November 2021 - Wine-Devel - list.winehq.org

[v2 PATCH] d3d11: Correctly handle optional arguments in OMGetBlendState().
by Nikolay Sivov Nov. 2, 2021

Nov. 2, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 14 ++++++++++++ dlls/d3d11/device.c | 37 ++++++++++++++++++++++---------- dlls/d3d11/tests/d3d11.c | 14 ++++++++++++ 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 6ec398269fa..b8338152bb7 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -5533,6 +5533,20 @@ float4 main(float4 color : COLOR) : SV_TARGET blend_factor[2] = 0.3f; blend_factor[3] = 0.4f; ID3D10Device_OMSetBlendState(device, blend_state, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); + /* OMGetBlendState() arguments are optional */ + ID3D10Device_OMGetBlendState(device, NULL, NULL, NULL); + ID3D10Device_OMGetBlendState(device, &tmp_blend_state, NULL, NULL); + ID3D10BlendState_Release(tmp_blend_state); + sample_mask = 0; + ID3D10Device_OMGetBlendState(device, NULL, NULL, &sample_mask); + ok(sample_mask == D3D10_DEFAULT_SAMPLE_MASK, "Unexpected sample mask %#x.\n", sample_mask); + memset(tmp_blend_factor, 0, sizeof(tmp_blend_factor)); + ID3D10Device_OMGetBlendState(device, NULL, tmp_blend_factor, NULL); + ok(tmp_blend_factor[0] == 0.1f && tmp_blend_factor[1] == 0.2f + && tmp_blend_factor[2] == 0.3f && tmp_blend_factor[3] == 0.4f, + "Got unexpected blend factor {%.8e, %.8e, %.8e, %.8e}.\n", + tmp_blend_factor[0], tmp_blend_factor[1], tmp_blend_factor[2], tmp_blend_factor[3]); + ID3D10Device_OMGetBlendState(device, &tmp_blend_state, tmp_blend_factor, &sample_mask); ok(tmp_blend_factor[0] == 0.1f && tmp_blend_factor[1] == 0.2f && tmp_blend_factor[2] == 0.3f && tmp_blend_factor[3] == 0.4f, diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8d88ee26222..417638bf314 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2190,20 +2190,26 @@ static void STDMETHODCALLTYPE d3d11_device_context_OMGetBlendState(ID3D11DeviceC struct d3d11_device_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_blend_state *wined3d_state; struct d3d_blend_state *blend_state_impl; + unsigned int tmp_sample_mask; + float tmp_blend_factor[4]; TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask %p.\n", iface, blend_state, blend_factor, sample_mask); wined3d_mutex_lock(); - if ((wined3d_state = wined3d_device_context_get_blend_state(context->wined3d_context, - (struct wined3d_color *)blend_factor, sample_mask))) + if (!blend_factor) blend_factor = tmp_blend_factor; + if (!sample_mask) sample_mask = &tmp_sample_mask; + wined3d_state = wined3d_device_context_get_blend_state(context->wined3d_context, + (struct wined3d_color *)blend_factor, sample_mask); + if (blend_state) { - blend_state_impl = wined3d_blend_state_get_parent(wined3d_state); - ID3D11BlendState_AddRef(*blend_state = &blend_state_impl->ID3D11BlendState_iface); - } - else - { - *blend_state = NULL; + if (wined3d_state) + { + blend_state_impl = wined3d_blend_state_get_parent(wined3d_state); + ID3D11BlendState_AddRef(*blend_state = &blend_state_impl->ID3D11BlendState_iface); + } + else + *blend_state = NULL; } wined3d_mutex_unlock(); } @@ -5541,10 +5547,19 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetBlendState(ID3D10Device1 *iface, d3d11_device_context_OMGetBlendState(&device->immediate_context.ID3D11DeviceContext1_iface, &d3d11_blend_state, blend_factor, sample_mask); + if (blend_state) + { + if (d3d11_blend_state) + { + *blend_state = (ID3D10BlendState *)&impl_from_ID3D11BlendState(d3d11_blend_state)->ID3D10BlendState1_iface; + ID3D10BlendState_AddRef(*blend_state); + } + else + *blend_state = NULL; + } + if (d3d11_blend_state) - *blend_state = (ID3D10BlendState *)&impl_from_ID3D11BlendState(d3d11_blend_state)->ID3D10BlendState1_iface; - else - *blend_state = NULL; + ID3D11BlendState_Release(d3d11_blend_state); } static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device1 *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 553caa10e46..2ed9aed490e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12608,6 +12608,20 @@ static void test_clear_state(void) ID3D11DeviceContext_OMGetDepthStencilState(context, &tmp_ds_state, NULL); ok(tmp_ds_state == ds_state, "Got unexpected depth stencil state %p, expected %p.\n", tmp_ds_state, ds_state); ID3D11DepthStencilState_Release(tmp_ds_state); + /* OMGetBlendState() arguments are optional */ + ID3D11DeviceContext_OMGetBlendState(context, NULL, NULL, NULL); + ID3D11DeviceContext_OMGetBlendState(context, &tmp_blend_state, NULL, NULL); + ok(tmp_blend_state == blend_state, "Got unexpected blend state %p, expected %p.\n", tmp_blend_state, blend_state); + ID3D11BlendState_Release(tmp_blend_state); + sample_mask = 0; + ID3D11DeviceContext_OMGetBlendState(context, NULL, NULL, &sample_mask); + ok(sample_mask == 0xff00ff00, "Got unexpected sample mask %#x.\n", sample_mask); + memset(blend_factor, 0, sizeof(blend_factor)); + ID3D11DeviceContext_OMGetBlendState(context, NULL, blend_factor, NULL); + ok(blend_factor[0] == 0.1f && blend_factor[1] == 0.2f + && blend_factor[2] == 0.3f && blend_factor[3] == 0.4f, + "Got unexpected blend factor {%.8e, %.8e, %.8e, %.8e}.\n", + blend_factor[0], blend_factor[1], blend_factor[2], blend_factor[3]); ID3D11DeviceContext_OMGetRenderTargets(context, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT, tmp_rtv, &tmp_dsv); for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT - 1; ++i) -- 2.33.0

3 2

[PATCH] kernel32: Correctly restore protection in set_entry_point().
by Paul Gofman Nov. 2, 2021

Nov. 2, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Passing NULL old protection results in VirtualProtect failure. dlls/kernel32/kernel_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 89394e16430..4467af739e0 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -65,7 +65,7 @@ static void set_entry_point( HMODULE module, const char *name, DWORD rva ) TRACE( "setting %s at %p to %08x\n", name, &functions[ordinal], rva ); VirtualProtect( functions + ordinal, sizeof(*functions), PAGE_READWRITE, &oldprot ); functions[ordinal] = rva; - VirtualProtect( functions + ordinal, sizeof(*functions), oldprot, NULL ); + VirtualProtect( functions + ordinal, sizeof(*functions), oldprot, &oldprot ); return; } if (res > 0) max = pos - 1; -- 2.31.1

1 0

[PATCH] winevulkan: Update to VK spec version 1.2.197.
by Georg Lehmann Nov. 2, 2021

Nov. 2, 2021

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 0a22834dc4d..e84442d7a79 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.196" +VK_XML_VERSION = "1.2.197" WINE_VK_VERSION = (1, 2) # Filenames to create. -- 2.33.1

1 0

[PATCH 1/5] ntdll: Allocate DDAG node for module.
by Paul Gofman Nov. 2, 2021

Nov. 2, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernel32/tests/module.c | 6 +++--- dlls/ntdll/loader.c | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index fd369ff33e9..7c4b690fb39 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -1358,7 +1358,7 @@ static void test_ddag_node(void) if (!(node = mod->DdagNode)) { - skip( "DdagNode is NULL, skipping tests.\n" ); + win_skip( "DdagNode is NULL, skipping tests.\n" ); return; } @@ -1376,11 +1376,11 @@ static void test_ddag_node(void) ok( !node->IncomingDependencies.Tail, "Expected empty incoming dependencies list.\n" ); /* node->Dependencies.Tail is NULL on Windows 10 1507-1607 32 bit test, maybe due to broken structure layout. */ - ok( !!node->Dependencies.Tail || broken( sizeof(void *) == 4 && !node->Dependencies.Tail), + todo_wine ok( !!node->Dependencies.Tail || broken( sizeof(void *) == 4 && !node->Dependencies.Tail ), "Expected nonempty dependencies list.\n" ); if (!node->Dependencies.Tail) { - win_skip( "Empty dependencies list.\n" ); + skip( "Empty dependencies list.\n" ); return; } ok( node->LoadCount == -1, "Got unexpected LoadCount %d.\n", node->LoadCount ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index dd41d6b66d2..c946b39574a 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1203,7 +1203,6 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) return status; } - /************************************************************************* * alloc_module * @@ -1232,6 +1231,16 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name RtlFreeHeap( GetProcessHeap(), 0, wm ); return NULL; } + + if (!(wm->ldr.DdagNode = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wm->ldr.DdagNode) ))) + { + RtlFreeHeap( GetProcessHeap(), 0, buffer ); + RtlFreeHeap( GetProcessHeap(), 0, wm ); + return NULL; + } + InitializeListHead(&wm->ldr.DdagNode->Modules); + InsertTailList(&wm->ldr.DdagNode->Modules, &wm->ldr.NodeModuleLink); + memcpy( buffer, nt_name->Buffer + 4 /* \??\ prefix */, nt_name->Length - 4 * sizeof(WCHAR) ); buffer[nt_name->Length/sizeof(WCHAR) - 4] = 0; if ((p = wcsrchr( buffer, '\\' ))) p++; @@ -3518,6 +3527,10 @@ static void free_modref( WINE_MODREF *wm ) if (wm->ldr.InInitializationOrderLinks.Flink) RemoveEntryList(&wm->ldr.InInitializationOrderLinks); + RemoveEntryList(&wm->ldr.NodeModuleLink); + if (IsListEmpty(&wm->ldr.DdagNode->Modules)) + RtlFreeHeap( GetProcessHeap(), 0, wm->ldr.DdagNode ); + TRACE(" unloading %s\n", debugstr_w(wm->ldr.FullDllName.Buffer)); if (!TRACE_ON(module)) TRACE_(loaddll)("Unloaded module %s : %s\n", -- 2.31.1

1 4

libFAudio-dev -build requirement
by Sveinar Søpler Nov. 2, 2021

Nov. 2, 2021

Hi I see now as of wine-devel-6.20, wine is built with /libs/faudio source as PE. I know the overall plan is to get distro's to provide the PE packages, but i would think this is still a bit ahead in time (atleast for some distro's) ref: [ https://github.com/wine-mirror/wine/commit/6b45777121fcd50d9b7d5b649c671006… | https://github.com/wine-mirror/wine/commit/6b45777121fcd50d9b7d5b649c671006… ] [ https://github.com/wine-mirror/wine/commit/d8be85863fedf6982944d06ebd1ce590… | https://github.com/wine-mirror/wine/commit/d8be85863fedf6982944d06ebd1ce590… ] and libs: Import code from upstream FAudio 21.10. xaudio: Use the bundled FAudio and build with msvcrt. Does this mean that libFAudio-dev requirement for package build on OBS can be dropped? Distro(s) in question is then Debian/Ubuntu, and packages would be wine-devel-6.21+ and wine-staging-6.21+ The note on libFAudio-21.11 also sais this: Deprecated Features: * GStreamer support is now deprecated. o Wine users should migrate to 6.20 and newer, and everyone else should move to codecs that are not patent-encumbered. o GStreamer support will be fully removed in the first release after Wine 7.0. Removed Features: * Removed the C++ wrapper. Use the headers/PE binaries found in Wine 6.20 and newer. PS. I am aware that libFAudio.so.0 would still be required for < wine-devel/staging-6.19 and wine-stable-6.0, but the above would (to me) indicate that configure no longer checks for the systemlib development package, and thus build-depends: libFAudio-dev could be dropped when building packages. Sveinar

2 1

[PATCH 2/2] comctl32/button: Use BS_PUSHLIKE instead of WS_EX_RIGHT in BUTTON_PositionRect().
by Zhiyi Zhang Nov. 2, 2021

Nov. 2, 2021

BS_PUSHLIKE and WS_EX_RIGHT have the same value and it was a typo to use WS_EX_RIGHT. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index b3331e179cd..fbe060513d2 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1122,7 +1122,7 @@ static void BUTTON_PositionRect(LONG style, const RECT *outerRect, RECT *innerRe INT width = innerRect->right - innerRect->left; INT height = innerRect->bottom - innerRect->top; - if ((style & WS_EX_RIGHT) && !(style & BS_CENTER)) style |= BS_CENTER; + if ((style & BS_PUSHLIKE) && !(style & BS_CENTER)) style |= BS_CENTER; if (!(style & BS_CENTER)) { -- 2.32.0

1 0

[PATCH 1/2] comctl32/button: Remove useless calculation for drawing group boxes.
by Zhiyi Zhang Nov. 2, 2021

Nov. 2, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index b576e6c6db6..b3331e179cd 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2113,10 +2113,6 @@ static void GB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) labelRect.right++; labelRect.bottom++; FillRect(hDC, &labelRect, hbr); - labelRect.left++; - labelRect.right--; - labelRect.bottom--; - BUTTON_DrawLabel(infoPtr, hDC, dtFlags, &imageRect, &textRect); } SelectClipRgn( hDC, hrgn ); -- 2.32.0

1 0

[PATCH 6/6] uxtheme: Implement GetThemeTransitionDuration().
by Zhiyi Zhang Nov. 2, 2021

Nov. 2, 2021

Fix Nokia SDK 2.0 for Java installer buttons not changing state after clicking. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/metric.c | 30 +++++++++++++++++++++++++++--- dlls/uxtheme/tests/system.c | 22 ++++------------------ 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c index b7c173740d7..3ef199bcca7 100644 --- a/dlls/uxtheme/metric.c +++ b/dlls/uxtheme/metric.c @@ -228,8 +228,32 @@ HRESULT WINAPI GetThemeSysString(HTHEME hTheme, int iStringID, HRESULT WINAPI GetThemeTransitionDuration(HTHEME hTheme, int iPartId, int iStateIdFrom, int iStateIdTo, int iPropId, DWORD *pdwDuration) { - FIXME("(%p, %u, %u, %u, %u, %p) stub\n", hTheme, iPartId, iStateIdFrom, iStateIdTo, - iPropId, pdwDuration); + INTLIST intlist; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p, %d, %d, %d, %d, %p)\n", hTheme, iPartId, iStateIdFrom, iStateIdTo, iPropId, + pdwDuration); + + if (!pdwDuration || iStateIdFrom < 1 || iStateIdTo < 1) + return E_INVALIDARG; + + hr = GetThemeIntList(hTheme, iPartId, 0, iPropId, &intlist); + if (FAILED(hr)) + { + if (hr == E_PROP_ID_UNSUPPORTED) + *pdwDuration = 0; + + return hr; + } + + if (intlist.iValueCount < 1 || iStateIdFrom > intlist.iValues[0] + || iStateIdTo > intlist.iValues[0] + || intlist.iValueCount != 1 + intlist.iValues[0] * intlist.iValues[0]) + { + *pdwDuration = 0; + return E_INVALIDARG; + } + + *pdwDuration = intlist.iValues[1 + intlist.iValues[0] * (iStateIdFrom - 1) + (iStateIdTo - 1)]; + return S_OK; } diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 57901e6affb..10857115061 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1329,74 +1329,64 @@ static void test_GetThemeTransitionDuration(void) duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(NULL, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, TMT_TRANSITIONDURATIONS, &duration); - todo_wine ok(hr == E_HANDLE, "GetThemeTransitionDuration failed, hr %#x.\n", hr); ok(duration == 0xdeadbeef, "Expected duration %#x, got %#x.\n", 0xdeadbeef, duration); + /* Crash on Wine. HTHEME is not a pointer that can be directly referenced. */ + if (strcmp(winetest_platform, "wine")) + { duration = 0xdeadbeef; hr = pGetThemeTransitionDuration((HTHEME)0xdeadbeef, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, TMT_TRANSITIONDURATIONS, &duration); todo_wine ok(hr == E_HANDLE, "GetThemeTransitionDuration failed, hr %#x.\n", hr); ok(duration == 0xdeadbeef, "Expected duration %#x, got %#x.\n", 0xdeadbeef, duration); + } duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, 0xdeadbeef, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, TMT_TRANSITIONDURATIONS, &duration); - todo_wine ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeTransitionDuration failed, hr %#x.\n", hr); - todo_wine ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL - 1, PBS_DEFAULTED_ANIMATING, TMT_TRANSITIONDURATIONS, &duration); - todo_wine ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); ok(duration == 0xdeadbeef, "Expected duration %#x, got %#x.\n", 0xdeadbeef, duration); duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING + 1, PBS_DEFAULTED_ANIMATING, TMT_TRANSITIONDURATIONS, &duration); - todo_wine ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); - todo_wine ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_NORMAL - 1, TMT_TRANSITIONDURATIONS, &duration); - todo_wine ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); ok(duration == 0xdeadbeef, "Expected duration %#x, got %#x.\n", 0xdeadbeef, duration); duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING + 1, TMT_TRANSITIONDURATIONS, &duration); - todo_wine ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); - todo_wine ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, TMT_BACKGROUND, &duration); - todo_wine ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeTransitionDuration failed, hr %#x.\n", hr); - todo_wine ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, 0xdeadbeef, &duration); - todo_wine ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeTransitionDuration failed, hr %#x.\n", hr); - todo_wine ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, TMT_TRANSITIONDURATIONS, NULL); - todo_wine ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); /* Parts that don't have TMT_TRANSITIONDURATIONS */ @@ -1406,9 +1396,7 @@ static void test_GetThemeTransitionDuration(void) duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, BP_GROUPBOX, GBS_NORMAL, GBS_DISABLED, TMT_TRANSITIONDURATIONS, &duration); - todo_wine ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeTransitionDuration failed, hr %#x.\n", hr); - todo_wine ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); /* Test parsing TMT_TRANSITIONDURATIONS property. TMT_TRANSITIONDURATIONS is a vista+ property */ @@ -1436,10 +1424,8 @@ static void test_GetThemeTransitionDuration(void) duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, from_state, to_state, TMT_TRANSITIONDURATIONS, &duration); - todo_wine ok(hr == S_OK, "GetThemeTransitionDuration failed, hr %#x.\n", hr); expected = intlist.iValues[1 + intlist.iValues[0] * (from_state - 1) + (to_state - 1)]; - todo_wine ok(duration == expected, "Expected duration %d, got %d.\n", expected, duration); winetest_pop_context(); -- 2.32.0

1 0

[PATCH 5/6] uxtheme/tests: Add GetThemeTransitionDuration() tests.
by Zhiyi Zhang Nov. 2, 2021

Nov. 2, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/tests/system.c | 154 ++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 541d46deeaa..57901e6affb 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -43,6 +43,7 @@ static HDC (WINAPI *pGetBufferedPaintDC)(HPAINTBUFFER); static HDC (WINAPI *pGetBufferedPaintTargetDC)(HPAINTBUFFER); 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 LONG (WINAPI *pDisplayConfigGetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); static LONG (WINAPI *pDisplayConfigSetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); @@ -81,6 +82,7 @@ static void init_funcs(void) GET_PROC(uxtheme, GetBufferedPaintTargetDC) GET_PROC(uxtheme, GetBufferedPaintTargetRect) GET_PROC(uxtheme, GetThemeIntList) + GET_PROC(uxtheme, GetThemeTransitionDuration) GET_PROC(uxtheme, OpenThemeDataEx) GET_PROC(uxtheme, OpenThemeDataForDpi) @@ -1299,6 +1301,157 @@ static void test_GetThemeIntList(void) DestroyWindow(hwnd); } +static void test_GetThemeTransitionDuration(void) +{ + int from_state, to_state, expected; + INTLIST intlist; + DWORD duration; + HTHEME theme; + HRESULT hr; + HWND hwnd; + + if (!pGetThemeTransitionDuration || !pGetThemeIntList) + { + win_skip("GetThemeTransitionDuration or GetThemeIntList is unavailable.\n"); + return; + } + + hwnd = CreateWindowA("static", "", WS_POPUP, 0, 0, 100, 100, 0, 0, 0, NULL); + theme = OpenThemeData(hwnd, L"Button"); + if (!theme) + { + skip("Theming is not active.\n"); + DestroyWindow(hwnd); + return; + } + + /* Invalid parameter tests */ + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(NULL, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, + TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == E_HANDLE, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + ok(duration == 0xdeadbeef, "Expected duration %#x, got %#x.\n", 0xdeadbeef, duration); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration((HTHEME)0xdeadbeef, BP_PUSHBUTTON, PBS_NORMAL, + PBS_DEFAULTED_ANIMATING, TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == E_HANDLE, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + ok(duration == 0xdeadbeef, "Expected duration %#x, got %#x.\n", 0xdeadbeef, duration); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, 0xdeadbeef, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, + TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + todo_wine + ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL - 1, PBS_DEFAULTED_ANIMATING, + TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + ok(duration == 0xdeadbeef, "Expected duration %#x, got %#x.\n", 0xdeadbeef, duration); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING + 1, + PBS_DEFAULTED_ANIMATING, TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + todo_wine + ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_NORMAL - 1, + TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + ok(duration == 0xdeadbeef, "Expected duration %#x, got %#x.\n", 0xdeadbeef, duration); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING + 1, + TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + todo_wine + ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, + TMT_BACKGROUND, &duration); + todo_wine + ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + todo_wine + ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, + 0xdeadbeef, &duration); + todo_wine + ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + todo_wine + ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); + + hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, + TMT_TRANSITIONDURATIONS, NULL); + todo_wine + ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + + /* Parts that don't have TMT_TRANSITIONDURATIONS */ + hr = GetThemeIntList(theme, BP_GROUPBOX, GBS_NORMAL, TMT_TRANSITIONDURATIONS, &intlist); + ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeIntList failed, hr %#x.\n", hr); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, BP_GROUPBOX, GBS_NORMAL, GBS_DISABLED, + TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + todo_wine + ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); + + /* Test parsing TMT_TRANSITIONDURATIONS property. TMT_TRANSITIONDURATIONS is a vista+ property */ + if (LOBYTE(LOWORD(GetVersion())) < 6) + goto done; + + hr = pGetThemeIntList(theme, BP_PUSHBUTTON, PBS_NORMAL, TMT_TRANSITIONDURATIONS, &intlist); + ok(hr == S_OK, "GetThemeIntList failed, hr %#x.\n", hr); + /* The first value is the theme part state count. The following are the values from every state + * to every state. So the total value count should be 1 + state ^ 2 */ + expected = PBS_DEFAULTED_ANIMATING - PBS_NORMAL + 1; + ok(intlist.iValues[0] == expected, "Expected the first value %d, got %d.\n", expected, + intlist.iValues[0]); + expected = 1 + intlist.iValues[0] * intlist.iValues[0]; + ok(intlist.iValueCount == expected, "Expected value count %d, got %d.\n", expected, + intlist.iValueCount); + if (hr == S_OK) + { + for (from_state = PBS_NORMAL; from_state <= PBS_DEFAULTED_ANIMATING; ++from_state) + { + for (to_state = PBS_NORMAL; to_state <= PBS_DEFAULTED_ANIMATING; ++to_state) + { + winetest_push_context("from state %d to %d", from_state, to_state); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, from_state, to_state, + TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == S_OK, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + expected = intlist.iValues[1 + intlist.iValues[0] * (from_state - 1) + (to_state - 1)]; + todo_wine + ok(duration == expected, "Expected duration %d, got %d.\n", expected, duration); + + winetest_pop_context(); + } + } + } + +done: + CloseThemeData(theme); + DestroyWindow(hwnd); +} + START_TEST(system) { init_funcs(); @@ -1319,6 +1472,7 @@ START_TEST(system) test_CloseThemeData(); test_buffered_paint(); test_GetThemeIntList(); + test_GetThemeTransitionDuration(); /* Test EnableTheming() in the end because it may disable theming */ test_EnableTheming(); -- 2.32.0

1 0

[PATCH 4/6] light.msstyles: Add TMT_TRANSITIONDURATIONS property.
by Zhiyi Zhang Nov. 2, 2021

Nov. 2, 2021

Set all transition duration to 100ms for different states and 0ms for the same state. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 193 +++++++++++++++++++++++++++++++++++ dlls/uxtheme/tests/system.c | 1 - 2 files changed, 193 insertions(+), 1 deletion(-) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index cf9271cb612..aad8aa51d09 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -194,6 +194,13 @@ BLUE_INI TEXTFILE "ImageLayout = Vertical\r\n" "TextColor = 0 0 0\r\n" "MinSize = 10, 5\r\n" +"TransitionDurations = 6, " +"0, 100, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, 100, " +"100, 100, 0, 100, 100, 100, " +"100, 100, 100, 0, 100, 100, " +"100, 100, 100, 100, 0, 100, " +"100, 100, 100, 100, 100, 0\r\n" "[Button.Pushbutton(Pressed)]\r\n" "TextColor = 255 255 255\r\n" @@ -227,6 +234,27 @@ BLUE_INI TEXTFILE "MinDpi5 = 192\r\n" "MinDpi6 = 216\r\n" "MinDpi7 = 240\r\n" +"TransitionDurations = 20, " +"0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, " +"100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, " +"100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, " +"100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, " +"100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, " +"100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, " +"100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, " +"100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, " +"100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, " +"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, " +"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, " +"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, " +"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, " +"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, " +"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, " +"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, " +"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, " +"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, " +"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0\r\n" "[Button.Checkbox(Checkeddisabled)]\r\n" "TextColor = 189 189 189\r\n" @@ -262,6 +290,15 @@ BLUE_INI TEXTFILE "MinDpi5 = 192\r\n" "MinDpi6 = 216\r\n" "MinDpi7 = 240\r\n" +"TransitionDurations = 8, " +"0, 100, 100, 100, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, 100, 100, 100, " +"100, 100, 0, 100, 100, 100, 100, 100, " +"100, 100, 100, 0, 100, 100, 100, 100, " +"100, 100, 100, 100, 0, 100, 100, 100, " +"100, 100, 100, 100, 100, 0, 100, 100, " +"100, 100, 100, 100, 100, 100, 0, 100, " +"100, 100, 100, 100, 100, 100, 100, 0\r\n" "[Button.Radiobutton(Checkeddisabled)]\r\n" "TextColor = 189 189 189\r\n" @@ -292,6 +329,13 @@ BLUE_INI TEXTFILE "Transparent = True\r\n" "TextColor = 0 0 0\r\n" "MinSize = 10, 5\r\n" +"TransitionDurations = 6, " +"0, 100, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, 100, " +"100, 100, 0, 100, 100, 100, " +"100, 100, 100, 0, 100, 100, " +"100, 100, 100, 100, 0, 100, " +"100, 100, 100, 100, 100, 0\r\n" "[Button.Commandlink(Hot)]\r\n" "TextColor = 48 150 250\r\n" @@ -333,6 +377,11 @@ BLUE_INI TEXTFILE "BorderSize = 1\r\n" "FillColor = 255 255 255\r\n" "BorderColor = 174 174 174\r\n" +"TransitionDurations = 4, " +"0, 100, 100, 100, " +"100, 0, 100, 100, " +"100, 100, 0, 100, " +"100, 100, 100, 0\r\n" "[ComboBox(Disabled)]\r\n" "BorderColor = 228 228 228\r\n" @@ -350,6 +399,11 @@ BLUE_INI TEXTFILE "GlyphImageFile = blue_combobutton_glyph.bmp\r\n" "GlyphTransparent = True\r\n" "Transparent = True\r\n" +"TransitionDurations = 4, " +"0, 100, 100, 100, " +"100, 0, 100, 100, " +"100, 100, 0, 100, " +"100, 100, 100, 0\r\n" "\r\n; Edit\r\n" "[Edit]\r\n" @@ -492,6 +546,14 @@ BLUE_INI TEXTFILE "VAlign = Top\r\n" "\r\n; Scroll Bar\r\n" +"[ScrollBar]\r\n" +"TransitionDurations = 5, " +"0, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, " +"100, 100, 0, 100, 100, " +"100, 100, 100, 0, 100, " +"100, 100, 100, 100, 0\r\n" + "[ScrollBar.ArrowBtn]\r\n" "BgType = ImageFile\r\n" "SizingMargins = 5, 5, 5, 5\r\n" @@ -601,6 +663,11 @@ BLUE_INI TEXTFILE "GlyphType = ImageGlyph\r\n" "GlyphImageFile = blue_spin_glyph_up.bmp\r\n" "GlyphTransparent = True\r\n" +"TransitionDurations = 4, " +"0, 100, 100, 100, " +"100, 0, 100, 100, " +"100, 100, 0, 100, " +"100, 100, 100, 0\r\n" "[Spin.Down]\r\n" "BgType = ImageFile\r\n" @@ -613,6 +680,11 @@ BLUE_INI TEXTFILE "GlyphType = ImageGlyph\r\n" "GlyphImageFile = blue_spin_glyph_down.bmp\r\n" "GlyphTransparent = True\r\n" +"TransitionDurations = 4, " +"0, 100, 100, 100, " +"100, 0, 100, 100, " +"100, 100, 0, 100, " +"100, 100, 100, 0\r\n" "[Spin.Uphorz]\r\n" "BgType = ImageFile\r\n" @@ -625,6 +697,11 @@ BLUE_INI TEXTFILE "GlyphType = ImageGlyph\r\n" "GlyphImageFile = blue_spin_glyph_right.bmp\r\n" "GlyphTransparent = True\r\n" +"TransitionDurations = 4, " +"0, 100, 100, 100, " +"100, 0, 100, 100, " +"100, 100, 0, 100, " +"100, 100, 100, 0\r\n" "[Spin.Downhorz]\r\n" "BgType = ImageFile\r\n" @@ -637,6 +714,11 @@ BLUE_INI TEXTFILE "GlyphType = ImageGlyph\r\n" "GlyphImageFile = blue_spin_glyph_left.bmp\r\n" "GlyphTransparent = True\r\n" +"TransitionDurations = 4, " +"0, 100, 100, 100, " +"100, 0, 100, 100, " +"100, 100, 0, 100, " +"100, 100, 100, 0\r\n" "\r\n; Status\r\n" "[Status]\r\n" @@ -703,6 +785,12 @@ BLUE_INI TEXTFILE "ImageFile = blue_tab_item.bmp\r\n" "ImageCount = 5\r\n" "ImageLayout = Vertical\r\n" +"TransitionDurations = 5, " +"0, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, " +"100, 100, 0, 100, 100, " +"100, 100, 100, 0, 100, " +"100, 100, 100, 100, 0\r\n" "[Tab.TabItemLeftEdge]\r\n" "SizingMargins = 2, 2, 6, 6\r\n" @@ -712,6 +800,12 @@ BLUE_INI TEXTFILE "ImageCount = 5\r\n" "ImageLayout = Vertical\r\n" "Transparent = True\r\n" +"TransitionDurations = 5, " +"0, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, " +"100, 100, 0, 100, 100, " +"100, 100, 100, 0, 100, " +"100, 100, 100, 100, 0\r\n" "[Tab.TabItemRightEdge]\r\n" "SizingMargins = 2, 2, 6, 6\r\n" @@ -721,6 +815,12 @@ BLUE_INI TEXTFILE "ImageCount = 5\r\n" "ImageLayout = Vertical\r\n" "Transparent = True\r\n" +"TransitionDurations = 5, " +"0, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, " +"100, 100, 0, 100, 100, " +"100, 100, 100, 0, 100, " +"100, 100, 100, 100, 0\r\n" "[Tab.TabItemBothEdge]\r\n" "SizingMargins = 2, 2, 6, 6\r\n" @@ -729,6 +829,12 @@ BLUE_INI TEXTFILE "ImageFile = blue_tab_item.bmp\r\n" "ImageCount = 5\r\n" "ImageLayout = Vertical\r\n" +"TransitionDurations = 5, " +"0, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, " +"100, 100, 0, 100, 100, " +"100, 100, 100, 0, 100, " +"100, 100, 100, 100, 0\r\n" "[Tab.TopTabItem]\r\n" "SizingMargins = 2, 2, 6, 6\r\n" @@ -738,6 +844,12 @@ BLUE_INI TEXTFILE "ImageCount = 5\r\n" "ImageLayout = Vertical\r\n" "Transparent = True\r\n" +"TransitionDurations = 5, " +"0, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, " +"100, 100, 0, 100, 100, " +"100, 100, 100, 0, 100, " +"100, 100, 100, 100, 0\r\n" "[Tab.TopTabItemLeftEdge]\r\n" "SizingMargins = 2, 2, 6, 6\r\n" @@ -747,6 +859,12 @@ BLUE_INI TEXTFILE "ImageCount = 5\r\n" "ImageLayout = Vertical\r\n" "Transparent = True\r\n" +"TransitionDurations = 5, " +"0, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, " +"100, 100, 0, 100, 100, " +"100, 100, 100, 0, 100, " +"100, 100, 100, 100, 0\r\n" "[Tab.TopTabItemRightEdge]\r\n" "SizingMargins = 2, 2, 6, 6\r\n" @@ -756,6 +874,12 @@ BLUE_INI TEXTFILE "ImageCount = 5\r\n" "ImageLayout = Vertical\r\n" "Transparent = True\r\n" +"TransitionDurations = 5, " +"0, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, " +"100, 100, 0, 100, 100, " +"100, 100, 100, 0, 100, " +"100, 100, 100, 100, 0\r\n" "[Tab.TopTabItemBothEdge]\r\n" "SizingMargins = 2, 2, 6, 6\r\n" @@ -765,6 +889,12 @@ BLUE_INI TEXTFILE "ImageCount = 5\r\n" "ImageLayout = Vertical\r\n" "Transparent = True\r\n" +"TransitionDurations = 5, " +"0, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, " +"100, 100, 0, 100, 100, " +"100, 100, 100, 0, 100, " +"100, 100, 100, 100, 0\r\n" "[Tab.Body]\r\n" "BgType = ImageFile\r\n" @@ -776,6 +906,15 @@ BLUE_INI TEXTFILE "BorderSize = 0\r\n" "FillColor = 244 244 244\r\n" "TextColor = 0 0 0\r\n" +"TransitionDurations = 8, " +"0, 100, 100, 100, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, 100, 100, 100, " +"100, 100, 0, 100, 100, 100, 100, 100, " +"100, 100, 100, 0, 100, 100, 100, 100, " +"100, 100, 100, 100, 0, 100, 100, 100, " +"100, 100, 100, 100, 100, 0, 100, 100, " +"100, 100, 100, 100, 100, 100, 0, 100, " +"100, 100, 100, 100, 100, 100, 100, 0\r\n" "[Toolbar(Pressed)]\r\n" "TextColor = 0 0 0\r\n" @@ -789,6 +928,15 @@ BLUE_INI TEXTFILE "ImageCount = 6\r\n" "SizingType = Stretch\r\n" "Transparent = True\r\n" +"TransitionDurations = 8, " +"0, 100, 100, 100, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, 100, 100, 100, " +"100, 100, 0, 100, 100, 100, 100, 100, " +"100, 100, 100, 0, 100, 100, 100, 100, " +"100, 100, 100, 100, 0, 100, 100, 100, " +"100, 100, 100, 100, 100, 0, 100, 100, " +"100, 100, 100, 100, 100, 100, 0, 100, " +"100, 100, 100, 100, 100, 100, 100, 0\r\n" "[Toolbar.Separator]\r\n" "SizingMargins = 5, 2, 2, 1\r\n" @@ -797,6 +945,15 @@ BLUE_INI TEXTFILE "ImageCount = 1\r\n" "SizingType = Tile\r\n" "Transparent = True\r\n" +"TransitionDurations = 8, " +"0, 100, 100, 100, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, 100, 100, 100, " +"100, 100, 0, 100, 100, 100, 100, 100, " +"100, 100, 100, 0, 100, 100, 100, 100, " +"100, 100, 100, 100, 0, 100, 100, 100, " +"100, 100, 100, 100, 100, 0, 100, 100, " +"100, 100, 100, 100, 100, 100, 0, 100, " +"100, 100, 100, 100, 100, 100, 100, 0\r\n" "[Toolbar.SeparatorVert]\r\n" "SizingMargins = 2, 1, 5, 1\r\n" @@ -805,6 +962,15 @@ BLUE_INI TEXTFILE "ImageCount = 1\r\n" "SizingType = Tile\r\n" "Transparent = True\r\n" +"TransitionDurations = 8, " +"0, 100, 100, 100, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, 100, 100, 100, " +"100, 100, 0, 100, 100, 100, 100, 100, " +"100, 100, 100, 0, 100, 100, 100, 100, " +"100, 100, 100, 100, 0, 100, 100, 100, " +"100, 100, 100, 100, 100, 0, 100, 100, " +"100, 100, 100, 100, 100, 100, 0, 100, " +"100, 100, 100, 100, 100, 100, 100, 0\r\n" "[Toolbar.DropdownButton]\r\n" "SizingMargins = 4, 4, 4, 4\r\n" @@ -815,6 +981,15 @@ BLUE_INI TEXTFILE "ImageCount = 6\r\n" "SizingType = Stretch\r\n" "Transparent = True\r\n" +"TransitionDurations = 8, " +"0, 100, 100, 100, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, 100, 100, 100, " +"100, 100, 0, 100, 100, 100, 100, 100, " +"100, 100, 100, 0, 100, 100, 100, 100, " +"100, 100, 100, 100, 0, 100, 100, 100, " +"100, 100, 100, 100, 100, 0, 100, 100, " +"100, 100, 100, 100, 100, 100, 0, 100, " +"100, 100, 100, 100, 100, 100, 100, 0\r\n" "[Toolbar.SplitButton]\r\n" "SizingMargins = 3, 2, 3, 3\r\n" @@ -824,6 +999,15 @@ BLUE_INI TEXTFILE "ImageCount = 6\r\n" "SizingType = Stretch\r\n" "Transparent = True\r\n" +"TransitionDurations = 8, " +"0, 100, 100, 100, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, 100, 100, 100, " +"100, 100, 0, 100, 100, 100, 100, 100, " +"100, 100, 100, 0, 100, 100, 100, 100, " +"100, 100, 100, 100, 0, 100, 100, 100, " +"100, 100, 100, 100, 100, 0, 100, 100, " +"100, 100, 100, 100, 100, 100, 0, 100, " +"100, 100, 100, 100, 100, 100, 100, 0\r\n" "[Toolbar.SplitButtonDropdown]\r\n" "SizingMargins = 1, 3, 3, 3\r\n" @@ -836,6 +1020,15 @@ BLUE_INI TEXTFILE "GlyphType = ImageGlyph\r\n" "GlyphImageFile = blue_toolbar_buttons_split_dropdown_glyph.bmp\r\n" "GlyphTransparent = True\r\n" +"TransitionDurations = 8, " +"0, 100, 100, 100, 100, 100, 100, 100, " +"100, 0, 100, 100, 100, 100, 100, 100, " +"100, 100, 0, 100, 100, 100, 100, 100, " +"100, 100, 100, 0, 100, 100, 100, 100, " +"100, 100, 100, 100, 0, 100, 100, 100, " +"100, 100, 100, 100, 100, 0, 100, 100, " +"100, 100, 100, 100, 100, 100, 0, 100, " +"100, 100, 100, 100, 100, 100, 100, 0\r\n" "\r\n; TrackBar\r\n" "[TrackBar]\r\n" diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 7992911bc19..541d46deeaa 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1293,7 +1293,6 @@ static void test_GetThemeIntList(void) if (LOBYTE(LOWORD(GetVersion())) < 6) ok(hr == E_PROP_ID_UNSUPPORTED, "Expected %#x, got %#x.\n", E_PROP_ID_UNSUPPORTED, hr); else - todo_wine ok(hr == S_OK, "GetThemeIntList failed, hr %#x.\n", hr); CloseThemeData(theme); -- 2.32.0

1 0