December 2023 - Wine-commits

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

22 Dec '23

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

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

22 Dec '23

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 : dxdiagn: Check ICreateDevEnum_CreateClassEnumerator result for S_OK.
by Alexandre Julliard 22 Dec '23

22 Dec '23

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

Alexandre Julliard : Release 9.0-rc3.
by Alexandre Julliard 22 Dec '23

22 Dec '23

Module: wine Branch: master Commit: bba97115d1a0991e4a95e8b209cb502dd434042a URL: https://gitlab.winehq.org/wine/wine/-/commit/bba97115d1a0991e4a95e8b209cb50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 22 21:55:14 2023 +0100 Release 9.0-rc3. --- ANNOUNCE | 217 +++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +++--- 3 files changed, 120 insertions(+), 117 deletions(-)

1 0

Tag wine-9.0-rc3 : Alexandre Julliard : Release 9.0-rc3
by Alexandre Julliard 22 Dec '23

22 Dec '23

Module: wine Branch: refs/tags/wine-9.0-rc3 Tag: c9bfb923f5be9d53d9e0011f0ad908629b759527 URL: https://gitlab.winehq.org/wine/wine/-/tags/c9bfb923f5be9d53d9e0011f0ad90862… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 22 21:55:14 2023 +0100 Release 9.0-rc3

1 0

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

22 Dec '23

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

Huw Davies : dnsapi: Update the array ptr in the insufficient buffer case.
by Alexandre Julliard 21 Dec '23

21 Dec '23

Module: wine Branch: master Commit: 55b3e6095b05ded653bb3a79af94d560e89cb222 URL: https://gitlab.winehq.org/wine/wine/-/commit/55b3e6095b05ded653bb3a79af94d5… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 21 13:47:10 2023 +0000 dnsapi: Update the array ptr in the insufficient buffer case. Fixes a regression caused by da65aa5b747d. --- dlls/dnsapi/query.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index d5f46d0a32e..a28d98fc328 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -329,9 +329,9 @@ static DNS_STATUS get_hostname_w( COMPUTER_NAME_FORMAT format, PWSTR buffer, PDW static DNS_STATUS get_dns_server_list( IP4_ARRAY *out, DWORD *len ) { char buf[FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[3])]; - DNS_ADDR_ARRAY *servers = (DNS_ADDR_ARRAY *)buf; DWORD ret, needed, i, num, array_len = sizeof(buf); - struct get_serverlist_params params = { AF_INET, servers, &array_len }; + struct get_serverlist_params params = { AF_INET, (DNS_ADDR_ARRAY *)buf, &array_len }; + for (;;) { ret = RESOLV_CALL( get_serverlist, &params ); @@ -346,9 +346,9 @@ static DNS_STATUS get_dns_server_list( IP4_ARRAY *out, DWORD *len ) } if (!ret) break; - if ((char *)servers != buf) free( servers ); - servers = malloc( array_len ); - if (!servers) + if ((char *)params.addrs != buf) free( params.addrs ); + params.addrs = malloc( array_len ); + if (!params.addrs) { ret = ERROR_NOT_ENOUGH_MEMORY; goto err; @@ -357,12 +357,12 @@ static DNS_STATUS get_dns_server_list( IP4_ARRAY *out, DWORD *len ) out->AddrCount = num; for (i = 0; i < num; i++) - out->AddrArray[i] = ((SOCKADDR_IN *)servers->AddrArray[i].MaxSa)->sin_addr.s_addr; + out->AddrArray[i] = ((SOCKADDR_IN *)params.addrs->AddrArray[i].MaxSa)->sin_addr.s_addr; *len = needed; ret = ERROR_SUCCESS; err: - if ((char *)servers != buf) free( servers ); + if ((char *)params.addrs != buf) free( params.addrs ); return ret; }

1 0

Huw Davies : dnsapi: Free the buffer in the early return paths.
by Alexandre Julliard 21 Dec '23

21 Dec '23

Module: wine Branch: master Commit: 5b0430a178ec16f05967065df7160efec5ee2b3d URL: https://gitlab.winehq.org/wine/wine/-/commit/5b0430a178ec16f05967065df7160e… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 21 14:07:54 2023 +0000 dnsapi: Free the buffer in the early return paths. --- dlls/dnsapi/libresolv.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index d68ca1fd9bf..9034651ac6d 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -192,11 +192,16 @@ static NTSTATUS resolv_get_serverlist( void *args ) if (filter( buf[i].sin.sin_family, params->family )) continue; found++; } - if (!found) return DNS_ERROR_NO_DNS_SERVERS; + if (!found) + { + free( buf ); + return DNS_ERROR_NO_DNS_SERVERS; + } needed = FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[found]); if (!addrs || *params->len < needed) { + free( buf ); *params->len = needed; return !addrs ? ERROR_SUCCESS : ERROR_MORE_DATA; }

1 0

Brendan McGrath : server: Always release internal hardware messages.
by Alexandre Julliard 21 Dec '23

21 Dec '23

Module: wine Branch: master Commit: fa873804fbe58db16f57fae835c3c350bd767984 URL: https://gitlab.winehq.org/wine/wine/-/commit/fa873804fbe58db16f57fae835c3c3… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Wed Dec 20 19:07:42 2023 +1100 server: Always release internal hardware messages. --- server/queue.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/server/queue.c b/server/queue.c index d3ca1172d91..ee8bdf34b7f 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2193,6 +2193,11 @@ static int check_hw_message_filter( user_handle_t win, unsigned int msg_code, } } +/* is this message an internal driver notification message */ +static inline BOOL is_internal_hardware_message( unsigned int message ) +{ + return (message >= WM_WINE_FIRST_DRIVER_MSG && message <= WM_WINE_LAST_DRIVER_MSG); +} /* find a hardware message for the given queue */ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user_handle_t filter_win, @@ -2287,7 +2292,8 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user data->hw_id = msg->unique_id; set_reply_data( msg->data, msg->data_size ); - if (get_hardware_msg_bit( msg->msg ) == QS_RAWINPUT && (flags & PM_REMOVE)) + if ((get_hardware_msg_bit( msg->msg ) == QS_RAWINPUT && (flags & PM_REMOVE)) || + is_internal_hardware_message( msg->msg )) release_hardware_message( current->queue, data->hw_id ); return 1; }

1 0

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

21 Dec '23

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