Changeset 1037

Timestamp:

Jul 4, 2008, 6:39:08 PM (17 years ago)

Author:

Gregg Young

Message:

Newview is used used when view is selected from menus in dircnrs, collector, arccnrs etc (ticket 244); Removed Fortify_Leavescope wrapper other minor fortify changes.

Location:

trunk/dll

Files:

• arccnrs.c (modified) (1 diff)
• collect.c (modified) (1 diff)
• dircnrs.c (modified) (2 diffs)
• fm3dll.h (modified) (1 diff)
• mainwnd.c (modified) (1 diff)
• seeall.c (modified) (2 diffs)
• treecnr.c (modified) (1 diff)
• wrappers.c (modified) (1 diff)

trunk/dll/arccnrs.c

@@ -2547 +2547 @@
     if (dcd && mp2) {
 
-      HWND ret;
-
-      ret = StartMLEEditor(dcd->hwndParent,
-                           (INT) mp1, (CHAR *) mp2, dcd->hwndFrame);
-      xfree((CHAR *) mp2, pszSrcFile, __LINE__);
-      return MRFROMLONG(ret);
+      HWND hwnd;
+
+      if ((INT)mp1 == 5 || (INT)mp1 == 13 || (INT)mp1 == 21)
+        hwnd = StartViewer(HWND_DESKTOP, (INT)mp1,
+                           (CHAR *)mp2, dcd->hwndFrame);
+      else
+        hwnd = StartMLEEditor(dcd->hwndParent,
+                              (INT)mp1, (CHAR *)mp2, dcd->hwndFrame);
+      xfree((CHAR *)mp2, pszSrcFile, __LINE__);
+      return MRFROMLONG(hwnd);
     }
     return 0;

trunk/dll/collect.c

@@ -2682 +2682 @@
   case UM_LOADFILE:
     if (dcd && mp2) {
-      HWND ret;
-
-      ret = StartMLEEditor(dcd->hwndParent,
-                           (INT) mp1, (CHAR *)mp2, dcd->hwndFrame);
+
+      HWND hwnd;
+
+      if ((INT)mp1 == 5 || (INT)mp1 == 13 || (INT)mp1 == 21)
+        hwnd = StartViewer(HWND_DESKTOP, (INT)mp1,
+                           (CHAR *)mp2, dcd->hwndFrame);
+      else
+        hwnd = StartMLEEditor(dcd->hwndParent,
+                              (INT)mp1, (CHAR *)mp2, dcd->hwndFrame);
       xfree((CHAR *)mp2, pszSrcFile, __LINE__);
-# ifdef FORTIFY
-  Fortify_LeaveScope();
-# endif
-      return MRFROMLONG(ret);
+      return MRFROMLONG(hwnd);
     }
     return 0;

trunk/dll/dircnrs.c

@@ -2496 +2496 @@
               break;
             }
-# ifdef FORTIFY
-  Fortify_EnterScope();
-# endif
             if (li->list) {
               if (SHORT1FROMMP(mp1) == IDM_COLLECTFROMFILE) {
@@ -3317 +3314 @@
     if (dcd && mp2) {
 
-      HWND ret = StartMLEEditor(dcd->hwndParent,
-                                (INT)mp1, (CHAR *)mp2, dcd->hwndFrame);
+      HWND hwnd;
+
+      if ((INT)mp1 == 5 || (INT)mp1 == 13 || (INT)mp1 == 21)
+        hwnd = StartViewer(HWND_DESKTOP, (INT)mp1,
+                           (CHAR *)mp2, dcd->hwndFrame);
+      else
+        hwnd = StartMLEEditor(dcd->hwndParent,
+                              (INT)mp1, (CHAR *)mp2, dcd->hwndFrame);
       xfree((CHAR *)mp2, pszSrcFile, __LINE__);
-# ifdef FORTIFY
-  Fortify_LeaveScope();
-# endif
-      return MRFROMLONG(ret);
+      return MRFROMLONG(hwnd);
     }
     return 0;

trunk/dll/fm3dll.h

@@ -1085 +1085 @@
 PVOID xrealloc(PVOID pvIn, size_t cBytes, PCSZ pszSrcFile, UINT uiLineNumber);
 PVOID xstrdup(PCSZ pszIn, PCSZ pszSrcFile, UINT uiLineNumber);
-unsigned char xFortify_LeaveScope(PCSZ pszSrcFile, UINT uiLineNumber);
 
 //=====================================================================

trunk/dll/mainwnd.c

@@ -6354 +6354 @@
       WinSendMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID);
 # ifdef FORTIFY
-  xFortify_LeaveScope( pszSrcFile, __LINE__);
+  free_commands();
+  free_associations();
+  free_udirs();
+  free_ldir();
+  free_archivers();
+  free_tools();
+  Fortify_LeaveScope();
 # endif
     break;

trunk/dll/seeall.c

@@ -2457 +2457 @@
     // fprintf(stderr,"Seeall: WM_CREATE\n");
     WinSetWindowPtr(hwnd, QWL_USER, NULL);
+# ifdef FORTIFY
+  Fortify_EnterScope();
+# endif
     pAD = xmallocz(sizeof(ALLDATA), pszSrcFile, __LINE__);
     if (pAD) {
@@ -4272 +4275 @@
       FreeAllFilesList(hwnd);
       xfree(pAD, pszSrcFile, __LINE__);
+# ifdef FORTIFY
+      Fortify_LeaveScope();
+# endif
     }
     break;

trunk/dll/treecnr.c

@@ -2171 +2171 @@
     if (dcd && mp2) {
 
-      HWND ret;
-
-      ret = StartMLEEditor(dcd->hwndParent, (INT) mp1, (CHAR *)mp2,
-                           dcd->hwndFrame);
+      HWND hwnd;
+
+      if ((INT)mp1 == 5 || (INT)mp1 == 13 || (INT)mp1 == 21)
+        hwnd = StartViewer(HWND_DESKTOP, (INT)mp1,
+                           (CHAR *)mp2, dcd->hwndFrame);
+      else
+        hwnd = StartMLEEditor(dcd->hwndParent,
+                              (INT)mp1, (CHAR *)mp2, dcd->hwndFrame);
       xfree((CHAR *)mp2, pszSrcFile, __LINE__);
-      return MRFROMLONG(ret);
+      return MRFROMLONG(hwnd);
     }
     return 0;

trunk/dll/wrappers.c

@@ -406 +406 @@
 }
 
-# ifdef FORTIFY
-unsigned char xFortify_LeaveScope(PCSZ pszSrcFile, UINT uiLineNumber)
-{
-  unsigned char ret;
-
-  free_commands();
-  free_associations();
-  free_udirs();
-  free_ldir();
-  free_archivers();
-  free_tools();
-  ret = Fortify_LeaveScope(pszSrcFile, uiLineNumber);
-  return ret;
-}
-# endif
 
 #pragma alloc_text(WRAPPERS1,xfree,xfopen,xfsopen,xmalloc,xrealloc,xstrdup)
-#pragma alloc_text(WRAPPERS2,xDosSetPathInfo,xDosFindFirst,xDosFindNext,xFortify_LeaveScope)
+#pragma alloc_text(WRAPPERS2,xDosSetPathInfo,xDosFindFirst,xDosFindNext)