Francois Gouget : shlwapi: Update win32. api to fix the winapi_check warnings.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 56c841ced0639cf94547163fd072ee24a4da5a03
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=56c841ced0639cf94547163fd0...

Author: Francois Gouget 
Date:   Fri Jun 15 19:00:02 2007 +0200

shlwapi: Update win32.api to fix the winapi_check warnings.

---

dlls/shlwapi/ordinal.c |    2 +-
 tools/winapi/win32.api |   10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index bad167c..e8738f3 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -4393,7 +4393,7 @@ typedef struct SHELL_USER_PERMISSION { /* ...and this should be in shlwapi.h */
  * NOTES
  *  Call should free returned descriptor with LocalFree
  */
-SECURITY_DESCRIPTOR * WINAPI GetShellSecurityDescriptor(PSHELL_USER_PERMISSION *apUserPerm, int cUserPerm)
+PSECURITY_DESCRIPTOR WINAPI GetShellSecurityDescriptor(PSHELL_USER_PERMISSION *apUserPerm, int cUserPerm)
 {
     PSID *sidlist;
     PSID  cur_user = NULL;
diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
index 2102951..9ce60f7 100644
--- a/tools/winapi/win32.api
+++ b/tools/winapi/win32.api
@@ -4193,7 +4193,6 @@ HRESULT
 HUSKEY
 HWND
 INT
-LANGID
 LONG
 LPARAM
 LRESULT
@@ -4214,6 +4213,7 @@ int
 %long --pointer

INT_PTR
+DWORD_PTR

%longlong

@@ -4224,9 +4224,11 @@ LONGLONG
 BOOL *
 BSTR *
 CLSID *
+DISPPARAMS *
 DLGPROC
 DLLVERSIONINFO *
 DWORD *
+DWORD_PTR *
 FDSA_info *
 HICON *
 HKEY *
@@ -4240,7 +4242,6 @@ IDropTarget *
 IEnumIDList **
 IFACE_INDEX_TBL *
 IID *
-INT *
 IPropertyBag *
 IShellFolder *
 IStream *
@@ -4285,12 +4286,11 @@ PARSEDURLA *
 PARSEDURLW *
 PHKEY
 PHUSKEY
-PLONG
 PPOINTL
 PSECURITY_DESCRIPTOR
+PSHELL_USER_PERMISSION *
 PVOID
 PVOID *
-RECT *
 REFCLSID
 REFGUID
 REFIID
@@ -4299,7 +4299,9 @@ STRRET *
 UINT *
 ULARGE_INTEGER *
 VARIANT *
+VARIANTARG *
 VOID *
+WAITORTIMERCALLBACK
 WNDCLASSA *
 WNDCLASSW *
 int *