Changeset 10397 for trunk/src/kernel32/windlllx.cpp

Timestamp:

Jan 15, 2004, 11:39:15 AM (22 years ago)

Author:

sandervl

Message:

Loader updates

File:

• trunk/src/kernel32/windlllx.cpp (modified) (6 diffs)

trunk/src/kernel32/windlllx.cpp

@@ -1 @@
-/* $Id: windlllx.cpp,v 1.28 2003-10-28 10:42:40 sandervl Exp $ */
+/* $Id: windlllx.cpp,v 1.29 2004-01-15 10:39:07 sandervl Exp $ */
 
 /*
@@ -5 +5 @@
  *
  * Copyright 1999-2000 Sander van Leeuwen (sandervl@xs4all.nl)
+ * Copyright 2003 Innotek Systemberatung GmbH (sandervl@innotek.de)
  *
  * TODO: Unloading of dlls probably needs to be fixed due to OS/2 bug
@@ -45 +46 @@
 *******************************************************************************/
 char *lpszCustomDllName      = NULL;
-char *lpszCustomExportPrefix = NULL;
-ULONG dwOrdinalBase          = 0;
+PIMAGE_FILE_HEADER lpCustomDllPEHdr = NULL;
 
 /**
@@ -57 +57 @@
 //******************************************************************************
 //******************************************************************************
-void WIN32API SetCustomBuildName(char *lpszName, PIMAGE_FILE_HEADER  pfh)
-
+void WIN32API SetCustomBuildName(char *lpszName, PIMAGE_FILE_HEADER pfh)
 {
     lpszCustomDllName      = lpszName;
+    lpCustomDllPEHdr       = pfh;
 }
 //******************************************************************************
@@ -101 +101 @@
        }
    }
+   else {
+       //make sure this dll hasn't already been loaded
+       if(Win32DllBase::findModule(lpszCustomDllName) != NULL) {
+           dprintf(("ERROR: RegisterLxDll: module %s already loaded!!", lpszCustomDllName));
+           DebugInt3();
+           return 0;
+       }
+   }
    windll = new Win32LxDll(hInstance, EntryPoint, pResData, MajorImageVersion,
                            MinorImageVersion, Subsystem);
@@ -109 +117 @@
    //clear name override in case dll init loads another dll
    lpszCustomDllName = NULL;
+   lpCustomDllPEHdr  = NULL;
 
    if(!fPeLoader) {