Changeset 8112

Timestamp:

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

Author:

sandervl

Message:

added LoadImageW hook

Location:

trunk

Files:

• include/custombuild.h (modified) (1 diff)
• src/user32/loadres.cpp (modified) (4 diffs)

trunk/include/custombuild.h

@@ -70 +70 @@
 BOOL WIN32API ClearCustomDialogHook();
 
-//Override FindResource function
-typedef void (* WIN32API PFNFINDRESOURCEEXA)(HINSTANCE *phModule, LPSTR *lplpszName, LPSTR *lplpszType, WORD *lpLanguage);
-typedef void (* WIN32API PFNFINDRESOURCEEXW)(HINSTANCE *phModule, LPWSTR *lplpszName, LPWSTR *lplpszType, WORD *lpLanguage);
+//Override LoadImage function
+typedef void (* WIN32API PFNLOADIMAGEW)(HINSTANCE *phinst, LPWSTR *lplpszName, UINT *lpuType);
 
-BOOL WIN32API SetCustomFindResource(PFNFINDRESOURCEEXA pfnFindResourceA, PFNFINDRESOURCEEXW pfnFindResourceW);
+BOOL WIN32API SetCustomLoadImage(PFNLOADIMAGEW pfnLoadImageW);
 
 //Set the default language in kernel32

trunk/src/user32/loadres.cpp

@@ -1 @@
-/* $Id: loadres.cpp,v 1.38 2001-07-16 19:32:55 sandervl Exp $ */
+/* $Id: loadres.cpp,v 1.39 2002-03-22 12:51:17 sandervl Exp $ */
 
 /*
@@ -26 +26 @@
 #include "initterm.h"
 #include <winres.h>
+#include <custombuild.h>
 #include "pmwindow.h"
 
@@ -350 +351 @@
 //******************************************************************************
 //******************************************************************************
+static PFNLOADIMAGEW pfnCustomLoadImageW  = NULL;
+//******************************************************************************
+//Called by custom Odin builds to hook LoadImageW
+//******************************************************************************
+BOOL WIN32API SetCustomLoadImage(PFNLOADIMAGEW pfnLoadImageW)
+{
+    pfnCustomLoadImageW = pfnLoadImageW;
+    return TRUE;
+}
+//******************************************************************************
+//******************************************************************************
 HANDLE WIN32API LoadImageA(HINSTANCE hinst, LPCSTR lpszName, UINT uType,
                            int cxDesired, int cyDesired, UINT fuLoad)
@@ -380 +392 @@
  HANDLE hRet = 0;
 
+  if(pfnCustomLoadImageW) {
+      pfnCustomLoadImageW(&hinst, (LPWSTR *)&lpszName, &uType);
+  }
+
   if(HIWORD(lpszName)) {
-        dprintf(("LoadImageW %x %ls %d (%d,%d)\n", hinst, lpszName, uType, cxDesired, cyDesired));
-  }
-  else  dprintf(("LoadImageW %x %x %d (%d,%d)\n", hinst, lpszName, uType, cxDesired, cyDesired));
+       dprintf(("LoadImageW %x %ls %d (%d,%d)\n", hinst, lpszName, uType, cxDesired, cyDesired));
+  }
+  else dprintf(("LoadImageW %x %x %d (%d,%d)\n", hinst, lpszName, uType, cxDesired, cyDesired));
 
   if (fuLoad & LR_DEFAULTSIZE) {