November 2023 - Wine-Commits

Nikolay Sivov : evr/tests: Skip tests if D3D9 is unusable.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 05892c236922cb2ccdac227ab4c7ac1a8ad3d362 URL: https://gitlab.winehq.org/wine/wine/-/commit/05892c236922cb2ccdac227ab4c7ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 18 23:25:39 2023 +0100 evr/tests: Skip tests if D3D9 is unusable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/tests/evr.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 8842a858b83..25fb1978443 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -3642,8 +3642,17 @@ done: START_TEST(evr) { IMFVideoPresenter *presenter; + IDirect3D9 *d3d9; HRESULT hr; + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + if (!d3d9) + { + skip("Failed to initialize D3D9. Skipping EVR tests.\n"); + return; + } + IDirect3D9_Release(d3d9); + CoInitialize(NULL); if (FAILED(hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter)))

1 0

Nikolay Sivov : evr/presenter: Handle failure to initialize D3D9.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 055e2c166ee8c274cd36e7e7aaaf88898e603ddf URL: https://gitlab.winehq.org/wine/wine/-/commit/055e2c166ee8c274cd36e7e7aaaf88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 18 23:20:53 2023 +0100 evr/presenter: Handle failure to initialize D3D9. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/presenter.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index eed6a84c83d..552e24b4b97 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -2119,6 +2119,11 @@ static HRESULT video_presenter_init_d3d(struct video_presenter *presenter) HRESULT hr; d3d = Direct3DCreate9(D3D_SDK_VERSION); + if (!d3d) + { + WARN("Failed to initialize d3d9.\n"); + return E_FAIL; + } present_params.BackBufferCount = 1; present_params.SwapEffect = D3DSWAPEFFECT_COPY;

1 0

Paul Gofman : windowscodecs: Enable WICPixelFormat32bppBGRA in BMP encoder.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: f27dd7740cdc1290debe1f4806bb7907c54b7847 URL: https://gitlab.winehq.org/wine/wine/-/commit/f27dd7740cdc1290debe1f4806bb79… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Nov 17 16:15:32 2023 -0600 windowscodecs: Enable WICPixelFormat32bppBGRA in BMP encoder. --- dlls/windowscodecs/bmpencode.c | 3 -- dlls/windowscodecs/tests/bmpformat.c | 69 ++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index f4c6bab8aa4..28da4a5e6d2 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -54,10 +54,7 @@ static const struct bmp_pixelformat formats[] = { {&GUID_WICPixelFormat16bppBGR555, 16, 0, BI_RGB}, {&GUID_WICPixelFormat16bppBGR565, 16, 0, BI_BITFIELDS, 0xf800, 0x7e0, 0x1f, 0}, {&GUID_WICPixelFormat32bppBGR, 32, 0, BI_RGB}, -#if 0 - /* Windows doesn't seem to support this one. */ {&GUID_WICPixelFormat32bppBGRA, 32, 0, BI_BITFIELDS, 0xff0000, 0xff00, 0xff, 0xff000000}, -#endif {NULL} }; diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index e21fa1ee035..39a576d6c69 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -1263,6 +1263,74 @@ static void test_writesource_palette(void) IWICImagingFactory_Release(factory); } +static void test_encoder_formats(void) +{ + static const struct + { + const GUID *format; + BOOL supported; + const char *name; + } + tests[] = + { + {&GUID_WICPixelFormat24bppBGR, TRUE, "WICPixelFormat24bppBGR"}, + {&GUID_WICPixelFormatBlackWhite, FALSE, "WICPixelFormatBlackWhite"}, + {&GUID_WICPixelFormat1bppIndexed, TRUE, "WICPixelFormat1bppIndexed"}, + {&GUID_WICPixelFormat2bppIndexed, FALSE, "WICPixelFormat2bppIndexed"}, + {&GUID_WICPixelFormat4bppIndexed, TRUE, "WICPixelFormat4bppIndexed"}, + {&GUID_WICPixelFormat8bppIndexed, TRUE, "WICPixelFormat8bppIndexed"}, + {&GUID_WICPixelFormat16bppBGR555, TRUE, "WICPixelFormat16bppBGR555"}, + {&GUID_WICPixelFormat16bppBGR565, TRUE, "WICPixelFormat16bppBGR565"}, + {&GUID_WICPixelFormat32bppBGR, TRUE, "WICPixelFormat32bppBGR"}, + {&GUID_WICPixelFormat32bppBGRA, TRUE, "WICPixelFormat32bppBGRA"}, + {&GUID_WICPixelFormat8bppGray, FALSE, "WICPixelFormat8bppGray"}, + }; + + IWICImagingFactory *factory; + HRESULT hr; + IStream *stream; + IWICBitmapEncoder *encoder; + IWICBitmapFrameEncode *frame_encode; + GUID pixelformat; + LONG refcount; + unsigned int i; + BOOL supported; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = IWICImagingFactory_CreateEncoder(factory, &GUID_ContainerFormatBmp, &GUID_VendorMicrosoft, &encoder); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = IWICBitmapEncoder_Initialize(encoder, stream, WICBitmapEncoderNoCache); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frame_encode, NULL); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = IWICBitmapFrameEncode_Initialize(frame_encode, NULL); + ok(hr == S_OK, "got %#lx.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context(tests[i].name); + pixelformat = *tests[i].format; + hr = IWICBitmapFrameEncode_SetPixelFormat(frame_encode, &pixelformat); + ok(hr == S_OK, "got %#lx.\n", hr); + supported = !memcmp(&pixelformat, tests[i].format, sizeof(pixelformat)); + ok(supported == tests[i].supported, "got %d.\n", supported); + winetest_pop_context(); + } + + IWICBitmapFrameEncode_Release(frame_encode); + refcount = IWICBitmapEncoder_Release(encoder); + ok(!refcount, "got %ld.\n", refcount); + IStream_Release(stream); + IWICImagingFactory_Release(factory); +} + START_TEST(bmpformat) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -1276,6 +1344,7 @@ START_TEST(bmpformat) test_createfromstream(); test_create_decoder(); test_writesource_palette(); + test_encoder_formats(); CoUninitialize(); }

1 0

Daniel Lehman : msxml3/tests: Add tests for default namespace.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: e55cae42b0058b4a81035d4ca53adca8979a3061 URL: https://gitlab.winehq.org/wine/wine/-/commit/e55cae42b0058b4a81035d4ca53adc… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Nov 15 23:21:59 2023 -0800 msxml3/tests: Add tests for default namespace. --- dlls/msxml3/tests/domdoc.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index ebc6476069a..d8a4bd47ef6 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13676,6 +13676,7 @@ static void test_namespaces_as_attributes(void) const char *uris[3]; const char *texts[3]; const char *xmls[3]; + BOOL todo; }; static const struct test tests[] = { { @@ -13707,6 +13708,17 @@ static void test_namespaces_as_attributes(void) { "nshref" }, /* text */ { "xmlns:ns=\"nshref\"" }, /* xml */ }, + /* default namespace */ + { + "<a xmlns=\"nshref\" />", 1, + { "xmlns" }, /* nodeName */ + { "xmlns" }, /* prefix */ + { "" }, /* baseName */ + { "" }, /* namespaceURI */ + { "nshref" }, /* text */ + { "xmlns=\"nshref\"" }, /* xml */ + TRUE, /* todo */ + }, /* no properties or namespaces */ { "<a />", 0, @@ -13760,7 +13772,9 @@ static void test_namespaces_as_attributes(void) { item = NULL; hr = IXMLDOMNamedNodeMap_get_item(map, i, &item); + todo_wine_if(test->todo) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr != S_OK) continue; str = NULL; hr = IXMLDOMNode_get_nodeName(item, &str);

1 0

Daniel Lehman : msxml6/tests: Add tests for default namespace.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 6a7c53130f71d9c72a382b2da092304b6260ea60 URL: https://gitlab.winehq.org/wine/wine/-/commit/6a7c53130f71d9c72a382b2da09230… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Nov 15 23:21:59 2023 -0800 msxml6/tests: Add tests for default namespace. --- dlls/msxml6/tests/domdoc.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/msxml6/tests/domdoc.c b/dlls/msxml6/tests/domdoc.c index 3aad799523d..0c156023b6b 100644 --- a/dlls/msxml6/tests/domdoc.c +++ b/dlls/msxml6/tests/domdoc.c @@ -67,6 +67,7 @@ static void test_namespaces_as_attributes(void) const WCHAR *uris[3]; const WCHAR *texts[3]; const WCHAR *xmls[3]; + BOOL todo; }; static const struct test tests[] = { @@ -99,6 +100,17 @@ static void test_namespaces_as_attributes(void) { L"nshref" }, /* text */ { L"xmlns:ns=\"nshref\"" }, /* xml */ }, + /* default namespace */ + { + L"<a xmlns=\"nshref\" />", 1, + { L"xmlns" }, /* nodeName */ + { NULL }, /* prefix */ + { L"xmlns" }, /* baseName */ + { L"http://www.w3.org/2000/xmlns/" }, /* namespaceURI */ + { L"nshref" }, /* text */ + { L"xmlns=\"nshref\"" }, /* xml */ + TRUE, /* todo */ + }, /* no properties or namespaces */ { L"<a />", 0, @@ -125,7 +137,7 @@ static void test_namespaces_as_attributes(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); node = NULL; - hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_(L"a"), &node); + hr = IXMLDOMDocument2_get_firstChild(doc, &node); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXMLDOMNode_get_attributes(node, &map); @@ -145,7 +157,9 @@ static void test_namespaces_as_attributes(void) { item = NULL; hr = IXMLDOMNamedNodeMap_get_item(map, i, &item); + todo_wine_if(test->todo) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr != S_OK) continue; str = NULL; hr = IXMLDOMNode_get_nodeName(item, &str);

1 0

Rémi Bernon : evr: Set last presented sample atomically.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 8ffebcf4ab869bf1067b23f3a67eead0213494c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ffebcf4ab869bf1067b23f3a67eea… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 17 21:28:10 2023 +0100 evr: Set last presented sample atomically. Fixes a race condition and crashes in Secret of Mana. The queue critical section is held in video_presenter_sample_present while GetCurrentImage only locks the presenter CS. Double locking is tricky and atomic operation is appropriate to swap the sample pointer. --- dlls/evr/presenter.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 2dc01608caf..eed6a84c83d 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -530,12 +530,9 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM WARN("Failed to get a backbuffer, hr %#lx.\n", hr); } - EnterCriticalSection(&queue->cs); - if (queue->last_presented) - IMFSample_Release(queue->last_presented); - queue->last_presented = sample; - IMFSample_AddRef(queue->last_presented); - LeaveCriticalSection(&queue->cs); + IMFSample_AddRef(sample); + if ((sample = InterlockedExchangePointer((void **)&queue->last_presented, sample))) + IMFSample_Release(sample); IDirect3DSurface9_Release(surface); } @@ -752,6 +749,9 @@ static HRESULT video_presenter_start_streaming(struct video_presenter *presenter static HRESULT video_presenter_end_streaming(struct video_presenter *presenter) { + struct sample_queue *queue = &presenter->thread.queue; + IMFSample *sample; + if (!presenter->thread.hthread) return S_OK; @@ -762,8 +762,9 @@ static HRESULT video_presenter_end_streaming(struct video_presenter *presenter) TRACE("Terminated streaming thread tid %#lx.\n", presenter->thread.tid); - if (presenter->thread.queue.last_presented) - IMFSample_Release(presenter->thread.queue.last_presented); + if ((sample = InterlockedExchangePointer((void **)&queue->last_presented, NULL))) + IMFSample_Release(sample); + video_presenter_sample_queue_free(presenter); memset(&presenter->thread, 0, sizeof(presenter->thread)); video_presenter_set_allocator_callback(presenter, NULL); @@ -1488,6 +1489,7 @@ static HRESULT WINAPI video_presenter_control_GetCurrentImage(IMFVideoDisplayCon BYTE **dib, DWORD *dib_size, LONGLONG *timestamp) { struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); + struct sample_queue *queue = &presenter->thread.queue; IDirect3DSurface9 *readback = NULL, *surface; D3DSURFACE_DESC surface_desc; D3DLOCKED_RECT mapped_rect; @@ -1500,10 +1502,7 @@ static HRESULT WINAPI video_presenter_control_GetCurrentImage(IMFVideoDisplayCon EnterCriticalSection(&presenter->cs); - sample = presenter->thread.queue.last_presented; - presenter->thread.queue.last_presented = NULL; - - if (!sample) + if (!(sample = InterlockedExchangePointer((void **)&queue->last_presented, NULL))) { hr = MF_E_INVALIDREQUEST; }

1 0

Giovanni Mascellani : vkd3d-shader/ir: Correctly compute the TEMP count after hull shader flattening.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: vkd3d Branch: master Commit: b1123ed35f48017b18fdc27540bb681414fc472f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b1123ed35f48017b18fdc27540bb6… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Nov 16 23:07:27 2023 +0100 vkd3d-shader/ir: Correctly compute the TEMP count after hull shader flattening. The previous computation was incorrect because the count was taken after resetting it to zero (as part of setting the instruction to NOP). --- libs/vkd3d-shader/ir.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 5c88946b..833f5084 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -207,10 +207,15 @@ static void flattener_eliminate_phase_related_dcls(struct hull_flattener *normal { /* Leave only the first temp declaration and set it to the max count later. */ if (!normaliser->max_temp_count) + { + normaliser->max_temp_count = ins->declaration.count; normaliser->temp_dcl_idx = index; + } else + { + normaliser->max_temp_count = max(normaliser->max_temp_count, ins->declaration.count); vkd3d_shader_instruction_make_nop(ins); - normaliser->max_temp_count = max(normaliser->max_temp_count, ins->declaration.count); + } return; }

1 0

Jacek Caban : include: Use GCC-style attributes and builtins on Clang MSVC target.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: vkd3d Branch: master Commit: 616bf939314e6c50a73932f742dfb779e807ef4c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/616bf939314e6c50a73932f742dfb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 17 17:52:53 2023 +0100 include: Use GCC-style attributes and builtins on Clang MSVC target. --- include/private/vkd3d_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 619665ad..5557df41 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -75,7 +75,7 @@ static inline size_t align(size_t addr, size_t alignment) return (addr + (alignment - 1)) & ~(alignment - 1); } -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__clang__) # define VKD3D_NORETURN __attribute__((noreturn)) # ifdef __MINGW_PRINTF_FORMAT # define VKD3D_PRINTF_FUNC(fmt, args) __attribute__((format(__MINGW_PRINTF_FORMAT, fmt, args)))

1 0

Jacek Caban : vkd3d-shader/dxbc: Use return type to return result from read_u32 and read_float.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: vkd3d Branch: master Commit: 078cf6a240f0bfb740402b41cda43b35557f0d06 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/078cf6a240f0bfb740402b41cda43… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 17 12:52:19 2023 +0100 vkd3d-shader/dxbc: Use return type to return result from read_u32 and read_float. Avoid implicit casts from enum pointers. --- libs/vkd3d-shader/dxbc.c | 158 +++++++++++++++++++++++++---------------------- 1 file changed, 83 insertions(+), 75 deletions(-)

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate IFC instructions.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: vkd3d Branch: master Commit: 5cb17cfd1c957a46fbe1d1053d2bd3f5502eb130 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5cb17cfd1c957a46fbe1d1053d2bd… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Nov 16 22:32:13 2023 +0100 vkd3d-shader/ir: Validate IFC instructions. --- libs/vkd3d-shader/ir.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index b8cb6a41..5c88946b 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1696,6 +1696,14 @@ static void vsir_validate_instruction(struct validation_context *ctx) ctx->blocks[ctx->depth++] = instruction->handler_idx; break; + case VKD3DSIH_IFC: + vsir_validate_dst_count(ctx, instruction, 0); + vsir_validate_src_count(ctx, instruction, 2); + if (!vkd3d_array_reserve((void **)&ctx->blocks, &ctx->blocks_capacity, ctx->depth + 1, sizeof(*ctx->blocks))) + return; + ctx->blocks[ctx->depth++] = VKD3DSIH_IF; + break; + case VKD3DSIH_ELSE: vsir_validate_dst_count(ctx, instruction, 0); vsir_validate_src_count(ctx, instruction, 0);

1 0