Changeset 1892

Timestamp:

Jan 31, 2020, 6:45:23 AM (6 years ago)

Author:

Steven Levine

Message:

Rework RemoveCnrItems to avoid possible traps on bad input.
Rework RemoveArcItems like RemoveCnrItems.
Sync source with standards.

Location:

trunk/dll

Files:

• arccnrs.c (modified) (82 diffs)
• filldir.c (modified) (34 diffs)

trunk/dll/arccnrs.c

@@ -6 +6 @@
   Archive containers
 
-  Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2013 Steven H. Levine
+  Copyright (c) 1993-1998 M. Kimes
+  Copyright (c) 2001-2020 Steven H. Levine
 
   11 Jun 02 SHL Ensure archive name not garbage
@@ -77 +77 @@
   12 Mar 09 SHL Use common SearchContainer
   13 Dec 09 GKY Fixed separate paramenters. Please note that appname should be used in
-                profile calls for user settings that work and are setable in more than one
-                miniapp; FM3Str should be used for setting only relavent to FM/2 or that
-                aren't user settable; realappname should be used for setting applicable to
-                one or more miniapp but not to FM/2
+                profile calls for user settings that work and are setable in more than one
+                miniapp; FM3Str should be used for setting only relavent to FM/2 or that
+                aren't user settable; realappname should be used for setting applicable to
+                one or more miniapp but not to FM/2
   17 Jan 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
   15 Apr 10 JBS Ticket 422: Stop hang when open archive gets deleted or moved
   23 Oct 10 GKY Add ForwardslashToBackslash function to streamline code
   20 Nov 10 GKY Check that pTmpDir IsValid and recreate if not found; Fixes hangs caused
-                by temp file creation failures.
+                by temp file creation failures.
   13 Aug 11 GKY Change to Doxygen comment format
   30 Jul 13 GKY Changes to allow 7z archiver to work with AV.
   05 Aug 13 GKY Changes to allow Lzip to work with AV
   11 Aug 13 GKY Removed code that attempted to use the archive name as the extract directory
-                It was never fully implemented and doesn't make sense for the container.
+                It was never fully implemented and doesn't make sense for the container.
   09 Feb 14 GKY Fix trap on opening a file without an extention
   22 Feb 14 GKY Fix warn readonly yes don't ask to work when recursing directories.
   28 Apr 14 JBS Ticket #522: Ensure use of wrapper functions where needed
   01 Mar 14 GKY Fixed error checking in FillArcCnr only to report missing archivers after
-                all entries have been tried. Added a check b/gzip exes for TAR.B/GZ archives.
-                Use the test archive string from the first working archive description.
-                Enhance the error message. Ticket 502
+                all entries have been tried. Added a check b/gzip exes for TAR.B/GZ archives.
+                Use the test archive string from the first working archive description.
+                Enhance the error message. Ticket 502
   01 Mar 14 GKY Fix a trap caused by selecting "print" from the arccontainer menu. Ticket 525
   01 Mar 14 GKY Fix the problem with copying text from the test archive window by launching
-                it in a command shell (i.e. comspec /k archiver -t archive) Ticket 503
+                it in a command shell (i.e. comspec /k archiver -t archive) Ticket 503
   02 Mar 14 GKY Fixed typo that reversed the function of the saymsg dialog g/bzip check.
-                Added option to suppress message regarding missing bzip2.exe
-                or gzip.exe on TAR.B/GZ archives.
+                Added option to suppress message regarding missing bzip2.exe
+                or gzip.exe on TAR.B/GZ archives.
   06 Apr 14 GKY Removed all BZ/GZ checks
   28 Jun 14 GKY Fix errors identified with CPPCheck; Fix retry to create workdir code
   12 Aug 15 JBS Ticket #522: Ensure no "highmem-unsafe" functions are called directly.
-                Calls to unsafe Dos... functions have been changed to call the wrapped xDos... functions.
+                Calls to unsafe Dos... functions have been changed to call the wrapped xDos... functions.
+  30 Jan 20 SHL Rework RemoveArcItems like RemoveCnrItems
+  30 Jan 20 SHL Use pai consistently for PARCITEM;
+  30 Jan 20 SHL Clean up some inconsistent formatting
 
 ***********************************************************************/
@@ -114 +117 @@
 #include <string.h>
 #include <ctype.h>
-#include <direct.h>                     // rmdir
+#include <direct.h>                     // rmdir
 #include <share.h>                      // SH_DENYWR
 #include <limits.h>                     // ULONG_MAX
@@ -145 +148 @@
 #include "strutil.h"                    // GetPString
 #include "notebook.h"                   // CfgDlgProc
-#include "worker.h"             // Action, MassAction
+#include "worker.h"                     // Action, MassAction
 #include "avv.h"                        // ArcReviewDlgProc, rewrite_archiverbb2
 #include "chklist.h"                    // CenterOverWindow, CheckListProc
 #include "common.h"                     // CommonCreateTextChildren, CommonFrameWndProc, CommonTextPaint
-                                // CommonTextButton
+                                        // CommonTextButton
 #include "draglist.h"                   // DoFileDrag, DragOne
 #include "valid.h"                      // GetDesktopName, TestCDates
@@ -159 +162 @@
 #include "srchpath.h"                   // RunFM2Util
 #include "misc.h"                       // Broadcast, CheckMenu, CurrentRecord, SayFilter, SaySort
-                                // DrawTargetEmphasis, IsFm2Window
+                                        // DrawTargetEmphasis, IsFm2Window
 #include "select.h"                     // SelectAll, SelectList
 #include "findrec.h"                    // ShowCnrRecord
@@ -186 +189 @@
 #include "excputil.h"                   // 06 May 08 SHL added
 
-#define ARCFLAGS_REALDIR    0x00000001
-#define ARCFLAGS_PSEUDODIR  0x00000002
-#define CON_COLS                6
-#define EXTRA_ARCRECORD_BYTES   (sizeof(ARCITEM) - sizeof(MINIRECORDCORE))
+#define ARCFLAGS_REALDIR        0x00000001
+#define ARCFLAGS_PSEUDODIR      0x00000002
+#define CON_COLS                6
+#define EXTRA_ARCRECORD_BYTES   (sizeof(ARCITEM) - sizeof(MINIRECORDCORE))
 #define NO_START_OF_ARCHIVER_LIST_STRING "None"
-#define NO_END_OF_ARCHIVER_LIST_STRING   NO_START_OF_ARCHIVER_LIST_STRING
+#define NO_END_OF_ARCHIVER_LIST_STRING NO_START_OF_ARCHIVER_LIST_STRING
 
 #pragma data_seg(DATA1)
@@ -211 +214 @@
 typedef struct {
 
-  HWND   hwndCnr;                //hwnd you want the message posted to
-  HWND   hwndClient;             //hwnd calling this thread; NULL will work
-  ULONG  RunFlags;               //runemf2 flags see systemf.h
-  ULONG  msg;                    //Message to post
+  HWND   hwndCnr;               // hwnd you want the message posted to
+  HWND   hwndClient;            // hwnd calling this thread; NULL will work
+  ULONG  RunFlags;              // runemf2 flags see systemf.h
+  ULONG  msg;                   // Message to post
   UINT   uiLineNumber;
   PCSZ   pszSrcFile;
-  CHAR   filename[CCHMAXPATH];   //file passed as MP1 message parameter (file selected)
-  CHAR   *pszDirectory;          //Execution directory
-  CHAR   *pszEnvironment;        //Enviroment -- NULL passes current
-  CHAR   *pszCmdLine;             //Use sprintf to format multipart command line into single string
-  CHAR   formatstring[40];       //Usally "%s"
+  CHAR   filename[CCHMAXPATH];  // file passed as MP1 message parameter (file selected)
+  CHAR   *pszDirectory;         // Execution directory
+  CHAR   *pszEnvironment;       // Enviroment -- NULL passes current
+  CHAR   *pszCmdLine;   // Use sprintf to format multipart command line into single string
+  CHAR   formatstring[40];      // Usally "%s"
 }
 WAITCHILD;
@@ -365 +368 @@
                               PVOID pStorage)
 {
-  PARCITEM pai1 = (PARCITEM) pmrc1;
-  PARCITEM pai2 = (PARCITEM) pmrc2;
+  PARCITEM pai1 = (PARCITEM)pmrc1;
+  PARCITEM pai2 = (PARCITEM)pmrc2;
   DIRCNRDATA *pdcd = (DIRCNRDATA *) pStorage;
   SHORT ret = 0;
@@ -432 +435 @@
     }
     if (!ret)
-      ret = (SHORT) stricmp(pai1->pszFileName, pai2->pszFileName);
+      ret = (SHORT)stricmp(pai1->pszFileName, pai2->pszFileName);
     if (ret && (sortFlags & SORT_REVERSE))
       ret = ret > 0 ? -1 : 1;
     return ret;
   }
-  return (SHORT) stricmp(pai1->pszFileName, pai2->pszFileName);
+  return (SHORT)stricmp(pai1->pszFileName, pai2->pszFileName);
 }
 
@@ -448 +451 @@
 
   if (dcd && *dcd->mask.szMask) {
-    r = (PARCITEM) rmini;
+    r = (PARCITEM)rmini;
     if (dcd->mask.pszMasks[1]) {
       for (x = 0; dcd->mask.pszMasks[x]; x++) {
@@ -513 +516 @@
 /**
  * Remove item(s) from archive container and free associated storage if requested
- * @param paiFirst points to first item to remove or NULL to remove all
- * @param usCnt is remove count or 0 to remove all
+ * @param paiFirst points to specific item to remove or NULL to remove all
+ * @param usCnt is 0 to remove all or 1 to remove specific record
+ * @param usFlags for CM_REMOVERECORD
+ * @returns count of items remaining to delete or -1 if error
  */
 
@@ -522 +527 @@
   PARCITEM pai;
 
-  if ((usCnt && !paiFirst) || (!usCnt && paiFirst))
+  // Counted remove requires paiFirst and can only remove 1 specifc record
+  // Remove all does not allow paiFirst
+  if ((usCnt && !paiFirst) || (usCnt != 1 && paiFirst)) {
     Runtime_Error(pszSrcFile, __LINE__, "paiFirst %p usCnt %u mismatch", paiFirst, usCnt);
-  else {
-    // Free our buffers if free requested
-    if (usFlags & CMA_FREE) {
-      if (paiFirst)
-        pai = paiFirst;
-      else {
-        pai = (PARCITEM)WinSendMsg(hwnd, CM_QUERYRECORD, MPVOID,
-                                   MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
-        if ((INT)pai == -1) {
-          Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_QUERYRECORD");
-          remaining = -1;
-          pai = NULL;
-        }
-      }
-      while (pai) {
-        FreeArcItemData(pai);
-        pai = (PARCITEM)pai->rc.preccNextRecord;
-        if (remaining && --remaining == 0)
-          break;
-      }
-    }
+    remaining = -1;
   }
-  if (remaining != - 1) {
-    remaining = (INT)WinSendMsg(hwnd, CM_REMOVERECORD, MPFROMP(&paiFirst),
-                                MPFROM2SHORT(usCnt, usFlags));
-    if (remaining == -1) {
-      Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,
-                "CM_REMOVERECORD hwnd %x pai %p cnt %u",
-                hwnd, paiFirst, usCnt);
-    }
+  if (!usFlags & CMA_FREE) {
+    Runtime_Error(pszSrcFile, __LINE__, "usFlags must have CMA_FREE set");
+    remaining = -1;
+  }
+  if (!paiFirst) {
+    // Removing all - query first
+    paiFirst = (PARCITEM)WinSendMsg(hwnd, CM_QUERYRECORD, MPVOID,
+                                    MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
+    if ((INT)paiFirst == -1) {
+      Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_QUERYRECORD");
+      remaining = -1;
+    }
+  }
+
+  // Free data
+  // 2020-01-28 SHL Rework to use CMA_NEXT - preccNextRecord method was never reliable
+  pai = paiFirst;
+  while (pai && (INT)pai != -1 && remaining > 0) {
+    FreeArcItemData(pai);
+    if (--remaining == 0)
+      break;
+    pai = WinSendMsg(hwnd, CM_QUERYRECORD, MPFROMP(pai),
+                     MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
+  } // while
+
+  // Free ARCITEM record(s) if OK so far
+  if (remaining != -1 && paiFirst && (INT)paiFirst != -1) {
+#   ifdef PMPRINTF
+    PmPrintf_Report(pszSrcFile, __LINE__, "RemoveArcItems CM_REMOVERECORD paiFirst %p usCnt %d", paiFirst, usCnt);
+#   endif
+    remaining = (INT)WinSendMsg(hwnd, CM_REMOVERECORD, MPFROMP(&paiFirst), MPFROM2SHORT(usCnt, usFlags));
+    if (remaining == -1)
+      Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_REMOVERECORD hwnd %x paiFirst %p cnt %u", hwnd, paiFirst, usCnt);
+    else if (usCnt == 0 && remaining != 0)
+      Runtime_Error(pszSrcFile, __LINE__, "%u records remain after CM_REMOVERECORD", remaining);
   }
 }
@@ -581 +595 @@
 }
 
-//== FillArcCnr() generate archive content list and fill container window ==
+/**
+ * FillArcCnr() generate archive content list and fill container window
+ */
 
 static INT FillArcCnr(HWND hwndCnr, CHAR * arcname, ARC_TYPE ** arcinfo,
@@ -622 +638 @@
   MakeTempName(arctemp, ArcTempRoot, 2);
 
-
 ReTry:
 
@@ -699 +714 @@
             return 0;
           }
-          else {
-            rc = 0;
-            rc = SearchPathForFile(PCSZ_PATH, s, NULL);
-            if (!rc) {
-              cnter ++;
-              runemf2(SEPARATE | INVISIBLE | MINIMIZED | BACKGROUND | WAIT,
-                      hwndCnr, pszSrcFile, __LINE__, NULL, NULL,
-                      "%s %s",
-                      info->list,
-                      BldQuotedFileName(s, arcname));
-              if (cnter == 1) {
-                if (info->test)
-                  strcpy(TestStr, info->test);
-                else {
-                  strcpy(TestStr, "");
-                  notest = TRUE;
-                }
-              }
-              else if (notest && info->test) {
-                strcpy(TestStr, info->test);
-                notest = FALSE;
-              }
-            }
+          else {
+            rc = 0;
+            rc = SearchPathForFile(PCSZ_PATH, s, NULL);
+            if (!rc) {
+              cnter ++;
+              runemf2(SEPARATE | INVISIBLE | MINIMIZED | BACKGROUND | WAIT,
+                      hwndCnr, pszSrcFile, __LINE__, NULL, NULL,
+                      "%s %s",
+                      info->list,
+                      BldQuotedFileName(s, arcname));
+              if (cnter == 1) {
+                if (info->test)
+                  strcpy(TestStr, info->test);
+                else {
+                  strcpy(TestStr, "");
+                  notest = TRUE;
+                }
+              }
+              else if (notest && info->test) {
+                strcpy(TestStr, info->test);
+                notest = FALSE;
+              }
+            }
             oldstdout = fileno(stdout);
             DosError(FERR_DISABLEHARDERR);
@@ -737 +752 @@
 
     if (fp) {
-      gotstart = !info->startlist ||            // If list has no start marker
+      gotstart = !info->startlist ||    // If list has no start marker
                  !*info->startlist ||
                  (stricmp(info->startlist, NO_START_OF_ARCHIVER_LIST_STRING) == 0);
@@ -771 +786 @@
           p = s;
           for (fieldnum = 0; fieldnum <= highest; fieldnum++) {
-            pp = p;
-            while (*pp && (*pp == ' ' || *pp == '\t'))  // skip leading
+            pp = p;
+            // skip leading
+            while (*pp && (*pp == ' ' || *pp == '\t'))
               pp++;
-            if (!*pp) {
-              if (fieldnum == info->fnpos && (!strcmp(strupr(info->ext), "7Z") ||
-                                             !strcmp(strupr(info->signature), "7Z")))
-                fname = nsize;// GKY 7-30-13 Work around for missing nsize field for some members of archive
-              break;
-            }
+            if (!*pp) {
+              if (fieldnum == info->fnpos && (!strcmp(strupr(info->ext), "7Z") ||
+                                             !strcmp(strupr(info->signature), "7Z")))
+                fname = nsize;// GKY 7-30-13 Work around for missing nsize field for some members of archive
+              break;
+            }
             wasquote = FALSE;
-            p = pp;
+            p = pp;
             while (*p && (wasquote ||
                           ((fieldnum != info->fnpos || !info->nameislast) ?
@@ -797 +813 @@
                 }
               }
-              else if (*p)
+              else if (*p)
                 p++;
-            }
+            }
             if (*p) {
               *p = 0;
               p++;
-            }
+            }
             if (fieldnum == info->nsizepos)
               nsize = pp;
@@ -830 +846 @@
               }
             }
-            else if (fieldnum == info->fnpos) {
+            else if (fieldnum == info->fnpos) {
               fname = pp;
-              if (pp && *pp == '*' && !*(pp + 1))       // workaround for LH.EXE
+              // workaround for LH.EXE
+              if (pp && *pp == '*' && !*(pp + 1))
                 fname = NULL;
               if (info->nameislast)
@@ -852 +869 @@
 
             RECORDINSERT ri;
-            PARCITEM pai;
-
-            pai = WinSendMsg(hwndCnr,
-                             CM_ALLOCRECORD,
-                             MPFROMLONG(EXTRA_ARCRECORD_BYTES),
-                             MPFROMLONG(1L));
+            PARCITEM pai = WinSendMsg(hwndCnr,
+                                      CM_ALLOCRECORD,
+                                      MPFROMLONG(EXTRA_ARCRECORD_BYTES),
+                                      MPFROMLONG(1L));
             if (!pai) {
               Runtime_Error(pszSrcFile, __LINE__, PCSZ_CM_ALLOCRECORD);
@@ -893 +908 @@
                 pai->cbComp = atol(nsize);
               if (info->datetype && fdate && *fdate)
-                ArcDateTime(fdate, info->datetype, &pai->date, &pai->time);
+                ArcDateTime(fdate, info->datetype, &pai->date, &pai->time);
               memset(&ri, 0, sizeof(RECORDINSERT));
               ri.cb = sizeof(RECORDINSERT);
@@ -921 +936 @@
           }
         }
-      }                                 // while !eof
+      } // while !eof
 
       fclose(fp);
@@ -928 +943 @@
         numarcfiles = 0;                // Request close
       else if (!numarcfiles || !gotstart
-               || (!gotend && info->endlist && *info->endlist &&
-                   (stricmp(info->endlist, NO_END_OF_ARCHIVER_LIST_STRING)))) {
+               || (!gotend && info->endlist && *info->endlist &&
+                   (stricmp(info->endlist, NO_END_OF_ARCHIVER_LIST_STRING)))) {
         // Oops
         ARCDUMP ad;
@@ -946 +961 @@
             goto ReTry;
           }
-        } while (tinfo);
-        if (!fAlertBeepOff)
-          DosBeep(750, 50);             // wake up user
-
-        if (cnter > 0) {
-          CHAR Temp[CCHMAXPATH + 2];
-
-          sprintf(errstr, GetPString(IDS_ARCERRORINFOTEXT),
-                  arcname,
-                  !gotstart ? GetPString(IDS_NOGOTSTARTTEXT) : NullStr,
-                  !numarcfiles ? GetPString(IDS_NOARCFILESFOUNDTEXT) : NullStr,
-                  !gotend ? GetPString(IDS_NOENDOFLISTTEXT) : NullStr,
-                  !notest ? NullStr : GetPString(IDS_ARCNOTEST));
-          memset(&ad, 0, sizeof(ARCDUMP));
-          ad.info = info;
-          strcpy(ad.listname, arctemp);
-          strcpy(ad.arcname, arcname);
-          if (!notest) {
-            strcpy(Temp, info->test);
-            info->test = xstrdup(TestStr, pszSrcFile, __LINE__);
-          }
-          else if (rc) {
-            strcpy(Temp, info->test);
-            info->test = NULL;
-          }
-          ad.errmsg = errstr;
-          WinDlgBox(HWND_DESKTOP,
-                    hwndCnr,
-                    ArcErrProc, FM3ModHandle, ARCERR_FRAME, MPFROMP(&ad));
-          if (!notest || rc)
-            info->test = xstrdup(Temp, pszSrcFile, __LINE__);
-        }
-        else
-          saymsg(MB_OK, HWND_DESKTOP, GetPString(IDS_ARCMISSINGEXE),
-                 GetPString(IDS_ARCMISSINGEXEVERBOSE));
+        } while (tinfo);
+        if (!fAlertBeepOff)
+          DosBeep(750, 50);             // wake up user
+
+        if (cnter > 0) {
+          CHAR Temp[CCHMAXPATH + 2];
+
+          sprintf(errstr, GetPString(IDS_ARCERRORINFOTEXT),
+                  arcname,
+                  !gotstart ? GetPString(IDS_NOGOTSTARTTEXT) : NullStr,
+                  !numarcfiles ? GetPString(IDS_NOARCFILESFOUNDTEXT) : NullStr,
+                  !gotend ? GetPString(IDS_NOENDOFLISTTEXT) : NullStr,
+                  !notest ? NullStr : GetPString(IDS_ARCNOTEST));
+          memset(&ad, 0, sizeof(ARCDUMP));
+          ad.info = info;
+          strcpy(ad.listname, arctemp);
+          strcpy(ad.arcname, arcname);
+          if (!notest) {
+            strcpy(Temp, info->test);
+            info->test = xstrdup(TestStr, pszSrcFile, __LINE__);
+          }
+          else if (rc) {
+            strcpy(Temp, info->test);
+            info->test = NULL;
+          }
+          ad.errmsg = errstr;
+          WinDlgBox(HWND_DESKTOP,
+                    hwndCnr,
+                    ArcErrProc, FM3ModHandle, ARCERR_FRAME, MPFROMP(&ad));
+          if (!notest || rc)
+            info->test = xstrdup(Temp, pszSrcFile, __LINE__);
+        }
+        else
+          saymsg(MB_OK, HWND_DESKTOP, GetPString(IDS_ARCMISSINGEXE),
+                 GetPString(IDS_ARCMISSINGEXEVERBOSE));
       }
       else if (!nomove && tinfo) {
@@ -994 +1009 @@
         rewrite_archiverbb2(NULL);      // Rewrite with warning
       }
-    }                                   // if opened
+    } // if opened
 
     DosError(FERR_DISABLEHARDERR);
@@ -1129 +1144 @@
 
   case WM_MENUEND:
-    if (hwndButtonPopup == (HWND) mp2) {
-      lastid = WinQueryWindowUShort((HWND) mp2, QWS_ID);
+    if (hwndButtonPopup == (HWND)mp2) {
+      lastid = WinQueryWindowUShort((HWND)mp2, QWS_ID);
       WinDestroyWindow(hwndButtonPopup);
       hwndButtonPopup = (HWND) 0;
@@ -1319 +1334 @@
           break;
         }
-        cnd.pDragInfo = (PDRAGINFO) mp1;
+        cnd.pDragInfo = (PDRAGINFO)mp1;
         cnd.pRecord = NULL;
         return WinSendMsg(WinQueryWindow(hwnd, QW_PARENT),
@@ -1456 +1471 @@
 
       cni.pRecord = NULL;
-      cni.pDragInfo = (PDRAGINFO) mp1;
+      cni.pDragInfo = (PDRAGINFO)mp1;
       li = DoFileDrop(dcd->hwndCnr,
                       dcd->directory, FALSE, MPVOID, MPFROMP(&cni));
@@ -1478 +1493 @@
     if (dcd && dcd->info && dcd->info->extract && dcd->arcname) {
 
-      PDRAGTRANSFER pdt = (PDRAGTRANSFER) mp1;
+      PDRAGTRANSFER pdt = (PDRAGTRANSFER)mp1;
       CHAR filename[CCHMAXPATH];
       ULONG len;
@@ -1508 +1523 @@
   case UM_RENDER:
     {
-      PDRAGTRANSFER pdt = (PDRAGTRANSFER) mp1;
+      PDRAGTRANSFER pdt = (PDRAGTRANSFER)mp1;
       USHORT usRes = DMFL_RENDERFAIL;
 
@@ -1572 +1587 @@
       dcd->hwndObject = hwnd;           // pass back hwnd
       if (ParentIsDesktop(hwnd, dcd->hwndParent))
-        DosSleep(100); //05 Aug 07 GKY 250 // Avoid race?
+        DosSleep(100);                  // 05 Aug 07 GKY was 250 - avoid race?
     }
     return 0;
@@ -1622 +1637 @@
         {
           MASK mask;
-          PARCITEM pci = (PARCITEM) mp2;
+          PARCITEM pai = (PARCITEM)mp2;
 
           memset(&mask, 0, sizeof(MASK));
@@ -1631 +1646 @@
                  GetPString((SHORT1FROMMP(mp1) == IDM_SELECTMASK) ?
                             IDS_SELECTFILTERTEXT : IDS_DESELECTFILTERTEXT));
-          if (pci && (INT) pci != -1)
-            strcpy(mask.szMask, pci->pszFileName);
+          if (pai && (INT)pai != -1)
+            strcpy(mask.szMask, pai->pszFileName);
           if (WinDlgBox(HWND_DESKTOP, dcd->hwndCnr, PickMaskDlgProc,
                         FM3ModHandle, MSK_FRAME, MPFROMP(&mask))) {
@@ -1640 +1655 @@
               DeselectAll(dcd->hwndCnr, TRUE, TRUE, mask.szMask, NULL, FALSE);
           }
-        }
-        break;
+        }
+        break;
 
       case IDM_INVERT:
@@ -1654 +1669 @@
     if (dcd) {
 
-      CHAR *s = (CHAR *) mp1, *p, *pp; // filename[CCHMAXPATH];
+      CHAR *s = (CHAR *) mp1, *p, *pp;  // filename[CCHMAXPATH];
       WAITCHILD *WaitChild;
 
@@ -1683 +1698 @@
             memmove(s, p + 1, strlen(p + 1));
         }
-        sprintf(WaitChild->filename, "%s\\%s", dcd->workdir, s);
-        ForwardslashToBackslash(WaitChild->filename);
+        sprintf(WaitChild->filename, "%s\\%s", dcd->workdir, s);
+        ForwardslashToBackslash(WaitChild->filename);
         free(s);
         WaitChild->RunFlags = SEPARATE | ASYNCHRONOUS | WAIT |
@@ -1736 +1751 @@
             ad.namecanchange = 0;
             ad.fmoving = (li->type == IDM_ARCHIVEM);
-            if (!WinDlgBox(HWND_DESKTOP, dcd->hwndClient, ArchiveDlgProc,
-                           FM3ModHandle, ARCH_FRAME, (PVOID) & ad) || !*ad.arcname ||
-                !*ad.command)   // we blew it
+            if (!WinDlgBox(HWND_DESKTOP, dcd->hwndClient, ArchiveDlgProc,
+                           FM3ModHandle, ARCH_FRAME, (PVOID) & ad) || !*ad.arcname ||
+                !*ad.command)           // we blew it
               break;
             // build the sucker
@@ -1895 +1910 @@
               for (x = 0; li->list[x]; x++) {
                 BldFullPathName(fullname, li->targetpath, li->list[x]);
-                //Check if file already exists on disk warn if it does.
+                // Check if file already exists on disk warn if it does.
                 if (IsFile(fullname) != -1) {
                   AddToList(li->list[x], &exfiles, &numfiles, &numalloc);
@@ -1945 +1960 @@
                       li->type == IDM_OPENDEFAULT ||
                       li->type == IDM_OPENSETTINGS ||
-                      (li->type == IDM_EDITBINARY ||            // JBS No way for this () to be true??
+                      (li->type == IDM_EDITBINARY ||    // JBS No way for this () to be true??
                        li->type == IDM_MCIPLAY)) ||
                      !li->info->exwdirs)) ?
@@ -1979 +1994 @@
                 CHAR *temp, *p;
 
-                temp = li->list[x];
-                ForwardslashToBackslash(temp);
+                temp = li->list[x];
+                ForwardslashToBackslash(temp);
                 p = xmalloc(strlen(temp) + strlen(li->targetpath) + 2,
                             pszSrcFile, __LINE__);
@@ -2017 +2032 @@
               ExecOnList(hwnd,
                          li->runfile,
-                         WINDOWED | SEPARATEKEEP | PROMPT,
-                         li->targetpath, NULL, NULL, GetPString(IDS_EXECARCFILETITLETEXT),
+                         WINDOWED | SEPARATEKEEP | PROMPT,
+                         li->targetpath, NULL, NULL, GetPString(IDS_EXECARCFILETITLETEXT),
                          pszSrcFile, __LINE__);
             else if (li->type == IDM_VIRUSSCAN)
@@ -2078 +2093 @@
 
                 FILE *fp;
-                CHAR szTempFile[CCHMAXPATH];
-                CHAR *modew = "w";
-
-                if (pTmpDir && !IsValidDir(pTmpDir))
-                  DosCreateDir(pTmpDir, 0);
+                CHAR szTempFile[CCHMAXPATH];
+                CHAR *modew = "w";
+
+                if (pTmpDir && !IsValidDir(pTmpDir))
+                  DosCreateDir(pTmpDir, 0);
                 BldFullPathName(szTempFile, pTmpDir, PCSZ_FM2PLAYTEMP);
                 fp = xfopen(szTempFile, modew, pszSrcFile, __LINE__, FALSE);
@@ -2134 +2149 @@
                                   (li->type == IDM_EDITTEXT) ? editor :
                                   bined),
-                           WINDOWED | SEPARATE, NULL, NULL, 
-                           li->list,
+                           WINDOWED | SEPARATE, NULL, NULL,
+                           li->list,
                            NULL, pszSrcFile, __LINE__);
               }
@@ -2213 +2228 @@
             CHAR **list2 = NULL, fullname[CCHMAXPATH * 2], *p;
 
-            for (x = 0; li->list[x]; x++) {
-              ForwardslashToBackslash(li->list[x]);
+            for (x = 0; li->list[x]; x++) {
+              ForwardslashToBackslash(li->list[x]);
               BldFullPathName(fullname, dcd->directory, li->list[x]);
               if (IsFile(fullname) != -1)
@@ -2237 +2252 @@
               WinSendMsg(dcd->hwndCnr, WM_COMMAND,
                          MPFROM2SHORT(IDM_COLLECTOR, 0), MPVOID);
-              DosSleep(10); 
+              DosSleep(10);
               if (Collector) {
                 if (!PostMsg(Collector, WM_COMMAND,
@@ -2284 +2299 @@
       WinSendMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID);
     break;
-  }                                     // switch
+  } // switch
   return WinDefWindowProc(hwnd, msg, mp1, mp2);
 }
@@ -2315 +2330 @@
 
     if (SearchContainer(hwnd, msg, mp1, mp2))
-        return (MRESULT)TRUE;           // Avoid default handler
+        return (MRESULT)TRUE;           // Avoid default handler
     break;                              // Let default handler see key too
 
@@ -2382 +2397 @@
       // Display parsed date/time columns if type specified
       AdjustCnrColVis(hwnd,
-                      GetPString(IDS_TIMECOLTEXT),
-                      dcd->info->fdpos != -1 && dcd->info->datetype, FALSE);
+                      GetPString(IDS_TIMECOLTEXT),
+                      dcd->info->fdpos != -1 && dcd->info->datetype, FALSE);
       AdjustCnrColVis(hwnd,
-                      GetPString(IDS_DATECOLTEXT),
-                      dcd->info->fdpos != -1 && dcd->info->datetype, FALSE);
+                      GetPString(IDS_DATECOLTEXT),
+                      dcd->info->fdpos != -1 && dcd->info->datetype, FALSE);
       WinSendMsg(hwnd, CM_INVALIDATEDETAILFIELDINFO, MPVOID, MPVOID);
     }
@@ -2395 +2410 @@
       CNRINFO cnri;
       CHAR s[CCHMAXPATH * 2], tb[81], tf[81];
-      PARCITEM pci;
+      PARCITEM pai;
 
       if (mp1) {
@@ -2432 +2447 @@
         WinSetWindowText(hwndStatus, s);
         if (!ParentIsDesktop(hwnd, dcd->hwndParent)) {
-          pci = WinSendMsg(hwnd,
+          pai = WinSendMsg(hwnd,
                            CM_QUERYRECORDEMPHASIS,
                            MPFROMLONG(CMA_FIRST), MPFROMSHORT(CRA_CURSORED));
-          if (pci && (INT) pci != -1) {
+          if (pai && (INT)pai != -1) {
             if (fSplitStatus && hwndStatus2) {
               if (dcd->ullTotalBytes)
-                CommaFmtULL(tb, sizeof(tb), pci->cbFile, ' ');
+                CommaFmtULL(tb, sizeof(tb), pai->cbFile, ' ');
               else
                 *tb = 0;
               sprintf(s, "%s%s%s%s",
                       *tb ? " " : NullStr,
-                      tb, *tb ? "  " : NullStr, pci->pszFileName);
+                      tb, *tb ? "  " : NullStr, pai->pszFileName);
               WinSetWindowText(hwndStatus2, s);
             }
             if (fMoreButtons)
-              WinSetWindowText(hwndName, pci->pszFileName);
+              WinSetWindowText(hwndName, pai->pszFileName);
           }
           else {
@@ -2483 +2498 @@
             if (rc == ERROR_ACCESS_DENIED) {
               p = strrchr(dcd->workdir, '.');
-              if (p) {          /* jbs: What if there is no "."? Give up? */
+              // jbs: What if there is no "."? Give up? FIXME
+              if (p) {
                 p++;
                 was = strtoul(p, NULL, 16);
@@ -2495 +2511 @@
               }
             }
-            if (rc) {
+            if (rc) {
               PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);
-              return 0;
-            }
+              return 0;
+            }
           }
         }
@@ -2556 +2572 @@
             fii.cb = sizeof(FIELDINFOINSERT);
             fii.pFieldInfoOrder = (PFIELDINFO) CMA_FIRST;
-            fii.cFieldInfoInsert = (SHORT) numcols;
+            fii.cFieldInfoInsert = (SHORT)numcols;
             fii.fInvalidateFieldInfo = TRUE;
             WinSendMsg(hwnd,
@@ -2650 +2666 @@
       }
       WinSetDlgItemText(dcd->hwndClient, ARC_EXTRACTDIR, dcd->directory);
-      return (MRESULT) ret;
+      return (MRESULT)ret;
     }
     return 0;
@@ -2679 +2695 @@
     if (dcd) {
 
-      HWND hwndMenu = (HWND) mp2;
+      HWND hwndMenu = (HWND)mp2;
 
       if (hwndMenu == ArcCnrMenu || hwndMenu == ArcMenu) {
@@ -2716 +2732 @@
       case IDM_FILESMENU:
         if (dcd->info) {
-          WinEnableMenuItem((HWND) mp2,
+          WinEnableMenuItem((HWND)mp2,
                             IDM_DELETE, dcd->info->delete != NULL);
-          WinEnableMenuItem((HWND) mp2, IDM_TEST, dcd->info->test != NULL);
-          WinEnableMenuItem((HWND) mp2, IDM_EXTRACT,
-                            dcd->info->extract != NULL && !strstr(dcd->info->ext, "TAR"));
-          WinEnableMenuItem((HWND) mp2, IDM_ARCEXTRACT,
-                            dcd->info->extract != NULL && !strstr(dcd->info->ext, "TAR"));
-          WinEnableMenuItem((HWND) mp2,
+          WinEnableMenuItem((HWND)mp2, IDM_TEST, dcd->info->test != NULL);
+          WinEnableMenuItem((HWND)mp2, IDM_EXTRACT,
+                            dcd->info->extract != NULL && !strstr(dcd->info->ext, "TAR"));
+          WinEnableMenuItem((HWND)mp2, IDM_ARCEXTRACT,
+                            dcd->info->extract != NULL && !strstr(dcd->info->ext, "TAR"));
+          WinEnableMenuItem((HWND)mp2,
                             IDM_EXTRACTWDIRS, dcd->info->exwdirs != NULL);
-          WinEnableMenuItem((HWND) mp2,
+          WinEnableMenuItem((HWND)mp2,
                             IDM_ARCEXTRACTWDIRS, dcd->info->exwdirs != NULL);
-          WinEnableMenuItem((HWND) mp2,
+          WinEnableMenuItem((HWND)mp2,
                             IDM_ARCEXTRACTWDIRSEXIT,
                             dcd->info->exwdirs != NULL);
@@ -2734 +2750 @@
 
       case IDM_VIEWSMENU:
-        WinEnableMenuItem((HWND) mp2, IDM_TEST, dcd->info->test != NULL);
-        WinEnableMenuItem((HWND) mp2, IDM_ARCEXTRACT,
-                            dcd->info->extract != NULL && !strstr(dcd->info->ext, "TAR"));
-        WinCheckMenuItem((HWND) mp2,
+        WinEnableMenuItem((HWND)mp2, IDM_TEST, dcd->info->test != NULL);
+        WinEnableMenuItem((HWND)mp2, IDM_ARCEXTRACT,
+                            dcd->info->extract != NULL && !strstr(dcd->info->ext, "TAR"));
+        WinCheckMenuItem((HWND)mp2,
                          IDM_MINIICONS, (dcd->flWindowAttr & CV_MINI) != 0);
-        WinEnableMenuItem((HWND) mp2,
+        WinEnableMenuItem((HWND)mp2,
                           IDM_RESELECT, (dcd->lastselection != NULL));
         break;
 
       case IDM_COMMANDSMENU:
-        SetupCommandMenu((HWND) mp2, hwnd);
+        SetupCommandMenu((HWND)mp2, hwnd);
         break;
 
       case IDM_SORTSUBMENU:
-        SetSortChecks((HWND) mp2, dcd->sortFlags);
+        SetSortChecks((HWND)mp2, dcd->sortFlags);
         break;
 
@@ -2759 +2775 @@
         break;
       }
-      dcd->hwndLastMenu = (HWND) mp2;
+      dcd->hwndLastMenu = (HWND)mp2;
     }
     if (msg == WM_INITMENU)
@@ -2920 +2936 @@
       case IDM_INVERT:
         {
-          PARCITEM pci;
-
-          pci = (PARCITEM) WinSendMsg(hwnd,
-                                      CM_QUERYRECORDEMPHASIS,
-                                      MPFROMLONG(CMA_FIRST),
-                                      MPFROMSHORT(CRA_CURSORED));
-          if ((INT) pci == -1)
-            pci = NULL;
+          PARCITEM pai = (PARCITEM)WinSendMsg(hwnd,
+                                              CM_QUERYRECORDEMPHASIS,
+                                              MPFROMLONG(CMA_FIRST),
+                                              MPFROMSHORT(CRA_CURSORED));
+          if ((INT)pai == -1)
+            pai = NULL;
           if (SHORT1FROMMP(mp1) == IDM_HIDEALL) {
-            if (pci) {
-              if (!(pci->rc.flRecordAttr & CRA_SELECTED))
-                pci->rc.flRecordAttr |= CRA_FILTERED;
+            if (pai) {
+              if (!(pai->rc.flRecordAttr & CRA_SELECTED))
+                pai->rc.flRecordAttr |= CRA_FILTERED;
               WinSendMsg(hwnd,
                          CM_INVALIDATERECORD,
-                         MPFROMP(&pci),
+                         MPFROMP(&pai),
                          MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION));
               break;
             }
           }
-          PostMsg(dcd->hwndObject, UM_SELECT, mp1, MPFROMP(pci));
+          PostMsg(dcd->hwndObject, UM_SELECT, mp1, MPFROMP(pai));
         }
         break;
@@ -3013 +3027 @@
             }
             WinSetWindowPos(hwndC, HWND_TOP, 0, 0, 0, 0, SWP_ACTIVATE);
-            DosSleep(100); 
+            DosSleep(100);
           }
         }
@@ -3024 +3038 @@
         if (dcd->directory && fFileNameCnrPath &&
             stricmp(lastextractpath, dcd->directory)) {
-          strcpy(lastextractpath, dcd->directory);
+          strcpy(lastextractpath, dcd->directory);
           SetDir(dcd->hwndParent, hwnd, dcd->directory, 1);
         }
@@ -3062 +3076 @@
         {
           BOOL empty = FALSE;
-          PARCITEM pci;
+          PARCITEM pai;
 
           if (!*dcd->mask.szMask) {
             empty = TRUE;
-            pci = (PARCITEM) CurrentRecord(hwnd);
-            if (pci && (INT) pci != -1 && strchr(pci->pszFileName, '.'))
-              strcpy(dcd->mask.szMask, pci->pszFileName);
+            pai = (PARCITEM) CurrentRecord(hwnd);
+            if (pai && (INT)pai != -1 && strchr(pai->pszFileName, '.'))
+              strcpy(dcd->mask.szMask, pai->pszFileName);
           }
 
@@ -3150 +3164 @@
             li->type = SHORT1FROMMP(mp1);
             li->hwnd = hwnd;
-            li->list = BuildArcList(hwnd);
-            if (li->type == IDM_DELETE)
-              ignorereadonly = FALSE;
+            li->list = BuildArcList(hwnd);
+            if (li->type == IDM_DELETE)
+              ignorereadonly = FALSE;
             if (li->type == IDM_REFRESH) {
 
@@ -3177 +3191 @@
                   }
                 }
-              }                         // for
+              } // for
             }
             strcpy(li->arcname, dcd->arcname);
@@ -3190 +3204 @@
                                             MPFROMLONG(CMA_FIRST),
                                             MPFROMSHORT(CRA_CURSORED));
-              if (pai && (INT) pai != -1)
+              if (pai && (INT)pai != -1)
                 strcpy(li->runfile, pai->pszFileName);
               else
@@ -3245 +3259 @@
 
       case CN_ENDEDIT:
-        if (!((PCNREDITDATA) mp2)->pRecord) {
-
-          PFIELDINFO pfi = ((PCNREDITDATA) mp2)->pFieldInfo;
+        if (!((PCNREDITDATA)mp2)->pRecord) {
+
+          PFIELDINFO pfi = ((PCNREDITDATA)mp2)->pFieldInfo;
           USHORT cmd = 0;
 
@@ -3276 +3290 @@
           PDRAGINFO pDInfo;
 
-          pDInfo = ((PCNRDRAGINFO) mp2)->pDragInfo;
+          pDInfo = ((PCNRDRAGINFO)mp2)->pDragInfo;
           DrgAccessDraginfo(pDInfo);    // Access DRAGINFO
           DrgFreeDraginfo(pDInfo);      // Free DRAGINFO
@@ -3288 +3302 @@
           PDRAGITEM pDItem;             // Pointer to DRAGITEM
           PDRAGINFO pDInfo;             // Pointer to DRAGINFO
-          PARCITEM pci;
-
-          pci = (PARCITEM) ((PCNRDRAGINFO) mp2)->pRecord;
+          PARCITEM pai = (PARCITEM)((PCNRDRAGINFO)mp2)->pRecord;
+
           if (SHORT1FROMMP(mp1) == CN_DRAGAFTER)
-            pci = NULL;
-          pDInfo = ((PCNRDRAGINFO) mp2)->pDragInfo;
+            pai = NULL;
+          pDInfo = ((PCNRDRAGINFO)mp2)->pDragInfo;
           DrgAccessDraginfo(pDInfo);    // Access DRAGINFO
           if (*dcd->arcname) {
@@ -3302 +3315 @@
             }
           }
-          if (pci && (INT) pci != -1) {
+          if (pai && (INT)pai != -1) {
             DrgFreeDraginfo(pDInfo);
             return MRFROM2SHORT(DOR_NODROP, 0);
           }
-          pDItem = DrgQueryDragitemPtr(pDInfo,          // Access DRAGITEM
-                                       0);              // Index to DRAGITEM
-          if (DrgVerifyRMF(pDItem,                      // Check valid rendering
+          pDItem = DrgQueryDragitemPtr(pDInfo,  // Access DRAGITEM
+                                       0);      // Index to DRAGITEM
+          // Check valid rendering
+          if (DrgVerifyRMF(pDItem,
                            (CHAR *) DRM_OS2FILE,        // mechanisms and data
                            NULL) && !(pDItem->fsControl & DC_PREPARE)) {
@@ -3323 +3337 @@
 
           BOOL wasemphasized = FALSE;
-          PCNRDRAGINIT pcd = (PCNRDRAGINIT) mp2;
-          PARCITEM pci;
+          PCNRDRAGINIT pcd = (PCNRDRAGINIT)mp2;
+          PARCITEM pai;
 
           if (pcd) {
-            pci = (PARCITEM) pcd->pRecord;
-            if (pci && (INT) pci != -1) {
-              if (pci->rc.flRecordAttr & CRA_SELECTED)
+            pai = (PARCITEM)pcd->pRecord;
+            if (pai && (INT)pai != -1) {
+              if (pai->rc.flRecordAttr & CRA_SELECTED)
                 wasemphasized = TRUE;
               if (!ParentIsDesktop(hwnd, dcd->hwndParent) &&
@@ -3379 +3393 @@
       case CN_CONTEXTMENU:
         {
-          PARCITEM pci = (PARCITEM) mp2;
-
-          if (pci && (INT) pci != -1) {
-            WinSendMsg(hwnd, CM_SETRECORDEMPHASIS, MPFROMP(pci),
+          PARCITEM pai = (PARCITEM)mp2;
+
+          if (pai && (INT)pai != -1) {
+            WinSendMsg(hwnd, CM_SETRECORDEMPHASIS, MPFROMP(pai),
                        MPFROM2SHORT(TRUE, CRA_CURSORED));
             MarkAll(hwnd, FALSE, FALSE, TRUE);
@@ -3418 +3432 @@
 
           PNOTIFYRECORDEMPHASIS pre = mp2;
-          PARCITEM pci;
           CHAR s[CCHMAXPATHCOMP + 91], tf[81], tb[81];
-
-          pci = (PARCITEM)(pre ? pre->pRecord : NULL);
-          if (!pci) {
+          PARCITEM pai = (PARCITEM)(pre ? pre->pRecord : NULL);
+
+          if (!pai) {
             if (!ParentIsDesktop(hwnd, dcd->hwndParent)) {
               if (hwndStatus2)
@@ -3432 +3445 @@
           }
           if (pre->fEmphasisMask & CRA_SELECTED) {
-            if (pci->rc.flRecordAttr & CRA_SELECTED) {
-              dcd->selectedbytes += pci->cbFile;
+            if (pai->rc.flRecordAttr & CRA_SELECTED) {
+              dcd->selectedbytes += pai->cbFile;
               dcd->selectedfiles++;
             }
             else if (dcd->selectedfiles) {
-              dcd->selectedbytes -= pci->cbFile;
+              dcd->selectedbytes -= pai->cbFile;
               dcd->selectedfiles--;
             }
@@ -3452 +3465 @@
                    !ParentIsDesktop(hwnd, dcd->hwndParent)) {
             if (pre->fEmphasisMask & CRA_CURSORED) {
-              if (pci->rc.flRecordAttr & CRA_CURSORED) {
+              if (pai->rc.flRecordAttr & CRA_CURSORED) {
                 if (fSplitStatus && hwndStatus2) {
                   if (dcd->ullTotalBytes)
-                    CommaFmtULL(tb, sizeof(tb), pci->cbFile, ' ');
+                    CommaFmtULL(tb, sizeof(tb), pai->cbFile, ' ');
                   else
                     *tb = 0;
                   sprintf(s, "%s%s%s%s",
                           *tb ? " " : NullStr,
-                          tb, *tb ? "  " : NullStr, pci->pszFileName);
+                          tb, *tb ? "  " : NullStr, pai->pszFileName);
                   WinSetWindowText(hwndStatus2, s);
                 }
                 if (fMoreButtons)
-                  WinSetWindowText(hwndName, pci->pszFileName);
+                  WinSetWindowText(hwndName, pai->pszFileName);
               }
             }
@@ -3474 +3487 @@
         if (mp2) {
 
-          PARCITEM pci = (PARCITEM) ((PNOTIFYRECORDENTER) mp2)->pRecord;
-
-          if (pci && (INT) pci != -1) {
+          PARCITEM pai = (PARCITEM)((PNOTIFYRECORDENTER)mp2)->pRecord;
+
+          if (pai && (INT)pai != -1) {
 
             CHAR *s;
 
-            if ((pci->rc.flRecordAttr & CRA_INUSE) ||
-                (pci->flags & (ARCFLAGS_REALDIR | ARCFLAGS_PSEUDODIR)))
+            if ((pai->rc.flRecordAttr & CRA_INUSE) ||
+                (pai->flags & (ARCFLAGS_REALDIR | ARCFLAGS_PSEUDODIR)))
               break;
-            s = xstrdup(pci->pszFileName, pszSrcFile, __LINE__);
+            s = xstrdup(pai->pszFileName, pszSrcFile, __LINE__);
             if (s) {
               if (!PostMsg(dcd->hwndObject, UM_ENTER, MPFROMP(s), MPVOID)) {
@@ -3578 +3591 @@
         PCSZ szHelpString = NULL;
 
-
         for (i=0; i<MenuItems; i++) {
           sCurrentMenuitem = asMenuIDs[i];
@@ -3590 +3602 @@
             MOUSEMSG(&msg)->y < rectl.yTop)
            break;
-        }                      // for
-
+        } // for
 
          switch (sCurrentMenuitem) {
@@ -3711 +3722 @@
         dcd->id = id;
         dcd->type = ARC_FRAME;
-        if (pTmpDir && !IsValidDir(pTmpDir))
-          DosCreateDir(pTmpDir, 0);
+        if (pTmpDir && !IsValidDir(pTmpDir))
+          DosCreateDir(pTmpDir, 0);
         MakeTempName(dcd->workdir, ArcTempRoot, 2);
         strcpy(dcd->arcname, fullname);
@@ -3729 +3740 @@
           else
             strcpy(dcd->directory, extractpath);
-        }
+        }
         if (!*dcd->directory && *lastextractpath) {
           DosRequestMutexSem(hmtxFM2Globals, SEM_INDEFINITE_WAIT);
@@ -3765 +3776 @@
 
           oldproc = WinSubclassWindow(hwndFrame, (PFNWP) ArcFrameWndProc);
-          WinSetWindowPtr(hwndFrame, QWL_USER, (PVOID) oldproc);
+          WinSetWindowPtr(hwndFrame, QWL_USER, (PVOID)oldproc);
         }
         dcd->hwndCnr = WinCreateWindow(hwndClient,
@@ -3787 +3798 @@
         }
         else {
-          WinSetWindowPtr(dcd->hwndCnr, QWL_USER, (PVOID) dcd);
+          WinSetWindowPtr(dcd->hwndCnr, QWL_USER, (PVOID)dcd);
           dcd->oldproc = WinSubclassWindow(dcd->hwndCnr,
                                            (PFNWP) ArcCnrWndProc);
@@ -3820 +3831 @@
 
             oldmenuproc = WinSubclassWindow(hwndMenu, (PFNWP) ArcCnrMenuProc);
-            WinSetWindowPtr(hwndMenu, QWL_USER, (PVOID) oldmenuproc);
+            WinSetWindowPtr(hwndMenu, QWL_USER, (PVOID)oldmenuproc);
             if (!fToolbar) {
 

trunk/dll/filldir.c

@@ -125 +125 @@
   26 Sep 15 GKY Remove fInitialDriveScan code
   28 Jan 20 SHL EmptyCnr: report more errors
-  29 Jan 20 SHL RemoveCnrItems: rework removal from prev/next chain
+  29 Jan 20 SHL Rework RemoveCnrItems removal to not use prev/next chain
+  30 Jan 20 SHL Rework RemoveCnrItems to avoid possible traps on bad input
+  30 Jan 20 SHL Clean up some inconsistent formatting
 
 ***********************************************************************/
@@ -297 +299 @@
       hptr = hptrArt;
     else
-      hptr = (HPOINTER) 0;
+      hptr = (HPOINTER)0;
   }
   else
-    hptr = (HPOINTER) 0;
+    hptr = (HPOINTER)0;
 
   return hptr;
@@ -319 +321 @@
 
   // try to guess WPS default file icon
-  hptr2 = (HPOINTER) 0;
+  hptr2 = (HPOINTER)0;
   for (u = 0; !hptrWPSFile && u < 10; u++) {
     char szFileName[CCHMAXPATH];
@@ -367 +369 @@
   ULONG flags = driveflags[toupper(*pci->pszFileName) - 'A'];
   BOOL fLoadSubjectForDrive = fLoadSubject && ~flags & DRIVE_NOLOADSUBJS;
-  BOOL fLoadLongNameForDrive = fLoadLongnames &&        // ~flags & DRIVE_NOLONGNAMES &&
+  BOOL fLoadLongNameForDrive = fLoadLongnames &&        // ~flags & DRIVE_NOLONGNAMES &&
                                ~flags & DRIVE_NOLOADLONGS;
   if (fLoadSubjectForDrive || fLoadLongNameForDrive) {
@@ -411 +413 @@
         eaop.fpFEA2List = pfealist;
         eaop.oError = 0;
-        rc = DosQueryPathInfo(pci->pszFileName, FIL_QUERYEASFROMLIST,
-                              (PVOID) &eaop, (ULONG) sizeof(EAOP2));
+        rc = DosQueryPathInfo(pci->pszFileName,
+                              FIL_QUERYEASFROMLIST,
+                              (PVOID)&eaop,
+                              (ULONG)sizeof(EAOP2));
         // Prevent this error from occuring when scanning a directory
         // that contains a locked data file
@@ -533 +537 @@
         (flags & DRIVE_NOLOADICONS) ||
         !isalpha(*pci->pszFileName)) {
-      hptr = (HPOINTER) 0;
+      hptr = (HPOINTER)0;
     }
     else
@@ -543 +547 @@
         (flags & DRIVE_NOLOADICONS) ||
         !isalpha(*pci->pszFileName)) {
-      hptr = (HPOINTER) 0;
+      hptr = (HPOINTER)0;
     }
     else
@@ -630 +634 @@
                != (FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY | FILE_ARCHIVED)))) {
     if (*dcd->mask.szMask || dcd->mask.antiattr) {
-      if (!Filter((PMINIRECORDCORE) pci, (PVOID) & dcd->mask))
+      if (!Filter((PMINIRECORDCORE)pci, (PVOID)&dcd->mask))
         pci->rc.flRecordAttr |= CRA_FILTERED;
     }
@@ -792 +796 @@
         (FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY | FILE_ARCHIVED)))) {
     if (*dcd->mask.szMask || dcd->mask.antiattr) {
-      if (!Filter((PMINIRECORDCORE) pci, (PVOID) & dcd->mask))
+      if (!Filter((PMINIRECORDCORE)pci, (PVOID)&dcd->mask))
         pci->rc.flRecordAttr |= CRA_FILTERED;
     }
@@ -954 +958 @@
                                                pffbFile, partial, dcd);
                 pciNext = pci;
-                pci = (PCNRITEM) pci->rc.preccNextRecord;
+                pci = (PCNRITEM)pci->rc.preccNextRecord;
                 ullTotalBytes += ullBytes;
               } // for
@@ -960 +964 @@
               memset(&ri, 0, sizeof(RECORDINSERT));
               ri.cb = sizeof(RECORDINSERT);
-              ri.pRecordOrder = (PRECORDCORE) CMA_END;
-              ri.pRecordParent = (PRECORDCORE) pciParent;
-              ri.zOrder = (ULONG) CMA_TOP;
+              ri.pRecordOrder = (PRECORDCORE)CMA_END;
+              ri.pRecordParent = (PRECORDCORE)pciParent;
+              ri.zOrder = (ULONG)CMA_TOP;
               ri.cRecordsInsert = ulSelCnt;
               ri.fInvalidateRecord = TRUE;
@@ -978 +982 @@
                   ok = FALSE;
                   ullTotalBytes = 0;
-                  if (WinIsWindow((HAB) 0, hwndCnr))
+                  if (WinIsWindow((HAB)0, hwndCnr))
                     FreeCnrItemList(hwndCnr, pciFirst);
                 }
@@ -1093 +1097 @@
               ullBytes = FillInRecordFromFFB(hwndCnr, pci, pszFileSpec,
                                           pffbFile, partial, dcd);
-              pci = (PCNRITEM) pci->rc.preccNextRecord;
+              pci = (PCNRITEM)pci->rc.preccNextRecord;
               ullTotalBytes += ullBytes;
               DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
@@ -1113 +1117 @@
             memset(&ri, 0, sizeof(RECORDINSERT));
             ri.cb = sizeof(RECORDINSERT);
-            ri.pRecordOrder = (PRECORDCORE) CMA_END;
-            ri.pRecordParent = (PRECORDCORE) pciParent;
-            ri.zOrder = (ULONG) CMA_TOP;
+            ri.pRecordOrder = (PRECORDCORE)CMA_END;
+            ri.pRecordParent = (PRECORDCORE)pciParent;
+            ri.zOrder = (ULONG)CMA_TOP;
             ri.cRecordsInsert = ulRecsToInsert;
             ri.fInvalidateRecord = (!fSyncUpdates && dcd &&
@@ -1130 +1134 @@
                 ok = FALSE;
                 ullTotalBytes = 0;
-                if (WinIsWindow((HAB) 0, hwndCnr))
+                if (WinIsWindow((HAB)0, hwndCnr))
                   FreeCnrItemList(hwndCnr, pciFirst);
                 pciFirst = NULL;
@@ -1271 +1275 @@
   if (!DosQuerySysInfo(QSV_BOOT_DRIVE,
                        QSV_BOOT_DRIVE,
-                       (PVOID) &startdrive,
-                       (ULONG) sizeof(ULONG)) &&
+                       (PVOID)&startdrive,
+                       (ULONG)sizeof(ULONG)) &&
       startdrive)
   {
@@ -1306 +1310 @@
                           CM_ALLOCRECORD,
                           MPFROMLONG(EXTRA_RECORD_BYTES),
-                          MPFROMLONG((ULONG) numtoinsert));
+                          MPFROMLONG((ULONG)numtoinsert));
   }
 
@@ -1351 +1355 @@
               CHAR Key[80];
 
-              sprintf(Key, "%c.VerifyOffChecked", (CHAR) (iDrvNum + 'A'));
+              sprintf(Key, "%c.VerifyOffChecked", (CHAR)(iDrvNum + 'A'));
               fVerifyOffChecked[iDrvNum] = TRUE;
               PrfWriteProfileData(fmprof, appname, Key, &fVerifyOffChecked[iDrvNum], sizeof(BOOL));
@@ -1370 +1374 @@
             rc = DosQueryPathInfo(szDrive,
                                   FIL_QUERYEASIZEL,
-                                  &fsa4, (ULONG) sizeof(FILESTATUS4L));
+                                  &fsa4,
+                                  (ULONG)sizeof(FILESTATUS4L));
             if (rc == ERROR_BAD_NET_RESP) {
               DosError(FERR_DISABLEHARDERR);
               rc = DosQueryPathInfo(szDrive,
                                     FIL_STANDARDL,
-                                    &fsa4, (ULONG) sizeof(FILESTATUS4L));
+                                    &fsa4,
+                                    (ULONG)sizeof(FILESTATUS4L));
               fsa4.cbList = 0;
             }
@@ -1449 +1455 @@
       }
       pci->rc.flRecordAttr |= CRA_RECORDREADONLY;
-      pci = (PCNRITEM) pci->rc.preccNextRecord; // next rec
+      pci = (PCNRITEM)pci->rc.preccNextRecord;  // next rec
     }
     else if (~ulDriveMap & ulDriveMapMask)
@@ -1482 +1488 @@
     memset(&ri, 0, sizeof(RECORDINSERT));
     ri.cb = sizeof(RECORDINSERT);
-    ri.pRecordOrder = (PRECORDCORE) CMA_END;
-    ri.pRecordParent = (PRECORDCORE) NULL;
-    ri.zOrder = (ULONG) CMA_TOP;
+    ri.pRecordOrder = (PRECORDCORE)CMA_END;
+    ri.pRecordParent = (PRECORDCORE)NULL;
+    ri.zOrder = (ULONG)CMA_TOP;
     ri.cRecordsInsert = numtoinsert;
     ri.fInvalidateRecord = FALSE;
@@ -1496 +1502 @@
 
   // move cursor onto the default drive rather than the first drive
-  pci = (PCNRITEM) WinSendMsg(hwndCnr,
-                              CM_QUERYRECORD,
-                              MPVOID,
-                              MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
+  pci = (PCNRITEM)WinSendMsg(hwndCnr,
+                             CM_QUERYRECORD,
+                             MPVOID,
+                             MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
   while (pci && (INT)pci != -1) {
-    if ((ULONG) (toupper(*pci->pszFileName) - '@') == ulCurDriveNum) {
+    if ((ULONG)(toupper(*pci->pszFileName) - '@') == ulCurDriveNum) {
       WinSendMsg(hwndCnr,
                  CM_SETRECORDEMPHASIS,
@@ -1507 +1513 @@
       break;
     }
-    pci = (PCNRITEM) WinSendMsg(hwndCnr,
-                                CM_QUERYRECORD,
-                                MPFROMP(pci),
-                                MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
+    pci = (PCNRITEM)WinSendMsg(hwndCnr,
+                               CM_QUERYRECORD,
+                               MPFROMP(pci),
+                               MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
   }
 
@@ -1528 +1534 @@
       memset(&ri, 0, sizeof(RECORDINSERT));
       ri.cb = sizeof(RECORDINSERT);
-      ri.pRecordOrder = (PRECORDCORE) CMA_END;
-      ri.pRecordParent = (PRECORDCORE) NULL;
-      ri.zOrder = (ULONG) CMA_TOP;
+      ri.pRecordOrder = (PRECORDCORE)CMA_END;
+      ri.pRecordParent = (PRECORDCORE)NULL;
+      ri.zOrder = (ULONG)CMA_TOP;
       ri.cRecordsInsert = 1;
       ri.fInvalidateRecord = FALSE;
@@ -1565 +1571 @@
               memset(&ri, 0, sizeof(RECORDINSERT));
               ri.cb = sizeof(RECORDINSERT);
-              ri.pRecordOrder = (PRECORDCORE) CMA_END;
-              ri.pRecordParent = (PRECORDCORE) pciParent;
-              ri.zOrder = (ULONG) CMA_TOP;
+              ri.pRecordOrder = (PRECORDCORE)CMA_END;
+              ri.pRecordParent = (PRECORDCORE)pciParent;
+              ri.zOrder = (ULONG)CMA_TOP;
               ri.cRecordsInsert = 1;
               ri.fInvalidateRecord = FALSE;
@@ -1591 +1597 @@
 
   // Run Stubby on each hard drive to ensure expand/collapse buttons correct
-  pci = (PCNRITEM) WinSendMsg(hwndCnr,
-                              CM_QUERYRECORD,
-                              MPVOID,
-                              MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
+  pci = (PCNRITEM)WinSendMsg(hwndCnr,
+                             CM_QUERYRECORD,
+                             MPVOID,
+                             MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
   while (pci && (INT)pci != -1) {
-    pciNext = (PCNRITEM) WinSendMsg(hwndCnr,
-                                    CM_QUERYRECORD,
-                                    MPFROMP(pci),
-                                    MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
+    pciNext = (PCNRITEM)WinSendMsg(hwndCnr,
+                                   CM_QUERYRECORD,
+                                   MPFROMP(pci),
+                                   MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
     if (~pci->flags & RECFLAGS_ENV) {
       iDrvNum = toupper(*pci->pszFileName) - 'A';       // 0..25
@@ -1627 +1633 @@
 
   // Fill in environment CNRITEMs, if any
-  pci = (PCNRITEM) WinSendMsg(hwndCnr,
-                              CM_QUERYRECORD,
-                              MPVOID,
-                              MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
+  pci = (PCNRITEM)WinSendMsg(hwndCnr,
+                             CM_QUERYRECORD,
+                             MPVOID,
+                             MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
   while (pci && (INT)pci != -1) {
-    pciNext = (PCNRITEM) WinSendMsg(hwndCnr,
-                                    CM_QUERYRECORD,
-                                    MPFROMP(pci),
-                                    MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
+    pciNext = (PCNRITEM)WinSendMsg(hwndCnr,
+                                   CM_QUERYRECORD,
+                                   MPFROMP(pci),
+                                   MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
     if (pci->flags & RECFLAGS_ENV) {
       pci = (PCNRITEM) WinSendMsg(hwndCnr,
@@ -1645 +1651 @@
         if (pci->flags & RECFLAGS_ENV)
           AddFleshWorkRequest(hwndCnr, pci, eFleshEnv);
-        pci = (PCNRITEM) WinSendMsg(hwndCnr,
-                                    CM_QUERYRECORD,
-                                    MPFROMP(pci),
-                                    MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
+        pci = (PCNRITEM)WinSendMsg(hwndCnr,
+                                   CM_QUERYRECORD,
+                                   MPFROMP(pci),
+                                   MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
       }
       break;
     }
-    pci = (PCNRITEM) WinSendMsg(hwndCnr,
-                                CM_QUERYRECORD,
-                                MPFROMP(pci),
-                                MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
+    pci = (PCNRITEM)WinSendMsg(hwndCnr,
+                               CM_QUERYRECORD,
+                               MPFROMP(pci),
+                               MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
   } // while pci
 
@@ -1763 +1769 @@
 
   // Remove field info descriptors
-  pfi = (PFIELDINFO) WinSendMsg(hwnd, CM_QUERYDETAILFIELDINFO, MPVOID,
-                                MPFROMSHORT(CMA_FIRST));
+  pfi = (PFIELDINFO)WinSendMsg(hwnd,
+                               CM_QUERYDETAILFIELDINFO,
+                               MPVOID,
+                               MPFROMSHORT(CMA_FIRST));
   if (pfi &&
       (INT)WinSendMsg(hwnd, CM_REMOVEDETAILFIELDINFO, MPVOID,
@@ -1955 +1963 @@
   InitITimer(&itdSleep, 500);
   for (usCount = 0; pci; usCount++) {
-    pciNext = (PCNRITEM) pci->rc.preccNextRecord;
+    pciNext = (PCNRITEM)pci->rc.preccNextRecord;
     FreeCnrItemData(pci);
     pci = pciNext;
     if (!IdleIfNeeded(&itdSleep, 30)) {
       for (usCount = usCount + 1; pci; usCount++) {
-        pciNext = (PCNRITEM) pci->rc.preccNextRecord;
+        pciNext = (PCNRITEM)pci->rc.preccNextRecord;
         FreeCnrItemData(pci);
         pci = pciNext;
@@ -1978 +1986 @@
 /**
  * Remove item(s) from container and free associated storage if requested
- * @param pciFirst points to first item to remove or NULL to remove all
+ * @param pciFirst points to specific item to remove or NULL to remove all
  * @param usCnt is 0 to remove all or 1 to remove specific record
  * @param usFlags for CM_REMOVERECORD
@@ -1997 +2005 @@
     remaining = -1;
   }
-  else if (!usFlags & CMA_FREE) {
+  if (!usFlags & CMA_FREE) {
     Runtime_Error(pszSrcFile, __LINE__, "usFlags must have CMA_FREE set");
     remaining = -1;
   }
-  else if (!pciFirst) {
+  if (!pciFirst) {
     // Removing all - query first
     pciFirst = (PCNRITEM)WinSendMsg(hwnd, CM_QUERYRECORD, MPVOID,
@@ -2021 +2029 @@
   // 2020-01-28 SHL Rework to use CMA_NEXT - preccNextRecord method was never reliable
   pci = pciFirst;
-  while (pci && (INT)pci != -1) {
+  while (pci && (INT)pci != -1 && remaining > 0) {
     FreeCnrItemData(pci);
-    if (remaining && --remaining == 0)
-      break;                    // pci point to last CNRITEM to be deleted
+    if (--remaining == 0)
+      break;
     pci = WinSendMsg(hwnd, CM_QUERYRECORD, MPFROMP(pci),
                      MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
@@ -2043 +2051 @@
     remaining = (INT)WinSendMsg(hwnd, CM_REMOVERECORD, MPFROMP(&pciFirst), MPFROM2SHORT(usCnt, usFlags));
     if (remaining == -1)
-      Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_REMOVERECORD hwnd %x pci %p cnt %u", hwnd, pciFirst, usCnt);
+      Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_REMOVERECORD hwnd %x pciFirst %p cnt %u", hwnd, pciFirst, usCnt);
     else if (usCnt == 0 && remaining != 0)
       Runtime_Error(pszSrcFile, __LINE__, "%u records remain after CM_REMOVERECORD", remaining);