Alexandre Julliard : mscms: Fix a couple of compiler warnings when lcms is missing.
Alexandre Julliard
julliard at winehq.org
Fri Mar 7 05:30:15 CST 2008
Module: wine
Branch: master
Commit: 533380817b0d6f97faf8cdf844228508baa133c7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=533380817b0d6f97faf8cdf844228508baa133c7
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Mar 7 12:26:36 2008 +0100
mscms: Fix a couple of compiler warnings when lcms is missing.
---
dlls/mscms/profile.c | 8 ++++++--
dlls/mscms/stub.c | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c
index 76a8168..2fd3e13 100644
--- a/dlls/mscms/profile.c
+++ b/dlls/mscms/profile.c
@@ -127,9 +127,13 @@ static BOOL set_profile_device_key( PCWSTR file, const BYTE *value, DWORD size )
SetLastError( ERROR_INVALID_PROFILE );
return FALSE;
}
-
+ if (!GetColorProfileHeader( handle, &header ))
+ {
+ CloseColorProfile( handle );
+ SetLastError( ERROR_INVALID_PROFILE );
+ return FALSE;
+ }
RegCreateKeyExW( HKEY_LOCAL_MACHINE, icmW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &icm_key, NULL );
- GetColorProfileHeader( handle, &header );
MSCMS_basename( file, basenameW );
sprintfW( classW, fmtW, (header.phClass >> 24) & 0xff, (header.phClass >> 16) & 0xff,
diff --git a/dlls/mscms/stub.c b/dlls/mscms/stub.c
index f142201..d7e6877 100644
--- a/dlls/mscms/stub.c
+++ b/dlls/mscms/stub.c
@@ -151,7 +151,7 @@ BOOL WINAPI RegisterCMMW( PCWSTR machine, DWORD id, PCWSTR dll )
BOOL WINAPI SelectCMM( DWORD id )
{
- FIXME( "( %s ) stub\n", MSCMS_dbgstr_tag(id) );
+ FIXME( "(%x) stub\n", id );
return TRUE;
}
More information about the wine-cvs
mailing list