December 2007 - Wine-commits

Rob Shearman : rpcrt4: Add tests for NdrServerInitializeNew.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 07622b0f05f18fdcbfdd635cc33c9e4fe4ca18ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=07622b0f05f18fdcbfdd635cc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Dec 30 16:46:15 2007 +0000 rpcrt4: Add tests for NdrServerInitializeNew. --- dlls/rpcrt4/tests/ndr_marshall.c | 104 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 100 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 73e33a4..eadb9c7 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -866,14 +866,15 @@ static void test_client_init(void) MIDL_STUB_MESSAGE stubMsg; RPC_MESSAGE rpcMsg; + memset(&rpcMsg, 0, sizeof(rpcMsg)); memset(&stubMsg, 0xcc, sizeof(stubMsg)); NdrClientInitializeNew(&rpcMsg, &stubMsg, &Object_StubDesc, 1); -#define TEST_ZERO(field, fmt) ok(stubMsg.field == 0, #field " should have be set to zero instead of " fmt "\n", stubMsg.field) -#define TEST_POINTER_UNSET(field) ok(stubMsg.field == (void *)0xcccccccc, #field " should have be unset instead of %p\n", stubMsg.field) -#define TEST_ULONG_UNSET(field) ok(stubMsg.field == 0xcccccccc, #field " should have be unset instead of 0x%x\n", stubMsg.field) -#define TEST_ULONG_PTR_UNSET(field) ok(stubMsg.field == 0xcccccccc, #field " should have be unset instead of 0x%lx\n", stubMsg.field) +#define TEST_ZERO(field, fmt) ok(stubMsg.field == 0, #field " should have been set to zero instead of " fmt "\n", stubMsg.field) +#define TEST_POINTER_UNSET(field) ok(stubMsg.field == (void *)0xcccccccc, #field " should have been unset instead of %p\n", stubMsg.field) +#define TEST_ULONG_UNSET(field) ok(stubMsg.field == 0xcccccccc, #field " should have been unset instead of 0x%x\n", stubMsg.field) +#define TEST_ULONG_PTR_UNSET(field) ok(stubMsg.field == 0xcccccccc, #field " should have been unset instead of 0x%lx\n", stubMsg.field) ok(stubMsg.RpcMsg == &rpcMsg, "stubMsg.RpcMsg should have been %p instead of %p\n", &rpcMsg, stubMsg.RpcMsg); TEST_POINTER_UNSET(Buffer); @@ -946,6 +947,100 @@ static void test_client_init(void) } +static void test_server_init(void) +{ + MIDL_STUB_MESSAGE stubMsg; + RPC_MESSAGE rpcMsg; + unsigned char *ret; + unsigned char buffer[256]; + + memset(&rpcMsg, 0, sizeof(rpcMsg)); + rpcMsg.Buffer = buffer; + rpcMsg.BufferLength = sizeof(buffer); + rpcMsg.RpcFlags = RPC_BUFFER_COMPLETE; + + memset(&stubMsg, 0xcc, sizeof(stubMsg)); + + ret = NdrServerInitializeNew(&rpcMsg, &stubMsg, &Object_StubDesc); + ok(ret == NULL, "NdrServerInitializeNew should have returned NULL instead of %p\n", ret); + +#define TEST_ZERO(field, fmt) ok(stubMsg.field == 0, #field " should have been set to zero instead of " fmt "\n", stubMsg.field) +#define TEST_POINTER_UNSET(field) ok(stubMsg.field == (void *)0xcccccccc, #field " should have been unset instead of %p\n", stubMsg.field) +#define TEST_ULONG_UNSET(field) ok(stubMsg.field == 0xcccccccc, #field " should have been unset instead of 0x%x\n", stubMsg.field) +#define TEST_ULONG_PTR_UNSET(field) ok(stubMsg.field == 0xcccccccc, #field " should have been unset instead of 0x%lx\n", stubMsg.field) + + ok(stubMsg.RpcMsg == &rpcMsg, "stubMsg.RpcMsg should have been %p instead of %p\n", &rpcMsg, stubMsg.RpcMsg); + ok(stubMsg.Buffer == buffer, "stubMsg.Buffer should have been %p instead of %p\n", buffer, stubMsg.Buffer); + ok(stubMsg.BufferStart == buffer, "stubMsg.BufferStart should have been %p instead of %p\n", buffer, stubMsg.BufferStart); + ok(stubMsg.BufferEnd == buffer + sizeof(buffer), "stubMsg.BufferEnd should have been %p instead of %p\n", buffer + sizeof(buffer), stubMsg.BufferEnd); + TEST_POINTER_UNSET(BufferMark); +todo_wine + TEST_ZERO(BufferLength, "%d"); + TEST_ULONG_UNSET(MemorySize); + TEST_POINTER_UNSET(Memory); + ok(stubMsg.IsClient == 0, "stubMsg.IsClient should have been 0 instead of %u\n", stubMsg.IsClient); + TEST_ZERO(ReuseBuffer, "%d"); + TEST_ZERO(pAllocAllNodesContext, "%p"); + TEST_ZERO(pPointerQueueState, "%p"); + TEST_ZERO(IgnoreEmbeddedPointers, "%d"); + TEST_ZERO(PointerBufferMark, "%p"); + ok(stubMsg.fBufferValid == 0xcc, "fBufferValid should have been unset instead of 0x%x\n", stubMsg.fBufferValid); + TEST_ZERO(uFlags, "%d"); + /* FIXME: UniquePtrCount */ + TEST_ULONG_PTR_UNSET(MaxCount); + TEST_ULONG_UNSET(Offset); + TEST_ULONG_UNSET(ActualCount); + ok(stubMsg.pfnAllocate == my_alloc, "stubMsg.pfnAllocate should have been %p instead of %p\n", my_alloc, stubMsg.pfnAllocate); + ok(stubMsg.pfnFree == my_free, "stubMsg.pfnFree should have been %p instead of %p\n", my_free, stubMsg.pfnFree); + TEST_ZERO(StackTop, "%p"); + TEST_POINTER_UNSET(pPresentedType); + TEST_POINTER_UNSET(pTransmitType); + TEST_POINTER_UNSET(SavedHandle); + ok(stubMsg.StubDesc == &Object_StubDesc, "stubMsg.StubDesc should have been %p instead of %p\n", &Object_StubDesc, stubMsg.StubDesc); + TEST_ZERO(FullPtrXlatTables, "%p"); + TEST_ZERO(FullPtrRefId, "%d"); + TEST_ZERO(PointerLength, "%d"); + TEST_ZERO(fInDontFree, "%d"); + TEST_ZERO(fDontCallFreeInst, "%d"); + TEST_ZERO(fInOnlyParam, "%d"); + TEST_ZERO(fHasReturn, "%d"); + TEST_ZERO(fHasExtensions, "%d"); + TEST_ZERO(fHasNewCorrDesc, "%d"); + TEST_ZERO(fUnused, "%d"); + ok(stubMsg.fUnused2 == 0xffffcccc, "stubMsg.fUnused2 should have been 0xcccc instead of 0x%x\n", stubMsg.fUnused2); + ok(stubMsg.dwDestContext == MSHCTX_DIFFERENTMACHINE, "stubMsg.dwDestContext should have been MSHCTX_DIFFERENTMACHINE instead of %d\n", stubMsg.dwDestContext); + TEST_ZERO(pvDestContext, "%p"); + TEST_POINTER_UNSET(SavedContextHandles); + TEST_ULONG_UNSET(ParamNumber); + TEST_ZERO(pRpcChannelBuffer, "%p"); + TEST_ZERO(pArrayInfo, "%p"); + TEST_POINTER_UNSET(SizePtrCountArray); + TEST_POINTER_UNSET(SizePtrOffsetArray); + TEST_POINTER_UNSET(SizePtrLengthArray); + TEST_POINTER_UNSET(pArgQueue); + TEST_ZERO(dwStubPhase, "%d"); + /* FIXME: where does this value come from? */ + trace("LowStackMark is %p\n", stubMsg.LowStackMark); + TEST_ZERO(pAsyncMsg, "%p"); + TEST_ZERO(pCorrInfo, "%p"); + TEST_ZERO(pCorrMemory, "%p"); + TEST_ZERO(pMemoryList, "%p"); + TEST_POINTER_UNSET(pCSInfo); + TEST_POINTER_UNSET(ConformanceMark); + TEST_POINTER_UNSET(VarianceMark); + ok(stubMsg.Unused == 0xcccccccc, "Unused should have be unset instead of 0x%lx\n", stubMsg.Unused); + TEST_POINTER_UNSET(pContext); + TEST_POINTER_UNSET(ContextHandleHash); + TEST_POINTER_UNSET(pUserMarshalList); + TEST_ULONG_PTR_UNSET(Reserved51_3); + TEST_ULONG_PTR_UNSET(Reserved51_4); + TEST_ULONG_PTR_UNSET(Reserved51_5); +#undef TEST_ULONG_UNSET +#undef TEST_POINTER_UNSET +#undef TEST_ZERO + +} + static void test_ndr_allocate(void) { RPC_MESSAGE RpcMessage; @@ -1421,6 +1516,7 @@ START_TEST( ndr_marshall ) test_simple_struct(); test_fullpointer_xlat(); test_client_init(); + test_server_init(); test_ndr_allocate(); test_conformant_array(); test_conformant_string();

1 0

Rob Shearman : rpcrt4: Make some variables in the tests static.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 4aff0cdac4b9c4ea7d39d2a300e3ae402b5370f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aff0cdac4b9c4ea7d39d2a30… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Dec 30 16:46:21 2007 +0000 rpcrt4: Make some variables in the tests static. --- dlls/rpcrt4/tests/rpc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 3828260..a720370 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -180,7 +180,7 @@ static RPC_DISPATCH_FUNCTION IFoo_table[] = 0 }; -RPC_DISPATCH_TABLE IFoo_v0_0_DispatchTable = +static RPC_DISPATCH_TABLE IFoo_v0_0_DispatchTable = { 0, IFoo_table @@ -199,7 +199,7 @@ static const RPC_SERVER_INTERFACE IFoo___RpcServerInterface = 0, }; -RPC_IF_HANDLE IFoo_v0_0_s_ifspec = (RPC_IF_HANDLE)& IFoo___RpcServerInterface; +static RPC_IF_HANDLE IFoo_v0_0_s_ifspec = (RPC_IF_HANDLE)& IFoo___RpcServerInterface; static void test_rpc_ncacn_ip_tcp(void) {

1 0

Rob Shearman : widl: Check that the buffer has enough space before unmarshalling base types in generated code .
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 9aaff94fb7c49ec48f909b86dc219b81913afce8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aaff94fb7c49ec48f909b86d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Dec 30 16:45:05 2007 +0000 widl: Check that the buffer has enough space before unmarshalling base types in generated code. --- tools/widl/typegen.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index dee5ad8..f40399f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2611,6 +2611,12 @@ void print_phase_basetype(FILE *file, int indent, enum remoting_phase phase, } else if (phase == PHASE_UNMARSHAL) { + print_file(file, indent, "if (_StubMsg.Buffer + sizeof("); + write_type_decl(file, is_ptr(type) ? type->ref : type, NULL); + fprintf(file, ") > _StubMsg.BufferEnd)\n"); + print_file(file, indent, "{\n"); + print_file(file, indent + 1, "RpcRaiseException(RPC_X_BAD_STUB_DATA);\n"); + print_file(file, indent, "}\n"); if (pass == PASS_IN || pass == PASS_RETURN) print_file(file, indent, ""); else

1 0

Rob Shearman : include: Add defines for more message flags in rpcdcep.h.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: b574533e508cf5c3185e8d3b9f2d8ba0ba7536ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=b574533e508cf5c3185e8d3b9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Dec 30 16:45:42 2007 +0000 include: Add defines for more message flags in rpcdcep.h. --- include/rpcdcep.h | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/include/rpcdcep.h b/include/rpcdcep.h index f2a2196..5514790 100644 --- a/include/rpcdcep.h +++ b/include/rpcdcep.h @@ -61,6 +61,21 @@ typedef struct _RPC_MESSAGE #define RPC_NCA_FLAGS_BROADCAST 0x00000002 #define RPC_NCA_FLAGS_MAYBE 0x00000004 +#define RPC_BUFFER_COMPLETE 0x00001000 +#define RPC_BUFFER_PARTIAL 0x00002000 +#define RPC_BUFFER_EXTRA 0x00004000 +#define RPC_BUFFER_ASYNC 0x00008000 +#define RPC_BUFFER_NONOTIFY 0x00010000 + +#define RPCFLG_MESSAGE 0x01000000 +#define RPCFLG_HAS_MULTI_SYNTAXES 0x02000000 +#define RPCFLG_HAS_CALLBACK 0x04000000 +#define RPCFLG_AUTO_COMPLETE 0x08000000 +#define RPCFLG_LOCAL_CALL 0x10000000 +#define RPCFLG_INPUT_SYNCHRONOUS 0x20000000 +#define RPCFLG_ASYNCHRONOUS 0x40000000 +#define RPCFLG_NON_NDR 0x80000000 + typedef void (__RPC_STUB *RPC_DISPATCH_FUNCTION)(PRPC_MESSAGE Message); typedef RPC_STATUS (RPC_ENTRY *RPC_FORWARD_FUNCTION)(UUID *InterfaceId, RPC_VERSION *InterfaceVersion, UUID *ObjectId, unsigned char *Rpcpro, void **ppDestEndpoint);

1 0

Rob Shearman : rpcrt4: Keep a track of server context handles allocated during processing of a request .
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 51c051c0c4fc26e45ab6c04684acf73886eeb7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51c051c0c4fc26e45ab6c0468… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Dec 30 16:44:54 2007 +0000 rpcrt4: Keep a track of server context handles allocated during processing of a request. Release them after processing of a request has finished to avoid a slow memory leak if the association isn't released for ages. --- dlls/rpcrt4/ndr_contexthandle.c | 2 + dlls/rpcrt4/rpc_binding.h | 4 ++ dlls/rpcrt4/rpc_server.c | 5 +++ dlls/rpcrt4/rpcrt4_main.c | 60 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_contexthandle.c b/dlls/rpcrt4/ndr_contexthandle.c index 0b3eeb1..7b3c3fd 100644 --- a/dlls/rpcrt4/ndr_contexthandle.c +++ b/dlls/rpcrt4/ndr_contexthandle.c @@ -272,6 +272,7 @@ void WINAPI NDRSContextMarshall2(RPC_BINDING_HANDLE hBinding, return; /* this is to cope with the case of the data not being valid * before and so not having a further reference */ } + RPCRT4_RemoveThreadContextHandle(SContext); RpcServerAssoc_ReleaseContextHandle(binding->Assoc, SContext, TRUE); } @@ -335,5 +336,6 @@ NDR_SCONTEXT WINAPI NDRSContextUnmarshall2(RPC_BINDING_HANDLE hBinding, if (status != RPC_S_OK) RpcRaiseException(status); + RPCRT4_PushThreadContextHandle(SContext); return SContext; } diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index b774074..ed8d4ea 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -22,6 +22,7 @@ #define __WINE_RPC_BINDING_H #include "wine/rpcss_shared.h" +#include "rpcndr.h" #include "security.h" #include "wine/list.h" @@ -189,5 +190,8 @@ RPC_STATUS RpcTransport_ParseTopOfTower(const unsigned char *tower_data, size_t void RPCRT4_SetThreadCurrentConnection(RpcConnection *Connection); void RPCRT4_SetThreadCurrentCallHandle(RpcBinding *Binding); RpcBinding *RPCRT4_GetThreadCurrentCallHandle(void); +void RPCRT4_PushThreadContextHandle(NDR_SCONTEXT SContext); +void RPCRT4_RemoveThreadContextHandle(NDR_SCONTEXT SContext); +NDR_SCONTEXT RPCRT4_PopThreadContextHandle(void); #endif diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index a1262da..34c71c7 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -172,6 +172,7 @@ static void RPCRT4_process_packet(RpcConnection* conn, RpcPktHdr* hdr, RPC_MESSA void *buf = msg->Buffer; RPC_STATUS status; BOOL exception; + NDR_SCONTEXT context_handle; msg->Handle = (RPC_BINDING_HANDLE)conn->server_binding; @@ -307,6 +308,10 @@ static void RPCRT4_process_packet(RpcConnection* conn, RpcPktHdr* hdr, RPC_MESSA } __ENDTRY RPCRT4_SetThreadCurrentCallHandle(NULL); + /* release any unmarshalled context handles */ + while ((context_handle = RPCRT4_PopThreadContextHandle()) != NULL) + RpcServerAssoc_ReleaseContextHandle(conn->server_binding->Assoc, context_handle, TRUE); + if (!exception) response = RPCRT4_BuildResponseHeader(msg->DataRepresentation, msg->BufferLength); diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index 887e049..e48cf58 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -146,6 +146,12 @@ static CRITICAL_SECTION threaddata_cs = { &threaddata_cs_debug, -1, 0, 0, 0, 0 } struct list threaddata_list = LIST_INIT(threaddata_list); +struct context_handle_list +{ + struct context_handle_list *next; + NDR_SCONTEXT context_handle; +}; + struct threaddata { struct list entry; @@ -153,6 +159,7 @@ struct threaddata DWORD thread_id; RpcConnection *connection; RpcBinding *server_binding; + struct context_handle_list *context_handle_list; }; /*********************************************************************** @@ -936,6 +943,59 @@ RpcBinding *RPCRT4_GetThreadCurrentCallHandle(void) return tdata->server_binding; } +void RPCRT4_PushThreadContextHandle(NDR_SCONTEXT SContext) +{ + struct threaddata *tdata = get_or_create_threaddata(); + struct context_handle_list *context_handle_list; + + if (!tdata) return; + + context_handle_list = HeapAlloc(GetProcessHeap(), 0, sizeof(*context_handle_list)); + if (!context_handle_list) return; + + context_handle_list->context_handle = SContext; + context_handle_list->next = tdata->context_handle_list; + tdata->context_handle_list = context_handle_list; +} + +void RPCRT4_RemoveThreadContextHandle(NDR_SCONTEXT SContext) +{ + struct threaddata *tdata = get_or_create_threaddata(); + struct context_handle_list *current, *prev; + + if (!tdata) return; + + for (current = tdata->context_handle_list, prev = NULL; current; prev = current, current = current->next) + { + if (current->context_handle == SContext) + { + if (prev) + prev->next = current->next; + else + tdata->context_handle_list = current->next; + HeapFree(GetProcessHeap(), 0, current); + return; + } + } +} + +NDR_SCONTEXT RPCRT4_PopThreadContextHandle(void) +{ + struct threaddata *tdata = get_or_create_threaddata(); + struct context_handle_list *context_handle_list; + NDR_SCONTEXT context_handle; + + if (!tdata) return NULL; + + context_handle_list = tdata->context_handle_list; + if (!context_handle_list) return NULL; + tdata->context_handle_list = context_handle_list->next; + + context_handle = context_handle_list->context_handle; + HeapFree(GetProcessHeap(), 0, context_handle_list); + return context_handle; +} + /****************************************************************************** * RpcCancelThread (rpcrt4.@) */

1 0

Rob Shearman : rpcrt4: Fix a case of destroying a context handle without first releasing the lock .
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: f6a29a1e73a4ad4bba7eac7be3d37266548684a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6a29a1e73a4ad4bba7eac7be… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Dec 30 16:45:19 2007 +0000 rpcrt4: Fix a case of destroying a context handle without first releasing the lock. Reverse the order of the release statements in NDRSContextMarshall2 for the case where the context handle doesn't have valid data so that the release that releases the lock comes first and then the optional second release doesn't need to release the lock. --- dlls/rpcrt4/ndr_contexthandle.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_contexthandle.c b/dlls/rpcrt4/ndr_contexthandle.c index 7b3c3fd..21d8747 100644 --- a/dlls/rpcrt4/ndr_contexthandle.c +++ b/dlls/rpcrt4/ndr_contexthandle.c @@ -259,21 +259,25 @@ void WINAPI NDRSContextMarshall2(RPC_BINDING_HANDLE hBinding, RpcRaiseException(status); ndr->attributes = 0; RpcContextHandle_GetUuid(SContext, &ndr->uuid); + + RPCRT4_RemoveThreadContextHandle(SContext); + RpcServerAssoc_ReleaseContextHandle(binding->Assoc, SContext, TRUE); } else { if (!RpcContextHandle_IsGuardCorrect(SContext, CtxGuard)) RpcRaiseException(ERROR_INVALID_HANDLE); memset(ndr, 0, sizeof(*ndr)); + + RPCRT4_RemoveThreadContextHandle(SContext); /* Note: release the context handle twice in this case to release * one ref being kept around for the data and one ref for the * unmarshall/marshall sequence */ - if (!RpcServerAssoc_ReleaseContextHandle(binding->Assoc, SContext, FALSE)) + if (!RpcServerAssoc_ReleaseContextHandle(binding->Assoc, SContext, TRUE)) return; /* this is to cope with the case of the data not being valid * before and so not having a further reference */ + RpcServerAssoc_ReleaseContextHandle(binding->Assoc, SContext, FALSE); } - RPCRT4_RemoveThreadContextHandle(SContext); - RpcServerAssoc_ReleaseContextHandle(binding->Assoc, SContext, TRUE); } /***********************************************************************

1 0

Jacek Caban : ole32: Fixed parameter checking and improved debug traces in IBindCtx:: QueryInterface.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 2c6cbea080da4e902d31d32ade832519507a8a0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6cbea080da4e902d31d32ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 30 17:44:32 2007 +0100 ole32: Fixed parameter checking and improved debug traces in IBindCtx::QueryInterface. --- dlls/ole32/bindctx.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index da68f33..e0f297e 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -74,11 +74,11 @@ BindCtxImpl_QueryInterface(IBindCtx* iface,REFIID riid,void** ppvObject) { BindCtxImpl *This = (BindCtxImpl *)iface; - TRACE("(%p,%p,%p)\n",This,riid,ppvObject); + TRACE("(%p %s %p)\n",This, debugstr_guid(riid), ppvObject); /* Perform a sanity check on the parameters.*/ - if ( (This==0) || (ppvObject==0) ) - return E_INVALIDARG; + if (!ppvObject) + return E_POINTER; /* Initialize the return parameter.*/ *ppvObject = 0;

1 0

Jacek Caban : urlmon: Better implementation of bind stopping.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 2f34d0093c3ac679d13eab92761c4cbdd2dcd73e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f34d0093c3ac679d13eab927… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 30 17:43:11 2007 +0100 urlmon: Better implementation of bind stopping. --- dlls/urlmon/binding.c | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index ca83537..8bfc9c1 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -52,6 +52,7 @@ typedef enum { } download_state_t; #define BINDING_LOCKED 0x0001 +#define BINDING_STOPPED 0x0002 struct Binding { const IBindingVtbl *lpBindingVtbl; @@ -74,6 +75,7 @@ struct Binding { BOOL report_mime; DWORD continue_call; DWORD state; + HRESULT hres; download_state_t download_state; DWORD apartment_thread; @@ -310,6 +312,21 @@ static void mime_available(Binding *This, LPCWSTR mime, BOOL verify) } } +static void stop_binding(Binding *binding, HRESULT hres, LPCWSTR str) +{ + if(binding->state & BINDING_LOCKED) { + IInternetProtocol_UnlockRequest(binding->protocol); + binding->state &= ~BINDING_LOCKED; + } + + if(!(binding->state & BINDING_STOPPED)) { + binding->state |= BINDING_STOPPED; + + IBindStatusCallback_OnStopBinding(binding->callback, hres, str); + binding->hres = hres; + } +} + #define STREAM_THIS(iface) DEFINE_THIS(ProtocolStream, Stream, iface) static HRESULT WINAPI ProtocolStream_QueryInterface(IStream *iface, @@ -852,9 +869,8 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres IBindStatusCallback_OnDataAvailable(This->callback, bscf, progress, &formatetc, &This->stgmed); - if(This->download_state == END_DOWNLOAD) { - IBindStatusCallback_OnStopBinding(This->callback, S_OK, NULL); - } + if(This->download_state == END_DOWNLOAD) + stop_binding(This, S_OK, NULL); } typedef struct { @@ -1167,6 +1183,7 @@ static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding * ret->state = 0; ret->download_state = BEFORE_DOWNLOAD; ret->task_queue_head = ret->task_queue_tail = NULL; + ret->hres = S_OK; memset(&ret->bindinfo, 0, sizeof(BINDINFO)); ret->bindinfo.cbSize = sizeof(BINDINFO); @@ -1232,7 +1249,7 @@ static HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding ** hres = IBindStatusCallback_OnStartBinding(binding->callback, 0, BINDING(binding)); if(FAILED(hres)) { WARN("OnStartBinding failed: %08x\n", hres); - IBindStatusCallback_OnStopBinding(binding->callback, 0x800c0008, NULL); + stop_binding(binding, 0x800c0008, NULL); IBinding_Release(BINDING(binding)); return hres; } @@ -1245,8 +1262,7 @@ static HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding ** if(FAILED(hres)) { WARN("Start failed: %08x\n", hres); - IInternetProtocol_Terminate(binding->protocol, 0); - IBindStatusCallback_OnStopBinding(binding->callback, S_OK, NULL); + stop_binding(binding, hres, NULL); IBinding_Release(BINDING(binding)); return hres;

1 0

Jacek Caban : urlmon: Better error handling.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 91938977e9e1ee175c5193cc30ca996ce041016d URL: http://source.winehq.org/git/wine.git/?a=commit;h=91938977e9e1ee175c5193cc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 30 17:43:26 2007 +0100 urlmon: Better error handling. --- dlls/urlmon/binding.c | 34 ++++++++++++++++++++++++---------- 1 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 8bfc9c1..706daed 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -913,16 +913,23 @@ static HRESULT WINAPI InternetProtocolSink_ReportData(IInternetProtocolSink *ifa return S_OK; } +typedef struct { + task_header_t header; + + HRESULT hres; + LPWSTR str; +} report_result_task_t; + static void report_result_proc(Binding *binding, task_header_t *t) { + report_result_task_t *task = (report_result_task_t*)t; + IInternetProtocol_Terminate(binding->protocol, 0); - if(binding->state & BINDING_LOCKED) { - IInternetProtocol_UnlockRequest(binding->protocol); - binding->state &= ~BINDING_LOCKED; - } + stop_binding(binding, task->hres, task->str); - heap_free(t); + heap_free(task->str); + heap_free(task); } static HRESULT WINAPI InternetProtocolSink_ReportResult(IInternetProtocolSink *iface, @@ -934,9 +941,14 @@ static HRESULT WINAPI InternetProtocolSink_ReportResult(IInternetProtocolSink *i if(GetCurrentThreadId() == This->apartment_thread && !This->continue_call) { IInternetProtocol_Terminate(This->protocol, 0); + stop_binding(This, hrResult, szResult); }else { - task_header_t *task = heap_alloc(sizeof(task_header_t)); - push_task(This, task, report_result_proc); + report_result_task_t *task = heap_alloc(sizeof(report_result_task_t)); + + task->hres = hrResult; + task->str = heap_strdupW(szResult); + + push_task(This, &task->header, report_result_proc); } return S_OK; @@ -1269,7 +1281,7 @@ static HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding ** } while(!(binding->bindf & BINDF_ASYNCHRONOUS) && - binding->download_state != END_DOWNLOAD) { + !(binding->state & BINDING_STOPPED)) { MsgWaitForMultipleObjects(0, NULL, FALSE, 5000, QS_POSTMESSAGE); while (PeekMessageW(&msg, binding->notif_hwnd, WM_USER, WM_USER+117, PM_REMOVE|PM_NOYIELD)) { TranslateMessage(&msg); @@ -1292,8 +1304,10 @@ HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv) if(FAILED(hres)) return hres; - if(binding->stream->init_buf) { - if(binding->state & BINDING_LOCKED) + if(binding->hres != S_OK) { + hres = SUCCEEDED(binding->hres) ? S_OK : binding->hres; + }else if(binding->stream->init_buf) { + if((binding->state & BINDING_STOPPED) && (binding->state & BINDING_LOCKED)) IInternetProtocol_UnlockRequest(binding->protocol); IStream_AddRef(STREAM(binding->stream));

1 0

Jacek Caban : urlmon: Binding_Create clean up.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: e3c47c88fdc40a7edf52d47535ed6576d7946130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3c47c88fdc40a7edf52d4753… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 30 17:43:39 2007 +0100 urlmon: Binding_Create clean up. --- dlls/urlmon/binding.c | 20 ++------------------ 1 files changed, 2 insertions(+), 18 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 706daed..23b11bd 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1162,7 +1162,6 @@ static BOOL is_urlmon_protocol(LPCWSTR url) static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding **binding) { Binding *ret; - int len; HRESULT hres; if(!IsEqualGUID(&IID_IStream, riid)) { @@ -1172,7 +1171,7 @@ static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding * URLMON_LockModule(); - ret = heap_alloc(sizeof(Binding)); + ret = heap_alloc_zero(sizeof(Binding)); ret->lpBindingVtbl = &BindingVtbl; ret->lpInternetProtocolSinkVtbl = &InternetProtocolSinkVtbl; @@ -1181,25 +1180,12 @@ static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding * ret->ref = 1; - ret->callback = NULL; - ret->protocol = NULL; - ret->service_provider = NULL; - ret->stream = NULL; - ret->mime = NULL; - ret->clipboard_format = 0; - ret->url = NULL; ret->apartment_thread = GetCurrentThreadId(); ret->notif_hwnd = get_notif_hwnd(); ret->report_mime = TRUE; - ret->continue_call = 0; - ret->state = 0; ret->download_state = BEFORE_DOWNLOAD; - ret->task_queue_head = ret->task_queue_tail = NULL; - ret->hres = S_OK; - memset(&ret->bindinfo, 0, sizeof(BINDINFO)); ret->bindinfo.cbSize = sizeof(BINDINFO); - ret->bindf = 0; InitializeCriticalSection(&ret->section); ret->section.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": Binding.section"); @@ -1235,9 +1221,7 @@ static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding * if(!is_urlmon_protocol(url)) ret->bindf |= BINDF_NEEDFILE; - len = strlenW(url)+1; - ret->url = heap_alloc(len*sizeof(WCHAR)); - memcpy(ret->url, url, len*sizeof(WCHAR)); + ret->url = heap_strdupW(url); ret->stream = create_stream(ret->protocol); ret->stgmed.tymed = TYMED_ISTREAM;

1 0