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

Rob Shearman : rpcrt4: Implement marshalling, unmarshalling and buffer sizing for the context handle type.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: fc124eca6eff950b97d2abebc2759b102ffb2fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc124eca6eff950b97d2abebc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jun 25 14:29:15 2007 +0100 rpcrt4: Implement marshalling, unmarshalling and buffer sizing for the context handle type. --- dlls/rpcrt4/ndr_marshall.c | 74 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 71 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 1bd2764..b2c08b2 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -118,6 +118,10 @@ static void WINAPI NdrBaseTypeBufferSize(PMIDL_STUB_MESSAGE, unsigned char *, PF static void WINAPI NdrBaseTypeFree(PMIDL_STUB_MESSAGE, unsigned char *, PFORMAT_STRING); static ULONG WINAPI NdrBaseTypeMemorySize(PMIDL_STUB_MESSAGE, PFORMAT_STRING); +static unsigned char *WINAPI NdrContextHandleMarshall(PMIDL_STUB_MESSAGE, unsigned char *, PFORMAT_STRING); +static void WINAPI NdrContextHandleBufferSize(PMIDL_STUB_MESSAGE, unsigned char *, PFORMAT_STRING); +static unsigned char *WINAPI NdrContextHandleUnmarshall(PMIDL_STUB_MESSAGE, unsigned char **, PFORMAT_STRING, unsigned char); + const NDR_MARSHALL NdrMarshaller[NDR_TABLE_SIZE] = { 0, NdrBaseTypeMarshall, NdrBaseTypeMarshall, NdrBaseTypeMarshall, @@ -152,7 +156,7 @@ const NDR_MARSHALL NdrMarshaller[NDR_TABLE_SIZE] = { /* 0x2f */ NdrInterfacePointerMarshall, /* 0x30 */ - 0, + NdrContextHandleMarshall, /* 0xb1 */ 0, 0, 0, NdrUserMarshalMarshall, @@ -194,7 +198,7 @@ const NDR_UNMARSHALL NdrUnmarshaller[NDR_TABLE_SIZE] = { /* 0x2f */ NdrInterfacePointerUnmarshall, /* 0x30 */ - 0, + NdrContextHandleUnmarshall, /* 0xb1 */ 0, 0, 0, NdrUserMarshalUnmarshall, @@ -236,7 +240,7 @@ const NDR_BUFFERSIZE NdrBufferSizer[NDR_TABLE_SIZE] = { /* 0x2f */ NdrInterfacePointerBufferSize, /* 0x30 */ - 0, + NdrContextHandleBufferSize, /* 0xb1 */ 0, 0, 0, NdrUserMarshalBufferSize, @@ -5517,6 +5521,70 @@ static void WINAPI NdrBaseTypeFree(PMIDL_STUB_MESSAGE pStubMsg, } /*********************************************************************** + * NdrContextHandleBufferSize [internal] + */ +static void WINAPI NdrContextHandleBufferSize( + PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + TRACE("pStubMsg %p, pMemory %p, type 0x%02x\n", pStubMsg, pMemory, *pFormat); + + if (*pFormat != RPC_FC_BIND_CONTEXT) + { + ERR("invalid format type %x\n", *pFormat); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + } + ALIGN_LENGTH(pStubMsg->BufferLength, 4); + pStubMsg->BufferLength += cbNDRContext; +} + +/*********************************************************************** + * NdrContextHandleMarshall [internal] + */ +static unsigned char *WINAPI NdrContextHandleMarshall( + PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + TRACE("pStubMsg %p, pMemory %p, type 0x%02x\n", pStubMsg, pMemory, *pFormat); + + if (*pFormat != RPC_FC_BIND_CONTEXT) + { + ERR("invalid format type %x\n", *pFormat); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + } + + if (pFormat[1] & 0x80) + NdrClientContextMarshall(pStubMsg, *(NDR_CCONTEXT **)pMemory, FALSE); + else + NdrClientContextMarshall(pStubMsg, (NDR_CCONTEXT *)pMemory, FALSE); + + return NULL; +} + +/*********************************************************************** + * NdrContextHandleUnmarshall [internal] + */ +static unsigned char *WINAPI NdrContextHandleUnmarshall( + PMIDL_STUB_MESSAGE pStubMsg, + unsigned char **ppMemory, + PFORMAT_STRING pFormat, + unsigned char fMustAlloc) +{ + if (*pFormat != RPC_FC_BIND_CONTEXT) + { + ERR("invalid format type %x\n", *pFormat); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + } + + **(NDR_CCONTEXT **)ppMemory = NULL; + NdrClientContextUnmarshall(pStubMsg, *(NDR_CCONTEXT **)ppMemory, pStubMsg->RpcMsg->Handle); + + return NULL; +} + +/*********************************************************************** * NdrClientContextMarshall [RPCRT4.@] */ void WINAPI NdrClientContextMarshall(PMIDL_STUB_MESSAGE pStubMsg,

1 0

Rob Shearman : rpcrt4: Add a STUBLESS_FREE phase for freeing the allocated memory in the server function .
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: 903fb72b210ca3ea2a4026859d6f7f9128fa7200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=903fb72b210ca3ea2a4026859… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jun 25 14:22:29 2007 +0100 rpcrt4: Add a STUBLESS_FREE phase for freeing the allocated memory in the server function. --- dlls/rpcrt4/ndr_stubless.c | 44 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index d6118fb..9eb25ef 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -121,6 +121,7 @@ static inline unsigned long call_memory_sizer(PMIDL_STUB_MESSAGE pStubMsg, PFORM #define STUBLESS_CALCSIZE 3 #define STUBLESS_GETBUFFER 4 #define STUBLESS_MARSHAL 5 +#define STUBLESS_FREE 6 /* From http://msdn.microsoft.com/library/default.asp?url=/library/en-us/rpc/rpc/pa… */ typedef struct _NDR_PROC_HEADER @@ -1258,7 +1259,7 @@ LONG WINAPI NdrStubCall2( * 4. STUBLESS_GETBUFFER - allocate [out] buffer * 5. STUBLESS_MARHSAL - marshal [out] params to buffer */ - for (phase = STUBLESS_UNMARSHAL; phase <= STUBLESS_MARSHAL; phase++) + for (phase = STUBLESS_UNMARSHAL; phase <= STUBLESS_FREE; phase++) { TRACE("phase = %d\n", phase); switch (phase) @@ -1316,6 +1317,7 @@ LONG WINAPI NdrStubCall2( case STUBLESS_MARSHAL: case STUBLESS_UNMARSHAL: case STUBLESS_CALCSIZE: + case STUBLESS_FREE: current_offset = parameter_start_offset; current_stack_offset = 0; @@ -1357,6 +1359,10 @@ LONG WINAPI NdrStubCall2( call_marshaller(&stubMsg, pArg, pTypeFormat); } break; + case STUBLESS_FREE: + if (pParam->param_attributes.ServerAllocSize) + HeapFree(GetProcessHeap(), 0, *(void **)pArg); + break; case STUBLESS_UNMARSHAL: if (pParam->param_attributes.ServerAllocSize) *(void **)pArg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -1408,12 +1414,29 @@ LONG WINAPI NdrStubCall2( if (pParam->param_attributes.IsByValue) call_marshaller(&stubMsg, pArg, pTypeFormat); else - { call_marshaller(&stubMsg, *(unsigned char **)pArg, pTypeFormat); - stubMsg.pfnFree(*(void **)pArg); - } } - /* FIXME: call call_freer here for IN types */ + break; + case STUBLESS_FREE: + if (pParam->param_attributes.MustFree) + { + if (pParam->param_attributes.IsByValue) + call_freer(&stubMsg, pArg, pTypeFormat); + else + call_freer(&stubMsg, *(unsigned char **)pArg, pTypeFormat); + } + + if (pParam->param_attributes.IsOut && + !pParam->param_attributes.IsIn && + !pParam->param_attributes.IsByValue && + !pParam->param_attributes.ServerAllocSize) + { + stubMsg.pfnFree(*(void **)pArg); + } + + if (pParam->param_attributes.ServerAllocSize) + HeapFree(GetProcessHeap(), 0, *(void **)pArg); + /* FIXME: call call_freer here for IN types with MustFree set */ break; case STUBLESS_UNMARSHAL: if (pParam->param_attributes.ServerAllocSize) @@ -1489,6 +1512,10 @@ LONG WINAPI NdrStubCall2( if (pParam->param_direction == RPC_FC_RETURN_PARAM_BASETYPE) call_marshaller(&stubMsg, pArg, pTypeFormat); break; + case STUBLESS_FREE: + if (pParam->param_direction == RPC_FC_IN_PARAM_BASETYPE) + call_freer(&stubMsg, pArg, pTypeFormat); + break; case STUBLESS_UNMARSHAL: if (pParam->param_direction == RPC_FC_IN_PARAM_BASETYPE) call_unmarshaller(&stubMsg, &pArg, pTypeFormat, 0); @@ -1524,6 +1551,13 @@ LONG WINAPI NdrStubCall2( pParam->param_direction == RPC_FC_RETURN_PARAM) call_marshaller(&stubMsg, *(unsigned char **)pArg, pTypeFormat); break; + case STUBLESS_FREE: + if (pParam->param_direction == RPC_FC_IN_OUT_PARAM || + pParam->param_direction == RPC_FC_IN_PARAM) + call_freer(&stubMsg, *(unsigned char **)pArg, pTypeFormat); + else if (pParam->param_direction == RPC_FC_OUT_PARAM) + stubMsg.pfnFree(*(void **)pArg); + break; case STUBLESS_UNMARSHAL: if (pParam->param_direction == RPC_FC_IN_OUT_PARAM || pParam->param_direction == RPC_FC_IN_PARAM)

1 0

Rob Shearman : rpcrt4: Return a fault packet if the interface/ object pair in a request packet aren't registered.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: 0d05685b686b59b566de143377f30973766998d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d05685b686b59b566de14337… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jun 25 14:23:04 2007 +0100 rpcrt4: Return a fault packet if the interface/object pair in a request packet aren't registered. --- dlls/rpcrt4/rpc_server.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index fd277b3..712a18b 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -235,7 +235,11 @@ static void RPCRT4_process_packet(RpcConnection* conn, RpcPktHdr* hdr, RPC_MESSA sif = RPCRT4_find_interface(object_uuid, &conn->ActiveInterface, TRUE); if (!sif) { - /* FIXME: send fault packet? */ + response = RPCRT4_BuildFaultHeader(NDR_LOCAL_DATA_REPRESENTATION, + RPC_S_UNKNOWN_IF); + + RPCRT4_Send(conn, response, NULL, 0); + RPCRT4_FreeHeader(response); break; } msg->RpcInterfaceInformation = sif->If;

1 0

Rob Shearman : rpcrt4: Close the connection if a protocol error or certain other kinds of errors occur , instead of returning it to the connection pool.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: c411d95e204abd8dedd1415894a8343fb3b16cd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c411d95e204abd8dedd141589… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jun 25 14:23:45 2007 +0100 rpcrt4: Close the connection if a protocol error or certain other kinds of errors occur, instead of returning it to the connection pool. --- dlls/rpcrt4/rpc_message.c | 40 +++++++++++++++++++++++++++++++++------- 1 files changed, 33 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index dd37f33..cd25520 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -952,6 +952,23 @@ RPC_STATUS WINAPI I_RpcSend(PRPC_MESSAGE pMsg) return status; } +/* is this status something that the server can't recover from? */ +static inline BOOL is_hard_error(RPC_STATUS status) +{ + switch (status) + { + case 0: /* user-defined fault */ + case ERROR_ACCESS_DENIED: + case ERROR_INVALID_PARAMETER: + case RPC_S_PROTOCOL_ERROR: + case RPC_S_CALL_FAILED: + case RPC_S_CALL_FAILED_DNE: + return TRUE; + default: + return FALSE; + } +} + /*********************************************************************** * I_RpcReceive [RPCRT4.@] */ @@ -999,31 +1016,40 @@ RPC_STATUS WINAPI I_RpcReceive(PRPC_MESSAGE pMsg) goto fail; } - status = RPC_S_PROTOCOL_ERROR; - switch (hdr->common.ptype) { case PKT_RESPONSE: - if (bind->server) goto fail; + if (bind->server) { + status = RPC_S_PROTOCOL_ERROR; + goto fail; + } break; case PKT_REQUEST: - if (!bind->server) goto fail; + if (!bind->server) { + status = RPC_S_PROTOCOL_ERROR; + goto fail; + } break; case PKT_FAULT: pMsg->RpcFlags |= WINE_RPCFLAG_EXCEPTION; ERR ("we got fault packet with status 0x%lx\n", hdr->fault.status); status = hdr->fault.status; /* FIXME: do translation from nca error codes */ - goto fail; + if (is_hard_error(status)) + goto fail; + break; default: WARN("bad packet type %d\n", hdr->common.ptype); + status = RPC_S_PROTOCOL_ERROR; goto fail; } /* success */ - status = RPC_S_OK; + RPCRT4_CloseBinding(bind, conn); + RPCRT4_FreeHeader(hdr); + return status; fail: RPCRT4_FreeHeader(hdr); - RPCRT4_CloseBinding(bind, conn); + RPCRT4_DestroyConnection(conn); return status; }

1 0

Rob Shearman : rpcrt4: Translate STATUS_ACCESS_VIOLATION exceptions caught whilst executing the stub function to ERROR_NOACCESS to prevent confusing exceptions occurring in the client .
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: 2de3d31a7a2362f754d3313d35383a8714da4d29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de3d31a7a2362f754d3313d3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jun 25 14:24:23 2007 +0100 rpcrt4: Translate STATUS_ACCESS_VIOLATION exceptions caught whilst executing the stub function to ERROR_NOACCESS to prevent confusing exceptions occurring in the client. --- dlls/rpcrt4/rpc_server.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 712a18b..0250902 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -235,6 +235,7 @@ static void RPCRT4_process_packet(RpcConnection* conn, RpcPktHdr* hdr, RPC_MESSA sif = RPCRT4_find_interface(object_uuid, &conn->ActiveInterface, TRUE); if (!sif) { + WARN("interface %s no longer registered, returning fault packet\n", debugstr_guid(&conn->ActiveInterface.SyntaxGUID)); response = RPCRT4_BuildFaultHeader(NDR_LOCAL_DATA_REPRESENTATION, RPC_S_UNKNOWN_IF); @@ -278,7 +279,10 @@ static void RPCRT4_process_packet(RpcConnection* conn, RpcPktHdr* hdr, RPC_MESSA msg->RpcFlags |= WINE_RPCFLAG_EXCEPTION; msg->BufferLength = sizeof(DWORD); I_RpcGetBuffer(msg); - *(DWORD*)msg->Buffer = GetExceptionCode(); + if (GetExceptionCode() == STATUS_ACCESS_VIOLATION) + *(DWORD*)msg->Buffer = ERROR_NOACCESS; + else + *(DWORD*)msg->Buffer = GetExceptionCode(); } __ENDTRY /* send response packet */

1 0

Rob Shearman : rpcrt4: When an exception is raised, return the stored exception code instead of the generic RPC_S_CALL_FAILED.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: 62c49bdd18bddccc97b3eb6edec6dd461d896cf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62c49bdd18bddccc97b3eb6ed… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jun 25 14:25:39 2007 +0100 rpcrt4: When an exception is raised, return the stored exception code instead of the generic RPC_S_CALL_FAILED. --- dlls/rpcrt4/rpc_message.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index cd25520..8ff2e15 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -925,7 +925,7 @@ RPC_STATUS WINAPI I_RpcSend(PRPC_MESSAGE pMsg) if (bind->server) { if (pMsg->RpcFlags & WINE_RPCFLAG_EXCEPTION) { hdr = RPCRT4_BuildFaultHeader(pMsg->DataRepresentation, - RPC_S_CALL_FAILED); + *(DWORD *)pMsg->Buffer); } else { hdr = RPCRT4_BuildResponseHeader(pMsg->DataRepresentation, pMsg->BufferLength);

1 0

Rob Shearman : rpcrt4: Store the assoc_group_id field returned from the bind_ack packet and use it when creating further connections in the association group .
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: 0ebcacca3922bea02fa7456fed2b07b1df6e133a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ebcacca3922bea02fa7456fe… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jun 25 14:26:23 2007 +0100 rpcrt4: Store the assoc_group_id field returned from the bind_ack packet and use it when creating further connections in the association group. --- dlls/rpcrt4/rpc_binding.c | 1 + dlls/rpcrt4/rpc_binding.h | 4 ++++ dlls/rpcrt4/rpc_message.c | 2 ++ dlls/rpcrt4/rpc_message.h | 2 +- dlls/rpcrt4/rpc_transport.c | 2 ++ 5 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 4f276ae..56dcc9e 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -312,6 +312,7 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding* Binding, RpcConnection** Connection, 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); diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index 6dde2ae..127a2cf 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -55,6 +55,9 @@ typedef struct _RpcAssoc LPWSTR NetworkOptions; RpcAuthInfo *AuthInfo; + /* id of this association group */ + ULONG assoc_group_id; + CRITICAL_SECTION cs; struct list connection_pool; } RpcAssoc; @@ -86,6 +89,7 @@ typedef struct _RpcConnection /* client-only */ struct list conn_pool_entry; + ULONG assoc_group_id; /* association group returned during binding */ } RpcConnection; struct connection_ops { diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 8ff2e15..bdd9d12 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -177,6 +177,7 @@ RpcPktHdr *RPCRT4_BuildFaultHeader(unsigned long DataRepresentation, RpcPktHdr *RPCRT4_BuildBindHeader(unsigned long DataRepresentation, unsigned short MaxTransmissionSize, unsigned short MaxReceiveSize, + unsigned long AssocGroupId, RPC_SYNTAX_IDENTIFIER *AbstractId, RPC_SYNTAX_IDENTIFIER *TransferId) { @@ -191,6 +192,7 @@ RpcPktHdr *RPCRT4_BuildBindHeader(unsigned long DataRepresentation, header->common.frag_len = sizeof(header->bind); header->bind.max_tsize = MaxTransmissionSize; header->bind.max_rsize = MaxReceiveSize; + header->bind.assoc_gid = AssocGroupId; header->bind.num_elements = 1; header->bind.num_syntaxes = 1; memcpy(&header->bind.abstract, AbstractId, sizeof(RPC_SYNTAX_IDENTIFIER)); diff --git a/dlls/rpcrt4/rpc_message.h b/dlls/rpcrt4/rpc_message.h index 97defb3..7246592 100644 --- a/dlls/rpcrt4/rpc_message.h +++ b/dlls/rpcrt4/rpc_message.h @@ -25,7 +25,7 @@ #include "rpc_defs.h" RpcPktHdr *RPCRT4_BuildFaultHeader(unsigned long DataRepresentation, RPC_STATUS Status); -RpcPktHdr *RPCRT4_BuildBindHeader(unsigned long DataRepresentation, unsigned short MaxTransmissionSize, unsigned short MaxReceiveSize, RPC_SYNTAX_IDENTIFIER *AbstractId, RPC_SYNTAX_IDENTIFIER *TransferId); +RpcPktHdr *RPCRT4_BuildBindHeader(unsigned long DataRepresentation, unsigned short MaxTransmissionSize, unsigned short MaxReceiveSize, unsigned long AssocGroupId, RPC_SYNTAX_IDENTIFIER *AbstractId, RPC_SYNTAX_IDENTIFIER *TransferId); RpcPktHdr *RPCRT4_BuildBindNackHeader(unsigned long DataRepresentation, unsigned char RpcVersion, unsigned char RpcVersionMinor); RpcPktHdr *RPCRT4_BuildBindAckHeader(unsigned long DataRepresentation, unsigned short MaxTransmissionSize, unsigned short MaxReceiveSize, LPSTR ServerAddress, unsigned long Result, unsigned long Reason, RPC_SYNTAX_IDENTIFIER *TransferId); VOID RPCRT4_FreeHeader(RpcPktHdr *Header); diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index c3d1ef3..1ff9cfd 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1432,6 +1432,7 @@ RPC_STATUS RPCRT4_GetAssociation(LPCSTR Protseq, LPCSTR NetworkAddr, assoc->NetworkAddr = RPCRT4_strdupA(NetworkAddr); assoc->Endpoint = RPCRT4_strdupA(Endpoint); assoc->NetworkOptions = NetworkOptions ? RPCRT4_strdupW(NetworkOptions) : NULL; + assoc->assoc_group_id = 0; list_add_head(&assoc_list, &assoc->entry); *assoc_out = assoc; @@ -1503,6 +1504,7 @@ void RpcAssoc_ReleaseIdleConnection(RpcAssoc *assoc, RpcConnection *Connection) { assert(!Connection->server); EnterCriticalSection(&assoc->cs); + if (!assoc->assoc_group_id) assoc->assoc_group_id = Connection->assoc_group_id; list_add_head(&assoc->connection_pool, &Connection->conn_pool_entry); LeaveCriticalSection(&assoc->cs); }

1 0

Rob Shearman : mshtml: Implement HTMLElement_get_children.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: a03ca3863f3ac0e761fbaa289c0d714efb993a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a03ca3863f3ac0e761fbaa289… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jun 25 15:01:27 2007 +0100 mshtml: Implement HTMLElement_get_children. --- dlls/mshtml/htmlelem.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index ccdad8c..9d5d475 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -875,11 +875,52 @@ static HRESULT WINAPI HTMLElement_get_onfilterchange(IHTMLElement *iface, VARIAN return E_NOTIMPL; } +static void create_child_list(HTMLDocument *doc, HTMLElement *elem, elem_vector *buf) +{ + nsIDOMNodeList *nsnode_list; + nsIDOMNode *iter; + PRUint32 list_len = 0, i; + HTMLDOMNode *node; + nsresult nsres; + + nsres = nsIDOMNode_GetChildNodes(elem->node->nsnode, &nsnode_list); + if(NS_FAILED(nsres)) { + ERR("GetChildNodes failed: %08x\n", nsres); + return; + } + + nsIDOMNodeList_GetLength(nsnode_list, &list_len); + if(!list_len) + return; + + buf->size = list_len; + buf->buf = mshtml_alloc(buf->size*sizeof(HTMLElement**)); + + for(i=0; i<list_len; i++) { + nsres = nsIDOMNodeList_Item(nsnode_list, i, &iter); + if(NS_FAILED(nsres)) { + ERR("Item failed: %08x\n", nsres); + continue; + } + + node = get_node(doc, iter); + if(node->node_type != NT_HTMLELEM) + continue; + + elem_vector_add(buf, (HTMLElement*)node->impl.elem); + } +} + static HRESULT WINAPI HTMLElement_get_children(IHTMLElement *iface, IDispatch **p) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + elem_vector buf = {NULL, 0, 0}; + + TRACE("(%p)->(%p)\n", This, p); + + create_child_list(This->node->doc, This, &buf); + + return HTMLElementCollection_Create((IUnknown*)HTMLELEM(This), buf.buf, buf.len, p); } static void create_all_list(HTMLDocument *doc, HTMLElement *elem, elem_vector *buf)

1 0

Rob Shearman : rpcrt4: Don' t use add on the sizes of array elements to an open-ended structure; use FIELD_OFFSET with the array index instead.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: 73c31ed309893628240cf7ee00e9c1635a87a5a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73c31ed309893628240cf7ee0… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jun 25 14:21:20 2007 +0100 rpcrt4: Don't use add on the sizes of array elements to an open-ended structure; use FIELD_OFFSET with the array index instead. --- dlls/rpcrt4/tests/server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index a0291e0..ceb083b 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -560,7 +560,7 @@ array_tests(void) ok(sum_var_array(&c[2], 0) == 0, "RPC sum_conf_array\n"); ok(dot_two_vectors(vs) == -4, "RPC dot_two_vectors\n"); - cs = HeapAlloc(GetProcessHeap(), 0, offsetof(cs_t, ca) + 5 * sizeof cs->ca[0]); + cs = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(cs_t, ca[5])); cs->n = 5; cs->ca[0] = 3; cs->ca[1] = 5;

1 0

Rob Shearman : rpcrt4: Add support for ServerAllocSize parameters.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: a1dca20dd7086194a9b452b93c3feabb72979576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1dca20dd7086194a9b452b93… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jun 25 14:21:55 2007 +0100 rpcrt4: Add support for ServerAllocSize parameters. --- dlls/rpcrt4/ndr_stubless.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 6a581a0..d6118fb 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1339,10 +1339,6 @@ LONG WINAPI NdrStubCall2( TRACE("\tstack_offset: 0x%x\n", current_stack_offset); TRACE("\tmemory addr (before): %p -> %p\n", pArg, *(unsigned char **)pArg); - if (pParam->param_attributes.ServerAllocSize) - FIXME("ServerAllocSize of %d ignored for parameter %d\n", - pParam->param_attributes.ServerAllocSize * 8, i); - if (pParam->param_attributes.IsBasetype) { const unsigned char *pTypeFormat = @@ -1360,9 +1356,12 @@ LONG WINAPI NdrStubCall2( else call_marshaller(&stubMsg, pArg, pTypeFormat); } - /* FIXME: call call_freer here */ break; case STUBLESS_UNMARSHAL: + if (pParam->param_attributes.ServerAllocSize) + *(void **)pArg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + pParam->param_attributes.ServerAllocSize * 8); + if (pParam->param_attributes.IsIn) { if (pParam->param_attributes.IsSimpleRef) @@ -1417,6 +1416,10 @@ LONG WINAPI NdrStubCall2( /* FIXME: call call_freer here for IN types */ break; case STUBLESS_UNMARSHAL: + if (pParam->param_attributes.ServerAllocSize) + *(void **)pArg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + pParam->param_attributes.ServerAllocSize * 8); + if (pParam->param_attributes.IsIn) { if (pParam->param_attributes.IsByValue) @@ -1425,6 +1428,7 @@ LONG WINAPI NdrStubCall2( call_unmarshaller(&stubMsg, (unsigned char **)pArg, pTypeFormat, 0); } else if (pParam->param_attributes.IsOut && + !pParam->param_attributes.ServerAllocSize && !pParam->param_attributes.IsByValue) { DWORD size = calc_arg_size(&stubMsg, pTypeFormat);

1 0