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

Robert Shearman : rpcrt4: Change ComputeConformance and ComputeVariance from macros to
by Alexandre Julliard 03 Jun '06

03 Jun '06

Module: wine Branch: refs/heads/master Commit: ebcd6b6a24430cb556d1637d90678cb3d3b99fed URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ebcd6b6a24430cb556d1637… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jun 2 20:46:16 2006 +0100 rpcrt4: Change ComputeConformance and ComputeVariance from macros to inline functions. Clear pStubMsg->Offset in ComputeVariance since it isn't set by ComputeConformanceOrVariance and so could be left filled with garbage. --- dlls/rpcrt4/ndr_misc.h | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_misc.h b/dlls/rpcrt4/ndr_misc.h index 008839f..a1560b9 100644 --- a/dlls/rpcrt4/ndr_misc.h +++ b/dlls/rpcrt4/ndr_misc.h @@ -30,12 +30,21 @@ #include "rpcndr.h" struct IPSFactoryBuffer; -#define ComputeConformance(pStubMsg, pMemory, pFormat, def) ComputeConformanceOrVariance(pStubMsg, pMemory, pFormat, def, &pStubMsg->MaxCount) -#define ComputeVariance(pStubMsg, pMemory, pFormat, def) ComputeConformanceOrVariance(pStubMsg, pMemory, pFormat, def, &pStubMsg->ActualCount) PFORMAT_STRING ComputeConformanceOrVariance( MIDL_STUB_MESSAGE *pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat, ULONG_PTR def, ULONG *pCount); +static inline PFORMAT_STRING ComputeConformance(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat, ULONG def) +{ + return ComputeConformanceOrVariance(pStubMsg, pMemory, pFormat, def, &pStubMsg->MaxCount); +} + +static inline PFORMAT_STRING ComputeVariance(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat, ULONG def) +{ + pStubMsg->Offset = 0; + return ComputeConformanceOrVariance(pStubMsg, pMemory, pFormat, def, &pStubMsg->ActualCount); +} + typedef unsigned char* (WINAPI *NDR_MARSHALL) (PMIDL_STUB_MESSAGE, unsigned char*, PFORMAT_STRING); typedef unsigned char* (WINAPI *NDR_UNMARSHALL)(PMIDL_STUB_MESSAGE, unsigned char**,PFORMAT_STRING, unsigned char); typedef void (WINAPI *NDR_BUFFERSIZE)(PMIDL_STUB_MESSAGE, unsigned char*, PFORMAT_STRING);

1 0

Robert Shearman : rpcrt4: Don' t try to resolve the name when constructing a protocol tower.
by Alexandre Julliard 03 Jun '06

03 Jun '06

Module: wine Branch: refs/heads/master Commit: 0fad0895d7b5e49298f4488a1920aeb4a275ce61 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0fad0895d7b5e49298f4488… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jun 2 20:46:29 2006 +0100 rpcrt4: Don't try to resolve the name when constructing a protocol tower. Instead just fill it in with all zeros. --- dlls/rpcrt4/rpc_transport.c | 10 +++++++--- dlls/rpcrt4/tests/rpc.c | 10 ++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 1a574d2..b50f839 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -584,7 +584,7 @@ static size_t rpcrt4_ncacn_ip_tcp_get_to ipv4_floor->protid = EPM_PROTOCOL_IP; ipv4_floor->count_rhs = sizeof(ipv4_floor->ipv4addr); - hints.ai_flags = 0; + hints.ai_flags = AI_NUMERICHOST; /* FIXME: only support IPv4 at the moment. how is IPv6 represented by the EPM? */ hints.ai_family = PF_INET; hints.ai_socktype = SOCK_STREAM; @@ -597,8 +597,12 @@ static size_t rpcrt4_ncacn_ip_tcp_get_to ret = getaddrinfo(networkaddr, endpoint, &hints, &ai); if (ret < 0) { - ERR("getaddrinfo failed: %s\n", gai_strerror(ret)); - return 0; + ret = getaddrinfo("0.0.0.0", endpoint, &hints, &ai); + if (ret < 0) + { + ERR("getaddrinfo failed: %s\n", gai_strerror(ret)); + return 0; + } } if (ai->ai_family == PF_INET) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 03dc792..e19844b 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -270,6 +270,16 @@ static void test_towers(void) ok(ret == RPC_S_OK, "TowerExplode failed with error %ld\n", ret); I_RpcFree(tower); + + /* test the behaviour for ip_tcp with name instead of dotted IP notation */ + ret = TowerConstruct(&mapi_if_id, &ndr_syntax, "ncacn_ip_tcp", "135", "localhost", &tower); + ok(ret == RPC_S_OK, "TowerConstruct failed with error %ld\n", ret); + ret = TowerExplode(tower, NULL, NULL, NULL, NULL, &address); + ok(ret == RPC_S_OK, "TowerExplode failed with error %ld\n", ret); + ok(!strcmp(address, "0.0.0.0"), "address was \"%s\" instead of \"0.0.0.0\"\n", address); + + I_RpcFree(address); + I_RpcFree(tower); } START_TEST( rpc )

1 0

Marcus Meissner : sane.ds: Replace FIXME() by TRACE() on sane_exit.
by Alexandre Julliard 03 Jun '06

03 Jun '06

Module: wine Branch: refs/heads/master Commit: 312fa564dbdee7b3cac7b7c1e1018a30edb25892 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=312fa564dbdee7b3cac7b7c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Jun 2 22:03:01 2006 +0200 sane.ds: Replace FIXME() by TRACE() on sane_exit. --- dlls/sane.ds/sane_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 521e30c..a20a4ae 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -51,7 +51,7 @@ #endif } case DLL_PROCESS_DETACH: #ifdef HAVE_SANE - FIXME("calling sane_Exit()\n"); + TRACE("calling sane_exit()\n"); sane_exit (); #endif SANE_instance = NULL;

1 0

Robert Shearman : rpcrt4: The lifetime of the binding handle stored in the context
by Alexandre Julliard 03 Jun '06

03 Jun '06

Module: wine Branch: refs/heads/master Commit: a48433453bf54890a0829d72498839ba0fb69476 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a48433453bf54890a0829d7… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jun 2 20:45:59 2006 +0100 rpcrt4: The lifetime of the binding handle stored in the context handle is independent of the binding handle used in the call that unmarshaled it, so we should use RpcBindingCopy to make a copy of it and then call RpcBindingFree later to free it. --- dlls/rpcrt4/ndr_marshall.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 96e923c..02c3583 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -4516,6 +4516,7 @@ static UINT ndr_update_context_handle(ND if (!che) return ERROR_INVALID_HANDLE; list_remove(&che->entry); + RpcBindingFree(&che->handle); HeapFree(GetProcessHeap(), 0, che); che = NULL; } @@ -4527,7 +4528,7 @@ static UINT ndr_update_context_handle(ND if (!che) return ERROR_NOT_ENOUGH_MEMORY; che->magic = NDR_CONTEXT_HANDLE_MAGIC; - che->handle = hBinding; + RpcBindingCopy(hBinding, &che->handle); list_add_tail(&context_handle_list, &che->entry); memcpy(&che->wire_data, chi, sizeof *chi); }

1 0

Robert Shearman : rpcrt4: Fix an incorrect format string pointer being passed in to
by Alexandre Julliard 03 Jun '06

03 Jun '06

Module: wine Branch: refs/heads/master Commit: a4fff73ba3c51521dd3e97ca2c6fb00339005c1b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a4fff73ba3c51521dd3e97c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jun 2 20:45:40 2006 +0100 rpcrt4: Fix an incorrect format string pointer being passed in to ComputeVariance in NdrConformantVaryingStructBufferSize. --- dlls/rpcrt4/ndr_marshall.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 240ca75..96e923c 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -3147,7 +3147,7 @@ void WINAPI NdrConformantVaryingStructBu pCVArrayFormat = ComputeConformance(pStubMsg, pMemory + pCVStructFormat->memory_size, pCVArrayFormat + 4, 0); pCVArrayFormat = ComputeVariance(pStubMsg, pMemory + pCVStructFormat->memory_size, - pCVArrayFormat + 4, 0); + pCVArrayFormat, 0); break; case RPC_FC_C_CSTRING: TRACE("string=%s\n", debugstr_a((char*)pMemory + pCVStructFormat->memory_size));

1 0

Robert Shearman : rpcrt4: Skip over the right-hand-side data for the protocol floor so
by Alexandre Julliard 03 Jun '06

03 Jun '06

Module: wine Branch: refs/heads/master Commit: 6a11aba526cd2e5cc87a0ca81b214772cdff5c61 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6a11aba526cd2e5cc87a0ca… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jun 2 20:45:09 2006 +0100 rpcrt4: Skip over the right-hand-side data for the protocol floor so that we can parse the towers received from native rpcrt4. --- dlls/rpcrt4/rpc_transport.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 34634b5..1a574d2 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -864,10 +864,12 @@ RPC_STATUS RpcTransport_ParseTopOfTower( if ((protocol_floor->count_lhs != sizeof(protocol_floor->protid)) || (protocol_floor->count_rhs > tower_size)) return EPT_S_NOT_REGISTERED; + tower_data += protocol_floor->count_rhs; + tower_size -= protocol_floor->count_rhs; floor4 = (twr_empty_floor_t *)tower_data; if ((tower_size < sizeof(*floor4)) || - (floor4->count_lhs != sizeof(protocol_floor->protid))) + (floor4->count_lhs != sizeof(floor4->protid))) return EPT_S_NOT_REGISTERED; for(i = 0; i < MAX_PROTSEQ; i++)

1 0

Robert Shearman : rpcrt4: Freeing a NULL context handle is allowed.
by Alexandre Julliard 03 Jun '06

03 Jun '06

Module: wine Branch: refs/heads/master Commit: ec5b3c3ea68c2a6b6f95d105562752ba2d203786 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ec5b3c3ea68c2a6b6f95d10… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jun 2 20:43:44 2006 +0100 rpcrt4: Freeing a NULL context handle is allowed. --- dlls/rpcrt4/ndr_marshall.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index befe124..03f5c6c 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -4504,12 +4504,15 @@ static UINT ndr_update_context_handle(ND /* a null UUID means we should free the context handle */ if (IsEqualGUID(&chi->uuid, &GUID_NULL)) { - che = get_context_entry(*CContext); - if (!che) - return ERROR_INVALID_HANDLE; - list_remove(&che->entry); - HeapFree(GetProcessHeap(), 0, che); - che = NULL; + if (*CContext) + { + che = get_context_entry(*CContext); + if (!che) + return ERROR_INVALID_HANDLE; + list_remove(&che->entry); + HeapFree(GetProcessHeap(), 0, che); + che = NULL; + } } /* if there's no existing entry matching the GUID, allocate one */ else if (!(che = context_entry_from_guid(&chi->uuid)))

1 0

Robert Shearman : rpcrt4: Align the buffer correctly when marshaling and unmarshaling context handles .
by Alexandre Julliard 03 Jun '06

03 Jun '06

Module: wine Branch: refs/heads/master Commit: da44126395db90d09abc0b013c12c4305984dce4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=da44126395db90d09abc0b0… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jun 2 20:44:18 2006 +0100 rpcrt4: Align the buffer correctly when marshaling and unmarshaling context handles. --- dlls/rpcrt4/ndr_marshall.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 03f5c6c..240ca75 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -4345,7 +4345,10 @@ void WINAPI NdrClientContextMarshall(PMI NDR_CCONTEXT ContextHandle, int fCheck) { - TRACE("(%p, %p, %d): stub\n", pStubMsg, ContextHandle, fCheck); + TRACE("(%p, %p, %d)\n", pStubMsg, ContextHandle, fCheck); + + ALIGN_POINTER(pStubMsg->Buffer, 4); + /* FIXME: what does fCheck do? */ NDRCContextMarshall(ContextHandle, pStubMsg->Buffer); @@ -4360,7 +4363,10 @@ void WINAPI NdrClientContextUnmarshall(P NDR_CCONTEXT * pContextHandle, RPC_BINDING_HANDLE BindHandle) { - TRACE("(%p, %p, %p): stub\n", pStubMsg, pContextHandle, BindHandle); + TRACE("(%p, %p, %p)\n", pStubMsg, pContextHandle, BindHandle); + + ALIGN_POINTER(pStubMsg->Buffer, 4); + NDRCContextUnmarshall(pContextHandle, BindHandle, pStubMsg->Buffer,

1 0

Robert Shearman : rpcrt4: NdrClientContextMarshall/ Unmarshall should both increment the buffer pointer.
by Alexandre Julliard 03 Jun '06

03 Jun '06

Module: wine Branch: refs/heads/master Commit: 1a346a4a134b867f0494835782c1aae028335b39 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1a346a4a134b867f0494835… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jun 2 20:43:22 2006 +0100 rpcrt4: NdrClientContextMarshall/Unmarshall should both increment the buffer pointer. --- dlls/rpcrt4/ndr_marshall.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 90c19c9..befe124 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -4347,8 +4347,10 @@ void WINAPI NdrClientContextMarshall(PMI { TRACE("(%p, %p, %d): stub\n", pStubMsg, ContextHandle, fCheck); /* FIXME: what does fCheck do? */ - return NDRCContextMarshall(ContextHandle, - pStubMsg->Buffer); + NDRCContextMarshall(ContextHandle, + pStubMsg->Buffer); + + pStubMsg->Buffer += cbNDRContext; } /*********************************************************************** @@ -4359,10 +4361,12 @@ void WINAPI NdrClientContextUnmarshall(P RPC_BINDING_HANDLE BindHandle) { TRACE("(%p, %p, %p): stub\n", pStubMsg, pContextHandle, BindHandle); - return NDRCContextUnmarshall(pContextHandle, - BindHandle, - pStubMsg->Buffer, - pStubMsg->RpcMsg->DataRepresentation); + NDRCContextUnmarshall(pContextHandle, + BindHandle, + pStubMsg->Buffer, + pStubMsg->RpcMsg->DataRepresentation); + + pStubMsg->Buffer += cbNDRContext; } void WINAPI NdrServerContextMarshall(PMIDL_STUB_MESSAGE pStubMsg,

1 0

Robert Shearman : rpcrt4: Fix the unmarshaling of pointers in conformant varying arrays,
by Alexandre Julliard 03 Jun '06

03 Jun '06

Module: wine Branch: refs/heads/master Commit: dc6c640cd23540f5887b3662f1e9dbc8038b6c47 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dc6c640cd23540f5887b366… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jun 2 20:42:44 2006 +0100 rpcrt4: Fix the unmarshaling of pointers in conformant varying arrays, by passing the correct type format string to ReadConformance. --- dlls/rpcrt4/ndr_marshall.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index c714017..90c19c9 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2275,7 +2275,7 @@ unsigned char* WINAPI NdrConformantVaryi return NULL; } - pFormat = ReadConformance(pStubMsg, pFormat); + pFormat = ReadConformance(pStubMsg, pFormat+4); pFormat = ReadVariance(pStubMsg, pFormat); ALIGN_POINTER(pStubMsg->Buffer, alignment);

1 0