Changeset 1029 for trunk/dll/autoview.c

Timestamp:

Jun 23, 2008, 3:30:16 AM (17 years ago)

Author:

Gregg Young

Message:

Fixed early memory free; Added free_... functions to make fortify checking easier; Added fortify scopes; Delete now moves to trash can on systems with the xworkplace trash can installed.

File:

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

trunk/dll/autoview.c

@@ -44 +44 @@
 #include "strutil.h"                    // GetPString
 #include "fm3dll.h"
+
+#include "fortify.h"
 
 #pragma data_seg(DATA1)
@@ -194 +196 @@
       break;
     }
-    pfealist->list[0].cbValue = (ULONG) (eaval -
+    pfealist->list[0].cbValue = /*(ULONG)*/ (eaval -
                                          (pfealist->list[0].szName +
                                           pfealist->list[0].cbName + 1));
@@ -416 +418 @@
                 }
                 xfree(ibuff, pszSrcFile, __LINE__);
+# ifdef FORTIFY
+  Fortify_LeaveScope();
+# endif
               }
               DosClose(handle);
@@ -509 +514 @@
                   WinSetWindowText(hwndAutoview, pszBuf);
                 xfree(pszBuf, pszSrcFile, __LINE__);
+# ifdef FORTIFY
+  Fortify_LeaveScope();
+# endif
               }
             }
@@ -543 +551 @@
                                     (PVOID) & eaop, (ULONG) sizeof(EAOP2));
               xfree(pgealist, pszSrcFile, __LINE__);
+# ifdef FORTIFY
+  Fortify_LeaveScope();
+# endif
               if (!rc) {
                 pfea = &eaop.fpFEA2List->list[0];
@@ -612 +623 @@
       }
       xfree((CHAR *)mp1, pszSrcFile, __LINE__);
+# ifdef FORTIFY
+  Fortify_LeaveScope();
+# endif
     }
     return 0;
@@ -788 +802 @@
               PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
               xfree(ea, pszSrcFile, __LINE__);
+# ifdef FORTIFY
+  Fortify_LeaveScope();
+# endif
             }
           }
@@ -838 +855 @@
           if (!PostMsg(hwndAutoObj, UM_LOADFILE, MPFROMP(cf), MPVOID))
             xfree(cf, pszSrcFile, __LINE__);
+# ifdef FORTIFY
+  Fortify_LeaveScope();
+# endif
         }
       }
@@ -894 +914 @@
     if (!PostMsg(hwndAutoObj, msg, mp1, mp2)) {
       xfree((CHAR *)mp1, pszSrcFile, __LINE__);
+# ifdef FORTIFY
+  Fortify_LeaveScope();
+# endif
     }
     return 0;