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

Protect against multiple definitions.
Use PNTSTATUS where appropriate.
oldstable
Francois Gouget 2005-08-16 16:01:49 +00:00 committed by Alexandre Julliard
parent 71af595499
commit 6fb12fc291
4 changed files with 23 additions and 2 deletions

View File

@ -960,7 +960,7 @@ BOOLEAN WINAPI GetUserNameExW(
NTSTATUS WINAPI LsaCallAuthenticationPackage(
HANDLE LsaHandle, ULONG AuthenticationPackage, PVOID ProtocolSubmitBuffer,
ULONG SubmitBufferLength, PVOID* ProtocolReturnBuffer, PULONG ReturnBufferLength,
NTSTATUS *ProtocolStatus)
PNTSTATUS ProtocolStatus)
{
FIXME("%p %ld %p %ld %p %p %p\n", LsaHandle, AuthenticationPackage,
ProtocolSubmitBuffer, SubmitBufferLength, ProtocolReturnBuffer,

View File

@ -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 };
#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 */
typedef struct _USER_INFO_0 {
LPWSTR usri0_name;

View File

@ -106,6 +106,15 @@ extern "C" {
#define SE_DENY_SERVICE_LOGON_NAME \
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
{
Interactive = 2,
@ -196,7 +205,7 @@ typedef struct _LSA_TRANSLATED_SID
LONG DomainIndex;
} 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 LsaConnectUntrusted(PHANDLE);
NTSTATUS WINAPI LsaDeregisterLogonProcess(HANDLE);

View File

@ -32,7 +32,10 @@ extern "C" {
* Fundamental types and data structures
*/
#ifndef WINE_NTSTATUS_DECLARED
#define WINE_NTSTATUS_DECLARED
typedef LONG NTSTATUS;
#endif
typedef CONST char *PCSZ;