[ros-diffs] [zguo] 65155: [KERNEL32] Merge English fallback for unlocalized text. CORE-8720

[zguo]

Author: zguo
Date: Fri Oct 31 17:47:32 2014
New Revision: 65155

URL: http://svn.reactos.org/svn/reactos?rev=65155&view=rev
Log:
[KERNEL32]
Merge English fallback for unlocalized text.
CORE-8720

Modified:
    branches/0.3.17/reactos/   (props changed)
    branches/0.3.17/reactos/dll/win32/kernel32/winnls/string/nls.c

Propchange: branches/0.3.17/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo       (original)
+++ svn:mergeinfo       Fri Oct 31 17:47:32 2014
@@ -18,4 +18,4 @@
 
/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup:54809-54998
-/trunk/reactos:64752-64754,64765,64769,64771,64776-64777,64793,64800,64825,64829,64832-64833,64855-64856,64859,64908-64909,64976,65025-65028,65041,65100
+/trunk/reactos:64752-64754,64765,64769,64771,64776-64777,64793,64800,64825,64829,64832-64833,64855-64856,64859,64908-64909,64976,65025-65028,65041,65100,65152

Modified: branches/0.3.17/reactos/dll/win32/kernel32/winnls/string/nls.c
URL: 
http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/dll/win32/kernel32/winnls/string/nls.c?rev=65155&r1=65154&r2=65155&view=diff
==============================================================================
--- branches/0.3.17/reactos/dll/win32/kernel32/winnls/string/nls.c      
[iso-8859-1] (original)
+++ branches/0.3.17/reactos/dll/win32/kernel32/winnls/string/nls.c      
[iso-8859-1] Fri Oct 31 17:47:32 2014
@@ -1704,6 +1704,16 @@
                             (LPWSTR)RT_STRING,
                             MAKEINTRESOURCEW((dwId >> 4) + 1),
                             langId);
+
+    /* english fallback */
+    if(!hrsrc)
+    {
+        hrsrc = FindResourceExW(hCurrentModule,
+                            (LPWSTR)RT_STRING,
+                            MAKEINTRESOURCEW((dwId >> 4) + 1),
+                            MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US));
+    }
+
     if (hrsrc)
     {
         HGLOBAL hmem = LoadResource(hCurrentModule, hrsrc);