wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Alexandre Julliard : ntdll: Cache the main image section information.
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: 7512c53b89308c16a512cb8f0c1d0fd6ff02b17b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7512c53b89308c16a512cb8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 7 10:46:34 2021 +0200 ntdll: Cache the main image section information. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50937 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 14 ++++++-------- dlls/ntdll/unix/loader.c | 13 +++++++------ dlls/ntdll/unix/server.c | 4 ++-- dlls/ntdll/unix/unix_private.h | 11 +++-------- dlls/ntdll/unix/virtual.c | 8 ++------ 5 files changed, 20 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 5b4a2254659..10089a740c2 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1891,7 +1891,6 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) { static const WCHAR pathW[] = {'P','A','T','H'}; RTL_USER_PROCESS_PARAMETERS *params = NULL; - SECTION_IMAGE_INFORMATION image_info; SIZE_T size, env_pos, env_size; WCHAR *dst, *image, *cmdline, *p, *path = NULL; WCHAR *env = get_initial_environment( &env_pos, &env_size ); @@ -1916,11 +1915,11 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) add_registry_environment( &env, &env_pos, &env_size ); env[env_pos++] = 0; - status = load_main_exe( NULL, main_argv[1], curdir, &image, &module, &image_info ); + status = load_main_exe( NULL, main_argv[1], curdir, &image, &module ); if (!status) { - if (image_info.ImageCharacteristics & IMAGE_FILE_DLL) status = STATUS_INVALID_IMAGE_FORMAT; - if (image_info.Machine != current_machine) status = STATUS_INVALID_IMAGE_FORMAT; + if (main_image_info.ImageCharacteristics & IMAGE_FILE_DLL) status = STATUS_INVALID_IMAGE_FORMAT; + if (main_image_info.Machine != current_machine) status = STATUS_INVALID_IMAGE_FORMAT; } if (status) /* try launching it through start.exe */ @@ -1928,7 +1927,7 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) static const char *args[] = { "start.exe", "/exec" }; free( image ); if (module) NtUnmapViewOfSection( GetCurrentProcess(), module ); - load_start_exe( &image, &module, &image_info ); + load_start_exe( &image, &module ); prepend_argv( args, 2 ); } else rebuild_argv(); @@ -1989,7 +1988,6 @@ void init_startup_info(void) NTSTATUS status; SIZE_T size, info_size, env_size, env_pos; RTL_USER_PROCESS_PARAMETERS *params = NULL; - SECTION_IMAGE_INFORMATION image_info; startup_info_t *info; if (!startup_info_size) @@ -2082,8 +2080,8 @@ void init_startup_info(void) free( info ); NtCurrentTeb()->Peb->ProcessParameters = params; - status = load_main_exe( params->ImagePathName.Buffer, NULL, params->CommandLine.Buffer, - &image, &module, &image_info ); + status = load_main_exe( params->ImagePathName.Buffer, NULL, + params->CommandLine.Buffer, &image, &module ); if (status) { MESSAGE( "wine: failed to start %s\n", debugstr_us(&params->ImagePathName) ); diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 3d613425b68..e362f5eb4db 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -122,6 +122,7 @@ const char *build_dir = NULL; const char *config_dir = NULL; const char **dll_paths = NULL; const char *user_name = NULL; +SECTION_IMAGE_INFORMATION main_image_info = { NULL }; static HMODULE ntdll_module; static const IMAGE_EXPORT_DIRECTORY *ntdll_exports; @@ -1473,7 +1474,7 @@ static NTSTATUS open_main_image( WCHAR *image, void **module, SECTION_IMAGE_INFO * load_main_exe */ NTSTATUS load_main_exe( const WCHAR *dos_name, const char *unix_name, const WCHAR *curdir, - WCHAR **image, void **module, SECTION_IMAGE_INFORMATION *image_info ) + WCHAR **image, void **module ) { UNICODE_STRING nt_name; WCHAR *tmp = NULL; @@ -1487,7 +1488,7 @@ NTSTATUS load_main_exe( const WCHAR *dos_name, const char *unix_name, const WCHA if (unix_name && unix_name[0] == '/' && !stat( unix_name, &st )) { if ((status = unix_to_nt_file_name( unix_name, image ))) goto failed; - status = open_main_image( *image, module, image_info ); + status = open_main_image( *image, module, &main_image_info ); if (status != STATUS_DLL_NOT_FOUND) return status; free( *image ); } @@ -1504,14 +1505,14 @@ NTSTATUS load_main_exe( const WCHAR *dos_name, const char *unix_name, const WCHA if ((status = get_full_path( dos_name, curdir, image ))) goto failed; free( tmp ); - status = open_main_image( *image, module, image_info ); + status = open_main_image( *image, module, &main_image_info ); if (status != STATUS_DLL_NOT_FOUND) return status; /* if path is in system dir, we can load the builtin even if the file itself doesn't exist */ init_unicode_string( &nt_name, *image ); if (is_builtin_path( &nt_name, &machine )) { - status = find_builtin_dll( &nt_name, module, &size, image_info, machine, FALSE ); + status = find_builtin_dll( &nt_name, module, &size, &main_image_info, machine, FALSE ); if (status != STATUS_DLL_NOT_FOUND) return status; } if (!contains_path) return STATUS_DLL_NOT_FOUND; @@ -1529,7 +1530,7 @@ failed: * * Load start.exe as main image. */ -NTSTATUS load_start_exe( WCHAR **image, void **module, SECTION_IMAGE_INFORMATION *image_info ) +NTSTATUS load_start_exe( WCHAR **image, void **module ) { static const WCHAR startW[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','t','e','m','3','2','\\','s','t','a','r','t','.','e','x','e',0}; @@ -1538,7 +1539,7 @@ NTSTATUS load_start_exe( WCHAR **image, void **module, SECTION_IMAGE_INFORMATION SIZE_T size; init_unicode_string( &nt_name, startW ); - status = find_builtin_dll( &nt_name, module, &size, image_info, current_machine, FALSE ); + status = find_builtin_dll( &nt_name, module, &size, &main_image_info, current_machine, FALSE ); if (status) { MESSAGE( "wine: failed to load start.exe: %x\n", status ); diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 65863f54c4b..a108ce00482 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1605,7 +1605,6 @@ size_t server_init_process(void) void server_init_process_done(void) { PEB *peb = NtCurrentTeb()->Peb; - IMAGE_NT_HEADERS *nt = get_exe_nt_header(); void *entry; NTSTATUS status; int suspend, needs_close, unixdir; @@ -1622,7 +1621,8 @@ void server_init_process_done(void) #ifdef __APPLE__ send_server_task_port(); #endif - if (nt->FileHeader.Characteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) virtual_set_large_address_space(); + if (main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) + virtual_set_large_address_space(); /* Install signal handlers; this cannot be done earlier, since we cannot * send exceptions to the debugger before the create process event that diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 257566ce976..d0fa7a54f49 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -120,6 +120,7 @@ extern const char **dll_paths DECLSPEC_HIDDEN; extern USHORT *uctable DECLSPEC_HIDDEN; extern USHORT *lctable DECLSPEC_HIDDEN; extern SIZE_T startup_info_size DECLSPEC_HIDDEN; +extern SECTION_IMAGE_INFORMATION main_image_info DECLSPEC_HIDDEN; extern int main_argc DECLSPEC_HIDDEN; extern char **main_argv DECLSPEC_HIDDEN; extern char **main_envp DECLSPEC_HIDDEN; @@ -147,8 +148,8 @@ extern NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename void **addr_ptr, SIZE_T *size_ptr ) DECLSPEC_HIDDEN; extern BOOL is_builtin_path( const UNICODE_STRING *path, WORD *machine ) DECLSPEC_HIDDEN; extern NTSTATUS load_main_exe( const WCHAR *name, const char *unix_name, const WCHAR *curdir, WCHAR **image, - void **module, SECTION_IMAGE_INFORMATION *image_info ) DECLSPEC_HIDDEN; -extern NTSTATUS load_start_exe( WCHAR **image, void **module, SECTION_IMAGE_INFORMATION *image_info ) DECLSPEC_HIDDEN; + void **module ) DECLSPEC_HIDDEN; +extern NTSTATUS load_start_exe( WCHAR **image, void **module ) DECLSPEC_HIDDEN; extern void start_server( BOOL debug ) DECLSPEC_HIDDEN; extern ULONG_PTR get_image_address(void) DECLSPEC_HIDDEN; @@ -295,12 +296,6 @@ static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) while (len--) *dst++ = (unsigned char)*src++; } -static inline IMAGE_NT_HEADERS *get_exe_nt_header(void) -{ - IMAGE_DOS_HEADER *module = (IMAGE_DOS_HEADER *)NtCurrentTeb()->Peb->ImageBaseAddress; - return (IMAGE_NT_HEADERS *)((char *)module + module->e_lfanew); -} - static inline void *get_signal_stack(void) { return (char *)NtCurrentTeb() + teb_size - teb_offset; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 149555f4fce..659ad2421d4 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3006,12 +3006,8 @@ NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, SIZE_T reserve_size, SI sigset_t sigset; SIZE_T size, extra_size = 0; - if (!reserve_size || !commit_size) - { - IMAGE_NT_HEADERS *nt = get_exe_nt_header(); - if (!reserve_size) reserve_size = nt->OptionalHeader.SizeOfStackReserve; - if (!commit_size) commit_size = nt->OptionalHeader.SizeOfStackCommit; - } + if (!reserve_size) reserve_size = main_image_info.MaximumStackSize; + if (!commit_size) commit_size = main_image_info.CommittedStackSize; size = max( reserve_size, commit_size ); if (size < 1024 * 1024) size = 1024 * 1024; /* Xlib needs a large stack */

1 0

Francois Gouget : winetest/dissect: Allow an error code on the 'version error' lines.
by Alexandre Julliard 07 Apr '21

07 Apr '21

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/PatchUtils: Rerun the tests when the Makefile is modified.
by Alexandre Julliard 07 Apr '21

07 Apr '21

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

Francois Gouget : testbot/LogUtils: Detect WineTest.exe errors.
by Alexandre Julliard 07 Apr '21

07 Apr '21

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/WineRunTask: Increase the leeway to catch TestLauncher timeouts!.
by Alexandre Julliard 07 Apr '21

07 Apr '21

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

Rémi Bernon : winex11.drv: Use X11 root-relative coordinates when possible.
by Alexandre Julliard 06 Apr '21

06 Apr '21

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

Rémi Bernon : winex11.drv: Map coordinates before calling send_mouse_input.
by Alexandre Julliard 06 Apr '21

06 Apr '21

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

Rémi Bernon : winex11.drv: Don't remap root_window relative coordinates.
by Alexandre Julliard 06 Apr '21

06 Apr '21

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 : user32/tests: Add a test for SetCursorPos / SetWindowPos interactions.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 6d6b42024321e576ae58c3c4e36b34b0902f23c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d6b42024321e576ae58c3c4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 6 17:47:38 2021 +0200 user32/tests: Add a test for SetCursorPos / SetWindowPos interactions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 63163b7ed01..1fd9383e80a 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3186,6 +3186,24 @@ static DWORD WINAPI create_static_win(void *arg) return 0; } +static LRESULT CALLBACK mouse_move_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + static DWORD last_x = 200, expect_x = 210; + + if (msg == WM_MOUSEMOVE) + { + 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 ); + + expect_x = pt.x == 200 ? 210 : 200; + last_x = pt.x; + } + + return DefWindowProcW(hwnd, msg, wparam, lparam); +} + static void test_Input_mouse(void) { BOOL got_button_down, got_button_up; @@ -3412,6 +3430,36 @@ static void test_Input_mouse(void) CloseHandle(thread_data.start_event); CloseHandle(thread_data.end_event); DestroyWindow(button_win); + + SetCursorPos(200, 200); + hwnd = CreateWindowA("static", "Title", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowA failed %u\n", GetLastError()); + + /* warm up test case by moving cursor and window a bit first */ + SetCursorPos(210, 200); + SetWindowPos(hwnd, NULL, 110, 100, 0, 0, SWP_NOSIZE); + empty_message_queue(); + SetCursorPos(200, 200); + SetWindowPos(hwnd, NULL, 100, 100, 0, 0, SWP_NOSIZE); + empty_message_queue(); + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)mouse_move_wndproc); + + SetCursorPos(210, 200); + 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); + + 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); + + SetCursorPos(pt_org.x, pt_org.y); + empty_message_queue(); + DestroyWindow(hwnd); }

1 0

Giovanni Mascellani : mfreadwrite/tests: Fix testing of a source with one stream.
by Alexandre Julliard 06 Apr '21

06 Apr '21

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

← Newer
1
...
71
72
73
74
75
76
77
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2021