Declare PNTSTATUS in more headers (take 3)

[Francois Gouget]

O, third try. This time I declare NTSTATUS and PNTSTATUS separately so 
we don't have to declare PNTSTATUS in winternl.h. This way we better 
matcht he PSDK.

Changelog:
  * dlls/secur32/secur32.c
    include/lmaccess.h
    include/ntsecapi.h
    include/winternl.h

    Francois Gouget <fgouget at free.fr>
    Declare PNTSTATUS in lmaccess.h and ntsecapi.h to match the PSDK.
    Protect against multiple definitions.
    Use PNTSTATUS where appropriate.

-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
            If it stinks, it's chemistry. If it moves, it's biology.
                   If it does not work, It's computer science.
-------------- next part --------------
Index: dlls/secur32/secur32.c
===================================================================
RCS file: /var/cvs/wine/dlls/secur32/secur32.c,v
retrieving revision 1.9
diff -u -p -r1.9 secur32.c
--- dlls/secur32/secur32.c	16 Aug 2005 11:13:30 -0000	1.9
+++ dlls/secur32/secur32.c	16 Aug 2005 12:11:19 -0000
@@ -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,
Index: include/lmaccess.h
===================================================================
RCS file: /var/cvs/wine/include/lmaccess.h,v
retrieving revision 1.3
diff -u -p -r1.3 lmaccess.h
--- include/lmaccess.h	25 Nov 2003 00:05:39 -0000	1.3
+++ include/lmaccess.h	15 Aug 2005 22:42:57 -0000
@@ -111,6 +111,15 @@ static const WCHAR GROUP_SPECIALGRP_GUES
 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;
Index: include/ntsecapi.h
===================================================================
RCS file: /var/cvs/wine/include/ntsecapi.h,v
retrieving revision 1.16
diff -u -p -r1.16 ntsecapi.h
--- include/ntsecapi.h	18 Jul 2005 09:11:14 -0000	1.16
+++ include/ntsecapi.h	15 Aug 2005 22:42:45 -0000
@@ -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);
Index: include/winternl.h
===================================================================
RCS file: /var/cvs/wine/include/winternl.h,v
retrieving revision 1.161
diff -u -p -r1.161 winternl.h
--- include/winternl.h	11 Aug 2005 10:41:26 -0000	1.161
+++ include/winternl.h	12 Aug 2005 09:38:34 -0000
@@ -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;