wine-commits April 2018

wine-commits@winehq.org

2 participants
542 discussions

Matteo Bruni : wined3d: Enable GL_ARB_viewport_array extension in GLSL shaders.
by Alexandre Julliard 18 Apr '18

18 Apr '18

Module: wine Branch: master Commit: 0c2f9a4f346e95d86824d9a633ccf3f55684aefc URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c2f9a4f346e95d86824d9a6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 18 01:32:16 2018 +0200 wined3d: Enable GL_ARB_viewport_array extension in GLSL shaders. Signed-off-by: Matteo Bruni <mbruni(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 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7f1e66b..799b2ff 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7515,6 +7515,8 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, shader_addline(buffer, "#extension GL_ARB_texture_query_levels : enable\n"); if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) shader_addline(buffer, "#extension GL_ARB_uniform_buffer_object : enable\n"); + if (gl_info->supported[ARB_VIEWPORT_ARRAY]) + shader_addline(buffer, "#extension GL_ARB_viewport_array : enable\n"); if (gl_info->supported[EXT_GPU_SHADER4]) shader_addline(buffer, "#extension GL_EXT_gpu_shader4 : enable\n"); if (gl_info->supported[EXT_TEXTURE_ARRAY])

1 0

Matteo Bruni : wined3d: Fix stateblock viewports memcmp() size.
by Alexandre Julliard 18 Apr '18

18 Apr '18

Module: wine Branch: master Commit: 993c85050e7830cedf8512e143b554d1107a85e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=993c85050e7830cedf8512e1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 18 01:32:15 2018 +0200 wined3d: Fix stateblock viewports memcmp() size. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 23a615f..4ad0331 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -810,9 +810,12 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) stateblock->state.material = src_state->material; } + assert(src_state->viewport_count <= 1); + if (stateblock->changed.viewport && (src_state->viewport_count != stateblock->state.viewport_count - || memcmp(src_state->viewports, stateblock->state.viewports, src_state->viewport_count * sizeof(stateblock->state.viewports)))) + || memcmp(src_state->viewports, stateblock->state.viewports, + src_state->viewport_count * sizeof(*stateblock->state.viewports)))) { TRACE("Updating viewports.\n");

1 0

Matteo Bruni : d3dx9: Allow passes argument to Begin() to be NULL.
by Alexandre Julliard 18 Apr '18

18 Apr '18

Module: wine Branch: master Commit: f9562007759d18e72098a9ca2794ea2ec094c20d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9562007759d18e72098a9ca… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 18 01:32:14 2018 +0200 d3dx9: Allow passes argument to Begin() to be NULL. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 5 +++-- dlls/d3dx9_36/tests/effect.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a909d66..94f7b07 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4202,7 +4202,7 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW TRACE("iface %p, passes %p, flags %#x.\n", iface, passes, flags); - if (passes && technique) + if (technique) { if (flags & ~(D3DXFX_DONOTSAVESTATE | D3DXFX_DONOTSAVESAMPLERSTATE | D3DXFX_DONOTSAVESHADERSTATE)) WARN("Invalid flags (%#x) specified.\n", flags); @@ -4234,7 +4234,8 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW ERR("StateBlock Capture failed, hr %#x.\n", hr); } - *passes = technique->pass_count; + if (passes) + *passes = technique->pass_count; effect->started = TRUE; effect->begin_flags = flags; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 9a8a9b6..a75b67c 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3081,7 +3081,7 @@ static void test_effect_states(IDirect3DDevice9 *device) ok(!bval, "Got result %u, expected 0.\n", bval); hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLDMATRIX(1), &test_mat); - hr = effect->lpVtbl->Begin(effect, &npasses, 0); + hr = effect->lpVtbl->Begin(effect, NULL, 0); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); hr = IDirect3DDevice9_GetTransform(device, D3DTS_WORLDMATRIX(1), &mat);

1 0

Piotr Caban : ucrtbase: Add _timespec{32,64}_get implementation.
by Alexandre Julliard 18 Apr '18

18 Apr '18

Module: wine Branch: master Commit: 7a50abd8949c47fd35c68358ba07336ed5f1c5eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a50abd8949c47fd35c68358… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 18 20:38:18 2018 +0200 ucrtbase: Add _timespec{32,64}_get implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-time-l1-1-0.spec | 4 +- dlls/msvcrt/time.c | 53 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 +- 3 files changed, 57 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec index db36c29..e21e07e 100644 --- a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec +++ b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec @@ -47,8 +47,8 @@ @ cdecl _strtime_s(ptr long) ucrtbase._strtime_s @ cdecl _time32(ptr) ucrtbase._time32 @ cdecl _time64(ptr) ucrtbase._time64 -@ stub _timespec32_get -@ stub _timespec64_get +@ cdecl _timespec32_get(ptr long) ucrtbase._timespec32_get +@ cdecl _timespec64_get(ptr long) ucrtbase._timespec64_get @ cdecl _tzset() ucrtbase._tzset @ cdecl _utime32(str ptr) ucrtbase._utime32 @ cdecl _utime64(str ptr) ucrtbase._utime64 diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index a2500c4..861b2ed 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1620,3 +1620,56 @@ int CDECL _get_daylight(int *hours) } #endif /* _MSVCR_VER >= 80 */ + +#if _MSVCR_VER >= 140 + +#define TIME_UTC 1 + +struct _timespec32 +{ + MSVCRT___time32_t tv_sec; + LONG tv_nsec; +}; + +struct _timespec64 +{ + MSVCRT___time64_t tv_sec; + LONG tv_nsec; +}; + +/********************************************************************* + * _timespec64_get (UCRTBASE.@) + */ +int CDECL _timespec64_get(struct _timespec64 *ts, int base) +{ + ULONGLONG time; + FILETIME ft; + + if(!MSVCRT_CHECK_PMT(ts != NULL)) return 0; + if(base != TIME_UTC) return 0; + + GetSystemTimePreciseAsFileTime(&ft); + time = ((ULONGLONG)ft.dwHighDateTime << 32) | ft.dwLowDateTime; + + ts->tv_sec = time / TICKSPERSEC - SECS_1601_TO_1970; + ts->tv_nsec = time % TICKSPERSEC * 100; + return base; +} + +/********************************************************************* + * _timespec32_get (UCRTBASE.@) + */ +int CDECL _timespec32_get(struct _timespec32 *ts, int base) +{ + struct _timespec64 ts64; + + if(_timespec64_get(&ts64, base) != base) + return 0; + if(ts64.tv_sec != (MSVCRT___time32_t)ts64.tv_sec) + return 0; + + ts->tv_sec = ts64.tv_sec; + ts->tv_nsec = ts64.tv_nsec; + return base; +} +#endif /* _MSVCR_VER >= 140 */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index b12a1b1..ce226fe 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1972,8 +1972,8 @@ @ cdecl _tempnam(str str) MSVCRT__tempnam @ cdecl _time32(ptr) MSVCRT__time32 @ cdecl _time64(ptr) MSVCRT__time64 -@ stub _timespec32_get -@ stub _timespec64_get +@ cdecl _timespec32_get(ptr long) +@ cdecl _timespec64_get(ptr long) @ cdecl _tolower(long) MSVCRT__tolower @ cdecl _tolower_l(long ptr) MSVCRT__tolower_l @ cdecl _toupper(long) MSVCRT__toupper

1 0

Zhiyi Zhang : comctl32: GroupBox can have multiline text.
by Alexandre Julliard 18 Apr '18

18 Apr '18

Module: wine Branch: master Commit: 45eb3cb4fc2ab54f1c6dfa041e10c5a4c5c53130 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45eb3cb4fc2ab54f1c6dfa04… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Apr 18 21:58:39 2018 +0800 comctl32: GroupBox can have multiline text. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 1b187e3..1feb07a 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -282,9 +282,6 @@ static UINT BUTTON_BStoDT( DWORD style, DWORD ex_style ) default: dtStyle |= DT_VCENTER; break; } } - else - /* GroupBox's text is always single line and is top aligned. */ - dtStyle |= DT_SINGLELINE; return dtStyle; }

1 0

Francois Gouget : windowscodecs: Make get_metadata_container() static.
by Alexandre Julliard 18 Apr '18

18 Apr '18

Module: wine Branch: master Commit: e7cc7f347d291418b14488075c10654f12f684fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7cc7f347d291418b1448807… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 18 03:24:47 2018 +0200 windowscodecs: Make get_metadata_container() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 6652ee3..21e6610 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1514,7 +1514,7 @@ typedef struct UINT container_count; } MetadataReaderInfo; -struct metadata_container *get_metadata_container(MetadataReaderInfo *info, const GUID *guid) +static struct metadata_container *get_metadata_container(MetadataReaderInfo *info, const GUID *guid) { unsigned i;

1 0

Hans Leidekker : secur32: Return a handle from LsaRegisterLogonProcess.
by Alexandre Julliard 18 Apr '18

18 Apr '18

Module: wine Branch: master Commit: 61171a5f11a1e631c3075f1415ddc0bf8f4c31ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=61171a5f11a1e631c3075f14… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 18 12:53:57 2018 +0200 secur32: Return a handle from LsaRegisterLogonProcess. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/lsa.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 779d67a..5fe6f3a 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -88,18 +88,34 @@ NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE lsa_handle, ULONG package_id return STATUS_INVALID_PARAMETER; } +struct lsa_connection *alloc_lsa_connection(void) +{ + struct lsa_connection *ret; + if (!(ret = heap_alloc(sizeof(*ret)))) return NULL; + ret->magic = LSA_MAGIC; + return ret; +} + NTSTATUS WINAPI LsaConnectUntrusted(PHANDLE LsaHandle) { struct lsa_connection *lsa_conn; TRACE("%p\n", LsaHandle); - lsa_conn = heap_alloc(sizeof(*lsa_conn)); - if (!lsa_conn) return STATUS_NO_MEMORY; - - lsa_conn->magic = LSA_MAGIC; + if (!(lsa_conn = alloc_lsa_connection())) return STATUS_NO_MEMORY; *LsaHandle = lsa_conn; + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI LsaRegisterLogonProcess(PLSA_STRING LogonProcessName, + PHANDLE LsaHandle, PLSA_OPERATIONAL_MODE SecurityMode) +{ + struct lsa_connection *lsa_conn; + + FIXME("%s %p %p stub\n", debugstr_as(LogonProcessName), LsaHandle, SecurityMode); + if (!(lsa_conn = alloc_lsa_connection())) return STATUS_NO_MEMORY; + *LsaHandle = lsa_conn; return STATUS_SUCCESS; } @@ -923,10 +939,3 @@ NTSTATUS WINAPI LsaLookupAuthenticationPackage(HANDLE lsa_handle, return STATUS_UNSUCCESSFUL; /* FIXME */ } - -NTSTATUS WINAPI LsaRegisterLogonProcess(PLSA_STRING LogonProcessName, - PHANDLE LsaHandle, PLSA_OPERATIONAL_MODE SecurityMode) -{ - FIXME("%p %p %p stub\n", LogonProcessName, LsaHandle, SecurityMode); - return STATUS_SUCCESS; -}

1 0

Hans Leidekker : secur32: Implement LsaDeregisterLogonProcess.
by Alexandre Julliard 18 Apr '18

18 Apr '18

Module: wine Branch: master Commit: d5a83ce67ce0bb103d15e55ab26b25cd1149a953 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5a83ce67ce0bb103d15e55a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 18 12:53:56 2018 +0200 secur32: Implement LsaDeregisterLogonProcess. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/lsa.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 23b380c..779d67a 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -105,7 +105,14 @@ NTSTATUS WINAPI LsaConnectUntrusted(PHANDLE LsaHandle) NTSTATUS WINAPI LsaDeregisterLogonProcess(HANDLE LsaHandle) { - FIXME("%p stub\n", LsaHandle); + struct lsa_connection *lsa_conn = (struct lsa_connection *)LsaHandle; + + TRACE("%p\n", LsaHandle); + + if (!lsa_conn || lsa_conn->magic != LSA_MAGIC) return STATUS_INVALID_HANDLE; + lsa_conn->magic = 0; + heap_free(lsa_conn); + return STATUS_SUCCESS; }

1 0

Hans Leidekker : kerberos: Consistently use NTSTATUS return values.
by Alexandre Julliard 18 Apr '18

18 Apr '18

Module: wine Branch: master Commit: 697bda8ac3a1020cf466efcd9e44cc84b9228e6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=697bda8ac3a1020cf466efcd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 18 12:53:55 2018 +0200 kerberos: Consistently use NTSTATUS return values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index e51f7ea..d40ec04 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -691,7 +691,7 @@ static inline void ctxthandle_gss_to_sspi( gss_ctx_id_t handle, LSA_SEC_HANDLE * *ctxt = (LSA_SEC_HANDLE)handle; } -static SECURITY_STATUS status_gss_to_sspi( OM_uint32 status ) +static NTSTATUS status_gss_to_sspi( OM_uint32 status ) { switch (status) { @@ -712,7 +712,7 @@ static SECURITY_STATUS status_gss_to_sspi( OM_uint32 status ) case GSS_S_GAP_TOKEN: return SEC_E_OUT_OF_SEQUENCE; default: - FIXME( "couldn't convert status 0x%08x to SECURITY_STATUS\n", status ); + FIXME( "couldn't convert status 0x%08x to NTSTATUS\n", status ); return SEC_E_INTERNAL_ERROR; } } @@ -761,7 +761,7 @@ static void expirytime_gss_to_sspi( OM_uint32 expirytime, TimeStamp *timestamp ) timestamp->HighPart = tmp.QuadPart >> 32; } -static SECURITY_STATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_name_t *name ) +static NTSTATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_name_t *name ) { OM_uint32 ret, minor_status; gss_OID type = GSS_C_NO_OID; /* FIXME: detect the appropriate value for this ourselves? */ @@ -925,8 +925,9 @@ static NTSTATUS acquire_credentials_handle( UNICODE_STRING *principal_us, gss_cr OM_uint32 ret, minor_status, expiry_time; gss_name_t principal = GSS_C_NO_NAME; gss_cred_id_t cred_handle; + NTSTATUS status; - if (principal_us && ((ret = name_sspi_to_gss( principal_us, &principal )) != SEC_E_OK)) return ret; + if (principal_us && ((status = name_sspi_to_gss( principal_us, &principal )) != SEC_E_OK)) return status; ret = pgss_acquire_cred( &minor_status, principal, GSS_C_INDEFINITE, GSS_C_NULL_OID_SET, cred_usage, &cred_handle, NULL, &expiry_time ); @@ -1018,6 +1019,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, gss_ctx_id_t ctxt_handle; gss_buffer_desc input_token, output_token; gss_name_t target = GSS_C_NO_NAME; + NTSTATUS status; int idx; TRACE( "(%lx %lx %s 0x%08x %u %p %p %p %p %p %p %p)\n", credential, context, debugstr_us(target_name), @@ -1041,7 +1043,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, output_token.length = 0; output_token.value = NULL; - if (target_name && ((ret = name_sspi_to_gss( target_name, &target )) != SEC_E_OK)) return ret; + if (target_name && ((status = name_sspi_to_gss( target_name, &target )) != SEC_E_OK)) return status; ret = pgss_init_sec_context( &minor_status, cred_handle, &ctxt_handle, target, GSS_C_NO_OID, req_flags, 0, GSS_C_NO_CHANNEL_BINDINGS, &input_token, NULL, &output_token, &ret_flags, @@ -1369,7 +1371,7 @@ static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULON #endif } -static SECURITY_STATUS SEC_ENTRY kerberos_SpVerifySignature( LSA_SEC_HANDLE context, SecBufferDesc *message, +static NTSTATUS NTAPI kerberos_SpVerifySignature( LSA_SEC_HANDLE context, SecBufferDesc *message, ULONG message_seq_no, ULONG *quality_of_protection ) { #ifdef SONAME_LIBGSSAPI_KRB5

1 0

Hans Leidekker : include: Fix a couple of LSA typedefs.
by Alexandre Julliard 18 Apr '18

18 Apr '18

Module: wine Branch: master Commit: c1a9749aef5addcedfa570ebc35b1cbc61e6177f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1a9749aef5addcedfa570eb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 18 12:53:54 2018 +0200 include: Fix a couple of LSA typedefs. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ntsecpkg.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/include/ntsecpkg.h b/include/ntsecpkg.h index 7f64d06..08373a2 100644 --- a/include/ntsecpkg.h +++ b/include/ntsecpkg.h @@ -308,14 +308,15 @@ typedef struct _LSA_SECPKG_FUNCTION_TABLE { /* LSA-mode functions implemented by SSP/AP obtainable by a dispatch table */ typedef NTSTATUS (NTAPI *PLSA_AP_INITIALIZE_PACKAGE)(ULONG, PLSA_DISPATCH_TABLE, PLSA_STRING, PLSA_STRING, PLSA_STRING *); -typedef NTSTATUS (NTAPI *PLSA_AP_LOGON_USER)(LPWSTR, LPWSTR, LPWSTR, LPWSTR, - DWORD, DWORD, PHANDLE); -typedef NTSTATUS (NTAPI *PLSA_AP_CALL_PACKAGE)(PUNICODE_STRING, PVOID, ULONG, +typedef NTSTATUS (NTAPI *PLSA_AP_LOGON_USER)(PLSA_CLIENT_REQUEST, SECURITY_LOGON_TYPE, + PVOID, PVOID, ULONG, PVOID *, PULONG, PLUID LogonId, PNTSTATUS, PLSA_TOKEN_INFORMATION_TYPE, + PVOID *, PLSA_UNICODE_STRING *, PLSA_UNICODE_STRING *); +typedef NTSTATUS (NTAPI *PLSA_AP_CALL_PACKAGE)(PLSA_CLIENT_REQUEST, PVOID, PVOID, ULONG, PVOID *, PULONG, PNTSTATUS); typedef VOID (NTAPI *PLSA_AP_LOGON_TERMINATED)(PLUID); typedef NTSTATUS (NTAPI *PLSA_AP_CALL_PACKAGE_UNTRUSTED)(PLSA_CLIENT_REQUEST, PVOID, PVOID, ULONG, PVOID *, PULONG, PNTSTATUS); -typedef NTSTATUS (NTAPI *PLSA_AP_CALL_PACKAGE_PASSTHROUGH)(PUNICODE_STRING, +typedef NTSTATUS (NTAPI *PLSA_AP_CALL_PACKAGE_PASSTHROUGH)(PLSA_CLIENT_REQUEST, PVOID, PVOID, ULONG, PVOID *, PULONG, PNTSTATUS); typedef NTSTATUS (NTAPI *PLSA_AP_LOGON_USER_EX)(PLSA_CLIENT_REQUEST, SECURITY_LOGON_TYPE, PVOID, PVOID, ULONG, PVOID *, PULONG, PLUID, PNTSTATUS, @@ -327,7 +328,7 @@ typedef NTSTATUS (NTAPI *PLSA_AP_LOGON_USER_EX2)(PLSA_CLIENT_REQUEST, PUNICODE_STRING *, PSECPKG_PRIMARY_CRED, PSECPKG_SUPPLEMENTAL_CRED_ARRAY *); typedef NTSTATUS (NTAPI SpInitializeFn)(ULONG_PTR, PSECPKG_PARAMETERS, PLSA_SECPKG_FUNCTION_TABLE); -typedef NTSTATUS (NTAPI SpShutDownFn)(void); +typedef NTSTATUS (NTAPI SpShutdownFn)(void); typedef NTSTATUS (NTAPI SpGetInfoFn)(PSecPkgInfoW); typedef NTSTATUS (NTAPI SpAcceptCredentialsFn)(SECURITY_LOGON_TYPE, PUNICODE_STRING, PSECPKG_PRIMARY_CRED, PSECPKG_SUPPLEMENTAL_CRED); @@ -411,7 +412,7 @@ typedef struct SECPKG_FUNCTION_TABLE { PLSA_AP_LOGON_USER_EX LogonUserEx; PLSA_AP_LOGON_USER_EX2 LogonUserEx2; SpInitializeFn *Initialize; - SpShutDownFn *Shutdown; + SpShutdownFn *Shutdown; SpGetInfoFn *GetInfo; SpAcceptCredentialsFn *AcceptCredentials; SpAcquireCredentialsHandleFn *SpAcquireCredentialsHandle;

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2018