January 2018 - Wine-Devel - list.winehq.org

Re: [PATCH 08/13] secur32: Implement MakeSignature in the SSP/AP wrapper.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Jan. 31, 2018

Re: [PATCH 07/13] secur32: Implement QueryContextAttributes in the SSP/AP wrapper.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Jan. 31, 2018

Re: [PATCH 06/13] secur32: Implement AcceptSecurityContext in the SSP/AP wrapper.

by Hans Leidekker

On Thu, 2018-01-18 at 23:54 +0800, Dmitry Timoshkov wrote: > +static SECURITY_STATUS WINAPI lsa_AcceptSecurityContext( > + CredHandle *credential, CtxtHandle *context, SecBufferDesc *input, > + ULONG context_req, ULONG target_data_rep, CtxtHandle *new_context, > + SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) > +{ > + SECURITY_STATUS status; > + struct lsa_package *lsa_package = NULL; > + LSA_SEC_HANDLE lsa_credential = 0, lsa_context = 0, new_lsa_context; > + BOOLEAN mapped_context; > + > + TRACE("%p %p %p %#x %#x %p %p %p %p\n", credential, context, input, > + context_req, target_data_rep, new_context, output, context_attr, ts_expiry); > + > + if (credential) > + { > + lsa_package = (struct lsa_package *)credential->dwUpper; > + lsa_credential = (LSA_SEC_HANDLE)credential->dwLower; > + } > + else if (context) > + { > + lsa_package = (struct lsa_package *)context->dwUpper; > + lsa_context = (LSA_SEC_HANDLE)context->dwLower; > + } Same issue as with InitializeSecurityContext. > + if (!lsa_package || !new_context) return SEC_E_INVALID_HANDLE; > + > + if (!lsa_package->lsa_api || !lsa_package->lsa_api->AcceptLsaModeContext) > + return SEC_E_UNSUPPORTED_FUNCTION; > + > + status = lsa_package->lsa_api->AcceptLsaModeContext(lsa_credential, lsa_context, > + input, context_req, target_data_rep, &new_lsa_context, output, context_attr, > + ts_expiry, &mapped_context, NULL /* FIXME */); > + if (status == SEC_E_OK) > + { > + new_context->dwLower = (ULONG_PTR)new_lsa_context; > + new_context->dwUpper = (ULONG_PTR)lsa_package; > + } Here too.

Jan. 31, 2018

Re: [PATCH 05/13] secur32: Implement DeleteSecurityContext in the SSP/AP wrapper.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Jan. 31, 2018

Re: [PATCH 04/13] secur32: Implement InitializeSecurityContext in the SSP/AP wrapper.

by Hans Leidekker

On Thu, 2018-01-18 at 23:54 +0800, Dmitry Timoshkov wrote: > +static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextW( > + CredHandle *credential, CtxtHandle *context, SEC_WCHAR *target_name, ULONG context_req, > + ULONG reserved1, ULONG target_data_rep, SecBufferDesc *input, ULONG reserved2, > + CtxtHandle *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) > +{ > + SECURITY_STATUS status; > + struct lsa_package *lsa_package = NULL; > + LSA_SEC_HANDLE lsa_credential = 0, lsa_context = 0, new_lsa_context; > + UNICODE_STRING target_name_us; > + BOOLEAN mapped_context; > + > + TRACE("%p %p %s %#x %d %d %p %d %p %p %p %p\n", credential, context, > + debugstr_w(target_name), context_req, reserved1, target_data_rep, input, > + reserved2, new_context, output, context_attr, ts_expiry); > + > + if (credential) > + { > + lsa_package = (struct lsa_package *)credential->dwUpper; > + lsa_credential = (LSA_SEC_HANDLE)credential->dwLower; > + } > + else if (context) > + { > + lsa_package = (struct lsa_package *)context->dwUpper; > + lsa_context = (LSA_SEC_HANDLE)context->dwLower; > + } It's not an error to pass a credential parameter in the second call, so you should switch the order here. > + if (!lsa_package || !new_context) return SEC_E_INVALID_HANDLE; > + > + if (!lsa_package->lsa_api || !lsa_package->lsa_api->InitLsaModeContext) > + return SEC_E_UNSUPPORTED_FUNCTION; > + > + if (target_name) > + RtlInitUnicodeString(&target_name_us, target_name); > + > + status = lsa_package->lsa_api->InitLsaModeContext(lsa_credential, lsa_context, > + target_name ? &target_name_us : NULL, context_req, target_data_rep, input, > + &new_lsa_context, output, context_attr, ts_expiry, &mapped_context, NULL /* FIXME */); > + if (status == SEC_E_OK) > + { > + new_context->dwLower = (ULONG_PTR)new_lsa_context; > + new_context->dwUpper = (ULONG_PTR)lsa_package; > + } You should also accept SEC_I_CONTINUE_NEEDED here, otherwise the caller won't see the new context in a three-leg authentication.

Jan. 31, 2018

Re: [PATCH 03/13] secur32: Implement FreeCredentialsHandle in the SSP/AP wrapper.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Jan. 31, 2018

Re: [PATCH 02/13] secur32: Implement AcquireCredentialsHandle in the SSP/AP wrapper.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Jan. 31, 2018

Re: [PATCH 01/13] secur32: Add support for loading SSP/AP dll as an SSPI provider.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Jan. 31, 2018

Re: [PATCH] ole32: Return error from IStream Clone.

by Huw Davies

On Tue, Jan 30, 2018 at 10:40:29PM +0000, Daniel Lehman wrote: > > From fe5040c66792c63ff28c97265a90dd65525b7340 Mon Sep 17 00:00:00 2001 > From: Daniel Lehman <dlehman(a)esri.com> > Date: Fri, 19 Jan 2018 10:39:17 -0800 > Subject: [PATCH] ole32: Return error from IStream Clone. > > Signed-off-by: Daniel Lehman <dlehman(a)esri.com> > --- > dlls/ole32/stg_stream.c | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c > index a3abf46..23b5b2c 100644 > --- a/dlls/ole32/stg_stream.c > +++ b/dlls/ole32/stg_stream.c > @@ -604,7 +604,6 @@ static HRESULT WINAPI StgStreamImpl_Clone( > IStream** ppstm) /* [out] */ > { > StgStreamImpl* This = impl_from_IStream(iface); > - HRESULT hres; > StgStreamImpl* new_stream; > LARGE_INTEGER seek_pos; > > @@ -630,11 +629,7 @@ static HRESULT WINAPI StgStreamImpl_Clone( > > seek_pos.QuadPart = This->currentPosition.QuadPart; > > - hres = IStream_Seek(*ppstm, seek_pos, STREAM_SEEK_SET, NULL); > - > - assert (SUCCEEDED(hres)); > - > - return S_OK; > + return IStream_Seek(*ppstm, seek_pos, STREAM_SEEK_SET, NULL); > } While you're at it, you could remove the #include <assert.h> line. Huw.

Jan. 31, 2018

Re: [PATCH] ole32/tests: Move stream creation to test function that's using it

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

Jan. 31, 2018