July 2016 - Wine-Commits - list.winehq.org

Hans Leidekker : credui: Use the input identity passed to SspiPromptForCredentialsW.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: 1ca4fc094365d7d1502c31dbed9a5ba0d9620189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ca4fc094365d7d1502c31dbe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 13 10:30:55 2016 +0200 credui: Use the input identity passed to SspiPromptForCredentialsW. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/credui/credui_main.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index c63983e..b85129a 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -871,6 +871,7 @@ ULONG SEC_ENTRY SspiPromptForCredentialsW( PCWSTR target, void *info, DWORD len_password = sizeof(password) / sizeof(password[0]); DWORD ret, flags; CREDUI_INFOW *cred_info = info; + SEC_WINNT_AUTH_IDENTITY_W *id = input_id; FIXME( "(%s, %p, %u, %s, %p, %p, %p, %x) stub\n", debugstr_w(target), info, error, debugstr_w(package), input_id, output_id, save, sspi_flags ); @@ -882,11 +883,6 @@ ULONG SEC_ENTRY SspiPromptForCredentialsW( PCWSTR target, void *info, FIXME( "package %s not supported\n", debugstr_w(package) ); return ERROR_NO_SUCH_PACKAGE; } - if (input_id) - { - FIXME( "input identity not supported\n" ); - return ERROR_CALL_NOT_IMPLEMENTED; - } flags = CREDUI_FLAGS_ALWAYS_SHOW_UI | CREDUI_FLAGS_GENERIC_CREDENTIALS; @@ -896,12 +892,24 @@ ULONG SEC_ENTRY SspiPromptForCredentialsW( PCWSTR target, void *info, if (!(sspi_flags & SSPIPFC_NO_CHECKBOX)) flags |= CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX; - find_existing_credential( target, username, len_username, password, len_password ); + if (!id) find_existing_credential( target, username, len_username, password, len_password ); + else + { + if (id->User && id->UserLength > 0 && id->UserLength <= CREDUI_MAX_USERNAME_LENGTH) + { + memcpy( username, id->User, id->UserLength * sizeof(WCHAR) ); + username[id->UserLength] = 0; + } + if (id->Password && id->PasswordLength > 0 && id->PasswordLength <= CREDUI_MAX_PASSWORD_LENGTH) + { + memcpy( password, id->Password, id->PasswordLength * sizeof(WCHAR) ); + password[id->PasswordLength] = 0; + } + } if (!(ret = CredUIPromptForCredentialsW( cred_info, target, NULL, error, username, len_username, password, len_password, save, flags ))) { - SEC_WINNT_AUTH_IDENTITY_W *id; DWORD size = sizeof(*id); WCHAR *ptr;

1 0

Hans Leidekker : sspicli: Implement SspiFreeAuthIdentity.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: 30d2813829b0f7c1e4549472c3ee1ddfbd7f2f52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30d2813829b0f7c1e4549472c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 13 10:28:33 2016 +0200 sspicli: Implement SspiFreeAuthIdentity. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sspicli/main.c | 9 +++++++++ dlls/sspicli/sspicli.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/sspicli/main.c b/dlls/sspicli/main.c index cbbb7f1..cd34d28 100644 --- a/dlls/sspicli/main.c +++ b/dlls/sspicli/main.c @@ -122,3 +122,12 @@ SECURITY_STATUS SEC_ENTRY SspiEncodeAuthIdentityAsStrings( return SEC_E_OK; } + +/*********************************************************************** + * SspiFreeAuthIdentity (SECUR32.0) + */ +void SEC_ENTRY SspiFreeAuthIdentity( PSEC_WINNT_AUTH_IDENTITY_OPAQUE opaque_id ) +{ + TRACE( "%p\n", opaque_id ); + HeapFree( GetProcessHeap(), 0, opaque_id ); +} diff --git a/dlls/sspicli/sspicli.spec b/dlls/sspicli/sspicli.spec index 6a6a24c..e7f02df 100644 --- a/dlls/sspicli/sspicli.spec +++ b/dlls/sspicli/sspicli.spec @@ -88,7 +88,7 @@ @ stub SspiEncryptAuthIdentity @ stub SspiEncryptAuthIdentityEx @ stub SspiExcludePackage -@ stub SspiFreeAuthIdentity +@ stdcall SspiFreeAuthIdentity(ptr) @ stub SspiGetComputerNameForSPN @ stub SspiGetTargetHostName @ stub SspiIsAuthIdentityEncrypted

1 0

Hans Leidekker : sspicli: Implement SspiEncodeAuthIdentityAsStrings.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: 20ba0b08a983c1e9610c31d8105d279de6313933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ba0b08a983c1e9610c31d81… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 13 10:28:32 2016 +0200 sspicli: Implement SspiEncodeAuthIdentityAsStrings. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sspicli/main.c | 27 +++++++++++++++++++++++++++ dlls/sspicli/sspicli.spec | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/sspicli/main.c b/dlls/sspicli/main.c index 026ecfc..cbbb7f1 100644 --- a/dlls/sspicli/main.c +++ b/dlls/sspicli/main.c @@ -95,3 +95,30 @@ void SEC_ENTRY SspiZeroAuthIdentity( PSEC_WINNT_AUTH_IDENTITY_OPAQUE opaque_id ) if (id->Password) memset( id->Password, 0, id->PasswordLength * sizeof(WCHAR) ); memset( id, 0, sizeof(*id) ); } + +static inline WCHAR *strdupW( const WCHAR *src ) +{ + WCHAR *dst; + if (!src) return NULL; + if ((dst = HeapAlloc( GetProcessHeap(), 0, (strlenW( src ) + 1) * sizeof(WCHAR) ))) + strcpyW( dst, src ); + return dst; +} + +/*********************************************************************** + * SspiEncodeAuthIdentityAsStrings (SECUR32.0) + */ +SECURITY_STATUS SEC_ENTRY SspiEncodeAuthIdentityAsStrings( + PSEC_WINNT_AUTH_IDENTITY_OPAQUE opaque_id, PCWSTR *username, + PCWSTR *domainname, PCWSTR *creds ) +{ + SEC_WINNT_AUTH_IDENTITY_W *id = (SEC_WINNT_AUTH_IDENTITY_W *)opaque_id; + + FIXME("%p %p %p %p\n", opaque_id, username, domainname, creds); + + *username = strdupW( id->User ); + *domainname = strdupW( id->Domain ); + *creds = strdupW( id->Password ); + + return SEC_E_OK; +} diff --git a/dlls/sspicli/sspicli.spec b/dlls/sspicli/sspicli.spec index 2a78cff..6a6a24c 100644 --- a/dlls/sspicli/sspicli.spec +++ b/dlls/sspicli/sspicli.spec @@ -83,7 +83,7 @@ @ stub SspiCopyAuthIdentity @ stub SspiDecryptAuthIdentity @ stub SspiDecryptAuthIdentityEx -@ stub SspiEncodeAuthIdentityAsStrings +@ stdcall SspiEncodeAuthIdentityAsStrings(ptr ptr ptr ptr) @ stdcall SspiEncodeStringsAsAuthIdentity(wstr wstr wstr ptr) @ stub SspiEncryptAuthIdentity @ stub SspiEncryptAuthIdentityEx

1 0

Hans Leidekker : sspicli: Implement SspiZeroAuthIdentity.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: 7f02dcbbcaefada10d0eac166986b49e6d54d419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f02dcbbcaefada10d0eac166… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 13 10:28:31 2016 +0200 sspicli: Implement SspiZeroAuthIdentity. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sspicli/main.c | 16 ++++++++++++++++ dlls/sspicli/sspicli.spec | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/sspicli/main.c b/dlls/sspicli/main.c index a5313cb..026ecfc 100644 --- a/dlls/sspicli/main.c +++ b/dlls/sspicli/main.c @@ -79,3 +79,19 @@ SECURITY_STATUS SEC_ENTRY SspiEncodeStringsAsAuthIdentity( *opaque_id = id; return SEC_E_OK; } + +/*********************************************************************** + * SspiZeroAuthIdentity (SECUR32.0) + */ +void SEC_ENTRY SspiZeroAuthIdentity( PSEC_WINNT_AUTH_IDENTITY_OPAQUE opaque_id ) +{ + SEC_WINNT_AUTH_IDENTITY_W *id = (SEC_WINNT_AUTH_IDENTITY_W *)opaque_id; + + TRACE( "%p\n", opaque_id ); + + if (!id) return; + if (id->User) memset( id->User, 0, id->UserLength * sizeof(WCHAR) ); + if (id->Domain) memset( id->Domain, 0, id->DomainLength * sizeof(WCHAR) ); + if (id->Password) memset( id->Password, 0, id->PasswordLength * sizeof(WCHAR) ); + memset( id, 0, sizeof(*id) ); +} diff --git a/dlls/sspicli/sspicli.spec b/dlls/sspicli/sspicli.spec index 7b92102..2a78cff 100644 --- a/dlls/sspicli/sspicli.spec +++ b/dlls/sspicli/sspicli.spec @@ -99,6 +99,6 @@ @ stub SspiUnmarshalAuthIdentity @ stub SspiUnmarshalAuthIdentityInternal @ stub SspiValidateAuthIdentity -@ stub SspiZeroAuthIdentity +@ stdcall SspiZeroAuthIdentity(ptr) @ stub UnsealMessage @ stub VerifySignature

1 0

Józef Kucia : wined3d: Set load_local_constsF in shader_init().
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: 42a378362a89c1e9be3470d00f4e503122ba292c URL: http://source.winehq.org/git/wine.git/?a=commit;h=42a378362a89c1e9be3470d00… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 13 10:52:04 2016 +0200 wined3d: Set load_local_constsF in shader_init(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 48 +++++++++------------------------------------- 2 files changed, 10 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0090308..5e23920 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -744,7 +744,7 @@ static void shader_glsl_load_constants_f(const struct wined3d_shader *shader, co if (!shader->load_local_constsF) { - TRACE("No need to load local float constants for this shader\n"); + TRACE("No need to load local float constants for this shader.\n"); return; } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 08cee35..d671ad0 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2704,8 +2704,7 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b return WINED3DERR_INVALIDCALL; } - shader->function = HeapAlloc(GetProcessHeap(), 0, shader->functionLength); - if (!shader->function) + if (!(shader->function = HeapAlloc(GetProcessHeap(), 0, shader->functionLength))) return E_OUTOFMEMORY; memcpy(shader->function, byte_code, shader->functionLength); @@ -2969,6 +2968,8 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device shader_cleanup(shader); } + shader->load_local_constsF = shader->lconst_inf_or_nan; + return hr; } @@ -2995,8 +2996,8 @@ static HRESULT vertex_shader_init(struct wined3d_shader *shader, struct wined3d_ shader->u.vs.attributes[input->register_idx].usage_idx = input->semantic_idx; } - shader->load_local_constsF = (reg_maps->usesrelconstF && !list_empty(&shader->constantsF)) || - shader->lconst_inf_or_nan; + if (reg_maps->usesrelconstF && !list_empty(&shader->constantsF)) + shader->load_local_constsF = TRUE; return WINED3D_OK; } @@ -3004,41 +3005,19 @@ static HRESULT vertex_shader_init(struct wined3d_shader *shader, struct wined3d_ static HRESULT domain_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { - HRESULT hr; - - if (FAILED(hr = shader_init(shader, device, desc, 0, WINED3D_SHADER_TYPE_DOMAIN, parent, parent_ops))) - return hr; - - shader->load_local_constsF = shader->lconst_inf_or_nan; - - return WINED3D_OK; + return shader_init(shader, device, desc, 0, WINED3D_SHADER_TYPE_DOMAIN, parent, parent_ops); } static HRESULT hull_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { - HRESULT hr; - - if (FAILED(hr = shader_init(shader, device, desc, 0, WINED3D_SHADER_TYPE_HULL, parent, parent_ops))) - return hr; - - shader->load_local_constsF = shader->lconst_inf_or_nan; - - return WINED3D_OK; + return shader_init(shader, device, desc, 0, WINED3D_SHADER_TYPE_HULL, parent, parent_ops); } static HRESULT geometry_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { - HRESULT hr; - - if (FAILED(hr = shader_init(shader, device, desc, 0, - WINED3D_SHADER_TYPE_GEOMETRY, parent, parent_ops))) - return hr; - - shader->load_local_constsF = shader->lconst_inf_or_nan; - - return WINED3D_OK; + return shader_init(shader, device, desc, 0, WINED3D_SHADER_TYPE_GEOMETRY, parent, parent_ops); } void find_gs_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, @@ -3324,8 +3303,6 @@ static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_d } } - shader->load_local_constsF = shader->lconst_inf_or_nan; - return WINED3D_OK; } @@ -3363,14 +3340,7 @@ void pixelshader_update_resource_types(struct wined3d_shader *shader, WORD tex_t static HRESULT compute_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { - HRESULT hr; - - if (FAILED(hr = shader_init(shader, device, desc, 0, WINED3D_SHADER_TYPE_COMPUTE, parent, parent_ops))) - return hr; - - shader->load_local_constsF = shader->lconst_inf_or_nan; - - return WINED3D_OK; + return shader_init(shader, device, desc, 0, WINED3D_SHADER_TYPE_COMPUTE, parent, parent_ops); } HRESULT CDECL wined3d_shader_create_cs(struct wined3d_device *device, const struct wined3d_shader_desc *desc,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_RSGetScissorRects().
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: ee29789685d0cdded90a1d94089fc0145b6fa266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee29789685d0cdded90a1d940… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 13 10:52:00 2016 +0200 d3d11: Implement d3d11_immediate_context_RSGetScissorRects(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e0e12a1..7f819db8 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1789,7 +1789,24 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetViewports(ID3D11Devic static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetScissorRects(ID3D11DeviceContext *iface, UINT *rect_count, D3D11_RECT *rects) { - FIXME("iface %p, rect_count %p, rects %p stub!\n", iface, rect_count, rects); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + + TRACE("iface %p, rect_count %p, rects %p.\n", iface, rect_count, rects); + + if (!rects) + { + *rect_count = 1; + return; + } + + if (!*rect_count) + return; + + wined3d_mutex_lock(); + wined3d_device_get_scissor_rect(device->wined3d_device, rects); + wined3d_mutex_unlock(); + if (*rect_count > 1) + memset(&rects[1], 0, (*rect_count - 1) * sizeof(*rects)); } static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShaderResources(ID3D11DeviceContext *iface,

1 0

Huw Davies : gdi32: Add a mask_rect primitive for use when the src is 1bpp.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: a8044bebe8257ef2487d3e5c747b4265bc5d3d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8044bebe8257ef2487d3e5c7… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 13 10:02:28 2016 +0100 gdi32: Add a mask_rect primitive for use when the src is 1bpp. This essentially combines the format conversion with a copy_rect. It cannot be used when stretching, since stretching of 1bpp is slightly special. Similarly, it cannot be used if the dst is also 1bpp (hence there is no mask_rect_1) or if the rop involves the brush. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/bitblt.c | 51 +++++- dlls/gdi32/dibdrv/dibdrv.h | 2 + dlls/gdi32/dibdrv/primitives.c | 348 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 396 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8044bebe8257ef2487d3…

1 0

Hans Leidekker : credui: Add a stub implementation of CredUIPromptForWindowsCredentialsW.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: 0ec0f075263626ade64dcf85f723d44abb693641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ec0f075263626ade64dcf85f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 13 10:30:53 2016 +0200 credui: Add a stub implementation of CredUIPromptForWindowsCredentialsW. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/credui/credui.spec | 1 + dlls/credui/credui_main.c | 12 ++++++++++++ include/wincred.h | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/dlls/credui/credui.spec b/dlls/credui/credui.spec index 891416c..bb2b408 100644 --- a/dlls/credui/credui.spec +++ b/dlls/credui/credui.spec @@ -7,6 +7,7 @@ @ stdcall CredUIParseUserNameW(wstr ptr long ptr long) @ stub CredUIPromptForCredentialsA @ stdcall CredUIPromptForCredentialsW(ptr wstr ptr long ptr long ptr long ptr long) +@ stdcall CredUIPromptForWindowsCredentialsW(ptr long ptr ptr long ptr ptr ptr long) @ stdcall CredUIReadSSOCredA(str ptr) @ stdcall CredUIReadSSOCredW(wstr ptr) @ stdcall CredUIStoreSSOCredA(str str str long) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index beb3c58..d2a098e 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -929,3 +929,15 @@ ULONG SEC_ENTRY SspiPromptForCredentialsW( PCWSTR target, void *info, return ret; } + +/****************************************************************************** + * CredUIPromptForWindowsCredentialsW [CREDUI.@] + */ +DWORD WINAPI CredUIPromptForWindowsCredentialsW( CREDUI_INFOW *info, DWORD error, ULONG *package, + const void *in_buf, ULONG in_buf_size, void **out_buf, + ULONG *out_buf_size, BOOL *save, DWORD flags ) +{ + FIXME( "(%p, %u, %p, %p, %u, %p, %p, %p, %08x) stub\n", info, error, package, in_buf, in_buf_size, + out_buf, out_buf_size, save, flags ); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/wincred.h b/include/wincred.h index f238c05..74fc16f 100644 --- a/include/wincred.h +++ b/include/wincred.h @@ -271,6 +271,8 @@ WINADVAPI BOOL WINAPI CredWriteA(PCREDENTIALA,DWORD); WINADVAPI BOOL WINAPI CredWriteW(PCREDENTIALW,DWORD); #define CredWrite WINELIB_NAME_AW(CredWrite) +BOOL WINAPI CredPackAuthenticationBufferW(DWORD,LPWSTR,LPWSTR,PBYTE,DWORD *); +BOOL WINAPI CredUnPackAuthenticationBufferW(DWORD,PVOID,DWORD,LPWSTR,DWORD *,LPWSTR,DWORD *,LPWSTR,DWORD *); DWORD WINAPI CredUICmdLinePromptForCredentialsW(PCWSTR,PCtxtHandle,DWORD,PWSTR,ULONG,PWSTR,ULONG,PBOOL,DWORD); DWORD WINAPI CredUICmdLinePromptForCredentialsA(PCSTR,PCtxtHandle,DWORD,PSTR,ULONG,PSTR,ULONG,PBOOL,DWORD); #define CredUICmdLinePromptForCredentials WINELIB_NAME_AW(CredUICmdLinePromptForCredentials) @@ -283,6 +285,8 @@ DWORD WINAPI CredUIParseUserNameA(PCSTR,PSTR,ULONG,PSTR,ULONG); DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW,PCWSTR,PCtxtHandle,DWORD,PWSTR,ULONG,PWSTR,ULONG,PBOOL,DWORD); DWORD WINAPI CredUIPromptForCredentialsA(PCREDUI_INFOA,PCSTR,PCtxtHandle,DWORD,PSTR,ULONG,PSTR,ULONG,PBOOL,DWORD); #define CredUIPromptForCredentials WINELIB_NAME_AW(CredUIPromptForCredentials) +DWORD WINAPI CredUIPromptForWindowsCredentialsW(PCREDUI_INFOW,DWORD,ULONG *,LPCVOID,ULONG,LPVOID *, ULONG *, BOOL *, + DWORD); DWORD WINAPI CredUIStoreSSOCredW(PCWSTR,PCWSTR,PCWSTR,BOOL); /* Note: no CredUIStoreSSOCredA in PSDK header */ DWORD WINAPI CredUIReadSSOCredW(PCWSTR,PWSTR*);

1 0

Hans Leidekker : secur32: Forward Sspi functions to sspicli.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: 33cb792056ae38cb09174191a7baf11c947629bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=33cb792056ae38cb09174191a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 13 10:28:35 2016 +0200 secur32: Forward Sspi functions to sspicli. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/secur32.c | 105 ---------------------------------------------- dlls/secur32/secur32.spec | 10 ++--- 2 files changed, 5 insertions(+), 110 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 76f6f37..5035ec36 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -1170,111 +1170,6 @@ BOOLEAN WINAPI TranslateNameW( } /*********************************************************************** - * SspiEncodeAuthIdentityAsStrings (SECUR32.0) - */ -SECURITY_STATUS SEC_ENTRY SspiEncodeAuthIdentityAsStrings( - PSEC_WINNT_AUTH_IDENTITY_OPAQUE opaque_id, PCWSTR *username, - PCWSTR *domainname, PCWSTR *creds ) -{ - SEC_WINNT_AUTH_IDENTITY_W *id = (SEC_WINNT_AUTH_IDENTITY_W *)opaque_id; - - FIXME("%p %p %p %p\n", opaque_id, username, domainname, creds); - - *username = SECUR32_strdupW( id->User ); - *domainname = SECUR32_strdupW( id->Domain ); - *creds = SECUR32_strdupW( id->Password ); - - return SEC_E_OK; -} - -/*********************************************************************** - * SspiEncodeStringsAsAuthIdentity (SECUR32.0) - */ -SECURITY_STATUS SEC_ENTRY SspiEncodeStringsAsAuthIdentity( - PCWSTR username, PCWSTR domainname, PCWSTR creds, - PSEC_WINNT_AUTH_IDENTITY_OPAQUE *opaque_id ) -{ - SEC_WINNT_AUTH_IDENTITY_W *id; - DWORD len_username = 0, len_domainname = 0, len_password = 0, size; - WCHAR *ptr; - - FIXME( "%s %s %s %p\n", debugstr_w(username), debugstr_w(domainname), - debugstr_w(creds), opaque_id ); - - if (!username && !domainname && !creds) return SEC_E_INVALID_TOKEN; - - if (username) len_username = strlenW( username ); - if (domainname) len_domainname = strlenW( domainname ); - if (creds) len_password = strlenW( creds ); - - size = sizeof(*id); - if (username) size += (len_username + 1) * sizeof(WCHAR); - if (domainname) size += (len_domainname + 1) * sizeof(WCHAR); - if (creds) size += (len_password + 1) * sizeof(WCHAR); - if (!(id = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ))) return ERROR_OUTOFMEMORY; - ptr = (WCHAR *)(id + 1); - - if (username) - { - memcpy( ptr, username, (len_username + 1) * sizeof(WCHAR) ); - id->User = ptr; - id->UserLength = len_username; - ptr += len_username + 1; - } - if (domainname) - { - memcpy( ptr, domainname, (len_domainname + 1) * sizeof(WCHAR) ); - id->Domain = ptr; - id->DomainLength = len_domainname; - ptr += len_domainname + 1; - } - if (creds) - { - memcpy( ptr, creds, (len_password + 1) * sizeof(WCHAR) ); - id->Password = ptr; - id->PasswordLength = len_password; - } - - *opaque_id = id; - return SEC_E_OK; -} - -/*********************************************************************** - * SspiFreeAuthIdentity (SECUR32.0) - */ -void SEC_ENTRY SspiFreeAuthIdentity( PSEC_WINNT_AUTH_IDENTITY_OPAQUE opaque_id ) -{ - - TRACE( "%p\n", opaque_id ); - HeapFree( GetProcessHeap(), 0, opaque_id ); -} - -/*********************************************************************** - * SspiLocalFree (SECUR32.0) - */ -void SEC_ENTRY SspiLocalFree( void *ptr ) -{ - TRACE( "%p\n", ptr ); - HeapFree( GetProcessHeap(), 0, ptr ); -} - -/*********************************************************************** - * SspiZeroAuthIdentity (SECUR32.0) - */ -void SEC_ENTRY SspiZeroAuthIdentity( PSEC_WINNT_AUTH_IDENTITY_OPAQUE opaque_id ) -{ - SEC_WINNT_AUTH_IDENTITY_W *id = (SEC_WINNT_AUTH_IDENTITY_W *)opaque_id; - - TRACE( "%p\n", opaque_id ); - - if (!id) return; - if (id->User) memset( id->User, 0, id->UserLength * sizeof(WCHAR) ); - if (id->Domain) memset( id->Domain, 0, id->DomainLength * sizeof(WCHAR) ); - if (id->Password) memset( id->Password, 0, id->PasswordLength * sizeof(WCHAR) ); - memset( id, 0, sizeof(*id) ); -} - -/*********************************************************************** * DllMain (SECUR32.0) */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) diff --git a/dlls/secur32/secur32.spec b/dlls/secur32/secur32.spec index cccc034..623ffe5 100644 --- a/dlls/secur32/secur32.spec +++ b/dlls/secur32/secur32.spec @@ -69,11 +69,11 @@ @ stub SecpTranslateNameEx @ stdcall SetContextAttributesA(ptr long ptr long) @ stdcall SetContextAttributesW(ptr long ptr long) -@ stdcall SspiEncodeAuthIdentityAsStrings(ptr ptr ptr ptr) -@ stdcall SspiEncodeStringsAsAuthIdentity(wstr wstr wstr ptr) -@ stdcall SspiFreeAuthIdentity(ptr) -@ stdcall SspiLocalFree(ptr) -@ stdcall SspiZeroAuthIdentity(ptr) +@ stdcall SspiEncodeAuthIdentityAsStrings(ptr ptr ptr ptr) sspicli.SspiEncodeAuthIdentityAsStrings +@ stdcall SspiEncodeStringsAsAuthIdentity(wstr wstr wstr ptr) sspicli.SspiEncodeStringsAsAuthIdentity +@ stdcall SspiFreeAuthIdentity(ptr) sspicli.SspiFreeAuthIdentity +@ stdcall SspiLocalFree(ptr) sspicli.SspiLocalFree +@ stdcall SspiZeroAuthIdentity(ptr) sspicli.SspiZeroAuthIdentity @ stdcall TranslateNameA(str long long ptr ptr) @ stdcall TranslateNameW(wstr long long ptr ptr) @ stdcall UnsealMessage(ptr ptr long ptr) DecryptMessage

1 0

Hans Leidekker : sspicli: Implement SspiLocalFree.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: 1ec8dd7556bd373353d53cf530c3f91aab20835f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ec8dd7556bd373353d53cf53… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 13 10:28:34 2016 +0200 sspicli: Implement SspiLocalFree. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sspicli/main.c | 9 +++++++++ dlls/sspicli/sspicli.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/sspicli/main.c b/dlls/sspicli/main.c index cd34d28..34f0a64 100644 --- a/dlls/sspicli/main.c +++ b/dlls/sspicli/main.c @@ -131,3 +131,12 @@ void SEC_ENTRY SspiFreeAuthIdentity( PSEC_WINNT_AUTH_IDENTITY_OPAQUE opaque_id ) TRACE( "%p\n", opaque_id ); HeapFree( GetProcessHeap(), 0, opaque_id ); } + +/*********************************************************************** + * SspiLocalFree (SECUR32.0) + */ +void SEC_ENTRY SspiLocalFree( void *ptr ) +{ + TRACE( "%p\n", ptr ); + HeapFree( GetProcessHeap(), 0, ptr ); +} diff --git a/dlls/sspicli/sspicli.spec b/dlls/sspicli/sspicli.spec index e7f02df..8876bc0 100644 --- a/dlls/sspicli/sspicli.spec +++ b/dlls/sspicli/sspicli.spec @@ -92,7 +92,7 @@ @ stub SspiGetComputerNameForSPN @ stub SspiGetTargetHostName @ stub SspiIsAuthIdentityEncrypted -@ stub SspiLocalFree +@ stdcall SspiLocalFree(ptr) @ stub SspiMarshalAuthIdentity @ stub SspiPrepareForCredRead @ stub SspiPrepareForCredWrite

1 0