October 2021 - Wine-Commits

Jacek Caban : win32u: Move ntgdi implementation from gdi32.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: 08f677cadf30b750d1661f7ef781b9c3aba6f1fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=08f677cadf30b750d1661f7e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 16:20:35 2021 +0200 win32u: Move ntgdi implementation from gdi32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 38 +-- dlls/gdi32/objects.c | 2 - dlls/win32u/Makefile.in | 34 ++- dlls/{gdi32 => win32u}/bitblt.c | 0 dlls/{gdi32 => win32u}/bitmap.c | 0 dlls/{gdi32 => win32u}/brush.c | 0 dlls/{gdi32 => win32u}/clipping.c | 0 dlls/{gdi32 => win32u}/dc.c | 0 dlls/{gdi32 => win32u}/dib.c | 0 dlls/{gdi32 => win32u}/dibdrv/bitblt.c | 0 dlls/{gdi32 => win32u}/dibdrv/dc.c | 0 dlls/{gdi32 => win32u}/dibdrv/dibdrv.h | 0 dlls/{gdi32 => win32u}/dibdrv/graphics.c | 0 dlls/{gdi32 => win32u}/dibdrv/objects.c | 0 dlls/{gdi32 => win32u}/dibdrv/opengl.c | 0 dlls/{gdi32 => win32u}/dibdrv/primitives.c | 0 dlls/{gdi32 => win32u}/driver.c | 0 dlls/{gdi32 => win32u}/emfdrv.c | 0 dlls/{gdi32 => win32u}/font.c | 0 dlls/{gdi32 => win32u}/freetype.c | 2 - dlls/{gdi32 => win32u}/gdiobj.c | 13 +- dlls/win32u/main.c | 5 +- dlls/{gdi32 => win32u}/mapping.c | 0 dlls/{gdi32 => win32u}/ntgdi_private.h | 0 dlls/{gdi32 => win32u}/opentype.c | 0 dlls/{gdi32 => win32u}/painting.c | 0 dlls/{gdi32 => win32u}/palette.c | 0 dlls/{gdi32 => win32u}/path.c | 0 dlls/{gdi32 => win32u}/pen.c | 0 dlls/{gdi32 => win32u}/printdrv.c | 0 dlls/{gdi32 => win32u}/region.c | 0 dlls/win32u/syscall.c | 20 +- dlls/{gdi32 => win32u}/vertical.c | 0 dlls/{gdi32 => win32u}/vulkan.c | 0 dlls/win32u/win32u.spec | 362 ++++++++++++++++------------- dlls/{gdi32 => win32u}/win32u_private.h | 8 +- dlls/{gdi32 => win32u}/wrappers.c | 26 +-- 37 files changed, 263 insertions(+), 247 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08f677cadf30b750d166…

1 0

Jacek Caban : gdi32: Use __wine_ prefix for Wine ntgdi extensions.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: 7757f4ee7ee9cf56ee8fb3619bc80892ebe89e80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7757f4ee7ee9cf56ee8fb361… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 16:20:26 2021 +0200 gdi32: Use __wine_ prefix for Wine ntgdi extensions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/brush.c | 5 ++++- dlls/gdi32/dc.c | 4 ++-- dlls/gdi32/emfdc.c | 4 ++-- dlls/gdi32/font.c | 5 ++++- dlls/gdi32/gdi_private.h | 7 ------- dlls/gdi32/gdiobj.c | 6 +++--- dlls/gdi32/icm.c | 4 ++-- dlls/gdi32/metadc.c | 4 ++-- dlls/gdi32/text.c | 2 +- dlls/gdi32/win32u_private.h | 6 ------ dlls/gdi32/wrappers.c | 6 +++--- include/ntgdi.h | 8 ++++++++ 12 files changed, 31 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7757f4ee7ee9cf56ee8f…

1 0

Jacek Caban : ntdll: Handle Unix lib exception outside Unix stack.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: e0a934d0ef2d690caa700f2bcbe2359b8141fc18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0a934d0ef2d690caa700f2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 16:20:12 2021 +0200 ntdll: Handle Unix lib exception outside Unix stack. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 2 +- dlls/ntdll/unix/signal_arm64.c | 2 +- dlls/ntdll/unix/signal_i386.c | 2 +- dlls/ntdll/unix/signal_x86_64.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 584c1f2f0bf..88f0f4ff76d 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -645,7 +645,7 @@ static BOOL handle_syscall_fault( ucontext_t *context, EXCEPTION_RECORD *rec ) struct syscall_frame *frame = arm_thread_data()->syscall_frame; DWORD i; - if (!is_inside_syscall( context )) return FALSE; + if (!is_inside_syscall( context ) && !ntdll_get_thread_data()->jmp_buf) return FALSE; TRACE( "code=%x flags=%x addr=%p pc=%08x tid=%04x\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index df0c7dad1da..ce7e1689434 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -794,7 +794,7 @@ static BOOL handle_syscall_fault( ucontext_t *context, EXCEPTION_RECORD *rec ) struct syscall_frame *frame = arm64_thread_data()->syscall_frame; DWORD i; - if (!is_inside_syscall( context )) return FALSE; + if (!is_inside_syscall( context ) && !ntdll_get_thread_data()->jmp_buf) return FALSE; TRACE( "code=%x flags=%x addr=%p pc=%p tid=%04x\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index a709c85b4da..c38c4d046d7 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1697,7 +1697,7 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, void *stack_ptr, struct syscall_frame *frame = x86_thread_data()->syscall_frame; DWORD i, *stack; - if (!is_inside_syscall( sigcontext )) return FALSE; + if (!is_inside_syscall( sigcontext ) && !ntdll_get_thread_data()->jmp_buf) return FALSE; TRACE( "code=%x flags=%x addr=%p ip=%08x tid=%04x\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index ffe7ef7db07..a99cf2ae9c1 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2478,7 +2478,7 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, struct syscall_frame *frame = amd64_thread_data()->syscall_frame; DWORD i; - if (!is_inside_syscall( sigcontext )) return FALSE; + if (!is_inside_syscall( sigcontext ) && !ntdll_get_thread_data()->jmp_buf) return FALSE; TRACE_(seh)( "code=%x flags=%x addr=%p ip=%lx tid=%04x\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress,

1 0

Alexandre Julliard : bcrypt: Move public key allocation to the PE side.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

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

Rémi Bernon : dinput: Partially implement HID joystick IDirectInputEffect_GetParameters.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: 35ea577409347b90920fedd11a5402686a3653ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=35ea577409347b90920fedd1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 7 10:40:05 2021 +0200 dinput: Partially implement HID joystick IDirectInputEffect_GetParameters. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 162 ++++++++++++++++++++++++++++++++++++++++++++- dlls/dinput8/tests/hid.c | 48 -------------- 2 files changed, 160 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=35ea577409347b90920f…

1 0

Alexandre Julliard : bcrypt: Add a helper macros to load GnuTLS optional functions.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

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

Rémi Bernon : dinput: Look for PID direction collection and set DIEP_DIRECTION if found.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

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: Implement HID joystick IDirectInputEffect_(Download|Unload).
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

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

Alexandre Julliard : bcrypt: Remove some no longer needed Unix backend functions.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

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

Jacek Caban : gdi32: Use __wine_unix_call interface for Unix library.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: f309721d13d8d728732ca97224c7502493ff6026 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f309721d13d8d728732ca972… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 16:20:19 2021 +0200 gdi32: Use __wine_unix_call interface for Unix library. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 3 ++- dlls/gdi32/dibdrv/dc.c | 4 ++-- dlls/gdi32/font.c | 27 +++++++++++++++------------ dlls/gdi32/gdiobj.c | 14 +++++++++----- dlls/gdi32/wrappers.c | 14 ++++++++++++-- 5 files changed, 40 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 6a5df55bfeb..fbfc11d7b60 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -1,9 +1,10 @@ EXTRADEFS = -D_GDI32_ MODULE = gdi32.dll +UNIXLIB = gdi32.so IMPORTLIB = gdi32 IMPORTS = advapi32 EXTRAINCL = $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) -EXTRALIBS = $(CARBON_LIBS) $(APPKIT_LIBS) $(PTHREAD_LIBS) +EXTRALIBS = $(CARBON_LIBS) $(APPKIT_LIBS) $(PTHREAD_LIBS) -lm DELAYIMPORTS = setupapi C_SRCS = \ diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index f69713c8025..8404630bb48 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -27,9 +27,9 @@ #include "ntgdi_private.h" #include "dibdrv.h" +#include "wine/unixlib.h" #include "wine/wgl.h" #include "wine/wgl_driver.h" -#include "wine/exception.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dib); @@ -232,7 +232,7 @@ DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit dst_dib.funcs->convert_to( &dst_dib, &src_dib, &src->visrect, FALSE ); ret = TRUE; } - __EXCEPT_PAGE_FAULT + __EXCEPT { WARN( "invalid bits pointer %p\n", src_bits ); ret = FALSE; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 8cc60d5a16f..3c5911785fd 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -40,7 +40,8 @@ #include "winternl.h" #include "winreg.h" #include "ntgdi_private.h" -#include "wine/exception.h" + +#include "wine/unixlib.h" #include "wine/rbtree.h" #include "wine/debug.h" @@ -528,17 +529,19 @@ static pthread_mutex_t font_lock = PTHREAD_MUTEX_INITIALIZER; static void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) { - SIZE_T len; - - static const WCHAR winedatadirW[] = {'W','I','N','E','D','A','T','A','D','I','R'}; - static const WCHAR winebuilddirW[] = {'W','I','N','E','B','U','I','L','D','D','I','R'}; + const char *dir; + ULONG len = MAX_PATH; - if (!RtlQueryEnvironmentVariable( NULL, winedatadirW, ARRAYSIZE(winedatadirW), - path, MAX_PATH, &len )) - asciiz_to_unicode( path + len, "\\" WINE_FONT_DIR "\\" ); - else if (!RtlQueryEnvironmentVariable( NULL, winebuilddirW, ARRAYSIZE(winebuilddirW), - path, MAX_PATH, &len )) - asciiz_to_unicode( path + len, "\\fonts\\" ); + if ((dir = ntdll_get_data_dir())) + { + wine_unix_to_nt_file_name( dir, path, &len ); + asciiz_to_unicode( path + len - 1, "\\" WINE_FONT_DIR "\\" ); + } + else if ((dir = ntdll_get_build_dir())) + { + wine_unix_to_nt_file_name( dir, path, &len ); + asciiz_to_unicode( path + len - 1, "\\fonts\\" ); + } if (file) lstrcatW( path, file ); } @@ -6456,7 +6459,7 @@ HANDLE WINAPI NtGdiAddFontMemResourceEx( void *ptr, DWORD size, void *dv, ULONG { *count = num_fonts; } - __EXCEPT_PAGE_FAULT + __EXCEPT { WARN( "page fault while writing to *count (%p)\n", count ); NtGdiRemoveFontMemResourceEx( ret ); diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index bbfe50d2c8b..ff7ee2cacda 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -38,6 +38,7 @@ #include "ntgdi_private.h" #include "wine/debug.h" +#include "wine/unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(gdi); @@ -1250,13 +1251,11 @@ static struct unix_funcs unix_funcs = __wine_set_visible_region, }; -NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) +NTSTATUS initialize( void *args ) { pthread_mutexattr_t attr; unsigned int dpi; - if (reason != DLL_PROCESS_ATTACH) return 0; - pthread_mutexattr_init( &attr ); pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_RECURSIVE ); pthread_mutex_init( &gdi_lock, &attr ); @@ -1268,7 +1267,12 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p dpi = font_init(); init_stock_objects( dpi ); - user_callbacks = ptr_in; - *(struct unix_funcs **)ptr_out = &unix_funcs; + user_callbacks = *(const struct user_callbacks **)args; + *(const struct unix_funcs **)args = &unix_funcs; return 0; } + +const unixlib_entry_t __wine_unix_call_funcs[] = +{ + initialize +}; diff --git a/dlls/gdi32/wrappers.c b/dlls/gdi32/wrappers.c index e6e7985e482..f37fbd57b0d 100644 --- a/dlls/gdi32/wrappers.c +++ b/dlls/gdi32/wrappers.c @@ -20,11 +20,12 @@ #include "gdi_private.h" #include "win32u_private.h" +#include "wine/unixlib.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(gdi); -static struct unix_funcs *unix_funcs; +static const struct unix_funcs *unix_funcs; INT WINAPI NtGdiAbortDoc( HDC hdc ) { @@ -1151,5 +1152,14 @@ static const struct user_callbacks user_callbacks = BOOL wrappers_init(void) { - return !__wine_init_unix_lib( gdi32_module, DLL_PROCESS_ATTACH, &user_callbacks, &unix_funcs ); + unixlib_handle_t handle; + const void *args = &user_callbacks; + + if (NtQueryVirtualMemory( GetCurrentProcess(), gdi32_module, MemoryWineUnixFuncs, + &handle, sizeof(handle), NULL )) + return FALSE; + + if (__wine_unix_call( handle, 0, &args )) return FALSE; + unix_funcs = args; + return TRUE; }

1 0