From e29e6c7078bebde9f7022ed03385f0cfdb081de7 Mon Sep 17 00:00:00 2001 From: Reece Dunn Date: Mon, 27 Oct 2008 09:12:24 +0000 Subject: [PATCH] uxtheme: fixed the todo blocks in the SetWindowTheme tests. --- dlls/uxtheme/system.c | 5 ++++- dlls/uxtheme/tests/system.c | 11 ++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 3586221..99ae244 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -696,7 +696,10 @@ HRESULT WINAPI SetWindowTheme(HWND hwnd, LPCWSTR pszSubAppName, HRESULT hr; TRACE("(%p,%s,%s)\n", hwnd, debugstr_w(pszSubAppName), debugstr_w(pszSubIdList)); - hr = UXTHEME_SetWindowProperty(hwnd, atSubAppName, pszSubAppName); + if (!IsWindow(hwnd)) + hr = E_HANDLE; + if (SUCCEEDED(hr)) + hr = UXTHEME_SetWindowProperty(hwnd, atSubAppName, pszSubAppName); if(SUCCEEDED(hr)) hr = UXTHEME_SetWindowProperty(hwnd, atSubIdList, pszSubIdList); if(SUCCEEDED(hr)) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 3e26547..af4edfa 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -150,13 +150,10 @@ static void test_SetWindowTheme(void) SetLastError(0xdeadbeef); hRes = pSetWindowTheme(NULL, NULL, NULL); - todo_wine - { - ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); - ok( GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got 0x%08x\n", - GetLastError()); - } + ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); + ok( GetLastError() == 0xdeadbeef, + "Expected 0xdeadbeef, got 0x%08x\n", + GetLastError()); /* Only do the bare minimum to get a valid hwnd */ hWnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100,0, 0, 0, NULL); -- 1.5.6.3