From 6fb12fc291d90f6ba6170380cc8eea984068d377 Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@free.fr>
Date: Tue, 16 Aug 2005 16:01:49 +0000
Subject: [PATCH] Declare PNTSTATUS in lmaccess.h and ntsecapi.h to match the
 PSDK. Protect against multiple definitions. Use PNTSTATUS where appropriate.

---
 dlls/secur32/secur32.c |  2 +-
 include/lmaccess.h     |  9 +++++++++
 include/ntsecapi.h     | 11 ++++++++++-
 include/winternl.h     |  3 +++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c
index be1250c42d8..1018605abbc 100644
--- a/dlls/secur32/secur32.c
+++ b/dlls/secur32/secur32.c
@@ -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,
diff --git a/include/lmaccess.h b/include/lmaccess.h
index 76aaee5cff1..87684ddb4d3 100644
--- a/include/lmaccess.h
+++ b/include/lmaccess.h
@@ -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;
diff --git a/include/ntsecapi.h b/include/ntsecapi.h
index b94e49ddf0d..1a93014b252 100644
--- a/include/ntsecapi.h
+++ b/include/ntsecapi.h
@@ -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);
diff --git a/include/winternl.h b/include/winternl.h
index d4453662f82..c29ef31e5b3 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -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;
 
-- 
2.11.4.GIT