Changeset 1320

Timestamp:

Dec 5, 2008, 3:10:20 PM (17 years ago)

Author:

Gregg Young

Message:

Use event semaphore to prevent rescan of drives while StubbySacnTreads are still running; code cleanup.

Location:

trunk/dll

Files:

• filldir.c (modified) (2 diffs)
• init.c (modified) (2 diffs)
• init.h (modified) (1 diff)
• treecnr.c (modified) (2 diffs)

trunk/dll/filldir.c

@@ -223 +223 @@
         if (StubbyScan->FirstDrive) {
           priority_critical();
-          DbgMsg(pszSrcFile, __LINE__, "StubbyScanCount %i", StubbyScanCount);
           while (StubbyScanCount != 0)
             DosSleep(50);
@@ -1563 +1562 @@
     HWND hwndDrivesList = WinWindowFromID(WinQueryWindow(hwndParent, QW_PARENT),
                                           MAIN_DRIVELIST);
-    PULONG pulPostCt;
     BOOL FirstDrive = TRUE;
 

trunk/dll/init.c

@@ -165 +165 @@
 PFNWP PFNWPMLE;
 CHAR ThousandsSeparator[2];
+BOOL fInitialDriveScan;
 BOOL fAmAV2;
 BOOL fChangeTarget;
@@ -1192 +1193 @@
     Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
               GetPString(IDS_CREATESEMFAILED));
+  fInitialDriveScan = TRUE;
+
   /*
    * set some defaults (note: everything else automatically initialized

trunk/dll/init.h

@@ -66 +66 @@
 extern CHAR *WC_TREESTATUS;
 extern CHAR *WC_VIEWSTATUS;
+extern BOOL fInitialDriveScan;
 extern BOOL fAmAV2;
 extern BOOL fChangeTarget;

trunk/dll/treecnr.c

@@ -802 +802 @@
       Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
     else {
+      PULONG pulPostCt;
+
       RemoveCnrItems(dcd->hwndCnr, NULL, 0, CMA_FREE | CMA_INVALIDATE | CMA_ERASE);
       WinSendMsg(dcd->hwndCnr,
@@ -808 +810 @@
                  CM_SCROLLWINDOW,
                  MPFROMSHORT(CMA_HORIZONTAL), MPFROMLONG(-1));
-      while (StubbyScanCount !=0)
-        DosSleep(50);
+      if (!fInitialDriveScan) {
+        DosWaitEventSem(DriveScanStart, 20000);
+        pulPostCt = xmallocz(sizeof(ULONG), pszSrcFile, __LINE__);
+        if (pulPostCt) {
+          DosResetEventSem(DriveScanStart, pulPostCt);
+          free(pulPostCt);
+        }
+      }
+      else
+        fInitialDriveScan = FALSE;
       FillTreeCnr(dcd->hwndCnr, dcd->hwndParent);
       if (fOkayMinimize) {