uxtheme: Check window handle for SetWindowTheme().

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

uxtheme: Check window handle for SetWindowTheme().
3f292a0e · Zhiyi Zhang · Alexandre Julliard · 16e2a9ae · 3f292a0e · 3f292a0e
Commit 3f292a0e authored Jun 21, 2021 by Zhiyi Zhang Committed by Alexandre Julliard Jun 21, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

system.c dlls/uxtheme/system.c +4 -0

system.c dlls/uxtheme/tests/system.c +0 -1

No files found.
--- a/dlls/uxtheme/system.c
+++ b/dlls/uxtheme/system.c
@@ -690,6 +690,10 @@ HRESULT WINAPI SetWindowTheme(HWND hwnd, LPCWSTR pszSubAppName,
    HRESULT hr;
    TRACE("(%p,%s,%s)\n", hwnd, debugstr_w(pszSubAppName),
          debugstr_w(pszSubIdList));
+
+    if (!hwnd)
+        return E_HANDLE;
+
    hr = UXTHEME_SetWindowProperty(hwnd, atSubAppName, pszSubAppName);
    if(SUCCEEDED(hr))
        hr = UXTHEME_SetWindowProperty(hwnd, atSubIdList, pszSubIdList);

--- a/dlls/uxtheme/tests/system.c
+++ b/dlls/uxtheme/tests/system.c
@@ -104,7 +104,6 @@ static void test_SetWindowTheme(void)
    HWND    hWnd;

    hRes = SetWindowTheme(NULL, NULL, NULL);
-todo_wine
    ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes);

    /* Only do the bare minimum to get a valid hwnd */