Reece Dunn : uxtheme: Fixed the todo blocks in the IsThemed tests when theming is inactive.

[Alexandre Julliard]

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

Author: Reece Dunn 
Date:   Mon Oct 27 09:04:48 2008 +0000

uxtheme: Fixed the todo blocks in the IsThemed tests when theming is inactive.

---

dlls/uxtheme/system.c       |    1 +
 dlls/uxtheme/tests/system.c |   14 ++++++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c
index f2c24ae..3630a6d 100644
--- a/dlls/uxtheme/system.c
+++ b/dlls/uxtheme/system.c
@@ -566,6 +566,7 @@ BOOL WINAPI IsAppThemed(void)
 BOOL WINAPI IsThemeActive(void)
 {
     TRACE("\n");
+    SetLastError(ERROR_SUCCESS);
     return bThemeActive;
 }

diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c
index b82472b..df20885 100644
--- a/dlls/uxtheme/tests/system.c
+++ b/dlls/uxtheme/tests/system.c
@@ -85,10 +85,9 @@ static void test_IsThemed(void)
     SetLastError(0xdeadbeef);
     bThemeActive = pIsThemeActive();
     trace("Theming is %s\n", (bThemeActive) ? "active" : "inactive");
-    todo_wine
-        ok( GetLastError() == ERROR_SUCCESS,
-            "Expected ERROR_SUCCESS, got 0x%08x\n",
-            GetLastError());
+    ok( GetLastError() == ERROR_SUCCESS,
+        "Expected ERROR_SUCCESS, got 0x%08x\n",
+        GetLastError());

/* This test is not themed */
     SetLastError(0xdeadbeef);
@@ -101,10 +100,9 @@ static void test_IsThemed(void)
         /* Although Wine currently returns FALSE, the logic behind it is wrong. It is not a todo_wine though in the testing sense */
         ok( bAppThemed == FALSE, "Expected FALSE as this test executable is not (yet) themed.\n");

-    todo_wine
-        ok( GetLastError() == ERROR_SUCCESS,
-            "Expected ERROR_SUCCESS, got 0x%08x\n",
-            GetLastError());
+    ok( GetLastError() == ERROR_SUCCESS,
+        "Expected ERROR_SUCCESS, got 0x%08x\n",
+        GetLastError());

SetLastError(0xdeadbeef);
     bTPDefined = pIsThemePartDefined(NULL, 0 , 0);