Changeset 1844 for trunk/dll/mainwnd.c

Timestamp:

Aug 12, 2015, 7:37:37 AM (10 years ago)

Author:

Steven Levine

Message:

Add RESTORE_STATE_... definitions and use

File:

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

trunk/dll/mainwnd.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2013 Steven H. Levine
+  Copyright (c) 2001, 2015 Steven H. Levine
 
   11 Jun 02 SHL Drop obsolete xor code
@@ -100 +100 @@
   14 Sep 09 SHL Blink thread LEDs when workers busy
   13 Dec 09 GKY Fixed separate paramenters. Please note that appname should be used in
-                profile calls for user settings that work and are setable in more than one
-                miniapp; FM3Str should be used for setting only relavent to FM/2 or that
-                aren't user settable; realappname should be used for setting applicable to
-                one or more miniapp but not to FM/2
+                profile calls for user settings that work and are setable in more than one
+                miniapp; FM3Str should be used for setting only relavent to FM/2 or that
+                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 *.
+                CHAR CONSTANT * as CHAR *.
   11 Apr 10 GKY Fix drive tree rescan failure and program hang caused by event sem
-                never being posted
+                never being posted
   23 Oct 10 GKY Changes to populate and utilize a HELPTABLE for context specific help
   03 Oct 11 SHL Add needTile to ensure containers opened on command line render correctly
@@ -114 +114 @@
   12 Aug 12 GKY Allow for selection of include subdirectories or a list file on initial startup of compare dirs
   30 Dec 12 GKY Enhance traget directory drop to give the option of changing the directory or carrying out an
-                operation to the current target; Added an error message for target = None;
+                operation to the current target; Added an error message for target = None;
   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_...
 
 ***********************************************************************/
@@ -340 +341 @@
         WinSendMsg(hwndMain, UM_SETDIR, MPFROMP(s), MPVOID);
       }
-      PostMsg(MainObjectHwnd, UM_RESTORE, MPFROMLONG(1), MPFROMLONG(1));
+      PostMsg(MainObjectHwnd, UM_RESTORE, MPFROMLONG(1), MPFROMLONG(RESTORE_STATE_TILE_CHILDREN));
     }
     return 0;
@@ -346 +347 @@
   case UM_RESTORE:
     switch ((ULONG)mp2) {
-    case 1:
+    case RESTORE_STATE_TILE_CHILDREN:
       TileChildren(hwndMain, TRUE);
       break;
-    case 2:
+    case RESTORE_STATE_CLOSE_CHILDREN:
       CloseDirCnrChildren(hwndMain);
       break;
-    case 0:
+    case RESTORE_STATE_RESTORE:
       fNoTileUpdate = TRUE;
       WinEnableWindow(WinQueryWindow(hwndMain, QW_PARENT), FALSE);
-      RestoreDirCnrState(hwndMain, (char *)mp1, FALSE);
+      RestoreDirCnrState(hwndMain, (CHAR *)mp1, FALSE);
       WinEnableWindow(WinQueryWindow(hwndMain, QW_PARENT), TRUE);
       fNoTileUpdate = FALSE; ;
@@ -1819 +1820 @@
 MRESULT EXPENTRY DriveBackProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
-    static BOOL emphasized = FALSE;
+  APIRET rc;
+
+  static BOOL emphasized;
 
   switch (msg) {
@@ -1883 +1886 @@
       cnd.pDragInfo = (PDRAGINFO) mp1;
       if (!DrgAccessDraginfo((PDRAGINFO) cnd.pDragInfo)) {
-        Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
-                  PCSZ_DRGACCESSDRAGINFO);
-        return 0;
+        Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                  PCSZ_DRGACCESSDRAGINFO);
+        return 0;
       }
       numitems = DrgQueryDragitemCount((PDRAGINFO) cnd.pDragInfo);
       usOperation = cnd.pDragInfo->usOperation;
       if (usOperation == DO_DEFAULT)
-        usOperation = fCopyDefault ? DO_COPY : DO_MOVE;
+        usOperation = fCopyDefault ? DO_COPY : DO_MOVE;
       saymsg(MB_ENTER | MB_ICONASTERISK,
-             hwnd,
-             GetPString(IDS_DROPHELPHDRTEXT),
-             GetPString(IDS_DROPHELPTEXT),
-             numitems,
-             &"s"[numitems == 1L],
-             NullStr,
-             NullStr,
-             targetdir,
-             " ",
-             GetPString((usOperation == DO_MOVE) ?
-                        IDS_MOVETEXT :
-                        (usOperation == DO_LINK) ?
-                        IDS_LINKTEXT : IDS_COPYTEXT));
+             hwnd,
+             GetPString(IDS_DROPHELPHDRTEXT),
+             GetPString(IDS_DROPHELPTEXT),
+             numitems,
+             &"s"[numitems == 1L],
+             NullStr,
+             NullStr,
+             targetdir,
+             " ",
+             GetPString((usOperation == DO_MOVE) ?
+                        IDS_MOVETEXT :
+                        (usOperation == DO_LINK) ?
+                        IDS_LINKTEXT : IDS_COPYTEXT));
     }
     return 0;
@@ -1927 +1930 @@
       CheckPmDrgLimit(cnd.pDragInfo);
       if (li) {
-        if (!li->list[1] && !IsFile(li->list[0])) {
-          ret = saymsg(MB_YESNO,
+        if (!li->list[1] && !IsFile(li->list[0])) {
+          ret = saymsg(MB_YESNO,
                    HWND_DESKTOP,
-                       NullStr,
-                       GetPString(IDS_DROPSETSTARGET));
-          if (ret == MBID_YES) {
-            SetTargetDir(hwnd, TRUE, li->list[0]);
-            break;
-          }
-        }
+                       NullStr,
+                       GetPString(IDS_DROPSETSTARGET));
+          if (ret == MBID_YES) {
+            SetTargetDir(hwnd, TRUE, li->list[0]);
+            break;
+          }
+        }
         strcpy(li->targetpath, targetdir);
         strcat(li->targetpath, PCSZ_BACKSLASH);
@@ -2054 +2057 @@
           FreeListInfo(li);
         else
-          WinSendMsg(hwndTree, UM_ACTION, MPFROMP(li), MPFROMLONG(action));
+          WinSendMsg(hwndTree, UM_ACTION, MPFROMP(li), MPFROMLONG(action));
     }
     else {
@@ -2072 +2075 @@
       CheckPmDrgLimit(cnd.pDragInfo);
       if (li && !li->list[1] && !IsFile(li->list[0]))
-        SetTargetDir(hwnd, TRUE, li->list[0]);
+        SetTargetDir(hwnd, TRUE, li->list[0]);
       else
-        saymsg(MB_ENTER | MB_ICONASTERISK, hwnd,
+        saymsg(MB_ENTER | MB_ICONASTERISK, hwnd,
                GetPString(IDS_WARNINGTEXT),
                GetPString(IDS_NOTARGETSET));
@@ -2092 +2095 @@
 
   case WM_COMMAND:
-    DosWaitEventSem(hevTreeCnrScanComplete, SEM_INDEFINITE_WAIT);
+    rc = DosWaitEventSem(hevTreeCnrScanComplete, SEM_INDEFINITE_WAIT);
+    if (rc)
+      Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosWaitEventSem");
+
     switch(SHORT1FROMMP(mp1)) {
     case IDM_RESCAN:
@@ -2123 +2129 @@
       {
         CHAR dv[4];
-
         *dv = SHORT1FROMMP(mp1) - IDM_DRIVEA + 'A';
-        strcpy(dv + 1, ":\\");
+        dv[1] = ':';
+        dv[2] = '\\';
+        dv[3] = 0;
         if (isalpha(*dv)) {
-
-          HWND hwndActive;
-
-          dv[1] = ':';
-          dv[2] = '\\';
-          dv[3] = 0;
-          hwndActive = TopWindow(hwnd, (HWND) 0);
+          HWND hwndActive = TopWindow(hwnd, (HWND) 0);
           if (hwndActive)
             WinSendMsg(WinWindowFromID(hwndActive, FID_CLIENT),
@@ -3890 +3891 @@
               WinSetWindowUShort(hwndChild,
                                  QWS_XRESTORE,
-                                 (USHORT) ((USHORT) ulWidth * (USHORT) ulCurCol)
-                                 + (USHORT) Rectl.xLeft);
+                                 (USHORT) ((USHORT) ulWidth * (USHORT) ulCurCol)
+                                 + (USHORT) Rectl.xLeft);
               WinSetWindowUShort(hwndChild,
                                  QWS_YRESTORE,
@@ -4819 +4820 @@
             cmp->size = sizeof(COMPARE);
             strcpy(cmp->leftdir, wa.szCurrentPath1);
-            strcpy(cmp->rightdir, wa.szCurrentPath2);
-            cmp->listfile = wa.listfile;
-            cmp->includesubdirs = wa.includesubdirs;
+            strcpy(cmp->rightdir, wa.szCurrentPath2);
+            cmp->listfile = wa.listfile;
+            cmp->includesubdirs = wa.includesubdirs;
             cmp->hwndParent = hwnd;
             cmp->dcd.hwndParent = hwnd;
@@ -6030 +6031 @@
     if (!fNoSaveState && fSaveState) {
       PCSZ pszStatename = PCSZ_SHUTDOWNSTATE;
-      PostMsg(MainObjectHwnd, UM_RESTORE, MPFROMP(pszStatename), MPVOID);
+      PostMsg(MainObjectHwnd, UM_RESTORE, MPFROMP(pszStatename), MPFROMLONG(RESTORE_STATE_RESTORE));
       if (!add_setup(pszStatename))
         save_setups();
@@ -6272 +6273 @@
       info = cmdhead;
       while (info) {
-        sprintf(s, "%s    {%i}", info->title, info->ID);
+        sprintf(s, "%s    {%i}", info->title, info->ID);
         WinSendMsg(hwndCmdlist, LM_INSERTITEM,
                    MPFROM2SHORT(LIT_END, 0), MPFROMP(s));
@@ -6546 +6547 @@
             }
             else if (SHORT1FROMMP(mp1) == MAIN_SETUPLIST) {
+              // State name list
               CHAR szKey[80];
               ULONG numsaves = 0;
               ULONG size = sizeof(ULONG);
-              // 06 Oct 09 SHL Ctrl-select selects, but suppresses open
+              // Ctrl-select selects, but suppresses open
                 if ((shiftstate & (KC_CTRL | KC_SHIFT | KC_ALT)) == KC_CTRL)
                   break;
@@ -6559 +6561 @@
                                        &size))
               {
+                // Name not found
                 if ((WinGetLastError(WinQueryAnchorBlock(hwnd)) & 0xffff) == PMERR_NOT_IN_IDX) {
                   saymsg(MB_ENTER | MB_ICONASTERISK, hwnd,
@@ -6570 +6573 @@
               }
               else {
+                // Name exists
                 char *pszStateName;
+                // If shift key, add state to existing state - FIXME to doc better
                 if ((shiftstate & KC_SHIFT) == 0)
-                  PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2));
+                  PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(RESTORE_STATE_CLOSE_CHILDREN));
                 pszStateName = xstrdup(path, pszSrcFile, __LINE__);
                 if (!pszStateName) {
@@ -6584 +6589 @@
                   }
                 }
+                // Request restore
                 else if (!PostMsg(MainObjectHwnd,
                                   UM_RESTORE,
@@ -6591 +6597 @@
                 }
               }
-            }
+            } // if MAIN_SETUPLIST
             else if (SHORT1FROMMP(mp1) == MAIN_CMDLIST) {
 
@@ -6602 +6608 @@
 
                 WinSendMsg(hwndCmdlist, LM_QUERYITEMTEXT,
-                           MPFROM2SHORT(sSelect, CCHMAXPATH), MPFROMP(s));
+                           MPFROM2SHORT(sSelect, CCHMAXPATH), MPFROMP(s));
                 p = strrchr(s, '}');
                 p = 0;
@@ -6609 +6615 @@
                 WinPostMsg(hwnd,
                            WM_COMMAND,
-                           MPFROM2SHORT(atol(p), 0), //fixme GKY this traps in atol the {} probably don't exist
-                           //IDM_COMMANDSTART + sSelect, 0),
+                           MPFROM2SHORT(atol(p), 0), //fixme GKY this traps in atol the {} probably don't exist
+                           //IDM_COMMANDSTART + sSelect, 0),
                            MPVOID);
               }
@@ -6657 +6663 @@
     }
     DosSleep(1);
-    return 0;           // Suppress WinDefWindowProc WM_QUIT message generation
+    DbgMsg(pszSrcFile, __LINE__, "MainWndProc WM_CLOSE returning");
+
+    return 0;           // Suppress WinDefWindowProc WM_QUIT message generation
 
   case UM_CLOSE:
@@ -6669 +6677 @@
       char *pszDefaultStateName = xstrdup(PCSZ_SHUTDOWNSTATE, pszSrcFile, __LINE__);
       if (pszDefaultStateName) {
-        if (!PostMsg(MainObjectHwnd, UM_RESTORE, MPFROMP(pszDefaultStateName), MPVOID))
+        if (!PostMsg(MainObjectHwnd, UM_RESTORE, MPFROMP(pszDefaultStateName), MPFROMLONG(RESTORE_STATE_RESTORE)))
           // 05 Feb 08 SHL fixme to complain?
           free(pszDefaultStateName);
@@ -6685 +6693 @@
 
   case WM_DESTROY:
-#   ifdef FORTIFY
-    DbgMsg(pszSrcFile, __LINE__, "WM_DESTROY hwnd %p TID %u", hwnd, GetTidForThread()); // 22 Jul 08 SHL fixme
-#   endif
-    hwndMain = (HWND) 0;
-    if (!PostMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID))
-      WinSendMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID);
+    hwndMain = (HWND)0;
+    if (!PostMsg((HWND)0, WM_QUIT, MPVOID, MPVOID))
+      WinSendMsg((HWND)0, WM_QUIT, MPVOID, MPVOID);
 #   ifdef FORTIFY
     free_commands();