Changeset 1137

Timestamp:

Oct 5, 1999, 4:28:52 PM (26 years ago)

Author:

sandervl

Message:

* empty log message *

Location:

trunk

Files:

• changelog (modified) (1 diff)
• src/Odin32API/odinexe.cpp (modified) (3 diffs)
• src/kernel32/exceptions.cpp (modified) (2 diffs)

trunk/changelog

@@ -1 @@
- /* $Id: changelog,v 1.270 1999-10-04 22:48:05 phaller Exp $ */
+ /* $Id: changelog,v 1.271 1999-10-05 14:28:06 sandervl Exp $ */
+
+ 99-10-05: Sander van Leeuwen <sandervl@xs4all.nl>
+        - KERNEL32: Set fs:0 to -1 in OS2UnsetExceptionHandler. 
+                    Prevents crash due to corrupted handler chain (see
+                    comments in that function)
+        - ODIN32API: Remove exception handler set & unset. Not necessary
+                     as it's also done in the start method of an exe image.
 
  99-10-04: Patrick Haller <phaller@gmx.net>

trunk/src/Odin32API/odinexe.cpp

@@ -1 @@
-/* $Id: odinexe.cpp,v 1.2 1999-09-18 17:46:47 sandervl Exp $ */
+/* $Id: odinexe.cpp,v 1.3 1999-10-05 14:28:52 sandervl Exp $ */
 /*
  * Win32 Odin32 Application executable entrypoint
@@ -12 +12 @@
 #include <win32type.h>
 #include <odinlx.h>
-#include <exceptions.h>
 
 //Win32 app entrypoint:
@@ -28 +27 @@
 int main(int argc, char *argv[])
 {
- WINEXCEPTION_FRAME exceptFrame;
-
-  OS2SetExceptionHandler(&exceptFrame);
   RegisterLxExe(WinMain, (PVOID)&_Resource_PEResTab);
-  OS2UnsetExceptionHandler(&exceptFrame);
 }
 //******************************************************************************

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.19 1999-09-02 20:56:48 phaller Exp $ */
+/* $Id: exceptions.cpp,v 1.20 1999-10-05 14:28:33 sandervl Exp $ */
 
 /*
@@ -1000 +1000 @@
 void OS2UnsetExceptionHandler(void *exceptframe)
 {
-  DosUnsetExceptionHandler((PEXCEPTIONREGISTRATIONRECORD)exceptframe);
+  SetExceptionChain(-1);
+  //TODO: Somebody messes up the exception handler chaing when executing
+  //      the LX version of generic, opening the About dialogbox and quitting
+//  DosUnsetExceptionHandler((PEXCEPTIONREGISTRATIONRECORD)exceptframe);
 }