Reece H. Dunn : uxtheme: Fix the system tests so they pass on Vista.

[Alexandre Julliard]

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

Author: Reece H. Dunn <msclrhd(a)gmail.com>
Date:   Thu Feb  7 08:12:25 2008 +0000

uxtheme: Fix the system tests so they pass on Vista.

---

 dlls/uxtheme/tests/system.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c
index 8b4e29a..b5f6619 100644
--- a/dlls/uxtheme/tests/system.c
+++ b/dlls/uxtheme/tests/system.c
@@ -417,8 +417,10 @@ static void test_GetCurrentThemeName(void)
     /* Given number of characters for the theme name is too large */
     SetLastError(0xdeadbeef);
     hRes = pGetCurrentThemeName(currentTheme, sizeof(currentTheme), NULL, 0, NULL, 0);
-    todo_wine
-        ok( hRes == E_POINTER, "Expected E_POINTER, got 0x%08x\n", hRes);
+    if (bThemeActive)
+        ok( hRes == E_POINTER || hRes == S_OK, "Expected E_POINTER or S_OK, got 0x%08x\n", hRes);
+    else
+        ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes);
     ok( GetLastError() == 0xdeadbeef,
         "Expected 0xdeadbeef, got 0x%08x\n",
         GetLastError());