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

Evan Stade : gdiplus: Make pen width depend on world transform.
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: b7053b74ba006d5f946051f7dee250ff1271f3e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7053b74ba006d5f946051f7d… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 24 17:18:58 2007 -0700 gdiplus: Make pen width depend on world transform. --- dlls/gdiplus/graphics.c | 51 +++++++++++++++++++++++++++++++--------------- 1 files changed, 34 insertions(+), 17 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6535def..6c8f13e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -99,10 +99,21 @@ static INT prepare_dc(GpGraphics *graphics, GpPen *pen) HPEN gdipen; REAL width; INT save_state = SaveDC(graphics->hdc); + GpPointF pt[2]; EndPath(graphics->hdc); - width = pen->width * convert_unit(graphics->hdc, + /* Get an estimate for the amount the pen width is affected by the world + * transform. (This is similar to what some of the wine drivers do.) */ + pt[0].X = 0.0; + pt[0].Y = 0.0; + pt[1].X = 1.0; + pt[1].Y = 1.0; + GdipTransformMatrixPoints(graphics->worldtrans, pt, 2); + width = sqrt((pt[1].X - pt[0].X) * (pt[1].X - pt[0].X) + + (pt[1].Y - pt[0].Y) * (pt[1].Y - pt[0].Y)) / sqrt(2.0); + + width *= pen->width * convert_unit(graphics->hdc, pen->unit == UnitWorld ? graphics->unit : pen->unit); gdipen = ExtCreatePen(pen->style, roundr(width), &pen->brush->lb, 0, NULL); @@ -205,31 +216,35 @@ static void calc_curve_bezier_endp(REAL xend, REAL yend, REAL xadj, REAL yadj, static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL size, const GpCustomLineCap *custom, REAL x1, REAL y1, REAL x2, REAL y2) { - HGDIOBJ oldbrush, oldpen; + HGDIOBJ oldbrush = NULL, oldpen = NULL; GpMatrix *matrix = NULL; - HBRUSH brush; - HPEN pen; + HBRUSH brush = NULL; + HPEN pen = NULL; PointF ptf[4], *custptf = NULL; POINT pt[4], *custpt = NULL; BYTE *tp = NULL; REAL theta, dsmall, dbig, dx, dy = 0.0; INT i, count; LOGBRUSH lb; + BOOL customstroke; if((x1 == x2) && (y1 == y2)) return; theta = gdiplus_atan2(y2 - y1, x2 - x1); - brush = CreateSolidBrush(color); - lb.lbStyle = BS_SOLID; - lb.lbColor = color; - lb.lbHatch = 0; - pen = ExtCreatePen(PS_GEOMETRIC | PS_SOLID | PS_ENDCAP_FLAT, - ((cap == LineCapCustom) && custom && (custom->fill)) ? size : 1, - &lb, 0, NULL); - oldbrush = SelectObject(graphics->hdc, brush); - oldpen = SelectObject(graphics->hdc, pen); + customstroke = (cap == LineCapCustom) && custom && (!custom->fill); + if(!customstroke){ + brush = CreateSolidBrush(color); + lb.lbStyle = BS_SOLID; + lb.lbColor = color; + lb.lbHatch = 0; + pen = ExtCreatePen(PS_GEOMETRIC | PS_SOLID | PS_ENDCAP_FLAT | + PS_JOIN_MITER, 1, &lb, 0, + NULL); + oldbrush = SelectObject(graphics->hdc, brush); + oldpen = SelectObject(graphics->hdc, pen); + } switch(cap){ case LineCapFlat: @@ -382,10 +397,12 @@ custend: break; } - SelectObject(graphics->hdc, oldbrush); - SelectObject(graphics->hdc, oldpen); - DeleteObject(brush); - DeleteObject(pen); + if(!customstroke){ + SelectObject(graphics->hdc, oldbrush); + SelectObject(graphics->hdc, oldpen); + DeleteObject(brush); + DeleteObject(pen); + } } /* Shortens the line by the given percent by changing x2, y2.

1 0

Evan Stade : gdiplus: Added GdipCreateMetafileFromEmf stub.
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: 5cc8c10e0e8930edbba5ec29603a1a17d02131b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc8c10e0e8930edbba5ec296… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 24 17:19:05 2007 -0700 gdiplus: Added GdipCreateMetafileFromEmf stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 14 ++++++++++++++ include/gdiplusflat.h | 1 + include/gdiplusgpstubs.h | 4 ++++ 4 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 49732db..5481670 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -99,7 +99,7 @@ @ stub GdipCreateMatrix3 @ stub GdipCreateMatrix3I @ stdcall GdipCreateMatrix(ptr) -@ stub GdipCreateMetafileFromEmf +@ stdcall GdipCreateMetafileFromEmf(ptr long ptr) @ stub GdipCreateMetafileFromFile @ stub GdipCreateMetafileFromStream @ stub GdipCreateMetafileFromWmf diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6c8f13e..f024d7c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -804,6 +804,20 @@ GpStatus WINGDIPAPI GdipCreateFromHWND(HWND hwnd, GpGraphics **graphics) return Ok; } +GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete, + GpMetafile **metafile) +{ + static int calls; + + if(!hemf || !metafile) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) { if(!graphics) return InvalidParameter; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 1143195..e493df5 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -46,6 +46,7 @@ GpStatus WINGDIPAPI GdipSetPenStartCap(GpPen*,GpLineCap); GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHWND(HWND,GpGraphics**); +GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE,BOOL,GpMetafile**); GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *); GpStatus WINGDIPAPI GdipDrawArc(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL, diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index 70da065..9d57648 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -29,6 +29,8 @@ class GpPath {}; class GpMatrix {}; class GpPathIterator {}; class GpCustomLineCap {}; +class GpImage {}; +class GpMetafile : public GpImage {}; #else /* end of c++ declarations */ @@ -40,6 +42,8 @@ typedef struct GpPath GpPath; typedef struct GpMatrix GpMatrix; typedef struct GpPathIterator GpPathIterator; typedef struct GpCustomLineCap GpCustomLineCap; +typedef struct GpImage GpImage; +typedef struct GpMetafile GpMetafile; #endif /* end of c declarations */

1 0

Evan Stade : gdiplus: Added GdipSetWorldTransform/GdipGetWorldTransform.
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: f30732fdf99d7bc0fb13d74ecf0ad6629a378d52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f30732fdf99d7bc0fb13d74ec… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 24 17:18:47 2007 -0700 gdiplus: Added GdipSetWorldTransform/GdipGetWorldTransform. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 26 ++++++++++++++++++++++++++ include/gdiplusflat.h | 2 ++ 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index f13a72f..49732db 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -386,7 +386,7 @@ @ stub GdipGetTextureWrapMode @ stub GdipGetVisibleClipBounds @ stub GdipGetVisibleClipBoundsI -@ stub GdipGetWorldTransform +@ stdcall GdipGetWorldTransform(ptr ptr) @ stub GdipGraphicsClear @ stub GdipImageForceValidation @ stub GdipImageGetFrameCount @@ -576,7 +576,7 @@ @ stub GdipSetTextRenderingHint @ stub GdipSetTextureTransform @ stub GdipSetTextureWrapMode -@ stub GdipSetWorldTransform +@ stdcall GdipSetWorldTransform(ptr ptr) @ stub GdipShearMatrix @ stdcall GdipStartPathFigure(ptr) @ stub GdipStringFormatGetGenericDefault diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 2e7fc2c..f8e79f0 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -67,6 +67,7 @@ struct GpGraphics{ PixelOffsetMode pixeloffset; GpUnit unit; /* page unit */ REAL scale; /* page scale */ + GpMatrix * worldtrans; /* world transform */ }; struct GpBrush{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3ed99ca..9daf092 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -734,6 +734,8 @@ end: GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) { + GpStatus retval; + if(hdc == NULL) return OutOfMemory; @@ -743,6 +745,11 @@ GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) *graphics = GdipAlloc(sizeof(GpGraphics)); if(!*graphics) return OutOfMemory; + if((retval = GdipCreateMatrix(&(*graphics)->worldtrans)) != Ok){ + GdipFree(*graphics); + return retval; + } + (*graphics)->hdc = hdc; (*graphics)->hwnd = NULL; (*graphics)->smoothing = SmoothingModeDefault; @@ -773,6 +780,7 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) if(graphics->hwnd) ReleaseDC(graphics->hwnd, graphics->hdc); + GdipDeleteMatrix(graphics->worldtrans); HeapFree(GetProcessHeap(), 0, graphics); return Ok; @@ -1133,6 +1141,15 @@ GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics *graphics, SmoothingMode *mo return Ok; } +GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics *graphics, GpMatrix *matrix) +{ + if(!graphics || !matrix) + return InvalidParameter; + + memcpy(matrix, graphics->worldtrans, sizeof(GpMatrix)); + return Ok; +} + GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics *graphics, GraphicsState state) { if(!graphics) @@ -1215,3 +1232,12 @@ GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics *graphics, SmoothingMode mod return Ok; } + +GpStatus WINGDIPAPI GdipSetWorldTransform(GpGraphics *graphics, GpMatrix *matrix) +{ + if(!graphics || !matrix) + return InvalidParameter; + + GdipDeleteMatrix(graphics->worldtrans); + return GdipCloneMatrix(matrix, &graphics->worldtrans); +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 94693eb..1143195 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -66,6 +66,7 @@ GpStatus WINGDIPAPI GdipGetPageScale(GpGraphics*,REAL*); GpStatus WINGDIPAPI GdipGetPageUnit(GpGraphics*,GpUnit*); GpStatus WINGDIPAPI GdipGetPixelOffsetMode(GpGraphics*,PixelOffsetMode*); GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics*,SmoothingMode*); +GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics*,GpMatrix*); GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics*,GraphicsState); GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics*,GraphicsState*); GpStatus WINGDIPAPI GdipSetCompositingQuality(GpGraphics*,CompositingQuality); @@ -74,6 +75,7 @@ GpStatus WINGDIPAPI GdipSetPageScale(GpGraphics*,REAL); GpStatus WINGDIPAPI GdipSetPageUnit(GpGraphics*,GpUnit); GpStatus WINGDIPAPI GdipSetPixelOffsetMode(GpGraphics*,PixelOffsetMode); GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics*,SmoothingMode); +GpStatus WINGDIPAPI GdipSetWorldTransform(GpGraphics*,GpMatrix*); GpStatus WINGDIPAPI GdipCloneBrush(GpBrush*,GpBrush**); GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB,GpSolidFill**);

1 0

Evan Stade : gdiplus: Use world transform when drawing points.
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: c3e8af414ba653358f4e34cc4b0c3088636b71a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3e8af414ba653358f4e34cc4… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 24 17:18:50 2007 -0700 gdiplus: Use world transform when drawing points. --- dlls/gdiplus/graphics.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 9daf092..6f022a1 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -83,9 +83,10 @@ static BYTE convert_path_point_type(BYTE type) * gdi to draw, and these functions would irreparably mess with line widths. */ static void transform_and_round_points(GpGraphics *graphics, POINT *pti, - GDIPCONST GpPointF *ptf, INT count) + GpPointF *ptf, INT count) { REAL unitscale; + GpMatrix *matrix; int i; switch(graphics->unit) @@ -113,9 +114,13 @@ static void transform_and_round_points(GpGraphics *graphics, POINT *pti, if(graphics->unit != UnitDisplay) unitscale *= graphics->scale; + GdipCloneMatrix(graphics->worldtrans, &matrix); + GdipScaleMatrix(matrix, unitscale, unitscale, MatrixOrderAppend); + GdipTransformMatrixPoints(matrix, ptf, count); + for(i = 0; i < count; i++){ - pti[i].x = roundr(unitscale * ptf[i].X); - pti[i].y = roundr(unitscale * ptf[i].Y); + pti[i].x = roundr(ptf[i].X); + pti[i].y = roundr(ptf[i].Y); } } @@ -431,9 +436,9 @@ static GpStatus draw_polyline(GpGraphics *graphics, GpPen *pen, goto end; } - if(caps){ - memcpy(ptcopy, pt, count * sizeof(GpPointF)); + memcpy(ptcopy, pt, count * sizeof(GpPointF)); + if(caps){ if(pen->endcap == LineCapArrowAnchor) shorten_line_amt(ptcopy[count-2].X, ptcopy[count-2].Y, &ptcopy[count-1].X, &ptcopy[count-1].Y, pen->width); @@ -454,11 +459,9 @@ static GpStatus draw_polyline(GpGraphics *graphics, GpPen *pen, pt[count - 2].X, pt[count - 2].Y, pt[count - 1].X, pt[count - 1].Y); draw_cap(graphics, pen->brush->lb.lbColor, pen->startcap, pen->width, pen->customstart, pt[1].X, pt[1].Y, pt[0].X, pt[0].Y);\ - - transform_and_round_points(graphics, pti, ptcopy, count); } - else - transform_and_round_points(graphics, pti, pt, count); + + transform_and_round_points(graphics, pti, ptcopy, count); Polyline(graphics->hdc, pti, count); @@ -533,9 +536,9 @@ static GpStatus draw_polybezier(GpGraphics *graphics, GpPen *pen, goto end; } - if(caps){ - memcpy(ptcopy, pt, count * sizeof(GpPointF)); + memcpy(ptcopy, pt, count * sizeof(GpPointF)); + if(caps){ if(pen->endcap == LineCapArrowAnchor) shorten_bezier_amt(&ptcopy[count-4], pen->width, FALSE); /* FIXME The following is seemingly correct only for baseinset < 0 or @@ -574,11 +577,9 @@ static GpStatus draw_polybezier(GpGraphics *graphics, GpPen *pen, draw_cap(graphics, 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); - - transform_and_round_points(graphics, pti, ptcopy, count); } - else - transform_and_round_points(graphics, pti, pt, count); + + transform_and_round_points(graphics, pti, ptcopy, count); PolyBezier(graphics->hdc, pti, count); @@ -622,11 +623,11 @@ static GpStatus draw_poly(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF * } } + memcpy(ptcopy, pt, count * sizeof(GpPointF)); + /* If we are drawing caps, go through the points and adjust them accordingly, * and draw the caps. */ if(caps){ - memcpy(ptcopy, pt, count * sizeof(GpPointF)); - switch(types[count - 1] & PathPointTypePathTypeMask){ case PathPointTypeBezier: if(pen->endcap == LineCapArrowAnchor) @@ -711,10 +712,9 @@ static GpStatus draw_poly(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF * ERR("Bad path points\n"); goto end; } - transform_and_round_points(graphics, pti, ptcopy, count); } - else - transform_and_round_points(graphics, pti, pt, count); + + transform_and_round_points(graphics, pti, ptcopy, count); for(i = 0; i < count; i++){ tp[i] = convert_path_point_type(types[i]);

1 0

Evan Stade : gdiplus: Added GdipSetPageScale/GdipGetPageScale.
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: 816213955360c650475cddacd117725e968ea8b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=816213955360c650475cddacd… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 24 17:18:39 2007 -0700 gdiplus: Added GdipSetPageScale/GdipGetPageScale. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 25 +++++++++++++++++++++++++ include/gdiplusflat.h | 2 ++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 919efe6..59887a7 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -305,7 +305,7 @@ @ stub GdipGetMetafileHeaderFromStream @ stub GdipGetMetafileHeaderFromWmf @ stub GdipGetNearestColor -@ stub GdipGetPageScale +@ stdcall GdipGetPageScale(ptr ptr) @ stdcall GdipGetPageUnit(ptr ptr) @ stub GdipGetPathData @ stdcall GdipGetPathFillMode(ptr ptr) @@ -524,7 +524,7 @@ @ stub GdipSetLineWrapMode @ stub GdipSetMatrixElements @ stub GdipSetMetafileDownLevelRasterizationLimit -@ stub GdipSetPageScale +@ stdcall GdipSetPageScale(ptr long) @ stdcall GdipSetPageUnit(ptr long) @ stdcall GdipSetPathFillMode(ptr long) @ stub GdipSetPathGradientBlend diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 72e2303..2e7fc2c 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -66,6 +66,7 @@ struct GpGraphics{ InterpolationMode interpolation; PixelOffsetMode pixeloffset; GpUnit unit; /* page unit */ + REAL scale; /* page scale */ }; struct GpBrush{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index df481cd..3ed99ca 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -109,6 +109,10 @@ static void transform_and_round_points(GpGraphics *graphics, POINT *pti, break; } + /* apply page scale */ + if(graphics->unit != UnitDisplay) + unitscale *= graphics->scale; + for(i = 0; i < count; i++){ pti[i].x = roundr(unitscale * ptf[i].X); pti[i].y = roundr(unitscale * ptf[i].Y); @@ -746,6 +750,7 @@ GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) (*graphics)->interpolation = InterpolationModeDefault; (*graphics)->pixeloffset = PixelOffsetModeDefault; (*graphics)->unit = UnitDisplay; + (*graphics)->scale = 1.0; return Ok; } @@ -1085,6 +1090,16 @@ GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics *graphics, return Ok; } +GpStatus WINGDIPAPI GdipGetPageScale(GpGraphics *graphics, REAL *scale) +{ + if(!graphics || !scale) + return InvalidParameter; + + *scale = graphics->scale; + + return Ok; +} + GpStatus WINGDIPAPI GdipGetPageUnit(GpGraphics *graphics, GpUnit *unit) { if(!graphics || !unit) @@ -1160,6 +1175,16 @@ GpStatus WINGDIPAPI GdipSetInterpolationMode(GpGraphics *graphics, return Ok; } +GpStatus WINGDIPAPI GdipSetPageScale(GpGraphics *graphics, REAL scale) +{ + if(!graphics || (scale <= 0.0)) + return InvalidParameter; + + graphics->scale = scale; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetPageUnit(GpGraphics *graphics, GpUnit unit) { if(!graphics || (unit == UnitWorld)) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index d0aae71..03def6f 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -62,6 +62,7 @@ GpStatus WINGDIPAPI GdipFillPolygonI(GpGraphics*,GpBrush*,GDIPCONST GpPoint*,INT GpFillMode); GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics*,CompositingQuality*); GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics*,InterpolationMode*); +GpStatus WINGDIPAPI GdipGetPageScale(GpGraphics*,REAL*); GpStatus WINGDIPAPI GdipGetPageUnit(GpGraphics*,GpUnit*); GpStatus WINGDIPAPI GdipGetPixelOffsetMode(GpGraphics*,PixelOffsetMode*); GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics*,SmoothingMode*); @@ -69,6 +70,7 @@ GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics*,GraphicsState); GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics*,GraphicsState*); GpStatus WINGDIPAPI GdipSetCompositingQuality(GpGraphics*,CompositingQuality); GpStatus WINGDIPAPI GdipSetInterpolationMode(GpGraphics*,InterpolationMode); +GpStatus WINGDIPAPI GdipSetPageScale(GpGraphics*,REAL); GpStatus WINGDIPAPI GdipSetPageUnit(GpGraphics*,GpUnit); GpStatus WINGDIPAPI GdipSetPixelOffsetMode(GpGraphics*,PixelOffsetMode); GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics*,SmoothingMode);

1 0

Evan Stade : gdiplus: Added GdipCloneMatrix.
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: eab427ee3fc8477df55db652b6334361958523c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eab427ee3fc8477df55db652b… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 24 17:18:42 2007 -0700 gdiplus: Added GdipCloneMatrix. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/matrix.c | 13 +++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 59887a7..f13a72f 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -49,7 +49,7 @@ @ stub GdipCloneFontFamily @ stub GdipCloneImage @ stub GdipCloneImageAttributes -@ stub GdipCloneMatrix +@ stdcall GdipCloneMatrix(ptr ptr) @ stub GdipClonePath @ stdcall GdipClonePen(ptr ptr) @ stub GdipCloneRegion diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index 0752077..50d511a 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -70,6 +70,19 @@ GpStatus WINGDIPAPI GdipCreateMatrix2(REAL m11, REAL m12, REAL m21, REAL m22, return Ok; } +GpStatus WINGDIPAPI GdipCloneMatrix(GpMatrix *matrix, GpMatrix **clone) +{ + if(!matrix || !clone) + return InvalidParameter; + + *clone = GdipAlloc(sizeof(GpMatrix)); + if(!*clone) return OutOfMemory; + + memcpy(*clone, matrix, sizeof(GpMatrix)); + + return Ok; +} + GpStatus WINGDIPAPI GdipCreateMatrix(GpMatrix **matrix) { if(!matrix) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 03def6f..94693eb 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -101,6 +101,7 @@ GpStatus WINGDIPAPI GdipResetPath(GpPath*); GpStatus WINGDIPAPI GdipSetPathFillMode(GpPath*,GpFillMode); GpStatus WINGDIPAPI GdipTransformPath(GpPath*,GpMatrix*); +GpStatus WINGDIPAPI GdipCloneMatrix(GpMatrix*,GpMatrix**); GpStatus WINGDIPAPI GdipCreateMatrix2(REAL,REAL,REAL,REAL,REAL,REAL,GpMatrix**); GpStatus WINGDIPAPI GdipCreateMatrix(GpMatrix**); GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix*);

1 0

Alexandre Julliard : user32/tests: Flush events more aggressively in mouse input test.
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: 809d47839d665588b79eb35fcf1a06fbd8d3e99a URL: http://source.winehq.org/git/wine.git/?a=commit;h=809d47839d665588b79eb35fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 25 13:46:42 2007 +0200 user32/tests: Flush events more aggressively in mouse input test. --- dlls/user32/tests/win.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6cbddeb..9c08367 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2507,7 +2507,7 @@ static void test_mouse_input(HWND hwnd) GetCursorPos(&pt); ok(x == pt.x && y == pt.y, "wrong cursor pos (%d,%d), expected (%d,%d)\n", pt.x, pt.y, x, y); - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + flush_events(); /* Check that setting the same position will generate WM_MOUSEMOVE */ SetCursorPos(x, y); @@ -2520,7 +2520,7 @@ static void test_mouse_input(HWND hwnd) * otherwise it won't generate relative mouse movements below. */ mouse_event(MOUSEEVENTF_MOVE, -1, -1, 0, 0); - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + flush_events(); msg.message = 0; mouse_event(MOUSEEVENTF_MOVE, 1, 1, 0, 0); @@ -2536,7 +2536,7 @@ static void test_mouse_input(HWND hwnd) ShowWindow(popup, SW_HIDE); ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); ok(msg.hwnd == hwnd && msg.message == WM_MOUSEMOVE, "hwnd %p message %04x\n", msg.hwnd, msg.message); - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + flush_events(); mouse_event(MOUSEEVENTF_MOVE, 1, 1, 0, 0); ShowWindow(hwnd, SW_HIDE); @@ -2547,8 +2547,6 @@ static void test_mouse_input(HWND hwnd) ShowWindow(hwnd, SW_SHOW); ShowWindow(popup, SW_SHOW); - - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); flush_events(); mouse_event(MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0); @@ -2580,7 +2578,7 @@ static void test_mouse_input(HWND hwnd) ok(!ret, "message %04x available\n", msg.message); ShowWindow(popup, SW_HIDE); - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + flush_events(); mouse_event(MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0); mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0);

1 0

Evan Stade : gdiplus: Added support for more page units.
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: 827f979b37b5e0fb2f0f74c3d5c3acc039c24da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=827f979b37b5e0fb2f0f74c3d… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 24 17:18:34 2007 -0700 gdiplus: Added support for more page units. --- dlls/gdiplus/graphics.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 8a53c03..df481cd 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -93,6 +93,17 @@ static void transform_and_round_points(GpGraphics *graphics, POINT *pti, case UnitInch: unitscale = GetDeviceCaps(graphics->hdc, LOGPIXELSX); break; + case UnitPoint: + unitscale = ((REAL)GetDeviceCaps(graphics->hdc, LOGPIXELSX)) / 72.0; + break; + case UnitDocument: + unitscale = ((REAL)GetDeviceCaps(graphics->hdc, LOGPIXELSX)) / 300.0; + break; + case UnitMillimeter: + unitscale = ((REAL)GetDeviceCaps(graphics->hdc, LOGPIXELSX)) / 25.4; + break; + case UnitPixel: + case UnitDisplay: default: unitscale = 1.0; break; @@ -1151,7 +1162,7 @@ GpStatus WINGDIPAPI GdipSetInterpolationMode(GpGraphics *graphics, GpStatus WINGDIPAPI GdipSetPageUnit(GpGraphics *graphics, GpUnit unit) { - if(!graphics) + if(!graphics || (unit == UnitWorld)) return InvalidParameter; graphics->unit = unit;

1 0

Alexandre Julliard : gdi32/tests: Don't test default char, it doesn' t have to be always the same.
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: cb0a626e509af2a4e09bf4974c1069a41b57bac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb0a626e509af2a4e09bf4974… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 25 13:46:18 2007 +0200 gdi32/tests: Don't test default char, it doesn't have to be always the same. --- dlls/gdi32/tests/font.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 92aad9e..dddacd9 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1571,8 +1571,6 @@ static void test_text_metrics(const LOGFONTA *lf) test_char = min(last_unicode_char, 255); ok(tmA.tmLastChar == test_char, "A: tmLastChar for %s %02x != %02x\n", font_name, tmA.tmLastChar, test_char); - ok(tmA.tmDefaultChar == 0x1f, "A: tmDefaultChar for %s %02x != 0x1f\n", - font_name, tmA.tmDefaultChar); ok(tmA.tmBreakChar == 0x20, "A: tmBreakChar for %s %02x != 0x20\n", font_name, tmA.tmBreakChar); }

1 0

James Hawkins : msi: Use a different separator as a semi-colon may separate values in the CustomActionData .
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: 6af199ef9c4e25e3521f8ad3b109a0ab43edebae URL: http://source.winehq.org/git/wine.git/?a=commit;h=6af199ef9c4e25e3521f8ad3b… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jul 24 15:54:36 2007 -0700 msi: Use a different separator as a semi-colon may separate values in the CustomActionData. --- dlls/msi/custom.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 06699d2..cc08c29 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -137,7 +137,7 @@ static BOOL check_execution_scheduling_options(MSIPACKAGE *package, LPCWSTR acti /* stores the following properties before the action: * - * [CustomActionData;UserSID;ProductCode]Action + * [CustomActionData][UserSID][ProductCode]Action */ static LPWSTR msi_get_deferred_action(LPCWSTR action, LPCWSTR actiondata, LPCWSTR usersid, LPCWSTR prodcode) @@ -145,7 +145,7 @@ static LPWSTR msi_get_deferred_action(LPCWSTR action, LPCWSTR actiondata, LPWSTR deferred; DWORD len; - static const WCHAR format[] = {'[','%','s',';','%','s',';','%','s',']','%','s',0}; + static const WCHAR format[] = {'[','%','s',']','[','%','s',']','[','%','s',']','%','s',0}; if (!actiondata) return strdupW(action); @@ -162,15 +162,15 @@ static void set_deferred_action_props(MSIPACKAGE *package, LPWSTR deferred_data) { LPWSTR end, beg = deferred_data + 1; - end = strchrW(beg, ';'); + end = strchrW(beg, ']'); *end = '\0'; MSI_SetPropertyW(package, szActionData, beg); - beg = end + 1; + beg = end + 2; - end = strchrW(beg, ';'); + end = strchrW(beg, ']'); *end = '\0'; MSI_SetPropertyW(package, UserSID, beg); - beg = end + 1; + beg = end + 2; end = strchrW(beg, ']'); *end = '\0'; @@ -193,7 +193,7 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL WCHAR *deformated=NULL; /* deferred action: [properties]Action */ - if ((ptr = strchrW(action_copy, ']'))) + if ((ptr = strrchrW(action_copy, ']'))) { deferred_data = action_copy; action = ptr + 1;

1 0