Changeset 1439 for trunk/dll/dircnrs.c

Timestamp:

Jul 12, 2009, 11:57:04 PM (16 years ago)

Author:

Gregg Young

Message:

Changes to allow high mem loading of dll; Refactor .LONGNAME and .SUBJECT EA fetch to FetchCommonEAs. Add szFSType to FillInRecordFromFSA use to bypass EA scan and size formatting for tree container; Fix labels/FS type to work on scan on NOPRESCAN Drives; Fixed dbl directory names on restore of dir cnrs; (Tickets 47, 339, 363, 368, 369, 370)

File:

• trunk/dll/dircnrs.c (modified) (4 diffs)

trunk/dll/dircnrs.c

@@ -804 +804 @@
                             MPFROMP(pci),
                             MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER));
-          if (!pciC) {
-            Stubby(dcd->hwndCnr, pci);
+          if (!pciC) {
+            if (fInitialDriveScan)
+              Stubby(dcd->hwndCnr, pci);
+            else {
+              while (StubbyScanCount != 0)
+                DosSleep(50);
+              Stubby(dcd->hwndCnr, pci);
+            }
           }
         }
@@ -1611 +1617 @@
               DIR_SORT), dcd->sortFlags, FALSE);
       SayView(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-              DIR_VIEW), dcd->flWindowAttr);
+                              DIR_VIEW), dcd->flWindowAttr);
+      //DbgMsg(pszSrcFile, __LINE__, "UM_SETUP2 %p pci %p", hwnd, dcd);
     } else
       PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);
@@ -2797 +2804 @@
                   if (Flesh(hwnd, pci) &&
                       SHORT2FROMMP(mp1) == CN_EXPANDTREE &&
-                      !dcd->suspendview && fTopDir)
-                    PostMsg(hwnd, UM_TOPDIR, MPFROMP(pci), MPVOID);
+                      !dcd->suspendview && fTopDir) {
+                    PostMsg(hwnd, UM_TOPDIR, MPFROMP(pci), MPVOID);
+                    //DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
+                  }
                 }
                 driveserial[toupper(*pci->pszFileName) - 'A'] = volser.serial;
@@ -2804 +2813 @@
             }
             else if (SHORT2FROMMP(mp1) == CN_EXPANDTREE) {
-              if (Flesh(hwnd, pci) && !dcd->suspendview && fTopDir)
+              if (Flesh(hwnd, pci) && !dcd->suspendview && fTopDir) {
                 PostMsg(hwnd, UM_TOPDIR, MPFROMP(pci), MPVOID);
-            }
-            if (SHORT2FROMMP(mp1) == CN_EXPANDTREE && !dcd->suspendview)
+                //DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
+              }
+            }
+            if (SHORT2FROMMP(mp1) == CN_EXPANDTREE && !dcd->suspendview) {
               WinSendMsg(hwnd, UM_FILTER, MPVOID, MPVOID);
+              //DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
+            }
           }
         }