Changeset 1017 for trunk/dll/treecnr.c

Timestamp:

May 26, 2008, 5:02:59 AM (17 years ago)

Author:

Gregg Young

Message:

fortify updates for threads dble free fix

File:

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

trunk/dll/treecnr.c

@@ -69 +69 @@
 #include "command.h"                    // RunCommand
 #include "fm3dll.h"
+
+#include "fortify.h"
 
 #pragma data_seg(DATA1)
@@ -784 +786 @@
       else {
         WORKER *wk;
-
+# ifdef FORTIFY
+  Fortify_EnterScope();
+# endif
         wk = xmallocz(sizeof(WORKER), pszSrcFile, __LINE__);
         if (!wk)
@@ -799 +803 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            xfree(wk, pszSrcFile, __LINE__);
+            xfree(wk, pszSrcFile, __LINE__);
+# ifdef FORTIFY
+  Fortify_LeaveScope();
+# endif
             FreeListInfo((LISTINFO *) mp1);
           }
@@ -815 +822 @@
       else {
         WORKER *wk;
-
+# ifdef FORTIFY
+  Fortify_EnterScope();
+# endif
         wk = xmallocz(sizeof(WORKER), pszSrcFile, __LINE__);
         if (!wk)
@@ -830 +839 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            xfree(wk, pszSrcFile, __LINE__);
+            xfree(wk, pszSrcFile, __LINE__);
+# ifdef FORTIFY
+  Fortify_LeaveScope();
+# endif
             FreeListInfo((LISTINFO *) mp1);
           }
@@ -849 +861 @@
                  UM_CLOSE, MPFROMLONG(dcd->dontclose != FALSE), MPVOID);
       xfree(dcd, pszSrcFile, __LINE__);
+# ifdef FORTIFY
+  Fortify_LeaveScope();
+# endif
+      WinSetWindowPtr(dcd->hwndCnr, QWL_USER, NULL);
     }
     DosPostEventSem(CompactSem);
@@ -2972 +2988 @@
   }
   if (hwndFrame && hwndClient) {
-    dcd = xmalloc(sizeof(DIRCNRDATA), pszSrcFile, __LINE__);
+# ifdef FORTIFY
+  Fortify_EnterScope();
+# endif
+    dcd = xmallocz(sizeof(DIRCNRDATA), pszSrcFile, __LINE__);
     if (!dcd) {
       Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_OUTOFMEMORY));
@@ -3055 +3074 @@
                    IDS_WINCREATEWINDOW);
         PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID);
-        xfree(dcd, pszSrcFile, __LINE__);
+        xfree(dcd, pszSrcFile, __LINE__);
+# ifdef FORTIFY
+  Fortify_LeaveScope();
+# endif
         hwndFrame = (HWND) 0;
       }