Changeset 3250 for trunk/src/shell32/shlview.cpp

Timestamp:

Mar 27, 2000, 5:09:22 PM (25 years ago)

Author:

cbratschi

Message:

* empty log message *

File:

• trunk/src/shell32/shlview.cpp (modified) (10 diffs)

trunk/src/shell32/shlview.cpp

@@ -1 @@
-/* $Id: shlview.cpp,v 1.9 2000-03-26 16:34:54 cbratschi Exp $ */
+/* $Id: shlview.cpp,v 1.10 2000-03-27 15:09:22 cbratschi Exp $ */
 /*
  * ShellView
@@ -17 +17 @@
  * buily according to the columns shown.
  *
- * FIXME: Load/Save the view state from/into the stream provied by
+ * FIXME: Load/Save the view state from/into the stream provided by
  * the ShellBrowser
  *
@@ -496 +496 @@
    LPITEMIDLIST   pidl;
    DWORD    dwFetched;
-   UINT     i;
+   UINT     i,iPos;
    LVITEMA  lvItem;
    HRESULT  hRes;
@@ -502 +502 @@
 
 //CB: really slow, even without debug information
-   //DecreaseLogCount();
    TRACE("%p\n",This);
 
@@ -517 +516 @@
    }
 
-//CB: ILClone calls
    /* create a pointer array */
-   hdpa = pDPA_Create(64);
+   hdpa = pDPA_Create(1024);
    if (!hdpa)
    {
@@ -526 +524 @@
 
    /* copy the items into the array*/
-   while((S_OK == IEnumIDList_Next(pEnumIDList,1, &pidl, &dwFetched)) && dwFetched)
+   while((S_OK == IEnumIDList_Next(pEnumIDList,1,(LPITEMIDLIST*)&pidl,&dwFetched)) && dwFetched)
    {
      if (pDPA_InsertPtr(hdpa, 0x7fff, pidl) == -1)
@@ -534 +532 @@
    }
 
-//CB: only Get* calls
    /*sort the array*/
    pDPA_Sort(hdpa, (PFNDPACOMPARE)ShellView_CompareItems, (LPARAM)This->pSFParent);
@@ -545 +542 @@
    lvItem.pszText = LPSTR_TEXTCALLBACKA;                  /*get text on a callback basis*/
    lvItem.iImage = I_IMAGECALLBACK;                       /*get the image on a callback basis*/
+   iPos = ListView_GetItemCount(This->hWndList);
 
    for (i = 0; i < DPA_GetPtrCount(hdpa); ++i)   /* DPA_GetPtrCount is a macro*/
@@ -552 +550 @@
      if (IncludeObject(This, pidl) == S_OK) /* in a commdlg This works as a filemask*/
      {
-       lvItem.iItem = i;                                      /*add the item to the end of the list*/
+       lvItem.iItem = iPos;                                      /*add the item to the end of the list*/
        lvItem.lParam = (LPARAM)pidl;                         /*set the item's data*/
        ListView_InsertItemA(This->hWndList, &lvItem);
+       iPos++;
      }
      else
@@ -565 +564 @@
    IEnumIDList_Release(pEnumIDList); /* destroy the list*/
    pDPA_Destroy(hdpa);
-   //IncreaseLogCount();
 
    return S_OK;