Changeset 3704 for trunk/src

Timestamp:

Jun 14, 2000, 4:28:43 AM (25 years ago)

Author:

phaller

Message:

Fix: StarCraft STORM.DLL requires reserved DllEntryPoint parameter

Location:

trunk/src/kernel32

Files:

• heapshared.cpp (modified) (2 diffs)
• windllbase.cpp (modified) (5 diffs)
• windllbase.h (modified) (3 diffs)

trunk/src/kernel32/heapshared.cpp

@@ -1 @@
-/* $Id: heapshared.cpp,v 1.5 2000-03-10 16:11:58 sandervl Exp $ */
+/* $Id: heapshared.cpp,v 1.6 2000-06-14 02:27:33 phaller Exp $ */
 /*
  * Shared heap functions for OS/2
@@ -134 +134 @@
 
   /* round the size up to a multiple of 4K */
-  *size = (*size / 4096) * 4096 + 4096;
+  // *size = (*size / 4096) * 4096 + 4096;
+  // @@@PH speed improvement
+  *size = (*size + 4096) & 0xFFFFF000;
   *size = max(*size, INCR_HEAPSIZE);
 

trunk/src/kernel32/windllbase.cpp

@@ -1 @@
-/* $Id: windllbase.cpp,v 1.13 2000-05-02 20:53:14 sandervl Exp $ */
+/* $Id: windllbase.cpp,v 1.14 2000-06-14 02:27:33 phaller Exp $ */
 
 /*
@@ -421 +421 @@
 
   dprintf(("attachProcess to dll %s", szModule));
-
-  rc = dllEntryPoint(hinstance, DLL_PROCESS_ATTACH, 0);
+  
+  // @@@PH 2000/06/13 lpvReserved, Starcraft STORM.DLL
+  // if DLL_PROCESS_ATTACH, lpvReserved is NULL for dynamic loads
+  //   and non-NULL for static loads.
+  // same goes for process termination
+  LPVOID lpvReserved;
+  
+  if (isDynamicLib())
+    lpvReserved = NULL;
+  else
+    lpvReserved = (LPVOID)0xdeadface; // some arbitrary value
+  
+  rc = dllEntryPoint(hinstance, DLL_PROCESS_ATTACH, lpvReserved);
 
   dprintf(("attachProcess to dll %s DONE", szModule));
@@ -461 +472 @@
   fUnloaded = TRUE;
   sel = SetWin32TIB();
-  rc = dllEntryPoint(hinstance, DLL_PROCESS_DETACH, 0);
+  
+  // @@@PH 2000/06/13 lpvReserved, Starcraft STORM.DLL
+  // if DLL_PROCESS_ATTACH, lpvReserved is NULL for dynamic loads
+  //   and non-NULL for static loads.
+  // same goes for process termination
+  LPVOID lpvReserved;
+  
+  if (isDynamicLib())
+    lpvReserved = NULL;
+  else
+    lpvReserved = (LPVOID)0xdeadface; // some arbitrary value
+  
+  rc = dllEntryPoint(hinstance, DLL_PROCESS_DETACH, lpvReserved);
+  
   SetFS(sel);
   tlsDetachThread();    //destroy TLS (main thread)
@@ -481 +505 @@
 
   dprintf(("attachThread to dll %s", szModule));
-
+  
   rc = dllEntryPoint(hinstance, DLL_THREAD_ATTACH, 0);
 
@@ -499 +523 @@
 
   dprintf(("detachThread from dll %s", szModule));
-
+  
   rc =  dllEntryPoint(hinstance, DLL_THREAD_DETACH, 0);
   return rc;

trunk/src/kernel32/windllbase.h

@@ -1 @@
-/* $Id: windllbase.h,v 1.2 2000-05-02 20:53:14 sandervl Exp $ */
+/* $Id: windllbase.h,v 1.3 2000-06-14 02:27:33 phaller Exp $ */
 
 /*
@@ -80 +80 @@
         void      decDynamicLib();
         BOOL      isDynamicLib()   { return nrDynamicLibRef != 0; };
-
+  
         void      setUnloadOrder(Win32ImageBase *parent);
 
@@ -141 +141 @@
         BOOL          fLoadLibrary;
         BOOL          fDisableUnload;
-
+  
 private:
 static  Queue         loadLibDlls;