Changeset 444 for trunk/dll

Timestamp:

Aug 24, 2006, 6:49:19 AM (19 years ago)

Author:

root

Message:

Don't write garbage to CollectorFilter INI entry
Rework SetMask args
CollectorCnrWndProc: avoid freeing NULL pointer

File:

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

trunk/dll/collect.c

@@ -25 +25 @@
   27 Jul 06 SHL Avoid shutdown hang - pre3 typo
   29 Jul 06 SHL Use xfgets_bstripcr
+  15 Aug 06 SHL Don't write garbage to CollectorFilter INI entry
+  15 Aug 06 SHL Rework SetMask args
+  18 Aug 06 SHL CollectorCnrWndProc: avoid freeing NULL pointer
 
 ***********************************************************************/
@@ -74 +77 @@
   static USHORT lastid = 0;
 
-  switch (msg)
-  {
+  switch (msg) {
   case WM_CREATE:
     return CommonTextProc(hwnd, msg, mp1, mp2);
@@ -85 +87 @@
 
       id = WinQueryWindowUShort(hwnd, QWS_ID);
-      switch (id)
-      {
+      switch (id) {
       case DIR_SELECTED:
       case DIR_VIEW:
@@ -96 +97 @@
           if (hwndButtonPopup)
             WinDestroyWindow(hwndButtonPopup);
-          if (id == lastid)
-          {
+          if (id == lastid) {
             ULONG check;
 
@@ -104 +104 @@
                             &check,
                             sizeof(check));
-            if (check < timestamp + 500)
-            {
+            if (check < timestamp + 500) {
               lastid = 0;
               goto MenuAbort;
@@ -113 +112 @@
                                         FM3ModHandle,
                                         id);
-          if (hwndButtonPopup)
-          {
+          if (hwndButtonPopup) {
             WinSetWindowUShort(hwndButtonPopup,
                                QWS_ID,
@@ -122 +120 @@
                                                     COLLECTOR_CNR),
                                     QWL_USER);
-            if (id == DIR_VIEW)
-            {
-              if (dcd)
-              {
+            if (id == DIR_VIEW) {
+              if (dcd) {
                 SetViewMenu(hwndButtonPopup,
                             dcd -> flWindowAttr);
@@ -140 +136 @@
 
             }
-            else if (id == DIR_SORT)
-            {
+            else if (id == DIR_SORT) {
               if (dcd)
                 SetSortChecks(hwndButtonPopup,
@@ -159 +154 @@
               ptl.y = -(swp.cy + 2);
             }
-            else
-            {
+            else {
               WinQueryWindowPos(hwnd,
                                 &swp);
@@ -199 +193 @@
 
   case WM_MENUEND:
-    if (hwndButtonPopup == (HWND)mp2)
-    {
+    if (hwndButtonPopup == (HWND)mp2) {
       lastid = WinQueryWindowUShort((HWND)mp2, QWS_ID);
       WinDestroyWindow(hwndButtonPopup);
@@ -208 +201 @@
                       &timestamp,
                       sizeof(timestamp));
-      switch (lastid)
-      {
+      switch (lastid) {
       case DIR_SELECTED:
       case DIR_VIEW:
@@ -253 +245 @@
       char *s = NULL;
 
-      if (fOtherHelp)
-      {
+      if (fOtherHelp) {
         if ((!hwndBubble ||
              WinQueryWindowULong(hwndBubble, QWL_USER) != hwnd) &&
             !WinQueryCapture(HWND_DESKTOP))
         {
-          switch (id)
-          {
+          switch (id) {
           case DIR_SELECTED:
             s = GetPString(IDS_COLSELECTEDHELP);
@@ -285 +275 @@
         }
       }
-      switch (id)
-      {
+      switch (id) {
       case DIR_FILTER:
       case DIR_SORT:
@@ -304 +293 @@
 
       id = WinQueryWindowUShort(hwnd, QWS_ID);
-      switch (id)
-      {
+      switch (id) {
       case DIR_FILTER:
       case DIR_SORT:
@@ -321 +309 @@
 
       id = WinQueryWindowUShort(hwnd, QWS_ID);
-      switch (id)
-      {
+      switch (id) {
       case DIR_VIEW:
       case DIR_SORT:
@@ -351 +338 @@
   case DM_DRAGLEAVE:
   case DM_DROPHELP:
-    if (msg == DM_DRAGOVER)
-    {
-      if (!emphasized)
-      {
+    if (msg == DM_DRAGOVER) {
+      if (!emphasized) {
         emphasized = TRUE;
         DrawTargetEmphasis(hwnd, emphasized);
       }
     }
-    else
-    {
-      if (emphasized)
-      {
+    else {
+      if (emphasized) {
         emphasized = FALSE;
         DrawTargetEmphasis(hwnd, emphasized);
@@ -371 +354 @@
       USHORT dcmd;
 
-      switch (msg)
-      {
+      switch (msg) {
       case DM_DROP:
         dcmd = CN_DROP;
@@ -399 +381 @@
                                         MPARAM mp2)
 {
-  switch (msg)
-  {
+  switch (msg) {
   case UM_CONTAINERHWND:
     return MRFROMLONG(WinWindowFromID(hwnd, COLLECTOR_CNR));
@@ -432 +413 @@
 
       hps = WinBeginPaint(hwnd, NULLHANDLE, NULL);
-      if (hps)
-      {
+      if (hps) {
         WinQueryWindowRect(hwnd, &rcl);
         WinFillRect(hps, &rcl, CLR_PALEGRAY);
@@ -444 +424 @@
   case UM_SIZE:
   case WM_SIZE:
-    if (msg == UM_SIZE)
-    {
+    if (msg == UM_SIZE) {
       SWP swp;
 
@@ -496 +475 @@
     }
     CommonTextPaint(hwnd, NULLHANDLE);
-    if (msg == UM_SIZE)
-    {
+    if (msg == UM_SIZE) {
       WinSetWindowPos(WinQueryWindow(hwnd, QW_PARENT), HWND_TOP, 0, 0, 0, 0,
                       SWP_SHOW | SWP_ZORDER | SWP_ACTIVATE);
@@ -519 +497 @@
   DIRCNRDATA *dcd;
 
-  switch (msg)
-  {
+  switch (msg) {
   case WM_CREATE:
     break;
@@ -529 +506 @@
   case DM_DISCARDOBJECT:
     dcd = INSTDATA(hwnd);
-    if (fFM2Deletes && dcd)
-    {
+    if (fFM2Deletes && dcd) {
       LISTINFO *li;
       CNRDRAGINFO cni;
@@ -537 +513 @@
       cni.pDragInfo = (PDRAGINFO) mp1;
       li = DoFileDrop(dcd -> hwndCnr, NULL, FALSE, MPVOID, MPFROMP(&cni));
-      if (li)
-      {
+      if (li) {
         li -> type = (fDefaultDeletePerm) ? IDM_PERMDELETE : IDM_DELETE;
         if (!PostMsg(hwnd, UM_MASSACTION, MPFROMP(li), MPVOID))
@@ -550 +525 @@
   case UM_UPDATERECORDLIST:
     dcd = WinQueryWindowPtr(hwnd, QWL_USER);
-    if (dcd && mp1)
-    {
+    if (dcd && mp1) {
       INT numentries = 0;
       CHAR **list = (CHAR **) mp1;
@@ -564 +538 @@
   case UM_SETUP:
     dcd = WinQueryWindowPtr(hwnd, QWL_USER);
-    if (dcd)
-    {
+    if (dcd) {
       /* set unique id */
       WinSetWindowUShort(hwnd,
@@ -579 +552 @@
 
   case UM_COMMAND:
-    if (mp1)
-    {
+    if (mp1) {
       LISTINFO *li = (LISTINFO *) mp1;
 
-      switch (li -> type)
-      {
+      switch (li -> type) {
       case IDM_DOITYOURSELF:
       case IDM_APPENDTOCLIP:
@@ -621 +592 @@
     DosError(FERR_DISABLEHARDERR);
     dcd = WinQueryWindowPtr(hwnd, QWL_USER);
-    if (dcd)
-    {
+    if (dcd) {
       LISTINFO *li = (LISTINFO *) mp1;
       INT x;
@@ -650 +620 @@
         else {
           pciFirst = pci;
-          for (x = 0; li -> list[x]; x++)
-          {
+          for (x = 0; li -> list[x]; x++) {
             nm = 1L;
             hdir = HDIR_CREATE;
@@ -688 +657 @@
               pci = (PCNRITEM) pci -> rc.preccNextRecord;
             }
-            else
-            {
+            else {
               pciT = pci;
               pci = (PCNRITEM) pci -> rc.preccNextRecord;
@@ -702 +670 @@
             DosSleep(1L);
           }
-          if (ulMaxFiles)
-          {
+          if (ulMaxFiles) {
             memset(&ri, 0, sizeof(RECORDINSERT));
             ri.cb = sizeof(RECORDINSERT);
@@ -741 +708 @@
       FILE *fp;
       ULONG errs = 0L;
+      BOOL first = FALSE;
+      size_t c;
 
       fp = _fsopen((CHAR *) mp1, "r", SH_DENYNO);
       if (fp) {
         while (!feof(fp)) {
-          if (!xfgets_bstripcr(fullname, sizeof(fullname), fp,pszSrcFile, __LINE__))
+          // Avoid too much noise if collecting from binary file - oops
+          if (!fgets(fullname, sizeof(fullname), fp)) {
+            if (ferror(fp))
+              Runtime_Error(pszSrcFile, __LINE__, "fgets");
             break;
-          if (*fullname == '\"') {
-            memmove(fullname, fullname + 1, strlen(fullname) + 1);
-            lstrip(fullname);
-            p = strchr(fullname, '\"');
-            if (p)
-              *p = 0;
-            rstrip(fullname);
-          }
+          }
+
+          c = strlen(fullname);
+          if (c + 1 >= sizeof(fullname))
+            errs++;
+          else if (!c || (fullname[c-1] != '\n' && fullname[c-1] != '\r'))
+            errs++;
           else {
-            p = strchr(fullname, ' ');
-            if (p)
-              *p = 0;
-          }
-          /* fullname now contains name of file to collect */
-          DosError(FERR_DISABLEHARDERR);
-          if (IsFullName(fullname) &&
-              !IsRoot(fullname) &&
-              !DosQueryPathInfo(fullname,
-                                FIL_QUERYEASIZE,
-                                &fs4,
-                                sizeof(fs4)) &&
-              !FindCnrRecord(dcd -> hwndCnr,
-                             fullname,
-                             NULL,
-                             FALSE,
-                             FALSE,
-                             TRUE))
-          {
-            /* collect it */
-            pci = WinSendMsg(dcd -> hwndCnr,
-                             CM_ALLOCRECORD,
-                             MPFROMLONG(EXTRA_RECORD_BYTES),
-                             MPFROMLONG(1L));
-            if (pci)
+            bstripcr(fullname);
+
+            if (*fullname == '\"') {
+              memmove(fullname, fullname + 1, strlen(fullname) + 1);
+              lstrip(fullname);
+              p = strchr(fullname, '\"');
+              if (p)
+                *p = 0;
+              rstrip(fullname);
+            }
+            else {
+              p = strchr(fullname, ' ');
+              if (p)
+                *p = 0;
+            }
+            /* fullname now contains name of file to collect */
+            DosError(FERR_DISABLEHARDERR);
+            if (IsFullName(fullname) &&
+                !IsRoot(fullname) &&
+                !DosQueryPathInfo(fullname,
+                                  FIL_QUERYEASIZE,
+                                  &fs4,
+                                  sizeof(fs4)) &&
+                !FindCnrRecord(dcd -> hwndCnr,
+                               fullname,
+                               NULL,
+                               FALSE,
+                               FALSE,
+                               TRUE))
             {
-              dcd -> ullTotalBytes += FillInRecordFromFSA(dcd -> hwndCnr, pci,
-                                                          fullname,
-                                                          &fs4, FALSE, dcd);
-              memset(&ri, 0, sizeof(RECORDINSERT));
-              ri.cb = sizeof(RECORDINSERT);
-              ri.pRecordOrder = (PRECORDCORE) CMA_END;
-              ri.pRecordParent = (PRECORDCORE) 0;
-              ri.zOrder = (ULONG) CMA_TOP;
-              ri.cRecordsInsert = 1L;
-              ri.fInvalidateRecord = TRUE;
-              WinSendMsg(dcd -> hwndCnr, CM_INSERTRECORD,
-                         MPFROMP(pci), MPFROMP(&ri));
-            }
-          }
-          else
-          {
-            errs++;
-            if (errs > 50L)
-            {                           /* prevent runaway on bad file */
-
-              APIRET ret;
-
-              ret = saymsg(MB_YESNO, dcd -> hwndCnr,
-                           GetPString(IDS_COLLECTNOLISTHDRTEXT),
-                           GetPString(IDS_COLLECTNOLISTTEXT),
-                           (CHAR *) mp1);
-              if (ret == MBID_NO)
-                break;
-              errs = 0L;
-            }
-          }
-        }
+              /* collect it */
+              pci = WinSendMsg(dcd -> hwndCnr,
+                               CM_ALLOCRECORD,
+                               MPFROMLONG(EXTRA_RECORD_BYTES),
+                               MPFROMLONG(1L));
+              if (pci) {
+                dcd -> ullTotalBytes += FillInRecordFromFSA(dcd -> hwndCnr, pci,
+                                                            fullname,
+                                                            &fs4, FALSE, dcd);
+                memset(&ri, 0, sizeof(RECORDINSERT));
+                ri.cb = sizeof(RECORDINSERT);
+                ri.pRecordOrder = (PRECORDCORE) CMA_END;
+                ri.pRecordParent = (PRECORDCORE) 0;
+                ri.zOrder = (ULONG) CMA_TOP;
+                ri.cRecordsInsert = 1L;
+                ri.fInvalidateRecord = TRUE;
+                WinSendMsg(dcd -> hwndCnr, CM_INSERTRECORD,
+                           MPFROMP(pci), MPFROMP(&ri));
+              }
+            }
+            else
+              errs++;
+          }
+          if (errs > (first ? 0 : 50)) {
+            /* prevent runaway on bad file */
+            APIRET ret = saymsg(MB_YESNO, dcd -> hwndCnr,
+                                GetPString(IDS_COLLECTNOLISTHDRTEXT),
+                                GetPString(IDS_COLLECTNOLISTTEXT),
+                                (CHAR *)mp1);
+            if (ret == MBID_NO)
+              break;
+            if (!first)
+              errs = 0;
+            else
+              first = FALSE;
+          }
+        } // while not eof
         fclose(fp);
       }
@@ -822 +802 @@
   case UM_SELECT:
     dcd = WinQueryWindowPtr(hwnd, QWL_USER);
-    if (dcd)
-    {
-      switch (SHORT1FROMMP(mp1))
-      {
+    if (dcd) {
+      switch (SHORT1FROMMP(mp1)) {
       case IDM_SELECTLIST:
         {
@@ -841 +819 @@
             pp = filename;
           p = strrchr(pp, '.');
-          if (p && *(p + 1) && p > pp + 1)
-          {
+          if (p && *(p + 1) && p > pp + 1) {
             if (pp > filename)
               pp++;
@@ -906 +883 @@
 
           list = ListFromClipboard(hwnd);
-          if (list)
-          {
+          if (list) {
             SelectList(dcd -> hwndCnr, TRUE, FALSE,
                        (SHORT1FROMMP(mp1) == IDM_DESELECTCLIP),
@@ -924 +900 @@
 
   case UM_MASSACTION:
-    if (mp1)
-    {
+    if (mp1) {
       dcd = WinQueryWindowPtr(hwnd, QWL_USER);
-      if (dcd)
-      {
-        WORKER *wk;
-
-        wk = xmallocz(sizeof(WORKER),pszSrcFile,__LINE__);
-        if (!wk) {
-          FreeListInfo((LISTINFO *) mp1);
-        }
-        else {
-          wk -> size = sizeof(WORKER);
-          wk -> hwndCnr = dcd -> hwndCnr;
-          wk -> hwndParent = dcd -> hwndParent;
-          wk -> hwndFrame = dcd -> hwndFrame;
-          wk -> hwndClient = dcd -> hwndClient;
-          wk -> li = (LISTINFO *) mp1;
-          strcpy(wk -> directory, dcd -> directory);
-          if (_beginthread(MassAction, NULL, 122880, (PVOID) wk) == -1)
-          {
-            Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            free(wk);
-            FreeListInfo((LISTINFO *) mp1);
-          }
-        }
-      }
-    }
-    return 0;
-
-  case UM_ACTION:
-    if (mp1)
-    {
-      dcd = WinQueryWindowPtr(hwnd, QWL_USER);
-      if (dcd)
-      {
+      if (dcd) {
         WORKER *wk;
 
@@ -973 +916 @@
           wk -> li = (LISTINFO *) mp1;
           strcpy(wk -> directory, dcd -> directory);
-          if (_beginthread(Action, NULL, 122880, (PVOID) wk) == -1)
-          {
-            Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
+          if (_beginthread(MassAction, NULL, 122880, (PVOID) wk) == -1) {
+            Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
+            free(wk);
+            FreeListInfo((LISTINFO *) mp1);
+          }
+        }
+      }
+    }
+    return 0;
+
+  case UM_ACTION:
+    if (mp1) {
+      dcd = WinQueryWindowPtr(hwnd, QWL_USER);
+      if (dcd) {
+        WORKER *wk;
+
+        wk = xmallocz(sizeof(WORKER),pszSrcFile,__LINE__);
+        if (!wk)
+          FreeListInfo((LISTINFO *) mp1);
+        else {
+          wk -> size = sizeof(WORKER);
+          wk -> hwndCnr = dcd -> hwndCnr;
+          wk -> hwndParent = dcd -> hwndParent;
+          wk -> hwndFrame = dcd -> hwndFrame;
+          wk -> hwndClient = dcd -> hwndClient;
+          wk -> li = (LISTINFO *) mp1;
+          strcpy(wk -> directory, dcd -> directory);
+          if (_beginthread(Action, NULL, 122880, (PVOID) wk) == -1) {
+            Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
             free(wk);
             FreeListInfo((LISTINFO *) mp1);
@@ -990 +959 @@
   case WM_DESTROY:
     dcd = WinQueryWindowPtr(hwnd, QWL_USER);
-    if (dcd)
-    {
-      INT x = 0;
-
+    if (dcd) {
+      INT x;
       dcd -> stopflag = 1;
       // Allow rescan logic to quiesce
-      while (x++ < 10 && dcd -> amextracted)
+      for (x = 0; x < 10 && dcd -> amextracted;x++)
         DosSleep(250L);
       WinSendMsg(dcd -> hwndCnr, UM_CLOSE, MPVOID, MPVOID);
@@ -1017 +984 @@
   static INT savedSortFlags;
 
-  switch (msg)
-  {
+  switch (msg) {
   case DM_PRINTOBJECT:
     return MRFROMLONG(DRR_TARGET);
@@ -1032 +998 @@
     if (SHORT1FROMMP(mp1) & KC_KEYUP)
       return (MRESULT) TRUE;
-    if (SHORT1FROMMP(mp1) & KC_VIRTUALKEY)
-    {
-      switch (SHORT2FROMMP(mp2))
-      {
+    if (SHORT1FROMMP(mp1) & KC_VIRTUALKEY) {
+      switch (SHORT2FROMMP(mp2)) {
       case VK_DELETE:
         if ((shiftstate & KC_CTRL) == KC_CTRL)
@@ -1048 +1012 @@
     if (shiftstate || fNoSearch)
       break;
-    if (SHORT1FROMMP(mp1) & KC_CHAR)
-    {
+    if (SHORT1FROMMP(mp1) & KC_CHAR) {
       ULONG thistime, len;
       SEARCHSTRING srch;
@@ -1056 +1019 @@
       if (!dcd)
         break;
-      switch (SHORT1FROMMP(mp2))
-      {
+      switch (SHORT1FROMMP(mp2)) {
       case '\x1b':
       case '\r':
@@ -1073 +1035 @@
       KbdRetry:
         len = strlen(dcd -> szCommonName);
-        if (len >= CCHMAXPATH - 1)
-        {
+        if (len >= CCHMAXPATH - 1) {
           *dcd -> szCommonName = 0;
           len = 0;
@@ -1088 +1049 @@
         pci = WinSendMsg(hwnd, CM_SEARCHSTRING, MPFROMP(&srch),
                          MPFROMLONG(CMA_FIRST));
-        if (pci && (INT) pci != -1)
-        {
+        if (pci && (INT) pci != -1) {
           USHORT attrib = CRA_CURSORED;
 
@@ -1101 +1061 @@
           return (MRESULT) TRUE;
         }
-        else
-        {
-          if (SHORT1FROMMP(mp2) == ' ')
-          {
+        else {
+          if (SHORT1FROMMP(mp2) == ' ') {
             dcd -> szCommonName[len] = 0;
             break;
@@ -1148 +1106 @@
 
   case UM_COMPARE:
-    if (dcd && mp1 && mp2)
-    {
+    if (dcd && mp1 && mp2) {
       COMPARE *cmp;
       CHAR *leftdir = (CHAR *) mp1, *rightdir = (CHAR *) mp2;
 
-      if (!IsFile(leftdir) && !IsFile(rightdir))
-      {
+      if (!IsFile(leftdir) && !IsFile(rightdir)) {
         cmp = xmallocz(sizeof(COMPARE),pszSrcFile,__LINE__);
-        if (cmp)
-        {
+        if (cmp) {
           cmp -> size = sizeof(COMPARE);
           strcpy(cmp -> leftdir, leftdir);
@@ -1176 +1131 @@
 
   case UM_UPDATERECORD:
-    if (dcd && mp1)
-    {
+    if (dcd && mp1) {
       CHAR *filename;
 
@@ -1190 +1144 @@
      * put name of our window on status line
      */
-    if (dcd && hwndStatus && mp2)
-    {
+    if (dcd && hwndStatus && mp2) {
       PCNRITEM pci = NULL;
 
-      if (fAutoView && hwndMain)
-      {
+      if (fAutoView && hwndMain) {
         pci = WinSendMsg(hwnd,
                          CM_QUERYRECORDEMPHASIS,
@@ -1223 +1175 @@
 
   case UM_RESCAN:
-    if (dcd)
-    {
+    if (dcd) {
       CNRINFO cnri;
       CHAR s[CCHMAXPATH + 69], tb[81], tf[81], *p;
@@ -1247 +1198 @@
           dcd -> hwndFrame == WinQueryActiveWindow(dcd -> hwndParent))
       {
-        if (hwndMain)
-        {
+        if (hwndMain) {
           pci = WinSendMsg(hwnd, CM_QUERYRECORDEMPHASIS,
                            MPFROMLONG(CMA_FIRST),
@@ -1274 +1224 @@
                            MPFROMLONG(CMA_FIRST),
                            MPFROMSHORT(CRA_CURSORED));
-        if (pci && (INT) pci != -1)
-        {
+        if (pci && (INT) pci != -1) {
           BOOL fStatus2Used = FALSE;
-          if (fSplitStatus && hwndStatus2)
-          {
+          if (fSplitStatus && hwndStatus2) {
             if (pci -> attrFile & FILE_DIRECTORY)
               p = pci -> pszFileName;
-            else
-            {
+            else {
               p = strrchr(pci -> szFileName, '\\');
-              if (p)
-              {
+              if (p) {
                 if (*(p + 1))
                   p++;
@@ -1295 +1241 @@
             }
             CommaFmtULL(tb, sizeof(tb), pci -> cbFile + pci -> easize, ' ');
-            if (!fMoreButtons)
-            {
+            if (!fMoreButtons) {
               sprintf(s, " %s  %04u/%02u/%02u %02u:%02u:%02u  [%s]  %s",
                       tb, pci -> date.year, pci -> date.month,
@@ -1302 +1247 @@
                       pci -> time.seconds, pci -> pszDispAttr, p);
             }
-            else
-            {
+            else {
               if (pci -> cbFile + pci -> easize > 1024)
                 CommaFmtULL(tf, sizeof(tf), pci -> cbFile + pci -> easize, 'K');
@@ -1317 +1261 @@
             fStatus2Used = TRUE;
           }
-          if (fMoreButtons)
-          {
+          if (fMoreButtons) {
             WinSetWindowText(hwndName, pci -> pszFileName);
             sprintf(s, "%04u/%02u/%02u %02u:%02u:%02u",
@@ -1330 +1273 @@
             WinSetWindowText(hwndStatus2, GetPString(IDS_INSEEKSCANTEXT));      // Say working
         }
-        else
-        {
+        else {
           if (hwndStatus2)
             WinSetWindowText(hwndStatus2, NullStr);
-          if (fMoreButtons)
-          {
+          if (fMoreButtons) {
             WinSetWindowText(hwndName, NullStr);
             WinSetWindowText(hwndDate, NullStr);
@@ -1363 +1304 @@
             MPVOID,
             MPVOID);
-    if (dcd)
-    {
+    if (dcd) {
       dcd -> stopflag = 0;
       dcd -> amextracted = FALSE;               // Say not scanning
-      if (dcd -> namecanchange)
-      {
+      if (dcd -> namecanchange) {
         if (!PostMsg(hwnd,
                      WM_CLOSE,
@@ -1391 +1330 @@
 
   case UM_SETUP:
-    if (dcd)
-    {
-      if (!dcd -> hwndObject)
-      {
+    if (dcd) {
+      if (!dcd -> hwndObject) {
         /*
          * first time through -- set things up
@@ -1423 +1360 @@
         cnri.pSortRecord = (PVOID) SortCollectorCnr;
 
+        size = sizeof(ULONG);
+        PrfQueryProfileData(fmprof, appname, "CollectorflWindowAttr",
+                            (PVOID) & cnri.flWindowAttr, &size);
+        size = sizeof(MASK);
+        if (PrfQueryProfileSize(fmprof, appname, "CollectorFilter", &size) &&
+            size)
         {
-          size = sizeof(ULONG);
-          PrfQueryProfileData(fmprof, appname, "CollectorflWindowAttr",
-                              (PVOID) & cnri.flWindowAttr, &size);
-          size = sizeof(MASK);
-          if (PrfQueryProfileSize(fmprof, appname, "CollectorFilter", &size) &&
-              size)
-          {
-            PrfQueryProfileData(fmprof, appname, "CollectorFilter", &dcd -> mask,
-                                &size);
-            SetMask(dcd -> mask.szMask, &dcd -> mask);
-          }
-          else
-          {
-            dcd -> mask.attrFile = (FILE_NORMAL | FILE_READONLY |
-                                    FILE_DIRECTORY | FILE_HIDDEN |
-                                    FILE_SYSTEM | FILE_ARCHIVED);
-            dcd -> mask.antiattr = 0;
-          }
-          *(dcd -> mask.prompt) = 0;
-        }
+          PrfQueryProfileData(fmprof, appname, "CollectorFilter", &dcd -> mask,
+                              &size);
+          SetMask(NULL, &dcd -> mask);
+        }
+        else {
+          dcd -> mask.attrFile = (FILE_NORMAL | FILE_READONLY |
+                                  FILE_DIRECTORY | FILE_HIDDEN |
+                                  FILE_SYSTEM | FILE_ARCHIVED);
+          dcd -> mask.antiattr = 0;
+        }
+
+        *(dcd -> mask.prompt) = 0;
+
         cnri.flWindowAttr |= CV_FLOW;
         cnri.flWindowAttr &= (~(CA_MIXEDTARGETEMPH | CA_ORDEREDTARGETEMPH));
@@ -1463 +1399 @@
                    MPFROMLONG(CMA_XVERTSPLITBAR));
 
-        if (_beginthread(MakeObjWin, NULL, 245760, (PVOID) dcd) == -1)
-        {
-          Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
+        if (_beginthread(MakeObjWin, NULL, 245760, (PVOID) dcd) == -1) {
+          Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
           PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);
           return 0;
@@ -1479 +1414 @@
                               DIR_VIEW), dcd -> flWindowAttr);
     }
-    else
-    {
+    else {
       PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);
       return 0;
@@ -1487 +1421 @@
 
   case WM_MENUEND:
-    if (dcd)
-    {
+    if (dcd) {
       HWND hwndMenu = (HWND)mp2;
 
@@ -1495 +1428 @@
       {
         MarkAll(hwnd, TRUE, FALSE, TRUE);
-        if (dcd -> cnremphasized)
-        {
+        if (dcd -> cnremphasized) {
           WinSendMsg(hwnd, CM_SETRECORDEMPHASIS, MPVOID,
                      MPFROM2SHORT(FALSE, CRA_SOURCE));
@@ -1506 +1438 @@
 
   case UM_OPENWINDOWFORME:
-    if (dcd)
-    {
+    if (dcd) {
       if (mp1 &&
           !IsFile((CHAR *) mp1))
@@ -1526 +1457 @@
 
   case MM_PORTHOLEINIT:
-    if (dcd)
-    {
-      switch (SHORT1FROMMP(mp1))
-      {
+    if (dcd) {
+      switch (SHORT1FROMMP(mp1)) {
       case 0:
       case 1:
@@ -1546 +1475 @@
   case UM_INITMENU:
   case WM_INITMENU:
-    if (dcd)
-    {
-      switch (SHORT1FROMMP(mp1))
-      {
+    if (dcd) {
+      switch (SHORT1FROMMP(mp1)) {
       case IDM_VIEWSMENU:
         SetViewMenu((HWND)mp2, dcd -> flWindowAttr);
@@ -1575 +1502 @@
 
   case UM_COLLECTFROMFILE:
-    if (mp1)
-    {
-      if (dcd)
-      {
-        if (!PostMsg(dcd -> hwndObject, UM_COLLECTFROMFILE, mp1, mp2))
-        {
-          Runtime_Error(pszSrcFile, __LINE__, "PostMsg");
+    if (mp1) {
+      if (!dcd) {
+        free(mp1);
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      }
+      else {
+        if (!PostMsg(dcd -> hwndObject, UM_COLLECTFROMFILE, mp1, mp2)) {
+          Runtime_Error(pszSrcFile, __LINE__, "PostMsg");
           free(mp1);
         }
       }
-      else
-        free(mp1);
-    }
-    else
-      free(mp1);
+    }
     return 0;
 
   case UM_COMMAND:
-    if (mp1)
-    {
-      if (dcd)
-      {
-        if (!PostMsg(dcd -> hwndObject, UM_COMMAND, mp1, mp2))
-        {
-          Runtime_Error(pszSrcFile, __LINE__, "PostMsg");
+    if (mp1) {
+      if (dcd) {
+        if (!PostMsg(dcd -> hwndObject, UM_COMMAND, mp1, mp2)) {
+          Runtime_Error(pszSrcFile, __LINE__, "PostMsg");
           FreeListInfo((LISTINFO *) mp1);
         }
@@ -1617 +1538 @@
   case WM_COMMAND:
     DosError(FERR_DISABLEHARDERR);
-    if (dcd)
-    {
-      switch (SHORT1FROMMP(mp1))
-      {
+    if (dcd) {
+      switch (SHORT1FROMMP(mp1)) {
       case IDM_SETTARGET:
         SetTargetDir(hwnd, FALSE);
@@ -1642 +1561 @@
                            MPFROMLONG(CMA_FIRST),
                            MPFROMSHORT(CRA_CURSORED));
-          if (pci && (INT) pci != -1)
-          {
+          if (pci && (INT) pci != -1) {
             static CHAR dirname[CCHMAXPATH];
 
@@ -1679 +1597 @@
                                       MPFROMLONG(CMA_FIRST),
                                       MPFROMSHORT(CRA_CURSORED));
-          if (pci && (INT) pci != -1)
-          {
+          if (pci && (INT) pci != -1) {
             WinQueryWindowPos(dcd -> hwndFrame, &swp);
             DefaultViewKeys(hwnd, dcd -> hwndFrame, dcd -> hwndParent, &swp,
@@ -1706 +1623 @@
             pp = filename;
           p = strrchr(pp, '.');
-          if (p && *(p + 1) && p > pp + 1)
-          {
+          if (p && *(p + 1) && p > pp + 1) {
             if (pp > filename)
               pp++;
@@ -1715 +1631 @@
               memmove(pp, p, strlen(p) + 1);
           }
-          if (insert_filename(hwnd, filename, FALSE, FALSE))
-          {
+          if (insert_filename(hwnd, filename, FALSE, FALSE)) {
             p = xstrdup(filename,pszSrcFile,__LINE__);
-            if (p)
-            {
+            if (p) {
               if (!PostMsg(hwnd, UM_COLLECTFROMFILE, MPFROMP(p), MPVOID))
                 free(p);
@@ -1763 +1677 @@
       case IDM_SORTDIRSLAST:
       case IDM_SORTREVERSE:
-        switch (SHORT1FROMMP(mp1))
-        {
+        switch (SHORT1FROMMP(mp1)) {
         case IDM_SORTSUBJECT:
           CollectorsortFlags |= SORT_SUBJECT;
@@ -1802 +1715 @@
           if (CollectorsortFlags & SORT_DIRSFIRST)
             CollectorsortFlags &= (~SORT_DIRSFIRST);
-          else
-          {
+          else {
             CollectorsortFlags |= SORT_DIRSFIRST;
             CollectorsortFlags &= (~SORT_DIRSLAST);
@@ -1811 +1723 @@
           if (CollectorsortFlags & SORT_DIRSLAST)
             CollectorsortFlags &= (~SORT_DIRSLAST);
-          else
-          {
+          else {
             CollectorsortFlags |= SORT_DIRSLAST;
             CollectorsortFlags &= (~SORT_DIRSFIRST);
@@ -1836 +1747 @@
 
           li = xmallocz(sizeof(LISTINFO),pszSrcFile,__LINE__);
-          if (li)
-          {
+          if (li) {
             li -> list = ListFromClipboard(hwnd);
             if (!li -> list || !li -> list[0])
               FreeListInfo(li);
-            else
-            {
+            else {
               li -> type = IDM_COLLECT;
               if (!PostMsg(dcd -> hwndObject, UM_COLLECT, MPFROMP(li),
@@ -1879 +1788 @@
                                       MPFROM2SHORT(CMA_FIRST,
                                                    CMA_ITEMORDER));
-          if (pci && (INT) pci != -1)
-          {
+          if (pci && (INT) pci != -1) {
             WinSendMsg(hwnd,
                        CM_REMOVERECORD,
@@ -1901 +1809 @@
 
       case IDM_COLLECTOR:
-        if (mp2)
-        {
+        if (mp2) {
           LISTINFO *li;
 
           li = xmallocz(sizeof(LISTINFO),pszSrcFile,__LINE__);
-          if (li)
-          {
+          if (li) {
             li -> list = mp2;
             if (!li -> list || !li -> list[0])
               FreeListInfo(li);
-            else
-            {
+            else {
               li -> type = IDM_COLLECT;
               if (!PostMsg(dcd -> hwndObject, UM_COLLECT, MPFROMP(li),
@@ -1930 +1835 @@
 
           pci = (PCNRITEM) CurrentRecord(hwnd);
-          if (pci)
-          {
+          if (pci) {
             strcpy(path, pci -> szFileName);
             MakeValidDir(path);
@@ -1943 +1847 @@
         if (dcd -> amextracted) {
           // fixme to disable?
-          Runtime_Error(pszSrcFile, __LINE__, "busy");
-        }
-        else
-        {
+          Runtime_Error(pszSrcFile, __LINE__, "busy");
+        }
+        else {
           if (WinDlgBox(HWND_DESKTOP, hwnd, GrepDlgProc,
                         FM3ModHandle, GREP_FRAME, (PVOID) & hwnd))
@@ -1972 +1875 @@
           CHAR *p;
 
-          if (!*dcd -> mask.szMask)
-          {
+          if (!*dcd -> mask.szMask) {
             empty = TRUE;
             pci = (PCNRITEM) CurrentRecord(hwnd);
-            if (pci && !(pci -> attrFile & FILE_DIRECTORY))
-            {
+            if (pci && !(pci -> attrFile & FILE_DIRECTORY)) {
               p = strrchr(pci -> szFileName, '\\');
-              if (p)
-              {
+              if (p) {
                 p++;
                 strcpy(dcd -> mask.szMask, p);
@@ -1993 +1893 @@
             size = sizeof(MASK);
             PrfWriteProfileData(fmprof, appname, "CollectorFilter",
-                                &dcd -> mask, size);
+                                &dcd -> mask, size);
             dcd -> suspendview = 1;
             WinSendMsg(hwnd, CM_FILTER, MPFROMP(Filter), MPFROMP(&dcd -> mask));
             dcd -> suspendview = 0;
-            if (fAutoView && hwndMain)
-            {
+            if (fAutoView && hwndMain) {
               pci = WinSendMsg(hwnd, CM_QUERYRECORDEMPHASIS,
                                MPFROMLONG(CMA_FIRST),
@@ -2045 +1944 @@
           if ((INT) pci == -1)
             pci = NULL;
-          if (SHORT1FROMMP(mp1) == IDM_HIDEALL)
-          {
-            if (pci)
-            {
+          if (SHORT1FROMMP(mp1) == IDM_HIDEALL) {
+            if (pci) {
               if (!(pci -> rc.flRecordAttr & CRA_SELECTED))
                 pci -> rc.flRecordAttr |= CRA_FILTERED;
@@ -2094 +1991 @@
           WinSendMsg(hwnd, CM_QUERYCNRINFO, MPFROMP(&cnri),
                      MPFROMLONG(sizeof(CNRINFO)));
-          switch (SHORT1FROMMP(mp1))
-          {
+          switch (SHORT1FROMMP(mp1)) {
           case IDM_ICON:
             cnri.flWindowAttr &= (~(CV_ICON | CV_TREE | CV_TEXT |
@@ -2219 +2115 @@
 
           li = xmallocz(sizeof(LISTINFO),pszSrcFile,__LINE__);
-          if (li)
-          {
+          if (li) {
             li -> type = SHORT1FROMMP(mp1);
             li -> hwnd = hwnd;
             li -> list = BuildList(hwnd);
-            if (li -> list)
-            {
-              switch (SHORT1FROMMP(mp1))
-              {
+            if (li -> list) {
+              switch (SHORT1FROMMP(mp1)) {
               case IDM_DOITYOURSELF:
               case IDM_APPENDTOCLIP:
@@ -2259 +2152 @@
                            MPVOID))
               {
-                Runtime_Error(pszSrcFile, __LINE__, "PostMsg");
+                Runtime_Error(pszSrcFile, __LINE__, "PostMsg");
                 FreeListInfo(li);
               }
@@ -2280 +2173 @@
 
           x = SHORT1FROMMP(mp1) - IDM_COMMANDSTART;
-          if (x >= 0)
-          {
+          if (x >= 0) {
             x++;
             RunCommand(hwnd, x);
@@ -2303 +2195 @@
 
       pci = (PCNRITEM) CurrentRecord(hwnd);
-      if (pci && (INT) pci != -1)
-      {
+      if (pci && (INT) pci != -1) {
         if (pci -> attrFile & FILE_DIRECTORY)
           menuHwnd = CheckMenu(&CollectorDirMenu, COLLECTORDIR_POPUP);
@@ -2315 +2206 @@
   case WM_CONTROL:
     DosError(FERR_DISABLEHARDERR);
-    if (dcd)
-    {
-      switch (SHORT2FROMMP(mp1))
-      {
+    if (dcd) {
+      switch (SHORT2FROMMP(mp1)) {
       case CN_CONTEXTMENU:
         {
           PCNRITEM pci = (PCNRITEM) mp2;
 
-          if (pci)
-          {
+          if (pci) {
             WinSendMsg(hwnd, CM_SETRECORDEMPHASIS, MPFROMP(pci),
                        MPFROM2SHORT(TRUE, CRA_CURSORED));
@@ -2335 +2223 @@
                                               COLLECTORFILE_POPUP);
           }
-          else
-          {
+          else {
             dcd -> hwndLastMenu = CheckMenu(&CollectorCnrMenu,
                                             COLLECTORCNR_POPUP);
-            if (dcd -> hwndLastMenu && !dcd -> cnremphasized)
-            {
+            if (dcd -> hwndLastMenu && !dcd -> cnremphasized) {
               WinSendMsg(hwnd, CM_SETRECORDEMPHASIS, MPVOID,
                          MPFROM2SHORT(TRUE, CRA_SOURCE));
@@ -2346 +2232 @@
             }
           }
-          if (dcd -> hwndLastMenu)
-          {
-            if (dcd -> hwndLastMenu == CollectorCnrMenu)
-            {
+          if (dcd -> hwndLastMenu) {
+            if (dcd -> hwndLastMenu == CollectorCnrMenu) {
               SetViewMenu(dcd -> hwndLastMenu, dcd -> flWindowAttr);
               SetDetailsSwitches(dcd -> hwndLastMenu, dcd);
@@ -2355 +2239 @@
                 WinCheckMenuItem(dcd -> hwndLastMenu, IDM_MINIICONS, TRUE);
             }
-            if (!PopupMenu(hwnd, hwnd, dcd -> hwndLastMenu))
-            {
-              if (dcd -> cnremphasized)
-              {
+            if (!PopupMenu(hwnd, hwnd, dcd -> hwndLastMenu)) {
+              if (dcd -> cnremphasized) {
                 WinSendMsg(hwnd, CM_SETRECORDEMPHASIS, MPVOID,
                            MPFROM2SHORT(FALSE, CRA_SOURCE));
@@ -2370 +2252 @@
 
       case CN_DROPHELP:
-        if (mp2)
-        {
+        if (mp2) {
           PDRAGINFO pDInfo;
           PCNRITEM pci;
@@ -2379 +2260 @@
           pci = (PCNRITEM) ((PCNRDRAGINFO) mp2) -> pRecord;
           pDInfo = ((PCNRDRAGINFO) mp2) -> pDragInfo;
-          if (!DrgAccessDraginfo(pDInfo))
-          {
+          if (!DrgAccessDraginfo(pDInfo)) {
             Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
                       "%s",
@@ -2408 +2288 @@
 
       case CN_DRAGLEAVE:
-        if (mp2)
-        {
+        if (mp2) {
           PDRAGINFO pDInfo;
 
           pDInfo = ((PCNRDRAGINFO) mp2) -> pDragInfo;
           DrgAccessDraginfo(pDInfo);    /* Access DRAGINFO       */
-          DrgFreeDraginfo(pDInfo);      /* Free DRAGINFO         */
+          DrgFreeDraginfo(pDInfo);      /* Free DRAGINFO         */
         }
         return 0;
@@ -2420 +2299 @@
       case CN_DRAGAFTER:
       case CN_DRAGOVER:
-        if (mp2)
-        {
+        if (mp2) {
           PDRAGITEM pDItem;     /* Pointer to DRAGITEM   */
           PDRAGINFO pDInfo;     /* Pointer to DRAGINFO   */
@@ -2428 +2306 @@
 
           pci = (PCNRITEM) ((PCNRDRAGINFO) mp2) -> pRecord;
-//              if(SHORT1FROMMP(mp1) == CN_DRAGAFTER)
-          //                pci = NULL;
+//            if(SHORT1FROMMP(mp1) == CN_DRAGAFTER)
+          //            pci = NULL;
           pDInfo = ((PCNRDRAGINFO) mp2) -> pDragInfo;
           DrgAccessDraginfo(pDInfo);    /* Access DRAGINFO       */
-          if (pci)
-          {
-            if (pci -> rc.flRecordAttr & CRA_SOURCE)
-            {
+          if (pci) {
+            if (pci -> rc.flRecordAttr & CRA_SOURCE) {
               DrgFreeDraginfo(pDInfo);
               return (MRFROM2SHORT(DOR_NODROP, 0));
@@ -2442 +2318 @@
             if (uso == DO_DEFAULT)
               uso = (fCopyDefault) ? DO_COPY : DO_MOVE;
-            if (!(pci -> attrFile & FILE_DIRECTORY))
-            {
+            if (!(pci -> attrFile & FILE_DIRECTORY)) {
               if (uso != DO_LINK && uso != DO_MOVE &&
                   uso != DO_COPY)
@@ -2477 +2352 @@
                            NULL))
           {
-            DrgFreeDraginfo(pDInfo);    /* Free DRAGINFO         */
-            if (pci)
-            {
+            DrgFreeDraginfo(pDInfo);    /* Free DRAGINFO         */
+            if (pci) {
               if (driveflags[toupper(*pci -> szFileName) - 'A'] &
                   DRIVE_NOTWRITEABLE)
@@ -2494 +2368 @@
                                   DO_COPY);
           }
-          DrgFreeDraginfo(pDInfo);      /* Free DRAGINFO         */
-        }
-        return (MRFROM2SHORT(DOR_NODROP, 0));   /* Drop not valid        */
+          DrgFreeDraginfo(pDInfo);      /* Free DRAGINFO         */
+        }
+        return (MRFROM2SHORT(DOR_NODROP, 0));   /* Drop not valid       */
 
       case CN_INITDRAG:
-        if (mp2)
-        {
+        if (mp2) {
           BOOL wasemphasized = FALSE;
           PCNRDRAGINIT pcd = (PCNRDRAGINIT) mp2;
           PCNRITEM pci;
 
-          if (pcd)
-          {
+          if (pcd) {
             pci = (PCNRITEM) pcd -> pRecord;
-            if (pci)
-            {
+            if (pci) {
               if (pci -> rc.flRecordAttr & CRA_SELECTED)
                 wasemphasized = TRUE;
@@ -2535 +2406 @@
 
       case CN_DROP:
-        if (mp2)
-        {
+        if (mp2) {
           LISTINFO *li;
           ULONG action = UM_ACTION;
 
           li = DoFileDrop(hwnd, NULL, TRUE, mp1, mp2);
-          if (li)
-          {
-            if (!*li -> targetpath)
-            {
+          if (li) {
+            if (!*li -> targetpath) {
               li -> type = IDM_COLLECT;
               action = UM_COLLECT;
             }
-            else
-            {
+            else {
               if (li -> list && li -> list[0] && IsRoot(li -> list[0]))
                 li -> type = DO_LINK;
-              else if (fDragndropDlg && (!*li -> arcname || !li -> info))
-              {
+              else if (fDragndropDlg && (!*li -> arcname || !li -> info)) {
                 CHECKLIST cl;
 
@@ -2565 +2431 @@
                                        DropListProc, FM3ModHandle,
                                        DND_FRAME, MPFROMP(&cl));
-                if (!li -> type)
-                {
+                if (!li -> type) {
                   FreeListInfo(li);
                   return 0;
                 }
                 li -> list = cl.list;
-                if (!li -> list || !li -> list[0])
-                {
+                if (!li -> list || !li -> list[0]) {
                   FreeListInfo(li);
                   return 0;
                 }
               }
-              switch (li -> type)
-              {
+              switch (li -> type) {
               case DND_LAUNCH:
                 strcat(li -> targetpath, " %a");
@@ -2587 +2450 @@
                 break;
               case DO_LINK:
-                if (fLinkSetsIcon)
-                {
+                if (fLinkSetsIcon) {
                   li -> type = IDM_SETICON;
                   action = UM_MASSACTION;
@@ -2601 +2463 @@
               case DND_MOVE:
                 li -> type = IDM_MOVE;
-                if (*li -> targetpath && IsFile(li -> targetpath) == 1)
-                {
+                if (*li -> targetpath && IsFile(li -> targetpath) == 1) {
                   action = UM_MASSACTION;
                   li -> type = IDM_ARCHIVEM;
@@ -2609 +2470 @@
               case DND_WILDMOVE:
                 li -> type = IDM_WILDMOVE;
-                if (*li -> targetpath && IsFile(li -> targetpath) == 1)
-                {
+                if (*li -> targetpath && IsFile(li -> targetpath) == 1) {
                   action = UM_MASSACTION;
                   li -> type = IDM_ARCHIVEM;
@@ -2632 +2492 @@
               case DND_WILDCOPY:
                 li -> type = IDM_WILDCOPY;
-                if (*li -> targetpath && IsFile(li -> targetpath) == 1)
-                {
+                if (*li -> targetpath && IsFile(li -> targetpath) == 1) {
                   action = UM_MASSACTION;
                   li -> type = IDM_ARCHIVE;
@@ -2640 +2499 @@
               case DND_COPY:
                 li -> type = IDM_COPY;
-                if (*li -> targetpath && IsFile(li -> targetpath) == 1)
-                {
+                if (*li -> targetpath && IsFile(li -> targetpath) == 1) {
                   action = UM_MASSACTION;
                   li -> type = IDM_ARCHIVE;
@@ -2647 +2505 @@
                 break;
               default:
-                if (*li -> arcname && li -> info)
-                {
+                if (*li -> arcname && li -> info) {
                   action = UM_MASSACTION;
                   li -> type = (li -> type == DO_MOVE) ? IDM_FAKEEXTRACTM : IDM_FAKEEXTRACT;
                 }
-                else if (*li -> targetpath && IsFile(li -> targetpath) == 1)
-                {
+                else if (*li -> targetpath && IsFile(li -> targetpath) == 1) {
                   action = UM_MASSACTION;
                   li -> type = (li -> type == DO_MOVE) ? IDM_ARCHIVEM : IDM_ARCHIVE;
@@ -2666 +2522 @@
             else if (!PostMsg(dcd -> hwndObject, action, MPFROMP(li), MPVOID))
               FreeListInfo(li);
-            else
-            {
+            else {
               USHORT usop = 0;
 
-              switch (li -> type)
-              {
+              switch (li -> type) {
               case IDM_COPY:
               case IDM_WILDCOPY:
@@ -2702 +2556 @@
 
       case CN_EMPHASIS:
-        if (mp2)
-        {
+        if (mp2) {
           PNOTIFYRECORDEMPHASIS pre = mp2;
           PCNRITEM pci;
@@ -2709 +2562 @@
 
           pci = (PCNRITEM) ((pre) ? pre -> pRecord : NULL);
-          if (!pci)
-          {
+          if (!pci) {
             if (hwndStatus2)
               WinSetWindowText(hwndStatus2, NullStr);
-            if (fMoreButtons)
-            {
+            if (fMoreButtons) {
               WinSetWindowText(hwndName, NullStr);
               WinSetWindowText(hwndDate, NullStr);
@@ -2723 +2574 @@
             break;
           }
-          if (pre -> fEmphasisMask & CRA_SELECTED)
-          {
-            if (pci -> rc.flRecordAttr & CRA_SELECTED)
-            {
+          if (pre -> fEmphasisMask & CRA_SELECTED) {
+            if (pci -> rc.flRecordAttr & CRA_SELECTED) {
               dcd -> selectedbytes += (pci -> cbFile + pci -> easize);
               dcd -> selectedfiles++;
             }
-            else if (dcd -> selectedfiles)
-            {
+            else if (dcd -> selectedfiles) {
               dcd -> selectedbytes -= (pci -> cbFile + pci -> easize);
               dcd -> selectedfiles--;
             }
-            if (!dcd -> suspendview)
-            {
+            if (!dcd -> suspendview) {
               commafmt(tf, sizeof(tf), dcd -> selectedfiles);
               CommaFmtULL(tb, sizeof(tb), dcd -> selectedbytes, ' ');
@@ -2746 +2593 @@
               WinQueryActiveWindow(dcd -> hwndParent) == dcd -> hwndFrame)
           {
-            if (pre -> fEmphasisMask & CRA_CURSORED)
-            {
-              if (pci -> rc.flRecordAttr & CRA_CURSORED)
-              {
-                if (fSplitStatus && hwndStatus2)
-                {
+            if (pre -> fEmphasisMask & CRA_CURSORED) {
+              if (pci -> rc.flRecordAttr & CRA_CURSORED) {
+                if (fSplitStatus && hwndStatus2) {
                   if (pci -> attrFile & FILE_DIRECTORY)
                     p = pci -> pszFileName;
-                  else
-                  {
+                  else {
                     p = strrchr(pci -> szFileName, '\\');
-                    if (p)
-                    {
+                    if (p) {
                       if (*(p + 1))
                         p++;
@@ -2774 +2616 @@
                             pci -> time.minutes, pci -> time.seconds,
                             pci -> pszDispAttr, p);
-                  else
-                  {
+                  else {
                     if (pci -> cbFile + pci -> easize > 1024)
                       CommaFmtULL(tf, sizeof(tf), pci -> cbFile + pci -> easize, ' ');
@@ -2788 +2629 @@
                   WinSetWindowText(hwndStatus2, s);
                 }
-                if (fMoreButtons)
-                {
+                if (fMoreButtons) {
                   WinSetWindowText(hwndName, pci -> pszFileName);
                   sprintf(s, "%04u/%02u/%02u %02u:%02u:%02u",
@@ -2812 +2652 @@
 
       case CN_ENTER:
-        if (mp2)
-        {
+        if (mp2) {
           PCNRITEM pci = (PCNRITEM) ((PNOTIFYRECORDENTER) mp2) -> pRecord;
           FILEFINDBUF3 ffb;
@@ -2821 +2660 @@
 
           SetShiftState();
-          if (pci)
-          {
+          if (pci) {
             if (pci -> rc.flRecordAttr & CRA_INUSE)
               break;
@@ -2833 +2671 @@
                                   FIL_STANDARD);
             priority_bumped();
-            if (!status)
-            {
+            if (!status) {
               DosFindClose(hDir);
-              if (ffb.attrFile & FILE_DIRECTORY)
-              {
+              if (ffb.attrFile & FILE_DIRECTORY) {
                 if ((shiftstate & (KC_CTRL | KC_ALT)) ==
                     (KC_CTRL | KC_ALT))
@@ -2854 +2690 @@
                              pci -> szFileName);
               }
-              else
-              {
+              else {
                 SWP swp;
 
@@ -2889 +2724 @@
 
   case UM_LOADFILE:
-    if (dcd && mp2)
-    {
+    if (dcd && mp2) {
       HWND ret;
 
@@ -2914 +2748 @@
 
   case WM_CLOSE:
-    if (dcd)
-    {
+    if (dcd) {
       dcd -> namecanchange = TRUE;
       dcd -> stopflag = 1;
@@ -2922 +2755 @@
     }
     WinSendMsg(hwnd, WM_SAVEAPPLICATION, MPVOID, MPVOID);
-    if (dcd)
-    {
+    if (dcd) {
       if (!dcd -> dontclose && ParentIsDesktop(hwnd, dcd -> hwndParent))
         PostMsg(hwnd, UM_FOLDUP, MPVOID, MPVOID);
-      if (dcd -> hwndObject)
-      {
+      if (dcd -> hwndObject) {
         DosSleep(64L);
         if (!PostMsg(dcd -> hwndObject, WM_CLOSE, MPVOID, MPVOID))
@@ -2958 +2789 @@
   HWND hwndClient;
   ULONG FrameFlags = FCF_TITLEBAR | FCF_SYSMENU |
-                     FCF_SIZEBORDER | FCF_MINMAX |
-                     FCF_ICON | FCF_NOBYTEALIGN |
-                     FCF_ACCELTABLE;
+                     FCF_SIZEBORDER | FCF_MINMAX |
+                     FCF_ICON | FCF_NOBYTEALIGN |
+                     FCF_ACCELTABLE;
   USHORT id;
   DIRCNRDATA *dcd;
@@ -2968 +2799 @@
   if (ParentIsDesktop(hwndParent, hwndParent))
     FrameFlags |= (FCF_TASKLIST | FCF_SHELLPOSITION | FCF_MENU);
-  if (Collector)
-  {
+  if (Collector) {
     WinSetWindowPos(WinQueryWindow(WinQueryWindow(Collector,
                                                   QW_PARENT),
@@ -2992 +2822 @@
                                  COLLECTOR_FRAME,
                                  &hwndClient);
-  if (hwndFrame && hwndClient)
-  {
+  if (hwndFrame && hwndClient) {
     id = COLLECTOR_FRAME + idinc++;
     WinSetWindowUShort(hwndFrame, QWS_ID, id);
@@ -3036 +2865 @@
                                        NULL);
       if (!dcd -> hwndCnr) {
-        Win_Error2(hwndClient,hwndClient,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW);
+        Win_Error2(hwndClient,hwndClient,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW);
         PostMsg(hwndClient,WM_CLOSE,MPVOID,MPVOID);
         free(dcd);
@@ -3046 +2875 @@
         WinSetWindowText(hwndFrame,
                          GetPString(IDS_COLLECTORTITLETEXT));
-        if (FrameFlags & FCF_MENU)
-        {
-          if (!fToolbar)
-          {
+        if (FrameFlags & FCF_MENU) {
+          if (!fToolbar) {
             HWND hwndMenu = WinWindowFromID(hwndFrame, FID_MENU);
 
-            if (hwndMenu)
-            {
+            if (hwndMenu) {
               WinSendMsg(hwndMenu,
                          MM_DELETEITEM,