Changeset 1786 for trunk/dll/init.c

Timestamp:

Aug 30, 2014, 10:03:35 PM (11 years ago)

Author:

Gregg Young

Message:

Add semaphore hmtxFiltering to prevent freeing dcd while filtering. Prevents a trap when FM2 is shutdown while directory containers are still populating (Ticket 535)

File:

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

trunk/dll/init.c

@@ -129 +129 @@
                 Added option to suppress message regarding missing bzip2.exe
                 or gzip.exe on TAR.B/GZ archives.
+  30 Aug 14 GKY Add semaphore hmtxFiltering to prevent freeing dcd while filtering. Prevents
+                a trap when FM2 is shutdown while directory containers are still populating
 
 ***********************************************************************/
@@ -228 +230 @@
 HMTX hmtxFM2Globals;
 HMTX hmtxScanning;
+HMTX hmtxFiltering;
 HEV  hevTreeCnrScanComplete;
 ULONG OS2ver[2];
@@ -590 +593 @@
   save_dir(s);
   AddBackslashToPath(s);
-  //if (s[strlen(s) - 1] != '\\')
-  //  strcat(s, "\\");
   enddir = &s[strlen(s)];
   if (*ArcTempRoot) {
@@ -1161 +1162 @@
   if (DosCreateMutexSem(NULL, &hmtxFM2Delete, 0L, FALSE))
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-              PCSZ_DOSCREATEMUTEXSEM);
+              PCSZ_DOSCREATEMUTEXSEM);
+  if (DosCreateMutexSem(NULL, &hmtxFiltering, 0L, FALSE))
+    Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+              PCSZ_DOSCREATEMUTEXSEM);
   if (DosCreateEventSem(NULL, &hevTreeCnrScanComplete, 0L, TRUE))
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,