From: Piotr Caban <piotr@codeweavers.com> --- dlls/msv1_0/main.c | 8 ++++---- dlls/secur32/lsa.c | 15 +++++++-------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c index addbc08ff9c..736fe184e9d 100644 --- a/dlls/msv1_0/main.c +++ b/dlls/msv1_0/main.c @@ -519,15 +519,15 @@ static NTSTATUS NTAPI ntlm_SpAcquireCredentialsHandle( UNICODE_STRING *principal } else { - SECPKG_CLIENT_INFO info; + SECPKG_CALL_INFO info; HANDLE h; - lsa_secpkg_table->GetClientInfo( &info ); - h = OpenThread( THREAD_QUERY_INFORMATION, FALSE, info.ThreadID ); + lsa_secpkg_table->GetCallInfo( &info ); + h = OpenThread( THREAD_QUERY_INFORMATION, FALSE, info.ThreadId ); if (!h || !OpenThreadToken( h, TOKEN_QUERY | TOKEN_DUPLICATE, TRUE, &cred->token )) { CloseHandle( h ); - h = OpenProcess( PROCESS_QUERY_INFORMATION, FALSE, info.ProcessID ); + h = OpenProcess( PROCESS_QUERY_INFORMATION, FALSE, info.ProcessId ); if (!h || !OpenProcessToken( h, TOKEN_QUERY | TOKEN_DUPLICATE, &cred->token )) WARN("failed to get user token (%ld)\n", GetLastError()); } diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 1d1e249c9f2..589e4d6bf6e 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -910,14 +910,13 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* SetContextAttributesA */ }; -static NTSTATUS NTAPI lsa_GetClientInfo( SECPKG_CLIENT_INFO *info ) +static BOOLEAN NTAPI lsa_GetCallInfo( SECPKG_CALL_INFO *info ) { - FIXME( "%p\n", info ); - memset( info, 0, sizeof(*info) ); - info->ProcessID = GetCurrentProcessId(); - info->ThreadID = GetCurrentThreadId(); - return SEC_E_OK; + info->ProcessId = GetCurrentProcessId(); + info->ThreadId = GetCurrentThreadId(); + info->Attributes = SECPKG_CALL_IN_PROC; + return TRUE; } static const LSA_SECPKG_FUNCTION_TABLE lsa_secpkg_table = @@ -938,7 +937,7 @@ static const LSA_SECPKG_FUNCTION_TABLE lsa_secpkg_table = NULL, /* DuplicateHandle */ NULL, /* SaveSupplementalCredentials */ NULL, /* CreateThread */ - lsa_GetClientInfo, + NULL, /* GetClientInfo */ NULL, /* RegisterNotification */ NULL, /* CancelNotification */ NULL, /* MapBuffer */ @@ -946,7 +945,7 @@ static const LSA_SECPKG_FUNCTION_TABLE lsa_secpkg_table = NULL, /* AuditLogon */ NULL, /* CallPackage */ NULL, /* FreeReturnBuffer */ - NULL, /* GetCallInfo */ + lsa_GetCallInfo, NULL, /* CallPackageEx */ NULL, /* CreateSharedMemory */ NULL, /* AllocateSharedMemory */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11653