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

Timestamp:

Jul 5, 2002, 7:59:30 PM (23 years ago)

Author:

sandervl

Message:

minor updates

File:

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

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.63 2002-07-05 15:09:59 sandervl Exp $ */
+/* $Id: exceptions.cpp,v 1.64 2002-07-05 17:59:30 sandervl Exp $ */
 
 /*
@@ -578 +578 @@
         rc = CurrentUnhExceptionFlt(lpexpExceptionInfo);
         if(rc != WINEXCEPTION_CONTINUE_SEARCH)
-        return rc;
-    }
-
+            return rc;
+    }
 
     if (DosQueryModFromEIP(&hmod, &iObj, sizeof(szModName), szModName, &offObj, (ULONG)lpexpExceptionInfo->ExceptionRecord->ExceptionAddress))
@@ -620 +619 @@
 
     case MBID_ABORT:
-       KillWin32Process();
-       // fall-through
-
     case MBID_RETRY:
     default:
@@ -1067 +1063 @@
     if(szExceptionLogFileName[0] == 0) {
         strcpy(szExceptionLogFileName, kernel32Path);
-        strcat(szExceptionLogFileName, "\\exception.log");
+        strcat(szExceptionLogFileName, "\\except.log");
     }
     rc = DosOpen(szExceptionLogFileName,         /* File path name */
@@ -1301 +1297 @@
         else    goto continuesearch; //pass on to OS/2 RTL or app exception handler
 
+        //Log fatal exception here
+        logException();
+
         dprintf(("KERNEL32: OS2ExceptionHandler: Continue and kill\n"));
         
-        //Log fatal exception here
-        logException();
-
         pCtxRec->ctx_RegEip = (ULONG)KillWin32Process;
         pCtxRec->ctx_RegEsp = pCtxRec->ctx_RegEsp + 0x10;