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

Evan Stade : gdiplus: Added pixel offset mode.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: d6bd866df5ec0f4b253af14d677348967cc89138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6bd866df5ec0f4b253af14d6… Author: Evan Stade <estade(a)gmail.com> Date: Fri Jul 13 17:51:33 2007 -0700 gdiplus: Added pixel offset mode. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 24 ++++++++++++++++++++++++ include/gdiplusenums.h | 11 +++++++++++ include/gdiplusflat.h | 2 ++ 5 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c4f68d2..4403a2f 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -352,7 +352,7 @@ @ stub GdipGetPenTransform @ stub GdipGetPenUnit @ stub GdipGetPenWidth -@ stub GdipGetPixelOffsetMode +@ stdcall GdipGetPixelOffsetMode(ptr ptr) @ stdcall GdipGetPointCount(ptr ptr) @ stub GdipGetPropertyCount @ stub GdipGetPropertyIdList @@ -559,7 +559,7 @@ @ stub GdipSetPenTransform @ stub GdipSetPenUnit @ stub GdipSetPenWidth -@ stub GdipSetPixelOffsetMode +@ stdcall GdipSetPixelOffsetMode(ptr long) @ stub GdipSetPropertyItem @ stub GdipSetRenderingOrigin @ stdcall GdipSetSmoothingMode(ptr long) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 3856dee..20678c8 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -57,6 +57,7 @@ struct GpGraphics{ SmoothingMode smoothing; CompositingQuality compqual; InterpolationMode interpolation; + PixelOffsetMode pixeloffset; }; struct GpBrush{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b202f74..a725804 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -545,6 +545,7 @@ GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) (*graphics)->smoothing = SmoothingModeDefault; (*graphics)->compqual = CompositingQualityDefault; (*graphics)->interpolation = InterpolationModeDefault; + (*graphics)->pixeloffset = PixelOffsetModeDefault; return Ok; } @@ -824,6 +825,18 @@ GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics *graphics, return Ok; } +/* FIXME: Pixel offset mode is not used anywhere except the getter/setter. */ +GpStatus WINGDIPAPI GdipGetPixelOffsetMode(GpGraphics *graphics, PixelOffsetMode + *mode) +{ + if(!graphics || !mode) + return InvalidParameter; + + *mode = graphics->pixeloffset; + + return Ok; +} + /* FIXME: Smoothing mode is not used anywhere except the getter/setter. */ GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics *graphics, SmoothingMode *mode) { @@ -857,6 +870,17 @@ GpStatus WINGDIPAPI GdipSetInterpolationMode(GpGraphics *graphics, return Ok; } +GpStatus WINGDIPAPI GdipSetPixelOffsetMode(GpGraphics *graphics, PixelOffsetMode + mode) +{ + if(!graphics) + return InvalidParameter; + + graphics->pixeloffset = mode; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics *graphics, SmoothingMode mode) { if(!graphics) diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 699862c..10ed54f 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -122,6 +122,16 @@ enum InterpolationMode InterpolationModeHighQualityBicubic }; +enum PixelOffsetMode +{ + PixelOffsetModeInvalid = QualityModeInvalid, + PixelOffsetModeDefault = QualityModeDefault, + PixelOffsetModeHighSpeed = QualityModeLow, + PixelOffsetModeHighQuality = QualityModeHigh, + PixelOffsetModeNone, + PixelOffsetModeHalf +}; + #ifndef __cplusplus typedef enum Unit Unit; @@ -134,6 +144,7 @@ typedef enum QualityMode QualityMode; typedef enum SmoothingMode SmoothingMode; typedef enum CompositingQuality CompositingQuality; typedef enum InterpolationMode InterpolationMode; +typedef enum PixelOffsetMode PixelOffsetMode; #endif /* end of c typedefs */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index c7f921d..2c3c617 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -47,9 +47,11 @@ GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics*,GpPen*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipFillPie(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics*,CompositingQuality*); GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics*,InterpolationMode*); +GpStatus WINGDIPAPI GdipGetPixelOffsetMode(GpGraphics*,PixelOffsetMode*); GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics*,SmoothingMode*); GpStatus WINGDIPAPI GdipSetCompositingQuality(GpGraphics*,CompositingQuality); GpStatus WINGDIPAPI GdipSetInterpolationMode(GpGraphics*,InterpolationMode); +GpStatus WINGDIPAPI GdipSetPixelOffsetMode(GpGraphics*,PixelOffsetMode); GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics*,SmoothingMode); GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB,GpSolidFill**);

1 0

Evan Stade : gdiplus: Added interpolation mode.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: a87ce7ab9265f4b90d34f48dae1474e72330fbc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a87ce7ab9265f4b90d34f48da… Author: Evan Stade <estade(a)gmail.com> Date: Fri Jul 13 17:51:29 2007 -0700 gdiplus: Added interpolation mode. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 24 ++++++++++++++++++++++++ include/gdiplusenums.h | 14 ++++++++++++++ include/gdiplusflat.h | 2 ++ 5 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 4d2feba..c4f68d2 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -283,7 +283,7 @@ @ stub GdipGetImageType @ stub GdipGetImageVerticalResolution @ stub GdipGetImageWidth -@ stub GdipGetInterpolationMode +@ stdcall GdipGetInterpolationMode(ptr ptr) @ stub GdipGetLineBlend @ stub GdipGetLineBlendCount @ stub GdipGetLineColors @@ -513,7 +513,7 @@ @ stub GdipSetImageAttributesWrapMode @ stub GdipSetImagePalette @ stub GdipSetInfinite -@ stub GdipSetInterpolationMode +@ stdcall GdipSetInterpolationMode(ptr long) @ stub GdipSetLineBlend @ stub GdipSetLineColors @ stub GdipSetLineGammaCorrection diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index dc0fd68..3856dee 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -56,6 +56,7 @@ struct GpGraphics{ HWND hwnd; SmoothingMode smoothing; CompositingQuality compqual; + InterpolationMode interpolation; }; struct GpBrush{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b7c94b9..b202f74 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -544,6 +544,7 @@ GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) (*graphics)->hwnd = NULL; (*graphics)->smoothing = SmoothingModeDefault; (*graphics)->compqual = CompositingQualityDefault; + (*graphics)->interpolation = InterpolationModeDefault; return Ok; } @@ -811,6 +812,18 @@ GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics *graphics, return Ok; } +/* FIXME: Interpolation mode is not used anywhere except the getter/setter. */ +GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics *graphics, + InterpolationMode *mode) +{ + if(!graphics || !mode) + return InvalidParameter; + + *mode = graphics->interpolation; + + return Ok; +} + /* FIXME: Smoothing mode is not used anywhere except the getter/setter. */ GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics *graphics, SmoothingMode *mode) { @@ -833,6 +846,17 @@ GpStatus WINGDIPAPI GdipSetCompositingQuality(GpGraphics *graphics, return Ok; } +GpStatus WINGDIPAPI GdipSetInterpolationMode(GpGraphics *graphics, + InterpolationMode mode) +{ + if(!graphics) + return InvalidParameter; + + graphics->interpolation = mode; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics *graphics, SmoothingMode mode) { if(!graphics) diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index e8ad9fd..699862c 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -109,6 +109,19 @@ enum CompositingQuality CompositingQualityAssumeLinear }; +enum InterpolationMode +{ + InterpolationModeInvalid = QualityModeInvalid, + InterpolationModeDefault = QualityModeDefault, + InterpolationModeLowQuality = QualityModeLow, + InterpolationModeHighQuality = QualityModeHigh, + InterpolationModeBilinear, + InterpolationModeBicubic, + InterpolationModeNearestNeighbor, + InterpolationModeHighQualityBilinear, + InterpolationModeHighQualityBicubic +}; + #ifndef __cplusplus typedef enum Unit Unit; @@ -120,6 +133,7 @@ typedef enum LineJoin LineJoin; typedef enum QualityMode QualityMode; typedef enum SmoothingMode SmoothingMode; typedef enum CompositingQuality CompositingQuality; +typedef enum InterpolationMode InterpolationMode; #endif /* end of c typedefs */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 246a04e..c7f921d 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -46,8 +46,10 @@ GpStatus WINGDIPAPI GdipDrawPie(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics*,GpPen*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipFillPie(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics*,CompositingQuality*); +GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics*,InterpolationMode*); GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics*,SmoothingMode*); GpStatus WINGDIPAPI GdipSetCompositingQuality(GpGraphics*,CompositingQuality); +GpStatus WINGDIPAPI GdipSetInterpolationMode(GpGraphics*,InterpolationMode); GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics*,SmoothingMode); GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB,GpSolidFill**);

1 0

Evan Stade : gdiplus: Added compositing quality.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: 60cad2352230b588a7d3bdd62a0048cdfaad0721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60cad2352230b588a7d3bdd62… Author: Evan Stade <estade(a)gmail.com> Date: Fri Jul 13 17:51:25 2007 -0700 gdiplus: Added compositing quality. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 24 ++++++++++++++++++++++++ include/gdiplusenums.h | 11 +++++++++++ include/gdiplusflat.h | 2 ++ 5 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 336fea1..4d2feba 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -235,7 +235,7 @@ @ stub GdipGetClipBounds @ stub GdipGetClipBoundsI @ stub GdipGetCompositingMode -@ stub GdipGetCompositingQuality +@ stdcall GdipGetCompositingQuality(ptr ptr) @ stub GdipGetCustomLineCapBaseCap @ stub GdipGetCustomLineCapBaseInset @ stub GdipGetCustomLineCapStrokeCaps @@ -493,7 +493,7 @@ @ stub GdipSetClipRectI @ stub GdipSetClipRegion @ stub GdipSetCompositingMode -@ stub GdipSetCompositingQuality +@ stdcall GdipSetCompositingQuality(ptr long) @ stub GdipSetCustomLineCapBaseCap @ stub GdipSetCustomLineCapBaseInset @ stub GdipSetCustomLineCapStrokeCaps diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 57a8579..dc0fd68 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -55,6 +55,7 @@ struct GpGraphics{ HDC hdc; HWND hwnd; SmoothingMode smoothing; + CompositingQuality compqual; }; struct GpBrush{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f1f5f6c..b7c94b9 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -543,6 +543,7 @@ GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) (*graphics)->hdc = hdc; (*graphics)->hwnd = NULL; (*graphics)->smoothing = SmoothingModeDefault; + (*graphics)->compqual = CompositingQualityDefault; return Ok; } @@ -798,6 +799,18 @@ GpStatus WINGDIPAPI GdipFillPie(GpGraphics *graphics, GpBrush *brush, REAL x, width, height, startAngle, sweepAngle); } +/* FIXME: Compositing quality is not used anywhere except the getter/setter. */ +GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics *graphics, + CompositingQuality *quality) +{ + if(!graphics || !quality) + return InvalidParameter; + + *quality = graphics->compqual; + + return Ok; +} + /* FIXME: Smoothing mode is not used anywhere except the getter/setter. */ GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics *graphics, SmoothingMode *mode) { @@ -809,6 +822,17 @@ GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics *graphics, SmoothingMode *mo return Ok; } +GpStatus WINGDIPAPI GdipSetCompositingQuality(GpGraphics *graphics, + CompositingQuality quality) +{ + if(!graphics) + return InvalidParameter; + + graphics->compqual = quality; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics *graphics, SmoothingMode mode) { if(!graphics) diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index f7e261d..e8ad9fd 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -99,6 +99,16 @@ enum SmoothingMode SmoothingModeAntiAlias }; +enum CompositingQuality +{ + CompositingQualityInvalid = QualityModeInvalid, + CompositingQualityDefault = QualityModeDefault, + CompositingQualityHighSpeed = QualityModeLow, + CompositingQualityHighQuality = QualityModeHigh, + CompositingQualityGammaCorrected, + CompositingQualityAssumeLinear +}; + #ifndef __cplusplus typedef enum Unit Unit; @@ -109,6 +119,7 @@ typedef enum PathPointType PathPointType; typedef enum LineJoin LineJoin; typedef enum QualityMode QualityMode; typedef enum SmoothingMode SmoothingMode; +typedef enum CompositingQuality CompositingQuality; #endif /* end of c typedefs */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index cb04c4e..246a04e 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -45,7 +45,9 @@ GpStatus WINGDIPAPI GdipDrawPath(GpGraphics*,GpPen*,GpPath*); GpStatus WINGDIPAPI GdipDrawPie(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics*,GpPen*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipFillPie(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL,REAL,REAL); +GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics*,CompositingQuality*); GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics*,SmoothingMode*); +GpStatus WINGDIPAPI GdipSetCompositingQuality(GpGraphics*,CompositingQuality); GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics*,SmoothingMode); GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB,GpSolidFill**);

1 0

Evan Stade : gdiplus: Added smoothing modes.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: 53e17d2993f51b9fa8079ad5df6a1ff93d1955e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53e17d2993f51b9fa8079ad5d… Author: Evan Stade <estade(a)gmail.com> Date: Fri Jul 13 17:51:13 2007 -0700 gdiplus: Added smoothing modes. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 22 ++++++++++++++++++++++ include/gdiplusenums.h | 20 ++++++++++++++++++++ include/gdiplusflat.h | 2 ++ 5 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 9d6457e..336fea1 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -368,7 +368,7 @@ @ stub GdipGetRegionScansCount @ stub GdipGetRegionScansI @ stub GdipGetRenderingOrigin -@ stub GdipGetSmoothingMode +@ stdcall GdipGetSmoothingMode(ptr ptr) @ stub GdipGetSolidFillColor @ stub GdipGetStringFormatAlign @ stub GdipGetStringFormatDigitSubstitution @@ -562,7 +562,7 @@ @ stub GdipSetPixelOffsetMode @ stub GdipSetPropertyItem @ stub GdipSetRenderingOrigin -@ stub GdipSetSmoothingMode +@ stdcall GdipSetSmoothingMode(ptr long) @ stub GdipSetSolidFillColor @ stub GdipSetStringFormatAlign @ stub GdipSetStringFormatDigitSubstitution diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 1a2d67c..57a8579 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -54,6 +54,7 @@ struct GpPen{ struct GpGraphics{ HDC hdc; HWND hwnd; + SmoothingMode smoothing; }; struct GpBrush{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index eb37995..f1f5f6c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -542,6 +542,7 @@ GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) (*graphics)->hdc = hdc; (*graphics)->hwnd = NULL; + (*graphics)->smoothing = SmoothingModeDefault; return Ok; } @@ -796,3 +797,24 @@ GpStatus WINGDIPAPI GdipFillPie(GpGraphics *graphics, GpBrush *brush, REAL x, return draw_pie(graphics, brush->gdibrush, GetStockObject(NULL_PEN), x, y, width, height, startAngle, sweepAngle); } + +/* FIXME: Smoothing mode is not used anywhere except the getter/setter. */ +GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics *graphics, SmoothingMode *mode) +{ + if(!graphics || !mode) + return InvalidParameter; + + *mode = graphics->smoothing; + + return Ok; +} + +GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics *graphics, SmoothingMode mode) +{ + if(!graphics) + return InvalidParameter; + + graphics->smoothing = mode; + + return Ok; +} diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 629a741..f7e261d 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -81,6 +81,24 @@ enum LineJoin LineJoinMiterClipped = 3 }; +enum QualityMode +{ + QualityModeInvalid = -1, + QualityModeDefault = 0, + QualityModeLow = 1, + QualityModeHigh = 2 +}; + +enum SmoothingMode +{ + SmoothingModeInvalid = QualityModeInvalid, + SmoothingModeDefault = QualityModeDefault, + SmoothingModeHighSpeed = QualityModeLow, + SmoothingModeHighQuality = QualityModeHigh, + SmoothingModeNone, + SmoothingModeAntiAlias +}; + #ifndef __cplusplus typedef enum Unit Unit; @@ -89,6 +107,8 @@ typedef enum FillMode FillMode; typedef enum LineCap LineCap; typedef enum PathPointType PathPointType; typedef enum LineJoin LineJoin; +typedef enum QualityMode QualityMode; +typedef enum SmoothingMode SmoothingMode; #endif /* end of c typedefs */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 42c33de..cb04c4e 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -45,6 +45,8 @@ GpStatus WINGDIPAPI GdipDrawPath(GpGraphics*,GpPen*,GpPath*); GpStatus WINGDIPAPI GdipDrawPie(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics*,GpPen*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipFillPie(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL,REAL,REAL); +GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics*,SmoothingMode*); +GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics*,SmoothingMode); GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB,GpSolidFill**); GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*);

1 0

Dmitry Timoshkov : shell32: Add a cache for queried shell folder interfaces .
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: f686cfab2feb9010efe82a932dc9f5904566c8ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=f686cfab2feb9010efe82a932… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jul 16 20:17:59 2007 +0900 shell32: Add a cache for queried shell folder interfaces. --- dlls/shell32/shlfolder.c | 107 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 101 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index b243412..e198ba9 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -50,6 +50,28 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); +static CRITICAL_SECTION SHELL32_SF_ClassCacheCS; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &SHELL32_SF_ClassCacheCS, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": SHELL32_SF_ClassCacheCS") } +}; +static CRITICAL_SECTION SHELL32_SF_ClassCacheCS = { &critsect_debug, -1, 0, 0, 0, 0 }; + +/* IShellFolder class cache */ +struct _sf_cls_cache_entry +{ + CLSID clsid; + LPVOID pv; +}; + +static struct _sf_class_cache +{ + DWORD allocated, used; + struct _sf_cls_cache_entry *sf_cls_cache_entry; +} sf_cls_cache; + static const WCHAR wszDotShellClassInfo[] = { '.','S','h','e','l','l','C','l','a','s','s','I','n','f','o',0}; @@ -182,6 +204,66 @@ HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc, return hr; } +static BOOL get_iface_from_cache(REFCLSID clsid, LPVOID *ppvOut) +{ + BOOL ret = FALSE; + int i; + + EnterCriticalSection(&SHELL32_SF_ClassCacheCS); + + for (i = 0; i < sf_cls_cache.used; i++) + { + if (IsEqualIID(&sf_cls_cache.sf_cls_cache_entry[i].clsid, clsid)) + { + *ppvOut = sf_cls_cache.sf_cls_cache_entry[i].pv; + /* Pin it */ + IUnknown_AddRef((IUnknown *)*ppvOut); + ret = TRUE; + break; + } + } + + LeaveCriticalSection(&SHELL32_SF_ClassCacheCS); + return ret; +} + +static void add_iface_to_cache(REFCLSID clsid, LPVOID pv) +{ + EnterCriticalSection(&SHELL32_SF_ClassCacheCS); + + if (sf_cls_cache.used >= sf_cls_cache.allocated) + { + DWORD allocated; + struct _sf_cls_cache_entry *sf_cls_cache_entry; + + if (!sf_cls_cache.allocated) + { + allocated = 4; + sf_cls_cache_entry = HeapAlloc(GetProcessHeap(), 0, + 4 * sizeof(*sf_cls_cache_entry)); + } + else + { + allocated = sf_cls_cache.allocated * 2; + sf_cls_cache_entry = HeapReAlloc(GetProcessHeap(), 0, sf_cls_cache.sf_cls_cache_entry, + allocated * sizeof(*sf_cls_cache_entry)); + } + if (!sf_cls_cache_entry) return; + + sf_cls_cache.allocated = allocated; + sf_cls_cache.sf_cls_cache_entry = sf_cls_cache_entry; + } + + /* Pin it */ + IUnknown_AddRef((IUnknown *)pv); + + sf_cls_cache.sf_cls_cache_entry[sf_cls_cache.used].clsid = *clsid; + sf_cls_cache.sf_cls_cache_entry[sf_cls_cache.used].pv = pv; + sf_cls_cache.used++; + + LeaveCriticalSection(&SHELL32_SF_ClassCacheCS); +} + /*********************************************************************** * SHELL32_CoCreateInitSF * @@ -193,13 +275,26 @@ HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc, * In this case the absolute path is built from pidlChild (eg. C:) */ static HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, - LPCITEMIDLIST pidlChild, REFCLSID clsid, REFIID riid, LPVOID * ppvOut) + LPCITEMIDLIST pidlChild, REFCLSID clsid, LPVOID * ppvOut) { - HRESULT hr; + HRESULT hr = S_OK; TRACE ("%p %s %p\n", pidlRoot, debugstr_w(pathRoot), pidlChild); - if (SUCCEEDED ((hr = SHCoCreateInstance (NULL, clsid, NULL, riid, ppvOut)))) { + if (!get_iface_from_cache(clsid, ppvOut)) + { + hr = SHCoCreateInstance(NULL, clsid, NULL, &IID_IShellFolder, ppvOut); + if (SUCCEEDED(hr)) + { + TRACE("loaded %p %s\n", *ppvOut, wine_dbgstr_guid(clsid)); + add_iface_to_cache(clsid, *ppvOut); + } + } + else + TRACE("found in the cache %p %s\n", *ppvOut, wine_dbgstr_guid(clsid)); + + if (SUCCEEDED (hr)) + { LPITEMIDLIST pidlAbsolute = ILCombine (pidlRoot, pidlChild); IPersistFolder *pPF; IPersistFolder3 *ppf; @@ -275,7 +370,7 @@ HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, if ((clsid = _ILGetGUIDPointer (pidlChild))) { /* virtual folder */ - hr = SHELL32_CoCreateInitSF (pidlRoot, pathRoot, pidlChild, clsid, &IID_IShellFolder, (LPVOID *) & pSF); + hr = SHELL32_CoCreateInitSF (pidlRoot, pathRoot, pidlChild, clsid, (LPVOID *)&pSF); } else { /* file system folder */ CLSID clsidFolder = CLSID_ShellFSFolder; @@ -294,8 +389,8 @@ HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, wszDotShellClassInfo, wszCLSID, wszCLSIDValue, CHARS_IN_GUID)) CLSIDFromString (wszCLSIDValue, &clsidFolder); - hr = SHELL32_CoCreateInitSF (pidlRoot, pathRoot, pidlChild, - &clsidFolder, &IID_IShellFolder, (LPVOID *)&pSF); + hr = SHELL32_CoCreateInitSF (pidlRoot, pathRoot, pidlChild, + &clsidFolder, (LPVOID *)&pSF); } ILFree (pidlChild);

1 0

Evan Stade : gdiplus: Added GdipSetPathFillMode.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: 68a3d94722fba2a7f245a2014d70aec424d8c99c URL: http://source.winehq.org/git/wine.git/?a=commit;h=68a3d94722fba2a7f245a2014… Author: Evan Stade <estade(a)gmail.com> Date: Fri Jul 13 17:51:01 2007 -0700 gdiplus: Added GdipSetPathFillMode. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 10 ++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 273a9ee..9d6457e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -526,7 +526,7 @@ @ stub GdipSetMetafileDownLevelRasterizationLimit @ stub GdipSetPageScale @ stub GdipSetPageUnit -@ stub GdipSetPathFillMode +@ stdcall GdipSetPathFillMode(ptr long) @ stub GdipSetPathGradientBlend @ stub GdipSetPathGradientCenterColor @ stub GdipSetPathGradientCenterPoint diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 2fabd49..5b0e502 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -361,6 +361,16 @@ GpStatus WINGDIPAPI GdipResetPath(GpPath *path) return Ok; } +GpStatus WINGDIPAPI GdipSetPathFillMode(GpPath *path, GpFillMode fill) +{ + if(!path) + return InvalidParameter; + + path->fill = fill; + + return Ok; +} + GpStatus WINGDIPAPI GdipTransformPath(GpPath *path, GpMatrix *matrix) { if(!path) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 07f52e9..42c33de 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -65,6 +65,7 @@ GpStatus WINGDIPAPI GdipGetPathWorldBounds(GpPath*,GpRectF*,GDIPCONST GpMatrix*, GpStatus WINGDIPAPI GdipGetPointCount(GpPath*,INT*); GpStatus WINGDIPAPI GdipStartPathFigure(GpPath*); GpStatus WINGDIPAPI GdipResetPath(GpPath*); +GpStatus WINGDIPAPI GdipSetPathFillMode(GpPath*,GpFillMode); GpStatus WINGDIPAPI GdipTransformPath(GpPath*,GpMatrix*); GpStatus WINGDIPAPI GdipCreateMatrix2(REAL,REAL,REAL,REAL,REAL,REAL,GpMatrix**);

1 0

Misha Koshelev : wininet: Fix behavior of InternetQueryDataAvailable if INTERNET_FLAG_ASYNC is set.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: 663c0146a5395c83a075cb09c2864b718150d34b URL: http://source.winehq.org/git/wine.git/?a=commit;h=663c0146a5395c83a075cb09c… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sun Jul 15 16:32:57 2007 -0500 wininet: Fix behavior of InternetQueryDataAvailable if INTERNET_FLAG_ASYNC is set. --- dlls/wininet/internet.c | 77 ++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 66 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 214f8ee..32891be 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3251,10 +3251,40 @@ lend: * Determines how much data is available to be read. * * RETURNS - * If there is data available then TRUE, otherwise if there - * is not or an error occurred then FALSE. Use GetLastError() to - * check for ERROR_NO_MORE_FILES to see if it was the former. + * TRUE on success, FALSE if an error occurred. If + * INTERNET_FLAG_ASYNC was specified in InternetOpen, and + * no data is presently available, FALSE is returned with + * the last error ERROR_IO_PENDING; a callback with status + * INTERNET_STATUS_REQUEST_COMPLETE will be sent when more + * data is available. */ +void AsyncInternetQueryDataAvailableProc(WORKREQUEST *workRequest) +{ + LPWININETHTTPREQW lpwhr; + INTERNET_ASYNC_RESULT iar; + char buffer[4048]; + + TRACE("INTERNETQUERYDATAAVAILABLE %p\n", workRequest->hdr); + + switch (workRequest->hdr->htype) + { + case WH_HHTTPREQ: + lpwhr = (LPWININETHTTPREQW)workRequest->hdr; + iar.dwResult = NETCON_recv(&lpwhr->netConnection, buffer, + min(sizeof(buffer), + lpwhr->dwContentLength - lpwhr->dwContentRead), + MSG_PEEK, (int *)&iar.dwError); + INTERNET_SendCallback(workRequest->hdr, workRequest->hdr->dwContext, + INTERNET_STATUS_REQUEST_COMPLETE, &iar, + sizeof(INTERNET_ASYNC_RESULT)); + break; + + default: + FIXME("unsupported file type\n"); + break; + } +} + BOOL WINAPI InternetQueryDataAvailable( HINTERNET hFile, LPDWORD lpdwNumberOfBytesAvailble, DWORD dwFlags, DWORD dwConext) @@ -3278,20 +3308,45 @@ BOOL WINAPI InternetQueryDataAvailable( HINTERNET hFile, if (NETCON_query_data_available(&lpwhr->netConnection, lpdwNumberOfBytesAvailble)) { - if (!*lpdwNumberOfBytesAvailble && - !NETCON_recv(&lpwhr->netConnection, buffer, - min(sizeof(buffer), lpwhr->dwContentLength - lpwhr->dwContentRead), - MSG_PEEK, (int *)lpdwNumberOfBytesAvailble)) + retval = TRUE; + if (!*lpdwNumberOfBytesAvailble) { - INTERNET_SetLastError(ERROR_NO_MORE_FILES); - retval = FALSE; + /* Even if we are in async mode, we need to determine whether + * there is actually more data available. We do this by trying + * to peek only a single byte in async mode. */ + BOOL async = (lpwhr->lpHttpSession->lpAppInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC); + if (!NETCON_recv(&lpwhr->netConnection, buffer, + async ? 1 : min(sizeof(buffer), + lpwhr->dwContentLength - lpwhr->dwContentRead), + MSG_PEEK, (int *)lpdwNumberOfBytesAvailble)) + { + INTERNET_SetLastError(ERROR_NO_MORE_FILES); + retval = FALSE; + } + else if (async && *lpdwNumberOfBytesAvailble) + { + WORKREQUEST workRequest; + + *lpdwNumberOfBytesAvailble = 0; + workRequest.asyncproc = AsyncInternetQueryDataAvailableProc; + workRequest.hdr = WININET_AddRef( &lpwhr->hdr ); + + retval = INTERNET_AsyncCall(&workRequest); + if (!retval) + { + WININET_Release( &lpwhr->hdr ); + } + else + { + INTERNET_SetLastError(ERROR_IO_PENDING); + retval = FALSE; + } + } } - retval = TRUE; } else { INTERNET_SetLastError(ERROR_NO_MORE_FILES); - retval = FALSE; } break;

1 0

Huw Davies : kernel32: Overlapped pipe tests.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: e59a947c8860a07db11b047a75d897d2a0007217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e59a947c8860a07db11b047a7… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 16 12:12:18 2007 +0100 kernel32: Overlapped pipe tests. --- dlls/kernel32/tests/pipe.c | 85 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 77 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 1850e77..ccb72ba 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1257,6 +1257,82 @@ static void test_impersonation(void) CloseHandle(hClientToken); } +struct overlapped_server_args +{ + HANDLE pipe_created; +}; + +static DWORD CALLBACK overlapped_server(LPVOID arg) +{ + OVERLAPPED ol; + HANDLE pipe; + int ret, err; + struct overlapped_server_args *a = (struct overlapped_server_args*)arg; + DWORD num; + char buf[100]; + + pipe = CreateNamedPipeA("\\\\.\\pipe\\my pipe", FILE_FLAG_OVERLAPPED | PIPE_ACCESS_DUPLEX, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, 1, 0, 0, 100000, NULL); + ok(pipe != NULL, "pipe NULL\n"); + + ol.hEvent = CreateEventA(0, 1, 0, 0); + ok(ol.hEvent != NULL, "event NULL\n"); + ret = ConnectNamedPipe(pipe, &ol); + err = GetLastError(); + ok(ret == 0, "ret %d\n", ret); + ok(err == ERROR_IO_PENDING, "gle %d\n", err); + SetEvent(a->pipe_created); + + ret = WaitForSingleObjectEx(ol.hEvent, INFINITE, 1); + if(ret == WAIT_IO_COMPLETION) + todo_wine ok(ret == WAIT_OBJECT_0, "ret %x\n", ret); + else + ok(ret == WAIT_OBJECT_0, "ret %x\n", ret); + + ret = GetOverlappedResult(pipe, &ol, &num, 1); + ok(ret == 1, "ret %d\n", ret); + + /* This should block */ + ret = ReadFile(pipe, buf, sizeof(buf), &num, NULL); + if(ret == 0) + todo_wine ok(ret == 1, "ret %d\n", ret); + else + ok(ret == 1, "ret %d\n", ret); + + DisconnectNamedPipe(pipe); + CloseHandle(ol.hEvent); + CloseHandle(pipe); + return 1; +} + +static void test_overlapped(void) +{ + DWORD tid, num; + HANDLE thread, pipe; + int ret; + struct overlapped_server_args args; + + args.pipe_created = CreateEventA(0, 1, 0, 0); + thread = CreateThread(NULL, 0, overlapped_server, &args, 0, &tid); + + WaitForSingleObject(args.pipe_created, INFINITE); + pipe = CreateFileA("\\\\.\\pipe\\my pipe", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(pipe != INVALID_HANDLE_VALUE, "cf failed\n"); + + /* Sleep to try to get the ReadFile in the server to occur before the following WriteFile */ + Sleep(1); + + ret = WriteFile(pipe, "x", 1, &num, NULL); + if(ret == 0) + todo_wine ok(ret == 1, "ret %d\n", ret); + else + ok(ret == 1, "ret %d\n", ret); + + WaitForSingleObject(thread, INFINITE); + CloseHandle(pipe); + CloseHandle(args.pipe_created); + CloseHandle(thread); +} + START_TEST(pipe) { HMODULE hmod; @@ -1264,20 +1340,13 @@ START_TEST(pipe) hmod = GetModuleHandle("advapi32.dll"); pDuplicateTokenEx = (void *) GetProcAddress(hmod, "DuplicateTokenEx"); - trace("test 1 of 7:\n"); if (test_DisconnectNamedPipe()) return; - trace("test 2 of 7:\n"); test_CreateNamedPipe_instances_must_match(); - trace("test 3 of 7:\n"); test_NamedPipe_2(); - trace("test 4 of 7:\n"); test_CreateNamedPipe(PIPE_TYPE_BYTE); - trace("test 5 of 7\n"); test_CreateNamedPipe(PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE); - trace("test 6 of 7\n"); test_CreatePipe(); - trace("test 7 of 7\n"); test_impersonation(); - trace("all tests done\n"); + test_overlapped(); }

1 0

Misha Koshelev : wininet/tests: Add testing framework and tests for internet status callbacks.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: 4e0371f322fdd73f3586f0312288dcaf3ff670b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e0371f322fdd73f3586f0312… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sun Jul 15 16:29:48 2007 -0500 wininet/tests: Add testing framework and tests for internet status callbacks. --- dlls/wininet/tests/http.c | 297 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 286 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e0371f322fdd73f3586f…

1 0

Misha Koshelev : wininet/tests: Properly handle ERROR_IO_PENDING from InternetQueryDataAvailable.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: 0d1f2bf5268248eeac684f24587899d800a98159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d1f2bf5268248eeac684f245… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sun Jul 15 16:29:46 2007 -0500 wininet/tests: Properly handle ERROR_IO_PENDING from InternetQueryDataAvailable. --- dlls/wininet/tests/http.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 92ef629..7953b8d 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -271,11 +271,18 @@ static void InternetReadFile_test(int flags) length = 100; trace("Entering Query loop\n"); - while (length) + while (TRUE) { rc = InternetQueryDataAvailable(hor,&length,0x0,0x0); ok(!(rc == 0 && length != 0),"InternetQueryDataAvailable failed\n"); - + if (flags & INTERNET_FLAG_ASYNC) + { + if (rc == 0 && GetLastError() == ERROR_IO_PENDING) + { + WaitForSingleObject(hCompleteEvent, INFINITE); + continue; + } + } if (length) { char *buffer; @@ -289,6 +296,8 @@ static void InternetReadFile_test(int flags) HeapFree(GetProcessHeap(),0,buffer); } + if (length == 0) + break; } abort: if (hor != 0x0) {

1 0