- Unfsck NtGdiExtCreatePen (thanks Christopher). Modified: trunk/reactos/lib/gdi32/gdi32.def Modified: trunk/reactos/lib/gdi32/objects/brush.c Modified: trunk/reactos/subsys/win32k/objects/pen.c Modified: trunk/reactos/tools/nci/w32ksvc.db _____
Modified: trunk/reactos/lib/gdi32/gdi32.def --- trunk/reactos/lib/gdi32/gdi32.def 2006-01-12 21:15:38 UTC (rev 20818) +++ trunk/reactos/lib/gdi32/gdi32.def 2006-01-12 21:16:42 UTC (rev 20819) @@ -223,7 +223,7 @@
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 _____
Modified: trunk/reactos/lib/gdi32/objects/brush.c --- trunk/reactos/lib/gdi32/objects/brush.c 2006-01-12 21:15:38 UTC (rev 20818) +++ trunk/reactos/lib/gdi32/objects/brush.c 2006-01-12 21:16:42 UTC (rev 20819) @@ -20,6 +20,31 @@
/* * @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 + */ HBRUSH STDCALL CreateDIBPatternBrush( HGLOBAL hglbDIBPacked, _____
Modified: trunk/reactos/subsys/win32k/objects/pen.c --- trunk/reactos/subsys/win32k/objects/pen.c 2006-01-12 21:15:38 UTC (rev 20818) +++ trunk/reactos/subsys/win32k/objects/pen.c 2006-01-12 21:16:42 UTC (rev 20819) @@ -137,9 +137,6 @@
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; _____
Modified: trunk/reactos/tools/nci/w32ksvc.db --- trunk/reactos/tools/nci/w32ksvc.db 2006-01-12 21:15:38 UTC (rev 20818) +++ trunk/reactos/tools/nci/w32ksvc.db 2006-01-12 21:16:42 UTC (rev 20819) @@ -70,7 +70,7 @@
NtGdiEqualRgn 2 NtGdiEscape 5 NtGdiExcludeClipRect 5 -NtGdiExtCreatePen 5 +NtGdiExtCreatePen 11 NtGdiExtCreateRegion 3 NtGdiExtEscape 6 NtGdiExtFloodFill 5