uxtheme: Fix CloseThemeData with invalid handle value.

Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

uxtheme: Fix CloseThemeData with invalid handle value.
997e2046 · Louis Lenders · Alexandre Julliard · d070c263 · 997e2046 · 997e2046
Commit 997e2046 authored Feb 12, 2016 by Louis Lenders Committed by Alexandre Julliard Feb 15, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

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

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

No files found.
--- a/dlls/uxtheme/system.c
+++ b/dlls/uxtheme/system.c
@@ -746,7 +746,7 @@ void WINAPI SetThemeAppProperties(DWORD dwFlags)
 HRESULT WINAPI CloseThemeData(HTHEME hTheme)
 {
    TRACE("(%p)\n", hTheme);
-    if(!hTheme)
+    if(!hTheme || hTheme == INVALID_HANDLE_VALUE)
        return E_HANDLE;
    return MSSTYLES_CloseThemeClass(hTheme);
 }

--- a/dlls/uxtheme/tests/system.c
+++ b/dlls/uxtheme/tests/system.c
@@ -541,6 +541,8 @@ static void test_CloseThemeData(void)

    hRes = pCloseThemeData(NULL);
    ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes);
+    hRes = pCloseThemeData(INVALID_HANDLE_VALUE);
+    ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes);
 }

 START_TEST(system)