March 2022 - Wine-Commits - list.winehq.org

Eric Pouech : ntdll/tests: Enable compilation with long types in thread.c.
by Alexandre Julliard March 24, 2022

March 24, 2022

Module: wine Branch: master Commit: bd9b459d70a9f7f9dfa9c43244b7e611f74ac5e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd9b459d70a9f7f9dfa9c432… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 24 08:35:17 2022 +0100 ntdll/tests: Enable compilation with long types in thread.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/thread.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/thread.c b/dlls/ntdll/tests/thread.c index f381f64dbfe..336e0741e93 100644 --- a/dlls/ntdll/tests/thread.c +++ b/dlls/ntdll/tests/thread.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include "ntdll_test.h" @@ -56,30 +57,30 @@ static void test_dbg_hidden_thread_creation(void) status = pNtCreateThreadEx( &thread, THREAD_ALL_ACCESS, NULL, GetCurrentProcess(), test_NtCreateThreadEx_proc, NULL, THREAD_CREATE_FLAGS_CREATE_SUSPENDED, 0, 0, 0, NULL ); - ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); dbg_hidden = 0xcc; status = NtQueryInformationThread( thread, ThreadHideFromDebugger, &dbg_hidden, sizeof(dbg_hidden), NULL ); - ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); ok( !dbg_hidden, "Got unexpected dbg_hidden %#x.\n", dbg_hidden ); status = NtResumeThread( thread, NULL ); - ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); WaitForSingleObject( thread, INFINITE ); CloseHandle( thread ); status = pNtCreateThreadEx( &thread, THREAD_ALL_ACCESS, NULL, GetCurrentProcess(), test_NtCreateThreadEx_proc, NULL, THREAD_CREATE_FLAGS_CREATE_SUSPENDED | THREAD_CREATE_FLAGS_HIDE_FROM_DEBUGGER, 0, 0, 0, NULL ); - ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); dbg_hidden = 0xcc; status = NtQueryInformationThread( thread, ThreadHideFromDebugger, &dbg_hidden, sizeof(dbg_hidden), NULL ); - ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); ok( dbg_hidden == 1, "Got unexpected dbg_hidden %#x.\n", dbg_hidden ); status = NtResumeThread( thread, NULL ); - ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); WaitForSingleObject( thread, INFINITE ); CloseHandle( thread ); @@ -97,7 +98,7 @@ static void test_dbg_hidden_thread_creation(void) status = RtlCreateProcessParametersEx( &params, &imageW, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, PROCESS_PARAMS_FLAG_NORMALIZED ); - ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); /* NtCreateUserProcess() may return STATUS_INVALID_PARAMETER with some uninitialized data in create_info. */ memset( &create_info, 0, sizeof(create_info) ); @@ -107,13 +108,13 @@ static void test_dbg_hidden_thread_creation(void) NULL, NULL, 0, THREAD_CREATE_FLAGS_CREATE_SUSPENDED | THREAD_CREATE_FLAGS_HIDE_FROM_DEBUGGER, params, &create_info, &ps_attr ); - ok( status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "Got unexpected status %#lx.\n", status ); status = NtCreateUserProcess( &process, &thread, PROCESS_ALL_ACCESS, THREAD_ALL_ACCESS, NULL, NULL, 0, THREAD_CREATE_FLAGS_CREATE_SUSPENDED, params, &create_info, &ps_attr ); - ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); status = NtTerminateProcess( process, 0 ); - ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); CloseHandle( process ); CloseHandle( thread ); }

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in threadpool.c.
by Alexandre Julliard March 24, 2022

March 24, 2022

Module: wine Branch: master Commit: d86fda0c700b2af30c5e843dcb47ed6b3bf4a476 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d86fda0c700b2af30c5e843d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 24 08:35:24 2022 +0100 ntdll/tests: Enable compilation with long types in threadpool.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/threadpool.c | 749 +++++++++++++++++++++--------------------- 1 file changed, 375 insertions(+), 374 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d86fda0c700b2af30c5e…

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in time.c.
by Alexandre Julliard March 24, 2022

March 24, 2022

Module: wine Branch: master Commit: 19bc52602f4137d42c750ce8d2c4ed263b2382f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19bc52602f4137d42c750ce8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 24 08:35:27 2022 +0100 ntdll/tests: Enable compilation with long types in time.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/time.c | 89 +++++++++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=19bc52602f4137d42c75…

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in virtual.c.
by Alexandre Julliard March 24, 2022

March 24, 2022

Module: wine Branch: master Commit: c4507729cabe490028e807cd8e61f58543db439c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4507729cabe490028e807cd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 24 08:35:32 2022 +0100 ntdll/tests: Enable compilation with long types in virtual.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/virtual.c | 313 +++++++++++++++++++++++---------------------- 1 file changed, 157 insertions(+), 156 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c4507729cabe490028e8…

1 0

Alexandre Julliard : kernelbase: Load the locale.nls file at startup.
by Alexandre Julliard March 24, 2022

March 24, 2022

Module: wine Branch: master Commit: fffbe3fcaef9c2b0e3814305b212a95188c1b0c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fffbe3fcaef9c2b0e3814305… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 24 10:33:41 2022 +0100 kernelbase: Load the locale.nls file at startup. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 44 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 9ef8fbe8f44..cb5441f755e 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -571,9 +571,15 @@ struct norm_table static NLSTABLEINFO nls_info; static UINT unix_cp = CP_UTF8; static UINT mac_cp = 10000; +static LCID system_lcid; +static LCID user_lcid; static HKEY intl_key; static HKEY nls_key; static HKEY tz_key; +static const NLS_LOCALE_LCID_INDEX *lcids_index; +static const NLS_LOCALE_LCNAME_INDEX *lcnames_index; +static const NLS_LOCALE_HEADER *locale_table; +static const WCHAR *locale_strings; static CPTABLEINFO codepages[128]; static unsigned int nb_codepages; @@ -620,6 +626,30 @@ static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION locale_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static void load_locale_nls(void) +{ + struct + { + UINT ctypes; + UINT unknown1; + UINT unknown2; + UINT unknown3; + UINT locales; + UINT charmaps; + UINT geoids; + UINT scripts; + } *header; + LCID lcid; + LARGE_INTEGER dummy; + + RtlGetLocaleFileMappingAddress( (void **)&header, &lcid, &dummy ); + locale_table = (const NLS_LOCALE_HEADER *)((char *)header + header->locales); + lcids_index = (const NLS_LOCALE_LCID_INDEX *)((char *)locale_table + locale_table->lcids_offset); + lcnames_index = (const NLS_LOCALE_LCNAME_INDEX *)((char *)locale_table + locale_table->lcnames_offset); + locale_strings = (const WCHAR *)((char *)locale_table + locale_table->strings_offset); +} + + static void init_sortkeys( DWORD *ptr ) { WORD *ctype; @@ -707,7 +737,6 @@ void init_locale(void) UINT ansi_cp = 0, oem_cp = 0; USHORT *ansi_ptr, *oem_ptr; void *sort_ptr; - LCID user_lcid; WCHAR bufferW[LOCALE_NAME_MAX_LENGTH]; DYNAMIC_TIME_ZONE_INFORMATION timezone; GEOID geoid = GEOID_NOT_AVAILABLE; @@ -715,6 +744,10 @@ void init_locale(void) SIZE_T size; HKEY hkey; + load_locale_nls(); + NtQueryDefaultLocale( FALSE, &system_lcid ); + NtQueryDefaultLocale( FALSE, &user_lcid ); + if (GetEnvironmentVariableW( L"WINEUNIXCP", bufferW, ARRAY_SIZE(bufferW) )) unix_cp = wcstoul( bufferW, NULL, 10 ); @@ -775,7 +808,6 @@ void init_locale(void) /* Update registry contents if the user locale has changed. * This simulates the action of the Windows control panel. */ - user_lcid = GetUserDefaultLCID(); count = sizeof(bufferW); if (!RegQueryValueExW( intl_key, L"Locale", NULL, NULL, (BYTE *)bufferW, &count )) { @@ -4671,9 +4703,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetStringTypeExW( LCID locale, DWORD type, const W */ LCID WINAPI DECLSPEC_HOTPATCH GetSystemDefaultLCID(void) { - LCID lcid; - NtQueryDefaultLocale( FALSE, &lcid ); - return lcid; + return system_lcid; } @@ -4820,9 +4850,7 @@ done: */ LCID WINAPI DECLSPEC_HOTPATCH GetUserDefaultLCID(void) { - LCID lcid; - NtQueryDefaultLocale( TRUE, &lcid ); - return lcid; + return user_lcid; }

1 0

Alexandre Julliard : kernelbase: Reimplement IsValidLocale() using the locale.nls data.
by Alexandre Julliard March 24, 2022

March 24, 2022

Module: wine Branch: master Commit: 0263494bec987dea94f8c1a3b9ea43a2364dda2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0263494bec987dea94f8c1a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 24 16:49:43 2022 +0100 kernelbase: Reimplement IsValidLocale() using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 70 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 67 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 318fe24d10a..a17942f4e9c 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -580,6 +580,8 @@ static const NLS_LOCALE_LCID_INDEX *lcids_index; static const NLS_LOCALE_LCNAME_INDEX *lcnames_index; static const NLS_LOCALE_HEADER *locale_table; static const WCHAR *locale_strings; +static const NLS_LOCALE_DATA *system_locale; +static const NLS_LOCALE_DATA *user_locale; static CPTABLEINFO codepages[128]; static unsigned int nb_codepages; @@ -729,6 +731,13 @@ done: } +static const NLS_LOCALE_DATA *get_locale_data( UINT idx ) +{ + ULONG offset = locale_table->locales_offset + idx * locale_table->locale_size; + return (const NLS_LOCALE_DATA *)((const char *)locale_table + offset); +} + + static int compare_locale_names( const WCHAR *n1, const WCHAR *n2 ) { for (;;) @@ -761,6 +770,61 @@ static const NLS_LOCALE_LCNAME_INDEX *find_lcname_entry( const WCHAR *name ) } +static const NLS_LOCALE_LCID_INDEX *find_lcid_entry( LCID lcid ) +{ + int min = 0, max = locale_table->nb_lcids - 1; + + while (min <= max) + { + int pos = (min + max) / 2; + if (lcid < lcids_index[pos].id) max = pos - 1; + else if (lcid > lcids_index[pos].id) min = pos + 1; + else return &lcids_index[pos]; + } + return NULL; +} + + +static const NLS_LOCALE_DATA *get_locale_by_name( const WCHAR *name, LCID *lcid ) +{ + const NLS_LOCALE_LCNAME_INDEX *entry; + + if (name == LOCALE_NAME_USER_DEFAULT) + { + *lcid = user_lcid; + return user_locale; + } + if (!(entry = find_lcname_entry( name ))) return NULL; + *lcid = entry->id; + return get_locale_data( entry->idx ); +} + + +static const NLS_LOCALE_DATA *get_locale_by_id( LCID *lcid, DWORD flags ) +{ + const NLS_LOCALE_LCID_INDEX *entry; + const NLS_LOCALE_DATA *locale; + + switch (*lcid) + { + case LOCALE_SYSTEM_DEFAULT: + *lcid = system_lcid; + return system_locale; + case LOCALE_NEUTRAL: + case LOCALE_USER_DEFAULT: + case LOCALE_CUSTOM_DEFAULT: + *lcid = user_lcid; + return user_locale; + default: + if (!(entry = find_lcid_entry( *lcid ))) return NULL; + locale = get_locale_data( entry->idx ); + if (!(flags & LOCALE_ALLOW_NEUTRAL_NAMES) && !locale->inotneutral) + locale = get_locale_by_name( locale_strings + locale->ssortlocale + 1, lcid ); + return locale; + } +} + + /*********************************************************************** * init_locale */ @@ -779,6 +843,8 @@ void init_locale(void) load_locale_nls(); NtQueryDefaultLocale( FALSE, &system_lcid ); NtQueryDefaultLocale( FALSE, &user_lcid ); + system_locale = get_locale_by_id( &system_lcid, 0 ); + user_locale = get_locale_by_id( &user_lcid, 0 ); if (GetEnvironmentVariableW( L"WINEUNIXCP", bufferW, ARRAY_SIZE(bufferW) )) unix_cp = wcstoul( bufferW, NULL, 10 ); @@ -5211,9 +5277,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsValidLanguageGroup( LGRPID id, DWORD flags ) */ BOOL WINAPI DECLSPEC_HOTPATCH IsValidLocale( LCID lcid, DWORD flags ) { - /* check if language is registered in the kernel32 resources */ - return FindResourceExW( kernel32_handle, (LPWSTR)RT_STRING, - ULongToPtr( (LOCALE_ILANGUAGE >> 4) + 1 ), LANGIDFROMLCID(lcid)) != 0; + return !!get_locale_by_id( &lcid, LOCALE_ALLOW_NEUTRAL_NAMES ); }

1 0

Alexandre Julliard : kernelbase: Reimplement ConvertDefaultLocale() using the locale.nls data.
by Alexandre Julliard March 24, 2022

March 24, 2022

Module: wine Branch: master Commit: 17c353a3bb47691a00157418ec71fb1126d2333c URL: https://source.winehq.org/git/wine.git/?a=commit;h=17c353a3bb47691a00157418… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 24 16:51:11 2022 +0100 kernelbase: Reimplement ConvertDefaultLocale() using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 39 +-------------------------------------- 1 file changed, 1 insertion(+), 38 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index a17942f4e9c..db9466fdd58 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3318,44 +3318,7 @@ INT WINAPI DECLSPEC_HOTPATCH CompareStringOrdinal( const WCHAR *str1, INT len1, */ LCID WINAPI DECLSPEC_HOTPATCH ConvertDefaultLocale( LCID lcid ) { - switch (lcid) - { - case LOCALE_INVARIANT: - return lcid; /* keep as-is */ - case LOCALE_SYSTEM_DEFAULT: - return GetSystemDefaultLCID(); - case LOCALE_USER_DEFAULT: - case LOCALE_NEUTRAL: - return GetUserDefaultLCID(); - case MAKELANGID( LANG_CHINESE, SUBLANG_NEUTRAL ): - case MAKELANGID( LANG_CHINESE, 0x1e ): - return MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED ); - case MAKELANGID( LANG_CHINESE, 0x1f ): - return MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_HONGKONG ); - case LANG_SERBIAN_NEUTRAL: - return MAKELANGID( LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN ); - case MAKELANGID( LANG_SPANISH, SUBLANG_NEUTRAL ): - return MAKELANGID( LANG_SPANISH, SUBLANG_SPANISH_MODERN ); - case MAKELANGID( LANG_IRISH, SUBLANG_NEUTRAL ): - return MAKELANGID( LANG_IRISH, SUBLANG_IRISH_IRELAND ); - case MAKELANGID( LANG_BENGALI, SUBLANG_NEUTRAL ): - return MAKELANGID( LANG_BENGALI, SUBLANG_BENGALI_BANGLADESH ); - case MAKELANGID( LANG_SINDHI, SUBLANG_NEUTRAL ): - return MAKELANGID( LANG_SINDHI, SUBLANG_SINDHI_AFGHANISTAN ); - case MAKELANGID( LANG_INUKTITUT, SUBLANG_NEUTRAL ): - return MAKELANGID( LANG_INUKTITUT, SUBLANG_INUKTITUT_CANADA_LATIN ); - case MAKELANGID( LANG_TAMAZIGHT, SUBLANG_NEUTRAL ): - return MAKELANGID( LANG_TAMAZIGHT, SUBLANG_TAMAZIGHT_ALGERIA_LATIN ); - case MAKELANGID( LANG_FULAH, SUBLANG_NEUTRAL ): - return MAKELANGID( LANG_FULAH, SUBLANG_FULAH_SENEGAL ); - case MAKELANGID( LANG_TIGRINYA, SUBLANG_NEUTRAL ): - return MAKELANGID( LANG_TIGRINYA, SUBLANG_TIGRINYA_ERITREA ); - default: - /* Replace SUBLANG_NEUTRAL with SUBLANG_DEFAULT */ - if (SUBLANGID(lcid) == SUBLANG_NEUTRAL && SORTIDFROMLCID(lcid) == SORT_DEFAULT) - lcid = MAKELANGID( PRIMARYLANGID(lcid), SUBLANG_DEFAULT ); - break; - } + get_locale_by_id( &lcid, 0 ); return lcid; }

1 0

Alexandre Julliard : kernelbase: Reimplement LocaleNameToLCID() using the locale.nls data.
by Alexandre Julliard March 24, 2022

March 24, 2022

Module: wine Branch: master Commit: e74b0dc880a49985a912d54073cf4cf093c5c595 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e74b0dc880a49985a912d540… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 24 16:52:42 2022 +0100 kernelbase: Reimplement LocaleNameToLCID() using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index db9466fdd58..faa7b657adc 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -5596,10 +5596,15 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringW( LCID lcid, DWORD flags, const WCHAR * LCID WINAPI DECLSPEC_HOTPATCH LocaleNameToLCID( const WCHAR *name, DWORD flags ) { LCID lcid; + const NLS_LOCALE_DATA *locale = get_locale_by_name( name, &lcid ); - if (!name) return GetUserDefaultLCID(); - if (!set_ntstatus( RtlLocaleNameToLcid( name, &lcid, 2 ))) return 0; - if (!(flags & LOCALE_ALLOW_NEUTRAL_NAMES)) lcid = ConvertDefaultLocale( lcid ); + if (!locale) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + if (!(flags & LOCALE_ALLOW_NEUTRAL_NAMES) && !locale->inotneutral) + lcid = locale->idefaultlanguage; return lcid; }

1 0

Alexandre Julliard : kernelbase: Reimplement EnumUILanguages() using the locale.nls data.
by Alexandre Julliard March 24, 2022

March 24, 2022

Module: wine Branch: master Commit: 1f70f72b29b08a6ff085581f900959bc4458816e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f70f72b29b08a6ff085581f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 24 16:57:15 2022 +0100 kernelbase: Reimplement EnumUILanguages() using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 4 ++++ dlls/kernelbase/locale.c | 54 ++++++++++++++++++++++++++++++-------------- 2 files changed, 41 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 2bc368c8bc1..d30a771c2c2 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3849,6 +3849,10 @@ static void test_EnumUILanguageA(void) } ok(ret, "Expected ret != 0, got %d, error %ld\n", ret, GetLastError()); + SetLastError(0xdeadbeef); + ret = pEnumUILanguagesA(luilocale_proc1A, MUI_LANGUAGE_NAME, 0); + ok(ret, "Expected ret != 0, got %d, error %ld\n", ret, GetLastError()); + enumCount = 0; SetLastError(ERROR_SUCCESS); ret = pEnumUILanguagesA(luilocale_proc2A, 0, 0); diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index faa7b657adc..0fd6d393eba 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3111,38 +3111,58 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumTimeFormats( TIMEFMT_ENUMPROCW proc, BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumUILanguages( UILANGUAGE_ENUMPROCW proc, DWORD flags, LONG_PTR param, BOOL unicode ) { - WCHAR name[10]; - DWORD name_len, type, index = 0; - HKEY key; + WCHAR nameW[LOCALE_NAME_MAX_LENGTH]; + char nameA[LOCALE_NAME_MAX_LENGTH]; + DWORD i; if (!proc) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } - if (flags & ~MUI_LANGUAGE_ID) + if (flags & ~(MUI_LANGUAGE_ID | MUI_LANGUAGE_NAME)) { SetLastError( ERROR_INVALID_FLAGS ); return FALSE; } - if (RegOpenKeyExW( nls_key, L"Locale", 0, KEY_READ, &key )) return FALSE; - - for (;;) + for (i = 0; i < locale_table->nb_lcnames; i++) { - name_len = ARRAY_SIZE(name); - if (RegEnumValueW( key, index++, name, &name_len, NULL, &type, NULL, NULL )) break; - if (type != REG_SZ) continue; - if (!wcstoul( name, NULL, 16 )) continue; - if (!unicode) + if (!lcnames_index[i].name) continue; /* skip invariant locale */ + if (lcnames_index[i].id & 0x80000000) continue; /* skip aliases */ + if (!get_locale_data( lcnames_index[i].idx )->inotneutral) continue; /* skip neutral locales */ + if (!SORTIDFROMLCID( lcnames_index[i].id ) != !(flags & LCID_ALTERNATE_SORTS)) + continue; /* skip alternate sorts */ + if (flags & MUI_LANGUAGE_NAME) { - char nameA[10]; - WideCharToMultiByte( CP_ACP, 0, name, -1, nameA, sizeof(nameA), NULL, NULL ); - if (!((UILANGUAGE_ENUMPROCA)proc)( nameA, param )) break; + const WCHAR *str = locale_strings + lcnames_index[i].name; + + if (unicode) + { + memcpy( nameW, str + 1, (*str + 1) * sizeof(WCHAR) ); + if (!proc( nameW, param )) break; + } + else + { + WideCharToMultiByte( CP_ACP, 0, str + 1, -1, nameA, sizeof(nameA), NULL, NULL ); + if (!((UILANGUAGE_ENUMPROCA)proc)( nameA, param )) break; + } + } + else + { + if (lcnames_index[i].id == LOCALE_CUSTOM_UNSPECIFIED) continue; /* skip locales with no lcid */ + if (unicode) + { + swprintf( nameW, ARRAY_SIZE(nameW), L"%04lx", lcnames_index[i].id ); + if (!proc( nameW, param )) break; + } + else + { + sprintf( nameA, "%04x", lcnames_index[i].id ); + if (!((UILANGUAGE_ENUMPROCA)proc)( nameA, param )) break; + } } - else if (!proc( name, param )) break; } - RegCloseKey( key ); return TRUE; }

1 0

Alexandre Julliard : kernelbase: Reimplement EnumSystemLocalesA/W/Ex using the locale.nls data.
by Alexandre Julliard March 24, 2022

March 24, 2022

Module: wine Branch: master Commit: 4c51d77951bc6d57e1896406d7c520e8bf3f8a18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c51d77951bc6d57e1896406… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 24 17:17:10 2022 +0100 kernelbase: Reimplement EnumSystemLocalesA/W/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 74 ++++++++++++++++++------------------------------ 1 file changed, 27 insertions(+), 47 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 0fd6d393eba..1fe6fcf97d9 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3506,20 +3506,19 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumSystemLanguageGroupsW( LANGUAGEGROUP_ENUMPROCW BOOL WINAPI DECLSPEC_HOTPATCH EnumSystemLocalesA( LOCALE_ENUMPROCA proc, DWORD flags ) { char name[10]; - DWORD name_len, type, index = 0; - HKEY key; - - if (RegOpenKeyExW( nls_key, L"Locale", 0, KEY_READ, &key )) return FALSE; + DWORD i; - for (;;) + for (i = 0; i < locale_table->nb_lcnames; i++) { - name_len = ARRAY_SIZE(name); - if (RegEnumValueA( key, index++, name, &name_len, NULL, &type, NULL, NULL )) break; - if (type != REG_SZ) continue; - if (!strtoul( name, NULL, 16 )) continue; + if (!lcnames_index[i].name) continue; /* skip invariant locale */ + if (lcnames_index[i].id == LOCALE_CUSTOM_UNSPECIFIED) continue; /* skip locales with no lcid */ + if (lcnames_index[i].id & 0x80000000) continue; /* skip aliases */ + if (!get_locale_data( lcnames_index[i].idx )->inotneutral) continue; /* skip neutral locales */ + if (!SORTIDFROMLCID( lcnames_index[i].id ) != !(flags & LCID_ALTERNATE_SORTS)) + continue; /* skip alternate sorts */ + sprintf( name, "%08x", lcnames_index[i].id ); if (!proc( name )) break; } - RegCloseKey( key ); return TRUE; } @@ -3530,20 +3529,19 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumSystemLocalesA( LOCALE_ENUMPROCA proc, DWORD f BOOL WINAPI DECLSPEC_HOTPATCH EnumSystemLocalesW( LOCALE_ENUMPROCW proc, DWORD flags ) { WCHAR name[10]; - DWORD name_len, type, index = 0; - HKEY key; - - if (RegOpenKeyExW( nls_key, L"Locale", 0, KEY_READ, &key )) return FALSE; + DWORD i; - for (;;) + for (i = 0; i < locale_table->nb_lcnames; i++) { - name_len = ARRAY_SIZE(name); - if (RegEnumValueW( key, index++, name, &name_len, NULL, &type, NULL, NULL )) break; - if (type != REG_SZ) continue; - if (!wcstoul( name, NULL, 16 )) continue; + if (!lcnames_index[i].name) continue; /* skip invariant locale */ + if (lcnames_index[i].id == LOCALE_CUSTOM_UNSPECIFIED) continue; /* skip locales with no lcid */ + if (lcnames_index[i].id & 0x80000000) continue; /* skip aliases */ + if (!get_locale_data( lcnames_index[i].idx )->inotneutral) continue; /* skip neutral locales */ + if (!SORTIDFROMLCID( lcnames_index[i].id ) != !(flags & LCID_ALTERNATE_SORTS)) + continue; /* skip alternate sorts */ + swprintf( name, ARRAY_SIZE(name), L"%08lx", lcnames_index[i].id ); if (!proc( name )) break; } - RegCloseKey( key ); return TRUE; } @@ -3554,10 +3552,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumSystemLocalesW( LOCALE_ENUMPROCW proc, DWORD f BOOL WINAPI DECLSPEC_HOTPATCH EnumSystemLocalesEx( LOCALE_ENUMPROCEX proc, DWORD wanted_flags, LPARAM param, void *reserved ) { - WCHAR buffer[256], name[10]; - DWORD name_len, type, neutral, flags, index = 0, alt = 0; - HKEY key, altkey; - LCID lcid; + WCHAR buffer[LOCALE_NAME_MAX_LENGTH]; + DWORD i, flags; if (reserved) { @@ -3565,36 +3561,20 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumSystemLocalesEx( LOCALE_ENUMPROCEX proc, DWORD return FALSE; } - if (RegOpenKeyExW( nls_key, L"Locale", 0, KEY_READ, &key )) return FALSE; - if (RegOpenKeyExW( key, L"Alternate Sorts", 0, KEY_READ, &altkey )) altkey = 0; - - for (;;) + for (i = 0; i < locale_table->nb_lcnames; i++) { - name_len = ARRAY_SIZE(name); - if (RegEnumValueW( alt ? altkey : key, index++, name, &name_len, NULL, &type, NULL, NULL )) - { - if (alt++) break; - index = 0; - continue; - } - if (type != REG_SZ) continue; - if (!(lcid = wcstoul( name, NULL, 16 ))) continue; - - GetLocaleInfoW( lcid, LOCALE_SNAME | LOCALE_NOUSEROVERRIDE, buffer, ARRAY_SIZE( buffer )); - if (!GetLocaleInfoW( lcid, LOCALE_INEUTRAL | LOCALE_NOUSEROVERRIDE | LOCALE_RETURN_NUMBER, - (LPWSTR)&neutral, sizeof(neutral) / sizeof(WCHAR) )) - neutral = 0; + const NLS_LOCALE_DATA *locale = get_locale_data( lcnames_index[i].idx ); + const WCHAR *str = locale_strings + lcnames_index[i].name; - if (alt) + if (lcnames_index[i].id & 0x80000000) continue; /* skip aliases */ + memcpy( buffer, str + 1, (*str + 1) * sizeof(WCHAR) ); + if (SORTIDFROMLCID( lcnames_index[i].id ) || wcschr( str + 1, '_' )) flags = LOCALE_ALTERNATE_SORTS; else - flags = LOCALE_WINDOWS | (neutral ? LOCALE_NEUTRALDATA : LOCALE_SPECIFICDATA); - + flags = LOCALE_WINDOWS | (locale->inotneutral ? LOCALE_SPECIFICDATA : LOCALE_NEUTRALDATA); if (wanted_flags && !(flags & wanted_flags)) continue; if (!proc( buffer, flags, param )) break; } - RegCloseKey( altkey ); - RegCloseKey( key ); return TRUE; }

1 0