Changeset 420 for trunk/src/kernel32/exceptions.cpp

Timestamp:

Aug 5, 1999, 3:14:18 PM (26 years ago)

Author:

phaller

Message:

Add: interactive user control for exception handling dialog (abort, retry, ignore)

File:

• trunk/src/kernel32/exceptions.cpp (modified) (5 diffs)

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.8 1999-08-04 14:39:06 phaller Exp $ */
+/* $Id: exceptions.cpp,v 1.9 1999-08-05 13:11:38 phaller Exp $ */
 
 /*
@@ -47 +47 @@
 #define INCL_MISC
 #define INCL_BASE
+#define INCL_WINBUTTONS
 #include <os2wrap.h>                     //Odin32 OS/2 api wrappers
 #include <stdio.h>
@@ -66 +67 @@
 
 LONG WIN32API UnhandledExceptionFilter(PWINEXCEPTION_POINTERS lpexpExceptionInfo);
+void KillWin32Process(void);
 
 
@@ -313 +315 @@
   DWORD rc;
 
+  // @@@PH: experimental change to have more control over exception handling
+#pragma pack(4)
+  typedef struct
+   {
+      ULONG    cb;                  /* Size of fixed part of structure          */
+      HPOINTER hIcon;               /* Icon handle                              */
+      ULONG    cButtons;            /* Number of buttons                        */
+      ULONG    flStyle;             /* Icon style flags (MB_ICONQUESTION, etc...)*/
+      HWND     hwndNotify;          /* Reserved                                 */
+      MB2D     mb2d[4];             /* Array of button definitions              */
+   } myMB2INFO;
+#pragma pack()
+
+  myMB2INFO mb2InfoExceptionBox = { 20,             // size of structure
+                                    NULLHANDLE,     // icon handle
+                                    4,              // number of buttons
+                                    MB_ICONHAND,    // icon style
+                                    NULLHANDLE,     // reserved
+                                    { {"continue ~search",    100, BS_PUSHBUTTON | BS_TEXT | BS_AUTOSIZE},
+                                      {"continue ~execution", 101, BS_PUSHBUTTON | BS_TEXT | BS_AUTOSIZE},
+                                      {"execute ~handler",    102, BS_PUSHBUTTON | BS_TEXT | BS_AUTOSIZE | BS_DEFAULT},
+                                      {"~terminate process",  103, BS_PUSHBUTTON | BS_TEXT | BS_AUTOSIZE} }
+                                  };
+
   dprintf(("KERNEL32: UnhandledExceptionFilter\n"));
 
@@ -326 +352 @@
           lpexpExceptionInfo->ExceptionRecord->ExceptionCode,
           lpexpExceptionInfo->ExceptionRecord->ExceptionAddress);
-
-  WinMessageBox(HWND_DESKTOP,
-                HWND_DESKTOP,
-                message,
-                "Oh, nooo!",
-                0,
-                MB_OK);
-
-  return WINEXCEPTION_EXECUTE_HANDLER;
+/*
+  rc = WinMessageBox2(HWND_DESKTOP,
+                     HWND_DESKTOP,
+                     message,
+                     "Oh, nooo!",
+                     0,
+                     (PMB2INFO)&mb2InfoExceptionBox);
+   switch (rc)
+   {
+     case 100:
+       return WINEXCEPTION_CONTINUE_SEARCH;
+
+     case 101:
+       return WINEXCEPTION_CONTINUE_EXECUTION;
+
+     case 102:
+       return WINEXCEPTION_EXECUTE_HANDLER;
+
+     case 103:
+       KillWin32Process();
+       // fall-through
+
+     default:
+       return WINEXCEPTION_EXECUTE_HANDLER;
+   }
+*/
+  rc = WinMessageBox(HWND_DESKTOP,
+                     HWND_DESKTOP,
+                     message,
+                     "Oh, nooo!",
+                     0,
+                     MB_ABORTRETRYIGNORE | MB_ERROR);
+   switch (rc)
+   {
+     case MBID_IGNORE:
+       return WINEXCEPTION_CONTINUE_EXECUTION;
+
+     case MBID_ABORT:
+       KillWin32Process();
+       // fall-through
+
+     case MBID_RETRY:
+     default:
+       return WINEXCEPTION_EXECUTE_HANDLER;
+   }
 }