Changeset 1161

Timestamp:

Sep 5, 2008, 11:42:27 PM (17 years ago)

Author:

John Small

Message:

Ticket 187: Draft 1: Functions only

Location:

trunk/dll

Files:

• filter.c (modified) (1 diff)
• grep2.c (modified) (22 diffs)
• inis.c (modified) (86 diffs)
• mainwnd2.c (modified) (1 diff)
• mle.c (modified) (1 diff)
• notebook.c (modified) (108 diffs)
• pathutil.c (modified) (2 diffs)
• sortcnr.c (modified) (10 diffs)
• srchpath.c (modified) (1 diff)
• undel.c (modified) (1 diff)

trunk/dll/filter.c

@@ -51 +51 @@
 static LINKMASKS *maskhead = NULL;
 static BOOL loadedmasks = FALSE;
+
+static VOID save_masks(VOID);
 
 INT APIENTRY Filter(PMINIRECORDCORE rmini, PVOID arg)

trunk/dll/grep2.c

@@ -31 +31 @@
 #include <ctype.h>
 #include <share.h>
-#include <process.h>                    // _beginthread
+#include <process.h>                    // _beginthread
 
 #define INCL_DOS
 #define INCL_WIN
-#define INCL_LONGLONG                   // dircnrs.h
-#define INCL_WINSTDCNR                  // makelist.h
+#define INCL_LONGLONG                   // dircnrs.h
+#define INCL_WINSTDCNR                  // makelist.h
 
 #include "fm3dlg.h"
@@ -42 +42 @@
 #include "mle.h"
 #include "grep.h"
-#include "errutil.h"                    // Dos_Error...
-#include "strutil.h"                    // GetPString
+#include "errutil.h"                    // Dos_Error...
+#include "strutil.h"                    // GetPString
 #include "pathutil.h"                   // BldFullPathName
+#include "walkem.h"                     // FillPathListBox
+#include "grep2.h"
 #include "fm3dll.h"
+#include "misc.h"                       // LoadLibPath
 #include "fortify.h"
 
@@ -67 +70 @@
       *(CHAR *)mp2 = 0;
       {
-        CHAR *p;
-        CHAR *pp;
-
-        p = GetPString(IDS_ENVVARNAMES);
-        while (*p == ' ')
-          p++;
-        while (*p) {
-          *szPath = 0;
-          pp = szPath;
-          while (*p && *p != ' ')
-            *pp++ = *p++;
-          *pp = 0;
-          while (*p == ' ')
-            p++;
-          if (*szPath)
-            WinSendDlgItemMsg(hwnd,
-                              ENV_LISTBOX,
-                              LM_INSERTITEM,
-                              MPFROM2SHORT(LIT_END, 0), MPFROMP(szPath));
-        }
+        CHAR *p;
+        CHAR *pp;
+
+        p = GetPString(IDS_ENVVARNAMES);
+        while (*p == ' ')
+          p++;
+        while (*p) {
+          *szPath = 0;
+          pp = szPath;
+          while (*p && *p != ' ')
+            *pp++ = *p++;
+          *pp = 0;
+          while (*p == ' ')
+            p++;
+          if (*szPath)
+            WinSendDlgItemMsg(hwnd,
+                              ENV_LISTBOX,
+                              LM_INSERTITEM,
+                              MPFROM2SHORT(LIT_END, 0), MPFROMP(szPath));
+        }
       }
       WinSendDlgItemMsg(hwnd,
-                        ENV_NAME,
-                        EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                        ENV_NAME,
+                        EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
       WinSetDlgItemText(hwnd, ENV_NAME, lastenv);
       WinSendDlgItemMsg(hwnd,
-                        ENV_NAME,
-                        EM_SETSEL, MPFROM2SHORT(0, CCHMAXPATH), MPVOID);
+                        ENV_NAME,
+                        EM_SETSEL, MPFROM2SHORT(0, CCHMAXPATH), MPVOID);
     }
     else
@@ -105 +108 @@
       switch (SHORT2FROMMP(mp1)) {
       case LN_SELECT:
-        {
-          sSelect = (SHORT) WinSendDlgItemMsg(hwnd,
-                                              ENV_LISTBOX,
-                                              LM_QUERYSELECTION,
-                                              MPFROMSHORT(LIT_FIRST), MPVOID);
-          if (sSelect >= 0) {
-            *s = 0;
-            WinSendDlgItemMsg(hwnd,
-                              ENV_LISTBOX,
-                              LM_QUERYITEMTEXT,
-                              MPFROM2SHORT(sSelect, CCHMAXPATH), MPFROMP(s));
-            bstrip(s);
-            if (*s)
-              WinSetDlgItemText(hwnd, ENV_NAME, s);
-          }
-        }
-        break;
+        {
+          sSelect = (SHORT) WinSendDlgItemMsg(hwnd,
+                                              ENV_LISTBOX,
+                                              LM_QUERYSELECTION,
+                                              MPFROMSHORT(LIT_FIRST), MPVOID);
+          if (sSelect >= 0) {
+            *s = 0;
+            WinSendDlgItemMsg(hwnd,
+                              ENV_LISTBOX,
+                              LM_QUERYITEMTEXT,
+                              MPFROM2SHORT(sSelect, CCHMAXPATH), MPFROMP(s));
+            bstrip(s);
+            if (*s)
+              WinSetDlgItemText(hwnd, ENV_NAME, s);
+          }
+        }
+        break;
       case LN_ENTER:
-        PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(DID_OK, 0), MPVOID);
-        break;
+        PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(DID_OK, 0), MPVOID);
+        break;
       }
     }
@@ -137 +140 @@
       p = WinQueryWindowPtr(hwnd, QWL_USER);
       if (p) {
-        WinQueryDlgItemText(hwnd, ENV_NAME, CCHMAXPATH, p);
-        bstrip(p);
-        if (!*p) {
-          DosBeep(50, 100);
-          WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, ENV_NAME));
-        }
-        else {
-          strcpy(lastenv, p);
-          WinDismissDlg(hwnd, 1);
-        }
+        WinQueryDlgItemText(hwnd, ENV_NAME, CCHMAXPATH, p);
+        bstrip(p);
+        if (!*p) {
+          DosBeep(50, 100);
+          WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, ENV_NAME));
+        }
+        else {
+          strcpy(lastenv, p);
+          WinDismissDlg(hwnd, 1);
+        }
       }
       break;
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp,
-                   HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_ENV, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp,
+                   HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_ENV, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -199 +202 @@
     WinSetWindowULong(hwnd, QWL_USER, *(HWND *) mp2);
     WinSendDlgItemMsg(hwnd,
-                      GREP_MASK,
-                      EM_SETTEXTLIMIT, MPFROM2SHORT(8192, 0), MPVOID);
+                      GREP_MASK,
+                      EM_SETTEXTLIMIT, MPFROM2SHORT(8192, 0), MPVOID);
     MLEsetlimit(hwndMLE, 4096);
     MLEsetformat(hwndMLE, MLFIE_NOTRANS);
     WinSendDlgItemMsg(hwnd,
-                      GREP_NEWER,
-                      EM_SETTEXTLIMIT, MPFROM2SHORT(34, 0), MPVOID);
+                      GREP_NEWER,
+                      EM_SETTEXTLIMIT, MPFROM2SHORT(34, 0), MPVOID);
     WinSendDlgItemMsg(hwnd,
-                      GREP_OLDER,
-                      EM_SETTEXTLIMIT, MPFROM2SHORT(34, 0), MPVOID);
+                      GREP_OLDER,
+                      EM_SETTEXTLIMIT, MPFROM2SHORT(34, 0), MPVOID);
     WinSendDlgItemMsg(hwnd,
-                      GREP_GREATER,
-                      EM_SETTEXTLIMIT, MPFROM2SHORT(34, 0), MPVOID);
+                      GREP_GREATER,
+                      EM_SETTEXTLIMIT, MPFROM2SHORT(34, 0), MPVOID);
     WinSendDlgItemMsg(hwnd,
-                      GREP_LESSER,
-                      EM_SETTEXTLIMIT, MPFROM2SHORT(34, 0), MPVOID);
+                      GREP_LESSER,
+                      EM_SETTEXTLIMIT, MPFROM2SHORT(34, 0), MPVOID);
     WinSetDlgItemText(hwnd, GREP_MASK, lastmask);
     WinSendDlgItemMsg(hwnd,
-                      GREP_MASK, EM_SETSEL, MPFROM2SHORT(0, 8192), MPVOID);
+                      GREP_MASK, EM_SETSEL, MPFROM2SHORT(0, 8192), MPVOID);
     PrfQueryProfileData(fmprof, FM3Str, "RememberFlagsGrep",
-                        (PVOID) & gRemember, &size);
+                        (PVOID) & gRemember, &size);
     WinCheckButton(hwnd, GREP_REMEMBERFLAGS, gRemember);
     if (gRemember) {
       PrfQueryProfileData(fmprof, FM3Str, "Grep_Recurse",
-                          (PVOID) & recurse, &size);
+                          (PVOID) & recurse, &size);
       PrfQueryProfileData(fmprof, FM3Str, "Grep_Absolute",
-                          (PVOID) & absolute, &size);
+                          (PVOID) & absolute, &size);
       PrfQueryProfileData(fmprof, FM3Str, "Grep_Case",
-                          (PVOID) & sensitive, &size);
+                          (PVOID) & sensitive, &size);
       PrfQueryProfileData(fmprof, FM3Str, "Grep_Sayfiles",
-                          (PVOID) & sayfiles, &size);
+                          (PVOID) & sayfiles, &size);
       PrfQueryProfileData(fmprof, FM3Str, "Grep_Searchfiles",
-                          (PVOID) & searchFiles, &size);
+                          (PVOID) & searchFiles, &size);
       PrfQueryProfileData(fmprof, FM3Str, "Grep_SearchfEAs",
-                          (PVOID) & searchEAs, &size);
+                          (PVOID) & searchEAs, &size);
     }
     if (!gRemember) {
@@ -248 +251 @@
       MLEsetcurposa(hwndMLE, 4096);
       if (!searchEAs)
-        searchFiles = TRUE;
+        searchFiles = TRUE;
     }
     WinCheckButton(hwnd, GREP_RECURSE, recurse);
@@ -275 +278 @@
     if (fp) {
       while (!feof(fp)) {
-        if (!xfgets_bstripcr(s, 8192 + 4, fp, pszSrcFile, __LINE__))
-          break;
-        if (*s && *s != ';') {
-          WinSendDlgItemMsg(hwnd,
-                            GREP_LISTBOX,
-                            LM_INSERTITEM,
-                            MPFROM2SHORT(LIT_SORTASCENDING, 0), MPFROMP(s));
-        }
+        if (!xfgets_bstripcr(s, 8192 + 4, fp, pszSrcFile, __LINE__))
+          break;
+        if (*s && *s != ';') {
+          WinSendDlgItemMsg(hwnd,
+                            GREP_LISTBOX,
+                            LM_INSERTITEM,
+                            MPFROM2SHORT(LIT_SORTASCENDING, 0), MPFROMP(s));
+        }
       }
       fclose(fp);
@@ -288 +291 @@
 
     FillPathListBox(hwnd,
-                    WinWindowFromID(hwnd, GREP_DRIVELIST),
-                    (HWND) 0, NULL, FALSE);
+                    WinWindowFromID(hwnd, GREP_DRIVELIST),
+                    (HWND) 0, NULL, FALSE);
     break;
 
@@ -298 +301 @@
   case UM_SETDIR:
     PaintRecessedWindow(WinWindowFromID(hwnd, GREP_HELP),
-                        (HPS) 0, FALSE, TRUE);
+                        (HPS) 0, FALSE, TRUE);
     return 0;
 
@@ -311 +314 @@
     case GREP_REMEMBERFLAGS:
       {
-        BOOL gRemember = WinQueryButtonCheckstate(hwnd, GREP_REMEMBERFLAGS);
-
-        PrfWriteProfileData(fmprof, FM3Str, "RememberFlagsGrep",
-                            (PVOID) & gRemember, sizeof(BOOL));
+        BOOL gRemember = WinQueryButtonCheckstate(hwnd, GREP_REMEMBERFLAGS);
+
+        PrfWriteProfileData(fmprof, FM3Str, "RememberFlagsGrep",
+                            (PVOID) & gRemember, sizeof(BOOL));
       }
       break;
@@ -321 +324 @@
       switch (SHORT2FROMMP(mp1)) {
       case LN_KILLFOCUS:
-        WinSetDlgItemText(hwnd,
-                          GREP_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
-        break;
+        WinSetDlgItemText(hwnd,
+                          GREP_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
+        break;
       case LN_SETFOCUS:
-        WinSetDlgItemText(hwnd,
-                          GREP_HELP, GetPString(IDS_2CLICKADDDRVMASKTEXT));
-        break;
+        WinSetDlgItemText(hwnd,
+                          GREP_HELP, GetPString(IDS_2CLICKADDDRVMASKTEXT));
+        break;
       case LN_ENTER:
-        WinQueryDlgItemText(hwnd, GREP_MASK, 8192, s);
-        bstrip(s);
-        p = strrchr(s, '\\');
-        if (p)
-          strcpy(simple, p);
-        else if (*s) {
-          strcpy(simple, "\\");
-          strcat(simple, s);
-          *s = 0;
-        }
-        else
-          strcpy(simple, "\\*");
-        if (simple[strlen(simple) - 1] == ';')
-          simple[strlen(simple) - 1] = 0;
-        lLen = strlen(simple) + 1;
-        if (strlen(s) > 8192 - lLen) {
-          Runtime_Error(pszSrcFile, __LINE__, "too big");
-          WinSetDlgItemText(hwnd, GREP_MASK, s);
-          break;
-        }
-
-        sSelect = (SHORT) WinSendDlgItemMsg(hwnd,
-                                            GREP_DRIVELIST,
-                                            LM_QUERYSELECTION,
-                                            MPFROMSHORT(LIT_FIRST), MPVOID);
-        if (sSelect >= 0) {
-          if (*s && s[strlen(s) - 1] != ';')
-            strcat(s, ";");
-          WinSendDlgItemMsg(hwnd,
-                            GREP_DRIVELIST,
-                            LM_QUERYITEMTEXT,
-                            MPFROM2SHORT(sSelect,
-                                         (8192 - strlen(s)) - lLen),
-                            MPFROMP(&s[strlen(s)]));
-          rstrip(s);
-          if (*s) {
-            strcat(s, simple);
-            WinSetDlgItemText(hwnd, GREP_MASK, s);
-            WinSendDlgItemMsg(hwnd,
-                              GREP_MASK,
-                              EM_SETSEL,
-                              MPFROM2SHORT(strlen(s) - (lLen + 1),
-                                           strlen(s)), MPVOID);
-            PostMsg(hwnd,
-                    UM_FOCUSME,
-                    MPFROMLONG(WinWindowFromID(hwnd, GREP_MASK)), MPVOID);
-          }
-        }
-        break;                          // LN_ENTER
-      }                                 // switch
+        WinQueryDlgItemText(hwnd, GREP_MASK, 8192, s);
+        bstrip(s);
+        p = strrchr(s, '\\');
+        if (p)
+          strcpy(simple, p);
+        else if (*s) {
+          strcpy(simple, "\\");
+          strcat(simple, s);
+          *s = 0;
+        }
+        else
+          strcpy(simple, "\\*");
+        if (simple[strlen(simple) - 1] == ';')
+          simple[strlen(simple) - 1] = 0;
+        lLen = strlen(simple) + 1;
+        if (strlen(s) > 8192 - lLen) {
+          Runtime_Error(pszSrcFile, __LINE__, "too big");
+          WinSetDlgItemText(hwnd, GREP_MASK, s);
+          break;
+        }
+
+        sSelect = (SHORT) WinSendDlgItemMsg(hwnd,
+                                            GREP_DRIVELIST,
+                                            LM_QUERYSELECTION,
+                                            MPFROMSHORT(LIT_FIRST), MPVOID);
+        if (sSelect >= 0) {
+          if (*s && s[strlen(s) - 1] != ';')
+            strcat(s, ";");
+          WinSendDlgItemMsg(hwnd,
+                            GREP_DRIVELIST,
+                            LM_QUERYITEMTEXT,
+                            MPFROM2SHORT(sSelect,
+                                         (8192 - strlen(s)) - lLen),
+                            MPFROMP(&s[strlen(s)]));
+          rstrip(s);
+          if (*s) {
+            strcat(s, simple);
+            WinSetDlgItemText(hwnd, GREP_MASK, s);
+            WinSendDlgItemMsg(hwnd,
+                              GREP_MASK,
+                              EM_SETSEL,
+                              MPFROM2SHORT(strlen(s) - (lLen + 1),
+                                           strlen(s)), MPVOID);
+            PostMsg(hwnd,
+                    UM_FOCUSME,
+                    MPFROMLONG(WinWindowFromID(hwnd, GREP_MASK)), MPVOID);
+          }
+        }
+        break;                          // LN_ENTER
+      }                                 // switch
       break;
 
@@ -384 +387 @@
       switch (SHORT2FROMMP(mp1)) {
       case LN_KILLFOCUS:
-        WinSetDlgItemText(hwnd,
-                          GREP_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
-        break;
+        WinSetDlgItemText(hwnd,
+                          GREP_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
+        break;
       case LN_SETFOCUS:
-        WinSetDlgItemText(hwnd, GREP_HELP, GetPString(IDS_ADDSELDELMASKTEXT));
-        break;
+        WinSetDlgItemText(hwnd, GREP_HELP, GetPString(IDS_ADDSELDELMASKTEXT));
+        break;
       case LN_ENTER:
       case LN_SELECT:
-        if ((SHORT2FROMMP(mp1) == LN_ENTER &&
-             !WinQueryButtonCheckstate(hwnd, GREP_APPEND)) ||
-            (SHORT2FROMMP(mp1) == LN_SELECT &&
-             WinQueryButtonCheckstate(hwnd, GREP_APPEND)))
-          break;
-        {
-          sSelect = (SHORT) WinSendDlgItemMsg(hwnd,
-                                              GREP_LISTBOX,
-                                              LM_QUERYSELECTION,
-                                              MPFROMSHORT(LIT_FIRST), MPVOID);
-          if (sSelect >= 0) {
-            *s = 0;
-            if (WinQueryButtonCheckstate(hwnd, GREP_APPEND)) {
-              WinQueryDlgItemText(hwnd, GREP_MASK, 8192, s);
-              bstrip(s);
-              if (*s && strlen(s) < 8190 && s[strlen(s) - 1] != ';')
-                strcat(s, ";");
-            }
-            WinSendDlgItemMsg(hwnd,
-                              GREP_LISTBOX,
-                              LM_QUERYITEMTEXT,
-                              MPFROM2SHORT(sSelect, 8192 - strlen(s)),
-                              MPFROMP(s + strlen(s)));
-            bstrip(s);
-            if (*s)
-              WinSetDlgItemText(hwnd, GREP_MASK, s);
-          }
-        }
-        break;
+        if ((SHORT2FROMMP(mp1) == LN_ENTER &&
+             !WinQueryButtonCheckstate(hwnd, GREP_APPEND)) ||
+            (SHORT2FROMMP(mp1) == LN_SELECT &&
+             WinQueryButtonCheckstate(hwnd, GREP_APPEND)))
+          break;
+        {
+          sSelect = (SHORT) WinSendDlgItemMsg(hwnd,
+                                              GREP_LISTBOX,
+                                              LM_QUERYSELECTION,
+                                              MPFROMSHORT(LIT_FIRST), MPVOID);
+          if (sSelect >= 0) {
+            *s = 0;
+            if (WinQueryButtonCheckstate(hwnd, GREP_APPEND)) {
+              WinQueryDlgItemText(hwnd, GREP_MASK, 8192, s);
+              bstrip(s);
+              if (*s && strlen(s) < 8190 && s[strlen(s) - 1] != ';')
+                strcat(s, ";");
+            }
+            WinSendDlgItemMsg(hwnd,
+                              GREP_LISTBOX,
+                              LM_QUERYITEMTEXT,
+                              MPFROM2SHORT(sSelect, 8192 - strlen(s)),
+                              MPFROMP(s + strlen(s)));
+            bstrip(s);
+            if (*s)
+              WinSetDlgItemText(hwnd, GREP_MASK, s);
+          }
+        }
+        break;
       }
       break;
@@ -426 +429 @@
     case GREP_MASK:
       if (SHORT2FROMMP(mp1) == EN_KILLFOCUS)
-        WinSetDlgItemText(hwnd,
-                          GREP_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
+        WinSetDlgItemText(hwnd,
+                          GREP_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
       if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
-        WinSetDlgItemText(hwnd, GREP_HELP, GetPString(IDS_MASKSFINDTEXT));
+        WinSetDlgItemText(hwnd, GREP_HELP, GetPString(IDS_MASKSFINDTEXT));
       break;
     case GREP_SEARCH:
       if (SHORT2FROMMP(mp1) == MLN_KILLFOCUS)
-        WinSetDlgItemText(hwnd,
-                          GREP_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
+        WinSetDlgItemText(hwnd,
+                          GREP_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
       if (SHORT2FROMMP(mp1) == MLN_SETFOCUS)
-        WinSetDlgItemText(hwnd, GREP_HELP, GetPString(IDS_TEXTFINDTEXT));
+        WinSetDlgItemText(hwnd, GREP_HELP, GetPString(IDS_TEXTFINDTEXT));
       break;
     case GREP_GREATER:
       if (SHORT2FROMMP(mp1) == EN_KILLFOCUS)
-        WinSetDlgItemText(hwnd,
-                          GREP_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
+        WinSetDlgItemText(hwnd,
+                          GREP_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
       if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
-        WinSetDlgItemText(hwnd, GREP_HELP, GetPString(IDS_MINSIZEFINDTEXT));
+        WinSetDlgItemText(hwnd, GREP_HELP, GetPString(IDS_MINSIZEFINDTEXT));
       break;
     case GREP_LESSER:
       if (SHORT2FROMMP(mp1) == EN_KILLFOCUS)
-        WinSetDlgItemText(hwnd,
-                          GREP_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
+        WinSetDlgItemText(hwnd,
+                          GREP_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
       if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
-        WinSetDlgItemText(hwnd, GREP_HELP, GetPString(IDS_MAXSIZEFINDTEXT));
+        WinSetDlgItemText(hwnd, GREP_HELP, GetPString(IDS_MAXSIZEFINDTEXT));
       break;
     case GREP_NEWER:
       if (SHORT2FROMMP(mp1) == EN_KILLFOCUS)
-        WinSetDlgItemText(hwnd,
-                          GREP_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
+        WinSetDlgItemText(hwnd,
+                          GREP_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
       if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
-        WinSetDlgItemText(hwnd, GREP_HELP, GetPString(IDS_MAXAGEFINDTEXT));
+        WinSetDlgItemText(hwnd, GREP_HELP, GetPString(IDS_MAXAGEFINDTEXT));
       break;
     case GREP_OLDER:
       if (SHORT2FROMMP(mp1) == EN_KILLFOCUS)
-        WinSetDlgItemText(hwnd,
-                          GREP_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
+        WinSetDlgItemText(hwnd,
+                          GREP_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
       if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
-        WinSetDlgItemText(hwnd, GREP_HELP, GetPString(IDS_MINAGEFINDTEXT));
+        WinSetDlgItemText(hwnd, GREP_HELP, GetPString(IDS_MINAGEFINDTEXT));
       break;
     case GREP_FINDDUPES:
       {
-        BOOL finddupes = WinQueryButtonCheckstate(hwnd, GREP_FINDDUPES);
-
-        WinEnableWindow(WinWindowFromID(hwnd, GREP_SEARCH), !finddupes);
-        WinEnableWindow(WinWindowFromID(hwnd, GREP_ABSOLUTE), !finddupes);
-        WinEnableWindow(WinWindowFromID(hwnd, GREP_CASE), !finddupes);
-        WinEnableWindow(WinWindowFromID(hwnd, GREP_CRCDUPES), finddupes);
-        WinEnableWindow(WinWindowFromID(hwnd, GREP_NOSIZEDUPES), finddupes);
-        WinEnableWindow(WinWindowFromID(hwnd, GREP_IGNOREEXTDUPES),
-                        finddupes);
-        WinEnableWindow(WinWindowFromID(hwnd, GREP_SEARCHFILES), !finddupes);
-        WinEnableWindow(WinWindowFromID(hwnd, GREP_SEARCHEAS), !finddupes);
-        WinEnableWindow(WinWindowFromID(hwnd, GREP_GREATER), !finddupes);
-        WinEnableWindow(WinWindowFromID(hwnd, GREP_LESSER), !finddupes);
-        WinEnableWindow(WinWindowFromID(hwnd, GREP_NEWER), !finddupes);
-        WinEnableWindow(WinWindowFromID(hwnd, GREP_OLDER), !finddupes);
-        WinEnableWindow(WinWindowFromID(hwnd, GREP_FINDIFANY), !finddupes);
-        WinEnableWindow(WinWindowFromID(hwnd, GREP_GK), !finddupes);
-        WinEnableWindow(WinWindowFromID(hwnd, GREP_LK), !finddupes);
-        WinEnableWindow(WinWindowFromID(hwnd, GREP_NM), !finddupes);
-        WinEnableWindow(WinWindowFromID(hwnd, GREP_OM), !finddupes);
-        if (finddupes)
-          WinCheckButton(hwnd, GREP_RECURSE, TRUE);
+        BOOL finddupes = WinQueryButtonCheckstate(hwnd, GREP_FINDDUPES);
+
+        WinEnableWindow(WinWindowFromID(hwnd, GREP_SEARCH), !finddupes);
+        WinEnableWindow(WinWindowFromID(hwnd, GREP_ABSOLUTE), !finddupes);
+        WinEnableWindow(WinWindowFromID(hwnd, GREP_CASE), !finddupes);
+        WinEnableWindow(WinWindowFromID(hwnd, GREP_CRCDUPES), finddupes);
+        WinEnableWindow(WinWindowFromID(hwnd, GREP_NOSIZEDUPES), finddupes);
+        WinEnableWindow(WinWindowFromID(hwnd, GREP_IGNOREEXTDUPES),
+                        finddupes);
+        WinEnableWindow(WinWindowFromID(hwnd, GREP_SEARCHFILES), !finddupes);
+        WinEnableWindow(WinWindowFromID(hwnd, GREP_SEARCHEAS), !finddupes);
+        WinEnableWindow(WinWindowFromID(hwnd, GREP_GREATER), !finddupes);
+        WinEnableWindow(WinWindowFromID(hwnd, GREP_LESSER), !finddupes);
+        WinEnableWindow(WinWindowFromID(hwnd, GREP_NEWER), !finddupes);
+        WinEnableWindow(WinWindowFromID(hwnd, GREP_OLDER), !finddupes);
+        WinEnableWindow(WinWindowFromID(hwnd, GREP_FINDIFANY), !finddupes);
+        WinEnableWindow(WinWindowFromID(hwnd, GREP_GK), !finddupes);
+        WinEnableWindow(WinWindowFromID(hwnd, GREP_LK), !finddupes);
+        WinEnableWindow(WinWindowFromID(hwnd, GREP_NM), !finddupes);
+        WinEnableWindow(WinWindowFromID(hwnd, GREP_OM), !finddupes);
+        if (finddupes)
+          WinCheckButton(hwnd, GREP_RECURSE, TRUE);
       }
     }
@@ -498 +501 @@
     case GREP_ENV:
       {
-        CHAR *t;
-        CHAR env[8192];
-
-        *path = 0;
-        if (!WinDlgBox(HWND_DESKTOP,
-                       hwnd, EnvDlgProc, FM3ModHandle, ENV_FRAME, path)) {
-          break;
-        }
-        bstrip(path);
-        if (!*path)
-          break;
-        if (!stricmp(path, "LIBPATH"))
-          LoadLibPath(env, 8192);
-        else {
-          p = getenv(path);
-          if (!p)
-            break;
-          strcpy(env, p);
-        }
-        bstrip(env);
-        if (!*env)
-          break;
-        WinQueryDlgItemText(hwnd, GREP_MASK, 8192, s);
-        bstrip(s);
-        if (strlen(s) > 8192 - 5) {
-          Runtime_Error(pszSrcFile, __LINE__, "too big");
-          break;
-        }
-        p = strrchr(s, '\\');
-        if (p)
-          strcpy(simple, p + 1);
-        else if (*s)
-          strcpy(simple, s);
-        else
-          strcpy(simple, "*");
-        if (!p)
-          *s = 0;
-        if (simple[strlen(simple) - 1] == ';')
-          simple[strlen(simple) - 1] = 0;
-        lLen = strlen(simple) + 1;
-        p = env;
-        while (p && *p) {
-          strncpy(path, p, CCHMAXPATH - 1);
-          path[CCHMAXPATH - 1] = 0;
-          t = strchr(path, ';');
-          if (t)
-            *t = 0;
-          bstrip(path);
-          if (isalpha(*path) && path[1] == ':' && path[2] == '\\') {
-            if (strlen(s) > (8192 - lLen) - (strlen(path) + 1)) {
-              WinSetDlgItemText(hwnd, GREP_MASK, s);
-              break;
-            }
-            if (!*s || (*s && s[strlen(s) - 1] != ';')) {
-              if (*s)
-                strcat(s, ";");
-              strcat(s, path);
-              lLen += strlen(path);
-              if (s[strlen(s) - 1] != '\\') {
-                lLen++;
-                strcat(s, "\\");
-              }
-              rstrip(s);
-              if (*s) {
-                strcat(s, simple);
-                WinSetDlgItemText(hwnd, GREP_MASK, s);
-                WinSendDlgItemMsg(hwnd,
-                                  GREP_MASK,
-                                  EM_SETSEL,
-                                  MPFROM2SHORT(strlen(s) - (lLen - 1),
-                                               strlen(s)), MPVOID);
-              }
-            }
-          }
-          p = strchr(p, ';');
-          if (p)
-            p++;
-        }
+        CHAR *t;
+        CHAR env[8192];
+
+        *path = 0;
+        if (!WinDlgBox(HWND_DESKTOP,
+                       hwnd, EnvDlgProc, FM3ModHandle, ENV_FRAME, path)) {
+          break;
+        }
+        bstrip(path);
+        if (!*path)
+          break;
+        if (!stricmp(path, "LIBPATH"))
+          LoadLibPath(env, 8192);
+        else {
+          p = getenv(path);
+          if (!p)
+            break;
+          strcpy(env, p);
+        }
+        bstrip(env);
+        if (!*env)
+          break;
+        WinQueryDlgItemText(hwnd, GREP_MASK, 8192, s);
+        bstrip(s);
+        if (strlen(s) > 8192 - 5) {
+          Runtime_Error(pszSrcFile, __LINE__, "too big");
+          break;
+        }
+        p = strrchr(s, '\\');
+        if (p)
+          strcpy(simple, p + 1);
+        else if (*s)
+          strcpy(simple, s);
+        else
+          strcpy(simple, "*");
+        if (!p)
+          *s = 0;
+        if (simple[strlen(simple) - 1] == ';')
+          simple[strlen(simple) - 1] = 0;
+        lLen = strlen(simple) + 1;
+        p = env;
+        while (p && *p) {
+          strncpy(path, p, CCHMAXPATH - 1);
+          path[CCHMAXPATH - 1] = 0;
+          t = strchr(path, ';');
+          if (t)
+            *t = 0;
+          bstrip(path);
+          if (isalpha(*path) && path[1] == ':' && path[2] == '\\') {
+            if (strlen(s) > (8192 - lLen) - (strlen(path) + 1)) {
+              WinSetDlgItemText(hwnd, GREP_MASK, s);
+              break;
+            }
+            if (!*s || (*s && s[strlen(s) - 1] != ';')) {
+              if (*s)
+                strcat(s, ";");
+              strcat(s, path);
+              lLen += strlen(path);
+              if (s[strlen(s) - 1] != '\\') {
+                lLen++;
+                strcat(s, "\\");
+              }
+              rstrip(s);
+              if (*s) {
+                strcat(s, simple);
+                WinSetDlgItemText(hwnd, GREP_MASK, s);
+                WinSendDlgItemMsg(hwnd,
+                                  GREP_MASK,
+                                  EM_SETSEL,
+                                  MPFROM2SHORT(strlen(s) - (lLen - 1),
+                                               strlen(s)), MPVOID);
+              }
+            }
+          }
+          p = strchr(p, ';');
+          if (p)
+            p++;
+        }
       }
       break;
@@ -583 +586 @@
       bstrip(s);
       if (strlen(s) > 8192 - 5) {
-        Runtime_Error(pszSrcFile, __LINE__, "too big");
-        break;
+        Runtime_Error(pszSrcFile, __LINE__, "too big");
+        break;
       }
       *path = 0;
       if (WinDlgBox(HWND_DESKTOP,
-                    hwnd,
-                    WalkAllDlgProc,
-                    FM3ModHandle, WALK_FRAME, MPFROMP(path)) && *path) {
-        p = strrchr(s, '\\');
-        if (p)
-          strcpy(simple, p + 1);
-        else if (*s)
-          strcpy(simple, s);
-        else
-          strcpy(simple, "*");
-        if (!p)
-          *s = 0;
-        if (simple[strlen(simple) - 1] == ';')
-          simple[strlen(simple) - 1] = 0;
-        lLen = strlen(simple) + 1;
-        if (strlen(s) > (8192 - lLen) - (strlen(path) + 1)) {
-          Runtime_Error(pszSrcFile, __LINE__, "too big");
-          WinSetDlgItemText(hwnd, GREP_MASK, s);
-          break;
-        }
-        if (!*s || (*s && s[strlen(s) - 1] != ';')) {
-          if (*s)
-            strcat(s, ";");
-          strcat(s, path);
-          lLen += strlen(path);
-          if (s[strlen(s) - 1] != '\\') {
-            lLen++;
-            strcat(s, "\\");
-          }
-          rstrip(s);
-          if (*s) {
-            strcat(s, simple);
-            WinSetDlgItemText(hwnd, GREP_MASK, s);
-            WinSendDlgItemMsg(hwnd,
-                              GREP_MASK,
-                              EM_SETSEL,
-                              MPFROM2SHORT(strlen(s) - (lLen - 1),
-                                           strlen(s)), MPVOID);
-          }
-        }
+                    hwnd,
+                    WalkAllDlgProc,
+                    FM3ModHandle, WALK_FRAME, MPFROMP(path)) && *path) {
+        p = strrchr(s, '\\');
+        if (p)
+          strcpy(simple, p + 1);
+        else if (*s)
+          strcpy(simple, s);
+        else
+          strcpy(simple, "*");
+        if (!p)
+          *s = 0;
+        if (simple[strlen(simple) - 1] == ';')
+          simple[strlen(simple) - 1] = 0;
+        lLen = strlen(simple) + 1;
+        if (strlen(s) > (8192 - lLen) - (strlen(path) + 1)) {
+          Runtime_Error(pszSrcFile, __LINE__, "too big");
+          WinSetDlgItemText(hwnd, GREP_MASK, s);
+          break;
+        }
+        if (!*s || (*s && s[strlen(s) - 1] != ';')) {
+          if (*s)
+            strcat(s, ";");
+          strcat(s, path);
+          lLen += strlen(path);
+          if (s[strlen(s) - 1] != '\\') {
+            lLen++;
+            strcat(s, "\\");
+          }
+          rstrip(s);
+          if (*s) {
+            strcat(s, simple);
+            WinSetDlgItemText(hwnd, GREP_MASK, s);
+            WinSendDlgItemMsg(hwnd,
+                              GREP_MASK,
+                              EM_SETSEL,
+                              MPFROM2SHORT(strlen(s) - (lLen - 1),
+                                           strlen(s)), MPVOID);
+          }
+        }
       }
       break;
@@ -636 +639 @@
       bstrip(s);
       if (*s) {
-        sSelect = (SHORT) WinSendDlgItemMsg(hwnd,
-                                            GREP_LISTBOX,
-                                            LM_SEARCHSTRING,
-                                            MPFROM2SHORT(0, LIT_FIRST),
-                                            MPFROMP(s));
-        if (sSelect < 0) {
-          WinSendDlgItemMsg(hwnd,
-                            GREP_LISTBOX,
-                            LM_INSERTITEM,
-                            MPFROM2SHORT(LIT_SORTASCENDING, 0), MPFROMP(s));
-          changed = TRUE;
-        }
+        sSelect = (SHORT) WinSendDlgItemMsg(hwnd,
+                                            GREP_LISTBOX,
+                                            LM_SEARCHSTRING,
+                                            MPFROM2SHORT(0, LIT_FIRST),
+                                            MPFROMP(s));
+        if (sSelect < 0) {
+          WinSendDlgItemMsg(hwnd,
+                            GREP_LISTBOX,
+                            LM_INSERTITEM,
+                            MPFROM2SHORT(LIT_SORTASCENDING, 0), MPFROMP(s));
+          changed = TRUE;
+        }
       }
       break;
@@ -653 +656 @@
     case GREP_DELETE:
       sSelect = (SHORT) WinSendDlgItemMsg(hwnd,
-                                          GREP_LISTBOX,
-                                          LM_QUERYSELECTION,
-                                          MPFROMSHORT(LIT_FIRST), MPVOID);
+                                          GREP_LISTBOX,
+                                          LM_QUERYSELECTION,
+                                          MPFROMSHORT(LIT_FIRST), MPVOID);
       if (sSelect >= 0) {
-        WinSendDlgItemMsg(hwnd,
-                          GREP_LISTBOX,
-                          LM_DELETEITEM, MPFROM2SHORT(sSelect, 0), MPVOID);
-        changed = TRUE;
+        WinSendDlgItemMsg(hwnd,
+                          GREP_LISTBOX,
+                          LM_DELETEITEM, MPFROM2SHORT(sSelect, 0), MPVOID);
+        changed = TRUE;
       }
       break;
@@ -702 +705 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp,
-                   HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_GREP, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp,
+                   HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_GREP, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
 
@@ -711 +714 @@
     case GREP_ALLHDS:
       {
-        CHAR szDrive[] = " :\\";
-        ULONG ulDriveNum;
-        ULONG ulDriveMap;
-        INT x;
-        BOOL incl;
-
-        CHAR new[8192];
-
-        *s = 0;
-        WinQueryDlgItemText(hwnd, GREP_MASK, 8192, s);
-        s[8192 - 1] = 0;
-        p = strchr(s, ';');
-        if (p)
-          *p = 0;
-        p = strrchr(s, '\\');
-        if (!p)
-          p = strrchr(s, '/');
-        if (!p)
-          p = strrchr(s, ':');
-        if (p)
-          strcpy(s, p + 1);
-        if (!*s)
-          strcpy(s, "*");
-        DosError(FERR_DISABLEHARDERR);
-        DosQCurDisk(&ulDriveNum, &ulDriveMap);
-        *new = 0;
-        for (x = 2; x < 26; x++) {
-          if (ulDriveMap & (1L << x)) {
-            incl = FALSE;
-            switch (SHORT1FROMMP(mp1)) {
-            case GREP_ALLHDS:
-              if (!(driveflags[x] & (DRIVE_REMOVABLE | DRIVE_IGNORE)))
-                incl = TRUE;
-              break;
-            case GREP_LOCALHDS:
-              if (!(driveflags[x] &
-                    (DRIVE_REMOVABLE | DRIVE_IGNORE | DRIVE_REMOTE |
-                     DRIVE_VIRTUAL)))
-                incl = TRUE;
-              break;
-            case GREP_REMOTEHDS:
-              if (!(driveflags[x] &
-                    (DRIVE_REMOVABLE | DRIVE_IGNORE)) &&
-                  (driveflags[x] & DRIVE_REMOTE))
-                incl = TRUE;
-              break;
-            }
-          }
-          if (incl) {
-            if (strlen(new) + strlen(s) + 5 < 8192 - 1) {
-              if (*new)
-                strcat(new, ";");
-              *szDrive = x + 'A';
-              strcat(new, szDrive);
-              strcat(new, s);
-            }
-          }
-        }
-        if (*new)
-          WinSetDlgItemText(hwnd, GREP_MASK, new);
+        CHAR szDrive[] = " :\\";
+        ULONG ulDriveNum;
+        ULONG ulDriveMap;
+        INT x;
+        BOOL incl;
+
+        CHAR new[8192];
+
+        *s = 0;
+        WinQueryDlgItemText(hwnd, GREP_MASK, 8192, s);
+        s[8192 - 1] = 0;
+        p = strchr(s, ';');
+        if (p)
+          *p = 0;
+        p = strrchr(s, '\\');
+        if (!p)
+          p = strrchr(s, '/');
+        if (!p)
+          p = strrchr(s, ':');
+        if (p)
+          strcpy(s, p + 1);
+        if (!*s)
+          strcpy(s, "*");
+        DosError(FERR_DISABLEHARDERR);
+        DosQCurDisk(&ulDriveNum, &ulDriveMap);
+        *new = 0;
+        for (x = 2; x < 26; x++) {
+          if (ulDriveMap & (1L << x)) {
+            incl = FALSE;
+            switch (SHORT1FROMMP(mp1)) {
+            case GREP_ALLHDS:
+              if (!(driveflags[x] & (DRIVE_REMOVABLE | DRIVE_IGNORE)))
+                incl = TRUE;
+              break;
+            case GREP_LOCALHDS:
+              if (!(driveflags[x] &
+                    (DRIVE_REMOVABLE | DRIVE_IGNORE | DRIVE_REMOTE |
+                     DRIVE_VIRTUAL)))
+                incl = TRUE;
+              break;
+            case GREP_REMOTEHDS:
+              if (!(driveflags[x] &
+                    (DRIVE_REMOVABLE | DRIVE_IGNORE)) &&
+                  (driveflags[x] & DRIVE_REMOTE))
+                incl = TRUE;
+              break;
+            }
+          }
+          if (incl) {
+            if (strlen(new) + strlen(s) + 5 < 8192 - 1) {
+              if (*new)
+                strcat(new, ";");
+              *szDrive = x + 'A';
+              strcat(new, szDrive);
+              strcat(new, s);
+            }
+          }
+        }
+        if (*new)
+          WinSetDlgItemText(hwnd, GREP_MASK, new);
       }
       break;
@@ -777 +780 @@
       hwndCollect = WinQueryWindowULong(hwnd, QWL_USER);
       if (!hwndCollect)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else {
-        // 07 Feb 08 SHL - fixme to malloc and free in thread
-        static GREP g;          // Passed to thread
-
-        p = xmalloc(8192 + 512, pszSrcFile, __LINE__);
-        if (!p)
-          break;
-        memset(&g, 0, sizeof(GREP));
-        g.size = sizeof(GREP);
-        recurse = WinQueryButtonCheckstate(hwnd, GREP_RECURSE) != 0;
-        absolute = WinQueryButtonCheckstate(hwnd, GREP_ABSOLUTE) != 0;
-        sensitive = WinQueryButtonCheckstate(hwnd, GREP_CASE) != 0;
-        sayfiles = WinQueryButtonCheckstate(hwnd, GREP_SAYFILES) != 0;
-        searchEAs = WinQueryButtonCheckstate(hwnd, GREP_SEARCHEAS) != 0;
-        searchFiles = WinQueryButtonCheckstate(hwnd, GREP_SEARCHFILES) != 0;
-        findifany = WinQueryButtonCheckstate(hwnd, GREP_FINDIFANY) != 0;
-        gRemember = WinQueryButtonCheckstate(hwnd, GREP_REMEMBERFLAGS);
-        if (gRemember) {
-          PrfWriteProfileData(fmprof, FM3Str, "Grep_Recurse",
-                              (PVOID) & recurse, sizeof(BOOL));
-          PrfWriteProfileData(fmprof, FM3Str, "Grep_Absolute",
-                              (PVOID) & absolute, sizeof(BOOL));
-          PrfWriteProfileData(fmprof, FM3Str, "Grep_Case",
-                              (PVOID) & sensitive, sizeof(BOOL));
-          PrfWriteProfileData(fmprof, FM3Str, "Grep_Sayfiles",
-                              (PVOID) & sayfiles, sizeof(BOOL));
-          PrfWriteProfileData(fmprof, FM3Str, "Grep_Searchfiles",
-                              (PVOID) & searchFiles, sizeof(BOOL));
-          PrfWriteProfileData(fmprof, FM3Str, "Grep_SearchfEAs",
-                              (PVOID) & searchEAs, sizeof(BOOL));
-        }
-        g.finddupes = WinQueryButtonCheckstate(hwnd, GREP_FINDDUPES) != 0;
-        if (g.finddupes) {
-          g.CRCdupes = WinQueryButtonCheckstate(hwnd, GREP_CRCDUPES) != 0;
-          g.nosizedupes =
-            WinQueryButtonCheckstate(hwnd, GREP_NOSIZEDUPES) != 0;
-          g.ignoreextdupes =
-            WinQueryButtonCheckstate(hwnd, GREP_IGNOREEXTDUPES) != 0;
-        }
-        // Parse file masks
-        *p = 0;
-        WinQueryDlgItemText(hwnd, GREP_MASK, 8192, p);
-        bstrip(p);
-        if (!*p) {
-          DosBeep(50, 100);
-          WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, GREP_MASK));
-          free(p);
+        // 07 Feb 08 SHL - fixme to malloc and free in thread
+        static GREP g;          // Passed to thread
+
+        p = xmalloc(8192 + 512, pszSrcFile, __LINE__);
+        if (!p)
+          break;
+        memset(&g, 0, sizeof(GREP));
+        g.size = sizeof(GREP);
+        recurse = WinQueryButtonCheckstate(hwnd, GREP_RECURSE) != 0;
+        absolute = WinQueryButtonCheckstate(hwnd, GREP_ABSOLUTE) != 0;
+        sensitive = WinQueryButtonCheckstate(hwnd, GREP_CASE) != 0;
+        sayfiles = WinQueryButtonCheckstate(hwnd, GREP_SAYFILES) != 0;
+        searchEAs = WinQueryButtonCheckstate(hwnd, GREP_SEARCHEAS) != 0;
+        searchFiles = WinQueryButtonCheckstate(hwnd, GREP_SEARCHFILES) != 0;
+        findifany = WinQueryButtonCheckstate(hwnd, GREP_FINDIFANY) != 0;
+        gRemember = WinQueryButtonCheckstate(hwnd, GREP_REMEMBERFLAGS);
+        if (gRemember) {
+          PrfWriteProfileData(fmprof, FM3Str, "Grep_Recurse",
+                              (PVOID) & recurse, sizeof(BOOL));
+          PrfWriteProfileData(fmprof, FM3Str, "Grep_Absolute",
+                              (PVOID) & absolute, sizeof(BOOL));
+          PrfWriteProfileData(fmprof, FM3Str, "Grep_Case",
+                              (PVOID) & sensitive, sizeof(BOOL));
+          PrfWriteProfileData(fmprof, FM3Str, "Grep_Sayfiles",
+                              (PVOID) & sayfiles, sizeof(BOOL));
+          PrfWriteProfileData(fmprof, FM3Str, "Grep_Searchfiles",
+                              (PVOID) & searchFiles, sizeof(BOOL));
+          PrfWriteProfileData(fmprof, FM3Str, "Grep_SearchfEAs",
+                              (PVOID) & searchEAs, sizeof(BOOL));
+        }
+        g.finddupes = WinQueryButtonCheckstate(hwnd, GREP_FINDDUPES) != 0;
+        if (g.finddupes) {
+          g.CRCdupes = WinQueryButtonCheckstate(hwnd, GREP_CRCDUPES) != 0;
+          g.nosizedupes =
+            WinQueryButtonCheckstate(hwnd, GREP_NOSIZEDUPES) != 0;
+          g.ignoreextdupes =
+            WinQueryButtonCheckstate(hwnd, GREP_IGNOREEXTDUPES) != 0;
+        }
+        // Parse file masks
+        *p = 0;
+        WinQueryDlgItemText(hwnd, GREP_MASK, 8192, p);
+        bstrip(p);
+        if (!*p) {
+          DosBeep(50, 100);
+          WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, GREP_MASK));
+          free(p);
 #         ifdef FORTIFY
           Fortify_LeaveScope();
 #          endif
-          break;
-        }
-        strcpy(g.tosearch, p);
-        strcpy(lastmask, p);
-        // Parse search strings
-        *p = 0;
-        WinQueryWindowText(hwndMLE, 4096, p);
-        strcpy(lasttext, p);
-        {
-          CHAR *pszFrom;
-          CHAR *pszTo;
-          ULONG matched = 0;
-
-          pszTo = g.searchPattern;
-          pszFrom = p;
-          while (*pszFrom) {
-            if (*pszFrom == '\r') {
-              pszFrom++;
-              continue;
-            }
-            if (*pszFrom == '\n') {
-              if (*(pszFrom + 1))
-                matched++;
-              *pszTo = 0;
-            }
-            else
-              *pszTo = *pszFrom;
-            pszTo++;
-            pszFrom++;
-          }
-          if (*g.searchPattern)
-            matched++;
-          *pszTo++ = 0;
-          *pszTo = 0;
-          g.numlines = matched;
-          if (matched) {
-            g.matched = xmalloc(g.numlines, pszSrcFile, __LINE__);
-            if (!g.matched)
-              g.numlines = 0;
-          }
-        }
-        *p = 0;
-        WinQueryDlgItemText(hwnd, GREP_GREATER, 34, p);
-        greater = atol(p);
-        *p = 0;
-        WinQueryDlgItemText(hwnd, GREP_LESSER, 34, p);
-        lesser = atol(p);
-        *p = 0;
-        WinQueryDlgItemText(hwnd, GREP_NEWER, 34, p);
-        newer = atoi(p);
-        *p = 0;
-        WinQueryDlgItemText(hwnd, GREP_OLDER, 34, p);
-        older = atoi(p);
-        if (older || newer) {
-          FDATE fdate;
-          FTIME ftime;
-          struct tm tm;
-          time_t t;
-
-          t = time(NULL);
-          tm = *localtime(&t);
-          fdate.day = tm.tm_mday;
-          fdate.month = tm.tm_mon + 1;
-          fdate.year = tm.tm_year - 80;
-          ftime.hours = tm.tm_hour;
-          ftime.minutes = tm.tm_min;
-          ftime.twosecs = tm.tm_sec / 2;
-          if (older) {
-            g.olderthan = SecsSince1980(&fdate, &ftime);
-            g.olderthan -= (older * (24L * 60L * 60L));
-          }
-          if (newer) {
-            g.newerthan = SecsSince1980(&fdate, &ftime);
-            g.newerthan -= (newer * (24L * 60L * 60L));
-          }
-        }
-        if (!newer)
-          g.newerthan = 0;
-        if (!older)
-          g.olderthan = 0;
-        g.greaterthan = greater;
-        g.lessthan = lesser;
-        g.absFlag = absolute;
-        g.caseFlag = sensitive;
-        g.dirFlag = recurse;
-        g.sayfiles = sayfiles;
-        g.searchEAs = searchEAs;
-        g.searchFiles = searchFiles;
-        g.findifany = findifany;
-        g.hwndFiles = hwndCollect;
-        g.hwnd = WinQueryWindow(hwndCollect, QW_PARENT);
-        g.hwndCurFile = WinWindowFromID(g.hwnd, DIR_SELECTED);
-        g.attrFile = ((DIRCNRDATA *)INSTDATA(hwndCollect))->mask.attrFile;
-        g.antiattr = ((DIRCNRDATA *)INSTDATA(hwndCollect))->mask.antiattr;
-        g.stopflag = &((DIRCNRDATA *)INSTDATA(hwndCollect))->stopflag;
-        if (_beginthread(GrepThread, NULL, 524280, (PVOID) & g) == -1) {
-          Runtime_Error(pszSrcFile, __LINE__,
-                        GetPString(IDS_COULDNTSTARTTHREADTEXT));
-          free(p);
+          break;
+        }
+        strcpy(g.tosearch, p);
+        strcpy(lastmask, p);
+        // Parse search strings
+        *p = 0;
+        WinQueryWindowText(hwndMLE, 4096, p);
+        strcpy(lasttext, p);
+        {
+          CHAR *pszFrom;
+          CHAR *pszTo;
+          ULONG matched = 0;
+
+          pszTo = g.searchPattern;
+          pszFrom = p;
+          while (*pszFrom) {
+            if (*pszFrom == '\r') {
+              pszFrom++;
+              continue;
+            }
+            if (*pszFrom == '\n') {
+              if (*(pszFrom + 1))
+                matched++;
+              *pszTo = 0;
+            }
+            else
+              *pszTo = *pszFrom;
+            pszTo++;
+            pszFrom++;
+          }
+          if (*g.searchPattern)
+            matched++;
+          *pszTo++ = 0;
+          *pszTo = 0;
+          g.numlines = matched;
+          if (matched) {
+            g.matched = xmalloc(g.numlines, pszSrcFile, __LINE__);
+            if (!g.matched)
+              g.numlines = 0;
+          }
+        }
+        *p = 0;
+        WinQueryDlgItemText(hwnd, GREP_GREATER, 34, p);
+        greater = atol(p);
+        *p = 0;
+        WinQueryDlgItemText(hwnd, GREP_LESSER, 34, p);
+        lesser = atol(p);
+        *p = 0;
+        WinQueryDlgItemText(hwnd, GREP_NEWER, 34, p);
+        newer = atoi(p);
+        *p = 0;
+        WinQueryDlgItemText(hwnd, GREP_OLDER, 34, p);
+        older = atoi(p);
+        if (older || newer) {
+          FDATE fdate;
+          FTIME ftime;
+          struct tm tm;
+          time_t t;
+
+          t = time(NULL);
+          tm = *localtime(&t);
+          fdate.day = tm.tm_mday;
+          fdate.month = tm.tm_mon + 1;
+          fdate.year = tm.tm_year - 80;
+          ftime.hours = tm.tm_hour;
+          ftime.minutes = tm.tm_min;
+          ftime.twosecs = tm.tm_sec / 2;
+          if (older) {
+            g.olderthan = SecsSince1980(&fdate, &ftime);
+            g.olderthan -= (older * (24L * 60L * 60L));
+          }
+          if (newer) {
+            g.newerthan = SecsSince1980(&fdate, &ftime);
+            g.newerthan -= (newer * (24L * 60L * 60L));
+          }
+        }
+        if (!newer)
+          g.newerthan = 0;
+        if (!older)
+          g.olderthan = 0;
+        g.greaterthan = greater;
+        g.lessthan = lesser;
+        g.absFlag = absolute;
+        g.caseFlag = sensitive;
+        g.dirFlag = recurse;
+        g.sayfiles = sayfiles;
+        g.searchEAs = searchEAs;
+        g.searchFiles = searchFiles;
+        g.findifany = findifany;
+        g.hwndFiles = hwndCollect;
+        g.hwnd = WinQueryWindow(hwndCollect, QW_PARENT);
+        g.hwndCurFile = WinWindowFromID(g.hwnd, DIR_SELECTED);
+        g.attrFile = ((DIRCNRDATA *)INSTDATA(hwndCollect))->mask.attrFile;
+        g.antiattr = ((DIRCNRDATA *)INSTDATA(hwndCollect))->mask.antiattr;
+        g.stopflag = &((DIRCNRDATA *)INSTDATA(hwndCollect))->stopflag;
+        if (_beginthread(GrepThread, NULL, 524280, (PVOID) & g) == -1) {
+          Runtime_Error(pszSrcFile, __LINE__,
+                        GetPString(IDS_COULDNTSTARTTHREADTEXT));
+          free(p);
 #         ifdef FORTIFY
           Fortify_LeaveScope();
 #          endif
-          WinDismissDlg(hwnd, 0);
-          break;
-        }
-        DosSleep(100); //05 Aug 07 GKY 128
-        free(p);
+          WinDismissDlg(hwnd, 0);
+          break;
+        }
+        DosSleep(100); //05 Aug 07 GKY 128
+        free(p);
 #       ifdef FORTIFY
         Fortify_LeaveScope();
@@ -940 +943 @@
       }
       if (changed) {
-        // Grep mask list changed
-        SHORT x;
-
-        sSelect = (SHORT) WinSendDlgItemMsg(hwnd,
-                                            GREP_LISTBOX,
-                                            LM_QUERYITEMCOUNT,
-                                            MPVOID, MPVOID);
+        // Grep mask list changed
+        SHORT x;
+
+        sSelect = (SHORT) WinSendDlgItemMsg(hwnd,
+                                            GREP_LISTBOX,
+                                            LM_QUERYITEMCOUNT,
+                                            MPVOID, MPVOID);
         if (sSelect > 0) {
           BldFullPathName(s, pFM2SaveDirectory, "GREPMASK.DAT");
           if (CheckDriveSpaceAvail(s, ullDATFileSpaceNeeded, 1) == 2)
             break; //already gave error msg
-          fp = xfopen(s, "w", pszSrcFile, __LINE__);
-          if (fp) {
-            fputs(GetPString(IDS_GREPFILETEXT), fp);
-            for (x = 0; x < sSelect; x++) {
-              *s = 0;
-              WinSendDlgItemMsg(hwnd,
-                                GREP_LISTBOX,
-                                LM_QUERYITEMTEXT,
-                                MPFROM2SHORT(x, 8192), MPFROMP(s));
-              bstrip(s);
-              if (*s)
-                fprintf(fp, "%s\n", s);
-            }
-            fclose(fp);
-          }
-        }
+          fp = xfopen(s, "w", pszSrcFile, __LINE__);
+          if (fp) {
+            fputs(GetPString(IDS_GREPFILETEXT), fp);
+            for (x = 0; x < sSelect; x++) {
+              *s = 0;
+              WinSendDlgItemMsg(hwnd,
+                                GREP_LISTBOX,
+                                LM_QUERYITEMTEXT,
+                                MPFROM2SHORT(x, 8192), MPFROMP(s));
+              bstrip(s);
+              if (*s)
+                fprintf(fp, "%s\n", s);
+            }
+            fclose(fp);
+          }
+        }
       }
       WinDismissDlg(hwnd, 1);

trunk/dll/inis.c

@@ -34 +34 @@
 #include <ctype.h>
 #include <share.h>
-#include <process.h>                    // _beginthread
+#include <process.h>                    // _beginthread
 
 #define INCL_DOS
@@ -40 +40 @@
 #define INCL_WIN
 #define INCL_GPI
-#define INCL_LONGLONG                   // dircnrs.h
+#define INCL_LONGLONG                   // dircnrs.h
 
 #include "fm3dlg.h"
 #include "fm3str.h"
 #include "mle.h"
-#include "errutil.h"                    // Dos_Error...
-#include "strutil.h"                    // GetPString
+#include "errutil.h"                    // Dos_Error...
+#include "strutil.h"                    // GetPString
 #include "pathutil.h"                   // BldFullPathName
+#include "mainwnd.h"                    // FillClient
+#include "droplist.h"                   // FullDrgName
+#include "inis.h"
+#include "literal.h"                    // fixup
 #include "fm3dll.h"
+#include "eas.h"                        // HexDump
 #include "fortify.h"
+#include "misc.h"                       // BoxWindow
 
 #pragma data_seg(DATA2)
@@ -58 +64 @@
 {
   USHORT size;
-  CHAR ininame[CCHMAXPATH];     // Must be null string if user or system ini
+  CHAR ininame[CCHMAXPATH];     // Must be null string if user or system ini
   HINI hini;
   BOOL working;
@@ -107 +113 @@
 {
   BOOL ok = fSkipIfSystem &&
-            (hini == HINI_USERPROFILE || hini == HINI_SYSTEMPROFILE);
+            (hini == HINI_USERPROFILE || hini == HINI_SYSTEMPROFILE);
 
   if (!ok) {
@@ -113 +119 @@
     if (!ok) {
       Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                "PrfCloseProfile failed for handle 0x%x", hini);
+                "PrfCloseProfile failed for handle 0x%x", hini);
     }
   }
@@ -136 +142 @@
       hmq2 = WinCreateMsgQueue(hab2, 0);
       if (hmq2) {
-        WinCancelShutdown(hmq2, TRUE);
-        IncrThreadUsage();
-        *userini = *sysini = 0;
-        memset(&cprfp, 0, sizeof(PRFPROFILE));
-        cprfp.cchUserName = CCHMAXPATH;
-        cprfp.cchSysName = CCHMAXPATH;
-        cprfp.pszUserName = (PSZ) userini;
-        cprfp.pszSysName = (PSZ) sysini;
-        if (PrfQueryProfile(hab2, &cprfp)) {
-          if (!stricmp(cprfp.pszUserName, inirec->filename1))
-            hiniFrom = HINI_USERPROFILE;
-          else if (!stricmp(cprfp.pszSysName, inirec->filename1))
-            hiniFrom = HINI_SYSTEMPROFILE;
-          if (!stricmp(cprfp.pszUserName, inirec->filename2))
-            hiniTo = HINI_USERPROFILE;
-          else if (!stricmp(cprfp.pszSysName, inirec->filename2))
-            hiniTo = HINI_SYSTEMPROFILE;
-        }
-        if (hiniFrom == NULLHANDLE) {
-          hiniFrom = PrfOpenProfile(hab2, inirec->filename1);
-          if (hiniFrom == NULLHANDLE) {
-            Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                      "PrfOpenProfile failed for %s", inirec->filename1);
-          }
-        }
-        if (hiniTo == NULLHANDLE) {
-          if (!stricmp(inirec->filename1, inirec->filename2))
-            hiniTo = hiniFrom;
-          else {
-            hiniTo = PrfOpenProfile(hab2, inirec->filename2);
-            if (hiniTo == NULLHANDLE) {
-              Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                        "PrfOpenProfile failed for %s", inirec->filename2);
-            }
-          }
-        }
-        if (hiniFrom && hiniTo && (*inirec->app2 || hiniFrom != hiniTo)) {
-
-          PVOID pDataK, pData;
-          PBYTE pCurrentK;
-          ULONG ulSize = 0L;
-
-          if (inirec->action == IDM_MOVE || inirec->action == IDM_COPY) {
-            if (!*inirec->key) {
-              if (inirec->confirm &&
-                  PrfQueryProfileSize(hiniFrom, (PSZ) ((*inirec->app2) ?
-                                                    inirec->app2 : inirec->
-                                                    app), NULL,
-                                      (PULONG) & ulSize) && ulSize) {
-                if (saymsg
-                    (MB_YESNOCANCEL, HWND_DESKTOP,
-                     GetPString(IDS_CONFIRMTEXT),
-                     GetPString(IDS_INIOVERAPPNAMETEXT),
-                     ((*inirec->app2) ? inirec->app2 : inirec->app),
-                     inirec->filename1) != MBID_YES)
-                  goto Abort;
-              }
-              if (PrfQueryProfileSize(hiniTo,
-                                      (PSZ) inirec->app,
-                                      NULL, (PULONG) & ulSize) && ulSize) {
-                pDataK = xmalloc(ulSize, pszSrcFile, __LINE__); /* allocate space for keynames */
-                if (pDataK) {
-                  /* get keynames */
-                  if (PrfQueryProfileString(hiniTo,
-                                            (PSZ) inirec->app,
-                                            NULL, "\0", pDataK, ulSize)) {
-                    pCurrentK = pDataK;
-                    /* step through keynames */
-                    while (*pCurrentK) {
-                      if (PrfQueryProfileSize(hiniTo, inirec->app,
-                                              pCurrentK,
-                                              (PULONG) & ulSize) && ulSize) {
-                        pData = xmalloc(ulSize, pszSrcFile, __LINE__);
-                        if (pData) {
-                          /* get data */
-                          if (PrfQueryProfileData(hiniTo, inirec->app,
-                                                  pCurrentK,
-                                                  pData, (PULONG) & ulSize))
-                            /* write data to new ini file */
-                            PrfWriteProfileData(hiniFrom, ((*inirec->app2) ?
-                                                        inirec->
-                                                        app2 : inirec->app),
-                                                pCurrentK, pData, ulSize);
-                          free(pData);  /* free data */
-                        }
-                      }
-                      while (*pCurrentK)        /* next keyname */
-                        pCurrentK++;
-                      pCurrentK++;
-                    }
-                  }
-                  free(pDataK);         /* free keynames */
-                }
-              }
-            }
-            else {
-              if (inirec->confirm &&
-                  PrfQueryProfileSize(hiniFrom, (PSZ) ((*inirec->app2) ?
-                                                    inirec->app2 : inirec->
-                                                    app),
-                                      ((*inirec->key2) ? inirec->
-                                       key2 : inirec->key), (PULONG) & ulSize)
-                  && ulSize) {
-                if (saymsg
-                    (MB_YESNOCANCEL, HWND_DESKTOP,
-                     GetPString(IDS_CONFIRMTEXT),
-                     GetPString(IDS_INIOVERAPPKEYNAMETEXT),
-                     ((*inirec->app2) ? inirec->app2 : inirec->app),
-                     ((*inirec->key2) ? inirec->key2 : inirec->key),
-                     inirec->filename1) != MBID_YES)
-                  goto Abort;
-              }
-              if (PrfQueryProfileSize(hiniTo, inirec->app,
-                                      inirec->key,
-                                      (PULONG) & ulSize) && ulSize) {
-                pData = xmalloc(ulSize, pszSrcFile, __LINE__);
-                if (pData) {
-                  /* get data */
-                  if (PrfQueryProfileData(hiniTo, inirec->app,
-                                          inirec->key,
-                                          pData, (PULONG) & ulSize))
-                    /* write data to new ini file */
-                    PrfWriteProfileData(hiniFrom, ((*inirec->app2) ?
-                                                inirec->app2 : inirec->app),
-                                        ((*inirec->key2) ?
-                                         inirec->key2 : inirec->key),
-                                        pData, ulSize);
-                  free(pData);          /* free data */
-                }
-              }
-            }
-            if (inirec->action == IDM_MOVE) {
-              if (inirec->confirm &&
-                  saymsg(MB_YESNOCANCEL,
-                         HWND_DESKTOP,
-                         GetPString(IDS_CONFIRMTEXT),
-                         GetPString(IDS_INIDELETEMOVEDTEXT),
-                         inirec->filename2) != MBID_YES)
-                goto Abort;
-              PrfWriteProfileData(hiniTo,
-                                  inirec->app,
-                                  ((*inirec->key) ? inirec->key : NULL),
-                                  NULL, 0L);
-            }
-          }
-        }
+        WinCancelShutdown(hmq2, TRUE);
+        IncrThreadUsage();
+        *userini = *sysini = 0;
+        memset(&cprfp, 0, sizeof(PRFPROFILE));
+        cprfp.cchUserName = CCHMAXPATH;
+        cprfp.cchSysName = CCHMAXPATH;
+        cprfp.pszUserName = (PSZ) userini;
+        cprfp.pszSysName = (PSZ) sysini;
+        if (PrfQueryProfile(hab2, &cprfp)) {
+          if (!stricmp(cprfp.pszUserName, inirec->filename1))
+            hiniFrom = HINI_USERPROFILE;
+          else if (!stricmp(cprfp.pszSysName, inirec->filename1))
+            hiniFrom = HINI_SYSTEMPROFILE;
+          if (!stricmp(cprfp.pszUserName, inirec->filename2))
+            hiniTo = HINI_USERPROFILE;
+          else if (!stricmp(cprfp.pszSysName, inirec->filename2))
+            hiniTo = HINI_SYSTEMPROFILE;
+        }
+        if (hiniFrom == NULLHANDLE) {
+          hiniFrom = PrfOpenProfile(hab2, inirec->filename1);
+          if (hiniFrom == NULLHANDLE) {
+            Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                      "PrfOpenProfile failed for %s", inirec->filename1);
+          }
+        }
+        if (hiniTo == NULLHANDLE) {
+          if (!stricmp(inirec->filename1, inirec->filename2))
+            hiniTo = hiniFrom;
+          else {
+            hiniTo = PrfOpenProfile(hab2, inirec->filename2);
+            if (hiniTo == NULLHANDLE) {
+              Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                        "PrfOpenProfile failed for %s", inirec->filename2);
+            }
+          }
+        }
+        if (hiniFrom && hiniTo && (*inirec->app2 || hiniFrom != hiniTo)) {
+
+          PVOID pDataK, pData;
+          PBYTE pCurrentK;
+          ULONG ulSize = 0L;
+
+          if (inirec->action == IDM_MOVE || inirec->action == IDM_COPY) {
+            if (!*inirec->key) {
+              if (inirec->confirm &&
+                  PrfQueryProfileSize(hiniFrom, (PSZ) ((*inirec->app2) ?
+                                                    inirec->app2 : inirec->
+                                                    app), NULL,
+                                      (PULONG) & ulSize) && ulSize) {
+                if (saymsg
+                    (MB_YESNOCANCEL, HWND_DESKTOP,
+                     GetPString(IDS_CONFIRMTEXT),
+                     GetPString(IDS_INIOVERAPPNAMETEXT),
+                     ((*inirec->app2) ? inirec->app2 : inirec->app),
+                     inirec->filename1) != MBID_YES)
+                  goto Abort;
+              }
+              if (PrfQueryProfileSize(hiniTo,
+                                      (PSZ) inirec->app,
+                                      NULL, (PULONG) & ulSize) && ulSize) {
+                pDataK = xmalloc(ulSize, pszSrcFile, __LINE__); /* allocate space for keynames */
+                if (pDataK) {
+                  /* get keynames */
+                  if (PrfQueryProfileString(hiniTo,
+                                            (PSZ) inirec->app,
+                                            NULL, "\0", pDataK, ulSize)) {
+                    pCurrentK = pDataK;
+                    /* step through keynames */
+                    while (*pCurrentK) {
+                      if (PrfQueryProfileSize(hiniTo, inirec->app,
+                                              pCurrentK,
+                                              (PULONG) & ulSize) && ulSize) {
+                        pData = xmalloc(ulSize, pszSrcFile, __LINE__);
+                        if (pData) {
+                          /* get data */
+                          if (PrfQueryProfileData(hiniTo, inirec->app,
+                                                  pCurrentK,
+                                                  pData, (PULONG) & ulSize))
+                            /* write data to new ini file */
+                            PrfWriteProfileData(hiniFrom, ((*inirec->app2) ?
+                                                        inirec->
+                                                        app2 : inirec->app),
+                                                pCurrentK, pData, ulSize);
+                          free(pData);  /* free data */
+                        }
+                      }
+                      while (*pCurrentK)        /* next keyname */
+                        pCurrentK++;
+                      pCurrentK++;
+                    }
+                  }
+                  free(pDataK);         /* free keynames */
+                }
+              }
+            }
+            else {
+              if (inirec->confirm &&
+                  PrfQueryProfileSize(hiniFrom, (PSZ) ((*inirec->app2) ?
+                                                    inirec->app2 : inirec->
+                                                    app),
+                                      ((*inirec->key2) ? inirec->
+                                       key2 : inirec->key), (PULONG) & ulSize)
+                  && ulSize) {
+                if (saymsg
+                    (MB_YESNOCANCEL, HWND_DESKTOP,
+                     GetPString(IDS_CONFIRMTEXT),
+                     GetPString(IDS_INIOVERAPPKEYNAMETEXT),
+                     ((*inirec->app2) ? inirec->app2 : inirec->app),
+                     ((*inirec->key2) ? inirec->key2 : inirec->key),
+                     inirec->filename1) != MBID_YES)
+                  goto Abort;
+              }
+              if (PrfQueryProfileSize(hiniTo, inirec->app,
+                                      inirec->key,
+                                      (PULONG) & ulSize) && ulSize) {
+                pData = xmalloc(ulSize, pszSrcFile, __LINE__);
+                if (pData) {
+                  /* get data */
+                  if (PrfQueryProfileData(hiniTo, inirec->app,
+                                          inirec->key,
+                                          pData, (PULONG) & ulSize))
+                    /* write data to new ini file */
+                    PrfWriteProfileData(hiniFrom, ((*inirec->app2) ?
+                                                inirec->app2 : inirec->app),
+                                        ((*inirec->key2) ?
+                                         inirec->key2 : inirec->key),
+                                        pData, ulSize);
+                  free(pData);          /* free data */
+                }
+              }
+            }
+            if (inirec->action == IDM_MOVE) {
+              if (inirec->confirm &&
+                  saymsg(MB_YESNOCANCEL,
+                         HWND_DESKTOP,
+                         GetPString(IDS_CONFIRMTEXT),
+                         GetPString(IDS_INIDELETEMOVEDTEXT),
+                         inirec->filename2) != MBID_YES)
+                goto Abort;
+              PrfWriteProfileData(hiniTo,
+                                  inirec->app,
+                                  ((*inirec->key) ? inirec->key : NULL),
+                                  NULL, 0L);
+            }
+          }
+        }
       Abort:
-        if (hiniFrom)
-          CloseProfile(hiniFrom, TRUE);
-        if (hiniTo && hiniTo != hiniFrom)
-          CloseProfile(hiniTo, FALSE);
-        WinDestroyMsgQueue(hmq2);
+        if (hiniFrom)
+          CloseProfile(hiniFrom, TRUE);
+        if (hiniTo && hiniTo != hiniFrom)
+          CloseProfile(hiniTo, FALSE);
+        WinDestroyMsgQueue(hmq2);
       }
       DecrThreadUsage();
@@ -293 +299 @@
     }
     PostMsg(inirec->hwndDlg, WM_COMMAND, MPFROM2SHORT(INI_REFRESH, 0),
-            MPVOID);
+            MPVOID);
     if (inirec->action == IDM_MOVE && inirec->hwndSource &&
-        inirec->hwndSource != inirec->hwndDlg)
+        inirec->hwndSource != inirec->hwndDlg)
       PostMsg(inirec->hwndSource, WM_COMMAND, MPFROM2SHORT(INI_REFRESH, 0),
-              MPVOID);
+              MPVOID);
     free(inirec);
 #   ifdef FORTIFY
@@ -316 +322 @@
       hmq2 = WinCreateMsgQueue(hab2, 0);
       if (hmq2) {
-        WinCancelShutdown(hmq2, TRUE);
-        IncrThreadUsage();
-
-        // fixme to do something?
-
-        WinDestroyMsgQueue(hmq2);
+        WinCancelShutdown(hmq2, TRUE);
+        IncrThreadUsage();
+
+        // fixme to do something?
+
+        WinDestroyMsgQueue(hmq2);
       }
       DecrThreadUsage();
@@ -351 +357 @@
       hmq2 = WinCreateMsgQueue(hab2, 0);
       if (hmq2) {
-        WinCancelShutdown(hmq2, TRUE);
-        IncrThreadUsage();
-        *userini = *sysini = 0;
-        memset(&cprfp, 0, sizeof(PRFPROFILE));
-        cprfp.cchUserName = CCHMAXPATH;
-        cprfp.cchSysName = CCHMAXPATH;
-        cprfp.pszUserName = (PSZ) userini;
-        cprfp.pszSysName = (PSZ) sysini;
-        if (PrfQueryProfile(hab2, &cprfp)) {
-          if (!stricmp(cprfp.pszUserName, prfp->pszUserName))
-            orig = HINI_USERPROFILE;
-          else if (!stricmp(cprfp.pszSysName, prfp->pszUserName))
-            orig = HINI_SYSTEMPROFILE;
-        }
-        if (orig == NULLHANDLE)
-          orig = PrfOpenProfile(hab2, prfp->pszUserName);
-        if (orig == NULLHANDLE) {
-          Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                    "PrfOpenProfile failed for %s", prfp->pszUserName);
-        }
-        else {
-          new = PrfOpenProfile(hab2, prfp->pszSysName);
-          if (new == NULLHANDLE) {
-            Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                      "PrfOpenProfile failed for %s", prfp->pszSysName);
-          }
-          else {
-            ulSize = 0;
-            if (PrfQueryProfileSize(orig, NULL, NULL, (PULONG) & ulSize)
-                && ulSize) {
-              pDataA = xmalloc(ulSize, pszSrcFile, __LINE__);   /* allocate space for applnames */
-              if (pDataA) {
-                /* get applnames */
-                if (PrfQueryProfileString
-                    (orig, NULL, NULL, "\0", pDataA, ulSize)) {
-                  pCurrentA = pDataA;
-                  /* step through applnames */
-                  while (*pCurrentA) {
-                    /* now keynames for this applname */
-                    if (PrfQueryProfileSize(orig, (PSZ) pCurrentA, NULL,
-                                            (PULONG) & ulSize) && ulSize) {
-                      pDataK = xmalloc(ulSize, pszSrcFile, __LINE__);   /* allocate space for keynames */
-                      if (pDataK) {
-                        /* get keynames */
-                        if (PrfQueryProfileString(orig, (PSZ) pCurrentA, NULL,
-                                                  "\0", pDataK, ulSize)) {
-                          pCurrentK = pDataK;
-                          /* step through keynames */
-                          while (*pCurrentK) {
-                            if (PrfQueryProfileSize(orig, pCurrentA,
-                                                    pCurrentK,
-                                                    (PULONG) & ulSize) &&
-                                ulSize) {
-                              pData = xmalloc(ulSize, pszSrcFile, __LINE__);
-                              if (pData) {
-                                /* get data */
-                                if (PrfQueryProfileData(orig, pCurrentA,
-                                                        pCurrentK,
-                                                        pData,
-                                                        (PULONG) & ulSize))
-                                  /* write data to new ini file */
-                                  PrfWriteProfileData(new, pCurrentA,
-                                                      pCurrentK, pData,
-                                                      ulSize);
-                                free(pData);    /* free data */
-                              }
-                            }
-                            while (*pCurrentK)  /* next keyname */
-                              pCurrentK++;
-                            pCurrentK++;
-                          }
-                        }
-                        free(pDataK);   /* free keynames */
-                      }
-                    }
-                    while (*pCurrentA)  /* next applname */
-                      pCurrentA++;
-                    pCurrentA++;
-                  }
-                }
-                free(pDataA);           /* free applnames */
-              }
-            }
-            CloseProfile(new, FALSE);
-          }
-          CloseProfile(orig, TRUE);
-        }
-        WinDestroyMsgQueue(hmq2);
+        WinCancelShutdown(hmq2, TRUE);
+        IncrThreadUsage();
+        *userini = *sysini = 0;
+        memset(&cprfp, 0, sizeof(PRFPROFILE));
+        cprfp.cchUserName = CCHMAXPATH;
+        cprfp.cchSysName = CCHMAXPATH;
+        cprfp.pszUserName = (PSZ) userini;
+        cprfp.pszSysName = (PSZ) sysini;
+        if (PrfQueryProfile(hab2, &cprfp)) {
+          if (!stricmp(cprfp.pszUserName, prfp->pszUserName))
+            orig = HINI_USERPROFILE;
+          else if (!stricmp(cprfp.pszSysName, prfp->pszUserName))
+            orig = HINI_SYSTEMPROFILE;
+        }
+        if (orig == NULLHANDLE)
+          orig = PrfOpenProfile(hab2, prfp->pszUserName);
+        if (orig == NULLHANDLE) {
+          Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                    "PrfOpenProfile failed for %s", prfp->pszUserName);
+        }
+        else {
+          new = PrfOpenProfile(hab2, prfp->pszSysName);
+          if (new == NULLHANDLE) {
+            Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                      "PrfOpenProfile failed for %s", prfp->pszSysName);
+          }
+          else {
+            ulSize = 0;
+            if (PrfQueryProfileSize(orig, NULL, NULL, (PULONG) & ulSize)
+                && ulSize) {
+              pDataA = xmalloc(ulSize, pszSrcFile, __LINE__);   /* allocate space for applnames */
+              if (pDataA) {
+                /* get applnames */
+                if (PrfQueryProfileString
+                    (orig, NULL, NULL, "\0", pDataA, ulSize)) {
+                  pCurrentA = pDataA;
+                  /* step through applnames */
+                  while (*pCurrentA) {
+                    /* now keynames for this applname */
+                    if (PrfQueryProfileSize(orig, (PSZ) pCurrentA, NULL,
+                                            (PULONG) & ulSize) && ulSize) {
+                      pDataK = xmalloc(ulSize, pszSrcFile, __LINE__);   /* allocate space for keynames */
+                      if (pDataK) {
+                        /* get keynames */
+                        if (PrfQueryProfileString(orig, (PSZ) pCurrentA, NULL,
+                                                  "\0", pDataK, ulSize)) {
+                          pCurrentK = pDataK;
+                          /* step through keynames */
+                          while (*pCurrentK) {
+                            if (PrfQueryProfileSize(orig, pCurrentA,
+                                                    pCurrentK,
+                                                    (PULONG) & ulSize) &&
+                                ulSize) {
+                              pData = xmalloc(ulSize, pszSrcFile, __LINE__);
+                              if (pData) {
+                                /* get data */
+                                if (PrfQueryProfileData(orig, pCurrentA,
+                                                        pCurrentK,
+                                                        pData,
+                                                        (PULONG) & ulSize))
+                                  /* write data to new ini file */
+                                  PrfWriteProfileData(new, pCurrentA,
+                                                      pCurrentK, pData,
+                                                      ulSize);
+                                free(pData);    /* free data */
+                              }
+                            }
+                            while (*pCurrentK)  /* next keyname */
+                              pCurrentK++;
+                            pCurrentK++;
+                          }
+                        }
+                        free(pDataK);   /* free keynames */
+                      }
+                    }
+                    while (*pCurrentA)  /* next applname */
+                      pCurrentA++;
+                    pCurrentA++;
+                  }
+                }
+                free(pDataA);           /* free applnames */
+              }
+            }
+            CloseProfile(new, FALSE);
+          }
+          CloseProfile(orig, TRUE);
+        }
+        WinDestroyMsgQueue(hmq2);
       }
       DecrThreadUsage();
@@ -461 +467 @@
   if (!PrfQueryProfileSize(hini, NULL, NULL, (PULONG) & ulSize))
     Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-              "PrfQueryProfileSize");
+              "PrfQueryProfileSize");
   else if (!ulSize)
     Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
@@ -468 +474 @@
     if (pData) {
       if (PrfQueryProfileString(hini, NULL, NULL, "\0", pData, ulSize)) {
-        pCurrent = pData;
-        WinEnableWindowUpdate(hwndList, FALSE);
-        while (*pCurrent) {
-          WinSendMsg(hwndList, LM_INSERTITEM, MPFROMSHORT(LIT_SORTASCENDING),
-                     MPFROMP(pCurrent));
-          while (*pCurrent)
-            pCurrent++;
-          pCurrent++;
-        }
-        WinSendMsg(hwndList, LM_SELECTITEM, MPFROMSHORT(0),
-                   MPFROMSHORT(TRUE));
-        WinEnableWindowUpdate(hwndList, TRUE);
+        pCurrent = pData;
+        WinEnableWindowUpdate(hwndList, FALSE);
+        while (*pCurrent) {
+          WinSendMsg(hwndList, LM_INSERTITEM, MPFROMSHORT(LIT_SORTASCENDING),
+                     MPFROMP(pCurrent));
+          while (*pCurrent)
+            pCurrent++;
+          pCurrent++;
+        }
+        WinSendMsg(hwndList, LM_SELECTITEM, MPFROMSHORT(0),
+                   MPFROMSHORT(TRUE));
+        WinEnableWindowUpdate(hwndList, TRUE);
       }
       free(pData);
@@ -487 +493 @@
 
 static CHAR *GetKeyData(HWND hwndList, HINI hini, PSZ pAppName,
-                        PSZ pKeyName, PULONG datalen)
+                        PSZ pKeyName, PULONG datalen)
 {
   ULONG ulKeySize = 0L;
@@ -495 +501 @@
   if (!PrfQueryProfileSize(hini, pAppName, pKeyName, (PULONG) & ulKeySize))
     Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-              "PrfQueryProfileSize");
+              "PrfQueryProfileSize");
   else {
     pKeyData = xmalloc(ulKeySize + 1L, pszSrcFile, __LINE__);
     if (pKeyData) {
       if (!PrfQueryProfileData
-          (hini, pAppName, pKeyName, pKeyData, (PULONG) & ulKeySize))
-        Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                  "PrfQueryProfileData");
+          (hini, pAppName, pKeyName, pKeyData, (PULONG) & ulKeySize))
+        Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                  "PrfQueryProfileData");
       else {
-        HexDump(hwndList, pKeyData, ulKeySize);
-        {
-          CHAR s[81];
-
-          sprintf(s,
-                  GetPString(IDS_INIBYTESTEXT),
-                  ulKeySize, &"s"[ulKeySize == 1]);
-          WinSetDlgItemText(WinQueryWindow(hwndList, QW_PARENT),
-                            INI_NUMDATA, s);
-        }
-        *datalen = ulKeySize;
-        return (CHAR *)pKeyData;
+        HexDump(hwndList, pKeyData, ulKeySize);
+        {
+          CHAR s[81];
+
+          sprintf(s,
+                  GetPString(IDS_INIBYTESTEXT),
+                  ulKeySize, &"s"[ulKeySize == 1]);
+          WinSetDlgItemText(WinQueryWindow(hwndList, QW_PARENT),
+                            INI_NUMDATA, s);
+        }
+        *datalen = ulKeySize;
+        return (CHAR *)pKeyData;
       }
     }
@@ -531 +537 @@
   if (!PrfQueryProfileSize(hini, pAppName, NULL, (PULONG) & ulSize))
     Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-              "PrfQueryProfileSize");
+              "PrfQueryProfileSize");
   else {
     if (!ulSize)
@@ -538 +544 @@
     if (pData) {
       if (!PrfQueryProfileString(hini, pAppName, NULL, "\0", pData, ulSize)) {
-        Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                  "PrfQueryProfileString");
-        free(pData);
+        Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                  "PrfQueryProfileString");
+        free(pData);
       }
       else {
-        pCurrent = pData;
-        WinEnableWindowUpdate(hwndList, FALSE);
-        while (*pCurrent) {
-          WinSendMsg(hwndList, LM_INSERTITEM, MPFROMSHORT(LIT_SORTASCENDING),
-                     MPFROMP(pCurrent));
-          while (*pCurrent)
-            pCurrent++;
-          pCurrent++;
-        }
-        WinSendMsg(hwndList, LM_SELECTITEM, MPFROMSHORT(0),
-                   MPFROMSHORT(TRUE));
+        pCurrent = pData;
+        WinEnableWindowUpdate(hwndList, FALSE);
+        while (*pCurrent) {
+          WinSendMsg(hwndList, LM_INSERTITEM, MPFROMSHORT(LIT_SORTASCENDING),
+                     MPFROMP(pCurrent));
+          while (*pCurrent)
+            pCurrent++;
+          pCurrent++;
+        }
+        WinSendMsg(hwndList, LM_SELECTITEM, MPFROMSHORT(0),
+                   MPFROMSHORT(TRUE));
         WinEnableWindowUpdate(hwndList, TRUE);
         free(pData);
-        return TRUE;
+        return TRUE;
       }
     }
@@ -575 +581 @@
     inidata = (INIDATA *) mp2;
     WinSendDlgItemMsg(hwnd, IAF_SAVENAME, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     MLEsetformat(hwndMLE, MLFIE_NOTRANS);
     MLEsetlimit(hwndMLE, 8192);
@@ -588 +594 @@
       DosError(FERR_DISABLEHARDERR);
       if (!DosFindFirst("*.IST",
-                        &hdir,
-                        FILE_NORMAL | FILE_ARCHIVED,
-                        &ffb, sizeof(ffb), &nm, FIL_STANDARD)) {
-        do {
-          priority_bumped();
-          WinSendDlgItemMsg(hwnd, IAF_LISTBOX, LM_INSERTITEM,
-                            MPFROMSHORT(LIT_SORTASCENDING),
-                            MPFROMP(ffb.achName));
-          nm = 1;
-        } while (!DosFindNext(hdir, &ffb, sizeof(ffb), &nm));
-        DosFindClose(hdir);
-        priority_bumped();
+                        &hdir,
+                        FILE_NORMAL | FILE_ARCHIVED,
+                        &ffb, sizeof(ffb), &nm, FIL_STANDARD)) {
+        do {
+          priority_bumped();
+          WinSendDlgItemMsg(hwnd, IAF_LISTBOX, LM_INSERTITEM,
+                            MPFROMSHORT(LIT_SORTASCENDING),
+                            MPFROMP(ffb.achName));
+          nm = 1;
+        } while (!DosFindNext(hdir, &ffb, sizeof(ffb), &nm));
+        DosFindClose(hdir);
+        priority_bumped();
       }
     }
@@ -610 +616 @@
   case UM_SETDIR:
     PaintRecessedWindow(WinWindowFromID(hwnd, IAF_HELP), (HPS) 0, FALSE,
-                        TRUE);
+                        TRUE);
     PaintRecessedWindow(WinWindowFromID(hwnd, IAF_SAVENAME), (HPS) 0, FALSE,
-                        FALSE);
+                        FALSE);
     PaintRecessedWindow(WinWindowFromID(hwnd, IAF_LISTBOX), (HPS) 0, FALSE,
-                        FALSE);
+                        FALSE);
     PaintRecessedWindow(WinWindowFromID(hwnd, IAF_MLE), (HPS) 0, FALSE,
-                        FALSE);
+                        FALSE);
     return 0;
 
@@ -623 +629 @@
     case IAF_SAVENAME:
       if (SHORT2FROMMP(mp1) == EN_KILLFOCUS)
-        WinSetDlgItemText(hwnd, IAF_HELP, NullStr);
+        WinSetDlgItemText(hwnd, IAF_HELP, NullStr);
       if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
-        WinSetDlgItemText(hwnd,
-                          IAF_HELP, GetPString(IDS_MASKLISTNAMEHELPTEXT));
+        WinSetDlgItemText(hwnd,
+                          IAF_HELP, GetPString(IDS_MASKLISTNAMEHELPTEXT));
       break;
 
     case IAF_LISTBOX:
       if (SHORT2FROMMP(mp1) == LN_KILLFOCUS)
-        WinSetDlgItemText(hwnd, IAF_HELP, NullStr);
+        WinSetDlgItemText(hwnd, IAF_HELP, NullStr);
       if (SHORT2FROMMP(mp1) == LN_SETFOCUS)
-        WinSetDlgItemText(hwnd,
-                          IAF_HELP, GetPString(IDS_MASKLISTFILESHELPTEXT));
+        WinSetDlgItemText(hwnd,
+                          IAF_HELP, GetPString(IDS_MASKLISTFILESHELPTEXT));
       else if (SHORT2FROMMP(mp1) == LN_ENTER)
-        PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IAF_LOAD, 0), MPVOID);
+        PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IAF_LOAD, 0), MPVOID);
       break;
 
     case IAF_MLE:
       if (SHORT2FROMMP(mp1) == MLN_KILLFOCUS)
-        WinSetDlgItemText(hwnd, IAF_HELP, NullStr);
+        WinSetDlgItemText(hwnd, IAF_HELP, NullStr);
       if (SHORT2FROMMP(mp1) == MLN_SETFOCUS)
-        WinSetDlgItemText(hwnd,
-                          IAF_HELP, GetPString(IDS_MASKLISTMASKSHELPTEXT));
+        WinSetDlgItemText(hwnd,
+                          IAF_HELP, GetPString(IDS_MASKLISTMASKSHELPTEXT));
       break;
     }
@@ -654 +660 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else {
-        CHAR s[8193], app[1024];
-        register CHAR *p;
-        SHORT sSelect, numitems;
-        BOOL match;
-
-        *s = 0;
-        WinQueryWindowText(hwndMLE, 8192, s);
-        if (!*s) {
-          DosBeep(250, 100);
-          break;
-        }
-        else {
-          strcpy(lasttext, s);
-          p = s;
-          while (*p) {
-            if (*p == '\r') {
-              memmove(p, p + 1, strlen(p));
-              continue;
-            }
-            if (*p == '\n')
-              *p = 0;
-            p++;
-          }
-          p++;
-          *p = 0;
-        }
-        numitems = (SHORT) WinSendMsg(inidata->hwndApp,
-                                      LM_QUERYITEMCOUNT, MPVOID, MPVOID);
-        if (!numitems) {
-          DosBeep(250, 100);
-          break;
-        }
-        else {
-          WinSetPointer(HWND_DESKTOP, hptrBusy);
-          WinSetDlgItemText(hwnd, IAF_HELP, GetPString(IDS_FILTERINGTEXT));
-          sSelect = 0;
-          while (numitems) {
-            *app = 0;
-            WinSendMsg(inidata->hwndApp,
-                       LM_QUERYITEMTEXT,
-                       MPFROM2SHORT(sSelect, 1024), MPFROMP(app));
-            match = FALSE;
-            if (*app) {
-              p = s;
-              while (*p) {
-                if (*p != '/') {
-                  if (wildcard(app, p, TRUE))
-                    match = TRUE;
-                }
-                else if (wildcard(app, p + 1, TRUE)) {
-                  match = FALSE;
-                  break;
-                }
-                while (*p)
-                  p++;
-                p++;
-              }
-            }
-            if (!match)
-              WinSendMsg(inidata->hwndApp, LM_DELETEITEM,
-                         MPFROMSHORT(sSelect), MPVOID);
-            else
-              sSelect++;
-            numitems--;
-          }
-          WinSetPointer(HWND_DESKTOP, hptrArrow);
-        }
+        CHAR s[8193], app[1024];
+        register CHAR *p;
+        SHORT sSelect, numitems;
+        BOOL match;
+
+        *s = 0;
+        WinQueryWindowText(hwndMLE, 8192, s);
+        if (!*s) {
+          DosBeep(250, 100);
+          break;
+        }
+        else {
+          strcpy(lasttext, s);
+          p = s;
+          while (*p) {
+            if (*p == '\r') {
+              memmove(p, p + 1, strlen(p));
+              continue;
+            }
+            if (*p == '\n')
+              *p = 0;
+            p++;
+          }
+          p++;
+          *p = 0;
+        }
+        numitems = (SHORT) WinSendMsg(inidata->hwndApp,
+                                      LM_QUERYITEMCOUNT, MPVOID, MPVOID);
+        if (!numitems) {
+          DosBeep(250, 100);
+          break;
+        }
+        else {
+          WinSetPointer(HWND_DESKTOP, hptrBusy);
+          WinSetDlgItemText(hwnd, IAF_HELP, GetPString(IDS_FILTERINGTEXT));
+          sSelect = 0;
+          while (numitems) {
+            *app = 0;
+            WinSendMsg(inidata->hwndApp,
+                       LM_QUERYITEMTEXT,
+                       MPFROM2SHORT(sSelect, 1024), MPFROMP(app));
+            match = FALSE;
+            if (*app) {
+              p = s;
+              while (*p) {
+                if (*p != '/') {
+                  if (wildcard(app, p, TRUE))
+                    match = TRUE;
+                }
+                else if (wildcard(app, p + 1, TRUE)) {
+                  match = FALSE;
+                  break;
+                }
+                while (*p)
+                  p++;
+                p++;
+              }
+            }
+            if (!match)
+              WinSendMsg(inidata->hwndApp, LM_DELETEITEM,
+                         MPFROMSHORT(sSelect), MPVOID);
+            else
+              sSelect++;
+            numitems--;
+          }
+          WinSetPointer(HWND_DESKTOP, hptrArrow);
+        }
       }
       WinDismissDlg(hwnd, 1);
@@ -729 +735 @@
     case IAF_LOAD:
       {
-        CHAR s[8193];
-        FILE *fp;
-        INT len;
-        SHORT sSelect;
-
-        sSelect = (SHORT) WinSendDlgItemMsg(hwnd, IAF_LISTBOX,
-                                            LM_QUERYSELECTION,
-                                            MPFROM2SHORT(LIT_FIRST, 0),
-                                            MPVOID);
-        if (sSelect < 0)
-          Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
-        else {
-          *s = 0;
-          WinSendDlgItemMsg(hwnd, IAF_LISTBOX, LM_QUERYITEMTEXT,
-                            MPFROM2SHORT(sSelect, CCHMAXPATH), MPFROMP(s));
-          bstrip(s);
-          if (*s) {
-            fp = _fsopen(s, "r", SH_DENYWR);
-            if (fp) {
-              len = fread(s, 1, 8192, fp);
-              s[len] = 0;
-              WinSetWindowText(hwndMLE, s);
-              fclose(fp);
-            }
-          }
-        }
+        CHAR s[8193];
+        FILE *fp;
+        INT len;
+        SHORT sSelect;
+
+        sSelect = (SHORT) WinSendDlgItemMsg(hwnd, IAF_LISTBOX,
+                                            LM_QUERYSELECTION,
+                                            MPFROM2SHORT(LIT_FIRST, 0),
+                                            MPVOID);
+        if (sSelect < 0)
+          Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        else {
+          *s = 0;
+          WinSendDlgItemMsg(hwnd, IAF_LISTBOX, LM_QUERYITEMTEXT,
+                            MPFROM2SHORT(sSelect, CCHMAXPATH), MPFROMP(s));
+          bstrip(s);
+          if (*s) {
+            fp = _fsopen(s, "r", SH_DENYWR);
+            if (fp) {
+              len = fread(s, 1, 8192, fp);
+              s[len] = 0;
+              WinSetWindowText(hwndMLE, s);
+              fclose(fp);
+            }
+          }
+        }
       }
       break;
@@ -760 +766 @@
     case IAF_SAVE:
       {
-        CHAR s[8193], filename[CCHMAXPATH], *p;
-        FILE *fp;
-
-        *filename = 0;
-        WinQueryDlgItemText(hwnd, IAF_SAVENAME, CCHMAXPATH, filename);
-        bstrip(filename);
-        if (*filename) {
-          p = strchr(filename, '.');
-          if (p) {
-            strcpy(p, ".IST");
-            WinSetDlgItemText(hwnd, IAF_SAVENAME, filename);
-          }
-          *s = 0;
-          WinQueryWindowText(hwndMLE, 8192, s);
-          if (!*s)
-            Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
-          else {
-            fp = xfopen(filename, "w", pszSrcFile, __LINE__);
-            if (fp) {
-              fwrite(s, 1, strlen(s), fp);
-              fclose(fp);
-              WinSendDlgItemMsg(hwnd,
-                                IAF_LISTBOX,
-                                LM_INSERTITEM,
-                                MPFROMSHORT(LIT_SORTASCENDING),
-                                MPFROMP(filename));
-            }
-          }
-        }
+        CHAR s[8193], filename[CCHMAXPATH], *p;
+        FILE *fp;
+
+        *filename = 0;
+        WinQueryDlgItemText(hwnd, IAF_SAVENAME, CCHMAXPATH, filename);
+        bstrip(filename);
+        if (*filename) {
+          p = strchr(filename, '.');
+          if (p) {
+            strcpy(p, ".IST");
+            WinSetDlgItemText(hwnd, IAF_SAVENAME, filename);
+          }
+          *s = 0;
+          WinQueryWindowText(hwndMLE, 8192, s);
+          if (!*s)
+            Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+          else {
+            fp = xfopen(filename, "w", pszSrcFile, __LINE__);
+            if (fp) {
+              fwrite(s, 1, strlen(s), fp);
+              fclose(fp);
+              WinSendDlgItemMsg(hwnd,
+                                IAF_LISTBOX,
+                                LM_INSERTITEM,
+                                MPFROMSHORT(LIT_SORTASCENDING),
+                                MPFROMP(filename));
+            }
+          }
+        }
       }
       break;
@@ -794 +800 @@
     case IAF_DELETE:
       {
-        CHAR s[CCHMAXPATH];
-        SHORT sSelect;
-
-        sSelect = (SHORT) WinSendDlgItemMsg(hwnd, IAF_LISTBOX,
-                                            LM_QUERYSELECTION,
-                                            MPFROM2SHORT(LIT_FIRST, 0),
-                                            MPVOID);
-        if (sSelect >= 0) {
-          *s = 0;
-          WinSendDlgItemMsg(hwnd, IAF_LISTBOX, LM_QUERYITEMTEXT,
-                            MPFROM2SHORT(sSelect, CCHMAXPATH), MPFROMP(s));
-          bstrip(s);
-          if (*s) {
-            unlinkf(s);
-            WinSendDlgItemMsg(hwnd, IAF_LISTBOX, LM_DELETEITEM,
-                              MPFROMSHORT(sSelect), MPVOID);
-          }
-        }
+        CHAR s[CCHMAXPATH];
+        SHORT sSelect;
+
+        sSelect = (SHORT) WinSendDlgItemMsg(hwnd, IAF_LISTBOX,
+                                            LM_QUERYSELECTION,
+                                            MPFROM2SHORT(LIT_FIRST, 0),
+                                            MPVOID);
+        if (sSelect >= 0) {
+          *s = 0;
+          WinSendDlgItemMsg(hwnd, IAF_LISTBOX, LM_QUERYITEMTEXT,
+                            MPFROM2SHORT(sSelect, CCHMAXPATH), MPFROMP(s));
+          bstrip(s);
+          if (*s) {
+            unlinkf(s);
+            WinSendDlgItemMsg(hwnd, IAF_LISTBOX, LM_DELETEITEM,
+                              MPFROMSHORT(sSelect), MPVOID);
+          }
+        }
       }
       break;
@@ -821 +827 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_FILTERINI, 0),
-                   MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_FILTERINI, 0),
+                   MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -840 +846 @@
     inirec = (INIREC *) mp2;
     WinSendDlgItemMsg(hwnd,
-                      INII_NEWAPP,
-                      EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      INII_NEWAPP,
+                      EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     WinSendDlgItemMsg(hwnd,
-                      INII_NEWKEY,
-                      EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      INII_NEWKEY,
+                      EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     {
       CHAR s[CCHMAXPATH + 34];
@@ -856 +862 @@
       switch (inirec->action) {
       case IDM_MOVE:
-        WinSetWindowText(hwnd, GetPString(IDS_INIRENAMEAPPTITLETEXT));
-        break;
+        WinSetWindowText(hwnd, GetPString(IDS_INIRENAMEAPPTITLETEXT));
+        break;
       case IDM_COPY:
-        WinSetWindowText(hwnd, GetPString(IDS_INICOPYAPPTITLETEXT));
-        break;
+        WinSetWindowText(hwnd, GetPString(IDS_INICOPYAPPTITLETEXT));
+        break;
       }
     }
     else {
       {
-        CHAR s[CCHMAXPATH + 34];
-
-        sprintf(s, GetPString(IDS_INIWASTEXT), inirec->key);
-        WinSetDlgItemText(hwnd, INII_OLDKEY, s);
+        CHAR s[CCHMAXPATH + 34];
+
+        sprintf(s, GetPString(IDS_INIWASTEXT), inirec->key);
+        WinSetDlgItemText(hwnd, INII_OLDKEY, s);
       }
       WinSetDlgItemText(hwnd, INII_NEWAPP, inirec->app);
       WinSendDlgItemMsg(hwnd,
-                        INII_NEWAPP,
-                        EM_SETSEL, MPFROM2SHORT(0, CCHMAXPATH), MPVOID);
+                        INII_NEWAPP,
+                        EM_SETSEL, MPFROM2SHORT(0, CCHMAXPATH), MPVOID);
       switch (inirec->action) {
       case IDM_MOVE:
-        WinSetWindowText(hwnd, GetPString(IDS_INIRENAMEKEYTITLETEXT));
-        break;
+        WinSetWindowText(hwnd, GetPString(IDS_INIRENAMEKEYTITLETEXT));
+        break;
       case IDM_COPY:
-        WinSetWindowText(hwnd, GetPString(IDS_INICOPYKEYTITLETEXT));
-        break;
+        WinSetWindowText(hwnd, GetPString(IDS_INICOPYKEYTITLETEXT));
+        break;
       }
     }
@@ -890 +896 @@
       inirec = (INIREC *) WinQueryWindowPtr(hwnd, QWL_USER);
       if (inirec) {
-        WinQueryDlgItemText(hwnd, INII_NEWAPP, CCHMAXPATH, inirec->app2);
-        bstrip(inirec->app2);
-        if (!*inirec->app2) {
-          DosBeep(50, 100);
-          break;
-        }
-        if (*inirec->key) {
-          WinQueryDlgItemText(hwnd, INII_NEWKEY, CCHMAXPATH, inirec->key2);
-          bstrip(inirec->key2);
-          if (!*inirec->key2) {
-            DosBeep(50, 100);
-            break;
-          }
-        }
-        WinDismissDlg(hwnd, 1);
+        WinQueryDlgItemText(hwnd, INII_NEWAPP, CCHMAXPATH, inirec->app2);
+        bstrip(inirec->app2);
+        if (!*inirec->app2) {
+          DosBeep(50, 100);
+          break;
+        }
+        if (*inirec->key) {
+          WinQueryDlgItemText(hwnd, INII_NEWKEY, CCHMAXPATH, inirec->key2);
+          bstrip(inirec->key2);
+          if (!*inirec->key2) {
+            DosBeep(50, 100);
+            break;
+          }
+        }
+        WinDismissDlg(hwnd, 1);
       }
       break;
@@ -914 +920 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp,
-                   HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_INTRAINI, 0),
-                   MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp,
+                   HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_INTRAINI, 0),
+                   MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -931 +937 @@
     WinSetWindowPtr(hwnd, QWL_USER, mp2);
     WinSendDlgItemMsg(hwnd, INIR_USERPROFILE, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, INIR_SYSTEMPROFILE, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     break;
 
@@ -940 +946 @@
     case INIR_FIND:
       {
-        CHAR filename[CCHMAXPATH], *p, *ininame;
-        USHORT id = 0;
-        HWND hwndFocus;
-
-        hwndFocus = WinQueryFocus(HWND_DESKTOP);
-        if (hwndFocus)
-          id = WinQueryWindowUShort(hwndFocus, QWS_ID);
-        if (id != INIR_SYSTEMPROFILE)
-          id = INIR_USERPROFILE;
-        ininame = INSTDATA(hwnd);
-        if (ininame && *ininame) {
-          strcpy(filename, ininame);
-          p = filename;
-          while (*p) {
-            if (*p == '/')
-              *p = '\\';
-            p++;
-          }
-          p = strrchr(filename, '\\');
-          if (p) {
-            p++;
-            *p = 0;
-          }
-          else
-            *filename = 0;
-        }
-        else
-          *filename = 0;
-        strcat(filename, "*.INI");
-        if (insert_filename(hwnd, filename, TRUE, FALSE) && *filename)
-          WinSetDlgItemText(hwnd, id, filename);
+        CHAR filename[CCHMAXPATH], *p, *ininame;
+        USHORT id = 0;
+        HWND hwndFocus;
+
+        hwndFocus = WinQueryFocus(HWND_DESKTOP);
+        if (hwndFocus)
+          id = WinQueryWindowUShort(hwndFocus, QWS_ID);
+        if (id != INIR_SYSTEMPROFILE)
+          id = INIR_USERPROFILE;
+        ininame = INSTDATA(hwnd);
+        if (ininame && *ininame) {
+          strcpy(filename, ininame);
+          p = filename;
+          while (*p) {
+            if (*p == '/')
+              *p = '\\';
+            p++;
+          }
+          p = strrchr(filename, '\\');
+          if (p) {
+            p++;
+            *p = 0;
+          }
+          else
+            *filename = 0;
+        }
+        else
+          *filename = 0;
+        strcat(filename, "*.INI");
+        if (insert_filename(hwnd, filename, TRUE, FALSE) && *filename)
+          WinSetDlgItemText(hwnd, id, filename);
       }
       break;
@@ -976 +982 @@
     case DID_OK:
       {
-        HINI testini;
-        PRFPROFILE prfp;
-        CHAR sysini[CCHMAXPATH];
-        CHAR userini[CCHMAXPATH];
-
-        WinQueryDlgItemText(hwnd, INIR_USERPROFILE, CCHMAXPATH, userini);
-        WinQueryDlgItemText(hwnd, INIR_SYSTEMPROFILE, CCHMAXPATH, sysini);
-        testini = PrfOpenProfile(WinQueryAnchorBlock(hwnd), userini);
-        if (testini == NULLHANDLE) {
-          saymsg(MB_CANCEL,
-                 hwnd,
-                 GetPString(IDS_ERRORTEXT),
-                 GetPString(IDS_INICANTOPENUSERTEXT), userini);
-          break;
-        }
-        CloseProfile(testini, FALSE);
-        testini = PrfOpenProfile(WinQueryAnchorBlock(hwnd), sysini);
-        if (testini == NULLHANDLE) {
-          saymsg(MB_CANCEL,
-                 hwnd,
-                 GetPString(IDS_ERRORTEXT),
-                 GetPString(IDS_INICANTOPENSYSTEXT), sysini);
-          break;
-        }
-        CloseProfile(testini, FALSE);
-        memset(&prfp, 0, sizeof(PRFPROFILE));
-        prfp.cchUserName = strlen(sysini);
-        prfp.cchSysName = strlen(userini);
-        prfp.pszUserName = (PSZ) userini;
-        prfp.pszSysName = (PSZ) sysini;
-        if (!PrfReset(WinQueryAnchorBlock(hwnd), &prfp)) {
-          Win_Error(hwnd, hwnd, __FILE__, __LINE__,
-                    GetPString(IDS_INIPRFRESETFAILEDTEXT));
-        }
-        else
-          WinDismissDlg(hwnd, 1);
+        HINI testini;
+        PRFPROFILE prfp;
+        CHAR sysini[CCHMAXPATH];
+        CHAR userini[CCHMAXPATH];
+
+        WinQueryDlgItemText(hwnd, INIR_USERPROFILE, CCHMAXPATH, userini);
+        WinQueryDlgItemText(hwnd, INIR_SYSTEMPROFILE, CCHMAXPATH, sysini);
+        testini = PrfOpenProfile(WinQueryAnchorBlock(hwnd), userini);
+        if (testini == NULLHANDLE) {
+          saymsg(MB_CANCEL,
+                 hwnd,
+                 GetPString(IDS_ERRORTEXT),
+                 GetPString(IDS_INICANTOPENUSERTEXT), userini);
+          break;
+        }
+        CloseProfile(testini, FALSE);
+        testini = PrfOpenProfile(WinQueryAnchorBlock(hwnd), sysini);
+        if (testini == NULLHANDLE) {
+          saymsg(MB_CANCEL,
+                 hwnd,
+                 GetPString(IDS_ERRORTEXT),
+                 GetPString(IDS_INICANTOPENSYSTEXT), sysini);
+          break;
+        }
+        CloseProfile(testini, FALSE);
+        memset(&prfp, 0, sizeof(PRFPROFILE));
+        prfp.cchUserName = strlen(sysini);
+        prfp.cchSysName = strlen(userini);
+        prfp.pszUserName = (PSZ) userini;
+        prfp.pszSysName = (PSZ) sysini;
+        if (!PrfReset(WinQueryAnchorBlock(hwnd), &prfp)) {
+          Win_Error(hwnd, hwnd, __FILE__, __LINE__,
+                    GetPString(IDS_INIPRFRESETFAILEDTEXT));
+        }
+        else
+          WinDismissDlg(hwnd, 1);
       }
       break;
@@ -1021 +1027 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CHANGEINI, 0),
-                   MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CHANGEINI, 0),
+                   MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -1037 +1043 @@
     WinSetWindowPtr(hwnd, QWL_USER, mp2);
     WinSendDlgItemMsg(hwnd,
-                      INIR_USERPROFILE,
-                      EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      INIR_USERPROFILE,
+                      EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     WinSendDlgItemMsg(hwnd,
-                      INIR_SYSTEMPROFILE,
-                      EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      INIR_SYSTEMPROFILE,
+                      EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     WinSetWindowText(hwnd, GetPString(IDS_INISWAPOS2INISTITLETEXT));
     break;
@@ -1049 +1055 @@
     case INIR_FIND:
       {
-        CHAR filename[CCHMAXPATH], *p, *ininame;
-        USHORT id = 0;
-        HWND hwndFocus;
-
-        hwndFocus = WinQueryFocus(HWND_DESKTOP);
-        if (hwndFocus)
-          id = WinQueryWindowUShort(hwndFocus, QWS_ID);
-        if (id != INIR_SYSTEMPROFILE)
-          id = INIR_USERPROFILE;
-        ininame = INSTDATA(hwnd);
-        if (ininame && *ininame) {
-          strcpy(filename, ininame);
-          p = filename;
-          while (*p) {
-            if (*p == '/')
-              *p = '\\';
-            p++;
-          }
-          p = strrchr(filename, '\\');
-          if (p) {
-            p++;
-            *p = 0;
-          }
-          else
-            *filename = 0;
-        }
-        else
-          *filename = 0;
-        strcat(filename, "*.INI");
-        if (insert_filename(hwnd, filename, TRUE, FALSE) && *filename)
-          WinSetDlgItemText(hwnd, id, filename);
+        CHAR filename[CCHMAXPATH], *p, *ininame;
+        USHORT id = 0;
+        HWND hwndFocus;
+
+        hwndFocus = WinQueryFocus(HWND_DESKTOP);
+        if (hwndFocus)
+          id = WinQueryWindowUShort(hwndFocus, QWS_ID);
+        if (id != INIR_SYSTEMPROFILE)
+          id = INIR_USERPROFILE;
+        ininame = INSTDATA(hwnd);
+        if (ininame && *ininame) {
+          strcpy(filename, ininame);
+          p = filename;
+          while (*p) {
+            if (*p == '/')
+              *p = '\\';
+            p++;
+          }
+          p = strrchr(filename, '\\');
+          if (p) {
+            p++;
+            *p = 0;
+          }
+          else
+            *filename = 0;
+        }
+        else
+          *filename = 0;
+        strcat(filename, "*.INI");
+        if (insert_filename(hwnd, filename, TRUE, FALSE) && *filename)
+          WinSetDlgItemText(hwnd, id, filename);
       }
       break;
@@ -1085 +1091 @@
     case DID_OK:
       {
-        HINI testini;
-        PRFPROFILE prfp;
-        CHAR sysini[CCHMAXPATH];
-        CHAR userini[CCHMAXPATH];
-        CHAR oldsysini[CCHMAXPATH];
-        CHAR olduserini[CCHMAXPATH];
-        CHAR tempsysini[CCHMAXPATH];
-        CHAR tempuserini[CCHMAXPATH];
-        CHAR tempsysini2[CCHMAXPATH];
-        CHAR tempuserini2[CCHMAXPATH];
-        CHAR *p;
-        APIRET rc;
-
-        *tempuserini = 0;
-        *tempsysini = 0;
-        *tempuserini2 = 0;
-        *tempsysini2 = 0;
-        memset(&prfp, 0, sizeof(PRFPROFILE));
-        prfp.cchUserName = CCHMAXPATH;
-        prfp.cchSysName = CCHMAXPATH;
-        prfp.pszUserName = (PSZ) olduserini;
-        prfp.pszSysName = (PSZ) oldsysini;
-        if (!PrfQueryProfile(WinQueryAnchorBlock(hwnd), &prfp)) {
-          Win_Error(hwnd, hwnd, __FILE__, __LINE__,
-                    GetPString(IDS_INIQUERYPRFFAILEDTEXT));
-          break;
-        }
-        WinQueryDlgItemText(hwnd, INIR_USERPROFILE, CCHMAXPATH, userini);
-        WinQueryDlgItemText(hwnd, INIR_SYSTEMPROFILE, CCHMAXPATH, sysini);
-        MakeFullName(userini);
-        MakeFullName(sysini);
-        testini = PrfOpenProfile(WinQueryAnchorBlock(hwnd), userini);
-        if (testini == NULLHANDLE) {
-          saymsg(MB_CANCEL,
-                 hwnd,
-                 GetPString(IDS_ERRORTEXT),
-                 GetPString(IDS_INICANTOPENUSERTEXT), userini);
-          break;
-        }
-        CloseProfile(testini, FALSE);
-        testini = PrfOpenProfile(WinQueryAnchorBlock(hwnd), sysini);
-        if (testini == NULLHANDLE) {
-          saymsg(MB_CANCEL,
-                 hwnd,
-                 GetPString(IDS_ERRORTEXT),
-                 GetPString(IDS_INICANTOPENSYSTEXT), sysini);
-          break;
-        }
-        CloseProfile(testini, FALSE);
-        /* make copies of new inis */
-        *tempuserini = 0;
+        HINI testini;
+        PRFPROFILE prfp;
+        CHAR sysini[CCHMAXPATH];
+        CHAR userini[CCHMAXPATH];
+        CHAR oldsysini[CCHMAXPATH];
+        CHAR olduserini[CCHMAXPATH];
+        CHAR tempsysini[CCHMAXPATH];
+        CHAR tempuserini[CCHMAXPATH];
+        CHAR tempsysini2[CCHMAXPATH];
+        CHAR tempuserini2[CCHMAXPATH];
+        CHAR *p;
+        APIRET rc;
+
+        *tempuserini = 0;
+        *tempsysini = 0;
+        *tempuserini2 = 0;
+        *tempsysini2 = 0;
+        memset(&prfp, 0, sizeof(PRFPROFILE));
+        prfp.cchUserName = CCHMAXPATH;
+        prfp.cchSysName = CCHMAXPATH;
+        prfp.pszUserName = (PSZ) olduserini;
+        prfp.pszSysName = (PSZ) oldsysini;
+        if (!PrfQueryProfile(WinQueryAnchorBlock(hwnd), &prfp)) {
+          Win_Error(hwnd, hwnd, __FILE__, __LINE__,
+                    GetPString(IDS_INIQUERYPRFFAILEDTEXT));
+          break;
+        }
+        WinQueryDlgItemText(hwnd, INIR_USERPROFILE, CCHMAXPATH, userini);
+        WinQueryDlgItemText(hwnd, INIR_SYSTEMPROFILE, CCHMAXPATH, sysini);
+        MakeFullName(userini);
+        MakeFullName(sysini);
+        testini = PrfOpenProfile(WinQueryAnchorBlock(hwnd), userini);
+        if (testini == NULLHANDLE) {
+          saymsg(MB_CANCEL,
+                 hwnd,
+                 GetPString(IDS_ERRORTEXT),
+                 GetPString(IDS_INICANTOPENUSERTEXT), userini);
+          break;
+        }
+        CloseProfile(testini, FALSE);
+        testini = PrfOpenProfile(WinQueryAnchorBlock(hwnd), sysini);
+        if (testini == NULLHANDLE) {
+          saymsg(MB_CANCEL,
+                 hwnd,
+                 GetPString(IDS_ERRORTEXT),
+                 GetPString(IDS_INICANTOPENSYSTEXT), sysini);
+          break;
+        }
+        CloseProfile(testini, FALSE);
+        /* make copies of new inis */
+        *tempuserini = 0;
         *tempsysini = 0;
         BldFullPathName(tempuserini, pTmpDir ? pTmpDir : pFM2SaveDirectory, "TEMPUSER.INI");
-        rc = DosCopy(userini, tempuserini, DCPY_EXISTING);
-        if (rc) {
-          Dos_Error(MB_CANCEL,
-                    rc,
-                    hwnd,
-                    __FILE__,
-                    __LINE__,
-                    GetPString(IDS_COMPCOPYFAILEDTEXT), userini, tempuserini);
-          break;
+        rc = DosCopy(userini, tempuserini, DCPY_EXISTING);
+        if (rc) {
+          Dos_Error(MB_CANCEL,
+                    rc,
+                    hwnd,
+                    __FILE__,
+                    __LINE__,
+                    GetPString(IDS_COMPCOPYFAILEDTEXT), userini, tempuserini);
+          break;
         }
         BldFullPathName(tempsysini, pTmpDir ? pTmpDir : pFM2SaveDirectory, "TEMPSYS.INI");
-        rc = DosCopy(sysini, tempsysini, DCPY_EXISTING);
-        if (rc) {
-          Dos_Error(MB_CANCEL,
-                    rc,
-                    hwnd,
-                    __FILE__,
-                    __LINE__,
-                    GetPString(IDS_COMPCOPYFAILEDTEXT), sysini, tempsysini);
-          break;
-        }
-        memset(&prfp, 0, sizeof(PRFPROFILE));
-        prfp.cchUserName = strlen(tempuserini);
-        prfp.cchSysName = strlen(tempsysini);
-        prfp.pszUserName = (PSZ) tempuserini;
-        prfp.pszSysName = (PSZ) tempsysini;
-        if (!PrfReset(WinQueryAnchorBlock(hwnd), &prfp)) {
-          Win_Error(hwnd, hwnd, __FILE__, __LINE__,
-                    GetPString(IDS_INIPRFRESETFAILEDTEXT));
-        }
-        else {
-          /* backup old inis */
-          strcpy(tempuserini2, olduserini);
-          p = strrchr(tempuserini2, '\\');
-          if (!p)
-            *tempuserini2 = 0;
-          else {
-            p++;
-            *p = 0;
-          }
-          strcat(tempuserini2, "OS2INI.BAK");
-          rc = DosCopy(olduserini, tempuserini2, DCPY_EXISTING);
-          if (rc) {
-            Dos_Error(MB_CANCEL,
-                      rc,
-                      hwnd,
-                      __FILE__,
-                      __LINE__,
-                      GetPString(IDS_COMPCOPYFAILEDTEXT),
-                      olduserini, tempuserini2);
-            WinDismissDlg(hwnd, 1);
-            break;
-          }
-          strcpy(tempsysini2, oldsysini);
-          p = strrchr(tempsysini2, '\\');
-          if (!p)
-            *tempsysini2 = 0;
-          else {
-            p++;
-            *p = 0;
-          }
-          strcat(tempsysini2, "OS2SYINI.BAK");
-          rc = DosCopy(oldsysini, tempsysini2, DCPY_EXISTING);
-          if (rc) {
-            Dos_Error(MB_CANCEL,
-                      rc,
-                      hwnd,
-                      __FILE__,
-                      __LINE__,
-                      GetPString(IDS_COMPCOPYFAILEDTEXT),
-                      oldsysini, tempsysini2);
-            WinDismissDlg(hwnd, 1);
-            break;
-          }
-          /* copy new inis to old ini names */
-          rc = DosCopy(userini, olduserini, DCPY_EXISTING);
-          if (rc) {
-            Dos_Error(MB_CANCEL,
-                      rc,
-                      hwnd,
-                      __FILE__,
-                      __LINE__,
-                      GetPString(IDS_COMPCOPYFAILEDTEXT),
-                      userini, olduserini);
-            WinDismissDlg(hwnd, 1);
-            break;
-          }
-          rc = DosCopy(sysini, oldsysini, DCPY_EXISTING);
-          if (rc) {
-            Dos_Error(MB_CANCEL,
-                      rc,
-                      hwnd,
-                      __FILE__,
-                      __LINE__,
-                      GetPString(IDS_COMPCOPYFAILEDTEXT),
-                      userini, olduserini);
-            WinDismissDlg(hwnd, 1);
-            break;
-          }
-          /* replace temp inis with new permanent inis */
-          memset(&prfp, 0, sizeof(PRFPROFILE));
-          prfp.cchUserName = strlen(oldsysini);
-          prfp.cchSysName = strlen(olduserini);
-          prfp.pszUserName = (PSZ) olduserini;
-          prfp.pszSysName = (PSZ) oldsysini;
-          if (!PrfReset(WinQueryAnchorBlock(hwnd), &prfp)) {
-            Win_Error(hwnd, hwnd, __FILE__, __LINE__,
-                      GetPString(IDS_INIPRFRESETFAILEDTEXT));
-          }
-          else {
-            Notify(GetPString(IDS_SUCCESSTEXT));
-            unlinkf(tempuserini);
-            unlinkf(tempsysini);
-          }
-          WinDismissDlg(hwnd, 1);
-        }
+        rc = DosCopy(sysini, tempsysini, DCPY_EXISTING);
+        if (rc) {
+          Dos_Error(MB_CANCEL,
+                    rc,
+                    hwnd,
+                    __FILE__,
+                    __LINE__,
+                    GetPString(IDS_COMPCOPYFAILEDTEXT), sysini, tempsysini);
+          break;
+        }
+        memset(&prfp, 0, sizeof(PRFPROFILE));
+        prfp.cchUserName = strlen(tempuserini);
+        prfp.cchSysName = strlen(tempsysini);
+        prfp.pszUserName = (PSZ) tempuserini;
+        prfp.pszSysName = (PSZ) tempsysini;
+        if (!PrfReset(WinQueryAnchorBlock(hwnd), &prfp)) {
+          Win_Error(hwnd, hwnd, __FILE__, __LINE__,
+                    GetPString(IDS_INIPRFRESETFAILEDTEXT));
+        }
+        else {
+          /* backup old inis */
+          strcpy(tempuserini2, olduserini);
+          p = strrchr(tempuserini2, '\\');
+          if (!p)
+            *tempuserini2 = 0;
+          else {
+            p++;
+            *p = 0;
+          }
+          strcat(tempuserini2, "OS2INI.BAK");
+          rc = DosCopy(olduserini, tempuserini2, DCPY_EXISTING);
+          if (rc) {
+            Dos_Error(MB_CANCEL,
+                      rc,
+                      hwnd,
+                      __FILE__,
+                      __LINE__,
+                      GetPString(IDS_COMPCOPYFAILEDTEXT),
+                      olduserini, tempuserini2);
+            WinDismissDlg(hwnd, 1);
+            break;
+          }
+          strcpy(tempsysini2, oldsysini);
+          p = strrchr(tempsysini2, '\\');
+          if (!p)
+            *tempsysini2 = 0;
+          else {
+            p++;
+            *p = 0;
+          }
+          strcat(tempsysini2, "OS2SYINI.BAK");
+          rc = DosCopy(oldsysini, tempsysini2, DCPY_EXISTING);
+          if (rc) {
+            Dos_Error(MB_CANCEL,
+                      rc,
+                      hwnd,
+                      __FILE__,
+                      __LINE__,
+                      GetPString(IDS_COMPCOPYFAILEDTEXT),
+                      oldsysini, tempsysini2);
+            WinDismissDlg(hwnd, 1);
+            break;
+          }
+          /* copy new inis to old ini names */
+          rc = DosCopy(userini, olduserini, DCPY_EXISTING);
+          if (rc) {
+            Dos_Error(MB_CANCEL,
+                      rc,
+                      hwnd,
+                      __FILE__,
+                      __LINE__,
+                      GetPString(IDS_COMPCOPYFAILEDTEXT),
+                      userini, olduserini);
+            WinDismissDlg(hwnd, 1);
+            break;
+          }
+          rc = DosCopy(sysini, oldsysini, DCPY_EXISTING);
+          if (rc) {
+            Dos_Error(MB_CANCEL,
+                      rc,
+                      hwnd,
+                      __FILE__,
+                      __LINE__,
+                      GetPString(IDS_COMPCOPYFAILEDTEXT),
+                      userini, olduserini);
+            WinDismissDlg(hwnd, 1);
+            break;
+          }
+          /* replace temp inis with new permanent inis */
+          memset(&prfp, 0, sizeof(PRFPROFILE));
+          prfp.cchUserName = strlen(oldsysini);
+          prfp.cchSysName = strlen(olduserini);
+          prfp.pszUserName = (PSZ) olduserini;
+          prfp.pszSysName = (PSZ) oldsysini;
+          if (!PrfReset(WinQueryAnchorBlock(hwnd), &prfp)) {
+            Win_Error(hwnd, hwnd, __FILE__, __LINE__,
+                      GetPString(IDS_INIPRFRESETFAILEDTEXT));
+          }
+          else {
+            Notify(GetPString(IDS_SUCCESSTEXT));
+            unlinkf(tempuserini);
+            unlinkf(tempsysini);
+          }
+          WinDismissDlg(hwnd, 1);
+        }
       }
       break;
@@ -1263 +1269 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_SWAPINI, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_SWAPINI, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -1288 +1294 @@
     WinSetWindowPtr(hwnd, QWL_USER, (PVOID) mp2);
     WinSendDlgItemMsg(hwnd,
-                      IAD_APPNAME,
-                      EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      IAD_APPNAME,
+                      EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     WinSendDlgItemMsg(hwnd,
-                      IAD_KEYNAME,
-                      EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      IAD_KEYNAME,
+                      EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     WinSendDlgItemMsg(hwnd,
-                      IAD_DATA,
-                      EM_SETTEXTLIMIT, MPFROM2SHORT(32767, 0), MPVOID);
+                      IAD_DATA,
+                      EM_SETTEXTLIMIT, MPFROM2SHORT(32767, 0), MPVOID);
     WinEnableWindow(WinWindowFromID(hwnd, DID_OK), FALSE);
     WinSetDlgItemText(hwnd, IAD_APPNAME, inidata->applname);
@@ -1302 +1308 @@
       if (inidata->data && inidata->datalen) {
 
-        CHAR *p;
-
-        inidata->isbinary = FALSE;
-        p = inidata->data;
-        while ((p - inidata->data) < inidata->datalen - 1) {
-          if (*p < ' ' || !isprint(*p)) {
-            inidata->isbinary = TRUE;
-            break;
-          }
-          p++;
-        }
-        if (inidata->isbinary) {
-          inidata->isbinary = TRUE;
-          WinCheckButton(hwnd, IAD_ISBINARY, TRUE);
-          if (saymsg(MB_ENTERCANCEL | MB_ICONEXCLAMATION,
-                     hwnd,
-                     GetPString(IDS_WARNINGTEXT),
-                     GetPString(IDS_INIBINARYDATASKIPTEXT)) == MBID_CANCEL)
-            WinDismissDlg(hwnd, 0);
-          l = inidata->datalen * 4 + 1;
-          p = xmallocz(l, pszSrcFile, __LINE__);
-          if (p) {
-            fixup(inidata->data, p, l, inidata->datalen);
-            WinSetDlgItemText(hwnd, IAD_DATA, p);
-            free(p);
-          }
-        }
-        else
-          WinSetDlgItemText(hwnd, IAD_DATA, inidata->data);
+        CHAR *p;
+
+        inidata->isbinary = FALSE;
+        p = inidata->data;
+        while ((p - inidata->data) < inidata->datalen - 1) {
+          if (*p < ' ' || !isprint(*p)) {
+            inidata->isbinary = TRUE;
+            break;
+          }
+          p++;
+        }
+        if (inidata->isbinary) {
+          inidata->isbinary = TRUE;
+          WinCheckButton(hwnd, IAD_ISBINARY, TRUE);
+          if (saymsg(MB_ENTERCANCEL | MB_ICONEXCLAMATION,
+                     hwnd,
+                     GetPString(IDS_WARNINGTEXT),
+                     GetPString(IDS_INIBINARYDATASKIPTEXT)) == MBID_CANCEL)
+            WinDismissDlg(hwnd, 0);
+          l = inidata->datalen * 4 + 1;
+          p = xmallocz(l, pszSrcFile, __LINE__);
+          if (p) {
+            fixup(inidata->data, p, l, inidata->datalen);
+            WinSetDlgItemText(hwnd, IAD_DATA, p);
+            free(p);
+          }
+        }
+        else
+          WinSetDlgItemText(hwnd, IAD_DATA, inidata->data);
       }
       PostMsg(hwnd, UM_SETDIR, MPFROMLONG(1L), MPVOID);
@@ -1342 +1348 @@
       WinQueryDlgItemText(hwnd, IAD_DATA, 32, s);
       if (*s)
-        WinEnableWindow(WinWindowFromID(hwnd, DID_OK), TRUE);
+        WinEnableWindow(WinWindowFromID(hwnd, DID_OK), TRUE);
     }
     WinSendDlgItemMsg(hwnd, IAD_APPNAME, EM_QUERYCHANGED, MPVOID, MPVOID);
@@ -1358 +1364 @@
   case UM_SETUP:
     saymsg(MB_ENTER | MB_ICONASTERISK,
-           hwnd,
-           GetPString(IDS_WARNINGTEXT), GetPString(IDS_INIAPPKEYEXISTSTEXT));
+           hwnd,
+           GetPString(IDS_WARNINGTEXT), GetPString(IDS_INIAPPKEYEXISTSTEXT));
     return 0;
 
@@ -1367 +1373 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else {
-        CHAR s[CCHMAXPATH], applname[CCHMAXPATH];
-        BOOL appchanged = FALSE, keychanged = FALSE;
-
-        *applname = 0;
-        WinQueryDlgItemText(hwnd, IAD_APPNAME, CCHMAXPATH, applname);
-        bstrip(applname);
-        if (*applname) {
-          *s = 0;
-          WinQueryDlgItemText(hwnd, IAD_KEYNAME, CCHMAXPATH, s);
-          bstrip(s);
-          if (*s) {
-            appchanged = (BOOL) WinSendDlgItemMsg(hwnd, IAD_APPNAME,
-                                                  EM_QUERYCHANGED,
-                                                  MPVOID, MPVOID);
-            keychanged = (BOOL) WinSendDlgItemMsg(hwnd, IAD_KEYNAME,
-                                                  EM_QUERYCHANGED,
-                                                  MPVOID, MPVOID);
-            if (appchanged || keychanged) {
-
-              ULONG size = 0L;
-
-              if (PrfQueryProfileSize(inidata->hini, applname, s, &size))
-                PostMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
-            }
-            *s = 0;
-            WinQueryDlgItemText(hwnd, IAD_DATA, CCHMAXPATH, s);
-            bstrip(s);
-            WinEnableWindow(WinWindowFromID(hwnd, DID_OK), (*s != 0));
-          }
-          else
-            WinEnableWindow(WinWindowFromID(hwnd, DID_OK), FALSE);
-        }
-        else
-          WinEnableWindow(WinWindowFromID(hwnd, DID_OK), FALSE);
+        CHAR s[CCHMAXPATH], applname[CCHMAXPATH];
+        BOOL appchanged = FALSE, keychanged = FALSE;
+
+        *applname = 0;
+        WinQueryDlgItemText(hwnd, IAD_APPNAME, CCHMAXPATH, applname);
+        bstrip(applname);
+        if (*applname) {
+          *s = 0;
+          WinQueryDlgItemText(hwnd, IAD_KEYNAME, CCHMAXPATH, s);
+          bstrip(s);
+          if (*s) {
+            appchanged = (BOOL) WinSendDlgItemMsg(hwnd, IAD_APPNAME,
+                                                  EM_QUERYCHANGED,
+                                                  MPVOID, MPVOID);
+            keychanged = (BOOL) WinSendDlgItemMsg(hwnd, IAD_KEYNAME,
+                                                  EM_QUERYCHANGED,
+                                                  MPVOID, MPVOID);
+            if (appchanged || keychanged) {
+
+              ULONG size = 0L;
+
+              if (PrfQueryProfileSize(inidata->hini, applname, s, &size))
+                PostMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
+            }
+            *s = 0;
+            WinQueryDlgItemText(hwnd, IAD_DATA, CCHMAXPATH, s);
+            bstrip(s);
+            WinEnableWindow(WinWindowFromID(hwnd, DID_OK), (*s != 0));
+          }
+          else
+            WinEnableWindow(WinWindowFromID(hwnd, DID_OK), FALSE);
+        }
+        else
+          WinEnableWindow(WinWindowFromID(hwnd, DID_OK), FALSE);
       }
       break;
@@ -1412 +1418 @@
     case DID_OK:
       {
-        CHAR applname[CCHMAXPATH], keyname[CCHMAXPATH], data[CCHMAXPATH];
-        INT len;
-
-        inidata = INSTDATA(hwnd);
-        if (!inidata) {
-          Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
-          break;
-        }
-        inidata->isbinary = WinQueryButtonCheckstate(hwnd, IAD_ISBINARY);
-        *applname = 0;
-        WinQueryDlgItemText(hwnd, IAD_APPNAME, CCHMAXPATH, applname);
-        bstrip(applname);
-        if (*applname) {
-          *keyname = 0;
-          WinQueryDlgItemText(hwnd, IAD_KEYNAME, CCHMAXPATH, keyname);
-          bstrip(keyname);
-          if (*keyname) {
-            *data = 0;
-            WinQueryDlgItemText(hwnd, IAD_DATA, CCHMAXPATH, data);
-            if (*data) {
-              if (inidata->isbinary)
-                len = literal(data);
-              else
-                len = strlen(data) + 1;
-              PrfWriteProfileData(inidata->hini, applname, keyname, data,
-                                  (ULONG) len);
-              WinSendMsg(inidata->hwndIni, UM_RESCAN,
-                         MPFROMP(applname), MPFROMP(keyname));
-              WinDismissDlg(hwnd, 1);
-            }
-          }
-        }
+        CHAR applname[CCHMAXPATH], keyname[CCHMAXPATH], data[CCHMAXPATH];
+        INT len;
+
+        inidata = INSTDATA(hwnd);
+        if (!inidata) {
+          Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+          break;
+        }
+        inidata->isbinary = WinQueryButtonCheckstate(hwnd, IAD_ISBINARY);
+        *applname = 0;
+        WinQueryDlgItemText(hwnd, IAD_APPNAME, CCHMAXPATH, applname);
+        bstrip(applname);
+        if (*applname) {
+          *keyname = 0;
+          WinQueryDlgItemText(hwnd, IAD_KEYNAME, CCHMAXPATH, keyname);
+          bstrip(keyname);
+          if (*keyname) {
+            *data = 0;
+            WinQueryDlgItemText(hwnd, IAD_DATA, CCHMAXPATH, data);
+            if (*data) {
+              if (inidata->isbinary)
+                len = literal(data);
+              else
+                len = strlen(data) + 1;
+              PrfWriteProfileData(inidata->hini, applname, keyname, data,
+                                  (ULONG) len);
+              WinSendMsg(inidata->hwndIni, UM_RESCAN,
+                         MPFROMP(applname), MPFROMP(keyname));
+              WinDismissDlg(hwnd, 1);
+            }
+          }
+        }
       }
       break;
@@ -1453 +1459 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_INIADD, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_INIADD, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -1499 +1505 @@
     flFrameFlags |= FCF_TASKLIST;
   hwndFrame = WinCreateStdWindow(hwnd,
-                                 0,
-                                 &flFrameFlags,
-                                 WC_INIEDITOR,
-                                 NullStr,
-                                 fwsAnimate,
-                                 FM3ModHandle, INI_FRAME, &hwndClient);
+                                 0,
+                                 &flFrameFlags,
+                                 WC_INIEDITOR,
+                                 NullStr,
+                                 fwsAnimate,
+                                 FM3ModHandle, INI_FRAME, &hwndClient);
   if (hwndFrame) {
     WinSetWindowUShort(hwndFrame, QWS_ID, INI_FRAME);
@@ -1513 +1519 @@
       FillClient(hwnd, &swp, NULL, FALSE);
       WinSetWindowPos(hwndFrame, HWND_TOP, swp.x, swp.y, swp.cx, swp.cy,
-                      SWP_SIZE | SWP_MOVE);
+                      SWP_SIZE | SWP_MOVE);
     }
     else if (ParentIsDesktop(hwndFrame, hwnd)) {
       if (!WinRestoreWindowPos(FM2Str, "INIWindowPos", hwndFrame)) {
 
-        ULONG fl = SWP_MOVE | SWP_SIZE;
-        SWP swp;
-
-        WinQueryTaskSizePos(WinQueryAnchorBlock(hwndFrame), 0L, &swp);
-        if (swp.fl & (SWP_MINIMIZE | SWP_HIDE))
-          fl = swp.fl;
-        else if (swp.fl & SWP_ACTIVATE)
-          fl |= SWP_ACTIVATE;
-        WinSetWindowPos(hwndFrame, HWND_TOP, swp.x, swp.y, swp.cx, swp.cy,
-                        fl);
+        ULONG fl = SWP_MOVE | SWP_SIZE;
+        SWP swp;
+
+        WinQueryTaskSizePos(WinQueryAnchorBlock(hwndFrame), 0L, &swp);
+        if (swp.fl & (SWP_MINIMIZE | SWP_HIDE))
+          fl = swp.fl;
+        else if (swp.fl & SWP_ACTIVATE)
+          fl |= SWP_ACTIVATE;
+        WinSetWindowPos(hwndFrame, HWND_TOP, swp.x, swp.y, swp.cx, swp.cy,
+                        fl);
       }
     }
@@ -1533 +1539 @@
     PostMsg(hwndClient, UM_ACTION, MPVOID, MPVOID);
     if (!PostMsg(hwndClient, UM_LOADFILE, MPFROMP(((filename && *filename) ?
-                                                   filename : NULL)), MPVOID))
+                                                   filename : NULL)), MPVOID))
       WinSendMsg(hwndClient, UM_LOADFILE, MPFROMP(((filename && *filename) ?
-                                                   filename : NULL)), MPVOID);
+                                                   filename : NULL)), MPVOID);
     if (flags & 4)
       PostMsg(hwndClient, UM_INITIALSIZE, MPVOID, MPVOID);
@@ -1568 +1574 @@
       switch (id) {
       case INI_APPLIST:
-        id = INI_APPMENU;
-        break;
+        id = INI_APPMENU;
+        break;
       case INI_KEYLIST:
-        id = INI_KEYMENU;
-        break;
+        id = INI_KEYMENU;
+        break;
       default:
-        id = 0;
-        break;
+        id = 0;
+        break;
       }
       if (id) {
-        if (hwndPopup)
-          WinDestroyWindow(hwndPopup);
-        hwndPopup = WinLoadMenu(HWND_DESKTOP, FM3ModHandle, id);
-        if (hwndPopup)
-          WinPopupMenu(hwnd, WinQueryWindow(hwnd, QW_PARENT),
-                       hwndPopup, 8, 8, 0,
-                       PU_HCONSTRAIN | PU_VCONSTRAIN |
-                       PU_KEYBOARD | PU_MOUSEBUTTON1);
+        if (hwndPopup)
+          WinDestroyWindow(hwndPopup);
+        hwndPopup = WinLoadMenu(HWND_DESKTOP, FM3ModHandle, id);
+        if (hwndPopup)
+          WinPopupMenu(hwnd, WinQueryWindow(hwnd, QW_PARENT),
+                       hwndPopup, 8, 8, 0,
+                       PU_HCONSTRAIN | PU_VCONSTRAIN |
+                       PU_KEYBOARD | PU_MOUSEBUTTON1);
       }
     }
@@ -1603 +1609 @@
       inidata = WinQueryWindowPtr(WinQueryWindow(hwnd, QW_PARENT), QWL_USER);
       if (!inidata || !*inidata->ininame || !*inidata->applname ||
-          !inidata->keyname) {
-        DosBeep(50, 100);
-        break;
+          !inidata->keyname) {
+        DosBeep(50, 100);
+        break;
       }
       hptrINI = WinLoadPointer(HWND_DESKTOP, FM3ModHandle, INI_FRAME);
@@ -1625 +1631 @@
       DItem.hstrSourceName = DrgAddStrHandle(inidata->applname);
       if (id == INI_APPLIST)
-        DItem.hstrTargetName = DrgAddStrHandle(NullStr);
+        DItem.hstrTargetName = DrgAddStrHandle(NullStr);
       else
-        DItem.hstrTargetName = DrgAddStrHandle(inidata->keyname);
+        DItem.hstrTargetName = DrgAddStrHandle(inidata->keyname);
       DItem.fsControl = 0;
       DItem.fsSupportedOps = DO_COPYABLE | DO_LINKABLE | DO_MOVEABLE;
@@ -1634 +1640 @@
       hDrop = DrgDrag(hwnd, pDInfo, &DIcon, 1L, VK_ENDDRAG, (PVOID) NULL);
       if (hDrop == NULLHANDLE)
-        FreeDragInfoData(hwnd, pDInfo);
+        FreeDragInfoData(hwnd, pDInfo);
       WinDestroyPointer(hptrINI);
     }
@@ -1645 +1651 @@
 
       if (!DrgAccessDraginfo(pDInfo)) {
-        Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                  "DrgAccessDraginfo");
+        Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                  "DrgAccessDraginfo");
       }
       else {
-        pDItem = DrgQueryDragitemPtr(pDInfo,0);
-        /* Check valid rendering mechanisms and data */
-        if (DrgVerifyRMF(pDItem, DRM_OS2FILE, NULL)) {
-          DrgFreeDraginfo(pDInfo);
-          return (MRFROM2SHORT(DOR_DROP, DO_LINK));     /* OK to drop */
-        }
-        else if (DrgVerifyRMF(pDItem, DRM_FM2INIRECORD, DRF_FM2INI)) {
-          if (WinQueryWindow(pDInfo->hwndSource, QW_PARENT) !=
-              WinQueryWindow(hwnd, QW_PARENT))
-          {
-            DrgFreeDraginfo(pDInfo);
-            return (MRFROM2SHORT(DOR_DROP, ((fCopyDefault) ? DO_COPY : DO_MOVE)));
-          }
-        }
-        DrgFreeDraginfo(pDInfo);
+        pDItem = DrgQueryDragitemPtr(pDInfo,0);
+        /* Check valid rendering mechanisms and data */
+        if (DrgVerifyRMF(pDItem, DRM_OS2FILE, NULL)) {
+          DrgFreeDraginfo(pDInfo);
+          return (MRFROM2SHORT(DOR_DROP, DO_LINK));     /* OK to drop */
+        }
+        else if (DrgVerifyRMF(pDItem, DRM_FM2INIRECORD, DRF_FM2INI)) {
+          if (WinQueryWindow(pDInfo->hwndSource, QW_PARENT) !=
+              WinQueryWindow(hwnd, QW_PARENT))
+          {
+            DrgFreeDraginfo(pDInfo);
+            return (MRFROM2SHORT(DOR_DROP, ((fCopyDefault) ? DO_COPY : DO_MOVE)));
+          }
+        }
+        DrgFreeDraginfo(pDInfo);
       }
     }
@@ -1675 +1681 @@
     {
       PDRAGINFO pDInfo = (PDRAGINFO) mp1;
-      PDRAGITEM pDItem;         /* Pointer to DRAGITEM */
+      PDRAGITEM pDItem;         /* Pointer to DRAGITEM */
       ULONG numitems, curitem, len;
       USHORT action;
       CHAR szFrom[CCHMAXPATH + 2], szDir[CCHMAXPATH + 1],
-        szTemp[CCHMAXPATH + 2];
+        szTemp[CCHMAXPATH + 2];
       FILESTATUS3 fsa;
       INIREC inirec;
 
       if (!DrgAccessDraginfo(pDInfo)) {
-        Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                  "DrgAccessDraginfo");
-        return 0;
+        Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                  "DrgAccessDraginfo");
+        return 0;
       }
       numitems = DrgQueryDragitemCount(pDInfo);
       for (curitem = 0; curitem < numitems; curitem++) {
-        pDItem = DrgQueryDragitemPtr(pDInfo, curitem);
-        if (DrgVerifyRMF(pDItem, DRM_OS2FILE, NULL)) {
-          if (pDItem->fsControl & DC_PREPARE)
-            DrgSendTransferMsg(pDItem->hwndItem,
-                               DM_ENDCONVERSATION,
-                               MPFROMLONG(pDItem->ulItemID),
-                               MPFROMLONG(DMFL_TARGETFAIL));
-          else {
-            if (FullDrgName(pDItem, szFrom, sizeof(szFrom)) &&
-                !DosQueryPathInfo(szFrom, FIL_STANDARD, &fsa, sizeof(fsa)))
-              WinSendMsg(WinQueryWindow(hwnd, QW_PARENT), WM_COMMAND,
-                         MPFROM2SHORT(IDM_COMPARE, 0), MPFROMP(szFrom));
-            DrgSendTransferMsg(pDItem->hwndItem,
-                               DM_ENDCONVERSATION,
-                               MPFROMLONG(pDItem->ulItemID),
-                               MPFROMLONG(DMFL_TARGETFAIL));
-          }
-        }
-        else if (DrgVerifyRMF(pDItem, DRM_FM2INIRECORD, DRF_FM2INI)) {
-          *szDir = *szFrom = *szTemp = 0;
-          len = DrgQueryStrName(pDItem->hstrContainerName, CCHMAXPATH, szDir);
-          szDir[len] = 0;
-          len = DrgQueryStrName(pDItem->hstrSourceName, CCHMAXPATH, szFrom);
-          szFrom[len] = 0;
-          len = DrgQueryStrName(pDItem->hstrTargetName, CCHMAXPATH, szTemp);
-          szTemp[len] = 0;
-          switch (pDInfo->usOperation) {
-          case DO_MOVE:
-            action = IDM_MOVE;
-            break;
-          case DO_COPY:
-            action = IDM_COPY;
-            break;
-          default:
-            action = IDM_INFO;
-            break;
-          }
-          memset(&inirec, 0, sizeof(inirec));
-          inirec.size = sizeof(inirec);
-          strcpy(inirec.filename2, szDir);
-          strcpy(inirec.app, szFrom);
-          strcpy(inirec.key, szTemp);
-          inirec.action = action;
-          inirec.hwndSource = WinQueryWindow(pDInfo->hwndSource, QW_PARENT);
-          WinSendMsg(WinQueryWindow(hwnd, QW_PARENT), WM_COMMAND,
-                     MPFROM2SHORT(action, 0), MPFROMP(&inirec));
-          DrgSendTransferMsg(pDItem->hwndItem,
-                             DM_ENDCONVERSATION,
-                             MPFROMLONG(pDItem->ulItemID),
-                             MPFROMLONG(DMFL_TARGETFAIL));
-        }
+        pDItem = DrgQueryDragitemPtr(pDInfo, curitem);
+        if (DrgVerifyRMF(pDItem, DRM_OS2FILE, NULL)) {
+          if (pDItem->fsControl & DC_PREPARE)
+            DrgSendTransferMsg(pDItem->hwndItem,
+                               DM_ENDCONVERSATION,
+                               MPFROMLONG(pDItem->ulItemID),
+                               MPFROMLONG(DMFL_TARGETFAIL));
+          else {
+            if (FullDrgName(pDItem, szFrom, sizeof(szFrom)) &&
+                !DosQueryPathInfo(szFrom, FIL_STANDARD, &fsa, sizeof(fsa)))
+              WinSendMsg(WinQueryWindow(hwnd, QW_PARENT), WM_COMMAND,
+                         MPFROM2SHORT(IDM_COMPARE, 0), MPFROMP(szFrom));
+            DrgSendTransferMsg(pDItem->hwndItem,
+                               DM_ENDCONVERSATION,
+                               MPFROMLONG(pDItem->ulItemID),
+                               MPFROMLONG(DMFL_TARGETFAIL));
+          }
+        }
+        else if (DrgVerifyRMF(pDItem, DRM_FM2INIRECORD, DRF_FM2INI)) {
+          *szDir = *szFrom = *szTemp = 0;
+          len = DrgQueryStrName(pDItem->hstrContainerName, CCHMAXPATH, szDir);
+          szDir[len] = 0;
+          len = DrgQueryStrName(pDItem->hstrSourceName, CCHMAXPATH, szFrom);
+          szFrom[len] = 0;
+          len = DrgQueryStrName(pDItem->hstrTargetName, CCHMAXPATH, szTemp);
+          szTemp[len] = 0;
+          switch (pDInfo->usOperation) {
+          case DO_MOVE:
+            action = IDM_MOVE;
+            break;
+          case DO_COPY:
+            action = IDM_COPY;
+            break;
+          default:
+            action = IDM_INFO;
+            break;
+          }
+          memset(&inirec, 0, sizeof(inirec));
+          inirec.size = sizeof(inirec);
+          strcpy(inirec.filename2, szDir);
+          strcpy(inirec.app, szFrom);
+          strcpy(inirec.key, szTemp);
+          inirec.action = action;
+          inirec.hwndSource = WinQueryWindow(pDInfo->hwndSource, QW_PARENT);
+          WinSendMsg(WinQueryWindow(hwnd, QW_PARENT), WM_COMMAND,
+                     MPFROM2SHORT(action, 0), MPFROMP(&inirec));
+          DrgSendTransferMsg(pDItem->hwndItem,
+                             DM_ENDCONVERSATION,
+                             MPFROMLONG(pDItem->ulItemID),
+                             MPFROMLONG(DMFL_TARGETFAIL));
+        }
       } // for
       FreeDragInfoData(hwnd, pDInfo);
@@ -1789 +1795 @@
     inidata->currid = INI_APPLIST;
     inidata->hwndMenu = WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-                                        FID_MENU);
+                                        FID_MENU);
     inidata->hwndIni = hwnd;
     WinSetWindowPtr(hwnd, QWL_USER, (PVOID) inidata);
@@ -1795 +1801 @@
 
     if (!WinCreateWindow
-        (hwnd, WC_LISTBOX, (PSZ) NULL,
-         WS_VISIBLE | LS_HORZSCROLL | LS_NOADJUSTPOS, 0, 0, 0, 0, hwnd,
-         HWND_TOP, INI_APPLIST, NULL, NULL)) {
+        (hwnd, WC_LISTBOX, (PSZ) NULL,
+         WS_VISIBLE | LS_HORZSCROLL | LS_NOADJUSTPOS, 0, 0, 0, 0, hwnd,
+         HWND_TOP, INI_APPLIST, NULL, NULL)) {
       Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     }
     if (!WinCreateWindow
-        (hwnd, WC_LISTBOX, (PSZ) NULL,
-         WS_VISIBLE | LS_HORZSCROLL | LS_NOADJUSTPOS, 0, 0, 0, 0, hwnd,
-         HWND_TOP, INI_KEYLIST, NULL, NULL)) {
+        (hwnd, WC_LISTBOX, (PSZ) NULL,
+         WS_VISIBLE | LS_HORZSCROLL | LS_NOADJUSTPOS, 0, 0, 0, 0, hwnd,
+         HWND_TOP, INI_KEYLIST, NULL, NULL)) {
       Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     }
     if (!WinCreateWindow
-        (hwnd, WC_LISTBOX, (PSZ) NULL,
-         WS_VISIBLE | LS_HORZSCROLL | LS_NOADJUSTPOS, 0, 0, 0, 0, hwnd,
-         HWND_TOP, INI_DATALIST, NULL, NULL)) {
+        (hwnd, WC_LISTBOX, (PSZ) NULL,
+         WS_VISIBLE | LS_HORZSCROLL | LS_NOADJUSTPOS, 0, 0, 0, 0, hwnd,
+         HWND_TOP, INI_DATALIST, NULL, NULL)) {
       Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     }
     if (!WinCreateWindow(hwnd, WC_STATIC, (PSZ) NULL, WS_VISIBLE | SS_TEXT |
-                         DT_CENTER | DT_VCENTER, 0, 0, 0, 0, hwnd, HWND_TOP,
-                         INI_NUMAPPS, NULL, NULL)) {
+                         DT_CENTER | DT_VCENTER, 0, 0, 0, 0, hwnd, HWND_TOP,
+                         INI_NUMAPPS, NULL, NULL)) {
       Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     }
     if (!WinCreateWindow(hwnd, WC_STATIC, (PSZ) NULL, WS_VISIBLE | SS_TEXT |
-                         DT_CENTER | DT_VCENTER, 0, 0, 0, 0, hwnd, HWND_TOP,
-                         INI_NUMKEYS, NULL, NULL)) {
+                         DT_CENTER | DT_VCENTER, 0, 0, 0, 0, hwnd, HWND_TOP,
+                         INI_NUMKEYS, NULL, NULL)) {
       Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     }
     if (!WinCreateWindow(hwnd, WC_STATIC, (PSZ) NULL, WS_VISIBLE | SS_TEXT |
-                         DT_CENTER | DT_VCENTER, 0, 0, 0, 0, hwnd, HWND_TOP,
-                         INI_NUMDATA, NULL, NULL)) {
+                         DT_CENTER | DT_VCENTER, 0, 0, 0, 0, hwnd, HWND_TOP,
+                         INI_NUMDATA, NULL, NULL)) {
       Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     }
     if (!WinCreateWindow(hwnd,
-                         WC_STATIC,
-                         GetPString(IDS_APPLICATIONSTITLETEXT),
-                         WS_VISIBLE | SS_TEXT |
-                         DT_CENTER | DT_VCENTER,
-                         0,
-                         0, 0, 0, hwnd, HWND_TOP, INI_APPHDR, NULL, NULL)) {
+                         WC_STATIC,
+                         GetPString(IDS_APPLICATIONSTITLETEXT),
+                         WS_VISIBLE | SS_TEXT |
+                         DT_CENTER | DT_VCENTER,
+                         0,
+                         0, 0, 0, hwnd, HWND_TOP, INI_APPHDR, NULL, NULL)) {
       Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     }
     if (!WinCreateWindow(hwnd,
-                         WC_STATIC,
-                         GetPString(IDS_KEYWORDSTITLETEXT),
-                         WS_VISIBLE | SS_TEXT |
-                         DT_CENTER | DT_VCENTER,
-                         0,
-                         0, 0, 0, hwnd, HWND_TOP, INI_KEYHDR, NULL, NULL)) {
+                         WC_STATIC,
+                         GetPString(IDS_KEYWORDSTITLETEXT),
+                         WS_VISIBLE | SS_TEXT |
+                         DT_CENTER | DT_VCENTER,
+                         0,
+                         0, 0, 0, hwnd, HWND_TOP, INI_KEYHDR, NULL, NULL)) {
       Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     }
     if (!WinCreateWindow(hwnd,
-                         WC_STATIC,
-                         GetPString(IDS_DATABYTESTITLETEXT),
-                         WS_VISIBLE | SS_TEXT |
-                         DT_CENTER | DT_VCENTER,
-                         0,
-                         0, 0, 0, hwnd, HWND_TOP, INI_DATAHDR, NULL, NULL)) {
+                         WC_STATIC,
+                         GetPString(IDS_DATABYTESTITLETEXT),
+                         WS_VISIBLE | SS_TEXT |
+                         DT_CENTER | DT_VCENTER,
+                         0,
+                         0, 0, 0, hwnd, HWND_TOP, INI_DATAHDR, NULL, NULL)) {
       Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     }
@@ -1860 +1866 @@
 
     oldproc = WinSubclassWindow(WinWindowFromID(hwnd, INI_APPLIST),
-                                IniLBSubProc);
+                                IniLBSubProc);
     WinSetWindowPtr(WinWindowFromID(hwnd, INI_APPLIST),
-                    QWL_USER, (PVOID) oldproc);
+                    QWL_USER, (PVOID) oldproc);
     oldproc = WinSubclassWindow(WinWindowFromID(hwnd, INI_KEYLIST),
-                                IniLBSubProc);
+                                IniLBSubProc);
     WinSetWindowPtr(WinWindowFromID(hwnd, INI_KEYLIST),
-                    QWL_USER, (PVOID) oldproc);
+                    QWL_USER, (PVOID) oldproc);
     oldproc = WinSubclassWindow(WinWindowFromID(hwnd, INI_DATALIST),
-                                IniLBSubProc2);
+                                IniLBSubProc2);
     WinSetWindowPtr(WinWindowFromID(hwnd, INI_DATALIST),
-                    QWL_USER, (PVOID) oldproc);
+                    QWL_USER, (PVOID) oldproc);
     break;
 
@@ -1877 +1883 @@
     if (mp2) {
       if (hwndMain && fAutoView)
-        PostMsg(hwndMain, UM_LOADFILE, MPVOID, MPVOID);
+        PostMsg(hwndMain, UM_LOADFILE, MPVOID, MPVOID);
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else if (hwndStatus) {
-        if (*inidata->ininame) {
-          WinSetWindowText(hwndStatus, GetPString(IDS_INTERNALINIVIEWERTEXT));
-          if (hwndStatus2)
-            WinSetWindowText(hwndStatus2, inidata->ininame);
-        }
-        else
-          PostMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
+        if (*inidata->ininame) {
+          WinSetWindowText(hwndStatus, GetPString(IDS_INTERNALINIVIEWERTEXT));
+          if (hwndStatus2)
+            WinSetWindowText(hwndStatus2, inidata->ininame);
+        }
+        else
+          PostMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
       }
     }
@@ -1901 +1907 @@
   case UM_ACTION:
     SetPresParams(WinWindowFromID(hwnd, INI_APPHDR),
-                  &RGBGREY,
-                  &RGBBLACK, &RGBBLACK, GetPString(IDS_8HELVBOLDTEXT));
+                  &RGBGREY,
+                  &RGBBLACK, &RGBBLACK, GetPString(IDS_8HELVBOLDTEXT));
     SetPresParams(WinWindowFromID(hwnd, INI_KEYHDR),
-                  &RGBGREY,
-                  &RGBBLACK, &RGBBLACK, GetPString(IDS_8HELVBOLDTEXT));
+                  &RGBGREY,
+                  &RGBBLACK, &RGBBLACK, GetPString(IDS_8HELVBOLDTEXT));
     SetPresParams(WinWindowFromID(hwnd, INI_DATAHDR),
-                  &RGBGREY,
-                  &RGBBLACK, &RGBBLACK, GetPString(IDS_8HELVBOLDTEXT));
+                  &RGBGREY,
+                  &RGBBLACK, &RGBBLACK, GetPString(IDS_8HELVBOLDTEXT));
     SetPresParams(WinWindowFromID(hwnd, INI_NUMAPPS),
-                  &RGBGREY,
-                  &RGBBLACK, &RGBBLACK, GetPString(IDS_8HELVBOLDTEXT));
+                  &RGBGREY,
+                  &RGBBLACK, &RGBBLACK, GetPString(IDS_8HELVBOLDTEXT));
     SetPresParams(WinWindowFromID(hwnd, INI_NUMKEYS),
-                  &RGBGREY,
-                  &RGBBLACK, &RGBBLACK, GetPString(IDS_8HELVBOLDTEXT));
+                  &RGBGREY,
+                  &RGBBLACK, &RGBBLACK, GetPString(IDS_8HELVBOLDTEXT));
     SetPresParams(WinWindowFromID(hwnd, INI_NUMDATA),
-                  &RGBGREY,
-                  &RGBBLACK, &RGBBLACK, GetPString(IDS_8HELVBOLDTEXT));
+                  &RGBGREY,
+                  &RGBBLACK, &RGBBLACK, GetPString(IDS_8HELVBOLDTEXT));
     if (!WinSetPresParam(WinWindowFromID(hwnd, INI_DATALIST),
-                         PP_FONTNAMESIZE,
-                         (ULONG) strlen(GetPString(IDS_5SYSTEMVIOTEXT)) + 1,
-                         (PVOID) GetPString(IDS_5SYSTEMVIOTEXT)))
+                         PP_FONTNAMESIZE,
+                         (ULONG) strlen(GetPString(IDS_5SYSTEMVIOTEXT)) + 1,
+                         (PVOID) GetPString(IDS_5SYSTEMVIOTEXT)))
       WinSetPresParam(WinWindowFromID(hwnd, INI_DATALIST),
-                      PP_FONTNAMESIZE,
-                      (ULONG) strlen(GetPString(IDS_10SYSTEMMONOTEXT)) + 1,
-                      (PVOID) GetPString(IDS_10SYSTEMMONOTEXT));
+                      PP_FONTNAMESIZE,
+                      (ULONG) strlen(GetPString(IDS_10SYSTEMMONOTEXT)) + 1,
+                      (PVOID) GetPString(IDS_10SYSTEMMONOTEXT));
     RestorePresParams(hwnd, "IniUtil");
     return 0;
@@ -1942 +1948 @@
       ULONG size;
       SHORT numitems = (SHORT)WinSendDlgItemMsg(hwnd,
-                                                INI_APPLIST,
-                                                LM_QUERYITEMCOUNT,
-                                                MPVOID, MPVOID);
+                                                INI_APPLIST,
+                                                LM_QUERYITEMCOUNT,
+                                                MPVOID, MPVOID);
       if (!numitems) {
-        PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(INI_REFRESH, 0), MPVOID);
-        return 0;
+        PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(INI_REFRESH, 0), MPVOID);
+        return 0;
       }
       size = 0;
       if (PrfQueryProfileSize(inidata->hini,
-                              (CHAR *)mp1, NULL, (PULONG) & size) && size)
-        inprofile = TRUE;
+                              (CHAR *)mp1, NULL, (PULONG) & size) && size)
+        inprofile = TRUE;
       else
-        inprofile = FALSE;
+        inprofile = FALSE;
       sSelect = (SHORT) WinSendDlgItemMsg(hwnd,
-                                          INI_APPLIST,
-                                          LM_SEARCHSTRING,
-                                          MPFROM2SHORT(LSS_CASESENSITIVE,
-                                                       LIT_FIRST),
-                                          MPFROMP((CHAR *)mp1));
+                                          INI_APPLIST,
+                                          LM_SEARCHSTRING,
+                                          MPFROM2SHORT(LSS_CASESENSITIVE,
+                                                       LIT_FIRST),
+                                          MPFROMP((CHAR *)mp1));
       if (sSelect >= 0) {
-        if (!inprofile)
-          WinSendDlgItemMsg(hwnd,
-                            INI_APPLIST,
-                            LM_DELETEITEM, MPFROMSHORT(sSelect), MPVOID);
-        else if (!strcmp(inidata->applname, (CHAR *)mp1))
-          PostMsg(hwnd,
-                  WM_CONTROL,
-                  MPFROM2SHORT(INI_APPLIST, LN_SELECT),
-                  MPFROMLONG(WinWindowFromID(hwnd, INI_APPLIST)));
+        if (!inprofile)
+          WinSendDlgItemMsg(hwnd,
+                            INI_APPLIST,
+                            LM_DELETEITEM, MPFROMSHORT(sSelect), MPVOID);
+        else if (!strcmp(inidata->applname, (CHAR *)mp1))
+          PostMsg(hwnd,
+                  WM_CONTROL,
+                  MPFROM2SHORT(INI_APPLIST, LN_SELECT),
+                  MPFROMLONG(WinWindowFromID(hwnd, INI_APPLIST)));
       }
       else if (inprofile)
-        WinSendDlgItemMsg(hwnd,
-                          INI_APPLIST,
-                          LM_INSERTITEM,
-                          MPFROM2SHORT(LIT_SORTASCENDING, 0),
-                          MPFROMP((CHAR *)mp1));
+        WinSendDlgItemMsg(hwnd,
+                          INI_APPLIST,
+                          LM_INSERTITEM,
+                          MPFROM2SHORT(LIT_SORTASCENDING, 0),
+                          MPFROMP((CHAR *)mp1));
       if (mp2 && inidata->applname) {
-        if (!EnumKeyNames(WinWindowFromID(hwnd, INI_KEYLIST),
-                          inidata->hini, inidata->applname))
-          PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(INI_REFRESH, 0), MPVOID);
+        if (!EnumKeyNames(WinWindowFromID(hwnd, INI_KEYLIST),
+                          inidata->hini, inidata->applname))
+          PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(INI_REFRESH, 0), MPVOID);
       }
     }
     return 0;
 
-  case UM_INITIALSIZE:                  /* kludge */
+  case UM_INITIALSIZE:                  /* kludge */
     inidata = INSTDATA(hwnd);
     if (!inidata)
@@ -2000 +2006 @@
 
       WinSetWindowPos(WinWindowFromID(hwnd, INI_APPHDR), HWND_TOP,
-                      2, cy - 22, (cx / 4) - 4, 20, SWP_MOVE | SWP_SIZE);
+                      2, cy - 22, (cx / 4) - 4, 20, SWP_MOVE | SWP_SIZE);
       WinSetWindowPos(WinWindowFromID(hwnd, INI_NUMAPPS), HWND_TOP,
-                      (cx / 4) + 2, cy - 22, (cx / 4) - 4, 20,
-                      SWP_MOVE | SWP_SIZE);
+                      (cx / 4) + 2, cy - 22, (cx / 4) - 4, 20,
+                      SWP_MOVE | SWP_SIZE);
       WinSetWindowPos(WinWindowFromID(hwnd, INI_APPLIST), HWND_TOP,
-                      2, (cy / 2) + 2, (cx / 2) - 4, (cy / 2) - 28,
-                      SWP_MOVE | SWP_SIZE);
+                      2, (cy / 2) + 2, (cx / 2) - 4, (cy / 2) - 28,
+                      SWP_MOVE | SWP_SIZE);
       WinSetWindowPos(WinWindowFromID(hwnd, INI_KEYHDR), HWND_TOP,
-                      (cx / 2) + 2, cy - 22, (cx / 4) - 4, 20,
-                      SWP_MOVE | SWP_SIZE);
+                      (cx / 2) + 2, cy - 22, (cx / 4) - 4, 20,
+                      SWP_MOVE | SWP_SIZE);
       WinSetWindowPos(WinWindowFromID(hwnd, INI_NUMKEYS), HWND_TOP,
-                      (cx - (cx / 4)) + 2, cy - 22, (cx / 4) - 4, 20,
-                      SWP_MOVE | SWP_SIZE);
+                      (cx - (cx / 4)) + 2, cy - 22, (cx / 4) - 4, 20,
+                      SWP_MOVE | SWP_SIZE);
       WinSetWindowPos(WinWindowFromID(hwnd, INI_KEYLIST), HWND_TOP,
-                      (cx / 2) + 2, (cy / 2) + 2, (cx / 2) - 4, (cy / 2) - 28,
-                      SWP_MOVE | SWP_SIZE);
+                      (cx / 2) + 2, (cy / 2) + 2, (cx / 2) - 4, (cy / 2) - 28,
+                      SWP_MOVE | SWP_SIZE);
       WinSetWindowPos(WinWindowFromID(hwnd, INI_DATAHDR), HWND_TOP,
-                      2, (cy / 2) - 22, (cx / 2) - 4, 20,
-                      SWP_MOVE | SWP_SIZE);
+                      2, (cy / 2) - 22, (cx / 2) - 4, 20,
+                      SWP_MOVE | SWP_SIZE);
       WinSetWindowPos(WinWindowFromID(hwnd, INI_NUMDATA), HWND_TOP,
-                      (cx / 2) + 2, (cy / 2) - 22, (cx / 2) - 4, 20,
-                      SWP_MOVE | SWP_SIZE);
+                      (cx / 2) + 2, (cy / 2) - 22, (cx / 2) - 4, 20,
+                      SWP_MOVE | SWP_SIZE);
       WinSetWindowPos(WinWindowFromID(hwnd, INI_DATALIST), HWND_TOP,
-                      2, 2, cx - 4, (cy / 2) - 28, SWP_MOVE | SWP_SIZE);
+                      2, 2, cx - 4, (cy / 2) - 28, SWP_MOVE | SWP_SIZE);
     }
     break;
@@ -2034 +2040 @@
     else {
       if (mp1) {
-        strcpy(inidata->ininame, (CHAR *)mp1);
-        inidata->hini = PrfOpenProfile(WinQueryAnchorBlock(hwnd),
-                                       inidata->ininame);
-        free(mp1);
+        strcpy(inidata->ininame, (CHAR *)mp1);
+        inidata->hini = PrfOpenProfile(WinQueryAnchorBlock(hwnd),
+                                       inidata->ininame);
+        free(mp1);
       }
       else
-        inidata->hini = HINI_USERPROFILE;
+        inidata->hini = HINI_USERPROFILE;
       if (inidata->hini == NULLHANDLE) {
-        Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                  "PrfOpenProfile failed for %s", inidata->ininame);
+        Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                  "PrfOpenProfile failed for %s", inidata->ininame);
       }
       else {
-        WinSendMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
-        WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
-        WinSetWindowPos(WinQueryWindow(hwnd, QW_PARENT),
-                        HWND_TOP,
-                        0, 0, 0, 0, SWP_SHOW | SWP_ACTIVATE | SWP_ZORDER);
-        EnumAppNames(WinWindowFromID(hwnd, INI_APPLIST), inidata->hini);
-        return 0;
+        WinSendMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
+        WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
+        WinSetWindowPos(WinQueryWindow(hwnd, QW_PARENT),
+                        HWND_TOP,
+                        0, 0, 0, 0, SWP_SHOW | SWP_ACTIVATE | SWP_ZORDER);
+        EnumAppNames(WinWindowFromID(hwnd, INI_APPLIST), inidata->hini);
+        return 0;
       }
     }
@@ -2069 +2075 @@
       hps = WinBeginPaint(hwnd, (HPS) 0, NULL);
       if (hps) {
-        WinQueryWindowRect(hwnd, &rcl);
-        WinFillRect(hps, &rcl, CLR_PALEGRAY);
-        WinEndPaint(hps);
-        /*
-         * tell status window to paint its box
-         */
-        PaintRecessedWindow(WinWindowFromID(hwnd, INI_APPHDR),
-                            (HPS) 0, FALSE, FALSE);
-        PaintRecessedWindow(WinWindowFromID(hwnd, INI_KEYHDR),
-                            (HPS) 0, FALSE, FALSE);
-        PaintRecessedWindow(WinWindowFromID(hwnd, INI_DATAHDR),
-                            (HPS) 0, FALSE, FALSE);
-        PaintRecessedWindow(WinWindowFromID(hwnd, INI_NUMAPPS),
-                            (HPS) 0, FALSE, FALSE);
-        PaintRecessedWindow(WinWindowFromID(hwnd, INI_NUMKEYS),
-                            (HPS) 0, FALSE, FALSE);
-        PaintRecessedWindow(WinWindowFromID(hwnd, INI_NUMDATA),
-                            (HPS) 0, FALSE, FALSE);
-        inidata = INSTDATA(hwnd);
-        if (!inidata)
-          Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
-        else if (inidata->hwndCurrent)
-          BoxWindow(inidata->hwndCurrent, (HPS) 0, CLR_RED);
+        WinQueryWindowRect(hwnd, &rcl);
+        WinFillRect(hps, &rcl, CLR_PALEGRAY);
+        WinEndPaint(hps);
+        /*
+         * tell status window to paint its box
+         */
+        PaintRecessedWindow(WinWindowFromID(hwnd, INI_APPHDR),
+                            (HPS) 0, FALSE, FALSE);
+        PaintRecessedWindow(WinWindowFromID(hwnd, INI_KEYHDR),
+                            (HPS) 0, FALSE, FALSE);
+        PaintRecessedWindow(WinWindowFromID(hwnd, INI_DATAHDR),
+                            (HPS) 0, FALSE, FALSE);
+        PaintRecessedWindow(WinWindowFromID(hwnd, INI_NUMAPPS),
+                            (HPS) 0, FALSE, FALSE);
+        PaintRecessedWindow(WinWindowFromID(hwnd, INI_NUMKEYS),
+                            (HPS) 0, FALSE, FALSE);
+        PaintRecessedWindow(WinWindowFromID(hwnd, INI_NUMDATA),
+                            (HPS) 0, FALSE, FALSE);
+        inidata = INSTDATA(hwnd);
+        if (!inidata)
+          Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        else if (inidata->hwndCurrent)
+          BoxWindow(inidata->hwndCurrent, (HPS) 0, CLR_RED);
       }
     }
@@ -2103 +2109 @@
       switch (SHORT2FROMMP(mp1)) {
       case LN_SETFOCUS:
-        inidata = INSTDATA(hwnd);
-        if (!inidata)
-          Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
-        else {
-          if (inidata->hwndCurrent)
-            BoxWindow(inidata->hwndCurrent, (HPS) 0, CLR_PALEGRAY);
-          inidata->hwndCurrent = WinWindowFromID(hwnd, SHORT1FROMMP(mp1));
-          BoxWindow(WinWindowFromID(hwnd,
-                                    SHORT1FROMMP(mp1)), (HPS) 0, CLR_RED);
-        }
-        break;
+        inidata = INSTDATA(hwnd);
+        if (!inidata)
+          Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        else {
+          if (inidata->hwndCurrent)
+            BoxWindow(inidata->hwndCurrent, (HPS) 0, CLR_PALEGRAY);
+          inidata->hwndCurrent = WinWindowFromID(hwnd, SHORT1FROMMP(mp1));
+          BoxWindow(WinWindowFromID(hwnd,
+                                    SHORT1FROMMP(mp1)), (HPS) 0, CLR_RED);
+        }
+        break;
 
       case LN_ENTER:
       case LN_SELECT:
-        {
-          CHAR applname[CCHMAXPATH], keyname[CCHMAXPATH];
-          SHORT sSelect;
-
-          if (SHORT1FROMMP(mp1) == INI_DATALIST)
-            break;
-
-          inidata = INSTDATA(hwnd);
-          if (!inidata || !inidata->hini) {
-            Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
-            break;
-          }
-          WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
-          inidata->keyindex = inidata->appindex = 0;
-          *applname = *keyname = *inidata->applname = *inidata->keyname = 0;
-          sSelect = (SHORT) WinSendDlgItemMsg(hwnd,
-                                              INI_APPLIST,
-                                              LM_QUERYSELECTION,
-                                              MPFROM2SHORT(LIT_FIRST, 0),
-                                              MPVOID);
-          if (sSelect < 0)
-            break;
-          inidata->appindex = sSelect;
-          WinSendDlgItemMsg(hwnd,
-                            INI_APPLIST,
-                            LM_QUERYITEMTEXT,
-                            MPFROM2SHORT(sSelect, CCHMAXPATH - 1),
-                            MPFROMP(applname));
-          if (SHORT1FROMMP(mp1) == INI_APPLIST) {
-            if (!EnumKeyNames(WinWindowFromID(hwnd, INI_KEYLIST),
-                              inidata->hini, applname))
-              PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(INI_REFRESH, 0), MPVOID);
-          }
-          else {
-            sSelect = (SHORT) WinSendDlgItemMsg(hwnd, INI_KEYLIST,
-                                                LM_QUERYSELECTION,
-                                                MPFROM2SHORT(LIT_FIRST, 0),
-                                                MPVOID);
-            if (sSelect < 0)
-              break;
-            inidata->keyindex = sSelect;
-            WinSendDlgItemMsg(hwnd,
-                              INI_KEYLIST,
-                              LM_QUERYITEMTEXT,
-                              MPFROM2SHORT(sSelect, CCHMAXPATH - 1),
-                              MPFROMP(keyname));
-            if (!*keyname || !*applname)
-              break;
-            strcpy(inidata->keyname, keyname);
-            strcpy(inidata->applname, applname);
-            xfree(inidata->data, pszSrcFile, __LINE__);
-            inidata->data = GetKeyData(WinWindowFromID(hwnd,
-                                                       INI_DATALIST),
-                                       inidata->hini,
-                                       applname, keyname, &inidata->datalen);
-            if (!inidata->data)
-              PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(INI_REFRESH, 0), MPVOID);
-          }
-        }
-        break;
+        {
+          CHAR applname[CCHMAXPATH], keyname[CCHMAXPATH];
+          SHORT sSelect;
+
+          if (SHORT1FROMMP(mp1) == INI_DATALIST)
+            break;
+
+          inidata = INSTDATA(hwnd);
+          if (!inidata || !inidata->hini) {
+            Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+            break;
+          }
+          WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
+          inidata->keyindex = inidata->appindex = 0;
+          *applname = *keyname = *inidata->applname = *inidata->keyname = 0;
+          sSelect = (SHORT) WinSendDlgItemMsg(hwnd,
+                                              INI_APPLIST,
+                                              LM_QUERYSELECTION,
+                                              MPFROM2SHORT(LIT_FIRST, 0),
+                                              MPVOID);
+          if (sSelect < 0)
+            break;
+          inidata->appindex = sSelect;
+          WinSendDlgItemMsg(hwnd,
+                            INI_APPLIST,
+                            LM_QUERYITEMTEXT,
+                            MPFROM2SHORT(sSelect, CCHMAXPATH - 1),
+                            MPFROMP(applname));
+          if (SHORT1FROMMP(mp1) == INI_APPLIST) {
+            if (!EnumKeyNames(WinWindowFromID(hwnd, INI_KEYLIST),
+                              inidata->hini, applname))
+              PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(INI_REFRESH, 0), MPVOID);
+          }
+          else {
+            sSelect = (SHORT) WinSendDlgItemMsg(hwnd, INI_KEYLIST,
+                                                LM_QUERYSELECTION,
+                                                MPFROM2SHORT(LIT_FIRST, 0),
+                                                MPVOID);
+            if (sSelect < 0)
+              break;
+            inidata->keyindex = sSelect;
+            WinSendDlgItemMsg(hwnd,
+                              INI_KEYLIST,
+                              LM_QUERYITEMTEXT,
+                              MPFROM2SHORT(sSelect, CCHMAXPATH - 1),
+                              MPFROMP(keyname));
+            if (!*keyname || !*applname)
+              break;
+            strcpy(inidata->keyname, keyname);
+            strcpy(inidata->applname, applname);
+            xfree(inidata->data, pszSrcFile, __LINE__);
+            inidata->data = GetKeyData(WinWindowFromID(hwnd,
+                                                       INI_DATALIST),
+                                       inidata->hini,
+                                       applname, keyname, &inidata->datalen);
+            if (!inidata->data)
+              PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(INI_REFRESH, 0), MPVOID);
+          }
+        }
+        break;
       }
       break;
@@ -2188 +2194 @@
 
       num = (SHORT) WinSendDlgItemMsg(hwnd,
-                                      INI_APPLIST,
-                                      LM_QUERYITEMCOUNT, MPVOID, MPVOID);
+                                      INI_APPLIST,
+                                      LM_QUERYITEMCOUNT, MPVOID, MPVOID);
       sprintf(s, "%u", num);
       WinSetDlgItemText(hwnd, INI_NUMAPPS, s);
       num = (SHORT) WinSendDlgItemMsg(hwnd,
-                                      INI_KEYLIST,
-                                      LM_QUERYITEMCOUNT, MPVOID, MPVOID);
+                                      INI_KEYLIST,
+                                      LM_QUERYITEMCOUNT, MPVOID, MPVOID);
       sprintf(s, "%u", num);
       WinSetDlgItemText(hwnd, INI_NUMKEYS, s);
       WinSetDlgItemText(hwnd, INI_NUMDATA, "0");
       WinSendDlgItemMsg(hwnd, INI_DATALIST, LM_DELETEALL, MPVOID, MPVOID);
-      // inidata = WinQueryWindowPtr(hwnd, QWL_USER);   // 09 Jan 08 SHL
+      // inidata = WinQueryWindowPtr(hwnd, QWL_USER);   // 09 Jan 08 SHL
     }
     return 0;
@@ -2218 +2224 @@
       prfp.pszSysName = (PSZ) sysini;
       if (PrfQueryProfile(WinQueryAnchorBlock(hwnd), &prfp)) {
-        if (inidata->hini == HINI_SYSTEMPROFILE)
-          strcpy(inidata->ininame, sysini);
-        else if (inidata->hini == HINI_USERPROFILE)
-          strcpy(inidata->ininame, userini);
-        sprintf(sysini, GetPString(IDS_INITITLETEXT), inidata->ininame);
-        WinSetWindowText(WinQueryWindow(hwnd, QW_PARENT), sysini);
-        if (WinQueryWindow(hwnd, QW_PARENT) ==
-            WinQueryActiveWindow(WinQueryWindow
-                                 (WinQueryWindow(hwnd, QW_PARENT),
-                                  QW_PARENT))) {
-          if (hwndStatus)
-            WinSetWindowText(hwndStatus,
-                             GetPString(IDS_INTERNALINIVIEWERTEXT));
-          if (hwndStatus2)
-            WinSetWindowText(hwndStatus2, inidata->ininame);
-        }
+        if (inidata->hini == HINI_SYSTEMPROFILE)
+          strcpy(inidata->ininame, sysini);
+        else if (inidata->hini == HINI_USERPROFILE)
+          strcpy(inidata->ininame, userini);
+        sprintf(sysini, GetPString(IDS_INITITLETEXT), inidata->ininame);
+        WinSetWindowText(WinQueryWindow(hwnd, QW_PARENT), sysini);
+        if (WinQueryWindow(hwnd, QW_PARENT) ==
+            WinQueryActiveWindow(WinQueryWindow
+                                 (WinQueryWindow(hwnd, QW_PARENT),
+                                  QW_PARENT))) {
+          if (hwndStatus)
+            WinSetWindowText(hwndStatus,
+                             GetPString(IDS_INTERNALINIVIEWERTEXT));
+          if (hwndStatus2)
+            WinSetWindowText(hwndStatus2, inidata->ininame);
+        }
       }
       else
-        WinSetWindowText(WinQueryWindow(hwnd, QW_PARENT),
-                         GetPString(IDS_INIQUERYPRFFAILEDTEXT));
+        WinSetWindowText(WinQueryWindow(hwnd, QW_PARENT),
+                         GetPString(IDS_INIQUERYPRFFAILEDTEXT));
       return 0;
     }
@@ -2247 +2253 @@
     if (!(SHORT1FROMMP(mp1) & KC_KEYUP)) {
       if (SHORT1FROMMP(mp1) & KC_VIRTUALKEY) {
-        switch (SHORT2FROMMP(mp2)) {
-        case VK_DELETE:
-          inidata = INSTDATA(hwnd);
-          if (!inidata)
-            Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
-          else {
-            SHORT cmd = inidata->hwndCurrent &&
-                        WinQueryWindowUShort(inidata->hwndCurrent, QWS_ID) ==
-                         INI_APPLIST ?
-                        INI_DELETEAPP :INI_DELETEKEY;
-            PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(cmd, 0), MPVOID);
-          }
-          break;
-        }
+        switch (SHORT2FROMMP(mp2)) {
+        case VK_DELETE:
+          inidata = INSTDATA(hwnd);
+          if (!inidata)
+            Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+          else {
+            SHORT cmd = inidata->hwndCurrent &&
+                        WinQueryWindowUShort(inidata->hwndCurrent, QWS_ID) ==
+                         INI_APPLIST ?
+                        INI_DELETEAPP :INI_DELETEKEY;
+            PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(cmd, 0), MPVOID);
+          }
+          break;
+        }
       }
     }
@@ -2271 +2277 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else if (inidata->hwndCurrent) {
-        STRINGINPARMS sip;
-        static CHAR tofind[258] = "";
-        SHORT x, z;
-
-        if (SHORT1FROMMP(mp1) == IDM_FINDFIRST || !*tofind) {
-          z = LIT_FIRST;
-          memset(&sip, 0, sizeof(sip));
-          sip.help = GetPString(IDS_INISEARCHHELPTEXT);
-          sip.prompt = GetPString(IDS_INISEARCHPROMPTTEXT);
-          sip.inputlen = 257;
-          sip.ret = tofind;
-          sip.title = GetPString(IDS_INISEARCHTITLETEXT);
-          if (WinDlgBox(HWND_DESKTOP,
-                        hwnd,
-                        InputDlgProc, FM3ModHandle, STR_FRAME, &sip)) {
-            rstrip(tofind);
-            if (!*tofind) {
-              DosBeep(50, 100);
-              break;
-            }
-          }
-          else
-            break;
-        }
-        else {
-          z = (SHORT) WinSendMsg(inidata->hwndCurrent,
-                                 LM_QUERYSELECTION,
-                                 MPFROM2SHORT(LIT_CURSOR, 0), MPVOID);
-          if (z < 0)
-            z = LIT_FIRST;
-        }
-        x = (SHORT) WinSendMsg(inidata->hwndCurrent,
-                               LM_SEARCHSTRING,
-                               MPFROM2SHORT(LSS_SUBSTRING, z),
-                               MPFROMP(tofind));
-        if (x >= 0 && x > z) {
-          WinSendMsg(inidata->hwndCurrent,
-                     LM_SETTOPINDEX, MPFROM2SHORT(x, 0), MPVOID);
-          WinSendMsg(inidata->hwndCurrent,
-                     LM_SELECTITEM,
-                     MPFROM2SHORT(x, 0), MPFROM2SHORT(TRUE, 0));
-        }
-        else
-          DosBeep(250, 100);
+        STRINGINPARMS sip;
+        static CHAR tofind[258] = "";
+        SHORT x, z;
+
+        if (SHORT1FROMMP(mp1) == IDM_FINDFIRST || !*tofind) {
+          z = LIT_FIRST;
+          memset(&sip, 0, sizeof(sip));
+          sip.help = GetPString(IDS_INISEARCHHELPTEXT);
+          sip.prompt = GetPString(IDS_INISEARCHPROMPTTEXT);
+          sip.inputlen = 257;
+          sip.ret = tofind;
+          sip.title = GetPString(IDS_INISEARCHTITLETEXT);
+          if (WinDlgBox(HWND_DESKTOP,
+                        hwnd,
+                        InputDlgProc, FM3ModHandle, STR_FRAME, &sip)) {
+            rstrip(tofind);
+            if (!*tofind) {
+              DosBeep(50, 100);
+              break;
+            }
+          }
+          else
+            break;
+        }
+        else {
+          z = (SHORT) WinSendMsg(inidata->hwndCurrent,
+                                 LM_QUERYSELECTION,
+                                 MPFROM2SHORT(LIT_CURSOR, 0), MPVOID);
+          if (z < 0)
+            z = LIT_FIRST;
+        }
+        x = (SHORT) WinSendMsg(inidata->hwndCurrent,
+                               LM_SEARCHSTRING,
+                               MPFROM2SHORT(LSS_SUBSTRING, z),
+                               MPFROMP(tofind));
+        if (x >= 0 && x > z) {
+          WinSendMsg(inidata->hwndCurrent,
+                     LM_SETTOPINDEX, MPFROM2SHORT(x, 0), MPVOID);
+          WinSendMsg(inidata->hwndCurrent,
+                     LM_SELECTITEM,
+                     MPFROM2SHORT(x, 0), MPFROM2SHORT(TRUE, 0));
+        }
+        else
+          DosBeep(250, 100);
       }
       break;
@@ -2323 +2329 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else {
-        SHORT numitems = (SHORT)WinSendDlgItemMsg(hwnd,
-                                                  INI_APPLIST,
-                                                  LM_QUERYITEMCOUNT,
-                                                  MPVOID, MPVOID);
-        if (numitems)
-          WinDlgBox(HWND_DESKTOP,
-                    hwnd,
-                    FilterIniProc, FM3ModHandle, IAF_FRAME, (PVOID) inidata);
-        else
-          DosBeep(50, 100);
+        SHORT numitems = (SHORT)WinSendDlgItemMsg(hwnd,
+                                                  INI_APPLIST,
+                                                  LM_QUERYITEMCOUNT,
+                                                  MPVOID, MPVOID);
+        if (numitems)
+          WinDlgBox(HWND_DESKTOP,
+                    hwnd,
+                    FilterIniProc, FM3ModHandle, IAF_FRAME, (PVOID) inidata);
+        else
+          DosBeep(50, 100);
       }
       break;
@@ -2343 +2349 @@
       inidata = INSTDATA(hwnd);
       if (!inidata || !*inidata->ininame)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else if (mp2) {
-        INIREC *inirec = xmallocz(sizeof(INIREC), pszSrcFile, __LINE__);
-        if (inirec) {
-          *inirec = *(INIREC *) mp2;
-          inirec->hwndDlg = hwnd;
-          inirec->confirm = inidata->confirm;
-          strcpy(inirec->filename1, inidata->ininame);
-          if (_beginthread(CopyIniThread, NULL, 122880, (PVOID) inirec) == -1) {
-            Runtime_Error(pszSrcFile, __LINE__,
-                          GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            free(inirec);
-          }
-        }
+        INIREC *inirec = xmallocz(sizeof(INIREC), pszSrcFile, __LINE__);
+        if (inirec) {
+          *inirec = *(INIREC *) mp2;
+          inirec->hwndDlg = hwnd;
+          inirec->confirm = inidata->confirm;
+          strcpy(inirec->filename1, inidata->ininame);
+          if (_beginthread(CopyIniThread, NULL, 122880, (PVOID) inirec) == -1) {
+            Runtime_Error(pszSrcFile, __LINE__,
+                          GetPString(IDS_COULDNTSTARTTHREADTEXT));
+            free(inirec);
+          }
+        }
       }
       break;
@@ -2363 +2369 @@
       inidata = INSTDATA(hwnd);
       if (!inidata || !*inidata->ininame)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else if (mp2) {
-        INIREC *inirec = xmalloc(sizeof(INIREC), pszSrcFile, __LINE__);
-        if (inirec) {
-          strcpy(inirec->filename2, (CHAR *)(mp2));
-          strcpy(inirec->filename1, inidata->ininame);
-          inirec->hwndDlg = hwnd;
-          if (_beginthread(CompareIniThread, NULL, 122880, (PVOID) inirec) ==
-              -1) {
-            Runtime_Error(pszSrcFile, __LINE__,
-                          GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            free(inirec);
-          }
-        }
+        INIREC *inirec = xmalloc(sizeof(INIREC), pszSrcFile, __LINE__);
+        if (inirec) {
+          strcpy(inirec->filename2, (CHAR *)(mp2));
+          strcpy(inirec->filename1, inidata->ininame);
+          inirec->hwndDlg = hwnd;
+          if (_beginthread(CompareIniThread, NULL, 122880, (PVOID) inirec) ==
+              -1) {
+            Runtime_Error(pszSrcFile, __LINE__,
+                          GetPString(IDS_COULDNTSTARTTHREADTEXT));
+            free(inirec);
+          }
+        }
       }
       break;
@@ -2386 +2392 @@
       inidata = INSTDATA(hwnd);
       if (!inidata) {
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
-        break;
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        break;
       }
       if (!*inidata->ininame ||
-          !*inidata->applname ||
-          (!*inidata->keyname &&
-           (SHORT1FROMMP(mp1) == INI_RENAMEKEY ||
-            SHORT1FROMMP(mp1) == INI_COPYKEY)))
-        break;
+          !*inidata->applname ||
+          (!*inidata->keyname &&
+           (SHORT1FROMMP(mp1) == INI_RENAMEKEY ||
+            SHORT1FROMMP(mp1) == INI_COPYKEY)))
+        break;
       {
-        INIREC *inirec = xmallocz(sizeof(INIREC), pszSrcFile, __LINE__);
-        if (inirec) {
-          inirec->size = sizeof(INIREC);
-          inirec->hwndDlg = hwnd;
-          inirec->confirm = inidata->confirm;
-          inirec->action = (SHORT1FROMMP(mp1) == INI_COPYAPP ||
-                            SHORT1FROMMP(mp1) == INI_COPYKEY) ?
-            IDM_COPY : IDM_MOVE;
-          strcpy(inirec->filename1, inidata->ininame);
-          strcpy(inirec->filename2, inidata->ininame);
-          if (SHORT1FROMMP(mp1) == INI_COPYKEY ||
-              SHORT1FROMMP(mp1) == INI_RENAMEKEY)
-            strcpy(inirec->key, inidata->keyname);
-          strcpy(inirec->app, inidata->applname);
-          if (!WinDlgBox(HWND_DESKTOP,
-                         hwnd,
-                         IntraIniProc,
-                         FM3ModHandle, INII_FRAME, (PVOID) inirec)) {
-            free(inirec);
-            break;
-          }
-          if (_beginthread(CopyIniThread, NULL, 122880, (PVOID) inirec) == -1) {
-            Runtime_Error(pszSrcFile, __LINE__,
-                          GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            free(inirec);
-          }
-        }
+        INIREC *inirec = xmallocz(sizeof(INIREC), pszSrcFile, __LINE__);
+        if (inirec) {
+          inirec->size = sizeof(INIREC);
+          inirec->hwndDlg = hwnd;
+          inirec->confirm = inidata->confirm;
+          inirec->action = (SHORT1FROMMP(mp1) == INI_COPYAPP ||
+                            SHORT1FROMMP(mp1) == INI_COPYKEY) ?
+            IDM_COPY : IDM_MOVE;
+          strcpy(inirec->filename1, inidata->ininame);
+          strcpy(inirec->filename2, inidata->ininame);
+          if (SHORT1FROMMP(mp1) == INI_COPYKEY ||
+              SHORT1FROMMP(mp1) == INI_RENAMEKEY)
+            strcpy(inirec->key, inidata->keyname);
+          strcpy(inirec->app, inidata->applname);
+          if (!WinDlgBox(HWND_DESKTOP,
+                         hwnd,
+                         IntraIniProc,
+                         FM3ModHandle, INII_FRAME, (PVOID) inirec)) {
+            free(inirec);
+            break;
+          }
+          if (_beginthread(CopyIniThread, NULL, 122880, (PVOID) inirec) == -1) {
+            Runtime_Error(pszSrcFile, __LINE__,
+                          GetPString(IDS_COULDNTSTARTTHREADTEXT));
+            free(inirec);
+          }
+        }
       }
       break;
@@ -2429 +2435 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else if (*inidata->ininame) {
-        // 09 Jan 08 SHL fixme to complain
-        CHAR filename[CCHMAXPATH], *p;
-
-        strcpy(filename, inidata->ininame);
-        p = filename;
-        while (*p) {
-          if (*p == '/')
-            *p = '\\';
-          p++;
-        }
-        p = strrchr(filename, '\\');
-        if (p) {
-          p++;
-          *p = 0;
-        }
-        else
-          *filename = 0;
-        strcat(filename, "*.INI");
-        if (export_filename(hwnd, filename, TRUE)) {
-
-          PPRFPROFILE prfp;
-
-          prfp = xmallocz(sizeof(PRFPROFILE), pszSrcFile, __LINE__);
-          if (prfp) {
-            prfp->pszUserName =
-              xstrdup(inidata->ininame, pszSrcFile, __LINE__);
-            if (!prfp->pszUserName)
-              free(prfp);
-            else {
-              prfp->cchUserName = strlen(prfp->pszUserName);
-              prfp->pszSysName = xstrdup(filename, pszSrcFile, __LINE__);
-              if (!prfp->pszSysName) {
-                free(prfp->pszUserName);
-                free(prfp);
-              }
-              else {
-                prfp->cchSysName = strlen(prfp->pszSysName);
-                if (_beginthread(BackupIniThread, NULL, 122880, (PVOID) prfp)
-                    == -1) {
-                  Runtime_Error(pszSrcFile, __LINE__,
-                                GetPString(IDS_COULDNTSTARTTHREADTEXT));
-                  free(prfp->pszSysName);
-                  free(prfp->pszUserName);
-                  free(prfp);
-                }
-                else
-                  DosSleep(100); //05 Aug 07 GKY 250
-              }
-            }
-          }
-        }
+        // 09 Jan 08 SHL fixme to complain
+        CHAR filename[CCHMAXPATH], *p;
+
+        strcpy(filename, inidata->ininame);
+        p = filename;
+        while (*p) {
+          if (*p == '/')
+            *p = '\\';
+          p++;
+        }
+        p = strrchr(filename, '\\');
+        if (p) {
+          p++;
+          *p = 0;
+        }
+        else
+          *filename = 0;
+        strcat(filename, "*.INI");
+        if (export_filename(hwnd, filename, TRUE)) {
+
+          PPRFPROFILE prfp;
+
+          prfp = xmallocz(sizeof(PRFPROFILE), pszSrcFile, __LINE__);
+          if (prfp) {
+            prfp->pszUserName =
+              xstrdup(inidata->ininame, pszSrcFile, __LINE__);
+            if (!prfp->pszUserName)
+              free(prfp);
+            else {
+              prfp->cchUserName = strlen(prfp->pszUserName);
+              prfp->pszSysName = xstrdup(filename, pszSrcFile, __LINE__);
+              if (!prfp->pszSysName) {
+                free(prfp->pszUserName);
+                free(prfp);
+              }
+              else {
+                prfp->cchSysName = strlen(prfp->pszSysName);
+                if (_beginthread(BackupIniThread, NULL, 122880, (PVOID) prfp)
+                    == -1) {
+                  Runtime_Error(pszSrcFile, __LINE__,
+                                GetPString(IDS_COULDNTSTARTTHREADTEXT));
+                  free(prfp->pszSysName);
+                  free(prfp->pszUserName);
+                  free(prfp);
+                }
+                else
+                  DosSleep(100); //05 Aug 07 GKY 250
+              }
+            }
+          }
+        }
       }
       break;
@@ -2488 +2494 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else {
-        if (WinDlgBox(HWND_DESKTOP,
-                      hwnd,
-                      ChangeIniProc,
-                      FM3ModHandle, INIR_FRAME, (PVOID) inidata->ininame)) {
-          WinSendMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
-          WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
-          EnumAppNames(WinWindowFromID(hwnd, INI_APPLIST), inidata->hini);
-        }
+        if (WinDlgBox(HWND_DESKTOP,
+                      hwnd,
+                      ChangeIniProc,
+                      FM3ModHandle, INIR_FRAME, (PVOID) inidata->ininame)) {
+          WinSendMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
+          WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
+          EnumAppNames(WinWindowFromID(hwnd, INI_APPLIST), inidata->hini);
+        }
       }
       break;
@@ -2504 +2510 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else {
-        if (WinDlgBox(HWND_DESKTOP,
-                      hwnd,
-                      SwapIniProc,
-                      FM3ModHandle, INIR_FRAME, (PVOID) inidata->ininame)) {
-          WinSendMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
-          WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
-          EnumAppNames(WinWindowFromID(hwnd, INI_APPLIST), inidata->hini);
-        }
+        if (WinDlgBox(HWND_DESKTOP,
+                      hwnd,
+                      SwapIniProc,
+                      FM3ModHandle, INIR_FRAME, (PVOID) inidata->ininame)) {
+          WinSendMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
+          WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
+          EnumAppNames(WinWindowFromID(hwnd, INI_APPLIST), inidata->hini);
+        }
       }
       break;
@@ -2520 +2526 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else {
-        inidata->currid++;
-        if (inidata->currid > INI_DATALIST)
-          inidata->currid = INI_APPLIST;
+        inidata->currid++;
+        if (inidata->currid > INI_DATALIST)
+          inidata->currid = INI_APPLIST;
       }
       WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, inidata->currid));
@@ -2532 +2538 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else {
-        inidata->currid--;
-        if (inidata->currid < INI_APPLIST)
-          inidata->currid = INI_DATALIST;
+        inidata->currid--;
+        if (inidata->currid < INI_APPLIST)
+          inidata->currid = INI_DATALIST;
       }
       WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, inidata->currid));
@@ -2544 +2550 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else {
-        inidata->confirm = (inidata->confirm) ? FALSE : TRUE;
-        WinCheckMenuItem(inidata->hwndMenu, INI_CONFIRM, inidata->confirm);
+        inidata->confirm = (inidata->confirm) ? FALSE : TRUE;
+        WinCheckMenuItem(inidata->hwndMenu, INI_CONFIRM, inidata->confirm);
 
       }
@@ -2556 +2562 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else {
-        inidata->edit = (SHORT1FROMMP(mp1) == INI_EDITENTRY);
-        WinDlgBox(HWND_DESKTOP,
-                  hwnd, AddIniProc, FM3ModHandle, IAD_FRAME, (PVOID) inidata);
+        inidata->edit = (SHORT1FROMMP(mp1) == INI_EDITENTRY);
+        WinDlgBox(HWND_DESKTOP,
+                  hwnd, AddIniProc, FM3ModHandle, IAD_FRAME, (PVOID) inidata);
       }
       break;
@@ -2567 +2573 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else {
-        CHAR filename[CCHMAXPATH + 81], *p;
-        FILESTATUS3 fsa;
-        HINI hINI;
-
-        strcpy(filename, inidata->ininame);
-        p = filename;
-        while (*p) {
-          if (*p == '/')
-            *p = '\\';
-          p++;
-        }
-        p = strrchr(filename, '\\');
-        if (p) {
-          p++;
-          *p = 0;
-        }
-        else
-          *filename = 0;
-        strcat(filename, "*.INI");
-        if (insert_filename(hwnd,
-                            filename,
-                            TRUE,
-                            TRUE) &&
-            *filename &&
-            !DosQueryPathInfo(filename, FIL_STANDARD, &fsa, sizeof(fsa))) {
-          hINI = PrfOpenProfile(WinQueryAnchorBlock(hwnd), filename);
-          if (hINI == NULLHANDLE) {
-            Win_Error(hwnd, hwnd, __FILE__, __LINE__,
-                      GetPString(IDS_INICANTOPENINITEXT), filename);
-          }
-          else {
-            if (*inidata->ininame) {
-              if (inidata->hini)
-                CloseProfile(inidata->hini, FALSE);
-              *inidata->ininame = 0;
-            }
-            inidata->hini = hINI;
-            strcpy(inidata->ininame, filename);
-            WinSendMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
-            WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
-            EnumAppNames(WinWindowFromID(hwnd, INI_APPLIST), inidata->hini);
-          }
-        }
+        CHAR filename[CCHMAXPATH + 81], *p;
+        FILESTATUS3 fsa;
+        HINI hINI;
+
+        strcpy(filename, inidata->ininame);
+        p = filename;
+        while (*p) {
+          if (*p == '/')
+            *p = '\\';
+          p++;
+        }
+        p = strrchr(filename, '\\');
+        if (p) {
+          p++;
+          *p = 0;
+        }
+        else
+          *filename = 0;
+        strcat(filename, "*.INI");
+        if (insert_filename(hwnd,
+                            filename,
+                            TRUE,
+                            TRUE) &&
+            *filename &&
+            !DosQueryPathInfo(filename, FIL_STANDARD, &fsa, sizeof(fsa))) {
+          hINI = PrfOpenProfile(WinQueryAnchorBlock(hwnd), filename);
+          if (hINI == NULLHANDLE) {
+            Win_Error(hwnd, hwnd, __FILE__, __LINE__,
+                      GetPString(IDS_INICANTOPENINITEXT), filename);
+          }
+          else {
+            if (*inidata->ininame) {
+              if (inidata->hini)
+                CloseProfile(inidata->hini, FALSE);
+              *inidata->ininame = 0;
+            }
+            inidata->hini = hINI;
+            strcpy(inidata->ininame, filename);
+            WinSendMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
+            WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
+            EnumAppNames(WinWindowFromID(hwnd, INI_APPLIST), inidata->hini);
+          }
+        }
       }
       break;
@@ -2618 +2624 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else {
-        if (inidata->hini && *inidata->ininame)
-          CloseProfile(inidata->hini, FALSE);
-        *inidata->ininame = 0;
-        inidata->hini = HINI_USERPROFILE;
-        WinSendMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
-        WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
-        EnumAppNames(WinWindowFromID(hwnd, INI_APPLIST), inidata->hini);
+        if (inidata->hini && *inidata->ininame)
+          CloseProfile(inidata->hini, FALSE);
+        *inidata->ininame = 0;
+        inidata->hini = HINI_USERPROFILE;
+        WinSendMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
+        WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
+        EnumAppNames(WinWindowFromID(hwnd, INI_APPLIST), inidata->hini);
       }
       break;
@@ -2633 +2639 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else {
-        if (inidata->hini && *inidata->ininame)
-          CloseProfile(inidata->hini, FALSE);
-        *inidata->ininame = 0;
-        inidata->hini = HINI_SYSTEMPROFILE;
-        WinSendMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
-        WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
-        EnumAppNames(WinWindowFromID(hwnd, INI_APPLIST), inidata->hini);
+        if (inidata->hini && *inidata->ininame)
+          CloseProfile(inidata->hini, FALSE);
+        *inidata->ininame = 0;
+        inidata->hini = HINI_SYSTEMPROFILE;
+        WinSendMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
+        WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
+        EnumAppNames(WinWindowFromID(hwnd, INI_APPLIST), inidata->hini);
       }
       break;
@@ -2648 +2654 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else {
-        WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
-        EnumAppNames(WinWindowFromID(hwnd, INI_APPLIST), inidata->hini);
+        WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
+        EnumAppNames(WinWindowFromID(hwnd, INI_APPLIST), inidata->hini);
       }
       break;
@@ -2658 +2664 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else if (*inidata->applname && *inidata->keyname) {
 
-        SHORT keyindex = inidata->keyindex;
-
-        if (inidata->confirm && saymsg(MB_YESNO,
-                                       hwnd,
-                                       GetPString(IDS_CONFIRMTEXT),
-                                       GetPString(IDS_INIDELETEKEYTEXT),
-                                       inidata->keyname) == MBID_NO)
-          break;
-        PrfWriteProfileData(inidata->hini,
-                            inidata->applname, inidata->keyname, NULL, 0L);
-        *inidata->keyname = 0;
-        WinSendDlgItemMsg(hwnd,
-                          INI_KEYLIST,
-                          LM_DELETEITEM, MPFROM2SHORT(keyindex, 0), MPVOID);
-        WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
-        sSel = (SHORT) WinSendDlgItemMsg(hwnd,
-                                         INI_KEYLIST,
-                                         LM_QUERYITEMCOUNT, MPVOID, MPVOID);
-        if (!sSel)
-          WinSendMsg(hwnd, INI_DELETEAPP, MPVOID, MPVOID);
-        else {
-          sSel = min(keyindex, sSel - 1);
-          WinSendDlgItemMsg(hwnd,
-                            INI_KEYLIST,
-                            LM_SELECTITEM,
-                            MPFROMSHORT(sSel), MPFROMSHORT(TRUE));
-        }
+        SHORT keyindex = inidata->keyindex;
+
+        if (inidata->confirm && saymsg(MB_YESNO,
+                                       hwnd,
+                                       GetPString(IDS_CONFIRMTEXT),
+                                       GetPString(IDS_INIDELETEKEYTEXT),
+                                       inidata->keyname) == MBID_NO)
+          break;
+        PrfWriteProfileData(inidata->hini,
+                            inidata->applname, inidata->keyname, NULL, 0L);
+        *inidata->keyname = 0;
+        WinSendDlgItemMsg(hwnd,
+                          INI_KEYLIST,
+                          LM_DELETEITEM, MPFROM2SHORT(keyindex, 0), MPVOID);
+        WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
+        sSel = (SHORT) WinSendDlgItemMsg(hwnd,
+                                         INI_KEYLIST,
+                                         LM_QUERYITEMCOUNT, MPVOID, MPVOID);
+        if (!sSel)
+          WinSendMsg(hwnd, INI_DELETEAPP, MPVOID, MPVOID);
+        else {
+          sSel = min(keyindex, sSel - 1);
+          WinSendDlgItemMsg(hwnd,
+                            INI_KEYLIST,
+                            LM_SELECTITEM,
+                            MPFROMSHORT(sSel), MPFROMSHORT(TRUE));
+        }
       }
       break;
@@ -2694 +2700 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       // 09 Jan 08 SHL fixme to complain?
       else if (*inidata->applname) {
 
-        SHORT appindex = inidata->appindex;
-
-        if (inidata->confirm && saymsg(MB_YESNO,
-                                       hwnd,
-                                       GetPString(IDS_CONFIRMTEXT),
-                                       GetPString(IDS_INIDELETEAPPTEXT),
-                                       inidata->applname) == MBID_NO)
-          break;
-        PrfWriteProfileData(inidata->hini, inidata->applname, NULL, NULL, 0L);
-        *inidata->applname = *inidata->keyname = 0;
-        WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
-        WinSendDlgItemMsg(hwnd, INI_KEYLIST, LM_DELETEALL, MPVOID, MPVOID);
-        WinSendDlgItemMsg(hwnd,
-                          INI_APPLIST,
-                          LM_DELETEITEM, MPFROM2SHORT(appindex, 0), MPVOID);
-        WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
-        sSel = (SHORT) WinSendDlgItemMsg(hwnd,
-                                         INI_APPLIST,
-                                         LM_QUERYITEMCOUNT, MPVOID, MPVOID);
-        if (sSel) {
-          sSel = min(appindex, sSel - 1);
-          WinSendDlgItemMsg(hwnd,
-                            INI_APPLIST,
-                            LM_SELECTITEM,
-                            MPFROMSHORT(sSel), MPFROMSHORT(TRUE));
-        }
+        SHORT appindex = inidata->appindex;
+
+        if (inidata->confirm && saymsg(MB_YESNO,
+                                       hwnd,
+                                       GetPString(IDS_CONFIRMTEXT),
+                                       GetPString(IDS_INIDELETEAPPTEXT),
+                                       inidata->applname) == MBID_NO)
+          break;
+        PrfWriteProfileData(inidata->hini, inidata->applname, NULL, NULL, 0L);
+        *inidata->applname = *inidata->keyname = 0;
+        WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
+        WinSendDlgItemMsg(hwnd, INI_KEYLIST, LM_DELETEALL, MPVOID, MPVOID);
+        WinSendDlgItemMsg(hwnd,
+                          INI_APPLIST,
+                          LM_DELETEITEM, MPFROM2SHORT(appindex, 0), MPVOID);
+        WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
+        sSel = (SHORT) WinSendDlgItemMsg(hwnd,
+                                         INI_APPLIST,
+                                         LM_QUERYITEMCOUNT, MPVOID, MPVOID);
+        if (sSel) {
+          sSel = min(appindex, sSel - 1);
+          WinSendDlgItemMsg(hwnd,
+                            INI_APPLIST,
+                            LM_SELECTITEM,
+                            MPFROMSHORT(sSel), MPFROMSHORT(TRUE));
+        }
       }
       break;
@@ -2734 +2740 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp,
-                   HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_INI, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp,
+                   HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_INI, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
 
     case IDM_ABOUT:
       saymsg(MB_ENTER | MB_ICONASTERISK,
-             hwnd,
-             GetPString(IDS_VIEWABOUTTITLETEXT),
-             GetPString(IDS_INIABOUTTEXT));
+             hwnd,
+             GetPString(IDS_VIEWABOUTTITLETEXT),
+             GetPString(IDS_INIABOUTTEXT));
       break;
     }
@@ -2755 +2761 @@
       WinQueryWindowPos(WinQueryWindow(hwnd, QW_PARENT), &swp);
       if (!(swp.fl & (SWP_HIDE | SWP_MINIMIZE)))
-        WinStoreWindowPos(FM2Str,
-                          "INIWindowPos", WinQueryWindow(hwnd, QW_PARENT));
-      // inidata = WinQueryWindowPtr(hwnd, QWL_USER);   // 09 Jan 08 SHL
+        WinStoreWindowPos(FM2Str,
+                          "INIWindowPos", WinQueryWindow(hwnd, QW_PARENT));
+      // inidata = WinQueryWindowPtr(hwnd, QWL_USER);   // 09 Jan 08 SHL
     }
     WinDestroyWindow(WinQueryWindow(hwnd, QW_PARENT));
@@ -2768 +2774 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else {
-        dontclose = inidata->dontclose;
-        if (inidata->hini != NULLHANDLE && *inidata->ininame)
-          CloseProfile(inidata->hini, FALSE);
-        free(inidata->data);
-        if (inidata->hwndPopup)
-          WinDestroyWindow(inidata->hwndPopup);
-        free(inidata);
+        dontclose = inidata->dontclose;
+        if (inidata->hini != NULLHANDLE && *inidata->ininame)
+          CloseProfile(inidata->hini, FALSE);
+        free(inidata->data);
+        if (inidata->hwndPopup)
+          WinDestroyWindow(inidata->hwndPopup);
+        free(inidata);
       }
       if (!dontclose &&
-          ParentIsDesktop(hwnd, WinQueryWindow(WinQueryWindow(hwnd,
-                                                              QW_PARENT),
-                                               QW_PARENT))) {
-        if (!PostMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID))
-          DosExit(EXIT_PROCESS, 1);
+          ParentIsDesktop(hwnd, WinQueryWindow(WinQueryWindow(hwnd,
+                                                              QW_PARENT),
+                                               QW_PARENT))) {
+        if (!PostMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID))
+          DosExit(EXIT_PROCESS, 1);
       }
     }

trunk/dll/mainwnd2.c

@@ -49 +49 @@
 #include "notebook.h"                   // CfgDlgProc
 #include "command.h"                    // RunCommand
+#include "misc.h"                       // BoxWindow, FixSwitchList, SetConditionalCascade
+                                        // SetSysMenu
+#include "mainwnd.h"                    // CloseChildren, MainWMCommand, MakeMainObjWin, ResizeDrives
+                                        // TopWindow
+#include "common.h"                     // CommonCreateMainChildren, CommonMainWndProc
+#include "notify.h"                     // HideNote
+#include "mainwnd2.h"
+#include "remap.h"                      // RemapDlgProc
+#include "treecnr.h"                    // StartTreeCnr
+#include "walkem.h"                     // WalkTwoCmpDlgProc, WalkTwoSetDlgProc
+#include "dirs.h"                       // switch_to
 #include "fm3dll.h"
 #include "fortify.h"

trunk/dll/mle.c

@@ -40 +40 @@
 #include "strutil.h"                    // GetPString
 #include "notebook.h"                   // httprun etc
+#include "autoview.h"                   // CreateHexDump
+#include "saveclip.h"                   // SaveToClip
 #include "fm3dll.h"
 #include "fortify.h"

trunk/dll/notebook.c

@@ -49 +49 @@
 #define INCL_DOS
 #define INCL_WIN
-#define INCL_LONGLONG                   // dircnrs.h
+#define INCL_LONGLONG                   // dircnrs.h
 
 #include "fm3dlg.h"
 #include "fm3str.h"
-#include "pathutil.h"                   // BldQuotedFileName
-#include "errutil.h"                    // Dos_Error...
-#include "strutil.h"                    // GetPString
+#include "pathutil.h"                   // BldQuotedFileName
+#include "errutil.h"                    // Dos_Error...
+#include "strutil.h"                    // GetPString
 #include "notebook.h"
+#include "getnames.h"                   // CustomFileDlg
+#include "mainwnd.h"                    // SaveDirCnrState
+#include "walkem.h"                     // WalkExtractDlgProc
 #include "fm3dll.h"
+#include "misc.h"                       // LoadDetailsSwitches, SetConditionalCascade
 #include "fortify.h"
 
@@ -75 +79 @@
   case WM_INITDLG:
     WinSendDlgItemMsg(hwnd, CFGA_VIRUS, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGA_EXTRACTPATH, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     WinEnableWindow(WinWindowFromID(hwnd, CFGA_FIND), FALSE);
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
@@ -123 +127 @@
       switch (SHORT2FROMMP(mp1)) {
       case EN_KILLFOCUS:
-        WinEnableWindow(WinWindowFromID(hwnd, CFGA_FIND), FALSE);
-        break;
+        WinEnableWindow(WinWindowFromID(hwnd, CFGA_FIND), FALSE);
+        break;
       case EN_SETFOCUS:
-        WinEnableWindow(WinWindowFromID(hwnd, CFGA_FIND), TRUE);
-        break;
+        WinEnableWindow(WinWindowFromID(hwnd, CFGA_FIND), TRUE);
+        break;
       }
       break;
@@ -133 +137 @@
       switch (SHORT2FROMMP(mp1)) {
       case BN_CLICKED:
-        if (WinQueryButtonCheckstate(hwnd, CFGA_DEFARC)) {
-
-          ARC_TYPE *pat = arcsighead;   // Hide dups
-
-          if (!WinDlgBox(HWND_DESKTOP, hwnd,
-                         SBoxDlgProc, FM3ModHandle, ASEL_FRAME,
-                         (PVOID) & pat) || !pat || !pat->id || !*pat->id) {
-            DosBeep(250, 100);          // Complain
-            WinCheckButton(hwnd, CFGA_DEFARC, FALSE);
-          }
-          else
-            WinSetDlgItemText(hwnd, CFGA_DEFARCNAME, pat->id);
-        }
-        break;
+        if (WinQueryButtonCheckstate(hwnd, CFGA_DEFARC)) {
+
+          ARC_TYPE *pat = arcsighead;   // Hide dups
+
+          if (!WinDlgBox(HWND_DESKTOP, hwnd,
+                         SBoxDlgProc, FM3ModHandle, ASEL_FRAME,
+                         (PVOID) & pat) || !pat || !pat->id || !*pat->id) {
+            DosBeep(250, 100);          // Complain
+            WinCheckButton(hwnd, CFGA_DEFARC, FALSE);
+          }
+          else
+            WinSetDlgItemText(hwnd, CFGA_DEFARCNAME, pat->id);
+        }
+        break;
       default:
-        break;
+        break;
       }
       break;
@@ -172 +176 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFGA, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFGA, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
 
     case CFGA_FIND:
       {
-        CHAR filename[CCHMAXPATH + 9], szfilename[CCHMAXPATH + 9];
-        USHORT id;
-        HWND hwndFocus;
-
-        strcpy(filename, "*.EXE");
-        hwndFocus = WinQueryFocus(HWND_DESKTOP);
-        if (hwndFocus) {
-          id = WinQueryWindowUShort(hwndFocus, QWS_ID);
-          switch (id) {
-          case CFGA_VIRUS:
-            if (insert_filename(hwnd, filename, 2, FALSE) && *filename) {
-              BldQuotedFileName(szfilename, filename);
-              strcat(szfilename, " %p");
-              WinSetDlgItemText(hwnd, id, szfilename);
-            }
-            break;
-          case CFGA_EXTRACTPATH:
-            strcpy(filename, extractpath);
-            if (WinDlgBox(HWND_DESKTOP, hwndNotebook,
-                          WalkExtractDlgProc, FM3ModHandle, WALK_FRAME,
-                          MPFROMP(filename)) && *filename)
-              WinSetDlgItemText(hwnd, id, filename);
-            break;
-          default:
-            Runtime_Error(pszSrcFile, __LINE__, "bad case");
-            break;
-          }
-        }
+        CHAR filename[CCHMAXPATH + 9], szfilename[CCHMAXPATH + 9];
+        USHORT id;
+        HWND hwndFocus;
+
+        strcpy(filename, "*.EXE");
+        hwndFocus = WinQueryFocus(HWND_DESKTOP);
+        if (hwndFocus) {
+          id = WinQueryWindowUShort(hwndFocus, QWS_ID);
+          switch (id) {
+          case CFGA_VIRUS:
+            if (insert_filename(hwnd, filename, 2, FALSE) && *filename) {
+              BldQuotedFileName(szfilename, filename);
+              strcat(szfilename, " %p");
+              WinSetDlgItemText(hwnd, id, szfilename);
+            }
+            break;
+          case CFGA_EXTRACTPATH:
+            strcpy(filename, extractpath);
+            if (WinDlgBox(HWND_DESKTOP, hwndNotebook,
+                          WalkExtractDlgProc, FM3ModHandle, WALK_FRAME,
+                          MPFROMP(filename)) && *filename)
+              WinSetDlgItemText(hwnd, id, filename);
+            break;
+          default:
+            Runtime_Error(pszSrcFile, __LINE__, "bad case");
+            break;
+          }
+        }
       }
       break;
@@ -214 +218 @@
     fQuickArcFind = WinQueryButtonCheckstate(hwnd, CFGA_QUICKARCFIND);
     PrfWriteProfileData(fmprof,
-                        appname,
-                        "QuickArcFind", &fQuickArcFind, sizeof(BOOL));
+                        appname,
+                        "QuickArcFind", &fQuickArcFind, sizeof(BOOL));
     fArcStuffVisible = WinQueryButtonCheckstate(hwnd, CFGA_ARCSTUFFVISIBLE);
     PrfWriteProfileData(fmprof,
-                        appname,
-                        "ArcStuffVisible", &fArcStuffVisible, sizeof(BOOL));
+                        appname,
+                        "ArcStuffVisible", &fArcStuffVisible, sizeof(BOOL));
     fFolderAfterExtract = WinQueryButtonCheckstate(hwnd,
-                                                   CFGA_FOLDERAFTEREXTRACT);
+                                                   CFGA_FOLDERAFTEREXTRACT);
     PrfWriteProfileData(fmprof,
-                        appname,
-                        "FolderAfterExtract",
-                        &fFolderAfterExtract, sizeof(BOOL));
+                        appname,
+                        "FolderAfterExtract",
+                        &fFolderAfterExtract, sizeof(BOOL));
     if (WinQueryButtonCheckstate(hwnd, CFGA_DEFARC)) {
 
@@ -253 +257 @@
       szCLBuf[MaxComLineStrg - 1] = 0;
       if (strcmp(szCLBuf, virus)){
-        NormalizeCmdLine(pszWorkBuf, szCLBuf);
-        memcpy(virus, pszWorkBuf, strlen(pszWorkBuf) + 1);
-        if (!strchr(virus, '%') && strlen(virus) > 3)
-          strcat(virus, " %p");
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(virus, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        if (!strchr(virus, '%') && strlen(virus) > 3)
+          strcat(virus, " %p");
       }
       free(pszWorkBuf);
       free(szCLBuf);
       if (!*virus)
-        strcpy(virus, "OS2SCAN.EXE %p /SUB /A");
+        strcpy(virus, "OS2SCAN.EXE %p /SUB /A");
       WinQueryDlgItemText(hwnd, CFGA_EXTRACTPATH, CCHMAXPATH, szPathBuf);
       szPathBuf[CCHMAXPATH - 1] = 0;
       bstrip(szPathBuf);
       if (strcmp(extractpath, szPathBuf)) {
-        memcpy(extractpath, szPathBuf, strlen(szPathBuf) + 1);
-        if (*extractpath){
-          MakeFullName(extractpath);
-          if (IsFile(extractpath)) {
-            ulResult = saymsg(MB_YESNOCANCEL | MB_ICONQUESTION | MB_DEFBUTTON1, HWND_DESKTOP,
-                              GetPString(IDS_WARNINGTEXT),
-                              GetPString(IDS_EXTPATHNOTVALIDTEXT),
-                              extractpath);
-            if (ulResult == MBID_YES)
-              *extractpath = 0;
-            if (ulResult == MBID_CANCEL){
-              WinDlgBox(HWND_DESKTOP,
-                        hwnd,
-                        CfgDlgProc,
-                        FM3ModHandle,
-                        CFG_FRAME,
-                        MPFROMLONG(IDM_ARCHIVERSETTINGS));
-              break;
-            }
-          }
-        }
+        memcpy(extractpath, szPathBuf, strlen(szPathBuf) + 1);
+        if (*extractpath){
+          MakeFullName(extractpath);
+          if (IsFile(extractpath)) {
+            ulResult = saymsg(MB_YESNOCANCEL | MB_ICONQUESTION | MB_DEFBUTTON1, HWND_DESKTOP,
+                              GetPString(IDS_WARNINGTEXT),
+                              GetPString(IDS_EXTPATHNOTVALIDTEXT),
+                              extractpath);
+            if (ulResult == MBID_YES)
+              *extractpath = 0;
+            if (ulResult == MBID_CANCEL){
+              WinDlgBox(HWND_DESKTOP,
+                        hwnd,
+                        CfgDlgProc,
+                        FM3ModHandle,
+                        CFG_FRAME,
+                        MPFROMLONG(IDM_ARCHIVERSETTINGS));
+              break;
+            }
+          }
+        }
       }
     }
@@ -296 +300 @@
     fCancelAction = FALSE;
     WinDlgBox(HWND_DESKTOP,
-              hwnd,
-              CfgDlgProc,
-              FM3ModHandle,
-              CFG_FRAME,
-              MPFROMLONG(IDM_ARCHIVERSETTINGS));
+              hwnd,
+              CfgDlgProc,
+              FM3ModHandle,
+              CFG_FRAME,
+              MPFROMLONG(IDM_ARCHIVERSETTINGS));
   }
   return WinDefDlgProc(hwnd, msg, mp1, mp2);
@@ -311 +315 @@
   case WM_INITDLG:
     WinSendDlgItemMsg(hwnd, CFGS_FILESTOGET, SPBM_SETTEXTLIMIT,
-                      MPFROMSHORT(8), MPVOID);
+                      MPFROMSHORT(8), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGS_FILESTOGET, SPBM_OVERRIDESETLIMITS,
-                      MPFROMLONG(FILESTOGET_MAX), MPFROMLONG(FILESTOGET_MIN));
+                      MPFROMLONG(FILESTOGET_MAX), MPFROMLONG(FILESTOGET_MIN));
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
     break;
@@ -352 +356 @@
     WinCheckButton(hwnd, CFGS_REMOTEBUG, fRemoteBug);
     WinSendDlgItemMsg(hwnd, CFGS_FILESTOGET, SPBM_SETCURRENTVALUE,
-                      MPFROMLONG(FilesToGet), MPVOID);
+                      MPFROMLONG(FilesToGet), MPVOID);
     return 0;
 
@@ -360 +364 @@
     case CFGS_FORCELOWER:
       {
-        BOOL temp;
-
-        temp = WinQueryButtonCheckstate(hwnd, SHORT1FROMMP(mp1));
-        if (temp) {
-          switch (SHORT1FROMMP(mp1)) {
-          case CFGS_FORCEUPPER:
-            WinCheckButton(hwnd, CFGS_FORCELOWER, FALSE);
-            break;
-          case CFGS_FORCELOWER:
-            WinCheckButton(hwnd, CFGS_FORCEUPPER, FALSE);
-            break;
-          }
-        }
+        BOOL temp;
+
+        temp = WinQueryButtonCheckstate(hwnd, SHORT1FROMMP(mp1));
+        if (temp) {
+          switch (SHORT1FROMMP(mp1)) {
+          case CFGS_FORCEUPPER:
+            WinCheckButton(hwnd, CFGS_FORCELOWER, FALSE);
+            break;
+          case CFGS_FORCELOWER:
+            WinCheckButton(hwnd, CFGS_FORCEUPPER, FALSE);
+            break;
+          }
+        }
       }
       break;
@@ -393 +397 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFGS, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFGS, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -402 +406 @@
     fLoadLongnames = WinQueryButtonCheckstate(hwnd, CFGS_LOADLONGNAMES);
     PrfWriteProfileData(fmprof, appname, "LoadLongname", &fLoadLongnames,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fLoadSubject = WinQueryButtonCheckstate(hwnd, CFGS_LOADSUBJECTS);
     PrfWriteProfileData(fmprof, appname, "LoadSubject", &fLoadSubject,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fRemoteBug = WinQueryButtonCheckstate(hwnd, CFGS_REMOTEBUG);
     PrfWriteProfileData(fmprof, appname, "RemoteBug", &fRemoteBug,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fNoRemovableScan = WinQueryButtonCheckstate(hwnd, CFGS_NOREMOVABLESCAN);
     PrfWriteProfileData(fmprof, FM3Str, "NoRemovableScan", &fNoRemovableScan,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fNoIconsFiles = WinQueryButtonCheckstate(hwnd, CFGS_NOICONSFILES);
     fNoIconsFiles = (fNoIconsFiles) ? FALSE : TRUE;
     PrfWriteProfileData(fmprof, appname, "NoIconsFiles",
-                        &fNoIconsFiles, sizeof(BOOL));
+                        &fNoIconsFiles, sizeof(BOOL));
     fNoIconsDirs = WinQueryButtonCheckstate(hwnd, CFGS_NOICONSDIRS);
     fNoIconsDirs = (fNoIconsDirs) ? FALSE : TRUE;
     PrfWriteProfileData(fmprof, appname, "NoIconsDirs",
-                        &fNoIconsDirs, sizeof(BOOL));
+                        &fNoIconsDirs, sizeof(BOOL));
     fForceUpper = WinQueryButtonCheckstate(hwnd, CFGS_FORCEUPPER);
     PrfWriteProfileData(fmprof, appname, "ForceUpper",
-                        &fForceUpper, sizeof(BOOL));
+                        &fForceUpper, sizeof(BOOL));
     fForceLower = WinQueryButtonCheckstate(hwnd, CFGS_FORCELOWER);
     PrfWriteProfileData(fmprof, appname, "ForceLower",
-                        &fForceLower, sizeof(BOOL));
+                        &fForceLower, sizeof(BOOL));
     {
       WinSendDlgItemMsg(hwnd, CFGS_FILESTOGET, SPBM_QUERYVALUE,
-                        MPFROMP(&FilesToGet), MPFROM2SHORT(0, SPBQ_DONOTUPDATE));
+                        MPFROMP(&FilesToGet), MPFROM2SHORT(0, SPBQ_DONOTUPDATE));
       if (FilesToGet < FILESTOGET_MIN)
-        FilesToGet = FILESTOGET_MIN;
+        FilesToGet = FILESTOGET_MIN;
       else if (FilesToGet > FILESTOGET_MAX)
-        FilesToGet = FILESTOGET_MAX;
+        FilesToGet = FILESTOGET_MAX;
       PrfWriteProfileData(fmprof,
-                          appname, "FilesToGet", &FilesToGet, sizeof(ULONG));
+                          appname, "FilesToGet", &FilesToGet, sizeof(ULONG));
     }
     break;
@@ -447 +451 @@
   case WM_INITDLG:
     WinSendDlgItemMsg(hwnd, CFGV_VIEWER, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGV_EDITOR, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGV_BINVIEW, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGV_BINED, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinEnableWindow(WinWindowFromID(hwnd, CFGV_FIND), FALSE);
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
@@ -502 +506 @@
       switch (SHORT2FROMMP(mp1)) {
       case EN_KILLFOCUS:
-        WinEnableWindow(WinWindowFromID(hwnd, CFGV_FIND), FALSE);
-        break;
+        WinEnableWindow(WinWindowFromID(hwnd, CFGV_FIND), FALSE);
+        break;
       case EN_SETFOCUS:
-        WinEnableWindow(WinWindowFromID(hwnd, CFGV_FIND), TRUE);
-        break;
+        WinEnableWindow(WinWindowFromID(hwnd, CFGV_FIND), TRUE);
+        break;
       }
       break;
@@ -527 +531 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFGV, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFGV, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
 
     case CFGV_FIND:
       {
-        CHAR filename[CCHMAXPATH + 9], szfilename[CCHMAXPATH + 9];
-        USHORT id;
-        HWND hwndFocus;
-
-        strcpy(filename, "*.EXE");
-        hwndFocus = WinQueryFocus(HWND_DESKTOP);
-        if (hwndFocus) {
-          id = WinQueryWindowUShort(hwndFocus, QWS_ID);
-          switch (id) {
-          case CFGV_BINVIEW:
-          case CFGV_BINED:
-          case CFGV_VIEWER:
-          case CFGV_EDITOR:
-            if (insert_filename(hwnd, filename, 2, FALSE) && *filename) {
-              BldQuotedFileName(szfilename, filename);
-              strcat(szfilename, " %a");
-              WinSetDlgItemText(hwnd, id, szfilename);
-            }
-            break;
-          default:
-            Runtime_Error(pszSrcFile, __LINE__, "bad case %d", id);
-            break;
-          }
-        }
+        CHAR filename[CCHMAXPATH + 9], szfilename[CCHMAXPATH + 9];
+        USHORT id;
+        HWND hwndFocus;
+
+        strcpy(filename, "*.EXE");
+        hwndFocus = WinQueryFocus(HWND_DESKTOP);
+        if (hwndFocus) {
+          id = WinQueryWindowUShort(hwndFocus, QWS_ID);
+          switch (id) {
+          case CFGV_BINVIEW:
+          case CFGV_BINED:
+          case CFGV_VIEWER:
+          case CFGV_EDITOR:
+            if (insert_filename(hwnd, filename, 2, FALSE) && *filename) {
+              BldQuotedFileName(szfilename, filename);
+              strcat(szfilename, " %a");
+              WinSetDlgItemText(hwnd, id, szfilename);
+            }
+            break;
+          default:
+            Runtime_Error(pszSrcFile, __LINE__, "bad case %d", id);
+            break;
+          }
+        }
       }
       break;
@@ -578 +582 @@
       szCLBuf[MaxComLineStrg - 1] = 0;
       if (strcmp(szCLBuf, viewer)){
-        NormalizeCmdLine(pszWorkBuf, szCLBuf);
-        memcpy(viewer, pszWorkBuf, strlen(pszWorkBuf) + 1);
-        if (!strchr(viewer, '%') && strlen(viewer) > 3)
-          strcat(viewer, " %a");
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(viewer, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        if (!strchr(viewer, '%') && strlen(viewer) > 3)
+          strcat(viewer, " %a");
       }
       WinQueryDlgItemText(hwnd, CFGV_EDITOR, MaxComLineStrg, szCLBuf);
       szCLBuf[MaxComLineStrg - 1] = 0;
       if (strcmp(szCLBuf, editor)){
-        NormalizeCmdLine(pszWorkBuf, szCLBuf);
-        memcpy(editor, pszWorkBuf, strlen(pszWorkBuf) + 1);
-        if (!strchr(editor, '%') && strlen(editor) > 3)
-          strcat(editor, " %a");
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(editor, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        if (!strchr(editor, '%') && strlen(editor) > 3)
+          strcat(editor, " %a");
       }
       WinQueryDlgItemText(hwnd, CFGV_BINVIEW, MaxComLineStrg, szCLBuf);
       szCLBuf[MaxComLineStrg - 1] = 0;
       if (strcmp(szCLBuf, binview)){
-        NormalizeCmdLine(pszWorkBuf, szCLBuf);
-        memcpy(binview, pszWorkBuf, strlen(pszWorkBuf) + 1);
-        if (!strchr(binview, '%') && strlen(binview) > 3)
-          strcat(binview, " %a");
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(binview, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        if (!strchr(binview, '%') && strlen(binview) > 3)
+          strcat(binview, " %a");
       }
       WinQueryDlgItemText(hwnd, CFGV_BINED, MaxComLineStrg, szCLBuf);
       szCLBuf[MaxComLineStrg - 1] = 0;
       if (strcmp(szCLBuf, bined)){
-        NormalizeCmdLine(pszWorkBuf, szCLBuf);
-        memcpy(bined, pszWorkBuf, strlen(pszWorkBuf) + 1);
-        if (!strchr(bined, '%') && strlen(bined) > 3)
-          strcat(bined, " %a");
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(bined, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        if (!strchr(bined, '%') && strlen(bined) > 3)
+          strcat(bined, " %a");
       }
       free(pszWorkBuf);
@@ -615 +619 @@
       fUseNewViewer = WinQueryButtonCheckstate(hwnd, CFGV_USENEWVIEWER);
       PrfWriteProfileData(fmprof, appname, "UseNewViewer", &fUseNewViewer,
-                          sizeof(BOOL));
+                          sizeof(BOOL));
       fGuessType = WinQueryButtonCheckstate(hwnd, CFGV_GUESSTYPE);
       PrfWriteProfileData(fmprof, appname, "GuessType", &fGuessType,
-                          sizeof(BOOL));
+                          sizeof(BOOL));
       fViewChild = WinQueryButtonCheckstate(hwnd, CFGV_VIEWCHILD);
       PrfWriteProfileData(fmprof, appname, "ViewChild", &fViewChild,
-                          sizeof(BOOL));
+                          sizeof(BOOL));
       fCheckMM = WinQueryButtonCheckstate(hwnd, CFGV_CHECKMM);
       PrfWriteProfileData(fmprof, appname, "CheckMM", &fCheckMM, sizeof(BOOL));
@@ -631 +635 @@
     fCancelAction = FALSE;
     WinDlgBox(HWND_DESKTOP,
-              hwnd,
-              CfgDlgProc,
-              FM3ModHandle,
-              CFG_FRAME,
-              MPFROMLONG(IDM_VIEWERSETTINGS));
+              hwnd,
+              CfgDlgProc,
+              FM3ModHandle,
+              CFG_FRAME,
+              MPFROMLONG(IDM_VIEWERSETTINGS));
   }
   return WinDefDlgProc(hwnd, msg, mp1, mp2);
@@ -645 +649 @@
   case WM_INITDLG:
     WinSendDlgItemMsg(hwnd, CFGH_RUNFTPWORKDIR, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGH_RUNHTTPWORKDIR, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGH_FTPRUN, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGH_HTTPRUN, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGH_MAILRUN, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGH_RUNMAILWORKDIR, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     WinEnableWindow(WinWindowFromID(hwnd, CFGH_FIND), FALSE);
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
@@ -710 +714 @@
       switch (SHORT2FROMMP(mp1)) {
       case EN_KILLFOCUS:
-        WinEnableWindow(WinWindowFromID(hwnd, CFGH_FIND), FALSE);
-        break;
+        WinEnableWindow(WinWindowFromID(hwnd, CFGH_FIND), FALSE);
+        break;
       case EN_SETFOCUS:
-        WinEnableWindow(WinWindowFromID(hwnd, CFGH_FIND), TRUE);
-        break;
+        WinEnableWindow(WinWindowFromID(hwnd, CFGH_FIND), TRUE);
+        break;
       }
       break;
@@ -735 +739 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFGH, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFGH, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
 
     case CFGH_FIND:
       {
-        CHAR filename[CCHMAXPATH + 9], szfilename[CCHMAXPATH + 9];
-        USHORT id;
-        HWND hwndFocus;
-
-        strcpy(filename, "*.EXE");
-        hwndFocus = WinQueryFocus(HWND_DESKTOP);
-        if (hwndFocus) {
-          id = WinQueryWindowUShort(hwndFocus, QWS_ID);
-          switch (id) {
-          case CFGH_HTTPRUN:
-          case CFGH_FTPRUN:
-          case CFGH_MAILRUN:
-            if (insert_filename(hwnd, filename, 2, FALSE) && *filename) {
-              BldQuotedFileName(szfilename, filename);
-              WinSetDlgItemText(hwnd, id, szfilename);
-            }
-            break;
-          case CFGH_RUNFTPWORKDIR:
-            strcpy(filename, ftprundir);
-            if (WinDlgBox(HWND_DESKTOP, hwndNotebook,
-                          WalkExtractDlgProc, FM3ModHandle, WALK_FRAME,
-                          MPFROMP(filename)) && *filename)
-              WinSetDlgItemText(hwnd, id, filename);
-            break;
-          case CFGH_RUNHTTPWORKDIR:
-            strcpy(filename, httprundir);
-            if (WinDlgBox(HWND_DESKTOP, hwndNotebook,
-                          WalkExtractDlgProc, FM3ModHandle, WALK_FRAME,
-                          MPFROMP(filename)) && *filename)
-              WinSetDlgItemText(hwnd, id, filename);
-            break;
-          case CFGH_RUNMAILWORKDIR:
-            strcpy(filename, mailrundir);
-            if (WinDlgBox(HWND_DESKTOP, hwndNotebook,
-                          WalkExtractDlgProc, FM3ModHandle, WALK_FRAME,
-                          MPFROMP(filename)) && *filename)
-              WinSetDlgItemText(hwnd, id, filename);
-            break;
-          default:
-            Runtime_Error(pszSrcFile, __LINE__, "bad case %d", id);
-            break;
-          }
-        }
+        CHAR filename[CCHMAXPATH + 9], szfilename[CCHMAXPATH + 9];
+        USHORT id;
+        HWND hwndFocus;
+
+        strcpy(filename, "*.EXE");
+        hwndFocus = WinQueryFocus(HWND_DESKTOP);
+        if (hwndFocus) {
+          id = WinQueryWindowUShort(hwndFocus, QWS_ID);
+          switch (id) {
+          case CFGH_HTTPRUN:
+          case CFGH_FTPRUN:
+          case CFGH_MAILRUN:
+            if (insert_filename(hwnd, filename, 2, FALSE) && *filename) {
+              BldQuotedFileName(szfilename, filename);
+              WinSetDlgItemText(hwnd, id, szfilename);
+            }
+            break;
+          case CFGH_RUNFTPWORKDIR:
+            strcpy(filename, ftprundir);
+            if (WinDlgBox(HWND_DESKTOP, hwndNotebook,
+                          WalkExtractDlgProc, FM3ModHandle, WALK_FRAME,
+                          MPFROMP(filename)) && *filename)
+              WinSetDlgItemText(hwnd, id, filename);
+            break;
+          case CFGH_RUNHTTPWORKDIR:
+            strcpy(filename, httprundir);
+            if (WinDlgBox(HWND_DESKTOP, hwndNotebook,
+                          WalkExtractDlgProc, FM3ModHandle, WALK_FRAME,
+                          MPFROMP(filename)) && *filename)
+              WinSetDlgItemText(hwnd, id, filename);
+            break;
+          case CFGH_RUNMAILWORKDIR:
+            strcpy(filename, mailrundir);
+            if (WinDlgBox(HWND_DESKTOP, hwndNotebook,
+                          WalkExtractDlgProc, FM3ModHandle, WALK_FRAME,
+                          MPFROMP(filename)) && *filename)
+              WinSetDlgItemText(hwnd, id, filename);
+            break;
+          default:
+            Runtime_Error(pszSrcFile, __LINE__, "bad case %d", id);
+            break;
+          }
+        }
       }
       break;
@@ -818 +822 @@
       szCLBuf[MaxComLineStrg - 1] = 0;
       if (strcmp(szCLBuf, ftprun)){
-        NormalizeCmdLine(pszWorkBuf, szCLBuf);
-        memcpy(ftprun, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(ftprun, pszWorkBuf, strlen(pszWorkBuf) + 1);
       }
       WinQueryDlgItemText(hwnd, CFGH_HTTPRUN, MaxComLineStrg, szCLBuf);
       szCLBuf[MaxComLineStrg - 1] = 0;
       if (strcmp(szCLBuf, httprun)){
-        NormalizeCmdLine(pszWorkBuf, szCLBuf);
-        memcpy(httprun, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(httprun, pszWorkBuf, strlen(pszWorkBuf) + 1);
       }
       WinQueryDlgItemText(hwnd, CFGH_MAILRUN, MaxComLineStrg, szCLBuf);
       szCLBuf[MaxComLineStrg - 1] = 0;
       if (strcmp(szCLBuf, mailrun)){
-        NormalizeCmdLine(pszWorkBuf, szCLBuf);
-        memcpy(mailrun, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(mailrun, pszWorkBuf, strlen(pszWorkBuf) + 1);
       }
       free(pszWorkBuf);
@@ -843 +847 @@
       fHttpRunWPSDefault = WinQueryButtonCheckstate(hwnd, CFGH_HTTPRUNWPSDEFAULT);
       PrfWriteProfileData(fmprof, appname, "HttpRunWPSDefault", &fHttpRunWPSDefault,
-                          sizeof(BOOL));
+                          sizeof(BOOL));
       fFtpRunWPSDefault = WinQueryButtonCheckstate(hwnd, CFGH_FTPRUNWPSDEFAULT);
       PrfWriteProfileData(fmprof, appname, "FtpRunWPSDefault", &fFtpRunWPSDefault,
-                          sizeof(BOOL));
+                          sizeof(BOOL));
       fLibPathStrictHttpRun = WinQueryButtonCheckstate(hwnd, CFGH_LIBPATHSTRICTHTTPRUN);
       PrfWriteProfileData(fmprof, appname, "LibPathStrictHttpRun",
-                          &fLibPathStrictHttpRun, sizeof(BOOL));
+                          &fLibPathStrictHttpRun, sizeof(BOOL));
       fLibPathStrictFtpRun = WinQueryButtonCheckstate(hwnd, CFGH_LIBPATHSTRICTFTPRUN);
       PrfWriteProfileData(fmprof, appname, "LibPathStrictFtpRun",
-                          &fLibPathStrictFtpRun, sizeof(BOOL));
+                          &fLibPathStrictFtpRun, sizeof(BOOL));
       fLibPathStrictMailRun = WinQueryButtonCheckstate(hwnd, CFGH_LIBPATHSTRICTMAILRUN);
       PrfWriteProfileData(fmprof, appname, "LibPathStrictMailRun",
-                          &fLibPathStrictMailRun, sizeof(BOOL));
+                          &fLibPathStrictMailRun, sizeof(BOOL));
       fNoMailtoMailRun = WinQueryButtonCheckstate(hwnd, CFGH_NOMAILTOMAILRUN);
       PrfWriteProfileData(fmprof, appname, "NoMailtoMailRun",
-                          &fNoMailtoMailRun, sizeof(BOOL));
+                          &fNoMailtoMailRun, sizeof(BOOL));
       break;
     }
@@ -865 +869 @@
     fCancelAction = FALSE;
     WinDlgBox(HWND_DESKTOP,
-              hwnd,
-              CfgDlgProc,
-              FM3ModHandle,
-              CFG_FRAME,
-              MPFROMLONG(IDM_VIEWERSETTINGS));
+              hwnd,
+              CfgDlgProc,
+              FM3ModHandle,
+              CFG_FRAME,
+              MPFROMLONG(IDM_VIEWERSETTINGS));
   }
   return WinDefDlgProc(hwnd, msg, mp1, mp2);
@@ -927 +931 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp,
-                   HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFGB, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp,
+                   HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFGB, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -937 +941 @@
     fToolbarHelp = WinQueryButtonCheckstate(hwnd, CFGB_TOOLBARHELP);
     PrfWriteProfileData(fmprof,
-                        FM3Str, "ToolbarHelp", &fToolbarHelp, sizeof(BOOL));
+                        FM3Str, "ToolbarHelp", &fToolbarHelp, sizeof(BOOL));
     fDrivebarHelp = WinQueryButtonCheckstate(hwnd, CFGB_DRIVEBARHELP);
     PrfWriteProfileData(fmprof,
-                        FM3Str, "DrivebarHelp", &fDrivebarHelp, sizeof(BOOL));
+                        FM3Str, "DrivebarHelp", &fDrivebarHelp, sizeof(BOOL));
     fOtherHelp = WinQueryButtonCheckstate(hwnd, CFGB_OTHERHELP);
     PrfWriteProfileData(fmprof,
-                        FM3Str, "OtherHelp", &fOtherHelp, sizeof(BOOL));
+                        FM3Str, "OtherHelp", &fOtherHelp, sizeof(BOOL));
     break;
   }
@@ -956 +960 @@
   case WM_INITDLG:
     WinSendDlgItemMsg(hwnd,
-                      CFG5_FILTER,
-                      EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      CFG5_FILTER,
+                      EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
     break;
@@ -996 +1000 @@
 
       if (!PrfQueryProfileData(fmprof,
-                               appname,
-                               "TreeflWindowAttr",
-                               (PVOID) & flWindowAttr, &ulSize))
-        flWindowAttr |= (CV_TREE | CA_TREELINE | CV_ICON | CV_MINI | CV_FLOW);
+                               appname,
+                               "TreeflWindowAttr",
+                               (PVOID) & flWindowAttr, &ulSize))
+        flWindowAttr |= (CV_TREE | CA_TREELINE | CV_ICON | CV_MINI | CV_FLOW);
       WinCheckButton(hwnd, CFG5_ICON, ((flWindowAttr & CV_ICON) != FALSE));
       WinCheckButton(hwnd, CFG5_MINIICONS,
-                     ((flWindowAttr & CV_MINI) != FALSE));
+                     ((flWindowAttr & CV_MINI) != FALSE));
       memset(&mask, 0, sizeof(mask));
       mask.attrFile = FILE_DIRECTORY | FILE_ARCHIVED | FILE_HIDDEN |
-        FILE_SYSTEM | FILE_NORMAL | FILE_READONLY;
+        FILE_SYSTEM | FILE_NORMAL | FILE_READONLY;
       mask.fIsTree = TRUE;
       ulSize = sizeof(MASK);
       if (PrfQueryProfileData(fmprof, appname, "TreeFilter", &mask, &ulSize)) {
-        SetMask(NULL, &mask);
+        SetMask(NULL, &mask);
       }
       if (!mask.attrFile)
-        mask.attrFile = (FILE_READONLY | FILE_NORMAL |
-                         FILE_ARCHIVED | FILE_DIRECTORY |
-                         FILE_HIDDEN | FILE_SYSTEM);
+        mask.attrFile = (FILE_READONLY | FILE_NORMAL |
+                         FILE_ARCHIVED | FILE_DIRECTORY |
+                         FILE_HIDDEN | FILE_SYSTEM);
       strcpy(mask.prompt, GetPString(IDS_TREEFILTERTITLETEXT));
       WinSetDlgItemText(hwnd, CFG5_FILTER, mask.szMask);
@@ -1027 +1031 @@
       WinCheckButton(hwnd, CFG6_SORTREVERSE, FALSE);
       if (TreesortFlags & SORT_FIRSTEXTENSION)
-        WinCheckButton(hwnd, CFG6_SORTFIRST, TRUE);
+        WinCheckButton(hwnd, CFG6_SORTFIRST, TRUE);
       else if (TreesortFlags & SORT_LASTEXTENSION)
-        WinCheckButton(hwnd, CFG6_SORTLAST, TRUE);
+        WinCheckButton(hwnd, CFG6_SORTLAST, TRUE);
       else if (TreesortFlags & SORT_SIZE)
-        WinCheckButton(hwnd, CFG6_SORTSIZE, TRUE);
+        WinCheckButton(hwnd, CFG6_SORTSIZE, TRUE);
       else if (TreesortFlags & SORT_EASIZE)
-        WinCheckButton(hwnd, CFG6_SORTEASIZE, TRUE);
+        WinCheckButton(hwnd, CFG6_SORTEASIZE, TRUE);
       else if (TreesortFlags & SORT_LWDATE)
-        WinCheckButton(hwnd, CFG6_SORTLWDATE, TRUE);
+        WinCheckButton(hwnd, CFG6_SORTLWDATE, TRUE);
       else if (TreesortFlags & SORT_LADATE)
-        WinCheckButton(hwnd, CFG6_SORTLADATE, TRUE);
+        WinCheckButton(hwnd, CFG6_SORTLADATE, TRUE);
       else if (TreesortFlags & SORT_CRDATE)
-        WinCheckButton(hwnd, CFG6_SORTCRDATE, TRUE);
+        WinCheckButton(hwnd, CFG6_SORTCRDATE, TRUE);
       else if (TreesortFlags & SORT_FILENAME)
-        WinCheckButton(hwnd, CFG6_SORTFILENAME, TRUE);
+        WinCheckButton(hwnd, CFG6_SORTFILENAME, TRUE);
       else
-        WinCheckButton(hwnd, CFG6_SORTNAME, TRUE);
+        WinCheckButton(hwnd, CFG6_SORTNAME, TRUE);
       if (TreesortFlags & SORT_REVERSE)
-        WinCheckButton(hwnd, CFG6_SORTREVERSE, TRUE);
+        WinCheckButton(hwnd, CFG6_SORTREVERSE, TRUE);
     }
     return 0;
@@ -1051 +1055 @@
   case UM_SETUP5:
     if (WinDlgBox(HWND_DESKTOP, hwndNotebook, PickMaskDlgProc,
-                  FM3ModHandle, MSK_FRAME, MPFROMP(&mask))) {
+                  FM3ModHandle, MSK_FRAME, MPFROMP(&mask))) {
       SetMask(NULL, &mask);
       WinSetDlgItemText(hwnd, CFG5_FILTER, mask.szMask);
@@ -1062 +1066 @@
       switch (SHORT2FROMMP(mp1)) {
       case EN_SETFOCUS:
-        PostMsg(hwnd, UM_FOCUSME, MPVOID, MPVOID);
-        PostMsg(hwnd, UM_SETUP5, MPVOID, MPVOID);
-        break;
+        PostMsg(hwnd, UM_FOCUSME, MPVOID, MPVOID);
+        PostMsg(hwnd, UM_SETUP5, MPVOID, MPVOID);
+        break;
       }
       break;
@@ -1085 +1089 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_TREEVIEW, 0),
-                   MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_TREEVIEW, 0),
+                   MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -1097 +1101 @@
 
       if (WinQueryButtonCheckstate(hwnd, CFG5_ICON))
-        flWindowAttr |= CV_ICON;
+        flWindowAttr |= CV_ICON;
       else
-        flWindowAttr |= CV_TEXT;
+        flWindowAttr |= CV_TEXT;
       if (WinQueryButtonCheckstate(hwnd, CFG5_MINIICONS))
-        flWindowAttr |= CV_MINI;
+        flWindowAttr |= CV_MINI;
       flWindowAttr |= (CV_TREE | CV_FLOW | CA_TREELINE);
       PrfWriteProfileData(fmprof,
-                          appname,
-                          "TreeflWindowAttr", &flWindowAttr, sizeof(ULONG));
+                          appname,
+                          "TreeflWindowAttr", &flWindowAttr, sizeof(ULONG));
       if (hwndTree) {
 
-        CNRINFO cnri;
-
-        memset(&cnri, 0, sizeof(cnri));
-        cnri.cb = sizeof(cnri);
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
-        cnri.flWindowAttr = flWindowAttr;
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_SETCNRINFO, MPFROMP(&cnri),
-                   MPFROMLONG(CMA_FLWINDOWATTR));
+        CNRINFO cnri;
+
+        memset(&cnri, 0, sizeof(cnri));
+        cnri.cb = sizeof(cnri);
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
+        cnri.flWindowAttr = flWindowAttr;
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_SETCNRINFO, MPFROMP(&cnri),
+                   MPFROMLONG(CMA_FLWINDOWATTR));
       }
     }
@@ -1146 +1150 @@
       TreesortFlags |= SORT_REVERSE;
     PrfWriteProfileData(fmprof, appname, "TreeSort", &TreesortFlags,
-                        sizeof(INT));
+                        sizeof(INT));
     if (hwndTree)
       PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_RESORT, 0), MPVOID);
@@ -1156 +1160 @@
 
       dcd = WinQueryWindowPtr(WinWindowFromID(WinWindowFromID(hwndTree,
-                                                              FID_CLIENT),
-                                              TREE_CNR), QWL_USER);
+                                                              FID_CLIENT),
+                                              TREE_CNR), QWL_USER);
       if (dcd && dcd->size == sizeof(DIRCNRDATA)) {
-        dcd->mask = mask;
-        PostMsg(hwndTree, UM_FILTER, MPVOID, MPVOID);
+        dcd->mask = mask;
+        PostMsg(hwndTree, UM_FILTER, MPVOID, MPVOID);
       }
     }
@@ -1176 +1180 @@
   case WM_INITDLG:
     WinSendDlgItemMsg(hwnd, CFGT_ENVVARLIST, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
     break;
@@ -1233 +1237 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFGT, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFGT, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -1242 +1246 @@
     fVTreeOpensWPS = WinQueryButtonCheckstate(hwnd, CFGT_VTREEOPENSWPS);
     PrfWriteProfileData(fmprof, FM3Str, "VTreeOpensWPS", &fVTreeOpensWPS,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fCollapseFirst = WinQueryButtonCheckstate(hwnd, CFGT_COLLAPSEFIRST);
     PrfWriteProfileData(fmprof, appname, "CollapseFirst", &fCollapseFirst,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fSwitchTreeOnFocus = WinQueryButtonCheckstate(hwnd,
-                                                  CFGT_SWITCHTREEONFOCUS);
+                                                  CFGT_SWITCHTREEONFOCUS);
     PrfWriteProfileData(fmprof, appname, "SwitchTreeOnFocus",
-                        &fSwitchTreeOnFocus, sizeof(BOOL));
+                        &fSwitchTreeOnFocus, sizeof(BOOL));
     fSwitchTreeExpand = WinQueryButtonCheckstate(hwnd, CFGT_SWITCHTREEEXPAND);
     PrfWriteProfileData(fmprof, appname, "SwitchTreeExpand",
-                        &fSwitchTreeExpand, sizeof(BOOL));
+                        &fSwitchTreeExpand, sizeof(BOOL));
     fSwitchTree = WinQueryButtonCheckstate(hwnd, CFGT_SWITCHTREE);
     PrfWriteProfileData(fmprof, appname, "SwitchTree", &fSwitchTree,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fFollowTree = WinQueryButtonCheckstate(hwnd, CFGT_FOLLOWTREE);
     PrfWriteProfileData(fmprof, appname, "FollowTree", &fFollowTree,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fTopDir = WinQueryButtonCheckstate(hwnd, CFGT_TOPDIR);
     PrfWriteProfileData(fmprof, appname, "TopDir", (PVOID) & fTopDir,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fDCOpens = WinQueryButtonCheckstate(hwnd, CFGT_DCOPENS);
     PrfWriteProfileData(fmprof, FM3Str, "DoubleClickOpens", &fDCOpens,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fShowEnvChanged = (fShowEnv != WinQueryButtonCheckstate(hwnd, CFGT_SHOWENV));
     fShowEnv = WinQueryButtonCheckstate(hwnd, CFGT_SHOWENV);
@@ -1282 +1286 @@
       if (hwndTree && (fShowEnvChanged || (fShowEnv && fTreeEnvVarListChanged)))
       {
-        PCNRITEM pci = WinSendMsg(WinWindowFromID
-                (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR), CM_QUERYRECORDEMPHASIS,
-                                  MPFROMLONG(CMA_FIRST),
-                                  MPFROMSHORT(CRA_SELECTED));
+        PCNRITEM pci = WinSendMsg(WinWindowFromID
+                (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR), CM_QUERYRECORDEMPHASIS,
+                                  MPFROMLONG(CMA_FIRST),
+                                  MPFROMSHORT(CRA_SELECTED));
         PostMsg(WinWindowFromID
-                (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR), WM_COMMAND,
-                MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
-        pszTemp = xstrdup(pci->pszFileName, pszSrcFile, __LINE__);
-        if (pszTemp) {
+                (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR), WM_COMMAND,
+                MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
+        pszTemp = xstrdup(pci->pszFileName, pszSrcFile, __LINE__);
+        if (pszTemp) {
           if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTemp), MPVOID))
             free(pszTemp);
-          /* pszTemp is freed in the UM_SHOWME code */
-        }
+          /* pszTemp is freed in the UM_SHOWME code */
+        }
       }
     }
@@ -1307 +1311 @@
   case WM_INITDLG:
     WinSendDlgItemMsg(hwnd, CFGG_CMDLNLNGTH, SPBM_SETTEXTLIMIT,
-                      MPFROMSHORT(8), MPVOID);
+                      MPFROMSHORT(8), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGG_CMDLNLNGTH, SPBM_OVERRIDESETLIMITS,
-                      MPFROMLONG(CMDLNLNGTH_MAX), MPFROMLONG(CMDLNLNGTH_MIN));
+                      MPFROMLONG(CMDLNLNGTH_MAX), MPFROMLONG(CMDLNLNGTH_MIN));
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
     break;
@@ -1358 +1362 @@
     WinCheckButton(hwnd, CFGG_TRASHCAN, fTrashCan);
     WinSendDlgItemMsg(hwnd, CFGG_CMDLNLNGTH, SPBM_SETCURRENTVALUE,
-                      MPFROMLONG(MaxComLineStrg), MPVOID);
+                      MPFROMLONG(MaxComLineStrg), MPVOID);
     return 0;
 
@@ -1375 +1379 @@
       switch (SHORT2FROMMP(mp1)) {
       case EN_SETFOCUS:
-        PostMsg(hwnd, UM_FOCUSME, MPVOID, MPVOID);
-        PostMsg(hwnd, UM_SETUP5, MPVOID, MPVOID);
-        break;
+        PostMsg(hwnd, UM_FOCUSME, MPVOID, MPVOID);
+        PostMsg(hwnd, UM_SETUP5, MPVOID, MPVOID);
+        break;
       }
       break;
@@ -1398 +1402 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp,
-                   HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFGG, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp,
+                   HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFGG, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -1414 +1418 @@
       PrfWriteProfileData(fmprof, FM3Str, "NoDead", &fNoDead, sizeof(BOOL));
       PrfWriteProfileData(fmprof,
-                          FM3Str, "NoFinger", &fNoFinger, sizeof(BOOL));
+                          FM3Str, "NoFinger", &fNoFinger, sizeof(BOOL));
       WinDestroyPointer(hptrFinger);
       if (!fNoDead)
-        hptrFinger = WinLoadPointer(HWND_DESKTOP, FM3ModHandle, FINGER_ICON);
+        hptrFinger = WinLoadPointer(HWND_DESKTOP, FM3ModHandle, FINGER_ICON);
       else
-        hptrFinger = WinLoadPointer(HWND_DESKTOP, FM3ModHandle, FINGER2_ICON);
+        hptrFinger = WinLoadPointer(HWND_DESKTOP, FM3ModHandle, FINGER2_ICON);
     }
     fLinkSetsIcon = WinQueryButtonCheckstate(hwnd, CFGG_LINKSETSICON);
     PrfWriteProfileData(fmprof,
-                        appname,
-                        "LinkSetsIcon", &fLinkSetsIcon, sizeof(BOOL));
+                        appname,
+                        "LinkSetsIcon", &fLinkSetsIcon, sizeof(BOOL));
     fCustomFileDlg = WinQueryButtonCheckstate(hwnd, CFGG_CUSTOMFILEDLG);
     PrfWriteProfileData(fmprof,
-                        FM3Str,
-                        "CustomFileDlg", &fCustomFileDlg, sizeof(BOOL));
+                        FM3Str,
+                        "CustomFileDlg", &fCustomFileDlg, sizeof(BOOL));
     fDullMin = WinQueryButtonCheckstate(hwnd, CFGG_BORING);
     PrfWriteProfileData(fmprof,
-                        FM3Str, "DullDatabar", &fDullMin, sizeof(BOOL));
+                        FM3Str, "DullDatabar", &fDullMin, sizeof(BOOL));
     fConfirmDelete = WinQueryButtonCheckstate(hwnd, CFGG_CONFIRMDELETE);
     PrfWriteProfileData(fmprof,
-                        appname,
-                        "ConfirmDelete", &fConfirmDelete, sizeof(BOOL));
+                        appname,
+                        "ConfirmDelete", &fConfirmDelete, sizeof(BOOL));
     fDontMoveMouse = WinQueryButtonCheckstate(hwnd, CFGG_DONTMOVEMOUSE);
     PrfWriteProfileData(fmprof,
-                        appname,
-                        "DontMoveMouse", &fDontMoveMouse, sizeof(BOOL));
+                        appname,
+                        "DontMoveMouse", &fDontMoveMouse, sizeof(BOOL));
     fCopyDefault = WinQueryButtonCheckstate(hwnd, CFGG_DEFAULTCOPY);
     PrfWriteProfileData(fmprof, appname, "DefaultCopy",
-                        &fCopyDefault, sizeof(BOOL));
+                        &fCopyDefault, sizeof(BOOL));
     fRealIdle = WinQueryButtonCheckstate(hwnd, CFGG_IDLECOPY);
     PrfWriteProfileData(fmprof, appname, "IdleCopy",
-                        &fRealIdle, sizeof(BOOL));
+                        &fRealIdle, sizeof(BOOL));
     fDragndropDlg = WinQueryButtonCheckstate(hwnd, CFGG_DNDDLG);
     PrfWriteProfileData(fmprof, appname, "Drag&DropDlg",
-                        &fDragndropDlg, sizeof(BOOL));
+                        &fDragndropDlg, sizeof(BOOL));
     fVerify = WinQueryButtonCheckstate(hwnd, CFGG_VERIFYWRITES);
     PrfWriteProfileData(fmprof, appname, "VerifyWrites",
-                        &fVerify, sizeof(BOOL));
+                        &fVerify, sizeof(BOOL));
     DosSetVerify(fVerify);
     fDefaultDeletePerm = WinQueryButtonCheckstate(hwnd,
-                                                  CFGG_DEFAULTDELETEPERM);
+                                                  CFGG_DEFAULTDELETEPERM);
     PrfWriteProfileData(fmprof, appname, "DefaultDeletePerm",
-                        &fDefaultDeletePerm, sizeof(BOOL));
+                        &fDefaultDeletePerm, sizeof(BOOL));
     fFM2Deletes = WinQueryButtonCheckstate(hwnd, CFGG_FM2DELETES);
     PrfWriteProfileData(fmprof, FM3Str, "FM2Deletes",
@@ -1462 +1466 @@
     fTrashCan = WinQueryButtonCheckstate(hwnd, CFGG_TRASHCAN);
     PrfWriteProfileData(fmprof, FM3Str, "TrashCan",
-                        &fTrashCan, sizeof(BOOL));
+                        &fTrashCan, sizeof(BOOL));
     fConfirmTarget = WinQueryButtonCheckstate(hwnd, CFGG_CONFIRMTARGET);
     PrfWriteProfileData(fmprof, appname, "ConfirmTarget",
@@ -1468 +1472 @@
     {
       WinSendDlgItemMsg(hwnd, CFGG_CMDLNLNGTH, SPBM_QUERYVALUE,
-                        MPFROMP(&MaxComLineStrg), MPFROM2SHORT(0, SPBQ_DONOTUPDATE));
+                        MPFROMP(&MaxComLineStrg), MPFROM2SHORT(0, SPBQ_DONOTUPDATE));
       if (MaxComLineStrg < CMDLNLNGTH_MIN)
-        MaxComLineStrg = CMDLNLNGTH_MIN;
+        MaxComLineStrg = CMDLNLNGTH_MIN;
       else if (MaxComLineStrg > CMDLNLNGTH_MAX)
-        MaxComLineStrg = CMDLNLNGTH_MAX;
+        MaxComLineStrg = CMDLNLNGTH_MAX;
       PrfWriteProfileData(fmprof,
-                          appname, "MaxComLineStrg", &MaxComLineStrg, sizeof(ULONG));
+                          appname, "MaxComLineStrg", &MaxComLineStrg, sizeof(ULONG));
     }
     break;
@@ -1486 +1490 @@
   case WM_INITDLG:
     WinSendDlgItemMsg(hwnd, CFGC_COMPARE, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGC_DIRCOMPARE, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinEnableWindow(WinWindowFromID(hwnd, CFGC_FIND), FALSE);
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
@@ -1529 +1533 @@
       switch (SHORT2FROMMP(mp1)) {
       case EN_KILLFOCUS:
-        WinEnableWindow(WinWindowFromID(hwnd, CFGC_FIND), FALSE);
-        break;
+        WinEnableWindow(WinWindowFromID(hwnd, CFGC_FIND), FALSE);
+        break;
       case EN_SETFOCUS:
-        WinEnableWindow(WinWindowFromID(hwnd, CFGC_FIND), TRUE);
-        break;
+        WinEnableWindow(WinWindowFromID(hwnd, CFGC_FIND), TRUE);
+        break;
       }
       break;
@@ -1554 +1558 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFGC, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFGC, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
 
     case CFGC_FIND:
       {
-        CHAR filename[CCHMAXPATH + 9], szfilename[CCHMAXPATH + 9];
-        USHORT id;
-        HWND hwndFocus;
-
-        strcpy(filename, "*.EXE");
-        hwndFocus = WinQueryFocus(HWND_DESKTOP);
-        if (hwndFocus) {
-          id = WinQueryWindowUShort(hwndFocus, QWS_ID);
-          switch (id) {
-          case CFGC_COMPARE:
-          case CFGC_DIRCOMPARE:
-            if (insert_filename(hwnd, filename, 2, FALSE) && *filename) {
-              BldQuotedFileName(szfilename, filename);
-              strcat(szfilename, " %a");
-              WinSetDlgItemText(hwnd, id, szfilename);
-            }
-            break;
-          default:
-            Runtime_Error(pszSrcFile, __LINE__, "bad case %d", id);
-            break;
-          }
-        }
+        CHAR filename[CCHMAXPATH + 9], szfilename[CCHMAXPATH + 9];
+        USHORT id;
+        HWND hwndFocus;
+
+        strcpy(filename, "*.EXE");
+        hwndFocus = WinQueryFocus(HWND_DESKTOP);
+        if (hwndFocus) {
+          id = WinQueryWindowUShort(hwndFocus, QWS_ID);
+          switch (id) {
+          case CFGC_COMPARE:
+          case CFGC_DIRCOMPARE:
+            if (insert_filename(hwnd, filename, 2, FALSE) && *filename) {
+              BldQuotedFileName(szfilename, filename);
+              strcat(szfilename, " %a");
+              WinSetDlgItemText(hwnd, id, szfilename);
+            }
+            break;
+          default:
+            Runtime_Error(pszSrcFile, __LINE__, "bad case %d", id);
+            break;
+          }
+        }
       }
       break;
@@ -1601 +1605 @@
       }
       WinQueryDlgItemText(hwnd, CFGC_DIRCOMPARE, MaxComLineStrg, szCLBuf);
-        szCLBuf[MaxComLineStrg - 1] = 0;
-        if (strcmp(szCLBuf, dircompare)){
-          NormalizeCmdLine(pszWorkBuf, szCLBuf);
-          memcpy(dircompare, pszWorkBuf, strlen(pszWorkBuf) + 1);
-          if (!strchr(dircompare, '%') && strlen(dircompare) > 3)
-            strcat(dircompare, " %a");
-        }
+        szCLBuf[MaxComLineStrg - 1] = 0;
+        if (strcmp(szCLBuf, dircompare)){
+          NormalizeCmdLine(pszWorkBuf, szCLBuf);
+          memcpy(dircompare, pszWorkBuf, strlen(pszWorkBuf) + 1);
+          if (!strchr(dircompare, '%') && strlen(dircompare) > 3)
+            strcat(dircompare, " %a");
+        }
       PrfWriteProfileString(fmprof, appname, "DirCompare", dircompare);
       WinQueryDlgItemText(hwnd, CFGC_COMPARE, MaxComLineStrg, szCLBuf);
@@ -1626 +1630 @@
     fCancelAction = FALSE;
     WinDlgBox(HWND_DESKTOP,
-              hwnd,
-              CfgDlgProc,
-              FM3ModHandle,
-              CFG_FRAME,
-              MPFROMLONG(IDM_COMPARESETTINGS));
+              hwnd,
+              CfgDlgProc,
+              FM3ModHandle,
+              CFG_FRAME,
+              MPFROMLONG(IDM_COMPARESETTINGS));
   }
   return WinDefDlgProc(hwnd, msg, mp1, mp2);
@@ -1651 +1655 @@
     WinCheckButton(hwnd, CFGD_NOSEARCH, fNoSearch);
     WinCheckButton(hwnd, CFGD_EXTENDEDSEL,
-                   ((ulCnrType & CCS_EXTENDSEL) != 0));
+                   ((ulCnrType & CCS_EXTENDSEL) != 0));
     WinCheckButton(hwnd, CFGD_MULTIPLESEL,
-                   ((ulCnrType & CCS_MULTIPLESEL) != 0));
+                   ((ulCnrType & CCS_MULTIPLESEL) != 0));
     WinCheckButton(hwnd, CFGD_LEAVETREE, fLeaveTree);
     WinCheckButton(hwnd, CFGD_NOFOLDMENU, fNoFoldMenu);
@@ -1698 +1702 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFGD, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFGD, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -1711 +1715 @@
       ulCnrType |= CCS_MULTIPLESEL;
     PrfWriteProfileData(fmprof, appname, "ContainerType",
-                        (PVOID) & ulCnrType, sizeof(BOOL));
+                        (PVOID) & ulCnrType, sizeof(BOOL));
     fMinOnOpen = WinQueryButtonCheckstate(hwnd, CFGD_MINONOPEN);
     PrfWriteProfileData(fmprof, FM3Str, "MinDirOnOpen", &fMinOnOpen,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fLeaveTree = WinQueryButtonCheckstate(hwnd, CFGD_LEAVETREE);
     PrfWriteProfileData(fmprof, appname, "LeaveTree", &fLeaveTree,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fNoFoldMenu = WinQueryButtonCheckstate(hwnd, CFGD_NOFOLDMENU);
     PrfWriteProfileData(fmprof, appname, "NoFoldMenu", &fNoFoldMenu,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fSelectedAlways = WinQueryButtonCheckstate(hwnd, CFGD_SELECTEDALWAYS);
     PrfWriteProfileData(fmprof, appname, "SelectedAlways", &fSelectedAlways,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fNoSearch = WinQueryButtonCheckstate(hwnd, CFGD_NOSEARCH);
     PrfWriteProfileData(fmprof, appname, "NoSearch", &fNoSearch,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fLookInDir = WinQueryButtonCheckstate(hwnd, CFGD_LOOKINDIR);
     PrfWriteProfileData(fmprof, FM3Str, "LookInDir", (PVOID) & fLookInDir,
-                        sizeof(BOOL));
+                        sizeof(BOOL));
     fUnHilite = WinQueryButtonCheckstate(hwnd, CFGD_UNHILITE);
     PrfWriteProfileData(fmprof, appname, "UnHilite",
-                        &fUnHilite, sizeof(BOOL));
+                        &fUnHilite, sizeof(BOOL));
     {
       BOOL fOldSyncUpdates = WinQueryButtonCheckstate(hwnd, CFGD_SYNCUPDATES);
 
       if (fOldSyncUpdates != fSyncUpdates) {
-        fSyncUpdates = fOldSyncUpdates;
-        if (hwndMain && !strcmp(realappname, FM3Str)) {
-          // Save state and restore to refresh windows with new settings
-          if (SaveDirCnrState(hwndMain, GetPString(IDS_FM2TEMPTEXT)) > 0) {
-            PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2));
-//          PostMsg(hwndMain, UM_RESTORE, MPVOID, MPVOID);
-            PostMsg(MainObjectHwnd, UM_RESTORE, GetPString(IDS_FM2TEMPTEXT), MPVOID);
-          }
-        }
+        fSyncUpdates = fOldSyncUpdates;
+        if (hwndMain && !strcmp(realappname, FM3Str)) {
+          // Save state and restore to refresh windows with new settings
+          if (SaveDirCnrState(hwndMain, GetPString(IDS_FM2TEMPTEXT)) > 0) {
+            PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2));
+//          PostMsg(hwndMain, UM_RESTORE, MPVOID, MPVOID);
+            PostMsg(MainObjectHwnd, UM_RESTORE, GetPString(IDS_FM2TEMPTEXT), MPVOID);
+          }
+        }
       }
     }
     PrfWriteProfileData(fmprof, appname, "SyncUpdates",
-                        &fSyncUpdates, sizeof(BOOL));
+                        &fSyncUpdates, sizeof(BOOL));
     if (!(ulCnrType & (CCS_EXTENDSEL | CCS_MULTIPLESEL)))
       saymsg(MB_ENTER | MB_ICONEXCLAMATION,
-             HWND_DESKTOP,
-             GetPString(IDS_WARNINGTEXT),
-             GetPString(IDS_SELECTTYPEERRORTEXT));
-    break;                              // WM_CLOSE
+             HWND_DESKTOP,
+             GetPString(IDS_WARNINGTEXT),
+             GetPString(IDS_SELECTTYPEERRORTEXT));
+    break;                              // WM_CLOSE
   }
   return WinDefDlgProc(hwnd, msg, mp1, mp2);
@@ -1834 +1838 @@
       switch (SHORT1FROMMP(mp1)) {
       case CFGM_RECENTDIRS:
-        sprintf(s,
-                GetPString(IDS_RECENTHELPWHICHTEXT),
-                (!oh && th) ?
-                GetPString(IDS_RECENTONLYTEXT) :
-                (oh && th) ?
-                GetPString(IDS_ALLONLYTEXT) : GetPString(IDS_NONE));
-        break;
+        sprintf(s,
+                GetPString(IDS_RECENTHELPWHICHTEXT),
+                (!oh && th) ?
+                GetPString(IDS_RECENTONLYTEXT) :
+                (oh && th) ?
+                GetPString(IDS_ALLONLYTEXT) : GetPString(IDS_NONE));
+        break;
       }
       if (*s)
-        WinSetDlgItemText(hwnd, SHORT1FROMMP(mp1), s);
+        WinSetDlgItemText(hwnd, SHORT1FROMMP(mp1), s);
     }
     return 0;
@@ -1854 +1858 @@
     case CFGM_STARTMIN:
       if (WinQueryButtonCheckstate(hwnd, CFGM_STARTMIN)) {
-        WinCheckButton(hwnd, CFGM_STARTMAX, FALSE);
-        WinEnableWindow(WinWindowFromID(hwnd, CFGM_STARTMAX), FALSE);
+        WinCheckButton(hwnd, CFGM_STARTMAX, FALSE);
+        WinEnableWindow(WinWindowFromID(hwnd, CFGM_STARTMAX), FALSE);
       }
       else
-        WinEnableWindow(WinWindowFromID(hwnd, CFGM_STARTMAX), TRUE);
+        WinEnableWindow(WinWindowFromID(hwnd, CFGM_STARTMAX), TRUE);
       break;
     case CFGM_STARTMAX:
       if (WinQueryButtonCheckstate(hwnd, CFGM_STARTMAX)) {
-        WinCheckButton(hwnd, CFGM_STARTMIN, FALSE);
-        WinEnableWindow(WinWindowFromID(hwnd, CFGM_STARTMIN), FALSE);
+        WinCheckButton(hwnd, CFGM_STARTMIN, FALSE);
+        WinEnableWindow(WinWindowFromID(hwnd, CFGM_STARTMIN), FALSE);
       }
       else
-        WinEnableWindow(WinWindowFromID(hwnd, CFGM_STARTMIN), TRUE);
+        WinEnableWindow(WinWindowFromID(hwnd, CFGM_STARTMIN), TRUE);
       break;
     }
@@ -1886 +1890 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFGM, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFGM, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -1895 +1899 @@
     if (hwndMain && !strcmp(realappname, FM3Str)) {
       if (fFreeTree != WinQueryButtonCheckstate(hwnd, CFGM_FREETREE))
-        PostMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_FREETREE, 0), MPVOID);
+        PostMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_FREETREE, 0), MPVOID);
       if (fAutoTile != WinQueryButtonCheckstate(hwnd, CFGM_AUTOTILE))
-        PostMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_AUTOTILE, 0), MPVOID);
+        PostMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_AUTOTILE, 0), MPVOID);
       if (fSplitStatus != WinQueryButtonCheckstate(hwnd, CFGM_SPLITSTATUS)) {
-        fSplitStatus = (fSplitStatus) ? FALSE : TRUE;
-        PostMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_BLINK, 0), MPVOID);
-        PrfWriteProfileData(fmprof, FM3Str, "SplitStatus", &fSplitStatus,
-                            sizeof(BOOL));
+        fSplitStatus = (fSplitStatus) ? FALSE : TRUE;
+        PostMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_BLINK, 0), MPVOID);
+        PrfWriteProfileData(fmprof, FM3Str, "SplitStatus", &fSplitStatus,
+                            sizeof(BOOL));
       }
     }
     fUserListSwitches = WinQueryButtonCheckstate(hwnd, CFGM_USERLISTSWITCHES);
     PrfWriteProfileData(fmprof, FM3Str, "UserListSwitches",
-                        (PVOID) & fUserListSwitches, sizeof(BOOL));
+                        (PVOID) & fUserListSwitches, sizeof(BOOL));
     fExternalINIs = WinQueryButtonCheckstate(hwnd, CFGM_EXTERNALINIS);
     PrfWriteProfileData(fmprof, FM3Str, "ExternalINIs",
-                        (PVOID) & fExternalINIs, sizeof(BOOL));
+                        (PVOID) & fExternalINIs, sizeof(BOOL));
     fExternalArcboxes = WinQueryButtonCheckstate(hwnd, CFGM_EXTERNALARCBOXES);
     PrfWriteProfileData(fmprof, FM3Str, "ExternalArcboxes",
-                        (PVOID) & fExternalArcboxes, sizeof(BOOL));
+                        (PVOID) & fExternalArcboxes, sizeof(BOOL));
     fExternalCollector =
       WinQueryButtonCheckstate(hwnd, CFGM_EXTERNALCOLLECTOR);
     PrfWriteProfileData(fmprof, FM3Str, "ExternalCollector",
-                        (PVOID) & fExternalCollector, sizeof(BOOL));
+                        (PVOID) & fExternalCollector, sizeof(BOOL));
     fExternalViewer = WinQueryButtonCheckstate(hwnd, CFGM_EXTERNALVIEWER);
     PrfWriteProfileData(fmprof, FM3Str, "ExternalViewer",
-                        (PVOID) & fExternalViewer, sizeof(BOOL));
+                        (PVOID) & fExternalViewer, sizeof(BOOL));
     {
       long test;
@@ -1929 +1933 @@
     }
     PrfWriteProfileData(fmprof,
-                        appname,
-                        "AutoAddDirs", (PVOID) & fAutoAddDirs, sizeof(BOOL));
+                        appname,
+                        "AutoAddDirs", (PVOID) & fAutoAddDirs, sizeof(BOOL));
     PrfWriteProfileData(fmprof,
-                        appname,
-                        "AutoAddAllDirs",
-                        (PVOID) & fAutoAddAllDirs, sizeof(BOOL));
+                        appname,
+                        "AutoAddAllDirs",
+                        (PVOID) & fAutoAddAllDirs, sizeof(BOOL));
     fwsAnimate = WinQueryButtonCheckstate(hwnd, CFGM_WSANIMATE);
     if (fwsAnimate)
       fwsAnimate = WS_ANIMATE;
     PrfWriteProfileData(fmprof,
-                        appname,
-                        "WS_ANIMATE", (PVOID) & fwsAnimate, sizeof(ULONG));
+                        appname,
+                        "WS_ANIMATE", (PVOID) & fwsAnimate, sizeof(ULONG));
     fSaveState = WinQueryButtonCheckstate(hwnd, CFGM_SAVESTATE);
     PrfWriteProfileData(fmprof,
-                        FM3Str,
-                        "SaveState", (PVOID) & fSaveState, sizeof(BOOL));
+                        FM3Str,
+                        "SaveState", (PVOID) & fSaveState, sizeof(BOOL));
     fStartMinimized = WinQueryButtonCheckstate(hwnd, CFGM_STARTMIN);
     PrfWriteProfileData(fmprof,
-                        appname,
-                        "StartMinimized",
-                        (PVOID) & fStartMinimized, sizeof(BOOL));
+                        appname,
+                        "StartMinimized",
+                        (PVOID) & fStartMinimized, sizeof(BOOL));
     fStartMaximized = WinQueryButtonCheckstate(hwnd, CFGM_STARTMAX);
     PrfWriteProfileData(fmprof,
-                        appname,
-                        "StartMaximized",
-                        (PVOID) & fStartMaximized, sizeof(BOOL));
+                        appname,
+                        "StartMaximized",
+                        (PVOID) & fStartMaximized, sizeof(BOOL));
     fDataMin = WinQueryButtonCheckstate(hwnd, CFGM_DATAMIN);
     PrfWriteProfileData(fmprof,
-                        FM3Str, "DataMin", (PVOID) & fDataMin, sizeof(BOOL));
+                        FM3Str, "DataMin", (PVOID) & fDataMin, sizeof(BOOL));
     fTileBackwards = WinQueryButtonCheckstate(hwnd, CFGM_TILEBACKWARDS);
     PrfWriteProfileData(fmprof,
-                        FM3Str,
-                        "TileBackwards",
-                        (PVOID) & fTileBackwards, sizeof(BOOL));
+                        FM3Str,
+                        "TileBackwards",
+                        (PVOID) & fTileBackwards, sizeof(BOOL));
     fNoTreeGap = WinQueryButtonCheckstate(hwnd, CFGM_NOTREEGAP);
     PrfWriteProfileData(fmprof,
-                        FM3Str,
-                        "NoTreeGap", (PVOID) & fNoTreeGap, sizeof(BOOL));
+                        FM3Str,
+                        "NoTreeGap", (PVOID) & fNoTreeGap, sizeof(BOOL));
     fBlueLED = WinQueryButtonCheckstate(hwnd, CFGM_BLUELED);
     PrfWriteProfileData(fmprof,
-                        appname, "BlueLED", (PVOID) & fBlueLED, sizeof(BOOL));
+                        appname, "BlueLED", (PVOID) & fBlueLED, sizeof(BOOL));
     {
       BOOL dummy;
@@ -1975 +1979 @@
       dummy = WinQueryButtonCheckstate(hwnd, CFGM_SHOWTARGET);
       if (dummy != fShowTarget) {
-        fShowTarget = dummy;
-        PrfWriteProfileData(fmprof,
-                            appname,
-                            "ShowTarget",
-                            (PVOID) & fShowTarget, sizeof(BOOL));
-        if (hwndMain)
-          PostMsg(WinQueryWindow(hwndMain, QW_PARENT),
-                  WM_UPDATEFRAME, MPFROMLONG(FCF_SIZEBORDER), MPVOID);
-        SetTargetDir(hwnd, TRUE);
+        fShowTarget = dummy;
+        PrfWriteProfileData(fmprof,
+                            appname,
+                            "ShowTarget",
+                            (PVOID) & fShowTarget, sizeof(BOOL));
+        if (hwndMain)
+          PostMsg(WinQueryWindow(hwndMain, QW_PARENT),
+                  WM_UPDATEFRAME, MPFROMLONG(FCF_SIZEBORDER), MPVOID);
+        SetTargetDir(hwnd, TRUE);
       }
       dummy = WinQueryButtonCheckstate(hwnd, CFGM_SEPARATEPARMS);
       if (dummy != fSeparateParms) {
-        fSeparateParms = dummy;
-        PrfWriteProfileData(fmprof,
-                            FM3Str,
-                            "SeparateParms",
-                            (PVOID) & fSeparateParms, sizeof(BOOL));
-        WinSendMsg((HWND) WinQueryWindowULong(hwnd, QWL_USER),
-                   UM_UNDO, MPVOID, MPVOID);
+        fSeparateParms = dummy;
+        PrfWriteProfileData(fmprof,
+                            FM3Str,
+                            "SeparateParms",
+                            (PVOID) & fSeparateParms, sizeof(BOOL));
+        WinSendMsg((HWND) WinQueryWindowULong(hwnd, QWL_USER),
+                   UM_UNDO, MPVOID, MPVOID);
       }
     }
@@ -2008 +2012 @@
   case WM_INITDLG:
     WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_SETTEXTLIMIT,
-                      MPFROMSHORT(8), MPVOID);
+                      MPFROMSHORT(8), MPVOID);
     WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_OVERRIDESETLIMITS,
-                      MPFROMLONG(1000), MPFROMLONG(50));
+                      MPFROMLONG(1000), MPFROMLONG(50));
     WinSendDlgItemMsg(hwnd,
-                      CFG5_FILTER,
-                      EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      CFG5_FILTER,
+                      EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
     break;
@@ -2052 +2056 @@
 
       if (!PrfQueryProfileData(fmprof,
-                               appname,
-                               "DirflWindowAttr", &flWindowAttr, &ulSize))
-        flWindowAttr = (CV_NAME | CV_MINI | CA_DETAILSVIEWTITLES | CV_FLOW);
+                               appname,
+                               "DirflWindowAttr", &flWindowAttr, &ulSize))
+        flWindowAttr = (CV_NAME | CV_MINI | CA_DETAILSVIEWTITLES | CV_FLOW);
       if (flWindowAttr & CV_ICON)
-        WinCheckButton(hwnd, CFG5_ICON, TRUE);
+        WinCheckButton(hwnd, CFG5_ICON, TRUE);
       if (flWindowAttr & CV_NAME)
-        WinCheckButton(hwnd, CFG5_NAME, TRUE);
+        WinCheckButton(hwnd, CFG5_NAME, TRUE);
       if (flWindowAttr & CV_TEXT)
-        WinCheckButton(hwnd, CFG5_TEXT, TRUE);
+        WinCheckButton(hwnd, CFG5_TEXT, TRUE);
       if (flWindowAttr & CV_DETAIL)
-        WinCheckButton(hwnd, CFG5_DETAIL, TRUE);
+        WinCheckButton(hwnd, CFG5_DETAIL, TRUE);
       if (flWindowAttr & CV_MINI)
-        WinCheckButton(hwnd, CFG5_MINIICONS, TRUE);
+        WinCheckButton(hwnd, CFG5_MINIICONS, TRUE);
       if (flWindowAttr & CA_DETAILSVIEWTITLES)
-        WinCheckButton(hwnd, CFG5_SHOWTITLES, TRUE);
+        WinCheckButton(hwnd, CFG5_SHOWTITLES, TRUE);
       WinCheckButton(hwnd, CFG5_SHOWLNAMES, dsDirCnrDefault.detailslongname);
       WinCheckButton(hwnd, CFG5_SHOWSUBJECT, dsDirCnrDefault.detailssubject);
@@ -2081 +2085 @@
       memset(&mask, 0, sizeof(mask));
       mask.attrFile = FILE_DIRECTORY | FILE_ARCHIVED | FILE_HIDDEN |
-        FILE_SYSTEM | FILE_NORMAL | FILE_READONLY;
+        FILE_SYSTEM | FILE_NORMAL | FILE_READONLY;
       ulSize = sizeof(MASK);
       if (PrfQueryProfileData(fmprof, appname, "DirFilter", &mask, &ulSize))
-        SetMask(NULL, &mask);
+        SetMask(NULL, &mask);
       if (!mask.attrFile)
-        mask.attrFile = FILE_DIRECTORY | FILE_ARCHIVED | FILE_HIDDEN |
-          FILE_SYSTEM | FILE_NORMAL | FILE_READONLY;
+        mask.attrFile = FILE_DIRECTORY | FILE_ARCHIVED | FILE_HIDDEN |
+          FILE_SYSTEM | FILE_NORMAL | FILE_READONLY;
       strcpy(mask.prompt, GetPString(IDS_DEFDIRFILTERTITLETEXT));
       WinSetDlgItemText(hwnd, CFG5_FILTER, mask.szMask);
@@ -2093 +2097 @@
       WinCheckButton(hwnd, CFG5_SUBJECTLENGTHMAX, dsDirCnrDefault.fSubjectLengthMax);
       WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_SETCURRENTVALUE,
-                        MPFROMLONG(dsDirCnrDefault.SubjectDisplayWidth), MPVOID);
+                        MPFROMLONG(dsDirCnrDefault.SubjectDisplayWidth), MPVOID);
     }
     return 0;
@@ -2099 +2103 @@
   case UM_SETUP5:
     if (WinDlgBox(HWND_DESKTOP, hwndNotebook, PickMaskDlgProc,
-                  FM3ModHandle, MSK_FRAME, MPFROMP(&mask))) {
+                  FM3ModHandle, MSK_FRAME, MPFROMP(&mask))) {
       SetMask(NULL, &mask);
       WinSetDlgItemText(hwnd, CFG5_FILTER, mask.szMask);
@@ -2110 +2114 @@
       switch (SHORT2FROMMP(mp1)) {
       case EN_SETFOCUS:
-        PostMsg(hwnd, UM_FOCUSME, MPVOID, MPVOID);
-        PostMsg(hwnd, UM_SETUP5, MPVOID, MPVOID);
-        break;
+        PostMsg(hwnd, UM_FOCUSME, MPVOID, MPVOID);
+        PostMsg(hwnd, UM_SETUP5, MPVOID, MPVOID);
+        break;
       }
       break;
@@ -2133 +2137 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFG5, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFG5, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -2144 +2148 @@
 
       if (WinQueryButtonCheckstate(hwnd, CFG5_ICON))
-        flWindowAttr |= CV_ICON;
+        flWindowAttr |= CV_ICON;
       if (WinQueryButtonCheckstate(hwnd, CFG5_NAME))
-        flWindowAttr |= CV_NAME;
+        flWindowAttr |= CV_NAME;
       if (WinQueryButtonCheckstate(hwnd, CFG5_TEXT))
-        flWindowAttr |= CV_TEXT;
+        flWindowAttr |= CV_TEXT;
       if (WinQueryButtonCheckstate(hwnd, CFG5_DETAIL))
-        flWindowAttr |= CV_DETAIL;
+        flWindowAttr |= CV_DETAIL;
       if (WinQueryButtonCheckstate(hwnd, CFG5_MINIICONS))
-        flWindowAttr |= CV_MINI;
+        flWindowAttr |= CV_MINI;
       if (WinQueryButtonCheckstate(hwnd, CFG5_SHOWTITLES))
-        flWindowAttr |= CA_DETAILSVIEWTITLES;
+        flWindowAttr |= CA_DETAILSVIEWTITLES;
       flWindowAttr |= CV_FLOW;
       PrfWriteProfileData(fmprof,
-                          appname,
-                          "DirflWindowAttr", &flWindowAttr, sizeof(ULONG));
+                          appname,
+                          "DirflWindowAttr", &flWindowAttr, sizeof(ULONG));
     }
     dsDirCnrDefault.detailslongname = WinQueryButtonCheckstate(hwnd, CFG5_SHOWLNAMES);
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsLongname",
-                        &dsDirCnrDefault.detailslongname, sizeof(BOOL));
+                        &dsDirCnrDefault.detailslongname, sizeof(BOOL));
     dsDirCnrDefault.detailssubject = WinQueryButtonCheckstate(hwnd, CFG5_SHOWSUBJECT);
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsSubject",
-                        &dsDirCnrDefault.detailssubject, sizeof(BOOL));
+                        &dsDirCnrDefault.detailssubject, sizeof(BOOL));
     dsDirCnrDefault.detailsea = WinQueryButtonCheckstate(hwnd, CFG5_SHOWSUBJECT);
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsEA",
-                        &dsDirCnrDefault.detailsea, sizeof(BOOL));
+                        &dsDirCnrDefault.detailsea, sizeof(BOOL));
     dsDirCnrDefault.detailssize = WinQueryButtonCheckstate(hwnd, CFG5_SHOWSIZE);
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsSize",
-                        &dsDirCnrDefault.detailssize, sizeof(BOOL));
+                        &dsDirCnrDefault.detailssize, sizeof(BOOL));
     dsDirCnrDefault.detailsicon = WinQueryButtonCheckstate(hwnd, CFG5_SHOWICON);
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsIcon",
-                        &dsDirCnrDefault.detailsicon, sizeof(BOOL));
+                        &dsDirCnrDefault.detailsicon, sizeof(BOOL));
     dsDirCnrDefault.detailslwdate = WinQueryButtonCheckstate(hwnd, CFG5_SHOWLWDATE);
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsLWDate",
-                        &dsDirCnrDefault.detailslwdate, sizeof(BOOL));
+                        &dsDirCnrDefault.detailslwdate, sizeof(BOOL));
     dsDirCnrDefault.detailslwtime = WinQueryButtonCheckstate(hwnd, CFG5_SHOWLWTIME);
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsLWTime",
-                        &dsDirCnrDefault.detailslwtime, sizeof(BOOL));
+                        &dsDirCnrDefault.detailslwtime, sizeof(BOOL));
     dsDirCnrDefault.detailsladate = WinQueryButtonCheckstate(hwnd, CFG5_SHOWLADATE);
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsLADate",
-                        &dsDirCnrDefault.detailsladate, sizeof(BOOL));
+                        &dsDirCnrDefault.detailsladate, sizeof(BOOL));
     dsDirCnrDefault.detailslatime = WinQueryButtonCheckstate(hwnd, CFG5_SHOWLATIME);
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsLATime",
-                        &dsDirCnrDefault.detailslatime, sizeof(BOOL));
+                        &dsDirCnrDefault.detailslatime, sizeof(BOOL));
     dsDirCnrDefault.detailscrdate = WinQueryButtonCheckstate(hwnd, CFG5_SHOWCRDATE);
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsCRDate",
-                        &dsDirCnrDefault.detailscrdate, sizeof(BOOL));
+                        &dsDirCnrDefault.detailscrdate, sizeof(BOOL));
     dsDirCnrDefault.detailscrtime = WinQueryButtonCheckstate(hwnd, CFG5_SHOWCRTIME);
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsCRTime",
-                        &dsDirCnrDefault.detailscrtime, sizeof(BOOL));
+                        &dsDirCnrDefault.detailscrtime, sizeof(BOOL));
     dsDirCnrDefault.detailsattr = WinQueryButtonCheckstate(hwnd, CFG5_SHOWATTR);
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsAttr",
-                        &dsDirCnrDefault.detailsattr, sizeof(BOOL));
+                        &dsDirCnrDefault.detailsattr, sizeof(BOOL));
     dsDirCnrDefault.fSubjectInLeftPane = WinQueryButtonCheckstate(hwnd, CFG5_SUBJECTINLEFTPANE);
     PrfWriteProfileData(fmprof, appname, "DirCnr.SubjectInLeftPane",
-                        &dsDirCnrDefault.fSubjectInLeftPane, sizeof(BOOL));
+                        &dsDirCnrDefault.fSubjectInLeftPane, sizeof(BOOL));
     dsDirCnrDefault.fSubjectLengthMax = WinQueryButtonCheckstate(hwnd, CFG5_SUBJECTLENGTHMAX);
     PrfWriteProfileData(fmprof, appname, "DirCnr.SubjectLengthMax",
-                        &dsDirCnrDefault.fSubjectLengthMax, sizeof(BOOL));
+                        &dsDirCnrDefault.fSubjectLengthMax, sizeof(BOOL));
     *mask.prompt = 0;
     PrfWriteProfileData(fmprof, appname, "DirFilter", &mask, sizeof(MASK));
     {
-        if (!WinQueryButtonCheckstate(hwnd, CFG5_SUBJECTLENGTHMAX)) {
-          WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_QUERYVALUE,
-                            MPFROMP(&dsDirCnrDefault.SubjectDisplayWidth), MPFROM2SHORT(0, SPBQ_DONOTUPDATE));
-          if (dsDirCnrDefault.SubjectDisplayWidth < 50)
-            dsDirCnrDefault.SubjectDisplayWidth = 0;
-          else if (dsDirCnrDefault.SubjectDisplayWidth > 1000)
-            dsDirCnrDefault.SubjectDisplayWidth = 1000;
-        }
-        else
-          dsDirCnrDefault.SubjectDisplayWidth = 0;
-        PrfWriteProfileData(fmprof,
-                            appname, "DirCnr.SubjectDisplayWidth",
-                            &dsDirCnrDefault.SubjectDisplayWidth, sizeof(ULONG));
+        if (!WinQueryButtonCheckstate(hwnd, CFG5_SUBJECTLENGTHMAX)) {
+          WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_QUERYVALUE,
+                            MPFROMP(&dsDirCnrDefault.SubjectDisplayWidth), MPFROM2SHORT(0, SPBQ_DONOTUPDATE));
+          if (dsDirCnrDefault.SubjectDisplayWidth < 50)
+            dsDirCnrDefault.SubjectDisplayWidth = 0;
+          else if (dsDirCnrDefault.SubjectDisplayWidth > 1000)
+            dsDirCnrDefault.SubjectDisplayWidth = 1000;
+        }
+        else
+          dsDirCnrDefault.SubjectDisplayWidth = 0;
+        PrfWriteProfileData(fmprof,
+                            appname, "DirCnr.SubjectDisplayWidth",
+                            &dsDirCnrDefault.SubjectDisplayWidth, sizeof(ULONG));
     }
     break;
@@ -2299 +2303 @@
     case CFG6_SORTDIRSLAST:
       {
-        BOOL temp;
-
-        temp = WinQueryButtonCheckstate(hwnd, SHORT1FROMMP(mp1));
-        if (temp) {
-          switch (SHORT1FROMMP(mp1)) {
-          case CFG6_SORTDIRSFIRST:
-            WinCheckButton(hwnd, CFG6_SORTDIRSLAST, FALSE);
-            break;
-          case CFG6_SORTDIRSLAST:
-            WinCheckButton(hwnd, CFG6_SORTDIRSFIRST, FALSE);
-            break;
-          }
-        }
+        BOOL temp;
+
+        temp = WinQueryButtonCheckstate(hwnd, SHORT1FROMMP(mp1));
+        if (temp) {
+          switch (SHORT1FROMMP(mp1)) {
+          case CFG6_SORTDIRSFIRST:
+            WinCheckButton(hwnd, CFG6_SORTDIRSLAST, FALSE);
+            break;
+          case CFG6_SORTDIRSLAST:
+            WinCheckButton(hwnd, CFG6_SORTDIRSFIRST, FALSE);
+            break;
+          }
+        }
       }
       break;
@@ -2332 +2336 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFG6, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFG6, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -2375 +2379 @@
   case WM_INITDLG:
     WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_SETTEXTLIMIT,
-                      MPFROMSHORT(8), MPVOID);
+                      MPFROMSHORT(8), MPVOID);
     WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_OVERRIDESETLIMITS,
-                      MPFROMLONG(1000), MPFROMLONG(50));
+                      MPFROMLONG(1000), MPFROMLONG(50));
     WinSendDlgItemMsg(hwnd, CFG5_FILTER, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
+                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
     break;
@@ -2419 +2423 @@
 
       if (!PrfQueryProfileData(fmprof,
-                               appname,
-                               "CollectorflWindowAttr", &flWindowAttr, &ulSize))
-        flWindowAttr = (CV_NAME | CA_DETAILSVIEWTITLES | CV_MINI | CV_FLOW);
+                               appname,
+                               "CollectorflWindowAttr", &flWindowAttr, &ulSize))
+        flWindowAttr = (CV_NAME | CA_DETAILSVIEWTITLES | CV_MINI | CV_FLOW);
       if (flWindowAttr & CV_ICON)
-        WinCheckButton(hwnd, CFG5_ICON, TRUE);
+        WinCheckButton(hwnd, CFG5_ICON, TRUE);
       if (flWindowAttr & CV_NAME)
-        WinCheckButton(hwnd, CFG5_NAME, TRUE);
+        WinCheckButton(hwnd, CFG5_NAME, TRUE);
       if (flWindowAttr & CV_TEXT)
-        WinCheckButton(hwnd, CFG5_TEXT, TRUE);
+        WinCheckButton(hwnd, CFG5_TEXT, TRUE);
       if (flWindowAttr & CV_DETAIL)
-        WinCheckButton(hwnd, CFG5_DETAIL, TRUE);
+        WinCheckButton(hwnd, CFG5_DETAIL, TRUE);
       if (flWindowAttr & CV_MINI)
-        WinCheckButton(hwnd, CFG5_MINIICONS, TRUE);
+        WinCheckButton(hwnd, CFG5_MINIICONS, TRUE);
       if (flWindowAttr & CA_DETAILSVIEWTITLES)
-        WinCheckButton(hwnd, CFG5_SHOWTITLES, TRUE);
+        WinCheckButton(hwnd, CFG5_SHOWTITLES, TRUE);
       memset(&mask, 0, sizeof(mask));
       mask.attrFile = FILE_DIRECTORY | FILE_ARCHIVED | FILE_HIDDEN |
-        FILE_SYSTEM | FILE_NORMAL | FILE_READONLY;
+        FILE_SYSTEM | FILE_NORMAL | FILE_READONLY;
       ulSize = sizeof(MASK);
       if (PrfQueryProfileData(fmprof,
-                              appname, "CollectorFilter", &mask, &ulSize)) {
-        SetMask(NULL, &mask);
+                              appname, "CollectorFilter", &mask, &ulSize)) {
+        SetMask(NULL, &mask);
       }
       if (!mask.attrFile)
-        mask.attrFile = FILE_DIRECTORY | FILE_ARCHIVED | FILE_HIDDEN |
-          FILE_SYSTEM | FILE_NORMAL | FILE_READONLY;
+        mask.attrFile = FILE_DIRECTORY | FILE_ARCHIVED | FILE_HIDDEN |
+          FILE_SYSTEM | FILE_NORMAL | FILE_READONLY;
       strcpy(mask.prompt, GetPString(IDS_DEFCOLFILTERTITLETEXT));
       WinSetDlgItemText(hwnd, CFG5_FILTER, mask.szMask);
@@ -2468 +2472 @@
       WinCheckButton(hwnd, CFG5_SUBJECTLENGTHMAX, ds.fSubjectLengthMax);
       WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_SETCURRENTVALUE,
-                        MPFROMLONG(ds.SubjectDisplayWidth), MPVOID);
+                        MPFROMLONG(ds.SubjectDisplayWidth), MPVOID);
 
     }
@@ -2475 +2479 @@
   case UM_SETUP5:
     if (WinDlgBox(HWND_DESKTOP, hwndNotebook, PickMaskDlgProc,
-                  FM3ModHandle, MSK_FRAME, MPFROMP(&mask))) {
+                  FM3ModHandle, MSK_FRAME, MPFROMP(&mask))) {
       SetMask(NULL, &mask);
       WinSetDlgItemText(hwnd, CFG5_FILTER, mask.szMask);
@@ -2486 +2490 @@
       switch (SHORT2FROMMP(mp1)) {
       case EN_SETFOCUS:
-        PostMsg(hwnd, UM_FOCUSME, MPVOID, MPVOID);
-        PostMsg(hwnd, UM_SETUP5, MPVOID, MPVOID);
-        break;
+        PostMsg(hwnd, UM_FOCUSME, MPVOID, MPVOID);
+        PostMsg(hwnd, UM_SETUP5, MPVOID, MPVOID);
+        break;
       }
       break;
@@ -2509 +2513 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFG7, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFG7, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -2517 +2521 @@
   case WM_CLOSE:
     fExternalCollector = WinQueryButtonCheckstate(hwnd,
-                                                  CFG5_EXTERNALCOLLECTOR);
+                                                  CFG5_EXTERNALCOLLECTOR);
     PrfWriteProfileData(fmprof, FM3Str, "ExternalCollector",
-                        &fExternalCollector, sizeof(BOOL));
+                        &fExternalCollector, sizeof(BOOL));
     {
       ULONG flWindowAttr = 0;
 
       if (WinQueryButtonCheckstate(hwnd, CFG5_ICON))
-        flWindowAttr |= CV_ICON;
+        flWindowAttr |= CV_ICON;
       if (WinQueryButtonCheckstate(hwnd, CFG5_NAME))
-        flWindowAttr |= CV_NAME;
+        flWindowAttr |= CV_NAME;
       if (WinQueryButtonCheckstate(hwnd, CFG5_TEXT))
-        flWindowAttr |= CV_TEXT;
+        flWindowAttr |= CV_TEXT;
       if (WinQueryButtonCheckstate(hwnd, CFG5_DETAIL))
-        flWindowAttr |= CV_DETAIL;
+        flWindowAttr |= CV_DETAIL;
       if (WinQueryButtonCheckstate(hwnd, CFG5_MINIICONS))
-        flWindowAttr |= CV_MINI;
+        flWindowAttr |= CV_MINI;
       if (WinQueryButtonCheckstate(hwnd, CFG5_SHOWTITLES))
-        flWindowAttr |= CA_DETAILSVIEWTITLES;
+        flWindowAttr |= CA_DETAILSVIEWTITLES;
       flWindowAttr |= CV_FLOW;
       PrfWriteProfileData(fmprof, appname, "CollectorflWindowAttr",
-                          &flWindowAttr, sizeof(ULONG));
+                          &flWindowAttr, sizeof(ULONG));
     }
     {
@@ -2545 +2549 @@
       ds.detailslongname = WinQueryButtonCheckstate(hwnd, CFG5_SHOWLNAMES);
       PrfWriteProfileData(fmprof, appname, "Collector.DetailsLongname",
-                          &ds.detailslongname, sizeof(BOOL));
+                          &ds.detailslongname, sizeof(BOOL));
       ds.detailssubject = WinQueryButtonCheckstate(hwnd, CFG5_SHOWSUBJECT);
       PrfWriteProfileData(fmprof, appname, "Collector.DetailsSubject",
-                          &ds.detailssubject, sizeof(BOOL));
+                          &ds.detailssubject, sizeof(BOOL));
       ds.detailsea = WinQueryButtonCheckstate(hwnd, CFG5_SHOWEAS);
       PrfWriteProfileData(fmprof, appname, "Collector.DetailsEA",
-                          &ds.detailsea, sizeof(BOOL));
+                          &ds.detailsea, sizeof(BOOL));
       ds.detailssize = WinQueryButtonCheckstate(hwnd, CFG5_SHOWSIZE);
       PrfWriteProfileData(fmprof, appname, "Collector.DetailsSize",
-                          &ds.detailssize, sizeof(BOOL));
+                          &ds.detailssize, sizeof(BOOL));
       ds.detailsicon = WinQueryButtonCheckstate(hwnd, CFG5_SHOWICON);
       PrfWriteProfileData(fmprof, appname, "Collector.DetailsIcon",
-                          &ds.detailsicon, sizeof(BOOL));
+                          &ds.detailsicon, sizeof(BOOL));
       ds.detailslwdate = WinQueryButtonCheckstate(hwnd, CFG5_SHOWLWDATE);
       PrfWriteProfileData(fmprof, appname, "Collector.DetailsLWDate",
-                          &ds.detailslwdate, sizeof(BOOL));
+                          &ds.detailslwdate, sizeof(BOOL));
       ds.detailslwtime = WinQueryButtonCheckstate(hwnd, CFG5_SHOWLWTIME);
       PrfWriteProfileData(fmprof, appname, "Collector.DetailsLWTime",
-                          &ds.detailslwtime, sizeof(BOOL));
+                          &ds.detailslwtime, sizeof(BOOL));
       ds.detailsladate = WinQueryButtonCheckstate(hwnd, CFG5_SHOWLADATE);
       PrfWriteProfileData(fmprof, appname, "Collector.DetailsLADate",
-                          &ds.detailsladate, sizeof(BOOL));
+                          &ds.detailsladate, sizeof(BOOL));
       ds.detailslatime = WinQueryButtonCheckstate(hwnd, CFG5_SHOWLATIME);
       PrfWriteProfileData(fmprof, appname, "Collector.DetailsLATime",
-                          &ds.detailslatime, sizeof(BOOL));
+                          &ds.detailslatime, sizeof(BOOL));
       ds.detailscrdate = WinQueryButtonCheckstate(hwnd, CFG5_SHOWCRDATE);
       PrfWriteProfileData(fmprof, appname, "Collector.DetailsCRDate",
-                          &ds.detailscrdate, sizeof(BOOL));
+                          &ds.detailscrdate, sizeof(BOOL));
       ds.detailscrtime = WinQueryButtonCheckstate(hwnd, CFG5_SHOWCRTIME);
       PrfWriteProfileData(fmprof, appname, "Collector.DetailsCRTime",
-                          &ds.detailscrtime, sizeof(BOOL));
+                          &ds.detailscrtime, sizeof(BOOL));
       ds.detailsattr = WinQueryButtonCheckstate(hwnd, CFG5_SHOWATTR);
       PrfWriteProfileData(fmprof, appname, "Collector.DetailsAttr",
-                          &ds.detailsattr, sizeof(BOOL));
+                          &ds.detailsattr, sizeof(BOOL));
       ds.fSubjectInLeftPane = WinQueryButtonCheckstate(hwnd, CFG5_SUBJECTINLEFTPANE);
       PrfWriteProfileData(fmprof, appname, "Collector.SubjectInLeftPane",
-                          &ds.fSubjectInLeftPane, sizeof(BOOL));
+                          &ds.fSubjectInLeftPane, sizeof(BOOL));
       ds.fSubjectLengthMax = WinQueryButtonCheckstate(hwnd, CFG5_SUBJECTLENGTHMAX);
       PrfWriteProfileData(fmprof, appname, "Collector.SubjectLengthMax",
-                          &ds.fSubjectLengthMax, sizeof(BOOL));
+                          &ds.fSubjectLengthMax, sizeof(BOOL));
       *mask.prompt = 0;
       PrfWriteProfileData(fmprof,
-                          appname, "CollectorFilter", &mask, sizeof(MASK));
+                          appname, "CollectorFilter", &mask, sizeof(MASK));
       {
-        if (!WinQueryButtonCheckstate(hwnd, CFG5_SUBJECTLENGTHMAX)) {
-          WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_QUERYVALUE,
-                            MPFROMP(&ds.SubjectDisplayWidth), MPFROM2SHORT(0, SPBQ_DONOTUPDATE));
-          if (ds.SubjectDisplayWidth < 50)
-            ds.SubjectDisplayWidth = 0;
-          else if (ds.SubjectDisplayWidth > 1000)
-            ds.SubjectDisplayWidth = 1000;
-        }
-        else
-          ds.SubjectDisplayWidth = 0;
-        PrfWriteProfileData(fmprof,
-                            appname, "Collector.SubjectDisplayWidth",
-                            &ds.SubjectDisplayWidth, sizeof(ULONG));
+        if (!WinQueryButtonCheckstate(hwnd, CFG5_SUBJECTLENGTHMAX)) {
+          WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_QUERYVALUE,
+                            MPFROMP(&ds.SubjectDisplayWidth), MPFROM2SHORT(0, SPBQ_DONOTUPDATE));
+          if (ds.SubjectDisplayWidth < 50)
+            ds.SubjectDisplayWidth = 0;
+          else if (ds.SubjectDisplayWidth > 1000)
+            ds.SubjectDisplayWidth = 1000;
+        }
+        else
+          ds.SubjectDisplayWidth = 0;
+        PrfWriteProfileData(fmprof,
+                            appname, "Collector.SubjectDisplayWidth",
+                            &ds.SubjectDisplayWidth, sizeof(ULONG));
       }
     }
@@ -2684 +2688 @@
     case CFG6_SORTDIRSLAST:
       {
-        BOOL temp;
-
-        temp = WinQueryButtonCheckstate(hwnd, SHORT1FROMMP(mp1));
-        if (temp) {
-          switch (SHORT1FROMMP(mp1)) {
-          case CFG6_SORTDIRSFIRST:
-            WinCheckButton(hwnd, CFG6_SORTDIRSLAST, FALSE);
-            break;
-          case CFG6_SORTDIRSLAST:
-            WinCheckButton(hwnd, CFG6_SORTDIRSFIRST, FALSE);
-            break;
-          }
-        }
+        BOOL temp;
+
+        temp = WinQueryButtonCheckstate(hwnd, SHORT1FROMMP(mp1));
+        if (temp) {
+          switch (SHORT1FROMMP(mp1)) {
+          case CFG6_SORTDIRSFIRST:
+            WinCheckButton(hwnd, CFG6_SORTDIRSLAST, FALSE);
+            break;
+          case CFG6_SORTDIRSLAST:
+            WinCheckButton(hwnd, CFG6_SORTDIRSFIRST, FALSE);
+            break;
+          }
+        }
       }
       break;
@@ -2717 +2721 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFG8, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFG8, 0), MPFROMSHORT(HM_RESOURCEID));
       break;
     }
@@ -2748 +2752 @@
       CollectorsortFlags |= SORT_REVERSE;
     PrfWriteProfileData(fmprof,
-                        appname,
-                        "CollectorSort", &CollectorsortFlags, sizeof(INT));
+                        appname,
+                        "CollectorSort", &CollectorsortFlags, sizeof(INT));
     break;
   }
@@ -2790 +2794 @@
     case IDM_HELP:
       if (hwndHelp)
-        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
-                   MPFROM2SHORT(HELP_CFG9, 0), MPFROMSHORT(HM_RESOURCEID));
+        WinSendMsg(hwndHelp, HM_DISPLAY_HELP,
+                   MPFROM2SHORT(HELP_CFG9, 0), MPFROMSHORT(HM_RESOURCEID));
       return 0;
     case CFG9_MAXIMUMUI:
       if (hwndMain) {
-        if (MenuInvisible)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_HIDEMENU, 0), MPVOID);
-        if (!fAutoView)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_AUTOVIEW, 0), MPVOID);
-        if (!fDrivebar)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_DRIVEBAR, 0), MPVOID);
-        if (!fToolbar)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_TOOLBAR, 0), MPVOID);
-        if (!fMoreButtons)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_MOREBUTTONS, 0), MPVOID);
-        if (!fUserComboBox)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_USERLIST, 0), MPVOID);
+        if (MenuInvisible)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_HIDEMENU, 0), MPVOID);
+        if (!fAutoView)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_AUTOVIEW, 0), MPVOID);
+        if (!fDrivebar)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_DRIVEBAR, 0), MPVOID);
+        if (!fToolbar)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_TOOLBAR, 0), MPVOID);
+        if (!fMoreButtons)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_MOREBUTTONS, 0), MPVOID);
+        if (!fUserComboBox)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_USERLIST, 0), MPVOID);
       }
       return 0;
     case CFG9_MINIMUMUI:
       if (hwndMain) {
-        if (!MenuInvisible)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_HIDEMENU, 0), MPVOID);
-        if (fAutoView)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_AUTOVIEW, 0), MPVOID);
-        if (fToolbar)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_TOOLBAR, 0), MPVOID);
-        if (fMoreButtons)
-          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_MOREBUTTONS, 0),
-                     MPVOID);
-        if (fUserComboBox)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_USERLIST, 0), MPVOID);
-        saymsg(MB_ENTER | MB_ICONASTERISK,
-               hwnd,
-               GetPString(IDS_DONTFORGETTEXT),
-               GetPString(IDS_UNHIDEMENUWARNTEXT));
+        if (!MenuInvisible)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_HIDEMENU, 0), MPVOID);
+        if (fAutoView)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_AUTOVIEW, 0), MPVOID);
+        if (fToolbar)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_TOOLBAR, 0), MPVOID);
+        if (fMoreButtons)
+          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_MOREBUTTONS, 0),
+                     MPVOID);
+        if (fUserComboBox)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_USERLIST, 0), MPVOID);
+        saymsg(MB_ENTER | MB_ICONASTERISK,
+               hwnd,
+               GetPString(IDS_DONTFORGETTEXT),
+               GetPString(IDS_UNHIDEMENUWARNTEXT));
       }
       return 0;
@@ -2849 +2853 @@
       fDragndropDlg = TRUE;
       {
-        ULONG flWindowAttr;
-
-        flWindowAttr = CV_DETAIL | CV_FLOW | CA_DETAILSVIEWTITLES;
-        PrfWriteProfileData(fmprof,
-                            appname,
-                            "DirflWindowAttr", &flWindowAttr, sizeof(ULONG));
-        PrfWriteProfileData(fmprof,
-                            appname,
-                            "CollectorflWindowAttr",
-                            &flWindowAttr, sizeof(ULONG));
-        PrfWriteProfileData(fmprof,
-                            appname, "Collector.Fontnamesize", NULL, 0);
+        ULONG flWindowAttr;
+
+        flWindowAttr = CV_DETAIL | CV_FLOW | CA_DETAILSVIEWTITLES;
+        PrfWriteProfileData(fmprof,
+                            appname,
+                            "DirflWindowAttr", &flWindowAttr, sizeof(ULONG));
+        PrfWriteProfileData(fmprof,
+                            appname,
+                            "CollectorflWindowAttr",
+                            &flWindowAttr, sizeof(ULONG));
+        PrfWriteProfileData(fmprof,
+                            appname, "Collector.Fontnamesize", NULL, 0);
       }
       dsDirCnrDefault.detailslongname = TRUE;
@@ -2876 +2880 @@
       if (hwndTree) {
 
-        CNRINFO cnri;
-        ULONG flWindowAttr = CV_TREE | CV_ICON | CV_FLOW | CA_TREELINE;
-
-        memset(&cnri, 0, sizeof(cnri));
-        cnri.cb = sizeof(cnri);
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
-        cnri.flWindowAttr = flWindowAttr;
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_SETCNRINFO, MPFROMP(&cnri),
-                   MPFROMLONG(CMA_FLWINDOWATTR));
+        CNRINFO cnri;
+        ULONG flWindowAttr = CV_TREE | CV_ICON | CV_FLOW | CA_TREELINE;
+
+        memset(&cnri, 0, sizeof(cnri));
+        cnri.cb = sizeof(cnri);
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
+        cnri.flWindowAttr = flWindowAttr;
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_SETCNRINFO, MPFROMP(&cnri),
+                   MPFROMLONG(CMA_FLWINDOWATTR));
       }
       break;
@@ -2903 +2907 @@
       fDragndropDlg = TRUE;
       {
-        ULONG flWindowAttr;
-
-        flWindowAttr = CV_DETAIL | CV_FLOW | CV_MINI;
-        PrfWriteProfileData(fmprof,
-                            appname,
-                            "DirflWindowAttr", &flWindowAttr, sizeof(ULONG));
-        PrfWriteProfileData(fmprof,
-                            appname,
-                            "CollectorflWindowAttr",
-                            &flWindowAttr, sizeof(ULONG));
-        PrfWriteProfileData(fmprof,
-                            appname,
-                            "Collector.Fontnamesize",
-                            GetPString(IDS_8HELVTEXT),
-                            strlen(GetPString(IDS_8HELVTEXT)) + 1);
+        ULONG flWindowAttr;
+
+        flWindowAttr = CV_DETAIL | CV_FLOW | CV_MINI;
+        PrfWriteProfileData(fmprof,
+                            appname,
+                            "DirflWindowAttr", &flWindowAttr, sizeof(ULONG));
+        PrfWriteProfileData(fmprof,
+                            appname,
+                            "CollectorflWindowAttr",
+                            &flWindowAttr, sizeof(ULONG));
+        PrfWriteProfileData(fmprof,
+                            appname,
+                            "Collector.Fontnamesize",
+                            GetPString(IDS_8HELVTEXT),
+                            strlen(GetPString(IDS_8HELVTEXT)) + 1);
       }
       dsDirCnrDefault.detailslongname = TRUE;
@@ -2933 +2937 @@
       if (hwndTree) {
 
-        CNRINFO cnri;
-        ULONG flWindowAttr = CV_TREE | CV_MINI | CV_TEXT |
-          CV_FLOW | CA_TREELINE;
-
-        memset(&cnri, 0, sizeof(cnri));
-        cnri.cb = sizeof(cnri);
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
-        cnri.flWindowAttr = flWindowAttr;
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_SETCNRINFO, MPFROMP(&cnri),
-                   MPFROMLONG(CMA_FLWINDOWATTR));
+        CNRINFO cnri;
+        ULONG flWindowAttr = CV_TREE | CV_MINI | CV_TEXT |
+          CV_FLOW | CA_TREELINE;
+
+        memset(&cnri, 0, sizeof(cnri));
+        cnri.cb = sizeof(cnri);
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
+        cnri.flWindowAttr = flWindowAttr;
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_SETCNRINFO, MPFROMP(&cnri),
+                   MPFROMLONG(CMA_FLWINDOWATTR));
       }
       break;
     case CFG9_MAXFILENAMES:
       if (hwndMain && fAutoView)
-        WinSendMsg(hwndMain, WM_COMMAND,
-                   MPFROM2SHORT(IDM_AUTOVIEW, 0), MPVOID);
+        WinSendMsg(hwndMain, WM_COMMAND,
+                   MPFROM2SHORT(IDM_AUTOVIEW, 0), MPVOID);
       fForceUpper = FALSE;
       fForceLower = TRUE;
@@ -2964 +2968 @@
       fNoIconsDirs = TRUE;
       {
-        ULONG flWindowAttr;
-
-        flWindowAttr = CV_TEXT | CV_FLOW;
-        PrfWriteProfileData(fmprof, appname, "DirflWindowAttr",
-                            &flWindowAttr, sizeof(ULONG));
-        PrfWriteProfileData(fmprof, appname, "CollectorflWindowAttr",
-                            &flWindowAttr, sizeof(ULONG));
-        PrfWriteProfileData(fmprof, appname, "Collector.Fontnamesize",
-                            GetPString(IDS_8HELVTEXT),
-                            strlen(GetPString(IDS_8HELVTEXT)) + 1);
+        ULONG flWindowAttr;
+
+        flWindowAttr = CV_TEXT | CV_FLOW;
+        PrfWriteProfileData(fmprof, appname, "DirflWindowAttr",
+                            &flWindowAttr, sizeof(ULONG));
+        PrfWriteProfileData(fmprof, appname, "CollectorflWindowAttr",
+                            &flWindowAttr, sizeof(ULONG));
+        PrfWriteProfileData(fmprof, appname, "Collector.Fontnamesize",
+                            GetPString(IDS_8HELVTEXT),
+                            strlen(GetPString(IDS_8HELVTEXT)) + 1);
       }
       if (hwndTree) {
 
-        CNRINFO cnri;
-        ULONG flWindowAttr = CV_TREE | CV_TEXT | CV_FLOW | CA_TREELINE;
-
-        memset(&cnri, 0, sizeof(cnri));
-        cnri.cb = sizeof(cnri);
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
-        cnri.flWindowAttr = flWindowAttr;
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_SETCNRINFO, MPFROMP(&cnri),
-                   MPFROMLONG(CMA_FLWINDOWATTR));
+        CNRINFO cnri;
+        ULONG flWindowAttr = CV_TREE | CV_TEXT | CV_FLOW | CA_TREELINE;
+
+        memset(&cnri, 0, sizeof(cnri));
+        cnri.cb = sizeof(cnri);
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
+        cnri.flWindowAttr = flWindowAttr;
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_SETCNRINFO, MPFROMP(&cnri),
+                   MPFROMLONG(CMA_FLWINDOWATTR));
       }
       break;
@@ -3059 +3063 @@
       fNoTreeGap = TRUE;
       {
-        ULONG flWindowAttr;
-
-        flWindowAttr = (CV_NAME | CV_MINI | CV_FLOW | CA_DETAILSVIEWTITLES);
-        PrfWriteProfileData(fmprof, appname, "DirflWindowAttr",
-                            &flWindowAttr, sizeof(ULONG));
-        PrfWriteProfileData(fmprof, appname, "CollectorflWindowAttr",
-                            &flWindowAttr, sizeof(ULONG));
+        ULONG flWindowAttr;
+
+        flWindowAttr = (CV_NAME | CV_MINI | CV_FLOW | CA_DETAILSVIEWTITLES);
+        PrfWriteProfileData(fmprof, appname, "DirflWindowAttr",
+                            &flWindowAttr, sizeof(ULONG));
+        PrfWriteProfileData(fmprof, appname, "CollectorflWindowAttr",
+                            &flWindowAttr, sizeof(ULONG));
       }
       dsDirCnrDefault.detailslongname = FALSE;
@@ -3083 +3087 @@
       if (hwndMain) {
 
-        SWP swp;
-
-        if (WinQueryWindowPos(hwndMain, &swp)) {
-          WinSetWindowPos(hwndTree, HWND_TOP, 0, 0,
-                          swp.cx / 5, swp.cy, SWP_MOVE | SWP_SIZE);
-        }
-        if (MenuInvisible)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_HIDEMENU, 0), MPVOID);
-        if (fAutoView)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_AUTOVIEW, 0), MPVOID);
-        if (fToolbar)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_TOOLBAR, 0), MPVOID);
-        if (!fDrivebar)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_DRIVEBAR, 0), MPVOID);
-        if (!fMoreButtons)
-          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_MOREBUTTONS, 0),
-                     MPVOID);
-        if (!fUserComboBox)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_USERLIST, 0), MPVOID);
+        SWP swp;
+
+        if (WinQueryWindowPos(hwndMain, &swp)) {
+          WinSetWindowPos(hwndTree, HWND_TOP, 0, 0,
+                          swp.cx / 5, swp.cy, SWP_MOVE | SWP_SIZE);
+        }
+        if (MenuInvisible)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_HIDEMENU, 0), MPVOID);
+        if (fAutoView)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_AUTOVIEW, 0), MPVOID);
+        if (fToolbar)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_TOOLBAR, 0), MPVOID);
+        if (!fDrivebar)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_DRIVEBAR, 0), MPVOID);
+        if (!fMoreButtons)
+          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_MOREBUTTONS, 0),
+                     MPVOID);
+        if (!fUserComboBox)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_USERLIST, 0), MPVOID);
       }
       if (hwndTree) {
 
-        CNRINFO cnri;
-        ULONG flWindowAttr = (CV_TREE | CV_TEXT | CV_MINI |
-                              CV_FLOW | CA_TREELINE);
-
-        memset(&cnri, 0, sizeof(cnri));
-        cnri.cb = sizeof(cnri);
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
-        cnri.flWindowAttr = flWindowAttr;
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_SETCNRINFO, MPFROMP(&cnri),
-                   MPFROMLONG(CMA_FLWINDOWATTR));
+        CNRINFO cnri;
+        ULONG flWindowAttr = (CV_TREE | CV_TEXT | CV_MINI |
+                              CV_FLOW | CA_TREELINE);
+
+        memset(&cnri, 0, sizeof(cnri));
+        cnri.cb = sizeof(cnri);
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
+        cnri.flWindowAttr = flWindowAttr;
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_SETCNRINFO, MPFROMP(&cnri),
+                   MPFROMLONG(CMA_FLWINDOWATTR));
       }
       break;
@@ -3176 +3180 @@
       fNoTreeGap = FALSE;
       {
-        ULONG flWindowAttr;
-
-        flWindowAttr = (CV_NAME | CV_MINI | CV_FLOW | CA_DETAILSVIEWTITLES);
-        PrfWriteProfileData(fmprof, appname, "DirflWindowAttr",
-                            &flWindowAttr, sizeof(ULONG));
-        PrfWriteProfileData(fmprof, appname, "CollectorflWindowAttr",
-                            &flWindowAttr, sizeof(ULONG));
+        ULONG flWindowAttr;
+
+        flWindowAttr = (CV_NAME | CV_MINI | CV_FLOW | CA_DETAILSVIEWTITLES);
+        PrfWriteProfileData(fmprof, appname, "DirflWindowAttr",
+                            &flWindowAttr, sizeof(ULONG));
+        PrfWriteProfileData(fmprof, appname, "CollectorflWindowAttr",
+                            &flWindowAttr, sizeof(ULONG));
       }
       dsDirCnrDefault.detailslongname = FALSE;
@@ -3200 +3204 @@
       if (hwndMain) {
 
-        SWP swp;
-
-        if (WinQueryWindowPos(hwndMain, &swp)) {
-          WinSetWindowPos(hwndTree, HWND_TOP, 0, 0,
-                          swp.cx / 5,
-                          swp.cy -
-                          (WinQuerySysValue(HWND_DESKTOP, SV_CYICON) * 2),
-                          SWP_MOVE | SWP_SIZE);
-        }
+        SWP swp;
+
+        if (WinQueryWindowPos(hwndMain, &swp)) {
+          WinSetWindowPos(hwndTree, HWND_TOP, 0, 0,
+                          swp.cx / 5,
+                          swp.cy -
+                          (WinQuerySysValue(HWND_DESKTOP, SV_CYICON) * 2),
+                          SWP_MOVE | SWP_SIZE);
+        }
       }
       if (hwndTree) {
 
-        CNRINFO cnri;
-        ULONG flWindowAttr = (CV_TREE | CV_TEXT |
-                              CV_FLOW | CA_TREELINE | CV_MINI);
-
-        memset(&cnri, 0, sizeof(cnri));
-        cnri.cb = sizeof(cnri);
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
-        cnri.flWindowAttr = flWindowAttr;
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_SETCNRINFO, MPFROMP(&cnri),
-                   MPFROMLONG(CMA_FLWINDOWATTR));
+        CNRINFO cnri;
+        ULONG flWindowAttr = (CV_TREE | CV_TEXT |
+                              CV_FLOW | CA_TREELINE | CV_MINI);
+
+        memset(&cnri, 0, sizeof(cnri));
+        cnri.cb = sizeof(cnri);
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
+        cnri.flWindowAttr = flWindowAttr;
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_SETCNRINFO, MPFROMP(&cnri),
+                   MPFROMLONG(CMA_FLWINDOWATTR));
       }
       break;
@@ -3240 +3244 @@
       fDCOpens = FALSE;
       {
-        ULONG flWindowAttr;
-
-        flWindowAttr = CV_NAME | CV_FLOW | CA_DETAILSVIEWTITLES;
-        PrfWriteProfileData(fmprof, appname, "DirflWindowAttr",
-                            &flWindowAttr, sizeof(ULONG));
-        PrfWriteProfileData(fmprof, appname, "CollectorflWindowAttr",
-                            &flWindowAttr, sizeof(ULONG));
+        ULONG flWindowAttr;
+
+        flWindowAttr = CV_NAME | CV_FLOW | CA_DETAILSVIEWTITLES;
+        PrfWriteProfileData(fmprof, appname, "DirflWindowAttr",
+                            &flWindowAttr, sizeof(ULONG));
+        PrfWriteProfileData(fmprof, appname, "CollectorflWindowAttr",
+                            &flWindowAttr, sizeof(ULONG));
       }
       fLinkSetsIcon = FALSE;
@@ -3257 +3261 @@
       fUserListSwitches = TRUE;
       WinSendMsg((HWND) WinQueryWindowULong(hwnd, QWL_USER), UM_UNDO, MPVOID,
-                 MPVOID);
+                 MPVOID);
       if (hwndTree) {
 
-        CNRINFO cnri;
-        ULONG flWindowAttr = CV_TREE | CV_MINI | CV_ICON |
-          CV_FLOW | CA_TREELINE;
-
-        memset(&cnri, 0, sizeof(cnri));
-        cnri.cb = sizeof(cnri);
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
-        cnri.flWindowAttr = flWindowAttr;
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_SETCNRINFO, MPFROMP(&cnri),
-                   MPFROMLONG(CMA_FLWINDOWATTR));
+        CNRINFO cnri;
+        ULONG flWindowAttr = CV_TREE | CV_MINI | CV_ICON |
+          CV_FLOW | CA_TREELINE;
+
+        memset(&cnri, 0, sizeof(cnri));
+        cnri.cb = sizeof(cnri);
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
+        cnri.flWindowAttr = flWindowAttr;
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_SETCNRINFO, MPFROMP(&cnri),
+                   MPFROMLONG(CMA_FLWINDOWATTR));
       }
       if (hwndMain) {
-        if (fAutoView)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_AUTOVIEW, 0), MPVOID);
-        if (!fDrivebar)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_DRIVEBAR, 0), MPVOID);
-        {
-          SWP swp;
-
-          if (WinQueryWindowPos(hwndMain, &swp)) {
-            WinSetWindowPos(hwndTree, HWND_TOP, 0, 0,
-                            swp.cx / 5, swp.cy, SWP_MOVE | SWP_SIZE);
-          }
-        }
-        PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2L));
-        PostMsg(MainObjectHwnd, UM_SETDIR, MPFROMLONG(1L), MPVOID);
+        if (fAutoView)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_AUTOVIEW, 0), MPVOID);
+        if (!fDrivebar)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_DRIVEBAR, 0), MPVOID);
+        {
+          SWP swp;
+
+          if (WinQueryWindowPos(hwndMain, &swp)) {
+            WinSetWindowPos(hwndTree, HWND_TOP, 0, 0,
+                            swp.cx / 5, swp.cy, SWP_MOVE | SWP_SIZE);
+          }
+        }
+        PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2L));
+        PostMsg(MainObjectHwnd, UM_SETDIR, MPFROMLONG(1L), MPVOID);
       }
       return 0;
@@ -3305 +3309 @@
       fTopDir = FALSE;
       if (hwndMain) {
-        if (!fTextTools)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_TEXTTOOLS, 0), MPVOID);
+        if (!fTextTools)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_TEXTTOOLS, 0), MPVOID);
       }
       {
-        ULONG flWindowAttr;
-
-        flWindowAttr = CV_TEXT | CV_FLOW | CA_DETAILSVIEWTITLES;
-        PrfWriteProfileData(fmprof, appname, "DirflWindowAttr",
-                            &flWindowAttr, sizeof(ULONG));
-        PrfWriteProfileData(fmprof, appname, "CollectorflWindowAttr",
-                            &flWindowAttr, sizeof(ULONG));
+        ULONG flWindowAttr;
+
+        flWindowAttr = CV_TEXT | CV_FLOW | CA_DETAILSVIEWTITLES;
+        PrfWriteProfileData(fmprof, appname, "DirflWindowAttr",
+                            &flWindowAttr, sizeof(ULONG));
+        PrfWriteProfileData(fmprof, appname, "CollectorflWindowAttr",
+                            &flWindowAttr, sizeof(ULONG));
       }
       if (hwndTree) {
 
-        CNRINFO cnri;
-        ULONG flWindowAttr = CV_TREE | CV_TEXT | CV_FLOW | CA_TREELINE;
-
-        memset(&cnri, 0, sizeof(cnri));
-        cnri.cb = sizeof(cnri);
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
-        cnri.flWindowAttr = flWindowAttr;
-        WinSendMsg(WinWindowFromID
-                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
-                   CM_SETCNRINFO, MPFROMP(&cnri),
-                   MPFROMLONG(CMA_FLWINDOWATTR));
+        CNRINFO cnri;
+        ULONG flWindowAttr = CV_TREE | CV_TEXT | CV_FLOW | CA_TREELINE;
+
+        memset(&cnri, 0, sizeof(cnri));
+        cnri.cb = sizeof(cnri);
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
+        cnri.flWindowAttr = flWindowAttr;
+        WinSendMsg(WinWindowFromID
+                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR),
+                   CM_SETCNRINFO, MPFROMP(&cnri),
+                   MPFROMLONG(CMA_FLWINDOWATTR));
       }
       /* intentional fallthru */
     case CFG9_1X:
       if (SHORT1FROMMP(mp1) == CFG9_1X) {
-        fTileBackwards = FALSE;
-        ulCnrType = CCS_MULTIPLESEL | CCS_EXTENDSEL;
-        fSwitchTree = FALSE;
-        fSwitchTreeOnFocus = FALSE;
-        fSwitchTreeExpand = FALSE;
-        fCollapseFirst = FALSE;
-        fFollowTree = FALSE;
-        fNoSearch = TRUE;
+        fTileBackwards = FALSE;
+        ulCnrType = CCS_MULTIPLESEL | CCS_EXTENDSEL;
+        fSwitchTree = FALSE;
+        fSwitchTreeOnFocus = FALSE;
+        fSwitchTreeExpand = FALSE;
+        fCollapseFirst = FALSE;
+        fFollowTree = FALSE;
+        fNoSearch = TRUE;
       }
       fAutoTile = TRUE;
@@ -3358 +3362 @@
       fUserListSwitches = TRUE;
       WinSendMsg((HWND) WinQueryWindowULong(hwnd, QWL_USER), UM_UNDO, MPVOID,
-                 MPVOID);
+                 MPVOID);
       if (hwndTree) {
 
-        CNRINFO cnri;
-        ULONG flWindowAttr = CV_TREE | CV_ICON | CV_FLOW | CA_TREELINE;
-
-        memset(&cnri, 0, sizeof(cnri));
-        cnri.cb = sizeof(cnri);
-        WinSendMsg(WinWindowFromID(WinWindowFromID(hwndTree, FID_CLIENT),
-                                   TREE_CNR),
-                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
-        cnri.flWindowAttr = flWindowAttr;
-        WinSendMsg(WinWindowFromID(WinWindowFromID(hwndTree, FID_CLIENT),
-                                   TREE_CNR),
-                   CM_SETCNRINFO,
-                   MPFROMP(&cnri), MPFROMLONG(CMA_FLWINDOWATTR));
+        CNRINFO cnri;
+        ULONG flWindowAttr = CV_TREE | CV_ICON | CV_FLOW | CA_TREELINE;
+
+        memset(&cnri, 0, sizeof(cnri));
+        cnri.cb = sizeof(cnri);
+        WinSendMsg(WinWindowFromID(WinWindowFromID(hwndTree, FID_CLIENT),
+                                   TREE_CNR),
+                   CM_QUERYCNRINFO, MPFROMP(&cnri), MPFROMLONG(sizeof(cnri)));
+        cnri.flWindowAttr = flWindowAttr;
+        WinSendMsg(WinWindowFromID(WinWindowFromID(hwndTree, FID_CLIENT),
+                                   TREE_CNR),
+                   CM_SETCNRINFO,
+                   MPFROMP(&cnri), MPFROMLONG(CMA_FLWINDOWATTR));
       }
       if (hwndMain) {
-        if (fAutoView)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_AUTOVIEW, 0), MPVOID);
-        if (fUserComboBox)
-          WinSendMsg(hwndMain, WM_COMMAND,
-                     MPFROM2SHORT(IDM_USERLIST, 0), MPVOID);
-        {
-          SWP swp;
-
-          if (WinQueryWindowPos(hwndMain, &swp)) {
-            WinSetWindowPos(hwndTree, HWND_TOP, 0, 0,
-                            swp.cx / 5, swp.cy, SWP_MOVE | SWP_SIZE);
-          }
-        }
-        PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2L));
-        PostMsg(MainObjectHwnd, UM_SETDIR, MPVOID, MPVOID);
+        if (fAutoView)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_AUTOVIEW, 0), MPVOID);
+        if (fUserComboBox)
+          WinSendMsg(hwndMain, WM_COMMAND,
+                     MPFROM2SHORT(IDM_USERLIST, 0), MPVOID);
+        {
+          SWP swp;
+
+          if (WinQueryWindowPos(hwndMain, &swp)) {
+            WinSetWindowPos(hwndTree, HWND_TOP, 0, 0,
+                            swp.cx / 5, swp.cy, SWP_MOVE | SWP_SIZE);
+          }
+        }
+        PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2L));
+        PostMsg(MainObjectHwnd, UM_SETDIR, MPVOID, MPVOID);
       }
       return 0;
@@ -3407 +3411 @@
     // Save new details settings and refresh windows
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsLongname",
-                        &dsDirCnrDefault.detailslongname, sizeof(BOOL));
+                        &dsDirCnrDefault.detailslongname, sizeof(BOOL));
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsSubject",
-                        &dsDirCnrDefault.detailssubject, sizeof(BOOL));
+                        &dsDirCnrDefault.detailssubject, sizeof(BOOL));
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsEA",
-                        &dsDirCnrDefault.detailsea, sizeof(BOOL));
+                        &dsDirCnrDefault.detailsea, sizeof(BOOL));
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsSize",
-                        &dsDirCnrDefault.detailssize, sizeof(BOOL));
+                        &dsDirCnrDefault.detailssize, sizeof(BOOL));
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsIcon",
-                        &dsDirCnrDefault.detailsicon, sizeof(BOOL));
+                        &dsDirCnrDefault.detailsicon, sizeof(BOOL));
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsLWDate",
-                        &dsDirCnrDefault.detailslwdate, sizeof(BOOL));
+                        &dsDirCnrDefault.detailslwdate, sizeof(BOOL));
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsLWTime",
-                        &dsDirCnrDefault.detailslwtime, sizeof(BOOL));
+                        &dsDirCnrDefault.detailslwtime, sizeof(BOOL));
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsLADate",
-                        &dsDirCnrDefault.detailsladate, sizeof(BOOL));
+                        &dsDirCnrDefault.detailsladate, sizeof(BOOL));
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsLATime",
-                        &dsDirCnrDefault.detailslatime, sizeof(BOOL));
+                        &dsDirCnrDefault.detailslatime, sizeof(BOOL));
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsCRDate",
-                        &dsDirCnrDefault.detailscrdate, sizeof(BOOL));
+                        &dsDirCnrDefault.detailscrdate, sizeof(BOOL));
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsCRTime",
-                        &dsDirCnrDefault.detailscrtime, sizeof(BOOL));
+                        &dsDirCnrDefault.detailscrtime, sizeof(BOOL));
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsAttr",
-                        &dsDirCnrDefault.detailsattr, sizeof(BOOL));
+                        &dsDirCnrDefault.detailsattr, sizeof(BOOL));
     if (hwndMain) {
       // Save state and restore to refresh windows with new settings
       if (SaveDirCnrState(hwndMain, GetPString(IDS_FM2TEMPTEXT)) > 0) {
-        // Tell window procedure to close container windows
-        PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2));
-        // Restore saved state
-        PostMsg(MainObjectHwnd, UM_RESTORE, GetPString(IDS_FM2TEMPTEXT), MPVOID);
+        // Tell window procedure to close container windows
+        PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2));
+        // Restore saved state
+        PostMsg(MainObjectHwnd, UM_RESTORE, GetPString(IDS_FM2TEMPTEXT), MPVOID);
       }
     }
     WinSendMsg((HWND) WinQueryWindowULong(hwnd, QWL_USER),
-               UM_UNDO, MPVOID, MPVOID);
+               UM_UNDO, MPVOID, MPVOID);
     return 0;
 
@@ -3475 +3479 @@
   { IDM_BUBBLESSETTINGS, CFGB_FRAME, IDS_NOTEBUBBLE1TEXT, CfgBDlgProc, 0, 0, 0 },
   { IDM_QUICKSETTINGS, CFG9_FRAME, IDS_NOTEQUICK1TEXT, Cfg9DlgProc, 0, 0, 0 },
-  { 0, 0, 0, NULL, 0, 0, 0 }    // usFrameId 0 is end marker
+  { 0, 0, 0, NULL, 0, 0, 0 }    // usFrameId 0 is end marker
 };
 
@@ -3513 +3517 @@
       hwndTemp = WinQueryWindow(hwnd, QW_OWNER);
       if (hwndTemp != HWND_DESKTOP) {
-        HWND hwndMenu;
-        // Owner is frame if not applet
-        hwndMenu = WinWindowFromID(hwndTemp, FID_MENU);
-        if (hwndMenu == NULLHANDLE)
-          Runtime_Error(pszSrcFile, __LINE__, "FID_MENU");
-        else {
-          MENUITEM mi;
-          BOOL ok;
-          memset(&mi, 0, sizeof(mi));
-          ok = (BOOL)WinSendMsg(hwndMenu,
-                                MM_QUERYITEM,
-                                MPFROM2SHORT(IDM_NOTEBOOKSUBMENU, TRUE),
-                                MPFROMP(&mi));
-          if (!ok)
-            Runtime_Error(pszSrcFile, __LINE__, "IDM_NOTEBOOKSUBMENU");
-          else {
-            mp2 = WinSendMsg(mi.hwndSubMenu, MM_QUERYDEFAULTITEMID, MPVOID, MPVOID);
-            if (!mp2)
-              Runtime_Error(pszSrcFile, __LINE__, "MM_QUERYDEFAULTITEMID");
-          }
-        }
+        HWND hwndMenu;
+        // Owner is frame if not applet
+        hwndMenu = WinWindowFromID(hwndTemp, FID_MENU);
+        if (hwndMenu == NULLHANDLE)
+          Runtime_Error(pszSrcFile, __LINE__, "FID_MENU");
+        else {
+          MENUITEM mi;
+          BOOL ok;
+          memset(&mi, 0, sizeof(mi));
+          ok = (BOOL)WinSendMsg(hwndMenu,
+                                MM_QUERYITEM,
+                                MPFROM2SHORT(IDM_NOTEBOOKSUBMENU, TRUE),
+                                MPFROMP(&mi));
+          if (!ok)
+            Runtime_Error(pszSrcFile, __LINE__, "IDM_NOTEBOOKSUBMENU");
+          else {
+            mp2 = WinSendMsg(mi.hwndSubMenu, MM_QUERYDEFAULTITEMID, MPVOID, MPVOID);
+            if (!mp2)
+              Runtime_Error(pszSrcFile, __LINE__, "MM_QUERYDEFAULTITEMID");
+          }
+        }
       }
     }
@@ -3539 +3543 @@
     PostMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
     WinSendDlgItemMsg(hwnd,
-                      CFG_NOTEBOOK,
-                      BKM_SETDIMENSIONS,
-                      MPFROM2SHORT(82, 24), MPFROMLONG(BKA_MAJORTAB));
+                      CFG_NOTEBOOK,
+                      BKM_SETDIMENSIONS,
+                      MPFROM2SHORT(82, 24), MPFROMLONG(BKA_MAJORTAB));
     WinSendDlgItemMsg(hwnd,
-                      CFG_NOTEBOOK,
-                      BKM_SETDIMENSIONS,
-                      MPFROM2SHORT(20, 20), MPFROMLONG(BKA_PAGEBUTTON));
+                      CFG_NOTEBOOK,
+                      BKM_SETDIMENSIONS,
+                      MPFROM2SHORT(20, 20), MPFROMLONG(BKA_PAGEBUTTON));
     WinSendDlgItemMsg(hwnd,
-                      CFG_NOTEBOOK,
-                      BKM_SETDIMENSIONS,
-                      MPFROM2SHORT(0, 0), MPFROMLONG(BKA_MINORTAB));
+                      CFG_NOTEBOOK,
+                      BKM_SETDIMENSIONS,
+                      MPFROM2SHORT(0, 0), MPFROMLONG(BKA_MINORTAB));
 
     // Build and insert notebook pages
     for (x = 0; np[x].usFrameId; x++) {
       hwndTemp = WinLoadDlg(HWND_DESKTOP,
-                            HWND_DESKTOP,
-                            np[x].pfnPageProc, FM3ModHandle, np[x].usFrameId, MPVOID);
+                            HWND_DESKTOP,
+                            np[x].pfnPageProc, FM3ModHandle, np[x].usFrameId, MPVOID);
       if (!hwndTemp) {
-        Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
-                  "Can not load settings page %u", x);
+        Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                  "Can not load settings page %u", x);
       }
       else {
-        WinSetWindowULong(hwndTemp, QWL_USER, (ULONG)hwnd);
-        np[x].hwnd = hwndTemp;
-        np[x].ulPageId = (ULONG)WinSendDlgItemMsg(hwnd,
-                                                CFG_NOTEBOOK,
-                                                BKM_INSERTPAGE,
-                                                MPFROMLONG(BKA_FIRST),
-                                                MPFROM2SHORT(BKA_AUTOPAGESIZE |
-                                                             BKA_STATUSTEXTON |
-                                                             BKA_MAJOR, attrib));
-        attrib = BKA_LAST;
-        WinSendDlgItemMsg(hwnd,
-                          CFG_NOTEBOOK,
-                          BKM_SETPAGEWINDOWHWND,
-                          MPFROMLONG(np[x].ulPageId), MPFROMLONG(np[x].hwnd));
-        WinSendDlgItemMsg(hwnd,
-                          CFG_NOTEBOOK,
-                          BKM_SETTABTEXT,
-                          MPFROMLONG(np[x].ulPageId),
-                          MPFROMP(GetPString(np[x].ulTitle)));
-        WinSendDlgItemMsg(hwnd,
-                          CFG_NOTEBOOK,
-                          BKM_SETSTATUSLINETEXT,
-                          MPFROMLONG(np[x].ulPageId),
-                          MPFROMP(GetPString(np[x].ulTitle + 1)));
-
-        if (LONGFROMMP(mp2) == np[x].usMenuId)
-          uPageIndex = x;               // Remember selected page
+        WinSetWindowULong(hwndTemp, QWL_USER, (ULONG)hwnd);
+        np[x].hwnd = hwndTemp;
+        np[x].ulPageId = (ULONG)WinSendDlgItemMsg(hwnd,
+                                                CFG_NOTEBOOK,
+                                                BKM_INSERTPAGE,
+                                                MPFROMLONG(BKA_FIRST),
+                                                MPFROM2SHORT(BKA_AUTOPAGESIZE |
+                                                             BKA_STATUSTEXTON |
+                                                             BKA_MAJOR, attrib));
+        attrib = BKA_LAST;
+        WinSendDlgItemMsg(hwnd,
+                          CFG_NOTEBOOK,
+                          BKM_SETPAGEWINDOWHWND,
+                          MPFROMLONG(np[x].ulPageId), MPFROMLONG(np[x].hwnd));
+        WinSendDlgItemMsg(hwnd,
+                          CFG_NOTEBOOK,
+                          BKM_SETTABTEXT,
+                          MPFROMLONG(np[x].ulPageId),
+                          MPFROMP(GetPString(np[x].ulTitle)));
+        WinSendDlgItemMsg(hwnd,
+                          CFG_NOTEBOOK,
+                          BKM_SETSTATUSLINETEXT,
+                          MPFROMLONG(np[x].ulPageId),
+                          MPFROMP(GetPString(np[x].ulTitle + 1)));
+
+        if (LONGFROMMP(mp2) == np[x].usMenuId)
+          uPageIndex = x;               // Remember selected page
       }
     } // for pages
@@ -3596 +3600 @@
     // 15 Feb 08 SHL fixme to do just once?
     if (mp2 == MPFROMLONG(IDM_QUICKSETTINGS) &&
-        x-- > 0 &&
-        np[x].hwnd &&
-        np[x].usFrameId == CFG9_FRAME)
+        x-- > 0 &&
+        np[x].hwnd &&
+        np[x].usFrameId == CFG9_FRAME)
     {
       // 10 Jan 08 SHL fixme to document what UM_SETDIR 1 means
       //PostMsg(MainObjectHwnd, UM_SETDIR, MPFROMLONG(1), MPVOID);
       PostMsg(WinWindowFromID(hwnd, CFG_NOTEBOOK),
-              BKM_TURNTOPAGE, MPFROMLONG(np[x].ulPageId), MPVOID);
+              BKM_TURNTOPAGE, MPFROMLONG(np[x].ulPageId), MPVOID);
       PostMsg(hwnd, UM_FOCUSME, MPFROMLONG(np[x].hwnd), MPVOID);
       PostMsg(np[x].hwnd, WM_COMMAND, MPFROM2SHORT(IDM_HELP, 0), MPVOID);
@@ -3609 +3613 @@
     else if (uPageIndex >= x) {
       Runtime_Error(pszSrcFile, __LINE__, "uPageIndex corrupted (%u)",
-                    uPageIndex);
+                    uPageIndex);
       uPageIndex = 0;
     }
     PostMsg(WinWindowFromID(hwnd, CFG_NOTEBOOK),
-            BKM_TURNTOPAGE, MPFROMLONG(np[uPageIndex].ulPageId), MPVOID);
+            BKM_TURNTOPAGE, MPFROMLONG(np[uPageIndex].ulPageId), MPVOID);
     // 15 Feb 08 SHL fixme to put focus on first field of page
 
@@ -3664 +3668 @@
       SaveLastPageIndex(hwnd);
       ulPageId = (ULONG) WinSendDlgItemMsg(hwnd,
-                                         CFG_NOTEBOOK,
-                                         BKM_QUERYPAGEID,
-                                         MPFROMLONG(0),
-                                         MPFROM2SHORT(BKA_TOP, 0));
+                                         CFG_NOTEBOOK,
+                                         BKM_QUERYPAGEID,
+                                         MPFROMLONG(0),
+                                         MPFROM2SHORT(BKA_TOP, 0));
       hwndTemp = (HWND) WinSendDlgItemMsg(hwnd,
-                                          CFG_NOTEBOOK,
-                                          BKM_QUERYPAGEWINDOWHWND,
-                                          MPFROMLONG(ulPageId), MPVOID);
+                                          CFG_NOTEBOOK,
+                                          BKM_QUERYPAGEWINDOWHWND,
+                                          MPFROMLONG(ulPageId), MPVOID);
       if (hwndTemp)
-        WinSendMsg(hwndTemp, UM_UNDO, MPVOID, MPVOID);
+        WinSendMsg(hwndTemp, UM_UNDO, MPVOID, MPVOID);
 
       WinDismissDlg(hwnd, 0);
       break;
 
-    case IDM_HELP:                      /* relay message to appropriate page's window */
+    case IDM_HELP:                      /* relay message to appropriate page's window */
       ulPageId = (ULONG) WinSendDlgItemMsg(hwnd,
-                                         CFG_NOTEBOOK,
-                                         BKM_QUERYPAGEID,
-                                         MPFROMLONG(0),
-                                         MPFROM2SHORT(BKA_TOP, 0));
+                                         CFG_NOTEBOOK,
+                                         BKM_QUERYPAGEID,
+                                         MPFROMLONG(0),
+                                         MPFROM2SHORT(BKA_TOP, 0));
       hwndTemp = (HWND) WinSendDlgItemMsg(hwnd,
-                                          CFG_NOTEBOOK,
-                                          BKM_QUERYPAGEWINDOWHWND,
-                                          MPFROMLONG(ulPageId), MPVOID);
+                                          CFG_NOTEBOOK,
+                                          BKM_QUERYPAGEWINDOWHWND,
+                                          MPFROMLONG(ulPageId), MPVOID);
       if (hwndTemp)
-        PostMsg(hwndTemp, WM_COMMAND, MPFROM2SHORT(IDM_HELP, 0), MPVOID);
+        PostMsg(hwndTemp, WM_COMMAND, MPFROM2SHORT(IDM_HELP, 0), MPVOID);
       break;
     }
@@ -3697 +3701 @@
     for (x = 0; np[x].usFrameId; x++) {
       if (np[x].hwnd)
-        WinSendMsg(np[x].hwnd, UM_UNDO, MPVOID, MPVOID);
+        WinSendMsg(np[x].hwnd, UM_UNDO, MPVOID, MPVOID);
     }
     break;
@@ -3704 +3708 @@
     if (np[0].usFrameId) {
       for (x = 1; np[x].usFrameId; x++) {
-        if (np[x].hwnd) {
-          WinSendMsg(np[x].hwnd, WM_CLOSE, MPVOID, MPVOID);
-          np[x].hwnd = (HWND) 0;
-          np[x].ulPageId = 0;
-        }
+        if (np[x].hwnd) {
+          WinSendMsg(np[x].hwnd, WM_CLOSE, MPVOID, MPVOID);
+          np[x].hwnd = (HWND) 0;
+          np[x].ulPageId = 0;
+        }
       }
       WinSendMsg(np[0].hwnd, WM_CLOSE, MPVOID, MPVOID);
@@ -3735 +3739 @@
   PrfQueryProfileData(fmprof, appname, pszIK_LastSettingsPage, &uPageIndex, &ulSize);
   for (x = 0; x < uPageIndex && np[x].usFrameId; x++)
-    ;                                   // Search
+    ;                                   // Search
   if (np[x].usMenuId)
     SetConditionalCascade(hwndMenu, IDM_NOTEBOOKSUBMENU, np[uPageIndex].usMenuId);
@@ -3741 +3745 @@
   if (fIsLite) {
     WinSendMsg(hwndMenu,
-               MM_DELETEITEM,
-               MPFROM2SHORT(IDM_QUICKSETTINGS, FALSE), MPVOID);
+               MM_DELETEITEM,
+               MPFROM2SHORT(IDM_QUICKSETTINGS, FALSE), MPVOID);
     // If fm/2 lite drop quick setting page
     for (x = 0; np[x].usFrameId && np[x].usFrameId != CFG9_FRAME; x++)
@@ -3761 +3765 @@
   if (hwndOwner != HWND_DESKTOP) {
     ulPageId = (ULONG)WinSendDlgItemMsg(hwnd,
-                                       CFG_NOTEBOOK,
-                                       BKM_QUERYPAGEID,
-                                       MPFROMLONG(0),
-                                       MPFROM2SHORT(BKA_TOP, 0));
+                                       CFG_NOTEBOOK,
+                                       BKM_QUERYPAGEID,
+                                       MPFROMLONG(0),
+                                       MPFROM2SHORT(BKA_TOP, 0));
     if (!ulPageId)
       Runtime_Error(pszSrcFile, __LINE__, "BKM_QUERYPAGEID");
     else {
       for (x = 0; np[x].usMenuId && np[x].ulPageId != ulPageId; x++)
-        ; // Scan
+        ; // Scan
       if (!np[x].usMenuId)
-        Runtime_Error(pszSrcFile, __LINE__, "bad menu id %lu", ulPageId);
+        Runtime_Error(pszSrcFile, __LINE__, "bad menu id %lu", ulPageId);
       else {
-        PrfWriteProfileData(fmprof, FM3Str, pszIK_LastSettingsPage,
-                            (PVOID)&x, sizeof(x));
-        hwndMenu = WinWindowFromID(hwndOwner, FID_MENU);
-        SetConditionalCascade(hwndMenu, IDM_NOTEBOOKSUBMENU, np[x].usMenuId);
+        PrfWriteProfileData(fmprof, FM3Str, pszIK_LastSettingsPage,
+                            (PVOID)&x, sizeof(x));
+        hwndMenu = WinWindowFromID(hwndOwner, FID_MENU);
+        SetConditionalCascade(hwndMenu, IDM_NOTEBOOKSUBMENU, np[x].usMenuId);
       }
     }

trunk/dll/pathutil.c

@@ -23 +23 @@
 
 #include "pathutil.h"
+#include "strips.h"                     // remove_first_occurence_of_character
 #include "fm3dll.h"                     // needs_quoting
 #include "fm3str.h"
@@ -64 +65 @@
 {
   UINT c = pszPathName ? strlen(pszPathName) : 0;
-  BOOL q = needs_quoting(pszPathName) ||
-           needs_quoting(pszFileName);
+  BOOL q = needs_quoting(pszPathName) || needs_quoting(pszFileName);
   PSZ psz = pszFullPathName;
 

trunk/dll/sortcnr.c

@@ -21 +21 @@
 
 #include "fm3dll.h"
+#include "sortcnr.h"
+#include "valid.h"                      // TestCDates
+
+static SHORT SortCnr(PMINIRECORDCORE p1, PMINIRECORDCORE p2, INT Sortflags);
 
 SHORT APIENTRY SortTreeCnr(PMINIRECORDCORE p1, PMINIRECORDCORE p2,
-                           PVOID pStorage)
+                           PVOID pStorage)
 {
   return SortCnr(p1, p2, ((pStorage) ? (INT) pStorage : TreesortFlags));
@@ -29 +33 @@
 
 SHORT APIENTRY SortDirCnr(PMINIRECORDCORE p1, PMINIRECORDCORE p2,
-                          PVOID pStorage)
+                          PVOID pStorage)
 {
   DIRCNRDATA *dcd = WinQueryWindowPtr(((PCNRITEM) p1)->hwndCnr, QWL_USER);
 
   return SortCnr(p1, p2, ((pStorage) ? (INT) pStorage :
-                          (dcd && dcd->size == sizeof(DIRCNRDATA)) ?
-                          dcd->sortFlags : sortFlags));
+                          (dcd && dcd->size == sizeof(DIRCNRDATA)) ?
+                          dcd->sortFlags : sortFlags));
 }
 
 SHORT APIENTRY SortCollectorCnr(PMINIRECORDCORE p1, PMINIRECORDCORE p2,
-                                PVOID pStorage)
+                                PVOID pStorage)
 {
   return SortCnr(p1, p2, ((pStorage) ? (INT) pStorage : CollectorsortFlags));
@@ -56 +60 @@
     if (SortFlags & SORT_DIRSFIRST) {
       if ((pCI1->attrFile & FILE_DIRECTORY) !=
-          (pCI2->attrFile & FILE_DIRECTORY))
-        return (pCI1->attrFile & FILE_DIRECTORY) ? -1 : 1;
+          (pCI2->attrFile & FILE_DIRECTORY))
+        return (pCI1->attrFile & FILE_DIRECTORY) ? -1 : 1;
     }
     else if (SortFlags & SORT_DIRSLAST) {
       if ((pCI1->attrFile & FILE_DIRECTORY) !=
-          (pCI2->attrFile & FILE_DIRECTORY))
-        return (pCI1->attrFile & FILE_DIRECTORY) ? 1 : -1;
+          (pCI2->attrFile & FILE_DIRECTORY))
+        return (pCI1->attrFile & FILE_DIRECTORY) ? 1 : -1;
     }
     switch (SortFlags & (~(SORT_DIRSFIRST | SORT_DIRSLAST | SORT_REVERSE))) {
     case SORT_SUBJECT:
       if (*pCI1->pszSubject && *pCI2->pszSubject)
-        ret = stricmp(pCI1->pszSubject, pCI2->pszSubject);
+        ret = stricmp(pCI1->pszSubject, pCI2->pszSubject);
       else {
-        ret = (*pCI2->pszSubject) ? 1 : (*pCI1->pszSubject) ? -1 : 0;
-        if (ret && (SortFlags & SORT_REVERSE))
-          ret = (ret > 0) ? -1 : 1;
+        ret = (*pCI2->pszSubject) ? 1 : (*pCI1->pszSubject) ? -1 : 0;
+        if (ret && (SortFlags & SORT_REVERSE))
+          ret = (ret > 0) ? -1 : 1;
       }
       break;
@@ -79 +83 @@
       pch2 = strrchr(pCI2->pszFileName, '\\');
       if (!pch1)
-        pch1 = NullStr;
-      if (!pch2)
-        pch2 = NullStr;
+        pch1 = NullStr;
+      if (!pch2)
+        pch2 = NullStr;
       ret = stricmp(pch1, pch2);
       break;
@@ -89 +93 @@
       pch2 = strrchr(pCI2->pszFileName, '\\');
       if (!pch1)
-        pch1 = pCI1->pszFileName;
-      if (!pch2)
-        pch2 = pCI2->pszFileName;
+        pch1 = pCI1->pszFileName;
+      if (!pch2)
+        pch2 = pCI2->pszFileName;
       pch1 = strchr(pch1, '.');
       pch2 = strchr(pch2, '.');
       if (!pch1)
-        pch1 = NullStr;
-      if (!pch2)
-        pch2 = NullStr;
+        pch1 = NullStr;
+      if (!pch2)
+        pch2 = NullStr;
       ret = stricmp(pch1, pch2);
       break;
@@ -105 +109 @@
       pch2 = strrchr(pCI2->pszFileName, '\\');
       if (!pch1)
-        pch1 = pCI1->pszFileName;
-      if (!pch2)
-        pch2 = pCI2->pszFileName;
+        pch1 = pCI1->pszFileName;
+      if (!pch2)
+        pch2 = pCI2->pszFileName;
       pch1 = strrchr(pch1, '.');
       pch2 = strrchr(pch2, '.');
       if (!pch1)
-        pch1 = NullStr;
-      if (!pch2)
-        pch2 = NullStr;
+        pch1 = NullStr;
+      if (!pch2)
+        pch2 = NullStr;
       ret = stricmp(pch1, pch2);
       break;
@@ -119 +123 @@
     case SORT_SIZE:
       ret =
-        (pCI1->cbFile < pCI2->cbFile) ? 1 : (pCI1->cbFile ==
-                                             pCI2->cbFile) ? 0 : -1;
+        (pCI1->cbFile < pCI2->cbFile) ? 1 : (pCI1->cbFile ==
+                                             pCI2->cbFile) ? 0 : -1;
       if (!ret)
-        ret =
-          (pCI1->easize < pCI2->easize) ? 1 : (pCI1->easize ==
-                                               pCI2->easize) ? 0 : -1;
+        ret =
+          (pCI1->easize < pCI2->easize) ? 1 : (pCI1->easize ==
+                                               pCI2->easize) ? 0 : -1;
       break;
 
     case SORT_EASIZE:
       ret =
-        (pCI1->easize < pCI2->easize) ? 1 : (pCI1->easize ==
-                                             pCI2->easize) ? 0 : -1;
+        (pCI1->easize < pCI2->easize) ? 1 : (pCI1->easize ==
+                                             pCI2->easize) ? 0 : -1;
       if (!ret)
-        ret =
-          (pCI1->cbFile < pCI2->cbFile) ? 1 : (pCI1->cbFile ==
-                                               pCI2->cbFile) ? 0 : -1;
+        ret =
+          (pCI1->cbFile < pCI2->cbFile) ? 1 : (pCI1->cbFile ==
+                                               pCI2->cbFile) ? 0 : -1;
       break;
 
@@ -141 +145 @@
                         &pCI2->date, &pCI2->time);
         /*(pCI1->date.year < pCI2->date.year) ? 1 :
-        (pCI1->date.year > pCI2->date.year) ? -1 :
-        (pCI1->date.month < pCI2->date.month) ? 1 :
-        (pCI1->date.month > pCI2->date.month) ? -1 :
-        (pCI1->date.day < pCI2->date.day) ? 1 :
-        (pCI1->date.day > pCI2->date.day) ? -1 :
-        (pCI1->time.hours < pCI2->time.hours) ? 1 :
-        (pCI1->time.hours > pCI2->time.hours) ? -1 :
-        (pCI1->time.minutes < pCI2->time.minutes) ? 1 :
-        (pCI1->time.minutes > pCI2->time.minutes) ? -1 :
-        (pCI1->time.seconds < pCI2->time.seconds) ? 1 :
-        (pCI1->time.seconds > pCI2->time.seconds) ? -1 : 0;*/
+        (pCI1->date.year > pCI2->date.year) ? -1 :
+        (pCI1->date.month < pCI2->date.month) ? 1 :
+        (pCI1->date.month > pCI2->date.month) ? -1 :
+        (pCI1->date.day < pCI2->date.day) ? 1 :
+        (pCI1->date.day > pCI2->date.day) ? -1 :
+        (pCI1->time.hours < pCI2->time.hours) ? 1 :
+        (pCI1->time.hours > pCI2->time.hours) ? -1 :
+        (pCI1->time.minutes < pCI2->time.minutes) ? 1 :
+        (pCI1->time.minutes > pCI2->time.minutes) ? -1 :
+        (pCI1->time.seconds < pCI2->time.seconds) ? 1 :
+        (pCI1->time.seconds > pCI2->time.seconds) ? -1 : 0;*/
       break;
 
@@ -158 +162 @@
                        &pCI2->ladate, &pCI2->latime);
         /*(pCI1->ladate.year < pCI2->ladate.year) ? 1 :
-        (pCI1->ladate.year > pCI2->ladate.year) ? -1 :
-        (pCI1->ladate.month < pCI2->ladate.month) ? 1 :
-        (pCI1->ladate.month > pCI2->ladate.month) ? -1 :
-        (pCI1->ladate.day < pCI2->ladate.day) ? 1 :
-        (pCI1->ladate.day > pCI2->ladate.day) ? -1 :
-        (pCI1->latime.hours < pCI2->latime.hours) ? 1 :
-        (pCI1->latime.hours > pCI2->latime.hours) ? -1 :
-        (pCI1->latime.minutes < pCI2->latime.minutes) ? 1 :
-        (pCI1->latime.minutes > pCI2->latime.minutes) ? -1 :
-        (pCI1->latime.seconds < pCI2->latime.seconds) ? 1 :
-        (pCI1->latime.seconds > pCI2->latime.seconds) ? -1 : 0;*/
+        (pCI1->ladate.year > pCI2->ladate.year) ? -1 :
+        (pCI1->ladate.month < pCI2->ladate.month) ? 1 :
+        (pCI1->ladate.month > pCI2->ladate.month) ? -1 :
+        (pCI1->ladate.day < pCI2->ladate.day) ? 1 :
+        (pCI1->ladate.day > pCI2->ladate.day) ? -1 :
+        (pCI1->latime.hours < pCI2->latime.hours) ? 1 :
+        (pCI1->latime.hours > pCI2->latime.hours) ? -1 :
+        (pCI1->latime.minutes < pCI2->latime.minutes) ? 1 :
+        (pCI1->latime.minutes > pCI2->latime.minutes) ? -1 :
+        (pCI1->latime.seconds < pCI2->latime.seconds) ? 1 :
+        (pCI1->latime.seconds > pCI2->latime.seconds) ? -1 : 0;*/
       break;
 
@@ -175 +179 @@
                        &pCI2->crdate, &pCI2->crtime);
         /*(pCI1->crdate.year < pCI2->crdate.year) ? 1 :
-        (pCI1->crdate.year > pCI2->crdate.year) ? -1 :
-        (pCI1->crdate.month < pCI2->crdate.month) ? 1 :
-        (pCI1->crdate.month > pCI2->crdate.month) ? -1 :
-        (pCI1->crdate.day < pCI2->crdate.day) ? 1 :
-        (pCI1->crdate.day > pCI2->crdate.day) ? -1 :
-        (pCI1->crtime.hours < pCI2->crtime.hours) ? 1 :
-        (pCI1->crtime.hours > pCI2->crtime.hours) ? -1 :
-        (pCI1->crtime.minutes < pCI2->crtime.minutes) ? 1 :
-        (pCI1->crtime.minutes > pCI2->crtime.minutes) ? -1 :
-        (pCI1->crtime.seconds < pCI2->crtime.seconds) ? 1 :
-        (pCI1->crtime.seconds > pCI2->crtime.seconds) ? -1 : 0;*/
+        (pCI1->crdate.year > pCI2->crdate.year) ? -1 :
+        (pCI1->crdate.month < pCI2->crdate.month) ? 1 :
+        (pCI1->crdate.month > pCI2->crdate.month) ? -1 :
+        (pCI1->crdate.day < pCI2->crdate.day) ? 1 :
+        (pCI1->crdate.day > pCI2->crdate.day) ? -1 :
+        (pCI1->crtime.hours < pCI2->crtime.hours) ? 1 :
+        (pCI1->crtime.hours > pCI2->crtime.hours) ? -1 :
+        (pCI1->crtime.minutes < pCI2->crtime.minutes) ? 1 :
+        (pCI1->crtime.minutes > pCI2->crtime.minutes) ? -1 :
+        (pCI1->crtime.seconds < pCI2->crtime.seconds) ? 1 :
+        (pCI1->crtime.seconds > pCI2->crtime.seconds) ? -1 : 0;*/
       break;
     }

trunk/dll/srchpath.c

@@ -25 +25 @@
 #include "pathutil.h"                   // BldQuotedFileName
 #include "errutil.h"                    // Dos_Error...
+#include "srchpath.h"
 #include "fm3dll.h"
 

trunk/dll/undel.c

@@ -33 +33 @@
 #include "strutil.h"                    // GetPString
 #include "pathutil.h"                   // BldFullPathName
+#include "walkem.h"                     // FillPathListBox
 #include "fm3dll.h"
 #include "fortify.h"