Louis Lenders : uxtheme: Fix CloseThemeData with invalid handle value.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Feb 15 09:41:50 CST 2016


Module: wine
Branch: master
Commit: 997e2046df8368ab23f87bfa7fa3cb2372a4e000
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=997e2046df8368ab23f87bfa7fa3cb2372a4e000

Author: Louis Lenders <xerox.xerox2000x at gmail.com>
Date:   Fri Feb 12 10:51:42 2016 +0100

uxtheme: Fix CloseThemeData with invalid handle value.

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

---

 dlls/uxtheme/system.c       | 2 +-
 dlls/uxtheme/tests/system.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c
index 8947587..7d07680 100644
--- 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);
 }
diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c
index 49eba64..4aeedbc 100644
--- 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)




More information about the wine-cvs mailing list