From d3bb910b196e03df351e66296627a334348f04fd Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Thu, 12 Jan 2006 21:16:42 +0000 Subject: [PATCH] - Unfsck NtGdiExtCreatePen (thanks Christopher). svn path=/trunk/; revision=20819 --- reactos/lib/gdi32/gdi32.def | 2 +- reactos/lib/gdi32/objects/brush.c | 25 +++++++++++++++++++++++++ reactos/subsys/win32k/objects/pen.c | 3 --- reactos/tools/nci/w32ksvc.db | 2 +- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/reactos/lib/gdi32/gdi32.def b/reactos/lib/gdi32/gdi32.def index c4660d59736..cd835dec124 100644 --- a/reactos/lib/gdi32/gdi32.def +++ b/reactos/lib/gdi32/gdi32.def @@ -223,7 +223,7 @@ Escape@20 EudcLoadLinkW@16 EudcUnloadLinkW@8 ExcludeClipRect@20=NtGdiExcludeClipRect@20 -ExtCreatePen@20=NtGdiExtCreatePen@20 +ExtCreatePen@20 ExtCreateRegion@12=NtGdiExtCreateRegion@12 ExtEscape@24=NtGdiExtEscape@24 ExtFloodFill@20=NtGdiExtFloodFill@20 diff --git a/reactos/lib/gdi32/objects/brush.c b/reactos/lib/gdi32/objects/brush.c index 714c77d1dde..24d423cdada 100644 --- a/reactos/lib/gdi32/objects/brush.c +++ b/reactos/lib/gdi32/objects/brush.c @@ -17,6 +17,31 @@ FixBrushOrgEx( return FALSE; } +/* + * @implemented + */ +HPEN +APIENTRY +ExtCreatePen(DWORD dwPenStyle, + DWORD dwWidth, + CONST LOGBRUSH *lplb, + DWORD dwStyleCount, + CONST DWORD *lpStyle) +{ + /* Call NTGDI (hack... like most of gdi32..sigh) */ + return NtGdiExtCreatePen(dwPenStyle, + dwWidth, + lplb->lbStyle, + lplb->lbColor, + lplb->lbHatch, + 0, + dwStyleCount, + (PULONG)lpStyle, + 0, + FALSE, + NULL); +} + /* * @implemented */ diff --git a/reactos/subsys/win32k/objects/pen.c b/reactos/subsys/win32k/objects/pen.c index d292435bd72..8ce6ac8f156 100644 --- a/reactos/subsys/win32k/objects/pen.c +++ b/reactos/subsys/win32k/objects/pen.c @@ -137,9 +137,6 @@ NtGdiExtCreatePen( IN OPTIONAL HBRUSH hbrush) { LOGPEN LogPen; - /* NOTE: This is HACK! */ - DPRINT1("FIXME: FIX CALLERS FIRST!\n"); - KEBUGCHECK(0); if (PenStyle & PS_USERSTYLE) PenStyle = (PenStyle & ~PS_STYLE_MASK) | PS_SOLID; diff --git a/reactos/tools/nci/w32ksvc.db b/reactos/tools/nci/w32ksvc.db index 4b630671ce2..f8cb45e7011 100644 --- a/reactos/tools/nci/w32ksvc.db +++ b/reactos/tools/nci/w32ksvc.db @@ -70,7 +70,7 @@ NtGdiEnumObjects 4 NtGdiEqualRgn 2 NtGdiEscape 5 NtGdiExcludeClipRect 5 -NtGdiExtCreatePen 5 +NtGdiExtCreatePen 11 NtGdiExtCreateRegion 3 NtGdiExtEscape 6 NtGdiExtFloodFill 5 -- 2.17.1