commit 05c88fa66474003f4831b6bb217d4a54a17ded06
author Dmitry Timoshkov <dmitry@sloboda.ru> Fri Aug 11 12:50:56 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Aug 11 12:50:56 2000 +0000
tree 907a5a91ff68875129761e25f5dd033a4a91d791
parent a3fcb47f2ba9d81575683a59e271584b240df6d1

Make FindResource and FindResourceEx fully windows compatible.

loader/resource.c

diff --git a/loader/resource.c b/loader/resource.c
index 512c2ea..cec6f6c 100644
--- a/loader/resource.c
+++ b/loader/resource.c
@@ -194,7 +194,14 @@
         else
             nameStr = (LPWSTR)name;
 
-        hRsrc = PE_FindResourceExW( hModule, nameStr, typeStr, lang );
+	/* Here is the real difference between FindResouce and FindResourceEx */
+	if(lang == MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL) ||
+		lang == MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT) ||
+		lang == MAKELANGID(LANG_NEUTRAL, SUBLANG_SYS_DEFAULT) ||
+		lang == MAKELANGID(LANG_NEUTRAL, 3)) /* FIXME: real name? */
+	    hRsrc = PE_FindResourceW( hModule, nameStr, typeStr );
+	else
+	    hRsrc = PE_FindResourceExW( hModule, nameStr, typeStr, lang );
 	    
         if ( HIWORD( type ) && !bUnicode ) 
             HeapFree( GetProcessHeap(), 0, typeStr );
@@ -319,7 +326,7 @@
     LPCSTR typeStr = HIWORD(type)? PTR_SEG_TO_LIN(type) : (LPCSTR)type;
 
     return RES_FindResource( hModule, typeStr, nameStr, 
-                             GetSystemDefaultLangID(), FALSE, TRUE );
+                    MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), FALSE, TRUE );
 }
 
 /**********************************************************************
@@ -328,7 +335,7 @@
 HANDLE WINAPI FindResourceA( HMODULE hModule, LPCSTR name, LPCSTR type )
 {
     return RES_FindResource( hModule, type, name, 
-                             GetSystemDefaultLangID(), FALSE, FALSE );
+                    MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), FALSE, FALSE );
 }
 
 /**********************************************************************
@@ -357,7 +364,7 @@
 HRSRC WINAPI FindResourceW(HINSTANCE hModule, LPCWSTR name, LPCWSTR type)
 {
     return RES_FindResource( hModule, (LPCSTR)type, (LPCSTR)name, 
-                             GetSystemDefaultLangID(), TRUE, FALSE );
+                    MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), TRUE, FALSE );
 }
 
 /**********************************************************************