Changeset 37 for trunk/src/kernel32/resource.cpp

Timestamp:

Jun 6, 1999, 2:25:49 PM (26 years ago)

Author:

cbratschi

Message:

hiho

File:

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

trunk/src/kernel32/resource.cpp

@@ -1 @@
-/* $Id: resource.cpp,v 1.3 1999-06-01 15:47:38 phaller Exp $ */
+/* $Id: resource.cpp,v 1.4 1999-06-06 12:25:49 cbratschi Exp $ */
 
 /*
@@ -31 +31 @@
 
     dprintf(("FindResourceA %X", hModule));
-    if(hModule == 0 || hModule == -1)
-        module = (Win32Image *)WinExe;
-    else    module = (Win32Image *)Win32Dll::findModule(hModule);
+    // EB: ->>> added real exe module handle
+    if(hModule == 0 || hModule == -1 || (WinExe != NULL && hModule == WinExe->getOS2InstanceHandle()))
+      module = (Win32Image *)WinExe;
+    else
+      module = (Win32Image *)Win32Dll::findModule(hModule);
 
     if(module == NULL)
@@ -43 +45 @@
 //******************************************************************************
 HRSRC WIN32API FindResourceW(HINSTANCE hModule, LPCWSTR lpszName,
-                             LPCWSTR lpszType)
+                             LPCWSTR lpszType)
 {
  Win32Image *module;
@@ -53 +55 @@
 
     if(module == NULL)
-        return(NULL);
+        return(NULL);
 
     return module->findResourceW((LPWSTR)lpszName, (LPWSTR)lpszType);