Saulius Krasuckas : mscms: Fix four todos for GetStandardColorSpaceProfile[ AW].

Alexandre Julliard julliard at wine.codeweavers.com
Mon Feb 20 05:40:21 CST 2006


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

Author: Saulius Krasuckas <saulius.krasuckas at ieee.org>
Date:   Mon Feb 20 11:13:28 2006 +0100

mscms: Fix four todos for GetStandardColorSpaceProfile[AW].

---

 dlls/mscms/profile.c       |    8 ++++----
 dlls/mscms/tests/profile.c |    4 ----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c
index 8f0279f..6f6ff62 100644
--- a/dlls/mscms/profile.c
+++ b/dlls/mscms/profile.c
@@ -348,13 +348,13 @@ BOOL WINAPI GetStandardColorSpaceProfile
 
     if (machine) 
     {
-        SetLastError(ERROR_NOT_SUPPORTED);
+        SetLastError( ERROR_NOT_SUPPORTED );
         return FALSE;
     }
 
     if (!size) 
     {
-        SetLastError(ERROR_INSUFFICIENT_BUFFER);
+        SetLastError( ERROR_INVALID_PARAMETER );
         return FALSE;
     }
 
@@ -413,13 +413,13 @@ BOOL WINAPI GetStandardColorSpaceProfile
 
     if (machine) 
     {
-        SetLastError(ERROR_NOT_SUPPORTED);
+        SetLastError( ERROR_NOT_SUPPORTED );
         return FALSE;
     }
 
     if (!size) 
     {
-        SetLastError(ERROR_INSUFFICIENT_BUFFER);
+        SetLastError( ERROR_INVALID_PARAMETER );
         return FALSE;
     }
 
diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c
index 5714cb6..2f46e37 100644
--- a/dlls/mscms/tests/profile.c
+++ b/dlls/mscms/tests/profile.c
@@ -601,7 +601,6 @@ static void test_GetStandardColorSpacePr
     fail_GSCSP(A, machine, SPACE_RGB, newprofile, &size, sizeP, FALSE, (GLE == ERROR_NOT_SUPPORTED));
     todo_wine
     fail_GSCSP(A, NULL,    (DWORD)-1, newprofile, &size, sizeP, FALSE, (GLE == ERROR_FILE_NOT_FOUND));
-    todo_wine
     fail_GSCSP(A, NULL,    SPACE_RGB, newprofile, NULL,  sizeP, FALSE, (GLE == ERROR_INVALID_PARAMETER));
 
     if (query_colorspace(SPACE_RGB)) 
@@ -619,7 +618,6 @@ static void test_GetStandardColorSpacePr
 
     /* Several invalid parameter checks */
     fail_GSCSP(A, machine,  0, newprofile, &size, 0,     FALSE, (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED));
-    todo_wine 
     fail_GSCSP(A, NULL,     0, newprofile, NULL,  0,     FALSE, (GLE == ERROR_INVALID_PARAMETER));
     todo_wine 
     fail_GSCSP(A, NULL,     0, NULL,       &size, 0,     FALSE, (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND));
@@ -670,14 +668,12 @@ static void test_GetStandardColorSpacePr
     fail_GSCSP(W, NULL,     (DWORD)-1, newprofile, &size, sizeP, FALSE, (GLE == ERROR_FILE_NOT_FOUND));
     todo_wine
     fail_GSCSP(W, NULL,     SPACE_RGB, NULL,       &size, sizeP, FALSE, (GLE == ERROR_INSUFFICIENT_BUFFER));
-    todo_wine
     fail_GSCSP(W, NULL,     SPACE_RGB, newprofile, NULL,  sizeP, FALSE, (GLE == ERROR_INVALID_PARAMETER));
     todo_wine
     fail_GSCSP(W, NULL,     SPACE_RGB, newprofile, &size, 0,     FALSE, (GLE == ERROR_MORE_DATA || GLE == ERROR_INSUFFICIENT_BUFFER));
 
     /* Several invalid parameter checks */
     fail_GSCSP(W, machineW,  0, newprofile, &size, 0,     FALSE, (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED));
-    todo_wine 
     fail_GSCSP(W, NULL,      0, newprofile, NULL,  0,     FALSE, (GLE == ERROR_INVALID_PARAMETER));
     todo_wine 
     fail_GSCSP(W, NULL,      0, NULL,       &size, 0,     FALSE, (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND));




More information about the wine-cvs mailing list