Changeset 1341 for trunk/fm4.c

Timestamp:

Dec 14, 2008, 11:18:26 PM (17 years ago)

Author:

Steven Levine

Message:

Ticket 26: add thread 1 exception handler support to applets

File:

• trunk/fm4.c (modified) (3 diffs)

trunk/fm4.c

@@ -10 +10 @@
 
   05 Jan 08 SHL Sync
+  14 Dec 08 SHL Add exception handler support
 
 ***********************************************************************/
@@ -18 +19 @@
 #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\notebook.h"               // Data declaration(s)
+#include "dll\mainwnd.h"                // hwndBubble
+#include "dll\notebook.h"               // appname
 #include "dll\tools.h"
 #include "dll\version.h"
 #include "dll\mainwnd2.h"               // StartFM32
 #include "dll\init.h"                   // InitFM3DLL
+#include "dll\errutil.h"                // Error reporting
+#include "dll\excputil.h"               // Exception handlers
+
+static PSZ pszSrcFile = __FILE__;
 
 int main(int argc, char *argv[])
@@ -33 +40 @@
   QMSG qmsg;
   HWND hwndFrame;
+  APIRET regRet;
+  UINT x;
+  EXCEPTIONREGISTRATIONRECORD regRec = { NULL, NULL };
 
   strcpy(appname, "FM/4");
-  {
-    INT x;
+  DosError(FERR_DISABLEHARDERR);
 
-    for (x = 1; x < argc; x++) {
-      if (*argv[x] == '+' && !argv[x][1])
-        fLogFile = TRUE;
-      if (*argv[x] == '-') {
-        if (argv[x][1])
-          strcpy(profile, &argv[x][1]);
-      }
+  regRec.ExceptionHandler = HandleException;
+  regRet = DosSetExceptionHandler(&regRec);
+  if (regRet != NO_ERROR) {
+    DbgMsg(pszSrcFile, __LINE__,
+           "DosSetExceptionHandler failed with error %u", regRet);
+  }
+
+  for (x = 1; x < argc; x++) {
+    if (*argv[x] == '+' && !argv[x][1])
+      fLogFile = TRUE;
+    if (*argv[x] == '-') {
+      if (argv[x][1])
+        strcpy(profile, &argv[x][1]);
     }
   }
-  DosError(FERR_DISABLEHARDERR);
+
   hab = WinInitialize(0);
   if (hab) {