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

Timestamp:

Sep 16, 1999, 1:39:08 AM (26 years ago)

Author:

sandervl

Message:

Rewrite for new win32 image classes

File:

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

trunk/src/kernel32/resource.cpp

@@ -1 @@
-/* $Id: resource.cpp,v 1.8 1999-08-19 19:50:40 sandervl Exp $ */
+/* $Id: resource.cpp,v 1.9 1999-09-15 23:38:01 sandervl Exp $ */
 
 /*
@@ -12 +12 @@
  */
 #include <os2win.h>
-#include "unicode.h"
+#include <unicode.h>
 #include "winres.h"
-#include "winimage.h"
-#include "winexe.h"
+#include <winimagebase.h>
+#include <winexebase.h>
+#include <windllbase.h>
 
 //******************************************************************************
@@ -23 +24 @@
 HRSRC WIN32API FindResourceA(HINSTANCE hModule, LPCSTR lpszName, LPCSTR lpszType)
 {
- Win32Image *module;
+ Win32ImageBase *module;
 
     dprintf(("FindResourceA %X", hModule));
@@ -29 +30 @@
        WinExe->getInstanceHandle()))
     {
-         module = (Win32Image *)WinExe;
+         module = (Win32ImageBase *)WinExe;
     }
-    else module = (Win32Image *)Win32Dll::findModule(hModule);
+    else module = (Win32ImageBase *)Win32DllBase::findModule(hModule);
 
     if(module == NULL)
@@ -43 +44 @@
                              LPCWSTR lpszType)
 {
- Win32Image *module;
+ Win32ImageBase *module;
 
     dprintf(("FindResourceW %X", hModule));
@@ -49 +50 @@
        WinExe->getInstanceHandle()))
     {
-         module = (Win32Image *)WinExe;
+         module = (Win32ImageBase *)WinExe;
     }
-    else module = (Win32Image *)Win32Dll::findModule(hModule);
+    else module = (Win32ImageBase *)Win32DllBase::findModule(hModule);
 
     if(module == NULL)