Francois Gouget : mscms/tests: EnumColorProfiles() should not fail even if there are no ICM files in the 'color directory'.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget at free.fr>
Date:   Wed Feb 13 21:56:45 2008 +0100

mscms/tests: EnumColorProfiles() should not fail even if there are no ICM files in the 'color directory'.

---

 dlls/mscms/tests/profile.c |   37 ++++++++++++++-----------------------
 1 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c
index 1055faa..9b01950 100644
--- a/dlls/mscms/tests/profile.c
+++ b/dlls/mscms/tests/profile.c
@@ -788,11 +788,9 @@ static void test_EnumColorProfilesA(void)
     ret = pEnumColorProfilesA( NULL, &record, buffer, NULL, &number );
     ok( !ret, "EnumColorProfilesA() succeeded (%d)\n", GetLastError() );
 
-    if (standardprofile)
-    {
-        ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number );
-        ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() );
-    }
+    ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number );
+    todo_wine
+    ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() );
 
     size = 0;
 
@@ -801,13 +799,11 @@ static void test_EnumColorProfilesA(void)
 
     /* Functional checks */
 
-    if (standardprofile)
-    {
-        size = total;
+    size = total;
+    ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number );
+    todo_wine
+    ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() );
 
-        ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number );
-        ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() );
-    }
     HeapFree( GetProcessHeap(), 0, buffer );
 }
 
@@ -842,26 +838,21 @@ static void test_EnumColorProfilesW(void)
     ret = pEnumColorProfilesW( NULL, &record, buffer, NULL, &number );
     ok( !ret, "EnumColorProfilesW() succeeded (%d)\n", GetLastError() );
 
-    if (standardprofileW)
-    {
-        ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number );
-        ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() );
-    }
+    ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number );
+    todo_wine
+    ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() );
 
     size = 0;
-
     ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number );
     ok( !ret, "EnumColorProfilesW() succeeded (%d)\n", GetLastError() );
 
     /* Functional checks */
 
-    if (standardprofileW)
-    {
-        size = total;
+    size = total;
+    ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number );
+    todo_wine
+    ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() );
 
-        ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number );
-        ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() );
-    }
     HeapFree( GetProcessHeap(), 0, buffer );
 }