Changeset 8548 for trunk/src/kernel32/misc.cpp

Timestamp:

Jun 2, 2002, 2:42:09 PM (23 years ago)

Author:

sandervl

Message:

LogExcpetion: check lockcount before changing it on entry

File:

• trunk/src/kernel32/misc.cpp (modified) (4 diffs)

trunk/src/kernel32/misc.cpp

@@ -1 @@
-/* $Id: misc.cpp,v 1.46 2002-02-26 17:01:23 sandervl Exp $ */
+/* $Id: misc.cpp,v 1.47 2002-06-02 12:42:09 sandervl Exp $ */
 
 /*
@@ -495 +495 @@
 //handler will hang the process
 //******************************************************************************
-void LogException(int state)
+int LogException(int state, int prevlock)
 {
     TEB *teb = GetThreadTEB();
-
-    if (!teb) return;
+    int  ret = 0;
+
+    if (!teb) return 0;
 
 #if !defined(__EMX__)
@@ -514 +515 @@
 #endif
 #endif
+        ret = (*lock);
         if (state == ENTER_EXCEPTION)
         {
-            (*lock)--;
+            if((*lock) > 0) (*lock)--;
         }
         else
         { //LEAVE_EXCEPTION
-            (*lock)++;
+            if(prevlock) (*lock)++;
         }
     }
@@ -528 +530 @@
 // I wanna have this compile, so we'll address problems later.
 #endif
+    return ret;
 }
 //******************************************************************************