- Wine-Commits - list.winehq.org

Rémi Bernon : dmime/tests: Remove some unnecessary and spuriously failing waits.
by Alexandre Julliard Dec. 22, 2023

Dec. 22, 2023

Module: wine Branch: master Commit: 930776022d33b5d1745d59cd4a4671e1fd347b11 URL: https://gitlab.winehq.org/wine/wine/-/commit/930776022d33b5d1745d59cd4a4671… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 15 12:12:49 2023 +0100 dmime/tests: Remove some unnecessary and spuriously failing waits. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55637 --- dlls/dmime/tests/dmime.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index cf45f30777f..f5ae845cf97 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3296,8 +3296,6 @@ static void test_notification_pmsg(void) hr = IDirectMusicPerformance_FreePMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); - ret = test_tool_wait_message(tool, 50, &msg); - ok(ret == WAIT_TIMEOUT, "got %#lx\n", ret); ret = test_tool_wait_message(tool, 500, &msg); ok(!ret, "got %#lx\n", ret); check_dmus_dirty_pmsg(msg, music_time + length); @@ -3534,9 +3532,6 @@ static void test_notification_pmsg(void) hr = IDirectMusicPerformance_FreePMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); - ret = test_tool_wait_message(tool, 500, &msg); - ok(ret == WAIT_TIMEOUT, "got %#lx\n", ret); - IDirectMusicSegmentState_Release(state); IDirectMusicSegment_Release(segment);

1 0

Rémi Bernon : dmime/tests: Allow small time variation in test_segment_state.
by Alexandre Julliard Dec. 22, 2023

Dec. 22, 2023

Module: wine Branch: master Commit: cbf48daecf8a07d2553914805b4e02f9e18c2930 URL: https://gitlab.winehq.org/wine/wine/-/commit/cbf48daecf8a07d2553914805b4e02… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 15 12:11:51 2023 +0100 dmime/tests: Allow small time variation in test_segment_state. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55637 --- dlls/dmime/tests/dmime.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 8f79511bf96..9ec6248f9d1 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -4503,17 +4503,20 @@ static void test_segment_state(void) tmp_state = (void *)0xdeadbeef; hr = IDirectMusicPerformance_GetSegmentState(performance, &tmp_state, 0); - ok(hr == S_OK, "got %#lx\n", hr); - ok(state == tmp_state, "got %p\n", state); - IDirectMusicSegmentState_Release(tmp_state); + ok(hr == S_OK || broken(hr == DMUS_E_NOT_FOUND) /* sometimes on Windows */, "got %#lx\n", hr); + if (hr == S_OK) + { + ok(state == tmp_state, "got %p\n", tmp_state); + IDirectMusicSegmentState_Release(tmp_state); + } tmp_state = (void *)0xdeadbeef; hr = IDirectMusicPerformance_GetSegmentState(performance, &tmp_state, 69); ok(hr == S_OK, "got %#lx\n", hr); - ok(state == tmp_state, "got %p\n", state); + ok(state == tmp_state, "got %p\n", tmp_state); IDirectMusicSegmentState_Release(tmp_state); - hr = IDirectMusicPerformance_GetSegmentState(performance, &tmp_state, 70); + hr = IDirectMusicPerformance_GetSegmentState(performance, &tmp_state, 71); todo_wine ok(hr == DMUS_E_NOT_FOUND, "got %#lx\n", hr);

1 0

Rémi Bernon : dmime/tests: Check reference time and allow 0.5 tick difference.
by Alexandre Julliard Dec. 22, 2023

Dec. 22, 2023

Module: wine Branch: master Commit: 6447b11b17d3481945d40e079a345cbe18fd1053 URL: https://gitlab.winehq.org/wine/wine/-/commit/6447b11b17d3481945d40e079a345c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 15 12:10:10 2023 +0100 dmime/tests: Check reference time and allow 0.5 tick difference. Renaming check_music_time to check_reference_time, as it's truly reference time values that are passed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55637 --- dlls/dmime/tests/dmime.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index b4b6d848fdc..5fff5ea02de 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -62,7 +62,7 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO static double scale_music_time(MUSIC_TIME time, double tempo) { - return (600000000.0 * time) / (tempo * 768.0); + return (600000000.0 * time) / (tempo * DMUS_PPQ); } #define check_dmus_note_pmsg(a, b, c, d, e, f, g) check_dmus_note_pmsg_(__LINE__, a, b, c, d, e, f, g) @@ -2812,10 +2812,11 @@ static void test_performance_graph(void) IDirectMusicTool_Release(tool); } -#define check_music_time(a, b) check_music_time_(__LINE__, a, b) -static void check_music_time_(int line, MUSIC_TIME time, MUSIC_TIME expect) +#define check_reference_time(a, b) check_reference_time_(__LINE__, a, b) +static void check_reference_time_(int line, REFERENCE_TIME time, double expect) { - ok_(__FILE__, line)(abs(time - expect) <= 1, "got %ld, expected %ld\n", time, expect); + ok_(__FILE__, line)(llabs(time - (REFERENCE_TIME)expect) <= scale_music_time(1, 120) / 2.0, + "got %I64u, expected %f\n", time, expect); } static void test_performance_time(void) @@ -2867,15 +2868,15 @@ static void test_performance_time(void) time = 0xdeadbeef; hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 1, &time); ok(hr == S_OK, "got %#lx\n", hr); - check_music_time(time - init_time, scale_music_time(1, 120)); + check_reference_time(time - init_time, scale_music_time(1, 120)); time = 0xdeadbeef; hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 1000, &time); ok(hr == S_OK, "got %#lx\n", hr); - check_music_time(time - init_time, scale_music_time(1000, 120)); + check_reference_time(time - init_time, scale_music_time(1000, 120)); time = 0xdeadbeef; hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 2000, &time); ok(hr == S_OK, "got %#lx\n", hr); - check_music_time(time - init_time, scale_music_time(2000, 120)); + check_reference_time(time - init_time, scale_music_time(2000, 120)); music_time = 0xdeadbeef; hr = IDirectMusicPerformance_ReferenceToMusicTime(performance, init_time, &music_time); @@ -4250,23 +4251,23 @@ static void test_tempo_track_play(void) time = 0xdeadbeef; hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 1, &time); ok(hr == S_OK, "got %#lx\n", hr); - check_music_time(time - init_time, scale_music_time(1, 120)); + check_reference_time(time - init_time, scale_music_time(1, 120)); time = 0xdeadbeef; hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 100, &time); ok(hr == S_OK, "got %#lx\n", hr); - check_music_time(time - init_time, scale_music_time(100, 120)); + check_reference_time(time - init_time, scale_music_time(100, 120)); time = 0xdeadbeef; hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 150, &time); ok(hr == S_OK, "got %#lx\n", hr); - check_music_time(time - init_time, scale_music_time(100, 120) + scale_music_time(50, 80)); + check_reference_time(time - init_time, scale_music_time(100, 120) + scale_music_time(50, 80)); time = 0xdeadbeef; hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 200, &time); ok(hr == S_OK, "got %#lx\n", hr); - check_music_time(time - init_time, scale_music_time(100, 120) + scale_music_time(100, 80)); + check_reference_time(time - init_time, scale_music_time(100, 120) + scale_music_time(100, 80)); time = 0xdeadbeef; hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 400, &time); ok(hr == S_OK, "got %#lx\n", hr); - check_music_time(time - init_time, scale_music_time(100, 120) + scale_music_time(200, 80) + scale_music_time(100, 20)); + check_reference_time(time - init_time, scale_music_time(100, 120) + scale_music_time(200, 80) + scale_music_time(100, 20)); music_time = 0xdeadbeef; hr = IDirectMusicPerformance_ReferenceToMusicTime(performance, init_time, &music_time);

1 0

Rémi Bernon : dmime/tests: Add optional notification sequence on segment stop.
by Alexandre Julliard Dec. 22, 2023

Dec. 22, 2023

Module: wine Branch: master Commit: 3ad341b603904e0df07afaab06bf9bb84180cff6 URL: https://gitlab.winehq.org/wine/wine/-/commit/3ad341b603904e0df07afaab06bf9b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 15 12:12:07 2023 +0100 dmime/tests: Add optional notification sequence on segment stop. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55637 --- dlls/dmime/tests/dmime.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 9ec6248f9d1..cf45f30777f 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3465,6 +3465,29 @@ static void test_notification_pmsg(void) ret = test_tool_wait_message(tool, 50, (DMUS_PMSG **)&notif); ok(!ret, "got %#lx\n", ret); + if (notif->dwNotificationOption == DMUS_NOTIFICATION_SEGALMOSTEND) + { + check_dmus_notification_pmsg(notif, music_time + length - 1450, DMUS_PMSGF_TOOL_IMMEDIATE, + &GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGALMOSTEND, state); + hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)notif); + ok(hr == S_OK, "got %#lx\n", hr); + + ret = test_tool_wait_message(tool, 50, (DMUS_PMSG **)&notif); + ok(!ret, "got %#lx\n", ret); + check_dmus_notification_pmsg(notif, music_time + length, DMUS_PMSGF_TOOL_IMMEDIATE, + &GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGEND, state); + hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)notif); + ok(hr == S_OK, "got %#lx\n", hr); + + ret = test_tool_wait_message(tool, 50, &msg); + ok(!ret, "got %#lx\n", ret); + check_dmus_dirty_pmsg(msg, music_time + length); + hr = IDirectMusicPerformance_FreePMsg(performance, msg); + ok(hr == S_OK, "got %#lx\n", hr); + + ret = test_tool_wait_message(tool, 50, (DMUS_PMSG **)&notif); + ok(!ret, "got %#lx\n", ret); + } check_dmus_notification_pmsg(notif, music_time, DMUS_PMSGF_TOOL_IMMEDIATE, &GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGABORT, state); hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)notif);

1 0

Paul Gofman : dxdiagn: Check ICreateDevEnum_CreateClassEnumerator result for S_OK.
by Alexandre Julliard Dec. 22, 2023

Dec. 22, 2023

Module: wine Branch: master Commit: d5a5800b5320cfe65dab6c25134258551c154dba URL: https://gitlab.winehq.org/wine/wine/-/commit/d5a5800b5320cfe65dab6c25134258… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Dec 22 09:55:31 2023 -0600 dxdiagn: Check ICreateDevEnum_CreateClassEnumerator result for S_OK. --- dlls/dxdiagn/provider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 696acf7dc51..0a6111fff25 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -1652,7 +1652,7 @@ static HRESULT build_directshowfilters_tree(IDxDiagContainerImpl_Container *node return hr; hr = ICreateDevEnum_CreateClassEnumerator(pCreateDevEnum, &CLSID_ActiveMovieCategories, &pEmCat, 0); - if (FAILED(hr)) + if (hr != S_OK) goto cleanup; while (IEnumMoniker_Next(pEmCat, 1, &pMCat, NULL) == S_OK)

1 0

Eric Pouech : winedbg: Fix main module detection in 'info share' command.
by Alexandre Julliard Dec. 22, 2023

Dec. 22, 2023

Module: wine Branch: master Commit: 8cbf27659b1bf59adece89d2a4bff8847c447030 URL: https://gitlab.winehq.org/wine/wine/-/commit/8cbf27659b1bf59adece89d2a4bff8… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Dec 22 11:08:38 2023 +0100 winedbg: Fix main module detection in 'info share' command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/winedbg/info.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index f97b122ed5b..5e724afc0ed 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -287,7 +287,14 @@ void info_win32_module(DWORD64 base, BOOL multi_machine) if (!im.num_used) return; - machine = im.modules[0].mi.MachineType; + /* main module is the first PE module in enumeration */ + for (i = 0; i < im.num_used; i++) + if (im.modules[i].ext_module_info.type == DMT_PE) + { + machine = im.modules[i].mi.MachineType; + break; + } + if (i == im.num_used) machine = IMAGE_FILE_MACHINE_UNKNOWN; qsort(im.modules, im.num_used, sizeof(im.modules[0]), module_compare); if (multi_machine)

1 0

Paul Gofman : include: Fix boolean return value definition in IIterator<T> methods.
by Alexandre Julliard Dec. 22, 2023

Dec. 22, 2023

Module: wine Branch: master Commit: eaca0f44be41e0543dd2f3909012cdcf041328a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/eaca0f44be41e0543dd2f3909012cd… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Dec 21 17:29:19 2023 -0600 include: Fix boolean return value definition in IIterator<T> methods. --- dlls/dinput/tests/hotplug.c | 18 +++++++++--------- dlls/windows.gaming.input/vector.c | 4 ++-- dlls/windows.media.speech/tests/speech.c | 4 ++-- dlls/windows.media.speech/vector.c | 10 +++++----- include/windows.foundation.collections.idl | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index 7187cf7dc38..5b9455d1819 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -977,11 +977,11 @@ static void test_windows_gaming_input(void) HANDLE hwnd, thread, stop_event; IInspectable *tmp_inspectable; HDEVNOTIFY devnotify; + boolean boolret; HSTRING str; UINT32 size; HRESULT hr; DWORD res; - BOOL ret; MSG msg; if (!load_combase_functions()) return; @@ -1100,18 +1100,18 @@ static void test_windows_gaming_input(void) ok( hr == S_OK, "First returned %#lx\n", hr ); IIterable_RawGameController_Release( iterable ); - hr = IIterator_RawGameController_get_HasCurrent( iterator, &ret ); + hr = IIterator_RawGameController_get_HasCurrent( iterator, &boolret ); ok( hr == S_OK, "First returned %#lx\n", hr ); - ok( ret == TRUE, "got HasCurrent %u\n", ret ); - hr = IIterator_RawGameController_MoveNext( iterator, &ret ); + ok( boolret == TRUE, "got HasCurrent %u\n", boolret ); + hr = IIterator_RawGameController_MoveNext( iterator, &boolret ); ok( hr == S_OK, "First returned %#lx\n", hr ); - ok( ret == FALSE, "got MoveNext %u\n", ret ); - hr = IIterator_RawGameController_get_HasCurrent( iterator, &ret ); + ok( boolret == FALSE, "got MoveNext %u\n", boolret ); + hr = IIterator_RawGameController_get_HasCurrent( iterator, &boolret ); ok( hr == S_OK, "First returned %#lx\n", hr ); - ok( ret == FALSE, "got MoveNext %u\n", ret ); - hr = IIterator_RawGameController_MoveNext( iterator, &ret ); + ok( boolret == FALSE, "got MoveNext %u\n", boolret ); + hr = IIterator_RawGameController_MoveNext( iterator, &boolret ); ok( hr == S_OK, "First returned %#lx\n", hr ); - ok( ret == FALSE, "got MoveNext %u\n", ret ); + ok( boolret == FALSE, "got MoveNext %u\n", boolret ); IIterator_RawGameController_Release( iterator ); IVectorView_RawGameController_Release( controller_view ); diff --git a/dlls/windows.gaming.input/vector.c b/dlls/windows.gaming.input/vector.c index 8958b07c0f2..954d7df3552 100644 --- a/dlls/windows.gaming.input/vector.c +++ b/dlls/windows.gaming.input/vector.c @@ -108,7 +108,7 @@ static HRESULT WINAPI iterator_get_Current( IIterator_IInspectable *iface, IInsp return IVectorView_IInspectable_GetAt( impl->view, impl->index, value ); } -static HRESULT WINAPI iterator_get_HasCurrent( IIterator_IInspectable *iface, BOOL *value ) +static HRESULT WINAPI iterator_get_HasCurrent( IIterator_IInspectable *iface, boolean *value ) { struct iterator *impl = impl_from_IIterator_IInspectable( iface ); @@ -118,7 +118,7 @@ static HRESULT WINAPI iterator_get_HasCurrent( IIterator_IInspectable *iface, BO return S_OK; } -static HRESULT WINAPI iterator_MoveNext( IIterator_IInspectable *iface, BOOL *value ) +static HRESULT WINAPI iterator_MoveNext( IIterator_IInspectable *iface, boolean *value ) { struct iterator *impl = impl_from_IIterator_IInspectable( iface ); diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 49a4915332a..feeeda58be4 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -524,7 +524,7 @@ static HRESULT WINAPI iterator_hstring_get_Current( IIterator_HSTRING *iface, HS return hr; } -static HRESULT WINAPI iterator_hstring_get_HasCurrent( IIterator_HSTRING *iface, BOOL *value ) +static HRESULT WINAPI iterator_hstring_get_HasCurrent( IIterator_HSTRING *iface, boolean *value ) { struct iterator_hstring *impl = impl_from_IIterator_HSTRING(iface); @@ -532,7 +532,7 @@ static HRESULT WINAPI iterator_hstring_get_HasCurrent( IIterator_HSTRING *iface, return S_OK; } -static HRESULT WINAPI iterator_hstring_MoveNext( IIterator_HSTRING *iface, BOOL *value ) +static HRESULT WINAPI iterator_hstring_MoveNext( IIterator_HSTRING *iface, boolean *value ) { struct iterator_hstring *impl = impl_from_IIterator_HSTRING(iface); diff --git a/dlls/windows.media.speech/vector.c b/dlls/windows.media.speech/vector.c index c23fb9dc56e..05bbaf89bef 100644 --- a/dlls/windows.media.speech/vector.c +++ b/dlls/windows.media.speech/vector.c @@ -113,7 +113,7 @@ static HRESULT WINAPI iterator_hstring_get_Current( IIterator_HSTRING *iface, HS return IVectorView_HSTRING_GetAt(impl->view, impl->index, value); } -static HRESULT WINAPI iterator_hstring_get_HasCurrent( IIterator_HSTRING *iface, BOOL *value ) +static HRESULT WINAPI iterator_hstring_get_HasCurrent( IIterator_HSTRING *iface, boolean *value ) { struct iterator_hstring *impl = impl_from_IIterator_HSTRING(iface); @@ -123,7 +123,7 @@ static HRESULT WINAPI iterator_hstring_get_HasCurrent( IIterator_HSTRING *iface, return S_OK; } -static HRESULT WINAPI iterator_hstring_MoveNext( IIterator_HSTRING *iface, BOOL *value ) +static HRESULT WINAPI iterator_hstring_MoveNext( IIterator_HSTRING *iface, boolean *value ) { struct iterator_hstring *impl = impl_from_IIterator_HSTRING(iface); @@ -735,7 +735,7 @@ HRESULT vector_hstring_create_copy( IIterable_HSTRING *iterable, IVector_HSTRING struct vector_hstring *impl; IIterator_HSTRING *iterator; UINT32 capacity = 0; - BOOL available; + boolean available; HRESULT hr; TRACE("iterable %p, out %p.\n", iterable, out); @@ -865,7 +865,7 @@ static HRESULT WINAPI iterator_inspectable_get_Current( IIterator_IInspectable * return IVectorView_IInspectable_GetAt(impl->view, impl->index, value); } -static HRESULT WINAPI iterator_inspectable_get_HasCurrent( IIterator_IInspectable *iface, BOOL *value ) +static HRESULT WINAPI iterator_inspectable_get_HasCurrent( IIterator_IInspectable *iface, boolean *value ) { struct iterator_inspectable *impl = impl_from_IIterator_IInspectable(iface); @@ -875,7 +875,7 @@ static HRESULT WINAPI iterator_inspectable_get_HasCurrent( IIterator_IInspectabl return S_OK; } -static HRESULT WINAPI iterator_inspectable_MoveNext( IIterator_IInspectable *iface, BOOL *value ) +static HRESULT WINAPI iterator_inspectable_MoveNext( IIterator_IInspectable *iface, boolean *value ) { struct iterator_inspectable *impl = impl_from_IIterator_IInspectable(iface); diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index 680d7803cc8..2a8fd55be7d 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -148,8 +148,8 @@ cpp_quote("#endif") interface IIterator<T> : IInspectable { [propget] HRESULT Current([out, retval] T *value); - [propget] HRESULT HasCurrent([out, retval] BOOL *value); - HRESULT MoveNext([out, retval] BOOL *value); + [propget] HRESULT HasCurrent([out, retval] boolean *value); + HRESULT MoveNext([out, retval] boolean *value); HRESULT GetMany([in] UINT32 items_size, [out] T *items, [out, retval] UINT32 *value); }

1 0

Rémi Bernon : server: Change desktop cursor only when inside the thread's windows.
by Alexandre Julliard Dec. 21, 2023

Dec. 21, 2023

Module: wine Branch: master Commit: d1789fbb40d74b747451c9c5d9e738c463a6aa67 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1789fbb40d74b747451c9c5d9e738… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 21 11:47:00 2023 +0100 server: Change desktop cursor only when inside the thread's windows. Getting rid of the desktop cursor handle at the same time. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55961 --- server/queue.c | 13 ++++--------- server/user.h | 1 - 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/server/queue.c b/server/queue.c index d2cf9800258..cd913ae03e5 100644 --- a/server/queue.c +++ b/server/queue.c @@ -478,13 +478,11 @@ static int update_desktop_cursor_pos( struct desktop *desktop, user_handle_t win return updated; } -static void update_desktop_cursor_handle( struct desktop *desktop, user_handle_t handle ) +static void update_desktop_cursor_handle( struct desktop *desktop, struct thread_input *input ) { - int updated = desktop->cursor.handle != handle; - user_handle_t win = desktop->cursor.win; - desktop->cursor.handle = handle; - if (updated) + if (input == get_desktop_cursor_thread_input( desktop )) { + user_handle_t handle = input->cursor_count < 0 ? 0 : input->cursor, win = desktop->cursor.win; /* when clipping send the message to the foreground window as well, as some driver have an artificial overlay window */ if (is_cursor_clipped( desktop )) queue_cursor_message( desktop, 0, WM_WINE_SETCURSOR, win, handle ); queue_cursor_message( desktop, win, WM_WINE_SETCURSOR, win, handle ); @@ -3414,10 +3412,7 @@ DECL_HANDLER(set_cursor) if (req->flags & SET_CURSOR_NOCLIP) set_clip_rectangle( desktop, NULL, SET_CURSOR_NOCLIP, 0 ); if (req->flags & (SET_CURSOR_HANDLE | SET_CURSOR_COUNT)) - { - if (input->cursor_count < 0) update_desktop_cursor_handle( desktop, 0 ); - else update_desktop_cursor_handle( desktop, input->cursor ); - } + update_desktop_cursor_handle( desktop, input ); reply->new_x = desktop->cursor.x; reply->new_y = desktop->cursor.y; diff --git a/server/user.h b/server/user.h index b6f47bcac1c..8fa55e09b0f 100644 --- a/server/user.h +++ b/server/user.h @@ -59,7 +59,6 @@ struct global_cursor rectangle_t clip; /* cursor clip rectangle */ unsigned int last_change; /* time of last position change */ user_handle_t win; /* window that contains the cursor */ - user_handle_t handle; /* last set cursor handle */ }; struct desktop

1 0

Rémi Bernon : server: Introduce a new get_desktop_cursor_thread_input helper.
by Alexandre Julliard Dec. 21, 2023

Dec. 21, 2023

Module: wine Branch: master Commit: 9dc80b13bec0b482150dbd8c9236dbb8b6a31ccd URL: https://gitlab.winehq.org/wine/wine/-/commit/9dc80b13bec0b482150dbd8c9236db… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 21 11:44:39 2023 +0100 server: Introduce a new get_desktop_cursor_thread_input helper. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55961 --- server/queue.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/server/queue.c b/server/queue.c index ee8bdf34b7f..d2cf9800258 100644 --- a/server/queue.c +++ b/server/queue.c @@ -429,26 +429,34 @@ static void queue_cursor_message( struct desktop *desktop, user_handle_t win, un queue_hardware_message( desktop, msg, 1 ); } +static struct thread_input *get_desktop_cursor_thread_input( struct desktop *desktop ) +{ + struct thread_input *input = NULL; + struct thread *thread; + + if ((thread = get_window_thread( desktop->cursor.win ))) + { + if (thread->queue) input = thread->queue->input; + release_object( thread ); + } + + return input; +} + static int update_desktop_cursor_window( struct desktop *desktop, user_handle_t win ) { int updated = win != desktop->cursor.win; - user_handle_t handle = desktop->cursor.handle; + struct thread_input *input; desktop->cursor.win = win; - if (updated) - { - struct thread *thread; - - if ((thread = get_window_thread( win ))) - { - struct thread_input *input = thread->queue->input; - if (input) handle = input->cursor_count < 0 ? 0 : input->cursor; - release_object( thread ); - } + if (updated && (input = get_desktop_cursor_thread_input( desktop ))) + { + user_handle_t handle = input->cursor_count < 0 ? 0 : input->cursor; /* when clipping send the message to the foreground window as well, as some driver have an artificial overlay window */ if (is_cursor_clipped( desktop )) queue_cursor_message( desktop, 0, WM_WINE_SETCURSOR, win, handle ); queue_cursor_message( desktop, win, WM_WINE_SETCURSOR, win, handle ); } + return updated; }

1 0

Eric Pouech : dbghelp/tests: Wait for child window to be up before testing.
by Alexandre Julliard Dec. 21, 2023

Dec. 21, 2023

Module: wine Branch: master Commit: 371827c3ef2f49beea7e1764792eadcfa7c613e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/371827c3ef2f49beea7e1764792ead… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Dec 21 17:09:57 2023 +0100 dbghelp/tests: Wait for child window to be up before testing. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/tests/dbghelp.c | 50 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 13cd173e761..e41dd5f94a0 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -31,6 +31,42 @@ static WCHAR wow64_directory[MAX_PATH]; static BOOL (*WINAPI pIsWow64Process2)(HANDLE, USHORT*, USHORT*); +struct startup_cb +{ + DWORD pid; + HWND wnd; +}; + +static BOOL CALLBACK startup_cb_window(HWND wnd, LPARAM lParam) +{ + struct startup_cb *info = (struct startup_cb*)lParam; + DWORD pid; + + if (GetWindowThreadProcessId(wnd, &pid) && info->pid == pid && IsWindowVisible(wnd)) + { + info->wnd = wnd; + return FALSE; + } + return TRUE; +} + +static BOOL wait_process_window_visible(HANDLE proc, DWORD pid, DWORD timeout) +{ + DWORD max_tc = GetTickCount() + timeout; + BOOL ret = WaitForInputIdle(proc, timeout); + struct startup_cb info = {pid, NULL}; + + if (!ret) + { + do + { + if (EnumWindows(startup_cb_window, (LPARAM)&info)) + Sleep(100); + } while (!info.wnd && GetTickCount() < max_tc); + } + return info.wnd != NULL; +} + #if defined(__i386__) || defined(__x86_64__) static DWORD CALLBACK stack_walk_thread(void *arg) @@ -373,14 +409,18 @@ static BOOL wrapper_EnumerateLoadedModulesW64(HANDLE proc, PENUMLOADED_MODULES_C { BOOL ret; int retry; + int retry_count = !strcmp(winetest_platform, "wine") ? 1 : 5; - for (retry = !strcmp(winetest_platform, "wine") ? 1 : 5; retry >= 0; retry--) + for (retry = retry_count - 1; retry >= 0; retry--) { ret = EnumerateLoadedModulesW64(proc, cb, usr); if (ret || GetLastError() != STATUS_INFO_LENGTH_MISMATCH) break; Sleep(10); } + if (retry + 1 < retry_count) + trace("used wrapper retry: ret=%d retry=%d top=%d\n", ret, retry, retry_count); + return ret; } @@ -789,8 +829,8 @@ static void test_loaded_modules(void) ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess failed: %lu\n", GetLastError()); - ret = WaitForInputIdle(pi.hProcess, 5000); - ok(!ret, "wait timed out\n"); + ret = wait_process_window_visible(pi.hProcess, pi.dwProcessId, 5000); + ok(ret, "wait timed out\n"); ret = SymInitialize(pi.hProcess, NULL, FALSE); ok(ret, "SymInitialize failed: %lu\n", GetLastError()); @@ -869,8 +909,8 @@ static void test_loaded_modules(void) ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); if (ret) { - ret = WaitForInputIdle(pi.hProcess, 5000); - ok(!ret, "wait timed out\n"); + ret = wait_process_window_visible(pi.hProcess, pi.dwProcessId, 5000); + ok(ret, "wait timed out\n"); ret = SymInitialize(pi.hProcess, NULL, FALSE); ok(ret, "SymInitialize failed: %lu\n", GetLastError());

1 0