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

Timestamp:

Jun 7, 1999, 10:58:22 PM (26 years ago)

Author:

sandervl

Message:

* empty log message *

File:

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

trunk/src/kernel32/resource.cpp

@@ -1 @@
-/* $Id: resource.cpp,v 1.4 1999-06-06 12:25:49 cbratschi Exp $ */
-
 /*
  *
@@ -14 +12 @@
  */
 #include <os2win.h>
-#include "misc.h"
-
 #include "unicode.h"
 #include "winres.h"
 #include "winimage.h"
 #include "winexe.h"
-
 
 //******************************************************************************
@@ -31 +26 @@
 
     dprintf(("FindResourceA %X", 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(hModule == 0 || hModule == -1 || (WinExe != NULL && hModule ==
+       WinExe->getOS2InstanceHandle()))
+    {
+         module = (Win32Image *)WinExe;
+    }
+    else module = (Win32Image *)Win32Dll::findModule(hModule);
 
     if(module == NULL)
-    return(NULL);
+        return(NULL);
 
     return module->findResourceA(lpszName, (LPSTR)lpszType);
@@ -45 +41 @@
 //******************************************************************************
 HRSRC WIN32API FindResourceW(HINSTANCE hModule, LPCWSTR lpszName,
-                             LPCWSTR lpszType)
+                             LPCWSTR lpszType)
 {
  Win32Image *module;
 
     dprintf(("FindResourceW %X", hModule));
-    if(hModule == 0 || hModule == -1)
+    if(hModule == 0 || hModule == -1 || (WinExe != NULL && hModule ==
+       WinExe->getOS2InstanceHandle()))
+    {
          module = (Win32Image *)WinExe;
+    }
     else module = (Win32Image *)Win32Dll::findModule(hModule);
 
     if(module == NULL)
-        return(NULL);
+        return(NULL);
 
     return module->findResourceW((LPWSTR)lpszName, (LPWSTR)lpszType);