- Wine-Commits - list.winehq.org

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

Nov. 20, 2023

Module: wine Branch: master Commit: 2dd3a20520dd2a3f18140a0f89ce87b1349caaea URL: https://gitlab.winehq.org/wine/wine/-/commit/2dd3a20520dd2a3f18140a0f89ce87… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 19 15:07:53 2023 +0100 dxva2/tests: Skip tests if D3D9 is unusable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/tests/dxva2.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index db48f331772..96368602f4a 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -695,6 +695,16 @@ done: START_TEST(dxva2) { + IDirect3D9 *d3d; + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + if (!d3d) + { + skip("Failed to initialize D3D9. Skipping tests.\n"); + return; + } + IDirect3D9_Release(d3d); + test_device_manager(); test_video_processor(); test_progressive_device();

1 0

Bernhard Übelacker : uxtheme: Add stub for RefreshImmersiveColorPolicyState.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 71b3d10f953fe6f970d7991666287340ac489130 URL: https://gitlab.winehq.org/wine/wine/-/commit/71b3d10f953fe6f970d79916662873… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Tue Nov 14 17:58:12 2023 +0100 uxtheme: Add stub for RefreshImmersiveColorPolicyState. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55898 --- dlls/uxtheme/system.c | 9 +++++++++ dlls/uxtheme/uxtheme.spec | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index f95a5d598ae..adf90a12cfb 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -1253,6 +1253,15 @@ BOOL WINAPI ThemeHooksRemove(void) return TRUE; } +/********************************************************************** + * RefreshImmersiveColorPolicyState (UXTHEME.104) + * + */ +void WINAPI RefreshImmersiveColorPolicyState(void) +{ + FIXME("stub\n"); +} + /********************************************************************** * ShouldSystemUseDarkMode (UXTHEME.138) * diff --git a/dlls/uxtheme/uxtheme.spec b/dlls/uxtheme/uxtheme.spec index 1cf8ae7e418..26dc54d5805 100644 --- a/dlls/uxtheme/uxtheme.spec +++ b/dlls/uxtheme/uxtheme.spec @@ -42,6 +42,7 @@ 61 stdcall OpenThemeDataEx(ptr wstr long) 62 stub -noname ServerClearStockObjects 63 stub -noname MarkSelection +104 stdcall -noname RefreshImmersiveColorPolicyState() 132 stdcall -noname ShouldAppsUseDarkMode() 133 stdcall -noname AllowDarkModeForWindow(ptr long) 135 stdcall -noname SetPreferredAppMode(long)

1 0

Piotr Caban : msvcrt: Avoid temporary buffer allocation in _mbsrev_l.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: c180a902c066de6e9f55d7486b3189b5ec0c4b0a URL: https://gitlab.winehq.org/wine/wine/-/commit/c180a902c066de6e9f55d7486b3189… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 17 20:28:55 2023 +0100 msvcrt: Avoid temporary buffer allocation in _mbsrev_l. --- dlls/msvcrt/mbcs.c | 50 +++++++++++++++----------------------------------- 1 file changed, 15 insertions(+), 35 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index e6c0e944255..2e228d77811 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2889,9 +2889,8 @@ size_t CDECL _mbscspn(const unsigned char* str, const unsigned char* cmp) */ unsigned char* CDECL _mbsrev_l(unsigned char* str, _locale_t locale) { - int i, len; - unsigned char *p, *temp; pthreadmbcinfo mbcinfo; + unsigned char *p, tmp; if (!MSVCRT_CHECK_PMT(str)) return NULL; @@ -2904,44 +2903,25 @@ unsigned char* CDECL _mbsrev_l(unsigned char* str, _locale_t locale) if (!mbcinfo->ismbcodepage) return u__strrev(str); - len = _mbslen_l(str, locale); - temp = malloc(len * 2); - if (!temp) - return str; - - /* unpack multibyte string to temp buffer */ - p = str; - for (i = 0; i < len; i++) + for (p = str; *p; p++) { if (_ismbblead_l(*p, locale)) { - temp[i * 2] = *p++; - temp[i * 2 + 1] = *p++; - } - else - { - temp[i * 2] = *p++; - temp[i * 2 + 1] = 0; - } - } - - /* repack it in the reverse order */ - p = str; - for (i = len - 1; i >= 0; i--) - { - if (_ismbblead_l(temp[i * 2], locale)) - { - *p++ = temp[i * 2]; - *p++ = temp[i * 2 + 1]; - } - else - { - *p++ = temp[i * 2]; + if (p[1]) + { + tmp = p[0]; + p[0] = p[1]; + p[1] = tmp; + p++; + } + else + { + /* drop trailing lead char */ + p[0] = 0; + } } } - - free(temp); - return str; + return u__strrev(str); } /*********************************************************************

1 0

Michael Stefaniuc : winegstreamer: Remove redundant NULL check before free().
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 7113bef649db0c6006b05aa0a92f58f42651f61b URL: https://gitlab.winehq.org/wine/wine/-/commit/7113bef649db0c6006b05aa0a92f58… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 8 19:30:11 2023 +0100 winegstreamer: Remove redundant NULL check before free(). --- dlls/winegstreamer/wg_parser.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 5a526b15712..247810b7796 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1747,11 +1747,8 @@ static NTSTATUS wg_parser_disconnect(void *args) for (i = 0; i < ARRAY_SIZE(parser->input_cache_chunks); i++) { - if (parser->input_cache_chunks[i].data) - { - free(parser->input_cache_chunks[i].data); - parser->input_cache_chunks[i].data = NULL; - } + free(parser->input_cache_chunks[i].data); + parser->input_cache_chunks[i].data = NULL; } return S_OK;

1 0

Piotr Caban : msvcrt: Add _mbsrev tests.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 4623c41100dd4d910829fc10c20ce4474f5d27ae URL: https://gitlab.winehq.org/wine/wine/-/commit/4623c41100dd4d910829fc10c20ce4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 19 12:05:00 2023 +0100 msvcrt: Add _mbsrev tests. --- dlls/msvcrt/tests/string.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index b63df4b846d..34338fd4a39 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -4671,6 +4671,27 @@ static void test_wcsncpy(void) wine_dbgstr_wn(dst, ARRAY_SIZE(dst))); } +static void test_mbsrev(void) +{ + unsigned char buf[64], *ret; + int cp = _getmbcp(); + + _setmbcp(932); + + strcpy((char *)buf, "\x36\x8c\x8e"); + ret = _mbsrev(buf); + ok(ret == buf, "ret = %p, expected %p\n", ret, buf); + ok(!memcmp(buf, "\x8c\x8e\x36", 4), "buf = %s\n", wine_dbgstr_a((char *)buf)); + + /* test string that ends with leading byte */ + strcpy((char *)buf, "\x36\x8c"); + ret = _mbsrev(buf); + ok(ret == buf, "ret = %p, expected %p\n", ret, buf); + ok(!memcmp(buf, "\x36", 2), "buf = %s\n", wine_dbgstr_a((char *)buf)); + + _setmbcp(cp); +} + START_TEST(string) { char mem[100]; @@ -4831,4 +4852,5 @@ START_TEST(string) test_SpecialCasing(); test__mbbtype(); test_wcsncpy(); + test_mbsrev(); }

1 0

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

Nov. 20, 2023

Module: wine Branch: master Commit: 712b33c171e1049f94a5cc5b48a5da1aa94bfadb URL: https://gitlab.winehq.org/wine/wine/-/commit/712b33c171e1049f94a5cc5b48a5da… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Nov 15 23:21:59 2023 -0800 msxml4/tests: Add tests for default namespace. --- dlls/msxml4/tests/domdoc.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/msxml4/tests/domdoc.c b/dlls/msxml4/tests/domdoc.c index 1784804c0c6..530a481679f 100644 --- a/dlls/msxml4/tests/domdoc.c +++ b/dlls/msxml4/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 */ + { L"xmlns" }, /* prefix */ + { L"" }, /* baseName */ + { L"" }, /* 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); @@ -157,8 +171,10 @@ static void test_namespaces_as_attributes(void) hr = IXMLDOMNode_get_prefix(item, &str); if (test->prefixes[i]) { - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!lstrcmpW(str, test->prefixes[i]), "got %s\n", wine_dbgstr_w(str)); + /* MSXML4 can report different results with different service packs */ + ok(hr == S_OK || broken(hr == S_FALSE), "Unexpected hr %#lx.\n", hr); + ok(!lstrcmpW(str, test->prefixes[i]) || broken(!str), + "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); } else @@ -166,8 +182,10 @@ static void test_namespaces_as_attributes(void) str = NULL; hr = IXMLDOMNode_get_baseName(item, &str); + /* MSXML4 can report different results with different service packs */ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!lstrcmpW(str, test->basenames[i]), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, test->basenames[i]) || broken(!lstrcmpW(str, L"xmlns")), + "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = NULL;

1 0

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