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

Eric Pouech : user32: Allow interprocess WM_NCPAINT messages when wParam is 0 or 1.
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: b980bbec17acd0efc5c104ef4b05730ef10ea525 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b980bbec17acd0efc5c104e… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue May 16 21:14:59 2006 +0200 user32: Allow interprocess WM_NCPAINT messages when wParam is 0 or 1. --- dlls/user/message.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/user/message.c b/dlls/user/message.c index c3ab617..ab6527b 100644 --- a/dlls/user/message.c +++ b/dlls/user/message.c @@ -619,6 +619,11 @@ static size_t pack_message( HWND hwnd, U case WM_WINE_MOUSE_LL_HOOK: push_data( data, (MSLLHOOKSTRUCT *)lparam, sizeof(MSLLHOOKSTRUCT) ); return 0; + case WM_NCPAINT: + if (wparam <= 1) return 0; + FIXME( "WM_NCPAINT hdc packing not supported yet\n" ); + data->count = -1; + return 0; case WM_PAINT: if (!wparam) return 0; /* fall through */ @@ -629,7 +634,6 @@ static size_t pack_message( HWND hwnd, U /* these contain an HDC */ case WM_ERASEBKGND: case WM_ICONERASEBKGND: - case WM_NCPAINT: case WM_CTLCOLORMSGBOX: case WM_CTLCOLOREDIT: case WM_CTLCOLORLISTBOX: @@ -879,6 +883,10 @@ static BOOL unpack_message( HWND hwnd, U case WM_WINE_MOUSE_LL_HOOK: minsize = sizeof(MSLLHOOKSTRUCT); break; + case WM_NCPAINT: + if (*wparam <= 1) return TRUE; + FIXME( "WM_NCPAINT hdc unpacking not supported\n" ); + return FALSE; case WM_PAINT: if (!*wparam) return TRUE; /* fall through */ @@ -889,7 +897,6 @@ static BOOL unpack_message( HWND hwnd, U /* these contain an HDC */ case WM_ERASEBKGND: case WM_ICONERASEBKGND: - case WM_NCPAINT: case WM_CTLCOLORMSGBOX: case WM_CTLCOLOREDIT: case WM_CTLCOLORLISTBOX:

1 0

Robert Shearman : rpcrt4: Implement RpcBindingSetAuthInfoExW based on the implementation for RpcBindingSetAuthInfoExA .
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: 63b66b95f97e68487973e38fe4c647869a878c5d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=63b66b95f97e68487973e38… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu May 18 03:41:34 2006 +0100 rpcrt4: Implement RpcBindingSetAuthInfoExW based on the implementation for RpcBindingSetAuthInfoExA. --- dlls/rpcrt4/rpc_binding.c | 63 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 6bc3182..631d46e 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1088,9 +1088,68 @@ RpcBindingSetAuthInfoExW( RPC_BINDING_HA unsigned long AuthnSvc, RPC_AUTH_IDENTITY_HANDLE AuthIdentity, unsigned long AuthzSvr, RPC_SECURITY_QOS *SecurityQos ) { - FIXME("%p %s %lu %lu %p %lu %p\n", Binding, debugstr_w((const WCHAR*)ServerPrincName), - AuthnLevel, AuthnSvc, AuthIdentity, AuthzSvr, SecurityQos); + RpcBinding* bind = (RpcBinding*)Binding; + SECURITY_STATUS r; + CredHandle cred; + TimeStamp exp; + ULONG package_count; + ULONG i; + PSecPkgInfoW packages; + + TRACE("%p %s %lu %lu %p %lu %p\n", Binding, debugstr_w((const WCHAR*)ServerPrincName), + AuthnLevel, AuthnSvc, AuthIdentity, AuthzSvr, SecurityQos); + + if (AuthnLevel != RPC_C_AUTHN_LEVEL_CONNECT) + { + FIXME("unsupported AuthnLevel %lu\n", AuthnLevel); + return RPC_S_UNKNOWN_AUTHN_LEVEL; + } + + if (AuthzSvr) + { + FIXME("unsupported AuthzSvr %lu\n", AuthzSvr); + return RPC_S_UNKNOWN_AUTHZ_SERVICE; + } + + if (SecurityQos) + FIXME("SecurityQos ignored\n"); + + r = EnumerateSecurityPackagesW(&package_count, &packages); + if (r != SEC_E_OK) + { + ERR("EnumerateSecurityPackagesA failed with error 0x%08lx\n", r); + return RPC_S_SEC_PKG_ERROR; + } + + for (i = 0; i < package_count; i++) + if (packages[i].wRPCID == AuthnSvc) + break; + + if (i == package_count) + { + FIXME("unsupported AuthnSvc %lu\n", AuthnSvc); + FreeContextBuffer(packages); + return RPC_S_UNKNOWN_AUTHN_SERVICE; + } + + TRACE("found package %s for service %ld\n", debugstr_w(packages[i].Name), AuthnSvc); + r = AcquireCredentialsHandleW((SEC_WCHAR *)ServerPrincName, packages[i].Name, SECPKG_CRED_OUTBOUND, NULL, + AuthIdentity, NULL, NULL, &cred, &exp); + 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); + if (r != RPC_S_OK) + FreeCredentialsHandle(&cred); return RPC_S_OK; + } + else + { + ERR("AcquireCredentialsHandleA failed with error 0x%08lx\n", r); + return RPC_S_SEC_PKG_ERROR; + } } /***********************************************************************

1 0

Robert Shearman : rpcrt4: A NULL AuthInfo is allowed.
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: 4cd5be26378bcc5aab2333ba487a814e5dd6816c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4cd5be26378bcc5aab2333b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu May 18 03:41:25 2006 +0100 rpcrt4: A NULL AuthInfo is allowed. Pass the server principal name into AcquireCredentialsHandleA. --- dlls/rpcrt4/rpc_binding.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 73bff58..6bc3182 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1027,9 +1027,6 @@ RpcBindingSetAuthInfoExA( RPC_BINDING_HA TRACE("%p %s %lu %lu %p %lu %p\n", Binding, debugstr_a((const char*)ServerPrincName), AuthnLevel, AuthnSvc, AuthIdentity, AuthzSvr, SecurityQos); - if (!AuthIdentity) - return RPC_S_INVALID_AUTH_IDENTITY; - if (AuthnLevel != RPC_C_AUTHN_LEVEL_CONNECT) { FIXME("unsupported AuthnLevel %lu\n", AuthnLevel); @@ -1064,7 +1061,7 @@ RpcBindingSetAuthInfoExA( RPC_BINDING_HA } TRACE("found package %s for service %ld\n", packages[i].Name, AuthnSvc); - r = AcquireCredentialsHandleA(NULL, packages[i].Name, SECPKG_CRED_OUTBOUND, NULL, + r = AcquireCredentialsHandleA((SEC_CHAR *)ServerPrincName, packages[i].Name, SECPKG_CRED_OUTBOUND, NULL, AuthIdentity, NULL, NULL, &cred, &exp); FreeContextBuffer(packages); if (r == ERROR_SUCCESS)

1 0

Robert Shearman : rpcrt4: Support all available security packages in RpcBindingSetAuthInfoExA, instead of just NTLM.
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: 84e42e0165cbc77f7a5ac6931ad050888a9f9b77 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=84e42e0165cbc77f7a5ac69… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu May 18 03:41:16 2006 +0100 rpcrt4: Support all available security packages in RpcBindingSetAuthInfoExA, instead of just NTLM. --- dlls/rpcrt4/rpc_binding.c | 38 +++++++++++++++++++++++++++++--------- 1 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 0801de7..73bff58 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1017,9 +1017,12 @@ RpcBindingSetAuthInfoExA( RPC_BINDING_HA RPC_SECURITY_QOS *SecurityQos ) { RpcBinding* bind = (RpcBinding*)Binding; - RPC_STATUS r; + SECURITY_STATUS r; CredHandle cred; TimeStamp exp; + ULONG package_count; + ULONG i; + PSecPkgInfoA packages; TRACE("%p %s %lu %lu %p %lu %p\n", Binding, debugstr_a((const char*)ServerPrincName), AuthnLevel, AuthnSvc, AuthIdentity, AuthzSvr, SecurityQos); @@ -1033,12 +1036,6 @@ RpcBindingSetAuthInfoExA( RPC_BINDING_HA return RPC_S_UNKNOWN_AUTHN_LEVEL; } - if (AuthnSvc != RPC_C_AUTHN_WINNT) - { - FIXME("unsupported AuthnSvc %lu\n", AuthnSvc); - return RPC_S_UNKNOWN_AUTHN_SERVICE; - } - if (AuthzSvr) { FIXME("unsupported AuthzSvr %lu\n", AuthzSvr); @@ -1048,8 +1045,28 @@ RpcBindingSetAuthInfoExA( RPC_BINDING_HA if (SecurityQos) FIXME("SecurityQos ignored\n"); - r = AcquireCredentialsHandleA(NULL, "NTLM", SECPKG_CRED_OUTBOUND, NULL, + r = EnumerateSecurityPackagesA(&package_count, &packages); + if (r != SEC_E_OK) + { + ERR("EnumerateSecurityPackagesA failed with error 0x%08lx\n", r); + return RPC_S_SEC_PKG_ERROR; + } + + for (i = 0; i < package_count; i++) + if (packages[i].wRPCID == AuthnSvc) + break; + + if (i == package_count) + { + FIXME("unsupported AuthnSvc %lu\n", AuthnSvc); + FreeContextBuffer(packages); + return RPC_S_UNKNOWN_AUTHN_SERVICE; + } + + TRACE("found package %s for service %ld\n", packages[i].Name, AuthnSvc); + r = AcquireCredentialsHandleA(NULL, packages[i].Name, SECPKG_CRED_OUTBOUND, NULL, AuthIdentity, NULL, NULL, &cred, &exp); + FreeContextBuffer(packages); if (r == ERROR_SUCCESS) { if (bind->AuthInfo) RpcAuthInfo_Release(bind->AuthInfo); @@ -1057,10 +1074,13 @@ RpcBindingSetAuthInfoExA( RPC_BINDING_HA r = RpcAuthInfo_Create(AuthnLevel, AuthnSvc, cred, exp, &bind->AuthInfo); if (r != RPC_S_OK) FreeCredentialsHandle(&cred); + return RPC_S_OK; } else + { ERR("AcquireCredentialsHandleA failed with error 0x%08lx\n", r); - return r; + return RPC_S_SEC_PKG_ERROR; + } } /***********************************************************************

1 0

Robert Shearman : rpcrt4: Only use the cached connection if the authentication information is compatible .
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: 4e89efadf615dd89d050f923d5a8b4f731a53b35 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4e89efadf615dd89d050f92… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu May 18 03:40:58 2006 +0100 rpcrt4: Only use the cached connection if the authentication information is compatible. --- dlls/rpcrt4/rpc_binding.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 22d9e98..0801de7 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -242,6 +242,7 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding /* if we try to bind a new interface and the connection is already opened, * close the current connection and create a new with the new binding. */ if (!Binding->server && Binding->FromConn && + (Binding->AuthInfo == Binding->FromConn->AuthInfo) && memcmp(&Binding->FromConn->ActiveInterface, InterfaceId, sizeof(RPC_SYNTAX_IDENTIFIER))) {

1 0

Robert Shearman : rpcrt4: Store non-connection-specific authentication information in a ref-counted structure that is shared between connections and bindings .
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: 217ec275b8b5d936014545d73f30d488183f737e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=217ec275b8b5d936014545d… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu May 18 03:40:42 2006 +0100 rpcrt4: Store non-connection-specific authentication information in a ref-counted structure that is shared between connections and bindings. --- dlls/rpcrt4/rpc_binding.c | 50 +++++++++++++++++++++++++++++++++++++++---- dlls/rpcrt4/rpc_binding.h | 22 +++++++++++++++---- dlls/rpcrt4/rpc_message.c | 19 ++++++++-------- dlls/rpcrt4/rpc_server.c | 3 ++- dlls/rpcrt4/rpc_transport.c | 10 +++++++-- 5 files changed, 81 insertions(+), 23 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index dc22be3..22d9e98 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -257,7 +257,9 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding } /* create a new connection */ - RPCRT4_CreateConnection(&NewConnection, Binding->server, Binding->Protseq, Binding->NetworkAddr, Binding->Endpoint, NULL, Binding); + RPCRT4_CreateConnection(&NewConnection, Binding->server, Binding->Protseq, + Binding->NetworkAddr, Binding->Endpoint, NULL, + Binding->AuthInfo, Binding); *Connection = NewConnection; status = RPCRT4_OpenConnection(NewConnection); if (status != RPC_S_OK) { @@ -922,6 +924,38 @@ RPC_STATUS WINAPI RpcRevertToSelfEx(RPC_ return RPC_S_OK; } +static RPC_STATUS RpcAuthInfo_Create(unsigned long AuthnLevel, unsigned long AuthnSvc, CredHandle cred, TimeStamp exp, RpcAuthInfo **ret) +{ + RpcAuthInfo *AuthInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*AuthInfo)); + if (!AuthInfo) + return ERROR_OUTOFMEMORY; + + AuthInfo->AuthnLevel = AuthnLevel; + AuthInfo->AuthnSvc = AuthnSvc; + AuthInfo->cred = cred; + AuthInfo->exp = exp; + *ret = AuthInfo; + return RPC_S_OK; +} + +ULONG RpcAuthInfo_AddRef(RpcAuthInfo *AuthInfo) +{ + return InterlockedIncrement(&AuthInfo->refs); +} + +ULONG RpcAuthInfo_Release(RpcAuthInfo *AuthInfo) +{ + ULONG refs = InterlockedDecrement(&AuthInfo->refs); + + if (!refs) + { + FreeCredentialsHandle(&AuthInfo->cred); + HeapFree(GetProcessHeap(), 0, AuthInfo); + } + + return refs; +} + /*********************************************************************** * RpcBindingInqAuthInfoExA (RPCRT4.@) */ @@ -983,6 +1017,8 @@ RpcBindingSetAuthInfoExA( RPC_BINDING_HA { RpcBinding* bind = (RpcBinding*)Binding; RPC_STATUS r; + CredHandle cred; + TimeStamp exp; TRACE("%p %s %lu %lu %p %lu %p\n", Binding, debugstr_a((const char*)ServerPrincName), AuthnLevel, AuthnSvc, AuthIdentity, AuthzSvr, SecurityQos); @@ -1012,13 +1048,17 @@ RpcBindingSetAuthInfoExA( RPC_BINDING_HA FIXME("SecurityQos ignored\n"); r = AcquireCredentialsHandleA(NULL, "NTLM", SECPKG_CRED_OUTBOUND, NULL, - AuthIdentity, NULL, NULL, &bind->cred, &bind->exp); + AuthIdentity, NULL, NULL, &cred, &exp); if (r == ERROR_SUCCESS) { - bind->AuthnSvc = AuthnSvc; - bind->AuthnLevel = AuthnLevel; + if (bind->AuthInfo) RpcAuthInfo_Release(bind->AuthInfo); + bind->AuthInfo = NULL; + r = RpcAuthInfo_Create(AuthnLevel, AuthnSvc, cred, exp, &bind->AuthInfo); + if (r != RPC_S_OK) + FreeCredentialsHandle(&cred); } - TRACE("AcquireCredentialsHandleA returned %08lx\n", r); + else + ERR("AcquireCredentialsHandleA failed with error 0x%08lx\n", r); return r; } diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index d9e1576..ad2e360 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -24,6 +24,17 @@ #define __WINE_RPC_BINDING_H #include "wine/rpcss_shared.h" #include "security.h" + +typedef struct _RpcAuthInfo +{ + LONG refs; + + unsigned long AuthnLevel; + unsigned long AuthnSvc; + CredHandle cred; + TimeStamp exp; +} RpcAuthInfo; + struct protseq_ops; typedef struct _RpcConnection @@ -43,6 +54,7 @@ typedef struct _RpcConnection CtxtHandle ctx; TimeStamp exp; ULONG attr; + RpcAuthInfo *AuthInfo; } RpcConnection; struct protseq_ops { @@ -71,10 +83,7 @@ typedef struct _RpcBinding RpcConnection* FromConn; /* authentication */ - unsigned long AuthnLevel; - unsigned long AuthnSvc; - CredHandle cred; - TimeStamp exp; + RpcAuthInfo *AuthInfo; } RpcBinding; LPSTR RPCRT4_strndupA(LPCSTR src, INT len); @@ -86,7 +95,10 @@ void RPCRT4_strfree(LPSTR src); #define RPCRT4_strdupA(x) RPCRT4_strndupA((x),-1) #define RPCRT4_strdupW(x) RPCRT4_strndupW((x),-1) -RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCSTR NetworkOptions, RpcBinding* Binding); +ULONG RpcAuthInfo_AddRef(RpcAuthInfo *AuthInfo); +ULONG RpcAuthInfo_Release(RpcAuthInfo *AuthInfo); + +RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcBinding* Binding); RPC_STATUS RPCRT4_DestroyConnection(RpcConnection* Connection); RPC_STATUS RPCRT4_OpenConnection(RpcConnection* Connection); RPC_STATUS RPCRT4_CloseConnection(RpcConnection* Connection); diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index a4d92b6..d4ddb41 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -295,12 +295,12 @@ static RPC_STATUS RPCRT4_SendAuth(RpcCon memcpy(pkt + hdr_size, buffer_pos, Header->common.frag_len - hdr_size - alen); /* add the authorization info */ - if (Connection->Used && AuthLength) + if (Connection->AuthInfo && AuthLength) { auth_hdr = &pkt[Header->common.frag_len - alen]; - auth_hdr[0] = Connection->Used->AuthnSvc; - auth_hdr[1] = Connection->Used->AuthnLevel; + auth_hdr[0] = Connection->AuthInfo->AuthnSvc; + auth_hdr[1] = Connection->AuthInfo->AuthnLevel; auth_hdr[2] = 0x00; /* FIXME: add padding */ auth_hdr[3] = 0x00; @@ -333,7 +333,6 @@ static void RPCRT4_AuthNegotiate(RpcConn SECURITY_STATUS r; SecBufferDesc out_desc; unsigned char *buffer; - RpcBinding *bind = conn->Used; buffer = HeapAlloc(GetProcessHeap(), 0, 0x100); @@ -349,10 +348,10 @@ static void RPCRT4_AuthNegotiate(RpcConn conn->ctx.dwLower = 0; conn->ctx.dwUpper = 0; - r = InitializeSecurityContextA(&bind->cred, NULL, NULL, + r = InitializeSecurityContextA(&conn->AuthInfo->cred, NULL, NULL, ISC_REQ_CONNECTION | ISC_REQ_USE_DCE_STYLE | ISC_REQ_MUTUAL_AUTH | ISC_REQ_DELEGATE, 0, SECURITY_NETWORK_DREP, - NULL, 0, &conn->ctx, &out_desc, &conn->attr, &bind->exp); + NULL, 0, &conn->ctx, &out_desc, &conn->attr, &conn->exp); TRACE("r = %08lx cbBuffer = %ld attr = %08lx\n", r, out->cbBuffer, conn->attr); } @@ -388,7 +387,7 @@ static RPC_STATUS RPCRT_AuthorizeConnect inp_desc.pBuffers = &inp; inp_desc.ulVersion = 0; - r = InitializeSecurityContextA(&conn->Used->cred, &conn->ctx, NULL, + r = InitializeSecurityContextA(&conn->AuthInfo->cred, &conn->ctx, NULL, ISC_REQ_CONNECTION | ISC_REQ_USE_DCE_STYLE | ISC_REQ_MUTUAL_AUTH | ISC_REQ_DELEGATE, 0, SECURITY_NETWORK_DREP, &inp_desc, 0, &conn->ctx, &out_desc, &conn->attr, &conn->exp); @@ -431,9 +430,9 @@ RPC_STATUS RPCRT4_Send(RpcConnection *Co return RPCRT4_SendAuth(Connection, Header, Buffer, BufferLength, buffer, sizeof buffer); } - if (Connection->Used == NULL || - Connection->Used->AuthnLevel == RPC_C_AUTHN_LEVEL_DEFAULT || - Connection->Used->AuthnLevel == RPC_C_AUTHN_LEVEL_NONE) + if (!Connection->AuthInfo || + Connection->AuthInfo->AuthnLevel == RPC_C_AUTHN_LEVEL_DEFAULT || + Connection->AuthInfo->AuthnLevel == RPC_C_AUTHN_LEVEL_NONE) { return RPCRT4_SendAuth(Connection, Header, Buffer, BufferLength, NULL, 0); } diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 8889540..e9a6da6 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -624,7 +624,8 @@ static void RPCRT4_stop_listen(BOOL auto static RPC_STATUS RPCRT4_use_protseq(RpcServerProtseq* ps) { - RPCRT4_CreateConnection(&ps->conn, TRUE, ps->Protseq, NULL, ps->Endpoint, NULL, NULL); + RPCRT4_CreateConnection(&ps->conn, TRUE, ps->Protseq, NULL, ps->Endpoint, + NULL, NULL, NULL); EnterCriticalSection(&server_cs); ps->Next = protseqs; diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 88a7769..ba4e8d3 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -435,7 +435,9 @@ RPC_STATUS RPCRT4_CloseConnection(RpcCon return RPC_S_OK; } -RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCSTR NetworkOptions, RpcBinding* Binding) +RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, + LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, + LPCSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcBinding* Binding) { struct protseq_ops *ops; RpcConnection* NewConnection; @@ -452,6 +454,8 @@ RPC_STATUS RPCRT4_CreateConnection(RpcCo NewConnection->Used = Binding; NewConnection->MaxTransmissionSize = RPC_MAX_PACKET_SIZE; NewConnection->NextCallId = 1; + if (AuthInfo) RpcAuthInfo_AddRef(AuthInfo); + NewConnection->AuthInfo = AuthInfo; TRACE("connection: %p\n", NewConnection); *Connection = NewConnection; @@ -466,7 +470,8 @@ RPC_STATUS RPCRT4_SpawnConnection(RpcCon err = RPCRT4_CreateConnection(Connection, OldConnection->server, rpcrt4_conn_get_name(OldConnection), OldConnection->NetworkAddr, - OldConnection->Endpoint, NULL, NULL); + OldConnection->Endpoint, NULL, + OldConnection->AuthInfo, NULL); if (err == RPC_S_OK) rpcrt4_conn_handoff(OldConnection, *Connection); return err; @@ -479,6 +484,7 @@ RPC_STATUS RPCRT4_DestroyConnection(RpcC RPCRT4_CloseConnection(Connection); RPCRT4_strfree(Connection->Endpoint); RPCRT4_strfree(Connection->NetworkAddr); + RpcAuthInfo_Release(Connection->AuthInfo); HeapFree(GetProcessHeap(), 0, Connection); return RPC_S_OK; }

1 0

Robert Shearman : rpcrt4: Make secur32 into a delayed import, as most of the time it won't be needed.
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: 40d80d7c7ac5d9794d82e54318ffad0f051df3de URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=40d80d7c7ac5d9794d82e54… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu May 18 03:40:16 2006 +0100 rpcrt4: Make secur32 into a delayed import, as most of the time it won't be needed. --- dlls/rpcrt4/Makefile.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in index b4ff100..2b57ccc 100644 --- a/dlls/rpcrt4/Makefile.in +++ b/dlls/rpcrt4/Makefile.in @@ -5,7 +5,8 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = rpcrt4.dll IMPORTLIB = librpcrt4.$(IMPLIBEXT) -IMPORTS = secur32 iphlpapi advapi32 kernel32 ntdll +IMPORTS = iphlpapi advapi32 kernel32 ntdll +DELAYIMPORTS = secur32 EXTRALIBS = -luuid C_SRCS = \

1 0

Robert Shearman : rpcrt4: Handle interface pointers in EmbeddedComplexSize.
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: 855535af62b162e2b9b29561a5244b83c073bb31 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=855535af62b162e2b9b2956… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu May 18 03:40:06 2006 +0100 rpcrt4: Handle interface pointers in EmbeddedComplexSize. --- dlls/rpcrt4/ndr_marshall.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 9045902..d80e45b 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1543,6 +1543,8 @@ static unsigned long EmbeddedComplexSize pFormat += *(const SHORT*)pFormat; return *(const SHORT*)pFormat; + case RPC_FC_IP: + return sizeof(void *); default: FIXME("unhandled embedded type %02x\n", *pFormat); }

1 0

Robert Shearman : rpcrt4: Fix an off-by-one error when checking the size of the buffer in NdrInterfacePointerMarshall .
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: 9b3cecaeb55471eaf9aa57ee644ccfec6b16d947 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9b3cecaeb55471eaf9aa57e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu May 18 03:40:29 2006 +0100 rpcrt4: Fix an off-by-one error when checking the size of the buffer in NdrInterfacePointerMarshall. --- dlls/rpcrt4/ndr_ole.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index ba0404f..e84bda6 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -254,7 +254,7 @@ unsigned char * WINAPI NdrInterfacePoint TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); pStubMsg->MaxCount = 0; if (!LoadCOM()) return NULL; - if (pStubMsg->Buffer + sizeof(DWORD) < (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) { + if (pStubMsg->Buffer + sizeof(DWORD) <= (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) { stream = RpcStream_Create(pStubMsg, TRUE); if (stream) { if (pMemory)

1 0

Robert Shearman : rpcrt4: Implement NdrNonEncapsulatedUnionMemorySize.
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: c1d00c547b9cb4908ccf0050801e38a35206210b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c1d00c547b9cb4908ccf005… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu May 18 03:39:34 2006 +0100 rpcrt4: Implement NdrNonEncapsulatedUnionMemorySize. --- dlls/rpcrt4/ndr_marshall.c | 56 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 50 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 231f7a5..9045902 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -3834,15 +3834,59 @@ void WINAPI NdrNonEncapsulatedUnionBuffe unsigned long WINAPI NdrNonEncapsulatedUnionMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { + unsigned long discriminant; + unsigned short type, size; + + pFormat++; + /* Unmarshall discriminant */ + discriminant = unmarshall_discriminant(pStubMsg, &pFormat); + TRACE("unmarshalled discriminant 0x%lx\n", discriminant); + + pFormat += *(const SHORT*)pFormat; + + size = *(const unsigned short*)pFormat; pFormat += 2; - if (pStubMsg->fHasNewCorrDesc) - pFormat += 6; + + pFormat = get_arm_offset_from_union_arm_selector(pStubMsg, discriminant, pFormat); + if(!pFormat) + return 0; + + pStubMsg->Memory += size; + + type = *(const unsigned short*)pFormat; + if((type & 0xff00) == 0x8000) + { + return NdrBaseTypeMemorySize(pStubMsg, pFormat); + } else - pFormat += 4; + { + PFORMAT_STRING desc = pFormat + *(const SHORT*)pFormat; + NDR_MEMORYSIZE m = NdrMemorySizer[*desc & NDR_TABLE_MASK]; + unsigned char *saved_buffer; + if (m) + { + switch(*desc) + { + case RPC_FC_RP: + case RPC_FC_UP: + case RPC_FC_OP: + case RPC_FC_FP: + ALIGN_POINTER(pStubMsg->Buffer, 4); + saved_buffer = pStubMsg->Buffer; + pStubMsg->Buffer += 4; + ALIGN_LENGTH(pStubMsg->MemorySize, 4); + pStubMsg->MemorySize += 4; + PointerMemorySize(pStubMsg, saved_buffer, pFormat); + break; + default: + return m(pStubMsg, desc); + } + } + else FIXME("no marshaller for embedded type %02x\n", *desc); + } - pFormat += *(const SHORT*)pFormat; - TRACE("size %d\n", *(const SHORT*)pFormat); - return *(const SHORT*)pFormat; + TRACE("size %d\n", size); + return size; } /***********************************************************************

1 0