- Minor API update.
- Minor bug fixes.
diff --git a/tools/winapi_check/nativeapi.pm b/tools/winapi_check/nativeapi.pm
index 5816d9a..482f0fc 100644
--- a/tools/winapi_check/nativeapi.pm
+++ b/tools/winapi_check/nativeapi.pm
@@ -47,11 +47,11 @@
my $conditional_functions = \%{$self->{CONDITIONAL_FUNCTIONS}};
my $api_file = "$winapi_check_dir/nativeapi.dat";
- my $configure_in_file = "$wine_dir/configure.in";
+ my $configure_ac_file = "$wine_dir/configure.ac";
my $config_h_in_file = "$wine_dir/include/config.h.in";
$api_file =~ s/^\.\///;
- $configure_in_file =~ s/^\.\///;
+ $configure_ac_file =~ s/^\.\///;
$config_h_in_file =~ s/^\.\///;
$output->progress("$api_file");
@@ -67,10 +67,10 @@
}
close(IN);
- $output->progress("$configure_in_file");
+ $output->progress("$configure_ac_file");
my $again = 0;
- open(IN, "< $configure_in_file");
+ open(IN, "< $configure_ac_file");
local $/ = "\n";
while($again || (defined($_ = <IN>))) {
$again = 0;
diff --git a/tools/winapi_check/win32/advapi32.api b/tools/winapi_check/win32/advapi32.api
index 1121555..e215853 100644
--- a/tools/winapi_check/win32/advapi32.api
+++ b/tools/winapi_check/win32/advapi32.api
@@ -50,8 +50,10 @@
LPSERVICE_TABLE_ENTRYA
LPSERVICE_TABLE_ENTRYW
LPVOID
+LPVOID *
PACL
PACL *
+PBOOL
PDWORD
PGENERIC_MAPPING
PHANDLE
diff --git a/tools/winapi_check/win32/ole32.api b/tools/winapi_check/win32/ole32.api
index 1540f51..934b9fd 100644
--- a/tools/winapi_check/win32/ole32.api
+++ b/tools/winapi_check/win32/ole32.api
@@ -42,6 +42,7 @@
IStorage *
IStorage **
IStream *
+IUnknown *
LPBC
LPBC *
LPCLSID
@@ -55,6 +56,7 @@
LPGUID
LPLOCKBYTES *
LPMALLOC *
+LPMARSHAL *
LPMESSAGEFILTER
LPMESSAGEFILTER *
LPMONIKER
@@ -70,6 +72,7 @@
LPOLESTREAM
LPOLESTR *
LPPERSISTSTORAGE
+LPSTREAM
LPRUNNINGOBJECTTABLE *
LPUNKNOWN
LPUNKNOWN *
@@ -84,6 +87,7 @@
REFIID
SNB
STGMEDIUM *
+ULONG *
WORD *
void *
void **
diff --git a/tools/winapi_check/win32/rpcrt4.api b/tools/winapi_check/win32/rpcrt4.api
index 3726cd2..70c6f68 100644
--- a/tools/winapi_check/win32/rpcrt4.api
+++ b/tools/winapi_check/win32/rpcrt4.api
@@ -27,7 +27,6 @@
UUID *
unsigned char **
unsigned short
-void *
%str
diff --git a/tools/winapi_check/win32/shlwapi.api b/tools/winapi_check/win32/shlwapi.api
index fe395f8..bf17a20 100644
--- a/tools/winapi_check/win32/shlwapi.api
+++ b/tools/winapi_check/win32/shlwapi.api
@@ -37,6 +37,7 @@
%ptr
BOOL *
+CLSID *
DLLVERSIONINFO *
HICON *
IFACE_INDEX_TBL *
@@ -51,6 +52,7 @@
LPCVOID
LPCWSTR *
LPDWORD
+LPDWORD *
LPHWND
LPINT
LPITEMIDLIST
@@ -64,13 +66,16 @@
LPVOID
LPVOID *
LPWORD
+PACL
PHUSKEY
+PSECURITY_DESCRIPTOR
PVOID
REFIID
REFGUID
SHFILEINFOW *
-unsigned char *
+UINT *
WNDCLASSA *
+unsigned char *
%ptr --extension
diff --git a/tools/winapi_check/winapi_check b/tools/winapi_check/winapi_check
index 8ef4a31..1dd5747 100755
--- a/tools/winapi_check/winapi_check
+++ b/tools/winapi_check/winapi_check
@@ -510,7 +510,10 @@
if($macro =~ /^HAVE_X11/) {
# Do nothing X Windows is handled differently
} elsif($macro =~ /^HAVE_(.*?)_H$/) {
- if($header ne "alloca.h" && !$preprocessor->is_def("STATFS_DEFINED_BY_$1")) {
+ my $name = $1;
+ if($header !~ /^alloca\.h|sys\/time\.h|unistd\.h$/ &&
+ !$preprocessor->is_def("STATFS_DEFINED_BY_$name"))
+ {
$output->write("$file: #$directive $argument: is a conditional include, " .
"but is not protected\n");
}
