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

Nikolay Sivov : directmanipulation: Use CRT memory allocation functions.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: 72c8bc653dc85ffb4df0f7082e154e74e8abc53b URL: https://source.winehq.org/git/wine.git/?a=commit;h=72c8bc653dc85ffb4df0f708… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 1 10:34:45 2022 +0300 directmanipulation: Use CRT memory allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/directmanipulation/directmanipulation.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index b20c41331e5..e72ffec3ddb 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -23,7 +23,6 @@ #include "winbase.h" #include "oleidl.h" #include "rpcproxy.h" -#include "wine/heap.h" #include "wine/debug.h" #include "directmanipulation.h" @@ -89,7 +88,7 @@ ULONG WINAPI update_manager_Release(IDirectManipulationUpdateManager *iface) if (!ref) { - heap_free(This); + free(This); } return ref; } @@ -130,7 +129,7 @@ static HRESULT create_update_manager(IDirectManipulationUpdateManager **obj) { struct directupdatemanager *object; - object = heap_alloc(sizeof(*object)); + object = malloc(sizeof(*object)); if(!object) return E_OUTOFMEMORY; @@ -201,7 +200,7 @@ static ULONG WINAPI primary_Release(IDirectManipulationPrimaryContent *iface) if (!ref) { - heap_free(This); + free(This); } return ref; } @@ -433,7 +432,7 @@ static ULONG WINAPI viewport_Release(IDirectManipulationViewport2 *iface) if (!ref) { - heap_free(This); + free(This); } return ref; } @@ -540,7 +539,7 @@ static HRESULT WINAPI viewport_GetPrimaryContent(IDirectManipulationViewport2 *i { struct primarycontext *primary; TRACE("IDirectManipulationPrimaryContent\n"); - primary = heap_alloc( sizeof(*primary)); + primary = malloc( sizeof(*primary)); if(!primary) return E_OUTOFMEMORY; @@ -719,7 +718,7 @@ static HRESULT create_viewport(IDirectManipulationViewport2 **obj) { struct directviewport *object; - object = heap_alloc(sizeof(*object)); + object = malloc(sizeof(*object)); if(!object) return E_OUTOFMEMORY; @@ -766,7 +765,7 @@ static ULONG WINAPI direct_manip_Release(IDirectManipulationManager2 *iface) { if(This->updatemanager) IDirectManipulationUpdateManager_Release(This->updatemanager); - heap_free(This); + free(This); } return ref; } @@ -887,7 +886,7 @@ static HRESULT WINAPI DirectManipulation_CreateInstance(IClassFactory *iface, IU *ppv = NULL; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + object = calloc(1, sizeof(*object)); if (!object) return E_OUTOFMEMORY; @@ -962,7 +961,7 @@ static ULONG WINAPI compositor_Release(IDirectManipulationCompositor2 *iface) { if(This->manager) IDirectManipulationUpdateManager_Release(This->manager); - heap_free(This); + free(This); } return ref; } @@ -1065,7 +1064,7 @@ static HRESULT WINAPI DirectCompositor_CreateInstance(IClassFactory *iface, IUnk *ppv = NULL; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + object = calloc(1, sizeof(*object)); if (!object) return E_OUTOFMEMORY;

1 0

Hans Leidekker : crypt32/tests: Add more OCSP response decoding tests.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: 4237cefb953af5a77f254e9951f63d393ad9c1dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=4237cefb953af5a77f254e99… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 1 11:45:36 2022 +0200 crypt32/tests: Add more OCSP response decoding tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/encode.c | 88 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 83 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index f25c779a9ce..8b1959fbef8 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -8860,7 +8860,7 @@ static const BYTE ocsp_basic_signed_response[] = { 0x05, 0x51, 0x49, 0xac, 0x2f, 0xe8, 0x67, 0xcf, 0xa7 }; -static const BYTE ocsp_to_be_signed[] = { +static const BYTE ocsp_basic_response[] = { 0x30, 0x81, 0x9e, 0xa2, 0x16, 0x04, 0x14, 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4, 0x18, 0x0f, 0x32, 0x30, 0x32, 0x32, 0x30, 0x33, 0x31, @@ -8877,6 +8877,24 @@ static const BYTE ocsp_to_be_signed[] = { 0x33, 0x36, 0x30, 0x31, 0x5a }; +static const BYTE ocsp_basic_response_revoked[] = { + 0x30, 0x81, 0xb1, 0xa2, 0x16, 0x04, 0x14, 0xa4, 0x8d, 0xe5, 0xbe, 0x7c, + 0x79, 0xe4, 0x70, 0x23, 0x6d, 0x2e, 0x29, 0x34, 0xad, 0x23, 0x58, 0xdc, + 0xf5, 0x31, 0x7f, 0x18, 0x0f, 0x32, 0x30, 0x32, 0x32, 0x30, 0x33, 0x33, + 0x31, 0x30, 0x31, 0x32, 0x35, 0x30, 0x35, 0x5a, 0x30, 0x81, 0x85, 0x30, + 0x81, 0x82, 0x30, 0x49, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, + 0x1a, 0x05, 0x00, 0x04, 0x14, 0x74, 0xb4, 0xe7, 0x23, 0x19, 0xc7, 0x65, + 0x92, 0x15, 0x40, 0x44, 0x7b, 0xc7, 0xce, 0x3e, 0x90, 0xc2, 0x18, 0x76, + 0xeb, 0x04, 0x14, 0xa4, 0x8d, 0xe5, 0xbe, 0x7c, 0x79, 0xe4, 0x70, 0x23, + 0x6d, 0x2e, 0x29, 0x34, 0xad, 0x23, 0x58, 0xdc, 0xf5, 0x31, 0x7f, 0x02, + 0x10, 0x0d, 0x2e, 0x67, 0xa2, 0x98, 0x85, 0x3b, 0x9a, 0x54, 0x52, 0xe3, + 0xa2, 0x85, 0xa4, 0x57, 0x2f, 0xa1, 0x11, 0x18, 0x0f, 0x32, 0x30, 0x32, + 0x31, 0x31, 0x30, 0x32, 0x37, 0x32, 0x31, 0x33, 0x38, 0x34, 0x38, 0x5a, + 0x18, 0x0f, 0x32, 0x30, 0x32, 0x32, 0x30, 0x33, 0x33, 0x31, 0x30, 0x31, + 0x30, 0x39, 0x30, 0x31, 0x5a, 0xa0, 0x11, 0x18, 0x0f, 0x32, 0x30, 0x32, + 0x32, 0x30, 0x34, 0x30, 0x37, 0x30, 0x30, 0x32, 0x34, 0x30, 0x31, 0x5a +}; + static const BYTE ocsp_signature[] = { 0x6a, 0x4c, 0xfa, 0xe6, 0xe3, 0x48, 0xbb, 0xd6, 0x18, 0x33, 0x04, 0x9d, 0x6a, 0x92, 0x4d, 0x01, 0x74, 0x4f, 0x1a, 0x70, 0xfa, 0xf2, 0x8b, 0xba, @@ -8914,8 +8932,8 @@ static void test_decodeOCSPBasicSignedResponseInfo(DWORD dwEncoding) ok(ret, "got %08lx\n", GetLastError()); if (sizeof(void *) == 4) todo_wine ok(size == 496, "got %lu\n", size); else ok(size == 536, "got %lu\n", size); - ok(info->ToBeSigned.cbData == sizeof(ocsp_to_be_signed), "got %lu\n", info->ToBeSigned.cbData); - ok(!memcmp(info->ToBeSigned.pbData, ocsp_to_be_signed, sizeof(ocsp_to_be_signed)), "wrong data\n"); + ok(info->ToBeSigned.cbData == sizeof(ocsp_basic_response), "got %lu\n", info->ToBeSigned.cbData); + ok(!memcmp(info->ToBeSigned.pbData, ocsp_basic_response, sizeof(ocsp_basic_response)), "wrong data\n"); ok(!strcmp(info->SignatureInfo.SignatureAlgorithm.pszObjId, szOID_RSA_SHA256RSA), "got %s\n", info->SignatureInfo.SignatureAlgorithm.pszObjId); @@ -8941,22 +8959,35 @@ static void test_decodeOCSPBasicResponseInfo(DWORD dwEncoding) static const BYTE resp_id[] = { 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4}; + static const BYTE resp_id2[] = { + 0xa4, 0x8d, 0xe5, 0xbe, 0x7c, 0x79, 0xe4, 0x70, 0x23, 0x6d, 0x2e, 0x29, 0x34, 0xad, 0x23, 0x58, + 0xdc, 0xf5, 0x31, 0x7f}; static const BYTE name_hash[] = { 0xe4, 0xe3, 0x95, 0xa2, 0x29, 0xd3, 0xd4, 0xc1, 0xc3, 0x1f, 0xf0, 0x98, 0x0c, 0x0b, 0x4e, 0xc0, 0x09, 0x8a, 0xab, 0xd8}; + static const BYTE name_hash2[] = { + 0x74, 0xb4, 0xe7, 0x23, 0x19, 0xc7, 0x65, 0x92, 0x15, 0x40, 0x44, 0x7b, 0xc7, 0xce, 0x3e, 0x90, + 0xc2, 0x18, 0x76, 0xeb}; static const BYTE key_hash[] = { 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4}; + static const BYTE key_hash2[] = { + 0xa4, 0x8d, 0xe5, 0xbe, 0x7c, 0x79, 0xe4, 0x70, 0x23, 0x6d, 0x2e, 0x29, 0x34, 0xad, 0x23, 0x58, + 0xdc, 0xf5, 0x31, 0x7f}; static const BYTE serial[] = { 0xb1, 0xc1, 0x87, 0x54, 0x54, 0xac, 0x1e, 0x55, 0x40, 0xfb, 0xef, 0xd9, 0x6d, 0x8f, 0x49, 0x08}; + static const BYTE serial2[] = { + 0x2f, 0x57, 0xa4, 0x85, 0xa2, 0xe3, 0x52, 0x54, 0x9a, 0x3b, 0x85, 0x98, 0xa2, 0x67, 0x2e, 0x0d}; OCSP_BASIC_RESPONSE_INFO *info; OCSP_BASIC_RESPONSE_ENTRY *entry; + OCSP_BASIC_REVOKED_INFO *revoked; DWORD size; BOOL ret; + /* good cert */ size = 0; - ret = pCryptDecodeObjectEx(dwEncoding, OCSP_BASIC_RESPONSE, ocsp_to_be_signed, - sizeof(ocsp_to_be_signed), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); + ret = pCryptDecodeObjectEx(dwEncoding, OCSP_BASIC_RESPONSE, ocsp_basic_response, + sizeof(ocsp_basic_response), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); ok(ret, "got %08lx\n", GetLastError()); ok(!info->dwVersion, "got %lu\n", info->dwVersion); @@ -8991,6 +9022,53 @@ static void test_decodeOCSPBasicResponseInfo(DWORD dwEncoding) ok(!info->cExtension, "got %lu\n", info->cExtension); ok(info->rgExtension == NULL, "got %p\n", info->rgExtension); LocalFree(info); + + /* revoked cert */ + size = 0; + ret = pCryptDecodeObjectEx(dwEncoding, OCSP_BASIC_RESPONSE, ocsp_basic_response_revoked, + sizeof(ocsp_basic_response_revoked), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); + todo_wine ok(ret, "got %08lx\n", GetLastError()); + + if (ret) { + ok(!info->dwVersion, "got %lu\n", info->dwVersion); + ok(info->dwResponderIdChoice == 2, "got %lu\n", info->dwResponderIdChoice); + ok(info->ByKeyResponderId.cbData == sizeof(resp_id), "got %lu\n", info->ByKeyResponderId.cbData); + ok(!memcmp(info->ByKeyResponderId.pbData, resp_id2, sizeof(resp_id2)), "wrong data\n"); + ok(info->ProducedAt.dwLowDateTime == 647048832, "got %lu\n", info->ProducedAt.dwLowDateTime); + ok(info->ProducedAt.dwHighDateTime == 30950558, "got %lu\n", info->ProducedAt.dwHighDateTime); + ok(info->cResponseEntry == 1, "got %lu\n", info->cResponseEntry); + ok(info->rgResponseEntry != NULL, "got %p\n", info->rgResponseEntry); + + entry = info->rgResponseEntry; + ok(!strcmp(entry->CertId.HashAlgorithm.pszObjId, szOID_OIWSEC_sha1), "got '%s'\n", entry->CertId.HashAlgorithm.pszObjId); + ok(entry->CertId.HashAlgorithm.Parameters.cbData == 2, "got %lu\n", entry->CertId.HashAlgorithm.Parameters.cbData); + ok(entry->CertId.HashAlgorithm.Parameters.pbData[0] == 5, "got 0x%02x\n", entry->CertId.HashAlgorithm.Parameters.pbData[0]); + ok(!entry->CertId.HashAlgorithm.Parameters.pbData[1], "got 0x%02x\n", entry->CertId.HashAlgorithm.Parameters.pbData[1]); + ok(entry->CertId.IssuerNameHash.cbData == 20, "got %lu\n", entry->CertId.IssuerNameHash.cbData); + ok(!memcmp(entry->CertId.IssuerNameHash.pbData, name_hash2, sizeof(name_hash2)), "wrong data\n"); + ok(entry->CertId.IssuerKeyHash.cbData == 20, "got %lu\n", entry->CertId.IssuerKeyHash.cbData); + ok(!memcmp(entry->CertId.IssuerKeyHash.pbData, key_hash2, sizeof(key_hash2)), "wrong data\n"); + ok(entry->CertId.SerialNumber.cbData == 16, "got %lu\n", entry->CertId.SerialNumber.cbData); + ok(!memcmp(entry->CertId.SerialNumber.pbData, serial2, sizeof(serial2)), "wrong data\n"); + ok(entry->dwCertStatus == 1, "got %lu\n", entry->dwCertStatus); + ok(entry->pRevokedInfo != NULL, "got NULL\n"); + + revoked = entry->pRevokedInfo; + ok(revoked->RevocationDate.dwLowDateTime == 107865088, "got %lu\n", revoked->RevocationDate.dwLowDateTime); + ok(revoked->RevocationDate.dwHighDateTime == 30919547, "got %lu\n", revoked->RevocationDate.dwHighDateTime); + ok(!revoked->dwCrlReasonCode, "got %lu\n", revoked->dwCrlReasonCode); + + ok(entry->ThisUpdate.dwLowDateTime == 3891950720, "got %lu\n", entry->ThisUpdate.dwLowDateTime); + ok(entry->ThisUpdate.dwHighDateTime == 30950555, "got %lu\n", entry->ThisUpdate.dwHighDateTime); + ok(entry->NextUpdate.dwLowDateTime == 3347801728, "got %lu\n", entry->NextUpdate.dwLowDateTime); + ok(entry->NextUpdate.dwHighDateTime == 30951957, "got %lu\n", entry->NextUpdate.dwHighDateTime); + ok(!entry->cExtension, "got %lu\n", entry->cExtension); + ok(entry->rgExtension == NULL, "got %p\n", entry->rgExtension); + + ok(!info->cExtension, "got %lu\n", info->cExtension); + ok(info->rgExtension == NULL, "got %p\n", info->rgExtension); + } + LocalFree(info); } START_TEST(encode)

1 0

Alexandre Julliard : ntdll: Recognize more script names in Unix locales.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: 4a757e2d20eec90b6061ca2868cd7ecd02a9afd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a757e2d20eec90b6061ca28… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 15:24:39 2022 +0200 ntdll: Recognize more script names in Unix locales. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 2302ee46e86..64117e70abe 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1019,6 +1019,7 @@ static WCHAR **build_wargv( const WCHAR *image ) static BOOL unix_to_win_locale( const char *unix_name, char *win_name ) { static const char sep[] = "_.@"; + const char *extra = NULL; char buffer[LOCALE_NAME_MAX_LENGTH]; char *p, *country = NULL, *modifier = NULL; @@ -1062,9 +1063,23 @@ static BOOL unix_to_win_locale( const char *unix_name, char *win_name ) strcpy( win_name, buffer ); if (modifier) { - if (!strcmp( modifier, "latin" )) strcat( win_name, "-Latn" ); - else if (!strcmp( modifier, "euro" )) {} /* ignore */ - else return FALSE; + if (!strcmp( modifier, "arabic" )) strcat( win_name, "-Arab" ); + else if (!strcmp( modifier, "chakma" )) strcat( win_name, "-Cakm" ); + else if (!strcmp( modifier, "cherokee" )) strcat( win_name, "-Cher" ); + else if (!strcmp( modifier, "cyrillic" )) strcat( win_name, "-Cyrl" ); + else if (!strcmp( modifier, "devanagari" )) strcat( win_name, "-Deva" ); + else if (!strcmp( modifier, "gurmukhi" )) strcat( win_name, "-Guru" ); + else if (!strcmp( modifier, "javanese" )) strcat( win_name, "-Java" ); + else if (!strcmp( modifier, "latin" )) strcat( win_name, "-Latn" ); + else if (!strcmp( modifier, "mongolian" )) strcat( win_name, "-Mong" ); + else if (!strcmp( modifier, "syriac" )) strcat( win_name, "-Syrc" ); + else if (!strcmp( modifier, "tifinagh" )) strcat( win_name, "-Tfng" ); + else if (!strcmp( modifier, "tibetan" )) strcat( win_name, "-Tibt" ); + else if (!strcmp( modifier, "vai" )) strcat( win_name, "-Vaii" ); + else if (!strcmp( modifier, "yi" )) strcat( win_name, "-Yiii" ); + else if (!strcmp( modifier, "saaho" )) strcpy( win_name, "ssy" ); + else if (!strcmp( modifier, "valencia" )) extra = "-valencia"; + /* ignore unknown modifiers */ } if (country) { @@ -1072,6 +1087,7 @@ static BOOL unix_to_win_locale( const char *unix_name, char *win_name ) *p++ = '-'; strcpy( p, country ); } + if (extra) strcat( win_name, extra ); return TRUE; }

1 0

Alexandre Julliard : kernelbase: Set system/user locales by name if they have no LCID.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: c0ff1a221be311534db72e9ff316287eb6b31351 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0ff1a221be311534db72e9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 15:24:59 2022 +0200 kernelbase: Set system/user locales by name if they have no LCID. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 997c7b6f4bc..4f0957ceff6 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1547,12 +1547,32 @@ void init_locale( HMODULE module ) SIZE_T size; HKEY hkey; + kernelbase_handle = module; 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 ); - kernelbase_handle = module; + if (!(system_locale = get_locale_by_id( &system_lcid, 0 ))) + { + if (GetEnvironmentVariableW( L"WINELOCALE", bufferW, ARRAY_SIZE(bufferW) )) + { + system_locale = get_locale_by_name( bufferW, &system_lcid ); + if (system_lcid == LOCALE_CUSTOM_UNSPECIFIED) system_lcid = LOCALE_CUSTOM_DEFAULT; + } + } + if (!(user_locale = get_locale_by_id( &user_lcid, 0 ))) + { + if (GetEnvironmentVariableW( L"WINEUSERLOCALE", bufferW, ARRAY_SIZE(bufferW) )) + { + user_locale = get_locale_by_name( bufferW, &user_lcid ); + if (user_lcid == LOCALE_CUSTOM_UNSPECIFIED) user_lcid = LOCALE_CUSTOM_DEFAULT; + } + else + { + user_locale = system_locale; + user_lcid = system_lcid; + } + } if (GetEnvironmentVariableW( L"WINEUNIXCP", bufferW, ARRAY_SIZE(bufferW) )) unix_cp = wcstoul( bufferW, NULL, 10 );

1 0

Alexandre Julliard : kernelbase: Check the locale name instead of the LCID to detect changes.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: c30626505b2782decc1370f9f60b82ebfd9f7c8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c30626505b2782decc1370f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 16:00:46 2022 +0200 kernelbase: Check the locale name instead of the LCID to detect changes. 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 4f0957ceff6..6bfa9604806 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1543,6 +1543,7 @@ void init_locale( HMODULE module ) void *sort_ptr; WCHAR bufferW[LOCALE_NAME_MAX_LENGTH]; DYNAMIC_TIME_ZONE_INFORMATION timezone; + const WCHAR *user_locale_name; DWORD count; SIZE_T size; HKEY hkey; @@ -1621,13 +1622,15 @@ void init_locale( HMODULE module ) /* Update registry contents if the user locale has changed. * This simulates the action of the Windows control panel. */ + user_locale_name = locale_strings + user_locale->sname + 1; count = sizeof(bufferW); - if (!RegQueryValueExW( intl_key, L"Locale", NULL, NULL, (BYTE *)bufferW, &count )) + if (!RegQueryValueExW( intl_key, L"LocaleName", NULL, NULL, (BYTE *)bufferW, &count )) { - if (wcstoul( bufferW, NULL, 16 ) == user_lcid) return; /* already set correctly */ - TRACE( "updating registry, locale changed %s -> %08lx\n", debugstr_w(bufferW), user_lcid ); + if (!wcscmp( bufferW, user_locale_name )) return; /* unchanged */ + TRACE( "updating registry, locale changed %s -> %s\n", + debugstr_w(bufferW), debugstr_w(user_locale_name) ); } - else TRACE( "updating registry, locale changed none -> %08lx\n", user_lcid ); + else TRACE( "updating registry, locale changed none -> %s\n", debugstr_w(user_locale_name) ); update_locale_registry();

1 0

Alexandre Julliard : oleaut32: Silence error message for unknown languages.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: 917d4306989ebdf24faefdaec2128b25b64d6b7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=917d4306989ebdf24faefdae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 12:57:45 2022 +0200 oleaut32: Silence error message for unknown languages. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/hash.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/dlls/oleaut32/hash.c b/dlls/oleaut32/hash.c index f1df69ef5e3..896e0ec5d37 100644 --- a/dlls/oleaut32/hash.c +++ b/dlls/oleaut32/hash.c @@ -520,34 +520,6 @@ ULONG WINAPI LHashValOfNameSysA( SYSKIND skind, LCID lcid, LPCSTR lpStr) switch (PRIMARYLANGID(LANGIDFROMLCID(lcid))) { default: - ERR("Unknown lcid %lx, treating as latin-based, please report\n", lcid); - /* .. Fall Through .. */ - case LANG_AFRIKAANS: case LANG_ALBANIAN: case LANG_ARMENIAN: - case LANG_ASSAMESE: case LANG_AZERI: case LANG_BASQUE: - case LANG_BELARUSIAN: case LANG_BENGALI: case LANG_BULGARIAN: - case LANG_CATALAN: case LANG_DANISH: case LANG_DIVEHI: - case LANG_DUTCH: case LANG_ENGLISH: case LANG_ESTONIAN: - case LANG_FAEROESE: case LANG_FINNISH: case LANG_FRENCH: - case LANG_GALICIAN: case LANG_GEORGIAN: case LANG_GERMAN: - case LANG_GUJARATI: case LANG_HINDI: case LANG_INDONESIAN: - case LANG_ITALIAN: case LANG_KANNADA: case LANG_KASHMIRI: - case LANG_KAZAK: case LANG_KONKANI: case LANG_KYRGYZ: - case LANG_LATVIAN: case LANG_LITHUANIAN: case LANG_MACEDONIAN: - case LANG_MALAY: case LANG_MALAYALAM: case LANG_MANIPURI: - case LANG_MARATHI: case LANG_MONGOLIAN: case LANG_NEPALI: - case LANG_ORIYA: case LANG_PORTUGUESE: case LANG_PUNJABI: - case LANG_ROMANIAN: case LANG_SANSKRIT: case LANG_SERBIAN: - case LANG_SINDHI: case LANG_SLOVENIAN: case LANG_SWAHILI: - case LANG_SWEDISH: case LANG_SYRIAC: case LANG_TAMIL: - case LANG_TATAR: case LANG_TELUGU: case LANG_THAI: - case LANG_UKRAINIAN: case LANG_URDU: case LANG_UZBEK: - case LANG_VIETNAMESE: case LANG_SCOTTISH_GAELIC: case LANG_MALTESE: - case LANG_MAORI: case LANG_ROMANSH: case LANG_IRISH: - case LANG_SAMI: case LANG_UPPER_SORBIAN: case LANG_SUTU: - case LANG_TSONGA: case LANG_TSWANA: case LANG_VENDA: - case LANG_XHOSA: case LANG_ZULU: case LANG_ESPERANTO: - case LANG_WALON: case LANG_CORNISH: case LANG_WELSH: - case LANG_BRETON: case LANG_MANX_GAELIC: nOffset = 16; pnLookup = Lookup_16; break;

1 0

Alexandre Julliard : widl: Silence error message for unknown languages.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: 88dcdbdcc650b3e750521879f9860ab0f90c34b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88dcdbdcc650b3e750521879… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 12:57:51 2022 +0200 widl: Silence error message for unknown languages. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/hash.c | 53 ----------------------------------------------------- 1 file changed, 53 deletions(-) diff --git a/tools/widl/hash.c b/tools/widl/hash.c index d65a2513a6d..a50c0905ec3 100644 --- a/tools/widl/hash.c +++ b/tools/widl/hash.c @@ -515,59 +515,6 @@ unsigned int lhash_val_of_name_sys( syskind_t skind, int lcid, const char *lpStr switch (PRIMARYLANGID(LANGIDFROMLCID(lcid))) { default: - fprintf(stderr, "Unknown lcid %x, treating as latin-based, please report\n", lcid); - /* .. Fall Through .. */ - case LANG_AFRIKAANS: case LANG_ALBANIAN: case LANG_ARMENIAN: - case LANG_ASSAMESE: case LANG_AZERI: case LANG_BASQUE: - case LANG_BELARUSIAN: case LANG_BENGALI: case LANG_BULGARIAN: - case LANG_CATALAN: case LANG_DANISH: case LANG_DIVEHI: - case LANG_DUTCH: case LANG_ENGLISH: case LANG_ESTONIAN: - case LANG_FAEROESE: case LANG_FINNISH: case LANG_FRENCH: - case LANG_GALICIAN: case LANG_GEORGIAN: case LANG_GERMAN: - case LANG_GUJARATI: case LANG_HINDI: case LANG_INDONESIAN: - case LANG_ITALIAN: case LANG_KANNADA: case LANG_KASHMIRI: - case LANG_KAZAK: case LANG_KONKANI: case LANG_KYRGYZ: - case LANG_LATVIAN: case LANG_LITHUANIAN: case LANG_MACEDONIAN: - case LANG_MALAY: case LANG_MALAYALAM: case LANG_MANIPURI: - case LANG_MARATHI: case LANG_MONGOLIAN: case LANG_NEPALI: - case LANG_ORIYA: case LANG_PORTUGUESE: case LANG_PUNJABI: - case LANG_ROMANIAN: case LANG_SANSKRIT: case LANG_SERBIAN: - case LANG_SINDHI: case LANG_SLOVENIAN: case LANG_SWAHILI: - case LANG_SWEDISH: case LANG_SYRIAC: case LANG_TAMIL: - case LANG_TATAR: case LANG_TELUGU: case LANG_THAI: - case LANG_UKRAINIAN: case LANG_URDU: case LANG_UZBEK: - case LANG_VIETNAMESE: case LANG_MALTESE: case LANG_IRISH: - case LANG_SAMI: case LANG_UPPER_SORBIAN: case LANG_TSWANA: - case LANG_XHOSA: case LANG_ZULU: case LANG_WELSH: - case LANG_BRETON: case LANG_SCOTTISH_GAELIC: case LANG_NEUTRAL: -/* some languages not in all windows versions or ReactOS */ -#ifdef LANG_MANX_GAELIC - case LANG_MANX_GAELIC: -#endif -#ifdef LANG_TAJIK - case LANG_TAJIK: -#endif -#ifdef LANG_ROMANSH - case LANG_ROMANSH: -#endif -#ifdef LANG_SUTU - case LANG_SUTU: -#endif -#ifdef LANG_TSONGA - case LANG_TSONGA: -#endif -#ifdef LANG_VENDA - case LANG_VENDA: -#endif -#ifdef LANG_ESPERANTO - case LANG_ESPERANTO: -#endif -#ifdef LANG_WALON - case LANG_WALON: -#endif -#ifdef LANG_CORNISH - case LANG_CORNISH: -#endif nOffset = 16; pnLookup = Lookup_16; break;

1 0

Francois Gouget : testbot/TestAgent: Fix the spelling of a comment in the module.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: tools Branch: master Commit: d33367a150aa6cc66032b97b0e4e617e5c0d0dfd URL: https://source.winehq.org/git/tools.git/?a=commit;h=d33367a150aa6cc66032b97… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 1 17:09:07 2022 +0200 testbot/TestAgent: Fix the spelling of a comment in the module. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 6457b4d..2d60021 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1526,7 +1526,7 @@ sub Upgrade($$) my $rc = $self->_RecvList(''); # The server has quit and thus the connection is no longer usable. - # So disconnect now to force the next RPC to reconnect, instead or letting it + # So disconnect now to force the next RPC to reconnect instead of letting it # try to reuse the broken connection and fail. $self->Disconnect();

1 0

Francois Gouget : testbot/TestAgent: Simplify the implementation for commands with no argument.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: tools Branch: master Commit: c923c74ac05d42d8f18e484be337a93164f42ded URL: https://source.winehq.org/git/tools.git/?a=commit;h=c923c74ac05d42d8f18e484… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 1 17:09:18 2022 +0200 testbot/TestAgent: Simplify the implementation for commands with no argument. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/TestAgent | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 10bdc63..8691f47 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -210,15 +210,7 @@ while (@ARGV) @Rm = @ARGV; last; } - elsif ($arg eq "getcwd") - { - $Cmd = $arg; - } - elsif ($arg eq "getversion") - { - set_cmd($arg); - } - elsif ($arg eq "ping" or $arg eq "settime") + elsif ($arg =~ /^(?:getcwd|getversion|ping|settime)$/) { set_cmd($arg); }

1 0

Francois Gouget : testbot: Document SecureConnection() and MakeSecureURL().
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: tools Branch: master Commit: 00fe5045513e213d54c87f1a1e43d8f38a6d6a48 URL: https://source.winehq.org/git/tools.git/?a=commit;h=00fe5045513e213d54c87f1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 1 17:09:41 2022 +0200 testbot: Document SecureConnection() and MakeSecureURL(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Utils.pm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 5315c75..d93a938 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -42,11 +42,38 @@ use WineTestBot::Config; # Web helpers # +=pod +=over 12 + +=item C<SecureConnection()> + +Returns true if the user accessed the website over a secure connection. + +This relies on the web server setting the $HTTPS environment variable. + +=back +=cut + sub SecureConnection() { return defined($ENV{"HTTPS"}) && $ENV{"HTTPS"} eq "on"; } +=pod +=over 12 + +=item C<MakeSecureURL()> + +Builds a URL that accesses this website using https if possible. +The parameter should be an absolute path that includes neither the protocol +nor the hostname. + +Note that this method uses $HTTP_HOST which may not match the official website +hostname. As such this should only be used for providing URLs back to the user +accessing the website, not for URLs sent to third-parties. + +=back +=cut sub MakeSecureURL($) { my ($URL) = @_;

1 0