Changeset 985

Timestamp:

Mar 1, 2008, 2:37:14 AM (17 years ago)

Author:

Gregg Young

Message:

Update sizes dialog (ticket 44); Make max command line length user settable (ticket 199); use xfree for free in most cases (ticket 212); initial code to check for valid ini file (ticket 102); Some additional refactoring and structure rework; Some documentation updates;

Location:

trunk

Files:

• HISTORY (modified) (1 diff)
• dll/arccnrs.c (modified) (11 diffs)
• dll/assoc.c (modified) (38 diffs)
• dll/autoview.c (modified) (8 diffs)
• dll/avl.c (modified) (3 diffs)
• dll/avv.c (modified) (3 diffs)
• dll/cmdline.c (modified) (6 diffs)
• dll/collect.c (modified) (9 diffs)
• dll/command.c (modified) (23 diffs)
• dll/common.c (modified) (2 diffs)
• dll/comp.c (modified) (19 diffs)
• dll/copyf.c (modified) (7 diffs)
• dll/defview.c (modified) (2 diffs)
• dll/dirsize.c (modified) (25 diffs)
• dll/draglist.c (modified) (7 diffs)
• dll/eas.c (modified) (12 diffs)
• dll/filldir.c (modified) (7 diffs)
• dll/filter.c (modified) (4 diffs)
• dll/flesh.c (modified) (2 diffs)
• dll/fm3dlg.h (modified) (2 diffs)
• dll/fm3dll.h (modified) (3 diffs)
• dll/fm3res.dlg (modified) (3 diffs)
• dll/grep.c (modified) (11 diffs)
• dll/grep2.c (modified) (3 diffs)
• dll/info.c (modified) (3 diffs)
• dll/inis.c (modified) (24 diffs)
• dll/init.c (modified) (9 diffs)
• dll/ipf/context.ipf (modified) (2 diffs)
• dll/literal.c (modified) (2 diffs)
• dll/mainwnd.c (modified) (7 diffs)
• dll/mainwnd2.c (modified) (2 diffs)
• dll/makelist.c (modified) (3 diffs)
• dll/menu.c (modified) (4 diffs)
• dll/misc.c (modified) (8 diffs)
• dll/mkdir.c (modified) (2 diffs)
• dll/mle.c (modified) (10 diffs)
• dll/newview.c (modified) (13 diffs)
• dll/notebook.c (modified) (18 diffs)
• dll/notebook.h (modified) (2 diffs)
• dll/notify.c (modified) (5 diffs)
• dll/objcnr.c (modified) (8 diffs)
• dll/pathutil.c (modified) (6 diffs)
• dll/pathutil.h (modified) (2 diffs)
• dll/presparm.c (modified) (2 diffs)
• dll/remap.c (modified) (8 diffs)
• dll/saveclip.c (modified) (4 diffs)
• dll/seeall.c (modified) (9 diffs)
• dll/select.c (modified) (4 diffs)
• dll/seticon.c (modified) (2 diffs)
• dll/shadow.c (modified) (3 diffs)
• dll/subj.c (modified) (4 diffs)
• dll/systemf.c (modified) (12 diffs)
• dll/tools.c (modified) (5 diffs)
• dll/treecnr.c (modified) (11 diffs)
• dll/undel.c (modified) (3 diffs)
• dll/update.c (modified) (2 diffs)
• dll/viewer.c (modified) (3 diffs)
• dll/viewinf.c (modified) (5 diffs)
• dll/walkem.c (modified) (9 diffs)
• dll/winlist.c (modified) (2 diffs)
• dll/worker.c (modified) (9 diffs)

trunk/HISTORY

@@ -37 +37 @@
  o Restore SaveDirCnrState internal state save logic - accidentally removed
  o Move save shutdown state name to strings (IDS_SHUTDOWNSTATE, ShutdownState)
+ o Add unhide menu option (Gregg)
+ o Enable user settable command line length (Gregg)
+ o Add presparams & update appearence of "Sizes" dialog (Gregg)
 
 3.09

trunk/dll/arccnrs.c

@@ -52 +52 @@
   10 Feb 08 GKY Implement bubble help for bitmap menu items
   15 Feb 08 SHL Sync with settings menu rework
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -1437 +1438 @@
         if (!dcd->info->extract) {
           Runtime_Error(pszSrcFile, __LINE__, "no extract");
-          free(s);
+          xfree(s);
           return 0;
         }
@@ -1467 +1468 @@
         }
         // printf("%s %d UM_ENTER %s %s\n",__FILE__, __LINE__,filename, s); fflush(stdout);     // 10 Mar 07 SHL hang
-        free(s);
+        xfree(s);
         if (IsFile(filename) == 1) {
 #if 1 // 06 Oct 07 SHL fixme to be gone - set to 0 for ticket #58 testing
@@ -1746 +1747 @@
                   strcat(p, temp);
                   li->list[x] = p;
-                  free(temp);
+                  xfree(temp);
                 }
               }
@@ -1993 +1994 @@
       FreeList(dcd->lastselection);
       WinSendMsg(dcd->hwndCnr, UM_CLOSE, MPVOID, MPVOID);
-      free(dcd);
+      xfree(dcd);
       WinSetWindowPtr(dcd->hwndCnr, QWL_USER, NULL);
     }
@@ -2540 +2541 @@
       ret = StartMLEEditor(dcd->hwndParent,
                            (INT) mp1, (CHAR *) mp2, dcd->hwndFrame);
-      free((CHAR *) mp2);
+      xfree((CHAR *) mp2);
       return MRFROMLONG(ret);
     }
@@ -2907 +2908 @@
                 BldFullPathName(s, dcd->workdir, li->list[x]);
                 if (IsFile(s) != 1) {
-                  free(li->list[x]);
+                  xfree(li->list[x]);
                   li->list[x] = NULL;
                   for (y = x; li->list[y]; y++)
@@ -2919 +2920 @@
                   p = xstrdup(s, pszSrcFile, __LINE__);
                   if (p) {
-                    free(li->list[x]);
+                    xfree(li->list[x]);
                     li->list[x] = p;
                   }
@@ -2967 +2968 @@
             }
             else
-              free(li);
+              xfree(li);
           }
         }
@@ -3228 +3229 @@
               if (!PostMsg(dcd->hwndObject, UM_ENTER, MPFROMP(s), MPVOID)) {
                 Runtime_Error(pszSrcFile, __LINE__, "post");
-                free(s);
+                xfree(s);
               }
             }
@@ -3521 +3522 @@
                      IDS_WINCREATEWINDOW);
           PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID);
-          free(dcd);
+          xfree(dcd);
           hwndFrame = (HWND) 0;
         }

trunk/dll/assoc.c

@@ -16 +16 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   06 Jan 08 GKY Use NormalizeCmdLine to check program strings on entry
+  29 Feb 08 GKY Changes to enable user settable command line length
+  29 Feb 08 GKY Use xfree where appropriate
 
 **************************************************************************************/
@@ -40 +42 @@
 typedef struct
 {
-  CHAR mask[CCHMAXPATH];
-  CHAR cl[MAXCOMLINESTRG];
-  CHAR sig[CCHMAXPATH];
   LONG offset;
   ULONG flags;
+  PSZ pszCmdLine;
+  CHAR mask[CCHMAXPATH];
+  CHAR sig[CCHMAXPATH];
 }
 ASSOC;
@@ -51 +53 @@
 {
   CHAR *mask;
-  CHAR *cl;
+  PSZ pszCmdLine;
   CHAR *sig;
   LONG offset;
@@ -118 +120 @@
     next = info->next;
     xfree(info->mask);
-    xfree(info->cl);
+    xfree(info->pszCmdLine);
     xfree(info->sig);
     xfree(info);
@@ -130 +132 @@
   FILE *fp;
   LINKASSOC *info;
-  CHAR cl[1024];
+  PSZ pszCmdLine;
   CHAR mask[CCHMAXPATH + 24];
   CHAR sig[CCHMAXPATH + 24];
@@ -144 +146 @@
   strcat(mask, "ASSOC.DAT");
   fp = _fsopen(mask, "r", SH_DENYWR);
+  pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
+  if (!pszCmdLine) {
+    if (fp)
+      fclose(fp); //already complained
+  }
   if (fp) {
     while (!feof(fp)) {
@@ -152 +159 @@
       if (!*mask || *mask == ';')
         continue;
-      if (!xfgets(cl, sizeof(cl), fp, pszSrcFile, __LINE__) ||
+      if (!xfgets(pszCmdLine, MaxComLineStrg, fp, pszSrcFile, __LINE__) ||
           !xfgets(sig, CCHMAXPATH + 24, fp, pszSrcFile, __LINE__) ||
           !xfgets(offset, sizeof(offset), fp, pszSrcFile, __LINE__) ||
           !xfgets(flags, sizeof(flags), fp, pszSrcFile, __LINE__))
         break;                          /* error! */
-      cl[1000] = 0;
-      bstripcr(cl);
+      pszCmdLine[MaxComLineStrg - 1] = 0;
+      bstripcr(pszCmdLine);
       sig[CCHMAXPATH] = 0;
       bstripcr(sig);
@@ -165 +172 @@
       flags[34] = 0;
       bstripcr(flags);
-      if (!*cl)
+      if (!*pszCmdLine)
         continue;
       info = xmallocz(sizeof(LINKASSOC), pszSrcFile, __LINE__);
       if (info) {
-        info->cl = xstrdup(cl, pszSrcFile, __LINE__);
+        info->pszCmdLine = xstrdup(pszCmdLine, pszSrcFile, __LINE__);
         info->mask = xstrdup(mask, pszSrcFile, __LINE__);
         if (*sig)
@@ -175 +182 @@
         info->offset = atol(offset);
         info->flags = atol(flags);
-        if (!info->cl || !info->mask) {
-          xfree(info->cl);
+        if (!info->pszCmdLine || !info->mask) {
+          xfree(info->pszCmdLine);
           xfree(info->mask);
           xfree(info);
@@ -191 +198 @@
     }
     fclose(fp);
+  }
+}
+
+VOID display_associations(HWND hwnd, ASSOC *temp, LINKASSOC *info)
+{
+  CHAR szEnviroment[2048];
+  PSZ pszDisplayStr;
+  SHORT x;
+
+  *szEnviroment = 0;
+  WinQueryDlgItemText(hwnd, ASS_ENVIRON, 2048, szEnviroment);
+  bstripcr(szEnviroment);
+  if (*szEnviroment)
+    PrfWriteProfileString(fmprof, FM3Str, temp->pszCmdLine, szEnviroment);
+  pszDisplayStr = xmallocz((CCHMAXPATH * 2) + MaxComLineStrg + 6,
+                           pszSrcFile, __LINE__);
+  if (pszDisplayStr) {
+    sprintf(pszDisplayStr, "%-12s \x1a %-24s %s%s%s", temp->mask,
+            temp->pszCmdLine, (*temp->sig) ?
+            "[" : NullStr, (*temp->sig) ? temp->sig : NullStr,
+            (*temp->sig) ? "]" : NullStr);
+    x = (SHORT) WinSendDlgItemMsg(hwnd,
+                                  ASS_LISTBOX,
+                                  LM_INSERTITEM,
+                                  MPFROM2SHORT(LIT_END, 0), MPFROMP(pszDisplayStr));
+    if (x >= 0) {
+      WinSendDlgItemMsg(hwnd,
+                        ASS_LISTBOX,
+                        LM_SETITEMHANDLE,
+                        MPFROMSHORT(x), MPFROMP(info));
+      WinSendDlgItemMsg(hwnd,
+                        ASS_LISTBOX,
+                        LM_SELECTITEM,
+                        MPFROMSHORT(x), MPFROMSHORT(TRUE));
+    }
+    xfree(pszDisplayStr);
   }
 }
@@ -232 +275 @@
     while (info) {
       fprintf(fp,
-              ";\n%0.*s\n%0.1000s\n%0.*s\n%lu\n%lu\n",
+              ";\n%0.*s\n%0.4096s\n%0.*s\n%lu\n%lu\n",
               CCHMAXPATH,
               info->mask,
-              info->cl,
+              info->pszCmdLine,
               CCHMAXPATH,
               (info->sig) ? info->sig : NullStr, info->offset, info->flags);
@@ -248 +291 @@
   LINKASSOC *info;
 
-  if (addme && *addme->cl && *addme->mask) {
+  if (addme && *addme->pszCmdLine && *addme->mask) {
     info = asshead;
     while (info) {
@@ -260 +303 @@
       info = xmallocz(sizeof(LINKASSOC), pszSrcFile, __LINE__);
       if (info) {
-        info->cl = xstrdup(addme->cl, pszSrcFile, __LINE__);
+        info->pszCmdLine = xstrdup(addme->pszCmdLine, pszSrcFile, __LINE__);
         info->mask = xstrdup(addme->mask, pszSrcFile, __LINE__);
         if (*addme->sig)
@@ -268 +311 @@
         if (addme->flags)
           info->flags = addme->flags;
-        if (!info->cl || !info->mask) {
-          xfree(info->cl);
+        if (!info->pszCmdLine || !info->mask) {
+          xfree(info->pszCmdLine);
           xfree(info->mask);
           xfree(info);
@@ -315 +358 @@
             asstail = info->prev;
         }
-        xfree(info->cl);
+        xfree(info->pszCmdLine);
         xfree(info->mask);
         xfree(info->sig);
@@ -392 +435 @@
 
         if (fAmAV2) {
-          if (stristr(info->cl, "AV2.EXE") ||
-              stristr(info->cl, "AV2.CMD") || stristr(info->cl, "<>"))
+          if (stristr(info->pszCmdLine, "AV2.EXE") ||
+              stristr(info->pszCmdLine, "AV2.CMD") || stristr(info->pszCmdLine, "<>"))
             return -1;
         }
-        if (!strcmp(info->cl, "<>")) {
+        if (!strcmp(info->pszCmdLine, "<>")) {
           OpenObject(datafile, Default, hwnd);
           return 0;
@@ -414 +457 @@
         flags &= (~DIEAFTER);
         rc = ExecOnList(hwnd,
-                        info->cl,
+                        info->pszCmdLine,
                         flags,
                         NULL, list, GetPString(IDS_EXECASSOCTITLETEXT),
@@ -467 +510 @@
   case UM_UNDO:
     {
-      CHAR s[1002 + CCHMAXPATH + 6];
+      CHAR s[4096];
 
       WinSendDlgItemMsg(hwnd, ASS_LISTBOX, LM_DELETEALL, MPVOID, MPVOID);
@@ -475 +518 @@
                 "%-12s \x1a %-24s %s%s%s",
                 info->mask,
-                info->cl,
+                info->pszCmdLine,
                 (info->sig && *info->sig) ?
                 "[" : NullStr,
@@ -518 +561 @@
           }
           WinSetDlgItemText(hwnd, ASS_MASK, info->mask);
-          WinSetDlgItemText(hwnd, ASS_CL, info->cl);
+          WinSetDlgItemText(hwnd, ASS_CL, info->pszCmdLine);
           WinSetDlgItemText(hwnd, ASS_SIG,
                             (info->sig && *info->sig) ? info->sig : NullStr);
@@ -545 +588 @@
             size = sizeof(env) - 1;
             if (PrfQueryProfileData(fmprof,
-                                    FM3Str, info->cl, env, &size) && *env)
+                                    FM3Str, info->pszCmdLine, env, &size) && *env)
               WinSetDlgItemText(hwnd, ASS_ENVIRON, env);
             else
@@ -629 +672 @@
         replace = FALSE;
 
+        memset(&temp, 0, sizeof(ASSOC));
+        temp.pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
+        if (!temp.pszCmdLine)
+          break; //already complained
+
         {
           x = (SHORT) WinSendDlgItemMsg(hwnd,
@@ -639 +687 @@
                                           MPFROMSHORT(0), MPFROMSHORT(TRUE));
         }
-        pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
-        if (!pszWorkBuf)
+        pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
+        if (!pszWorkBuf) {
+          xfree(temp.pszCmdLine);
           break; //already complained
-        memset(&temp, 0, sizeof(ASSOC));
+        }
         WinQueryDlgItemText(hwnd, ASS_MASK, sizeof(temp.mask), temp.mask);
-        WinQueryDlgItemText(hwnd, ASS_CL, sizeof(temp.cl), temp.cl);
-        NormalizeCmdLine(pszWorkBuf, temp.cl);
-        memcpy(temp.cl, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        WinQueryDlgItemText(hwnd, ASS_CL, MaxComLineStrg, temp.pszCmdLine);
+        if (strcmp(temp.pszCmdLine, "<>")) {
+          NormalizeCmdLine(pszWorkBuf, temp.pszCmdLine);
+          memcpy(temp.pszCmdLine, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        }
         xfree(pszWorkBuf);
         WinQueryDlgItemText(hwnd, ASS_SIG, sizeof(temp.sig), temp.sig);
@@ -655 +706 @@
         }
         bstrip(temp.mask);
-        bstrip(temp.cl);
+        bstrip(temp.pszCmdLine);
         if (WinQueryButtonCheckstate(hwnd, ASS_DEFAULT))
           temp.flags = 0;
@@ -674 +725 @@
         if (fCancelAction){
           fCancelAction = FALSE;
+          xfree(temp.pszCmdLine);
           break;
         }
@@ -680 +732 @@
         if (!info)
           WinDismissDlg(hwnd, 1);       /* Runtime_Error(pszSrcFile, __LINE__, "add_association"); */
-        else {
-
-          CHAR s[1002 + CCHMAXPATH + 6];
-
-          *s = 0;
-          WinQueryDlgItemText(hwnd, ASS_ENVIRON, 1000, s);
-          bstripcr(s);
-          if (*s)
-            PrfWriteProfileString(fmprof, FM3Str, temp.cl, s);
-          sprintf(s, "%-12s \x1a %-24s %s%s%s", temp.mask,
-                  temp.cl, (*temp.sig) ?
-                  "[" : NullStr, (*temp.sig) ? temp.sig : NullStr,
-                  (*temp.sig) ? "]" : NullStr);
-          x = (SHORT) WinSendDlgItemMsg(hwnd,
-                                        ASS_LISTBOX,
-                                        LM_INSERTITEM,
-                                        MPFROM2SHORT(LIT_END, 0), MPFROMP(s));
-          if (x >= 0) {
-            WinSendDlgItemMsg(hwnd,
-                              ASS_LISTBOX,
-                              LM_SETITEMHANDLE,
-                              MPFROMSHORT(x), MPFROMP(info));
-            WinSendDlgItemMsg(hwnd,
-                              ASS_LISTBOX,
-                              LM_SELECTITEM,
-                              MPFROMSHORT(x), MPFROMSHORT(TRUE));
-          }
+        else {
+          display_associations(hwnd, &temp, info);
           save_associations();
-        }
+        }
+        xfree(temp.pszCmdLine);
       }
       WinDismissDlg(hwnd, 1);
@@ -728 +756 @@
         CHAR dummy[34];
         PSZ pszWorkBuf;
-        replace = FALSE;
-
-        pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
-        if (!pszWorkBuf)
+        replace = FALSE;
+
+        memset(&temp, 0, sizeof(ASSOC));
+        temp.pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
+        if (!temp.pszCmdLine)
           break; //already complained
-        memset(&temp, 0, sizeof(ASSOC));
-        WinQueryDlgItemText(hwnd, ASS_MASK, sizeof(temp.mask), temp.mask);
-        WinQueryDlgItemText(hwnd, ASS_CL, sizeof(temp.cl), temp.cl);
-        NormalizeCmdLine(pszWorkBuf, temp.cl);
-        memcpy(temp.cl, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
+        if (!pszWorkBuf) {
+          xfree(temp.pszCmdLine);
+          break; //already complained
+        }
+        WinQueryDlgItemText(hwnd, ASS_MASK, sizeof(temp.mask), temp.mask);
+        WinQueryDlgItemText(hwnd, ASS_CL, MaxComLineStrg, temp.pszCmdLine);
+        if (strcmp(temp.pszCmdLine, "<>")) {
+          NormalizeCmdLine(pszWorkBuf, temp.pszCmdLine);
+          memcpy(temp.pszCmdLine, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        }
         xfree(pszWorkBuf);
         WinQueryDlgItemText(hwnd, ASS_SIG, sizeof(temp.sig), temp.sig);
@@ -746 +781 @@
         }
         bstrip(temp.mask);
-        bstrip(temp.cl);
+        bstrip(temp.pszCmdLine);
         if (WinQueryButtonCheckstate(hwnd, ASS_DEFAULT))
           temp.flags = 0;
@@ -765 +800 @@
         if (fCancelAction){
           fCancelAction = FALSE;
+          xfree(temp.pszCmdLine);
           break;
         }
@@ -771 +807 @@
         //Add will fail if mask is not changed
         if (info) {
-
-          CHAR s[1002 + CCHMAXPATH + 6];
-
-          *s = 0;
-          WinQueryDlgItemText(hwnd, ASS_ENVIRON, 1000, s);
-          bstripcr(s);
-          if (*s)
-            PrfWriteProfileString(fmprof, FM3Str, temp.cl, s);
-          sprintf(s, "%-12s \x1a %-24s %s%s%s", temp.mask,
-                  temp.cl, (*temp.sig) ?
-                  "[" : NullStr, (*temp.sig) ? temp.sig : NullStr,
-                  (*temp.sig) ? "]" : NullStr);
-          x = (SHORT) WinSendDlgItemMsg(hwnd,
-                                        ASS_LISTBOX,
-                                        LM_INSERTITEM,
-                                        MPFROM2SHORT(LIT_END, 0), MPFROMP(s));
-          if (x >= 0) {
-            WinSendDlgItemMsg(hwnd,
-                              ASS_LISTBOX,
-                              LM_SETITEMHANDLE,
-                              MPFROMSHORT(x), MPFROMP(info));
-            WinSendDlgItemMsg(hwnd,
-                              ASS_LISTBOX,
-                              LM_SELECTITEM,
-                              MPFROMSHORT(x), MPFROMSHORT(TRUE));
-          }
+          display_associations(hwnd, &temp, info);
           save_associations();
         }
+        xfree(temp.pszCmdLine);
       }
       break;
@@ -805 +817 @@
       {
         ASSOC temp;
-        CHAR dummy[34];
-
-        memset(&temp, 0, sizeof(ASSOC));
+        CHAR dummy[34];
+
+        memset(&temp, 0, sizeof(ASSOC));
+        temp.pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
+        if (!temp.pszCmdLine)
+          break; //already complained
         WinQueryDlgItemText(hwnd, ASS_MASK, sizeof(temp.mask), temp.mask);
         WinQueryDlgItemText(hwnd, ASS_SIG, sizeof(temp.sig), temp.sig);
@@ -817 +832 @@
         bstrip(temp.mask);
         PrfWriteProfileData(fmprof, FM3Str, temp.mask, NULL, 0L);
-        if (kill_association(&temp))
-         /* Runtime_Error(pszSrcFile, __LINE__, "kill_association");
-        else */{
+        if (kill_association(&temp)) {
           x = (SHORT) WinSendDlgItemMsg(hwnd,
                                         ASS_LISTBOX,
@@ -832 +845 @@
           }
           save_associations();
-        }
-      }
+        }
+        xfree(temp.pszCmdLine);
+      }
+
       break;
     case ASS_REPLACE:
@@ -841 +856 @@
         CHAR dummy[34];
         PSZ pszWorkBuf;
-        replace = TRUE;
-
+        replace = TRUE;
+
+        memset(&temp, 0, sizeof(ASSOC));
+        temp.pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
+        if (!temp.pszCmdLine)
+          break; //already complained
         y = (SHORT) WinSendDlgItemMsg(hwnd,
                                       ASS_LISTBOX,
                                       LM_QUERYSELECTION,
                                       MPFROMSHORT(LIT_CURSOR), MPVOID);
-        pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
-        if (!pszWorkBuf)
+        pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
+        if (!pszWorkBuf) {
+          xfree(temp.pszCmdLine);
           break; //already complained
-        memset(&temp, 0, sizeof(ASSOC));
+        }
         WinQueryDlgItemText(hwnd, ASS_MASK, sizeof(temp.mask), temp.mask);
-        WinQueryDlgItemText(hwnd, ASS_CL, sizeof(temp.cl), temp.cl);
-        NormalizeCmdLine(pszWorkBuf, temp.cl);
-        memcpy(temp.cl, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        WinQueryDlgItemText(hwnd, ASS_CL, MaxComLineStrg, temp.pszCmdLine);
+        if (strcmp(temp.pszCmdLine, "<>")) {
+          NormalizeCmdLine(pszWorkBuf, temp.pszCmdLine);
+          memcpy(temp.pszCmdLine, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        }
         xfree(pszWorkBuf);
         WinQueryDlgItemText(hwnd, ASS_SIG, sizeof(temp.sig), temp.sig);
@@ -863 +885 @@
         }
         bstrip(temp.mask);
-        bstrip(temp.cl);
+        bstrip(temp.pszCmdLine);
         if (WinQueryButtonCheckstate(hwnd, ASS_DEFAULT))
           temp.flags = 0;
@@ -882 +904 @@
         if (fCancelAction){
           fCancelAction = FALSE;
+          xfree(temp.pszCmdLine);
           break;
         }
         else
           info = add_association(&temp);
-        //Add will fail if mask is not changed
         if (info) {
-
-          CHAR s[1002 + CCHMAXPATH + 6];
-
-          *s = 0;
-          WinQueryDlgItemText(hwnd, ASS_ENVIRON, 1000, s);
-          bstripcr(s);
-          if (*s)
-            PrfWriteProfileString(fmprof, FM3Str, temp.cl, s);
-          sprintf(s, "%-12s \x1a %-24s %s%s%s", temp.mask,
-                  temp.cl, (*temp.sig) ?
-                  "[" : NullStr, (*temp.sig) ? temp.sig : NullStr,
-                  (*temp.sig) ? "]" : NullStr);
-          x = (SHORT) WinSendDlgItemMsg(hwnd,
-                                        ASS_LISTBOX,
-                                        LM_INSERTITEM,
-                                        MPFROM2SHORT(LIT_END, 0), MPFROMP(s));
-          if (x >= 0) {
-            WinSendDlgItemMsg(hwnd,
-                              ASS_LISTBOX,
-                              LM_SETITEMHANDLE,
-                              MPFROMSHORT(x), MPFROMP(info));
-            WinSendDlgItemMsg(hwnd,
-                              ASS_LISTBOX,
-                              LM_SELECTITEM,
-                              MPFROMSHORT(x), MPFROMSHORT(TRUE));
-          }
+          display_associations(hwnd, &temp, info);
           save_associations();
-        }
+        }
+        xfree(temp.pszCmdLine);
       }
       {
         ASSOC temp;
-        CHAR dummy[34];
-
+        CHAR dummy[34];
+
+        temp.pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
+        if (!temp.pszCmdLine)
+          break; //already complained
         WinSendDlgItemMsg(hwnd,
                           ASS_LISTBOX,
                           LM_SELECTITEM, MPFROMSHORT(y), MPFROMSHORT(TRUE));
-        memset(&temp, 0, sizeof(ASSOC));
+        memset(temp.sig, 0, sizeof(temp.sig));
+        memset(temp.mask, 0, sizeof(temp.mask));
+        temp.offset = 0;
         WinQueryDlgItemText(hwnd, ASS_MASK, sizeof(temp.mask), temp.mask);
         WinQueryDlgItemText(hwnd, ASS_SIG, sizeof(temp.sig), temp.sig);
@@ -946 +949 @@
           }
           save_associations();
-        }
+        }
+        xfree(temp.pszCmdLine);
       }
       break;
@@ -968 +972 @@
 }
 
-#pragma alloc_text(ASSOC2,free_commands,load_associations,save_associations)
+#pragma alloc_text(ASSOC2,free_commands,load_associations,save_associations,display_associations)
 #pragma alloc_text(ASSOC2,ExecAssociation,AssocTextProc)
 #pragma alloc_text(ASSOC,add_association,kill_association,AssocDlgProc,EditAssociations)

trunk/dll/autoview.c

@@ -23 +23 @@
   22 Nov 07 GKY Use CopyPresParams to fix presparam inconsistencies in menus
   30 Dec 07 GKY Use CommaFmtULL
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -412 +413 @@
                       WinSetWindowText(hwndAutoview, obuff);
                   }
-                  free(obuff);
+                  xfree(obuff);
                 }
-                free(ibuff);
+                xfree(ibuff);
               }
               DosClose(handle);
@@ -507 +508 @@
                 if (*pszBuf)
                   WinSetWindowText(hwndAutoview, pszBuf);
-                free(pszBuf);
+                xfree(pszBuf);
               }
             }
@@ -541 +542 @@
               rc = DosQueryPathInfo((CHAR *) mp1, FIL_QUERYEASFROMLIST,
                                     (PVOID) & eaop, (ULONG) sizeof(EAOP2));
-              free(pgealist);
+              xfree(pgealist);
               if (!rc) {
                 pfea = &eaop.fpFEA2List->list[0];
@@ -591 +592 @@
                       }
                       WinSetWindowText(hwndAutoMLE, pszBuf);
-                      free(pszBuf);
+                      xfree(pszBuf);
                     }
                   }
@@ -605 +606 @@
                 MLEsetreadonly(hwndAutoMLE, FALSE);
               }
-              free(pfealist);
+              xfree(pfealist);
             }
           }
         }
       }
-      free((CHAR *) mp1);
+      xfree((CHAR *) mp1);
     }
     return 0;
@@ -786 +787 @@
               PutComments(hwnd, currfile, ea);
               PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
-              free(ea);
+              xfree(ea);
             }
           }
@@ -836 +837 @@
           stopflag++;
           if (!PostMsg(hwndAutoObj, UM_LOADFILE, MPFROMP(cf), MPVOID))
-            free(cf);
+            xfree(cf);
         }
       }

trunk/dll/avl.c

@@ -30 +30 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   25 Aug 07 SHL load_archivers: add missing close on error path
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -236 +237 @@
     xfree(pat->createwdirs);
     xfree(pat->movewdirs);
-    free(pat);
+    xfree(pat);
   }
 }
@@ -822 +823 @@
                          ArcReviewDlgProc,
                          FM3ModHandle, AD_FRAME, MPFROMP(&ad))) {
-            free(ad.info);
+            xfree(ad.info);
           }
           else {

trunk/dll/avv.c

@@ -24 +24 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   06 Jan 08 GKY Use NormalizeCmdLine to check program strings on entry
+  29 Feb 08 GKY Changes to enable user settable command line length
 
 ***********************************************************************/
@@ -93 +94 @@
 static PSZ free_and_strdup_quoted_from_window(HWND hwnd, USHORT id, PSZ pszDest)
 { // fixme for command line limit
-  CHAR szCmdLine[MAXCOMLINESTRG];
-
+  CHAR *szCmdLine;
+
+  szCmdLine = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
+        if (!szCmdLine)
+          return NULL; //already complained
   xfree(pszDest);
   WinQueryDlgItemText(hwnd, id, sizeof(szCmdLine), szCmdLine);
   if (*szCmdLine){
     PSZ pszWorkBuf;
-    pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
+    pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
     if (pszWorkBuf) {
       NormalizeCmdLine(pszWorkBuf, szCmdLine);
@@ -110 +114 @@
   else
     pszDest = NULL;
+  xfree(szCmdLine);
   return pszDest;
 }

trunk/dll/cmdline.c

@@ -16 +16 @@
   16 Jun 07 SHL Update for OpenWatcom
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -78 +79 @@
           info->cl = xstrdup(s, pszSrcFile, __LINE__);
           if (!info->cl)
-            free(info);
+            xfree(info);
           else {
             info->next = NULL;
@@ -155 +156 @@
     info->cl = xstrdup(cl, pszSrcFile, __LINE__);
     if (!info->cl)
-      free(info);
+      xfree(info);
     else {
       info->next = NULL;
@@ -165 +166 @@
         info = clhead;
         clhead = clhead->next;
-        free(info);
+        xfree(info);
       }
       if (big)
@@ -193 +194 @@
       else
         clhead = info->next;
-      free(info->cl);
-      free(info);
+      xfree(info->cl);
+      xfree(info);
       if (big)
         clbig = clhead;
@@ -215 +216 @@
   while (info) {
     next = info->next;
-    free(info->cl);
-    free(info);
+    xfree(info->cl);
+    xfree(info);
     info = next;
   }

trunk/dll/collect.c

@@ -47 +47 @@
   15 Feb 08 GKY Fix attempt to free container items that were never inserted
   15 Feb 08 GKY Fix "collect" so it updates recollected files and unhides them if needed
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -898 +899 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            free(wk);
+            xfree(wk);
             FreeListInfo((LISTINFO *) mp1);
           }
@@ -926 +927 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            free(wk);
+            xfree(wk);
             FreeListInfo((LISTINFO *) mp1);
           }
@@ -951 +952 @@
       WinSendMsg(dcd->hwndCnr, UM_CLOSE, MPVOID, MPVOID);
       FreeList(dcd->lastselection);
-      free(dcd);
+      xfree(dcd);
     }
     DosPostEventSem(CompactSem);
@@ -1446 +1447 @@
     if (mp1) {
       if (!dcd) {
-        free(mp1);
+        xfree(mp1);
         Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       }
@@ -1452 +1453 @@
         if (!PostMsg(dcd->hwndObject, UM_COLLECTFROMFILE, mp1, mp2)) {
           Runtime_Error(pszSrcFile, __LINE__, "PostMsg");
-          free(mp1);
+          xfree(mp1);
         }
       }
@@ -1578 +1579 @@
             if (p) {
               if (!PostMsg(hwnd, UM_COLLECTFROMFILE, MPFROMP(p), MPVOID))
-                free(p);
+                xfree(p);
             }
           }
@@ -2088 +2089 @@
             }
             else
-              free(li);
+              xfree(li);
           }
         }
@@ -2837 +2838 @@
                    IDS_WINCREATEWINDOW);
         PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID);
-        free(dcd);
+        xfree(dcd);
         hwndFrame = (HWND) 0;
       }

trunk/dll/command.c

@@ -22 +22 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   06 Jan 08 GKY Use NormalizeCmdLine to check program strings on entry
+  29 Feb 08 GKY Changes to enable user settable command line length
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -44 +46 @@
 typedef struct
 {
-  CHAR cl[MAXCOMLINESTRG];
+  PSZ pszCmdLine;
   INT flags;
   CHAR title[34];
@@ -307 +309 @@
     xfree(info->title);
     xfree(info->cl);
-    free(info);
+    xfree(info);
     info = next;
   }
@@ -355 +357 @@
           xfree(info->cl);
           xfree(info->title);
-          free(info);
+          xfree(info);
           break;
         }
@@ -404 +406 @@
   LINKCMDS *info;
 
-  if (!addme || !*addme->cl || !*addme->title)
+  if (!addme || !*addme->pszCmdLine || !*addme->title)
     return NULL;                        // No data
   info = cmdhead;
@@ -415 +417 @@
   if (!info)
     return NULL;
-  info->cl = xstrdup(addme->cl, pszSrcFile, __LINE__);
+  info->cl = xstrdup(addme->pszCmdLine, pszSrcFile, __LINE__);
   info->title = xstrdup(addme->title, pszSrcFile, __LINE__);
   if (addme->flags)
@@ -422 +424 @@
     xfree(info->cl);
     xfree(info->title);
-    free(info);
+    xfree(info);
     return NULL;
   }
@@ -459 +461 @@
         xfree(info->cl);
         xfree(info->title);
-        free(info);
+        xfree(info);
         return TRUE;
       }
@@ -622 +624 @@
         APIRET ret;
 
-        pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
-        if (!pszWorkBuf)
+        memset(&temp, 0, sizeof(COMMAND));
+        temp.pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
+        if (!temp.pszCmdLine)
           break; //already complained
-        memset(&temp, 0, sizeof(COMMAND));
-        WinQueryDlgItemText(hwnd, CMD_CL, sizeof(temp.cl), temp.cl);
-        NormalizeCmdLine(pszWorkBuf, temp.cl);
-        memcpy(temp.cl, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
+        if (!pszWorkBuf) {
+          xfree(temp.pszCmdLine);
+          break; //already complained
+        }
+        WinQueryDlgItemText(hwnd, CMD_CL, MaxComLineStrg, temp.pszCmdLine);
+        NormalizeCmdLine(pszWorkBuf, temp.pszCmdLine);
+        memcpy(temp.pszCmdLine, pszWorkBuf, strlen(pszWorkBuf) + 1);
         xfree(pszWorkBuf);
-        if (!strchr(temp.cl, '%')){
+        if (!strchr(temp.pszCmdLine, '%')){
           ret = saymsg(MB_YESNO,
                        HWND_DESKTOP,
@@ -636 +643 @@
                        GetPString(IDS_TOACTONSELECTEDTEXT));
           if (ret == MBID_YES)
-            strcat(temp.cl, " %a");
+            strcat(temp.pszCmdLine, " %a");
         }
         WinQueryDlgItemText(hwnd, CMD_TITLE, sizeof(temp.title), temp.title);
@@ -657 +664 @@
         if (fCancelAction){
           fCancelAction = FALSE;
+          xfree(temp.pszCmdLine);
           break;
         }
@@ -676 +684 @@
           bstripcr(env);
           if (*env) {
-            PrfWriteProfileString(fmprof, FM3Str, temp.cl, env);
+            PrfWriteProfileString(fmprof, FM3Str, temp.pszCmdLine, env);
           }
           x = (SHORT) WinSendDlgItemMsg(hwnd,
@@ -694 +702 @@
             save_commands();
           }
-        }
+        }
+        xfree(temp.pszCmdLine);
       }
       x = (SHORT) WinSendDlgItemMsg(hwnd,
                                     CMD_LISTBOX,
                                     LM_QUERYSELECTION,
-                                    MPFROMSHORT(LIT_FIRST), MPVOID);
+                                    MPFROMSHORT(LIT_FIRST), MPVOID);
       WinDismissDlg(hwnd, 0);
       break;
@@ -720 +729 @@
         APIRET ret;
 
-        pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
-        if (!pszWorkBuf)
+        memset(&temp, 0, sizeof(COMMAND));
+        temp.pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
+        if (!temp.pszCmdLine)
           break; //already complained
-        memset(&temp, 0, sizeof(COMMAND));
-        WinQueryDlgItemText(hwnd, CMD_CL, sizeof(temp.cl), temp.cl);
-        NormalizeCmdLine(pszWorkBuf, temp.cl);
-        memcpy(temp.cl, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
+        if (!pszWorkBuf) {
+          xfree(temp.pszCmdLine);
+          break; //already complained
+        }
+        WinQueryDlgItemText(hwnd, CMD_CL, MaxComLineStrg, temp.pszCmdLine);
+        NormalizeCmdLine(pszWorkBuf, temp.pszCmdLine);
+        memcpy(temp.pszCmdLine, pszWorkBuf, strlen(pszWorkBuf) + 1);
         xfree(pszWorkBuf);
-        if (!strchr(temp.cl, '%')){
+        if (!strchr(temp.pszCmdLine, '%')){
           ret = saymsg(MB_YESNO,
                        HWND_DESKTOP,
@@ -734 +748 @@
                        GetPString(IDS_TOACTONSELECTEDTEXT));
           if (ret == MBID_YES)
-            strcat(temp.cl, " %a");
+            strcat(temp.pszCmdLine, " %a");
         }
         WinQueryDlgItemText(hwnd, CMD_TITLE, sizeof(temp.title), temp.title);
@@ -755 +769 @@
         if (fCancelAction){
           fCancelAction = FALSE;
+          xfree(temp.pszCmdLine);
           break;
         }
@@ -770 +785 @@
           bstripcr(env);
           if (*env) {
-            PrfWriteProfileString(fmprof, FM3Str, temp.cl, env);
+            PrfWriteProfileString(fmprof, FM3Str, temp.pszCmdLine, env);
           }
           x = (SHORT) WinSendDlgItemMsg(hwnd,
@@ -788 +803 @@
             save_commands();
           }
-        }
+        }
+        xfree(temp.pszCmdLine);
       }
       break;
@@ -818 +834 @@
       }
       break;
+
     case CMD_REPLACE:
       { //Delete first
@@ -824 +841 @@
         APIRET ret;
 
-        pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
-        if (!pszWorkBuf)
+        pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
+        if (!pszWorkBuf) {
           break; //already complained
-        memset(&temp, 0, sizeof(COMMAND));
-        WinQueryDlgItemText(hwnd, CMD_CL, sizeof(temp.cl), temp.cl);
-        NormalizeCmdLine(pszWorkBuf, temp.cl);
-        memcpy(temp.cl, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        }
+        memset(&temp, 0, sizeof(COMMAND));
+        temp.pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
+        if (!temp.pszCmdLine) {
+          xfree(pszWorkBuf);
+          break; //already complained
+        }
+        WinQueryDlgItemText(hwnd, CMD_CL, MaxComLineStrg, temp.pszCmdLine);
+        NormalizeCmdLine(pszWorkBuf, temp.pszCmdLine);
+        memcpy(temp.pszCmdLine, pszWorkBuf, strlen(pszWorkBuf) + 1);
         xfree(pszWorkBuf);
         if (fCancelAction){
           fCancelAction = FALSE;
+          xfree(temp.pszCmdLine);
           break;
         }
-        if (!strchr(temp.cl, '%')){
+        if (!strchr(temp.pszCmdLine, '%')){
           ret = saymsg(MB_YESNO,
                        HWND_DESKTOP,
@@ -842 +866 @@
                        GetPString(IDS_TOACTONSELECTEDTEXT));
           if (ret == MBID_YES)
-            strcat(temp.cl, " %a");
+            strcat(temp.pszCmdLine, " %a");
         }
         //remember item location in the list
@@ -896 +920 @@
           bstripcr(env);
           if (*env) {
-            PrfWriteProfileString(fmprof, FM3Str, temp.cl, env);
+            PrfWriteProfileString(fmprof, FM3Str, temp.pszCmdLine, env);
           } //put item back in original place
           x = (SHORT) WinSendDlgItemMsg(hwnd,
@@ -947 +971 @@
           }
         }
+        xfree(temp.pszCmdLine);
       }
       break;

trunk/dll/common.c

@@ -20 +20 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   26 Aug 07 SHL Change to DosSleep(0)
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -745 +746 @@
           Broadcast(WinQueryAnchorBlock(hwnd),
                     dcd->hwndParent, UM_UPDATERECORD, mp2, MPVOID);
-          free(mp2);
+          xfree(mp2);
         }
       }

trunk/dll/comp.c

@@ -51 +51 @@
   18 Jan 08 SHL Honor filters in actions
   20 Jan 08 GKY Compare dialog now saves and restores size and position
+  29 Feb 08 GKY Use xfree where appropriate
+  29 Feb 08 GKY Refactor global command line variables to notebook.h
 
 ***********************************************************************/
@@ -76 +78 @@
 #include "comp.h"
 #include "fm3dll.h"
+#include "notebook.h"                   // External compare/dircompare
 
 typedef struct
@@ -140 +143 @@
         DosFindClose(hdir);
       }
-      free(mask);
+      xfree(mask);
     }
-    free(pffb);
+    xfree(pffb);
   }
 }
@@ -174 +177 @@
       }
     }
-    free(sf);
+    xfree(sf);
   }
 }
@@ -678 +681 @@
     WinTerminate(hab);
   }
-  free(cmp);
+  xfree(cmp);
 }
 
@@ -735 +738 @@
     WinTerminate(hab);
   }
-  free(cmp);
+  xfree(cmp);
 }
 
@@ -780 +783 @@
   pciSa = xmalloc(sizeof(PCNRITEM) * numS, pszSrcFile, __LINE__);
   if (!pciSa) {
-    free(pciDa);
+    xfree(pciDa);
     return;
   }
@@ -813 +816 @@
       goto Restart;
     }
-    free(pciDa);
-    free(pciSa);
+    xfree(pciDa);
+    xfree(pciSa);
     Runtime_Error(pszSrcFile, __LINE__, "numD %u != x %lu", numD, x);
     return;
@@ -840 +843 @@
       goto Restart;
     }
-    free(pciSa);
-    free(pciDa);
+    xfree(pciSa);
+    xfree(pciDa);
     Runtime_Error(pszSrcFile, __LINE__, "numS (%lu) != x (%lu)", numS, x);
     return;
@@ -1284 +1287 @@
   }
 
-  free(pciSa);
-  free(pciDa);
+  xfree(pciSa);
+  xfree(pciDa);
 
   if (fUpdateHideButton) {
@@ -1325 +1328 @@
   pffbArray = xmalloc(ulBufBytes, pszSrcFile, __LINE__);
   if (!pffbArray) {
-    free(maskstr);
+    xfree(maskstr);
     return;
   }
@@ -1393 +1396 @@
   }
 
-  free(maskstr);
-  free(pffbArray);
+  xfree(maskstr);
+  xfree(pffbArray);
 
   // DbgMsg(pszSrcFile, __LINE__, "FillDirList finish %s", str);
@@ -1975 +1978 @@
         } // if insufficient resources
 
-        if (filesl)
-          free(filesl);                 // Free header - have already freed elements
+          xfree(filesl);                        // Free header - have already freed elements
         filesl = NULL;
-        if (filesr)
-          free(filesr);
+          xfree(filesr);
         filesr = NULL;
 
@@ -2046 +2047 @@
     WinTerminate(hab);
   }
-  free(cmp);
+  xfree(cmp);
   DosPostEventSem(CompactSem);
 
@@ -2607 +2608 @@
                         GetPString(IDS_COULDNTSTARTTHREADTEXT));
           WinDismissDlg(hwnd, 0);
-          free(forthread);
+          xfree(forthread);
         }
         else {
@@ -2887 +2888 @@
               Runtime_Error(pszSrcFile, __LINE__,
                             GetPString(IDS_COULDNTSTARTTHREADTEXT));
-              free(sf);
+              xfree(sf);
             }
           }
@@ -2939 +2940 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            free(forthread);
+            xfree(forthread);
           }
           else {
@@ -3062 +3063 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            free(forthread);
+            xfree(forthread);
           }
           else {
@@ -3218 +3219 @@
           WinSendMsg(cmp->dcd.hwndObject, WM_CLOSE, MPVOID, MPVOID);
       }
-      free(cmp);
+      xfree(cmp);
     }
     EmptyCnr(hwndLeft);

trunk/dll/copyf.c

@@ -18 +18 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   01 Sep 07 GKY Use xDosSetPathInfo to fix case where FS3 buffer crosses 64k boundry
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -236 +237 @@
           longname[CCHMAXPATH - 1] = 0;
         }
-        free(pfealist);
-      }
-      free(pgealist);
+        xfree(pfealist);
+      }
+      xfree(pgealist);
     }
   }
@@ -711 +712 @@
         /* under no circumstances! */
         Runtime_Error(pszSrcFile, __LINE__, "bad name %s", str);
-        free(str);
+        xfree(str);
         return -1;
       }
@@ -738 +739 @@
     xfree(ss);
     xfree(f);
-    free(str);
+    xfree(str);
     return -1;
   }
@@ -785 +786 @@
   xfree(f);
   xfree(ss);
-  free(str);
+  xfree(str);
   return 0;
 }
@@ -832 +833 @@
     xfree(ss);
     xfree(f);
-    free(str);
+    xfree(str);
     return -1;
   }
@@ -858 +859 @@
   xfree(f);
   xfree(ss);
-  free(str);
+  xfree(str);
   return 0;
 }

trunk/dll/defview.c

@@ -17 +17 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   20 Dec 07 GKY Open jpg files with OS2 object default since image.exe fails
+  29 Feb 08 GKY Refactor global command line variables to notebook.h
 
 ***********************************************************************/
@@ -34 +35 @@
 #include "arccnrs.h"                    // StartArcCnr
 #include "errutil.h"                    // Dos_Error...
+#include "notebook.h"                   // external viewers
 #include "fm3dll.h"
 

trunk/dll/dirsize.c

@@ -31 +31 @@
   13 Aug 07 SHL Move #pragma alloc_text to end for OpenWatcom compat
   26 Aug 07 GKY DosSleep(1) in loops changed to (0)
+  29 Feb 08 GKY Use xfree where appropriate
+  29 Feb 08 GKY Add presparams & update appearence of "Sizes" dialog
 
 ***********************************************************************/
@@ -150 +152 @@
       strlen(pszFileName) < 4) {
     if (*pchStopFlag) {
-      free(pffbArray);
+      xfree(pffbArray);
       return FALSE;
     }
@@ -157 +159 @@
     if (!pci) {
       Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__, "CM_ALLOCRECORD");
-      free(pffbArray);
+      xfree(pffbArray);
       return FALSE;
     }
@@ -173 +175 @@
   else {
     // No match
-    free(pffbArray);
+    xfree(pffbArray);
     Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
               GetPString(IDS_CANTFINDDIRTEXT), pszFileName);
@@ -216 +218 @@
   ri.fInvalidateRecord = TRUE;
   if (!WinSendMsg(hwndCnr, CM_INSERTRECORD, MPFROMP(pci), MPFROMP(&ri))) {
-    free(pffbArray);
+    xfree(pffbArray);
     return FALSE;
   }
@@ -278 +280 @@
   }
 
-  free(pffbArray);
+  xfree(pffbArray);
 
   pci->cbFile = ullCurDirBytes;
@@ -456 +458 @@
   PostMsg(WinQueryWindow(hwndCnr, QW_PARENT),
           UM_CONTAINER_FILLED, MPVOID, MPVOID);
-  free(dirsize);
+  xfree(dirsize);
 }
 
@@ -483 +485 @@
     {
       CHAR s[CCHMAXPATH + 81];
-
+      RestorePresParams(hwnd, "DirSizes");
       sprintf(s, GetPString(IDS_DIRSIZETITLETEXT), pState->szDirName);
       WinSetWindowText(hwnd, s);
+    }
+    {
+      SWP swp;
+      ULONG size = sizeof(SWP);
+
+      PrfQueryProfileData(fmprof, FM3Str, "DirSizes.Position", (PVOID) &swp, &size);
+      WinSetWindowPos(hwnd,
+                      HWND_TOP,
+                      swp.x,
+                      swp.y,
+                      swp.cx,
+                      swp.cy,
+                      swp.fl);
     }
     {
@@ -502 +517 @@
         Runtime_Error(pszSrcFile, __LINE__,
                       GetPString(IDS_COULDNTSTARTTHREADTEXT));
-        free(dirsize);
+        xfree(dirsize);
         WinDismissDlg(hwnd, 0);
         break;
@@ -614 +629 @@
     return 0;
 
+  case WM_PRESPARAMCHANGED:
+    PresParamChanged(hwnd, "DirSizes", mp1, mp2);
+    break;
+
   case WM_DRAWITEM:
     if (mp2) {
@@ -638 +657 @@
             p = strchr(pci->pszFileName, '\r');
             if (p) {
-              // draw text
-              if (!pci->cbFile)         // no size
+              // draw text
+              if (*(pci->pszLongName + 1) == 1)  // is root record
+                GpiSetColor(oi->hps, CLR_DARKRED);
+              else if (!pci->cbFile)            // no size
                 GpiSetColor(oi->hps, CLR_DARKGRAY);
               else if (!pci->easize)    // no size below
@@ -654 +675 @@
                               pci->pszFileName, TXTBOX_COUNT, aptl);
               boxHeight = aptl[TXTBOX_TOPRIGHT].y - aptl[TXTBOX_BOTTOMRIGHT].y;
-              boxHeight -= 6;
+              boxHeight -= 4;
 
               // Calculate nominal baseline of graph box
@@ -662 +683 @@
               // Place text above graph box with a bit of whitespace between
               ptl.x = oi->rclItem.xLeft;
-              ptl.y = yBottom + boxHeight + 8;  // 03 Aug 07 SHL
+              ptl.y = yBottom + boxHeight + 6;  // 03 Aug 07 SHL
               // GpiMove(oi->hps, &ptl);
               GpiCharStringAt(oi->hps, &ptl, strlen(pci->pszFileName),
@@ -676 +697 @@
               ptl.y = yBottom + 2;
               GpiMove(oi->hps, &ptl);
-              ptl.x = oi->rclItem.xLeft + 101;
+              ptl.x = oi->rclItem.xLeft + 201;
               ptl.y = yBottom + boxHeight;
               GpiBox(oi->hps, DRO_OUTLINE, &ptl, 0, 0);
@@ -684 +705 @@
               ptl.y = yBottom + 3;
               GpiMove(oi->hps, &ptl);
-              ptl.x = oi->rclItem.xLeft + 100;
+              ptl.x = oi->rclItem.xLeft + 200;
               ptl.y = yBottom + boxHeight - 1;
               GpiBox(oi->hps, DRO_OUTLINEFILL, &ptl, 0, 0);
@@ -693 +714 @@
               ptl.y = yBottom + 3;
               GpiMove(oi->hps, &ptl);
-              ptl.x = oi->rclItem.xLeft + 100;
+              ptl.x = oi->rclItem.xLeft + 200;
               GpiLine(oi->hps, &ptl);
               ptl.y = yBottom + boxHeight - 1;
@@ -710 +731 @@
               ptl.y = yBottom + boxHeight;
               GpiMove(oi->hps, &ptl);
-              ptl.x = oi->rclItem.xLeft + 103;
+              ptl.x = oi->rclItem.xLeft + 203;
               GpiLine(oi->hps, &ptl);
               ptl.y = yBottom + boxHeight - 2;
@@ -727 +748 @@
                 else
                   GpiSetColor(oi->hps, CLR_RED);
-                ptl.x = oi->rclItem.xLeft + 1;
+                ptl.x = oi->rclItem.xLeft + 2;
                 ptl.y = yBottom + 3;
                 GpiMove(oi->hps, &ptl);
-                ptl.x = oi->rclItem.xLeft + pci->flags;
+                ptl.x = oi->rclItem.xLeft + pci->flags * 2;
                 ptl.y = yBottom + boxHeight - 1;
                 GpiBox(oi->hps, DRO_OUTLINEFILL, &ptl, 0, 0);
@@ -750 +771 @@
                   GpiMove(oi->hps, &ptl);
                 }
-                ptl.x = oi->rclItem.xLeft + pci->flags;
+                ptl.x = oi->rclItem.xLeft + pci->flags * 2;
                 GpiLine(oi->hps, &ptl);
                 if (*(pci->pszLongName + 1) != 1) {
@@ -757 +778 @@
                   ptl.y = yBottom + 3;
                   GpiMove(oi->hps, &ptl);
-                  ptl.x = oi->rclItem.xLeft + pci->flags;
+                  ptl.x = oi->rclItem.xLeft + pci->flags * 2;
                   GpiLine(oi->hps, &ptl);
                 }
@@ -765 +786 @@
               GpiSetColor(oi->hps, CLR_WHITE);
               clr = CLR_WHITE;
-              for (x = 1; x < 10; x++) {
-                if (clr == CLR_WHITE && x * 10 > pci->flags) {
+              for (x = 1; x < 20; x++) {
+                if (clr == CLR_WHITE && x * 10 > pci->flags * 2) {
                   clr = CLR_BLACK;
                   GpiSetColor(oi->hps, CLR_BLACK);
@@ -775 +796 @@
                 switch (x) {
                 case 1:
-                case 3:
+                case 3:
+                case 5:
                 case 7:
-                case 9:
+                case 9:
+                case 11:
+                case 13:
+                case 15:
+                case 17:
+                case 19:
                   ptl.y -= 1;
                   break;
-                case 5:
+                case 10:
                   ptl.y -= 4;
                   break;
@@ -786 +813 @@
                 case 4:
                 case 6:
-                case 8:
+                case 8:
+                case 12:
+                case 14:
+                case 16:
+                case 18:
                   ptl.y -= 2;
                   break;
@@ -943 +974 @@
     case DID_OK:
     case DID_CANCEL:
+      {
+        SWP swp;
+        ULONG size = sizeof(SWP);
+
+        WinQueryWindowPos(hwnd, &swp);
+        PrfWriteProfileData(fmprof, FM3Str, "DirSizes.Position", (PVOID) &swp,
+                            size);
+      }
       pState = INSTDATA(hwnd);
       if (!pState)
@@ -973 +1012 @@
         WinDestroyPointer(pState->hptr);
       DosSleep(16); //05 Aug 07 GKY 33
-      free(pState);                     // Let's hope no one is still looking
+      xfree(pState);                    // Let's hope no one is still looking
     }
     DosPostEventSem(CompactSem);

trunk/dll/draglist.c

@@ -19 +19 @@
   21 Apr 07 SHL Avoid odd first time drag failure
   12 May 07 SHL Use dcd->ulItemsToUnHilite
-  05 Jul 07 FreeDragInfoData: suppress PMERR_SOURCE_SAME_AS_TARGET notices
+  05 Jul 07 SHL FreeDragInfoData: suppress PMERR_SOURCE_SAME_AS_TARGET notices
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  29 Feb 08 GKY Use xmallocz where appropriate
 
 ***********************************************************************/
@@ -305 +306 @@
         ulNumDIAlloc += 4L;
       }
-      pDItem = xmalloc(sizeof(DRAGITEM), pszSrcFile, __LINE__);
+      // Create & Initialize DRAGITEM
+      pDItem = xmallocz(sizeof(DRAGITEM), pszSrcFile, __LINE__);
       if (!pDItem)
         break;                          // Already complained
@@ -322 +324 @@
         pDImg->cyOffset = 0 + (ulNumfiles * 6);
       }
-      // Initialize DRAGITEM
-      memset(pDItem, 0, sizeof(DRAGITEM));
       pDItem->hwndItem = (hwndObj) ? hwndObj : hwndCnr;
       pDItem->hwndItem = hwndCnr;
@@ -394 +394 @@
         ulNumDIAlloc += 5L;
       }
-      pDItem = xmalloc(sizeof(DRAGITEM), pszSrcFile, __LINE__);
+      // Create & Initialize DRAGITEM
+      pDItem = xmallocz(sizeof(DRAGITEM), pszSrcFile, __LINE__);
       if (!pDItem)
         break;
       ppDItem[ulNumfiles] = pDItem;
       dimgFakeIcon.hImage = hptrFile;
-      // Initialize DRAGITEM
-      memset(pDItem, 0, sizeof(DRAGITEM));
       pDItem->hwndItem = (hwndObj) ? hwndObj : hwndCnr;
       pDItem->hwndItem = hwndCnr;
@@ -435 +434 @@
       pDItem->fsSupportedOps = DO_COPYABLE;
       ulNumfiles++;
-
-      pDItem = xmalloc(sizeof(DRAGITEM), pszSrcFile, __LINE__);
+      // Create & Initialize DRAGITEM
+      pDItem = xmallocz(sizeof(DRAGITEM), pszSrcFile, __LINE__);
       if (pDItem) {
         ppDItem[ulNumfiles] = pDItem;
         dimgFakeIcon.hImage = hptrFile;
-        // Initialize DRAGITEM
-        memset(pDItem, 0, sizeof(DRAGITEM));
         pDItem->hwndItem = (hwndObj) ? hwndObj : hwndCnr;
         pDItem->hwndItem = hwndCnr;
@@ -641 +638 @@
         ulNumDIAlloc += 4L;
       }
-      pDItem = xmalloc(sizeof(DRAGITEM), pszSrcFile, __LINE__);
+      // Create & Initialize DRAGITEM
+      pDItem = xmallocz(sizeof(DRAGITEM), pszSrcFile, __LINE__);
       if (!pDItem)
         break;
@@ -656 +654 @@
         pDImg->cyOffset = 0 + (ulNumfiles * 6);
       }
-      memset(pDItem, 0, sizeof(DRAGITEM));
       pDItem->hwndItem = (hwndObj) ? hwndObj : hwnd;
-      // pDItem->hwndItem = hwnd;
       pDItem->ulItemID = (ULONG) ulSelect;
       pDItem->hstrType = DrgAddStrHandle(DRT_UNKNOWN);

trunk/dll/eas.c

@@ -21 +21 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   01 Sep 07 GKY Use xDosSetPathInfo to fix case where FS3 buffer crosses 64k boundry
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -866 +867 @@
                     memcpy(pfea, pfealist->list,
                            pfealist->cbList - sizeof(ULONG));
-                    free(eap->current->pfea);
+                    xfree(eap->current->pfea);
                     eap->current->pfea = pfea;
                     eap->current->name = eap->current->pfea->szName;
@@ -880 +881 @@
                 }
               }
-              free(s);
+              xfree(s);
             }
           }
@@ -911 +912 @@
           rc = xDosSetPathInfo(eap->filename, FIL_QUERYEASIZE,
                                &eaop, sizeof(eaop), DSPI_WRTTHRU);
-          free(pfealist);
+          xfree(pfealist);
           if (rc)
             Dos_Error(MB_CANCEL, rc, hwnd, pszSrcFile, __LINE__,
@@ -919 +920 @@
             if (eap->current == eap->head) {
               eap->head = eap->head->next;
-              free(eap->current->pfea);
-              free(eap->current);
+              xfree(eap->current->pfea);
+              xfree(eap->current);
               eap->current = NULL;
             }
@@ -929 +930 @@
                   sSelect++;
                   info->next = eap->current->next;
-                  free(eap->current->pfea);
-                  free(eap->current);
+                  xfree(eap->current->pfea);
+                  xfree(eap->current);
                   eap->current = NULL;
                   break;
@@ -986 +987 @@
       if (eap->head)
         Free_FEAList(eap->head);
-      free(eap);
+      xfree(eap);
       if (hptrIcon)
         WinDestroyPointer(hptrIcon);
@@ -1275 +1276 @@
                 }
               }
-              free(pfealist);
+              xfree(pfealist);
             }
-            free(pgealist);
+            xfree(pgealist);
           }
           ulEntry += ulCount;
         } // while
-        free(pdena);
+        xfree(pdena);
         DosPostEventSem(CompactSem);
       }
@@ -1349 +1350 @@
                 }
                 else
-                  free(pfealist);
+                  xfree(pfealist);
               }
               else {
-                free(pfealist);
+                xfree(pfealist);
                 if (!silentfail) {
                   if (rc == ERROR_ACCESS_DENIED
@@ -1362 +1363 @@
                              pdena->szName);
                     if (rc == MBID_CANCEL) {
-                      free(pgealist);
+                      xfree(pgealist);
                       break;
                     }
@@ -1377 +1378 @@
               }
             }
-            free(pgealist);
+            xfree(pgealist);
           }
           ulEntry += ulCount;
         } // while
-        free(pdena);
+        xfree(pdena);
         DosPostEventSem(CompactSem);
       }
@@ -1398 +1399 @@
     /* Free linked list */
     next = pFEA->next;
-    free(pFEA->pfea);
-    free(pFEA);
+    xfree(pFEA->pfea);
+    xfree(pFEA);
     pFEA = next;
   }

trunk/dll/filldir.c

@@ -40 +40 @@
   13 Aug 07 SHL Move #pragma alloc_text to end for OpenWatcom compat
   04 Nov 07 GKY Use commaFmtULL to display large file sizes
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -306 +307 @@
             pci->pszSubject = xstrdup(value + (sizeof(USHORT) * 2), pszSrcFile, __LINE__);
         }
-        free(pfealist);
-      }
-      free(pgealist);
+        xfree(pfealist);
+      }
+      xfree(pgealist);
     }
   }
@@ -353 +354 @@
             pci->pszLongName = xstrdup(value + (sizeof(USHORT) * 2), pszSrcFile, __LINE__);
         }
-        free(pfealist);
-      }
-      free(pgealist);
+        xfree(pfealist);
+      }
+      xfree(pgealist);
     }
   }
@@ -535 +536 @@
             pci->pszSubject = xstrdup(value + (sizeof(USHORT) * 2), pszSrcFile, __LINE__);
         }
-        free(pfealist);
-      }
-      free(pgealist);
+        xfree(pfealist);
+      }
+      xfree(pgealist);
     }
   }
@@ -583 +584 @@
           }
         }
-        free(pfealist);
-      }
-      free(pgealist);
+        xfree(pfealist);
+      }
+      xfree(pgealist);
     }
   }
@@ -903 +904 @@
 
       DosFindClose(hdir);
-
-      if (paffbFound) {
-        free(paffbFound);
-        paffbFound = NULL;
-      }
-      if (papffbSelected) {
-        free(papffbSelected);
-        papffbSelected = NULL;
-      }
+      xfree(paffbFound);
+      paffbFound = NULL;
+      xfree(papffbSelected);
+      papffbSelected = NULL;
 
       if (ulTotal && paffbTotal) {
@@ -998 +994 @@
   }
 Abort:
-  if (paffbTotal)
-    free(paffbTotal);
-  if (pszFileSpec)
-    free(pszFileSpec);
-  if (paffbFound)
-    free(paffbFound);
-  if (papffbSelected)
-    free(papffbSelected);
+  xfree(paffbTotal);
+  xfree(pszFileSpec);
+  xfree(paffbFound);
+  xfree(papffbSelected);
 
   if (recurse) {

trunk/dll/filter.c

@@ -14 +14 @@
   22 Mar 07 GKY Use QWL_USER
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -153 +154 @@
           }
           else
-            free(info);
+            xfree(info);
         }
       }
@@ -217 +218 @@
     }
     else
-      free(info);
+      xfree(info);
   }
 }
@@ -237 +238 @@
       else
         maskhead = info->next;
-      free(info->mask);
-      free(info);
+      xfree(info->mask);
+      xfree(info);
       break;
     }

trunk/dll/flesh.c

@@ -19 +19 @@
   06 Aug 07 GKY Reduce DosSleep times (ticket 148)
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -134 +135 @@
       }
     }
-    if (var)
-      free(var);
+    xfree(var);
     pciL = (PCNRITEM) WinSendMsg(hwndCnr,
                                  CM_QUERYRECORD,

trunk/dll/fm3dlg.h

@@ -19 +19 @@
   21 Aug 07 GKY Make Subject column in dircnr sizable and movable from the right to the left pane
   11 Jan 08 SHL Correct all to 3 column tabs since dialog editors assume this
+  29 Feb 08 GKY Changes to enable user settable command line length  
 
 ***********************************************************************/
@@ -635 +636 @@
 #define CFGG_CONFIRMTARGET                                                              25214
 #define CFGG_TARGETDIR                                                                  25215
-
-#define CFGB_FRAME                                                                              25250
+#define CFGG_CMDLNLNGTH                                                                 25216
+
+#define CFGB_FRAME                                                                      25250
 #define CFGB_TOOLBARHELP                                                                25251
 #define CFGB_DRIVEBARHELP                                                               25252

trunk/dll/fm3dll.h

@@ -78 +78 @@
   12 Jan 08 SHL Localize SpecialSelect to comp.c
   14 Feb 08 SHL Refactor CfgDlgProc to notebook.h
+  29 Feb 08 GKY Refactor global command line variables to notebook.h
 
 ***********************************************************************/
@@ -687 +688 @@
 HAPP Exec(HWND hwndNotify, BOOL child, char *startdir, char *env,
           PROGTYPE * progt, ULONG fl, char *formatstring, ...);
-#define MAXCOMLINESTRG (2048)                   /* used to build command line strings */
 #define RUNTYPE_MASK  0xf
 #define SYNCHRONOUS   1
@@ -1179 +1179 @@
   *WPProgram, *FM3Folder, *FM3Tools;
 DATADEF RGB2 RGBGREY, RGBBLACK;
-DATADEF CHAR archiverbb2[CCHMAXPATH], StopPrinting, profile[CCHMAXPATH];
+DATADEF CHAR archiverbb2[CCHMAXPATH], StopPrinting, profile[CCHMAXPATH], extractpath[CCHMAXPATH],
+  lastextractpath[CCHMAXPATH];
 DATADEF CHAR appname[12], realappname[12];
-DATADEF CHAR editor[MAXCOMLINESTRG], viewer[MAXCOMLINESTRG], virus[MAXCOMLINESTRG],
-  compare[MAXCOMLINESTRG], extractpath[CCHMAXPATH],
-  lastextractpath[CCHMAXPATH], lasttoolbox[CCHMAXPATH],
-  HomePath[CCHMAXPATH], SwapperDat[CCHMAXPATH],
-  binview[MAXCOMLINESTRG], bined[MAXCOMLINESTRG], printer[CCHMAXPATH],
-  dircompare[MAXCOMLINESTRG], szDefArc[CCHMAXPATH],
-  ftprun[MAXCOMLINESTRG], ftprundir[CCHMAXPATH], httprun[MAXCOMLINESTRG],
-  httprundir[CCHMAXPATH], mailrundir[CCHMAXPATH],
-  mailrun[MAXCOMLINESTRG], targetdir[CCHMAXPATH];
+DATADEF CHAR  lasttoolbox[CCHMAXPATH], HomePath[CCHMAXPATH],
+  SwapperDat[CCHMAXPATH], printer[CCHMAXPATH], szDefArc[CCHMAXPATH];
 DATADEF HMODULE FM3DllHandle, FM3ModHandle;
 DATADEF CHAR *quicktool[50];

trunk/dll/fm3res.dlg

@@ -31 +31 @@
   21 Aug 07 GKY Make Subject column in dircnr sizable and movable from the rigth to the left pane
   12 Jan 08 SHL Rework WALK_FRAME
+  29 Feb 08 GKY Changes to enable user settable command line length
+  29 Feb 08 GKY Add presparams & update appearence of "Sizes" dialog
 
 ***********************************************************************/
@@ -2538 +2540 @@
         PUSHBUTTON      "~Expand", DSZ_EXPAND, 48, 4, 44, 14,
                         BS_NOPOINTERFOCUS
-        PUSHBUTTON      "~Help", IDM_HELP, 96, 4, 40, 14, BS_NOPOINTERFOCUS
-        PUSHBUTTON      "~Collapse", DSZ_COLLAPSE, 140, 4, 44, 14,
-                        BS_NOPOINTERFOCUS
-        PUSHBUTTON      "~Save", DSZ_PRINT, 188, 4, 44, 14,
+        PUSHBUTTON      "~Help", IDM_HELP, 192, 4, 40, 14, BS_NOPOINTERFOCUS
+        PUSHBUTTON      "~Collapse", DSZ_COLLAPSE, 96, 4, 44, 14,
+                        BS_NOPOINTERFOCUS
+        PUSHBUTTON      "~Save", DSZ_PRINT, 144, 4, 44, 14,
                         BS_NOPOINTERFOCUS
         PUSHBUTTON      "Cancel", DID_CANCEL, 337, 4, 40, 14,
@@ -2764 +2766 @@
         AUTOCHECKBOX    "FM/~2 deletes dragged items", CFGG_FM2DELETES, 122,
                         68, 130, 10
+        LTEXT           "Command line length", -1, 122, 56, 60, 10, NOT WS_GROUP
+        CONTROL         "", CFGG_CMDLNLNGTH, 184, 56, 44, 10, WC_SPINBUTTON,
+                        SPBS_NUMERICONLY | SPBS_MASTER | SPBS_SERVANT |
+                        SPBS_JUSTCENTER | WS_TABSTOP | SPBS_FASTSPIN |
+                        WS_VISIBLE
         PUSHBUTTON      "~Help", IDM_HELP, 4, 4, 40, 14, BS_NOPOINTERFOCUS |
                         WS_GROUP

trunk/dll/grep.c

@@ -28 +28 @@
   21 Sep 07 GKY Fix trap on search that includes filenames that exceed maxpath
   07 Feb 08 SHL Use ITIMER_DESC to control sleeps and reporting
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -578 +579 @@
             // Complain if pathnames exceeds max
             DosFindClose(findHandle);
-            free(pffbArray);
+            xfree(pffbArray);
             if (!fDone) {
               fDone = TRUE;
@@ -607 +608 @@
             else if (!InsertDupe(grep, szFindPath, pffbFile)) {
               DosFindClose(findHandle);
-              free(pffbArray);
+              xfree(pffbArray);
               return 1;
             }
@@ -633 +634 @@
   }
 
-  free(pffbArray);
+  xfree(pffbArray);
   return 0;
 }
@@ -762 +763 @@
                              pszSrcFile, __LINE__);
         if (!grep->dir) {
-          free(grep->insertffb);
+          xfree(grep->insertffb);
           return FALSE;
         }
@@ -775 +776 @@
       grep->dir[grep->toinsert] = xstrdup(szDirectory, pszSrcFile, __LINE__);
       if (!grep->dir) {
-        free(grep->insertffb[grep->toinsert]);
+        xfree(grep->insertffb[grep->toinsert]);
         return FALSE;
       }
@@ -992 +993 @@
         fclose(inputFile);
       }
-      free(input);
+      xfree(input);
       // DosSleep(1);                   // 07 Feb 08 SHL
     }
@@ -1106 +1107 @@
       // DosSleep(1);                   // 07 Feb 08 SHL
     }
-    free(buffer);
+    xfree(buffer);
   }
   return CRC;
@@ -1124 +1125 @@
   }
   grep->dupehead = grep->dupelast = NULL;
-  if (grep->dupenames)
-    free(grep->dupenames);
-  if (grep->dupesizes)
-    free(grep->dupesizes);
+  xfree(grep->dupenames);
+  xfree(grep->dupesizes);
   grep->dupesizes = grep->dupenames = NULL;
 }
@@ -1474 +1473 @@
         WinSetWindowText(hwndStatus, GetPString(IDS_GREPDUPECOMPARINGTEXT));
       x = y = 0;
-      if (grep->dupenames) {
-        free(grep->dupenames);
-        grep->dupenames = NULL;
-      }
-      if (grep->dupesizes) {
-        free(grep->dupesizes);
-        grep->dupesizes = NULL;
-      }
+      xfree(grep->dupenames);
+      grep->dupenames = NULL;
+      xfree(grep->dupesizes);
+      grep->dupesizes = NULL;
 
       InitITimer(pitdSleep, 0);         // Reset rate estimator
@@ -1595 +1590 @@
     info->name = xstrdup(dir, pszSrcFile, __LINE__);
     if (!info->name) {
-      free(info);
+      xfree(info);
       return FALSE;
     }

trunk/dll/grep2.c

@@ -20 +20 @@
   06 Aug 07 GKY Reduce DosSleep times (ticket 148)
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  29 Feb 08 GKY Use xfree where appropriate
 
   fixme for more excess locals to be gone
@@ -823 +824 @@
           DosBeep(50, 100);
           WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, GREP_MASK));
-          free(p);
+          xfree(p);
           break;
         }
@@ -922 +923 @@
           Runtime_Error(pszSrcFile, __LINE__,
                         GetPString(IDS_COULDNTSTARTTHREADTEXT));
-          free(p);
+          xfree(p);
           WinDismissDlg(hwnd, 0);
           break;
         }
         DosSleep(100); //05 Aug 07 GKY 128
-        free(p);
+        xfree(p);
       }
       if (changed) {

trunk/dll/info.c

@@ -24 +24 @@
   27 Sep 07 SHL Correct ULONGLONG size formatting
   30 Dec 07 GKY Use CommaFmtULL
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -463 +464 @@
       if (pis->lasthwndMenu)
         WinDestroyWindow(pis->lasthwndMenu);
-      free(pis);
+      xfree(pis);
       return oldproc(hwnd, msg, mp1, mp2);
     }
@@ -882 +883 @@
   case WM_DESTROY:
     pfs = WinQueryWindowPtr(hwnd, QWL_USER);
-    if (pfs)
-      free(pfs);
+    xfree(pfs);
     break;
   }

trunk/dll/inis.c

@@ -25 +25 @@
   09 Jan 08 SHL Standardize PrfOpenProfile return checks
   09 Jan 08 SHL Use CloseProfile to avoid spurious system INI closes
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -212 +213 @@
                                                         app2 : inirec->app),
                                                 pCurrentK, pData, ulSize);
-                          free(pData);  /* free data */
+                          xfree(pData); /* free data */
                         }
                       }
@@ -220 +221 @@
                     }
                   }
-                  free(pDataK);         /* free keynames */
+                  xfree(pDataK);                /* free keynames */
                 }
               }
@@ -256 +257 @@
                                          inirec->key2 : inirec->key),
                                         pData, ulSize);
-                  free(pData);          /* free data */
+                  xfree(pData);         /* free data */
                 }
               }
@@ -291 +292 @@
       PostMsg(inirec->hwndSource, WM_COMMAND, MPFROM2SHORT(INI_REFRESH, 0),
               MPVOID);
-    free(inirec);
+    xfree(inirec);
   }
 }
@@ -316 +317 @@
       WinTerminate(hab2);
     }
-    free(inirec);
+    xfree(inirec);
   }
 }
@@ -402 +403 @@
                                                       pCurrentK, pData,
                                                       ulSize);
-                                free(pData);    /* free data */
+                                xfree(pData);   /* free data */
                               }
                             }
@@ -410 +411 @@
                           }
                         }
-                        free(pDataK);   /* free keynames */
+                        xfree(pDataK);  /* free keynames */
                       }
                     }
@@ -418 +419 @@
                   }
                 }
-                free(pDataA);           /* free applnames */
+                xfree(pDataA);          /* free applnames */
               }
             }
@@ -430 +431 @@
       WinTerminate(hab2);
     }
-    free(prfp->pszUserName);
-    free(prfp->pszSysName);
-    free(prfp);
+    xfree(prfp->pszUserName);
+    xfree(prfp->pszSysName);
+    xfree(prfp);
   }
 }
@@ -465 +466 @@
         WinEnableWindowUpdate(hwndList, TRUE);
       }
-      free(pData);
+      xfree(pData);
     }
   }
@@ -524 +525 @@
         Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
                   "PrfQueryProfileString");
-        free(pData);
+        xfree(pData);
       }
       else {
@@ -1315 +1316 @@
             fixup(inidata->data, p, l, inidata->datalen);
             WinSetDlgItemText(hwnd, IAD_DATA, p);
-            free(p);
+            xfree(p);
           }
         }
@@ -1478 +1479 @@
     hINI = PrfOpenProfile(useHab, filename);
     if (hINI == NULLHANDLE) {
-      free(filename);
+      xfree(filename);
       return (HWND) 0;
     }
@@ -1528 +1529 @@
       PostMsg(hwndClient, UM_INITIALSIZE, MPVOID, MPVOID);
   }
-  else if (filename)
-    free(filename);
+  else
+    xfree(filename);
   return hwndFrame;
 }
@@ -2026 +2027 @@
         inidata->hini = PrfOpenProfile(WinQueryAnchorBlock(hwnd),
                                        inidata->ininame);
-        free(mp1);
+        xfree(mp1);
       }
       else
@@ -2156 +2157 @@
             strcpy(inidata->keyname, keyname);
             strcpy(inidata->applname, applname);
-            if (inidata->data)
-              free(inidata->data);
+            xfree(inidata->data);
             inidata->data = GetKeyData(WinWindowFromID(hwnd,
                                                        INI_DATALIST),
@@ -2344 +2344 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            free(inirec);
+            xfree(inirec);
           }
         }
@@ -2364 +2364 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            free(inirec);
+            xfree(inirec);
           }
         }
@@ -2404 +2404 @@
                          IntraIniProc,
                          FM3ModHandle, INII_FRAME, (PVOID) inirec)) {
-            free(inirec);
+            xfree(inirec);
             break;
           }
@@ -2410 +2410 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            free(inirec);
+            xfree(inirec);
           }
         }
@@ -2448 +2448 @@
               xstrdup(inidata->ininame, pszSrcFile, __LINE__);
             if (!prfp->pszUserName)
-              free(prfp);
+              xfree(prfp);
             else {
               prfp->cchUserName = strlen(prfp->pszUserName);
               prfp->pszSysName = xstrdup(filename, pszSrcFile, __LINE__);
               if (!prfp->pszSysName) {
-                free(prfp->pszUserName);
-                free(prfp);
+                xfree(prfp->pszUserName);
+                xfree(prfp);
               }
               else {
@@ -2462 +2462 @@
                   Runtime_Error(pszSrcFile, __LINE__,
                                 GetPString(IDS_COULDNTSTARTTHREADTEXT));
-                  free(prfp->pszSysName);
-                  free(prfp->pszUserName);
-                  free(prfp);
+                  xfree(prfp->pszSysName);
+                  xfree(prfp->pszUserName);
+                  xfree(prfp);
                 }
                 else
@@ -2763 +2763 @@
         if (inidata->hini != NULLHANDLE && *inidata->ininame)
           CloseProfile(inidata->hini, FALSE);
-        if (inidata->data)
-          free(inidata->data);
+        xfree(inidata->data);
         if (inidata->hwndPopup)
           WinDestroyWindow(inidata->hwndPopup);
-        free(inidata);
+        xfree(inidata);
       }
       if (!dontclose &&

trunk/dll/init.c

@@ -41 +41 @@
   13 Jan 08 GKY Get Subjectwidth/Subjectleft working in the collector.
   12 Feb 08 SHL Compile OpenWatcom version into binary
+  29 Feb 08 GKY Changes to enable user settable command line length
+  29 Feb 08 GKY Refactor global command line variables to notebook.h
 
 ***********************************************************************/
@@ -71 +73 @@
 #include "strutil.h"                    // GetPString
 #include "fm3dll.h"
+#include "notebook.h"                   // command line variables (editor etc)
 
 #ifdef __IBMC__
@@ -90 +93 @@
 
 static PSZ pszSrcFile = __FILE__;
+
+BOOL CheckFileHeader(CHAR *filespec, CHAR *signature, LONG offset);
 
 VOID FindSwapperDat(VOID)
@@ -709 +714 @@
     }
     else {
+      if (!CheckFileHeader(inipath, "\xff\xff\xff\xff\x14\x00\x00\x00", 0L))
+        saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING, "Check INI header failed");
       fIniExisted = TRUE;
       if (fs3.attrFile & (FILE_READONLY | FILE_HIDDEN | FILE_SYSTEM)) {
@@ -951 +958 @@
   ulCnrType = CCS_EXTENDSEL;
   FilesToGet = FILESTOGET_MIN;
+  MaxComLineStrg = MAXCOMLINESTRGDEFAULT;
   AutoviewHeight = 48;
   strcpy(printer, "PRN");
@@ -975 +983 @@
 
   // load preferences from profile (INI) file
+  size = sizeof(ULONG);
+  PrfQueryProfileData(fmprof, appname, "MaxComLineStrg", &MaxComLineStrg, &size);
+  if (MaxComLineStrg < CMDLNLNGTH_MIN)
+    MaxComLineStrg = CMDLNLNGTH_MIN;
+  else if (MaxComLineStrg > CMDLNLNGTH_MAX)
+    MaxComLineStrg = CMDLNLNGTH_MAX;
+  editor = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
+  if (!editor)
+    return 0; //already complained
+  viewer = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
+  if (!viewer)
+    return 0; //already complained
+  virus = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
+  if (!virus)
+    return 0; //already complained
+  compare = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
+  if (!compare)
+    return 0; //already complained
+  binview = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
+  if (!binview)
+    return 0; //already complained
+  bined = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
+  if (!bined)
+    return 0; //already complained
+  dircompare = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
+  if (!dircompare)
+    return 0; //already complained
+  ftprun = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
+  if (!ftprun)
+    return 0; //already complained
+  httprun = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
+  if (!httprun)
+    return 0; //already complained
+  mailrun = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
+  if (!mailrun)
+    return 0; //already complained
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, appname, "ShowTarget", &fShowTarget, &size);
@@ -1186 +1230 @@
   size = sizeof(printer);
   PrfQueryProfileData(fmprof, appname, "Printer", printer, &size);
-  size = sizeof(dircompare);
+  size = MaxComLineStrg;
   PrfQueryProfileData(fmprof, appname, "DirCompare", dircompare,
                       &size);
-  size = sizeof(viewer);
+  size = MaxComLineStrg;
   PrfQueryProfileData(fmprof, appname, "Viewer", viewer, &size);
-  size = sizeof(editor);
+  size = MaxComLineStrg;
   PrfQueryProfileData(fmprof, appname, "Editor", editor, &size);
-  size = sizeof(binview);
+  size = MaxComLineStrg;
   PrfQueryProfileData(fmprof, appname, "BinView", binview, &size);
-  size = sizeof(bined);
+  size = MaxComLineStrg;
   PrfQueryProfileData(fmprof, appname, "BinEd", bined, &size);
-  size = sizeof(compare);
+  size = MaxComLineStrg;
   PrfQueryProfileData(fmprof, appname, "Compare", compare, &size);
-  size = sizeof(virus);
+  size = MaxComLineStrg;
   PrfQueryProfileData(fmprof, appname, "Virus", virus, &size);
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, appname, "FtpRunWPSDefault", &fFtpRunWPSDefault, &size);
-  size = sizeof(ftprun);
+  size = MaxComLineStrg;
   PrfQueryProfileData(fmprof, appname, "FTPRun", ftprun, &size);
   if (!*ftprun)
@@ -1209 +1253 @@
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, appname, "HttpRunWPSDefault", &fHttpRunWPSDefault, &size);
-  size = sizeof(httprun);
+  size = MaxComLineStrg;
   PrfQueryProfileData(fmprof, appname, "HTTPRun", httprun, &size);
   if (!*httprun)
     fHttpRunWPSDefault = TRUE;
-  size = sizeof(mailrun);
+  size = MaxComLineStrg;
   PrfQueryProfileData(fmprof, appname, "MailRun", mailrun, &size);
   size = sizeof(ftprundir);
@@ -1442 +1486 @@
 }
 
+BOOL CheckFileHeader(CHAR *filespec, CHAR *signature, LONG offset)
+{
+  HFILE handle;
+  ULONG action;
+  ULONG len = strlen(signature);
+  ULONG l;
+  // CHAR buffer[80];
+  CHAR buffer[4096];                    // 06 Oct 07 SHL Protect against NTFS defect
+  BOOL ret = FALSE;
+
+  DosError(FERR_DISABLEHARDERR);
+  if (DosOpen(filespec,
+              &handle,
+              &action,
+              0,
+              0,
+              OPEN_ACTION_FAIL_IF_NEW |
+              OPEN_ACTION_OPEN_IF_EXISTS,
+              OPEN_FLAGS_FAIL_ON_ERROR |
+              OPEN_FLAGS_NOINHERIT |
+              OPEN_FLAGS_RANDOMSEQUENTIAL |
+              OPEN_SHARE_DENYNONE | OPEN_ACCESS_READONLY, 0))
+    ret = FALSE;
+  else {
+    // Try signature match
+    l = len;
+    l = min(l, 79);
+    if (!DosChgFilePtr(handle,
+                       abs(offset),
+                       (offset >= 0) ?
+                       FILE_BEGIN : FILE_END, &len)) {
+      if (!DosRead(handle, buffer, l, &len) && len == l) {
+        if (!memcmp(signature, buffer, l))
+          ret = TRUE;                   // Matched
+      }
+    }
+  }
+  DosClose(handle);                     /* Either way, we're done for now */
+  return ret;                           /* Return TRUE if matched */
+}
+
 int CheckVersion(int vermajor, int verminor)
 {

trunk/dll/ipf/context.ipf

@@ -10 +10 @@
 .* 01 Sep 06 GKY ADD new partition disks information
 .* 03 Mar 07 GKY Update that file systems other than HPFS support long names
+.* 29 Feb 08 GKY Document unhide menu item
 .*
 .***********************************************************************
@@ -188 +189 @@
 :hp6.Hide objects:ehp6. hides objects (removes them from view in the
 container) until you rescan, use the :link reftype=hd res=93400.Filter
-dialog:elink. or switch directories.
-:artwork runin name='\bitmaps\file.bmp'. :artwork runin name='\bitmaps\fldr.bmp'. :artwork runin name='\bitmaps\drive.bmp'.
+dialog:elink. or switch directories or use Unhide (see below).
+:artwork runin name='\bitmaps\file.bmp'. :artwork runin name='\bitmaps\fldr.bmp'.
+:p.
+:hp6.Unhide objects:ehp6. unhides objects (restores them from view in the container)
+Unhide doesn't unhide items that are filtered by the current mask or attribute filters
+:artwork runin name='\bitmaps\file.bmp'. :artwork runin name='\bitmaps\fldr.bmp'.
 :p.
 :artwork name='..\..\bitmaps\playmm.bmp' align=center.

trunk/dll/literal.c

@@ -17 +17 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   16 Nov 07 SHL Report fixup buffer overflow
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -192 +193 @@
   cBufBytes = pszOut - pszWork;                /* Calc string length excluding terminator */
   memcpy(pszBuf, pszWork, cBufBytes + 1);        /* Overwrite including terminator */
-  free(pszWork);
+  xfree(pszWork);
 
   return cBufBytes;                        /* Return string length */

trunk/dll/mainwnd.c

@@ -54 +54 @@
   19 Feb 08 JBS Stop deleting "State at last FM/2 Close" from INI file so it be accessed from States combo box.
   22 Feb 08 JBS Ticket 230: Fix/improve various code related to state or presparam values in the INI file.
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -180 +181 @@
       WinEnableWindow(WinQueryWindow(hwndMain, QW_PARENT), TRUE);
       fNoTileUpdate = FALSE;
-      if (mp1)
-        free((char *)mp1);
+      xfree((char *)mp1);
       if (fAutoTile)
         TileChildren(hwndMain, TRUE);
@@ -510 +510 @@
       WinSetMultWindowPos(WinQueryAnchorBlock(hwnd), &swp[2], numtools);
     }
-    free(swp);
+    xfree(swp);
   }
   WinInvalidateRect(hwnd, NULL, TRUE);
@@ -1004 +1004 @@
               }
             }
-            free(s);
+            xfree(s);
           }
         }
@@ -1606 +1606 @@
                                    SEPARATEKEEP : SEPARATE),
                        directory, list, NULL, pszSrcFile, __LINE__);
-            if (list)
-              free(list);
+            xfree(list);
             WinDestroyWindow(hwnd);
             break;
@@ -6234 +6233 @@
                                   MPFROMP(pszStateName),
                                   MPVOID)) {
-                  free(pszStateName);
+                  xfree(pszStateName);
                 }
               }
@@ -6308 +6307 @@
         if (!PostMsg(MainObjectHwnd, UM_RESTORE, MPFROMP(pszDefaultStateName), MPVOID))
           // 05 Feb 08 SHL fixme to complain?
-          free(pszDefaultStateName);
+          xfree(pszDefaultStateName);
       }
     }

trunk/dll/mainwnd2.c

@@ -23 +23 @@
   19 Jan 08 GKY Rework Utilities menu
   14 Feb 08 SHL Rework to support settings menu conditional cascade
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -1347 +1348 @@
     hwndMain = (HWND) 0;
     pd = WinQueryWindowPtr(hwnd, QWL_USER + 4);
-    if (pd)
-      free(pd);
+    xfree(pd);
     if (!PostMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID))
       WinSendMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID);

trunk/dll/makelist.c

@@ -14 +14 @@
   06 Apr 07 GKY Work around PM DragInfo and DrgFreeDISH limits
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -68 +69 @@
 {
   if (li) {
-    if (li->ulitemID)
-      free(li->ulitemID);
-    if (li->cbFile)
-      free(li->cbFile);
+    xfree(li->ulitemID);
+    xfree(li->cbFile);
     if (li->list)
       FreeList(li->list);
-    free(li);
+    xfree(li);
   }
 }
@@ -92 +91 @@
     _heap_check();
 #endif
-    free(list);
+    xfree(list);
   }
   DosPostEventSem(CompactSem);

trunk/dll/menu.c

@@ -13 +13 @@
   29 Jul 06 SHL Use xfgets_bstripcr
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -67 +68 @@
   while (info) {
     next = info->next;
-    if (info->text)
-      free(info->text);
-    free(info);
+    xfree(info->text);
+    xfree(info);
     info = next;
   }
@@ -107 +107 @@
           info->text = xstrdup(tokens[2], pszSrcFile, __LINE__);
           if (!info->text)
-            free(info);
+            xfree(info);
           else {
             if (!stricmp(tokens[0], "MENUITEM"))
@@ -115 +115 @@
             else {
               /* error! */
-              free(info->text);
-              free(info);
+              xfree(info->text);
+              xfree(info);
               info = NULL;
             }

trunk/dll/misc.c

@@ -40 +40 @@
   xx Jan 08 JBS Ticket 150: fix/improve save and restore of dir cnr state at FM/2 close/reopen
   21 Jan 08 GKY Stop reallocating NullStr by direct editing of empty subject and longname strings.
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -225 +226 @@
         }
       }
-      free(s);
+      xfree(s);
     }
     if (releaseme)
@@ -844 +845 @@
                   if (!PostMsg(hwnd,
                                UM_FIXEDITNAME, MPVOID, MPFROMP(filename)))
-                    free(filename);
+                    xfree(filename);
                 }
                 if (stricmp(testname, pci->pszFileName)) {
@@ -852 +853 @@
                     if (!PostMsg(hwnd,
                                  UM_FIXEDITNAME, MPVOID, MPFROMP(filename)))
-                      free(filename);
+                      xfree(filename);
                   }
                 }
@@ -2012 +2013 @@
                                   GetPString(IDS_SUBJ) : GetPString(IDS_NAME));
     WinSetWindowText(hwnd, s);
-    free(s);
+    xfree(s);
   }
 }
@@ -2031 +2032 @@
              !(flWindowAttr & CV_TEXT)) ? GetPString(IDS_MINI) : NullStr);
     WinSetWindowText(hwnd, s);
-    free(s);
+    xfree(s);
   }
 }
@@ -2051 +2052 @@
       sprintf(s, "F:%s", GetPString(IDS_ALLTEXT));
     WinSetWindowText(hwnd, s);
-    free(s);
+    xfree(s);
   }
 }
@@ -2196 +2197 @@
       }
       numswitches = y;
-      free(pswb);
+      xfree(pswb);
       DosPostEventSem(CompactSem);
     }

trunk/dll/mkdir.c

@@ -10 +10 @@
 
   01 Aug 04 SHL Baseline
+  29 Feb 08 GKY Refactor global command line variables to notebook.h
 
 ***********************************************************************/
@@ -24 +25 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "notebook.h"                   // targetdirectoy
 #include "fm3dll.h"
 

trunk/dll/mle.c

@@ -18 +18 @@
   26 Aug 07 GKY DosSleep(1) in loops changed to (0)
   17 Dec 07 GKY Make WPURLDEFAULTSETTINGS the fall back for ftp/httprun
+  29 Feb 08 GKY Refactor global command line variables to notebook.h
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -36 +38 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "notebook.h"                   // httprun etc
 #include "fm3dll.h"
 
@@ -247 +250 @@
     Dos_Error(MB_CANCEL, rc, h, pszSrcFile, __LINE__,
               GetPString(IDS_OUTOFMEMORY));
-    free(sel);
+    xfree(sel);
     DosPostEventSem(CompactSem);
     return FALSE;
@@ -264 +267 @@
     if (sellen < 1) {
       Runtime_Error(pszSrcFile, __LINE__, "len < 1");
-      free(sel);
+      xfree(sel);
       DosPostEventSem(CompactSem);
       return FALSE;
@@ -278 +281 @@
     SaveToClip(h, sel, TRUE);
     DosFreeMem(temp);
-    free(sel);
+    xfree(sel);
     MLEenable(h);
     DosPostEventSem(CompactSem);
@@ -299 +302 @@
 #endif
       DosFreeMem(temp);
-      free(sel);
+      xfree(sel);
       MLEenable(h);
       DosPostEventSem(CompactSem);
@@ -372 +375 @@
 #endif
     DosFreeMem(temp);
-    free(sel);
+    xfree(sel);
     DosPostEventSem(CompactSem);
     MLEenable(h);
@@ -405 +408 @@
 #endif
   DosFreeMem(temp);
-  free(sel);
+  xfree(sel);
   DosPostEventSem(CompactSem);
   return TRUE;
@@ -571 +574 @@
           else
             ret = FALSE;
-          free(buffer);
+          xfree(buffer);
         }
         DosFreeMem(hexbuff);
@@ -767 +770 @@
         _heap_check();
 #endif
-        free(bkg);
+        xfree(bkg);
         WinDestroyMsgQueue(thmq);
       }

trunk/dll/newview.c

@@ -29 +29 @@
   28 Dec 07 GKY Add mailrun to allow mailto by clicking on an email address in the viewer
   29 Dec 07 GKY Formated email address using "<mailto:"
+  29 Feb 08 GKY Use xfree where appropriate
+  29 Feb 08 GKY Refactor global command line variables to notebook.h
 
 ***********************************************************************/
@@ -49 +51 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "notebook.h"                   // httprun etc
 #include "fm3dll.h"
 
@@ -638 +641 @@
   if (ad) {
     ad->selected = ad->textsize = ad->numlines = ad->numalloc = 0;
-    if (ad->text)
-      free(ad->text);
-    if (ad->lines)
-      free(ad->lines);
-    if (ad->markedlines)
-      free(ad->markedlines);
+    xfree(ad->text);
+    xfree(ad->lines);
+    xfree(ad->markedlines);
     ad->text = NULL;
     ad->lines = NULL;
@@ -1202 +1202 @@
             ad->found = 0;
             ad->selected = ad->numlines = ad->numalloc = 0;
-            if (ad->lines)
-              free(ad->lines);
-            if (ad->markedlines)
-              free(ad->markedlines);
+            xfree(ad->lines);
+            xfree(ad->markedlines);
             ad->lines = NULL;
             ad->markedlines = NULL;
@@ -1314 +1312 @@
             }
             if (ad->numlines) {
-              ad->markedlines = xmalloc(ad->numlines, pszSrcFile, __LINE__);
+              ad->markedlines = xmallocz(ad->numlines, pszSrcFile, __LINE__);
               if (ad->markedlines) {
-                memset(ad->markedlines, 0, ad->numlines);
                 ad->selected = 0;
               }
@@ -1372 +1369 @@
           priority_normal();
           if (*ad->filename) {
-            if (ad->text)
-              free(ad->text);
-            if (ad->lines)
-              free(ad->lines);
-            if (ad->markedlines)
-              free(ad->markedlines);
+            xfree(ad->text);
+            xfree(ad->lines);
+            xfree(ad->markedlines);
             ad->text = NULL;
             ad->lines = NULL;
@@ -1426 +1420 @@
                               __LINE__,
                               GetPString(IDS_ERRORREADINGTEXT), ad->filename);
-                    free(ad->text);
+                    xfree(ad->text);
                     ad->text = NULL;
                     ad->textsize = 0;
@@ -2381 +2375 @@
               switch (ret) {
               case 0:
-                free(urld);
+                xfree(urld);
                 goto NoAdd;
               case 1:
@@ -2407 +2401 @@
                             "%s %s", httprun, urld->url);
                 }
-                free(urld);
+                xfree(urld);
                 goto NoAdd;
               case 2:
@@ -2433 +2427 @@
                             "%s %s", ftprun, urld->url);
                 }
+                xfree(urld);
+                goto NoAdd;
               case 3:
                 if (*urld->url){
@@ -2441 +2437 @@
                           "%s %s", mailrun, urld->url);
                 }
-                free(urld);
+                xfree(urld);
                 goto NoAdd;
               default:
                 break;
               }
-              free(urld);
+              xfree(urld);
             }
           }
@@ -2524 +2520 @@
                                   MPFROMLONG(whichline));
             }
-            free(s);
+            xfree(s);
           }
         }
@@ -3937 +3933 @@
         FreeViewerMem(hwnd);
         WinSetWindowPtr(hwnd, QWL_USER, NULL);
-        free(ad);
+        xfree(ad);
       }
       if (hwndRestore && hwndRestore != HWND_DESKTOP) {

trunk/dll/notebook.c

@@ -29 +29 @@
   16 Feb 08 SHL Restore SaveDirCnrState internal state save logic - accidentally removed
   22 Feb 08 JBS Ticket 230: Fix/improve various code related to state or presparam values in the INI file.
+  29 Feb 08 GKY Changes to enable user settable command line length
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -201 +203 @@
     PrfWriteProfileString(fmprof, appname, "DefArc", szDefArc);
     {
-      CHAR szCLBuf[MAXCOMLINESTRG], szPathBuf[CCHMAXPATH];
+      CHAR *szCLBuf;
+      CHAR szPathBuf[CCHMAXPATH];
       PSZ pszWorkBuf;
 
-      pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
-      if (!pszWorkBuf)
+      szCLBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
+        if (!szCLBuf)
+          return 0; //already complained
+      pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
+      if (!pszWorkBuf) {
+        xfree(szCLBuf);
         return 0; //already complained
-      WinQueryDlgItemText(hwnd, CFGA_VIRUS, MAXCOMLINESTRG, szCLBuf);
-      szCLBuf[MAXCOMLINESTRG - 1] = 0;
+      }
+      WinQueryDlgItemText(hwnd, CFGA_VIRUS, MaxComLineStrg, szCLBuf);
+      szCLBuf[MaxComLineStrg - 1] = 0;
       if (strcmp(szCLBuf, virus)){
         NormalizeCmdLine(pszWorkBuf, szCLBuf);
         memcpy(virus, pszWorkBuf, strlen(pszWorkBuf) + 1);
-        xfree(pszWorkBuf);
+        xfree(pszWorkBuf);
+        xfree(szCLBuf);
         if (!strchr(virus, '%') && strlen(virus) > 3)
           strcat(virus, " %p");
@@ -376 +385 @@
   case WM_INITDLG:
     WinSendDlgItemMsg(hwnd, CFGV_VIEWER, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MAXCOMLINESTRG, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGV_EDITOR, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MAXCOMLINESTRG, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGV_BINVIEW, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MAXCOMLINESTRG, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGV_BINED, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MAXCOMLINESTRG, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinEnableWindow(WinWindowFromID(hwnd, CFGV_FIND), FALSE);
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
@@ -468 +477 @@
   case WM_CLOSE:
     {
-      CHAR szCLBuf[MAXCOMLINESTRG];
+      CHAR *szCLBuf;
       PSZ pszWorkBuf;
 
-      pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
-      if (!pszWorkBuf)
+      szCLBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
+        if (!szCLBuf)
+          return 0; //already complained
+      pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
+      if (!pszWorkBuf) {
+        xfree(szCLBuf);
         return 0; //already complained
-      WinQueryDlgItemText(hwnd, CFGV_VIEWER, MAXCOMLINESTRG, szCLBuf);
-      szCLBuf[MAXCOMLINESTRG - 1] = 0;
+      }
+      WinQueryDlgItemText(hwnd, CFGV_VIEWER, MaxComLineStrg, szCLBuf);
+      szCLBuf[MaxComLineStrg - 1] = 0;
       if (strcmp(szCLBuf, viewer)){
         NormalizeCmdLine(pszWorkBuf, szCLBuf);
@@ -482 +496 @@
           strcat(viewer, " %a");
       }
-      WinQueryDlgItemText(hwnd, CFGV_EDITOR, MAXCOMLINESTRG, szCLBuf);
-      szCLBuf[MAXCOMLINESTRG - 1] = 0;
+      WinQueryDlgItemText(hwnd, CFGV_EDITOR, MaxComLineStrg, szCLBuf);
+      szCLBuf[MaxComLineStrg - 1] = 0;
       if (strcmp(szCLBuf, editor)){
         NormalizeCmdLine(pszWorkBuf, szCLBuf);
@@ -490 +504 @@
           strcat(editor, " %a");
       }
-      WinQueryDlgItemText(hwnd, CFGV_BINVIEW, MAXCOMLINESTRG, szCLBuf);
-      szCLBuf[MAXCOMLINESTRG - 1] = 0;
+      WinQueryDlgItemText(hwnd, CFGV_BINVIEW, MaxComLineStrg, szCLBuf);
+      szCLBuf[MaxComLineStrg - 1] = 0;
       if (strcmp(szCLBuf, binview)){
         NormalizeCmdLine(pszWorkBuf, szCLBuf);
@@ -498 +512 @@
           strcat(binview, " %a");
       }
-      WinQueryDlgItemText(hwnd, CFGV_BINED, MAXCOMLINESTRG, szCLBuf);
-      szCLBuf[MAXCOMLINESTRG - 1] = 0;
+      WinQueryDlgItemText(hwnd, CFGV_BINED, MaxComLineStrg, szCLBuf);
+      szCLBuf[MaxComLineStrg - 1] = 0;
       if (strcmp(szCLBuf, bined)){
         NormalizeCmdLine(pszWorkBuf, szCLBuf);
@@ -507 +521 @@
       }
       xfree(pszWorkBuf);
+      xfree(szCLBuf);
       PrfWriteProfileString(fmprof, appname, "Viewer", viewer);
       PrfWriteProfileString(fmprof, appname, "Editor", editor);
@@ -547 +562 @@
                       MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGH_FTPRUN, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MAXCOMLINESTRG, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGH_HTTPRUN, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MAXCOMLINESTRG, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGH_MAILRUN, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MAXCOMLINESTRG, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGH_RUNMAILWORKDIR, EM_SETTEXTLIMIT,
                       MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
@@ -664 +679 @@
   case WM_CLOSE:
     {
-      CHAR szCLBuf[MAXCOMLINESTRG], szPathBuf[CCHMAXPATH];
+      CHAR *szCLBuf;
+      CHAR szPathBuf[CCHMAXPATH];
       PSZ pszWorkBuf;
 
-      pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
-      if (!pszWorkBuf)
+      szCLBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
+        if (!szCLBuf)
+          return 0; //already complained
+      pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
+      if (!pszWorkBuf) {
+        xfree(szCLBuf);
         return 0; //already complained
+      }
       WinQueryDlgItemText(hwnd, CFGH_RUNHTTPWORKDIR, CCHMAXPATH, szPathBuf);
       szPathBuf[CCHMAXPATH - 1] = 0;
@@ -682 +703 @@
       bstrip(szPathBuf);
       memcpy(mailrundir, szPathBuf, strlen(szPathBuf) + 1);
-      WinQueryDlgItemText(hwnd, CFGH_FTPRUN, MAXCOMLINESTRG, szCLBuf);
-      szCLBuf[MAXCOMLINESTRG - 1] = 0;
+      WinQueryDlgItemText(hwnd, CFGH_FTPRUN, MaxComLineStrg, szCLBuf);
+      szCLBuf[MaxComLineStrg - 1] = 0;
       if (strcmp(szCLBuf, ftprun)){
         NormalizeCmdLine(pszWorkBuf, szCLBuf);
         memcpy(ftprun, pszWorkBuf, strlen(pszWorkBuf) + 1);
       }
-      WinQueryDlgItemText(hwnd, CFGH_HTTPRUN, MAXCOMLINESTRG, szCLBuf);
-      szCLBuf[MAXCOMLINESTRG - 1] = 0;
+      WinQueryDlgItemText(hwnd, CFGH_HTTPRUN, MaxComLineStrg, szCLBuf);
+      szCLBuf[MaxComLineStrg - 1] = 0;
       if (strcmp(szCLBuf, httprun)){
         NormalizeCmdLine(pszWorkBuf, szCLBuf);
         memcpy(httprun, pszWorkBuf, strlen(pszWorkBuf) + 1);
       }
-      WinQueryDlgItemText(hwnd, CFGH_MAILRUN, MAXCOMLINESTRG, szCLBuf);
-      szCLBuf[MAXCOMLINESTRG - 1] = 0;
+      WinQueryDlgItemText(hwnd, CFGH_MAILRUN, MaxComLineStrg, szCLBuf);
+      szCLBuf[MaxComLineStrg - 1] = 0;
       if (strcmp(szCLBuf, mailrun)){
         NormalizeCmdLine(pszWorkBuf, szCLBuf);
@@ -701 +722 @@
       }
       xfree(pszWorkBuf);
+      xfree(szCLBuf);
       PrfWriteProfileString(fmprof, appname, "HttpRunDir", httprundir);
       PrfWriteProfileString(fmprof, appname, "FtpRunDir", ftprundir);
@@ -1065 +1087 @@
   switch (msg) {
   case WM_INITDLG:
+    WinSendDlgItemMsg(hwnd, CFGG_CMDLNLNGTH, SPBM_SETTEXTLIMIT,
+                      MPFROMSHORT(8), MPVOID);
+    WinSendDlgItemMsg(hwnd, CFGG_CMDLNLNGTH, SPBM_OVERRIDESETLIMITS,
+                      MPFROMLONG(CMDLNLNGTH_MAX), MPFROMLONG(CMDLNLNGTH_MIN));
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
     break;
@@ -1086 +1112 @@
     WinCheckButton(hwnd, CFGG_CONFIRMTARGET, fConfirmTarget);
     WinSetDlgItemText(hwnd, CFGG_TARGETDIR, targetdir);
+    WinSendDlgItemMsg(hwnd, CFGG_CMDLNLNGTH, SPBM_SETCURRENTVALUE,
+                      MPFROMLONG(MaxComLineStrg), MPVOID);
     return 0;
 
@@ -1189 +1217 @@
     fConfirmTarget = WinQueryButtonCheckstate(hwnd, CFGG_CONFIRMTARGET);
     PrfWriteProfileData(fmprof, appname, "ConfirmTarget",
-                        &fConfirmTarget, sizeof(BOOL));
+                        &fConfirmTarget, sizeof(BOOL));
+    {
+      WinSendDlgItemMsg(hwnd, CFGG_CMDLNLNGTH, SPBM_QUERYVALUE,
+                        MPFROMP(&MaxComLineStrg), MPFROM2SHORT(0, SPBQ_DONOTUPDATE));
+      if (MaxComLineStrg < CMDLNLNGTH_MIN)
+        MaxComLineStrg = CMDLNLNGTH_MIN;
+      else if (MaxComLineStrg > CMDLNLNGTH_MAX)
+        MaxComLineStrg = CMDLNLNGTH_MAX;
+      PrfWriteProfileData(fmprof,
+                          appname, "MaxComLineStrg", &MaxComLineStrg, sizeof(ULONG));
+    }
     break;
   }
@@ -1200 +1238 @@
   case WM_INITDLG:
     WinSendDlgItemMsg(hwnd, CFGC_COMPARE, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MAXCOMLINESTRG, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGC_DIRCOMPARE, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(MAXCOMLINESTRG, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg, 0), MPVOID);
     WinEnableWindow(WinWindowFromID(hwnd, CFGC_FIND), FALSE);
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
@@ -1278 +1316 @@
   case WM_CLOSE:
     {
-      CHAR szCLBuf[MAXCOMLINESTRG];
+      CHAR *szCLBuf;
       PSZ pszWorkBuf;
 
-      pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
-      if (!pszWorkBuf)
+      szCLBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
+        if (!szCLBuf)
+          return 0; //already complained
+      pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
+      if (!pszWorkBuf) {
+        xfree(szCLBuf);
         return 0; //already complained
-      WinQueryDlgItemText(hwnd, CFGC_DIRCOMPARE, MAXCOMLINESTRG, szCLBuf);
-        szCLBuf[MAXCOMLINESTRG - 1] = 0;
+      }
+      WinQueryDlgItemText(hwnd, CFGC_DIRCOMPARE, MaxComLineStrg, szCLBuf);
+        szCLBuf[MaxComLineStrg - 1] = 0;
         if (strcmp(szCLBuf, dircompare)){
           NormalizeCmdLine(pszWorkBuf, szCLBuf);
@@ -1293 +1336 @@
         }
       PrfWriteProfileString(fmprof, appname, "DirCompare", dircompare);
-      WinQueryDlgItemText(hwnd, CFGC_COMPARE, MAXCOMLINESTRG, szCLBuf);
-        szCLBuf[MAXCOMLINESTRG - 1] = 0;
-        if (strcmp(szCLBuf, compare)){
-          NormalizeCmdLine(pszWorkBuf, szCLBuf);
-          memcpy(compare, pszWorkBuf, strlen(pszWorkBuf) + 1);
-          if (!strchr(compare, '%') && strlen(compare) > 3)
-            strcat(compare, " %a");
-        }
+      WinQueryDlgItemText(hwnd, CFGC_COMPARE, MaxComLineStrg, szCLBuf);
+      szCLBuf[MaxComLineStrg - 1] = 0;
+      if (strcmp(szCLBuf, compare)){
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(compare, pszWorkBuf, strlen(pszWorkBuf) + 1);
+        if (!strchr(compare, '%') && strlen(compare) > 3)
+          strcat(compare, " %a");
+      }
       xfree(pszWorkBuf);
+      xfree(szCLBuf);
       PrfWriteProfileString(fmprof, appname, "Compare", compare);
       break;

trunk/dll/notebook.h

@@ -10 +10 @@
 
   14 Feb 08 SHL Refactor from fm3dll.h
+  29 Feb 08 GKY Refactor global command line variables to notebook.h
 
 ***********************************************************************/
@@ -29 +30 @@
 VOID CfgMenuInit(HWND hwndMenu, BOOL fIsLite);
 
+#ifdef DEFINE_GLOBALS
+#define DATADEF
+#else
+#define DATADEF extern
+#endif
+
+DATADEF CHAR *editor, *viewer, *virus, *compare, *binview, *bined,
+  *dircompare, *ftprun, *httprun, *mailrun;
+DATADEF CHAR ftprundir[CCHMAXPATH], httprundir[CCHMAXPATH],
+  mailrundir[CCHMAXPATH], targetdir[CCHMAXPATH];
+
 #endif // NOTEBOOK_H

trunk/dll/notify.c

@@ -14 +14 @@
   06 Aug 07 GKY Reduce DosSleep times (ticket 148)
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  29 Feb 08 GKY Use xfree where appropriate
 
 
@@ -190 +191 @@
 
     if (p != str)
-      free(p);
+      xfree(p);
     if (id > NOTE_MAX)
       id = NOTE_FRAME;
@@ -254 +255 @@
                           LM_INSERTITEM, MPFROM2SHORT(LIT_END, 0), mp2);
         PostMsg(hwndNotify, UM_NOTIFY, MPVOID, MPVOID);
-        free((CHAR *) mp2);
+        xfree((CHAR *) mp2);
       }
       WinDismissDlg(hwnd, 0);
@@ -271 +272 @@
                         NOTE_LISTBOX,
                         LM_INSERTITEM, MPFROM2SHORT(LIT_END, 0), mp2);
-      free((CHAR *) mp2);
+      xfree((CHAR *) mp2);
     }
     {
@@ -472 +473 @@
           }
         }
-        free(s);
+        xfree(s);
       }
     }

trunk/dll/objcnr.c

@@ -21 +21 @@
   13 Aug 07 SHL Move #pragma alloc_text to end for OpenWatcom compat
   14 Aug 07 SHL Revert ProcessDir DosSleep to 0
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -106 +107 @@
     if (!pciP) {
       Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__, "CM_ALLOCRECORD");
-      free(pffbArray);
+      xfree(pffbArray);
       return;
     }
@@ -131 +132 @@
   }
   else {
-    free(pffbArray);
+    xfree(pffbArray);
     Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
               GetPString(IDS_CANTFINDDIRTEXT), filename);
@@ -152 +153 @@
   ri.fInvalidateRecord = TRUE;
   if (!WinSendMsg(hwndCnr, CM_INSERTRECORD, MPFROMP(pciP), MPFROMP(&ri))) {
-    free(pffbArray);
+    xfree(pffbArray);
     return;
   }
@@ -201 +202 @@
   }
 
-  free(pffbArray);
+  xfree(pffbArray);
   WinSendMsg(hwndCnr, CM_INVALIDATERECORD, MPFROMP(&pciP),
              MPFROM2SHORT(1, 0));
@@ -233 +234 @@
   PostMsg(WinQueryWindow(dirsize->hwndCnr, QW_PARENT), UM_CONTAINER_FILLED,
           MPVOID, MPVOID);
-  free(dirsize);
+  xfree(dirsize);
 }
 
@@ -279 +280 @@
         Runtime_Error(pszSrcFile, __LINE__,
                       GetPString(IDS_COULDNTSTARTTHREADTEXT));
-        free(dirsize);
+        xfree(dirsize);
         WinDismissDlg(hwnd, 0);
         break;
@@ -425 +426 @@
     objcnrwnd = (HWND) 0;
     data = INSTDATA(hwnd);
-    if (data)
-      free(data);
+    xfree(data);
     break;
   }

trunk/dll/pathutil.c

@@ -11 +11 @@
   05 Jan 08 SHL Move from arccnrs.c and comp.c to here
   06 Jan 08 GKY Add NormalizeCmdLine to check program strings on entry
+  29 Feb 08 GKY Use xfree where appropriate
+  29 Feb 08 GKY Changes to enable user settable command line length
 
 ***********************************************************************/
@@ -25 +27 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+
+static PSZ pszSrcFile = __FILE__;
 
 // #pragma data_seg(DATA1)
@@ -105 +109 @@
  * no space between exe and args etc)
  * Command line passed as pszCmdLine_
- * A pointer to a buffer of the size MAXCOMLINESTRG should be supplied in
+ * A pointer to a buffer of the size MaxComLineStrg should be supplied in
  * pszWorkBuf. This is where the quoted etc as necessary command
  * line string will be returned.
@@ -112 +116 @@
 PCSZ NormalizeCmdLine(PSZ pszWorkBuf, PSZ pszCmdLine_)
 {
-  char szCmdLine[MAXCOMLINESTRG], szArgs[MAXCOMLINESTRG];
+  char *szCmdLine, *szArgs;
   char *offset = '\0', *offsetexe, *offsetcom, *offsetcmd, *offsetbtm, *offsetbat;
   APIRET ret;
@@ -123 +127 @@
   PSZ pszNewCmdLine = pszWorkBuf;
 
+  szCmdLine = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
+  if (!szCmdLine)
+    return pszCmdLine_; //already complained
+  szArgs = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
+  if (!szArgs) {
+    xfree(szCmdLine);
+    return pszCmdLine_; //already complained
+  }
   bstrip(pszCmdLine_);
-  memset(pszWorkBuf, 0, MAXCOMLINESTRG);
+  memset(pszWorkBuf, 0, MaxComLineStrg);
   strcpy(szCmdLine, pszCmdLine_);
   if (szCmdLine[0] != '\0') {
@@ -317 +329 @@
     }
   }
+  xfree(szArgs);
+  xfree(szCmdLine);
   return pszWorkBuf;
 }

trunk/dll/pathutil.h

@@ -10 +10 @@
 
   05 Jan 08 SHL Move from fm3dll.h to here
+  29 Feb 08 GKY Changes to enable user settable command line length
 
 ***********************************************************************/
@@ -27 +28 @@
 PCSZ NormalizeCmdLine(PSZ pszWorkBuf, PSZ pszCmdLine_);
 
+#define MAXCOMLINESTRGDEFAULT (2048)                    /* used to build command line strings */
+#define CMDLNLNGTH_MIN (299)
+#define CMDLNLNGTH_MAX (32768)
+
+#ifdef DEFINE_GLOBALS
+#define DATADEF
+#else
+#define DATADEF extern
+#endif
+
+DATADEF ULONG MaxComLineStrg;
+
 #endif // PATHUTIL_H

trunk/dll/presparm.c

@@ -13 +13 @@
   22 Nov 07 GKY Use CopyPresParams to fix presparam inconsistencies in menus
   10 Dec 07 GKY Updated CopyPresParams to copy all parameter types
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -307 +308 @@
                         appname, tagname, ppresparams, ppresparams->cb + 4);
 
-  free(ppresparams);
+  xfree(ppresparams);
 }
 

trunk/dll/remap.c

@@ -13 +13 @@
   31 Aug 06 SHL Use _fsopen to avoid noise complaints
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -83 +84 @@
           info->res = xstrdup(s, pszSrcFile, __LINE__);
           if (!info->res)
-            free(info);
+            xfree(info);
           else {
             x++;
@@ -151 +152 @@
     info->res = xstrdup(res, pszSrcFile, __LINE__);
     if (!info->res)
-      free(info);
+      xfree(info);
     else {
       info->next = NULL;
@@ -161 +162 @@
         info = reshead;
         reshead = reshead->next;
-        free(info);
+        xfree(info);
       }
       return TRUE;
@@ -184 +185 @@
       else
         reshead = info->next;
-      free(info->res);
-      free(info);
+      xfree(info->res);
+      xfree(info);
       return TRUE;
     }
@@ -201 +202 @@
   while (info) {
     next = info->next;
-    free(info->res);
-    free(info);
+    xfree(info->res);
+    xfree(info);
     info = next;
   }
@@ -439 +440 @@
                    "%s", GetPString(IDS_CANTSTARTNETUSETEXT));
           if (!mp2 || (ULONG) mp2 == 1041 || info->failedonce)
-            free(info);
+            xfree(info);
           break;
         }
@@ -728 +729 @@
       while (info) {
         next = info->next;
-        free(info);
+        xfree(info);
         info = next;
       }

trunk/dll/saveclip.c

@@ -22 +22 @@
   30 Dec 07 GKY Use CommaFmtULL
   16 Feb 08 GKY Changed _fsopen flag so a new list file can be created
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -186 +187 @@
           p = strchr(pp, '\n');
       }
-      free(text);
+      xfree(text);
     }
   }
@@ -839 +840 @@
                         subject[1023] = 0;
                       }
-                      free(pfealist);
+                      xfree(pfealist);
                     }
-                    free(pgealist);
+                    xfree(pgealist);
                   }
                 }
@@ -882 +883 @@
                         longname[CCHMAXPATHCOMP - 1] = 0;
                       }
-                      free(pfealist);
+                      xfree(pfealist);
                     }
-                    free(pgealist);
+                    xfree(pgealist);
                   }
                 }

trunk/dll/seeall.c

@@ -34 +34 @@
   30 Dec 07 GKY Use TestFDates for comparing by date
   15 Feb 08 GKY Prevent trap on scan of drive containing files that exceed maxpath
+  29 Feb 08 GKY Use xfree where appropriate
+  29 Feb 08 GKY Refactor global command line variables to notebook.h
 
 ***********************************************************************/
@@ -54 +56 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "notebook.h"                   // targetdirectory
 #include "fm3dll.h"
 
@@ -1300 +1303 @@
   if (ad->afhead && ad->afheadcnt) {
     for (x = 0; x < ad->afheadcnt; x++) {
-      if (ad->afhead[x].fullname)
-        free(ad->afhead[x].fullname);
-    }
-    free(ad->afhead);
+      xfree(ad->afhead[x].fullname);
+    }
+    xfree(ad->afhead);
     ad->afhead = NULL;
-    if (ad->afindex)
-      free(ad->afindex);
+    xfree(ad->afindex);
     ad->afindex = NULL;
   }
@@ -1860 +1861 @@
           pAD->ullSelectedBytes -= pAD->afhead[y].cbFile;
         }
-        free(pAD->afhead[y].fullname);
+        xfree(pAD->afhead[y].fullname);
       }
       memmove(&(pAD->afhead[x]), &(pAD->afhead[y]),
@@ -1919 +1920 @@
   pffbArray = xmalloc(ulBufBytes, pszSrcFile, __LINE__);
   if (!pffbArray) {
-    free(filename);
+    xfree(filename);
     return;
   }
@@ -1957 +1958 @@
             // Complain if pathnames exceeds max
             DosFindClose(hdir);
-            free(pffbArray);
-            free(filename);
+            xfree(pffbArray);
+            xfree(filename);
             if (!fDone) {
               fDone = TRUE;
@@ -2025 +2026 @@
   }
 
-  free(pffbArray);
-  free(filename);
+  xfree(pffbArray);
+  xfree(filename);
 }
 
@@ -4266 +4267 @@
       }
       FreeAllFilesList(hwnd);
-      free(pAD);
+      xfree(pAD);
     }
     break;
@@ -4323 +4324 @@
 #pragma alloc_text(SEEALL,InitWindow,PaintLine,SeeAllWndProc)
 #pragma alloc_text(SEEALL,UpdateList,CollectList,ReSort,Mark)
-#pragma alloc_text(SEEALL,BuildAList,RemoveDeleted,SeeFrameWndProc,FilterList)
+#pragma alloc_text(SEEALL,BuildAList,RemoveDeleted,SeeFrameWndProc,FilterList,FilterAll)
 #pragma alloc_text(SEEALL2,SeeObjWndProc,MakeSeeObjWinThread,FindDupesThread,DupeDlgProc)
 #pragma alloc_text(SEEALL3,FreeAllFilesList,DoADir,FindAllThread,AFDrvsWndProc)

trunk/dll/select.c

@@ -29 +29 @@
   26 Aug 07 GKY DosSleep(1) in loops changed to (0)
   12 Jan 08 SHL Localize SpecialSelect in comp.c
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -257 +258 @@
             fclose(inputFile);
           }
-          free(input);
+          xfree(input);
           DosSleep(1);
         }
@@ -360 +361 @@
             fclose(inputFile);
           }
-          free(input);
+          xfree(input);
           DosSleep(1);
         }
@@ -611 +612 @@
 
   for (z = 0; z < numw; z++) {
-    if (Cnrs[z].ss)
-      free(Cnrs[z].ss);
-  }
-  free(Cnrs);
+    xfree(Cnrs[z].ss);
+  }
+  xfree(Cnrs);
   DosPostEventSem(CompactSem);
 }

trunk/dll/seticon.c

@@ -12 +12 @@
   22 Mar 06 GKY Use QWL_USER
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -92 +93 @@
           Win_Error(hwnd, hwnd, pszSrcFile, __LINE__, "WinSetSysPointerData");
         }
-        if (buff)
-          free(buff);
+        xfree(buff);
       }
       WinDismissDlg(hwnd, 1);

trunk/dll/shadow.c

@@ -13 +13 @@
   06 Aug 07 SHL Use BldFullPathName
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -56 +57 @@
               (path) ? ";STARTUPDIR=" : "", (path) ? path : "", objtitle);
       WinSetObjectData(obj, s);
-      free(s);
+      xfree(s);
     }
   }
@@ -157 +158 @@
                           objtitle,
                           s, (location) ? location : cnr, CO_FAILIFEXISTS);
-    free(s);
+    xfree(s);
   }
   return obj;

trunk/dll/subj.c

@@ -14 +14 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   01 Sep 07 GKY Use xDosSetPathInfo to fix case where FS3 buffer crosses 64k boundry
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -56 +57 @@
     pfealist = xmallocz(1024, pszSrcFile, __LINE__);
     if (pfealist)
-      free(pgealist);
+    xfree(pgealist);
     else {
       pfealist->cbList = 1024;
@@ -64 +65 @@
       rc = DosQueryPathInfo(filename, FIL_QUERYEASFROMLIST,
                             (PVOID) & eaop, (ULONG) sizeof(EAOP2));
-      free(pgealist);
+      xfree(pgealist);
       if (!rc) {
         pfea = &eaop.fpFEA2List->list[0];
@@ -73 +74 @@
         subject[1023] = 0;
       }
-      free(pfealist);
+      xfree(pfealist);
       if (rc == ERROR_SHARING_VIOLATION || rc == ERROR_ACCESS_DENIED) {
         saymsg(MB_CANCEL,

trunk/dll/systemf.c

@@ -20 +20 @@
   06 Aug 07 GKY Reduce DosSleep times (ticket 148)
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  29 Feb 08 GKY Use xfree where appropriate
+  29 Feb 08 GKY Changes to enable user settable command line length
+  29 Feb 08 GKY Refactor global command line variables to notebook.h
 
 ***********************************************************************/
@@ -37 +40 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "notebook.h"                   //targetdirectory
 #include "pathutil.h"
 #include "fm3dll.h"
@@ -80 +84 @@
   /* executes the command once for all files in list */
 
-  char path[CCHMAXPATH], commandline[MAXCOMLINESTRG], modpath[CCHMAXPATH], listfile[CCHMAXPATH],
+  char path[CCHMAXPATH], *commandline, modpath[CCHMAXPATH], listfile[CCHMAXPATH],
        *p, *pp, drive, *file, *ext, *dot;
   register int x;
@@ -89 +93 @@
     return -1;
   }
+  commandline = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
+  if (!commandline)
+    return -1; //already complained
   *listfile = 0;
   bstrip(command);
@@ -590 +597 @@
       ret = WinDlgBox(HWND_DESKTOP, hwnd, CmdLineDlgProc, FM3ModHandle,
                       EXEC_FRAME, &ex);
-      if (ret != 1)
-        return (ret == 0) ? -1 : -2;
+      if (ret != 1) {
+        xfree(commandline);
+        return (ret == 0) ? -1 : -2;
+      }
     }
     else
@@ -673 +682 @@
 
   rc = DosAllocMem((PVOID)&pszPgm,
-                   MAXCOMLINESTRG,
+                   MaxComLineStrg,
                    PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
   if (rc) {
@@ -718 +727 @@
       if (temp) {
         rc = DosAllocMem((PVOID)&pszArgs,
-                         MAXCOMLINESTRG * 2,
+                         MaxComLineStrg * 2,
                          PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
         if (rc)
@@ -851 +860 @@
       if (~type & FULLSCREEN)
         type |= WINDOWED;
-      rc = DosAllocMem((PVOID) & pszArgs, MAXCOMLINESTRG * 2,
+      rc = DosAllocMem((PVOID) & pszArgs, MaxComLineStrg * 2,
                        PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
       if (rc) {
@@ -1234 +1243 @@
     ulOptions |= SAF_STARTCHILDAPP;
 
-  executable = xmallocz(MAXCOMLINESTRG, pszSrcFile, __LINE__);
+  executable = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (executable) {
     va_start(parguments, formatstring);
@@ -1241 +1250 @@
     strip_lead_char(" \t", executable);
     if (*executable) {
-      parameters = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
+      parameters = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
       if (parameters) {
         p = executable;
@@ -1293 +1302 @@
               strcpy(executable, GetCmdSpec(FALSE));
             }
-            free(temp);
+            xfree(temp);
           }
         }
@@ -1307 +1316 @@
         pgd.swpInitial.hwndInsertBehind = HWND_TOP;
         happ = WinStartApp(hwndNotify, &pgd, NULL, NULL, ulOptions);
-        free(parameters);
+        xfree(parameters);
       }
     }
-    free(executable);
+    xfree(executable);
   }
   return happ;

trunk/dll/tools.c

@@ -17 +17 @@
   05 Sep 06 SHL Sync with standard source formatting
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -51 +52 @@
   qtloaded = TRUE;
   for (x = 0; x < 50 && quicktool[x]; x++) {
-    free(quicktool[x]);
+    xfree(quicktool[x]);
     quicktool[x] = NULL;
   }
@@ -265 +266 @@
         if (prev)
           prev->next = info->next;
-        if (info->help)
-          free(info->help);
-        if (info->text)
-          free(info->text);
-        free(info);
+        xfree(info->help);
+        xfree(info->text);
+        xfree(info);
         fToolsChanged = TRUE;
         break;
@@ -365 +364 @@
   while (tool) {
     next = tool->next;
-    if (tool->help)
-      free(tool->help);
-    if (tool->text)
-      free(tool->text);
-    free(tool);
+    xfree(tool->help);
+    xfree(tool->text);
+    xfree(tool);
     tool = next;
   }
@@ -716 +713 @@
         if (tool) {                     /* just editing strings... */
           istext = ((tool->flags & T_TEXT) != 0);
-          if (tool->help)
-            free(tool->help);
+          xfree(tool->help);
           tool->help = NULL;
-          if (tool->text)
-            free(tool->text);
+          xfree(tool->text);
           tool->text = NULL;
           if (*help)

trunk/dll/treecnr.c

@@ -46 +46 @@
   15 Feb 08 SHL Sync with settings menu rework
   15 Feb 08 SHL Avoid death if tree container 0 width
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -565 +566 @@
           fTopDir = temptop;
       }
-      free((CHAR *) mp1);
+      xfree((CHAR *) mp1);
     }
     return 0;
@@ -797 +798 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            free(wk);
+            xfree(wk);
             FreeListInfo((LISTINFO *) mp1);
           }
@@ -828 +829 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            free(wk);
+            xfree(wk);
             FreeListInfo((LISTINFO *) mp1);
           }
@@ -846 +847 @@
       WinSendMsg(dcd->hwndCnr,
                  UM_CLOSE, MPFROMLONG(dcd->dontclose != FALSE), MPVOID);
-      free(dcd);
+      xfree(dcd);
     }
     DosPostEventSem(CompactSem);
@@ -1717 +1718 @@
       if (dir) {
         if (!PostMsg(dcd->hwndObject, UM_SHOWME, MPFROMP(dir), MPVOID))
-          free(dir);
+          xfree(dir);
       }
     }
@@ -2157 +2158 @@
       ret = StartMLEEditor(dcd->hwndParent, (INT) mp1, (CHAR *) mp2,
                            dcd->hwndFrame);
-      if (mp2)
-        free((CHAR *) mp2);
+      xfree((CHAR *) mp2);
       return MRFROMLONG(ret);
     }
@@ -2227 +2227 @@
           if (apptail == info)
             apptail = info->prev;
-          free(info);
+          xfree(info);
           break;
         }
@@ -2748 +2748 @@
             li->list = BuildList(hwnd);
             if (!li->list || !li->list[0]) {
-              free(li);
+              xfree(li);
               break;
             }
@@ -2916 +2916 @@
       while (info) {
         next = info->next;
-        free(info);
+        xfree(info);
         info = next;
       }
@@ -3054 +3054 @@
                    IDS_WINCREATEWINDOW);
         PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID);
-        free(dcd);
+        xfree(dcd);
         hwndFrame = (HWND) 0;
       }

trunk/dll/undel.c

@@ -14 +14 @@
   06 Aug 07 GKY Reduce DosSleep times (ticket 148)
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -146 +147 @@
   }
   DosForceDelete("$UDELETE.#$#");
-  if (undelinfo)
-    free(undelinfo);
+  xfree(undelinfo);
   if (thmq) {
     PostMsg(hwnd, UM_CONTAINER_FILLED, MPVOID, MPVOID);
@@ -221 +221 @@
           Runtime_Error(pszSrcFile, __LINE__,
                         GetPString(IDS_COULDNTSTARTTHREADTEXT));
-          free(undelinfo);
+          xfree(undelinfo);
           listdone = TRUE;
           WinDismissDlg(hwnd, 0);

trunk/dll/update.c

@@ -19 +19 @@
   02 Aug 07 SHL Sync with CNRITEM mods
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -642 +643 @@
   PostMsg(hwndCnr, UM_RESCAN, MPVOID, MPVOID);
   if (pciList) {
-    free(pciList);
+    xfree(pciList);
     DosPostEventSem(CompactSem);
   }

trunk/dll/viewer.c

@@ -16 +16 @@
   26 Nov 07 GKY Allow open of readonly files in the editor with warning
   26 Nov 07 GKY Add "Save as" menu option to editor
+  29 Feb 08 GKY Use xfree where appropriate
+  29 Feb 08 GKY Refactor global command line variables to notebook.h
 
 ***********************************************************************/
@@ -32 +34 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "notebook.h"                   // External viewers
 #include "fm3dll.h"
 
@@ -1250 +1253 @@
           }
         }
-        free(vw);
+        xfree(vw);
       }
       if (!dontclose &&

trunk/dll/viewinf.c

@@ -14 +14 @@
   03 Nov 06 SHL Count thread usage
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -157 +158 @@
             p = strtok(NULL, ";");
           }
-          free(holdenv);
+          xfree(holdenv);
         NoEnv:
           if (WinIsWindow(hab2, hwnd) && !repeating) {
@@ -173 +174 @@
                   Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
                             "PrfQueryProfileData");
-                  free(holdenv);
+                  xfree(holdenv);
                 }
                 else
@@ -188 +189 @@
     WinTerminate(hab2);
   }
-  free(dummy);
+  xfree(dummy);
 }
 
@@ -266 +267 @@
           Runtime_Error(pszSrcFile, __LINE__,
                         GetPString(IDS_COULDNTSTARTTHREADTEXT));
-          free(d);
+          xfree(d);
           WinDismissDlg(hwnd, 0);
           return 0;

trunk/dll/walkem.c

@@ -25 +25 @@
   20 Jan 08 GKY Walk & walk2 dialogs now save and restore size and position
   19 Feb 08 JBS Add "State at last FM/2 close" to the states combo box
+  29 Feb 08 GKY Use xfree where appropriate
+  29 Feb 08 GKY Refactor global command line variables to notebook.h
 
 ***********************************************************************/
@@ -43 +45 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "notebook.h"                   // targetdirectory
 #include "fm3dll.h"
 
@@ -337 +340 @@
           info->path = xstrdup(s, pszSrcFile, __LINE__);
           if (!info->path)
-            free(info);
+            xfree(info);
           else {
             info->next = NULL;
@@ -430 +433 @@
             else
               ldirhead = info->next;
-            free(info->path);
-            free(info);
+            xfree(info->path);
+            xfree(info);
             break;
           }
@@ -443 +446 @@
         info->path = xstrdup(path, pszSrcFile, __LINE__);
         if (!info->path)
-          free(info);
+          xfree(info);
         else {
           info->next = NULL;
@@ -484 +487 @@
         else
           udirhead = info->next;
-        free(info->path);
-        free(info);
+        xfree(info->path);
+        xfree(info);
         fUdirsChanged = TRUE;
         return TRUE;
@@ -501 +504 @@
         else
           ldirhead = info->next;
-        free(info->path);
-        free(info);
+        xfree(info->path);
+        xfree(info);
         return TRUE;
       }
@@ -525 +528 @@
         else
           ldirhead = info->next;
-        free(info->path);
-        free(info);
+        xfree(info->path);
+        xfree(info);
         return TRUE;
       }
@@ -1195 +1198 @@
       if (wa->changed)
         WinSendMsg(hwnd, UM_SETUP3, MPVOID, MPVOID);
-      free(wa);
+      xfree(wa);
       WinDismissDlg(hwnd, 0);
       break;

trunk/dll/winlist.c

@@ -12 +12 @@
   22 Jul 06 SHL Check more run time errors
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -119 +120 @@
             y++;
           }
-          free(pswb);
+          xfree(pswb);
           DosPostEventSem(CompactSem);
         }

trunk/dll/worker.c

@@ -24 +24 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   26 Aug 07 SHL Revert to DosSleep(0)
+  29 Feb 08 GKY Use xfree where appropriate
+  29 Feb 08 GKY Refactor global command line variables to notebook.h
 
 ***********************************************************************/
@@ -47 +49 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "notebook.h"                   // External viewers
 #include "fm3dll.h"
 
@@ -95 +98 @@
                             GetPString(IDS_COULDNTSTARTTHREADTEXT));
               FreeListInfo(wk->li);
-              free(wk);
+              xfree(wk);
             }
           }
@@ -253 +256 @@
                     if (!PostMsg(Collector,
                                  UM_COLLECTFROMFILE, MPFROMP(temp), MPVOID))
-                      free(temp);
+                      xfree(temp);
                   }
                 }
@@ -961 +964 @@
     if (wk->li)
       FreeListInfo(wk->li);
-    free(wk);
+    xfree(wk);
     DosPostEventSem(CompactSem);
   }
@@ -1116 +1119 @@
               for (x = 0; wk->li->list[x]; x++) {
                 strcpy(p, wk->li->list[x]);
-                free(wk->li->list[x]);
+                xfree(wk->li->list[x]);
                 wk->li->list[x] = xstrdup(szBuffer, pszSrcFile, __LINE__);
               }
@@ -1296 +1299 @@
                                UM_LOADFILE,
                                MPFROMLONG(5 + viewtype), MPFROMP(temp)))
-                    free(temp);
+                    xfree(temp);
                 }
                 DosSleep(1);
@@ -1341 +1344 @@
                                UM_LOADFILE,
                                MPFROMLONG(4 + viewtype), MPFROMP(temp)))
-                    free(temp);
+                    xfree(temp);
                 }
                 DosSleep(1);
@@ -1604 +1607 @@
     if (wk->li)
       FreeListInfo(wk->li);
-    free(wk);
+    xfree(wk);
     DosPostEventSem(CompactSem);
   }