Changeset 1062 for trunk/dll/objwin.c

Timestamp:

Jul 8, 2008, 10:57:26 PM (17 years ago)

Author:

Steven Levine

Message:

Correct Fortify_LeaveScope usage and avoid spurious reports

File:

• trunk/dll/objwin.c (modified) (4 diffs)

trunk/dll/objwin.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2006 Steven H.Levine
+  Copyright (c) 2006, 2008 Steven H.Levine
 
   26 Jul 06 SHL Check more run time errors
@@ -13 +13 @@
   30 Mar 07 GKY Remove GetPString for window class names
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  08 Jul 08 SHL Correct Fortify_LeaveScope usage and avoid spurious reports
 
 ***********************************************************************/
@@ -76 +77 @@
                    IDS_WINCREATEWINDOW);
       else {
-# ifdef FORTIFY
-  Fortify_EnterScope();
-# endif
+#ifdef FORTIFY
+        Fortify_EnterScope();
+#endif
         WinSetWindowPtr(ObjectHwnd, QWL_USER, args);
         /* initially populate container */
@@ -87 +88 @@
           WinDispatchMsg(hab2, &qmsg2);
         WinDestroyWindow(ObjectHwnd);
+#ifdef FORTIFY
+        {
+          HWND hwndCnr = ((DIRCNRDATA *)args)->hwndCnr;
+          USHORT i;
+          // Allow container to close and free data
+          for (i = 0; WinIsWindow(hab2, hwndCnr) && i < 10; i++) {
+            DosSleep(50);
+          }
+          Fortify_LeaveScope();
+        }
+#endif
       }
       WinDestroyMsgQueue(hmq2);
     }
-# ifdef FORTIFY
-    Fortify_LeaveScope();
-# endif
     WinTerminate(hab2);
   }