When reading resources in NLS_LoadStringExW we should map

SUBLANG_NEUTRAL to SUBLANG_DEFAULT.

When reading resources in NLS_LoadStringExW we should map
0925d6ec · Huw D M Davies · Alexandre Julliard · 738e2461 · 0925d6ec
Commit 0925d6ec authored May 29, 2001 by Huw D M Davies Committed by Alexandre Julliard May 29, 2001
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

ole2nls.c ole/ole2nls.c +4 -0

No files found.
--- a/ole/ole2nls.c
+++ b/ole/ole2nls.c
@@ -418,6 +418,10 @@ static INT NLS_LoadStringExW(HMODULE hModule, LANGID lang_id, UINT res_id, LPWST
    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;