From 1051c3fe139a3829af58ee0dcc2daba0702c02f6 Mon Sep 17 00:00:00 2001
From: Patrik Stridvall <ps@leissner.se>
Date: Mon, 2 Oct 2000 03:34:14 +0000
Subject: [PATCH] - Support for stdcall64 - Minor API updates.

---
 tools/winapi_check/modules.dat        |  1 +
 tools/winapi_check/win16/mmsystem.api |  5 +----
 tools/winapi_check/win16/setupx.api   | 10 ++++++++++
 tools/winapi_check/win16/user.api     |  1 -
 tools/winapi_check/win32/kernel32.api |  4 ----
 tools/winapi_check/win32/ntdll.api    | 11 ++++++++---
 tools/winapi_check/win32/shell32.api  |  1 +
 tools/winapi_check/win32/shlwapi.api  |  2 +-
 tools/winapi_check/win32/wnaspi32.api |  5 ++++-
 tools/winapi_check/winapi.pm          |  2 +-
 tools/winapi_check/winapi_local.pm    |  6 +++++-
 11 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/tools/winapi_check/modules.dat b/tools/winapi_check/modules.dat
index 2207979b0d6..bc2c2cd4c86 100644
--- a/tools/winapi_check/modules.dat
+++ b/tools/winapi_check/modules.dat
@@ -356,6 +356,7 @@ dlls/win32s
 
 % dlls/win32s/win32s16.spec
 
+dlls/kernel
 dlls/win32s
 memory
 scheduler
diff --git a/tools/winapi_check/win16/mmsystem.api b/tools/winapi_check/win16/mmsystem.api
index 5e3e7680583..fd80f8b6a65 100644
--- a/tools/winapi_check/win16/mmsystem.api
+++ b/tools/winapi_check/win16/mmsystem.api
@@ -51,6 +51,7 @@ MMIOINFO16 *
 UINT16 *
 WAVEHDR *
 WORD *
+YIELDPROC16
 
 %ptr # --forbidden
 
@@ -63,10 +64,6 @@ FARPROC16
 LPTIMECALLBACK16
 SEGPTR
 
-%segptr # --forbidden
-
-YIELDPROC
-
 %str
 
 LPCSTR
diff --git a/tools/winapi_check/win16/setupx.api b/tools/winapi_check/win16/setupx.api
index d628f7214c7..7549949efc3 100644
--- a/tools/winapi_check/win16/setupx.api
+++ b/tools/winapi_check/win16/setupx.api
@@ -9,16 +9,26 @@ LPDWORD
 
 %ptr # --forbidden
 
+HINF16 *
 LPHKEY
+LPWORD
 
 %str
 
 LPCSTR
 LPSTR
 
+%void
+
+void
+
 %word # --forbidden
 
 INT16
+LOGDISKID16
+HINF16
 HINSTANCE16
 HKEY
 HWND16
+RETERR16
+WORD
diff --git a/tools/winapi_check/win16/user.api b/tools/winapi_check/win16/user.api
index 94552a2233a..25b966ff20d 100644
--- a/tools/winapi_check/win16/user.api
+++ b/tools/winapi_check/win16/user.api
@@ -33,7 +33,6 @@ LPDWORD
 LPICONINFO16
 LPINT16
 LPMSG16
-LPMSG16_32
 LPMSGBOXPARAMS16
 LPPAINTSTRUCT16
 LPPOINT16
diff --git a/tools/winapi_check/win32/kernel32.api b/tools/winapi_check/win32/kernel32.api
index d5a589c4411..eedc9b8cfe1 100644
--- a/tools/winapi_check/win32/kernel32.api
+++ b/tools/winapi_check/win32/kernel32.api
@@ -38,10 +38,6 @@ HMODULE16
 UINT16
 int
 
-%longlong
-
-LARGE_INTEGER
-
 %ptr
 
 BOOL *
diff --git a/tools/winapi_check/win32/ntdll.api b/tools/winapi_check/win32/ntdll.api
index e1020b0fb9a..4fe32362420 100644
--- a/tools/winapi_check/win32/ntdll.api
+++ b/tools/winapi_check/win32/ntdll.api
@@ -38,21 +38,23 @@ unsigned long
 
 %longlong
 
-LARGE_INTEGER
+LONGLONG
+ULONGLONG
 
 %ptr
 
 CONTEXT *
 CONTEXT86 *
-CRITICAL_SECTION *
 DWORD *
 EXCEPTION_FRAME *
 EXCEPTION_RECORD *
+FILETIME *
 HANDLE *
+INT *
+LARGE_INTEGER *
 LPBYTE
 LPDWORD
 LPDWORD *
-LPFILETIME
 LPRTL_RWLOCK
 LPVOID
 LPVOID *
@@ -90,7 +92,10 @@ PULONG
 PUNICODE_STRING
 PVOID
 PVOID *
+RTL_CRITICAL_SECTION *
 STRING *
+UINT *
+ULONGLONG *
 UNICODE_STRING *
 VOID *
 struct _TEB *
diff --git a/tools/winapi_check/win32/shell32.api b/tools/winapi_check/win32/shell32.api
index 3c7143e6e9a..a04a93fdd60 100644
--- a/tools/winapi_check/win32/shell32.api
+++ b/tools/winapi_check/win32/shell32.api
@@ -38,6 +38,7 @@ HIMAGELIST *
 HWND *
 IShellFolder **
 IStream *
+ITEMIDLIST *
 IUnknown *
 LPBROWSEINFOA
 LPBYTE
diff --git a/tools/winapi_check/win32/shlwapi.api b/tools/winapi_check/win32/shlwapi.api
index ed408728b30..882882a7df4 100644
--- a/tools/winapi_check/win32/shlwapi.api
+++ b/tools/winapi_check/win32/shlwapi.api
@@ -24,12 +24,12 @@ int
 
 DLLVERSIONINFO *
 IStream *
+ITEMIDLIST *
 IUnknown *
 LPBYTE
 LPCLSID
 LPCVOID
 LPDWORD
-LPITEMIDLIST
 LPSTRRET
 LPVOID
 REFGUID
diff --git a/tools/winapi_check/win32/wnaspi32.api b/tools/winapi_check/win32/wnaspi32.api
index ce5a936423f..994725af431 100644
--- a/tools/winapi_check/win32/wnaspi32.api
+++ b/tools/winapi_check/win32/wnaspi32.api
@@ -1,7 +1,10 @@
 %long
 
+BOOL
 DWORD
 
 %ptr
 
-LPSRB
\ No newline at end of file
+LPDWORD
+LPSRB
+LPVOID
diff --git a/tools/winapi_check/winapi.pm b/tools/winapi_check/winapi.pm
index cb5299267d1..32df6074a59 100644
--- a/tools/winapi_check/winapi.pm
+++ b/tools/winapi_check/winapi.pm
@@ -268,7 +268,7 @@ sub parse_spec_file {
 	} 
 
 	my $ordinal;
-	if(/^(\d+|@)\s+(pascal|pascal16|stdcall|cdecl|register|interrupt|varargs)\s+(\S+)\s*\(\s*(.*?)\s*\)\s*(\S+)$/) {
+	if(/^(\d+|@)\s+(pascal|pascal16|stdcall|stdcall64|cdecl|register|interrupt|varargs)\s+(\S+)\s*\(\s*(.*?)\s*\)\s*(\S+)$/) {
 	    my $calling_convention = $2;
 	    my $external_name = $3;
 	    my $arguments = $4;
diff --git a/tools/winapi_check/winapi_local.pm b/tools/winapi_check/winapi_local.pm
index c1bef9cf85e..678aac47c24 100644
--- a/tools/winapi_check/winapi_local.pm
+++ b/tools/winapi_check/winapi_local.pm
@@ -75,7 +75,11 @@ sub check_function {
 	} elsif($calling_convention =~ /^VFWAPIV|WINAPIV$/) {
 	    $implemented_calling_convention = "varargs";
 	} elsif($calling_convention =~ /^__stdcall|VFWAPI|WINAPI|CALLBACK$/) {
-	    $implemented_calling_convention = "stdcall";
+	    if($implemented_return_kind =~ /^longlong$/) {
+		$implemented_calling_convention = "stdcall64";
+	    } else {
+		$implemented_calling_convention = "stdcall";
+	    }
 	} else {
 	    $implemented_calling_convention = "cdecl";
 	}