Paul Vriens : mscms/tests: Fix some test failures on Win98 and WinME.
Alexandre Julliard
julliard at winehq.org
Thu Sep 10 09:07:49 CDT 2009
Module: wine
Branch: master
Commit: 2c2d0a416082a1d132ebc82f7dfddb6007233d6d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c2d0a416082a1d132ebc82f7dfddb6007233d6d
Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Wed Sep 9 21:11:10 2009 +0200
mscms/tests: Fix some test failures on Win98 and WinME.
---
dlls/mscms/tests/profile.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c
index 894d33c..4f71789 100644
--- a/dlls/mscms/tests/profile.c
+++ b/dlls/mscms/tests/profile.c
@@ -539,7 +539,8 @@ static void test_GetStandardColorSpaceProfileW()
DWORD size;
WCHAR oldprofile[MAX_PATH];
WCHAR newprofile[MAX_PATH];
- const WCHAR emptyW[] = {0};
+ CHAR newprofileA[MAX_PATH];
+ const CHAR empty[] = "";
DWORD zero = 0;
DWORD sizeP = sizeof(newprofile);
@@ -557,7 +558,9 @@ static void test_GetStandardColorSpaceProfileW()
SetLastError(0xfaceabee); /* 2nd param, */
ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &sizeP);
- ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() );
+ ok( (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) ||
+ broken(ret), /* Win98 and WinME */
+ "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() );
SetLastError(0xfaceabee); /* 3rd param, */
ret = pGetStandardColorSpaceProfileW(NULL, LCS_sRGB, NULL, &sizeP);
@@ -590,8 +593,9 @@ static void test_GetStandardColorSpaceProfileW()
SetLastError(0xfaceabee); /* maybe 2nd param. */
ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &sizeP);
+ WideCharToMultiByte(CP_ACP, 0, newprofile, -1, newprofileA, sizeof(newprofileA), NULL, NULL);
if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() );
- else ok( !lstrcmpiW( newprofile, emptyW ) && GetLastError() == 0xfaceabee,
+ else ok( !lstrcmpiA( newprofileA, empty ) && GetLastError() == 0xfaceabee,
"GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() );
/* Functional checks */
More information about the wine-cvs
mailing list