wine-commits July 2007

wine-commits@winehq.org

3 participants
957 discussions

Alexandre Julliard : configure: Move notices about missing features next to the corresponding checks.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: f9dec94f9f4c59dd79f91e781ed8d840bb2f3940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9dec94f9f4c59dd79f91e781… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 10 15:14:15 2007 +0200 configure: Move notices about missing features next to the corresponding checks. --- configure | 413 +++++++++++++++++++++------------------------------------- configure.ac | 314 +++++++++++--------------------------------- 2 files changed, 228 insertions(+), 499 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9dec94f9f4c59dd79f91…

1 0

Alexandre Julliard : aclocal: Add macros for logging messages about missing features.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 8d8c5c60a6c46ef193f140d4bf02ecba502e4d11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8c5c60a6c46ef193f140d4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 10 15:05:40 2007 +0200 aclocal: Add macros for logging messages about missing features. --- aclocal.m4 | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index ff071f5..1799ff0 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -153,6 +153,37 @@ dnl AC_DEFUN([WINE_CONFIG_EXTRA_DIR], [AC_CONFIG_COMMANDS([$1],[test -d "$1" || (AC_MSG_NOTICE([creating $1]) && mkdir "$1")])]) +dnl **** Add a message to the list displayed at the end **** +dnl +dnl Usage: WINE_NOTICE(notice) +dnl Usage: WINE_NOTICE_IF(test, notice) +dnl Usage: WINE_WARNING(warning) +dnl Usage: WINE_WARNING_IF(test, warning) +dnl Usage: WINE_PRINT_MESSAGES +dnl +AC_DEFUN([WINE_NOTICE],[wine_notices="$wine_notices|$1"]) +AC_DEFUN([WINE_NOTICE_IF],[AS_IF([$1],[WINE_NOTICE([$2],[$3])])]) +AC_DEFUN([WINE_WARNING],[wine_warnings="$wine_warnings|$1"]) +AC_DEFUN([WINE_WARNING_IF],[AS_IF([$1],[WINE_WARNING([$2],[$3])])]) + +AC_DEFUN([WINE_PRINT_MESSAGES],[ac_save_IFS="$IFS" +IFS="|" +if test "$verbose" = "yes"; then + for msg in $wine_notices; do + if test -n "$msg"; then + echo >&2 + AC_MSG_NOTICE([$msg]) + fi + done +fi +for msg in $wine_warnings; do + if test -n "$msg"; then + echo >&2 + AC_MSG_WARN([$msg]) + fi +done +IFS="$ac_save_IFS"]) + dnl Local Variables: dnl compile-command: "autoreconf --warnings=all" dnl End:

1 0

Juan Lang : crypt32: Implement CryptSIPGetSignedDataMsg, CryptSIPPutSignedDataMsg,
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 1d5a8b2f781e2a4a8894c84d2590a8e198a24cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d5a8b2f781e2a4a8894c84d2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 9 13:44:38 2007 -0700 crypt32: Implement CryptSIPGetSignedDataMsg, CryptSIPPutSignedDataMsg, CryptSIPCreateIndirectData, CryptSIPVerifyIndirectData, and CryptSIPRemoveSignedDataMsg. --- dlls/crypt32/sip.c | 47 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 37 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index ed50380..34668e5 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -568,9 +568,14 @@ BOOL WINAPI CryptSIPLoad BOOL WINAPI CryptSIPCreateIndirectData(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pcbIndirectData, SIP_INDIRECT_DATA* pIndirectData) { - FIXME("(%p %p %p) stub\n", pSubjectInfo, pcbIndirectData, pIndirectData); + WINE_SIP_PROVIDER *sip; + BOOL ret = FALSE; - return FALSE; + TRACE("(%p %p %p)\n", pSubjectInfo, pcbIndirectData, pIndirectData); + + if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType))) + ret = sip->info.pfCreate(pSubjectInfo, pcbIndirectData, pIndirectData); + return ret; } /*********************************************************************** @@ -579,10 +584,16 @@ BOOL WINAPI CryptSIPCreateIndirectData(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pcb BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pdwEncodingType, DWORD dwIndex, DWORD* pcbSignedDataMsg, BYTE* pbSignedDataMsg) { - FIXME("(%p %p %d %p %p) stub\n", pSubjectInfo, pdwEncodingType, dwIndex, + WINE_SIP_PROVIDER *sip; + BOOL ret = FALSE; + + TRACE("(%p %p %d %p %p)\n", pSubjectInfo, pdwEncodingType, dwIndex, pcbSignedDataMsg, pbSignedDataMsg); - return FALSE; + if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType))) + ret = sip->info.pfGet(pSubjectInfo, pdwEncodingType, dwIndex, + pcbSignedDataMsg, pbSignedDataMsg); + return ret; } /*********************************************************************** @@ -591,10 +602,16 @@ BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pdwEn BOOL WINAPI CryptSIPPutSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD pdwEncodingType, DWORD* pdwIndex, DWORD cbSignedDataMsg, BYTE* pbSignedDataMsg) { - FIXME("(%p %d %p %d %p) stub\n", pSubjectInfo, pdwEncodingType, pdwIndex, + WINE_SIP_PROVIDER *sip; + BOOL ret = FALSE; + + TRACE("(%p %d %p %d %p)\n", pSubjectInfo, pdwEncodingType, pdwIndex, cbSignedDataMsg, pbSignedDataMsg); - return FALSE; + if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType))) + ret = sip->info.pfPut(pSubjectInfo, pdwEncodingType, pdwIndex, + cbSignedDataMsg, pbSignedDataMsg); + return ret; } /*********************************************************************** @@ -603,9 +620,14 @@ BOOL WINAPI CryptSIPPutSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD pdwEnc BOOL WINAPI CryptSIPRemoveSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD dwIndex) { - FIXME("(%p %d) stub\n", pSubjectInfo, dwIndex); + WINE_SIP_PROVIDER *sip; + BOOL ret = FALSE; - return FALSE; + TRACE("(%p %d)\n", pSubjectInfo, dwIndex); + + if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType))) + ret = sip->info.pfRemove(pSubjectInfo, dwIndex); + return ret; } /*********************************************************************** @@ -614,7 +636,12 @@ BOOL WINAPI CryptSIPRemoveSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, BOOL WINAPI CryptSIPVerifyIndirectData(SIP_SUBJECTINFO* pSubjectInfo, SIP_INDIRECT_DATA* pIndirectData) { - FIXME("(%p %p) stub\n", pSubjectInfo, pIndirectData); + WINE_SIP_PROVIDER *sip; + BOOL ret = FALSE; - return FALSE; + TRACE("(%p %p)\n", pSubjectInfo, pIndirectData); + + if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType))) + ret = sip->info.pfVerify(pSubjectInfo, pIndirectData); + return ret; }

1 0

Juan Lang : crypt32: Implement CryptSIPLoad.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 19c3a09ba8160c3b654f39681f6abdc550ab5d39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19c3a09ba8160c3b654f39681… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 9 17:07:54 2007 -0700 crypt32: Implement CryptSIPLoad. --- dlls/crypt32/crypt32_private.h | 1 + dlls/crypt32/main.c | 1 + dlls/crypt32/sip.c | 173 +++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/sip.c | 51 +++++------- 4 files changed, 194 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19c3a09ba8160c3b654f3…

1 0

Evan Stade : gdiplus: Added a test for GdipAddPathLine2.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: da23ed6e0f95893b069f0f0ede16002a0970c31c URL: http://source.winehq.org/git/wine.git/?a=commit;h=da23ed6e0f95893b069f0f0ed… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 9 20:54:47 2007 -0700 gdiplus: Added a test for GdipAddPathLine2. --- dlls/gdiplus/tests/graphicspath.c | 146 +++++++++++++++++++++++++++++++++++++ 1 files changed, 146 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 8dd9adf..f7cfedb 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -21,8 +21,116 @@ #include "windows.h" #include "gdiplus.h" #include "wine/test.h" +#include "math.h" #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +#define POINT_TYPE_MAX_LEN (75) + +static void stringify_point_type(PathPointType type, char * name) +{ + *name = '\0'; + + switch(type & PathPointTypePathTypeMask){ + case PathPointTypeStart: + strcat(name, "PathPointTypeStart"); + break; + case PathPointTypeLine: + strcat(name, "PathPointTypeLine"); + break; + case PathPointTypeBezier: + strcat(name, "PathPointTypeBezier"); + break; + default: + strcat(name, "Unknown type"); + return; + } + + type &= ~PathPointTypePathTypeMask; + if(type & ~((PathPointTypePathMarker | PathPointTypeCloseSubpath))){ + *name = '\0'; + strcat(name, "Unknown type"); + return; + } + + if(type & PathPointTypePathMarker) + strcat(name, " | PathPointTypePathMarker"); + if(type & PathPointTypeCloseSubpath) + strcat(name, " | PathPointTypeCloseSubpath"); +} + +/* this helper structure and function modeled after gdi path.c test */ +typedef struct +{ + REAL X, Y; + BYTE type; + + /* How many extra entries before this one only on wine + * but not on native? */ + int wine_only_entries_preceding; + + /* 0 - This entry matches on wine. + * 1 - This entry corresponds to a single entry on wine that does not match the native entry. + * 2 - This entry is currently skipped on wine but present on native. */ + int todo; +} path_test_t; + +static void ok_path(GpPath* path, const path_test_t *expected, INT expected_size, BOOL todo_size) +{ + BYTE * types; + INT size, idx = 0, eidx = 0, numskip; + GpPointF * points; + char ename[POINT_TYPE_MAX_LEN], name[POINT_TYPE_MAX_LEN]; + + if(GdipGetPointCount(path, &size) != Ok){ + skip("Cannot perform path comparisons due to failure to retrieve path.\n"); + return; + } + + if(todo_size) todo_wine + ok(size == expected_size, "Path size %d does not match expected size %d\n", + size, expected_size); + else + ok(size == expected_size, "Path size %d does not match expected size %d\n", + size, expected_size); + + points = HeapAlloc(GetProcessHeap(), 0, size * sizeof(GpPointF)); + types = HeapAlloc(GetProcessHeap(), 0, size); + + if(GdipGetPathPoints(path, points, size) != Ok || GdipGetPathTypes(path, types, size) != Ok){ + skip("Cannot perform path comparisons due to failure to retrieve path.\n"); + goto end; + } + + numskip = expected_size ? expected[eidx].wine_only_entries_preceding : 0; + while (idx < size && eidx < expected_size){ + /* We allow a few pixels fudge in matching X and Y coordinates to account for imprecision in + * floating point to integer conversion */ + BOOL match = (types[idx] == expected[eidx].type) && + fabs(points[idx].X - expected[eidx].X) <= 2.0 && + fabs(points[idx].Y - expected[eidx].Y) <= 2.0; + + stringify_point_type(expected[eidx].type, ename); + stringify_point_type(types[idx], name); + + if (expected[eidx].todo || numskip) todo_wine + ok(match, "Expected #%d: %s (%.1f,%.1f) but got %s (%.1f,%.1f)\n", eidx, + ename, expected[eidx].X, expected[eidx].Y, + name, points[idx].X, points[idx].Y); + else + ok(match, "Expected #%d: %s (%.1f,%.1f) but got %s (%.1f,%.1f)\n", eidx, + ename, expected[eidx].X, expected[eidx].Y, + name, points[idx].X, points[idx].Y); + + if (match || expected[eidx].todo != 2) + idx++; + if (match || !numskip--) + numskip = expected[++eidx].wine_only_entries_preceding; + } + +end: + HeapFree(GetProcessHeap(), 0, types); + HeapFree(GetProcessHeap(), 0, points); +} static void test_constructor_destructor(void) { @@ -40,6 +148,43 @@ static void test_constructor_destructor(void) expect(Ok, status); } +static path_test_t line2_path[] = { + {0.0, 50.0, PathPointTypeStart, 0, 0}, /*0*/ + {5.0, 45.0, PathPointTypeLine, 0, 0}, /*1*/ + {0.0, 40.0, PathPointTypeLine, 0, 0}, /*2*/ + {15.0, 35.0, PathPointTypeLine, 0, 0}, /*3*/ + {0.0, 30.0, PathPointTypeLine, 0, 0}, /*4*/ + {25.0, 25.0, PathPointTypeLine | PathPointTypeCloseSubpath, 0, 0}, /*5*/ + {0.0, 20.0, PathPointTypeStart, 0, 0}, /*6*/ + {35.0, 15.0, PathPointTypeLine, 0, 0}, /*7*/ + {0.0, 10.0, PathPointTypeLine, 0, 0} /*8*/ + }; + +static void test_line2(void) +{ + GpStatus status; + GpPath* path; + int i; + GpPointF line2_points[9]; + + for(i = 0; i < 9; i ++){ + line2_points[i].X = i * 5.0 * (REAL)(i % 2); + line2_points[i].Y = 50.0 - i * 5.0; + } + + GdipCreatePath(FillModeAlternate, &path); + status = GdipAddPathLine2(path, line2_points, 3); + expect(Ok, status); + status = GdipAddPathLine2(path, &(line2_points[3]), 3); + expect(Ok, status); + status = GdipClosePathFigure(path); + expect(Ok, status); + status = GdipAddPathLine2(path, &(line2_points[6]), 3); + expect(Ok, status); + + ok_path(path, line2_path, sizeof(line2_path)/sizeof(path_test_t), FALSE); +} + START_TEST(graphicspath) { struct GdiplusStartupInput gdiplusStartupInput; @@ -53,6 +198,7 @@ START_TEST(graphicspath) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); test_constructor_destructor(); + test_line2(); GdiplusShutdown(gdiplusToken); }

1 0

Evan Stade : gdiplus: Fixed bug in GdipGetPathPoints().
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 1fc841f6555d9700499dcc59adf0e6b1d6bc5795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fc841f6555d9700499dcc59a… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 9 20:54:43 2007 -0700 gdiplus: Fixed bug in GdipGetPathPoints(). --- dlls/gdiplus/graphicspath.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 4f7d1ef..7c0e826 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -152,7 +152,7 @@ GpStatus WINGDIPAPI GdipGetPathPoints(GpPath *path, GpPointF* points, INT count) if(count < path->pathdata.Count) return InsufficientBuffer; - memcpy(points, path->pathdata.Points, path->pathdata.Count); + memcpy(points, path->pathdata.Points, path->pathdata.Count * sizeof(GpPointF)); return Ok; }

1 0

Evan Stade : gdiplus: Added constructor and destructor test for gdiplus paths.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: fec9e5e8031ba35e840ad2804027e29d4d2b9c5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec9e5e8031ba35e840ad2804… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 9 20:54:38 2007 -0700 gdiplus: Added constructor and destructor test for gdiplus paths. --- dlls/gdiplus/tests/Makefile.in | 1 + dlls/gdiplus/tests/graphicspath.c | 58 +++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/Makefile.in b/dlls/gdiplus/tests/Makefile.in index 45853f6..4d8662a 100644 --- a/dlls/gdiplus/tests/Makefile.in +++ b/dlls/gdiplus/tests/Makefile.in @@ -7,6 +7,7 @@ IMPORTS = gdiplus kernel32 CTESTS = \ brush.c \ + graphicspath.c \ pen.c @MAKE_TEST_RULES@ diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c new file mode 100644 index 0000000..8dd9adf --- /dev/null +++ b/dlls/gdiplus/tests/graphicspath.c @@ -0,0 +1,58 @@ +/* + * Unit test suite for paths + * + * 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 "windows.h" +#include "gdiplus.h" +#include "wine/test.h" + +#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) + +static void test_constructor_destructor(void) +{ + GpStatus status; + GpPath* path = NULL; + + status = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, status); + ok(path != NULL, "Expected path to be initialized\n"); + + status = GdipDeletePath(NULL); + expect(InvalidParameter, status); + + status = GdipDeletePath(path); + expect(Ok, status); +} + +START_TEST(graphicspath) +{ + struct GdiplusStartupInput gdiplusStartupInput; + ULONG_PTR gdiplusToken; + + gdiplusStartupInput.GdiplusVersion = 1; + gdiplusStartupInput.DebugEventCallback = NULL; + gdiplusStartupInput.SuppressBackgroundThread = 0; + gdiplusStartupInput.SuppressExternalCodecs = 0; + + GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + + test_constructor_destructor(); + + GdiplusShutdown(gdiplusToken); +}

1 0

Evan Stade : gdiplus: Make LineCapArrowAnchor look more like it does in windows.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 30084db2ce2ba20800610726954533eddb9abcc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30084db2ce2ba208006107269… Author: Evan Stade <estade(a)evanstade.smo.corp.google.com> Date: Mon Jul 9 20:32:29 2007 -0700 gdiplus: Make LineCapArrowAnchor look more like it does in windows. --- dlls/gdiplus/graphicspath.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 40975b2..4f7d1ef 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -71,7 +71,7 @@ GpStatus WINGDIPAPI GdipAddPathLine2(GpPath *path, GDIPCONST GpPointF *points, if(!path || !points) return InvalidParameter; - if(!lengthen_path(path, count + (path->newfigure ? 1 : 0))) + if(!lengthen_path(path, count)) return OutOfMemory; for(i = 0; i < count; i++){

1 0

Evan Stade : gdiplus: Fixed a bug in helper function draw_polybezier.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 14c7466c9f2d726741e9e9f9cf6a8befc527a147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14c7466c9f2d726741e9e9f9c… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 9 20:54:27 2007 -0700 gdiplus: Fixed a bug in helper function draw_polybezier. --- dlls/gdiplus/graphics.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b640621..3a88295 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -376,8 +376,8 @@ static void draw_polybezier(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, pti[i].y = roundr(pt[i].Y); } for(i = 0; i < 4; i ++){ - pti[i].x = roundr(ptf[i].X); - pti[i].y = roundr(ptf[i].Y); + pti[i + count - 4].x = roundr(ptf[i].X); + pti[i + count - 4].y = roundr(ptf[i].Y); } PolyBezier(hdc, pti, count);

1 0

Evan Stade : gdiplus: GdipDrawCurve2 now uses SaveDC()/RestoreDC() and end caps.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: b72dc0df9d534322b74efa493d6e73793cc20f62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b72dc0df9d534322b74efa493… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 9 20:54:23 2007 -0700 gdiplus: GdipDrawCurve2 now uses SaveDC()/RestoreDC() and end caps. --- dlls/gdiplus/graphics.c | 44 +++++++++++++++++++++++--------------------- 1 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 06a5dad..b640621 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -483,50 +483,52 @@ GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count, REAL tension) { - HGDIOBJ old_pen; - /* PolyBezier expects count*3-2 points. */ - int i, len_pt = count*3-2; - POINT pt[len_pt]; + INT i, len_pt = count*3-2, save_state; + GpPointF *pt; REAL x1, x2, y1, y2; if(!graphics || !pen) return InvalidParameter; + pt = GdipAlloc(len_pt * sizeof(GpPointF)); 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 = roundr(points[0].X); - pt[0].y = roundr(points[0].Y); - pt[1].x = roundr(x1); - pt[1].y = roundr(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 = roundr(x1); - pt[3*i+2].y = roundr(y1); - pt[3*i+3].x = roundr(points[i+1].X); - pt[3*i+3].y = roundr(points[i+1].Y); - pt[3*i+4].x = roundr(x2); - pt[3*i+4].y = roundr(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 = roundr(points[count-1].X); - pt[len_pt-1].y = roundr(points[count-1].Y); + 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; - old_pen = SelectObject(graphics->hdc, pen->gdipen); + save_state = SaveDC(graphics->hdc); + EndPath(graphics->hdc); + SelectObject(graphics->hdc, pen->gdipen); - PolyBezier(graphics->hdc, pt, len_pt); + draw_polybezier(graphics->hdc, pen, pt, len_pt, TRUE); - SelectObject(graphics->hdc, old_pen); + GdipFree(pt); + RestoreDC(graphics->hdc, save_state); return Ok; }

1 0

← Newer
1
...
70
71
72
73
74
75
76
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2007