April 2021 - Wine-Commits - list.winehq.org

Zebediah Figura : ntoskrnl/tests: Separate a helper to print the contents of the driver output file.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: wine Branch: master Commit: 57d438b5d33ce605c1c0c17ce33eab6e4bea57cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=57d438b5d33ce605c1c0c17c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 6 22:42:23 2021 -0500 ntoskrnl/tests: Separate a helper to print the contents of the driver output file. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index d0320fbb2b4..22fddfd3192 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -366,19 +366,37 @@ static BOOL start_driver(HANDLE service, BOOL vista_plus) return TRUE; } +static void cat_okfile(HANDLE okfile) +{ + char buffer[512]; + DWORD size; + + SetFilePointer(okfile, 0, NULL, FILE_BEGIN); + + do + { + ReadFile(okfile, buffer, sizeof(buffer), &size, NULL); + printf("%.*s", size, buffer); + } while (size == sizeof(buffer)); + + SetFilePointer(okfile, 0, NULL, FILE_BEGIN); + SetEndOfFile(okfile); + + winetest_add_failures(InterlockedExchange(&test_data->failures, 0)); +} + static ULONG64 modified_value; static void main_test(void) { struct main_test_input *test_input; - char buffer[512]; HANDLE okfile; DWORD size; BOOL res; /* Create a temporary file that the driver will write ok/trace output to. */ - okfile = CreateFileA("C:\\windows\\winetest_ntoskrnl_okfile", GENERIC_READ, + okfile = CreateFileA("C:\\windows\\winetest_ntoskrnl_okfile", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); ok(okfile != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError()); @@ -392,12 +410,7 @@ static void main_test(void) ok(res, "DeviceIoControl failed: %u\n", GetLastError()); ok(!size, "got size %u\n", size); - do { - ReadFile(okfile, buffer, sizeof(buffer), &size, NULL); - printf("%.*s", size, buffer); - } while (size == sizeof(buffer)); - - winetest_add_failures(InterlockedExchange(&test_data->failures, 0)); + cat_okfile(okfile); heap_free(test_input); CloseHandle(okfile);

1 0

Francois Gouget : testbot/WineRunTask: Increase the leeway to catch TestLauncher timeouts!.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: tools Branch: master Commit: 4e59cecd35cb3632771f854e08f387cb7757167f URL: https://source.winehq.org/git/tools.git/?a=commit;h=4e59cecd35cb3632771f854… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 7 11:03:53 2021 +0200 testbot/WineRunTask: Increase the leeway to catch TestLauncher timeouts!. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index d5f2610..b1578ad 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -444,9 +444,9 @@ if ($Step->Type eq "single") } $Script .= "$TestLauncher -t $Timeout $FileName "; - # Add 1 second to the timeout so the client-side Wait() does not time out - # right before $TestLauncher does. - $Timeout += 1; + # Add some margin so $TA->Wait() does not time out right before + # TestLauncher does. + $Timeout += 5; $Keepalive = 20; my $CmdLineArg = $Task->CmdLineArg; if ($CmdLineArg)

1 0

Francois Gouget : winetest/dissect: Allow an error code on the 'version error' lines.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: tools Branch: master Commit: 6871e5d5ca3a4ef728640b509a0aa4aba5aa92c0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6871e5d5ca3a4ef728640b5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 7 11:06:13 2021 +0200 winetest/dissect: Allow an error code on the 'version error' lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index 4f0e95b..2c89aba 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -427,7 +427,7 @@ while ($line = <IN> || "") my ($dll, $info) = ($1, $2); $dllinfo{$dll} = { version => $info }; if ($info =~ /^dll is (?:missing|native|a stub)/ or - $info =~ /^(?:load error|version error \d+|version not (?:found|present))$/ or + $info =~ /^(?:(?:load|version) error \d+|version not (?:found|present))/ or # For compatibility with old WineTest versions $info =~ /^(?:failed|unknown|version not available)$/) {

1 0

Francois Gouget : testbot/LogUtils: Detect WineTest.exe errors.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: tools Branch: master Commit: abb9aa978f751e9ffeea53d5533e6a369a15fa57 URL: https://source.winehq.org/git/tools.git/?a=commit;h=abb9aa978f751e9ffeea53d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 7 11:04:08 2021 +0200 testbot/LogUtils: Detect WineTest.exe errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index e6e89f5..5d2dc33 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -106,8 +106,10 @@ sub GetLogLineCategory($) $Line =~ /^Task: / or # Typical perl errors _IsPerlError($Line) or - # The testbot.log errors - $Line =~ /:error: /) + # The TestLauncher / testbot.log errors + $Line =~ /:error: / or + # WineTest.exe errors + $Line =~ /^Error: /) { return "error"; }

1 0

Francois Gouget : testbot/PatchUtils: Rerun the tests when the Makefile is modified.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: tools Branch: master Commit: 88455aac32e777c0c3d675e00c842c943699c459 URL: https://source.winehq.org/git/tools.git/?a=commit;h=88455aac32e777c0c3d675e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 7 11:05:50 2021 +0200 testbot/PatchUtils: Rerun the tests when the Makefile is modified. Makefile changes are less likely to cause tests to fail but they are also quite rare so they are not worth special-casing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 3 --- 1 file changed, 3 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index a7d33f6..eb9fa09 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -570,9 +570,6 @@ sub GetPatchImpacts($) my $TestFiles = $Module->{TestFiles}; foreach my $File (sort keys %$TestFiles) { - # Assume makefile modifications may break the build but not the tests - next if ($File eq "Makefile.in"); - my $Base = $File; if ($Base !~ s/(?:\.c|\.spec)$//) {

1 0

Rémi Bernon : winex11.drv: Use X11 root-relative coordinates when possible.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: wine Branch: master Commit: 5a8bc554ef06c4a21d8b49ea8d936299f2cb2f34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a8bc554ef06c4a21d8b49ea… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 6 17:47:41 2021 +0200 winex11.drv: Use X11 root-relative coordinates when possible. Since whole_rect / client_rect are updated asynchronously, there may be a small lag between X11 and Wine regarding the expected window position. Then, as events' x and y fields are reported relative to the X11 window position, this lag can cause inconsistencies when we compute absolute mouse positions. Also, applications that control their own position while being moved cause additional whole_rect / client_rect updates, before X11 knows about it. This can make applications like Winamp go nuts when they are being moved and move all over the place "randomly". Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46309 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 6 +++--- dlls/winex11.drv/mouse.c | 14 ++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 1fd9383e80a..646a9a66eb5 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3195,7 +3195,7 @@ static LRESULT CALLBACK mouse_move_wndproc(HWND hwnd, UINT msg, WPARAM wparam, L POINT pt = {LOWORD(lparam), HIWORD(lparam)}; MapWindowPoints(hwnd, NULL, &pt, 1); - if (pt.x != last_x) todo_wine ok( pt.x == expect_x, "got unexpected WM_MOUSEMOVE x %d, expected %d\n", pt.x, expect_x ); + if (pt.x != last_x) ok( pt.x == expect_x, "got unexpected WM_MOUSEMOVE x %d, expected %d\n", pt.x, expect_x ); expect_x = pt.x == 200 ? 210 : 200; last_x = pt.x; @@ -3449,13 +3449,13 @@ static void test_Input_mouse(void) SetWindowPos(hwnd, NULL, 110, 100, 0, 0, SWP_NOSIZE); empty_message_queue(); GetCursorPos(&pt); - todo_wine ok(pt.x == 210 && pt.y == 200, "GetCursorPos returned %dx%d, expected 210x200\n", pt.x, pt.y); + ok(pt.x == 210 && pt.y == 200, "GetCursorPos returned %dx%d, expected 210x200\n", pt.x, pt.y); SetCursorPos(200, 200); SetWindowPos(hwnd, NULL, 100, 100, 0, 0, SWP_NOSIZE); empty_message_queue(); GetCursorPos(&pt); - todo_wine ok(pt.x == 200 && pt.y == 200, "GetCursorPos returned %dx%d, expected 200x200\n", pt.x, pt.y); + ok(pt.x == 200 && pt.y == 200, "GetCursorPos returned %dx%d, expected 200x200\n", pt.x, pt.y); SetCursorPos(pt_org.x, pt_org.y); empty_message_queue(); diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 25b0b742fe3..94dece652b6 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -592,13 +592,14 @@ static BOOL is_old_motion_event( unsigned long serial ) * * Map the input event coordinates so they're relative to the desktop. */ -static void map_event_coords( HWND hwnd, Window window, INPUT *input ) +static void map_event_coords( HWND hwnd, Window window, Window event_root, int x_root, int y_root, INPUT *input ) { struct x11drv_thread_data *thread_data; struct x11drv_win_data *data; POINT pt = { input->u.mi.dx, input->u.mi.dy }; - TRACE( "hwnd %p, window %lx, input %p\n", hwnd, window, input ); + TRACE( "hwnd %p, window %lx, event_root %lx, x_root %d, y_root %d, input %p\n", hwnd, window, event_root, + x_root, y_root, input ); if (!hwnd) { @@ -611,6 +612,7 @@ static void map_event_coords( HWND hwnd, Window window, INPUT *input ) else if ((data = get_win_data( hwnd ))) { if (window == root_window) pt = root_to_virtual_screen( pt.x, pt.y ); + else if (event_root == root_window) pt = root_to_virtual_screen( x_root, y_root ); else { if (window == data->whole_window) @@ -1709,7 +1711,7 @@ BOOL X11DRV_ButtonPress( HWND hwnd, XEvent *xev ) input.u.mi.dwExtraInfo = 0; update_user_time( event->time ); - map_event_coords( hwnd, event->window, &input ); + map_event_coords( hwnd, event->window, event->root, event->x_root, event->y_root, &input ); send_mouse_input( hwnd, event->window, event->state, &input ); return TRUE; } @@ -1735,7 +1737,7 @@ BOOL X11DRV_ButtonRelease( HWND hwnd, XEvent *xev ) input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); input.u.mi.dwExtraInfo = 0; - map_event_coords( hwnd, event->window, &input ); + map_event_coords( hwnd, event->window, event->root, event->x_root, event->y_root, &input ); send_mouse_input( hwnd, event->window, event->state, &input ); return TRUE; } @@ -1764,7 +1766,7 @@ BOOL X11DRV_MotionNotify( HWND hwnd, XEvent *xev ) TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, event->serial ); return FALSE; } - map_event_coords( hwnd, event->window, &input ); + map_event_coords( hwnd, event->window, event->root, event->x_root, event->y_root, &input ); send_mouse_input( hwnd, event->window, event->state, &input ); return TRUE; } @@ -1796,7 +1798,7 @@ BOOL X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, event->serial ); return FALSE; } - map_event_coords( hwnd, event->window, &input ); + map_event_coords( hwnd, event->window, event->root, event->x_root, event->y_root, &input ); send_mouse_input( hwnd, event->window, event->state, &input ); return TRUE; }

1 0

Hans Leidekker : include: Remove functions declarations from winldap.h that don't exist in the native header.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: wine Branch: master Commit: 62721a7db3bf03b24bde51a50dc75340a4b05ded URL: https://source.winehq.org/git/wine.git/?a=commit;h=62721a7db3bf03b24bde51a5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 6 15:46:52 2021 +0200 include: Remove functions declarations from winldap.h that don't exist in the native header. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 1 + dlls/wldap32/tests/parse.c | 1 + include/Makefile.in | 1 + include/winldap.h | 12 ------------ 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 63f800b5061..89d658c53ff 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -38,6 +38,7 @@ #include "lmcons.h" #include "lmapibuf.h" #include "winldap.h" +#include "winber.h" #include "adsldp_private.h" diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 9fdd4db03ad..8deebcbc6bf 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -24,6 +24,7 @@ #include <windef.h> #include <winbase.h> #include <winldap.h> +#include <winber.h> #include "wine/test.h" diff --git a/include/Makefile.in b/include/Makefile.in index 9133e5c6315..3b60e1be303 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -741,6 +741,7 @@ SOURCES = \ wimgapi.h \ winapifamily.h \ winbase.h \ + winber.h \ wincodec.idl \ wincodecsdk.idl \ wincon.h \ diff --git a/include/winldap.h b/include/winldap.h index 2d41eaa3fa2..2cc29ef693c 100644 --- a/include/winldap.h +++ b/include/winldap.h @@ -632,19 +632,7 @@ ULONG CDECL ldap_value_freeW(PWCHAR*); #define ldap_value_free WINELIB_NAME_AW(ldap_value_free) ULONG CDECL ldap_value_free_len(struct berval**); -BerElement* CDECL ber_alloc_t(INT); -BERVAL* CDECL ber_bvdup(BERVAL*); -void CDECL ber_bvecfree(PBERVAL*); void CDECL ber_bvfree(BERVAL*); -ULONG CDECL ber_first_element(BerElement*,ULONG*,CHAR**); -INT CDECL ber_flatten(BerElement*,PBERVAL*); -void CDECL ber_free(BerElement*,INT); -BerElement* CDECL ber_init(BERVAL*); -ULONG CDECL ber_next_element(BerElement*,ULONG*,CHAR*); -ULONG CDECL ber_peek_tag(BerElement*,ULONG*); -INT WINAPIV ber_printf(BerElement*,PCHAR,...); -ULONG CDECL ber_skip_tag(BerElement*,ULONG*); -INT WINAPIV ber_scanf(BerElement*,PCHAR,...); ULONG CDECL LdapGetLastError(void); ULONG CDECL LdapMapErrorToWin32(ULONG);

1 0

Giovanni Mascellani : mfreadwrite/tests: Fix testing of a source with one stream.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: wine Branch: master Commit: c35adbac8fef689f6da67afcc4468d8f4989da3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c35adbac8fef689f6da67afc… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Mar 31 09:41:20 2021 +0200 mfreadwrite/tests: Fix testing of a source with one stream. Even when a lower stream count was requested, most of the implementation still used ARRAY_SIZE(source->streams) as actual count, so the implemented behaviour was not the desired one. Also, it implied undefined behaviour. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/tests/mfplat.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index c27806f699e..8ea4e5038f6 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -255,6 +255,7 @@ struct test_source IMFMediaEventQueue *event_queue; IMFPresentationDescriptor *pd; struct test_media_stream *streams[TEST_SOURCE_NUM_STREAMS]; + unsigned stream_count; enum source_state state; CRITICAL_SECTION cs; }; @@ -352,7 +353,7 @@ static HRESULT WINAPI test_source_CreatePresentationDescriptor(IMFMediaSource *i } else { - for (i = 0; i < ARRAY_SIZE(source->streams); ++i) + for (i = 0; i < source->stream_count; ++i) { hr = MFCreateMediaType(&media_type); ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); @@ -368,9 +369,9 @@ static HRESULT WINAPI test_source_CreatePresentationDescriptor(IMFMediaSource *i IMFMediaType_Release(media_type); } - hr = MFCreatePresentationDescriptor(ARRAY_SIZE(sds), sds, &source->pd); + hr = MFCreatePresentationDescriptor(source->stream_count, sds, &source->pd); ok(hr == S_OK, "Failed to create presentation descriptor, hr %#x.\n", hr); - for (i = 0; i < ARRAY_SIZE(sds); ++i) + for (i = 0; i < source->stream_count; ++i) IMFStreamDescriptor_Release(sds[i]); *pd = source->pd; @@ -413,7 +414,7 @@ static HRESULT WINAPI test_source_Start(IMFMediaSource *iface, IMFPresentationDe hr = IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, &GUID_NULL, S_OK, NULL); ok(hr == S_OK, "Failed to queue event, hr %#x.\n", hr); - for (i = 0; i < ARRAY_SIZE(source->streams); ++i) + for (i = 0; i < source->stream_count; ++i) { if (!is_stream_selected(pd, i)) continue; @@ -501,7 +502,7 @@ static struct test_media_stream *create_test_stream(DWORD stream_index, IMFMedia return stream; } -static IMFMediaSource *create_test_source(int stream_num) +static IMFMediaSource *create_test_source(int stream_count) { struct test_source *source; int i; @@ -509,9 +510,10 @@ static IMFMediaSource *create_test_source(int stream_num) source = heap_alloc_zero(sizeof(*source)); source->IMFMediaSource_iface.lpVtbl = &test_source_vtbl; source->refcount = 1; + source->stream_count = stream_count; MFCreateEventQueue(&source->event_queue); InitializeCriticalSection(&source->cs); - for (i = 0; i < stream_num; ++i) + for (i = 0; i < source->stream_count; ++i) source->streams[i] = create_test_stream(i, &source->IMFMediaSource_iface); return &source->IMFMediaSource_iface;

1 0

Rémi Bernon : winex11.drv: Don't remap root_window relative coordinates.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: wine Branch: master Commit: 9b6b09053a1f19654d061c386ea929f3af3218da URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b6b09053a1f19654d061c38… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 6 17:47:39 2021 +0200 winex11.drv: Don't remap root_window relative coordinates. We already converted coordinates from root to virtual screen, we shouldn't need to remap them. This is actually no-op because when window == root_window, hwnd is the desktop window. In which case it isn't RTL, and MapWindowPoints is no-op too. It makes things less confusing and it will help later cases when we get root-relative coordinates for other windows. Based on a patch from Gabriel Ivăncescu <gabrielopcode(a)gmail.com>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46309 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 8b39458fd37..e567a03c61c 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -599,15 +599,18 @@ static void map_event_coords( HWND hwnd, Window window, struct x11drv_win_data * TRACE( "hwnd %p, window %lx, data %p, input %p\n", hwnd, window, data, input ); if (window == root_window) pt = root_to_virtual_screen( pt.x, pt.y ); - if (window == data->whole_window) + else { - pt.x += data->whole_rect.left - data->client_rect.left; - pt.y += data->whole_rect.top - data->client_rect.top; - } + if (window == data->whole_window) + { + pt.x += data->whole_rect.left - data->client_rect.left; + pt.y += data->whole_rect.top - data->client_rect.top; + } - if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) - pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x; - MapWindowPoints( hwnd, 0, &pt, 1 ); + if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) + pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x; + MapWindowPoints( hwnd, 0, &pt, 1 ); + } TRACE( "mapped %s to %s\n", wine_dbgstr_point( (POINT *)&input->u.mi.dx ), wine_dbgstr_point( &pt ) );

1 0

Rémi Bernon : winex11.drv: Map coordinates before calling send_mouse_input.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: wine Branch: master Commit: a358a25edad7b7ef8b326270d4a66086deb8c1a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a358a25edad7b7ef8b326270… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 6 17:47:40 2021 +0200 winex11.drv: Map coordinates before calling send_mouse_input. Based on a patch from Gabriel Ivăncescu <gabrielopcode(a)gmail.com>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46309 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index e567a03c61c..25b0b742fe3 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -592,24 +592,38 @@ static BOOL is_old_motion_event( unsigned long serial ) * * Map the input event coordinates so they're relative to the desktop. */ -static void map_event_coords( HWND hwnd, Window window, struct x11drv_win_data *data, INPUT *input ) +static void map_event_coords( HWND hwnd, Window window, INPUT *input ) { + struct x11drv_thread_data *thread_data; + struct x11drv_win_data *data; POINT pt = { input->u.mi.dx, input->u.mi.dy }; - TRACE( "hwnd %p, window %lx, data %p, input %p\n", hwnd, window, data, input ); + TRACE( "hwnd %p, window %lx, input %p\n", hwnd, window, input ); - if (window == root_window) pt = root_to_virtual_screen( pt.x, pt.y ); - else + if (!hwnd) + { + thread_data = x11drv_thread_data(); + if (!thread_data->clip_hwnd) return; + if (thread_data->clip_window != window) return; + pt.x += clip_rect.left; + pt.y += clip_rect.top; + } + else if ((data = get_win_data( hwnd ))) { - if (window == data->whole_window) + if (window == root_window) pt = root_to_virtual_screen( pt.x, pt.y ); + else { - pt.x += data->whole_rect.left - data->client_rect.left; - pt.y += data->whole_rect.top - data->client_rect.top; - } + if (window == data->whole_window) + { + pt.x += data->whole_rect.left - data->client_rect.left; + pt.y += data->whole_rect.top - data->client_rect.top; + } - if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) - pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x; - MapWindowPoints( hwnd, 0, &pt, 1 ); + if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) + pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x; + MapWindowPoints( hwnd, 0, &pt, 1 ); + } + release_win_data( data ); } TRACE( "mapped %s to %s\n", wine_dbgstr_point( (POINT *)&input->u.mi.dx ), wine_dbgstr_point( &pt ) ); @@ -643,15 +657,11 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU sync_window_cursor( window ); last_cursor_change = input->u.mi.time; } - input->u.mi.dx += clip_rect.left; - input->u.mi.dy += clip_rect.top; __wine_send_input( hwnd, input ); return; } if (!(data = get_win_data( hwnd ))) return; - map_event_coords( hwnd, window, data, input ); - if (InterlockedExchangePointer( (void **)&cursor_window, hwnd ) != hwnd || input->u.mi.time - last_cursor_change > 100) { @@ -1699,6 +1709,7 @@ BOOL X11DRV_ButtonPress( HWND hwnd, XEvent *xev ) input.u.mi.dwExtraInfo = 0; update_user_time( event->time ); + map_event_coords( hwnd, event->window, &input ); send_mouse_input( hwnd, event->window, event->state, &input ); return TRUE; } @@ -1724,6 +1735,7 @@ BOOL X11DRV_ButtonRelease( HWND hwnd, XEvent *xev ) input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); input.u.mi.dwExtraInfo = 0; + map_event_coords( hwnd, event->window, &input ); send_mouse_input( hwnd, event->window, event->state, &input ); return TRUE; } @@ -1752,6 +1764,7 @@ BOOL X11DRV_MotionNotify( HWND hwnd, XEvent *xev ) TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, event->serial ); return FALSE; } + map_event_coords( hwnd, event->window, &input ); send_mouse_input( hwnd, event->window, event->state, &input ); return TRUE; } @@ -1783,6 +1796,7 @@ BOOL X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, event->serial ); return FALSE; } + map_event_coords( hwnd, event->window, &input ); send_mouse_input( hwnd, event->window, event->state, &input ); return TRUE; }

1 0