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

Evan Stade : gdiplus: Added GdipDeleteStringFormat.
by Alexandre Julliard Aug. 15, 2007

Aug. 15, 2007

Module: wine Branch: master Commit: 380f18498666bcae9b067c14f331a48513aae48e URL: http://source.winehq.org/git/wine.git/?a=commit;h=380f18498666bcae9b067c14f… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 14 19:01:23 2007 -0700 gdiplus: Added GdipDeleteStringFormat. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/stringformat.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 a93e822..b31c6ed 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -149,7 +149,7 @@ @ stdcall GdipDeletePen(ptr) @ stub GdipDeletePrivateFontCollection @ stub GdipDeleteRegion -@ stub GdipDeleteStringFormat +@ stdcall GdipDeleteStringFormat(ptr) @ stdcall GdipDisposeImage(ptr) @ stdcall GdipDisposeImageAttributes(ptr) @ stdcall GdipDrawArc(ptr ptr long long long long long long) diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index 1be004d..6b20d23 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -44,6 +44,16 @@ GpStatus WINGDIPAPI GdipCreateStringFormat(INT attr, LANGID lang, return Ok; } +GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat *format) +{ + if(!format) + return InvalidParameter; + + GdipFree(format); + + return Ok; +} + GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat *format, StringAlignment *align) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 640f0fc..f63d895 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -251,6 +251,7 @@ GpStatus WINGDIPAPI GdipDeleteFont(GpFont*); GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*); GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**); +GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat*); GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat*,StringAlignment*); GpStatus WINGDIPAPI GdipGetStringFormatHotkeyPrefix(GDIPCONST GpStringFormat*,INT*); GpStatus WINGDIPAPI GdipGetStringFormatLineAlign(GpStringFormat*,StringAlignment*);

1 0

Evan Stade : gdiplus: Allow null-terminated strings in GdipDrawString.
by Alexandre Julliard Aug. 15, 2007

Aug. 15, 2007

Module: wine Branch: master Commit: d0cead32a64455ec1efd3d37914d948d0b7cbf7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0cead32a64455ec1efd3d379… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 14 19:01:07 2007 -0700 gdiplus: Allow null-terminated strings in GdipDrawString. --- dlls/gdiplus/graphics.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 968c89f..f63e073 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1296,6 +1296,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string return NotImplemented; } + if(length == -1) length = lstrlenW(string); + stringdup = GdipAlloc(length * sizeof(WCHAR)); if(!stringdup) return OutOfMemory;

1 0

Evan Stade : gdiplus: Added GdipSetLineBlend stub.
by Alexandre Julliard Aug. 15, 2007

Aug. 15, 2007

Module: wine Branch: master Commit: b56689d22c41a64eb611a5488068e9b89601382a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b56689d22c41a64eb611a5488… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 14 19:01:00 2007 -0700 gdiplus: Added GdipSetLineBlend stub. --- dlls/gdiplus/brush.c | 14 ++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 2 ++ 3 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index e91538e..45de034 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -486,6 +486,20 @@ GpStatus WINGDIPAPI GdipGetSolidFillColor(GpSolidFill *sf, ARGB *argb) return Ok; } +GpStatus WINGDIPAPI GdipSetLineBlend(GpLineGradient *brush, + GDIPCONST REAL *blend, GDIPCONST REAL* positions, INT count) +{ + static int calls; + + if(!brush || !blend || !positions || count <= 0) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return Ok; +} + GpStatus WINGDIPAPI GdipSetLineGammaCorrection(GpLineGradient *line, BOOL usegamma) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b13fc8f..7380ef5 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -535,7 +535,7 @@ @ stdcall GdipSetImagePalette(ptr ptr) @ stub GdipSetInfinite @ stdcall GdipSetInterpolationMode(ptr long) -@ stub GdipSetLineBlend +@ stdcall GdipSetLineBlend(ptr ptr ptr long) @ stub GdipSetLineColors @ stdcall GdipSetLineGammaCorrection(ptr long) @ stub GdipSetLineLinearBlend diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 84634e0..0b5ac3b 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -127,6 +127,8 @@ GpStatus WINGDIPAPI GdipGetPathGradientPointCount(GpPathGradient*,INT*); GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorsWithCount(GpPathGradient*, ARGB*,INT*); GpStatus WINGDIPAPI GdipGetSolidFillColor(GpSolidFill*,ARGB*); +GpStatus WINGDIPAPI GdipSetLineBlend(GpLineGradient*,GDIPCONST REAL*, + GDIPCONST REAL*,INT); GpStatus WINGDIPAPI GdipSetLineGammaCorrection(GpLineGradient*,BOOL); GpStatus WINGDIPAPI GdipSetLineSigmaBlend(GpLineGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetLineWrapMode(GpLineGradient*,GpWrapMode);

1 0

Evan Stade : gdiplus: Added GdipAddPathLineI.
by Alexandre Julliard Aug. 15, 2007

Aug. 15, 2007

Module: wine Branch: master Commit: 059a2d8c6fcfe6007bf3ab7be523f681ab7769ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=059a2d8c6fcfe6007bf3ab7be… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 14 19:00:21 2007 -0700 gdiplus: Added GdipAddPathLineI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 27 +++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 42591dc..71a6b26 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -19,7 +19,7 @@ @ stdcall GdipAddPathLine2(ptr ptr long) @ stub GdipAddPathLine2I @ stub GdipAddPathLine -@ stub GdipAddPathLineI +@ stdcall GdipAddPathLineI(ptr long long long long) @ stdcall GdipAddPathPath(ptr ptr long) @ stub GdipAddPathPie @ stub GdipAddPathPieI diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 399f2f7..ed71400 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -217,6 +217,33 @@ GpStatus WINGDIPAPI GdipAddPathLine2(GpPath *path, GDIPCONST GpPointF *points, return Ok; } +GpStatus WINGDIPAPI GdipAddPathLineI(GpPath *path, INT x1, INT y1, INT x2, INT y2) +{ + INT old_count; + + if(!path) + return InvalidParameter; + + if(!lengthen_path(path, 2)) + return OutOfMemory; + + old_count = path->pathdata.Count; + + path->pathdata.Points[old_count].X = (REAL) x1; + path->pathdata.Points[old_count].Y = (REAL) y1; + path->pathdata.Points[old_count + 1].X = (REAL) x2; + path->pathdata.Points[old_count + 1].Y = (REAL) y2; + + path->pathdata.Types[old_count] = + (path->newfigure ? PathPointTypeStart : PathPointTypeLine); + path->pathdata.Types[old_count + 1] = PathPointTypeLine; + + path->newfigure = FALSE; + path->pathdata.Count += 2; + + return Ok; +} + GpStatus WINGDIPAPI GdipAddPathPath(GpPath *path, GDIPCONST GpPath* addingPath, BOOL connect) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index d24d744..8b325a6 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -146,6 +146,7 @@ GpStatus WINGDIPAPI GdipAddPathBezierI(GpPath*,INT,INT,INT,INT,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath*,GDIPCONST GpPointF*,INT); GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathLine2(GpPath*,GDIPCONST GpPointF*,INT); +GpStatus WINGDIPAPI GdipAddPathLineI(GpPath*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathPath(GpPath*,GDIPCONST GpPath*,BOOL); GpStatus WINGDIPAPI GdipClonePath(GpPath*,GpPath**); GpStatus WINGDIPAPI GdipClosePathFigure(GpPath*);

1 0

Evan Stade : gdiplus: Added GdipGetStringFormatAlign/ GdipSetStringFormatAlign.
by Alexandre Julliard Aug. 15, 2007

Aug. 15, 2007

Module: wine Branch: master Commit: 16dea47a5c690d1833547f5740631c558a9def89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16dea47a5c690d1833547f574… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 14 19:00:32 2007 -0700 gdiplus: Added GdipGetStringFormatAlign/GdipSetStringFormatAlign. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/stringformat.c | 22 ++++++++++++++++++++++ include/gdiplusenums.h | 8 ++++++++ include/gdiplusflat.h | 2 ++ 5 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 71a6b26..5a2bbd2 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -386,7 +386,7 @@ @ stub GdipGetRenderingOrigin @ stdcall GdipGetSmoothingMode(ptr ptr) @ stdcall GdipGetSolidFillColor(ptr ptr) -@ stub GdipGetStringFormatAlign +@ stdcall GdipGetStringFormatAlign(ptr ptr) @ stub GdipGetStringFormatDigitSubstitution @ stub GdipGetStringFormatFlags @ stub GdipGetStringFormatHotkeyPrefix @@ -585,7 +585,7 @@ @ stub GdipSetRenderingOrigin @ stdcall GdipSetSmoothingMode(ptr long) @ stdcall GdipSetSolidFillColor(ptr ptr) -@ stub GdipSetStringFormatAlign +@ stdcall GdipSetStringFormatAlign(ptr long) @ stub GdipSetStringFormatDigitSubstitution @ stub GdipSetStringFormatFlags @ stub GdipSetStringFormatHotkeyPrefix diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index c462e10..d6c9dba 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -178,6 +178,7 @@ struct GpFont{ struct GpStringFormat{ INT attr; LANGID lang; + StringAlignment align; }; #endif diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index 0836a3b..c8bd3d1 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -43,3 +43,25 @@ GpStatus WINGDIPAPI GdipCreateStringFormat(INT attr, LANGID lang, return Ok; } + +GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat *format, + StringAlignment *align) +{ + if(!format || !align) + return InvalidParameter; + + *align = format->align; + + return Ok; +} + +GpStatus WINGDIPAPI GdipSetStringFormatAlign(GpStringFormat *format, + StringAlignment align) +{ + if(!format) + return InvalidParameter; + + format->align = align; + + return Ok; +} diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 3a68a54..91e779b 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -214,6 +214,13 @@ enum TextRenderingHint TextRenderingHintClearTypeGridFit }; +enum StringAlignment +{ + StringAlignmentNear = 0, + StringAlignmentCenter = 1, + StringAlignmentFar = 2 +}; + #ifndef __cplusplus typedef enum Unit Unit; @@ -237,6 +244,7 @@ typedef enum LinearGradientMode LinearGradientMode; typedef enum EmfType EmfType; typedef enum CompositingMode CompositingMode; typedef enum TextRenderingHint TextRenderingHint; +typedef enum StringAlignment StringAlignment; #endif /* end of c typedefs */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 8b325a6..ff1bcb1 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -249,6 +249,8 @@ GpStatus WINGDIPAPI GdipDeleteFont(GpFont*); GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*); GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**); +GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat*,StringAlignment*); +GpStatus WINGDIPAPI GdipSetStringFormatAlign(GpStringFormat*,StringAlignment); #ifdef __cplusplus }

1 0

Evan Stade : gdiplus: Added GdipGetStringFormatTrimming/ GdipSetStringFormatTrimming.
by Alexandre Julliard Aug. 15, 2007

Aug. 15, 2007

Module: wine Branch: master Commit: 551a606ab247a6a89dc4e1e42c28feb717827990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=551a606ab247a6a89dc4e1e42… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 14 19:00:40 2007 -0700 gdiplus: Added GdipGetStringFormatTrimming/GdipSetStringFormatTrimming. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/stringformat.c | 22 ++++++++++++++++++++++ include/gdiplusenums.h | 25 +++++++++++++++++++++++++ include/gdiplusflat.h | 2 ++ 5 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 5a2bbd2..b762c69 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -394,7 +394,7 @@ @ stub GdipGetStringFormatMeasurableCharacterRangeCount @ stub GdipGetStringFormatTabStopCount @ stub GdipGetStringFormatTabStops -@ stub GdipGetStringFormatTrimming +@ stdcall GdipGetStringFormatTrimming(ptr ptr) @ stub GdipGetTextContrast @ stdcall GdipGetTextRenderingHint(ptr ptr) @ stub GdipGetTextureImage @@ -592,7 +592,7 @@ @ stub GdipSetStringFormatLineAlign @ stub GdipSetStringFormatMeasurableCharacterRanges @ stub GdipSetStringFormatTabStops -@ stub GdipSetStringFormatTrimming +@ stdcall GdipSetStringFormatTrimming(ptr long) @ stub GdipSetTextContrast @ stdcall GdipSetTextRenderingHint(ptr long) @ stdcall GdipSetTextureTransform(ptr ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index d6c9dba..0c74245 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -179,6 +179,7 @@ struct GpStringFormat{ INT attr; LANGID lang; StringAlignment align; + StringTrimming trimming; }; #endif diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index c8bd3d1..d1e3719 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -55,6 +55,17 @@ GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat *format, return Ok; } +GpStatus WINGDIPAPI GdipGetStringFormatTrimming(GpStringFormat *format, + StringTrimming *trimming) +{ + if(!format || !trimming) + return InvalidParameter; + + *trimming = format->trimming; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetStringFormatAlign(GpStringFormat *format, StringAlignment align) { @@ -65,3 +76,14 @@ GpStatus WINGDIPAPI GdipSetStringFormatAlign(GpStringFormat *format, return Ok; } + +GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat *format, + StringTrimming trimming) +{ + if(!format) + return InvalidParameter; + + format->trimming = trimming; + + return Ok; +} diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 91e779b..786cf51 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -221,6 +221,29 @@ enum StringAlignment StringAlignmentFar = 2 }; +enum StringFormatFlags +{ + StringFormatFlagsDirectionRightToLeft = 0x00000001, + StringFormatFlagsDirectionVertical = 0x00000002, + StringFormatFlagsNoFitBlackBox = 0x00000004, + StringFormatFlagsDisplayFormatControl = 0x00000020, + StringFormatFlagsNoFontFallback = 0x00000400, + StringFormatFlagsMeasureTrailingSpaces = 0x00000800, + StringFormatFlagsNoWrap = 0x00001000, + StringFormatFlagsLineLimit = 0x00002000, + StringFormatFlagsNoClip = 0x00004000 +}; + +enum StringTrimming +{ + StringTrimmingNone = 0, + StringTrimmingCharacter = 1, + StringTrimmingWord = 2, + StringTrimmingEllipsisCharacter = 3, + StringTrimmingEllipsisWord = 4, + StringTrimmingEllipsisPath = 5 +}; + #ifndef __cplusplus typedef enum Unit Unit; @@ -245,6 +268,8 @@ typedef enum EmfType EmfType; typedef enum CompositingMode CompositingMode; typedef enum TextRenderingHint TextRenderingHint; typedef enum StringAlignment StringAlignment; +typedef enum StringTrimming StringTrimming; +typedef enum StringFormatFlags StringFormatFlags; #endif /* end of c typedefs */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index ff1bcb1..b5123b9 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -250,7 +250,9 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*); GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**); GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat*,StringAlignment*); +GpStatus WINGDIPAPI GdipGetStringFormatTrimming(GpStringFormat*,StringTrimming*); GpStatus WINGDIPAPI GdipSetStringFormatAlign(GpStringFormat*,StringAlignment); +GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat*,StringTrimming); #ifdef __cplusplus }

1 0

Evan Stade : gdiplus: Added GdipSetStringFormatHotkeyPrefix/ GdipGetStringFormatHotkeyPrefix.
by Alexandre Julliard Aug. 15, 2007

Aug. 15, 2007

Module: wine Branch: master Commit: 936f310190806eada54edf353c89421cdb0c7b4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=936f310190806eada54edf353… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 14 19:00:53 2007 -0700 gdiplus: Added GdipSetStringFormatHotkeyPrefix/GdipGetStringFormatHotkeyPrefix. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/stringformat.c | 22 ++++++++++++++++++++++ include/gdiplusenums.h | 9 +++++++++ include/gdiplusflat.h | 2 ++ 5 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b762c69..b13fc8f 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -389,7 +389,7 @@ @ stdcall GdipGetStringFormatAlign(ptr ptr) @ stub GdipGetStringFormatDigitSubstitution @ stub GdipGetStringFormatFlags -@ stub GdipGetStringFormatHotkeyPrefix +@ stdcall GdipGetStringFormatHotkeyPrefix(ptr ptr) @ stub GdipGetStringFormatLineAlign @ stub GdipGetStringFormatMeasurableCharacterRangeCount @ stub GdipGetStringFormatTabStopCount @@ -588,7 +588,7 @@ @ stdcall GdipSetStringFormatAlign(ptr long) @ stub GdipSetStringFormatDigitSubstitution @ stub GdipSetStringFormatFlags -@ stub GdipSetStringFormatHotkeyPrefix +@ stdcall GdipSetStringFormatHotkeyPrefix(ptr long) @ stub GdipSetStringFormatLineAlign @ stub GdipSetStringFormatMeasurableCharacterRanges @ stub GdipSetStringFormatTabStops diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 0c74245..e8832e6 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -180,6 +180,7 @@ struct GpStringFormat{ LANGID lang; StringAlignment align; StringTrimming trimming; + HotkeyPrefix hkprefix; }; #endif diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index d1e3719..311c5ee 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -55,6 +55,17 @@ GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat *format, return Ok; } +GpStatus WINGDIPAPI GdipGetStringFormatHotkeyPrefix(GDIPCONST GpStringFormat + *format, INT *hkpx) +{ + if(!format || !hkpx) + return InvalidParameter; + + *hkpx = (INT)format->hkprefix; + + return Ok; +} + GpStatus WINGDIPAPI GdipGetStringFormatTrimming(GpStringFormat *format, StringTrimming *trimming) { @@ -77,6 +88,17 @@ GpStatus WINGDIPAPI GdipSetStringFormatAlign(GpStringFormat *format, return Ok; } +GpStatus WINGDIPAPI GdipSetStringFormatHotkeyPrefix(GpStringFormat *format, + INT hkpx) +{ + if(!format || hkpx < 0 || hkpx > 2) + return InvalidParameter; + + format->hkprefix = (HotkeyPrefix) hkpx; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat *format, StringTrimming trimming) { diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 786cf51..c625e68 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -244,6 +244,14 @@ enum StringTrimming StringTrimmingEllipsisPath = 5 }; +enum HotkeyPrefix +{ + HotkeyPrefixNone = 0, + HotkeyPrefixShow = 1, + HotkeyPrefixHide = 2 +}; + + #ifndef __cplusplus typedef enum Unit Unit; @@ -270,6 +278,7 @@ typedef enum TextRenderingHint TextRenderingHint; typedef enum StringAlignment StringAlignment; typedef enum StringTrimming StringTrimming; typedef enum StringFormatFlags StringFormatFlags; +typedef enum HotkeyPrefix HotkeyPrefix; #endif /* end of c typedefs */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index b5123b9..84634e0 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -250,8 +250,10 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*); GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**); GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat*,StringAlignment*); +GpStatus WINGDIPAPI GdipGetStringFormatHotkeyPrefix(GDIPCONST GpStringFormat*,INT*); GpStatus WINGDIPAPI GdipGetStringFormatTrimming(GpStringFormat*,StringTrimming*); GpStatus WINGDIPAPI GdipSetStringFormatAlign(GpStringFormat*,StringAlignment); +GpStatus WINGDIPAPI GdipSetStringFormatHotkeyPrefix(GpStringFormat*,INT); GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat*,StringTrimming); #ifdef __cplusplus

1 0

Evan Stade : gdiplus: Added GdipAddPathBezierI.
by Alexandre Julliard Aug. 15, 2007

Aug. 15, 2007

Module: wine Branch: master Commit: ee59d41441bac1a9b797b1385251374c79b55505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee59d41441bac1a9b797b1385… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 14 19:00:02 2007 -0700 gdiplus: Added GdipAddPathBezierI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 2 ++ dlls/gdiplus/graphicspath.c | 34 ++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index f1e7c03..f0424ac 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -1,7 +1,7 @@ @ stdcall GdipAddPathArc(ptr long long long long long long) @ stub GdipAddPathArcI @ stub GdipAddPathBezier -@ stub GdipAddPathBezierI +@ stdcall GdipAddPathBezierI(ptr long long long long long long long long) @ stdcall GdipAddPathBeziers(ptr ptr long) @ stub GdipAddPathBeziersI @ stub GdipAddPathClosedCurve2 diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3626217..4bdaaee 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1291,6 +1291,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if(format || (brush->bt != BrushTypeSolidColor)){ FIXME("not implemented for given parameters\n"); + if(format) + TRACE("format attr is %d\n", format->attr); return NotImplemented; } diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 5cfac5f..399f2f7 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -97,6 +97,40 @@ GpStatus WINGDIPAPI GdipAddPathArc(GpPath *path, REAL x1, REAL y1, REAL x2, return Ok; } +GpStatus WINGDIPAPI GdipAddPathBezierI(GpPath *path, INT x1, INT y1, INT x2, + INT y2, INT x3, INT y3, INT x4, INT y4) +{ + INT old_count; + + if(!path) + return InvalidParameter; + + if(!lengthen_path(path, 4)) + return OutOfMemory; + + old_count = path->pathdata.Count; + + path->pathdata.Points[old_count].X = (REAL) x1; + path->pathdata.Points[old_count].Y = (REAL) y1; + path->pathdata.Points[old_count + 1].X = (REAL) x2; + path->pathdata.Points[old_count + 1].Y = (REAL) y2; + path->pathdata.Points[old_count + 2].X = (REAL) x3; + path->pathdata.Points[old_count + 2].Y = (REAL) y3; + path->pathdata.Points[old_count + 3].X = (REAL) x4; + path->pathdata.Points[old_count + 3].Y = (REAL) y4; + + path->pathdata.Types[old_count] = + (path->newfigure ? PathPointTypeStart : PathPointTypeLine); + path->pathdata.Types[old_count + 1] = PathPointTypeBezier; + path->pathdata.Types[old_count + 2] = PathPointTypeBezier; + path->pathdata.Types[old_count + 3] = PathPointTypeBezier; + + path->newfigure = FALSE; + path->pathdata.Count += 4; + + return Ok; +} + GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath *path, GDIPCONST GpPointF *points, INT count) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 6fe0104..1c75813 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -140,6 +140,7 @@ GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill*,ARGB); GpStatus WINGDIPAPI GdipSetTextureTransform(GpTexture *,GDIPCONST GpMatrix*); GpStatus WINGDIPAPI GdipAddPathArc(GpPath*,REAL,REAL,REAL,REAL,REAL,REAL); +GpStatus WINGDIPAPI GdipAddPathBezierI(GpPath*,INT,INT,INT,INT,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath*,GDIPCONST GpPointF*,INT); GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathLine2(GpPath*,GDIPCONST GpPointF*,INT);

1 0

Evan Stade : gdiplus: Added GdipSetTextRenderingHint/ GdipGetTextRenderingHint.
by Alexandre Julliard Aug. 15, 2007

Aug. 15, 2007

Module: wine Branch: master Commit: 5662820072ef3ce138dd625a08bcd5770d3cee6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5662820072ef3ce138dd625a0… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 14 19:00:09 2007 -0700 gdiplus: Added GdipSetTextRenderingHint/GdipGetTextRenderingHint. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 23 +++++++++++++++++++++++ include/gdiplusenums.h | 11 +++++++++++ include/gdiplusflat.h | 2 ++ 5 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index f0424ac..42591dc 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -396,7 +396,7 @@ @ stub GdipGetStringFormatTabStops @ stub GdipGetStringFormatTrimming @ stub GdipGetTextContrast -@ stub GdipGetTextRenderingHint +@ stdcall GdipGetTextRenderingHint(ptr ptr) @ stub GdipGetTextureImage @ stub GdipGetTextureTransform @ stub GdipGetTextureWrapMode @@ -594,7 +594,7 @@ @ stub GdipSetStringFormatTabStops @ stub GdipSetStringFormatTrimming @ stub GdipSetTextContrast -@ stub GdipSetTextRenderingHint +@ stdcall GdipSetTextRenderingHint(ptr long) @ stdcall GdipSetTextureTransform(ptr ptr) @ stub GdipSetTextureWrapMode @ stdcall GdipSetWorldTransform(ptr ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index bb73b47..c462e10 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -80,6 +80,7 @@ struct GpGraphics{ InterpolationMode interpolation; PixelOffsetMode pixeloffset; CompositingMode compmode; + TextRenderingHint texthint; GpUnit unit; /* page unit */ REAL scale; /* page scale */ GpMatrix * worldtrans; /* world transform */ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4bdaaee..968c89f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1686,6 +1686,18 @@ GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics *graphics, SmoothingMode *mo return Ok; } +/* FIXME: Text rendering hint is not used anywhere except the getter/setter. */ +GpStatus WINGDIPAPI GdipGetTextRenderingHint(GpGraphics *graphics, + TextRenderingHint *hint) +{ + if(!graphics || !hint) + return InvalidParameter; + + *hint = graphics->texthint; + + return Ok; +} + GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics *graphics, GpMatrix *matrix) { if(!graphics || !matrix) @@ -1813,6 +1825,17 @@ GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics *graphics, SmoothingMode mod return Ok; } +GpStatus WINGDIPAPI GdipSetTextRenderingHint(GpGraphics *graphics, + TextRenderingHint hint) +{ + if(!graphics) + return InvalidParameter; + + graphics->texthint = hint; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetWorldTransform(GpGraphics *graphics, GpMatrix *matrix) { if(!graphics || !matrix) diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index e503da5..3a68a54 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -204,6 +204,16 @@ enum CompositingMode CompositingModeSourceCopy }; +enum TextRenderingHint +{ + TextRenderingHintSystemDefault = 0, + TextRenderingHintSingleBitPerPixelGridFit, + TextRenderingHintSingleBitPerPixel, + TextRenderingHintAntiAliasGridFit, + TextRenderingHintAntiAlias, + TextRenderingHintClearTypeGridFit +}; + #ifndef __cplusplus typedef enum Unit Unit; @@ -226,6 +236,7 @@ typedef enum MetafileType MetafileType; typedef enum LinearGradientMode LinearGradientMode; typedef enum EmfType EmfType; typedef enum CompositingMode CompositingMode; +typedef enum TextRenderingHint TextRenderingHint; #endif /* end of c typedefs */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 1c75813..d24d744 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -92,6 +92,7 @@ GpStatus WINGDIPAPI GdipGetPageScale(GpGraphics*,REAL*); GpStatus WINGDIPAPI GdipGetPageUnit(GpGraphics*,GpUnit*); GpStatus WINGDIPAPI GdipGetPixelOffsetMode(GpGraphics*,PixelOffsetMode*); GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics*,SmoothingMode*); +GpStatus WINGDIPAPI GdipGetTextRenderingHint(GpGraphics*,TextRenderingHint*); GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics*,GpMatrix*); GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics*,GraphicsState); GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics*,REAL,GpMatrixOrder); @@ -104,6 +105,7 @@ GpStatus WINGDIPAPI GdipSetPageScale(GpGraphics*,REAL); GpStatus WINGDIPAPI GdipSetPageUnit(GpGraphics*,GpUnit); GpStatus WINGDIPAPI GdipSetPixelOffsetMode(GpGraphics*,PixelOffsetMode); GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics*,SmoothingMode); +GpStatus WINGDIPAPI GdipSetTextRenderingHint(GpGraphics*,TextRenderingHint); GpStatus WINGDIPAPI GdipSetWorldTransform(GpGraphics*,GpMatrix*); GpStatus WINGDIPAPI GdipTranslateWorldTransform(GpGraphics*,REAL,REAL,GpMatrixOrder);

1 0

Evan Stade : gdiplus: Added string format constructor.
by Alexandre Julliard Aug. 15, 2007

Aug. 15, 2007

Module: wine Branch: master Commit: 73be69c5760fe882b5fa597cd310f293bd8a13c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73be69c5760fe882b5fa597cd… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 14 18:59:48 2007 -0700 gdiplus: Added string format constructor. --- dlls/gdiplus/Makefile.in | 3 +- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 5 ++++ dlls/gdiplus/stringformat.c | 45 ++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 + 5 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in index a826644..e47592b 100644 --- a/dlls/gdiplus/Makefile.in +++ b/dlls/gdiplus/Makefile.in @@ -18,7 +18,8 @@ C_SRCS = \ imageattributes.c \ matrix.c \ pathiterator.c \ - pen.c + pen.c \ + stringformat.c @MAKE_DLL_RULES@ diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b4c0c36..f1e7c03 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -130,7 +130,7 @@ @ stub GdipCreateRegionRgnData @ stdcall GdipCreateSolidFill(long ptr) @ stdcall GdipCreateStreamOnFile(ptr long ptr) -@ stub GdipCreateStringFormat +@ stdcall GdipCreateStringFormat(long long ptr) @ stub GdipCreateTexture2 @ stub GdipCreateTexture2I @ stub GdipCreateTexture diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 5be21b1..bb73b47 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -174,4 +174,9 @@ struct GpFont{ LOGFONTW lfw; }; +struct GpStringFormat{ + INT attr; + LANGID lang; +}; + #endif diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c new file mode 100644 index 0000000..0836a3b --- /dev/null +++ b/dlls/gdiplus/stringformat.c @@ -0,0 +1,45 @@ +/* + * + * Copyright (C) 2007 Google (Evan Stade) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winnls.h" + +#include "objbase.h" + +#include "gdiplus.h" +#include "gdiplus_private.h" + +GpStatus WINGDIPAPI GdipCreateStringFormat(INT attr, LANGID lang, + GpStringFormat **format) +{ + if(!format) + return InvalidParameter; + + *format = GdipAlloc(sizeof(GpStringFormat)); + if(!*format) return OutOfMemory; + + (*format)->attr = attr; + (*format)->lang = lang; + + return Ok; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index ed11b4a..6fe0104 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -244,6 +244,8 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC,GDIPCONST LOGFONTW*,GpFont**) GpStatus WINGDIPAPI GdipDeleteFont(GpFont*); GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*); +GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**); + #ifdef __cplusplus } #endif

1 0