Changeset 1009 for trunk/dll/treecnr.c

Timestamp:

May 10, 2008, 9:51:58 AM (17 years ago)

Author:

Steven Levine

Message:

Add xfree xstrdup Fortify support
Add MT capable Fortify scope logic

File:

• trunk/dll/treecnr.c (modified) (16 diffs)

trunk/dll/treecnr.c

@@ -561 +561 @@
           fTopDir = TRUE;
         }
-        ShowTreeRec(dcd->hwndCnr, (CHAR *) mp1, fCollapseFirst, TRUE);
+        ShowTreeRec(dcd->hwndCnr, (CHAR *)mp1, fCollapseFirst, TRUE);
         dcd->suspendview = tempsusp;
         fFollowTree = tempfollow;
@@ -567 +567 @@
           fTopDir = temptop;
       }
-      xfree((CHAR *) mp1);
+      xfree((CHAR *)mp1, pszSrcFile, __LINE__);
     }
     return 0;
@@ -799 +799 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            xfree(wk);
+            xfree(wk, pszSrcFile, __LINE__);
             FreeListInfo((LISTINFO *) mp1);
           }
@@ -830 +830 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            xfree(wk);
+            xfree(wk, pszSrcFile, __LINE__);
             FreeListInfo((LISTINFO *) mp1);
           }
@@ -848 +848 @@
       WinSendMsg(dcd->hwndCnr,
                  UM_CLOSE, MPFROMLONG(dcd->dontclose != FALSE), MPVOID);
-      xfree(dcd);
+      xfree(dcd, pszSrcFile, __LINE__);
     }
     DosPostEventSem(CompactSem);
@@ -1041 +1041 @@
 
       COMPARE *cmp;
-      CHAR *leftdir = (CHAR *) mp1, *rightdir = (CHAR *) mp2;
+      CHAR *leftdir = (CHAR *)mp1, *rightdir = (CHAR *)mp2;
 
       if (!IsFile(leftdir) && !IsFile(rightdir)) {
@@ -1715 +1715 @@
   case UM_SHOWME:
     if (mp1 && dcd) {
-      CHAR *dir = xstrdup((CHAR *) mp1, pszSrcFile, __LINE__);
+      CHAR *dir = xstrdup((CHAR *)mp1, pszSrcFile, __LINE__);
 
       if (dir) {
         if (!PostMsg(dcd->hwndObject, UM_SHOWME, MPFROMP(dir), MPVOID))
-          xfree(dir);
+          xfree(dir, pszSrcFile, __LINE__);
       }
     }
@@ -2007 +2007 @@
   case UM_OPENWINDOWFORME:
     if (dcd) {
-      if (mp1 && !IsFile((CHAR *) mp1))
+      if (mp1 && !IsFile((CHAR *)mp1))
         OpenDirCnr(hwnd, dcd->hwndParent, dcd->hwndFrame, FALSE, (char *)mp1);
     }
@@ -2157 +2157 @@
       HWND ret;
 
-      ret = StartMLEEditor(dcd->hwndParent, (INT) mp1, (CHAR *) mp2,
+      ret = StartMLEEditor(dcd->hwndParent, (INT) mp1, (CHAR *)mp2,
                            dcd->hwndFrame);
-      xfree((CHAR *) mp2);
+      xfree((CHAR *)mp2, pszSrcFile, __LINE__);
       return MRFROMLONG(ret);
     }
@@ -2170 +2170 @@
   case UM_NOTIFY:
     if (mp2)
-      Notify((CHAR *) mp2);
+      Notify((CHAR *)mp2);
     return 0;
 
@@ -2180 +2180 @@
       if (mp1) {
         DosEnterCritSec();
-        SetMask((CHAR *) mp1, &dcd->mask);
+        SetMask((CHAR *)mp1, &dcd->mask);
         DosExitCritSec();
       }
@@ -2193 +2193 @@
   case UM_DRIVECMD:
     if (mp1)
-      ShowTreeRec(hwnd, (CHAR *) mp1, FALSE, TRUE);
+      ShowTreeRec(hwnd, (CHAR *)mp1, FALSE, TRUE);
     return 0;
 
@@ -2228 +2228 @@
           if (apptail == info)
             apptail = info->prev;
-          xfree(info);
+          xfree(info, pszSrcFile, __LINE__);
           break;
         }
@@ -2749 +2749 @@
             li->list = BuildList(hwnd);
             if (!li->list || !li->list[0]) {
-              xfree(li);
+              xfree(li, pszSrcFile, __LINE__);
               break;
             }
@@ -2917 +2917 @@
       while (info) {
         next = info->next;
-        xfree(info);
+        xfree(info, pszSrcFile, __LINE__);
         info = next;
       }
@@ -3055 +3055 @@
                    IDS_WINCREATEWINDOW);
         PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID);
-        xfree(dcd);
+        xfree(dcd, pszSrcFile, __LINE__);
         hwndFrame = (HWND) 0;
       }