June 2020 - Wine-devel - list.winehq.org

[PATCH 0/8] Implement cross-process rawinput messages support.
by Rémi Bernon 08 Jun '20

08 Jun '20

Hi! This is another attempt at upstreaming my rawinput patches. I think there's a safer route, by first implementing the wineserver and dinput8 parts, while still relying on the current winex11 code. As long as a Wine window has input focus, the rawinput messages can be dispatch correctly to the listening processes. This series implements the missing rawinput support in wineserver, as well as some flag support that dinput8 implementation will then use. Then it should be possible to implement dinput8 on top of rawinput API, and get rid of the low-level hooks there, which is the correct way to do, and which should improve performance. The tricky part is about listening to xinput2 rawevent globally, which will solve the spurious mouse movements, but it will require first to sort out or workaround some focus issues, so that events are only dispatched when a Wine window has input focus. It can probably still live in staging until an good solution is found. Cheers, Rémi Bernon (8): user32/tests: Add basic rawinput message tests. user32/tests: Add inter-thread rawinput message tests. user32/tests: Add inter-process rawinput message tests. server: Implement rawinput cross-process message dispatch. server: Split cursor position update to update_desktop_cursor_pos. server: Split cursor state update to update_desktop_mouse_state. server: Implement RegisterRawInputDevices RIDEV_NOLEGACY flag. server: Implement RegisterRawInputDevices RIDEV_INPUTSINK flag. dlls/user32/rawinput.c | 9 +- dlls/user32/tests/input.c | 325 +++++++++++++++++++++++++++++++++++++- server/queue.c | 200 +++++++++++++++++------ 3 files changed, 485 insertions(+), 49 deletions(-) -- 2.27.0

4 14

[PATCH 1/3] dinput: Stop sending WM_WINE_NOTIFY_ACTIVITY on every input.
by Rémi Bernon 08 Jun '20

08 Jun '20

This message triggers screensaver notification in the user drivers, but it is not useful to send it on every input message, and it even hurts performance when high polling mouse is used. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33643 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46976 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Notes: This only partially solves the mentionned bugs. Performance can be improved even more by using rawinput API instead of low-level hooks, but it requires the wineserver side to be implemented first. Because wiggling the mouse is a bit unpredictable, I've used evemu to create a fake evdev mouse device. And I've then injected events using this python / evemu-play script: python -u - <<EOF | stdbuf -oL evemu-play /dev/input/eventX for i in range(0, 1000*10000): print('E: {:.06f} 0002 0001 +001 # EV_REL / REL_Y' ' +1'.format(i / 1000.)) print('E: {:.06f} 0000 0000 0000 # ------------ ' 'SYN_REPORT (0) ---------- +1ms'.format(i / 1000.)) EOF Event injection time is not 100% reliable, but it is consistent and the event frequency is approximately 1kHz, similar to a high polling rate mouse. I've used Sekiro as a test case, with graphics settings set to lowest possible. The game runs at ~60fps without mouse input. The fps is not completely stable, and I believe it may be because the game is doing things at the same time. So I've measured the average fps of the first game scene after letting the injection run for a long time. Only positive REL_Y events are used so that the game camera gets down quickly and stops moving, to smooth variation that could be caused by the draw calls. With Wine 5.10, the fps drop to about ~40fps while input is injected, and PATCH #1 makes it go up to ~50fps. The other two patches have smaller effect and not easily measurable, but I believe they are still helpful -- perf indicates a lot of cache misses around the list iterations -- and they are also preparing ground for the rawinput patches. dlls/dinput/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 8c5aa318837..51ae349f34e 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -931,13 +931,19 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L void queue_event(LPDIRECTINPUTDEVICE8A iface, int inst_id, DWORD data, DWORD time, DWORD seq) { + static ULONGLONG notify_ms = 0; IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); int next_pos, ofs = id_to_offset(&This->data_format, inst_id); + ULONGLONG time_ms = GetTickCount64(); /* Event is being set regardless of the queue state */ if (This->hEvent) SetEvent(This->hEvent); - PostMessageW(GetDesktopWindow(), WM_WINE_NOTIFY_ACTIVITY, 0, 0); + if (time_ms - notify_ms > 1000) + { + PostMessageW(GetDesktopWindow(), WM_WINE_NOTIFY_ACTIVITY, 0, 0); + notify_ms = time_ms; + } if (!This->queue_len || This->overflow || ofs < 0) return; -- 2.27.0

1 2

[PATCH 2/3] windowscodecs: Initialize block data in DdsDecoder_Dds_GetFrame().
by Ziqing Hui 08 Jun '20

08 Jun '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 61 ++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 14 deletions(-)

2 2

[PATCH 3/3] windowscodecs: Implement DdsFrameDecode_Dds_CopyBlocks().
by Ziqing Hui 08 Jun '20

08 Jun '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 41 ++++++++++++++++++++++++++-- dlls/windowscodecs/tests/ddsformat.c | 30 ++++++++++---------- 2 files changed, 54 insertions(+), 17 deletions(-)

2 2

[PATCH] kernelbase: Output message ID as hex in debug messages.
by Jeff Smith 08 Jun '20

08 Jun '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- When printed as (signed) decimals in wine logs, many error codes are unrecognizable. dlls/kernelbase/locale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 4f67a0d6d2..4e7bd9937b 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3689,7 +3689,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH FormatMessageA( DWORD flags, const void *source, WCHAR *result, *message = NULL; NTSTATUS status; - TRACE( "(0x%x,%p,%d,0x%x,%p,%d,%p)\n", flags, source, msgid, langid, buffer, size, args ); + TRACE( "(0x%x,%p,%#x,0x%x,%p,%u,%p)\n", flags, source, msgid, langid, buffer, size, args ); if (flags & FORMAT_MESSAGE_ALLOCATE_BUFFER) { @@ -3771,7 +3771,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH FormatMessageW( DWORD flags, const void *source, WCHAR *message = NULL; NTSTATUS status; - TRACE( "(0x%x,%p,%d,0x%x,%p,%d,%p)\n", flags, source, msgid, langid, buffer, size, args ); + TRACE( "(0x%x,%p,%#x,0x%x,%p,%u,%p)\n", flags, source, msgid, langid, buffer, size, args ); if (!buffer) { -- 2.23.0

1 0

[PATCH resend] oleaut32: Retrieve funcdesc from TLB by memberid and invkind.
by mo porot 08 Jun '20

08 Jun '20

This allows searching exact property access functions which share same memberid. Signed-off-by: porotmjp <porotmjp(a)gmail.com> --- dlls/oleaut32/typelib.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)

3 2

[PATCH 1/2] setupapi/tests: Add error tests for SetupDiDestroyDeviceInfoList.
by Jeff Smith 08 Jun '20

08 Jun '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/setupapi/tests/devinst.c | 40 ++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index d4c82dea1f..bbdd375214 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2708,7 +2708,10 @@ static void test_class_installer(void) ok(*coinst_last_message == DIF_REMOVE, "Got unexpected message %#x.\n", *coinst_last_message); *coinst_callback_count = 0; - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xcafef00d); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + todo_wine ok(!ret || !GetLastError(), "Got unexpected error %#x.\n", GetLastError()); ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2740,7 +2743,10 @@ static void test_class_installer(void) ok(GetLastError() == 0xdeadbeef, "Got unexpected error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xcafef00d); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + todo_wine ok(!ret || !GetLastError(), "Got unexpected error %#x.\n", GetLastError()); /* Test returning ERROR_DI_DO_DEFAULT. */ @@ -2766,7 +2772,10 @@ static void test_class_installer(void) ok(ret, "Failed to call class installer, error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xcafef00d); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + todo_wine ok(!ret || !GetLastError(), "Got unexpected error %#x.\n", GetLastError()); /* The default entry point is ClassInstall(). */ @@ -2786,7 +2795,10 @@ static void test_class_installer(void) ok(*coinst_last_message == DIF_ALLOW_INSTALL, "Got unexpected message %#x.\n", *coinst_last_message); *coinst_callback_count = 0; - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xcafef00d); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + todo_wine ok(!ret || !GetLastError(), "Got unexpected error %#x.\n", GetLastError()); ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2854,7 +2866,10 @@ static void test_class_coinstaller(void) ok(*coinst_last_message == DIF_REMOVE, "Got unexpected message %#x.\n", *coinst_last_message); *coinst_callback_count = 0; - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xcafef00d); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + todo_wine ok(!ret || !GetLastError(), "Got unexpected error %#x.\n", GetLastError()); todo_wine ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); todo_wine ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2883,7 +2898,10 @@ static void test_class_coinstaller(void) ok(GetLastError() == 0xdeadbeef, "Got unexpected error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xcafef00d); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + todo_wine ok(!ret || !GetLastError(), "Got unexpected error %#x.\n", GetLastError()); /* The default entry point is CoDeviceInstall(). */ @@ -2906,7 +2924,10 @@ static void test_class_coinstaller(void) ok(*coinst_last_message == DIF_ALLOW_INSTALL, "Got unexpected message %#x.\n", *coinst_last_message); *coinst_callback_count = 0; - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xcafef00d); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + todo_wine ok(!ret || !GetLastError(), "Got unexpected error %#x.\n", GetLastError()); ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2954,7 +2975,10 @@ static void test_call_class_installer(void) ok(ret, "Failed to call class installer, error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xcafef00d); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + todo_wine ok(!ret || !GetLastError(), "Got unexpected error %#x.\n", GetLastError()); load_resource("coinst.dll", "C:\\windows\\system32\\winetest_coinst.dll"); -- 2.23.0

3 9

[PATCH 1/4] quartz: Free type libraries on process detach (Valgrind).
by Zebediah Figura 07 Jun '20

07 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/main.c | 3 +++ dlls/strmbase/dispatch.c | 13 +++++++++++++ include/wine/strmbase.h | 1 + 3 files changed, 17 insertions(+) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 4acb4f1a79..9266987c2e 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -32,7 +32,10 @@ LONG object_locks = 0; BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { if (reason == DLL_PROCESS_DETACH) + { video_window_unregister_class(); + strmbase_release_typelibs(); + } return QUARTZ_DllMain(instance, reason, reserved); } diff --git a/dlls/strmbase/dispatch.c b/dlls/strmbase/dispatch.c index 25573fa1a2..5d3d9aad99 100644 --- a/dlls/strmbase/dispatch.c +++ b/dlls/strmbase/dispatch.c @@ -68,3 +68,16 @@ HRESULT strmbase_get_typeinfo(enum strmbase_type_id tid, ITypeInfo **ret) ITypeInfo_AddRef(*ret = control_typeinfo[tid]); return S_OK; } + +void strmbase_release_typelibs(void) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(control_typeinfo); ++i) + { + if (control_typeinfo[i]) + ITypeInfo_Release(control_typeinfo); + } + if (control_typelib) + ITypeLib_Release(control_typelib); +} diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 6789957e50..02a5469de1 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -252,6 +252,7 @@ enum strmbase_type_id }; HRESULT strmbase_get_typeinfo(enum strmbase_type_id tid, ITypeInfo **typeinfo); +void strmbase_release_typelibs(void); struct strmbase_passthrough { -- 2.27.0

2 4

[PATCH v2 1/4] quartz: Free type libraries on process detach (Valgrind).
by Zebediah Figura 07 Jun '20

07 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Check the 'reserved' parameter; thanks Nikolay. dlls/quartz/main.c | 5 ++++- dlls/strmbase/dispatch.c | 13 +++++++++++++ include/wine/strmbase.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 4acb4f1a79..303cc30a93 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -31,8 +31,11 @@ LONG object_locks = 0; BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { - if (reason == DLL_PROCESS_DETACH) + if (reason == DLL_PROCESS_DETACH && !reserved) + { video_window_unregister_class(); + strmbase_release_typelibs(); + } return QUARTZ_DllMain(instance, reason, reserved); } diff --git a/dlls/strmbase/dispatch.c b/dlls/strmbase/dispatch.c index 25573fa1a2..5d3d9aad99 100644 --- a/dlls/strmbase/dispatch.c +++ b/dlls/strmbase/dispatch.c @@ -68,3 +68,16 @@ HRESULT strmbase_get_typeinfo(enum strmbase_type_id tid, ITypeInfo **ret) ITypeInfo_AddRef(*ret = control_typeinfo[tid]); return S_OK; } + +void strmbase_release_typelibs(void) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(control_typeinfo); ++i) + { + if (control_typeinfo[i]) + ITypeInfo_Release(control_typeinfo); + } + if (control_typelib) + ITypeLib_Release(control_typelib); +} diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 6789957e50..02a5469de1 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -252,6 +252,7 @@ enum strmbase_type_id }; HRESULT strmbase_get_typeinfo(enum strmbase_type_id tid, ITypeInfo **typeinfo); +void strmbase_release_typelibs(void); struct strmbase_passthrough { -- 2.27.0

1 3

[PATCH] quartz/tests: Avoid leaking the media type from IPin::ConnectionMediaType() (Valgrind).
by Zebediah Figura 07 Jun '20

07 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/avidec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index 0e1e92a950..9505bfb591 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -967,6 +967,7 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); ok(compare_media_types(&testsource.source.pin.mt, &req_mt), "Media types didn't match.\n"); + FreeMediaType(&mt); sink_bih = req_format.bmiHeader; @@ -1072,6 +1073,7 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); ok(compare_media_types(&testsink.sink.pin.mt, &req_mt), "Media types didn't match.\n"); + FreeMediaType(&mt); hr = IFilterGraph2_Disconnect(graph, source); ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.27.0

1 0