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

Timestamp:

Mar 22, 2002, 1:51:35 PM (23 years ago)

Author:

sandervl

Message:

removed FindResource hooks

File:

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

trunk/src/kernel32/resource.cpp

@@ -1 @@
-/* $Id: resource.cpp,v 1.18 2002-02-25 12:02:17 sandervl Exp $ */
+/* $Id: resource.cpp,v 1.19 2002-03-22 12:51:35 sandervl Exp $ */
 
 /*
@@ -16 +16 @@
 #include <winexebase.h>
 #include <windllbase.h>
-#include <custombuild.h>
 
 #define DBG_LOCALLOG    DBG_resource
@@ -22 +21 @@
 
 
-static PFNFINDRESOURCEEXA pfnCustomFindResourceA = NULL;
-static PFNFINDRESOURCEEXW pfnCustomFindResourceW = NULL;
-
-//******************************************************************************
-//Called by custom Odin builds to hook FindReource(Ex)A/W calls
-//******************************************************************************
-BOOL WIN32API SetCustomFindResource(PFNFINDRESOURCEEXA pfnFindResourceA, PFNFINDRESOURCEEXW pfnFindResourceW)
-{
-    pfnCustomFindResourceA = pfnFindResourceA;
-    pfnCustomFindResourceW = pfnFindResourceW;
-    return TRUE;
-}
 //******************************************************************************
 //lpszName = integer id (high word 0), else string (name or "#237")
@@ -43 +30 @@
  WORD wLanguage = MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL);
 
-    if(pfnCustomFindResourceA) {
-        pfnCustomFindResourceA(&hModule, (LPSTR *)&lpszName, (LPSTR *)&lpszType, &wLanguage);
-    }
     module = Win32ImageBase::findModule(hModule);
     if(module == NULL) {
@@ -61 +45 @@
  WORD wLanguage = MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL);
 
-    if(pfnCustomFindResourceW) {
-        pfnCustomFindResourceW(&hModule, (LPWSTR *)&lpszName, (LPWSTR *)&lpszType, &wLanguage);
-    }
     module = Win32ImageBase::findModule(hModule);
     if(module == NULL) {
@@ -96 +77 @@
  Win32ImageBase *module;
 
-    if(pfnCustomFindResourceA) {
-        pfnCustomFindResourceA(&hModule, (LPSTR *)&lpName, (LPSTR *)&lpType, &wLanguage);
-    }
-
     module = Win32ImageBase::findModule(hModule);
     if(module == NULL) {
@@ -134 +111 @@
  Win32ImageBase *module;
 
-    if(pfnCustomFindResourceW) {
-        pfnCustomFindResourceW(&hModule, (LPWSTR *)&lpName, (LPWSTR *)&lpType, &wLanguage);
-    }
-
     module = Win32ImageBase::findModule(hModule);
     if(module == NULL) {
@@ -161 +134 @@
   /* @@@PH */
   if(HIWORD(hRes) == NULL) {
-        dprintf(("ERROR: LoadResource %x: invalid hRes %x", hModule, hRes));
-        return 0;
+      dprintf(("ERROR: LoadResource %x: invalid hRes %x", hModule, hRes));
+      return 0;
   }