wine/dlls/mscms/tests profile.c

Alexandre Julliard julliard at wine.codeweavers.com
Wed Nov 23 08:25:56 CST 2005


ChangeSet ID:	21418
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard at winehq.org	2005/11/23 08:25:56

Modified files:
	dlls/mscms/tests: profile.c 

Log message:
	Saulius Krasuckas <saulius.krasuckas at ieee.org>
	Be more strict and verbose while testing
	GetStandardColorSpaceProfile().

Patch: http://cvs.winehq.org/patch.py?id=21418

Old revision  New revision  Changes     Path
 1.18          1.19          +42 -10     wine/dlls/mscms/tests/profile.c

Index: wine/dlls/mscms/tests/profile.c
diff -u -p wine/dlls/mscms/tests/profile.c:1.18 wine/dlls/mscms/tests/profile.c:1.19
--- wine/dlls/mscms/tests/profile.c:1.18	23 Nov 2005 14:25:56 -0000
+++ wine/dlls/mscms/tests/profile.c	23 Nov 2005 14:25:56 -0000
@@ -442,27 +442,43 @@ static void test_GetCountColorProfileEle
 static void test_GetStandardColorSpaceProfileA(void)
 {
     BOOL ret;
-    DWORD size;
+    DWORD size, GLE;
     CHAR oldprofile[MAX_PATH];
     CHAR newprofile[MAX_PATH];
 
     /* Parameter checks */
 
+    SetLastError(0);
     ret = pGetStandardColorSpaceProfileA( NULL, 0, newprofile, NULL );
-    ok( !ret, "GetStandardColorSpaceProfileA() succeeded (%ld)\n", GetLastError() );
+    GLE = GetLastError();
+    todo_wine
+    ok( !ret && GLE == ERROR_INVALID_PARAMETER, 
+        "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE );
 
+    SetLastError(0);
     ret = pGetStandardColorSpaceProfileA( machine, 0, newprofile, &size );
-    ok( !ret, "GetStandardColorSpaceProfileA() succeeded (%ld)\n", GetLastError() );
+    GLE = GetLastError();
+    todo_wine
+    ok( !ret && GLE == ERROR_INVALID_PARAMETER, 
+        "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE );
 
     size = 0;
 
+    SetLastError(0);
     ret = pGetStandardColorSpaceProfileA( NULL, 0, NULL, &size );
-    ok( !ret, "GetStandardColorSpaceProfileA() succeeded (%ld)\n", GetLastError() );
+    GLE = GetLastError();
+    todo_wine
+    ok( !ret && (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND), 
+        "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE );
 
     size = sizeof(newprofile);
 
+    SetLastError(0);
     ret = pGetStandardColorSpaceProfileA( NULL, 0, newprofile, &size );
-    ok( !ret, "GetStandardColorSpaceProfileA() succeeded (%ld)\n", GetLastError() );
+    GLE = GetLastError();
+    todo_wine
+    ok( !ret && GLE == ERROR_FILE_NOT_FOUND, 
+        "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE );
 
     /* Functional checks */
 
@@ -491,27 +507,43 @@ static void test_GetStandardColorSpacePr
 static void test_GetStandardColorSpaceProfileW(void)
 {
     BOOL ret;
-    DWORD size;
+    DWORD size, GLE;
     WCHAR oldprofile[MAX_PATH];
     WCHAR newprofile[MAX_PATH];
 
     /* Parameter checks */
 
+    SetLastError(0);
     ret = pGetStandardColorSpaceProfileW( NULL, 0, newprofile, NULL );
-    ok( !ret, "GetStandardColorSpaceProfileW() succeeded (%ld)\n", GetLastError() );
+    GLE = GetLastError();
+    todo_wine
+    ok( !ret && GLE == ERROR_INVALID_PARAMETER, 
+        "GetStandardColorSpaceProfileW() returns %d (GLE=%ld)\n", ret, GLE );
 
+    SetLastError(0);
     ret = pGetStandardColorSpaceProfileW( machineW, 0, newprofile, &size );
-    ok( !ret, "GetStandardColorSpaceProfileW() succeeded (%ld)\n", GetLastError() );
+    GLE = GetLastError();
+    todo_wine
+    ok( !ret && GLE == ERROR_INVALID_PARAMETER, 
+        "GetStandardColorSpaceProfileW() returns %d (GLE=%ld)\n", ret, GLE );
 
     size = 0;
 
+    SetLastError(0);
     ret = pGetStandardColorSpaceProfileW( NULL, 0, NULL, &size );
-    ok( !ret, "GetStandardColorSpaceProfileW() succeeded (%ld)\n", GetLastError() );
+    GLE = GetLastError();
+    todo_wine
+    ok( !ret && (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND), 
+        "GetStandardColorSpaceProfileW() returns %d (GLE=%ld)\n", ret, GLE );
 
     size = sizeof(newprofile);
 
+    SetLastError(0);
     ret = pGetStandardColorSpaceProfileW( NULL, 0, newprofile, &size );
-    ok( !ret, "GetStandardColorSpaceProfileW() succeeded (%ld)\n", GetLastError() );
+    GLE = GetLastError();
+    todo_wine
+    ok( !ret && GLE == ERROR_FILE_NOT_FOUND, 
+        "GetStandardColorSpaceProfileW() returns %d (GLE=%ld)\n", ret, GLE );
 
     /* Functional checks */
 



More information about the wine-cvs mailing list