March 2022 - Wine-Commits - list.winehq.org

Eric Pouech : user32/tests: Enable compilation with long types.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 66ec7ae37a97205114067d493eedad175db8de90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66ec7ae37a97205114067d49… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 12 09:37:18 2022 +0100 user32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 435 ++++++++++++++++++++++---------------------- 1 file changed, 218 insertions(+), 217 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=66ec7ae37a9720511406…

1 0

Eric Pouech : user32/tests: Enable compilation with long types.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 4607d822d9bc626f90b7b841df80e7b68db69d17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4607d822d9bc626f90b7b841… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 12 09:37:26 2022 +0100 user32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/scroll.c | 93 +++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4607d822d9bc626f90b7…

1 0

Eric Pouech : user32/tests: Enable compilation with long types.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 3d39354998d1f4375a03773dab635d4d3f0b1f05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d39354998d1f4375a03773d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 12 09:37:22 2022 +0100 user32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 973 ++++++++++++++++++++++++------------------------ 1 file changed, 487 insertions(+), 486 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3d39354998d1f4375a03…

1 0

Rémi Bernon : winebus.sys: Remove the now unused HID haptics combined waveform report.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: ecc881f731fed583af9af3f626409758c28c86a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecc881f731fed583af9af3f6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 14 10:29:38 2022 +0100 winebus.sys: Remove the now unused HID haptics combined waveform report. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/hid.c | 107 +--------------------------------------- dlls/winebus.sys/unix_private.h | 20 -------- 2 files changed, 2 insertions(+), 125 deletions(-) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 46336716a70..5b18da5d8ed 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -331,12 +331,6 @@ BOOL hid_device_add_axes(struct unix_device *iface, BYTE count, USAGE usage_page } #include "pshpack1.h" -struct hid_haptics_waveform -{ - UINT16 intensity; - BYTE manual_trigger; - BYTE repeat_count; -}; struct hid_haptics_intensity { UINT16 rumble_intensity; @@ -348,68 +342,7 @@ BOOL hid_device_add_haptics(struct unix_device *iface) { struct hid_report_descriptor *desc = &iface->hid_report_descriptor; const BYTE haptics_features_report = ++desc->next_report_id[HidP_Feature]; - const BYTE haptics_waveform_report = ++desc->next_report_id[HidP_Output]; const BYTE haptics_intensity_report = ++desc->next_report_id[HidP_Output]; - const BYTE waveforms_template[] = - { - USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), - USAGE(1, HID_USAGE_HAPTICS_SIMPLE_CONTROLLER), - COLLECTION(1, Logical), - REPORT_ID(1, haptics_features_report), - - USAGE(1, HID_USAGE_HAPTICS_WAVEFORM_LIST), - COLLECTION(1, NamedArray), - USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|HAPTICS_WAVEFORM_RUMBLE_ORDINAL), /* HID_USAGE_HAPTICS_WAVEFORM_RUMBLE */ - USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|HAPTICS_WAVEFORM_BUZZ_ORDINAL), /* HID_USAGE_HAPTICS_WAVEFORM_BUZZ */ - REPORT_COUNT(1, 2), - REPORT_SIZE(1, 16), - FEATURE(1, Data|Var|Abs|Null), - END_COLLECTION, - - USAGE(1, HID_USAGE_HAPTICS_DURATION_LIST), - COLLECTION(1, NamedArray), - USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|HAPTICS_WAVEFORM_RUMBLE_ORDINAL), /* 0 (HID_USAGE_HAPTICS_WAVEFORM_RUMBLE) */ - USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|HAPTICS_WAVEFORM_BUZZ_ORDINAL), /* 0 (HID_USAGE_HAPTICS_WAVEFORM_BUZZ) */ - REPORT_COUNT(1, 2), - REPORT_SIZE(1, 16), - FEATURE(1, Data|Var|Abs|Null), - END_COLLECTION, - - USAGE(1, HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME), - UNIT(2, 0x1001), /* seconds */ - UNIT_EXPONENT(1, -3), /* 10^-3 */ - LOGICAL_MINIMUM(4, 0x00000000), - LOGICAL_MAXIMUM(4, 0x7fffffff), - REPORT_SIZE(1, 32), - REPORT_COUNT(1, 1), - FEATURE(1, Data|Var|Abs), - /* reset global items */ - UNIT(1, 0), /* None */ - UNIT_EXPONENT(1, 0), - - REPORT_ID(1, haptics_waveform_report), - USAGE(1, HID_USAGE_HAPTICS_INTENSITY), - LOGICAL_MINIMUM(4, 0x00000000), - LOGICAL_MAXIMUM(4, 0x0000ffff), - REPORT_SIZE(1, 16), - REPORT_COUNT(1, 1), - OUTPUT(1, Data|Var|Abs), - - USAGE(1, HID_USAGE_HAPTICS_MANUAL_TRIGGER), - LOGICAL_MINIMUM(1, HAPTICS_WAVEFORM_NONE_ORDINAL), - LOGICAL_MAXIMUM(1, HAPTICS_WAVEFORM_LAST_ORDINAL), - REPORT_SIZE(1, 8), - REPORT_COUNT(1, 1), - OUTPUT(1, Data|Var|Abs), - - USAGE(1, HID_USAGE_HAPTICS_REPEAT_COUNT), - LOGICAL_MINIMUM(1, 0), - LOGICAL_MAXIMUM(1, 1), - REPORT_SIZE(1, 8), - REPORT_COUNT(1, 1), - OUTPUT(1, Data|Var|Abs), - END_COLLECTION, - }; const BYTE haptics_template[] = { USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), @@ -419,6 +352,7 @@ BOOL hid_device_add_haptics(struct unix_device *iface) USAGE(1, HID_USAGE_HAPTICS_WAVEFORM_LIST), COLLECTION(1, NamedArray), + /* ordinal 1 and 2 are reserved for implicit waveforms */ USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|3), REPORT_SIZE(1, 16), REPORT_COUNT(1, 1), @@ -427,6 +361,7 @@ BOOL hid_device_add_haptics(struct unix_device *iface) USAGE(1, HID_USAGE_HAPTICS_DURATION_LIST), COLLECTION(1, NamedArray), + /* ordinal 1 and 2 are reserved for implicit waveforms */ USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|3), REPORT_SIZE(1, 16), REPORT_COUNT(1, 1), @@ -456,13 +391,7 @@ BOOL hid_device_add_haptics(struct unix_device *iface) }; iface->hid_haptics.features_report = haptics_features_report; - iface->hid_haptics.waveform_report = haptics_waveform_report; iface->hid_haptics.intensity_report = haptics_intensity_report; - iface->hid_haptics.features.waveform_list[0] = HID_USAGE_HAPTICS_WAVEFORM_RUMBLE; - iface->hid_haptics.features.waveform_list[1] = HID_USAGE_HAPTICS_WAVEFORM_BUZZ; - iface->hid_haptics.features.duration_list[0] = 0; - iface->hid_haptics.features.duration_list[1] = 0; - iface->hid_haptics.features.waveform_cutoff_time_ms = 1000; iface->hid_haptics.features.rumble.waveform = HID_USAGE_HAPTICS_WAVEFORM_RUMBLE; iface->hid_haptics.features.rumble.duration = 0; iface->hid_haptics.features.rumble.cutoff_time_ms = 1000; @@ -470,9 +399,6 @@ BOOL hid_device_add_haptics(struct unix_device *iface) iface->hid_haptics.features.buzz.duration = 0; iface->hid_haptics.features.buzz.cutoff_time_ms = 1000; - if (!hid_report_descriptor_append(desc, waveforms_template, sizeof(waveforms_template))) - return FALSE; - if (!hid_report_descriptor_append(desc, haptics_template, sizeof(haptics_template))) return FALSE; if (!hid_report_descriptor_append(desc, haptics_template, sizeof(haptics_template))) @@ -1153,34 +1079,6 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC io->Status = iface->hid_vtbl->haptics_start(iface, duration_ms, report->rumble_intensity, report->buzz_intensity); } } - else if (packet->reportId == haptics->waveform_report) - { - struct hid_haptics_waveform *report = (struct hid_haptics_waveform *)(packet->reportBuffer + 1); - UINT16 *rumble_intensity = haptics->waveform_intensity + HAPTICS_WAVEFORM_RUMBLE_ORDINAL; - UINT16 *buzz_intensity = haptics->waveform_intensity + HAPTICS_WAVEFORM_BUZZ_ORDINAL; - ULONG duration_ms; - - io->Information = sizeof(*report) + 1; - assert(packet->reportBufferLen == io->Information); - - if (report->manual_trigger == 0 || report->manual_trigger > HAPTICS_WAVEFORM_LAST_ORDINAL) - io->Status = STATUS_INVALID_PARAMETER; - else - { - if (report->manual_trigger == HAPTICS_WAVEFORM_STOP_ORDINAL) - { - memset(haptics->waveform_intensity, 0, sizeof(haptics->waveform_intensity)); - io->Status = iface->hid_vtbl->haptics_stop(iface); - } - else - { - haptics->waveform_intensity[report->manual_trigger] = report->intensity; - duration_ms = haptics->features.waveform_cutoff_time_ms; - if (!report->repeat_count) io->Status = STATUS_SUCCESS; - else io->Status = iface->hid_vtbl->haptics_start(iface, duration_ms, *rumble_intensity, *buzz_intensity); - } - } - } else if (packet->reportId == physical->device_control_report) { struct pid_device_control *report = (struct pid_device_control *)(packet->reportBuffer + 1); @@ -1387,7 +1285,6 @@ static void hid_device_set_feature_report(struct unix_device *iface, HID_XFER_PA io->Information = sizeof(*features) + 1; assert(packet->reportBufferLen == io->Information); - haptics->features.waveform_cutoff_time_ms = features->waveform_cutoff_time_ms; haptics->features.rumble.cutoff_time_ms = features->rumble.cutoff_time_ms; haptics->features.buzz.cutoff_time_ms = features->buzz.cutoff_time_ms; io->Status = STATUS_SUCCESS; diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 081e57dc53d..0763d084823 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -123,21 +123,6 @@ struct hid_report_descriptor BYTE next_report_id[3]; }; -/* HID spec uses None / Stop names for the first two implicit waveforms, - * where Windows SDK headers use STOP / NULL for the corresponding HID - * usage constants. We're not actually using the usages anyway are we - * stick to the HID spec here. - */ -enum haptics_waveform_ordinal -{ - HAPTICS_WAVEFORM_NONE_ORDINAL = 1, /* implicit, not included in waveform_list / duration_list */ - HAPTICS_WAVEFORM_STOP_ORDINAL = 2, /* implicit, not included in waveform_list / duration_list */ - HAPTICS_WAVEFORM_RUMBLE_ORDINAL = 3, - HAPTICS_WAVEFORM_BUZZ_ORDINAL = 4, - HAPTICS_WAVEFORM_FIRST_ORDINAL = HAPTICS_WAVEFORM_RUMBLE_ORDINAL, - HAPTICS_WAVEFORM_LAST_ORDINAL = HAPTICS_WAVEFORM_BUZZ_ORDINAL, -}; - #include "pshpack1.h" struct hid_haptics_feature { @@ -148,9 +133,6 @@ struct hid_haptics_feature struct hid_haptics_features { - WORD waveform_list[HAPTICS_WAVEFORM_LAST_ORDINAL - HAPTICS_WAVEFORM_FIRST_ORDINAL + 1]; - WORD duration_list[HAPTICS_WAVEFORM_LAST_ORDINAL - HAPTICS_WAVEFORM_FIRST_ORDINAL + 1]; - UINT waveform_cutoff_time_ms; struct hid_haptics_feature rumble; struct hid_haptics_feature buzz; }; @@ -159,9 +141,7 @@ struct hid_haptics_features struct hid_haptics { struct hid_haptics_features features; - UINT16 waveform_intensity[HAPTICS_WAVEFORM_LAST_ORDINAL + 1]; BYTE features_report; - BYTE waveform_report; BYTE intensity_report; };

1 0

Eric Pouech : user32/tests: Enable compilation with long types.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 8a52d3e93f5690fd0833c228d54a996a784afad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a52d3e93f5690fd0833c228… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 12 09:37:32 2022 +0100 user32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/static.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 0899f4c6187..39cd93c54da 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -16,6 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <stdarg.h> #include <stdio.h> @@ -85,19 +86,19 @@ static void test_updates(int style) exstyle = GetWindowLongW(hStatic, GWL_EXSTYLE); if (style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT || style == SS_SUNKEN) - ok(exstyle == WS_EX_STATICEDGE, "expected WS_EX_STATICEDGE, got %d\n", exstyle); + ok(exstyle == WS_EX_STATICEDGE, "expected WS_EX_STATICEDGE, got %ld\n", exstyle); else - ok(exstyle == 0, "expected 0, got %d\n", exstyle); + ok(exstyle == 0, "expected 0, got %ld\n", exstyle); GetClientRect(hStatic, &rcClient); if (style == SS_ETCHEDVERT) - ok(rcClient.right == 0, "expected zero width, got %d\n", rcClient.right); + ok(rcClient.right == 0, "expected zero width, got %ld\n", rcClient.right); else - ok(rcClient.right > 0, "expected non-zero width, got %d\n", rcClient.right); + ok(rcClient.right > 0, "expected non-zero width, got %ld\n", rcClient.right); if (style == SS_ETCHEDHORZ) - ok(rcClient.bottom == 0, "expected zero height, got %d\n", rcClient.bottom); + ok(rcClient.bottom == 0, "expected zero height, got %ld\n", rcClient.bottom); else - ok(rcClient.bottom > 0, "expected non-zero height, got %d\n", rcClient.bottom); + ok(rcClient.bottom > 0, "expected non-zero height, got %ld\n", rcClient.bottom); g_nReceivedColorStatic = 0; /* during each update parent WndProc will test the WM_CTLCOLORSTATIC message */ @@ -217,10 +218,10 @@ static void test_STM_SETIMAGE(void) for (type = SS_LEFT; type < SS_ETCHEDFRAME; type++) { - winetest_push_context("%u", type); + winetest_push_context("%lu", type); hwnd = build_static(type); - ok(hwnd != 0, "failed to create static type %#x\n", type); + ok(hwnd != 0, "failed to create static type %#lx\n", type); /* set icon */ g_nReceivedColorStatic = 0;

1 0

Eric Pouech : user32/tests: Enable compilation with long types.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 4e40e2cb2e1105bdb9f09609f472fae453e841db URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e40e2cb2e1105bdb9f09609… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 12 09:37:14 2022 +0100 user32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/menu.c | 333 ++++++++++++++++++++++++----------------------- 1 file changed, 167 insertions(+), 166 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4e40e2cb2e1105bdb9f0…

1 0

Giovanni Mascellani : mfplat: Properly align memory allocated by IMF2DBuffer.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 4b36913660bfedb7e0b73c6ab1ea40caf63a9170 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b36913660bfedb7e0b73c6a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Mar 14 17:47:17 2022 +0300 mfplat: Properly align memory allocated by IMF2DBuffer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 2 +- dlls/mfplat/tests/mfplat.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 1cb84cba944..2ec714c1419 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1385,7 +1385,7 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo max_length = pitch * height; } - if (FAILED(hr = memory_buffer_init(object, max_length, MF_1_BYTE_ALIGNMENT, &memory_1d_2d_buffer_vtbl))) + if (FAILED(hr = memory_buffer_init(object, max_length, row_alignment, &memory_1d_2d_buffer_vtbl))) { free(object); return hr; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index d9c25edaa72..83877041694 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6005,6 +6005,28 @@ static void test_MFCreate2DMediaBuffer(void) IMFMediaBuffer_Release(buffer); } + + /* Alignment tests */ + for (i = 0; i < ARRAY_SIZE(_2d_buffer_tests); ++i) + { + const struct _2d_buffer_test *ptr = &_2d_buffer_tests[i]; + + hr = pMFCreate2DMediaBuffer(ptr->width, ptr->height, ptr->fourcc, FALSE, &buffer); + ok(hr == S_OK, "Failed to create a buffer, hr %#lx.\n", hr); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&_2dbuffer); + ok(hr == S_OK, "Failed to get interface, hr %#lx.\n", hr); + + hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); + ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr); + ok(((uintptr_t)data & MF_64_BYTE_ALIGNMENT) == 0, "Misaligned data at %p.\n", data); + + hr = IMF2DBuffer_Unlock2D(_2dbuffer); + ok(hr == S_OK, "Failed to unlock buffer, hr %#lx.\n", hr); + + IMF2DBuffer_Release(_2dbuffer); + IMFMediaBuffer_Release(buffer); + } } static void test_MFCreateMediaBufferFromMediaType(void)

1 0

Rémi Bernon : xinput1_3: Support multiple HID simple haptics controller collections.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: ec059e2b7e046ad1a28162279416d6e6b8018700 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec059e2b7e046ad1a2816227… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 14 10:29:37 2022 +0100 xinput1_3: Support multiple HID simple haptics controller collections. With individual waveform intensity caps, instead of a complicated waveform manual trigger. Also ignore collections with Z/RZ physical usages, later used to describe trigger haptics controllers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/main.c | 224 +++++++++++++++++++++----------------------------- 1 file changed, 93 insertions(+), 131 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ec059e2b7e046ad1a281…

1 0

Rémi Bernon : windows.gaming.input: Fix IIterator_IInspectable trace messages.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 0fb4c0519b3a1cab52d20e3dc825ab26ec4a208d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fb4c0519b3a1cab52d20e3d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 14 10:28:15 2022 +0100 windows.gaming.input: Fix IIterator_IInspectable trace messages. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/vector.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/windows.gaming.input/vector.c b/dlls/windows.gaming.input/vector.c index ae83d16a384..c98c89195d1 100644 --- a/dlls/windows.gaming.input/vector.c +++ b/dlls/windows.gaming.input/vector.c @@ -104,9 +104,7 @@ static HRESULT WINAPI iterator_GetTrustLevel( IIterator_IInspectable *iface, Tru static HRESULT WINAPI iterator_get_Current( IIterator_IInspectable *iface, IInspectable **value ) { struct iterator *impl = impl_from_IIterator_IInspectable( iface ); - - FIXME("\n"); - + TRACE( "iface %p, value %p.\n", iface, value ); return IVectorView_IInspectable_GetAt( impl->view, impl->index, value ); } @@ -114,7 +112,7 @@ static HRESULT WINAPI iterator_get_HasCurrent( IIterator_IInspectable *iface, BO { struct iterator *impl = impl_from_IIterator_IInspectable( iface ); - FIXME("\n"); + TRACE( "iface %p, value %p.\n", iface, value ); *value = impl->index < impl->size; return S_OK; @@ -124,7 +122,7 @@ static HRESULT WINAPI iterator_MoveNext( IIterator_IInspectable *iface, BOOL *va { struct iterator *impl = impl_from_IIterator_IInspectable( iface ); - FIXME("\n"); + TRACE( "iface %p, value %p.\n", iface, value ); if (impl->index < impl->size) impl->index++; return IIterator_IInspectable_get_HasCurrent( iface, value ); @@ -134,9 +132,7 @@ static HRESULT WINAPI iterator_GetMany( IIterator_IInspectable *iface, UINT32 it IInspectable **items, UINT *count ) { struct iterator *impl = impl_from_IIterator_IInspectable( iface ); - - FIXME("\n"); - + TRACE( "iface %p, items_size %u, items %p, count %p.\n", iface, items_size, items, count ); return IVectorView_IInspectable_GetMany( impl->view, impl->index, items_size, items, count ); } @@ -635,7 +631,7 @@ static HRESULT WINAPI iterable_First( IIterable_IInspectable *iface, IIterator_I IVectorView_IInspectable *view; HRESULT hr; - TRACE("\n"); + TRACE( "iface %p, value %p.\n", iface, value ); if (FAILED(hr = IVector_IInspectable_GetView( &impl->IVector_IInspectable_iface, &view ))) return hr;

1 0

Rémi Bernon : winebus.sys: Declare multiple HID simple haptics controller collections.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: e651f56e795e089f2e418ef0cbf21ab216b5f882 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e651f56e795e089f2e418ef0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 14 10:29:36 2022 +0100 winebus.sys: Declare multiple HID simple haptics controller collections. Instead of having the waveforms combined. This better matches what Windows.Gaming.Input and Windows.Devices.Haptics are exposing, with one SimpleHapticsController for each motor. This will also simplify the declaration of left/right trigger motors. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/hid.c | 89 +++++++++++++++++++++++++++++++++++++++-- dlls/winebus.sys/unix_private.h | 12 ++++++ 2 files changed, 98 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 3e83a05cdf6..46336716a70 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -337,6 +337,11 @@ struct hid_haptics_waveform BYTE manual_trigger; BYTE repeat_count; }; +struct hid_haptics_intensity +{ + UINT16 rumble_intensity; + UINT16 buzz_intensity; +}; #include "poppack.h" BOOL hid_device_add_haptics(struct unix_device *iface) @@ -344,7 +349,8 @@ BOOL hid_device_add_haptics(struct unix_device *iface) struct hid_report_descriptor *desc = &iface->hid_report_descriptor; const BYTE haptics_features_report = ++desc->next_report_id[HidP_Feature]; const BYTE haptics_waveform_report = ++desc->next_report_id[HidP_Output]; - const BYTE haptics_template[] = + const BYTE haptics_intensity_report = ++desc->next_report_id[HidP_Output]; + const BYTE waveforms_template[] = { USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), USAGE(1, HID_USAGE_HAPTICS_SIMPLE_CONTROLLER), @@ -404,16 +410,75 @@ BOOL hid_device_add_haptics(struct unix_device *iface) OUTPUT(1, Data|Var|Abs), END_COLLECTION, }; + const BYTE haptics_template[] = + { + USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), + USAGE(1, HID_USAGE_HAPTICS_SIMPLE_CONTROLLER), + COLLECTION(1, Logical), + REPORT_ID(1, haptics_features_report), + + USAGE(1, HID_USAGE_HAPTICS_WAVEFORM_LIST), + COLLECTION(1, NamedArray), + USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|3), + REPORT_SIZE(1, 16), + REPORT_COUNT(1, 1), + FEATURE(1, Data|Var|Abs|Null), + END_COLLECTION, + + USAGE(1, HID_USAGE_HAPTICS_DURATION_LIST), + COLLECTION(1, NamedArray), + USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|3), + REPORT_SIZE(1, 16), + REPORT_COUNT(1, 1), + FEATURE(1, Data|Var|Abs|Null), + END_COLLECTION, + + USAGE(1, HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME), + UNIT(2, 0x1001), /* seconds */ + UNIT_EXPONENT(1, -3), /* 10^-3 */ + LOGICAL_MINIMUM(4, 0x00000000), + LOGICAL_MAXIMUM(4, 0x7fffffff), + REPORT_SIZE(1, 32), + REPORT_COUNT(1, 1), + FEATURE(1, Data|Var|Abs), + /* reset global items */ + UNIT(1, 0), /* None */ + UNIT_EXPONENT(1, 0), + + REPORT_ID(1, haptics_intensity_report), + USAGE(1, HID_USAGE_HAPTICS_INTENSITY), + LOGICAL_MINIMUM(4, 0x00000000), + LOGICAL_MAXIMUM(4, 0x0000ffff), + REPORT_SIZE(1, 16), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + END_COLLECTION, + }; iface->hid_haptics.features_report = haptics_features_report; iface->hid_haptics.waveform_report = haptics_waveform_report; + iface->hid_haptics.intensity_report = haptics_intensity_report; iface->hid_haptics.features.waveform_list[0] = HID_USAGE_HAPTICS_WAVEFORM_RUMBLE; iface->hid_haptics.features.waveform_list[1] = HID_USAGE_HAPTICS_WAVEFORM_BUZZ; iface->hid_haptics.features.duration_list[0] = 0; iface->hid_haptics.features.duration_list[1] = 0; iface->hid_haptics.features.waveform_cutoff_time_ms = 1000; + iface->hid_haptics.features.rumble.waveform = HID_USAGE_HAPTICS_WAVEFORM_RUMBLE; + iface->hid_haptics.features.rumble.duration = 0; + iface->hid_haptics.features.rumble.cutoff_time_ms = 1000; + iface->hid_haptics.features.buzz.waveform = HID_USAGE_HAPTICS_WAVEFORM_BUZZ; + iface->hid_haptics.features.buzz.duration = 0; + iface->hid_haptics.features.buzz.cutoff_time_ms = 1000; + + if (!hid_report_descriptor_append(desc, waveforms_template, sizeof(waveforms_template))) + return FALSE; - return hid_report_descriptor_append(desc, haptics_template, sizeof(haptics_template)); + if (!hid_report_descriptor_append(desc, haptics_template, sizeof(haptics_template))) + return FALSE; + if (!hid_report_descriptor_append(desc, haptics_template, sizeof(haptics_template))) + return FALSE; + + return TRUE; } #include "pshpack1.h" @@ -1072,7 +1137,23 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC struct hid_physical *physical = &iface->hid_physical; struct hid_haptics *haptics = &iface->hid_haptics; - if (packet->reportId == haptics->waveform_report) + if (packet->reportId == haptics->intensity_report) + { + struct hid_haptics_intensity *report = (struct hid_haptics_intensity *)(packet->reportBuffer + 1); + ULONG duration_ms; + + io->Information = sizeof(*report) + 1; + assert(packet->reportBufferLen == io->Information); + + if (!report->rumble_intensity && !report->buzz_intensity) + io->Status = iface->hid_vtbl->haptics_stop(iface); + else + { + duration_ms = min(haptics->features.rumble.cutoff_time_ms, haptics->features.buzz.cutoff_time_ms); + io->Status = iface->hid_vtbl->haptics_start(iface, duration_ms, report->rumble_intensity, report->buzz_intensity); + } + } + else if (packet->reportId == haptics->waveform_report) { struct hid_haptics_waveform *report = (struct hid_haptics_waveform *)(packet->reportBuffer + 1); UINT16 *rumble_intensity = haptics->waveform_intensity + HAPTICS_WAVEFORM_RUMBLE_ORDINAL; @@ -1307,6 +1388,8 @@ static void hid_device_set_feature_report(struct unix_device *iface, HID_XFER_PA assert(packet->reportBufferLen == io->Information); haptics->features.waveform_cutoff_time_ms = features->waveform_cutoff_time_ms; + haptics->features.rumble.cutoff_time_ms = features->rumble.cutoff_time_ms; + haptics->features.buzz.cutoff_time_ms = features->buzz.cutoff_time_ms; io->Status = STATUS_SUCCESS; } else diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 553631e40fb..081e57dc53d 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -138,12 +138,23 @@ enum haptics_waveform_ordinal HAPTICS_WAVEFORM_LAST_ORDINAL = HAPTICS_WAVEFORM_BUZZ_ORDINAL, }; +#include "pshpack1.h" +struct hid_haptics_feature +{ + WORD waveform; + WORD duration; + UINT cutoff_time_ms; +}; + struct hid_haptics_features { WORD waveform_list[HAPTICS_WAVEFORM_LAST_ORDINAL - HAPTICS_WAVEFORM_FIRST_ORDINAL + 1]; WORD duration_list[HAPTICS_WAVEFORM_LAST_ORDINAL - HAPTICS_WAVEFORM_FIRST_ORDINAL + 1]; UINT waveform_cutoff_time_ms; + struct hid_haptics_feature rumble; + struct hid_haptics_feature buzz; }; +#include "poppack.h" struct hid_haptics { @@ -151,6 +162,7 @@ struct hid_haptics UINT16 waveform_intensity[HAPTICS_WAVEFORM_LAST_ORDINAL + 1]; BYTE features_report; BYTE waveform_report; + BYTE intensity_report; }; /* must match the order and number of usages in the

1 0