A few bug fixes.
diff --git a/tools/winapi_check/modules.dat b/tools/winapi_check/modules.dat
index 706a32e..e9a016f 100644
--- a/tools/winapi_check/modules.dat
+++ b/tools/winapi_check/modules.dat
@@ -391,6 +391,8 @@
% dlls/wineps/wineps.spec
+dlls/wineps
+
% dlls/wineps/wineps16.spec
dlls/wineps
diff --git a/tools/winapi_check/modules.pm b/tools/winapi_check/modules.pm
index 357e850..1880b49 100644
--- a/tools/winapi_check/modules.pm
+++ b/tools/winapi_check/modules.pm
@@ -14,7 +14,7 @@
use config qw(
&file_type &files_skip
&file_directory
- &get_c_files
+ &get_c_files &get_spec_files
$current_dir $wine_dir
$winapi_check_dir
);
@@ -23,36 +23,58 @@
$modules = 'modules'->new;
+sub get_spec_file_type {
+ my $file = shift;
+
+ my $module;
+ my $type;
+
+ open(IN, "< $file") || die "$file: $!\n";
+ local $/ = "\n";
+ while(<IN>) {
+ s/^\s*(.*?)\s*$/$1/;
+ s/^(.*?)\s*#.*$/$1/;
+ /^$/ && next;
+
+ if(/^name\s*(\S*)/) { $module = $1; }
+ if(/^type\s*(\w+)/) { $type = $1; }
+
+ if(defined($module) && defined($type)) { last; }
+ }
+ close(IN);
+
+ if(!defined($module)) {
+ $module = $file;
+ $module =~ s%^.*?([^/]+)\.spec|%$1%;
+ }
+
+ if(!defined($type)) {
+ $type = "";
+ }
+
+ return ($type, $module);
+}
+
sub new {
my $proto = shift;
my $class = ref($proto) || $proto;
my $self = {};
bless ($self, $class);
+ my $spec_files16 = \@{$self->{SPEC_FILES16}};
+ my $spec_files32 = \@{$self->{SPEC_FILES32}};
my $dir2spec_file = \%{$self->{DIR2SPEC_FILE}};
my $spec_file2dir = \%{$self->{SPEC_FILE2DIR}};
my $spec_file2module = \%{$self->{SPEC_FILE2MODULE}};
+ my $module2spec_file = \%{$self->{MODULE2SPEC_FILE}};
my $module_file = "$winapi_check_dir/modules.dat";
- my @all_spec_files = map {
- s/^.\/(.*)$/$1/;
- if(file_type($_) eq "winelib") {
- $_;
- } else {
- ();
- }
- } split(/\n/, `find $wine_dir -name \\*.spec`);
-
- my %all_spec_files;
- foreach my $file (@all_spec_files) {
- $all_spec_files{$file}++ ;
- }
-
if($options->progress) {
$output->progress("modules.dat");
}
+ my %spec_file_found;
my $allowed_dir;
my $spec_file;
@@ -65,17 +87,13 @@
if(/^%\s+(.*?)$/) {
$spec_file = $1;
-
+
if(!-f "$wine_dir/$spec_file") {
$output->write("modules.dat: $spec_file: file ($spec_file) doesn't exist or is no file\n");
}
- if($wine_dir eq ".") {
- $all_spec_files{$spec_file}--;
- } else {
- $all_spec_files{"$wine_dir/$spec_file"}--;
- }
- $$dir2spec_file{""}{$spec_file}++; # FIXME: Kludge
+ $spec_file_found{$spec_file}++;
+ $$spec_file2dir{$spec_file} = {};
next;
} else {
$allowed_dir = $1;
@@ -89,8 +107,40 @@
}
close(IN);
- foreach my $spec_file (sort(keys(%all_spec_files))) {
- if($all_spec_files{$spec_file} > 0) {
+ my @spec_files;
+ if($wine_dir eq ".") {
+ @spec_files = get_spec_files("winelib");
+ } else {
+ my %spec_files = ();
+ foreach my $dir ($options->directories) {
+ $dir = "$current_dir/$dir";
+ $dir =~ s%/\.$%%;
+ foreach my $spec_file (sort(keys(%{$$dir2spec_file{$dir}}))) {
+ $spec_files{$spec_file}++;
+ }
+ }
+ @spec_files = sort(keys(%spec_files));
+ }
+
+ @$spec_files16 = ();
+ @$spec_files32 = ();
+ foreach my $spec_file (@spec_files) {
+ (my $type, my $module) = get_spec_file_type("$wine_dir/$spec_file");
+
+ $$spec_file2module{$spec_file} = $module;
+ $$module2spec_file{$module} = $spec_file;
+
+ if($type eq "win16") {
+ push @$spec_files16, $spec_file;
+ } elsif($type eq "win32") {
+ push @$spec_files32, $spec_file;
+ } else {
+ $output->write("$spec_file: unknown type '$type'\n");
+ }
+ }
+
+ foreach my $spec_file (@spec_files) {
+ if(!$spec_file_found{$spec_file}) {
$output->write("modules.dat: $spec_file: exists but is not specified\n");
}
}
@@ -146,19 +196,14 @@
return @complete_modules;
}
-sub spec_file_module {
+sub is_allowed_module {
my $self = shift;
- my $spec_file2module = \%{$self->{SPEC_FILE2MODULE}};
my $module2spec_file = \%{$self->{MODULE2SPEC_FILE}};
- my $spec_file = shift;
- $spec_file =~ s/^\.\///;
-
my $module = shift;
-
- $$spec_file2module{$spec_file} = $module;
- $$module2spec_file{$module} = $spec_file;
+
+ return defined($$module2spec_file{$module});
}
sub is_allowed_module_in_file {
@@ -205,7 +250,9 @@
$allowed_modules{$module}++;
}
- return join(" & ", sort(keys(%allowed_modules)));
+ my $module = join(" & ", sort(keys(%allowed_modules)));
+
+ return $module;
}
sub allowed_dirs_for_module {
@@ -221,32 +268,20 @@
return sort(keys(%{$$spec_file2dir{$spec_file}}));
}
-sub allowed_spec_files {
+sub allowed_spec_files16 {
my $self = shift;
- my $dir2spec_file = \%{$self->{DIR2SPEC_FILE}};
+ my $spec_files16 = \@{$self->{SPEC_FILES16}};
- my @dirs = map {
- s/^\.\/(.*)$/$1/;
- if(/^\.$/) {
- $current_dir;
- } else {
- if($current_dir ne ".") {
- "$current_dir/$_";
- } else {
- $_;
- }
- }
- } split(/\n/, `find . -type d ! -name CVS`);
+ return @$spec_files16;
+}
- my %allowed_spec_files = ();
- foreach my $dir (sort(@dirs)) {
- foreach my $spec_file (sort(keys(%{$$dir2spec_file{$dir}}))) {
- $allowed_spec_files{$spec_file}++;
- }
- }
+sub allowed_spec_files32 {
+ my $self = shift;
- return sort(keys(%allowed_spec_files));
+ my $spec_files32 = \@{$self->{SPEC_FILES32}};
+
+ return @$spec_files32;
}
sub found_module_in_dir {
@@ -257,6 +292,9 @@
my $used_module_dirs = \%{$self->{USED_MODULE_DIRS}};
+ $dir = "$current_dir/$dir";
+ $dir =~ s%/\.$%%;
+
$$used_module_dirs{$module}{$dir}++;
}
@@ -264,15 +302,16 @@
my $self = shift;
my $dir2spec_file = \%{$self->{DIR2SPEC_FILE}};
- my $spec_file2module = \%{$self->{SPEC_FILE2MODULE}};
+ my $module2spec_file = \%{$self->{MODULE2SPEC_FILE}};
my $used_module_dirs = \%{$self->{USED_MODULE_DIRS}};
my @messages;
- foreach my $dir (sort(keys(%$dir2spec_file))) {
- if($dir eq "") { next; }
- foreach my $spec_file (sort(keys(%{$$dir2spec_file{$dir}}))) {
- my $module = $$spec_file2module{$spec_file};
+ foreach my $dir ($options->directories) {
+ $dir = "$current_dir/$dir";
+ $dir =~ s%/\.$%%;
+ foreach my $module ($self->all_modules) {
if(!$$used_module_dirs{$module}{$dir}) {
+ my $spec_file = $$module2spec_file{$module};
push @messages, "modules.dat: $spec_file: directory ($dir) is not used\n";
}
}
diff --git a/tools/winapi_check/win32/ttydrv.api b/tools/winapi_check/win32/ttydrv.api
index ae8a27c..e08e9d3 100644
--- a/tools/winapi_check/win32/ttydrv.api
+++ b/tools/winapi_check/win32/ttydrv.api
@@ -2,10 +2,13 @@
BOOL
CHAR
+COLORREF
DWORD
INT
HANDLE
HDC
+HBITMAP
+HGDIOBJ
HRGN
HWND
LONG
@@ -20,16 +23,28 @@
%ptr
+BITMAPINFO *
BYTE *
+DC *
+DEVMODEA *
+DWORD *
CREATESTRUCTA *
LPBYTE
+LPCVOID
LPDIDEVICEOBJECTDATA
LPDWORD
+LPINT
LPMOUSE_EVENT_PROC
+LPSIZE
+LPTEXTMETRICW
LPVOID
+INT *
+POINT *
+RECT *
WINDOWPOS *
struct tagCURSORICONINFO *
struct tagWND *
+void *
%str
@@ -38,6 +53,7 @@
%wstr
+LPCWSTR
LPWSTR
%void
diff --git a/tools/winapi_check/win32/wineps.api b/tools/winapi_check/win32/wineps.api
new file mode 100644
index 0000000..89b4309
--- /dev/null
+++ b/tools/winapi_check/win32/wineps.api
@@ -0,0 +1,47 @@
+%long
+
+BOOL
+COLORREF
+DWORD
+HDC
+HGDIOBJ
+HWND
+INT
+LPARAM
+UINT
+WORD
+
+%ptr
+
+BITMAPINFO *
+DC *
+DEVICEFONTENUMPROC
+DEVMODEA *
+DOCINFOA *
+DWORD *
+INT *
+LPDEVMODEA
+LPINT
+LPLOGFONTW
+LPSIZE
+POINT *
+RECT *
+TEXTMETRICW *
+void *
+
+%ptr # --forbidden
+
+SEGPTR
+
+%str
+
+LPCSTR
+LPSTR
+
+%wstr
+
+LPCWSTR
+
+%void
+
+VOID
diff --git a/tools/winapi_check/win32/x11drv.api b/tools/winapi_check/win32/x11drv.api
index 67a6c9c..2dfd72c 100644
--- a/tools/winapi_check/win32/x11drv.api
+++ b/tools/winapi_check/win32/x11drv.api
@@ -2,14 +2,18 @@
BOOL
CHAR
+COLORREF
DWORD
HANDLE
+HBITMAP
HDC
+HGDIOBJ
HICON
HRGN
HWND
INT
LONG
+LPARAM
UINT
WPARAM
WORD
@@ -22,20 +26,39 @@
%ptr
+BITMAPINFO *
BYTE *
+DC *
CURSORICONINFO *
CREATESTRUCTA *
+DEVICEFONTENUMPROC
+DEVMODEA *
+DWORD *
HANDLE *
+INT *
LPBYTE
+LPCVOID
LPDIDEVICEOBJECTDATA
LPDWORD
+LPINT
+LPLOGFONTW
LPMOUSE_EVENT_PROC
LPPOINT
LPRECT
+LPSIZE
LPVOID
+LPVOID *
+PIXELFORMATDESCRIPTOR *
+POINT *
RECT *
+TEXTMETRICW *
WINDOWPOS *
WND *
+void *
+
+%ptr # --forbidden
+
+SEGPTR
%str
diff --git a/tools/winapi_check/winapi.pm b/tools/winapi_check/winapi.pm
index 813aa6a..4eb33e4 100644
--- a/tools/winapi_check/winapi.pm
+++ b/tools/winapi_check/winapi.pm
@@ -13,28 +13,31 @@
use config qw(
&file_type
- &get_api_files &get_spec_files
+ &get_api_files
$current_dir $wine_dir
);
use modules qw($modules);
use options qw($options);
use output qw($output);
-$win16api = 'winapi'->new("win16");
-$win32api = 'winapi'->new("win32");
+my @spec_files16 = $modules->allowed_spec_files16;
+$win16api = 'winapi'->new("win16", \@spec_files16);
+
+my @spec_files32 = $modules->allowed_spec_files32;
+$win32api = 'winapi'->new("win32", \@spec_files32);
+
@winapis = ($win16api, $win32api);
-my @spec_files = get_spec_files("winelib");
-foreach my $file (@spec_files) {
- (my $type, my $module) = 'winapi'->get_spec_file_type("$wine_dir/$file");
- $modules->spec_file_module($file, $module);
-}
-
-if($wine_dir eq ".") {
- 'winapi'->read_spec_files(\@spec_files);
-} else {
- @spec_files = $modules->allowed_spec_files;
- 'winapi'->read_spec_files(\@spec_files);
+for my $internal_name ($win32api->all_internal_functions) {
+ my $module16 = $win16api->function_internal_module($internal_name);
+ my $module32 = $win16api->function_internal_module($internal_name);
+ if(defined($module16) &&
+ !$win16api->is_function_stub_in_module($module16, $internal_name) &&
+ !$win32api->is_function_stub_in_module($module32, $internal_name))
+ {
+ $win16api->found_shared_internal_function($internal_name);
+ $win32api->found_shared_internal_function($internal_name);
+ }
}
sub new {
@@ -44,19 +47,34 @@
bless ($self, $class);
my $name = \${$self->{NAME}};
+ my $function_forward = \%{$self->{FUNCTION_FORWARD}};
+ my $function_internal_name = \%{$self->{FUNCTION_INTERNAL_NAME}};
+ my $function_module = \%{$self->{FUNCTION_MODULE}};
$$name = shift;
+ my $refspec_files = shift;
+
+ foreach my $file (@$refspec_files) {
+ $self->parse_spec_file("$wine_dir/$file");
+ }
foreach my $file (get_api_files($$name)) {
my $module = $file;
-
- if($options->progress) {
- $output->lazy_progress("$file");
- }
-
$module =~ s/.*?\/([^\/]*?)\.api$/$1/;
- $self->parse_api_file($file,$module);
+
+ if($modules->is_allowed_module($module)) {
+ $self->parse_api_file($file,$module);
+ }
}
+
+ foreach my $forward_name (sort(keys(%$function_forward))) {
+ $$function_forward{$forward_name} =~ /^(\S*):(\S*)\.(\S*)$/;
+ (my $from_module, my $to_module, my $external_name) = ($1, $2, $3);
+ my $internal_name = $$function_internal_name{$external_name};
+ if(defined($internal_name)) {
+ $$function_module{$internal_name} .= " & $from_module";
+ }
+ }
return $self;
}
@@ -88,7 +106,7 @@
my $forbidden = 0;
if($options->progress) {
- $output->progress("$file");
+ $output->lazy_progress("$file");
}
open(IN, "< $wine_dir/$file") || die "$wine_dir/$file: $!\n";
@@ -173,75 +191,6 @@
close(IN);
}
-sub get_spec_file_type {
- my $proto = shift;
- my $class = ref($proto) || $proto;
-
- my $file = shift;
-
- my $module;
- my $type;
-
- open(IN, "< $file") || die "$file: $!\n";
- local $/ = "\n";
- while(<IN>) {
- s/^\s*(.*?)\s*$/$1/;
- s/^(.*?)\s*#.*$/$1/;
- /^$/ && next;
-
- if(/^name\s*(\S*)/) { $module = $1; }
- if(/^type\s*(\w+)/) { $type = $1; }
-
- if(defined($module) && defined($type)) { last; }
- }
- close(IN);
-
- return ($type, $module);
-}
-
-sub read_spec_files {
- my $proto = shift;
- my $class = ref($proto) || $proto;
-
- my $files = shift;
-
- foreach my $file (@$files) {
- (my $type, my $module) = 'winapi'->get_spec_file_type("$wine_dir/$file");
- if($type eq "win16") {
- $win16api->parse_spec_file("$wine_dir/$file");
- } elsif($type eq "win32") {
- $win32api->parse_spec_file("$wine_dir/$file");
- }
- }
-
- foreach my $self ($win16api, $win32api) {
- my $function_forward = \%{$self->{FUNCTION_FORWARD}};
- my $function_internal_name = \%{$self->{FUNCTION_INTERNAL_NAME}};
- my $function_module = \%{$self->{FUNCTION_MODULE}};
-
- foreach my $forward_name (sort(keys(%$function_forward))) {
- $$function_forward{$forward_name} =~ /^(\S*):(\S*)\.(\S*)$/;
- (my $from_module, my $to_module, my $external_name) = ($1, $2, $3);
- my $internal_name = $$function_internal_name{$external_name};
- if(defined($internal_name)) {
- $$function_module{$internal_name} .= " & $from_module";
- }
- }
- }
-
- for my $internal_name ($win32api->all_internal_functions) {
- my $module16 = $win16api->function_internal_module($internal_name);
- my $module32 = $win16api->function_internal_module($internal_name);
- if(defined($module16) &&
- !$win16api->is_function_stub_in_module($module16, $internal_name) &&
- !$win32api->is_function_stub_in_module($module32, $internal_name))
- {
- $win16api->found_shared_internal_function($internal_name);
- $win32api->found_shared_internal_function($internal_name);
- }
- }
-}
-
sub parse_spec_file {
my $self = shift;
diff --git a/tools/winapi_check/winapi_check b/tools/winapi_check/winapi_check
index f327cd5..b7feb37 100755
--- a/tools/winapi_check/winapi_check
+++ b/tools/winapi_check/winapi_check
@@ -98,6 +98,26 @@
@h_files = files_skip(@h_files);
@h_files = files_filter("winelib", @h_files);
+my $all_modules = 0;
+my %complete_module;
+if($options->global) {
+ my @complete_modules = $modules->complete_modules(\@c_files);
+
+ foreach my $module (@complete_modules) {
+ $complete_module{$module}++;
+ }
+
+ my $all_modules = 1;
+ foreach my $module ($modules->all_modules) {
+ if(!$complete_module{$module}) {
+ $all_modules = 0;
+ if($wine_dir eq ".") {
+ $output->write("*.c: module $module is not complete\n");
+ }
+ }
+ }
+}
+
my $progress_current = 0;
my $progress_max = scalar(@c_files);
@@ -289,7 +309,7 @@
(defined($module16) || defined($module32)) &&
$linkage eq "" && defined($statements))
{
- # &winapi_documentation::check_documentation($function);
+ &winapi_documentation::check_documentation($function);
}
if(1) {
@@ -523,7 +543,7 @@
}
}
};
-
+
&winapi_parser::parse_c_file($file, $create_function, $found_function, $create_type, $found_type, $found_preprocessor);
if($options->config_unnessary) {
@@ -536,12 +556,7 @@
}
if($options->global) {
- my @complete_modules = $modules->complete_modules(\@c_files);
- my %complete_module;
-
- foreach my $module (@complete_modules) {
- $complete_module{$module}++;
- }
+ my @complete_modules = sort(keys(%complete_module));
if($options->declared) {
foreach my $module (@complete_modules) {
@@ -575,12 +590,6 @@
}
}
- my $all_modules = 1;
- foreach my $module ($modules->all_modules) {
- if(!$complete_module{$module}) {
- $all_modules = 0;
- }
- }
if($all_modules) {
&winapi_documentation::report_documentation;
diff --git a/tools/winapi_check/winapi_local.pm b/tools/winapi_check/winapi_local.pm
index a4c5231..7203693 100644
--- a/tools/winapi_check/winapi_local.pm
+++ b/tools/winapi_check/winapi_local.pm
@@ -323,7 +323,7 @@
}
}
}
- } else {
+ } elsif($options->cross_call) {
$$functions{$internal_name}->function_called($called_name);
if(!defined($$functions{$called_name})) {
$$functions{$called_name} = 'winapi_function'->new;
diff --git a/tools/winapi_check/winapi_parser.pm b/tools/winapi_check/winapi_parser.pm
index 5aa3b3a..1e6e4af 100644
--- a/tools/winapi_check/winapi_parser.pm
+++ b/tools/winapi_check/winapi_parser.pm
@@ -293,10 +293,6 @@
}
}
- if(!defined($statements)) {
- $statements = "";
- }
-
if($line !~ /^\s*$/) {
$statements .= "$line\n";
}
@@ -408,9 +404,9 @@
$function_line, $linkage, $return_type, $calling_convention, $name,
\@argument_types,\@argument_names,\@argument_documentations);
if($level == 0) {
- &$function_end($statements);
- $statements = undef;
+ &$function_end(undef);
}
+ $statements = "";
} elsif(/__ASM_GLOBAL_FUNC\(\s*(.*?)\s*,/s) {
my @lines = split(/\n/, $&);
my $function_line = $. - scalar(@lines) + 1;
