Backed out FindResource language patch.
diff --git a/include/pe_image.h b/include/pe_image.h
index 43b39c6..eb69db3 100644
--- a/include/pe_image.h
+++ b/include/pe_image.h
@@ -33,7 +33,7 @@
extern BOOL PE_EnumResourceNamesW(HMODULE,LPCWSTR,ENUMRESNAMEPROCW,LONG);
extern BOOL PE_EnumResourceLanguagesA(HMODULE,LPCSTR,LPCSTR,ENUMRESLANGPROCA,LONG);
extern BOOL PE_EnumResourceLanguagesW(HMODULE,LPCWSTR,LPCWSTR,ENUMRESLANGPROCW,LONG);
-extern HRSRC PE_FindResourceExW(struct _wine_modref*,LPCWSTR,LPCWSTR,WORD,BOOL);
+extern HRSRC PE_FindResourceExW(struct _wine_modref*,LPCWSTR,LPCWSTR,WORD);
extern DWORD PE_SizeofResource(HMODULE,HRSRC);
extern struct _wine_modref *PE_LoadLibraryExA(LPCSTR, DWORD);
extern void PE_UnloadLibrary(struct _wine_modref *);
diff --git a/loader/pe_resource.c b/loader/pe_resource.c
index 762e2b3..29f13c6 100644
--- a/loader/pe_resource.c
+++ b/loader/pe_resource.c
@@ -116,10 +116,10 @@
}
/**********************************************************************
- * PE_FindResourceExW
+ * PE_FindResourceEx32W
*/
HANDLE PE_FindResourceExW(
- WINE_MODREF *wm,LPCWSTR name,LPCWSTR type,WORD lang, BOOL allowdefault
+ WINE_MODREF *wm,LPCWSTR name,LPCWSTR type,WORD lang
) {
PIMAGE_RESOURCE_DIRECTORY resdirptr;
DWORD root;
@@ -137,8 +137,14 @@
return 0;
result = (HANDLE)GetResDirEntryW(resdirptr, (LPCWSTR)(UINT)lang, root, FALSE);
+ /* Try with only the primary language set */
+ if (!result)
+ {
+ lang = MAKELANGID(PRIMARYLANGID(lang), SUBLANG_DEFAULT);
+ result = (HANDLE)GetResDirEntryW(resdirptr, (LPCWSTR)(UINT)lang, root, FALSE);
+ }
/* Try LANG_NEUTRAL, too */
- if(!result && allowdefault)
+ if(!result)
return (HANDLE)GetResDirEntryW(resdirptr, (LPCWSTR)0, root, TRUE);
return result;
}
diff --git a/loader/resource.c b/loader/resource.c
index 9c5d982..1171c07 100644
--- a/loader/resource.c
+++ b/loader/resource.c
@@ -130,7 +130,7 @@
static HRSRC RES_FindResource2( HMODULE hModule, LPCSTR type,
LPCSTR name, WORD lang,
- BOOL bUnicode, BOOL bRet16, BOOL allowdefault )
+ BOOL bUnicode, BOOL bRet16 )
{
HRSRC hRsrc = 0;
HMODULE16 hMod16 = MapHModuleLS( hModule );
@@ -138,15 +138,14 @@
WINE_MODREF *wm = pModule && pModule->module32?
MODULE32_LookupHMODULE( pModule->module32 ) : NULL;
- TRACE("(%08x %s, %08x%s, %08x%s, %04x, %s, %s, %s)\n",
+ TRACE("(%08x %s, %08x%s, %08x%s, %04x, %s, %s)\n",
hModule,
pModule ? (char *)NE_MODULE_NAME(pModule) : "NULL dereference",
(UINT)type, HIWORD(type)? (bUnicode? debugstr_w((LPWSTR)type) : debugstr_a(type)) : "",
(UINT)name, HIWORD(name)? (bUnicode? debugstr_w((LPWSTR)name) : debugstr_a(name)) : "",
lang,
bUnicode? "W" : "A",
- bRet16? "NE" : "PE",
- allowdefault ? "allow default" : "NOT allowdefault" );
+ bRet16? "NE" : "PE" );
if (pModule)
{
@@ -164,7 +163,7 @@
else
nameStr = (LPWSTR)name;
- hRsrc = PE_FindResourceExW( wm, nameStr, typeStr, lang, allowdefault );
+ hRsrc = PE_FindResourceExW( wm, nameStr, typeStr, lang );
if ( HIWORD( type ) && !bUnicode )
HeapFree( GetProcessHeap(), 0, typeStr );
@@ -212,12 +211,12 @@
static HRSRC RES_FindResource( HMODULE hModule, LPCSTR type,
LPCSTR name, WORD lang,
- BOOL bUnicode, BOOL bRet16, BOOL allowdefault )
+ BOOL bUnicode, BOOL bRet16 )
{
HRSRC hRsrc;
__TRY
{
- hRsrc = RES_FindResource2(hModule, type, name, lang, bUnicode, bRet16, allowdefault);
+ hRsrc = RES_FindResource2(hModule, type, name, lang, bUnicode, bRet16);
}
__EXCEPT(page_fault)
{
@@ -445,7 +444,7 @@
LPCSTR typeStr = HIWORD(type)? PTR_SEG_TO_LIN(type) : (LPCSTR)type;
return RES_FindResource( hModule, typeStr, nameStr,
- GetSystemDefaultLangID(), FALSE, TRUE, TRUE );
+ GetSystemDefaultLangID(), FALSE, TRUE );
}
/**********************************************************************
@@ -454,7 +453,7 @@
HANDLE WINAPI FindResourceA( HMODULE hModule, LPCSTR name, LPCSTR type )
{
return RES_FindResource( hModule, type, name,
- GetSystemDefaultLangID(), FALSE, FALSE, TRUE );
+ GetSystemDefaultLangID(), FALSE, FALSE );
}
/**********************************************************************
@@ -464,7 +463,7 @@
LPCSTR type, LPCSTR name, WORD lang )
{
return RES_FindResource( hModule, type, name,
- lang, FALSE, FALSE, FALSE );
+ lang, FALSE, FALSE );
}
/**********************************************************************
@@ -474,7 +473,7 @@
LPCWSTR type, LPCWSTR name, WORD lang )
{
return RES_FindResource( hModule, (LPCSTR)type, (LPCSTR)name,
- lang, TRUE, FALSE, FALSE );
+ lang, TRUE, FALSE );
}
/**********************************************************************
@@ -483,7 +482,7 @@
HRSRC WINAPI FindResourceW(HINSTANCE hModule, LPCWSTR name, LPCWSTR type)
{
return RES_FindResource( hModule, (LPCSTR)type, (LPCSTR)name,
- GetSystemDefaultLangID(), TRUE, FALSE, TRUE );
+ GetSystemDefaultLangID(), TRUE, FALSE );
}
/**********************************************************************
