From 8657ed51b63db15d1f2d44bba8596437a47a9125 Mon Sep 17 00:00:00 2001 From: Patrik Stridvall Date: Wed, 3 Apr 2002 02:35:34 +0000 Subject: [PATCH] - Minor API file update. - Minor bug fixes. --- tools/winapi_check/modules.dat | 20 +++++++++++++------- tools/winapi_check/modules.pm | 2 +- tools/winapi_check/win16/setupx.api | 1 + tools/winapi_check/win32/imaadp32.api | 6 ++++++ tools/winapi_check/win32/ntdll.api | 6 ++++++ tools/winapi_check/win32/setupapi.api | 20 ++++++++++++++++---- tools/winapi_check/win32/ttydrv.api | 2 ++ tools/winapi_check/win32/wineps.api | 6 +++++- tools/winapi_check/win32/x11drv.api | 5 +++++ tools/winapi_check/winapi_check | 2 +- 10 files changed, 56 insertions(+), 14 deletions(-) create mode 100644 tools/winapi_check/win32/imaadp32.api diff --git a/tools/winapi_check/modules.dat b/tools/winapi_check/modules.dat index 37e4297a54..84606a8fa3 100644 --- a/tools/winapi_check/modules.dat +++ b/tools/winapi_check/modules.dat @@ -65,19 +65,21 @@ dlls/dsound graphics -% dlls/gdi/gdi.spec +% dlls/gdi/gdi.exe.spec dlls/gdi -graphics/metafiledrv -graphics/win16drv +dlls/gdi/enhmfdrv +dlls/gdi/mfdrv +dlls/gdi/win16drv graphics objects % dlls/gdi/gdi32.spec dlls/gdi -graphics/enhmetafiledrv -graphics/metafiledrv +dlls/gdi/enhmfdrv +dlls/gdi/mfdrv +dlls/gdi/win16drv graphics objects @@ -105,7 +107,7 @@ dlls/imm32 % dlls/kernel/comm.spec -% dlls/kernel/kernel.spec +% dlls/kernel/krnl386.exe.spec dlls/kernel files @@ -202,6 +204,10 @@ dlls/msacm dlls/msacm +% dlls/msacm/imaadp32/imaadp32.acm.spec + +dlls/msacm/imaadp32 + % dlls/msacm/msg711/msg711.drv.spec dlls/msacm/msg711 @@ -395,7 +401,7 @@ dlls/user dlls/url -% dlls/user/user.spec +% dlls/user/user.exe.spec controls dlls/user diff --git a/tools/winapi_check/modules.pm b/tools/winapi_check/modules.pm index 030866e517..9a9936cabf 100644 --- a/tools/winapi_check/modules.pm +++ b/tools/winapi_check/modules.pm @@ -156,7 +156,7 @@ sub new { } foreach my $spec_file (@spec_files) { - if(!$spec_file_found{$spec_file}) { + if(!$spec_file_found{$spec_file} && $spec_file !~ m%tests/[^/]+$%) { $output->write("modules.dat: $spec_file: exists but is not specified\n"); } } diff --git a/tools/winapi_check/win16/setupx.api b/tools/winapi_check/win16/setupx.api index 104ca49998..8d3d3f798b 100644 --- a/tools/winapi_check/win16/setupx.api +++ b/tools/winapi_check/win16/setupx.api @@ -1,5 +1,6 @@ %long +BOOL DWORD LPARAM int diff --git a/tools/winapi_check/win32/imaadp32.api b/tools/winapi_check/win32/imaadp32.api new file mode 100644 index 0000000000..927d81c415 --- /dev/null +++ b/tools/winapi_check/win32/imaadp32.api @@ -0,0 +1,6 @@ +%long + +DWORD +LONG +HDRVR +UINT diff --git a/tools/winapi_check/win32/ntdll.api b/tools/winapi_check/win32/ntdll.api index ee8685305f..33e86427b1 100644 --- a/tools/winapi_check/win32/ntdll.api +++ b/tools/winapi_check/win32/ntdll.api @@ -32,6 +32,10 @@ UINT ULONG WCHAR +%long --extension + +handle_t + %long # --forbidden int @@ -114,6 +118,8 @@ WCHAR *** char * char *** enum __WINE_DEBUG_CLASS +enum fd_type * +int * va_list %str diff --git a/tools/winapi_check/win32/setupapi.api b/tools/winapi_check/win32/setupapi.api index 68736eab97..21ba3398b7 100644 --- a/tools/winapi_check/win32/setupapi.api +++ b/tools/winapi_check/win32/setupapi.api @@ -1,6 +1,7 @@ %long BOOL +LONG DWORD HDEVINFO HINF @@ -9,22 +10,33 @@ HSPFILEQ HWND UINT +%long --ptr + +UINT_PTR + %ptr -PSP_DEVINFO_DATA +BYTE * +DWORD * +INFCONTEXT * +INT * PDWORD +PSP_DEVINFO_DATA PSP_FILE_CALLBACK_A PSP_FILE_CALLBACK_W -PINFCONTEXT +PSP_FILE_COPY_PARAMS_A +PSP_FILE_COPY_PARAMS_W +PSTR PUINT PVOID +UINT * %str -LPSTR PCSTR +PCWSTR PWSTR %void -VOID +void diff --git a/tools/winapi_check/win32/ttydrv.api b/tools/winapi_check/win32/ttydrv.api index 1a4114f4c5..ea101e2bbd 100644 --- a/tools/winapi_check/win32/ttydrv.api +++ b/tools/winapi_check/win32/ttydrv.api @@ -7,6 +7,7 @@ DWORD INT HDC HBITMAP +HFONT HGDIOBJ HRGN HWND @@ -35,6 +36,7 @@ LPTEXTMETRICW INT * POINT * RECT * +TTYDRV_PDEVICE * WINDOWPOS * struct tagCURSORICONINFO * diff --git a/tools/winapi_check/win32/wineps.api b/tools/winapi_check/win32/wineps.api index 6ab105691c..2ad8288407 100644 --- a/tools/winapi_check/win32/wineps.api +++ b/tools/winapi_check/win32/wineps.api @@ -3,8 +3,11 @@ BOOL COLORREF DWORD +HBITMAP +HBRUSH HDC -HGDIOBJ +HFONT +HPEN HWND INT LPARAM @@ -27,6 +30,7 @@ LPLOGFONTW LPSIZE LPVOID POINT * +PSDRV_PDEVICE * RECT * TEXTMETRICW * void * diff --git a/tools/winapi_check/win32/x11drv.api b/tools/winapi_check/win32/x11drv.api index 3048fece73..5cac998ae3 100644 --- a/tools/winapi_check/win32/x11drv.api +++ b/tools/winapi_check/win32/x11drv.api @@ -6,9 +6,12 @@ COLORREF DWORD HANDLE HBITMAP +HBRUSH HDC +HFONT HGDIOBJ HICON +HPEN HRGN HWND INT @@ -46,8 +49,10 @@ LPVOID * PIXELFORMATDESCRIPTOR * POINT * RECT * +RGBQUAD * TEXTMETRICW * WINDOWPOS * +X11DRV_PDEVICE * void * %str diff --git a/tools/winapi_check/winapi_check b/tools/winapi_check/winapi_check index 1dd5747918..ac08690cab 100755 --- a/tools/winapi_check/winapi_check +++ b/tools/winapi_check/winapi_check @@ -496,7 +496,7 @@ foreach my $file (@c_files) { if($check_protection && $header) { if((-e "$wine_dir/include/$header" || -e "$wine_dir/$file_dir/$header")) { - if($header !~ /^ctype.h$/) { + if($header !~ /^(oleauto\.h|win(?:base|def|error|gdi|nls|nt|user)\.h)$/) { $output->write("$file: #include \<$header\> is a local include\n"); } }