Changeset 1039

Timestamp:

Jul 6, 2008, 12:16:21 AM (17 years ago)

Author:

Gregg Young

Message:

Removed unnecessary xfrees and included fortify.h where needed; moved several misplaced (x)frees;

Location:

trunk

Files:

• dll/arccnrs.c (modified) (10 diffs)
• dll/assoc.c (modified) (20 diffs)
• dll/autoview.c (modified) (7 diffs)
• dll/avl.c (modified) (3 diffs)
• dll/avv.c (modified) (2 diffs)
• dll/cmdline.c (modified) (6 diffs)
• dll/collect.c (modified) (9 diffs)
• dll/command.c (modified) (17 diffs)
• dll/common.c (modified) (2 diffs)
• dll/comp.c (modified) (17 diffs)
• dll/copyf.c (modified) (7 diffs)
• dll/dircnrs.c (modified) (5 diffs)
• dll/dirsize.c (modified) (1 diff)
• dll/draglist.c (modified) (5 diffs)
• dll/eas.c (modified) (12 diffs)
• dll/filldir.c (modified) (4 diffs)
• dll/filter.c (modified) (4 diffs)
• dll/grep.c (modified) (9 diffs)
• dll/grep2.c (modified) (3 diffs)
• dll/info.c (modified) (2 diffs)
• dll/inis.c (modified) (23 diffs)
• dll/literal.c (modified) (3 diffs)
• dll/mainwnd.c (modified) (5 diffs)
• dll/mainwnd2.c (modified) (1 diff)
• dll/makelist.c (modified) (2 diffs)
• dll/menu.c (modified) (4 diffs)
• dll/misc.c (modified) (9 diffs)
• dll/mle.c (modified) (9 diffs)
• dll/newview.c (modified) (7 diffs)
• dll/notebook.c (modified) (9 diffs)
• dll/notify.c (modified) (4 diffs)
• dll/objcnr.c (modified) (6 diffs)
• dll/pathutil.c (modified) (4 diffs)
• dll/presparm.c (modified) (2 diffs)
• dll/remap.c (modified) (8 diffs)
• dll/saveclip.c (modified) (4 diffs)
• dll/seeall.c (modified) (5 diffs)
• dll/select.c (modified) (3 diffs)
• dll/seticon.c (modified) (2 diffs)
• dll/shadow.c (modified) (3 diffs)
• dll/subj.c (modified) (4 diffs)
• dll/systemf.c (modified) (5 diffs)
• dll/tools.c (modified) (4 diffs)
• dll/treecnr.c (modified) (10 diffs)
• dll/undel.c (modified) (1 diff)
• dll/update.c (modified) (2 diffs)
• dll/viewer.c (modified) (1 diff)
• dll/viewinf.c (modified) (4 diffs)
• dll/walkem.c (modified) (16 diffs)
• dll/winlist.c (modified) (2 diffs)
• dll/worker.c (modified) (7 diffs)
• eas.c (modified) (1 diff)

trunk/dll/arccnrs.c

@@ -1442 +1442 @@
         if (!dcd->info->extract) {
           Runtime_Error(pszSrcFile, __LINE__, "no extract");
-          xfree(s, pszSrcFile, __LINE__);
+          free(s);
           return 0;
         }
@@ -1472 +1472 @@
         }
         // printf("%s %d UM_ENTER %s %s\n",__FILE__, __LINE__,filename, s); fflush(stdout);     // 10 Mar 07 SHL hang
-        xfree(s, pszSrcFile, __LINE__);
+        free(s);
         if (IsFile(filename) == 1) {
 #if 1 // 06 Oct 07 SHL fixme to be gone - set to 0 for ticket #58 testing
@@ -1750 +1750 @@
                   strcat(p, temp);
                   li->list[x] = p;
-                  xfree(temp, pszSrcFile, __LINE__);
+                  free(temp);
                 }
               }
@@ -1997 +1997 @@
       FreeList(dcd->lastselection);
       WinSendMsg(dcd->hwndCnr, UM_CLOSE, MPVOID, MPVOID);
-      xfree(dcd, pszSrcFile, __LINE__);
+      free(dcd);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -2551 +2551 @@
         hwnd = StartMLEEditor(dcd->hwndParent,
                               (INT)mp1, (CHAR *)mp2, dcd->hwndFrame);
-      xfree((CHAR *)mp2, pszSrcFile, __LINE__);
+      free((CHAR *)mp2);
       return MRFROMLONG(hwnd);
     }
@@ -2920 +2920 @@
                 BldFullPathName(s, dcd->workdir, li->list[x]);
                 if (IsFile(s) != 1) {
-                  xfree(li->list[x], pszSrcFile, __LINE__);
+                  free(li->list[x]);
                   li->list[x] = NULL;
                   for (y = x; li->list[y]; y++)
@@ -2932 +2932 @@
                   p = xstrdup(s, pszSrcFile, __LINE__);
                   if (p) {
-                    xfree(li->list[x], pszSrcFile, __LINE__);
+                    free(li->list[x]);
                     li->list[x] = p;
                   }
@@ -2980 +2980 @@
             }
             else
-              xfree(li, pszSrcFile, __LINE__);
+              free(li);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -3244 +3244 @@
               if (!PostMsg(dcd->hwndObject, UM_ENTER, MPFROMP(s), MPVOID)) {
                 Runtime_Error(pszSrcFile, __LINE__, "post");
-                xfree(s, pszSrcFile, __LINE__);
+                free(s);
               }
             }
@@ -3540 +3540 @@
                      IDS_WINCREATEWINDOW);
           PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID);
-          xfree(dcd, pszSrcFile, __LINE__);
+          free(dcd);
 # ifdef FORTIFY
   Fortify_LeaveScope();

trunk/dll/assoc.c

@@ -37 +37 @@
 #include "strutil.h"                    // GetPString
 #include "fm3dll.h"
+#include "fortify.h"
 
 #pragma data_seg(DATA1)
@@ -122 +123 @@
     xfree(info->pszCmdLine, pszSrcFile, __LINE__);
     xfree(info->sig, pszSrcFile, __LINE__);
-    xfree(info, pszSrcFile, __LINE__);
+    free(info);
     info = next;
   }
@@ -185 +186 @@
           xfree(info->pszCmdLine, pszSrcFile, __LINE__);
           xfree(info->mask, pszSrcFile, __LINE__);
-          xfree(info, pszSrcFile, __LINE__);
+          free(info);
           break;
         }
@@ -234 +235 @@
                         MPFROMSHORT(x), MPFROMSHORT(TRUE));
     }
-    xfree(pszDisplayStr, pszSrcFile, __LINE__);
+    free(pszDisplayStr);
   }
 }
@@ -316 +317 @@
           xfree(info->pszCmdLine, pszSrcFile, __LINE__);
           xfree(info->mask, pszSrcFile, __LINE__);
-          xfree(info, pszSrcFile, __LINE__);
+          free(info);
         }
         else {
@@ -363 +364 @@
         xfree(info->mask, pszSrcFile, __LINE__);
         xfree(info->sig, pszSrcFile, __LINE__);
-        xfree(info, pszSrcFile, __LINE__);
+        free(info);
         return TRUE;
       }
@@ -696 +697 @@
         pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
         if (!pszWorkBuf) {
-          xfree(temp.pszCmdLine, pszSrcFile, __LINE__);
+          free(temp.pszCmdLine);
           break; //already complained
         }
@@ -705 +706 @@
           memcpy(temp.pszCmdLine, pszWorkBuf, strlen(pszWorkBuf) + 1);
         }
-        xfree(pszWorkBuf, pszSrcFile, __LINE__);
+        free(pszWorkBuf);
         WinQueryDlgItemText(hwnd, ASS_SIG, sizeof(temp.sig), temp.sig);
         rstrip(temp.sig);
@@ -732 +733 @@
         if (fCancelAction){
           fCancelAction = FALSE;
-          xfree(temp.pszCmdLine, pszSrcFile, __LINE__);
+          free(temp.pszCmdLine);
           break;
         }
@@ -743 +744 @@
           save_associations();
         }
-        xfree(temp.pszCmdLine, pszSrcFile, __LINE__);
+        free(temp.pszCmdLine);
       }
       WinDismissDlg(hwnd, 1);
@@ -771 +772 @@
         pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
         if (!pszWorkBuf) {
-          xfree(temp.pszCmdLine, pszSrcFile, __LINE__);
+          free(temp.pszCmdLine);
           break; //already complained
         }
@@ -780 +781 @@
           memcpy(temp.pszCmdLine, pszWorkBuf, strlen(pszWorkBuf) + 1);
         }
-        xfree(pszWorkBuf, pszSrcFile, __LINE__);
+        free(pszWorkBuf);
         WinQueryDlgItemText(hwnd, ASS_SIG, sizeof(temp.sig), temp.sig);
         rstrip(temp.sig);
@@ -807 +808 @@
         if (fCancelAction){
           fCancelAction = FALSE;
-          xfree(temp.pszCmdLine, pszSrcFile, __LINE__);
+          free(temp.pszCmdLine);
           break;
         }
@@ -817 +818 @@
           save_associations();
         }
-        xfree(temp.pszCmdLine, pszSrcFile, __LINE__);
+        free(temp.pszCmdLine);
       }
       break;
@@ -853 +854 @@
           save_associations();
         }
-        xfree(temp.pszCmdLine, pszSrcFile, __LINE__);
+        free(temp.pszCmdLine);
       }
 
@@ -875 +876 @@
         pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
         if (!pszWorkBuf) {
-          xfree(temp.pszCmdLine, pszSrcFile, __LINE__);
+          free(temp.pszCmdLine);
           break; //already complained
         }
@@ -884 +885 @@
           memcpy(temp.pszCmdLine, pszWorkBuf, strlen(pszWorkBuf) + 1);
         }
-        xfree(pszWorkBuf, pszSrcFile, __LINE__);
+        free(pszWorkBuf);
         WinQueryDlgItemText(hwnd, ASS_SIG, sizeof(temp.sig), temp.sig);
         rstrip(temp.sig);
@@ -911 +912 @@
         if (fCancelAction){
           fCancelAction = FALSE;
-          xfree(temp.pszCmdLine, pszSrcFile, __LINE__);
+          free(temp.pszCmdLine);
           break;
         }
@@ -920 +921 @@
           save_associations();
         }
-        xfree(temp.pszCmdLine, pszSrcFile, __LINE__);
+        free(temp.pszCmdLine);
       }
       {
@@ -957 +958 @@
           save_associations();
         }
-        xfree(temp.pszCmdLine, pszSrcFile, __LINE__);
+        free(temp.pszCmdLine);
       }
       break;

trunk/dll/autoview.c

@@ -415 +415 @@
                       WinSetWindowText(hwndAutoview, obuff);
                   }
-                  xfree(obuff, pszSrcFile, __LINE__);
+                  free(obuff);
                 }
-                xfree(ibuff, pszSrcFile, __LINE__);
+                free(ibuff);
               }
               DosClose(handle);
@@ -510 +510 @@
                 if (*pszBuf)
                   WinSetWindowText(hwndAutoview, pszBuf);
-                xfree(pszBuf, pszSrcFile, __LINE__);
+                free(pszBuf);
               }
             }
@@ -544 +544 @@
               rc = DosQueryPathInfo((CHAR *)mp1, FIL_QUERYEASFROMLIST,
                                     (PVOID) & eaop, (ULONG) sizeof(EAOP2));
-              xfree(pgealist, pszSrcFile, __LINE__);
+              free(pgealist);
               if (!rc) {
                 pfea = &eaop.fpFEA2List->list[0];
@@ -594 +594 @@
                       }
                       WinSetWindowText(hwndAutoMLE, pszBuf);
-                      xfree(pszBuf, pszSrcFile, __LINE__);
+                      free(pszBuf);
                     }
                   }
@@ -608 +608 @@
                 MLEsetreadonly(hwndAutoMLE, FALSE);
               }
-              xfree(pfealist, pszSrcFile, __LINE__);
+              free(pfealist);
             }
           }
         }
       }
-      xfree((CHAR *)mp1, pszSrcFile, __LINE__);
+      free((CHAR *)mp1);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -798 +798 @@
               PutComments(hwnd, currfile, ea);
               PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
-              xfree(ea, pszSrcFile, __LINE__);
+              free(ea);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -851 +851 @@
           stopflag++;
           if (!PostMsg(hwndAutoObj, UM_LOADFILE, MPFROMP(cf), MPVOID))
-            xfree(cf, pszSrcFile, __LINE__);
+            free(cf);
 # ifdef FORTIFY
   Fortify_LeaveScope();

trunk/dll/avl.c

@@ -51 +51 @@
 #include "errutil.h"                    // Runtime_Error
 #include "fm3dll.h"
+#include "fortify.h"
 
 static PSZ pszSrcFile = __FILE__;
@@ -265 +266 @@
     xfree(pat->createwdirs, pszSrcFile, __LINE__);
     xfree(pat->movewdirs, pszSrcFile, __LINE__);
-    xfree(pat, pszSrcFile, __LINE__);
+    free(pat);
   }
 }
@@ -851 +852 @@
                          ArcReviewDlgProc,
                          FM3ModHandle, AD_FRAME, MPFROMP(&ad))) {
-            xfree(ad.info, pszSrcFile, __LINE__);
+            free(ad.info);
           }
           else {

trunk/dll/avv.c

@@ -42 +42 @@
 #include "fm3dll.h"
 #include "pathutil.h"                   // NormalizeCmdLine
+#include "fortify.h"
 
 #pragma data_seg(DATA1)
@@ -105 +106 @@
       NormalizeCmdLine(pszWorkBuf, szCmdLine);
       pszDest = xstrdup(pszWorkBuf, pszSrcFile, __LINE__);
-      xfree(pszWorkBuf, pszSrcFile, __LINE__);
+      free(pszWorkBuf);
     }
     else
       pszDest = xstrdup(szCmdLine, pszSrcFile, __LINE__); // return the unexamined input on failure
-    xfree(szCmdLine, pszSrcFile, __LINE__);
+    free(szCmdLine);
   }
   else

trunk/dll/cmdline.c

@@ -37 +37 @@
 #include "fm3dll.h"
 #include "pathutil.h"                   // MaxCmdLineStr
+#include "fortify.h"
 
 static PSZ pszSrcFile = __FILE__;
@@ -88 +89 @@
             info->cmdline = xstrdup(pszCmdLine, pszSrcFile, __LINE__);
             if (!info->cmdline)
-              xfree(info, pszSrcFile, __LINE__);
+              free(info);
             else {
               info->next = NULL;
@@ -102 +103 @@
       fclose(fp);
     }
+    free(pszCmdLine);
   }
-  xfree(pszCmdLine, pszSrcFile, __LINE__);
   if (DoItYourself)
     DoItYourselfCmdLine = CmdLineHead;
@@ -185 +186 @@
         info = CmdLineHead;
         CmdLineHead = CmdLineHead->next;
-        xfree(info, pszSrcFile, __LINE__);
+        free(info);
       }
       if (DoItYourself)
@@ -214 +215 @@
         CmdLineHead = info->next;
       xfree(info->cmdline, pszSrcFile, __LINE__);
-      xfree(info, pszSrcFile, __LINE__);
+      free(info);
       if (DoItYourself)
         DoItYourselfCmdLine = CmdLineHead;
@@ -236 +237 @@
     next = info->next;
     xfree(info->cmdline, pszSrcFile, __LINE__);
-    xfree(info, pszSrcFile, __LINE__);
+    free(info);
     info = next;
   }

trunk/dll/collect.c

@@ -907 +907 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            xfree(wk, pszSrcFile, __LINE__);
+            free(wk);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -940 +940 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            xfree(wk, pszSrcFile, __LINE__);
+            free(wk);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -968 +968 @@
       WinSendMsg(dcd->hwndCnr, UM_CLOSE, MPVOID, MPVOID);
       FreeList(dcd->lastselection);
-      xfree(dcd, pszSrcFile, __LINE__);
+      free(dcd);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -1467 +1467 @@
     if (mp1) {
       if (!dcd) {
-        xfree(mp1, pszSrcFile, __LINE__);
+        free(mp1);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -1476 +1476 @@
         if (!PostMsg(dcd->hwndObject, UM_COLLECTFROMFILE, mp1, mp2)) {
           Runtime_Error(pszSrcFile, __LINE__, "PostMsg");
-          xfree(mp1, pszSrcFile, __LINE__);
+          free(mp1);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -1605 +1605 @@
             if (p) {
               if (!PostMsg(hwnd, UM_COLLECTFROMFILE, MPFROMP(p), MPVOID))
-                xfree(p, pszSrcFile, __LINE__);
+                free(p);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -2124 +2124 @@
             }
             else
-              xfree(li, pszSrcFile, __LINE__);
+              free(li);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -2691 +2691 @@
         hwnd = StartMLEEditor(dcd->hwndParent,
                               (INT)mp1, (CHAR *)mp2, dcd->hwndFrame);
-      xfree((CHAR *)mp2, pszSrcFile, __LINE__);
+      free((CHAR *)mp2);
       return MRFROMLONG(hwnd);
     }
@@ -2884 +2884 @@
                    IDS_WINCREATEWINDOW);
         PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID);
-        xfree(dcd, pszSrcFile, __LINE__);
+        free(dcd);
 # ifdef FORTIFY
   Fortify_LeaveScope();

trunk/dll/command.c

@@ -44 +44 @@
 #include "pathutil.h"                   // NormalizeCmdLine
 #include "command.h"
+#include "fortify.h"
 
 typedef struct
@@ -310 +311 @@
     xfree(info->title, pszSrcFile, __LINE__);
     xfree(info->pszCmdLine, pszSrcFile, __LINE__);
-    xfree(info, pszSrcFile, __LINE__);
+    free(info);
     info = next;
   }
@@ -360 +361 @@
             xfree(info->pszCmdLine, pszSrcFile, __LINE__);
             xfree(info->title, pszSrcFile, __LINE__);
-            xfree(info, pszSrcFile, __LINE__);
+            free(info);
             break;
           }
@@ -372 +373 @@
         }
       }
-      xfree(pszCmdLine, pszSrcFile, __LINE__);
+      free(pszCmdLine);
       fclose(fp);
     }
@@ -429 +430 @@
     xfree(info->pszCmdLine, pszSrcFile, __LINE__);
     xfree(info->title, pszSrcFile, __LINE__);
-    xfree(info, pszSrcFile, __LINE__);
+    free(info);
     return NULL;
   }
@@ -466 +467 @@
         xfree(info->pszCmdLine, pszSrcFile, __LINE__);
         xfree(info->title, pszSrcFile, __LINE__);
-        xfree(info, pszSrcFile, __LINE__);
+        free(info);
         return TRUE;
       }
@@ -635 +636 @@
         pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
         if (!pszWorkBuf) {
-          xfree(temp.pszCmdLine, pszSrcFile, __LINE__);
+          free(temp.pszCmdLine);
           break; //already complained
         }
@@ -641 +642 @@
         NormalizeCmdLine(pszWorkBuf, temp.pszCmdLine);
         memcpy(temp.pszCmdLine, pszWorkBuf, strlen(pszWorkBuf) + 1);
-        xfree(pszWorkBuf, pszSrcFile, __LINE__);
+        free(pszWorkBuf);
         if (!strchr(temp.pszCmdLine, '%')){
           ret = saymsg(MB_YESNO,
@@ -669 +670 @@
         if (fCancelAction){
           fCancelAction = FALSE;
-          xfree(temp.pszCmdLine, pszSrcFile, __LINE__);
+          free(temp.pszCmdLine);
           break;
         }
@@ -708 +709 @@
           }
         }
-        xfree(temp.pszCmdLine, pszSrcFile, __LINE__);
+        free(temp.pszCmdLine);
       }
       x = (SHORT) WinSendDlgItemMsg(hwnd,
@@ -740 +741 @@
         pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
         if (!pszWorkBuf) {
-          xfree(temp.pszCmdLine, pszSrcFile, __LINE__);
+          free(temp.pszCmdLine);
           break; //already complained
         }
@@ -746 +747 @@
         NormalizeCmdLine(pszWorkBuf, temp.pszCmdLine);
         memcpy(temp.pszCmdLine, pszWorkBuf, strlen(pszWorkBuf) + 1);
-        xfree(pszWorkBuf, pszSrcFile, __LINE__);
+        free(pszWorkBuf);
         if (!strchr(temp.pszCmdLine, '%')){
           ret = saymsg(MB_YESNO,
@@ -774 +775 @@
         if (fCancelAction){
           fCancelAction = FALSE;
-          xfree(temp.pszCmdLine, pszSrcFile, __LINE__);
+          free(temp.pszCmdLine);
           break;
         }
@@ -809 +810 @@
           }
         }
-        xfree(temp.pszCmdLine, pszSrcFile, __LINE__);
+        free(temp.pszCmdLine);
       }
       break;
@@ -853 +854 @@
         temp.pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
         if (!temp.pszCmdLine) {
-          xfree(pszWorkBuf, pszSrcFile, __LINE__);
+          free(pszWorkBuf);
           break; //already complained
         }
@@ -859 +860 @@
         NormalizeCmdLine(pszWorkBuf, temp.pszCmdLine);
         memcpy(temp.pszCmdLine, pszWorkBuf, strlen(pszWorkBuf) + 1);
-        xfree(pszWorkBuf, pszSrcFile, __LINE__);
+        free(pszWorkBuf);
         if (fCancelAction){
           fCancelAction = FALSE;
-          xfree(temp.pszCmdLine, pszSrcFile, __LINE__);
+          free(temp.pszCmdLine);
           break;
         }
@@ -976 +977 @@
           }
         }
-        xfree(temp.pszCmdLine, pszSrcFile, __LINE__);
+        free(temp.pszCmdLine);
       }
       break;

trunk/dll/common.c

@@ -41 +41 @@
 #include "strutil.h"                    // GetPString
 #include "fm3dll.h"
+#include "fortify.h"
 
 #pragma data_seg(DATA1)
@@ -746 +747 @@
           Broadcast(WinQueryAnchorBlock(hwnd),
                     dcd->hwndParent, UM_UPDATERECORD, mp2, MPVOID);
-          xfree(mp2, pszSrcFile, __LINE__);
+          free(mp2);
         }
       }

trunk/dll/comp.c

@@ -146 +146 @@
         DosFindClose(hdir);
       }
-      xfree(mask, pszSrcFile, __LINE__);
+      free(mask);
     }
-    xfree(pffb, pszSrcFile, __LINE__);
+    free(pffb);
   }
 }
@@ -180 +180 @@
       }
     }
-    xfree(sf, pszSrcFile, __LINE__);
+    free(sf);
   }
 }
@@ -691 +691 @@
     // PostMsg(cmp->hwnd, WM_COMMAND, MPFROM2SHORT(IDM_DESELECTALL, 0), MPVOID);        // 18 Jan 08 SHL we can count now
     DecrThreadUsage();
-    xfree(cmp, pszSrcFile, __LINE__);
+    free(cmp);
     WinTerminate(hab);
 # ifdef FORTIFY
@@ -756 +756 @@
     }
     DecrThreadUsage();
-    xfree(cmp, pszSrcFile, __LINE__);
+    free(cmp);
     WinTerminate(hab);
 # ifdef FORTIFY
@@ -763 +763 @@
   }
   else
-    xfree(cmp, pszSrcFile, __LINE__);
+    free(cmp);
 }
 
@@ -808 +808 @@
   pciSa = xmalloc(sizeof(PCNRITEM) * numS, pszSrcFile, __LINE__);
   if (!pciSa) {
-    xfree(pciDa, pszSrcFile, __LINE__);
+    free(pciDa);
     return;
   }
@@ -841 +841 @@
       goto Restart;
     }
-    xfree(pciDa, pszSrcFile, __LINE__);
-    xfree(pciSa, pszSrcFile, __LINE__);
+    free(pciDa);
+    free(pciSa);
     Runtime_Error(pszSrcFile, __LINE__, "numD %u != x %lu", numD, x);
     return;
@@ -868 +868 @@
       goto Restart;
     }
-    xfree(pciSa, pszSrcFile, __LINE__);
-    xfree(pciDa, pszSrcFile, __LINE__);
+    free(pciSa);
+    free(pciDa);
     Runtime_Error(pszSrcFile, __LINE__, "numS (%lu) != x (%lu)", numS, x);
     return;
@@ -1312 +1312 @@
   }
 
-  xfree(pciSa, pszSrcFile, __LINE__);
-  xfree(pciDa, pszSrcFile, __LINE__);
+  free(pciSa);
+  free(pciDa);
 
   if (fUpdateHideButton) {
@@ -1354 +1354 @@
   pffbArray = xmalloc(ulBufBytes, pszSrcFile, __LINE__);
   if (!pffbArray) {
-    xfree(maskstr, pszSrcFile, __LINE__);
+    free(maskstr);
     return;
   }
@@ -1402 +1402 @@
             // Complain if pathnames exceeds max
             DosFindClose(hDir);
-            xfree(pffbArray, pszSrcFile, __LINE__);
-            xfree(maskstr, pszSrcFile, __LINE__);
+            free(pffbArray);
+            free(maskstr);
             if (!fDone) {
               fDone = TRUE;
@@ -2097 +2097 @@
     WinTerminate(hab);
   }
-  xfree(cmp, pszSrcFile, __LINE__);
+  free(cmp);
   DosPostEventSem(CompactSem);
 
@@ -2665 +2665 @@
                         GetPString(IDS_COULDNTSTARTTHREADTEXT));
           WinDismissDlg(hwnd, 0);
-          xfree(forthread, pszSrcFile, __LINE__);
+          free(forthread);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -2948 +2948 @@
               Runtime_Error(pszSrcFile, __LINE__,
                             GetPString(IDS_COULDNTSTARTTHREADTEXT));
-              xfree(sf, pszSrcFile, __LINE__);
+              free(sf);
             }
           }
@@ -3000 +3000 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            xfree(forthread, pszSrcFile, __LINE__);
+            free(forthread);
           }
           else {
@@ -3123 +3123 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            xfree(forthread, pszSrcFile, __LINE__);
+            free(forthread);
           }
           else {
@@ -3279 +3279 @@
           WinSendMsg(cmp->dcd.hwndObject, WM_CLOSE, MPVOID, MPVOID);
       }
-      xfree(cmp, pszSrcFile, __LINE__);
+      free(cmp);
     }
     EmptyCnr(hwndLeft);

trunk/dll/copyf.c

@@ -36 +36 @@
 #include "strutil.h"                    // GetPString
 #include "fm3dll.h"
+#include "fortify.h"
 
 static PSZ pszSrcFile = __FILE__;
@@ -237 +238 @@
           longname[CCHMAXPATH - 1] = 0;
         }
-        xfree(pfealist, pszSrcFile, __LINE__);
-      }
-      xfree(pgealist, pszSrcFile, __LINE__);
+        free(pfealist);
+      }
+      free(pgealist);
     }
   }
@@ -712 +713 @@
         /* under no circumstances! */
         Runtime_Error(pszSrcFile, __LINE__, "bad name %s", str);
-        xfree(str, pszSrcFile, __LINE__);
+        free(str);
         return -1;
       }
@@ -739 +740 @@
     xfree(ss, pszSrcFile, __LINE__);
     xfree(f, pszSrcFile, __LINE__);
-    xfree(str, pszSrcFile, __LINE__);
+    free(str);
     return -1;
   }
@@ -784 +785 @@
   }
 
-  xfree(f, pszSrcFile, __LINE__);
-  xfree(ss, pszSrcFile, __LINE__);
-  xfree(str, pszSrcFile, __LINE__);
+  free(f);
+  free(ss);
+  free(str);
   return 0;
 }
@@ -833 +834 @@
     xfree(ss, pszSrcFile, __LINE__);
     xfree(f, pszSrcFile, __LINE__);
-    xfree(str, pszSrcFile, __LINE__);
+    free(str);
     return -1;
   }
@@ -857 +858 @@
   }
 
-  xfree(f, pszSrcFile, __LINE__);
-  xfree(ss, pszSrcFile, __LINE__);
-  xfree(str, pszSrcFile, __LINE__);
+  free(f);
+  free(ss);
+  free(str);
   return 0;
 }

trunk/dll/dircnrs.c

@@ -1005 +1005 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            xfree(wk, pszSrcFile, __LINE__);
+            free(wk);
             FreeListInfo((LISTINFO *) mp1);
 # ifdef FORTIFY
@@ -1040 +1040 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            xfree(wk, pszSrcFile, __LINE__);
+            free(wk);
             FreeListInfo((LISTINFO *) mp1);
 # ifdef FORTIFY
@@ -2563 +2563 @@
             }
             else
-              xfree(li, pszSrcFile, __LINE__);
+              free(li);
           }
         }
@@ -3356 +3356 @@
                         SWP_RESTORE | SWP_SHOW | SWP_ACTIVATE | SWP_ZORDER);
       FreeList(dcd->lastselection);
-      xfree(dcd, pszSrcFile, __LINE__);
+      free(dcd);
       WinSetWindowPtr(hwnd, QWL_USER, NULL);
       DosPostEventSem(CompactSem);
@@ -3494 +3494 @@
                      IDS_WINCREATEWINDOW);
           PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID);
-          xfree(dcd, pszSrcFile, __LINE__);
+          free(dcd);
 # ifdef FORTIFY
   Fortify_LeaveScope();

trunk/dll/dirsize.c

@@ -154 +154 @@
       strlen(pszFileName) < 4) {
     if (*pchStopFlag) {
-      xfree(pffbArray, pszSrcFile, __LINE__);
+      free(pffbArray);
       return FALSE;
     }

trunk/dll/draglist.c

@@ -356 +356 @@
           if (pDItem->hstrTargetName)
             DrgDeleteStrHandle(pDItem->hstrTargetName);
-          xfree(pDItem, pszSrcFile, __LINE__);
+          free(pDItem);
           // Last item not yet count so only decrement by one less than loop count
           // Unhilite code will adjust this when unhighliting
@@ -425 +425 @@
         if (pDItem->hstrTargetName)
           DrgDeleteStrHandle(pDItem->hstrTargetName);
-        xfree(pDItem, pszSrcFile, __LINE__);
+        free(pDItem);
         dcd->ulItemsToUnHilite = ulNumfiles + 1;        // +1 to ensure non-zero
         break;
@@ -471 +471 @@
             if (pDItem->hstrTargetName)
               DrgDeleteStrHandle(pDItem->hstrTargetName);
-            xfree(pDItem, pszSrcFile, __LINE__);
+            free(pDItem);
             // Last item not yet count so only decrement by one less than loop count
             if (c > 1) {
@@ -562 +562 @@
       FreeDragInfoData(hwndCnr, pDInfo);
   }
-
-  if (ppDItem)
-    xfree(ppDItem, pszSrcFile, __LINE__);
+  xfree(ppDItem, pszSrcFile, __LINE__);
   if (paDImgIcons && paDImgIcons != &dimgFakeIcon)
-    xfree(paDImgIcons, pszSrcFile, __LINE__);
+    free(paDImgIcons);
   DosPostEventSem(CompactSem);
   MarkAll(hwndCnr, TRUE, FALSE, TRUE);
@@ -678 +676 @@
         if (pDItem->hstrTargetName)
           DrgDeleteStrHandle(pDItem->hstrTargetName);
-        xfree(pDItem, pszSrcFile, __LINE__);
+        free(pDItem);
         // pDItem = NULL;       // Why bother, we can count - fixme to be gone
         dcd->ulItemsToUnHilite = ulNumfiles + 1;

trunk/dll/eas.c

@@ -41 +41 @@
 #include "strutil.h"                    // GetPString
 #include "fm3dll.h"
+#include "fortify.h"
 
 #pragma data_seg(DATA1)
@@ -867 +868 @@
                     memcpy(pfea, pfealist->list,
                            pfealist->cbList - sizeof(ULONG));
-                    xfree(eap->current->pfea, pszSrcFile, __LINE__);
+                    free(eap->current->pfea);
                     eap->current->pfea = pfea;
                     eap->current->name = eap->current->pfea->szName;
@@ -881 +882 @@
                 }
               }
-              xfree(s, pszSrcFile, __LINE__);
+              free(s);
             }
           }
@@ -912 +913 @@
           rc = xDosSetPathInfo(eap->filename, FIL_QUERYEASIZE,
                                &eaop, sizeof(eaop), DSPI_WRTTHRU);
-          xfree(pfealist, pszSrcFile, __LINE__);
+          free(pfealist);
           if (rc)
             Dos_Error(MB_CANCEL, rc, hwnd, pszSrcFile, __LINE__,
@@ -920 +921 @@
             if (eap->current == eap->head) {
               eap->head = eap->head->next;
-              xfree(eap->current->pfea, pszSrcFile, __LINE__);
-              xfree(eap->current, pszSrcFile, __LINE__);
+              free(eap->current->pfea);
+              free(eap->current);
               eap->current = NULL;
             }
@@ -930 +931 @@
                   sSelect++;
                   info->next = eap->current->next;
-                  xfree(eap->current->pfea, pszSrcFile, __LINE__);
-                  xfree(eap->current, pszSrcFile, __LINE__);
+                  free(eap->current->pfea);
+                  free(eap->current);
                   eap->current = NULL;
                   break;
@@ -987 +988 @@
       if (eap->head)
         Free_FEAList(eap->head);
-      xfree(eap, pszSrcFile, __LINE__);
+      free(eap);
       if (hptrIcon)
         WinDestroyPointer(hptrIcon);
@@ -1276 +1277 @@
                 }
               }
-              xfree(pfealist, pszSrcFile, __LINE__);
+              free(pfealist);
             }
-            xfree(pgealist, pszSrcFile, __LINE__);
+            free(pgealist);
           }
           ulEntry += ulCount;
         } // while
-        xfree(pdena, pszSrcFile, __LINE__);
+        free(pdena);
         DosPostEventSem(CompactSem);
       }
@@ -1350 +1351 @@
                 }
                 else
-                  xfree(pfealist, pszSrcFile, __LINE__);
+                  free(pfealist);
               }
               else {
-                xfree(pfealist, pszSrcFile, __LINE__);
+                free(pfealist);
                 if (!silentfail) {
                   if (rc == ERROR_ACCESS_DENIED
@@ -1363 +1364 @@
                              pdena->szName);
                     if (rc == MBID_CANCEL) {
-                      xfree(pgealist, pszSrcFile, __LINE__);
+                      free(pgealist);
                       break;
                     }
@@ -1378 +1379 @@
               }
             }
-            xfree(pgealist, pszSrcFile, __LINE__);
+            free(pgealist);
           }
           ulEntry += ulCount;
         } // while
-        xfree(pdena, pszSrcFile, __LINE__);
+        free(pdena);
         DosPostEventSem(CompactSem);
       }
@@ -1400 +1401 @@
     next = pFEA->next;
     xfree(pFEA->pfea, pszSrcFile, __LINE__);
-    xfree(pFEA, pszSrcFile, __LINE__);
+    free(pFEA);
     pFEA = next;
   }

trunk/dll/filldir.c

@@ -309 +309 @@
             pci->pszSubject = xstrdup(value + (sizeof(USHORT) * 2), pszSrcFile, __LINE__);
         }
-        xfree(pfealist, pszSrcFile, __LINE__);
-      }
-      xfree(pgealist, pszSrcFile, __LINE__);
+        free(pfealist);
+      }
+      free(pgealist);
     }
   }
@@ -356 +356 @@
             pci->pszLongName = xstrdup(value + (sizeof(USHORT) * 2), pszSrcFile, __LINE__);
         }
-        xfree(pfealist, pszSrcFile, __LINE__);
-      }
-      xfree(pgealist, pszSrcFile, __LINE__);
+        free(pfealist);
+      }
+      free(pgealist);
     }
   }
@@ -538 +538 @@
             pci->pszSubject = xstrdup(value + (sizeof(USHORT) * 2), pszSrcFile, __LINE__);
         }
-        xfree(pfealist, pszSrcFile, __LINE__);
-      }
-      xfree(pgealist, pszSrcFile, __LINE__);
+        free(pfealist);
+      }
+      free(pgealist);
     }
   }
@@ -586 +586 @@
           }
         }
-        xfree(pfealist, pszSrcFile, __LINE__);
-      }
-      xfree(pgealist, pszSrcFile, __LINE__);
+        free(pfealist);
+      }
+      free(pgealist);
     }
   }

trunk/dll/filter.c

@@ -31 +31 @@
 #include "strutil.h"                    // GetPString
 #include "fm3dll.h"
+#include "fortify.h"
 
 #pragma data_seg(FILTER_DATA)
@@ -154 +155 @@
           }
           else
-            xfree(info, pszSrcFile, __LINE__);
+            free(info);
         }
       }
@@ -218 +219 @@
     }
     else
-      xfree(info, pszSrcFile, __LINE__);
+      free(info);
   }
 }
@@ -239 +240 @@
         maskhead = info->next;
       xfree(info->mask, pszSrcFile, __LINE__);
-      xfree(info, pszSrcFile, __LINE__);
+      free(info);
       break;
     }

trunk/dll/grep.c

@@ -616 +616 @@
             else if (!InsertDupe(grep, szFindPath, pffbFile)) {
               DosFindClose(findHandle);
-              xfree(pffbArray, pszSrcFile, __LINE__);
+              free(pffbArray);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -645 +645 @@
   }
 
-  xfree(pffbArray, pszSrcFile, __LINE__);
+  free(pffbArray);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -661 +661 @@
         free(grep->insertffb[x]);
       }
-      xfree(grep->insertffb, pszSrcFile, __LINE__);
+      free(grep->insertffb);
     }
     if (grep->dir) {
@@ -667 +667 @@
         free(grep->dir[x]);
       }
-      xfree(grep->dir, pszSrcFile, __LINE__);
+      free(grep->dir);
     }
     grep->dir = NULL;
@@ -782 +782 @@
                              pszSrcFile, __LINE__);
         if (!grep->dir) {
-          xfree(grep->insertffb, pszSrcFile, __LINE__);
+          free(grep->insertffb);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -798 +798 @@
       grep->dir[grep->toinsert] = xstrdup(szDirectory, pszSrcFile, __LINE__);
       if (!grep->dir) {
-        xfree(grep->insertffb[grep->toinsert], pszSrcFile, __LINE__);
+        free(grep->insertffb[grep->toinsert]);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -1018 +1018 @@
         fclose(inputFile);
       }
-      xfree(input, pszSrcFile, __LINE__);
+      free(input);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -1135 +1135 @@
       // DosSleep(1);                   // 07 Feb 08 SHL
     }
-    xfree(buffer, pszSrcFile, __LINE__);
+    free(buffer);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -1628 +1628 @@
     info->name = xstrdup(dir, pszSrcFile, __LINE__);
     if (!info->name) {
-      xfree(info, pszSrcFile, __LINE__);
+      free(info);
 # ifdef FORTIFY
   Fortify_LeaveScope();

trunk/dll/grep2.c

@@ -825 +825 @@
           DosBeep(50, 100);
           WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, GREP_MASK));
-          xfree(p, pszSrcFile, __LINE__);
+          free(p);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -927 +927 @@
           Runtime_Error(pszSrcFile, __LINE__,
                         GetPString(IDS_COULDNTSTARTTHREADTEXT));
-          xfree(p, pszSrcFile, __LINE__);
+          free(p);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -935 +935 @@
         }
         DosSleep(100); //05 Aug 07 GKY 128
-        xfree(p, pszSrcFile, __LINE__);
+        free(p);
 # ifdef FORTIFY
   Fortify_LeaveScope();

trunk/dll/info.c

@@ -44 +44 @@
 #include "strutil.h"                    // GetPString
 #include "fm3dll.h"
+#include "fortify.h"
 
 #pragma data_seg(DATA1)
@@ -464 +465 @@
       if (pis->lasthwndMenu)
         WinDestroyWindow(pis->lasthwndMenu);
-      xfree(pis, pszSrcFile, __LINE__);
+      free(pis);
       return oldproc(hwnd, msg, mp1, mp2);
     }

trunk/dll/inis.c

@@ -217 +217 @@
                                                         app2 : inirec->app),
                                                 pCurrentK, pData, ulSize);
-                          xfree(pData, pszSrcFile, __LINE__);   /* free data */
+                          free(pData);  /* free data */
                         }
                       }
@@ -225 +225 @@
                     }
                   }
-                  xfree(pDataK, pszSrcFile, __LINE__);          /* free keynames */
+                  free(pDataK);         /* free keynames */
                 }
               }
@@ -261 +261 @@
                                          inirec->key2 : inirec->key),
                                         pData, ulSize);
-                  xfree(pData, pszSrcFile, __LINE__);           /* free data */
+                  free(pData);          /* free data */
                 }
               }
@@ -296 +296 @@
       PostMsg(inirec->hwndSource, WM_COMMAND, MPFROM2SHORT(INI_REFRESH, 0),
               MPVOID);
-    xfree(inirec, pszSrcFile, __LINE__);
+    free(inirec);
 # ifdef FORTIFY
     Fortify_LeaveScope();
@@ -324 +324 @@
       WinTerminate(hab2);
     }
-    xfree(inirec, pszSrcFile, __LINE__);
+    free(inirec);
   }
 }
@@ -413 +413 @@
                                                       pCurrentK, pData,
                                                       ulSize);
-                                xfree(pData, pszSrcFile, __LINE__);     /* free data */
+                                free(pData);    /* free data */
                               }
                             }
@@ -421 +421 @@
                           }
                         }
-                        xfree(pDataK, pszSrcFile, __LINE__);    /* free keynames */
+                        free(pDataK);   /* free keynames */
                       }
                     }
@@ -429 +429 @@
                   }
                 }
-                xfree(pDataA, pszSrcFile, __LINE__);            /* free applnames */
+                free(pDataA);           /* free applnames */
               }
             }
@@ -443 +443 @@
     xfree(prfp->pszUserName, pszSrcFile, __LINE__);
     xfree(prfp->pszSysName, pszSrcFile, __LINE__);
-    xfree(prfp, pszSrcFile, __LINE__);
+    free(prfp);
 # ifdef FORTIFY
     Fortify_LeaveScope();
@@ -479 +479 @@
         WinEnableWindowUpdate(hwndList, TRUE);
       }
-      xfree(pData, pszSrcFile, __LINE__);
+      free(pData);
     }
   }
@@ -538 +538 @@
         Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
                   "PrfQueryProfileString");
-        xfree(pData, pszSrcFile, __LINE__);
+        free(pData);
       }
       else {
@@ -553 +553 @@
                    MPFROMSHORT(TRUE));
         WinEnableWindowUpdate(hwndList, TRUE);
-        xfree(pData, pszSrcFile, __LINE__);
+        free(pData);
         return TRUE;
       }
@@ -1330 +1330 @@
             fixup(inidata->data, p, l, inidata->datalen);
             WinSetDlgItemText(hwnd, IAD_DATA, p);
-            xfree(p, pszSrcFile, __LINE__);
+            free(p);
           }
         }
@@ -1493 +1493 @@
     hINI = PrfOpenProfile(useHab, filename);
     if (hINI == NULLHANDLE) {
-      xfree(filename, pszSrcFile, __LINE__);
+      free(filename);
       return (HWND) 0;
     }
@@ -1544 +1544 @@
   }
   else
-    xfree(filename, pszSrcFile, __LINE__);
+    free(filename);
   return hwndFrame;
 }
@@ -2041 +2041 @@
         inidata->hini = PrfOpenProfile(WinQueryAnchorBlock(hwnd),
                                        inidata->ininame);
-        xfree(mp1, pszSrcFile, __LINE__);
+        free(mp1);
       }
       else
@@ -2358 +2358 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            xfree(inirec, pszSrcFile, __LINE__);
+            free(inirec);
           }
         }
@@ -2378 +2378 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            xfree(inirec, pszSrcFile, __LINE__);
+            free(inirec);
           }
         }
@@ -2418 +2418 @@
                          IntraIniProc,
                          FM3ModHandle, INII_FRAME, (PVOID) inirec)) {
-            xfree(inirec, pszSrcFile, __LINE__);
+            free(inirec);
             break;
           }
@@ -2424 +2424 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            xfree(inirec, pszSrcFile, __LINE__);
+            free(inirec);
           }
         }
@@ -2462 +2462 @@
               xstrdup(inidata->ininame, pszSrcFile, __LINE__);
             if (!prfp->pszUserName)
-              xfree(prfp, pszSrcFile, __LINE__);
+              free(prfp);
             else {
               prfp->cchUserName = strlen(prfp->pszUserName);
               prfp->pszSysName = xstrdup(filename, pszSrcFile, __LINE__);
               if (!prfp->pszSysName) {
-                xfree(prfp->pszUserName, pszSrcFile, __LINE__);
-                xfree(prfp, pszSrcFile, __LINE__);
+                free(prfp->pszUserName);
+                free(prfp);
               }
               else {
@@ -2476 +2476 @@
                   Runtime_Error(pszSrcFile, __LINE__,
                                 GetPString(IDS_COULDNTSTARTTHREADTEXT));
-                  xfree(prfp->pszSysName, pszSrcFile, __LINE__);
-                  xfree(prfp->pszUserName, pszSrcFile, __LINE__);
-                  xfree(prfp, pszSrcFile, __LINE__);
+                  free(prfp->pszSysName);
+                  free(prfp->pszUserName);
+                  free(prfp);
                 }
                 else
@@ -2777 +2777 @@
         if (inidata->hini != NULLHANDLE && *inidata->ininame)
           CloseProfile(inidata->hini, FALSE);
-        xfree(inidata->data, pszSrcFile, __LINE__);
+        free(inidata->data);
         if (inidata->hwndPopup)
           WinDestroyWindow(inidata->hwndPopup);
-        xfree(inidata, pszSrcFile, __LINE__);
+        free(inidata);
       }
       if (!dontclose &&

trunk/dll/literal.c

@@ -32 +32 @@
 #include "errutil.h"                    // Dos_Error...
 #include "fm3dll.h"
+#include "fortify.h"
 
 static PSZ pszSrcFile = __FILE__;
@@ -194 +195 @@
   cBufBytes = pszOut - pszWork;                /* Calc string length excluding terminator */
   memcpy(pszBuf, pszWork, cBufBytes + 1);        /* Overwrite including terminator */
-  xfree(pszWork, pszSrcFile, __LINE__);
+  free(pszWork);
 
   return cBufBytes;                        /* Return string length */
@@ -280 +281 @@
     return (*fstr == *fcard);
 }
-
-
-/*BOOL wildcard(const PSZ pszBuf, const PSZ pszWildCard,
-              const BOOL fNotFileSpec)
-{
-  const CHAR *fstr = pszBuf;
-  PSZ fcard = pszWildCard;
-  CHAR *tcard;
-  INT wmatch = TRUE;
-  BOOL reverse = FALSE;
-
-  while (wmatch && *fcard && *fstr) {
-    if (*fcard == '*' && fcard[strlen(fcard) - 1] == '*' && !reverse){
-      tcard  = xstrdup(fcard + 1, __FILE__, __LINE__);
-      tcard[strlen(tcard) - 1] = 0;
-      if (!(strchr(tcard, '?')) && !(strchr(tcard, '*'))){
-        if (strstr(fstr, tcard)){ //strstr match for *stuff* pattern no wildcards in "stuff"
-          xfree(tcard, pszSrcFile, __LINE__);
-          return TRUE;
-        }
-        else{
-          xfree(tcard, pszSrcFile, __LINE__);
-          return FALSE;
-        }
-      }
-      xfree(tcard, pszSrcFile, __LINE__);
-    }
-    else   //reverse search for *stuff pattern "stuff" can contain wildcards
-      if (*fcard == '*' && fcard[strlen(fcard) - 1] != '*'){
-        fstr = strrev(pszBuf);
-        fcard = strrev(pszWildCard);
-        reverse = TRUE;
-      }
-     switch (*fcard) { //fm2 standard forward search for all other cases
-      case '?':                                // character substitution /
-        fcard++;
-        if (fNotFileSpec || (*fstr != '.' && *fstr != '/' && *fstr != '\\'))
-          fstr++;                                // skip (match) next character
-        break;
-
-      case '*':
-        // find next non-wild character in wildcard
-        while (*fcard && (*fcard == '?' || *fcard == '*'))
-          fcard++;
-        if (!*fcard){                        // if last char of wildcard is *, it matches
-          if (reverse){
-            fstr = strrev(pszBuf);
-            fcard = strrev(pszWildCard);
-          }
-          return TRUE;
-        }
-        // skip until partition, match, or eos
-        while (*fstr && toupper(*fstr) != toupper(*fcard) &&
-               (fNotFileSpec || (*fstr != '\\' &&
-                                 *fstr != '/' && *fstr != '.')))
-          fstr++;
-        if (!fNotFileSpec && !*fstr)        // implicit '.'
-          if (*fcard == '.')
-            fcard++;
-        break;
-
-      default:
-        if (!fNotFileSpec && ((*fstr == '/' || *fstr == '\\') &&
-                              (*fcard == '/' || *fcard == '\\')))
-          wmatch = TRUE;
-        else
-          wmatch = (toupper(*fstr) == toupper(*fcard));
-        fstr++;
-        fcard++;
-        break;
-      }
-  }  //while
-
-  if ((*fcard && *fcard != '*') || *fstr){
-    if (reverse){
-      fstr = strrev(pszBuf);
-      fcard = strrev(pszWildCard);
-    }
-    return 0;
-  }
-  else {
-    if (reverse){
-      fstr = strrev(pszBuf);
-      fcard = strrev(pszWildCard);
-    }
-    return wmatch;
-  }
-} */
-
 
 // fixup - quote literal character array

trunk/dll/mainwnd.c

@@ -520 +520 @@
       WinSetMultWindowPos(WinQueryAnchorBlock(hwnd), &swp[2], numtools);
     }
-    xfree(swp, pszSrcFile, __LINE__);
+    free(swp);
   }
   WinInvalidateRect(hwnd, NULL, TRUE);
@@ -1014 +1014 @@
               }
             }
-            xfree(s, pszSrcFile, __LINE__);
+            free(s);
           }
         }
@@ -1560 +1560 @@
         PostMsg(hwnd, UM_FOCUSME, MPVOID, MPVOID);
         PostMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
-        xfree(pszCmdLine, pszSrcFile, __LINE__);
+        free(pszCmdLine);
       }
     }
@@ -6262 +6262 @@
                                   MPFROMP(pszStateName),
                                   MPVOID)) {
-                  xfree(pszStateName, pszSrcFile, __LINE__);
+                  free(pszStateName);
                 }
               }
@@ -6336 +6336 @@
         if (!PostMsg(MainObjectHwnd, UM_RESTORE, MPFROMP(pszDefaultStateName), MPVOID))
           // 05 Feb 08 SHL fixme to complain?
-          xfree(pszDefaultStateName, pszSrcFile, __LINE__);
+          free(pszDefaultStateName);
       }
     }

trunk/dll/mainwnd2.c

@@ -48 +48 @@
 #include "command.h"                    // RunCommand
 #include "fm3dll.h"
+#include "fortify.h"
 
 typedef struct

trunk/dll/makelist.c

@@ -75 +75 @@
     if (li->list)
       FreeList(li->list);
-    xfree(li, pszSrcFile, __LINE__);
+    free(li);
 # ifdef FORTIFY
   //Fortify_LeaveScope();
@@ -96 +96 @@
     _heap_check();
 #endif
-    xfree(list, pszSrcFile, __LINE__);
+    free(list);
 # ifdef FORTIFY
   //Fortify_LeaveScope();

trunk/dll/menu.c

@@ -27 +27 @@
 #include "errutil.h"                    // Dos_Error...
 #include "fm3dll.h"
+#include "fortify.h"
 
 #pragma data_seg(DATA2)
@@ -69 +70 @@
     next = info->next;
     xfree(info->text, pszSrcFile, __LINE__);
-    xfree(info, pszSrcFile, __LINE__);
+    free(info);
     info = next;
   }
@@ -107 +108 @@
           info->text = xstrdup(tokens[2], pszSrcFile, __LINE__);
           if (!info->text)
-            xfree(info, pszSrcFile, __LINE__);
+            free(info);
           else {
             if (!stricmp(tokens[0], "MENUITEM"))
@@ -116 +117 @@
               /* error! */
               xfree(info->text, pszSrcFile, __LINE__);
-              xfree(info, pszSrcFile, __LINE__);
+              free(info);
               info = NULL;
             }

trunk/dll/misc.c

@@ -67 +67 @@
 #include "command.h"                // LINKCMDS
 #include "fm3dll.h"
+#include "fortify.h"
 
 #pragma data_seg(DATA1)
@@ -232 +233 @@
         }
       }
-      xfree(s, pszSrcFile, __LINE__);
+      free(s);
     }
     if (releaseme)
@@ -851 +852 @@
                   if (!PostMsg(hwnd,
                                UM_FIXEDITNAME, MPVOID, MPFROMP(filename)))
-                    xfree(filename, pszSrcFile, __LINE__);
+                    free(filename);
                 }
                 if (stricmp(testname, pci->pszFileName)) {
@@ -859 +860 @@
                     if (!PostMsg(hwnd,
                                  UM_FIXEDITNAME, MPVOID, MPFROMP(filename)))
-                      xfree(filename, pszSrcFile, __LINE__);
+                      free(filename);
                   }
                 }
@@ -1005 +1006 @@
     else if (ret != 0)
       return -1;
-    xfree(pszCmdLine, pszSrcFile, __LINE__);
+    free(pszCmdLine);
   }
   return 0;
@@ -1998 +1999 @@
                                   GetPString(IDS_SUBJ) : GetPString(IDS_NAME));
     WinSetWindowText(hwnd, s);
-    xfree(s, pszSrcFile, __LINE__);
+    free(s);
   }
 }
@@ -2017 +2018 @@
              !(flWindowAttr & CV_TEXT)) ? GetPString(IDS_MINI) : NullStr);
     WinSetWindowText(hwnd, s);
-    xfree(s, pszSrcFile, __LINE__);
+    free(s);
   }
 }
@@ -2037 +2038 @@
       sprintf(s, "F:%s", GetPString(IDS_ALLTEXT));
     WinSetWindowText(hwnd, s);
-    xfree(s, pszSrcFile, __LINE__);
+    free(s);
   }
 }
@@ -2182 +2183 @@
       }
       numswitches = y;
-      xfree(pswb, pszSrcFile, __LINE__);
+      free(pswb);
       DosPostEventSem(CompactSem);
     }

trunk/dll/mle.c

@@ -252 +252 @@
     Dos_Error(MB_CANCEL, rc, h, pszSrcFile, __LINE__,
               GetPString(IDS_OUTOFMEMORY));
-    xfree(sel, pszSrcFile, __LINE__);
+    free(sel);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -272 +272 @@
     if (sellen < 1) {
       Runtime_Error(pszSrcFile, __LINE__, "len < 1");
-      xfree(sel, pszSrcFile, __LINE__);
+      free(sel);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -289 +289 @@
     SaveToClip(h, sel, TRUE);
     DosFreeMem(temp);
-    xfree(sel, pszSrcFile, __LINE__);
+    free(sel);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -313 +313 @@
 #endif
       DosFreeMem(temp);
-      xfree(sel, pszSrcFile, __LINE__);
+      free(sel);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -389 +389 @@
 #endif
     DosFreeMem(temp);
-    xfree(sel, pszSrcFile, __LINE__);
+    free(sel);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -425 +425 @@
 #endif
   DosFreeMem(temp);
-  xfree(sel, pszSrcFile, __LINE__);
+  free(sel);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -594 +594 @@
           else
             ret = FALSE;
-          xfree(buffer, pszSrcFile, __LINE__);
+          free(buffer);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -796 +796 @@
         _heap_check();
 #endif
-        //xfree(bkg, pszSrcFile, __LINE__);
         WinDestroyMsgQueue(thmq);
       }
+      else
+        PostMsg(bkg->hwndReport, bkg->msg, MPVOID, MPVOID);
       DecrThreadUsage();
       WinTerminate(thab);
-      xfree(bkg, pszSrcFile, __LINE__);
+      free(bkg);
       bkg = NULL;
 # ifdef FORTIFY
@@ -809 +810 @@
     }
     // fixme to be gone?
-    if (bkg) {
+    else {
       PostMsg(bkg->hwndReport, bkg->msg, MPVOID, MPVOID);
-      xfree(bkg, pszSrcFile, __LINE__);
+      free(bkg);
 # ifdef FORTIFY
   Fortify_LeaveScope();

trunk/dll/newview.c

@@ -1442 +1442 @@
                               __LINE__,
                               GetPString(IDS_ERRORREADINGTEXT), ad->filename);
-                    xfree(ad->text, pszSrcFile, __LINE__);
+                    free(ad->text);
                     ad->text = NULL;
                     ad->textsize = 0;
@@ -2400 +2400 @@
               switch (ret) {
               case 0:
-                xfree(urld, pszSrcFile, __LINE__);
+                free(urld);
                 goto NoAdd;
               case 1:
@@ -2426 +2426 @@
                             "%s %s", httprun, urld->url);
                 }
-                xfree(urld, pszSrcFile, __LINE__);
+                free(urld);
                 goto NoAdd;
               case 2:
@@ -2452 +2452 @@
                             "%s %s", ftprun, urld->url);
                 }
-                xfree(urld, pszSrcFile, __LINE__);
+                free(urld);
                 goto NoAdd;
               case 3:
@@ -2462 +2462 @@
                           "%s %s", mailrun, urld->url);
                 }
-                xfree(urld, pszSrcFile, __LINE__);
+                free(urld);
                 goto NoAdd;
               default:
                 break;
               }
-              xfree(urld, pszSrcFile, __LINE__);
+              free(urld);
             }
           }
@@ -2545 +2545 @@
                                   MPFROMLONG(whichline));
             }
-            xfree(s, pszSrcFile, __LINE__);
+            free(s);
           }
         }
@@ -3958 +3958 @@
         FreeViewerMem(hwnd);
         WinSetWindowPtr(hwnd, QWL_USER, NULL);
-        xfree(ad, pszSrcFile, __LINE__);
+        free(ad);
       }
       if (hwndRestore && hwndRestore != HWND_DESKTOP) {

trunk/dll/notebook.c

@@ -51 +51 @@
 #include "notebook.h"
 #include "fm3dll.h"
+#include "fortify.h"
 
 #pragma data_seg(DATA2)
@@ -214 +215 @@
       pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
       if (!pszWorkBuf) {
-        xfree(szCLBuf, pszSrcFile, __LINE__);
+        free(szCLBuf);
         return 0; //already complained
       }
@@ -222 +223 @@
         NormalizeCmdLine(pszWorkBuf, szCLBuf);
         memcpy(virus, pszWorkBuf, strlen(pszWorkBuf) + 1);
-        xfree(pszWorkBuf, pszSrcFile, __LINE__);
-        xfree(szCLBuf, pszSrcFile, __LINE__);
+        free(pszWorkBuf);
+        free(szCLBuf);
         if (!strchr(virus, '%') && strlen(virus) > 3)
           strcat(virus, " %p");
@@ -487 +488 @@
       pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
       if (!pszWorkBuf) {
-        xfree(szCLBuf, pszSrcFile, __LINE__);
+        free(szCLBuf);
         return 0; //already complained
       }
@@ -522 +523 @@
           strcat(bined, " %a");
       }
-      xfree(pszWorkBuf, pszSrcFile, __LINE__);
-      xfree(szCLBuf, pszSrcFile, __LINE__);
+      free(pszWorkBuf);
+      free(szCLBuf);
       PrfWriteProfileString(fmprof, appname, "Viewer", viewer);
       PrfWriteProfileString(fmprof, appname, "Editor", editor);
@@ -690 +691 @@
       pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
       if (!pszWorkBuf) {
-        xfree(szCLBuf, pszSrcFile, __LINE__);
+        free(szCLBuf);
         return 0; //already complained
       }
@@ -723 +724 @@
         memcpy(mailrun, pszWorkBuf, strlen(pszWorkBuf) + 1);
       }
-      xfree(pszWorkBuf, pszSrcFile, __LINE__);
-      xfree(szCLBuf, pszSrcFile, __LINE__);
+      free(pszWorkBuf);
+      free(szCLBuf);
       PrfWriteProfileString(fmprof, appname, "HttpRunDir", httprundir);
       PrfWriteProfileString(fmprof, appname, "FtpRunDir", ftprundir);
@@ -1326 +1327 @@
       pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
       if (!pszWorkBuf) {
-        xfree(szCLBuf, pszSrcFile, __LINE__);
+        free(szCLBuf);
         return 0; //already complained
       }
@@ -1346 +1347 @@
           strcat(compare, " %a");
       }
-      xfree(pszWorkBuf, pszSrcFile, __LINE__);
-      xfree(szCLBuf, pszSrcFile, __LINE__);
+      free(pszWorkBuf);
+      free(szCLBuf);
       PrfWriteProfileString(fmprof, appname, "Compare", compare);
       break;

trunk/dll/notify.c

@@ -198 +198 @@
 
     if (p != str)
-      xfree(p, pszSrcFile, __LINE__);
+      free(p);
     if (id > NOTE_MAX)
       id = NOTE_FRAME;
@@ -275 +275 @@
                           LM_INSERTITEM, MPFROM2SHORT(LIT_END, 0), mp2);
         PostMsg(hwndNotify, UM_NOTIFY, MPVOID, MPVOID);
-        xfree((CHAR *)mp2, pszSrcFile, __LINE__);
+        free((CHAR *)mp2);
       }
       WinDismissDlg(hwnd, 0);
@@ -292 +292 @@
                         NOTE_LISTBOX,
                         LM_INSERTITEM, MPFROM2SHORT(LIT_END, 0), mp2);
-      xfree((CHAR *)mp2, pszSrcFile, __LINE__);
+      free((CHAR *)mp2);
     }
 
@@ -505 +505 @@
             PostMsg(hwndNotify, UM_CONTAINER_FILLED, MPVOID, MPVOID);
             once = TRUE;
-          }
+          }
+          free(s);
         }
-        xfree(s, pszSrcFile, __LINE__);
       }
     }

trunk/dll/objcnr.c

@@ -109 +109 @@
     if (!pciP) {
       Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__, "CM_ALLOCRECORD");
-      xfree(pffbArray, pszSrcFile, __LINE__);
+      free(pffbArray);
       return;
     }
@@ -134 +134 @@
   }
   else {
-    xfree(pffbArray, pszSrcFile, __LINE__);
+    free(pffbArray);
     Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
               GetPString(IDS_CANTFINDDIRTEXT), filename);
@@ -155 +155 @@
   ri.fInvalidateRecord = TRUE;
   if (!WinSendMsg(hwndCnr, CM_INSERTRECORD, MPFROMP(pciP), MPFROMP(&ri))) {
-    xfree(pffbArray, pszSrcFile, __LINE__);
+    free(pffbArray);
     return;
   }
@@ -204 +204 @@
   }
 
-  xfree(pffbArray, pszSrcFile, __LINE__);
+  free(pffbArray);
   WinSendMsg(hwndCnr, CM_INVALIDATERECORD, MPFROMP(&pciP),
              MPFROM2SHORT(1, 0));
@@ -239 +239 @@
   PostMsg(WinQueryWindow(dirsize->hwndCnr, QW_PARENT), UM_CONTAINER_FILLED,
           MPVOID, MPVOID);
-  xfree(dirsize, pszSrcFile, __LINE__);
+  free(dirsize);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -290 +290 @@
         Runtime_Error(pszSrcFile, __LINE__,
                       GetPString(IDS_COULDNTSTARTTHREADTEXT));
-        xfree(dirsize, pszSrcFile, __LINE__);
+        free(dirsize);
 # ifdef FORTIFY
   Fortify_LeaveScope();

trunk/dll/pathutil.c

@@ -16 +16 @@
 ***********************************************************************/
 
+#include <stdlib.h>
 #include <string.h>
 
@@ -27 +28 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "fortify.h"
 
 static PSZ pszSrcFile = __FILE__;
@@ -132 +134 @@
   szArgs = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
   if (!szArgs) {
-    xfree(szCmdLine, pszSrcFile, __LINE__);
+    free(szCmdLine);
     return pszCmdLine_; //already complained
   }
@@ -333 +335 @@
     }
   }
-  xfree(szArgs, pszSrcFile, __LINE__);
-  xfree(szCmdLine, pszSrcFile, __LINE__);
+  free(szArgs);
+  free(szCmdLine);
   return pszWorkBuf;
 }

trunk/dll/presparm.c

@@ -23 +23 @@
 
 #include "fm3dll.h"
+#include "fortify.h"
 
 // static PSZ pszSrcFile = __FILE__;
@@ -308 +309 @@
                         appname, tagname, ppresparams, ppresparams->cb + 4);
 
-  xfree(ppresparams, pszSrcFile, __LINE__);
+  free(ppresparams);
 }
 

trunk/dll/remap.c

@@ -31 +31 @@
 #include "strutil.h"                    // GetPString
 #include "fm3dll.h"
+#include "fortify.h"
 
 #pragma data_seg(DATA1)
@@ -84 +85 @@
           info->res = xstrdup(s, pszSrcFile, __LINE__);
           if (!info->res)
-            xfree(info, pszSrcFile, __LINE__);
+            free(info);
           else {
             x++;
@@ -152 +153 @@
     info->res = xstrdup(res, pszSrcFile, __LINE__);
     if (!info->res)
-      xfree(info, pszSrcFile, __LINE__);
+      free(info);
     else {
       info->next = NULL;
@@ -162 +163 @@
         info = reshead;
         reshead = reshead->next;
-        xfree(info, pszSrcFile, __LINE__);
+        free(info);
       }
       return TRUE;
@@ -186 +187 @@
         reshead = info->next;
       xfree(info->res, pszSrcFile, __LINE__);
-      xfree(info, pszSrcFile, __LINE__);
+      free(info);
       return TRUE;
     }
@@ -203 +204 @@
     next = info->next;
     xfree(info->res, pszSrcFile, __LINE__);
-    xfree(info, pszSrcFile, __LINE__);
+    free(info);
     info = next;
   }
@@ -440 +441 @@
                    "%s", GetPString(IDS_CANTSTARTNETUSETEXT));
           if (!mp2 || (ULONG) mp2 == 1041 || info->failedonce)
-            xfree(info, pszSrcFile, __LINE__);
+            free(info);
           break;
         }
@@ -729 +730 @@
       while (info) {
         next = info->next;
-        xfree(info, pszSrcFile, __LINE__);
+        free(info);
         info = next;
       }

trunk/dll/saveclip.c

@@ -39 +39 @@
 #include "strutil.h"                    // GetPString
 #include "fm3dll.h"
+#include "fortify.h"
 
 static PSZ pszSrcFile = __FILE__;
@@ -187 +188 @@
           p = strchr(pp, '\n');
       }
-      xfree(text, pszSrcFile, __LINE__);
+      free(text);
     }
   }
@@ -840 +841 @@
                         subject[1023] = 0;
                       }
-                      xfree(pfealist, pszSrcFile, __LINE__);
+                      free(pfealist);
                     }
-                    xfree(pgealist, pszSrcFile, __LINE__);
+                    free(pgealist);
                   }
                 }
@@ -883 +884 @@
                         longname[CCHMAXPATHCOMP - 1] = 0;
                       }
-                      xfree(pfealist, pszSrcFile, __LINE__);
+                      free(pfealist);
                     }
-                    xfree(pgealist, pszSrcFile, __LINE__);
+                    free(pgealist);
                   }
                 }

trunk/dll/seeall.c

@@ -1315 +1315 @@
       xfree(ad->afhead[x].fullname, pszSrcFile, __LINE__);
     }
-    xfree(ad->afhead, pszSrcFile, __LINE__);
+    free(ad->afhead);
     ad->afhead = NULL;
     xfree(ad->afindex, pszSrcFile, __LINE__);
@@ -1936 +1936 @@
   pffbArray = xmalloc(ulBufBytes, pszSrcFile, __LINE__);
   if (!pffbArray) {
-    xfree(filename, pszSrcFile, __LINE__);
+    free(filename);
     return;
   }
@@ -1974 +1974 @@
             // Complain if pathnames exceeds max
             DosFindClose(hdir);
-            xfree(pffbArray, pszSrcFile, __LINE__);
-            xfree(filename, pszSrcFile, __LINE__);
+            free(pffbArray);
+            free(filename);
             if (!fDone) {
               fDone = TRUE;
@@ -2042 +2042 @@
   }
 
-  xfree(pffbArray, pszSrcFile, __LINE__);
-  xfree(filename, pszSrcFile, __LINE__);
+  free(pffbArray);
+  free(filename);
 }
 
@@ -4292 +4292 @@
       }
       FreeAllFilesList(hwnd);
-      xfree(pAD, pszSrcFile, __LINE__);
+      free(pAD);
 # ifdef FORTIFY
       Fortify_LeaveScope();

trunk/dll/select.c

@@ -48 +48 @@
 #include "strutil.h"                    // GetPString
 #include "fm3dll.h"
+#include "fortify.h"
 
 static PSZ pszSrcFile = __FILE__;
@@ -258 +259 @@
             fclose(inputFile);
           }
-          xfree(input, pszSrcFile, __LINE__);
+          free(input);
           DosSleep(1);
         }
@@ -361 +362 @@
             fclose(inputFile);
           }
-          xfree(input, pszSrcFile, __LINE__);
+          free(input);
           DosSleep(1);
         }

trunk/dll/seticon.c

@@ -26 +26 @@
 #include "errutil.h"                    // Dos_Error...
 #include "fm3dll.h"
+#include "fortify.h"
 
 #pragma data_seg(DATA2)
@@ -93 +94 @@
           Win_Error(hwnd, hwnd, pszSrcFile, __LINE__, "WinSetSysPointerData");
         }
-        xfree(buff, pszSrcFile, __LINE__);
+        free(buff);
       }
       WinDismissDlg(hwnd, 1);

trunk/dll/shadow.c

@@ -30 +30 @@
 #include "strutil.h"                    // GetPString
 #include "fm3dll.h"
+#include "fortify.h"
 
 #pragma data_seg(DATA1)
@@ -57 +58 @@
               (path) ? ";STARTUPDIR=" : "", (path) ? path : "", objtitle);
       WinSetObjectData(obj, s);
-      xfree(s, pszSrcFile, __LINE__);
+      free(s);
     }
   }
@@ -158 +159 @@
                           objtitle,
                           s, (location) ? location : cnr, CO_FAILIFEXISTS);
-    xfree(s, pszSrcFile, __LINE__);
+    free(s);
   }
   return obj;

trunk/dll/subj.c

@@ -32 +32 @@
 #include "strutil.h"                    // GetPString
 #include "fm3dll.h"
+#include "fortify.h"
 
 static PSZ pszSrcFile = __FILE__;
@@ -57 +58 @@
     pfealist = xmallocz(1024, pszSrcFile, __LINE__);
     if (pfealist)
-    xfree(pgealist, pszSrcFile, __LINE__);
+    free(pgealist);
     else {
       pfealist->cbList = 1024;
@@ -65 +66 @@
       rc = DosQueryPathInfo(filename, FIL_QUERYEASFROMLIST,
                             (PVOID) & eaop, (ULONG) sizeof(EAOP2));
-      xfree(pgealist, pszSrcFile, __LINE__);
+      free(pgealist);
       if (!rc) {
         pfea = &eaop.fpFEA2List->list[0];
@@ -74 +75 @@
         subject[1023] = 0;
       }
-      xfree(pfealist, pszSrcFile, __LINE__);
+      free(pfealist);
       if (rc == ERROR_SHARING_VIOLATION || rc == ERROR_ACCESS_DENIED) {
         saymsg(MB_CANCEL,

trunk/dll/systemf.c

@@ -44 +44 @@
 #include "pathutil.h"
 #include "fm3dll.h"
+#include "fortify.h"
 
 static PSZ pszSrcFile = __FILE__;
@@ -599 +600 @@
                       EXEC_FRAME, &ex);
       if (ret != 1) {
-        xfree(commandline, pszSrcFile, __LINE__);
+        free(commandline);
         return (ret == 0) ? -1 : -2;
       }
@@ -609 +610 @@
                    (*ex.environment) ? ex.environment : NULL,
                    "%s", commandline);
-    xfree(commandline, pszSrcFile, __LINE__);
+    free(commandline);
     return ret;
   }
@@ -1305 +1306 @@
               strcpy(executable, GetCmdSpec(FALSE));
             }
-            xfree(temp, pszSrcFile, __LINE__);
+            free(temp);
           }
         }
@@ -1319 +1320 @@
         pgd.swpInitial.hwndInsertBehind = HWND_TOP;
         happ = WinStartApp(hwndNotify, &pgd, NULL, NULL, ulOptions);
-        xfree(parameters, pszSrcFile, __LINE__);
+        free(parameters);
       }
     }
-    xfree(executable, pszSrcFile, __LINE__);
+    free(executable);
   }
   return happ;

trunk/dll/tools.c

@@ -35 +35 @@
 #include "strutil.h"                    // GetPString
 #include "fm3dll.h"
+#include "fortify.h"
 
 #pragma data_seg(DATA1)
@@ -52 +53 @@
   qtloaded = TRUE;
   for (x = 0; x < 50 && quicktool[x]; x++) {
-    xfree(quicktool[x], pszSrcFile, __LINE__);
+    free(quicktool[x]);
     quicktool[x] = NULL;
   }
@@ -268 +269 @@
         xfree(info->help, pszSrcFile, __LINE__);
         xfree(info->text, pszSrcFile, __LINE__);
-        xfree(info, pszSrcFile, __LINE__);
+        free(info);
         fToolsChanged = TRUE;
         break;
@@ -366 +367 @@
     xfree(tool->help, pszSrcFile, __LINE__);
     xfree(tool->text, pszSrcFile, __LINE__);
-    xfree(tool, pszSrcFile, __LINE__);
+    free(tool);
     tool = next;
   }

trunk/dll/treecnr.c

@@ -569 +569 @@
           fTopDir = temptop;
       }
-      xfree((CHAR *)mp1, pszSrcFile, __LINE__);
+      free((CHAR *)mp1);
     }
     return 0;
@@ -803 +803 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            xfree(wk, pszSrcFile, __LINE__);
+            free(wk);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -839 +839 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            xfree(wk, pszSrcFile, __LINE__);
+            free(wk);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -860 +860 @@
       WinSendMsg(dcd->hwndCnr,
                  UM_CLOSE, MPFROMLONG(dcd->dontclose != FALSE), MPVOID);
-      xfree(dcd, pszSrcFile, __LINE__);
+      free(dcd);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -1735 +1735 @@
       if (dir) {
         if (!PostMsg(dcd->hwndObject, UM_SHOWME, MPFROMP(dir), MPVOID))
-          xfree(dir, pszSrcFile, __LINE__);
+          free(dir);
       }
     }
@@ -2179 +2179 @@
         hwnd = StartMLEEditor(dcd->hwndParent,
                               (INT)mp1, (CHAR *)mp2, dcd->hwndFrame);
-      xfree((CHAR *)mp2, pszSrcFile, __LINE__);
+      free((CHAR *)mp2);
       return MRFROMLONG(hwnd);
     }
@@ -2248 +2248 @@
           if (apptail == info)
             apptail = info->prev;
-          xfree(info, pszSrcFile, __LINE__);
+          free(info);
           break;
         }
@@ -2771 +2771 @@
             li->list = BuildList(hwnd);
             if (!li->list || !li->list[0]) {
-              xfree(li, pszSrcFile, __LINE__);
+              free(li);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -2942 +2942 @@
       while (info) {
         next = info->next;
-        xfree(info, pszSrcFile, __LINE__);
+        free(info);
         info = next;
       }
@@ -3083 +3083 @@
                    IDS_WINCREATEWINDOW);
         PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID);
-        xfree(dcd, pszSrcFile, __LINE__);
+        free(dcd);
 # ifdef FORTIFY
   Fortify_LeaveScope();

trunk/dll/undel.c

@@ -228 +228 @@
           Runtime_Error(pszSrcFile, __LINE__,
                         GetPString(IDS_COULDNTSTARTTHREADTEXT));
-          xfree(undelinfo, pszSrcFile, __LINE__);
+          free(undelinfo);
           listdone = TRUE;
           WinDismissDlg(hwnd, 0);

trunk/dll/update.c

@@ -36 +36 @@
 #include "dircnrs.h"
 #include "fm3dll.h"
+#include "fortify.h"
 
 static PSZ pszSrcFile = __FILE__;
@@ -643 +644 @@
   PostMsg(hwndCnr, UM_RESCAN, MPVOID, MPVOID);
   if (pciList) {
-    xfree(pciList, pszSrcFile, __LINE__);
+    free(pciList);
     DosPostEventSem(CompactSem);
   }

trunk/dll/viewer.c

@@ -1257 +1257 @@
           }
         }
-        xfree(vw, pszSrcFile, __LINE__);
+        free(vw);
       }
       if (!dontclose &&

trunk/dll/viewinf.c

@@ -162 +162 @@
             p = strtok(NULL, ";");
           }
-          xfree(holdenv, pszSrcFile, __LINE__);
+          free(holdenv);
         NoEnv:
           if (WinIsWindow(hab2, hwnd) && !repeating) {
@@ -178 +178 @@
                   Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
                             "PrfQueryProfileData");
-                  xfree(holdenv, pszSrcFile, __LINE__);
+                  free(holdenv);
                 }
                 else
@@ -193 +193 @@
     WinTerminate(hab2);
   }
-  xfree(dummy, pszSrcFile, __LINE__);
+  free(dummy);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -274 +274 @@
           Runtime_Error(pszSrcFile, __LINE__,
                         GetPString(IDS_COULDNTSTARTTHREADTEXT));
-          xfree(d, pszSrcFile, __LINE__);
+          free(d);
           WinDismissDlg(hwnd, 0);
           return 0;

trunk/dll/walkem.c

@@ -49 +49 @@
 #include "notebook.h"                   // targetdirectory
 #include "fm3dll.h"
+#include "fortify.h"
 
 #pragma data_seg(DATA1)
@@ -129 +130 @@
           pFirstSetup = pld->next;
         xfree(pld->path, pszSrcFile, __LINE__);
-        xfree(pld, pszSrcFile, __LINE__);
+        free(pld);
       }
       return 1;                         // Found or added
@@ -143 +144 @@
     pld->path = xstrdup(name, pszSrcFile, __LINE__);
     if (!pld->path) {
-      xfree(pld, pszSrcFile, __LINE__);
+      free(pld);
       return -1;
     }
@@ -195 +196 @@
   if (!PrfQueryProfileData(fmprof, FM3Str, pszLastSetups, pszBuf, &l)) {
     Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__, "PrfQueryProfileData");
-    xfree(pszBuf, pszSrcFile, __LINE__);
+    free(pszBuf);
     return;
   }
@@ -201 +202 @@
   if (ulDataBytes != l) {
     Runtime_Error(pszSrcFile, __LINE__, "PrfQueryProfileData reported %u expected %u", l, ulDataBytes);
-    xfree(pszBuf, pszSrcFile, __LINE__);
+    free(pszBuf);
     return;
   }
@@ -214 +215 @@
     pld = xmalloc(sizeof(LINKDIRS), pszSrcFile, __LINE__);
     if (!pld) {
-      xfree(pszBuf, pszSrcFile, __LINE__);
+      free(pszBuf);
       return;
     }
     pld->path = xstrdup(psz, pszSrcFile, __LINE__);
     if (!pld->path) {
-      xfree(pszBuf, pszSrcFile, __LINE__);
-      xfree(pld, pszSrcFile, __LINE__);
+      free(pszBuf);
+      free(pld);
       return;
     }
@@ -235 +236 @@
   } // while
 
-  xfree(pszBuf, pszSrcFile, __LINE__);
+  free(pszBuf);
 
   fSetupsLoaded = TRUE;
@@ -338 +339 @@
           info->path = xstrdup(s, pszSrcFile, __LINE__);
           if (!info->path)
-            xfree(info, pszSrcFile, __LINE__);
+            free(info);
           else {
             info->next = NULL;
@@ -432 +433 @@
               ldirhead = info->next;
             xfree(info->path, pszSrcFile, __LINE__);
-            xfree(info, pszSrcFile, __LINE__);
+            free(info);
             break;
           }
@@ -444 +445 @@
         info->path = xstrdup(path, pszSrcFile, __LINE__);
         if (!info->path)
-          xfree(info, pszSrcFile, __LINE__);
+          free(info);
         else {
           info->next = NULL;
@@ -486 +487 @@
           udirhead = info->next;
         xfree(info->path, pszSrcFile, __LINE__);
-        xfree(info, pszSrcFile, __LINE__);
+        free(info);
         fUdirsChanged = TRUE;
         return TRUE;
@@ -503 +504 @@
           ldirhead = info->next;
         xfree(info->path, pszSrcFile, __LINE__);
-        xfree(info, pszSrcFile, __LINE__);
+        free(info);
         return TRUE;
       }
@@ -527 +528 @@
           ldirhead = info->next;
         xfree(info->path, pszSrcFile, __LINE__);
-        xfree(info, pszSrcFile, __LINE__);
+        free(info);
         return TRUE;
       }
@@ -545 +546 @@
     next = info->next;
     xfree(info->path, pszSrcFile, __LINE__);
-    xfree(info, pszSrcFile, __LINE__);
+    free(info);
     info = next;
   }
@@ -559 +560 @@
     next = info->next;
     xfree(info->path, pszSrcFile, __LINE__);
-    xfree(info, pszSrcFile, __LINE__);
+    free(info);
     info = next;
   }
@@ -1224 +1225 @@
       if (wa->changed)
         WinSendMsg(hwnd, UM_SETUP3, MPVOID, MPVOID);
-      xfree(wa, pszSrcFile, __LINE__);
+      free(wa);
       WinDismissDlg(hwnd, 0);
       break;

trunk/dll/winlist.c

@@ -24 +24 @@
 #include "fm3dlg.h"
 #include "fm3dll.h"
+#include "fortify.h"
 
 #pragma data_seg(DATA1)
@@ -120 +121 @@
             y++;
           }
-          xfree(pswb, pszSrcFile, __LINE__);
+          free(pswb);
           DosPostEventSem(CompactSem);
         }

trunk/dll/worker.c

@@ -105 +105 @@
                             GetPString(IDS_COULDNTSTARTTHREADTEXT));
               FreeListInfo(wk->li);
-              xfree(wk, pszSrcFile, __LINE__);
+              free(wk);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -270 +270 @@
                     if (!PostMsg(Collector,
                                  UM_COLLECTFROMFILE, MPFROMP(temp), MPVOID))
-                      xfree(temp, pszSrcFile, __LINE__);
+                      free(temp);
                   }
                 }
@@ -978 +978 @@
     if (wk->li)
       FreeListInfo(wk->li);
-    xfree(wk, pszSrcFile, __LINE__);
+    free(wk);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -1140 +1140 @@
               for (x = 0; wk->li->list[x]; x++) {
                 strcpy(p, wk->li->list[x]);
-                xfree(wk->li->list[x], pszSrcFile, __LINE__);
+                free(wk->li->list[x]);
                 wk->li->list[x] = xstrdup(szBuffer, pszSrcFile, __LINE__);
               }
@@ -1320 +1320 @@
                                UM_LOADFILE,
                                MPFROMLONG(5 + viewtype), MPFROMP(temp)))
-                    xfree(temp, pszSrcFile, __LINE__);
+                    free(temp);
                 }
                 DosSleep(1);
@@ -1365 +1365 @@
                                UM_LOADFILE,
                                MPFROMLONG(4 + viewtype), MPFROMP(temp)))
-                    xfree(temp, pszSrcFile, __LINE__);
+                    free(temp);
                 }
                 DosSleep(1);
@@ -1643 +1643 @@
     if (wk->li)
       FreeListInfo(wk->li);
-    xfree(wk, pszSrcFile, __LINE__);
+    free(wk);
 # ifdef FORTIFY
   Fortify_LeaveScope();

trunk/eas.c

@@ -75 +75 @@
     WinTerminate(hab);
   }
-  if (list)
-    xfree(list, pszSrcFile, __LINE__);
+  xfree(list, pszSrcFile, __LINE__);
   return 0;
 }