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

Timestamp:

Mar 24, 2000, 6:17:30 PM (25 years ago)

Author:

cbratschi

Message:

bug fixes

File:

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

trunk/src/shell32/shlview.cpp

@@ -1 @@
-/* $Id: shlview.cpp,v 1.7 2000-03-22 16:55:52 cbratschi Exp $ */
+/* $Id: shlview.cpp,v 1.8 2000-03-24 17:17:28 cbratschi Exp $ */
 /*
  * ShellView
@@ -14 +14 @@
  * appearing in the view. To fix this it should use the IShellFolder2
  * interface when possible to get the informations dynamically
- * this will take a lot of work to implemet and wont likely not
+ * this will take a lot of work to implement and wont likely not
  * be done in near future
  * Please considder this when code new features. Mail me if you
@@ -105 +105 @@
 #define LISTVIEW_COLUMN_TIME 3
 #define LISTVIEW_COLUMN_ATTRIB 4
+//CB: todo: drive view!
 
 /*menu items */
@@ -328 +329 @@
         lvColumn.fmt = sd.fmt;
         lvColumn.cx = sd.cxChar*8; /* chars->pixel */
-         StrRetToStrNA( szTemp, 50, &sd.str, NULL);
+        StrRetToStrNA( szTemp, 50, &sd.str, NULL);
         ListView_InsertColumnA(This->hWndList, i, &lvColumn);
       }
@@ -475 +476 @@
    UINT     i;
    LVITEMA  lvItem;
-   HRESULT     hRes;
+   HRESULT  hRes;
    HDPA     hdpa;
 
+//CB: really slow, even without debug information
+   //DecreaseLogCount();
    TRACE("%p\n",This);
 
+//CB: FindFirstFileA, many calls to FindNextFileA in this block
+//    OS/2's APIs can read more than one file per call -> much faster
+//    -> add a new API for faster handling
    /* get the itemlist from the shfolder*/
    hRes = IShellFolder_EnumObjects(This->pSFParent,This->hWnd, SHCONTF_NONFOLDERS | SHCONTF_FOLDERS, &pEnumIDList);
@@ -489 +495 @@
    }
 
+//CB: ILClone calls
    /* create a pointer array */
-   hdpa = pDPA_Create(16);
+   hdpa = pDPA_Create(64);
    if (!hdpa)
    {
@@ -505 +512 @@
    }
 
+//CB: only Get* calls
    /*sort the array*/
    pDPA_Sort(hdpa, (PFNDPACOMPARE)ShellView_CompareItems, (LPARAM)This->pSFParent);
@@ -511 +519 @@
    SendMessageA(This->hWndList, WM_SETREDRAW, FALSE, 0);
 
-   for (i=0; i < DPA_GetPtrCount(hdpa); ++i)   /* DPA_GetPtrCount is a macro*/
+   ZeroMemory(&lvItem, sizeof(lvItem));                   /* create the listviewitem*/
+   lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM;     /*set the mask*/
+   lvItem.pszText = LPSTR_TEXTCALLBACKA;                  /*get text on a callback basis*/
+   lvItem.iImage = I_IMAGECALLBACK;                       /*get the image on a callback basis*/
+
+   for (i = 0; i < DPA_GetPtrCount(hdpa); ++i)   /* DPA_GetPtrCount is a macro*/
    {
      pidl = (LPITEMIDLIST)DPA_GetPtr(hdpa, i);
+
      if (IncludeObject(This, pidl) == S_OK) /* in a commdlg This works as a filemask*/
      {
-       ZeroMemory(&lvItem, sizeof(lvItem)); /* create the listviewitem*/
-       lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM;     /*set the mask*/
-       lvItem.iItem = i;  /*add the item to the end of the list*/
-       lvItem.lParam = (LPARAM) pidl;             /*set the item's data*/
-       lvItem.pszText = LPSTR_TEXTCALLBACKA;         /*get text on a callback basis*/
-       lvItem.iImage = I_IMAGECALLBACK;           /*get the image on a callback basis*/
+       lvItem.iItem = i;                                      /*add the item to the end of the list*/
+       lvItem.lParam = (LPARAM)pidl;                         /*set the item's data*/
        ListView_InsertItemA(This->hWndList, &lvItem);
      }
@@ -535 +545 @@
    IEnumIDList_Release(pEnumIDList); /* destroy the list*/
    pDPA_Destroy(hdpa);
+   //IncreaseLogCount();
 
    return S_OK;
@@ -1078 +1089 @@
               {
                 SHELLDETAILS sd;
+
                 IShellFolder2_GetDetailsOf(This->pSF2Parent, pidl, lpdi->item.iSubItem, &sd);
                 StrRetToStrNA( lpdi->item.pszText, lpdi->item.cchTextMax, &sd.str, NULL);