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

Nikolay Sivov : mfplay: Create per-player session instance.
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: 7e9d294711a7abe96a237d9750d039f42c1fd903 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e9d294711a7abe96a237d97… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 7 11:07:00 2021 +0300 mfplay: Create per-player session instance. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 479aca40890..6fbbc0f4632 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -63,10 +63,12 @@ struct media_player IPropertyStore IPropertyStore_iface; IMFAsyncCallback resolver_callback; IMFAsyncCallback events_callback; + IMFAsyncCallback session_events_callback; LONG refcount; IMFPMediaPlayerCallback *callback; IPropertyStore *propstore; IMFSourceResolver *resolver; + IMFMediaSession *session; MFP_CREATION_OPTIONS options; HWND event_window; HWND output_window; @@ -121,6 +123,11 @@ static struct media_player *impl_from_events_IMFAsyncCallback(IMFAsyncCallback * return CONTAINING_RECORD(iface, struct media_player, events_callback); } +static struct media_player *impl_from_session_events_IMFAsyncCallback(IMFAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct media_player, session_events_callback); +} + static struct media_item *impl_from_IMFPMediaItem(IMFPMediaItem *iface) { return CONTAINING_RECORD(iface, struct media_item, IMFPMediaItem_iface); @@ -618,6 +625,8 @@ static ULONG WINAPI media_player_Release(IMFPMediaPlayer *iface) IPropertyStore_Release(player->propstore); if (player->resolver) IMFSourceResolver_Release(player->resolver); + if (player->session) + IMFMediaSession_Release(player->session); DestroyWindow(player->event_window); heap_free(player); @@ -1170,6 +1179,43 @@ static const IMFAsyncCallbackVtbl media_player_events_callback_vtbl = media_player_events_callback_Invoke, }; +static ULONG WINAPI media_player_session_events_callback_AddRef(IMFAsyncCallback *iface) +{ + struct media_player *player = impl_from_session_events_IMFAsyncCallback(iface); + return IMFPMediaPlayer_AddRef(&player->IMFPMediaPlayer_iface); +} + +static ULONG WINAPI media_player_session_events_callback_Release(IMFAsyncCallback *iface) +{ + struct media_player *player = impl_from_session_events_IMFAsyncCallback(iface); + return IMFPMediaPlayer_Release(&player->IMFPMediaPlayer_iface); +} + +static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallback *iface, + IMFAsyncResult *result) +{ + struct media_player *player = impl_from_session_events_IMFAsyncCallback(iface); + IMFMediaEvent *event; + HRESULT hr; + + if (FAILED(hr = IMFMediaSession_EndGetEvent(player->session, result, &event))) + return S_OK; + + IMFMediaSession_BeginGetEvent(player->session, &player->session_events_callback, NULL); + IMFMediaEvent_Release(event); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl media_player_session_events_callback_vtbl = +{ + media_player_callback_QueryInterface, + media_player_session_events_callback_AddRef, + media_player_session_events_callback_Release, + media_player_callback_GetParameters, + media_player_session_events_callback_Invoke, +}; + HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_CREATION_OPTIONS options, IMFPMediaPlayerCallback *callback, HWND window, IMFPMediaPlayer **player) { @@ -1187,6 +1233,7 @@ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_C object->IPropertyStore_iface.lpVtbl = &media_player_propstore_vtbl; object->resolver_callback.lpVtbl = &media_player_resolver_callback_vtbl; object->events_callback.lpVtbl = &media_player_events_callback_vtbl; + object->session_events_callback.lpVtbl = &media_player_session_events_callback_vtbl; object->refcount = 1; object->callback = callback; if (object->callback) @@ -1197,6 +1244,10 @@ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_C goto failed; if (FAILED(hr = MFCreateSourceResolver(&object->resolver))) goto failed; + if (FAILED(hr = MFCreateMediaSession(NULL, &object->session))) + goto failed; + if (FAILED(hr = IMFMediaSession_BeginGetEvent(object->session, &object->session_events_callback, NULL))) + goto failed; if (!(object->options & MFP_OPTION_FREE_THREADED_CALLBACK)) { object->event_window = CreateWindowW(eventclassW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE,

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

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/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 : 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

Hans Leidekker : include: Remove functions declarations from winldap.h that don't exist in the native header.
by Alexandre Julliard 06 Apr '21

06 Apr '21

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

Hans Leidekker : wldap32/tests: Add ber_printf/scanf tests.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 842987cd12057cfe757a4a1df03945840b4cf8c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=842987cd12057cfe757a4a1d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 6 15:46:53 2021 +0200 wldap32/tests: Add ber_printf/scanf tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/tests/Makefile.in | 1 + dlls/wldap32/tests/ber.c | 72 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/dlls/wldap32/tests/Makefile.in b/dlls/wldap32/tests/Makefile.in index 6df015083e8..05fe5b9af6d 100644 --- a/dlls/wldap32/tests/Makefile.in +++ b/dlls/wldap32/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = wldap32.dll IMPORTS = wldap32 C_SRCS = \ + ber.c \ parse.c diff --git a/dlls/wldap32/tests/ber.c b/dlls/wldap32/tests/ber.c new file mode 100644 index 00000000000..56d54fa6f5a --- /dev/null +++ b/dlls/wldap32/tests/ber.c @@ -0,0 +1,72 @@ +/* + * Copyright 2021 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winldap.h> +#include <winber.h> + +#include "wine/test.h" + +static void test_ber_printf(void) +{ + int ret; + BerElement *ber; + struct berval *bv; + + ber = ber_alloc_t( 0 ); + todo_wine ok( ber == NULL, "ber_alloc_t succeeded\n" ); + + ber = ber_alloc_t( LBER_USE_DER ); + ok( ber != NULL, "ber_alloc_t failed\n" ); + + ret = ber_printf( ber, (char *)"{i}", -1 ); + todo_wine ok( !ret, "got %d\n", ret ); + + ret = ber_flatten( ber, &bv ); + ok( !ret, "got %d\n", ret ); + todo_wine ok( bv->bv_len == 12, "got %d\n", bv->bv_len ); + if (bv->bv_len == 12) ok( !memcmp( bv->bv_val, "0\x84\x00\x00\x00\x06\x02\x04\xff\xff\xff\xff", 12 ), "got %s\n", + wine_dbgstr_an(bv->bv_val, 12) ); + ber_bvfree( bv ); + ber_free( ber, 1 ); +} + +static void test_ber_scanf(void) +{ + int ret; + BerElement *ber; + struct berval bv = { 12, (char *)"0\x84\x00\x00\x00\x06\x02\x04\xff\xff\xff\xff" }; + int i; + + ber = ber_init( &bv ); + ok( ber != NULL, "ber_init failed\n" ); + + i = 0; + ret = ber_scanf( ber, (char *)"{i}", &i ); + ok( !ret, "got %d\n", ret ); + ok( i == -1, "got %d\n", i ); + ber_free( ber, 1 ); +} + +START_TEST(ber) +{ + test_ber_printf(); + test_ber_scanf(); +}

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

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

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