From 900290aa9f510274767549b04c0c174f2bf907db Mon Sep 17 00:00:00 2001 From: Patrik Stridvall Date: Sun, 24 Oct 1999 21:32:43 +0000 Subject: [PATCH] Added Win16 variants of existing Win32 functions. --- graphics/path.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++ if1632/gdi.spec | 16 ++++++------ objects/clipping.c | 8 ++++++ 3 files changed, 77 insertions(+), 8 deletions(-) diff --git a/graphics/path.c b/graphics/path.c index 147a9214711..b7023bfc503 100644 --- a/graphics/path.c +++ b/graphics/path.c @@ -299,6 +299,13 @@ INT WINAPI GetPath(HDC hdc, LPPOINT pPoints, LPBYTE pTypes, } } +/*********************************************************************** + * PathToRegion16 (GDI.518) + */ +HRGN16 WINAPI PathToRegion16(HDC16 hdc) +{ + return (HRGN16) PathToRegion((HDC) hdc); +} /*********************************************************************** * PathToRegion32 (GDI32.261) @@ -337,6 +344,13 @@ HRGN WINAPI PathToRegion(HDC hdc) return hrgnRval; } +/*********************************************************************** + * FillPath16 (GDI.515) + */ +BOOL16 WINAPI FillPath16(HDC16 hdc) +{ + return (BOOL16) FillPath((HDC) hdc); +} /*********************************************************************** * FillPath32 (GDI32.100) @@ -424,6 +438,13 @@ BOOL WINAPI FillPath(HDC hdc) } } +/*********************************************************************** + * SelectClipPath16 (GDI.519) + */ +BOOL16 WINAPI SelectClipPath16(HDC16 hdc, INT16 iMode) +{ + return (BOOL16) SelectClipPath((HDC) hdc, iMode); +} /*********************************************************************** * SelectClipPath32 (GDI32.296) @@ -1125,6 +1146,16 @@ static void PATH_NormalizePoint(FLOAT_POINT corners[], 2.0 - 1.0; } +/******************************************************************* + * FlattenPath16 [GDI.516] + * + * + */ +BOOL16 WINAPI FlattenPath16(HDC16 hdc) +{ + return (BOOL16) FlattenPath((HDC) hdc); +} + /******************************************************************* * FlattenPath32 [GDI32.103] * @@ -1136,6 +1167,16 @@ BOOL WINAPI FlattenPath(HDC hdc) return 0; } +/******************************************************************* + * StrokeAndFillPath16 [GDI.520] + * + * + */ +BOOL16 WINAPI StrokeAndFillPath16(HDC16 hdc) +{ + return (BOOL16) StrokeAndFillPath((HDC) hdc); +} + /******************************************************************* * StrokeAndFillPath [GDI32.352] * @@ -1147,6 +1188,16 @@ BOOL WINAPI StrokeAndFillPath(HDC hdc) return 0; } +/******************************************************************* + * StrokePath16 [GDI.521] + * + * + */ +BOOL16 WINAPI StrokePath16(HDC16 hdc) +{ + return (BOOL16) StrokePath((HDC) hdc); +} + /******************************************************************* * StrokePath [GDI32.353] * @@ -1158,6 +1209,16 @@ BOOL WINAPI StrokePath(HDC hdc) return 0; } +/******************************************************************* + * WidenPath16 [GDI.522] + * + * + */ +BOOL16 WINAPI WidenPath16(HDC16 hdc) +{ + return (BOOL16) WidenPath((HDC) hdc); +} + /******************************************************************* * WidenPath [GDI32.360] * diff --git a/if1632/gdi.spec b/if1632/gdi.spec index 9bfee33599d..adde2c49f78 100644 --- a/if1632/gdi.spec +++ b/if1632/gdi.spec @@ -331,19 +331,19 @@ file gdi.exe 504 stub PlayEnhMetafileRecord 505 stub SetEnhMetafileBits 506 stub SetMetaRgn -508 stub ExtSelectClipRgn +508 pascal16 ExtSelectClipRgn(word word word) ExtSelectClipRgn16 511 pascal16 AbortPath(word) AbortPath16 512 pascal16 BeginPath(word) BeginPath16 513 pascal16 CloseFigure(word) CloseFigure16 514 pascal16 EndPath(word) EndPath16 -515 stub FillPath -516 stub FlattenPath +515 pascal16 FillPath(word) FillPath16 +516 pascal16 FlattenPath(word) FlattenPath16 517 pascal16 GetPath(word ptr ptr word) GetPath16 -518 stub PathToRegion -519 stub SelectClipPath -520 stub StrokeAndFillPath -521 stub StrokePath -522 stub WidenPath +518 pascal16 PathToRegion(word) PathToRegion16 +519 pascal16 SelectClipPath(word word) SelectClipPath16 +520 pascal16 StrokeAndFillPath(word) StrokeAndFillPath16 +521 pascal16 StrokePath(word) StrokePath16 +522 pascal16 WidenPath(word) WidenPath16 523 stub ExtCreatePen 524 pascal16 GetArcDirection(word) GetArcDirection16 525 pascal16 SetArcDirection(word word) SetArcDirection16 diff --git a/objects/clipping.c b/objects/clipping.c index 0484e3ebaad..72affae25ee 100644 --- a/objects/clipping.c +++ b/objects/clipping.c @@ -67,6 +67,14 @@ INT WINAPI SelectClipRgn( HDC hdc, HRGN hrgn ) return ExtSelectClipRgn( hdc, hrgn, RGN_COPY ); } +/****************************************************************************** + * ExtSelectClipRgn16 [GDI.508] + */ +INT16 WINAPI ExtSelectClipRgn16( HDC16 hdc, HRGN16 hrgn, INT16 fnMode ) +{ + return (INT16) ExtSelectClipRgn((HDC) hdc, (HRGN) hrgn, fnMode); +} + /****************************************************************************** * ExtSelectClipRgn [GDI32.97] */