Changeset 1036 for trunk/dll/newview.c

Timestamp:

Jul 2, 2008, 12:53:51 AM (17 years ago)

Author:

Gregg Young

Message:

More fortify changes eliminated the leave scope wrapper except in mainwnd.c Wrapper only unlaods stuuff (archivers, commands, etc

File:

• trunk/dll/newview.c (modified) (9 diffs)

trunk/dll/newview.c

@@ -650 +650 @@
     DosPostEventSem(CompactSem);
 # ifdef FORTIFY
-    xFortify_LeaveScope(pszSrcFile, __LINE__);
+    Fortify_LeaveScope(pszSrcFile, __LINE__);
 # endif
   }
@@ -941 +941 @@
     hmq2 = WinCreateMsgQueue(hab2, 0);
     if (hmq2) {
+# ifdef FORTIFY
+  Fortify_EnterScope();
+# endif
       WinCancelShutdown(hmq2, TRUE);
       IncrThreadUsage();
@@ -1068 +1071 @@
       }
       WinDestroyMsgQueue(hmq2);
+# ifdef FORTIFY
+      Fortify_LeaveScope(pszSrcFile, __LINE__);
+# endif
     }
     DecrThreadUsage();
@@ -1169 +1175 @@
       WinDestroyMsgQueue(hmq2);
     }
+# ifdef FORTIFY
+      Fortify_LeaveScope();
+# endif
     DecrThreadUsage();
     WinTerminate(hab2);
@@ -1192 +1201 @@
       WinCancelShutdown(hmq2, TRUE);
       IncrThreadUsage();
+# ifdef FORTIFY
+  Fortify_EnterScope();
+# endif
       ad = WinQueryWindowPtr(hwnd, QWL_USER);
       if (!ad)
@@ -1211 +1223 @@
             xfree(ad->lines, pszSrcFile, __LINE__);
             xfree(ad->markedlines, pszSrcFile, __LINE__);
-# ifdef FORTIFY
-  Fortify_LeaveScope();
-# endif
             ad->lines = NULL;
             ad->markedlines = NULL;
@@ -1346 +1355 @@
     DecrThreadUsage();
     WinTerminate(hab2);
+# ifdef FORTIFY
+    Fortify_LeaveScope(pszSrcFile, __LINE__);
+# endif
   }
   DosPostEventSem(CompactSem);
@@ -1469 +1481 @@
     WinTerminate(hab2);
 # ifdef FORTIFY
-    xFortify_LeaveScope(pszSrcFile, __LINE__);
+    Fortify_LeaveScope(pszSrcFile, __LINE__);
 # endif
   }
@@ -3969 +3981 @@
         xfree(ad, pszSrcFile, __LINE__);
 # ifdef FORTIFY
-      xFortify_LeaveScope(pszSrcFile, __LINE__);
+      Fortify_LeaveScope(pszSrcFile, __LINE__);
 # endif
       }