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

Evan Stade : gdiplus: Added GdipPathIterRewind.
by Alexandre Julliard July 17, 2007

July 17, 2007

Module: wine Branch: master Commit: 1182162dac3dd31e7ec47608b54200b9072062b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1182162dac3dd31e7ec47608b… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 16 19:45:13 2007 -0700 gdiplus: Added GdipPathIterRewind. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pathiterator.c | 11 +++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 1238e10..aea3a72 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -442,7 +442,7 @@ @ stub GdipPathIterNextPathType @ stdcall GdipPathIterNextSubpath(ptr ptr ptr ptr ptr) @ stub GdipPathIterNextSubpathPath -@ stub GdipPathIterRewind +@ stdcall GdipPathIterRewind(ptr) @ stub GdipPlayMetafileRecord @ stub GdipPrivateAddFontFile @ stub GdipPrivateAddMemoryFont diff --git a/dlls/gdiplus/pathiterator.c b/dlls/gdiplus/pathiterator.c index 1bd1191..a9e1d3f 100644 --- a/dlls/gdiplus/pathiterator.c +++ b/dlls/gdiplus/pathiterator.c @@ -117,3 +117,14 @@ GpStatus WINGDIPAPI GdipPathIterNextSubpath(GpPathIterator* iterator, return Ok; } +GpStatus WINGDIPAPI GdipPathIterRewind(GpPathIterator *iterator) +{ + if(!iterator) + return InvalidParameter; + + iterator->subpath_pos = 0; + iterator->marker_pos = 0; + iterator->pathtype_pos = 0; + + return Ok; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index c9a3f50..fa56952 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -90,6 +90,7 @@ GpStatus WINGDIPAPI GdipDeletePathIter(GpPathIterator*); GpStatus WINGDIPAPI GdipPathIterCopyData(GpPathIterator*,INT*,GpPointF*,BYTE*, INT,INT); GpStatus WINGDIPAPI GdipPathIterNextSubpath(GpPathIterator*,INT*,INT*,INT*,BOOL*); +GpStatus WINGDIPAPI GdipPathIterRewind(GpPathIterator*); #ifdef __cplusplus }

1 0

Evan Stade : gdiplus: Added GdipPathIterNextSubpath.
by Alexandre Julliard July 17, 2007

July 17, 2007

Module: wine Branch: master Commit: 90ff0fdd6c813a762fd490aee9a369146243c014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90ff0fdd6c813a762fd490aee… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 16 19:45:10 2007 -0700 gdiplus: Added GdipPathIterNextSubpath. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pathiterator.c | 34 ++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index f1ecbc1..1238e10 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -440,7 +440,7 @@ @ stub GdipPathIterNextMarker @ stub GdipPathIterNextMarkerPath @ stub GdipPathIterNextPathType -@ stub GdipPathIterNextSubpath +@ stdcall GdipPathIterNextSubpath(ptr ptr ptr ptr ptr) @ stub GdipPathIterNextSubpathPath @ stub GdipPathIterRewind @ stub GdipPlayMetafileRecord diff --git a/dlls/gdiplus/pathiterator.c b/dlls/gdiplus/pathiterator.c index de71e6e..1bd1191 100644 --- a/dlls/gdiplus/pathiterator.c +++ b/dlls/gdiplus/pathiterator.c @@ -83,3 +83,37 @@ GpStatus WINGDIPAPI GdipPathIterCopyData(GpPathIterator* iterator, return Ok; } + +GpStatus WINGDIPAPI GdipPathIterNextSubpath(GpPathIterator* iterator, + INT *resultCount, INT* startIndex, INT* endIndex, BOOL* isClosed) +{ + INT i, count; + + if(!iterator) + return InvalidParameter; + + count = iterator->pathdata.Count; + + if(iterator->subpath_pos == count){ + *startIndex = *endIndex = *resultCount = 0; + *isClosed = 1; + return Ok; + } + + *startIndex = iterator->subpath_pos; + + for(i = iterator->subpath_pos + 1; i < count && + !(iterator->pathdata.Types[i] == PathPointTypeStart); i++); + + *endIndex = i - 1; + iterator->subpath_pos = i; + + *resultCount = *endIndex - *startIndex + 1; + + if(iterator->pathdata.Types[*endIndex] & PathPointTypeCloseSubpath) + *isClosed = TRUE; + else + *isClosed = FALSE; + + return Ok; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 0aa2e7d..c9a3f50 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -89,6 +89,7 @@ GpStatus WINGDIPAPI GdipCreatePathIter(GpPathIterator**,GpPath*); GpStatus WINGDIPAPI GdipDeletePathIter(GpPathIterator*); GpStatus WINGDIPAPI GdipPathIterCopyData(GpPathIterator*,INT*,GpPointF*,BYTE*, INT,INT); +GpStatus WINGDIPAPI GdipPathIterNextSubpath(GpPathIterator*,INT*,INT*,INT*,BOOL*); #ifdef __cplusplus }

1 0

Evan Stade : gdiplus: Added GdipSetPenMiterLimit.
by Alexandre Julliard July 17, 2007

July 17, 2007

Module: wine Branch: master Commit: d59fe31e8b498fbe540bd101143e5bac985709a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d59fe31e8b498fbe540bd1011… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 16 19:44:58 2007 -0700 gdiplus: Added GdipSetPenMiterLimit. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.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 aaabdf5..5f5b3b9 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -553,7 +553,7 @@ @ stdcall GdipSetPenEndCap(ptr long) @ stdcall GdipSetPenLineCap197819(ptr long long long) @ stdcall GdipSetPenLineJoin(ptr long) -@ stub GdipSetPenMiterLimit +@ stdcall GdipSetPenMiterLimit(ptr long) @ stub GdipSetPenMode @ stub GdipSetPenStartCap @ stub GdipSetPenTransform diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 3bebc35..1b37e13 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -135,3 +135,13 @@ GpStatus WINGDIPAPI GdipSetPenLineJoin(GpPen *pen, GpLineJoin join) return Ok; } + +GpStatus WINGDIPAPI GdipSetPenMiterLimit(GpPen *pen, REAL limit) +{ + if(!pen) + return InvalidParameter; + + pen->miterlimit = limit; + + return Ok; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 3ac4b3e..ffb6007 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -32,6 +32,7 @@ GpStatus WINGDIPAPI GdipDeletePen(GpPen*); GpStatus WINGDIPAPI GdipSetPenEndCap(GpPen*,GpLineCap); GpStatus WINGDIPAPI GdipSetPenLineCap197819(GpPen*,GpLineCap,GpLineCap,GpDashCap); GpStatus WINGDIPAPI GdipSetPenLineJoin(GpPen*,GpLineJoin); +GpStatus WINGDIPAPI GdipSetPenMiterLimit(GpPen*,REAL); GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHWND(HWND,GpGraphics**);

1 0

Evan Stade : gdiplus: Initial path iterator implementation.
by Alexandre Julliard July 17, 2007

July 17, 2007

Module: wine Branch: master Commit: 085082897a47fec1113fad66b38d2129c1123acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=085082897a47fec1113fad66b… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 16 19:45:02 2007 -0700 gdiplus: Initial path iterator implementation. --- dlls/gdiplus/Makefile.in | 1 + dlls/gdiplus/gdiplus.spec | 4 +- dlls/gdiplus/gdiplus_private.h | 7 ++++ dlls/gdiplus/pathiterator.c | 64 ++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 3 ++ include/gdiplusgpstubs.h | 2 + 6 files changed, 79 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in index 85c1f27..f4bf072 100644 --- a/dlls/gdiplus/Makefile.in +++ b/dlls/gdiplus/Makefile.in @@ -12,6 +12,7 @@ C_SRCS = \ graphics.c \ graphicspath.c \ matrix.c \ + pathiterator.c \ pen.c @MAKE_DLL_RULES@ diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 5f5b3b9..b1d9490 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -110,7 +110,7 @@ @ stub GdipCreatePathGradient @ stub GdipCreatePathGradientFromPath @ stub GdipCreatePathGradientI -@ stub GdipCreatePathIter +@ stdcall GdipCreatePathIter(ptr ptr) @ stdcall GdipCreatePen1(long long long ptr) @ stub GdipCreatePen2 @ stub GdipCreateRegion @@ -135,7 +135,7 @@ @ stdcall GdipDeleteGraphics(ptr) @ stdcall GdipDeleteMatrix(ptr) @ stdcall GdipDeletePath(ptr) -@ stub GdipDeletePathIter +@ stdcall GdipDeletePathIter(ptr) @ stdcall GdipDeletePen(ptr) @ stub GdipDeletePrivateFontCollection @ stub GdipDeleteRegion diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index d7851d6..b0a9dd1 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -83,4 +83,11 @@ struct GpMatrix{ REAL matrix[6]; }; +struct GpPathIterator{ + GpPathData pathdata; + INT subpath_pos; /* for NextSubpath methods */ + INT marker_pos; /* for NextMarker methods */ + INT pathtype_pos; /* for NextPathType methods */ +}; + #endif diff --git a/dlls/gdiplus/pathiterator.c b/dlls/gdiplus/pathiterator.c new file mode 100644 index 0000000..9d4dc85 --- /dev/null +++ b/dlls/gdiplus/pathiterator.c @@ -0,0 +1,64 @@ +/* + * 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 "gdiplus.h" +#include "gdiplus_private.h" + +GpStatus WINGDIPAPI GdipCreatePathIter(GpPathIterator **iterator, GpPath* path) +{ + INT size; + + if(!iterator || !path) + return InvalidParameter; + + size = path->pathdata.Count; + + *iterator = GdipAlloc(sizeof(GpPathIterator)); + if(!*iterator) return OutOfMemory; + + (*iterator)->pathdata.Types = GdipAlloc(size); + (*iterator)->pathdata.Points = GdipAlloc(size * sizeof(PointF)); + + memcpy((*iterator)->pathdata.Types, path->pathdata.Types, size); + memcpy((*iterator)->pathdata.Points, path->pathdata.Points, + size * sizeof(PointF)); + (*iterator)->pathdata.Count = size; + + (*iterator)->subpath_pos = 0; + (*iterator)->marker_pos = 0; + (*iterator)->pathtype_pos = 0; + + return Ok; +} + +GpStatus WINGDIPAPI GdipDeletePathIter(GpPathIterator *iter) +{ + if(!iter) + return InvalidParameter; + + GdipFree(iter->pathdata.Types); + GdipFree(iter->pathdata.Points); + GdipFree(iter); + + return Ok; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index ffb6007..e6751b1 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -85,6 +85,9 @@ GpStatus WINGDIPAPI GdipCreateMatrix2(REAL,REAL,REAL,REAL,REAL,REAL,GpMatrix**); GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix*); GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix*,GpPointF*,INT); +GpStatus WINGDIPAPI GdipCreatePathIter(GpPathIterator**,GpPath*); +GpStatus WINGDIPAPI GdipDeletePathIter(GpPathIterator*); + #ifdef __cplusplus } #endif diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index d2174bb..e847e0e 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -27,6 +27,7 @@ class GpBrush {}; class GpSolidFill {}; class GpPath {}; class GpMatrix {}; +class GpPathIterator {}; #else /* end of c++ declarations */ @@ -36,6 +37,7 @@ typedef struct GpBrush GpBrush; typedef struct GpSolidFill GpSolidFill; typedef struct GpPath GpPath; typedef struct GpMatrix GpMatrix; +typedef struct GpPathIterator GpPathIterator; #endif /* end of c declarations */

1 0

Evan Stade : gdiplus: Added GdipPathIterCopyData.
by Alexandre Julliard July 17, 2007

July 17, 2007

Module: wine Branch: master Commit: ef6c41663159c38eba19a166773c5b871ef5ec25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef6c41663159c38eba19a1667… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 16 19:45:06 2007 -0700 gdiplus: Added GdipPathIterCopyData. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pathiterator.c | 21 +++++++++++++++++++++ include/gdiplusflat.h | 2 ++ 3 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b1d9490..f1ecbc1 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -431,7 +431,7 @@ @ stub GdipMultiplyWorldTransform @ stub GdipNewInstalledFontCollection @ stub GdipNewPrivateFontCollection -@ stub GdipPathIterCopyData +@ stdcall GdipPathIterCopyData(ptr ptr ptr ptr long long) @ stub GdipPathIterEnumerate @ stub GdipPathIterGetCount @ stub GdipPathIterGetSubpathCount diff --git a/dlls/gdiplus/pathiterator.c b/dlls/gdiplus/pathiterator.c index 9d4dc85..de71e6e 100644 --- a/dlls/gdiplus/pathiterator.c +++ b/dlls/gdiplus/pathiterator.c @@ -62,3 +62,24 @@ GpStatus WINGDIPAPI GdipDeletePathIter(GpPathIterator *iter) return Ok; } + +GpStatus WINGDIPAPI GdipPathIterCopyData(GpPathIterator* iterator, + INT* resultCount, GpPointF* points, BYTE* types, INT startIndex, INT endIndex) +{ + if(!iterator || !types || !points) + return InvalidParameter; + + if(endIndex > iterator->pathdata.Count - 1 || startIndex < 0 || + endIndex < startIndex){ + *resultCount = 0; + return Ok; + } + + *resultCount = endIndex - startIndex + 1; + + memcpy(types, &(iterator->pathdata.Types[startIndex]), *resultCount); + memcpy(points, &(iterator->pathdata.Points[startIndex]), + *resultCount * sizeof(PointF)); + + return Ok; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index e6751b1..0aa2e7d 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -87,6 +87,8 @@ GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix*,GpPointF*,INT); GpStatus WINGDIPAPI GdipCreatePathIter(GpPathIterator**,GpPath*); GpStatus WINGDIPAPI GdipDeletePathIter(GpPathIterator*); +GpStatus WINGDIPAPI GdipPathIterCopyData(GpPathIterator*,INT*,GpPointF*,BYTE*, + INT,INT); #ifdef __cplusplus }

1 0

Evan Stade : gdiplus: Export GdipSetPenLineJoin.
by Alexandre Julliard July 17, 2007

July 17, 2007

Module: wine Branch: master Commit: 18ee93b0c4826e3f23577f0ad25855e1659bb068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18ee93b0c4826e3f23577f0ad… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 16 19:44:54 2007 -0700 gdiplus: Export GdipSetPenLineJoin. --- dlls/gdiplus/gdiplus.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index d14457e..aaabdf5 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -552,7 +552,7 @@ @ stub GdipSetPenDashStyle @ stdcall GdipSetPenEndCap(ptr long) @ stdcall GdipSetPenLineCap197819(ptr long long long) -@ stub GdipSetPenLineJoin +@ stdcall GdipSetPenLineJoin(ptr long) @ stub GdipSetPenMiterLimit @ stub GdipSetPenMode @ stub GdipSetPenStartCap

1 0

Evan Stade : gdiplus: Added GdipSetPenLineCap197819.
by Alexandre Julliard July 17, 2007

July 17, 2007

Module: wine Branch: master Commit: 6893ef397ba63205bd102c5b262c943684fdf911 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6893ef397ba63205bd102c5b2… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 16 19:44:50 2007 -0700 gdiplus: Added GdipSetPenLineCap197819. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/pen.c | 14 ++++++++++++++ include/gdiplusenums.h | 8 ++++++++ include/gdiplusflat.h | 1 + include/gdiplusgpstubs.h | 1 + 6 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b5e0b03..d14457e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -551,7 +551,7 @@ @ stub GdipSetPenDashOffset @ stub GdipSetPenDashStyle @ stdcall GdipSetPenEndCap(ptr long) -@ stub GdipSetPenLineCap197819 +@ stdcall GdipSetPenLineCap197819(ptr long long long) @ stub GdipSetPenLineJoin @ stub GdipSetPenMiterLimit @ stub GdipSetPenMode diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 20678c8..d7851d6 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -47,6 +47,8 @@ struct GpPen{ REAL width; HPEN gdipen; GpLineCap endcap; + GpLineCap startcap; + GpDashCap dashcap; GpLineJoin join; REAL miterlimit; }; diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index a4894d3..3bebc35 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -100,6 +100,20 @@ GpStatus WINGDIPAPI GdipSetPenEndCap(GpPen *pen, GpLineCap cap) return Ok; } +/* FIXME: startcap, dashcap not used. */ +GpStatus WINGDIPAPI GdipSetPenLineCap197819(GpPen *pen, GpLineCap start, + GpLineCap end, GpDashCap dash) +{ + if(!pen) + return InvalidParameter; + + pen->startcap = start; + pen->endcap = end; + pen->dashcap = dash; + + return Ok; +} + /* FIXME: Miter line joins behave a bit differently than they do in windows. * Both kinds of miter joins clip if the angle is less than 11 degrees. */ GpStatus WINGDIPAPI GdipSetPenLineJoin(GpPen *pen, GpLineJoin join) diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 74f9c02..7bf5eb6 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -134,6 +134,13 @@ enum PixelOffsetMode PixelOffsetModeHalf }; +enum DashCap +{ + DashCapFlat = 0, + DashCapRound = 2, + DashCapTriangle = 3 +}; + #ifndef __cplusplus typedef enum Unit Unit; @@ -147,6 +154,7 @@ typedef enum SmoothingMode SmoothingMode; typedef enum CompositingQuality CompositingQuality; typedef enum InterpolationMode InterpolationMode; typedef enum PixelOffsetMode PixelOffsetMode; +typedef enum DashCap DashCap; #endif /* end of c typedefs */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 3bda290..3ac4b3e 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -30,6 +30,7 @@ extern "C" { GpStatus WINGDIPAPI GdipCreatePen1(ARGB,REAL,GpUnit,GpPen**); GpStatus WINGDIPAPI GdipDeletePen(GpPen*); GpStatus WINGDIPAPI GdipSetPenEndCap(GpPen*,GpLineCap); +GpStatus WINGDIPAPI GdipSetPenLineCap197819(GpPen*,GpLineCap,GpLineCap,GpDashCap); GpStatus WINGDIPAPI GdipSetPenLineJoin(GpPen*,GpLineJoin); GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**); diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index b3962aa..d2174bb 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -48,5 +48,6 @@ typedef PathData GpPathData; typedef LineCap GpLineCap; typedef RectF GpRectF; typedef LineJoin GpLineJoin; +typedef DashCap GpDashCap; #endif

1 0

James Hawkins : msi: Load the AdminProperties stream if the package is an Admin package.
by Alexandre Julliard July 17, 2007

July 17, 2007

Module: wine Branch: master Commit: dc3060c542661173937d3aa948f51ced7bbbdd5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc3060c542661173937d3aa94… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 16 14:45:29 2007 -0700 msi: Load the AdminProperties stream if the package is an Admin package. --- dlls/msi/action.c | 2 +- dlls/msi/msipriv.h | 3 +- dlls/msi/package.c | 20 +++++++++++++ dlls/msi/string.c | 4 +- dlls/msi/table.c | 8 ++-- dlls/msi/tests/install.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 100 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 10443c6..953ecb5 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -293,7 +293,7 @@ static void ui_actioninfo(MSIPACKAGE *package, LPCWSTR action, BOOL start, msiobj_release(&row->hdr); } -static UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine ) +UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine ) { LPCWSTR ptr,ptr2; BOOL quote; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 3253a5d..a94866a 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -605,7 +605,7 @@ extern MSICONDITION MSI_DatabaseIsTablePersistent( MSIDATABASE *db, LPCWSTR tabl extern UINT read_raw_stream_data( MSIDATABASE *db, LPCWSTR stname, USHORT **pdata, UINT *psz ); -extern UINT read_stream_data( IStorage *stg, LPCWSTR stname, +extern UINT read_stream_data( IStorage *stg, LPCWSTR stname, BOOL table, BYTE **pdata, UINT *psz ); extern UINT write_stream_data( IStorage *stg, LPCWSTR stname, LPCVOID data, UINT sz, BOOL bTable ); @@ -623,6 +623,7 @@ extern UINT ACTION_DialogBox( MSIPACKAGE*, LPCWSTR); extern UINT ACTION_ForceReboot(MSIPACKAGE *package); extern UINT MSI_Sequence( MSIPACKAGE *package, LPCWSTR szTable, INT iSequenceMode ); extern UINT MSI_SetFeatureStates( MSIPACKAGE *package ); +extern UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine ); /* record internals */ extern UINT MSI_RecordSetIStream( MSIRECORD *, unsigned int, IStream *); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 2fb7fbe..0309dc3 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -720,6 +720,23 @@ static MSIPACKAGE *msi_alloc_package( void ) return package; } +static UINT msi_load_admin_properties(MSIPACKAGE *package) +{ + BYTE *data; + UINT r, sz; + + static const WCHAR stmname[] = {'A','d','m','i','n','P','r','o','p','e','r','t','i','e','s',0}; + + r = read_stream_data(package->db->storage, stmname, FALSE, &data, &sz); + if (r != ERROR_SUCCESS) + return r; + + r = msi_parse_command_line(package, (WCHAR *)data); + + msi_free(data); + return r; +} + MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) { static const WCHAR szLevel[] = { 'U','I','L','e','v','e','l',0 }; @@ -750,6 +767,9 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) package->ProductCode = msi_dup_property( package, szProductCode ); set_installed_prop( package ); msi_load_summary_properties( package ); + + if (package->WordCount & MSIWORDCOUNT_ADMINISTRATIVE) + msi_load_admin_properties( package ); } return package; diff --git a/dlls/msi/string.c b/dlls/msi/string.c index fe1f5cc..0cacf1e 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -521,10 +521,10 @@ string_table *msi_load_string_table( IStorage *stg, UINT *bytes_per_strref ) UINT r, datasize = 0, poolsize = 0, codepage; DWORD i, count, offset, len, n, refs; - r = read_stream_data( stg, szStringPool, (BYTE **)&pool, &poolsize ); + r = read_stream_data( stg, szStringPool, TRUE, (BYTE **)&pool, &poolsize ); if( r != ERROR_SUCCESS) goto end; - r = read_stream_data( stg, szStringData, (BYTE **)&data, &datasize ); + r = read_stream_data( stg, szStringData, TRUE, (BYTE **)&data, &datasize ); if( r != ERROR_SUCCESS) goto end; diff --git a/dlls/msi/table.c b/dlls/msi/table.c index fb414a2..69a033c 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -262,7 +262,7 @@ void enum_stream_names( IStorage *stg ) IEnumSTATSTG_Release( stgenum ); } -UINT read_stream_data( IStorage *stg, LPCWSTR stname, +UINT read_stream_data( IStorage *stg, LPCWSTR stname, BOOL table, BYTE **pdata, UINT *psz ) { HRESULT r; @@ -273,7 +273,7 @@ UINT read_stream_data( IStorage *stg, LPCWSTR stname, STATSTG stat; LPWSTR encname; - encname = encode_streamname(TRUE, stname); + encname = encode_streamname(table, stname); TRACE("%s -> %s\n",debugstr_w(stname),debugstr_w(encname)); @@ -506,7 +506,7 @@ static UINT read_table_from_storage( MSITABLE *t, IStorage *stg ) row_size = msi_table_get_row_size( t->colinfo, t->col_count ); /* if we can't read the table, just assume that it's empty */ - read_stream_data( stg, t->name, &rawdata, &rawsize ); + read_stream_data( stg, t->name, TRUE, &rawdata, &rawsize ); if( !rawdata ) return ERROR_SUCCESS; @@ -1992,7 +1992,7 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg, TRACE("%p %p %p %s\n", db, stg, st, debugstr_w(name) ); /* read the transform data */ - read_stream_data( stg, name, &rawdata, &rawsize ); + read_stream_data( stg, name, TRUE, &rawdata, &rawsize ); if ( !rawdata ) { TRACE("table %s empty\n", debugstr_w(name) ); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 0d9d703..164040f 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -443,6 +443,11 @@ static const CHAR adm_admin_exec_seq_dat[] = "Action\tCondition\tSequence\n" "InstallValidate\t\t1400\n" "LaunchConditions\t\t100"; +static const CHAR amp_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "augustus\t\tMSITESTDIR\t0\tMYPROP=2718\taugustus\n"; + typedef struct _msi_table { const CHAR *filename; @@ -667,6 +672,18 @@ static const msi_table adm_tables[] = ADD_TABLE(adm_admin_exec_seq), }; +static const msi_table amp_tables[] = +{ + ADD_TABLE(amp_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(ci2_feature_comp), + ADD_TABLE(ci2_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(rof_media), + ADD_TABLE(property), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -2635,6 +2652,59 @@ static void test_admin(void) RemoveDirectory("msitest"); } +static void set_admin_property_stream(LPCSTR file) +{ + IStorage *stg; + IStream *stm; + WCHAR fileW[MAX_PATH]; + HRESULT hr; + DWORD count; + const DWORD mode = STGM_DIRECT | STGM_READWRITE | STGM_SHARE_EXCLUSIVE; + + /* AdminProperties */ + static const WCHAR stmname[] = {0x41ca,0x4330,0x3e71,0x44b5,0x4233,0x45f5,0x422c,0x4836,0}; + static const WCHAR data[] = {'M','Y','P','R','O','P','=','2','7','1','8',0}; + + MultiByteToWideChar(CP_ACP, 0, file, -1, fileW, MAX_PATH); + + hr = StgOpenStorage(fileW, NULL, mode, NULL, 0, &stg); + ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + if (!stg) + return; + + hr = IStorage_CreateStream(stg, stmname, STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); + ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + + hr = IStream_Write(stm, data, sizeof(data) - 1, &count); + ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + + IStream_Release(stm); + IStorage_Release(stg); +} + +static void test_adminprops(void) +{ + UINT r; + + CreateDirectoryA("msitest", NULL); + create_file("msitest\\augustus", 500); + + create_database(msifile, amp_tables, sizeof(amp_tables) / sizeof(msi_table)); + set_admin_summary_info(msifile); + set_admin_property_stream(msifile); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\augustus", TRUE), "File installed\n"); + ok(delete_pf("msitest", FALSE), "File installed\n"); + + DeleteFile(msifile); + DeleteFile("msitest\\augustus"); + RemoveDirectory("msitest"); +} + START_TEST(install) { DWORD len; @@ -2670,6 +2740,7 @@ START_TEST(install) test_transformprop(); test_currentworkingdir(); test_admin(); + test_adminprops(); SetCurrentDirectoryA(prev_path); }

1 0

James Hawkins : msi: Only call a custom action remotely if the type is msidbCustomActionTypeInScript .
by Alexandre Julliard July 17, 2007

July 17, 2007

Module: wine Branch: master Commit: f2ae31000b6d6c105838fad36c17ba1fb1f5524b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2ae31000b6d6c105838fad36… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 16 19:21:45 2007 -0700 msi: Only call a custom action remotely if the type is msidbCustomActionTypeInScript. --- dlls/msi/custom.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 77 insertions(+), 1 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 06699d2..86d4ccb 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -647,7 +647,7 @@ static UINT get_action_info( const GUID *guid, INT *type, MSIHANDLE *handle, return ERROR_SUCCESS; } -static DWORD WINAPI ACTION_CallDllFunction( const GUID *guid ) +static DWORD WINAPI ACTION_CallRemoteDllFunction( const GUID *guid ) { MsiCustomActionEntryPoint fn; MSIHANDLE hPackage, handle; @@ -713,6 +713,82 @@ static DWORD WINAPI ACTION_CallDllFunction( const GUID *guid ) return r; } +static DWORD WINAPI ACTION_CallLocalDllFunction( msi_custom_action_info *info ) +{ + MsiCustomActionEntryPoint fn; + MSIHANDLE hPackage; + HANDLE hModule; + LPSTR proc; + UINT r = ERROR_FUNCTION_FAILED; + + TRACE("%s %s\n", debugstr_w( info->source ), debugstr_w( info->target ) ); + + hModule = LoadLibraryW( info->source ); + if (!hModule) + { + ERR("failed to load dll %s\n", debugstr_w( info->source ) ); + return r; + } + + proc = strdupWtoA( info->target ); + fn = (MsiCustomActionEntryPoint) GetProcAddress( hModule, proc ); + msi_free( proc ); + if (fn) + { + hPackage = alloc_msihandle( &info->package->hdr ); + if (hPackage) + { + TRACE("calling %s\n", debugstr_w( info->target ) ); + handle_msi_break( info->target ); + + __TRY + { + r = fn( hPackage ); + } + __EXCEPT_PAGE_FAULT + { + ERR("Custom action (%s:%s) caused a page fault: %08x\n", + debugstr_w(info->source), debugstr_w(info->target), GetExceptionCode()); + r = ERROR_SUCCESS; + } + __ENDTRY; + + MsiCloseHandle( hPackage ); + } + else + ERR("failed to create handle for %p\n", info->package ); + } + else + ERR("GetProcAddress(%s) failed\n", debugstr_w( info->target ) ); + + FreeLibrary(hModule); + + return r; +} + +static DWORD WINAPI ACTION_CallDllFunction(const GUID *guid) +{ + msi_custom_action_info *info; + UINT r; + + info = find_action_by_guid(guid); + if (!info) + { + ERR("failed to find action %s\n", debugstr_guid(guid)); + return ERROR_FUNCTION_FAILED; + } + + TRACE("%s %s\n", debugstr_w(info->source), debugstr_w(info->target)); + + if (info->type & msidbCustomActionTypeInScript) + r = ACTION_CallRemoteDllFunction(guid); + else + r = ACTION_CallLocalDllFunction(info); + + release_custom_action_data(info); + return r; +} + static DWORD WINAPI DllThread( LPVOID arg ) { LPGUID guid = arg;

1 0

appdb/. screenshots.php
by WineHQ July 16, 2007

July 16, 2007

ChangeSet ID: 31254 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/16 23:44:17 Modified files: . : screenshots.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Screenshots were incorrectly displaying 'Delete Image' links when the user had no permission to do so. Bug was that the version id used for User::isMaintainer() was 0, which caused Maintainer::isUserMaintainer() to return true if the user was a maintainer of any application. Switch to using the version id of the screenshot image being displayed and cache the value to reduce database queries. Also switch to using prefixed naming for a variable that wasn't. Patch: http://cvs.winehq.org/patch.py?id=31254 Old revision New revision Changes Path 1.46 1.47 +18 -7 appdb/screenshots.php Index: appdb/screenshots.php diff -u -p appdb/screenshots.php:1.46 appdb/screenshots.php:1.47 --- appdb/screenshots.php:1.46 17 Jul 2007 4:44:17 -0000 +++ appdb/screenshots.php 17 Jul 2007 4:44:17 -0000 @@ -55,7 +55,7 @@ if($aClean['sCmd']) // we didn't issued any command -$hResult = Screenshot::get_screenshots($aClean['iAppId'], $aClean['iVersionId']); +$hResult = Screenshot::get_screenshots($aClean['iAppId'], $aClean['iVersionId']); apidb_header("Screenshots"); $oApp = new Application($aClean['iAppId']); $oVersion = new Version($aClean['iVersionId']); @@ -66,22 +66,29 @@ if($hResult && mysql_num_rows($hResult)) // display thumbnails $c = 1; + + // optimization so we don't have to perform as many database queries + // only update this variable when $iCurrentVersionId changes + $bUserIsMaintainerOfVersion = false; + echo "<div align=center><table><tr>\n"; while($oRow = mysql_fetch_object($hResult)) { // if the current version changed then update the current version // and close the previous html frame if this isn't the // first frame - if(!$aClean['iVersionId'] && $oRow->versionId != $currentVersionId) + if(!$aClean['iVersionId'] && $oRow->versionId != $iCurrentVersionId) { - if($currentVersionId) + if($iCurrentVersionId) { echo "</tr></table></div>\n"; echo html_frame_end(); $c=1; } - $currentVersionId = $oRow->versionId; - echo html_frame_start("Version ".Version::lookup_name($currentVersionId)); + $iCurrentVersionId = $oRow->versionId; + $bUserIsMaintainerOfVersion = $_SESSION['current']->isMaintainer($iCurrentVersionId); + + echo html_frame_start("Version ".Version::lookup_name($iCurrentVersionId)); echo "<div align=center><table><tr>\n"; } $oScreenshot = new Screenshot($oRow->id); @@ -92,8 +99,12 @@ if($hResult && mysql_num_rows($hResult)) echo "<div align=center>". substr($oRow->description,0,20). "\n"; //show admin delete link - if($_SESSION['current']->isLoggedIn() && ($_SESSION['current']->hasPriv("admin") || - $_SESSION['current']->isMaintainer($aClean['iVersionId']))) + if($_SESSION['current']->isLoggedIn() && + ( + $_SESSION['current']->hasPriv("admin") || + $bUserIsMaintainerOfVersion + ) + ) { echo "<br />[<a href='screenshots.php?sCmd=delete&iImageId=$oRow->id&iAppId=".$aClean['iAppId']."&iVersionId=".$aClean['iVersionId']."'>Delete Image</a>]"; }

1 0