June 2022 - Wine-Commits - list.winehq.org

Nikolay Sivov : d2d1: Move effect object creation to effect.c.
by Alexandre Julliard June 27, 2022

June 27, 2022

Module: wine Branch: master Commit: c172b89588abef7c2fc4b26a5af843e817acbf0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c172b89588abef7c2fc4b26a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 26 14:13:02 2022 +0300 d2d1: Move effect object creation to effect.c. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 4 ++-- dlls/d2d1/device.c | 28 +--------------------------- dlls/d2d1/effect.c | 43 ++++++++++++++++++++++++++++++++----------- 3 files changed, 35 insertions(+), 40 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 9be553c72d8..82c0b91e06d 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -624,8 +624,8 @@ struct d2d_effect size_t input_count; }; -HRESULT d2d_effect_init(struct d2d_effect *effect, - struct d2d_effect_context *effect_context, const CLSID *effect_id) DECLSPEC_HIDDEN; +HRESULT d2d_effect_create(struct d2d_device_context *context, const CLSID *effect_id, + ID2D1Effect **effect) DECLSPEC_HIDDEN; static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 04a31992ba2..dc29f3b7cb6 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1946,36 +1946,10 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceCont REFCLSID effect_id, ID2D1Effect **effect) { struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); - struct d2d_effect_context *effect_context; - struct d2d_effect *object; - HRESULT hr; TRACE("iface %p, effect_id %s, effect %p.\n", iface, debugstr_guid(effect_id), effect); - if (!(effect_context = calloc(1, sizeof(*effect_context)))) - return E_OUTOFMEMORY; - d2d_effect_context_init(effect_context, context); - - if (!(object = calloc(1, sizeof(*object)))) - { - ID2D1EffectContext_Release(&effect_context->ID2D1EffectContext_iface); - return E_OUTOFMEMORY; - } - - hr = d2d_effect_init(object, effect_context, effect_id); - ID2D1EffectContext_Release(&effect_context->ID2D1EffectContext_iface); - if (FAILED(hr)) - { - WARN("Failed to initialise effect, hr %#lx.\n", hr); - free(object); - return hr; - } - - *effect = &object->ID2D1Effect_iface; - - TRACE("Created effect %p.\n", *effect); - - return S_OK; + return d2d_effect_create(context, effect_id, effect); } static HRESULT STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_CreateGradientStopCollection( diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index f1b877821c8..688f1055791 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -753,26 +753,47 @@ static const ID2D1ImageVtbl d2d_effect_image_vtbl = d2d_effect_image_GetFactory, }; -HRESULT d2d_effect_init(struct d2d_effect *effect, struct d2d_effect_context *effect_context, const CLSID *effect_id) +HRESULT d2d_effect_create(struct d2d_device_context *context, const CLSID *effect_id, + ID2D1Effect **effect) { + struct d2d_effect_context *effect_context; + struct d2d_effect *object; unsigned int i; - effect->ID2D1Effect_iface.lpVtbl = &d2d_effect_vtbl; - effect->ID2D1Image_iface.lpVtbl = &d2d_effect_image_vtbl; - effect->refcount = 1; + if (!(effect_context = calloc(1, sizeof(*effect_context)))) + return E_OUTOFMEMORY; + d2d_effect_context_init(effect_context, context); + + if (!(object = calloc(1, sizeof(*object)))) + { + ID2D1EffectContext_Release(&effect_context->ID2D1EffectContext_iface); + return E_OUTOFMEMORY; + } + + object->ID2D1Effect_iface.lpVtbl = &d2d_effect_vtbl; + object->ID2D1Image_iface.lpVtbl = &d2d_effect_image_vtbl; + object->refcount = 1; + object->effect_context = effect_context; for (i = 0; i < ARRAY_SIZE(builtin_effects); ++i) { if (IsEqualGUID(effect_id, builtin_effects[i].clsid)) { - effect->info = &builtin_effects[i]; - d2d_effect_SetInputCount(&effect->ID2D1Effect_iface, effect->info->default_input_count); - effect->effect_context = effect_context; - ID2D1EffectContext_AddRef(&effect_context->ID2D1EffectContext_iface); - return S_OK; + object->info = &builtin_effects[i]; + d2d_effect_SetInputCount(&object->ID2D1Effect_iface, object->info->default_input_count); + break; } } - WARN("Unsupported effect clsid %s.\n", debugstr_guid(effect_id)); - return E_FAIL; + if (i == ARRAY_SIZE(builtin_effects)) + { + ID2D1Effect_Release(&object->ID2D1Effect_iface); + return E_FAIL; + } + + *effect = &object->ID2D1Effect_iface; + + TRACE("Created effect %p.\n", *effect); + + return S_OK; }

1 0

Zhiyi Zhang : uxtheme/tests: Add GetThemeBackgroundRegion() tests.
by Alexandre Julliard June 27, 2022

June 27, 2022

Module: wine Branch: master Commit: 9fa5f83ad30e0e49c56e4b8161c646b5f62bf9c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fa5f83ad30e0e49c56e4b81… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 23 17:37:06 2022 +0800 uxtheme/tests: Add GetThemeBackgroundRegion() tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/tests/system.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index cbaf4b51258..e9c91c62638 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -2399,6 +2399,40 @@ static void test_DrawThemeBackgroundEx(void) DestroyWindow(hwnd); } +static void test_GetThemeBackgroundRegion(void) +{ + HTHEME htheme; + HRGN region; + HRESULT hr; + HWND hwnd; + RECT rect; + int ret; + + hwnd = CreateWindowA(WC_STATICA, "", WS_POPUP, 0, 0, 1, 1, 0, 0, 0, NULL); + ok(hwnd != NULL, "CreateWindowA failed, error %#lx.\n", GetLastError()); + htheme = OpenThemeData(hwnd, L"Rebar"); + if (!htheme) + { + skip("Theming is inactive.\n"); + DestroyWindow(hwnd); + return; + } + + hr = GetThemeEnumValue(htheme, RP_BAND, 0, TMT_BGTYPE, &ret); + ok(hr == S_OK, "Got unexpected hr %#lx,\n", hr); + ok(ret == BT_NONE, "Got expected type %d.\n", ret); + + SetRect(&rect, 0, 0, 10, 10); + region = (HRGN)0xdeadbeef; + hr = GetThemeBackgroundRegion(htheme, NULL, RP_BAND, 0, &rect, &region); + todo_wine + ok(hr == E_UNEXPECTED || broken(hr == S_OK) /* < Win10 */, "Got unexpected hr %#lx.\n", hr); + ok(region == (HRGN)0xdeadbeef, "Got unexpected region.\n"); + + CloseThemeData(htheme); + DestroyWindow(hwnd); +} + START_TEST(system) { ULONG_PTR ctx_cookie; @@ -2422,6 +2456,7 @@ START_TEST(system) test_GetThemeTransitionDuration(); test_DrawThemeParentBackground(); test_DrawThemeBackgroundEx(); + test_GetThemeBackgroundRegion(); if (load_v6_module(&ctx_cookie, &ctx)) {

1 0

Zhiyi Zhang : uxtheme: Handle BT_NONE in GetThemeBackgroundRegion().
by Alexandre Julliard June 27, 2022

June 27, 2022

Module: wine Branch: master Commit: 5d5853e3edded8cdafe1ea984162254dd2e54a25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d5853e3edded8cdafe1ea98… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 1 16:57:39 2022 +0800 uxtheme: Handle BT_NONE in GetThemeBackgroundRegion(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 6 +++++- dlls/uxtheme/tests/system.c | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 55242d92559..3286d70d4d1 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -2063,8 +2063,12 @@ HRESULT WINAPI GetThemeBackgroundRegion(HTHEME hTheme, HDC hdc, int iPartId, if(!*pRegion) hr = HRESULT_FROM_WIN32(GetLastError()); } + else if (bgtype == BT_NONE) + { + hr = E_UNEXPECTED; + } else { - FIXME("Unknown background type\n"); + FIXME("Unknown background type %d\n", bgtype); /* This should never happen, and hence I don't know what to return */ hr = E_FAIL; } diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index e9c91c62638..aa566f554ff 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -2425,7 +2425,6 @@ static void test_GetThemeBackgroundRegion(void) SetRect(&rect, 0, 0, 10, 10); region = (HRGN)0xdeadbeef; hr = GetThemeBackgroundRegion(htheme, NULL, RP_BAND, 0, &rect, &region); - todo_wine ok(hr == E_UNEXPECTED || broken(hr == S_OK) /* < Win10 */, "Got unexpected hr %#lx.\n", hr); ok(region == (HRGN)0xdeadbeef, "Got unexpected region.\n");

1 0

Zhiyi Zhang : light.msstyles: Add Vista+ edit parts.
by Alexandre Julliard June 27, 2022

June 27, 2022

Module: wine Branch: master Commit: 24aa157516ad161773f2f774d37b822a1860d2be URL: https://source.winehq.org/git/wine.git/?a=commit;h=24aa157516ad161773f2f774… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 8 15:27:26 2022 +0800 light.msstyles: Add Vista+ edit parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 9 ++ .../light.msstyles/blue_edit_background_1x12px.bmp | Bin 0 -> 186 bytes .../light.msstyles/blue_edit_background_1x12px.svg | 13 +++ .../light.msstyles/blue_edit_background_1x15px.bmp | Bin 0 -> 198 bytes .../light.msstyles/blue_edit_background_1x15px.svg | 13 +++ .../light.msstyles/blue_edit_background_1x18px.bmp | Bin 0 -> 210 bytes .../light.msstyles/blue_edit_background_1x18px.svg | 13 +++ .../light.msstyles/blue_edit_background_1x24px.bmp | Bin 0 -> 234 bytes .../light.msstyles/blue_edit_background_1x24px.svg | 13 +++ dlls/light.msstyles/blue_edit_background_1x6px.bmp | Bin 0 -> 162 bytes dlls/light.msstyles/blue_edit_background_1x6px.svg | 13 +++ dlls/light.msstyles/blue_edit_border_hscroll.bmp | Bin 0 -> 458 bytes dlls/light.msstyles/blue_edit_border_hscroll.svg | 17 +++ dlls/light.msstyles/blue_edit_border_hvscroll.bmp | Bin 0 -> 458 bytes dlls/light.msstyles/blue_edit_border_hvscroll.svg | 17 +++ dlls/light.msstyles/blue_edit_border_noscroll.bmp | Bin 0 -> 458 bytes dlls/light.msstyles/blue_edit_border_noscroll.svg | 17 +++ dlls/light.msstyles/blue_edit_border_vscroll.bmp | Bin 0 -> 458 bytes dlls/light.msstyles/blue_edit_border_vscroll.svg | 17 +++ dlls/light.msstyles/light.rc | 120 +++++++++++++++++++++ 20 files changed, 262 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=24aa157516ad161773f2…

1 0

Zhiyi Zhang : light.msstyles: Add Vista+ header parts.
by Alexandre Julliard June 27, 2022

June 27, 2022

Module: wine Branch: master Commit: ab82ff093aa716e8927ca782585d44d399b7fe77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab82ff093aa716e8927ca782… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 2 17:16:11 2022 +0800 light.msstyles: Add Vista+ header parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 29 +++ dlls/light.msstyles/blue_header.bmp | Bin 618 -> 714 bytes dlls/light.msstyles/blue_header.svg | 13 +- dlls/light.msstyles/blue_header_dropdown.bmp | Bin 0 -> 1002 bytes dlls/light.msstyles/blue_header_dropdown.svg | 4 + .../light.msstyles/blue_header_dropdown_filter.bmp | Bin 0 -> 1002 bytes .../light.msstyles/blue_header_dropdown_filter.svg | 10 + .../blue_header_dropdown_filter_glyph_10px.bmp | Bin 0 -> 1218 bytes .../blue_header_dropdown_filter_glyph_10px.svg | 8 + .../blue_header_dropdown_filter_glyph_12px.bmp | Bin 0 -> 1578 bytes .../blue_header_dropdown_filter_glyph_12px.svg | 8 + .../blue_header_dropdown_filter_glyph_15px.bmp | Bin 0 -> 2658 bytes .../blue_header_dropdown_filter_glyph_15px.svg | 8 + .../blue_header_dropdown_filter_glyph_19px.bmp | Bin 0 -> 4242 bytes .../blue_header_dropdown_filter_glyph_19px.svg | 8 + .../blue_header_dropdown_filter_glyph_23px.bmp | Bin 0 -> 6210 bytes .../blue_header_dropdown_filter_glyph_23px.svg | 8 + .../blue_header_dropdown_glyph_10px.bmp | Bin 0 -> 858 bytes .../blue_header_dropdown_glyph_10px.svg | 9 + .../blue_header_dropdown_glyph_13px.bmp | Bin 0 -> 1334 bytes .../blue_header_dropdown_glyph_13px.svg | 9 + .../blue_header_dropdown_glyph_17px.bmp | Bin 0 -> 1974 bytes .../blue_header_dropdown_glyph_17px.svg | 9 + .../blue_header_dropdown_glyph_21px.bmp | Bin 0 -> 3162 bytes .../blue_header_dropdown_glyph_21px.svg | 9 + .../blue_header_dropdown_glyph_29px.bmp | Bin 0 -> 5706 bytes .../blue_header_dropdown_glyph_29px.svg | 9 + .../blue_header_dropdown_glyph_7px.bmp | Bin 0 -> 474 bytes .../blue_header_dropdown_glyph_7px.svg | 9 + .../blue_header_dropdown_glyph_9px.bmp | Bin 0 -> 678 bytes .../blue_header_dropdown_glyph_9px.svg | 9 + dlls/light.msstyles/blue_header_item.bmp | Bin 2538 -> 5898 bytes dlls/light.msstyles/blue_header_item.svg | 70 ++++--- dlls/light.msstyles/blue_header_overflow.bmp | Bin 0 -> 1482 bytes dlls/light.msstyles/blue_header_overflow.svg | 5 + .../blue_header_overflow_glyph_10px.bmp | Bin 0 -> 858 bytes .../blue_header_overflow_glyph_10px.svg | 13 ++ .../blue_header_overflow_glyph_12px.bmp | Bin 0 -> 1194 bytes .../blue_header_overflow_glyph_12px.svg | 13 ++ .../blue_header_overflow_glyph_16px.bmp | Bin 0 -> 1930 bytes .../blue_header_overflow_glyph_16px.svg | 13 ++ .../blue_header_overflow_glyph_20px.bmp | Bin 0 -> 3338 bytes .../blue_header_overflow_glyph_20px.svg | 11 ++ .../blue_header_overflow_glyph_24px.bmp | Bin 0 -> 4170 bytes .../blue_header_overflow_glyph_24px.svg | 13 ++ .../blue_header_overflow_glyph_32px.bmp | Bin 0 -> 7306 bytes .../blue_header_overflow_glyph_32px.svg | 13 ++ .../blue_header_overflow_glyph_8px.bmp | Bin 0 -> 586 bytes .../blue_header_overflow_glyph_8px.svg | 13 ++ .../light.msstyles/blue_header_sort_arrow_13px.bmp | Bin 0 -> 658 bytes .../light.msstyles/blue_header_sort_arrow_13px.svg | 9 + .../light.msstyles/blue_header_sort_arrow_16px.bmp | Bin 0 -> 970 bytes .../light.msstyles/blue_header_sort_arrow_16px.svg | 9 + .../light.msstyles/blue_header_sort_arrow_17px.bmp | Bin 0 -> 2314 bytes .../light.msstyles/blue_header_sort_arrow_17px.svg | 9 + .../light.msstyles/blue_header_sort_arrow_20px.bmp | Bin 0 -> 1338 bytes .../light.msstyles/blue_header_sort_arrow_20px.svg | 9 + .../light.msstyles/blue_header_sort_arrow_26px.bmp | Bin 0 -> 2010 bytes .../light.msstyles/blue_header_sort_arrow_26px.svg | 9 + .../light.msstyles/blue_header_sort_arrow_39px.bmp | Bin 0 -> 4818 bytes .../light.msstyles/blue_header_sort_arrow_39px.svg | 9 + .../light.msstyles/blue_header_sort_arrow_52px.bmp | Bin 0 -> 8458 bytes .../light.msstyles/blue_header_sort_arrow_52px.svg | 9 + dlls/light.msstyles/light.rc | 203 ++++++++++++++++++++- 64 files changed, 544 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab82ff093aa716e8927c…

1 0

Nikolay Sivov : d2d1/effect: Set initial value for uint32 properties.
by Alexandre Julliard June 27, 2022

June 27, 2022

Module: wine Branch: master Commit: 4a05b93d023ef8260c75e500efe53be421397a03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a05b93d023ef8260c75e500… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 26 14:22:05 2022 +0300 d2d1/effect: Set initial value for uint32 properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/factory.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 16e12d818bc..52e09033e6d 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -827,10 +827,32 @@ static HRESULT parse_effect_add_property(struct d2d_effect_properties *props, co } else { + void *src = NULL; + UINT32 _uint32; + p->data.offset = props->offset; p->size = sizes[type]; props->offset += p->size; - /* FIXME: convert and write initial value */ + + if (value) + { + switch (p->type) + { + case D2D1_PROPERTY_TYPE_UINT32: + _uint32 = wcstoul(value, NULL, 10); + src = &_uint32; + break; + case D2D1_PROPERTY_TYPE_IUNKNOWN: + case D2D1_PROPERTY_TYPE_COLOR_CONTEXT: + break; + default: + FIXME("Initial value for property type %u is not handled.\n", p->type); + } + + if (src && p->size) memcpy(props->data.ptr + p->data.offset, src, p->size); + } + else if (p->size) + memset(props->data.ptr + p->data.offset, 0, p->size); } p->set_function = NULL; p->get_function = NULL;

1 0

Zhiyi Zhang : uxtheme: Do not transfer glyph alpha values when drawing opaque background.
by Alexandre Julliard June 27, 2022

June 27, 2022

Module: wine Branch: master Commit: b7644afa59b7a179497c17419f137aa9ccece884 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7644afa59b7a179497c1741… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 22 17:40:45 2022 +0800 uxtheme: Do not transfer glyph alpha values when drawing opaque background. Fix QSpinBox artifacts for Qt5 applications. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53066 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/uxtheme/tests/system.c | 1 - 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 3ddb9b3bf4d..55242d92559 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -523,6 +523,39 @@ static inline void get_transparency (HTHEME hTheme, int iPartId, int iStateId, } } +/* Reset alpha values in hdc to 0xFF if the background is opaque */ +static void reset_dc_alpha_values(HTHEME htheme, HDC hdc, int part_id, int state_id, + const RECT *rect) +{ + static const RGBQUAD bitmap_bits = {0x0, 0x0, 0x0, 0xFF}; + BITMAPINFO bitmap_info = {{0}}; + RECT image_rect; + BOOL has_alpha; + HBITMAP hbmp; + int bg_type; + + if (GetDeviceCaps(hdc, BITSPIXEL) != 32) + return; + + if (FAILED(GetThemeEnumValue(htheme, part_id, state_id, TMT_BGTYPE, &bg_type)) + || bg_type != BT_IMAGEFILE) + return; + + if (FAILED(UXTHEME_LoadImage(htheme, part_id, state_id, rect, FALSE, &hbmp, &image_rect, + &has_alpha, NULL)) || has_alpha) + return; + + bitmap_info.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bitmap_info.bmiHeader.biWidth = 1; + bitmap_info.bmiHeader.biHeight = 1; + bitmap_info.bmiHeader.biPlanes = 1; + bitmap_info.bmiHeader.biBitCount = 32; + bitmap_info.bmiHeader.biCompression = BI_RGB; + StretchDIBits(hdc, rect->left, rect->top, abs(rect->right - rect->left), + abs(rect->bottom - rect->top), 0, 0, 1, 1, &bitmap_bits, &bitmap_info, + DIB_RGB_COLORS, SRCPAINT); +} + /*********************************************************************** * UXTHEME_DrawImageGlyph * @@ -581,6 +614,11 @@ static HRESULT UXTHEME_DrawImageGlyph(HTHEME hTheme, HDC hdc, int iPartId, SelectObject(hdcSrc, oldSrc); DeleteDC(hdcSrc); + + /* Don't transfer alpha values from the glyph when drawing opaque background */ + if (SUCCEEDED(hr) && hasAlpha) + reset_dc_alpha_values(hTheme, hdc, iPartId, iStateId, pRect); + return hr; } diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index e9191de1507..cbaf4b51258 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -2322,7 +2322,6 @@ static void test_DrawThemeBackgroundEx(void) ptr += 4; } - todo_wine ok(i == width * height || broken(ptr[3] == 0) /* Spin button glyphs on XP don't use alpha */, "Unexpected alpha value %#x at (%d,%d).\n", ptr[3], i % height, i / height);

1 0

Zhiyi Zhang : uxtheme: Test DrawThemeBackgroundEx() alpha channel handling.
by Alexandre Julliard June 27, 2022

June 27, 2022

Module: wine Branch: master Commit: 709722bec73a002d9ae452ad0f7b7e994c943e79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=709722bec73a002d9ae452ad… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 22 17:39:57 2022 +0800 uxtheme: Test DrawThemeBackgroundEx() alpha channel handling. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/tests/system.c | 133 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 129 insertions(+), 4 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index aa491ffb2d2..e9191de1507 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -2265,10 +2265,139 @@ static void test_EnableThemeDialogTexture(void) static void test_DrawThemeBackgroundEx(void) { + static const int width = 10, height = 10; + static const RECT rect = {0, 0, 10, 10}; + HBITMAP bitmap, old_bitmap; + BOOL transparent, found; + BITMAPINFO bitmap_info; + int i, glyph_type; + BYTE *bits, *ptr; + HTHEME htheme; void *proc; + HDC mem_dc; + HRESULT hr; + HWND hwnd; proc = GetProcAddress(GetModuleHandleA("uxtheme.dll"), MAKEINTRESOURCEA(47)); ok(proc == (void *)pDrawThemeBackgroundEx, "Expected DrawThemeBackgroundEx() at ordinal 47.\n"); + + hwnd = CreateWindowA(WC_STATICA, "", WS_POPUP, 0, 0, 1, 1, 0, 0, 0, NULL); + ok(hwnd != NULL, "CreateWindowA failed, error %#lx.\n", GetLastError()); + htheme = OpenThemeData(hwnd, L"Spin"); + if (!htheme) + { + skip("Theming is inactive.\n"); + DestroyWindow(hwnd); + return; + } + + bitmap_info.bmiHeader.biSize = sizeof(bitmap_info.bmiHeader); + bitmap_info.bmiHeader.biWidth = width; + bitmap_info.bmiHeader.biHeight = height; + bitmap_info.bmiHeader.biPlanes = 1; + bitmap_info.bmiHeader.biBitCount = 32; + bitmap_info.bmiHeader.biCompression = BI_RGB; + bitmap = CreateDIBSection(0, &bitmap_info, DIB_RGB_COLORS, (void **)&bits, 0, 0); + mem_dc = CreateCompatibleDC(NULL); + old_bitmap = SelectObject(mem_dc, bitmap); + + /* Drawing opaque background with transparent glyphs should discard the alpha values from the glyphs */ + transparent = IsThemeBackgroundPartiallyTransparent(htheme, SPNP_UP, UPS_NORMAL); + ok(!transparent, "Expected spin button background opaque.\n"); + hr = GetThemeBool(htheme, SPNP_UP, UPS_NORMAL, TMT_TRANSPARENT, &transparent); + ok(hr == E_PROP_ID_UNSUPPORTED, "Got unexpected hr %#lx.\n", hr); + transparent = FALSE; + hr = GetThemeBool(htheme, SPNP_UP, UPS_NORMAL, TMT_GLYPHTRANSPARENT, &transparent); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(transparent, "Expected spin button glyph transparent.\n"); + + memset(bits, 0xa5, width * height * sizeof(int)); + hr = DrawThemeBackgroundEx(htheme, mem_dc, SPNP_UP, UPS_NORMAL, &rect, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ptr = bits; + for (i = 0; i < width * height; ++i) + { + if (ptr[3] != 0xff) + break; + + ptr += 4; + } + todo_wine + ok(i == width * height || broken(ptr[3] == 0) /* Spin button glyphs on XP don't use alpha */, + "Unexpected alpha value %#x at (%d,%d).\n", ptr[3], i % height, i / height); + + /* Drawing transparent background without glyphs should keep the alpha values */ + CloseThemeData(htheme); + htheme = OpenThemeData(hwnd, L"Scrollbar"); + transparent = IsThemeBackgroundPartiallyTransparent(htheme, SBP_SIZEBOX, SZB_RIGHTALIGN); + ok(transparent, "Expected scrollbar sizebox transparent.\n"); + transparent = FALSE; + hr = GetThemeBool(htheme, SBP_SIZEBOX, SZB_RIGHTALIGN, TMT_TRANSPARENT, &transparent); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(transparent, "Expected scrollbar sizebox transparent.\n"); + hr = GetThemeEnumValue(htheme, SBP_SIZEBOX, SZB_RIGHTALIGN, TMT_GLYPHTYPE, &glyph_type); + ok(hr == E_PROP_ID_UNSUPPORTED, "Got unexpected hr %#lx.\n", hr); + + memset(bits, 0xa5, width * height * sizeof(int)); + hr = DrawThemeBackgroundEx(htheme, mem_dc, SBP_SIZEBOX, SZB_RIGHTALIGN, &rect, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + found = FALSE; + ptr = bits; + for (i = 0; i < width * height; ++i) + { + if (ptr[3] == 0xa5) + { + found = TRUE; + break; + } + + ptr += 4; + } + ok(found, "Expected alpha values found.\n"); + + /* Drawing transparent background with transparent glyphs should keep alpha values */ + CloseThemeData(htheme); + htheme = OpenThemeData(hwnd, L"Header"); + if (IsThemePartDefined(htheme, HP_HEADERDROPDOWN, 0)) + { + transparent = IsThemeBackgroundPartiallyTransparent(htheme, HP_HEADERDROPDOWN, HDDS_NORMAL); + ok(transparent, "Expected header dropdown transparent.\n"); + transparent = FALSE; + hr = GetThemeBool(htheme, HP_HEADERDROPDOWN, HDDS_NORMAL, TMT_TRANSPARENT, &transparent); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(transparent, "Expected header dropdown background transparent.\n"); + transparent = FALSE; + hr = GetThemeBool(htheme, HP_HEADERDROPDOWN, HDDS_NORMAL, TMT_GLYPHTRANSPARENT, &transparent); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(transparent, "Expected header dropdown glyph transparent.\n"); + + memset(bits, 0xa5, width * height * sizeof(int)); + hr = DrawThemeBackgroundEx(htheme, mem_dc, HP_HEADERDROPDOWN, HDDS_NORMAL, &rect, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + found = FALSE; + ptr = bits; + for (i = 0; i < width * height; ++i) + { + if (ptr[3] == 0xa5) + { + found = TRUE; + break; + } + + ptr += 4; + } + ok(found, "Expected alpha values found.\n"); + } + else + { + skip("Failed to get header dropdown parts.\n"); + } + + SelectObject(mem_dc, old_bitmap); + DeleteDC(mem_dc); + DeleteObject(bitmap); + CloseThemeData(htheme); + DestroyWindow(hwnd); } START_TEST(system) @@ -2279,10 +2408,6 @@ START_TEST(system) init_funcs(); init_msg_sequences(sequences, NUM_MSG_SEQUENCES); - /* No real functional theme API tests will be done (yet). The current tests - * only show input/return behaviour - */ - test_IsThemed(); test_IsThemePartDefined(); test_GetWindowTheme();

1 0

Zebediah Figura : dnsapi: ntdll_umbstowcs() deals in characters, not bytes.
by Alexandre Julliard June 27, 2022

June 27, 2022

Module: wine Branch: master Commit: 91083d451022bdac99ac6c349f0965dec1d1db67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91083d451022bdac99ac6c34… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 22 17:03:47 2022 -0500 dnsapi: ntdll_umbstowcs() deals in characters, not bytes. --- dlls/dnsapi/libresolv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index e19e867c76c..51a44f88aa5 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -127,7 +127,7 @@ static NTSTATUS resolv_get_searchlist( void *args ) const struct get_searchlist_params *params = args; DNS_TXT_DATAW *list = params->list; DWORD i, needed, str_needed = 0; - char *ptr, *end; + WCHAR *ptr, *end; init_resolver(); @@ -145,11 +145,11 @@ static NTSTATUS resolv_get_searchlist( void *args ) *params->len = needed; list->dwStringCount = i; - ptr = (char *)(list->pStringArray + i); - end = ptr + str_needed; + ptr = (WCHAR *)(list->pStringArray + i); + end = ptr + str_needed / sizeof(WCHAR); for (i = 0; i < MAXDNSRCH + 1 && _res.dnsrch[i]; i++) { - list->pStringArray[i] = (WCHAR *)ptr; + list->pStringArray[i] = ptr; ptr += ntdll_umbstowcs( _res.dnsrch[i], strlen(_res.dnsrch[i]) + 1, list->pStringArray[i], end - ptr ); }

1 0

Zebediah Figura : dnsapi: Clarify that Windows does not implement DnsQueryConfig(DnsConfigSearchList).
by Alexandre Julliard June 27, 2022

June 27, 2022

Module: wine Branch: master Commit: f66880c86aa283503434a0ff871a38082d2452e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f66880c86aa283503434a0ff… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 22 17:09:57 2022 -0500 dnsapi: Clarify that Windows does not implement DnsQueryConfig(DnsConfigSearchList). >From 17e2d5c1ca655a29775e1a4cd08d9fdec9654dcd. --- dlls/dnsapi/query.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 12aa1086540..0e2f1b39ece 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -387,6 +387,7 @@ DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, const WCHA struct get_serverlist_params params = { AF_INET6, buffer, len }; return RESOLV_CALL( get_serverlist, &params ); } + /* Windows does not implement this, but we need it in iphlpapi. */ case DnsConfigSearchList: { struct get_searchlist_params params = { buffer, len };

1 0