Changeset 1506 for trunk/dll/mainwnd.c

Timestamp:

Apr 12, 2010, 12:36:53 AM (15 years ago)

Author:

Gregg Young

Message:

Fixed hang and drive tree rescan failure resulting from event sem not being posted.

File:

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

trunk/dll/mainwnd.c

@@ -104 +104 @@
                 aren't user settable; realappname should be used for setting applicable to
                 one or more miniapp but not to FM/2
-  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
+  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast
+                CHAR CONSTANT * as CHAR *.
+  11 Apr 10 GKY Fix drive tree rescan failure and program hang caused by event sem
+                never being posted
 
 ***********************************************************************/
@@ -353 +356 @@
     }
     if (fInitialDriveScan) {
+      fInitialDriveScan = FALSE;
       DosPostEventSem(hevInitialCnrScanComplete);
       DosCloseEventSem(hevInitialCnrScanComplete);
-      fInitialDriveScan = FALSE;
     }
     return 0;
@@ -3057 +3060 @@
   if (*lasttoolbar) {
     sprintf(szKey, "%sToolbar", szPrefix);
-    PrfWriteProfileString(fmprof, (CHAR *) (CHAR *) FM3Str, szKey, lasttoolbar);
+    PrfWriteProfileString(fmprof, FM3Str, szKey, lasttoolbar);
   }
 
   if (!fIsShutDownState) {
     sprintf(szKey, "%sTargetDir", szPrefix);
-    PrfWriteProfileString(fmprof, (CHAR *) FM3Str, szKey, targetdir);
+    PrfWriteProfileString(fmprof, FM3Str, szKey, targetdir);
     sprintf(szKey, "%sVersion", szPrefix);
-    PrfWriteProfileString(fmprof, (CHAR *) FM3Str, szKey, "3.16");
+    PrfWriteProfileString(fmprof, FM3Str, szKey, "3.16");
   }
 
@@ -3088 +3091 @@
             eos = &szKey[strlen(szKey)];
             strcpy(eos, "Pos");
-            PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) & swp,
+            PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & swp,
                                 sizeof(SWP));
             dcd = WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), QWL_USER);
             if (dcd) {
               strcpy(eos, "Sort");
-              PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) & dcd->sortFlags,
+              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->sortFlags,
                                   sizeof(INT));
               strcpy(eos, "Filter");
-              PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) & dcd->mask,
+              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->mask,
                                   sizeof(MASK));
               strcpy(eos, "View");
@@ -3115 +3118 @@
                   flWindowAttr |= CV_NAME;
               }
-              PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) &flWindowAttr,
+              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) &flWindowAttr,
                                   sizeof(ULONG));
               WriteDetailsSwitches(szKeyBase, &dcd->ds, TRUE);
@@ -3121 +3124 @@
             }
             strcpy(eos, "Dir");
-            PrfWriteProfileString(fmprof, (CHAR *) FM3Str, szKey, szDir);
+            PrfWriteProfileString(fmprof, FM3Str, szKey, szDir);
             numsaves++;
           }
@@ -3131 +3134 @@
 
   sprintf(szKey, "%sNumDirsLastTime", szPrefix);
-  if (PrfQueryProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) &previous_numsaves, &ulTemp)) {
+  if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &previous_numsaves, &ulTemp)) {
     ULONG size = 0;
 
     sprintf(szKey, "%sVersion", szPrefix);
-    PrfQueryProfileSize(fmprof, (CHAR *) FM3Str, szKey, &size);
+    PrfQueryProfileSize(fmprof, FM3Str, szKey, &size);
     if (!size && fSaveState) {
       for (ulTemp = 0; ulTemp < previous_numsaves; ulTemp++)
         RemoveOldCnrSwitches(szPrefix, ulTemp);
        sprintf(szKey, "%sVersion", szPrefix);
-       PrfWriteProfileString(fmprof, (CHAR *) FM3Str, szKey, "3.16");
+       PrfWriteProfileString(fmprof, FM3Str, szKey, "3.16");
       }
     for (ulTemp = numsaves; ulTemp < previous_numsaves; ulTemp++) {
@@ -3149 +3152 @@
   sprintf(szKey, "%sNumDirsLastTime", szPrefix);
   if (numsaves) {
-    PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) &numsaves, sizeof(ULONG));
+    PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) &numsaves, sizeof(ULONG));
     WinQueryWindowPos(WinQueryWindow(hwndClient, QW_PARENT), &swp);
     sprintf(szKey, "%sMySizeLastTime", szPrefix);
-    PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) &swp, sizeof(SWP));
+    PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) &swp, sizeof(SWP));
     if (WinQueryWindowPos(hwndTree, &swp)) {
       sprintf(szKey, "%sLastTreePos", szPrefix);
-      PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) &swp, sizeof(SWP));
+      PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) &swp, sizeof(SWP));
     }
   }
   else if (fIsShutDownState) {
-    PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) &numsaves, sizeof(ULONG));
+    PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) &numsaves, sizeof(ULONG));
   }
   return numsaves;
@@ -3240 +3243 @@
     if (fToolsChanged)
       save_tools(NULL);
-    PrfQueryProfileString(fmprof, (CHAR *) FM3Str, szKey, NULL, lasttoolbar, sizeof(lasttoolbar));
-    PrfWriteProfileString(fmprof, (CHAR *) FM3Str, "LastToolbar", lasttoolbar);
+    PrfQueryProfileString(fmprof, FM3Str, szKey, NULL, lasttoolbar, sizeof(lasttoolbar));
+    PrfWriteProfileString(fmprof, FM3Str, "LastToolbar", lasttoolbar);
     load_tools(NULL);
     PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
@@ -3247 +3250 @@
   sprintf(szKey, "%sTargetDir", szPrefix);
   {
-    PrfQueryProfileString(fmprof, (CHAR *) FM3Str, szKey, NULL, targetdir, sizeof(targetdir));
-    PrfWriteProfileString(fmprof, (CHAR *) FM3Str, "TargetDir", targetdir);
+    PrfQueryProfileString(fmprof, FM3Str, szKey, NULL, targetdir, sizeof(targetdir));
+    PrfWriteProfileString(fmprof, FM3Str, "TargetDir", targetdir);
     SetTargetDir(NULLHANDLE, TRUE);
   }
   size = sizeof(SWP);
   sprintf(szKey, "%sMySizeLastTime", szPrefix);
-  if (!PrfQueryProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) &swpO, &size) ||
+  if (!PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &swpO, &size) ||
       size != sizeof(SWP) || !swp.cx || !swp.cy)
   {
@@ -3260 +3263 @@
   // If restoring internally saved state, forget info
   if (fDeleteState)
-    PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, NULL, 0L);
+    PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
   WinQueryWindowPos(WinQueryWindow(hwndClient, QW_PARENT), &swpN);
   if (swpN.fl & (SWP_MINIMIZE | SWP_HIDE))
@@ -3268 +3271 @@
   size = sizeof(SWP);
   sprintf(szKey, "%sLastTreePos", szPrefix);
-  if (PrfQueryProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) &swp, &size)) {
+  if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &swp, &size)) {
     if (fDeleteState)
-      PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, NULL, 0L);
+      PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
     swp.hwnd = hwndTree;
     TransformSwp(&swp, xtrans, ytrans);
@@ -3299 +3302 @@
   sprintf(szKey, "%sNumDirsLastTime", szPrefix);
   size = sizeof(ULONG);
-  if (PrfQueryProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) &numsaves, &size)) {
+  if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &numsaves, &size)) {
     if (fDeleteState)
-      PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, NULL, 0L);
+      PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
     for (x = numsaves - 1; x >= 0; x--) {
       CHAR *eos = szKey;
@@ -3311 +3314 @@
       strcpy(eos, "Pos");
       size = sizeof(SWP);
-      if (PrfQueryProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) &swp, &size)) {
+      if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &swp, &size)) {
         strcpy(eos, "Dir"); ;
         size = sizeof(szDir);
-        if (PrfQueryProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) szDir, &size)) {
+        if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) szDir, &size)) {
           // If restoring shutdown state and drive marked no prescan
           // bypass window restore
@@ -3363 +3366 @@
                 strcpy(eos, "Sort");
                 size = sizeof(INT);
-                if (PrfQueryProfileData(fmprof, (CHAR *) FM3Str,        szKey, (PVOID) &dcd->sortFlags,
+                if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &dcd->sortFlags,
                                         &size)) {
                   if (!dcd->sortFlags)
@@ -3370 +3373 @@
                 size = sizeof(MASK);
                 strcpy(eos, "Filter");
-                if (PrfQueryProfileData(fmprof, (CHAR *) FM3Str,        szKey, (PVOID) &dcd->mask, &size)) {
+                if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &dcd->mask, &size)) {
                   if (*dcd->mask.szMask)
                     WinSendMsg(WinWindowFromID(hwndC, DIR_CNR),
@@ -3379 +3382 @@
                 if (!noview) {
                   size = sizeof(ULONG);
-                  if (PrfQueryProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) &dcd->flWindowAttr,
+                  if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &dcd->flWindowAttr,
                                           &size)) {
 
@@ -4718 +4721 @@
             sprintf(szKey, "%s.NumDirsLastTime", szStateName);
             size = sizeof(ULONG);
-            if (!PrfQueryProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) &numsaves, &size)) {
+            if (!PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &numsaves, &size)) {
               saymsg(MB_ENTER | MB_ICONASTERISK, hwnd,
                      GetPString(IDS_WARNINGTEXT),
@@ -4726 +4729 @@
               Runtime_Error(pszSrcFile, __LINE__, NULL);
             else {
-              PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, NULL, 0L);
+              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
               for (x = 0; x < numsaves; x++) {
                 sprintf(szKeyBase, "%s.DirCnr.%lu", szStateName, x);
@@ -4732 +4735 @@
                 size = 0;
                 sprintf(szKey, "%sVersion", szStateName);
-                if (PrfQueryProfileSize(fmprof, (CHAR *) FM3Str, szKey, &size) && size)
+                if (PrfQueryProfileSize(fmprof, FM3Str, szKey, &size) && size)
                   RemoveOldCnrSwitches(szStateName, x);
               }
@@ -5053 +5056 @@
     else
       fComments = TRUE;
-    PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "Comments", &fComments, sizeof(BOOL));
+    PrfWriteProfileData(fmprof, FM3Str, "Comments", &fComments, sizeof(BOOL));
     WinSetWindowText((fComments) ? hwndAutoview : hwndAutoMLE, NullStr);
     goto AutoChange;
@@ -5125 +5128 @@
       PostMsg(WinQueryWindow(hwnd, QW_PARENT), WM_UPDATEFRAME,
               MPFROMLONG(FCF_MENU), MPVOID);
-      PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "MenuInvisible",
+      PrfWriteProfileData(fmprof, FM3Str, "MenuInvisible",
                           &MenuInvisible, sizeof(BOOL));
     }
@@ -5399 +5402 @@
             strcpy(lasttoolbar,
                    quicktool[SHORT1FROMMP(mp1) - IDM_QUICKTOOLSTART - 1]);
-            PrfWriteProfileString(fmprof, (CHAR *) FM3Str, "LastToolbar", lasttoolbar);
+            PrfWriteProfileString(fmprof, FM3Str, "LastToolbar", lasttoolbar);
           }
           PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
@@ -5707 +5710 @@
 
     size = sizeof(BOOL);
-    if (PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "MenuInvisible", &temp, &size) &&
+    if (PrfQueryProfileData(fmprof, FM3Str, "MenuInvisible", &temp, &size) &&
         size && temp)
       WinSendMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_HIDEMENU, 0), MPVOID);
     size = sizeof(BOOL);
-    if (PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "FreeTree", &temp, &size) &&
+    if (PrfQueryProfileData(fmprof, FM3Str, "FreeTree", &temp, &size) &&
         size && temp)
       WinSendMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_FREETREE, 0), MPVOID);
     size = sizeof(BOOL);
-    if (PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "AutoTile", &temp, &size) &&
+    if (PrfQueryProfileData(fmprof, FM3Str, "AutoTile", &temp, &size) &&
         size && !temp)
       WinSendMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_AUTOTILE, 0), MPVOID);
@@ -5746 +5749 @@
         if (!fSaveState ||
             !PrfQueryProfileData(fmprof,
-                                 (CHAR *) FM3Str,
+                                 FM3Str,
                                  "LastTreePos",
                                  &swp, &size) || size != sizeof(SWP)) {
@@ -5756 +5759 @@
           size = sizeof(ratio);
           if (!PrfQueryProfileData(fmprof,
-                                   (CHAR *) FM3Str,
+                                   FM3Str,
                                    "TreeWindowRatio",
                                    (PVOID) & ratio,
@@ -5798 +5801 @@
       PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
       if (fInitialDriveScan) {
+        fInitialDriveScan = FALSE;
         DosPostEventSem(hevInitialCnrScanComplete);
         DosCloseEventSem(hevInitialCnrScanComplete);
@@ -6296 +6300 @@
               load_tools(path);
               PrfWriteProfileString(fmprof,
-                                    (CHAR *) FM3Str, "LastToolbar", lasttoolbar);
+                                    FM3Str, "LastToolbar", lasttoolbar);
               PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
               WinSetWindowText(hwndButtonlist, (CHAR *) GetPString(IDS_TOOLBARTEXT));
@@ -6309 +6313 @@
               sprintf(szKey, "%s.NumDirsLastTime", path);       // path is state name
               if (!PrfQueryProfileData(fmprof,
-                                       (CHAR *) FM3Str,
+                                       FM3Str,
                                        szKey,
                                        (PVOID)&numsaves,