Changeset 1012

Timestamp:

May 11, 2008, 10:27:56 PM (17 years ago)

Author:

Gregg Young

Message:

Fixed crash on directory container close with fortify enabled; fixed memory leak in assoc.c;added a fortify scope to correspond to the loading and unloading of fm3.dll

Location:

trunk/dll

Files:

• assoc.c (modified) (1 diff)
• dircnrs.c (modified) (5 diffs)
• init.c (modified) (3 diffs)

trunk/dll/assoc.c

@@ -197 +197 @@
       }
     }
+    xfree(pszCmdLine, pszSrcFile, __LINE__);
     fclose(fp);
   }

trunk/dll/dircnrs.c

@@ -61 +61 @@
 #include "command.h"                    // RunCommand
 #include "fm3dll.h"
+#include "fortify.h"
 
 #pragma data_seg(DATA1)
@@ -3320 +3321 @@
     if (dcd) {
       dcd->stopflag++;
+      //printf("%i %x %x %x\n", dcd->dontclose, dcd->hwndFrame, dcd->hwndObject, dcd);
       if (!dcd->dontclose && ParentIsDesktop(dcd->hwndFrame, (HWND) 0))
         PostMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID);
-      if (!dcd->hwndObject ||
-          !PostMsg(dcd->hwndObject, WM_CLOSE, MPVOID, MPVOID)) {
-        if (dcd->hwndObject)
-          WinSetWindowPtr(dcd->hwndObject, QWL_USER, NULL);
-        WinSetWindowPtr(hwnd, QWL_USER, NULL);
-        if (dcd->hwndRestore)
-          WinSetWindowPos(dcd->hwndRestore,
-                          HWND_TOP,
-                          0,
-                          0,
-                          0,
-                          0,
-                          SWP_RESTORE | SWP_SHOW | SWP_ACTIVATE | SWP_ZORDER);
-        FreeList(dcd->lastselection);
-        xfree(dcd, pszSrcFile, __LINE__);
-        DosPostEventSem(CompactSem);
-      }
+      if (dcd->hwndObject) {
+          WinSetWindowPtr(dcd->hwndObject, QWL_USER, NULL);
+          PostMsg(dcd->hwndObject, WM_CLOSE, MPVOID, MPVOID);
+      }
+      if (dcd->hwndRestore)
+        WinSetWindowPos(dcd->hwndRestore,
+                        HWND_TOP,
+                        0,
+                        0,
+                        0,
+                        0,
+                        SWP_RESTORE | SWP_SHOW | SWP_ACTIVATE | SWP_ZORDER);
+      //printf("%i %x %x %x\n", dcd->dontclose, dcd->hwndFrame, dcd->hwndObject, dcd);
+      FreeList(dcd->lastselection);
+      xfree(dcd, pszSrcFile, __LINE__);
+      WinSetWindowPtr(hwnd, QWL_USER, NULL);
+      //printf("%i %x %x %x\n", dcd->dontclose, dcd->hwndFrame, dcd->hwndObject, dcd);
+      //Fortify_LeaveScope();
+      DosPostEventSem(CompactSem);
     }
     WinDestroyWindow(WinQueryWindow(WinQueryWindow(hwnd, QW_PARENT),
@@ -3417 +3421 @@
         idinc = 0;
       WinSetWindowUShort(hwndFrame, QWS_ID, id);
+      //Fortify_EnterScope();
       dcd = xmallocz(sizeof(DIRCNRDATA), pszSrcFile, __LINE__);
       if (!dcd) {
-        PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID);
+        PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID);
         hwndFrame = (HWND) 0;
       }
@@ -3467 +3472 @@
                      IDS_WINCREATEWINDOW);
           PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID);
-          xfree(dcd, pszSrcFile, __LINE__);
+          xfree(dcd, pszSrcFile, __LINE__);
           hwndFrame = (HWND) 0;
         }
@@ -3474 +3479 @@
           WinSetWindowPtr(dcd->hwndCnr, QWL_USER, (PVOID) dcd);
           dcd->oldproc = WinSubclassWindow(dcd->hwndCnr,
-                                           (PFNWP) DirCnrWndProc);
+                                           (PFNWP) DirCnrWndProc);
           {
             USHORT ids[] = { DIR_TOTALS, DIR_SELECTED, DIR_VIEW, DIR_SORT,

trunk/dll/init.c

@@ -77 +77 @@
 #include "fm3dll.h"
 #include "notebook.h"                   // command line variables (editor etc)
+#include "fortify.h"
 
 #ifdef __IBMC__
@@ -537 +538 @@
 
   EndNote();
-
+  Fortify_LeaveScope();
   if (FM3ModHandle)
     DosFreeModule(FM3ModHandle);
@@ -604 +605 @@
       ret = pfnResVersion(&RVMajor, &RVMinor);
   }
-
+  Fortify_EnterScope();
   if (RVMajor < VERMAJOR || (RVMajor == VERMAJOR && RVMinor < VERMINOR)) {
     saymsg(MB_ENTER,