diff options
Diffstat (limited to 'winsup/w32api/include/wingdi.h')
| -rw-r--r-- | winsup/w32api/include/wingdi.h | 42 |
1 files changed, 33 insertions, 9 deletions
diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h index 7045d20ea..a3717106a 100644 --- a/winsup/w32api/include/wingdi.h +++ b/winsup/w32api/include/wingdi.h @@ -1401,7 +1401,7 @@ typedef struct _XFORM { FLOAT eM22; FLOAT eDx; FLOAT eDy; -} XFORM,*LPXFORM; +} XFORM,*PXFORM,*LPXFORM; typedef struct tagEMRBITBLT { EMR emr; RECTL rclBounds; @@ -1423,7 +1423,7 @@ typedef struct tagLOGBRUSH { UINT lbStyle; COLORREF lbColor; LONG lbHatch; -} LOGBRUSH,*LPLOGBRUSH; +} LOGBRUSH,*PLOGBRUSH,*LPLOGBRUSH; typedef LOGBRUSH PATTERN,*PPATTERN,*LPPATTERN; typedef struct tagEMRCREATEBRUSHINDIRECT { EMR emr; @@ -1499,7 +1499,7 @@ typedef struct tagLOGPEN { UINT lopnStyle; POINT lopnWidth; COLORREF lopnColor; -} LOGPEN,*LPLOGPEN; +} LOGPEN,*PLOGPEN,*LPLOGPEN; typedef struct tagEMRCREATEPEN { EMR emr; DWORD ihPen; @@ -2020,7 +2020,7 @@ typedef struct _RGNDATAHEADER { typedef struct _RGNDATA { RGNDATAHEADER rdh; char Buffer[1]; -} RGNDATA,*LPRGNDATA; +} RGNDATA,*PRGNDATA, *LPRGNDATA; /* for GetRandomRgn */ #define SYSRGN 4 typedef struct tagGCP_RESULTSA { @@ -2148,7 +2148,7 @@ typedef struct _POLYTEXTA { UINT uiFlags; RECT rcl; int *pdx; -} POLYTEXTA; +} POLYTEXTA, *PPOLYTEXTA; typedef struct _POLYTEXTW { int x; int y; @@ -2157,7 +2157,7 @@ typedef struct _POLYTEXTW { UINT uiFlags; RECT rcl; int *pdx; -} POLYTEXTW; +} POLYTEXTW, *PPOLYTEXTW; typedef struct tagPIXELFORMATDESCRIPTOR { WORD nSize; WORD nVersion; @@ -2346,6 +2346,30 @@ typedef struct _BLENDFUNCTION { BYTE SourceConstantAlpha; BYTE AlphaFormat; } BLENDFUNCTION,*PBLENDFUNCTION,*LPBLENDFUNCTION; +#define MM_MAX_NUMAXES 16 +typedef struct _DESIGNVECTOR { + DWORD dvReserved; + DWORD dvNumAxes; + LONG dvValues[MM_MAX_NUMAXES]; +} DESIGNVECTOR, *PDESIGNVECTOR, FAR *LPDESIGNVECTOR; +typedef USHORT COLOR16; +typedef struct _TRIVERTEX { + LONG x; + LONG y; + COLOR16 Red; + COLOR16 Green; + COLOR16 Blue; + COLOR16 Alpha; +} TRIVERTEX, *PTRIVERTEX, *LPTRIVERTEX; +typedef struct _DISPLAY_DEVICE { + DWORD cb; + WCHAR DeviceName[32]; + WCHAR DeviceString[128]; + DWORD StateFlags; + WCHAR DeviceID[128]; + WCHAR DeviceKey[128]; +} DISPLAY_DEVICE, *PDISPLAY_DEVICE; + typedef BOOL (CALLBACK *ABORTPROC)(HDC,int); typedef int (CALLBACK *MFENUMPROC)(HDC,HANDLETABLE*,METARECORD*,int,LPARAM); typedef int (CALLBACK *ENHMFENUMPROC)(HDC,HANDLETABLE*,ENHMETARECORD*,int,LPARAM); @@ -2450,7 +2474,7 @@ int WINAPI EnumFontFamiliesW(HDC,LPCWSTR,FONTENUMPROCW,LPARAM); int WINAPI EnumFontFamiliesExA(HDC,PLOGFONTA,FONTENUMPROCA,LPARAM,DWORD); int WINAPI EnumFontFamiliesExW(HDC,PLOGFONTW,FONTENUMPROCW,LPARAM,DWORD); int WINAPI EnumFontsA(HDC,LPCSTR,FONTENUMPROCA,LPARAM); -int WINAPI EnumFontsW(HDC,LPCWSTR,FONTENUMPROCA,LPARAM); +int WINAPI EnumFontsW(HDC,LPCWSTR,FONTENUMPROCW,LPARAM); int WINAPI EnumICMProfilesA(HDC,ICMENUMPROCA,LPARAM); int WINAPI EnumICMProfilesW(HDC,ICMENUMPROCW,LPARAM); BOOL WINAPI EnumMetaFile(HDC,HMETAFILE,MFENUMPROC,LPARAM); @@ -2523,7 +2547,7 @@ UINT WINAPI GetEnhMetaFileDescriptionA(HENHMETAFILE,UINT,LPSTR); UINT WINAPI GetEnhMetaFileDescriptionW(HENHMETAFILE,UINT,LPWSTR); UINT WINAPI GetEnhMetaFileHeader(HENHMETAFILE,UINT,LPENHMETAHEADER); UINT WINAPI GetEnhMetaFilePaletteEntries(HENHMETAFILE,UINT,LPPALETTEENTRY); -UINT WINAPI GetEnhMetaFilePixelFormat(HENHMETAFILE,DWORD,PIXELFORMATDESCRIPTOR*); +UINT WINAPI GetEnhMetaFilePixelFormat(HENHMETAFILE,DWORD,CONST PIXELFORMATDESCRIPTOR*); DWORD WINAPI GetFontData(HDC,DWORD,DWORD,PVOID,DWORD); DWORD WINAPI GetFontLanguageInfo(HDC); DWORD WINAPI GetGlyphOutlineA(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,PVOID,const MAT2*); @@ -2700,7 +2724,7 @@ BOOL WINAPI wglDeleteContext(HGLRC); BOOL WINAPI wglDescribeLayerPlane(HDC,int,int,UINT,LPLAYERPLANEDESCRIPTOR); HGLRC WINAPI wglGetCurrentContext(void); HDC WINAPI wglGetCurrentDC(void); -int WINAPI wglGetLayerPaletteEntries(HDC,int,int,int,COLORREF*); +int WINAPI wglGetLayerPaletteEntries(HDC,int,int,int,CONST COLORREF*); PROC WINAPI wglGetProcAddress(LPCSTR); BOOL WINAPI wglMakeCurrent(HDC,HGLRC); BOOL WINAPI wglRealizeLayerPalette(HDC,int,BOOL); |