mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 19:49:50 +00:00
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().
This commit is contained in:
Huw D M Davies
Alexandre Julliard
parent
9d14a001f7
commit
a9f55c46c1
13 changed files with 1339 additions and 966 deletions
|
|
@ -97,7 +97,7 @@ HFONT16 PSDRV_FONT_SelectObject( DC * dc, HFONT16 hfont,
|
|||
if(physDev->font.tm.tmHeight < 0) {
|
||||
physDev->font.tm.tmHeight *= - (afm->FullAscender - afm->Descender) /
|
||||
(afm->Ascender - afm->Descender);
|
||||
TRACE(psdrv, "Fixed -ve height to %d\n", physDev->font.tm.tmHeight);
|
||||
TRACE(psdrv, "Fixed -ve height to %ld\n", physDev->font.tm.tmHeight);
|
||||
}
|
||||
physDev->font.size = physDev->font.tm.tmHeight * 1000.0 /
|
||||
(afm->FullAscender - afm->Descender);
|
||||
|
|
@ -131,10 +131,10 @@ HFONT16 PSDRV_FONT_SelectObject( DC * dc, HFONT16 hfont,
|
|||
|
||||
physDev->font.set = FALSE;
|
||||
|
||||
TRACE(psdrv, "Selected PS font '%s' size %d weight %d.\n",
|
||||
TRACE(psdrv, "Selected PS font '%s' size %d weight %ld.\n",
|
||||
physDev->font.afm->FontName, physDev->font.size,
|
||||
physDev->font.tm.tmWeight );
|
||||
TRACE(psdrv, "H = %d As = %d Des = %d IL = %d EL = %d\n",
|
||||
TRACE(psdrv, "H = %ld As = %ld Des = %ld IL = %ld EL = %ld\n",
|
||||
physDev->font.tm.tmHeight, physDev->font.tm.tmAscent,
|
||||
physDev->font.tm.tmDescent, physDev->font.tm.tmInternalLeading,
|
||||
physDev->font.tm.tmExternalLeading);
|
||||
|
|
|
|||
|
|
@ -52,7 +52,8 @@ BOOL WIN16DRV_GetTextMetrics( DC *dc, TEXTMETRICA *metrics )
|
|||
|
||||
FONT_TextMetric16to32A( &physDev->tm, metrics );
|
||||
|
||||
TRACE(win16drv, "H %d, A %d, D %d, Int %d, Ext %d, AW %d, MW %d, W %d\n",
|
||||
TRACE(win16drv,
|
||||
"H %ld, A %ld, D %ld, Int %ld, Ext %ld, AW %ld, MW %ld, W %ld\n",
|
||||
metrics->tmHeight,
|
||||
metrics->tmAscent,
|
||||
metrics->tmDescent,
|
||||
|
|
|
|||
|
|
@ -7,8 +7,11 @@
|
|||
#ifndef __WINE_GDI_H
|
||||
#define __WINE_GDI_H
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include "windef.h"
|
||||
#include "wingdi.h"
|
||||
#include "wine/wingdi16.h"
|
||||
#include "ldt.h"
|
||||
#include "local.h"
|
||||
#include "path.h"
|
||||
|
|
@ -302,7 +305,7 @@ typedef struct tagFLOAT_POINT
|
|||
* transformation process is done in floating point internally. This function
|
||||
* is then used to round these coordinates to integer values.
|
||||
*/
|
||||
static __inline__ INT WINE_UNUSED GDI_ROUND(FLOAT val)
|
||||
static inline INT WINE_UNUSED GDI_ROUND(FLOAT val)
|
||||
{
|
||||
return (int)floor(val + 0.5);
|
||||
}
|
||||
|
|
@ -310,7 +313,7 @@ static __inline__ INT WINE_UNUSED GDI_ROUND(FLOAT val)
|
|||
/* Performs a viewport-to-world transformation on the specified point (which
|
||||
* is in floating point format). Returns TRUE if successful, else FALSE.
|
||||
*/
|
||||
static __inline__ BOOL WINE_UNUSED INTERNAL_DPTOLP_FLOAT(DC *dc, FLOAT_POINT *point)
|
||||
static inline BOOL WINE_UNUSED INTERNAL_DPTOLP_FLOAT(DC *dc, FLOAT_POINT *point)
|
||||
{
|
||||
FLOAT x, y;
|
||||
|
||||
|
|
@ -334,7 +337,7 @@ static __inline__ BOOL WINE_UNUSED INTERNAL_DPTOLP_FLOAT(DC *dc, FLOAT_POINT *po
|
|||
/* Performs a viewport-to-world transformation on the specified point (which
|
||||
* is in integer format). Returns TRUE if successful, else FALSE.
|
||||
*/
|
||||
static __inline__ BOOL WINE_UNUSED INTERNAL_DPTOLP(DC *dc, LPPOINT point)
|
||||
static inline BOOL WINE_UNUSED INTERNAL_DPTOLP(DC *dc, LPPOINT point)
|
||||
{
|
||||
FLOAT_POINT floatPoint;
|
||||
|
||||
|
|
@ -354,7 +357,7 @@ static __inline__ BOOL WINE_UNUSED INTERNAL_DPTOLP(DC *dc, LPPOINT point)
|
|||
/* Performs a world-to-viewport transformation on the specified point (which
|
||||
* is in floating point format).
|
||||
*/
|
||||
static __inline__ void WINE_UNUSED INTERNAL_LPTODP_FLOAT(DC *dc, FLOAT_POINT *point)
|
||||
static inline void WINE_UNUSED INTERNAL_LPTODP_FLOAT(DC *dc, FLOAT_POINT *point)
|
||||
{
|
||||
FLOAT x, y;
|
||||
|
||||
|
|
@ -372,7 +375,7 @@ static __inline__ void WINE_UNUSED INTERNAL_LPTODP_FLOAT(DC *dc, FLOAT_POINT *po
|
|||
/* Performs a world-to-viewport transformation on the specified point (which
|
||||
* is in integer format).
|
||||
*/
|
||||
static __inline__ void WINE_UNUSED INTERNAL_LPTODP(DC *dc, LPPOINT point)
|
||||
static inline void WINE_UNUSED INTERNAL_LPTODP(DC *dc, LPPOINT point)
|
||||
{
|
||||
FLOAT_POINT floatPoint;
|
||||
|
||||
|
|
|
|||
|
|
@ -299,14 +299,10 @@ typedef LRESULT (CALLBACK *FARPROC16)();
|
|||
typedef LRESULT (CALLBACK *FARPROC)();
|
||||
typedef INT16 (CALLBACK *PROC16)();
|
||||
typedef INT (CALLBACK *PROC)();
|
||||
typedef INT16 (CALLBACK *GOBJENUMPROC16)(SEGPTR,LPARAM);
|
||||
typedef INT (CALLBACK *GOBJENUMPROC)(LPVOID,LPARAM);
|
||||
typedef BOOL16 (CALLBACK *GRAYSTRINGPROC16)(HDC16,LPARAM,INT16);
|
||||
typedef BOOL (CALLBACK *GRAYSTRINGPROC)(HDC,LPARAM,INT);
|
||||
typedef LRESULT (CALLBACK *HOOKPROC16)(INT16,WPARAM16,LPARAM);
|
||||
typedef LRESULT (CALLBACK *HOOKPROC)(INT,WPARAM,LPARAM);
|
||||
typedef VOID (CALLBACK *LINEDDAPROC16)(INT16,INT16,LPARAM);
|
||||
typedef VOID (CALLBACK *LINEDDAPROC)(INT,INT,LPARAM);
|
||||
typedef BOOL16 (CALLBACK *PROPENUMPROC16)(HWND16,SEGPTR,HANDLE16);
|
||||
typedef BOOL (CALLBACK *PROPENUMPROCA)(HWND,LPCSTR,HANDLE);
|
||||
typedef BOOL (CALLBACK *PROPENUMPROCW)(HWND,LPCWSTR,HANDLE);
|
||||
|
|
|
|||
549
include/wine/wingdi16.h
Normal file
549
include/wine/wingdi16.h
Normal file
|
|
@ -0,0 +1,549 @@
|
|||
#ifndef __WINE_WINGDI16_H
|
||||
#define __WINE_WINGDI16_H
|
||||
|
||||
#include "wingdi.h"
|
||||
|
||||
#include "pshpack1.h"
|
||||
|
||||
|
||||
typedef struct
|
||||
{
|
||||
WORD wFirst;
|
||||
WORD wSecond;
|
||||
INT16 iKernAmount;
|
||||
} KERNINGPAIR16, *LPKERNINGPAIR16;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
INT16 bmType;
|
||||
INT16 bmWidth;
|
||||
INT16 bmHeight;
|
||||
INT16 bmWidthBytes;
|
||||
BYTE bmPlanes;
|
||||
BYTE bmBitsPixel;
|
||||
SEGPTR bmBits;
|
||||
} BITMAP16, *LPBITMAP16;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
UINT16 lbStyle;
|
||||
COLORREF lbColor;
|
||||
INT16 lbHatch;
|
||||
} LOGBRUSH16, *LPLOGBRUSH16;
|
||||
|
||||
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];
|
||||
} LOGFONT16, *LPLOGFONT16;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
LOGFONT16 elfLogFont;
|
||||
BYTE elfFullName[LF_FULLFACESIZE];
|
||||
BYTE elfStyle[LF_FACESIZE];
|
||||
} ENUMLOGFONT16, *LPENUMLOGFONT16;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
LOGFONT16 elfLogFont;
|
||||
BYTE elfFullName[LF_FULLFACESIZE];
|
||||
BYTE elfStyle[LF_FACESIZE];
|
||||
BYTE elfScript[LF_FACESIZE];
|
||||
} ENUMLOGFONTEX16, *LPENUMLOGFONTEX16;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
INT16 txfHeight;
|
||||
INT16 txfWidth;
|
||||
INT16 txfEscapement;
|
||||
INT16 txfOrientation;
|
||||
INT16 txfWeight;
|
||||
CHAR txfItalic;
|
||||
CHAR txfUnderline;
|
||||
CHAR txfStrikeOut;
|
||||
CHAR txfOutPrecision;
|
||||
CHAR txfClipPrecision;
|
||||
INT16 txfAccelerator;
|
||||
INT16 txfOverhang;
|
||||
} 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;
|
||||
|
||||
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;
|
||||
INT16 tmDigitizedAspectX;
|
||||
INT16 tmDigitizedAspectY;
|
||||
} TEXTMETRIC16, *LPTEXTMETRIC16;
|
||||
|
||||
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;
|
||||
|
||||
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;
|
||||
INT16 tmDigitizedAspectX;
|
||||
INT16 tmDigitizedAspectY;
|
||||
DWORD ntmFlags;
|
||||
UINT16 ntmSizeEM;
|
||||
UINT16 ntmCellHeight;
|
||||
UINT16 ntmAvgWidth;
|
||||
} NEWTEXTMETRIC16,*LPNEWTEXTMETRIC16;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
NEWTEXTMETRIC16 ntmetm;
|
||||
FONTSIGNATURE ntmeFontSignature;
|
||||
} NEWTEXTMETRICEX16,*LPNEWTEXTMETRICEX16;
|
||||
|
||||
typedef INT16 (CALLBACK *FONTENUMPROC16)(SEGPTR,SEGPTR,UINT16,LPARAM);
|
||||
typedef INT16 (CALLBACK *FONTENUMPROCEX16)(SEGPTR,SEGPTR,UINT16,LPARAM);
|
||||
typedef VOID (CALLBACK *LINEDDAPROC16)(INT16,INT16,LPARAM);
|
||||
typedef INT16 (CALLBACK *GOBJENUMPROC16)(SEGPTR,LPARAM);
|
||||
|
||||
typedef struct
|
||||
{
|
||||
UINT16 gmBlackBoxX;
|
||||
UINT16 gmBlackBoxY;
|
||||
POINT16 gmptGlyphOrigin;
|
||||
INT16 gmCellIncX;
|
||||
INT16 gmCellIncY;
|
||||
} GLYPHMETRICS16, *LPGLYPHMETRICS16;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
INT16 abcA;
|
||||
UINT16 abcB;
|
||||
INT16 abcC;
|
||||
} ABC16, *LPABC16;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
UINT16 lopnStyle;
|
||||
POINT16 lopnWidth;
|
||||
COLORREF lopnColor;
|
||||
} LOGPEN16, *LPLOGPEN16;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
HGDIOBJ16 objectHandle[1];
|
||||
} HANDLETABLE16, *LPHANDLETABLE16;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
INT16 mm;
|
||||
INT16 xExt;
|
||||
INT16 yExt;
|
||||
HMETAFILE16 hMF;
|
||||
} METAFILEPICT16, *LPMETAFILEPICT16;
|
||||
|
||||
typedef INT16 (CALLBACK *MFENUMPROC16)(HDC16,HANDLETABLE16*,METARECORD*,
|
||||
INT16,LPARAM);
|
||||
|
||||
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;
|
||||
BYTE dmFormName[CCHFORMNAME];
|
||||
WORD dmUnusedPadding;
|
||||
WORD dmBitsPerPel;
|
||||
DWORD dmPelsWidth;
|
||||
DWORD dmPelsHeight;
|
||||
DWORD dmDisplayFlags;
|
||||
DWORD dmDisplayFrequency;
|
||||
} DEVMODE16, *LPDEVMODE16;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
INT16 cbSize;
|
||||
SEGPTR lpszDocName;
|
||||
SEGPTR lpszOutput;
|
||||
} DOCINFO16, *LPDOCINFO16;
|
||||
|
||||
typedef BOOL16 (CALLBACK* ABORTPROC16)(HDC16, INT16);
|
||||
|
||||
#include "poppack.h"
|
||||
|
||||
|
||||
INT16 WINAPI AbortDoc16(HDC16);
|
||||
BOOL16 WINAPI AbortPath16(HDC16);
|
||||
INT16 WINAPI AddFontResource16(LPCSTR);
|
||||
void WINAPI AnimatePalette16(HPALETTE16,UINT16,UINT16,const PALETTEENTRY*);
|
||||
BOOL16 WINAPI Arc16(HDC16,INT16,INT16,INT16,INT16,INT16,INT16,INT16,INT16);
|
||||
BOOL16 WINAPI BeginPath16(HDC16);
|
||||
BOOL16 WINAPI BitBlt16(HDC16,INT16,INT16,INT16,INT16,HDC16,INT16,INT16,DWORD);
|
||||
BOOL16 WINAPI Chord16(HDC16,INT16,INT16,INT16,INT16,INT16,INT16,INT16,INT16);
|
||||
BOOL16 WINAPI CloseFigure16(HDC16);
|
||||
HMETAFILE16 WINAPI CloseMetaFile16(HDC16);
|
||||
INT16 WINAPI CombineRgn16(HRGN16,HRGN16,HRGN16,INT16);
|
||||
HMETAFILE16 WINAPI CopyMetaFile16(HMETAFILE16,LPCSTR);
|
||||
HBITMAP16 WINAPI CreateBitmap16(INT16,INT16,UINT16,UINT16,LPCVOID);
|
||||
HBITMAP16 WINAPI CreateBitmapIndirect16(const BITMAP16*);
|
||||
HBRUSH16 WINAPI CreateBrushIndirect16(const LOGBRUSH16*);
|
||||
HBITMAP16 WINAPI CreateCompatibleBitmap16(HDC16,INT16,INT16);
|
||||
HDC16 WINAPI CreateCompatibleDC16(HDC16);
|
||||
HDC16 WINAPI CreateDC16(LPCSTR,LPCSTR,LPCSTR,const DEVMODE16*);
|
||||
HBITMAP16 WINAPI CreateDIBitmap16(HDC16,const BITMAPINFOHEADER*,DWORD,
|
||||
LPCVOID,const BITMAPINFO*,UINT16);
|
||||
HBRUSH16 WINAPI CreateDIBPatternBrush16(HGLOBAL16,UINT16);
|
||||
HBITMAP16 WINAPI CreateDIBSection16 (HDC16, BITMAPINFO *, UINT16,
|
||||
SEGPTR *, HANDLE, DWORD offset);
|
||||
HBITMAP16 WINAPI CreateDiscardableBitmap16(HDC16,INT16,INT16);
|
||||
HRGN16 WINAPI CreateEllipticRgn16(INT16,INT16,INT16,INT16);
|
||||
HRGN16 WINAPI CreateEllipticRgnIndirect16(const RECT16 *);
|
||||
HFONT16 WINAPI CreateFont16(INT16,INT16,INT16,INT16,INT16,BYTE,BYTE,BYTE,
|
||||
BYTE,BYTE,BYTE,BYTE,BYTE,LPCSTR);
|
||||
HFONT16 WINAPI CreateFontIndirect16(const LOGFONT16*);
|
||||
HBRUSH16 WINAPI CreateHatchBrush16(INT16,COLORREF);
|
||||
HDC16 WINAPI CreateIC16(LPCSTR,LPCSTR,LPCSTR,const DEVMODE16*);
|
||||
HDC16 WINAPI CreateMetaFile16(LPCSTR);
|
||||
HPALETTE16 WINAPI CreatePalette16(const LOGPALETTE*);
|
||||
HBRUSH16 WINAPI CreatePatternBrush16(HBITMAP16);
|
||||
HPEN16 WINAPI CreatePen16(INT16,INT16,COLORREF);
|
||||
HPEN16 WINAPI CreatePenIndirect16(const LOGPEN16*);
|
||||
HRGN16 WINAPI CreatePolyPolygonRgn16(const POINT16*,const INT16*,INT16,INT16);
|
||||
HRGN16 WINAPI CreatePolygonRgn16(const POINT16*,INT16,INT16);
|
||||
HRGN16 WINAPI CreateRectRgn16(INT16,INT16,INT16,INT16);
|
||||
HRGN16 WINAPI CreateRectRgnIndirect16(const RECT16*);
|
||||
HRGN16 WINAPI CreateRoundRectRgn16(INT16,INT16,INT16,INT16,INT16,INT16);
|
||||
BOOL16 WINAPI CreateScalableFontResource16(UINT16,LPCSTR,LPCSTR,LPCSTR);
|
||||
HBRUSH16 WINAPI CreateSolidBrush16(COLORREF);
|
||||
VOID WINAPI Death16(HDC16);
|
||||
BOOL16 WINAPI DeleteDC16(HDC16);
|
||||
BOOL16 WINAPI DeleteMetaFile16(HMETAFILE16);
|
||||
BOOL16 WINAPI DeleteObject16(HGDIOBJ16);
|
||||
BOOL16 WINAPI DPtoLP16(HDC16,LPPOINT16,INT16);
|
||||
BOOL16 WINAPI Ellipse16(HDC16,INT16,INT16,INT16,INT16);
|
||||
INT16 WINAPI EndDoc16(HDC16);
|
||||
BOOL16 WINAPI EndPath16(HDC16);
|
||||
INT16 WINAPI EnumFontFamilies16(HDC16,LPCSTR,FONTENUMPROC16,LPARAM);
|
||||
INT16 WINAPI EnumFontFamiliesEx16(HDC16,LPLOGFONT16,FONTENUMPROCEX16,LPARAM,DWORD);
|
||||
INT16 WINAPI EnumFonts16(HDC16,LPCSTR,FONTENUMPROC16,LPARAM);
|
||||
BOOL16 WINAPI EnumMetaFile16(HDC16,HMETAFILE16,MFENUMPROC16,LPARAM);
|
||||
INT16 WINAPI EnumObjects16(HDC16,INT16,GOBJENUMPROC16,LPARAM);
|
||||
BOOL16 WINAPI EqualRgn16(HRGN16,HRGN16);
|
||||
INT16 WINAPI Escape16(HDC16,INT16,INT16,SEGPTR,SEGPTR);
|
||||
INT16 WINAPI ExcludeClipRect16(HDC16,INT16,INT16,INT16,INT16);
|
||||
INT16 WINAPI ExcludeVisRect16(HDC16,INT16,INT16,INT16,INT16);
|
||||
HPEN16 WINAPI ExtCreatePen16(DWORD,DWORD,const LOGBRUSH16*,DWORD,const DWORD*);
|
||||
BOOL16 WINAPI ExtFloodFill16(HDC16,INT16,INT16,COLORREF,UINT16);
|
||||
BOOL16 WINAPI ExtTextOut16(HDC16,INT16,INT16,UINT16,const RECT16*,
|
||||
LPCSTR,UINT16,const INT16*);
|
||||
BOOL16 WINAPI FastWindowFrame16(HDC16,const RECT16*,INT16,INT16,DWORD);
|
||||
BOOL16 WINAPI FillPath16(HDC16);
|
||||
BOOL16 WINAPI FillRgn16(HDC16,HRGN16,HBRUSH16);
|
||||
BOOL16 WINAPI FlattenPath16(HDC16);
|
||||
BOOL16 WINAPI FloodFill16(HDC16,INT16,INT16,COLORREF);
|
||||
BOOL16 WINAPI FrameRgn16(HDC16,HRGN16,HBRUSH16,INT16,INT16);
|
||||
UINT16 WINAPI GDIRealizePalette16(HDC16);
|
||||
HPALETTE16 WINAPI GDISelectPalette16(HDC16,HPALETTE16,WORD);
|
||||
INT16 WINAPI GetArcDirection16(HDC16);
|
||||
BOOL16 WINAPI GetAspectRatioFilterEx16(HDC16,LPSIZE16);
|
||||
LONG WINAPI GetBitmapBits16(HBITMAP16,LONG,LPVOID);
|
||||
DWORD WINAPI GetBitmapDimension16(HBITMAP16);
|
||||
BOOL16 WINAPI GetBitmapDimensionEx16(HBITMAP16,LPSIZE16);
|
||||
DWORD WINAPI GetBrushOrg16(HDC16);
|
||||
BOOL16 WINAPI GetBrushOrgEx16(HDC16,LPPOINT16);
|
||||
COLORREF WINAPI GetBkColor16(HDC16);
|
||||
INT16 WINAPI GetBkMode16(HDC16);
|
||||
UINT16 WINAPI GetBoundsRect16(HDC16,LPRECT16,UINT16);
|
||||
BOOL16 WINAPI GetCharABCWidths16(HDC16,UINT16,UINT16,LPABC16);
|
||||
BOOL16 WINAPI GetCharWidth16(HDC16,UINT16,UINT16,LPINT16);
|
||||
INT16 WINAPI GetClipBox16(HDC16,LPRECT16);
|
||||
HRGN16 WINAPI GetClipRgn16(HDC16);
|
||||
HFONT16 WINAPI GetCurLogFont16(HDC16);
|
||||
DWORD WINAPI GetCurrentPosition16(HDC16);
|
||||
BOOL16 WINAPI GetCurrentPositionEx16(HDC16,LPPOINT16);
|
||||
DWORD WINAPI GetDCHook(HDC16,FARPROC16*);
|
||||
DWORD WINAPI GetDCOrg16(HDC16);
|
||||
HDC16 WINAPI GetDCState16(HDC16);
|
||||
INT16 WINAPI GetDeviceCaps16(HDC16,INT16);
|
||||
UINT16 WINAPI GetDIBColorTable16(HDC16,UINT16,UINT16,RGBQUAD*);
|
||||
INT16 WINAPI GetDIBits16(HDC16,HBITMAP16,UINT16,UINT16,LPVOID,LPBITMAPINFO,UINT16);
|
||||
INT16 WINAPI GetEnvironment16(LPCSTR,LPDEVMODE16,UINT16);
|
||||
DWORD WINAPI GetFontLanguageInfo16(HDC16);
|
||||
DWORD WINAPI GetGlyphOutline16(HDC16,UINT16,UINT16,LPGLYPHMETRICS16,DWORD,LPVOID,const MAT2*);
|
||||
INT16 WINAPI GetKerningPairs16(HDC16,INT16,LPKERNINGPAIR16);
|
||||
INT16 WINAPI GetMapMode16(HDC16);
|
||||
HMETAFILE16 WINAPI GetMetaFile16(LPCSTR);
|
||||
HGLOBAL16 WINAPI GetMetaFileBits16(HMETAFILE16);
|
||||
DWORD WINAPI GetNearestColor16(HDC16,DWORD);
|
||||
UINT16 WINAPI GetNearestPaletteIndex16(HPALETTE16,COLORREF);
|
||||
INT16 WINAPI GetObject16(HANDLE16,INT16,LPVOID);
|
||||
UINT16 WINAPI GetOutlineTextMetrics16(HDC16,UINT16,LPOUTLINETEXTMETRIC16);
|
||||
UINT16 WINAPI GetPaletteEntries16(HPALETTE16,UINT16,UINT16,LPPALETTEENTRY);
|
||||
INT16 WINAPI GetPath16(HDC16,LPPOINT16,LPBYTE,INT16);
|
||||
COLORREF WINAPI GetPixel16(HDC16,INT16,INT16);
|
||||
INT16 WINAPI GetPolyFillMode16(HDC16);
|
||||
BOOL16 WINAPI GetRasterizerCaps16(LPRASTERIZER_STATUS,UINT16);
|
||||
DWORD WINAPI GetRegionData16(HRGN16,DWORD,LPRGNDATA);
|
||||
INT16 WINAPI GetRelAbs16(HDC16);
|
||||
INT16 WINAPI GetRgnBox16(HRGN16,LPRECT16);
|
||||
INT16 WINAPI GetROP216(HDC16);
|
||||
HGDIOBJ16 WINAPI GetStockObject16(INT16);
|
||||
INT16 WINAPI GetStretchBltMode16(HDC16);
|
||||
UINT16 WINAPI GetSystemPaletteEntries16(HDC16,UINT16,UINT16,LPPALETTEENTRY);
|
||||
UINT16 WINAPI GetSystemPaletteUse16(HDC16);
|
||||
UINT16 WINAPI GetTextAlign16(HDC16);
|
||||
INT16 WINAPI GetTextCharacterExtra16(HDC16);
|
||||
UINT16 WINAPI GetTextCharset16(HDC16);
|
||||
COLORREF WINAPI GetTextColor16(HDC16);
|
||||
DWORD WINAPI GetTextExtent16(HDC16,LPCSTR,INT16);
|
||||
BOOL16 WINAPI GetTextExtentPoint16(HDC16,LPCSTR,INT16,LPSIZE16);
|
||||
INT16 WINAPI GetTextFace16(HDC16,INT16,LPSTR);
|
||||
BOOL16 WINAPI GetTextMetrics16(HDC16,LPTEXTMETRIC16);
|
||||
DWORD WINAPI GetViewportExt16(HDC16);
|
||||
BOOL16 WINAPI GetViewportExtEx16(HDC16,LPSIZE16);
|
||||
BOOL16 WINAPI GetViewportOrgEx16(HDC16,LPPOINT16);
|
||||
DWORD WINAPI GetViewportOrg16(HDC16);
|
||||
DWORD WINAPI GetWindowExt16(HDC16);
|
||||
DWORD WINAPI GetWindowOrg16(HDC16);
|
||||
BOOL16 WINAPI GetWindowExtEx16(HDC16,LPSIZE16);
|
||||
BOOL16 WINAPI GetWindowOrgEx16(HDC16,LPPOINT16);
|
||||
HRGN16 WINAPI InquireVisRgn16(HDC16);
|
||||
INT16 WINAPI IntersectClipRect16(HDC16,INT16,INT16,INT16,INT16);
|
||||
INT16 WINAPI IntersectVisRect16(HDC16,INT16,INT16,INT16,INT16);
|
||||
BOOL16 WINAPI InvertRgn16(HDC16,HRGN16);
|
||||
BOOL16 WINAPI IsDCCurrentPalette16(HDC16);
|
||||
BOOL16 WINAPI IsGDIObject16(HGDIOBJ16);
|
||||
BOOL16 WINAPI IsValidMetaFile16(HMETAFILE16);
|
||||
VOID WINAPI LineDDA16(INT16,INT16,INT16,INT16,LINEDDAPROC16,LPARAM);
|
||||
BOOL16 WINAPI LineTo16(HDC16,INT16,INT16);
|
||||
BOOL16 WINAPI LPtoDP16(HDC16,LPPOINT16,INT16);
|
||||
DWORD WINAPI MoveTo16(HDC16,INT16,INT16);
|
||||
BOOL16 WINAPI MoveToEx16(HDC16,INT16,INT16,LPPOINT16);
|
||||
INT16 WINAPI MulDiv16(INT16,INT16,INT16);
|
||||
INT16 WINAPI OffsetClipRgn16(HDC16,INT16,INT16);
|
||||
INT16 WINAPI OffsetRgn16(HRGN16,INT16,INT16);
|
||||
DWORD WINAPI OffsetViewportOrg16(HDC16,INT16,INT16);
|
||||
BOOL16 WINAPI OffsetViewportOrgEx16(HDC16,INT16,INT16,LPPOINT16);
|
||||
INT16 WINAPI OffsetVisRgn16(HDC16,INT16,INT16);
|
||||
DWORD WINAPI OffsetWindowOrg16(HDC16,INT16,INT16);
|
||||
BOOL16 WINAPI OffsetWindowOrgEx16(HDC16,INT16,INT16,LPPOINT16);
|
||||
BOOL16 WINAPI PaintRgn16(HDC16,HRGN16);
|
||||
BOOL16 WINAPI PatBlt16(HDC16,INT16,INT16,INT16,INT16,DWORD);
|
||||
HRGN16 WINAPI PathToRegion16(HDC16);
|
||||
BOOL16 WINAPI Pie16(HDC16,INT16,INT16,INT16,INT16,INT16,INT16,INT16,INT16);
|
||||
BOOL16 WINAPI PlayMetaFile16(HDC16,HMETAFILE16);
|
||||
VOID WINAPI PlayMetaFileRecord16(HDC16,LPHANDLETABLE16,LPMETARECORD,UINT16);
|
||||
BOOL16 WINAPI PolyBezier16(HDC16,const POINT16*,INT16);
|
||||
BOOL16 WINAPI PolyBezierTo16(HDC16,const POINT16*,INT16);
|
||||
BOOL16 WINAPI PolyPolygon16(HDC16,const POINT16*,const INT16*,UINT16);
|
||||
BOOL16 WINAPI Polygon16(HDC16,const POINT16*,INT16);
|
||||
BOOL16 WINAPI Polyline16(HDC16,const POINT16*,INT16);
|
||||
BOOL16 WINAPI PtInRegion16(HRGN16,INT16,INT16);
|
||||
BOOL16 WINAPI PtVisible16(HDC16,INT16,INT16);
|
||||
UINT16 WINAPI RealizeDefaultPalette16(HDC16);
|
||||
/* FIXME This is defined in user.spec !? */
|
||||
UINT16 WINAPI RealizePalette16(HDC16);
|
||||
BOOL16 WINAPI Rectangle16(HDC16,INT16,INT16,INT16,INT16);
|
||||
BOOL16 WINAPI RectInRegion16(HRGN16,const RECT16 *);
|
||||
BOOL16 WINAPI RectVisible16(HDC16,const RECT16*);
|
||||
BOOL16 WINAPI RemoveFontResource16(SEGPTR);
|
||||
HDC16 WINAPI ResetDC16(HDC16,const DEVMODE16 *);
|
||||
BOOL16 WINAPI ResizePalette16(HPALETTE16,UINT16);
|
||||
BOOL16 WINAPI RestoreDC16(HDC16,INT16);
|
||||
INT16 WINAPI RestoreVisRgn16(HDC16);
|
||||
VOID WINAPI Resurrection16(HDC16,WORD,WORD,WORD,WORD,WORD,WORD);
|
||||
BOOL16 WINAPI RoundRect16(HDC16,INT16,INT16,INT16,INT16,INT16,INT16);
|
||||
INT16 WINAPI SaveDC16(HDC16);
|
||||
HRGN16 WINAPI SaveVisRgn16(HDC16);
|
||||
DWORD WINAPI ScaleViewportExt16(HDC16,INT16,INT16,INT16,INT16);
|
||||
BOOL16 WINAPI ScaleViewportExtEx16(HDC16,INT16,INT16,INT16,INT16,LPSIZE16);
|
||||
DWORD WINAPI ScaleWindowExt16(HDC16,INT16,INT16,INT16,INT16);
|
||||
BOOL16 WINAPI ScaleWindowExtEx16(HDC16,INT16,INT16,INT16,INT16,LPSIZE16);
|
||||
BOOL16 WINAPI SelectClipPath16(HDC16,INT16);
|
||||
INT16 WINAPI SelectClipRgn16(HDC16,HRGN16);
|
||||
HGDIOBJ16 WINAPI SelectObject16(HDC16,HGDIOBJ16);
|
||||
/* FIXME This is defined in user.spec !? */
|
||||
HPALETTE16 WINAPI SelectPalette16(HDC16,HPALETTE16,BOOL16);
|
||||
INT16 WINAPI SelectVisRgn16(HDC16,HRGN16);
|
||||
INT16 WINAPI SetAbortProc16(HDC16,SEGPTR);
|
||||
INT16 WINAPI SetArcDirection16(HDC16,INT16);
|
||||
LONG WINAPI SetBitmapBits16(HBITMAP16,LONG,LPCVOID);
|
||||
DWORD WINAPI SetBitmapDimension16(HBITMAP16,INT16,INT16);
|
||||
BOOL16 WINAPI SetBitmapDimensionEx16(HBITMAP16,INT16,INT16,LPSIZE16);
|
||||
COLORREF WINAPI SetBkColor16(HDC16,COLORREF);
|
||||
INT16 WINAPI SetBkMode16(HDC16,INT16);
|
||||
UINT16 WINAPI SetBoundsRect16(HDC16,const RECT16*,UINT16);
|
||||
DWORD WINAPI SetBrushOrg16(HDC16,INT16,INT16);
|
||||
BOOL16 WINAPI SetDCHook(HDC16,FARPROC16,DWORD);
|
||||
DWORD WINAPI SetDCOrg16(HDC16,INT16,INT16);
|
||||
VOID WINAPI SetDCState16(HDC16,HDC16);
|
||||
UINT16 WINAPI SetDIBColorTable16(HDC16,UINT16,UINT16,RGBQUAD*);
|
||||
INT16 WINAPI SetDIBits16(HDC16,HBITMAP16,UINT16,UINT16,LPCVOID,const BITMAPINFO*,UINT16);
|
||||
INT16 WINAPI SetDIBitsToDevice16(HDC16,INT16,INT16,INT16,INT16,INT16,
|
||||
INT16,UINT16,UINT16,LPCVOID,const BITMAPINFO*,UINT16);
|
||||
INT16 WINAPI SetEnvironment16(LPCSTR,LPDEVMODE16,UINT16);
|
||||
WORD WINAPI SetHookFlags16(HDC16,WORD);
|
||||
INT16 WINAPI SetMapMode16(HDC16,INT16);
|
||||
DWORD WINAPI SetMapperFlags16(HDC16,DWORD);
|
||||
HMETAFILE16 WINAPI SetMetaFileBits16(HGLOBAL16);
|
||||
UINT16 WINAPI SetPaletteEntries16(HPALETTE16,UINT16,UINT16,LPPALETTEENTRY);
|
||||
COLORREF WINAPI SetPixel16(HDC16,INT16,INT16,COLORREF);
|
||||
INT16 WINAPI SetPolyFillMode16(HDC16,INT16);
|
||||
VOID WINAPI SetRectRgn16(HRGN16,INT16,INT16,INT16,INT16);
|
||||
INT16 WINAPI SetRelAbs16(HDC16,INT16);
|
||||
INT16 WINAPI SetROP216(HDC16,INT16);
|
||||
INT16 WINAPI SetStretchBltMode16(HDC16,INT16);
|
||||
UINT16 WINAPI SetSystemPaletteUse16(HDC16,UINT16);
|
||||
UINT16 WINAPI SetTextAlign16(HDC16,UINT16);
|
||||
INT16 WINAPI SetTextCharacterExtra16(HDC16,INT16);
|
||||
COLORREF WINAPI SetTextColor16(HDC16,COLORREF);
|
||||
INT16 WINAPI SetTextJustification16(HDC16,INT16,INT16);
|
||||
DWORD WINAPI SetViewportExt16(HDC16,INT16,INT16);
|
||||
BOOL16 WINAPI SetViewportExtEx16(HDC16,INT16,INT16,LPSIZE16);
|
||||
DWORD WINAPI SetViewportOrg16(HDC16,INT16,INT16);
|
||||
BOOL16 WINAPI SetViewportOrgEx16(HDC16,INT16,INT16,LPPOINT16);
|
||||
DWORD WINAPI SetWindowExt16(HDC16,INT16,INT16);
|
||||
BOOL16 WINAPI SetWindowExtEx16(HDC16,INT16,INT16,LPSIZE16);
|
||||
DWORD WINAPI SetWindowOrg16(HDC16,INT16,INT16);
|
||||
BOOL16 WINAPI SetWindowOrgEx16(HDC16,INT16,INT16,LPPOINT16);
|
||||
INT16 WINAPI StartDoc16(HDC16,const DOCINFO16*);
|
||||
INT16 WINAPI StartPage16(HDC16);
|
||||
INT16 WINAPI EndPage16(HDC16);
|
||||
BOOL16 WINAPI StretchBlt16(HDC16,INT16,INT16,INT16,INT16,HDC16,INT16,
|
||||
INT16,INT16,INT16,DWORD);
|
||||
INT16 WINAPI StretchDIBits16(HDC16,INT16,INT16,INT16,INT16,INT16,INT16,
|
||||
INT16,INT16,const VOID*,const BITMAPINFO*,UINT16,DWORD);
|
||||
BOOL16 WINAPI StrokeAndFillPath16(HDC16);
|
||||
BOOL16 WINAPI StrokePath16(HDC16);
|
||||
BOOL16 WINAPI TextOut16(HDC16,INT16,INT16,LPCSTR,INT16);
|
||||
BOOL16 WINAPI UnrealizeObject16(HGDIOBJ16);
|
||||
INT16 WINAPI UpdateColors16(HDC16);
|
||||
BOOL16 WINAPI WidenPath16(HDC16);
|
||||
|
||||
|
||||
#endif /* __WINE_WINGDI16_H */
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
#include "winuser.h" /* winuser.h needed for MSGBOXCALLBACK */
|
||||
/* wingdi.h needed for COLORREF */
|
||||
|
||||
#include "wine/wingdi16.h"
|
||||
|
||||
|
||||
#include "pshpack1.h"
|
||||
|
|
@ -256,6 +256,16 @@ typedef struct
|
|||
DWORD dwExStyle WINE_PACKED;
|
||||
} CREATESTRUCT16, *LPCREATESTRUCT16;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
HDC16 hdc;
|
||||
BOOL16 fErase;
|
||||
RECT16 rcPaint;
|
||||
BOOL16 fRestore;
|
||||
BOOL16 fIncUpdate;
|
||||
BYTE rgbReserved[16];
|
||||
} PAINTSTRUCT16, *LPPAINTSTRUCT16;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
HMENU16 hWindowMenu;
|
||||
|
|
@ -304,6 +314,24 @@ typedef struct
|
|||
SEGPTR lppos;
|
||||
} NCCALCSIZE_PARAMS16, *LPNCCALCSIZE_PARAMS16;
|
||||
|
||||
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;
|
||||
|
||||
/* Journalling hook structure */
|
||||
|
||||
typedef struct
|
||||
|
|
|
|||
1417
include/wingdi.h
1417
include/wingdi.h
File diff suppressed because it is too large
Load diff
|
|
@ -368,6 +368,53 @@ typedef struct
|
|||
#define OIC_HDISK 32524
|
||||
#define OIC_NETWORK 32525
|
||||
|
||||
#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
|
||||
|
||||
/* 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
|
||||
|
||||
/* Edit control messages */
|
||||
#define EM_GETSEL 0x00b0
|
||||
#define EM_SETSEL 0x00b1
|
||||
|
|
@ -761,6 +808,16 @@ typedef struct
|
|||
DECL_WINELIB_TYPE_AW(CREATESTRUCT)
|
||||
DECL_WINELIB_TYPE_AW(LPCREATESTRUCT)
|
||||
|
||||
typedef struct
|
||||
{
|
||||
HDC hdc;
|
||||
BOOL fErase;
|
||||
RECT rcPaint;
|
||||
BOOL fRestore;
|
||||
BOOL fIncUpdate;
|
||||
BYTE rgbReserved[32];
|
||||
} PAINTSTRUCT, *PPAINTSTRUCT, *LPPAINTSTRUCT;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
HMENU hWindowMenu;
|
||||
|
|
@ -2110,6 +2167,46 @@ typedef struct
|
|||
#define SPIF_SENDWININICHANGE 2
|
||||
#define SPIF_SENDCHANGE SPIF_SENDWININICHANGE
|
||||
|
||||
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)
|
||||
|
||||
|
||||
/* Window Styles */
|
||||
#define WS_OVERLAPPED 0x00000000L
|
||||
#define WS_POPUP 0x80000000L
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@
|
|||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include "winspool.h"
|
||||
#include "winbase.h"
|
||||
#include "wine/wingdi16.h"
|
||||
#include "ldt.h"
|
||||
#include "winerror.h"
|
||||
#include "winreg.h"
|
||||
|
|
|
|||
|
|
@ -980,16 +980,16 @@ BOOL WINAPI GetTextMetricsA( HDC hdc, TEXTMETRICA *metrics )
|
|||
metrics->tmOverhang = WDPTOLP(metrics->tmOverhang);
|
||||
|
||||
TRACE_(font)("text metrics:\n"
|
||||
" Weight = %03i\t FirstChar = %03i\t AveCharWidth = %i\n"
|
||||
" Italic = % 3i\t LastChar = %03i\t\t MaxCharWidth = %i\n"
|
||||
" UnderLined = %01i\t DefaultChar = %03i\t Overhang = %i\n"
|
||||
" Weight = %03li\t FirstChar = %03i\t AveCharWidth = %li\n"
|
||||
" Italic = % 3i\t LastChar = %03i\t\t MaxCharWidth = %li\n"
|
||||
" UnderLined = %01i\t DefaultChar = %03i\t Overhang = %li\n"
|
||||
" StruckOut = %01i\t BreakChar = %03i\t CharSet = %i\n"
|
||||
" PitchAndFamily = %02x\n"
|
||||
" --------------------\n"
|
||||
" InternalLeading = %i\n"
|
||||
" Ascent = %i\n"
|
||||
" Descent = %i\n"
|
||||
" Height = %i\n",
|
||||
" InternalLeading = %li\n"
|
||||
" Ascent = %li\n"
|
||||
" Descent = %li\n"
|
||||
" Height = %li\n",
|
||||
metrics->tmWeight, metrics->tmFirstChar, metrics->tmAveCharWidth,
|
||||
metrics->tmItalic, metrics->tmLastChar, metrics->tmMaxCharWidth,
|
||||
metrics->tmUnderlined, metrics->tmDefaultChar, metrics->tmOverhang,
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
#include <stdlib.h>
|
||||
#include "wingdi.h"
|
||||
|
||||
#include "wine/wingdi16.h"
|
||||
|
||||
/**********************************************************************
|
||||
* LineDDA16 (GDI.100)
|
||||
|
|
|
|||
|
|
@ -333,7 +333,7 @@ VOID WINAPI SetRectRgn16( HRGN16 hrgn, INT16 left, INT16 top,
|
|||
*
|
||||
* Allows either or both left and top to be greater than right or bottom.
|
||||
*/
|
||||
VOID WINAPI SetRectRgn( HRGN hrgn, INT left, INT top,
|
||||
BOOL WINAPI SetRectRgn( HRGN hrgn, INT left, INT top,
|
||||
INT right, INT bottom )
|
||||
{
|
||||
RGNOBJ * obj;
|
||||
|
|
@ -341,7 +341,7 @@ VOID WINAPI SetRectRgn( HRGN hrgn, INT left, INT top,
|
|||
TRACE(region, " %04x %d,%d-%d,%d\n",
|
||||
hrgn, left, top, right, bottom );
|
||||
|
||||
if (!(obj = (RGNOBJ *) GDI_GetObjPtr( hrgn, REGION_MAGIC ))) return;
|
||||
if (!(obj = (RGNOBJ *) GDI_GetObjPtr( hrgn, REGION_MAGIC ))) return FALSE;
|
||||
|
||||
if (left > right) { INT tmp = left; left = right; right = tmp; }
|
||||
if (top > bottom) { INT tmp = top; top = bottom; bottom = tmp; }
|
||||
|
|
@ -359,6 +359,7 @@ VOID WINAPI SetRectRgn( HRGN hrgn, INT left, INT top,
|
|||
EMPTY_REGION(obj->rgn);
|
||||
|
||||
GDI_HEAP_UNLOCK( hrgn );
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
#include "winuser.h"
|
||||
#include "module.h"
|
||||
#include "debug.h"
|
||||
#include "wine/wingdi16.h"
|
||||
|
||||
DEFAULT_DEBUG_CHANNEL(caret)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue