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

Rob Shearman : ntdll: The impersonation level in NtDuplicateToken should be taken from the SecurityQualityOfService member of ObjectAttributes if present .
by Alexandre Julliard 13 Jul '07

13 Jul '07

Module: wine Branch: master Commit: 1cd222b451627e2a3dab50c91eac52994a103428 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd222b451627e2a3dab50c91… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jul 12 15:32:00 2007 +0100 ntdll: The impersonation level in NtDuplicateToken should be taken from the SecurityQualityOfService member of ObjectAttributes if present. --- dlls/ntdll/nt.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index a303dcf..27a18ef 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -61,6 +61,16 @@ NTSTATUS WINAPI NtDuplicateToken( ImpersonationLevel, TokenType, NewToken); dump_ObjectAttributes(ObjectAttributes); + if (ObjectAttributes && ObjectAttributes->SecurityQualityOfService) + { + SECURITY_QUALITY_OF_SERVICE *SecurityQOS = ObjectAttributes->SecurityQualityOfService; + TRACE("ObjectAttributes->SecurityQualityOfService = {%d, %d, %d, %s}\n", + SecurityQOS->Length, SecurityQOS->ImpersonationLevel, + SecurityQOS->ContextTrackingMode, + SecurityQOS->EffectiveOnly ? "TRUE" : "FALSE"); + ImpersonationLevel = SecurityQOS->ImpersonationLevel; + } + SERVER_START_REQ( duplicate_token ) { req->handle = ExistingToken;

1 0

Rob Shearman : rpcrt4: Make binding to an interface a function of RpcAssoc instead of
by Alexandre Julliard 13 Jul '07

13 Jul '07

Module: wine Branch: master Commit: c6dc14d81b7cb7c1d81868382122eca56009c673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6dc14d81b7cb7c1d81868382… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jul 12 15:32:43 2007 +0100 rpcrt4: Make binding to an interface a function of RpcAssoc instead of binding handles, since binding requires information from the association and not from the binding handle. --- dlls/rpcrt4/rpc_binding.c | 82 ++------------------------------------ dlls/rpcrt4/rpc_binding.h | 2 +- dlls/rpcrt4/rpc_transport.c | 92 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 96 insertions(+), 80 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 79eceda..db30be6 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -277,93 +277,21 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding* Binding, RpcConnection** Connection, PRPC_SYNTAX_IDENTIFIER TransferSyntax, PRPC_SYNTAX_IDENTIFIER InterfaceId) { - RpcConnection* NewConnection; - RPC_STATUS status; - TRACE("(Binding == ^%p)\n", Binding); if (!Binding->server) { - /* try to find a compatible connection from the connection pool */ - NewConnection = RpcAssoc_GetIdleConnection(Binding->Assoc, InterfaceId, - TransferSyntax, Binding->AuthInfo, Binding->QOS); - if (NewConnection) { - *Connection = NewConnection; - return RPC_S_OK; - } + return RpcAssoc_GetClientConnection(Binding->Assoc, InterfaceId, + TransferSyntax, Binding->AuthInfo, Binding->QOS, Connection); } else { /* we already have a connection with acceptable binding, so use it */ if (Binding->FromConn) { *Connection = Binding->FromConn; return RPC_S_OK; + } else { + ERR("no connection in binding\n"); + return RPC_S_INTERNAL_ERROR; } } - - /* create a new connection */ - status = RPCRT4_CreateConnection(&NewConnection, Binding->server, - Binding->Protseq, Binding->NetworkAddr, - Binding->Endpoint, Binding->NetworkOptions, - Binding->AuthInfo, Binding->QOS); - if (status != RPC_S_OK) - return status; - - status = RPCRT4_OpenClientConnection(NewConnection); - if (status != RPC_S_OK) - { - RPCRT4_DestroyConnection(NewConnection); - return status; - } - - /* we need to send a binding packet if we are client. */ - if (!NewConnection->server) { - RpcPktHdr *hdr; - RpcPktHdr *response_hdr; - RPC_MESSAGE msg; - - TRACE("sending bind request to server\n"); - - hdr = RPCRT4_BuildBindHeader(NDR_LOCAL_DATA_REPRESENTATION, - RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, - Binding->Assoc->assoc_group_id, - InterfaceId, TransferSyntax); - - status = RPCRT4_Send(NewConnection, hdr, NULL, 0); - RPCRT4_FreeHeader(hdr); - if (status != RPC_S_OK) { - RPCRT4_DestroyConnection(NewConnection); - return status; - } - - status = RPCRT4_Receive(NewConnection, &response_hdr, &msg); - if (status != RPC_S_OK) { - ERR("receive failed\n"); - RPCRT4_DestroyConnection(NewConnection); - return status; - } - - if (response_hdr->common.ptype != PKT_BIND_ACK || - response_hdr->bind_ack.max_tsize < RPC_MIN_PACKET_SIZE) { - ERR("failed to bind for interface %s, %d.%d\n", - debugstr_guid(&InterfaceId->SyntaxGUID), - InterfaceId->SyntaxVersion.MajorVersion, - InterfaceId->SyntaxVersion.MinorVersion); - RPCRT4_FreeHeader(response_hdr); - RPCRT4_DestroyConnection(NewConnection); - return RPC_S_PROTOCOL_ERROR; - } - - /* FIXME: do more checks? */ - - NewConnection->MaxTransmissionSize = response_hdr->bind_ack.max_tsize; - NewConnection->assoc_group_id = response_hdr->bind_ack.assoc_gid; - NewConnection->ActiveInterface = *InterfaceId; - RPCRT4_FreeHeader(response_hdr); - } - - if (Binding->server) - Binding->FromConn = NewConnection; - *Connection = NewConnection; - - return RPC_S_OK; } RPC_STATUS RPCRT4_CloseBinding(RpcBinding* Binding, RpcConnection* Connection) diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index 58f2d06..5113b27 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -146,7 +146,7 @@ ULONG RpcQualityOfService_Release(RpcQualityOfService *qos); BOOL RpcQualityOfService_IsEqual(const RpcQualityOfService *qos1, const RpcQualityOfService *qos2); RPC_STATUS RPCRT4_GetAssociation(LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, RpcAssoc **assoc); -RpcConnection *RpcAssoc_GetIdleConnection(RpcAssoc *assoc, const RPC_SYNTAX_IDENTIFIER *InterfaceId, const RPC_SYNTAX_IDENTIFIER *TransferSyntax, const RpcAuthInfo *AuthInfo, const RpcQualityOfService *QOS); +RPC_STATUS RpcAssoc_GetClientConnection(RpcAssoc *assoc, const RPC_SYNTAX_IDENTIFIER *InterfaceId, const RPC_SYNTAX_IDENTIFIER *TransferSyntax, RpcAuthInfo *AuthInfo, RpcQualityOfService *QOS, RpcConnection **Connection); void RpcAssoc_ReleaseIdleConnection(RpcAssoc *assoc, RpcConnection *Connection); ULONG RpcAssoc_Release(RpcAssoc *assoc); diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 2bb891d..413bcbb 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1473,15 +1473,63 @@ ULONG RpcAssoc_Release(RpcAssoc *assoc) return refs; } -RpcConnection *RpcAssoc_GetIdleConnection(RpcAssoc *assoc, +static RPC_STATUS RpcAssoc_BindConnection(RpcAssoc *assoc, RpcConnection *conn, + const RPC_SYNTAX_IDENTIFIER *InterfaceId, + const RPC_SYNTAX_IDENTIFIER *TransferSyntax) +{ + RpcPktHdr *hdr; + RpcPktHdr *response_hdr; + RPC_MESSAGE msg; + RPC_STATUS status; + + TRACE("sending bind request to server\n"); + + hdr = RPCRT4_BuildBindHeader(NDR_LOCAL_DATA_REPRESENTATION, + RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, + assoc->assoc_group_id, + InterfaceId, TransferSyntax); + + status = RPCRT4_Send(conn, hdr, NULL, 0); + RPCRT4_FreeHeader(hdr); + if (status != RPC_S_OK) + return status; + + status = RPCRT4_Receive(conn, &response_hdr, &msg); + if (status != RPC_S_OK) + { + ERR("receive failed\n"); + return status; + } + + if (response_hdr->common.ptype != PKT_BIND_ACK) + { + ERR("failed to bind for interface %s, %d.%d\n", + debugstr_guid(&InterfaceId->SyntaxGUID), + InterfaceId->SyntaxVersion.MajorVersion, + InterfaceId->SyntaxVersion.MinorVersion); + RPCRT4_FreeHeader(response_hdr); + return RPC_S_PROTOCOL_ERROR; + } + + /* FIXME: do more checks? */ + + conn->assoc_group_id = response_hdr->bind_ack.assoc_gid; + conn->MaxTransmissionSize = response_hdr->bind_ack.max_tsize; + conn->ActiveInterface = *InterfaceId; + RPCRT4_FreeHeader(response_hdr); + return RPC_S_OK; +} + +static RpcConnection *RpcAssoc_GetIdleConnection(RpcAssoc *assoc, const RPC_SYNTAX_IDENTIFIER *InterfaceId, const RPC_SYNTAX_IDENTIFIER *TransferSyntax, const RpcAuthInfo *AuthInfo, const RpcQualityOfService *QOS) { RpcConnection *Connection; - /* try to find a compatible connection from the connection pool */ EnterCriticalSection(&assoc->cs); + /* try to find a compatible connection from the connection pool */ LIST_FOR_EACH_ENTRY(Connection, &assoc->connection_pool, RpcConnection, conn_pool_entry) + { if (!memcmp(&Connection->ActiveInterface, InterfaceId, sizeof(RPC_SYNTAX_IDENTIFIER)) && RpcAuthInfo_IsEqual(Connection->AuthInfo, AuthInfo) && @@ -1492,11 +1540,51 @@ RpcConnection *RpcAssoc_GetIdleConnection(RpcAssoc *assoc, TRACE("got connection from pool %p\n", Connection); return Connection; } + } LeaveCriticalSection(&assoc->cs); return NULL; } +RPC_STATUS RpcAssoc_GetClientConnection(RpcAssoc *assoc, + const RPC_SYNTAX_IDENTIFIER *InterfaceId, + const RPC_SYNTAX_IDENTIFIER *TransferSyntax, RpcAuthInfo *AuthInfo, + RpcQualityOfService *QOS, RpcConnection **Connection) +{ + RpcConnection *NewConnection; + RPC_STATUS status; + + *Connection = RpcAssoc_GetIdleConnection(assoc, InterfaceId, TransferSyntax, AuthInfo, QOS); + if (*Connection) + return RPC_S_OK; + + /* create a new connection */ + status = RPCRT4_CreateConnection(&NewConnection, FALSE /* is this a server connection? */, + assoc->Protseq, assoc->NetworkAddr, + assoc->Endpoint, assoc->NetworkOptions, + AuthInfo, QOS); + if (status != RPC_S_OK) + return status; + + status = RPCRT4_OpenClientConnection(NewConnection); + if (status != RPC_S_OK) + { + RPCRT4_DestroyConnection(NewConnection); + return status; + } + + status = RpcAssoc_BindConnection(assoc, NewConnection, InterfaceId, TransferSyntax); + if (status != RPC_S_OK) + { + RPCRT4_DestroyConnection(NewConnection); + return status; + } + + *Connection = NewConnection; + + return RPC_S_OK; +} + void RpcAssoc_ReleaseIdleConnection(RpcAssoc *assoc, RpcConnection *Connection) { assert(!Connection->server);

1 0

Alexandre Julliard : user32: Check both A and W proc for previously allocated winprocs.
by Alexandre Julliard 13 Jul '07

13 Jul '07

Module: wine Branch: master Commit: cc90b25aef7ec8a357733c98b2e56105a1ee26e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc90b25aef7ec8a357733c98b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 12 15:45:00 2007 +0200 user32: Check both A and W proc for previously allocated winprocs. Some apps get a winproc as A and then set it again as W. --- dlls/user32/winproc.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 59d432d..c6e49f2 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -98,8 +98,9 @@ static inline WINDOWPROC *find_winproc( WNDPROC funcA, WNDPROC funcW ) for (i = 0; i < winproc_used; i++) { - if (funcA && winproc_array[i].procA != funcA) continue; - if (funcW && winproc_array[i].procW != funcW) continue; + /* match either proc, some apps confuse A and W */ + if (funcA && winproc_array[i].procA != funcA && winproc_array[i].procW != funcA) continue; + if (funcW && winproc_array[i].procA != funcW && winproc_array[i].procW != funcW) continue; return &winproc_array[i]; } return NULL;

1 0

Alexandre Julliard : user32: Allocate a dual A/W winproc for DefWindowProc.
by Alexandre Julliard 13 Jul '07

13 Jul '07

Module: wine Branch: master Commit: 4688389d74ec1a6c5750589ec27419c70b82f968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4688389d74ec1a6c5750589ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 12 15:45:19 2007 +0200 user32: Allocate a dual A/W winproc for DefWindowProc. --- dlls/user32/class.c | 3 +++ dlls/user32/tests/class.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index c682812..4f6c7b5 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -416,6 +416,9 @@ void CLASS_RegisterBuiltinClasses(void) register_builtin( &MENU_builtin_class ); register_builtin( &SCROLL_builtin_class ); register_builtin( &STATIC_builtin_class ); + + /* the DefWindowProc winprocs are magic too */ + WINPROC_AllocProc( DefWindowProcA, DefWindowProcW ); } diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index bd1cde6..2af4c2b 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -602,7 +602,7 @@ static void test_defwndproc() (void *)GetClassLongPtrA(hwnd, GCLP_WNDPROC), pDefWindowProcA); } else - todo_wine { + { ok(GetWindowLongPtrA(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", (void *)GetWindowLongPtrA(hwnd, GWLP_WNDPROC), pDefWindowProcA); ok(GetClassLongPtrA(hwnd, GCLP_WNDPROC) == (ULONG_PTR)pDefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", @@ -617,7 +617,7 @@ static void test_defwndproc() (void *)GetClassLongPtrW(hwnd, GCLP_WNDPROC), pDefWindowProcW); } else - todo_wine { + { ok(GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", (void *)GetWindowLongPtrW(hwnd, GWLP_WNDPROC), pDefWindowProcW); ok(GetClassLongPtrW(hwnd, GCLP_WNDPROC) == (ULONG_PTR)pDefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n",

1 0

appdb/ ./apidb.css include/html.php include/ut ...
by WineHQ 13 Jul '07

13 Jul '07

ChangeSet ID: 31250 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/12 18:58:01 Modified files: . : apidb.css include : html.php util.php version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Color versions when displaying the version table on the application page. Add dynamic highlighting and the ability to click on the row in the version table. Patch: http://cvs.winehq.org/patch.py?id=31250 Old revision New revision Changes Path 1.22 1.23 +1 -2 appdb/apidb.css 1.13 1.14 +2 -1 appdb/include/html.php 1.95 1.96 +75 -0 appdb/include/util.php 1.135 1.136 +33 -4 appdb/include/version.php Index: appdb/apidb.css diff -u -p appdb/apidb.css:1.22 appdb/apidb.css:1.23 --- appdb/apidb.css:1.22 12 Jul 2007 23:58: 1 -0000 +++ appdb/apidb.css 12 Jul 2007 23:58: 1 -0000 @@ -137,8 +137,7 @@ p.indent { padding-left: 1em; .gold { background-color: #fff600; } .silver { background-color: silver; } .bronze { background-color: #fcba0a; } -.Garbage { background-color: #999966; } - +.garbage { background-color: #999966; } /*******************************************************************/ /* The following styles are used exclusively in appdb */ Index: appdb/include/html.php diff -u -p appdb/include/html.php:1.13 appdb/include/html.php:1.14 --- appdb/include/html.php:1.13 12 Jul 2007 23:58: 1 -0000 +++ appdb/include/html.php 12 Jul 2007 23:58: 1 -0000 @@ -70,7 +70,8 @@ function html_tr($arr, $class = "", $ext } function html_tr_highlight_clickable($sUrl, $sClass, $sHighlightColor, $sInactiveColor, - $sTextDecorationHighlight = "none", $sTextDecorationInactive = "none") + $sTextDecorationHighlight = "none", + $sTextDecorationInactive = "none") { echo '<tr class='.$sClass.' '. 'onmouseover="ChangeTr(this, true, \''.$sHighlightColor.'\', \''.$sInactiveColor.'\', \''.$sTextDecorationHighlight.'\', \''.$sTextDecorationInactive.'\');"'. Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.95 appdb/include/util.php:1.96 --- appdb/include/util.php:1.95 12 Jul 2007 23:58: 1 -0000 +++ appdb/include/util.php 12 Jul 2007 23:58: 1 -0000 @@ -936,4 +936,79 @@ function login_url() return $sLoginUrl; } +// representation of an html color value +class color +{ + var $iRed; + var $iGreen; + var $iBlue; + + function color($iRed = 0, $iGreen = 0, $iBlue = 0) + { + $this->iRed = $iRed; + $this->iGreen = $iGreen; + $this->iBlue = $iBlue; + } + + function setColorByName($sColorName) + { + switch($sColorName) + { + case "Platinum": + $this->iRed = 0xEC; + $this->iGreen = 0xEC; + $this->iBlue = 0xEC; + break; + case "Gold": + $this->iRed = 0xFF; + $this->iGreen = 0xF6; + $this->iBlue = 0x00; + break; + case "Silver": + $this->iRed = 0xC0; + $this->iGreen = 0xC0; + $this->iBlue = 0xC0; + break; + case "Bronze": + $this->iRed = 0xFC; + $this->iGreen = 0xBA; + $this->iBlue = 0x0A; + break; + case "Garbage": + $this->iRed = 0x99; + $this->iGreen = 0x96; + $this->iBlue = 0x66; + break; + default: + break; + } + } + + // convert the color value into a html rgb hex string + function getHexString() + { + return sprintf("#%02X%02X%02X", $this->iRed, $this->iGreen, $this->iBlue); + } + + // add $iAmount to each color value, maxing out at 0xFF, the largest + // color value allowed + function add($iAmount) + { + if($this->iRed + $iAmount > 0xFF) + $this->iRed = 0xFF; + else + $this->iRed += $iAmount; + + if($this->iGreen + $iAmount > 0xFF) + $this->iGreen = 0xFF; + else + $this->iGreen += $iAmount; + + if($this->iBlue + $iAmount > 0xFF) + $this->iBlue = 0xFF; + else + $this->iBlue += $iAmount; + } +}; + ?> Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.135 appdb/include/version.php:1.136 --- appdb/include/version.php:1.135 12 Jul 2007 23:58: 1 -0000 +++ appdb/include/version.php 12 Jul 2007 23:58: 1 -0000 @@ -1023,17 +1023,46 @@ class version { // set row color $bgcolor = ($c % 2 == 0) ? "color0" : "color1"; + // if we have a valid tested rating if($oVersion->sTestedRating && $oVersion->sTestedRating != "/") + { $sRatingColor = "class=\"$oVersion->sTestedRating\""; - else + $sClass = $oVersion->sTestedRating; + + $oColor = new Color(); + $oColor->setColorByName($oVersion->sTestedRating); + $sInactiveColor = $oColor->getHexString(); + + // increase the brightness of the color to create the + // value used for the highlight color + $oColor->add(50); + $sHighlightColor = $oColor->getHexString(); + } else + { $sRatingColor = "class=\"$bgcolor\""; + $sClass = $bgcolor; + + // convert color values to hex values for the row highlighting + if($bgcolor == "color0") + { + $sHighlightColor = "#E0E0E0"; + $sInactiveColor = $sHighlightColor; + } else + { + $sHighlightColor = "#C0C0C0"; + $sInactiveColor = $sHighlightColor; + } + } //display row - echo "<tr class=$bgcolor>\n"; + html_tr_highlight_clickable($oVersion->objectMakeUrl(), + $sClass, // class + $sHighlightColor, // highlight color + $sInactiveColor);// inactive color echo " <td>".$oVersion->objectMakeLink()."</td>\n"; echo " <td>".util_trim_description($oVersion->sDescription)."</td>\n"; - echo " <td $sRatingColor align=center>".$oVersion->sTestedRating."</td>\n"; - echo " <td $sRatingColor align=center>".$oVersion->sTestedRelease."</td>\n"; + echo " <td align=center>".$oVersion->sTestedRating."</td>\n"; + echo " <td align=center>".$oVersion->sTestedRelease."</td>\n"; echo " <td align=center>".testData::get_testdata_count_for_versionid($oVersion->iVersionId)."</td>\n"; echo " <td align=center>".Comment::get_comment_count_for_versionid($oVersion->iVersionId)."</td>\n"; echo "</tr>\n\n";

1 0

Evan Stade : gdiplus: Changed the way the direction of the endcap is calculated to make LineCapArrowAnchor direction match Windows better .
by Alexandre Julliard 12 Jul '07

12 Jul '07

Module: wine Branch: master Commit: 55d70e894cd70f69d313771e8f5dedd56cce4bc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55d70e894cd70f69d313771e8… Author: Evan Stade <estade(a)gmail.com> Date: Wed Jul 11 18:08:26 2007 -0700 gdiplus: Changed the way the direction of the endcap is calculated to make LineCapArrowAnchor direction match Windows better. --- dlls/gdiplus/graphics.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 93cbcd1..eb37995 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -384,8 +384,13 @@ static GpStatus draw_polybezier(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, if(pen->endcap == LineCapArrowAnchor) shorten_bezier_amt(ptf, pen->width); - draw_cap(hdc, pen->color, pen->endcap, pen->width, ptf[3].X, - ptf[3].Y, pt[count - 1].X, pt[count - 1].Y); + /* the direction of the line cap is parallel to the direction at the + * end of the bezier (which, if it has been shortened, is not the same + * as the direction from pt[count-2] to pt[count-1]) */ + draw_cap(hdc, pen->color, pen->endcap, pen->width, + pt[count - 1].X - (ptf[3].X - ptf[2].X), + pt[count - 1].Y - (ptf[3].Y - ptf[2].Y), + pt[count - 1].X, pt[count - 1].Y); } for(i = 0; i < count - 4; i ++){ @@ -474,8 +479,10 @@ static GpStatus draw_poly(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, if(pen->endcap == LineCapArrowAnchor) shorten_bezier_amt(ptf, pen->width); - draw_cap(hdc, pen->color, pen->endcap, pen->width, ptf[3].X, - ptf[3].Y, pt[count - 1].X, pt[count - 1].Y); + draw_cap(hdc, pen->color, pen->endcap, pen->width, + pt[count - 1].X - (ptf[3].X - ptf[2].X), + pt[count - 1].Y - (ptf[3].Y - ptf[2].Y), + pt[count - 1].X, pt[count - 1].Y); } for(i = 0; i < 4; i ++){ pti[i + count - 4].x = roundr(ptf[i].X);

1 0

Evan Stade : gdiplus: Added GdipGetPathWorldBounds test.
by Alexandre Julliard 12 Jul '07

12 Jul '07

Module: wine Branch: master Commit: f9b0dac9f55ed876a0438450b3140e4f551870a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9b0dac9f55ed876a0438450b… Author: Evan Stade <estade(a)gmail.com> Date: Wed Jul 11 18:08:19 2007 -0700 gdiplus: Added GdipGetPathWorldBounds test. --- dlls/gdiplus/tests/graphicspath.c | 60 +++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index a24853d..6754797 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -24,6 +24,7 @@ #include <math.h> #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +#define expectf(expected, got) ok(fabs(expected - got) < 2.0, "Expected %.2f, got %.2f\n", expected, got) #define POINT_TYPE_MAX_LEN (75) static void stringify_point_type(PathPointType type, char * name) @@ -254,6 +255,64 @@ static void test_arc(void) ok_path(path, arc_path, sizeof(arc_path)/sizeof(path_test_t), FALSE); } +static void test_worldbounds(void) +{ + GpStatus status; + GpPath *path; + GpPen *pen; + GpMatrix *matrix; + GpRectF bounds; + GpPointF line2_points[10]; + int i; + + for(i = 0; i < 10; i ++){ + line2_points[i].X = 200.0 + i * 50.0 * (i % 2); + line2_points[i].Y = 200.0 + i * 50.0 * !(i % 2); + } + GdipCreatePen1((ARGB)0xdeadbeef, 20.0, UnitWorld, &pen); + GdipSetPenEndCap(pen, LineCapSquareAnchor); + GdipCreateMatrix2(1.5, 0.0, 1.0, 1.2, 10.4, 10.2, &matrix); + + GdipCreatePath(FillModeAlternate, &path); + GdipAddPathArc(path, 100.0, 100.0, 500.0, 700.0, 0.0, 100.0); + GdipAddPathLine2(path, &(line2_points[0]), 10); + status = GdipGetPathWorldBounds(path, &bounds, NULL, NULL); + expect(Ok, status); + GdipDeletePath(path); + + expectf(200.0, bounds.X); + expectf(200.0, bounds.Y); + expectf(450.0, bounds.Width); + expectf(600.0, bounds.Height); + + GdipCreatePath(FillModeAlternate, &path); + GdipAddPathArc(path, 100.0, 100.0, 500.0, 700.0, 0.0, 100.0); + GdipAddPathLine2(path, &(line2_points[0]), 10); + status = GdipGetPathWorldBounds(path, &bounds, matrix, NULL); + expect(Ok, status); + GdipDeletePath(path); + + expectf(510.4, bounds.X); + expectf(250.2, bounds.Y); + expectf(1275.0, bounds.Width); + expectf(720.0, bounds.Height); + + GdipCreatePath(FillModeAlternate, &path); + GdipAddPathArc(path, 100.0, 100.0, 500.0, 700.0, 0.0, 100.0); + GdipAddPathLine2(path, &(line2_points[0]), 10); + status = GdipGetPathWorldBounds(path, &bounds, NULL, pen); + todo_wine + expect(Ok, status); + GdipDeletePath(path); + + todo_wine{ + expectf(100.0, bounds.X); + expectf(100.0, bounds.Y); + expectf(650.0, bounds.Width); + expectf(800.0, bounds.Height); + } +} + START_TEST(graphicspath) { struct GdiplusStartupInput gdiplusStartupInput; @@ -269,6 +328,7 @@ START_TEST(graphicspath) test_constructor_destructor(); test_line2(); test_arc(); + test_worldbounds(); GdiplusShutdown(gdiplusToken); }

1 0

Evan Stade : gdiplus: Added GdipTransformMatrixPoints test.
by Alexandre Julliard 12 Jul '07

12 Jul '07

Module: wine Branch: master Commit: 37d91b04f3b7abf2c6876c75d7e3e0bfdd422dd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d91b04f3b7abf2c6876c75d… Author: Evan Stade <estade(a)gmail.com> Date: Wed Jul 11 18:08:01 2007 -0700 gdiplus: Added GdipTransformMatrixPoints test. --- dlls/gdiplus/tests/matrix.c | 49 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/matrix.c b/dlls/gdiplus/tests/matrix.c index d6fc0ed..ff8a47f 100644 --- a/dlls/gdiplus/tests/matrix.c +++ b/dlls/gdiplus/tests/matrix.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <math.h> #include "windef.h" #include "gdiplus.h" @@ -42,6 +43,53 @@ static void test_constructor_destructor(void) expect(Ok, status); } +typedef struct{ + REAL X; + REAL Y; +} real_point; + +static real_point transform_points[] = { + {1000.00, 2600.00}, /*0*/ + {855.00, 2390.00}, /*1*/ + {700.00, 2200.00}, /*2*/ + {565.00, 1970.00}, /*3*/ + {400.00, 1800.00}, /*4*/ + {275.00, 1550.00}, /*5*/ + {100.00, 1400.00}, /*6*/ + {-15.00, 1130.00}, /*7*/ + {-200.00, 1000.00}, /*8*/ + {-305.00, 710.00} /*9*/ + }; + +static void test_transform(void) +{ + GpStatus status; + GpMatrix *matrix = NULL; + GpPointF pts[10]; + INT i; + BOOL match; + + for(i = 0; i < 10; i ++){ + pts[i].X = i * 5.0 * (REAL)(i % 2); + pts[i].Y = 50.0 - i * 5.0; + } + + GdipCreateMatrix2(1.0, -2.0, 30.0, 40.0, -500.0, 600.0, &matrix); + + status = GdipTransformMatrixPoints(matrix, pts, 10); + expect(Ok, status); + + for(i = 0; i < 10; i ++){ + match = fabs(transform_points[i].X - pts[i].X) < 2.0 + && fabs(transform_points[i].Y - pts[i].Y) < 2.0; + + ok(match, "Expected #%d to be (%.2f, %.2f) but got (%.2f, %.2f)\n", i, + transform_points[i].X, transform_points[i].Y, pts[i].X, pts[i].Y); + } + + GdipDeleteMatrix(matrix); +} + START_TEST(matrix) { struct GdiplusStartupInput gdiplusStartupInput; @@ -55,6 +103,7 @@ START_TEST(matrix) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); test_constructor_destructor(); + test_transform(); GdiplusShutdown(gdiplusToken); }

1 0

Evan Stade : gdiplus: Fixed memory leak in GdipDeletePath.
by Alexandre Julliard 12 Jul '07

12 Jul '07

Module: wine Branch: master Commit: e9eceb5f313180e6bf9a5b893df9a9e64cbb9a5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9eceb5f313180e6bf9a5b893… Author: Evan Stade <estade(a)gmail.com> Date: Wed Jul 11 18:08:14 2007 -0700 gdiplus: Fixed memory leak in GdipDeletePath. --- dlls/gdiplus/graphicspath.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 664cde2..5b410d6 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -172,6 +172,8 @@ GpStatus WINGDIPAPI GdipDeletePath(GpPath *path) if(!path) return InvalidParameter; + GdipFree(path->pathdata.Points); + GdipFree(path->pathdata.Types); GdipFree(path); return Ok;

1 0

Evan Stade : gdiplus: Added GdipTransformPath.
by Alexandre Julliard 12 Jul '07

12 Jul '07

Module: wine Branch: master Commit: 1f1ecfb2b51bb0cab790c9c83cd8cbd8fb20d013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f1ecfb2b51bb0cab790c9c83… Author: Evan Stade <estade(a)gmail.com> Date: Wed Jul 11 18:08:05 2007 -0700 gdiplus: Added GdipTransformPath. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 12 ++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 5879360..c1d6725 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -584,7 +584,7 @@ @ stub GdipTestControl @ stdcall GdipTransformMatrixPoints(ptr ptr long) @ stub GdipTransformMatrixPointsI -@ stub GdipTransformPath +@ stdcall GdipTransformPath(ptr ptr) @ stub GdipTransformPoints @ stub GdipTransformPointsI @ stub GdipTransformRegion diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 394b9f6..4665fca 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -222,3 +222,15 @@ GpStatus WINGDIPAPI GdipStartPathFigure(GpPath *path) return Ok; } + +GpStatus WINGDIPAPI GdipTransformPath(GpPath *path, GpMatrix *matrix) +{ + if(!path) + return InvalidParameter; + + if(path->pathdata.Count == 0) + return Ok; + + return GdipTransformMatrixPoints(matrix, (GpPointF*) path->pathdata.Points, + path->pathdata.Count); +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 9185fd5..95dafde 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -59,6 +59,7 @@ GpStatus WINGDIPAPI GdipGetPathPoints(GpPath*,GpPointF*,INT); GpStatus WINGDIPAPI GdipGetPathTypes(GpPath*,BYTE*,INT); GpStatus WINGDIPAPI GdipGetPointCount(GpPath*,INT*); GpStatus WINGDIPAPI GdipStartPathFigure(GpPath*); +GpStatus WINGDIPAPI GdipTransformPath(GpPath*,GpMatrix*); GpStatus WINGDIPAPI GdipCreateMatrix2(REAL,REAL,REAL,REAL,REAL,REAL,GpMatrix**); GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix*);

1 0