Changeset 1858 for trunk/dll/mainwnd.c

Timestamp:

Aug 20, 2015, 7:31:14 AM (10 years ago)

Author:

Steven Levine

Message:

Rework FlestWaitForWorkListEmpty to support wait for parents of path
Clean up some obsolete code

File:

• trunk/dll/mainwnd.c (modified) (6 diffs)

trunk/dll/mainwnd.c

@@ -120 +120 @@
   09 Aug 15 SHL Use RESTORE_STATE_...
   13 Aug 15 SHL Sync with Flesh/Stubby mods
+  19 Aug 15 SHL Add/use fAmQuitting
+  19 Aug 15 SHL Delete obsoletes
 
 ***********************************************************************/
@@ -214 +216 @@
 PFNWP PFNWPButton;
 PFNWP PFNWPStatic;
-BOOL fAmClosing;
+BOOL fAmClosing;                        // Attempting to close main window
+BOOL fAmQuitting;                       // Main window close/destroy in progress
 BOOL fAutoTile;
 BOOL fAutoView;
@@ -1824 +1827 @@
 MRESULT EXPENTRY DriveBackProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
-#if 0 // 2015-08-04 SHL FIXME to be gone
-  APIRET rc;
-#endif // 2015-08-04 SHL FIXME to be gone
-
   static BOOL emphasized;
 
@@ -2101 +2100 @@
 
   case WM_COMMAND:
-#if 0 // 2015-08-04 SHL FIXME to be gone
-    rc = DosWaitEventSem(hevTreeCnrScanComplete, SEM_INDEFINITE_WAIT);
-    if (rc)
-      Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosWaitEventSem");
-#endif // 2015-08-04 SHL FIXME to be gone
-
     switch(SHORT1FROMMP(mp1)) {
     case IDM_RESCAN:
@@ -6679 +6672 @@
                WM_SYSCOMMAND, MPFROM2SHORT(SC_MINIMIZE, 0), MPVOID);
     if (CloseChildren(hwnd)) {
+      // Close request refused - recover
       fAmClosing = FALSE;
       if (fAutoTile)
@@ -6688 +6682 @@
         WinSendMsg(hwndTree, WM_CLOSE, MPVOID, MPVOID);
     }
+    fAmQuitting = TRUE;                 // Let world know quit in progress
     DosSleep(1);
     DbgMsg(pszSrcFile, __LINE__, "MainWndProc WM_CLOSE returning with fAmClosing %u", fAmClosing); // 2015-08-16 SHL