From 05fffb15ec5a07fcdab4d02ea15880fa5266b631 Mon Sep 17 00:00:00 2001
From: Patrik Stridvall <ps@leissner.se>
Date: Tue, 4 Jun 2002 22:13:21 +0000
Subject: [PATCH] API files update.

---
 tools/winapi_check/modules.dat        | 10 +++++++++-
 tools/winapi_check/win32/kernel32.api |  2 ++
 tools/winapi_check/win32/msg711.api   |  6 ++++++
 tools/winapi_check/win32/ntdll.api    |  3 ++-
 tools/winapi_check/win32/setupapi.api |  6 ++++++
 tools/winapi_check/win32/ttydrv.api   |  2 +-
 tools/winapi_check/win32/user32.api   |  1 -
 tools/winapi_check/win32/winemp3.api  |  7 +++++++
 tools/winapi_check/win32/x11drv.api   |  3 ++-
 tools/winapi_check/winapi_parser.pm   |  2 +-
 10 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 tools/winapi_check/win32/winemp3.api

diff --git a/tools/winapi_check/modules.dat b/tools/winapi_check/modules.dat
index b0b45988b5a..6d8e205e5dd 100644
--- a/tools/winapi_check/modules.dat
+++ b/tools/winapi_check/modules.dat
@@ -218,10 +218,18 @@ dlls/msacm
 
 dlls/msacm/imaadp32
 
-% dlls/msacm/msg711/msg711.drv.spec
+% dlls/msacm/msadp32/msadp32.acm.spec
+
+dlls/msacm/msadp32
+
+% dlls/msacm/msg711/msg711.acm.spec
 
 dlls/msacm/msg711
 
+% dlls/msacm/winemp3/winemp3.acm.spec
+
+dlls/msacm/winemp3
+
 % dlls/msnet32/msnet32.spec
 
 % dlls/msvideo/msvfw32.spec
diff --git a/tools/winapi_check/win32/kernel32.api b/tools/winapi_check/win32/kernel32.api
index 22f71f30155..d11117a2935 100644
--- a/tools/winapi_check/win32/kernel32.api
+++ b/tools/winapi_check/win32/kernel32.api
@@ -107,6 +107,8 @@ LPMODULEENTRY32
 LPOVERLAPPED
 LPOVERLAPPED *
 LPOVERLAPPED_COMPLETION_ROUTINE
+LPOSVERSIONINFOEXA
+LPOSVERSIONINFOEXW
 LPPROCESSENTRY32
 LPPROCESS_HEAP_ENTRY
 LPPROCESS_INFORMATION
diff --git a/tools/winapi_check/win32/msg711.api b/tools/winapi_check/win32/msg711.api
index 8b137891791..1debd44c7af 100644
--- a/tools/winapi_check/win32/msg711.api
+++ b/tools/winapi_check/win32/msg711.api
@@ -1 +1,7 @@
+%long
 
+DWORD
+HDRVR
+LPARAM
+LRESULT
+UINT
diff --git a/tools/winapi_check/win32/ntdll.api b/tools/winapi_check/win32/ntdll.api
index fbcbc481559..e2155c9c20e 100644
--- a/tools/winapi_check/win32/ntdll.api
+++ b/tools/winapi_check/win32/ntdll.api
@@ -34,7 +34,7 @@ WCHAR
 
 %long --extension
 
-handle_t
+obj_handle_t
 
 %long # --forbidden
 
@@ -115,6 +115,7 @@ void *
 WCHAR *
 char *
 enum fd_type *
+obj_handle_t *
 int *
 
 %str
diff --git a/tools/winapi_check/win32/setupapi.api b/tools/winapi_check/win32/setupapi.api
index 21ba3398b72..6debfe7ab98 100644
--- a/tools/winapi_check/win32/setupapi.api
+++ b/tools/winapi_check/win32/setupapi.api
@@ -18,9 +18,14 @@ UINT_PTR
 
 BYTE *
 DWORD *
+GUID *
 INFCONTEXT *
 INT *
+PBYTE
 PDWORD
+PSP_DEVICE_INTERFACE_DATA
+PSP_DEVICE_INTERFACE_DETAIL_DATAA
+PSP_DEVICE_INTERFACE_DETAIL_DATAW
 PSP_DEVINFO_DATA
 PSP_FILE_CALLBACK_A
 PSP_FILE_CALLBACK_W
@@ -33,6 +38,7 @@ UINT *
 
 %str
 
+LPCSTR
 PCSTR
 PCWSTR
 PWSTR
diff --git a/tools/winapi_check/win32/ttydrv.api b/tools/winapi_check/win32/ttydrv.api
index ea101e2bbdf..d7977ed3fa4 100644
--- a/tools/winapi_check/win32/ttydrv.api
+++ b/tools/winapi_check/win32/ttydrv.api
@@ -8,7 +8,6 @@ INT
 HDC
 HBITMAP
 HFONT
-HGDIOBJ
 HRGN
 HWND
 LONG
@@ -31,6 +30,7 @@ CREATESTRUCTA *
 LPBYTE
 LPCVOID
 LPINT
+LPPALETTEENTRY
 LPSIZE
 LPTEXTMETRICW
 INT *
diff --git a/tools/winapi_check/win32/user32.api b/tools/winapi_check/win32/user32.api
index 5491dd07109..0ed0a672c1f 100644
--- a/tools/winapi_check/win32/user32.api
+++ b/tools/winapi_check/win32/user32.api
@@ -23,7 +23,6 @@ HHOOK
 HICON
 HINSTANCE
 HKL
-HPEN
 HMENU
 HMONITOR
 HRESULT
diff --git a/tools/winapi_check/win32/winemp3.api b/tools/winapi_check/win32/winemp3.api
new file mode 100644
index 00000000000..1debd44c7af
--- /dev/null
+++ b/tools/winapi_check/win32/winemp3.api
@@ -0,0 +1,7 @@
+%long
+
+DWORD
+HDRVR
+LPARAM
+LRESULT
+UINT
diff --git a/tools/winapi_check/win32/x11drv.api b/tools/winapi_check/win32/x11drv.api
index 5cac998ae30..f24ed1c19a0 100644
--- a/tools/winapi_check/win32/x11drv.api
+++ b/tools/winapi_check/win32/x11drv.api
@@ -9,8 +9,8 @@ HBITMAP
 HBRUSH
 HDC
 HFONT
-HGDIOBJ
 HICON
+HPALETTE
 HPEN
 HRGN
 HWND
@@ -41,6 +41,7 @@ LPBYTE
 LPCVOID
 LPINT
 LPLOGFONTW
+LPPALETTEENTRY
 LPPOINT
 LPRECT
 LPSIZE
diff --git a/tools/winapi_check/winapi_parser.pm b/tools/winapi_check/winapi_parser.pm
index ec746604b30..500cd0f6e6f 100644
--- a/tools/winapi_check/winapi_parser.pm
+++ b/tools/winapi_check/winapi_parser.pm
@@ -560,7 +560,7 @@ sub parse_c_file {
 		(?:(?:const\s+|enum\s+|long\s+|signed\s+|short\s+|struct\s+|union\s+|unsigned\s+)*?)
 		(\w+(?:\s*\*+\s*)?)\s+
 		(?:(\w+)\s*)?
-		\((?:(\w+)\s+)?\s*\*\s*(\w+)\s*\)\s*
+		\((?:(\w+)\s*)?\s*\*\s*(\w+)\s*\)\s*
 		(?:\(([^\)]*)\)|\[([^\]]*)\])\s*;/sx)
 	{
 	    $_ = $'; $again = 1;