July 2007 - Wine-Commits - list.winehq.org

Evan Stade : gdiplus: Added GdipSetPageUnit.
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: 10b575bc8636f262b8667310bbbd96da7d32f040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b575bc8636f262b8667310b… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 23 20:24:41 2007 -0700 gdiplus: Added GdipSetPageUnit. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 21 +++++++++++++++++++++ include/gdiplusflat.h | 2 ++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index e59516c..919efe6 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -306,7 +306,7 @@ @ stub GdipGetMetafileHeaderFromWmf @ stub GdipGetNearestColor @ stub GdipGetPageScale -@ stub GdipGetPageUnit +@ stdcall GdipGetPageUnit(ptr ptr) @ stub GdipGetPathData @ stdcall GdipGetPathFillMode(ptr ptr) @ stub GdipGetPathGradientBlend @@ -525,7 +525,7 @@ @ stub GdipSetMatrixElements @ stub GdipSetMetafileDownLevelRasterizationLimit @ stub GdipSetPageScale -@ stub GdipSetPageUnit +@ stdcall GdipSetPageUnit(ptr long) @ stdcall GdipSetPathFillMode(ptr long) @ stub GdipSetPathGradientBlend @ stub GdipSetPathGradientCenterColor diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index aac3278..72e2303 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -65,6 +65,7 @@ struct GpGraphics{ CompositingQuality compqual; InterpolationMode interpolation; PixelOffsetMode pixeloffset; + GpUnit unit; /* page unit */ }; struct GpBrush{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 64ac4fe..7a26d87 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -701,6 +701,7 @@ GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) (*graphics)->compqual = CompositingQualityDefault; (*graphics)->interpolation = InterpolationModeDefault; (*graphics)->pixeloffset = PixelOffsetModeDefault; + (*graphics)->unit = UnitDisplay; return Ok; } @@ -1018,6 +1019,16 @@ GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics *graphics, return Ok; } +GpStatus WINGDIPAPI GdipGetPageUnit(GpGraphics *graphics, GpUnit *unit) +{ + if(!graphics || !unit) + return InvalidParameter; + + *unit = graphics->unit; + + return Ok; +} + /* FIXME: Pixel offset mode is not used anywhere except the getter/setter. */ GpStatus WINGDIPAPI GdipGetPixelOffsetMode(GpGraphics *graphics, PixelOffsetMode *mode) @@ -1083,6 +1094,16 @@ GpStatus WINGDIPAPI GdipSetInterpolationMode(GpGraphics *graphics, return Ok; } +GpStatus WINGDIPAPI GdipSetPageUnit(GpGraphics *graphics, GpUnit unit) +{ + if(!graphics) + return InvalidParameter; + + graphics->unit = unit; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetPixelOffsetMode(GpGraphics *graphics, PixelOffsetMode mode) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 706aa27..d0aae71 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -62,12 +62,14 @@ GpStatus WINGDIPAPI GdipFillPolygonI(GpGraphics*,GpBrush*,GDIPCONST GpPoint*,INT GpFillMode); GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics*,CompositingQuality*); GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics*,InterpolationMode*); +GpStatus WINGDIPAPI GdipGetPageUnit(GpGraphics*,GpUnit*); GpStatus WINGDIPAPI GdipGetPixelOffsetMode(GpGraphics*,PixelOffsetMode*); GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics*,SmoothingMode*); GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics*,GraphicsState); GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics*,GraphicsState*); GpStatus WINGDIPAPI GdipSetCompositingQuality(GpGraphics*,CompositingQuality); GpStatus WINGDIPAPI GdipSetInterpolationMode(GpGraphics*,InterpolationMode); +GpStatus WINGDIPAPI GdipSetPageUnit(GpGraphics*,GpUnit); GpStatus WINGDIPAPI GdipSetPixelOffsetMode(GpGraphics*,PixelOffsetMode); GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics*,SmoothingMode);

1 0

Evan Stade : gdiplus: Added GdipFillPolygonI.
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: 6467526469d91f72d05fc3851b797ec5018cb122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6467526469d91f72d05fc3851… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 23 20:24:35 2007 -0700 gdiplus: Added GdipFillPolygonI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 20 ++++++++++++++++++ include/gdiplusflat.h | 2 + include/gdiplusgpstubs.h | 1 + include/gdiplustypes.h | 48 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 72 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c2880e8..e59516c 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -214,7 +214,7 @@ @ stub GdipFillPolygon2 @ stub GdipFillPolygon2I @ stub GdipFillPolygon -@ stub GdipFillPolygonI +@ stdcall GdipFillPolygonI(ptr ptr ptr long long) @ stub GdipFillRectangle @ stub GdipFillRectangleI @ stub GdipFillRectangles diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 93b2079..64ac4fe 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -974,6 +974,26 @@ GpStatus WINGDIPAPI GdipFillPie(GpGraphics *graphics, GpBrush *brush, REAL x, width, height, startAngle, sweepAngle); } +GpStatus WINGDIPAPI GdipFillPolygonI(GpGraphics *graphics, GpBrush *brush, + GDIPCONST GpPoint *points, INT count, GpFillMode fillMode) +{ + INT save_state; + + if(!graphics || !brush || !points || !count) + return InvalidParameter; + + save_state = SaveDC(graphics->hdc); + EndPath(graphics->hdc); + SelectObject(graphics->hdc, brush->gdibrush); + SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); + SetPolyFillMode(graphics->hdc, (fillMode == FillModeAlternate ? ALTERNATE + : WINDING)); + Polygon(graphics->hdc, (GDIPCONST POINT*) points, count); + + RestoreDC(graphics->hdc, save_state); + return Ok; +} + /* FIXME: Compositing quality is not used anywhere except the getter/setter. */ GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics *graphics, CompositingQuality *quality) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 446cb98..706aa27 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -58,6 +58,8 @@ GpStatus WINGDIPAPI GdipDrawPie(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics*,GpPen*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipFillPath(GpGraphics*,GpBrush*,GpPath*); GpStatus WINGDIPAPI GdipFillPie(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL,REAL,REAL); +GpStatus WINGDIPAPI GdipFillPolygonI(GpGraphics*,GpBrush*,GDIPCONST GpPoint*,INT, + GpFillMode); GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics*,CompositingQuality*); GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics*,InterpolationMode*); GpStatus WINGDIPAPI GdipGetPixelOffsetMode(GpGraphics*,PixelOffsetMode*); diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index 0e431c5..70da065 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -55,5 +55,6 @@ typedef LineJoin GpLineJoin; typedef DashCap GpDashCap; typedef DashStyle GpDashStyle; typedef MatrixOrder GpMatrixOrder; +typedef Point GpPoint; #endif diff --git a/include/gdiplustypes.h b/include/gdiplustypes.h index 9404376..426ab7a 100644 --- a/include/gdiplustypes.h +++ b/include/gdiplustypes.h @@ -47,6 +47,48 @@ enum Status{ #ifdef __cplusplus +class Point +{ +public: + Point() + { + X = Y = 0; + } + + Point(IN const Point &pt) + { + X = pt.X; + Y = pt.Y; + } + + /* FIXME: missing constructor that takes a Size */ + + Point(IN INT x, IN INT y) + { + X = x; + Y = y; + } + + Point operator+(IN const Point& pt) const + { + return Point(X + pt.X, Y + pt.Y); + } + + Point operator-(IN const Point& pt) const + { + return Point(X - pt.X, Y - pt.Y); + } + + BOOL Equals(IN const Point& pt) + { + return (X == pt.X) && (Y == pt.Y); + } + +public: + INT X; + INT Y; +}; + class PointF { public: @@ -134,6 +176,12 @@ public: #else /* end of c++ typedefs */ +typedef struct Point +{ + INT X; + INT Y; +} Point; + typedef struct PointF { REAL X;

1 0

Evan Stade : gdiplus: Implemented GdipSetPenColor.
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: 27124d5d327c5fe9a975fd174c47b31bc72d3c25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27124d5d327c5fe9a975fd174… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 23 20:24:29 2007 -0700 gdiplus: Implemented GdipSetPenColor. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 1 - dlls/gdiplus/graphics.c | 16 ++++++++-------- dlls/gdiplus/pen.c | 17 +++++++++++++++-- dlls/gdiplus/tests/pen.c | 6 ++---- include/gdiplusflat.h | 1 + 6 files changed, 27 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 82e2b76..c2880e8 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -542,7 +542,7 @@ @ stub GdipSetPathGradientWrapMode @ stub GdipSetPathMarker @ stdcall GdipSetPenBrushFill(ptr ptr) -@ stub GdipSetPenColor +@ stdcall GdipSetPenColor(ptr long) @ stub GdipSetPenCompoundArray @ stdcall GdipSetPenCustomEndCap(ptr ptr) @ stdcall GdipSetPenCustomStartCap(ptr ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 0338042..aac3278 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -44,7 +44,6 @@ static inline REAL deg2rad(REAL degrees) struct GpPen{ UINT style; - COLORREF color; GpUnit unit; REAL width; HPEN gdipen; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 0594c57..93b2079 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -394,9 +394,9 @@ static GpStatus draw_polyline(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, &ptcopy[0].X, &ptcopy[0].Y, pen->customend->inset * pen->width); - draw_cap(hdc, pen->color, pen->endcap, pen->width, pen->customend, + draw_cap(hdc, pen->brush->lb.lbColor, pen->endcap, pen->width, pen->customend, pt[count - 2].X, pt[count - 2].Y, pt[count - 1].X, pt[count - 1].Y); - draw_cap(hdc, pen->color, pen->startcap, pen->width, pen->customstart, + draw_cap(hdc, pen->brush->lb.lbColor, pen->startcap, pen->width, pen->customstart, pt[1].X, pt[1].Y, pt[0].X, pt[0].Y); } @@ -512,12 +512,12 @@ static GpStatus draw_polybezier(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, /* the direction of the line cap is parallel to the direction at the * end of the bezier (which, if it has been shortened, is not the same * as the direction from pt[count-2] to pt[count-1]) */ - draw_cap(hdc, pen->color, pen->endcap, pen->width, pen->customend, + draw_cap(hdc, pen->brush->lb.lbColor, pen->endcap, pen->width, pen->customend, pt[count - 1].X - (ptcopy[count - 1].X - ptcopy[count - 2].X), pt[count - 1].Y - (ptcopy[count - 1].Y - ptcopy[count - 2].Y), pt[count - 1].X, pt[count - 1].Y); - draw_cap(hdc, pen->color, pen->startcap, pen->width, pen->customstart, + draw_cap(hdc, pen->brush->lb.lbColor, pen->startcap, pen->width, pen->customstart, pt[0].X - (ptcopy[0].X - ptcopy[1].X), pt[0].Y - (ptcopy[0].Y - ptcopy[1].Y), pt[0].X, pt[0].Y); } @@ -588,7 +588,7 @@ static GpStatus draw_poly(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, MoveToEx(hdc, curpos.x, curpos.y, NULL); } - draw_cap(hdc, pen->color, pen->endcap, pen->width, pen->customend, + draw_cap(hdc, pen->brush->lb.lbColor, pen->endcap, pen->width, pen->customend, pt[count - 1].X - (ptcopy[count - 1].X - ptcopy[count - 2].X), pt[count - 1].Y - (ptcopy[count - 1].Y - ptcopy[count - 2].Y), pt[count - 1].X, pt[count - 1].Y); @@ -604,7 +604,7 @@ static GpStatus draw_poly(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, &ptcopy[count - 1].X, &ptcopy[count - 1].Y, pen->customend->inset * pen->width); - draw_cap(hdc, pen->color, pen->endcap, pen->width, pen->customend, + draw_cap(hdc, pen->brush->lb.lbColor, pen->endcap, pen->width, pen->customend, pt[count - 2].X, pt[count - 2].Y, pt[count - 1].X, pt[count - 1].Y); @@ -632,7 +632,7 @@ static GpStatus draw_poly(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, MoveToEx(hdc, curpos.x, curpos.y, NULL); } - draw_cap(hdc, pen->color, pen->startcap, pen->width, pen->customstart, + draw_cap(hdc, pen->brush->lb.lbColor, pen->startcap, pen->width, pen->customstart, pt[j - 1].X - (ptcopy[j - 1].X - ptcopy[j].X), pt[j - 1].Y - (ptcopy[j - 1].Y - ptcopy[j].Y), pt[j - 1].X, pt[j - 1].Y); @@ -648,7 +648,7 @@ static GpStatus draw_poly(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, &ptcopy[j - 1].X, &ptcopy[j - 1].Y, pen->customstart->inset * pen->width); - draw_cap(hdc, pen->color, pen->endcap, pen->width, pen->customstart, + draw_cap(hdc, pen->brush->lb.lbColor, pen->endcap, pen->width, pen->customstart, pt[j].X, pt[j].Y, pt[j - 1].X, pt[j - 1].Y); diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index d68df33..0f58b25 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -98,7 +98,6 @@ GpStatus WINGDIPAPI GdipCreatePen1(ARGB color, FLOAT width, GpUnit unit, if(!gp_pen) return OutOfMemory; gp_pen->style = GP_DEFAULT_PENSTYLE; - gp_pen->color = ARGB2COLORREF(color); gp_pen->width = width; gp_pen->unit = unit; gp_pen->endcap = LineCapFlat; @@ -147,7 +146,10 @@ GpStatus WINGDIPAPI GdipGetPenColor(GpPen *pen, ARGB *argb) if(!pen || !argb) return InvalidParameter; - return NotImplemented; + if(pen->brush->bt != BrushTypeSolidColor) + return NotImplemented; + + return GdipGetSolidFillColor(((GpSolidFill*)pen->brush), argb); } GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen *pen, GpDashStyle *dash) @@ -179,6 +181,17 @@ GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen *pen, GpBrush *brush) return Ok; } +GpStatus WINGDIPAPI GdipSetPenColor(GpPen *pen, ARGB argb) +{ + if(!pen) + return InvalidParameter; + + if(pen->brush->bt != BrushTypeSolidColor) + return NotImplemented; + + return GdipSetSolidFillColor(((GpSolidFill*)pen->brush), argb); +} + GpStatus WINGDIPAPI GdipSetPenCustomEndCap(GpPen *pen, GpCustomLineCap* customCap) { GpCustomLineCap * cap; diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 16a9356..0238aac 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -87,8 +87,7 @@ static void test_brushfill(void) GdipGetBrushType(brush, &type); expect(BrushTypeSolidColor, type); GdipGetPenColor(pen, &color); - todo_wine - expect(0xdeadbeef, color); + expect(0xdeadbeef, color); GdipDeleteBrush(brush); /* color controlled by brush */ @@ -96,8 +95,7 @@ static void test_brushfill(void) status = GdipSetPenBrushFill(pen, brush); expect(Ok, status); GdipGetPenColor(pen, &color); - todo_wine - expect(0xabaddeed, color); + expect(0xabaddeed, color); GdipDeleteBrush(brush); color = 0; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index bfd1211..446cb98 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -34,6 +34,7 @@ GpStatus WINGDIPAPI GdipGetPenBrushFill(GpPen*,GpBrush**); GpStatus WINGDIPAPI GdipGetPenColor(GpPen*,ARGB*); GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen*,GpDashStyle*); GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen*,GpBrush*); +GpStatus WINGDIPAPI GdipSetPenColor(GpPen*,ARGB); GpStatus WINGDIPAPI GdipSetPenCustomEndCap(GpPen*,GpCustomLineCap*); GpStatus WINGDIPAPI GdipSetPenCustomStartCap(GpPen*,GpCustomLineCap*); GpStatus WINGDIPAPI GdipSetPenDashStyle(GpPen*,GpDashStyle);

1 0

Evan Stade : gdiplus: Implemented GdipSetSolidFillColor/ GdipGetSolidFillColor.
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: 8b2ce0f94b2097fdcafc6f313b56858a45d2990a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b2ce0f94b2097fdcafc6f313… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 23 20:24:24 2007 -0700 gdiplus: Implemented GdipSetSolidFillColor/GdipGetSolidFillColor. --- dlls/gdiplus/brush.c | 28 +++++++++++++++++++++------- dlls/gdiplus/gdiplus_private.h | 2 +- dlls/gdiplus/tests/pen.c | 3 +-- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 64fdb69..76456bd 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -26,12 +26,18 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) if(!brush || !clone) return InvalidParameter; - *clone = GdipAlloc(sizeof(GpBrush)); - if (!*clone) return OutOfMemory; + switch(brush->bt){ + case BrushTypeSolidColor: + *clone = GdipAlloc(sizeof(GpSolidFill)); + if (!*clone) return OutOfMemory; - memcpy(*clone, brush, sizeof(GpBrush)); + memcpy(*clone, brush, sizeof(GpSolidFill)); - (*clone)->gdibrush = CreateBrushIndirect(&(*clone)->lb); + (*clone)->gdibrush = CreateBrushIndirect(&(*clone)->lb); + break; + default: + return NotImplemented; + } return Ok; } @@ -51,7 +57,7 @@ GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB color, GpSolidFill **sf) (*sf)->brush.gdibrush = CreateSolidBrush(col); (*sf)->brush.bt = BrushTypeSolidColor; - (*sf)->brush.color = col; + (*sf)->color = color; return Ok; } @@ -80,7 +86,9 @@ GpStatus WINGDIPAPI GdipGetSolidFillColor(GpSolidFill *sf, ARGB *argb) if(!sf || !argb) return InvalidParameter; - return NotImplemented; + *argb = sf->color; + + return Ok; } GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill *sf, ARGB argb) @@ -88,5 +96,11 @@ GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill *sf, ARGB argb) if(!sf) return InvalidParameter; - return NotImplemented; + sf->color = argb; + sf->brush.lb.lbColor = ARGB2COLORREF(argb); + + DeleteObject(sf->brush.gdibrush); + sf->brush.gdibrush = CreateSolidBrush(sf->brush.lb.lbColor); + + return Ok; } diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index c872481..0338042 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -71,12 +71,12 @@ struct GpGraphics{ struct GpBrush{ HBRUSH gdibrush; GpBrushType bt; - COLORREF color; LOGBRUSH lb; }; struct GpSolidFill{ GpBrush brush; + ARGB color; }; struct GpPath{ diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 94163e9..16a9356 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -107,8 +107,7 @@ static void test_brushfill(void) GdipGetPenBrushFill(pen, &brush2); ok(brush != brush2, "Expected to get a clone, not a copy of the reference\n"); GdipGetSolidFillColor((GpSolidFill*)brush2, &color); - todo_wine - expect(0xabaddeed, color); + expect(0xabaddeed, color); GdipDeleteBrush(brush); GdipDeleteBrush(brush2);

1 0

Evan Stade : gdiplus/tests: Added pen brush fill test.
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: 777d661fd2bc3eea67896161b0c37dec9de5de28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=777d661fd2bc3eea67896161b… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 23 20:24:18 2007 -0700 gdiplus/tests: Added pen brush fill test. --- dlls/gdiplus/tests/pen.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index c6e29c9..94163e9 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -72,6 +72,53 @@ static void test_constructor_destructor(void) expect(Ok, status); } +static void test_brushfill(void) +{ + GpStatus status; + GpPen *pen; + GpBrush *brush, *brush2; + GpBrushType type; + ARGB color = 0; + + /* default solid */ + GdipCreatePen1(0xdeadbeef, 4.5, UnitWorld, &pen); + status = GdipGetPenBrushFill(pen, &brush); + expect(Ok, status); + GdipGetBrushType(brush, &type); + expect(BrushTypeSolidColor, type); + GdipGetPenColor(pen, &color); + todo_wine + expect(0xdeadbeef, color); + GdipDeleteBrush(brush); + + /* color controlled by brush */ + GdipCreateSolidFill(0xabaddeed, (GpSolidFill**)&brush); + status = GdipSetPenBrushFill(pen, brush); + expect(Ok, status); + GdipGetPenColor(pen, &color); + todo_wine + expect(0xabaddeed, color); + GdipDeleteBrush(brush); + color = 0; + + /* get returns a clone, not a reference */ + GdipGetPenBrushFill(pen, &brush); + GdipSetSolidFillColor((GpSolidFill*)brush, 0xbeadfeed); + GdipGetPenBrushFill(pen, &brush2); + ok(brush != brush2, "Expected to get a clone, not a copy of the reference\n"); + GdipGetSolidFillColor((GpSolidFill*)brush2, &color); + todo_wine + expect(0xabaddeed, color); + GdipDeleteBrush(brush); + GdipDeleteBrush(brush2); + + /* brush cannot be NULL */ + status = GdipSetPenBrushFill(pen, NULL); + expect(InvalidParameter, status); + + GdipDeletePen(pen); +} + START_TEST(pen) { struct GdiplusStartupInput gdiplusStartupInput; @@ -87,6 +134,7 @@ START_TEST(pen) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); test_constructor_destructor(); + test_brushfill(); GdiplusShutdown(gdiplusToken); }

1 0

Evan Stade : gdiplus: Added GdipGetPenBrushFill.
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: 37598f81e7c300cf3be10ad321c42c3244a4350f URL: http://source.winehq.org/git/wine.git/?a=commit;h=37598f81e7c300cf3be10ad32… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 23 20:24:07 2007 -0700 gdiplus: Added GdipGetPenBrushFill. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 8 ++++++++ include/gdiplusflat.h | 1 + 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 9c7abb3..6fec42c 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -332,7 +332,7 @@ @ stdcall GdipGetPathTypes(ptr ptr long) @ stdcall GdipGetPathWorldBounds(ptr ptr ptr ptr) @ stub GdipGetPathWorldBoundsI -@ stub GdipGetPenBrushFill +@ stdcall GdipGetPenBrushFill(ptr ptr) @ stdcall GdipGetPenColor(ptr ptr) @ stub GdipGetPenCompoundArray @ stub GdipGetPenCompoundCount diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index d52ef1e..d68df33 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -134,6 +134,14 @@ GpStatus WINGDIPAPI GdipDeletePen(GpPen *pen) return Ok; } +GpStatus WINGDIPAPI GdipGetPenBrushFill(GpPen *pen, GpBrush **brush) +{ + if(!pen || !brush) + return InvalidParameter; + + return GdipCloneBrush(pen->brush, brush); +} + GpStatus WINGDIPAPI GdipGetPenColor(GpPen *pen, ARGB *argb) { if(!pen || !argb) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 1dfbe51..5f424c1 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -30,6 +30,7 @@ extern "C" { GpStatus WINGDIPAPI GdipClonePen(GpPen*,GpPen**); GpStatus WINGDIPAPI GdipCreatePen1(ARGB,REAL,GpUnit,GpPen**); GpStatus WINGDIPAPI GdipDeletePen(GpPen*); +GpStatus WINGDIPAPI GdipGetPenBrushFill(GpPen*,GpBrush**); GpStatus WINGDIPAPI GdipGetPenColor(GpPen*,ARGB*); GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen*,GpDashStyle*); GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen*,GpBrush*);

1 0

Evan Stade : gdiplus: Added GdipSetSolidFillColor and GdipGetSolidFillColor stubs.
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: 82abeeea75adf4627fd5143d36434428a01398cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=82abeeea75adf4627fd5143d3… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 23 20:24:13 2007 -0700 gdiplus: Added GdipSetSolidFillColor and GdipGetSolidFillColor stubs. --- dlls/gdiplus/brush.c | 16 ++++++++++++++++ dlls/gdiplus/gdiplus.spec | 4 ++-- include/gdiplusflat.h | 2 ++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 21c92b5..64fdb69 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -74,3 +74,19 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) return Ok; } + +GpStatus WINGDIPAPI GdipGetSolidFillColor(GpSolidFill *sf, ARGB *argb) +{ + if(!sf || !argb) + return InvalidParameter; + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill *sf, ARGB argb) +{ + if(!sf) + return InvalidParameter; + + return NotImplemented; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 6fec42c..82e2b76 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -369,7 +369,7 @@ @ stub GdipGetRegionScansI @ stub GdipGetRenderingOrigin @ stdcall GdipGetSmoothingMode(ptr ptr) -@ stub GdipGetSolidFillColor +@ stdcall GdipGetSolidFillColor(ptr ptr) @ stub GdipGetStringFormatAlign @ stub GdipGetStringFormatDigitSubstitution @ stub GdipGetStringFormatFlags @@ -563,7 +563,7 @@ @ stub GdipSetPropertyItem @ stub GdipSetRenderingOrigin @ stdcall GdipSetSmoothingMode(ptr long) -@ stub GdipSetSolidFillColor +@ stdcall GdipSetSolidFillColor(ptr ptr) @ stub GdipSetStringFormatAlign @ stub GdipSetStringFormatDigitSubstitution @ stub GdipSetStringFormatFlags diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 5f424c1..bfd1211 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -72,6 +72,8 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush*,GpBrush**); GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB,GpSolidFill**); GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*); GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush*); +GpStatus WINGDIPAPI GdipGetSolidFillColor(GpSolidFill*,ARGB*); +GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill*,ARGB); GpStatus WINGDIPAPI GdipAddPathArc(GpPath*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath*,GDIPCONST GpPointF*,INT);

1 0

Evan Stade : gdiplus: Added GdipGetPenColor stub.
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: e43967773f6bb0759433d33910a2da974d9cc4bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e43967773f6bb0759433d3391… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 23 20:24:00 2007 -0700 gdiplus: Added GdipGetPenColor stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 8 ++++++++ include/gdiplusflat.h | 1 + 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 4fa3d89..9c7abb3 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -333,7 +333,7 @@ @ stdcall GdipGetPathWorldBounds(ptr ptr ptr ptr) @ stub GdipGetPathWorldBoundsI @ stub GdipGetPenBrushFill -@ stub GdipGetPenColor +@ stdcall GdipGetPenColor(ptr ptr) @ stub GdipGetPenCompoundArray @ stub GdipGetPenCompoundCount @ stub GdipGetPenCustomEndCap diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 8817c1b..d52ef1e 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -134,6 +134,14 @@ GpStatus WINGDIPAPI GdipDeletePen(GpPen *pen) return Ok; } +GpStatus WINGDIPAPI GdipGetPenColor(GpPen *pen, ARGB *argb) +{ + if(!pen || !argb) + return InvalidParameter; + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen *pen, GpDashStyle *dash) { if(!pen || !dash) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 63a3873..1dfbe51 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -30,6 +30,7 @@ extern "C" { GpStatus WINGDIPAPI GdipClonePen(GpPen*,GpPen**); GpStatus WINGDIPAPI GdipCreatePen1(ARGB,REAL,GpUnit,GpPen**); GpStatus WINGDIPAPI GdipDeletePen(GpPen*); +GpStatus WINGDIPAPI GdipGetPenColor(GpPen*,ARGB*); GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen*,GpDashStyle*); GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen*,GpBrush*); GpStatus WINGDIPAPI GdipSetPenCustomEndCap(GpPen*,GpCustomLineCap*);

1 0

Evan Stade : gdiplus: Added GdipSetPenBrushFill.
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: a72be4b1676091e779256ff4308f18ed724a8397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a72be4b1676091e779256ff43… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 23 20:23:52 2007 -0700 gdiplus: Added GdipSetPenBrushFill. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 19 +++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 66f4de2..4fa3d89 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -541,7 +541,7 @@ @ stub GdipSetPathGradientTransform @ stub GdipSetPathGradientWrapMode @ stub GdipSetPathMarker -@ stub GdipSetPenBrushFill +@ stdcall GdipSetPenBrushFill(ptr ptr) @ stub GdipSetPenColor @ stub GdipSetPenCompoundArray @ stdcall GdipSetPenCustomEndCap(ptr ptr) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index c003076..8817c1b 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -144,6 +144,25 @@ GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen *pen, GpDashStyle *dash) return Ok; } +GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen *pen, GpBrush *brush) +{ + GpStatus retval; + + if(!pen || !brush) + return InvalidParameter; + + GdipDeleteBrush(pen->brush); + retval = GdipCloneBrush(brush, &pen->brush); + if(retval != Ok) + return retval; + + DeleteObject(pen->gdipen); + pen->gdipen = ExtCreatePen(pen->style, roundr(pen->width), &pen->brush->lb, 0, + NULL); + + return Ok; +} + GpStatus WINGDIPAPI GdipSetPenCustomEndCap(GpPen *pen, GpCustomLineCap* customCap) { GpCustomLineCap * cap; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 31d973b..63a3873 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -31,6 +31,7 @@ GpStatus WINGDIPAPI GdipClonePen(GpPen*,GpPen**); GpStatus WINGDIPAPI GdipCreatePen1(ARGB,REAL,GpUnit,GpPen**); GpStatus WINGDIPAPI GdipDeletePen(GpPen*); GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen*,GpDashStyle*); +GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen*,GpBrush*); GpStatus WINGDIPAPI GdipSetPenCustomEndCap(GpPen*,GpCustomLineCap*); GpStatus WINGDIPAPI GdipSetPenCustomStartCap(GpPen*,GpCustomLineCap*); GpStatus WINGDIPAPI GdipSetPenDashStyle(GpPen*,GpDashStyle);

1 0

Misha Koshelev : urlmon: Wrap IHttpNegotiate2 interface exposed by IBindStatusCallback as done by native .
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: 7cc8b279fb397d19f852df4526125dafbfd2e9b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cc8b279fb397d19f852df452… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Jul 23 20:35:53 2007 -0500 urlmon: Wrap IHttpNegotiate2 interface exposed by IBindStatusCallback as done by native. --- dlls/urlmon/binding.c | 159 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 128 insertions(+), 31 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 17bc0f2..aaadbd8 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -46,6 +46,15 @@ typedef struct _task_header_t { } task_header_t; typedef struct { + const IHttpNegotiate2Vtbl *lpHttpNegotiate2Vtbl; + + LONG ref; + + IHttpNegotiate *http_negotiate; + IHttpNegotiate2 *http_negotiate2; +} HttpNegotiate2Wrapper; + +typedef struct { const IStreamVtbl *lpStreamVtbl; LONG ref; @@ -76,6 +85,7 @@ struct Binding { IInternetProtocol *protocol; IServiceProvider *service_provider; ProtocolStream *stream; + HttpNegotiate2Wrapper *httpneg2_wrapper; BINDINFO bindinfo; DWORD bindf; @@ -101,6 +111,7 @@ struct Binding { #define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) #define STREAM(x) ((IStream*) &(x)->lpStreamVtbl) +#define HTTPNEG2(x) ((IHttpNegotiate2*) &(x)->lpHttpNegotiate2Vtbl) #define WM_MK_CONTINUE (WM_USER+101) @@ -248,84 +259,153 @@ static void dump_BINDINFO(BINDINFO *bi) ); } -static HRESULT WINAPI HttpNegotiate_QueryInterface(IHttpNegotiate2 *iface, - REFIID riid, void **ppv) +#define HTTPNEG2_THIS(iface) DEFINE_THIS(HttpNegotiate2Wrapper, HttpNegotiate2, iface) + +static HRESULT WINAPI HttpNegotiate2Wrapper_QueryInterface(IHttpNegotiate2 *iface, + REFIID riid, void **ppv) { + HttpNegotiate2Wrapper *This = HTTPNEG2_THIS(iface); + *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(IID_IUnknown %p)\n", ppv); - *ppv = iface; + *ppv = HTTPNEG2(This); }else if(IsEqualGUID(&IID_IHttpNegotiate, riid)) { TRACE("(IID_IHttpNegotiate %p)\n", ppv); - *ppv = iface; + *ppv = HTTPNEG2(This); }else if(IsEqualGUID(&IID_IHttpNegotiate2, riid)) { TRACE("(IID_IHttpNegotiate2 %p)\n", ppv); - *ppv = iface; + *ppv = HTTPNEG2(This); } if(*ppv) { - IHttpNegotiate2_AddRef(iface); + IHttpNegotiate2_AddRef(HTTPNEG2(This)); return S_OK; } - WARN("Unsupported interface %s\n", debugstr_guid(riid)); + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); return E_NOINTERFACE; } -static ULONG WINAPI HttpNegotiate_AddRef(IHttpNegotiate2 *iface) +static ULONG WINAPI HttpNegotiate2Wrapper_AddRef(IHttpNegotiate2 *iface) { - URLMON_LockModule(); - return 2; + HttpNegotiate2Wrapper *This = HTTPNEG2_THIS(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } -static ULONG WINAPI HttpNegotiate_Release(IHttpNegotiate2 *iface) +static ULONG WINAPI HttpNegotiate2Wrapper_Release(IHttpNegotiate2 *iface) { - URLMON_UnlockModule(); - return 1; + HttpNegotiate2Wrapper *This = HTTPNEG2_THIS(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + if (This->http_negotiate) + IHttpNegotiate_Release(This->http_negotiate); + if (This->http_negotiate2) + IHttpNegotiate2_Release(This->http_negotiate2); + HeapFree(GetProcessHeap(), 0, This); + + URLMON_UnlockModule(); + } + + return ref; } -static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate2 *iface, +static HRESULT WINAPI HttpNegotiate2Wrapper_BeginningTransaction(IHttpNegotiate2 *iface, LPCWSTR szURL, LPCWSTR szHeaders, DWORD dwReserved, LPWSTR *pszAdditionalHeaders) { - TRACE("(%s %s %d %p)\n", debugstr_w(szURL), debugstr_w(szHeaders), dwReserved, + HttpNegotiate2Wrapper *This = HTTPNEG2_THIS(iface); + + TRACE("(%p)->(%s %s %d %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders), dwReserved, pszAdditionalHeaders); + if(This->http_negotiate) + return IHttpNegotiate_BeginningTransaction(This->http_negotiate, szURL, szHeaders, + dwReserved, pszAdditionalHeaders); + *pszAdditionalHeaders = NULL; return S_OK; } -static HRESULT WINAPI HttpNegotiate_OnResponse(IHttpNegotiate2 *iface, DWORD dwResponseCode, +static HRESULT WINAPI HttpNegotiate2Wrapper_OnResponse(IHttpNegotiate2 *iface, DWORD dwResponseCode, LPCWSTR szResponseHeaders, LPCWSTR szRequestHeaders, LPWSTR *pszAdditionalRequestHeaders) { - TRACE("(%d %s %s %p)\n", dwResponseCode, debugstr_w(szResponseHeaders), + HttpNegotiate2Wrapper *This = HTTPNEG2_THIS(iface); + LPWSTR szAdditionalRequestHeaders = NULL; + HRESULT hres = S_OK; + + TRACE("(%p)->(%d %s %s %p)\n", This, dwResponseCode, debugstr_w(szResponseHeaders), debugstr_w(szRequestHeaders), pszAdditionalRequestHeaders); - if(pszAdditionalRequestHeaders) + /* IHttpNegotiate2_OnResponse expects pszAdditionalHeaders to be non-NULL when it is + * implemented as part of IBindStatusCallback, but it is NULL when called directly from + * IProtocol */ + if(!pszAdditionalRequestHeaders) + pszAdditionalRequestHeaders = &szAdditionalRequestHeaders; + + if(This->http_negotiate) + { + hres = IHttpNegotiate_OnResponse(This->http_negotiate, dwResponseCode, szResponseHeaders, + szRequestHeaders, pszAdditionalRequestHeaders); + if(pszAdditionalRequestHeaders == &szAdditionalRequestHeaders && + szAdditionalRequestHeaders) + CoTaskMemFree(szAdditionalRequestHeaders); + } + else + { *pszAdditionalRequestHeaders = NULL; - return S_OK; + } + + return hres; } -static HRESULT WINAPI HttpNegotiate_GetRootSecurityId(IHttpNegotiate2 *iface, +static HRESULT WINAPI HttpNegotiate2Wrapper_GetRootSecurityId(IHttpNegotiate2 *iface, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved) { - TRACE("(%p %p %ld)\n", pbSecurityId, pcbSecurityId, dwReserved); + HttpNegotiate2Wrapper *This = HTTPNEG2_THIS(iface); + + TRACE("(%p)->(%p %p %ld)\n", This, pbSecurityId, pcbSecurityId, dwReserved); + + if (This->http_negotiate2) + return IHttpNegotiate2_GetRootSecurityId(This->http_negotiate2, pbSecurityId, + pcbSecurityId, dwReserved); /* That's all we have to do here */ return E_FAIL; } -static const IHttpNegotiate2Vtbl HttpNegotiate2Vtbl = { - HttpNegotiate_QueryInterface, - HttpNegotiate_AddRef, - HttpNegotiate_Release, - HttpNegotiate_BeginningTransaction, - HttpNegotiate_OnResponse, - HttpNegotiate_GetRootSecurityId +#undef HTTPNEG2_THIS + +static const IHttpNegotiate2Vtbl HttpNegotiate2WrapperVtbl = { + HttpNegotiate2Wrapper_QueryInterface, + HttpNegotiate2Wrapper_AddRef, + HttpNegotiate2Wrapper_Release, + HttpNegotiate2Wrapper_BeginningTransaction, + HttpNegotiate2Wrapper_OnResponse, + HttpNegotiate2Wrapper_GetRootSecurityId }; -static IHttpNegotiate2 HttpNegotiate = { &HttpNegotiate2Vtbl }; +static HttpNegotiate2Wrapper *create_httpneg2_wrapper(void) +{ + HttpNegotiate2Wrapper *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(HttpNegotiate2Wrapper)); + + ret->lpHttpNegotiate2Vtbl = &HttpNegotiate2WrapperVtbl; + ret->ref = 1; + ret->http_negotiate = NULL; + ret->http_negotiate2 = NULL; + + URLMON_LockModule(); + + return ret; +} #define STREAM_THIS(iface) DEFINE_THIS(ProtocolStream, Stream, iface) @@ -601,6 +681,8 @@ static ULONG WINAPI Binding_Release(IBinding *iface) IServiceProvider_Release(This->service_provider); if(This->stream) IStream_Release(STREAM(This->stream)); + if(This->httpneg2_wrapper) + IHttpNegotiate2_Release(HTTPNEG2(This->httpneg2_wrapper)); ReleaseBindInfo(&This->bindinfo); This->section.DebugInfo->Spare[0] = 0; @@ -1092,8 +1174,20 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, } if(IsEqualGUID(&IID_IHttpNegotiate, guidService) - || IsEqualGUID(&IID_IHttpNegotiate2, guidService)) - return IHttpNegotiate2_QueryInterface(&HttpNegotiate, riid, ppv); + || IsEqualGUID(&IID_IHttpNegotiate2, guidService)) { + if(!This->httpneg2_wrapper) { + WARN("HttpNegotiate2Wrapper expected to be non-NULL\n"); + } else { + if(IsEqualGUID(&IID_IHttpNegotiate, guidService)) + IBindStatusCallback_QueryInterface(This->callback, riid, + (void **)&This->httpneg2_wrapper->http_negotiate); + else + IBindStatusCallback_QueryInterface(This->callback, riid, + (void **)&This->httpneg2_wrapper->http_negotiate2); + + return IHttpNegotiate2_QueryInterface(HTTPNEG2(This->httpneg2_wrapper), riid, ppv); + } + } WARN("unknown service %s\n", debugstr_guid(guidService)); return E_NOTIMPL; @@ -1208,6 +1302,7 @@ static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding * ret->protocol = NULL; ret->service_provider = NULL; ret->stream = NULL; + ret->httpneg2_wrapper = NULL; ret->mime = NULL; ret->url = NULL; ret->apartment_thread = GetCurrentThreadId(); @@ -1265,6 +1360,8 @@ static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding * ret->stgmed.u.pstm = STREAM(ret->stream); ret->stgmed.pUnkForRelease = (IUnknown*)BINDING(ret); /* NOTE: Windows uses other IUnknown */ + ret->httpneg2_wrapper = create_httpneg2_wrapper(); + *binding = ret; return S_OK; }

1 0