Saulius Krasuckas : mscms: One more LastError code fixed.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Feb 27 09:33:03 CST 2006
Module: wine
Branch: refs/heads/master
Commit: 9f19f75a54f0e16f5cbb9a3f3762c979a11e97ee
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9f19f75a54f0e16f5cbb9a3f3762c979a11e97ee
Author: Saulius Krasuckas <saulius.krasuckas at ieee.org>
Date: Sat Feb 25 10:22:36 2006 +0200
mscms: One more LastError code fixed.
---
dlls/mscms/profile.c | 6 ++++++
dlls/mscms/tests/profile.c | 4 ----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c
index 6f6ff62..5fbf898 100644
--- a/dlls/mscms/profile.c
+++ b/dlls/mscms/profile.c
@@ -423,6 +423,12 @@ BOOL WINAPI GetStandardColorSpaceProfile
return FALSE;
}
+ if (!profile)
+ {
+ SetLastError( ERROR_INSUFFICIENT_BUFFER );
+ return FALSE;
+ }
+
GetColorDirectoryW( machine, rgbprofile, &len );
switch (id)
diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c
index 2f46e37..8c7d0aa 100644
--- a/dlls/mscms/tests/profile.c
+++ b/dlls/mscms/tests/profile.c
@@ -605,7 +605,6 @@ static void test_GetStandardColorSpacePr
if (query_colorspace(SPACE_RGB))
{
- todo_wine
fail_GSCSP(A, NULL, SPACE_RGB, NULL, &size, sizeP, FALSE, (GLE == ERROR_INSUFFICIENT_BUFFER));
todo_wine
fail_GSCSP(A, NULL, SPACE_RGB, newprofile, &size, 0, FALSE, (GLE == ERROR_MORE_DATA || GLE == ERROR_INSUFFICIENT_BUFFER));
@@ -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));
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));
todo_wine
fail_GSCSP(A, NULL, 0, newprofile, &size, sizeP, TRUE, (GLE == ERROR_FILE_NOT_FOUND));
@@ -666,7 +664,6 @@ static void test_GetStandardColorSpacePr
fail_GSCSP(W, machineW, SPACE_RGB, newprofile, &size, sizeP, FALSE, (GLE == ERROR_NOT_SUPPORTED));
todo_wine
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));
fail_GSCSP(W, NULL, SPACE_RGB, newprofile, NULL, sizeP, FALSE, (GLE == ERROR_INVALID_PARAMETER));
todo_wine
@@ -675,7 +672,6 @@ static void test_GetStandardColorSpacePr
/* Several invalid parameter checks */
fail_GSCSP(W, machineW, 0, newprofile, &size, 0, FALSE, (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED));
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));
todo_wine
fail_GSCSP(W, NULL, 0, newprofile, &size, sizeP, TRUE, (GLE == ERROR_FILE_NOT_FOUND));
More information about the wine-cvs
mailing list