Changeset 1844

Timestamp:

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

Author:

Steven Levine

Message:

Add RESTORE_STATE_... definitions and use

Location:

trunk/dll

Files:

• fm3dll.h (modified) (3 diffs)
• mainwnd.c (modified) (26 diffs)
• notebook.c (modified) (15 diffs)

trunk/dll/fm3dll.h

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2008 Steven H. Levine
+  Copyright (c) 2001, 2015 Steven H. Levine
 
   12 Feb 03 SHL Add CBLIST_TO_EASIZE
@@ -94 +94 @@
                 and rescans drive in tree container depending on container focus, greyed out
                 inappropriate menu context choices
+  09 Aug 15 SHL Add RESTORE_STATE_...
 
 ***********************************************************************/
@@ -198 +199 @@
 #define SysVal(value)       WinQuerySysValue(HWND_DESKTOP, (value))
 
+// 2015-08-09 SHL See MainObjectWndProc UM_RESTORE
+#define RESTORE_STATE_RESTORE           0
+#define RESTORE_STATE_TILE_CHILDREN     1
+#define RESTORE_STATE_CLOSE_CHILDREN    2
+
+
 
 #endif // FM3DLL_H

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();

trunk/dll/notebook.c

@@ -52 +52 @@
   15 Nov 09 GKY Change rescan following label/type change to WinSendMsg to avoid trap on SMP
   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
   13 Dec 09 GKY Updated Quick page "Default" to match current defaults; added Gregg's way
-                option to Quick page.
+                option to Quick page.
   17 Jan 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR
-                CONSTANT * as CHAR *.
+                CONSTANT * as CHAR *.
   24 Oct 10 GKY Fixed spurious error message when labels in tree are changed with a
-                "not ready" drive selected
+                "not ready" drive selected
   04 Aug 12 GKY Changes to allow copy and move over readonly files with a warning dialog; also added a warning dialog
-                for delete of readonly files
+                for delete of readonly files
   09 Feb 14 GKY Fix separate parameters. Moved to general page renamed separate settings
-                for apps.
+                for apps.
   25 May 15 GKY Auto open help only on first access of quick setting page during a session.
+  09 Aug 15 SHL Use RESTORE_STATE_...
 
 ***********************************************************************/
@@ -297 +298 @@
                          SBoxDlgProc, FM3ModHandle, ASEL_FRAME,
                          (PVOID) & pat) || !pat || !pat->id || !*pat->id) {
-            if (!fAlertBeepOff)
+            if (!fAlertBeepOff)
               DosBeep(250, 100);          // Complain
             WinCheckButton(hwnd, CFGA_DEFARC, FALSE);
@@ -372 +373 @@
     fQuickArcFind = WinQueryButtonCheckstate(hwnd, CFGA_QUICKARCFIND);
     PrfWriteProfileData(fmprof, appname, "QuickArcFind",
-                        &fQuickArcFind, sizeof(BOOL));
+                        &fQuickArcFind, sizeof(BOOL));
     fArcStuffVisible = WinQueryButtonCheckstate(hwnd, CFGA_ARCSTUFFVISIBLE);
     PrfWriteProfileData(fmprof, appname, "ArcStuffVisible",
-                        &fArcStuffVisible, sizeof(BOOL));
+                        &fArcStuffVisible, sizeof(BOOL));
     fFileNameCnrPath = WinQueryButtonCheckstate(hwnd, CFGA_FILENAMEPATH);
     PrfWriteProfileData(fmprof, appname, "FileNamePathCnr", &fFileNameCnrPath, sizeof(BOOL));
@@ -1435 +1436 @@
 
       if ((fShowFSTypeInTree != WinQueryButtonCheckstate(hwnd, CFGT_SYSTYPE)) ||
-          (fShowDriveLabelInTree != WinQueryButtonCheckstate(hwnd, CFGT_LABEL)))
-        fShowSysTypeLabelChanged = TRUE;
+          (fShowDriveLabelInTree != WinQueryButtonCheckstate(hwnd, CFGT_LABEL)))
+        fShowSysTypeLabelChanged = TRUE;
       fShowFSTypeInTree = WinQueryButtonCheckstate(hwnd, CFGT_SYSTYPE);
       fShowDriveLabelInTree = WinQueryButtonCheckstate(hwnd, CFGT_LABEL);
@@ -1442 +1443 @@
       PrfWriteProfileData(fmprof, appname, "ShowDriveOnly", &fShowDriveOnly, sizeof(BOOL));
       PrfWriteProfileData(fmprof, appname, "ShowFSTypeInTree",
-                          &fShowFSTypeInTree, sizeof(BOOL));
+                          &fShowFSTypeInTree, sizeof(BOOL));
       PrfWriteProfileData(fmprof,       appname, "ShowDriveLabelInTree",
-                          &fShowDriveLabelInTree, sizeof(BOOL));
+                          &fShowDriveLabelInTree, sizeof(BOOL));
       fVTreeOpensWPS = WinQueryButtonCheckstate(hwnd, CFGT_VTREEOPENSWPS);
       PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "VTreeOpensWPS", &fVTreeOpensWPS,
-                          sizeof(BOOL));
+                          sizeof(BOOL));
       fCollapseFirst = WinQueryButtonCheckstate(hwnd, CFGT_COLLAPSEFIRST);
       PrfWriteProfileData(fmprof, appname, "CollapseFirst", &fCollapseFirst,
-                          sizeof(BOOL));
+                          sizeof(BOOL));
       fSwitchTreeOnFocus = WinQueryButtonCheckstate(hwnd,
-                                                    CFGT_SWITCHTREEONFOCUS);
+                                                    CFGT_SWITCHTREEONFOCUS);
       PrfWriteProfileData(fmprof, appname, "SwitchTreeOnFocus",
-                          &fSwitchTreeOnFocus, sizeof(BOOL));
+                          &fSwitchTreeOnFocus, sizeof(BOOL));
       fSwitchTreeExpand = WinQueryButtonCheckstate(hwnd, CFGT_SWITCHTREEEXPAND);
       PrfWriteProfileData(fmprof, appname, "SwitchTreeExpand",
-                          &fSwitchTreeExpand, sizeof(BOOL));
+                          &fSwitchTreeExpand, sizeof(BOOL));
       fSwitchTreeOnDirChg = WinQueryButtonCheckstate(hwnd, CFGT_SWITCHTREEONDIRCHG);
       PrfWriteProfileData(fmprof, appname, "SwitchTree", &fSwitchTreeOnDirChg,
-                          sizeof(BOOL));
+                          sizeof(BOOL));
       fFollowTree = WinQueryButtonCheckstate(hwnd, CFGT_FOLLOWTREE);
       PrfWriteProfileData(fmprof, appname, "FollowTree", &fFollowTree,
-                          sizeof(BOOL));
+                          sizeof(BOOL));
       fTopDir = WinQueryButtonCheckstate(hwnd, CFGT_TOPDIR);
       PrfWriteProfileData(fmprof, appname, "TopDir", (PVOID) & fTopDir,
-                          sizeof(BOOL));
+                          sizeof(BOOL));
       fDCOpens = WinQueryButtonCheckstate(hwnd, CFGT_DCOPENS);
       PrfWriteProfileData(fmprof, appname, "DoubleClickOpens", &fDCOpens,
-                          sizeof(BOOL));
+                          sizeof(BOOL));
       fShowEnvChanged = (fShowEnv != WinQueryButtonCheckstate(hwnd, CFGT_SHOWENV));
       fShowEnv = WinQueryButtonCheckstate(hwnd, CFGT_SHOWENV);
       PrfWriteProfileData(fmprof, appname, "ShowEnv", &fShowEnv, sizeof(BOOL));
       {
-        char * pszTemp = xmalloc(WinQueryDlgItemTextLength(hwnd, CFGT_ENVVARLIST) + 1,
-                                 pszSrcFile, __LINE__);
-        if (pszTemp) {
-          WinQueryDlgItemText(hwnd, CFGT_ENVVARLIST, MaxComLineStrg, pszTemp);
-          strupr(pszTemp);
-          if (strcmp(pszTemp, pszTreeEnvVarList)) {
-            fTreeEnvVarListChanged = TRUE;
-            strcpy(pszTreeEnvVarList, pszTemp);
-            PrfWriteProfileString(fmprof, appname, "TreeEnvVarList", pszTreeEnvVarList);
-          }
-          free(pszTemp);
-        }
-        if (hwndTree && (fShowEnvChanged || (fShowEnv && fTreeEnvVarListChanged) ||
-                         fShowSysTypeLabelChanged)) {
-          PCNRITEM pci = WinSendMsg(WinWindowFromID
-                                    (WinWindowFromID(hwndTree, FID_CLIENT),
-                                    TREE_CNR), CM_QUERYRECORDEMPHASIS,
-                                    MPFROMLONG(CMA_FIRST),
-                                    MPFROMSHORT(CRA_SELECTED));
-          WinSendMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
-          if (strlen(pci->pszFileName) > 3 &&  fSwitchTreeExpand) {
-            pszTemp = xstrdup(pci->pszFileName, pszSrcFile, __LINE__);
-            if (pszTemp) {
-              if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTemp), MPVOID))
-                free(pszTemp);
-              //pszTemp is freed in the UM_SHOWME code
-            }
-          }
-        }
+        char * pszTemp = xmalloc(WinQueryDlgItemTextLength(hwnd, CFGT_ENVVARLIST) + 1,
+                                 pszSrcFile, __LINE__);
+        if (pszTemp) {
+          WinQueryDlgItemText(hwnd, CFGT_ENVVARLIST, MaxComLineStrg, pszTemp);
+          strupr(pszTemp);
+          if (strcmp(pszTemp, pszTreeEnvVarList)) {
+            fTreeEnvVarListChanged = TRUE;
+            strcpy(pszTreeEnvVarList, pszTemp);
+            PrfWriteProfileString(fmprof, appname, "TreeEnvVarList", pszTreeEnvVarList);
+          }
+          free(pszTemp);
+        }
+        if (hwndTree && (fShowEnvChanged || (fShowEnv && fTreeEnvVarListChanged) ||
+                         fShowSysTypeLabelChanged)) {
+          PCNRITEM pci = WinSendMsg(WinWindowFromID
+                                    (WinWindowFromID(hwndTree, FID_CLIENT),
+                                    TREE_CNR), CM_QUERYRECORDEMPHASIS,
+                                    MPFROMLONG(CMA_FIRST),
+                                    MPFROMSHORT(CRA_SELECTED));
+          WinSendMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
+          if (strlen(pci->pszFileName) > 3 &&  fSwitchTreeExpand) {
+            pszTemp = xstrdup(pci->pszFileName, pszSrcFile, __LINE__);
+            if (pszTemp) {
+              if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTemp), MPVOID))
+                free(pszTemp);
+              //pszTemp is freed in the UM_SHOWME code
+            }
+          }
+        }
       }
       break;
@@ -1624 +1625 @@
       dummy = WinQueryButtonCheckstate(hwnd, CFGG_APPSEPARATESETTINGS);
       if (dummy != fAppSeparateSettings) {
-        fAppSeparateSettings =  dummy;
-        PrfWriteProfileData(fmprof, realappname, "SeparateParms",
+        fAppSeparateSettings =  dummy;
+        PrfWriteProfileData(fmprof, realappname, "SeparateParms",
                         &fAppSeparateSettings, sizeof(BOOL));
         WinSendMsg((HWND) WinQueryWindowULong(hwnd, QWL_USER),
-                   UM_UNDO, MPVOID, MPVOID);
-        if (fAppSeparateSettings)
-          strcpy(appname, realappname);
-        else
-          strcpy(appname, FM3Str);
+                   UM_UNDO, MPVOID, MPVOID);
+        if (fAppSeparateSettings)
+          strcpy(appname, realappname);
+        else
+          strcpy(appname, FM3Str);
       }
 
@@ -1691 +1692 @@
     fConfirmTarget = WinQueryButtonCheckstate(hwnd, CFGG_CONFIRMTARGET);
     PrfWriteProfileData(fmprof, appname, "ConfirmTarget",
-                        &fConfirmTarget, sizeof(BOOL));
+                        &fConfirmTarget, sizeof(BOOL));
     fAlertBeepOff = WinQueryButtonCheckstate(hwnd, CFGG_ALERTBEEPOFF);
     PrfWriteProfileData(fmprof, appname, "AlertBeepOff",
-                        &fAlertBeepOff, sizeof(BOOL));
+                        &fAlertBeepOff, sizeof(BOOL));
     fErrorBeepOff = WinQueryButtonCheckstate(hwnd, CFGG_ERRORBEEPOFF);
     PrfWriteProfileData(fmprof, appname, "ErrorBeepOff",
-                        &fErrorBeepOff, sizeof(BOOL));
+                        &fErrorBeepOff, sizeof(BOOL));
     fWarnReadOnly = WinQueryButtonCheckstate(hwnd, CFGG_WARNREADONLY);
     PrfWriteProfileData(fmprof, appname, "WarnReadOnly",
-                        &fWarnReadOnly, sizeof(BOOL));
+                        &fWarnReadOnly, sizeof(BOOL));
     {
       WinSendDlgItemMsg(hwnd, CFGG_CMDLNLNGTH, SPBM_QUERYVALUE,
@@ -1976 +1977 @@
           // Save state and restore to refresh windows with new settings
           if (SaveDirCnrState(hwndMain, PCSZ_FM2TEMPTEXT) > 0) {
-            PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2));
+            PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(RESTORE_STATE_CLOSE_CHILDREN));
 //          PostMsg(hwndMain, UM_RESTORE, MPVOID, MPVOID);
-            PostMsg(MainObjectHwnd, UM_RESTORE, (PSZ) PCSZ_FM2TEMPTEXT, MPVOID);
+            PostMsg(MainObjectHwnd, UM_RESTORE, (PSZ) PCSZ_FM2TEMPTEXT, MPFROMLONG(RESTORE_STATE_RESTORE));
           }
         }
@@ -3077 +3078 @@
                             "CollectorflWindowAttr",
                             &flWindowAttr, sizeof(ULONG));
-        //This is set to maximize the info seen in the container GKY
-        PrfWriteProfileData(fmprof,
+        //This is set to maximize the info seen in the container GKY
+        PrfWriteProfileData(fmprof,
                             appname,
                             "Collector.Fontnamesize",
@@ -3404 +3405 @@
                           (WinQuerySysValue(HWND_DESKTOP, SV_CYICON) * 2),
                           SWP_MOVE | SWP_SIZE);
-        }
-        if (!fToolbar) {
+        }
+        if (!fToolbar) {
           WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_TOOLBAR, 0), MPVOID);
-          fToolbar = TRUE;
-        }
-        if (!fDrivebar) {
+                     MPFROM2SHORT(IDM_TOOLBAR, 0), MPVOID);
+          fToolbar = TRUE;
+        }
+        if (!fDrivebar) {
           WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_DRIVEBAR, 0), MPVOID);
-          fDrivebar = TRUE;
-        }
-        if (!fMoreButtons) {
+                     MPFROM2SHORT(IDM_DRIVEBAR, 0), MPVOID);
+          fDrivebar = TRUE;
+        }
+        if (!fMoreButtons) {
           WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_MOREBUTTONS, 0),
-                     MPVOID);
-          fMoreButtons = TRUE;
-        }
-        if (!fUserComboBox) {
+                     MPVOID);
+          fMoreButtons = TRUE;
+        }
+        if (!fUserComboBox) {
           WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_USERLIST, 0), MPVOID);
-          fUserComboBox = TRUE;
-        }
+                     MPFROM2SHORT(IDM_USERLIST, 0), MPVOID);
+          fUserComboBox = TRUE;
+        }
       }
       if (hwndTree) {
@@ -3506 +3507 @@
           }
         }
-        PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2L));
+        PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(RESTORE_STATE_CLOSE_CHILDREN));
         PostMsg(MainObjectHwnd, UM_SETDIR, MPFROMLONG(1L), MPVOID);
       }
@@ -3606 +3607 @@
           }
         }
-        PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2L));
+        PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(RESTORE_STATE_CLOSE_CHILDREN));
         PostMsg(MainObjectHwnd, UM_SETDIR, MPVOID, MPVOID);
       }
@@ -3720 +3721 @@
                           (WinQuerySysValue(HWND_DESKTOP, SV_CYICON) * 2),
                           SWP_MOVE | SWP_SIZE);
-        }
-        if (!fToolbar) {
+        }
+        if (!fToolbar) {
           WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_TOOLBAR, 0), MPVOID);
-          fToolbar = TRUE;
-        }
-        if (!fDrivebar) {
+                     MPFROM2SHORT(IDM_TOOLBAR, 0), MPVOID);
+          fToolbar = TRUE;
+        }
+        if (!fDrivebar) {
           WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_DRIVEBAR, 0), MPVOID);
-          fDrivebar = TRUE;
-        }
-        if (!fMoreButtons) {
+                     MPFROM2SHORT(IDM_DRIVEBAR, 0), MPVOID);
+          fDrivebar = TRUE;
+        }
+        if (!fMoreButtons) {
           WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_MOREBUTTONS, 0),
-                     MPVOID);
-          fMoreButtons = TRUE;
-        }
-        if (!fUserComboBox) {
+                     MPVOID);
+          fMoreButtons = TRUE;
+        }
+        if (!fUserComboBox) {
           WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_USERLIST, 0), MPVOID);
-          fUserComboBox = TRUE;
-        }
+                     MPFROM2SHORT(IDM_USERLIST, 0), MPVOID);
+          fUserComboBox = TRUE;
+        }
       }
       if (hwndTree) {
@@ -3777 +3778 @@
       if (SaveDirCnrState(hwndMain, PCSZ_FM2TEMPTEXT) > 0) {
         // Tell window procedure to close container windows
-        PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2));
+        PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(RESTORE_STATE_CLOSE_CHILDREN));
         // Restore saved state
-        PostMsg(MainObjectHwnd, UM_RESTORE, (PSZ) PCSZ_FM2TEMPTEXT, MPVOID);
+        PostMsg(MainObjectHwnd, UM_RESTORE, (PSZ) PCSZ_FM2TEMPTEXT, MPFROMLONG(RESTORE_STATE_RESTORE));
       }
     }
@@ -3951 +3952 @@
       PostMsg(hwnd, UM_FOCUSME, MPFROMLONG(np[x].hwnd), MPVOID);
       if (!fShowedHelpThisSession) {
-        PostMsg(np[x].hwnd, WM_COMMAND, MPFROM2SHORT(IDM_HELP, 0), MPVOID);
-        fShowedHelpThisSession = TRUE;
+        PostMsg(np[x].hwnd, WM_COMMAND, MPFROM2SHORT(IDM_HELP, 0), MPVOID);
+        fShowedHelpThisSession = TRUE;
       }
     }