Changeset 4264 for trunk/src

Timestamp:

Sep 15, 2000, 3:24:29 PM (25 years ago)

Author:

sandervl

Message:

exception handler fix + WriteLogNoEOL export added

Location:

trunk/src/kernel32

Files:

• Fileio.cpp (modified) (2 diffs)
• KERNEL32.DEF (modified) (2 diffs)
• async.cpp (modified) (3 diffs)
• exceptions.cpp (modified) (3 diffs)

trunk/src/kernel32/Fileio.cpp

@@ -1 @@
-/* $Id: Fileio.cpp,v 1.38 2000-09-10 21:54:05 sandervl Exp $ */
+/* $Id: Fileio.cpp,v 1.39 2000-09-15 13:24:28 sandervl Exp $ */
 
 /*
@@ -410 +410 @@
  BOOL rc;
 
-#if 1
+#if 0
   dprintf(("DeleteFileA %s", lpszFile));
   return 1;

trunk/src/kernel32/KERNEL32.DEF

@@ -1 @@
-; $Id: KERNEL32.DEF,v 1.85 2000-08-11 10:56:16 sandervl Exp $
+; $Id: KERNEL32.DEF,v 1.86 2000-09-15 13:24:29 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -1024 +1024 @@
     WriteLog                                                      @1202
     WriteLogError                                                 @1214
+    WriteLogNoEOL                                                 @1218
     WritePrivateLog                                               @1208
     DecreaseLogCount                                              @1273

trunk/src/kernel32/async.cpp

@@ -1 @@
-/* $Id: async.cpp,v 1.8 2000-06-01 11:28:44 sandervl Exp $ */
+/* $Id: async.cpp,v 1.9 2000-09-15 13:24:29 sandervl Exp $ */
 
 /*
@@ -11 +11 @@
  *
  */
-
-#ifndef _ASYNCIOSUBSYSTEM_H_
-#define _ASYNCIOSUBSYSTEM_H_
 
 
@@ -114 +111 @@
 }
 
-#endif /* _ASYNCIOSUBSYSTEM_H_ */

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.44 2000-09-09 08:59:54 sandervl Exp $ */
+/* $Id: exceptions.cpp,v 1.45 2000-09-15 13:24:29 sandervl Exp $ */
 
 /* WARNING: Compiling this module with ICC with optimizations turned on   */
@@ -1053 +1053 @@
                                    PVOID                        p)
 {
-  //MN: If EH_NESTED_CALL is set, an exception occurred during the execution
-  //    of this exception handler. We better bail out ASAP or we'll likely
-  //    recurse infinitely until we run out of stack space!!
-  if (pERepRec->fHandlerFlags & EH_NESTED_CALL)
-      return XCPT_CONTINUE_SEARCH;
-
   //SvL: Check if exception inside debug fprintf -> if so, clear lock so
   //     next dprintf won't wait forever
@@ -1175 +1169 @@
   case XCPT_IN_PAGE_ERROR:
 CrashAndBurn:
+        //SvL: TODO: this may not always be the right thing to do
+        //MN: If EH_NESTED_CALL is set, an exception occurred during the execution
+        //    of this exception handler. We better bail out ASAP or we'll likely
+        //    recurse infinitely until we run out of stack space!!
+        if (pERepRec->fHandlerFlags & EH_NESTED_CALL)
+                return XCPT_CONTINUE_SEARCH;
+
 #ifdef DEBUG
         dprintfException(pERepRec, pERegRec, pCtxRec, p);