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

Eric Pouech : ntdll/tests: Enable compilation with long types in threadpool.c.
by Alexandre Julliard 24 Mar '22

24 Mar '22

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 24 Mar '22

24 Mar '22

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 24 Mar '22

24 Mar '22

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

Eric Pouech : ntdll/tests: Enable compilation with long types in wow64.c.
by Alexandre Julliard 24 Mar '22

24 Mar '22

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

1 0

Eric Pouech : ntdll/tests: Finalize migration to long types.
by Alexandre Julliard 24 Mar '22

24 Mar '22

Module: wine Branch: master Commit: 55b45d00efeb8330c6cf87ab9feb74050df50de3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55b45d00efeb8330c6cf87ab… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 24 09:57:52 2022 +0100 ntdll/tests: Finalize migration to long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/Makefile.in | 1 - dlls/ntdll/tests/atom.c | 1 - dlls/ntdll/tests/change.c | 1 - dlls/ntdll/tests/directory.c | 1 - dlls/ntdll/tests/env.c | 1 - dlls/ntdll/tests/error.c | 1 - dlls/ntdll/tests/exception.c | 1 - dlls/ntdll/tests/file.c | 1 - dlls/ntdll/tests/info.c | 1 - dlls/ntdll/tests/large_int.c | 1 - dlls/ntdll/tests/om.c | 1 - dlls/ntdll/tests/path.c | 1 - dlls/ntdll/tests/pipe.c | 1 - dlls/ntdll/tests/port.c | 1 - dlls/ntdll/tests/reg.c | 1 - dlls/ntdll/tests/rtl.c | 1 - dlls/ntdll/tests/rtlbitmap.c | 1 - dlls/ntdll/tests/rtlstr.c | 1 - dlls/ntdll/tests/string.c | 1 - dlls/ntdll/tests/sync.c | 1 - dlls/ntdll/tests/thread.c | 1 - dlls/ntdll/tests/threadpool.c | 1 - dlls/ntdll/tests/time.c | 1 - dlls/ntdll/tests/virtual.c | 1 - dlls/ntdll/tests/wow64.c | 1 - 25 files changed, 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=55b45d00efeb8330c6cf…

1 0

Alexandre Julliard : kernelbase: Load the locale.nls file at startup.
by Alexandre Julliard 24 Mar '22

24 Mar '22

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 IsValidLocaleName() using the locale.nls data.
by Alexandre Julliard 24 Mar '22

24 Mar '22

Module: wine Branch: master Commit: da125003e6cf5522c1f97246c96c3a754b5b4f66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da125003e6cf5522c1f97246… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 24 16:45:24 2022 +0100 kernelbase: Reimplement IsValidLocaleName() using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index cb5441f755e..318fe24d10a 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -729,6 +729,38 @@ done: } +static int compare_locale_names( const WCHAR *n1, const WCHAR *n2 ) +{ + for (;;) + { + WCHAR ch1 = *n1++; + WCHAR ch2 = *n2++; + if (ch1 >= 'a' && ch1 <= 'z') ch1 -= 'a' - 'A'; + else if (ch1 == '_') ch1 = '-'; + if (ch2 >= 'a' && ch2 <= 'z') ch2 -= 'a' - 'A'; + else if (ch2 == '_') ch2 = '-'; + if (!ch1 || ch1 != ch2) return ch1 - ch2; + } +} + + +static const NLS_LOCALE_LCNAME_INDEX *find_lcname_entry( const WCHAR *name ) +{ + int min = 0, max = locale_table->nb_lcnames - 1; + + while (min <= max) + { + int res, pos = (min + max) / 2; + const WCHAR *str = locale_strings + lcnames_index[pos].name; + res = compare_locale_names( name, str + 1 ); + if (res < 0) max = pos - 1; + else if (res > 0) min = pos + 1; + else return &lcnames_index[pos]; + } + return NULL; +} + + /*********************************************************************** * init_locale */ @@ -5190,9 +5222,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsValidLocale( LCID lcid, DWORD flags ) */ BOOL WINAPI DECLSPEC_HOTPATCH IsValidLocaleName( const WCHAR *locale ) { - LCID lcid; - - return !RtlLocaleNameToLcid( locale, &lcid, 2 ); + if (locale == LOCALE_NAME_USER_DEFAULT) return FALSE; + return !!find_lcname_entry( locale ); }

1 0

Alexandre Julliard : kernelbase: Reimplement IsValidLocale() using the locale.nls data.
by Alexandre Julliard 24 Mar '22

24 Mar '22

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 24 Mar '22

24 Mar '22

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 24 Mar '22

24 Mar '22

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