Changeset 1209 for trunk

Timestamp:

Sep 13, 2008, 8:51:06 AM (17 years ago)

Author:

John Small

Message:

Ticket 187: Move data declarations/definitions out of fm3dll.h

Location:

trunk/dll

Files:

• inis.c (modified) (2 diffs)
• inis.h (modified) (1 diff)
• init.c (modified) (3 diffs)
• init.h (modified) (1 diff)
• key.c (modified) (2 diffs)
• killproc.c (modified) (2 diffs)
• killproc.h (modified) (1 diff)
• loadbmp.c (modified) (1 diff)
• mainwnd.c (modified) (187 diffs)
• mainwnd.h (modified) (1 diff)

trunk/dll/inis.c

@@ -43 +43 @@
 
 #include "fm3dll.h"
+#include "mainwnd2.h"                   // Data declaration(s)
+#include "collect.h"                    // Data declaration(s)
+#include "grep.h"                       // Data declaration(s)
+#include "notebook.h"                   // Data declaration(s)
+#include "init.h"                       // Data declaration(s)
 #include "fm3dlg.h"
 #include "fm3str.h"
@@ -67 +72 @@
 #include "wrappers.h"                   // xfopen
 #include "fortify.h"
+
+// Data definitions
+#pragma data_seg(GLOBAL1)
+HELPINIT hini;
+
+#pragma data_seg(GLOBAL2)
+CHAR *DRF_FM2INI;
+CHAR *DRM_FM2INIRECORD;
+RGB2 RGBBLACK;
 
 #pragma data_seg(DATA2)

trunk/dll/inis.h

@@ -19 +19 @@
 HWND StartIniEditor(HWND hwnd, CHAR * filename, INT flags);
 
+// Data declarations
+extern CHAR *DRF_FM2INI;
+extern CHAR *DRM_FM2INIRECORD;
+extern RGB2 RGBBLACK;
+extern HELPINIT hini;
 
 #endif // INIS_H

trunk/dll/init.c

@@ -78 +78 @@
 
 #include "fm3dll.h"
+#include "mkdir.h"                      // Data declaration(s)
+#include "dircnrs.h"                    // Data declaration(s)
+#include "comp.h"                       // Data declaration(s)
+#include "cmdline.h"                    // Data declaration(s)
+#include "fm2cmd.h"                     // Data declaration(s)
+#include "printer.h"                    // Data declaration(s)
+#include "init.h"                       // Data declaration(s)
+#include "flesh.h"                      // Data declaration(s)
+#include "worker.h"                     // Data declaration(s)
+#include "filldir.h"                    // Data declaration(s)
+#include "defview.h"                    // Data declaration(s)
+#include "draglist.h"                   // Data declaration(s)
 #include "fm3dlg.h"
 #include "datamin.h"
@@ -101 +113 @@
 #include "notify.h"                     // NotifyWndProc
 #include "treecnr.h"                    // OpenButtonProc
-#include "seeall.h"                     // SeeAllWndProc, SeeStatusProc
-#include "init.h"
-#include "timer.h"                      // StartTimer, StopTimer
-#include "treecnr.h"                    // TreeClientWndProc, TreeStatProc
-#include "newview.h"                    // ViewStatusProc, ViewWndProc
-#include "subj.h"                       // Subject
-#include "select.h"                     // UnHilite
-#include "dirs.h"                       // save_dir
-#include "copyf.h"                      // unlinkf
-#include "wrappers.h"                   // xDosSetPathInfo
+#include "seeall.h"                     // SeeAllWndProc, SeeStatusProc
+#include "timer.h"                      // StartTimer, StopTimer
+#include "treecnr.h"                    // TreeClientWndProc, TreeStatProc
+#include "newview.h"                    // ViewStatusProc, ViewWndProc
+#include "subj.h"                       // Subject
+#include "select.h"                     // UnHilite
+#include "dirs.h"                       // save_dir
+#include "copyf.h"                      // unlinkf
+#include "wrappers.h"                   // xDosSetPathInfo
 #include "misc.h"                       // HeapThread, LoadDetailsSwitches
 #include "notebook.h"                   // command line variables (editor etc)
-#include "strips.h"                     // bstrip
-#include "killproc.h"                   // GetDosPgmName
-#include "srchpath.h"                   // searchpath
+#include "strips.h"                     // bstrip
+#include "killproc.h"                   // GetDosPgmName
+#include "srchpath.h"                   // searchpath
 #include "fortify.h"
 
@@ -135 +146 @@
 #endif
 
+// Data definitions
 static PSZ pszSrcFile = __FILE__;
-
+static CHAR *WC_MAINWND;
+
+#pragma data_seg(GLOBAL1)
+ULONG OS2ver[2];
+PFNWP PFNWPCnr;
+PFNWP PFNWPMLE;
+CHAR ThousandsSeparator[2];
+BOOL fAmAV2;
+BOOL fChangeTarget;
+BOOL fIniExisted;
+BOOL fLogFile;
+BOOL fReminimize;
+BOOL fWantFirstTimeInit;
+HPOINTER hptrApp;
+HPOINTER hptrArc;
+HPOINTER hptrArrow;
+HPOINTER hptrArt;
+HPOINTER hptrBusy;
+HPOINTER hptrCDROM;
+HPOINTER hptrDrive;
+HPOINTER hptrEW;
+HPOINTER hptrFloppy;
+HPOINTER hptrNS;
+HPOINTER hptrRamdisk;
+HPOINTER hptrRemote;
+HPOINTER hptrRemovable;
+HPOINTER hptrVirtual;
+HPOINTER hptrZipstrm;
+CHAR *pFM2SaveDirectory;
+CHAR *pTmpDir;
+
+#pragma data_seg(GLOBAL2)
+CHAR *CBSIFS;
+CHAR *DRF_FM2ARCHIVE;
+CHAR *DRMDRFFM2ARC;
+CHAR *DRMDRFOS2FILE;
+CHAR *DRM_FM2ARCMEMBER;
+CHAR *DRM_OS2FILE;
+CHAR *FM2Str;
+HMODULE FM3DllHandle;
+CHAR *FM3Folder;
+CHAR HomePath[CCHMAXPATH];
+CHAR *LONGNAME;
+CHAR *NullStr;
+CHAR *Settings;
+CHAR SwapperDat[CCHMAXPATH];
+CHAR *WC_ARCCONTAINER;
+CHAR *WC_ARCSTATUS;
+CHAR *WC_AUTOVIEW;
+CHAR *WC_BUBBLE;
+CHAR *WC_COLLECTOR;
+CHAR *WC_COLSTATUS;
+CHAR *WC_DATABAR;
+CHAR *WC_DIRCONTAINER;
+CHAR *WC_DIRSTATUS;
+CHAR *WC_DRIVEBACK;
+CHAR *WC_DRIVEBUTTONS;
+CHAR *WC_ERRORWND;
+CHAR *WC_INIEDITOR;
+CHAR *WC_LED;
+CHAR *WC_MAINWND2;
+CHAR *WC_MINITIME;
+CHAR *WC_MLEEDITOR;
+CHAR *WC_NEWVIEW;
+CHAR *WC_OBJECTWINDOW;
+CHAR *WC_SEEALL;
+CHAR *WC_SEESTATUS;
+CHAR *WC_STATUS;
+CHAR *WC_TOOLBACK;
+CHAR *WC_TOOLBUTTONS;
+CHAR *WC_TREECONTAINER;
+CHAR *WC_TREEOPENBUTTON;
+CHAR *WC_TREESTATUS;
+CHAR *WC_VIEWSTATUS;
 VOID FindSwapperDat(VOID);
+CHAR profile[CCHMAXPATH];
+ULONGLONG ullTmpSpaceNeeded;
 
 BOOL CheckFileHeader(CHAR *filespec, CHAR *signature, LONG offset);

trunk/dll/init.h

@@ -19 +19 @@
 HWND StartFM3(HAB hab, INT argc, CHAR ** argv);
 
+// Data declarations
+extern CHAR *CBSIFS;
+extern CHAR *DRMDRFFM2ARC;
+extern CHAR *DRF_FM2ARCHIVE;
+extern CHAR *DRMDRFOS2FILE;
+extern CHAR *DRM_FM2ARCMEMBER;
+extern CHAR *DRM_OS2FILE;
+extern CHAR *FM2Str;
+extern CHAR *FM3Folder;
+extern CHAR HomePath[CCHMAXPATH];
+extern CHAR *LONGNAME;
+extern CHAR *NullStr;
+extern ULONG OS2ver[2];
+extern PFNWP PFNWPCnr;
+extern PFNWP PFNWPMLE;
+extern CHAR *Settings;
+extern CHAR SwapperDat[CCHMAXPATH];
+extern CHAR ThousandsSeparator[2];
+extern CHAR *WC_ARCCONTAINER;
+extern CHAR *WC_ARCSTATUS;
+extern CHAR *WC_AUTOVIEW;
+extern CHAR *WC_BUBBLE;
+extern CHAR *WC_COLLECTOR;
+extern CHAR *WC_COLSTATUS;
+extern CHAR *WC_DATABAR;
+extern CHAR *WC_DIRCONTAINER;
+extern CHAR *WC_DIRSTATUS;
+extern CHAR *WC_DRIVEBACK;
+extern CHAR *WC_DRIVEBUTTONS;
+extern CHAR *WC_ERRORWND;
+extern CHAR *WC_INIEDITOR;
+extern CHAR *WC_LED;
+extern CHAR *WC_MAINWND2;
+extern CHAR *WC_MINITIME;
+extern CHAR *WC_MLEEDITOR;
+extern CHAR *WC_NEWVIEW;
+extern CHAR *WC_OBJECTWINDOW;
+extern CHAR *WC_SEEALL;
+extern CHAR *WC_SEESTATUS;
+extern CHAR *WC_STATUS;
+extern CHAR *WC_TOOLBACK;
+extern CHAR *WC_TOOLBUTTONS;
+extern CHAR *WC_TREECONTAINER;
+extern CHAR *WC_TREEOPENBUTTON;
+extern CHAR *WC_TREESTATUS;
+extern CHAR *WC_VIEWSTATUS;
+extern BOOL fAmAV2;
+extern BOOL fChangeTarget;
+extern BOOL fIniExisted;
+extern BOOL fLogFile;
+extern BOOL fReminimize;
+extern BOOL fWantFirstTimeInit;
+extern HPOINTER hptrApp;
+extern HPOINTER hptrArc;
+extern HPOINTER hptrArrow;
+extern HPOINTER hptrArt;
+extern HPOINTER hptrBusy;
+extern HPOINTER hptrCDROM;
+extern HPOINTER hptrDrive;
+extern HPOINTER hptrEW;
+extern HPOINTER hptrFloppy;
+extern HPOINTER hptrNS;
+extern HPOINTER hptrRamdisk;
+extern HPOINTER hptrRemote;
+extern HPOINTER hptrRemovable;
+extern HPOINTER hptrVirtual;
+extern HPOINTER hptrZipstrm;
+extern CHAR *pFM2SaveDirectory;
+extern CHAR *pTmpDir;
+extern CHAR profile[CCHMAXPATH];
+extern ULONGLONG ullTmpSpaceNeeded;
 
 #endif // INIT_H

trunk/dll/key.c

@@ -24 +24 @@
 
 #include "fm3dll.h"
+#include "mainwnd2.h"                   // Data declaration(s)
+#include "mainwnd.h"                    // Data declaration(s)
 #include "fm3dlg.h"
 #include "fm3str.h"
@@ -31 +33 @@
 #include "key.h"                        // AboutDlgProc
 #include "misc.h"                       // PostMsg
+
+// Data declarations
+#pragma data_seg(GLOBAL1)
+static HWND AboutBox;
 
 #pragma data_seg(DATA1)

trunk/dll/killproc.c

@@ -34 +34 @@
 
 #include "fm3dll.h"
+#include "init.h"                       // Data declaration(s)
+#include "notebook.h"                   // Data declaration(s)
+#include "mainwnd.h"                    // Data declaration(s)
 #include "fm3dlg.h"
 #include "fm3str.h"
@@ -50 +53 @@
 #include "fortify.h"
 
+// Data definitions
 #pragma data_seg(DATA2)
 
 static PSZ pszSrcFile = __FILE__;
+
+#pragma data_seg(GLOBAL1)
+BOOL fUseQProcStat;
+BOOL fUseQSysState;
+PID mypid;
 
 CHAR *GetDosPgmName(PID pid, CHAR * string)

trunk/dll/killproc.h

@@ -19 +19 @@
 MRESULT EXPENTRY KillDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
 
+// Data declarations
+extern BOOL fUseQSysState;
+extern BOOL fUseQProcStat;
+extern PID mypid;
 
 #endif // KILLPROC_H

trunk/dll/loadbmp.c

@@ -30 +30 @@
 
 #include "fm3dll.h"
+#include "init.h"                       // Data declaration(s)
 #include "errutil.h"                    // Dos_Error...
 #include "loadbmp.h"

trunk/dll/mainwnd.c

@@ -59 +59 @@
   07 Jul 08 JBS Ticket 242: Delete obsolete INI keys when re-saving a state
   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.
   12 Jul 08 JBS Ticket 246: Allow saved directory container states to have no directory containers
-                (i.e. just a directory tree container).
+                (i.e. just a directory tree container).
                 18 Jul 08 SHL Use new Fortify feature to avoid spurious reports
   19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory
@@ -75 +75 @@
 #include <string.h>
 #include <ctype.h>
-#include <process.h>                    // _beginthread
+#include <process.h>                    // _beginthread
 
 #define INCL_DOS
 #define INCL_WIN
-#define INCL_SHLERRORS                  // PMERR_NOT_IN_IDX
+#define INCL_SHLERRORS                  // PMERR_NOT_IN_IDX
 #define INCL_WINHELP
 #define INCL_GPI
@@ -85 +85 @@
 
 #include "fm3dll.h"
+#include "grep.h"                       // Data declaration(s)
+#include "autoview.h"                   // Data declaration(s)
+#include "dircnrs.h"                    // Data declaration(s)
+#include "info.h"                       // Data declaration(s)
+#include "defview.h"                    // Data declaration(s)
+#include "init.h"                       // Data declaration(s)
 #include "fm3dlg.h"
 #include "fm3str.h"
@@ -90 +96 @@
 #include "comp.h"
 #include "datamin.h"
-#include "pathutil.h"                   // BldQuotedFileName
-#include "errutil.h"                    // Dos_Error...
-#include "strutil.h"                    // GetPString
-#include "notebook.h"                   // CfgDlgProc CfgMenuInit
-#include "command.h"                    // LINKCMDS
-#include "avl.h"                        // free_archivers
-#include "walkem.h"                     // free_setups...
-#include "key.h"                        // AboutDlgProc
-#include "menu.h"                       // AddToMenu
+#include "pathutil.h"                   // BldQuotedFileName
+#include "errutil.h"                    // Dos_Error...
+#include "strutil.h"                    // GetPString
+#include "notebook.h"                   // CfgDlgProc CfgMenuInit
+#include "command.h"                    // LINKCMDS
+#include "avl.h"                        // free_archivers
+#include "walkem.h"                     // free_setups...
+#include "key.h"                        // AboutDlgProc
+#include "menu.h"                       // AddToMenu
 #include "mainwnd.h"
-#include "cmdline.h"                    // CmdLine2DlgProc, save_cmdlines
-#include "common.h"                     // CommonCreateMainChildren, CommonDriveCmd, CommonMainWndProc
-                                        // CommonTextButton
-#include "notify.h"                     // DoNotify, HideNote, ShowNote
-#include "draglist.h"                   // DragOne
-#include "chklist.h"                    // DropListProc
-#include "avv.h"                        // EditArchiverDefinition
-#include "assoc.h"                      // EditAssociations
-#include "fm2cmd.h"                     // FM2Command
-#include "misc.h"                       // FindDirCnr, FixSwitchList, PaintSTextWindow,
-                                        // SetConditionalCascade, SetMenuCheck, SetSysMenu
-                                        // SwitchCommand, CheckMenu, DrawTargetEmphasis
-                                        // IsFm2Window
-#include "instant.h"                    // InstantDlgProc
-#include "killproc.h"                   // KillDlgProc
-#include "loadbmp.h"                    // LoadBitmapFromFileNum
-#include "presparm.h"                   // SavePresParams
-#include "treecnr.h"                    // ShowTreeRec, StartTreeCnr
-#include "inis.h"                       // StartIniEditor
-#include "sysinfo.h"                    // SysInfoDlgProc
-#include "viewinf.h"                    // ViewInfProc
-#include "walkem.h"                     // WalkDlgProc, WalkTwoCmpDlgProc, add_setup, add_udir
-                                        // fill_setups_list, free_ldir, free_udirs, load_udirs
-                                        // remove_setup, remove_udir, save_setups, save_udirs
-#include "winlist.h"                    // WindowList
-#include "cmdline.h"                    // add_cmdline
-#include "assoc.h"                      // free_associations
-#include "droplist.h"                   // AcceptOneDrop, CheckPmDrgLimit, DropHelp, GetOneDrop
-#include "common.h"                     // CommonTextProc
-#include "presparm.h"                   // CopyPresParams
-#include "systemf.h"                    // ExecOnList
-#include "shadow.h"                     // OpenObject
-#include "mkdir.h"                      // PMMkDir
-#include "collect.h"                    // StartCollector
-#include "select.h"                     // UnHilite
-#include "strips.h"                     // bstrip
-#include "commafmt.h"                   // CommaFmtULL
-#include "valid.h"                      // IsFullName
-#include "dirs.h"                       // save_dir2
-#include "wrappers.h"                   // xfree
+#include "cmdline.h"                    // CmdLine2DlgProc, save_cmdlines
+#include "common.h"                     // CommonCreateMainChildren, CommonDriveCmd, CommonMainWndProc
+                                        // CommonTextButton
+#include "notify.h"                     // DoNotify, HideNote, ShowNote
+#include "draglist.h"                   // DragOne
+#include "chklist.h"                    // DropListProc
+#include "avv.h"                        // EditArchiverDefinition
+#include "assoc.h"                      // EditAssociations
+#include "fm2cmd.h"                     // FM2Command
+#include "misc.h"                       // FindDirCnr, FixSwitchList, PaintSTextWindow,
+                                        // SetConditionalCascade, SetMenuCheck, SetSysMenu
+                                        // SwitchCommand, CheckMenu, DrawTargetEmphasis
+                                        // IsFm2Window
+#include "instant.h"                    // InstantDlgProc
+#include "killproc.h"                   // KillDlgProc
+#include "loadbmp.h"                    // LoadBitmapFromFileNum
+#include "presparm.h"                   // SavePresParams
+#include "treecnr.h"                    // ShowTreeRec, StartTreeCnr
+#include "inis.h"                       // StartIniEditor
+#include "sysinfo.h"                    // SysInfoDlgProc
+#include "viewinf.h"                    // ViewInfProc
+#include "walkem.h"                     // WalkDlgProc, WalkTwoCmpDlgProc, add_setup, add_udir
+                                        // fill_setups_list, free_ldir, free_udirs, load_udirs
+                                        // remove_setup, remove_udir, save_setups, save_udirs
+#include "winlist.h"                    // WindowList
+#include "cmdline.h"                    // add_cmdline
+#include "assoc.h"                      // free_associations
+#include "droplist.h"                   // AcceptOneDrop, CheckPmDrgLimit, DropHelp, GetOneDrop
+#include "common.h"                     // CommonTextProc
+#include "presparm.h"                   // CopyPresParams
+#include "systemf.h"                    // ExecOnList
+#include "shadow.h"                     // OpenObject
+#include "mkdir.h"                      // PMMkDir
+#include "collect.h"                    // StartCollector
+#include "select.h"                     // UnHilite
+#include "strips.h"                     // bstrip
+#include "commafmt.h"                   // CommaFmtULL
+#include "valid.h"                      // IsFullName
+#include "dirs.h"                       // save_dir2
+#include "wrappers.h"                   // xfree
 #include "fortify.h"
-
-#pragma data_seg(DATA1)
-
-static PSZ pszSrcFile = __FILE__;
-
-static USHORT firsttool = 0;
 
 static BOOL CloseDirCnrChildren(HWND hwndClient);
@@ -153 +153 @@
 static VOID BuildTools(HWND hwndT, BOOL resize);
 
+// Data definitions
+#pragma data_seg(GLOBAL1)
+ULONG DriveLines;
+HWND MainObjectHwnd;
+HWND MainPopupMenu;
+BOOL MenuInvisible;
+PFNWP PFNWPButton;
+PFNWP PFNWPStatic;
+BOOL fAmClosing;
+BOOL fAutoTile;
+BOOL fAutoView;
+BOOL fComments;
+BOOL fDrivebar;
+BOOL fFreeTree;
+BOOL fMoreButtons;
+BOOL fNoFinger;
+BOOL fNoSaveState;
+BOOL fNoTileUpdate;
+BOOL fRunning;
+BOOL fSplitStatus;
+BOOL fTextTools;
+BOOL fToolTitles;
+BOOL fToolbar;
+BOOL fUserComboBox;
+HBITMAP hbmLEDoff;
+HBITMAP hbmLEDon;
+HPOINTER hptrFinger;
+HWND hwndAutoview;
+HWND hwndBubble;
+HWND hwndName;
+HWND hwndStatelist;
+HWND hwndToolback;
+HWND hwndTree;
+USHORT shiftstate;
+
+#pragma data_seg(GLOBAL2)
+HMODULE FM3ModHandle;
+CHAR *FM3Str;
+RGB2 RGBGREY;
+
+#pragma data_seg(DATA1)
+
+static PSZ pszSrcFile = __FILE__;
+static USHORT firsttool = 0;
+static HWND hwndButtonlist;
+static HWND hwndCmdlist;
+static HWND hwndDrivelist;
+static HWND hwndUserlist;
+
+
 static MRESULT EXPENTRY MainObjectWndProc(HWND hwnd, ULONG msg, MPARAM mp1,
-                                          MPARAM mp2)
+                                          MPARAM mp2)
 {
   switch (msg) {
@@ -183 +233 @@
       *dv = 0;
       WinQueryWindowText(WinWindowFromID(WinQueryWindow(hwndB, QW_PARENT),
-                                         id + 50), sizeof(dv), dv);
+                                         id + 50), sizeof(dv), dv);
       d = toupper(*dv);
       if (isalpha(d) && d > 'B' &&
-          !(driveflags[d - 'A'] & (DRIVE_CDROM | DRIVE_INVALID |
-                                   DRIVE_SLOW)) &&
-          (!hwndBubble ||
-           WinQueryWindowULong(hwndBubble, QWL_USER) != hwndB) &&
-          !WinQueryCapture(HWND_DESKTOP)) {
-
-        FSALLOCATE fsa;
-        CHAR s[90], szQty[38];
-        ULONG ulPctFree;
-        ULONGLONG ullFreeQty;
-
-        if (!DosQueryFSInfo((d - 'A') + 1,
-                            FSIL_ALLOC, &fsa, sizeof(FSALLOCATE))) {
-          ullFreeQty = (ULONGLONG) fsa.cUnitAvail *
-            (fsa.cSectorUnit * fsa.cbSector);
-          ulPctFree = (fsa.cUnit && fsa.cUnitAvail) ?
-            (fsa.cUnitAvail * 100) / fsa.cUnit : 0;
-          CommaFmtULL(szQty, sizeof(szQty), ullFreeQty, ' ');
-          sprintf(s, "%s (%lu%%) free", szQty, ulPctFree);
-        }
-        if ((!hwndBubble ||
-             WinQueryWindowULong(hwndBubble, QWL_USER) != hwndB) &&
-            !WinQueryCapture(HWND_DESKTOP))
-          WinSendMsg(hwndB, UM_SETUP6, MPFROMP(s), MPVOID);
+          !(driveflags[d - 'A'] & (DRIVE_CDROM | DRIVE_INVALID |
+                                   DRIVE_SLOW)) &&
+          (!hwndBubble ||
+           WinQueryWindowULong(hwndBubble, QWL_USER) != hwndB) &&
+          !WinQueryCapture(HWND_DESKTOP)) {
+
+        FSALLOCATE fsa;
+        CHAR s[90], szQty[38];
+        ULONG ulPctFree;
+        ULONGLONG ullFreeQty;
+
+        if (!DosQueryFSInfo((d - 'A') + 1,
+                            FSIL_ALLOC, &fsa, sizeof(FSALLOCATE))) {
+          ullFreeQty = (ULONGLONG) fsa.cUnitAvail *
+            (fsa.cSectorUnit * fsa.cbSector);
+          ulPctFree = (fsa.cUnit && fsa.cUnitAvail) ?
+            (fsa.cUnitAvail * 100) / fsa.cUnit : 0;
+          CommaFmtULL(szQty, sizeof(szQty), ullFreeQty, ' ');
+          sprintf(s, "%s (%lu%%) free", szQty, ulPctFree);
+        }
+        if ((!hwndBubble ||
+             WinQueryWindowULong(hwndBubble, QWL_USER) != hwndB) &&
+            !WinQueryCapture(HWND_DESKTOP))
+          WinSendMsg(hwndB, UM_SETUP6, MPFROMP(s), MPVOID);
       }
     }
@@ -220 +270 @@
 
       if (DosQuerySysInfo(QSV_BOOT_DRIVE,
-                          QSV_BOOT_DRIVE,
-                          (PVOID) & bd, (ULONG) sizeof(ULONG)))
-        bd = 3L;
+                          QSV_BOOT_DRIVE,
+                          (PVOID) & bd, (ULONG) sizeof(ULONG)))
+        bd = 3L;
       *s = (CHAR) bd + '@';
       WinSendMsg(hwndMain, UM_SETDIR, MPFROMP(s), MPFROMLONG(1));
       if (!mp1) {
-        s[3] = 0;
-        WinSendMsg(hwndMain, UM_SETDIR, MPFROMP(s), MPVOID);
+        s[3] = 0;
+        WinSendMsg(hwndMain, UM_SETDIR, MPFROMP(s), MPVOID);
       }
       PostMsg(MainObjectHwnd, UM_RESTORE, MPFROMLONG(1), MPFROMLONG(1));
@@ -285 +335 @@
       DosError(FERR_DISABLEHARDERR);
       WinRegisterClass(hab2,
-                       (PSZ) WC_OBJECTWINDOW,
-                       MainObjectWndProc, 0, sizeof(PVOID));
+                       (PSZ) WC_OBJECTWINDOW,
+                       MainObjectWndProc, 0, sizeof(PVOID));
       MainObjectHwnd = WinCreateWindow(HWND_OBJECT,
-                                       WC_OBJECTWINDOW,
-                                       (PSZ) NULL,
-                                       0,
-                                       0L,
-                                       0L,
-                                       0L,
-                                       0L,
-                                       0L, HWND_TOP, OBJ_FRAME, NULL, NULL);
+                                       WC_OBJECTWINDOW,
+                                       (PSZ) NULL,
+                                       0,
+                                       0L,
+                                       0L,
+                                       0L,
+                                       0L,
+                                       0L, HWND_TOP, OBJ_FRAME, NULL, NULL);
       if (!MainObjectHwnd)
-        Win_Error2(HWND_OBJECT, HWND_DESKTOP, pszSrcFile, __LINE__,
-                   IDS_WINCREATEWINDOW);
+        Win_Error2(HWND_OBJECT, HWND_DESKTOP, pszSrcFile, __LINE__,
+                   IDS_WINCREATEWINDOW);
       else {
-        WinSetWindowPtr(MainObjectHwnd, QWL_USER, args);
-#       ifdef FORTIFY
-        Fortify_EnterScope();
-#       endif
-        while (WinGetMsg(hab2, &qmsg2, (HWND) 0, 0, 0))
-          WinDispatchMsg(hab2, &qmsg2);
-        WinDestroyWindow(MainObjectHwnd);
-#       ifdef FORTIFY
-        Fortify_LeaveScope();
-#       endif
+        WinSetWindowPtr(MainObjectHwnd, QWL_USER, args);
+#       ifdef FORTIFY
+        Fortify_EnterScope();
+#       endif
+        while (WinGetMsg(hab2, &qmsg2, (HWND) 0, 0, 0))
+          WinDispatchMsg(hab2, &qmsg2);
+        WinDestroyWindow(MainObjectHwnd);
+#       ifdef FORTIFY
+        Fortify_LeaveScope();
+#       endif
       }
       WinDestroyMsgQueue(hmq2);
@@ -318 +368 @@
 
 static MRESULT EXPENTRY IdealButtonProc(HWND hwnd, ULONG msg, MPARAM mp1,
-                                        MPARAM mp2)
+                                        MPARAM mp2)
 {
   switch (msg) {
@@ -338 +388 @@
     while ((hwndC = WinGetNextWindow(henum)) != NULLHANDLE) {
       if (hwndC != exclude) {
-        id = WinQueryWindowUShort(hwndC, QWS_ID);
-        if (id)
-          break;
+        id = WinQueryWindowUShort(hwndC, QWS_ID);
+        if (id)
+          break;
       }
     }
@@ -360 +410 @@
       henum = WinBeginEnumWindows(hwndMain);
       while ((hwndC = WinGetNextWindow(henum)) != NULLHANDLE) {
-        // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Tree = %lu\rExclude = %lu\rFound = %lu",hwndTree,exclude,hwndC);
-        if (hwndC != exclude && hwndC != hwndTree) {
-          id = WinQueryWindowUShort(hwndC, QWS_ID);
-          if (id) {
-            hwndClient = WinWindowFromID(hwndC, FID_CLIENT);
-            if (hwndClient) {
-              hwndDir = WinWindowFromID(hwndClient, DIR_CNR);
-              if (hwndDir) {
-                if (fLookInDir) {
-                  pci = (PCNRITEM) WinSendMsg(hwndDir,
-                                              CM_QUERYRECORDEMPHASIS,
-                                              MPFROMLONG(CMA_FIRST),
-                                              MPFROMSHORT(CRA_CURSORED));
-                  if (pci && (INT) pci != -1)
-                    break;
-                }
-                if (WinSendMsg(hwndClient,
-                               UM_CONTAINERDIR, MPFROMP(ret), MPVOID)) {
-                  MakeValidDir(ret);
-                  // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Tree = %lu\rExclude = %lu\rFound = %lu\r\"%s\"",hwndTree,exclude,hwndC,ret);
-                  WinEndEnumWindows(henum);
-                  return hwndC;
-                }
-              }
-            }
-          }
-        }
+        // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Tree = %lu\rExclude = %lu\rFound = %lu",hwndTree,exclude,hwndC);
+        if (hwndC != exclude && hwndC != hwndTree) {
+          id = WinQueryWindowUShort(hwndC, QWS_ID);
+          if (id) {
+            hwndClient = WinWindowFromID(hwndC, FID_CLIENT);
+            if (hwndClient) {
+              hwndDir = WinWindowFromID(hwndClient, DIR_CNR);
+              if (hwndDir) {
+                if (fLookInDir) {
+                  pci = (PCNRITEM) WinSendMsg(hwndDir,
+                                              CM_QUERYRECORDEMPHASIS,
+                                              MPFROMLONG(CMA_FIRST),
+                                              MPFROMSHORT(CRA_CURSORED));
+                  if (pci && (INT) pci != -1)
+                    break;
+                }
+                if (WinSendMsg(hwndClient,
+                               UM_CONTAINERDIR, MPFROMP(ret), MPVOID)) {
+                  MakeValidDir(ret);
+                  // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Tree = %lu\rExclude = %lu\rFound = %lu\r\"%s\"",hwndTree,exclude,hwndC,ret);
+                  WinEndEnumWindows(henum);
+                  return hwndC;
+                }
+              }
+            }
+          }
+        }
       }
       WinEndEnumWindows(henum);
       if (!pci || (INT) pci == -1) {
-        hwndC = hwndTree;
-        pci = (PCNRITEM) WinSendMsg(WinWindowFromID(WinWindowFromID(hwndTree,
-                                                                    FID_CLIENT),
-                                                    TREE_CNR),
-                                    CM_QUERYRECORDEMPHASIS,
-                                    MPFROMLONG(CMA_FIRST),
-                                    MPFROMSHORT(CRA_CURSORED));
+        hwndC = hwndTree;
+        pci = (PCNRITEM) WinSendMsg(WinWindowFromID(WinWindowFromID(hwndTree,
+                                                                    FID_CLIENT),
+                                                    TREE_CNR),
+                                    CM_QUERYRECORDEMPHASIS,
+                                    MPFROMLONG(CMA_FIRST),
+                                    MPFROMSHORT(CRA_CURSORED));
       }
       if (pci && (INT) pci != -1) {
-        strcpy(ret, pci->pszFileName);
-        MakeValidDir(ret);
+        strcpy(ret, pci->pszFileName);
+        MakeValidDir(ret);
       }
       else
-        strcpy(ret, pFM2SaveDirectory);
+        strcpy(ret, pFM2SaveDirectory);
     }
   }
@@ -421 +471 @@
       hwndDir = WinWindowFromID(hwndC, DIR_CNR);
       if (hwndDir)
-        ret++;
+        ret++;
     }
   }
@@ -439 +489 @@
       hwndC = WinWindowFromID(hwndF, FID_CLIENT);
       if (hwndC) {
-        hwndDir = WinWindowFromID(hwndC, DIR_CNR);
-        if (hwndDir) {
-          *retstr = 0;
-          WinSendMsg(hwndC, UM_CONTAINERDIR, MPFROMP(retstr), MPVOID);
-          if (*retstr && !stricmp(retstr, directory)) {
-            if (restore)
-              WinSetWindowPos(hwndF,
-                              HWND_TOP,
-                              0,
-                              0,
-                              0,
-                              0,
-                              SWP_RESTORE | SWP_SHOW |
-                              SWP_ACTIVATE | SWP_ZORDER);
-            break;
-          }
-        }
+        hwndDir = WinWindowFromID(hwndC, DIR_CNR);
+        if (hwndDir) {
+          *retstr = 0;
+          WinSendMsg(hwndC, UM_CONTAINERDIR, MPFROMP(retstr), MPVOID);
+          if (*retstr && !stricmp(retstr, directory)) {
+            if (restore)
+              WinSetWindowPos(hwndF,
+                              HWND_TOP,
+                              0,
+                              0,
+                              0,
+                              0,
+                              SWP_RESTORE | SWP_SHOW |
+                              SWP_ACTIVATE | SWP_ZORDER);
+            break;
+          }
+        }
       }
     }
@@ -522 +572 @@
     while (tool) {
       if (!(tool->flags & T_INVISIBLE)) {
-        swp[x].x = butx;
-        if (fTextTools || (tool->flags & T_TEXT)) {
-          butx += 55L;
-          swp[x].cx = 54L;
-          swp[x].cy = 24L;
-          swp[x].y = 3L;
-        }
-        else
-          butx += 33L;
-        if (tool->flags & T_SEPARATOR)
-          butx += 12;
+        swp[x].x = butx;
+        if (fTextTools || (tool->flags & T_TEXT)) {
+          butx += 55L;
+          swp[x].cx = 54L;
+          swp[x].cy = 24L;
+          swp[x].y = 3L;
+        }
+        else
+          butx += 33L;
+        if (tool->flags & T_SEPARATOR)
+          butx += 12;
       }
       else
-        swp[x].fl = noattrib;
+        swp[x].fl = noattrib;
       swp[x].hwnd = WinWindowFromID(hwnd, tool->id);
       x++;
@@ -544 +594 @@
       swp[x].x = butx;
       if (!(tool->flags & T_INVISIBLE)) {
-        if (fTextTools || (tool->flags & T_TEXT)) {
-          butx += 55L;
-          swp[x].cx = 54L;
-          swp[x].cy = 24L;
-          swp[x].y = 3L;
-        }
-        else
-          butx += 33L;
-        if (tool->flags & T_SEPARATOR)
-          butx += 12;
+        if (fTextTools || (tool->flags & T_TEXT)) {
+          butx += 55L;
+          swp[x].cx = 54L;
+          swp[x].cy = 24L;
+          swp[x].y = 3L;
+        }
+        else
+          butx += 33L;
+        if (tool->flags & T_SEPARATOR)
+          butx += 12;
       }
       else
-        swp[x].fl = noattrib;
+        swp[x].fl = noattrib;
       swp[x].hwnd = WinWindowFromID(hwnd, tool->id);
       x++;
@@ -564 +614 @@
     if (!fTextTools && fToolTitles) {
       for (x = 2L; x < numtools + 2L; x++) {
-        if (fTextTools || !fToolTitles)
-          swp[x].fl = noattrib;
-        else {
-          tool = find_tool(WinQueryWindowUShort(swp[x].hwnd, QWS_ID));
-          if (tool && (tool->flags & T_TEXT))
-            swp[x].fl = noattrib;
-          else {
-            swp[x].hwndInsertBehind = HWND_TOP;
-            swp[x].y = 1L;
-            swp[x].cy = 10L;
-          }
-        }
-        swp[x].hwnd = WinWindowFromID(hwnd,
-                                      WinQueryWindowUShort(swp[x].hwnd,
-                                                           QWS_ID) + 25000);
+        if (fTextTools || !fToolTitles)
+          swp[x].fl = noattrib;
+        else {
+          tool = find_tool(WinQueryWindowUShort(swp[x].hwnd, QWS_ID));
+          if (tool && (tool->flags & T_TEXT))
+            swp[x].fl = noattrib;
+          else {
+            swp[x].hwndInsertBehind = HWND_TOP;
+            swp[x].y = 1L;
+            swp[x].cy = 10L;
+          }
+        }
+        swp[x].hwnd = WinWindowFromID(hwnd,
+                                      WinQueryWindowUShort(swp[x].hwnd,
+                                                           QWS_ID) + 25000);
       }
       WinSetMultWindowPos(WinQueryAnchorBlock(hwnd), &swp[2], numtools);
@@ -588 +638 @@
 
 static MRESULT EXPENTRY DropDownListProc(HWND hwnd, ULONG msg, MPARAM mp1,
-                                         MPARAM mp2)
+                                         MPARAM mp2)
 {
   PFNWP oldproc = (PFNWP) INSTDATA(hwnd);
@@ -626 +676 @@
       id = WinQueryWindowUShort(hwndParent, QWS_ID);
       if (SHORT1FROMMP(mp2)) {
-        // If getting focus 1st time - save original accelerator
-        if (haccelSaved == NULLHANDLE) {
-          haccelSaved = WinQueryAccelTable(hab, hwndFrame);
-          if (haccelSaved == NULLHANDLE)
-            Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, "WinQueryAccelTable");
-          // else
-            // DbgMsg(pszSrcFile, __LINE__, "WinQueryAccelTable SAVED %x", haccelSaved);
-        }
-        if (haccelSaved != NULLHANDLE) {
-          switch (id) {
-          case MAIN_DRIVELIST:
-            if (haccelDriveList == NULLHANDLE) {
-                haccelDriveList = WinLoadAccelTable(hab, FM3ModHandle, MAIN_DRIVELIST);
-                if (haccelDriveList == NULLHANDLE)
-                  Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, "WinLoadAccelTable");
-            }
-            if (haccelDriveList != NULLHANDLE) {
-              if (!WinSetAccelTable(hab, haccelDriveList, hwndFrame))
-                Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, "WinSetAccelTable");
-              // else
-                // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_DRIVELIST %x %x", hwndFrame, haccelDriveList);
-            }
-            break;
-          case MAIN_SETUPLIST:
-            if (haccelSetupList == NULLHANDLE) {
-                haccelSetupList = WinLoadAccelTable(hab, FM3ModHandle, MAIN_SETUPLIST);
-                if (haccelSetupList == NULLHANDLE)
-                  Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, "WinLoadAccelTable");
-            }
-            if (haccelSetupList != NULLHANDLE) {
-              if (!WinSetAccelTable(hab, haccelSetupList, hwndFrame))
-                Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, "WinSetAccelTable");
-              // else
-                // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_SETUPLIST %x %x", hwndFrame, haccelSetupList);
-            }
-            break;
-          case MAIN_CMDLIST:
-            if (haccelCmdList == NULLHANDLE) {
-                haccelCmdList = WinLoadAccelTable(hab, FM3ModHandle, MAIN_CMDLIST);
-                if (haccelCmdList == NULLHANDLE)
-                  Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, "WinLoadAccelTable");
-            }
-            if (haccelCmdList != NULLHANDLE) {
-              if (!WinSetAccelTable(hab, haccelCmdList, hwndFrame))
-                Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, "WinSetAccelTable");
-              // else
-                // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_CMDLIST %x %x", hwndFrame, haccelCmdList);
-            }
-            break;
-          case MAIN_USERLIST:
-            if (haccelUserList == NULLHANDLE) {
-                haccelUserList = WinLoadAccelTable(hab, FM3ModHandle, MAIN_USERLIST);
-                if (haccelUserList == NULLHANDLE)
-                  Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, "WinLoadAccelTable");
-            }
-            if (haccelUserList != NULLHANDLE) {
-              if (!WinSetAccelTable(hab, haccelUserList, hwndFrame))
-                Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, "WinSetAccelTable");
-              // else
-                // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_USERLIST %x %x", hwndFrame, haccelUserList);
-            }
-            break;
-          case MAIN_BUTTONLIST:
-            if (haccelButtonList == NULLHANDLE) {
-                haccelButtonList = WinLoadAccelTable(hab, FM3ModHandle, MAIN_BUTTONLIST);
-                if (haccelButtonList == NULLHANDLE)
-                  Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, "WinLoadAccelTable");
-            }
-            if (haccelButtonList != NULLHANDLE) {
-              if (!WinSetAccelTable(hab, haccelButtonList, hwndFrame))
-                Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, "WinSetAccelTable");
-              // else
-                // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_BUTTONLIST %x %x", hwndFrame, haccelButtonList);
-            }
-            break;
-          } // switch
-        }
+        // If getting focus 1st time - save original accelerator
+        if (haccelSaved == NULLHANDLE) {
+          haccelSaved = WinQueryAccelTable(hab, hwndFrame);
+          if (haccelSaved == NULLHANDLE)
+            Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, "WinQueryAccelTable");
+          // else
+            // DbgMsg(pszSrcFile, __LINE__, "WinQueryAccelTable SAVED %x", haccelSaved);
+        }
+        if (haccelSaved != NULLHANDLE) {
+          switch (id) {
+          case MAIN_DRIVELIST:
+            if (haccelDriveList == NULLHANDLE) {
+                haccelDriveList = WinLoadAccelTable(hab, FM3ModHandle, MAIN_DRIVELIST);
+                if (haccelDriveList == NULLHANDLE)
+                  Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, "WinLoadAccelTable");
+            }
+            if (haccelDriveList != NULLHANDLE) {
+              if (!WinSetAccelTable(hab, haccelDriveList, hwndFrame))
+                Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, "WinSetAccelTable");
+              // else
+                // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_DRIVELIST %x %x", hwndFrame, haccelDriveList);
+            }
+            break;
+          case MAIN_SETUPLIST:
+            if (haccelSetupList == NULLHANDLE) {
+                haccelSetupList = WinLoadAccelTable(hab, FM3ModHandle, MAIN_SETUPLIST);
+                if (haccelSetupList == NULLHANDLE)
+                  Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, "WinLoadAccelTable");
+            }
+            if (haccelSetupList != NULLHANDLE) {
+              if (!WinSetAccelTable(hab, haccelSetupList, hwndFrame))
+                Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, "WinSetAccelTable");
+              // else
+                // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_SETUPLIST %x %x", hwndFrame, haccelSetupList);
+            }
+            break;
+          case MAIN_CMDLIST:
+            if (haccelCmdList == NULLHANDLE) {
+                haccelCmdList = WinLoadAccelTable(hab, FM3ModHandle, MAIN_CMDLIST);
+                if (haccelCmdList == NULLHANDLE)
+                  Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, "WinLoadAccelTable");
+            }
+            if (haccelCmdList != NULLHANDLE) {
+              if (!WinSetAccelTable(hab, haccelCmdList, hwndFrame))
+                Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, "WinSetAccelTable");
+              // else
+                // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_CMDLIST %x %x", hwndFrame, haccelCmdList);
+            }
+            break;
+          case MAIN_USERLIST:
+            if (haccelUserList == NULLHANDLE) {
+                haccelUserList = WinLoadAccelTable(hab, FM3ModHandle, MAIN_USERLIST);
+                if (haccelUserList == NULLHANDLE)
+                  Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, "WinLoadAccelTable");
+            }
+            if (haccelUserList != NULLHANDLE) {
+              if (!WinSetAccelTable(hab, haccelUserList, hwndFrame))
+                Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, "WinSetAccelTable");
+              // else
+                // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_USERLIST %x %x", hwndFrame, haccelUserList);
+            }
+            break;
+          case MAIN_BUTTONLIST:
+            if (haccelButtonList == NULLHANDLE) {
+                haccelButtonList = WinLoadAccelTable(hab, FM3ModHandle, MAIN_BUTTONLIST);
+                if (haccelButtonList == NULLHANDLE)
+                  Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, "WinLoadAccelTable");
+            }
+            if (haccelButtonList != NULLHANDLE) {
+              if (!WinSetAccelTable(hab, haccelButtonList, hwndFrame))
+                Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, "WinSetAccelTable");
+              // else
+                // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_BUTTONLIST %x %x", hwndFrame, haccelButtonList);
+            }
+            break;
+          } // switch
+        }
       }
       else {
-        // Losing focus
-        switch (id) {
-        case MAIN_DRIVELIST:
-        case MAIN_SETUPLIST:
-        case MAIN_CMDLIST:
-        case MAIN_USERLIST:
-        case MAIN_BUTTONLIST:
-          if (haccelSaved != NULLHANDLE) {
-            if (!WinSetAccelTable(hab, haccelSaved, hwndFrame))
-              Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, "WinSetAccelTable");
-            // else
-              // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable SAVED %x %x", hwndFrame, haccelSaved);
-          }
-          break;
-        } // switch
+        // Losing focus
+        switch (id) {
+        case MAIN_DRIVELIST:
+        case MAIN_SETUPLIST:
+        case MAIN_CMDLIST:
+        case MAIN_USERLIST:
+        case MAIN_BUTTONLIST:
+          if (haccelSaved != NULLHANDLE) {
+            if (!WinSetAccelTable(hab, haccelSaved, hwndFrame))
+              Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, "WinSetAccelTable");
+            // else
+              // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable SAVED %x %x", hwndFrame, haccelSaved);
+          }
+          break;
+        } // switch
       }
     }
@@ -729 +779 @@
 
       if (hwndMenu)
-        WinDestroyWindow(hwndMenu);
+        WinDestroyWindow(hwndMenu);
       hwndMenu = (HWND) 0;
       id = WinQueryWindowUShort(WinQueryWindow(hwnd, QW_PARENT), QWS_ID);
       switch (id) {
       case MAIN_CMDLIST:
-        WinPostMsg(WinWindowFromID(WinQueryWindow(WinQueryWindow(hwnd,
-                                                                 QW_PARENT),
-                                                  QW_PARENT),
-                                   FID_CLIENT),
-                   WM_COMMAND, MPFROM2SHORT(IDM_EDITCOMMANDS, 0), MPVOID);
-        break;
+        WinPostMsg(WinWindowFromID(WinQueryWindow(WinQueryWindow(hwnd,
+                                                                 QW_PARENT),
+                                                  QW_PARENT),
+                                   FID_CLIENT),
+                   WM_COMMAND, MPFROM2SHORT(IDM_EDITCOMMANDS, 0), MPVOID);
+        break;
       case MAIN_USERLIST:
       case MAIN_SETUPLIST:
-        hwndMenu = WinLoadMenu(HWND_DESKTOP, FM3ModHandle, id);
-        if (hwndMenu)
-          PopupMenu(hwnd,
-                    WinWindowFromID(WinQueryWindow(WinQueryWindow(hwnd,
-                                                                  QW_PARENT),
-                                                   QW_PARENT),
-                                    FID_CLIENT), hwndMenu);
-        break;
+        hwndMenu = WinLoadMenu(HWND_DESKTOP, FM3ModHandle, id);
+        if (hwndMenu)
+          PopupMenu(hwnd,
+                    WinWindowFromID(WinQueryWindow(WinQueryWindow(hwnd,
+                                                                  QW_PARENT),
+                                                   QW_PARENT),
+                                    FID_CLIENT), hwndMenu);
+        break;
       default:
-        ret = FALSE;
-        break;
+        ret = FALSE;
+        break;
       } // switch
       return ret;
@@ -761 +811 @@
       switch (SHORT1FROMMP(mp1)) {
       case CBID_EDIT:
-        id = WinQueryWindowUShort(hwnd, QWS_ID);
-        switch (SHORT2FROMMP(mp1)) {
-        case EN_SETFOCUS:
-          switch (id) {
-          case MAIN_CMDLIST:
-            WinSetWindowText(hwndStatus2, GetPString(IDS_CMDLISTHELP));
-            break;
-          case MAIN_SETUPLIST:
-            WinSetWindowText(hwndStatus2, GetPString(IDS_SETUPLISTHELP));
-            break;
-          case MAIN_USERLIST:
-            WinSetWindowText(hwndStatus2, GetPString(IDS_USERLISTHELP));
-            break;
-          case MAIN_DRIVELIST:
-            WinSetWindowText(hwndStatus2, GetPString(IDS_DRIVELISTHELP));
-            break;
-          case MAIN_BUTTONLIST:
-            WinSetWindowText(hwndStatus2, GetPString(IDS_BUTTONLISTHELP));
-            break;
-          default:
-            break;
-          }
-          break;
-
-        default:
-          break;
-        }
+        id = WinQueryWindowUShort(hwnd, QWS_ID);
+        switch (SHORT2FROMMP(mp1)) {
+        case EN_SETFOCUS:
+          switch (id) {
+          case MAIN_CMDLIST:
+            WinSetWindowText(hwndStatus2, GetPString(IDS_CMDLISTHELP));
+            break;
+          case MAIN_SETUPLIST:
+            WinSetWindowText(hwndStatus2, GetPString(IDS_SETUPLISTHELP));
+            break;
+          case MAIN_USERLIST:
+            WinSetWindowText(hwndStatus2, GetPString(IDS_USERLISTHELP));
+            break;
+          case MAIN_DRIVELIST:
+            WinSetWindowText(hwndStatus2, GetPString(IDS_DRIVELISTHELP));
+            break;
+          case MAIN_BUTTONLIST:
+            WinSetWindowText(hwndStatus2, GetPString(IDS_BUTTONLISTHELP));
+            break;
+          default:
+            break;
+          }
+          break;
+
+        default:
+          break;
+        }
       }
       break;
@@ -800 +850 @@
     // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"%u %s %u",id,(id == CBID_EDIT) ? "TRUE" : "FALSE",WinQueryWindowUShort(WinQueryWindow(hwnd,QW_PARENT),QWS_ID) == MAIN_USERLIST);
     if (id == CBID_EDIT &&
-        WinQueryWindowUShort(WinQueryWindow(hwnd, QW_PARENT), QWS_ID) ==
-        MAIN_USERLIST) {
+        WinQueryWindowUShort(WinQueryWindow(hwnd, QW_PARENT), QWS_ID) ==
+        MAIN_USERLIST) {
 
       CHAR path[CCHMAXPATH];
@@ -810 +860 @@
       // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Dragging: %s",path);
       if (*path && !IsRoot(path))
-        DragOne(hwnd, (HWND) 0, path, FALSE);
+        DragOne(hwnd, (HWND) 0, path, FALSE);
       return 0;
     }
@@ -819 +869 @@
     if (id == MAIN_USERLIST) {
       if (!emphasized) {
-        emphasized = TRUE;
-        DrawTargetEmphasis(hwnd, emphasized);
+        emphasized = TRUE;
+        DrawTargetEmphasis(hwnd, emphasized);
       }
       if (AcceptOneDrop(hwnd, mp1, mp2))
-        return MRFROM2SHORT(DOR_DROP, DO_MOVE);
+        return MRFROM2SHORT(DOR_DROP, DO_MOVE);
       return MRFROM2SHORT(DOR_NEVERDROP, 0);
     }
@@ -832 +882 @@
     if (id == MAIN_USERLIST) {
       if (emphasized) {
-        emphasized = FALSE;
-        DrawTargetEmphasis(hwnd, emphasized);
+        emphasized = FALSE;
+        DrawTargetEmphasis(hwnd, emphasized);
       }
     }
@@ -853 +903 @@
 
       if (emphasized) {
-        emphasized = FALSE;
-        DrawTargetEmphasis(hwnd, emphasized);
+        emphasized = FALSE;
+        DrawTargetEmphasis(hwnd, emphasized);
       }
       if (GetOneDrop(hwnd, mp1, mp2, szFrom, sizeof(szFrom))) {
-        MakeValidDir(szFrom);
-        WinSetWindowText(hwnd, szFrom);
-        PostMsg(WinWindowFromID(WinQueryWindow(WinQueryWindow(hwnd,
-                                                              QW_PARENT),
-                                               QW_PARENT),
-                                FID_CLIENT),
-                UM_COMMAND, MPFROM2SHORT(IDM_ADDTOUSERLIST, 0), MPVOID);
-        return 0;
+        MakeValidDir(szFrom);
+        WinSetWindowText(hwnd, szFrom);
+        PostMsg(WinWindowFromID(WinQueryWindow(WinQueryWindow(hwnd,
+                                                              QW_PARENT),
+                                               QW_PARENT),
+                                FID_CLIENT),
+                UM_COMMAND, MPFROM2SHORT(IDM_ADDTOUSERLIST, 0), MPVOID);
+        return 0;
       }
     }
@@ -885 +935 @@
        (other && fOtherHelp) || (!other && !drive && fToolbarHelp))) {
     if ((!hwndBubble ||
-         WinQueryWindowULong(hwndBubble, QWL_USER) != hwnd) &&
-        !WinQueryCapture(HWND_DESKTOP))
+         WinQueryWindowULong(hwndBubble, QWL_USER) != hwnd) &&
+        !WinQueryCapture(HWND_DESKTOP))
       MakeBubble(hwnd, above, help);
   }
@@ -907 +957 @@
       /* don't bring up help if window isn't active */
       if (!WinIsChild(hwnd, hwndActive))
-        return;
+        return;
     }
     hwndActive = WinQueryFocus(HWND_DESKTOP);
@@ -913 +963 @@
       /* don't bring up help if a menu is active */
       if (!strcmp(ucClassname, "#4"))
-        return;
+        return;
     }
   }
 
   hwndBubble = WinCreateWindow(HWND_DESKTOP,
-                               WC_BUBBLE,
-                               help,
-                               WS_CLIPSIBLINGS | SS_TEXT |
-                               DT_CENTER | DT_VCENTER,
-                               0,
-                               0,
-                               0,
-                               0,
-                               HWND_DESKTOP, HWND_TOP, MAIN_HELP, NULL, NULL);
+                               WC_BUBBLE,
+                               help,
+                               WS_CLIPSIBLINGS | SS_TEXT |
+                               DT_CENTER | DT_VCENTER,
+                               0,
+                               0,
+                               0,
+                               0,
+                               HWND_DESKTOP, HWND_TOP, MAIN_HELP, NULL, NULL);
   if (!hwndBubble)
     Win_Error2(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-               IDS_WINCREATEWINDOW);
+               IDS_WINCREATEWINDOW);
   else {
     HPS hps;
@@ -949 +999 @@
       pp = strchr(p, '\r');
       if (pp) {
-        wp = pp;
-        *pp = 0;
-        pp++;
+        wp = pp;
+        *pp = 0;
+        pp++;
       }
       GpiQueryTextBox(hps, strlen(p), p, TXTBOX_COUNT, aptl);
       tptl.x = max(aptl[TXTBOX_TOPRIGHT].x, tptl.x);
       if (tptl.y)
-        tptl.y += extra;
+        tptl.y += extra;
       else
-        extra = aptl[TXTBOX_TOPLEFT].y / 4;
+        extra = aptl[TXTBOX_TOPLEFT].y / 4;
       tptl.y += aptl[TXTBOX_TOPLEFT].y;
       if (wp)
-        *wp = '\r';
+        *wp = '\r';
       p = pp;
     }
@@ -971 +1021 @@
       sy = ptl.y + swp.cy + 4;
       if (sy + tptl.y + 12 > lyScreen) {
-        above = FALSE;
-        sy = ptl.y - (tptl.y + 14);
+        above = FALSE;
+        sy = ptl.y - (tptl.y + 14);
       }
     }
@@ -988 +1038 @@
       sy = ptl.y + swp.cy + 4;
       if (sy + tptl.y + 12 > lyScreen)
-        sy = 0;
+        sy = 0;
     }
     WinSetWindowPos(hwndBubble, HWND_TOP, sx, sy,
-                    tptl.x + 14,
-                    tptl.y + 12,
-                    SWP_DEACTIVATE | SWP_SHOW | SWP_ZORDER |
-                    SWP_MOVE | SWP_SIZE);
+                    tptl.x + 14,
+                    tptl.y + 12,
+                    SWP_DEACTIVATE | SWP_SHOW | SWP_ZORDER |
+                    SWP_MOVE | SWP_SIZE);
   }
 }
@@ -1020 +1070 @@
       WinQueryPointerPos(HWND_DESKTOP, &ptl);
       if (WinWindowFromPoint(HWND_DESKTOP, &ptl, TRUE) !=
-          WinQueryWindowULong(hwnd, QWL_USER) || !WinIsWindowVisible(hwnd))
-        WinDestroyWindow(hwnd);
+          WinQueryWindowULong(hwnd, QWL_USER) || !WinIsWindowVisible(hwnd))
+        WinDestroyWindow(hwnd);
     }
     return 0;
@@ -1035 +1085 @@
       hps = WinBeginPaint(hwnd, (HPS) 0, NULL);
       if (hps) {
-        WinQueryWindowPos(hwnd, &swp);
-        GpiCreateLogColorTable(hps, 0, LCOLF_RGB, 0, 0, 0);
-        GpiSetColor(hps, ((255 << 16) | (255 << 8) | 198));
-        GpiSetBackMix(hps, BM_LEAVEALONE);
-        GpiSetMix(hps, FM_OVERPAINT);
-        ptl.x = ptl.y = 0;
-        GpiMove(hps, &ptl);
-        ptl.x = swp.cx - 1;
-        ptl.y = swp.cy - 1;
-        GpiBox(hps, DRO_OUTLINEFILL, &ptl, 0, 0);
-        tlen = WinQueryWindowTextLength(hwnd);
-        if (tlen) {
-          s = xmalloc(tlen + 2, pszSrcFile, __LINE__);
-          if (s) {
-            WinQueryWindowText(hwnd, tlen + 1, s);
-            if (*s) {
-              p = s;
-              y = swp.cy - 3;
-              extra = WinQueryWindowULong(hwnd, QWL_USER + 4);
-              GpiSetColor(hps, 0);
-              GpiSetMix(hps, FM_OVERPAINT);
-              while (p && *p) {
-                wp = NULL;
-                pp = strchr(p, '\r');
-                if (pp) {
-                  wp = pp;
-                  *pp = 0;
-                  pp++;
-                }
-                GpiQueryTextBox(hps, strlen(p), p, TXTBOX_COUNT, aptl);
-                ptl.x = 7;
-                y -= aptl[TXTBOX_TOPLEFT].y;
-                if (p != s)
-                  y -= extra;
-                ptl.y = y;
-                GpiCharStringAt(hps, &ptl, strlen(p), p);
-                if (wp)
-                  *wp = '\r';
-                p = pp;
-              }
-            }
-            free(s);
-          }
-        }
-        if (!(swp.fl & (SWP_HIDE | SWP_MINIMIZE)) && swp.cx > 6 && swp.cy > 6) {
-          GpiSetColor(hps, CLR_WHITE);
-          ptl.x = 1;
-          ptl.y = 1;
-          GpiMove(hps, &ptl);
-          ptl.y = swp.cy - 2;
-          GpiLine(hps, &ptl);
-          ptl.x = swp.cx - 2;
-          GpiLine(hps, &ptl);
-          ptl.x = 2;
-          ptl.y = 2;
-          GpiMove(hps, &ptl);
-          ptl.y = swp.cy - 3;
-          GpiLine(hps, &ptl);
-          ptl.x = swp.cx - 3;
-          GpiLine(hps, &ptl);
-          GpiSetColor(hps, CLR_BROWN);
-          ptl.x = 1;
-          ptl.y = 1;
-          GpiMove(hps, &ptl);
-          ptl.x = swp.cx - 2;
-          GpiLine(hps, &ptl);
-          ptl.y = swp.cy - 2;
-          GpiLine(hps, &ptl);
-          ptl.x = 2;
-          ptl.y = 2;
-          GpiMove(hps, &ptl);
-          ptl.x = swp.cx - 3;
-          GpiLine(hps, &ptl);
-          ptl.y = swp.cy - 3;
-          GpiLine(hps, &ptl);
-        }
-        WinEndPaint(hps);
+        WinQueryWindowPos(hwnd, &swp);
+        GpiCreateLogColorTable(hps, 0, LCOLF_RGB, 0, 0, 0);
+        GpiSetColor(hps, ((255 << 16) | (255 << 8) | 198));
+        GpiSetBackMix(hps, BM_LEAVEALONE);
+        GpiSetMix(hps, FM_OVERPAINT);
+        ptl.x = ptl.y = 0;
+        GpiMove(hps, &ptl);
+        ptl.x = swp.cx - 1;
+        ptl.y = swp.cy - 1;
+        GpiBox(hps, DRO_OUTLINEFILL, &ptl, 0, 0);
+        tlen = WinQueryWindowTextLength(hwnd);
+        if (tlen) {
+          s = xmalloc(tlen + 2, pszSrcFile, __LINE__);
+          if (s) {
+            WinQueryWindowText(hwnd, tlen + 1, s);
+            if (*s) {
+              p = s;
+              y = swp.cy - 3;
+              extra = WinQueryWindowULong(hwnd, QWL_USER + 4);
+              GpiSetColor(hps, 0);
+              GpiSetMix(hps, FM_OVERPAINT);
+              while (p && *p) {
+                wp = NULL;
+                pp = strchr(p, '\r');
+                if (pp) {
+                  wp = pp;
+                  *pp = 0;
+                  pp++;
+                }
+                GpiQueryTextBox(hps, strlen(p), p, TXTBOX_COUNT, aptl);
+                ptl.x = 7;
+                y -= aptl[TXTBOX_TOPLEFT].y;
+                if (p != s)
+                  y -= extra;
+                ptl.y = y;
+                GpiCharStringAt(hps, &ptl, strlen(p), p);
+                if (wp)
+                  *wp = '\r';
+                p = pp;
+              }
+            }
+            free(s);
+          }
+        }
+        if (!(swp.fl & (SWP_HIDE | SWP_MINIMIZE)) && swp.cx > 6 && swp.cy > 6) {
+          GpiSetColor(hps, CLR_WHITE);
+          ptl.x = 1;
+          ptl.y = 1;
+          GpiMove(hps, &ptl);
+          ptl.y = swp.cy - 2;
+          GpiLine(hps, &ptl);
+          ptl.x = swp.cx - 2;
+          GpiLine(hps, &ptl);
+          ptl.x = 2;
+          ptl.y = 2;
+          GpiMove(hps, &ptl);
+          ptl.y = swp.cy - 3;
+          GpiLine(hps, &ptl);
+          ptl.x = swp.cx - 3;
+          GpiLine(hps, &ptl);
+          GpiSetColor(hps, CLR_BROWN);
+          ptl.x = 1;
+          ptl.y = 1;
+          GpiMove(hps, &ptl);
+          ptl.x = swp.cx - 2;
+          GpiLine(hps, &ptl);
+          ptl.y = swp.cy - 2;
+          GpiLine(hps, &ptl);
+          ptl.x = 2;
+          ptl.y = 2;
+          GpiMove(hps, &ptl);
+          ptl.x = swp.cx - 3;
+          GpiLine(hps, &ptl);
+          ptl.y = swp.cy - 3;
+          GpiLine(hps, &ptl);
+        }
+        WinEndPaint(hps);
       }
     }
@@ -1138 +1188 @@
       switch (WinQueryWindowUShort(hwnd, QWS_ID)) {
       case MAIN_LED:
-        hps = WinGetPS(hwnd);
-        hbmold = (HBITMAP) WinSendMsg(hwnd, SM_QUERYHANDLE, MPVOID, MPVOID);
-        if (!fBlueLED) {
-          hbmLEDon = GpiLoadBitmap(hps, 0, LEDON_BMP, 12, 12);
-          hbmLEDoff = GpiLoadBitmap(hps, 0, LEDOFF_BMP, 12, 12);
-        }
-        else {
-          hbmLEDon = GpiLoadBitmap(hps, 0, LEDON2_BMP, 12, 12);
-          hbmLEDoff = GpiLoadBitmap(hps, 0, LEDOFF2_BMP, 12, 12);
-        }
-        if (hbmLEDoff && hbmLEDon)
-          WinSendMsg(hwnd, SM_SETHANDLE, MPFROMLONG(hbmLEDoff), MPVOID);
-        else {
-          if (hbmLEDoff)
-            GpiDeleteBitmap(hbmLEDoff);
-          if (hbmLEDon)
-            GpiDeleteBitmap(hbmLEDon);
-        }
-        if (hbmold &&
-            hbmLEDon &&
-            hbmLEDoff && hbmold != hbmLEDon && hbmold != hbmLEDoff)
-          GpiDeleteBitmap(hbmold);
-        if (hps)
-          WinReleasePS(hps);
-        break;
+        hps = WinGetPS(hwnd);
+        hbmold = (HBITMAP) WinSendMsg(hwnd, SM_QUERYHANDLE, MPVOID, MPVOID);
+        if (!fBlueLED) {
+          hbmLEDon = GpiLoadBitmap(hps, 0, LEDON_BMP, 12, 12);
+          hbmLEDoff = GpiLoadBitmap(hps, 0, LEDOFF_BMP, 12, 12);
+        }
+        else {
+          hbmLEDon = GpiLoadBitmap(hps, 0, LEDON2_BMP, 12, 12);
+          hbmLEDoff = GpiLoadBitmap(hps, 0, LEDOFF2_BMP, 12, 12);
+        }
+        if (hbmLEDoff && hbmLEDon)
+          WinSendMsg(hwnd, SM_SETHANDLE, MPFROMLONG(hbmLEDoff), MPVOID);
+        else {
+          if (hbmLEDoff)
+            GpiDeleteBitmap(hbmLEDoff);
+          if (hbmLEDon)
+            GpiDeleteBitmap(hbmLEDon);
+        }
+        if (hbmold &&
+            hbmLEDon &&
+            hbmLEDoff && hbmold != hbmLEDon && hbmold != hbmLEDoff)
+          GpiDeleteBitmap(hbmold);
+        if (hps)
+          WinReleasePS(hps);
+        break;
       default:
-        SetPresParams(hwnd,
-                      &RGBGREY,
-                      &RGBBLACK, &RGBGREY, GetPString(IDS_6HELVTEXT));
-        break;
+        SetPresParams(hwnd,
+                      &RGBGREY,
+                      &RGBBLACK, &RGBGREY, GetPString(IDS_6HELVTEXT));
+        break;
       }
       return mr;
@@ -1191 +1241 @@
   case WM_BUTTON1CLICK:
     PostMsg(WinQueryWindow(hwnd, QW_PARENT),
-            WM_COMMAND, MPFROM2SHORT(IDM_SHOWNOTEWND, 0), MPVOID);
+            WM_COMMAND, MPFROM2SHORT(IDM_SHOWNOTEWND, 0), MPVOID);
     break;
 
   case WM_BUTTON2CLICK:
     PostMsg(WinQueryWindow(hwnd, QW_PARENT),
-            WM_COMMAND, MPFROM2SHORT(IDM_HIDENOTEWND, 0), MPVOID);
+            WM_COMMAND, MPFROM2SHORT(IDM_HIDENOTEWND, 0), MPVOID);
     break;
 
@@ -1202 +1252 @@
   case WM_BUTTON3CLICK:
     PostMsg(WinQueryWindow(hwnd, QW_PARENT),
-            WM_COMMAND, MPFROM2SHORT(IDM_WINDOWDLG, 0), MPVOID);
+            WM_COMMAND, MPFROM2SHORT(IDM_WINDOWDLG, 0), MPVOID);
     break;
   }
@@ -1225 +1275 @@
     if (fToolbarHelp) {
       if ((!hwndBubble || WinQueryWindowULong(hwndBubble, QWL_USER) != hwnd)
-          && !WinQueryCapture(HWND_DESKTOP)) {
-        id = WinQueryWindowUShort(hwnd, QWS_ID);
-        tool = find_tool(id);
-        if (tool && tool->help && *tool->help) {
-
-          char s[128];
-
-          strcpy(s, tool->help);
-          if (tool->flags & T_DROPABLE)
-            strcat(s, GetPString(IDS_DROPONMETEXT));
-          MakeBubble(hwnd, FALSE, s);
-        }
+          && !WinQueryCapture(HWND_DESKTOP)) {
+        id = WinQueryWindowUShort(hwnd, QWS_ID);
+        tool = find_tool(id);
+        if (tool && tool->help && *tool->help) {
+
+          char s[128];
+
+          strcpy(s, tool->help);
+          if (tool->flags & T_DROPABLE)
+            strcat(s, GetPString(IDS_DROPONMETEXT));
+          MakeBubble(hwnd, FALSE, s);
+        }
       }
     }
@@ -1245 +1295 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp,
-                   HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_TOOLBAR, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp,
+                   HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_TOOLBAR, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
 
@@ -1253 +1303 @@
     case IDM_HIDETOOL:                  /* hide tool */
       if (SHORT1FROMMP(mp1) == IDM_HIDETOOL)
-        id = WinQueryWindowUShort(hwnd, QWS_ID);
+        id = WinQueryWindowUShort(hwnd, QWS_ID);
       else
-        id = (USHORT) WinDlgBox(HWND_DESKTOP, hwnd,
-                                PickToolProc, FM3ModHandle,
-                                PICKBTN_FRAME, GetPString(IDS_HIDETEXT));
+        id = (USHORT) WinDlgBox(HWND_DESKTOP, hwnd,
+                                PickToolProc, FM3ModHandle,
+                                PICKBTN_FRAME, GetPString(IDS_HIDETEXT));
       if (id) {
-        tool = find_tool(id);
-        if (tool) {
-          tool->flags |= T_INVISIBLE;
+        tool = find_tool(id);
+        if (tool) {
+          tool->flags |= T_INVISIBLE;
           save_tools(NULL);
-        }
+        }
       }
       break;
@@ -1270 +1320 @@
       tool = toolhead;
       while (tool) {
-        tool->flags &= (~T_INVISIBLE);
-        tool = tool->next;
+        tool->flags &= (~T_INVISIBLE);
+        tool = tool->next;
       }
       save_tools(NULL);
@@ -1279 +1329 @@
     case IDM_DELETETOOL:                /* delete button */
       if (SHORT1FROMMP(mp1) == IDM_DELETETOOL)
-        id = WinQueryWindowUShort(hwnd, QWS_ID);
+        id = WinQueryWindowUShort(hwnd, QWS_ID);
       else
-        id =
-          (USHORT) WinDlgBox(HWND_DESKTOP, hwnd, PickToolProc, FM3ModHandle,
-                             PICKBTN_FRAME, GetPString(IDS_DELETETEXT));
+        id =
+          (USHORT) WinDlgBox(HWND_DESKTOP, hwnd, PickToolProc, FM3ModHandle,
+                             PICKBTN_FRAME, GetPString(IDS_DELETETEXT));
       if (id)
-        PostMsg(WinQueryWindow(hwnd, QW_PARENT), UM_SETUP,
+        PostMsg(WinQueryWindow(hwnd, QW_PARENT), UM_SETUP,
                 MPFROM2SHORT(id, 0), MPVOID);
       return 0;
@@ -1292 +1342 @@
     case IDM_EDITTOOL:                  /* edit button */
       if (SHORT1FROMMP(mp1) == IDM_EDITTOOL)
-        id = WinQueryWindowUShort(hwnd, QWS_ID);
+        id = WinQueryWindowUShort(hwnd, QWS_ID);
       else
-        id =
-          (USHORT) WinDlgBox(HWND_DESKTOP, hwnd, PickToolProc, FM3ModHandle,
-                             PICKBTN_FRAME, GetPString(IDS_EDITTEXT));
+        id =
+          (USHORT) WinDlgBox(HWND_DESKTOP, hwnd, PickToolProc, FM3ModHandle,
+                             PICKBTN_FRAME, GetPString(IDS_EDITTEXT));
       if (id) {
-        tool = find_tool(id);
-        if (tool) {
-          if (WinDlgBox(HWND_DESKTOP, hwnd, AddToolProc, FM3ModHandle,
-                        ADDBTN_FRAME, (PVOID) tool))
-            WinSendMsg(WinWindowFromID(WinQueryWindow(WinQueryWindow(hwnd,
-                                                                     QW_PARENT),
-                                                      QW_PARENT), FID_CLIENT),
-                       WM_COMMAND, MPFROM2SHORT(IDM_CREATETOOL, 0),
-                       MPFROM2SHORT(id, 0));
-        }
+        tool = find_tool(id);
+        if (tool) {
+          if (WinDlgBox(HWND_DESKTOP, hwnd, AddToolProc, FM3ModHandle,
+                        ADDBTN_FRAME, (PVOID) tool))
+            WinSendMsg(WinWindowFromID(WinQueryWindow(WinQueryWindow(hwnd,
+                                                                     QW_PARENT),
+                                                      QW_PARENT), FID_CLIENT),
+                       WM_COMMAND, MPFROM2SHORT(IDM_CREATETOOL, 0),
+                       MPFROM2SHORT(id, 0));
+        }
       }
       break;
@@ -1313 +1363 @@
     case IDM_ADDTOOL:                   /* add tool */
       id = (USHORT) WinDlgBox(HWND_DESKTOP, hwnd, AddToolProc, FM3ModHandle,
-                              ADDBTN_FRAME, MPVOID);
+                              ADDBTN_FRAME, MPVOID);
       if (id && id != (USHORT) - 1)
-        WinSendMsg(WinWindowFromID(WinQueryWindow(WinQueryWindow(hwnd,
-                                                                 QW_PARENT),
-                                                  QW_PARENT), FID_CLIENT),
-                   WM_COMMAND, MPFROM2SHORT(IDM_CREATETOOL, 0),
-                   MPFROM2SHORT(id, 0));
+        WinSendMsg(WinWindowFromID(WinQueryWindow(WinQueryWindow(hwnd,
+                                                                 QW_PARENT),
+                                                  QW_PARENT), FID_CLIENT),
+                   WM_COMMAND, MPFROM2SHORT(IDM_CREATETOOL, 0),
+                   MPFROM2SHORT(id, 0));
       break;
 
     case IDM_REORDERTOOLS:              /* reorder tools */
       WinDlgBox(HWND_DESKTOP,
-                hwnd, ReOrderToolsProc, FM3ModHandle, RE_FRAME, MPVOID);
+                hwnd, ReOrderToolsProc, FM3ModHandle, RE_FRAME, MPVOID);
       break;
 
@@ -1330 +1380 @@
     case IDM_LOADTOOLS:
       if (WinDlgBox(HWND_DESKTOP,
-                    hwnd,
-                    ToolIODlgProc,
-                    FM3ModHandle,
-                    SVBTN_FRAME,
-                    (PVOID) (SHORT1FROMMP(mp1) == IDM_SAVETOOLS) ?
-                    "TRUE" : NULL))
+                    hwnd,
+                    ToolIODlgProc,
+                    FM3ModHandle,
+                    SVBTN_FRAME,
+                    (PVOID) (SHORT1FROMMP(mp1) == IDM_SAVETOOLS) ?
+                    "TRUE" : NULL))
         PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
       break;
@@ -1368 +1418 @@
       tool = find_tool(id);
       if (!tool) {
-        DrgFreeDraginfo(pDInfo);
-        return (MRFROM2SHORT(DOR_NEVERDROP, 0));        /* Drop not valid */
+        DrgFreeDraginfo(pDInfo);
+        return (MRFROM2SHORT(DOR_NEVERDROP, 0));        /* Drop not valid */
       }
       if (!(tool->flags & T_DROPABLE)) {
-        DrgFreeDraginfo(pDInfo);
-        return (MRFROM2SHORT(DOR_NEVERDROP, 0));        /* Drop not valid */
+        DrgFreeDraginfo(pDInfo);
+        return (MRFROM2SHORT(DOR_NEVERDROP, 0));        /* Drop not valid */
       }
       {
-        PDRAGITEM pDItem;               /* Pointer to DRAGITEM */
-
-        pDItem = DrgQueryDragitemPtr(pDInfo,    /* Access DRAGITEM */
-                                     0);        /* Index to DRAGITEM */
-        if (DrgVerifyRMF(pDItem,        /* Check valid rendering */
-                         DRM_OS2FILE,   /* mechanisms and data */
-                         NULL)) {       /* formats */
-          if (!(tool->flags & T_EMPHASIZED)) {
-            tool->flags |= T_EMPHASIZED;
-            DrawTargetEmphasis(hwnd, ((tool->flags & T_EMPHASIZED) != 0));
-            DrgFreeDraginfo(pDInfo);
-          }
-          return (MRFROM2SHORT(DOR_DROP,        /* Return okay to drop */
-                               DO_MOVE));       /* Move operation valid */
-        }
-        DrgFreeDraginfo(pDInfo);
+        PDRAGITEM pDItem;               /* Pointer to DRAGITEM */
+
+        pDItem = DrgQueryDragitemPtr(pDInfo,    /* Access DRAGITEM */
+                                     0);        /* Index to DRAGITEM */
+        if (DrgVerifyRMF(pDItem,        /* Check valid rendering */
+                         DRM_OS2FILE,   /* mechanisms and data */
+                         NULL)) {       /* formats */
+          if (!(tool->flags & T_EMPHASIZED)) {
+            tool->flags |= T_EMPHASIZED;
+            DrawTargetEmphasis(hwnd, ((tool->flags & T_EMPHASIZED) != 0));
+            DrgFreeDraginfo(pDInfo);
+          }
+          return (MRFROM2SHORT(DOR_DROP,        /* Return okay to drop */
+                               DO_MOVE));       /* Move operation valid */
+        }
+        DrgFreeDraginfo(pDInfo);
       }
     }
@@ -1408 +1458 @@
     if (tool && (tool->flags & T_DROPABLE)) {
       if (tool->flags & T_EMPHASIZED) {
-        tool->flags &= (~T_EMPHASIZED);
-        DrawTargetEmphasis(hwnd, ((tool->flags & T_EMPHASIZED) != 0));
+        tool->flags &= (~T_EMPHASIZED);
+        DrawTargetEmphasis(hwnd, ((tool->flags & T_EMPHASIZED) != 0));
       }
     }
@@ -1422 +1472 @@
 
       if (tool->flags & T_EMPHASIZED) {
-        DrawTargetEmphasis(hwnd, ((tool->flags & T_EMPHASIZED) != 0));
-        tool->flags &= (~T_EMPHASIZED);
+        DrawTargetEmphasis(hwnd, ((tool->flags & T_EMPHASIZED) != 0));
+        tool->flags &= (~T_EMPHASIZED);
       }
       memset(&cdi, 0, sizeof(cdi));
@@ -1430 +1480 @@
       CheckPmDrgLimit(cdi.pDragInfo);
       if (li) {
-        li->type = id;
-        if (!li->list || !li->list[0])
-          FreeListInfo(li);
-        else {
-          HWND hwndActive;
-
-          hwndActive = TopWindow(hwndMain, (HWND) 0);
-          if (hwndActive) {
-            if (!WinSendMsg(hwndActive, UM_COMMAND, MPFROMP(li), MPVOID))
-              FreeListInfo(li);
-          }
-          else
-            FreeListInfo(li);
-        }
+        li->type = id;
+        if (!li->list || !li->list[0])
+          FreeListInfo(li);
+        else {
+          HWND hwndActive;
+
+          hwndActive = TopWindow(hwndMain, (HWND) 0);
+          if (hwndActive) {
+            if (!WinSendMsg(hwndActive, UM_COMMAND, MPFROMP(li), MPVOID))
+              FreeListInfo(li);
+          }
+          else
+            FreeListInfo(li);
+        }
       }
     }
@@ -1481 +1531 @@
     if (!fTextTools) {
       if (!(tool->flags & T_MYICON)) {
-        hwndTool = WinCreateWindow(hwndT,
-                                   WC_TOOLBUTTONS,
-                                   s,
-                                   BS_NOPOINTERFOCUS |
-                                   BS_BITMAP | BS_PUSHBUTTON,
-                                   ctrlxpos,
-                                   14,
-                                   32,
-                                   32, hwndT, HWND_TOP, tool->id, NULL, NULL);
+        hwndTool = WinCreateWindow(hwndT,
+                                   WC_TOOLBUTTONS,
+                                   s,
+                                   BS_NOPOINTERFOCUS |
+                                   BS_BITMAP | BS_PUSHBUTTON,
+                                   ctrlxpos,
+                                   14,
+                                   32,
+                                   32, hwndT, HWND_TOP, tool->id, NULL, NULL);
       }
       if (!hwndTool) {
-        HBITMAP hbm = LoadBitmapFromFileNum(tool->id);
-
-        if (hbm) {
-          BTNCDATA btc;
-
-          memset(&btc, 0, sizeof(btc));
-          btc.cb = sizeof(btc);
-          btc.hImage = hbm;
-          hwndTool = WinCreateWindow(hwndT,
-                                     WC_TOOLBUTTONS,
-                                     NullStr,
-                                     BS_NOPOINTERFOCUS |
-                                     BS_BITMAP | BS_PUSHBUTTON,
-                                     ctrlxpos,
-                                     14,
-                                     32,
-                                     32,
-                                     hwndT, HWND_TOP, tool->id, &btc, NULL);
-          if (!hwndTool)
-            GpiDeleteBitmap(hbm);
-        }
+        HBITMAP hbm = LoadBitmapFromFileNum(tool->id);
+
+        if (hbm) {
+          BTNCDATA btc;
+
+          memset(&btc, 0, sizeof(btc));
+          btc.cb = sizeof(btc);
+          btc.hImage = hbm;
+          hwndTool = WinCreateWindow(hwndT,
+                                     WC_TOOLBUTTONS,
+                                     NullStr,
+                                     BS_NOPOINTERFOCUS |
+                                     BS_BITMAP | BS_PUSHBUTTON,
+                                     ctrlxpos,
+                                     14,
+                                     32,
+                                     32,
+                                     hwndT, HWND_TOP, tool->id, &btc, NULL);
+          if (!hwndTool)
+            GpiDeleteBitmap(hbm);
+        }
       }
       if (hwndTool)
-        tool->flags &= (~T_TEXT);
+        tool->flags &= (~T_TEXT);
     }
     if (!hwndTool) {
       hwndTool = WinCreateWindow(hwndT,
-                                 WC_TOOLBUTTONS,
-                                 (!tool->text && tool->id >= IDM_COMMANDSTART
-                                  && tool->id <
-                                  IDM_QUICKTOOLSTART) ? command_title(tool->
-                                                                      id -
-                                                                      IDM_COMMANDSTART)
-                                 : tool->text,
-                                 BS_NOPOINTERFOCUS | BS_PUSHBUTTON, ctrlxpos,
-                                 2, 54, 24, hwndT, HWND_TOP, tool->id, NULL,
-                                 NULL);
+                                 WC_TOOLBUTTONS,
+                                 (!tool->text && tool->id >= IDM_COMMANDSTART
+                                  && tool->id <
+                                  IDM_QUICKTOOLSTART) ? command_title(tool->
+                                                                      id -
+                                                                      IDM_COMMANDSTART)
+                                 : tool->text,
+                                 BS_NOPOINTERFOCUS | BS_PUSHBUTTON, ctrlxpos,
+                                 2, 54, 24, hwndT, HWND_TOP, tool->id, NULL,
+                                 NULL);
       if (!hwndTool)
-        Win_Error2(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
-                   IDS_WINCREATEWINDOW);
+        Win_Error2(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
+                   IDS_WINCREATEWINDOW);
       tool->flags |= T_TEXT;
     }
     if (fToolTitles && !fTextTools) {
       hwndTool = WinCreateWindow(hwndT,
-                                 WC_STATIC,
-                                 tool->text,
-                                 SS_TEXT | DT_LEFT | DT_VCENTER,
-                                 ctrlxpos,
-                                 1,
-                                 32,
-                                 10,
-                                 hwndT,
-                                 HWND_TOP, tool->id + 25000, NULL, NULL);
+                                 WC_STATIC,
+                                 tool->text,
+                                 SS_TEXT | DT_LEFT | DT_VCENTER,
+                                 ctrlxpos,
+                                 1,
+                                 32,
+                                 10,
+                                 hwndT,
+                                 HWND_TOP, tool->id + 25000, NULL, NULL);
       if (!hwndTool)
-        Win_Error2(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
-                   IDS_WINCREATEWINDOW);
+        Win_Error2(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
+                   IDS_WINCREATEWINDOW);
       else {
-        SetPresParams(hwndTool,
-                      &RGBGREY,
-                      &RGBBLACK, &RGBGREY, GetPString(IDS_2SYSTEMVIOTEXT));
+        SetPresParams(hwndTool,
+                      &RGBGREY,
+                      &RGBBLACK, &RGBGREY, GetPString(IDS_2SYSTEMVIOTEXT));
       }
     }
     ctrlxpos += ((tool->flags & T_TEXT) ? 55L : 33L);
     SetPresParams(WinWindowFromID(hwndT, tool->id),
-                  NULL, NULL, NULL, GetPString(IDS_8HELVTEXT));
+                  NULL, NULL, NULL, GetPString(IDS_8HELVTEXT));
     tool = tool->next;
   }                                     // while tool
 
   hwndTool = WinCreateWindow(hwndT,
-                             WC_BUTTON,
-                             "#6010",
-                             BS_NOPOINTERFOCUS |
-                             BS_BITMAP | BS_PUSHBUTTON,
-                             1,
-                             19,
-                             14,
-                             13, hwndT, HWND_TOP, IDM_TOOLLEFT, NULL, NULL);
+                             WC_BUTTON,
+                             "#6010",
+                             BS_NOPOINTERFOCUS |
+                             BS_BITMAP | BS_PUSHBUTTON,
+                             1,
+                             19,
+                             14,
+                             13, hwndT, HWND_TOP, IDM_TOOLLEFT, NULL, NULL);
   if (!hwndTool)
     Win_Error2(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
-               IDS_WINCREATEWINDOW);
+               IDS_WINCREATEWINDOW);
   hwndTool =
     WinCreateWindow(hwndT, WC_BUTTON, "#6011",
-                    BS_NOPOINTERFOCUS | BS_BITMAP | BS_PUSHBUTTON, 1, 4, 14,
-                    13, hwndT, HWND_TOP, IDM_TOOLRIGHT, NULL, NULL);
+                    BS_NOPOINTERFOCUS | BS_BITMAP | BS_PUSHBUTTON, 1, 4, 14,
+                    13, hwndT, HWND_TOP, IDM_TOOLRIGHT, NULL, NULL);
   if (!hwndTool)
     Win_Error2(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
-               IDS_WINCREATEWINDOW);
+               IDS_WINCREATEWINDOW);
   if (resize)
     ResizeTools(hwndT);
@@ -1584 +1634 @@
 
 static MRESULT EXPENTRY CommandLineProc(HWND hwnd, ULONG msg, MPARAM mp1,
-                                        MPARAM mp2)
+                                        MPARAM mp2)
 {
   PFNWP oldproc = (PFNWP) WinQueryWindowPtr(hwnd, QWL_USER);
@@ -1601 +1651 @@
 
       if (WinQueryWindowUShort((HWND) mp1, QWS_ID) == COMMAND_BUTTON)
-        break;
+        break;
       if (!WinQueryWindowProcess((HWND) mp1, &pid, &tid) || pid == mypid)
-        WinDestroyWindow(hwnd);
+        WinDestroyWindow(hwnd);
     }
     break;
@@ -1613 +1663 @@
       pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
       if (pszCmdLine) {
-        lbup = TRUE;
-        if (WinDlgBox(HWND_DESKTOP,
-                        hwnd,
-                      CmdLine2DlgProc,
-                      FM3ModHandle, EXEC2_FRAME, MPFROMP(pszCmdLine))) {
-          lstrip(pszCmdLine);
-        WinSetWindowText(hwnd, pszCmdLine);
-        }
-        PostMsg(hwnd, UM_FOCUSME, MPVOID, MPVOID);
-        PostMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
-        free(pszCmdLine);
+        lbup = TRUE;
+        if (WinDlgBox(HWND_DESKTOP,
+                        hwnd,
+                      CmdLine2DlgProc,
+                      FM3ModHandle, EXEC2_FRAME, MPFROMP(pszCmdLine))) {
+          lstrip(pszCmdLine);
+        WinSetWindowText(hwnd, pszCmdLine);
+        }
+        PostMsg(hwnd, UM_FOCUSME, MPVOID, MPVOID);
+        PostMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
+        free(pszCmdLine);
       }
     }
@@ -1640 +1690 @@
     case COMMAND_BUTTON:
       if (!lbup)
-        PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
+        PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
       break;
     }
@@ -1659 +1709 @@
       bstrip(cl + len);
       if (strlen(cl) > len) {
-        WinSendMsg(WinQueryWindow(hwnd, QW_PARENT),
-                   UM_SETUP, MPFROMP(cl + len), MPVOID);
-        WinQueryWindowText(hwndStatus, CCHMAXPATH, directory);
-        bstrip(directory);
-        if (*directory && (IsRoot(directory) || !IsFile(directory))) {
-          if (!FM2Command(directory, cl + len)) {
-            hwndCnr = TopWindow(hwndMain, (HWND) 0);
-            if (hwndCnr) {
-              hwndCnr = WinWindowFromID(hwndCnr, FID_CLIENT);
-              if (hwndCnr) {
-                hwndCnr = WinWindowFromID(hwndCnr, DIR_CNR);
-                if (hwndCnr)
-                  list = BuildList(hwndCnr);
-              }
-            }
-            WinSetActiveWindow(HWND_DESKTOP, hwndCnr);
-            if (add_cmdline(cl + len, FALSE) && fSaveMiniCmds)
-              save_cmdlines(FALSE);
-            ExecOnList(hwndCnr,
-                       cl,
-                       WINDOWED | ((fKeepCmdLine) ?
-                                   SEPARATEKEEP : SEPARATE),
-                       directory, list, NULL, pszSrcFile, __LINE__);
-            xfree(list, pszSrcFile, __LINE__);
-            WinDestroyWindow(hwnd);
-            break;
-          }
-        }
+        WinSendMsg(WinQueryWindow(hwnd, QW_PARENT),
+                   UM_SETUP, MPFROMP(cl + len), MPVOID);
+        WinQueryWindowText(hwndStatus, CCHMAXPATH, directory);
+        bstrip(directory);
+        if (*directory && (IsRoot(directory) || !IsFile(directory))) {
+          if (!FM2Command(directory, cl + len)) {
+            hwndCnr = TopWindow(hwndMain, (HWND) 0);
+            if (hwndCnr) {
+              hwndCnr = WinWindowFromID(hwndCnr, FID_CLIENT);
+              if (hwndCnr) {
+                hwndCnr = WinWindowFromID(hwndCnr, DIR_CNR);
+                if (hwndCnr)
+                  list = BuildList(hwndCnr);
+              }
+            }
+            WinSetActiveWindow(HWND_DESKTOP, hwndCnr);
+            if (add_cmdline(cl + len, FALSE) && fSaveMiniCmds)
+              save_cmdlines(FALSE);
+            ExecOnList(hwndCnr,
+                       cl,
+                       WINDOWED | ((fKeepCmdLine) ?
+                                   SEPARATEKEEP : SEPARATE),
+                       directory, list, NULL, pszSrcFile, __LINE__);
+            xfree(list, pszSrcFile, __LINE__);
+            WinDestroyWindow(hwnd);
+            break;
+          }
+        }
       }
       WinSendMsg(hwnd, EM_SETSEL, MPFROM2SHORT(0, 1024), MPVOID);
@@ -1695 +1745 @@
     if (!lbup && !(SHORT1FROMMP(mp1) & KC_KEYUP)) {
       if (SHORT1FROMMP(mp1) & KC_VIRTUALKEY) {
-        if ((SHORT1FROMMP(mp2) & 255) == '\r')
-          PostMsg(hwnd, UM_OPENWINDOWFORME, MPVOID, MPVOID);
-        else if ((SHORT1FROMMP(mp2) & 0xff) == 0x1b)
-          WinDestroyWindow(hwnd);
-        else if (SHORT2FROMMP(mp2) == VK_UP || SHORT2FROMMP(mp2) == VK_DOWN)
-          PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
+        if ((SHORT1FROMMP(mp2) & 255) == '\r')
+          PostMsg(hwnd, UM_OPENWINDOWFORME, MPVOID, MPVOID);
+        else if ((SHORT1FROMMP(mp2) & 0xff) == 0x1b)
+          WinDestroyWindow(hwnd);
+        else if (SHORT2FROMMP(mp2) == VK_UP || SHORT2FROMMP(mp2) == VK_DOWN)
+          PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
       }
     }
     else if ((SHORT1FROMMP(mp1) & KC_VIRTUALKEY) &&
-             ((SHORT2FROMMP(mp2) == VK_UP ||
-               SHORT2FROMMP(mp2) == VK_DOWN) ||
-              (SHORT1FROMMP(mp2) == '\x1b') || (SHORT1FROMMP(mp2) == '\r')))
+             ((SHORT2FROMMP(mp2) == VK_UP ||
+               SHORT2FROMMP(mp2) == VK_DOWN) ||
+              (SHORT1FROMMP(mp2) == '\x1b') || (SHORT1FROMMP(mp2) == '\r')))
       return 0;
     break;
@@ -1732 +1782 @@
       rgb.bRed = (BYTE)128;
       SetPresParams(hwnd,
-                    &RGBGREY, &rgb, &RGBGREY, GetPString(IDS_8HELVTEXT));
+                    &RGBGREY, &rgb, &RGBGREY, GetPString(IDS_8HELVTEXT));
       SetTargetDir(hwnd, TRUE);
     }
@@ -1762 +1812 @@
   case WM_CONTROLPOINTER:
     if (!fNoFinger &&
-        (SHORT1FROMMP(mp1) >= IDM_DRIVEA &&
-         SHORT1FROMMP(mp1) < IDM_DRIVEA + 26))
+        (SHORT1FROMMP(mp1) >= IDM_DRIVEA &&
+         SHORT1FROMMP(mp1) < IDM_DRIVEA + 26))
       return MRFROMLONG(hptrFinger);
     break;
@@ -1773 +1823 @@
       *dv = 0;
       WinQueryWindowText(WinWindowFromID(hwnd, SHORT1FROMMP(mp1) + 50),
-                         2, dv);
+                         2, dv);
       if (isalpha(*dv)) {
 
-        HWND hwndActive;
-
-        dv[1] = ':';
-        dv[2] = '\\';
-        dv[3] = 0;
-        hwndActive = TopWindow(hwnd, (HWND) 0);
-        if (hwndActive)
-          WinSendMsg(WinWindowFromID(hwndActive, FID_CLIENT),
-                     UM_DRIVECMD, MPFROMP(dv), MPVOID);
+        HWND hwndActive;
+
+        dv[1] = ':';
+        dv[2] = '\\';
+        dv[3] = 0;
+        hwndActive = TopWindow(hwnd, (HWND) 0);
+        if (hwndActive)
+          WinSendMsg(WinWindowFromID(hwndActive, FID_CLIENT),
+                     UM_DRIVECMD, MPFROMP(dv), MPVOID);
       }
     }
@@ -1812 +1862 @@
   case WM_MOUSEMOVE:
     if (fDrivebarHelp &&
-        (!hwndBubble ||
-         WinQueryWindowULong(hwndBubble, QWL_USER) != hwnd) &&
-        !WinQueryCapture(HWND_DESKTOP)) {
+        (!hwndBubble ||
+         WinQueryWindowULong(hwndBubble, QWL_USER) != hwnd) &&
+        !WinQueryCapture(HWND_DESKTOP)) {
       id = WinQueryWindowUShort(hwnd, QWS_ID);
       if (helpid != id) {
-        helpid = id;
-        PostMsg(MainObjectHwnd, UM_SETUP6, MPFROMLONG((ULONG) hwnd), MPVOID);
+        helpid = id;
+        PostMsg(MainObjectHwnd, UM_SETUP6, MPFROMLONG((ULONG) hwnd), MPVOID);
       }
       else
-        helpid = 0;
+        helpid = 0;
     }
     break;
@@ -1828 +1878 @@
     if (helpid == WinQueryWindowUShort(hwnd, QWS_ID)) {
       if ((char *)mp1 &&
-          (!hwndBubble ||
-           WinQueryWindowULong(hwndBubble, QWL_USER) != hwnd) &&
-          !WinQueryCapture(HWND_DESKTOP)) {
-
-        RECTL rcl;
-        POINTL ptl;
-
-        WinQueryPointerPos(HWND_DESKTOP, &ptl);
-        WinMapWindowPoints(HWND_DESKTOP, hwnd, &ptl, 1);
-        WinQueryWindowRect(hwnd, &rcl);
-        if (WinPtInRect(WinQueryAnchorBlock(hwnd), &rcl, &ptl))
-          BubbleHelp(hwnd, FALSE, TRUE, FALSE, (char *)mp1);
+          (!hwndBubble ||
+           WinQueryWindowULong(hwndBubble, QWL_USER) != hwnd) &&
+          !WinQueryCapture(HWND_DESKTOP)) {
+
+        RECTL rcl;
+        POINTL ptl;
+
+        WinQueryPointerPos(HWND_DESKTOP, &ptl);
+        WinMapWindowPoints(HWND_DESKTOP, hwnd, &ptl, 1);
+        WinQueryWindowRect(hwnd, &rcl);
+        if (WinPtInRect(WinQueryAnchorBlock(hwnd), &rcl, &ptl))
+          BubbleHelp(hwnd, FALSE, TRUE, FALSE, (char *)mp1);
       }
     }
@@ -1858 +1908 @@
     *szDrv = 0;
     WinQueryWindowText(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-                                       id + 50), sizeof(szDrv), szDrv);
+                                       id + 50), sizeof(szDrv), szDrv);
     if (isalpha(*szDrv)) {
       hwndMenu = WinLoadMenu(HWND_DESKTOP, FM3ModHandle, MAIN_DRIVES);
       if (hwndMenu) {
-        BOOL rdy;
-        CHAR chDrv = *szDrv;
-        UINT iDrv;
-
-        strcpy(szDrv + 2, "\\");
-        MakeValidDir(szDrv);
-        // Disable menus if MakeValidDir changes drive letter fixme this section doesn't do anything see treecnt.c
-        rdy = toupper(*szDrv) == toupper(chDrv);
-        iDrv = toupper(*szDrv) - 'A';
-        if (!rdy || ~driveflags[iDrv] & DRIVE_REMOTE)
-          WinEnableMenuItem(hwndMenu, IDM_DETACH, FALSE);
-
-        if (!rdy || driveflags[iDrv] & DRIVE_NOTWRITEABLE) {
-          WinEnableMenuItem(hwndMenu, IDM_MKDIR, FALSE);
-          WinEnableMenuItem(hwndMenu, IDM_FORMAT, FALSE);
-          WinEnableMenuItem(hwndMenu, IDM_OPTIMIZE, FALSE);
-          WinEnableMenuItem(hwndMenu, IDM_UNDELETE, FALSE);
-        }
-        if (!rdy || ~driveflags[iDrv] & DRIVE_REMOVABLE) {
-          WinEnableMenuItem(hwndMenu, IDM_EJECT, FALSE);
-          WinEnableMenuItem(hwndMenu, IDM_LOCK, FALSE);
-          WinEnableMenuItem(hwndMenu, IDM_UNLOCK, FALSE);
-        }
-        if (!rdy) {
-          WinEnableMenuItem(hwndMenu, IDM_INFO, FALSE);
-          WinEnableMenuItem(hwndMenu, IDM_ARCHIVE, FALSE);
-          WinEnableMenuItem(hwndMenu, IDM_SIZES, FALSE);
-          WinEnableMenuItem(hwndMenu, IDM_SHOWALLFILES, FALSE);
-          WinEnableMenuItem(hwndMenu, IDM_CHKDSK, FALSE);
-        }
-        /* fixme to be gone?
-          if (!rdy || ~driveflags[iDrv] & DRIVE_CDROM) {
-            WinEnableMenuItem(hwndMenu, IDM_CLOSETRAY, FALSE);
-          }
-        */
-        PopupMenu(hwnd, hwnd, hwndMenu);
+        BOOL rdy;
+        CHAR chDrv = *szDrv;
+        UINT iDrv;
+
+        strcpy(szDrv + 2, "\\");
+        MakeValidDir(szDrv);
+        // Disable menus if MakeValidDir changes drive letter fixme this section doesn't do anything see treecnt.c
+        rdy = toupper(*szDrv) == toupper(chDrv);
+        iDrv = toupper(*szDrv) - 'A';
+        if (!rdy || ~driveflags[iDrv] & DRIVE_REMOTE)
+          WinEnableMenuItem(hwndMenu, IDM_DETACH, FALSE);
+
+        if (!rdy || driveflags[iDrv] & DRIVE_NOTWRITEABLE) {
+          WinEnableMenuItem(hwndMenu, IDM_MKDIR, FALSE);
+          WinEnableMenuItem(hwndMenu, IDM_FORMAT, FALSE);
+          WinEnableMenuItem(hwndMenu, IDM_OPTIMIZE, FALSE);
+          WinEnableMenuItem(hwndMenu, IDM_UNDELETE, FALSE);
+        }
+        if (!rdy || ~driveflags[iDrv] & DRIVE_REMOVABLE) {
+          WinEnableMenuItem(hwndMenu, IDM_EJECT, FALSE);
+          WinEnableMenuItem(hwndMenu, IDM_LOCK, FALSE);
+          WinEnableMenuItem(hwndMenu, IDM_UNLOCK, FALSE);
+        }
+        if (!rdy) {
+          WinEnableMenuItem(hwndMenu, IDM_INFO, FALSE);
+          WinEnableMenuItem(hwndMenu, IDM_ARCHIVE, FALSE);
+          WinEnableMenuItem(hwndMenu, IDM_SIZES, FALSE);
+          WinEnableMenuItem(hwndMenu, IDM_SHOWALLFILES, FALSE);
+          WinEnableMenuItem(hwndMenu, IDM_CHKDSK, FALSE);
+        }
+        /* fixme to be gone?
+          if (!rdy || ~driveflags[iDrv] & DRIVE_CDROM) {
+            WinEnableMenuItem(hwndMenu, IDM_CLOSETRAY, FALSE);
+          }
+        */
+        PopupMenu(hwnd, hwnd, hwndMenu);
       }
     }
@@ -1912 +1962 @@
     *szDrv = 0;
     WinQueryWindowText(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-                                       id + 50), sizeof(szDrv), szDrv);
+                                       id + 50), sizeof(szDrv), szDrv);
     if (isalpha(*szDrv)) {
       strcat(szDrv, "\\");
       if (!FindDirCnrByName(szDrv, TRUE))
-        OpenDirCnr((HWND) 0, hwndMain, hwndTree, FALSE, szDrv);
+        OpenDirCnr((HWND) 0, hwndMain, hwndTree, FALSE, szDrv);
     }
     break;
@@ -1928 +1978 @@
     *szDrv = 0;
     WinQueryWindowText(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-                                       id + 50), sizeof(szDrv), szDrv);
+                                       id + 50), sizeof(szDrv), szDrv);
     if (isalpha(*szDrv)) {
       strcat(szDrv, "\\");
@@ -1939 +1989 @@
     *szDrv = 0;
     WinQueryWindowText(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-                                       id + 50), sizeof(szDrv), szDrv);
+                                       id + 50), sizeof(szDrv), szDrv);
     if (isalpha(*szDrv) &&
-        !(driveflags[toupper(*szDrv) - 'A'] & DRIVE_NOTWRITEABLE)) {
+        !(driveflags[toupper(*szDrv) - 'A'] & DRIVE_NOTWRITEABLE)) {
       if (!emphasized) {
-        emphasized = TRUE;
-        DrawTargetEmphasis(hwnd, emphasized);
+        emphasized = TRUE;
+        DrawTargetEmphasis(hwnd, emphasized);
       }
       if (AcceptOneDrop(hwnd, mp1, mp2))
-        return MRFROM2SHORT(DOR_DROP, DO_MOVE);
+        return MRFROM2SHORT(DOR_DROP, DO_MOVE);
       return MRFROM2SHORT(DOR_NEVERDROP, 0);
     }
@@ -1956 +2006 @@
     *szDrv = 0;
     WinQueryWindowText(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-                                       id + 50), sizeof(szDrv), szDrv);
+                                       id + 50), sizeof(szDrv), szDrv);
     if (isalpha(*szDrv) &&
-        !(driveflags[toupper(*szDrv) - 'A'] & DRIVE_NOTWRITEABLE)) {
+        !(driveflags[toupper(*szDrv) - 'A'] & DRIVE_NOTWRITEABLE)) {
       if (emphasized) {
-        emphasized = FALSE;
-        DrawTargetEmphasis(hwnd, emphasized);
+        emphasized = FALSE;
+        DrawTargetEmphasis(hwnd, emphasized);
       }
     }
@@ -1970 +2020 @@
     *szDrv = 0;
     WinQueryWindowText(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-                                       id + 50), sizeof(szDrv), szDrv);
+                                       id + 50), sizeof(szDrv), szDrv);
     if (isalpha(*szDrv) &&
-        !(driveflags[toupper(*szDrv) - 'A'] & DRIVE_NOTWRITEABLE)) {
+        !(driveflags[toupper(*szDrv) - 'A'] & DRIVE_NOTWRITEABLE)) {
       DropHelp(mp1, mp2, hwnd, GetPString(IDS_DRIVEDROPHELP));
       return 0;
@@ -1982 +2032 @@
     *szDrv = 0;
     WinQueryWindowText(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-                                       id + 50), sizeof(szDrv), szDrv);
+                                       id + 50), sizeof(szDrv), szDrv);
     if (isalpha(*szDrv) &&
-        !(driveflags[toupper(*szDrv) - 'A'] & DRIVE_NOTWRITEABLE)) {
+        !(driveflags[toupper(*szDrv) - 'A'] & DRIVE_NOTWRITEABLE)) {
 
       CNRDRAGINFO cnd;
@@ -1991 +2041 @@
 
       if (emphasized) {
-        emphasized = FALSE;
-        DrawTargetEmphasis(hwnd, emphasized);
+        emphasized = FALSE;
+        DrawTargetEmphasis(hwnd, emphasized);
       }
       memset(&cnd, 0, sizeof(cnd));
@@ -1998 +2048 @@
       cnd.pRecord = NULL;
       li = DoFileDrop(hwnd,
-                      NULL,
-                      TRUE, MPFROM2SHORT(TREE_CNR, CN_DROP), MPFROMP(&cnd));
+                      NULL,
+                      TRUE, MPFROM2SHORT(TREE_CNR, CN_DROP), MPFROMP(&cnd));
       CheckPmDrgLimit(cnd.pDragInfo);
       if (li) {
-        strcpy(li->targetpath, szDrv);
-        strcat(li->targetpath, "\\");
-        if (li->list && li->list[0] && IsRoot(li->list[0]))
-          li->type = DO_LINK;
-        else if (fDragndropDlg && (!*li->arcname || !li->info)) {
-
-          CHECKLIST cl;
-
-          memset(&cl, 0, sizeof(cl));
-          cl.size = sizeof(cl);
-          cl.flags = li->type;
-          cl.list = li->list;
-          cl.cmd = li->type;
-          cl.prompt = li->targetpath;
-          li->type = WinDlgBox(HWND_DESKTOP,
-                               hwndMain,
-                               DropListProc,
-                               FM3ModHandle, DND_FRAME, MPFROMP(&cl));
-          if (li->type == DID_ERROR)
-                  Win_Error(DND_FRAME, HWND_DESKTOP, pszSrcFile, __LINE__,
-                            "Drag & Drop Dialog");
-          if (!li->type) {
-            FreeListInfo(li);
-            return 0;
-          }
-          li->list = cl.list;
-          if (!li->list || !li->list[0]) {
-            FreeListInfo(li);
-            return 0;
-          }
-        }
-        else {
-          if (!WinDlgBox(HWND_DESKTOP,
-                         hwndMain,
-                         WalkDlgProc,
-                         FM3ModHandle,
-                         WALK_FRAME,
-                         MPFROMP(li->targetpath)) || !*li->targetpath) {
-            FreeListInfo(li);
-            return 0;
-          }
-        }
-        switch (li->type) {
-        case DND_LAUNCH:
-          strcat(li->targetpath, " %a");
-          ExecOnList(hwndMain,
-                     li->targetpath, PROMPT | WINDOWED, NULL, li->list, NULL,
-                     pszSrcFile, __LINE__);
-          FreeList(li->list);
-          li->list = NULL;
-          break;
-        case DO_LINK:
-          if (fLinkSetsIcon) {
-            li->type = IDM_SETICON;
-            action = UM_MASSACTION;
-          }
-          else
-            li->type = IDM_COMPARE;
-          break;
-        case DND_EXTRACT:
-          if (*li->targetpath && !IsFile(li->targetpath))
-            li->type = IDM_EXTRACT;
-          break;
-        case DND_MOVE:
-          li->type = IDM_MOVE;
-          if (*li->targetpath && IsFile(li->targetpath) == 1) {
-            action = UM_MASSACTION;
-            li->type = IDM_ARCHIVEM;
-          }
-          break;
-        case DND_WILDMOVE:
-          li->type = IDM_WILDMOVE;
-          if (*li->targetpath && IsFile(li->targetpath) == 1) {
-            action = UM_MASSACTION;
-            li->type = IDM_ARCHIVEM;
-          }
-          break;
-        case DND_OBJECT:
-          li->type = IDM_OBJECT;
-          action = UM_MASSACTION;
-          break;
-        case DND_SHADOW:
-          li->type = IDM_SHADOW;
-          action = UM_MASSACTION;
-          break;
-        case DND_COMPARE:
-          li->type = IDM_COMPARE;
-          break;
-        case DND_SETICON:
-          action = UM_MASSACTION;
-          li->type = IDM_SETICON;
-          break;
-        case DND_COPY:
-          li->type = IDM_COPY;
-          if (*li->targetpath && IsFile(li->targetpath) == 1) {
-            action = UM_MASSACTION;
-            li->type = IDM_ARCHIVE;
-          }
-          break;
-        case DND_WILDCOPY:
-          li->type = IDM_WILDCOPY;
-          if (*li->targetpath && IsFile(li->targetpath) == 1) {
-            action = UM_MASSACTION;
-            li->type = IDM_ARCHIVE;
-          }
-          break;
-        default:
-          if (*li->arcname && li->info) {
-            action = UM_MASSACTION;
-            li->type = (li->type == DO_MOVE) ? IDM_FAKEEXTRACTM :
-              IDM_FAKEEXTRACT;
-          }
-          else if (*li->targetpath && IsFile(li->targetpath) == 1) {
-            action = UM_MASSACTION;
-            li->type = (li->type == DO_MOVE) ? IDM_ARCHIVEM : IDM_ARCHIVE;
-          }
-          else
-            li->type = (li->type == DO_MOVE) ? IDM_MOVE : IDM_COPY;
-          break;
-        }
-        if (!li->list || !li->list[0])
-          FreeListInfo(li);
-        else
-          WinSendMsg(hwndTree, UM_ACTION, MPFROMP(li), MPFROMLONG(action));
+        strcpy(li->targetpath, szDrv);
+        strcat(li->targetpath, "\\");
+        if (li->list && li->list[0] && IsRoot(li->list[0]))
+          li->type = DO_LINK;
+        else if (fDragndropDlg && (!*li->arcname || !li->info)) {
+
+          CHECKLIST cl;
+
+          memset(&cl, 0, sizeof(cl));
+          cl.size = sizeof(cl);
+          cl.flags = li->type;
+          cl.list = li->list;
+          cl.cmd = li->type;
+          cl.prompt = li->targetpath;
+          li->type = WinDlgBox(HWND_DESKTOP,
+                               hwndMain,
+                               DropListProc,
+                               FM3ModHandle, DND_FRAME, MPFROMP(&cl));
+          if (li->type == DID_ERROR)
+                  Win_Error(DND_FRAME, HWND_DESKTOP, pszSrcFile, __LINE__,
+                            "Drag & Drop Dialog");
+          if (!li->type) {
+            FreeListInfo(li);
+            return 0;
+          }
+          li->list = cl.list;
+          if (!li->list || !li->list[0]) {
+            FreeListInfo(li);
+            return 0;
+          }
+        }
+        else {
+          if (!WinDlgBox(HWND_DESKTOP,
+                         hwndMain,
+                         WalkDlgProc,
+                         FM3ModHandle,
+                         WALK_FRAME,
+                         MPFROMP(li->targetpath)) || !*li->targetpath) {
+            FreeListInfo(li);
+            return 0;
+          }
+        }
+        switch (li->type) {
+        case DND_LAUNCH:
+          strcat(li->targetpath, " %a");
+          ExecOnList(hwndMain,
+                     li->targetpath, PROMPT | WINDOWED, NULL, li->list, NULL,
+                     pszSrcFile, __LINE__);
+          FreeList(li->list);
+          li->list = NULL;
+          break;
+        case DO_LINK:
+          if (fLinkSetsIcon) {
+            li->type = IDM_SETICON;
+            action = UM_MASSACTION;
+          }
+          else
+            li->type = IDM_COMPARE;
+          break;
+        case DND_EXTRACT:
+          if (*li->targetpath && !IsFile(li->targetpath))
+            li->type = IDM_EXTRACT;
+          break;
+        case DND_MOVE:
+          li->type = IDM_MOVE;
+          if (*li->targetpath && IsFile(li->targetpath) == 1) {
+            action = UM_MASSACTION;
+            li->type = IDM_ARCHIVEM;
+          }
+          break;
+        case DND_WILDMOVE:
+          li->type = IDM_WILDMOVE;
+          if (*li->targetpath && IsFile(li->targetpath) == 1) {
+            action = UM_MASSACTION;
+            li->type = IDM_ARCHIVEM;
+          }
+          break;
+        case DND_OBJECT:
+          li->type = IDM_OBJECT;
+          action = UM_MASSACTION;
+          break;
+        case DND_SHADOW:
+          li->type = IDM_SHADOW;
+          action = UM_MASSACTION;
+          break;
+        case DND_COMPARE:
+          li->type = IDM_COMPARE;
+          break;
+        case DND_SETICON:
+          action = UM_MASSACTION;
+          li->type = IDM_SETICON;
+          break;
+        case DND_COPY:
+          li->type = IDM_COPY;
+          if (*li->targetpath && IsFile(li->targetpath) == 1) {
+            action = UM_MASSACTION;
+            li->type = IDM_ARCHIVE;
+          }
+          break;
+        case DND_WILDCOPY:
+          li->type = IDM_WILDCOPY;
+          if (*li->targetpath && IsFile(li->targetpath) == 1) {
+            action = UM_MASSACTION;
+            li->type = IDM_ARCHIVE;
+          }
+          break;
+        default:
+          if (*li->arcname && li->info) {
+            action = UM_MASSACTION;
+            li->type = (li->type == DO_MOVE) ? IDM_FAKEEXTRACTM :
+              IDM_FAKEEXTRACT;
+          }
+          else if (*li->targetpath && IsFile(li->targetpath) == 1) {
+            action = UM_MASSACTION;
+            li->type = (li->type == DO_MOVE) ? IDM_ARCHIVEM : IDM_ARCHIVE;
+          }
+          else
+            li->type = (li->type == DO_MOVE) ? IDM_MOVE : IDM_COPY;
+          break;
+        }
+        if (!li->list || !li->list[0])
+          FreeListInfo(li);
+        else
+          WinSendMsg(hwndTree, UM_ACTION, MPFROMP(li), MPFROMLONG(action));
       }
       return 0;
@@ -2159 +2209 @@
     for (x = 0; x < 26; x++) {
       if ((ulDriveMap & (1L << x)) && !(driveflags[x] & DRIVE_IGNORE)) {
-        if (x > 1) {
-          if (driveflags[x] & DRIVE_CDROM)
-            iconid = CDROM_ICON;
-          else
-            iconid = (driveflags[x] & DRIVE_REMOVABLE) ?
-              REMOVABLE_ICON :
-                     (driveflags[x] & DRIVE_VIRTUAL) ?
-                      VIRTUAL_ICON :
-              (driveflags[x] & DRIVE_REMOTE) ?
-              REMOTE_ICON :
-                     (driveflags[x] & DRIVE_RAMDISK) ?
-                      RAMDISK_ICON :
-                     (driveflags[x] & DRIVE_ZIPSTREAM) ?
-                      ZIPSTREAM_ICON :DRIVE_ICON;
-        }
-        else
-          iconid = FLOPPY_ICON;
-        sprintf(s, "#%lu", iconid);
-        hwndB = WinCreateWindow(hwndT,
-                                WC_DRIVEBUTTONS,
-                                s,
-                                BS_NOPOINTERFOCUS | BS_BITMAP | BS_PUSHBUTTON,
-                                0,
-                                0,
-                                28,
-                                18,
-                                hwndT, HWND_TOP, y + IDM_DRIVEA, NULL, NULL);
-        if (!hwndB)
-          Win_Error2(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
-                     IDS_WINCREATEWINDOW);
-        else {
-          WinSetWindowPos(hwndB, HWND_BOTTOM, 0, 0, 0, 0, SWP_ZORDER);
-          sprintf(s, "%c:", (CHAR) x + 'A');
-          hwndB = WinCreateWindow(hwndT,
-                                  WC_STATIC,
-                                  s,
-                                  SS_TEXT | DT_LEFT | DT_VCENTER,
-                                  0,
-                                  0,
-                                  10,
-                                  18,
-                                  hwndT,
-                                  HWND_TOP, y + IDM_DRIVEATEXT, NULL, NULL);
-          if (!hwndB)
-            Win_Error2(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
-                       IDS_WINCREATEWINDOW);
-          else {
-            SetPresParams(hwndB,
-                          &RGBGREY,
-                          &RGBBLACK, &RGBGREY, GetPString(IDS_6HELVTEXT));
-            WinSetWindowPos(hwndB, HWND_BOTTOM, 0, 0, 0, 0, SWP_ZORDER);
-          }
-          y++;
-        }
+        if (x > 1) {
+          if (driveflags[x] & DRIVE_CDROM)
+            iconid = CDROM_ICON;
+          else
+            iconid = (driveflags[x] & DRIVE_REMOVABLE) ?
+              REMOVABLE_ICON :
+                     (driveflags[x] & DRIVE_VIRTUAL) ?
+                      VIRTUAL_ICON :
+              (driveflags[x] & DRIVE_REMOTE) ?
+              REMOTE_ICON :
+                     (driveflags[x] & DRIVE_RAMDISK) ?
+                      RAMDISK_ICON :
+                     (driveflags[x] & DRIVE_ZIPSTREAM) ?
+                      ZIPSTREAM_ICON :DRIVE_ICON;
+        }
+        else
+          iconid = FLOPPY_ICON;
+        sprintf(s, "#%lu", iconid);
+        hwndB = WinCreateWindow(hwndT,
+                                WC_DRIVEBUTTONS,
+                                s,
+                                BS_NOPOINTERFOCUS | BS_BITMAP | BS_PUSHBUTTON,
+                                0,
+                                0,
+                                28,
+                                18,
+                                hwndT, HWND_TOP, y + IDM_DRIVEA, NULL, NULL);
+        if (!hwndB)
+          Win_Error2(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
+                     IDS_WINCREATEWINDOW);
+        else {
+          WinSetWindowPos(hwndB, HWND_BOTTOM, 0, 0, 0, 0, SWP_ZORDER);
+          sprintf(s, "%c:", (CHAR) x + 'A');
+          hwndB = WinCreateWindow(hwndT,
+                                  WC_STATIC,
+                                  s,
+                                  SS_TEXT | DT_LEFT | DT_VCENTER,
+                                  0,
+                                  0,
+                                  10,
+                                  18,
+                                  hwndT,
+                                  HWND_TOP, y + IDM_DRIVEATEXT, NULL, NULL);
+          if (!hwndB)
+            Win_Error2(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
+                       IDS_WINCREATEWINDOW);
+          else {
+            SetPresParams(hwndB,
+                          &RGBGREY,
+                          &RGBBLACK, &RGBGREY, GetPString(IDS_6HELVTEXT));
+            WinSetWindowPos(hwndB, HWND_BOTTOM, 0, 0, 0, 0, SWP_ZORDER);
+          }
+          y++;
+        }
       }
     }                                   // for
   }                                     // if drivebar
   PostMsg(WinQueryWindow(hwndT, QW_PARENT),
-          WM_UPDATEFRAME, MPFROMLONG(FCF_SIZEBORDER), MPVOID);
+          WM_UPDATEFRAME, MPFROMLONG(FCF_SIZEBORDER), MPVOID);
 }
 
@@ -2233 +2283 @@
     WinQueryWindowRect(hwndT, &rcl);
     xwidth = rcl.xRight - ((WinQuerySysValue(HWND_DESKTOP,
-                                             SV_CYSIZEBORDER) * 2) + 2);
+                                             SV_CYSIZEBORDER) * 2) + 2);
   }
   henum = WinBeginEnumWindows(hwndT);
@@ -2242 +2292 @@
       ctrlxsize = 28;
     WinSetWindowPos(hwndB,
-                    HWND_TOP,
-                    ctrlxpos, ctrlypos, ctrlxsize, 18, SWP_MOVE | SWP_SHOW);
+                    HWND_TOP,
+                    ctrlxpos, ctrlypos, ctrlxsize, 18, SWP_MOVE | SWP_SHOW);
     ctrlxpos += (ctrlxsize + 2);
     if (ctrlxsize == 10) {
       if (ctrlxpos + (42 + ((fShowTarget && DriveLines == 0) ?
-                            256 : 0)) > xwidth) {
-        ctrlxpos = 2;
-        ctrlypos += 18;
-        DriveLines++;
+                            256 : 0)) > xwidth) {
+        ctrlxpos = 2;
+        ctrlypos += 18;
+        DriveLines++;
       }
     }
@@ -2269 +2319 @@
 
       SetPresParams(hwnd,
-                    &RGBGREY,
-                    &RGBBLACK, &RGBGREY, GetPString(IDS_8HELVBOLDTEXT));
+                    &RGBGREY,
+                    &RGBBLACK, &RGBGREY, GetPString(IDS_8HELVBOLDTEXT));
       return mr;
     }
@@ -2280 +2330 @@
 
       cbRetLen = WinQueryPresParam(hwnd,
-                                   (ULONG) mp1,
-                                   0,
-                                   &AttrFound,
-                                   (ULONG) sizeof(AttrValue), &AttrValue, 0);
+                                   (ULONG) mp1,
+                                   0,
+                                   &AttrFound,
+                                   (ULONG) sizeof(AttrValue), &AttrValue, 0);
       if (cbRetLen) {
-        PostMsg(WinQueryWindow(hwnd, QW_PARENT),
-                WM_UPDATEFRAME, MPFROMLONG(FCF_SIZEBORDER), MPVOID);
+        PostMsg(WinQueryWindow(hwnd, QW_PARENT),
+                WM_UPDATEFRAME, MPFROMLONG(FCF_SIZEBORDER), MPVOID);
       }
     }
@@ -2303 +2353 @@
       WinQueryWindowPos(hwndTree, &swp);
       if (!(swp.fl & SWP_MAXIMIZE))
-        fl |= SWP_RESTORE;
+        fl |= SWP_RESTORE;
       WinSetWindowPos(hwndTree, HWND_TOP, 0, 0, 0, 0, fl);
     }
@@ -2336 +2386 @@
 
       if (fOtherHelp) {
-        if ((!hwndBubble || WinQueryWindowULong(hwndBubble, QWL_USER) != hwnd)
-            && !WinQueryCapture(HWND_DESKTOP)) {
-          switch (id) {
-          case IDM_ATTRS:
-            if (WinQueryWindowTextLength(hwnd))
-              s = GetPString(IDS_ATTRSBUTTONHELP);
-            break;
-          case IDM_INFO:
-            if (WinQueryWindowTextLength(hwnd))
-              s = GetPString(IDS_INFOBUTTONHELP);
-            break;
-          case IDM_RENAME:
-            if (WinQueryWindowTextLength(hwnd))
-              s = GetPString(IDS_NAMEBUTTONHELP);
-            break;
-          case MAIN_STATUS2:
-            if (!hwndE)
-              s = GetPString(IDS_STATUS2HELP);
-            break;
-          default:
-            break;
-          }
-          if (s)
-            MakeBubble(hwnd, FALSE, s);
-          else if (hwndBubble)
-            WinDestroyWindow(hwndBubble);
-        }
+        if ((!hwndBubble || WinQueryWindowULong(hwndBubble, QWL_USER) != hwnd)
+            && !WinQueryCapture(HWND_DESKTOP)) {
+          switch (id) {
+          case IDM_ATTRS:
+            if (WinQueryWindowTextLength(hwnd))
+              s = GetPString(IDS_ATTRSBUTTONHELP);
+            break;
+          case IDM_INFO:
+            if (WinQueryWindowTextLength(hwnd))
+              s = GetPString(IDS_INFOBUTTONHELP);
+            break;
+          case IDM_RENAME:
+            if (WinQueryWindowTextLength(hwnd))
+              s = GetPString(IDS_NAMEBUTTONHELP);
+            break;
+          case MAIN_STATUS2:
+            if (!hwndE)
+              s = GetPString(IDS_STATUS2HELP);
+            break;
+          default:
+            break;
+          }
+          if (s)
+            MakeBubble(hwnd, FALSE, s);
+          else if (hwndBubble)
+            WinDestroyWindow(hwndBubble);
+        }
       }
       switch (id) {
@@ -2369 +2419 @@
       case IDM_RENAME:
       case MAIN_STATUS2:
-        return CommonTextProc(hwnd, msg, mp1, mp2);
+        return CommonTextProc(hwnd, msg, mp1, mp2);
       default:
-        break;
+        break;
       }
     }
@@ -2394 +2444 @@
       case IDM_RENAME:
       case MAIN_STATUS2:
-        return CommonTextButton(hwnd, msg, mp1, mp2);
+        return CommonTextButton(hwnd, msg, mp1, mp2);
       default:
-        PostMsg(hwnd, UM_FOCUSME, MPVOID, MPVOID);
-        break;
+        PostMsg(hwnd, UM_FOCUSME, MPVOID, MPVOID);
+        break;
       }
     }
@@ -2409 +2459 @@
       id = WinQueryWindowUShort(hwnd, QWS_ID);
       if (id == MAIN_STATUS2 && hwndE)
-        WinSendMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
+        WinSendMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
       else
-        return CommonTextButton(hwnd, msg, mp1, mp2);
+        return CommonTextButton(hwnd, msg, mp1, mp2);
     }
     break;
@@ -2421 +2471 @@
       id = WinQueryWindowUShort(hwnd, QWS_ID);
       if (id == MAIN_STATUS) {
-        if (SHORT2FROMMP(mp2) & KC_CTRL)
-          PostMsg(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-                                  FID_CLIENT),
-                  WM_COMMAND, MPFROM2SHORT(IDM_WINDOWDLG, 0), MPVOID);
-        else if (hwndTree)
-          PostMsg(hwndTree, UM_TIMER, MPVOID, MPVOID);
+        if (SHORT2FROMMP(mp2) & KC_CTRL)
+          PostMsg(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
+                                  FID_CLIENT),
+                  WM_COMMAND, MPFROM2SHORT(IDM_WINDOWDLG, 0), MPVOID);
+        else if (hwndTree)
+          PostMsg(hwndTree, UM_TIMER, MPVOID, MPVOID);
       }
     }
@@ -2439 +2489 @@
       if (id == MAIN_STATUS2 && !hwndE) {
 
-        SWP swp;
-        CHAR directory[CCHMAXPATH];
-        PFNWP oldproce;
-
-        *directory = 0;
-        TopWindowName(hwndMain, (HWND) 0, directory);
-        WinQueryWindowPos(hwnd, &swp);
-        hwndB = WinCreateWindow(hwnd,
-                                WC_BUTTON,
-                                "+",
-                                WS_VISIBLE | BS_PUSHBUTTON |
-                                BS_NOPOINTERFOCUS,
-                                swp.cx - swp.cy,
-                                0,
-                                swp.cy,
-                                swp.cy,
-                                hwnd, HWND_TOP, COMMAND_BUTTON, NULL, NULL);
-        if (!hwndB)
-          Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
-        hwndE = WinCreateWindow(hwnd,
-                                WC_ENTRYFIELD,
-                                NULL,
-                                WS_VISIBLE | ES_AUTOSCROLL,
-                                0,
-                                0,
-                                swp.cx - swp.cy,
-                                swp.cy,
-                                hwnd, HWND_TOP, COMMAND_LINE, NULL, NULL);
-        if (!hwndE)
-          Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
-        if (!hwndE || !hwndB) {
-          PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
-          return 0;
-        }
-        WinSendMsg(hwndE, EM_SETTEXTLIMIT, MPFROM2SHORT(1024, 0), MPVOID);
-        WinSetWindowText(hwndStatus, directory);
-        if (*lastcmd)
-          WinSetWindowText(hwndE, lastcmd);
-        else
-          WinSetWindowText(hwndE, GetPString(IDS_HELPCMDTEXT));
-        oldproce = WinSubclassWindow(hwndE, (PFNWP) CommandLineProc);
-        if (oldproce)
-          WinSetWindowPtr(hwndE, QWL_USER, (PVOID) oldproce);
-        PostMsg(hwndE, UM_FOCUSME, MPVOID, MPVOID);
-        PostMsg(hwndE, EM_SETSEL, MPFROM2SHORT(0, 1024), MPVOID);
-        return 0;
+        SWP swp;
+        CHAR directory[CCHMAXPATH];
+        PFNWP oldproce;
+
+        *directory = 0;
+        TopWindowName(hwndMain, (HWND) 0, directory);
+        WinQueryWindowPos(hwnd, &swp);
+        hwndB = WinCreateWindow(hwnd,
+                                WC_BUTTON,
+                                "+",
+                                WS_VISIBLE | BS_PUSHBUTTON |
+                                BS_NOPOINTERFOCUS,
+                                swp.cx - swp.cy,
+                                0,
+                                swp.cy,
+                                swp.cy,
+                                hwnd, HWND_TOP, COMMAND_BUTTON, NULL, NULL);
+        if (!hwndB)
+          Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+        hwndE = WinCreateWindow(hwnd,
+                                WC_ENTRYFIELD,
+                                NULL,
+                                WS_VISIBLE | ES_AUTOSCROLL,
+                                0,
+                                0,
+                                swp.cx - swp.cy,
+                                swp.cy,
+                                hwnd, HWND_TOP, COMMAND_LINE, NULL, NULL);
+        if (!hwndE)
+          Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+        if (!hwndE || !hwndB) {
+          PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
+          return 0;
+        }
+        WinSendMsg(hwndE, EM_SETTEXTLIMIT, MPFROM2SHORT(1024, 0), MPVOID);
+        WinSetWindowText(hwndStatus, directory);
+        if (*lastcmd)
+          WinSetWindowText(hwndE, lastcmd);
+        else
+          WinSetWindowText(hwndE, GetPString(IDS_HELPCMDTEXT));
+        oldproce = WinSubclassWindow(hwndE, (PFNWP) CommandLineProc);
+        if (oldproce)
+          WinSetWindowPtr(hwndE, QWL_USER, (PVOID) oldproce);
+        PostMsg(hwndE, UM_FOCUSME, MPVOID, MPVOID);
+        PostMsg(hwndE, EM_SETSEL, MPFROM2SHORT(0, 1024), MPVOID);
+        return 0;
       }
       if (msg == UM_CLICKED3 || (SHORT2FROMMP(mp2) & KC_CTRL)) {
-        switch (id) {
-        case IDM_ATTRS:
-          id = IDM_SORTSIZE;
-          break;
-        case IDM_INFO:
-          id = IDM_SORTLWDATE;
-          break;
-        case IDM_RENAME:
-          id = IDM_SORTFILENAME;
-          break;
-        }
+        switch (id) {
+        case IDM_ATTRS:
+          id = IDM_SORTSIZE;
+          break;
+        case IDM_INFO:
+          id = IDM_SORTLWDATE;
+          break;
+        case IDM_RENAME:
+          id = IDM_SORTFILENAME;
+          break;
+        }
       }
       PostMsg(WinQueryWindow(hwnd, QW_PARENT),
-              WM_COMMAND, MPFROM2SHORT(id, 0), MPVOID);
+              WM_COMMAND, MPFROM2SHORT(id, 0), MPVOID);
     }
     return 0;
@@ -2514 +2564 @@
       case IDM_RENAME:
       case MAIN_STATUS2:
-        PaintRecessedWindow(hwnd, (HPS) 0, TRUE, FALSE);
-        break;
+        PaintRecessedWindow(hwnd, (HPS) 0, TRUE, FALSE);
+        break;
       default:
-        PaintRecessedWindow(hwnd, (HPS) 0, FALSE, TRUE);
-        break;
+        PaintRecessedWindow(hwnd, (HPS) 0, FALSE, TRUE);
+        break;
       }
       if (id == IDM_RENAME) {
 
-        HPS hps;
-
-        hps = WinBeginPaint(hwnd, (HPS) 0, NULL);
-        if (hps) {
-          PaintSTextWindow(hwnd, hps);
-          WinEndPaint(hps);
-        }
-        return 0;
+        HPS hps;
+
+        hps = WinBeginPaint(hwnd, (HPS) 0, NULL);
+        if (hps) {
+          PaintSTextWindow(hwnd, hps);
+          WinEndPaint(hps);
+        }
+        return 0;
       }
     }
@@ -2562 +2612 @@
   case UM_COMMAND:
     return WinSendMsg(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-                                      FID_CLIENT), msg, mp1, mp2);
+                                      FID_CLIENT), msg, mp1, mp2);
 
   case WM_PAINT:
@@ -2575 +2625 @@
       hps = WinBeginPaint(hwnd, (HPS)0, NULL);
       if (hps) {
-        GpiCreateLogColorTable(hps, 0, LCOLF_RGB, 0, 0, NULL);
-        WinQueryPresParam(hwnd, PP_BACKGROUNDCOLOR, 0, NULL,
+        GpiCreateLogColorTable(hps, 0, LCOLF_RGB, 0, 0, NULL);
+        WinQueryPresParam(hwnd, PP_BACKGROUNDCOLOR, 0, NULL,
                           sizeof(lColor), &lColor, 0);
         if (!lColor)
           lColor = CLR_PALEGRAY;
-        WinQueryWindowRect(hwnd, &rcl);
-        WinFillRect(hps, &rcl, lColor);
-        WinEndPaint(hps);
+        WinQueryWindowRect(hwnd, &rcl);
+        WinFillRect(hps, &rcl, lColor);
+        WinEndPaint(hps);
       }
 
@@ -2601 +2651 @@
       tool = find_tool(id);
       if (tool) {
-        del_tool(tool);
-        WinShowWindow(WinWindowFromID(hwnd, id), FALSE);
-        if (fToolTitles)
-          WinShowWindow(WinWindowFromID(hwnd, id + 25000), FALSE);
+        del_tool(tool);
+        WinShowWindow(WinWindowFromID(hwnd, id), FALSE);
+        if (fToolTitles)
+          WinShowWindow(WinWindowFromID(hwnd, id + 25000), FALSE);
         ResizeTools(hwnd);
         save_tools(NULL);
@@ -2620 +2670 @@
 
       id = (USHORT) WinDlgBox(HWND_DESKTOP,
-                              hwnd,
-                              AddToolProc,
-                              FM3ModHandle, ADDBTN_FRAME, MPVOID);
+                              hwnd,
+                              AddToolProc,
+                              FM3ModHandle, ADDBTN_FRAME, MPVOID);
       if (id && id != (USHORT) - 1)
-        WinSendMsg(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-                                   FID_CLIENT),
-                   WM_COMMAND,
-                   MPFROM2SHORT(IDM_CREATETOOL, 0), MPFROM2SHORT(id, 0));
+        WinSendMsg(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
+                                   FID_CLIENT),
+                   WM_COMMAND,
+                   MPFROM2SHORT(IDM_CREATETOOL, 0), MPFROM2SHORT(id, 0));
     }
     break;
@@ -2633 +2683 @@
   case WM_CONTEXTMENU:
     if (WinDlgBox(HWND_DESKTOP,
-                  hwnd, ToolIODlgProc, FM3ModHandle, SVBTN_FRAME, MPVOID))
+                  hwnd, ToolIODlgProc, FM3ModHandle, SVBTN_FRAME, MPVOID))
       PostMsg(hwnd, UM_SETUP2, MPVOID, MPVOID);
     return MRFROMSHORT(TRUE);
@@ -2656 +2706 @@
   if (pswp) {
     if (WinQueryWindowPos(hwndTree, &swp) &&
-        !(swp.fl & (SWP_MINIMIZE | SWP_HIDE | SWP_MAXIMIZE))) {
+        !(swp.fl & (SWP_MINIMIZE | SWP_HIDE | SWP_MAXIMIZE))) {
       pswp->x = swp.cx;
       pswp->cx -= swp.cx;
@@ -2663 +2713 @@
   if (prectl) {
     if (WinQueryWindowPos(hwndTree, &swp) &&
-        !(swp.fl & (SWP_MINIMIZE | SWP_HIDE | SWP_MAXIMIZE)) &&
-        WinQueryWindowRect(hwndTree, &rectl)) {
+        !(swp.fl & (SWP_MINIMIZE | SWP_HIDE | SWP_MAXIMIZE)) &&
+        WinQueryWindowRect(hwndTree, &rectl)) {
       prectl->xLeft = rectl.xRight;
       prectl->xRight -= rectl.xRight;
@@ -2716 +2766 @@
     if (!(swp.fl & (SWP_MAXIMIZE | SWP_HIDE | SWP_MINIMIZE))) {
       if (swp.x < swpT.cx) {
-        swp.x = swpT.cx;
-        if (swp.x + swp.cx > swpC.cx)
-          swp.cx = swpC.cx - swp.x;
-        if (swp.cx > 24)
-          WinSetWindowPos(hwndChild, HWND_TOP, swp.x, swp.y, swp.cx, swp.cy,
-                          SWP_SIZE | SWP_MOVE | SWP_SHOW);
+        swp.x = swpT.cx;
+        if (swp.x + swp.cx > swpC.cx)
+          swp.cx = swpC.cx - swp.x;
+        if (swp.cx > 24)
+          WinSetWindowPos(hwndChild, HWND_TOP, swp.x, swp.y, swp.cx, swp.cy,
+                          SWP_SIZE | SWP_MOVE | SWP_SHOW);
       }
     }
@@ -2741 +2791 @@
       WinSetWindowUShort(hwndChild, QWS_YMINIMIZE, (USHORT) - 1);
       WinSetWindowPos(hwndChild, HWND_TOP, 0, 0, 0, 0,
-                      SWP_MOVE | SWP_SHOW | SWP_FOCUSDEACTIVATE);
+                      SWP_MOVE | SWP_SHOW | SWP_FOCUSDEACTIVATE);
     }
   }
@@ -2763 +2813 @@
     if (hwndNext) {
       if (!WinQueryWindowUShort(hwndNext, QWS_ID))
-        continue;
+        continue;
       if (next)
-        break;
+        break;
       if (hwndNext == hwndActive) {
-        if (!previous && hwndPrev) {
-          hwndNext = hwndPrev;
-          break;
-        }
-        else if (previous)
-          next = TRUE;
+        if (!previous && hwndPrev) {
+          hwndNext = hwndPrev;
+          break;
+        }
+        else if (previous)
+          next = TRUE;
       }
       hwndPrev = hwndNext;
@@ -2778 +2828 @@
     else {
       if ((!next && previous) || once)
-        break;
+        break;
       else if (!previous) {
-        hwndNext = hwndPrev;
-        break;
+        hwndNext = hwndPrev;
+        break;
       }
       else
-        once = next = TRUE;
+        once = next = TRUE;
     }
   }
@@ -2791 +2841 @@
   if (hwndNext && hwndNext != hwndActive) {
     WinSetWindowPos(hwndNext, HWND_TOP, 0, 0, 0, 0,
-                    SWP_ZORDER | SWP_ACTIVATE);
+                    SWP_ZORDER | SWP_ACTIVATE);
     WinSetWindowPos(hwndActive, ((previous) ? HWND_BOTTOM : hwndNext), 0, 0,
-                    0, 0, SWP_ZORDER);
+                    0, 0, SWP_ZORDER);
   }
 }
@@ -2808 +2858 @@
     if (hwndChild != hwndTree) {
       WinSendMsg(WinWindowFromID(hwndChild, FID_CLIENT),
-                 WM_SAVEAPPLICATION, MPVOID, MPVOID);
+                 WM_SAVEAPPLICATION, MPVOID, MPVOID);
       if (WinSendMsg(WinWindowFromID(hwndChild, FID_CLIENT),
-                     WM_CLOSE, MPVOID, MPVOID)) {
-        ret = TRUE;
-        break;
+                     WM_CLOSE, MPVOID, MPVOID)) {
+        ret = TRUE;
+        break;
       }
     }
@@ -2835 +2885 @@
       hwndTemp = WinWindowFromID(hwndChild, FID_CLIENT);
       if (hwndTemp) {
-        hwndDir = WinWindowFromID(hwndTemp, DIR_CNR);
-        if (hwndDir) {
-          WinSendMsg(WinWindowFromID(hwndChild, FID_CLIENT),
-                     WM_CLOSE, MPVOID, MPVOID);
-          ret = TRUE;
-        }
+        hwndDir = WinWindowFromID(hwndTemp, DIR_CNR);
+        if (hwndDir) {
+          WinSendMsg(WinWindowFromID(hwndChild, FID_CLIENT),
+                     WM_CLOSE, MPVOID, MPVOID);
+          ret = TRUE;
+        }
       }
     }
@@ -2898 +2948 @@
       hwndC = WinWindowFromID(hwndChild, FID_CLIENT);
       if (hwndC) {
-        hwndDir = WinWindowFromID(hwndC, DIR_CNR);
-        if (hwndDir) {
-          WinQueryWindowPos(hwndChild, &swp);
-          *szDir = 0;
-          WinSendMsg(hwndC, UM_CONTAINERDIR, MPFROMP(szDir), MPVOID);
-          if (*szDir) {
-           // If saving shutdown state skip no prescan drives
-            if (fIsShutDownState &&
-                driveflags[toupper(*szDir) - 'A'] & DRIVE_NOPRESCAN) {
-              continue;
-            }
-            sprintf(szKey, "%sDirCnrPos.%lu", szPrefix, numsaves);
-            PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & swp,
-                                sizeof(SWP));
-            dcd =
-              WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), QWL_USER);
-            if (dcd) {
-              sprintf(szKey, "%sDirCnrSort.%lu", szPrefix, numsaves);
-              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->sortFlags,
-                                  sizeof(INT));
-              sprintf(szKey, "%sDirCnrFilter.%lu", szPrefix, numsaves);
-              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->mask,
-                                  sizeof(MASK));
-              sprintf(szKey, "%sDirCnrView.%lu", szPrefix, numsaves);
-              flWindowAttr = dcd->flWindowAttr;
-              if (!fLeaveTree && (flWindowAttr & CV_TREE)) {
-                flWindowAttr &= (~(CV_TREE | CV_ICON | CV_DETAIL | CV_TEXT));
-                if (dcd->lastattr) {
-                  if (dcd->lastattr & CV_TEXT)
-                    flWindowAttr |= CV_TEXT;
-                  else if (dcd->lastattr & CV_DETAIL)
-                    flWindowAttr |= CV_DETAIL;
-                  else if (dcd->lastattr & CV_ICON)
-                    flWindowAttr |= CV_ICON;
-                  else
-                    flWindowAttr |= CV_NAME;
-                }
-                else
-                  flWindowAttr |= CV_NAME;
-              }
-              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & flWindowAttr,
-                                  sizeof(ULONG));
-              sprintf(szKey, "%sDirCnr.%lu.DetailsLongname", szPrefix, numsaves);
-              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->ds.detailslongname,
-                                  sizeof(BOOL));
-              sprintf(szKey, "%sDirCnr.%lu.DetailsSubject", szPrefix, numsaves);
-              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->ds.detailssubject,
-                                  sizeof(BOOL));
-              sprintf(szKey, "%sDirCnr.%lu.DetailsSize", szPrefix, numsaves);
-              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->ds.detailssize,
-                                  sizeof(BOOL));
-              sprintf(szKey, "%sDirCnr.%lu.DetailsEA", szPrefix, numsaves);
-              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->ds.detailsea,
-                                  sizeof(BOOL));
-              sprintf(szKey, "%sDirCnr.%lu.DetailsAttr", szPrefix, numsaves);
-              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->ds.detailsattr,
-                                  sizeof(BOOL));
-              sprintf(szKey, "%sDirCnr.%lu.DetailsIcon", szPrefix, numsaves);
-              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->ds.detailsicon,
-                                  sizeof(BOOL));
-              sprintf(szKey, "%sDirCnr.%lu.DetailsLWDate", szPrefix, numsaves);
-              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->ds.detailslwdate,
-                                  sizeof(BOOL));
-              sprintf(szKey, "%sDirCnr.%lu.DetailsLWTime", szPrefix, numsaves);
-              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->ds.detailslwtime,
-                                  sizeof(BOOL));
-              sprintf(szKey, "%sDirCnr.%lu.DetailsLADate", szPrefix, numsaves);
-              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->ds.detailsladate,
-                                  sizeof(BOOL));
-              sprintf(szKey, "%sDirCnr.%lu.DetailsLATime", szPrefix, numsaves);
-              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->ds.detailslatime,
-                                  sizeof(BOOL));
-              sprintf(szKey, "%sDirCnr.%lu.DetailsCRDate", szPrefix, numsaves);
-              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->ds.detailscrdate,
-                                  sizeof(BOOL));
-              sprintf(szKey, "%sDirCnr.%lu.DetailsCRTime", szPrefix, numsaves);
-              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->ds.detailscrtime,
-                                  sizeof(BOOL));
-              sprintf(szKey, "%sDirCnr.%lu", szPrefix, numsaves);
-              SavePresParams(hwndDir, szKey);
-            }
-            sprintf(szKey, "%sDirCnrDir.%lu", szPrefix, numsaves++);
-            PrfWriteProfileString(fmprof, FM3Str, szKey, szDir);
-          }
-        }
+        hwndDir = WinWindowFromID(hwndC, DIR_CNR);
+        if (hwndDir) {
+          WinQueryWindowPos(hwndChild, &swp);
+          *szDir = 0;
+          WinSendMsg(hwndC, UM_CONTAINERDIR, MPFROMP(szDir), MPVOID);
+          if (*szDir) {
+           // If saving shutdown state skip no prescan drives
+            if (fIsShutDownState &&
+                driveflags[toupper(*szDir) - 'A'] & DRIVE_NOPRESCAN) {
+              continue;
+            }
+            sprintf(szKey, "%sDirCnrPos.%lu", szPrefix, numsaves);
+            PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & swp,
+                                sizeof(SWP));
+            dcd =
+              WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), QWL_USER);
+            if (dcd) {
+              sprintf(szKey, "%sDirCnrSort.%lu", szPrefix, numsaves);
+              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->sortFlags,
+                                  sizeof(INT));
+              sprintf(szKey, "%sDirCnrFilter.%lu", szPrefix, numsaves);
+              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->mask,
+                                  sizeof(MASK));
+              sprintf(szKey, "%sDirCnrView.%lu", szPrefix, numsaves);
+              flWindowAttr = dcd->flWindowAttr;
+              if (!fLeaveTree && (flWindowAttr & CV_TREE)) {
+                flWindowAttr &= (~(CV_TREE | CV_ICON | CV_DETAIL | CV_TEXT));
+                if (dcd->lastattr) {
+                  if (dcd->lastattr & CV_TEXT)
+                    flWindowAttr |= CV_TEXT;
+                  else if (dcd->lastattr & CV_DETAIL)
+                    flWindowAttr |= CV_DETAIL;
+                  else if (dcd->lastattr & CV_ICON)
+                    flWindowAttr |= CV_ICON;
+                  else
+                    flWindowAttr |= CV_NAME;
+                }
+                else
+                  flWindowAttr |= CV_NAME;
+              }
+              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & flWindowAttr,
+                                  sizeof(ULONG));
+              sprintf(szKey, "%sDirCnr.%lu.DetailsLongname", szPrefix, numsaves);
+              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->ds.detailslongname,
+                                  sizeof(BOOL));
+              sprintf(szKey, "%sDirCnr.%lu.DetailsSubject", szPrefix, numsaves);
+              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->ds.detailssubject,
+                                  sizeof(BOOL));
+              sprintf(szKey, "%sDirCnr.%lu.DetailsSize", szPrefix, numsaves);
+              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->ds.detailssize,
+                                  sizeof(BOOL));
+              sprintf(szKey, "%sDirCnr.%lu.DetailsEA", szPrefix, numsaves);
+              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->ds.detailsea,
+                                  sizeof(BOOL));
+              sprintf(szKey, "%sDirCnr.%lu.DetailsAttr", szPrefix, numsaves);
+              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->ds.detailsattr,
+                                  sizeof(BOOL));
+              sprintf(szKey, "%sDirCnr.%lu.DetailsIcon", szPrefix, numsaves);
+              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->ds.detailsicon,
+                                  sizeof(BOOL));
+              sprintf(szKey, "%sDirCnr.%lu.DetailsLWDate", szPrefix, numsaves);
+              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->ds.detailslwdate,
+                                  sizeof(BOOL));
+              sprintf(szKey, "%sDirCnr.%lu.DetailsLWTime", szPrefix, numsaves);
+              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->ds.detailslwtime,
+                                  sizeof(BOOL));
+              sprintf(szKey, "%sDirCnr.%lu.DetailsLADate", szPrefix, numsaves);
+              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->ds.detailsladate,
+                                  sizeof(BOOL));
+              sprintf(szKey, "%sDirCnr.%lu.DetailsLATime", szPrefix, numsaves);
+              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->ds.detailslatime,
+                                  sizeof(BOOL));
+              sprintf(szKey, "%sDirCnr.%lu.DetailsCRDate", szPrefix, numsaves);
+              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->ds.detailscrdate,
+                                  sizeof(BOOL));
+              sprintf(szKey, "%sDirCnr.%lu.DetailsCRTime", szPrefix, numsaves);
+              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->ds.detailscrtime,
+                                  sizeof(BOOL));
+              sprintf(szKey, "%sDirCnr.%lu", szPrefix, numsaves);
+              SavePresParams(hwndDir, szKey);
+            }
+            sprintf(szKey, "%sDirCnrDir.%lu", szPrefix, numsaves++);
+            PrfWriteProfileString(fmprof, FM3Str, szKey, szDir);
+          }
+        }
       }
     }
@@ -3067 +3117 @@
     if (hwnd) {
       if (WinQueryWindowPos(hwnd, &swp)) {
-        if (pswp->x > swp.cx)
-          pswp->x = (swp.cx > 24) ? swp.cx - 24 : swp.cx;
-        if (pswp->y > swp.cy)
-          pswp->y = (swp.cy > 24) ? swp.cy - 24 : swp.cy;
-        if (pswp->x + pswp->cx > swp.cx)
-          pswp->cx = swp.cx - pswp->x;
-        if (pswp->y + pswp->cy > swp.cy)
-          pswp->cy = swp.cy - pswp->y;
+        if (pswp->x > swp.cx)
+          pswp->x = (swp.cx > 24) ? swp.cx - 24 : swp.cx;
+        if (pswp->y > swp.cy)
+          pswp->y = (swp.cy > 24) ? swp.cy - 24 : swp.cy;
+        if (pswp->x + pswp->cx > swp.cx)
+          pswp->cx = swp.cx - pswp->x;
+        if (pswp->y + pswp->cy > swp.cy)
+          pswp->cy = swp.cy - pswp->y;
       }
     }
@@ -3141 +3191 @@
   sprintf(szKey, "%sMySizeLastTime", szPrefix);
   if (!PrfQueryProfileData(fmprof,
-                           FM3Str,
-                           szKey,
-                           (PVOID) & swpO,
-                           &size) ||
+                           FM3Str,
+                           szKey,
+                           (PVOID) & swpO,
+                           &size) ||
       size != sizeof(SWP) || !swp.cx || !swp.cy)
   {
@@ -3172 +3222 @@
       swp.fl &= (~SWP_ACTIVATE);
       WinSetWindowPos(hwndTree,
-                      HWND_TOP,
-                      swp.x,
-                      swp.y,
-                      swp.cx,
-                      swp.cy,
-                      swp.fl | SWP_MOVE | SWP_SIZE | SWP_SHOW | SWP_ZORDER);
+                      HWND_TOP,
+                      swp.x,
+                      swp.y,
+                      swp.cx,
+                      swp.cy,
+                      swp.fl | SWP_MOVE | SWP_SIZE | SWP_SHOW | SWP_ZORDER);
     }
     else {
       WinSetWindowPos(hwndTree,
-                      HWND_TOP, 0, 0, 0, 0, SWP_MINIMIZE | SWP_SHOW);
+                      HWND_TOP, 0, 0, 0, 0, SWP_MINIMIZE | SWP_SHOW);
       WinSetWindowUShort(hwndTree, QWS_XRESTORE, (USHORT) swp.x);
       WinSetWindowUShort(hwndTree, QWS_CXRESTORE, (USHORT) swp.cx);
@@ -3191 +3241 @@
   sprintf(szKey, "%sNumDirsLastTime", szPrefix);
   if (PrfQueryProfileData(fmprof,
-                          FM3Str, szKey, (PVOID) & numsaves, &size)) {
+                          FM3Str, szKey, (PVOID) & numsaves, &size)) {
     if (fDeleteState)
       PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
@@ -3198 +3248 @@
       size = sizeof(SWP);
       if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &swp, &size)) {
-        if (fDeleteState)
-          PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
-        sprintf(szKey, "%sDirCnrDir.%lu", szPrefix, x);
-        size = sizeof(szDir);
-        if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) szDir, &size)) {
-          // If restoring shutdown state and drive marked no prescan
-          // bypass window restore
-          if (fIsShutDownState &&
-              driveflags[toupper(*szDir) - 'A'] & DRIVE_NOPRESCAN) {
-            PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
-            continue;
-          }
-          if (fDeleteState)
-            PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
-          localdcd.ds.detailslongname = dsDirCnrDefault.detailslongname;  // Set default
-          size = sizeof(BOOL);
-          sprintf(szKey, "%sDirCnr.%lu.DetailsLongname", szPrefix, x);
-          if (PrfQueryProfileData(fmprof,
-                                  FM3Str,
-                                  szKey,
-                                  (PVOID)&localdcd.ds.detailslongname,
-                                  &size) &&
-              size == sizeof(BOOL))
-          {
-            if (fDeleteState)
-              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
-          }
-          localdcd.ds.detailssubject = dsDirCnrDefault.detailssubject;  // Set default
-          size = sizeof(BOOL);
-          sprintf(szKey, "%sDirCnr.%lu.DetailsSubject", szPrefix, x);
-          if (PrfQueryProfileData(fmprof,
-                                  FM3Str,
-                                  szKey,
-                                  (PVOID)&localdcd.ds.detailssubject,
-                                  &size) &&
-              size == sizeof(BOOL))
-          {
-            if (fDeleteState)
-              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
-          }
-          localdcd.ds.detailsea = dsDirCnrDefault.detailsea;  // Set default
-          size = sizeof(BOOL);
-          sprintf(szKey, "%sDirCnr.%lu.DetailsEA", szPrefix, x);
-          if (PrfQueryProfileData(fmprof,
-                                  FM3Str,
-                                  szKey,
-                                  (PVOID) & localdcd.ds.detailsea,
-                                  &size) &&
-              size == sizeof(BOOL))
-          {
-            if (fDeleteState)
-              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
-          }
-          localdcd.ds.detailssize = dsDirCnrDefault.detailssize;  // Set default
-          size = sizeof(BOOL);
-          sprintf(szKey, "%sDirCnr.%lu.DetailsSize", szPrefix, x);
-          if (PrfQueryProfileData(fmprof,
-                                  FM3Str,
-                                  szKey,
-                                  (PVOID) & localdcd.ds.detailssize,
-                                  &size) &&
-              size == sizeof(BOOL))
-          {
-            if (fDeleteState)
-              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
-          }
-          localdcd.ds.detailsicon = dsDirCnrDefault.detailsicon;  // Set default
-          size = sizeof(BOOL);
-          sprintf(szKey, "%sDirCnr.%lu.DetailsIcon", szPrefix, x);
-          if (PrfQueryProfileData(fmprof,
-                                  FM3Str,
-                                  szKey,
-                                  (PVOID) & localdcd.ds.detailsicon,
-                                  &size) &&
-              size == sizeof(BOOL))
-          {
-            if (fDeleteState)
-              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
-          }
-          localdcd.ds.detailsattr = dsDirCnrDefault.detailsattr;  // Set default
-          size = sizeof(BOOL);
-          sprintf(szKey, "%sDirCnr.%lu.DetailsAttr", szPrefix, x);
-          if (PrfQueryProfileData(fmprof,
-                                  FM3Str,
-                                  szKey,
-                                  (PVOID)&localdcd.ds.detailsattr,
-                                  &size) &&
-              size == sizeof(BOOL))
-          {
-            if (fDeleteState)
-              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
-          }
-          localdcd.ds.detailscrdate = dsDirCnrDefault.detailscrdate;  // Set default
-          size = sizeof(BOOL);
-          sprintf(szKey, "%sDirCnr.%lu.DetailsCRDate", szPrefix, x);
-          if (PrfQueryProfileData(fmprof,
-                                  FM3Str,
-                                  szKey,
-                                  (PVOID) & localdcd.ds.detailscrdate,
-              &size) && size == sizeof(BOOL))
-          {
-            if (fDeleteState)
-              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
-          }
-          localdcd.ds.detailscrtime = dsDirCnrDefault.detailscrtime;  // Set default
-          size = sizeof(BOOL);
-          sprintf(szKey, "%sDirCnr.%lu.DetailsCRTime", szPrefix, x);
-          if (PrfQueryProfileData(fmprof,
-                                  FM3Str,
-                                  szKey,
-                                  (PVOID)&localdcd.ds.detailscrtime,
-                                  &size) &&
-              size == sizeof(BOOL))
-          {
-            if (fDeleteState)
-              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
-          }
-          localdcd.ds.detailslwdate = dsDirCnrDefault.detailslwdate;  // Set default
-          size = sizeof(BOOL);
-          sprintf(szKey, "%sDirCnr.%lu.DetailsLWDate", szPrefix, x);
-          if (PrfQueryProfileData(fmprof,
-                                  FM3Str,
-                                  szKey,
-                                  (PVOID) & localdcd.ds.detailslwdate,
-                                  &size) &&
-              size == sizeof(BOOL))
-          {
-            if (fDeleteState)
-              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
-          }
-          localdcd.ds.detailslwtime = dsDirCnrDefault.detailslwtime;  // Set default
-          size = sizeof(BOOL);
-          sprintf(szKey, "%sDirCnr.%lu.DetailsLWTime", szPrefix, x);
-          if (PrfQueryProfileData(fmprof,
-                                  FM3Str,
-                                  szKey,
-                                  (PVOID) & localdcd.ds.detailslwtime,
-                                  &size) &&
-              size == sizeof(BOOL))
-          {
-            if (fDeleteState)
-              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
-          }
-          localdcd.ds.detailsladate = dsDirCnrDefault.detailsladate;  // Set default
-          size = sizeof(BOOL);
-          sprintf(szKey, "%sDirCnr.%lu.DetailsLADate", szPrefix, x);
-          if (PrfQueryProfileData(fmprof,
-                                  FM3Str,
-                                  szKey,
-                                  (PVOID) & localdcd.ds.detailsladate,
-                                  &size) &&
-              size == sizeof(BOOL))
-          {
-            if (fDeleteState)
-              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
-          }
-          localdcd.ds.detailslatime = dsDirCnrDefault.detailslatime;  // Set default
-          size = sizeof(BOOL);
-          sprintf(szKey, "%sDirCnr.%lu.DetailsLATime", szPrefix, x);
-          if (PrfQueryProfileData(fmprof,
-                                  FM3Str,
-                                  szKey,
-                                  (PVOID) & localdcd.ds.detailslatime,
-                                  &size) &&
-              size == sizeof(BOOL))
-          {
-            if (fDeleteState)
-              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
-          }
-          hwndDir = (HWND) WinSendMsg(hwndClient,
-                                      UM_SETDIR,
-                                      MPFROMP(szDir), MPFROMLONG(1));
-          if (hwndDir) {
-            hwndC = WinWindowFromID(hwndDir, FID_CLIENT);
-            if (hwndC) {
-              HWND hwndCnr = WinWindowFromID(hwndC, DIR_CNR);
-              if (!hwndPPSave) {
-                hwndPPSave = WinCreateWindow(hwndCnr,         // Create a window (used to save default presparams)
-                                             WC_CONTAINER,
-                                             NULL,
-                                             CCS_AUTOPOSITION | CCS_MINIICONS |
-                                             CCS_MINIRECORDCORE | ulCnrType |
-                                             WS_VISIBLE,
-                                             0,
-                                             0,
-                                             0,
-                                             0,
-                                             hwndCnr,
-                                             HWND_TOP, (ULONG) -1, NULL, NULL);
-                CopyPresParams(hwndPPSave, hwndC);
-                RestorePresParams(hwndPPSave, "DirCnr");
-              }
-              sprintf(szKey, "%sDirCnr.%lu", szPrefix, x);
-              RestorePresParams(hwndCnr, szKey);
-              dcd = WinQueryWindowPtr(hwndCnr, QWL_USER);
-              if (dcd) {
-                dcd->ds.detailslongname = localdcd.ds.detailslongname;
-                dcd->ds.detailssubject  = localdcd.ds.detailssubject ;
-                dcd->ds.detailsattr     = localdcd.ds.detailsattr    ;
-                dcd->ds.detailsea       = localdcd.ds.detailsea      ;
-                dcd->ds.detailssize     = localdcd.ds.detailssize    ;
-                dcd->ds.detailsicon     = localdcd.ds.detailsicon    ;
-                dcd->ds.detailscrdate   = localdcd.ds.detailscrdate  ;
-                dcd->ds.detailscrtime   = localdcd.ds.detailscrtime  ;
-                dcd->ds.detailsladate   = localdcd.ds.detailsladate  ;
-                dcd->ds.detailslatime   = localdcd.ds.detailslatime  ;
-                dcd->ds.detailslwdate   = localdcd.ds.detailslwdate  ;
-                dcd->ds.detailslwtime   = localdcd.ds.detailslwtime  ;
-                size = sizeof(INT);
-                sprintf(szKey, "%sDirCnrSort.%lu", szPrefix, x);
-                if (PrfQueryProfileData(fmprof,
-                                        FM3Str,
-                                        szKey,
-                                        (PVOID) & dcd->sortFlags,
-                                        &size) && size == sizeof(INT)) {
-                  if (!dcd->sortFlags)
-                    dcd->sortFlags = SORT_PATHNAME;
-                }
-                if (fDeleteState)
-                  PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
-                size = sizeof(MASK);
-                sprintf(szKey, "%sDirCnrFilter.%lu", szPrefix, x);
-                if (PrfQueryProfileData(fmprof,
-                                        FM3Str,
-                                        szKey,
-                                        (PVOID) & dcd->mask, &size) && size) {
-                  if (*dcd->mask.szMask)
-                    WinSendMsg(WinWindowFromID(hwndC, DIR_CNR),
-                               UM_FILTER, MPFROMP(dcd->mask.szMask), MPVOID);
-                }
-                *(dcd->mask.prompt) = 0;
-                if (fDeleteState)
-                  PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
-                size = sizeof(ULONG);
-                sprintf(szKey, "%sDirCnrView.%lu", szPrefix, x);
-                if (!noview) {
-                  if (PrfQueryProfileData(fmprof,
-                                          FM3Str,
-                                          szKey,
-                                          (PVOID) & dcd->flWindowAttr,
-                                          &size) && size == sizeof(ULONG)) {
-
-                    CNRINFO cnri;
-
-                    memset(&cnri, 0, sizeof(CNRINFO));
-                    cnri.cb = sizeof(CNRINFO);
-                    if (WinSendMsg(WinWindowFromID(hwndC, DIR_CNR),
-                                   CM_QUERYCNRINFO,
-                                   MPFROMP(&cnri),
-                                   MPFROMLONG(sizeof(CNRINFO)))) {
-                      cnri.flWindowAttr = dcd->flWindowAttr;
-                      WinSendMsg(WinWindowFromID(hwndC, DIR_CNR),
-                                 CM_SETCNRINFO,
-                                 MPFROMP(&cnri),
-                                 MPFROMLONG(CMA_FLWINDOWATTR));
-                    }
-                  }
-                }
-                if (fDeleteState)
-                  PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
-                  if (!PostMsg(hwndCnr, UM_SETUP2, NULL, NULL))
-                    WinSendMsg(hwndCnr, UM_SETUP2, NULL, NULL);
-              }
-            }
-            fRestored = TRUE;
-            swp.hwnd = hwndDir;
-            TransformSwp(&swp, xtrans, ytrans);
-            if (swp.fl & (SWP_HIDE | SWP_MINIMIZE)) {
-              WinSetWindowPos(hwndDir,
-                              HWND_TOP, 0, 0, 0, 0, SWP_MINIMIZE | SWP_SHOW);
-              WinSetWindowUShort(hwndDir, QWS_XRESTORE, (USHORT) swp.x);
-              WinSetWindowUShort(hwndDir, QWS_CXRESTORE, (USHORT) swp.cx);
-              WinSetWindowUShort(hwndDir, QWS_YRESTORE, (USHORT) swp.y);
-              WinSetWindowUShort(hwndDir, QWS_CYRESTORE, (USHORT) swp.cy);
-            } else
-              WinSetWindowPos(hwndDir,
-                              HWND_TOP,
-                              swp.x,
-                              swp.y,
-                              swp.cx,
-                              swp.cy,
-                              swp.fl | SWP_MOVE |
-                              SWP_SIZE | SWP_SHOW |  SWP_ZORDER |
-                              SWP_ACTIVATE);
-          }
-        }
+        if (fDeleteState)
+          PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+        sprintf(szKey, "%sDirCnrDir.%lu", szPrefix, x);
+        size = sizeof(szDir);
+        if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) szDir, &size)) {
+          // If restoring shutdown state and drive marked no prescan
+          // bypass window restore
+          if (fIsShutDownState &&
+              driveflags[toupper(*szDir) - 'A'] & DRIVE_NOPRESCAN) {
+            PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+            continue;
+          }
+          if (fDeleteState)
+            PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+          localdcd.ds.detailslongname = dsDirCnrDefault.detailslongname;  // Set default
+          size = sizeof(BOOL);
+          sprintf(szKey, "%sDirCnr.%lu.DetailsLongname", szPrefix, x);
+          if (PrfQueryProfileData(fmprof,
+                                  FM3Str,
+                                  szKey,
+                                  (PVOID)&localdcd.ds.detailslongname,
+                                  &size) &&
+              size == sizeof(BOOL))
+          {
+            if (fDeleteState)
+              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+          }
+          localdcd.ds.detailssubject = dsDirCnrDefault.detailssubject;  // Set default
+          size = sizeof(BOOL);
+          sprintf(szKey, "%sDirCnr.%lu.DetailsSubject", szPrefix, x);
+          if (PrfQueryProfileData(fmprof,
+                                  FM3Str,
+                                  szKey,
+                                  (PVOID)&localdcd.ds.detailssubject,
+                                  &size) &&
+              size == sizeof(BOOL))
+          {
+            if (fDeleteState)
+              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+          }
+          localdcd.ds.detailsea = dsDirCnrDefault.detailsea;  // Set default
+          size = sizeof(BOOL);
+          sprintf(szKey, "%sDirCnr.%lu.DetailsEA", szPrefix, x);
+          if (PrfQueryProfileData(fmprof,
+                                  FM3Str,
+                                  szKey,
+                                  (PVOID) & localdcd.ds.detailsea,
+                                  &size) &&
+              size == sizeof(BOOL))
+          {
+            if (fDeleteState)
+              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+          }
+          localdcd.ds.detailssize = dsDirCnrDefault.detailssize;  // Set default
+          size = sizeof(BOOL);
+          sprintf(szKey, "%sDirCnr.%lu.DetailsSize", szPrefix, x);
+          if (PrfQueryProfileData(fmprof,
+                                  FM3Str,
+                                  szKey,
+                                  (PVOID) & localdcd.ds.detailssize,
+                                  &size) &&
+              size == sizeof(BOOL))
+          {
+            if (fDeleteState)
+              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+          }
+          localdcd.ds.detailsicon = dsDirCnrDefault.detailsicon;  // Set default
+          size = sizeof(BOOL);
+          sprintf(szKey, "%sDirCnr.%lu.DetailsIcon", szPrefix, x);
+          if (PrfQueryProfileData(fmprof,
+                                  FM3Str,
+                                  szKey,
+                                  (PVOID) & localdcd.ds.detailsicon,
+                                  &size) &&
+              size == sizeof(BOOL))
+          {
+            if (fDeleteState)
+              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+          }
+          localdcd.ds.detailsattr = dsDirCnrDefault.detailsattr;  // Set default
+          size = sizeof(BOOL);
+          sprintf(szKey, "%sDirCnr.%lu.DetailsAttr", szPrefix, x);
+          if (PrfQueryProfileData(fmprof,
+                                  FM3Str,
+                                  szKey,
+                                  (PVOID)&localdcd.ds.detailsattr,
+                                  &size) &&
+              size == sizeof(BOOL))
+          {
+            if (fDeleteState)
+              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+          }
+          localdcd.ds.detailscrdate = dsDirCnrDefault.detailscrdate;  // Set default
+          size = sizeof(BOOL);
+          sprintf(szKey, "%sDirCnr.%lu.DetailsCRDate", szPrefix, x);
+          if (PrfQueryProfileData(fmprof,
+                                  FM3Str,
+                                  szKey,
+                                  (PVOID) & localdcd.ds.detailscrdate,
+              &size) && size == sizeof(BOOL))
+          {
+            if (fDeleteState)
+              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+          }
+          localdcd.ds.detailscrtime = dsDirCnrDefault.detailscrtime;  // Set default
+          size = sizeof(BOOL);
+          sprintf(szKey, "%sDirCnr.%lu.DetailsCRTime", szPrefix, x);
+          if (PrfQueryProfileData(fmprof,
+                                  FM3Str,
+                                  szKey,
+                                  (PVOID)&localdcd.ds.detailscrtime,
+                                  &size) &&
+              size == sizeof(BOOL))
+          {
+            if (fDeleteState)
+              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+          }
+          localdcd.ds.detailslwdate = dsDirCnrDefault.detailslwdate;  // Set default
+          size = sizeof(BOOL);
+          sprintf(szKey, "%sDirCnr.%lu.DetailsLWDate", szPrefix, x);
+          if (PrfQueryProfileData(fmprof,
+                                  FM3Str,
+                                  szKey,
+                                  (PVOID) & localdcd.ds.detailslwdate,
+                                  &size) &&
+              size == sizeof(BOOL))
+          {
+            if (fDeleteState)
+              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+          }
+          localdcd.ds.detailslwtime = dsDirCnrDefault.detailslwtime;  // Set default
+          size = sizeof(BOOL);
+          sprintf(szKey, "%sDirCnr.%lu.DetailsLWTime", szPrefix, x);
+          if (PrfQueryProfileData(fmprof,
+                                  FM3Str,
+                                  szKey,
+                                  (PVOID) & localdcd.ds.detailslwtime,
+                                  &size) &&
+              size == sizeof(BOOL))
+          {
+            if (fDeleteState)
+              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+          }
+          localdcd.ds.detailsladate = dsDirCnrDefault.detailsladate;  // Set default
+          size = sizeof(BOOL);
+          sprintf(szKey, "%sDirCnr.%lu.DetailsLADate", szPrefix, x);
+          if (PrfQueryProfileData(fmprof,
+                                  FM3Str,
+                                  szKey,
+                                  (PVOID) & localdcd.ds.detailsladate,
+                                  &size) &&
+              size == sizeof(BOOL))
+          {
+            if (fDeleteState)
+              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+          }
+          localdcd.ds.detailslatime = dsDirCnrDefault.detailslatime;  // Set default
+          size = sizeof(BOOL);
+          sprintf(szKey, "%sDirCnr.%lu.DetailsLATime", szPrefix, x);
+          if (PrfQueryProfileData(fmprof,
+                                  FM3Str,
+                                  szKey,
+                                  (PVOID) & localdcd.ds.detailslatime,
+                                  &size) &&
+              size == sizeof(BOOL))
+          {
+            if (fDeleteState)
+              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+          }
+          hwndDir = (HWND) WinSendMsg(hwndClient,
+                                      UM_SETDIR,
+                                      MPFROMP(szDir), MPFROMLONG(1));
+          if (hwndDir) {
+            hwndC = WinWindowFromID(hwndDir, FID_CLIENT);
+            if (hwndC) {
+              HWND hwndCnr = WinWindowFromID(hwndC, DIR_CNR);
+              if (!hwndPPSave) {
+                hwndPPSave = WinCreateWindow(hwndCnr,         // Create a window (used to save default presparams)
+                                             WC_CONTAINER,
+                                             NULL,
+                                             CCS_AUTOPOSITION | CCS_MINIICONS |
+                                             CCS_MINIRECORDCORE | ulCnrType |
+                                             WS_VISIBLE,
+                                             0,
+                                             0,
+                                             0,
+                                             0,
+                                             hwndCnr,
+                                             HWND_TOP, (ULONG) -1, NULL, NULL);
+                CopyPresParams(hwndPPSave, hwndC);
+                RestorePresParams(hwndPPSave, "DirCnr");
+              }
+              sprintf(szKey, "%sDirCnr.%lu", szPrefix, x);
+              RestorePresParams(hwndCnr, szKey);
+              dcd = WinQueryWindowPtr(hwndCnr, QWL_USER);
+              if (dcd) {
+                dcd->ds.detailslongname = localdcd.ds.detailslongname;
+                dcd->ds.detailssubject  = localdcd.ds.detailssubject ;
+                dcd->ds.detailsattr     = localdcd.ds.detailsattr    ;
+                dcd->ds.detailsea       = localdcd.ds.detailsea      ;
+                dcd->ds.detailssize     = localdcd.ds.detailssize    ;
+                dcd->ds.detailsicon     = localdcd.ds.detailsicon    ;
+                dcd->ds.detailscrdate   = localdcd.ds.detailscrdate  ;
+                dcd->ds.detailscrtime   = localdcd.ds.detailscrtime  ;
+                dcd->ds.detailsladate   = localdcd.ds.detailsladate  ;
+                dcd->ds.detailslatime   = localdcd.ds.detailslatime  ;
+                dcd->ds.detailslwdate   = localdcd.ds.detailslwdate  ;
+                dcd->ds.detailslwtime   = localdcd.ds.detailslwtime  ;
+                size = sizeof(INT);
+                sprintf(szKey, "%sDirCnrSort.%lu", szPrefix, x);
+                if (PrfQueryProfileData(fmprof,
+                                        FM3Str,
+                                        szKey,
+                                        (PVOID) & dcd->sortFlags,
+                                        &size) && size == sizeof(INT)) {
+                  if (!dcd->sortFlags)
+                    dcd->sortFlags = SORT_PATHNAME;
+                }
+                if (fDeleteState)
+                  PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+                size = sizeof(MASK);
+                sprintf(szKey, "%sDirCnrFilter.%lu", szPrefix, x);
+                if (PrfQueryProfileData(fmprof,
+                                        FM3Str,
+                                        szKey,
+                                        (PVOID) & dcd->mask, &size) && size) {
+                  if (*dcd->mask.szMask)
+                    WinSendMsg(WinWindowFromID(hwndC, DIR_CNR),
+                               UM_FILTER, MPFROMP(dcd->mask.szMask), MPVOID);
+                }
+                *(dcd->mask.prompt) = 0;
+                if (fDeleteState)
+                  PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+                size = sizeof(ULONG);
+                sprintf(szKey, "%sDirCnrView.%lu", szPrefix, x);
+                if (!noview) {
+                  if (PrfQueryProfileData(fmprof,
+                                          FM3Str,
+                                          szKey,
+                                          (PVOID) & dcd->flWindowAttr,
+                                          &size) && size == sizeof(ULONG)) {
+
+                    CNRINFO cnri;
+
+                    memset(&cnri, 0, sizeof(CNRINFO));
+                    cnri.cb = sizeof(CNRINFO);
+                    if (WinSendMsg(WinWindowFromID(hwndC, DIR_CNR),
+                                   CM_QUERYCNRINFO,
+                                   MPFROMP(&cnri),
+                                   MPFROMLONG(sizeof(CNRINFO)))) {
+                      cnri.flWindowAttr = dcd->flWindowAttr;
+                      WinSendMsg(WinWindowFromID(hwndC, DIR_CNR),
+                                 CM_SETCNRINFO,
+                                 MPFROMP(&cnri),
+                                 MPFROMLONG(CMA_FLWINDOWATTR));
+                    }
+                  }
+                }
+                if (fDeleteState)
+                  PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+                  if (!PostMsg(hwndCnr, UM_SETUP2, NULL, NULL))
+                    WinSendMsg(hwndCnr, UM_SETUP2, NULL, NULL);
+              }
+            }
+            fRestored = TRUE;
+            swp.hwnd = hwndDir;
+            TransformSwp(&swp, xtrans, ytrans);
+            if (swp.fl & (SWP_HIDE | SWP_MINIMIZE)) {
+              WinSetWindowPos(hwndDir,
+                              HWND_TOP, 0, 0, 0, 0, SWP_MINIMIZE | SWP_SHOW);
+              WinSetWindowUShort(hwndDir, QWS_XRESTORE, (USHORT) swp.x);
+              WinSetWindowUShort(hwndDir, QWS_CXRESTORE, (USHORT) swp.cx);
+              WinSetWindowUShort(hwndDir, QWS_YRESTORE, (USHORT) swp.y);
+              WinSetWindowUShort(hwndDir, QWS_CYRESTORE, (USHORT) swp.cy);
+            } else
+              WinSetWindowPos(hwndDir,
+                              HWND_TOP,
+                              swp.x,
+                              swp.y,
+                              swp.cx,
+                              swp.cy,
+                              swp.fl | SWP_MOVE |
+                              SWP_SIZE | SWP_SHOW |  SWP_ZORDER |
+                              SWP_ACTIVATE);
+          }
+        }
       }
     } // for
@@ -3512 +3562 @@
     if (ulNumMinChildren) {
       if (WinQueryWindowPos(hwndChild, &swp) && (swp.fl & SWP_MINIMIZE))
-        (*ulNumMinChildren)++;
+        (*ulNumMinChildren)++;
     }
   }
@@ -3520 +3570 @@
 
 VOID GetNextWindowPos(HWND hwndClient, PSWP pswp, ULONG * ulCntR,
-                      ULONG * ulNumMinChildrenR)
+                      ULONG * ulNumMinChildrenR)
 {
   register ULONG ulCnt;
@@ -3584 +3634 @@
     if (!(swp.fl & (SWP_MAXIMIZE | SWP_HIDE | SWP_MINIMIZE))) {
       if (swp.y + swp.cy < Rectl.yTop - Rectl.yBottom)
-        swp.cy = (Rectl.yTop - Rectl.yBottom) - swp.y;
+        swp.cy = (Rectl.yTop - Rectl.yBottom) - swp.y;
       if (swp.x != 0)
-        swp.x = 0;
+        swp.x = 0;
       if (swp.y < 0)
-        swp.y = 0;
+        swp.y = 0;
       if (swp.x + swp.cx > Rectl.xRight - Rectl.xLeft)
-        swp.cx = Rectl.xRight - Rectl.xLeft;
+        swp.cx = Rectl.xRight - Rectl.xLeft;
       WinSetWindowPos(hwndTree, HWND_TOP, swp.x, swp.y, swp.cx, swp.cy,
-                      SWP_MOVE | SWP_SIZE | SWP_SHOW | SWP_RESTORE);
+                      SWP_MOVE | SWP_SIZE | SWP_SHOW | SWP_RESTORE);
     }
   }
@@ -3604 +3654 @@
       GetNextWindowPos(hwndClient, &swp, &ulCnt, &ulNumMinChildren);
       WinSetWindowPos(hwndChild, HWND_TOP, swp.x, swp.y, swp.cx, swp.cy,
-                      SWP_SIZE | SWP_MOVE | SWP_SHOW | SWP_RESTORE |
-                      SWP_ZORDER | SWP_ACTIVATE);
+                      SWP_SIZE | SWP_MOVE | SWP_SHOW | SWP_RESTORE |
+                      SWP_ZORDER | SWP_ACTIVATE);
       ulCnt++;
     }
@@ -3658 +3708 @@
     if (!(swp.fl & (SWP_MAXIMIZE | SWP_HIDE | SWP_MINIMIZE))) {
       if (swp.y < 0)
-        swp.y = 0;
+        swp.y = 0;
       if (swp.y + swp.cy < Rectl.yTop - Rectl.yBottom)
-        swp.cy = (Rectl.yTop - Rectl.yBottom) - swp.y;
+        swp.cy = (Rectl.yTop - Rectl.yBottom) - swp.y;
       if (swp.x != 0)
-        swp.x = 0;
+        swp.x = 0;
       if (swp.x + swp.cx > Rectl.xRight - Rectl.xLeft)
-        swp.cx = Rectl.xRight - Rectl.xLeft;
+        swp.cx = Rectl.xRight - Rectl.xLeft;
       WinSetWindowPos(hwndTree,
-                      HWND_TOP,
-                      swp.x,
-                      swp.y,
-                      swp.cx,
-                      swp.cy, SWP_MOVE | SWP_SIZE | SWP_SHOW | SWP_RESTORE);
+                      HWND_TOP,
+                      swp.x,
+                      swp.y,
+                      swp.cx,
+                      swp.cy, SWP_MOVE | SWP_SIZE | SWP_SHOW | SWP_RESTORE);
       WinQueryWindowPos(hwndTree, &swp);
     }
@@ -3695 +3745 @@
 
       for (ulCurRow = 0; ulCurRow < ulNumRows; ulCurRow++) {
-        if ((ulNumRows - ulCurRow) <= ulExtraCols)
-          ulNumCols++;
-        for (ulCurCol = 0; ulCurCol < ulNumCols; ulCurCol++) {
-          ulWidth = Rectl.xRight / ulNumCols;
-
-          while (hwndChild) {
-            id = WinQueryWindowUShort(hwndChild, QWS_ID);
-            if (id && (id != TREE_FRAME || fFreeTree)) {
-              WinQueryWindowPos(hwndChild, &swp);
-              if (!(swp.fl & (SWP_HIDE | SWP_MINIMIZE)))
-                break;
-            }
-            hwndChild = WinGetNextWindow(henum);
-          }
-
-          if (hwndChild) {
-            if (!absolute && (swp.fl & SWP_MAXIMIZE)) {
-              WinGetMaxPosition(hwndChild, &swp);
-              WinSetWindowPos(hwndChild,
-                              HWND_TOP,
-                              swp.x,
-                              swp.y,
-                              swp.cx, swp.cy, SWP_MOVE | SWP_SIZE | SWP_SHOW);
-              WinSetWindowUShort(hwndChild,
-                                 QWS_XRESTORE,
-                                 (USHORT) (ulWidth * ulCurCol) + Rectl.xLeft);
-              WinSetWindowUShort(hwndChild,
-                                 QWS_YRESTORE,
-                                 (USHORT) (Rectl.yTop -
-                                           (ulHeight * (ulCurRow + 1))));
-              WinSetWindowUShort(hwndChild, QWS_CXRESTORE, (USHORT) ulWidth);
-              WinSetWindowUShort(hwndChild, QWS_CYRESTORE, (USHORT) ulHeight);
-            }
-            else
-              WinSetWindowPos(hwndChild,
-                              HWND_TOP,
-                              (ulWidth * ulCurCol) + Rectl.xLeft,
-                              Rectl.yTop - (ulHeight * (ulCurRow + 1)),
-                              ulWidth,
-                              ulHeight,
-                              SWP_MOVE | SWP_SIZE | SWP_SHOW | SWP_RESTORE);
-            hwndChild = WinGetNextWindow(henum);
-          }
-        }
-        if ((ulNumRows - ulCurRow) <= ulExtraCols) {
-          ulNumCols--;
-          ulExtraCols--;
-        }
+        if ((ulNumRows - ulCurRow) <= ulExtraCols)
+          ulNumCols++;
+        for (ulCurCol = 0; ulCurCol < ulNumCols; ulCurCol++) {
+          ulWidth = Rectl.xRight / ulNumCols;
+
+          while (hwndChild) {
+            id = WinQueryWindowUShort(hwndChild, QWS_ID);
+            if (id && (id != TREE_FRAME || fFreeTree)) {
+              WinQueryWindowPos(hwndChild, &swp);
+              if (!(swp.fl & (SWP_HIDE | SWP_MINIMIZE)))
+                break;
+            }
+            hwndChild = WinGetNextWindow(henum);
+          }
+
+          if (hwndChild) {
+            if (!absolute && (swp.fl & SWP_MAXIMIZE)) {
+              WinGetMaxPosition(hwndChild, &swp);
+              WinSetWindowPos(hwndChild,
+                              HWND_TOP,
+                              swp.x,
+                              swp.y,
+                              swp.cx, swp.cy, SWP_MOVE | SWP_SIZE | SWP_SHOW);
+              WinSetWindowUShort(hwndChild,
+                                 QWS_XRESTORE,
+                                 (USHORT) (ulWidth * ulCurCol) + Rectl.xLeft);
+              WinSetWindowUShort(hwndChild,
+                                 QWS_YRESTORE,
+                                 (USHORT) (Rectl.yTop -
+                                           (ulHeight * (ulCurRow + 1))));
+              WinSetWindowUShort(hwndChild, QWS_CXRESTORE, (USHORT) ulWidth);
+              WinSetWindowUShort(hwndChild, QWS_CYRESTORE, (USHORT) ulHeight);
+            }
+            else
+              WinSetWindowPos(hwndChild,
+                              HWND_TOP,
+                              (ulWidth * ulCurCol) + Rectl.xLeft,
+                              Rectl.yTop - (ulHeight * (ulCurRow + 1)),
+                              ulWidth,
+                              ulHeight,
+                              SWP_MOVE | SWP_SIZE | SWP_SHOW | SWP_RESTORE);
+            hwndChild = WinGetNextWindow(henum);
+          }
+        }
+        if ((ulNumRows - ulCurRow) <= ulExtraCols) {
+          ulNumCols--;
+          ulExtraCols--;
+        }
       }
     }
@@ -3752 +3802 @@
 
 static VOID ResizeChildren(HWND hwndClient, SHORT oldcx, SHORT oldcy,
-                           SHORT newcx, SHORT newcy)
+                           SHORT newcx, SHORT newcy)
 {
   /*
@@ -3770 +3820 @@
     while ((hwndChild = WinGetNextWindow(henum)) != NULLHANDLE) {
       if (!WinQueryWindowUShort(hwndChild, QWS_ID))
-        continue;
+        continue;
       if (WinQueryWindowPos(hwndChild, &swp)) {
-        if (swp.fl & (SWP_MINIMIZE | SWP_HIDE)) {
-          swp.x = WinQueryWindowUShort(hwndChild, QWS_XRESTORE);
-          swp.y = WinQueryWindowUShort(hwndChild, QWS_YRESTORE);
-          swp.cx = WinQueryWindowUShort(hwndChild, QWS_CXRESTORE);
-          swp.cy = WinQueryWindowUShort(hwndChild, QWS_CYRESTORE);
-        }
-        else if (swp.fl & SWP_MAXIMIZE) {
-          swp.x = WinQueryWindowUShort(hwndChild, QWS_XRESTORE);
-          swp.y = WinQueryWindowUShort(hwndChild, QWS_YRESTORE);
-          swp.cx = WinQueryWindowUShort(hwndChild, QWS_CXRESTORE);
-          swp.cy = WinQueryWindowUShort(hwndChild, QWS_CYRESTORE);
-        }
-        cx = (swp.cx) ? (LONG) (((double)oldcx * 100.0) / (double)swp.cx) : 0;
-        cy = (swp.cy) ? (LONG) (((double)oldcy * 100.0) / (double)swp.cy) : 0;
-        x = (swp.x) ? (LONG) (((double)oldcx * 100.0) / (double)swp.x) : 0;
-        y = (swp.y) ? (LONG) (((double)oldcy * 100.0) / (double)swp.y) : 0;
-        if (x < 0)
-          x = 0;
-        if (y < 0)
-          y = 0;
-        ux = (x) ? (LONG) (((double)newcx * 100.0) / (double)x) : 0;
-        uy = (y) ? (LONG) (((double)newcy * 100.0) / (double)y) : 0;
-        ucx = (cx) ? (LONG) (((double)newcx * 100.0) / (double)cx) : 0;
-        ucy = (cy) ? (LONG) (((double)newcy * 100.0) / (double)cy) : 0;
-        if (ux + ucx > newcx)
-          ucx = newcx - ux;
-        if (uy + ucy > newcy)
-          ucy = newcy - uy;
-
-        if (!(swp.fl & (SWP_MINIMIZE | SWP_HIDE | SWP_MAXIMIZE)))
-          WinSetWindowPos(hwndChild, HWND_TOP, ux, uy, ucx, ucy,
-                          SWP_MOVE | SWP_SIZE | SWP_SHOW);
-        else if (swp.fl & (SWP_HIDE | SWP_MINIMIZE)) {
-          WinSetWindowUShort(hwndChild, QWS_XMINIMIZE, (USHORT) - 1);
-          WinSetWindowUShort(hwndChild, QWS_YMINIMIZE, (USHORT) - 1);
-          WinSetWindowPos(hwndChild, HWND_TOP, 0, 0, 0, 0,
-                          SWP_SIZE | SWP_MOVE | SWP_FOCUSDEACTIVATE);
-          WinSetWindowUShort(hwndChild, QWS_XRESTORE, ux);
-          WinSetWindowUShort(hwndChild, QWS_YRESTORE, uy);
-          WinSetWindowUShort(hwndChild, QWS_CXRESTORE, ucx);
-          WinSetWindowUShort(hwndChild, QWS_CYRESTORE, ucy);
-        }
-        else {
-          WinGetMaxPosition(hwndChild, &swp);
-          WinSetWindowPos(hwndChild, HWND_TOP, swp.x, swp.y, swp.cx, swp.cy,
-                          SWP_MOVE | SWP_SIZE | SWP_SHOW);
-          WinSetWindowUShort(hwndChild, QWS_XRESTORE, ux);
-          WinSetWindowUShort(hwndChild, QWS_YRESTORE, uy);
-          WinSetWindowUShort(hwndChild, QWS_CXRESTORE, ucx);
-          WinSetWindowUShort(hwndChild, QWS_CYRESTORE, ucy);
-        }
+        if (swp.fl & (SWP_MINIMIZE | SWP_HIDE)) {
+          swp.x = WinQueryWindowUShort(hwndChild, QWS_XRESTORE);
+          swp.y = WinQueryWindowUShort(hwndChild, QWS_YRESTORE);
+          swp.cx = WinQueryWindowUShort(hwndChild, QWS_CXRESTORE);
+          swp.cy = WinQueryWindowUShort(hwndChild, QWS_CYRESTORE);
+        }
+        else if (swp.fl & SWP_MAXIMIZE) {
+          swp.x = WinQueryWindowUShort(hwndChild, QWS_XRESTORE);
+          swp.y = WinQueryWindowUShort(hwndChild, QWS_YRESTORE);
+          swp.cx = WinQueryWindowUShort(hwndChild, QWS_CXRESTORE);
+          swp.cy = WinQueryWindowUShort(hwndChild, QWS_CYRESTORE);
+        }
+        cx = (swp.cx) ? (LONG) (((double)oldcx * 100.0) / (double)swp.cx) : 0;
+        cy = (swp.cy) ? (LONG) (((double)oldcy * 100.0) / (double)swp.cy) : 0;
+        x = (swp.x) ? (LONG) (((double)oldcx * 100.0) / (double)swp.x) : 0;
+        y = (swp.y) ? (LONG) (((double)oldcy * 100.0) / (double)swp.y) : 0;
+        if (x < 0)
+          x = 0;
+        if (y < 0)
+          y = 0;
+        ux = (x) ? (LONG) (((double)newcx * 100.0) / (double)x) : 0;
+        uy = (y) ? (LONG) (((double)newcy * 100.0) / (double)y) : 0;
+        ucx = (cx) ? (LONG) (((double)newcx * 100.0) / (double)cx) : 0;
+        ucy = (cy) ? (LONG) (((double)newcy * 100.0) / (double)cy) : 0;
+        if (ux + ucx > newcx)
+          ucx = newcx - ux;
+        if (uy + ucy > newcy)
+          ucy = newcy - uy;
+
+        if (!(swp.fl & (SWP_MINIMIZE | SWP_HIDE | SWP_MAXIMIZE)))
+          WinSetWindowPos(hwndChild, HWND_TOP, ux, uy, ucx, ucy,
+                          SWP_MOVE | SWP_SIZE | SWP_SHOW);
+        else if (swp.fl & (SWP_HIDE | SWP_MINIMIZE)) {
+          WinSetWindowUShort(hwndChild, QWS_XMINIMIZE, (USHORT) - 1);
+          WinSetWindowUShort(hwndChild, QWS_YMINIMIZE, (USHORT) - 1);
+          WinSetWindowPos(hwndChild, HWND_TOP, 0, 0, 0, 0,
+                          SWP_SIZE | SWP_MOVE | SWP_FOCUSDEACTIVATE);
+          WinSetWindowUShort(hwndChild, QWS_XRESTORE, ux);
+          WinSetWindowUShort(hwndChild, QWS_YRESTORE, uy);
+          WinSetWindowUShort(hwndChild, QWS_CXRESTORE, ucx);
+          WinSetWindowUShort(hwndChild, QWS_CYRESTORE, ucy);
+        }
+        else {
+          WinGetMaxPosition(hwndChild, &swp);
+          WinSetWindowPos(hwndChild, HWND_TOP, swp.x, swp.y, swp.cx, swp.cy,
+                          SWP_MOVE | SWP_SIZE | SWP_SHOW);
+          WinSetWindowUShort(hwndChild, QWS_XRESTORE, ux);
+          WinSetWindowUShort(hwndChild, QWS_YRESTORE, uy);
+          WinSetWindowUShort(hwndChild, QWS_CXRESTORE, ucx);
+          WinSetWindowUShort(hwndChild, QWS_CYRESTORE, ucy);
+        }
       }
     }
@@ -3838 +3888 @@
 
       if (!fNoTreeGap) {
-        INT height = WinQuerySysValue(HWND_DESKTOP, SV_CYICON) * 2;
-        if (swp.y < height)
-          swp.y = height;        // Force bottom to position
+        INT height = WinQuerySysValue(HWND_DESKTOP, SV_CYICON) * 2;
+        if (swp.y < height)
+          swp.y = height;        // Force bottom to position
       }
       else
-        swp.y = 0;                // Force bottom to position
+        swp.y = 0;                // Force bottom to position
 
       swp.cy = (Rectl.yTop - Rectl.yBottom) - swp.y;
       if (swp.cy < 0)
-        swp.cy = 0;
+        swp.cy = 0;
 
       if (swp.x != 0)
-        swp.x = 0;                // Left align
+        swp.x = 0;                // Left align
 
       // AdjustSizeOfClient can return bogus xRight values - fixme someday
       if (Rectl.xRight >= Rectl.xLeft) {
-        if (swp.x + swp.cx > Rectl.xRight - Rectl.xLeft)
-          swp.cx = Rectl.xRight - Rectl.xLeft;
+        if (swp.x + swp.cx > Rectl.xRight - Rectl.xLeft)
+          swp.cx = Rectl.xRight - Rectl.xLeft;
       }
       WinSetWindowPos(hwndTree, HWND_TOP, swp.x, swp.y, swp.cx, swp.cy,
-                      SWP_MOVE | SWP_SIZE | SWP_SHOW | SWP_RESTORE);
+                      SWP_MOVE | SWP_SIZE | SWP_SHOW | SWP_RESTORE);
     }
   }
@@ -3886 +3936 @@
 
 static MRESULT EXPENTRY ChildFrameButtonProc(HWND hwnd,
-                                             ULONG msg,
-                                             MPARAM mp1, MPARAM mp2)
+                                             ULONG msg,
+                                             MPARAM mp1, MPARAM mp2)
 {
   USHORT id;
@@ -3901 +3951 @@
     if (fOtherHelp) {
       if ((!hwndBubble || WinQueryWindowULong(hwndBubble, QWL_USER) != hwnd)
-          && !WinQueryCapture(HWND_DESKTOP)) {
-        id = WinQueryWindowUShort(hwnd, QWS_ID);
-        switch (id) {
-        case IDM_OPENWALK:
-          MakeBubble(hwnd, FALSE, GetPString(IDS_WALKBUTTONHELP));
-          break;
-        case IDM_USERLIST:
-          MakeBubble(hwnd, FALSE, GetPString(IDS_QUICKBUTTONHELP));
-          break;
-        }
+          && !WinQueryCapture(HWND_DESKTOP)) {
+        id = WinQueryWindowUShort(hwnd, QWS_ID);
+        switch (id) {
+        case IDM_OPENWALK:
+          MakeBubble(hwnd, FALSE, GetPString(IDS_WALKBUTTONHELP));
+          break;
+        case IDM_USERLIST:
+          MakeBubble(hwnd, FALSE, GetPString(IDS_QUICKBUTTONHELP));
+          break;
+        }
       }
     }
@@ -3924 +3974 @@
       switch (id) {
       case IDM_OPENWALK:
-        switch (msg) {
-        case WM_BUTTON2CLICK:
-          if ((shiftstate & (KC_ALT | KC_SHIFT | KC_CTRL)) ==
-              (KC_ALT | KC_SHIFT | KC_CTRL))
-            cmd = IDM_GREP;
-          else if ((shiftstate & (KC_ALT | KC_CTRL)) == (KC_ALT | KC_CTRL))
-            CascadeChildren(hwndMain);
+        switch (msg) {
+        case WM_BUTTON2CLICK:
+          if ((shiftstate & (KC_ALT | KC_SHIFT | KC_CTRL)) ==
+              (KC_ALT | KC_SHIFT | KC_CTRL))
+            cmd = IDM_GREP;
+          else if ((shiftstate & (KC_ALT | KC_CTRL)) == (KC_ALT | KC_CTRL))
+            CascadeChildren(hwndMain);
 
 #ifdef NEVER
-          else if ((shiftstate & (KC_ALT | KC_SHIFT)) == (KC_ALT | KC_SHIFT))
-            cmd = IDM_SYSINFO;
+          else if ((shiftstate & (KC_ALT | KC_SHIFT)) == (KC_ALT | KC_SHIFT))
+            cmd = IDM_SYSINFO;
 #endif
 
-          else if (shiftstate & KC_SHIFT)
-            cmd = IDM_WINDOWDLG;
-          else if (shiftstate & KC_CTRL)
-            cmd = IDM_SEEALL;
-          else if (shiftstate & KC_ALT)
-            TileChildren(hwndMain, TRUE);
-          else
-            cmd = IDM_WALKDIR;
-          break;
-        case WM_BUTTON3CLICK:
-          TileChildren(hwndMain, TRUE);
-          break;
-        }
-        break;
+          else if (shiftstate & KC_SHIFT)
+            cmd = IDM_WINDOWDLG;
+          else if (shiftstate & KC_CTRL)
+            cmd = IDM_SEEALL;
+          else if (shiftstate & KC_ALT)
+            TileChildren(hwndMain, TRUE);
+          else
+            cmd = IDM_WALKDIR;
+          break;
+        case WM_BUTTON3CLICK:
+          TileChildren(hwndMain, TRUE);
+          break;
+        }
+        break;
       case IDM_USERLIST:
-        switch (msg) {
-        case WM_BUTTON2CLICK:
-          if ((shiftstate & (KC_ALT | KC_SHIFT | KC_CTRL)) ==
-              (KC_ALT | KC_SHIFT | KC_CTRL))
-            cmd = IDM_COLORPALETTE;
-          else if ((shiftstate & (KC_ALT | KC_CTRL)) == (KC_ALT | KC_CTRL))
-            cmd = IDM_HIDEMENU;
-          else if ((shiftstate & (KC_ALT | KC_SHIFT)) == (KC_ALT | KC_SHIFT))
-            cmd = IDM_NOTEBOOK;
-          else if (shiftstate & KC_SHIFT)
-            cmd = IDM_TOOLTITLES;
-          else if (shiftstate & KC_CTRL)
-            cmd = IDM_TEXTTOOLS;
-          else if (shiftstate & KC_ALT)
-            cmd = IDM_FONTPALETTE;
-          else
-            cmd = IDM_TOOLBAR;
-          break;
-        case WM_BUTTON3CLICK:
-          cmd = IDM_DRIVEBAR;
-          break;
-        }
-        break;
+        switch (msg) {
+        case WM_BUTTON2CLICK:
+          if ((shiftstate & (KC_ALT | KC_SHIFT | KC_CTRL)) ==
+              (KC_ALT | KC_SHIFT | KC_CTRL))
+            cmd = IDM_COLORPALETTE;
+          else if ((shiftstate & (KC_ALT | KC_CTRL)) == (KC_ALT | KC_CTRL))
+            cmd = IDM_HIDEMENU;
+          else if ((shiftstate & (KC_ALT | KC_SHIFT)) == (KC_ALT | KC_SHIFT))
+            cmd = IDM_NOTEBOOK;
+          else if (shiftstate & KC_SHIFT)
+            cmd = IDM_TOOLTITLES;
+          else if (shiftstate & KC_CTRL)
+            cmd = IDM_TEXTTOOLS;
+          else if (shiftstate & KC_ALT)
+            cmd = IDM_FONTPALETTE;
+          else
+            cmd = IDM_TOOLBAR;
+          break;
+        case WM_BUTTON3CLICK:
+          cmd = IDM_DRIVEBAR;
+          break;
+        }
+        break;
       }                                 // switch id
 
       if (cmd) {
-        PostMsg(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT), FID_CLIENT),
-                WM_COMMAND, MPFROM2SHORT(cmd, 0), MPVOID);
+        PostMsg(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT), FID_CLIENT),
+                WM_COMMAND, MPFROM2SHORT(cmd, 0), MPVOID);
       }
     }
@@ -3988 +4038 @@
     if (id == IDM_OPENWALK) {
       if (!emphasized) {
-        emphasized = TRUE;
-        DrawTargetEmphasis(hwnd, emphasized);
+        emphasized = TRUE;
+        DrawTargetEmphasis(hwnd, emphasized);
       }
       if (AcceptOneDrop(hwnd, mp1, mp2))
-        return MRFROM2SHORT(DOR_DROP, DO_MOVE);
+        return MRFROM2SHORT(DOR_DROP, DO_MOVE);
     }
     return MRFROM2SHORT(DOR_NEVERDROP, 0);
@@ -4012 +4062 @@
 
       if (emphasized) {
-        emphasized = FALSE;
-        DrawTargetEmphasis(hwnd, emphasized);
+        emphasized = FALSE;
+        DrawTargetEmphasis(hwnd, emphasized);
       }
       if (GetOneDrop(hwnd, mp1, mp2, szFrom, sizeof(szFrom))) {
-        if (MakeValidDir(szFrom) && !FindDirCnrByName(szFrom, TRUE)) {
-          OpenDirCnr((HWND) 0, hwndMain, hwndTree, FALSE, szFrom);
-        }
+        if (MakeValidDir(szFrom) && !FindDirCnrByName(szFrom, TRUE)) {
+          OpenDirCnr((HWND) 0, hwndMain, hwndTree, FALSE, szFrom);
+        }
       }
     }
@@ -4031 +4081 @@
 
 static MRESULT EXPENTRY MainFrameWndProc(HWND hwnd, ULONG msg, MPARAM mp1,
-                                         MPARAM mp2)
+                                         MPARAM mp2)
 {
   PFNWP oldproc = (PFNWP) WinQueryWindowPtr(hwnd, QWL_USER);
@@ -4043 +4093 @@
       pswp = (SWP *) mp1;
       if (fDataMin && !fAmClosing) {
-        if (pswp->fl & (SWP_HIDE | SWP_MINIMIZE)) {
-
-          SWP swp;
-
-          WinQueryWindowPos(hwnd, &swp);
-          PostMsg(hwnd, UM_FOCUSME, MPFROMLONG(swp.fl), MPVOID);
-          HideNote();
-        }
-        else if (pswp->fl & (SWP_SHOW | SWP_RESTORE)) {
-          if (DataHwnd)
-            PostMsg(DataHwnd, WM_CLOSE, MPVOID, MPVOID);
-        }
+        if (pswp->fl & (SWP_HIDE | SWP_MINIMIZE)) {
+
+          SWP swp;
+
+          WinQueryWindowPos(hwnd, &swp);
+          PostMsg(hwnd, UM_FOCUSME, MPFROMLONG(swp.fl), MPVOID);
+          HideNote();
+        }
+        else if (pswp->fl & (SWP_SHOW | SWP_RESTORE)) {
+          if (DataHwnd)
+            PostMsg(DataHwnd, WM_CLOSE, MPVOID, MPVOID);
+        }
       }
       if (!fAmClosing) {
-        if (pswp->fl & (SWP_HIDE | SWP_MINIMIZE))
-          HideNote();
+        if (pswp->fl & (SWP_HIDE | SWP_MINIMIZE))
+          HideNote();
       }
     }
@@ -4081 +4131 @@
   case WM_CONTROL:
     return WinSendMsg(WinWindowFromID(hwnd, FID_CLIENT), UM_CONTROL, mp1,
-                      mp2);
+                      mp2);
 
   case WM_COMMAND:
@@ -4101 +4151 @@
 
       if (mr && mp2) {
-        prectl = (PRECTL) mp1;
-        if (prectl->yBottom != prectl->yTop) {
-          {
-            HPS hps;
-            POINTL aptl[TXTBOX_COUNT];
-
-            hps = WinGetPS(hwndStatus);
-            if (hps) {
-              GpiQueryTextBox(hps, 6, "$`WjgT", TXTBOX_COUNT, aptl);
-              bheight = sheight = aptl[TXTBOX_TOPLEFT].y + 6;
-              WinReleasePS(hps);
-            }
-          }
-          prectl->yBottom += (sheight + 4);
-          prectl->yTop -= (sheight + 4);
-          if (fMoreButtons) {
-
-            HPS hps;
-            POINTL aptl[TXTBOX_COUNT];
-
-            hps = WinGetPS(hwndName);
-            if (hps) {
-              GpiQueryTextBox(hps, 6, "$`WjgT", TXTBOX_COUNT, aptl);
-              bheight = aptl[TXTBOX_TOPLEFT].y + 6;
-              WinReleasePS(hps);
-            }
-            prectl->yBottom += (bheight + 4);
-            prectl->yTop -= (bheight + 4);
-          }
-          if (fToolbar) {
-            if (!fTextTools)
-              prectl->yTop -= ((fToolTitles) ? 50 : 40);
-            else
-              prectl->yTop -= 32;
-          }
-          if (fDrivebar) {
-            ResizeDrives(WinWindowFromID(hwnd, MAIN_DRIVES),
-                         ((prectl->xRight -
-                           (WinQuerySysValue(HWND_DESKTOP,
-                                             SV_CYSIZEBORDER) * 2)) - 4));
-            prectl->yTop -= (16 * (DriveLines * 18));
-          }
-          if (fUserComboBox) {
-            if (!aheight) {
-
-              SWP swpTemp;
-
-              WinQueryWindowPos(WinWindowFromID(hwndDrivelist, CBID_EDIT),
-                                &swpTemp);
-              aheight = swpTemp.cy;
-            }
-            prectl->yTop -= (aheight + 6L);
-          }
-          if (fAutoView) {
-            AutoviewHeight = min(AutoviewHeight,
-                                 (prectl->yTop - prectl->yBottom) - 116);
-            AutoviewHeight = max(AutoviewHeight, 36);
-            prectl->yBottom += (AutoviewHeight + 6);
-          }
-        }
+        prectl = (PRECTL) mp1;
+        if (prectl->yBottom != prectl->yTop) {
+          {
+            HPS hps;
+            POINTL aptl[TXTBOX_COUNT];
+
+            hps = WinGetPS(hwndStatus);
+            if (hps) {
+              GpiQueryTextBox(hps, 6, "$`WjgT", TXTBOX_COUNT, aptl);
+              bheight = sheight = aptl[TXTBOX_TOPLEFT].y + 6;
+              WinReleasePS(hps);
+            }
+          }
+          prectl->yBottom += (sheight + 4);
+          prectl->yTop -= (sheight + 4);
+          if (fMoreButtons) {
+
+            HPS hps;
+            POINTL aptl[TXTBOX_COUNT];
+
+            hps = WinGetPS(hwndName);
+            if (hps) {
+              GpiQueryTextBox(hps, 6, "$`WjgT", TXTBOX_COUNT, aptl);
+              bheight = aptl[TXTBOX_TOPLEFT].y + 6;
+              WinReleasePS(hps);
+            }
+            prectl->yBottom += (bheight + 4);
+            prectl->yTop -= (bheight + 4);
+          }
+          if (fToolbar) {
+            if (!fTextTools)
+              prectl->yTop -= ((fToolTitles) ? 50 : 40);
+            else
+              prectl->yTop -= 32;
+          }
+          if (fDrivebar) {
+            ResizeDrives(WinWindowFromID(hwnd, MAIN_DRIVES),
+                         ((prectl->xRight -
+                           (WinQuerySysValue(HWND_DESKTOP,
+                                             SV_CYSIZEBORDER) * 2)) - 4));
+            prectl->yTop -= (16 * (DriveLines * 18));
+          }
+          if (fUserComboBox) {
+            if (!aheight) {
+
+              SWP swpTemp;
+
+              WinQueryWindowPos(WinWindowFromID(hwndDrivelist, CBID_EDIT),
+                                &swpTemp);
+              aheight = swpTemp.cy;
+            }
+            prectl->yTop -= (aheight + 6L);
+          }
+          if (fAutoView) {
+            AutoviewHeight = min(AutoviewHeight,
+                                 (prectl->yTop - prectl->yBottom) - 116);
+            AutoviewHeight = max(AutoviewHeight, 36);
+            prectl->yBottom += (AutoviewHeight + 6);
+          }
+        }
       }
       return mr;
@@ -4184 +4234 @@
       pswp = (PSWP) mp1;
       {
-        SHORT x;
-
-        for (x = 0; x < soldCount; x++) {
-          if (WinQueryWindowUShort(pswp->hwnd, QWS_ID) == FID_CLIENT) {
-            pswpClient = pswp;
-            break;
-          }
-          pswp++;
-        }
+        SHORT x;
+
+        for (x = 0; x < soldCount; x++) {
+          if (WinQueryWindowUShort(pswp->hwnd, QWS_ID) == FID_CLIENT) {
+            pswpClient = pswp;
+            break;
+          }
+          pswp++;
+        }
       }
 
       {
-        HPS hps;
-        POINTL aptl[TXTBOX_COUNT];
-
-        hps = WinGetPS(hwndStatus);
-        if (hps) {
-          GpiQueryTextBox(hps, 6, "$`WjgT", TXTBOX_COUNT, aptl);
-          bheight = sheight = aptl[TXTBOX_TOPLEFT].y + 6;
-          WinReleasePS(hps);
-        }
-        if (fMoreButtons) {
-          hps = WinGetPS(hwndName);
-          if (hps) {
-            GpiQueryTextBox(hps, 6, "$`WjgT", TXTBOX_COUNT, aptl);
-            bheight = aptl[TXTBOX_TOPLEFT].y + 6;
-            WinReleasePS(hps);
-          }
-        }
+        HPS hps;
+        POINTL aptl[TXTBOX_COUNT];
+
+        hps = WinGetPS(hwndStatus);
+        if (hps) {
+          GpiQueryTextBox(hps, 6, "$`WjgT", TXTBOX_COUNT, aptl);
+          bheight = sheight = aptl[TXTBOX_TOPLEFT].y + 6;
+          WinReleasePS(hps);
+        }
+        if (fMoreButtons) {
+          hps = WinGetPS(hwndName);
+          if (hps) {
+            GpiQueryTextBox(hps, 6, "$`WjgT", TXTBOX_COUNT, aptl);
+            bheight = aptl[TXTBOX_TOPLEFT].y + 6;
+            WinReleasePS(hps);
+          }
+        }
       }
       pswpNew = (PSWP) mp1 + soldCount;
@@ -4222 +4272 @@
       pswpNew->y = swpClient.y + 2;
       if (!fSplitStatus)
-        width = swpClient.cx - (16 + (sheight * 2) + 4);
+        width = swpClient.cx - (16 + (sheight * 2) + 4);
       else
-        width = (swpClient.cx - (16 + (sheight * 2) + 4)) / 2;
+        width = (swpClient.cx - (16 + (sheight * 2) + 4)) / 2;
       width = max(width, 10);
       if (fSplitStatus)
-        pswpNew->cx = width - 6;
+        pswpNew->cx = width - 6;
       else
-        pswpNew->cx = width - 8;
+        pswpNew->cx = width - 8;
       pswpNew->cy = sheight;
       pswpClient->y = pswpNew->y + pswpNew->cy + 3;
@@ -4236 +4286 @@
 
       if (fSplitStatus) {
-        pswpNew = (PSWP) mp1 + (soldCount + 1);
-        *pswpNew = *pswpClient;
-        pswpNew->hwnd = hwndStatus2;
-        pswpNew->hwndInsertBehind = HWND_BOTTOM;
-        pswpNew->x = width + 8;
-        pswpNew->y = swpClient.y + 2;
-        pswpNew->cx = width - 6;
-        pswpNew->cy = sheight;
-        sCount++;
+        pswpNew = (PSWP) mp1 + (soldCount + 1);
+        *pswpNew = *pswpClient;
+        pswpNew->hwnd = hwndStatus2;
+        pswpNew->hwndInsertBehind = HWND_BOTTOM;
+        pswpNew->x = width + 8;
+        pswpNew->y = swpClient.y + 2;
+        pswpNew->cx = width - 6;
+        pswpNew->cy = sheight;
+        sCount++;
       }
       else {
-        WinShowWindow(hwndStatus2, FALSE);
-        WinSetWindowText(hwndStatus2, NullStr);
+        WinShowWindow(hwndStatus2, FALSE);
+        WinSetWindowText(hwndStatus2, NullStr);
       }
 
       if (fToolbar) {
-        if (fTextTools)
-          theight = 32L;
-        else if (!fToolTitles)
-          theight = 40L;
-        pswpNew = (PSWP) mp1 + (soldCount + 1 + (fSplitStatus != FALSE));
-        *pswpNew = *pswpClient;
-        pswpNew->hwnd = WinWindowFromID(hwnd, MAIN_TOOLS);
-        pswpNew->hwndInsertBehind = HWND_BOTTOM;
-        pswpNew->x = swpClient.x + 2;
-        pswpNew->y = (swpClient.y + swpClient.cy) - (theight - 2);
-        pswpNew->cx = swpClient.cx - 4;
-        pswpNew->cy = theight - 4;
-        pswpClient->cy -= theight;
-        sCount++;
+        if (fTextTools)
+          theight = 32L;
+        else if (!fToolTitles)
+          theight = 40L;
+        pswpNew = (PSWP) mp1 + (soldCount + 1 + (fSplitStatus != FALSE));
+        *pswpNew = *pswpClient;
+        pswpNew->hwnd = WinWindowFromID(hwnd, MAIN_TOOLS);
+        pswpNew->hwndInsertBehind = HWND_BOTTOM;
+        pswpNew->x = swpClient.x + 2;
+        pswpNew->y = (swpClient.y + swpClient.cy) - (theight - 2);
+        pswpNew->cx = swpClient.cx - 4;
+        pswpNew->cy = theight - 4;
+        pswpClient->cy -= theight;
+        sCount++;
       }
       else
-        WinShowWindow(WinWindowFromID(hwnd, MAIN_TOOLS), FALSE);
+        WinShowWindow(WinWindowFromID(hwnd, MAIN_TOOLS), FALSE);
 
       if (fDrivebar) {
-        ResizeDrives(WinWindowFromID(hwnd, MAIN_DRIVES), pswpClient->cx - 4);
-        pswpNew = (PSWP) mp1 + (soldCount + 1 +
-                                (fSplitStatus != FALSE) +
-                                (fToolbar != FALSE));
-        *pswpNew = *pswpClient;
-        pswpNew->hwnd = WinWindowFromID(hwnd, MAIN_DRIVES);
-        pswpNew->hwndInsertBehind = HWND_BOTTOM;
-        pswpNew->x = swpClient.x + 2;
-        dheight += ((dheight - 2) * DriveLines);
-        pswpNew->y = (swpClient.y + swpClient.cy) - (dheight - 2);
-        if (fToolbar)
-          pswpNew->y -= theight;
-        pswpNew->cx = swpClient.cx - 4;
-        pswpNew->cy = dheight - 4;
-        pswpClient->cy -= dheight;
-        sCount++;
+        ResizeDrives(WinWindowFromID(hwnd, MAIN_DRIVES), pswpClient->cx - 4);
+        pswpNew = (PSWP) mp1 + (soldCount + 1 +
+                                (fSplitStatus != FALSE) +
+                                (fToolbar != FALSE));
+        *pswpNew = *pswpClient;
+        pswpNew->hwnd = WinWindowFromID(hwnd, MAIN_DRIVES);
+        pswpNew->hwndInsertBehind = HWND_BOTTOM;
+        pswpNew->x = swpClient.x + 2;
+        dheight += ((dheight - 2) * DriveLines);
+        pswpNew->y = (swpClient.y + swpClient.cy) - (dheight - 2);
+        if (fToolbar)
+          pswpNew->y -= theight;
+        pswpNew->cx = swpClient.cx - 4;
+        pswpNew->cy = dheight - 4;
+        pswpClient->cy -= dheight;
+        sCount++;
       }
       else
-        WinShowWindow(WinWindowFromID(hwnd, MAIN_DRIVES), FALSE);
+        WinShowWindow(WinWindowFromID(hwnd, MAIN_DRIVES), FALSE);
 
       if (fAutoView) {
-        pswpNew = (PSWP) mp1 + (soldCount + 1 +
-                                (fToolbar != FALSE) +
-                                (fDrivebar != FALSE) +
-                                (fSplitStatus != FALSE));
-        *pswpNew = *pswpClient;
-        pswpNew->hwnd = (fComments) ? hwndAutoMLE : hwndAutoview;
-        pswpNew->x = pswpClient->x + 3;
-        pswpNew->y = pswpClient->y + 3;
-        if (fMoreButtons)
-          pswpNew->y += (bheight + 4);
-        pswpNew->cx = pswpClient->cx - 6;
-        AutoviewHeight = min(AutoviewHeight, pswpClient->cy - 116);
-        AutoviewHeight = max(AutoviewHeight, 36);
-        pswpNew->cy = AutoviewHeight;
-        pswpClient->y += (AutoviewHeight + 6);
-        pswpClient->cy -= (AutoviewHeight + 6);
-        sCount++;
-        WinShowWindow((fComments) ? hwndAutoview : hwndAutoMLE, FALSE);
+        pswpNew = (PSWP) mp1 + (soldCount + 1 +
+                                (fToolbar != FALSE) +
+                                (fDrivebar != FALSE) +
+                                (fSplitStatus != FALSE));
+        *pswpNew = *pswpClient;
+        pswpNew->hwnd = (fComments) ? hwndAutoMLE : hwndAutoview;
+        pswpNew->x = pswpClient->x + 3;
+        pswpNew->y = pswpClient->y + 3;
+        if (fMoreButtons)
+          pswpNew->y += (bheight + 4);
+        pswpNew->cx = pswpClient->cx - 6;
+        AutoviewHeight = min(AutoviewHeight, pswpClient->cy - 116);
+        AutoviewHeight = max(AutoviewHeight, 36);
+        pswpNew->cy = AutoviewHeight;
+        pswpClient->y += (AutoviewHeight + 6);
+        pswpClient->cy -= (AutoviewHeight + 6);
+        sCount++;
+        WinShowWindow((fComments) ? hwndAutoview : hwndAutoMLE, FALSE);
       }
       else {
-        WinShowWindow(hwndAutoview, FALSE);
-        WinShowWindow(hwndAutoMLE, FALSE);
+        WinShowWindow(hwndAutoview, FALSE);
+        WinShowWindow(hwndAutoMLE, FALSE);
       }
 
       pswpNew = (PSWP) mp1 + (soldCount + 1 +
-                              (fToolbar != FALSE) +
-                              (fDrivebar != FALSE) +
-                              (fSplitStatus != FALSE) + (fAutoView != FALSE));
+                              (fToolbar != FALSE) +
+                              (fDrivebar != FALSE) +
+                              (fSplitStatus != FALSE) + (fAutoView != FALSE));
       *pswpNew = *pswpClient;
       pswpNew->hwnd = WinWindowFromID(hwnd, IDM_OPENWALK);
@@ -4328 +4378 @@
       sCount++;
       pswpNew = (PSWP) mp1 + (soldCount + 2 +
-                              (fToolbar != FALSE) +
-                              (fDrivebar != FALSE) +
-                              (fSplitStatus != FALSE) + (fAutoView != FALSE));
+                              (fToolbar != FALSE) +
+                              (fDrivebar != FALSE) +
+                              (fSplitStatus != FALSE) + (fAutoView != FALSE));
       *pswpNew = *pswpClient;
       pswpNew->hwnd = WinWindowFromID(hwnd, IDM_USERLIST);
@@ -4339 +4389 @@
       sCount++;
       pswpNew = (PSWP) mp1 + (soldCount + 3 +
-                              (fToolbar != FALSE) +
-                              (fDrivebar != FALSE) +
-                              (fSplitStatus != FALSE) + (fAutoView != FALSE));
+                              (fToolbar != FALSE) +
+                              (fDrivebar != FALSE) +
+                              (fSplitStatus != FALSE) + (fAutoView != FALSE));
       *pswpNew = *pswpClient;
       pswpNew->hwnd = WinWindowFromID(hwnd, MAIN_LED);
@@ -4350 +4400 @@
       sCount++;
       pswpNew = (PSWP) mp1 + (soldCount + 4 +
-                              (fToolbar != FALSE) +
-                              (fDrivebar != FALSE) +
-                              (fSplitStatus != FALSE) + (fAutoView != FALSE));
+                              (fToolbar != FALSE) +
+                              (fDrivebar != FALSE) +
+                              (fSplitStatus != FALSE) + (fAutoView != FALSE));
       *pswpNew = *pswpClient;
       pswpNew->hwnd = WinWindowFromID(hwnd, MAIN_LEDHDR);
@@ -4361 +4411 @@
       sCount++;
       if (fUserComboBox) {
-        if (!aheight) {
-
-          SWP swpTemp;
-
-          WinQueryWindowPos(WinWindowFromID(hwndDrivelist, CBID_EDIT),
-                            &swpTemp);
-          aheight = swpTemp.cy;
-        }
-        pswpNew = (PSWP) mp1 + (soldCount + 5 +
-                                (fToolbar != FALSE) +
-                                (fSplitStatus != FALSE) +
-                                (fDrivebar != FALSE) + (fAutoView != FALSE));
-        *pswpNew = *pswpClient;
-        pswpNew->hwnd = hwndDrivelist;
-        pswpNew->x = swpClient.x;
-        pswpNew->cx = 48;
-        pswpClient->cy -= (aheight + 6L);
-        pswpNew->y = pswpClient->y;
-        pswpNew->cy = pswpClient->cy + (aheight + 5L);
-        sCount++;
-        pswpNew = (PSWP) mp1 + (soldCount + 6 +
-                                (fToolbar != FALSE) +
-                                (fDrivebar != FALSE) +
-                                (fSplitStatus != FALSE) +
-                                (fAutoView != FALSE));
-        *pswpNew = *pswpClient;
-        pswpNew->hwnd = hwndStatelist;
-        pswpNew->x = swpClient.x + 48;
-        pswpNew->cx = (swpClient.cx - 48) / 7;
-        pswpNew->y = pswpClient->y;
-        pswpNew->cy = pswpClient->cy + (aheight + 5L);
-        sCount++;
-        pswpNew = (PSWP) mp1 + (soldCount + 7 +
-                                (fToolbar != FALSE) +
-                                (fDrivebar != FALSE) +
-                                (fSplitStatus != FALSE) +
-                                (fAutoView != FALSE));
-        *pswpNew = *pswpClient;
-        pswpNew->hwnd = hwndCmdlist;
-        pswpNew->x = swpClient.x + 48 + ((swpClient.cx - 48) / 7);
-        pswpNew->cx = (swpClient.cx - 48) / 5 +
-          ((swpClient.cx - 48) / 5) - ((swpClient.cx - 48) / 7);
-        pswpNew->y = pswpClient->y;
-        pswpNew->cy = pswpClient->cy + (aheight + 5L);
-        sCount++;
-        pswpNew = (PSWP) mp1 + (soldCount + 8 +
-                                (fToolbar != FALSE) +
-                                (fDrivebar != FALSE) +
-                                (fSplitStatus != FALSE) +
-                                (fAutoView != FALSE));
-        *pswpNew = *pswpClient;
-        pswpNew->hwnd = hwndUserlist;
-        pswpNew->x = swpClient.x + 48 + (((swpClient.cx - 48) / 5) * 2);
-        pswpNew->cx = ((swpClient.x + swpClient.cx) - pswpNew->x) -
-          ((fToolbar) ? ((swpClient.cx - 48) / 7) : 0);
-        pswpNew->y = pswpClient->y;
-        pswpNew->cy = pswpClient->cy + (aheight + 5L);
-        sCount++;
-        if (fToolbar) {
-          pswpNew = (PSWP) mp1 + (soldCount + 9 +
-                                  (fToolbar != FALSE) +
-                                  (fDrivebar != FALSE) +
-                                  (fSplitStatus != FALSE) +
-                                  (fAutoView != FALSE));
-          *pswpNew = *pswpClient;
-          pswpNew->hwnd = hwndButtonlist;
-          pswpNew->x = swpClient.cx - ((swpClient.cx - 48) / 7) + 4;
-          pswpNew->cx = (swpClient.x + swpClient.cx) - pswpNew->x;
-          pswpNew->y = pswpClient->y;
-          pswpNew->cy = pswpClient->cy + (aheight + 5L);
-          sCount++;
-        }
-        else
-          WinShowWindow(hwndButtonlist, FALSE);
+        if (!aheight) {
+
+          SWP swpTemp;
+
+          WinQueryWindowPos(WinWindowFromID(hwndDrivelist, CBID_EDIT),
+                            &swpTemp);
+          aheight = swpTemp.cy;
+        }
+        pswpNew = (PSWP) mp1 + (soldCount + 5 +
+                                (fToolbar != FALSE) +
+                                (fSplitStatus != FALSE) +
+                                (fDrivebar != FALSE) + (fAutoView != FALSE));
+        *pswpNew = *pswpClient;
+        pswpNew->hwnd = hwndDrivelist;
+        pswpNew->x = swpClient.x;
+        pswpNew->cx = 48;
+        pswpClient->cy -= (aheight + 6L);
+        pswpNew->y = pswpClient->y;
+        pswpNew->cy = pswpClient->cy + (aheight + 5L);
+        sCount++;
+        pswpNew = (PSWP) mp1 + (soldCount + 6 +
+                                (fToolbar != FALSE) +
+                                (fDrivebar != FALSE) +
+                                (fSplitStatus != FALSE) +
+                                (fAutoView != FALSE));
+        *pswpNew = *pswpClient;
+        pswpNew->hwnd = hwndStatelist;
+        pswpNew->x = swpClient.x + 48;
+        pswpNew->cx = (swpClient.cx - 48) / 7;
+        pswpNew->y = pswpClient->y;
+        pswpNew->cy = pswpClient->cy + (aheight + 5L);
+        sCount++;
+        pswpNew = (PSWP) mp1 + (soldCount + 7 +
+                                (fToolbar != FALSE) +
+                                (fDrivebar != FALSE) +
+                                (fSplitStatus != FALSE) +
+                                (fAutoView != FALSE));
+        *pswpNew = *pswpClient;
+        pswpNew->hwnd = hwndCmdlist;
+        pswpNew->x = swpClient.x + 48 + ((swpClient.cx - 48) / 7);
+        pswpNew->cx = (swpClient.cx - 48) / 5 +
+          ((swpClient.cx - 48) / 5) - ((swpClient.cx - 48) / 7);
+        pswpNew->y = pswpClient->y;
+        pswpNew->cy = pswpClient->cy + (aheight + 5L);
+        sCount++;
+        pswpNew = (PSWP) mp1 + (soldCount + 8 +
+                                (fToolbar != FALSE) +
+                                (fDrivebar != FALSE) +
+                                (fSplitStatus != FALSE) +
+                                (fAutoView != FALSE));
+        *pswpNew = *pswpClient;
+        pswpNew->hwnd = hwndUserlist;
+        pswpNew->x = swpClient.x + 48 + (((swpClient.cx - 48) / 5) * 2);
+        pswpNew->cx = ((swpClient.x + swpClient.cx) - pswpNew->x) -
+          ((fToolbar) ? ((swpClient.cx - 48) / 7) : 0);
+        pswpNew->y = pswpClient->y;
+        pswpNew->cy = pswpClient->cy + (aheight + 5L);
+        sCount++;
+        if (fToolbar) {
+          pswpNew = (PSWP) mp1 + (soldCount + 9 +
+                                  (fToolbar != FALSE) +
+                                  (fDrivebar != FALSE) +
+                                  (fSplitStatus != FALSE) +
+                                  (fAutoView != FALSE));
+          *pswpNew = *pswpClient;
+          pswpNew->hwnd = hwndButtonlist;
+          pswpNew->x = swpClient.cx - ((swpClient.cx - 48) / 7) + 4;
+          pswpNew->cx = (swpClient.x + swpClient.cx) - pswpNew->x;
+          pswpNew->y = pswpClient->y;
+          pswpNew->cy = pswpClient->cy + (aheight + 5L);
+          sCount++;
+        }
+        else
+          WinShowWindow(hwndButtonlist, FALSE);
       }
       else {
-        WinShowWindow(hwndUserlist, FALSE);
-        WinShowWindow(hwndDrivelist, FALSE);
-        WinShowWindow(hwndStatelist, FALSE);
-        WinShowWindow(hwndButtonlist, FALSE);
-        WinShowWindow(hwndCmdlist, FALSE);
+        WinShowWindow(hwndUserlist, FALSE);
+        WinShowWindow(hwndDrivelist, FALSE);
+        WinShowWindow(hwndStatelist, FALSE);
+        WinShowWindow(hwndButtonlist, FALSE);
+        WinShowWindow(hwndCmdlist, FALSE);
       }
       {
-        PSWP pswpTitlebar = (PSWP) 0, pswpMinbutton = (PSWP) 0;
-        SHORT x;
-
-        pswpNew = (PSWP) mp1 + (soldCount + 5 +
-                                (fToolbar != FALSE) +
-                                (fDrivebar != FALSE) +
-                                (fSplitStatus != FALSE) +
-                                (fAutoView != FALSE) +
-                                ((fUserComboBox != FALSE) * 4) +
-                                (fUserComboBox != FALSE &&
-                                 fToolbar != FALSE));
-        pswp = (PSWP) mp1;
-        for (x = 0; x < soldCount; x++) {
-          if (!pswpTitlebar &&
-              WinQueryWindowUShort(pswp->hwnd, QWS_ID) == FID_TITLEBAR)
-            pswpTitlebar = pswp;
-          else if (!pswpMinbutton &&
-                   WinQueryWindowUShort(pswp->hwnd, QWS_ID) == FID_MINMAX)
-            pswpMinbutton = pswp;
-          if (pswpTitlebar && pswpMinbutton)
-            break;
-          pswp++;
-        }
-        if (pswpMinbutton && pswpTitlebar) {
-          *pswpNew = *pswpMinbutton;
-          pswpNew->hwnd = WinWindowFromID(hwnd, IDM_IDEALSIZE);
-          pswpNew->cy = pswpMinbutton->cy + 3;
-          pswpNew->cx = min(pswpNew->cy, (pswpMinbutton->cx / 2) + 3);
-          pswpTitlebar->cx -= (pswpNew->cx - 1);
-          pswpNew->x = pswpTitlebar->x + (pswpTitlebar->cx);
-          pswpNew->y = pswpMinbutton->y - 1;
-          sCount++;
-        }
-        else
-          WinShowWindow(WinWindowFromID(hwnd, IDM_IDEALSIZE), FALSE);
+        PSWP pswpTitlebar = (PSWP) 0, pswpMinbutton = (PSWP) 0;
+        SHORT x;
+
+        pswpNew = (PSWP) mp1 + (soldCount + 5 +
+                                (fToolbar != FALSE) +
+                                (fDrivebar != FALSE) +
+                                (fSplitStatus != FALSE) +
+                                (fAutoView != FALSE) +
+                                ((fUserComboBox != FALSE) * 4) +
+                                (fUserComboBox != FALSE &&
+                                 fToolbar != FALSE));
+        pswp = (PSWP) mp1;
+        for (x = 0; x < soldCount; x++) {
+          if (!pswpTitlebar &&
+              WinQueryWindowUShort(pswp->hwnd, QWS_ID) == FID_TITLEBAR)
+            pswpTitlebar = pswp;
+          else if (!pswpMinbutton &&
+                   WinQueryWindowUShort(pswp->hwnd, QWS_ID) == FID_MINMAX)
+            pswpMinbutton = pswp;
+          if (pswpTitlebar && pswpMinbutton)
+            break;
+          pswp++;
+        }
+        if (pswpMinbutton && pswpTitlebar) {
+          *pswpNew = *pswpMinbutton;
+          pswpNew->hwnd = WinWindowFromID(hwnd, IDM_IDEALSIZE);
+          pswpNew->cy = pswpMinbutton->cy + 3;
+          pswpNew->cx = min(pswpNew->cy, (pswpMinbutton->cx / 2) + 3);
+          pswpTitlebar->cx -= (pswpNew->cx - 1);
+          pswpNew->x = pswpTitlebar->x + (pswpTitlebar->cx);
+          pswpNew->y = pswpMinbutton->y - 1;
+          sCount++;
+        }
+        else
+          WinShowWindow(WinWindowFromID(hwnd, IDM_IDEALSIZE), FALSE);
       }
 
       if (fMoreButtons) {
 
-        LONG lastx;
-
-        pswpNew = (PSWP) mp1 + (soldCount + 6 +
-                                (fToolbar != FALSE) +
-                                (fDrivebar != FALSE) +
-                                (fSplitStatus != FALSE) +
-                                (fAutoView != FALSE) +
-                                ((fUserComboBox != FALSE) * 4) +
-                                (fUserComboBox != FALSE &&
-                                 fToolbar != FALSE));
-        *pswpNew = *pswpClient;
-        pswpNew->hwnd = hwndName;
-        pswpNew->x = swpClient.x + 3;
-        pswpNew->y = swpClient.y + (sheight + 6);
-        pswpNew->cx = ((swpClient.cx / 2) + (swpClient.cx / 5)) - 3;
-        lastx = pswpNew->x + pswpNew->cx;
-        pswpNew->cy = bheight;
-        pswpClient->y += (bheight + 4);
-        pswpClient->cy -= (bheight + 4);
-        sCount++;
-        pswpNew = (PSWP) mp1 + (soldCount + 7 +
-                                (fToolbar != FALSE) +
-                                (fDrivebar != FALSE) +
-                                (fSplitStatus != FALSE) +
-                                (fAutoView != FALSE) +
-                                ((fUserComboBox != FALSE) * 4) +
-                                (fUserComboBox != FALSE &&
-                                 fToolbar != FALSE));
-        *pswpNew = *pswpClient;
-        pswpNew->hwnd = hwndDate;
-        pswpNew->x = lastx + 3;
-        pswpNew->y = swpClient.y + (sheight + 6);
-        pswpNew->cx = (swpClient.cx / 6) + (swpClient.cx / 16) - 3;
-        lastx = pswpNew->x + pswpNew->cx;
-        pswpNew->cy = bheight;
-        sCount++;
-        pswpNew = (PSWP) mp1 + (soldCount + 8 +
-                                (fToolbar != FALSE) +
-                                (fDrivebar != FALSE) +
-                                (fSplitStatus != FALSE) +
-                                (fAutoView != FALSE) +
-                                ((fUserComboBox != FALSE) * 4) +
-                                (fUserComboBox != FALSE &&
-                                 fToolbar != FALSE));
-        *pswpNew = *pswpClient;
-        pswpNew->hwnd = hwndAttr;
-        pswpNew->x = lastx + 3;
-        pswpNew->y = swpClient.y + (sheight + 6);
-        pswpNew->cx = (swpClient.cx - pswpNew->x) - 1;
-        pswpNew->cy = bheight;
-        sCount++;
+        LONG lastx;
+
+        pswpNew = (PSWP) mp1 + (soldCount + 6 +
+                                (fToolbar != FALSE) +
+                                (fDrivebar != FALSE) +
+                                (fSplitStatus != FALSE) +
+                                (fAutoView != FALSE) +
+                                ((fUserComboBox != FALSE) * 4) +
+                                (fUserComboBox != FALSE &&
+                                 fToolbar != FALSE));
+        *pswpNew = *pswpClient;
+        pswpNew->hwnd = hwndName;
+        pswpNew->x = swpClient.x + 3;
+        pswpNew->y = swpClient.y + (sheight + 6);
+        pswpNew->cx = ((swpClient.cx / 2) + (swpClient.cx / 5)) - 3;
+        lastx = pswpNew->x + pswpNew->cx;
+        pswpNew->cy = bheight;
+        pswpClient->y += (bheight + 4);
+        pswpClient->cy -= (bheight + 4);
+        sCount++;
+        pswpNew = (PSWP) mp1 + (soldCount + 7 +
+                                (fToolbar != FALSE) +
+                                (fDrivebar != FALSE) +
+                                (fSplitStatus != FALSE) +
+                                (fAutoView != FALSE) +
+                                ((fUserComboBox != FALSE) * 4) +
+                                (fUserComboBox != FALSE &&
+                                 fToolbar != FALSE));
+        *pswpNew = *pswpClient;
+        pswpNew->hwnd = hwndDate;
+        pswpNew->x = lastx + 3;
+        pswpNew->y = swpClient.y + (sheight + 6);
+        pswpNew->cx = (swpClient.cx / 6) + (swpClient.cx / 16) - 3;
+        lastx = pswpNew->x + pswpNew->cx;
+        pswpNew->cy = bheight;
+        sCount++;
+        pswpNew = (PSWP) mp1 + (soldCount + 8 +
+                                (fToolbar != FALSE) +
+                                (fDrivebar != FALSE) +
+                                (fSplitStatus != FALSE) +
+                                (fAutoView != FALSE) +
+                                ((fUserComboBox != FALSE) * 4) +
+                                (fUserComboBox != FALSE &&
+                                 fToolbar != FALSE));
+        *pswpNew = *pswpClient;
+        pswpNew->hwnd = hwndAttr;
+        pswpNew->x = lastx + 3;
+        pswpNew->y = swpClient.y + (sheight + 6);
+        pswpNew->cx = (swpClient.cx - pswpNew->x) - 1;
+        pswpNew->cy = bheight;
+        sCount++;
       }
       else {
-        WinShowWindow(hwndAttr, FALSE);
-        WinShowWindow(hwndName, FALSE);
-        WinShowWindow(hwndDate, FALSE);
+        WinShowWindow(hwndAttr, FALSE);
+        WinShowWindow(hwndName, FALSE);
+        WinShowWindow(hwndDate, FALSE);
       }
       return MRFROMSHORT(sCount);
@@ -4551 +4601 @@
       sCount += 6;
       if (fSplitStatus)
-        sCount++;
+        sCount++;
       if (fToolbar)
-        sCount++;
+        sCount++;
       if (fUserComboBox) {
-        sCount += 4;
-        if (fToolbar)
-          sCount++;
+        sCount += 4;
+        if (fToolbar)
+          sCount++;
       }
       if (fDrivebar)
-        sCount++;
+        sCount++;
       if (fAutoView)
-        sCount++;
+        sCount++;
       if (fMoreButtons)
-        sCount += 3;
+        sCount += 3;
       return MRFROMSHORT(sCount);
     }
@@ -4585 +4635 @@
       // DbgMsg(pszSrcFile, __LINE__, "IDM_CONTEXTMENU %x", hwnd);
       if (hwnd != NULLHANDLE) {
-        HWND hwndParent = WinQueryWindow(hwnd, QW_PARENT);
-        USHORT id = WinQueryWindowUShort(hwndParent, QWS_ID);
-        switch (id) {
-        case MAIN_SETUPLIST:
-        case MAIN_USERLIST:
-        case MAIN_CMDLIST:
-          // DbgMsg(pszSrcFile, __LINE__, "WM_CONTEXTMENU");
-          WinPostMsg(hwnd, WM_CONTEXTMENU, 0, 0);
-        }
+        HWND hwndParent = WinQueryWindow(hwnd, QW_PARENT);
+        USHORT id = WinQueryWindowUShort(hwndParent, QWS_ID);
+        switch (id) {
+        case MAIN_SETUPLIST:
+        case MAIN_USERLIST:
+        case MAIN_CMDLIST:
+          // DbgMsg(pszSrcFile, __LINE__, "WM_CONTEXTMENU");
+          WinPostMsg(hwnd, WM_CONTEXTMENU, 0, 0);
+        }
       }
     }
@@ -4622 +4672 @@
       wa.size = sizeof(wa);
       pci =
-        (PCNRITEM)
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_QUERYRECORDEMPHASIS, MPFROMLONG(CMA_FIRST),
-                   MPFROMSHORT(CRA_CURSORED));
+        (PCNRITEM)
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_QUERYRECORDEMPHASIS, MPFROMLONG(CMA_FIRST),
+                   MPFROMSHORT(CRA_CURSORED));
       if (pci && (INT) pci != -1) {
-        strcpy(wa.szCurrentPath1, pci->pszFileName);
-        MakeValidDir(wa.szCurrentPath1);
+        strcpy(wa.szCurrentPath1, pci->pszFileName);
+        MakeValidDir(wa.szCurrentPath1);
       }
       else
-        strcpy(wa.szCurrentPath1, pFM2SaveDirectory);
+        strcpy(wa.szCurrentPath1, pFM2SaveDirectory);
       TopWindowName(hwndMain, (HWND) 0, wa.szCurrentPath2);
       if (!*wa.szCurrentPath2)
-        strcpy(wa.szCurrentPath2, wa.szCurrentPath1);
+        strcpy(wa.szCurrentPath2, wa.szCurrentPath1);
       MakeValidDir(wa.szCurrentPath2);
       if (WinDlgBox(HWND_DESKTOP,
-                    hwnd,
-                    WalkTwoCmpDlgProc,
-                    FM3ModHandle,
-                    WALK2_FRAME,
-                    MPFROMP(&wa)) &&
-          !IsFile(wa.szCurrentPath1) && !IsFile(wa.szCurrentPath2)) {
-        if (!*dircompare) {
-
-          COMPARE *cmp;
-
-          cmp = xmallocz(sizeof(COMPARE), pszSrcFile, __LINE__);
-          if (cmp) {
-            cmp->size = sizeof(COMPARE);
-            strcpy(cmp->leftdir, wa.szCurrentPath1);
-            strcpy(cmp->rightdir, wa.szCurrentPath2);
-            cmp->hwndParent = hwnd;
-            cmp->dcd.hwndParent = hwnd;
-            WinDlgBox(HWND_DESKTOP,
-                      HWND_DESKTOP,
-                      CompareDlgProc, FM3ModHandle, COMP_FRAME, MPFROMP(cmp));
-          }
-        }
-        else {
-
-          CHAR szPath1[CCHMAXPATH];
-          CHAR szPath2[CCHMAXPATH];
-          runemf2(SEPARATE,
-                  HWND_DESKTOP, pszSrcFile, __LINE__,
-                  NULL, NULL,
-                  "%s %s %s",
-                  dircompare,
-                  BldQuotedFileName(szPath1, wa.szCurrentPath1),
-                  BldQuotedFileName(szPath2, wa.szCurrentPath2));
-        }
+                    hwnd,
+                    WalkTwoCmpDlgProc,
+                    FM3ModHandle,
+                    WALK2_FRAME,
+                    MPFROMP(&wa)) &&
+          !IsFile(wa.szCurrentPath1) && !IsFile(wa.szCurrentPath2)) {
+        if (!*dircompare) {
+
+          COMPARE *cmp;
+
+          cmp = xmallocz(sizeof(COMPARE), pszSrcFile, __LINE__);
+          if (cmp) {
+            cmp->size = sizeof(COMPARE);
+            strcpy(cmp->leftdir, wa.szCurrentPath1);
+            strcpy(cmp->rightdir, wa.szCurrentPath2);
+            cmp->hwndParent = hwnd;
+            cmp->dcd.hwndParent = hwnd;
+            WinDlgBox(HWND_DESKTOP,
+                      HWND_DESKTOP,
+                      CompareDlgProc, FM3ModHandle, COMP_FRAME, MPFROMP(cmp));
+          }
+        }
+        else {
+
+          CHAR szPath1[CCHMAXPATH];
+          CHAR szPath2[CCHMAXPATH];
+          runemf2(SEPARATE,
+                  HWND_DESKTOP, pszSrcFile, __LINE__,
+                  NULL, NULL,
+                  "%s %s %s",
+                  dircompare,
+                  BldQuotedFileName(szPath1, wa.szCurrentPath1),
+                  BldQuotedFileName(szPath2, wa.szCurrentPath2));
+        }
       }
     }
@@ -4683 +4733 @@
   case IDM_CLI:
     if (fSplitStatus &&
-        hwndStatus2 &&
-        !WinIsWindow(WinQueryAnchorBlock(hwnd),
-                     WinWindowFromID(hwndStatus2, COMMAND_LINE)))
+        hwndStatus2 &&
+        !WinIsWindow(WinQueryAnchorBlock(hwnd),
+                     WinWindowFromID(hwndStatus2, COMMAND_LINE)))
       PostMsg(hwndStatus2, UM_CLICKED, MPVOID, MPVOID);
     break;
@@ -4698 +4748 @@
       bstrip(temp);
       if (*temp &&
-          !DosQueryPathInfo(temp, FIL_QUERYFULLNAME, path, sizeof(path))) {
-        if (SHORT1FROMMP(mp1) == IDM_ADDTOUSERLIST) {
-          add_udir(TRUE, path);
-          if (fUdirsChanged)
-            save_udirs();
-          WinSendMsg(hwnd, UM_FILLUSERLIST, MPVOID, MPVOID);
-        }
-        else {
-          if (!remove_udir(path))
-            Runtime_Error(pszSrcFile, __LINE__, "remove_udir");
-          else {
-            if (fUdirsChanged)
-              save_udirs();
-            WinSendMsg(hwnd, UM_FILLUSERLIST, MPVOID, MPVOID);
-          }
-        }
+          !DosQueryPathInfo(temp, FIL_QUERYFULLNAME, path, sizeof(path))) {
+        if (SHORT1FROMMP(mp1) == IDM_ADDTOUSERLIST) {
+          add_udir(TRUE, path);
+          if (fUdirsChanged)
+            save_udirs();
+          WinSendMsg(hwnd, UM_FILLUSERLIST, MPVOID, MPVOID);
+        }
+        else {
+          if (!remove_udir(path))
+            Runtime_Error(pszSrcFile, __LINE__, "remove_udir");
+          else {
+            if (fUdirsChanged)
+              save_udirs();
+            WinSendMsg(hwnd, UM_FILLUSERLIST, MPVOID, MPVOID);
+          }
+        }
       }
     }
@@ -4728 +4778 @@
       // Complain if attempting to use reserved name
       if (stricmp(szStateName, GetPString(IDS_STATETEXT)) == 0 ||
-          stricmp(szStateName, GetPString(IDS_FM2TEMPTEXT)) == 0)
+          stricmp(szStateName, GetPString(IDS_FM2TEMPTEXT)) == 0)
       {
-        saymsg(MB_ENTER | MB_ICONASTERISK, hwnd,
-               GetPString(IDS_WARNINGTEXT),
-               "\"%s\" is a reserved state name", szStateName);
+        saymsg(MB_ENTER | MB_ICONASTERISK, hwnd,
+               GetPString(IDS_WARNINGTEXT),
+               "\"%s\" is a reserved state name", szStateName);
       }
       // Ignore request if blank
       else if (*szStateName) {
-        BOOL fAbortOperation = FALSE;
-        if (!fNoSaveState && fSaveState && stricmp(szStateName, GetPString(IDS_SHUTDOWNSTATE)) == 0)
-         {
-          if (saymsg(MB_YESNO | MB_DEFBUTTON2 | MB_ICONASTERISK, hwnd,
-              GetPString(IDS_WARNINGTEXT),
-              GetPString(IDS_SHUTDOWNSTATE_WARNING), szStateName) == MBID_NO)
-              fAbortOperation = TRUE;
-        }
-        if (!fAbortOperation) {
-          if (SHORT1FROMMP(mp1) == IDM_SAVEDIRCNRSTATE) {
-            // Save
-            INT nSaved = SaveDirCnrState(hwnd, szStateName);
-            if (nSaved >= 0) {
-              INT ret = add_setup(szStateName);
-              if (ret == 0) {
-                WinSendMsg(hwndStatelist, LM_INSERTITEM,
-                           MPFROM2SHORT(LIT_SORTASCENDING, 0), MPFROMP(szStateName));
-                save_setups();
-              }
-              else if (ret != 1) {
-                saymsg(MB_ENTER | MB_ICONASTERISK, hwnd,
-                       GetPString(IDS_WARNINGTEXT),
-                       "\"%s\" state name add failed", szStateName);      // 15 Apr 07 SHL failed
-                WinSetWindowText(hwndStatelist, GetPString(IDS_STATETEXT));
-              }
-            }
-            else {
-              saymsg(MB_ENTER | MB_ICONASTERISK,
-                     hwnd,
-                     GetPString(IDS_WARNINGTEXT),
-                     "State data save failed");
-              WinSetWindowText(hwndStatelist, GetPString(IDS_STATETEXT));
-            }
-          }
-          else {
-            // Delete
-            ULONG numsaves = 0, size, x;
-            CHAR s[STATE_NAME_MAX_BYTES + 80];
-
-            INT ret = remove_setup(szStateName);
-            if (ret == 1)
-              save_setups();
-            sprintf(s, "%s.NumDirsLastTime", szStateName);
-            size = sizeof(ULONG);
-            if (!PrfQueryProfileData(fmprof,
-                                     FM3Str,
-                                     s,
-                                     (PVOID)&numsaves,
-                                     &size)) {
-              saymsg(MB_ENTER | MB_ICONASTERISK, hwnd,
-                     GetPString(IDS_WARNINGTEXT),
-                     GetPString(IDS_DOESNTEXISTTEXT), szStateName);
-            }
-            else if (!size)
-              Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
-            else {
-              PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0L);
-              for (x = 0; x < numsaves; x++) {
-                sprintf(s, "%s.DirCnrPos.%lu", szStateName, x);
-                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
-                sprintf(s, "%s.DirCnrDir.%lu", szStateName, x);
-                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
-                sprintf(s, "%s.DirCnrSort.%lu", szStateName, x);
-                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
-                sprintf(s, "%s.DirCnrFilter.%lu", szStateName, x);
-                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
-                sprintf(s, "%s.DirCnrView.%lu", szStateName, x);
-                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
-                sprintf(s, "%s.DirCnr.%lu.DetailsLongname", szStateName, x);
-                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
-                sprintf(s, "%s.DirCnr.%lu.DetailsSubject", szStateName, x);
-                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
-                sprintf(s, "%s.DirCnr.%lu.DetailsSize", szStateName, x);
-                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
-                sprintf(s, "%s.DirCnr.%lu.DetailsEA", szStateName, x);
-                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
-                sprintf(s, "%s.DirCnr.%lu.DetailsAttr", szStateName, x);
-                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
-                sprintf(s, "%s.DirCnr.%lu.DetailsIcon", szStateName, x);
-                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
-                sprintf(s, "%s.DirCnr.%lu.DetailsLWDate", szStateName, x);
-                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
-                sprintf(s, "%s.DirCnr.%lu.DetailsLWTime", szStateName, x);
-                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
-                sprintf(s, "%s.DirCnr.%lu.DetailsLADate", szStateName, x);
-                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
-                sprintf(s, "%s.DirCnr.%lu.DetailsLATime", szStateName, x);
-                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
-                sprintf(s, "%s.DirCnr.%lu.DetailsCRDate", szStateName, x);
-                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
-                sprintf(s, "%s.DirCnr.%lu.DetailsCRTime", szStateName, x);
-                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
-                sprintf(s, "%s.DirCnr.%lu.Backgroundcolor", szStateName, x);
-                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
-                sprintf(s, "%s.DirCnr.%lu.Fontnamesize", szStateName, x);
-                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
-              }
-              sprintf(s, "%s.LastTreePos", szStateName);
-              PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
-              sprintf(s, "%s.MySizeLastTime", szStateName);
-              PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
-            }
-            PostMsg(hwnd, UM_FILLSETUPLIST, MPVOID, MPVOID);
-          }
-        }
+        BOOL fAbortOperation = FALSE;
+        if (!fNoSaveState && fSaveState && stricmp(szStateName, GetPString(IDS_SHUTDOWNSTATE)) == 0)
+         {
+          if (saymsg(MB_YESNO | MB_DEFBUTTON2 | MB_ICONASTERISK, hwnd,
+              GetPString(IDS_WARNINGTEXT),
+              GetPString(IDS_SHUTDOWNSTATE_WARNING), szStateName) == MBID_NO)
+              fAbortOperation = TRUE;
+        }
+        if (!fAbortOperation) {
+          if (SHORT1FROMMP(mp1) == IDM_SAVEDIRCNRSTATE) {
+            // Save
+            INT nSaved = SaveDirCnrState(hwnd, szStateName);
+            if (nSaved >= 0) {
+              INT ret = add_setup(szStateName);
+              if (ret == 0) {
+                WinSendMsg(hwndStatelist, LM_INSERTITEM,
+                           MPFROM2SHORT(LIT_SORTASCENDING, 0), MPFROMP(szStateName));
+                save_setups();
+              }
+              else if (ret != 1) {
+                saymsg(MB_ENTER | MB_ICONASTERISK, hwnd,
+                       GetPString(IDS_WARNINGTEXT),
+                       "\"%s\" state name add failed", szStateName);      // 15 Apr 07 SHL failed
+                WinSetWindowText(hwndStatelist, GetPString(IDS_STATETEXT));
+              }
+            }
+            else {
+              saymsg(MB_ENTER | MB_ICONASTERISK,
+                     hwnd,
+                     GetPString(IDS_WARNINGTEXT),
+                     "State data save failed");
+              WinSetWindowText(hwndStatelist, GetPString(IDS_STATETEXT));
+            }
+          }
+          else {
+            // Delete
+            ULONG numsaves = 0, size, x;
+            CHAR s[STATE_NAME_MAX_BYTES + 80];
+
+            INT ret = remove_setup(szStateName);
+            if (ret == 1)
+              save_setups();
+            sprintf(s, "%s.NumDirsLastTime", szStateName);
+            size = sizeof(ULONG);
+            if (!PrfQueryProfileData(fmprof,
+                                     FM3Str,
+                                     s,
+                                     (PVOID)&numsaves,
+                                     &size)) {
+              saymsg(MB_ENTER | MB_ICONASTERISK, hwnd,
+                     GetPString(IDS_WARNINGTEXT),
+                     GetPString(IDS_DOESNTEXISTTEXT), szStateName);
+            }
+            else if (!size)
+              Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+            else {
+              PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0L);
+              for (x = 0; x < numsaves; x++) {
+                sprintf(s, "%s.DirCnrPos.%lu", szStateName, x);
+                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+                sprintf(s, "%s.DirCnrDir.%lu", szStateName, x);
+                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+                sprintf(s, "%s.DirCnrSort.%lu", szStateName, x);
+                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+                sprintf(s, "%s.DirCnrFilter.%lu", szStateName, x);
+                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+                sprintf(s, "%s.DirCnrView.%lu", szStateName, x);
+                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+                sprintf(s, "%s.DirCnr.%lu.DetailsLongname", szStateName, x);
+                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+                sprintf(s, "%s.DirCnr.%lu.DetailsSubject", szStateName, x);
+                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+                sprintf(s, "%s.DirCnr.%lu.DetailsSize", szStateName, x);
+                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+                sprintf(s, "%s.DirCnr.%lu.DetailsEA", szStateName, x);
+                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+                sprintf(s, "%s.DirCnr.%lu.DetailsAttr", szStateName, x);
+                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+                sprintf(s, "%s.DirCnr.%lu.DetailsIcon", szStateName, x);
+                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+                sprintf(s, "%s.DirCnr.%lu.DetailsLWDate", szStateName, x);
+                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+                sprintf(s, "%s.DirCnr.%lu.DetailsLWTime", szStateName, x);
+                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+                sprintf(s, "%s.DirCnr.%lu.DetailsLADate", szStateName, x);
+                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+                sprintf(s, "%s.DirCnr.%lu.DetailsLATime", szStateName, x);
+                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+                sprintf(s, "%s.DirCnr.%lu.DetailsCRDate", szStateName, x);
+                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+                sprintf(s, "%s.DirCnr.%lu.DetailsCRTime", szStateName, x);
+                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+                sprintf(s, "%s.DirCnr.%lu.Backgroundcolor", szStateName, x);
+                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+                sprintf(s, "%s.DirCnr.%lu.Fontnamesize", szStateName, x);
+                PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+              }
+              sprintf(s, "%s.LastTreePos", szStateName);
+              PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+              sprintf(s, "%s.MySizeLastTime", szStateName);
+              PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+            }
+            PostMsg(hwnd, UM_FILLSETUPLIST, MPVOID, MPVOID);
+          }
+        }
       }
     }
@@ -4853 +4903 @@
       WinQueryWindowPos(WinQueryWindow(hwnd, QW_PARENT), &swp);
       if (swp.fl & SWP_MAXIMIZE) {
-        WinSendMsg(WinQueryWindow(hwnd, QW_PARENT), WM_SYSCOMMAND,
-                   MPFROM2SHORT(SC_RESTORE, 0), MPVOID);
-        WinQueryWindowPos(WinQueryWindow(hwnd, QW_PARENT), &swp);
+        WinSendMsg(WinQueryWindow(hwnd, QW_PARENT), WM_SYSCOMMAND,
+                   MPFROM2SHORT(SC_RESTORE, 0), MPVOID);
+        WinQueryWindowPos(WinQueryWindow(hwnd, QW_PARENT), &swp);
       }
       WinGetMaxPosition(WinQueryWindow(hwnd, QW_PARENT), &swpD);
@@ -4863 +4913 @@
       swpD.cy -= (icz + bsz);
       if (swp.x == swpD.x && swp.y == swpD.y &&
-          swp.cx == swpD.cx && swp.cy == swpD.cy &&
-          // fixme to be #defined someday
-          WinQueryWindowUShort(hwnd, QWL_USER + 10) &&
-          WinQueryWindowUShort(hwnd, QWL_USER + 14)) {
-        swpD.x = WinQueryWindowUShort(hwnd, QWL_USER + 8);
-        swpD.cx = WinQueryWindowUShort(hwnd, QWL_USER + 10);
-        swpD.y = WinQueryWindowUShort(hwnd, QWL_USER + 12);
-        swpD.cy = WinQueryWindowUShort(hwnd, QWL_USER + 14);
+          swp.cx == swpD.cx && swp.cy == swpD.cy &&
+          // fixme to be #defined someday
+          WinQueryWindowUShort(hwnd, QWL_USER + 10) &&
+          WinQueryWindowUShort(hwnd, QWL_USER + 14)) {
+        swpD.x = WinQueryWindowUShort(hwnd, QWL_USER + 8);
+        swpD.cx = WinQueryWindowUShort(hwnd, QWL_USER + 10);
+        swpD.y = WinQueryWindowUShort(hwnd, QWL_USER + 12);
+        swpD.cy = WinQueryWindowUShort(hwnd, QWL_USER + 14);
       }
       else {
-        WinSetWindowUShort(hwnd, QWL_USER + 8, (USHORT) swp.x);
-        WinSetWindowUShort(hwnd, QWL_USER + 10, (USHORT) swp.cx);
-        WinSetWindowUShort(hwnd, QWL_USER + 12, (USHORT) swp.y);
-        WinSetWindowUShort(hwnd, QWL_USER + 14, (USHORT) swp.cy);
+        WinSetWindowUShort(hwnd, QWL_USER + 8, (USHORT) swp.x);
+        WinSetWindowUShort(hwnd, QWL_USER + 10, (USHORT) swp.cx);
+        WinSetWindowUShort(hwnd, QWL_USER + 12, (USHORT) swp.y);
+        WinSetWindowUShort(hwnd, QWL_USER + 14, (USHORT) swp.cy);
       }
       WinSetWindowPos(WinQueryWindow(hwnd, QW_PARENT), HWND_TOP,
-                      swpD.x, swpD.y, swpD.cx, swpD.cy, SWP_MOVE | SWP_SIZE);
+                      swpD.x, swpD.y, swpD.cx, swpD.cy, SWP_MOVE | SWP_SIZE);
     }
     break;
@@ -4885 +4935 @@
   case IDM_BLINK:
     WinSetWindowPos(WinQueryWindow(hwnd, QW_PARENT), HWND_TOP, 0, 0, 0, 0,
-                    SWP_MINIMIZE);
+                    SWP_MINIMIZE);
     WinSetWindowPos(WinQueryWindow(hwnd, QW_PARENT), HWND_TOP, 0, 0, 0, 0,
-                    SWP_RESTORE | SWP_ZORDER);
+                    SWP_RESTORE | SWP_ZORDER);
     break;
 
@@ -4895 +4945 @@
 
       if (hwndTop)
-        WinSetFocus(HWND_DESKTOP, hwndTop);
+        WinSetFocus(HWND_DESKTOP, hwndTop);
     }
     break;
@@ -4917 +4967 @@
   case IDM_QUICKSETTINGS:
     WinDlgBox(HWND_DESKTOP,
-              hwnd, CfgDlgProc, FM3ModHandle, CFG_FRAME, MPFROMLONG(mp1));
+              hwnd, CfgDlgProc, FM3ModHandle, CFG_FRAME, MPFROMLONG(mp1));
     break;
 
@@ -4923 +4973 @@
   case IDM_VIEWINFS:
     WinDlgBox(HWND_DESKTOP,
-              HWND_DESKTOP,
-              ViewInfProc,
-              FM3ModHandle,
-              VINF_FRAME,
-              ((SHORT1FROMMP(mp1) == IDM_VIEWHELPS) ?
-               MPFROMP(NullStr) : MPVOID));
+              HWND_DESKTOP,
+              ViewInfProc,
+              FM3ModHandle,
+              VINF_FRAME,
+              ((SHORT1FROMMP(mp1) == IDM_VIEWHELPS) ?
+               MPFROMP(NullStr) : MPVOID));
     break;
 
@@ -4938 +4988 @@
       TopWindowName(hwnd, (HWND) 0, newpath);
       if (WinDlgBox(HWND_DESKTOP,
-                    hwnd,
-                    WalkAllDlgProc,
-                    FM3ModHandle, WALK_FRAME, MPFROMP(newpath)) && *newpath)
-        OpenDirCnr((HWND) 0, hwndMain, hwndTree, FALSE, newpath);
+                    hwnd,
+                    WalkAllDlgProc,
+                    FM3ModHandle, WALK_FRAME, MPFROMP(newpath)) && *newpath)
+        OpenDirCnr((HWND) 0, hwndMain, hwndTree, FALSE, newpath);
     }
     break;
@@ -4962 +5012 @@
       if (SHORT1FROMMP(mp2) == CMDSRC_MENU) {
 
-        RECTL rcl;
-        ULONG icz = WinQuerySysValue(HWND_DESKTOP, SV_CYICON) * 2L;
-
-        WinQueryWindowRect(HWND_DESKTOP, &rcl);
-        rcl.yBottom += icz;
-        rcl.yTop -= icz;
-        rcl.xLeft += icz;
-        rcl.xRight -= icz;
-        WinSendMsg(hwndHelp, HM_SET_COVERPAGE_SIZE, MPFROMP(&rcl), MPVOID);
+        RECTL rcl;
+        ULONG icz = WinQuerySysValue(HWND_DESKTOP, SV_CYICON) * 2L;
+
+        WinQueryWindowRect(HWND_DESKTOP, &rcl);
+        rcl.yBottom += icz;
+        rcl.yTop -= icz;
+        rcl.xLeft += icz;
+        rcl.xRight -= icz;
+        WinSendMsg(hwndHelp, HM_SET_COVERPAGE_SIZE, MPFROMP(&rcl), MPVOID);
       }
       else {
 
-        RECTL rcl;
-
-        WinQueryWindowRect(HWND_DESKTOP, &rcl);
-        rcl.yBottom += 8;
-        rcl.yTop = (rcl.yTop / 2) + (rcl.yTop / 7);
-        rcl.xLeft = (rcl.xRight / 2) - (rcl.xRight / 7);
-        rcl.xRight -= 8;
-        WinSendMsg(hwndHelp, HM_SET_COVERPAGE_SIZE, MPFROMP(&rcl), MPVOID);
+        RECTL rcl;
+
+        WinQueryWindowRect(HWND_DESKTOP, &rcl);
+        rcl.yBottom += 8;
+        rcl.yTop = (rcl.yTop / 2) + (rcl.yTop / 7);
+        rcl.xLeft = (rcl.xRight / 2) - (rcl.xRight / 7);
+        rcl.xRight -= 8;
+        WinSendMsg(hwndHelp, HM_SET_COVERPAGE_SIZE, MPFROMP(&rcl), MPVOID);
       }
       switch (SHORT1FROMMP(mp1)) {
       case IDM_HELPCONTEXT:
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CONTEXT, 0), MPFROMSHORT(HM_RESOURCEID));
-        break;
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CONTEXT, 0), MPFROMSHORT(HM_RESOURCEID));
+        break;
 
       case IDM_HELPMOUSE:
-        if (hwndHelp)
-          WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                     MPFROM2SHORT(HELP_MOUSE, 0), MPFROMSHORT(HM_RESOURCEID));
-        break;
+        if (hwndHelp)
+          WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                     MPFROM2SHORT(HELP_MOUSE, 0), MPFROMSHORT(HM_RESOURCEID));
+        break;
 
       case IDM_HELPPIX:
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_BITMAP1, 0), MPFROMSHORT(HM_RESOURCEID));
-        break;
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_BITMAP1, 0), MPFROMSHORT(HM_RESOURCEID));
+        break;
 
       case IDM_HELPTUTOR:
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_TUTORIAL, 0),
-                   MPFROMSHORT(HM_RESOURCEID));
-        break;
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_TUTORIAL, 0),
+                   MPFROMSHORT(HM_RESOURCEID));
+        break;
 
       case IDM_HELPHINTS:
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_HINTS, 0), MPFROMSHORT(HM_RESOURCEID));
-        break;
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_HINTS, 0), MPFROMSHORT(HM_RESOURCEID));
+        break;
 
       case IDM_HELPGENERAL:
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_MAIN, 0), MPFROMSHORT(HM_RESOURCEID));
-        break;
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_MAIN, 0), MPFROMSHORT(HM_RESOURCEID));
+        break;
       case IDM_HELPKEYS:
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_KEYS, 0), MPFROMSHORT(HM_RESOURCEID));
-        break;
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_KEYS, 0), MPFROMSHORT(HM_RESOURCEID));
+        break;
 
       case IDM_HELP:
       case IDM_HELPCONTENTS:
-        WinSendMsg(hwndHelp, HM_HELP_CONTENTS, MPVOID, MPVOID);
-        break;
+        WinSendMsg(hwndHelp, HM_HELP_CONTENTS, MPVOID, MPVOID);
+        break;
 
       case IDM_HELPUSERLIST:
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_USERLISTS, 0),
-                   MPFROMSHORT(HM_RESOURCEID));
-        break;
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_USERLISTS, 0),
+                   MPFROMSHORT(HM_RESOURCEID));
+        break;
       }
     }
@@ -5040 +5090 @@
   case IDM_ABOUT:
     WinDlgBox(HWND_DESKTOP, hwnd, AboutDlgProc, FM3ModHandle,
-              ABT_FRAME, MPVOID);
+              ABT_FRAME, MPVOID);
     break;
 
@@ -5054 +5104 @@
 
       if (!DosQuerySysInfo(QSV_VERSION_MAJOR, QSV_VERSION_MINOR,
-                           (PVOID) & version, (ULONG) sizeof(version))) {
-        if (version[0] > 20L || (version[0] == 20L && version[1] > 29L)) {
-          if (SHORT1FROMMP(mp1) == IDM_HICOLORPALETTE)
-            palette = "<WP_HIRESCLRPAL>";
-          else
-            palette = "<WP_LORESCLRPAL>";
-        }
+                           (PVOID) & version, (ULONG) sizeof(version))) {
+        if (version[0] > 20L || (version[0] == 20L && version[1] > 29L)) {
+          if (SHORT1FROMMP(mp1) == IDM_HICOLORPALETTE)
+            palette = "<WP_HIRESCLRPAL>";
+          else
+            palette = "<WP_LORESCLRPAL>";
+        }
       }
       OpenObject(palette, Default, hwnd);
@@ -5076 +5126 @@
       hWPSObject = WinQueryObject("<WP_SCHPAL>");
       if (hWPSObject != NULLHANDLE)
-        WinSetObjectData(hWPSObject, "SCHEMES=Winter:PM_Winter,"
-                         "Spring:PM_Spring,Summer:PM_Summer,"
-                         "System:PM_System,Windows:PM_Windows;"
-                         "OPEN=DEFAULT");
+        WinSetObjectData(hWPSObject, "SCHEMES=Winter:PM_Winter,"
+                         "Spring:PM_Spring,Summer:PM_Summer,"
+                         "System:PM_System,Windows:PM_Windows;"
+                         "OPEN=DEFAULT");
     }
     break;
@@ -5090 +5140 @@
   case IDM_SYSINFO:
     WinDlgBox(HWND_DESKTOP, HWND_DESKTOP, SysInfoDlgProc, FM3ModHandle,
-              SYS_FRAME, NULL);
+              SYS_FRAME, NULL);
     break;
 #endif
@@ -5100 +5150 @@
 
       if (hwndTree)
-        pci = (PCNRITEM) WinSendMsg(hwndTree, CM_QUERYRECORDEMPHASIS,
-                                    MPFROMLONG(CMA_FIRST),
-                                    MPFROMSHORT(CRA_CURSORED));
+        pci = (PCNRITEM) WinSendMsg(hwndTree, CM_QUERYRECORDEMPHASIS,
+                                    MPFROMLONG(CMA_FIRST),
+                                    MPFROMSHORT(CRA_CURSORED));
       if (pci && (INT) pci != -1) {
-        strcpy(path, pci->pszFileName);
-        MakeValidDir(path);
+        strcpy(path, pci->pszFileName);
+        MakeValidDir(path);
       }
       else
-        strcpy(path, pFM2SaveDirectory);
+        strcpy(path, pFM2SaveDirectory);
       WinDlgBox(HWND_DESKTOP, hwnd, InstantDlgProc, FM3ModHandle,
-                BAT_FRAME, MPFROMP(path));
+                BAT_FRAME, MPFROMP(path));
     }
     break;
@@ -5124 +5174 @@
       TopWindowName(hwnd, (HWND) 0, path);
       if (SHORT1FROMMP(mp1) == IDM_DOSCOMMANDLINE)
-        env = GetCmdSpec(TRUE);
+        env = GetCmdSpec(TRUE);
       else if (SHORT1FROMMP(mp1) != IDM_COMMANDLINE) {
-        env = "WINOS2.COM";
-        type = SEPARATE | FULLSCREEN;
+        env = "WINOS2.COM";
+        type = SEPARATE | FULLSCREEN;
       }
       runemf2(type, hwnd, pszSrcFile, __LINE__,
-              path, NULL, "%s", env);
+              path, NULL, "%s", env);
     }
     break;
@@ -5136 +5186 @@
   case IDM_KILLPROC:
     WinDlgBox(HWND_DESKTOP, hwnd, KillDlgProc, FM3ModHandle,
-              KILL_FRAME, NULL);
+              KILL_FRAME, NULL);
     break;
 
@@ -5151 +5201 @@
   case IDM_AUTOVIEW:
     SetMenuCheck(WinQueryWindowULong(hwnd, QWL_USER), SHORT1FROMMP(mp1),
-                 &fAutoView, TRUE, "AutoView");
+                 &fAutoView, TRUE, "AutoView");
   AutoChange:
     PostMsg(WinQueryWindow(hwnd, QW_PARENT), WM_UPDATEFRAME,
-            MPFROMLONG(FCF_SIZEBORDER), MPVOID);
+            MPFROMLONG(FCF_SIZEBORDER), MPVOID);
     if (fAutoView) {
 
@@ -5163 +5213 @@
       hwndDir = TopWindowName(hwnd, (HWND) 0, s);
       if (hwndDir) {
-        hwndDir = WinWindowFromID(hwndDir, FID_CLIENT);
-        if (hwndDir) {
-          hwndDir = WinWindowFromID(hwndDir, DIR_CNR);
-          if (hwndDir) {
-            pci = (PCNRITEM) WinSendMsg(hwndDir, CM_QUERYRECORDEMPHASIS,
-                                        MPFROMLONG(CMA_FIRST),
-                                        MPFROMSHORT(CRA_CURSORED));
-            if (pci && (INT) pci != -1 &&
-                (!(driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_SLOW)))
-              WinSendMsg(hwnd,
-                         UM_LOADFILE,
-                         MPFROMP(pci->pszFileName),
-                         (SHORT1FROMMP(mp1) == IDM_AUTOVIEW) ?
-                         MPVOID : MPFROMLONG(1));
-          }
-        }
+        hwndDir = WinWindowFromID(hwndDir, FID_CLIENT);
+        if (hwndDir) {
+          hwndDir = WinWindowFromID(hwndDir, DIR_CNR);
+          if (hwndDir) {
+            pci = (PCNRITEM) WinSendMsg(hwndDir, CM_QUERYRECORDEMPHASIS,
+                                        MPFROMLONG(CMA_FIRST),
+                                        MPFROMSHORT(CRA_CURSORED));
+            if (pci && (INT) pci != -1 &&
+                (!(driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_SLOW)))
+              WinSendMsg(hwnd,
+                         UM_LOADFILE,
+                         MPFROMP(pci->pszFileName),
+                         (SHORT1FROMMP(mp1) == IDM_AUTOVIEW) ?
+                         MPVOID : MPFROMLONG(1));
+          }
+        }
       }
     }
@@ -5185 +5235 @@
   case IDM_TEXTTOOLS:
     SetMenuCheck(WinQueryWindowULong(hwnd, QWL_USER), SHORT1FROMMP(mp1),
-                 &fTextTools, TRUE, "TextTools");
+                 &fTextTools, TRUE, "TextTools");
     PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
     PostMsg(WinQueryWindow(hwnd, QW_PARENT), WM_UPDATEFRAME,
-            MPFROMLONG(FCF_SIZEBORDER), MPVOID);
+            MPFROMLONG(FCF_SIZEBORDER), MPVOID);
     break;
 
   case IDM_TOOLTITLES:
     SetMenuCheck(WinQueryWindowULong(hwnd, QWL_USER), SHORT1FROMMP(mp1),
-                 &fToolTitles, TRUE, "ToolTitles");
+                 &fToolTitles, TRUE, "ToolTitles");
     PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
     PostMsg(WinQueryWindow(hwnd, QW_PARENT), WM_UPDATEFRAME,
-            MPFROMLONG(FCF_SIZEBORDER), MPVOID);
+            MPFROMLONG(FCF_SIZEBORDER), MPVOID);
     break;
 
@@ -5204 +5254 @@
       MenuInvisible = MenuInvisible ? FALSE : TRUE;
       if (MenuInvisible) {
-        WinSetParent(hwndMenu, HWND_OBJECT, FALSE);
-        WinSetMenuItemText(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-                                           FID_SYSMENU), IDM_HIDEMENU,
-                           GetPString(IDS_UNHIDEMENUTEXT));
+        WinSetParent(hwndMenu, HWND_OBJECT, FALSE);
+        WinSetMenuItemText(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
+                                           FID_SYSMENU), IDM_HIDEMENU,
+                           GetPString(IDS_UNHIDEMENUTEXT));
       }
       else {
-        WinSetParent(hwndMenu, WinQueryWindow(hwnd, QW_PARENT), FALSE);
-        WinSetMenuItemText(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-                                           FID_SYSMENU), IDM_HIDEMENU,
-                           GetPString(IDS_HIDEMENUTEXT));
+        WinSetParent(hwndMenu, WinQueryWindow(hwnd, QW_PARENT), FALSE);
+        WinSetMenuItemText(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
+                                           FID_SYSMENU), IDM_HIDEMENU,
+                           GetPString(IDS_HIDEMENUTEXT));
       }
       PostMsg(WinQueryWindow(hwnd, QW_PARENT), WM_UPDATEFRAME,
-              MPFROMLONG(FCF_MENU), MPVOID);
+              MPFROMLONG(FCF_MENU), MPVOID);
       PrfWriteProfileData(fmprof, FM3Str, "MenuInvisible",
-                          &MenuInvisible, sizeof(BOOL));
+                          &MenuInvisible, sizeof(BOOL));
     }
     break;
@@ -5231 +5281 @@
 
       if (Collector)
-        already = TRUE;
+        already = TRUE;
       if (!already && !fAutoTile && !fExternalCollector)
-        GetNextWindowPos(hwnd, &swp, NULL, NULL);
+        GetNextWindowPos(hwnd, &swp, NULL, NULL);
       hwndC = StartCollector(fExternalCollector ? HWND_DESKTOP : hwnd, 4);
       if (hwndC) {
-        if (!already && !fAutoTile && !fExternalCollector)
-          WinSetWindowPos(hwndC, HWND_TOP,
-                          swp.x, swp.y, swp.cx, swp.cy,
-                          SWP_MOVE | SWP_SIZE | SWP_SHOW | SWP_ZORDER);
-        else if (fAutoTile && !already)
-          TileChildren(hwnd, TRUE);
-        WinSetWindowPos(hwndC, HWND_TOP, 0, 0, 0, 0, SWP_SHOW | SWP_RESTORE |
-                        SWP_ACTIVATE);
-        if (SHORT1FROMMP(mp1) == IDM_GREP)
-          PostMsg(WinWindowFromID(hwndC, FID_CLIENT), WM_COMMAND,
-                  MPFROM2SHORT(IDM_GREP, 0), MPVOID);
-        if (SHORT1FROMMP(mp1) == IDM_SEEALL)
-          PostMsg(WinWindowFromID(hwndC, FID_CLIENT), WM_COMMAND,
-                  MPFROM2SHORT(IDM_SEEALL, 0), MPVOID);
+        if (!already && !fAutoTile && !fExternalCollector)
+          WinSetWindowPos(hwndC, HWND_TOP,
+                          swp.x, swp.y, swp.cx, swp.cy,
+                          SWP_MOVE | SWP_SIZE | SWP_SHOW | SWP_ZORDER);
+        else if (fAutoTile && !already)
+          TileChildren(hwnd, TRUE);
+        WinSetWindowPos(hwndC, HWND_TOP, 0, 0, 0, 0, SWP_SHOW | SWP_RESTORE |
+                        SWP_ACTIVATE);
+        if (SHORT1FROMMP(mp1) == IDM_GREP)
+          PostMsg(WinWindowFromID(hwndC, FID_CLIENT), WM_COMMAND,
+                  MPFROM2SHORT(IDM_GREP, 0), MPVOID);
+        if (SHORT1FROMMP(mp1) == IDM_SEEALL)
+          PostMsg(WinWindowFromID(hwndC, FID_CLIENT), WM_COMMAND,
+                  MPFROM2SHORT(IDM_SEEALL, 0), MPVOID);
       }
     }
@@ -5260 +5310 @@
 
       if (!toolhead || !toolhead->next) {
-        firsttool = (toolhead) ? toolhead->id : 0;
-        break;
+        firsttool = (toolhead) ? toolhead->id : 0;
+        break;
       }
       tool = find_tool(firsttool);
       if (!tool)
-        tool = toolhead;
+        tool = toolhead;
       if (SHORT1FROMMP(mp1) == IDM_TOOLRIGHT) {
-        tool = prev_tool(tool, TRUE);
-        firsttool = tool->id;
+        tool = prev_tool(tool, TRUE);
+        firsttool = tool->id;
       }
       else {
-        tool = next_tool(tool, TRUE);
-        firsttool = tool->id;
+        tool = next_tool(tool, TRUE);
+        firsttool = tool->id;
       }
       ResizeTools(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-                                  MAIN_TOOLS));
+                                  MAIN_TOOLS));
     }
     break;
@@ -5285 +5335 @@
   case IDM_TOOLBAR:
     SetMenuCheck(WinQueryWindowULong(hwnd, QWL_USER),
-                 IDM_TOOLSUBMENU, &fToolbar, TRUE, "Toolbar");
+                 IDM_TOOLSUBMENU, &fToolbar, TRUE, "Toolbar");
     PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
     WinShowWindow(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-                                  MAIN_TOOLS), fToolbar);
+                                  MAIN_TOOLS), fToolbar);
     WinSendMsg(WinQueryWindow(hwnd, QW_PARENT),
-               WM_UPDATEFRAME, MPFROMLONG(FCF_SIZEBORDER), MPVOID);
+               WM_UPDATEFRAME, MPFROMLONG(FCF_SIZEBORDER), MPVOID);
     if (fDrivebar)
       WinInvalidateRect(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-                                        MAIN_DRIVES), NULL, TRUE);
+                                        MAIN_DRIVES), NULL, TRUE);
     break;
 
   case IDM_DRIVEBAR:
     SetMenuCheck(WinQueryWindowULong(hwnd, QWL_USER),
-                 IDM_DRIVEBAR, &fDrivebar, TRUE, "Drivebar");
+                 IDM_DRIVEBAR, &fDrivebar, TRUE, "Drivebar");
     WinShowWindow(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-                                  MAIN_DRIVES), fDrivebar);
+                                  MAIN_DRIVES), fDrivebar);
     PostMsg(WinQueryWindow(hwnd, QW_PARENT),
-            WM_UPDATEFRAME, MPFROMLONG(FCF_SIZEBORDER), MPVOID);
+            WM_UPDATEFRAME, MPFROMLONG(FCF_SIZEBORDER), MPVOID);
     PostMsg(hwnd, UM_BUILDDRIVEBAR, MPVOID, MPVOID);
     break;
@@ -5308 +5358 @@
   case IDM_USERLIST:
     SetMenuCheck(WinQueryWindowULong(hwnd, QWL_USER),
-                 SHORT1FROMMP(mp1), &fUserComboBox, TRUE, "UserComboBox");
+                 SHORT1FROMMP(mp1), &fUserComboBox, TRUE, "UserComboBox");
     WinShowWindow(hwndUserlist, fUserComboBox);
     PostMsg(WinQueryWindow(hwnd, QW_PARENT),
-            WM_UPDATEFRAME, MPFROMLONG(FCF_SIZEBORDER), MPVOID);
+            WM_UPDATEFRAME, MPFROMLONG(FCF_SIZEBORDER), MPVOID);
     PostMsg(hwnd, UM_FILLUSERLIST, MPVOID, MPVOID);
     PostMsg(hwnd, UM_FILLSETUPLIST, MPVOID, MPVOID);
@@ -5323 +5373 @@
     WinSetWindowText(hwndAttr, NullStr);
     SetMenuCheck(WinQueryWindowULong(hwnd, QWL_USER),
-                 SHORT1FROMMP(mp1), &fMoreButtons, TRUE, "MoreButtons");
+                 SHORT1FROMMP(mp1), &fMoreButtons, TRUE, "MoreButtons");
     if (fMoreButtons) {
 
@@ -5331 +5381 @@
 
       if (hwndTemp) {
-        WinSetFocus(HWND_DESKTOP, hwnd);
-        WinSetFocus(HWND_DESKTOP, hwndTemp);
+        WinSetFocus(HWND_DESKTOP, hwnd);
+        WinSetFocus(HWND_DESKTOP, hwndTemp);
       }
     }
     PostMsg(WinQueryWindow(hwnd, QW_PARENT),
-            WM_UPDATEFRAME, MPFROMLONG(FCF_SIZEBORDER), MPVOID);
+            WM_UPDATEFRAME, MPFROMLONG(FCF_SIZEBORDER), MPVOID);
     break;
 
   case IDM_TOGGLEDRAGDIALOG:
     SetMenuCheck(WinQueryWindowULong(hwnd, QWL_USER),
-                 IDM_TOGGLEDRAGDIALOG,
-                 &fDragndropDlg,
-                 TRUE,
-                 "Drag&DropDlg");
+                 IDM_TOGGLEDRAGDIALOG,
+                 &fDragndropDlg,
+                 TRUE,
+                 "Drag&DropDlg");
     break;
 
   case IDM_SYNCUPDATES:
     SetMenuCheck(WinQueryWindowULong(hwnd, QWL_USER),
-                 IDM_SYNCUPDATES,
-                 &fSyncUpdates,
-                 TRUE,
-                 "SyncUpdates");
+                 IDM_SYNCUPDATES,
+                 &fSyncUpdates,
+                 TRUE,
+                 "SyncUpdates");
     break;
 
@@ -5362 +5412 @@
       WinQueryWindowPos(hwnd, &swp);
       WinSetWindowPos(hwndTree, HWND_TOP, 0, swp.cy - swpT.cy, 0, 0,
-                      SWP_MOVE);
+                      SWP_MOVE);
     }
     SetMenuCheck(WinQueryWindowULong(hwnd, QWL_USER), SHORT1FROMMP(mp1),
-                 &fFreeTree, TRUE, "FreeTree");
+                 &fFreeTree, TRUE, "FreeTree");
     if (fAutoTile)
       TileChildren(hwnd, TRUE);
@@ -5372 +5422 @@
   case IDM_AUTOTILE:
     SetMenuCheck(WinQueryWindowULong(hwnd, QWL_USER),
-                 SHORT1FROMMP(mp1), &fAutoTile, TRUE, "AutoTile");
+                 SHORT1FROMMP(mp1), &fAutoTile, TRUE, "AutoTile");
     if (fAutoTile)
       TileChildren(hwnd, TRUE);
@@ -5379 +5429 @@
   case IDM_TILEBACKWARDS:
     SetMenuCheck(WinQueryWindowULong(hwnd, QWL_USER),
-                 SHORT1FROMMP(mp1), &fTileBackwards, TRUE, "TileBackwards");
+                 SHORT1FROMMP(mp1), &fTileBackwards, TRUE, "TileBackwards");
     if (fAutoTile)
       TileChildren(hwnd, TRUE);
@@ -5424 +5474 @@
   default:
     if (!SwitchCommand((HWND) WinQueryWindowULong(hwnd, QWL_USER),
-                       SHORT1FROMMP(mp1))) {
+                       SHORT1FROMMP(mp1))) {
       if (SHORT1FROMMP(mp1) >= IDM_COMMANDSTART &&
-          SHORT1FROMMP(mp1) < IDM_QUICKTOOLSTART) {
-
-        INT x;
-        HWND hwndCnr;
-
-        if (!cmdloaded)
-          load_commands();
-        hwndCnr = TopWindow(hwnd, (HWND) 0);
-        hwndCnr = (HWND) WinSendMsg(WinWindowFromID(hwndCnr, FID_CLIENT),
-                                    UM_CONTAINERHWND, MPVOID, MPVOID);
-        if (!hwndCnr) {
-          Runtime_Error2(pszSrcFile, __LINE__, IDS_NOWINDOWTEXT);
-          break;
-        }
-        x = SHORT1FROMMP(mp1) - IDM_COMMANDSTART;
-        if (x >= 0) {
-          x++;
-          RunCommand(hwndCnr, x);
-          if (fUnHilite) {
-
-            PCNRITEM pci;
-            DIRCNRDATA *dcd = NULL;
-
-            // 12 May 07 SHL fixme to understand? backwards maybe? looking for DIR_CNR?
-            if (WinQueryWindowUShort(hwndCnr, QWS_ID) != TREE_CNR)
-              dcd = INSTDATA(hwndCnr);
-            pci = (PCNRITEM) WinSendMsg(hwndCnr,
-                                        CM_QUERYRECORDEMPHASIS,
-                                        MPFROMLONG(CMA_FIRST),
-                                        MPFROMSHORT(CRA_CURSORED));
-            if (pci && (INT) pci != -1 &&
-                (pci->rc.flRecordAttr & CRA_SELECTED))
-            {
-              UnHilite(hwnd,
-                       TRUE,
-                       dcd ? &dcd->lastselection : NULL,
-                       dcd ? dcd ->ulItemsToUnHilite : 0);
-            }
-          }
-        }
+          SHORT1FROMMP(mp1) < IDM_QUICKTOOLSTART) {
+
+        INT x;
+        HWND hwndCnr;
+
+        if (!cmdloaded)
+          load_commands();
+        hwndCnr = TopWindow(hwnd, (HWND) 0);
+        hwndCnr = (HWND) WinSendMsg(WinWindowFromID(hwndCnr, FID_CLIENT),
+                                    UM_CONTAINERHWND, MPVOID, MPVOID);
+        if (!hwndCnr) {
+          Runtime_Error2(pszSrcFile, __LINE__, IDS_NOWINDOWTEXT);
+          break;
+        }
+        x = SHORT1FROMMP(mp1) - IDM_COMMANDSTART;
+        if (x >= 0) {
+          x++;
+          RunCommand(hwndCnr, x);
+          if (fUnHilite) {
+
+            PCNRITEM pci;
+            DIRCNRDATA *dcd = NULL;
+
+            // 12 May 07 SHL fixme to understand? backwards maybe? looking for DIR_CNR?
+            if (WinQueryWindowUShort(hwndCnr, QWS_ID) != TREE_CNR)
+              dcd = INSTDATA(hwndCnr);
+            pci = (PCNRITEM) WinSendMsg(hwndCnr,
+                                        CM_QUERYRECORDEMPHASIS,
+                                        MPFROMLONG(CMA_FIRST),
+                                        MPFROMSHORT(CRA_CURSORED));
+            if (pci && (INT) pci != -1 &&
+                (pci->rc.flRecordAttr & CRA_SELECTED))
+            {
+              UnHilite(hwnd,
+                       TRUE,
+                       dcd ? &dcd->lastselection : NULL,
+                       dcd ? dcd ->ulItemsToUnHilite : 0);
+            }
+          }
+        }
       }
       else if (SHORT1FROMMP(mp1) >= IDM_QUICKTOOLSTART &&
-               SHORT1FROMMP(mp1) < IDM_QUICKTOOLSTART + 51) {
-        if (!qtloaded)
-          load_quicktools();
-        if (quicktool[SHORT1FROMMP(mp1) - IDM_QUICKTOOLSTART - 1]) {
-          if (fToolsChanged)
-            save_tools(NULL);
-          if (!load_tools(quicktool[SHORT1FROMMP(mp1) - IDM_QUICKTOOLSTART - 1]))
-            load_tools(NULL);
-          else {
-            strcpy(lasttoolbar,
-                   quicktool[SHORT1FROMMP(mp1) - IDM_QUICKTOOLSTART - 1]);
-            PrfWriteProfileString(fmprof, FM3Str, "LastToolbar", lasttoolbar);
-          }
-          PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
-        }
+               SHORT1FROMMP(mp1) < IDM_QUICKTOOLSTART + 51) {
+        if (!qtloaded)
+          load_quicktools();
+        if (quicktool[SHORT1FROMMP(mp1) - IDM_QUICKTOOLSTART - 1]) {
+          if (fToolsChanged)
+            save_tools(NULL);
+          if (!load_tools(quicktool[SHORT1FROMMP(mp1) - IDM_QUICKTOOLSTART - 1]))
+            load_tools(NULL);
+          else {
+            strcpy(lasttoolbar,
+                   quicktool[SHORT1FROMMP(mp1) - IDM_QUICKTOOLSTART - 1]);
+            PrfWriteProfileString(fmprof, FM3Str, "LastToolbar", lasttoolbar);
+          }
+          PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
+        }
       }
       else {
 
-        HWND hwndActive;
-
-        hwndActive = TopWindow(hwnd, (HWND) 0);
-        if (hwndActive)
-          PostMsg(WinWindowFromID(hwndActive, FID_CLIENT),
-                  WM_COMMAND, mp1, mp2);
+        HWND hwndActive;
+
+        hwndActive = TopWindow(hwnd, (HWND) 0);
+        if (hwndActive)
+          PostMsg(WinWindowFromID(hwndActive, FID_CLIENT),
+                  WM_COMMAND, mp1, mp2);
       }
     }
@@ -5500 +5550 @@
 
 static MRESULT EXPENTRY MainWMOnce(HWND hwnd, ULONG msg, MPARAM mp1,
-                                   MPARAM mp2)
+                                   MPARAM mp2)
 {
   TID tid;
@@ -5523 +5573 @@
     if (_beginthread(MakeMainObjWin, NULL, 245760, MPVOID) == -1) {
       Runtime_Error(pszSrcFile, __LINE__,
-                    GetPString(IDS_COULDNTSTARTTHREADTEXT));
+                    GetPString(IDS_COULDNTSTARTTHREADTEXT));
       PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);
       return 0;
@@ -5542 +5592 @@
 
     if (!WinCreateWindow(hwndFrame,
-                         WC_BUTTON,
-                         "I",
-                         WS_VISIBLE | BS_PUSHBUTTON | BS_NOPOINTERFOCUS,
-                         ((swp.cx -
-                           WinQuerySysValue(HWND_DESKTOP,
-                                            SV_CXMINMAXBUTTON)) -
-                          WinQuerySysValue(HWND_DESKTOP,
-                                           SV_CXMINMAXBUTTON) / 2) -
-                         WinQuerySysValue(HWND_DESKTOP,
-                                          SV_CXSIZEBORDER),
-                         (swp.cy - WinQuerySysValue(HWND_DESKTOP,
-                                                    SV_CYMINMAXBUTTON)) -
-                         WinQuerySysValue(HWND_DESKTOP,
-                                          SV_CYSIZEBORDER),
-                         WinQuerySysValue(HWND_DESKTOP,
-                                          SV_CXMINMAXBUTTON) / 2,
-                         WinQuerySysValue(HWND_DESKTOP,
-                                          SV_CYMINMAXBUTTON),
-                         hwnd, HWND_TOP, IDM_IDEALSIZE, NULL, NULL)) {
+                         WC_BUTTON,
+                         "I",
+                         WS_VISIBLE | BS_PUSHBUTTON | BS_NOPOINTERFOCUS,
+                         ((swp.cx -
+                           WinQuerySysValue(HWND_DESKTOP,
+                                            SV_CXMINMAXBUTTON)) -
+                          WinQuerySysValue(HWND_DESKTOP,
+                                           SV_CXMINMAXBUTTON) / 2) -
+                         WinQuerySysValue(HWND_DESKTOP,
+                                          SV_CXSIZEBORDER),
+                         (swp.cy - WinQuerySysValue(HWND_DESKTOP,
+                                                    SV_CYMINMAXBUTTON)) -
+                         WinQuerySysValue(HWND_DESKTOP,
+                                          SV_CYSIZEBORDER),
+                         WinQuerySysValue(HWND_DESKTOP,
+                                          SV_CXMINMAXBUTTON) / 2,
+                         WinQuerySysValue(HWND_DESKTOP,
+                                          SV_CYMINMAXBUTTON),
+                         hwnd, HWND_TOP, IDM_IDEALSIZE, NULL, NULL)) {
       Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     }
     else {
       WinSubclassWindow(WinWindowFromID(hwndFrame, IDM_IDEALSIZE),
-                        IdealButtonProc);
+                        IdealButtonProc);
       SetPresParams(WinWindowFromID(hwndFrame,
-                                    IDM_IDEALSIZE),
-                    NULL, NULL, NULL, GetPString(IDS_10SYSTEMVIOTEXT));
+                                    IDM_IDEALSIZE),
+                    NULL, NULL, NULL, GetPString(IDS_10SYSTEMVIOTEXT));
     }
 
     hwndTmp = WinCreateWindow(hwndFrame,
-                              WC_BUTTON,
-                              "#1019",
-                              WS_VISIBLE | BS_PUSHBUTTON | BS_NOPOINTERFOCUS |
-                              BS_BITMAP,
-                              swp.cx - 46,
-                              swp.y + 2,
-                              24,
-                              22, hwnd, HWND_TOP, IDM_OPENWALK, NULL, NULL);
+                              WC_BUTTON,
+                              "#1019",
+                              WS_VISIBLE | BS_PUSHBUTTON | BS_NOPOINTERFOCUS |
+                              BS_BITMAP,
+                              swp.cx - 46,
+                              swp.y + 2,
+                              24,
+                              22, hwnd, HWND_TOP, IDM_OPENWALK, NULL, NULL);
     if (!hwndTmp)
       Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
 
     hwndTmp = WinCreateWindow(hwndFrame,
-                              WC_BUTTON,
-                              "#3062",
-                              WS_VISIBLE | BS_PUSHBUTTON | BS_NOPOINTERFOCUS |
-                              BS_BITMAP,
-                              swp.cx - 22,
-                              swp.y + 2,
-                              24,
-                              22, hwnd, HWND_TOP, IDM_USERLIST, NULL, NULL);
+                              WC_BUTTON,
+                              "#3062",
+                              WS_VISIBLE | BS_PUSHBUTTON | BS_NOPOINTERFOCUS |
+                              BS_BITMAP,
+                              swp.cx - 22,
+                              swp.y + 2,
+                              24,
+                              22, hwnd, HWND_TOP, IDM_USERLIST, NULL, NULL);
     if (!hwndTmp)
       Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
 
     hwndUserlist = WinCreateWindow(hwndFrame,
-                                   WC_COMBOBOX,
-                                   (PSZ) NULL,
-                                   WS_VISIBLE | CBS_DROPDOWN |
-                                   LS_HORZSCROLL,
-                                   (swp.x +
-                                    WinQuerySysValue(HWND_DESKTOP,
-                                                     SV_CXSIZEBORDER) + 48L),
-                                   (swp.cy -
-                                    WinQuerySysValue(HWND_DESKTOP,
-                                                     SV_CYSIZEBORDER)) - 60,
-                                   ((swp.cx -
-                                     (WinQuerySysValue(HWND_DESKTOP,
-                                                       SV_CXSIZEBORDER) *
-                                      2)) - 64L), 60L, hwndFrame, HWND_TOP,
-                                   MAIN_USERLIST, NULL, NULL);
+                                   WC_COMBOBOX,
+                                   (PSZ) NULL,
+                                   WS_VISIBLE | CBS_DROPDOWN |
+                                   LS_HORZSCROLL,
+                                   (swp.x +
+                                    WinQuerySysValue(HWND_DESKTOP,
+                                                     SV_CXSIZEBORDER) + 48L),
+                                   (swp.cy -
+                                    WinQuerySysValue(HWND_DESKTOP,
+                                                     SV_CYSIZEBORDER)) - 60,
+                                   ((swp.cx -
+                                     (WinQuerySysValue(HWND_DESKTOP,
+                                                       SV_CXSIZEBORDER) *
+                                      2)) - 64L), 60L, hwndFrame, HWND_TOP,
+                                   MAIN_USERLIST, NULL, NULL);
     if (!hwndUserlist)
       Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     hwndCmdlist = WinCreateWindow(hwndFrame,
-                                  WC_COMBOBOX,
-                                  (PSZ) NULL,
-                                  WS_VISIBLE | CBS_DROPDOWN |
-                                  LS_HORZSCROLL,
-                                  (swp.x +
-                                   WinQuerySysValue(HWND_DESKTOP,
-                                                    SV_CXSIZEBORDER) + 48L),
-                                  (swp.cy -
-                                   WinQuerySysValue(HWND_DESKTOP,
-                                                    SV_CYSIZEBORDER)) - 60,
-                                  ((swp.cx -
-                                    (WinQuerySysValue(HWND_DESKTOP,
-                                                      SV_CXSIZEBORDER) * 2)) -
-                                   64L), 60L, hwndFrame, HWND_TOP,
-                                  MAIN_CMDLIST, NULL, NULL);
+                                  WC_COMBOBOX,
+                                  (PSZ) NULL,
+                                  WS_VISIBLE | CBS_DROPDOWN |
+                                  LS_HORZSCROLL,
+                                  (swp.x +
+                                   WinQuerySysValue(HWND_DESKTOP,
+                                                    SV_CXSIZEBORDER) + 48L),
+                                  (swp.cy -
+                                   WinQuerySysValue(HWND_DESKTOP,
+                                                    SV_CYSIZEBORDER)) - 60,
+                                  ((swp.cx -
+                                    (WinQuerySysValue(HWND_DESKTOP,
+                                                      SV_CXSIZEBORDER) * 2)) -
+                                   64L), 60L, hwndFrame, HWND_TOP,
+                                  MAIN_CMDLIST, NULL, NULL);
     if (!hwndCmdlist)
       Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     WinSetWindowText(hwndCmdlist, GetPString(IDS_COMMANDSTEXT));
     hwndStatelist = WinCreateWindow(hwndFrame,
-                                    WC_COMBOBOX,
-                                    (PSZ) NULL,
-                                    WS_VISIBLE | CBS_DROPDOWN |
-                                    LS_HORZSCROLL,
-                                    (swp.x +
-                                     WinQuerySysValue(HWND_DESKTOP,
-                                                      SV_CXSIZEBORDER) + 48L),
-                                    (swp.cy -
-                                     WinQuerySysValue(HWND_DESKTOP,
-                                                      SV_CYSIZEBORDER)) - 60,
-                                    ((swp.cx -
-                                      (WinQuerySysValue(HWND_DESKTOP,
-                                                        SV_CXSIZEBORDER) *
-                                       2)) - 64L), 60L, hwndFrame, HWND_TOP,
-                                    MAIN_SETUPLIST, NULL, NULL);
+                                    WC_COMBOBOX,
+                                    (PSZ) NULL,
+                                    WS_VISIBLE | CBS_DROPDOWN |
+                                    LS_HORZSCROLL,
+                                    (swp.x +
+                                     WinQuerySysValue(HWND_DESKTOP,
+                                                      SV_CXSIZEBORDER) + 48L),
+                                    (swp.cy -
+                                     WinQuerySysValue(HWND_DESKTOP,
+                                                      SV_CYSIZEBORDER)) - 60,
+                                    ((swp.cx -
+                                      (WinQuerySysValue(HWND_DESKTOP,
+                                                        SV_CXSIZEBORDER) *
+                                       2)) - 64L), 60L, hwndFrame, HWND_TOP,
+                                    MAIN_SETUPLIST, NULL, NULL);
     if (!hwndStatelist)
       Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
 
     hwndDrivelist = WinCreateWindow(hwndFrame,
-                                    WC_COMBOBOX,
-                                    (PSZ) NULL,
-                                    WS_VISIBLE | CBS_DROPDOWN,
-                                    (swp.x +
-                                     WinQuerySysValue(HWND_DESKTOP,
-                                                      SV_CXSIZEBORDER)),
-                                    (swp.cy -
-                                     WinQuerySysValue(HWND_DESKTOP,
-                                                      SV_CYSIZEBORDER)) - 60,
-                                    48L,
-                                    60L,
-                                    hwndFrame,
-                                    HWND_TOP, MAIN_DRIVELIST, NULL, NULL);
+                                    WC_COMBOBOX,
+                                    (PSZ) NULL,
+                                    WS_VISIBLE | CBS_DROPDOWN,
+                                    (swp.x +
+                                     WinQuerySysValue(HWND_DESKTOP,
+                                                      SV_CXSIZEBORDER)),
+                                    (swp.cy -
+                                     WinQuerySysValue(HWND_DESKTOP,
+                                                      SV_CYSIZEBORDER)) - 60,
+                                    48L,
+                                    60L,
+                                    hwndFrame,
+                                    HWND_TOP, MAIN_DRIVELIST, NULL, NULL);
     if (!hwndDrivelist)
       Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     SetPresParams(hwndDrivelist,
-                  NULL, NULL, NULL, GetPString(IDS_10SYSTEMMONOTEXT));
+                  NULL, NULL, NULL, GetPString(IDS_10SYSTEMMONOTEXT));
     hwndButtonlist = WinCreateWindow(hwndFrame,
-                                     WC_COMBOBOX,
-                                     (PSZ) NULL,
-                                     WS_VISIBLE | CBS_DROPDOWN |
-                                     LS_HORZSCROLL,
-                                     (swp.cx -
-                                      WinQuerySysValue(HWND_DESKTOP,
-                                                       SV_CXSIZEBORDER)) -
-                                     164L,
-                                     (swp.cy -
-                                      WinQuerySysValue(HWND_DESKTOP,
-                                                       SV_CYSIZEBORDER)) - 60,
-                                     164L, 60L, hwndFrame, HWND_TOP,
-                                     MAIN_BUTTONLIST, NULL, NULL);
+                                     WC_COMBOBOX,
+                                     (PSZ) NULL,
+                                     WS_VISIBLE | CBS_DROPDOWN |
+                                     LS_HORZSCROLL,
+                                     (swp.cx -
+                                      WinQuerySysValue(HWND_DESKTOP,
+                                                       SV_CXSIZEBORDER)) -
+                                     164L,
+                                     (swp.cy -
+                                      WinQuerySysValue(HWND_DESKTOP,
+                                                       SV_CYSIZEBORDER)) - 60,
+                                     164L, 60L, hwndFrame, HWND_TOP,
+                                     MAIN_BUTTONLIST, NULL, NULL);
     if (!hwndButtonlist)
       Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     WinSendMsg(WinWindowFromID(hwndUserlist, CBID_EDIT),
-               EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+               EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     WinSendMsg(WinWindowFromID(hwndStatelist, CBID_EDIT),
-               EM_SETTEXTLIMIT, MPFROM2SHORT(STATE_NAME_MAX_BYTES, 0), MPVOID);
+               EM_SETTEXTLIMIT, MPFROM2SHORT(STATE_NAME_MAX_BYTES, 0), MPVOID);
     WinSendMsg(WinWindowFromID(hwndDrivelist, CBID_EDIT),
-               EM_SETREADONLY, MPFROM2SHORT(TRUE, 0), MPVOID);
+               EM_SETREADONLY, MPFROM2SHORT(TRUE, 0), MPVOID);
     WinSendMsg(WinWindowFromID(hwndButtonlist, CBID_EDIT),
-               EM_SETREADONLY, MPFROM2SHORT(TRUE, 0), MPVOID);
+               EM_SETREADONLY, MPFROM2SHORT(TRUE, 0), MPVOID);
     WinSendMsg(WinWindowFromID(hwndCmdlist, CBID_EDIT),
-               EM_SETREADONLY, MPFROM2SHORT(TRUE, 0), MPVOID);
+               EM_SETREADONLY, MPFROM2SHORT(TRUE, 0), MPVOID);
 
     oldproc = WinSubclassWindow(WinWindowFromID(hwndUserlist, CBID_EDIT),
-                                DropDownListProc);
+                                DropDownListProc);
     WinSetWindowPtr(WinWindowFromID(hwndUserlist, CBID_EDIT),
-                    QWL_USER, (PVOID) oldproc);
+                    QWL_USER, (PVOID) oldproc);
     oldproc = WinSubclassWindow(WinWindowFromID(hwndCmdlist, CBID_EDIT),
-                                DropDownListProc);
+                                DropDownListProc);
     WinSetWindowPtr(WinWindowFromID(hwndCmdlist, CBID_EDIT),
-                    QWL_USER, (PVOID) oldproc);
+                    QWL_USER, (PVOID) oldproc);
     oldproc = WinSubclassWindow(WinWindowFromID(hwndButtonlist, CBID_EDIT),
-                                DropDownListProc);
+                                DropDownListProc);
     WinSetWindowPtr(WinWindowFromID(hwndButtonlist, CBID_EDIT),
-                    QWL_USER, (PVOID) oldproc);
+                    QWL_USER, (PVOID) oldproc);
     oldproc = WinSubclassWindow(WinWindowFromID(hwndStatelist, CBID_EDIT),
-                                DropDownListProc);
+                                DropDownListProc);
     WinSetWindowPtr(WinWindowFromID(hwndStatelist, CBID_EDIT),
-                    QWL_USER, (PVOID) oldproc);
+                    QWL_USER, (PVOID) oldproc);
     oldproc = WinSubclassWindow(WinWindowFromID(hwndDrivelist, CBID_EDIT),
-                                DropDownListProc);
+                                DropDownListProc);
     WinSetWindowPtr(WinWindowFromID(hwndDrivelist, CBID_EDIT),
-                    QWL_USER, (PVOID) oldproc);
+                    QWL_USER, (PVOID) oldproc);
     oldproc = WinSubclassWindow(hwndUserlist, DropDownListProc);
     WinSetWindowPtr(hwndUserlist, QWL_USER, (PVOID) oldproc);
@@ -5727 +5777 @@
     WinSetWindowPtr(hwndButtonlist, QWL_USER, (PVOID) oldproc);
     oldproc = WinSubclassWindow(WinWindowFromID(hwndFrame, IDM_USERLIST),
-                                ChildFrameButtonProc);
+                                ChildFrameButtonProc);
     WinSetWindowPtr(WinWindowFromID(hwndFrame, IDM_USERLIST),
-                    QWL_USER, (PVOID) oldproc);
+                    QWL_USER, (PVOID) oldproc);
     oldproc = WinSubclassWindow(WinWindowFromID(hwndFrame, IDM_OPENWALK),
-                                ChildFrameButtonProc);
+                                ChildFrameButtonProc);
     WinSetWindowPtr(WinWindowFromID(hwndFrame, IDM_OPENWALK),
-                    QWL_USER, (PVOID) oldproc);
+                    QWL_USER, (PVOID) oldproc);
     hwndMenu = WinWindowFromID(hwndFrame, FID_MENU);
     WinSendMsg(hwnd, UM_ADDTOMENU, MPVOID, MPVOID);
@@ -5747 +5797 @@
     hwndSysMenu = WinWindowFromID(hwndFrame, FID_SYSMENU);
     idSysMenu = SHORT1FROMMR(WinSendMsg(hwndSysMenu,
-                                        MM_ITEMIDFROMPOSITION,
-                                        MPVOID, MPVOID));
+                                        MM_ITEMIDFROMPOSITION,
+                                        MPVOID, MPVOID));
     WinSendMsg(hwndSysMenu,
-               MM_QUERYITEM, MPFROM2SHORT(idSysMenu, 0), MPFROMP(&mit));
+               MM_QUERYITEM, MPFROM2SHORT(idSysMenu, 0), MPFROMP(&mit));
     hwndSysSubMenu = mit.hwndSubMenu;
     mi.iPosition = MIT_END;
@@ -5759 +5809 @@
     mi.id = IDM_IDEALSIZE;
     WinSendMsg(hwndSysSubMenu,
-               MM_INSERTITEM,
-               MPFROMP(&mi), MPFROMP(GetPString(IDS_IDEALMENUTEXT)));
+               MM_INSERTITEM,
+               MPFROMP(&mi), MPFROMP(GetPString(IDS_IDEALMENUTEXT)));
     mi.afStyle = MIS_TEXT;
     mi.id = IDM_HIDEMENU;
     WinSendMsg(hwndSysSubMenu,
-               MM_INSERTITEM,
-               MPFROMP(&mi), MPFROMP(GetPString(IDS_HIDEMENUTEXT)));
+               MM_INSERTITEM,
+               MPFROMP(&mi), MPFROMP(GetPString(IDS_HIDEMENUTEXT)));
     SetSysMenu(hwndSysMenu);
 
     size = sizeof(BOOL);
     if (PrfQueryProfileData(fmprof,
-                            FM3Str,
-                            "MenuInvisible", &temp, &size) && size && temp)
+                            FM3Str,
+                            "MenuInvisible", &temp, &size) && size && temp)
       WinSendMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_HIDEMENU, 0), MPVOID);
     size = sizeof(BOOL);
     if (PrfQueryProfileData(fmprof,
-                            FM3Str, "FreeTree", &temp, &size) && size && temp)
+                            FM3Str, "FreeTree", &temp, &size) && size && temp)
       WinSendMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_FREETREE, 0), MPVOID);
     size = sizeof(BOOL);
     if (PrfQueryProfileData(fmprof,
-                            FM3Str,
-                            "AutoTile", &temp, &size) && size && !temp)
+                            FM3Str,
+                            "AutoTile", &temp, &size) && size && !temp)
       WinSendMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_AUTOTILE, 0), MPVOID);
     size = sizeof(BOOL);
     if (PrfQueryProfileData(fmprof,
-                            FM3Str, "Toolbar", &temp, &size) && size && !temp)
+                            FM3Str, "Toolbar", &temp, &size) && size && !temp)
       WinSendMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_TOOLBAR, 0), MPVOID);
 
@@ -5807 +5857 @@
       hwndTree = StartTreeCnr(hwnd, 4);
       if (!hwndTree)
-        WinDestroyWindow(WinQueryWindow(hwnd, QW_PARENT));
+        WinDestroyWindow(WinQueryWindow(hwnd, QW_PARENT));
       else {
-        if (!fSaveState ||
-            !PrfQueryProfileData(fmprof,
-                                 FM3Str,
-                                 "LastTreePos",
-                                 &swp, &size) || size != sizeof(SWP)) {
-
-          INT ratio, height = 0;
-
-          if (!fNoTreeGap)
-            height = WinQuerySysValue(HWND_DESKTOP, SV_CYICON) * 2;
-          size = sizeof(ratio);
-          if (!PrfQueryProfileData(fmprof,
-                                   FM3Str,
-                                   "TreeWindowRatio",
-                                   (PVOID) & ratio,
-                                   &size) || size < sizeof(ratio))
-            ratio = 400;
-          WinSetWindowPos(hwndTree,
-                          HWND_TOP,
-                          0,
-                          height,
-                          (swp.cx * 100) / ratio,
-                          swp.cy - height,
-                          SWP_SHOW | SWP_SIZE | SWP_MOVE |
-                          SWP_ACTIVATE | SWP_ZORDER);
-        }
-        else
-          WinSetWindowPos(hwndTree,
-                          HWND_TOP,
-                          swp.x,
-                          swp.y,
-                          swp.cx,
-                          swp.cy,
-                          swp.fl | SWP_MOVE | SWP_SIZE | SWP_SHOW |
-                          SWP_ZORDER | SWP_ACTIVATE);
+        if (!fSaveState ||
+            !PrfQueryProfileData(fmprof,
+                                 FM3Str,
+                                 "LastTreePos",
+                                 &swp, &size) || size != sizeof(SWP)) {
+
+          INT ratio, height = 0;
+
+          if (!fNoTreeGap)
+            height = WinQuerySysValue(HWND_DESKTOP, SV_CYICON) * 2;
+          size = sizeof(ratio);
+          if (!PrfQueryProfileData(fmprof,
+                                   FM3Str,
+                                   "TreeWindowRatio",
+                                   (PVOID) & ratio,
+                                   &size) || size < sizeof(ratio))
+            ratio = 400;
+          WinSetWindowPos(hwndTree,
+                          HWND_TOP,
+                          0,
+                          height,
+                          (swp.cx * 100) / ratio,
+                          swp.cy - height,
+                          SWP_SHOW | SWP_SIZE | SWP_MOVE |
+                          SWP_ACTIVATE | SWP_ZORDER);
+        }
+        else
+          WinSetWindowPos(hwndTree,
+                          HWND_TOP,
+                          swp.x,
+                          swp.y,
+                          swp.cx,
+                          swp.cy,
+                          swp.fl | SWP_MOVE | SWP_SIZE | SWP_SHOW |
+                          SWP_ZORDER | SWP_ACTIVATE);
       }
 //       ResizeTools(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-//                                MAIN_TOOLS));
+//                                MAIN_TOOLS));
     }
     PostMsg(MainObjectHwnd, UM_SETUP3, mp1, mp2);
@@ -5871 +5921 @@
 
       for (x = 1; x < argc; x++) {
-        if (*argv[x] == '/' || *argv[x] == ';')
-          continue;
-        if (!IsFile(argv[x]) && !FindDirCnrByName(argv[x], FALSE))
-          OpenDirCnr((HWND) 0, hwndMain, hwndTree, TRUE, argv[x]);
+        if (*argv[x] == '/' || *argv[x] == ';')
+          continue;
+        if (!IsFile(argv[x]) && !FindDirCnrByName(argv[x], FALSE))
+          OpenDirCnr((HWND) 0, hwndMain, hwndTree, TRUE, argv[x]);
       }
     }
@@ -5892 +5942 @@
       hwndActive = TopWindow(hwnd, hwndTree);
       if (hwndActive)
-        WinSetWindowPos(hwndActive, HWND_TOP, 0, 0, 0, 0, SWP_ACTIVATE);
+        WinSetWindowPos(hwndActive, HWND_TOP, 0, 0, 0, 0, SWP_ACTIVATE);
     }
     if (fStartMinimized || fReminimize)
@@ -5925 +5975 @@
   case WM_CONTROLPOINTER:
     if (!fNoFinger &&
-        (SHORT1FROMMP(mp1) == IDM_OPENWALK ||
-         SHORT1FROMMP(mp1) == IDM_USERLIST))
+        (SHORT1FROMMP(mp1) == IDM_OPENWALK ||
+         SHORT1FROMMP(mp1) == IDM_USERLIST))
       return MRFROMLONG(hptrFinger);
     break;
@@ -5966 +6016 @@
     if (mp1) {
       if (fUserComboBox)
-        WinSetWindowText(WinWindowFromID(hwndUserlist, CBID_EDIT),
-                         (CHAR *)mp1);
+        WinSetWindowText(WinWindowFromID(hwndUserlist, CBID_EDIT),
+                         (CHAR *)mp1);
       if (add_udir(FALSE, (CHAR *)mp1)) {
-        if (fUserComboBox && fAutoAddDirs) {
-          WinSendMsg(hwndUserlist, LM_INSERTITEM,
-                     MPFROM2SHORT(LIT_SORTASCENDING, 0),
-                     MPFROMP((CHAR *)mp1));
-        }
+        if (fUserComboBox && fAutoAddDirs) {
+          WinSendMsg(hwndUserlist, LM_INSERTITEM,
+                     MPFROM2SHORT(LIT_SORTASCENDING, 0),
+                     MPFROMP((CHAR *)mp1));
+        }
       }
     }
@@ -6005 +6055 @@
       WinQueryWindowPos(WinQueryWindow(hwnd, QW_PARENT), &swp);
       if (!(swp.fl & (SWP_HIDE | SWP_MINIMIZE))) {
-        WinStoreWindowPos(FM2Str,
-                          "MainWindowPos", WinQueryWindow(hwnd, QW_PARENT));
-        if (!fNoSaveState && fSaveState)
-          SaveDirCnrState(hwnd, GetPString(IDS_SHUTDOWNSTATE));
+        WinStoreWindowPos(FM2Str,
+                          "MainWindowPos", WinQueryWindow(hwnd, QW_PARENT));
+        if (!fNoSaveState && fSaveState)
+          SaveDirCnrState(hwnd, GetPString(IDS_SHUTDOWNSTATE));
       }
     }
@@ -6018 +6068 @@
     case 1:
       {
-        HWND hwndCurrent;
-        ULONG wmsg;
-
-        wmsg = (SHORT1FROMMP(mp1) == 0) ? UM_FILESMENU : UM_VIEWSMENU;
-        hwndCurrent = TopWindow(hwnd, (HWND) 0);
-        PortholeInit((HWND) WinSendMsg(WinWindowFromID(hwndCurrent,
-                                                       FID_CLIENT), wmsg,
-                                       MPVOID, MPVOID), mp1, mp2);
+        HWND hwndCurrent;
+        ULONG wmsg;
+
+        wmsg = (SHORT1FROMMP(mp1) == 0) ? UM_FILESMENU : UM_VIEWSMENU;
+        hwndCurrent = TopWindow(hwnd, (HWND) 0);
+        PortholeInit((HWND) WinSendMsg(WinWindowFromID(hwndCurrent,
+                                                       FID_CLIENT), wmsg,
+                                       MPVOID, MPVOID), mp1, mp2);
       }
       break;
@@ -6043 +6093 @@
        */
       {
-        HWND hwndMenu, hwndSubMenu;
-        MENUITEM mi;
-
-        hwndMenu = WinQueryWindowULong(hwnd, QWL_USER);
-        memset(&mi, 0, sizeof(mi));
-        mi.iPosition = MIT_END;
-        mi.afStyle = MIS_TEXT;
-        if (!WinSendMsg(hwndMenu, MM_QUERYITEM,
-                        MPFROM2SHORT(IDM_WINDOWSMENU, TRUE), MPFROMP(&mi)))
-          break;
-        hwndSubMenu = mi.hwndSubMenu;
-        SetupWinList(hwndSubMenu, hwnd, WinQueryWindow(hwnd, QW_PARENT));
+        HWND hwndMenu, hwndSubMenu;
+        MENUITEM mi;
+
+        hwndMenu = WinQueryWindowULong(hwnd, QWL_USER);
+        memset(&mi, 0, sizeof(mi));
+        mi.iPosition = MIT_END;
+        mi.afStyle = MIS_TEXT;
+        if (!WinSendMsg(hwndMenu, MM_QUERYITEM,
+                        MPFROM2SHORT(IDM_WINDOWSMENU, TRUE), MPFROMP(&mi)))
+          break;
+        hwndSubMenu = mi.hwndSubMenu;
+        SetupWinList(hwndSubMenu, hwnd, WinQueryWindow(hwnd, QW_PARENT));
       }
       break;
@@ -6060 +6110 @@
     default:
       {
-        HWND hwndCurrent;
-
-        hwndCurrent = TopWindow(hwnd, (HWND) 0);
-        if (hwndCurrent)
-          WinSendMsg(hwndCurrent, UM_INITMENU, mp1, mp2);
+        HWND hwndCurrent;
+
+        hwndCurrent = TopWindow(hwnd, (HWND) 0);
+        if (hwndCurrent)
+          WinSendMsg(hwndCurrent, UM_INITMENU, mp1, mp2);
       }
       break;
@@ -6072 +6122 @@
   case UM_ADDTOMENU:
     AddToMenu((CHAR *)mp1, WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-                                            FID_MENU));
+                                            FID_MENU));
     return 0;
 
@@ -6085 +6135 @@
       info = cmdhead;
       while (info) {
-        WinSendMsg(hwndCmdlist, LM_INSERTITEM,
-                   MPFROM2SHORT(LIT_END, 0), MPFROMP(info->title));
-        info = info->next;
+        WinSendMsg(hwndCmdlist, LM_INSERTITEM,
+                   MPFROM2SHORT(LIT_END, 0), MPFROMP(info->title));
+        info = info->next;
       }
     }
@@ -6111 +6161 @@
       ulSearchCount = 1;
       if (!DosFindFirst("*.TLS", &hDir, FILE_READONLY | FILE_ARCHIVED,
-                        &findbuf, sizeof(FILEFINDBUF3),
-                        &ulSearchCount, FIL_STANDARD)) {
-        do {
-          priority_bumped();
-          if (!foundit) {
-            thisone = FALSE;
-            p = strrchr(lasttoolbar, '\\');
-            if (!p)
-              p = lasttoolbar;
-            else
-              p++;
-            if (!stricmp(findbuf.achName, p))
-              thisone = TRUE;
-          }
-          p = strrchr(findbuf.achName, '.');
-          if (p)
-            *p = 0;
-          sSelect = (SHORT) WinSendMsg(hwndButtonlist, LM_INSERTITEM,
-                                       MPFROM2SHORT(LIT_SORTASCENDING, 0),
-                                       MPFROMP(findbuf.achName));
-          if (!foundit && thisone && sSelect >= 0) {
-            WinSendMsg(hwndButtonlist, LM_SELECTITEM,
-                       MPFROM2SHORT(sSelect, 0), MPFROMLONG(TRUE));
-            foundit = TRUE;
-          }
-        }
-        while (!DosFindNext(hDir, &findbuf, sizeof(FILEFINDBUF3),
-                            &ulSearchCount));
-        DosFindClose(hDir);
-        priority_bumped();
+                        &findbuf, sizeof(FILEFINDBUF3),
+                        &ulSearchCount, FIL_STANDARD)) {
+        do {
+          priority_bumped();
+          if (!foundit) {
+            thisone = FALSE;
+            p = strrchr(lasttoolbar, '\\');
+            if (!p)
+              p = lasttoolbar;
+            else
+              p++;
+            if (!stricmp(findbuf.achName, p))
+              thisone = TRUE;
+          }
+          p = strrchr(findbuf.achName, '.');
+          if (p)
+            *p = 0;
+          sSelect = (SHORT) WinSendMsg(hwndButtonlist, LM_INSERTITEM,
+                                       MPFROM2SHORT(LIT_SORTASCENDING, 0),
+                                       MPFROMP(findbuf.achName));
+          if (!foundit && thisone && sSelect >= 0) {
+            WinSendMsg(hwndButtonlist, LM_SELECTITEM,
+                       MPFROM2SHORT(sSelect, 0), MPFROMLONG(TRUE));
+            foundit = TRUE;
+          }
+        }
+        while (!DosFindNext(hDir, &findbuf, sizeof(FILEFINDBUF3),
+                            &ulSearchCount));
+        DosFindClose(hDir);
+        priority_bumped();
       }
       WinSetWindowText(hwndButtonlist, GetPString(IDS_TOOLBARTEXT));
@@ -6159 +6209 @@
 
       if (!loadedudirs)
-        load_udirs();
+        load_udirs();
       DosError(FERR_DISABLEHARDERR);
       DosQCurDisk(&ulDriveNum, &ulDriveMap);
       info = udirhead;
       while (info) {
-        if (IsFullName(info->path) &&
-            !(driveflags[toupper(*info->path) - 'A'] &
-              (DRIVE_IGNORE | DRIVE_INVALID))) {
-          DosError(FERR_DISABLEHARDERR);
-          hDir = HDIR_CREATE;
-          ulSearchCount = 1;
-          if (!IsRoot(info->path))
-            rc = DosFindFirst(info->path, &hDir, FILE_DIRECTORY |
-                              MUST_HAVE_DIRECTORY | FILE_READONLY |
-                              FILE_ARCHIVED | FILE_SYSTEM | FILE_HIDDEN,
-                              &findbuf, sizeof(FILEFINDBUF3),
-                              &ulSearchCount, FIL_STANDARD);
-          else {
-            rc = 0;
-            findbuf.attrFile = FILE_DIRECTORY;
-          }
-          priority_bumped();
-          if (!rc) {
-            if (!IsRoot(info->path))
-              DosFindClose(hDir);
-            if (findbuf.attrFile & FILE_DIRECTORY)
-              WinSendMsg(hwndUserlist, LM_INSERTITEM,
-                         MPFROM2SHORT(LIT_SORTASCENDING, 0),
-                         MPFROMP(info->path));
-            else {
-              temp = info->next;
-              remove_udir(info->path);
-              info = temp;
-              continue;
-            }
-          }
-          else if (!(ulDriveMap & (1 << (toupper(*info->path) - 'A')))) {
-            temp = info->next;
-            remove_udir(info->path);
-            info = temp;
-            continue;
-          }
-        }
-        info = info->next;
+        if (IsFullName(info->path) &&
+            !(driveflags[toupper(*info->path) - 'A'] &
+              (DRIVE_IGNORE | DRIVE_INVALID))) {
+          DosError(FERR_DISABLEHARDERR);
+          hDir = HDIR_CREATE;
+          ulSearchCount = 1;
+          if (!IsRoot(info->path))
+            rc = DosFindFirst(info->path, &hDir, FILE_DIRECTORY |
+                              MUST_HAVE_DIRECTORY | FILE_READONLY |
+                              FILE_ARCHIVED | FILE_SYSTEM | FILE_HIDDEN,
+                              &findbuf, sizeof(FILEFINDBUF3),
+                              &ulSearchCount, FIL_STANDARD);
+          else {
+            rc = 0;
+            findbuf.attrFile = FILE_DIRECTORY;
+          }
+          priority_bumped();
+          if (!rc) {
+            if (!IsRoot(info->path))
+              DosFindClose(hDir);
+            if (findbuf.attrFile & FILE_DIRECTORY)
+              WinSendMsg(hwndUserlist, LM_INSERTITEM,
+                         MPFROM2SHORT(LIT_SORTASCENDING, 0),
+                         MPFROMP(info->path));
+            else {
+              temp = info->next;
+              remove_udir(info->path);
+              info = temp;
+              continue;
+            }
+          }
+          else if (!(ulDriveMap & (1 << (toupper(*info->path) - 'A')))) {
+            temp = info->next;
+            remove_udir(info->path);
+            info = temp;
+            continue;
+          }
+        }
+        info = info->next;
       }
       info = ldirhead;
       while (info) {
-        if (IsFullName(info->path) &&
-            !(driveflags[toupper(*info->path) - 'A'] &
-              (DRIVE_IGNORE | DRIVE_INVALID))) {
-          DosError(FERR_DISABLEHARDERR);
-          hDir = HDIR_CREATE;
-          ulSearchCount = 1;
-          if (!IsRoot(info->path))
-            rc = DosFindFirst(info->path, &hDir, FILE_DIRECTORY |
-                              MUST_HAVE_DIRECTORY | FILE_READONLY |
-                              FILE_ARCHIVED | FILE_SYSTEM | FILE_HIDDEN,
-                              &findbuf, sizeof(FILEFINDBUF3),
-                              &ulSearchCount, FIL_STANDARD);
-          else {
-            rc = 0;
-            findbuf.attrFile = FILE_DIRECTORY;
-          }
-          priority_bumped();
-          if (!rc) {
-            if (!IsRoot(info->path))
-              DosFindClose(hDir);
-            if (findbuf.attrFile & FILE_DIRECTORY)
-              WinSendMsg(hwndUserlist, LM_INSERTITEM,
-                         MPFROM2SHORT(LIT_SORTASCENDING, 0),
-                         MPFROMP(info->path));
-            else {
-              temp = info->next;
-              remove_udir(info->path);
-              info = temp;
-              continue;
-            }
-          }
-          else if (!(ulDriveMap & (1 << (toupper(*info->path) - 'A')))) {
-            temp = info->next;
-            remove_udir(info->path);
-            info = temp;
-            continue;
-          }
-        }
-        info = info->next;
+        if (IsFullName(info->path) &&
+            !(driveflags[toupper(*info->path) - 'A'] &
+              (DRIVE_IGNORE | DRIVE_INVALID))) {
+          DosError(FERR_DISABLEHARDERR);
+          hDir = HDIR_CREATE;
+          ulSearchCount = 1;
+          if (!IsRoot(info->path))
+            rc = DosFindFirst(info->path, &hDir, FILE_DIRECTORY |
+                              MUST_HAVE_DIRECTORY | FILE_READONLY |
+                              FILE_ARCHIVED | FILE_SYSTEM | FILE_HIDDEN,
+                              &findbuf, sizeof(FILEFINDBUF3),
+                              &ulSearchCount, FIL_STANDARD);
+          else {
+            rc = 0;
+            findbuf.attrFile = FILE_DIRECTORY;
+          }
+          priority_bumped();
+          if (!rc) {
+            if (!IsRoot(info->path))
+              DosFindClose(hDir);
+            if (findbuf.attrFile & FILE_DIRECTORY)
+              WinSendMsg(hwndUserlist, LM_INSERTITEM,
+                         MPFROM2SHORT(LIT_SORTASCENDING, 0),
+                         MPFROMP(info->path));
+            else {
+              temp = info->next;
+              remove_udir(info->path);
+              info = temp;
+              continue;
+            }
+          }
+          else if (!(ulDriveMap & (1 << (toupper(*info->path) - 'A')))) {
+            temp = info->next;
+            remove_udir(info->path);
+            info = temp;
+            continue;
+          }
+        }
+        info = info->next;
       }
       WinSendMsg(hwndUserlist, LM_INSERTITEM,
-                 MPFROM2SHORT(0, 0),
-                 MPFROMP(GetPString(IDS_NEWDIRECTORYTEXT)));
+                 MPFROM2SHORT(0, 0),
+                 MPFROMP(GetPString(IDS_NEWDIRECTORYTEXT)));
       WinSetWindowText(hwndUserlist, GetPString(IDS_COMMONDIRTEXT));
     }
@@ -6262 +6312 @@
   case WM_SIZE:
     ResizeChildren(hwnd, SHORT1FROMMP(mp1), SHORT2FROMMP(mp1),
-                   SHORT1FROMMP(mp2), SHORT2FROMMP(mp2));
+                   SHORT1FROMMP(mp2), SHORT2FROMMP(mp2));
     break;
 
@@ -6276 +6326 @@
       hps = WinBeginPaint(hwnd, (HPS) 0, NULL);
       if (hps) {
-        WinQueryWindowRect(hwnd, &rcl);
-        WinFillRect(hps, &rcl, CLR_PALEGRAY);
-        WinEndPaint(hps);
+        WinQueryWindowRect(hwnd, &rcl);
+        WinFillRect(hps, &rcl, CLR_PALEGRAY);
+        WinEndPaint(hps);
       }
     }
@@ -6292 +6342 @@
       switch (SHORT2FROMMP(mp1)) {
       case CBN_ENTER:
-        {
-          HWND hwndUL = WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-                                        SHORT1FROMMP(mp1));
-          CHAR path[CCHMAXPATH];
-          ULONG ul;
-
-          switch (SHORT1FROMMP(mp1)) {
-          case MAIN_USERLIST:
-            ul = CCHMAXPATH;
-            break;
-          case MAIN_SETUPLIST:
-            ul = STATE_NAME_MAX_BYTES;
-            break;
-          default:
-            ul = 13;                    // fixme to not be hardcoded
-          }
-
-          SetShiftState();
-          WinQueryWindowText(WinWindowFromID(hwndUL, CBID_EDIT), ul, path);
-          bstrip(path);
-          if (*path) {
-            if (SHORT1FROMMP(mp1) == MAIN_USERLIST) {
-              if (!strcmp(path, GetPString(IDS_NEWDIRECTORYTEXT))) {
-                if (!LastDir ||
-                    !WinSendMsg(WinQueryWindow(LastDir, QW_PARENT),
-                                UM_CONTAINERDIR, MPFROMP(path), MPVOID))
-                  strcpy(path, pFM2SaveDirectory);
-                if (!PMMkDir(hwnd, path, TRUE)) {
-                  WinSetWindowText(hwndUL, GetPString(IDS_COMMONDIRTEXT));
-                  break;
-                }
-              }
-              if (!IsFile(path) && !FindDirCnrByName(path, TRUE)) {
-
-                HWND hwndDir;
-
-                if ((fUserListSwitches &&
-                     !(shiftstate & KC_SHIFT)) ||
-                    (!fUserListSwitches && (shiftstate & KC_SHIFT))) {
-                  hwndDir = FindDirCnr(hwnd);
-                  if (hwndDir) {
-                    WinSendMsg(LastDir, UM_SETDIR, MPFROMP(path), MPVOID);
-                    break;
-                  }
-                }
-                OpenDirCnr((HWND) 0, hwndMain, hwndTree, FALSE, path);
-              }
-            }
-            else if (SHORT1FROMMP(mp1) == MAIN_DRIVELIST) {
-              ShowTreeRec(WinWindowFromID(WinWindowFromID(hwndTree,
-                                                          FID_CLIENT),
-                                          TREE_CNR), path, FALSE, TRUE);
-              WinSetFocus(HWND_DESKTOP, hwndTree);
-            }
-            else if (SHORT1FROMMP(mp1) == MAIN_BUTTONLIST) {
-              strcat(path, ".TLS");
-              load_tools(path);
-              PrfWriteProfileString(fmprof,
-                                    FM3Str, "LastToolbar", lasttoolbar);
-              PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
-              WinSetWindowText(hwndButtonlist, GetPString(IDS_TOOLBARTEXT));
-            }
-            else if (SHORT1FROMMP(mp1) == MAIN_SETUPLIST) {
-              CHAR szKey[80];
-              ULONG size, numsaves = 0;
-
-              SetShiftState();
-              size = sizeof(ULONG);
-              sprintf(szKey, "%s.NumDirsLastTime", path);       // path is state name
-              if (!PrfQueryProfileData(fmprof,
-                                       FM3Str,
-                                       szKey,
-                                       (PVOID)&numsaves,
-                                       &size))
-              {
-                if ((WinGetLastError(WinQueryAnchorBlock(hwnd)) & 0xffff) == PMERR_NOT_IN_IDX) {
-                  saymsg(MB_ENTER | MB_ICONASTERISK, hwnd,
-                         GetPString(IDS_WARNINGTEXT),
-                         GetPString(IDS_DOESNTEXISTTEXT), path);
-                }
-                else {
-                  Win_Error2(hwnd, hwnd, __FILE__, __LINE__,
-                             IDS_PRFQUERYPROFILEDATA);
-                }
-              }
-              else {
-                char *pszStateName;
-                if ((shiftstate & KC_SHIFT) == 0)
-                  PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2));
-                pszStateName = xstrdup(path, pszSrcFile, __LINE__);
-                if (!pszStateName) {
-                  // Fall back if out of memory - already complained
-                  if ((shiftstate & KC_SHIFT) != 0 || fAutoTile) {
-                    // Autotile requested or forced
-                    PostMsg(MainObjectHwnd,
-                            UM_RESTORE,
-                            MPVOID,
-                            MPFROMLONG(1));                // Autotile
-                  }
-                }
-                else if (!PostMsg(MainObjectHwnd,
-                                  UM_RESTORE,
-                                  MPFROMP(pszStateName),
-                                  MPVOID)) {
-                  free(pszStateName);
-                }
-              }
-            }
-            else if (SHORT1FROMMP(mp1) == MAIN_CMDLIST) {
-
-              SHORT sSelect;
-
-              sSelect = (SHORT) WinSendMsg(hwndCmdlist,
-                                           LM_QUERYSELECTION,
-                                           MPFROMSHORT(LIT_FIRST), MPVOID);
-              if (sSelect >= 0)
-                WinPostMsg(hwnd,
-                           WM_COMMAND,
-                           MPFROM2SHORT(IDM_COMMANDSTART + sSelect, 0),
-                           MPVOID);
-              WinSetWindowText(hwndCmdlist, GetPString(IDS_COMMANDSTEXT));
-            }
-          }
-        }
-        break;
+        {
+          HWND hwndUL = WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
+                                        SHORT1FROMMP(mp1));
+          CHAR path[CCHMAXPATH];
+          ULONG ul;
+
+          switch (SHORT1FROMMP(mp1)) {
+          case MAIN_USERLIST:
+            ul = CCHMAXPATH;
+            break;
+          case MAIN_SETUPLIST:
+            ul = STATE_NAME_MAX_BYTES;
+            break;
+          default:
+            ul = 13;                    // fixme to not be hardcoded
+          }
+
+          SetShiftState();
+          WinQueryWindowText(WinWindowFromID(hwndUL, CBID_EDIT), ul, path);
+          bstrip(path);
+          if (*path) {
+            if (SHORT1FROMMP(mp1) == MAIN_USERLIST) {
+              if (!strcmp(path, GetPString(IDS_NEWDIRECTORYTEXT))) {
+                if (!LastDir ||
+                    !WinSendMsg(WinQueryWindow(LastDir, QW_PARENT),
+                                UM_CONTAINERDIR, MPFROMP(path), MPVOID))
+                  strcpy(path, pFM2SaveDirectory);
+                if (!PMMkDir(hwnd, path, TRUE)) {
+                  WinSetWindowText(hwndUL, GetPString(IDS_COMMONDIRTEXT));
+                  break;
+                }
+              }
+              if (!IsFile(path) && !FindDirCnrByName(path, TRUE)) {
+
+                HWND hwndDir;
+
+                if ((fUserListSwitches &&
+                     !(shiftstate & KC_SHIFT)) ||
+                    (!fUserListSwitches && (shiftstate & KC_SHIFT))) {
+                  hwndDir = FindDirCnr(hwnd);
+                  if (hwndDir) {
+                    WinSendMsg(LastDir, UM_SETDIR, MPFROMP(path), MPVOID);
+                    break;
+                  }
+                }
+                OpenDirCnr((HWND) 0, hwndMain, hwndTree, FALSE, path);
+              }
+            }
+            else if (SHORT1FROMMP(mp1) == MAIN_DRIVELIST) {
+              ShowTreeRec(WinWindowFromID(WinWindowFromID(hwndTree,
+                                                          FID_CLIENT),
+                                          TREE_CNR), path, FALSE, TRUE);
+              WinSetFocus(HWND_DESKTOP, hwndTree);
+            }
+            else if (SHORT1FROMMP(mp1) == MAIN_BUTTONLIST) {
+              strcat(path, ".TLS");
+              load_tools(path);
+              PrfWriteProfileString(fmprof,
+                                    FM3Str, "LastToolbar", lasttoolbar);
+              PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
+              WinSetWindowText(hwndButtonlist, GetPString(IDS_TOOLBARTEXT));
+            }
+            else if (SHORT1FROMMP(mp1) == MAIN_SETUPLIST) {
+              CHAR szKey[80];
+              ULONG size, numsaves = 0;
+
+              SetShiftState();
+              size = sizeof(ULONG);
+              sprintf(szKey, "%s.NumDirsLastTime", path);       // path is state name
+              if (!PrfQueryProfileData(fmprof,
+                                       FM3Str,
+                                       szKey,
+                                       (PVOID)&numsaves,
+                                       &size))
+              {
+                if ((WinGetLastError(WinQueryAnchorBlock(hwnd)) & 0xffff) == PMERR_NOT_IN_IDX) {
+                  saymsg(MB_ENTER | MB_ICONASTERISK, hwnd,
+                         GetPString(IDS_WARNINGTEXT),
+                         GetPString(IDS_DOESNTEXISTTEXT), path);
+                }
+                else {
+                  Win_Error2(hwnd, hwnd, __FILE__, __LINE__,
+                             IDS_PRFQUERYPROFILEDATA);
+                }
+              }
+              else {
+                char *pszStateName;
+                if ((shiftstate & KC_SHIFT) == 0)
+                  PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2));
+                pszStateName = xstrdup(path, pszSrcFile, __LINE__);
+                if (!pszStateName) {
+                  // Fall back if out of memory - already complained
+                  if ((shiftstate & KC_SHIFT) != 0 || fAutoTile) {
+                    // Autotile requested or forced
+                    PostMsg(MainObjectHwnd,
+                            UM_RESTORE,
+                            MPVOID,
+                            MPFROMLONG(1));                // Autotile
+                  }
+                }
+                else if (!PostMsg(MainObjectHwnd,
+                                  UM_RESTORE,
+                                  MPFROMP(pszStateName),
+                                  MPVOID)) {
+                  free(pszStateName);
+                }
+              }
+            }
+            else if (SHORT1FROMMP(mp1) == MAIN_CMDLIST) {
+
+              SHORT sSelect;
+
+              sSelect = (SHORT) WinSendMsg(hwndCmdlist,
+                                           LM_QUERYSELECTION,
+                                           MPFROMSHORT(LIT_FIRST), MPVOID);
+              if (sSelect >= 0)
+                WinPostMsg(hwnd,
+                           WM_COMMAND,
+                           MPFROM2SHORT(IDM_COMMANDSTART + sSelect, 0),
+                           MPVOID);
+              WinSetWindowText(hwndCmdlist, GetPString(IDS_COMMANDSTEXT));
+            }
+          }
+        }
+        break;
 
       default:
-        break;
+        break;
       }
       break;
@@ -6439 +6489 @@
   case WM_CLOSE:
     WinSendMsg(WinQueryWindow(hwnd, QW_PARENT),
-               WM_SYSCOMMAND, MPFROM2SHORT(SC_RESTORE, 0), MPVOID);
+               WM_SYSCOMMAND, MPFROM2SHORT(SC_RESTORE, 0), MPVOID);
     WinSendMsg(hwnd, WM_SAVEAPPLICATION, MPVOID, MPVOID);
     fAmClosing = TRUE;
     WinSendMsg(WinQueryWindow(hwnd, QW_PARENT),
-               WM_SYSCOMMAND, MPFROM2SHORT(SC_MINIMIZE, 0), MPVOID);
+               WM_SYSCOMMAND, MPFROM2SHORT(SC_MINIMIZE, 0), MPVOID);
     if (CloseChildren(hwnd)) {
       fAmClosing = FALSE;
       if (fAutoTile)
-        PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_TILE, 0), MPVOID);
+        PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_TILE, 0), MPVOID);
       return 0;
     }
     if (hwndTree) {
       if (!PostMsg(hwndTree, WM_CLOSE, MPVOID, MPVOID))
-        WinSendMsg(hwndTree, WM_CLOSE, MPVOID, MPVOID);
+        WinSendMsg(hwndTree, WM_CLOSE, MPVOID, MPVOID);
     }
     DosSleep(1);
@@ -6466 +6516 @@
       // Try to restore saved shutdown state
       char *pszDefaultStateName = xstrdup(GetPString(IDS_SHUTDOWNSTATE),
-                                          pszSrcFile, __LINE__);
+                                          pszSrcFile, __LINE__);
       if (pszDefaultStateName) {
-        if (!PostMsg(MainObjectHwnd, UM_RESTORE, MPFROMP(pszDefaultStateName), MPVOID))
-          // 05 Feb 08 SHL fixme to complain?
-          free(pszDefaultStateName);
+        if (!PostMsg(MainObjectHwnd, UM_RESTORE, MPFROMP(pszDefaultStateName), MPVOID))
+          // 05 Feb 08 SHL fixme to complain?
+          free(pszDefaultStateName);
       }
     }
@@ -6479 +6529 @@
     if (mp1)
       return MRFROMLONG(OpenDirCnr((HWND) 0,
-                                   hwndMain,
-                                   hwndTree, (BOOL) mp2, (char *)mp1));
+                                   hwndMain,
+                                   hwndTree, (BOOL) mp2, (char *)mp1));
     return 0;
 

trunk/dll/mainwnd.h

@@ -43 +43 @@
 HWND TopWindowName(HWND hwndParent, HWND exclude, CHAR * ret);
 
+// Data declarations
+extern ULONG AutoviewHeight;
+extern ULONG DriveLines;
+extern HMODULE FM3ModHandle;
+extern CHAR *FM3Str;
+extern HWND MainPopupMenu;
+extern HWND MainObjectHwnd;
+extern BOOL MenuInvisible;
+extern PFNWP PFNWPStatic;
+extern PFNWP PFNWPButton;
+extern RGB2 RGBGREY;
+extern BOOL fAmClosing;
+extern BOOL fAutoTile;
+extern BOOL fAutoView;
+extern BOOL fComments;
+extern BOOL fDrivebar;
+extern BOOL fFreeTree;
+extern BOOL fMoreButtons;
+extern BOOL fNoFinger;
+extern BOOL fNoSaveState;
+extern BOOL fNoTileUpdate;
+extern BOOL fRunning;
+extern BOOL fSplitStatus;
+extern BOOL fTextTools;
+extern BOOL fToolTitles;
+extern BOOL fToolbar;
+extern BOOL fUserComboBox;
+extern HBITMAP hbmLEDoff;
+extern HBITMAP hbmLEDon;
+extern HPOINTER hptrFinger;
+extern HWND hwndAutoview;
+extern HWND hwndBubble;
+extern HWND hwndName;
+extern HWND hwndStatelist;
+extern HWND hwndToolback;
+extern HWND hwndTree;
+extern USHORT shiftstate;
+
 #endif  // MAINWND_H