Changeset 1786

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)

Location:

trunk/dll

Files:

• dircnrs.c (modified) (4 diffs)
• filter.c (modified) (6 diffs)
• init.c (modified) (4 diffs)
• init.h (modified) (2 diffs)

trunk/dll/dircnrs.c

@@ -86 +86 @@
   02 Mar 14 GKY Speed up intial drive scans Ticket 528
   26 Jun 14 SHL Rework DirObjWndProc UM_RESCAN to avoid hanging FM/2 Lite when tree hidden
+  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
 
 ***********************************************************************/
@@ -1210 +1212 @@
                         0,
                         0,
-                        SWP_RESTORE | SWP_SHOW | SWP_ACTIVATE | SWP_ZORDER);
+                        SWP_RESTORE | SWP_SHOW | SWP_ACTIVATE | SWP_ZORDER);
+      DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
       FreeList(dcd->lastselection);
       WinSetWindowPtr(dcd->hwndCnr, QWL_USER, NULL);    // 13 Apr 10 SHL Set NULL before freeing dcd
@@ -1630 +1633 @@
       }
       // 2014-06-11 SHL fm/2 lite can get here before drive scan completes
-      if (!fInitialDriveScan)
-        PostMsg(hwnd, UM_SETUP2, MPVOID, MPVOID);
+      //if (!fInitialDriveScan) // 2014-08-30 GKY This doesn't seem to be needed
+        PostMsg(hwnd, UM_SETUP2, MPVOID, MPVOID);
     }
     else {
@@ -3522 +3525 @@
                         0,
                         0,
-                        SWP_RESTORE | SWP_SHOW | SWP_ACTIVATE | SWP_ZORDER);
+                        SWP_RESTORE | SWP_SHOW | SWP_ACTIVATE | SWP_ZORDER);
+      DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
       FreeList(dcd->lastselection);
       free(dcd);

trunk/dll/filter.c

@@ -22 +22 @@
   31 May 11 SHL Rework Filter() for speed
   28 Jun 14 GKY Fix errors identified with CPPCheck;
+  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
 
 ***********************************************************************/
@@ -84 +86 @@
     return TRUE;                        // No mask data
 
+  DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
   pci = (PCNRITEM) rmini;
   // Always show root directory
   // 2011-05-31 SHL fixme to know if this is correct
   if (!(*(pci->pszFileName + 3))
-      || mask->fShowDirs && (pci->attrFile & FILE_DIRECTORY))
+      || mask->fShowDirs && (pci->attrFile & FILE_DIRECTORY)) {
+    DosReleaseMutexSem(hmtxFiltering);
     return TRUE;
+  }
 
   if ((~mask->attrFile & FILE_HIDDEN && pci->attrFile & FILE_HIDDEN) ||
@@ -95 +100 @@
       (~mask->attrFile & FILE_READONLY && pci->attrFile & FILE_READONLY) ||
       (~mask->attrFile & FILE_ARCHIVED && pci->attrFile & FILE_ARCHIVED) ||
-      (~mask->attrFile & FILE_DIRECTORY && pci->attrFile & FILE_DIRECTORY))
+      (~mask->attrFile & FILE_DIRECTORY && pci->attrFile & FILE_DIRECTORY)) {
+    DosReleaseMutexSem(hmtxFiltering);
     return FALSE;
+  }
 
   if ((mask->antiattr & FILE_HIDDEN && ~pci->attrFile & FILE_HIDDEN) ||
@@ -102 +109 @@
       (mask->antiattr & FILE_READONLY && ~pci->attrFile & FILE_READONLY) ||
       (mask->antiattr & FILE_ARCHIVED && ~pci->attrFile & FILE_ARCHIVED) ||
-      (mask->antiattr & FILE_DIRECTORY && ~pci->attrFile & FILE_DIRECTORY))
+      (mask->antiattr & FILE_DIRECTORY && ~pci->attrFile & FILE_DIRECTORY)) {
+    DosReleaseMutexSem(hmtxFiltering);
     return FALSE;
-
-  if (!*mask->szMask)
-    return TRUE;                        // No masks
+  }
+
+  if (mask && !*mask->szMask) {
+    DosReleaseMutexSem(hmtxFiltering);
+    return TRUE;
+  }// No masks
 
   // Have mask string
@@ -118 +129 @@
 
   if (!mask->pszMasks[1]) {
+    DosReleaseMutexSem(hmtxFiltering);
     // Just one mask string
     return wildcard(strchr(mask->szMask, '\\') ||
@@ -153 +165 @@
     }
   } // for
-
+  DosReleaseMutexSem(hmtxFiltering);
   return matched;
 }

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__,

trunk/dll/init.h

@@ -39 +39 @@
                 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
 
 ***********************************************************************/
@@ -236 +238 @@
 extern HMTX hmtxFM2Delete;
 extern HMTX hmtxScanning;
+extern HMTX hmtxFiltering;
 extern HEV  hevTreeCnrScanComplete;
 #endif