- Wine-Devel - list.winehq.org

[PATCH v2] mscms: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker Feb. 11, 2022

Feb. 11, 2022

v2: Rebase. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mscms/Makefile.in | 1 - dlls/mscms/mscms_main.c | 4 +- dlls/mscms/profile.c | 38 ++-- dlls/mscms/stub.c | 30 +-- dlls/mscms/tests/Makefile.in | 1 - dlls/mscms/tests/profile.c | 372 +++++++++++++++++------------------ dlls/mscms/transform.c | 25 ++- 7 files changed, 232 insertions(+), 239 deletions(-) diff --git a/dlls/mscms/Makefile.in b/dlls/mscms/Makefile.in index f28f90327f4..d57cc54e3c6 100644 --- a/dlls/mscms/Makefile.in +++ b/dlls/mscms/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mscms.dll IMPORTLIB = mscms IMPORTS = $(LCMS2_PE_LIBS) shlwapi advapi32 diff --git a/dlls/mscms/mscms_main.c b/dlls/mscms/mscms_main.c index 1ea2eaef832..8c7e7c9e498 100644 --- a/dlls/mscms/mscms_main.c +++ b/dlls/mscms/mscms_main.c @@ -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) { diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 83bfcb50143..2c20b857a81 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -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 ); diff --git a/dlls/mscms/stub.c b/dlls/mscms/stub.c index 28c08e20868..6ac777a86f7 100644 --- a/dlls/mscms/stub.c +++ b/dlls/mscms/stub.c @@ -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; } diff --git a/dlls/mscms/tests/Makefile.in b/dlls/mscms/tests/Makefile.in index e9ff9724e2f..2d229c049ab 100644 --- a/dlls/mscms/tests/Makefile.in +++ b/dlls/mscms/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mscms.dll IMPORTS = advapi32 diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index be4eaa66c00..e0bfbd70e10 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -161,29 +161,25 @@ static void test_GetColorDirectoryA(void) /* Parameter checks */ ret = pGetColorDirectoryA( NULL, NULL, NULL ); - ok( !ret, "GetColorDirectoryA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorDirectoryA() succeeded (%lu)\n", GetLastError() ); size = 0; - ret = pGetColorDirectoryA( NULL, NULL, &size ); - ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%lu)\n", GetLastError() ); size = 0; - ret = pGetColorDirectoryA( NULL, buffer, &size ); - ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%lu)\n", GetLastError() ); size = 1; - ret = pGetColorDirectoryA( NULL, buffer, &size ); - ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ size = sizeof(buffer); - ret = pGetColorDirectoryA( NULL, buffer, &size ); - ok( ret && size > 0, "GetColorDirectoryA() failed (%d)\n", GetLastError() ); + ok( ret && size > 0, "GetColorDirectoryA() failed (%lu)\n", GetLastError() ); } static void test_GetColorDirectoryW(void) @@ -195,33 +191,27 @@ static void test_GetColorDirectoryW(void) /* Parameter checks */ /* This one crashes win2k - ret = pGetColorDirectoryW( NULL, NULL, NULL ); - ok( !ret, "GetColorDirectoryW() succeeded (%d)\n", GetLastError() ); - + ok( !ret, "GetColorDirectoryW() succeeded (%lu)\n", GetLastError() ); */ size = 0; - ret = pGetColorDirectoryW( NULL, NULL, &size ); - ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%lu)\n", GetLastError() ); size = 0; - ret = pGetColorDirectoryW( NULL, buffer, &size ); - ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%lu)\n", GetLastError() ); size = 1; - ret = pGetColorDirectoryW( NULL, buffer, &size ); - ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ size = sizeof(buffer); - ret = pGetColorDirectoryW( NULL, buffer, &size ); - ok( ret && size > 0, "GetColorDirectoryW() failed (%d)\n", GetLastError() ); + ok( ret && size > 0, "GetColorDirectoryW() failed (%lu)\n", GetLastError() ); } static void test_GetColorProfileElement( char *standardprofile ) @@ -241,15 +231,15 @@ static void test_GetColorProfileElement( char *standardprofile ) profile.cbDataSize = strlen(standardprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ ret = pGetColorProfileElement( handle, tag, 0, NULL, NULL, &ref ); - ok( !ret, "GetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElement() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileElement( handle, tag, 0, &size, NULL, NULL ); - ok( !ret, "GetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElement() succeeded (%lu)\n", GetLastError() ); size = 0; ret = pGetColorProfileElement( handle, tag, 0, &size, NULL, &ref ); @@ -260,7 +250,7 @@ static void test_GetColorProfileElement( char *standardprofile ) size = sizeof(buffer); ret = pGetColorProfileElement( handle, tag, 0, &size, buffer, &ref ); - ok( ret, "GetColorProfileElement() failed %u\n", GetLastError() ); + ok( ret, "GetColorProfileElement() failed %lu\n", GetLastError() ); ok( size > 0, "wrong size\n" ); ok( !memcmp( buffer, expect, sizeof(expect)-1 ), "Unexpected tag data\n" ); @@ -283,27 +273,26 @@ static void test_GetColorProfileElementTag( char *standardprofile ) profile.cbDataSize = strlen(standardprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ ret = pGetColorProfileElementTag( NULL, index, &tag ); - ok( !ret, "GetColorProfileElementTag() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElementTag() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileElementTag( handle, 0, &tag ); - ok( !ret, "GetColorProfileElementTag() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElementTag() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileElementTag( handle, index, NULL ); - ok( !ret, "GetColorProfileElementTag() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElementTag() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileElementTag( handle, 18, NULL ); - ok( !ret, "GetColorProfileElementTag() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElementTag() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ while ((ret = pGetColorProfileElementTag( handle, index, &tag )) && tag != expect) index++; - ok( ret && tag == expect, "GetColorProfileElementTag() failed (%d)\n", - GetLastError() ); + ok( ret && tag == expect, "GetColorProfileElementTag() failed (%lu)\n", GetLastError() ); pCloseColorProfile( handle ); } @@ -325,40 +314,40 @@ static void test_GetColorProfileFromHandle( char *testprofile ) profile.cbDataSize = strlen(testprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ size = 0; ret = pGetColorProfileFromHandle( handle, NULL, &size ); - ok( !ret && size > 0, "GetColorProfileFromHandle() failed (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorProfileFromHandle() failed (%lu)\n", GetLastError() ); buffer = HeapAlloc( GetProcessHeap(), 0, size ); if (buffer) { ret = pGetColorProfileFromHandle( NULL, buffer, &size ); - ok( !ret, "GetColorProfileFromHandle() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileFromHandle() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileFromHandle( handle, buffer, NULL ); - ok( !ret, "GetColorProfileFromHandle() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileFromHandle() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ ret = pGetColorProfileFromHandle( handle, buffer, &size ); - ok( ret && size > 0, "GetColorProfileFromHandle() failed (%d)\n", GetLastError() ); + ok( ret && size > 0, "GetColorProfileFromHandle() failed (%lu)\n", GetLastError() ); header = (PROFILEHEADER *)buffer; - ok( header->phClass == 0x72746e6d, "wrong phClass %x\n", header->phClass ); - ok( header->phDataColorSpace == 0x20424752, "wrong phDataColorSpace %x\n", header->phDataColorSpace ); - ok( header->phConnectionSpace == 0x205a5958, "wrong phConnectionSpace %x\n", header->phConnectionSpace ); - ok( header->phSignature == 0x70736361, "wrong phSignature %x\n", header->phSignature ); - ok( header->phProfileFlags == 0x00000000, "wrong phProfileFlags %x\n", header->phProfileFlags ); - ok( header->phRenderingIntent == 0x00000000, "wrong phRenderingIntent %x\n", header->phRenderingIntent ); - ok( header->phIlluminant.ciexyzX == 0xd6f60000, "wrong phIlluminant.ciexyzX %x\n", header->phIlluminant.ciexyzX ); - ok( header->phIlluminant.ciexyzY == 0x00000100, "wrong phIlluminant.ciexyzY %x\n", header->phIlluminant.ciexyzY ); - ok( header->phIlluminant.ciexyzZ == 0x2dd30000, "wrong phIlluminant.ciexyzZ %x\n", header->phIlluminant.ciexyzZ ); + ok( header->phClass == 0x72746e6d, "wrong phClass %lx\n", header->phClass ); + ok( header->phDataColorSpace == 0x20424752, "wrong phDataColorSpace %lx\n", header->phDataColorSpace ); + ok( header->phConnectionSpace == 0x205a5958, "wrong phConnectionSpace %lx\n", header->phConnectionSpace ); + ok( header->phSignature == 0x70736361, "wrong phSignature %lx\n", header->phSignature ); + ok( header->phProfileFlags == 0x00000000, "wrong phProfileFlags %lx\n", header->phProfileFlags ); + ok( header->phRenderingIntent == 0x00000000, "wrong phRenderingIntent %lx\n", header->phRenderingIntent ); + ok( header->phIlluminant.ciexyzX == 0xd6f60000, "wrong phIlluminant.ciexyzX %lx\n", header->phIlluminant.ciexyzX ); + ok( header->phIlluminant.ciexyzY == 0x00000100, "wrong phIlluminant.ciexyzY %lx\n", header->phIlluminant.ciexyzY ); + ok( header->phIlluminant.ciexyzZ == 0x2dd30000, "wrong phIlluminant.ciexyzZ %lx\n", header->phIlluminant.ciexyzZ ); HeapFree( GetProcessHeap(), 0, buffer ); } @@ -381,36 +370,36 @@ static void test_GetColorProfileHeader( char *testprofile ) profile.cbDataSize = strlen(testprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ ret = pGetColorProfileHeader( NULL, NULL ); - ok( !ret, "GetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileHeader( NULL, &header ); - ok( !ret, "GetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); if (0) /* Crashes on Vista */ { ret = pGetColorProfileHeader( handle, NULL ); - ok( !ret, "GetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); } /* Functional checks */ ret = pGetColorProfileHeader( handle, &header ); - ok( ret, "GetColorProfileHeader() failed (%d)\n", GetLastError() ); - - ok( header.phClass == 0x6d6e7472, "wrong phClass %x\n", header.phClass ); - ok( header.phDataColorSpace == 0x52474220, "wrong phDataColorSpace %x\n", header.phDataColorSpace ); - ok( header.phConnectionSpace == 0x58595a20, "wrong phConnectionSpace %x\n", header.phConnectionSpace ); - ok( header.phSignature == 0x61637370, "wrong phSignature %x\n", header.phSignature ); - ok( header.phProfileFlags == 0x00000000, "wrong phProfileFlags %x\n", header.phProfileFlags ); - ok( header.phRenderingIntent == 0x00000000, "wrong phRenderingIntent %x\n", header.phRenderingIntent ); - ok( header.phIlluminant.ciexyzX == 0x0000f6d6, "wrong phIlluminant.ciexyzX %x\n", header.phIlluminant.ciexyzX ); - ok( header.phIlluminant.ciexyzY == 0x00010000, "wrong phIlluminant.ciexyzY %x\n", header.phIlluminant.ciexyzY ); - ok( header.phIlluminant.ciexyzZ == 0x0000d32d, "wrong phIlluminant.ciexyzZ %x\n", header.phIlluminant.ciexyzZ ); + ok( ret, "GetColorProfileHeader() failed (%lu)\n", GetLastError() ); + + ok( header.phClass == 0x6d6e7472, "wrong phClass %#lx\n", header.phClass ); + ok( header.phDataColorSpace == 0x52474220, "wrong phDataColorSpace %#lx\n", header.phDataColorSpace ); + ok( header.phConnectionSpace == 0x58595a20, "wrong phConnectionSpace %#lx\n", header.phConnectionSpace ); + ok( header.phSignature == 0x61637370, "wrong phSignature %#lx\n", header.phSignature ); + ok( header.phProfileFlags == 0x00000000, "wrong phProfileFlags %#lx\n", header.phProfileFlags ); + ok( header.phRenderingIntent == 0x00000000, "wrong phRenderingIntent %#lx\n", header.phRenderingIntent ); + ok( header.phIlluminant.ciexyzX == 0x0000f6d6, "wrong phIlluminant.ciexyzX %#lx\n", header.phIlluminant.ciexyzX ); + ok( header.phIlluminant.ciexyzY == 0x00010000, "wrong phIlluminant.ciexyzY %#lx\n", header.phIlluminant.ciexyzY ); + ok( header.phIlluminant.ciexyzZ == 0x0000d32d, "wrong phIlluminant.ciexyzZ %#lx\n", header.phIlluminant.ciexyzZ ); pCloseColorProfile( handle ); } @@ -430,23 +419,21 @@ static void test_GetCountColorProfileElements( char *standardprofile ) profile.cbDataSize = strlen(standardprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ ret = pGetCountColorProfileElements( NULL, &count ); - ok( !ret, "GetCountColorProfileElements() succeeded (%d)\n", - GetLastError() ); + ok( !ret, "GetCountColorProfileElements() succeeded (%lu)\n", GetLastError() ); ret = pGetCountColorProfileElements( handle, NULL ); - ok( !ret, "GetCountColorProfileElements() succeeded (%d)\n", - GetLastError() ); + ok( !ret, "GetCountColorProfileElements() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ ret = pGetCountColorProfileElements( handle, &count ); ok( ret && count > 15 && count < 20, - "GetCountColorProfileElements() failed (%d) %u\n", GetLastError(), count ); + "GetCountColorProfileElements() failed (%lu) %lu\n", GetLastError(), count ); pCloseColorProfile( handle ); } @@ -466,28 +453,32 @@ static void test_GetStandardColorSpaceProfileA( char *standardprofile ) size = sizeof(newprofile); SetLastError(0xfaceabee); /* 1st param, */ ret = pGetStandardColorSpaceProfileA(machine, LCS_sRGB, newprofile, &size); - ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 2nd param, */ ret = pGetStandardColorSpaceProfileA(NULL, (DWORD)-1, newprofile, &size); - ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 4th param, */ ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, newprofile, NULL); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 3rd param, */ ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, NULL, &size); - ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = 0; SetLastError(0xfaceabee); /* dereferenced 4th param, */ ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, newprofile, &size); ok( !ret && (GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); /* Several invalid parameter checks: */ @@ -495,30 +486,32 @@ static void test_GetStandardColorSpaceProfileA( char *standardprofile ) SetLastError(0xfaceabee); /* 1st, maybe 2nd and then dereferenced 4th param, */ ret = pGetStandardColorSpaceProfileA(machine, 0, newprofile, &size); ok( !ret && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_NOT_SUPPORTED), - "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); SetLastError(0xfaceabee); /* maybe 2nd and then 4th param, */ ret = pGetStandardColorSpaceProfileA(NULL, 0, newprofile, NULL); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = 0; SetLastError(0xfaceabee); /* maybe 2nd, then 3rd and dereferenced 4th param, */ ret = pGetStandardColorSpaceProfileA(NULL, 0, NULL, &size); ok( !ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER || GetLastError() == ERROR_FILE_NOT_FOUND), - "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* maybe 2nd param. */ ret = pGetStandardColorSpaceProfileA(NULL, 0, newprofile, &size); - if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); else ok( !lstrcmpiA( newprofile, "" ) && GetLastError() == 0xfaceabee, - "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); /* Functional checks */ size = sizeof(oldprofile); ret = pGetStandardColorSpaceProfileA( NULL, LCS_sRGB, oldprofile, &size ); - ok( ret, "GetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "GetStandardColorSpaceProfileA() failed (%lu)\n", GetLastError() ); SetLastError(0xdeadbeef); ret = pSetStandardColorSpaceProfileA( NULL, LCS_sRGB, standardprofile ); @@ -527,14 +520,14 @@ static void test_GetStandardColorSpaceProfileA( char *standardprofile ) skip("Not enough rights for SetStandardColorSpaceProfileA\n"); return; } - ok( ret, "SetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "SetStandardColorSpaceProfileA() failed (%lu)\n", GetLastError() ); size = sizeof(newprofile); ret = pGetStandardColorSpaceProfileA( NULL, LCS_sRGB, newprofile, &size ); - ok( ret, "GetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "GetStandardColorSpaceProfileA() failed (%lu)\n", GetLastError() ); ret = pSetStandardColorSpaceProfileA( NULL, LCS_sRGB, oldprofile ); - ok( ret, "SetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "SetStandardColorSpaceProfileA() failed (%lu)\n", GetLastError() ); } static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) @@ -552,19 +545,21 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) size = sizeof(newprofile); SetLastError(0xfaceabee); /* 1st param, */ ret = pGetStandardColorSpaceProfileW(machineW, LCS_sRGB, newprofile, &size); - ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 2nd param, */ ret = pGetStandardColorSpaceProfileW(NULL, (DWORD)-1, newprofile, &size); - ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 2nd param, */ ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &size); ok( (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) || broken(ret), /* Win98 and WinME */ - "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 3rd param, */ @@ -572,12 +567,13 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) ok( !ret || broken(ret) /* win98 */, "GetStandardColorSpaceProfileW succeeded\n" ); ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER || broken(GetLastError() == 0xfaceabee) /* win98 */, - "GetStandardColorSpaceProfileW() returns GLE=%u\n", GetLastError() ); + "GetStandardColorSpaceProfileW() returns GLE=%lu\n", GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 4th param, */ ret = pGetStandardColorSpaceProfileW(NULL, LCS_sRGB, newprofile, NULL); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = 0; SetLastError(0xfaceabee); /* dereferenced 4th param. */ @@ -586,7 +582,7 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) ok( GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER || broken(GetLastError() == 0xfaceabee) /* win98 */, - "GetStandardColorSpaceProfileW() returns GLE=%u\n", GetLastError() ); + "GetStandardColorSpaceProfileW() returns GLE=%lu\n", GetLastError() ); /* Several invalid parameter checks: */ @@ -594,11 +590,12 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) SetLastError(0xfaceabee); /* 1st, maybe 2nd and then dereferenced 4th param, */ ret = pGetStandardColorSpaceProfileW(machineW, 0, newprofile, &size); ok( !ret && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_NOT_SUPPORTED), - "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", ret, GetLastError() ); SetLastError(0xfaceabee); /* maybe 2nd and then 4th param, */ ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, NULL); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = 0; SetLastError(0xfaceabee); /* maybe 2nd, then 3rd and dereferenced 4th param, */ @@ -607,24 +604,25 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER || GetLastError() == ERROR_FILE_NOT_FOUND || broken(GetLastError() == 0xfaceabee) /* win98 */, - "GetStandardColorSpaceProfileW() returns GLE=%u\n", GetLastError() ); + "GetStandardColorSpaceProfileW() returns GLE=%lu\n", GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* maybe 2nd param. */ ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &size); - if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", + ret, GetLastError() ); else { WideCharToMultiByte(CP_ACP, 0, newprofile, -1, newprofileA, sizeof(newprofileA), NULL, NULL); ok( !lstrcmpiA( newprofileA, "" ) && GetLastError() == 0xfaceabee, - "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", ret, GetLastError() ); } /* Functional checks */ size = sizeof(oldprofile); ret = pGetStandardColorSpaceProfileW( NULL, LCS_sRGB, oldprofile, &size ); - ok( ret, "GetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "GetStandardColorSpaceProfileW() failed (%lu)\n", GetLastError() ); SetLastError(0xdeadbeef); ret = pSetStandardColorSpaceProfileW( NULL, LCS_sRGB, standardprofileW ); @@ -633,14 +631,14 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) skip("Not enough rights for SetStandardColorSpaceProfileW\n"); return; } - ok( ret, "SetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "SetStandardColorSpaceProfileW() failed (%lu)\n", GetLastError() ); size = sizeof(newprofile); ret = pGetStandardColorSpaceProfileW( NULL, LCS_sRGB, newprofile, &size ); - ok( ret, "GetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "GetStandardColorSpaceProfileW() failed (%lu)\n", GetLastError() ); ret = pSetStandardColorSpaceProfileW( NULL, LCS_sRGB, oldprofile ); - ok( ret, "SetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "SetStandardColorSpaceProfileW() failed (%lu)\n", GetLastError() ); } static void test_EnumColorProfilesA( char *standardprofile ) @@ -663,7 +661,7 @@ static void test_EnumColorProfilesA( char *standardprofile ) SetLastError( 0xdeadbeef ); ret = pEnumColorProfilesA( NULL, &record, NULL, &total, &number ); ok( !ret, "EnumColorProfilesA succeeded\n" ); - if (have_color_profile) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError() ); + if (have_color_profile) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError() ); buffer = HeapAlloc( GetProcessHeap(), 0, total ); size = total; @@ -678,7 +676,7 @@ static void test_EnumColorProfilesA( char *standardprofile ) ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) - ok( ret, "EnumColorProfilesA failed %u\n", GetLastError() ); + ok( ret, "EnumColorProfilesA failed %lu\n", GetLastError() ); size = 0; ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); @@ -689,7 +687,7 @@ static void test_EnumColorProfilesA( char *standardprofile ) size = total; ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) - ok( ret, "EnumColorProfilesA failed %u\n", GetLastError() ); + ok( ret, "EnumColorProfilesA failed %lu\n", GetLastError() ); HeapFree( GetProcessHeap(), 0, buffer ); } @@ -714,7 +712,7 @@ static void test_EnumColorProfilesW( WCHAR *standardprofileW ) SetLastError( 0xdeadbeef ); ret = pEnumColorProfilesW( NULL, &record, NULL, &total, &number ); ok( !ret, "EnumColorProfilesW succeeded\n" ); - if (have_color_profile) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError() ); + if (have_color_profile) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError() ); buffer = HeapAlloc( GetProcessHeap(), 0, total * sizeof(WCHAR) ); size = total; @@ -729,7 +727,7 @@ static void test_EnumColorProfilesW( WCHAR *standardprofileW ) ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) - ok( ret, "EnumColorProfilesW failed %u\n", GetLastError() ); + ok( ret, "EnumColorProfilesW failed %lu\n", GetLastError() ); size = 0; ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); @@ -740,7 +738,7 @@ static void test_EnumColorProfilesW( WCHAR *standardprofileW ) size = total; ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) - ok( ret, "EnumColorProfilesW failed %u\n", GetLastError() ); + ok( ret, "EnumColorProfilesW failed %lu\n", GetLastError() ); HeapFree( GetProcessHeap(), 0, buffer ); } @@ -752,18 +750,18 @@ static void test_InstallColorProfileA( char *standardprofile, char *testprofile /* Parameter checks */ ret = pInstallColorProfileA( NULL, NULL ); - ok( !ret, "InstallColorProfileA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileA() succeeded (%lu)\n", GetLastError() ); ret = pInstallColorProfileA( machine, NULL ); - ok( !ret, "InstallColorProfileA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileA() succeeded (%lu)\n", GetLastError() ); ret = pInstallColorProfileA( NULL, machine ); - ok( !ret, "InstallColorProfileA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileA() succeeded (%lu)\n", GetLastError() ); if (standardprofile) { ret = pInstallColorProfileA( NULL, standardprofile ); - ok( ret, "InstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileA() failed (%lu)\n", GetLastError() ); } /* Functional checks */ @@ -781,10 +779,10 @@ static void test_InstallColorProfileA( char *standardprofile, char *testprofile skip("Not enough rights for InstallColorProfileA\n"); return; } - ok( ret, "InstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileA() failed (%lu)\n", GetLastError() ); ret = pGetColorDirectoryA( NULL, dest, &size ); - ok( ret, "GetColorDirectoryA() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorDirectoryA() failed (%lu)\n", GetLastError() ); MSCMS_basenameA( testprofile, base ); @@ -793,11 +791,11 @@ static void test_InstallColorProfileA( char *standardprofile, char *testprofile /* Check if the profile is really there */ handle = CreateFileA( dest, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); - ok( handle != INVALID_HANDLE_VALUE, "Couldn't find the profile (%d)\n", GetLastError() ); + ok( handle != INVALID_HANDLE_VALUE, "Couldn't find the profile (%lu)\n", GetLastError() ); CloseHandle( handle ); ret = pUninstallColorProfileA( NULL, dest, TRUE ); - ok( ret, "UninstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileA() failed (%lu)\n", GetLastError() ); } } @@ -808,18 +806,18 @@ static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofi /* Parameter checks */ ret = pInstallColorProfileW( NULL, NULL ); - ok( !ret, "InstallColorProfileW() succeeded (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileW() succeeded (%lu)\n", GetLastError() ); ret = pInstallColorProfileW( machineW, NULL ); - ok( !ret, "InstallColorProfileW() succeeded (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileW() succeeded (%lu)\n", GetLastError() ); ret = pInstallColorProfileW( NULL, machineW ); - ok( !ret, "InstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileW() failed (%lu)\n", GetLastError() ); if (standardprofileW) { ret = pInstallColorProfileW( NULL, standardprofileW ); - ok( ret, "InstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileW() failed (%lu)\n", GetLastError() ); } /* Functional checks */ @@ -837,10 +835,10 @@ static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofi skip("Not enough rights for InstallColorProfileW\n"); return; } - ok( ret, "InstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileW() failed (%lu)\n", GetLastError() ); ret = pGetColorDirectoryW( NULL, dest, &size ); - ok( ret, "GetColorDirectoryW() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorDirectoryW() failed (%lu)\n", GetLastError() ); MSCMS_basenameW( testprofileW, base ); @@ -849,11 +847,11 @@ static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofi /* Check if the profile is really there */ handle = CreateFileW( dest, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); - ok( handle != INVALID_HANDLE_VALUE, "Couldn't find the profile (%d)\n", GetLastError() ); + ok( handle != INVALID_HANDLE_VALUE, "Couldn't find the profile (%lu)\n", GetLastError() ); CloseHandle( handle ); ret = pUninstallColorProfileW( NULL, dest, TRUE ); - ok( ret, "UninstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileW() failed (%lu)\n", GetLastError() ); } } @@ -871,27 +869,27 @@ static void test_IsColorProfileTagPresent( char *standardprofile ) profile.cbDataSize = strlen(standardprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ tag = 0; ret = pIsColorProfileTagPresent( handle, tag, &present ); - ok( !(ret && present), "IsColorProfileTagPresent() succeeded (%d)\n", GetLastError() ); + ok( !(ret && present), "IsColorProfileTagPresent() succeeded (%lu)\n", GetLastError() ); tag = 0x63707274; /* 'cprt' */ ret = pIsColorProfileTagPresent( NULL, tag, &present ); - ok( !ret, "IsColorProfileTagPresent() succeeded (%d)\n", GetLastError() ); + ok( !ret, "IsColorProfileTagPresent() succeeded (%lu)\n", GetLastError() ); ret = pIsColorProfileTagPresent( handle, tag, NULL ); - ok( !ret, "IsColorProfileTagPresent() succeeded (%d)\n", GetLastError() ); + ok( !ret, "IsColorProfileTagPresent() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ ret = pIsColorProfileTagPresent( handle, tag, &present ); - ok( ret && present, "IsColorProfileTagPresent() failed (%d)\n", GetLastError() ); + ok( ret && present, "IsColorProfileTagPresent() failed (%lu)\n", GetLastError() ); pCloseColorProfile( handle ); } @@ -910,16 +908,16 @@ static void test_OpenColorProfileA( char *standardprofile ) /* Parameter checks */ handle = pOpenColorProfileA( NULL, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileA( &profile, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileA( &profile, PROFILE_READWRITE, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ok ( !pCloseColorProfile( NULL ), "CloseColorProfile() succeeded\n" ); @@ -929,31 +927,31 @@ static void test_OpenColorProfileA( char *standardprofile ) profile.cbDataSize = strlen(standardprofile); handle = pOpenColorProfileA( &profile, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileA( &profile, PROFILE_READ|PROFILE_READWRITE, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Functional checks */ handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pCloseColorProfile( handle ); - ok( ret, "CloseColorProfile() failed (%d)\n", GetLastError() ); + ok( ret, "CloseColorProfile() failed (%lu)\n", GetLastError() ); profile.dwType = PROFILE_FILENAME; profile.pProfileData = (void *)"sRGB Color Space Profile.icm"; profile.cbDataSize = sizeof("sRGB Color Space Profile.icm"); handle = pOpenColorProfileA( &profile, PROFILE_READ, FILE_SHARE_READ, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pCloseColorProfile( handle ); - ok( ret, "CloseColorProfile() failed (%d)\n", GetLastError() ); + ok( ret, "CloseColorProfile() failed (%lu)\n", GetLastError() ); } } @@ -970,16 +968,16 @@ static void test_OpenColorProfileW( WCHAR *standardprofileW ) /* Parameter checks */ handle = pOpenColorProfileW( NULL, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileW( &profile, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileW( &profile, PROFILE_READ, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileW( &profile, PROFILE_READWRITE, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); ok ( !pCloseColorProfile( NULL ), "CloseColorProfile() succeeded\n" ); @@ -989,21 +987,21 @@ static void test_OpenColorProfileW( WCHAR *standardprofileW ) profile.cbDataSize = lstrlenW(standardprofileW) * sizeof(WCHAR); handle = pOpenColorProfileW( &profile, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileW( &profile, PROFILE_READ, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileW( &profile, PROFILE_READ|PROFILE_READWRITE, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); /* Functional checks */ handle = pOpenColorProfileW( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); ret = pCloseColorProfile( handle ); - ok( ret, "CloseColorProfile() failed (%d)\n", GetLastError() ); + ok( ret, "CloseColorProfile() failed (%lu)\n", GetLastError() ); } } @@ -1027,41 +1025,41 @@ static void test_SetColorProfileElement( char *testprofile ) /* Parameter checks */ handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pSetColorProfileElement( handle, tag, 0, &size, data ); - ok( !ret, "SetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); pCloseColorProfile( handle ); handle = pOpenColorProfileA( &profile, PROFILE_READWRITE, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pSetColorProfileElement( NULL, 0, 0, NULL, NULL ); - ok( !ret, "SetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); ret = pSetColorProfileElement( handle, 0, 0, NULL, NULL ); - ok( !ret, "SetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); ret = pSetColorProfileElement( handle, tag, 0, NULL, NULL ); - ok( !ret, "SetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); ret = pSetColorProfileElement( handle, tag, 0, &size, NULL ); - ok( !ret, "SetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ size = sizeof(data); ret = pSetColorProfileElement( handle, tag, 0, &size, data ); - ok( ret, "SetColorProfileElement() failed %u\n", GetLastError() ); + ok( ret, "SetColorProfileElement() failed %lu\n", GetLastError() ); size = sizeof(buffer); ret = pGetColorProfileElement( handle, tag, 0, &size, buffer, &ref ); - ok( ret, "GetColorProfileElement() failed %u\n", GetLastError() ); + ok( ret, "GetColorProfileElement() failed %lu\n", GetLastError() ); ok( size > 0, "wrong size\n" ); ok( !memcmp( data, buffer, sizeof(data) ), - "Unexpected tag data, expected %s, got %s (%u)\n", data, buffer, GetLastError() ); + "Unexpected tag data, expected %s, got %s (%lu)\n", data, buffer, GetLastError() ); pCloseColorProfile( handle ); } @@ -1105,32 +1103,32 @@ static void test_SetColorProfileHeader( char *testprofile ) /* Parameter checks */ handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pSetColorProfileHeader( handle, &header ); - ok( !ret, "SetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); pCloseColorProfile( handle ); handle = pOpenColorProfileA( &profile, PROFILE_READWRITE, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pSetColorProfileHeader( NULL, NULL ); - ok( !ret, "SetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); ret = pSetColorProfileHeader( handle, NULL ); - ok( !ret, "SetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); ret = pSetColorProfileHeader( NULL, &header ); - ok( !ret, "SetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ ret = pSetColorProfileHeader( handle, &header ); - ok( ret, "SetColorProfileHeader() failed (%d)\n", GetLastError() ); + ok( ret, "SetColorProfileHeader() failed (%lu)\n", GetLastError() ); ret = pGetColorProfileHeader( handle, &header ); - ok( ret, "GetColorProfileHeader() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorProfileHeader() failed (%lu)\n", GetLastError() ); ok( !memcmp( &header, rgbheader, sizeof(rgbheader) ), "Unexpected header data\n" ); @@ -1145,10 +1143,10 @@ static void test_UninstallColorProfileA( char *testprofile ) /* Parameter checks */ ret = pUninstallColorProfileA( NULL, NULL, FALSE ); - ok( !ret, "UninstallColorProfileA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "UninstallColorProfileA() succeeded (%lu)\n", GetLastError() ); ret = pUninstallColorProfileA( machine, NULL, FALSE ); - ok( !ret, "UninstallColorProfileA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "UninstallColorProfileA() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ @@ -1165,10 +1163,10 @@ static void test_UninstallColorProfileA( char *testprofile ) skip("Not enough rights for InstallColorProfileA\n"); return; } - ok( ret, "InstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileA() failed (%lu)\n", GetLastError() ); ret = pGetColorDirectoryA( NULL, dest, &size ); - ok( ret, "GetColorDirectoryA() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorDirectoryA() failed (%lu)\n", GetLastError() ); MSCMS_basenameA( testprofile, base ); @@ -1176,11 +1174,11 @@ static void test_UninstallColorProfileA( char *testprofile ) lstrcatA( dest, base ); ret = pUninstallColorProfileA( NULL, dest, TRUE ); - ok( ret, "UninstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileA() failed (%lu)\n", GetLastError() ); /* Check if the profile is really gone */ handle = CreateFileA( dest, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); - ok( handle == INVALID_HANDLE_VALUE, "Found the profile (%d)\n", GetLastError() ); + ok( handle == INVALID_HANDLE_VALUE, "Found the profile (%lu)\n", GetLastError() ); CloseHandle( handle ); } } @@ -1192,10 +1190,10 @@ static void test_UninstallColorProfileW( WCHAR *testprofileW ) /* Parameter checks */ ret = pUninstallColorProfileW( NULL, NULL, FALSE ); - ok( !ret, "UninstallColorProfileW() succeeded (%d)\n", GetLastError() ); + ok( !ret, "UninstallColorProfileW() succeeded (%lu)\n", GetLastError() ); ret = pUninstallColorProfileW( machineW, NULL, FALSE ); - ok( !ret, "UninstallColorProfileW() succeeded (%d)\n", GetLastError() ); + ok( !ret, "UninstallColorProfileW() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ @@ -1214,10 +1212,10 @@ static void test_UninstallColorProfileW( WCHAR *testprofileW ) skip("Not enough rights for InstallColorProfileW\n"); return; } - ok( ret, "InstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileW() failed (%lu)\n", GetLastError() ); ret = pGetColorDirectoryW( NULL, dest, &size ); - ok( ret, "GetColorDirectoryW() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorDirectoryW() failed (%lu)\n", GetLastError() ); MSCMS_basenameW( testprofileW, base ); @@ -1225,13 +1223,13 @@ static void test_UninstallColorProfileW( WCHAR *testprofileW ) lstrcatW( dest, base ); ret = pUninstallColorProfileW( NULL, dest, TRUE ); - ok( ret, "UninstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileW() failed (%lu)\n", GetLastError() ); bytes_copied = WideCharToMultiByte(CP_ACP, 0, dest, -1, destA, MAX_PATH, NULL, NULL); ok( bytes_copied > 0 , "WideCharToMultiByte() returns %d\n", bytes_copied); /* Check if the profile is really gone */ handle = CreateFileA( destA, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); - ok( handle == INVALID_HANDLE_VALUE, "Found the profile (%d)\n", GetLastError() ); + ok( handle == INVALID_HANDLE_VALUE, "Found the profile (%lu)\n", GetLastError() ); CloseHandle( handle ); } } @@ -1258,56 +1256,56 @@ static void test_AssociateColorProfileWithDeviceA( char *testprofile ) ret = pAssociateColorProfileWithDeviceA( "machine", testprofile, NULL ); error = GetLastError(); ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error ); SetLastError(0xdeadbeef); ret = pAssociateColorProfileWithDeviceA( "machine", NULL, monitor.DeviceID ); error = GetLastError(); ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error ); SetLastError(0xdeadbeef); ret = pAssociateColorProfileWithDeviceA( "machine", testprofile, monitor.DeviceID ); error = GetLastError(); ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); - ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %u\n", error ); + ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %lu\n", error ); ret = pInstallColorProfileA( NULL, testprofile ); - ok( ret, "InstallColorProfileA() failed (%u)\n", GetLastError() ); + ok( ret, "InstallColorProfileA() failed (%lu)\n", GetLastError() ); ret = pGetColorDirectoryA( NULL, profile, &size ); - ok( ret, "GetColorDirectoryA() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorDirectoryA() failed (%lu)\n", GetLastError() ); MSCMS_basenameA( testprofile, basename ); lstrcatA( profile, "\\" ); lstrcatA( profile, basename ); ret = pAssociateColorProfileWithDeviceA( NULL, profile, monitor.DeviceID ); - ok( ret, "AssociateColorProfileWithDevice() failed (%u)\n", GetLastError() ); + ok( ret, "AssociateColorProfileWithDevice() failed (%lu)\n", GetLastError() ); SetLastError(0xdeadbeef); ret = pDisassociateColorProfileFromDeviceA( "machine", profile, NULL ); error = GetLastError(); ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error ); SetLastError(0xdeadbeef); ret = pDisassociateColorProfileFromDeviceA( "machine", NULL, monitor.DeviceID ); error = GetLastError(); ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error ); SetLastError(0xdeadbeef); ret = pDisassociateColorProfileFromDeviceA( "machine", profile, monitor.DeviceID ); error = GetLastError(); ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); - ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %u\n", error ); + ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %lu\n", error ); ret = pDisassociateColorProfileFromDeviceA( NULL, profile, monitor.DeviceID ); - ok( ret, "DisassociateColorProfileFromDeviceA() failed (%u)\n", GetLastError() ); + ok( ret, "DisassociateColorProfileFromDeviceA() failed (%lu)\n", GetLastError() ); ret = pUninstallColorProfileA( NULL, profile, TRUE ); - ok( ret, "UninstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileA() failed (%lu)\n", GetLastError() ); } else skip("Unable to obtain monitor name\n"); @@ -1343,17 +1341,17 @@ static void test_CreateMultiProfileTransform( char *standardprofile, char *testp profile.cbDataSize = strlen(standardprofile); handle[0] = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle[0] != NULL, "got %u\n", GetLastError() ); + ok( handle[0] != NULL, "got %lu\n", GetLastError() ); profile.dwType = PROFILE_FILENAME; profile.pProfileData = testprofile; profile.cbDataSize = strlen(testprofile); handle[1] = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle[1] != NULL, "got %u\n", GetLastError() ); + ok( handle[1] != NULL, "got %lu\n", GetLastError() ); transform = pCreateMultiProfileTransform( handle, 2, intents, 2, 0, 0 ); - ok( transform != NULL, "got %u\n", GetLastError() ); + ok( transform != NULL, "got %lu\n", GetLastError() ); pDeleteColorTransform( transform ); pCloseColorProfile( handle[0] ); @@ -1390,7 +1388,7 @@ START_TEST(profile) /* See if we can find the standard color profile */ ret = GetSystemDirectoryA( profilefile1, sizeof(profilefile1) ); - ok( ret > 0, "GetSystemDirectoryA() returns %d, LastError = %d\n", ret, GetLastError()); + ok( ret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", ret, GetLastError()); ok(profilefile1[0] && lstrlenA(profilefile1) < MAX_PATH, "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(profilefile1)); MultiByteToWideChar(CP_ACP, 0, profilefile1, -1, profilefile1W, MAX_PATH); diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 8296341f7b7..0d48e217d66 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -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; -- 2.30.2

1 0

[PATCH 2/2] mscms: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mscms/Makefile.in | 1 - dlls/mscms/mscms_main.c | 4 +- dlls/mscms/profile.c | 38 ++-- dlls/mscms/stub.c | 30 +-- dlls/mscms/tests/Makefile.in | 1 - dlls/mscms/tests/profile.c | 373 +++++++++++++++++------------------ dlls/mscms/transform.c | 25 ++- 7 files changed, 232 insertions(+), 240 deletions(-) diff --git a/dlls/mscms/Makefile.in b/dlls/mscms/Makefile.in index f28f90327f4..d57cc54e3c6 100644 --- a/dlls/mscms/Makefile.in +++ b/dlls/mscms/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mscms.dll IMPORTLIB = mscms IMPORTS = $(LCMS2_PE_LIBS) shlwapi advapi32 diff --git a/dlls/mscms/mscms_main.c b/dlls/mscms/mscms_main.c index 1ea2eaef832..8c7e7c9e498 100644 --- a/dlls/mscms/mscms_main.c +++ b/dlls/mscms/mscms_main.c @@ -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) { diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 5bc5df0712d..b6c2b5cb797 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -327,7 +327,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; @@ -365,7 +365,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; @@ -506,7 +506,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) { @@ -565,7 +565,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) { @@ -661,15 +661,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) @@ -708,7 +708,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) @@ -723,14 +723,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) @@ -1084,7 +1084,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; @@ -1153,7 +1153,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; @@ -1271,7 +1271,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; @@ -1316,7 +1316,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; @@ -1366,7 +1366,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) @@ -1398,7 +1398,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; } @@ -1461,7 +1461,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; } @@ -1485,7 +1485,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; @@ -1506,7 +1506,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 ); diff --git a/dlls/mscms/stub.c b/dlls/mscms/stub.c index 28c08e20868..6ac777a86f7 100644 --- a/dlls/mscms/stub.c +++ b/dlls/mscms/stub.c @@ -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; } diff --git a/dlls/mscms/tests/Makefile.in b/dlls/mscms/tests/Makefile.in index e9ff9724e2f..2d229c049ab 100644 --- a/dlls/mscms/tests/Makefile.in +++ b/dlls/mscms/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mscms.dll IMPORTS = advapi32 diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 7083b56f11d..a3082500fe7 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -161,29 +161,25 @@ static void test_GetColorDirectoryA(void) /* Parameter checks */ ret = pGetColorDirectoryA( NULL, NULL, NULL ); - ok( !ret, "GetColorDirectoryA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorDirectoryA() succeeded (%lu)\n", GetLastError() ); size = 0; - ret = pGetColorDirectoryA( NULL, NULL, &size ); - ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%lu)\n", GetLastError() ); size = 0; - ret = pGetColorDirectoryA( NULL, buffer, &size ); - ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%lu)\n", GetLastError() ); size = 1; - ret = pGetColorDirectoryA( NULL, buffer, &size ); - ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ size = sizeof(buffer); - ret = pGetColorDirectoryA( NULL, buffer, &size ); - ok( ret && size > 0, "GetColorDirectoryA() failed (%d)\n", GetLastError() ); + ok( ret && size > 0, "GetColorDirectoryA() failed (%lu)\n", GetLastError() ); } static void test_GetColorDirectoryW(void) @@ -195,33 +191,27 @@ static void test_GetColorDirectoryW(void) /* Parameter checks */ /* This one crashes win2k - ret = pGetColorDirectoryW( NULL, NULL, NULL ); - ok( !ret, "GetColorDirectoryW() succeeded (%d)\n", GetLastError() ); - + ok( !ret, "GetColorDirectoryW() succeeded (%lu)\n", GetLastError() ); */ size = 0; - ret = pGetColorDirectoryW( NULL, NULL, &size ); - ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%lu)\n", GetLastError() ); size = 0; - ret = pGetColorDirectoryW( NULL, buffer, &size ); - ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%lu)\n", GetLastError() ); size = 1; - ret = pGetColorDirectoryW( NULL, buffer, &size ); - ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ size = sizeof(buffer); - ret = pGetColorDirectoryW( NULL, buffer, &size ); - ok( ret && size > 0, "GetColorDirectoryW() failed (%d)\n", GetLastError() ); + ok( ret && size > 0, "GetColorDirectoryW() failed (%lu)\n", GetLastError() ); } static void test_GetColorProfileElement( char *standardprofile ) @@ -241,15 +231,15 @@ static void test_GetColorProfileElement( char *standardprofile ) profile.cbDataSize = strlen(standardprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ ret = pGetColorProfileElement( handle, tag, 0, NULL, NULL, &ref ); - ok( !ret, "GetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElement() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileElement( handle, tag, 0, &size, NULL, NULL ); - ok( !ret, "GetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElement() succeeded (%lu)\n", GetLastError() ); size = 0; ret = pGetColorProfileElement( handle, tag, 0, &size, NULL, &ref ); @@ -260,7 +250,7 @@ static void test_GetColorProfileElement( char *standardprofile ) size = sizeof(buffer); ret = pGetColorProfileElement( handle, tag, 0, &size, buffer, &ref ); - ok( ret, "GetColorProfileElement() failed %u\n", GetLastError() ); + ok( ret, "GetColorProfileElement() failed %lu\n", GetLastError() ); ok( size > 0, "wrong size\n" ); ok( !memcmp( buffer, expect, sizeof(expect)-1 ), "Unexpected tag data\n" ); @@ -283,27 +273,26 @@ static void test_GetColorProfileElementTag( char *standardprofile ) profile.cbDataSize = strlen(standardprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ ret = pGetColorProfileElementTag( NULL, index, &tag ); - ok( !ret, "GetColorProfileElementTag() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElementTag() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileElementTag( handle, 0, &tag ); - ok( !ret, "GetColorProfileElementTag() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElementTag() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileElementTag( handle, index, NULL ); - ok( !ret, "GetColorProfileElementTag() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElementTag() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileElementTag( handle, 18, NULL ); - ok( !ret, "GetColorProfileElementTag() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElementTag() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ while ((ret = pGetColorProfileElementTag( handle, index, &tag )) && tag != expect) index++; - ok( ret && tag == expect, "GetColorProfileElementTag() failed (%d)\n", - GetLastError() ); + ok( ret && tag == expect, "GetColorProfileElementTag() failed (%lu)\n", GetLastError() ); pCloseColorProfile( handle ); } @@ -325,38 +314,37 @@ static void test_GetColorProfileFromHandle( char *testprofile ) profile.cbDataSize = strlen(testprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ size = 0; - ret = pGetColorProfileFromHandle( handle, NULL, &size ); - ok( !ret && size > 0, "GetColorProfileFromHandle() failed (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorProfileFromHandle() failed (%lu)\n", GetLastError() ); if ((buffer = malloc( size ))) { ret = pGetColorProfileFromHandle( NULL, buffer, &size ); - ok( !ret, "GetColorProfileFromHandle() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileFromHandle() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileFromHandle( handle, buffer, NULL ); - ok( !ret, "GetColorProfileFromHandle() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileFromHandle() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ ret = pGetColorProfileFromHandle( handle, buffer, &size ); - ok( ret && size > 0, "GetColorProfileFromHandle() failed (%d)\n", GetLastError() ); + ok( ret && size > 0, "GetColorProfileFromHandle() failed (%lu)\n", GetLastError() ); header = (PROFILEHEADER *)buffer; - ok( header->phClass == 0x72746e6d, "wrong phClass %x\n", header->phClass ); - ok( header->phDataColorSpace == 0x20424752, "wrong phDataColorSpace %x\n", header->phDataColorSpace ); - ok( header->phConnectionSpace == 0x205a5958, "wrong phConnectionSpace %x\n", header->phConnectionSpace ); - ok( header->phSignature == 0x70736361, "wrong phSignature %x\n", header->phSignature ); - ok( header->phProfileFlags == 0x00000000, "wrong phProfileFlags %x\n", header->phProfileFlags ); - ok( header->phRenderingIntent == 0x00000000, "wrong phRenderingIntent %x\n", header->phRenderingIntent ); - ok( header->phIlluminant.ciexyzX == 0xd6f60000, "wrong phIlluminant.ciexyzX %x\n", header->phIlluminant.ciexyzX ); - ok( header->phIlluminant.ciexyzY == 0x00000100, "wrong phIlluminant.ciexyzY %x\n", header->phIlluminant.ciexyzY ); - ok( header->phIlluminant.ciexyzZ == 0x2dd30000, "wrong phIlluminant.ciexyzZ %x\n", header->phIlluminant.ciexyzZ ); + ok( header->phClass == 0x72746e6d, "wrong phClass %#lx\n", header->phClass ); + ok( header->phDataColorSpace == 0x20424752, "wrong phDataColorSpace %#lx\n", header->phDataColorSpace ); + ok( header->phConnectionSpace == 0x205a5958, "wrong phConnectionSpace %#lx\n", header->phConnectionSpace ); + ok( header->phSignature == 0x70736361, "wrong phSignature %#lx\n", header->phSignature ); + ok( header->phProfileFlags == 0x00000000, "wrong phProfileFlags %#lx\n", header->phProfileFlags ); + ok( header->phRenderingIntent == 0x00000000, "wrong phRenderingIntent %#lx\n", header->phRenderingIntent ); + ok( header->phIlluminant.ciexyzX == 0xd6f60000, "wrong phIlluminant.ciexyzX %#lx\n", header->phIlluminant.ciexyzX ); + ok( header->phIlluminant.ciexyzY == 0x00000100, "wrong phIlluminant.ciexyzY %#lx\n", header->phIlluminant.ciexyzY ); + ok( header->phIlluminant.ciexyzZ == 0x2dd30000, "wrong phIlluminant.ciexyzZ %#lx\n", header->phIlluminant.ciexyzZ ); free( buffer ); } @@ -378,36 +366,36 @@ static void test_GetColorProfileHeader( char *testprofile ) profile.cbDataSize = strlen(testprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ ret = pGetColorProfileHeader( NULL, NULL ); - ok( !ret, "GetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileHeader( NULL, &header ); - ok( !ret, "GetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); if (0) /* Crashes on Vista */ { ret = pGetColorProfileHeader( handle, NULL ); - ok( !ret, "GetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); } /* Functional checks */ ret = pGetColorProfileHeader( handle, &header ); - ok( ret, "GetColorProfileHeader() failed (%d)\n", GetLastError() ); - - ok( header.phClass == 0x6d6e7472, "wrong phClass %x\n", header.phClass ); - ok( header.phDataColorSpace == 0x52474220, "wrong phDataColorSpace %x\n", header.phDataColorSpace ); - ok( header.phConnectionSpace == 0x58595a20, "wrong phConnectionSpace %x\n", header.phConnectionSpace ); - ok( header.phSignature == 0x61637370, "wrong phSignature %x\n", header.phSignature ); - ok( header.phProfileFlags == 0x00000000, "wrong phProfileFlags %x\n", header.phProfileFlags ); - ok( header.phRenderingIntent == 0x00000000, "wrong phRenderingIntent %x\n", header.phRenderingIntent ); - ok( header.phIlluminant.ciexyzX == 0x0000f6d6, "wrong phIlluminant.ciexyzX %x\n", header.phIlluminant.ciexyzX ); - ok( header.phIlluminant.ciexyzY == 0x00010000, "wrong phIlluminant.ciexyzY %x\n", header.phIlluminant.ciexyzY ); - ok( header.phIlluminant.ciexyzZ == 0x0000d32d, "wrong phIlluminant.ciexyzZ %x\n", header.phIlluminant.ciexyzZ ); + ok( ret, "GetColorProfileHeader() failed (%lu)\n", GetLastError() ); + + ok( header.phClass == 0x6d6e7472, "wrong phClass %#lx\n", header.phClass ); + ok( header.phDataColorSpace == 0x52474220, "wrong phDataColorSpace %#lx\n", header.phDataColorSpace ); + ok( header.phConnectionSpace == 0x58595a20, "wrong phConnectionSpace %#lx\n", header.phConnectionSpace ); + ok( header.phSignature == 0x61637370, "wrong phSignature %#lx\n", header.phSignature ); + ok( header.phProfileFlags == 0x00000000, "wrong phProfileFlags %#lx\n", header.phProfileFlags ); + ok( header.phRenderingIntent == 0x00000000, "wrong phRenderingIntent %#lx\n", header.phRenderingIntent ); + ok( header.phIlluminant.ciexyzX == 0x0000f6d6, "wrong phIlluminant.ciexyzX %#lx\n", header.phIlluminant.ciexyzX ); + ok( header.phIlluminant.ciexyzY == 0x00010000, "wrong phIlluminant.ciexyzY %#lx\n", header.phIlluminant.ciexyzY ); + ok( header.phIlluminant.ciexyzZ == 0x0000d32d, "wrong phIlluminant.ciexyzZ %#lx\n", header.phIlluminant.ciexyzZ ); pCloseColorProfile( handle ); } @@ -427,23 +415,21 @@ static void test_GetCountColorProfileElements( char *standardprofile ) profile.cbDataSize = strlen(standardprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ ret = pGetCountColorProfileElements( NULL, &count ); - ok( !ret, "GetCountColorProfileElements() succeeded (%d)\n", - GetLastError() ); + ok( !ret, "GetCountColorProfileElements() succeeded (%lu)\n", GetLastError() ); ret = pGetCountColorProfileElements( handle, NULL ); - ok( !ret, "GetCountColorProfileElements() succeeded (%d)\n", - GetLastError() ); + ok( !ret, "GetCountColorProfileElements() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ ret = pGetCountColorProfileElements( handle, &count ); ok( ret && count > 15 && count < 20, - "GetCountColorProfileElements() failed (%d) %u\n", GetLastError(), count ); + "GetCountColorProfileElements() failed (%lu) %lu\n", GetLastError(), count ); pCloseColorProfile( handle ); } @@ -463,28 +449,32 @@ static void test_GetStandardColorSpaceProfileA( char *standardprofile ) size = sizeof(newprofile); SetLastError(0xfaceabee); /* 1st param, */ ret = pGetStandardColorSpaceProfileA(machine, LCS_sRGB, newprofile, &size); - ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 2nd param, */ ret = pGetStandardColorSpaceProfileA(NULL, (DWORD)-1, newprofile, &size); - ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 4th param, */ ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, newprofile, NULL); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 3rd param, */ ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, NULL, &size); - ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = 0; SetLastError(0xfaceabee); /* dereferenced 4th param, */ ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, newprofile, &size); ok( !ret && (GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); /* Several invalid parameter checks: */ @@ -492,30 +482,32 @@ static void test_GetStandardColorSpaceProfileA( char *standardprofile ) SetLastError(0xfaceabee); /* 1st, maybe 2nd and then dereferenced 4th param, */ ret = pGetStandardColorSpaceProfileA(machine, 0, newprofile, &size); ok( !ret && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_NOT_SUPPORTED), - "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); SetLastError(0xfaceabee); /* maybe 2nd and then 4th param, */ ret = pGetStandardColorSpaceProfileA(NULL, 0, newprofile, NULL); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = 0; SetLastError(0xfaceabee); /* maybe 2nd, then 3rd and dereferenced 4th param, */ ret = pGetStandardColorSpaceProfileA(NULL, 0, NULL, &size); ok( !ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER || GetLastError() == ERROR_FILE_NOT_FOUND), - "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* maybe 2nd param. */ ret = pGetStandardColorSpaceProfileA(NULL, 0, newprofile, &size); - if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); else ok( !lstrcmpiA( newprofile, "" ) && GetLastError() == 0xfaceabee, - "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); /* Functional checks */ size = sizeof(oldprofile); ret = pGetStandardColorSpaceProfileA( NULL, LCS_sRGB, oldprofile, &size ); - ok( ret, "GetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "GetStandardColorSpaceProfileA() failed (%lu)\n", GetLastError() ); SetLastError(0xdeadbeef); ret = pSetStandardColorSpaceProfileA( NULL, LCS_sRGB, standardprofile ); @@ -524,14 +516,14 @@ static void test_GetStandardColorSpaceProfileA( char *standardprofile ) skip("Not enough rights for SetStandardColorSpaceProfileA\n"); return; } - ok( ret, "SetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "SetStandardColorSpaceProfileA() failed (%lu)\n", GetLastError() ); size = sizeof(newprofile); ret = pGetStandardColorSpaceProfileA( NULL, LCS_sRGB, newprofile, &size ); - ok( ret, "GetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "GetStandardColorSpaceProfileA() failed (%lu)\n", GetLastError() ); ret = pSetStandardColorSpaceProfileA( NULL, LCS_sRGB, oldprofile ); - ok( ret, "SetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "SetStandardColorSpaceProfileA() failed (%lu)\n", GetLastError() ); } static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) @@ -549,19 +541,21 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) size = sizeof(newprofile); SetLastError(0xfaceabee); /* 1st param, */ ret = pGetStandardColorSpaceProfileW(machineW, LCS_sRGB, newprofile, &size); - ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 2nd param, */ ret = pGetStandardColorSpaceProfileW(NULL, (DWORD)-1, newprofile, &size); - ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 2nd param, */ ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &size); ok( (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) || broken(ret), /* Win98 and WinME */ - "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 3rd param, */ @@ -569,12 +563,13 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) ok( !ret || broken(ret) /* win98 */, "GetStandardColorSpaceProfileW succeeded\n" ); ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER || broken(GetLastError() == 0xfaceabee) /* win98 */, - "GetStandardColorSpaceProfileW() returns GLE=%u\n", GetLastError() ); + "GetStandardColorSpaceProfileW() returns GLE=%lu\n", GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 4th param, */ ret = pGetStandardColorSpaceProfileW(NULL, LCS_sRGB, newprofile, NULL); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = 0; SetLastError(0xfaceabee); /* dereferenced 4th param. */ @@ -583,7 +578,7 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) ok( GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER || broken(GetLastError() == 0xfaceabee) /* win98 */, - "GetStandardColorSpaceProfileW() returns GLE=%u\n", GetLastError() ); + "GetStandardColorSpaceProfileW() returns GLE=%lu\n", GetLastError() ); /* Several invalid parameter checks: */ @@ -591,11 +586,12 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) SetLastError(0xfaceabee); /* 1st, maybe 2nd and then dereferenced 4th param, */ ret = pGetStandardColorSpaceProfileW(machineW, 0, newprofile, &size); ok( !ret && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_NOT_SUPPORTED), - "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", ret, GetLastError() ); SetLastError(0xfaceabee); /* maybe 2nd and then 4th param, */ ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, NULL); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = 0; SetLastError(0xfaceabee); /* maybe 2nd, then 3rd and dereferenced 4th param, */ @@ -604,24 +600,25 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER || GetLastError() == ERROR_FILE_NOT_FOUND || broken(GetLastError() == 0xfaceabee) /* win98 */, - "GetStandardColorSpaceProfileW() returns GLE=%u\n", GetLastError() ); + "GetStandardColorSpaceProfileW() returns GLE=%lu\n", GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* maybe 2nd param. */ ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &size); - if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", + ret, GetLastError() ); else { WideCharToMultiByte(CP_ACP, 0, newprofile, -1, newprofileA, sizeof(newprofileA), NULL, NULL); ok( !lstrcmpiA( newprofileA, "" ) && GetLastError() == 0xfaceabee, - "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", ret, GetLastError() ); } /* Functional checks */ size = sizeof(oldprofile); ret = pGetStandardColorSpaceProfileW( NULL, LCS_sRGB, oldprofile, &size ); - ok( ret, "GetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "GetStandardColorSpaceProfileW() failed (%lu)\n", GetLastError() ); SetLastError(0xdeadbeef); ret = pSetStandardColorSpaceProfileW( NULL, LCS_sRGB, standardprofileW ); @@ -630,14 +627,14 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) skip("Not enough rights for SetStandardColorSpaceProfileW\n"); return; } - ok( ret, "SetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "SetStandardColorSpaceProfileW() failed (%lu)\n", GetLastError() ); size = sizeof(newprofile); ret = pGetStandardColorSpaceProfileW( NULL, LCS_sRGB, newprofile, &size ); - ok( ret, "GetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "GetStandardColorSpaceProfileW() failed (%lu)\n", GetLastError() ); ret = pSetStandardColorSpaceProfileW( NULL, LCS_sRGB, oldprofile ); - ok( ret, "SetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "SetStandardColorSpaceProfileW() failed (%lu)\n", GetLastError() ); } static void test_EnumColorProfilesA( char *standardprofile ) @@ -660,7 +657,7 @@ static void test_EnumColorProfilesA( char *standardprofile ) SetLastError( 0xdeadbeef ); ret = pEnumColorProfilesA( NULL, &record, NULL, &total, &number ); ok( !ret, "EnumColorProfilesA succeeded\n" ); - if (have_color_profile) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError() ); + if (have_color_profile) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError() ); buffer = malloc( total ); size = total; @@ -675,7 +672,7 @@ static void test_EnumColorProfilesA( char *standardprofile ) ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) - ok( ret, "EnumColorProfilesA failed %u\n", GetLastError() ); + ok( ret, "EnumColorProfilesA failed %lu\n", GetLastError() ); size = 0; ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); @@ -686,7 +683,7 @@ static void test_EnumColorProfilesA( char *standardprofile ) size = total; ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) - ok( ret, "EnumColorProfilesA failed %u\n", GetLastError() ); + ok( ret, "EnumColorProfilesA failed %lu\n", GetLastError() ); free( buffer ); } @@ -711,7 +708,7 @@ static void test_EnumColorProfilesW( WCHAR *standardprofileW ) SetLastError( 0xdeadbeef ); ret = pEnumColorProfilesW( NULL, &record, NULL, &total, &number ); ok( !ret, "EnumColorProfilesW succeeded\n" ); - if (have_color_profile) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError() ); + if (have_color_profile) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError() ); buffer = malloc( total * sizeof(WCHAR) ); size = total; @@ -726,7 +723,7 @@ static void test_EnumColorProfilesW( WCHAR *standardprofileW ) ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) - ok( ret, "EnumColorProfilesW failed %u\n", GetLastError() ); + ok( ret, "EnumColorProfilesW failed %lu\n", GetLastError() ); size = 0; ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); @@ -737,7 +734,7 @@ static void test_EnumColorProfilesW( WCHAR *standardprofileW ) size = total; ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) - ok( ret, "EnumColorProfilesW failed %u\n", GetLastError() ); + ok( ret, "EnumColorProfilesW failed %lu\n", GetLastError() ); free( buffer ); } @@ -749,18 +746,18 @@ static void test_InstallColorProfileA( char *standardprofile, char *testprofile /* Parameter checks */ ret = pInstallColorProfileA( NULL, NULL ); - ok( !ret, "InstallColorProfileA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileA() succeeded (%lu)\n", GetLastError() ); ret = pInstallColorProfileA( machine, NULL ); - ok( !ret, "InstallColorProfileA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileA() succeeded (%lu)\n", GetLastError() ); ret = pInstallColorProfileA( NULL, machine ); - ok( !ret, "InstallColorProfileA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileA() succeeded (%lu)\n", GetLastError() ); if (standardprofile) { ret = pInstallColorProfileA( NULL, standardprofile ); - ok( ret, "InstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileA() failed (%lu)\n", GetLastError() ); } /* Functional checks */ @@ -778,10 +775,10 @@ static void test_InstallColorProfileA( char *standardprofile, char *testprofile skip("Not enough rights for InstallColorProfileA\n"); return; } - ok( ret, "InstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileA() failed (%lu)\n", GetLastError() ); ret = pGetColorDirectoryA( NULL, dest, &size ); - ok( ret, "GetColorDirectoryA() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorDirectoryA() failed (%lu)\n", GetLastError() ); MSCMS_basenameA( testprofile, base ); @@ -790,11 +787,11 @@ static void test_InstallColorProfileA( char *standardprofile, char *testprofile /* Check if the profile is really there */ handle = CreateFileA( dest, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); - ok( handle != INVALID_HANDLE_VALUE, "Couldn't find the profile (%d)\n", GetLastError() ); + ok( handle != INVALID_HANDLE_VALUE, "Couldn't find the profile (%lu)\n", GetLastError() ); CloseHandle( handle ); ret = pUninstallColorProfileA( NULL, dest, TRUE ); - ok( ret, "UninstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileA() failed (%lu)\n", GetLastError() ); } } @@ -805,18 +802,18 @@ static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofi /* Parameter checks */ ret = pInstallColorProfileW( NULL, NULL ); - ok( !ret, "InstallColorProfileW() succeeded (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileW() succeeded (%lu)\n", GetLastError() ); ret = pInstallColorProfileW( machineW, NULL ); - ok( !ret, "InstallColorProfileW() succeeded (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileW() succeeded (%lu)\n", GetLastError() ); ret = pInstallColorProfileW( NULL, machineW ); - ok( !ret, "InstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileW() failed (%lu)\n", GetLastError() ); if (standardprofileW) { ret = pInstallColorProfileW( NULL, standardprofileW ); - ok( ret, "InstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileW() failed (%lu)\n", GetLastError() ); } /* Functional checks */ @@ -834,10 +831,10 @@ static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofi skip("Not enough rights for InstallColorProfileW\n"); return; } - ok( ret, "InstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileW() failed (%lu)\n", GetLastError() ); ret = pGetColorDirectoryW( NULL, dest, &size ); - ok( ret, "GetColorDirectoryW() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorDirectoryW() failed (%lu)\n", GetLastError() ); MSCMS_basenameW( testprofileW, base ); @@ -846,11 +843,11 @@ static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofi /* Check if the profile is really there */ handle = CreateFileW( dest, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); - ok( handle != INVALID_HANDLE_VALUE, "Couldn't find the profile (%d)\n", GetLastError() ); + ok( handle != INVALID_HANDLE_VALUE, "Couldn't find the profile (%lu)\n", GetLastError() ); CloseHandle( handle ); ret = pUninstallColorProfileW( NULL, dest, TRUE ); - ok( ret, "UninstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileW() failed (%lu)\n", GetLastError() ); } } @@ -868,27 +865,27 @@ static void test_IsColorProfileTagPresent( char *standardprofile ) profile.cbDataSize = strlen(standardprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ tag = 0; ret = pIsColorProfileTagPresent( handle, tag, &present ); - ok( !(ret && present), "IsColorProfileTagPresent() succeeded (%d)\n", GetLastError() ); + ok( !(ret && present), "IsColorProfileTagPresent() succeeded (%lu)\n", GetLastError() ); tag = 0x63707274; /* 'cprt' */ ret = pIsColorProfileTagPresent( NULL, tag, &present ); - ok( !ret, "IsColorProfileTagPresent() succeeded (%d)\n", GetLastError() ); + ok( !ret, "IsColorProfileTagPresent() succeeded (%lu)\n", GetLastError() ); ret = pIsColorProfileTagPresent( handle, tag, NULL ); - ok( !ret, "IsColorProfileTagPresent() succeeded (%d)\n", GetLastError() ); + ok( !ret, "IsColorProfileTagPresent() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ ret = pIsColorProfileTagPresent( handle, tag, &present ); - ok( ret && present, "IsColorProfileTagPresent() failed (%d)\n", GetLastError() ); + ok( ret && present, "IsColorProfileTagPresent() failed (%lu)\n", GetLastError() ); pCloseColorProfile( handle ); } @@ -907,16 +904,16 @@ static void test_OpenColorProfileA( char *standardprofile ) /* Parameter checks */ handle = pOpenColorProfileA( NULL, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileA( &profile, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileA( &profile, PROFILE_READWRITE, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ok ( !pCloseColorProfile( NULL ), "CloseColorProfile() succeeded\n" ); @@ -926,31 +923,31 @@ static void test_OpenColorProfileA( char *standardprofile ) profile.cbDataSize = strlen(standardprofile); handle = pOpenColorProfileA( &profile, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileA( &profile, PROFILE_READ|PROFILE_READWRITE, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Functional checks */ handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pCloseColorProfile( handle ); - ok( ret, "CloseColorProfile() failed (%d)\n", GetLastError() ); + ok( ret, "CloseColorProfile() failed (%lu)\n", GetLastError() ); profile.dwType = PROFILE_FILENAME; profile.pProfileData = (void *)"sRGB Color Space Profile.icm"; profile.cbDataSize = sizeof("sRGB Color Space Profile.icm"); handle = pOpenColorProfileA( &profile, PROFILE_READ, FILE_SHARE_READ, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pCloseColorProfile( handle ); - ok( ret, "CloseColorProfile() failed (%d)\n", GetLastError() ); + ok( ret, "CloseColorProfile() failed (%lu)\n", GetLastError() ); } } @@ -967,16 +964,16 @@ static void test_OpenColorProfileW( WCHAR *standardprofileW ) /* Parameter checks */ handle = pOpenColorProfileW( NULL, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileW( &profile, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileW( &profile, PROFILE_READ, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileW( &profile, PROFILE_READWRITE, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); ok ( !pCloseColorProfile( NULL ), "CloseColorProfile() succeeded\n" ); @@ -986,21 +983,21 @@ static void test_OpenColorProfileW( WCHAR *standardprofileW ) profile.cbDataSize = lstrlenW(standardprofileW) * sizeof(WCHAR); handle = pOpenColorProfileW( &profile, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileW( &profile, PROFILE_READ, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileW( &profile, PROFILE_READ|PROFILE_READWRITE, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); /* Functional checks */ handle = pOpenColorProfileW( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); ret = pCloseColorProfile( handle ); - ok( ret, "CloseColorProfile() failed (%d)\n", GetLastError() ); + ok( ret, "CloseColorProfile() failed (%lu)\n", GetLastError() ); } } @@ -1024,41 +1021,41 @@ static void test_SetColorProfileElement( char *testprofile ) /* Parameter checks */ handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pSetColorProfileElement( handle, tag, 0, &size, data ); - ok( !ret, "SetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); pCloseColorProfile( handle ); handle = pOpenColorProfileA( &profile, PROFILE_READWRITE, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pSetColorProfileElement( NULL, 0, 0, NULL, NULL ); - ok( !ret, "SetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); ret = pSetColorProfileElement( handle, 0, 0, NULL, NULL ); - ok( !ret, "SetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); ret = pSetColorProfileElement( handle, tag, 0, NULL, NULL ); - ok( !ret, "SetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); ret = pSetColorProfileElement( handle, tag, 0, &size, NULL ); - ok( !ret, "SetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ size = sizeof(data); ret = pSetColorProfileElement( handle, tag, 0, &size, data ); - ok( ret, "SetColorProfileElement() failed %u\n", GetLastError() ); + ok( ret, "SetColorProfileElement() failed %lu\n", GetLastError() ); size = sizeof(buffer); ret = pGetColorProfileElement( handle, tag, 0, &size, buffer, &ref ); - ok( ret, "GetColorProfileElement() failed %u\n", GetLastError() ); + ok( ret, "GetColorProfileElement() failed %lu\n", GetLastError() ); ok( size > 0, "wrong size\n" ); ok( !memcmp( data, buffer, sizeof(data) ), - "Unexpected tag data, expected %s, got %s (%u)\n", data, buffer, GetLastError() ); + "Unexpected tag data, expected %s, got %s (%lu)\n", data, buffer, GetLastError() ); pCloseColorProfile( handle ); } @@ -1102,32 +1099,32 @@ static void test_SetColorProfileHeader( char *testprofile ) /* Parameter checks */ handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pSetColorProfileHeader( handle, &header ); - ok( !ret, "SetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); pCloseColorProfile( handle ); handle = pOpenColorProfileA( &profile, PROFILE_READWRITE, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pSetColorProfileHeader( NULL, NULL ); - ok( !ret, "SetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); ret = pSetColorProfileHeader( handle, NULL ); - ok( !ret, "SetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); ret = pSetColorProfileHeader( NULL, &header ); - ok( !ret, "SetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ ret = pSetColorProfileHeader( handle, &header ); - ok( ret, "SetColorProfileHeader() failed (%d)\n", GetLastError() ); + ok( ret, "SetColorProfileHeader() failed (%lu)\n", GetLastError() ); ret = pGetColorProfileHeader( handle, &header ); - ok( ret, "GetColorProfileHeader() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorProfileHeader() failed (%lu)\n", GetLastError() ); ok( !memcmp( &header, rgbheader, sizeof(rgbheader) ), "Unexpected header data\n" ); @@ -1142,10 +1139,10 @@ static void test_UninstallColorProfileA( char *testprofile ) /* Parameter checks */ ret = pUninstallColorProfileA( NULL, NULL, FALSE ); - ok( !ret, "UninstallColorProfileA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "UninstallColorProfileA() succeeded (%lu)\n", GetLastError() ); ret = pUninstallColorProfileA( machine, NULL, FALSE ); - ok( !ret, "UninstallColorProfileA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "UninstallColorProfileA() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ @@ -1162,10 +1159,10 @@ static void test_UninstallColorProfileA( char *testprofile ) skip("Not enough rights for InstallColorProfileA\n"); return; } - ok( ret, "InstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileA() failed (%lu)\n", GetLastError() ); ret = pGetColorDirectoryA( NULL, dest, &size ); - ok( ret, "GetColorDirectoryA() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorDirectoryA() failed (%lu)\n", GetLastError() ); MSCMS_basenameA( testprofile, base ); @@ -1173,11 +1170,11 @@ static void test_UninstallColorProfileA( char *testprofile ) lstrcatA( dest, base ); ret = pUninstallColorProfileA( NULL, dest, TRUE ); - ok( ret, "UninstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileA() failed (%lu)\n", GetLastError() ); /* Check if the profile is really gone */ handle = CreateFileA( dest, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); - ok( handle == INVALID_HANDLE_VALUE, "Found the profile (%d)\n", GetLastError() ); + ok( handle == INVALID_HANDLE_VALUE, "Found the profile (%lu)\n", GetLastError() ); CloseHandle( handle ); } } @@ -1189,10 +1186,10 @@ static void test_UninstallColorProfileW( WCHAR *testprofileW ) /* Parameter checks */ ret = pUninstallColorProfileW( NULL, NULL, FALSE ); - ok( !ret, "UninstallColorProfileW() succeeded (%d)\n", GetLastError() ); + ok( !ret, "UninstallColorProfileW() succeeded (%lu)\n", GetLastError() ); ret = pUninstallColorProfileW( machineW, NULL, FALSE ); - ok( !ret, "UninstallColorProfileW() succeeded (%d)\n", GetLastError() ); + ok( !ret, "UninstallColorProfileW() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ @@ -1211,10 +1208,10 @@ static void test_UninstallColorProfileW( WCHAR *testprofileW ) skip("Not enough rights for InstallColorProfileW\n"); return; } - ok( ret, "InstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileW() failed (%lu)\n", GetLastError() ); ret = pGetColorDirectoryW( NULL, dest, &size ); - ok( ret, "GetColorDirectoryW() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorDirectoryW() failed (%lu)\n", GetLastError() ); MSCMS_basenameW( testprofileW, base ); @@ -1222,13 +1219,13 @@ static void test_UninstallColorProfileW( WCHAR *testprofileW ) lstrcatW( dest, base ); ret = pUninstallColorProfileW( NULL, dest, TRUE ); - ok( ret, "UninstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileW() failed (%lu)\n", GetLastError() ); bytes_copied = WideCharToMultiByte(CP_ACP, 0, dest, -1, destA, MAX_PATH, NULL, NULL); ok( bytes_copied > 0 , "WideCharToMultiByte() returns %d\n", bytes_copied); /* Check if the profile is really gone */ handle = CreateFileA( destA, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); - ok( handle == INVALID_HANDLE_VALUE, "Found the profile (%d)\n", GetLastError() ); + ok( handle == INVALID_HANDLE_VALUE, "Found the profile (%lu)\n", GetLastError() ); CloseHandle( handle ); } } @@ -1255,56 +1252,56 @@ static void test_AssociateColorProfileWithDeviceA( char *testprofile ) ret = pAssociateColorProfileWithDeviceA( "machine", testprofile, NULL ); error = GetLastError(); ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error ); SetLastError(0xdeadbeef); ret = pAssociateColorProfileWithDeviceA( "machine", NULL, monitor.DeviceID ); error = GetLastError(); ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error ); SetLastError(0xdeadbeef); ret = pAssociateColorProfileWithDeviceA( "machine", testprofile, monitor.DeviceID ); error = GetLastError(); ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); - ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %u\n", error ); + ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %lu\n", error ); ret = pInstallColorProfileA( NULL, testprofile ); - ok( ret, "InstallColorProfileA() failed (%u)\n", GetLastError() ); + ok( ret, "InstallColorProfileA() failed (%lu)\n", GetLastError() ); ret = pGetColorDirectoryA( NULL, profile, &size ); - ok( ret, "GetColorDirectoryA() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorDirectoryA() failed (%lu)\n", GetLastError() ); MSCMS_basenameA( testprofile, basename ); lstrcatA( profile, "\\" ); lstrcatA( profile, basename ); ret = pAssociateColorProfileWithDeviceA( NULL, profile, monitor.DeviceID ); - ok( ret, "AssociateColorProfileWithDevice() failed (%u)\n", GetLastError() ); + ok( ret, "AssociateColorProfileWithDevice() failed (%lu)\n", GetLastError() ); SetLastError(0xdeadbeef); ret = pDisassociateColorProfileFromDeviceA( "machine", profile, NULL ); error = GetLastError(); ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error ); SetLastError(0xdeadbeef); ret = pDisassociateColorProfileFromDeviceA( "machine", NULL, monitor.DeviceID ); error = GetLastError(); ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error ); SetLastError(0xdeadbeef); ret = pDisassociateColorProfileFromDeviceA( "machine", profile, monitor.DeviceID ); error = GetLastError(); ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); - ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %u\n", error ); + ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %lu\n", error ); ret = pDisassociateColorProfileFromDeviceA( NULL, profile, monitor.DeviceID ); - ok( ret, "DisassociateColorProfileFromDeviceA() failed (%u)\n", GetLastError() ); + ok( ret, "DisassociateColorProfileFromDeviceA() failed (%lu)\n", GetLastError() ); ret = pUninstallColorProfileA( NULL, profile, TRUE ); - ok( ret, "UninstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileA() failed (%lu)\n", GetLastError() ); } else skip("Unable to obtain monitor name\n"); @@ -1340,17 +1337,17 @@ static void test_CreateMultiProfileTransform( char *standardprofile, char *testp profile.cbDataSize = strlen(standardprofile); handle[0] = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle[0] != NULL, "got %u\n", GetLastError() ); + ok( handle[0] != NULL, "got %lu\n", GetLastError() ); profile.dwType = PROFILE_FILENAME; profile.pProfileData = testprofile; profile.cbDataSize = strlen(testprofile); handle[1] = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle[1] != NULL, "got %u\n", GetLastError() ); + ok( handle[1] != NULL, "got %lu\n", GetLastError() ); transform = pCreateMultiProfileTransform( handle, 2, intents, 2, 0, 0 ); - ok( transform != NULL, "got %u\n", GetLastError() ); + ok( transform != NULL, "got %lu\n", GetLastError() ); pDeleteColorTransform( transform ); pCloseColorProfile( handle[0] ); @@ -1387,7 +1384,7 @@ START_TEST(profile) /* See if we can find the standard color profile */ ret = GetSystemDirectoryA( profilefile1, sizeof(profilefile1) ); - ok( ret > 0, "GetSystemDirectoryA() returns %d, LastError = %d\n", ret, GetLastError()); + ok( ret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", ret, GetLastError()); ok(profilefile1[0] && lstrlenA(profilefile1) < MAX_PATH, "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(profilefile1)); MultiByteToWideChar(CP_ACP, 0, profilefile1, -1, profilefile1W, MAX_PATH); diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 8296341f7b7..0d48e217d66 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -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; -- 2.30.2

2 1

[PATCH 1/2] msv1_0: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msv1_0/Makefile.in | 1 - dlls/msv1_0/main.c | 50 ++++++++++++++++++++--------------------- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/msv1_0/Makefile.in b/dlls/msv1_0/Makefile.in index 8367caede9c..439d74d7bb9 100644 --- a/dlls/msv1_0/Makefile.in +++ b/dlls/msv1_0/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msv1_0.dll UNIXLIB = msv1_0.so IMPORTS = netapi32 advapi32 diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c index 32783f2f6cf..77dcfa3b67d 100644 --- a/dlls/msv1_0/main.c +++ b/dlls/msv1_0/main.c @@ -111,7 +111,7 @@ static NTSTATUS NTAPI ntlm_LsaApInitializePackage( ULONG package_id, LSA_DISPATC LSA_STRING *str; char *ptr; - TRACE( "%08x, %p, %s, %s, %p\n", package_id, dispatch, debugstr_as(database), debugstr_as(confidentiality), + TRACE( "%#lx, %p, %s, %s, %p\n", package_id, dispatch, debugstr_as(database), debugstr_as(confidentiality), package_name ); if (ntlm_check_version()) @@ -135,7 +135,7 @@ static NTSTATUS NTAPI ntlm_LsaApInitializePackage( ULONG package_id, LSA_DISPATC static NTSTATUS NTAPI ntlm_SpInitialize( ULONG_PTR package_id, SECPKG_PARAMETERS *params, LSA_SECPKG_FUNCTION_TABLE *lsa_function_table ) { - TRACE( "%lu, %p, %p\n", package_id, params, lsa_function_table ); + TRACE( "%#Ix, %p, %p\n", package_id, params, lsa_function_table ); if (ntlm_check_version()) { @@ -192,7 +192,7 @@ static NTSTATUS NTAPI ntlm_SpAcquireCredentialsHandle( UNICODE_STRING *principal WCHAR *domain = NULL, *user = NULL, *password = NULL; SEC_WINNT_AUTH_IDENTITY_W *id = NULL; - TRACE( "%s, 0x%08x, %p, %p, %p, %p, %p, %p\n", debugstr_us(principal), cred_use, logon_id, auth_data, + TRACE( "%s, %#lx, %p, %p, %p, %p, %p, %p\n", debugstr_us(principal), cred_use, logon_id, auth_data, get_key_fn, get_key_arg, cred, expiry ); switch (cred_use & ~SECPKG_CRED_RESERVED) @@ -298,7 +298,7 @@ static NTSTATUS NTAPI ntlm_SpFreeCredentialsHandle( LSA_SEC_HANDLE handle ) { struct ntlm_cred *cred = (struct ntlm_cred *)handle; - TRACE( "%lx\n", handle ); + TRACE( "%#Ix\n", handle ); if (!cred) return SEC_E_OK; @@ -589,7 +589,7 @@ static NTSTATUS NTAPI ntlm_SpInitLsaModeContext( LSA_SEC_HANDLE cred_handle, LSA unsigned int len, bin_len; int idx; - TRACE( "%lx, %lx, %s, 0x%08x, %u, %p, %p, %p, %p, %p, %p, %p\n", cred_handle, ctx_handle, debugstr_us(target), + TRACE( "%#Ix, %#Ix, %s, %#lx, %lu, %p, %p, %p, %p, %p, %p, %p\n", cred_handle, ctx_handle, debugstr_us(target), ctx_req, data_rep, input, new_ctx_handle, output, ctx_attr, expiry, mapped_ctx, ctx_data ); /* when communicating with the client there can be the following reply packets: @@ -875,7 +875,7 @@ done: free( bin ); free( want_flags ); - TRACE( "returning %08x\n", status ); + TRACE( "returning %#lx\n", status ); return status; } @@ -890,9 +890,9 @@ static NTSTATUS NTAPI ntlm_SpAcceptLsaModeContext( LSA_SEC_HANDLE cred_handle, L char *buf, *bin, *want_flags = NULL; unsigned int len, bin_len; - TRACE( "%lx, %lx, %08x, %u, %p, %p, %p, %p, %p, %p, %p\n", cred_handle, ctx_handle, ctx_req, data_rep, input, + TRACE( "%#Ix, %#Ix, %#lx, %lu, %p, %p, %p, %p, %p, %p, %p\n", cred_handle, ctx_handle, ctx_req, data_rep, input, new_ctx_handle, output, ctx_attr, expiry, mapped_ctx, ctx_data ); - if (ctx_req) FIXME( "ignoring flags %08x\n", ctx_req ); + if (ctx_req) FIXME( "ignoring flags %#lx\n", ctx_req ); if (!(buf = malloc( NTLM_MAX_BUF ))) return SEC_E_INSUFFICIENT_MEMORY; if (!(bin = malloc( NTLM_MAX_BUF ))) goto done; @@ -1088,7 +1088,7 @@ done: free( bin ); free( want_flags ); - TRACE( "returning %08x\n", status ); + TRACE( "returning %#lx\n", status ); return status; } @@ -1096,7 +1096,7 @@ static NTSTATUS NTAPI ntlm_SpDeleteContext( LSA_SEC_HANDLE handle ) { struct ntlm_ctx *ctx = (struct ntlm_ctx *)handle; - TRACE( "%lx\n", handle ); + TRACE( "%#Ix\n", handle ); if (!ctx) return SEC_E_INVALID_HANDLE; ntlm_cleanup( ctx ); @@ -1124,7 +1124,7 @@ static SecPkgInfoW *build_package_info( const SecPkgInfoW *info ) static NTSTATUS NTAPI ntlm_SpQueryContextAttributes( LSA_SEC_HANDLE handle, ULONG attr, void *buf ) { - TRACE( "%lx, %u, %p\n", handle, attr, buf ); + TRACE( "%#Ix, %lu, %p\n", handle, attr, buf ); if (!handle) return SEC_E_INVALID_HANDLE; @@ -1171,7 +1171,7 @@ static NTSTATUS NTAPI ntlm_SpQueryContextAttributes( LSA_SEC_HANDLE handle, ULON } #undef X default: - FIXME( "unknown attribute %u\n", attr ); + FIXME( "unknown attribute %lu\n", attr ); break; } @@ -1221,7 +1221,7 @@ static SECPKG_FUNCTION_TABLE ntlm_table = NTSTATUS NTAPI SpLsaModeInitialize( ULONG lsa_version, ULONG *package_version, SECPKG_FUNCTION_TABLE **table, ULONG *table_count ) { - TRACE( "%08x, %p, %p, %p\n", lsa_version, package_version, table, table_count ); + TRACE( "%#lx, %p, %p, %p\n", lsa_version, package_version, table, table_count ); *package_version = SECPKG_INTERFACE_VERSION; *table = &ntlm_table; @@ -1231,7 +1231,7 @@ NTSTATUS NTAPI SpLsaModeInitialize( ULONG lsa_version, ULONG *package_version, S static NTSTATUS NTAPI ntlm_SpInstanceInit( ULONG version, SECPKG_DLL_FUNCTIONS *dll_functions, void **user_functions ) { - TRACE( "%08x, %p, %p\n", version, dll_functions, user_functions ); + TRACE( "%#lx, %p, %p\n", version, dll_functions, user_functions ); return STATUS_SUCCESS; } @@ -1400,9 +1400,9 @@ static NTSTATUS NTAPI ntlm_SpMakeSignature( LSA_SEC_HANDLE handle, ULONG qop, Se struct ntlm_ctx *ctx = (struct ntlm_ctx *)handle; int idx; - TRACE( "%lx, 0x%08x, %p, %u\n", handle, qop, msg, msg_seq_no ); - if (qop) FIXME( "ignoring quality of protection %08x\n", qop ); - if (msg_seq_no) FIXME( "ignoring message sequence number %u\n", msg_seq_no ); + TRACE( "%#Ix, %#lx, %p, %lu\n", handle, qop, msg, msg_seq_no ); + if (qop) FIXME( "ignoring quality of protection %#lx\n", qop ); + if (msg_seq_no) FIXME( "ignoring message sequence number %lu\n", msg_seq_no ); if (!handle) return SEC_E_INVALID_HANDLE; if (!msg || !msg->pBuffers || msg->cBuffers < 2 || (idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1) @@ -1456,8 +1456,8 @@ static NTSTATUS NTAPI ntlm_SpVerifySignature( LSA_SEC_HANDLE handle, SecBufferDe struct ntlm_ctx *ctx = (struct ntlm_ctx *)handle; int idx; - TRACE( "%lx, %p, %u, %p\n", handle, msg, msg_seq_no, qop ); - if (msg_seq_no) FIXME( "ignoring message sequence number %u\n", msg_seq_no ); + TRACE( "%#Ix, %p, %lu, %p\n", handle, msg, msg_seq_no, qop ); + if (msg_seq_no) FIXME( "ignoring message sequence number %lu\n", msg_seq_no ); if (!handle) return SEC_E_INVALID_HANDLE; if (!msg || !msg->pBuffers || msg->cBuffers < 2 || (idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1) @@ -1472,9 +1472,9 @@ static NTSTATUS NTAPI ntlm_SpSealMessage( LSA_SEC_HANDLE handle, ULONG qop, SecB int token_idx, data_idx; struct ntlm_ctx *ctx; - TRACE( "%lx, %08x, %p %u\n", handle, qop, msg, msg_seq_no ); - if (qop) FIXME( "ignoring quality of protection %08x\n", qop ); - if (msg_seq_no) FIXME( "ignoring message sequence number %u\n", msg_seq_no ); + TRACE( "%#Ix, %#lx, %p %lu\n", handle, qop, msg, msg_seq_no ); + if (qop) FIXME( "ignoring quality of protection %#lx\n", qop ); + if (msg_seq_no) FIXME( "ignoring message sequence number %lu\n", msg_seq_no ); if (!handle) return SEC_E_INVALID_HANDLE; @@ -1514,8 +1514,8 @@ static NTSTATUS NTAPI ntlm_SpUnsealMessage( LSA_SEC_HANDLE handle, SecBufferDesc int token_idx, data_idx; struct ntlm_ctx *ctx; - TRACE( "%lx, %p, %u, %p\n", handle, msg, msg_seq_no, qop ); - if (msg_seq_no) FIXME( "ignoring message sequence number %u\n", msg_seq_no ); + TRACE( "%#Ix, %p, %lu, %p\n", handle, msg, msg_seq_no, qop ); + if (msg_seq_no) FIXME( "ignoring message sequence number %lu\n", msg_seq_no ); if (!handle) return SEC_E_INVALID_HANDLE; @@ -1559,7 +1559,7 @@ static SECPKG_USER_FUNCTION_TABLE ntlm_user_table = NTSTATUS NTAPI SpUserModeInitialize( ULONG lsa_version, ULONG *package_version, SECPKG_USER_FUNCTION_TABLE **table, ULONG *table_count ) { - TRACE( "%08x, %p, %p, %p\n", lsa_version, package_version, table, table_count ); + TRACE( "%#lx, %p, %p, %p\n", lsa_version, package_version, table, table_count ); *package_version = SECPKG_INTERFACE_VERSION; *table = &ntlm_user_table; -- 2.30.2

1 0

[PATCH 0/3] Fix for BZ52048
by eric.pouech＠gmail.com Feb. 11, 2022

Feb. 11, 2022

https://bugs.winehq.org/show_bug.cgi?id=52048 Basically, when calling CreateProcess with current console inheritance (no CREATE_NEW_CONSOLE nor DETACHED_PROCESS), and that the child is a CUI program, native behaves as if CREATE_NEW_CONSOLE was passed. builtin doesn't... this serie: - adds a test case for this case (which requires to extend makedep to support creation of exe sub-modules) - fixes kernelbase accordingly - but also requires to fix the usage of CreateProcess that will now force the creation of a console + one patch of wow64 redirection (only for CUI executables) + after quickly auditing all CreateProcess calls, I fixed a couple of them. --- Eric Pouech (4): tools/makedep: extend submodule in testdll to support exe as well as dll dlls/kernel32/tests: add tests about CreateProcess on CUI programs with console inheritance programs: don't recreate a console when redirecting a program to wow64 dlls/kernelbase: in CreateProcess, allocate a console for CUI process dlls/kernel32/tests/Makefile.in | 4 ++ dlls/kernel32/tests/console.c | 56 ++++++++++++++++++++++++++++ dlls/kernel32/tests/console_cui.c | 31 +++++++++++++++ dlls/kernel32/tests/console_cui.spec | 0 dlls/kernelbase/process.c | 6 ++- programs/services/services.c | 2 +- programs/uninstaller/main.c | 6 ++- programs/winedbg/winedbg.c | 3 +- programs/wusa/main.c | 3 +- tools/makedep.c | 10 +++-- 10 files changed, 111 insertions(+), 10 deletions(-) create mode 100644 dlls/kernel32/tests/console_cui.c create mode 100644 dlls/kernel32/tests/console_cui.spec

4 6

[PATCH 8/8] light.msstyles: Do not use transparent treeview parts.
by Zhiyi Zhang Feb. 11, 2022

Feb. 11, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52434 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../blue_treeview_expand_collapse_11px.bmp | Bin 1106 -> 930 bytes .../blue_treeview_expand_collapse_11px.svg | 14 ++++++++++---- .../blue_treeview_expand_collapse_13px.bmp | Bin 1490 -> 1178 bytes .../blue_treeview_expand_collapse_13px.svg | 14 ++++++++++---- .../blue_treeview_expand_collapse_16px.bmp | Bin 2186 -> 1674 bytes .../blue_treeview_expand_collapse_16px.svg | 14 ++++++++++---- .../blue_treeview_expand_collapse_18px.bmp | Bin 2730 -> 2154 bytes .../blue_treeview_expand_collapse_18px.svg | 14 +++++++++----- .../blue_treeview_expand_collapse_20px.bmp | Bin 3338 -> 2538 bytes .../blue_treeview_expand_collapse_20px.svg | 14 +++++++++----- .../blue_treeview_expand_collapse_23px.bmp | Bin 4370 -> 3450 bytes .../blue_treeview_expand_collapse_23px.svg | 14 +++++++++----- .../blue_treeview_expand_collapse_9px.bmp | Bin 786 -> 642 bytes .../blue_treeview_expand_collapse_9px.svg | 15 ++++++++++----- 14 files changed, 67 insertions(+), 32 deletions(-) diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_11px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_11px.bmp index ca04c0d291fc37479da3b6e7c21741c61ec5074b..ec33b3c461b841ab98e3138fcbc0edc6d066e1ce 100644 GIT binary patch literal 930 zcmZ?rUBt`)23<h128g+VSPY0686<!t1A_!q9?XFg{}~t{2qf~~$vvnTE=44R1x?*L zLI9{9sN_Fx0F)gNHE14zaDmPoDEHtBA-H>h3_Ji5hIkYJr66kl{r`^(VO0avg{+<y fY9N7+MglFRg<WvJ5aTbnVh9879v}k`0GbQ{TRBrM literal 1106 zcmbu;K?;IE6b9h2f}kK;wTPgO-~oa{h*oVpNf6Ygh0ADPi?(foP%%O90%6cCqB=uu zrvFufPL2u<{XXWs&q)_*BfZ4lYl-U|sUi(TVI5XP4e0W-IAfn5O}IAHCqE>k@%`Hj zB_BUls_|T_To&=pG%s4(%Y2fRd6`Y}X;$=EHtO@((C4-PI?J*)p68YGoCC{|lWCf* zEKk<9?J4RFwV&q6(j2viT#*^)TuHhov^1mVKmwe<^L?K_m)MG08sI%^=v|O~3}O?t zj^i}3KjQ2I&aTTWOc$Z&T^NQ(a)5FPC?<2YxGdPfFHChU<#&hYK9C#!H<*L5qhIrU#w Cztr~t diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_11px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_11px.svg index 59df40cb0e4..b94a832605f 100644 --- a/dlls/light.msstyles/blue_treeview_expand_collapse_11px.svg +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_11px.svg @@ -1,14 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:11-32" width="11" height="22" version="1.1" viewBox="0 0 2.9104 5.8209" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:11-24" width="11" height="22" version="1.1" viewBox="0 0 2.9104 5.8209" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> - <path d="m0.66143 2.6368 1.5026-1.1842-1.5026-1.1842z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> - <path d="m0.26456 5.5563h2.1167v-2.1167z" fill="#3096fa" stroke-width=".19844"/> + <g transform="matrix(1 0 0 1 -.1323 -.13229)" stroke="#aeaeae" stroke-width=".26458"> + <rect x=".26456" y=".26458" width="2.6458" height="2.6458" fill="#fffffe"/> + <rect x=".26456" y="3.175" width="2.6458" height="2.6458" fill="#fff"/> + </g> + <g transform="matrix(1 0 0 1 -.1323 -.13229)" stroke-width=".26458"> + <path d="m0.66145 1.4552h1.8521v0.26458h-1.8521z"/> + <path d="m1.7198 0.66147v1.8521h-0.26458v-1.8521z"/> + <path d="m0.66144 4.3656h1.8521v0.26458h-1.8521z"/> + </g> </svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_13px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_13px.bmp index 9edaf18e26b4b5158398e2ca307a90b2127a62de..0e8978b69a478239893a76832216bc4b5db00dbd 100644 GIT binary patch literal 1178 zcmZ?royEcc23<h128elqSPF<486<!t1A_om9?XFg{}~t{2qf~~$vvnTE=42*-Pm=+ z0S2J5|AYWg%@9$CC$NB?96J8MA0tqI04ah16mP@;kh*{W|KmqMHCWUE!yHZ9z^lWP a4uEbQc=sU(7_s4ptOvq|`U6N21PlP{%TUt* literal 1490 zcmcJPziPuU5XP1NOOvH!Ng?zR@(fwpB}-nVLzhrAmMn!p3MLsl6jRxoA!JB120E2M zpCwt;@6rgwA<Hr}!k<rf_x&VWU=K&%4RIP%+$T^Q>OmE8D{6(a)M=RT&^&_euORMW$| z(a)q^V2n%09{moXjY19^NMXrEj=7jZ6zYCbNH(a)o_#Tk1JwaTnNLtP{!uUForA3{I@?z zl4q(a)TrOdiuG_;80m_Dtbab{MCD$BA~2t*9_Xr^iUj`;>$r-&nlJoHZBUXXubjjoR~ zjPW3Ugnq#FO^rv+P#-mVzfbNpxy{h?A)i8f>~mv0JQ(a)a`no??sd<R`~pPds!XAJ)b n&R`Ap%I>@7#6Vl<Es7%N-;#60VEvhtvdVjTIhd!so?ZV1Nxc7- diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_13px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_13px.svg index f63653a8430..f2cb889813f 100644 --- a/dlls/light.msstyles/blue_treeview_expand_collapse_13px.svg +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_13px.svg @@ -1,14 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:13-32" width="13" height="26" version="1.1" viewBox="0 0 3.4396 6.8792" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:13-24" width="13" height="26" version="1.1" viewBox="0 0 3.4396 6.8792" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> - <path d="m0.92604 3.1357 1.5306-1.4107-1.5306-1.4107z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> - <path d="m0.26458 6.35h2.3813v-2.3813z" fill="#3096fa" stroke-width=".19844"/> + <g transform="matrix(1 0 0 1 -.059604 -.068297)" stroke="#aeaeae" stroke-width=".26458"> + <rect x=".19189" y=".20059" width="3.175" height="3.175" fill="#fffffe"/> + <rect x=".19189" y="3.6402" width="3.175" height="3.175" fill="#fff"/> + </g> + <g transform="matrix(1 0 0 1 -.059604 -.068297)" stroke-width=".26458"> + <path d="m0.58877 1.6558h2.3812v0.26458h-2.3812z"/> + <path d="m1.9117 0.59746v2.3812h-0.26458v-2.3812z"/> + <path d="m0.58877 5.0954h2.3812v0.26458h-2.3812z"/> + </g> </svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_16px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_16px.bmp index ab9813146d6dab88842b00214be7ad7446b89fb3..d9604ddcda24ee0567b997625265517c1ddd6516 100644 GIT binary patch literal 1674 zcmZ?r?P6m9gDxOh1H=MAtN_G}3=%*R2%z#14vhTIzyLuYf&WhKLB%i`VrdpMh3iNM z|A__=vx!#zf7qx;3uLTZV6edbi&X)dAhLQQgA{K5h*A&nHSNfM|Nj$-Aa1}^42fAx o(a)nNGLE$L$A0=*CSFIEL;g2?L8f)1h*O>h{i$Mh*ggp4!~005K3O8@`> literal 2186 zcmZ?r?c!hngDxOh1H=MAtN_G}K$00qGeG4*Oa%DPzyLuYq5n?qLB$9;;#e%iDWkip zpHmGQeoZs(a)PYlN8IAYDfr5_|tj2Za!6JrJ;{e;XQMn66?h}DnF3{v!CGlNw9=w^_k zAK46Y^~21dME_vcyLRo``I|Ry<|5aP>(;IN55!kCY}lYhju{~R>({SO0Mf63IG$89 zK>9&?)~s2h0c2kSnzd->&Yj%Engi1hQom}|Do!AO77$+t`bU=-Gm!Pe)C0xhfcP~K zr^3W=(b)8Z)Dr6-T>3#~0OiDh_!TfrR)F}}051KM*bhuou|RWQ1MN-2W+$>3vi<Yt z&*uR0Cjv3a;lFX?Ms=XRi{!*Vl6&)!-9`)><bEK&1`IE4V$`Fn0l62L?s(9}X~_ow DJIPeq diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_16px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_16px.svg index caf7ddf36b5..25496924a86 100644 --- a/dlls/light.msstyles/blue_treeview_expand_collapse_16px.svg +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_16px.svg @@ -1,14 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:16-32" width="16" height="32" version="1.1" viewBox="0 0 4.2333 8.4667" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:16-24" width="16" height="32" version="1.1" viewBox="0 0 4.2333 8.4667" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> - <path d="m0.92602 3.969 2.2916-1.7207-2.2916-1.7207z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> - <path d="m0.52914 7.9375h2.9104v-2.9104z" fill="#3096fa" stroke-width=".19844"/> + <g transform="translate(-.059625 -.0683)" stroke="#aeaeae" stroke-width=".26458"> + <rect x=".19189" y=".20059" width="3.9688" height="3.9688" fill="#fffffe"/> + <rect x=".19189" y="4.4339" width="3.9688" height="3.9688" fill="#fff"/> + </g> + <g transform="translate(-.059625 -.0683)" stroke-width=".26458"> + <path d="m0.58877 1.9204h3.175v0.52917h-3.175z"/> + <path d="m0.58877 6.1537h3.175v0.52917h-3.175z"/> + <path d="m2.4409 0.59747v3.175h-0.52917v-3.175z"/> + </g> </svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_18px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_18px.bmp index ed6ba251404c7859d402cad390a54b4d0d686f29..90a5ce7a5795c9896f2656024dca57008e9d735e 100644 GIT binary patch literal 2154 zcmZ?r&EjAHgDxOh1H?i=tOCT03=%++f#Cr=m_j4|GcZ69Nc_K(dr&c&0)ku?G!^T} z0t^g5ZU0FGKrN&Cu!I?P!UZi}v2r1nquPg6A(|jIeONq#LkQJA9Ez|AkLtq`C_o`t zxBzKV0XYAWstKqbtnc6d|0E%r=!2w8tnR>T->}n%mPN60A;E+iE?5<!31ZWS7UU2e aXo92q(a)Z}KHc)%KTSOsDFfHbLqfdK$|wM;Gm literal 2730 zcmeIxJqp4w6bJB#F6!ps?BF1X&@*&#a`6D-<m%w+;Owr0lQ(a)RbcI`C;@eX<db*TTR z7DDOAYtli%(ARvt<VTWHdn6m;Rn~Yf5iLX)Q4t+cMcw)2(Nsz(#QUMK&>oH#N|M#A zv1WbGq}#??-M3cAiM(BNtvrYF9E;;{EUuGh6>+kxqE4En<0M(SPTVqaRLj(ftTLRx zVSWRy>+XXfXqrlJLd3~&oW6+#<KcPU6!nE_U5gxAi~aP_KEgWaoHKIBl2X>u-yzPv z?+<8<TT~}ngRu$XioMOEvAjCTp*2O%ndXp%TpMvgNa|;mG^dRHz&5&{GQL;QbHwk8 Y?ngPtJf7$FVU+TJ>HY`Yeg4wCClAF{T>t<8 diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_18px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_18px.svg index 727a373970a..1eeb7f300fd 100644 --- a/dlls/light.msstyles/blue_treeview_expand_collapse_18px.svg +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_18px.svg @@ -1,16 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:18-32" width="18" height="36" version="1.1" viewBox="0 0 4.7624 9.525" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:18-24" width="18" height="36" version="1.1" viewBox="0 0 4.7624 9.525" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> - <g transform="matrix(2 0 0 2.0707 .13123 -.34848)"> - <path d="m0.66082 2.3416 1.1469-0.83167-1.1469-0.83167z" fill="none" stroke="#aeaeae" stroke-width=".13001"/> - <path d="m0.46353 4.5126h1.4552v-1.4055z" fill="#3096fa" stroke-width=".097511"/> + <g transform="matrix(1 0 0 1 .20492 .19629)" stroke="#aeaeae" stroke-width=".26458"> + <rect x="-.072682" y="-.064004" width="4.4979" height="4.4979" fill="#fffffe"/> + <rect x="-.072682" y="4.6985" width="4.4979" height="4.4979" fill="#fff"/> + </g> + <g transform="matrix(1 0 0 1 .20492 .19629)" stroke-width=".26458"> + <path d="m0.58878 1.9204h3.175v0.52917h-3.175z"/> + <path d="m0.58878 6.6829h3.175v0.52917h-3.175z"/> + <path d="m2.4409 0.59746v3.175h-0.52917v-3.175z"/> </g> </svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_20px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_20px.bmp index 30982d5d41380915caa2201148c10626791e7b8c..d8bc9546e78e71713edb18cb44e35580052b2b16 100644 GIT binary patch literal 2538 zcmZ?reZ|QD23<h128cy~SObU|86<!t149B-9?XFg{}~t{2qf~~$vvnTE=44R1x?*L z%D{iJ0K`tRwEiE}OMJLdE3DAc3?44TZOHcGQH&;qsh4=4j_Ms+VFgJc^e6xQ|4#;j zxRVTxKrQ(7Lb3oZlSlO;hYayyg;ucO;X=$u4re(a)y(WEf-BD)sChG(a)YQAJvN)CX|E~ TrfJ9`$nlFTP7E8OmuwOMct77Z literal 3338 zcmeI!yGp}Q9LMoUb&+-ubQcHFt-I(@1P68T5!6j|ad2_yC=TMFg0E0W)7VZr6#5Jb zinAB6FW?2(a)_pd$lk|sGPIfH|tznt`3J~>HG)0Wo93(n7W%>Ix}k~uQsOglNsa-Lmi z3moV7B`rZ|Wn(|oC81(8q5ZEmzn>S&9~Z^IG;!CH#*Fi%&D2ctOidln#MJe4O%qSY zH1(3qG+vyU){8Q;c*D%B-k(a)p2>osk8%CzbITj4uUtya&P&8D(a)V8N7g8HyVwJ@Y&33 zu)fF%xhJ#cLjMSiPpR=dZ;Rts*L9csdzigbo{Yj;;QbTXGgG>~d%cc1L)|U*CEHlH zr{2+^C!;ErN}hV3wCeS`{FTw(hIuj=Ge_GI^L(V7*9D_IHJ<iO@`k&r>f*{IPsY}2 zwMF{9kexV7+H^eTwj>_qZdR|eF57r(NmktaY<?cT?-#hXE9TU~ozj_?>N9x%aAZB- zQD$Dx81j94CI{+#rlp!6);7m&O09Jkbsh|PUY(K$V&i!guqJM7Jx|l#cXhqr07>y| diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_20px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_20px.svg index e6b567d5e94..cabc2fd2876 100644 --- a/dlls/light.msstyles/blue_treeview_expand_collapse_20px.svg +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_20px.svg @@ -1,16 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:20-32" width="20" height="40" version="1.1" viewBox="0 0 5.2916 10.583" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:20-24" width="20" height="40" version="1.1" viewBox="0 0 5.2916 10.583" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> - <g transform="matrix(2 0 0 2.0707 .13123 -.34848)"> - <path d="m0.52855 2.5873 1.4194-1.1412-1.4194-1.1412z" fill="none" stroke="#aeaeae" stroke-width=".13001"/> - <path d="m0.19896 5.0236h1.8521v-1.7888z" fill="#3096fa" stroke-width=".097512"/> + <g transform="matrix(.99999 0 0 .99999 .20497 .19619)" stroke="#aeaeae" stroke-width=".26458"> + <rect x="-.072682" y="-.064004" width="5.0271" height="5.0271" fill="#fffffe"/> + <rect x="-.072682" y="5.2277" width="5.0271" height="5.0271" fill="#fff"/> + </g> + <g transform="matrix(.99999 0 0 .99999 .28401 .32966)" stroke-width=".26458"> + <path d="m0.50973 2.0515h3.7042v0.52917h-3.7042z"/> + <path d="m0.50973 7.3431h3.7042v0.52917h-3.7042z"/> + <path d="m2.6264 0.46399v3.7042h-0.52917v-3.7042z"/> </g> </svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_23px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_23px.bmp index 3c42111b2dfd36a9bc3d201e27bde024a2a51626..61dee08bf96e63cae8a79258e701fa9f86babd21 100644 GIT binary patch literal 3450 zcmZ?rt>R?>gDxOh1H|G$tOvx53=%++f#CxWm_j4|GcZ69Nc_K(dr&c&0)ku?G!^Tp z0f1%#jrmU*0Gcpr4xS(!4Iey#1C&AwAGCB%3>RYlAU6kpAmEWj^A{eK_(a)ze88R6jr zOaK%DNI6fTAwcaAbN>DRPYI%@Iq*^lkAsPE&!{=TP{I?20~kJVtBGeoJc1VQ#A}DE pq^UVrLmSO%tZLBwg;mX{IfFJmV~sCj1c`}vlFR`bNFe|wGXQlH3^@P* literal 4370 zcmeI!ze^io7{Kw1wxCk522s(a6sHz6(52uOhfcOoJLo^)Kj7fvaAU}>;FO`I!;$0? z0&WgcXu*z!4z(bN7V{_g1FqjkbCBfT_uls|m(7<vxy$oB(a)8{lJ?vfPO@>9<JDD%8a z%o0mP&UxXCvMoL5DKY}bd3Z=AD8Bo+9ceKno*3$n<=!)Jy;pE=_6tGU=+&aH2Jxd> zG?UhkO6p7+UoEM#Nqx1V&nEHpioRm&>xKA=jUO+>S51EWY;!fvH_tYA=zQ}`yAG9a zH`A`G-?y7(-_`Bg&$90feft^7I>k>m<FPwD1D(a)x}UyY%RdcA&#KRFB>J0N~Ho6W_n zecW5$_qW(yv0cs57hAkqt+vAcKVl~<KeRjkOJ4utI0uZUgC3*X7K_jI8MaUU8!<D8 z-*1Z*1VIkprS`X4t-em{tL)ICwn4Os4`D9JHqI7@^}nU(Qr<@rS9(ph^l<IZ(|1CA z<?|SqoXxPY#i>*(WAuI|e&Ek#X^SOm#{MJMQI>YA)tbgVCOq~hva<1(i8G?)y6%XL zD?Rkz-}AbD-v1|h+I-in>w0u~oh|ndwH(a)Ld_l<6TTwY~&u8A+yzS~|Cs$=xqSPQK4 zC;3FzvdQk;gBQ4&e9wmKX04m-xAEVr){rKLcSn>lPaBQKt2Bmg4zB!O9&w)Yx}LOo J)|<(1%zsjeaS;Fj diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_23px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_23px.svg index 6bd39dbfc67..87ad74eda29 100644 --- a/dlls/light.msstyles/blue_treeview_expand_collapse_23px.svg +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_23px.svg @@ -1,16 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:23-32" width="23" height="46" version="1.1" viewBox="0 0 6.0853 12.17" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:23-24" width="23" height="46" version="1.1" viewBox="0 0 6.0853 12.17" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> - <g transform="matrix(2 0 0 2.0707 .13123 -.34848)"> - <path d="m0.66084 2.9897 1.6823-1.3432-1.6823-1.3432z" fill="none" stroke="#aeaeae" stroke-width=".13001"/> - <path d="m0.33125 5.6625h2.1166v-2.0444z" fill="#3096fa" stroke-width=".097511"/> + <g transform="matrix(.99998 0 0 .99998 .33049 .33087)" stroke="#aeaeae" stroke-width=".26458"> + <rect x="-.19821" y="-.19888" width="5.8208" height="5.8208" fill="#fffffe"/> + <rect x="-.19821" y="5.8865" width="5.8208" height="5.8208" fill="#fff"/> + </g> + <g transform="matrix(.99998 0 0 .99998 .40953 .46434)" stroke-width=".26458"> + <path d="m0.38421 2.1812h4.4979v0.79375h-4.4979z"/> + <path d="m0.38421 8.2666h4.4979v0.79375h-4.4979z"/> + <path d="m3.03 0.3291v4.4979h-0.79375v-4.4979z"/> </g> </svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_9px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_9px.bmp index 239cf2d779f9e59e69198996b7eef8da472a4123..6348199b5ef6da5c6b7e13a1ec86c3d7933c3589 100644 GIT binary patch literal 642 zcmZ?rZDL{ogDxOh1H_y_ECj(a)i3=%++f#C-um_j4|GcZ69Nc_K(dr&c&0)ku?G!^S` z0|ubfe{29KPN5u{BY>7rZYHKnp=JUptN`Q(T!3i*0eu3u7-$%ZKJ0RY{f=E9#2S2Z NaEAaHP`BXp9{>W&hA034 literal 786 zcmZ?r6=G%pgDxOh1H_y_ECj(a)i3<?Y&sSYL}fdT$AFhCGU=D(ABP%(xQ0s<@q<Z(&= zoNCbUYns7-bd0VZn>utgAU?V}Y--Te;ZlRF4xbvBIznp5m0!1RUGM+@{~7V=2deqM ze*OBTt5&UI!=(<S28cmm*T#(-d9kSj%KZnL!Mt|u+G#-cC7?Pfbafy#Ffkze2oUdt b(a)nJMb4Kd~b)qwzB_YmQ)i46(a)6SW`9tD$0)A diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_9px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_9px.svg index 15ba25f8094..a47f9101a5b 100644 --- a/dlls/light.msstyles/blue_treeview_expand_collapse_9px.svg +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_9px.svg @@ -1,16 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:9-32" width="9" height="18" version="1.1" viewBox="0 0 2.3812 4.7625" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:9-24" width="9" height="18" version="1.1" viewBox="0 0 2.3812 4.7625" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> - <g> - <path d="m0.66146 2.0842 0.99269-0.89372-0.99269-0.89372z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> - <path d="m0.26458 4.4979h1.5875v-1.5875z" fill="#3096fa" stroke-width=".19844"/> + <g stroke-linejoin="round" stroke-width=".26458"> + <rect x="-2.5e-5" width="2.3812" height="4.7625" fill="#fff"/> + <rect x=".13227" y=".13229" width="2.1167" height="2.1167" fill="none" stroke="#aeaeae" stroke-linejoin="miter"/> + <rect x=".13227" y="2.5135" width="2.1167" height="2.1167" fill="none" stroke="#aeaeae" stroke-linejoin="miter"/> + </g> + <g stroke-width=".26458"> + <path d="m0.52914 1.0583h1.3229v0.26458h-1.3229z"/> + <path d="m0.52914 3.4396h1.3229v0.26458h-1.3229z"/> + <path d="m1.3229 0.52917v1.3229h-0.26458v-1.3229z"/> </g> </svg> -- 2.32.0

1 0

[PATCH 7/8] light.msstyles: Do not use transparent edges for trackbar horizontal and vertical thumb.
by Zhiyi Zhang Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../blue_trackbar_thumb_horizontal.bmp | Bin 2418 -> 3918 bytes .../blue_trackbar_thumb_horizontal.svg | 14 +++++++------- .../blue_trackbar_thumb_vertical.bmp | Bin 4758 -> 3658 bytes .../blue_trackbar_thumb_vertical.svg | 14 +++++++------- dlls/light.msstyles/light.rc | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/light.msstyles/blue_trackbar_thumb_horizontal.bmp b/dlls/light.msstyles/blue_trackbar_thumb_horizontal.bmp index f3c8f55a9b2041f5d6b551124fb5d518218cb718..5a548024b186ab32f53fa15bd2903c46e5324526 100644 GIT binary patch literal 3918 zcmeH}u}*_P7{|}V%|usULG925AE1kq4kpI>0IfPZ2|j_lh^Fxo8pJmcM(Yf7>)fPG z2cgI3A4n;85OgAjaJjqQ_y7J}dtZK`*Ev4fVR5_1e21}xagDLTb}=*NY{wtcM2sap z(y4QFdLtQr4L2pnVlj6d+ceFg*q}g17Je*T*X5j(*q}g179RNXhQtmXS$Oab;s!#5 zY~v9sA_n!Y&tLel?RU(a)f@|a~g1hKGTHxcI{l$7U&d6BGjRBy&`y7f_WtLo2QCG#{L zlinq(a)MYnrGhw^wq(+S?aq(a)R;^AY(a)ZBbiEsS@;js+EVNeS$tp$b##3IRI(a)hP1A2sIZ z;f&P%;u5JV4#6{QT8?KZz&PePoJ|7j(l-=eZwuW}g14)1{)IXRR-cas#C`dFz<vJl zjK|@@4h4qff#tXVbQpQ`w!A|oMz--}>LD*{UY~M)3?<_5wZ}hS3NQnQqX8&|C!CD~ gt5?jk)d%hHG<O(a)BtyNt8|NDQtZ&dkvs=V9$07S=Y-T(jq literal 2418 zcmeHJOHPD95XESW-ol*_H=}`tMqSLtl^ZYM9drX3PvG89GR_Sc2(VEPq9nTG=NW)b zSp`!)lNmcRCMIs^@S2y`1tjl5HU0CeZLJx%INu;P5toQHZAV+j^Vb$m3j;K*J!l2` zXBXECB};^jAJ)g?u(a)wYCPH<h<<dP_g;xtVmNfJQ*&bsgWwGaXb#98+|4|ovobbwWS zQ2D9ypYsaCFq_Sb^)AQ%c(a)O_8M;PpyU>jKj<oq3ht;gUP(7-m{r0(do)R9m1N$upC zPH+8K?t{Wl+nD<A=&~Pzy=P%o1!j;F=lhqB`(`yf$_T`zK01lT=L?9BXDCOfGRN}a zpaxL^fw-){?{Qm&5_zY?YCfp^d^$$|Ux6|}|7DKlUC*k9hXv-96K9{P$5OAI(a)3(XP kS>~wf1Ks}EI{I55RDQDm^p7(8e?t2pW>wHWNSvPf4R_|o;s5{u diff --git a/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg b/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg index d1063507dd0..4aa6c26b068 100644 --- a/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg +++ b/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:6-32" width="6" height="95" version="1.1" viewBox="0 0 1.5875 25.135" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:11-24" width="11" height="105" version="1.1" viewBox="0 0 2.9104 27.781" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> + <rect y="-.00023066" width="2.9104" height="27.781" fill="#fdffff" stroke-linejoin="round" stroke-width=".070004"/> <g stroke-width=".26458"> - <rect x=".39688" y=".13229" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> - <rect x=".39688" y="5.1594" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> - <rect x=".39688" y="10.186" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> - <rect x=".39688" y="15.214" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> - <rect x=".39688" y="20.241" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y=".13206" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y="5.6883" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> + <rect x=".13229" y="11.245" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".13229" y="16.801" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y="22.357" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> </g> </svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_vertical.bmp b/dlls/light.msstyles/blue_trackbar_thumb_vertical.bmp index b5c9d0f78a528afc15f2073d17e0a8fce6e1884a..32315aa00da3ac5ece65c2c7aa140f85b892cca5 100644 GIT binary patch literal 3658 zcmeHKy-LGS82toS-2`7j?cfsKyA%W$L0TW6)!oU)Cvb0!QhbCG;|qxCXq}VQ)YX8c zgNe7FCrznsK*E;}BF*Lg<c4#;bGhFkxwm|HuukK0h5iz418pB|g*MR>J+6(1RL4X~ zjo)**a&(>oWKLI8h~aS1?K+labtDCNu)rk(a)uInnLSW<uo3tU1ZDLD}W3tYmgCBk!9 zaF?FH=>9v-ljnKT6#nEN9zqDLLSnxT(a)Du+P{#|bW|9Ag#;ImQVW{EGh1Qqz}6At>s zMwRs)0dpz?mQf?I@|2GUy+nDGXF?QwY364(54j_59dmO#PZr|*SBc+W;}E*gf55|d zfls54eq^79rWP8zf@*5f!`W!?Mv>i6y*8_G?$4Y#QK5Rig)l)`OirSIeTFxCgf(Z1 z{RRNH;4iZOrbf|yUA^3iQ;7Wc+VBqi=SOxukN(a)ljyi3LTp*TMXFE7dGU~>QX>+|n7 Di7IQU literal 4758 zcmeHJKTpC?5U<hE$;7qo*y(a)5|aFT(=$;GeYAgG_f*+7W)3y>6s_A~UK#u+{dv3)P+ zUEu}7guT}$L(a)pdx+TO44?tVY|x_5&!qqJB2enCG+zeYbYY~vW?>FPQjZWtKG@<ZpK zdwc(|adD@^lb!D3-Q(a)ee6^3CloleDMGJ&d2`9ToG<MG(Un9k>Oi3S{_{Ml?);u1a= zPpyS;RK4n)j;MO41507lg;_&Ci#q0B2S0g=X)c>;Crv4?DlYsrQa<8Dq)pN~X^N|* znzdO_jXF*BY#%Ud&?e14)A^sgdS}?Ac^&*DJmPzE>f${Ko?Q!iZVWv~K;MPRzRZu{ z(a)zO+$1f7SsUW?GOzBS&m#;1#-a;@7~`}mtX(a)9mmPJST&`BQ^Dv_>&+nZH%cVekR0s zo?@EIUc6md`9~+thi#D$T2R?3-|Iw+QQOSDn?!!S3y?YQ6(a)vNlb0pOI*m!C+;s>za zf@;-is&{*ViSyFjPnv%wzdgyurMV-2h)0WI%f^`M;V0rD-<wkx?@5O}tv)3k_O$<Z GPx}k^i?<a3 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg b/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg index 0ea443d89ef..f15c9fd1baa 100644 --- a/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg +++ b/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:21-32" width="21" height="55" version="1.1" viewBox="0 0 5.5562 14.552" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:21-24" width="21" height="55" version="1.1" viewBox="0 0 5.5562 14.552" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> + <rect x="-9.0909e-6" y="2.2204e-16" width="5.5562" height="14.552" fill="#fdffff" stroke-linejoin="round" stroke-width=".070003"/> <g stroke-width=".26458"> - <rect x=".13229" y=".39688" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> - <rect x=".13229" y="3.3073" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> - <rect x=".13229" y="6.2177" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> - <rect x=".13229" y="9.1281" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> - <rect x=".13229" y="12.039" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y=".13229" width="5.2916" height="2.6458" rx=".52916" ry=".52916" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y="3.0427" width="5.2917" height="2.6458" rx=".52917" ry=".52916" fill="#fff" stroke="#3096fa"/> + <rect x=".13229" y="5.9531" width="5.2917" height="2.6458" rx=".52917" ry=".52916" fill="#2979ff" stroke="#2979ff"/> + <rect x=".13229" y="8.8635" width="5.2917" height="2.6458" rx=".52917" ry=".52916" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y="11.774" width="5.2917" height="2.6458" rx=".52917" ry=".52916" fill="#fff" stroke="#aeaeae"/> </g> </svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 4b196716171..4596f0f0458 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -1091,13 +1091,13 @@ BLUE_INI TEXTFILE "ImageFile = blue_trackbar_thumb_horizontal.bmp\r\n" "ImageCount = 5\r\n" "ImageLayout = Vertical\r\n" -"SizingMargins = 2, 3, 2, 3\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" "SizingType = Tile\r\n" "[TrackBar.ThumbVert]\r\n" "BgType = ImageFile\r\n" "ImageFile = blue_trackbar_thumb_vertical.bmp\r\n" -"SizingMargins = 2, 3, 2, 3\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" "SizingType = Stretch\r\n" "ImageCount = 5\r\n" "ImageLayout = Vertical\r\n" -- 2.32.0

1 0

[PATCH 6/8] light.msstyles: Do not use transparent tab pane edges.
by Zhiyi Zhang Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/blue_tab_pane_edge.bmp | Bin 9354 -> 7050 bytes dlls/light.msstyles/blue_tab_pane_edge.svg | 7 +++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/light.msstyles/blue_tab_pane_edge.bmp b/dlls/light.msstyles/blue_tab_pane_edge.bmp index 0ee90aca9c540376d512f607da8aefd74ec87961..0fe3e1cd2eb65b65927a39eaac72bbf5c21a1187 100644 GIT binary patch literal 7050 zcmeI1u?@m76hw{05J)V+3~8unScR4eG7L&qaE6Enh&+WYbHquJ6bId>xUcv}_C?C+ z`MTfS+OwOhMSo&lmUVEa`P?mf-K(a)PhSD(*8X|DIjs{Hys?mmn$dhffgdzlst48s63 z=;Ju%oQr9}0BpbvjG3FMBvML!-{Y1{!EAnBBeOX&-N+BeFFxYK32;^U5g$%~tICh~ zZ~|Oae#D0p;HvT?KAZqol^^lp1h}gFhz}>gRpm!~I03FIKjOm)a8>#F%IDwa1sGw3 c5X?syFaR4cGfh*Ss?;o5bzBq1UYIw%0jZ}x;Q#;t literal 9354 zcmeI2El<Nx6oxMW0TMd_3&CMXu&8Cp)C>t0iA5kV2qc+9Vv$YSiq_2_2w%UT{VlAy zdtd0AnUUZQH#s+ZcA9?N^Y&?{c1P3MVfY?1eBXlOo{caJn>^AV=jLj}5Pm+~6-Se^ z>(#NpZEdYNEylP5cEJD~fFp1MPQe&V!3DSkSKtQRfqU=(9>EjHKm}fY;Tikq{W(0B z*YH}-!MQjm=VlM~I|uB|49vnz%*Kq&x}E3wepOX(WmztYqKGNLtjPSDW!YX`*Y8c! zEV{14?W8f7m6_!|rR*}y%y<r8d|y%>de=R_jRE&><6T|dzf9Ov_iy7}UERM-*i`p# z<6T|dzf9Ov_iy7}UERM-*i`p#<6T|dzf9Ov_iy7}UERM-*i`p#<6T|dzf9Ov_iy7} zUERM-*i`p#<6T|dzf9Ov_iy7}UFn}|2@?MQoofg_+qT6mq__ToYd7G3h<o_pbI|YM MzgK2ucCMXS0_lekzyJUM diff --git a/dlls/light.msstyles/blue_tab_pane_edge.svg b/dlls/light.msstyles/blue_tab_pane_edge.svg index 73f3fc2d2c7..2a950c9087d 100644 --- a/dlls/light.msstyles/blue_tab_pane_edge.svg +++ b/dlls/light.msstyles/blue_tab_pane_edge.svg @@ -1,16 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:48-32" width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:48-24" width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> <g fill="#fff"> - <rect x=".13229" y=".13229" width="12.435" height="12.171" rx=".52917" ry=".52917" stroke="#aeaeae" stroke-width=".26458"/> - <rect transform="matrix(1 0 .99934 .036434 0 0)" x="-341.09" y="341.31" width="5.4429" height="7.262"/> + <rect y="-2.2204e-16" width="12.7" height="12.7" rx=".52919" ry=".54067" stroke-linejoin="round" stroke-width=".26458"/> + <rect x=".13229" y=".13229" width="12.435" height="12.435" rx=".52919" ry=".54067" stroke="#aeaeae" stroke-width=".26458"/> </g> </svg> -- 2.32.0

1 0

[PATCH 5/8] light.msstyles: Fill combo box background with white pixels.
by Zhiyi Zhang Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/blue_combobutton.bmp | Bin 6858 -> 5178 bytes dlls/light.msstyles/blue_combobutton.svg | 6 +++--- dlls/light.msstyles/light.rc | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/light.msstyles/blue_combobutton.bmp b/dlls/light.msstyles/blue_combobutton.bmp index a2b12ba3e1f3c3506f30c0dd75e567612a6e526c..77ddc24e2964ebff7ed90f5b14b9f1b1e7094ebf 100644 GIT binary patch literal 5178 zcmeH~J5Iwu6h)214xnHQe2O$sP|{G*Aif(&pr#_Q0(#6xh$SFnmXMT$I_ddzAO)qs z#u;uh(bdBe^M*ts1s*xhao#-{`$;oOR(a)RoMgZ?<d`53R><py38!3(a)qp5KZ;pawii6 z_UL_XR#w*!asl;nGM6x;jZUXiuh*j}y73r(a)Aq>UN32ru<S(f?S0%8b5v0;3br)cvC zL$QoI^_fv-s1Rh;%~S~PysT0o$f}#E5ZrlLr9zNZH&Y?F^Rh~XAggYsLU8A0l?p*t z-Askx&dVwlf~>lk3c;P1RVt&bqgt)jYPCF<VQ&3m6M&A{aVP3POzs=<LH?BAo=mu7 zste|DRzDCs+cj^`gF6hj&C$GW(a)tYCGTy}WQNEdLlFmUCE{%mFcyi69Z?1r0*Ub*`t ztE2a7h;;<Tj?+z3o%`kb-5$8FkLGl%w<P7`{KSZ1ufSF_*3oT0r}18LzL<n1{WxDt z(a)AkXzFZPzxxRN!lOqO^(L6&6qmzc|jF{7_&h0l-VVrk%pC9fGp2#;2{q8~0SdgbcQ z_uBY-HN-lC(jVz<IeWPFU4~e{jVmm9>vr2uX<Yurz7bcj)qHQ>UtbmfVbzY~C%VlL zRD}U51eR2wLQoY3s1R6EfeJxY7@$I6Nd+ndRbhY%fh85F5LAT$Dg>5Pph8d;2B`e2 G|FB<8h73{w literal 6858 zcmeI1&raJw5XN1B$_sGf(B#lVLJm0M1rV2>dO>}Y9_svgf*vdCh*yY|<Q9n}TxrS+ zrA|Q03}&29-pkA;m2$AfFrRn7`DMMa2H9MHeL9QYj-T|qPjO1|jp9R8kB%r`z0Z?` z!$nd4!(;CH%guL~RLNtNYd6zqG^&lq;~7Op;f%pG_ru}vldNJgnaqjVrLm7Prp;VK z^?hQ_q=s}B!jk&wbb3OJe{xQmzLnh$WS|bEA_H~B)9nE68ERd%??MJ(a)->Dlx25Mck z??MJ(a)->Dlx25Mck??MJ(a)->Dlx25Mck??MLYee{=1K81J->S3Lbp2am(-=iq{-+O;v z(a)H#2X{h9kQaf|*e>pax#dd-?kntxo<cy^tpGeutW=zg?{>!tc7g`Kti>}Ot&>{rmb zwygYmy62mMSDp(zuXx6LrL(a)o0{#E;D={5iDehKM&rF)rs)OLN1C)a7bSgx()<=(k0 zcuAv9=YNCxV18{&?(xDq^t`%l*Vez|**c9g3TKQgOXK_1-DUCji0bE?H14`#%lv%A zHJkLJ&+CzW<8_6wq~87dd_s)k`G~Ji=0Y<vP**(N4&a`l)>Zp1WT5t)x)Efc)>Zp1 zWT5t)x)Efc)>Zp1WT5t)x)Efc)>Zp1WT5t)x)EfM-ba5ao{!dP`(ZO^Cm}s6?|*TZ z)-;zZSq<X)dT_Deb(a)IB6!8LR4(a)xnXwT)nTee?$D-ELEsw%$kvb+R70>GEmFBH6sJH zl_P#+pq6=SMh0ptNBqb(a)E%Vll4AfSR_>qBH=B*hSsI46FBLlU}TQf3HTRGxK2I+mj guX`Y768gT5|JT9q*krAw>%`mXeI56B;q5cO0viV(a)SpWb4 diff --git a/dlls/light.msstyles/blue_combobutton.svg b/dlls/light.msstyles/blue_combobutton.svg index aab7ff06812..07293de0ba8 100644 --- a/dlls/light.msstyles/blue_combobutton.svg +++ b/dlls/light.msstyles/blue_combobutton.svg @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:20-32" width="20" height="84" version="1.1" viewBox="0 0 5.2917 22.225" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:20-24" width="20" height="84" version="1.1" viewBox="0 0 5.2917 22.225" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> - <g stroke-width=".26458"> + <rect y="-7e-5" width="5.2917" height="22.225" fill="#fff" stroke-width=".26458"/> + <g transform="translate(5.0184e-6 -6.4982e-5)" stroke-width=".26458"> <rect x=".39687" y=".39687" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="none" stroke="#aeaeae"/> <rect x=".39687" y="5.9531" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="none" stroke="#3096fa"/> <rect x=".39687" y="11.509" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index a8e35f9c5d7..4b196716171 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -398,7 +398,6 @@ BLUE_INI TEXTFILE "GlyphType = ImageGlyph\r\n" "GlyphImageFile = blue_combobutton_glyph.bmp\r\n" "GlyphTransparent = True\r\n" -"Transparent = True\r\n" "TransitionDurations = 4, " "0, 100, 100, 100, " "100, 0, 100, 100, " -- 2.32.0

1 0

[PATCH 4/8] light.msstyles: Fill radio button background with white pixels.
by Zhiyi Zhang Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/blue_radiobutton_13px.bmp | Bin 5546 -> 5546 bytes dlls/light.msstyles/blue_radiobutton_13px.svg | 27 +++++++++--------- dlls/light.msstyles/blue_radiobutton_16px.bmp | Bin 8330 -> 8330 bytes dlls/light.msstyles/blue_radiobutton_16px.svg | 27 +++++++++--------- dlls/light.msstyles/blue_radiobutton_19px.bmp | Bin 11690 -> 11690 bytes dlls/light.msstyles/blue_radiobutton_19px.svg | 19 ++++++------ dlls/light.msstyles/blue_radiobutton_22px.bmp | Bin 15626 -> 15626 bytes dlls/light.msstyles/blue_radiobutton_22px.svg | 17 ++++++----- dlls/light.msstyles/blue_radiobutton_25px.bmp | Bin 20138 -> 20138 bytes dlls/light.msstyles/blue_radiobutton_25px.svg | 25 ++++++++-------- dlls/light.msstyles/blue_radiobutton_28px.bmp | Bin 25226 -> 25226 bytes dlls/light.msstyles/blue_radiobutton_28px.svg | 17 ++++++----- dlls/light.msstyles/blue_radiobutton_31px.bmp | Bin 30890 -> 30890 bytes dlls/light.msstyles/blue_radiobutton_31px.svg | 17 ++++++----- 14 files changed, 82 insertions(+), 67 deletions(-) diff --git a/dlls/light.msstyles/blue_radiobutton_13px.bmp b/dlls/light.msstyles/blue_radiobutton_13px.bmp index 636992294934772b6821a1bdebbc8c625c46c738..ee19cf265c401af8b872fb8b2c37e9a6f16bded7 100644 GIT binary patch literal 5546 zcmeHJO-x)>6vl|U0G95mc4xGWHq!z5nIQ&EOspoxL>Fpwp=rB!VW_4|Nb16MfdK8; z6(S6O!$53eL|`MjmDr6#jfHl_5SSrl?#w%W-+k{6(a)8^!i*hLqdaOb>p&Uel|=iJMC zr|0d7ryDeVgWs>PTCgr+J=Sot;c(a)Vjo*j=ql7<HNk2>jj<K54F#v?s8{tIe)dOCsi z9o8MJ1FXNX#-^sGy25TtOG}N=55m3yeqmx_;#sUG$)USQJ=Rs?jIW2kIX5(a)Qaw9}N zd~VW(a)M(_lD@&=FRbI`3}?U83PnKy~^{Fq1A%*@O<)_LkZyZ{?m#t(YtIfk`0J3IRf zec=0B81KnzUd-np>;AA_>LBmd@!6$)adGh}*zaR)BBvA7J!l`Vk9Yj_!2d1VKES-g zn23D=_A%6w1pgB;nyL5veuce=XYzB(a)vu}9LLzke8=Rw5!!T3?<Cv!f;8NIm&j04~E z?Bnq8(a)Dq?vP^O-E|2;6i%oCV#?7xXsCii5WkHPu5d~qrv{q6H|IkqjAPFExa-rt^; z-sdBCR8p(a)tN-Ca~D~Y14eeXzNOQcd3&3_qpv_2KTMx5D0<3~O&$^D{OiF(@MM<1Qf zm1MDozxA`o!22S7XI*}4*$qQK=7Bt=|COB1hZf>{Ux+T_$2?iz<=Bqw+;wAJeJ_e< z4DL%RY)Y*^te2FE+kL1fsRNNOPb=w*6^_0S`pI+f*Yn4ceV_Fo^)|Y0eO(a)mn<?HUE z9F$x={RU81U(Ds~3rY74{l&TKe)Bv>J}K4wT-4$3;rXNw&(z!l#Nj<)A1g{Ur_A$X zT;DyY`Sv1D*2lhFI#tn}vX_s+`MDZ+Iiap6=haBZc6sP*MU8fDt8{l(4V|&x(eh|# zT7BD7tgcTw&K`2BmW90f`=mpCd9*8VM>T%-(~^{Nr)&hhf}MWMOXqXrwW7g0w^u}E zJ`%*y-1%$OjY2={$2`^b?p$>}<Iq5SdGJhR89$vT>MM`5(a)96yDqb5Iy;2DGa>X^G* zV*0~+NyyjgL%pWTfuNsCjdm2Ay?a{qz<tn1?h~wM*}6|P|C5f%bI|8C_)=2ccpZIn z(a)2GQo8To&RJUcXJUo^3A=r8-se!J)M8P3PM+b-(xw{||Afjg(a)G5Qlwt?}5TSxF?hu zpLW|FRm>CT#lDn>Vz_S|1uc8|FsCr_oj(uCX0zLP=T^um;$0oNqkMP6o?cj3DCYBd zr&KCQwOSQ&%GASt&Hs)ker08)q!j+oEJQu+^kZ(!hj9!(m&-|8TbndDH){@?jzT+e z%oCX0#>R%eqr(a)XjWEnr^$@=gO+u7gW*RkU9cm&TF+?T}qke}`k>m{|cv{-$pClQB! zD(qAEulxAxL9W()5L(a)qK>ftvO^F^(1^lNQxm8Pa9&Dj@{=^OjZe)D`*S67d6KD9f_ z^Q9mA&%U!h)=N&AdfJKO9)4n;tdD)+eIuuA^6_KMGi_Lp>^y4n40F`RIW{tnhH+sT zK9PAej0wy5KZwkuVN6)I&7)yVShmfhVN6&?Zq|7;j59L(2A|`3)HjFx?|D(a)J_gjAI z&7&4*KxLap0|1L)n(a)26MfXX(H1^^a;^L=<8wZH-@&VROfGyw7m$MfhzpGSS&4L;VH zM}wfKWSd8$sG!EN%%eesMY7DJ7F0mRxh_191^^bJ-aKl7x~k)O^r6qA^?GgQDtxyB z^JqQ1(VO`V-(a)Mv9YHanmZ62+MHG11TYHanm*@yF)nXl_%jo#D~o=1&6%uU}o<MI3d IsLrGR0FDk<@&Et; literal 5546 zcmeHLyG~m{5OowDO;V;KkOB#8B76}gMv7=6#YBqo5jIV#NCbxz)F}~M$3<FWSv(tr zD{9O)a9v>Y0f2a1kT&P+Biz?Qq@;j|D<-ouduDfb_K2M@^}hZhCBN_Z_Z#FnWCrpi z^(yrg`jwu?Fz|^~O8w9$rrv)19GLv0Vb?9F_4V}}WChZOTtW^Z)wQ*?iD=mF?rs<S zF6LX%#d^Ko59y(XZ-#!z5^*M0;~QIBTRd*;qaQI1#&HrlhZxV`G0wxc2RWf$U0r=g zoQ`826B`>FHAsPejTgX%#KghRJgbnS&CSi1j6v*v6tC?)z2*RHSs$L4KG?^Wm}Aaw zZ*TWv{sPiLPJQ&<wU4f2J9r+%PbcjI%m=QCwTqaq;w+QU2Uz17{W`9R`BRLk^YpWB z7<=&LXk+YRtsN6bU+^>cL!9v&9&jDR7FfqhrP2+%k2d|p2YFy(nI|wc?B9X-)Y_K$ z7+g?`FC#foO0PiLkV{b-K7_7{(ol?}V&P2}=3Gcilrlxc_KSs)9;xRtGs>S{BF^lg z(a)eMIMl*m!~foVV_M|D1)!HciyJm&TwCt6F6>Nw;vGy#82%neJ9YP^6iDk(a)IpiSwn8 z#QbZ?QH=K!@Qjxn74zu<j8%PbUY-s1u_Z=wRD2rj#ry(a)NBW4FBM=`#AAJ$Xtb90{3 z(a)HBkUv(T0tmG>a;D>I4l0q#R`6!(a@;U;jWQlpMCZ&h!Pb=K#=eP(t{9DTtra6i8} z8sLG)y0ea=Fy75`O1qTyu&*2BfmsuKAy3>F>rzVlTGvcI1{c&<%h{aoW>>CUr|rAW z<yF}^^vg~aI+3HmxR91#&KA!r<NcyO(nIaLV>8n4Iw6h{f9X06(a)zcUl_&E=p<fzKW z(a)eKajb@G_ogPc%b|8Nx75C^-(Jh68TW64pC7qCNO;$)sUAND*tTUH$Pm!176UfYtR z=SyP)ran9`>xcPcON`>^;$Sc4FA&!`TO5(a)fy>lPbQSB2rPdPiCv=8!^9OXU8`*KGo zfjbb(ilf&mt_j~Mq{+H4Z`KvI$2#kC;C{w-OdNf|k9d7QA&z1V^1y=>SVvJA(a)8&sa zYkwj~uVkKMHP!_<UuoDnpWxnR%-{Ktd;8WSPu7-PInnyow_fAX9kD|SiHyTpV{bih z`w^^(wZ8ShlZyry)YiBDu6>f;dc;gy_PO<~*KtkgQwX)>=tF$#9{@*D-uP$hN8`w_ z$HLJtC}N?viuI!rNX$&?M`NIf!@|)BDr_RR#C|l4y0IQ2M|J;qZ~M`k>V`+Qel(1V zTOy$!jibVzq<%Dvh+9ehXdD&x;4WhQXc!T<Z2f2)sXV%FkNs%i|4isP{;D6f*4omK z+VIAo)Q_4un@;LSZCK+M3H_*<vuXDA(SFp1HGW$^YUZQ*u^;{Se|w77*w~M6y{g3j H`quvf$~kDv diff --git a/dlls/light.msstyles/blue_radiobutton_13px.svg b/dlls/light.msstyles/blue_radiobutton_13px.svg index 41f2b6e976a..c47a790cd42 100644 --- a/dlls/light.msstyles/blue_radiobutton_13px.svg +++ b/dlls/light.msstyles/blue_radiobutton_13px.svg @@ -5,24 +5,25 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> - <path d="m10 58.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z"/> <g fill="none"> - <ellipse cx="6.5" cy="6.5" rx="6" ry="6" stroke="#aeaeae"/> - <ellipse cx="6.5" cy="19.5" rx="6" ry="6" stroke="#3096fa"/> - <ellipse cx="6.5" cy="32.5" rx="6" ry="6" stroke="#2979ff"/> + <g fill="#fff"> + <ellipse cx="6.5" cy="6.5" rx="6" ry="6" stroke="#aeaeae"/> + <ellipse cx="6.5" cy="19.5" rx="6" ry="6" stroke="#3096fa"/> + <ellipse cx="6.5" cy="32.5" rx="6" ry="6" stroke="#2979ff"/> + </g> <ellipse cx="6.5" cy="45.5" rx="6" ry="6" stroke="#aeaeae"/> - <ellipse cx="6.5" cy="58.5" rx="6" ry="6" stroke="#aeaeae"/> - <ellipse cx="6.5" cy="71.5" rx="6" ry="6" stroke="#3096fa"/> - <ellipse cx="6.5" cy="84.5" rx="6" ry="6" stroke="#2979ff"/> + <g fill="#fff"> + <ellipse cx="6.5" cy="58.5" rx="6" ry="6" stroke="#aeaeae"/> + <ellipse cx="6.5" cy="71.5" rx="6" ry="6" stroke="#3096fa"/> + <ellipse cx="6.5" cy="84.5" rx="6" ry="6" stroke="#2979ff"/> + </g> <ellipse cx="6.5" cy="97.5" rx="6" ry="6" stroke="#aeaeae"/> </g> - <g> - <path d="m10 71.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#3096fa"/> - <path d="m10 84.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#2979ff"/> - <path d="m10 97.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#aeaeae"/> - </g> + <path d="m10 58.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z"/> + <path d="m10 71.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#3096fa"/> + <path d="m10 84.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#2979ff"/> + <path d="m10 97.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#aeaeae"/> </svg> diff --git a/dlls/light.msstyles/blue_radiobutton_16px.bmp b/dlls/light.msstyles/blue_radiobutton_16px.bmp index 9b8ffe570b308de67845223ad0c3d1d409f430ac..80192a72f150d9cee1203c5aee7e507a101d57f6 100644 GIT binary patch literal 8330 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 A2><{9 literal 8330 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 diff --git a/dlls/light.msstyles/blue_radiobutton_16px.svg b/dlls/light.msstyles/blue_radiobutton_16px.svg index 158279ee557..abc996e08cf 100644 --- a/dlls/light.msstyles/blue_radiobutton_16px.svg +++ b/dlls/light.msstyles/blue_radiobutton_16px.svg @@ -5,24 +5,25 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> - <path d="m13 72a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z"/> <g fill="none"> - <circle cx="8" cy="8" r="7.5" stroke="#aeaeae"/> - <circle cx="8" cy="24" r="7.5" stroke="#3096fa"/> - <circle cx="8" cy="40" r="7.5" stroke="#2979ff"/> + <g fill="#fff"> + <circle cx="8" cy="8" r="7.5" stroke="#aeaeae"/> + <circle cx="8" cy="24" r="7.5" stroke="#3096fa"/> + <circle cx="8" cy="40" r="7.5" stroke="#2979ff"/> + </g> <circle cx="8" cy="56" r="7.5" stroke="#aeaeae"/> - <circle cx="8" cy="72" r="7.5" stroke="#aeaeae"/> - <circle cx="8" cy="88" r="7.5" stroke="#3096fa"/> - <circle cx="8" cy="104" r="7.5" stroke="#2979ff"/> + <g fill="#fff"> + <circle cx="8" cy="72" r="7.5" stroke="#aeaeae"/> + <circle cx="8" cy="88" r="7.5" stroke="#3096fa"/> + <circle cx="8" cy="104" r="7.5" stroke="#2979ff"/> + </g> <circle cx="8" cy="120" r="7.5" stroke="#aeaeae"/> </g> - <g> - <path d="m13 88a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#3096fa" stroke="#3096fa"/> - <path d="m13 104a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#2979ff"/> - <path d="m13 120a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#aeaeae"/> - </g> + <path d="m13 72a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z"/> + <path d="m12.5 88a4.5 4.5 0 0 1-4.5 4.5 4.5 4.5 0 0 1-4.5-4.5 4.5 4.5 0 0 1 4.5-4.5 4.5 4.5 0 0 1 4.5 4.5z" fill="#3096fa" stroke="#3096fa"/> + <path d="m13 104a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#2979ff"/> + <path d="m13 120a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#aeaeae"/> </svg> diff --git a/dlls/light.msstyles/blue_radiobutton_19px.bmp b/dlls/light.msstyles/blue_radiobutton_19px.bmp index a8f0d8e369e091c4a70bc0738a13df37ea5213d3..e9859c35ddfb43658c20f31795ccdea0535ff364 100644 GIT binary patch literal 11690 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 literal 11690 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 HC$8gvq=Xj^ diff --git a/dlls/light.msstyles/blue_radiobutton_19px.svg b/dlls/light.msstyles/blue_radiobutton_19px.svg index 116c68b5fdc..9d2528e61eb 100644 --- a/dlls/light.msstyles/blue_radiobutton_19px.svg +++ b/dlls/light.msstyles/blue_radiobutton_19px.svg @@ -5,21 +5,24 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> - <path d="m15 85.5a5.5 5.5 0 0 1-5.5 5.5 5.5 5.5 0 0 1-5.5-5.5 5.5 5.5 0 0 1 5.5-5.5 5.5 5.5 0 0 1 5.5 5.5z" stroke-width=".99999"/> <g transform="matrix(1.2106 0 0 1.189 -.18477 -.17782)" fill="none" stroke-width=".83352"> - <ellipse cx="8" cy="8.1396" rx="7.4306" ry="7.5733" stroke="#aeaeae"/> - <ellipse cx="8" cy="24.12" rx="7.4306" ry="7.5733" stroke="#3096fa"/> - <ellipse cx="8" cy="40.1" rx="7.4306" ry="7.5733" stroke="#2979ff"/> + <g> + <ellipse cx="8" cy="8.1396" rx="7.4306" ry="7.5733" fill="#fffff9" stroke="#aeaeae"/> + <ellipse cx="8" cy="24.12" rx="7.4306" ry="7.5733" fill="#fff" stroke="#3096fa"/> + <ellipse cx="8" cy="40.1" rx="7.4306" ry="7.5733" fill="#fff" stroke="#2979ff"/> + </g> <ellipse cx="8" cy="56.08" rx="7.4306" ry="7.5733" stroke="#aeaeae"/> - <ellipse cx="8" cy="72.06" rx="7.4306" ry="7.5733" stroke="#aeaeae"/> - <ellipse cx="8" cy="88.04" rx="7.4306" ry="7.5733" stroke="#3096fa"/> - <ellipse cx="8" cy="104.02" rx="7.4306" ry="7.5733" stroke="#2979ff"/> + <g fill="#fff"> + <ellipse cx="8" cy="72.06" rx="7.4306" ry="7.5733" stroke="#aeaeae"/> + <ellipse cx="8" cy="88.04" rx="7.4306" ry="7.5733" stroke="#3096fa"/> + <ellipse cx="8" cy="104.02" rx="7.4306" ry="7.5733" stroke="#2979ff"/> + </g> <ellipse cx="8" cy="120" rx="7.4306" ry="7.5733" stroke="#aeaeae"/> </g> + <path d="m15 85.5a5.5 5.5 0 0 1-5.5 5.5 5.5 5.5 0 0 1-5.5-5.5 5.5 5.5 0 0 1 5.5-5.5 5.5 5.5 0 0 1 5.5 5.5z" stroke-width=".99999"/> <g transform="matrix(1.0159 0 0 1.1881 1.3728 -.10631)"> <path d="m12.967 88.044a5 4.2482 0 0 1-5 4.2482 5 4.2482 0 0 1-5-4.2482 5 4.2482 0 0 1 5-4.2482 5 4.2482 0 0 1 5 4.2482z" fill="#3096fa" stroke="#3096fa" stroke-width=".76202"/> <path d="m13.414 104.04a5.414 4.6292 0 0 1-5.414 4.6292 5.414 4.6292 0 0 1-5.414-4.6292 5.414 4.6292 0 0 1 5.414-4.6292 5.414 4.6292 0 0 1 5.414 4.6292z" fill="#2979ff" stroke-width=".76202"/> diff --git a/dlls/light.msstyles/blue_radiobutton_22px.bmp b/dlls/light.msstyles/blue_radiobutton_22px.bmp index 580b466b2c9fedc9626edd2f66e8d1b5acde1e0e..c489a5171dc9fa637fcb63bd2f4dd80d0adaf9a6 100644 GIT binary patch literal 15626 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 literal 15626 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 Zf!OcI%*`U_Zhkk^_`MUR%j2G}{x8-y9Pt1E diff --git a/dlls/light.msstyles/blue_radiobutton_22px.svg b/dlls/light.msstyles/blue_radiobutton_22px.svg index 45993de1038..a8da8bfab35 100644 --- a/dlls/light.msstyles/blue_radiobutton_22px.svg +++ b/dlls/light.msstyles/blue_radiobutton_22px.svg @@ -5,18 +5,21 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> <g fill="none" stroke-width="2"> - <circle cx="11" cy="11" r="10" stroke="#aeaeae"/> - <circle cx="11" cy="33" r="10" stroke="#3096fa"/> - <circle cx="11" cy="55" r="10" stroke="#2979ff"/> + <g fill="#fff"> + <circle cx="11" cy="11" r="10" stroke="#aeaeae"/> + <circle cx="11" cy="33" r="10" stroke="#3096fa"/> + <circle cx="11" cy="55" r="10" stroke="#2979ff"/> + </g> <circle cx="11" cy="77" r="10" stroke="#aeaeae"/> - <circle cx="11" cy="99" r="10" stroke="#aeaeae"/> - <circle cx="11" cy="121" r="10" stroke="#3096fa"/> - <circle cx="11.055" cy="143" r="10" stroke="#2979ff"/> + <g fill="#fff"> + <circle cx="11" cy="99" r="10" stroke="#aeaeae"/> + <circle cx="11" cy="121" r="10" stroke="#3096fa"/> + <circle cx="11.055" cy="143" r="10" stroke="#2979ff"/> + </g> <circle cx="11" cy="165" r="10" stroke="#aeaeae"/> </g> <path d="m17 99a6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6 6 6 0 0 1 6 6z"/> diff --git a/dlls/light.msstyles/blue_radiobutton_25px.bmp b/dlls/light.msstyles/blue_radiobutton_25px.bmp index cab87f62316ed9d409412a5b32a1c30b394a6e1b..e3d239011f149055f47dca2c5629a4f66d80af20 100644 GIT binary patch literal 20138 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 bSO4LDqkVAq?DcONcz$ucAooA>e~bJV2*la& literal 20138 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 diff --git a/dlls/light.msstyles/blue_radiobutton_25px.svg b/dlls/light.msstyles/blue_radiobutton_25px.svg index f105f57095c..e478008e2ea 100644 --- a/dlls/light.msstyles/blue_radiobutton_25px.svg +++ b/dlls/light.msstyles/blue_radiobutton_25px.svg @@ -5,24 +5,25 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> <g fill="none" stroke-width="2"> - <ellipse cx="12.5" cy="12.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> - <ellipse cx="12.5" cy="37.5" rx="11.5" ry="11.5" stroke="#3096fa"/> - <ellipse cx="12.5" cy="62.5" rx="11.5" ry="11.5" stroke="#2979ff"/> + <g> + <ellipse cx="12.5" cy="12.5" rx="11.5" ry="11.5" fill="#fffff9" stroke="#aeaeae"/> + <ellipse cx="12.5" cy="37.5" rx="11.5" ry="11.5" fill="#fff" stroke="#3096fa"/> + <ellipse cx="12.5" cy="62.5" rx="11.5" ry="11.5" fill="#fff" stroke="#2979ff"/> + </g> <ellipse cx="12.5" cy="87.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> - <ellipse cx="12.5" cy="112.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> - <ellipse cx="12.5" cy="137.5" rx="11.5" ry="11.5" stroke="#3096fa"/> - <ellipse cx="12.5" cy="162.5" rx="11.5" ry="11.5" stroke="#2979ff"/> + <g fill="#fff"> + <ellipse cx="12.5" cy="112.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> + <ellipse cx="12.5" cy="137.5" rx="11.5" ry="11.5" stroke="#3096fa"/> + <ellipse cx="12.5" cy="162.5" rx="11.5" ry="11.5" stroke="#2979ff"/> + </g> <ellipse cx="12.5" cy="187.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> </g> <path d="m20 112.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z"/> - <g> - <path d="m20 137.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#3096fa"/> - <path d="m20 162.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#2979ff"/> - <path d="m20 187.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#aeaeae"/> - </g> + <path d="m20 137.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#3096fa"/> + <path d="m20 162.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#2979ff"/> + <path d="m20 187.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#aeaeae"/> </svg> diff --git a/dlls/light.msstyles/blue_radiobutton_28px.bmp b/dlls/light.msstyles/blue_radiobutton_28px.bmp index 4329d94e6ed6e87d8279e8e2482ede00ec4c9db3..44b0fc173be392da46784b692f3f8af9a64aae40 100644 GIT binary patch literal 25226 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 Wr$|$df8c6}POwX!vnTBLTmKIof`BLh literal 25226 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 E7wh(kHvj+t diff --git a/dlls/light.msstyles/blue_radiobutton_28px.svg b/dlls/light.msstyles/blue_radiobutton_28px.svg index fc52dd57e08..c1dc2cb3cf8 100644 --- a/dlls/light.msstyles/blue_radiobutton_28px.svg +++ b/dlls/light.msstyles/blue_radiobutton_28px.svg @@ -5,18 +5,21 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> <g fill="none" stroke-width="2"> - <circle cx="14" cy="14" r="13" stroke="#aeaeae"/> - <circle cx="14" cy="42" r="13" stroke="#3096fa"/> - <circle cx="14" cy="70" r="13" stroke="#2979ff"/> + <g fill="#fff"> + <circle cx="14" cy="14" r="13" stroke="#aeaeae"/> + <circle cx="14" cy="42" r="13" stroke="#3096fa"/> + <circle cx="14" cy="70" r="13" stroke="#2979ff"/> + </g> <circle cx="14" cy="98" r="13" stroke="#aeaeae"/> - <circle cx="14" cy="126" r="13" stroke="#aeaeae"/> - <circle cx="14" cy="154" r="13" stroke="#3096fa"/> - <circle cx="14" cy="182" r="13" stroke="#2979ff"/> + <g fill="#fff"> + <circle cx="14" cy="126" r="13" stroke="#aeaeae"/> + <circle cx="14" cy="154" r="13" stroke="#3096fa"/> + <circle cx="14" cy="182" r="13" stroke="#2979ff"/> + </g> <circle cx="14" cy="210" r="13" stroke="#aeaeae"/> </g> <path d="m22 126a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z"/> diff --git a/dlls/light.msstyles/blue_radiobutton_31px.bmp b/dlls/light.msstyles/blue_radiobutton_31px.bmp index 159e5cb68b30cceabb3be64feecb9ca97fb3074b..0b7bdddd52be25597e63de895d231ed7c6ca7361 100644 GIT binary patch literal 30890 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 F{Rg<8R<Zy9 literal 30890 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 diff --git a/dlls/light.msstyles/blue_radiobutton_31px.svg b/dlls/light.msstyles/blue_radiobutton_31px.svg index 5dddadd4ee7..69f0845edfa 100644 --- a/dlls/light.msstyles/blue_radiobutton_31px.svg +++ b/dlls/light.msstyles/blue_radiobutton_31px.svg @@ -5,18 +5,21 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> <g fill="none" stroke-width="2"> - <circle cx="15.5" cy="15.5" r="14.5" stroke="#aeaeae"/> - <circle cx="15.5" cy="46.5" r="14.5" stroke="#3096fa"/> - <circle cx="15.5" cy="77.5" r="14.5" stroke="#2979ff"/> + <g fill="#fff"> + <circle cx="15.5" cy="15.5" r="14.5" stroke="#aeaeae"/> + <circle cx="15.5" cy="46.5" r="14.5" stroke="#3096fa"/> + <circle cx="15.5" cy="77.5" r="14.5" stroke="#2979ff"/> + </g> <circle cx="15.5" cy="108.5" r="14.5" stroke="#aeaeae"/> - <circle cx="15.5" cy="139.5" r="14.5" stroke="#aeaeae"/> - <circle cx="15.5" cy="170.5" r="14.5" stroke="#3096fa"/> - <circle cx="15.5" cy="201.5" r="14.5" stroke="#2979ff"/> + <g fill="#fff"> + <circle cx="15.5" cy="139.5" r="14.5" stroke="#aeaeae"/> + <circle cx="15.5" cy="170.5" r="14.5" stroke="#3096fa"/> + <circle cx="15.5" cy="201.5" r="14.5" stroke="#2979ff"/> + </g> <circle cx="15.5" cy="232.5" r="14.5" stroke="#aeaeae"/> </g> <path d="m25 139.5a9.5 9.5 0 0 1-9.5 9.5 9.5 9.5 0 0 1-9.5-9.5 9.5 9.5 0 0 1 9.5-9.5 9.5 9.5 0 0 1 9.5 9.5z"/> -- 2.32.0

1 0

[PATCH 3/8] light.msstyles: Fill checkbox background with white pixels.
by Zhiyi Zhang Feb. 11, 2022

Feb. 11, 2022

Some window procedures don't actually erase background when WM_ERASEBKGND is received. So when drawing transparent buttons on such windows, there may be left over content from buttons of different states. This commit adds a white background to all the button parts that shouldn't be transparent. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52433 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/blue_checkbox_13px.bmp | Bin 8250 -> 8250 bytes dlls/light.msstyles/blue_checkbox_13px.svg | 18 ++++++-------- dlls/light.msstyles/blue_checkbox_16px.bmp | Bin 12426 -> 12426 bytes dlls/light.msstyles/blue_checkbox_16px.svg | 12 ++++------ dlls/light.msstyles/blue_checkbox_19px.bmp | Bin 17466 -> 17466 bytes dlls/light.msstyles/blue_checkbox_19px.svg | 2 +- dlls/light.msstyles/blue_checkbox_22px.bmp | Bin 23370 -> 23370 bytes dlls/light.msstyles/blue_checkbox_22px.svg | 2 +- dlls/light.msstyles/blue_checkbox_25px.bmp | Bin 30138 -> 30138 bytes dlls/light.msstyles/blue_checkbox_25px.svg | 18 ++++++-------- dlls/light.msstyles/blue_checkbox_28px.bmp | Bin 37770 -> 37770 bytes dlls/light.msstyles/blue_checkbox_28px.svg | 10 ++++---- dlls/light.msstyles/blue_checkbox_31px.bmp | Bin 46266 -> 46266 bytes dlls/light.msstyles/blue_checkbox_31px.svg | 26 ++++++++------------- 14 files changed, 36 insertions(+), 52 deletions(-) diff --git a/dlls/light.msstyles/blue_checkbox_13px.bmp b/dlls/light.msstyles/blue_checkbox_13px.bmp index a6b1903b236fae8ccbbcd272d143f36a01eca005..e3376a5ab0070a243774b0edddf5871e59adfdcf 100644 GIT binary patch literal 8250 zcmeI0O-NKx6vroO+e*}BZQE2J27N$ei&kwS7tx{*nF`zl(IT)QDu~t<NmiiX#u&e; zD0N6t%u*{VE&9(a)Cj6}x_E8pCEPWRmLjCW>yzB>#I8t>tq^St-`?z{8Of8PD`%J%Qr z7|_Qx^;xCbdev%FTNBtASgT^w2KA9~U?7nAqY*6Ici>D$ibuz~wDGyQInmS815Hg$ z7z%}48;w&Q=Z}nxNOcHAbZs<Fc|5;YKF>vYydLheiM)QBT+YdrVSc$t*Wz)$u1(A* zL-#w|`gC`9!|3R!!t8ZG`XP?%%il3QntH=nMBts{fK{6j&uwyVG=8(a)NFcww$#{fHT zNfeH&K6MRfyyK=!&hM4adXLWwJijHe7Vfi&yndTp&dHTwez{23;&HyNP0S}l_06U} zlwWfMFkEe?1JVoWX8N1Jnxl4lqkN(a)Ln2m~f%Smu<m7;TVt9w)9(a)zzrSza~`v36L*t zOOzfORpat`wdDCd^SN$fUO3g;^jd75H=M)k=l^YDt_<_bMOp`s+pLLm^2(_CW>p{3 zLvs-1;2k?1D7}zwU^b%k6SUKt&W{S-yR&)r(%$Xw^&urC6y&+Q8s+g`#`?2~`D9k| zUcXv23IJkoa1h4E#-v+)(`!okU0q$!-rkPm<Ks(mCNn%dtn(em5wTcI5*LX?GB}f= z^-w;qX?l8EbJ1utg)<q>HRIIOlx%Bj!-<KBB<IBtpU&AZ#7$04%KrX-pmSnYvPM^p z9|h&hLsfu7&B+>?HP+{*e^Z*q#tVSg4+37<h4`{<Y0hL?E(6{u2mCWDF!EO7m7R#M zA7*kUGt?sS_s^t8@!M;OmlgNsNh)VDN*5Vx9~+i<X*=S(jz!Lkp?SUzCAg7rg0o?W z`}9m={b{XH?Uj8$s{Kb+eka|JDvgS+iy%i^7i*YS>s0>+LWD0tyx|Zy_x7Uv(a)L);K zWW>{}5WjyIaQ>Ho$#>GZSBCQA;|$JZ<a?$4zl$1$A8!=52j!>E6wYKa^r^lFe19dK zySq_-UeKEA^I~Wo`2JFJ(a)a3t#o(-e9$a5(koz)uEjPFPFy9Td!6kI#XV}ES+Ra8_! zZEbBz?RlJ{xzCX|2nK^tQc?oN#l=`(U%w=0GL(a)B;P+D3FGcz;fD`Zho5jHe5WN;=^ zS63(1{+(a)g;4h#&)!oosqY-~*7OvYR(a)pZE3k$%29cY;IoMC%hP9dwY8|*V>x+?b<NJ zg~MT4Uat0xh5NRW_xjc1N4b{EMcewAbNGz!NB{fxqv|<iYTotS)+d_t<&*LKXzqU0 qtewlbtrs(O<TDGt*Y~42`%zO(a)Zs-2Ko$ATm?o)a{-M5wONB;rk9jZ$J literal 8250 zcmeHM&2HL27&K|soGR282&k&mK-9)=I6yB*x%5y)mD)=s`U*Yu5QlK!++#^h5PgB7 z{BVdOB_t1kco9I{gQ3!PKF8~>4S4M$Sw*syVb}Z3?5(a)2N_S3Sv_cpCq*LQqYfTzGu zAfcp{M=0AVe9T--Q6By%!gk+%{5C_8G(7gi&(6+L=jZ1)fC(@kQ2e^pYHeIxTy&r- zqyEIxo$Hq3;8vis`j_#!`0DCv9hx!Cg|`JMi66CwkLg#^+<836b8t??8Z+ejkRR>< zU8bWr`GtG~q(a)lS5q<*t~mSTsQ6g$Y=04BhEK=Es~zqNs~!w#}#R^9UTD8<3801y33 z_<U{H*B9&1jDb)dC4STzKBiwu&&A{X8H1D&YfRaC@;Te<13zru0lG~0-~;%De4}rs zQQiVU{MI3V-XCeH$+3DfF;o*^J}^x~y}obkY=G058fuxfBpyY4YHU|{|1!Sw4t~5? z#~5Rp3vUZj^0^1$a?Y|EuJ<cxEFS0M1}P)fm?75(e$noxbxoJ)C{BLC^K|a(YI;)N zzC~T?H;WH{#(VwJ`2qbO$q?`LOYHTl;?Zigx`rI4i5%t2qVFKYoqUurmcX+$!0(~G z4}6}d6E)!1aNkA#lsr8>)leTm|H-QpHK>;^FE5{Q4s<!R4S^55jY?4?w(~m1&Vw^* zx7&NXO{O6pI0e!{|K7fL-U07tUI|SR_$6rKe3bH!CGt^LRn}NJ(`4oBLXV318@|{Q z;5N|K1NzX;^{7j8kgegq%l4lqnV!{<YYmV;&3M$M(X%C{zj8dv4qxUFAF}<d%cG)Z zo(a)bDE<-r-T!%fGdG7a^EITkEkIb(S=h{o0x!L>YUYr?KioR50)QSvDAlcs5GFZ3wl zRz7X50aFsVZy*=$0e!Qs&Go3LnH+01+;>@HCyAU%Lwx|<j7LR{SyxNU`0LThiIzir zXdbC9kBS<apZA&=Z}Q-b#>cN6kIFRE$Mi%iknXpkS{@Cev2=!3#Cx$kYHQ+r6lV>x zGYY<L3(lU_5N`qtJ&L_c+~*SDHh><`2j+Uzqp5+{1(JXU41gJrdNd_)obOT8bHEUA zdDNppc;?EZWdt}L4WOY;3broPUJp$Xusmvy6Lx(fJ9|PNlfoS1^HD5V&?}&KT-~jJ z=D+o5d_EfenX1dYJ~u&gOR<Y3G;uzP^Dx;t8h_Vph0aI$oMmOuJW=c?VolifiO)w@ S<hM}KQ-1Y$umAVoLjM5TYj8mT diff --git a/dlls/light.msstyles/blue_checkbox_13px.svg b/dlls/light.msstyles/blue_checkbox_13px.svg index fbbca0ae2f6..819b6f4b667 100644 --- a/dlls/light.msstyles/blue_checkbox_13px.svg +++ b/dlls/light.msstyles/blue_checkbox_13px.svg @@ -5,10 +5,10 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> + <rect width="13" height="156" fill="#fff" fill-opacity=".98444"/> <g fill="none"> <path d="m0 0h24v24h-24z"/> <rect x=".5" y=".5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> @@ -30,15 +30,11 @@ <rect x=".5" y="143.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> </g> <path d="m4.8636 60.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z"/> - <g> - <path d="m4.8636 73.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#3096fa"/> - <path d="m4.8636 99.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#aeaeae"/> - <path d="m4.8636 86.537-2.1477-2.194-0.71591 0.73135 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#2979ff"/> - </g> + <path d="m4.8636 73.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#3096fa"/> + <path d="m4.8636 99.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#aeaeae"/> + <path d="m4.8636 86.537-2.1477-2.194-0.71591 0.73135 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#2979ff"/> <path d="m2 110h9v1h-9z"/> - <g> - <path d="m2 123h9v1h-9z" fill="#3096fa"/> - <path d="m2 136h9v1h-9z" fill="#2979ff"/> - <path d="m2 149h9v1h-9z" fill="#aeaeae"/> - </g> + <path d="m2 123h9v1h-9z" fill="#3096fa"/> + <path d="m2 136h9v1h-9z" fill="#2979ff"/> + <path d="m2 149h9v1h-9z" fill="#aeaeae"/> </svg> diff --git a/dlls/light.msstyles/blue_checkbox_16px.bmp b/dlls/light.msstyles/blue_checkbox_16px.bmp index 3504ce48ff7b2a97db094252fc1bd13f6ab5fa00..3357120d6a9d8cdd994df075df374e6d8a92f27d 100644 GIT binary patch literal 12426 zcmeI2T}&KR6vr1dAv};65?*-Xjc5~W4Ss|^G&CBMCPpy&;!6cnHAEl87p#>KE!l*m zF==!QEoj6>gQ)~8rZ$m^f(a>76Qv2n8Z_C`O4EXD5tzC69PgRo%-*H5%iQI`VKW;p zXP7y^b3gX{XYZNi;4(a)u&W6rBf{XVAJ1FDUwRurp>-KT79^Ew(a)-Ul@zIKXeKYKK<NV z>1)A`?%(3Jy1FVRCMIBLXb1-f2Lm<oC5GAA*;%Px0uci>@+F4*HDS3AVtCAa&eZaJ zO*!@t6HobI(r6C)_)S>y-OBTtm{`4k6OMhuz*7$HB!9=p$6;=6PKC%%Kcqp5!CK%o z$z^r@;?i}2ea(Q!Y7pOkFjynsk6#8{T2O2g;H7Sf!V08)=e;A}(S-E+HDUQ4V{Zt2 z_hEOue9qMJd`&s_4-?O032JE$?5iL1x$UgZ(a)Oqe9?!%O0|1j{Rg?#gu*xti{V?E~j zA<dEY?j!~FzGSXnVwLt`WkJ|qzY13Oqi7}e25ZXKKK~j(>V{%p0Xcm}qBPLI@|8dL zNbc8&<@a7}2&?BYXT1D*U}|~3rX2f+iRZBdwKNCz)sOkyc2;M2Jxne4Val<8D0roX zyz`fIG<*c)l|FO*D9w(a)fVCA~f;1P5EI_!erJ$%0V2in6&`~P5d59cjg-lOr~rdH>7 zx_{p(Z#s7J*T=tG`Q5(%FEsrFfM{xJf{~FCxm`~A<zH)SE07jSOG{DJRXJm9<>T?V zB(}4&Q`XhhL3w#O&dkhYjiK}X{r$42s0iEI+JMHryu2)GYHFaevJ&U#=Y4A{oo{Sx zgy!aEHGS}WlgXs0s;a{3>S|nET=dTKy6F7c+M1vjUt_CkQ&CY-fwi@@kV>U8uIoJe z``M|fDOpxlhV}LJu)e<T#R$q%%+b+NSyEDh4Gj&z<22zZ#=yXUEG{m_mX;Q0jZJxq zkw_$DdwaXb?{@tcT>Ve^f9@#Y><?LW=jEth{rF86ICXLRKE(Oy+%dNDW2dFVQf=1# zBH(*ZAm02vdkmfbWmw|ThY&A*;N%vrtq45%EMWWqIyIikJ#XB6tn+8z0Q~A5Ku!Pn z&rN|{Pa>W;gn0LMZr)b9l=tc%Z>f9F@%@M&JrB6Cni)gypU329lfOyqsC8>ydTzr$ zL3#53V^TWLd(OTN-Z)Koit+0OwZ?l8hu?SC*p#OjlV3>u?!z=6)&C)@|JBFCr4E3< za({MH4*J!P;-?efoIm|I!orp8+V$b7jw4o1_ey*4Fj##D5N=<~8bj}2&Yf56J`|HD z-Q3zp347oLus?kYsmAj(LpiwFbY6Vh3gY_?#il?1;qKqU{_GIipEn@>d&lGacvR0* z5bk{j4NHFt>yvu4&#C*Fm8pNde~#&AVezW8&g^$;U8f(P@%wT5IY?fX^t?x0cvIcu z+;Il&pX11D7o~OT5fnehoi#S)DUO`^Qi{u`(tK3^hpPUM_Wx=9NBjTuy^^#W?f>2H z_x11p3a$R<dwmd_PyMIIjd(Yo^ffU#E`;@q>i_8bf0LZg(a)Xe?G+}t}maU%Zz|NoDu z{tsFGpSkDD(3`Fub(~NAr^kzU_y0xoH8D9Zi1mx=|4`NcCizzg`%jvK$((iHX#P8| JUv~Tc|39u_HR%8V literal 12426 zcmeHNJx|+E6m`_9VW>oxPDmuGP#|HjBN#grmP(bnRLaH=VCmE$A7seX0Wl$xPzlsM zQo(a)D=AyNk>CPp?U79<vi5GRG#a~)seI0^Q1IwY2#INay!d)}Ad5x&o?f8Ev;qio}M z9(V`*0YXYtc?GMO_o><|LQ%Ru<Pz(jzy0Xlb60z93#(SEky@>G3h01v35q?bR4VgF zM(a)MzEkwg8Bt?7}M6boJ+Z5aK^aJkXr<Kr;+EgCQTWG!)h#HV$TfnuA#4A)q58((($ z?fp+HUms)tl8zccMy3slCC!ocfGGH9fRuhs-A2S#JR-93Q$PoVOHk~INH5RB)<rgv z6NP2h`lnd%@<6v=2`+CE(a)qHl-ehV=6BKu`5as9&Qxwy5oP8(a)5kv(L#|IaK#jxDPK} z;!Fr%m)ZL~S9AYDM(a)tPLBhyA#KhPX$FS8VdJp*L*TPN*5>?I(a)ZqITLYX*wWWLf1>$ z$-}RedBoQ{B`qf^68cAMr=;e&Um5Q6`t2(a)+(RYi+%RX7lbCu<B{3P*tEN(5$fn%+8 z_BmNAhw5Gm_u++0oC)FUW9(mOF4^dmlNp&dD3&yb`PU!HTC`nO&rp}rufc`(gZF>m z<PYP%zmLn8mNDL0{g8i6_4~gM^&i4UJOsWtZO9S(ZwEZmLKFD-QX50~X_K3UJqPZ9 zWngHr(a)i!3k1pG9EXJIda8z2e{6dS*afCGT$&t(pkYv2la&rY^B{tW!a(G%Y{Z4CAn zxB%XoKEv4f)?4=aDjfGf0|@g?2|iKQfEG{#jB!fxK~qw|Bd|vo9{5Dt1PW9!`BSZb zzvcfBZb)R}hscK<^^cf={9j}eJEp&h^NknvZ|9(a)mwBgGvWpO5Qj{2QQCr0Yu$``rB z2CkoA4gHJshgsx>m+;+Cjz{~=Ui$dicoo+NG=Gj0Td_I#t}(7FkzE+je;>aPoe`-) z{bLL<#NEPPAn)wczm?B(a)4zprwaTT%mXrn=SFUPp$Q(a)qG6t|7i9a`76EQ-*J}kx8V$ zc?1mo%ks(a)OHt~!KM!ma#g8YAi(a)_!+eP`j8s{JXC?>VH`N*e<F&roY)KsxRu_&c~TX zntaI3vasjCoxZ1z)W4Olm(&ehKjB=ZtN&jsv$(!QTQ`*B(SEZRE5B1pR@)`@facF} z&9XX&m}}rl>?Q~FZ{>^MpJqfQHSqVpwWr1qcMDvIV!!^aeC~6YZSN;n5qnR$uE4ns z$GGKFJf6iG;#-}fR^xHX(a)Tm=~Z3>)6z|g-epW472Hua)b=+=$%vLOGTtnYuc|AY5` z+MtROy#IICfqw_@|J^eeoxlJ2F#qRg?Pxvbf6wg(d|#a3(OHkD66F8E_kYSEJ#8M4 zyyTzOz5(a)Q>`Hgjboa+B+{et{|g7SZ-XKuakCI1Wfy%h-7FUbGRJR<o2-<~X7*Mj`P L7x}|ffB*Xjzuufm diff --git a/dlls/light.msstyles/blue_checkbox_16px.svg b/dlls/light.msstyles/blue_checkbox_16px.svg index 4646a259e62..35dfb532a23 100644 --- a/dlls/light.msstyles/blue_checkbox_16px.svg +++ b/dlls/light.msstyles/blue_checkbox_16px.svg @@ -5,10 +5,10 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> + <rect width="16" height="192" fill="#fff" fill-opacity=".98444"/> <g fill="none"> <rect x=".5" y=".5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> <rect x=".5" y="16.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/> @@ -27,10 +27,8 @@ <path d="m5.8182 90.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" fill="#3096fa"/> <path d="m5.8182 106.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" fill="#2979ff"/> <path d="m5.8182 122.91-2.8636-3.1343-0.95454 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z"/> - <g> - <path d="m2 135h12v2h-12z"/> - <path d="m2 151h12v2h-12z" fill="#3096fa"/> - <path d="m2 167h12v2h-12z" fill="#2979ff"/> - <path d="m2 183h12v2h-12z"/> - </g> + <path d="m2 135h12v2h-12z"/> + <path d="m2 151h12v2h-12z" fill="#3096fa"/> + <path d="m2 167h12v2h-12z" fill="#2979ff"/> + <path d="m2 183h12v2h-12z"/> </svg> diff --git a/dlls/light.msstyles/blue_checkbox_19px.bmp b/dlls/light.msstyles/blue_checkbox_19px.bmp index 005d8148040fa29a76fe40367fd9396a0689e6f4..6a7e904fde9196374105d254627f38076f4be273 100644 GIT binary patch literal 17466 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 literal 17466 zcmeI3Jx?n~6oyT{NT2!w#Vu^OlGnOjs^}(Csx%Qoq9A3uR1|p4hYW%yDS|?53xuGf zKmt+(gfZmT<TnJ?Mwz^4c8;;vJNC{Dj&8`TIG)|vInSOwvmDm%F7Lki{HvT?e#GY* z>@(P(u!-DE?nAV{eTk2OMdWhv5A6}}zW#Q3V91D$j}rUO&d#PUE-qT<=jUyhurTtw zIXyj{LVF8VxWB*uapEwUHo^D=j8)>nBHGU6s2Oy1bu~#G7_#QR5XZB!=W(3*0{d(a)M z<H(b7RjbtxOijn)ew#KKmkon`{zt6msuK^$nXF&7b*Hy}_0&~ae|SC&TJn>1RjkZS ziLh`3dw>ZGBfq9tee()!OOy+%;)mChe65(Y<OlzC$qNgSsLnanXvtIOWfF&OEayhI z-=yEOOtOU=5_N5|7jK)iNnhS}Y5Djr4EFUb&P29W<;%TJpw565i7<bM`m-Xwe`|G* zNq(Z755Ynm%+H8$_7AMLRh*`^mHckSYGL~R*V1&m7TmP!K?D;P7De(a)-dB6X53cjsQ zJ*bFNyV^>AoqBPN<FV!N42xf0Pa>uVIw$UPX*oA84EFUb&P290nJ?ZpY57R(!`njS zCQOZelPvDHX+6s<YbsxnbDcol0Soo7bk}K=%C@|?egze<TKA1$rrjvs#$3C)Dmkdn zbWcwA)G(KO(a)+R){r${pauj2Au0gN?{$Ckr0t+WpM4)ZKEnmC(a)t*&W(a)EIbSrVrY3_P zb6lenqZ#4j(j-RHt(a)7opbtsL3>far#Y+HB8kLn-QLD&pfw=nCvs_Ln%(X<Yh*P}Jp z0(T=v+8T|yS%MvsuF2zvwK^8&VgdU)YX4CdUK$IWMf5+Sy`<|#jX4lPOqj$4-+A~_ zJk8_d<4?&Keaplfb-wDD-M^36K0!R!%;7lDPtPC(_SJOpC0X>$BgyIEZP0kcx0l9C zve-}8V*IA^*-i3HS#%7X=N9>){kiv;HZ1ao-;VPAiFvjx#oI>iD$l`U2DdJ8F(a)syh za<0)m_j2#29u2)i>L+fx$&J#rZ>1h%tLKm|M0$3tkGtzkq;E@|snD$xJij(ASW;6; z^Toa;*rBNAGSz4uOH^hTu&)#E&mU#srLiy%i|BuZT|yVDs4)jf#Lya(a)WQlNY9(@!~ zQ&eYUjTV*svKlw^d<R*D6U1`O9L}Sfb0I2)nl8Qp7HNMf9_DZhU2!8GKf9O4OS0Hc z*COUk=~FK3CV8eTItI>jOZoNHXd9N~h54P>H{Y$%wk#FjHeEBcPKygGCOmzPf%RN< zf}X3z^~>@(7(GAh)~~0!3Z2{PIUo7Sx+-<#SdW&vEi(a)2QP5OcK=)Y=jUXgy%sRgT~ z13%45_BHZ(a)9<)w8(s68cAwJ^2sYkaPrKNVgIJ9PQT-0)&d;4fTY7`f+ucP*7s?lkz zs8(7;|6^1OF6kM89McGJA3eNACt2Xkqpw4AB96b1H5zlY9FH4*zDZWQ5u8Nz(lvAV z-07N;V;cePqtoL{vcx`Ww2Fs0+;-}v4LQD6!hQ50FUev*T^rSln<_rsNB8qgS#*r3 zR(a)_p4eKp#KC3*E=hkP+d-5PDnlDtN+P1g*q)8fL42~VG6V7b?cUOl>AT%l|0DdOyF z<fneuVm%uAHqN)r=WN)vNzbO|h4(a)b6_2`V#FyedKcfcINGTlcHVJ(2sf#H(a)dca(*v zVJ*V<5%xPQgc0umHuOF^g*6W!isu?8YcyJV=aYCt&o_m20-s(EHswO~fOs`nYJ4dy zdX1Fh!D`>KjxFNt!3KCKtUl+IjVk(xw+rjzS+Ib}ZNiAxSEDUi#M(a)T9ZjE+eF|S*r z9a+TdE(a)NOhYaRauJsNrQ&kVa)k$z<i*BAYsIxjvhvlRM#y{LS>_!>>`-$~s=>9!Wy z3F#(HrAN1<_UWSMgoU+kJeC~30{#2ZoQdo$&wq9g{YcN!=O%5B&sSPj^nEH{?s_!o z$ozhEm(a)nJ@Uxw79<7YqW{b=ahZgsWg-;dVMf7%|_lhXE?_IZ|B#(chfzLFVG*TnPc t(f<ADWSaZ7Nf*NVNdEokzO0Pi(a)Za4>=cspt&sT3YMz6o;`FinM$3KC(a)pAG;3 diff --git a/dlls/light.msstyles/blue_checkbox_19px.svg b/dlls/light.msstyles/blue_checkbox_19px.svg index 9e45a9c8048..9a069746204 100644 --- a/dlls/light.msstyles/blue_checkbox_19px.svg +++ b/dlls/light.msstyles/blue_checkbox_19px.svg @@ -5,10 +5,10 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> + <rect width="19" height="228" fill="#fff" fill-opacity=".98444"/> <g transform="matrix(.95 0 0 .9499 .051376 .05137)" fill="none" stroke-width="1.0527"> <path d="m2.9e-6 0h36.923v36.965h-36.923z"/> <rect x=".47226" y=".47227" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#aeaeae"/> diff --git a/dlls/light.msstyles/blue_checkbox_22px.bmp b/dlls/light.msstyles/blue_checkbox_22px.bmp index 8b072c13265e17dae870cae1ce30e7e1141a51c2..153a23ff76fdd90ac9126582b7ec93e1ce1c2894 100644 GIT binary patch literal 23370 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 G%>MyXSj58s literal 23370 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 N$jN#&&69G+{{u0LOQQe) diff --git a/dlls/light.msstyles/blue_checkbox_22px.svg b/dlls/light.msstyles/blue_checkbox_22px.svg index 67d005ab6f8..578bfc896a0 100644 --- a/dlls/light.msstyles/blue_checkbox_22px.svg +++ b/dlls/light.msstyles/blue_checkbox_22px.svg @@ -5,10 +5,10 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> + <rect width="22" height="264" fill="#fff" fill-opacity=".98444"/> <g transform="matrix(1.1 0 0 1.1001 .043576 .04358)" fill="none"> <path d="m2.9e-6 0h36.923v36.965h-36.923z" stroke-width=".90907"/> <rect transform="scale(1,-1)" x=".86945" y="-19.05" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#aeaeae" stroke-width="1.8181"/> diff --git a/dlls/light.msstyles/blue_checkbox_25px.bmp b/dlls/light.msstyles/blue_checkbox_25px.bmp index 8720209c6081e0c7f097a0822be7c621895e56d4..619f077413e9e75a4b5b889b4aed3c251693bf01 100644 GIT binary patch literal 30138 zcmeHPTWl3Y7;doyc;t~cA9zt{1U2*xk_JN{Atqq-0b>LsJZOBd;lV-)F$5DtO4XE` zBqa#3MkqH6r7e_;g(a)UDWD@7}9xfH{lQZ79^yW{+`{HJGUXZFl?r$y5_VfoMg`_K37 z{QJ%BoSi={oPBU{4*#rT|1V|RIJQm9&B(a)8lc{%4L_I=Xx<Lqn3hvww?|G-BJXUr+e zIH>hCPl$3|mz+O;-m9*zraO1;G`0cWg$oxvzz1s*Tf_o<JpVg)?zogvVrm0C;6r@) zZVEdSN9<GPF;m|yhrTXsu9D|U%;7-xQTt+Bm0yh0*;iqy{5qIoj0y|=CasFwa)dQ) za}~~sN+&~^D}3JGy?b}ip64*{5&L9vALl=VHNOH}m|sznB6R<1kA5|c(l1^yw*lUP zH6F)5(a)Qr5_TRhL2Qje~j>YsaOv(al#JAQZhxo76b;2beMUc^3G4)r|T=1QF#Q8zC# zS0eX7_OU-=Ta{mo)7e*Hsr)*aVvGt4{U)u7+j4}*jm=d!Cn}u`Wv=jf-gU<8^Bm>} z&<}W?SARXY^Aec%IDLfkV1L9M4s;*zVBQAvH#bGdiM5`y<t>^jpJZ$UJaVGU^YP0( zlh`5_Ir*)Zs+i8t-MiUh^qPC!%`Wg|<|jSxQfYkvez8xML;d^E=1QF#Q8zC#S0eX7 z_OU-=Ta{mo)7e*Hsr)*aVvGt4{U)u7+j4}*jm=d!Cn}u`X|B(a)G^FPc!&)NI{`oZTX zjirM-FM;_F=_3Sqp7%%0;ehuU9?aWder4BEqcv>TQls-Dj(720w0PXazU9!rCNDBq zQ16j+L%pc_krW@={}(v$986eMu1sJfhUNHwj6u9!ChSmNbGw!rUDpQr!L?L7hl?JI z!*LGx`0-=X*x2Y1_K7?8b;h~lIHbP5p4TD(5BtR8$;JViK7Raopw^+KrNxWWmuwu( z&CMKt(a)7}$%y}jM7s;c6(r0`vrCyJx3t&P`V?%K7B-nw;*V|H|Oa364WcXw;?s5q`) zzn(tluCA^C7S(a)UE-o2aNyLT^eOx8CQ$FXC_c#c|ITSK{rYku<NNq!veN1!<wHu_W? zeSLl8;>C+0d~63AK79Bv=c%i!^HM3c_MmuAuHsO|XZqnhYHDh(a)296#*>es1Ac#?1c zUr$dD0nGspXfX2}@Ox4Yz`1?<whP(=tjm`#hcsY<19+}oyT&yQcvr7p4e*%a03OgF z;DM$yYo<+d0MF^ur#VkULqq!7nC5`{TT(a)e$_vq21w3bbCKwrddC^_sLPJa$(>*2y$ z4QO{b*2CSuL1(a)JykM=zYjpIOWB;!0(_b7{b#_m03Z~L_f6${z>;Fxnov4%k8AP%9M z7X)h^s+Ohisag8~c-c61Eb;NbETFV;t4o(m^y(a)Ky+Y)#VMRG-P99r+!Z7j{FwEcvS zdFp51S3H5zi?w<@DvopeT?#nGuTpxZDu`9R%J18<$&_9_8$2fFIx1H`eCXrUeIL%f z$7*r6edZsB+K&6((OOgWqxT-62icl}>UTiuDWT=>`aElAd-Q3Knn%SU>$B*C^H(a)E@ z*TAL^{5lmeCMs95SeftE--LqZ;9P$x4(HVb2Vh(|?b4Fhe4d64VGSh7Rc61=?qfP+ z8icK7PmsqH2k_N?=WC#35~Z0n(<V7UgO!VYp7QtluZ>9#=nLH6VC>w!(ywLH9GTY$ zzYiq`+!KJ$*2DRE5OWXtvGs8M`bUjQ>~O4y^Lo08^XsP`O~s$XiR=5)IZR(KaVp>8 zwFu6>PuTO9J<lb%SNXDXxDIjlEDF>*kcJig_f!q8Y#ik9avy*5RO+7F?xxni!Rs;I zvp)u(LlIn29B%U_Ubm52|0eaWHE~S0b%*a;_d0d2)NApmINbIcH^p#L<&&w~7JPP+ z#x;K5HWpCtpL1DxR2<Hpk2wxGwJw}{cFoCw&wU<N+u=RB8L0sk2Yq^<kS3TTD&FNf z&xo_*ea_?jG?)D@>3?@2>PyKHaShWL>^z)pv$+PGT_3UECGz)ui8$DKc=tO<ifImT z$f4!oyt0_29MC842CD<!FvZvOnav>$nBV{&_pkj-)02H2{>kQZ%!ivP4!|R)%6+Y| zK4sQSo8$lulDcAFYfN*4(GQNv?r)@~$OA158b`);cp)6N9*&PaQJ?93TMw7kKI&6t zhvQmmXJ;pwHEWjF+uN(1C(NJD`}T(qACmn1d=F}oX3m@$d(Ac*2dtM(pFW-AW4+YE zh3tKw<i4cxW#d?|U;)P;J9aEBD=TyJ^744?S7~W!;5nqi2Y(dDiWMtdIQNkwN7C9_ z|DD^$jT^ad#E22F#-+uh;;5{wbO9$fH<wmaR0Ob!ii&vO#*7(5*?MQ-n5;i4j>5u1 zj<al8_#G&$2hEu?haVp|ZX9Lnxsh5^aj-Q%Qe0fDT#tY9<O!KFWeVq+FkyoC;K2hW zkBURqXVC}eF(a)F4bu7PROrg^ZoD#pNm5)Np8>Cz<vngeajpFdx!>7*RMbL7Yochsm+ zoM+|Al_3q7-~gWO+qb)*LD;r#W$&|@4>waBfLBsd!Zk2@^k~ZJEYdtCIiNmZ-n(a)C7 zr=Xx9eQiu~KwsegHh1n^kJVcYO0F>fqBY$Q5g+!E!>*<3ucg|0xc+;FOjE;g4kycl zt`El`THSVW;t(5coVL2Lh>cdaU7R??MjNNCZY*M>)om9i4zbb3X{#HH*l2az#fd{~ zv~k+%#v(Ra-F9)}5F2frwz{#1jaIi^oH)cr8>g*qEMlY8Z5JmFvC+n9s~d~hXm#7g zi9>9(aoXy}BDS5w>CfS8JzVr0&i;M4Ecwa!-OR_SxNa{VH?eOy(!am6-WzSMY_3d< zIT6F^%IZqggo%CBm92-9*TH4x$JWDXjltnq50`ab5HVKM>-Eq7)?gAWRa?uUKd-jA zvbj=?qa=Q-E32y{`cbt_>&n){*?PE$d4(a)_qGQV9*)xTFk{_tHmT3Jq$`Vbp!Qao9E z#6~NNN$Nvvv`O(~?GYQTEGDTBvC$^QleI@|w6d6_KEy_w6i?P3vC+z6lKK!EZBjg0 zd&EX7i%IH3Y_v)7WbF|ftt=*~53$iE#gny1Y_zhNq&~z(n-ovh9<l9Os{UH)zn=EA Am;e9( literal 30138 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 I)$m#BzuylKPXGV_ diff --git a/dlls/light.msstyles/blue_checkbox_25px.svg b/dlls/light.msstyles/blue_checkbox_25px.svg index 0815af16e31..bbd354948b1 100644 --- a/dlls/light.msstyles/blue_checkbox_25px.svg +++ b/dlls/light.msstyles/blue_checkbox_25px.svg @@ -5,10 +5,10 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> + <rect width="25" height="300" fill="#fff" fill-opacity=".98444"/> <rect x="1" y="1" width="23" height="23" rx="2" ry="2" fill="none" stroke="#aeaeae" stroke-width="2"/> <path d="m9.4091 116.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z"/> <path d="m4 211h17v3h-17z"/> @@ -21,20 +21,16 @@ <rect x="1" y="151" width="23" height="23" rx="2" ry="2" stroke="#2979ff"/> <rect x="1" y="176" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> </g> - <g> - <path d="m9.4091 141.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#3096fa"/> - <path d="m9.4091 166.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#2979ff"/> - <path d="m9.4091 191.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#aeaeae"/> - </g> + <path d="m9.4091 141.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#3096fa"/> + <path d="m9.4091 166.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#2979ff"/> + <path d="m9.4091 191.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#aeaeae"/> <g fill="none" stroke-width="2"> <rect x="1" y="201" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> <rect x="1" y="226" width="23" height="23" rx="2" ry="2" stroke="#3096fa"/> <rect x="1" y="251" width="23" height="23" rx="2" ry="2" stroke="#2979ff"/> <rect x="1" y="276" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> </g> - <g> - <path d="m4 236h17v3h-17z" fill="#3096fa"/> - <path d="m4 261h17v3h-17z" fill="#2979ff"/> - <path d="m4 286h17v3h-17z" fill="#aeaeae"/> - </g> + <path d="m4 236h17v3h-17z" fill="#3096fa"/> + <path d="m4 261h17v3h-17z" fill="#2979ff"/> + <path d="m4 286h17v3h-17z" fill="#aeaeae"/> </svg> diff --git a/dlls/light.msstyles/blue_checkbox_28px.bmp b/dlls/light.msstyles/blue_checkbox_28px.bmp index 8911e3159873641a1f6c603eef6bafbd995b803c..53921d083514e31def8629eafd6c0c7f4dc76e81 100644 GIT binary patch literal 37770 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 BEyMr- literal 37770 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 diff --git a/dlls/light.msstyles/blue_checkbox_28px.svg b/dlls/light.msstyles/blue_checkbox_28px.svg index 35e78c0d6ef..7899390b59d 100644 --- a/dlls/light.msstyles/blue_checkbox_28px.svg +++ b/dlls/light.msstyles/blue_checkbox_28px.svg @@ -5,10 +5,10 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> + <rect width="28" height="336" fill="#fff" fill-opacity=".98444"/> <rect x=".99999" y="1" width="26" height="26" rx="2" ry="2" fill="none" stroke="#aeaeae" stroke-width="2"/> <path d="m10.045 130.87-4.534-4.7014-1.5114 1.5672 6.0454 6.2686 12.955-13.433-1.5114-1.5672z"/> <path d="m4 237h20v2h-20z"/> @@ -32,9 +32,9 @@ <rect x="1.0113" y="250.81" width="22.985" height="23.213" rx="1.7692" ry="1.7844" stroke="#2979ff"/> <rect x="1.0113" y="275.79" width="22.985" height="23.213" rx="1.7692" ry="1.7844" stroke="#aeaeae"/> </g> - <g transform="matrix(1.1765 0 0 1.1208 -.70588 -.12081)"> - <path d="m4 236.54h17v1.7844h-17z" fill="#3096fa" stroke-width=".77367"/> - <path d="m4 261.53h17v1.7844h-17z" fill="#2979ff" stroke-width=".77367"/> - <path d="m4 286.51h17v1.7844h-17z" fill="#aeaeae" stroke-width=".77367"/> + <g transform="matrix(1.1765 0 0 1.1208 -.70588 -.12081)" stroke-width=".77367"> + <path d="m4 236.54h17v1.7844h-17z" fill="#3096fa"/> + <path d="m4 261.53h17v1.7844h-17z" fill="#2979ff"/> + <path d="m4 286.51h17v1.7844h-17z" fill="#aeaeae"/> </g> </svg> diff --git a/dlls/light.msstyles/blue_checkbox_31px.bmp b/dlls/light.msstyles/blue_checkbox_31px.bmp index eab02f44485bfc8ec3811f0d5b9e89eed276f225..49296dcb6bb94878e915a1e0f5cd5e47a4d02d55 100644 GIT binary patch literal 46266 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 literal 46266 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 G9QrjU(2gnq diff --git a/dlls/light.msstyles/blue_checkbox_31px.svg b/dlls/light.msstyles/blue_checkbox_31px.svg index 731c5af121a..ea2a02ea77d 100644 --- a/dlls/light.msstyles/blue_checkbox_31px.svg +++ b/dlls/light.msstyles/blue_checkbox_31px.svg @@ -5,25 +5,21 @@ <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> + <rect width="31" height="372" fill="#fff" fill-opacity=".98444"/> <rect x="1" y="1" width="29" height="29" rx="2" ry="2" fill="none" stroke="#aeaeae" stroke-width="2"/> <path d="m11.682 144.66-5.0112-5.0148-1.6705 1.6717 6.6816 6.6864 14.318-14.328-1.6705-1.6717z"/> <path d="m5 262h21v3h-21z"/> <g transform="matrix(1.2787 0 0 1.2336 -.27878 -.23525)" fill="none" stroke-width="1.5924"> - <g> - <rect x="1.0142" y="26.116" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#3096fa"/> - <rect x="1.0142" y="51.246" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#2979ff"/> - <rect x="1.0142" y="76.375" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#aeaeae"/> - </g> + <rect x="1.0142" y="26.116" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#3096fa"/> + <rect x="1.0142" y="51.246" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#2979ff"/> + <rect x="1.0142" y="76.375" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#aeaeae"/> <rect x="1.0142" y="101.5" width="22.68" height="23.508" rx="1.5641" ry="1.6213" fill="none" stroke="#aeaeae"/> - <g> - <rect x="1.0284" y="126.62" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#3096fa"/> - <rect x="1.0284" y="151.75" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#2979ff"/> - <rect x="1.0284" y="176.88" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#aeaeae"/> - </g> + <rect x="1.0284" y="126.62" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#3096fa"/> + <rect x="1.0284" y="151.75" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#2979ff"/> + <rect x="1.0284" y="176.88" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#aeaeae"/> </g> <g transform="matrix(1.2494 0 0 1.2335 .4349 -.23356)" stroke-width=".6481"> <path d="m9.0017 142.59-4.0109-4.0654-1.337 1.3552 5.3479 5.4206 11.46-11.616-1.337-1.3552z" fill="#3096fa"/> @@ -32,11 +28,9 @@ </g> <g transform="matrix(1.2522 0 0 1.2335 -.2522 -.23356)" fill="none" stroke-width="1.6092"> <rect x="1.006" y="202.04" width="23.16" height="23.509" rx="1.5972" ry="1.6213" fill="none" stroke="#aeaeae"/> - <g> - <rect x="1.0205" y="227.16" width="23.131" height="23.538" rx="1.5972" ry="1.6213" stroke="#3096fa"/> - <rect x="1.0205" y="252.29" width="23.131" height="23.538" rx="1.5972" ry="1.6213" stroke="#2979ff"/> - <rect x="1.0205" y="277.42" width="23.131" height="23.538" rx="1.5972" ry="1.6213" stroke="#aeaeae"/> - </g> + <rect x="1.0205" y="227.16" width="23.131" height="23.538" rx="1.5972" ry="1.6213" stroke="#3096fa"/> + <rect x="1.0205" y="252.29" width="23.131" height="23.538" rx="1.5972" ry="1.6213" stroke="#2979ff"/> + <rect x="1.0205" y="277.42" width="23.131" height="23.538" rx="1.5972" ry="1.6213" stroke="#aeaeae"/> </g> <g transform="matrix(1.3032 0 0 1.2335 -.88963 -.23356)" stroke-width=".70069"> <path d="m4.5192 237.72h16.114v2.432h-16.114z" fill="#3096fa"/> -- 2.32.0

1 0