Merge numerous changes from ReactOS. Submitted by Filip Navara.
This commit is contained in:
@ -2014,6 +2014,14 @@ typedef struct tagENHMETAHEADER {
|
||||
DWORD nPalEntries;
|
||||
SIZEL szlDevice;
|
||||
SIZEL szlMillimeters;
|
||||
#if (WINVER >= 0x0400)
|
||||
DWORD cbPixelFormat;
|
||||
DWORD offPixelFormat;
|
||||
DWORD bOpenGL;
|
||||
#endif
|
||||
#if (WINVER >= 0x0500)
|
||||
SIZEL szlMicrometers;
|
||||
#endif
|
||||
} ENHMETAHEADER,*LPENHMETAHEADER;
|
||||
typedef struct tagMETARECORD {
|
||||
DWORD rdSize;
|
||||
@ -2114,6 +2122,21 @@ typedef struct _GLYPHMETRICS {
|
||||
short gmCellIncX;
|
||||
short gmCellIncY;
|
||||
} GLYPHMETRICS,*LPGLYPHMETRICS;
|
||||
#if (_WIN32_WINNT >= 0x0500)
|
||||
typedef struct tagWCRANGE
|
||||
{
|
||||
WCHAR wcLow;
|
||||
USHORT cGlyphs;
|
||||
} WCRANGE, *PWCRANGE, *LPWCRANGE;
|
||||
typedef struct tagGLYPHSET
|
||||
{
|
||||
DWORD cbThis;
|
||||
DWORD flAccel;
|
||||
DWORD cGlyphsSupported;
|
||||
DWORD cRanges;
|
||||
WCRANGE ranges[1];
|
||||
} GLYPHSET, *PGLYPHSET, *LPGLYPHSET;
|
||||
#endif
|
||||
typedef struct tagKERNINGPAIR {
|
||||
WORD wFirst;
|
||||
WORD wSecond;
|
||||
@ -2210,7 +2233,7 @@ typedef struct _POLYTEXTA {
|
||||
UINT uiFlags;
|
||||
RECT rcl;
|
||||
int *pdx;
|
||||
} POLYTEXTA, *PPOLYTEXTA;
|
||||
} POLYTEXTA, *PPOLYTEXTA, *LPPOLYTEXTA;
|
||||
typedef struct _POLYTEXTW {
|
||||
int x;
|
||||
int y;
|
||||
@ -2219,7 +2242,7 @@ typedef struct _POLYTEXTW {
|
||||
UINT uiFlags;
|
||||
RECT rcl;
|
||||
int *pdx;
|
||||
} POLYTEXTW, *PPOLYTEXTW;
|
||||
} POLYTEXTW, *PPOLYTEXTW, *LPPOLYTEXTW;
|
||||
typedef struct tagPIXELFORMATDESCRIPTOR {
|
||||
WORD nSize;
|
||||
WORD nVersion;
|
||||
@ -2348,8 +2371,8 @@ typedef struct tagENUMLOGFONTEXA {
|
||||
typedef struct tagENUMLOGFONTEXW {
|
||||
LOGFONTW elfLogFont;
|
||||
WCHAR elfFullName[LF_FULLFACESIZE];
|
||||
BYTE elfStyle[LF_FACESIZE];
|
||||
BYTE elfScript[LF_FACESIZE];
|
||||
WCHAR elfStyle[LF_FACESIZE];
|
||||
WCHAR elfScript[LF_FACESIZE];
|
||||
} ENUMLOGFONTEXW,*LPENUMLOGFONTEXW;
|
||||
typedef struct tagPOINTFX {
|
||||
FIXED x;
|
||||
@ -2414,6 +2437,18 @@ typedef struct _DESIGNVECTOR {
|
||||
DWORD dvNumAxes;
|
||||
LONG dvValues[MM_MAX_NUMAXES];
|
||||
} DESIGNVECTOR, *PDESIGNVECTOR, FAR *LPDESIGNVECTOR;
|
||||
#if _WIN32_WINNT >= 0x0500
|
||||
typedef struct tagENUMLOGFONTEXDVA
|
||||
{
|
||||
ENUMLOGFONTEXA elfEnumLogfontEx;
|
||||
DESIGNVECTOR elfDesignVector;
|
||||
} ENUMLOGFONTEXDVA, *PENUMLOGFONTEXDVA, *LPENUMLOGFONTEXDVA;
|
||||
typedef struct tagENUMLOGFONTEXDVW
|
||||
{
|
||||
ENUMLOGFONTEXW elfEnumLogfontEx;
|
||||
DESIGNVECTOR elfDesignVector;
|
||||
} ENUMLOGFONTEXDVW, *PENUMLOGFONTEXDVW, *LPENUMLOGFONTEXDVW;
|
||||
#endif /* _WIN32_WINNT >= 0x0500 */
|
||||
typedef USHORT COLOR16;
|
||||
typedef struct _TRIVERTEX {
|
||||
LONG x;
|
||||
@ -2843,10 +2878,13 @@ typedef TEXTMETRICW TEXTMETRIC,*PTEXTMETRIC,*LPTEXTMETRIC;
|
||||
#define ICMENUMPROC ICMENUMPROCW
|
||||
#define FONTENUMPROC FONTENUMPROCW
|
||||
typedef DEVMODEW DEVMODE,*PDEVMODE,*LPDEVMODE;
|
||||
typedef ENUMLOGFONTEXDVW ENUMLOGFONTEXDV;
|
||||
typedef PENUMLOGFONTEXDVW PENUMLOGFONTEXDV;
|
||||
typedef LPENUMLOGFONTEXDVW LPENUMLOGFONTEXDV;
|
||||
typedef EXTLOGFONTW EXTLOGFONT,*PEXTLOGFONT,*LPEXTLOGFONT;
|
||||
typedef GCP_RESULTSW GCP_RESULTS,*LPGCP_RESULTS;
|
||||
typedef OUTLINETEXTMETRICW OUTLINETEXTMETRIC,*POUTLINETEXTMETRIC,*LPOUTLINETEXTMETRIC;
|
||||
typedef POLYTEXTW POLYTEXT;
|
||||
typedef POLYTEXTW POLYTEXT,*PPOLYTEXT,*LPPOLYTEXT;
|
||||
typedef LOGCOLORSPACEW LOGCOLORSPACE,*LPLOGCOLORSPACE;
|
||||
typedef NEWTEXTMETRICW NEWTEXTMETRIC,*PNEWTEXTMETRIC,*LPNEWTEXTMETRIC;
|
||||
typedef NEWTEXTMETRICEXW NEWTEXTMETRICEX;
|
||||
@ -2912,10 +2950,13 @@ typedef TEXTMETRICA TEXTMETRIC,*PTEXTMETRIC,*LPTEXTMETRIC;
|
||||
#define ICMENUMPROC ICMENUMPROCA
|
||||
#define FONTENUMPROC FONTENUMPROCA
|
||||
typedef DEVMODEA DEVMODE,*PDEVMODE,*LPDEVMODE;
|
||||
typedef ENUMLOGFONTEXDVA ENUMLOGFONTEXDV;
|
||||
typedef PENUMLOGFONTEXDVA PENUMLOGFONTEXDV;
|
||||
typedef LPENUMLOGFONTEXDVA LPENUMLOGFONTEXDV;
|
||||
typedef EXTLOGFONTA EXTLOGFONT,*PEXTLOGFONT,*LPEXTLOGFONT;
|
||||
typedef GCP_RESULTSA GCP_RESULTS,*LPGCP_RESULTS;
|
||||
typedef OUTLINETEXTMETRICA OUTLINETEXTMETRIC,*POUTLINETEXTMETRIC,*LPOUTLINETEXTMETRIC;
|
||||
typedef POLYTEXTA POLYTEXT;
|
||||
typedef POLYTEXTA POLYTEXT,*PPOLYTEXT,*LPPOLYTEXT;
|
||||
typedef LOGCOLORSPACEA LOGCOLORSPACE,*LPLOGCOLORSPACE;
|
||||
typedef NEWTEXTMETRICA NEWTEXTMETRIC,*PNEWTEXTMETRIC,*LPNEWTEXTMETRIC;
|
||||
typedef NEWTEXTMETRICEXA NEWTEXTMETRICEX;
|
||||
|
Reference in New Issue
Block a user