From 533380817b0d6f97faf8cdf844228508baa133c7 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard <julliard@winehq.org> Date: Fri, 7 Mar 2008 12:26:36 +0100 Subject: [PATCH] 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 76a8168b6c7..2fd3e138295 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 f142201f3b5..d7e6877f7fd 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; }