Headers diff for msimg32.dll between 6.0.6001.18000-Windows 6.0 and 6.1.7600.16385-Windows 7.0 versions

wingdi.h (6.0.6001.18000-Windows 6.0)		wingdi.h (6.1.7600.16385-Windows 7.0)

skipping to change at line 14		skipping to change at line 14
* *		* *
* Copyright (c) Microsoft Corp. All rights reserved. *		* Copyright (c) Microsoft Corp. All rights reserved. *
* *		* *
**************************************************************************/		**************************************************************************/

#ifndef _WINGDI_		#ifndef _WINGDI_
#define _WINGDI_		#define _WINGDI_

#pragma once		#pragma once


		#if _MSC_VER >= 1200
		#pragma warning(push)
		#pragma warning(disable: 4201) // nonstandard extension used : nameless str
		uct/union
		#endif

#ifdef _MAC		#ifdef _MAC
#include <macwin32.h>		#include <macwin32.h>
#endif		#endif


//		//
// Define API decoration for direct importing of DLL references.		// Define API decoration for direct importing of DLL references.
//		//

#if !defined(_GDI32_)		#if !defined(_GDI32_)
#define WINGDIAPI DECLSPEC_IMPORT		#define WINGDIAPI DECLSPEC_IMPORT
#else		#else
#define WINGDIAPI		#define WINGDIAPI
#endif		#endif


skipping to change at line 86		skipping to change at line 92
#define MERGECOPY (DWORD)0x00C000CA /* dest = (source AND pattern) */		#define MERGECOPY (DWORD)0x00C000CA /* dest = (source AND pattern) */
#define MERGEPAINT (DWORD)0x00BB0226 /* dest = (NOT source) OR dest */		#define MERGEPAINT (DWORD)0x00BB0226 /* dest = (NOT source) OR dest */
#define PATCOPY (DWORD)0x00F00021 /* dest = pattern */		#define PATCOPY (DWORD)0x00F00021 /* dest = pattern */
#define PATPAINT (DWORD)0x00FB0A09 /* dest = DPSnoo */		#define PATPAINT (DWORD)0x00FB0A09 /* dest = DPSnoo */
#define PATINVERT (DWORD)0x005A0049 /* dest = pattern XOR dest */		#define PATINVERT (DWORD)0x005A0049 /* dest = pattern XOR dest */
#define DSTINVERT (DWORD)0x00550009 /* dest = (NOT dest) */		#define DSTINVERT (DWORD)0x00550009 /* dest = (NOT dest) */
#define BLACKNESS (DWORD)0x00000042 /* dest = BLACK */		#define BLACKNESS (DWORD)0x00000042 /* dest = BLACK */
#define WHITENESS (DWORD)0x00FF0062 /* dest = WHITE */		#define WHITENESS (DWORD)0x00FF0062 /* dest = WHITE */
#if(WINVER >= 0x0500)		#if(WINVER >= 0x0500)


#define NOMIRRORBITMAP (DWORD)0x80000000 /* Do not Mirror the bitmap in thi		#define NOMIRRORBITMAP (DWORD)0x80000000 /* Do not Mirror the bitm
s call */		ap in this call */
#define CAPTUREBLT (DWORD)0x40000000 /* Include layered windows */		#define CAPTUREBLT (DWORD)0x40000000 /* Include layered window
		s */
#endif /* WINVER >= 0x0500 */		#endif /* WINVER >= 0x0500 */

/* Quaternary raster codes */		/* Quaternary raster codes */
#define MAKEROP4(fore,back) (DWORD)((((back) << 8) & 0xFF000000) \| (fore))		#define MAKEROP4(fore,back) (DWORD)((((back) << 8) & 0xFF000000) \| (fore))

#endif /* NORASTEROPS */		#endif /* NORASTEROPS */

#define GDI_ERROR (0xFFFFFFFFL)		#define GDI_ERROR (0xFFFFFFFFL)
#if (_WIN32_WINNT >= _WIN32_WINNT_WINXP)		#if (_WIN32_WINNT >= _WIN32_WINNT_WINXP)
#define HGDI_ERROR (LongToHandle(0xFFFFFFFFL))		#define HGDI_ERROR (LongToHandle(0xFFFFFFFFL))

skipping to change at line 451		skipping to change at line 457
#define PSINJECT_PLATECOLOR 104		#define PSINJECT_PLATECOLOR 104

#define PSINJECT_SHOWPAGE 105		#define PSINJECT_SHOWPAGE 105
#define PSINJECT_PAGEBBOX 106		#define PSINJECT_PAGEBBOX 106
#define PSINJECT_ENDPAGECOMMENTS 107		#define PSINJECT_ENDPAGECOMMENTS 107

#define PSINJECT_VMSAVE 200		#define PSINJECT_VMSAVE 200
#define PSINJECT_VMRESTORE 201		#define PSINJECT_VMRESTORE 201

/*		/*

		* InjectionPoint for publisher mode PScript5 OEM plugin to
		* generate DSC comment for included font resource
		*/
		#define PSINJECT_DLFONT 0xdddddddd

		/*
* Parameter for GET_PS_FEATURESETTING escape		* Parameter for GET_PS_FEATURESETTING escape
*/		*/

#define FEATURESETTING_NUP 0		#define FEATURESETTING_NUP 0
#define FEATURESETTING_OUTPUT 1		#define FEATURESETTING_OUTPUT 1
#define FEATURESETTING_PSLEVEL 2		#define FEATURESETTING_PSLEVEL 2
#define FEATURESETTING_CUSTPAPER 3		#define FEATURESETTING_CUSTPAPER 3
#define FEATURESETTING_MIRROR 4		#define FEATURESETTING_MIRROR 4
#define FEATURESETTING_NEGATIVE 5		#define FEATURESETTING_NEGATIVE 5
#define FEATURESETTING_PROTOCOL 6		#define FEATURESETTING_PROTOCOL 6

skipping to change at line 1120		skipping to change at line 1132
LONG paXExt;		LONG paXExt;
LONG paYExt;		LONG paYExt;
BYTE paRGBs;		BYTE paRGBs;
} PELARRAY, PPELARRAY, NEAR NPPELARRAY, FAR *LPPELARRAY;		} PELARRAY, PPELARRAY, NEAR NPPELARRAY, FAR *LPPELARRAY;

/* Logical Brush (or Pattern) */		/* Logical Brush (or Pattern) */
typedef struct tagLOGBRUSH		typedef struct tagLOGBRUSH
{		{
UINT lbStyle;		UINT lbStyle;
COLORREF lbColor;		COLORREF lbColor;

ULONG_PTR lbHatch; // Sundown: lbHatch could hold a HANDLE		ULONG_PTR lbHatch;
} LOGBRUSH, PLOGBRUSH, NEAR NPLOGBRUSH, FAR *LPLOGBRUSH;		} LOGBRUSH, PLOGBRUSH, NEAR NPLOGBRUSH, FAR *LPLOGBRUSH;

typedef struct tagLOGBRUSH32		typedef struct tagLOGBRUSH32
{		{
UINT lbStyle;		UINT lbStyle;
COLORREF lbColor;		COLORREF lbColor;
ULONG lbHatch;		ULONG lbHatch;
} LOGBRUSH32, PLOGBRUSH32, NEAR NPLOGBRUSH32, FAR *LPLOGBRUSH32;		} LOGBRUSH32, PLOGBRUSH32, NEAR NPLOGBRUSH32, FAR *LPLOGBRUSH32;

typedef LOGBRUSH PATTERN;		typedef LOGBRUSH PATTERN;

skipping to change at line 1148		skipping to change at line 1160
UINT lopnStyle;		UINT lopnStyle;
POINT lopnWidth;		POINT lopnWidth;
COLORREF lopnColor;		COLORREF lopnColor;
} LOGPEN, PLOGPEN, NEAR NPLOGPEN, FAR *LPLOGPEN;		} LOGPEN, PLOGPEN, NEAR NPLOGPEN, FAR *LPLOGPEN;

typedef struct tagEXTLOGPEN {		typedef struct tagEXTLOGPEN {
DWORD elpPenStyle;		DWORD elpPenStyle;
DWORD elpWidth;		DWORD elpWidth;
UINT elpBrushStyle;		UINT elpBrushStyle;
COLORREF elpColor;		COLORREF elpColor;

ULONG_PTR elpHatch; //Sundown: elpHatch could take a HANDLE		ULONG_PTR elpHatch;
DWORD elpNumEntries;		DWORD elpNumEntries;
DWORD elpStyleEntry[1];		DWORD elpStyleEntry[1];
} EXTLOGPEN, PEXTLOGPEN, NEAR NPEXTLOGPEN, FAR *LPEXTLOGPEN;		} EXTLOGPEN, PEXTLOGPEN, NEAR NPEXTLOGPEN, FAR *LPEXTLOGPEN;


		typedef struct tagEXTLOGPEN32 {
		DWORD elpPenStyle;
		DWORD elpWidth;
		UINT elpBrushStyle;
		COLORREF elpColor;
		ULONG elpHatch;
		DWORD elpNumEntries;
		DWORD elpStyleEntry[1];
		} EXTLOGPEN32, PEXTLOGPEN32, NEAR NPEXTLOGPEN32, FAR *LPEXTLOGPEN32;

#ifndef _PALETTEENTRY_DEFINED		#ifndef _PALETTEENTRY_DEFINED
#define _PALETTEENTRY_DEFINED		#define _PALETTEENTRY_DEFINED
typedef struct tagPALETTEENTRY {		typedef struct tagPALETTEENTRY {
BYTE peRed;		BYTE peRed;
BYTE peGreen;		BYTE peGreen;
BYTE peBlue;		BYTE peBlue;
BYTE peFlags;		BYTE peFlags;
} PALETTEENTRY, PPALETTEENTRY, FAR LPPALETTEENTRY;		} PALETTEENTRY, PPALETTEENTRY, FAR LPPALETTEENTRY;
#endif // !_PALETTEENTRY_DEFINED		#endif // !_PALETTEENTRY_DEFINED


skipping to change at line 1563		skipping to change at line 1585
typedef PEXTLOGFONTA PEXTLOGFONT;		typedef PEXTLOGFONTA PEXTLOGFONT;
typedef NPEXTLOGFONTA NPEXTLOGFONT;		typedef NPEXTLOGFONTA NPEXTLOGFONT;
typedef LPEXTLOGFONTA LPEXTLOGFONT;		typedef LPEXTLOGFONTA LPEXTLOGFONT;
#endif // UNICODE		#endif // UNICODE

#define ELF_VERSION 0		#define ELF_VERSION 0
#define ELF_CULTURE_LATIN 0		#define ELF_CULTURE_LATIN 0

/* EnumFonts Masks */		/* EnumFonts Masks */
#define RASTER_FONTTYPE 0x0001		#define RASTER_FONTTYPE 0x0001

#define DEVICE_FONTTYPE 0x002		#define DEVICE_FONTTYPE 0x0002
#define TRUETYPE_FONTTYPE 0x004		#define TRUETYPE_FONTTYPE 0x0004

#define RGB(r,g,b) ((COLORREF)(((BYTE)(r)\|((WORD)((BYTE)(g))<<8))\|(((DW ORD)(BYTE)(b))<<16)))		#define RGB(r,g,b) ((COLORREF)(((BYTE)(r)\|((WORD)((BYTE)(g))<<8))\|(((DW ORD)(BYTE)(b))<<16)))
#define PALETTERGB(r,g,b) (0x02000000 \| RGB(r,g,b))		#define PALETTERGB(r,g,b) (0x02000000 \| RGB(r,g,b))
#define PALETTEINDEX(i) ((COLORREF)(0x01000000 \| (DWORD)(WORD)(i)))		#define PALETTEINDEX(i) ((COLORREF)(0x01000000 \| (DWORD)(WORD)(i)))

/* palette entry flags */		/* palette entry flags */

#define PC_RESERVED 0x01 /* palette index used for animation */		#define PC_RESERVED 0x01 /* palette index used for animation */
#define PC_EXPLICIT 0x02 /* palette index is explicit to device */		#define PC_EXPLICIT 0x02 /* palette index is explicit to device */
#define PC_NOCOLLAPSE 0x04 /* do not match color to system palette */		#define PC_NOCOLLAPSE 0x04 /* do not match color to system palette */

skipping to change at line 1674		skipping to change at line 1696
#define BS_DIBPATTERN8X8 8		#define BS_DIBPATTERN8X8 8
#define BS_MONOPATTERN 9		#define BS_MONOPATTERN 9

/* Hatch Styles */		/* Hatch Styles */
#define HS_HORIZONTAL 0 /* ----- */		#define HS_HORIZONTAL 0 /* ----- */
#define HS_VERTICAL 1 /* \|\|\|\|\| */		#define HS_VERTICAL 1 /* \|\|\|\|\| */
#define HS_FDIAGONAL 2 /* \\\\\ */		#define HS_FDIAGONAL 2 /* \\\\\ */
#define HS_BDIAGONAL 3 /* ///// */		#define HS_BDIAGONAL 3 /* ///// */
#define HS_CROSS 4 /* +++++ */		#define HS_CROSS 4 /* +++++ */
#define HS_DIAGCROSS 5 /* xxxxx */		#define HS_DIAGCROSS 5 /* xxxxx */

		#define HS_API_MAX 12

/* Pen Styles */		/* Pen Styles */
#define PS_SOLID 0		#define PS_SOLID 0
#define PS_DASH 1 /* ------- */		#define PS_DASH 1 /* ------- */
#define PS_DOT 2 /* ....... */		#define PS_DOT 2 /* ....... */
#define PS_DASHDOT 3 /* _._._._ */		#define PS_DASHDOT 3 /* _._._._ */
#define PS_DASHDOTDOT 4 /* _.._.._ */		#define PS_DASHDOTDOT 4 /* _.._.._ */
#define PS_NULL 5		#define PS_NULL 5
#define PS_INSIDEFRAME 6		#define PS_INSIDEFRAME 6
#define PS_USERSTYLE 7		#define PS_USERSTYLE 7

skipping to change at line 2476		skipping to change at line 2499
#if (_WIN32_WINNT >= _WIN32_WINNT_LONGHORN)		#if (_WIN32_WINNT >= _WIN32_WINNT_LONGHORN)
#define DISPLAY_DEVICE_UNSAFE_MODES_ON 0x00080000		#define DISPLAY_DEVICE_UNSAFE_MODES_ON 0x00080000
#endif		#endif

/* Child device state */		/* Child device state */
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN2K)		#if (_WIN32_WINNT >= _WIN32_WINNT_WIN2K)
#define DISPLAY_DEVICE_ACTIVE 0x00000001		#define DISPLAY_DEVICE_ACTIVE 0x00000001
#define DISPLAY_DEVICE_ATTACHED 0x00000002		#define DISPLAY_DEVICE_ATTACHED 0x00000002
#endif // (_WIN32_WINNT >= _WIN32_WINNT_WIN2K)		#endif // (_WIN32_WINNT >= _WIN32_WINNT_WIN2K)


		#if(WINVER >= 0x0601)

		#define DISPLAYCONFIG_MAXPATH 1024 // Maximum display path in system.
		// Max adapter (16) * Max source (16)
		*
		// Max clone pre source (4)

		typedef struct DISPLAYCONFIG_RATIONAL
		{
		UINT32 Numerator;
		UINT32 Denominator;
		} DISPLAYCONFIG_RATIONAL;

		typedef enum
		{
		DISPLAYCONFIG_OUTPUT_TECHNOLOGY_OTHER = -1,
		DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HD15 = 0,
		DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SVIDEO = 1,
		DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPOSITE_VIDEO = 2,
		DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPONENT_VIDEO = 3,
		DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DVI = 4,
		DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HDMI = 5,
		DISPLAYCONFIG_OUTPUT_TECHNOLOGY_LVDS = 6,
		DISPLAYCONFIG_OUTPUT_TECHNOLOGY_D_JPN = 8,
		DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDI = 9,
		DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EXTERNAL = 10,
		DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EMBEDDED = 11,
		DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EXTERNAL = 12,
		DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EMBEDDED = 13,
		DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDTVDONGLE = 14,
		DISPLAYCONFIG_OUTPUT_TECHNOLOGY_INTERNAL = 0x80000000,
		DISPLAYCONFIG_OUTPUT_TECHNOLOGY_FORCE_UINT32 = 0xFFFFFFFF
		} DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY;

		typedef enum
		{
		DISPLAYCONFIG_SCANLINE_ORDERING_UNSPECIFIED = 0,
		DISPLAYCONFIG_SCANLINE_ORDERING_PROGRESSIVE = 1,
		DISPLAYCONFIG_SCANLINE_ORDERING_INTERLACED = 2,
		DISPLAYCONFIG_SCANLINE_ORDERING_INTERLACED_UPPERFIELDFIRST = DISPLAYCONFIG_
		SCANLINE_ORDERING_INTERLACED,
		DISPLAYCONFIG_SCANLINE_ORDERING_INTERLACED_LOWERFIELDFIRST = 3,
		DISPLAYCONFIG_SCANLINE_ORDERING_FORCE_UINT32 = 0xFFFFFFFF
		} DISPLAYCONFIG_SCANLINE_ORDERING;

		typedef struct DISPLAYCONFIG_2DREGION
		{
		UINT32 cx;
		UINT32 cy;
		} DISPLAYCONFIG_2DREGION;

		typedef struct DISPLAYCONFIG_VIDEO_SIGNAL_INFO
		{
		UINT64 pixelRate;
		DISPLAYCONFIG_RATIONAL hSyncFreq;
		DISPLAYCONFIG_RATIONAL vSyncFreq;
		DISPLAYCONFIG_2DREGION activeSize;
		DISPLAYCONFIG_2DREGION totalSize;
		UINT32 videoStandard;
		DISPLAYCONFIG_SCANLINE_ORDERING scanLineOrdering;
		} DISPLAYCONFIG_VIDEO_SIGNAL_INFO;

		typedef enum
		{
		DISPLAYCONFIG_SCALING_IDENTITY = 1,
		DISPLAYCONFIG_SCALING_CENTERED = 2,
		DISPLAYCONFIG_SCALING_STRETCHED = 3,
		DISPLAYCONFIG_SCALING_ASPECTRATIOCENTEREDMAX = 4,
		DISPLAYCONFIG_SCALING_CUSTOM = 5,
		DISPLAYCONFIG_SCALING_PREFERRED = 128,
		DISPLAYCONFIG_SCALING_FORCE_UINT32 = 0xFFFFFFFF
		} DISPLAYCONFIG_SCALING;

		typedef enum
		{
		DISPLAYCONFIG_ROTATION_IDENTITY = 1,
		DISPLAYCONFIG_ROTATION_ROTATE90 = 2,
		DISPLAYCONFIG_ROTATION_ROTATE180 = 3,
		DISPLAYCONFIG_ROTATION_ROTATE270 = 4,
		DISPLAYCONFIG_ROTATION_FORCE_UINT32 = 0xFFFFFFFF
		} DISPLAYCONFIG_ROTATION;

		typedef enum
		{
		DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE = 1,
		DISPLAYCONFIG_MODE_INFO_TYPE_TARGET = 2,
		DISPLAYCONFIG_MODE_INFO_TYPE_FORCE_UINT32 = 0xFFFFFFFF
		} DISPLAYCONFIG_MODE_INFO_TYPE;

		typedef enum
		{
		DISPLAYCONFIG_PIXELFORMAT_8BPP = 1,
		DISPLAYCONFIG_PIXELFORMAT_16BPP = 2,
		DISPLAYCONFIG_PIXELFORMAT_24BPP = 3,
		DISPLAYCONFIG_PIXELFORMAT_32BPP = 4,
		DISPLAYCONFIG_PIXELFORMAT_NONGDI = 5,
		DISPLAYCONFIG_PIXELFORMAT_FORCE_UINT32 = 0xffffffff
		} DISPLAYCONFIG_PIXELFORMAT;

		typedef struct DISPLAYCONFIG_SOURCE_MODE
		{
		UINT32 width;
		UINT32 height;
		DISPLAYCONFIG_PIXELFORMAT pixelFormat;
		POINTL position;
		} DISPLAYCONFIG_SOURCE_MODE;

		typedef struct DISPLAYCONFIG_TARGET_MODE
		{
		DISPLAYCONFIG_VIDEO_SIGNAL_INFO targetVideoSignalInfo;
		} DISPLAYCONFIG_TARGET_MODE;

		typedef struct DISPLAYCONFIG_MODE_INFO
		{
		DISPLAYCONFIG_MODE_INFO_TYPE infoType;
		UINT32 id;
		LUID adapterId;
		union
		{
		DISPLAYCONFIG_TARGET_MODE targetMode;
		DISPLAYCONFIG_SOURCE_MODE sourceMode;
		};
		} DISPLAYCONFIG_MODE_INFO;

		#define DISPLAYCONFIG_PATH_MODE_IDX_INVALID 0xffffffff

		typedef struct DISPLAYCONFIG_PATH_SOURCE_INFO
		{
		LUID adapterId;
		UINT32 id;
		UINT32 modeInfoIdx;
		UINT32 statusFlags;
		} DISPLAYCONFIG_PATH_SOURCE_INFO;

		//
		// Flags for source info structure (from OS to application through QDC)
		//

		#define DISPLAYCONFIG_SOURCE_IN_USE 0x00000001

		typedef struct DISPLAYCONFIG_PATH_TARGET_INFO
		{
		LUID adapterId;
		UINT32 id;
		UINT32 modeInfoIdx;
		DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY outputTechnology;
		DISPLAYCONFIG_ROTATION rotation;
		DISPLAYCONFIG_SCALING scaling;
		DISPLAYCONFIG_RATIONAL refreshRate;
		DISPLAYCONFIG_SCANLINE_ORDERING scanLineOrdering;
		BOOL targetAvailable;
		UINT32 statusFlags;
		} DISPLAYCONFIG_PATH_TARGET_INFO;

		//
		// Status flags for target info structure (from OS to application through QDC)
		//
		#define DISPLAYCONFIG_TARGET_IN_USE 0x00000001
		#define DISPLAYCONFIG_TARGET_FORCIBLE 0x00000002
		#define DISPLAYCONFIG_TARGET_FORCED_AVAILABILITY_BOOT 0x00000004
		#define DISPLAYCONFIG_TARGET_FORCED_AVAILABILITY_PATH 0x00000008
		#define DISPLAYCONFIG_TARGET_FORCED_AVAILABILITY_SYSTEM 0x00000010

		typedef struct DISPLAYCONFIG_PATH_INFO
		{
		DISPLAYCONFIG_PATH_SOURCE_INFO sourceInfo;
		DISPLAYCONFIG_PATH_TARGET_INFO targetInfo;
		UINT32 flags;
		} DISPLAYCONFIG_PATH_INFO;

		//
		// Flags for path info structure (from OS to application through QDC)
		//

		#define DISPLAYCONFIG_PATH_ACTIVE 0x00000001

		typedef enum
		{
		DISPLAYCONFIG_TOPOLOGY_INTERNAL = 0x00000001,
		DISPLAYCONFIG_TOPOLOGY_CLONE = 0x00000002,
		DISPLAYCONFIG_TOPOLOGY_EXTEND = 0x00000004,
		DISPLAYCONFIG_TOPOLOGY_EXTERNAL = 0x00000008,
		DISPLAYCONFIG_TOPOLOGY_FORCE_UINT32 = 0xFFFFFFFF
		} DISPLAYCONFIG_TOPOLOGY_ID;

		typedef enum
		{
		DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME = 1,
		DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME = 2,
		DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE = 3,
		DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME = 4,
		DISPLAYCONFIG_DEVICE_INFO_SET_TARGET_PERSISTENCE = 5,
		DISPLAYCONFIG_DEVICE_INFO_FORCE_UINT32 = 0xFFFFFFFF
		} DISPLAYCONFIG_DEVICE_INFO_TYPE;

		typedef struct DISPLAYCONFIG_DEVICE_INFO_HEADER
		{
		DISPLAYCONFIG_DEVICE_INFO_TYPE type;
		UINT32 size;
		LUID adapterId;
		UINT32 id;
		} DISPLAYCONFIG_DEVICE_INFO_HEADER;

		typedef struct DISPLAYCONFIG_SOURCE_DEVICE_NAME
		{
		DISPLAYCONFIG_DEVICE_INFO_HEADER header;
		WCHAR viewGdiDeviceName[CCHDEVICENAME]
		;
		} DISPLAYCONFIG_SOURCE_DEVICE_NAME;

		typedef struct DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS
		{
		union
		{
		struct
		{
		UINT32 friendlyNameFromEdid : 1;
		UINT32 friendlyNameForced : 1;
		UINT32 edidIdsValid : 1;
		UINT32 reserved : 29;
		};
		UINT32 value;
		};
		} DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS;

		typedef struct DISPLAYCONFIG_TARGET_DEVICE_NAME
		{
		DISPLAYCONFIG_DEVICE_INFO_HEADER header;
		DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS flags;
		DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY outputTechnology;
		UINT16 edidManufactureId;
		UINT16 edidProductCodeId;
		UINT32 connectorInstance;
		WCHAR monitorFriendlyDeviceName[64];
		WCHAR monitorDevicePath[128];
		} DISPLAYCONFIG_TARGET_DEVICE_NAME;

		typedef struct DISPLAYCONFIG_TARGET_PREFERRED_MODE
		{
		DISPLAYCONFIG_DEVICE_INFO_HEADER header;
		UINT32 width;
		UINT32 height;
		DISPLAYCONFIG_TARGET_MODE targetMode;
		} DISPLAYCONFIG_TARGET_PREFERRED_MODE;

		typedef struct DISPLAYCONFIG_ADAPTER_NAME
		{
		DISPLAYCONFIG_DEVICE_INFO_HEADER header;
		WCHAR adapterDevicePath[128];
		} DISPLAYCONFIG_ADAPTER_NAME;

		typedef struct DISPLAYCONFIG_SET_TARGET_PERSISTENCE
		{
		DISPLAYCONFIG_DEVICE_INFO_HEADER header;
		union
		{
		struct
		{
		UINT32 bootPersistenceOn : 1;
		UINT32 reserved : 31;
		};
		UINT32 value;
		};
		} DISPLAYCONFIG_SET_TARGET_PERSISTENCE;

		//
		// Definitions to be used by GetDisplayConfigBufferSizes and QueryDisplayConfig.
		//

		#define QDC_ALL_PATHS 0x00000001
		#define QDC_ONLY_ACTIVE_PATHS 0x00000002
		#define QDC_DATABASE_CURRENT 0x00000004

		//
		// Definitions used by SetDisplayConfig.
		//

		#define SDC_TOPOLOGY_INTERNAL 0x00000001
		#define SDC_TOPOLOGY_CLONE 0x00000002
		#define SDC_TOPOLOGY_EXTEND 0x00000004
		#define SDC_TOPOLOGY_EXTERNAL 0x00000008
		#define SDC_TOPOLOGY_SUPPLIED 0x00000010
		#define SDC_USE_DATABASE_CURRENT (SDC_TOPOLOGY_INTERNAL \| SDC_TOPOLOGY_CL
		ONE \| SDC_TOPOLOGY_EXTEND \| SDC_TOPOLOGY_EXTERNAL)

		#define SDC_USE_SUPPLIED_DISPLAY_CONFIG 0x00000020
		#define SDC_VALIDATE 0x00000040
		#define SDC_APPLY 0x00000080
		#define SDC_NO_OPTIMIZATION 0x00000100
		#define SDC_SAVE_TO_DATABASE 0x00000200
		#define SDC_ALLOW_CHANGES 0x00000400
		#define SDC_PATH_PERSIST_IF_REQUIRED 0x00000800
		#define SDC_FORCE_MODE_ENUMERATION 0x00001000
		#define SDC_ALLOW_PATH_ORDER_CHANGES 0x00002000

		#endif /* WINVER >= 0x0601 */

/* GetRegionData/ExtCreateRegion */		/* GetRegionData/ExtCreateRegion */

#define RDH_RECTANGLES 1		#define RDH_RECTANGLES 1

typedef struct _RGNDATAHEADER {		typedef struct _RGNDATAHEADER {
DWORD dwSize;		DWORD dwSize;
DWORD iType;		DWORD iType;
DWORD nCount;		DWORD nCount;
DWORD nRgnSize;		DWORD nRgnSize;
RECT rcBound;		RECT rcBound;

skipping to change at line 3301		skipping to change at line 3617
__in UINT cjCopy,		__in UINT cjCopy,
__out_bcount_opt(cjCopy) LPOUTLI NETEXTMETRICW potm);		__out_bcount_opt(cjCopy) LPOUTLI NETEXTMETRICW potm);
#ifdef UNICODE		#ifdef UNICODE
#define GetOutlineTextMetrics GetOutlineTextMetricsW		#define GetOutlineTextMetrics GetOutlineTextMetricsW
#else		#else
#define GetOutlineTextMetrics GetOutlineTextMetricsA		#define GetOutlineTextMetrics GetOutlineTextMetricsA
#endif // !UNICODE		#endif // !UNICODE

#endif /* NOTEXTMETRIC */		#endif /* NOTEXTMETRIC */


		__range(0,cEntries)
WINGDIAPI UINT WINAPI GetPaletteEntries( __in HPALETTE hpal,		WINGDIAPI UINT WINAPI GetPaletteEntries( __in HPALETTE hpal,
__in UINT iStart,		__in UINT iStart,
__in UINT cEntries,		__in UINT cEntries,

__out_ecount_opt(cEntries) LPPALETTE ENTRY pPalEntries);		__out_ecount_part_opt(cEntries,retur n) LPPALETTEENTRY pPalEntries);
WINGDIAPI COLORREF WINAPI GetPixel( __in HDC hdc, __in int x, __in int y);		WINGDIAPI COLORREF WINAPI GetPixel( __in HDC hdc, __in int x, __in int y);
WINGDIAPI int WINAPI GetPixelFormat( __in HDC hdc);		WINGDIAPI int WINAPI GetPixelFormat( __in HDC hdc);
WINGDIAPI int WINAPI GetPolyFillMode( __in HDC hdc);		WINGDIAPI int WINAPI GetPolyFillMode( __in HDC hdc);
WINGDIAPI BOOL WINAPI GetRasterizerCaps( __out_bcount(cjBytes) LPRASTERIZER_S TATUS lpraststat,		WINGDIAPI BOOL WINAPI GetRasterizerCaps( __out_bcount(cjBytes) LPRASTERIZER_S TATUS lpraststat,
__in UINT cjBytes);		__in UINT cjBytes);

WINGDIAPI int WINAPI GetRandomRgn (__in HDC hdc, __in HRGN hrgn, __in INT i);		WINGDIAPI int WINAPI GetRandomRgn (__in HDC hdc, __in HRGN hrgn, __in INT i);
WINGDIAPI DWORD WINAPI GetRegionData( __in HRGN hrgn,		WINGDIAPI DWORD WINAPI GetRegionData( __in HRGN hrgn,
__in DWORD nCount,		__in DWORD nCount,
__out_bcount_part_opt(nCount, return) LP RGNDATA lpRgnData);		__out_bcount_part_opt(nCount, return) LP RGNDATA lpRgnData);

skipping to change at line 3805		skipping to change at line 4122
//		//

#define AC_SRC_OVER 0x00		#define AC_SRC_OVER 0x00

//		//
// alpha format flags		// alpha format flags
//		//

#define AC_SRC_ALPHA 0x01		#define AC_SRC_ALPHA 0x01


WINGDIAPI BOOL WINAPI AlphaBlend( __in HDC hdcDest, __in int xoriginDest, __in i		WINGDIAPI BOOL WINAPI AlphaBlend(
nt yoriginDest, __in int wDest, __in int hDest, __in HDC hdcSrc, __in int xorigi		__in HDC hdcDest,
nSrc, __in int yoriginSrc, __in int wSrc, __in int hSrc, __in BLENDFUNCTION ftn)		__in int xoriginDest,
;		__in int yoriginDest,
		__in int wDest,
		__in int hDest,
		__in HDC hdcSrc,
		__in int xoriginSrc,
		__in int yoriginSrc,
		__in int wSrc,
		__in int hSrc,
		__in BLENDFUNCTION ftn);


WINGDIAPI BOOL WINAPI TransparentBlt(__in HDC hdcDest,__in int xoriginDest, __in		WINGDIAPI BOOL WINAPI TransparentBlt(
int yoriginDest, __in int wDest, __in int hDest, __in HDC hdcSrc,		__in HDC hdcDest,
__in int xoriginSrc, __in int yorigin		__in int xoriginDest,
Src, __in int wSrc, __in int hSrc, __in UINT crTransparent);		__in int yoriginDest,
		__in int wDest,
		__in int hDest,
		__in HDC hdcSrc,
		__in int xoriginSrc,
		__in int yoriginSrc,
		__in int wSrc,
		__in int hSrc,
		__in UINT crTransparent);

//		//
// gradient drawing modes		// gradient drawing modes
//		//

#define GRADIENT_FILL_RECT_H 0x00000000		#define GRADIENT_FILL_RECT_H 0x00000000
#define GRADIENT_FILL_RECT_V 0x00000001		#define GRADIENT_FILL_RECT_V 0x00000001
#define GRADIENT_FILL_TRIANGLE 0x00000002		#define GRADIENT_FILL_TRIANGLE 0x00000002
#define GRADIENT_FILL_OP_FLAG 0x000000ff		#define GRADIENT_FILL_OP_FLAG 0x000000ff


skipping to change at line 3859		skipping to change at line 4197
#ifndef NOMETAFILE		#ifndef NOMETAFILE

WINGDIAPI BOOL WINAPI PlayMetaFileRecord( __in HDC hdc,		WINGDIAPI BOOL WINAPI PlayMetaFileRecord( __in HDC hdc,
__in_ecount(noObjs) LPHANDLETABLE lp HandleTable,		__in_ecount(noObjs) LPHANDLETABLE lp HandleTable,
__in LPMETARECORD lpMR,		__in LPMETARECORD lpMR,
__in UINT noObjs);		__in UINT noObjs);

typedef int (CALLBACK* MFENUMPROC)( __in HDC hdc, __in_ecount(nObj) HANDLETABLE FAR* lpht, __in METARECORD FAR* lpMR, __in int nObj, __in_opt LPARAM param);		typedef int (CALLBACK* MFENUMPROC)( __in HDC hdc, __in_ecount(nObj) HANDLETABLE FAR* lpht, __in METARECORD FAR* lpMR, __in int nObj, __in_opt LPARAM param);
WINGDIAPI BOOL WINAPI EnumMetaFile( __in HDC hdc, __in HMETAFILE hmf, __in MFEN UMPROC proc, __in_opt LPARAM param);		WINGDIAPI BOOL WINAPI EnumMetaFile( __in HDC hdc, __in HMETAFILE hmf, __in MFEN UMPROC proc, __in_opt LPARAM param);


typedef int (CALLBACK* ENHMFENUMPROC)(__in HDC hdc, __in_ecount(nHandles) HANDLE TABLE FAR* lpht, __in CONST ENHMETARECORD * lpmr, __in int hHandles, __in_opt LP ARAM data);		typedef int (CALLBACK* ENHMFENUMPROC)(__in HDC hdc, __in_ecount(nHandles) HANDLE TABLE FAR* lpht, __in CONST ENHMETARECORD * lpmr, __in int nHandles, __in_opt LP ARAM data);

// Enhanced Metafile Function Declarations		// Enhanced Metafile Function Declarations

WINGDIAPI HENHMETAFILE WINAPI CloseEnhMetaFile( __in HDC hdc);		WINGDIAPI HENHMETAFILE WINAPI CloseEnhMetaFile( __in HDC hdc);
WINGDIAPI HENHMETAFILE WINAPI CopyEnhMetaFileA( __in HENHMETAFILE hEnh, __in_opt LPCSTR lpFileName);		WINGDIAPI HENHMETAFILE WINAPI CopyEnhMetaFileA( __in HENHMETAFILE hEnh, __in_opt LPCSTR lpFileName);
WINGDIAPI HENHMETAFILE WINAPI CopyEnhMetaFileW( __in HENHMETAFILE hEnh, __in_opt LPCWSTR lpFileName);		WINGDIAPI HENHMETAFILE WINAPI CopyEnhMetaFileW( __in HENHMETAFILE hEnh, __in_opt LPCWSTR lpFileName);
#ifdef UNICODE		#ifdef UNICODE
#define CopyEnhMetaFile CopyEnhMetaFileW		#define CopyEnhMetaFile CopyEnhMetaFileW
#else		#else
#define CopyEnhMetaFile CopyEnhMetaFileA		#define CopyEnhMetaFile CopyEnhMetaFileA

skipping to change at line 3983		skipping to change at line 4321
DWORD dsOffset;		DWORD dsOffset;
} DIBSECTION, FAR LPDIBSECTION, PDIBSECTION;		} DIBSECTION, FAR LPDIBSECTION, PDIBSECTION;

WINGDIAPI BOOL WINAPI AngleArc( __in HDC hdc, __in int x, __in int y, __in DWORD r, __in FLOAT StartAngle, __in FLOAT SweepAngle);		WINGDIAPI BOOL WINAPI AngleArc( __in HDC hdc, __in int x, __in int y, __in DWORD r, __in FLOAT StartAngle, __in FLOAT SweepAngle);
WINGDIAPI BOOL WINAPI PolyPolyline(__in HDC hdc, __in CONST POINT apt, __in_eco unt(csz) CONST DWORD asz, __in DWORD csz);		WINGDIAPI BOOL WINAPI PolyPolyline(__in HDC hdc, __in CONST POINT apt, __in_eco unt(csz) CONST DWORD asz, __in DWORD csz);
WINGDIAPI BOOL WINAPI GetWorldTransform( __in HDC hdc, __out LPXFORM lpxf);		WINGDIAPI BOOL WINAPI GetWorldTransform( __in HDC hdc, __out LPXFORM lpxf);
WINGDIAPI BOOL WINAPI SetWorldTransform( __in HDC hdc, __in CONST XFORM * lpxf);		WINGDIAPI BOOL WINAPI SetWorldTransform( __in HDC hdc, __in CONST XFORM * lpxf);
WINGDIAPI BOOL WINAPI ModifyWorldTransform( __in HDC hdc, __in_opt CONST XFORM * lpxf, __in DWORD mode);		WINGDIAPI BOOL WINAPI ModifyWorldTransform( __in HDC hdc, __in_opt CONST XFORM * lpxf, __in DWORD mode);
WINGDIAPI BOOL WINAPI CombineTransform( __out LPXFORM lpxfOut, __in CONST XFORM lpxf1, __in CONST XFORM lpxf2);		WINGDIAPI BOOL WINAPI CombineTransform( __out LPXFORM lpxfOut, __in CONST XFORM lpxf1, __in CONST XFORM lpxf2);
WINGDIAPI HBITMAP WINAPI CreateDIBSection(__in_opt HDC hdc, __in CONST BITMAPINF O lpbmi, __in UINT usage, __deref_opt_out VOID *ppvBits, __in_opt HANDLE hSect ion, __in DWORD offset);		WINGDIAPI HBITMAP WINAPI CreateDIBSection(__in_opt HDC hdc, __in CONST BITMAPINF O lpbmi, __in UINT usage, __deref_opt_out VOID *ppvBits, __in_opt HANDLE hSect ion, __in DWORD offset);

		__range(0,cEntries)
WINGDIAPI UINT WINAPI GetDIBColorTable( __in HDC hdc,		WINGDIAPI UINT WINAPI GetDIBColorTable( __in HDC hdc,
__in UINT iStart,		__in UINT iStart,
__in UINT cEntries,		__in UINT cEntries,

__out_ecount(cEntries) RGBQUAD *prgbq);		__out_ecount_part(cEntries,return) RGBQU AD *prgbq);
WINGDIAPI UINT WINAPI SetDIBColorTable( __in HDC hdc,		WINGDIAPI UINT WINAPI SetDIBColorTable( __in HDC hdc,
__in UINT iStart,		__in UINT iStart,
__in UINT cEntries,		__in UINT cEntries,
__in_ecount(cEntries) CONST RGBQUAD *prg bq);		__in_ecount(cEntries) CONST RGBQUAD *prg bq);

/* Flags value for COLORADJUSTMENT */		/* Flags value for COLORADJUSTMENT */
#define CA_NEGATIVE 0x0001		#define CA_NEGATIVE 0x0001
#define CA_LOG_FILTER 0x0002		#define CA_LOG_FILTER 0x0002

/* IlluminantIndex values */		/* IlluminantIndex values */

skipping to change at line 4103		skipping to change at line 4442
__gdi_entry WINGDIAPI int WINAPI AbortDoc(__in HDC hdc);		__gdi_entry WINGDIAPI int WINAPI AbortDoc(__in HDC hdc);
WINGDIAPI int WINAPI SetAbortProc(__in HDC hdc, __in ABORTPROC proc);		WINGDIAPI int WINAPI SetAbortProc(__in HDC hdc, __in ABORTPROC proc);

WINGDIAPI BOOL WINAPI AbortPath(__in HDC hdc);		WINGDIAPI BOOL WINAPI AbortPath(__in HDC hdc);
WINGDIAPI BOOL WINAPI ArcTo(__in HDC hdc, __in int left, __in int top, __in int right, __in int bottom, __in int xr1, __in int yr1, __in int xr2, __in int yr2);		WINGDIAPI BOOL WINAPI ArcTo(__in HDC hdc, __in int left, __in int top, __in int right, __in int bottom, __in int xr1, __in int yr1, __in int xr2, __in int yr2);
WINGDIAPI BOOL WINAPI BeginPath(__in HDC hdc);		WINGDIAPI BOOL WINAPI BeginPath(__in HDC hdc);
WINGDIAPI BOOL WINAPI CloseFigure(__in HDC hdc);		WINGDIAPI BOOL WINAPI CloseFigure(__in HDC hdc);
WINGDIAPI BOOL WINAPI EndPath(__in HDC hdc);		WINGDIAPI BOOL WINAPI EndPath(__in HDC hdc);
WINGDIAPI BOOL WINAPI FillPath(__in HDC hdc);		WINGDIAPI BOOL WINAPI FillPath(__in HDC hdc);
WINGDIAPI BOOL WINAPI FlattenPath(__in HDC hdc);		WINGDIAPI BOOL WINAPI FlattenPath(__in HDC hdc);

WINGDIAPI int WINAPI GetPath(__in HDC hdc, __out_ecount(cpt) LPPOINT apt, __out _ecount(cpt) LPBYTE aj, int cpt);		WINGDIAPI int WINAPI GetPath(__in HDC hdc, __out_ecount_opt(cpt) LPPOINT apt, _ _out_ecount_opt(cpt) LPBYTE aj, int cpt);
WINGDIAPI HRGN WINAPI PathToRegion(__in HDC hdc);		WINGDIAPI HRGN WINAPI PathToRegion(__in HDC hdc);
WINGDIAPI BOOL WINAPI PolyDraw(__in HDC hdc, __in_ecount(cpt) CONST POINT * apt, __in_ecount(cpt) CONST BYTE * aj, __in int cpt);		WINGDIAPI BOOL WINAPI PolyDraw(__in HDC hdc, __in_ecount(cpt) CONST POINT * apt, __in_ecount(cpt) CONST BYTE * aj, __in int cpt);
WINGDIAPI BOOL WINAPI SelectClipPath(__in HDC hdc, __in int mode);		WINGDIAPI BOOL WINAPI SelectClipPath(__in HDC hdc, __in int mode);
WINGDIAPI int WINAPI SetArcDirection(__in HDC hdc, __in int dir);		WINGDIAPI int WINAPI SetArcDirection(__in HDC hdc, __in int dir);
WINGDIAPI BOOL WINAPI SetMiterLimit(__in HDC hdc, __in FLOAT limit, __out_opt PF LOAT old);		WINGDIAPI BOOL WINAPI SetMiterLimit(__in HDC hdc, __in FLOAT limit, __out_opt PF LOAT old);
WINGDIAPI BOOL WINAPI StrokeAndFillPath(__in HDC hdc);		WINGDIAPI BOOL WINAPI StrokeAndFillPath(__in HDC hdc);
WINGDIAPI BOOL WINAPI StrokePath(__in HDC hdc);		WINGDIAPI BOOL WINAPI StrokePath(__in HDC hdc);
WINGDIAPI BOOL WINAPI WidenPath(__in HDC hdc);		WINGDIAPI BOOL WINAPI WidenPath(__in HDC hdc);
WINGDIAPI HPEN WINAPI ExtCreatePen( __in DWORD iPenStyle,		WINGDIAPI HPEN WINAPI ExtCreatePen( __in DWORD iPenStyle,
__in DWORD cWidth,		__in DWORD cWidth,

skipping to change at line 5028		skipping to change at line 5367
typedef struct tagEMREXTCREATEPEN		typedef struct tagEMREXTCREATEPEN
{		{
EMR emr;		EMR emr;
DWORD ihPen; // Pen handle index		DWORD ihPen; // Pen handle index
DWORD offBmi; // Offset to the BITMAPINFO structure if any		DWORD offBmi; // Offset to the BITMAPINFO structure if any
DWORD cbBmi; // Size of the BITMAPINFO structure if any		DWORD cbBmi; // Size of the BITMAPINFO structure if any
// The bitmap info is followed by the bitmap		// The bitmap info is followed by the bitmap
// bits to form a packed DIB.		// bits to form a packed DIB.
DWORD offBits; // Offset to the brush bitmap bits if any		DWORD offBits; // Offset to the brush bitmap bits if any
DWORD cbBits; // Size of the brush bitmap bits if any		DWORD cbBits; // Size of the brush bitmap bits if any

EXTLOGPEN elp; // The extended pen with the style array.		EXTLOGPEN32 elp; // The extended pen with the style array.
} EMREXTCREATEPEN, *PEMREXTCREATEPEN;		} EMREXTCREATEPEN, *PEMREXTCREATEPEN;

typedef struct tagEMRCREATEBRUSHINDIRECT		typedef struct tagEMRCREATEBRUSHINDIRECT
{		{
EMR emr;		EMR emr;
DWORD ihBrush; // Brush handle index		DWORD ihBrush; // Brush handle index
LOGBRUSH32 lb; // The style must be BS_SOLID, BS_HOLLOW,		LOGBRUSH32 lb; // The style must be BS_SOLID, BS_HOLLOW,
// BS_NULL or BS_HATCHED.		// BS_NULL or BS_HATCHED.
} EMRCREATEBRUSHINDIRECT, *PEMRCREATEBRUSHINDIRECT;		} EMRCREATEBRUSHINDIRECT, *PEMRCREATEBRUSHINDIRECT;


skipping to change at line 5397		skipping to change at line 5736
WINGDIAPI DWORD WINAPI wglSwapMultipleBuffers(UINT, CONST WGLSWAP *);		WINGDIAPI DWORD WINAPI wglSwapMultipleBuffers(UINT, CONST WGLSWAP *);

#endif // (WINVER >= 0x0500)		#endif // (WINVER >= 0x0500)

#endif /* NOGDI */		#endif /* NOGDI */

#ifdef __cplusplus		#ifdef __cplusplus
}		}
#endif		#endif


		#if _MSC_VER >= 1200
		#pragma warning(pop)
		#endif

#endif /* _WINGDI_ */		#endif /* _WINGDI_ */

End of changes. 20 change blocks.
20 lines changed or deleted		364 lines changed or added

This html diff was produced by rfcdiff 1.41.