nls patch

Huw D M Davies h.davies1 at physics.ox.ac.uk
Tue May 29 10:59:57 CDT 2001


	Huw D M Davies <hdavies at codeweavers.com>
	When reading resources in NLS_LoadStringExW we should map
	SUBLANG_NEUTRAL to SUBLANG_DEFAULT.
-------------- next part --------------
Index: ole/ole2nls.c
===================================================================
RCS file: /home/wine/wine/ole/ole2nls.c,v
retrieving revision 1.87
diff -u -r1.87 ole2nls.c
--- ole/ole2nls.c	2001/04/12 21:06:39	1.87
+++ ole/ole2nls.c	2001/05/29 15:44:15
@@ -418,6 +418,10 @@
     int string_num;
     int i;
 
+    /* Replace SUBLANG_NEUTRAL by SUBLANG_DEFAULT */
+    if(SUBLANGID(lang_id) == SUBLANG_NEUTRAL)
+        lang_id = MAKELANGID(PRIMARYLANGID(lang_id), SUBLANG_DEFAULT);
+
     hrsrc = FindResourceExW(hModule, RT_STRINGW, (LPCWSTR)((res_id >> 4) + 1), lang_id);
 
     if(!hrsrc) return 0;


More information about the wine-patches mailing list