Update win32.api

[Francois Gouget]

On Thu, 21 Jul 2005, Vincent Béron wrote:
[...]
>> -  NTSTATUS *ProtocolStatus)
>> +  PNTSTATUS ProtocolStatus)
>
> This causes a compilation error, PNTSTATUS isn't defined anywhere else.
> Or do you have an as of yet unsent patch adding it? :)

Argh! How did I miss that compile error?

We should be declaring PNTSTATUS in lmaccess.h and ntsecapi.h. So here's 
a fixed patch with just the PNTSTATUS stuff. And it should really 
compile this time.


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.
    Tweak some prototypes to better match the PSDK.

-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
               Linux: Because rebooting is for adding new hardware
-------------- next part --------------
Index: dlls/secur32/secur32.c
===================================================================
RCS file: /var/cvs/wine/dlls/secur32/secur32.c,v
retrieving revision 1.7
diff -u -p -r1.7 secur32.c
--- dlls/secur32/secur32.c	18 Jul 2005 09:11:14 -0000	1.7
+++ dlls/secur32/secur32.c	19 Jul 2005 13:26:26 -0000
@@ -958,7 +958,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	22 Jul 2005 09:08:20 -0000
@@ -111,6 +111,11 @@ static const WCHAR GROUP_SPECIALGRP_GUES
 static const WCHAR GROUP_SPECIALGRP_LOCAL[] = { 'L','O','C','A','L',0 };
 #endif
 
+#ifndef _NTSTATUS_
+#define _NTSTATUS_
+typedef LONG 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	22 Jul 2005 09:08:11 -0000
@@ -106,6 +106,11 @@ extern "C" {
 #define SE_DENY_SERVICE_LOGON_NAME \
  TEXT("SeDenyServiceLogonRight")
 
+#ifndef _NTSTATUS_
+#define _NTSTATUS_
+typedef LONG NTSTATUS, *PNTSTATUS;
+#endif
+
 typedef enum _SECURITY_LOGON_TYPE
 {
     Interactive = 2,
@@ -196,7 +201,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.158
diff -u -p -r1.158 winternl.h
--- include/winternl.h	15 Jul 2005 10:01:30 -0000	1.158
+++ include/winternl.h	22 Jul 2005 09:07:58 -0000
@@ -32,7 +32,10 @@ extern "C" {
  * Fundamental types and data structures
  */
 
-typedef LONG NTSTATUS;
+#ifndef _NTSTATUS_
+#define _NTSTATUS_
+typedef LONG NTSTATUS, *PNTSTATUS;
+#endif
 
 typedef CONST char *PCSZ;