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

Timestamp:

Oct 18, 2000, 7:09:34 PM (25 years ago)

Author:

sandervl

Message:

LoadLibraryExA + memory map close fix, added new registry keys for installation, don't log guard page violation

File:

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

trunk/src/kernel32/misc.cpp

@@ -1 @@
-/* $Id: misc.cpp,v 1.26 2000-10-05 13:48:09 sandervl Exp $ */
+/* $Id: misc.cpp,v 1.27 2000-10-18 17:09:33 sandervl Exp $ */
 
 /*
@@ -29 +29 @@
 #include "initterm.h"
 #include "logging.h"
+#include "exceptutil.h"
 #include <wprocess.h>
 #include <versionos2.h>
@@ -251 +252 @@
 #if defined(DEBUG) && defined(CHECK_ODINHEAP)
 int checkOdinHeap = 1;
-#define ODIN_HEAPCHECK()        if(checkOdinHeap)       _heap_check();
+#define ODIN_HEAPCHECK()    if(checkOdinHeap)   _heap_check();
 #else
 #define ODIN_HEAPCHECK()
@@ -272 +273 @@
     if(!getenv("NOWIN32LOG")) {
 #endif
-        char logname[CCHMAXPATH];
-
-        sprintf(logname, "odin32_%d.log", loadNr);
-        flog = fopen(logname, "w");
-        if(flog == NULL) {//probably running exe on readonly device
-                sprintf(logname, "%sodin32_%d.log", kernel32Path, loadNr);
-                flog = fopen(logname, "w");
-        }
+        char logname[CCHMAXPATH];
+
+        sprintf(logname, "odin32_%d.log", loadNr);
+        flog = fopen(logname, "w");
+        if(flog == NULL) {//probably running exe on readonly device
+            sprintf(logname, "%sodin32_%d.log", kernel32Path, loadNr);
+            flog = fopen(logname, "w");
+        }
         oldcrtmsghandle = _set_crt_msg_handle(fileno(flog));
     }
@@ -291 +292 @@
 
     va_start(argptr, tekst);
-    if(thdb) { 
-        thdb->logfile = (DWORD)flog;
+    if(thdb) {
+    thdb->logfile = (DWORD)flog;
         if(sel == 0x150b && !fIsOS2Image) {
-                fprintf(flog, "t%d: (FS=150B) ", thdb->threadId);
-        }
-        else    fprintf(flog, "t%d: ", thdb->threadId);
+        fprintf(flog, "t%d: (FS=150B) ", thdb->threadId);
+    }
+    else    fprintf(flog, "t%d: ", thdb->threadId);
     }
     vfprintf(flog, tekst, argptr);
@@ -326 +327 @@
     if(!getenv("NOWIN32LOG")) {
 #endif
-        char logname[CCHMAXPATH];
-
-        sprintf(logname, "odin32_%d.log", loadNr);
-        flog = fopen(logname, "w");
-        if(flog == NULL) {//probably running exe on readonly device
-                sprintf(logname, "%sodin32_%d.log", kernel32Path, loadNr);
-                flog = fopen(logname, "w");
-        }
+        char logname[CCHMAXPATH];
+
+        sprintf(logname, "odin32_%d.log", loadNr);
+        flog = fopen(logname, "w");
+        if(flog == NULL) {//probably running exe on readonly device
+            sprintf(logname, "%sodin32_%d.log", kernel32Path, loadNr);
+            flog = fopen(logname, "w");
+        }
     }
     else
@@ -344 +345 @@
 
     va_start(argptr, tekst);
-    if(thdb) { 
-        thdb->logfile = (DWORD)flog;
+    if(thdb) {
+        thdb->logfile = (DWORD)flog;
     }
     vfprintf(flog, tekst, argptr);
@@ -378 +379 @@
 
     va_start(argptr, tekst);
+    if(thdb) {
+        thdb->logfile = (DWORD)flog;
+    }
     vfprintf((FILE *)logfile, tekst, argptr);
     if(thdb) thdb->logfile = 0;
@@ -390 +394 @@
 }
 //******************************************************************************
-//Check if the exception occurred inside a fprintf (logging THDB member set)
-//If true, decrease the lock count for that file stream 
-//NOTE: HACK: DEPENDS ON COMPILER VERSION!!!!
-//******************************************************************************
-void CheckLogException()
+//WriteLog has to take special care to handle dprintfs inside our os/2 exception
+//handler; if an exception occurs inside a dprintf, using dprintf in the exception
+//handler will hang the process
+//******************************************************************************
+void LogException(int state)
 {
   THDB *thdb = GetThreadTHDB();
@@ -402 +406 @@
 
   if(thdb->logfile) {
-        //oops, exception in vfprintf; let's clear the lock count
+    if(state == ENTER_EXCEPTION) {
 #if (__IBMCPP__ == 300) || (__IBMC__ == 300)
-        lock = (USHORT *)(thdb->logfile+0x1C);
+        lock = (USHORT *)(thdb->logfile+0x1C);
 #else
 #error Check the offset of the lock count word in the file stream structure for this compiler revision!!!!!
 #endif
-        (*lock)--;
+        (*lock)--;
+    }
+    else { //LEAVE_EXCEPTION
+#if (__IBMCPP__ == 300) || (__IBMC__ == 300)
+        lock = (USHORT *)(thdb->logfile+0x1C);
+#else
+#error Check the offset of the lock count word in the file stream structure for this compiler revision!!!!!
+#endif
+        (*lock)++;
+    }
+  }
+}
+//******************************************************************************
+//Check if the exception occurred inside a fprintf (logging THDB member set)
+//If true, decrease the lock count for that file stream
+//NOTE: HACK: DEPENDS ON COMPILER VERSION!!!!
+//******************************************************************************
+void CheckLogException()
+{
+  THDB *thdb = GetThreadTHDB();
+  USHORT *lock;
+
+  if(!thdb) return;
+
+  if(thdb->logfile) {
+    //oops, exception in vfprintf; let's clear the lock count
+#if (__IBMCPP__ == 300) || (__IBMC__ == 300)
+    lock = (USHORT *)(thdb->logfile+0x1C);
+#else
+#error Check the offset of the lock count word in the file stream structure for this compiler revision!!!!!
+#endif
+    (*lock)--;
   }
 }
@@ -418 +453 @@
 {
   if(oldcrtmsghandle)
-        _set_crt_msg_handle(oldcrtmsghandle);
+    _set_crt_msg_handle(oldcrtmsghandle);
 
   fclose(flog);
@@ -433 +468 @@
     if(!getenv("NOWIN32LOG")) {
 #endif
-        OpenPrivateLogFilePE();
+    OpenPrivateLogFilePE();
     }
 }
@@ -446 +481 @@
     if(!getenv("NOWIN32LOG")) {
 #endif
-        ClosePrivateLogFilePE();
+        ClosePrivateLogFilePE();
     }
 }