From 175d2a76b30e11cc6fab525dfd0cfef0fc76e318 Mon Sep 17 00:00:00 2001 From: Kamil Hornicek Date: Fri, 31 Oct 2014 16:32:23 +0000 Subject: [PATCH] [KERNEL32] - fall back to english if a localized resource is not found in GetLocalisedText - this prevents debug spam and loss of functionality (see CORE-8720) for languages that don't have kernel32 translated svn path=/trunk/; revision=65152 --- reactos/dll/win32/kernel32/winnls/string/nls.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/reactos/dll/win32/kernel32/winnls/string/nls.c b/reactos/dll/win32/kernel32/winnls/string/nls.c index 02a5681309e..7ba816da68a 100644 --- a/reactos/dll/win32/kernel32/winnls/string/nls.c +++ b/reactos/dll/win32/kernel32/winnls/string/nls.c @@ -1704,6 +1704,16 @@ GetLocalisedText(DWORD dwResId, WCHAR *lpszDest) (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);