Changeset 1394 for trunk/dll/notebook.c

Timestamp:

Feb 5, 2009, 5:17:25 AM (17 years ago)

Author:

Steven Levine

Message:

Ticket 340: Convert GetPString to use STRINGTABLE.

Drop fm3dll.str and mkstr.exe from makefiles and wpi builders

Convert many functions to expect PCSZ arguments.
Correct walk, compare and dirsizes dialog setups to ignore saved dialog size
Drop copyright.c logic from makefile

File:

• trunk/dll/notebook.c (modified) (126 diffs)

trunk/dll/notebook.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2004, 2008 Steven H. Levine
+  Copyright (c) 2004, 2009 Steven H. Levine
 
   01 Aug 04 SHL Rework lstrip/rstrip usage
@@ -31 +31 @@
   29 Feb 08 GKY Changes to enable user settable command line length
   08 Mar 08 JBS Ticket 230: Replace prefixless INI keys for default directory containers with
-                keys using a "DirCnr." prefix
+                keys using a "DirCnr." prefix
   06 Jul 08 GKY Update delete/undelete to include move to and open XWP trashcan
   11 Jul 08 JBS Ticket 230: Simplified code and eliminated some local variables by incorporating
-                all the details view settings (both the global variables and those in the
-                DIRCNRDATA struct) into a new struct: DETAILS_SETTINGS.
+                all the details view settings (both the global variables and those in the
+                DIRCNRDATA struct) into a new struct: DETAILS_SETTINGS.
   19 Jul 08 JBS Ticket 197: Support accelerator keys in setting dialogs.
   20 Jul 08 JBS Ticket 114: Support user-selectable env. strings in Tree container.
@@ -41 +41 @@
   02 Aug 08 JBS Ticket 114: Improved code to avoid traps.
   30 Nov 08 GKY Add the option of creating a subdirectory from the arcname
-                for the extract path to arc container.
+                for the extract path to arc container.
   25 Dec 08 GKY Add ProcessDirectoryThread to allow optional recursive drive scan at startup.
   01 Jan 09 GKY Add option to rescan tree container on eject of removable media
@@ -202 +202 @@
   case WM_INITDLG:
     WinSendDlgItemMsg(hwnd, CFGA_VIRUS, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGA_EXTRACTPATH, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     WinEnableWindow(WinWindowFromID(hwnd, CFGA_FIND), FALSE);
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
@@ -216 +216 @@
     if (CHARMSG(&msg)->fs & KC_VIRTUALKEY) {
       switch (CHARMSG(&msg)->vkey) {
-        case VK_F3:
-        case VK_ENTER:
-        case VK_NEWLINE:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
-          return 0;
-          break;
-        case VK_ESC:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
-          return 0;
-          break;
-        case VK_F1:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
-          return 0;
-          break;
+        case VK_F3:
+        case VK_ENTER:
+        case VK_NEWLINE:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
+          return 0;
+          break;
+        case VK_ESC:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
+          return 0;
+          break;
+        case VK_F1:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
+          return 0;
+          break;
       }
     }
@@ -251 +251 @@
       switch (SHORT2FROMMP(mp1)) {
       case EN_KILLFOCUS:
-        WinEnableWindow(WinWindowFromID(hwnd, CFGA_FIND), FALSE);
-        break;
+        WinEnableWindow(WinWindowFromID(hwnd, CFGA_FIND), FALSE);
+        break;
       case EN_SETFOCUS:
-        WinEnableWindow(WinWindowFromID(hwnd, CFGA_FIND), TRUE);
-        break;
+        WinEnableWindow(WinWindowFromID(hwnd, CFGA_FIND), TRUE);
+        break;
       }
       break;
@@ -261 +261 @@
       switch (SHORT2FROMMP(mp1)) {
       case BN_CLICKED:
-        if (WinQueryButtonCheckstate(hwnd, CFGA_DEFARC)) {
-
-          ARC_TYPE *pat = arcsighead;   // Hide dups
-
-          if (!WinDlgBox(HWND_DESKTOP, hwnd,
-                         SBoxDlgProc, FM3ModHandle, ASEL_FRAME,
-                         (PVOID) & pat) || !pat || !pat->id || !*pat->id) {
-            DosBeep(250, 100);          // Complain
-            WinCheckButton(hwnd, CFGA_DEFARC, FALSE);
-          }
-          else
-            WinSetDlgItemText(hwnd, CFGA_DEFARCNAME, pat->id);
-        }
-        break;
+        if (WinQueryButtonCheckstate(hwnd, CFGA_DEFARC)) {
+
+          ARC_TYPE *pat = arcsighead;   // Hide dups
+
+          if (!WinDlgBox(HWND_DESKTOP, hwnd,
+                         SBoxDlgProc, FM3ModHandle, ASEL_FRAME,
+                         (PVOID) & pat) || !pat || !pat->id || !*pat->id) {
+            DosBeep(250, 100);          // Complain
+            WinCheckButton(hwnd, CFGA_DEFARC, FALSE);
+          }
+          else
+            WinSetDlgItemText(hwnd, CFGA_DEFARCNAME, pat->id);
+        }
+        break;
       default:
-        break;
+        break;
       }
       break;
@@ -300 +300 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFGA, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFGA, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
 
     case CFGA_FIND:
       {
-        CHAR filename[CCHMAXPATH + 9], szfilename[CCHMAXPATH + 9];
-        USHORT id;
-        HWND hwndFocus;
-
-        strcpy(filename, "*.EXE");
-        hwndFocus = WinQueryFocus(HWND_DESKTOP);
-        if (hwndFocus) {
-          id = WinQueryWindowUShort(hwndFocus, QWS_ID);
-          switch (id) {
-          case CFGA_VIRUS:
-            if (insert_filename(hwnd, filename, 2, FALSE) && *filename) {
-              BldQuotedFileName(szfilename, filename);
-              strcat(szfilename, " %p");
-              WinSetDlgItemText(hwnd, id, szfilename);
-            }
-            break;
-          case CFGA_EXTRACTPATH:
-            strcpy(filename, extractpath);
-            if (WinDlgBox(HWND_DESKTOP, hwndNotebook,
-                          WalkExtractDlgProc, FM3ModHandle, WALK_FRAME,
-                          MPFROMP(filename)) && *filename)
-              WinSetDlgItemText(hwnd, id, filename);
-            break;
-          default:
-            Runtime_Error(pszSrcFile, __LINE__, "bad case");
-            break;
-          }
-        }
+        CHAR filename[CCHMAXPATH + 9], szfilename[CCHMAXPATH + 9];
+        USHORT id;
+        HWND hwndFocus;
+
+        strcpy(filename, "*.EXE");
+        hwndFocus = WinQueryFocus(HWND_DESKTOP);
+        if (hwndFocus) {
+          id = WinQueryWindowUShort(hwndFocus, QWS_ID);
+          switch (id) {
+          case CFGA_VIRUS:
+            if (insert_filename(hwnd, filename, 2, FALSE) && *filename) {
+              BldQuotedFileName(szfilename, filename);
+              strcat(szfilename, " %p");
+              WinSetDlgItemText(hwnd, id, szfilename);
+            }
+            break;
+          case CFGA_EXTRACTPATH:
+            strcpy(filename, extractpath);
+            if (WinDlgBox(HWND_DESKTOP, hwndNotebook,
+                          WalkExtractDlgProc, FM3ModHandle, WALK_FRAME,
+                          MPFROMP(filename)) && *filename)
+              WinSetDlgItemText(hwnd, id, filename);
+            break;
+          default:
+            Runtime_Error(pszSrcFile, __LINE__, "bad case");
+            break;
+          }
+        }
       }
       break;
@@ -342 +342 @@
     fQuickArcFind = WinQueryButtonCheckstate(hwnd, CFGA_QUICKARCFIND);
     PrfWriteProfileData(fmprof,
-                        appname,
-                        "QuickArcFind", &fQuickArcFind, sizeof(BOOL));
+                        appname,
+                        "QuickArcFind", &fQuickArcFind, sizeof(BOOL));
     fArcStuffVisible = WinQueryButtonCheckstate(hwnd, CFGA_ARCSTUFFVISIBLE);
     PrfWriteProfileData(fmprof,
-                        appname,
-                        "ArcStuffVisible", &fArcStuffVisible, sizeof(BOOL));
+                        appname,
+                        "ArcStuffVisible", &fArcStuffVisible, sizeof(BOOL));
     fFileNameCnrPath = WinQueryButtonCheckstate(hwnd, CFGA_FILENAMEPATH);
     PrfWriteProfileData(fmprof,
-                        appname,
-                        "FileNamePathCnr", &fFileNameCnrPath, sizeof(BOOL));
+                        appname,
+                        "FileNamePathCnr", &fFileNameCnrPath, sizeof(BOOL));
     fFolderAfterExtract = WinQueryButtonCheckstate(hwnd,
-                                                   CFGA_FOLDERAFTEREXTRACT);
+                                                   CFGA_FOLDERAFTEREXTRACT);
     PrfWriteProfileData(fmprof,
-                        appname,
-                        "FolderAfterExtract",
-                        &fFolderAfterExtract, sizeof(BOOL));
+                        appname,
+                        "FolderAfterExtract",
+                        &fFolderAfterExtract, sizeof(BOOL));
     if (WinQueryButtonCheckstate(hwnd, CFGA_DEFARC)) {
 
@@ -375 +375 @@
 
       szCLBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
-        if (!szCLBuf)
-          return 0; //already complained
+        if (!szCLBuf)
+          return 0; //already complained
       pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
       if (!pszWorkBuf) {
-        free(szCLBuf);
-        return 0; //already complained
+        free(szCLBuf);
+        return 0; //already complained
       }
       WinQueryDlgItemText(hwnd, CFGA_VIRUS, MaxComLineStrg, szCLBuf);
       szCLBuf[MaxComLineStrg - 1] = 0;
       if (strcmp(szCLBuf, virus)){
-        NormalizeCmdLine(pszWorkBuf, szCLBuf);
-        memcpy(virus, pszWorkBuf, strlen(pszWorkBuf) + 1);
-        if (!strchr(virus, '%') && strlen(virus) > 3)
-          strcat(virus, " %p");
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(virus, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        if (!strchr(virus, '%') && strlen(virus) > 3)
+          strcat(virus, " %p");
       }
       free(pszWorkBuf);
       free(szCLBuf);
       if (!*virus)
-        strcpy(virus, "OS2SCAN.EXE %p /SUB /A");
+        strcpy(virus, "OS2SCAN.EXE %p /SUB /A");
       WinQueryDlgItemText(hwnd, CFGA_EXTRACTPATH, CCHMAXPATH, szPathBuf);
       szPathBuf[CCHMAXPATH - 1] = 0;
       bstrip(szPathBuf);
       if (strcmp(extractpath, szPathBuf)) {
-        memcpy(extractpath, szPathBuf, strlen(szPathBuf) + 1);
-        if (*extractpath){
-          MakeFullName(extractpath);
-          if (IsFile(extractpath)) {
-            ulResult = saymsg(MB_YESNOCANCEL | MB_ICONQUESTION | MB_DEFBUTTON1, HWND_DESKTOP,
-                              GetPString(IDS_WARNINGTEXT),
-                              GetPString(IDS_EXTPATHNOTVALIDTEXT),
-                              extractpath);
-            if (ulResult == MBID_YES)
-              *extractpath = 0;
-            if (ulResult == MBID_CANCEL){
-              WinDlgBox(HWND_DESKTOP,
-                        hwnd,
-                        CfgDlgProc,
-                        FM3ModHandle,
-                        CFG_FRAME,
-                        MPFROMLONG(IDM_ARCHIVERSETTINGS));
-              break;
-            }
-          }
-        }
+        memcpy(extractpath, szPathBuf, strlen(szPathBuf) + 1);
+        if (*extractpath){
+          MakeFullName(extractpath);
+          if (IsFile(extractpath)) {
+            ulResult = saymsg(MB_YESNOCANCEL | MB_ICONQUESTION | MB_DEFBUTTON1, HWND_DESKTOP,
+                              GetPString(IDS_WARNINGTEXT),
+                              GetPString(IDS_EXTPATHNOTVALIDTEXT),
+                              extractpath);
+            if (ulResult == MBID_YES)
+              *extractpath = 0;
+            if (ulResult == MBID_CANCEL){
+              WinDlgBox(HWND_DESKTOP,
+                        hwnd,
+                        CfgDlgProc,
+                        FM3ModHandle,
+                        CFG_FRAME,
+                        MPFROMLONG(IDM_ARCHIVERSETTINGS));
+              break;
+            }
+          }
+        }
       }
     }
@@ -428 +428 @@
     fCancelAction = FALSE;
     WinDlgBox(HWND_DESKTOP,
-              hwnd,
-              CfgDlgProc,
-              FM3ModHandle,
-              CFG_FRAME,
-              MPFROMLONG(IDM_ARCHIVERSETTINGS));
+              hwnd,
+              CfgDlgProc,
+              FM3ModHandle,
+              CFG_FRAME,
+              MPFROMLONG(IDM_ARCHIVERSETTINGS));
   }
   return WinDefDlgProc(hwnd, msg, mp1, mp2);
@@ -443 +443 @@
   case WM_INITDLG:
     WinSendDlgItemMsg(hwnd, CFGS_FILESTOGET, SPBM_SETTEXTLIMIT,
-                      MPFROMSHORT(8), MPVOID);
+                      MPFROMSHORT(8), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGS_FILESTOGET, SPBM_OVERRIDESETLIMITS,
-                      MPFROMLONG(FILESTOGET_MAX), MPFROMLONG(FILESTOGET_MIN));
+                      MPFROMLONG(FILESTOGET_MAX), MPFROMLONG(FILESTOGET_MIN));
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
     break;
@@ -456 +456 @@
     if (CHARMSG(&msg)->fs & KC_VIRTUALKEY) {
       switch (CHARMSG(&msg)->vkey) {
-        case VK_F3:
-        case VK_ENTER:
-        case VK_NEWLINE:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
-          return 0;
-          break;
-        case VK_ESC:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
-          return 0;
-          break;
-        case VK_F1:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
-          return 0;
-          break;
+        case VK_F3:
+        case VK_ENTER:
+        case VK_NEWLINE:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
+          return 0;
+          break;
+        case VK_ESC:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
+          return 0;
+          break;
+        case VK_F1:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
+          return 0;
+          break;
       }
     }
@@ -492 +492 @@
     WinCheckButton(hwnd, CFGS_EJECTFLPYSCAN, fEjectFlpyScan);
     WinSendDlgItemMsg(hwnd, CFGS_FILESTOGET, SPBM_SETCURRENTVALUE,
-                      MPFROMLONG(FilesToGet), MPVOID);
+                      MPFROMLONG(FilesToGet), MPVOID);
     return 0;
 
@@ -500 +500 @@
     case CFGS_FORCELOWER:
       {
-        BOOL temp;
-
-        temp = WinQueryButtonCheckstate(hwnd, SHORT1FROMMP(mp1));
-        if (temp) {
-          switch (SHORT1FROMMP(mp1)) {
-          case CFGS_FORCEUPPER:
-            WinCheckButton(hwnd, CFGS_FORCELOWER, FALSE);
-            break;
-          case CFGS_FORCELOWER:
-            WinCheckButton(hwnd, CFGS_FORCEUPPER, FALSE);
-            break;
-          }
-        }
+        BOOL temp;
+
+        temp = WinQueryButtonCheckstate(hwnd, SHORT1FROMMP(mp1));
+        if (temp) {
+          switch (SHORT1FROMMP(mp1)) {
+          case CFGS_FORCEUPPER:
+            WinCheckButton(hwnd, CFGS_FORCELOWER, FALSE);
+            break;
+          case CFGS_FORCELOWER:
+            WinCheckButton(hwnd, CFGS_FORCEUPPER, FALSE);
+            break;
+          }
+        }
       }
       break;
@@ -533 +533 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFGS, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFGS, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -542 +542 @@
     fLoadLongnames = WinQueryButtonCheckstate(hwnd, CFGS_LOADLONGNAMES);
     PrfWriteProfileData(fmprof, appname, "LoadLongname", &fLoadLongnames,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fLoadSubject = WinQueryButtonCheckstate(hwnd, CFGS_LOADSUBJECTS);
     PrfWriteProfileData(fmprof, appname, "LoadSubject", &fLoadSubject,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fRemoteBug = WinQueryButtonCheckstate(hwnd, CFGS_REMOTEBUG);
     PrfWriteProfileData(fmprof, appname, "RemoteBug", &fRemoteBug,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fRScanLocal = WinQueryButtonCheckstate(hwnd, CFGS_RSCANLOCAL);
     PrfWriteProfileData(fmprof, appname, "RScanLocal", &fRScanLocal,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fRScanRemote = WinQueryButtonCheckstate(hwnd, CFGS_RSCANREMOTE);
     PrfWriteProfileData(fmprof, appname, "RScanRemote", &fRScanRemote,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fRScanVirtual = WinQueryButtonCheckstate(hwnd, CFGS_RSCANVIRTUAL);
     PrfWriteProfileData(fmprof, appname, "RScanVirtual", &fRScanVirtual,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fRScanSlow = WinQueryButtonCheckstate(hwnd, CFGS_RSCANSLOW);
     PrfWriteProfileData(fmprof, appname, "RScanSlow", &fRScanSlow,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fRScanNoWrite = WinQueryButtonCheckstate(hwnd, CFGS_RSCANNOWRITE);
     PrfWriteProfileData(fmprof, appname, "RScanNoWrite", &fRScanNoWrite,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fNoRemovableScan = WinQueryButtonCheckstate(hwnd, CFGS_NOREMOVABLESCAN);
     PrfWriteProfileData(fmprof, appname, "NoRemovableScan", &fNoRemovableScan,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fEjectRemovableScan = WinQueryButtonCheckstate(hwnd, CFGS_EJECTREMOVABLESCAN);
     PrfWriteProfileData(fmprof, appname, "EjectRemovableScan", &fEjectRemovableScan,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fEjectCDScan = WinQueryButtonCheckstate(hwnd, CFGS_EJECTCDSCAN);
     PrfWriteProfileData(fmprof, appname, "EjectCDScan", &fEjectCDScan,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fEjectFlpyScan = WinQueryButtonCheckstate(hwnd, CFGS_EJECTFLPYSCAN);
     PrfWriteProfileData(fmprof, appname, "EjectFlpyScan", &fEjectFlpyScan,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fNoIconsFiles = WinQueryButtonCheckstate(hwnd, CFGS_NOICONSFILES);
     fNoIconsFiles = (fNoIconsFiles) ? FALSE : TRUE;
     PrfWriteProfileData(fmprof, appname, "NoIconsFiles",
-                        &fNoIconsFiles, sizeof(BOOL));
+                        &fNoIconsFiles, sizeof(BOOL));
     fNoIconsDirs = WinQueryButtonCheckstate(hwnd, CFGS_NOICONSDIRS);
     fNoIconsDirs = (fNoIconsDirs) ? FALSE : TRUE;
     PrfWriteProfileData(fmprof, appname, "NoIconsDirs",
-                        &fNoIconsDirs, sizeof(BOOL));
+                        &fNoIconsDirs, sizeof(BOOL));
     fForceUpper = WinQueryButtonCheckstate(hwnd, CFGS_FORCEUPPER);
     PrfWriteProfileData(fmprof, appname, "ForceUpper",
-                        &fForceUpper, sizeof(BOOL));
+                        &fForceUpper, sizeof(BOOL));
     fForceLower = WinQueryButtonCheckstate(hwnd, CFGS_FORCELOWER);
     PrfWriteProfileData(fmprof, appname, "ForceLower",
-                        &fForceLower, sizeof(BOOL));
+                        &fForceLower, sizeof(BOOL));
     {
       WinSendDlgItemMsg(hwnd, CFGS_FILESTOGET, SPBM_QUERYVALUE,
-                        MPFROMP(&FilesToGet), MPFROM2SHORT(0, SPBQ_DONOTUPDATE));
+                        MPFROMP(&FilesToGet), MPFROM2SHORT(0, SPBQ_DONOTUPDATE));
       if (FilesToGet < FILESTOGET_MIN)
-        FilesToGet = FILESTOGET_MIN;
+        FilesToGet = FILESTOGET_MIN;
       else if (FilesToGet > FILESTOGET_MAX)
-        FilesToGet = FILESTOGET_MAX;
+        FilesToGet = FILESTOGET_MAX;
       PrfWriteProfileData(fmprof,
-                          appname, "FilesToGet", &FilesToGet, sizeof(ULONG));
+                          appname, "FilesToGet", &FilesToGet, sizeof(ULONG));
     }
     break;
@@ -611 +611 @@
   case WM_INITDLG:
     WinSendDlgItemMsg(hwnd, CFGV_VIEWER, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGV_EDITOR, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGV_BINVIEW, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGV_BINED, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinEnableWindow(WinWindowFromID(hwnd, CFGV_FIND), FALSE);
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
@@ -629 +629 @@
     if (CHARMSG(&msg)->fs & KC_VIRTUALKEY) {
       switch (CHARMSG(&msg)->vkey) {
-        case VK_F3:
-        case VK_ENTER:
-        case VK_NEWLINE:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
-          return 0;
-          break;
-        case VK_ESC:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
-          return 0;
-          break;
-        case VK_F1:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
-          return 0;
-          break;
+        case VK_F3:
+        case VK_ENTER:
+        case VK_NEWLINE:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
+          return 0;
+          break;
+        case VK_ESC:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
+          return 0;
+          break;
+        case VK_F1:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
+          return 0;
+          break;
       }
     }
@@ -666 +666 @@
       switch (SHORT2FROMMP(mp1)) {
       case EN_KILLFOCUS:
-        WinEnableWindow(WinWindowFromID(hwnd, CFGV_FIND), FALSE);
-        break;
+        WinEnableWindow(WinWindowFromID(hwnd, CFGV_FIND), FALSE);
+        break;
       case EN_SETFOCUS:
-        WinEnableWindow(WinWindowFromID(hwnd, CFGV_FIND), TRUE);
-        break;
+        WinEnableWindow(WinWindowFromID(hwnd, CFGV_FIND), TRUE);
+        break;
       }
       break;
@@ -691 +691 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFGV, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFGV, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
 
     case CFGV_FIND:
       {
-        CHAR filename[CCHMAXPATH + 9], szfilename[CCHMAXPATH + 9];
-        USHORT id;
-        HWND hwndFocus;
-
-        strcpy(filename, "*.EXE");
-        hwndFocus = WinQueryFocus(HWND_DESKTOP);
-        if (hwndFocus) {
-          id = WinQueryWindowUShort(hwndFocus, QWS_ID);
-          switch (id) {
-          case CFGV_BINVIEW:
-          case CFGV_BINED:
-          case CFGV_VIEWER:
-          case CFGV_EDITOR:
-            if (insert_filename(hwnd, filename, 2, FALSE) && *filename) {
-              BldQuotedFileName(szfilename, filename);
-              strcat(szfilename, " %a");
-              WinSetDlgItemText(hwnd, id, szfilename);
-            }
-            break;
-          default:
-            Runtime_Error(pszSrcFile, __LINE__, "bad case %d", id);
-            break;
-          }
-        }
+        CHAR filename[CCHMAXPATH + 9], szfilename[CCHMAXPATH + 9];
+        USHORT id;
+        HWND hwndFocus;
+
+        strcpy(filename, "*.EXE");
+        hwndFocus = WinQueryFocus(HWND_DESKTOP);
+        if (hwndFocus) {
+          id = WinQueryWindowUShort(hwndFocus, QWS_ID);
+          switch (id) {
+          case CFGV_BINVIEW:
+          case CFGV_BINED:
+          case CFGV_VIEWER:
+          case CFGV_EDITOR:
+            if (insert_filename(hwnd, filename, 2, FALSE) && *filename) {
+              BldQuotedFileName(szfilename, filename);
+              strcat(szfilename, " %a");
+              WinSetDlgItemText(hwnd, id, szfilename);
+            }
+            break;
+          default:
+            Runtime_Error(pszSrcFile, __LINE__, "bad case %d", id);
+            break;
+          }
+        }
       }
       break;
@@ -732 +732 @@
 
       szCLBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
-        if (!szCLBuf)
-          return 0; //already complained
+        if (!szCLBuf)
+          return 0; //already complained
       pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
       if (!pszWorkBuf) {
-        free(szCLBuf);
-        return 0; //already complained
+        free(szCLBuf);
+        return 0; //already complained
       }
       WinQueryDlgItemText(hwnd, CFGV_VIEWER, MaxComLineStrg, szCLBuf);
       szCLBuf[MaxComLineStrg - 1] = 0;
       if (strcmp(szCLBuf, viewer)){
-        NormalizeCmdLine(pszWorkBuf, szCLBuf);
-        memcpy(viewer, pszWorkBuf, strlen(pszWorkBuf) + 1);
-        if (!strchr(viewer, '%') && strlen(viewer) > 3)
-          strcat(viewer, " %a");
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(viewer, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        if (!strchr(viewer, '%') && strlen(viewer) > 3)
+          strcat(viewer, " %a");
       }
       WinQueryDlgItemText(hwnd, CFGV_EDITOR, MaxComLineStrg, szCLBuf);
       szCLBuf[MaxComLineStrg - 1] = 0;
       if (strcmp(szCLBuf, editor)){
-        NormalizeCmdLine(pszWorkBuf, szCLBuf);
-        memcpy(editor, pszWorkBuf, strlen(pszWorkBuf) + 1);
-        if (!strchr(editor, '%') && strlen(editor) > 3)
-          strcat(editor, " %a");
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(editor, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        if (!strchr(editor, '%') && strlen(editor) > 3)
+          strcat(editor, " %a");
       }
       WinQueryDlgItemText(hwnd, CFGV_BINVIEW, MaxComLineStrg, szCLBuf);
       szCLBuf[MaxComLineStrg - 1] = 0;
       if (strcmp(szCLBuf, binview)){
-        NormalizeCmdLine(pszWorkBuf, szCLBuf);
-        memcpy(binview, pszWorkBuf, strlen(pszWorkBuf) + 1);
-        if (!strchr(binview, '%') && strlen(binview) > 3)
-          strcat(binview, " %a");
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(binview, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        if (!strchr(binview, '%') && strlen(binview) > 3)
+          strcat(binview, " %a");
       }
       WinQueryDlgItemText(hwnd, CFGV_BINED, MaxComLineStrg, szCLBuf);
       szCLBuf[MaxComLineStrg - 1] = 0;
       if (strcmp(szCLBuf, bined)){
-        NormalizeCmdLine(pszWorkBuf, szCLBuf);
-        memcpy(bined, pszWorkBuf, strlen(pszWorkBuf) + 1);
-        if (!strchr(bined, '%') && strlen(bined) > 3)
-          strcat(bined, " %a");
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(bined, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        if (!strchr(bined, '%') && strlen(bined) > 3)
+          strcat(bined, " %a");
       }
       free(pszWorkBuf);
@@ -779 +779 @@
       fUseNewViewer = WinQueryButtonCheckstate(hwnd, CFGV_USENEWVIEWER);
       PrfWriteProfileData(fmprof, appname, "UseNewViewer", &fUseNewViewer,
-                          sizeof(BOOL));
+                          sizeof(BOOL));
       fGuessType = WinQueryButtonCheckstate(hwnd, CFGV_GUESSTYPE);
       PrfWriteProfileData(fmprof, appname, "GuessType", &fGuessType,
-                          sizeof(BOOL));
+                          sizeof(BOOL));
       fViewChild = WinQueryButtonCheckstate(hwnd, CFGV_VIEWCHILD);
       PrfWriteProfileData(fmprof, appname, "ViewChild", &fViewChild,
-                          sizeof(BOOL));
+                          sizeof(BOOL));
       fCheckMM = WinQueryButtonCheckstate(hwnd, CFGV_CHECKMM);
       PrfWriteProfileData(fmprof, appname, "CheckMM", &fCheckMM, sizeof(BOOL));
@@ -795 +795 @@
     fCancelAction = FALSE;
     WinDlgBox(HWND_DESKTOP,
-              hwnd,
-              CfgDlgProc,
-              FM3ModHandle,
-              CFG_FRAME,
-              MPFROMLONG(IDM_VIEWERSETTINGS));
+              hwnd,
+              CfgDlgProc,
+              FM3ModHandle,
+              CFG_FRAME,
+              MPFROMLONG(IDM_VIEWERSETTINGS));
   }
   return WinDefDlgProc(hwnd, msg, mp1, mp2);
@@ -809 +809 @@
   case WM_INITDLG:
     WinSendDlgItemMsg(hwnd, CFGH_RUNFTPWORKDIR, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGH_RUNHTTPWORKDIR, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGH_FTPRUN, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGH_HTTPRUN, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGH_MAILRUN, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGH_RUNMAILWORKDIR, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     WinEnableWindow(WinWindowFromID(hwnd, CFGH_FIND), FALSE);
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
@@ -831 +831 @@
     if (CHARMSG(&msg)->fs & KC_VIRTUALKEY) {
       switch (CHARMSG(&msg)->vkey) {
-        case VK_F3:
-        case VK_ENTER:
-        case VK_NEWLINE:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
-          return 0;
-          break;
-        case VK_ESC:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
-          return 0;
-          break;
-        case VK_F1:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
-          return 0;
-          break;
+        case VK_F3:
+        case VK_ENTER:
+        case VK_NEWLINE:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
+          return 0;
+          break;
+        case VK_ESC:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
+          return 0;
+          break;
+        case VK_F1:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
+          return 0;
+          break;
       }
     }
@@ -874 +874 @@
       switch (SHORT2FROMMP(mp1)) {
       case EN_KILLFOCUS:
-        WinEnableWindow(WinWindowFromID(hwnd, CFGH_FIND), FALSE);
-        break;
+        WinEnableWindow(WinWindowFromID(hwnd, CFGH_FIND), FALSE);
+        break;
       case EN_SETFOCUS:
-        WinEnableWindow(WinWindowFromID(hwnd, CFGH_FIND), TRUE);
-        break;
+        WinEnableWindow(WinWindowFromID(hwnd, CFGH_FIND), TRUE);
+        break;
       }
       break;
@@ -899 +899 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFGH, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFGH, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
 
     case CFGH_FIND:
       {
-        CHAR filename[CCHMAXPATH + 9], szfilename[CCHMAXPATH + 9];
-        USHORT id;
-        HWND hwndFocus;
-
-        strcpy(filename, "*.EXE");
-        hwndFocus = WinQueryFocus(HWND_DESKTOP);
-        if (hwndFocus) {
-          id = WinQueryWindowUShort(hwndFocus, QWS_ID);
-          switch (id) {
-          case CFGH_HTTPRUN:
-          case CFGH_FTPRUN:
-          case CFGH_MAILRUN:
-            if (insert_filename(hwnd, filename, 2, FALSE) && *filename) {
-              BldQuotedFileName(szfilename, filename);
-              WinSetDlgItemText(hwnd, id, szfilename);
-            }
-            break;
-          case CFGH_RUNFTPWORKDIR:
-            strcpy(filename, ftprundir);
-            if (WinDlgBox(HWND_DESKTOP, hwndNotebook,
-                          WalkExtractDlgProc, FM3ModHandle, WALK_FRAME,
-                          MPFROMP(filename)) && *filename)
-              WinSetDlgItemText(hwnd, id, filename);
-            break;
-          case CFGH_RUNHTTPWORKDIR:
-            strcpy(filename, httprundir);
-            if (WinDlgBox(HWND_DESKTOP, hwndNotebook,
-                          WalkExtractDlgProc, FM3ModHandle, WALK_FRAME,
-                          MPFROMP(filename)) && *filename)
-              WinSetDlgItemText(hwnd, id, filename);
-            break;
-          case CFGH_RUNMAILWORKDIR:
-            strcpy(filename, mailrundir);
-            if (WinDlgBox(HWND_DESKTOP, hwndNotebook,
-                          WalkExtractDlgProc, FM3ModHandle, WALK_FRAME,
-                          MPFROMP(filename)) && *filename)
-              WinSetDlgItemText(hwnd, id, filename);
-            break;
-          default:
-            Runtime_Error(pszSrcFile, __LINE__, "bad case %d", id);
-            break;
-          }
-        }
+        CHAR filename[CCHMAXPATH + 9], szfilename[CCHMAXPATH + 9];
+        USHORT id;
+        HWND hwndFocus;
+
+        strcpy(filename, "*.EXE");
+        hwndFocus = WinQueryFocus(HWND_DESKTOP);
+        if (hwndFocus) {
+          id = WinQueryWindowUShort(hwndFocus, QWS_ID);
+          switch (id) {
+          case CFGH_HTTPRUN:
+          case CFGH_FTPRUN:
+          case CFGH_MAILRUN:
+            if (insert_filename(hwnd, filename, 2, FALSE) && *filename) {
+              BldQuotedFileName(szfilename, filename);
+              WinSetDlgItemText(hwnd, id, szfilename);
+            }
+            break;
+          case CFGH_RUNFTPWORKDIR:
+            strcpy(filename, ftprundir);
+            if (WinDlgBox(HWND_DESKTOP, hwndNotebook,
+                          WalkExtractDlgProc, FM3ModHandle, WALK_FRAME,
+                          MPFROMP(filename)) && *filename)
+              WinSetDlgItemText(hwnd, id, filename);
+            break;
+          case CFGH_RUNHTTPWORKDIR:
+            strcpy(filename, httprundir);
+            if (WinDlgBox(HWND_DESKTOP, hwndNotebook,
+                          WalkExtractDlgProc, FM3ModHandle, WALK_FRAME,
+                          MPFROMP(filename)) && *filename)
+              WinSetDlgItemText(hwnd, id, filename);
+            break;
+          case CFGH_RUNMAILWORKDIR:
+            strcpy(filename, mailrundir);
+            if (WinDlgBox(HWND_DESKTOP, hwndNotebook,
+                          WalkExtractDlgProc, FM3ModHandle, WALK_FRAME,
+                          MPFROMP(filename)) && *filename)
+              WinSetDlgItemText(hwnd, id, filename);
+            break;
+          default:
+            Runtime_Error(pszSrcFile, __LINE__, "bad case %d", id);
+            break;
+          }
+        }
       }
       break;
@@ -960 +960 @@
 
       szCLBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
-        if (!szCLBuf)
-          return 0; //already complained
+        if (!szCLBuf)
+          return 0; //already complained
       pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
       if (!pszWorkBuf) {
-        free(szCLBuf);
-        return 0; //already complained
+        free(szCLBuf);
+        return 0; //already complained
       }
       WinQueryDlgItemText(hwnd, CFGH_RUNHTTPWORKDIR, CCHMAXPATH, szPathBuf);
@@ -982 +982 @@
       szCLBuf[MaxComLineStrg - 1] = 0;
       if (strcmp(szCLBuf, ftprun)){
-        NormalizeCmdLine(pszWorkBuf, szCLBuf);
-        memcpy(ftprun, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(ftprun, pszWorkBuf, strlen(pszWorkBuf) + 1);
       }
       WinQueryDlgItemText(hwnd, CFGH_HTTPRUN, MaxComLineStrg, szCLBuf);
       szCLBuf[MaxComLineStrg - 1] = 0;
       if (strcmp(szCLBuf, httprun)){
-        NormalizeCmdLine(pszWorkBuf, szCLBuf);
-        memcpy(httprun, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(httprun, pszWorkBuf, strlen(pszWorkBuf) + 1);
       }
       WinQueryDlgItemText(hwnd, CFGH_MAILRUN, MaxComLineStrg, szCLBuf);
       szCLBuf[MaxComLineStrg - 1] = 0;
       if (strcmp(szCLBuf, mailrun)){
-        NormalizeCmdLine(pszWorkBuf, szCLBuf);
-        memcpy(mailrun, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(mailrun, pszWorkBuf, strlen(pszWorkBuf) + 1);
       }
       free(pszWorkBuf);
@@ -1007 +1007 @@
       fHttpRunWPSDefault = WinQueryButtonCheckstate(hwnd, CFGH_HTTPRUNWPSDEFAULT);
       PrfWriteProfileData(fmprof, appname, "HttpRunWPSDefault", &fHttpRunWPSDefault,
-                          sizeof(BOOL));
+                          sizeof(BOOL));
       fFtpRunWPSDefault = WinQueryButtonCheckstate(hwnd, CFGH_FTPRUNWPSDEFAULT);
       PrfWriteProfileData(fmprof, appname, "FtpRunWPSDefault", &fFtpRunWPSDefault,
-                          sizeof(BOOL));
+                          sizeof(BOOL));
       fLibPathStrictHttpRun = WinQueryButtonCheckstate(hwnd, CFGH_LIBPATHSTRICTHTTPRUN);
       PrfWriteProfileData(fmprof, appname, "LibPathStrictHttpRun",
-                          &fLibPathStrictHttpRun, sizeof(BOOL));
+                          &fLibPathStrictHttpRun, sizeof(BOOL));
       fLibPathStrictFtpRun = WinQueryButtonCheckstate(hwnd, CFGH_LIBPATHSTRICTFTPRUN);
       PrfWriteProfileData(fmprof, appname, "LibPathStrictFtpRun",
-                          &fLibPathStrictFtpRun, sizeof(BOOL));
+                          &fLibPathStrictFtpRun, sizeof(BOOL));
       fLibPathStrictMailRun = WinQueryButtonCheckstate(hwnd, CFGH_LIBPATHSTRICTMAILRUN);
       PrfWriteProfileData(fmprof, appname, "LibPathStrictMailRun",
-                          &fLibPathStrictMailRun, sizeof(BOOL));
+                          &fLibPathStrictMailRun, sizeof(BOOL));
       fNoMailtoMailRun = WinQueryButtonCheckstate(hwnd, CFGH_NOMAILTOMAILRUN);
       PrfWriteProfileData(fmprof, appname, "NoMailtoMailRun",
-                          &fNoMailtoMailRun, sizeof(BOOL));
+                          &fNoMailtoMailRun, sizeof(BOOL));
       break;
     }
@@ -1029 +1029 @@
     fCancelAction = FALSE;
     WinDlgBox(HWND_DESKTOP,
-              hwnd,
-              CfgDlgProc,
-              FM3ModHandle,
-              CFG_FRAME,
-              MPFROMLONG(IDM_VIEWERSETTINGS));
+              hwnd,
+              CfgDlgProc,
+              FM3ModHandle,
+              CFG_FRAME,
+              MPFROMLONG(IDM_VIEWERSETTINGS));
   }
   return WinDefDlgProc(hwnd, msg, mp1, mp2);
@@ -1058 +1058 @@
     if (CHARMSG(&msg)->fs & KC_VIRTUALKEY) {
       switch (CHARMSG(&msg)->vkey) {
-        case VK_F3:
-        case VK_ENTER:
-        case VK_NEWLINE:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
-          return 0;
-          break;
-        case VK_ESC:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
-          return 0;
-          break;
-        case VK_F1:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
-          return 0;
-          break;
+        case VK_F3:
+        case VK_ENTER:
+        case VK_NEWLINE:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
+          return 0;
+          break;
+        case VK_ESC:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
+          return 0;
+          break;
+        case VK_F1:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
+          return 0;
+          break;
       }
     }
@@ -1091 +1091 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp,
-                   HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFGB, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp,
+                   HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFGB, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -1101 +1101 @@
     fToolbarHelp = WinQueryButtonCheckstate(hwnd, CFGB_TOOLBARHELP);
     PrfWriteProfileData(fmprof,
-                        FM3Str, "ToolbarHelp", &fToolbarHelp, sizeof(BOOL));
+                        FM3Str, "ToolbarHelp", &fToolbarHelp, sizeof(BOOL));
     fDrivebarHelp = WinQueryButtonCheckstate(hwnd, CFGB_DRIVEBARHELP);
     PrfWriteProfileData(fmprof,
-                        FM3Str, "DrivebarHelp", &fDrivebarHelp, sizeof(BOOL));
+                        FM3Str, "DrivebarHelp", &fDrivebarHelp, sizeof(BOOL));
     fOtherHelp = WinQueryButtonCheckstate(hwnd, CFGB_OTHERHELP);
     PrfWriteProfileData(fmprof,
-                        FM3Str, "OtherHelp", &fOtherHelp, sizeof(BOOL));
+                        FM3Str, "OtherHelp", &fOtherHelp, sizeof(BOOL));
     break;
   }
@@ -1120 +1120 @@
   case WM_INITDLG:
     WinSendDlgItemMsg(hwnd,
-                      CFG5_FILTER,
-                      EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      CFG5_FILTER,
+                      EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
     break;
@@ -1132 +1132 @@
     if (CHARMSG(&msg)->fs & KC_VIRTUALKEY) {
       switch (CHARMSG(&msg)->vkey) {
-        case VK_F3:
-        case VK_ENTER:
-        case VK_NEWLINE:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
-          return 0;
-          break;
-        case VK_ESC:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
-          return 0;
-          break;
-        case VK_F1:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
-          return 0;
-          break;
+        case VK_F3:
+        case VK_ENTER:
+        case VK_NEWLINE:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
+          return 0;
+          break;
+        case VK_ESC:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
+          return 0;
+          break;
+        case VK_F1:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
+          return 0;
+          break;
       }
     }
@@ -1160 +1160 @@
 
       if (!PrfQueryProfileData(fmprof,
-                               appname,
-                               "TreeflWindowAttr",
-                               (PVOID) & flWindowAttr, &ulSize))
-        flWindowAttr |= (CV_TREE | CA_TREELINE | CV_ICON | CV_MINI | CV_FLOW);
+                               appname,
+                               "TreeflWindowAttr",
+                               (PVOID) & flWindowAttr, &ulSize))
+        flWindowAttr |= (CV_TREE | CA_TREELINE | CV_ICON | CV_MINI | CV_FLOW);
       WinCheckButton(hwnd, CFG5_ICON, ((flWindowAttr & CV_ICON) != FALSE));
       WinCheckButton(hwnd, CFG5_MINIICONS,
-                     ((flWindowAttr & CV_MINI) != FALSE));
+                     ((flWindowAttr & CV_MINI) != FALSE));
       memset(&mask, 0, sizeof(mask));
       mask.attrFile = FILE_DIRECTORY | FILE_ARCHIVED | FILE_HIDDEN |
-        FILE_SYSTEM | FILE_NORMAL | FILE_READONLY;
+        FILE_SYSTEM | FILE_NORMAL | FILE_READONLY;
       mask.fIsTree = TRUE;
       ulSize = sizeof(MASK);
       if (PrfQueryProfileData(fmprof, appname, "TreeFilter", &mask, &ulSize)) {
-        SetMask(NULL, &mask);
+        SetMask(NULL, &mask);
       }
       if (!mask.attrFile)
-        mask.attrFile = (FILE_READONLY | FILE_NORMAL |
-                         FILE_ARCHIVED | FILE_DIRECTORY |
-                         FILE_HIDDEN | FILE_SYSTEM);
+        mask.attrFile = (FILE_READONLY | FILE_NORMAL |
+                         FILE_ARCHIVED | FILE_DIRECTORY |
+                         FILE_HIDDEN | FILE_SYSTEM);
       strcpy(mask.prompt, GetPString(IDS_TREEFILTERTITLETEXT));
       WinSetDlgItemText(hwnd, CFG5_FILTER, mask.szMask);
@@ -1191 +1191 @@
       WinCheckButton(hwnd, CFG6_SORTREVERSE, FALSE);
       if (TreesortFlags & SORT_FIRSTEXTENSION)
-        WinCheckButton(hwnd, CFG6_SORTFIRST, TRUE);
+        WinCheckButton(hwnd, CFG6_SORTFIRST, TRUE);
       else if (TreesortFlags & SORT_LASTEXTENSION)
-        WinCheckButton(hwnd, CFG6_SORTLAST, TRUE);
+        WinCheckButton(hwnd, CFG6_SORTLAST, TRUE);
       else if (TreesortFlags & SORT_SIZE)
-        WinCheckButton(hwnd, CFG6_SORTSIZE, TRUE);
+        WinCheckButton(hwnd, CFG6_SORTSIZE, TRUE);
       else if (TreesortFlags & SORT_EASIZE)
-        WinCheckButton(hwnd, CFG6_SORTEASIZE, TRUE);
+        WinCheckButton(hwnd, CFG6_SORTEASIZE, TRUE);
       else if (TreesortFlags & SORT_LWDATE)
-        WinCheckButton(hwnd, CFG6_SORTLWDATE, TRUE);
+        WinCheckButton(hwnd, CFG6_SORTLWDATE, TRUE);
       else if (TreesortFlags & SORT_LADATE)
-        WinCheckButton(hwnd, CFG6_SORTLADATE, TRUE);
+        WinCheckButton(hwnd, CFG6_SORTLADATE, TRUE);
       else if (TreesortFlags & SORT_CRDATE)
-        WinCheckButton(hwnd, CFG6_SORTCRDATE, TRUE);
+        WinCheckButton(hwnd, CFG6_SORTCRDATE, TRUE);
       else if (TreesortFlags & SORT_FILENAME)
-        WinCheckButton(hwnd, CFG6_SORTFILENAME, TRUE);
+        WinCheckButton(hwnd, CFG6_SORTFILENAME, TRUE);
       else
-        WinCheckButton(hwnd, CFG6_SORTNAME, TRUE);
+        WinCheckButton(hwnd, CFG6_SORTNAME, TRUE);
       if (TreesortFlags & SORT_REVERSE)
-        WinCheckButton(hwnd, CFG6_SORTREVERSE, TRUE);
+        WinCheckButton(hwnd, CFG6_SORTREVERSE, TRUE);
     }
     return 0;
@@ -1215 +1215 @@
   case UM_SETUP5:
     if (WinDlgBox(HWND_DESKTOP, hwndNotebook, PickMaskDlgProc,
-                  FM3ModHandle, MSK_FRAME, MPFROMP(&mask))) {
+                  FM3ModHandle, MSK_FRAME, MPFROMP(&mask))) {
       SetMask(NULL, &mask);
       WinSetDlgItemText(hwnd, CFG5_FILTER, mask.szMask);
@@ -1226 +1226 @@
       switch (SHORT2FROMMP(mp1)) {
       case EN_SETFOCUS:
-        PostMsg(hwnd, UM_FOCUSME, MPVOID, MPVOID);
-        PostMsg(hwnd, UM_SETUP5, MPVOID, MPVOID);
-        break;
+        PostMsg(hwnd, UM_FOCUSME, MPVOID, MPVOID);
+        PostMsg(hwnd, UM_SETUP5, MPVOID, MPVOID);
+        break;
       }
       break;
@@ -1249 +1249 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_TREEVIEW, 0),
-                   MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_TREEVIEW, 0),
+                   MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -1261 +1261 @@
 
       if (WinQueryButtonCheckstate(hwnd, CFG5_ICON))
-        flWindowAttr |= CV_ICON;
+        flWindowAttr |= CV_ICON;
       else
-        flWindowAttr |= CV_TEXT;
+        flWindowAttr |= CV_TEXT;
       if (WinQueryButtonCheckstate(hwnd, CFG5_MINIICONS))
-        flWindowAttr |= CV_MINI;
+        flWindowAttr |= CV_MINI;
       flWindowAttr |= (CV_TREE | CV_FLOW | CA_TREELINE);
       PrfWriteProfileData(fmprof,
-                          appname,
-                          "TreeflWindowAttr", &flWindowAttr, sizeof(ULONG));
+                          appname,
+                          "TreeflWindowAttr", &flWindowAttr, sizeof(ULONG));
       if (hwndTree) {
 
-        CNRINFO cnri;
-
-        memset(&cnri, 0, sizeof(cnri));
-        cnri.cb = sizeof(cnri);
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
-        cnri.flWindowAttr = flWindowAttr;
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_SETCNRINFO, MPFROMP(&cnri),
-                   MPFROMLONG(CMA_FLWINDOWATTR));
+        CNRINFO cnri;
+
+        memset(&cnri, 0, sizeof(cnri));
+        cnri.cb = sizeof(cnri);
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
+        cnri.flWindowAttr = flWindowAttr;
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_SETCNRINFO, MPFROMP(&cnri),
+                   MPFROMLONG(CMA_FLWINDOWATTR));
       }
     }
@@ -1310 +1310 @@
       TreesortFlags |= SORT_REVERSE;
     PrfWriteProfileData(fmprof, appname, "TreeSort", &TreesortFlags,
-                        sizeof(INT));
+                        sizeof(INT));
     if (hwndTree)
       PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_RESORT, 0), MPVOID);
@@ -1320 +1320 @@
 
       dcd = WinQueryWindowPtr(WinWindowFromID(WinWindowFromID(hwndTree,
-                                                              FID_CLIENT),
-                                              TREE_CNR), QWL_USER);
+                                                              FID_CLIENT),
+                                              TREE_CNR), QWL_USER);
       if (dcd && dcd->size == sizeof(DIRCNRDATA)) {
-        dcd->mask = mask;
-        PostMsg(hwndTree, UM_FILTER, MPVOID, MPVOID);
+        dcd->mask = mask;
+        PostMsg(hwndTree, UM_FILTER, MPVOID, MPVOID);
       }
     }
@@ -1340 +1340 @@
   case WM_INITDLG:
     WinSendDlgItemMsg(hwnd, CFGT_ENVVARLIST, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
     break;
@@ -1364 +1364 @@
     if (CHARMSG(&msg)->fs & KC_VIRTUALKEY) {
       switch (CHARMSG(&msg)->vkey) {
-        case VK_F3:
-        case VK_ENTER:
-        case VK_NEWLINE:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
-          return 0;
-          break;
-        case VK_ESC:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
-          return 0;
-          break;
-        case VK_F1:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
-          return 0;
-          break;
+        case VK_F3:
+        case VK_ENTER:
+        case VK_NEWLINE:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
+          return 0;
+          break;
+        case VK_ESC:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
+          return 0;
+          break;
+        case VK_F1:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
+          return 0;
+          break;
       }
     }
@@ -1397 +1397 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFGT, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFGT, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -1406 +1406 @@
     fVTreeOpensWPS = WinQueryButtonCheckstate(hwnd, CFGT_VTREEOPENSWPS);
     PrfWriteProfileData(fmprof, 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));
     fSwitchTree = WinQueryButtonCheckstate(hwnd, CFGT_SWITCHTREE);
     PrfWriteProfileData(fmprof, appname, "SwitchTree", &fSwitchTree,
-                        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, FM3Str, "DoubleClickOpens", &fDCOpens,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fShowEnvChanged = (fShowEnv != WinQueryButtonCheckstate(hwnd, CFGT_SHOWENV));
     fShowEnv = WinQueryButtonCheckstate(hwnd, CFGT_SHOWENV);
@@ -1435 +1435 @@
       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);
+        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)))
       {
-        PCNRITEM pci = WinSendMsg(WinWindowFromID
-                (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR), CM_QUERYRECORDEMPHASIS,
-                                  MPFROMLONG(CMA_FIRST),
-                                  MPFROMSHORT(CRA_SELECTED));
-        PostMsg(WinWindowFromID
-                (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR), WM_COMMAND,
-                MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
-        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 */
-        }
+        PCNRITEM pci = WinSendMsg(WinWindowFromID
+                (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR), CM_QUERYRECORDEMPHASIS,
+                                  MPFROMLONG(CMA_FIRST),
+                                  MPFROMSHORT(CRA_SELECTED));
+        PostMsg(WinWindowFromID
+                (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR), WM_COMMAND,
+                MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
+        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 */
+        }
       }
     }
@@ -1471 +1471 @@
   case WM_INITDLG:
     WinSendDlgItemMsg(hwnd, CFGG_CMDLNLNGTH, SPBM_SETTEXTLIMIT,
-                      MPFROMSHORT(8), MPVOID);
+                      MPFROMSHORT(8), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGG_CMDLNLNGTH, SPBM_OVERRIDESETLIMITS,
-                      MPFROMLONG(CMDLNLNGTH_MAX), MPFROMLONG(CMDLNLNGTH_MIN));
+                      MPFROMLONG(CMDLNLNGTH_MAX), MPFROMLONG(CMDLNLNGTH_MIN));
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
     break;
@@ -1484 +1484 @@
     if (CHARMSG(&msg)->fs & KC_VIRTUALKEY) {
       switch (CHARMSG(&msg)->vkey) {
-        case VK_F3:
-        case VK_ENTER:
-        case VK_NEWLINE:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
-          return 0;
-          break;
-        case VK_ESC:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
-          return 0;
-          break;
-        case VK_F1:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
-          return 0;
-          break;
+        case VK_F3:
+        case VK_ENTER:
+        case VK_NEWLINE:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
+          return 0;
+          break;
+        case VK_ESC:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
+          return 0;
+          break;
+        case VK_F1:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
+          return 0;
+          break;
       }
     }
@@ -1522 +1522 @@
     WinCheckButton(hwnd, CFGG_TRASHCAN, fTrashCan);
     WinSendDlgItemMsg(hwnd, CFGG_CMDLNLNGTH, SPBM_SETCURRENTVALUE,
-                      MPFROMLONG(MaxComLineStrg), MPVOID);
+                      MPFROMLONG(MaxComLineStrg), MPVOID);
     return 0;
 
@@ -1539 +1539 @@
       switch (SHORT2FROMMP(mp1)) {
       case EN_SETFOCUS:
-        PostMsg(hwnd, UM_FOCUSME, MPVOID, MPVOID);
-        PostMsg(hwnd, UM_SETUP5, MPVOID, MPVOID);
-        break;
+        PostMsg(hwnd, UM_FOCUSME, MPVOID, MPVOID);
+        PostMsg(hwnd, UM_SETUP5, MPVOID, MPVOID);
+        break;
       }
       break;
@@ -1562 +1562 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp,
-                   HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFGG, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp,
+                   HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFGG, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -1578 +1578 @@
       PrfWriteProfileData(fmprof, FM3Str, "NoDead", &fNoDead, sizeof(BOOL));
       PrfWriteProfileData(fmprof,
-                          FM3Str, "NoFinger", &fNoFinger, sizeof(BOOL));
+                          FM3Str, "NoFinger", &fNoFinger, sizeof(BOOL));
       WinDestroyPointer(hptrFinger);
       if (!fNoDead)
-        hptrFinger = WinLoadPointer(HWND_DESKTOP, FM3ModHandle, FINGER_ICON);
+        hptrFinger = WinLoadPointer(HWND_DESKTOP, FM3ModHandle, FINGER_ICON);
       else
-        hptrFinger = WinLoadPointer(HWND_DESKTOP, FM3ModHandle, FINGER2_ICON);
+        hptrFinger = WinLoadPointer(HWND_DESKTOP, FM3ModHandle, FINGER2_ICON);
     }
     fLinkSetsIcon = WinQueryButtonCheckstate(hwnd, CFGG_LINKSETSICON);
     PrfWriteProfileData(fmprof,
-                        appname,
-                        "LinkSetsIcon", &fLinkSetsIcon, sizeof(BOOL));
+                        appname,
+                        "LinkSetsIcon", &fLinkSetsIcon, sizeof(BOOL));
     fCustomFileDlg = WinQueryButtonCheckstate(hwnd, CFGG_CUSTOMFILEDLG);
     PrfWriteProfileData(fmprof,
-                        FM3Str,
-                        "CustomFileDlg", &fCustomFileDlg, sizeof(BOOL));
+                        FM3Str,
+                        "CustomFileDlg", &fCustomFileDlg, sizeof(BOOL));
     fDullMin = WinQueryButtonCheckstate(hwnd, CFGG_BORING);
     PrfWriteProfileData(fmprof,
-                        FM3Str, "DullDatabar", &fDullMin, sizeof(BOOL));
+                        FM3Str, "DullDatabar", &fDullMin, sizeof(BOOL));
     fConfirmDelete = WinQueryButtonCheckstate(hwnd, CFGG_CONFIRMDELETE);
     PrfWriteProfileData(fmprof,
-                        appname,
-                        "ConfirmDelete", &fConfirmDelete, sizeof(BOOL));
+                        appname,
+                        "ConfirmDelete", &fConfirmDelete, sizeof(BOOL));
     fDontMoveMouse = WinQueryButtonCheckstate(hwnd, CFGG_DONTMOVEMOUSE);
     PrfWriteProfileData(fmprof,
-                        appname,
-                        "DontMoveMouse", &fDontMoveMouse, sizeof(BOOL));
+                        appname,
+                        "DontMoveMouse", &fDontMoveMouse, sizeof(BOOL));
     fCopyDefault = WinQueryButtonCheckstate(hwnd, CFGG_DEFAULTCOPY);
     PrfWriteProfileData(fmprof, appname, "DefaultCopy",
-                        &fCopyDefault, sizeof(BOOL));
+                        &fCopyDefault, sizeof(BOOL));
     fRealIdle = WinQueryButtonCheckstate(hwnd, CFGG_IDLECOPY);
     PrfWriteProfileData(fmprof, appname, "IdleCopy",
-                        &fRealIdle, sizeof(BOOL));
+                        &fRealIdle, sizeof(BOOL));
     fDragndropDlg = WinQueryButtonCheckstate(hwnd, CFGG_DNDDLG);
     PrfWriteProfileData(fmprof, appname, "Drag&DropDlg",
-                        &fDragndropDlg, sizeof(BOOL));
+                        &fDragndropDlg, sizeof(BOOL));
     fVerify = WinQueryButtonCheckstate(hwnd, CFGG_VERIFYWRITES);
     PrfWriteProfileData(fmprof, appname, "VerifyWrites",
-                        &fVerify, sizeof(BOOL));
+                        &fVerify, sizeof(BOOL));
     DosSetVerify(fVerify);
     fDefaultDeletePerm = WinQueryButtonCheckstate(hwnd,
-                                                  CFGG_DEFAULTDELETEPERM);
+                                                  CFGG_DEFAULTDELETEPERM);
     PrfWriteProfileData(fmprof, appname, "DefaultDeletePerm",
-                        &fDefaultDeletePerm, sizeof(BOOL));
+                        &fDefaultDeletePerm, sizeof(BOOL));
     fFM2Deletes = WinQueryButtonCheckstate(hwnd, CFGG_FM2DELETES);
     PrfWriteProfileData(fmprof, FM3Str, "FM2Deletes",
-                        &fFM2Deletes, sizeof(BOOL));
+                        &fFM2Deletes, sizeof(BOOL));
     fTrashCan = WinQueryButtonCheckstate(hwnd, CFGG_TRASHCAN);
     PrfWriteProfileData(fmprof, FM3Str, "TrashCan",
-                        &fTrashCan, sizeof(BOOL));
+                        &fTrashCan, sizeof(BOOL));
     fConfirmTarget = WinQueryButtonCheckstate(hwnd, CFGG_CONFIRMTARGET);
     PrfWriteProfileData(fmprof, appname, "ConfirmTarget",
-                        &fConfirmTarget, sizeof(BOOL));
+                        &fConfirmTarget, sizeof(BOOL));
     {
       WinSendDlgItemMsg(hwnd, CFGG_CMDLNLNGTH, SPBM_QUERYVALUE,
-                        MPFROMP(&MaxComLineStrg), MPFROM2SHORT(0, SPBQ_DONOTUPDATE));
+                        MPFROMP(&MaxComLineStrg), MPFROM2SHORT(0, SPBQ_DONOTUPDATE));
       if (MaxComLineStrg < CMDLNLNGTH_MIN)
-        MaxComLineStrg = CMDLNLNGTH_MIN;
+        MaxComLineStrg = CMDLNLNGTH_MIN;
       else if (MaxComLineStrg > CMDLNLNGTH_MAX)
-        MaxComLineStrg = CMDLNLNGTH_MAX;
+        MaxComLineStrg = CMDLNLNGTH_MAX;
       PrfWriteProfileData(fmprof,
-                          appname, "MaxComLineStrg", &MaxComLineStrg, sizeof(ULONG));
+                          appname, "MaxComLineStrg", &MaxComLineStrg, sizeof(ULONG));
     }
     break;
@@ -1650 +1650 @@
   case WM_INITDLG:
     WinSendDlgItemMsg(hwnd, CFGC_COMPARE, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGC_DIRCOMPARE, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinEnableWindow(WinWindowFromID(hwnd, CFGC_FIND), FALSE);
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
@@ -1664 +1664 @@
     if (CHARMSG(&msg)->fs & KC_VIRTUALKEY) {
       switch (CHARMSG(&msg)->vkey) {
-        case VK_F3:
-        case VK_ENTER:
-        case VK_NEWLINE:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
-          return 0;
-          break;
-        case VK_ESC:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
-          return 0;
-          break;
-        case VK_F1:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
-          return 0;
-          break;
+        case VK_F3:
+        case VK_ENTER:
+        case VK_NEWLINE:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
+          return 0;
+          break;
+        case VK_ESC:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
+          return 0;
+          break;
+        case VK_F1:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
+          return 0;
+          break;
       }
     }
@@ -1693 +1693 @@
       switch (SHORT2FROMMP(mp1)) {
       case EN_KILLFOCUS:
-        WinEnableWindow(WinWindowFromID(hwnd, CFGC_FIND), FALSE);
-        break;
+        WinEnableWindow(WinWindowFromID(hwnd, CFGC_FIND), FALSE);
+        break;
       case EN_SETFOCUS:
-        WinEnableWindow(WinWindowFromID(hwnd, CFGC_FIND), TRUE);
-        break;
+        WinEnableWindow(WinWindowFromID(hwnd, CFGC_FIND), TRUE);
+        break;
       }
       break;
@@ -1718 +1718 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFGC, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFGC, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
 
     case CFGC_FIND:
       {
-        CHAR filename[CCHMAXPATH + 9], szfilename[CCHMAXPATH + 9];
-        USHORT id;
-        HWND hwndFocus;
-
-        strcpy(filename, "*.EXE");
-        hwndFocus = WinQueryFocus(HWND_DESKTOP);
-        if (hwndFocus) {
-          id = WinQueryWindowUShort(hwndFocus, QWS_ID);
-          switch (id) {
-          case CFGC_COMPARE:
-          case CFGC_DIRCOMPARE:
-            if (insert_filename(hwnd, filename, 2, FALSE) && *filename) {
-              BldQuotedFileName(szfilename, filename);
-              strcat(szfilename, " %a");
-              WinSetDlgItemText(hwnd, id, szfilename);
-            }
-            break;
-          default:
-            Runtime_Error(pszSrcFile, __LINE__, "bad case %d", id);
-            break;
-          }
-        }
+        CHAR filename[CCHMAXPATH + 9], szfilename[CCHMAXPATH + 9];
+        USHORT id;
+        HWND hwndFocus;
+
+        strcpy(filename, "*.EXE");
+        hwndFocus = WinQueryFocus(HWND_DESKTOP);
+        if (hwndFocus) {
+          id = WinQueryWindowUShort(hwndFocus, QWS_ID);
+          switch (id) {
+          case CFGC_COMPARE:
+          case CFGC_DIRCOMPARE:
+            if (insert_filename(hwnd, filename, 2, FALSE) && *filename) {
+              BldQuotedFileName(szfilename, filename);
+              strcat(szfilename, " %a");
+              WinSetDlgItemText(hwnd, id, szfilename);
+            }
+            break;
+          default:
+            Runtime_Error(pszSrcFile, __LINE__, "bad case %d", id);
+            break;
+          }
+        }
       }
       break;
@@ -1757 +1757 @@
 
       szCLBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
-        if (!szCLBuf)
-          return 0; //already complained
+        if (!szCLBuf)
+          return 0; //already complained
       pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
       if (!pszWorkBuf) {
-        free(szCLBuf);
-        return 0; //already complained
+        free(szCLBuf);
+        return 0; //already complained
       }
       WinQueryDlgItemText(hwnd, CFGC_DIRCOMPARE, MaxComLineStrg, szCLBuf);
-        szCLBuf[MaxComLineStrg - 1] = 0;
-        if (strcmp(szCLBuf, dircompare)){
-          NormalizeCmdLine(pszWorkBuf, szCLBuf);
-          memcpy(dircompare, pszWorkBuf, strlen(pszWorkBuf) + 1);
-          if (!strchr(dircompare, '%') && strlen(dircompare) > 3)
-            strcat(dircompare, " %a");
-        }
+        szCLBuf[MaxComLineStrg - 1] = 0;
+        if (strcmp(szCLBuf, dircompare)){
+          NormalizeCmdLine(pszWorkBuf, szCLBuf);
+          memcpy(dircompare, pszWorkBuf, strlen(pszWorkBuf) + 1);
+          if (!strchr(dircompare, '%') && strlen(dircompare) > 3)
+            strcat(dircompare, " %a");
+        }
       PrfWriteProfileString(fmprof, appname, "DirCompare", dircompare);
       WinQueryDlgItemText(hwnd, CFGC_COMPARE, MaxComLineStrg, szCLBuf);
       szCLBuf[MaxComLineStrg - 1] = 0;
       if (strcmp(szCLBuf, compare)){
-        NormalizeCmdLine(pszWorkBuf, szCLBuf);
-        memcpy(compare, pszWorkBuf, strlen(pszWorkBuf) + 1);
-        if (!strchr(compare, '%') && strlen(compare) > 3)
-          strcat(compare, " %a");
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(compare, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        if (!strchr(compare, '%') && strlen(compare) > 3)
+          strcat(compare, " %a");
       }
       free(pszWorkBuf);
@@ -1790 +1790 @@
     fCancelAction = FALSE;
     WinDlgBox(HWND_DESKTOP,
-              hwnd,
-              CfgDlgProc,
-              FM3ModHandle,
-              CFG_FRAME,
-              MPFROMLONG(IDM_COMPARESETTINGS));
+              hwnd,
+              CfgDlgProc,
+              FM3ModHandle,
+              CFG_FRAME,
+              MPFROMLONG(IDM_COMPARESETTINGS));
   }
   return WinDefDlgProc(hwnd, msg, mp1, mp2);
@@ -1815 +1815 @@
     WinCheckButton(hwnd, CFGD_NOSEARCH, fNoSearch);
     WinCheckButton(hwnd, CFGD_EXTENDEDSEL,
-                   ((ulCnrType & CCS_EXTENDSEL) != 0));
+                   ((ulCnrType & CCS_EXTENDSEL) != 0));
     WinCheckButton(hwnd, CFGD_MULTIPLESEL,
-                   ((ulCnrType & CCS_MULTIPLESEL) != 0));
+                   ((ulCnrType & CCS_MULTIPLESEL) != 0));
     WinCheckButton(hwnd, CFGD_LEAVETREE, fLeaveTree);
     WinCheckButton(hwnd, CFGD_NOFOLDMENU, fNoFoldMenu);
@@ -1829 +1829 @@
     if (CHARMSG(&msg)->fs & KC_VIRTUALKEY) {
       switch (CHARMSG(&msg)->vkey) {
-        case VK_F3:
-        case VK_ENTER:
-        case VK_NEWLINE:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
-          return 0;
-          break;
-        case VK_ESC:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
-          return 0;
-          break;
-        case VK_F1:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
-          return 0;
-          break;
+        case VK_F3:
+        case VK_ENTER:
+        case VK_NEWLINE:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
+          return 0;
+          break;
+        case VK_ESC:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
+          return 0;
+          break;
+        case VK_F1:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
+          return 0;
+          break;
       }
     }
@@ -1862 +1862 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFGD, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFGD, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -1875 +1875 @@
       ulCnrType |= CCS_MULTIPLESEL;
     PrfWriteProfileData(fmprof, appname, "ContainerType",
-                        (PVOID) & ulCnrType, sizeof(BOOL));
+                        (PVOID) & ulCnrType, sizeof(BOOL));
     fMinOnOpen = WinQueryButtonCheckstate(hwnd, CFGD_MINONOPEN);
     PrfWriteProfileData(fmprof, FM3Str, "MinDirOnOpen", &fMinOnOpen,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fLeaveTree = WinQueryButtonCheckstate(hwnd, CFGD_LEAVETREE);
     PrfWriteProfileData(fmprof, appname, "LeaveTree", &fLeaveTree,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fNoFoldMenu = WinQueryButtonCheckstate(hwnd, CFGD_NOFOLDMENU);
     PrfWriteProfileData(fmprof, appname, "NoFoldMenu", &fNoFoldMenu,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fSelectedAlways = WinQueryButtonCheckstate(hwnd, CFGD_SELECTEDALWAYS);
     PrfWriteProfileData(fmprof, appname, "SelectedAlways", &fSelectedAlways,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fNoSearch = WinQueryButtonCheckstate(hwnd, CFGD_NOSEARCH);
     PrfWriteProfileData(fmprof, appname, "NoSearch", &fNoSearch,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fLookInDir = WinQueryButtonCheckstate(hwnd, CFGD_LOOKINDIR);
     PrfWriteProfileData(fmprof, FM3Str, "LookInDir", (PVOID) & fLookInDir,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fUnHilite = WinQueryButtonCheckstate(hwnd, CFGD_UNHILITE);
     PrfWriteProfileData(fmprof, appname, "UnHilite",
-                        &fUnHilite, sizeof(BOOL));
+                        &fUnHilite, sizeof(BOOL));
     {
       BOOL fOldSyncUpdates = WinQueryButtonCheckstate(hwnd, CFGD_SYNCUPDATES);
 
       if (fOldSyncUpdates != fSyncUpdates) {
-        fSyncUpdates = fOldSyncUpdates;
-        if (hwndMain && !strcmp(realappname, FM3Str)) {
-          // Save state and restore to refresh windows with new settings
-          if (SaveDirCnrState(hwndMain, GetPString(IDS_FM2TEMPTEXT)) > 0) {
-            PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2));
+        fSyncUpdates = fOldSyncUpdates;
+        if (hwndMain && !strcmp(realappname, FM3Str)) {
+          // Save state and restore to refresh windows with new settings
+          if (SaveDirCnrState(hwndMain, GetPString(IDS_FM2TEMPTEXT)) > 0) {
+            PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2));
 //          PostMsg(hwndMain, UM_RESTORE, MPVOID, MPVOID);
-            PostMsg(MainObjectHwnd, UM_RESTORE, GetPString(IDS_FM2TEMPTEXT), MPVOID);
-          }
-        }
+            PostMsg(MainObjectHwnd, UM_RESTORE, (PSZ)GetPString(IDS_FM2TEMPTEXT), MPVOID);
+          }
+        }
       }
     }
     PrfWriteProfileData(fmprof, appname, "SyncUpdates",
-                        &fSyncUpdates, sizeof(BOOL));
+                        &fSyncUpdates, sizeof(BOOL));
     if (!(ulCnrType & (CCS_EXTENDSEL | CCS_MULTIPLESEL)))
       saymsg(MB_ENTER | MB_ICONEXCLAMATION,
-             HWND_DESKTOP,
-             GetPString(IDS_WARNINGTEXT),
-             GetPString(IDS_SELECTTYPEERRORTEXT));
+             HWND_DESKTOP,
+             GetPString(IDS_WARNINGTEXT),
+             GetPString(IDS_SELECTTYPEERRORTEXT));
     break;                              // WM_CLOSE
   }
@@ -1938 +1938 @@
     if (CHARMSG(&msg)->fs & KC_VIRTUALKEY) {
       switch (CHARMSG(&msg)->vkey) {
-        case VK_F3:
-        case VK_ENTER:
-        case VK_NEWLINE:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
-          return 0;
-          break;
-        case VK_ESC:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
-          return 0;
-          break;
-        case VK_F1:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
-          return 0;
-          break;
+        case VK_F3:
+        case VK_ENTER:
+        case VK_NEWLINE:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
+          return 0;
+          break;
+        case VK_ESC:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
+          return 0;
+          break;
+        case VK_F1:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
+          return 0;
+          break;
       }
     }
@@ -1998 +1998 @@
       switch (SHORT1FROMMP(mp1)) {
       case CFGM_RECENTDIRS:
-        sprintf(s,
-                GetPString(IDS_RECENTHELPWHICHTEXT),
-                (!oh && th) ?
-                GetPString(IDS_RECENTONLYTEXT) :
-                (oh && th) ?
-                GetPString(IDS_ALLONLYTEXT) : GetPString(IDS_NONE));
-        break;
+        sprintf(s,
+                GetPString(IDS_RECENTHELPWHICHTEXT),
+                (!oh && th) ?
+                GetPString(IDS_RECENTONLYTEXT) :
+                (oh && th) ?
+                GetPString(IDS_ALLONLYTEXT) : GetPString(IDS_NONE));
+        break;
       }
       if (*s)
-        WinSetDlgItemText(hwnd, SHORT1FROMMP(mp1), s);
+        WinSetDlgItemText(hwnd, SHORT1FROMMP(mp1), s);
     }
     return 0;
@@ -2018 +2018 @@
     case CFGM_STARTMIN:
       if (WinQueryButtonCheckstate(hwnd, CFGM_STARTMIN)) {
-        WinCheckButton(hwnd, CFGM_STARTMAX, FALSE);
-        WinEnableWindow(WinWindowFromID(hwnd, CFGM_STARTMAX), FALSE);
+        WinCheckButton(hwnd, CFGM_STARTMAX, FALSE);
+        WinEnableWindow(WinWindowFromID(hwnd, CFGM_STARTMAX), FALSE);
       }
       else
-        WinEnableWindow(WinWindowFromID(hwnd, CFGM_STARTMAX), TRUE);
+        WinEnableWindow(WinWindowFromID(hwnd, CFGM_STARTMAX), TRUE);
       break;
     case CFGM_STARTMAX:
       if (WinQueryButtonCheckstate(hwnd, CFGM_STARTMAX)) {
-        WinCheckButton(hwnd, CFGM_STARTMIN, FALSE);
-        WinEnableWindow(WinWindowFromID(hwnd, CFGM_STARTMIN), FALSE);
+        WinCheckButton(hwnd, CFGM_STARTMIN, FALSE);
+        WinEnableWindow(WinWindowFromID(hwnd, CFGM_STARTMIN), FALSE);
       }
       else
-        WinEnableWindow(WinWindowFromID(hwnd, CFGM_STARTMIN), TRUE);
+        WinEnableWindow(WinWindowFromID(hwnd, CFGM_STARTMIN), TRUE);
       break;
     }
@@ -2050 +2050 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFGM, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFGM, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -2059 +2059 @@
     if (hwndMain && !strcmp(realappname, FM3Str)) {
       if (fFreeTree != WinQueryButtonCheckstate(hwnd, CFGM_FREETREE))
-        PostMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_FREETREE, 0), MPVOID);
+        PostMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_FREETREE, 0), MPVOID);
       if (fAutoTile != WinQueryButtonCheckstate(hwnd, CFGM_AUTOTILE))
-        PostMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_AUTOTILE, 0), MPVOID);
+        PostMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_AUTOTILE, 0), MPVOID);
       if (fSplitStatus != WinQueryButtonCheckstate(hwnd, CFGM_SPLITSTATUS)) {
-        fSplitStatus = (fSplitStatus) ? FALSE : TRUE;
-        PostMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_BLINK, 0), MPVOID);
-        PrfWriteProfileData(fmprof, FM3Str, "SplitStatus", &fSplitStatus,
-                            sizeof(BOOL));
+        fSplitStatus = (fSplitStatus) ? FALSE : TRUE;
+        PostMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_BLINK, 0), MPVOID);
+        PrfWriteProfileData(fmprof, FM3Str, "SplitStatus", &fSplitStatus,
+                            sizeof(BOOL));
       }
     }
     fUserListSwitches = WinQueryButtonCheckstate(hwnd, CFGM_USERLISTSWITCHES);
     PrfWriteProfileData(fmprof, FM3Str, "UserListSwitches",
-                        (PVOID) & fUserListSwitches, sizeof(BOOL));
+                        (PVOID) & fUserListSwitches, sizeof(BOOL));
     fExternalINIs = WinQueryButtonCheckstate(hwnd, CFGM_EXTERNALINIS);
     PrfWriteProfileData(fmprof, FM3Str, "ExternalINIs",
-                        (PVOID) & fExternalINIs, sizeof(BOOL));
+                        (PVOID) & fExternalINIs, sizeof(BOOL));
     fExternalArcboxes = WinQueryButtonCheckstate(hwnd, CFGM_EXTERNALARCBOXES);
     PrfWriteProfileData(fmprof, FM3Str, "ExternalArcboxes",
-                        (PVOID) & fExternalArcboxes, sizeof(BOOL));
+                        (PVOID) & fExternalArcboxes, sizeof(BOOL));
     fExternalCollector =
       WinQueryButtonCheckstate(hwnd, CFGM_EXTERNALCOLLECTOR);
     PrfWriteProfileData(fmprof, FM3Str, "ExternalCollector",
-                        (PVOID) & fExternalCollector, sizeof(BOOL));
+                        (PVOID) & fExternalCollector, sizeof(BOOL));
     fExternalViewer = WinQueryButtonCheckstate(hwnd, CFGM_EXTERNALVIEWER);
     PrfWriteProfileData(fmprof, FM3Str, "ExternalViewer",
-                        (PVOID) & fExternalViewer, sizeof(BOOL));
+                        (PVOID) & fExternalViewer, sizeof(BOOL));
     {
       long test;
@@ -2093 +2093 @@
     }
     PrfWriteProfileData(fmprof,
-                        appname,
-                        "AutoAddDirs", (PVOID) & fAutoAddDirs, sizeof(BOOL));
+                        appname,
+                        "AutoAddDirs", (PVOID) & fAutoAddDirs, sizeof(BOOL));
     PrfWriteProfileData(fmprof,
-                        appname,
-                        "AutoAddAllDirs",
-                        (PVOID) & fAutoAddAllDirs, sizeof(BOOL));
+                        appname,
+                        "AutoAddAllDirs",
+                        (PVOID) & fAutoAddAllDirs, sizeof(BOOL));
     fwsAnimate = WinQueryButtonCheckstate(hwnd, CFGM_WSANIMATE);
     if (fwsAnimate)
       fwsAnimate = WS_ANIMATE;
     PrfWriteProfileData(fmprof,
-                        appname,
-                        "WS_ANIMATE", (PVOID) & fwsAnimate, sizeof(ULONG));
+                        appname,
+                        "WS_ANIMATE", (PVOID) & fwsAnimate, sizeof(ULONG));
     fSaveState = WinQueryButtonCheckstate(hwnd, CFGM_SAVESTATE);
     PrfWriteProfileData(fmprof,
-                        FM3Str,
-                        "SaveState", (PVOID) & fSaveState, sizeof(BOOL));
+                        FM3Str,
+                        "SaveState", (PVOID) & fSaveState, sizeof(BOOL));
     fStartMinimized = WinQueryButtonCheckstate(hwnd, CFGM_STARTMIN);
     PrfWriteProfileData(fmprof,
-                        appname,
-                        "StartMinimized",
-                        (PVOID) & fStartMinimized, sizeof(BOOL));
+                        appname,
+                        "StartMinimized",
+                        (PVOID) & fStartMinimized, sizeof(BOOL));
     fStartMaximized = WinQueryButtonCheckstate(hwnd, CFGM_STARTMAX);
     PrfWriteProfileData(fmprof,
-                        appname,
-                        "StartMaximized",
-                        (PVOID) & fStartMaximized, sizeof(BOOL));
+                        appname,
+                        "StartMaximized",
+                        (PVOID) & fStartMaximized, sizeof(BOOL));
     fDataMin = WinQueryButtonCheckstate(hwnd, CFGM_DATAMIN);
     PrfWriteProfileData(fmprof,
-                        FM3Str, "DataMin", (PVOID) & fDataMin, sizeof(BOOL));
+                        FM3Str, "DataMin", (PVOID) & fDataMin, sizeof(BOOL));
     fTileBackwards = WinQueryButtonCheckstate(hwnd, CFGM_TILEBACKWARDS);
     PrfWriteProfileData(fmprof,
-                        FM3Str,
-                        "TileBackwards",
-                        (PVOID) & fTileBackwards, sizeof(BOOL));
+                        FM3Str,
+                        "TileBackwards",
+                        (PVOID) & fTileBackwards, sizeof(BOOL));
     fNoTreeGap = WinQueryButtonCheckstate(hwnd, CFGM_NOTREEGAP);
     PrfWriteProfileData(fmprof,
-                        FM3Str,
-                        "NoTreeGap", (PVOID) & fNoTreeGap, sizeof(BOOL));
+                        FM3Str,
+                        "NoTreeGap", (PVOID) & fNoTreeGap, sizeof(BOOL));
     fBlueLED = WinQueryButtonCheckstate(hwnd, CFGM_BLUELED);
     PrfWriteProfileData(fmprof,
-                        appname, "BlueLED", (PVOID) & fBlueLED, sizeof(BOOL));
+                        appname, "BlueLED", (PVOID) & fBlueLED, sizeof(BOOL));
     {
       BOOL dummy;
@@ -2139 +2139 @@
       dummy = WinQueryButtonCheckstate(hwnd, CFGM_SHOWTARGET);
       if (dummy != fShowTarget) {
-        fShowTarget = dummy;
-        PrfWriteProfileData(fmprof,
-                            appname,
-                            "ShowTarget",
-                            (PVOID) & fShowTarget, sizeof(BOOL));
-        if (hwndMain)
-          PostMsg(WinQueryWindow(hwndMain, QW_PARENT),
-                  WM_UPDATEFRAME, MPFROMLONG(FCF_SIZEBORDER), MPVOID);
-        SetTargetDir(hwnd, TRUE);
+        fShowTarget = dummy;
+        PrfWriteProfileData(fmprof,
+                            appname,
+                            "ShowTarget",
+                            (PVOID) & fShowTarget, sizeof(BOOL));
+        if (hwndMain)
+          PostMsg(WinQueryWindow(hwndMain, QW_PARENT),
+                  WM_UPDATEFRAME, MPFROMLONG(FCF_SIZEBORDER), MPVOID);
+        SetTargetDir(hwnd, TRUE);
       }
       dummy = WinQueryButtonCheckstate(hwnd, CFGM_SEPARATEPARMS);
       if (dummy != fSeparateParms) {
-        fSeparateParms = dummy;
-        PrfWriteProfileData(fmprof,
-                            FM3Str,
-                            "SeparateParms",
-                            (PVOID) & fSeparateParms, sizeof(BOOL));
-        WinSendMsg((HWND) WinQueryWindowULong(hwnd, QWL_USER),
-                   UM_UNDO, MPVOID, MPVOID);
+        fSeparateParms = dummy;
+        PrfWriteProfileData(fmprof,
+                            FM3Str,
+                            "SeparateParms",
+                            (PVOID) & fSeparateParms, sizeof(BOOL));
+        WinSendMsg((HWND) WinQueryWindowULong(hwnd, QWL_USER),
+                   UM_UNDO, MPVOID, MPVOID);
       }
     }
@@ -2172 +2172 @@
   case WM_INITDLG:
     WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_SETTEXTLIMIT,
-                      MPFROMSHORT(8), MPVOID);
+                      MPFROMSHORT(8), MPVOID);
     WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_OVERRIDESETLIMITS,
-                      MPFROMLONG(1000), MPFROMLONG(50));
+                      MPFROMLONG(1000), MPFROMLONG(50));
     WinSendDlgItemMsg(hwnd,
-                      CFG5_FILTER,
-                      EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      CFG5_FILTER,
+                      EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
     break;
@@ -2188 +2188 @@
     if (CHARMSG(&msg)->fs & KC_VIRTUALKEY) {
       switch (CHARMSG(&msg)->vkey) {
-        case VK_F3:
-        case VK_ENTER:
-        case VK_NEWLINE:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
-          return 0;
-          break;
-        case VK_ESC:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
-          return 0;
-          break;
-        case VK_F1:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
-          return 0;
-          break;
+        case VK_F3:
+        case VK_ENTER:
+        case VK_NEWLINE:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
+          return 0;
+          break;
+        case VK_ESC:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
+          return 0;
+          break;
+        case VK_F1:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
+          return 0;
+          break;
       }
     }
@@ -2216 +2216 @@
 
       if (!PrfQueryProfileData(fmprof,
-                               appname,
-                               "DirflWindowAttr", &flWindowAttr, &ulSize))
-        flWindowAttr = (CV_NAME | CV_MINI | CA_DETAILSVIEWTITLES | CV_FLOW);
+                               appname,
+                               "DirflWindowAttr", &flWindowAttr, &ulSize))
+        flWindowAttr = (CV_NAME | CV_MINI | CA_DETAILSVIEWTITLES | CV_FLOW);
       if (flWindowAttr & CV_ICON)
-        WinCheckButton(hwnd, CFG5_ICON, TRUE);
+        WinCheckButton(hwnd, CFG5_ICON, TRUE);
       if (flWindowAttr & CV_NAME)
-        WinCheckButton(hwnd, CFG5_NAME, TRUE);
+        WinCheckButton(hwnd, CFG5_NAME, TRUE);
       if (flWindowAttr & CV_TEXT)
-        WinCheckButton(hwnd, CFG5_TEXT, TRUE);
+        WinCheckButton(hwnd, CFG5_TEXT, TRUE);
       if (flWindowAttr & CV_DETAIL)
-        WinCheckButton(hwnd, CFG5_DETAIL, TRUE);
+        WinCheckButton(hwnd, CFG5_DETAIL, TRUE);
       if (flWindowAttr & CV_MINI)
-        WinCheckButton(hwnd, CFG5_MINIICONS, TRUE);
+        WinCheckButton(hwnd, CFG5_MINIICONS, TRUE);
       if (flWindowAttr & CA_DETAILSVIEWTITLES)
-        WinCheckButton(hwnd, CFG5_SHOWTITLES, TRUE);
+        WinCheckButton(hwnd, CFG5_SHOWTITLES, TRUE);
       WinCheckButton(hwnd, CFG5_SHOWLNAMES, dsDirCnrDefault.detailslongname);
       WinCheckButton(hwnd, CFG5_SHOWSUBJECT, dsDirCnrDefault.detailssubject);
@@ -2245 +2245 @@
       memset(&mask, 0, sizeof(mask));
       mask.attrFile = FILE_DIRECTORY | FILE_ARCHIVED | FILE_HIDDEN |
-        FILE_SYSTEM | FILE_NORMAL | FILE_READONLY;
+        FILE_SYSTEM | FILE_NORMAL | FILE_READONLY;
       ulSize = sizeof(MASK);
       if (PrfQueryProfileData(fmprof, appname, "DirFilter", &mask, &ulSize))
-        SetMask(NULL, &mask);
+        SetMask(NULL, &mask);
       if (!mask.attrFile)
-        mask.attrFile = FILE_DIRECTORY | FILE_ARCHIVED | FILE_HIDDEN |
-          FILE_SYSTEM | FILE_NORMAL | FILE_READONLY;
+        mask.attrFile = FILE_DIRECTORY | FILE_ARCHIVED | FILE_HIDDEN |
+          FILE_SYSTEM | FILE_NORMAL | FILE_READONLY;
       strcpy(mask.prompt, GetPString(IDS_DEFDIRFILTERTITLETEXT));
       WinSetDlgItemText(hwnd, CFG5_FILTER, mask.szMask);
@@ -2257 +2257 @@
       WinCheckButton(hwnd, CFG5_SUBJECTLENGTHMAX, dsDirCnrDefault.fSubjectLengthMax);
       WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_SETCURRENTVALUE,
-                        MPFROMLONG(dsDirCnrDefault.SubjectDisplayWidth), MPVOID);
+                        MPFROMLONG(dsDirCnrDefault.SubjectDisplayWidth), MPVOID);
     }
     return 0;
@@ -2263 +2263 @@
   case UM_SETUP5:
     if (WinDlgBox(HWND_DESKTOP, hwndNotebook, PickMaskDlgProc,
-                  FM3ModHandle, MSK_FRAME, MPFROMP(&mask))) {
+                  FM3ModHandle, MSK_FRAME, MPFROMP(&mask))) {
       SetMask(NULL, &mask);
       WinSetDlgItemText(hwnd, CFG5_FILTER, mask.szMask);
@@ -2274 +2274 @@
       switch (SHORT2FROMMP(mp1)) {
       case EN_SETFOCUS:
-        PostMsg(hwnd, UM_FOCUSME, MPVOID, MPVOID);
-        PostMsg(hwnd, UM_SETUP5, MPVOID, MPVOID);
-        break;
+        PostMsg(hwnd, UM_FOCUSME, MPVOID, MPVOID);
+        PostMsg(hwnd, UM_SETUP5, MPVOID, MPVOID);
+        break;
       }
       break;
@@ -2297 +2297 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFG5, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFG5, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -2308 +2308 @@
 
       if (WinQueryButtonCheckstate(hwnd, CFG5_ICON))
-        flWindowAttr |= CV_ICON;
+        flWindowAttr |= CV_ICON;
       if (WinQueryButtonCheckstate(hwnd, CFG5_NAME))
-        flWindowAttr |= CV_NAME;
+        flWindowAttr |= CV_NAME;
       if (WinQueryButtonCheckstate(hwnd, CFG5_TEXT))
-        flWindowAttr |= CV_TEXT;
+        flWindowAttr |= CV_TEXT;
       if (WinQueryButtonCheckstate(hwnd, CFG5_DETAIL))
-        flWindowAttr |= CV_DETAIL;
+        flWindowAttr |= CV_DETAIL;
       if (WinQueryButtonCheckstate(hwnd, CFG5_MINIICONS))
-        flWindowAttr |= CV_MINI;
+        flWindowAttr |= CV_MINI;
       if (WinQueryButtonCheckstate(hwnd, CFG5_SHOWTITLES))
-        flWindowAttr |= CA_DETAILSVIEWTITLES;
+        flWindowAttr |= CA_DETAILSVIEWTITLES;
       flWindowAttr |= CV_FLOW;
       PrfWriteProfileData(fmprof,
-                          appname,
-                          "DirflWindowAttr", &flWindowAttr, sizeof(ULONG));
+                          appname,
+                          "DirflWindowAttr", &flWindowAttr, sizeof(ULONG));
     }
     dsDirCnrDefault.detailslongname = WinQueryButtonCheckstate(hwnd, CFG5_SHOWLNAMES);
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsLongname",
-                        &dsDirCnrDefault.detailslongname, sizeof(BOOL));
+                        &dsDirCnrDefault.detailslongname, sizeof(BOOL));
     dsDirCnrDefault.detailssubject = WinQueryButtonCheckstate(hwnd, CFG5_SHOWSUBJECT);
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsSubject",
-                        &dsDirCnrDefault.detailssubject, sizeof(BOOL));
+                        &dsDirCnrDefault.detailssubject, sizeof(BOOL));
     dsDirCnrDefault.detailsea = WinQueryButtonCheckstate(hwnd, CFG5_SHOWSUBJECT);
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsEA",
-                        &dsDirCnrDefault.detailsea, sizeof(BOOL));
+                        &dsDirCnrDefault.detailsea, sizeof(BOOL));
     dsDirCnrDefault.detailssize = WinQueryButtonCheckstate(hwnd, CFG5_SHOWSIZE);
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsSize",
-                        &dsDirCnrDefault.detailssize, sizeof(BOOL));
+                        &dsDirCnrDefault.detailssize, sizeof(BOOL));
     dsDirCnrDefault.detailsicon = WinQueryButtonCheckstate(hwnd, CFG5_SHOWICON);
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsIcon",
-                        &dsDirCnrDefault.detailsicon, sizeof(BOOL));
+                        &dsDirCnrDefault.detailsicon, sizeof(BOOL));
     dsDirCnrDefault.detailslwdate = WinQueryButtonCheckstate(hwnd, CFG5_SHOWLWDATE);
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsLWDate",
-                        &dsDirCnrDefault.detailslwdate, sizeof(BOOL));
+                        &dsDirCnrDefault.detailslwdate, sizeof(BOOL));
     dsDirCnrDefault.detailslwtime = WinQueryButtonCheckstate(hwnd, CFG5_SHOWLWTIME);
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsLWTime",
-                        &dsDirCnrDefault.detailslwtime, sizeof(BOOL));
+                        &dsDirCnrDefault.detailslwtime, sizeof(BOOL));
     dsDirCnrDefault.detailsladate = WinQueryButtonCheckstate(hwnd, CFG5_SHOWLADATE);
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsLADate",
-                        &dsDirCnrDefault.detailsladate, sizeof(BOOL));
+                        &dsDirCnrDefault.detailsladate, sizeof(BOOL));
     dsDirCnrDefault.detailslatime = WinQueryButtonCheckstate(hwnd, CFG5_SHOWLATIME);
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsLATime",
-                        &dsDirCnrDefault.detailslatime, sizeof(BOOL));
+                        &dsDirCnrDefault.detailslatime, sizeof(BOOL));
     dsDirCnrDefault.detailscrdate = WinQueryButtonCheckstate(hwnd, CFG5_SHOWCRDATE);
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsCRDate",
-                        &dsDirCnrDefault.detailscrdate, sizeof(BOOL));
+                        &dsDirCnrDefault.detailscrdate, sizeof(BOOL));
     dsDirCnrDefault.detailscrtime = WinQueryButtonCheckstate(hwnd, CFG5_SHOWCRTIME);
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsCRTime",
-                        &dsDirCnrDefault.detailscrtime, sizeof(BOOL));
+                        &dsDirCnrDefault.detailscrtime, sizeof(BOOL));
     dsDirCnrDefault.detailsattr = WinQueryButtonCheckstate(hwnd, CFG5_SHOWATTR);
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsAttr",
-                        &dsDirCnrDefault.detailsattr, sizeof(BOOL));
+                        &dsDirCnrDefault.detailsattr, sizeof(BOOL));
     dsDirCnrDefault.fSubjectInLeftPane = WinQueryButtonCheckstate(hwnd, CFG5_SUBJECTINLEFTPANE);
     PrfWriteProfileData(fmprof, appname, "DirCnr.SubjectInLeftPane",
-                        &dsDirCnrDefault.fSubjectInLeftPane, sizeof(BOOL));
+                        &dsDirCnrDefault.fSubjectInLeftPane, sizeof(BOOL));
     dsDirCnrDefault.fSubjectLengthMax = WinQueryButtonCheckstate(hwnd, CFG5_SUBJECTLENGTHMAX);
     PrfWriteProfileData(fmprof, appname, "DirCnr.SubjectLengthMax",
-                        &dsDirCnrDefault.fSubjectLengthMax, sizeof(BOOL));
+                        &dsDirCnrDefault.fSubjectLengthMax, sizeof(BOOL));
     *mask.prompt = 0;
     PrfWriteProfileData(fmprof, appname, "DirFilter", &mask, sizeof(MASK));
     {
-        if (!WinQueryButtonCheckstate(hwnd, CFG5_SUBJECTLENGTHMAX)) {
-          WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_QUERYVALUE,
-                            MPFROMP(&dsDirCnrDefault.SubjectDisplayWidth), MPFROM2SHORT(0, SPBQ_DONOTUPDATE));
-          if (dsDirCnrDefault.SubjectDisplayWidth < 50)
-            dsDirCnrDefault.SubjectDisplayWidth = 0;
-          else if (dsDirCnrDefault.SubjectDisplayWidth > 1000)
-            dsDirCnrDefault.SubjectDisplayWidth = 1000;
-        }
-        else
-          dsDirCnrDefault.SubjectDisplayWidth = 0;
-        PrfWriteProfileData(fmprof,
-                            appname, "DirCnr.SubjectDisplayWidth",
-                            &dsDirCnrDefault.SubjectDisplayWidth, sizeof(ULONG));
+        if (!WinQueryButtonCheckstate(hwnd, CFG5_SUBJECTLENGTHMAX)) {
+          WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_QUERYVALUE,
+                            MPFROMP(&dsDirCnrDefault.SubjectDisplayWidth), MPFROM2SHORT(0, SPBQ_DONOTUPDATE));
+          if (dsDirCnrDefault.SubjectDisplayWidth < 50)
+            dsDirCnrDefault.SubjectDisplayWidth = 0;
+          else if (dsDirCnrDefault.SubjectDisplayWidth > 1000)
+            dsDirCnrDefault.SubjectDisplayWidth = 1000;
+        }
+        else
+          dsDirCnrDefault.SubjectDisplayWidth = 0;
+        PrfWriteProfileData(fmprof,
+                            appname, "DirCnr.SubjectDisplayWidth",
+                            &dsDirCnrDefault.SubjectDisplayWidth, sizeof(ULONG));
     }
     break;
@@ -2402 +2402 @@
     if (CHARMSG(&msg)->fs & KC_VIRTUALKEY) {
       switch (CHARMSG(&msg)->vkey) {
-        case VK_F3:
-        case VK_ENTER:
-        case VK_NEWLINE:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
-          return 0;
-          break;
-        case VK_ESC:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
-          return 0;
-          break;
-        case VK_F1:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
-          return 0;
-          break;
+        case VK_F3:
+        case VK_ENTER:
+        case VK_NEWLINE:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
+          return 0;
+          break;
+        case VK_ESC:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
+          return 0;
+          break;
+        case VK_F1:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
+          return 0;
+          break;
       }
     }
@@ -2463 +2463 @@
     case CFG6_SORTDIRSLAST:
       {
-        BOOL temp;
-
-        temp = WinQueryButtonCheckstate(hwnd, SHORT1FROMMP(mp1));
-        if (temp) {
-          switch (SHORT1FROMMP(mp1)) {
-          case CFG6_SORTDIRSFIRST:
-            WinCheckButton(hwnd, CFG6_SORTDIRSLAST, FALSE);
-            break;
-          case CFG6_SORTDIRSLAST:
-            WinCheckButton(hwnd, CFG6_SORTDIRSFIRST, FALSE);
-            break;
-          }
-        }
+        BOOL temp;
+
+        temp = WinQueryButtonCheckstate(hwnd, SHORT1FROMMP(mp1));
+        if (temp) {
+          switch (SHORT1FROMMP(mp1)) {
+          case CFG6_SORTDIRSFIRST:
+            WinCheckButton(hwnd, CFG6_SORTDIRSLAST, FALSE);
+            break;
+          case CFG6_SORTDIRSLAST:
+            WinCheckButton(hwnd, CFG6_SORTDIRSFIRST, FALSE);
+            break;
+          }
+        }
       }
       break;
@@ -2496 +2496 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFG6, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFG6, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -2539 +2539 @@
   case WM_INITDLG:
     WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_SETTEXTLIMIT,
-                      MPFROMSHORT(8), MPVOID);
+                      MPFROMSHORT(8), MPVOID);
     WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_OVERRIDESETLIMITS,
-                      MPFROMLONG(1000), MPFROMLONG(50));
+                      MPFROMLONG(1000), MPFROMLONG(50));
     WinSendDlgItemMsg(hwnd, CFG5_FILTER, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
     break;
@@ -2554 +2554 @@
     if (CHARMSG(&msg)->fs & KC_VIRTUALKEY) {
       switch (CHARMSG(&msg)->vkey) {
-        case VK_F3:
-        case VK_ENTER:
-        case VK_NEWLINE:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
-          return 0;
-          break;
-        case VK_ESC:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
-          return 0;
-          break;
-        case VK_F1:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
-          return 0;
-          break;
+        case VK_F3:
+        case VK_ENTER:
+        case VK_NEWLINE:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
+          return 0;
+          break;
+        case VK_ESC:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
+          return 0;
+          break;
+        case VK_F1:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
+          return 0;
+          break;
       }
     }
@@ -2583 +2583 @@
 
       if (!PrfQueryProfileData(fmprof,
-                               appname,
-                               "CollectorflWindowAttr", &flWindowAttr, &ulSize))
-        flWindowAttr = (CV_NAME | CA_DETAILSVIEWTITLES | CV_MINI | CV_FLOW);
+                               appname,
+                               "CollectorflWindowAttr", &flWindowAttr, &ulSize))
+        flWindowAttr = (CV_NAME | CA_DETAILSVIEWTITLES | CV_MINI | CV_FLOW);
       if (flWindowAttr & CV_ICON)
-        WinCheckButton(hwnd, CFG5_ICON, TRUE);
+        WinCheckButton(hwnd, CFG5_ICON, TRUE);
       if (flWindowAttr & CV_NAME)
-        WinCheckButton(hwnd, CFG5_NAME, TRUE);
+        WinCheckButton(hwnd, CFG5_NAME, TRUE);
       if (flWindowAttr & CV_TEXT)
-        WinCheckButton(hwnd, CFG5_TEXT, TRUE);
+        WinCheckButton(hwnd, CFG5_TEXT, TRUE);
       if (flWindowAttr & CV_DETAIL)
-        WinCheckButton(hwnd, CFG5_DETAIL, TRUE);
+        WinCheckButton(hwnd, CFG5_DETAIL, TRUE);
       if (flWindowAttr & CV_MINI)
-        WinCheckButton(hwnd, CFG5_MINIICONS, TRUE);
+        WinCheckButton(hwnd, CFG5_MINIICONS, TRUE);
       if (flWindowAttr & CA_DETAILSVIEWTITLES)
-        WinCheckButton(hwnd, CFG5_SHOWTITLES, TRUE);
+        WinCheckButton(hwnd, CFG5_SHOWTITLES, TRUE);
       memset(&mask, 0, sizeof(mask));
       mask.attrFile = FILE_DIRECTORY | FILE_ARCHIVED | FILE_HIDDEN |
-        FILE_SYSTEM | FILE_NORMAL | FILE_READONLY;
+        FILE_SYSTEM | FILE_NORMAL | FILE_READONLY;
       ulSize = sizeof(MASK);
       if (PrfQueryProfileData(fmprof,
-                              appname, "CollectorFilter", &mask, &ulSize)) {
-        SetMask(NULL, &mask);
+                              appname, "CollectorFilter", &mask, &ulSize)) {
+        SetMask(NULL, &mask);
       }
       if (!mask.attrFile)
-        mask.attrFile = FILE_DIRECTORY | FILE_ARCHIVED | FILE_HIDDEN |
-          FILE_SYSTEM | FILE_NORMAL | FILE_READONLY;
+        mask.attrFile = FILE_DIRECTORY | FILE_ARCHIVED | FILE_HIDDEN |
+          FILE_SYSTEM | FILE_NORMAL | FILE_READONLY;
       strcpy(mask.prompt, GetPString(IDS_DEFCOLFILTERTITLETEXT));
       WinSetDlgItemText(hwnd, CFG5_FILTER, mask.szMask);
@@ -2632 +2632 @@
       WinCheckButton(hwnd, CFG5_SUBJECTLENGTHMAX, ds.fSubjectLengthMax);
       WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_SETCURRENTVALUE,
-                        MPFROMLONG(ds.SubjectDisplayWidth), MPVOID);
+                        MPFROMLONG(ds.SubjectDisplayWidth), MPVOID);
 
     }
@@ -2639 +2639 @@
   case UM_SETUP5:
     if (WinDlgBox(HWND_DESKTOP, hwndNotebook, PickMaskDlgProc,
-                  FM3ModHandle, MSK_FRAME, MPFROMP(&mask))) {
+                  FM3ModHandle, MSK_FRAME, MPFROMP(&mask))) {
       SetMask(NULL, &mask);
       WinSetDlgItemText(hwnd, CFG5_FILTER, mask.szMask);
@@ -2650 +2650 @@
       switch (SHORT2FROMMP(mp1)) {
       case EN_SETFOCUS:
-        PostMsg(hwnd, UM_FOCUSME, MPVOID, MPVOID);
-        PostMsg(hwnd, UM_SETUP5, MPVOID, MPVOID);
-        break;
+        PostMsg(hwnd, UM_FOCUSME, MPVOID, MPVOID);
+        PostMsg(hwnd, UM_SETUP5, MPVOID, MPVOID);
+        break;
       }
       break;
@@ -2673 +2673 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFG7, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFG7, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -2681 +2681 @@
   case WM_CLOSE:
     fExternalCollector = WinQueryButtonCheckstate(hwnd,
-                                                  CFG5_EXTERNALCOLLECTOR);
+                                                  CFG5_EXTERNALCOLLECTOR);
     PrfWriteProfileData(fmprof, FM3Str, "ExternalCollector",
-                        &fExternalCollector, sizeof(BOOL));
+                        &fExternalCollector, sizeof(BOOL));
     {
       ULONG flWindowAttr = 0;
 
       if (WinQueryButtonCheckstate(hwnd, CFG5_ICON))
-        flWindowAttr |= CV_ICON;
+        flWindowAttr |= CV_ICON;
       if (WinQueryButtonCheckstate(hwnd, CFG5_NAME))
-        flWindowAttr |= CV_NAME;
+        flWindowAttr |= CV_NAME;
       if (WinQueryButtonCheckstate(hwnd, CFG5_TEXT))
-        flWindowAttr |= CV_TEXT;
+        flWindowAttr |= CV_TEXT;
       if (WinQueryButtonCheckstate(hwnd, CFG5_DETAIL))
-        flWindowAttr |= CV_DETAIL;
+        flWindowAttr |= CV_DETAIL;
       if (WinQueryButtonCheckstate(hwnd, CFG5_MINIICONS))
-        flWindowAttr |= CV_MINI;
+        flWindowAttr |= CV_MINI;
       if (WinQueryButtonCheckstate(hwnd, CFG5_SHOWTITLES))
-        flWindowAttr |= CA_DETAILSVIEWTITLES;
+        flWindowAttr |= CA_DETAILSVIEWTITLES;
       flWindowAttr |= CV_FLOW;
       PrfWriteProfileData(fmprof, appname, "CollectorflWindowAttr",
-                          &flWindowAttr, sizeof(ULONG));
+                          &flWindowAttr, sizeof(ULONG));
     }
     {
@@ -2709 +2709 @@
       ds.detailslongname = WinQueryButtonCheckstate(hwnd, CFG5_SHOWLNAMES);
       PrfWriteProfileData(fmprof, appname, "Collector.DetailsLongname",
-                          &ds.detailslongname, sizeof(BOOL));
+                          &ds.detailslongname, sizeof(BOOL));
       ds.detailssubject = WinQueryButtonCheckstate(hwnd, CFG5_SHOWSUBJECT);
       PrfWriteProfileData(fmprof, appname, "Collector.DetailsSubject",
-                          &ds.detailssubject, sizeof(BOOL));
+                          &ds.detailssubject, sizeof(BOOL));
       ds.detailsea = WinQueryButtonCheckstate(hwnd, CFG5_SHOWEAS);
       PrfWriteProfileData(fmprof, appname, "Collector.DetailsEA",
-                          &ds.detailsea, sizeof(BOOL));
+                          &ds.detailsea, sizeof(BOOL));
       ds.detailssize = WinQueryButtonCheckstate(hwnd, CFG5_SHOWSIZE);
       PrfWriteProfileData(fmprof, appname, "Collector.DetailsSize",
-                          &ds.detailssize, sizeof(BOOL));
+                          &ds.detailssize, sizeof(BOOL));
       ds.detailsicon = WinQueryButtonCheckstate(hwnd, CFG5_SHOWICON);
       PrfWriteProfileData(fmprof, appname, "Collector.DetailsIcon",
-                          &ds.detailsicon, sizeof(BOOL));
+                          &ds.detailsicon, sizeof(BOOL));
       ds.detailslwdate = WinQueryButtonCheckstate(hwnd, CFG5_SHOWLWDATE);
       PrfWriteProfileData(fmprof, appname, "Collector.DetailsLWDate",
-                          &ds.detailslwdate, sizeof(BOOL));
+                          &ds.detailslwdate, sizeof(BOOL));
       ds.detailslwtime = WinQueryButtonCheckstate(hwnd, CFG5_SHOWLWTIME);
       PrfWriteProfileData(fmprof, appname, "Collector.DetailsLWTime",
-                          &ds.detailslwtime, sizeof(BOOL));
+                          &ds.detailslwtime, sizeof(BOOL));
       ds.detailsladate = WinQueryButtonCheckstate(hwnd, CFG5_SHOWLADATE);
       PrfWriteProfileData(fmprof, appname, "Collector.DetailsLADate",
-                          &ds.detailsladate, sizeof(BOOL));
+                          &ds.detailsladate, sizeof(BOOL));
       ds.detailslatime = WinQueryButtonCheckstate(hwnd, CFG5_SHOWLATIME);
       PrfWriteProfileData(fmprof, appname, "Collector.DetailsLATime",
-                          &ds.detailslatime, sizeof(BOOL));
+                          &ds.detailslatime, sizeof(BOOL));
       ds.detailscrdate = WinQueryButtonCheckstate(hwnd, CFG5_SHOWCRDATE);
       PrfWriteProfileData(fmprof, appname, "Collector.DetailsCRDate",
-                          &ds.detailscrdate, sizeof(BOOL));
+                          &ds.detailscrdate, sizeof(BOOL));
       ds.detailscrtime = WinQueryButtonCheckstate(hwnd, CFG5_SHOWCRTIME);
       PrfWriteProfileData(fmprof, appname, "Collector.DetailsCRTime",
-                          &ds.detailscrtime, sizeof(BOOL));
+                          &ds.detailscrtime, sizeof(BOOL));
       ds.detailsattr = WinQueryButtonCheckstate(hwnd, CFG5_SHOWATTR);
       PrfWriteProfileData(fmprof, appname, "Collector.DetailsAttr",
-                          &ds.detailsattr, sizeof(BOOL));
+                          &ds.detailsattr, sizeof(BOOL));
       ds.fSubjectInLeftPane = WinQueryButtonCheckstate(hwnd, CFG5_SUBJECTINLEFTPANE);
       PrfWriteProfileData(fmprof, appname, "Collector.SubjectInLeftPane",
-                          &ds.fSubjectInLeftPane, sizeof(BOOL));
+                          &ds.fSubjectInLeftPane, sizeof(BOOL));
       ds.fSubjectLengthMax = WinQueryButtonCheckstate(hwnd, CFG5_SUBJECTLENGTHMAX);
       PrfWriteProfileData(fmprof, appname, "Collector.SubjectLengthMax",
-                          &ds.fSubjectLengthMax, sizeof(BOOL));
+                          &ds.fSubjectLengthMax, sizeof(BOOL));
       *mask.prompt = 0;
       PrfWriteProfileData(fmprof,
-                          appname, "CollectorFilter", &mask, sizeof(MASK));
+                          appname, "CollectorFilter", &mask, sizeof(MASK));
       {
-        if (!WinQueryButtonCheckstate(hwnd, CFG5_SUBJECTLENGTHMAX)) {
-          WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_QUERYVALUE,
-                            MPFROMP(&ds.SubjectDisplayWidth), MPFROM2SHORT(0, SPBQ_DONOTUPDATE));
-          if (ds.SubjectDisplayWidth < 50)
-            ds.SubjectDisplayWidth = 0;
-          else if (ds.SubjectDisplayWidth > 1000)
-            ds.SubjectDisplayWidth = 1000;
-        }
-        else
-          ds.SubjectDisplayWidth = 0;
-        PrfWriteProfileData(fmprof,
-                            appname, "Collector.SubjectDisplayWidth",
-                            &ds.SubjectDisplayWidth, sizeof(ULONG));
+        if (!WinQueryButtonCheckstate(hwnd, CFG5_SUBJECTLENGTHMAX)) {
+          WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_QUERYVALUE,
+                            MPFROMP(&ds.SubjectDisplayWidth), MPFROM2SHORT(0, SPBQ_DONOTUPDATE));
+          if (ds.SubjectDisplayWidth < 50)
+            ds.SubjectDisplayWidth = 0;
+          else if (ds.SubjectDisplayWidth > 1000)
+            ds.SubjectDisplayWidth = 1000;
+        }
+        else
+          ds.SubjectDisplayWidth = 0;
+        PrfWriteProfileData(fmprof,
+                            appname, "Collector.SubjectDisplayWidth",
+                            &ds.SubjectDisplayWidth, sizeof(ULONG));
       }
     }
@@ -2787 +2787 @@
     if (CHARMSG(&msg)->fs & KC_VIRTUALKEY) {
       switch (CHARMSG(&msg)->vkey) {
-        case VK_F3:
-        case VK_ENTER:
-        case VK_NEWLINE:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
-          return 0;
-          break;
-        case VK_ESC:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
-          return 0;
-          break;
-        case VK_F1:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
-          return 0;
-          break;
+        case VK_F3:
+        case VK_ENTER:
+        case VK_NEWLINE:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
+          return 0;
+          break;
+        case VK_ESC:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
+          return 0;
+          break;
+        case VK_F1:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
+          return 0;
+          break;
       }
     }
@@ -2848 +2848 @@
     case CFG6_SORTDIRSLAST:
       {
-        BOOL temp;
-
-        temp = WinQueryButtonCheckstate(hwnd, SHORT1FROMMP(mp1));
-        if (temp) {
-          switch (SHORT1FROMMP(mp1)) {
-          case CFG6_SORTDIRSFIRST:
-            WinCheckButton(hwnd, CFG6_SORTDIRSLAST, FALSE);
-            break;
-          case CFG6_SORTDIRSLAST:
-            WinCheckButton(hwnd, CFG6_SORTDIRSFIRST, FALSE);
-            break;
-          }
-        }
+        BOOL temp;
+
+        temp = WinQueryButtonCheckstate(hwnd, SHORT1FROMMP(mp1));
+        if (temp) {
+          switch (SHORT1FROMMP(mp1)) {
+          case CFG6_SORTDIRSFIRST:
+            WinCheckButton(hwnd, CFG6_SORTDIRSLAST, FALSE);
+            break;
+          case CFG6_SORTDIRSLAST:
+            WinCheckButton(hwnd, CFG6_SORTDIRSFIRST, FALSE);
+            break;
+          }
+        }
       }
       break;
@@ -2881 +2881 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFG8, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFG8, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -2912 +2912 @@
       CollectorsortFlags |= SORT_REVERSE;
     PrfWriteProfileData(fmprof,
-                        appname,
-                        "CollectorSort", &CollectorsortFlags, sizeof(INT));
+                        appname,
+                        "CollectorSort", &CollectorsortFlags, sizeof(INT));
     break;
   }
@@ -2932 +2932 @@
     if (CHARMSG(&msg)->fs & KC_VIRTUALKEY) {
       switch (CHARMSG(&msg)->vkey) {
-        case VK_F3:
-        case VK_ENTER:
-        case VK_NEWLINE:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
-          return 0;
-          break;
-        case VK_ESC:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
-          return 0;
-          break;
-        case VK_F1:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
-          return 0;
-          break;
+        case VK_F3:
+        case VK_ENTER:
+        case VK_NEWLINE:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
+          return 0;
+          break;
+        case VK_ESC:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
+          return 0;
+          break;
+        case VK_F1:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
+          return 0;
+          break;
       }
     }
@@ -2954 +2954 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFG9, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFG9, 0), MPFROMSHORT(HM_RESOURCEID));
       return 0;
     case CFG9_MAXIMUMUI:
       if (hwndMain) {
-        if (MenuInvisible)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_HIDEMENU, 0), MPVOID);
-        if (!fAutoView)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_AUTOVIEW, 0), MPVOID);
-        if (!fDrivebar)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_DRIVEBAR, 0), MPVOID);
-        if (!fToolbar)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_TOOLBAR, 0), MPVOID);
-        if (!fMoreButtons)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_MOREBUTTONS, 0), MPVOID);
-        if (!fUserComboBox)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_USERLIST, 0), MPVOID);
+        if (MenuInvisible)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_HIDEMENU, 0), MPVOID);
+        if (!fAutoView)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_AUTOVIEW, 0), MPVOID);
+        if (!fDrivebar)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_DRIVEBAR, 0), MPVOID);
+        if (!fToolbar)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_TOOLBAR, 0), MPVOID);
+        if (!fMoreButtons)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_MOREBUTTONS, 0), MPVOID);
+        if (!fUserComboBox)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_USERLIST, 0), MPVOID);
       }
       return 0;
     case CFG9_MINIMUMUI:
       if (hwndMain) {
-        if (!MenuInvisible)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_HIDEMENU, 0), MPVOID);
-        if (fAutoView)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_AUTOVIEW, 0), MPVOID);
-        if (fToolbar)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_TOOLBAR, 0), MPVOID);
-        if (fMoreButtons)
-          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_MOREBUTTONS, 0),
-                     MPVOID);
-        if (fUserComboBox)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_USERLIST, 0), MPVOID);
-        saymsg(MB_ENTER | MB_ICONASTERISK,
-               hwnd,
-               GetPString(IDS_DONTFORGETTEXT),
-               GetPString(IDS_UNHIDEMENUWARNTEXT));
+        if (!MenuInvisible)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_HIDEMENU, 0), MPVOID);
+        if (fAutoView)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_AUTOVIEW, 0), MPVOID);
+        if (fToolbar)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_TOOLBAR, 0), MPVOID);
+        if (fMoreButtons)
+          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_MOREBUTTONS, 0),
+                     MPVOID);
+        if (fUserComboBox)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_USERLIST, 0), MPVOID);
+        saymsg(MB_ENTER | MB_ICONASTERISK,
+               hwnd,
+               GetPString(IDS_DONTFORGETTEXT),
+               GetPString(IDS_UNHIDEMENUWARNTEXT));
       }
       return 0;
@@ -3013 +3013 @@
       fDragndropDlg = TRUE;
       {
-        ULONG flWindowAttr;
-
-        flWindowAttr = CV_DETAIL | CV_FLOW | CA_DETAILSVIEWTITLES;
-        PrfWriteProfileData(fmprof,
-                            appname,
-                            "DirflWindowAttr", &flWindowAttr, sizeof(ULONG));
-        PrfWriteProfileData(fmprof,
-                            appname,
-                            "CollectorflWindowAttr",
-                            &flWindowAttr, sizeof(ULONG));
-        PrfWriteProfileData(fmprof,
-                            appname, "Collector.Fontnamesize", NULL, 0);
+        ULONG flWindowAttr;
+
+        flWindowAttr = CV_DETAIL | CV_FLOW | CA_DETAILSVIEWTITLES;
+        PrfWriteProfileData(fmprof,
+                            appname,
+                            "DirflWindowAttr", &flWindowAttr, sizeof(ULONG));
+        PrfWriteProfileData(fmprof,
+                            appname,
+                            "CollectorflWindowAttr",
+                            &flWindowAttr, sizeof(ULONG));
+        PrfWriteProfileData(fmprof,
+                            appname, "Collector.Fontnamesize", NULL, 0);
       }
       dsDirCnrDefault.detailslongname = TRUE;
@@ -3040 +3040 @@
       if (hwndTree) {
 
-        CNRINFO cnri;
-        ULONG flWindowAttr = CV_TREE | CV_ICON | CV_FLOW | CA_TREELINE;
-
-        memset(&cnri, 0, sizeof(cnri));
-        cnri.cb = sizeof(cnri);
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
-        cnri.flWindowAttr = flWindowAttr;
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_SETCNRINFO, MPFROMP(&cnri),
-                   MPFROMLONG(CMA_FLWINDOWATTR));
+        CNRINFO cnri;
+        ULONG flWindowAttr = CV_TREE | CV_ICON | CV_FLOW | CA_TREELINE;
+
+        memset(&cnri, 0, sizeof(cnri));
+        cnri.cb = sizeof(cnri);
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
+        cnri.flWindowAttr = flWindowAttr;
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_SETCNRINFO, MPFROMP(&cnri),
+                   MPFROMLONG(CMA_FLWINDOWATTR));
       }
       break;
@@ -3067 +3067 @@
       fDragndropDlg = TRUE;
       {
-        ULONG flWindowAttr;
-
-        flWindowAttr = CV_DETAIL | CV_FLOW | CV_MINI;
-        PrfWriteProfileData(fmprof,
-                            appname,
-                            "DirflWindowAttr", &flWindowAttr, sizeof(ULONG));
-        PrfWriteProfileData(fmprof,
-                            appname,
-                            "CollectorflWindowAttr",
-                            &flWindowAttr, sizeof(ULONG));
-        //fixme to allow user to change presparams 1-10-09 GKY
-        PrfWriteProfileData(fmprof,
-                            appname,
-                            "Collector.Fontnamesize",
-                            FNT_8HELVETICA,
-                            strlen(FNT_8HELVETICA) + 1);
+        ULONG flWindowAttr;
+
+        flWindowAttr = CV_DETAIL | CV_FLOW | CV_MINI;
+        PrfWriteProfileData(fmprof,
+                            appname,
+                            "DirflWindowAttr", &flWindowAttr, sizeof(ULONG));
+        PrfWriteProfileData(fmprof,
+                            appname,
+                            "CollectorflWindowAttr",
+                            &flWindowAttr, sizeof(ULONG));
+        //fixme to allow user to change presparams 1-10-09 GKY
+        PrfWriteProfileData(fmprof,
+                            appname,
+                            "Collector.Fontnamesize",
+                            FNT_8HELVETICA,
+                            strlen(FNT_8HELVETICA) + 1);
       }
       dsDirCnrDefault.detailslongname = TRUE;
@@ -3098 +3098 @@
       if (hwndTree) {
 
-        CNRINFO cnri;
-        ULONG flWindowAttr = CV_TREE | CV_MINI | CV_TEXT |
-          CV_FLOW | CA_TREELINE;
-
-        memset(&cnri, 0, sizeof(cnri));
-        cnri.cb = sizeof(cnri);
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
-        cnri.flWindowAttr = flWindowAttr;
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_SETCNRINFO, MPFROMP(&cnri),
-                   MPFROMLONG(CMA_FLWINDOWATTR));
+        CNRINFO cnri;
+        ULONG flWindowAttr = CV_TREE | CV_MINI | CV_TEXT |
+          CV_FLOW | CA_TREELINE;
+
+        memset(&cnri, 0, sizeof(cnri));
+        cnri.cb = sizeof(cnri);
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
+        cnri.flWindowAttr = flWindowAttr;
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_SETCNRINFO, MPFROMP(&cnri),
+                   MPFROMLONG(CMA_FLWINDOWATTR));
       }
       break;
     case CFG9_MAXFILENAMES:
       if (hwndMain && fAutoView)
-        WinSendMsg(hwndMain, WM_COMMAND,
-                   MPFROM2SHORT(IDM_AUTOVIEW, 0), MPVOID);
+        WinSendMsg(hwndMain, WM_COMMAND,
+                   MPFROM2SHORT(IDM_AUTOVIEW, 0), MPVOID);
       fForceUpper = FALSE;
       fForceLower = TRUE;
@@ -3129 +3129 @@
       fNoIconsDirs = TRUE;
       {
-        ULONG flWindowAttr;
-
-        flWindowAttr = CV_TEXT | CV_FLOW;
-        PrfWriteProfileData(fmprof, appname, "DirflWindowAttr",
-                            &flWindowAttr, sizeof(ULONG));
-        PrfWriteProfileData(fmprof, appname, "CollectorflWindowAttr",
-                            &flWindowAttr, sizeof(ULONG));
-        //fixme to allow user to change presparams 1-10-09 GKY
-        PrfWriteProfileData(fmprof, appname, "Collector.Fontnamesize",
-                            FNT_8HELVETICA,
-                            strlen(FNT_8HELVETICA) + 1);
+        ULONG flWindowAttr;
+
+        flWindowAttr = CV_TEXT | CV_FLOW;
+        PrfWriteProfileData(fmprof, appname, "DirflWindowAttr",
+                            &flWindowAttr, sizeof(ULONG));
+        PrfWriteProfileData(fmprof, appname, "CollectorflWindowAttr",
+                            &flWindowAttr, sizeof(ULONG));
+        //fixme to allow user to change presparams 1-10-09 GKY
+        PrfWriteProfileData(fmprof, appname, "Collector.Fontnamesize",
+                            FNT_8HELVETICA,
+                            strlen(FNT_8HELVETICA) + 1);
       }
       if (hwndTree) {
 
-        CNRINFO cnri;
-        ULONG flWindowAttr = CV_TREE | CV_TEXT | CV_FLOW | CA_TREELINE;
-
-        memset(&cnri, 0, sizeof(cnri));
-        cnri.cb = sizeof(cnri);
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
-        cnri.flWindowAttr = flWindowAttr;
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_SETCNRINFO, MPFROMP(&cnri),
-                   MPFROMLONG(CMA_FLWINDOWATTR));
+        CNRINFO cnri;
+        ULONG flWindowAttr = CV_TREE | CV_TEXT | CV_FLOW | CA_TREELINE;
+
+        memset(&cnri, 0, sizeof(cnri));
+        cnri.cb = sizeof(cnri);
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
+        cnri.flWindowAttr = flWindowAttr;
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_SETCNRINFO, MPFROMP(&cnri),
+                   MPFROMLONG(CMA_FLWINDOWATTR));
       }
       break;
@@ -3225 +3225 @@
       fNoTreeGap = TRUE;
       {
-        ULONG flWindowAttr;
-
-        flWindowAttr = (CV_NAME | CV_MINI | CV_FLOW | CA_DETAILSVIEWTITLES);
-        PrfWriteProfileData(fmprof, appname, "DirflWindowAttr",
-                            &flWindowAttr, sizeof(ULONG));
-        PrfWriteProfileData(fmprof, appname, "CollectorflWindowAttr",
-                            &flWindowAttr, sizeof(ULONG));
+        ULONG flWindowAttr;
+
+        flWindowAttr = (CV_NAME | CV_MINI | CV_FLOW | CA_DETAILSVIEWTITLES);
+        PrfWriteProfileData(fmprof, appname, "DirflWindowAttr",
+                            &flWindowAttr, sizeof(ULONG));
+        PrfWriteProfileData(fmprof, appname, "CollectorflWindowAttr",
+                            &flWindowAttr, sizeof(ULONG));
       }
       dsDirCnrDefault.detailslongname = FALSE;
@@ -3249 +3249 @@
       if (hwndMain) {
 
-        SWP swp;
-
-        if (WinQueryWindowPos(hwndMain, &swp)) {
-          WinSetWindowPos(hwndTree, HWND_TOP, 0, 0,
-                          swp.cx / 5, swp.cy, SWP_MOVE | SWP_SIZE);
-        }
-        if (MenuInvisible)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_HIDEMENU, 0), MPVOID);
-        if (fAutoView)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_AUTOVIEW, 0), MPVOID);
-        if (fToolbar)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_TOOLBAR, 0), MPVOID);
-        if (!fDrivebar)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_DRIVEBAR, 0), MPVOID);
-        if (!fMoreButtons)
-          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_MOREBUTTONS, 0),
-                     MPVOID);
-        if (!fUserComboBox)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_USERLIST, 0), MPVOID);
+        SWP swp;
+
+        if (WinQueryWindowPos(hwndMain, &swp)) {
+          WinSetWindowPos(hwndTree, HWND_TOP, 0, 0,
+                          swp.cx / 5, swp.cy, SWP_MOVE | SWP_SIZE);
+        }
+        if (MenuInvisible)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_HIDEMENU, 0), MPVOID);
+        if (fAutoView)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_AUTOVIEW, 0), MPVOID);
+        if (fToolbar)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_TOOLBAR, 0), MPVOID);
+        if (!fDrivebar)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_DRIVEBAR, 0), MPVOID);
+        if (!fMoreButtons)
+          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_MOREBUTTONS, 0),
+                     MPVOID);
+        if (!fUserComboBox)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_USERLIST, 0), MPVOID);
       }
       if (hwndTree) {
 
-        CNRINFO cnri;
-        ULONG flWindowAttr = (CV_TREE | CV_TEXT | CV_MINI |
-                              CV_FLOW | CA_TREELINE);
-
-        memset(&cnri, 0, sizeof(cnri));
-        cnri.cb = sizeof(cnri);
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
-        cnri.flWindowAttr = flWindowAttr;
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_SETCNRINFO, MPFROMP(&cnri),
-                   MPFROMLONG(CMA_FLWINDOWATTR));
+        CNRINFO cnri;
+        ULONG flWindowAttr = (CV_TREE | CV_TEXT | CV_MINI |
+                              CV_FLOW | CA_TREELINE);
+
+        memset(&cnri, 0, sizeof(cnri));
+        cnri.cb = sizeof(cnri);
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
+        cnri.flWindowAttr = flWindowAttr;
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_SETCNRINFO, MPFROMP(&cnri),
+                   MPFROMLONG(CMA_FLWINDOWATTR));
       }
       break;
@@ -3342 +3342 @@
       fNoTreeGap = FALSE;
       {
-        ULONG flWindowAttr;
-
-        flWindowAttr = (CV_NAME | CV_MINI | CV_FLOW | CA_DETAILSVIEWTITLES);
-        PrfWriteProfileData(fmprof, appname, "DirflWindowAttr",
-                            &flWindowAttr, sizeof(ULONG));
-        PrfWriteProfileData(fmprof, appname, "CollectorflWindowAttr",
-                            &flWindowAttr, sizeof(ULONG));
+        ULONG flWindowAttr;
+
+        flWindowAttr = (CV_NAME | CV_MINI | CV_FLOW | CA_DETAILSVIEWTITLES);
+        PrfWriteProfileData(fmprof, appname, "DirflWindowAttr",
+                            &flWindowAttr, sizeof(ULONG));
+        PrfWriteProfileData(fmprof, appname, "CollectorflWindowAttr",
+                            &flWindowAttr, sizeof(ULONG));
       }
       dsDirCnrDefault.detailslongname = FALSE;
@@ -3366 +3366 @@
       if (hwndMain) {
 
-        SWP swp;
-
-        if (WinQueryWindowPos(hwndMain, &swp)) {
-          WinSetWindowPos(hwndTree, HWND_TOP, 0, 0,
-                          swp.cx / 5,
-                          swp.cy -
-                          (WinQuerySysValue(HWND_DESKTOP, SV_CYICON) * 2),
-                          SWP_MOVE | SWP_SIZE);
-        }
+        SWP swp;
+
+        if (WinQueryWindowPos(hwndMain, &swp)) {
+          WinSetWindowPos(hwndTree, HWND_TOP, 0, 0,
+                          swp.cx / 5,
+                          swp.cy -
+                          (WinQuerySysValue(HWND_DESKTOP, SV_CYICON) * 2),
+                          SWP_MOVE | SWP_SIZE);
+        }
       }
       if (hwndTree) {
 
-        CNRINFO cnri;
-        ULONG flWindowAttr = (CV_TREE | CV_TEXT |
-                              CV_FLOW | CA_TREELINE | CV_MINI);
-
-        memset(&cnri, 0, sizeof(cnri));
-        cnri.cb = sizeof(cnri);
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
-        cnri.flWindowAttr = flWindowAttr;
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_SETCNRINFO, MPFROMP(&cnri),
-                   MPFROMLONG(CMA_FLWINDOWATTR));
+        CNRINFO cnri;
+        ULONG flWindowAttr = (CV_TREE | CV_TEXT |
+                              CV_FLOW | CA_TREELINE | CV_MINI);
+
+        memset(&cnri, 0, sizeof(cnri));
+        cnri.cb = sizeof(cnri);
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
+        cnri.flWindowAttr = flWindowAttr;
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_SETCNRINFO, MPFROMP(&cnri),
+                   MPFROMLONG(CMA_FLWINDOWATTR));
       }
       break;
@@ -3406 +3406 @@
       fDCOpens = FALSE;
       {
-        ULONG flWindowAttr;
-
-        flWindowAttr = CV_NAME | CV_FLOW | CA_DETAILSVIEWTITLES;
-        PrfWriteProfileData(fmprof, appname, "DirflWindowAttr",
-                            &flWindowAttr, sizeof(ULONG));
-        PrfWriteProfileData(fmprof, appname, "CollectorflWindowAttr",
-                            &flWindowAttr, sizeof(ULONG));
+        ULONG flWindowAttr;
+
+        flWindowAttr = CV_NAME | CV_FLOW | CA_DETAILSVIEWTITLES;
+        PrfWriteProfileData(fmprof, appname, "DirflWindowAttr",
+                            &flWindowAttr, sizeof(ULONG));
+        PrfWriteProfileData(fmprof, appname, "CollectorflWindowAttr",
+                            &flWindowAttr, sizeof(ULONG));
       }
       fLinkSetsIcon = FALSE;
@@ -3423 +3423 @@
       fUserListSwitches = TRUE;
       WinSendMsg((HWND) WinQueryWindowULong(hwnd, QWL_USER), UM_UNDO, MPVOID,
-                 MPVOID);
+                 MPVOID);
       if (hwndTree) {
 
-        CNRINFO cnri;
-        ULONG flWindowAttr = CV_TREE | CV_MINI | CV_ICON |
-          CV_FLOW | CA_TREELINE;
-
-        memset(&cnri, 0, sizeof(cnri));
-        cnri.cb = sizeof(cnri);
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
-        cnri.flWindowAttr = flWindowAttr;
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_SETCNRINFO, MPFROMP(&cnri),
-                   MPFROMLONG(CMA_FLWINDOWATTR));
+        CNRINFO cnri;
+        ULONG flWindowAttr = CV_TREE | CV_MINI | CV_ICON |
+          CV_FLOW | CA_TREELINE;
+
+        memset(&cnri, 0, sizeof(cnri));
+        cnri.cb = sizeof(cnri);
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
+        cnri.flWindowAttr = flWindowAttr;
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_SETCNRINFO, MPFROMP(&cnri),
+                   MPFROMLONG(CMA_FLWINDOWATTR));
       }
       if (hwndMain) {
-        if (fAutoView)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_AUTOVIEW, 0), MPVOID);
-        if (!fDrivebar)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_DRIVEBAR, 0), MPVOID);
-        {
-          SWP swp;
-
-          if (WinQueryWindowPos(hwndMain, &swp)) {
-            WinSetWindowPos(hwndTree, HWND_TOP, 0, 0,
-                            swp.cx / 5, swp.cy, SWP_MOVE | SWP_SIZE);
-          }
-        }
-        PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2L));
-        PostMsg(MainObjectHwnd, UM_SETDIR, MPFROMLONG(1L), MPVOID);
+        if (fAutoView)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_AUTOVIEW, 0), MPVOID);
+        if (!fDrivebar)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_DRIVEBAR, 0), MPVOID);
+        {
+          SWP swp;
+
+          if (WinQueryWindowPos(hwndMain, &swp)) {
+            WinSetWindowPos(hwndTree, HWND_TOP, 0, 0,
+                            swp.cx / 5, swp.cy, SWP_MOVE | SWP_SIZE);
+          }
+        }
+        PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2L));
+        PostMsg(MainObjectHwnd, UM_SETDIR, MPFROMLONG(1L), MPVOID);
       }
       return 0;
@@ -3471 +3471 @@
       fTopDir = FALSE;
       if (hwndMain) {
-        if (!fTextTools)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_TEXTTOOLS, 0), MPVOID);
+        if (!fTextTools)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_TEXTTOOLS, 0), MPVOID);
       }
       {
-        ULONG flWindowAttr;
-
-        flWindowAttr = CV_TEXT | CV_FLOW | CA_DETAILSVIEWTITLES;
-        PrfWriteProfileData(fmprof, appname, "DirflWindowAttr",
-                            &flWindowAttr, sizeof(ULONG));
-        PrfWriteProfileData(fmprof, appname, "CollectorflWindowAttr",
-                            &flWindowAttr, sizeof(ULONG));
+        ULONG flWindowAttr;
+
+        flWindowAttr = CV_TEXT | CV_FLOW | CA_DETAILSVIEWTITLES;
+        PrfWriteProfileData(fmprof, appname, "DirflWindowAttr",
+                            &flWindowAttr, sizeof(ULONG));
+        PrfWriteProfileData(fmprof, appname, "CollectorflWindowAttr",
+                            &flWindowAttr, sizeof(ULONG));
       }
       if (hwndTree) {
 
-        CNRINFO cnri;
-        ULONG flWindowAttr = CV_TREE | CV_TEXT | CV_FLOW | CA_TREELINE;
-
-        memset(&cnri, 0, sizeof(cnri));
-        cnri.cb = sizeof(cnri);
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
-        cnri.flWindowAttr = flWindowAttr;
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_SETCNRINFO, MPFROMP(&cnri),
-                   MPFROMLONG(CMA_FLWINDOWATTR));
+        CNRINFO cnri;
+        ULONG flWindowAttr = CV_TREE | CV_TEXT | CV_FLOW | CA_TREELINE;
+
+        memset(&cnri, 0, sizeof(cnri));
+        cnri.cb = sizeof(cnri);
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
+        cnri.flWindowAttr = flWindowAttr;
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_SETCNRINFO, MPFROMP(&cnri),
+                   MPFROMLONG(CMA_FLWINDOWATTR));
       }
       /* intentional fallthru */
     case CFG9_1X:
       if (SHORT1FROMMP(mp1) == CFG9_1X) {
-        fTileBackwards = FALSE;
-        ulCnrType = CCS_MULTIPLESEL | CCS_EXTENDSEL;
-        fSwitchTree = FALSE;
-        fSwitchTreeOnFocus = FALSE;
-        fSwitchTreeExpand = FALSE;
-        fCollapseFirst = FALSE;
-        fFollowTree = FALSE;
-        fNoSearch = TRUE;
+        fTileBackwards = FALSE;
+        ulCnrType = CCS_MULTIPLESEL | CCS_EXTENDSEL;
+        fSwitchTree = FALSE;
+        fSwitchTreeOnFocus = FALSE;
+        fSwitchTreeExpand = FALSE;
+        fCollapseFirst = FALSE;
+        fFollowTree = FALSE;
+        fNoSearch = TRUE;
       }
       fAutoTile = TRUE;
@@ -3524 +3524 @@
       fUserListSwitches = TRUE;
       WinSendMsg((HWND) WinQueryWindowULong(hwnd, QWL_USER), UM_UNDO, MPVOID,
-                 MPVOID);
+                 MPVOID);
       if (hwndTree) {
 
-        CNRINFO cnri;
-        ULONG flWindowAttr = CV_TREE | CV_ICON | CV_FLOW | CA_TREELINE;
-
-        memset(&cnri, 0, sizeof(cnri));
-        cnri.cb = sizeof(cnri);
-        WinSendMsg(WinWindowFromID(WinWindowFromID(hwndTree, FID_CLIENT),
-                                   TREE_CNR),
-                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
-        cnri.flWindowAttr = flWindowAttr;
-        WinSendMsg(WinWindowFromID(WinWindowFromID(hwndTree, FID_CLIENT),
-                                   TREE_CNR),
-                   CM_SETCNRINFO,
-                   MPFROMP(&cnri), MPFROMLONG(CMA_FLWINDOWATTR));
+        CNRINFO cnri;
+        ULONG flWindowAttr = CV_TREE | CV_ICON | CV_FLOW | CA_TREELINE;
+
+        memset(&cnri, 0, sizeof(cnri));
+        cnri.cb = sizeof(cnri);
+        WinSendMsg(WinWindowFromID(WinWindowFromID(hwndTree, FID_CLIENT),
+                                   TREE_CNR),
+                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
+        cnri.flWindowAttr = flWindowAttr;
+        WinSendMsg(WinWindowFromID(WinWindowFromID(hwndTree, FID_CLIENT),
+                                   TREE_CNR),
+                   CM_SETCNRINFO,
+                   MPFROMP(&cnri), MPFROMLONG(CMA_FLWINDOWATTR));
       }
       if (hwndMain) {
-        if (fAutoView)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_AUTOVIEW, 0), MPVOID);
-        if (fUserComboBox)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_USERLIST, 0), MPVOID);
-        {
-          SWP swp;
-
-          if (WinQueryWindowPos(hwndMain, &swp)) {
-            WinSetWindowPos(hwndTree, HWND_TOP, 0, 0,
-                            swp.cx / 5, swp.cy, SWP_MOVE | SWP_SIZE);
-          }
-        }
-        PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2L));
-        PostMsg(MainObjectHwnd, UM_SETDIR, MPVOID, MPVOID);
+        if (fAutoView)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_AUTOVIEW, 0), MPVOID);
+        if (fUserComboBox)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_USERLIST, 0), MPVOID);
+        {
+          SWP swp;
+
+          if (WinQueryWindowPos(hwndMain, &swp)) {
+            WinSetWindowPos(hwndTree, HWND_TOP, 0, 0,
+                            swp.cx / 5, swp.cy, SWP_MOVE | SWP_SIZE);
+          }
+        }
+        PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2L));
+        PostMsg(MainObjectHwnd, UM_SETDIR, MPVOID, MPVOID);
       }
       return 0;
@@ -3573 +3573 @@
     // Save new details settings and refresh windows
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsLongname",
-                        &dsDirCnrDefault.detailslongname, sizeof(BOOL));
+                        &dsDirCnrDefault.detailslongname, sizeof(BOOL));
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsSubject",
-                        &dsDirCnrDefault.detailssubject, sizeof(BOOL));
+                        &dsDirCnrDefault.detailssubject, sizeof(BOOL));
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsEA",
-                        &dsDirCnrDefault.detailsea, sizeof(BOOL));
+                        &dsDirCnrDefault.detailsea, sizeof(BOOL));
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsSize",
-                        &dsDirCnrDefault.detailssize, sizeof(BOOL));
+                        &dsDirCnrDefault.detailssize, sizeof(BOOL));
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsIcon",
-                        &dsDirCnrDefault.detailsicon, sizeof(BOOL));
+                        &dsDirCnrDefault.detailsicon, sizeof(BOOL));
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsLWDate",
-                        &dsDirCnrDefault.detailslwdate, sizeof(BOOL));
+                        &dsDirCnrDefault.detailslwdate, sizeof(BOOL));
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsLWTime",
-                        &dsDirCnrDefault.detailslwtime, sizeof(BOOL));
+                        &dsDirCnrDefault.detailslwtime, sizeof(BOOL));
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsLADate",
-                        &dsDirCnrDefault.detailsladate, sizeof(BOOL));
+                        &dsDirCnrDefault.detailsladate, sizeof(BOOL));
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsLATime",
-                        &dsDirCnrDefault.detailslatime, sizeof(BOOL));
+                        &dsDirCnrDefault.detailslatime, sizeof(BOOL));
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsCRDate",
-                        &dsDirCnrDefault.detailscrdate, sizeof(BOOL));
+                        &dsDirCnrDefault.detailscrdate, sizeof(BOOL));
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsCRTime",
-                        &dsDirCnrDefault.detailscrtime, sizeof(BOOL));
+                        &dsDirCnrDefault.detailscrtime, sizeof(BOOL));
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsAttr",
-                        &dsDirCnrDefault.detailsattr, sizeof(BOOL));
+                        &dsDirCnrDefault.detailsattr, sizeof(BOOL));
     if (hwndMain) {
       // Save state and restore to refresh windows with new settings
       if (SaveDirCnrState(hwndMain, GetPString(IDS_FM2TEMPTEXT)) > 0) {
-        // Tell window procedure to close container windows
-        PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2));
-        // Restore saved state
-        PostMsg(MainObjectHwnd, UM_RESTORE, GetPString(IDS_FM2TEMPTEXT), MPVOID);
+        // Tell window procedure to close container windows
+        PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2));
+        // Restore saved state
+        PostMsg(MainObjectHwnd, UM_RESTORE, (PSZ)GetPString(IDS_FM2TEMPTEXT), MPVOID);
       }
     }
     WinSendMsg((HWND) WinQueryWindowULong(hwnd, QWL_USER),
-               UM_UNDO, MPVOID, MPVOID);
+               UM_UNDO, MPVOID, MPVOID);
     return 0;
 
@@ -3664 +3664 @@
       haccelCfg = WinLoadAccelTable(hab, FM3ModHandle, CFG_FRAME);
       if (haccelCfg == NULLHANDLE)
-        Win_Error(hwndNotebook, HWND_DESKTOP, pszSrcFile, __LINE__, "WinLoadAccelTable");
+        Win_Error(hwndNotebook, HWND_DESKTOP, pszSrcFile, __LINE__, "WinLoadAccelTable");
     }
     if (haccelCfg != NULLHANDLE) {
       if (!WinSetAccelTable(hab, haccelCfg, hwndNotebook))
-        Win_Error(hwndNotebook, HWND_DESKTOP, pszSrcFile, __LINE__, "WinSetAccelTable");
+        Win_Error(hwndNotebook, HWND_DESKTOP, pszSrcFile, __LINE__, "WinSetAccelTable");
       // else
-        // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_DRIVELIST %x %x", hwndFrame, haccelDriveList);
+        // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_DRIVELIST %x %x", hwndFrame, haccelDriveList);
     }
 
@@ -3679 +3679 @@
       hwndTemp = WinQueryWindow(hwnd, QW_OWNER);
       if (hwndTemp != HWND_DESKTOP) {
-        HWND hwndMenu;
-        // Owner is frame if not applet
-        hwndMenu = WinWindowFromID(hwndTemp, FID_MENU);
-        if (hwndMenu == NULLHANDLE)
-          Runtime_Error(pszSrcFile, __LINE__, "FID_MENU");
-        else {
-          MENUITEM mi;
-          BOOL ok;
-          memset(&mi, 0, sizeof(mi));
-          ok = (BOOL)WinSendMsg(hwndMenu,
-                                MM_QUERYITEM,
-                                MPFROM2SHORT(IDM_NOTEBOOKSUBMENU, TRUE),
-                                MPFROMP(&mi));
-          if (!ok)
-            Runtime_Error(pszSrcFile, __LINE__, "IDM_NOTEBOOKSUBMENU");
-          else {
-            mp2 = WinSendMsg(mi.hwndSubMenu, MM_QUERYDEFAULTITEMID, MPVOID, MPVOID);
-            //if (!mp2) // causes spurious error message on new installs GKY 1-9-09
-            //  mp2 = MPFROMLONG(IDM_QUICKSETTINGS);
-              //Runtime_Error(pszSrcFile, __LINE__, "MM_QUERYDEFAULTITEMID");
-          }
-        }
+        HWND hwndMenu;
+        // Owner is frame if not applet
+        hwndMenu = WinWindowFromID(hwndTemp, FID_MENU);
+        if (hwndMenu == NULLHANDLE)
+          Runtime_Error(pszSrcFile, __LINE__, "FID_MENU");
+        else {
+          MENUITEM mi;
+          BOOL ok;
+          memset(&mi, 0, sizeof(mi));
+          ok = (BOOL)WinSendMsg(hwndMenu,
+                                MM_QUERYITEM,
+                                MPFROM2SHORT(IDM_NOTEBOOKSUBMENU, TRUE),
+                                MPFROMP(&mi));
+          if (!ok)
+            Runtime_Error(pszSrcFile, __LINE__, "IDM_NOTEBOOKSUBMENU");
+          else {
+            mp2 = WinSendMsg(mi.hwndSubMenu, MM_QUERYDEFAULTITEMID, MPVOID, MPVOID);
+            //if (!mp2) // causes spurious error message on new installs GKY 1-9-09
+            //  mp2 = MPFROMLONG(IDM_QUICKSETTINGS);
+              //Runtime_Error(pszSrcFile, __LINE__, "MM_QUERYDEFAULTITEMID");
+          }
+        }
       }
     }
@@ -3706 +3706 @@
     PostMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
     WinSendDlgItemMsg(hwnd,
-                      CFG_NOTEBOOK,
-                      BKM_SETDIMENSIONS,
-                      MPFROM2SHORT(82, 24), MPFROMLONG(BKA_MAJORTAB));
+                      CFG_NOTEBOOK,
+                      BKM_SETDIMENSIONS,
+                      MPFROM2SHORT(82, 24), MPFROMLONG(BKA_MAJORTAB));
     WinSendDlgItemMsg(hwnd,
-                      CFG_NOTEBOOK,
-                      BKM_SETDIMENSIONS,
-                      MPFROM2SHORT(20, 20), MPFROMLONG(BKA_PAGEBUTTON));
+                      CFG_NOTEBOOK,
+                      BKM_SETDIMENSIONS,
+                      MPFROM2SHORT(20, 20), MPFROMLONG(BKA_PAGEBUTTON));
     WinSendDlgItemMsg(hwnd,
-                      CFG_NOTEBOOK,
-                      BKM_SETDIMENSIONS,
-                      MPFROM2SHORT(0, 0), MPFROMLONG(BKA_MINORTAB));
+                      CFG_NOTEBOOK,
+                      BKM_SETDIMENSIONS,
+                      MPFROM2SHORT(0, 0), MPFROMLONG(BKA_MINORTAB));
 
     // Build and insert notebook pages
     for (x = 0; np[x].usFrameId; x++) {
       hwndTemp = WinLoadDlg(HWND_DESKTOP,
-                            HWND_DESKTOP,
-                            np[x].pfnPageProc, FM3ModHandle, np[x].usFrameId, MPVOID);
+                            HWND_DESKTOP,
+                            np[x].pfnPageProc, FM3ModHandle, np[x].usFrameId, MPVOID);
       if (!hwndTemp) {
-        Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
-                  "Can not load settings page %u", x);
+        Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                  "Can not load settings page %u", x);
       }
       else {
-        WinSetWindowULong(hwndTemp, QWL_USER, (ULONG)hwnd);
-        np[x].hwnd = hwndTemp;
-        np[x].ulPageId = (ULONG)WinSendDlgItemMsg(hwnd,
-                                                CFG_NOTEBOOK,
-                                                BKM_INSERTPAGE,
-                                                MPFROMLONG(BKA_FIRST),
-                                                MPFROM2SHORT(BKA_AUTOPAGESIZE |
-                                                             BKA_STATUSTEXTON |
-                                                             BKA_MAJOR, attrib));
-        attrib = BKA_LAST;
-        WinSendDlgItemMsg(hwnd,
-                          CFG_NOTEBOOK,
-                          BKM_SETPAGEWINDOWHWND,
-                          MPFROMLONG(np[x].ulPageId), MPFROMLONG(np[x].hwnd));
-        WinSendDlgItemMsg(hwnd,
-                          CFG_NOTEBOOK,
-                          BKM_SETTABTEXT,
-                          MPFROMLONG(np[x].ulPageId),
-                          MPFROMP(GetPString(np[x].ulTitle)));
-        WinSendDlgItemMsg(hwnd,
-                          CFG_NOTEBOOK,
-                          BKM_SETSTATUSLINETEXT,
-                          MPFROMLONG(np[x].ulPageId),
-                          MPFROMP(GetPString(np[x].ulTitle + 1)));
-
-        if (LONGFROMMP(mp2) == np[x].usMenuId)
-          uPageIndex = x;               // Remember selected page
+        WinSetWindowULong(hwndTemp, QWL_USER, (ULONG)hwnd);
+        np[x].hwnd = hwndTemp;
+        np[x].ulPageId = (ULONG)WinSendDlgItemMsg(hwnd,
+                                                CFG_NOTEBOOK,
+                                                BKM_INSERTPAGE,
+                                                MPFROMLONG(BKA_FIRST),
+                                                MPFROM2SHORT(BKA_AUTOPAGESIZE |
+                                                             BKA_STATUSTEXTON |
+                                                             BKA_MAJOR, attrib));
+        attrib = BKA_LAST;
+        WinSendDlgItemMsg(hwnd,
+                          CFG_NOTEBOOK,
+                          BKM_SETPAGEWINDOWHWND,
+                          MPFROMLONG(np[x].ulPageId), MPFROMLONG(np[x].hwnd));
+        WinSendDlgItemMsg(hwnd,
+                          CFG_NOTEBOOK,
+                          BKM_SETTABTEXT,
+                          MPFROMLONG(np[x].ulPageId),
+                          MPFROMP(GetPString(np[x].ulTitle)));
+        WinSendDlgItemMsg(hwnd,
+                          CFG_NOTEBOOK,
+                          BKM_SETSTATUSLINETEXT,
+                          MPFROMLONG(np[x].ulPageId),
+                          MPFROMP(GetPString(np[x].ulTitle + 1)));
+
+        if (LONGFROMMP(mp2) == np[x].usMenuId)
+          uPageIndex = x;               // Remember selected page
       }
     } // for pages
@@ -3763 +3763 @@
     // 15 Feb 08 SHL fixme to do just once?
     if (mp2 == MPFROMLONG(IDM_QUICKSETTINGS) &&
-        x-- > 0 &&
-        np[x].hwnd &&
-        np[x].usFrameId == CFG9_FRAME)
+        x-- > 0 &&
+        np[x].hwnd &&
+        np[x].usFrameId == CFG9_FRAME)
     {
       // 10 Jan 08 SHL fixme to document what UM_SETDIR 1 means
       //PostMsg(MainObjectHwnd, UM_SETDIR, MPFROMLONG(1), MPVOID);
       PostMsg(WinWindowFromID(hwnd, CFG_NOTEBOOK),
-              BKM_TURNTOPAGE, MPFROMLONG(np[x].ulPageId), MPVOID);
+              BKM_TURNTOPAGE, MPFROMLONG(np[x].ulPageId), MPVOID);
       PostMsg(hwnd, UM_FOCUSME, MPFROMLONG(np[x].hwnd), MPVOID);
       PostMsg(np[x].hwnd, WM_COMMAND, MPFROM2SHORT(IDM_HELP, 0), MPVOID);
@@ -3776 +3776 @@
     else if (uPageIndex >= x) {
       Runtime_Error(pszSrcFile, __LINE__, "uPageIndex corrupted (%u)",
-                    uPageIndex);
+                    uPageIndex);
       uPageIndex = 0;
     }
     PostMsg(WinWindowFromID(hwnd, CFG_NOTEBOOK),
-            BKM_TURNTOPAGE, MPFROMLONG(np[uPageIndex].ulPageId), MPVOID);
+            BKM_TURNTOPAGE, MPFROMLONG(np[uPageIndex].ulPageId), MPVOID);
     // 15 Feb 08 SHL fixme to put focus on first field of page
 
@@ -3802 +3802 @@
     if (CHARMSG(&msg)->fs & KC_VIRTUALKEY) {
       switch (CHARMSG(&msg)->vkey) {
-        case VK_F3:
-        case VK_ENTER:
-        case VK_NEWLINE:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
-          return 0;
-          break;
-        case VK_ESC:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
-          return 0;
-          break;
-        case VK_F1:
-          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
-          return 0;
-          break;
+        case VK_F3:
+        case VK_ENTER:
+        case VK_NEWLINE:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_OK, MPVOID);
+          return 0;
+          break;
+        case VK_ESC:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)DID_CANCEL, MPVOID);
+          return 0;
+          break;
+        case VK_F1:
+          PostMsg(hwnd, WM_COMMAND, (MPARAM)IDM_HELP, MPVOID);
+          return 0;
+          break;
       }
     }
@@ -3831 +3831 @@
       SaveLastPageIndex(hwnd);
       ulPageId = (ULONG) WinSendDlgItemMsg(hwnd,
-                                         CFG_NOTEBOOK,
-                                         BKM_QUERYPAGEID,
-                                         MPFROMLONG(0),
-                                         MPFROM2SHORT(BKA_TOP, 0));
+                                         CFG_NOTEBOOK,
+                                         BKM_QUERYPAGEID,
+                                         MPFROMLONG(0),
+                                         MPFROM2SHORT(BKA_TOP, 0));
       hwndTemp = (HWND) WinSendDlgItemMsg(hwnd,
-                                          CFG_NOTEBOOK,
-                                          BKM_QUERYPAGEWINDOWHWND,
-                                          MPFROMLONG(ulPageId), MPVOID);
+                                          CFG_NOTEBOOK,
+                                          BKM_QUERYPAGEWINDOWHWND,
+                                          MPFROMLONG(ulPageId), MPVOID);
       if (hwndTemp)
-        WinSendMsg(hwndTemp, UM_UNDO, MPVOID, MPVOID);
+        WinSendMsg(hwndTemp, UM_UNDO, MPVOID, MPVOID);
 
       WinDismissDlg(hwnd, 0);
@@ -3847 +3847 @@
     case IDM_HELP:                      /* relay message to appropriate page's window */
       ulPageId = (ULONG) WinSendDlgItemMsg(hwnd,
-                                         CFG_NOTEBOOK,
-                                         BKM_QUERYPAGEID,
-                                         MPFROMLONG(0),
-                                         MPFROM2SHORT(BKA_TOP, 0));
+                                         CFG_NOTEBOOK,
+                                         BKM_QUERYPAGEID,
+                                         MPFROMLONG(0),
+                                         MPFROM2SHORT(BKA_TOP, 0));
       hwndTemp = (HWND) WinSendDlgItemMsg(hwnd,
-                                          CFG_NOTEBOOK,
-                                          BKM_QUERYPAGEWINDOWHWND,
-                                          MPFROMLONG(ulPageId), MPVOID);
+                                          CFG_NOTEBOOK,
+                                          BKM_QUERYPAGEWINDOWHWND,
+                                          MPFROMLONG(ulPageId), MPVOID);
       if (hwndTemp)
-        PostMsg(hwndTemp, WM_COMMAND, MPFROM2SHORT(IDM_HELP, 0), MPVOID);
+        PostMsg(hwndTemp, WM_COMMAND, MPFROM2SHORT(IDM_HELP, 0), MPVOID);
       break;
     }
@@ -3864 +3864 @@
     for (x = 0; np[x].usFrameId; x++) {
       if (np[x].hwnd)
-        WinSendMsg(np[x].hwnd, UM_UNDO, MPVOID, MPVOID);
+        WinSendMsg(np[x].hwnd, UM_UNDO, MPVOID, MPVOID);
     }
     break;
@@ -3871 +3871 @@
     if (np[0].usFrameId) {
       for (x = 1; np[x].usFrameId; x++) {
-        if (np[x].hwnd) {
-          WinSendMsg(np[x].hwnd, WM_CLOSE, MPVOID, MPVOID);
-          np[x].hwnd = (HWND) 0;
-          np[x].ulPageId = 0;
-        }
+        if (np[x].hwnd) {
+          WinSendMsg(np[x].hwnd, WM_CLOSE, MPVOID, MPVOID);
+          np[x].hwnd = (HWND) 0;
+          np[x].ulPageId = 0;
+        }
       }
       WinSendMsg(np[0].hwnd, WM_CLOSE, MPVOID, MPVOID);
@@ -3908 +3908 @@
   if (fIsLite) {
     WinSendMsg(hwndMenu,
-               MM_DELETEITEM,
-               MPFROM2SHORT(IDM_QUICKSETTINGS, FALSE), MPVOID);
+               MM_DELETEITEM,
+               MPFROM2SHORT(IDM_QUICKSETTINGS, FALSE), MPVOID);
     // If fm/2 lite drop quick setting page
     for (x = 0; np[x].usFrameId && np[x].usFrameId != CFG9_FRAME; x++)
@@ -3928 +3928 @@
   if (hwndOwner != HWND_DESKTOP) {
     ulPageId = (ULONG)WinSendDlgItemMsg(hwnd,
-                                       CFG_NOTEBOOK,
-                                       BKM_QUERYPAGEID,
-                                       MPFROMLONG(0),
-                                       MPFROM2SHORT(BKA_TOP, 0));
+                                       CFG_NOTEBOOK,
+                                       BKM_QUERYPAGEID,
+                                       MPFROMLONG(0),
+                                       MPFROM2SHORT(BKA_TOP, 0));
     if (!ulPageId)
       Runtime_Error(pszSrcFile, __LINE__, "BKM_QUERYPAGEID");
     else {
       for (x = 0; np[x].usMenuId && np[x].ulPageId != ulPageId; x++)
-        ; // Scan
+        ; // Scan
       if (!np[x].usMenuId)
-        Runtime_Error(pszSrcFile, __LINE__, "bad menu id %lu", ulPageId);
+        Runtime_Error(pszSrcFile, __LINE__, "bad menu id %lu", ulPageId);
       else {
-        PrfWriteProfileData(fmprof, FM3Str, pszIK_LastSettingsPage,
-                            (PVOID)&x, sizeof(x));
-        hwndMenu = WinWindowFromID(hwndOwner, FID_MENU);
-        SetConditionalCascade(hwndMenu, IDM_NOTEBOOKSUBMENU, np[x].usMenuId);
+        PrfWriteProfileData(fmprof, FM3Str, pszIK_LastSettingsPage,
+                            (PVOID)&x, sizeof(x));
+        hwndMenu = WinWindowFromID(hwndOwner, FID_MENU);
+        SetConditionalCascade(hwndMenu, IDM_NOTEBOOKSUBMENU, np[x].usMenuId);
       }
     }