Changeset 617 for trunk/src/kernel32/winexe.cpp

Timestamp:

Aug 22, 1999, 1:11:11 PM (26 years ago)

Author:

sandervl

Message:

Exception handler changes

File:

• trunk/src/kernel32/winexe.cpp (modified) (6 diffs)

trunk/src/kernel32/winexe.cpp

@@ -1 @@
-/* $Id: winexe.cpp,v 1.9 1999-08-16 13:54:32 sandervl Exp $ */
+/* $Id: winexe.cpp,v 1.10 1999-08-22 11:11:11 sandervl Exp $ */
 
 /*
@@ -27 +27 @@
 #include <wprocess.h>
 #include <pefile.h>
+#include "exceptions.h"
+#include "exceptutil.h"
 #include "cio.h"
 
@@ -44 +46 @@
 //******************************************************************************
 Win32Exe::Win32Exe(char *szFileName) : Win32Image(szFileName), fConsoleApp(FALSE),
-                   cmdline(NULL), OS2InstanceHandle(-1)
+                   cmdline(NULL)
 {
   fConsoleApp = (oh.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI);
@@ -63 +65 @@
 Win32Exe::Win32Exe(HINSTANCE hinstance, int NameTableId, int Win32TableId) :
          Win32Image(hinstance, NameTableId, Win32TableId),
-         fConsoleApp(FALSE), cmdline(NULL), OS2InstanceHandle(-1)
+         fConsoleApp(FALSE), cmdline(NULL)
 {
   if(GET_CONSOLE(Win32TableId) == 1) {//console app
@@ -86 +88 @@
 ULONG Win32Exe::start()
 {
+ WINEXCEPTION_FRAME exceptFrame;
  ULONG rc;
 
@@ -99 +102 @@
   tlsAttachThread();    //setup TLS (main thread)
 
+  //Note: The Win32 exception structure references by FS:[0] is the same
+  //      in OS/2
+  OS2SetExceptionHandler((void *)&exceptFrame);
+
   SetWin32TIB();
   rc = ((WIN32EXEENTRY)entryPoint)();
   RestoreOS2TIB();
+
+  OS2UnsetExceptionHandler((void *)&exceptFrame);
+
   return rc;
 }