August 2008 - Wine-commits - list.winehq.org

Andrew Talbot : fusion: Sign-compare warnings fix.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: 5f6d8da932df1bea81a5100a22073f1cff4d1f6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f6d8da932df1bea81a5100a2… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Aug 2 22:09:45 2008 +0100 fusion: Sign-compare warnings fix. --- dlls/fusion/assembly.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index 240c47c..ec86fd3 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -747,7 +747,7 @@ static LPSTR assembly_dup_str(ASSEMBLY *assembly, DWORD index) HRESULT assembly_get_name(ASSEMBLY *assembly, LPSTR *name) { BYTE *ptr; - ULONG offset; + LONG offset; DWORD stridx; offset = assembly->tables[TableFromToken(mdtAssembly)].offset; @@ -839,7 +839,7 @@ static BYTE *assembly_get_blob(ASSEMBLY *assembly, WORD index, ULONG *size) static void bytes_to_str(BYTE *bytes, DWORD len, LPSTR str) { - int i; + DWORD i; static const char hexval[16] = { '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f' @@ -859,7 +859,8 @@ static void bytes_to_str(BYTE *bytes, DWORD len, LPSTR str) HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPSTR *token) { ASSEMBLYTABLE *asmtbl; - ULONG i, offset, size; + ULONG i, size; + LONG offset; BYTE *hashdata; HCRYPTPROV crypt; HCRYPTHASH hash;

1 0

Nikolay Sivov : gdiplus: Implemented GdipAddPathCurve2I using GdipAddPathCurve2.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: edfc1968ce783c7fb325f4160f49d3461bb3f265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edfc1968ce783c7fb325f4160… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Aug 3 02:45:11 2008 +0400 gdiplus: Implemented GdipAddPathCurve2I using GdipAddPathCurve2. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 26 ++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 976bd3a..a592971 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -9,7 +9,7 @@ @ stub GdipAddPathClosedCurve @ stub GdipAddPathClosedCurveI @ stdcall GdipAddPathCurve2(ptr ptr long long) -@ stub GdipAddPathCurve2I +@ stdcall GdipAddPathCurve2I(ptr ptr long long) @ stub GdipAddPathCurve3 @ stub GdipAddPathCurve3I @ stub GdipAddPathCurve diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index bf580b0..8e8930d 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -247,6 +247,32 @@ GpStatus WINGDIPAPI GdipAddPathCurve2(GpPath *path, GDIPCONST GpPointF *points, return stat; } +GpStatus WINGDIPAPI GdipAddPathCurve2I(GpPath *path, GDIPCONST GpPoint *points, + INT count, REAL tension) +{ + GpPointF *ptf; + INT i; + GpStatus stat; + + if(!path || !points || count <= 1) + return InvalidParameter; + + ptf = GdipAlloc(sizeof(GpPointF)*count); + if(!ptf) + return OutOfMemory; + + for(i = 0; i < count; i++){ + ptf[i].X = (REAL)points[i].X; + ptf[i].Y = (REAL)points[i].Y; + } + + stat = GdipAddPathCurve2(path, ptf, count, tension); + + GdipFree(ptf); + + return stat; +} + GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath *path, REAL x, REAL y, REAL width, REAL height) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 2928500..da5c930 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -247,6 +247,7 @@ GpStatus WINGDIPAPI GdipAddPathBezierI(GpPath*,INT,INT,INT,INT,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath*,GDIPCONST GpPointF*,INT); GpStatus WINGDIPAPI GdipAddPathBeziersI(GpPath*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipAddPathCurve2(GpPath*,GDIPCONST GpPointF*,INT,REAL); +GpStatus WINGDIPAPI GdipAddPathCurve2I(GpPath*,GDIPCONST GpPoint*,INT,REAL); GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathEllipseI(GpPath*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathLine(GpPath*,REAL,REAL,REAL,REAL);

1 0

Nikolay Sivov : gdiplus: Implemented GdipAddPathCurve/GdipAddPathCurveI.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: 6492f07f8dc7afeb9bd5ff487a89ed11483ec49b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6492f07f8dc7afeb9bd5ff487… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Aug 3 02:45:15 2008 +0400 gdiplus: Implemented GdipAddPathCurve/GdipAddPathCurveI. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/graphicspath.c | 16 ++++++++++++++++ include/gdiplusflat.h | 2 ++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index a592971..d812fcf 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -12,8 +12,8 @@ @ stdcall GdipAddPathCurve2I(ptr ptr long long) @ stub GdipAddPathCurve3 @ stub GdipAddPathCurve3I -@ stub GdipAddPathCurve -@ stub GdipAddPathCurveI +@ stdcall GdipAddPathCurve(ptr ptr long) +@ stdcall GdipAddPathCurveI(ptr ptr long) @ stdcall GdipAddPathEllipse(ptr long long long long) @ stdcall GdipAddPathEllipseI(ptr long long long long) @ stdcall GdipAddPathLine2(ptr ptr long) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 8e8930d..86059f0 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -196,6 +196,22 @@ GpStatus WINGDIPAPI GdipAddPathBeziersI(GpPath *path, GDIPCONST GpPoint *points, return ret; } +GpStatus WINGDIPAPI GdipAddPathCurve(GpPath *path, GDIPCONST GpPointF *points, INT count) +{ + if(!path || !points || count <= 1) + return InvalidParameter; + + return GdipAddPathCurve2(path, points, count, 1.0); +} + +GpStatus WINGDIPAPI GdipAddPathCurveI(GpPath *path, GDIPCONST GpPoint *points, INT count) +{ + if(!path || !points || count <= 1) + return InvalidParameter; + + return GdipAddPathCurve2I(path, points, count, 1.0); +} + GpStatus WINGDIPAPI GdipAddPathCurve2(GpPath *path, GDIPCONST GpPointF *points, INT count, REAL tension) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index da5c930..ca9975d 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -246,6 +246,8 @@ GpStatus WINGDIPAPI GdipAddPathBezier(GpPath*,REAL,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 GdipAddPathBeziersI(GpPath*,GDIPCONST GpPoint*,INT); +GpStatus WINGDIPAPI GdipAddPathCurve(GpPath*,GDIPCONST GpPointF*,INT); +GpStatus WINGDIPAPI GdipAddPathCurveI(GpPath*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipAddPathCurve2(GpPath*,GDIPCONST GpPointF*,INT,REAL); GpStatus WINGDIPAPI GdipAddPathCurve2I(GpPath*,GDIPCONST GpPoint*,INT,REAL); GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath*,REAL,REAL,REAL,REAL);

1 0

Nikolay Sivov : gdiplus: Implemented GdipAddPathClosedCurve2 with tests.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: 8be642c4c0c0596763069d6d2f5012a9d1fcbd3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8be642c4c0c0596763069d6d2… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Aug 3 02:45:19 2008 +0400 gdiplus: Implemented GdipAddPathClosedCurve2 with tests. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 69 +++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/graphicspath.c | 50 ++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 121 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index d812fcf..a84667f 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -4,7 +4,7 @@ @ stdcall GdipAddPathBezierI(ptr long long long long long long long long) @ stdcall GdipAddPathBeziers(ptr ptr long) @ stdcall GdipAddPathBeziersI(ptr ptr long) -@ stub GdipAddPathClosedCurve2 +@ stdcall GdipAddPathClosedCurve2(ptr ptr long long) @ stub GdipAddPathClosedCurve2I @ stub GdipAddPathClosedCurve @ stub GdipAddPathClosedCurveI diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 86059f0..040e13a 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -196,6 +196,75 @@ GpStatus WINGDIPAPI GdipAddPathBeziersI(GpPath *path, GDIPCONST GpPoint *points, return ret; } +GpStatus WINGDIPAPI GdipAddPathClosedCurve2(GpPath *path, GDIPCONST GpPointF *points, + INT count, REAL tension) +{ + INT i, len_pt = (count + 1)*3-2; + GpPointF *pt; + GpPointF *pts; + REAL x1, x2, y1, y2; + GpStatus stat; + + if(!path || !points || count <= 1) + return InvalidParameter; + + pt = GdipAlloc(len_pt * sizeof(GpPointF)); + pts = GdipAlloc((count + 1)*sizeof(GpPointF)); + if(!pt || !pts){ + GdipFree(pt); + GdipFree(pts); + return OutOfMemory; + } + + /* copy source points to extend with the last one */ + memcpy(pts, points, sizeof(GpPointF)*count); + pts[count] = pts[0]; + + tension = tension * TENSION_CONST; + + for(i = 0; i < count-1; i++){ + calc_curve_bezier(&(pts[i]), tension, &x1, &y1, &x2, &y2); + + pt[3*i+2].X = x1; + pt[3*i+2].Y = y1; + pt[3*i+3].X = pts[i+1].X; + pt[3*i+3].Y = pts[i+1].Y; + pt[3*i+4].X = x2; + pt[3*i+4].Y = y2; + } + + /* points [len_pt-2] and [0] are calculated + separetely to connect splines properly */ + pts[0] = points[count-1]; + pts[1] = points[0]; /* equals to start and end of a resulting path */ + pts[2] = points[1]; + + calc_curve_bezier(pts, tension, &x1, &y1, &x2, &y2); + pt[len_pt-2].X = x1; + pt[len_pt-2].Y = y1; + pt[0].X = pts[1].X; + pt[0].Y = pts[1].Y; + pt[1].X = x2; + pt[1].Y = y2; + /* close path */ + pt[len_pt-1].X = pt[0].X; + pt[len_pt-1].Y = pt[0].Y; + + stat = GdipAddPathBeziers(path, pt, len_pt); + + /* close figure */ + if(stat == Ok){ + INT count = path->pathdata.Count; + path->pathdata.Types[count - 1] |= PathPointTypeCloseSubpath; + path->newfigure = TRUE; + } + + GdipFree(pts); + GdipFree(pt); + + return stat; +} + GpStatus WINGDIPAPI GdipAddPathCurve(GpPath *path, GDIPCONST GpPointF *points, INT count) { if(!path || !points || count <= 1) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 7af1814..eb7e2de 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -764,6 +764,55 @@ static void test_addcurve(void) GdipDeletePath(path); } +static path_test_t addclosedcurve_path[] = { + {0.0, 0.0, PathPointTypeStart, 0, 0}, /*0*/ + {-6.7, 0.0, PathPointTypeBezier, 0, 0}, /*1*/ + {6.7, 3.3, PathPointTypeBezier, 0, 0}, /*2*/ + {10.0, 10.0, PathPointTypeBezier, 0, 0}, /*3*/ + {13.3, 16.7, PathPointTypeBezier, 0, 0}, /*4*/ + {3.3, 20.0, PathPointTypeBezier, 0, 0}, /*5*/ + {10.0, 20.0, PathPointTypeBezier, 0, 0}, /*6*/ + {16.7, 20.0, PathPointTypeBezier, 0, 0}, /*7*/ + {33.3, 16.7, PathPointTypeBezier, 0, 0}, /*8*/ + {30.0, 10.0, PathPointTypeBezier, 0, 0}, /*9*/ + {26.7, 3.3, PathPointTypeBezier, 0, 0}, /*10*/ + {6.7, 0.0, PathPointTypeBezier, 0, 0}, /*11*/ + {0.0, 0.0, PathPointTypeBezier | PathPointTypeCloseSubpath, 0, 0} /*12*/ + }; +static void test_addclosedcurve(void) +{ + GpStatus status; + GpPath *path; + GpPointF points[4]; + + points[0].X = 0.0; + points[0].Y = 0.0; + points[1].X = 10.0; + points[1].Y = 10.0; + points[2].X = 10.0; + points[2].Y = 20.0; + points[3].X = 30.0; + points[3].Y = 10.0; + + GdipCreatePath(FillModeAlternate, &path); + + /* NULL args */ + status = GdipAddPathClosedCurve2(NULL, NULL, 0, 0.0); + expect(InvalidParameter, status); + status = GdipAddPathClosedCurve2(path, NULL, 0, 0.0); + expect(InvalidParameter, status); + status = GdipAddPathClosedCurve2(path, points, -1, 0.0); + expect(InvalidParameter, status); + status = GdipAddPathClosedCurve2(path, points, 1, 1.0); + expect(InvalidParameter, status); + + /* add to empty path */ + status = GdipAddPathClosedCurve2(path, points, 4, 1.0); + expect(Ok, status); + ok_path(path, addclosedcurve_path, sizeof(addclosedcurve_path)/sizeof(path_test_t), FALSE); + GdipDeletePath(path); +} + START_TEST(graphicspath) { struct GdiplusStartupInput gdiplusStartupInput; @@ -788,6 +837,7 @@ START_TEST(graphicspath) test_polygon(); test_lastpoint(); test_addcurve(); + test_addclosedcurve(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index ca9975d..d9c9188 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -246,6 +246,7 @@ GpStatus WINGDIPAPI GdipAddPathBezier(GpPath*,REAL,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 GdipAddPathBeziersI(GpPath*,GDIPCONST GpPoint*,INT); +GpStatus WINGDIPAPI GdipAddPathClosedCurve2(GpPath*,GDIPCONST GpPointF*,INT,REAL); GpStatus WINGDIPAPI GdipAddPathCurve(GpPath*,GDIPCONST GpPointF*,INT); GpStatus WINGDIPAPI GdipAddPathCurveI(GpPath*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipAddPathCurve2(GpPath*,GDIPCONST GpPointF*,INT,REAL);

1 0

Nikolay Sivov : gdiplus: Move some Beziers helpers to gdiplus. c to use them for graphicspath.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: 2fb0c7e639d0c8ff8920a44f5400629503925133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb0c7e639d0c8ff8920a44f5… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Aug 3 02:44:57 2008 +0400 gdiplus: Move some Beziers helpers to gdiplus.c to use them for graphicspath. --- dlls/gdiplus/gdiplus.c | 26 ++++++++++++++++++++++++++ dlls/gdiplus/gdiplus_private.h | 6 ++++++ dlls/gdiplus/graphics.c | 29 ----------------------------- 3 files changed, 32 insertions(+), 29 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index fb38497..070a80f 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -285,3 +285,29 @@ REAL convert_unit(HDC hdc, GpUnit unit) return 1.0; } } + +/* Calculates Bezier points from cardinal spline points. */ +void calc_curve_bezier(CONST GpPointF *pts, REAL tension, REAL *x1, + REAL *y1, REAL *x2, REAL *y2) +{ + REAL xdiff, ydiff; + + /* calculate tangent */ + xdiff = pts[2].X - pts[0].X; + ydiff = pts[2].Y - pts[0].Y; + + /* apply tangent to get control points */ + *x1 = pts[1].X - tension * xdiff; + *y1 = pts[1].Y - tension * ydiff; + *x2 = pts[1].X + tension * xdiff; + *y2 = pts[1].Y + tension * ydiff; +} + +/* Calculates Bezier points from cardinal spline endpoints. */ +void calc_curve_bezier_endp(REAL xend, REAL yend, REAL xadj, REAL yadj, + REAL tension, REAL *x, REAL *y) +{ + /* tangent at endpoints is the line from the endpoint to the adjacent point */ + *x = roundr(tension * (xadj - xend) + xend); + *y = roundr(tension * (yadj - yend) + yend); +} diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 8fe8862..3611239 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -38,6 +38,7 @@ #define INCH_HIMETRIC (2540) #define VERSION_MAGIC 0xdbc01001 +#define TENSION_CONST (0.3) COLORREF ARGB2COLORREF(ARGB color); extern INT arc2polybezier(GpPointF * points, REAL x1, REAL y1, REAL x2, REAL y2, @@ -46,6 +47,11 @@ extern REAL gdiplus_atan2(REAL dy, REAL dx); extern GpStatus hresult_to_status(HRESULT res); extern REAL convert_unit(HDC hdc, GpUnit unit); +extern void calc_curve_bezier(CONST GpPointF *pts, REAL tension, REAL *x1, + REAL *y1, REAL *x2, REAL *y2); +extern void calc_curve_bezier_endp(REAL xend, REAL yend, REAL xadj, REAL yadj, + REAL tension, REAL *x, REAL *y); + static inline INT roundr(REAL x) { return (INT) floorf(x + 0.5); diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4448b6a..2450b47 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -42,7 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); /* looks-right constants */ -#define TENSION_CONST (0.3) #define ANCHOR_WIDTH (2.0) #define MAX_ITERS (50) @@ -194,34 +193,6 @@ static void draw_pie(GpGraphics *graphics, REAL x, REAL y, REAL width, pti[2].y, pti[3].x, pti[3].y); } -/* GdipDrawCurve helper function. - * Calculates Bezier points from cardinal spline points. */ -static void calc_curve_bezier(CONST GpPointF *pts, REAL tension, REAL *x1, - REAL *y1, REAL *x2, REAL *y2) -{ - REAL xdiff, ydiff; - - /* calculate tangent */ - xdiff = pts[2].X - pts[0].X; - ydiff = pts[2].Y - pts[0].Y; - - /* apply tangent to get control points */ - *x1 = pts[1].X - tension * xdiff; - *y1 = pts[1].Y - tension * ydiff; - *x2 = pts[1].X + tension * xdiff; - *y2 = pts[1].Y + tension * ydiff; -} - -/* GdipDrawCurve helper function. - * Calculates Bezier points from cardinal spline endpoints. */ -static void calc_curve_bezier_endp(REAL xend, REAL yend, REAL xadj, REAL yadj, - REAL tension, REAL *x, REAL *y) -{ - /* tangent at endpoints is the line from the endpoint to the adjacent point */ - *x = roundr(tension * (xadj - xend) + xend); - *y = roundr(tension * (yadj - yend) + yend); -} - /* Draws the linecap the specified color and size on the hdc. The linecap is in * direction of the line from x1, y1 to x2, y2 and is anchored on x2, y2. Probably * should not be called on an hdc that has a path you care about. */

1 0

Nikolay Sivov : gdiplus: Implemented GdipAddPathCurve2 with tests.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: 169140cc83b9604e5ab23f711183847e7e2e3c35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=169140cc83b9604e5ab23f711… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Aug 3 02:45:06 2008 +0400 gdiplus: Implemented GdipAddPathCurve2 with tests. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 51 +++++++++++++++++++++++++++ dlls/gdiplus/tests/graphicspath.c | 69 +++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 122 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index eeda4be..976bd3a 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -8,7 +8,7 @@ @ stub GdipAddPathClosedCurve2I @ stub GdipAddPathClosedCurve @ stub GdipAddPathClosedCurveI -@ stub GdipAddPathCurve2 +@ stdcall GdipAddPathCurve2(ptr ptr long long) @ stub GdipAddPathCurve2I @ stub GdipAddPathCurve3 @ stub GdipAddPathCurve3I diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 75f89d4..bf580b0 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -196,6 +196,57 @@ GpStatus WINGDIPAPI GdipAddPathBeziersI(GpPath *path, GDIPCONST GpPoint *points, return ret; } +GpStatus WINGDIPAPI GdipAddPathCurve2(GpPath *path, GDIPCONST GpPointF *points, INT count, + REAL tension) +{ + INT i, len_pt = count*3-2; + GpPointF *pt; + REAL x1, x2, y1, y2; + GpStatus stat; + + if(!path || !points || count <= 1) + return InvalidParameter; + + pt = GdipAlloc(len_pt * sizeof(GpPointF)); + if(!pt) + return OutOfMemory; + + tension = tension * TENSION_CONST; + + calc_curve_bezier_endp(points[0].X, points[0].Y, points[1].X, points[1].Y, + tension, &x1, &y1); + + pt[0].X = points[0].X; + pt[0].Y = points[0].Y; + pt[1].X = x1; + pt[1].Y = y1; + + for(i = 0; i < count-2; i++){ + calc_curve_bezier(&(points[i]), tension, &x1, &y1, &x2, &y2); + + pt[3*i+2].X = x1; + pt[3*i+2].Y = y1; + pt[3*i+3].X = points[i+1].X; + pt[3*i+3].Y = points[i+1].Y; + pt[3*i+4].X = x2; + pt[3*i+4].Y = y2; + } + + calc_curve_bezier_endp(points[count-1].X, points[count-1].Y, + points[count-2].X, points[count-2].Y, tension, &x1, &y1); + + pt[len_pt-2].X = x1; + pt[len_pt-2].Y = y1; + pt[len_pt-1].X = points[count-1].X; + pt[len_pt-1].Y = points[count-1].Y; + + stat = GdipAddPathBeziers(path, pt, len_pt); + + GdipFree(pt); + + return stat; +} + GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath *path, REAL x, REAL y, REAL width, REAL height) { diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 9f9af9c..7af1814 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -696,6 +696,74 @@ static void test_lastpoint(void) GdipDeletePath(path); } +static path_test_t addcurve_path[] = { + {0.0, 0.0, PathPointTypeStart, 0, 0}, /*0*/ + {3.3, 3.3, PathPointTypeBezier, 0, 0}, /*1*/ + {6.7, 3.3, PathPointTypeBezier, 0, 0}, /*2*/ + {10.0, 10.0, PathPointTypeBezier, 0, 0}, /*3*/ + {13.3, 16.7, PathPointTypeBezier, 0, 0}, /*4*/ + {3.3, 20.0, PathPointTypeBezier, 0, 0}, /*5*/ + {10.0, 20.0, PathPointTypeBezier, 0, 0}, /*6*/ + {16.7, 20.0, PathPointTypeBezier, 0, 0}, /*7*/ + {23.3, 13.3, PathPointTypeBezier, 0, 0}, /*8*/ + {30.0, 10.0, PathPointTypeBezier, 0, 0} /*9*/ + }; +static path_test_t addcurve_path2[] = { + {100.0,120.0,PathPointTypeStart, 0, 0}, /*0*/ + {123.0,10.0, PathPointTypeLine, 0, 0}, /*1*/ + {0.0, 0.0, PathPointTypeLine, 0, 0}, /*2*/ + {3.3, 3.3, PathPointTypeBezier, 0, 0}, /*3*/ + {6.7, 3.3, PathPointTypeBezier, 0, 0}, /*4*/ + {10.0, 10.0, PathPointTypeBezier, 0, 0}, /*5*/ + {13.3, 16.7, PathPointTypeBezier, 0, 0}, /*6*/ + {3.3, 20.0, PathPointTypeBezier, 0, 0}, /*7*/ + {10.0, 20.0, PathPointTypeBezier, 0, 0}, /*8*/ + {16.7, 20.0, PathPointTypeBezier, 0, 0}, /*9*/ + {23.3, 13.3, PathPointTypeBezier, 0, 0}, /*10*/ + {30.0, 10.0, PathPointTypeBezier, 0, 0} /*11*/ + }; +static void test_addcurve(void) +{ + GpStatus status; + GpPath *path; + GpPointF points[4]; + + points[0].X = 0.0; + points[0].Y = 0.0; + points[1].X = 10.0; + points[1].Y = 10.0; + points[2].X = 10.0; + points[2].Y = 20.0; + points[3].X = 30.0; + points[3].Y = 10.0; + + GdipCreatePath(FillModeAlternate, &path); + + /* NULL args */ + status = GdipAddPathCurve2(NULL, NULL, 0, 0.0); + expect(InvalidParameter, status); + status = GdipAddPathCurve2(path, NULL, 0, 0.0); + expect(InvalidParameter, status); + status = GdipAddPathCurve2(path, points, -1, 0.0); + expect(InvalidParameter, status); + status = GdipAddPathCurve2(path, points, 1, 1.0); + expect(InvalidParameter, status); + + /* add to empty path */ + status = GdipAddPathCurve2(path, points, 4, 1.0); + expect(Ok, status); + ok_path(path, addcurve_path, sizeof(addcurve_path)/sizeof(path_test_t), FALSE); + GdipDeletePath(path); + + /* add to notempty path and opened figure */ + GdipCreatePath(FillModeAlternate, &path); + GdipAddPathLine(path, 100.0, 120.0, 123.0, 10.0); + status = GdipAddPathCurve2(path, points, 4, 1.0); + expect(Ok, status); + ok_path(path, addcurve_path2, sizeof(addcurve_path2)/sizeof(path_test_t), FALSE); + GdipDeletePath(path); +} + START_TEST(graphicspath) { struct GdiplusStartupInput gdiplusStartupInput; @@ -719,6 +787,7 @@ START_TEST(graphicspath) test_rect(); test_polygon(); test_lastpoint(); + test_addcurve(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 4293f64..2928500 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -246,6 +246,7 @@ GpStatus WINGDIPAPI GdipAddPathBezier(GpPath*,REAL,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 GdipAddPathBeziersI(GpPath*,GDIPCONST GpPoint*,INT); +GpStatus WINGDIPAPI GdipAddPathCurve2(GpPath*,GDIPCONST GpPointF*,INT,REAL); GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathEllipseI(GpPath*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathLine(GpPath*,REAL,REAL,REAL,REAL);

1 0

Tobias Jakobi : wined3d: Remove arb_tex_npot for NV FX series in fixup_extensions.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: 2583975ec799527cebc3238916394390c913b842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2583975ec799527cebc323891… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Sun Aug 3 00:59:48 2008 +0200 wined3d: Remove arb_tex_npot for NV FX series in fixup_extensions. --- dlls/wined3d/directx.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5474a45..ebf7b40 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3814,6 +3814,29 @@ static void fixup_extensions(WineD3D_GL_Info *gl_info) { } } + /* The nVidia GeForceFX series reports OpenGL 2.0 capabilities with the latest drivers versions, but + * doesn't explicitly advertise the ARB_tex_npot extension in the GL extension string. + * This usually means that ARB_tex_npot is supported in hardware as long as the application is staying + * within the limits enforced by the ARB_texture_rectangle extension. This however is not true for the + * FX series, which instantly falls back to a slower software path as soon as ARB_tex_npot is used. + * We therefore completly remove ARB_tex_npot from the list of supported extensions. + * + * Note that wine_normalized_texrect can't be used in this case because internally it uses ARB_tex_npot, + * triggering the software fallback. There is not much we can do here apart from disabling the + * software-emulated extension and reenable ARB_tex_rect (which was previously disabled + * in IWineD3DImpl_FillGLCaps). + * This fixup removes performance problems on both the FX 5900 and FX 5700 (e.g. for framebuffer + * post-processing effects in the game "Max Payne 2"). + * The behaviour can be verified through a simple test app attached in bugreport #14724. + */ + if(gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] && gl_info->gl_vendor == VENDOR_NVIDIA) { + if(gl_info->gl_card == CARD_NVIDIA_GEFORCEFX_5800 || gl_info->gl_card == CARD_NVIDIA_GEFORCEFX_5600) { + TRACE("GL_ARB_texture_non_power_of_two advertised through OpenGL 2.0 on NV FX card, removing\n"); + gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = FALSE; + gl_info->supported[ARB_TEXTURE_RECTANGLE] = TRUE; + } + } + /* Find out if PBOs work as they are supposed to */ test_pbo_functionality(gl_info);

1 0

Piotr Caban : msxml3: Add ISAXContentHandler_startPrefixMapping event.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: e9d34b7f5aa4a57391629bcf4413c5d0a9e0f394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9d34b7f5aa4a57391629bcf4… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Aug 3 17:03:28 2008 +0200 msxml3: Add ISAXContentHandler_startPrefixMapping event. --- dlls/msxml3/saxreader.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 0cdd0c1..0d0a091 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -919,15 +919,41 @@ static void libxmlStartElementNS( int nb_defaulted, const xmlChar **attributes) { - BSTR NamespaceUri, LocalName, QName; + BSTR NamespaceUri, LocalName, QName, Prefix, Uri; saxlocator *This = ctx; HRESULT hr; saxattributes *attr; + int index; update_position(This, (xmlChar*)This->pParserCtxt->input->cur+1); if(This->saxreader->contentHandler) { + for(index=0; index<nb_namespaces; index++) + { + Prefix = bstr_from_xmlChar(namespaces[2*index]); + Uri = bstr_from_xmlChar(namespaces[2*index+1]); + + if(This->vbInterface) + hr = IVBSAXContentHandler_startPrefixMapping( + This->saxreader->vbcontentHandler, + &Prefix, &Uri); + else + hr = ISAXContentHandler_startPrefixMapping( + This->saxreader->contentHandler, + Prefix, SysStringLen(Prefix), + Uri, SysStringLen(Uri)); + + SysFreeString(Prefix); + SysFreeString(Uri); + + if(hr != S_OK) + { + format_error_message_from_id(This, hr); + return; + } + } + NamespaceUri = bstr_from_xmlChar(URI); LocalName = bstr_from_xmlChar(localname); QName = QName_from_xmlChar(prefix, localname);

1 0

Piotr Caban : msxml3: Add namespaces to attributes.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: a94e4c196c9f5005fd8de6725585b91831492adf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a94e4c196c9f5005fd8de6725… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Aug 3 14:38:10 2008 +0200 msxml3: Add namespaces to attributes. --- dlls/msxml3/saxreader.c | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 0d0a091..18ff134 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -811,10 +811,12 @@ static const struct ISAXAttributesVtbl isaxattributes_vtbl = }; static HRESULT SAXAttributes_create(saxattributes **attr, + int nb_namespaces, const xmlChar **xmlNamespaces, int nb_attributes, const xmlChar **xmlAttributes) { saxattributes *attributes; int index; + static const xmlChar xmlns[] = "xmlns"; attributes = HeapAlloc(GetProcessHeap(), 0, sizeof(*attributes)); if(!attributes) @@ -824,16 +826,16 @@ static HRESULT SAXAttributes_create(saxattributes **attr, attributes->lpSAXAttributesVtbl = &isaxattributes_vtbl; attributes->ref = 1; - attributes->nb_attributes = nb_attributes; + attributes->nb_attributes = nb_namespaces+nb_attributes; attributes->szLocalname = - HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR)*nb_attributes); + HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR)*attributes->nb_attributes); attributes->szURI = - HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR)*nb_attributes); + HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR)*attributes->nb_attributes); attributes->szValue = - HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR)*nb_attributes); + HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR)*attributes->nb_attributes); attributes->szQName = - HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR)*nb_attributes); + HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR)*attributes->nb_attributes); if(!attributes->szLocalname || !attributes->szURI || !attributes->szValue || !attributes->szQName) @@ -846,16 +848,24 @@ static HRESULT SAXAttributes_create(saxattributes **attr, return E_FAIL; } + for(index=0; index<nb_namespaces; index++) + { + attributes->szLocalname[index] = SysAllocStringLen(NULL, 0); + attributes->szURI[index] = SysAllocStringLen(NULL, 0); + attributes->szValue[index] = bstr_from_xmlChar(xmlNamespaces[2*index+1]); + attributes->szQName[index] = QName_from_xmlChar(xmlns, xmlNamespaces[2*index]); + } + for(index=0; index<nb_attributes; index++) { - attributes->szLocalname[index] = + attributes->szLocalname[nb_namespaces+index] = bstr_from_xmlChar(xmlAttributes[index*5]); - attributes->szURI[index] = + attributes->szURI[nb_namespaces+index] = bstr_from_xmlChar(xmlAttributes[index*5+2]); - attributes->szValue[index] = + attributes->szValue[nb_namespaces+index] = bstr_from_xmlCharN(xmlAttributes[index*5+3], xmlAttributes[index*5+4]-xmlAttributes[index*5+3]); - attributes->szQName[index] = + attributes->szQName[nb_namespaces+index] = QName_from_xmlChar(xmlAttributes[index*5+1], xmlAttributes[index*5]); } @@ -958,7 +968,7 @@ static void libxmlStartElementNS( LocalName = bstr_from_xmlChar(localname); QName = QName_from_xmlChar(prefix, localname); - hr = SAXAttributes_create(&attr, nb_attributes, attributes); + hr = SAXAttributes_create(&attr, nb_namespaces, namespaces, nb_attributes, attributes); if(hr == S_OK) { if(This->vbInterface)

1 0

H. Verbeet : wined3d: Move setting the draw buffer to a separate function.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: f037eb86962b46185dcc57856d1ea52c1f2b29d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f037eb86962b46185dcc57856… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Aug 3 21:17:51 2008 +0200 wined3d: Move setting the draw buffer to a separate function. --- dlls/wined3d/context.c | 40 +++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index bb354f6..3556714 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -871,7 +871,7 @@ static WineD3DContext *findThreadContextForSwapChain(IWineD3DSwapChain *swapchai * Returns: The needed context * *****************************************************************************/ -static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, DWORD tid, GLint *buffer) { +static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, DWORD tid) { IWineD3DSwapChain *swapchain = NULL; HRESULT hr; BOOL readTexture = wined3d_settings.offscreen_rendering_mode != ORM_FBO && This->render_offscreen; @@ -907,11 +907,6 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf * rendering. No context change is needed in that case */ - if(((IWineD3DSwapChainImpl *) swapchain)->frontBuffer == target) { - *buffer = GL_FRONT; - } else { - *buffer = GL_BACK; - } if(wined3d_settings.offscreen_rendering_mode == ORM_PBUFFER) { if(This->pbufferContext && tid == This->pbufferContext->tid) { This->pbufferContext->tid = 0; @@ -930,7 +925,6 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf } else { TRACE("Rendering offscreen\n"); This->render_offscreen = TRUE; - *buffer = This->offscreenBuffer; switch(wined3d_settings.offscreen_rendering_mode) { case ORM_FBO: @@ -1057,6 +1051,25 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf return context; } +static void apply_draw_buffer(IWineD3DDeviceImpl *This, IWineD3DSurface *target) +{ + HRESULT hr; + IWineD3DSwapChain *swapchain; + + hr = IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain); + if (SUCCEEDED(hr)) + { + IWineD3DSwapChain_Release((IUnknown *)swapchain); + glDrawBuffer(surface_get_gl_buffer(target, swapchain)); + checkGLcall("glDrawBuffers()"); + } + else + { + glDrawBuffer(This->offscreenBuffer); + checkGLcall("glDrawBuffer()"); + } +} + /***************************************************************************** * ActivateContext * @@ -1076,12 +1089,12 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU DWORD dirtyState, idx; BYTE shift; WineD3DContext *context; - GLint drawBuffer=0; const struct StateEntry *StateTable = This->StateTable; TRACE("(%p): Selecting context for render target %p, thread %d\n", This, target, tid); if(This->lastActiveRenderTarget != target || tid != This->lastThread) { - context = FindContext(This, target, tid, &drawBuffer); + context = FindContext(This, target, tid); + context->draw_buffer_dirty = TRUE; This->lastActiveRenderTarget = target; This->lastThread = tid; } else { @@ -1121,13 +1134,10 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU /* We only need ENTER_GL for the gl calls made below and for the helper functions which make GL calls */ ENTER_GL(); - /* Select the right draw buffer. It is selected in FindContext. */ - if(drawBuffer && context->last_draw_buffer != drawBuffer) { - TRACE("Drawing to buffer: %#x\n", drawBuffer); - context->last_draw_buffer = drawBuffer; - glDrawBuffer(drawBuffer); - checkGLcall("glDrawBuffer"); + if (context->draw_buffer_dirty) { + apply_draw_buffer(This, target); + context->draw_buffer_dirty = FALSE; } switch(usage) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0e798c1..33b48df 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -591,7 +591,7 @@ struct WineD3DContext { DWORD tid; /* Thread ID which owns this context at the moment */ /* Stores some information about the context state for optimization */ - GLint last_draw_buffer; + BOOL draw_buffer_dirty; BOOL last_was_rhw; /* true iff last draw_primitive was in xyzrhw mode */ BOOL last_was_pshader; BOOL last_was_vshader;

1 0