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

Timestamp:

May 28, 2000, 6:45:14 PM (25 years ago)

Author:

sandervl

Message:

resource handling changes

File:

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

trunk/src/kernel32/resource.cpp

@@ -1 @@
-/* $Id: resource.cpp,v 1.15 2000-02-16 14:25:45 sandervl Exp $ */
+/* $Id: resource.cpp,v 1.16 2000-05-28 16:45:12 sandervl Exp $ */
 
 /*
@@ -13 +13 @@
 #include <os2win.h>
 #include <unicode.h>
-#include "winres.h"
 #include <winimagebase.h>
 #include <winexebase.h>
@@ -71 +70 @@
  *****************************************************************************/
 
-HRSRC  WIN32API FindResourceExA( HMODULE hModule, LPCSTR lpType,
-                                    LPCSTR lpName, WORD wLanguage)
+HRSRC WIN32API FindResourceExA( HMODULE hModule, LPCSTR lpType,
+                                LPCSTR lpName, WORD wLanguage)
 {
  Win32ImageBase *module;
@@ -105 +104 @@
  *****************************************************************************/
 
-HRSRC  WIN32API FindResourceExW(HMODULE hModule,
-                                LPCWSTR lpType,
-                                LPCWSTR lpName,
-                                WORD    wLanguage)
+HRSRC WIN32API FindResourceExW(HMODULE hModule,
+                               LPCWSTR lpType,
+                               LPCWSTR lpName,
+                               WORD    wLanguage)
 {
  Win32ImageBase *module;
@@ -117 +116 @@
           return(NULL);
     }
-
     return module->findResourceW((LPWSTR)lpName, (LPWSTR)lpType, wLanguage);
 }
@@ -128 +126 @@
 }
 //******************************************************************************
+//hRes == returned by FindResource(Ex) = PIMAGE_RESOURCE_DATA_ENTRY for resource
+//******************************************************************************
+HGLOBAL WIN32API LoadResource(HINSTANCE hModule, HRSRC hRes)
+{
+  Win32ImageBase *module;
+
+  /* @@@PH */
+  if(HIWORD(hRes) == NULL) {
+        dprintf(("ERROR: LoadResource %x: invalid hRes %x", hModule, hRes));
+        return 0;
+  }
+
+  dprintf(("LoadResource %x %X\n", hModule, hRes));
+  if(hModule == 0 || hModule == -1 || (WinExe && hModule == WinExe->getInstanceHandle())) {
+        module = (Win32ImageBase *)WinExe;
+  }
+  else {
+        module = (Win32ImageBase *)Win32DllBase::findModule(hModule);
+  }
+
+  return (HGLOBAL)module->getResourceAddr(hRes);
+}
+//******************************************************************************
 //hRes == returned by FindResource(Ex)
 //******************************************************************************
-HGLOBAL WIN32API LoadResource(HINSTANCE hModule, HRSRC hRes)
-{
-  Win32Resource *res = (Win32Resource *)hRes;
-
-  dprintf(("LoadResource %x %X\n", hModule, hRes));
-
-  /* @@@PH */
-  if (HIWORD(res) == NULL) {
-   dprintf(("LoadResource %x: invalid hRes %x", hModule, hRes));
-   return 0;
-  }
-  else  return (HGLOBAL)res->lockResource();
-}
-//******************************************************************************
-//hRes == returned by FindResource(Ex)
-//******************************************************************************
 DWORD WIN32API SizeofResource(HINSTANCE hModule, HRSRC hRes)
 {
- Win32Resource *res = (Win32Resource *)hRes;
-
-    dprintf(("OS2SizeofResource\n"));
-    if(res == NULL)
-    return(0);
-
-    return res->getSize();
+ Win32ImageBase *module;
+
+  if(hRes == NULL) {
+        dprintf(("ERROR: SizeofResource %x: invalid hRes %x", hModule, hRes));
+        return(0);
+  }
+
+  dprintf(("SizeofResource %x %x", hModule, hRes));
+
+  if(hModule == 0 || hModule == -1 || (WinExe && hModule == WinExe->getInstanceHandle())) {
+        module = (Win32ImageBase *)WinExe;
+  }
+  else {
+        module = (Win32ImageBase *)Win32DllBase::findModule(hModule);
+  }
+
+  return module->getResourceSize(hRes);
 }
 //******************************************************************************