Changeset 1856 for trunk/dll/mainwnd.c

Timestamp:

Aug 18, 2015, 7:12:52 PM (10 years ago)

Author:

Steven Levine

Message:

Rework Flesh/Stubby etc. to avoid running on thread 1
Should be ready for release after spurious traps resolved
DbgMsg calls retained - delete/disable before release

File:

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

trunk/dll/mainwnd.c

@@ -117 +117 @@
   02 Aug 15 GKY Remove unneed SubbyScan code and improve suppression of blank lines and
                 duplicate subdirectory name caused by running Stubby in worker threads.
+                duplicate subdirectory name caused by running Stubby in worker threads.
   09 Aug 15 SHL Use RESTORE_STATE_...
+  13 Aug 15 SHL Sync with Flesh/Stubby mods
 
 ***********************************************************************/
@@ -239 +241 @@
 USHORT shiftstate;
 
+UINT cDirectoriesRestored;              // 2015-08-12 SHL Incremented by RestoreDirCnrState
+
 #pragma data_seg(GLOBAL2)
 HMODULE FM3ModHandle;
@@ -1820 +1824 @@
 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;
@@ -2095 +2101 @@
 
   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)) {
@@ -2136 +2144 @@
           HWND hwndActive = TopWindow(hwnd, (HWND) 0);
           if (hwndActive)
+            DbgMsg(pszSrcFile, __LINE__, "WinSendMsg UM_DRIVECMD %c", *dv); // 2015-08-04 SHL FIXME debug
             WinSendMsg(WinWindowFromID(hwndActive, FID_CLIENT),
                        UM_DRIVECMD, MPFROMP(dv), MPVOID);
@@ -3446 +3455 @@
   HWND hwndDir, hwndC, hwndPPSave = NULLHANDLE;
   SWP swp, swpO, swpN;
-  ULONG size, numsaves = 0;
+  ULONG size;
+  ULONG numsaves = 0;
   LONG x;
   double xtrans, ytrans;
@@ -3464 +3474 @@
 
   sprintf(szPrefix, "%s.", pszStateName);
+
+  DbgMsg(pszSrcFile, __LINE__, "RestoreDirCnrState %s", pszStateName);  // 2015-08-13 SHL FIXME debug
 
   // If restoring shutdown state bypass no-prescan drives
@@ -3533 +3545 @@
   size = sizeof(ULONG);
   if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &numsaves, &size)) {
+    // 2015-08-13 SHL TreeCnrWndProc UM_RESCAN has already requested a UM_RESCAN2 which
+    // will result in an extra UM_SHOWME
+    // RestoreDirCnrState can be called before pending UM_SHOWMEs complete - oh well
+    if (fSwitchTreeOnFocus && numsaves)
+      cDirectoriesRestored = 1;
+    else
+      cDirectoriesRestored = 0;
     if (fDeleteState)
       PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
@@ -3631 +3650 @@
                   }
                 }
+                // 2015-08-12 SHL Suppress drive tree updates if not last container to restore
+                if (fSwitchTreeOnFocus)
+                  cDirectoriesRestored++;       // 2015-08-12 SHL
+
                 if (!PostMsg(hwndCnr, UM_SETUP2, NULL, NULL))
                   WinSendMsg(hwndCnr, UM_SETUP2, NULL, NULL);
@@ -3660 +3683 @@
         }
       }
-    } // for
+    } // for numsaves
     if (hwndPPSave) {
       SavePresParams(hwndPPSave, PCSZ_DIRCNR);
       WinDestroyWindow(hwndPPSave);
     }
+    DbgMsg(pszSrcFile, __LINE__, "RestoreDirCnrState returning fRestored %u", fRestored);       // 2015-08-13 SHL FIXME debug
   }
+
   return fRestored;
 }
@@ -6533 +6558 @@
             }
             else if (SHORT1FROMMP(mp1) == MAIN_DRIVELIST) {
+              DbgMsg(pszSrcFile, __LINE__, "MainWndProc CBN_ENTER ShowTreeRec(\"%s\")", path); // 2015-08-04 SHL FIXME debug
               ShowTreeRec(WinWindowFromID(WinWindowFromID(hwndTree,
                                                           FID_CLIENT),
@@ -6663 +6689 @@
     }
     DosSleep(1);
-    DbgMsg(pszSrcFile, __LINE__, "MainWndProc WM_CLOSE returning");
+    DbgMsg(pszSrcFile, __LINE__, "MainWndProc WM_CLOSE returning with fAmClosing %u", fAmClosing); // 2015-08-16 SHL
 
     return 0;           // Suppress WinDefWindowProc WM_QUIT message generation
@@ -6693 +6719 @@
 
   case WM_DESTROY:
+    DbgMsg(pszSrcFile, __LINE__, "MainWndProc WM_DESTROY hwnd %p TID %u", hwnd, GetTidForThread());     // 2015-08-09 SHL FIXME debug
     hwndMain = (HWND)0;
     if (!PostMsg((HWND)0, WM_QUIT, MPVOID, MPVOID))
       WinSendMsg((HWND)0, WM_QUIT, MPVOID, MPVOID);
 #   ifdef FORTIFY
+    DbgMsg(pszSrcFile, __LINE__, "MainWndProc WM_DESTROY hwnd %p TID %u", hwnd, GetTidForThread());     // 2015-08-09 SHL FIXME debug
     free_commands();
     free_associations();