mscms: Fix some wine_todo for GetStandardColorSpaceProfile().
Saulius Krasuckas
saulius2 at ar.fi.lt
Thu Jan 12 15:11:33 CST 2006
Log message:
Saulius Krasuckas <saulius.krasuckas at gmail.com>
mscms: Fix some wine_todo for GetStandardColorSpaceProfile().
Index: dlls/mscms/profile.c
===================================================================
RCS file: /home/wine/wine/dlls/mscms/profile.c,v
retrieving revision 1.20
diff -p -u -r1.20 profile.c
--- dlls/mscms/profile.c 6 Jan 2006 20:51:22 -0000 1.20
+++ dlls/mscms/profile.c 12 Jan 2006 19:47:08 -0000
@@ -346,7 +346,17 @@ BOOL WINAPI GetStandardColorSpaceProfile
TRACE( "( 0x%08lx, %p, %p )\n", id, profile, size );
- if (machine || !size) return FALSE;
+ if (machine)
+ {
+ SetLastError(ERROR_NOT_SUPPORTED);
+ return FALSE;
+ }
+
+ if (!size)
+ {
+ SetLastError(ERROR_INSUFFICIENT_BUFFER);
+ return FALSE;
+ }
sizeW = *size * sizeof(WCHAR);
@@ -401,7 +411,18 @@ BOOL WINAPI GetStandardColorSpaceProfile
TRACE( "( 0x%08lx, %p, %p )\n", id, profile, size );
- if (machine || !size) return FALSE;
+ if (machine)
+ {
+ SetLastError(ERROR_NOT_SUPPORTED);
+ return FALSE;
+ }
+
+ if (!size)
+ {
+ SetLastError(ERROR_INSUFFICIENT_BUFFER);
+ return FALSE;
+ }
+
GetColorDirectoryW( machine, rgbprofile, &len );
switch (id)
Index: dlls/mscms/tests/profile.c
===================================================================
RCS file: /home/wine/wine/dlls/mscms/tests/profile.c,v
retrieving revision 1.26
diff -p -u -r1.26 profile.c
--- dlls/mscms/tests/profile.c 12 Jan 2006 12:44:55 -0000 1.26
+++ dlls/mscms/tests/profile.c 12 Jan 2006 19:47:09 -0000
@@ -524,7 +524,6 @@ static void test_GetStandardColorSpacePr
/* Parameter checks */
/* Single invalid parameter checks */
- todo_wine
fail_GSCSPA(machine, SPACE_RGB, newprofile, &size, sizeP, (GLE == ERROR_NOT_SUPPORTED));
todo_wine
fail_GSCSPA(NULL, (DWORD)-1, newprofile, &size, sizeP, (GLE == ERROR_FILE_NOT_FOUND));
@@ -536,7 +535,6 @@ static void test_GetStandardColorSpacePr
fail_GSCSPA(NULL, SPACE_RGB, newprofile, &size, 0, (GLE == ERROR_MORE_DATA || GLE == ERROR_INSUFFICIENT_BUFFER));
/* Several invalid parameter checks */
- todo_wine
fail_GSCSPA(machine, 0, newprofile, &size, 0, (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED));
todo_wine
fail_GSCSPA(NULL, 0, newprofile, NULL, 0, (GLE == ERROR_INVALID_PARAMETER));
@@ -602,7 +600,6 @@ static void test_GetStandardColorSpacePr
/* Parameter checks */
/* Single invalid parameter checks */
- todo_wine
fail_GSCSPW(machineW, SPACE_RGB, newprofile, &size, sizeP, (GLE == ERROR_NOT_SUPPORTED));
todo_wine
fail_GSCSPW(NULL, (DWORD)-1, newprofile, &size, sizeP, (GLE == ERROR_FILE_NOT_FOUND));
@@ -614,7 +611,6 @@ static void test_GetStandardColorSpacePr
fail_GSCSPW(NULL, SPACE_RGB, newprofile, &size, 0, (GLE == ERROR_MORE_DATA || GLE == ERROR_INSUFFICIENT_BUFFER));
/* Several invalid parameter checks */
- todo_wine
fail_GSCSPW(machineW, 0, newprofile, &size, 0, (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED));
todo_wine
fail_GSCSPW(NULL, 0, newprofile, NULL, 0, (GLE == ERROR_INVALID_PARAMETER));
More information about the wine-patches
mailing list