* icm.h: Multiple fixes according to ...
http://msdn.microsoft.com/en-us/library/ff546018(VS.85).aspx
http://msdn.microsoft.com/en-us/library/ff563752(VS.85).aspx
http://www.color.org/ICC34.pdf
http://msdn.microsoft.com/en-us/library/ff546012(VS.85).aspx
http://msdn.microsoft.com/en-us/library/ff563709(VS.85).aspx
http://msdn.microsoft.com/en-us/library/ff563736(VS.85).aspx

Add INTENT_* macros from ICC spec, fix the COLORPROFILESUBTYPE
enum name and its values. Fix the COLORPROFILETYPE enum values.
Add initial value to WCS_PROFILE_MANAGEMENT_SCOPE enum's first 
member. WcsAssociateColorProfileWithDevice(): Remove the ANSI
and UNICODE variants of it, make it single type only accepting
PCWSTR arguments. WcsOpenColorProfile(): Add ANSI and UNICODE
versions, make a macro defining the correct one. Fix a WINBOOL
typo (was WInBOOL).

(if you don't believe me about the ANSI/UNICODE changes, just
look at your mscms.def file.)


git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@3332 4407c894-4637-0410-b4f5-ada5f102cad1

mingw-w64-headers/include/icm.h

diff --git a/mingw-w64-headers/include/icm.h b/mingw-w64-headers/include/icm.h
index 3c00c5f..f4c9054 100644
--- a/mingw-w64-headers/include/icm.h
+++ b/mingw-w64-headers/include/icm.h
@@ -475,37 +475,34 @@
   COLOR_10b_R10G10B10A2_XR
 } COLORDATATYPE, *PCOLORDATATYPE, *LPCOLORDATATYPE;
 
-typedef enum tagCOLORPROFILSUBTYPE {
-  CPST_NONE                    = 0x0000,
-  CPST_RGB_WORKING_SPACE       = 0x0001,
-  CPST_PERCEPTUAL              = 0x0002,
-  CPST_ABSOLUTE_COLORIMETRIC   = 0x0004,
-  CPST_RELATIVE_COLORIMETRIC   = 0x0008,
-  CPST_SATURATION              = 0x0010,
-  CPST_CUSTOM_WORKING_SPACE    = 0x0020 
-} COLORPROFILSUBTYPE, *COLORPROFILESUBTYPE PCOLORPROFILESUBTYPE, *LPCOLORPROFILESUBTYPE;
+#define INTENT_PERCEPTUAL 0
+#define INTENT_RELATIVE_COLORIMETRIC 1
+#define INTENT_SATURATION 2
+#define INTENT_ABSOLUTE_COLORIMETRIC 3
+
+typedef enum tagCOLORPROFILESUBTYPE {
+  CPST_PERCEPTUAL            = INTENT_PERCEPTUAL,
+  CPST_RELATIVE_COLORIMETRIC = INTENT_RELATIVE_COLORIMETRIC,
+  CPST_SATURATION            = INTENT_SATURATION,
+  CPST_ABSOLUTE_COLORIMETRIC = INTENT_ABSOLUTE_COLORIMETRIC,
+  CPST_NONE,
+  CPST_RGB_WORKING_SPACE,
+  CPST_CUSTOM_WORKING_SPACE
+} COLORPROFILESUBTYPE, *PCOLORPROFILESUBTYPE, *LPCOLORPROFILESUBTYPE;
 
 typedef enum tagCOLORPROFILETYPE {
-  CPT_ICC    = 0x0001,
-  CPT_DMP,
-  CPT_CAMP,
-  CPT_GMMP
+  CPT_ICC  = 0,
+  CPT_DMP  = 1,
+  CPT_CAMP = 2,
+  CPT_GMMP = 3
 } COLORPROFILETYPE, *PCOLORPROFILETYPE, *LPCOLORPROFILETYPE;
 
 typedef enum tagWCS_PROFILE_MANAGEMENT_SCOPE {
-  WCS_PROFILE_MANAGEMENT_SCOPE_SYSTEM_WIDE,
+  WCS_PROFILE_MANAGEMENT_SCOPE_SYSTEM_WIDE = 0,
   WCS_PROFILE_MANAGEMENT_SCOPE_CURRENT_USER
 } WCS_PROFILE_MANAGEMENT_SCOPE;
 
-#define WcsAssociateColorProfileWithDevice __MINGW_NAME_AW(WcsAssociateColorProfileWithDevice)
-
-WINBOOL WINAPI WcsAssociateColorProfileWithDeviceA(
-  WCS_PROFILE_MANAGEMENT_SCOPE profileManagementScope,
-  PCSTR pProfileName,
-  PCSTR pDeviceName
-);
-
-WINBOOL WINAPI WcsAssociateColorProfileWithDeviceW(
+WINBOOL WINAPI WcsAssociateColorProfileWithDevice(
   WCS_PROFILE_MANAGEMENT_SCOPE profileManagementScope,
   PCWSTR pProfileName,
   PCWSTR pDeviceName
@@ -576,7 +573,19 @@
   WINBOOL *pUsePerUserProfiles
 );
 
-HPROFILE WINAPI WcsOpenColorProfile(
+#define WcsOpenColorProfile __MINGW_NAME_AW(WcsOpenColorProfile)
+
+HPROFILE WINAPI WcsOpenColorProfileA(
+  PPROFILE pCDMPProfile,
+  PPROFILE pCAMPProfile,
+  PPROFILE pGMMPProfile,
+  DWORD dwDesiredAccess,
+  DWORD dwShareMode,
+  DWORD dwCreationMode,
+  DWORD dwFlags
+);
+
+HPROFILE WINAPI WcsOpenColorProfileW(
   PPROFILE pCDMPProfile,
   PPROFILE pCAMPProfile,
   PPROFILE pGMMPProfile,
@@ -595,7 +604,7 @@
   LPCWSTR pProfileName
 );
 
-WInBOOL WINAPI WcsSetDefaultRenderingIntent(
+WINBOOL WINAPI WcsSetDefaultRenderingIntent(
   WCS_PROFILE_MANAGEMENT_SCOPE scope,
   DWORD dwRenderingIntent
 );