Changeset 1786 for trunk/dll/dircnrs.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/dircnrs.c (modified) (4 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);