Changeset 8462 for trunk/src/kernel32

Timestamp:

May 21, 2002, 4:42:40 PM (23 years ago)

Author:

sandervl

Message:

fix for lx dll unload fix

Location:

trunk/src/kernel32

Files:

• thread.cpp (modified) (2 diffs)
• windlllx.cpp (modified) (3 diffs)
• windlllx.h (modified) (2 diffs)

trunk/src/kernel32/thread.cpp

@@ -1 @@
-/* $Id: thread.cpp,v 1.43 2002-02-26 11:11:17 sandervl Exp $ */
+/* $Id: thread.cpp,v 1.44 2002-05-21 14:42:40 sandervl Exp $ */
 
 /*
@@ -302 +302 @@
   winteb->o.odin.hmq = OSLibWinQueryMsgQueue(winteb->o.odin.hab);
   dprintf(("Win32ThreadProc: hab %x hmq %x", winteb->o.odin.hab, winteb->o.odin.hmq));
+#ifdef DEBUG
+  TEB *teb = GetThreadTEB();
+  dprintf(("Stack top 0x%x, stack end 0x%x", teb->stack_top, teb->stack_low));
+#endif
 
   //Note: The Win32 exception structure referenced by FS:[0] is the same

trunk/src/kernel32/windlllx.cpp

@@ -1 @@
-/* $Id: windlllx.cpp,v 1.24 2002-05-20 14:22:37 sandervl Exp $ */
+/* $Id: windlllx.cpp,v 1.25 2002-05-21 14:42:40 sandervl Exp $ */
 
 /*
@@ -145 +145 @@
        offset += modsize + 1;
    }
+#ifdef HACK_NEVER_UNLOAD_LX_DLLS
+   //HACK ALERT!!
+   //This makes sure the LX dll never gets unloaded.
+   //Necessary since unloading doesn't work due to dependencies on dlls
+   //with exitlist handlers.
+   windll->AddRef();
+#endif
    return windll->getInstanceHandle();
 
@@ -195 +202 @@
                                      Subsystem);
   dprintf(("Fake PE header %x for dll %s", hinstance, getModuleName()));
-
-  //HACK ALERT!!
-  //This makes sure the LX dll never gets unloaded.
-  //Necessary since unloading doesn't work due to dependencies on dlls
-  //with exitlist handlers.
-  referenced++;
 }
 //******************************************************************************

trunk/src/kernel32/windlllx.h

@@ -1 @@
-/* $Id: windlllx.h,v 1.6 2001-08-06 19:36:42 sandervl Exp $ */
+/* $Id: windlllx.h,v 1.7 2002-05-21 14:42:40 sandervl Exp $ */
 
 /*
@@ -15 +15 @@
 #include <windllbase.h>
 #include <winimagelx.h>
+
+#define HACK_NEVER_UNLOAD_LX_DLLS
 
 class Win32LxDll : public Win32LxImage, public Win32DllBase