Alexandre Julliard : mscms/tests: The tests shouldn' t fail if we have some ICM files.

Alexandre Julliard julliard at winehq.org
Wed Feb 27 08:03:28 CST 2008


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Feb 27 14:44:22 2008 +0100

mscms/tests: The tests shouldn't fail if we have some ICM files.

---

 dlls/mscms/tests/profile.c |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c
index d7e1f6a..68d14d2 100644
--- a/dlls/mscms/tests/profile.c
+++ b/dlls/mscms/tests/profile.c
@@ -803,8 +803,10 @@ static void test_EnumColorProfilesA(void)
     ok( !ret, "EnumColorProfilesA() succeeded (%d)\n", GetLastError() );
 
     ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number );
-    todo_wine
-    ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() );
+    if (standardprofile)
+        ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() );
+    else
+        todo_wine ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() );
 
     size = 0;
 
@@ -815,8 +817,10 @@ static void test_EnumColorProfilesA(void)
 
     size = total;
     ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number );
-    todo_wine
-    ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() );
+    if (standardprofile)
+        ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() );
+    else
+        todo_wine ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() );
 
     HeapFree( GetProcessHeap(), 0, buffer );
 }
@@ -853,8 +857,10 @@ static void test_EnumColorProfilesW(void)
     ok( !ret, "EnumColorProfilesW() succeeded (%d)\n", GetLastError() );
 
     ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number );
-    todo_wine
-    ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() );
+    if (standardprofileW)
+        ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() );
+    else
+        todo_wine ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() );
 
     size = 0;
     ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number );
@@ -864,8 +870,10 @@ static void test_EnumColorProfilesW(void)
 
     size = total;
     ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number );
-    todo_wine
-    ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() );
+    if (standardprofileW)
+        ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() );
+    else
+        todo_wine ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() );
 
     HeapFree( GetProcessHeap(), 0, buffer );
 }




More information about the wine-cvs mailing list