André Hentschel : uxtheme/tests: Mark XP SP1 behaviour as broken.
Alexandre Julliard
julliard at winehq.org
Tue Apr 5 11:23:32 CDT 2011
Module: wine
Branch: master
Commit: 85c989be49ba646242b88c47358d049cbe8c6d68
URL: http://source.winehq.org/git/wine.git/?a=commit;h=85c989be49ba646242b88c47358d049cbe8c6d68
Author: André Hentschel <nerv at dawncrow.de>
Date: Fri Apr 1 18:50:30 2011 +0200
uxtheme/tests: Mark XP SP1 behaviour as broken.
---
dlls/uxtheme/tests/system.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c
index b730246..a63b6c4 100644
--- a/dlls/uxtheme/tests/system.c
+++ b/dlls/uxtheme/tests/system.c
@@ -507,7 +507,7 @@ static void test_GetCurrentThemeName(void)
SetLastError(0xdeadbeef);
hRes = pGetCurrentThemeName(currentTheme, 0, NULL, 0, NULL, 0);
if (bThemeActive)
- ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes);
+ ok( hRes == S_OK || broken(hRes == E_FAIL /* WinXP SP1 */), "Expected 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,
@@ -523,7 +523,9 @@ static void test_GetCurrentThemeName(void)
hRes = pGetCurrentThemeName(currentTheme, 2, NULL, 0, NULL, 0);
if (bThemeActive)
todo_wine
- ok(hRes == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got 0x%08x\n", hRes);
+ ok(hRes == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) ||
+ broken(hRes == E_FAIL /* WinXP SP1 */),
+ "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), 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,
@@ -537,7 +539,9 @@ static void test_GetCurrentThemeName(void)
currentSize, sizeof(currentSize) / sizeof(WCHAR));
if (bThemeActive)
todo_wine
- ok(hRes == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got 0x%08x\n", hRes);
+ ok(hRes == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) ||
+ broken(hRes == E_FAIL /* WinXP SP1 */),
+ "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), 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,
More information about the wine-cvs
mailing list