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

Timestamp:

Mar 28, 2000, 5:28:54 PM (25 years ago)

Author:

cbratschi

Message:

floppy name resource, release fix (don't use pdump)

File:

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

trunk/src/shell32/shlview.cpp

@@ -1 @@
-/* $Id: shlview.cpp,v 1.10 2000-03-27 15:09:22 cbratschi Exp $ */
+/* $Id: shlview.cpp,v 1.11 2000-03-28 15:28:54 cbratschi Exp $ */
 /*
  * ShellView
@@ -115 +115 @@
 #define FILEDIALOG_COLUMN_TIME 3
 #define FILEDIALOG_COLUMN_ATTRIB 4
-//CB: todo: drive view!
 
 /*menu items */
@@ -184 +183 @@
  */
 static BOOL IsInCommDlg(IShellViewImpl * This)
-{  return(This->pCommDlgBrowser != NULL);
+{
+  return(This->pCommDlgBrowser != NULL);
 }
 
@@ -502 +502 @@
 
 //CB: really slow, even without debug information
+//    too much transfers
    TRACE("%p\n",This);
 
@@ -507 +508 @@
 //    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);
@@ -526 +528 @@
    while((S_OK == IEnumIDList_Next(pEnumIDList,1,(LPITEMIDLIST*)&pidl,&dwFetched)) && dwFetched)
    {
-     if (pDPA_InsertPtr(hdpa, 0x7fff, pidl) == -1)
+     if (IncludeObject(This,pidl) == S_OK) /* in a commdlg This works as a filemask*/
      {
-       SHFree(pidl);
-     }
+       if (pDPA_InsertPtr(hdpa, 0x7fff, pidl) == -1)
+       {
+         SHFree(pidl);
+       }
+     } else SHFree(pidl);
    }
 
@@ -548 +553 @@
      pidl = (LPITEMIDLIST)DPA_GetPtr(hdpa, i);
 
-     if (IncludeObject(This, pidl) == S_OK) /* in a commdlg This works as a filemask*/
-     {
-       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
-       SHFree(pidl);                     /* the listview has the COPY*/
+     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++;
    }