Changeset 7447 for trunk/src

Timestamp:

Nov 24, 2001, 2:55:57 PM (24 years ago)

Author:

sandervl

Message:

check for double calls to inittermKernel32

Location:

trunk/src/kernel32

Files:

• initkernel32.cpp (modified) (3 diffs)
• initterm.cpp (modified) (3 diffs)
• initterm.h (modified) (2 diffs)

trunk/src/kernel32/initkernel32.cpp

@@ -1 @@
-/* $Id: initkernel32.cpp,v 1.8 2001-11-10 12:47:46 sandervl Exp $
+/* $Id: initkernel32.cpp,v 1.9 2001-11-24 13:55:57 sandervl Exp $
  *
  * KERNEL32 DLL entry point
@@ -72 +72 @@
        char    kernel32Path[CCHMAXPATH] = "";
 static HMODULE dllHandle = 0;
+       BOOL    fInit     = FALSE;
 
 /****************************************************************************/
@@ -93 +94 @@
     /*-------------------------------------------------------------------------*/
 
+    if(fInit == TRUE && ulFlag == 0) {
+        return 1; //already initialized
+    }
+    fInit = TRUE;
+
     switch (ulFlag)
     {

trunk/src/kernel32/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.64 2001-10-15 17:10:54 sandervl Exp $
+/* $Id: initterm.cpp,v 1.65 2001-11-24 13:55:57 sandervl Exp $
  *
  * KERNEL32 DLL entry point
@@ -67 +67 @@
 #pragma data_seg()
 
-static BOOL fInit = FALSE;
-
 /*-------------------------------------------------------------------*/
 /* A clean up routine registered with DosExitList must be used if    */
@@ -100 +98 @@
         return 1; //already initialized
     }
-    fInit = TRUE;
+
     switch (ulFlag)
     {

trunk/src/kernel32/initterm.h

@@ -1 @@
-/* $Id: initterm.h,v 1.7 2001-07-15 15:18:57 sandervl Exp $ */
+/* $Id: initterm.h,v 1.8 2001-11-24 13:55:57 sandervl Exp $ */
 /*
  * KERNEL32 DLL entry point header
@@ -31 +31 @@
 extern int loadNr;
 extern BOOL fVersionWarp3;
+extern BOOL fInit;
 
 /* Tue 03.03.1998: knut */