September 2022 - Wine-commits

Rémi Bernon : winegstreamer: Use IWMSyncReader2_GetStreamSelected in the async reader.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: 54843124d91f27a74235bd7c83a34a4b88339fbf URL: https://gitlab.winehq.org/wine/wine/-/commit/54843124d91f27a74235bd7c83a34a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 22 13:35:01 2022 +0200 winegstreamer: Use IWMSyncReader2_GetStreamSelected in the async reader. --- dlls/winegstreamer/gst_private.h | 2 -- dlls/winegstreamer/wm_asyncreader.c | 2 +- dlls/winegstreamer/wm_reader.c | 33 +++++++++++++-------------------- 3 files changed, 14 insertions(+), 23 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 7fb4f12e65a..53588d0c8ab 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -191,8 +191,6 @@ struct wm_reader *wm_reader_from_sync_reader_inner(IUnknown *inner); HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, IWMReaderCallbackAdvanced *callback_advanced, WORD stream_number, INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags, WORD *ret_stream_number); -HRESULT wm_reader_get_stream_selection(struct wm_reader *reader, - WORD stream_number, WMT_STREAM_SELECTION *selection); HRESULT wm_reader_set_allocate_for_output(struct wm_reader *reader, DWORD output, BOOL allocate); HRESULT wm_reader_set_allocate_for_stream(struct wm_reader *reader, WORD stream_number, BOOL allocate); HRESULT wm_reader_set_streams_selected(struct wm_reader *reader, WORD count, diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 487bed4564c..f84f6aba0bf 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -711,7 +711,7 @@ static HRESULT WINAPI WMReaderAdvanced_GetStreamSelected(IWMReaderAdvanced6 *ifa TRACE("reader %p, stream_number %u, selection %p.\n", reader, stream_number, selection); - return wm_reader_get_stream_selection(reader->wm_reader, stream_number, selection); + return IWMSyncReader2_GetStreamSelected(reader->reader, stream_number, selection); } static HRESULT WINAPI WMReaderAdvanced_SetReceiveSelectionCallbacks(IWMReaderAdvanced6 *iface, BOOL get_callbacks) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 06373f8bdaa..e4ee11239f6 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1740,25 +1740,6 @@ HRESULT wm_reader_set_streams_selected(struct wm_reader *reader, WORD count, return S_OK; } -HRESULT wm_reader_get_stream_selection(struct wm_reader *reader, - WORD stream_number, WMT_STREAM_SELECTION *selection) -{ - struct wm_stream *stream; - - EnterCriticalSection(&reader->cs); - - if (!(stream = wm_reader_get_stream_by_stream_number(reader, stream_number))) - { - LeaveCriticalSection(&reader->cs); - return E_INVALIDARG; - } - - *selection = stream->selection; - - LeaveCriticalSection(&reader->cs); - return S_OK; -} - HRESULT wm_reader_set_allocate_for_output(struct wm_reader *reader, DWORD output, BOOL allocate) { struct wm_stream *stream; @@ -2164,10 +2145,22 @@ static HRESULT WINAPI reader_GetStreamSelected(IWMSyncReader2 *iface, WORD stream_number, WMT_STREAM_SELECTION *selection) { struct wm_reader *reader = impl_from_IWMSyncReader2(iface); + struct wm_stream *stream; TRACE("reader %p, stream_number %u, selection %p.\n", reader, stream_number, selection); - return wm_reader_get_stream_selection(reader, stream_number, selection); + EnterCriticalSection(&reader->cs); + + if (!(stream = wm_reader_get_stream_by_stream_number(reader, stream_number))) + { + LeaveCriticalSection(&reader->cs); + return E_INVALIDARG; + } + + *selection = stream->selection; + + LeaveCriticalSection(&reader->cs); + return S_OK; } static HRESULT WINAPI reader_Open(IWMSyncReader2 *iface, const WCHAR *filename)

1 0

Rémi Bernon : winegstreamer: Use IWMSyncReader2_SetStreamsSelected in the async reader.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: 0f6f105cc0541abdbd6e39fef2749347a52d1b97 URL: https://gitlab.winehq.org/wine/wine/-/commit/0f6f105cc0541abdbd6e39fef27493… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 22 13:35:52 2022 +0200 winegstreamer: Use IWMSyncReader2_SetStreamsSelected in the async reader. --- dlls/winegstreamer/gst_private.h | 2 - dlls/winegstreamer/wm_asyncreader.c | 2 +- dlls/winegstreamer/wm_reader.c | 83 +++++++++++++++++-------------------- 3 files changed, 39 insertions(+), 48 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 53588d0c8ab..178679c38ee 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -193,7 +193,5 @@ HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, IWMReaderCallbackA INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags, WORD *ret_stream_number); HRESULT wm_reader_set_allocate_for_output(struct wm_reader *reader, DWORD output, BOOL allocate); HRESULT wm_reader_set_allocate_for_stream(struct wm_reader *reader, WORD stream_number, BOOL allocate); -HRESULT wm_reader_set_streams_selected(struct wm_reader *reader, WORD count, - const WORD *stream_numbers, const WMT_STREAM_SELECTION *selections); #endif /* __GST_PRIVATE_INCLUDED__ */ diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index f84f6aba0bf..f5509cd865d 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -701,7 +701,7 @@ static HRESULT WINAPI WMReaderAdvanced_SetStreamsSelected(IWMReaderAdvanced6 *if TRACE("reader %p, count %u, stream_numbers %p, selections %p.\n", reader, count, stream_numbers, selections); - return wm_reader_set_streams_selected(reader->wm_reader, count, stream_numbers, selections); + return IWMSyncReader2_SetStreamsSelected(reader->reader, count, stream_numbers, selections); } static HRESULT WINAPI WMReaderAdvanced_GetStreamSelected(IWMReaderAdvanced6 *iface, diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index e4ee11239f6..95d6d8e0180 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1696,50 +1696,6 @@ HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, IWMReaderCallbackA } } -HRESULT wm_reader_set_streams_selected(struct wm_reader *reader, WORD count, - const WORD *stream_numbers, const WMT_STREAM_SELECTION *selections) -{ - struct wm_stream *stream; - WORD i; - - if (!count) - return E_INVALIDARG; - - EnterCriticalSection(&reader->cs); - - for (i = 0; i < count; ++i) - { - if (!(stream = wm_reader_get_stream_by_stream_number(reader, stream_numbers[i]))) - { - LeaveCriticalSection(&reader->cs); - WARN("Invalid stream number %u; returning NS_E_INVALID_REQUEST.\n", stream_numbers[i]); - return NS_E_INVALID_REQUEST; - } - } - - for (i = 0; i < count; ++i) - { - stream = wm_reader_get_stream_by_stream_number(reader, stream_numbers[i]); - stream->selection = selections[i]; - if (selections[i] == WMT_OFF) - { - TRACE("Disabling stream %u.\n", stream_numbers[i]); - wg_parser_stream_disable(stream->wg_stream); - } - else if (selections[i] == WMT_ON) - { - if (selections[i] != WMT_ON) - FIXME("Ignoring selection %#x for stream %u; treating as enabled.\n", - selections[i], stream_numbers[i]); - TRACE("Enabling stream %u.\n", stream_numbers[i]); - wg_parser_stream_enable(stream->wg_stream, &stream->format); - } - } - - LeaveCriticalSection(&reader->cs); - return S_OK; -} - HRESULT wm_reader_set_allocate_for_output(struct wm_reader *reader, DWORD output, BOOL allocate) { struct wm_stream *stream; @@ -2412,11 +2368,48 @@ static HRESULT WINAPI reader_SetStreamsSelected(IWMSyncReader2 *iface, WORD count, WORD *stream_numbers, WMT_STREAM_SELECTION *selections) { struct wm_reader *reader = impl_from_IWMSyncReader2(iface); + struct wm_stream *stream; + WORD i; TRACE("reader %p, count %u, stream_numbers %p, selections %p.\n", reader, count, stream_numbers, selections); - return wm_reader_set_streams_selected(reader, count, stream_numbers, selections); + if (!count) + return E_INVALIDARG; + + EnterCriticalSection(&reader->cs); + + for (i = 0; i < count; ++i) + { + if (!(stream = wm_reader_get_stream_by_stream_number(reader, stream_numbers[i]))) + { + LeaveCriticalSection(&reader->cs); + WARN("Invalid stream number %u; returning NS_E_INVALID_REQUEST.\n", stream_numbers[i]); + return NS_E_INVALID_REQUEST; + } + } + + for (i = 0; i < count; ++i) + { + stream = wm_reader_get_stream_by_stream_number(reader, stream_numbers[i]); + stream->selection = selections[i]; + if (selections[i] == WMT_OFF) + { + TRACE("Disabling stream %u.\n", stream_numbers[i]); + wg_parser_stream_disable(stream->wg_stream); + } + else if (selections[i] == WMT_ON) + { + if (selections[i] != WMT_ON) + FIXME("Ignoring selection %#x for stream %u; treating as enabled.\n", + selections[i], stream_numbers[i]); + TRACE("Enabling stream %u.\n", stream_numbers[i]); + wg_parser_stream_enable(stream->wg_stream, &stream->format); + } + } + + LeaveCriticalSection(&reader->cs); + return S_OK; } static HRESULT WINAPI reader_SetRangeByTimecode(IWMSyncReader2 *iface, WORD stream_num,

1 0

Rémi Bernon : winegstreamer: Use IWMSyncReader2_GetOutputCount in the async reader.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: 2a4ec7dafc7ee38108f6a9f626a7c39e6b6777e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/2a4ec7dafc7ee38108f6a9f626a7c3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 22 13:51:51 2022 +0200 winegstreamer: Use IWMSyncReader2_GetOutputCount in the async reader. --- dlls/winegstreamer/wm_asyncreader.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index f5509cd865d..84742d2f40f 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -496,10 +496,7 @@ static HRESULT WINAPI WMReader_GetOutputCount(IWMReader *iface, DWORD *count) TRACE("reader %p, count %p.\n", reader, count); - EnterCriticalSection(&reader->wm_reader->cs); - *count = reader->wm_reader->stream_count; - LeaveCriticalSection(&reader->wm_reader->cs); - return S_OK; + return IWMSyncReader2_GetOutputCount(reader->reader, count); } static HRESULT WINAPI WMReader_GetOutputProps(IWMReader *iface, DWORD output, IWMOutputMediaProps **props)

1 0

Alexandre Julliard : quartz/tests: Mark some tests as flaky.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: c738be12e1e425f0acd9e65d788d735f7214f892 URL: https://gitlab.winehq.org/wine/wine/-/commit/c738be12e1e425f0acd9e65d788d73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 19:57:55 2022 +0200 quartz/tests: Mark some tests as flaky. --- dlls/quartz/tests/filtergraph.c | 3 +++ dlls/quartz/tests/videorenderer.c | 3 +++ dlls/quartz/tests/vmr7.c | 3 +++ dlls/quartz/tests/vmr9.c | 3 +++ 4 files changed, 12 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 0e9a398ad2c..2c07dc49356 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -430,6 +430,7 @@ static void test_state_change(IFilterGraph2 *graph) hr = IMediaControl_Pause(control); ok(SUCCEEDED(hr), "Got hr %#lx.\n", hr); hr = IMediaControl_GetState(control, 1000, &state); + flaky_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(state == State_Paused, "Got state %ld.\n", state); @@ -519,10 +520,12 @@ static void test_media_event(IFilterGraph2 *graph) } } } + flaky_wine ok(got_eos, "didn't get EOS\n"); hr = IMediaSeeking_GetCurrentPosition(seeking, &current); ok(hr == S_OK, "Got hr %#lx.\n", hr); + flaky_wine ok(current == stop, "expected %s, got %s\n", wine_dbgstr_longlong(stop), wine_dbgstr_longlong(current)); hr = IMediaControl_Stop(control); diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index c76dae15e91..0c5f7f440ef 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1723,6 +1723,7 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw style = GetWindowLongA(hwnd, GWL_STYLE); ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#lx.\n", style); + flaky_wine ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); hr = IVideoWindow_get_WindowStyleEx(window, &style); @@ -2349,6 +2350,7 @@ static void test_video_window(void) filter = create_video_renderer(); flush_events(); + flaky_wine ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); IBaseFilter_FindPin(filter, L"In", &pin); @@ -2385,6 +2387,7 @@ static void test_video_window(void) hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); ok(hr == S_OK, "Got hr %#lx.\n", hr); + flaky_wine ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); test_video_window_caption(window, hwnd); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 88c82bec0d3..0e5aa89265a 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1725,6 +1725,7 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw style = GetWindowLongA(hwnd, GWL_STYLE); ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#lx.\n", style); + flaky_wine ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); hr = IVideoWindow_get_WindowStyleEx(window, &style); @@ -2354,6 +2355,7 @@ static void test_video_window(void) filter = create_vmr7(0); flush_events(); + flaky_wine ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); IBaseFilter_FindPin(filter, L"VMR Input0", &pin); @@ -2407,6 +2409,7 @@ static void test_video_window(void) IMemAllocator_Release(allocator); } + flaky_wine ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); test_video_window_caption(window, hwnd); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 405f7ee89ba..1d3fa207e18 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1949,6 +1949,7 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw style = GetWindowLongA(hwnd, GWL_STYLE); ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#lx.\n", style); + flaky_wine ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); hr = IVideoWindow_get_WindowStyleEx(window, &style); @@ -2580,6 +2581,7 @@ static void test_video_window(void) filter = create_vmr9(VMR9Mode_Windowed); flush_events(); + flaky_wine ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); IBaseFilter_FindPin(filter, L"VMR Input0", &pin); @@ -2632,6 +2634,7 @@ static void test_video_window(void) IMemAllocator_Release(allocator); } + flaky_wine ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); test_video_window_caption(window, hwnd);

1 0

Alexandre Julliard : vkd3d: Import upstream release 1.5.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: c3025582fd5be155ce8231ccce4d69916856dec7 URL: https://gitlab.winehq.org/wine/wine/-/commit/c3025582fd5be155ce8231ccce4d69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 10:57:38 2022 +0200 vkd3d: Import upstream release 1.5. --- libs/vkd3d/AUTHORS | 1 + libs/vkd3d/include/private/vkd3d_version.h | 2 +- libs/vkd3d/include/vkd3d.h | 3 + libs/vkd3d/include/vkd3d_shader.h | 22 + libs/vkd3d/libs/vkd3d-shader/hlsl.c | 643 ++++++++++++---- libs/vkd3d/libs/vkd3d-shader/hlsl.h | 75 +- libs/vkd3d/libs/vkd3d-shader/hlsl.y | 808 ++++++++++++++------- libs/vkd3d/libs/vkd3d-shader/hlsl_codegen.c | 740 +++++++++++++------ libs/vkd3d/libs/vkd3d-shader/hlsl_constant_ops.c | 187 ++++- libs/vkd3d/libs/vkd3d-shader/hlsl_sm1.c | 13 +- libs/vkd3d/libs/vkd3d-shader/hlsl_sm4.c | 130 +++- libs/vkd3d/libs/vkd3d-shader/spirv.c | 20 +- .../vkd3d/libs/vkd3d-shader/vkd3d_shader_private.h | 1 + libs/vkd3d/libs/vkd3d/command.c | 41 +- libs/vkd3d/libs/vkd3d/device.c | 43 +- libs/vkd3d/libs/vkd3d/state.c | 21 +- libs/vkd3d/libs/vkd3d/vkd3d_private.h | 5 +- 17 files changed, 2070 insertions(+), 685 deletions(-)

1 0

Brendan Shanks : ntdll: Set the name of internal thread pool threads.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: fa8e36fafa57e5bc2761669ae68fa6fe9ef89c09 URL: https://gitlab.winehq.org/wine/wine/-/commit/fa8e36fafa57e5bc2761669ae68fa6… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Sep 23 09:57:43 2022 -0700 ntdll: Set the name of internal thread pool threads. --- dlls/ntdll/threadpool.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 827232b2143..421d1ade133 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -396,6 +396,14 @@ static BOOL array_reserve(void **elements, unsigned int *capacity, unsigned int return TRUE; } +static void set_thread_name(const WCHAR *name) +{ + THREAD_NAME_INFORMATION info; + + RtlInitUnicodeString(&info.ThreadName, name); + NtSetInformationThread(GetCurrentThread(), ThreadNameInformation, &info, sizeof(info)); +} + static void CALLBACK process_rtl_work_item( TP_CALLBACK_INSTANCE *instance, void *userdata ) { struct rtl_work_item *item = userdata; @@ -703,6 +711,7 @@ static void WINAPI timer_queue_thread_proc(LPVOID p) struct timer_queue *q = p; ULONG timeout_ms; + set_thread_name(L"wine_threadpool_timer_queue"); timeout_ms = INFINITE; for (;;) { @@ -1052,6 +1061,7 @@ static void CALLBACK timerqueue_thread_proc( void *param ) struct list *ptr; TRACE( "starting timer queue thread\n" ); + set_thread_name(L"wine_threadpool_timerqueue"); RtlEnterCriticalSection( &timerqueue.cs ); for (;;) @@ -1241,6 +1251,7 @@ static void CALLBACK waitqueue_thread_proc( void *param ) NTSTATUS status; TRACE( "starting wait queue thread\n" ); + set_thread_name(L"wine_threadpool_waitqueue"); RtlEnterCriticalSection( &waitqueue.cs ); @@ -1511,6 +1522,7 @@ static void CALLBACK ioqueue_thread_proc( void *param ) NTSTATUS status; TRACE( "starting I/O completion thread\n" ); + set_thread_name(L"wine_threadpool_ioqueue"); RtlEnterCriticalSection( &ioqueue.cs ); @@ -2323,6 +2335,7 @@ static void CALLBACK threadpool_worker_proc( void *param ) struct list *ptr; TRACE( "starting worker thread for pool %p\n", pool ); + set_thread_name(L"wine_threadpool_worker"); RtlEnterCriticalSection( &pool->cs ); for (;;)

1 0

Kevin Puetz : oleaut32/tests: Get_test_recordinfo shouldn't point into a specific VARIANT.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: 27f417eb9382e07617d37029bdca3bbaadf9f10d URL: https://gitlab.winehq.org/wine/wine/-/commit/27f417eb9382e07617d37029bdca3b… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Thu Sep 22 23:50:29 2022 -0500 oleaut32/tests: Get_test_recordinfo shouldn't point into a specific VARIANT. In many cases (in particular when VariantCopy has been used), multiple VARIANT structs which contain the same type of record will share the same instance of IRecordInfo, just adding refcounts. RecordClear should not be aware of where the data it's clearing came from, and certainly should not be modifying someone else's VARIANT::brecVal. This seems to have been intended as a way to make tests more sensitive to use-after-free, by overwriting the source pointer with NULL after clearing the pointed-to record. To preserve that sensitivity (if it was indeed the goal), replace the hardcoded "0xdeadbeef is valid" check with a "validsrc" address that get_test_recordinfo initially agrees to pretend points to a valid record, but will stop accepting after a call to RecordClear. --- dlls/oleaut32/tests/vartest.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index cdbb836b041..342133d6403 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -246,10 +246,10 @@ typedef struct IRecordInfoImpl { IRecordInfo IRecordInfo_iface; LONG ref; + void *validsrc; unsigned int recordclear; unsigned int getsize; unsigned int recordcopy; - struct __tagBRECORD *rec; } IRecordInfoImpl; static inline IRecordInfoImpl *impl_from_IRecordInfo(IRecordInfo *iface) @@ -299,7 +299,8 @@ static HRESULT WINAPI RecordInfo_RecordClear(IRecordInfo *iface, void *data) { IRecordInfoImpl* This = impl_from_IRecordInfo(iface); This->recordclear++; - This->rec->pvRecord = NULL; + if(data == This->validsrc) + This->validsrc = NULL; /* not valid anymore, now that it's been cleared */ return S_OK; } @@ -307,7 +308,7 @@ static HRESULT WINAPI RecordInfo_RecordCopy(IRecordInfo *iface, void *src, void { IRecordInfoImpl* This = impl_from_IRecordInfo(iface); This->recordcopy++; - ok(src == (void*)0xdeadbeef, "wrong src pointer %p\n", src); + ok(This->validsrc && (src == This->validsrc), "wrong src pointer %p\n", src); return S_OK; } @@ -430,6 +431,7 @@ static IRecordInfoImpl *get_test_recordinfo(void) rec->recordclear = 0; rec->getsize = 0; rec->recordcopy = 0; + rec->validsrc = (void *)0xdeadbeef; return rec; } @@ -767,7 +769,6 @@ static test_VariantClearImpl test_myVariantClearImpl = {{&test_VariantClear_vtbl static void test_VariantClear(void) { - struct __tagBRECORD *rec; IRecordInfoImpl *recinfo; HRESULT hres; VARIANTARG v; @@ -892,15 +893,12 @@ static void test_VariantClear(void) /* RECORD */ recinfo = get_test_recordinfo(); V_VT(&v) = VT_RECORD; - rec = &V_UNION(&v, brecVal); - rec->pRecInfo = &recinfo->IRecordInfo_iface; - rec->pvRecord = (void*)0xdeadbeef; + V_RECORDINFO(&v) = &recinfo->IRecordInfo_iface; + V_RECORD(&v) = recinfo->validsrc; recinfo->recordclear = 0; recinfo->ref = 2; - recinfo->rec = rec; hres = VariantClear(&v); ok(hres == S_OK, "ret %08lx\n", hres); - ok(rec->pvRecord == NULL, "got %p\n", rec->pvRecord); ok(recinfo->recordclear == 1, "got %d\n", recinfo->recordclear); ok(recinfo->ref == 1, "got %ld\n", recinfo->ref); IRecordInfo_Release(&recinfo->IRecordInfo_iface); @@ -908,7 +906,6 @@ static void test_VariantClear(void) static void test_VariantCopy(void) { - struct __tagBRECORD *rec; IRecordInfoImpl *recinfo; VARIANTARG vSrc, vDst; VARTYPE vt; @@ -1033,20 +1030,17 @@ static void test_VariantCopy(void) V_VT(&vDst) = VT_EMPTY; V_VT(&vSrc) = VT_RECORD; - rec = &V_UNION(&vSrc, brecVal); - rec->pRecInfo = &recinfo->IRecordInfo_iface; - rec->pvRecord = (void*)0xdeadbeef; + V_RECORDINFO(&vSrc) = &recinfo->IRecordInfo_iface; + V_RECORD(&vSrc) = recinfo->validsrc; recinfo->recordclear = 0; recinfo->recordcopy = 0; recinfo->getsize = 0; - recinfo->rec = rec; hres = VariantCopy(&vDst, &vSrc); ok(hres == S_OK, "ret %08lx\n", hres); - rec = &V_UNION(&vDst, brecVal); - ok(rec->pvRecord != (void*)0xdeadbeef && rec->pvRecord != NULL, "got %p\n", rec->pvRecord); - ok(rec->pRecInfo == &recinfo->IRecordInfo_iface, "got %p\n", rec->pRecInfo); + ok(V_RECORD(&vDst) != recinfo->validsrc && V_RECORD(&vDst) != NULL, "got %p\n", V_RECORD(&vDst)); + ok(V_RECORDINFO(&vDst) == &recinfo->IRecordInfo_iface, "got %p\n", V_RECORDINFO(&vDst)); ok(recinfo->getsize == 1, "got %d\n", recinfo->recordclear); ok(recinfo->recordcopy == 1, "got %d\n", recinfo->recordclear);

1 0

Kevin Puetz : oleaut32: Dereference VT_RECORD|VT_BYREF in place.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: 28e0d8ff3bd0db62e5b15f9b1e3c805b10dd198d URL: https://gitlab.winehq.org/wine/wine/-/commit/28e0d8ff3bd0db62e5b15f9b1e3c80… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Tue Sep 20 16:53:15 2022 -0500 oleaut32: Dereference VT_RECORD|VT_BYREF in place. VariantCopyInd allows pvargDest == pvargSrc in order to dereference in place To avoid confusing the source values and a partially-written destination, wine's implementation makes a shallow copy and uses that as pSrc. However, the call to VARIANT_CopyIRecordInfo did not use this, leading to it copying from the zeroed-out memory it just allocated. --- dlls/oleaut32/tests/vartest.c | 60 +++++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/variant.c | 2 +- 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 342133d6403..782142a3ca2 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -902,6 +902,19 @@ static void test_VariantClear(void) ok(recinfo->recordclear == 1, "got %d\n", recinfo->recordclear); ok(recinfo->ref == 1, "got %ld\n", recinfo->ref); IRecordInfo_Release(&recinfo->IRecordInfo_iface); + + /* RECORD BYREF */ + recinfo = get_test_recordinfo(); + V_VT(&v) = VT_RECORD|VT_BYREF; + V_RECORDINFO(&v) = &recinfo->IRecordInfo_iface; + V_RECORD(&v) = recinfo->validsrc; + hres = VariantClear(&v); + ok(hres == S_OK, "ret %08lx\n", hres); + ok(V_VT(&v) == VT_EMPTY, "got vt = %d",V_VT(&v)); + /* BYREF does not own the pointed-to V_RECORD/INFO, so no RecordClear and no Release */ + ok(recinfo->recordclear == 0, "got %d\n", recinfo->recordclear); + ok(recinfo->ref == 1, "got %ld\n", recinfo->ref); + IRecordInfo_Release(&recinfo->IRecordInfo_iface); } static void test_VariantCopy(void) @@ -1069,6 +1082,7 @@ static void test_VariantCopyInd(void) size_t i; BYTE buffer[64]; HRESULT hres, hExpected; + IRecordInfoImpl *recinfo; memset(buffer, 0, sizeof(buffer)); @@ -1259,6 +1273,52 @@ static void test_VariantCopyInd(void) hres = VariantCopyInd(&vDst, &vSrc); ok(hres == E_INVALIDARG, "CopyInd(ref->ref): expected E_INVALIDARG, got 0x%08lx\n", hres); + + /* source data for a deep-copy of VT_BYREF|VT_RECORD... */ + recinfo = get_test_recordinfo(); + V_VT(&vSrc) = VT_RECORD|VT_BYREF; + V_RECORDINFO(&vSrc) = &recinfo->IRecordInfo_iface; + V_RECORD(&vSrc) = recinfo->validsrc; + + /* into a separate vDst */ + VariantInit(&vDst); + hres = VariantCopyInd(&vDst, &vSrc); + ok(hres == S_OK, "VariantCopyInd failed: 0x%08lx\n", hres); + ok(V_VT(&vDst) == VT_RECORD, "got vt = %d|0x%X\n", V_VT(&vDst) & VT_TYPEMASK, V_VT(&vDst) & ~VT_TYPEMASK); + ok(V_RECORDINFO(&vDst) == &recinfo->IRecordInfo_iface, "got %p\n", V_RECORDINFO(&vDst)); + ok(recinfo->recordclear == 0,"got %d\n", recinfo->recordclear); + ok(V_RECORD(&vDst) != recinfo->validsrc, "expected a newly-allocated deep copy\n"); + ok(recinfo->getsize == 1,"got %d\n", recinfo->getsize); + ok(recinfo->recordcopy == 1,"got %d\n", recinfo->recordcopy); + ok(recinfo->ref == 2,"got %ld\n", recinfo->ref); + + VariantClear(&vDst); + ok(recinfo->ref == 1,"got %ld\n", recinfo->ref); + ok(recinfo->recordclear == 1,"got %d\n", recinfo->recordclear); + + recinfo->getsize = 0; + recinfo->recordcopy = 0; + recinfo->recordclear = 0; + + /* and also in-place */ + hres = VariantCopyInd(&vSrc, &vSrc); + ok(V_VT(&vSrc) == VT_RECORD, "got vt = %d|0x%X\n", V_VT(&vSrc) & VT_TYPEMASK, V_VT(&vSrc) & ~VT_TYPEMASK); + ok(V_RECORDINFO(&vSrc) == &recinfo->IRecordInfo_iface, "got %p\n", V_RECORDINFO(&vSrc)); + /* ++ref and no RecordClear, since the source BYREF does not own the V_RECORD/INFO + * which it pointed to, and thus did not free them when overwritten */ + ok(recinfo->ref == 2,"got %ld\n", recinfo->ref); + ok(recinfo->recordclear == 0,"got %d\n", recinfo->recordclear); + + ok(V_RECORD(&vDst) != recinfo->validsrc, "expected a newly-allocated deep copy\n"); + ok(recinfo->getsize == 1,"got %d\n", recinfo->getsize); + ok(recinfo->recordcopy == 1,"got %d\n", recinfo->recordcopy); + + /* but the no-longer-BYREF output owns and will free its copies */ + VariantClear(&vSrc); + ok(recinfo->ref == 1,"got %ld\n", recinfo->ref); + ok(recinfo->recordclear == 1,"got %d\n", recinfo->recordclear); + + IRecordInfo_Release(&recinfo->IRecordInfo_iface); } static HRESULT (WINAPI *pVarParseNumFromStr)(const OLECHAR*,LCID,ULONG,NUMPARSE*,BYTE*); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 885082cc659..ec0c9544a61 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -879,7 +879,7 @@ HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, const VARIANTARG* pvargSrc) } else if (V_VT(pSrc) == (VT_RECORD|VT_BYREF)) { - hres = VARIANT_CopyIRecordInfo(pvargDest, pvargSrc); + hres = VARIANT_CopyIRecordInfo(pvargDest, pSrc); } else if (V_VT(pSrc) == (VT_DISPATCH|VT_BYREF) || V_VT(pSrc) == (VT_UNKNOWN|VT_BYREF))

1 0

Alistair Leslie-Hughes : odbc: SQLGetInfoW allow NULL parameter InfoValue.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: e8b7c1da6cc7de8374c02df126719844e4744bb5 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8b7c1da6cc7de8374c02df1267198… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Sep 24 17:01:35 2022 +1000 odbc: SQLGetInfoW allow NULL parameter InfoValue. MSDN states, a NULL InfoValue parameter will return as the length. unixODBC which we currently use, handles this scenario. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53714 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/odbc32/proxyodbc.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index c1cb44c29fc..714819993ee 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -1041,12 +1041,6 @@ SQLRETURN WINAPI SQLGetInfo(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoType, SQL TRACE("(ConnectionHandle, %p, InfoType %d, InfoValue %p, BufferLength %d, StringLength %p)\n", ConnectionHandle, InfoType, InfoValue, BufferLength, StringLength); - if (!InfoValue) - { - WARN("Unexpected NULL InfoValue address\n"); - return SQL_ERROR; - } - ret = ODBC_CALL( SQLGetInfo, &params ); TRACE("Returning %d\n", ret); return ret; @@ -2246,12 +2240,6 @@ SQLRETURN WINAPI SQLGetInfoW(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoType, SQ TRACE("(ConnectionHandle, %p, InfoType %d, InfoValue %p, BufferLength %d, StringLength %p)\n", ConnectionHandle, InfoType, InfoValue, BufferLength, StringLength); - if (!InfoValue) - { - WARN("Unexpected NULL InfoValue address\n"); - return SQL_ERROR; - } - ret = ODBC_CALL( SQLGetInfoW, &params ); TRACE("Returning %d\n", ret); return ret;

1 0

Francois Gouget : tests: Make sure only one thread prints traces at a time.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: e28d24621d84c930a2873b70515348372f9f401f URL: https://gitlab.winehq.org/wine/wine/-/commit/e28d24621d84c930a2873b70515348… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 30 15:26:25 2022 +0200 tests: Make sure only one thread prints traces at a time. Some Wine tests are multi-threaded or start child processes which can result in traces and failure messages being garbled which prevents them from being recognized by continuous integration tools. So printing the test messages is now serialized. Note that if a process crashes while holding the mutex, that mutex will be abandoned and not cause a deadlock. --- include/wine/test.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index 605081607f1..e502c967d9b 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -219,6 +219,8 @@ int winetest_mute_threshold = 42; /* use ANSI escape codes for output coloring */ static int winetest_color; +static HANDLE winetest_mutex; + /* passing arguments around */ static int winetest_argc; static char** winetest_argv; @@ -330,14 +332,36 @@ static void winetest_print_context( const char *msgtype ) printf( "%s: ", data->context[i] ); } +static void winetest_print_lock(void) +{ + UINT ret; + + if (!winetest_mutex) return; + ret = WaitForSingleObject(winetest_mutex, 30000); + if (ret != WAIT_OBJECT_0 && ret != WAIT_ABANDONED) + { + winetest_printf("could not get the print lock: %u\n", ret); + winetest_mutex = 0; + } +} + +static void winetest_print_unlock(void) +{ + if (winetest_mutex) ReleaseMutex(winetest_mutex); +} + void winetest_subtest( const char* name ) { + winetest_print_lock(); winetest_printf( "Subtest %s\n", name ); + winetest_print_unlock(); } void winetest_ignore_exceptions( BOOL ignore ) { + winetest_print_lock(); winetest_printf( "IgnoreExceptions=%d\n", ignore ? 1 : 0 ); + winetest_print_unlock(); } int broken( int condition ) @@ -357,7 +381,11 @@ static LONG winetest_add_line( void ) index = data->current_line % ARRAY_SIZE(line_counters); count = InterlockedIncrement(line_counters + index) - 1; if (count == winetest_mute_threshold) + { + winetest_print_lock(); winetest_printf( "Line has been silenced after %d occurrences\n", winetest_mute_threshold ); + winetest_print_unlock(); + } return count; } @@ -380,6 +408,7 @@ int winetest_vok( int condition, const char *msg, va_list args ) { if (condition) { + winetest_print_lock(); if (data->flaky_level) { if (winetest_color) printf( color_dark_purple ); @@ -395,6 +424,7 @@ int winetest_vok( int condition, const char *msg, va_list args ) InterlockedIncrement(&todo_failures); } if (winetest_color) printf( color_reset ); + winetest_print_unlock(); return 0; } else @@ -404,10 +434,12 @@ int winetest_vok( int condition, const char *msg, va_list args ) { if (winetest_debug > 0) { + winetest_print_lock(); if (winetest_color) printf( color_yellow ); winetest_print_context( "Test marked todo: " ); vprintf(msg, args); if (winetest_color) printf( color_reset ); + winetest_print_unlock(); } InterlockedIncrement(&todo_successes); } @@ -420,6 +452,7 @@ int winetest_vok( int condition, const char *msg, va_list args ) { if (!condition) { + winetest_print_lock(); if (data->flaky_level) { if (winetest_color) printf( color_bright_purple ); @@ -435,6 +468,7 @@ int winetest_vok( int condition, const char *msg, va_list args ) InterlockedIncrement(&failures); } if (winetest_color) printf( color_reset ); + winetest_print_unlock(); return 0; } else @@ -442,9 +476,11 @@ int winetest_vok( int condition, const char *msg, va_list args ) if (winetest_report_success || (winetest_time && GetTickCount() >= winetest_last_time + 1000)) { + winetest_print_lock(); if (winetest_color) printf( color_green ); winetest_printf("Test succeeded\n"); if (winetest_color) printf( color_reset ); + winetest_print_unlock(); } InterlockedIncrement(&successes); return 1; @@ -469,10 +505,12 @@ void winetest_trace( const char *msg, ... ) return; if (winetest_add_line() < winetest_mute_threshold) { + winetest_print_lock(); winetest_print_context( "" ); va_start(valist, msg); vprintf( msg, valist ); va_end(valist); + winetest_print_unlock(); } else InterlockedIncrement(&muted_traces); @@ -482,10 +520,12 @@ void winetest_vskip( const char *msg, va_list args ) { if (winetest_add_line() < winetest_mute_threshold) { + winetest_print_lock(); if (winetest_color) printf( color_blue ); winetest_print_context( "Tests skipped: " ); vprintf(msg, args); if (winetest_color) printf( color_reset ); + winetest_print_unlock(); InterlockedIncrement(&skipped); } else @@ -613,12 +653,16 @@ void winetest_wait_child_process( HANDLE process ) if (exit_code > 255) { DWORD pid = GetProcessId( process ); + winetest_print_lock(); winetest_printf( "unhandled exception %08x in child process %04x\n", (UINT)exit_code, (UINT)pid ); + winetest_print_unlock(); InterlockedIncrement( &failures ); } else if (exit_code) { + winetest_print_lock(); winetest_printf( "%u failures in child process\n", (UINT)exit_code ); + winetest_print_unlock(); while (exit_code-- > 0) InterlockedIncrement(&failures); } @@ -673,6 +717,7 @@ static int run_test( const char *name ) if (winetest_debug) { + winetest_print_lock(); if (muted_todo_successes || muted_skipped || muted_traces) printf( "%04x:%s:%s Silenced %d todos, %d skips and %d traces.\n", (UINT)GetCurrentProcessId(), test->name, winetest_elapsed(), @@ -683,6 +728,7 @@ static int run_test( const char *name ) (UINT)todo_successes, (UINT)flaky_failures, (UINT)(failures + todo_failures), (failures + todo_failures != 1) ? "failures" : "failure", (UINT)skipped ); + winetest_print_unlock(); } status = failures + todo_failures; if (!winetest_allow_flaky) status += flaky_failures; @@ -704,6 +750,7 @@ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) { struct tls_data *data = get_tls_data(); + winetest_print_lock(); if (data->current_file) printf( "%s:%d: this is the last test seen before the exception\n", data->current_file, data->current_line ); @@ -711,6 +758,7 @@ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) (UINT)GetCurrentProcessId(), current_test->name, winetest_elapsed(), (UINT)ptrs->ExceptionRecord->ExceptionCode, ptrs->ExceptionRecord->ExceptionAddress ); fflush( stdout ); + winetest_print_unlock(); return EXCEPTION_EXECUTE_HANDLER; } @@ -732,6 +780,7 @@ int main( int argc, char **argv ) char p[128]; setvbuf (stdout, NULL, _IONBF, 0); + winetest_mutex = CreateMutexA(NULL, FALSE, "winetest_print_mutex"); winetest_argc = argc; winetest_argv = argv;

1 0