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

Alexandre Julliard : kernelbase: Reimplement LOCALE_SPARENT in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard March 28, 2022

March 28, 2022

Module: wine Branch: master Commit: 0f7cd3d685b2b81a3d6802c0b32080bfa5dc4b90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f7cd3d685b2b81a3d6802c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 12:13:04 2022 +0200 kernelbase: Reimplement LOCALE_SPARENT in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 258893cada6..39d7fe1ccd9 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1103,7 +1103,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SPARENT: - return -1; + return locale_return_string( locale->sparent, type, buffer, len ); case LOCALE_SCONSOLEFALLBACKNAME: return -1; @@ -5017,17 +5017,6 @@ INT WINAPI DECLSPEC_HOTPATCH GetLocaleInfoEx( const WCHAR *name, LCTYPE info, WC lcid = LocaleNameToLCID( name, 0 ); if (!lcid) return 0; - - /* special handling for neutral locale names */ - if (name && lstrlenW( name ) == 2) - { - switch (LOWORD( info )) - { - case LOCALE_SPARENT: - if (len) buffer[0] = 0; - return 1; - } - } return GetLocaleInfoW( lcid, info, buffer, len ); }

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_*LANGNAME in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard March 28, 2022

March 28, 2022

Module: wine Branch: master Commit: 85a39a977347e037bcd910efd388faa6f04d870a URL: https://source.winehq.org/git/wine.git/?a=commit;h=85a39a977347e037bcd910ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 12:26:34 2022 +0200 kernelbase: Reimplement LOCALE_*LANGNAME in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 13 +++++++------ dlls/msvcrt/locale.c | 9 +++++++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 7cb16e5b387..0caf790384c 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -906,10 +906,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SABBREVLANGNAME: - return -1; + return locale_return_string( locale->sabbrevlangname, type, buffer, len ); case LOCALE_SNATIVELANGNAME: - return -1; + return locale_return_string( locale->snativelangname, type, buffer, len ); case LOCALE_ICOUNTRY: return -1; @@ -1094,7 +1094,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SISO639LANGNAME: - return -1; + return locale_return_string( locale->siso639langname, type, buffer, len ); case LOCALE_SISO3166CTRYNAME: return -1; @@ -1126,7 +1126,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SISO639LANGNAME2: - return -1; + return locale_return_string( locale->siso639langname2, type, buffer, len ); case LOCALE_SISO3166CTRYNAME2: return -1; @@ -1150,7 +1150,8 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SLOCALIZEDLANGUAGENAME: - return -1; + /* FIXME: localization */ + return locale_return_string( locale->senglanguage, type, buffer, len ); case LOCALE_IREADINGLAYOUT: return -1; @@ -1201,7 +1202,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SENGLANGUAGE: - return -1; + return locale_return_string( locale->senglanguage, type, buffer, len ); case LOCALE_SENGCOUNTRY: return -1; diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 924671e7047..e800e7142c8 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -525,8 +525,13 @@ static BOOL update_threadlocinfo_category(LCID lcid, unsigned short cp, if(!locinfo->lc_category[category].locale) { int len = 0; - len += GetLocaleInfoA(lcid, LOCALE_SENGLANGUAGE - |LOCALE_NOUSEROVERRIDE, buf, 256); + if (lcid == MAKELANGID( LANG_NORWEGIAN, SUBLANG_NORWEGIAN_NYNORSK )) + { + /* locale.nls contains "Norwegian Nynorsk" instead for LOCALE_SENGLANGUAGE */ + strcpy( buf, "Norwegian-Nynorsk" ); + len = strlen( buf ) + 1; + } + else len += GetLocaleInfoA(lcid, LOCALE_SENGLANGUAGE|LOCALE_NOUSEROVERRIDE, buf, 256); buf[len-1] = '_'; len += GetLocaleInfoA(lcid, LOCALE_SENGCOUNTRY |LOCALE_NOUSEROVERRIDE, &buf[len], 256-len);

1 0

Eric Pouech : shell32: Always allocate a whole ITEMIDLIST structure.
by Alexandre Julliard March 28, 2022

March 28, 2022

Module: wine Branch: master Commit: e62dd2a5b62a6a75d9bcaec29e80b31eb257c41d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e62dd2a5b62a6a75d9bcaec2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 24 10:13:26 2022 +0100 shell32: Always allocate a whole ITEMIDLIST structure. Partially allocating a structure generates -Warray-bounds warnings with GCC11. In this specific case, given the rounding in memory allocators, would even not increase the effective allocated size. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/pidl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 4c66a14c700..f9c91a79132 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1574,7 +1574,7 @@ LPITEMIDLIST _ILCreateDesktop(void) LPITEMIDLIST ret; TRACE("()\n"); - ret = SHAlloc(2); + ret = SHAlloc(sizeof(*ret)); if (ret) ret->mkid.cb = 0; return ret;

1 0

Santino Mazza : ncrypt: Implement NCryptVerifySignature.
by Alexandre Julliard March 28, 2022

March 28, 2022

Module: wine Branch: master Commit: 24914ab84bc4bfc27b0899b8311d590fc76d337a URL: https://source.winehq.org/git/wine.git/?a=commit;h=24914ab84bc4bfc27b0899b8… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Mon Mar 28 11:52:03 2022 +0200 ncrypt: Implement NCryptVerifySignature. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 25 +++++++++++++++++++++---- dlls/ncrypt/tests/ncrypt.c | 8 +++----- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f8fb3135f56..cc979a539d2 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -36,8 +36,11 @@ static SECURITY_STATUS map_ntstatus(NTSTATUS status) { switch (status) { - case STATUS_INVALID_HANDLE: return NTE_INVALID_HANDLE; - case NTE_BAD_DATA: return NTE_BAD_DATA; + case STATUS_INVALID_HANDLE: return NTE_INVALID_HANDLE; + case STATUS_INVALID_SIGNATURE: return NTE_BAD_SIGNATURE; + case STATUS_SUCCESS: return ERROR_SUCCESS; + case STATUS_INVALID_PARAMETER: return NTE_INVALID_PARAMETER; + case NTE_BAD_DATA: return NTE_BAD_DATA; default: FIXME("unhandled status %#lx\n", status); return NTE_INTERNAL_ERROR; @@ -458,7 +461,21 @@ SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE handle, const WCHAR *name SECURITY_STATUS WINAPI NCryptVerifySignature(NCRYPT_KEY_HANDLE handle, void *padding, BYTE *hash, DWORD hash_size, BYTE *signature, DWORD signature_size, DWORD flags) { - FIXME("(%#Ix, %p, %p, %lu, %p, %lu, %#lx): stub\n", handle, padding, hash, hash_size, signature, + struct object *key_object = (struct object *)handle; + + TRACE("(%#Ix, %p, %p, %lu, %p, %lu, %#lx)\n", handle, padding, hash, hash_size, signature, signature_size, flags); - return ERROR_SUCCESS; + + if (!hash_size || !signature_size) return NTE_INVALID_PARAMETER; + if (!hash || !signature) return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER); + if (!handle || key_object->type != KEY) return NTE_INVALID_HANDLE; + + if (key_object->key.algid < RSA) + { + FIXME("Symmetric keys not supported.\n"); + return NTE_NOT_SUPPORTED; + } + + return map_ntstatus(BCryptVerifySignature(key_object->key.bcrypt_key, padding, hash, hash_size, signature, + signature_size, flags)); } diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index e8de441876b..7fb8b2cb4c5 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -428,7 +428,6 @@ static void test_verify_signature(void) sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); - todo_wine { ret = NCryptVerifySignature(key, &padinfo, sha256_hash, sizeof(sha256_hash), invalid_signature, sizeof(invalid_signature), NCRYPT_PAD_PKCS1_FLAG); ok(ret == NTE_BAD_SIGNATURE, "got %#lx\n", ret); @@ -447,7 +446,7 @@ static void test_verify_signature(void) ret = NCryptVerifySignature(key, &padinfo, sha256_hash, 4, signature_pkcs1_sha256, sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); - ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); + todo_wine ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); ret = NCryptVerifySignature(key, &padinfo, sha256_hash, sizeof(sha256_hash), NULL, sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); @@ -455,13 +454,12 @@ static void test_verify_signature(void) ret = NCryptVerifySignature(key, &padinfo, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, 4, NCRYPT_PAD_PKCS1_FLAG); - ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); + todo_wine ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); invalid_padinfo.pszAlgId = BCRYPT_MD5_ALGORITHM; ret = NCryptVerifySignature(key, &invalid_padinfo, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); - ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); - } + todo_wine ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); NCryptFreeObject(key); NCryptFreeObject(prov);

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_*CTRYNAME in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard March 28, 2022

March 28, 2022

Module: wine Branch: master Commit: 2c70ed249ab393f8cb1e522bbd6cf299afe82906 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c70ed249ab393f8cb1e522b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 12:27:45 2022 +0200 kernelbase: Reimplement LOCALE_*CTRYNAME in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 13 +++++++------ dlls/msvcrt/locale.c | 3 --- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 0caf790384c..2faec8136b9 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -915,13 +915,14 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SLOCALIZEDCOUNTRYNAME: - return -1; + /* FIXME: localization */ + return locale_return_string( locale->sengcountry, type, buffer, len ); case LOCALE_SABBREVCTRYNAME: - return -1; + return locale_return_string( locale->sabbrevctryname, type, buffer, len ); case LOCALE_SNATIVECTRYNAME: - return -1; + return locale_return_string( locale->snativectryname, type, buffer, len ); case LOCALE_IDEFAULTLANGUAGE: return locale_return_number( locale->idefaultlanguage, type, buffer, len ); @@ -1097,7 +1098,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->siso639langname, type, buffer, len ); case LOCALE_SISO3166CTRYNAME: - return -1; + return locale_return_string( locale->siso3166ctryname, type, buffer, len ); case LOCALE_IGEOID: return -1; @@ -1129,7 +1130,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->siso639langname2, type, buffer, len ); case LOCALE_SISO3166CTRYNAME2: - return -1; + return locale_return_string( locale->siso3166ctryname2, type, buffer, len ); case LOCALE_SNAN: return -1; @@ -1205,7 +1206,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->senglanguage, type, buffer, len ); case LOCALE_SENGCOUNTRY: - return -1; + return locale_return_string( locale->sengcountry, type, buffer, len ); case LOCALE_STIMEFORMAT: return -1; diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index e800e7142c8..037660d0a91 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -363,9 +363,6 @@ LCID locale_to_LCID(const char *locale, unsigned short *codepage, BOOL *sname) search.allow_sname = TRUE; } - if(!_stricmp(search.search_country, "China")) - strcpy(search.search_country, "People's Republic of China"); - EnumResourceLanguagesA(GetModuleHandleA("KERNEL32"), (LPSTR)RT_STRING, (LPCSTR)LOCALE_ILANGUAGE,find_best_locale_proc, (LONG_PTR)&search);

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_*DEFAULTCODEPAGE in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard March 28, 2022

March 28, 2022

Module: wine Branch: master Commit: b1e17a053a66d06532aa0b8258569d5efc51a806 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1e17a053a66d06532aa0b82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 12:42:21 2022 +0200 kernelbase: Reimplement LOCALE_*DEFAULTCODEPAGE in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 2e512240b2b..7f8c51a8414 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -932,7 +932,8 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_IDEFAULTCODEPAGE: - return -1; + val = locale->idefaultcodepage == CP_UTF8 ? CP_OEMCP : locale->idefaultcodepage; + return locale_return_number( val, type, buffer, len ); case LOCALE_SLIST: return -1; @@ -1213,7 +1214,8 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_IDEFAULTANSICODEPAGE: - return -1; + val = locale->idefaultansicodepage == CP_UTF8 ? CP_ACP : locale->idefaultansicodepage; + return locale_return_number( val, type, buffer, len ); case LOCALE_ITIMEMARKPOSN: return -1; @@ -1252,10 +1254,11 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_IDEFAULTMACCODEPAGE: - return -1; + val = locale->idefaultmaccodepage == CP_UTF8 ? CP_MACCP : locale->idefaultmaccodepage; + return locale_return_number( val, type, buffer, len ); case LOCALE_IDEFAULTEBCDICCODEPAGE: - return -1; + return locale_return_number( locale->idefaultebcdiccodepage, type, buffer, len ); case LOCALE_SSORTNAME: return -1;

1 0

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

March 28, 2022

Module: wine Branch: master Commit: 412e79181fc15aec030a584ca484a6b6fedee868 URL: https://source.winehq.org/git/wine.git/?a=commit;h=412e79181fc15aec030a584c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 12:21:15 2022 +0200 kernelbase: Reimplement LCIDToLocaleName() using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 8 ++++++++ dlls/kernelbase/locale.c | 16 ++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index d30a771c2c2..9475df22cbe 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2790,6 +2790,14 @@ static void test_LocaleNameToLCID(void) ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(L"zh-hans"), ret); ok(!lstrcmpW(L"zh-CN", buffer), "%s: got wrong locale name %s\n", wine_dbgstr_w(L"zh-hans"), wine_dbgstr_w(buffer)); + + /* de-DE_phoneb */ + lcid = pLocaleNameToLCID(L"de-DE_phoneb", 0); + ok(lcid == MAKELCID(MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), SORT_GERMAN_PHONE_BOOK), + "%s: got wrong lcid 0x%04lx\n", wine_dbgstr_w(L"zh-hans"), lcid); + ret = pLCIDToLocaleName(lcid, buffer, ARRAY_SIZE(buffer), 0); + ok(!lstrcmpW(L"de-DE_phoneb", buffer), "got wrong locale name %s\n", + wine_dbgstr_w(buffer)); } if (pRtlLocaleNameToLcid) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 39d7fe1ccd9..8b137cdf90a 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -5180,9 +5180,9 @@ LANGID WINAPI DECLSPEC_HOTPATCH GetSystemDefaultLangID(void) /*********************************************************************** * GetSystemDefaultLocaleName (kernelbase.@) */ -INT WINAPI DECLSPEC_HOTPATCH GetSystemDefaultLocaleName( LPWSTR name, INT len ) +INT WINAPI DECLSPEC_HOTPATCH GetSystemDefaultLocaleName( LPWSTR name, INT count ) { - return LCIDToLocaleName( GetSystemDefaultLCID(), name, len, 0 ); + return get_locale_info( system_locale, system_lcid, LOCALE_SNAME, name, count ); } @@ -5329,7 +5329,7 @@ LANGID WINAPI DECLSPEC_HOTPATCH GetUserDefaultLangID(void) */ INT WINAPI DECLSPEC_HOTPATCH GetUserDefaultLocaleName( LPWSTR name, INT len ) { - return LCIDToLocaleName( GetUserDefaultLCID(), name, len, 0 ); + return get_locale_info( user_locale, user_lcid, LOCALE_SNAME, name, len ); } @@ -5692,10 +5692,14 @@ DWORD WINAPI DECLSPEC_HOTPATCH IsValidNLSVersion( NLS_FUNCTION func, const WCHAR */ INT WINAPI DECLSPEC_HOTPATCH LCIDToLocaleName( LCID lcid, WCHAR *name, INT count, DWORD flags ) { - static int once; - if (flags && !once++) FIXME( "unsupported flags %lx\n", flags ); + const NLS_LOCALE_DATA *locale = get_locale_by_id( &lcid, flags ); - return GetLocaleInfoW( lcid, LOCALE_SNAME | LOCALE_NOUSEROVERRIDE, name, count ); + if (!locale) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + return get_locale_info( locale, lcid, LOCALE_SNAME, name, count ); }

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_SNAME in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard March 28, 2022

March 28, 2022

Module: wine Branch: master Commit: d370618a5a505cbaf8cb5b1c441d3335aa8b2c1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d370618a5a505cbaf8cb5b1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 12:09:51 2022 +0200 kernelbase: Reimplement LOCALE_SNAME in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 435 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 423 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d370618a5a505cbaf8cb…

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_*DAYNAME in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard March 28, 2022

March 28, 2022

Module: wine Branch: master Commit: 5bf289ea37cc22309b9bb47b016195d5e12c2de2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bf289ea37cc22309b9bb47b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 13:26:01 2022 +0200 kernelbase: Reimplement LOCALE_*DAYNAME in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 7f8c51a8414..6e7a277ba07 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -887,6 +887,15 @@ static int locale_return_number( UINT val, LCTYPE type, WCHAR *buffer, int len ) } +static int locale_return_strarray( DWORD pos, WORD idx, LCTYPE type, WCHAR *buffer, int len ) +{ + const DWORD *array = (const DWORD *)(locale_strings + pos + 1); + WORD count = locale_strings[pos]; + + return locale_return_string( idx < count ? array[idx] : 0, type, buffer, len ); +} + + /* get locale information from the locale.nls file */ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE type, WCHAR *buffer, int len ) @@ -1030,7 +1039,8 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ case LOCALE_SDAYNAME5: case LOCALE_SDAYNAME6: case LOCALE_SDAYNAME7: - return -1; + return locale_return_strarray( locale->sdayname, + LOWORD(type - LOCALE_SDAYNAME1 + 1) % 7, type, buffer, len ); case LOCALE_SABBREVDAYNAME1: case LOCALE_SABBREVDAYNAME2: @@ -1039,7 +1049,8 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ case LOCALE_SABBREVDAYNAME5: case LOCALE_SABBREVDAYNAME6: case LOCALE_SABBREVDAYNAME7: - return -1; + return locale_return_strarray( locale->sabbrevdayname, + LOWORD(type - LOCALE_SABBREVDAYNAME1 + 1) % 7, type, buffer, len ); case LOCALE_SMONTHNAME1: case LOCALE_SMONTHNAME2: @@ -1126,7 +1137,8 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ case LOCALE_SSHORTESTDAYNAME5: case LOCALE_SSHORTESTDAYNAME6: case LOCALE_SSHORTESTDAYNAME7: - return -1; + return locale_return_strarray( locale->sshortestdayname, + LOWORD(type - LOCALE_SSHORTESTDAYNAME1 + 1) % 7, type, buffer, len ); case LOCALE_SISO639LANGNAME2: return locale_return_string( locale->siso639langname2, type, buffer, len );

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_ILANGUAGE/IDEFAULTLANGUAGE in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard March 28, 2022

March 28, 2022

Module: wine Branch: master Commit: 956c88db183402caf5f1bc4c45af5e667eef41e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=956c88db183402caf5f1bc4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 12:15:30 2022 +0200 kernelbase: Reimplement LOCALE_ILANGUAGE/IDEFAULTLANGUAGE in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 8b137cdf90a..7cb16e5b387 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -850,16 +850,57 @@ static int locale_return_string( DWORD pos, LCTYPE type, WCHAR *buffer, int len } +static int locale_return_number( UINT val, LCTYPE type, WCHAR *buffer, int len ) +{ + int ret; + WCHAR tmp[80]; + + if (!(type & LOCALE_RETURN_NUMBER)) + { + switch (LOWORD(type)) + { + case LOCALE_ILANGUAGE: + case LOCALE_IDEFAULTLANGUAGE: + ret = swprintf( tmp, ARRAY_SIZE(tmp), L"%04x", val ) + 1; + break; + case LOCALE_IDEFAULTEBCDICCODEPAGE: + ret = swprintf( tmp, ARRAY_SIZE(tmp), L"%03u", val ) + 1; + break; + default: + ret = swprintf( tmp, ARRAY_SIZE(tmp), L"%u", val ) + 1; + break; + } + } + else ret = sizeof(UINT) / sizeof(WCHAR); + + if (!len) return ret; + if (ret > len) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return 0; + } + + if (type & LOCALE_RETURN_NUMBER) memcpy( buffer, &val, sizeof(val) ); + else wcscpy( buffer, tmp ); + + return ret; +} + + /* get locale information from the locale.nls file */ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE type, WCHAR *buffer, int len ) { + UINT val; + if (locale != user_locale) type |= LOCALE_NOUSEROVERRIDE; switch (LOWORD(type)) { case LOCALE_ILANGUAGE: - return -1; + /* return default language for neutral locales */ + val = locale->inotneutral ? locale->ilanguage : locale->idefaultlanguage; + return locale_return_number( val, type, buffer, len ); case LOCALE_SLOCALIZEDDISPLAYNAME: return -1; @@ -883,7 +924,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_IDEFAULTLANGUAGE: - return -1; + return locale_return_number( locale->idefaultlanguage, type, buffer, len ); case LOCALE_IDEFAULTCOUNTRY: return -1;

1 0