Changeset 1317

Timestamp:

Dec 5, 2008, 2:45:02 AM (17 years ago)

Author:

Gregg Young

Message:

Add an event semaphore to prevent duplicate directory names in tree caused by RestoreDirCnrState running concurrently with the StubbyThread for the same drive. (Ticket 25)

Location:

trunk/dll

Files:

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

trunk/dll/filldir.c

@@ -120 +120 @@
   HWND        hwndDrivesList;
   BOOL        RamDrive;
+  BOOL        FirstDrive;
 }
 STUBBYSCAN;
@@ -217 +218 @@
                      MPFROMP(StubbyScan->pci->pszFileName));
         }
-        StubbyScanCount--;
+        StubbyScanCount--;
+        if (StubbyScan->FirstDrive) {
+          priority_critical();
+          DbgMsg(pszSrcFile, __LINE__, "StubbyScanCount %i", StubbyScanCount);
+          while (StubbyScanCount != 0)
+            DosSleep(50);
+          DosPostEventSem(DriveScanStart);
+        }
         WinDestroyMsgQueue(hmq);
       }
@@ -964 +972 @@
           if (stopflag && *stopflag)
             goto Abort;
-          if (fSyncUpdates) {
+          if (fSyncUpdates) {
             pciFirst = WinSendMsg(hwndCnr, CM_ALLOCRECORD,
                                   MPFROMLONG(EXTRA_RECORD_BYTES),
@@ -1017 +1025 @@
               ullReturnBytes += ullTotalBytes;
               ulReturnFiles += ulSelCnt;
-            }
+            }
           } // if sync updates
           else {
@@ -1552 +1560 @@
     STUBBYSCAN *StubbyScan;
     HWND hwndDrivesList = WinWindowFromID(WinQueryWindow(hwndParent, QW_PARENT),
-                                          MAIN_DRIVELIST);
-
-    //AddDrive = TRUE;
+                                          MAIN_DRIVELIST);
+    PULONG pulPostCt;
+    BOOL FirstDrive = TRUE;
+
     pci = (PCNRITEM) WinSendMsg(hwndCnr,
                                 CM_QUERYRECORD,
                                 MPVOID,
-                                MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
+                                MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
+    StubbyScanCount ++;
     while (pci && (INT)pci != -1) {
       StubbyScan = xmallocz(sizeof(STUBBYSCAN), pszSrcFile, __LINE__);
@@ -1567 +1577 @@
       StubbyScan->hwndDrivesList = hwndDrivesList;
       StubbyScan->RamDrive = FALSE;
+      StubbyScan->FirstDrive = FALSE;
       pciNext = (PCNRITEM) WinSendMsg(hwndCnr,
                                       CM_QUERYRECORD,
@@ -1580 +1591 @@
           {
             if (DRIVE_RAMDISK)
-              StubbyScan->RamDrive = TRUE;
+              StubbyScan->RamDrive = TRUE;
+            if (FirstDrive)
+              StubbyScan->FirstDrive = TRUE;
             rc = _beginthread(StubbyScanThread, NULL, 65536, StubbyScan);
             if (rc == -1)
               Runtime_Error(pszSrcFile, __LINE__,
-                            GetPString(IDS_COULDNTSTARTTHREADTEXT));
+                            GetPString(IDS_COULDNTSTARTTHREADTEXT));
+            else
+              FirstDrive = FALSE;
           } // if drive for scanning
           else
@@ -1605 +1620 @@
       pci = pciNext;
     } // while
+    StubbyScanCount --;
   }
   if (hwndParent)

trunk/dll/fm3dll.h

@@ -189 +189 @@
 // #define priority_tweaked()  DosSetPriority(PRTYS_THREAD,PRTYC_REGULAR,1L,0L)                 // Unused, 13 Sep 08 JBS
 #define priority_bumped()   DosSetPriority(PRTYS_THREAD,PRTYC_REGULAR,3L,0L)
-// #define priority_critical() DosSetPriority(PRTYS_THREAD,PRTYC_FOREGROUNDSERVER,2L,0L)        // Unused, 13 Sep 08 JBS
+#define priority_critical() DosSetPriority(PRTYS_THREAD,PRTYC_FOREGROUNDSERVER,2L,0L)   // Unused, 13 Sep 08 JBS
 // #define priority_max()      DosSetPriority(PRTYS_THREAD,PRTYC_FOREGROUNDSERVER,31L,0L)       // Unused, 13 Sep 08 JBS
 

trunk/dll/init.c

@@ -158 +158 @@
 
 #pragma data_seg(GLOBAL1)
+HEV  DriveScanStart;
 HMTX hmtxFM2Delete;
 HMTX hmtxFM2Globals;
@@ -1188 +1189 @@
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
               "DosCreateMutexSem");
+  if (DosCreateEventSem("\\SEM32\\DRIVESCAN", &DriveScanStart, 0L, FALSE))
+    Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+              GetPString(IDS_CREATESEMFAILED));
   /*
    * set some defaults (note: everything else automatically initialized

trunk/dll/init.h

@@ -93 +93 @@
 extern HMTX hmtxFM2Globals;
 extern HMTX hmtxFM2Delete;
+extern HEV  DriveScanStart;
 
 #endif // INIT_H