wine-commits June 2024

wine-commits@winehq.org

1 participants
613 discussions

Ziqing Hui : qasf/dmowrapper: Return failure in dmo_wrapper_sink_Receive if samples allocating fails.
by Alexandre Julliard 06 Jun '24

06 Jun '24

Module: wine Branch: master Commit: 5396e722d5a979a0f219bdb0abc9f69c2287f1ff URL: https://gitlab.winehq.org/wine/wine/-/commit/5396e722d5a979a0f219bdb0abc9f6… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jun 4 11:18:06 2024 +0800 qasf/dmowrapper: Return failure in dmo_wrapper_sink_Receive if samples allocating fails. --- dlls/qasf/dmowrapper.c | 11 +++++++---- dlls/qasf/tests/dmowrapper.c | 3 --- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index 1d4ad7f75e6..2caf59c746d 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -249,9 +249,6 @@ static HRESULT process_output(struct dmo_wrapper *filter, IMediaObject *dmo) BOOL more_data; HRESULT hr; - if (FAILED(hr = get_output_samples(filter))) - return hr; - do { more_data = FALSE; @@ -325,6 +322,8 @@ static HRESULT WINAPI dmo_wrapper_sink_Receive(struct strmbase_sink *iface, IMed /* Calling Discontinuity() might change the DMO's mind about whether it * has more data to process. The DirectX documentation explicitly * states that we should call ProcessOutput() again in this case. */ + if (FAILED(hr = get_output_samples(filter))) + goto out; process_output(filter, dmo); } @@ -346,6 +345,8 @@ static HRESULT WINAPI dmo_wrapper_sink_Receive(struct strmbase_sink *iface, IMed goto out; } + if (FAILED(hr = get_output_samples(filter))) + goto out; process_output(filter, dmo); out: @@ -366,7 +367,9 @@ static HRESULT dmo_wrapper_sink_eos(struct strmbase_sink *iface) if (FAILED(hr = IMediaObject_Discontinuity(dmo, index))) ERR("Discontinuity() failed, hr %#lx.\n", hr); - process_output(filter, dmo); + if (SUCCEEDED(get_output_samples(filter))) + process_output(filter, dmo); + if (FAILED(hr = IMediaObject_Flush(dmo))) ERR("Flush() failed, hr %#lx.\n", hr); diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index 632b7e2e558..ada45c447b1 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -1703,9 +1703,7 @@ static void test_sample_processing(IMediaControl *control, IMemInputPin *input, hr = IMemAllocator_Decommit(testsink->sink.pAllocator); ok(hr == S_OK, "Decommit returned %#lx.\n", hr); hr = IMemInputPin_Receive(input, sample); - todo_wine ok(hr == VFW_E_NOT_COMMITTED, "Receive returned %#lx.\n", hr); - todo_wine ok(got_ProcessInput == 0, "Got %u calls to ProcessInput().\n", got_ProcessInput); ok(got_ProcessOutput == 0, "Got %u calls to ProcessOutput().\n", got_ProcessOutput); ok(got_Receive == 0, "Got %u calls to Receive().\n", got_Receive); @@ -1720,7 +1718,6 @@ static void test_sample_processing(IMediaControl *control, IMemInputPin *input, hr = IMemInputPin_Receive(input, sample); todo_wine ok(hr == VFW_E_WRONG_STATE, "Receive returned %#lx.\n", hr); - todo_wine ok(got_ProcessInput == 0, "Got %u calls to ProcessInput().\n", got_ProcessInput); ok(got_ProcessOutput == 0, "Got %u calls to ProcessOutput().\n", got_ProcessOutput); ok(got_Receive == 0, "Got %u calls to Receive().\n", got_Receive);

1 0

Ziqing Hui : qasf/dmowrapper: Introduce release_output_samples.
by Alexandre Julliard 06 Jun '24

06 Jun '24

Module: wine Branch: master Commit: 50485e0db4d143f05edbef6c473bc44c50e611a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/50485e0db4d143f05edbef6c473bc4… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jun 4 11:12:59 2024 +0800 qasf/dmowrapper: Introduce release_output_samples. --- dlls/qasf/dmowrapper.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index b98b18a7cac..1d4ad7f75e6 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -202,6 +202,20 @@ static void dmo_wrapper_sink_disconnect(struct strmbase_sink *iface) IMediaObject_Release(dmo); } +static void release_output_samples(struct dmo_wrapper *filter) +{ + DWORD i; + + for (i = 0; i < filter->source_count; ++i) + { + if (filter->sources[i].buffer.sample) + { + IMediaSample_Release(filter->sources[i].buffer.sample); + filter->sources[i].buffer.sample = NULL; + } + } +} + static HRESULT get_output_samples(struct dmo_wrapper *filter) { HRESULT hr; @@ -215,6 +229,7 @@ static HRESULT get_output_samples(struct dmo_wrapper *filter) &filter->sources[i].buffer.sample, NULL, NULL, 0))) { ERR("Failed to get sample for source %lu, hr %#lx.\n", i, hr); + release_output_samples(filter); return hr; } filter->buffers[i].pBuffer = &filter->sources[i].buffer.IMediaBuffer_iface; @@ -235,7 +250,7 @@ static HRESULT process_output(struct dmo_wrapper *filter, IMediaObject *dmo) HRESULT hr; if (FAILED(hr = get_output_samples(filter))) - goto out; + return hr; do { @@ -275,7 +290,8 @@ static HRESULT process_output(struct dmo_wrapper *filter, IMediaObject *dmo) if (FAILED(hr = IMemInputPin_Receive(filter->sources[i].pin.pMemInputPin, sample))) { WARN("Downstream sink returned %#lx.\n", hr); - goto out; + release_output_samples(filter); + return hr; } IMediaSample_SetActualDataLength(sample, 0); } @@ -283,16 +299,7 @@ static HRESULT process_output(struct dmo_wrapper *filter, IMediaObject *dmo) } } while (more_data); -out: - for (i = 0; i < filter->source_count; ++i) - { - if (filter->sources[i].buffer.sample) - { - IMediaSample_Release(filter->sources[i].buffer.sample); - filter->sources[i].buffer.sample = NULL; - } - } - + release_output_samples(filter); return hr; }

1 0

Ziqing Hui : qasf/dmowrapper: Introduce get_output_samples.
by Alexandre Julliard 06 Jun '24

06 Jun '24

Module: wine Branch: master Commit: 30496272f618eb74769009eee50a7d8cd04367be URL: https://gitlab.winehq.org/wine/wine/-/commit/30496272f618eb74769009eee50a7d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu May 16 17:11:08 2024 +0800 qasf/dmowrapper: Introduce get_output_samples. --- dlls/qasf/dmowrapper.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index 95e12e860ae..b98b18a7cac 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -202,12 +202,10 @@ static void dmo_wrapper_sink_disconnect(struct strmbase_sink *iface) IMediaObject_Release(dmo); } -static HRESULT process_output(struct dmo_wrapper *filter, IMediaObject *dmo) +static HRESULT get_output_samples(struct dmo_wrapper *filter) { - DMO_OUTPUT_DATA_BUFFER *buffers = filter->buffers; - DWORD status, i; - BOOL more_data; HRESULT hr; + DWORD i; for (i = 0; i < filter->source_count; ++i) { @@ -216,16 +214,29 @@ static HRESULT process_output(struct dmo_wrapper *filter, IMediaObject *dmo) if (FAILED(hr = IMemAllocator_GetBuffer(filter->sources[i].pin.pAllocator, &filter->sources[i].buffer.sample, NULL, NULL, 0))) { - ERR("Failed to get sample, hr %#lx.\n", hr); - goto out; + ERR("Failed to get sample for source %lu, hr %#lx.\n", i, hr); + return hr; } - buffers[i].pBuffer = &filter->sources[i].buffer.IMediaBuffer_iface; + filter->buffers[i].pBuffer = &filter->sources[i].buffer.IMediaBuffer_iface; IMediaSample_SetActualDataLength(filter->sources[i].buffer.sample, 0); } else - buffers[i].pBuffer = NULL; + filter->buffers[i].pBuffer = NULL; } + return S_OK; +} + +static HRESULT process_output(struct dmo_wrapper *filter, IMediaObject *dmo) +{ + DMO_OUTPUT_DATA_BUFFER *buffers = filter->buffers; + DWORD status, i; + BOOL more_data; + HRESULT hr; + + if (FAILED(hr = get_output_samples(filter))) + goto out; + do { more_data = FALSE;

1 0

Ziqing Hui : qasf/tests: Add more tests for dmo_wrapper_sink_Receive.
by Alexandre Julliard 06 Jun '24

06 Jun '24

Module: wine Branch: master Commit: b6d63b05368960e87207ff3363dd68cf7d6c6082 URL: https://gitlab.winehq.org/wine/wine/-/commit/b6d63b05368960e87207ff3363dd68… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu May 16 16:55:25 2024 +0800 qasf/tests: Add more tests for dmo_wrapper_sink_Receive. --- dlls/qasf/tests/dmowrapper.c | 101 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 99 insertions(+), 2 deletions(-) diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index 9fade2f7f1f..632b7e2e558 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -1122,6 +1122,7 @@ struct testfilter struct strmbase_sink sink; const AM_MEDIA_TYPE *sink_mt; unsigned int got_new_segment, got_eos, got_begin_flush, got_end_flush; + HANDLE event; }; static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -1145,6 +1146,7 @@ static void testfilter_destroy(struct strmbase_filter *iface) strmbase_source_cleanup(&filter->source); strmbase_sink_cleanup(&filter->sink); strmbase_filter_cleanup(&filter->filter); + CloseHandle(filter->event); } static const struct strmbase_filter_ops testfilter_ops = @@ -1199,6 +1201,7 @@ static HRESULT testsink_get_media_type(struct strmbase_pin *iface, unsigned int static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample *sample) { + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); REFERENCE_TIME start, stop; LONG len, i; HRESULT hr; @@ -1257,6 +1260,9 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample if (testmode == 10) testmode = 11; + if (testmode == 13 && got_Receive > 1) + WaitForSingleObject(filter->event, INFINITE); + return S_OK; } @@ -1311,6 +1317,7 @@ static void testfilter_init(struct testfilter *filter) strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); strmbase_source_init(&filter->source, &filter->filter, L"source", &testsource_ops); strmbase_sink_init(&filter->sink, &filter->filter, L"sink", &testsink_ops, NULL); + filter->event = CreateEventA(NULL, TRUE, FALSE, NULL); } static void test_sink_allocator(IMemInputPin *input) @@ -1518,15 +1525,46 @@ static void test_filter_state(IMediaControl *control) ok(state == State_Stopped, "Got state %lu.\n", state); } +struct receive_proc_arg +{ + IMemInputPin *input_pin; + IMediaSample *sample; +}; + +static DWORD WINAPI receive_proc(void *arg) +{ + struct receive_proc_arg *proc_arg = arg; + HRESULT hr; + + hr = IMemInputPin_Receive(proc_arg->input_pin, proc_arg->sample); + ok(hr == S_OK, "Receive returned %#lx.\n", hr); + + return 0; +} + +static DWORD WINAPI stop_filter_proc(void *arg) +{ + IBaseFilter *filter = arg; + HRESULT hr; + + hr = IBaseFilter_Stop(filter); + ok(hr == S_OK, "Stop returned %#lx.\n", hr); + + return 0; +} + static void test_sample_processing(IMediaControl *control, IMemInputPin *input, - struct testfilter *testsink) + struct testfilter *testsink, IBaseFilter *dmo_filter) { + struct receive_proc_arg receive_proc_arg; + HANDLE stop_thread, receive_thread; REFERENCE_TIME start, stop; IMemAllocator *allocator; IMediaSample *sample; LONG size, i; HRESULT hr; BYTE *data; + DWORD ret; hr = IMemInputPin_ReceiveCanBlock(input); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -1661,6 +1699,65 @@ static void test_sample_processing(IMediaControl *control, IMemInputPin *input, ok(got_Discontinuity == 1, "Got %u calls to Discontinuity().\n", got_Discontinuity); got_ProcessInput = got_ProcessOutput = got_Receive = got_Discontinuity = 0; + /* Test receive with downstream input allocator decommitted. */ + hr = IMemAllocator_Decommit(testsink->sink.pAllocator); + ok(hr == S_OK, "Decommit returned %#lx.\n", hr); + hr = IMemInputPin_Receive(input, sample); + todo_wine + ok(hr == VFW_E_NOT_COMMITTED, "Receive returned %#lx.\n", hr); + todo_wine + ok(got_ProcessInput == 0, "Got %u calls to ProcessInput().\n", got_ProcessInput); + ok(got_ProcessOutput == 0, "Got %u calls to ProcessOutput().\n", got_ProcessOutput); + ok(got_Receive == 0, "Got %u calls to Receive().\n", got_Receive); + ok(got_Discontinuity == 1, "Got %u calls to Discontinuity().\n", got_Discontinuity); + hr = IMemAllocator_Commit(testsink->sink.pAllocator); + ok(hr == S_OK, "Commit returned %#lx.\n", hr); + got_ProcessInput = got_ProcessOutput = got_Receive = got_Discontinuity = 0; + + /* Test receive with filter stopped. */ + hr = IBaseFilter_Stop(dmo_filter); + ok(hr == S_OK, "Stop returned %#lx.\n", hr); + hr = IMemInputPin_Receive(input, sample); + todo_wine + ok(hr == VFW_E_WRONG_STATE, "Receive returned %#lx.\n", hr); + todo_wine + ok(got_ProcessInput == 0, "Got %u calls to ProcessInput().\n", got_ProcessInput); + ok(got_ProcessOutput == 0, "Got %u calls to ProcessOutput().\n", got_ProcessOutput); + ok(got_Receive == 0, "Got %u calls to Receive().\n", got_Receive); + todo_wine + ok(got_Discontinuity == 0, "Got %u calls to Discontinuity().\n", got_Discontinuity); + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Run returned %#lx.\n", hr); + got_ProcessInput = got_ProcessOutput = got_Receive = got_Discontinuity = 0; + + /* Test stop filter during receiving. */ + testmode = 13; + /* Call Receive() in new thread, it will be blocked + * by event waiting in testsink_Receive(). */ + receive_proc_arg.input_pin = input; + receive_proc_arg.sample = sample; + receive_thread = CreateThread(NULL, 0, receive_proc, &receive_proc_arg, 0, NULL); + ok(!!receive_thread, "CreateThread returned NULL thread.\n"); + ret = WaitForSingleObject(receive_thread, 200); + ok(ret == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx.\n", ret); + /* Call Stop() in new thread, it will be blocked + * because Receive() is still processing. */ + stop_thread = CreateThread(NULL, 0, stop_filter_proc, dmo_filter, 0, NULL); + ok(!!stop_thread, "CreateThread returned NULL thread.\n"); + ret = WaitForSingleObject(stop_thread, 200); + todo_wine + ok(ret == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx.\n", ret); + /* Signal event to end Receive(). */ + SetEvent(testsink->event); + ret = WaitForSingleObject(receive_thread, 200); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %#lx.\n", ret); + ret = WaitForSingleObject(stop_thread, 200); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %#lx.\n", ret); + got_ProcessInput = got_ProcessOutput = got_Receive = got_Discontinuity = 0; + + testmode = 0; + CloseHandle(stop_thread); + CloseHandle(receive_thread); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#lx.\n", hr); IMediaSample_Release(sample); @@ -1882,7 +1979,7 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); test_filter_state(control); - test_sample_processing(control, meminput, &testsink); + test_sample_processing(control, meminput, &testsink, filter); /* Streaming event tests are more interesting if multiple source pins are * connected. */

1 0

Nikolay Sivov : gdi32/text: Handle null partial extents pointer in GetTextExtentExPointW().
by Alexandre Julliard 06 Jun '24

06 Jun '24

Module: wine Branch: master Commit: 3c59fb2071c225dd9bb0b5d0fe45e3376e3b5f91 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c59fb2071c225dd9bb0b5d0fe45e3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 6 11:28:04 2024 +0200 gdi32/text: Handle null partial extents pointer in GetTextExtentExPointW(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56788 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdi32/text.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 085c5e3afbe..ff548306dc3 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1421,8 +1421,11 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, const WCHAR *str, INT count, INT max if (extents + cluster_extent > max_ext) break; if (nfit) *nfit += cluster_size; - for (j = 0; j < cluster_size; ++j) - dxs[i + j] = extents + cluster_extent / cluster_size; + if (dxs) + { + for (j = 0; j < cluster_size; ++j) + dxs[i + j] = extents + cluster_extent / cluster_size; + } extents += cluster_extent; }

1 0

Nikolay Sivov : dwrite/tests: Fix a test failure on some Win10 machines with CJK locales.
by Alexandre Julliard 06 Jun '24

06 Jun '24

Module: wine Branch: master Commit: 07affdfbefae06cdbf7d1908df2a3a841859955c URL: https://gitlab.winehq.org/wine/wine/-/commit/07affdfbefae06cdbf7d1908df2a3a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 6 12:38:50 2024 +0200 dwrite/tests: Fix a test failure on some Win10 machines with CJK locales. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/layout.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c8c706a7395..f8ca4f250c4 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -5266,6 +5266,19 @@ static void test_MapCharacters(void) IDWriteFactory2_Release(factory2); } +static BOOL is_font_name_match(const WCHAR *name, const WCHAR *list) +{ + WCHAR *p, str[256]; + + wcscpy(str, list); + for (p = wcstok(str, L";"); p; p = wcstok(NULL, L";")) + { + if (!wcscmp(p, name)) + return TRUE; + } + return FALSE; +} + static void test_system_fallback(void) { static const struct fallback_test @@ -5275,7 +5288,7 @@ static void test_system_fallback(void) } tests[] = { - { { 0x25d4, 0}, L"Segoe UI Symbol" }, + { { 0x25d4, 0}, L"Segoe UI Symbol;Meiryo UI" }, }; IDWriteFontFallback *fallback; IDWriteFactory2 *factory; @@ -5310,7 +5323,7 @@ static void test_system_fallback(void) get_font_name(font, name, ARRAY_SIZE(name)); todo_wine - ok(!wcscmp(name, tests[i].name), "%u: unexpected name %s.\n", i, wine_dbgstr_w(name)); + ok(is_font_name_match(name, tests[i].name), "%u: unexpected name %s.\n", i, wine_dbgstr_w(name)); hr = IDWriteFont_HasCharacter(font, g_source[0], &exists); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0

Rémi Bernon : gdi.exe16: Fix some incorrect usage of NtGdiDdDDICreateDCFromMemory.
by Alexandre Julliard 06 Jun '24

06 Jun '24

Module: wine Branch: master Commit: 7292edaf55bd18a83b4067e60e52bb8cfbdfcba0 URL: https://gitlab.winehq.org/wine/wine/-/commit/7292edaf55bd18a83b4067e60e52bb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 6 08:56:09 2024 +0200 gdi.exe16: Fix some incorrect usage of NtGdiDdDDICreateDCFromMemory. --- dlls/gdi.exe16/gdi.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c index c634f0739c7..e81d335f127 100644 --- a/dlls/gdi.exe16/gdi.c +++ b/dlls/gdi.exe16/gdi.c @@ -1189,10 +1189,11 @@ HDC16 WINAPI CreateDC16( LPCSTR driver, LPCSTR device, LPCSTR output, D3DKMT_CREATEDCFROMMEMORY desc = { .Width = info->bmiHeader.biWidth, - .Height = info->bmiHeader.biHeight, - .Pitch = info->bmiHeader.biWidth * info->bmiHeader.biBitCount / 8, + .Height = abs( info->bmiHeader.biHeight ), + .Pitch = info->bmiHeader.biSizeImage / abs( info->bmiHeader.biHeight ), }; struct saved_bitmap *bitmap; + UINT status; int color; if (info->bmiHeader.biBitCount <= 8) @@ -1230,7 +1231,14 @@ HDC16 WINAPI CreateDC16( LPCSTR driver, LPCSTR device, LPCSTR output, desc.pMemory = &info->bmiColors[0]; } - if (NtGdiDdDDICreateDCFromMemory( &desc )) return 0; + if (!(desc.hDeviceDc = NtGdiCreateCompatibleDC( 0 ))) return 0; + if ((status = NtGdiDdDDICreateDCFromMemory( &desc ))) + { + NtGdiDeleteObjectApp( desc.hDeviceDc ); + ERR( "Failed to create HBITMAP over memory, status %#x\n", status ); + return 0; + } + NtGdiDeleteObjectApp( desc.hDeviceDc ); if ((bitmap = HeapAlloc( GetProcessHeap(), 0, sizeof(*bitmap) ))) {

1 0

Rémi Bernon : winex11: Fix some incorrect usage of NtGdiDdDDICreateDCFromMemory.
by Alexandre Julliard 06 Jun '24

06 Jun '24

Module: wine Branch: master Commit: 3a0376f8b5ef92d49172e65a383c6542e4e0b6da URL: https://gitlab.winehq.org/wine/wine/-/commit/3a0376f8b5ef92d49172e65a383c65… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 6 08:59:06 2024 +0200 winex11: Fix some incorrect usage of NtGdiDdDDICreateDCFromMemory. --- dlls/winex11.drv/bitblt.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index d7d5c93ea64..e1a05cf612b 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -2067,7 +2067,7 @@ struct window_surface *create_surface( HWND hwnd, Window window, const XVisualIn D3DDDIFORMAT d3d_format; HBITMAP bitmap = 0; BOOL byteswap; - UINT size; + UINT size, status; memset( info, 0, sizeof(*info) ); info->bmiHeader.biSize = sizeof(info->bmiHeader); @@ -2082,23 +2082,29 @@ struct window_surface *create_surface( HWND hwnd, Window window, const XVisualIn if (!(image = x11drv_image_create( info, vis ))) return NULL; /* wrap the XImage data in a HBITMAP if we can write to the surface pixels directly */ - if (!(byteswap = image_needs_byteswap( image->ximage, is_r8g8b8( vis ), info->bmiHeader.biBitCount )) && - info->bmiHeader.biBitCount > 8 && (d3d_format = get_dib_d3dddifmt( info ))) + if ((byteswap = image_needs_byteswap( image->ximage, is_r8g8b8( vis ), info->bmiHeader.biBitCount )) || + info->bmiHeader.biBitCount <= 8 || !(d3d_format = get_dib_d3dddifmt( info ))) + WARN( "Cannot use direct rendering, falling back to copies\n" ); + else { D3DKMT_CREATEDCFROMMEMORY desc = { .Width = info->bmiHeader.biWidth, - .Height = info->bmiHeader.biHeight, - .Pitch = info->bmiHeader.biWidth * info->bmiHeader.biBitCount / 8, + .Height = abs( info->bmiHeader.biHeight ), + .Pitch = info->bmiHeader.biSizeImage / abs( info->bmiHeader.biHeight ), .Format = d3d_format, .pMemory = image->ximage->data, + .hDeviceDc = NtUserGetDCEx( hwnd, 0, DCX_CACHE | DCX_WINDOW ), }; - if (!NtGdiDdDDICreateDCFromMemory( &desc )) + if ((status = NtGdiDdDDICreateDCFromMemory( &desc ))) + ERR( "Failed to create HBITMAP falling back to copies, status %#x\n", status ); + else { bitmap = desc.hBitmap; NtGdiDeleteObjectApp( desc.hDc ); } + if (desc.hDeviceDc) NtUserReleaseDC( hwnd, desc.hDeviceDc ); } if (!(surface = calloc( 1, size )))

1 0

Rémi Bernon : winex11: Wrap more window surface formats with NtGdiDdDDICreateDCFromMemory.
by Alexandre Julliard 06 Jun '24

06 Jun '24

Module: wine Branch: master Commit: 1e5b45cb0da007bfc72b2ef153cffb1a25fcdfca URL: https://gitlab.winehq.org/wine/wine/-/commit/1e5b45cb0da007bfc72b2ef153cffb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 6 08:59:06 2024 +0200 winex11: Wrap more window surface formats with NtGdiDdDDICreateDCFromMemory. --- dlls/winex11.drv/bitblt.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 8a001606420..d7d5c93ea64 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1887,10 +1887,22 @@ static UINT get_dib_d3dddifmt( const BITMAPINFO *info ) if (info->bmiHeader.biCompression == BI_BITFIELDS) { DWORD *colors = (DWORD *)info->bmiColors; - if (info->bmiHeader.biBitCount != 16) return D3DDDIFMT_UNKNOWN; - if (colors[0] == 0x0000f800 && colors[1] == 0x000007e0 && colors[2] == 0x0000001f) return D3DDDIFMT_R5G6B5; - if (colors[0] == 0x00007c00 && colors[1] == 0x000003e0 && colors[2] == 0x0000001f) return D3DDDIFMT_A1R5G5B5; - if (colors[0] == 0x00000f00 && colors[1] == 0x000000f0 && colors[2] == 0x0000000f) return D3DDDIFMT_A4R4G4B4; + + if (info->bmiHeader.biBitCount == 16) + { + if (colors[0] == 0x0000f800 && colors[1] == 0x000007e0 && colors[2] == 0x0000001f) return D3DDDIFMT_R5G6B5; + if (colors[0] == 0x00007c00 && colors[1] == 0x000003e0 && colors[2] == 0x0000001f) return D3DDDIFMT_A1R5G5B5; + if (colors[0] == 0x00000f00 && colors[1] == 0x000000f0 && colors[2] == 0x0000000f) return D3DDDIFMT_A4R4G4B4; + } + else if (info->bmiHeader.biBitCount == 24) + { + if (colors[0] == 0x00ff0000 && colors[1] == 0x0000ff00 && colors[2] == 0x000000ff) return D3DDDIFMT_R8G8B8; + } + else if (info->bmiHeader.biBitCount == 32) + { + if (colors[0] == 0x00ff0000 && colors[1] == 0x0000ff00 && colors[2] == 0x000000ff) return D3DDDIFMT_X8R8G8B8; + } + return D3DDDIFMT_UNKNOWN; }

1 0

Dmitry Timoshkov : win32u: Limit GDI object generation to 128.
by Alexandre Julliard 06 Jun '24

06 Jun '24

Module: wine Branch: master Commit: 408569cb33b9060577b56223064e346eed1bc4c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/408569cb33b9060577b56223064e34… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 3 13:52:26 2024 +0300 win32u: Limit GDI object generation to 128. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/tests/gdiobj.c | 2 ++ dlls/win32u/gdiobj.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index b9671c0fb9f..ffe376abed7 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -403,6 +403,7 @@ static void test_shared_handle_entry( HGDIOBJ obj, unsigned int type, BOOL is_st "Type = %x, expected %x\n", entry->Type, type & 0x1f); ok(entry->Object, "Object = NULL\n"); ok(entry->Owner.Count == 0, "Count = %u\n", entry->Owner.Count); + ok(entry->Generation <= (sizeof(void *) == 8) ? 127 : 255, "Generation = %u\n", entry->Generation); } static void test_shared_handle_table(void) @@ -445,6 +446,7 @@ static void test_shared_handle_table(void) ok(entry->Owner.ProcessId == GetCurrentProcessId(), "ProcessId = %x, expected %lx\n", entry->Owner.ProcessId, GetCurrentProcessId()); ok(entry->Owner.Count == 0, "Count = %u\n", entry->Owner.Count); + ok(entry->Generation <= (sizeof(void *) == 8) ? 127 : 255, "Generation = %u\n", entry->Generation); test_shared_handle_entry( GetStockObject( WHITE_PEN ), NTGDI_OBJ_PEN, TRUE ); test_shared_handle_entry( GetStockObject( WHITE_BRUSH ), NTGDI_OBJ_BRUSH, TRUE ); diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 057988e99e9..5cf99e39ff0 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -743,7 +743,7 @@ HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, DWORD type, const struct g entry->Object = (UINT_PTR)obj; entry->ExtType = type >> NTGDI_HANDLE_TYPE_SHIFT; entry->Type = entry->ExtType & 0x1f; - if (++entry->Generation == 0xff) entry->Generation = 1; + if (++entry->Generation == 0x80) entry->Generation = 1; ret = entry_to_handle( entry ); pthread_mutex_unlock( &gdi_lock ); TRACE( "allocated %s %p %u/%u\n", gdi_obj_type(type), ret,

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2024