Skip to content

W
wine-winehq
Commit 5442ddc7 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard
Browse files
Options

mscms: Build without -DWINE_NO_LONG_TYPES.

Signed-off-by: 's avatarHans Leidekker <hans@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 9b11f6fd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 52 deletions
dlls/mscms/Makefile.in
View file @ 5442ddc7
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = mscms.dll
IMPORTLIB = mscms
IMPORTS = $(LCMS2_PE_LIBS) shlwapi advapi32
......
dlls/mscms/mscms_main.c
View file @ 5442ddc7
......@@ -37,9 +37,9 @@ static void lcms_error_handler(cmsContext ctx, cmsUInt32Number error, const char
TRACE("%u %s\n", error, debugstr_a(text));
}
BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, void *reserved )
{
TRACE( "(%p, %d, %p)\n", hinst, reason, reserved );
TRACE( "(%p, %lu, %p)\n", hinst, reason, reserved );
switch (reason)
{
......
dlls/mscms/profile.c
View file @ 5442ddc7
......@@ -328,7 +328,7 @@ BOOL WINAPI GetColorProfileElement( HPROFILE handle, TAGTYPE type, DWORD offset,
BOOL ret;
struct profile *profile = grab_profile( handle );
TRACE( "( %p, 0x%08x, %d, %p, %p, %p )\n", handle, type, offset, size, buffer, ref );
TRACE( "( %p, %#lx, %lu, %p, %p, %p )\n", handle, type, offset, size, buffer, ref );
if (!profile) return FALSE;
......@@ -366,7 +366,7 @@ BOOL WINAPI GetColorProfileElementTag( HPROFILE handle, DWORD index, PTAGTYPE ty
struct profile *profile = grab_profile( handle );
struct tag_entry tag;
TRACE( "( %p, %d, %p )\n", handle, index, type );
TRACE( "( %p, %lu, %p )\n", handle, index, type );
if (!profile) return FALSE;
......@@ -507,7 +507,7 @@ BOOL WINAPI GetStandardColorSpaceProfileA( PCSTR machine, DWORD id, PSTR profile
BOOL ret = FALSE;
DWORD sizeW;
TRACE( "( 0x%08x, %p, %p )\n", id, profile, size );
TRACE( "( %#lx, %p, %p )\n", id, profile, size );
if (machine)
{
......@@ -567,7 +567,7 @@ BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profi
WCHAR rgbprofile[MAX_PATH];
DWORD len = sizeof(rgbprofile);
TRACE( "( 0x%08x, %p, %p )\n", id, profile, size );
TRACE( "( %#lx, %p, %p )\n", id, profile, size );
if (machine)
{
......@@ -663,15 +663,15 @@ static BOOL match_profile( PENUMTYPEW rec, PPROFILEHEADER hdr )
}
if (rec->dwFields & ET_MEDIATYPE)
{
FIXME( "ET_MEDIATYPE: 0x%08x\n", rec->dwMediaType );
FIXME( "ET_MEDIATYPE: %#lx\n", rec->dwMediaType );
}
if (rec->dwFields & ET_DITHERMODE)
{
FIXME( "ET_DITHERMODE: 0x%08x\n", rec->dwDitheringMode );
FIXME( "ET_DITHERMODE: %#lx\n", rec->dwDitheringMode );
}
if (rec->dwFields & ET_RESOLUTION)
{
FIXME( "ET_RESOLUTION: 0x%08x, 0x%08x\n",
FIXME( "ET_RESOLUTION: %#lx, %#lx\n",
rec->dwResolution[0], rec->dwResolution[1] );
}
if (rec->dwFields & ET_DEVICECLASS)
......@@ -710,7 +710,7 @@ static BOOL match_profile( PENUMTYPEW rec, PPROFILEHEADER hdr )
}
if (rec->dwFields & ET_PROFILEFLAGS)
{
TRACE( "ET_PROFILEFLAGS: 0x%08x\n", rec->dwProfileFlags );
TRACE( "ET_PROFILEFLAGS: %#lx\n", rec->dwProfileFlags );
if (rec->dwProfileFlags != hdr->phProfileFlags) return FALSE;
}
if (rec->dwFields & ET_MANUFACTURER)
......@@ -725,14 +725,14 @@ static BOOL match_profile( PENUMTYPEW rec, PPROFILEHEADER hdr )
}
if (rec->dwFields & ET_ATTRIBUTES)
{
TRACE( "ET_ATTRIBUTES: 0x%08x, 0x%08x\n",
TRACE( "ET_ATTRIBUTES: %#lx, %#lx\n",
rec->dwAttributes[0], rec->dwAttributes[1] );
if (rec->dwAttributes[0] != hdr->phAttributes[0] ||
rec->dwAttributes[1] != hdr->phAttributes[1]) return FALSE;
}
if (rec->dwFields & ET_RENDERINGINTENT)
{
TRACE( "ET_RENDERINGINTENT: 0x%08x\n", rec->dwRenderingIntent );
TRACE( "ET_RENDERINGINTENT: %#lx\n", rec->dwRenderingIntent );
if (rec->dwRenderingIntent != hdr->phRenderingIntent) return FALSE;
}
if (rec->dwFields & ET_CREATOR)
......@@ -1095,7 +1095,7 @@ BOOL WINAPI IsColorProfileTagPresent( HPROFILE handle, TAGTYPE type, PBOOL prese
struct profile *profile = grab_profile( handle );
struct tag_entry tag;
TRACE( "( %p, 0x%08x, %p )\n", handle, type, present );
TRACE( "( %p, %#lx, %p )\n", handle, type, present );
if (!profile) return FALSE;
......@@ -1164,7 +1164,7 @@ BOOL WINAPI SetColorProfileElement( HPROFILE handle, TAGTYPE type, DWORD offset,
BOOL ret;
struct profile *profile = grab_profile( handle );
TRACE( "( %p, 0x%08x, %d, %p, %p )\n", handle, type, offset, size, buffer );
TRACE( "( %p, %#lx, %lu, %p, %p )\n", handle, type, offset, size, buffer );
if (!profile) return FALSE;
......@@ -1286,7 +1286,7 @@ HPROFILE WINAPI OpenColorProfileA( PPROFILE profile, DWORD access, DWORD sharing
HPROFILE handle = NULL;
PROFILE profileW;
TRACE( "( %p, 0x%08x, 0x%08x, 0x%08x )\n", profile, access, sharing, creation );
TRACE( "( %p, %#lx, %#lx, %#lx )\n", profile, access, sharing, creation );
if (!profile || !profile->pProfileData) return NULL;
......@@ -1331,7 +1331,7 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing
HANDLE handle = INVALID_HANDLE_VALUE;
DWORD size;
TRACE( "( %p, 0x%08x, 0x%08x, 0x%08x )\n", profile, access, sharing, creation );
TRACE( "( %p, %#lx, %#lx, %#lx )\n", profile, access, sharing, creation );
if (!profile || !profile->pProfileData) return NULL;
......@@ -1381,7 +1381,7 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing
}
if (handle == INVALID_HANDLE_VALUE)
{
WARN( "Unable to open color profile %u\n", GetLastError() );
WARN( "Unable to open color profile %lu\n", GetLastError() );
return NULL;
}
if ((size = GetFileSize( handle, NULL )) == INVALID_FILE_SIZE)
......@@ -1413,7 +1413,7 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing
}
else
{
ERR( "Invalid profile type %u\n", profile->dwType );
ERR( "Invalid profile type %lu\n", profile->dwType );
return NULL;
}
......@@ -1476,7 +1476,7 @@ BOOL WINAPI WcsGetDefaultColorProfileSize( WCS_PROFILE_MANAGEMENT_SCOPE scope, P
COLORPROFILETYPE type, COLORPROFILESUBTYPE subtype,
DWORD profile_id, PDWORD profile_size)
{
FIXME( "%d %s %d %d %d %p\n", scope, debugstr_w(device_name), type, subtype, profile_id, profile_size );
FIXME( "%d, %s, %d, %d, %lu, %p\n", scope, debugstr_w(device_name), type, subtype, profile_id, profile_size );
SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
return FALSE;
}
......@@ -1500,7 +1500,7 @@ HPROFILE WINAPI WcsOpenColorProfileA( PROFILE *cdm, PROFILE *camp, PROFILE *gmmp
PROFILE cdmW, campW = {0}, gmmpW = {0};
HPROFILE ret = NULL;
TRACE( "%p, %p, %p, %08x, %08x, %08x, %08x\n", cdm, camp, gmmp, access, sharing, creation, flags );
TRACE( "%p, %p, %p, %#lx, %#lx, %#lx, %#lx\n", cdm, camp, gmmp, access, sharing, creation, flags );
if (!cdm || !profile_AtoW( cdm, &cdmW )) return NULL;
if (camp && !profile_AtoW( camp, &campW )) goto done;
......@@ -1521,7 +1521,7 @@ done:
HPROFILE WINAPI WcsOpenColorProfileW( PROFILE *cdm, PROFILE *camp, PROFILE *gmmp, DWORD access, DWORD sharing,
DWORD creation, DWORD flags )
{
TRACE( "%p, %p, %p, %08x, %08x, %08x, %08x\n", cdm, camp, gmmp, access, sharing, creation, flags );
TRACE( "%p, %p, %p, %#lx, %#lx, %#lx, %#lx\n", cdm, camp, gmmp, access, sharing, creation, flags );
FIXME("no support for WCS profiles\n" );
return OpenColorProfileW( cdm, access, sharing, creation );
......
dlls/mscms/stub.c
View file @ 5442ddc7
......@@ -35,7 +35,7 @@ BOOL WINAPI CheckBitmapBits( HTRANSFORM transform, PVOID srcbits, BMFORMAT forma
DWORD height, DWORD stride, PBYTE result, PBMCALLBACKFN callback,
LPARAM data )
{
FIXME( "( %p, %p, 0x%08x, 0x%08x, 0x%08x, 0x%08x, %p, %p, 0x%08lx ) stub\n",
FIXME( "( %p, %p, %#x, %#lx, %#lx, %#lx, %p, %p, %#Ix ) stub\n",
transform, srcbits, format, width, height, stride, result, callback, data );
return FALSE;
......@@ -44,21 +44,21 @@ BOOL WINAPI CheckBitmapBits( HTRANSFORM transform, PVOID srcbits, BMFORMAT forma
BOOL WINAPI CheckColors( HTRANSFORM transform, PCOLOR colors, DWORD number, COLORTYPE type,
PBYTE result )
{
FIXME( "( %p, %p, 0x%08x, 0x%08x, %p ) stub\n", transform, colors, number, type, result );
FIXME( "( %p, %p, %#lx, %#x, %p ) stub\n", transform, colors, number, type, result );
return FALSE;
}
BOOL WINAPI ConvertColorNameToIndex( HPROFILE profile, PCOLOR_NAME name, PDWORD index, DWORD count )
{
FIXME( "( %p, %p, %p, 0x%08x ) stub\n", profile, name, index, count );
FIXME( "( %p, %p, %p, %#lx ) stub\n", profile, name, index, count );
return FALSE;
}
BOOL WINAPI ConvertIndexToColorName( HPROFILE profile, PDWORD index, PCOLOR_NAME name, DWORD count )
{
FIXME( "( %p, %p, %p, 0x%08x ) stub\n", profile, index, name, count );
FIXME( "( %p, %p, %p, %#lx ) stub\n", profile, index, name, count );
return FALSE;
}
......@@ -66,7 +66,7 @@ BOOL WINAPI ConvertIndexToColorName( HPROFILE profile, PDWORD index, PCOLOR_NAME
BOOL WINAPI CreateDeviceLinkProfile( PHPROFILE profiles, DWORD nprofiles, PDWORD intents,
DWORD nintents, DWORD flags, PBYTE *data, DWORD index )
{
FIXME( "( %p, 0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08x ) stub\n",
FIXME( "( %p, %#lx, %p, %#lx, %#lx, %p, %#lx ) stub\n",
profiles, nprofiles, intents, nintents, flags, data, index );
return FALSE;
......@@ -90,7 +90,7 @@ DWORD WINAPI GenerateCopyFilePaths( LPCWSTR printer, LPCWSTR directory, LPBYTE c
DWORD level, LPWSTR sourcedir, LPDWORD sourcedirsize,
LPWSTR targetdir, LPDWORD targetdirsize, DWORD flags )
{
FIXME( "( %s, %s, %p, 0x%08x, %p, %p, %p, %p, 0x%08x ) stub\n",
FIXME( "( %s, %s, %p, %#lx, %p, %p, %p, %p, %#lx ) stub\n",
debugstr_w(printer), debugstr_w(directory), clientinfo, level, sourcedir,
sourcedirsize, targetdir, targetdirsize, flags );
return ERROR_SUCCESS;
......@@ -98,7 +98,7 @@ DWORD WINAPI GenerateCopyFilePaths( LPCWSTR printer, LPCWSTR directory, LPBYTE c
DWORD WINAPI GetCMMInfo( HTRANSFORM transform, DWORD info )
{
FIXME( "( %p, 0x%08x ) stub\n", transform, info );
FIXME( "( %p, %#lx ) stub\n", transform, info );
return 0;
}
......@@ -113,14 +113,14 @@ BOOL WINAPI GetNamedProfileInfo( HPROFILE profile, PNAMED_PROFILE_INFO info )
BOOL WINAPI GetPS2ColorRenderingDictionary( HPROFILE profile, DWORD intent, PBYTE buffer,
PDWORD size, PBOOL binary )
{
FIXME( "( %p, 0x%08x, %p, %p, %p ) stub\n", profile, intent, buffer, size, binary );
FIXME( "( %p, %#lx, %p, %p, %p ) stub\n", profile, intent, buffer, size, binary );
return FALSE;
}
BOOL WINAPI GetPS2ColorRenderingIntent( HPROFILE profile, DWORD intent, PBYTE buffer, PDWORD size )
{
FIXME( "( %p, 0x%08x, %p, %p ) stub\n", profile, intent, buffer, size );
FIXME( "( %p, %#lx, %p, %p ) stub\n", profile, intent, buffer, size );
return FALSE;
}
......@@ -128,7 +128,7 @@ BOOL WINAPI GetPS2ColorRenderingIntent( HPROFILE profile, DWORD intent, PBYTE bu
BOOL WINAPI GetPS2ColorSpaceArray( HPROFILE profile, DWORD intent, DWORD type, PBYTE buffer,
PDWORD size, PBOOL binary )
{
FIXME( "( %p, 0x%08x, 0x%08x, %p, %p, %p ) stub\n", profile, intent, type, buffer, size, binary );
FIXME( "( %p, %#lx, %#lx, %p, %p, %p ) stub\n", profile, intent, type, buffer, size, binary );
return FALSE;
}
......@@ -156,33 +156,33 @@ BOOL WINAPI SelectCMM( DWORD id )
BOOL WINAPI SetColorProfileElementReference( HPROFILE profile, TAGTYPE type, TAGTYPE ref )
{
FIXME( "( %p, 0x%08x, 0x%08x ) stub\n", profile, type, ref );
FIXME( "( %p, %#lx, %#lx ) stub\n", profile, type, ref );
return TRUE;
}
BOOL WINAPI SetColorProfileElementSize( HPROFILE profile, TAGTYPE type, DWORD size )
{
FIXME( "( %p, 0x%08x, 0x%08x ) stub\n", profile, type, size );
FIXME( "( %p, %#lx, %#lx ) stub\n", profile, type, size );
return FALSE;
}
BOOL WINAPI SetStandardColorSpaceProfileA( PCSTR machine, DWORD id, PSTR profile )
{
FIXME( "( 0x%08x, %p ) stub\n", id, profile );
FIXME( "( %#lx, %p ) stub\n", id, profile );
return TRUE;
}
BOOL WINAPI SetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profile )
{
FIXME( "( 0x%08x, %p ) stub\n", id, profile );
FIXME( "( %#lx, %p ) stub\n", id, profile );
return TRUE;
}
BOOL WINAPI SpoolerCopyFileEvent( LPWSTR printer, LPWSTR key, DWORD event )
{
FIXME( "( %s, %s, 0x%08x ) stub\n", debugstr_w(printer), debugstr_w(key), event );
FIXME( "( %s, %s, %#lx ) stub\n", debugstr_w(printer), debugstr_w(key), event );
return TRUE;
}
......
dlls/mscms/tests/Makefile.in
View file @ 5442ddc7
EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = mscms.dll
IMPORTS = advapi32
......
dlls/mscms/transform.c
View file @ 5442ddc7
......@@ -48,13 +48,13 @@ static DWORD from_bmformat( BMFORMAT format )
default:
if (!quietfixme)
{
FIXME( "unhandled bitmap format %08x\n", format );
FIXME( "unhandled bitmap format %#x\n", format );
quietfixme = TRUE;
}
ret = TYPE_RGB_8;
break;
}
TRACE( "color space: %08x -> %08x\n", format, ret );
TRACE( "color space: %#x -> %#lx\n", format, ret );
return ret;
}
......@@ -76,7 +76,7 @@ static DWORD from_type( COLORTYPE type )
break;
}
TRACE( "color type: %08x -> %08x\n", type, ret );
TRACE( "color type: %#x -> %#lx\n", type, ret );
return ret;
}
......@@ -85,13 +85,12 @@ static DWORD from_type( COLORTYPE type )
*
* See CreateColorTransformW.
*/
HTRANSFORM WINAPI CreateColorTransformA( LPLOGCOLORSPACEA space, HPROFILE dest,
HPROFILE target, DWORD flags )
HTRANSFORM WINAPI CreateColorTransformA( LPLOGCOLORSPACEA space, HPROFILE dest, HPROFILE target, DWORD flags )
{
LOGCOLORSPACEW spaceW;
DWORD len;
TRACE( "( %p, %p, %p, 0x%08x )\n", space, dest, target, flags );
TRACE( "( %p, %p, %p, %#lx )\n", space, dest, target, flags );
if (!space || !dest) return FALSE;
......@@ -119,8 +118,7 @@ HTRANSFORM WINAPI CreateColorTransformA( LPLOGCOLORSPACEA space, HPROFILE dest,
* Success: Handle to a transform.
* Failure: NULL
*/
HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest,
HPROFILE target, DWORD flags )
HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest, HPROFILE target, DWORD flags )
{
HTRANSFORM ret = NULL;
cmsHTRANSFORM transform;
......@@ -129,7 +127,7 @@ HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest,
cmsHPROFILE input;
int intent;
TRACE( "( %p, %p, %p, 0x%08x )\n", space, dest, target, flags );
TRACE( "( %p, %p, %p, %#lx )\n", space, dest, target, flags );
if (!space || !(dst = grab_profile( dest ))) return FALSE;
......@@ -140,7 +138,7 @@ HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest,
}
intent = space->lcsIntent > 3 ? INTENT_PERCEPTUAL : space->lcsIntent;
TRACE( "lcsIntent: %x\n", space->lcsIntent );
TRACE( "lcsIntent: %#lx\n", space->lcsIntent );
TRACE( "lcsCSType: %s\n", dbgstr_tag( space->lcsCSType ) );
TRACE( "lcsFilename: %s\n", debugstr_w( space->lcsFilename ) );
......@@ -186,8 +184,7 @@ HTRANSFORM WINAPI CreateMultiProfileTransform( PHPROFILE profiles, DWORD nprofil
cmsHTRANSFORM transform;
struct profile *profile0, *profile1;
TRACE( "( %p, 0x%08x, %p, 0x%08x, 0x%08x, 0x%08x )\n",
profiles, nprofiles, intents, nintents, flags, cmm );
TRACE( "( %p, %#lx, %p, %lu, %#lx, %#lx )\n", profiles, nprofiles, intents, nintents, flags, cmm );
if (!profiles || !nprofiles || !intents) return NULL;
......@@ -265,7 +262,7 @@ BOOL WINAPI TranslateBitmapBits( HTRANSFORM handle, PVOID srcbits, BMFORMAT inpu
BOOL ret;
cmsHTRANSFORM transform = grab_transform( handle );
TRACE( "( %p, %p, 0x%08x, 0x%08x, 0x%08x, 0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08x )\n",
TRACE( "( %p, %p, %#x, %lu, %lu, %lu, %p, %#x, %lu, %p, %#lx )\n",
handle, srcbits, input, width, height, inputstride, destbits, output,
outputstride, callback, data );
......@@ -300,7 +297,7 @@ BOOL WINAPI TranslateColors( HTRANSFORM handle, PCOLOR in, DWORD count,
unsigned int i;
cmsHTRANSFORM transform = grab_transform( handle );
TRACE( "( %p, %p, %d, %d, %p, %d )\n", handle, in, count, input_type, out, output_type );
TRACE( "( %p, %p, %lu, %d, %p, %d )\n", handle, in, count, input_type, out, output_type );
if (!transform) return FALSE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment