Split off wingdi16.h from wingdi.h. Add many more #defines/typedefs
to bring wingdi.h almost upto a complete NT4.0 interface.
Fix return value of SetRectRgn().
diff --git a/include/wingdi.h b/include/wingdi.h
index e60a3c0..a74ccf5 100644
--- a/include/wingdi.h
+++ b/include/wingdi.h
@@ -17,12 +17,7 @@
FLOAT abcfC;
} ABCFLOAT, *PABCFLOAT, *LPABCFLOAT;
-typedef struct
-{
- WORD wFirst;
- WORD wSecond;
- INT16 iKernAmount;
-} KERNINGPAIR16, *LPKERNINGPAIR16;
+#define FONTMAPPER_MAX 10
typedef struct
{
@@ -31,29 +26,6 @@
INT iKernAmount;
} KERNINGPAIR, *LPKERNINGPAIR;
-
-typedef struct
-{
- HDC16 hdc;
- BOOL16 fErase;
- RECT16 rcPaint;
- BOOL16 fRestore;
- BOOL16 fIncUpdate;
- BYTE rgbReserved[16];
-} PAINTSTRUCT16, *LPPAINTSTRUCT16;
-
-typedef struct
-{
- HDC hdc;
- BOOL fErase;
- RECT rcPaint;
- BOOL fRestore;
- BOOL fIncUpdate;
- BYTE rgbReserved[32];
-} PAINTSTRUCT, *PPAINTSTRUCT, *LPPAINTSTRUCT;
-
-
-
typedef struct tagPIXELFORMATDESCRIPTOR {
WORD nSize;
WORD nVersion;
@@ -83,6 +55,31 @@
DWORD dwDamageMask;
} PIXELFORMATDESCRIPTOR, *LPPIXELFORMATDESCRIPTOR;
+#define PFD_TYPE_RGBA 0
+#define PFD_TYPE_COLORINDEX 1
+
+#define PFD_MAIN_PLANE 0
+#define PFD_OVERLAY_PLANE 1
+#define PFD_UNDERLAY_PLANE (-1)
+
+#define PFD_DOUBLEBUFFER 0x00000001
+#define PFD_STEREO 0x00000002
+#define PFD_DRAW_TO_WINDOW 0x00000004
+#define PFD_DRAW_TO_BITMAP 0x00000008
+#define PFD_SUPPORT_GDI 0x00000010
+#define PFD_SUPPORT_OPENGL 0x00000020
+#define PFD_GENERIC_FORMAT 0x00000040
+#define PFD_NEED_PALETTE 0x00000080
+#define PFD_NEED_SYSTEM_PALETTE 0x00000100
+#define PFD_SWAP_EXCHANGE 0x00000200
+#define PFD_SWAP_COPY 0x00000400
+#define PFD_SWAP_LAYER_BUFFERS 0x00000800
+#define PFD_GENERIC_ACCELERATED 0x00001000
+
+#define PFD_DEPTH_DONTCARE 0x20000000
+#define PFD_DOUBLEBUFFER_DONTCARE 0x40000000
+#define PFD_STEREO_DONTCARE 0x80000000
+
typedef struct tagCOLORADJUSTMENT
{
WORD caSize;
@@ -99,11 +96,52 @@
SHORT caRedGreenTint;
} COLORADJUSTMENT, *PCOLORADJUSTMENT, *LPCOLORADJUSTMENT;
+#define CA_NEGATIVE 0x0001
+#define CA_LOG_FILTER 0x0002
+
+#define ILLUMINANT_DEVICE_DEFAULT 0
+#define ILLUMINANT_A 1
+#define ILLUMINANT_B 2
+#define ILLUMINANT_C 3
+#define ILLUMINANT_D50 4
+#define ILLUMINANT_D55 5
+#define ILLUMINANT_D65 6
+#define ILLUMINANT_D75 7
+#define ILLUMINANT_F2 8
+#define ILLUMINANT_MAX_INDEX ILLUMINANT_F2
+
+#define ILLUMINANT_TUNGSTEN ILLUMINANT_A
+#define ILLUMINANT_DAYLIGHT ILLUMINANT_C
+#define ILLUMINANT_FLUORESCENT ILLUMINANT_F2
+#define ILLUMINANT_NTSC ILLUMINANT_C
+
+#define RGB_GAMMA_MIN (WORD)02500
+#define RGB_GAMMA_MAX (WORD)65000
+
+#define REFERENCE_WHITE_MIN (WORD)6000
+#define REFERENCE_WHITE_MAX (WORD)10000
+#define REFERENCE_BLACK_MIN (WORD)0
+#define REFERENCE_BLACK_MAX (WORD)4000
+
+#define COLOR_ADJ_MIN ((SHORT)-100)
+#define COLOR_ADJ_MAX (SHORT) 100
+
typedef LONG FXPT16DOT16, *LPFXPT16DOT16;
typedef LONG FXPT2DOT30, *LPFXPT2DOT30;
typedef LONG LCSCSTYPE;
typedef LONG LCSGAMUTMATCH;
+#define LCS_CALIBRATED_RGB 0x00000000L
+#define LCS_DEVICE_RGB 0x00000001L
+#define LCS_DEVICE_CMYK 0x00000002L
+
+#define LCS_GM_BUSINESS 0x00000001L
+#define LCS_GM_GRAPHICS 0x00000002L
+#define LCS_GM_IMAGES 0x00000004L
+
+#define CM_OUT_OF_GAMUT 255
+#define CM_IN_GAMUT 0
+
typedef struct tagCIEXYZ
{
FXPT2DOT30 ciexyzX;
@@ -174,6 +212,20 @@
#define DC_MANUFACTURER 23
#define DC_MODEL 24
+#define DCTT_BITMAP 0x00000001L
+#define DCTT_DOWNLOAD 0x00000002L
+#define DCTT_SUBDEV 0x00000004L
+#define DCTT_DOWNLOAD_OUTLINE 0x00000008L
+
+#define DCBA_FACEUPNONE 0x0000
+#define DCBA_FACEUPCENTER 0x0001
+#define DCBA_FACEUPLEFT 0x0002
+#define DCBA_FACEUPRIGHT 0x0003
+#define DCBA_FACEDOWNNONE 0x0100
+#define DCBA_FACEDOWNCENTER 0x0101
+#define DCBA_FACEDOWNLEFT 0x0102
+#define DCBA_FACEDOWNRIGHT 0x0103
+
/* Flag returned from Escape QUERYDIBSUPPORT */
#define QDI_SETDIBITS 1
#define QDI_GETDIBITS 2
@@ -181,9 +233,6 @@
#define QDI_STRETCHDIB 8
-#define PR_JOBSTATUS 0x0000
-
-
/* GDI Escape commands */
#define NEWFRAME 1
#define ABORTDOC 2
@@ -267,6 +316,11 @@
#define POSTSCRIPT_PASSTHROUGH 4115
#define ENCAPSULATED_POSTSCRIPT 4116
+#define QDI_SETDIBITS 1
+#define QDI_GETDIBITS 2
+#define QDI_DIBTOSCREEN 4
+#define QDI_STRETCHDIB 8
+
/* Spooler Error Codes */
#define SP_NOTREPORTED 0x4000
#define SP_ERROR (-1)
@@ -275,6 +329,7 @@
#define SP_OUTOFDISK (-4)
#define SP_OUTOFMEMORY (-5)
+#define PR_JOBSTATUS 0
/* Raster operations */
@@ -335,52 +390,13 @@
#define GetGValue(rgb) (((rgb) >> 8) & 0xff)
#define GetBValue(rgb) (((rgb) >> 16) & 0xff)
-#define COLOR_SCROLLBAR 0
-#define COLOR_BACKGROUND 1
-#define COLOR_ACTIVECAPTION 2
-#define COLOR_INACTIVECAPTION 3
-#define COLOR_MENU 4
-#define COLOR_WINDOW 5
-#define COLOR_WINDOWFRAME 6
-#define COLOR_MENUTEXT 7
-#define COLOR_WINDOWTEXT 8
-#define COLOR_CAPTIONTEXT 9
-#define COLOR_ACTIVEBORDER 10
-#define COLOR_INACTIVEBORDER 11
-#define COLOR_APPWORKSPACE 12
-#define COLOR_HIGHLIGHT 13
-#define COLOR_HIGHLIGHTTEXT 14
-#define COLOR_BTNFACE 15
-#define COLOR_BTNSHADOW 16
-#define COLOR_GRAYTEXT 17
-#define COLOR_BTNTEXT 18
-#define COLOR_INACTIVECAPTIONTEXT 19
-#define COLOR_BTNHIGHLIGHT 20
-/* win95 colors */
-#define COLOR_3DDKSHADOW 21
-#define COLOR_3DLIGHT 22
-#define COLOR_INFOTEXT 23
-#define COLOR_INFOBK 24
-#define COLOR_DESKTOP COLOR_BACKGROUND
-#define COLOR_3DFACE COLOR_BTNFACE
-#define COLOR_3DSHADOW COLOR_BTNSHADOW
-#define COLOR_3DHIGHLIGHT COLOR_BTNHIGHLIGHT
-#define COLOR_3DHILIGHT COLOR_BTNHIGHLIGHT
-#define COLOR_BTNHILIGHT COLOR_BTNHIGHLIGHT
-/* win98 colors */
-#define COLOR_ALTERNATEBTNFACE 25 /* undocumented, constant's name unknown */
-#define COLOR_HOTLIGHT 26
-#define COLOR_GRADIENTACTIVECAPTION 27
-#define COLOR_GRADIENTINACTIVECAPTION 28
+#define GetKValue(cmyk) ((BYTE) (cmyk) )
+#define GetYValue(cmyk) ((BYTE) ((cymk) >> 8))
+#define GetMValue(cmyk) ((BYTE) ((cymk) >> 16))
+#define GetCValue(cmyk) ((BYTE) ((cymk) >> 24))
- /* WM_CTLCOLOR values */
-#define CTLCOLOR_MSGBOX 0
-#define CTLCOLOR_EDIT 1
-#define CTLCOLOR_LISTBOX 2
-#define CTLCOLOR_BTN 3
-#define CTLCOLOR_DLG 4
-#define CTLCOLOR_SCROLLBAR 5
-#define CTLCOLOR_STATIC 6
+#define CMYK(c,m,y,k) ((COLOREF)((((BYTE)(k)|((WORD)((BYTE)(y))<<8))|(((DWORD)(BYTE)(m))<<16))|(((DWORD)(BYTE)(c))<<24)))
+
#define ICM_OFF 1
#define ICM_ON 2
@@ -394,18 +410,16 @@
#define DCB_ENABLE 0x0004
#define DCB_DISABLE 0x0008
- /* Bitmaps */
-
typedef struct
{
- INT16 bmType;
- INT16 bmWidth;
- INT16 bmHeight;
- INT16 bmWidthBytes;
- BYTE bmPlanes;
- BYTE bmBitsPixel;
- SEGPTR bmBits WINE_PACKED;
-} BITMAP16, *LPBITMAP16;
+ LONG paXCount;
+ LONG paYCount;
+ LONG paXExt;
+ LONG paYExt;
+ BYTE paRGBs;
+} PELARRAY, *PPELARRAY;
+
+ /* Bitmaps */
typedef struct
{
@@ -415,7 +429,7 @@
INT bmWidthBytes;
WORD bmPlanes;
WORD bmBitsPixel;
- LPVOID bmBits WINE_PACKED;
+ LPVOID bmBits;
} BITMAP, *LPBITMAP;
@@ -423,18 +437,13 @@
typedef struct
{
- UINT16 lbStyle;
- COLORREF lbColor WINE_PACKED;
- INT16 lbHatch;
-} LOGBRUSH16, *LPLOGBRUSH16;
-
-typedef struct
-{
UINT lbStyle;
COLORREF lbColor;
INT lbHatch;
} LOGBRUSH, *LPLOGBRUSH;
+typedef LOGBRUSH PATTERN, *PPATTERN;
+
/* Brush styles */
#define BS_SOLID 0
@@ -468,29 +477,11 @@
typedef struct
{
- INT16 lfHeight;
- INT16 lfWidth;
- INT16 lfEscapement;
- INT16 lfOrientation;
- INT16 lfWeight;
- BYTE lfItalic;
- BYTE lfUnderline;
- BYTE lfStrikeOut;
- BYTE lfCharSet;
- BYTE lfOutPrecision;
- BYTE lfClipPrecision;
- BYTE lfQuality;
- BYTE lfPitchAndFamily;
- CHAR lfFaceName[LF_FACESIZE] WINE_PACKED;
-} LOGFONT16, *LPLOGFONT16;
-
-typedef struct
-{
- INT lfHeight;
- INT lfWidth;
- INT lfEscapement;
- INT lfOrientation;
- INT lfWeight;
+ LONG lfHeight;
+ LONG lfWidth;
+ LONG lfEscapement;
+ LONG lfOrientation;
+ LONG lfWeight;
BYTE lfItalic;
BYTE lfUnderline;
BYTE lfStrikeOut;
@@ -504,11 +495,11 @@
typedef struct
{
- INT lfHeight;
- INT lfWidth;
- INT lfEscapement;
- INT lfOrientation;
- INT lfWeight;
+ LONG lfHeight;
+ LONG lfWidth;
+ LONG lfEscapement;
+ LONG lfOrientation;
+ LONG lfWeight;
BYTE lfItalic;
BYTE lfUnderline;
BYTE lfStrikeOut;
@@ -526,47 +517,32 @@
typedef struct
{
- LOGFONT16 elfLogFont;
- BYTE elfFullName[LF_FULLFACESIZE] WINE_PACKED;
- BYTE elfStyle[LF_FACESIZE] WINE_PACKED;
-} ENUMLOGFONT16, *LPENUMLOGFONT16;
-
-typedef struct
-{
LOGFONTA elfLogFont;
- BYTE elfFullName[LF_FULLFACESIZE] WINE_PACKED;
- BYTE elfStyle[LF_FACESIZE] WINE_PACKED;
+ BYTE elfFullName[LF_FULLFACESIZE];
+ BYTE elfStyle[LF_FACESIZE];
} ENUMLOGFONTA, *LPENUMLOGFONTA;
typedef struct
{
LOGFONTW elfLogFont;
- WCHAR elfFullName[LF_FULLFACESIZE] WINE_PACKED;
- WCHAR elfStyle[LF_FACESIZE] WINE_PACKED;
+ WCHAR elfFullName[LF_FULLFACESIZE];
+ WCHAR elfStyle[LF_FACESIZE];
} ENUMLOGFONTW, *LPENUMLOGFONTW;
typedef struct
{
- LOGFONT16 elfLogFont;
- BYTE elfFullName[LF_FULLFACESIZE] WINE_PACKED;
- BYTE elfStyle[LF_FACESIZE] WINE_PACKED;
- BYTE elfScript[LF_FACESIZE] WINE_PACKED;
-} ENUMLOGFONTEX16, *LPENUMLOGFONTEX16;
-
-typedef struct
-{
LOGFONTA elfLogFont;
- BYTE elfFullName[LF_FULLFACESIZE] WINE_PACKED;
- BYTE elfStyle[LF_FACESIZE] WINE_PACKED;
- BYTE elfScript[LF_FACESIZE] WINE_PACKED;
+ BYTE elfFullName[LF_FULLFACESIZE];
+ BYTE elfStyle[LF_FACESIZE];
+ BYTE elfScript[LF_FACESIZE];
} ENUMLOGFONTEXA,*LPENUMLOGFONTEXA;
typedef struct
{
LOGFONTW elfLogFont;
- WCHAR elfFullName[LF_FULLFACESIZE] WINE_PACKED;
- WCHAR elfStyle[LF_FACESIZE] WINE_PACKED;
- WCHAR elfScript[LF_FACESIZE] WINE_PACKED;
+ WCHAR elfFullName[LF_FULLFACESIZE];
+ WCHAR elfStyle[LF_FACESIZE];
+ WCHAR elfScript[LF_FACESIZE];
} ENUMLOGFONTEXW,*LPENUMLOGFONTEXW;
DECL_WINELIB_TYPE_AW(ENUMLOGFONT)
@@ -603,10 +579,20 @@
#define TCI_SRCCODEPAGE 2
#define TCI_SRCFONTSIG 3
+typedef struct
+{
+ DWORD lsUsb[4];
+ DWORD lsCsbDefault[2];
+ DWORD lsCsbSupported[2];
+} LOCALESIGNATURE, *PLOCALESIGNATURE;
+
+
/* Flags for ModifyWorldTransform */
#define MWT_IDENTITY 1
#define MWT_LEFTMULTIPLY 2
#define MWT_RIGHTMULTIPLY 3
+#define MWT_MIN MWT_INDENTITY
+#define MWT_MAX MWT_RIGHTMULTIPLY
/* Object Definitions for EnumObjects() */
#define OBJ_PEN 1
@@ -623,7 +609,6 @@
#define OBJ_ENHMETADC 12
#define OBJ_ENHMETAFILE 13
-
typedef struct
{
FLOAT eM11;
@@ -634,59 +619,6 @@
FLOAT eDy;
} XFORM, *LPXFORM;
-typedef struct
-{
- INT16 txfHeight;
- INT16 txfWidth;
- INT16 txfEscapement;
- INT16 txfOrientation;
- INT16 txfWeight;
- CHAR txfItalic;
- CHAR txfUnderline;
- CHAR txfStrikeOut;
- CHAR txfOutPrecision;
- CHAR txfClipPrecision;
- INT16 txfAccelerator WINE_PACKED;
- INT16 txfOverhang WINE_PACKED;
-} TEXTXFORM16, *LPTEXTXFORM16;
-
-typedef struct
-{
- INT16 dfType;
- INT16 dfPoints;
- INT16 dfVertRes;
- INT16 dfHorizRes;
- INT16 dfAscent;
- INT16 dfInternalLeading;
- INT16 dfExternalLeading;
- CHAR dfItalic;
- CHAR dfUnderline;
- CHAR dfStrikeOut;
- INT16 dfWeight;
- BYTE dfCharSet;
- INT16 dfPixWidth;
- INT16 dfPixHeight;
- CHAR dfPitchAndFamily;
- INT16 dfAvgWidth;
- INT16 dfMaxWidth;
- CHAR dfFirstChar;
- CHAR dfLastChar;
- CHAR dfDefaultChar;
- CHAR dfBreakChar;
- INT16 dfWidthBytes;
- LONG dfDevice;
- LONG dfFace;
- LONG dfBitsPointer;
- LONG dfBitsOffset;
- CHAR dfReserved;
- LONG dfFlags;
- INT16 dfAspace;
- INT16 dfBspace;
- INT16 dfCspace;
- LONG dfColorPointer;
- LONG dfReserved1[4];
-} FONTINFO16, *LPFONTINFO16;
-
/* lfWeight values */
#define FW_DONTCARE 0
#define FW_THIN 100
@@ -723,6 +655,7 @@
#define EASTEUROPE_CHARSET EE_CHARSET
#define THAI_CHARSET (BYTE)222 /* CP874, iso8859-11, tis620 */
#define JOHAB_CHARSET (BYTE)130 /* korean (johab) CP1361 */
+#define MAC_CHARSET (BYTE)77
#define OEM_CHARSET (BYTE)255
/* I don't know if the values of *_CHARSET macros are defined in Windows
* or if we can choose them as we want. -- srtxg
@@ -733,6 +666,23 @@
#define ISO3_CHARSET (BYTE)243 /* iso8859-3 */
#define ISO4_CHARSET (BYTE)244 /* iso8859-4 */
+#define FS_LATIN1 0x00000001L
+#define FS_LATIN2 0x00000002L
+#define FS_CYRILLIC 0x00000004L
+#define FS_GREEK 0x00000008L
+#define FS_TURKISH 0x00000010L
+#define FS_HEBREW 0x00000020L
+#define FS_ARABIC 0x00000040L
+#define FS_BALTIC 0x00000080L
+#define FS_VIETNAMESE 0x00000100L
+#define FS_THAI 0x00010000L
+#define FS_JISJAPAN 0x00020000L
+#define FS_CHINESESIMP 0x00040000L
+#define FS_WANSUNG 0x00080000L
+#define FS_CHINESETRAD 0x00100000L
+#define FS_JOHAB 0x00200000L
+#define FS_SYMBOL 0x80000000L
+
/* lfOutPrecision values */
#define OUT_DEFAULT_PRECIS 0
#define OUT_STRING_PRECIS 1
@@ -742,6 +692,7 @@
#define OUT_DEVICE_PRECIS 5
#define OUT_RASTER_PRECIS 6
#define OUT_TT_ONLY_PRECIS 7
+#define OUT_OUTLINE_PRECIS 8
/* lfClipPrecision values */
#define CLIP_DEFAULT_PRECIS 0x00
@@ -753,14 +704,18 @@
#define CLIP_EMBEDDED 0x80
/* lfQuality values */
-#define DEFAULT_QUALITY 0
-#define DRAFT_QUALITY 1
-#define PROOF_QUALITY 2
+#define DEFAULT_QUALITY 0
+#define DRAFT_QUALITY 1
+#define PROOF_QUALITY 2
+#define NONANTIALIASED_QUALITY 3
+#define ANTIALIASED_QUALITY 4
/* lfPitchAndFamily pitch values */
#define DEFAULT_PITCH 0x00
#define FIXED_PITCH 0x01
#define VARIABLE_PITCH 0x02
+#define MONO_FONT 0x08
+
#define FF_DONTCARE 0x00
#define FF_ROMAN 0x10
#define FF_SWISS 0x20
@@ -770,41 +725,17 @@
typedef struct
{
- INT16 tmHeight;
- INT16 tmAscent;
- INT16 tmDescent;
- INT16 tmInternalLeading;
- INT16 tmExternalLeading;
- INT16 tmAveCharWidth;
- INT16 tmMaxCharWidth;
- INT16 tmWeight;
- BYTE tmItalic;
- BYTE tmUnderlined;
- BYTE tmStruckOut;
- BYTE tmFirstChar;
- BYTE tmLastChar;
- BYTE tmDefaultChar;
- BYTE tmBreakChar;
- BYTE tmPitchAndFamily;
- BYTE tmCharSet;
- INT16 tmOverhang WINE_PACKED;
- INT16 tmDigitizedAspectX WINE_PACKED;
- INT16 tmDigitizedAspectY WINE_PACKED;
-} TEXTMETRIC16, *LPTEXTMETRIC16;
-
-typedef struct
-{
- INT tmHeight;
- INT tmAscent;
- INT tmDescent;
- INT tmInternalLeading;
- INT tmExternalLeading;
- INT tmAveCharWidth;
- INT tmMaxCharWidth;
- INT tmWeight;
- INT tmOverhang;
- INT tmDigitizedAspectX;
- INT tmDigitizedAspectY;
+ LONG tmHeight;
+ LONG tmAscent;
+ LONG tmDescent;
+ LONG tmInternalLeading;
+ LONG tmExternalLeading;
+ LONG tmAveCharWidth;
+ LONG tmMaxCharWidth;
+ LONG tmWeight;
+ LONG tmOverhang;
+ LONG tmDigitizedAspectX;
+ LONG tmDigitizedAspectY;
BYTE tmFirstChar;
BYTE tmLastChar;
BYTE tmDefaultChar;
@@ -818,17 +749,17 @@
typedef struct
{
- INT tmHeight;
- INT tmAscent;
- INT tmDescent;
- INT tmInternalLeading;
- INT tmExternalLeading;
- INT tmAveCharWidth;
- INT tmMaxCharWidth;
- INT tmWeight;
- INT tmOverhang;
- INT tmDigitizedAspectX;
- INT tmDigitizedAspectY;
+ LONG tmHeight;
+ LONG tmAscent;
+ LONG tmDescent;
+ LONG tmInternalLeading;
+ LONG tmExternalLeading;
+ LONG tmAveCharWidth;
+ LONG tmMaxCharWidth;
+ LONG tmWeight;
+ LONG tmOverhang;
+ LONG tmDigitizedAspectX;
+ LONG tmDigitizedAspectY;
WCHAR tmFirstChar;
WCHAR tmLastChar;
WCHAR tmDefaultChar;
@@ -858,6 +789,19 @@
BYTE bXHeight;
} PANOSE;
+#define PANOSE_COUNT 10
+
+#define PANOSE_FAMILYTYPE_INDEX 0
+#define PAN_SERIFSTYLE_INDEX 1
+#define PAN_WEIGTH_INDEX 2
+#define PAN_PROPORTION_INDEX 3
+#define PAN_CONTRAST_INDEX 4
+#define PAN_STROKEVARIATION_INDEX 5
+#define PAN_ARMSTYLE_INDEX 6
+#define PAN_LETTERFORM_INDEX 7
+#define PAN_MIDLINE_INDEX 8
+#define PAN_XHEIGHT_INDEX 9
+
#define PAN_CULTURE_LATIN 0
#define PAN_ANY 0
@@ -998,6 +942,9 @@
DECL_WINELIB_TYPE_AW(EXTLOGFONT)
DECL_WINELIB_TYPE_AW(PEXTLOGFONT)
+#define ELF_VERSION 0
+#define ELF_CULTURE_LATIN 0
+
typedef struct _OUTLINETEXTMETRICA
{
UINT otmSize;
@@ -1070,45 +1017,33 @@
LPSTR otmpFullName;
} OUTLINETEXTMETRICW, *LPOUTLINETEXTMETRICW;
-typedef struct _OUTLINETEXTMETRIC16
-{
- UINT16 otmSize;
- TEXTMETRIC16 otmTextMetrics;
- BYTE otmFilter;
- PANOSE otmPanoseNumber;
- UINT16 otmfsSelection;
- UINT16 otmfsType;
- INT16 otmsCharSlopeRise;
- INT16 otmsCharSlopeRun;
- INT16 otmItalicAngle;
- UINT16 otmEMSquare;
- INT16 otmAscent;
- INT16 otmDescent;
- UINT16 otmLineGap;
- UINT16 otmsCapEmHeight;
- UINT16 otmsXHeight;
- RECT16 otmrcFontBox;
- INT16 otmMacAscent;
- INT16 otmMacDescent;
- UINT16 otmMacLineGap;
- UINT16 otmusMinimumPPEM;
- POINT16 otmptSubscriptSize;
- POINT16 otmptSubscriptOffset;
- POINT16 otmptSuperscriptSize;
- POINT16 otmptSuperscriptOffset;
- UINT16 otmsStrikeoutSize;
- INT16 otmsStrikeoutPosition;
- INT16 otmsUnderscoreSize;
- INT otmsUnderscorePosition;
- LPSTR otmpFamilyName;
- LPSTR otmpFaceName;
- LPSTR otmpStyleName;
- LPSTR otmpFullName;
-} OUTLINETEXTMETRIC16,*LPOUTLINETEXTMETRIC16;
-
DECL_WINELIB_TYPE_AW(OUTLINETEXTMETRIC)
DECL_WINELIB_TYPE_AW(LPOUTLINETEXTMETRIC)
+typedef struct
+{
+ INT x;
+ INT y;
+ UINT n;
+ LPCSTR lpstr;
+ UINT uiFlags;
+ RECT rcl;
+ INT *pdx;
+} POLYTEXTA, *PPOLYTEXTA;
+
+typedef struct
+{
+ INT x;
+ INT y;
+ UINT n;
+ LPCWSTR lpstr;
+ UINT uiFlags;
+ RECT rcl;
+ INT *pdx;
+} POLYTEXTW, *PPOLYTEXTW;
+
+DECL_WINELIB_TYPE_AW(POLYTEXT)
+DECL_WINELIB_TYPE_AW(PPOLYTEXT)
/* ntmFlags field flags */
@@ -1118,45 +1053,17 @@
typedef struct
{
- INT16 tmHeight;
- INT16 tmAscent;
- INT16 tmDescent;
- INT16 tmInternalLeading;
- INT16 tmExternalLeading;
- INT16 tmAveCharWidth;
- INT16 tmMaxCharWidth;
- INT16 tmWeight;
- BYTE tmItalic;
- BYTE tmUnderlined;
- BYTE tmStruckOut;
- BYTE tmFirstChar;
- BYTE tmLastChar;
- BYTE tmDefaultChar;
- BYTE tmBreakChar;
- BYTE tmPitchAndFamily;
- BYTE tmCharSet;
- INT16 tmOverhang WINE_PACKED;
- INT16 tmDigitizedAspectX WINE_PACKED;
- INT16 tmDigitizedAspectY WINE_PACKED;
- DWORD ntmFlags;
- UINT16 ntmSizeEM;
- UINT16 ntmCellHeight;
- UINT16 ntmAvgWidth;
-} NEWTEXTMETRIC16,*LPNEWTEXTMETRIC16;
-
-typedef struct
-{
- INT tmHeight;
- INT tmAscent;
- INT tmDescent;
- INT tmInternalLeading;
- INT tmExternalLeading;
- INT tmAveCharWidth;
- INT tmMaxCharWidth;
- INT tmWeight;
- INT tmOverhang;
- INT tmDigitizedAspectX;
- INT tmDigitizedAspectY;
+ LONG tmHeight;
+ LONG tmAscent;
+ LONG tmDescent;
+ LONG tmInternalLeading;
+ LONG tmExternalLeading;
+ LONG tmAveCharWidth;
+ LONG tmMaxCharWidth;
+ LONG tmWeight;
+ LONG tmOverhang;
+ LONG tmDigitizedAspectX;
+ LONG tmDigitizedAspectY;
BYTE tmFirstChar;
BYTE tmLastChar;
BYTE tmDefaultChar;
@@ -1174,17 +1081,17 @@
typedef struct
{
- INT tmHeight;
- INT tmAscent;
- INT tmDescent;
- INT tmInternalLeading;
- INT tmExternalLeading;
- INT tmAveCharWidth;
- INT tmMaxCharWidth;
- INT tmWeight;
- INT tmOverhang;
- INT tmDigitizedAspectX;
- INT tmDigitizedAspectY;
+ LONG tmHeight;
+ LONG tmAscent;
+ LONG tmDescent;
+ LONG tmInternalLeading;
+ LONG tmExternalLeading;
+ LONG tmAveCharWidth;
+ LONG tmMaxCharWidth;
+ LONG tmWeight;
+ LONG tmOverhang;
+ LONG tmDigitizedAspectX;
+ LONG tmDigitizedAspectY;
WCHAR tmFirstChar;
WCHAR tmLastChar;
WCHAR tmDefaultChar;
@@ -1195,9 +1102,9 @@
BYTE tmPitchAndFamily;
BYTE tmCharSet;
DWORD ntmFlags;
- UINT ntmSizeEM;
- UINT ntmCellHeight;
- UINT ntmAvgWidth;
+ UINT ntmSizeEM;
+ UINT ntmCellHeight;
+ UINT ntmAvgWidth;
} NEWTEXTMETRICW, *LPNEWTEXTMETRICW;
DECL_WINELIB_TYPE_AW(NEWTEXTMETRIC)
@@ -1205,12 +1112,6 @@
typedef struct
{
- NEWTEXTMETRIC16 ntmetm;
- FONTSIGNATURE ntmeFontSignature;
-} NEWTEXTMETRICEX16,*LPNEWTEXTMETRICEX16;
-
-typedef struct
-{
NEWTEXTMETRICA ntmetm;
FONTSIGNATURE ntmeFontSignature;
} NEWTEXTMETRICEXA,*LPNEWTEXTMETRICEXA;
@@ -1224,19 +1125,24 @@
DECL_WINELIB_TYPE_AW(NEWTEXTMETRICEX)
DECL_WINELIB_TYPE_AW(LPNEWTEXTMETRICEX)
-
-typedef INT16 (CALLBACK *FONTENUMPROC16)(SEGPTR,SEGPTR,UINT16,LPARAM);
typedef INT (CALLBACK *FONTENUMPROCA)(LPENUMLOGFONTA,LPNEWTEXTMETRICA,
UINT,LPARAM);
typedef INT (CALLBACK *FONTENUMPROCW)(LPENUMLOGFONTW,LPNEWTEXTMETRICW,
UINT,LPARAM);
DECL_WINELIB_TYPE_AW(FONTENUMPROC)
-typedef INT16 (CALLBACK *FONTENUMPROCEX16)(SEGPTR,SEGPTR,UINT16,LPARAM);
+typedef FONTENUMPROCA OLDFONTENUMPROCA;
+typedef FONTENUMPROCW OLDFONTENUMPROCW;
+
+DECL_WINELIB_TYPE_AW(OLDFONTENUMPROC)
+
typedef INT (CALLBACK *FONTENUMPROCEXA)(LPENUMLOGFONTEXA,LPNEWTEXTMETRICEXA,UINT,LPARAM);
typedef INT (CALLBACK *FONTENUMPROCEXW)(LPENUMLOGFONTEXW,LPNEWTEXTMETRICEXW,UINT,LPARAM);
DECL_WINELIB_TYPE_AW(FONTENUMPROCEX)
+typedef INT (CALLBACK *GOBJENUMPROC)(LPVOID,LPARAM);
+typedef VOID (CALLBACK *LINEDDAPROC)(INT,INT,LPARAM);
+
/* tmPitchAndFamily bits */
#define TMPF_FIXED_PITCH 1 /* means variable pitch */
#define TMPF_VECTOR 2
@@ -1252,39 +1158,49 @@
#define TA_TOP 0x00
#define TA_BOTTOM 0x08
#define TA_BASELINE 0x18
+#define TA_RTLEADING 0x100
+#define TA_MASK TA_BASELINE+TA_CENTER+TA_UPDATECP+TA_RTLEADING
+
+#define VTA_BASELINE TA_BASELINE
+#define VTA_LEFT TA_BOTTOM
+#define VTA_RIGHT TA_TOP
+#define VTA_CENTER TA_CENTER
+#define VTA_BOTTOM TA_RIGHT
+#define VTA_TOP TA_LEFT
+
/* ExtTextOut() parameters */
-#define ETO_GRAYED 0x01
-#define ETO_OPAQUE 0x02
-#define ETO_CLIPPED 0x04
+#define ETO_GRAYED 0x0001
+#define ETO_OPAQUE 0x0002
+#define ETO_CLIPPED 0x0004
+#define ETO_GLYPH_INDEX 0x0010
+#define ETO_RTLEADING 0x0080
+#define ETO_IGNORELANGUAGE 0x1000
-typedef struct
-{
- UINT16 gmBlackBoxX;
- UINT16 gmBlackBoxY;
- POINT16 gmptGlyphOrigin;
- INT16 gmCellIncX;
- INT16 gmCellIncY;
-} GLYPHMETRICS16, *LPGLYPHMETRICS16;
+#define ASPECT_FILTERING 0x0001
typedef struct
{
UINT gmBlackBoxX;
UINT gmBlackBoxY;
POINT gmptGlyphOrigin;
- INT16 gmCellIncX;
- INT16 gmCellIncY;
+ SHORT gmCellIncX;
+ SHORT gmCellIncY;
} GLYPHMETRICS, *LPGLYPHMETRICS;
#define GGO_METRICS 0
#define GGO_BITMAP 1
#define GGO_NATIVE 2
-
+#define GGO_GRAY2_BITMAP 4
+#define GGO_GRAY4_BITMAP 5
+#define GGO_GRAY8_BITMAP 6
+#define GGO_GLYPH_INDEX 0x80
+
typedef struct
{
- UINT16 fract;
- INT16 value;
+ WORD fract;
+ SHORT value;
} FIXED;
typedef struct tagPOINTFX
@@ -1318,13 +1234,6 @@
/* for GetCharABCWidths() */
typedef struct
{
- INT16 abcA;
- UINT16 abcB;
- INT16 abcC;
-} ABC16, *LPABC16;
-
-typedef struct
-{
INT abcA;
UINT abcB;
INT abcC;
@@ -1332,30 +1241,69 @@
/* for GetCharacterPlacement () */
-typedef struct tagGCP_RESULTSA
-{
+
+#define GCP_DBCS 0x0001
+#define GCP_REORDER 0x0002
+#define GCP_USEKERNING 0x0008
+#define GCP_GLYPHSHAPE 0x0010
+#define GCP_LIGATE 0x0020
+#define GCP_DIACRITIC 0x0100
+#define GCP_KASHIDA 0x0200
+#define GCP_ERROR 0x8000
+#define FLI_MASK 0x103b
+#define GCP_JUSTIFY 0x00010000L
+#define FLI_GLYPHS 0x00040000L
+#define GCP_CLASSIN 0x00080000L
+#define GCP_MAXEXTENT 0x00100000L
+#define GCP_JUSTIFYIN 0x00200000L
+#define GCP_DISPLAYZWG 0x00400000L
+#define GCP_SYMSWAPOFF 0x00800000L
+#define GCP_NUMERICOVERRIDE 0x01000000L
+#define GCP_NEUTRALOVERRIDE 0x02000000L
+#define GCP_NUMERICSLATIN 0x04000000L
+#define GCP_NUMERICSLOCAL 0x08000000L
+
+#define GCPCLASS_LATIN 1
+#define GCPCLASS_HEBREW 2
+#define GCPCLASS_ARABIC 3
+#define GCPCLASS_NEUTRAL 4
+#define GCPCLASS_LOCALNUMBER 5
+#define GCPCLASS_LATINNUMBER 6
+#define GCPCLASS_LATINNUMERICTERMINATOR 7
+#define GCPCLASS_LATINNUMERICSEPARATOR 8
+#define GCPCLASS_NUMERICSEPARATOR 9
+#define GCPCLASS_PREBOUNDLTR 0x80
+#define GCPCLASS_PREBOUNDRLT 0x40
+#define GCPCLASS_POSTBOUNDLTR 0x20
+#define GCPCLASS_POSTBOUNDRTL 0x10
+
+#define GCPGLYPH_LINKBEFORE 0x8000
+#define GCPGLYPH_LINKAFTER 0x4000
+
+
+typedef struct tagGCP_RESULTSA{
DWORD lStructSize;
LPSTR lpOutString;
- UINT *lpOrder;
- INT *lpDx;
- INT *lpCaretPos;
+ UINT *lpOrder;
+ INT *lpDx;
+ INT *lpCaretPos;
LPSTR lpClass;
- UINT *lpGlyphs;
- UINT nGlyphs;
- UINT nMaxFit;
+ LPWSTR lpGlyphs;
+ UINT nGlyphs;
+ UINT nMaxFit;
} GCP_RESULTSA;
typedef struct tagGCP_RESULTSW
{
DWORD lStructSize;
LPWSTR lpOutString;
- UINT *lpOrder;
- INT *lpDx;
- INT *lpCaretPos;
+ UINT *lpOrder;
+ INT *lpDx;
+ INT *lpCaretPos;
LPWSTR lpClass;
- UINT *lpGlyphs;
- UINT nGlyphs;
- UINT nMaxFit;
+ LPWSTR lpGlyphs;
+ UINT nGlyphs;
+ UINT nMaxFit;
} GCP_RESULTSW;
DECL_WINELIB_TYPE_AW(GCP_RESULTS)
@@ -1363,9 +1311,9 @@
/* Rasterizer status */
typedef struct
{
- INT16 nSize;
- INT16 wFlags;
- INT16 nLanguageID;
+ SHORT nSize;
+ SHORT wFlags;
+ SHORT nLanguageID;
} RASTERIZER_STATUS, *LPRASTERIZER_STATUS;
#define TT_AVAILABLE 0x0001
@@ -1376,6 +1324,7 @@
#define TT_POLYGON_TYPE 24
/* Get/SetSystemPaletteUse() values */
+#define SYSPAL_ERROR 0
#define SYSPAL_STATIC 1
#define SYSPAL_NOSTATIC 2
@@ -1393,34 +1342,28 @@
{
WORD palVersion;
WORD palNumEntries;
- PALETTEENTRY palPalEntry[1] WINE_PACKED;
+ PALETTEENTRY palPalEntry[1];
} LOGPALETTE, *PLOGPALETTE, *LPLOGPALETTE;
/* Pens */
typedef struct
{
- UINT16 lopnStyle;
- POINT16 lopnWidth WINE_PACKED;
- COLORREF lopnColor WINE_PACKED;
-} LOGPEN16, *LPLOGPEN16;
-
-typedef struct
-{
- UINT lopnStyle;
- POINT lopnWidth WINE_PACKED;
- COLORREF lopnColor WINE_PACKED;
+ UINT lopnStyle;
+ POINT lopnWidth;
+ COLORREF lopnColor;
} LOGPEN, *LPLOGPEN;
typedef struct tagEXTLOGPEN
{
- DWORD elpPenStyle;
- DWORD elpWidth;
- DWORD elpBrushStyle;
- DWORD elpColor;
- DWORD elpNumEntries;
- DWORD elpStyleEntry[1];
+ DWORD elpPenStyle;
+ DWORD elpWidth;
+ UINT elpBrushStyle;
+ COLORREF elpColor;
+ LONG elpHatch;
+ DWORD elpNumEntries;
+ DWORD elpStyleEntry[1];
} EXTLOGPEN, *PEXTLOGPEN, *NPEXTLOGPEN, *LPEXTLOGPEN;
#define PS_SOLID 0x00000000
@@ -1454,13 +1397,15 @@
#define NULLREGION 1
#define SIMPLEREGION 2
#define COMPLEXREGION 3
+#define RGN_ERROR ERROR
#define RGN_AND 1
#define RGN_OR 2
#define RGN_XOR 3
#define RGN_DIFF 4
#define RGN_COPY 5
-
+#define RGN_MIN RGN_AND
+#define RGN_MAX RGN_COPY
/* Device contexts */
/* GetDCEx flags */
@@ -1477,6 +1422,7 @@
/* Polygon modes */
#define ALTERNATE 1
#define WINDING 2
+#define POLYFILL_LAST 2
/* Background modes */
#ifdef TRANSPARENT /*Apparently some broken svr4 includes define TRANSPARENT*/
@@ -1484,7 +1430,7 @@
#endif
#define TRANSPARENT 1
#define OPAQUE 2
-
+#define BKMODE_LAST 2
/* Graphics Modes */
#define GM_COMPATIBLE 1
@@ -1505,6 +1451,10 @@
#define MM_ISOTROPIC 7
#define MM_ANISOTROPIC 8
+#define MM_MIN MM_TEXT
+#define MM_MAX MM_ANISOTROPIC
+#define MM_MAX_FIXEDSCALE MM_TWIPS
+
/* Coordinate modes */
#define ABSOLUTE 1
#define RELATIVE 2
@@ -1543,6 +1493,17 @@
#define NUMRESERVED 106
#define COLORRES 108
+#define PHYSICALWIDTH 110
+#define PHYSICALHEIGHT 111
+#define PHYSICALOFFSETX 112
+#define PHYSICALOFFSETY 113
+#define SCALINGFACTORX 114
+#define SCALINGFACTORY 115
+#define VREFRESH 116
+#define DESKTOPVERTRES 117
+#define DESKTOPHORZRES 118
+#define BTLALIGNMENT 119
+
/* TECHNOLOGY */
#define DT_PLOTTER 0
#define DT_RASDISPLAY 1
@@ -1584,6 +1545,8 @@
#define PC_STYLED 0x0020
#define PC_WIDESTYLED 0x0040
#define PC_INTERIORS 0x0080
+#define PC_POLYPOLYGON 0x0100
+#define PC_PATHS 0x0200
/* TEXTCAPS */
#define TC_OP_CHARACTER 0x0001
@@ -1602,6 +1565,7 @@
#define TC_RA_ABLE 0x2000
#define TC_VA_ABLE 0x4000
#define TC_RESERVED 0x8000
+#define TC_SCROLLBLT 0x00010000
/* CLIPCAPS */
#define CP_NONE 0x0000
@@ -1731,11 +1695,11 @@
typedef struct
{
- UINT16 bfType;
- DWORD bfSize WINE_PACKED;
- UINT16 bfReserved1 WINE_PACKED;
- UINT16 bfReserved2 WINE_PACKED;
- DWORD bfOffBits WINE_PACKED;
+ WORD bfType;
+ DWORD bfSize;
+ WORD bfReserved1;
+ WORD bfReserved2;
+ DWORD bfOffBits;
} BITMAPFILEHEADER;
typedef struct
@@ -1753,10 +1717,36 @@
DWORD biClrImportant;
} BITMAPINFOHEADER, *PBITMAPINFOHEADER, *LPBITMAPINFOHEADER;
+typedef struct
+{
+ DWORD bV4Size;
+ LONG bV4Width;
+ LONG bV4Height;
+ WORD bV4Planes;
+ WORD bV4BitCount;
+ DWORD bV4Compression;
+ DWORD bV4SizeImage;
+ LONG bV4XPelsPerMeter;
+ LONG bV4YPelsPerMeter;
+ DWORD bV4ClrUsed;
+ DWORD bV4ClrImportant;
+ DWORD bV4RedMask;
+ DWORD bV4GreenMask;
+ DWORD bV4BlueMask;
+ DWORD bV4AlphaMask;
+ DWORD bV4CSType;
+ CIEXYZTRIPLE bV4EndPoints;
+ DWORD bV4GammaRed;
+ DWORD bV4GammaGreen;
+ DWORD bV4GammaBlue;
+} BITMAPV4HEADER, *PBITMAPV4HEADER;
+
+
/* biCompression */
#define BI_RGB 0
#define BI_RLE8 1
#define BI_RLE4 2
+#define BI_BITFIELDS 3
typedef struct {
BITMAPINFOHEADER bmiHeader;
@@ -1769,10 +1759,10 @@
typedef struct
{
DWORD bcSize;
- UINT16 bcWidth;
- UINT16 bcHeight;
- UINT16 bcPlanes;
- UINT16 bcBitCount;
+ WORD bcWidth;
+ WORD bcHeight;
+ WORD bcPlanes;
+ WORD bcBitCount;
} BITMAPCOREHEADER, *LPBITMAPCOREHEADER;
typedef struct
@@ -1817,15 +1807,16 @@
#define STOCK_LAST 17
+#define CLR_INVALID 0xffffffff
/* Metafile header structure */
typedef struct
{
WORD mtType;
WORD mtHeaderSize;
WORD mtVersion;
- DWORD mtSize WINE_PACKED;
+ DWORD mtSize;
WORD mtNoObjects;
- DWORD mtMaxRecord WINE_PACKED;
+ DWORD mtMaxRecord;
WORD mtNoParameters;
} METAHEADER;
@@ -1843,11 +1834,6 @@
typedef struct
{
- HGDIOBJ16 objectHandle[1];
-} HANDLETABLE16, *LPHANDLETABLE16;
-
-typedef struct
-{
HGDIOBJ objectHandle[1];
} HANDLETABLE, *LPHANDLETABLE;
@@ -1855,17 +1841,9 @@
/* Clipboard metafile picture structure */
typedef struct
{
- INT16 mm;
- INT16 xExt;
- INT16 yExt;
- HMETAFILE16 hMF;
-} METAFILEPICT16, *LPMETAFILEPICT16;
-
-typedef struct
-{
- INT mm;
- INT xExt;
- INT yExt;
+ LONG mm;
+ LONG xExt;
+ LONG yExt;
HMETAFILE hMF;
} METAFILEPICT, *LPMETAFILEPICT;
@@ -1951,8 +1929,6 @@
#define META_CREATEREGION 0x06FF
#define META_UNKNOWN 0x0529 /* FIXME: unknown meta magic */
-typedef INT16 (CALLBACK *MFENUMPROC16)(HDC16,HANDLETABLE16*,METARECORD*,
- INT16,LPARAM);
typedef INT (CALLBACK *MFENUMPROC)(HDC,HANDLETABLE*,METARECORD*,
INT,LPARAM);
@@ -2201,7 +2177,7 @@
EMR emr;
DWORD cbData;
BYTE Data[1];
-} EMRGDICOMMENT, *PEMRGDICOMMENT;
+} EMRGDICMMENT, *PEMRGDICOMMENT;
#if 0
typedef struct {
@@ -2625,7 +2601,18 @@
#define EMR_GLSBOUNDEDRECORD 103
#define EMR_PIXELFORMAT 104
+#define EMR_MIN 1
+#define EMR_MAX 104
+
#define ENHMETA_SIGNATURE 1179469088
+#define ENHMETA_STOCK_OBJECT 0x80000000
+
+#define GDICPMMENT_INDENTIFIER 0x43494447
+#define GDICOMMENT_WINDOWS_METAFILE 0x80000000
+#define GDICOMMENT_BEGINGROUP 0x80000001
+#define GDICOMMENT_ENDGROUP 0x80000002
+#define GDICOMMENT_MULTIFORMATS 0x80000003
+#define EPS_SIGNATURE 0x46535045
#define CCHDEVICENAME 32
#define CCHFORMNAME 32
@@ -2638,49 +2625,19 @@
WORD dmSize;
WORD dmDriverExtra;
DWORD dmFields;
- INT16 dmOrientation;
- INT16 dmPaperSize;
- INT16 dmPaperLength;
- INT16 dmPaperWidth;
- INT16 dmScale;
- INT16 dmCopies;
- INT16 dmDefaultSource;
- INT16 dmPrintQuality;
- INT16 dmColor;
- INT16 dmDuplex;
- INT16 dmYResolution;
- INT16 dmTTOption;
- INT16 dmCollate;
- BYTE dmFormName[CCHFORMNAME];
- WORD dmUnusedPadding;
- WORD dmBitsPerPel;
- DWORD dmPelsWidth;
- DWORD dmPelsHeight;
- DWORD dmDisplayFlags;
- DWORD dmDisplayFrequency;
-} DEVMODE16, *LPDEVMODE16;
-
-typedef struct
-{
- BYTE dmDeviceName[CCHDEVICENAME];
- WORD dmSpecVersion;
- WORD dmDriverVersion;
- WORD dmSize;
- WORD dmDriverExtra;
- DWORD dmFields;
- INT16 dmOrientation;
- INT16 dmPaperSize;
- INT16 dmPaperLength;
- INT16 dmPaperWidth;
- INT16 dmScale;
- INT16 dmCopies;
- INT16 dmDefaultSource;
- INT16 dmPrintQuality;
- INT16 dmColor;
- INT16 dmDuplex;
- INT16 dmYResolution;
- INT16 dmTTOption;
- INT16 dmCollate;
+ SHORT dmOrientation;
+ SHORT dmPaperSize;
+ SHORT dmPaperLength;
+ SHORT dmPaperWidth;
+ SHORT dmScale;
+ SHORT dmCopies;
+ SHORT dmDefaultSource;
+ SHORT dmPrintQuality;
+ SHORT dmColor;
+ SHORT dmDuplex;
+ SHORT dmYResolution;
+ SHORT dmTTOption;
+ SHORT dmCollate;
BYTE dmFormName[CCHFORMNAME];
WORD dmLogPixels;
DWORD dmBitsPerPel;
@@ -2694,6 +2651,8 @@
DWORD dmDitherType;
DWORD dmReserved1;
DWORD dmReserved2;
+ DWORD dmPanningWidth;
+ DWORD dmPanningHeight;
} DEVMODEA, *PDEVMODEA, *LPDEVMODEA;
typedef struct
@@ -2704,19 +2663,19 @@
WORD dmSize;
WORD dmDriverExtra;
DWORD dmFields;
- INT16 dmOrientation;
- INT16 dmPaperSize;
- INT16 dmPaperLength;
- INT16 dmPaperWidth;
- INT16 dmScale;
- INT16 dmCopies;
- INT16 dmDefaultSource;
- INT16 dmPrintQuality;
- INT16 dmColor;
- INT16 dmDuplex;
- INT16 dmYResolution;
- INT16 dmTTOption;
- INT16 dmCollate;
+ SHORT dmOrientation;
+ SHORT dmPaperSize;
+ SHORT dmPaperLength;
+ SHORT dmPaperWidth;
+ SHORT dmScale;
+ SHORT dmCopies;
+ SHORT dmDefaultSource;
+ SHORT dmPrintQuality;
+ SHORT dmColor;
+ SHORT dmDuplex;
+ SHORT dmYResolution;
+ SHORT dmTTOption;
+ SHORT dmCollate;
WCHAR dmFormName[CCHFORMNAME];
WORD dmLogPixels;
DWORD dmBitsPerPel;
@@ -2730,12 +2689,15 @@
DWORD dmDitherType;
DWORD dmReserved1;
DWORD dmReserved2;
+ DWORD dmPanningWidth;
+ DWORD dmPanningHeight;
} DEVMODEW, *PDEVMODEW, *LPDEVMODEW;
DECL_WINELIB_TYPE_AW(DEVMODE)
DECL_WINELIB_TYPE_AW(PDEVMODE)
DECL_WINELIB_TYPE_AW(LPDEVMODE)
+#define DM_SPECVERSION 0x401
#define DM_UPDATE 1
#define DM_COPY 2
#define DM_PROMPT 4
@@ -2763,23 +2725,28 @@
#define DM_PELSHEIGHT 0x00100000L
#define DM_DISPLAYFLAGS 0x00200000L
#define DM_DISPLAYFREQUENCY 0x00400000L
-
-/* etc.... */
+#define DM_PANNINGHEIGHT 0x00800000L
+#define DM_PANNINGWIDTH 0x01000000L
+#define DM_ICMMETHOD 0x02000000L
+#define DM_ICMINTENT 0x04000000L
+#define DM_MEDIATYPE 0x08000000L
+#define DM_DITHERTYPE 0x10000000L
#define DMORIENT_PORTRAIT 1
#define DMORIENT_LANDSCAPE 2
-#define DMPAPER_LETTER 1
+#define DMPAPER_FIRST DMPAPER_LETTER
+#define DMPAPER_LETTER 1
#define DMPAPER_LETTERSMALL 2
#define DMPAPER_TABLOID 3
#define DMPAPER_LEDGER 4
-#define DMPAPER_LEGAL 5
+#define DMPAPER_LEGAL 5
#define DMPAPER_STATEMENT 6
-#define DMPAPER_EXECUTIVE 7
-#define DMPAPER_A3 8
-#define DMPAPER_A4 9
+#define DMPAPER_EXECUTIVE 7
+#define DMPAPER_A3 8
+#define DMPAPER_A4 9
#define DMPAPER_A4SMALL 10
-#define DMPAPER_A5 11
+#define DMPAPER_A5 11
#define DMPAPER_B4 12
#define DMPAPER_B5 13
#define DMPAPER_FOLIO 14
@@ -2788,56 +2755,59 @@
#define DMPAPER_11X17 17
#define DMPAPER_NOTE 18
#define DMPAPER_ENV_9 19
-#define DMPAPER_ENV_10 20
+#define DMPAPER_ENV_10 20
#define DMPAPER_ENV_11 21
#define DMPAPER_ENV_12 22
#define DMPAPER_ENV_14 23
#define DMPAPER_CSHEET 24
#define DMPAPER_DSHEET 25
#define DMPAPER_ESHEET 26
-#define DMPAPER_ENV_DL 27
-#define DMPAPER_ENV_C5 28
+#define DMPAPER_ENV_DL 27
+#define DMPAPER_ENV_C5 28
#define DMPAPER_ENV_C3 29
#define DMPAPER_ENV_C4 30
#define DMPAPER_ENV_C6 31
#define DMPAPER_ENV_C65 32
#define DMPAPER_ENV_B4 33
-#define DMPAPER_ENV_B5 34
+#define DMPAPER_ENV_B5 34
#define DMPAPER_ENV_B6 35
#define DMPAPER_ENV_ITALY 36
-#define DMPAPER_ENV_MONARCH 37
+#define DMPAPER_ENV_MONARCH 37
#define DMPAPER_ENV_PERSONAL 38
#define DMPAPER_FANFOLD_US 39
#define DMPAPER_FANFOLD_STD_GERMAN 40
#define DMPAPER_FANFOLD_LGL_GERMAN 41
-#define DMPAPER_ISO_B4 42
-#define DMPAPER_JAPANESE_POSTCARD 43
-#define DMPAPER_9X11 44
-#define DMPAPER_10X11 45
-#define DMPAPER_15X11 46
-#define DMPAPER_ENV_INVITE 47
-#define DMPAPER_RESERVED_48 48
-#define DMPAPER_RESERVED_49 49
-#define DMPAPER_LETTER_EXTRA 50
-#define DMPAPER_LEGAL_EXTRA 51
-#define DMPAPER_TABLOID_EXTRA 52
-#define DMPAPER_A4_EXTRA 53
-#define DMPAPER_LETTER_TRANSVERSE 54
-#define DMPAPER_A4_TRANSVERSE 55
+#define DMPAPER_ISO_B4 42
+#define DMPAPER_JAPANESE_POSTCARD 43
+#define DMPAPER_9X11 44
+#define DMPAPER_10X11 45
+#define DMPAPER_15X11 46
+#define DMPAPER_ENV_INVITE 47
+#define DMPAPER_RESERVED_48 48
+#define DMPAPER_RESERVED_49 49
+#define DMPAPER_LETTER_EXTRA 50
+#define DMPAPER_LEGAL_EXTRA 51
+#define DMPAPER_TABLOID_EXTRA 52
+#define DMPAPER_A4_EXTRA 53
+#define DMPAPER_LETTER_TRANSVERSE 54
+#define DMPAPER_A4_TRANSVERSE 55
#define DMPAPER_LETTER_EXTRA_TRANSVERSE 56
-#define DMPAPER_A_PLUS 57
-#define DMPAPER_B_PLUS 58
-#define DMPAPER_LETTER_PLUS 59
-#define DMPAPER_A4_PLUS 60
-#define DMPAPER_A5_TRANSVERSE 61
-#define DMPAPER_B5_TRANSVERSE 62
-#define DMPAPER_A3_EXTRA 63
-#define DMPAPER_A5_EXTRA 64
-#define DMPAPER_B5_EXTRA 65
-#define DMPAPER_A2 66
-#define DMPAPER_A3_TRANSVERSE 67
+#define DMPAPER_A_PLUS 57
+#define DMPAPER_B_PLUS 58
+#define DMPAPER_LETTER_PLUS 59
+#define DMPAPER_A4_PLUS 60
+#define DMPAPER_A5_TRANSVERSE 61
+#define DMPAPER_B5_TRANSVERSE 62
+#define DMPAPER_A3_EXTRA 63
+#define DMPAPER_A5_EXTRA 64
+#define DMPAPER_B5_EXTRA 65
+#define DMPAPER_A2 66
+#define DMPAPER_A3_TRANSVERSE 67
#define DMPAPER_A3_EXTRA_TRANSVERSE 68
+#define DMPAPER_LAST DMPAPER_A3_EXTRA_TRANSVERSE
+#define DMPAPER_USER 256
+#define DMBIN_FIRST DMBIN_UPPER
#define DMBIN_UPPER 1
#define DMBIN_LOWER 2
#define DMBIN_MIDDLE 3
@@ -2845,21 +2815,57 @@
#define DMBIN_ENVELOPE 5
#define DMBIN_ENVMANUAL 6
#define DMBIN_AUTO 7
+#define DMBIN_TRACTOR 8
+#define DMBIN_SMALLFMT 9
+#define DMBIN_LARGEFMT 10
#define DMBIN_LARGECAPACITY 11
+#define DMBIN_CASSETTE 14
+#define DMBIN_FORMSOURCE 15
+#define DMBIN_LAST DMBIN_FORMSOURCE
+#define DMBIN_USER 256
+
+#define DMRES_DRAFT (-1)
+#define DMRES_LOW (-2)
+#define DMRES_MEDIUM (-3)
+#define DMRES_HIGH (-4)
#define DMCOLOR_MONOCHROME 1
#define DMCOLOR_COLOR 2
+#define DMDUP_SIMPLEX 1
+#define DMDUP_VERTICAL 2
+#define DMDUP_HORIZONTAL 3
+
#define DMTT_BITMAP 1
#define DMTT_DOWNLOAD 2
#define DMTT_SUBDEV 3
+#define DMTT_DOWNLOAD_OUTLINE 4
-typedef struct
-{
- INT16 cbSize;
- SEGPTR lpszDocName WINE_PACKED;
- SEGPTR lpszOutput WINE_PACKED;
-} DOCINFO16, *LPDOCINFO16;
+#define DMCOLLATE_FALSE 0
+#define DMCOLLATE_TRUE 1
+
+#define DMICMMETHOD_NONE 1
+#define DMICMMETHOD_SYSTEM 2
+#define DMICMMETHOD_DRIVER 3
+#define DMICMMETHOD_DEVICE 4
+#define DMICMMETHOD_USER 256
+
+#define DMICM_SATURATE 1
+#define DMICM_CONTRAST 2
+#define DMICM_COLORMETRIC 3
+#define DMICM_USER 256
+
+#define DMMEDIA_STANDARD 1
+#define DMMEDIA_TRANSPARENCY 2
+#define DMMEDIA_GLOSSY 3
+#define DMMEDIA_USER 256
+
+#define DMDITHER_NONE 1
+#define DMDITHER_COARSE 2
+#define DMDITHER_FINE 3
+#define DMDITHER_LINEART 4
+#define DMDITHER_GRAYSCALE 5
+#define DMDITHER_USER 256
typedef struct
{
@@ -2882,62 +2888,7 @@
DECL_WINELIB_TYPE_AW(DOCINFO)
DECL_WINELIB_TYPE_AW(LPDOCINFO)
-typedef struct {
- UINT16 cbSize;
- INT16 iBorderWidth;
- INT16 iScrollWidth;
- INT16 iScrollHeight;
- INT16 iCaptionWidth;
- INT16 iCaptionHeight;
- LOGFONT16 lfCaptionFont;
- INT16 iSmCaptionWidth;
- INT16 iSmCaptionHeight;
- LOGFONT16 lfSmCaptionFont;
- INT16 iMenuWidth;
- INT16 iMenuHeight;
- LOGFONT16 lfMenuFont;
- LOGFONT16 lfStatusFont;
- LOGFONT16 lfMessageFont;
-} NONCLIENTMETRICS16,*LPNONCLIENTMETRICS16;
-
-typedef struct {
- UINT cbSize;
- INT iBorderWidth;
- INT iScrollWidth;
- INT iScrollHeight;
- INT iCaptionWidth;
- INT iCaptionHeight;
- LOGFONTA lfCaptionFont;
- INT iSmCaptionWidth;
- INT iSmCaptionHeight;
- LOGFONTA lfSmCaptionFont;
- INT iMenuWidth;
- INT iMenuHeight;
- LOGFONTA lfMenuFont;
- LOGFONTA lfStatusFont;
- LOGFONTA lfMessageFont;
-} NONCLIENTMETRICSA,*LPNONCLIENTMETRICSA;
-
-typedef struct {
- UINT cbSize;
- INT iBorderWidth;
- INT iScrollWidth;
- INT iScrollHeight;
- INT iCaptionWidth;
- INT iCaptionHeight;
- LOGFONTW lfCaptionFont;
- INT iSmCaptionWidth;
- INT iSmCaptionHeight;
- LOGFONTW lfSmCaptionFont;
- INT iMenuWidth;
- INT iMenuHeight;
- LOGFONTW lfMenuFont;
- LOGFONTW lfStatusFont;
- LOGFONTW lfMessageFont;
-} NONCLIENTMETRICSW,*LPNONCLIENTMETRICSW;
-
-DECL_WINELIB_TYPE_AW(NONCLIENTMETRICS)
-DECL_WINELIB_TYPE_AW(LPNONCLIENTMETRICS)
+#define DI_APPBANDING 0x0001
/* Flags for PolyDraw and GetPath */
#define PT_CLOSEFIGURE 0x0001
@@ -2960,597 +2911,341 @@
char Buffer[1];
} RGNDATA,*PRGNDATA,*LPRGNDATA;
-typedef BOOL16 (CALLBACK* ABORTPROC16)(HDC16, INT16);
typedef BOOL (CALLBACK* ABORTPROC)(HDC, INT);
#include "poppack.h"
-/* Declarations for functions that exist only in Win16 */
-
-VOID WINAPI Death16(HDC16);
-VOID WINAPI Resurrection16(HDC16,WORD,WORD,WORD,WORD,WORD,WORD);
-
-/* Declarations for functions that exist only in Win32 */
-
+INT WINAPI AbortDoc(HDC);
+BOOL WINAPI AbortPath(HDC);
+INT WINAPI AddFontResourceA(LPCSTR);
+INT WINAPI AddFontResourceW(LPCWSTR);
+#define AddFontResource WINELIB_NAME_AW(AddFontResource)
BOOL WINAPI AngleArc(HDC, INT, INT, DWORD, FLOAT, FLOAT);
+BOOL WINAPI AnimatePalette(HPALETTE,UINT,UINT,const PALETTEENTRY*);
+BOOL WINAPI Arc(HDC,INT,INT,INT,INT,INT,INT,INT,INT);
BOOL WINAPI ArcTo(HDC, INT, INT, INT, INT, INT, INT, INT, INT);
+BOOL WINAPI BeginPath(HDC);
+BOOL WINAPI BitBlt(HDC,INT,INT,INT,INT,HDC,INT,INT,DWORD);
+INT WINAPI ChoosePixelFormat(HDC,const PIXELFORMATDESCRIPTOR*);
+BOOL WINAPI Chord(HDC,INT,INT,INT,INT,INT,INT,INT,INT);
HENHMETAFILE WINAPI CloseEnhMetaFile(HDC);
-HBRUSH WINAPI CreateDIBPatternBrushPt(const void*,UINT);
-HDC WINAPI CreateEnhMetaFileA(HDC,LPCSTR,const RECT*,LPCSTR);
-HDC WINAPI CreateEnhMetaFileW(HDC,LPCWSTR,const RECT*,LPCWSTR);
-#define CreateEnhMetaFile WINELIB_NAME_AW(CreateEnhMetaFile)
-INT WINAPI DrawEscape(HDC,INT,INT,LPCSTR);
-INT16 WINAPI ExcludeVisRect16(HDC16,INT16,INT16,INT16,INT16);
-BOOL16 WINAPI FastWindowFrame16(HDC16,const RECT16*,INT16,INT16,DWORD);
-UINT16 WINAPI GDIRealizePalette16(HDC16);
-HPALETTE16 WINAPI GDISelectPalette16(HDC16,HPALETTE16,WORD);
-BOOL WINAPI GdiComment(HDC,UINT,const BYTE *);
-DWORD WINAPI GetBitmapDimension16(HBITMAP16);
-DWORD WINAPI GetBrushOrg16(HDC16);
-BOOL WINAPI GetCharABCWidthsFloatA(HDC,UINT,UINT,LPABCFLOAT);
-BOOL WINAPI GetCharABCWidthsFloatW(HDC,UINT,UINT,LPABCFLOAT);
-#define GetCharABCWidthsFloat WINELIB_NAME_AW(GetCharABCWidthsFloat)
-BOOL WINAPI GetCharWidthFloatA(HDC,UINT,UINT,PFLOAT);
-BOOL WINAPI GetCharWidthFloatW(HDC,UINT,UINT,PFLOAT);
-#define GetCharWidthFloat WINELIB_NAME_AW(GetCharWidthFloat)
-BOOL WINAPI GetColorAdjustment(HDC, LPCOLORADJUSTMENT);
-HFONT16 WINAPI GetCurLogFont16(HDC16);
-DWORD WINAPI GetCurrentPosition16(HDC16);
-DWORD WINAPI GetDCHook(HDC16,FARPROC16*);
-DWORD WINAPI GetDCOrg16(HDC16);
-HDC16 WINAPI GetDCState16(HDC16);
-INT16 WINAPI GetEnvironment16(LPCSTR,LPDEVMODE16,UINT16);
-HGLOBAL16 WINAPI GetMetaFileBits16(HMETAFILE16);
-BOOL WINAPI GetMiterLimit(HDC, PFLOAT);
-DWORD WINAPI GetTextExtent16(HDC16,LPCSTR,INT16);
-DWORD WINAPI GetViewportExt16(HDC16);
-DWORD WINAPI GetViewportOrg16(HDC16);
-DWORD WINAPI GetWindowExt16(HDC16);
-DWORD WINAPI GetWindowOrg16(HDC16);
-HRGN16 WINAPI InquireVisRgn16(HDC16);
-INT16 WINAPI IntersectVisRect16(HDC16,INT16,INT16,INT16,INT16);
-BOOL16 WINAPI IsDCCurrentPalette16(HDC16);
-BOOL16 WINAPI IsGDIObject16(HGDIOBJ16);
-BOOL16 WINAPI IsValidMetaFile16(HMETAFILE16);
-BOOL WINAPI MaskBlt(HDC,INT,INT,INT,INT,HDC,INT,INT,HBITMAP,INT,INT,DWORD);
-DWORD WINAPI MoveTo16(HDC16,INT16,INT16);
-DWORD WINAPI OffsetViewportOrg16(HDC16,INT16,INT16);
-INT16 WINAPI OffsetVisRgn16(HDC16,INT16,INT16);
-DWORD WINAPI OffsetWindowOrg16(HDC16,INT16,INT16);
-BOOL WINAPI PlgBlt(HDC,const POINT*,HDC,INT,INT,INT,INT,HBITMAP,INT,INT);
-BOOL WINAPI PolyDraw(HDC,const POINT*,const BYTE*,DWORD);
-UINT16 WINAPI RealizeDefaultPalette16(HDC16);
-INT16 WINAPI RestoreVisRgn16(HDC16);
-HRGN16 WINAPI SaveVisRgn16(HDC16);
-DWORD WINAPI ScaleViewportExt16(HDC16,INT16,INT16,INT16,INT16);
-DWORD WINAPI ScaleWindowExt16(HDC16,INT16,INT16,INT16,INT16);
-INT16 WINAPI SelectVisRgn16(HDC16,HRGN16);
-DWORD WINAPI SetBitmapDimension16(HBITMAP16,INT16,INT16);
-DWORD WINAPI SetBrushOrg16(HDC16,INT16,INT16);
-BOOL WINAPI SetColorAdjustment(HDC,const COLORADJUSTMENT*);
-BOOL16 WINAPI SetDCHook(HDC16,FARPROC16,DWORD);
-DWORD WINAPI SetDCOrg16(HDC16,INT16,INT16);
-VOID WINAPI SetDCState16(HDC16,HDC16);
-INT16 WINAPI SetEnvironment16(LPCSTR,LPDEVMODE16,UINT16);
-WORD WINAPI SetHookFlags16(HDC16,WORD);
-HMETAFILE16 WINAPI SetMetaFileBits16(HGLOBAL16);
-BOOL WINAPI SetMiterLimit(HDC, FLOAT, PFLOAT);
-DWORD WINAPI SetViewportExt16(HDC16,INT16,INT16);
-DWORD WINAPI SetViewportOrg16(HDC16,INT16,INT16);
-DWORD WINAPI SetWindowExt16(HDC16,INT16,INT16);
-DWORD WINAPI SetWindowOrg16(HDC16,INT16,INT16);
+BOOL WINAPI CloseFigure(HDC);
+HMETAFILE WINAPI CloseMetaFile(HDC);
+INT WINAPI CombineRgn(HRGN,HRGN,HRGN,INT);
BOOL WINAPI CombineTransform(LPXFORM,const XFORM *,const XFORM *);
HENHMETAFILE WINAPI CopyEnhMetaFileA(HENHMETAFILE,LPCSTR);
HENHMETAFILE WINAPI CopyEnhMetaFileW(HENHMETAFILE,LPCWSTR);
#define CopyEnhMetaFile WINELIB_NAME_AW(CopyEnhMetaFile)
-HPALETTE WINAPI CreateHalftonePalette(HDC);
-BOOL WINAPI DeleteEnhMetaFile(HENHMETAFILE);
-INT WINAPI ExtSelectClipRgn(HDC,HRGN,INT);
-HRGN WINAPI ExtCreateRegion(const XFORM*,DWORD,const RGNDATA*);
-INT WINAPI ExtEscape(HDC,INT,INT,LPCSTR,INT,LPSTR);
-BOOL WINAPI FixBrushOrgEx(HDC,INT,INT,LPPOINT);
-HANDLE WINAPI GetCurrentObject(HDC,UINT);
-BOOL WINAPI GetDCOrgEx(HDC,LPPOINT);
-HENHMETAFILE WINAPI GetEnhMetaFileA(LPCSTR);
-HENHMETAFILE WINAPI GetEnhMetaFileW(LPCWSTR);
-#define GetEnhMetaFile WINELIB_NAME_AW(GetEnhMetaFile)
-UINT WINAPI GetEnhMetaFileBits(HENHMETAFILE,UINT,LPBYTE);
-UINT WINAPI GetEnhMetaFileHeader(HENHMETAFILE,UINT,LPENHMETAHEADER);
-UINT WINAPI GetEnhMetaFilePaletteEntries(HENHMETAFILE,UINT,LPPALETTEENTRY);
-INT WINAPI GetGraphicsMode(HDC);
-UINT WINAPI GetMetaFileBitsEx(HMETAFILE,UINT,LPVOID);
-DWORD WINAPI GetObjectType(HANDLE);
-UINT WINAPI GetTextCharsetInfo(HDC,LPFONTSIGNATURE,DWORD);
-BOOL WINAPI GetTextExtentExPointA(HDC,LPCSTR,INT,INT,
- LPINT,LPINT,LPSIZE);
-BOOL WINAPI GetTextExtentExPointW(HDC,LPCWSTR,INT,INT,
- LPINT,LPINT,LPSIZE);
-#define GetTextExtentExPoint WINELIB_NAME_AW(GetTextExtentExPoint)
-BOOL WINAPI GetWorldTransform(HDC,LPXFORM);
-BOOL WINAPI ModifyWorldTransform(HDC,const XFORM *, DWORD);
-BOOL WINAPI PlayEnhMetaFile(HDC,HENHMETAFILE,const RECT*);
-BOOL WINAPI PlayEnhMetaFileRecord(HDC,LPHANDLETABLE,const ENHMETARECORD*,UINT);
-BOOL WINAPI PolyPolyline(HDC,const POINT*,const DWORD*,DWORD);
-BOOL WINAPI SetBrushOrgEx(HDC,INT,INT,LPPOINT);
-HENHMETAFILE WINAPI SetEnhMetaFileBits(UINT,const BYTE *);
-INT WINAPI SetGraphicsMode(HDC,INT);
-HMETAFILE WINAPI SetMetaFileBitsEx(UINT,const BYTE*);
-BOOL WINAPI SetWorldTransform(HDC,const XFORM*);
-BOOL WINAPI TranslateCharsetInfo(LPDWORD,LPCHARSETINFO,DWORD);
-
-/* Declarations for functions that change between Win16 and Win32 */
-
-INT16 WINAPI AbortDoc16(HDC16);
-INT WINAPI AbortDoc(HDC);
-BOOL16 WINAPI AbortPath16(HDC16);
-BOOL WINAPI AbortPath(HDC);
-INT16 WINAPI AddFontResource16(LPCSTR);
-INT WINAPI AddFontResourceA(LPCSTR);
-INT WINAPI AddFontResourceW(LPCWSTR);
-#define AddFontResource WINELIB_NAME_AW(AddFontResource)
-void WINAPI AnimatePalette16(HPALETTE16,UINT16,UINT16,const PALETTEENTRY*);
-BOOL WINAPI AnimatePalette(HPALETTE,UINT,UINT,const PALETTEENTRY*);
-BOOL16 WINAPI Arc16(HDC16,INT16,INT16,INT16,INT16,INT16,INT16,INT16,INT16);
-BOOL WINAPI Arc(HDC,INT,INT,INT,INT,INT,INT,INT,INT);
-BOOL16 WINAPI BeginPath16(HDC16);
-BOOL WINAPI BeginPath(HDC);
-BOOL16 WINAPI BitBlt16(HDC16,INT16,INT16,INT16,INT16,HDC16,INT16,INT16,DWORD);
-BOOL WINAPI BitBlt(HDC,INT,INT,INT,INT,HDC,INT,INT,DWORD);
-INT WINAPI ChoosePixelFormat(HDC,const PIXELFORMATDESCRIPTOR*);
-BOOL16 WINAPI Chord16(HDC16,INT16,INT16,INT16,INT16,INT16,INT16,INT16,INT16);
-BOOL WINAPI Chord(HDC,INT,INT,INT,INT,INT,INT,INT,INT);
-BOOL16 WINAPI CloseFigure16(HDC16);
-BOOL WINAPI CloseFigure(HDC);
-HMETAFILE16 WINAPI CloseMetaFile16(HDC16);
-HMETAFILE WINAPI CloseMetaFile(HDC);
-INT16 WINAPI CombineRgn16(HRGN16,HRGN16,HRGN16,INT16);
-INT WINAPI CombineRgn(HRGN,HRGN,HRGN,INT);
-HMETAFILE16 WINAPI CopyMetaFile16(HMETAFILE16,LPCSTR);
HMETAFILE WINAPI CopyMetaFileA(HMETAFILE,LPCSTR);
HMETAFILE WINAPI CopyMetaFileW(HMETAFILE,LPCWSTR);
#define CopyMetaFile WINELIB_NAME_AW(CopyMetaFile)
-HBITMAP16 WINAPI CreateBitmap16(INT16,INT16,UINT16,UINT16,LPCVOID);
HBITMAP WINAPI CreateBitmap(INT,INT,UINT,UINT,LPCVOID);
-HBITMAP16 WINAPI CreateBitmapIndirect16(const BITMAP16*);
HBITMAP WINAPI CreateBitmapIndirect(const BITMAP*);
-HBRUSH16 WINAPI CreateBrushIndirect16(const LOGBRUSH16*);
HBRUSH WINAPI CreateBrushIndirect(const LOGBRUSH*);
-HBITMAP16 WINAPI CreateCompatibleBitmap16(HDC16,INT16,INT16);
HBITMAP WINAPI CreateCompatibleBitmap(HDC,INT,INT);
-HDC16 WINAPI CreateCompatibleDC16(HDC16);
HDC WINAPI CreateCompatibleDC(HDC);
-HDC16 WINAPI CreateDC16(LPCSTR,LPCSTR,LPCSTR,const DEVMODE16*);
HDC WINAPI CreateDCA(LPCSTR,LPCSTR,LPCSTR,const DEVMODEA*);
HDC WINAPI CreateDCW(LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*);
#define CreateDC WINELIB_NAME_AW(CreateDC)
-HBITMAP16 WINAPI CreateDIBitmap16(HDC16,const BITMAPINFOHEADER*,DWORD,
- LPCVOID,const BITMAPINFO*,UINT16);
HBITMAP WINAPI CreateDIBitmap(HDC,const BITMAPINFOHEADER*,DWORD,
LPCVOID,const BITMAPINFO*,UINT);
-HBRUSH16 WINAPI CreateDIBPatternBrush16(HGLOBAL16,UINT16);
HBRUSH WINAPI CreateDIBPatternBrush(HGLOBAL,UINT);
-HBITMAP16 WINAPI CreateDIBSection16 (HDC16, BITMAPINFO *, UINT16,
- SEGPTR *, HANDLE, DWORD offset);
+HBRUSH WINAPI CreateDIBPatternBrushPt(const void*,UINT);
HBITMAP WINAPI CreateDIBSection (HDC, BITMAPINFO *, UINT,
LPVOID *, HANDLE, DWORD offset);
-HBITMAP16 WINAPI CreateDiscardableBitmap16(HDC16,INT16,INT16);
HBITMAP WINAPI CreateDiscardableBitmap(HDC,INT,INT);
-HRGN16 WINAPI CreateEllipticRgn16(INT16,INT16,INT16,INT16);
HRGN WINAPI CreateEllipticRgn(INT,INT,INT,INT);
-HRGN16 WINAPI CreateEllipticRgnIndirect16(const RECT16 *);
HRGN WINAPI CreateEllipticRgnIndirect(const RECT *);
-HFONT16 WINAPI CreateFont16(INT16,INT16,INT16,INT16,INT16,BYTE,BYTE,BYTE,
- BYTE,BYTE,BYTE,BYTE,BYTE,LPCSTR);
+HDC WINAPI CreateEnhMetaFileA(HDC,LPCSTR,const RECT*,LPCSTR);
+HDC WINAPI CreateEnhMetaFileW(HDC,LPCWSTR,const RECT*,LPCWSTR);
+#define CreateEnhMetaFile WINELIB_NAME_AW(CreateEnhMetaFile)
HFONT WINAPI CreateFontA(INT,INT,INT,INT,INT,DWORD,DWORD,
DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPCSTR);
HFONT WINAPI CreateFontW(INT,INT,INT,INT,INT,DWORD,DWORD,
DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPCWSTR);
#define CreateFont WINELIB_NAME_AW(CreateFont)
-HFONT16 WINAPI CreateFontIndirect16(const LOGFONT16*);
HFONT WINAPI CreateFontIndirectA(const LOGFONTA*);
HFONT WINAPI CreateFontIndirectW(const LOGFONTW*);
#define CreateFontIndirect WINELIB_NAME_AW(CreateFontIndirect)
-HBRUSH16 WINAPI CreateHatchBrush16(INT16,COLORREF);
+HPALETTE WINAPI CreateHalftonePalette(HDC);
HBRUSH WINAPI CreateHatchBrush(INT,COLORREF);
-HDC16 WINAPI CreateIC16(LPCSTR,LPCSTR,LPCSTR,const DEVMODE16*);
HDC WINAPI CreateICA(LPCSTR,LPCSTR,LPCSTR,const DEVMODEA*);
HDC WINAPI CreateICW(LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*);
#define CreateIC WINELIB_NAME_AW(CreateIC)
-HDC16 WINAPI CreateMetaFile16(LPCSTR);
HDC WINAPI CreateMetaFileA(LPCSTR);
HDC WINAPI CreateMetaFileW(LPCWSTR);
#define CreateMetaFile WINELIB_NAME_AW(CreateMetaFile)
-HPALETTE16 WINAPI CreatePalette16(const LOGPALETTE*);
HPALETTE WINAPI CreatePalette(const LOGPALETTE*);
-HBRUSH16 WINAPI CreatePatternBrush16(HBITMAP16);
HBRUSH WINAPI CreatePatternBrush(HBITMAP);
-HPEN16 WINAPI CreatePen16(INT16,INT16,COLORREF);
HPEN WINAPI CreatePen(INT,INT,COLORREF);
-HPEN16 WINAPI CreatePenIndirect16(const LOGPEN16*);
HPEN WINAPI CreatePenIndirect(const LOGPEN*);
-HRGN16 WINAPI CreatePolyPolygonRgn16(const POINT16*,const INT16*,INT16,INT16);
HRGN WINAPI CreatePolyPolygonRgn(const POINT*,const INT*,INT,INT);
-HRGN16 WINAPI CreatePolygonRgn16(const POINT16*,INT16,INT16);
HRGN WINAPI CreatePolygonRgn(const POINT*,INT,INT);
-HRGN16 WINAPI CreateRectRgn16(INT16,INT16,INT16,INT16);
HRGN WINAPI CreateRectRgn(INT,INT,INT,INT);
-HRGN16 WINAPI CreateRectRgnIndirect16(const RECT16*);
HRGN WINAPI CreateRectRgnIndirect(const RECT*);
-HRGN16 WINAPI CreateRoundRectRgn16(INT16,INT16,INT16,INT16,INT16,INT16);
HRGN WINAPI CreateRoundRectRgn(INT,INT,INT,INT,INT,INT);
-BOOL16 WINAPI CreateScalableFontResource16(UINT16,LPCSTR,LPCSTR,LPCSTR);
BOOL WINAPI CreateScalableFontResourceA(DWORD,LPCSTR,LPCSTR,LPCSTR);
BOOL WINAPI CreateScalableFontResourceW(DWORD,LPCWSTR,LPCWSTR,LPCWSTR);
#define CreateScalableFontResource WINELIB_NAME_AW(CreateScalableFontResource)
-HBRUSH16 WINAPI CreateSolidBrush16(COLORREF);
HBRUSH WINAPI CreateSolidBrush(COLORREF);
-BOOL16 WINAPI DeleteDC16(HDC16);
+BOOL WINAPI DPtoLP(HDC,LPPOINT,INT);
BOOL WINAPI DeleteDC(HDC);
-BOOL16 WINAPI DeleteMetaFile16(HMETAFILE16);
+BOOL WINAPI DeleteEnhMetaFile(HENHMETAFILE);
BOOL WINAPI DeleteMetaFile(HMETAFILE);
-BOOL16 WINAPI DeleteObject16(HGDIOBJ16);
BOOL WINAPI DeleteObject(HGDIOBJ);
INT WINAPI DescribePixelFormat(HDC,int,UINT,
LPPIXELFORMATDESCRIPTOR);
-BOOL16 WINAPI DPtoLP16(HDC16,LPPOINT16,INT16);
-BOOL WINAPI DPtoLP(HDC,LPPOINT,INT);
-BOOL16 WINAPI Ellipse16(HDC16,INT16,INT16,INT16,INT16);
+INT WINAPI DrawEscape(HDC,INT,INT,LPCSTR);
BOOL WINAPI Ellipse(HDC,INT,INT,INT,INT);
-INT16 WINAPI EndDoc16(HDC16);
INT WINAPI EndDoc(HDC);
-BOOL16 WINAPI EndPath16(HDC16);
BOOL WINAPI EndPath(HDC);
-INT16 WINAPI EnumFontFamilies16(HDC16,LPCSTR,FONTENUMPROC16,LPARAM);
INT WINAPI EnumFontFamiliesA(HDC,LPCSTR,FONTENUMPROCA,LPARAM);
INT WINAPI EnumFontFamiliesW(HDC,LPCWSTR,FONTENUMPROCW,LPARAM);
#define EnumFontFamilies WINELIB_NAME_AW(EnumFontFamilies)
-INT16 WINAPI EnumFontFamiliesEx16(HDC16,LPLOGFONT16,FONTENUMPROCEX16,LPARAM,DWORD);
INT WINAPI EnumFontFamiliesExA(HDC,LPLOGFONTA,FONTENUMPROCEXA,LPARAM,DWORD);
INT WINAPI EnumFontFamiliesExW(HDC,LPLOGFONTW,FONTENUMPROCEXW,LPARAM,DWORD);
#define EnumFontFamiliesEx WINELIB_NAME_AW(EnumFontFamiliesEx)
-INT16 WINAPI EnumFonts16(HDC16,LPCSTR,FONTENUMPROC16,LPARAM);
INT WINAPI EnumFontsA(HDC,LPCSTR,FONTENUMPROCA,LPARAM);
INT WINAPI EnumFontsW(HDC,LPCWSTR,FONTENUMPROCW,LPARAM);
#define EnumFonts WINELIB_NAME_AW(EnumFonts)
-BOOL16 WINAPI EnumMetaFile16(HDC16,HMETAFILE16,MFENUMPROC16,LPARAM);
BOOL WINAPI EnumMetaFile(HDC,HMETAFILE,MFENUMPROC,LPARAM);
-INT16 WINAPI EnumObjects16(HDC16,INT16,GOBJENUMPROC16,LPARAM);
INT WINAPI EnumObjects(HDC,INT,GOBJENUMPROC,LPARAM);
-BOOL16 WINAPI EqualRgn16(HRGN16,HRGN16);
BOOL WINAPI EqualRgn(HRGN,HRGN);
-INT16 WINAPI Escape16(HDC16,INT16,INT16,SEGPTR,SEGPTR);
INT WINAPI Escape(HDC,INT,INT,LPCSTR,LPVOID);
-INT16 WINAPI ExcludeClipRect16(HDC16,INT16,INT16,INT16,INT16);
INT WINAPI ExcludeClipRect(HDC,INT,INT,INT,INT);
-HPEN16 WINAPI ExtCreatePen16(DWORD,DWORD,const LOGBRUSH16*,DWORD,const DWORD*);
HPEN WINAPI ExtCreatePen(DWORD,DWORD,const LOGBRUSH*,DWORD,const DWORD*);
-BOOL16 WINAPI ExtFloodFill16(HDC16,INT16,INT16,COLORREF,UINT16);
+HRGN WINAPI ExtCreateRegion(const XFORM*,DWORD,const RGNDATA*);
+INT WINAPI ExtEscape(HDC,INT,INT,LPCSTR,INT,LPSTR);
BOOL WINAPI ExtFloodFill(HDC,INT,INT,COLORREF,UINT);
-BOOL16 WINAPI ExtTextOut16(HDC16,INT16,INT16,UINT16,const RECT16*,
- LPCSTR,UINT16,const INT16*);
+INT WINAPI ExtSelectClipRgn(HDC,HRGN,INT);
BOOL WINAPI ExtTextOutA(HDC,INT,INT,UINT,const RECT*,
LPCSTR,UINT,const INT*);
BOOL WINAPI ExtTextOutW(HDC,INT,INT,UINT,const RECT*,
LPCWSTR,UINT,const INT*);
#define ExtTextOut WINELIB_NAME_AW(ExtTextOut)
-BOOL16 WINAPI FillPath16(HDC16);
BOOL WINAPI FillPath(HDC);
-BOOL16 WINAPI FillRgn16(HDC16,HRGN16,HBRUSH16);
BOOL WINAPI FillRgn(HDC,HRGN,HBRUSH);
-BOOL16 WINAPI FlattenPath16(HDC16);
+BOOL WINAPI FixBrushOrgEx(HDC,INT,INT,LPPOINT);
BOOL WINAPI FlattenPath(HDC);
-BOOL16 WINAPI FloodFill16(HDC16,INT16,INT16,COLORREF);
BOOL WINAPI FloodFill(HDC,INT,INT,COLORREF);
-BOOL16 WINAPI FrameRgn16(HDC16,HRGN16,HBRUSH16,INT16,INT16);
BOOL WINAPI FrameRgn(HDC,HRGN,HBRUSH,INT,INT);
-INT16 WINAPI GetArcDirection16(HDC16);
+BOOL WINAPI GdiComment(HDC,UINT,const BYTE *);
INT WINAPI GetArcDirection(HDC);
-BOOL16 WINAPI GetAspectRatioFilterEx16(HDC16,LPSIZE16);
BOOL WINAPI GetAspectRatioFilterEx(HDC,LPSIZE);
-LONG WINAPI GetBitmapBits16(HBITMAP16,LONG,LPVOID);
-LONG WINAPI GetBitmapBits(HBITMAP,LONG,LPVOID);
-BOOL16 WINAPI GetBitmapDimensionEx16(HBITMAP16,LPSIZE16);
+LONG WINAPI GetBitmapBits(HBITMAP,LONG,LPVOID);
BOOL WINAPI GetBitmapDimensionEx(HBITMAP,LPSIZE);
-BOOL16 WINAPI GetBrushOrgEx16(HDC16,LPPOINT16);
BOOL WINAPI GetBrushOrgEx(HDC,LPPOINT);
-COLORREF WINAPI GetBkColor16(HDC16);
-COLORREF WINAPI GetBkColor(HDC);
-INT16 WINAPI GetBkMode16(HDC16);
+COLORREF WINAPI GetBkColor(HDC);
INT WINAPI GetBkMode(HDC);
-UINT16 WINAPI GetBoundsRect16(HDC16,LPRECT16,UINT16);
UINT WINAPI GetBoundsRect(HDC,LPRECT,UINT);
-BOOL16 WINAPI GetCharABCWidths16(HDC16,UINT16,UINT16,LPABC16);
BOOL WINAPI GetCharABCWidthsA(HDC,UINT,UINT,LPABC);
BOOL WINAPI GetCharABCWidthsW(HDC,UINT,UINT,LPABC);
#define GetCharABCWidths WINELIB_NAME_AW(GetCharABCWidths)
-DWORD WINAPI GetCharacterPlacementA(HDC,LPCSTR,INT,INT,GCP_RESULTSA*,DWORD);
-DWORD WINAPI GetCharacterPlacementW(HDC,LPCWSTR,INT,INT,GCP_RESULTSW*,DWORD);
+BOOL WINAPI GetCharABCWidthsFloatA(HDC,UINT,UINT,LPABCFLOAT);
+BOOL WINAPI GetCharABCWidthsFloatW(HDC,UINT,UINT,LPABCFLOAT);
+#define GetCharABCWidthsFloat WINELIB_NAME_AW(GetCharABCWidthsFloat)
+DWORD WINAPI GetCharacterPlacementA(HDC,LPCSTR,INT,INT,GCP_RESULTSA*,DWORD);
+DWORD WINAPI GetCharacterPlacementW(HDC,LPCWSTR,INT,INT,GCP_RESULTSW*,DWORD);
#define GetCharacterPlacement WINELIB_NAME_AW(GetCharacterPlacement)
-BOOL16 WINAPI GetCharWidth16(HDC16,UINT16,UINT16,LPINT16);
BOOL WINAPI GetCharWidth32A(HDC,UINT,UINT,LPINT);
BOOL WINAPI GetCharWidth32W(HDC,UINT,UINT,LPINT);
#define GetCharWidthA GetCharWidth32A
#define GetCharWidthW GetCharWidth32W
#define GetCharWidth32 WINELIB_NAME_AW(GetCharWidth32)
#define GetCharWidth WINELIB_NAME_AW(GetCharWidth)
-INT16 WINAPI GetClipBox16(HDC16,LPRECT16);
+BOOL WINAPI GetCharWidthFloatA(HDC,UINT,UINT,PFLOAT);
+BOOL WINAPI GetCharWidthFloatW(HDC,UINT,UINT,PFLOAT);
+#define GetCharWidthFloat WINELIB_NAME_AW(GetCharWidthFloat)
INT WINAPI GetClipBox(HDC,LPRECT);
-HRGN16 WINAPI GetClipRgn16(HDC16);
INT WINAPI GetClipRgn(HDC,HRGN);
-BOOL16 WINAPI GetCurrentPositionEx16(HDC16,LPPOINT16);
+BOOL WINAPI GetColorAdjustment(HDC, LPCOLORADJUSTMENT);
+HANDLE WINAPI GetCurrentObject(HDC,UINT);
BOOL WINAPI GetCurrentPositionEx(HDC,LPPOINT);
-INT16 WINAPI GetDeviceCaps16(HDC16,INT16);
INT WINAPI GetDeviceCaps(HDC,INT);
-UINT16 WINAPI GetDIBColorTable16(HDC16,UINT16,UINT16,RGBQUAD*);
+BOOL WINAPI GetDCOrgEx(HDC,LPPOINT);
UINT WINAPI GetDIBColorTable(HDC,UINT,UINT,RGBQUAD*);
-INT16 WINAPI GetDIBits16(HDC16,HBITMAP16,UINT16,UINT16,LPVOID,LPBITMAPINFO,UINT16);
INT WINAPI GetDIBits(HDC,HBITMAP,UINT,UINT,LPVOID,LPBITMAPINFO,UINT);
-DWORD WINAPI GetFontData(HDC,DWORD,DWORD,LPVOID,DWORD);
-DWORD WINAPI GetFontLanguageInfo16(HDC16);
-DWORD WINAPI GetFontLanguageInfo(HDC);
-DWORD WINAPI GetGlyphOutline16(HDC16,UINT16,UINT16,LPGLYPHMETRICS16,DWORD,LPVOID,const MAT2*);
-DWORD WINAPI GetGlyphOutlineA(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,LPVOID,const MAT2*);
-DWORD WINAPI GetGlyphOutlineW(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,LPVOID,const MAT2*);
+HENHMETAFILE WINAPI GetEnhMetaFileA(LPCSTR);
+HENHMETAFILE WINAPI GetEnhMetaFileW(LPCWSTR);
+#define GetEnhMetaFile WINELIB_NAME_AW(GetEnhMetaFile)
+UINT WINAPI GetEnhMetaFileBits(HENHMETAFILE,UINT,LPBYTE);
+UINT WINAPI GetEnhMetaFileHeader(HENHMETAFILE,UINT,LPENHMETAHEADER);
+UINT WINAPI GetEnhMetaFilePaletteEntries(HENHMETAFILE,UINT,LPPALETTEENTRY);
+DWORD WINAPI GetFontData(HDC,DWORD,DWORD,LPVOID,DWORD);
+DWORD WINAPI GetFontLanguageInfo(HDC);
+DWORD WINAPI GetGlyphOutlineA(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,LPVOID,const MAT2*);
+DWORD WINAPI GetGlyphOutlineW(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,LPVOID,const MAT2*);
#define GetGlyphOutline WINELIB_NAME_AW(GetGlyphOutline)
-INT16 WINAPI GetKerningPairs16(HDC16,INT16,LPKERNINGPAIR16);
-DWORD WINAPI GetKerningPairsA(HDC,DWORD,LPKERNINGPAIR);
-DWORD WINAPI GetKerningPairsW(HDC,DWORD,LPKERNINGPAIR);
+INT WINAPI GetGraphicsMode(HDC);
+DWORD WINAPI GetKerningPairsA(HDC,DWORD,LPKERNINGPAIR);
+DWORD WINAPI GetKerningPairsW(HDC,DWORD,LPKERNINGPAIR);
#define GetKerningPairs WINELIB_NAME_AW(GetKerningPairs)
-INT16 WINAPI GetMapMode16(HDC16);
INT WINAPI GetMapMode(HDC);
-HMETAFILE16 WINAPI GetMetaFile16(LPCSTR);
HMETAFILE WINAPI GetMetaFileA(LPCSTR);
HMETAFILE WINAPI GetMetaFileW(LPCWSTR);
#define GetMetaFile WINELIB_NAME_AW(GetMetaFile)
-DWORD WINAPI GetNearestColor16(HDC16,DWORD);
-DWORD WINAPI GetNearestColor(HDC,DWORD);
-UINT16 WINAPI GetNearestPaletteIndex16(HPALETTE16,COLORREF);
+UINT WINAPI GetMetaFileBitsEx(HMETAFILE,UINT,LPVOID);
+BOOL WINAPI GetMiterLimit(HDC, PFLOAT);
+DWORD WINAPI GetNearestColor(HDC,DWORD);
UINT WINAPI GetNearestPaletteIndex(HPALETTE,COLORREF);
-INT16 WINAPI GetObject16(HANDLE16,INT16,LPVOID);
INT WINAPI GetObjectA(HANDLE,INT,LPVOID);
INT WINAPI GetObjectW(HANDLE,INT,LPVOID);
#define GetObject WINELIB_NAME_AW(GetObject)
-UINT16 WINAPI GetOutlineTextMetrics16(HDC16,UINT16,LPOUTLINETEXTMETRIC16);
+DWORD WINAPI GetObjectType(HANDLE);
UINT WINAPI GetOutlineTextMetricsA(HDC,UINT,LPOUTLINETEXTMETRICA);
UINT WINAPI GetOutlineTextMetricsW(HDC,UINT,LPOUTLINETEXTMETRICW);
#define GetOutlineTextMetrics WINELIB_NAME_AW(GetOutlineTextMetrics)
-UINT16 WINAPI GetPaletteEntries16(HPALETTE16,UINT16,UINT16,LPPALETTEENTRY);
UINT WINAPI GetPaletteEntries(HPALETTE,UINT,UINT,LPPALETTEENTRY);
-INT16 WINAPI GetPath16(HDC16,LPPOINT16,LPBYTE,INT16);
INT WINAPI GetPath(HDC,LPPOINT,LPBYTE,INT);
-COLORREF WINAPI GetPixel16(HDC16,INT16,INT16);
-COLORREF WINAPI GetPixel(HDC,INT,INT);
+COLORREF WINAPI GetPixel(HDC,INT,INT);
INT WINAPI GetPixelFormat(HDC);
-INT16 WINAPI GetPolyFillMode16(HDC16);
INT WINAPI GetPolyFillMode(HDC);
-BOOL16 WINAPI GetRasterizerCaps16(LPRASTERIZER_STATUS,UINT16);
BOOL WINAPI GetRasterizerCaps(LPRASTERIZER_STATUS,UINT);
-DWORD WINAPI GetRegionData16(HRGN16,DWORD,LPRGNDATA);
-DWORD WINAPI GetRegionData(HRGN,DWORD,LPRGNDATA);
-INT16 WINAPI GetRelAbs16(HDC16);
+DWORD WINAPI GetRegionData(HRGN,DWORD,LPRGNDATA);
INT WINAPI GetRelAbs(HDC);
-INT16 WINAPI GetRgnBox16(HRGN16,LPRECT16);
INT WINAPI GetRgnBox(HRGN,LPRECT);
-INT16 WINAPI GetROP216(HDC16);
INT WINAPI GetROP2(HDC);
-HGDIOBJ16 WINAPI GetStockObject16(INT16);
HGDIOBJ WINAPI GetStockObject(INT);
-INT16 WINAPI GetStretchBltMode16(HDC16);
INT WINAPI GetStretchBltMode(HDC);
-UINT16 WINAPI GetSystemPaletteEntries16(HDC16,UINT16,UINT16,LPPALETTEENTRY);
UINT WINAPI GetSystemPaletteEntries(HDC,UINT,UINT,LPPALETTEENTRY);
-UINT16 WINAPI GetSystemPaletteUse16(HDC16);
UINT WINAPI GetSystemPaletteUse(HDC);
-UINT16 WINAPI GetTextAlign16(HDC16);
UINT WINAPI GetTextAlign(HDC);
-INT16 WINAPI GetTextCharacterExtra16(HDC16);
INT WINAPI GetTextCharacterExtra(HDC);
-UINT16 WINAPI GetTextCharset16(HDC16);
UINT WINAPI GetTextCharset(HDC);
-COLORREF WINAPI GetTextColor16(HDC16);
-COLORREF WINAPI GetTextColor(HDC);
-BOOL16 WINAPI GetTextExtentPoint16(HDC16,LPCSTR,INT16,LPSIZE16);
-BOOL WINAPI GetTextExtentPointA(HDC,LPCSTR,INT,LPSIZE);
-BOOL WINAPI GetTextExtentPointW(HDC,LPCWSTR,INT,LPSIZE);
+UINT WINAPI GetTextCharsetInfo(HDC,LPFONTSIGNATURE,DWORD);
+COLORREF WINAPI GetTextColor(HDC);
+BOOL WINAPI GetTextExtentExPointA(HDC,LPCSTR,INT,INT,
+ LPINT,LPINT,LPSIZE);
+BOOL WINAPI GetTextExtentExPointW(HDC,LPCWSTR,INT,INT,
+ LPINT,LPINT,LPSIZE);
+BOOL WINAPI GetTextExtentPointA(HDC,LPCSTR,INT,LPSIZE);
+BOOL WINAPI GetTextExtentPointW(HDC,LPCWSTR,INT,LPSIZE);
#define GetTextExtentPoint WINELIB_NAME_AW(GetTextExtentPoint)
-BOOL WINAPI GetTextExtentPoint32A(HDC,LPCSTR,INT,LPSIZE);
-BOOL WINAPI GetTextExtentPoint32W(HDC,LPCWSTR,INT,LPSIZE);
+BOOL WINAPI GetTextExtentPoint32A(HDC,LPCSTR,INT,LPSIZE);
+BOOL WINAPI GetTextExtentPoint32W(HDC,LPCWSTR,INT,LPSIZE);
#define GetTextExtentPoint32 WINELIB_NAME_AW(GetTextExtentPoint32)
-INT16 WINAPI GetTextFace16(HDC16,INT16,LPSTR);
+#define GetTextExtentExPoint WINELIB_NAME_AW(GetTextExtentExPoint)
INT WINAPI GetTextFaceA(HDC,INT,LPSTR);
INT WINAPI GetTextFaceW(HDC,INT,LPWSTR);
#define GetTextFace WINELIB_NAME_AW(GetTextFace)
-BOOL16 WINAPI GetTextMetrics16(HDC16,LPTEXTMETRIC16);
BOOL WINAPI GetTextMetricsA(HDC,LPTEXTMETRICA);
BOOL WINAPI GetTextMetricsW(HDC,LPTEXTMETRICW);
#define GetTextMetrics WINELIB_NAME_AW(GetTextMetrics)
-BOOL16 WINAPI GetViewportExtEx16(HDC16,LPSIZE16);
BOOL WINAPI GetViewportExtEx(HDC,LPSIZE);
-BOOL16 WINAPI GetViewportOrgEx16(HDC16,LPPOINT16);
BOOL WINAPI GetViewportOrgEx(HDC,LPPOINT);
-BOOL16 WINAPI GetWindowExtEx16(HDC16,LPSIZE16);
BOOL WINAPI GetWindowExtEx(HDC,LPSIZE);
-BOOL16 WINAPI GetWindowOrgEx16(HDC16,LPPOINT16);
BOOL WINAPI GetWindowOrgEx(HDC,LPPOINT);
-INT16 WINAPI IntersectClipRect16(HDC16,INT16,INT16,INT16,INT16);
+BOOL WINAPI GetWorldTransform(HDC,LPXFORM);
INT WINAPI IntersectClipRect(HDC,INT,INT,INT,INT);
-BOOL16 WINAPI InvertRgn16(HDC16,HRGN16);
BOOL WINAPI InvertRgn(HDC,HRGN);
-VOID WINAPI LineDDA16(INT16,INT16,INT16,INT16,LINEDDAPROC16,LPARAM);
BOOL WINAPI LineDDA(INT,INT,INT,INT,LINEDDAPROC,LPARAM);
-BOOL16 WINAPI LineTo16(HDC16,INT16,INT16);
BOOL WINAPI LineTo(HDC,INT,INT);
-BOOL16 WINAPI LPtoDP16(HDC16,LPPOINT16,INT16);
BOOL WINAPI LPtoDP(HDC,LPPOINT,INT);
-BOOL16 WINAPI MoveToEx16(HDC16,INT16,INT16,LPPOINT16);
+BOOL WINAPI MaskBlt(HDC,INT,INT,INT,INT,HDC,INT,INT,HBITMAP,INT,INT,DWORD);
+BOOL WINAPI ModifyWorldTransform(HDC,const XFORM *, DWORD);
BOOL WINAPI MoveToEx(HDC,INT,INT,LPPOINT);
-INT16 WINAPI MulDiv16(INT16,INT16,INT16);
/* FIXME This is defined in kernel32.spec !?*/
INT WINAPI MulDiv(INT,INT,INT);
-INT16 WINAPI OffsetClipRgn16(HDC16,INT16,INT16);
INT WINAPI OffsetClipRgn(HDC,INT,INT);
-INT16 WINAPI OffsetRgn16(HRGN16,INT16,INT16);
INT WINAPI OffsetRgn(HRGN,INT,INT);
-BOOL16 WINAPI OffsetViewportOrgEx16(HDC16,INT16,INT16,LPPOINT16);
BOOL WINAPI OffsetViewportOrgEx(HDC,INT,INT,LPPOINT);
-BOOL16 WINAPI OffsetWindowOrgEx16(HDC16,INT16,INT16,LPPOINT16);
BOOL WINAPI OffsetWindowOrgEx(HDC,INT,INT,LPPOINT);
-BOOL16 WINAPI PaintRgn16(HDC16,HRGN16);
BOOL WINAPI PaintRgn(HDC,HRGN);
-BOOL16 WINAPI PatBlt16(HDC16,INT16,INT16,INT16,INT16,DWORD);
BOOL WINAPI PatBlt(HDC,INT,INT,INT,INT,DWORD);
-HRGN16 WINAPI PathToRegion16(HDC16);
HRGN WINAPI PathToRegion(HDC);
-BOOL16 WINAPI Pie16(HDC16,INT16,INT16,INT16,INT16,INT16,INT16,INT16,INT16);
BOOL WINAPI Pie(HDC,INT,INT,INT,INT,INT,INT,INT,INT);
-BOOL16 WINAPI PlayMetaFile16(HDC16,HMETAFILE16);
+BOOL WINAPI PlayEnhMetaFile(HDC,HENHMETAFILE,const RECT*);
+BOOL WINAPI PlayEnhMetaFileRecord(HDC,LPHANDLETABLE,const ENHMETARECORD*,UINT);
BOOL WINAPI PlayMetaFile(HDC,HMETAFILE);
-VOID WINAPI PlayMetaFileRecord16(HDC16,LPHANDLETABLE16,LPMETARECORD,UINT16);
BOOL WINAPI PlayMetaFileRecord(HDC,LPHANDLETABLE,LPMETARECORD,UINT);
-BOOL16 WINAPI PolyBezier16(HDC16,const POINT16*,INT16);
+BOOL WINAPI PlgBlt(HDC,const POINT*,HDC,INT,INT,INT,INT,HBITMAP,INT,INT);
BOOL WINAPI PolyBezier(HDC,const POINT*,DWORD);
-BOOL16 WINAPI PolyBezierTo16(HDC16,const POINT16*,INT16);
BOOL WINAPI PolyBezierTo(HDC,const POINT*,DWORD);
-BOOL16 WINAPI PolyPolygon16(HDC16,const POINT16*,const INT16*,UINT16);
+BOOL WINAPI PolyDraw(HDC,const POINT*,const BYTE*,DWORD);
BOOL WINAPI PolyPolygon(HDC,const POINT*,const INT*,UINT);
-BOOL16 WINAPI Polygon16(HDC16,const POINT16*,INT16);
+BOOL WINAPI PolyPolyline(HDC,const POINT*,const DWORD*,DWORD);
BOOL WINAPI Polygon(HDC,const POINT*,INT);
-BOOL16 WINAPI Polyline16(HDC16,const POINT16*,INT16);
BOOL WINAPI Polyline(HDC,const POINT*,INT);
BOOL WINAPI PolylineTo(HDC,const POINT*,DWORD);
-BOOL16 WINAPI PtInRegion16(HRGN16,INT16,INT16);
BOOL WINAPI PtInRegion(HRGN,INT,INT);
-BOOL16 WINAPI PtVisible16(HDC16,INT16,INT16);
BOOL WINAPI PtVisible(HDC,INT,INT);
-/* FIXME This is defined in user.spec !? */
-UINT16 WINAPI RealizePalette16(HDC16);
UINT WINAPI RealizePalette(HDC);
-BOOL16 WINAPI Rectangle16(HDC16,INT16,INT16,INT16,INT16);
BOOL WINAPI Rectangle(HDC,INT,INT,INT,INT);
-BOOL16 WINAPI RectInRegion16(HRGN16,const RECT16 *);
BOOL WINAPI RectInRegion(HRGN,const RECT *);
-BOOL16 WINAPI RectVisible16(HDC16,const RECT16*);
BOOL WINAPI RectVisible(HDC,const RECT*);
-BOOL16 WINAPI RemoveFontResource16(SEGPTR);
BOOL WINAPI RemoveFontResourceA(LPCSTR);
BOOL WINAPI RemoveFontResourceW(LPCWSTR);
#define RemoveFontResource WINELIB_NAME_AW(RemoveFontResource)
-HDC16 WINAPI ResetDC16(HDC16,const DEVMODE16 *);
HDC WINAPI ResetDCA(HDC,const DEVMODEA *);
HDC WINAPI ResetDCW(HDC,const DEVMODEW *);
#define ResetDC WINELIB_NAME_AW(ResetDC)
-BOOL16 WINAPI ResizePalette16(HPALETTE16,UINT16);
BOOL WINAPI ResizePalette(HPALETTE,UINT);
-BOOL16 WINAPI RestoreDC16(HDC16,INT16);
BOOL WINAPI RestoreDC(HDC,INT);
-BOOL16 WINAPI RoundRect16(HDC16,INT16,INT16,INT16,INT16,INT16,INT16);
BOOL WINAPI RoundRect(HDC,INT,INT,INT,INT,INT,INT);
-INT16 WINAPI SaveDC16(HDC16);
INT WINAPI SaveDC(HDC);
-BOOL16 WINAPI ScaleViewportExtEx16(HDC16,INT16,INT16,INT16,INT16,LPSIZE16);
BOOL WINAPI ScaleViewportExtEx(HDC,INT,INT,INT,INT,LPSIZE);
-BOOL16 WINAPI ScaleWindowExtEx16(HDC16,INT16,INT16,INT16,INT16,LPSIZE16);
BOOL WINAPI ScaleWindowExtEx(HDC,INT,INT,INT,INT,LPSIZE);
-BOOL16 WINAPI SelectClipPath16(HDC16,INT16);
BOOL WINAPI SelectClipPath(HDC,INT);
-INT16 WINAPI SelectClipRgn16(HDC16,HRGN16);
INT WINAPI SelectClipRgn(HDC,HRGN);
-HGDIOBJ16 WINAPI SelectObject16(HDC16,HGDIOBJ16);
HGDIOBJ WINAPI SelectObject(HDC,HGDIOBJ);
-/* FIXME This is defined in user.spec !? */
-HPALETTE16 WINAPI SelectPalette16(HDC16,HPALETTE16,BOOL16);
HPALETTE WINAPI SelectPalette(HDC,HPALETTE,BOOL);
-INT16 WINAPI SetAbortProc16(HDC16,SEGPTR);
INT WINAPI SetAbortProc(HDC,ABORTPROC);
-INT16 WINAPI SetArcDirection16(HDC16,INT16);
INT WINAPI SetArcDirection(HDC,INT);
-LONG WINAPI SetBitmapBits16(HBITMAP16,LONG,LPCVOID);
-LONG WINAPI SetBitmapBits(HBITMAP,LONG,LPCVOID);
-BOOL16 WINAPI SetBitmapDimensionEx16(HBITMAP16,INT16,INT16,LPSIZE16);
+LONG WINAPI SetBitmapBits(HBITMAP,LONG,LPCVOID);
BOOL WINAPI SetBitmapDimensionEx(HBITMAP,INT,INT,LPSIZE);
-COLORREF WINAPI SetBkColor16(HDC16,COLORREF);
-COLORREF WINAPI SetBkColor(HDC,COLORREF);
-INT16 WINAPI SetBkMode16(HDC16,INT16);
+COLORREF WINAPI SetBkColor(HDC,COLORREF);
INT WINAPI SetBkMode(HDC,INT);
-UINT16 WINAPI SetBoundsRect16(HDC16,const RECT16*,UINT16);
UINT WINAPI SetBoundsRect(HDC,const RECT*,UINT);
-UINT16 WINAPI SetDIBColorTable16(HDC16,UINT16,UINT16,RGBQUAD*);
+BOOL WINAPI SetBrushOrgEx(HDC,INT,INT,LPPOINT);
+BOOL WINAPI SetColorAdjustment(HDC,const COLORADJUSTMENT*);
UINT WINAPI SetDIBColorTable(HDC,UINT,UINT,RGBQUAD*);
-INT16 WINAPI SetDIBits16(HDC16,HBITMAP16,UINT16,UINT16,LPCVOID,const BITMAPINFO*,UINT16);
INT WINAPI SetDIBits(HDC,HBITMAP,UINT,UINT,LPCVOID,const BITMAPINFO*,UINT);
-INT16 WINAPI SetDIBitsToDevice16(HDC16,INT16,INT16,INT16,INT16,INT16,
- INT16,UINT16,UINT16,LPCVOID,const BITMAPINFO*,UINT16);
INT WINAPI SetDIBitsToDevice(HDC,INT,INT,DWORD,DWORD,INT,
INT,UINT,UINT,LPCVOID,const BITMAPINFO*,UINT);
-INT16 WINAPI SetMapMode16(HDC16,INT16);
+HENHMETAFILE WINAPI SetEnhMetaFileBits(UINT,const BYTE *);
+INT WINAPI SetGraphicsMode(HDC,INT);
INT WINAPI SetMapMode(HDC,INT);
-DWORD WINAPI SetMapperFlags16(HDC16,DWORD);
-DWORD WINAPI SetMapperFlags(HDC,DWORD);
-UINT16 WINAPI SetPaletteEntries16(HPALETTE16,UINT16,UINT16,LPPALETTEENTRY);
+DWORD WINAPI SetMapperFlags(HDC,DWORD);
+HMETAFILE WINAPI SetMetaFileBitsEx(UINT,const BYTE*);
+BOOL WINAPI SetMiterLimit(HDC, FLOAT, PFLOAT);
UINT WINAPI SetPaletteEntries(HPALETTE,UINT,UINT,LPPALETTEENTRY);
-COLORREF WINAPI SetPixel16(HDC16,INT16,INT16,COLORREF);
-COLORREF WINAPI SetPixel(HDC,INT,INT,COLORREF);
+COLORREF WINAPI SetPixel(HDC,INT,INT,COLORREF);
BOOL WINAPI SetPixelV(HDC,INT,INT,COLORREF);
BOOL WINAPI SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR*);
-INT16 WINAPI SetPolyFillMode16(HDC16,INT16);
INT WINAPI SetPolyFillMode(HDC,INT);
-VOID WINAPI SetRectRgn16(HRGN16,INT16,INT16,INT16,INT16);
-VOID WINAPI SetRectRgn(HRGN,INT,INT,INT,INT);
-INT16 WINAPI SetRelAbs16(HDC16,INT16);
+BOOL WINAPI SetRectRgn(HRGN,INT,INT,INT,INT);
INT WINAPI SetRelAbs(HDC,INT);
-INT16 WINAPI SetROP216(HDC16,INT16);
INT WINAPI SetROP2(HDC,INT);
-INT16 WINAPI SetStretchBltMode16(HDC16,INT16);
INT WINAPI SetStretchBltMode(HDC,INT);
-UINT16 WINAPI SetSystemPaletteUse16(HDC16,UINT16);
UINT WINAPI SetSystemPaletteUse(HDC,UINT);
-UINT16 WINAPI SetTextAlign16(HDC16,UINT16);
UINT WINAPI SetTextAlign(HDC,UINT);
-INT16 WINAPI SetTextCharacterExtra16(HDC16,INT16);
INT WINAPI SetTextCharacterExtra(HDC,INT);
-COLORREF WINAPI SetTextColor16(HDC16,COLORREF);
-COLORREF WINAPI SetTextColor(HDC,COLORREF);
-INT16 WINAPI SetTextJustification16(HDC16,INT16,INT16);
+COLORREF WINAPI SetTextColor(HDC,COLORREF);
BOOL WINAPI SetTextJustification(HDC,INT,INT);
-BOOL16 WINAPI SetViewportExtEx16(HDC16,INT16,INT16,LPSIZE16);
BOOL WINAPI SetViewportExtEx(HDC,INT,INT,LPSIZE);
-BOOL16 WINAPI SetViewportOrgEx16(HDC16,INT16,INT16,LPPOINT16);
BOOL WINAPI SetViewportOrgEx(HDC,INT,INT,LPPOINT);
-BOOL16 WINAPI SetWindowExtEx16(HDC16,INT16,INT16,LPSIZE16);
BOOL WINAPI SetWindowExtEx(HDC,INT,INT,LPSIZE);
-BOOL16 WINAPI SetWindowOrgEx16(HDC16,INT16,INT16,LPPOINT16);
BOOL WINAPI SetWindowOrgEx(HDC,INT,INT,LPPOINT);
HENHMETAFILE WINAPI SetWinMetaFileBits(UINT,CONST BYTE*,HDC,CONST METAFILEPICT *);
-INT16 WINAPI StartDoc16(HDC16,const DOCINFO16*);
+BOOL WINAPI SetWorldTransform(HDC,const XFORM*);
INT WINAPI StartDocA(HDC,const DOCINFOA*);
INT WINAPI StartDocW(HDC,const DOCINFOW*);
#define StartDoc WINELIB_NAME_AW(StartDoc)
-INT16 WINAPI StartPage16(HDC16);
INT WINAPI StartPage(HDC);
-INT16 WINAPI EndPage16(HDC16);
INT WINAPI EndPage(HDC);
-BOOL16 WINAPI StretchBlt16(HDC16,INT16,INT16,INT16,INT16,HDC16,INT16,
- INT16,INT16,INT16,DWORD);
BOOL WINAPI StretchBlt(HDC,INT,INT,INT,INT,HDC,INT,
INT,INT,INT,DWORD);
-INT16 WINAPI StretchDIBits16(HDC16,INT16,INT16,INT16,INT16,INT16,INT16,
- INT16,INT16,const VOID*,const BITMAPINFO*,UINT16,DWORD);
INT WINAPI StretchDIBits(HDC,INT,INT,INT,INT,INT,INT,
INT,INT,const VOID*,const BITMAPINFO*,UINT,DWORD);
-BOOL16 WINAPI StrokeAndFillPath16(HDC16);
BOOL WINAPI StrokeAndFillPath(HDC);
-BOOL16 WINAPI StrokePath16(HDC16);
BOOL WINAPI StrokePath(HDC);
BOOL WINAPI SwapBuffers(HDC);
-BOOL16 WINAPI TextOut16(HDC16,INT16,INT16,LPCSTR,INT16);
BOOL WINAPI TextOutA(HDC,INT,INT,LPCSTR,INT);
BOOL WINAPI TextOutW(HDC,INT,INT,LPCWSTR,INT);
#define TextOut WINELIB_NAME_AW(TextOut)
-BOOL16 WINAPI UnrealizeObject16(HGDIOBJ16);
+BOOL WINAPI TranslateCharsetInfo(LPDWORD,LPCHARSETINFO,DWORD);
BOOL WINAPI UnrealizeObject(HGDIOBJ);
-INT16 WINAPI UpdateColors16(HDC16);
BOOL WINAPI UpdateColors(HDC);
-BOOL16 WINAPI WidenPath16(HDC16);
BOOL WINAPI WidenPath(HDC);
#ifdef __cplusplus
