November 2021 - Wine-commits

Nikolay Sivov : mf/tests: Attempt to fix test crashes on some test boxes.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 42c570f7be2cea4b62d42fa8b436b7365477c49a URL: https://source.winehq.org/git/wine.git/?a=commit;h=42c570f7be2cea4b62d42fa8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 21 22:06:45 2021 +0300 mf/tests: Attempt to fix test crashes on some test boxes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index eb681a8b9a7..0d4cb05711a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4498,15 +4498,18 @@ todo_wine { hr = IMFMediaSink_AddStreamSink(sink, 1, NULL, &stream_sink2); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = MFGetService((IUnknown *)stream_sink2, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, - (void **)&allocator); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IMFVideoSampleAllocator_Release(allocator); + if (SUCCEEDED(hr)) + { + hr = MFGetService((IUnknown *)stream_sink2, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, + (void **)&allocator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFVideoSampleAllocator_Release(allocator); - hr = IMFMediaSink_RemoveStreamSink(sink, 1); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSink_RemoveStreamSink(sink, 1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IMFStreamSink_Release(stream_sink2); + IMFStreamSink_Release(stream_sink2); + } hr = IMFMediaSink_GetCharacteristics(sink, &flags); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : include: Add mfd3d12.idl.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: e2b2352fc5216bf916a28fc195aebbbefae99a57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2b2352fc5216bf916a28fc1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 22 10:48:35 2021 +0300 include: Add mfd3d12.idl. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/mfd3d12.idl | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index df049fd284f..756e25dcc82 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -408,6 +408,7 @@ SOURCES = \ mediaobj.idl \ metahost.idl \ mfapi.h \ + mfd3d12.idl \ mferror.h \ mfidl.idl \ mfmediaengine.idl \ diff --git a/include/mfd3d12.idl b/include/mfd3d12.idl new file mode 100644 index 00000000000..2098e6d405a --- /dev/null +++ b/include/mfd3d12.idl @@ -0,0 +1,63 @@ +/* + * Copyright 2021 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "mfidl.idl"; +import "d3d12.idl"; + +[ + object, + uuid(09d0f835-92ff-4e53-8efa-40faa551f233), + local +] +interface IMFD3D12SynchronizationObjectCommands : IUnknown +{ + HRESULT EnqueueResourceReady([in] ID3D12CommandQueue *producer_queue); + HRESULT EnqueueResourceReadyWait([in] ID3D12CommandQueue *consumer_queue); + HRESULT SignalEventOnResourceReady(HANDLE event); + HRESULT EnqueueResourceRelease([in] ID3D12CommandQueue *consumer_queue); +} + +[ + object, + uuid(802302b0-82de-45e1-b421-f19ee5bdaf23), + local +] +interface IMFD3D12SynchronizationObject : IUnknown +{ + HRESULT SignalEventOnFinalResourceRelease(HANDLE hEvent); +} + +typedef enum MF_MT_D3D_RESOURCE_VERSION_ENUM +{ + MF_D3D11_RESOURCE, + MF_D3D12_RESOURCE +} MF_MT_D3D_RESOURCE_VERSION_ENUM; + +cpp_quote("EXTERN_GUID(MF_D3D12_SYNCHRONIZATION_OBJECT, 0x2a7c8d6a, 0x85a6, 0x494d, 0xa0, 0x46, 0x06, 0xea, 0x1a, 0x13, 0x8f, 0x4b);") +cpp_quote("EXTERN_GUID(MF_MT_D3D_RESOURCE_VERSION, 0x174f1e85, 0xfe26, 0x453d, 0xb5, 0x2e, 0x5b, 0xdd, 0x4e, 0x55, 0xb9, 0x44);") +cpp_quote("EXTERN_GUID(MF_MT_D3D12_CPU_READBACK, 0x28ee9fe3, 0xd481, 0x46a6, 0xb9, 0x8a, 0x7f, 0x69, 0xd5, 0x28, 0xe, 0x82);") +cpp_quote("EXTERN_GUID(MF_MT_D3D12_TEXTURE_LAYOUT, 0x97c85caa, 0xbeb, 0x4ee1, 0x97, 0x15, 0xf2, 0x2f, 0xad, 0x8c, 0x10, 0xf5);") +cpp_quote("EXTERN_GUID(MF_MT_D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET, 0xeeac2585, 0x3430, 0x498c, 0x84, 0xa2, 0x77, 0xb1, 0xbb, 0xa5, 0x70, 0xf6);") +cpp_quote("EXTERN_GUID(MF_MT_D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL, 0xb1138dc3, 0x01d5, 0x4c14, 0x9b, 0xdc, 0xcd, 0xc9, 0x33, 0x6f, 0x55, 0xb9);") +cpp_quote("EXTERN_GUID(MF_MT_D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, 0x82c85647, 0x5057, 0x4960, 0x95, 0x59, 0xf4, 0x5b, 0x8e, 0x27, 0x14, 0x27);") +cpp_quote("EXTERN_GUID(MF_MT_D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE, 0xba06bfac, 0xffe3, 0x474a, 0xab, 0x55, 0x16, 0x1e, 0xe4, 0x41, 0x7a, 0x2e);") +cpp_quote("EXTERN_GUID(MF_MT_D3D12_RESOURCE_FLAG_ALLOW_CROSS_ADAPTER, 0xa6a1e439, 0x2f96, 0x4ab5, 0x98, 0xdc, 0xad, 0xf7, 0x49, 0x73, 0x50, 0x5d);") +cpp_quote("EXTERN_GUID(MF_MT_D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS, 0xa4940b2, 0xcfd6, 0x4738, 0x9d, 0x02, 0x98, 0x11, 0x37, 0x34, 0x01, 0x5a);") +cpp_quote("EXTERN_GUID(MF_SA_D3D12_HEAP_FLAGS, 0x496b3266, 0xd28f, 0x4f8c, 0x93, 0xa7, 0x4a, 0x59, 0x6b, 0x1a, 0x31, 0xa1);") +cpp_quote("EXTERN_GUID(MF_SA_D3D12_HEAP_TYPE, 0x56f26a76, 0xbbc1, 0x4ce0, 0xbb, 0x11, 0xe2, 0x23, 0x68, 0xd8, 0x74, 0xed);") +cpp_quote("EXTERN_GUID(MF_SA_D3D12_CLEAR_VALUE, 0x86ba9a39, 0x526, 0x495d, 0x9a, 0xb5, 0x54, 0xec, 0x9f, 0xad, 0x6f, 0xc3);")

1 0

Nikolay Sivov : mfplat: Add mfd3d12 attributes to tracing.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 598efc65c09284f4efb67deaac1daca8ec8385e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=598efc65c09284f4efb67dea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 22 10:48:36 2021 +0300 mfplat: Add mfd3d12 attributes to tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c36a2069bd8..d7cd0d360d9 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -46,6 +46,12 @@ #include "strsafe.h" #undef INITGUID #include "evr.h" +/* mfd3d12 guids are not included in mfuuid */ +#define INITGUID +#undef EXTERN_GUID +#define EXTERN_GUID DEFINE_GUID +#include "initguid.h" +#include "mfd3d12.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -1572,6 +1578,8 @@ const char *debugstr_attr(const GUID *guid) X(MF_PD_PLAYBACK_ELEMENT_ID), X(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE9), X(MF_MT_ALL_SAMPLES_INDEPENDENT), + X(MF_SA_D3D12_CLEAR_VALUE), + X(MF_MT_D3D12_RESOURCE_FLAG_ALLOW_CROSS_ADAPTER), X(MF_PD_PREFERRED_LANGUAGE), X(MF_PD_PLAYBACK_BOUNDARY_TIME), X(MF_MEDIA_ENGINE_TELEMETRY_APPLICATION_ID), @@ -1596,6 +1604,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MEDIA_ENGINE_STREAM_CONTAINS_ALPHA_CHANNEL), X(MF_MEDIA_ENGINE_MEDIA_PLAYER_MODE), X(MF_MEDIA_ENGINE_EXTENSION), + X(MF_MT_D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS), X(MF_MT_DEFAULT_STRIDE), X(MF_MT_ARBITRARY_FORMAT), X(MF_TRANSFORM_CATEGORY_Attribute), @@ -1629,9 +1638,11 @@ const char *debugstr_attr(const GUID *guid) X(MF_READWRITE_DISABLE_CONVERTERS), X(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE_EDGE), X(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_FLAGS), + X(MF_SA_D3D12_HEAP_FLAGS), X(MF_MT_MINIMUM_DISPLAY_APERTURE), X(MFSampleExtension_Token), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_CATEGORY), + X(MF_D3D12_SYNCHRONIZATION_OBJECT), X(MF_MT_AUDIO_VALID_BITS_PER_SAMPLE), X(MF_TRANSFORM_ASYNC_UNLOCK), X(MF_DISABLE_FRAME_CORRUPTION_INFO), @@ -1644,6 +1655,7 @@ const char *debugstr_attr(const GUID *guid) X(MFSampleExtension_3DVideo_SampleFormat), X(MF_MT_H264_RESOLUTION_SCALING), X(MF_MT_VIDEO_LEVEL), + X(MF_SA_D3D12_HEAP_TYPE), X(MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET), X(MF_MT_SAMPLE_SIZE), X(MF_MT_AAC_PAYLOAD_TYPE), @@ -1665,6 +1677,8 @@ const char *debugstr_attr(const GUID *guid) X(MF_SESSION_QUALITY_MANAGER), X(MF_SESSION_CONTENT_PROTECTION_MANAGER), X(MF_MT_MPEG4_SAMPLE_DESCRIPTION), + X(MF_MT_D3D_RESOURCE_VERSION), + X(MF_MT_D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET), X(MF_MT_MPEG_START_TIME_CODE), X(MFT_REMUX_MARK_I_PICTURE_AS_CLEAN_POINT), X(MFT_REMUX_MARK_I_PICTURE_AS_CLEAN_POINT), @@ -1724,10 +1738,12 @@ const char *debugstr_attr(const GUID *guid) X(MF_EVENT_SOURCE_FAKE_START), X(MF_EVENT_SOURCE_PROJECTSTART), X(MF_EVENT_SOURCE_ACTUAL_START), + X(MF_MT_D3D12_TEXTURE_LAYOUT), X(MF_MEDIA_ENGINE_CONTENT_PROTECTION_MANAGER), X(MF_MT_AUDIO_SAMPLES_PER_BLOCK), X(MFT_ENUM_HARDWARE_URL_Attribute), X(MF_SOURCE_READER_ASYNC_CALLBACK), + X(MF_MT_D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE), X(MF_MT_OUTPUT_BUFFER_NUM), X(MF_SA_D3D11_BINDFLAGS), X(MFT_ENCODER_SUPPORTS_CONFIG_EVENT), @@ -1737,6 +1753,7 @@ const char *debugstr_attr(const GUID *guid) X(MFT_SUPPORT_3DVIDEO), X(MFT_SUPPORT_3DVIDEO), X(MFT_INPUT_TYPES_Attributes), + X(MF_MT_D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS), X(MF_MT_H264_LAYOUT_PER_STREAM), X(MF_EVENT_SCRUBSAMPLE_TIME), X(MF_MT_SPATIAL_AUDIO_MAX_METADATA_ITEMS), @@ -1754,6 +1771,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_SAMPLEGRABBERSINK_IGNORE_CLOCK), X(MF_SA_D3D11_SHARED), X(MF_MT_PAN_SCAN_ENABLED), + X(MF_MT_D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL), X(MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ID), X(MF_MT_DV_VAUX_CTRL_PACK), X(MFSampleExtension_ForwardedDecodeUnitType), @@ -1798,6 +1816,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_PD_AUDIO_ISVARIABLEBITRATE), X(MF_AUDIO_RENDERER_ATTRIBUTE_FLAGS), X(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE), + X(MF_MT_D3D12_CPU_READBACK), X(MF_AUDIO_RENDERER_ATTRIBUTE_SESSION_ID), X(MF_MT_MPEG2_CONTENT_PACKET), X(MFT_PROCESS_LOCAL_Attribute),

1 0

Rémi Bernon : winebus.sys: Initialize last_report length and buffer.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 6d3b3aab25cfd1afc2909a4d65a76088fba02ea8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d3b3aab25cfd1afc2909a4d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 22 11:05:43 2021 +0100 winebus.sys: Initialize last_report length and buffer. Fixes a regression from e9c3c494fd2f388acd046c95ac6b121c0830bb46 where although we use the last report length, it was only initialized after the first corresponding report was received. Calling HidD_GetInputReport before that could cause a buffer overlow and report invalid data. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52068 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index d805f887a6f..111953c3bae 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -444,8 +444,6 @@ static void process_hid_report(DEVICE_OBJECT *device, BYTE *report_buf, DWORD re if (!ext->collection_desc.ReportIDs[0].ReportID) last_report = ext->last_reports[0]; else last_report = ext->last_reports[report_buf[0]]; - - last_report->length = report_len; memcpy(last_report->buffer, report_buf, report_len); if ((irp = pop_pending_read(ext))) @@ -861,7 +859,13 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) { if (!(size = reports[i].InputLength)) continue; size = offsetof( struct hid_report, buffer[size] ); - if (!(ext->last_reports[reports[i].ReportID] = RtlAllocateHeap(GetProcessHeap(), 0, size))) status = STATUS_NO_MEMORY; + if (!(report = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, size))) status = STATUS_NO_MEMORY; + else + { + report->length = reports[i].InputLength; + report->buffer[0] = reports[i].ReportID; + ext->last_reports[reports[i].ReportID] = report; + } } if (!status) ext->state = DEVICE_STATE_STARTED; }

1 0

Rémi Bernon : dinput8/tests: Use WaitForSingleObject instead of GetOverlappedResultEx.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 1560f6df5f10c67bffef519cfbd9e7392baaec01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1560f6df5f10c67bffef519c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 22 11:05:44 2021 +0100 dinput8/tests: Use WaitForSingleObject instead of GetOverlappedResultEx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52075 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index cbb202530ac..f1342c5714d 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -745,16 +745,18 @@ static inline void check_hidp_value_caps_( int line, HIDP_VALUE_CAPS *caps, cons static BOOL sync_ioctl( HANDLE file, DWORD code, void *in_buf, DWORD in_len, void *out_buf, DWORD *ret_len, DWORD timeout ) { + DWORD res, out_len = ret_len ? *ret_len : 0; OVERLAPPED ovl = {0}; - DWORD out_len = ret_len ? *ret_len : 0; BOOL ret; ovl.hEvent = CreateEventW( NULL, TRUE, FALSE, NULL ); ret = DeviceIoControl( file, code, in_buf, in_len, out_buf, out_len, &out_len, &ovl ); if (!ret && GetLastError() == ERROR_IO_PENDING) { - ret = GetOverlappedResultEx( file, &ovl, &out_len, timeout, TRUE ); - ok( ret, "GetOverlappedResultEx returned %u\n", GetLastError() ); + res = WaitForSingleObject( ovl.hEvent, timeout ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); + ret = GetOverlappedResult( file, &ovl, &out_len, FALSE ); + ok( ret, "GetOverlappedResult returned %u\n", GetLastError() ); } CloseHandle( ovl.hEvent );

1 0

Rémi Bernon : dinput8/tests: Add some partial effect update tests.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: c188a87020a91c50bad679f15785f9bdec8e750b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c188a87020a91c50bad679f1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 22 11:05:45 2021 +0100 dinput8/tests: Add some partial effect update tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52061 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/driver_hid.c | 13 ++-- dlls/dinput8/tests/driver_hid.h | 1 + dlls/dinput8/tests/hid.c | 135 +++++++++++++++++++++++++++++++++++++--- 3 files changed, 137 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c188a87020a91c50bad6…

1 0

Rémi Bernon : dinput: Send -1 for infinite durations in HID reports.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: a95f76094e9563230b131cfdea39f906678d8ce4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a95f76094e9563230b131cfd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 22 11:05:46 2021 +0100 dinput: Send -1 for infinite durations in HID reports. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52061 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 3 ++- dlls/dinput8/tests/hid.c | 11 +---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 3d90e721fb6..5ecf54e2281 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2728,7 +2728,8 @@ static void set_parameter_value_us( struct hid_joystick_effect *impl, char *repo LONG exp; if (!caps) return; exp = caps->units_exp; - if (caps->units != 0x1003) WARN( "unknown time unit caps %x\n", caps->units ); + if (value == INFINITE) value = caps->physical_min - 1; + else if (caps->units != 0x1003) WARN( "unknown time unit caps %x\n", caps->units ); else if (exp < -6) while (exp++ < -6) value *= 10; else if (exp > -6) while (exp-- > -6) value /= 10; set_parameter_value( impl, report_buf, caps, value ); diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 884a0100abe..26a5406fa57 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -5650,15 +5650,6 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO .report_id = 3, .report_len = 11, .report_buf = {0x03,0x01,0x02,0x08,0xff,0xff,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,0x55,0xd5}, - .todo = TRUE, - }, - /* update effect */ - { - .code = IOCTL_HID_WRITE_REPORT, - .report_id = 3, - .report_len = 11, - .report_buf = {0x03,0x01,0x02,0x08,0x00,0x00,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,0x55,0xd5}, - .wine_only = TRUE, .todo = TRUE, }, }; struct hid_expect expect_set_envelope[] = @@ -5683,7 +5674,7 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO .code = IOCTL_HID_WRITE_REPORT, .report_id = 3, .report_len = 11, - .report_buf = {0x03,0x01,0x02,0x08,0x00,0x00,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,0x55,0xd5}, + .report_buf = {0x03,0x01,0x02,0x08,0xff,0xff,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,0x55,0xd5}, .wine_only = TRUE, .todo = TRUE, }, };

1 0

Ivo Ivanov : winebus.sys: Support arbitrary effect parameter updates.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 31a668439b95b93424a3c6bc3c2c05f702ce49e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31a668439b95b93424a3c6bc… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Mon Nov 22 11:05:47 2021 +0100 winebus.sys: Support arbitrary effect parameter updates. DInput will only send the output reports that have been modified, we need to support sparse effect updates. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52061 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 1 + dlls/winebus.sys/bus_udev.c | 1 + dlls/winebus.sys/hid.c | 21 ++++++++++++++++++--- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index e3932e31ff5..003f6652f05 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -569,6 +569,7 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT TRACE("iface %p, index %u, params %p.\n", iface, index, params); + if (params->effect_type == PID_USAGE_UNDEFINED) return STATUS_SUCCESS; if ((status = set_effect_type_from_usage(&effect, params->effect_type))) return status; switch (params->effect_type) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 3a7a5db723d..521ae4192b5 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1024,6 +1024,7 @@ static NTSTATUS lnxev_device_physical_effect_update(struct unix_device *iface, B TRACE("iface %p, index %u, params %p.\n", iface, index, params); + if (params->effect_type == PID_USAGE_UNDEFINED) return STATUS_SUCCESS; if ((status = set_effect_type_from_usage(&effect, params->effect_type))) return status; effect.replay.length = params->duration; diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 56f30338481..beb2ebe8ad9 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -1033,7 +1033,11 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC else if (!(control = pid_device_control_usages[report->control_index])) io->Status = STATUS_INVALID_PARAMETER; else + { io->Status = iface->hid_vtbl->physical_device_control(iface, control); + if (control == PID_USAGE_DC_DEVICE_RESET && io->Status == STATUS_SUCCESS) + memset(physical->effect_params, 0, sizeof(physical->effect_params)); + } } else if (packet->reportId == physical->device_gain_report) { @@ -1088,8 +1092,6 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC params->direction[1] = report->direction[1]; io->Status = iface->hid_vtbl->physical_effect_update(iface, report->index, params); - - params->condition_count = 0; } } else if (packet->reportId == physical->set_periodic_report) @@ -1106,6 +1108,8 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC params->periodic.offset = report->offset; params->periodic.phase = report->phase; params->periodic.period = report->period; + + io->Status = iface->hid_vtbl->physical_effect_update(iface, report->index, params); } } else if (packet->reportId == physical->set_envelope_report) @@ -1122,6 +1126,8 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC params->envelope.fade_level = report->fade_level; params->envelope.attack_time = report->attack_time; params->envelope.fade_time = report->fade_time; + + io->Status = iface->hid_vtbl->physical_effect_update(iface, report->index, params); } } else if (packet->reportId == physical->set_condition_report) @@ -1134,10 +1140,11 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC io->Information = sizeof(*report) + 1; if (packet->reportBufferLen < io->Information) io->Status = STATUS_BUFFER_TOO_SMALL; - else if ((index = params->condition_count++) >= ARRAY_SIZE(params->condition)) + else if ((index = report->condition_index) >= ARRAY_SIZE(params->condition)) io->Status = STATUS_INVALID_PARAMETER; else { + if (params->condition_count <= index) params->condition_count = index + 1; condition = params->condition + index; condition->center_point_offset = report->center_point_offset; condition->positive_coefficient = report->positive_coefficient; @@ -1145,6 +1152,8 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC condition->positive_saturation = report->positive_saturation; condition->negative_saturation = report->negative_saturation; condition->dead_band = report->dead_band; + + io->Status = iface->hid_vtbl->physical_effect_update(iface, report->index, params); } } else if (packet->reportId == physical->set_constant_force_report) @@ -1156,7 +1165,11 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC if (packet->reportBufferLen < io->Information) io->Status = STATUS_BUFFER_TOO_SMALL; else + { params->constant_force.magnitude = report->magnitude; + + io->Status = iface->hid_vtbl->physical_effect_update(iface, report->index, params); + } } else if (packet->reportId == physical->set_ramp_force_report) { @@ -1170,6 +1183,8 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC { params->ramp_force.ramp_start = report->ramp_start; params->ramp_force.ramp_end = report->ramp_end; + + io->Status = iface->hid_vtbl->physical_effect_update(iface, report->index, params); } } else

1 0

Ivo Ivanov : dinput: Send only the reports that have been modified.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 0059dc2567ada71242a5aba94b047a51266bd0dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0059dc2567ada71242a5aba9… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Mon Nov 22 11:05:48 2021 +0100 dinput: Send only the reports that have been modified. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52061 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 71 ++++++++++++++++++++++++++++------------------ dlls/dinput8/tests/hid.c | 32 --------------------- 2 files changed, 44 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0059dc2567ada71242a5…

1 0

Ivo Ivanov : dinput: Mark effect parameters as modified when duration is set.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 13aea4844a9a7c301fdc3591e46560ab93008c02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13aea4844a9a7c301fdc3591… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Mon Nov 22 11:05:49 2021 +0100 dinput: Mark effect parameters as modified when duration is set. Even if it doesn't actually change. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52061 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 2 +- dlls/dinput8/tests/hid.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 62856cefa44..99436bd8b05 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2554,7 +2554,7 @@ static HRESULT WINAPI hid_joystick_effect_SetParameters( IDirectInputEffect *ifa if (flags & DIEP_DURATION) { - if (impl->params.dwDuration != params->dwDuration) impl->modified |= DIEP_DURATION; + impl->modified |= DIEP_DURATION; impl->params.dwDuration = params->dwDuration; } if (flags & DIEP_GAIN) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 4159c3edd90..0c63ed835e8 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -6471,6 +6471,15 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO hr = IDirectInputEffect_SetParameters( effect, &expect_desc, 0 ); ok( hr == DI_OK, "SetParameters returned %#x\n", hr ); wait_hid_expect( file, 100 ); /* these updates are sent asynchronously */ + desc = expect_desc; + desc.dwDuration = INFINITE; + desc.dwTriggerButton = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( 0 ) | DIDFT_FFEFFECTTRIGGER, + hr = IDirectInputEffect_SetParameters( effect, &desc, DIEP_NODOWNLOAD|DIEP_DURATION|DIEP_TRIGGERBUTTON ); + ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#x\n", hr ); + set_hid_expect( file, expect_update, sizeof(expect_update) ); + hr = IDirectInputEffect_SetParameters( effect, &expect_desc, 0 ); + ok( hr == DI_OK, "SetParameters returned %#x\n", hr ); + wait_hid_expect( file, 100 ); /* these updates are sent asynchronously */ desc = expect_desc; desc.lpEnvelope = &envelope;

1 0