Update win32.api

[Francois Gouget]

Changelog:

  * dlls/secur32/secur32.c
    include/ntsecapi.h
    tools/winapi/win32.api

    Francois Gouget <fgouget at free.fr>
    Update win32.api to match current sources.
    Tweak some prototypes to better match their PSDK counterparts.


-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
                  There are 10 types of people in the world...
                those who understand binary and those who don't.
-------------- 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/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	19 Jul 2005 13:26:05 -0000
@@ -196,7 +196,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: tools/winapi/win32.api
===================================================================
RCS file: /var/cvs/wine/tools/winapi/win32.api,v
retrieving revision 1.38
diff -u -p -r1.38 win32.api
--- tools/winapi/win32.api	21 Jul 2005 11:31:56 -0000	1.38
+++ tools/winapi/win32.api	21 Jul 2005 12:24:56 -0000
@@ -191,12 +191,17 @@ HANDLE *
 LPCSTRTABLE
 LPDWORD
 LPVOID
+PCABINFO
+PDWORD
+PVOID
 SETUPCOMMAND_PARAMS *
 
 %str
 
 LPCSTR
 LPSTR
+PCSTR
+PSTR
 
 %void
 
@@ -1126,6 +1131,7 @@ LOGFONTA *
 LOGFONTW *
 LOGPALETTE *
 LOGPEN *
+LONG *
 LPABC
 LPABCFLOAT
 LPBYTE
@@ -1153,6 +1159,7 @@ LPRASTERIZER_STATUS
 LPRECT
 LPRGNDATA
 LPSIZE
+LPTEXTMETRICW
 LPVOID
 LPWORD
 LPXFORM
@@ -3397,6 +3404,8 @@ LPVOID
 LPVOID *
 LPWSTR *
 MIDL_STUB_MESSAGE *
+NDR_CCONTEXT
+NDR_CCONTEXT *
 PFORMAT_STRING
 PMIDL_STUB_DESC
 PMIDL_STUB_MESSAGE
@@ -3465,6 +3474,8 @@ LPCWSTR
 
 BOOLEAN
 EXTENDED_NAME_FORMAT
+HANDLE
+NTSTATUS
 SECURITY_STATUS
 ULONG
 unsigned long
@@ -3474,7 +3485,9 @@ unsigned long
 HANDLE *
 PCredHandle
 PCtxtHandle
+PHANDLE
 PLUID
+PNTSTATUS
 PSecBuffer
 PSecBufferDesc
 PSecPkgInfoA *
@@ -3484,6 +3497,7 @@ PSecurityFunctionTableW
 PTimeStamp
 PULONG
 PVOID
+PVOID *
 SEC_CHAR *
 SEC_GET_KEY_FN
 SEC_WCHAR *
@@ -3494,10 +3508,12 @@ void **
 %str
 
 LPSTR
+LPCSTR
 
 %wstr
 
 LPWSTR
+LPCWSTR
 
 %%sensapi.dll
 
@@ -3700,6 +3716,7 @@ DLLVERSIONINFO *
 DWORD *
 FARPROC
 FORMATETC *
+HANDLE *
 HICON *
 HIMAGELIST *
 HWND *
@@ -4586,15 +4603,11 @@ HANDLE
 HBITMAP
 HDC
 HFONT
-HKL
 HRGN
 HWND
 INT
 LONG
-SHORT
 UINT
-WCHAR
-int
 
 %ptr
 
@@ -4603,7 +4616,6 @@ CREATESTRUCTA *
 DEVMODEW *
 DWORD *
 INT *
-LPBYTE
 LPCVOID
 LPINT
 LPPALETTEENTRY
@@ -4616,21 +4628,11 @@ RECT *
 TTYDRV_PDEVICE *
 TTYDRV_PDEVICE **
 WINDOWPOS *
-struct tagCURSORICONINFO *
 void *
 
-%str
-
-LPCSTR
-
-%void
-
-void
-
 %wstr
 
 LPCWSTR
-LPWSTR
 
 %%winex11.drv
 
@@ -4992,6 +4994,31 @@ WINTRUST_DATA *
 
 void
 
+%%wldap32.dll
+
+%long
+
+INT
+ULONG
+
+%ptr
+
+BerElement *
+BERVAL *
+PBERVAL *
+CHAR *
+CHAR **
+PCHAR
+ULONG *
+
+%wstr
+
+PWCHAR
+
+%void
+
+void
+
 %%wnaspi32.dll
 
 %long
@@ -5094,6 +5121,7 @@ UINT
 INT *
 LPDWORD
 LPGUID
+LPINT
 LPSERVICE_ASYNC_INFO
 LPSERVICE_INFOA
 LPSERVICE_INFOW