Changeset 730 for trunk/src/kernel32

Timestamp:

Aug 28, 1999, 9:33:44 PM (26 years ago)

Author:

sandervl

Message:

Exception handler fixes

Location:

trunk/src/kernel32

Files:

• KERNEL32.DEF (modified) (2 diffs)
• exceptions.cpp (modified) (4 diffs)
• kernel32exp.def (modified) (2 diffs)
• vmutex.cpp (modified) (2 diffs)

trunk/src/kernel32/KERNEL32.DEF

@@ -1 @@
-; $Id: KERNEL32.DEF,v 1.31 1999-08-27 16:51:00 sandervl Exp $
+; $Id: KERNEL32.DEF,v 1.32 1999-08-28 19:33:44 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -952 +952 @@
    enter__6VMutexFUl                                              @1204
    leave__6VMutexFv                                               @1205
-   __ct__6VMutexFv                                                @1206
+   __ct__6VMutexFi                                                @1206
    __dt__6VMutexFv                                                @1207
 ;Used by tibfix page in dll (change ordinal in lx.cpp too!!)

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.17 1999-08-27 16:50:59 sandervl Exp $ */
+/* $Id: exceptions.cpp,v 1.18 1999-08-28 19:33:44 sandervl Exp $ */
 
 /*
@@ -891 +891 @@
   case XCPT_PROCESS_TERMINATE:
   case XCPT_ASYNC_PROCESS_TERMINATE:
-        SetExceptionChain((ULONG)0);
+        SetExceptionChain((ULONG)-1);
         return (XCPT_CONTINUE_SEARCH);
 
@@ -941 +941 @@
   case XCPT_UNABLE_TO_GROW_STACK:
   case XCPT_IN_PAGE_ERROR:
-  case XCPT_SIGNAL:
+CrashAndBurn:
         dprintf(("KERNEL32: OS2ExceptionHandler: Continue and kill\n"));
         pCtxRec->ctx_RegEip = (ULONG)KillWin32Process;
@@ -948 +948 @@
         pCtxRec->ctx_RegEbx = pCtxRec->ctx_RegEip;
         return (XCPT_CONTINUE_EXECUTION);
+
+  case XCPT_SIGNAL:
+      if(pERepRec->ExceptionInfo[0] == XCPT_SIGNAL_KILLPROC)          /* resolve signal information */
+      {
+        SetExceptionChain((ULONG)-1);
+        return (XCPT_CONTINUE_SEARCH);
+      }
+      goto CrashAndBurn;
 
   default: //non-continuable exceptions

trunk/src/kernel32/kernel32exp.def

@@ -1 @@
-; $Id: kernel32exp.def,v 1.16 1999-08-25 14:27:06 sandervl Exp $
+; $Id: kernel32exp.def,v 1.17 1999-08-28 19:33:44 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -815 +815 @@
 enter__6VMutexFUl                                               @1204
 leave__6VMutexFv                                                @1205
-__ct__6VMutexFv                                                 @1206
+__ct__6VMutexFi                                                 @1206
 __dt__6VMutexFv                                                 @1207
 ;;;_DLLExitList@4                 @1208

trunk/src/kernel32/vmutex.cpp

@@ -1 @@
-/* $Id: vmutex.cpp,v 1.5 1999-08-24 12:23:25 sandervl Exp $ */
+/* $Id: vmutex.cpp,v 1.6 1999-08-28 19:33:44 sandervl Exp $ */
 
 /*
@@ -18 +18 @@
 /******************************************************************************/
 /******************************************************************************/
-VMutex::VMutex() : waiting(0)
+VMutex::VMutex(int fShared) : waiting(0)
 {
  APIRET rc;
 
-  rc = DosCreateMutexSem(NULL, &sem_handle, 0, FALSE);
+  rc = DosCreateMutexSem(NULL, &sem_handle, (fShared) ? DC_SEM_SHARED : 0, FALSE);
   if(rc != 0) {
     dprintf(("Error creating mutex %X\n", rc));