From e0f9ff9eb003211ce4fa436b7398851f06e46293 Mon Sep 17 00:00:00 2001 From: Louis Lenders Date: Sat, 31 Mar 2018 11:26:24 +0200 Subject: [PATCH] kernel32: Improve stub for SetThreadUILanguage. Signed-off-by: Louis Lenders Signed-off-by: Alexandre Julliard --- dlls/kernel32/locale.c | 6 +++++- dlls/kernel32/tests/locale.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index c5eeabfbbed..5a6ff35b75b 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2821,7 +2821,11 @@ BOOL WINAPI SetThreadLocale( LCID lcid ) LANGID WINAPI SetThreadUILanguage( LANGID langid ) { TRACE("(0x%04x) stub - returning success\n", langid); - return langid; + + if (!langid) + return GetThreadUILanguage(); + else + return langid; } /****************************************************************************** diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 12769f7c582..a99763db92f 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5459,7 +5459,7 @@ static void test_SetThreadUILanguage(void) } res = pSetThreadUILanguage(0); - todo_wine ok(res == pGetThreadUILanguage(), "expected %d got %d\n", pGetThreadUILanguage(), res); + ok(res == pGetThreadUILanguage(), "expected %d got %d\n", pGetThreadUILanguage(), res); res = pSetThreadUILanguage(MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH_BELGIAN)); ok(res == MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH_BELGIAN), -- 2.11.4.GIT