gdi: Add support for creating extended pens.

dlls/gdi/enhmfdrv/objects.c

@@ -398,7 +398,20 @@ static HPEN EMFDRV_CreatePenIndirect(PHYSDEV dev, HPEN hPen )
     EMRCREATEPEN emr;
     DWORD index = 0;
 
-    if (!GetObjectA( hPen, sizeof(emr.lopn), &emr.lopn )) return 0;
+    if (!GetObjectW( hPen, sizeof(emr.lopn), &emr.lopn ))
+    {
+        /* must be an extended pen */
+        EXTLOGPEN elp;
+        if (!GetObjectW( hPen, sizeof(elp), &elp ))
+        {
+            FIXME("extended pen %p not supported\n", hPen);
+            return 0;
+        }
+        emr.lopn.lopnStyle = elp.elpPenStyle;
+        emr.lopn.lopnWidth.x = elp.elpWidth;
+        emr.lopn.lopnWidth.y = 0;
+        emr.lopn.lopnColor = elp.elpColor;
+    }
 
     emr.emr.iType = EMR_CREATEPEN;
     emr.emr.nSize = sizeof(emr);

dlls/gdi/gdiobj.c

@@ -1033,6 +1033,9 @@ DWORD WINAPI GetObjectType( HGDIOBJ handle )
       case PEN_MAGIC:
 	  result = OBJ_PEN;
 	  break;
+      case EXT_PEN_MAGIC:
+	  result = OBJ_EXTPEN;
+	  break;
       case BRUSH_MAGIC:
 	  result = OBJ_BRUSH;
 	  break;
@@ -1288,7 +1291,7 @@ BOOL16 WINAPI IsGDIObject16( HGDIOBJ16 handle16 )
     GDIOBJHDR *object = GDI_GetObjPtr( handle, MAGIC_DONTCARE );
     if (object)
     {
-        magic = GDIMAGIC(object->wMagic) - PEN_MAGIC + 1;
+        magic = GDIMAGIC(object->wMagic) - FIRST_MAGIC + 1;
         GDI_ReleaseObj( handle );
     }
     return magic;

dlls/gdi/mfdrv/objects.c

@@ -404,7 +404,20 @@ HPEN MFDRV_SelectPen( PHYSDEV dev, HPEN hpen )
     if( index < 0 )
     {
         if (!GetObject16( HPEN_16(hpen), sizeof(logpen), &logpen ))
+        {
+            /* must be an extended pen */
+            EXTLOGPEN elp;
+            if (!GetObjectW( hpen, sizeof(elp), &elp ))
+            {
+                FIXME("extended pen %p not supported\n", hpen);
                 return 0;
+            }
+            logpen.lopnStyle = elp.elpPenStyle;
+            logpen.lopnWidth.x = elp.elpWidth;
+            logpen.lopnWidth.y = 0;
+            logpen.lopnColor = elp.elpColor;
+        }
+
         index = MFDRV_CreatePenIndirect( dev, hpen, &logpen );
         if( index < 0 )
             return 0;

dlls/gdi/pen.c

@@ -23,6 +23,7 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
+#include <assert.h>
 
 #include "windef.h"
 #include "winbase.h"
@@ -38,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi);
 typedef struct
 {
     GDIOBJHDR header;
-    LOGPEN    logpen;
+    EXTLOGPEN logpen;
 } PENOBJ;
 
 
@@ -86,20 +87,24 @@ HPEN WINAPI CreatePenIndirect( const LOGPEN * pen )
     if (!(penPtr = GDI_AllocObject( sizeof(PENOBJ), PEN_MAGIC, (HGDIOBJ *)&hpen,
 				    &pen_funcs ))) return 0;
     if (pen->lopnStyle == PS_USERSTYLE || pen->lopnStyle == PS_ALTERNATE)
-        penPtr->logpen.lopnStyle = PS_SOLID;
+        penPtr->logpen.elpPenStyle = PS_SOLID;
     else
-        penPtr->logpen.lopnStyle = pen->lopnStyle;
-    penPtr->logpen.lopnWidth.y = 0;
+        penPtr->logpen.elpPenStyle = pen->lopnStyle;
     if (pen->lopnStyle == PS_NULL)
     {
-        penPtr->logpen.lopnWidth.x = 1;
-        penPtr->logpen.lopnColor = RGB(0, 0, 0);
+        penPtr->logpen.elpWidth = 1;
+        penPtr->logpen.elpColor = RGB(0, 0, 0);
     }
     else
     {
-        penPtr->logpen.lopnWidth.x = abs(pen->lopnWidth.x);
-        penPtr->logpen.lopnColor = pen->lopnColor;
+        penPtr->logpen.elpWidth = abs(pen->lopnWidth.x);
+        penPtr->logpen.elpColor = pen->lopnColor;
     }
+    penPtr->logpen.elpBrushStyle = BS_SOLID;
+    penPtr->logpen.elpHatch = 0;
+    penPtr->logpen.elpNumEntries = 0;
+    penPtr->logpen.elpStyleEntry[0] = 0;
+
     GDI_ReleaseObj( hpen );
     return hpen;
 }
@@ -118,23 +123,63 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width,
     HPEN hpen;
 
     if ((style & PS_STYLE_MASK) == PS_USERSTYLE)
+    {
+        if (!style_count || !style_bits)
+        {
+            SetLastError(ERROR_INVALID_PARAMETER);
+            return 0;
+        }
+        /* FIXME: PS_USERSTYLE workaround */
         FIXME("PS_USERSTYLE not handled\n");
+        style = (style & ~PS_STYLE_MASK) | PS_SOLID;
+    }
+    else
+    {
+        if (style_count || style_bits)
+        {
+            SetLastError(ERROR_INVALID_PARAMETER);
+            return 0;
+        }
+    }
+
+    if ((style & PS_STYLE_MASK) == PS_NULL)
+        return CreatePen( PS_NULL, 0, brush->lbColor );
+
     if ((style & PS_TYPE_MASK) == PS_GEOMETRIC)
+    {
+        /* PS_ALTERNATE is applicable only for cosmetic pens */
+        if ((style & PS_STYLE_MASK) == PS_ALTERNATE)
+        {
+            SetLastError(ERROR_INVALID_PARAMETER);
+            return 0;
+        }
+
 	if (brush->lbHatch && ((brush->lbStyle == BS_SOLID) || (brush->lbStyle == BS_HOLLOW)))
 	    FIXME("Hatches not implemented\n");	
+    }
+    else
+    {
+        /* PS_INSIDEFRAME is applicable only for gemetric pens */
+        if ((style & PS_STYLE_MASK) == PS_INSIDEFRAME || width != 1)
+        {
+            SetLastError(ERROR_INVALID_PARAMETER);
+            return 0;
+        }
+    }
 
-    if (!(penPtr = GDI_AllocObject( sizeof(PENOBJ), PEN_MAGIC, (HGDIOBJ *)&hpen,
+    if (!(penPtr = GDI_AllocObject( sizeof(PENOBJ) +
+                                    style_count * sizeof(DWORD) - sizeof(penPtr->logpen.elpStyleEntry),
+                                    EXT_PEN_MAGIC, (HGDIOBJ *)&hpen,
 				    &pen_funcs ))) return 0;
-    penPtr->logpen.lopnStyle = style & ~PS_TYPE_MASK;
 
-    /* PS_USERSTYLE workaround */
-    if((penPtr->logpen.lopnStyle & PS_STYLE_MASK) == PS_USERSTYLE)
-       penPtr->logpen.lopnStyle =
-         (penPtr->logpen.lopnStyle & ~PS_STYLE_MASK) | PS_SOLID;
+    penPtr->logpen.elpPenStyle = style;
+    penPtr->logpen.elpWidth = abs(width);
+    penPtr->logpen.elpBrushStyle = brush->lbStyle;
+    penPtr->logpen.elpColor = brush->lbColor;
+    penPtr->logpen.elpHatch = brush->lbHatch;
+    penPtr->logpen.elpNumEntries = style_count;
+    memcpy(penPtr->logpen.elpStyleEntry, style_bits, style_count * sizeof(DWORD));
     
-    penPtr->logpen.lopnWidth.x = (style & PS_GEOMETRIC) ? width : 1;
-    penPtr->logpen.lopnWidth.y = 0;
-    penPtr->logpen.lopnColor = brush->lbColor;
     GDI_ReleaseObj( hpen );
 
     return hpen;
@@ -165,15 +210,19 @@ static HGDIOBJ PEN_SelectObject( HGDIOBJ handle, void *obj, HDC hdc )
 static INT PEN_GetObject16( HGDIOBJ handle, void *obj, INT count, LPVOID buffer )
 {
     PENOBJ *pen = obj;
-    LOGPEN16 logpen;
-
-    logpen.lopnStyle = pen->logpen.lopnStyle;
-    logpen.lopnColor = pen->logpen.lopnColor;
-    logpen.lopnWidth.x = pen->logpen.lopnWidth.x;
-    logpen.lopnWidth.y = pen->logpen.lopnWidth.y;
-    if (count > sizeof(logpen)) count = sizeof(logpen);
-    memcpy( buffer, &logpen, count );
-    return count;
+    LOGPEN16 *logpen;
+
+    if (!buffer) return sizeof(LOGPEN16);
+
+    if (count < sizeof(LOGPEN16)) return 0;
+
+    logpen = buffer;
+    logpen->lopnStyle = pen->logpen.elpPenStyle;
+    logpen->lopnColor = pen->logpen.elpColor;
+    logpen->lopnWidth.x = pen->logpen.elpWidth;
+    logpen->lopnWidth.y = 0;
+
+    return sizeof(LOGPEN16);
 }
 
 
@@ -184,21 +233,47 @@ static INT PEN_GetObject( HGDIOBJ handle, void *obj, INT count, LPVOID buffer )
 {
     PENOBJ *pen = obj;
 
-    if( !buffer )
-        return sizeof(pen->logpen);
+    switch (GDIMAGIC(pen->header.wMagic))
+    {
+    case PEN_MAGIC:
+    {
+        LOGPEN *lp;
+
+        if (!buffer) return sizeof(LOGPEN);
+
+        if (count < sizeof(LOGPEN)) return 0;
 
-    switch (count)
+        if ((pen->logpen.elpPenStyle & PS_STYLE_MASK) == PS_NULL &&
+            count == sizeof(EXTLOGPEN))
         {
-    case sizeof(EXTLOGPEN):
-        FIXME("extended pens not supported\n");
-        return 0;
+            EXTLOGPEN *elp = buffer;
+            memcpy(elp, &pen->logpen, sizeof(EXTLOGPEN));
+            elp->elpWidth = 0;
+            return sizeof(EXTLOGPEN);
+        }
 
-    case sizeof(LOGPEN):
-        memcpy( buffer, &pen->logpen, sizeof(LOGPEN) );
+        lp = buffer;
+        lp->lopnStyle = pen->logpen.elpPenStyle;
+        lp->lopnColor = pen->logpen.elpColor;
+        lp->lopnWidth.x = pen->logpen.elpWidth;
+        lp->lopnWidth.y = 0;
         return sizeof(LOGPEN);
+    }
+
+    case EXT_PEN_MAGIC:
+    {
+        INT size = sizeof(EXTLOGPEN) + pen->logpen.elpNumEntries * sizeof(DWORD) - sizeof(pen->logpen.elpStyleEntry);
+
+        if (!buffer) return size;
+
+        if (count < size) return 0;
+        memcpy(buffer, &pen->logpen, size);
+        return size;
+    }
 
     default:
         break;
     }
+    assert(0);
     return 0;
 }

dlls/wineps/pen.c

@@ -41,7 +41,20 @@ HPEN PSDRV_SelectPen( PSDRV_PDEVICE *physDev, HPEN hpen )
 {
     LOGPEN logpen;
 
-    if (!GetObjectA( hpen, sizeof(logpen), &logpen )) return 0;
+    if (!GetObjectW( hpen, sizeof(logpen), &logpen ))
+    {
+        /* must be an extended pen */
+        EXTLOGPEN elp;
+        if (!GetObjectW( hpen, sizeof(elp), &elp ))
+        {
+            FIXME("extended pen %p not supported\n", hpen);
+            return 0;
+        }
+        logpen.lopnStyle = elp.elpPenStyle;
+        logpen.lopnWidth.x = elp.elpWidth;
+        logpen.lopnWidth.y = 0;
+        logpen.lopnColor = elp.elpColor;
+    }
 
     TRACE("hpen = %p colour = %08lx\n", hpen, logpen.lopnColor);
 

dlls/x11drv/pen.c

@@ -38,7 +38,20 @@ HPEN X11DRV_SelectPen( X11DRV_PDEVICE *physDev, HPEN hpen )
 {
     LOGPEN logpen;
 
-    if (!GetObjectA( hpen, sizeof(logpen), &logpen )) return 0;
+    if (!GetObjectW( hpen, sizeof(logpen), &logpen ))
+    {
+        /* must be an extended pen */
+        EXTLOGPEN elp;
+        if (!GetObjectW( hpen, sizeof(elp), &elp ))
+        {
+            FIXME("extended pen %p not supported\n", hpen);
+            return 0;
+        }
+        logpen.lopnStyle = elp.elpPenStyle;
+        logpen.lopnWidth.x = elp.elpWidth;
+        logpen.lopnWidth.y = 0;
+        logpen.lopnColor = elp.elpColor;
+    }
 
     physDev->pen.style = logpen.lopnStyle & PS_STYLE_MASK;
     physDev->pen.type = logpen.lopnStyle & PS_TYPE_MASK;

include/gdi.h

@@ -44,7 +44,8 @@
 #define ENHMETAFILE_MAGIC     0x4f52
 #define ENHMETAFILE_DC_MAGIC  0x4f53
 #define MEMORY_DC_MAGIC       0x4f54
-#define LAST_MAGIC            0x4f54
+#define EXT_PEN_MAGIC         0x4f55
+#define LAST_MAGIC            0x4f55
 
 #define MAGIC_DONTCARE	      0xffff