1 files changed, 20 insertions, 9 deletions

diff --git a/src/dutil/locutil.cpp b/src/dutil/locutil.cpp
index c4567c03..43e1bb5b 100644
--- a/src/dutil/locutil.cpp
+++ b/src/dutil/locutil.cpp
@@ -51,7 +51,7 @@ static HRESULT ParseWxlControl(
 #ifndef MUI_MERGE_SYSTEM_FALLBACK
 #define MUI_MERGE_SYSTEM_FALLBACK           0x10     // GetThreadPreferredUILanguages merges in parent and base languages
 #endif
-typedef WINBASEAPI BOOL (WINAPI *GET_THREAD_PREFERRED_UI_LANGUAGES) (
+typedef WINBASEAPI BOOL (WINAPI *PFN_GET_THREAD_PREFERRED_UI_LANGUAGES) (
     __in DWORD dwFlags,
     __out PULONG pulNumLanguages,
     __out_ecount_opt(*pcchLanguagesBuffer) PZZWSTR pwszLanguagesBuffer,
@@ -65,14 +65,25 @@ extern "C" HRESULT DAPI LocProbeForFile(
     __inout LPWSTR* psczPath
     )
 {
+    return LocProbeForFileEx(wzBasePath, wzLocFileName, wzLanguage, psczPath, FALSE);
+}
+
+extern "C" HRESULT DAPI LocProbeForFileEx(
+    __in_z LPCWSTR wzBasePath,
+    __in_z LPCWSTR wzLocFileName,
+    __in_z_opt LPCWSTR wzLanguage,
+    __inout LPWSTR* psczPath,
+    __in BOOL fUseUILanguage
+    )
+{
     HRESULT hr = S_OK;
     LPWSTR sczProbePath = NULL;
     LANGID langid = 0;
     LPWSTR sczLangIdFile = NULL;
     LPWSTR sczLangsBuff = NULL;
-    GET_THREAD_PREFERRED_UI_LANGUAGES pvfnGetThreadPreferredUILanguages =
-        reinterpret_cast<GET_THREAD_PREFERRED_UI_LANGUAGES>(
-            GetProcAddress(GetModuleHandle("Kernel32.dll"), "GetThreadPreferredUILanguages"));
+    PFN_GET_THREAD_PREFERRED_UI_LANGUAGES pfnGetThreadPreferredUILanguages  =
+        reinterpret_cast<PFN_GET_THREAD_PREFERRED_UI_LANGUAGES>(
+            ::GetProcAddress(::GetModuleHandle("Kernel32.dll"), "GetThreadPreferredUILanguages"));
 
     // If a language was specified, look for a loc file in that as a directory.
     if (wzLanguage && *wzLanguage)
@@ -89,12 +100,12 @@ extern "C" HRESULT DAPI LocProbeForFile(
         }
     }
 
-    if (pvfnGetThreadPreferredUILanguages)
+    if (fUseUILanguage && pfnGetThreadPreferredUILanguages)
     {
-        ULONG nLangs;
+        ULONG nLangs = 0;
         ULONG cchLangs = 0;
         DWORD dwFlags = MUI_LANGUAGE_ID | MUI_MERGE_USER_FALLBACK | MUI_MERGE_SYSTEM_FALLBACK;
-        if (!(*pvfnGetThreadPreferredUILanguages)(dwFlags, &nLangs, NULL, &cchLangs))
+        if (!(*pfnGetThreadPreferredUILanguages)(dwFlags, &nLangs, NULL, &cchLangs))
         {
             LocExitWithLastError(hr, "GetThreadPreferredUILanguages failed to return buffer size.");
         }
@@ -103,7 +114,7 @@ extern "C" HRESULT DAPI LocProbeForFile(
         LocExitOnFailure(hr, "Failed to allocate buffer for languages");
 
         nLangs = 0;
-        if (!(*pvfnGetThreadPreferredUILanguages)(dwFlags, &nLangs, sczLangsBuff, &cchLangs))
+        if (!(*pfnGetThreadPreferredUILanguages)(dwFlags, &nLangs, sczLangsBuff, &cchLangs))
         {
             LocExitWithLastError(hr, "GetThreadPreferredUILanguages failed to return language list.");
         }
@@ -129,7 +140,7 @@ extern "C" HRESULT DAPI LocProbeForFile(
         }
     }
 
-    langid = ::GetUserDefaultUILanguage();
+    langid = fUseUILanguage ? ::GetUserDefaultUILanguage() : ::GetUserDefaultLangID();
 
     hr = StrAllocFormatted(&sczLangIdFile, L"%u\\%ls", langid, wzLocFileName);
     LocExitOnFailure(hr, "Failed to format user langid.");