October 2023 - Wine-commits

Louis Lenders : uxtheme: Add ShouldAppsUseDarkMode.
by Alexandre Julliard 24 Oct '23

24 Oct '23

Module: wine Branch: master Commit: b5f4a6a4dbb6f4d7b9f182d0d551393558458712 URL: https://gitlab.winehq.org/wine/wine/-/commit/b5f4a6a4dbb6f4d7b9f182d0d55139… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Oct 19 15:15:36 2023 +0200 uxtheme: Add ShouldAppsUseDarkMode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55821 --- dlls/uxtheme/system.c | 17 +++++++++++++++++ dlls/uxtheme/tests/system.c | 32 ++++++++++++++++++++++++++++++++ dlls/uxtheme/uxtheme.spec | 1 + 3 files changed, 50 insertions(+) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 156051406e3..f1a4d0d5566 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -1273,3 +1273,20 @@ BOOL WINAPI ShouldSystemUseDarkMode(void) return !light_theme; } + +/********************************************************************** + * ShouldAppsUseDarkMode (UXTHEME.132) + * + * RETURNS + * Whether or not apps should use dark mode. + */ +BOOL WINAPI ShouldAppsUseDarkMode(void) +{ + DWORD light_theme = TRUE, light_theme_size = sizeof(light_theme); + + RegGetValueW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", + L"AppsUseLightTheme", RRF_RT_REG_DWORD, NULL, &light_theme, &light_theme_size); + + return !light_theme; +} diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 197cd86f6b6..c5fc19dd86a 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -49,6 +49,7 @@ static HRESULT (WINAPI *pGetBufferedPaintTargetRect)(HPAINTBUFFER, RECT *); static HRESULT (WINAPI *pGetThemeIntList)(HTHEME, int, int, int, INTLIST *); static HRESULT (WINAPI *pGetThemeTransitionDuration)(HTHEME, int, int, int, int, DWORD *); static BOOL (WINAPI *pShouldSystemUseDarkMode)(void); +static BOOL (WINAPI *pShouldAppsUseDarkMode)(void); static LONG (WINAPI *pDisplayConfigGetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); static LONG (WINAPI *pDisplayConfigSetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); @@ -76,6 +77,7 @@ static void init_funcs(void) HMODULE uxtheme = GetModuleHandleA("uxtheme.dll"); pShouldSystemUseDarkMode = (void *)GetProcAddress(uxtheme, MAKEINTRESOURCEA(138)); + pShouldAppsUseDarkMode = (void *)GetProcAddress(uxtheme, MAKEINTRESOURCEA(132)); #define GET_PROC(module, func) \ p##func = (void *)GetProcAddress(module, #func); \ @@ -2629,6 +2631,35 @@ static void test_ShouldSystemUseDarkMode(void) ok(result == !light_theme, "Expected value %d, got %d.\n", !light_theme, result); } +static void test_ShouldAppsUseDarkMode(void) +{ + DWORD light_theme, light_theme_size = sizeof(light_theme), last_error; + BOOL result; + LSTATUS ls; + + if (!pShouldAppsUseDarkMode) + { + win_skip("ShouldAppsUseDarkMode() is unavailable\n"); + return; + } + + ls = RegGetValueW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", + L"AppsUseLightTheme", RRF_RT_REG_DWORD, NULL, &light_theme, &light_theme_size); + if (ls == ERROR_FILE_NOT_FOUND) + { + skip("AppsUseLightTheme registry value not found.\n"); + return; + } + ok(ls == 0, "RegGetValue failed: %ld.\n", ls); + + SetLastError(0xdeadbeef); + result = pShouldAppsUseDarkMode(); + last_error = GetLastError(); + ok(last_error == 0xdeadbeef, "ShouldAppsUseDarkMode set last error: %ld.\n", last_error); + ok(result == !light_theme, "Expected value %d, got %d\n", !light_theme, result); +} + START_TEST(system) { ULONG_PTR ctx_cookie; @@ -2655,6 +2686,7 @@ START_TEST(system) test_GetThemeBackgroundRegion(); test_theme(); test_ShouldSystemUseDarkMode(); + test_ShouldAppsUseDarkMode(); if (load_v6_module(&ctx_cookie, &ctx)) { diff --git a/dlls/uxtheme/uxtheme.spec b/dlls/uxtheme/uxtheme.spec index a5bfb88c49a..d31621e11a7 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 +132 stdcall -noname ShouldAppsUseDarkMode() 138 stdcall -noname ShouldSystemUseDarkMode() # Standard functions

1 0

Gabriel Ivăncescu : mshtml: Set outer window to uninitialized page when document obj is released.
by Alexandre Julliard 24 Oct '23

24 Oct '23

Module: wine Branch: master Commit: 110dad9ca562fb3952dd78f6f08e7bf00c2e3e48 URL: https://gitlab.winehq.org/wine/wine/-/commit/110dad9ca562fb3952dd78f6f08e7b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Oct 20 22:24:51 2023 +0300 mshtml: Set outer window to uninitialized page when document obj is released. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlwindow.c | 12 ++-- dlls/mshtml/navigate.c | 5 +- dlls/mshtml/nsevents.c | 6 +- dlls/mshtml/nsio.c | 2 +- dlls/mshtml/oleobj.c | 72 +++++++++++++++++++-- dlls/mshtml/tests/events.c | 148 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/htmldoc.c | 36 ++++++++++- dlls/mshtml/tests/script.c | 17 +++++ 9 files changed, 283 insertions(+), 17 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Return proper errors when navigating with no browser.
by Alexandre Julliard 24 Oct '23

24 Oct '23

Module: wine Branch: master Commit: 4418f928affdc9fc0637adf4fdaa9cc76927b20c URL: https://gitlab.winehq.org/wine/wine/-/commit/4418f928affdc9fc0637adf4fdaa9c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Oct 20 22:24:51 2023 +0300 mshtml: Return proper errors when navigating with no browser. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/navigate.c | 3 +++ dlls/mshtml/tests/events.c | 21 ++++++++++++++++++++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 80d23ecc12d..47e65472c01 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2832,7 +2832,7 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, FIXME("unimplemented flags %lx\n", flags & ~2); if(!window || !window->browser) - return E_UNEXPECTED; + return E_FAIL; if(window->browser->doc->hostui) { hres = IDocHostUIHandler_TranslateUrl(window->browser->doc->hostui, 0, url, &translated_url); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 8af2de6705c..373cfa03585 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2679,6 +2679,9 @@ HRESULT navigate_url(HTMLOuterWindow *window, const WCHAR *new_url, IUri *base_u BSTR display_uri; HRESULT hres; + if(!window->browser) + return E_UNEXPECTED; + if(new_url && base_uri) hres = CoInternetCombineUrlEx(base_uri, new_url, URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, &nav_uri, 0); diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 56b62aa418c..7d139ccafe1 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -6003,12 +6003,13 @@ static void test_document_close(void) { IHTMLPrivateWindow *priv_window; IHTMLDocument2 *doc, *doc_node; + IHTMLLocation *location; IHTMLDocument3 *doc3; IHTMLElement *elem; DWORD cookie; + BSTR bstr, bstr2; HRESULT hres; VARIANT v; - BSTR bstr; LONG ref; MSG msg; @@ -6091,6 +6092,24 @@ static void test_document_close(void) IHTMLDocument2_Release(doc_node); IHTMLDocument2_Release(doc); + + bstr = SysAllocString(L"about:blank"); + hres = IHTMLWindow2_get_location(window, &location); + ok(hres == S_OK, "get_location failed: %08lx\n", hres); + hres = IHTMLLocation_put_href(location, bstr); + ok(hres == E_UNEXPECTED || broken(hres == E_ABORT), "put_href returned: %08lx\n", hres); + IHTMLLocation_Release(location); + + V_VT(&v) = VT_EMPTY; + bstr2 = SysAllocString(L""); + hres = IHTMLWindow2_QueryInterface(window, &IID_IHTMLPrivateWindow, (void**)&priv_window); + ok(hres == S_OK, "Could not get IHTMLPrivateWindow) interface: %08lx\n", hres); + hres = IHTMLPrivateWindow_SuperNavigate(priv_window, bstr, bstr2, NULL, NULL, &v, &v, 0); + ok(hres == E_FAIL, "SuperNavigate returned: %08lx\n", hres); + IHTMLPrivateWindow_Release(priv_window); + SysFreeString(bstr2); + SysFreeString(bstr); + IHTMLWindow2_Release(window); window = NULL;

1 0

Nikolay Sivov : d3d10_1/tests: Add some more tests for fx_4_1 blend states.
by Alexandre Julliard 20 Oct '23

20 Oct '23

Module: wine Branch: master Commit: 9afcf7c8e0c406907f6ce3a9dc9fe3892b8a322d URL: https://gitlab.winehq.org/wine/wine/-/commit/9afcf7c8e0c406907f6ce3a9dc9fe3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 20 10:38:47 2023 +0200 d3d10_1/tests: Add some more tests for fx_4_1 blend states. --- dlls/d3d10_1/tests/d3d10_1.c | 124 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 107 insertions(+), 17 deletions(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index 5db4ded0413..75b01c89903 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -779,13 +779,19 @@ BlendState blend_state srcblend[0] = zero; }; +BlendState blend_state2 +{ + blendenable = true; + srcblend = src_color; +}; + BlendState default_blend_state {}; #endif static DWORD fx_4_1_test_blend_state[] = { - 0x43425844, 0x9e1570b0, 0x0ed82fb4, 0x16300839, 0x88b70426, 0x00000001, 0x000002b3, 0x00000001, - 0x00000024, 0x30315846, 0x00000287, 0xfeff1011, 0x00000000, 0x00000000, 0x00000002, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x0000010b, 0x00000000, 0x00000000, 0x00000000, 0x00000002, + 0x43425844, 0x93b3fe48, 0xee555ce6, 0xc07d00df, 0x616889d5, 0x00000001, 0x000003d4, 0x00000001, + 0x00000024, 0x30315846, 0x000003a8, 0xfeff1011, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000184, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6e656c42, 0x61745364, 0x04006574, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x02000000, 0x62000000, 0x646e656c, 0x6174735f, 0x01006574, 0x04000000, 0x01000000, 0x01000000, 0x04000000, @@ -794,22 +800,32 @@ static DWORD fx_4_1_test_blend_state[] = 0x01000000, 0x04000000, 0x01000000, 0x01000000, 0x02000000, 0x02000000, 0x01000000, 0x02000000, 0x02000000, 0x01000000, 0x02000000, 0x02000000, 0x01000000, 0x02000000, 0x02000000, 0x01000000, 0x02000000, 0x02000000, 0x01000000, 0x02000000, 0x02000000, 0x01000000, 0x02000000, 0x02000000, - 0x01000000, 0x02000000, 0x01000000, 0x64000000, 0x75616665, 0x625f746c, 0x646e656c, 0x6174735f, - 0x2b006574, 0x0f000000, 0x00000000, 0xff000000, 0x10ffffff, 0x25000000, 0x00000000, 0x01000000, - 0x37000000, 0x25000000, 0x01000000, 0x01000000, 0x43000000, 0x25000000, 0x02000000, 0x01000000, - 0x4f000000, 0x25000000, 0x03000000, 0x01000000, 0x5b000000, 0x25000000, 0x04000000, 0x01000000, - 0x67000000, 0x25000000, 0x05000000, 0x01000000, 0x73000000, 0x25000000, 0x06000000, 0x01000000, - 0x7f000000, 0x25000000, 0x07000000, 0x01000000, 0x8b000000, 0x26000000, 0x01000000, 0x01000000, - 0x97000000, 0x26000000, 0x02000000, 0x01000000, 0xa3000000, 0x26000000, 0x03000000, 0x01000000, - 0xaf000000, 0x26000000, 0x04000000, 0x01000000, 0xbb000000, 0x26000000, 0x05000000, 0x01000000, - 0xc7000000, 0x26000000, 0x06000000, 0x01000000, 0xd3000000, 0x26000000, 0x07000000, 0x01000000, - 0xdf000000, 0x26000000, 0x00000000, 0x01000000, 0xeb000000, 0x00000000, 0xf7000000, 0x0f000000, - 0x00000000, 0xff000000, 0x00ffffff, 0x00000000, 0x00000000, + 0x01000000, 0x02000000, 0x01000000, 0x62000000, 0x646e656c, 0x6174735f, 0x00326574, 0x00000001, + 0x00000004, 0x00000001, 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000002, 0x00000003, + 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000002, + 0x00000003, 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000002, 0x00000003, 0x00000001, + 0x00000002, 0x00000003, 0x61666564, 0x5f746c75, 0x6e656c62, 0x74735f64, 0x00657461, 0x0000002b, + 0x0000000f, 0x00000000, 0xffffffff, 0x00000010, 0x00000025, 0x00000000, 0x00000001, 0x00000037, + 0x00000025, 0x00000001, 0x00000001, 0x00000043, 0x00000025, 0x00000002, 0x00000001, 0x0000004f, + 0x00000025, 0x00000003, 0x00000001, 0x0000005b, 0x00000025, 0x00000004, 0x00000001, 0x00000067, + 0x00000025, 0x00000005, 0x00000001, 0x00000073, 0x00000025, 0x00000006, 0x00000001, 0x0000007f, + 0x00000025, 0x00000007, 0x00000001, 0x0000008b, 0x00000026, 0x00000001, 0x00000001, 0x00000097, + 0x00000026, 0x00000002, 0x00000001, 0x000000a3, 0x00000026, 0x00000003, 0x00000001, 0x000000af, + 0x00000026, 0x00000004, 0x00000001, 0x000000bb, 0x00000026, 0x00000005, 0x00000001, 0x000000c7, + 0x00000026, 0x00000006, 0x00000001, 0x000000d3, 0x00000026, 0x00000007, 0x00000001, 0x000000df, + 0x00000026, 0x00000000, 0x00000001, 0x000000eb, 0x00000000, 0x000000f7, 0x0000000f, 0x00000000, + 0xffffffff, 0x00000009, 0x00000025, 0x00000000, 0x00000001, 0x00000104, 0x00000026, 0x00000000, + 0x00000001, 0x00000110, 0x00000026, 0x00000001, 0x00000001, 0x0000011c, 0x00000026, 0x00000002, + 0x00000001, 0x00000128, 0x00000026, 0x00000003, 0x00000001, 0x00000134, 0x00000026, 0x00000004, + 0x00000001, 0x00000140, 0x00000026, 0x00000005, 0x00000001, 0x0000014c, 0x00000026, 0x00000006, + 0x00000001, 0x00000158, 0x00000026, 0x00000007, 0x00000001, 0x00000164, 0x00000000, 0x00000170, + 0x0000000f, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, }; static void test_fx_4_1_blend_state(void) { ID3D10EffectBlendVariable *blend; + struct device_desc device_desc; ID3D10EffectVariable *v; D3D10_BLEND_DESC1 desc1; ID3D10BlendState1 *bs1; @@ -830,7 +846,11 @@ static void test_fx_4_1_blend_state(void) hr = create_effect(fx_4_1_test_blend_state, 0, device, NULL, &effect); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - if (FAILED(hr)) goto done; + if (FAILED(hr)) + { + ID3D10Device1_Release(device); + return; + } v = effect->lpVtbl->GetVariableByName(effect, "blend_state"); ok(v->lpVtbl->IsValid(v), "Invalid variable.\n"); @@ -942,9 +962,79 @@ static void test_fx_4_1_blend_state(void) ID3D10BlendState1_Release(bs1); ID3D10BlendState_Release(bs); - effect->lpVtbl->Release(effect); + refcount = effect->lpVtbl->Release(effect); + ok(!refcount, "Unexpected refcount %lu.\n", refcount); + + refcount = ID3D10Device1_Release(device); + ok(!refcount, "Device has %lu references left.\n", refcount); + + /* Using feature level 10.0 device. */ + device_desc.flags = 0; + device_desc.feature_level = D3D10_FEATURE_LEVEL_10_0; + + device = create_device(&device_desc); + ok(!!device, "Failed to create device.\n"); + + hr = create_effect(fx_4_1_test_blend_state, 0, device, NULL, &effect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + v = effect->lpVtbl->GetVariableByName(effect, "blend_state"); + ok(!v->lpVtbl->IsValid(v), "Unexpected variable.\n"); + + v = effect->lpVtbl->GetVariableByName(effect, "blend_state2"); + ok(v->lpVtbl->IsValid(v), "Unexpected variable.\n"); + blend = v->lpVtbl->AsBlend(v); + ok(blend->lpVtbl->IsValid(blend), "Invalid variable.\n"); + + memset(&desc, 0, sizeof(desc)); + hr = blend->lpVtbl->GetBackingStore(blend, 0, &desc); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!desc.AlphaToCoverageEnable, "Unexpected value %#x.\n", desc.AlphaToCoverageEnable); + ok(desc.BlendEnable[0], "Unexpected value %#x.\n", desc.BlendEnable[0]); + for (i = 1; i < ARRAY_SIZE(desc.BlendEnable); ++i) + ok(!desc.BlendEnable[i], "Unexpected value[%u] %#x.\n", i, desc.BlendEnable[i]); + ok(desc.SrcBlend == D3D10_BLEND_SRC_COLOR, "Unexpected value %u.\n", desc.SrcBlend); + ok(desc.DestBlend == D3D10_BLEND_ZERO, "Unexpected value %u.\n", desc.DestBlend); + ok(desc.BlendOp == D3D10_BLEND_OP_ADD, "Unexpected value %u.\n", desc.BlendOp); + ok(desc.SrcBlendAlpha == D3D10_BLEND_ONE, "Unexpected value %u.\n", desc.SrcBlendAlpha); + ok(desc.DestBlendAlpha == D3D10_BLEND_ZERO, "Unexpected value %u.\n", desc.DestBlendAlpha); + ok(desc.BlendOpAlpha == D3D10_BLEND_OP_ADD, "Unexpected value %u.\n", desc.BlendOpAlpha); + for (i = 0; i < ARRAY_SIZE(desc.RenderTargetWriteMask); ++i) + ok(desc.RenderTargetWriteMask[i] == D3D10_COLOR_WRITE_ENABLE_ALL, "Unexpected value[%u] %#x.\n", + i, desc.RenderTargetWriteMask[i]); + + /* Default state. */ + v = effect->lpVtbl->GetVariableByName(effect, "default_blend_state"); + ok(v->lpVtbl->IsValid(v), "Invalid variable.\n"); + blend = v->lpVtbl->AsBlend(v); + ok(blend->lpVtbl->IsValid(blend), "Invalid variable.\n"); + + memset(&desc, 0, sizeof(desc)); + hr = blend->lpVtbl->GetBackingStore(blend, 0, &desc); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!desc.AlphaToCoverageEnable, "Unexpected value %#x.\n", desc1.AlphaToCoverageEnable); + for (i = 0; i < ARRAY_SIZE(desc.BlendEnable); ++i) + ok(!desc.BlendEnable[i], "Unexpected value[%u] %#x.\n", i, desc.BlendEnable[i]); + ok(desc.SrcBlend == D3D10_BLEND_ONE, "Unexpected value %u.\n", desc.SrcBlend); + ok(desc.DestBlend == D3D10_BLEND_ZERO, "Unexpected value %u.\n", desc.DestBlend); + ok(desc.BlendOp == D3D10_BLEND_OP_ADD, "Unexpected value %u.\n", desc.BlendOp); + ok(desc.SrcBlendAlpha == D3D10_BLEND_ONE, "Unexpected value %u.\n", desc.SrcBlendAlpha); + ok(desc.DestBlendAlpha == D3D10_BLEND_ZERO, "Unexpected value %u.\n", desc.DestBlendAlpha); + ok(desc.BlendOpAlpha == D3D10_BLEND_OP_ADD, "Unexpected value %u.\n", desc.BlendOpAlpha); + for (i = 0; i < ARRAY_SIZE(desc.RenderTargetWriteMask); ++i) + ok(desc.RenderTargetWriteMask[i] == D3D10_COLOR_WRITE_ENABLE_ALL, "Unexpected value[%u] %#x.\n", + i, desc.RenderTargetWriteMask[i]); + + hr = blend->lpVtbl->GetBlendState(blend, 0, &bs); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID3D10BlendState_QueryInterface(bs, &IID_ID3D10BlendState1, (void **)&bs1); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ID3D10BlendState1_Release(bs1); + ID3D10BlendState_Release(bs); + + refcount = effect->lpVtbl->Release(effect); + ok(!refcount, "Unexpected refcount %lu.\n", refcount); -done: refcount = ID3D10Device1_Release(device); ok(!refcount, "Device has %lu references left.\n", refcount); }

1 0

Jacek Caban : d2d1/tests: Use D2D1_INTERPOLATION_MODE constants in DrawImage calls.
by Alexandre Julliard 20 Oct '23

20 Oct '23

Module: wine Branch: master Commit: a07fbb93072ff236ea3782f65a22dd76c765483b URL: https://gitlab.winehq.org/wine/wine/-/commit/a07fbb93072ff236ea3782f65a22dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 17 22:28:44 2023 +0200 d2d1/tests: Use D2D1_INTERPOLATION_MODE constants in DrawImage calls. --- dlls/d2d1/tests/d2d1.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 024886706c3..58f905ca1dc 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -2266,41 +2266,41 @@ static void test_bitmap_brush(BOOL d3d11) /* Crash on Windows 7+ */ if (0) { - ID2D1DeviceContext_DrawImage(context, NULL, NULL, NULL, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + ID2D1DeviceContext_DrawImage(context, NULL, NULL, NULL, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR, D2D1_COMPOSITE_MODE_SOURCE_OVER); } - ID2D1DeviceContext_DrawImage(context, image, NULL, NULL, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + ID2D1DeviceContext_DrawImage(context, image, NULL, NULL, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR, D2D1_COMPOSITE_MODE_SOURCE_OVER); set_rect(&src_rect, 0.0f, 0.0f, image_size.width, image_size.height); - ID2D1DeviceContext_DrawImage(context, image, NULL, &src_rect, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + ID2D1DeviceContext_DrawImage(context, image, NULL, &src_rect, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR, D2D1_COMPOSITE_MODE_SOURCE_OVER); offset.x = -1; offset.y = -1; - ID2D1DeviceContext_DrawImage(context, image, &offset, NULL, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + ID2D1DeviceContext_DrawImage(context, image, &offset, NULL, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR, D2D1_COMPOSITE_MODE_SOURCE_OVER); offset.x = image_size.width * 2; offset.y = image_size.height; - ID2D1DeviceContext_DrawImage(context, image, &offset, NULL, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + ID2D1DeviceContext_DrawImage(context, image, &offset, NULL, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR, D2D1_COMPOSITE_MODE_SOURCE_OVER); offset.x = image_size.width * 3; set_rect(&src_rect, image_size.width / 2, image_size.height / 2, image_size.width, image_size.height); - ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR, D2D1_COMPOSITE_MODE_SOURCE_OVER); offset.x = image_size.width * 4; set_rect(&src_rect, 0.0f, 0.0f, image_size.width * 2, image_size.height * 2); - ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR, D2D1_COMPOSITE_MODE_SOURCE_OVER); offset.x = image_size.width * 5; set_rect(&src_rect, image_size.width, image_size.height, 0.0f, 0.0f); - ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR, D2D1_COMPOSITE_MODE_SOURCE_OVER); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); @@ -2312,7 +2312,7 @@ static void test_bitmap_brush(BOOL d3d11) offset.x = image_size.width * 6; set_rect(&src_rect, 1.0f, 0.0f, 1.0f, image_size.height); - ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR, D2D1_COMPOSITE_MODE_SOURCE_OVER); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);

1 0

Jacek Caban : d2d1: Pass interpolation mode as D2D1_INTERPOLATION_MODE to d2d_device_context_draw_bitmap.
by Alexandre Julliard 20 Oct '23

20 Oct '23

Module: wine Branch: master Commit: f319d4ce8edb1803f536858f745372c4bfb0788b URL: https://gitlab.winehq.org/wine/wine/-/commit/f319d4ce8edb1803f536858f745372… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 17 22:30:48 2023 +0200 d2d1: Pass interpolation mode as D2D1_INTERPOLATION_MODE to d2d_device_context_draw_bitmap. --- dlls/d2d1/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index a8993e79d4d..e5548878ee9 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -2544,8 +2544,7 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawImage(ID2D1DeviceContext1 * if (SUCCEEDED(ID2D1Image_QueryInterface(image, &IID_ID2D1Bitmap, (void **)&bitmap))) { - d2d_device_context_draw_bitmap(context, bitmap, NULL, 1.0f, d2d1_1_interp_mode_from_d2d1(interpolation_mode), - image_rect, target_offset, NULL); + d2d_device_context_draw_bitmap(context, bitmap, NULL, 1.0f, interpolation_mode, image_rect, target_offset, NULL); ID2D1Bitmap_Release(bitmap); return;

1 0

Jacek Caban : d2d1: Don't cast D2D1_THREADING_MODE to D2D1_FACTORY_TYPE in D2D1CreateDevice.
by Alexandre Julliard 20 Oct '23

20 Oct '23

Module: wine Branch: master Commit: 6239db72ed4f00eb0c84105ed51fcea64b60bab3 URL: https://gitlab.winehq.org/wine/wine/-/commit/6239db72ed4f00eb0c84105ed51fce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 18 10:23:37 2023 +0200 d2d1: Don't cast D2D1_THREADING_MODE to D2D1_FACTORY_TYPE in D2D1CreateDevice. --- dlls/d2d1/factory.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index fff9895e930..3b2b1f5e4ec 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -1308,6 +1308,7 @@ HRESULT WINAPI D2D1CreateDevice(IDXGIDevice *dxgi_device, { D2D1_CREATION_PROPERTIES default_properties = {0}; D2D1_FACTORY_OPTIONS factory_options; + D2D1_FACTORY_TYPE factory_type; ID3D11Device *d3d_device; ID2D1Factory1 *factory; HRESULT hr; @@ -1325,9 +1326,20 @@ HRESULT WINAPI D2D1CreateDevice(IDXGIDevice *dxgi_device, properties = &default_properties; } + switch (properties->threadingMode) + { + case D2D1_THREADING_MODE_SINGLE_THREADED: + factory_type = D2D1_FACTORY_TYPE_SINGLE_THREADED; + break; + case D2D1_THREADING_MODE_MULTI_THREADED: + factory_type = D2D1_FACTORY_TYPE_MULTI_THREADED; + break; + default: + return E_INVALIDARG; + } + factory_options.debugLevel = properties->debugLevel; - if (FAILED(hr = D2D1CreateFactory(properties->threadingMode, - &IID_ID2D1Factory1, &factory_options, (void **)&factory))) + if (FAILED(hr = D2D1CreateFactory(factory_type, &IID_ID2D1Factory1, &factory_options, (void **)&factory))) return hr; hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, device);

1 0

Rémi Bernon : dmime: Avoid crashing when purging notification messages.
by Alexandre Julliard 20 Oct '23

20 Oct '23

Module: wine Branch: master Commit: 4d0c3d89a46029697cbc5414fc882cae3136b3d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/4d0c3d89a46029697cbc5414fc882c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 17 11:23:16 2023 +0200 dmime: Avoid crashing when purging notification messages. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55792 --- dlls/dmime/performance.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index a8fcd869331..a2e611523a6 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1783,6 +1783,7 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, do { previous = LIST_ENTRY(list_head(&This->notifications), struct message, entry); + if (This->notification_timeout <= 0) break; /* negative values may be used to keep everything */ if (message->msg.rtTime - previous->msg.rtTime <= This->notification_timeout) break; list_remove(&previous->entry); list_init(&previous->entry);

1 0

Rémi Bernon : dmime: Return S_OK from wave track SetParam GUID_UnloadFromAudioPath.
by Alexandre Julliard 20 Oct '23

20 Oct '23

Module: wine Branch: master Commit: 0431c88a9dffce2bd9360fc412e26ef913f8f974 URL: https://gitlab.winehq.org/wine/wine/-/commit/0431c88a9dffce2bd9360fc412e26e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 17 11:28:42 2023 +0200 dmime: Return S_OK from wave track SetParam GUID_UnloadFromAudioPath. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55792 --- dlls/dmime/wavetrack.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index def1e59fb23..79169a2a6fa 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -296,6 +296,8 @@ static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ item->buffer = NULL; } } + + return S_OK; } return DMUS_E_TYPE_UNSUPPORTED;

1 0

Rémi Bernon : dmime: Return hr from wave track SetParam GUID_DownloadToAudioPath.
by Alexandre Julliard 20 Oct '23

20 Oct '23

Module: wine Branch: master Commit: b1bfc52676cbb41e3fbc0f114588acc486028c7d URL: https://gitlab.winehq.org/wine/wine/-/commit/b1bfc52676cbb41e3fbc0f114588ac… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 17 11:29:18 2023 +0200 dmime: Return hr from wave track SetParam GUID_DownloadToAudioPath. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55792 --- dlls/dmime/wavetrack.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 79169a2a6fa..fcf57c1148d 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -273,6 +273,8 @@ static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ } } } + + return hr; } if (IsEqualGUID(type, &GUID_Enable_Auto_Download)) { FIXME("GUID_Enable_Auto_Download not handled yet\n");

1 0