March 2007 - Wine-Commits - list.winehq.org

Rob Shearman : ole32: Add documentation for CreateBindCtx, BindMoniker, GetRunningObjectTable and OleRun.
by Alexandre Julliard March 27, 2007

March 27, 2007

Module: wine Branch: master Commit: cdc9367d78a178abbfa7b6d020e65fc6836de39b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc9367d78a178abbfa7b6d02… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 26 18:23:51 2007 +0100 ole32: Add documentation for CreateBindCtx, BindMoniker, GetRunningObjectTable and OleRun. --- dlls/ole32/bindctx.c | 28 +++++++++++++++++++++++++++- dlls/ole32/moniker.c | 19 +++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index 6e87128..da68f33 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -541,7 +541,18 @@ static HRESULT BindCtxImpl_Construct(BindCtxImpl* This) /****************************************************************************** * CreateBindCtx (OLE32.@) - ******************************************************************************/ + * + * Creates a bind context. A bind context encompasses information and options + * used when binding to a moniker. + * + * PARAMS + * reserved [I] Reserved. Set to 0. + * ppbc [O] Address that receives the bind context object. + * + * RETURNS + * Success: S_OK. + * Failure: Any HRESULT code. + */ HRESULT WINAPI CreateBindCtx(DWORD reserved, LPBC * ppbc) { BindCtxImpl* newBindCtx = 0; @@ -576,6 +587,21 @@ HRESULT WINAPI CreateBindCtx(DWORD reserved, LPBC * ppbc) return hr; } +/****************************************************************************** + * BindMoniker [OLE32.@] + * + * Binds to a moniker. + * + * PARAMS + * pmk [I] Moniker to bind to. + * grfOpt [I] Reserved option flags. Set to 0. + * riid [I] ID of the interface to bind to. + * pvResult [O] Address that receives the interface of the object that was bound to. + * + * RETURNS + * Success: S_OK. + * Failure: Any HRESULT code. + */ HRESULT WINAPI BindMoniker(LPMONIKER pmk, DWORD grfOpt, REFIID riid, LPVOID * ppvResult) { HRESULT res; diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 0cb35fa..d34860d 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -736,6 +736,16 @@ RunningObjectTableImpl_EnumRunning(IRunningObjectTable* iface, /*********************************************************************** * GetRunningObjectTable (OLE32.@) + * + * Retrieves the global running object table. + * + * PARAMS + * reserved [I] Reserved. Set to 0. + * pprot [O] Address that receives the pointer to the running object table. + * + * RETURNS + * Success: S_OK. + * Failure: Any HRESULT code. */ HRESULT WINAPI GetRunningObjectTable(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot) @@ -758,6 +768,15 @@ GetRunningObjectTable(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot) /****************************************************************************** * OleRun [OLE32.@] + * + * Set the OLE object to the running state. + * + * PARAMS + * pUnknown [I] OLE object to run. + * + * RETURNS + * Success: S_OK. + * Failure: Any HRESULT code. */ HRESULT WINAPI OleRun(LPUNKNOWN pUnknown) {

1 0

Rob Shearman : rpcrt4: Call CompleteAuthToken if InitializeSecurityContext returned a code that says it should be called .
by Alexandre Julliard March 27, 2007

March 27, 2007

Module: wine Branch: master Commit: 88295b9a020c3fac092bb0c49837d63d18a15de2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88295b9a020c3fac092bb0c49… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 26 18:18:01 2007 +0100 rpcrt4: Call CompleteAuthToken if InitializeSecurityContext returned a code that says it should be called. Currently, the only security provider that requires this is the Digest one, which we don't really care about, but is supported for completeness. --- dlls/rpcrt4/rpc_message.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index b100431..2519cee 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -501,7 +501,22 @@ static RPC_STATUS RPCRT4_ClientAuthorize(RpcConnection *conn, SecBuffer *in, return ERROR_ACCESS_DENIED; /* FIXME: is this correct? */ } - TRACE("r = 0x%08x, cbBuffer = %ld, attr = 0x%08x\n", r, out->cbBuffer, conn->attr); + TRACE("r = 0x%08x, attr = 0x%08x\n", r, conn->attr); + + if ((r == SEC_I_COMPLETE_NEEDED) || (r == SEC_I_COMPLETE_AND_CONTINUE)) + { + TRACE("complete needed\n"); + r = CompleteAuthToken(&conn->ctx, &out_desc); + if (FAILED(r)) + { + HeapFree(GetProcessHeap(), 0, out->pvBuffer); + out->pvBuffer = NULL; + WARN("CompleteAuthToken failed with error 0x%08x\n", r); + return ERROR_ACCESS_DENIED; /* FIXME: is this correct? */ + } + } + + TRACE("cbBuffer = %ld\n", out->cbBuffer); return RPC_S_OK; }

1 0

Rob Shearman : rpcrt4: Use the correct authorization trailer length using information from the security provider .
by Alexandre Julliard March 27, 2007

March 27, 2007

Module: wine Branch: master Commit: 763fe63213680dff039e206dc835bc4d6375f6d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=763fe63213680dff039e206dc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 26 18:19:33 2007 +0100 rpcrt4: Use the correct authorization trailer length using information from the security provider. Previously it was hardcoded to 16, so only the NTLM provider would work correctly. --- dlls/rpcrt4/rpc_binding.h | 2 ++ dlls/rpcrt4/rpc_message.c | 43 +++++++++++++++++++++++++++++++++---------- dlls/rpcrt4/rpc_transport.c | 2 ++ 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index 1650ad6..6dde2ae 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -80,6 +80,8 @@ typedef struct _RpcConnection TimeStamp exp; ULONG attr; RpcAuthInfo *AuthInfo; + ULONG encryption_auth_len; + ULONG signature_auth_len; RpcQualityOfService *QOS; /* client-only */ diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 2519cee..53d191b 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -59,7 +59,7 @@ enum secure_packet_direction static RPC_STATUS I_RpcReAllocateBuffer(PRPC_MESSAGE pMsg); -static DWORD RPCRT4_GetHeaderSize(RpcPktHdr *Header) +static DWORD RPCRT4_GetHeaderSize(const RpcPktHdr *Header) { static const DWORD header_sizes[] = { sizeof(Header->request), 0, sizeof(Header->response), @@ -82,14 +82,14 @@ static DWORD RPCRT4_GetHeaderSize(RpcPktHdr *Header) return ret; } -static int packet_has_body(RpcPktHdr *Header) +static int packet_has_body(const RpcPktHdr *Header) { return (Header->common.ptype == PKT_FAULT) || (Header->common.ptype == PKT_REQUEST) || (Header->common.ptype == PKT_RESPONSE); } -static int packet_has_auth_verifier(RpcPktHdr *Header) +static int packet_has_auth_verifier(const RpcPktHdr *Header) { return !(Header->common.ptype == PKT_BIND_NACK) && !(Header->common.ptype == PKT_SHUTDOWN); @@ -379,7 +379,12 @@ static RPC_STATUS RPCRT4_SendAuth(RpcConnection *Connection, RpcPktHdr *Header, if (AuthLength) Header->common.auth_len = AuthLength; else if (Connection->AuthInfo && packet_has_auth_verifier(Header)) - Header->common.auth_len = 16 /* FIXME */; + { + if ((Connection->AuthInfo->AuthnLevel == RPC_C_AUTHN_LEVEL_PKT_PRIVACY) && packet_has_body(Header)) + Header->common.auth_len = Connection->signature_auth_len; + else + Header->common.auth_len = Connection->encryption_auth_len; + } else Header->common.auth_len = 0; Header->common.flags |= RPC_FLG_FIRST; @@ -469,6 +474,8 @@ static RPC_STATUS RPCRT4_ClientAuthorize(RpcConnection *conn, SecBuffer *in, SECURITY_STATUS r; SecBufferDesc out_desc; SecBufferDesc inp_desc; + SecPkgContext_Sizes secctx_sizes; + BOOL continue_needed; ULONG context_req = ISC_REQ_CONNECTION | ISC_REQ_USE_DCE_STYLE | ISC_REQ_MUTUAL_AUTH | ISC_REQ_DELEGATE; @@ -480,6 +487,7 @@ static RPC_STATUS RPCRT4_ClientAuthorize(RpcConnection *conn, SecBuffer *in, out->BufferType = SECBUFFER_TOKEN; out->cbBuffer = conn->AuthInfo->cbMaxToken; out->pvBuffer = HeapAlloc(GetProcessHeap(), 0, out->cbBuffer); + if (!out->pvBuffer) return ERROR_OUTOFMEMORY; out_desc.ulVersion = 0; out_desc.cBuffers = 1; @@ -495,13 +503,13 @@ static RPC_STATUS RPCRT4_ClientAuthorize(RpcConnection *conn, SecBuffer *in, &conn->exp); if (FAILED(r)) { - HeapFree(GetProcessHeap(), 0, out->pvBuffer); - out->pvBuffer = NULL; WARN("InitializeSecurityContext failed with error 0x%08x\n", r); - return ERROR_ACCESS_DENIED; /* FIXME: is this correct? */ + goto failed; } TRACE("r = 0x%08x, attr = 0x%08x\n", r, conn->attr); + continue_needed = ((r == SEC_I_CONTINUE_NEEDED) || + (r == SEC_I_COMPLETE_AND_CONTINUE)); if ((r == SEC_I_COMPLETE_NEEDED) || (r == SEC_I_COMPLETE_AND_CONTINUE)) { @@ -509,16 +517,31 @@ static RPC_STATUS RPCRT4_ClientAuthorize(RpcConnection *conn, SecBuffer *in, r = CompleteAuthToken(&conn->ctx, &out_desc); if (FAILED(r)) { - HeapFree(GetProcessHeap(), 0, out->pvBuffer); - out->pvBuffer = NULL; WARN("CompleteAuthToken failed with error 0x%08x\n", r); - return ERROR_ACCESS_DENIED; /* FIXME: is this correct? */ + goto failed; } } TRACE("cbBuffer = %ld\n", out->cbBuffer); + if (!continue_needed) + { + r = QueryContextAttributesA(&conn->ctx, SECPKG_ATTR_SIZES, &secctx_sizes); + if (FAILED(r)) + { + WARN("QueryContextAttributes failed with error 0x%08x\n", r); + goto failed; + } + conn->signature_auth_len = secctx_sizes.cbMaxSignature; + conn->encryption_auth_len = secctx_sizes.cbSecurityTrailer; + } + return RPC_S_OK; + +failed: + HeapFree(GetProcessHeap(), 0, out->pvBuffer); + out->pvBuffer = NULL; + return ERROR_ACCESS_DENIED; /* FIXME: is this correct? */ } /*********************************************************************** diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 4996c12..b4af8e9 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1385,6 +1385,8 @@ RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, NewConnection->attr = 0; if (AuthInfo) RpcAuthInfo_AddRef(AuthInfo); NewConnection->AuthInfo = AuthInfo; + NewConnection->encryption_auth_len = 0; + NewConnection->signature_auth_len = 0; if (QOS) RpcQualityOfService_AddRef(QOS); NewConnection->QOS = QOS;

1 0

Rob Shearman : ole32: Add the OXID_INFO structure to dcom.idl.
by Alexandre Julliard March 27, 2007

March 27, 2007

Module: wine Branch: master Commit: 1fa24db9fdd586ede877e5efce7d9a39e5cea866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fa24db9fdd586ede877e5efc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 26 18:22:30 2007 +0100 ole32: Add the OXID_INFO structure to dcom.idl. --- dlls/ole32/dcom.idl | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/dcom.idl b/dlls/ole32/dcom.idl index 3d6b271..6e5a454 100644 --- a/dlls/ole32/dcom.idl +++ b/dlls/ole32/dcom.idl @@ -108,6 +108,14 @@ interface ObjectRpcBaseTypes [size_is(wNumEntries)] unsigned short aStringArray[]; } DUALSTRINGARRAY; + typedef struct tagOXID_INFO { + DWORD dwTid; + DWORD dwPid; + IPID ipidRemUnknown; + DWORD dwAuthnHint; + DUALSTRINGARRAY *psa; + } OXID_INFO; + const unsigned long OBJREF_SIGNATURE = 0x574f454d; /* "MEOW" */ const unsigned long OBJREF_STANDARD = 0x1; const unsigned long OBJREF_HANDLER = 0x2;

1 0

Rob Shearman : rpcrt4: Call InitializeSecurityContext from only one function.
by Alexandre Julliard March 27, 2007

March 27, 2007

Module: wine Branch: master Commit: 88e9b3fad8bf9f1fe9a4fc276d400aa47255869b URL: http://source.winehq.org/git/wine.git/?a=commit;h=88e9b3fad8bf9f1fe9a4fc276… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 26 18:17:15 2007 +0100 rpcrt4: Call InitializeSecurityContext from only one function. This reduces the amount of code and ensures that the parameters passed to it stay the same, apart from the previous context and the output buffer description. --- dlls/rpcrt4/rpc_message.c | 74 +++++++++++++++--------------------------- dlls/rpcrt4/rpc_transport.c | 3 ++ 2 files changed, 30 insertions(+), 47 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index c1e0c86..b100431 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -459,13 +459,16 @@ write: } /*********************************************************************** - * RPCRT4_AuthNegotiate (internal) + * RPCRT4_ClientAuthorize (internal) + * + * Authorize a client connection. A NULL in param signifies a new connection. */ -static void RPCRT4_AuthNegotiate(RpcConnection *conn, SecBuffer *out) +static RPC_STATUS RPCRT4_ClientAuthorize(RpcConnection *conn, SecBuffer *in, + SecBuffer *out) { SECURITY_STATUS r; SecBufferDesc out_desc; - unsigned char *buffer; + SecBufferDesc inp_desc; ULONG context_req = ISC_REQ_CONNECTION | ISC_REQ_USE_DCE_STYLE | ISC_REQ_MUTUAL_AUTH | ISC_REQ_DELEGATE; @@ -474,24 +477,33 @@ static void RPCRT4_AuthNegotiate(RpcConnection *conn, SecBuffer *out) else if (conn->AuthInfo->AuthnLevel == RPC_C_AUTHN_LEVEL_PKT_PRIVACY) context_req |= ISC_REQ_CONFIDENTIALITY | ISC_REQ_INTEGRITY; - buffer = HeapAlloc(GetProcessHeap(), 0, conn->AuthInfo->cbMaxToken); - out->BufferType = SECBUFFER_TOKEN; out->cbBuffer = conn->AuthInfo->cbMaxToken; - out->pvBuffer = buffer; + out->pvBuffer = HeapAlloc(GetProcessHeap(), 0, out->cbBuffer); out_desc.ulVersion = 0; out_desc.cBuffers = 1; out_desc.pBuffers = out; - conn->attr = 0; - SecInvalidateHandle(&conn->ctx); + inp_desc.cBuffers = 1; + inp_desc.pBuffers = in; + inp_desc.ulVersion = 0; + + r = InitializeSecurityContextA(&conn->AuthInfo->cred, in ? &conn->ctx : NULL, + NULL, context_req, 0, SECURITY_NETWORK_DREP, + in ? &inp_desc : NULL, 0, &conn->ctx, &out_desc, &conn->attr, + &conn->exp); + if (FAILED(r)) + { + HeapFree(GetProcessHeap(), 0, out->pvBuffer); + out->pvBuffer = NULL; + WARN("InitializeSecurityContext failed with error 0x%08x\n", r); + return ERROR_ACCESS_DENIED; /* FIXME: is this correct? */ + } - r = InitializeSecurityContextA(&conn->AuthInfo->cred, NULL, NULL, - context_req, 0, SECURITY_NETWORK_DREP, - NULL, 0, &conn->ctx, &out_desc, &conn->attr, &conn->exp); + TRACE("r = 0x%08x, cbBuffer = %ld, attr = 0x%08x\n", r, out->cbBuffer, conn->attr); - TRACE("r = %08x cbBuffer = %ld attr = %08x\n", r, out->cbBuffer, conn->attr); + return RPC_S_OK; } /*********************************************************************** @@ -500,46 +512,18 @@ static void RPCRT4_AuthNegotiate(RpcConnection *conn, SecBuffer *out) static RPC_STATUS RPCRT_AuthorizeConnection(RpcConnection* conn, BYTE *challenge, ULONG count) { - SecBufferDesc inp_desc, out_desc; SecBuffer inp, out; - SECURITY_STATUS r; RpcPktHdr *resp_hdr; RPC_STATUS status; - ULONG context_req = ISC_REQ_CONNECTION | ISC_REQ_USE_DCE_STYLE | - ISC_REQ_MUTUAL_AUTH | ISC_REQ_DELEGATE; TRACE("challenge %s, %d bytes\n", challenge, count); - if (conn->AuthInfo->AuthnLevel == RPC_C_AUTHN_LEVEL_PKT_INTEGRITY) - context_req |= ISC_REQ_INTEGRITY; - else if (conn->AuthInfo->AuthnLevel == RPC_C_AUTHN_LEVEL_PKT_PRIVACY) - context_req |= ISC_REQ_CONFIDENTIALITY | ISC_REQ_INTEGRITY; - - out.BufferType = SECBUFFER_TOKEN; - out.cbBuffer = conn->AuthInfo->cbMaxToken; - out.pvBuffer = HeapAlloc(GetProcessHeap(), 0, out.cbBuffer); - - out_desc.ulVersion = 0; - out_desc.cBuffers = 1; - out_desc.pBuffers = &out; - inp.BufferType = SECBUFFER_TOKEN; inp.pvBuffer = challenge; inp.cbBuffer = count; - inp_desc.cBuffers = 1; - inp_desc.pBuffers = &inp; - inp_desc.ulVersion = 0; - - r = InitializeSecurityContextA(&conn->AuthInfo->cred, &conn->ctx, NULL, - context_req, 0, SECURITY_NETWORK_DREP, - &inp_desc, 0, &conn->ctx, &out_desc, &conn->attr, &conn->exp); - if (r) - { - HeapFree(GetProcessHeap(), 0, out.pvBuffer); - WARN("InitializeSecurityContext failed with error 0x%08x\n", r); - return ERROR_ACCESS_DENIED; - } + status = RPCRT4_ClientAuthorize(conn, &inp, &out); + if (status) return status; resp_hdr = RPCRT4_BuildAuthHeader(NDR_LOCAL_DATA_REPRESENTATION); if (!resp_hdr) @@ -569,12 +553,8 @@ RPC_STATUS RPCRT4_Send(RpcConnection *Connection, RpcPktHdr *Header, return RPCRT4_SendAuth(Connection, Header, Buffer, BufferLength, NULL, 0); } - out.BufferType = SECBUFFER_TOKEN; - out.cbBuffer = 0; - out.pvBuffer = NULL; - /* tack on a negotiate packet */ - RPCRT4_AuthNegotiate(Connection, &out); + RPCRT4_ClientAuthorize(Connection, NULL, &out); r = RPCRT4_SendAuth(Connection, Header, Buffer, BufferLength, out.pvBuffer, out.cbBuffer); HeapFree(GetProcessHeap(), 0, out.pvBuffer); diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index e1d29bb..4996c12 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1381,10 +1381,13 @@ RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, NewConnection->NextCallId = 1; SecInvalidateHandle(&NewConnection->ctx); + memset(&NewConnection->exp, 0, sizeof(NewConnection->exp)); + NewConnection->attr = 0; if (AuthInfo) RpcAuthInfo_AddRef(AuthInfo); NewConnection->AuthInfo = AuthInfo; if (QOS) RpcQualityOfService_AddRef(QOS); NewConnection->QOS = QOS; + list_init(&NewConnection->conn_pool_entry); TRACE("connection: %p\n", NewConnection);

1 0

Rob Shearman : ole32: Generate OXID_INFO in the stub manager.
by Alexandre Julliard March 27, 2007

March 27, 2007

Module: wine Branch: master Commit: d1ec56c87160631d5cf8d20423b387c8365f74e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ec56c87160631d5cf8d2042… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 26 18:23:16 2007 +0100 ole32: Generate OXID_INFO in the stub manager. Copy the OXID_INFO from the stub manager, if available, in proxy_manager_construct. Otherwise, attempt to resolve it. Use ipidRemUnknown from OXID_INFO in the proxy manager instead of magically generating the IPID for RemUnknown. --- dlls/ole32/compobj_private.h | 3 ++ dlls/ole32/marshal.c | 57 ++++++++++++++++++++++++++--------------- dlls/ole32/rpc.c | 17 ++++++++++++ dlls/ole32/stubmanager.c | 35 +++++++++++++++---------- 4 files changed, 77 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1ec56c87160631d5cf8d…

1 0

Rob Shearman : rpcrt4: Retrieve the maximum token length from the security provider rather than using a hardcoded and rather small limit .
by Alexandre Julliard March 27, 2007

March 27, 2007

Module: wine Branch: master Commit: 7abb647cd3b45c07a3b794bdae721eb5f56efa73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7abb647cd3b45c07a3b794bda… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 26 18:16:34 2007 +0100 rpcrt4: Retrieve the maximum token length from the security provider rather than using a hardcoded and rather small limit. --- dlls/rpcrt4/rpc_binding.c | 15 ++++++++++++--- dlls/rpcrt4/rpc_binding.h | 5 +++-- dlls/rpcrt4/rpc_message.c | 11 ++++++----- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 807921b..ad96ac6 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -967,7 +967,9 @@ RPC_STATUS WINAPI RpcRevertToSelfEx(RPC_BINDING_HANDLE BindingHandle) return RPC_S_OK; } -static RPC_STATUS RpcAuthInfo_Create(ULONG AuthnLevel, ULONG AuthnSvc, CredHandle cred, TimeStamp exp, RpcAuthInfo **ret) +static RPC_STATUS RpcAuthInfo_Create(ULONG AuthnLevel, ULONG AuthnSvc, + CredHandle cred, TimeStamp exp, + ULONG cbMaxToken, RpcAuthInfo **ret) { RpcAuthInfo *AuthInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*AuthInfo)); if (!AuthInfo) @@ -978,6 +980,7 @@ static RPC_STATUS RpcAuthInfo_Create(ULONG AuthnLevel, ULONG AuthnSvc, CredHandl AuthInfo->AuthnSvc = AuthnSvc; AuthInfo->cred = cred; AuthInfo->exp = exp; + AuthInfo->cbMaxToken = cbMaxToken; *ret = AuthInfo; return RPC_S_OK; } @@ -1225,6 +1228,7 @@ RpcBindingSetAuthInfoExA( RPC_BINDING_HANDLE Binding, RPC_CSTR ServerPrincName, ULONG package_count; ULONG i; PSecPkgInfoA packages; + ULONG cbMaxToken; TRACE("%p %s %u %u %p %u %p\n", Binding, debugstr_a((const char*)ServerPrincName), AuthnLevel, AuthnSvc, AuthIdentity, AuthzSvr, SecurityQos); @@ -1306,12 +1310,14 @@ RpcBindingSetAuthInfoExA( RPC_BINDING_HANDLE Binding, RPC_CSTR ServerPrincName, TRACE("found package %s for service %u\n", packages[i].Name, AuthnSvc); r = AcquireCredentialsHandleA((SEC_CHAR *)ServerPrincName, packages[i].Name, SECPKG_CRED_OUTBOUND, NULL, AuthIdentity, NULL, NULL, &cred, &exp); + cbMaxToken = packages[i].cbMaxToken; FreeContextBuffer(packages); if (r == ERROR_SUCCESS) { if (bind->AuthInfo) RpcAuthInfo_Release(bind->AuthInfo); bind->AuthInfo = NULL; - r = RpcAuthInfo_Create(AuthnLevel, AuthnSvc, cred, exp, &bind->AuthInfo); + r = RpcAuthInfo_Create(AuthnLevel, AuthnSvc, cred, exp, cbMaxToken, + &bind->AuthInfo); if (r != RPC_S_OK) FreeCredentialsHandle(&cred); return RPC_S_OK; @@ -1338,6 +1344,7 @@ RpcBindingSetAuthInfoExW( RPC_BINDING_HANDLE Binding, RPC_WSTR ServerPrincName, ULONG package_count; ULONG i; PSecPkgInfoW packages; + ULONG cbMaxToken; TRACE("%p %s %u %u %p %u %p\n", Binding, debugstr_w((const WCHAR*)ServerPrincName), AuthnLevel, AuthnSvc, AuthIdentity, AuthzSvr, SecurityQos); @@ -1419,12 +1426,14 @@ RpcBindingSetAuthInfoExW( RPC_BINDING_HANDLE Binding, RPC_WSTR ServerPrincName, TRACE("found package %s for service %u\n", debugstr_w(packages[i].Name), AuthnSvc); r = AcquireCredentialsHandleW((SEC_WCHAR *)ServerPrincName, packages[i].Name, SECPKG_CRED_OUTBOUND, NULL, AuthIdentity, NULL, NULL, &cred, &exp); + cbMaxToken = packages[i].cbMaxToken; FreeContextBuffer(packages); if (r == ERROR_SUCCESS) { if (bind->AuthInfo) RpcAuthInfo_Release(bind->AuthInfo); bind->AuthInfo = NULL; - r = RpcAuthInfo_Create(AuthnLevel, AuthnSvc, cred, exp, &bind->AuthInfo); + r = RpcAuthInfo_Create(AuthnLevel, AuthnSvc, cred, exp, cbMaxToken, + &bind->AuthInfo); if (r != RPC_S_OK) FreeCredentialsHandle(&cred); return RPC_S_OK; diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index 5328ac0..1650ad6 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -30,10 +30,11 @@ typedef struct _RpcAuthInfo { LONG refs; - unsigned long AuthnLevel; - unsigned long AuthnSvc; + ULONG AuthnLevel; + ULONG AuthnSvc; CredHandle cred; TimeStamp exp; + ULONG cbMaxToken; } RpcAuthInfo; typedef struct _RpcQualityOfService diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 8a02463..c1e0c86 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -474,10 +474,10 @@ static void RPCRT4_AuthNegotiate(RpcConnection *conn, SecBuffer *out) else if (conn->AuthInfo->AuthnLevel == RPC_C_AUTHN_LEVEL_PKT_PRIVACY) context_req |= ISC_REQ_CONFIDENTIALITY | ISC_REQ_INTEGRITY; - buffer = HeapAlloc(GetProcessHeap(), 0, 0x100); + buffer = HeapAlloc(GetProcessHeap(), 0, conn->AuthInfo->cbMaxToken); out->BufferType = SECBUFFER_TOKEN; - out->cbBuffer = 0x100; + out->cbBuffer = conn->AuthInfo->cbMaxToken; out->pvBuffer = buffer; out_desc.ulVersion = 0; @@ -503,7 +503,6 @@ static RPC_STATUS RPCRT_AuthorizeConnection(RpcConnection* conn, SecBufferDesc inp_desc, out_desc; SecBuffer inp, out; SECURITY_STATUS r; - unsigned char buffer[0x100]; RpcPktHdr *resp_hdr; RPC_STATUS status; ULONG context_req = ISC_REQ_CONNECTION | ISC_REQ_USE_DCE_STYLE | @@ -517,8 +516,8 @@ static RPC_STATUS RPCRT_AuthorizeConnection(RpcConnection* conn, context_req |= ISC_REQ_CONFIDENTIALITY | ISC_REQ_INTEGRITY; out.BufferType = SECBUFFER_TOKEN; - out.cbBuffer = sizeof buffer; - out.pvBuffer = buffer; + out.cbBuffer = conn->AuthInfo->cbMaxToken; + out.pvBuffer = HeapAlloc(GetProcessHeap(), 0, out.cbBuffer); out_desc.ulVersion = 0; out_desc.cBuffers = 1; @@ -537,6 +536,7 @@ static RPC_STATUS RPCRT_AuthorizeConnection(RpcConnection* conn, &inp_desc, 0, &conn->ctx, &out_desc, &conn->attr, &conn->exp); if (r) { + HeapFree(GetProcessHeap(), 0, out.pvBuffer); WARN("InitializeSecurityContext failed with error 0x%08x\n", r); return ERROR_ACCESS_DENIED; } @@ -547,6 +547,7 @@ static RPC_STATUS RPCRT_AuthorizeConnection(RpcConnection* conn, status = RPCRT4_SendAuth(conn, resp_hdr, NULL, 0, out.pvBuffer, out.cbBuffer); + HeapFree(GetProcessHeap(), 0, out.pvBuffer); RPCRT4_FreeHeader(resp_hdr); return status;

1 0

Rob Shearman : rpcrt4: Make some parameters of non-exported functions const .
by Alexandre Julliard March 27, 2007

March 27, 2007

Module: wine Branch: master Commit: 7e061e4f646653dbc6ee113dcfb38af361b1f135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e061e4f646653dbc6ee113dc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 26 18:14:27 2007 +0100 rpcrt4: Make some parameters of non-exported functions const. --- dlls/rpcrt4/rpc_binding.c | 24 ++++++++++++------------ dlls/rpcrt4/rpc_binding.h | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index b554e7f..807921b 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -110,7 +110,7 @@ static RPC_STATUS RPCRT4_AllocBinding(RpcBinding** Binding, BOOL server) return RPC_S_OK; } -static RPC_STATUS RPCRT4_CreateBindingA(RpcBinding** Binding, BOOL server, LPSTR Protseq) +static RPC_STATUS RPCRT4_CreateBindingA(RpcBinding** Binding, BOOL server, LPCSTR Protseq) { RpcBinding* NewBinding; @@ -123,7 +123,7 @@ static RPC_STATUS RPCRT4_CreateBindingA(RpcBinding** Binding, BOOL server, LPSTR return RPC_S_OK; } -static RPC_STATUS RPCRT4_CreateBindingW(RpcBinding** Binding, BOOL server, LPWSTR Protseq) +static RPC_STATUS RPCRT4_CreateBindingW(RpcBinding** Binding, BOOL server, LPCWSTR Protseq) { RpcBinding* NewBinding; @@ -136,8 +136,8 @@ static RPC_STATUS RPCRT4_CreateBindingW(RpcBinding** Binding, BOOL server, LPWST return RPC_S_OK; } -static RPC_STATUS RPCRT4_CompleteBindingA(RpcBinding* Binding, LPSTR NetworkAddr, - LPSTR Endpoint, LPSTR NetworkOptions) +static RPC_STATUS RPCRT4_CompleteBindingA(RpcBinding* Binding, LPCSTR NetworkAddr, + LPCSTR Endpoint, LPCSTR NetworkOptions) { RPC_STATUS status; @@ -165,8 +165,8 @@ static RPC_STATUS RPCRT4_CompleteBindingA(RpcBinding* Binding, LPSTR NetworkAddr return RPC_S_OK; } -static RPC_STATUS RPCRT4_CompleteBindingW(RpcBinding* Binding, LPWSTR NetworkAddr, - LPWSTR Endpoint, LPWSTR NetworkOptions) +static RPC_STATUS RPCRT4_CompleteBindingW(RpcBinding* Binding, LPCWSTR NetworkAddr, + LPCWSTR Endpoint, LPCWSTR NetworkOptions) { RPC_STATUS status; @@ -194,7 +194,7 @@ static RPC_STATUS RPCRT4_CompleteBindingW(RpcBinding* Binding, LPWSTR NetworkAdd return RPC_S_OK; } -RPC_STATUS RPCRT4_ResolveBinding(RpcBinding* Binding, LPSTR Endpoint) +RPC_STATUS RPCRT4_ResolveBinding(RpcBinding* Binding, LPCSTR Endpoint) { RPC_STATUS status; @@ -214,7 +214,7 @@ RPC_STATUS RPCRT4_ResolveBinding(RpcBinding* Binding, LPSTR Endpoint) return RPC_S_OK; } -RPC_STATUS RPCRT4_SetBindingObject(RpcBinding* Binding, UUID* ObjectUuid) +RPC_STATUS RPCRT4_SetBindingObject(RpcBinding* Binding, const UUID* ObjectUuid) { TRACE("(*RpcBinding == ^%p, UUID == %s)\n", Binding, debugstr_guid(ObjectUuid)); if (ObjectUuid) memcpy(&Binding->ObjectUuid, ObjectUuid, sizeof(UUID)); @@ -838,17 +838,17 @@ RPC_STATUS WINAPI RpcBindingToStringBindingA( RPC_BINDING_HANDLE Binding, RPC_CS { RPC_STATUS ret; RpcBinding* bind = (RpcBinding*)Binding; - LPSTR ObjectUuid; + RPC_CSTR ObjectUuid; TRACE("(%p,%p)\n", Binding, StringBinding); - ret = UuidToStringA(&bind->ObjectUuid, (unsigned char**)&ObjectUuid); + ret = UuidToStringA(&bind->ObjectUuid, &ObjectUuid); if (ret != RPC_S_OK) return ret; - ret = RpcStringBindingComposeA((unsigned char*) ObjectUuid, (unsigned char*)bind->Protseq, (unsigned char*) bind->NetworkAddr, + ret = RpcStringBindingComposeA(ObjectUuid, (unsigned char*)bind->Protseq, (unsigned char*) bind->NetworkAddr, (unsigned char*) bind->Endpoint, NULL, StringBinding); - RpcStringFreeA((unsigned char**)&ObjectUuid); + RpcStringFreeA(&ObjectUuid); return ret; } diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index 2ad90f8..5328ac0 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -144,8 +144,8 @@ RPC_STATUS RPCRT4_OpenClientConnection(RpcConnection* Connection); RPC_STATUS RPCRT4_CloseConnection(RpcConnection* Connection); RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnection* OldConnection); -RPC_STATUS RPCRT4_ResolveBinding(RpcBinding* Binding, LPSTR Endpoint); -RPC_STATUS RPCRT4_SetBindingObject(RpcBinding* Binding, UUID* ObjectUuid); +RPC_STATUS RPCRT4_ResolveBinding(RpcBinding* Binding, LPCSTR Endpoint); +RPC_STATUS RPCRT4_SetBindingObject(RpcBinding* Binding, const UUID* ObjectUuid); RPC_STATUS RPCRT4_MakeBinding(RpcBinding** Binding, RpcConnection* Connection); RPC_STATUS RPCRT4_ExportBinding(RpcBinding** Binding, RpcBinding* OldBinding); RPC_STATUS RPCRT4_DestroyBinding(RpcBinding* Binding);

1 0

Rob Shearman : rpcrt4: Implement associations which are intermediary objects that track the relationship between the client and a given endpoint on the server .
by Alexandre Julliard March 27, 2007

March 27, 2007

Module: wine Branch: master Commit: adb7cca85cc3a288761fab996de43860d50be320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adb7cca85cc3a288761fab996… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 26 18:13:49 2007 +0100 rpcrt4: Implement associations which are intermediary objects that track the relationship between the client and a given endpoint on the server. Use these to encapsulate the connection pool so that the lifetimes of connections are properly handled again. --- dlls/rpcrt4/rpc_binding.c | 37 +++++++++++-- dlls/rpcrt4/rpc_binding.h | 23 ++++++++- dlls/rpcrt4/rpc_transport.c | 120 +++++++++++++++++++++++++++++++++++-------- 3 files changed, 151 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=adb7cca85cc3a288761fa…

1 0

Andrew Talbot : secur32: Replace const pointer parameters with correct pointers to const.
by Alexandre Julliard March 27, 2007

March 27, 2007

Module: wine Branch: master Commit: e7730a16680741f6bbce80b284fe2349df1d8030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7730a16680741f6bbce80b28… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Mar 26 21:29:02 2007 +0100 secur32: Replace const pointer parameters with correct pointers to const. --- dlls/secur32/secur32.c | 2 +- dlls/secur32/secur32_priv.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index ee0b080..421b115 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -389,7 +389,7 @@ static void _copyPackageInfo(PSecPkgInfoW info, const SecPkgInfoA *inInfoA, } SecureProvider *SECUR32_addProvider(const SecurityFunctionTableA *fnTableA, - const SecurityFunctionTableW *fnTableW, const PWSTR moduleName) + const SecurityFunctionTableW *fnTableW, PCWSTR moduleName) { SecureProvider *ret; diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 29c48e7..8e80dea 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -103,7 +103,7 @@ typedef enum _sign_direction { * Returns a pointer to the stored provider entry, for use adding packages. */ SecureProvider *SECUR32_addProvider(const SecurityFunctionTableA *fnTableA, - const SecurityFunctionTableW *fnTableW, const PWSTR moduleName); + const SecurityFunctionTableW *fnTableW, PCWSTR moduleName); /* Allocates space for and adds toAdd packages with the given provider. * provider must not be NULL, and either infoA or infoW may be NULL, but not

1 0