[PATCH v3] vbscript/tests: Fix test for WeekDayName(foo, bar, 0).
Jacek Caban
jacek at codeweavers.com
Thu Nov 2 07:57:14 CDT 2017
On 02.11.2017 13:55, Jacek Caban wrote:
> Hi Alex,
>
> On 01.11.2017 22:04, Alex Henrie wrote:
>> - if (!hkernel32)
>> + if (pGetThreadUILanguage)
>> {
>> - hkernel32 = GetModuleHandleA("kernel32.dll");
>> - pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage");
>> - pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage");
>> + is_english = (PRIMARYLANGID(pGetThreadUILanguage()) == LANG_ENGLISH &&
>> + PRIMARYLANGID(GetUserDefaultUILanguage()) == LANG_ENGLISH &&
>> + PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH);
>
> I think you don't want to skip those tests if GetThreadUILanguage is not
> available, just don't use it. Something like:
>
> is_english = (!pGetThreadUILanguage ||
> PRIMARYLANGID(pGetThreadUILanguage()) == LANG_ENGLISH) && /* other tests */;
>
> should do the trick.
>
Also you shouldn't use CloseHandle() on a handle returned from
GetModuleHandleA().
Cheers,
Jcaek
More information about the wine-patches
mailing list