wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Martin Storsjö : winedump: Print the whole multibyte unwind opcode for arm.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 825e8d8105efcd18a1a2083cdded3f5b1cef5435 URL: https://source.winehq.org/git/wine.git/?a=commit;h=825e8d8105efcd18a1a2083c… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Nov 9 16:05:44 2021 +0200 winedump: Print the whole multibyte unwind opcode for arm. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/pe.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 04e01755171..4629c3082f9 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -764,6 +764,18 @@ static void dump_x86_64_unwind_info( const struct runtime_function_x86_64 *funct (ULONG)(function->UnwindData + (const char *)(&handler_data->handler + 1) - (const char *)info )); } +static const BYTE armnt_code_lengths[256] = +{ +/* 00 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +/* 20 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +/* 40 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +/* 60 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +/* 80 */ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, +/* a0 */ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, +/* c0 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +/* e0 */ 1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,4,3,4,1,1,1,1,1 +}; + static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) { const struct unwind_info_armnt *info; @@ -990,6 +1002,7 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) for (b = 0; b < words * sizeof(*codes); b++) { BYTE code = bytes[b]; + BYTE len = armnt_code_lengths[code]; if (info->e && b == count) { @@ -1007,7 +1020,10 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) } } - printf( " Unwind Code %x\t", code ); + printf( " Unwind Code"); + for (i = 0; i < len; i++) + printf( " %02x", bytes[b+i] ); + printf( "\t" ); if (code == 0x00) printf( "\n" );

1 0

Martin Storsjö : ntdll/tests: Add tests for RtlVirtualUnwind for arm.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 0dc34ad87a20996fc63de7f1fd4c9064b53edf3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dc34ad87a20996fc63de7f1… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Nov 9 16:05:43 2021 +0200 ntdll/tests: Add tests for RtlVirtualUnwind for arm. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 1350 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1350 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0dc34ad87a20996fc63d…

1 0

Martin Storsjö : ntdll: Implement RtlVirtualUnwind for arm.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: dd1c56075297d647b078ba9b35770cf82f7f2eb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd1c56075297d647b078ba9b… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Nov 9 16:05:42 2021 +0200 ntdll: Implement RtlVirtualUnwind for arm. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-rtlsupport-l1-1-0.spec | 2 +- .../api-ms-win-core-rtlsupport-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_arm.c | 524 +++++++++++++++++++++ 5 files changed, 528 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dd1c56075297d647b078…

1 0

Martin Storsjö : kernel32: Update arch availability for Rtl* forwards to ntdll.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: eeb18e491377531d1f652668ec01868ea765289c URL: https://source.winehq.org/git/wine.git/?a=commit;h=eeb18e491377531d1f652668… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Nov 9 16:05:41 2021 +0200 kernel32: Update arch availability for Rtl* forwards to ntdll. Some functions aren't available in real kernel32.dll on i386, even if they are available in ntdll (and thus are available on x86_64,arm,arm64), some should be available on more architectures but aren't implemented in ntdll yet. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 90b503af19f..13e4df3c99f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1302,16 +1302,16 @@ @ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable @ stdcall -norelay RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace -@ stdcall -arch=x86_64 RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory +@ stdcall -arch=arm,arm64,x86_64 RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory @ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) ntdll.RtlCopyMemory @ cdecl -arch=arm,arm64,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory @ cdecl -arch=arm,arm64,x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr ptr) ntdll.RtlInstallFunctionTableCallback @ stdcall -arch=arm,arm64,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory -@ stdcall -arch=x86_64,arm,arm64 RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader -@ stdcall -arch=arm -norelay RtlRaiseException(ptr) ntdll.RtlRaiseException -@ cdecl -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext +@ stdcall RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader +@ stdcall -arch=arm,arm64,x86_64 -norelay RtlRaiseException(ptr) ntdll.RtlRaiseException +@ cdecl -arch=arm64,x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind @ stdcall -arch=arm64,x86_64 RtlUnwindEx(long long ptr long ptr) ntdll.RtlUnwindEx @ stdcall -arch=arm64,x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind

1 0

Martin Storsjö : ntdll: Don't blindly increment Sp by 8 in leaf functions on arm64.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 7b7a2af5ee29a571a72e7234caf89dd0275967e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b7a2af5ee29a571a72e7234… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Nov 9 16:05:40 2021 +0200 ntdll: Don't blindly increment Sp by 8 in leaf functions on arm64. This doesn't fix (or break) any case known to me, but the code seems wrong. Leaf functions on arm (either 32 or 64) don't generally have any default/implicit stack allocation. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 50939125846..a52e9bccc49 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -224,7 +224,6 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON dispatch->LanguageHandler = NULL; dispatch->EstablisherFrame = context->Sp; context->Pc = context->u.s.Lr; - context->Sp = context->Sp + sizeof(ULONG64); context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; return STATUS_SUCCESS; }

1 0

Martin Storsjö : ntdll: Print an error if unable to unwind due to missing libunwind on arm64.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 4463ccb26709ad3353b7911ed623db94a5b419ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=4463ccb26709ad3353b7911e… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Nov 9 16:05:39 2021 +0200 ntdll: Print an error if unable to unwind due to missing libunwind on arm64. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 0f72bf3c89d..50939125846 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -319,6 +319,7 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON context->u.s.X28, context->u.s.Fp, context->u.s.Lr, context->Sp ); return STATUS_SUCCESS; #else + ERR("libunwind not available, unable to unwind\n"); return STATUS_INVALID_DISPOSITION; #endif }

1 0

Martin Storsjö : ntdll/tests: Remove an accidental, unused macro in arm64 exception tests.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: e9939c9301c926e8a35f4b483b544752bf58d956 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9939c9301c926e8a35f4b48… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Nov 9 16:05:38 2021 +0200 ntdll/tests: Remove an accidental, unused macro in arm64 exception tests. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 6af68317732..c57d7c01d86 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -5320,8 +5320,6 @@ static const char * const reg_names[48] = #define ORIG_LR 0xCCCCCCCC -#define UWOP(code,info) (UWOP_##code | ((info) << 4)) - static void call_virtual_unwind( int testnum, const struct unwind_test *test ) { static const int code_offset = 1024;

1 0

Paul Gofman : winex11.drv: Check if the surface is in list in wine_vk_surface_release().
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 963589ee296ae90003dab3e8204766ab4e4c0045 URL: https://source.winehq.org/git/wine.git/?a=commit;h=963589ee296ae90003dab3e8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Nov 9 17:43:31 2021 +0300 winex11.drv: Check if the surface is in list in wine_vk_surface_release(). Fixes a regression introduced by 6dcaff421f87a93efe18b2efe0ec64d94ed1d483. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/vulkan.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 4f6624b3db8..6f67d9a8a19 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -211,9 +211,12 @@ static void wine_vk_surface_release(struct wine_vk_surface *surface) if (InterlockedDecrement(&surface->ref)) return; - EnterCriticalSection(&context_section); - list_remove(&surface->entry); - LeaveCriticalSection(&context_section); + if (surface->entry.next) + { + EnterCriticalSection(&context_section); + list_remove(&surface->entry); + LeaveCriticalSection(&context_section); + } if (surface->window) XDestroyWindow(gdi_display, surface->window);

1 0

Rémi Bernon : dinput: Improve object dwOfs values for dinput version <= 0x700.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: f183f8f946f5f273d94cbdfa451e90de326f909c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f183f8f946f5f273d94cbdfa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 9 16:12:42 2021 +0100 dinput: Improve object dwOfs values for dinput version <= 0x700. It's not completely correct yet as dinput version 0x500 and probably below enumerate objects following the default data format instead of a device specific one. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index b061fe30bcd..dfaf6ae83ff 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -400,11 +400,15 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, DIDEVICEOBJECTINSTANCEW instance = {.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW)}; struct hid_value_caps *caps, *caps_end, *nary, *nary_end, *effect_caps; struct hid_collection_node *node, *node_end; + WORD version = impl->base.dinput->dwVersion; BOOL ret, seen_axis[6] = {0}; button_ofs += impl->caps.NumberInputValueCaps * sizeof(LONG); - button_ofs += impl->caps.NumberOutputValueCaps * sizeof(LONG); - button_ofs += impl->caps.NumberFeatureValueCaps * sizeof(LONG); + if (version >= 0x800) + { + button_ofs += impl->caps.NumberOutputValueCaps * sizeof(LONG); + button_ofs += impl->caps.NumberFeatureValueCaps * sizeof(LONG); + } for (caps = HID_INPUT_VALUE_CAPS( preparsed ), caps_end = caps + preparsed->input_caps_count; caps != caps_end; ++caps) @@ -545,7 +549,9 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, for (nary = caps; nary != nary_end; nary--) { - instance.dwOfs = button_ofs; + if (version < 0x800) instance.dwOfs = 0; + else instance.dwOfs = button_ofs; + instance.dwType = DIDFT_NODATA | DIDFT_MAKEINSTANCE( object++ ) | DIDFT_OUTPUT; instance.dwFlags = 0x80008000; instance.wUsagePage = nary->usage_page; @@ -562,7 +568,8 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, } else for (j = caps->usage_min; j <= caps->usage_max; ++j) { - if (caps->flags & HID_VALUE_CAPS_IS_BUTTON) instance.dwOfs = button_ofs; + if (version < 0x800) instance.dwOfs = 0; + else if (caps->flags & HID_VALUE_CAPS_IS_BUTTON) instance.dwOfs = button_ofs; else instance.dwOfs = value_ofs; instance.dwType = DIDFT_NODATA | DIDFT_MAKEINSTANCE( object++ ) | DIDFT_OUTPUT;

1 0

Rémi Bernon : dinput: Fix HID joystick GetEffectInfo / GetCapabilities flags.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: ec3ffba786b273f7cf9630c5aa8421d671789511 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec3ffba786b273f7cf9630c5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 9 16:12:41 2021 +0100 dinput: Fix HID joystick GetEffectInfo / GetCapabilities flags. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 35 +++++++++-------------------------- dlls/dinput8/tests/hid.c | 7 ------- 2 files changed, 9 insertions(+), 33 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 541aa26e73b..b061fe30bcd 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -859,8 +859,6 @@ static HRESULT hid_joystick_get_effect_info( IDirectInputDevice8W *iface, DIEFFE type |= DIEFT_STARTDELAY; info->dwDynamicParams |= DIEP_STARTDELAY; } - 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; @@ -882,7 +880,7 @@ static HRESULT hid_joystick_get_effect_info( IDirectInputDevice8W *iface, DIEFFE } } - if ((type == DIEFT_PERIODIC) && (collection = set_periodic->collection)) + if ((type & DIEFT_PERIODIC) && (collection = set_periodic->collection)) { if (set_periodic->magnitude_caps) info->dwDynamicParams |= DIEP_TYPESPECIFICPARAMS; if (set_periodic->offset_caps) info->dwDynamicParams |= DIEP_TYPESPECIFICPARAMS; @@ -890,39 +888,27 @@ static HRESULT hid_joystick_get_effect_info( IDirectInputDevice8W *iface, DIEFFE if (set_periodic->phase_caps) info->dwDynamicParams |= DIEP_TYPESPECIFICPARAMS; } - if ((type == DIEFT_PERIODIC || type == DIEFT_RAMPFORCE || type == DIEFT_CONSTANTFORCE) && - (collection = set_envelope->collection)) + if ((type & (DIEFT_PERIODIC | DIEFT_RAMPFORCE | DIEFT_CONSTANTFORCE)) && (collection = set_envelope->collection)) { info->dwDynamicParams |= DIEP_ENVELOPE; if (set_envelope->attack_level_caps) type |= DIEFT_FFATTACK; if (set_envelope->attack_time_caps) type |= DIEFT_FFATTACK; if (set_envelope->fade_level_caps) type |= DIEFT_FFFADE; if (set_envelope->fade_time_caps) type |= DIEFT_FFFADE; + if (effect_update->trigger_button_caps) info->dwDynamicParams |= DIEP_TRIGGERBUTTON; + if (effect_update->trigger_repeat_interval_caps) info->dwDynamicParams |= DIEP_TRIGGERREPEATINTERVAL; } - if ((collection = set_condition->collection) && (type == DIEFT_CONDITION)) + if ((type & DIEFT_CONDITION) && (collection = set_condition->collection)) { if (set_condition->center_point_offset_caps) info->dwDynamicParams |= DIEP_TYPESPECIFICPARAMS; - if (set_condition->positive_coefficient_caps) - { - info->dwDynamicParams |= DIEP_TYPESPECIFICPARAMS; - type |= DIEFT_POSNEGCOEFFICIENTS; - } - if (set_condition->negative_coefficient_caps) - { + if (set_condition->positive_coefficient_caps || set_condition->negative_coefficient_caps) info->dwDynamicParams |= DIEP_TYPESPECIFICPARAMS; - type |= DIEFT_POSNEGCOEFFICIENTS; - } - if (set_condition->positive_saturation_caps) - { - info->dwDynamicParams |= DIEP_TYPESPECIFICPARAMS; - type |= DIEFT_SATURATION | DIEFT_POSNEGSATURATION; - } - if (set_condition->negative_saturation_caps) + if (set_condition->positive_saturation_caps || set_condition->negative_saturation_caps) { info->dwDynamicParams |= DIEP_TYPESPECIFICPARAMS; - type |= DIEFT_SATURATION | DIEFT_POSNEGSATURATION; + type |= DIEFT_SATURATION; } if (set_condition->dead_band_caps) { @@ -1841,12 +1827,9 @@ HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID *guid, if (impl->pid_set_envelope.fade_level_caps || impl->pid_set_envelope.fade_time_caps) impl->base.caps.dwFlags |= DIDC_FFFADE; - if (impl->pid_set_condition.positive_coefficient_caps || - impl->pid_set_condition.negative_coefficient_caps) - impl->base.caps.dwFlags |= DIDC_POSNEGCOEFFICIENTS; if (impl->pid_set_condition.positive_saturation_caps || impl->pid_set_condition.negative_saturation_caps) - impl->base.caps.dwFlags |= DIDC_SATURATION|DIDC_POSNEGSATURATION; + impl->base.caps.dwFlags |= DIDC_SATURATION; if (impl->pid_set_condition.dead_band_caps) impl->base.caps.dwFlags |= DIDC_DEADBAND; impl->base.caps.dwFFSamplePeriod = 1000000; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index a0e202ba804..57fc7272369 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3388,11 +3388,8 @@ static BOOL CALLBACK check_effects( const DIEFFECTINFOW *effect, void *args ) check_member( *effect, *exp, "%u", dwSize ); check_member_guid( *effect, *exp, guid ); - todo_wine check_member( *effect, *exp, "%#x", dwEffType ); - todo_wine check_member( *effect, *exp, "%#x", dwStaticParams ); - todo_wine check_member( *effect, *exp, "%#x", dwDynamicParams ); check_member_wstr( *effect, *exp, tszName ); @@ -7289,7 +7286,6 @@ static void test_force_feedback_joystick( void ) hr = IDirectInputDevice8_GetCapabilities( device, &caps ); ok( hr == DI_OK, "GetCapabilities returned %#x\n", hr ); check_member( caps, expect_caps, "%d", dwSize ); - todo_wine check_member( caps, expect_caps, "%#x", dwFlags ); check_member( caps, expect_caps, "%#x", dwDevType ); check_member( caps, expect_caps, "%d", dwAxes ); @@ -7332,11 +7328,8 @@ static void test_force_feedback_joystick( void ) hr = IDirectInputDevice8_GetEffectInfo( device, &effectinfo, &GUID_Sine ); ok( hr == DI_OK, "GetEffectInfo returned %#x\n", hr ); check_member_guid( effectinfo, expect_effects[1], guid ); - todo_wine check_member( effectinfo, expect_effects[1], "%#x", dwEffType ); - todo_wine check_member( effectinfo, expect_effects[1], "%#x", dwStaticParams ); - todo_wine check_member( effectinfo, expect_effects[1], "%#x", dwDynamicParams ); check_member_wstr( effectinfo, expect_effects[1], tszName );

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
96
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 2021