[1/3]uxtheme: fix todo in SetWindowTheme
André Hentschel
nerv at dawncrow.de
Thu Aug 13 13:25:22 CDT 2009
---
dlls/uxtheme/system.c | 2 ++
dlls/uxtheme/tests/system.c | 11 ++++-------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c
index 2839539..80fddc2 100644
--- a/dlls/uxtheme/system.c
+++ b/dlls/uxtheme/system.c
@@ -689,6 +689,8 @@ 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);
diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c
index ad277a0..6181a92 100644
--- a/dlls/uxtheme/tests/system.c
+++ b/dlls/uxtheme/tests/system.c
@@ -148,13 +148,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);
--
Best Regards, André Hentschel
More information about the wine-patches
mailing list