Changeset 1336 for trunk/fm3.c

Timestamp:

Dec 13, 2008, 1:01:10 AM (17 years ago)

Author:

Steven Levine

Message:

Ticket 26: add thread 1 exception handler support to fm3.exe

File:

• trunk/fm3.c (modified) (6 diffs)

trunk/fm3.c

@@ -11 +11 @@
   05 Jan 08 SHL Sync
   18 Jul 08 SHL Add Fortify support
+  11 Dec 08 SHL Add exception handler support
 
 ***********************************************************************/
@@ -19 +20 @@
 #define INCL_WIN
 #define INCL_LONGLONG
+#define INCL_DOSEXCEPTIONS              // XCTP_...
+#define INCL_DOSERRORS                  // NO_ERROR
 
 #include "dll\fm3dll.h"
-#include "dll\mainwnd.h"                        // Data declaration(s)
+#include "dll\mainwnd.h"                // Data declaration(s)
 #include "dll\tools.h"
 #include "dll\version.h"
@@ -28 +31 @@
 #include "dll\init.h"                   // StartFM3
 #include "dll\notebook.h"               // Data declaration(s)
+#include "dll\errutil.h"                // Error reporting
+#include "dll\excputil.h"               // Exception handlers
+
+static PSZ pszSrcFile = __FILE__;
 
 int main(int argc, char *argv[])
@@ -35 +42 @@
   QMSG qmsg;
   HWND hwndFrame;
+  APIRET regRet;
+  EXCEPTIONREGISTRATIONRECORD regRec = { NULL, NULL };
 
   strcpy(appname, "FM/3");
   DosError(FERR_DISABLEHARDERR);
+
+  regRec.ExceptionHandler = HandleException;
+  regRet = DosSetExceptionHandler(&regRec);
+  if (regRet != NO_ERROR) {
+#if 0 // 10 Dec 08 SHL fixme to report later maybe?
+    Dos_Error(MB_ENTER, regRet, HWND_DESKTOP, pszSrcFile, __LINE__,
+              "DosSetExceptionHandler");
+#endif
+    DbgMsg(pszSrcFile, __LINE__,
+           "DosSetExceptionHandler failed with error %u", regRet);
+  }
+
   hab = WinInitialize(0);
   if (hab) {
@@ -78 +99 @@
               break;
           }
+          Fortify_DumpAllMemory();
 #         endif
         }
@@ -86 +108 @@
     WinTerminate(hab);
   }
+
+  if (regRet == NO_ERROR) {
+    regRet = DosUnsetExceptionHandler(&regRec);
+    if (regRet != NO_ERROR) {
+      DbgMsg(pszSrcFile, __LINE__,
+             "DosUnsetExceptionHandler failed with error %u", regRet);
+    }
+  }
   return 0;
 }