Changeset 6412 for trunk/src/kernel32/winimagebase.cpp

Timestamp:

Jul 30, 2001, 2:02:45 PM (24 years ago)

Author:

sandervl

Message:

custom build fixes

File:

• trunk/src/kernel32/winimagebase.cpp (modified) (4 diffs)

trunk/src/kernel32/winimagebase.cpp

@@ -1 @@
-/* $Id: winimagebase.cpp,v 1.32 2001-06-10 22:32:17 sandervl Exp $ */
+/* $Id: winimagebase.cpp,v 1.33 2001-07-30 12:01:25 sandervl Exp $ */
 
 /*
@@ -30 +30 @@
 #include <windllbase.h>
 #include <winexebase.h>
+#include <windlllx.h>
 #include <pefile.h>
 #include <unicode.h>
@@ -50 +51 @@
     ulRVAResourceSection(0)
 {
+  char *name;
+
   magic = MAGIC_WINIMAGE;
 
@@ -55 +58 @@
     this->hinstance = hInstance;
 
-    char *name = OSLibGetDllName(hinstance);
+    if(lpszCustomDllName) {
+         name = lpszCustomDllName;
+    }
+    else name = OSLibGetDllName(hinstance);
+
     strcpy(szFileName, name);
     strupr(szFileName);
 
-    //rename dll (os/2 -> win32) if necessary (i.e. OLE32OS2 -> OLE32)
-    Win32DllBase::renameDll(szFileName, FALSE);
-
-    name = strrchr(szFileName, '\\')+1;
-    strcpy(szModule, name);
+    if(lpszCustomDllName) {
+        strcpy(szModule, name);
+    }
+    else {
+        //rename dll (os/2 -> win32) if necessary (i.e. OLE32OS2 -> OLE32)
+        Win32DllBase::renameDll(szFileName, FALSE);
+        name = strrchr(szFileName, '\\')+1;
+        strcpy(szModule, name);
+    }
   }
   else {