diff --git a/src/frameworks/ColorSync/CMakeLists.txt b/src/frameworks/ColorSync/CMakeLists.txt index 0a0dc78ed..f032f6cc2 100644 --- a/src/frameworks/ColorSync/CMakeLists.txt +++ b/src/frameworks/ColorSync/CMakeLists.txt @@ -12,5 +12,6 @@ add_framework(ColorSync src/ColorSync.c DEPENDENCIES + CoreFoundation system ) diff --git a/src/frameworks/ColorSync/include/ColorSync/ColorSync.h b/src/frameworks/ColorSync/include/ColorSync/ColorSync.h index 8006f0446..29ee7ff22 100644 --- a/src/frameworks/ColorSync/include/ColorSync/ColorSync.h +++ b/src/frameworks/ColorSync/include/ColorSync/ColorSync.h @@ -21,6 +21,8 @@ #ifndef _ColorSync_H_ #define _ColorSync_H_ +#include + void* CGDisplayCreateUUIDFromDisplayID(void); void* CGDisplayGetDisplayIDFromUUID(void); void* CMProfileFromColorSyncProfile(void); @@ -39,7 +41,6 @@ void* ColorSyncCreateInputPoppyProfile(void); void* ColorSyncCreateOutputPoppyProfile(void); void* ColorSyncCreateOutputPoppyProfileForRGBData(void); void* ColorSyncCreateSignatureFromFourCharCode(void); -void* ColorSyncCreateUUIDFromUInt32(void); void* ColorSyncDataCanBeIgnoredOnSRGBDevice(void); void* ColorSyncDeviceCopyDeviceInfo(void); void* ColorSyncDeviceCopyDeviceRegistrationInfo(void); @@ -106,7 +107,6 @@ void* ColorSyncProfileUninstall(void); void* ColorSyncProfileVerify(void); void* ColorSyncProfileWriteToFile(void); void* ColorSyncPureGammaOriginalTRC(void); -void* ColorSyncRegisterDevice(void); void* ColorSyncSwapProfileHeader(void); void* ColorSyncTRCGetFunction(void); void* ColorSyncTRCGetGammaID(void); @@ -122,11 +122,25 @@ void* ColorSyncTransformCreateWithName(void); void* ColorSyncTransformGetTypeID(void); void* ColorSyncTransformIterate(void); void* ColorSyncTransformSetProperty(void); -void* ColorSyncUnregisterDevice(void); void* ColorSyncVerifyAdobeRGBData(void); void* ColorSyncVerifyDisplayP3Data(void); void* ColorSyncVerifyGenericGrayGamma2_2Data(void); void* ColorSyncVerifyGenericLabData(void); void* ColorSyncVerifySRGBData(void); +// fixed-up declarations + +CFUUIDRef ColorSyncCreateUUIDFromUInt32(unsigned int uuid); +bool ColorSyncRegisterDevice(CFStringRef class, CFUUIDRef uuid, CFDictionaryRef info); +bool ColorSyncUnregisterDevice(CFStringRef class, CFUUIDRef uuid); + +extern CFStringRef kColorSyncDeviceProfileURL; +extern CFStringRef kColorSyncDeviceModeDescriptions; +extern CFStringRef kColorSyncDeviceDefaultProfileID; +extern CFStringRef kColorSyncDeviceDescriptions; +extern CFStringRef kColorSyncFactoryProfiles; +extern CFStringRef kColorSyncDeviceUserScope; +extern CFStringRef kColorSyncDeviceHostScope; +extern CFStringRef kColorSyncPrinterDeviceClass; + #endif diff --git a/src/frameworks/ColorSync/src/ColorSync.c b/src/frameworks/ColorSync/src/ColorSync.c index b820c60bb..afbbfc082 100644 --- a/src/frameworks/ColorSync/src/ColorSync.c +++ b/src/frameworks/ColorSync/src/ColorSync.c @@ -137,12 +137,6 @@ void* ColorSyncCreateSignatureFromFourCharCode(void) return NULL; } -void* ColorSyncCreateUUIDFromUInt32(void) -{ - if (verbose) puts("STUB: ColorSyncCreateUUIDFromUInt32 called"); - return NULL; -} - void* ColorSyncDataCanBeIgnoredOnSRGBDevice(void) { if (verbose) puts("STUB: ColorSyncDataCanBeIgnoredOnSRGBDevice called"); @@ -539,12 +533,6 @@ void* ColorSyncPureGammaOriginalTRC(void) return NULL; } -void* ColorSyncRegisterDevice(void) -{ - if (verbose) puts("STUB: ColorSyncRegisterDevice called"); - return NULL; -} - void* ColorSyncSwapProfileHeader(void) { if (verbose) puts("STUB: ColorSyncSwapProfileHeader called"); @@ -635,12 +623,6 @@ void* ColorSyncTransformSetProperty(void) return NULL; } -void* ColorSyncUnregisterDevice(void) -{ - if (verbose) puts("STUB: ColorSyncUnregisterDevice called"); - return NULL; -} - void* ColorSyncVerifyAdobeRGBData(void) { if (verbose) puts("STUB: ColorSyncVerifyAdobeRGBData called"); @@ -670,3 +652,30 @@ void* ColorSyncVerifySRGBData(void) if (verbose) puts("STUB: ColorSyncVerifySRGBData called"); return NULL; } + +// stubs with fixed-up declarations + +CFUUIDRef ColorSyncCreateUUIDFromUInt32(unsigned int uuid) { + if (verbose) puts("STUB: ColorSyncCreateUUIDFromUInt32 called"); + return NULL; +}; + +bool ColorSyncRegisterDevice(CFStringRef class, CFUUIDRef uuid, CFDictionaryRef info) { + if (verbose) puts("STUB: ColorSyncRegisterDevice called"); + return 0; +}; + +bool ColorSyncUnregisterDevice(CFStringRef class, CFUUIDRef uuid) { + if (verbose) puts("STUB: ColorSyncUnregisterDevice called"); + return 0; +}; + +// someone please check these and replace them with the correct values +CFStringRef kColorSyncDeviceProfileURL = CFSTR("ColorSyncDeviceProfileURL"); +CFStringRef kColorSyncDeviceModeDescriptions = CFSTR("ColorSyncDeviceModeDescriptions"); +CFStringRef kColorSyncDeviceDefaultProfileID = CFSTR("ColorSyncDeviceDefaultProfileID"); +CFStringRef kColorSyncDeviceDescriptions = CFSTR("ColorSyncDeviceDescriptions"); +CFStringRef kColorSyncFactoryProfiles = CFSTR("ColorSyncFactoryProfiles"); +CFStringRef kColorSyncDeviceUserScope = CFSTR("ColorSyncDeviceUserScope"); +CFStringRef kColorSyncDeviceHostScope = CFSTR("ColorSyncDeviceHostScope"); +CFStringRef kColorSyncPrinterDeviceClass = CFSTR("ColorSyncPrinterDeviceClass");