- Unfsck NtGdiExtCreatePen (thanks Christopher).
authorAlex Ionescu <aionescu@gmail.com>
Thu, 12 Jan 2006 21:16:42 +0000 (21:16 +0000)
committerAlex Ionescu <aionescu@gmail.com>
Thu, 12 Jan 2006 21:16:42 +0000 (21:16 +0000)
svn path=/trunk/; revision=20819

reactos/lib/gdi32/gdi32.def
reactos/lib/gdi32/objects/brush.c
reactos/subsys/win32k/objects/pen.c
reactos/tools/nci/w32ksvc.db

index c4660d5..cd835de 100644 (file)
@@ -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
index 714c77d..24d423c 100644 (file)
@@ -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
  */
index d292435..8ce6ac8 100644 (file)
@@ -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;
index 4b63067..f8cb45e 100644 (file)
@@ -70,7 +70,7 @@ NtGdiEnumObjects                      4
 NtGdiEqualRgn                          2
 NtGdiEscape                            5
 NtGdiExcludeClipRect                   5
-NtGdiExtCreatePen                      5
+NtGdiExtCreatePen                      11
 NtGdiExtCreateRegion                   3
 NtGdiExtEscape                         6
 NtGdiExtFloodFill                      5