wine-commits November 2020

wine-commits@winehq.org

1 participants
851 discussions

Dmitry Timoshkov : advapi32/tests: Fix compilation with PSDK compiler.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 65cab573abe748974f20195083d7bd3d64f63e7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=65cab573abe748974f201950… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 10 20:53:05 2020 +0300 advapi32/tests: Fix compilation with PSDK compiler. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/lsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index f2e10671a47..54a8528bc21 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -336,7 +336,7 @@ static void test_LsaLookupSids(void) { WCHAR langW[32]; char user_buffer[64]; - LSA_OBJECT_ATTRIBUTES attrs = {.Length = sizeof(attrs)}; + LSA_OBJECT_ATTRIBUTES attrs = {sizeof(attrs)}; TOKEN_USER *user = (TOKEN_USER *)user_buffer; WCHAR computer_name[64], user_name[64]; LSA_REFERENCED_DOMAIN_LIST *list;

1 0

Dmitry Timoshkov : crypt32/tests: Fix test failures under newer Windows versions.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 0c8ce3aab57d0f81889438f0e9d1a9cb5adee342 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c8ce3aab57d0f81889438f0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 10 10:22:13 2020 +0300 crypt32/tests: Fix test failures under newer Windows versions. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/cert.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 7d6d07fe025..d9f839c72d2 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3886,17 +3886,19 @@ static void testAcquireCertPrivateKey(void) /* Missing private key */ ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &csp, NULL, NULL); - ok(!ret && GetLastError() == CRYPT_E_NO_KEY_PROPERTY, + ok(!ret && (GetLastError() == CRYPT_E_NO_KEY_PROPERTY || GetLastError() == NTE_BAD_PROV_TYPE /* win10 */), "Expected CRYPT_E_NO_KEY_PROPERTY, got %08x\n", GetLastError()); ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &csp, &keySpec, &callerFree); - ok(!ret && GetLastError() == CRYPT_E_NO_KEY_PROPERTY, + ok(!ret && (GetLastError() == CRYPT_E_NO_KEY_PROPERTY || GetLastError() == NTE_BAD_PROV_TYPE /* win10 */), "Expected CRYPT_E_NO_KEY_PROPERTY, got %08x\n", GetLastError()); CertSetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID, 0, &keyProvInfo); ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &csp, &keySpec, &callerFree); - ok(!ret && (GetLastError() == CRYPT_E_NO_KEY_PROPERTY || GetLastError() == NTE_BAD_KEYSET /* win8 */), + ok(!ret && (GetLastError() == CRYPT_E_NO_KEY_PROPERTY || + GetLastError() == NTE_BAD_KEYSET /* win8 */ || + GetLastError() == NTE_BAD_PROV_TYPE /* win10 */), "Expected CRYPT_E_NO_KEY_PROPERTY, got %08x\n", GetLastError()); pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL,

1 0

Rémi Bernon : msvcrt: Pass temporary locale to MSVCRT__towupper_l.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 35886486d4aa88f49369d1196ac891e56b43c026 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35886486d4aa88f49369d119… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 10 16:58:57 2020 +0100 msvcrt: Pass temporary locale to MSVCRT__towupper_l. When not provided, instead of calling get_locinfo on every character. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 63f9fd472d7..fcadad77832 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -355,6 +355,7 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcsset( MSVCRT_wchar_t* str, MSVCRT_wchar_t c ) int CDECL MSVCRT__wcsupr_s_l( MSVCRT_wchar_t* str, MSVCRT_size_t n, MSVCRT__locale_t locale ) { + MSVCRT__locale_tstruct tmp = {0}; MSVCRT_wchar_t* ptr = str; if (!str || !n) @@ -364,13 +365,22 @@ int CDECL MSVCRT__wcsupr_s_l( MSVCRT_wchar_t* str, MSVCRT_size_t n, return MSVCRT_EINVAL; } + if(!locale) + locale = get_current_locale_noalloc(&tmp); + while (n--) { - if (!*ptr) return 0; + if (!*ptr) + { + free_locale_noalloc(&tmp); + return 0; + } *ptr = MSVCRT__towupper_l(*ptr, locale); ptr++; } + free_locale_noalloc(&tmp); + /* MSDN claims that the function should return and set errno to * ERANGE, which doesn't seem to be true based on the tests. */ *str = '\0';

1 0

Rémi Bernon : msvcrt: Pass temporary locale to MSVCRT__towlower_l.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 0a2635611ac46081b2049b62ba62e3691e1c039f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a2635611ac46081b2049b62… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 10 16:58:44 2020 +0100 msvcrt: Pass temporary locale to MSVCRT__towlower_l. When not provided, instead of calling get_locinfo on every character. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 858ecbd7ed0..63f9fd472d7 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -119,16 +119,22 @@ int CDECL MSVCRT_towlower(MSVCRT_wint_t c) INT CDECL MSVCRT__wcsicmp_l(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, MSVCRT__locale_t locale) { + MSVCRT__locale_tstruct tmp = {0}; MSVCRT_wchar_t c1, c2; if(!MSVCRT_CHECK_PMT(str1 != NULL) || !MSVCRT_CHECK_PMT(str2 != NULL)) return MSVCRT__NLSCMPERROR; + if(!locale) + locale = get_current_locale_noalloc(&tmp); + do { c1 = MSVCRT__towlower_l(*str1++, locale); c2 = MSVCRT__towlower_l(*str2++, locale); } while(c1 && (c1 == c2)); + + free_locale_noalloc(&tmp); return c1 - c2; } @@ -146,19 +152,25 @@ INT CDECL MSVCRT__wcsicmp( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str INT CDECL MSVCRT__wcsnicmp_l(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, MSVCRT_size_t n, MSVCRT__locale_t locale) { + MSVCRT__locale_tstruct tmp = {0}; MSVCRT_wchar_t c1, c2; if (!n) - return 0; + return 0; if(!MSVCRT_CHECK_PMT(str1 != NULL) || !MSVCRT_CHECK_PMT(str2 != NULL)) return MSVCRT__NLSCMPERROR; + if(!locale) + locale = get_current_locale_noalloc(&tmp); + do { c1 = MSVCRT__towlower_l(*str1++, locale); c2 = MSVCRT__towlower_l(*str2++, locale); } while(--n && c1 && (c1 == c2)); + + free_locale_noalloc(&tmp); return c1 - c2; } @@ -397,6 +409,7 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcsupr( MSVCRT_wchar_t *str ) */ int CDECL MSVCRT__wcslwr_s_l( MSVCRT_wchar_t* str, MSVCRT_size_t n, MSVCRT__locale_t locale ) { + MSVCRT__locale_tstruct tmp = {0}; MSVCRT_wchar_t* ptr = str; if (!str || !n) @@ -406,13 +419,22 @@ int CDECL MSVCRT__wcslwr_s_l( MSVCRT_wchar_t* str, MSVCRT_size_t n, MSVCRT__loca return MSVCRT_EINVAL; } + if(!locale) + locale = get_current_locale_noalloc(&tmp); + while (n--) { - if (!*ptr) return 0; + if (!*ptr) + { + free_locale_noalloc(&tmp); + return 0; + } *ptr = MSVCRT__towlower_l(*ptr, locale); ptr++; } + free_locale_noalloc(&tmp); + /* MSDN claims that the function should return and set errno to * ERANGE, which doesn't seem to be true based on the tests. */ *str = '\0';

1 0

Rémi Bernon : msvcrt: Introduce noalloc current locale lookup helpers.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: faf92fdedb16a6e35c556e389bf5ac7241058f75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=faf92fdedb16a6e35c556e38… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 10 16:58:49 2020 +0100 msvcrt: Introduce noalloc current locale lookup helpers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 34 +++++++++++++++++++++++++++------- dlls/msvcrt/msvcrt.h | 2 ++ 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index f25c1228d2f..c49439951a9 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -953,6 +953,31 @@ void free_mbcinfo(MSVCRT_pthreadmbcinfo mbcinfo) MSVCRT_free(mbcinfo); } +MSVCRT__locale_t CDECL get_current_locale_noalloc(MSVCRT__locale_t locale) +{ + thread_data_t *data = msvcrt_get_thread_data(); + + if(!data || !data->have_locale) + { + *locale = *MSVCRT_locale; + } + else + { + locale->locinfo = data->locinfo; + locale->mbcinfo = data->mbcinfo; + } + + InterlockedIncrement(&locale->locinfo->refcount); + InterlockedIncrement(&locale->mbcinfo->refcount); + return locale; +} + +void CDECL free_locale_noalloc(MSVCRT__locale_t locale) +{ + free_locinfo(locale->locinfo); + free_mbcinfo(locale->mbcinfo); +} + /********************************************************************* * _get_current_locale (MSVCRT.@) */ @@ -962,11 +987,7 @@ MSVCRT__locale_t CDECL MSVCRT__get_current_locale(void) if(!loc) return NULL; - loc->locinfo = get_locinfo(); - loc->mbcinfo = get_mbcinfo(); - InterlockedIncrement(&loc->locinfo->refcount); - InterlockedIncrement(&loc->mbcinfo->refcount); - return loc; + return get_current_locale_noalloc(loc); } /********************************************************************* @@ -977,8 +998,7 @@ void CDECL MSVCRT__free_locale(MSVCRT__locale_t locale) if (!locale) return; - free_locinfo(locale->locinfo); - free_mbcinfo(locale->mbcinfo); + free_locale_noalloc(locale); MSVCRT_free(locale); } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index f73117ae5e2..07a2f3d33e8 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1128,6 +1128,8 @@ int __cdecl MSVCRT__set_printf_count_output(int); #define MSVCRT__DISABLE_PER_THREAD_LOCALE 2 extern MSVCRT__locale_t MSVCRT_locale; +MSVCRT__locale_t CDECL get_current_locale_noalloc(MSVCRT__locale_t locale) DECLSPEC_HIDDEN; +void CDECL free_locale_noalloc(MSVCRT__locale_t locale) DECLSPEC_HIDDEN; MSVCRT_pthreadlocinfo CDECL get_locinfo(void) DECLSPEC_HIDDEN; MSVCRT_pthreadmbcinfo CDECL get_mbcinfo(void) DECLSPEC_HIDDEN; void __cdecl MSVCRT__free_locale(MSVCRT__locale_t);

1 0

Rémi Bernon : msvcrt: Make locale and thread helper functions CDECL.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: a24ad51e3f2515c1970b56f8dfe2206e2b282dc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a24ad51e3f2515c1970b56f8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 10 16:58:37 2020 +0100 msvcrt: Make locale and thread helper functions CDECL. This prevent callers from having to save SSE registers to the stack. It is for instance the case in MSVCRT__towlower_l, which is called on every character by MSVCRT__wcsicmp_l. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 4 ++-- dlls/msvcrt/msvcrt.h | 6 +++--- dlls/msvcrt/thread.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 7562f70eb0b..f25c1228d2f 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -452,7 +452,7 @@ static inline void swap_pointers(void **p1, void **p2) { } /* INTERNAL: returns pthreadlocinfo struct */ -MSVCRT_pthreadlocinfo get_locinfo(void) { +MSVCRT_pthreadlocinfo CDECL get_locinfo(void) { thread_data_t *data = msvcrt_get_thread_data(); if(!data || !data->have_locale) @@ -462,7 +462,7 @@ MSVCRT_pthreadlocinfo get_locinfo(void) { } /* INTERNAL: returns pthreadlocinfo struct */ -MSVCRT_pthreadmbcinfo get_mbcinfo(void) { +MSVCRT_pthreadmbcinfo CDECL get_mbcinfo(void) { thread_data_t *data = msvcrt_get_thread_data(); if(!data || !data->have_locale) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 4f79778f7cc..f73117ae5e2 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -308,7 +308,7 @@ struct __thread_data { typedef struct __thread_data thread_data_t; -extern thread_data_t *msvcrt_get_thread_data(void) DECLSPEC_HIDDEN; +extern thread_data_t *CDECL msvcrt_get_thread_data(void) DECLSPEC_HIDDEN; LCID MSVCRT_locale_to_LCID(const char*, unsigned short*, BOOL*) DECLSPEC_HIDDEN; extern MSVCRT__locale_t MSVCRT_locale DECLSPEC_HIDDEN; @@ -1128,8 +1128,8 @@ int __cdecl MSVCRT__set_printf_count_output(int); #define MSVCRT__DISABLE_PER_THREAD_LOCALE 2 extern MSVCRT__locale_t MSVCRT_locale; -MSVCRT_pthreadlocinfo get_locinfo(void) DECLSPEC_HIDDEN; -MSVCRT_pthreadmbcinfo get_mbcinfo(void) DECLSPEC_HIDDEN; +MSVCRT_pthreadlocinfo CDECL get_locinfo(void) DECLSPEC_HIDDEN; +MSVCRT_pthreadmbcinfo CDECL get_mbcinfo(void) DECLSPEC_HIDDEN; void __cdecl MSVCRT__free_locale(MSVCRT__locale_t); void free_locinfo(MSVCRT_pthreadlocinfo) DECLSPEC_HIDDEN; void free_mbcinfo(MSVCRT_pthreadmbcinfo) DECLSPEC_HIDDEN; diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index af31534adbd..11573892e95 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -35,7 +35,7 @@ typedef struct { * * Return the thread local storage structure. */ -thread_data_t *msvcrt_get_thread_data(void) +thread_data_t *CDECL msvcrt_get_thread_data(void) { thread_data_t *ptr; DWORD err = GetLastError(); /* need to preserve last error */

1 0

Rémi Bernon : bcrypt: Implement 3DES cipher support.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 6b569a451f1259384d68ba882e536643c834445c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b569a451f1259384d68ba88… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 10 14:42:27 2020 +0100 bcrypt: Implement 3DES cipher support. This is used by CoD: WWII multiplayer mode to login to its servers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 1 + dlls/bcrypt/bcrypt_main.c | 65 +++++++++++++++++++++++++++++++++++++++++++ dlls/bcrypt/gnutls.c | 13 +++++++++ dlls/bcrypt/tests/bcrypt.c | 62 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 141 insertions(+) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index 463672db470..d5a54aad92b 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -113,6 +113,7 @@ struct object enum alg_id { /* cipher */ + ALG_ID_3DES, ALG_ID_AES, /* hash */ diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 85d06f6001e..380d9105e48 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -101,6 +101,7 @@ static const struct } builtin_algorithms[] = { + { BCRYPT_3DES_ALGORITHM, BCRYPT_CIPHER_INTERFACE, 522, 0, 0 }, { BCRYPT_AES_ALGORITHM, BCRYPT_CIPHER_INTERFACE, 654, 0, 0 }, { BCRYPT_SHA256_ALGORITHM, BCRYPT_HASH_INTERFACE, 286, 32, 512 }, { BCRYPT_SHA384_ALGORITHM, BCRYPT_HASH_INTERFACE, 382, 48, 1024 }, @@ -426,6 +427,7 @@ struct hash struct hash_impl inner; }; +#define BLOCK_LENGTH_3DES 8 #define BLOCK_LENGTH_AES 16 static NTSTATUS generic_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) @@ -467,6 +469,46 @@ static NTSTATUS generic_alg_property( enum alg_id id, const WCHAR *prop, UCHAR * return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS get_3des_property( enum mode_id mode, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) +{ + if (!wcscmp( prop, BCRYPT_BLOCK_LENGTH )) + { + *ret_size = sizeof(ULONG); + if (size < sizeof(ULONG)) return STATUS_BUFFER_TOO_SMALL; + if (buf) *(ULONG *)buf = BLOCK_LENGTH_3DES; + return STATUS_SUCCESS; + } + if (!wcscmp( prop, BCRYPT_CHAINING_MODE )) + { + const WCHAR *str; + switch (mode) + { + case MODE_ID_CBC: str = BCRYPT_CHAIN_MODE_CBC; break; + default: return STATUS_NOT_IMPLEMENTED; + } + + *ret_size = 64; + if (size < *ret_size) return STATUS_BUFFER_TOO_SMALL; + memcpy( buf, str, (lstrlenW(str) + 1) * sizeof(WCHAR) ); + return STATUS_SUCCESS; + } + if (!wcscmp( prop, BCRYPT_KEY_LENGTHS )) + { + BCRYPT_KEY_LENGTHS_STRUCT *key_lengths = (void *)buf; + *ret_size = sizeof(*key_lengths); + if (key_lengths && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; + if (key_lengths) + { + key_lengths->dwMinLength = 192; + key_lengths->dwMaxLength = 192; + key_lengths->dwIncrement = 0; + } + return STATUS_SUCCESS; + } + FIXME( "unsupported property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS get_aes_property( enum mode_id mode, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) { if (!wcscmp( prop, BCRYPT_BLOCK_LENGTH )) @@ -556,6 +598,9 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop switch (alg->id) { + case ALG_ID_3DES: + return get_3des_property( alg->mode, prop, buf, size, ret_size ); + case ALG_ID_AES: return get_aes_property( alg->mode, prop, buf, size, ret_size ); @@ -577,6 +622,23 @@ static NTSTATUS set_alg_property( struct algorithm *alg, const WCHAR *prop, UCHA { switch (alg->id) { + case ALG_ID_3DES: + if (!wcscmp( prop, BCRYPT_CHAINING_MODE )) + { + if (!wcscmp( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC )) + { + alg->mode = MODE_ID_CBC; + return STATUS_SUCCESS; + } + else + { + FIXME( "unsupported mode %s\n", debugstr_w((WCHAR *)value) ); + return STATUS_NOT_SUPPORTED; + } + } + FIXME( "unsupported 3des algorithm property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; + case ALG_ID_AES: if (!wcscmp( prop, BCRYPT_CHAINING_MODE )) { @@ -624,6 +686,9 @@ static NTSTATUS get_key_property( const struct key *key, const WCHAR *prop, UCHA { switch (key->alg_id) { + case ALG_ID_3DES: + return get_3des_property( key->u.s.mode, prop, buf, size, ret_size ); + case ALG_ID_AES: if (!wcscmp( prop, BCRYPT_AUTH_TAG_LENGTH )) return STATUS_NOT_SUPPORTED; return get_aes_property( key->u.s.mode, prop, buf, size, ret_size ); diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 5ed51e8704c..e85085499ca 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -491,6 +491,7 @@ static NTSTATUS CDECL key_symmetric_init( struct key *key ) switch (key->alg_id) { + case ALG_ID_3DES: case ALG_ID_AES: return STATUS_SUCCESS; @@ -504,6 +505,18 @@ static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) { switch (key->alg_id) { + case ALG_ID_3DES: + WARN( "handle block size\n" ); + switch (key->u.s.mode) + { + case MODE_ID_CBC: + return GNUTLS_CIPHER_3DES_CBC; + default: + break; + } + FIXME( "3DES mode %u with key length %u not supported\n", key->u.s.mode, key->u.s.secret_len ); + return GNUTLS_CIPHER_UNKNOWN; + case ALG_ID_AES: WARN( "handle block size\n" ); switch (key->u.s.mode) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 0ae4b5dad53..456727d04a9 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -639,6 +639,67 @@ static void test_aes(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } +static void test_3des(void) +{ + BCRYPT_KEY_LENGTHS_STRUCT key_lengths; + BCRYPT_ALG_HANDLE alg; + ULONG size, len; + UCHAR mode[64]; + NTSTATUS ret; + + alg = NULL; + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_3DES_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(alg != NULL, "alg not set\n"); + + len = size = 0; + ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(len, "expected non-zero len\n"); + ok(size == sizeof(len), "got %u\n", size); + + len = size = 0; + ret = pBCryptGetProperty(alg, BCRYPT_BLOCK_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(len == 8, "got %u\n", len); + ok(size == sizeof(len), "got %u\n", size); + + size = 0; + ret = pBCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, 0, &size, 0); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 64, "got %u\n", size); + + size = 0; + ret = pBCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode) - 1, &size, 0); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 64, "got %u\n", size); + + size = 0; + memset(mode, 0, sizeof(mode)); + ret = pBCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_CBC), "got %s\n", wine_dbgstr_w((const WCHAR *)mode)); + ok(size == 64, "got %u\n", size); + + size = 0; + memset(&key_lengths, 0, sizeof(key_lengths)); + ret = pBCryptGetProperty(alg, BCRYPT_KEY_LENGTHS, (UCHAR*)&key_lengths, sizeof(key_lengths), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == sizeof(key_lengths), "got %u\n", size); + ok(key_lengths.dwMinLength == 192, "Expected 192, got %d\n", key_lengths.dwMinLength); + ok(key_lengths.dwMaxLength == 192, "Expected 192, got %d\n", key_lengths.dwMaxLength); + ok(key_lengths.dwIncrement == 0, "Expected 0, got %d\n", key_lengths.dwIncrement); + + memcpy(mode, BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM)); + ret = pBCryptSetProperty(alg, BCRYPT_CHAINING_MODE, mode, 0, 0); + ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); + + test_alg_name(alg, L"3DES"); + + ret = pBCryptCloseAlgorithmProvider(alg, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); +} + static void test_BCryptGenerateSymmetricKey(void) { static UCHAR secret[] = @@ -2730,6 +2791,7 @@ START_TEST(bcrypt) test_BcryptHash(); test_BcryptDeriveKeyPBKDF2(); test_rng(); + test_3des(); test_aes(); test_BCryptGenerateSymmetricKey(); test_BCryptEncrypt();

1 0

Jacek Caban : server: Remove no longer needed get_console_wait_event request.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: b865d8ec9e2a297e66791cf302046d0b63528fa9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b865d8ec9e2a297e66791cf3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 10 16:32:18 2020 +0100 server: Remove no longer needed get_console_wait_event request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 19 +-------------- server/console.c | 52 ------------------------------------------ server/protocol.def | 8 ------- server/request.h | 6 ----- server/trace.c | 14 ------------ 5 files changed, 1 insertion(+), 98 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b865d8ec9e2a297e6679…

1 0

Jacek Caban : kernelbase: Wait directly on console handles.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: cc5afe41edafbbfb68abfbb0346c113a09128645 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc5afe41edafbbfb68abfbb0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 10 16:32:01 2020 +0100 kernelbase: Wait directly on console handles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 25 +------------------------ dlls/kernelbase/kernelbase.h | 1 - dlls/kernelbase/sync.c | 13 +++++-------- 3 files changed, 6 insertions(+), 33 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 71c594b3c18..f812b2b9a55 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -37,8 +37,8 @@ #include "winnls.h" #include "winerror.h" #include "wincon.h" +#include "winternl.h" #include "wine/condrv.h" -#include "wine/server.h" #include "wine/exception.h" #include "wine/debug.h" #include "kernelbase.h" @@ -56,7 +56,6 @@ static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION console_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static HANDLE console_connection; -static HANDLE console_wait_event; static unsigned int console_flags; #define CONSOLE_INPUT_HANDLE 0x01 @@ -559,32 +558,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH FillConsoleOutputCharacterW( HANDLE handle, WCHAR written, sizeof(*written), NULL ); } -HANDLE get_console_wait_handle( HANDLE handle ) -{ - HANDLE event = 0; - - SERVER_START_REQ( get_console_wait_event ) - { - req->handle = wine_server_obj_handle( console_handle_map( handle )); - if (!wine_server_call( req )) event = wine_server_ptr_handle( reply->event ); - } - SERVER_END_REQ; - if (event) - { - if (InterlockedCompareExchangePointer( &console_wait_event, event, 0 )) NtClose( event ); - handle = console_wait_event; - } - return handle; -} - /*********************************************************************** * FreeConsole (kernelbase.@) */ BOOL WINAPI DECLSPEC_HOTPATCH FreeConsole(void) { - HANDLE event; - RtlEnterCriticalSection( &console_section ); NtClose( console_connection ); @@ -598,8 +577,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeConsole(void) if (console_flags & CONSOLE_ERROR_HANDLE) NtClose( GetStdHandle( STD_ERROR_HANDLE )); console_flags = 0; - if ((event = InterlockedExchangePointer( &console_wait_event, NULL ))) NtClose( event ); - RtlLeaveCriticalSection( &console_section ); return TRUE; } diff --git a/dlls/kernelbase/kernelbase.h b/dlls/kernelbase/kernelbase.h index 551542e5725..836d636b47b 100644 --- a/dlls/kernelbase/kernelbase.h +++ b/dlls/kernelbase/kernelbase.h @@ -36,7 +36,6 @@ extern DWORD file_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) extern void init_startup_info( RTL_USER_PROCESS_PARAMETERS *params ) DECLSPEC_HIDDEN; extern void init_locale(void) DECLSPEC_HIDDEN; extern void init_console(void) DECLSPEC_HIDDEN; -extern HANDLE get_console_wait_handle( HANDLE handle ) DECLSPEC_HIDDEN; extern const WCHAR windows_dir[] DECLSPEC_HIDDEN; extern const WCHAR system_dir[] DECLSPEC_HIDDEN; diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index 13a9938e7c6..e8e51b1c573 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -211,17 +211,14 @@ ULONGLONG WINAPI DECLSPEC_HOTPATCH GetTickCount64(void) ***********************************************************************/ -static HANDLE normalize_handle_if_console( HANDLE handle ) +static HANDLE normalize_std_handle( HANDLE handle ) { if ((handle == (HANDLE)STD_INPUT_HANDLE) || (handle == (HANDLE)STD_OUTPUT_HANDLE) || (handle == (HANDLE)STD_ERROR_HANDLE)) - handle = GetStdHandle( HandleToULong(handle) ); + return GetStdHandle( HandleToULong(handle) ); - /* even screen buffer console handles are waitable, and are - * handled as a handle to the console itself - */ - return is_console_handle( handle ) ? get_console_wait_handle( handle ) : handle; + return handle; } @@ -235,7 +232,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH RegisterWaitForSingleObjectEx( HANDLE handle, WA TRACE( "%p %p %p %d %d\n", handle, callback, context, timeout, flags ); - handle = normalize_handle_if_console( handle ); + handle = normalize_std_handle( handle ); if (!set_ntstatus( RtlRegisterWait( &ret, handle, callback, context, timeout, flags ))) return NULL; return ret; } @@ -340,7 +337,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH WaitForMultipleObjectsEx( DWORD count, const HAND SetLastError(ERROR_INVALID_PARAMETER); return WAIT_FAILED; } - for (i = 0; i < count; i++) hloc[i] = normalize_handle_if_console( handles[i] ); + for (i = 0; i < count; i++) hloc[i] = normalize_std_handle( handles[i] ); status = NtWaitForMultipleObjects( count, hloc, !wait_all, alertable, get_nt_timeout( &time, timeout ) );

1 0

Jacek Caban : server: Support waiting on screen buffer handles.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 2eb8644426d327d2c75fd02dd4d038c68c901fad URL: https://source.winehq.org/git/wine.git/?a=commit;h=2eb8644426d327d2c75fd02d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 10 16:31:53 2020 +0100 server: Support waiting on screen buffer handles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 4 ---- server/console.c | 14 +++++++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 6d15abd8c5f..4a06a2b396e 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1019,7 +1019,6 @@ static void test_wait(HANDLE input, HANDLE orig_output) res = WaitForSingleObject(input, 0); ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); res = WaitForSingleObject(output, 0); - todo_wine ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); res = WaitForSingleObject(orig_output, 0); ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); @@ -1027,7 +1026,6 @@ static void test_wait(HANDLE input, HANDLE orig_output) ok(status == STATUS_TIMEOUT || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), "NtWaitForSingleObject returned %x\n", status); status = NtWaitForSingleObject(output, FALSE, &zero); - todo_wine ok(status == STATUS_TIMEOUT || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), "NtWaitForSingleObject returned %x\n", status); @@ -1037,7 +1035,6 @@ static void test_wait(HANDLE input, HANDLE orig_output) res = WaitForSingleObject(input, 0); ok(!res, "WaitForSingleObject returned %x\n", res); res = WaitForSingleObject(output, 0); - todo_wine ok(!res, "WaitForSingleObject returned %x\n", res); res = WaitForSingleObject(orig_output, 0); ok(!res, "WaitForSingleObject returned %x\n", res); @@ -1045,7 +1042,6 @@ static void test_wait(HANDLE input, HANDLE orig_output) ok(!status || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), "NtWaitForSingleObject returned %x\n", status); status = NtWaitForSingleObject(output, FALSE, &zero); - todo_wine ok(!status || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), "NtWaitForSingleObject returned %x\n", status); diff --git a/server/console.c b/server/console.c index 4e51ed48a31..8bb7d8ecfa8 100644 --- a/server/console.c +++ b/server/console.c @@ -208,6 +208,7 @@ struct screen_buffer static void screen_buffer_dump( struct object *obj, int verbose ); static void screen_buffer_destroy( struct object *obj ); +static int screen_buffer_add_queue( struct object *obj, struct wait_queue_entry *entry ); static struct fd *screen_buffer_get_fd( struct object *obj ); static struct object *screen_buffer_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); @@ -217,7 +218,7 @@ static const struct object_ops screen_buffer_ops = sizeof(struct screen_buffer), /* size */ screen_buffer_dump, /* dump */ no_get_type, /* get_type */ - no_add_queue, /* add_queue */ + screen_buffer_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ NULL, /* satisfied */ @@ -706,6 +707,17 @@ static struct object *screen_buffer_open_file( struct object *obj, unsigned int return grab_object( obj ); } +static int screen_buffer_add_queue( struct object *obj, struct wait_queue_entry *entry ) +{ + struct screen_buffer *screen_buffer = (struct screen_buffer*)obj; + if (!screen_buffer->input) + { + set_error( STATUS_ACCESS_DENIED ); + return 0; + } + return add_queue( &screen_buffer->input->obj, entry ); +} + static struct fd *screen_buffer_get_fd( struct object *obj ) { struct screen_buffer *screen_buffer = (struct screen_buffer*)obj;

1 0

← Newer
1
...
54
55
56
57
58
59
60
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2020