Changeset 3615 for trunk/src/kernel32

Timestamp:

May 27, 2000, 1:30:36 PM (25 years ago)

Author:

sandervl

Message:

Don't call entrypoint of exe loaded as dll

Location:

trunk/src/kernel32

Files:

• windllpeldr.cpp (modified) (2 diffs)
• wintls.cpp (modified) (5 diffs)

trunk/src/kernel32/windllpeldr.cpp

@@ -1 @@
-/* $Id: windllpeldr.cpp,v 1.6 2000-02-17 14:08:51 sandervl Exp $ */
+/* $Id: windllpeldr.cpp,v 1.7 2000-05-27 11:30:35 sandervl Exp $ */
 
 /*
@@ -80 +80 @@
   fRet = Win32PeLdrImage::init(0);
   dllEntryPoint = (WIN32DLLENTRY)entryPoint;
+
+  if(!(fh.Characteristics & IMAGE_FILE_DLL)) {
+        //executable loaded as dll; don't call entrypoint
+        dprintf(("WARNING: Exe %s loaded as dll; entrypoint not called", szFileName));
+        dllEntryPoint = NULL;
+  }
   return fRet;
 }

trunk/src/kernel32/wintls.cpp

@@ -1 @@
-/* $Id: wintls.cpp,v 1.9 2000-02-16 14:22:13 sandervl Exp $ */
+/* $Id: wintls.cpp,v 1.10 2000-05-27 11:30:36 sandervl Exp $ */
 /*
  * Win32 TLS API functions
@@ -136 +136 @@
 DWORD WIN32API TlsAlloc()
 {
-  dprintf(("KERNEL32:  TlsAlloc\n"));
-  return(O32_TlsAlloc());
+ DWORD index;
+
+  index = O32_TlsAlloc();
+  dprintf(("KERNEL32: TlsAlloc returned %d", index));
+  return index;
 }
 //******************************************************************************
@@ -143 +146 @@
 BOOL WIN32API TlsFree(DWORD index)
 {
-  dprintf(("KERNEL32:  TlsFree\n"));
+  dprintf(("KERNEL32: TlsFree %d", index));
   return(O32_TlsFree(index));
 }
@@ -153 +156 @@
 
   rc = O32_TlsGetValue(index);
-//  dprintf(("KERNEL32:  TlsGetValue %d returned %X\n", index, rc));
+  dprintf2(("KERNEL32:  TlsGetValue %d returned %X\n", index, rc));
   return(rc);
 }
@@ -160 +163 @@
 BOOL WIN32API TlsSetValue(DWORD index, LPVOID val)
 {
-//  dprintf(("KERNEL32:  TlsSetValue\n"));
+  dprintf2(("KERNEL32:  TlsSetValue\n"));
   return(O32_TlsSetValue(index, val));
 }