Skip to content

W
wine-cw
Commit 5d5853e3 authored by Zhiyi Zhang's avatar Zhiyi Zhang Committed by Alexandre Julliard
Browse files
Options

uxtheme: Handle BT_NONE in GetThemeBackgroundRegion().

Signed-off-by: 's avatarZhiyi Zhang <zzhang@codeweavers.com>
parent 9fa5f83a
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
dlls/uxtheme/draw.c
View file @ 5d5853e3
...@@ -2063,8 +2063,12 @@ HRESULT WINAPI GetThemeBackgroundRegion(HTHEME hTheme, HDC hdc, int iPartId, ...@@ -2063,8 +2063,12 @@ HRESULT WINAPI GetThemeBackgroundRegion(HTHEME hTheme, HDC hdc, int iPartId,
if(!*pRegion) if(!*pRegion)
hr = HRESULT_FROM_WIN32(GetLastError()); hr = HRESULT_FROM_WIN32(GetLastError());
} }
else if (bgtype == BT_NONE)
{
hr = E_UNEXPECTED;
}
else { 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 */ /* This should never happen, and hence I don't know what to return */
hr = E_FAIL; hr = E_FAIL;
} }
......
dlls/uxtheme/tests/system.c
View file @ 5d5853e3
...@@ -2425,7 +2425,6 @@ static void test_GetThemeBackgroundRegion(void) ...@@ -2425,7 +2425,6 @@ static void test_GetThemeBackgroundRegion(void)
SetRect(&rect, 0, 0, 10, 10); SetRect(&rect, 0, 0, 10, 10);
region = (HRGN)0xdeadbeef; region = (HRGN)0xdeadbeef;
hr = GetThemeBackgroundRegion(htheme, NULL, RP_BAND, 0, &rect, &region); 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(hr == E_UNEXPECTED || broken(hr == S_OK) /* < Win10 */, "Got unexpected hr %#lx.\n", hr);
ok(region == (HRGN)0xdeadbeef, "Got unexpected region.\n"); ok(region == (HRGN)0xdeadbeef, "Got unexpected region.\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment