Changeset 1078 for trunk/dll/dircnrs.c

Timestamp:

Jul 19, 2008, 6:08:02 AM (17 years ago)

Author:

Steven Levine

Message:

More Fortify infrastructure enhancements
Rework Fortify_SetOwner
Add Fortify_BecomeOwner
Avoid more spurious leak reports

File:

• trunk/dll/dircnrs.c (modified) (5 diffs)

trunk/dll/dircnrs.c

@@ -646 +646 @@
     if (dcd) {
 #     ifdef FORTIFY
-      Fortify_ChangeOwner(dcd);
+      Fortify_BecomeOwner(dcd);         // We free dcd
 #     endif
       /* set unique id */
@@ -1065 +1065 @@
 
   case WM_DESTROY:
+#   ifdef FORTIFY
+    DbgMsg(pszSrcFile, __LINE__, "WM_DESTROY hwnd %p", hwnd);   // 18 Jul 08 SHL fixme
+#   endif
     dcd = WinQueryWindowPtr(hwnd, QWL_USER);
     if (dcd) {
@@ -1079 +1082 @@
 #     ifdef FORTIFY
       Fortify_LeaveScope();
-#      endif
+#     endif
       WinSetWindowPtr(dcd->hwndCnr, QWL_USER, NULL);
       DosPostEventSem(CompactSem);
@@ -3408 +3411 @@
 
   case WM_DESTROY:
+#   ifdef FORTIFY
+    DbgMsg(pszSrcFile, __LINE__, "WM_DESTROY hwnd %p", hwnd);   // 18 Jul 08 SHL fixme
+#   endif
     if (DirMenu)
       WinDestroyWindow(DirMenu);
@@ -3542 +3548 @@
         }
         else {
+#         ifdef FORTIFY
+          Fortify_ChangeScope(dcd, -1);
+#         endif
           RestorePresParams(dcd->hwndCnr, "DirCnr");
           WinSetWindowPtr(dcd->hwndCnr, QWL_USER, (PVOID) dcd);