wine-commits July 2007

wine-commits@winehq.org

3 participants
957 discussions

Alexandre Julliard : ntdll: Simply store the assembly type without interpreting it.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: 8f0fb1e3e9830b49ce851aa3748578a8f8a625d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f0fb1e3e9830b49ce851aa37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 27 12:17:07 2007 +0200 ntdll: Simply store the assembly type without interpreting it. --- dlls/ntdll/actctx.c | 21 +++++---------------- 1 files changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index e1c20ba..8cf5467 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -80,20 +80,14 @@ struct version USHORT revision; }; -enum assembly_id_type -{ - TYPE_NONE, - TYPE_WIN32 -}; - struct assembly_identity { WCHAR *name; WCHAR *arch; WCHAR *public_key; WCHAR *language; + WCHAR *type; struct version version; - enum assembly_id_type type; BOOL optional; }; @@ -536,7 +530,7 @@ static WCHAR *build_assembly_id( const struct assembly_identity *ai ) static const WCHAR public_keyW[] = {',','p','u','b','l','i','c','K','e','y','T','o','k','e','n','=',0}; static const WCHAR typeW[] = - {',','t','y','p','e','=','"','w','i','n','3','2','"',0}; + {',','t','y','p','e','=',0}; static const WCHAR versionW[] = {',','v','e','r','s','i','o','n','=',0}; @@ -548,7 +542,7 @@ static WCHAR *build_assembly_id( const struct assembly_identity *ai ) if (ai->name) size += strlenW(ai->name) * sizeof(WCHAR); if (ai->arch) size += strlenW(archW) + strlenW(ai->arch) + 2; if (ai->public_key) size += strlenW(public_keyW) + strlenW(ai->public_key) + 2; - if (ai->type == TYPE_WIN32) size += strlenW(typeW); + if (ai->type) size += strlenW(typeW) + strlenW(ai->type) + 2; size += strlenW(versionW) + strlenW(version) + 2; if (!(ret = RtlAllocateHeap( GetProcessHeap(), 0, (size + 1) * sizeof(WCHAR) ))) @@ -558,7 +552,7 @@ static WCHAR *build_assembly_id( const struct assembly_identity *ai ) else *ret = 0; append_string( ret, archW, ai->arch ); append_string( ret, public_keyW, ai->public_key ); - if (ai->type == TYPE_WIN32) strcatW( ret, typeW ); + append_string( ret, typeW, ai->type ); append_string( ret, versionW, version ); return ret; } @@ -835,12 +829,7 @@ static BOOL parse_assembly_identity_elem(xmlbuf_t* xmlbuf, ACTIVATION_CONTEXT* a } else if (xmlstr_cmp(&attr_name, TYPE_ATTR)) { - if (!xmlstr_cmp(&attr_value, "win32")) - { - FIXME("wrong type attr %s\n", debugstr_xmlstr(&attr_value)); - return FALSE; - } - ai->type = TYPE_WIN32; + if (!(ai->type = xmlstrdupW(&attr_value))) return FALSE; } else if (xmlstr_cmp(&attr_name, VERSION_ATTR)) {

1 0

Jacek Caban : kernel32: Added a number of activation context tests.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: 43adec3e81f61bbf77f3c1fa4e339c2a1434f391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43adec3e81f61bbf77f3c1fa4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 26 19:42:06 2007 +0200 kernel32: Added a number of activation context tests. --- dlls/kernel32/tests/Makefile.in | 1 + dlls/kernel32/tests/actctx.c | 1058 +++++++++++++++++++++++++++++++++++++++ dlls/ntdll/actctx.c | 7 +- 3 files changed, 1062 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43adec3e81f61bbf77f3c…

1 0

appdb/include maintainer.php
by WineHQ 26 Jul '07

26 Jul '07

ChangeSet ID: 31280 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/26 09:42:21 Modified files: include : maintainer.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Speedup maintainer::objectGetEntries and maintainer::objectGetEntriesCount. Use UNION for sql statements and multipage controls Patch: http://cvs.winehq.org/patch.py?id=31280 Old revision New revision Changes Path 1.49 1.50 +83 -47 appdb/include/maintainer.php Index: appdb/include/maintainer.php diff -u -p appdb/include/maintainer.php:1.49 appdb/include/maintainer.php:1.50 --- appdb/include/maintainer.php:1.49 26 Jul 2007 14:42:21 -0000 +++ appdb/include/maintainer.php 26 Jul 2007 14:42:21 -0000 @@ -165,7 +165,7 @@ class maintainer var $sMaintainReason; var $bSuperMaintainer; var $aSubmitTime; //FIXME: should be 'sSubmitTime' - var $bQueued; + var $bQueued; //FIXME: Should be sQueued var $sReplyText; // parameters used in the queued data notification system @@ -382,45 +382,75 @@ class maintainer return $hResult; } - function ObjectGetEntries($bQueued, $bRejected) + function ObjectGetEntries($bQueued, $bRejected, $iRows = 0, $iStart = 0) { /* Not implemented */ if($bRejected) return FALSE; + $sLimit = ""; + + /* Should we add a limit clause to the query? */ + if($iRows || $iStart) + { + $sLimit = " LIMIT ?,?"; + + /* Selecting 0 rows makes no sense, so we assume the user wants to select all of them + after an offset given by iStart */ + if(!$iRows) + $iRows = maintainer::objectGetEntriesCount($bQueued, $bRejected); + } + /* Excluding requests for queued apps and versions, as these will be handled automatically */ - $sQuery = "SELECT DISTINCT appMaintainers.* FROM - appMaintainers, appFamily, appVersion WHERE + $sQuery = "(SELECT DISTINCT appMaintainers.* FROM + appMaintainers, appFamily WHERE appMaintainers.queued = '?' AND - appFamily.appId = appVersion.appId + appMaintainers.superMaintainer = '1' AND - ( - ( - appFamily.appId = appMaintainers.appId - AND - appFamily.queued = 'false' - AND - appMaintainers.versionId = '' - ) - OR - ( - appVersion.versionId = appMaintainers.versionId - AND - appVersion.queued = 'false' - ) - )"; + appFamily.appId = appMaintainers.appId + AND + appFamily.queued = 'false') UNION + (SELECT DISTINCT appMaintainers.* FROM + appMaintainers, appVersion WHERE + appMaintainers.queued = '?' + AND + appMaintainers.versionId = appVersion.versionId + AND + appMaintainers.superMaintainer = '0' + AND + appVersion.queued = 'false')$sLimit"; if($bQueued) { if($_SESSION['current']->hasPriv("admin")) - return query_parameters($sQuery, $bQueued ? "true" : "false"); - else + { + if($sLimit) + { + return query_parameters($sQuery, $bQueued ? "true" : "false", + $bQueued ? "true" : "false", + $iStart, $iRows); + } else + { + return query_parameters($sQuery, $bQueued ? "true" : "false", + $bQueued ? "true" : "false"); + } + } else + { return NULL; + } } else { - return query_parameters($sQuery, $bQueued ? "true" : "false"); + if($sLimit) + { + return query_parameters($sQuery, $bQueued ? "true" : "false", + $bQueued ? "true" : "false", $iStart, $iRows); + } else + { + return query_parameters($sQuery, $bQueued ? "true" : "false", + $bQueued ? "true" : "false"); + } } } @@ -475,34 +505,33 @@ class maintainer /* Excluding requests for queued apps and versions, as these are handled automatically. One SELECT for super maintainers, one for maintainers. */ - $sQuery = "SELECT COUNT(DISTINCT maintainerId) as queued_maintainers FROM - appMaintainers, appFamily, appVersion WHERE - appMaintainers.queued = '?' - AND - appFamily.appId = appVersion.appId - AND - ( - ( - appFamily.appId = appMaintainers.appId - AND - appFamily.queued = 'false' - AND - appMaintainers.versionId = '' - ) - OR - ( - appVersion.versionId = appMaintainers.versionId - AND - appVersion.queued = 'false' - ) - )"; + $sQuery = "(SELECT COUNT(DISTINCT maintainerId) as count FROM + appMaintainers, appFamily WHERE + appMaintainers.queued = '?' + AND + appMaintainers.superMaintainer = '1' + AND + appFamily.appId = appMaintainers.appId + AND + appFamily.queued = 'false') UNION + (SELECT COUNT(DISTINCT maintainerId) as count FROM + appMaintainers, appVersion WHERE + appMaintainers.queued = '?' + AND + appMaintainers.versionId = appVersion.versionId + AND + appMaintainers.superMaintainer = '0' + AND + appVersion.queued = 'false')"; - if(!($hResult = query_parameters($sQuery, $bQueued ? "true" : "false"))) + if(!($hResult = query_parameters($sQuery, $bQueued ? "true" : "false", + $bQueued ? "true" : "false"))) return FALSE; - $oRow = mysql_fetch_object($hResult); + for($iCount = 0; $oRow = mysql_fetch_object($hResult);) + $iCount += $oRow->count; - return $oRow->queued_maintainers; + return $iCount; } /* see how many maintainer entries we have in the database */ @@ -782,6 +811,13 @@ class maintainer return TRUE; } + function objectGetItemsPerPage($bQueued = false) + { + $aItemsPerPage = array(25, 50, 100, 200); + $iDefaultPerPage = 25; + return array($aItemsPerPage, $iDefaultPerPage); + } + function update() { /* STUB: No updating possible at the moment */

1 0

appdb/ include/user.php unit_test/test_user.ph ...
by WineHQ 26 Jul '07

26 Jul '07

ChangeSet ID: 31279 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/26 09:39:15 Modified files: include : user.php unit_test : test_user.php Added files: unit_test : test_user_password_migration.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add support for mysql versions >=4.0x by adding multiple hash attempts when logging in. We now attempt sha1(), password() and if mysql >= 4.0x, old_password() hashes. Switch the default user hash from mysql's password() function to a sha1() hash. Update user::login() to flag logins with password() and old_password() hashes. If the flag is set we call user::update_password() to update the users password hash to one generated from the sha1 of the users password. Add a unit test to test logging in and upgrading from the old hashes. Patch: http://cvs.winehq.org/patch.py?id=31279 Old revision New revision Changes Path 1.94 1.95 +57 -6 appdb/include/user.php 1.11 1.12 +4 -1 appdb/unit_test/test_user.php Added 1.1 +0 -0 appdb/unit_test/test_user_password_migration.php

1 0

appdb/unit_test test_common.php
by WineHQ 26 Jul '07

26 Jul '07

ChangeSet ID: 31278 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/26 09:30:32 Modified files: unit_test : test_common.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Remove explicit user::login() call from create_and_login_user() since user::create() calls user::login() if the user creation is successful Patch: http://cvs.winehq.org/patch.py?id=31278 Old revision New revision Changes Path 1.3 1.4 +3 -9 appdb/unit_test/test_common.php Index: appdb/unit_test/test_common.php diff -u -p appdb/unit_test/test_common.php:1.3 appdb/unit_test/test_common.php:1.4 --- appdb/unit_test/test_common.php:1.3 26 Jul 2007 14:30:32 -0000 +++ appdb/unit_test/test_common.php 26 Jul 2007 14:30:32 -0000 @@ -55,7 +55,9 @@ function create_and_login_user($sTestEma $oUser = new User(); } - /* create the user */ + // create the user + // NOTE: user::create() will call user::login() to login the user + // if the user creation is successful $retval = $oUser->create($sTestEmail, $sTestPassword, "Test user", "20051020"); if($retval != SUCCESS) { @@ -69,14 +71,6 @@ function create_and_login_user($sTestEma return false; } - /* login the user */ - $retval = $oUser->login($sTestEmail, $sTestPassword); - if($retval != SUCCESS) - { - error("Got '".$retval."' instead of SUCCESS(".SUCCESS.")"); - return false; - } - return $oUser; }

1 0

Evan Stade : gdiplus/tests: Added pen dash array tests.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: a8fd94b126f38283d65bf0c88493ef4a3f0837d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8fd94b126f38283d65bf0c88… Author: Evan Stade <estade(a)gmail.com> Date: Wed Jul 25 19:15:43 2007 -0700 gdiplus/tests: Added pen dash array tests. --- dlls/gdiplus/tests/pen.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 0238aac..5221423 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -19,12 +19,14 @@ */ #include <stdarg.h> +#include <math.h> #include "windef.h" #include "gdiplus.h" #include "wine/test.h" #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +#define expectf(expected, got) ok(fabs(got - expected) < 0.1, "Expected %.2f, got %.2f\n", expected, got) static void test_startup(void) { @@ -116,6 +118,71 @@ static void test_brushfill(void) GdipDeletePen(pen); } +static void test_dasharray(void) +{ + GpPen *pen; + GpDashStyle style; + GpStatus status; + REAL dashes[12]; + + GdipCreatePen1(0xdeadbeef, 10.0, UnitWorld, &pen); + dashes[0] = 10.0; + dashes[1] = 11.0; + dashes[2] = 12.0; + dashes[3] = 13.0; + dashes[4] = 14.0; + dashes[5] = -100.0; + dashes[6] = -100.0; + + /* setting the array sets the type to custom */ + GdipGetPenDashStyle(pen, &style); + expect(DashStyleSolid, style); + status = GdipSetPenDashArray(pen, dashes, 2); + expect(Ok, status); + GdipGetPenDashStyle(pen, &style); + expect(DashStyleCustom, style); + + /* Getting the array on a non-custom pen returns invalid parameter (unless + * you are getting 0 elements).*/ + GdipSetPenDashStyle(pen, DashStyleSolid); + status = GdipGetPenDashArray(pen, &dashes[5], 2); + expect(InvalidParameter, status); + status = GdipGetPenDashArray(pen, &dashes[5], 0); + expect(Ok, status); + + /* What does setting DashStyleCustom do to the array length? */ + GdipSetPenDashArray(pen, dashes, 2); + GdipSetPenDashStyle(pen, DashStyleCustom); + status = GdipGetPenDashArray(pen, &dashes[5], 2); + expect(Ok, status); + expectf(10.0, dashes[5]); + expectf(11.0, dashes[6]); + + /* Set the array, then get with different sized buffers. */ + status = GdipSetPenDashArray(pen, dashes, 5); + expect(Ok, status); + dashes[5] = -100.0; + dashes[6] = -100.0; + status = GdipGetPenDashArray(pen, &dashes[5], 1); + expect(Ok, status); /* not InsufficientBuffer! */ + expectf(10.0, dashes[5]); + expectf(-100.0, dashes[6]); + dashes[5] = -100.0; + status = GdipGetPenDashArray(pen, &dashes[5], 6); + expect(InvalidParameter, status); /* not Ok! */ + expectf(-100.0, dashes[5]); + expectf(-100.0, dashes[6]); + + /* Try to set with count = 0. */ + GdipSetPenDashStyle(pen, DashStyleDot); + status = GdipSetPenDashArray(pen, dashes, 0); + expect(OutOfMemory, status); + GdipGetPenDashStyle(pen, &style); + expect(DashStyleDot, style); + + GdipDeletePen(pen); +} + START_TEST(pen) { struct GdiplusStartupInput gdiplusStartupInput; @@ -132,6 +199,7 @@ START_TEST(pen) test_constructor_destructor(); test_brushfill(); + test_dasharray(); GdiplusShutdown(gdiplusToken); }

1 0

Evan Stade : gdiplus: Fix arc2polybezier.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: a4f238a1172a84898943353f4f7ab91b7ef9a6fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4f238a1172a84898943353f4… Author: Evan Stade <estade(a)gmail.com> Date: Wed Jul 25 19:15:33 2007 -0700 gdiplus: Fix arc2polybezier. --- dlls/gdiplus/gdiplus.c | 4 ++-- dlls/gdiplus/tests/graphicspath.c | 33 ++++++++++++++++----------------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index ee1c49b..80a4b9c 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -151,10 +151,10 @@ static void unstretch_angle(REAL * angle, REAL rad_x, REAL rad_y) *angle = deg2rad(*angle); - if(cos(*angle) == 0 || sin(*angle) == 0) + if(fabs(cos(*angle)) < 0.00001 || fabs(sin(*angle)) < 0.00001) return; - stretched = gdiplus_atan2(sin(*angle) / rad_y, cos(*angle) / rad_x); + stretched = gdiplus_atan2(sin(*angle) / fabs(rad_y), cos(*angle) / fabs(rad_x)); revs_off = roundr(*angle / (2.0 * M_PI)) - roundr(stretched / (2.0 * M_PI)); stretched += ((REAL)revs_off) * M_PI * 2.0; *angle = stretched; diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 3078980..5896fcd 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -448,20 +448,20 @@ static path_test_t ellipse_path[] = { {30.00, 111.30, PathPointTypeBezier, 0, 0}, /*11*/ {30.00, 125.25, PathPointTypeBezier | PathPointTypeCloseSubpath, 0, 0}, /*12*/ {7.00, 11.00, PathPointTypeStart, 0, 0}, /*13*/ - {13.00, 17.00, PathPointTypeLine, 0, 1}, /*14*/ - {5.00, 195.00, PathPointTypeStart, 0, 1}, /*15*/ - {5.00, 192.24, PathPointTypeBezier, 0, 1}, /*16*/ - {6.12, 190.00, PathPointTypeBezier, 0, 1}, /*17*/ - {7.50, 190.00, PathPointTypeBezier, 0, 1}, /*18*/ - {8.88, 190.00, PathPointTypeBezier, 0, 1}, /*19*/ - {10.00, 192.24, PathPointTypeBezier, 0, 1}, /*20*/ - {10.00, 195.00, PathPointTypeBezier, 0, 1}, /*21*/ - {10.00, 197.76, PathPointTypeBezier, 0, 1}, /*22*/ - {8.88, 200.00, PathPointTypeBezier, 0, 1}, /*23*/ - {7.50, 200.00, PathPointTypeBezier, 0, 1}, /*24*/ - {6.12, 200.00, PathPointTypeBezier, 0, 1}, /*25*/ - {5.00, 197.76, PathPointTypeBezier, 0, 1}, /*26*/ - {5.00, 195.00, PathPointTypeBezier | PathPointTypeCloseSubpath, 0, 1}, /*27*/ + {13.00, 17.00, PathPointTypeLine, 0, 0}, /*14*/ + {5.00, 195.00, PathPointTypeStart, 0, 0}, /*15*/ + {5.00, 192.24, PathPointTypeBezier, 0, 0}, /*16*/ + {6.12, 190.00, PathPointTypeBezier, 0, 0}, /*17*/ + {7.50, 190.00, PathPointTypeBezier, 0, 0}, /*18*/ + {8.88, 190.00, PathPointTypeBezier, 0, 0}, /*19*/ + {10.00, 192.24, PathPointTypeBezier, 0, 0}, /*20*/ + {10.00, 195.00, PathPointTypeBezier, 0, 0}, /*21*/ + {10.00, 197.76, PathPointTypeBezier, 0, 0}, /*22*/ + {8.88, 200.00, PathPointTypeBezier, 0, 0}, /*23*/ + {7.50, 200.00, PathPointTypeBezier, 0, 0}, /*24*/ + {6.12, 200.00, PathPointTypeBezier, 0, 0}, /*25*/ + {5.00, 197.76, PathPointTypeBezier, 0, 0}, /*26*/ + {5.00, 195.00, PathPointTypeBezier | PathPointTypeCloseSubpath, 0, 0}, /*27*/ {10.00, 300.50, PathPointTypeStart, 0, 0}, /*28*/ {10.00, 300.78, PathPointTypeBezier, 0, 0}, /*29*/ {10.00, 301.00, PathPointTypeBezier, 0, 0}, /*30*/ @@ -493,13 +493,12 @@ static void test_ellipse(void) expect(Ok, status); GdipAddPathLine2(path, points, 2); status = GdipAddPathEllipse(path, 10.0, 200.0, -5.0, -10.0); - todo_wine - expect(Ok, status); + expect(Ok, status); GdipClosePathFigure(path); status = GdipAddPathEllipse(path, 10.0, 300.0, 0.0, 1.0); expect(Ok, status); - ok_path(path, ellipse_path, sizeof(ellipse_path)/sizeof(path_test_t), TRUE); + ok_path(path, ellipse_path, sizeof(ellipse_path)/sizeof(path_test_t), FALSE); GdipDeletePath(path); }

1 0

Evan Stade : gdiplus: Added GdipSetPenDashArray/GdipGetPenDashArray.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: 51bd0af43ed168709b8ad489f90075e846d846b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51bd0af43ed168709b8ad489f… Author: Evan Stade <estade(a)gmail.com> Date: Wed Jul 25 19:15:38 2007 -0700 gdiplus: Added GdipSetPenDashArray/GdipGetPenDashArray. --- dlls/gdiplus/gdiplus.spec | 4 +- dlls/gdiplus/gdiplus_private.h | 2 + dlls/gdiplus/pen.c | 44 ++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 + 4 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 02b1e18..cf08c90 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -338,7 +338,7 @@ @ stub GdipGetPenCompoundCount @ stub GdipGetPenCustomEndCap @ stub GdipGetPenCustomStartCap -@ stub GdipGetPenDashArray +@ stdcall GdipGetPenDashArray(ptr ptr long) @ stub GdipGetPenDashCap197819 @ stub GdipGetPenDashCount @ stub GdipGetPenDashOffset @@ -546,7 +546,7 @@ @ stub GdipSetPenCompoundArray @ stdcall GdipSetPenCustomEndCap(ptr ptr) @ stdcall GdipSetPenCustomStartCap(ptr ptr) -@ stub GdipSetPenDashArray +@ stdcall GdipSetPenDashArray(ptr ptr long) @ stub GdipSetPenDashCap197819 @ stub GdipSetPenDashOffset @ stdcall GdipSetPenDashStyle(ptr long) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 79800c2..f20ea3d 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -54,6 +54,8 @@ struct GpPen{ GpLineJoin join; REAL miterlimit; GpDashStyle dash; + REAL *dashes; + INT numdashes; GpBrush *brush; }; diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 3026d52..e582f76 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -123,6 +123,7 @@ GpStatus WINGDIPAPI GdipDeletePen(GpPen *pen) GdipDeleteBrush(pen->brush); GdipDeleteCustomLineCap(pen->customstart); GdipDeleteCustomLineCap(pen->customend); + GdipFree(pen->dashes); GdipFree(pen); return Ok; @@ -147,6 +148,20 @@ GpStatus WINGDIPAPI GdipGetPenColor(GpPen *pen, ARGB *argb) return GdipGetSolidFillColor(((GpSolidFill*)pen->brush), argb); } +GpStatus WINGDIPAPI GdipGetPenDashArray(GpPen *pen, REAL *dash, INT count) +{ + if(!pen || !dash || count > pen->numdashes) + return InvalidParameter; + + /* note: if you pass a negative value for count, it crashes native gdiplus. */ + if(count < 0) + return GenericError; + + memcpy(dash, pen->dashes, count * sizeof(REAL)); + + return Ok; +} + GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen *pen, GpDashStyle *dash) { if(!pen || !dash) @@ -209,11 +224,40 @@ GpStatus WINGDIPAPI GdipSetPenCustomStartCap(GpPen *pen, GpCustomLineCap* custom return ret; } +GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen *pen, GDIPCONST REAL *dash, + INT count) +{ + if(!pen || !dash) + return InvalidParameter; + + GdipFree(pen->dashes); + pen->dashes = NULL; + + if(count > 0) + pen->dashes = GdipAlloc(count * sizeof(REAL)); + if(!pen->dashes){ + pen->numdashes = 0; + return OutOfMemory; + } + + pen->dash = DashStyleCustom; + memcpy(pen->dashes, dash, count * sizeof(REAL)); + pen->numdashes = count; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetPenDashStyle(GpPen *pen, GpDashStyle dash) { if(!pen) return InvalidParameter; + if(dash != DashStyleCustom){ + GdipFree(pen->dashes); + pen->dashes = NULL; + pen->numdashes = 0; + } + pen->dash = dash; pen->style &= ~(PS_ALTERNATE | PS_SOLID | PS_DASH | PS_DOT | PS_DASHDOT | PS_DASHDOTDOT | PS_NULL | PS_USERSTYLE | PS_INSIDEFRAME); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index d56c45c..eabdbfb 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -32,11 +32,13 @@ GpStatus WINGDIPAPI GdipCreatePen1(ARGB,REAL,GpUnit,GpPen**); GpStatus WINGDIPAPI GdipDeletePen(GpPen*); GpStatus WINGDIPAPI GdipGetPenBrushFill(GpPen*,GpBrush**); GpStatus WINGDIPAPI GdipGetPenColor(GpPen*,ARGB*); +GpStatus WINGDIPAPI GdipGetPenDashArray(GpPen*,REAL*,INT); GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen*,GpDashStyle*); GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen*,GpBrush*); GpStatus WINGDIPAPI GdipSetPenColor(GpPen*,ARGB); GpStatus WINGDIPAPI GdipSetPenCustomEndCap(GpPen*,GpCustomLineCap*); GpStatus WINGDIPAPI GdipSetPenCustomStartCap(GpPen*,GpCustomLineCap*); +GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen*,GDIPCONST REAL*,INT); GpStatus WINGDIPAPI GdipSetPenDashStyle(GpPen*,GpDashStyle); GpStatus WINGDIPAPI GdipSetPenEndCap(GpPen*,GpLineCap); GpStatus WINGDIPAPI GdipSetPenLineCap197819(GpPen*,GpLineCap,GpLineCap,GpDashCap);

1 0

Evan Stade : gdiplus: Added GdipAddPathEllipse.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: fe2ce3a08b61f5629181148e53d4ec39b58ced1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe2ce3a08b61f5629181148e5… Author: Evan Stade <estade(a)gmail.com> Date: Wed Jul 25 19:15:24 2007 -0700 gdiplus: Added GdipAddPathEllipse. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 30 ++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 74ba047..02b1e18 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -14,7 +14,7 @@ @ stub GdipAddPathCurve3I @ stub GdipAddPathCurve @ stub GdipAddPathCurveI -@ stub GdipAddPathEllipse +@ stdcall GdipAddPathEllipse(ptr long long long long) @ stub GdipAddPathEllipseI @ stdcall GdipAddPathLine2(ptr ptr long) @ stub GdipAddPathLine2I diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index d059482..4fe99e0 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -121,6 +121,36 @@ GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath *path, GDIPCONST GpPointF *points, return Ok; } +GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath *path, REAL x, REAL y, REAL width, + REAL height) +{ + INT old_count, numpts; + + if(!path) + return InvalidParameter; + + if(!lengthen_path(path, MAX_ARC_PTS)) + return OutOfMemory; + + old_count = path->pathdata.Count; + if((numpts = arc2polybezier(&path->pathdata.Points[old_count], x, y, width, + height, 0.0, 360.0)) != MAX_ARC_PTS){ + ERR("expected %d points but got %d\n", MAX_ARC_PTS, numpts); + return GenericError; + } + + memset(&path->pathdata.Types[old_count + 1], PathPointTypeBezier, + MAX_ARC_PTS - 1); + + /* An ellipse is an instrinsic figure (always its own subpath). */ + path->pathdata.Types[old_count] = PathPointTypeStart; + path->pathdata.Types[old_count + MAX_ARC_PTS - 1] |= PathPointTypeCloseSubpath; + path->newfigure = TRUE; + path->pathdata.Count += MAX_ARC_PTS; + + return Ok; +} + GpStatus WINGDIPAPI GdipAddPathLine2(GpPath *path, GDIPCONST GpPointF *points, INT count) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 816f32d..d56c45c 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -89,6 +89,7 @@ GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill*,ARGB); GpStatus WINGDIPAPI GdipAddPathArc(GpPath*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath*,GDIPCONST GpPointF*,INT); +GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathLine2(GpPath*,GDIPCONST GpPointF*,INT); GpStatus WINGDIPAPI GdipAddPathPath(GpPath*,GDIPCONST GpPath*,BOOL); GpStatus WINGDIPAPI GdipClosePathFigure(GpPath*);

1 0

Evan Stade : gdiplus: Fix memory leak.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: f52adfd0dea44dcdea0e87b624f9fdf7970d889c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f52adfd0dea44dcdea0e87b62… Author: Evan Stade <estade(a)gmail.com> Date: Wed Jul 25 19:15:20 2007 -0700 gdiplus: Fix memory leak. --- dlls/gdiplus/graphics.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f53ea4c..3836476 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -154,6 +154,7 @@ static void transform_and_round_points(GpGraphics *graphics, POINT *pti, GdipCloneMatrix(graphics->worldtrans, &matrix); GdipScaleMatrix(matrix, unitscale, unitscale, MatrixOrderAppend); GdipTransformMatrixPoints(matrix, ptf, count); + GdipDeleteMatrix(matrix); for(i = 0; i < count; i++){ pti[i].x = roundr(ptf[i].X);

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
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