wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Jacek Caban : ntdll: Provide some Unicode helpers for Unix libs.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 1be12eaa942e38302c2b79806a184f58d664c617 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1be12eaa942e38302c2b7980… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 16:19:58 2021 +0200 ntdll: Provide some Unicode helpers for Unix libs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 101 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 71 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 92ae04d90a5..13bf85d2eb6 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -644,37 +644,11 @@ DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) } else /* utf-8 */ { - unsigned int res; - const char *srcend = src + srclen; - WCHAR *dstend = dst + dstlen; - - while ((dst < dstend) && (src < srcend)) - { - unsigned char ch = *src++; - if (ch < 0x80) /* special fast case for 7-bit ASCII */ - { - *dst++ = ch; - continue; - } - if ((res = decode_utf8_char( ch, &src, srcend )) <= 0xffff) - { - *dst++ = res; - } - else if (res <= 0x10ffff) /* we need surrogates */ - { - res -= 0x10000; - *dst++ = 0xd800 | (res >> 10); - if (dst == dstend) break; - *dst++ = 0xdc00 | (res & 0x3ff); - } - else - { - *dst++ = 0xfffd; - } - } - reslen = dstlen - (dstend - dst); + reslen = 0; + RtlUTF8ToUnicodeN( dst, dstlen * sizeof(WCHAR), &reslen, src, srclen ); + reslen /= sizeof(WCHAR); #ifdef __APPLE__ /* work around broken Mac OS X filesystem that enforces NFD */ - if (reslen && nfc_table) reslen = compose_string( nfc_table, dst - reslen, reslen ); + if (reslen && nfc_table) reslen = compose_string( nfc_table, dst, reslen ); #endif } return reslen; @@ -2486,3 +2460,70 @@ NTSTATUS WINAPI NtQueryInstallUILanguage( LANGID *lang ) *lang = system_ui_language; return STATUS_SUCCESS; } + +WCHAR WINAPI RtlUpcaseUnicodeChar( WCHAR wch ) +{ + return ntdll_towupper( wch ); +} + +WCHAR WINAPI RtlDowncaseUnicodeChar( WCHAR wch ) +{ + return ntdll_towlower( wch ); +} + +NTSTATUS WINAPI RtlUTF8ToUnicodeN( WCHAR *dst, DWORD dstlen, DWORD *reslen, const char *src, DWORD srclen ) +{ + unsigned int res, len; + NTSTATUS status = STATUS_SUCCESS; + const char *srcend = src + srclen; + WCHAR *dstend; + + if (!src) return STATUS_INVALID_PARAMETER_4; + if (!reslen) return STATUS_INVALID_PARAMETER; + + dstlen /= sizeof(WCHAR); + dstend = dst + dstlen; + if (!dst) + { + for (len = 0; src < srcend; len++) + { + unsigned char ch = *src++; + if (ch < 0x80) continue; + if ((res = decode_utf8_char( ch, &src, srcend )) > 0x10ffff) + status = STATUS_SOME_NOT_MAPPED; + else + if (res > 0xffff) len++; + } + *reslen = len * sizeof(WCHAR); + return status; + } + + while ((dst < dstend) && (src < srcend)) + { + unsigned char ch = *src++; + if (ch < 0x80) /* special fast case for 7-bit ASCII */ + { + *dst++ = ch; + continue; + } + if ((res = decode_utf8_char( ch, &src, srcend )) <= 0xffff) + { + *dst++ = res; + } + else if (res <= 0x10ffff) /* we need surrogates */ + { + res -= 0x10000; + *dst++ = 0xd800 | (res >> 10); + if (dst == dstend) break; + *dst++ = 0xdc00 | (res & 0x3ff); + } + else + { + *dst++ = 0xfffd; + status = STATUS_SOME_NOT_MAPPED; + } + } + if (src < srcend) status = STATUS_BUFFER_TOO_SMALL; /* overflow */ + *reslen = (dstlen - (dstend - dst)) * sizeof(WCHAR); + return status; +}

1 0

Jacek Caban : ntdll: Introduce ntdll_get_build_dir and ntdll_get_data_dir.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 65ce784ffacf3fb20440b635e5bd4f5de1058a79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65ce784ffacf3fb20440b635… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 16:19:05 2021 +0200 ntdll: Introduce ntdll_get_build_dir and ntdll_get_data_dir. To expose build and data dirs for Unix libs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 18 ++++++++++++++++++ include/wine/unixlib.h | 2 ++ 2 files changed, 20 insertions(+) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index ae1afb2797b..92ae04d90a5 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -783,6 +783,24 @@ int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BO } +/*********************************************************************** + * ntdll_get_build_dir + */ +const char *ntdll_get_build_dir(void) +{ + return build_dir; +} + + +/*********************************************************************** + * ntdll_get_data_dir + */ +const char *ntdll_get_data_dir(void) +{ + return data_dir; +} + + /*********************************************************************** * build_envp * diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 072401a0714..4abc3172192 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -27,6 +27,8 @@ typedef UINT64 unixlib_handle_t; extern NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); /* some useful helpers from ntdll */ +extern const char *ntdll_get_build_dir(void); +extern const char *ntdll_get_data_dir(void); extern DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ); extern int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict ); extern NTSTATUS ntdll_init_syscalls( ULONG id, SYSTEM_SERVICE_TABLE *table, void **dispatcher );

1 0

Alexandre Julliard : ntdll: Move some exception definitions to winternl.h.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 97479d3d32cd1adf1a77f74b19ecfd0560b78128 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97479d3d32cd1adf1a77f74b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 7 12:06:54 2021 +0200 ntdll: Move some exception definitions to winternl.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/store.c | 1 - dlls/dbghelp/coff.c | 1 - dlls/ddraw/tests/dsurface.c | 1 - dlls/kernel32/console.c | 2 -- dlls/kernel32/file.c | 1 - dlls/kernel32/module.c | 1 - dlls/kernel32/process.c | 1 - dlls/krnl386.exe16/instr.c | 1 - dlls/krnl386.exe16/int21.c | 1 - dlls/krnl386.exe16/int31.c | 1 - dlls/msvcp140_1/tests/msvcp140_1.c | 2 -- dlls/msvcp90/misc.c | 2 +- dlls/msvcrt/except.c | 1 - dlls/ntdll/unix/process.c | 1 - dlls/ntdll/unix/sync.c | 1 - dlls/ntdll/unix/thread.c | 1 - dlls/ntoskrnl.exe/instr.c | 1 - dlls/user32/lstr.c | 2 -- dlls/user32/png.c | 1 - dlls/win32u/main.c | 1 - dlls/wininet/internet.c | 2 -- dlls/wow64cpu/cpu.c | 1 - dlls/ws2_32/ws2_32_private.h | 1 - include/wine/exception.h | 32 +------------------------------- include/winternl.h | 31 +++++++++++++++++++++++++++++++ programs/winedbg/gdbproxy.c | 1 - programs/winedbg/info.c | 1 - programs/winedbg/tgt_active.c | 1 - programs/winedbg/winedbg.c | 2 -- 29 files changed, 33 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=97479d3d32cd1adf1a77…

1 0

Alexandre Julliard : bcrypt: Convert the Unix library to the __wine_unix_call() interface.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: dc3a240a2dc89e5280f37c3b50df86e09705dc70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc3a240a2dc89e5280f37c3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 7 11:19:27 2021 +0200 bcrypt: Convert the Unix library to the __wine_unix_call() interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/Makefile.in | 1 + dlls/bcrypt/bcrypt_internal.h | 128 ++++++++++++++++++++++---- dlls/bcrypt/bcrypt_main.c | 179 +++++++++++++++++++++++++++---------- dlls/bcrypt/gnutls.c | 203 +++++++++++++++++++++++------------------- 4 files changed, 357 insertions(+), 154 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dc3a240a2dc89e5280f3…

1 0

Alexandre Julliard : bcrypt: Move public key allocation to the PE side.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 696255907c53d52836d80c2360bf4c66ec327a3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=696255907c53d52836d80c23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 7 11:18:55 2021 +0200 bcrypt: Move public key allocation to the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 41 ++++++++++++++++++++++------------------ dlls/bcrypt/gnutls.c | 48 +++++++++++++++++++++++------------------------ 2 files changed, 47 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=696255907c53d52836d8…

1 0

Alexandre Julliard : bcrypt: Add a helper macros to load GnuTLS optional functions.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 52ca433e7801cbc588763089bf6a8637f076bfe1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52ca433e7801cbc588763089… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 7 11:17:52 2021 +0200 bcrypt: Add a helper macros to load GnuTLS optional functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 98 ++++++++++++---------------------------------------- 1 file changed, 23 insertions(+), 75 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 317881640ed..f0cee5aff41 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -274,87 +274,35 @@ static BOOL gnutls_initialize(void) LOAD_FUNCPTR(gnutls_pubkey_init); #undef LOAD_FUNCPTR - if (!(pgnutls_cipher_tag = dlsym( libgnutls_handle, "gnutls_cipher_tag" ))) - { - WARN("gnutls_cipher_tag not found\n"); - pgnutls_cipher_tag = compat_gnutls_cipher_tag; - } - if (!(pgnutls_cipher_add_auth = dlsym( libgnutls_handle, "gnutls_cipher_add_auth" ))) - { - WARN("gnutls_cipher_add_auth not found\n"); - pgnutls_cipher_add_auth = compat_gnutls_cipher_add_auth; - } +#define LOAD_FUNCPTR_OPT(f) \ + if (!(p##f = dlsym( libgnutls_handle, #f ))) \ + { \ + WARN( "failed to load %s\n", #f ); \ + p##f = compat_##f; \ + } + + LOAD_FUNCPTR_OPT(gnutls_cipher_tag) + LOAD_FUNCPTR_OPT(gnutls_cipher_add_auth) + LOAD_FUNCPTR_OPT(gnutls_pubkey_import_ecc_raw) + LOAD_FUNCPTR_OPT(gnutls_privkey_export_rsa_raw) + LOAD_FUNCPTR_OPT(gnutls_privkey_export_ecc_raw) + LOAD_FUNCPTR_OPT(gnutls_privkey_import_ecc_raw) + LOAD_FUNCPTR_OPT(gnutls_privkey_export_dsa_raw) + LOAD_FUNCPTR_OPT(gnutls_pk_to_sign) + LOAD_FUNCPTR_OPT(gnutls_pubkey_verify_hash2) + LOAD_FUNCPTR_OPT(gnutls_pubkey_import_rsa_raw) + LOAD_FUNCPTR_OPT(gnutls_pubkey_import_dsa_raw) + LOAD_FUNCPTR_OPT(gnutls_privkey_generate) + LOAD_FUNCPTR_OPT(gnutls_decode_rs_value) + LOAD_FUNCPTR_OPT(gnutls_privkey_import_rsa_raw) + LOAD_FUNCPTR_OPT(gnutls_privkey_decrypt_data) +#undef LOAD_FUNCPTR_OPT if ((ret = pgnutls_global_init()) != GNUTLS_E_SUCCESS) { pgnutls_perror( ret ); goto fail; } - if (!(pgnutls_pubkey_import_ecc_raw = dlsym( libgnutls_handle, "gnutls_pubkey_import_ecc_raw" ))) - { - WARN("gnutls_pubkey_import_ecc_raw not found\n"); - pgnutls_pubkey_import_ecc_raw = compat_gnutls_pubkey_import_ecc_raw; - } - if (!(pgnutls_privkey_export_rsa_raw = dlsym( libgnutls_handle, "gnutls_privkey_export_rsa_raw" ))) - { - WARN("gnutls_privkey_export_rsa_raw not found\n"); - pgnutls_privkey_export_rsa_raw = compat_gnutls_privkey_export_rsa_raw; - } - if (!(pgnutls_privkey_export_ecc_raw = dlsym( libgnutls_handle, "gnutls_privkey_export_ecc_raw" ))) - { - WARN("gnutls_privkey_export_ecc_raw not found\n"); - pgnutls_privkey_export_ecc_raw = compat_gnutls_privkey_export_ecc_raw; - } - if (!(pgnutls_privkey_import_ecc_raw = dlsym( libgnutls_handle, "gnutls_privkey_import_ecc_raw" ))) - { - WARN("gnutls_privkey_import_ecc_raw not found\n"); - pgnutls_privkey_import_ecc_raw = compat_gnutls_privkey_import_ecc_raw; - } - if (!(pgnutls_privkey_export_dsa_raw = dlsym( libgnutls_handle, "gnutls_privkey_export_dsa_raw" ))) - { - WARN("gnutls_privkey_export_dsa_raw not found\n"); - pgnutls_privkey_export_dsa_raw = compat_gnutls_privkey_export_dsa_raw; - } - if (!(pgnutls_pk_to_sign = dlsym( libgnutls_handle, "gnutls_pk_to_sign" ))) - { - WARN("gnutls_pk_to_sign not found\n"); - pgnutls_pk_to_sign = compat_gnutls_pk_to_sign; - } - if (!(pgnutls_pubkey_verify_hash2 = dlsym( libgnutls_handle, "gnutls_pubkey_verify_hash2" ))) - { - WARN("gnutls_pubkey_verify_hash2 not found\n"); - pgnutls_pubkey_verify_hash2 = compat_gnutls_pubkey_verify_hash2; - } - if (!(pgnutls_pubkey_import_rsa_raw = dlsym( libgnutls_handle, "gnutls_pubkey_import_rsa_raw" ))) - { - WARN("gnutls_pubkey_import_rsa_raw not found\n"); - pgnutls_pubkey_import_rsa_raw = compat_gnutls_pubkey_import_rsa_raw; - } - if (!(pgnutls_pubkey_import_dsa_raw = dlsym( libgnutls_handle, "gnutls_pubkey_import_dsa_raw" ))) - { - WARN("gnutls_pubkey_import_dsa_raw not found\n"); - pgnutls_pubkey_import_dsa_raw = compat_gnutls_pubkey_import_dsa_raw; - } - if (!(pgnutls_privkey_generate = dlsym( libgnutls_handle, "gnutls_privkey_generate" ))) - { - WARN("gnutls_privkey_generate not found\n"); - pgnutls_privkey_generate = compat_gnutls_privkey_generate; - } - if (!(pgnutls_decode_rs_value = dlsym( libgnutls_handle, "gnutls_decode_rs_value" ))) - { - WARN("gnutls_decode_rs_value not found\n"); - pgnutls_decode_rs_value = compat_gnutls_decode_rs_value; - } - if (!(pgnutls_privkey_import_rsa_raw = dlsym( libgnutls_handle, "gnutls_privkey_import_rsa_raw" ))) - { - WARN("gnutls_privkey_import_rsa_raw not found\n"); - pgnutls_privkey_import_rsa_raw = compat_gnutls_privkey_import_rsa_raw; - } - if (!(pgnutls_privkey_decrypt_data = dlsym( libgnutls_handle, "gnutls_privkey_decrypt_data" ))) - { - WARN("gnutls_privkey_decrypt_data not found\n"); - pgnutls_privkey_decrypt_data = compat_gnutls_privkey_decrypt_data; - } if (TRACE_ON( bcrypt )) {

1 0

Alexandre Julliard : bcrypt: Remove some no longer needed Unix backend functions.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: e4f716bc26fc61e2734f6e8dec4473fc63b6b99f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4f716bc26fc61e2734f6e8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 7 11:17:07 2021 +0200 bcrypt: Remove some no longer needed Unix backend functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 3 -- dlls/bcrypt/bcrypt_main.c | 65 +++++++++++++++++++++++++++++----------- dlls/bcrypt/gnutls.c | 69 ------------------------------------------- 3 files changed, 47 insertions(+), 90 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index 61c367cae9d..590e0a666c9 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -197,15 +197,12 @@ struct secret struct key_funcs { - NTSTATUS (CDECL *key_set_property)( struct key *, const WCHAR *, UCHAR *, ULONG, ULONG ); - NTSTATUS (CDECL *key_symmetric_init)( struct key * ); void (CDECL *key_symmetric_vector_reset)( struct key * ); NTSTATUS (CDECL *key_symmetric_set_auth_data)( struct key *, UCHAR *, ULONG ); NTSTATUS (CDECL *key_symmetric_encrypt)( struct key *, const UCHAR *, ULONG, UCHAR *, ULONG ); NTSTATUS (CDECL *key_symmetric_decrypt)( struct key *, const UCHAR *, ULONG, UCHAR *, ULONG ); NTSTATUS (CDECL *key_symmetric_get_tag)( struct key *, UCHAR *, ULONG ); void (CDECL *key_symmetric_destroy)( struct key * ); - NTSTATUS (CDECL *key_asymmetric_init)( struct key * ); NTSTATUS (CDECL *key_asymmetric_generate)( struct key * ); NTSTATUS (CDECL *key_asymmetric_decrypt)( struct key *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG * ); NTSTATUS (CDECL *key_asymmetric_duplicate)( struct key *, struct key * ); diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 5eb50cd616b..e32d5a175db 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -672,6 +672,36 @@ static NTSTATUS set_alg_property( struct algorithm *alg, const WCHAR *prop, UCHA } } +static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) +{ + if (!wcscmp( prop, BCRYPT_CHAINING_MODE )) + { + if (!wcscmp( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB )) + { + key->u.s.mode = MODE_ID_ECB; + return STATUS_SUCCESS; + } + else if (!wcscmp( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC )) + { + key->u.s.mode = MODE_ID_CBC; + return STATUS_SUCCESS; + } + else if (!wcscmp( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM )) + { + key->u.s.mode = MODE_ID_GCM; + return STATUS_SUCCESS; + } + else + { + FIXME( "unsupported mode %s\n", debugstr_w((WCHAR *)value) ); + return STATUS_NOT_IMPLEMENTED; + } + } + + FIXME( "unsupported key property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS get_hash_property( const struct hash *hash, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) { NTSTATUS status; @@ -933,7 +963,6 @@ static NTSTATUS key_asymmetric_create( struct key **ret_key, struct algorithm *a const UCHAR *pubkey, ULONG pubkey_len ) { struct key *key; - NTSTATUS status; if (!key_funcs) { @@ -956,12 +985,6 @@ static NTSTATUS key_asymmetric_create( struct key **ret_key, struct algorithm *a memcpy( key->u.a.pubkey, pubkey, pubkey_len ); key->u.a.pubkey_len = pubkey_len; } - if ((status = key_funcs->key_asymmetric_init( key ))) - { - heap_free( key->u.a.pubkey ); - heap_free( key ); - return status; - } *ret_key = key; return STATUS_SUCCESS; } @@ -1446,7 +1469,6 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ struct algorithm *alg = algorithm; struct key *key; ULONG block_size; - NTSTATUS status; TRACE( "%p, %p, %p, %u, %p, %u, %08x\n", algorithm, handle, object, object_len, secret, secret_len, flags ); @@ -1476,13 +1498,6 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ memcpy( key->u.s.secret, secret, secret_len ); key->u.s.secret_len = secret_len; - if ((status = key_funcs->key_symmetric_init( key ))) - { - heap_free( key->u.s.secret ); - heap_free( key ); - return status; - } - *handle = key; return STATUS_SUCCESS; } @@ -1499,8 +1514,22 @@ NTSTATUS WINAPI BCryptGenerateKeyPair( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_H if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; if (!handle) return STATUS_INVALID_PARAMETER; - if (!(status = key_asymmetric_create( &key, alg, key_len, NULL, 0 ))) *handle = key; - return status; + switch (alg->id) + { + case ALG_ID_ECDH_P256: + case ALG_ID_ECDSA_P256: + case ALG_ID_ECDSA_P384: + case ALG_ID_RSA: + case ALG_ID_RSA_SIGN: + case ALG_ID_DSA: + if (!(status = key_asymmetric_create( &key, alg, key_len, NULL, 0 ))) *handle = key; + return status; + + default: + FIXME( "algorithm %u not supported\n", alg->id ); + return STATUS_NOT_SUPPORTED; + } + } NTSTATUS WINAPI BCryptFinalizeKeyPair( BCRYPT_KEY_HANDLE handle, ULONG flags ) @@ -1767,7 +1796,7 @@ NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHA case MAGIC_KEY: { struct key *key = (struct key *)object; - return key_funcs->key_set_property( key, prop, value, size, flags ); + return set_key_property( key, prop, value, size, flags ); } default: WARN( "unknown magic %08x\n", object->magic ); diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 9c1e7b5ab06..317881640ed 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -480,52 +480,6 @@ static void buffer_append_asn1_r_s( struct buffer *buffer, BYTE *r, DWORD r_len, buffer_free( &value ); } -static NTSTATUS CDECL key_set_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) -{ - if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) - { - if (!strcmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB )) - { - key->u.s.mode = MODE_ID_ECB; - return STATUS_SUCCESS; - } - else if (!strcmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC )) - { - key->u.s.mode = MODE_ID_CBC; - return STATUS_SUCCESS; - } - else if (!strcmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM )) - { - key->u.s.mode = MODE_ID_GCM; - return STATUS_SUCCESS; - } - else - { - FIXME( "unsupported mode %s\n", debugstr_w((WCHAR *)value) ); - return STATUS_NOT_IMPLEMENTED; - } - } - - FIXME( "unsupported key property %s\n", debugstr_w(prop) ); - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS CDECL key_symmetric_init( struct key *key ) -{ - if (!libgnutls_handle) return STATUS_INTERNAL_ERROR; - - switch (key->alg_id) - { - case ALG_ID_3DES: - case ALG_ID_AES: - return STATUS_SUCCESS; - - default: - FIXME( "algorithm %u not supported\n", key->alg_id ); - return STATUS_NOT_SUPPORTED; - } -} - static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) { switch (key->alg_id) @@ -1271,26 +1225,6 @@ static NTSTATUS CDECL key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG le return STATUS_SUCCESS; } -static NTSTATUS CDECL key_asymmetric_init( struct key *key ) -{ - if (!libgnutls_handle) return STATUS_INTERNAL_ERROR; - - switch (key->alg_id) - { - case ALG_ID_ECDH_P256: - case ALG_ID_ECDSA_P256: - case ALG_ID_ECDSA_P384: - case ALG_ID_RSA: - case ALG_ID_RSA_SIGN: - case ALG_ID_DSA: - return STATUS_SUCCESS; - - default: - FIXME( "algorithm %u not supported\n", key->alg_id ); - return STATUS_NOT_SUPPORTED; - } -} - static NTSTATUS import_gnutls_pubkey_ecc( struct key *key, gnutls_pubkey_t *gnutls_key ) { BCRYPT_ECCKEY_BLOB *ecc_blob; @@ -1871,15 +1805,12 @@ static NTSTATUS CDECL key_asymmetric_decrypt( struct key *key, UCHAR *input, ULO static const struct key_funcs key_funcs = { - key_set_property, - key_symmetric_init, key_symmetric_vector_reset, key_symmetric_set_auth_data, key_symmetric_encrypt, key_symmetric_decrypt, key_symmetric_get_tag, key_symmetric_destroy, - key_asymmetric_init, key_asymmetric_generate, key_asymmetric_decrypt, key_asymmetric_duplicate,

1 0

Rémi Bernon : dinput: Implement HID joystick IDirectInputEffect_(Download|Unload).
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 9aad438057a141401df2e3298478920c427c1bd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9aad438057a141401df2e329… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 7 10:40:08 2021 +0200 dinput: Implement HID joystick IDirectInputEffect_(Download|Unload). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 157 +++++++++++++++++++++++++++++++++++++++++++-- dlls/dinput8/tests/hid.c | 33 ---------- 2 files changed, 153 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9aad438057a141401df2…

1 0

Rémi Bernon : dinput: Look for PID direction collection and set DIEP_DIRECTION if found.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 453940f571c361419b1c93f730d57df6815f00ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=453940f571c361419b1c93f7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 7 10:40:07 2021 +0200 dinput: Look for PID direction collection and set DIEP_DIRECTION if found. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 66899e73e53..1bc8e752524 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -92,7 +92,10 @@ struct pid_effect_update ULONG type_coll; ULONG axes_coll; ULONG axis_count; + ULONG direction_coll; + ULONG direction_count; struct hid_value_caps *axis_caps[6]; + struct hid_value_caps *direction_caps[6]; struct hid_value_caps *duration_caps; struct hid_value_caps *gain_caps; struct hid_value_caps *sample_period_caps; @@ -1138,6 +1141,7 @@ static HRESULT WINAPI hid_joystick_GetEffectInfo( IDirectInputDevice8W *iface, D } if (effect_update->trigger_button_caps) info->dwDynamicParams |= DIEP_TRIGGERBUTTON; if (effect_update->trigger_repeat_interval_caps) info->dwDynamicParams |= DIEP_TRIGGERREPEATINTERVAL; + if (effect_update->direction_coll) info->dwDynamicParams |= DIEP_DIRECTION; if (effect_update->axes_coll) info->dwDynamicParams |= DIEP_AXES; if (!(collection = effect_update->type_coll)) return DIERR_DEVICENOTREG; @@ -1831,6 +1835,7 @@ static BOOL init_pid_reports( struct hid_joystick *impl, struct hid_value_caps * SET_SUB_COLLECTION( effect_update, type_coll ); break; case PID_USAGE_AXES_ENABLE: SET_SUB_COLLECTION( effect_update, axes_coll ); break; + case PID_USAGE_DIRECTION: SET_SUB_COLLECTION( effect_update, direction_coll ); break; } } @@ -1887,6 +1892,13 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap else effect_update->axis_caps[effect_update->axis_count] = caps; effect_update->axis_count++; } + if (instance->wCollectionNumber == effect_update->direction_coll) + { + SET_REPORT_ID( effect_update ); + if (effect_update->direction_count >= 6) FIXME( "more than 6 PID directions detected\n" ); + else effect_update->direction_caps[effect_update->direction_count] = caps; + effect_update->direction_count++; + } #undef SET_REPORT_ID

1 0

Rémi Bernon : dinput: Partially implement HID joystick IDirectInputEffect_SetParameters.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 83bc89f41f1d2a24b4503a8f659d27cd16da89b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83bc89f41f1d2a24b4503a8f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 7 10:40:06 2021 +0200 dinput: Partially implement HID joystick IDirectInputEffect_SetParameters. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 176 +++++++++++++++++++++++++++++++++++++++++++-- dlls/dinput8/tests/hid.c | 85 ++-------------------- 2 files changed, 177 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=83bc89f41f1d2a24b450…

1 0

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 October 2021