Commit 6fb12fc2 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

Declare PNTSTATUS in lmaccess.h and ntsecapi.h to match the PSDK.

Protect against multiple definitions. Use PNTSTATUS where appropriate.
parent 71af5954
...@@ -960,7 +960,7 @@ BOOLEAN WINAPI GetUserNameExW( ...@@ -960,7 +960,7 @@ BOOLEAN WINAPI GetUserNameExW(
NTSTATUS WINAPI LsaCallAuthenticationPackage( NTSTATUS WINAPI LsaCallAuthenticationPackage(
HANDLE LsaHandle, ULONG AuthenticationPackage, PVOID ProtocolSubmitBuffer, HANDLE LsaHandle, ULONG AuthenticationPackage, PVOID ProtocolSubmitBuffer,
ULONG SubmitBufferLength, PVOID* ProtocolReturnBuffer, PULONG ReturnBufferLength, ULONG SubmitBufferLength, PVOID* ProtocolReturnBuffer, PULONG ReturnBufferLength,
NTSTATUS *ProtocolStatus) PNTSTATUS ProtocolStatus)
{ {
FIXME("%p %ld %p %ld %p %p %p\n", LsaHandle, AuthenticationPackage, FIXME("%p %ld %p %ld %p %p %p\n", LsaHandle, AuthenticationPackage,
ProtocolSubmitBuffer, SubmitBufferLength, ProtocolReturnBuffer, ProtocolSubmitBuffer, SubmitBufferLength, ProtocolReturnBuffer,
......
...@@ -111,6 +111,15 @@ static const WCHAR GROUP_SPECIALGRP_GUESTS[] = { 'G','U','E','S','T','S',0 }; ...@@ -111,6 +111,15 @@ static const WCHAR GROUP_SPECIALGRP_GUESTS[] = { 'G','U','E','S','T','S',0 };
static const WCHAR GROUP_SPECIALGRP_LOCAL[] = { 'L','O','C','A','L',0 }; static const WCHAR GROUP_SPECIALGRP_LOCAL[] = { 'L','O','C','A','L',0 };
#endif #endif
#ifndef WINE_NTSTATUS_DECLARED
#define WINE_NTSTATUS_DECLARED
typedef LONG NTSTATUS;
#endif
#ifndef WINE_PNTSTATUS_DECLARED
#define WINE_PNTSTATUS_DECLARED
typedef NTSTATUS *PNTSTATUS;
#endif
/* NetGetUserInfo structures */ /* NetGetUserInfo structures */
typedef struct _USER_INFO_0 { typedef struct _USER_INFO_0 {
LPWSTR usri0_name; LPWSTR usri0_name;
......
...@@ -106,6 +106,15 @@ extern "C" { ...@@ -106,6 +106,15 @@ extern "C" {
#define SE_DENY_SERVICE_LOGON_NAME \ #define SE_DENY_SERVICE_LOGON_NAME \
TEXT("SeDenyServiceLogonRight") TEXT("SeDenyServiceLogonRight")
#ifndef WINE_NTSTATUS_DECLARED
#define WINE_NTSTATUS_DECLARED
typedef LONG NTSTATUS;
#endif
#ifndef WINE_PNTSTATUS_DECLARED
#define WINE_PNTSTATUS_DECLARED
typedef NTSTATUS *PNTSTATUS;
#endif
typedef enum _SECURITY_LOGON_TYPE typedef enum _SECURITY_LOGON_TYPE
{ {
Interactive = 2, Interactive = 2,
...@@ -196,7 +205,7 @@ typedef struct _LSA_TRANSLATED_SID ...@@ -196,7 +205,7 @@ typedef struct _LSA_TRANSLATED_SID
LONG DomainIndex; LONG DomainIndex;
} LSA_TRANSLATED_SID, *PLSA_TRANSLATED_SID; } LSA_TRANSLATED_SID, *PLSA_TRANSLATED_SID;
NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE,ULONG,PVOID,ULONG,PVOID*,PULONG,NTSTATUS*); NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE,ULONG,PVOID,ULONG,PVOID*,PULONG,PNTSTATUS);
NTSTATUS WINAPI LsaClose(LSA_HANDLE); NTSTATUS WINAPI LsaClose(LSA_HANDLE);
NTSTATUS WINAPI LsaConnectUntrusted(PHANDLE); NTSTATUS WINAPI LsaConnectUntrusted(PHANDLE);
NTSTATUS WINAPI LsaDeregisterLogonProcess(HANDLE); NTSTATUS WINAPI LsaDeregisterLogonProcess(HANDLE);
......
...@@ -32,7 +32,10 @@ extern "C" { ...@@ -32,7 +32,10 @@ extern "C" {
* Fundamental types and data structures * Fundamental types and data structures
*/ */
#ifndef WINE_NTSTATUS_DECLARED
#define WINE_NTSTATUS_DECLARED
typedef LONG NTSTATUS; typedef LONG NTSTATUS;
#endif
typedef CONST char *PCSZ; typedef CONST char *PCSZ;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment