kernelbase: Get language sort only when required in LCMapStringEx().

Fixes very slow loading (a few minutes) of Warhammer 40000: Inquisitor - Martyr after b780e5f5. Signed-off-by: Paul Gofman <pgofman@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

kernelbase: Get language sort only when required in LCMapStringEx().
cf3bb0ce · Paul Gofman · Alexandre Julliard · 06206f16 · cf3bb0ce
Commit cf3bb0ce authored Dec 08, 2020 by Paul Gofman Committed by Alexandre Julliard Dec 08, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

locale.c dlls/kernelbase/locale.c +2 -2

No files found.
--- a/dlls/kernelbase/locale.c
+++ b/dlls/kernelbase/locale.c
@@ -5205,7 +5205,7 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringEx( const WCHAR *locale, DWORD flags, co
                                            WCHAR *dst, int dstlen, NLSVERSIONINFO *version,
                                            void *reserved, LPARAM handle )
 {
-    const struct sortguid *sortid;
+    const struct sortguid *sortid = NULL;
    LPWSTR dst_ptr;
    INT len;

@@ -5236,7 +5236,7 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringEx( const WCHAR *locale, DWORD flags, co

    if (!dstlen) dst = NULL;

-    if (!(sortid = get_language_sort( locale )))
+    if (flags & LCMAP_LINGUISTIC_CASING && !(sortid = get_language_sort( locale )))
    {
        FIXME( "unknown locale %s\n", debugstr_w(locale) );
        SetLastError( ERROR_INVALID_PARAMETER );