November 2021 - Wine-Devel - list.winehq.org

[PATCH 1/3] dinput: Fix HID joystick GetEffectInfo / GetCapabilities flags.

by Rémi Bernon

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 37 ++++++++++--------------------------- dlls/dinput8/tests/hid.c | 7 ------- 2 files changed, 10 insertions(+), 34 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) + if (set_condition->positive_coefficient_caps || set_condition->negative_coefficient_caps) + info->dwDynamicParams |= DIEP_TYPESPECIFICPARAMS; + if (set_condition->positive_saturation_caps || set_condition->negative_saturation_caps) { info->dwDynamicParams |= DIEP_TYPESPECIFICPARAMS; - type |= DIEFT_POSNEGCOEFFICIENTS; - } - if (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) - { - 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 ); -- 2.33.1

Nov. 9, 2021

Re: [PATCH vkd3d 5/5] vkd3d-shader/hlsl: Write SM4 sample instructions.

by Matteo Bruni

On Tue, Nov 9, 2021 at 4:56 AM Zebediah Figura <zfigura(a)codeweavers.com> wrote: > > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > --- > libs/vkd3d-shader/hlsl_sm4.c | 56 ++++++++++++++++++++++++++++++++++-- > 1 file changed, 54 insertions(+), 2 deletions(-) > > diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c > index e597425ae..da31d5ae2 100644 > --- a/libs/vkd3d-shader/hlsl_sm4.c > +++ b/libs/vkd3d-shader/hlsl_sm4.c > @@ -1227,6 +1236,32 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf > write_sm4_instruction(buffer, &instr); > } > > +static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, > + const struct hlsl_type *resource_type, const struct hlsl_ir_node *dst, > + const struct hlsl_deref *resource, const struct hlsl_deref *sampler, const struct hlsl_ir_node *coords) Just for my own curiosity: any particular reason for write_sm4_sample() (and write_sm4_ld()) to take an explicit resource_type argument?

Nov. 9, 2021

Re: [PATCH vkd3d 5/5] vkd3d-shader/hlsl: Write SM4 sample instructions.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>

Nov. 9, 2021

Re: [PATCH vkd3d 4/5] vkd3d-shader/hlsl: Write SM4 sampler declarations.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>

Nov. 9, 2021

Re: [PATCH vkd3d 3/5] vkd3d-shader/hlsl: Handle samplers in write_sm1_uniform().

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>

Nov. 9, 2021

[PATCH] winex11.drv: Check if the surface is in list in wine_vk_surface_release().

by Paul Gofman

Fixes a regression introduced by 6dcaff421f87a93efe18b2efe0ec64d94ed1d483. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- The surface might have not been added to the list if it gets released from error path in X11DRV_vkCreateWin32SurfaceKHR(). 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); -- 2.33.1

Nov. 9, 2021

[PATCH] win32u: Use the replacement name in otmpFamilyName and GetTextFace().

by Akihiro Sagawa

Some visual novel games verify that otmpFamilyName matches the desired font name. That prevents us from using replacement fonts. This commit allows to make otmpFamilyName from the replacement name. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/win32u/font.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)

Nov. 9, 2021

[PATCH] win32u: Make elfFullName from family name in the font replacement.

by Akihiro Sagawa

The original Kusanagi code, commit eab02574929d, was implemented in this way. However, commit abc8f2c6c270 and f360057e2f99 made it from face->full_name. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/win32u/font.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)

Nov. 9, 2021

Re: [PATCH 5/5] win32u: Move NtUserCountClipboardFormats implementation from user32.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=101535 Your paranoid android. === debiant2 (32 bit Chinese:China report) === user32: msg.c:15143: Test failed: bad time 73be526 === debiant2 (64 bit WoW report) === user32: win.c:10414: Test failed: Expected foreground window 0, got 00000000017700B4 win.c:10420: Test failed: Expected foreground window 00000000000D0126, got 00000000017700B4

Nov. 9, 2021

[PATCH 18/18] msvcrt: Don't set frame to 0 in arm and arm64 setjmp.

by Martin Storsjö

This matches what was done for x86_64 in 882980c17a9a033fa8e49a4c116af9583698d218. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/msvcrt/except_arm.c | 1 - dlls/msvcrt/except_arm64.c | 1 - 2 files changed, 2 deletions(-) diff --git a/dlls/msvcrt/except_arm.c b/dlls/msvcrt/except_arm.c index 8e5c552b552..fecbfe65929 100644 --- a/dlls/msvcrt/except_arm.c +++ b/dlls/msvcrt/except_arm.c @@ -109,7 +109,6 @@ unsigned int CDECL __CxxQueryExceptionSize(void) * _setjmp (MSVCRT.@) */ __ASM_GLOBAL_FUNC(MSVCRT__setjmp, - "mov r1, #0\n\t" /* frame */ "b " __ASM_NAME("__wine_setjmpex")); /******************************************************************* diff --git a/dlls/msvcrt/except_arm64.c b/dlls/msvcrt/except_arm64.c index 242ef8bdb09..574e77485f9 100644 --- a/dlls/msvcrt/except_arm64.c +++ b/dlls/msvcrt/except_arm64.c @@ -110,7 +110,6 @@ unsigned int CDECL __CxxQueryExceptionSize(void) * _setjmp (MSVCRT.@) */ __ASM_GLOBAL_FUNC(MSVCRT__setjmp, - "mov x1, #0\n\t" /* frame */ "b " __ASM_NAME("__wine_setjmpex")); /******************************************************************* -- 2.25.1

Nov. 9, 2021