May 2006 - Wine-Commits - list.winehq.org

Robert Shearman : rpcrt4: Set the Memory field of the stub message structure to the
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: ec2a9cef3a52bd59a1faa028b7a4c49123c02285 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ec2a9cef3a52bd59a1faa02… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 24 23:04:35 2006 +0100 rpcrt4: Set the Memory field of the stub message structure to the start of the memory that an embedded pointer is embedded in so that FC_POINTER conformance works correctly. --- dlls/rpcrt4/ndr_marshall.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index f6888c8..e7e1ff9 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1041,7 +1041,11 @@ static unsigned char * EmbeddedPointerMa for (u=0; u<count; u++,info+=8) { unsigned char *memptr = membase + *(const SHORT*)&info[0]; unsigned char *bufptr = bufbase + *(const SHORT*)&info[2]; + unsigned char *saved_memory = pStubMsg->Memory; + + pStubMsg->Memory = pMemory; PointerMarshall(pStubMsg, bufptr, *(unsigned char**)memptr, info+4); + pStubMsg->Memory = saved_memory; } } pFormat += 8 * count; @@ -1172,7 +1176,11 @@ static void EmbeddedPointerBufferSize(PM unsigned u; for (u=0; u<count; u++,info+=8) { unsigned char *memptr = membase + *(const SHORT*)&info[0]; + unsigned char *saved_memory = pStubMsg->Memory; + + pStubMsg->Memory = pMemory; PointerBufferSize(pStubMsg, *(unsigned char**)memptr, info+4); + pStubMsg->Memory = saved_memory; } } pFormat += 8 * count; @@ -1291,7 +1299,11 @@ static void EmbeddedPointerFree(PMIDL_ST unsigned u; for (u=0; u<count; u++,info+=8) { unsigned char *memptr = membase + *(const SHORT*)&info[0]; + unsigned char *saved_memory = pStubMsg->Memory; + + pStubMsg->Memory = pMemory; PointerFree(pStubMsg, *(unsigned char**)memptr, info+4); + pStubMsg->Memory = saved_memory; } } pFormat += 8 * count;

1 0

Robert Shearman : rpcrt4: Implement explicit generic binding handles.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: 4e85273086f05d69656b844a3354ebcf8e6866b6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4e85273086f05d69656b844… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 24 23:03:54 2006 +0100 rpcrt4: Implement explicit generic binding handles. --- dlls/rpcrt4/ndr_stubless.c | 79 ++++++++++++++++++++++++++++++++++++++++++-- include/rpcndr.h | 17 ++++++++- 2 files changed, 90 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 03541c5..1f1e2e1 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -394,9 +394,23 @@ static PFORMAT_STRING client_get_handle( return pFormat + sizeof(NDR_EHD_PRIMITIVE); } case RPC_FC_BIND_GENERIC: /* explicit generic */ - FIXME("RPC_FC_BIND_GENERIC\n"); - RpcRaiseException(RPC_X_WRONG_STUB_VERSION); /* FIXME: remove when implemented */ - return pFormat + sizeof(NDR_EHD_GENERIC); + { + NDR_EHD_GENERIC * pDesc = (NDR_EHD_GENERIC *)pFormat; + void *pObject = NULL; + void *pArg; + const GENERIC_BINDING_ROUTINE_PAIR *pGenPair; + + TRACE("Explicit generic binding handle #%d\n", pDesc->binding_routine_pair_index); + + if (pDesc->flag_and_size & HANDLE_PARAM_IS_VIA_PTR) + pArg = *(void **)ARG_FROM_OFFSET(*pStubMsg, pDesc->offset); + else + pArg = (void *)ARG_FROM_OFFSET(*pStubMsg, pDesc->offset); + memcpy(&pObject, pArg, pDesc->flag_and_size & 0xf); + pGenPair = &pStubMsg->StubDesc->aGenericBindingRoutinePairs[pDesc->binding_routine_pair_index]; + *phBinding = pGenPair->pfnBind(pObject); + return pFormat + sizeof(NDR_EHD_GENERIC); + } case RPC_FC_BIND_CONTEXT: /* explicit context */ { NDR_EHD_CONTEXT * pDesc = (NDR_EHD_CONTEXT *)pFormat; @@ -451,6 +465,57 @@ static PFORMAT_STRING client_get_handle( return pFormat; } +static void client_free_handle( + PMIDL_STUB_MESSAGE pStubMsg, const NDR_PROC_HEADER *pProcHeader, + PFORMAT_STRING pFormat, handle_t hBinding) +{ + /* binding */ + switch (pProcHeader->handle_type) + { + /* explicit binding: parse additional section */ + case RPC_FC_BIND_EXPLICIT: + switch (*pFormat) /* handle_type */ + { + case RPC_FC_BIND_GENERIC: /* explicit generic */ + { + NDR_EHD_GENERIC * pDesc = (NDR_EHD_GENERIC *)pFormat; + void *pObject = NULL; + void *pArg; + const GENERIC_BINDING_ROUTINE_PAIR *pGenPair; + + TRACE("Explicit generic binding handle #%d\n", pDesc->binding_routine_pair_index); + + if (pDesc->flag_and_size & HANDLE_PARAM_IS_VIA_PTR) + pArg = *(void **)ARG_FROM_OFFSET(*pStubMsg, pDesc->offset); + else + pArg = (void *)ARG_FROM_OFFSET(*pStubMsg, pDesc->offset); + memcpy(&pObject, pArg, pDesc->flag_and_size & 0xf); + pGenPair = &pStubMsg->StubDesc->aGenericBindingRoutinePairs[pDesc->binding_routine_pair_index]; + pGenPair->pfnUnbind(pObject, hBinding); + break; + } + case RPC_FC_BIND_CONTEXT: /* explicit context */ + case RPC_FC_BIND_PRIMITIVE: /* explicit primitive */ + break; + default: + ERR("bad explicit binding handle type (0x%02x)\n", pProcHeader->handle_type); + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + break; + case RPC_FC_BIND_GENERIC: /* implicit generic */ + FIXME("RPC_FC_BIND_GENERIC\n"); + RpcRaiseException(RPC_X_BAD_STUB_DATA); /* FIXME: remove when implemented */ + break; + case RPC_FC_CALLBACK_HANDLE: /* implicit callback */ + case RPC_FC_BIND_PRIMITIVE: /* implicit primitive */ + case RPC_FC_AUTO_HANDLE: /* implicit auto handle */ + break; + default: + ERR("bad implicit binding handle type (0x%02x)\n", pProcHeader->handle_type); + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } +} + /* the return type should be CLIENT_CALL_RETURN, but this is incompatible * with the way gcc returns structures. "void *" should be the largest type * that MIDL should allow you to return anyway */ @@ -480,6 +545,7 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_ST LONG_PTR RetVal = 0; /* the pointer to the object when in OLE mode */ void * This = NULL; + PFORMAT_STRING pHandleFormat; TRACE("pStubDesc %p, pFormat %p, ...\n", pStubDesc, pFormat); @@ -524,10 +590,12 @@ #else # warning Stack not retrieved for your CPU architecture #endif + pHandleFormat = pFormat; + /* we only need a handle if this isn't an object method */ if (!(pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT)) { - pFormat = client_get_handle(&stubMsg, pProcHeader, pFormat, &hBinding); + pFormat = client_get_handle(&stubMsg, pProcHeader, pHandleFormat, &hBinding); if (!pFormat) return 0; } @@ -890,7 +958,10 @@ #endif if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) NdrProxyFreeBuffer(This, &stubMsg); else + { NdrFreeBuffer(&stubMsg); + client_free_handle(&stubMsg, pProcHeader, pHandleFormat, hBinding); + } TRACE("RetVal = 0x%lx\n", RetVal); diff --git a/include/rpcndr.h b/include/rpcndr.h index 18dce08..6f43bb4 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -227,9 +227,22 @@ typedef struct _MIDL_STUB_MESSAGE } MIDL_STUB_MESSAGE, *PMIDL_STUB_MESSAGE; #include <poppack.h> -typedef struct _GENERIC_BINDING_ROUTINE_PAIR GENERIC_BINDING_ROUTINE_PAIR, *PGENERIC_BINDING_ROUTINE_PAIR; +typedef void * (__RPC_API * GENERIC_BINDING_ROUTINE)(void *); +typedef void (__RPC_API * GENERIC_UNBIND_ROUTINE)(void *, unsigned char *); -typedef struct __GENERIC_BINDING_INFO GENERIC_BINDING_INFO, *PGENERIC_BINDING_INFO; +typedef struct _GENERIC_BINDING_ROUTINE_PAIR +{ + GENERIC_BINDING_ROUTINE pfnBind; + GENERIC_UNBIND_ROUTINE pfnUnbind; +} GENERIC_BINDING_ROUTINE_PAIR, *PGENERIC_BINDING_ROUTINE_PAIR; + +typedef struct __GENERIC_BINDING_INFO +{ + void *pObj; + unsigned int Size; + GENERIC_BINDING_ROUTINE pfnBind; + GENERIC_UNBIND_ROUTINE pfnUnbind; +} GENERIC_BINDING_INFO, *PGENERIC_BINDING_INFO; typedef void (__RPC_USER *XMIT_HELPER_ROUTINE)(PMIDL_STUB_MESSAGE);

1 0

Robert Shearman : rpcrt4: Move the getting of the client binding handle to a separate function.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: 0030b6dacd4d4edcae38a839f2d9335436a7dc88 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0030b6dacd4d4edcae38a83… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 24 23:03:29 2006 +0100 rpcrt4: Move the getting of the client binding handle to a separate function. --- dlls/rpcrt4/ndr_stubless.c | 193 ++++++++++++++++++++++---------------------- 1 files changed, 98 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0030b6dacd4d4edcae3…

1 0

Robert Shearman : rpcrt4: Move the initialising of the stub message structure nearer to the top of NdrClientCall2 .
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: fdda17deea1777303d1ce74873f0ea98e56e662a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fdda17deea1777303d1ce74… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 24 23:03:18 2006 +0100 rpcrt4: Move the initialising of the stub message structure nearer to the top of NdrClientCall2. Set stubMsg.StackTop after calling the initialise function. --- dlls/rpcrt4/ndr_stubless.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 15b045d..1997361 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -410,13 +410,6 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_ST TRACE("pStubDesc %p, pFormat %p, ...\n", pStubDesc, pFormat); - /* needed for conformance of top-level objects */ -#ifdef __i386__ - stubMsg.StackTop = *(unsigned char **)(&pFormat+1); -#else -# warning Stack not retrieved for your CPU architecture -#endif - /* Later NDR language versions probably won't be backwards compatible */ if (pStubDesc->Version > 0x50002) { @@ -439,9 +432,25 @@ #endif current_offset = sizeof(NDR_PROC_HEADER); } + if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) + { + /* object is always the first argument */ + This = *(void **)ARG_FROM_OFFSET(stubMsg, 0); + NdrProxyInitialize(This, &rpcMsg, &stubMsg, pStubDesc, procedure_number); + } + else + NdrClientInitializeNew(&rpcMsg, &stubMsg, pStubDesc, procedure_number); + TRACE("Oi_flags = 0x%02x\n", pProcHeader->Oi_flags); TRACE("MIDL stub version = 0x%lx\n", pStubDesc->MIDLVersion); + /* needed for conformance of top-level objects */ +#ifdef __i386__ + stubMsg.StackTop = *(unsigned char **)(&pFormat+1); +#else +# warning Stack not retrieved for your CPU architecture +#endif + /* we only need a handle if this isn't an object method */ if (!(pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT)) { @@ -547,15 +556,6 @@ #endif current_offset += pExtensions->Size; } - if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) - { - /* object is always the first argument */ - This = *(void **)ARG_FROM_OFFSET(stubMsg, 0); - NdrProxyInitialize(This, &rpcMsg, &stubMsg, pStubDesc, procedure_number); - } - else - NdrClientInitializeNew(&rpcMsg, &stubMsg, pStubDesc, procedure_number); - /* create the full pointer translation tables, if requested */ if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_FULLPTR) #if 0

1 0

Robert Shearman : rpcrt4: Store the arguments exclusively in stubMsg. StackTop.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: 9d87447455fc7c51729ee83e81d5a26166e90086 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9d87447455fc7c51729ee83… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 24 23:03:10 2006 +0100 rpcrt4: Store the arguments exclusively in stubMsg.StackTop. --- dlls/rpcrt4/ndr_stubless.c | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 0769ca5..15b045d 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -368,8 +368,7 @@ static void WINAPI dump_INTERPRETER_OPT_ TRACE("\n"); } -/* FIXME: this will be different on other plaftorms than i386 */ -#define ARG_FROM_OFFSET(args, offset) (*(unsigned char **)args + offset) +#define ARG_FROM_OFFSET(stubMsg, offset) (stubMsg.StackTop + offset) /* the return type should be CLIENT_CALL_RETURN, but this is incompatible * with the way gcc returns structures. "void *" should be the largest type @@ -377,8 +376,6 @@ #define ARG_FROM_OFFSET(args, offset) (* LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, ...) { /* pointer to start of stack where arguments start */ - /* FIXME: not portable */ - unsigned char *args = (unsigned char *)(&pFormat+1); RPC_MESSAGE rpcMsg; MIDL_STUB_MESSAGE stubMsg; handle_t hBinding = NULL; @@ -412,7 +409,13 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_ST void * This = NULL; TRACE("pStubDesc %p, pFormat %p, ...\n", pStubDesc, pFormat); - TRACE("&first_argument = %p -> %p\n", args, ARG_FROM_OFFSET(args, 0)); + + /* needed for conformance of top-level objects */ +#ifdef __i386__ + stubMsg.StackTop = *(unsigned char **)(&pFormat+1); +#else +# warning Stack not retrieved for your CPU architecture +#endif /* Later NDR language versions probably won't be backwards compatible */ if (pStubDesc->Version > 0x50002) @@ -456,9 +459,9 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_ST TRACE("Explicit primitive handle @ %d\n", pDesc->offset); if (pDesc->flag) /* pointer to binding */ - hBinding = **(handle_t **)ARG_FROM_OFFSET(args, pDesc->offset); + hBinding = **(handle_t **)ARG_FROM_OFFSET(stubMsg, pDesc->offset); else - hBinding = *(handle_t *)ARG_FROM_OFFSET(args, pDesc->offset); + hBinding = *(handle_t *)ARG_FROM_OFFSET(stubMsg, pDesc->offset); current_offset += sizeof(NDR_EHD_PRIMITIVE); break; } @@ -475,10 +478,10 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_ST if (pDesc->flags & HANDLE_PARAM_IS_VIA_PTR) { TRACE("\tHANDLE_PARAM_IS_VIA_PTR\n"); - context_handle = **(NDR_CCONTEXT **)ARG_FROM_OFFSET(args, pDesc->offset); + context_handle = **(NDR_CCONTEXT **)ARG_FROM_OFFSET(stubMsg, pDesc->offset); } else - context_handle = *(NDR_CCONTEXT *)ARG_FROM_OFFSET(args, pDesc->offset); + context_handle = *(NDR_CCONTEXT *)ARG_FROM_OFFSET(stubMsg, pDesc->offset); if ((pDesc->flags & NDR_CONTEXT_HANDLE_CANNOT_BE_NULL) && !context_handle) { @@ -547,7 +550,7 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_ST if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) { /* object is always the first argument */ - This = *(void **)ARG_FROM_OFFSET(args, 0); + This = *(void **)ARG_FROM_OFFSET(stubMsg, 0); NdrProxyInitialize(This, &rpcMsg, &stubMsg, pStubDesc, procedure_number); } else @@ -562,8 +565,6 @@ #else #endif stubMsg.BufferLength = 0; - /* needed for conformance of top-level objects */ - stubMsg.StackTop = *(unsigned char **)args; /* store the RPC flags away */ if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS) @@ -665,7 +666,7 @@ #endif unsigned char * pArg; current_stack_offset = pParam->stack_offset; - pArg = ARG_FROM_OFFSET(args, current_stack_offset); + pArg = ARG_FROM_OFFSET(stubMsg, current_stack_offset); TRACE("param[%d]: new format\n", i); TRACE("\tparam_attributes:"); dump_RPC_FC_PROC_PF(pParam->param_attributes); TRACE("\n"); @@ -771,7 +772,7 @@ #endif { NDR_PARAM_OI_BASETYPE * pParam = (NDR_PARAM_OI_BASETYPE *)&pFormat[current_offset]; - unsigned char * pArg = ARG_FROM_OFFSET(args, current_stack_offset); + unsigned char * pArg = ARG_FROM_OFFSET(stubMsg, current_stack_offset); /* no more parameters; exit loop */ if (current_stack_offset > stack_size)

1 0

Robert Shearman : rpcrt4: Implement RpcBindingCopy.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: b9f36c3fa208e2b3a99ed4c5859a423a6aef89c0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b9f36c3fa208e2b3a99ed4c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 24 23:00:34 2006 +0100 rpcrt4: Implement RpcBindingCopy. --- dlls/rpcrt4/rpc_binding.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index b1cd88e..bb691f6 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -836,6 +836,37 @@ RPC_STATUS WINAPI I_RpcBindingSetAsync( } /*********************************************************************** + * RpcBindingCopy (RPCRT4.@) + */ +RPC_STATUS RPC_ENTRY RpcBindingCopy( + RPC_BINDING_HANDLE SourceBinding, + RPC_BINDING_HANDLE* DestinationBinding) +{ + RpcBinding *DestBinding; + RpcBinding *SrcBinding = (RpcBinding*)SourceBinding; + RPC_STATUS status; + + TRACE("(%p, %p)\n", SourceBinding, DestinationBinding); + + status = RPCRT4_AllocBinding(&DestBinding, SrcBinding->server); + if (status != RPC_S_OK) return status; + + DestBinding->ObjectUuid = SrcBinding->ObjectUuid; + DestBinding->BlockingFn = SrcBinding->BlockingFn; + DestBinding->Protseq = RPCRT4_strndupA(SrcBinding->Protseq, -1); + DestBinding->NetworkAddr = RPCRT4_strndupA(SrcBinding->NetworkAddr, -1); + DestBinding->Endpoint = RPCRT4_strndupA(SrcBinding->Endpoint, -1); + + DestBinding->FromConn = SrcBinding->FromConn; + SrcBinding->FromConn = NULL; + if (SrcBinding->AuthInfo) RpcAuthInfo_AddRef(SrcBinding->AuthInfo); + DestBinding->AuthInfo = SrcBinding->AuthInfo; + + *DestinationBinding = DestBinding; + return RPC_S_OK; +} + +/*********************************************************************** * RpcImpersonateClient (RPCRT4.@) * * Impersonates the client connected via a binding handle so that security

1 0

Robert Shearman : uuid: Add some COM CLSIDs.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: 760208b2a5b784f42b2409edaa8fabb620bc08db URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=760208b2a5b784f42b2409e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 24 23:02:51 2006 +0100 uuid: Add some COM CLSIDs. --- dlls/ole32/compobj.c | 2 -- dlls/uuid/uuid.c | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 9c7b387..f2a587f 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -82,8 +82,6 @@ #define ARRAYSIZE(array) (sizeof(array)/ static HRESULT COM_GetRegisteredClassObject(REFCLSID rclsid, DWORD dwClsContext, LPUNKNOWN* ppUnk); static void COM_RevokeAllClasses(void); -const CLSID CLSID_StdGlobalInterfaceTable = { 0x00000323, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, 0x46} }; - APARTMENT *MTA; /* protected by csApartment */ static struct list apts = LIST_INIT( apts ); /* protected by csApartment */ diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 7e11fe5..21b0ee1 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -77,3 +77,26 @@ DEFINE_GUID(IID_IDPLobbySP,0x5a4e5a20,0x DEFINE_GUID(FMTID_SummaryInformation,0xF29F85E0,0x4FF9,0x1068,0xAB,0x91,0x08,0x00,0x2B,0x27,0xB3,0xD9); DEFINE_GUID(FMTID_DocSummaryInformation,0xD5CDD502,0x2E9C,0x101B,0x93,0x97,0x08,0x00,0x2B,0x2C,0xF9,0xAE); DEFINE_GUID(FMTID_UserDefinedProperties,0xD5CDD505,0x2E9C,0x101B,0x93,0x97,0x08,0x00,0x2B,0x2C,0xF9,0xAE); + +/* COM CLSIDs not declared in an exported header file */ +DEFINE_GUID(CLSID_StdMarshal, 0x00000017,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_IdentityUnmarshal, 0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_PSGenObject, 0x0000030c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_PSClientSite, 0x0000030d,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_PSClassObject, 0x0000030e,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_PSInPlaceActive, 0x0000030f,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_PSInPlaceFrame, 0x00000310,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_PSDragDrop, 0x00000311,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_PSBindCtx, 0x00000312,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_PSEnumerators, 0x00000313,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_Picture_Metafile, 0x00000315,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_StaticMetafile, 0x00000315,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_Picture_Dib, 0x00000316,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_StaticDib, 0x00000316,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_Picture_EnhMetafile, 0x00000316,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_DCOMAccessControl, 0x0000031d,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_StdGlobalInterfaceTable,0x00000323,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_ComBinding, 0x00000328,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_StdEvent, 0x0000032b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_SynchornizeContainer, 0x0000032d,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);

1 0

Robert Shearman : include: Add several more interfaces to urlmon.idl.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: 4c021232bc252a54a5ac821c4f3ab6fb1a162086 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4c021232bc252a54a5ac821… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 24 23:03:01 2006 +0100 include: Add several more interfaces to urlmon.idl. --- include/urlmon.idl | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index 0b03296..d96a6dc 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -455,6 +455,39 @@ interface IWinInetHttpInfo : IWinInetInf [in, out] DWORD *pdwReserved); } +/***************************************************************************** + * IWindowForBindingUI interface + */ +[ + local, + object, + uuid(79eac9d5-bafa-11ce-8c82-00aa004ba90b), + pointer_default(unique) +] +interface IWindowForBindingUI : IUnknown +{ + typedef [unique] IWindowForBindingUI *LPWINDOWFORBINDINGUI; + + HRESULT GetWindow( + [in] REFGUID rguidReason, + [out] HWND *phwnd); +} + +/***************************************************************************** + * IHttpSecurity interface + */ +[ + object, + uuid(79eac9d7-bafa-11ce-8c82-00aa004ba90b), + pointer_default(unique) +] +interface IHttpSecurity : IWindowForBindingUI +{ + typedef [unique] IHttpSecurity *LPHTTPSECURITY; + + HRESULT OnSecurityProblem( + [in] DWORD dwProblem); +} /***************************************************************************** @@ -515,6 +548,30 @@ interface IMonikerProp : IUnknown [in] LPCWSTR val); } +cpp_quote("#ifndef _LPBINDPROTOCOL_DEFINED") +cpp_quote("#define _LPBINDPROTOCOL_DEFINED") + +/***************************************************************************** + * IBindProtocol interface + */ +[ + local, + object, + uuid(79EAC9CD-BAF9-11CE-8C82-00AA004BA90B), + pointer_default(unique) +] +interface IBindProtocol : IUnknown +{ + typedef [unique] IBindProtocol *LPBINDPROTOCOL; + + HRESULT CreateBinding( + [in] LPCWSTR szUrl, + [in] IBindCtx *pbc, + [out] IBinding **ppb); +} + +cpp_quote("#endif /* !defined _LPBINDPROTOCOL_DEFINED */") + /***************************************************************************** * IInternetBindInfo interface */

1 0

Jacek Caban : urlmon: Added registering name space test.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: d523eda74260f6a383fa3c177e0c2bb49ef14728 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d523eda74260f6a383fa3c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 24 18:01:17 2006 +0200 urlmon: Added registering name space test. --- dlls/urlmon/tests/misc.c | 277 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 276 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=d523eda74260f6a383f…

1 0

Jacek Caban : urlmon: Use registered protocols.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: 9c9838d9e8d95986d181fc4a8dbdbe16cd254a24 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9c9838d9e8d95986d181fc4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 24 18:00:08 2006 +0200 urlmon: Use registered protocols. --- dlls/urlmon/binding.c | 2 + dlls/urlmon/internet.c | 16 --------- dlls/urlmon/session.c | 82 ++++++++++++++++++++++++++++++++++++++++----- dlls/urlmon/urlmon_main.h | 3 +- 4 files changed, 76 insertions(+), 27 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index e1c63f6..efbd12f 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -789,7 +789,7 @@ static HRESULT get_protocol(Binding *Thi return S_OK; } - hres = get_protocol_iface(url, &unk); + hres = get_protocol_handler(url, &unk); if(FAILED(hres)) return hres; diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index ef9939e..8ae22e0 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -61,22 +61,6 @@ static HRESULT parse_schema(LPCWSTR url, return S_OK; } -static IInternetProtocolInfo *get_protocol_info(LPCWSTR url) -{ - IInternetProtocolInfo *ret = NULL; - IUnknown *unk; - HRESULT hres; - - hres = get_protocol_iface(url, &unk); - if(FAILED(hres)) - return NULL; - - IUnknown_QueryInterface(unk, &IID_IInternetProtocolInfo, (void**)&ret); - IUnknown_Release(unk); - - return ret; -} - static HRESULT parse_security_url(LPCWSTR url, DWORD flags, LPWSTR result, DWORD size, DWORD *rsize) { IInternetProtocolInfo *protocol_info; diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 4a1a9b3..deb7146 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -1,5 +1,5 @@ /* - * Copyright 2005 Jacek Caban + * Copyright 2005-2006 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -42,11 +42,23 @@ typedef struct name_space { static name_space *name_space_list = NULL; -HRESULT get_protocol_iface(LPCWSTR url, IUnknown **ret) +static IClassFactory *find_name_space(LPCWSTR protocol) { - WCHAR schema[64], str_clsid[64]; + name_space *iter; + + for(iter = name_space_list; iter; iter = iter->next) { + if(!strcmpW(iter->protocol, protocol)) + return iter->cf; + } + + return NULL; +} + +static HRESULT get_protocol_iface(LPCWSTR schema, DWORD schema_len, IUnknown **ret) +{ + WCHAR str_clsid[64]; HKEY hkey = NULL; - DWORD res, type, size, schema_len; + DWORD res, type, size; CLSID clsid; LPWSTR wszKey; HRESULT hres; @@ -55,11 +67,6 @@ HRESULT get_protocol_iface(LPCWSTR url, {'P','R','O','T','O','C','O','L','S','\\','H','a','n','d','l','e','r','\\'}; static const WCHAR wszCLSID[] = {'C','L','S','I','D',0}; - hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(schema[0]), - &schema_len, 0); - if(FAILED(hres) || !schema_len) - return E_FAIL; - wszKey = HeapAlloc(GetProcessHeap(), 0, sizeof(wszProtocolsKey)+(schema_len+1)*sizeof(WCHAR)); memcpy(wszKey, wszProtocolsKey, sizeof(wszProtocolsKey)); memcpy(wszKey + sizeof(wszProtocolsKey)/sizeof(WCHAR), schema, (schema_len+1)*sizeof(WCHAR)); @@ -88,6 +95,63 @@ HRESULT get_protocol_iface(LPCWSTR url, return CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)ret); } +IInternetProtocolInfo *get_protocol_info(LPCWSTR url) +{ + IInternetProtocolInfo *ret = NULL; + IClassFactory *cf; + IUnknown *unk; + WCHAR schema[64]; + DWORD schema_len; + HRESULT hres; + + hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(schema[0]), + &schema_len, 0); + if(FAILED(hres) || !schema_len) + return NULL; + + cf = find_name_space(schema); + if(cf) { + hres = IClassFactory_QueryInterface(cf, &IID_IInternetProtocolInfo, (void**)&ret); + if(SUCCEEDED(hres)) + return ret; + + hres = IClassFactory_CreateInstance(cf, NULL, &IID_IInternetProtocolInfo, (void**)&ret); + if(SUCCEEDED(hres)) + return ret; + } + + hres = get_protocol_iface(schema, schema_len, &unk); + if(FAILED(hres)) + return NULL; + + hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocolInfo, (void**)&ret); + IUnknown_Release(unk); + + return ret; +} + +HRESULT get_protocol_handler(LPCWSTR url, IUnknown **ret) +{ + IClassFactory *cf; + WCHAR schema[64]; + DWORD schema_len; + HRESULT hres; + + hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(schema[0]), + &schema_len, 0); + if(FAILED(hres) || !schema_len) + return schema_len ? hres : E_FAIL; + + cf = find_name_space(schema); + if(cf) { + hres = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)ret); + if(SUCCEEDED(hres)) + return hres; + } + + return get_protocol_iface(schema, schema_len, ret); +} + static HRESULT WINAPI InternetSession_QueryInterface(IInternetSession *iface, REFIID riid, void **ppv) { diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index c67b52a..0eb7db6 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -54,7 +54,8 @@ typedef struct HRESULT UMCreateStreamOnCacheFile(LPCWSTR pszURL, DWORD dwSize, LPWSTR pszFileName, HANDLE *phfile, IUMCacheStream **ppstr); void UMCloseCacheFileStream(IUMCacheStream *pstr); -HRESULT get_protocol_iface(LPCWSTR url, IUnknown **ret); +IInternetProtocolInfo *get_protocol_info(LPCWSTR url); +HRESULT get_protocol_handler(LPCWSTR url, IUnknown **ret); HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv);

1 0