Changeset 1079

Timestamp:

07/19/08 06:41:55 (6 weeks ago)

Author:

stevenhl

Message:

Avoid some more spurious leak reports

Location:

trunk/dll

Files:

• dircnrs.c (modified) (4 diffs)
• tools.c (modified) (2 diffs)
• treecnr.c (modified) (1 diff)

trunk/dll/dircnrs.c

@@ -71 +71 @@
 #include "fm3dll.h"
 #include "avl.h"                        // free_archivers
+#ifdef FORTIFY
+#include "misc.h"                       // GetTidForThread
+#endif
 #include "fortify.h"
 
@@ -641 +644 @@
   case UM_SETUP:
 #   ifdef FORTIFY
+    DbgMsg(pszSrcFile, __LINE__, "UM_SETUP hwnd %p TID %u", hwnd, GetTidForThread());   // 18 Jul 08 SHL fixme
     Fortify_EnterScope();
 #   endif
@@ -1066 +1070 @@
   case WM_DESTROY:
 #   ifdef FORTIFY
-    DbgMsg(pszSrcFile, __LINE__, "WM_DESTROY hwnd %p", hwnd);   // 18 Jul 08 SHL fixme
+    DbgMsg(pszSrcFile, __LINE__, "WM_DESTROY hwnd %p TID %u", hwnd, GetTidForThread()); // 18 Jul 08 SHL fixme
 #   endif
     dcd = WinQueryWindowPtr(hwnd, QWL_USER);
@@ -3412 +3416 @@
   case WM_DESTROY:
 #   ifdef FORTIFY
-    DbgMsg(pszSrcFile, __LINE__, "WM_DESTROY hwnd %p", hwnd);   // 18 Jul 08 SHL fixme
+    DbgMsg(pszSrcFile, __LINE__, "WM_DESTROY hwnd %p TID %u", hwnd, GetTidForThread()); // 18 Jul 08 SHL fixme
 #   endif
     if (DirMenu)

trunk/dll/tools.c

@@ -34 +34 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "fortify.h"
 #include "fm3dll.h"
-#include "fortify.h"
 
 #pragma data_seg(DATA1)
@@ -146 +146 @@
         info = xmallocz(sizeof(TOOL), pszSrcFile, __LINE__);
         if (info) {
+#         ifdef FORTIFY
+          Fortify_SetOwner(info, 1);
+          Fortify_SetScope(info, 1);
+#         endif
           if (*help) {
             literal(help);
-            if (*help)
+            if (*help) {
               info->help = xstrdup(help, pszSrcFile, __LINE__);
+#             ifdef FORTIFY
+              Fortify_SetOwner(info->help, 1);
+              Fortify_SetScope(info->help, 1);
+#             endif
+            }
           }
-          if (*text)
+          if (*text) {
             info->text = xstrdup(text, pszSrcFile, __LINE__);
+#           ifdef FORTIFY
+            Fortify_SetOwner(info->text, 1);
+            Fortify_SetScope(info->text, 1);
+#           endif
+          }
           info->flags = (atoi(flagstr) & (~(T_TEXT | T_EMPHASIZED)));
           info->id = (USHORT) atoi(idstr);

trunk/dll/treecnr.c

@@ -1237 +1237 @@
                         GetPString(IDS_COULDNTSTARTTHREADTEXT));
           PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);
-          return 0;
+          // return 0;
         }
         else
           DosSleep(1);
+#       ifdef FORTIFY
+        Fortify_LeaveScope();
+#       endif
       }
     }