Removed some more trailing whitespace.
diff --git a/tools/winapi/c_function.pm b/tools/winapi/c_function.pm
index 9b82814..b5d32ce 100644
--- a/tools/winapi/c_function.pm
+++ b/tools/winapi/c_function.pm
@@ -36,7 +36,7 @@
local $_ = shift;
if(defined($_)) { $$file = $_; }
-
+
return $$file;
}
@@ -47,7 +47,7 @@
local $_ = shift;
if(defined($_)) { $$begin_line = $_; }
-
+
return $$begin_line;
}
@@ -58,7 +58,7 @@
local $_ = shift;
if(defined($_)) { $$begin_column = $_; }
-
+
return $$begin_column;
}
@@ -69,7 +69,7 @@
local $_ = shift;
if(defined($_)) { $$end_line = $_; }
-
+
return $$end_line;
}
@@ -80,7 +80,7 @@
local $_ = shift;
if(defined($_)) { $$end_column = $_; }
-
+
return $$end_column;
}
@@ -91,7 +91,7 @@
local $_ = shift;
if(defined($_)) { $$linkage = $_; }
-
+
return $$linkage;
}
@@ -102,7 +102,7 @@
local $_ = shift;
if(defined($_)) { $$return_type = $_; }
-
+
return $$return_type;
}
@@ -113,7 +113,7 @@
local $_ = shift;
if(defined($_)) { $$calling_convention = $_; }
-
+
return $$calling_convention;
}
@@ -124,7 +124,7 @@
local $_ = shift;
if(defined($_)) { $$name = $_; }
-
+
return $$name;
}
@@ -135,7 +135,7 @@
local $_ = shift;
if(defined($_)) { $$argument_types = $_; }
-
+
return $$argument_types;
}
@@ -146,7 +146,7 @@
local $_ = shift;
if(defined($_)) { $$argument_names = $_; }
-
+
return $$argument_names;
}
@@ -157,7 +157,7 @@
local $_ = shift;
if(defined($_)) { $$statements_line = $_; }
-
+
return $$statements_line;
}
@@ -168,7 +168,7 @@
local $_ = shift;
if(defined($_)) { $$statements_column = $_; }
-
+
return $$statements_column;
}
@@ -179,7 +179,7 @@
local $_ = shift;
if(defined($_)) { $$statements = $_; }
-
+
return $$statements;
}
diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm
index 451dcdf..7165f90 100644
--- a/tools/winapi/c_parser.pm
+++ b/tools/winapi/c_parser.pm
@@ -221,7 +221,7 @@
$output->write("\n");
$output->prefix("");
}
-
+
if($current) {
$output->write("$$file:$line." . ($column + 1) . ": $context: $message: \\\n$current");
} else {
@@ -493,7 +493,7 @@
if(!&$$found_declaration($begin_line, $begin_column, $end_line, $end_column, $_)) {
return 1;
}
-
+
# Function
my $function = shift;
@@ -543,7 +543,7 @@
} else {
$self->_parse_c_error($_, $line, $column, "declaration");
}
-
+
$$refcurrent = $_;
$$refline = $line;
$$refcolumn = $column;
@@ -588,7 +588,7 @@
my $begin_line = $line;
my $begin_column = $column + 1;
-
+
my $name;
my @arguments;
my @argument_lines;
@@ -596,7 +596,7 @@
if(!$self->parse_c_function_call(\$_, \$line, \$column, \$name, \@arguments, \@argument_lines, \@argument_columns)) {
return 0;
}
-
+
if(&$$found_function_call($begin_line, $begin_column, $line, $column, $name, \@arguments))
{
while(defined(my $argument = shift @arguments) &&
@@ -632,7 +632,7 @@
my $refcurrent = shift;
my $refline = shift;
my $refcolumn = shift;
-
+
local $_ = $$refcurrent;
my $line = $$refline;
my $column = $$refcolumn;
@@ -652,7 +652,7 @@
while($plevel > 0 || $blevel > 0) {
my $match;
$self->_parse_c_until_one_of("#/\\(\\)\\[\\]\\{\\};", \$_, \$line, \$column, \$match);
-
+
if($line != $previous_line) {
&$$found_line($line);
} elsif($column == $previous_column) {
@@ -737,7 +737,7 @@
&$$found_comment($line, $column + 1, $&);
local $_ = $&;
while(s/^.*?\n//) {
- $blank_lines++;
+ $blank_lines++;
}
if($_) {
$column += length($_);
@@ -815,11 +815,11 @@
}
} elsif(s/^;//) {
$declaration .= $&;
- if($blevel == 1 &&
- $declaration !~ /^typedef/ &&
+ if($blevel == 1 &&
+ $declaration !~ /^typedef/ &&
$declaration !~ /^(?:const\s+|extern\s+|static\s+)(?:struct|union)(?:\s+\w+)?\s*\{/s &&
- $declaration =~ /^(?:\w+\s*)*(?:(?:\*\s*)+|\s+)(\w+)\s*\(\s*(?:(?:\w+\s*,\s*)*\w+\s*)?\)(.*?);/s &&
- $1 ne "ICOM_VTABLE" && $2) # K&R
+ $declaration =~ /^(?:\w+\s*)*(?:(?:\*\s*)+|\s+)(\w+)\s*\(\s*(?:(?:\w+\s*,\s*)*\w+\s*)?\)(.*?);/s &&
+ $1 ne "ICOM_VTABLE" && $2) # K&R
{
$self->_parse_c_warning($line, $column, "function $1: warning: function has K&R format");
} elsif($plevel == 1 && $blevel == 1) {
@@ -861,7 +861,7 @@
my $refcolumn = shift;
my $reffunction = shift;
-
+
local $_ = $$refcurrent;
my $line = $$refline;
my $column = $$refcolumn;
@@ -883,10 +883,10 @@
my $begin_column = $column + 1;
my $match;
- while($self->_parse_c('const|inline|extern|static|volatile|' .
+ while($self->_parse_c('const|inline|extern|static|volatile|' .
'signed(?=\\s+char|s+int|\s+long(?:\s+long)?|\s+short)|' .
'unsigned(?=\s+char|\s+int|\s+long(?:\s+long)?|\s+short)',
- \$_, \$line, \$column, \$match))
+ \$_, \$line, \$column, \$match))
{
if($match =~ /^extern|static$/) {
if(!$linkage) {
@@ -907,15 +907,15 @@
return 0;
}
- $self->_parse_c("__cdecl|__stdcall|inline|CDECL|VFWAPIV|VFWAPI|WINAPIV|WINAPI|CALLBACK|WINE_UNUSED|PASCAL",
+ $self->_parse_c("__cdecl|__stdcall|inline|CDECL|VFWAPIV|VFWAPI|WINAPIV|WINAPI|CALLBACK|WINE_UNUSED|PASCAL",
\$_, \$line, \$column, \$calling_convention);
-
- if(!$self->_parse_c('\w+', \$_, \$line, \$column, \$name)) {
- return 0;
+
+ if(!$self->_parse_c('\w+', \$_, \$line, \$column, \$name)) {
+ return 0;
}
if(!$self->parse_c_tuple(\$_, \$line, \$column, \@arguments, \@argument_lines, \@argument_columns)) {
- return 0;
+ return 0;
}
}
@@ -933,7 +933,7 @@
my $end_line = $line;
my $end_column = $column;
-
+
$$refcurrent = $_;
$$refline = $line;
$$refcolumn = $column;
@@ -946,7 +946,7 @@
$function->end_line($end_line);
$function->end_column($end_column);
$function->linkage($linkage);
- $function->return_type($return_type);
+ $function->return_type($return_type);
$function->calling_convention($calling_convention);
$function->name($name);
# if(defined($argument_types)) {
@@ -1036,7 +1036,7 @@
if(!&$$found_preprocessor($begin_line, $begin_column, "$_")) {
return 1;
}
-
+
if(0) {
# Nothing
} elsif(/^\#\s*define\s*(.*?)$/s) {
@@ -1424,10 +1424,10 @@
my $name = "";
my $match;
- while($self->_parse_c('const|inline|extern|static|volatile|' .
+ while($self->_parse_c('const|inline|extern|static|volatile|' .
'signed(?=\\s+char|s+int|\s+long(?:\s+long)?|\s+short)|' .
'unsigned(?=\s+char|\s+int|\s+long(?:\s+long)?|\s+short)',
- \$_, \$line, \$column, \$match))
+ \$_, \$line, \$column, \$match))
{
if($match =~ /^extern|static$/) {
if(!$linkage) {
@@ -1448,7 +1448,7 @@
$finished = 1;
} elsif($self->_parse_c('DEFINE_REGS_ENTRYPOINT_\w+|DPQ_DECL_\w+|HANDLER_DEF|IX86_ONLY', # Wine specific
\$_, \$line, \$column, \$match))
- {
+ {
$type = $match;
$finished = 1;
} elsif($self->_parse_c('(?:struct\s+)?ICOM_VTABLE\s*\(\w+\)', \$_, \$line, \$column, \$match)) {
@@ -1509,7 +1509,7 @@
} else {
return 0;
}
-
+
# $output->write("$type: $name: '$_'\n");
if(1) {
diff --git a/tools/winapi/config.pm b/tools/winapi/config.pm
index 24c3ed4..bda39c7 100644
--- a/tools/winapi/config.pm
+++ b/tools/winapi/config.pm
@@ -159,7 +159,7 @@
my @entries= readdir(DIR);
closedir(DIR);
foreach (@entries) {
- $_ = "$dir/$_";
+ $_ = "$dir/$_";
if(/\.\.?$/) {
# Nothing
} elsif(-d $_) {
@@ -174,8 +174,8 @@
return @files;
}
-sub get_api_files {
- my $name = shift;
+sub get_api_files {
+ my $name = shift;
return _get_files("api", undef, "$winapi_check_dir/$name");
}
sub get_c_files { return _get_files("c", @_); }
diff --git a/tools/winapi/function.pm b/tools/winapi/function.pm
index 92dfab7..fbc3475 100644
--- a/tools/winapi/function.pm
+++ b/tools/winapi/function.pm
@@ -36,7 +36,7 @@
local $_ = shift;
if(defined($_)) { $$file = $_; }
-
+
return $$file;
}
@@ -47,7 +47,7 @@
local $_ = shift;
if(defined($_)) { $$debug_channels = $_; }
-
+
return $$debug_channels;
}
@@ -58,7 +58,7 @@
local $_ = shift;
if(defined($_)) { $$documentation_line = $_; }
-
+
return $$documentation_line;
}
@@ -69,7 +69,7 @@
local $_ = shift;
if(defined($_)) { $$documentation = $_; }
-
+
return $$documentation;
}
@@ -80,7 +80,7 @@
local $_ = shift;
if(defined($_)) { $$function_line = $_; }
-
+
return $$function_line;
}
@@ -91,7 +91,7 @@
local $_ = shift;
if(defined($_)) { $$linkage = $_; }
-
+
return $$linkage;
}
@@ -102,7 +102,7 @@
local $_ = shift;
if(defined($_)) { $$return_type = $_; }
-
+
return $$return_type;
}
@@ -113,7 +113,7 @@
local $_ = shift;
if(defined($_)) { $$calling_convention = $_; }
-
+
return $$calling_convention;
}
@@ -124,7 +124,7 @@
local $_ = shift;
if(defined($_)) { $$internal_name = $_; }
-
+
return $$internal_name;
}
@@ -135,7 +135,7 @@
local $_ = shift;
if(defined($_)) { $$argument_types = $_; }
-
+
return $$argument_types;
}
@@ -146,7 +146,7 @@
local $_ = shift;
if(defined($_)) { $$argument_names = $_; }
-
+
return $$argument_names;
}
@@ -157,7 +157,7 @@
local $_ = shift;
if(defined($_)) { $$argument_documentations = $_; }
-
+
return $$argument_documentations;
}
@@ -168,7 +168,7 @@
local $_ = shift;
if(defined($_)) { $$statements_line = $_; }
-
+
return $$statements_line;
}
@@ -179,7 +179,7 @@
local $_ = shift;
if(defined($_)) { $$statements = $_; }
-
+
return $$statements;
}
diff --git a/tools/winapi/make_filter b/tools/winapi/make_filter
index 1dfc9af..5f7c293 100755
--- a/tools/winapi/make_filter
+++ b/tools/winapi/make_filter
@@ -46,7 +46,7 @@
my $command = $options->make . " " . join(" ", $options->arguments);
open(IN, "($command) 2>&1 |");
-while(<IN>) {
+while(<IN>) {
chomp;
if(!&make_parser::line($_)) {
diff --git a/tools/winapi/make_parser.pm b/tools/winapi/make_parser.pm
index 5d35f39..527ee66 100644
--- a/tools/winapi/make_parser.pm
+++ b/tools/winapi/make_parser.pm
@@ -40,7 +40,7 @@
# global
########################################################################
-my $current;
+my $current;
my $function;
########################################################################
@@ -98,7 +98,7 @@
my $progress = "";
if($directory && $directory ne ".") {
$progress .= "$directory: ";
- }
+ }
if($tool) {
$progress .= "$tool: ";
}
@@ -122,16 +122,16 @@
if($#$write_files >= 0) {
if($#$read_files >= 0) {
$progress .= ", ";
- }
+ }
$progress .= "write[" . join(" ", @{$write_files}) . "]";
}
if($#$remove_files >= 0) {
if($#$read_files >= 0 || $#$write_files >= 0) {
$progress .= ", ";
- }
+ }
$progress .= "remove[" . join(" ", @{$remove_files}) . "]";
}
-
+
$output->progress($progress);
}
@@ -209,7 +209,7 @@
# Nothing
} elsif(/^\*\*\* Error code (\d+)$/) {
# Nothing
- } elsif(/^\*\*\* Warning:\s+/) { #
+ } elsif(/^\*\*\* Warning:\s+/) { #
if(/^File \`(.+?)\' has modification time in the future \((.+?) > \(.+?\)\)$/) {
# Nothing
} else {
@@ -493,7 +493,7 @@
HMENU|HMIDISTRM|HMIDIIN|HMIDIOUT|HMIXER|HMIXEROBJ|HMMIO|HMODULE|
HLINE|HPEN|HPHONE|HPHONEAPP|
HRASCONN|HRGN|HRSRC|HWAVEIN|HWAVEOUT|HWINSTA|HWND|
- SC_HANDLE|WSAEVENT|handle_t|pointer)$/x)
+ SC_HANDLE|WSAEVENT|handle_t|pointer)$/x)
{
$supress = 1;
} else {
diff --git a/tools/winapi/options.pm b/tools/winapi/options.pm
index 5a6ca95..277622b 100644
--- a/tools/winapi/options.pm
+++ b/tools/winapi/options.pm
@@ -102,13 +102,13 @@
} else {
$name = $1;
}
-
+
if($name =~ /^([^-].*)$/) {
$name = $$options_short{$1};
} else {
$name =~ s/^-(.*)$/$1/;
}
-
+
my $prefix;
if(defined($name) && $name =~ /^no-(.*)$/) {
$name = $1;
@@ -130,7 +130,7 @@
my $parser = $$option{parser};
my $refvalue = \${$self->{$key}};
my @parents = ();
-
+
if(defined($$option{parent})) {
if(ref($$option{parent}) eq "ARRAY") {
@parents = @{$$option{parent}};
@@ -139,7 +139,7 @@
}
}
- if(defined($parser)) {
+ if(defined($parser)) {
if(!defined($value)) {
$value = shift @ARGV;
}
@@ -161,7 +161,7 @@
foreach my $parent (@old_parents) {
my $parentkey = $$options_long{$parent}{key};
my $refparentvalue = \${$self->{$parentkey}};
-
+
$$refparentvalue = 1;
if(defined($$options_long{$parent}{parent})) {
@@ -177,9 +177,9 @@
next;
}
}
-
+
if(!$end_of_options && /^-(.*)$/) {
- $output->write("unknown option: $_\n");
+ $output->write("unknown option: $_\n");
$output->write($$options_usage);
exit 1;
} else {
@@ -335,7 +335,7 @@
my $current = ${$self->{$$option{key}}};
my $value = $current;
-
+
my $command;
if(ref($value) ne "HASH") {
if($value) {
@@ -358,7 +358,7 @@
$output->write("Disable ");
} else {
$output->write("Enable ");
- }
+ }
} else {
if($value->{active}) {
$output->write("(Disable) ");
@@ -370,7 +370,7 @@
$output->write("$description (default)\n");
} else {
$output->write("$description\n");
- }
+ }
}
}
@@ -382,7 +382,7 @@
my $refvalue = $self->{$name};
if(!defined($refvalue)) {
- die "<internal>: options.pm: member $name does not exists\n";
+ die "<internal>: options.pm: member $name does not exists\n";
}
if(ref($$refvalue) ne "HASH") {
@@ -392,16 +392,16 @@
}
}
-sub arguments {
+sub arguments {
my $self = shift;
my $arguments = \@{$self->{_ARGUMENTS}};
- return @$arguments;
+ return @$arguments;
}
sub c_files {
- my $self = shift;
+ my $self = shift;
my $c_files = \@{$self->{_C_FILES}};
@@ -412,8 +412,8 @@
return @$c_files;
}
-sub h_files {
- my $self = shift;
+sub h_files {
+ my $self = shift;
my $h_files = \@{$self->{_H_FILES}};
@@ -425,7 +425,7 @@
}
sub directories {
- my $self = shift;
+ my $self = shift;
my $directories = \@{$self->{_DIRECTORIES}};
diff --git a/tools/winapi/output.pm b/tools/winapi/output.pm
index f5cf793..259b9ef 100644
--- a/tools/winapi/output.pm
+++ b/tools/winapi/output.pm
@@ -126,7 +126,7 @@
my $progress_enabled = \${$self->{PROGRESS_ENABLED}};
my $progress = \${$self->{PROGRESS}};
my $last_progress = \${$self->{LAST_PROGRESS}};
-
+
if($$progress_enabled) {
my $prefix = "";
my $suffix = "";
@@ -134,7 +134,7 @@
for (1..length($$last_progress)) {
$prefix .= "";
}
-
+
my $diff = length($$last_progress)-length($$progress);
if($diff > 0) {
for (1..$diff) {
diff --git a/tools/winapi/setup.pm b/tools/winapi/setup.pm
index 6ec13a5..16c9ade 100644
--- a/tools/winapi/setup.pm
+++ b/tools/winapi/setup.pm
@@ -30,7 +30,7 @@
use vars qw($current_dir $wine_dir $winapi_dir $winapi_check_dir);
- my $tool = $0;
+ my $tool = $0;
$tool =~ s%^(?:.*?/)?([^/]+)$%$1%;
if(defined($current_dir) && defined($wine_dir) &&
@@ -45,8 +45,8 @@
$wine_dir = $1;
} else {
$wine_dir = ".";
-
- }
+
+ }
require Cwd;
my $cwd = Cwd::cwd();
diff --git a/tools/winapi/trampoline b/tools/winapi/trampoline
index cd04865..7bdf13f 100755
--- a/tools/winapi/trampoline
+++ b/tools/winapi/trampoline
@@ -21,7 +21,7 @@
require Cwd;
-my $tool = $0;
+my $tool = $0;
$tool =~ s%^(?:.*?/)?([^/]+)$%$1%;
$_ = Cwd::cwd();
diff --git a/tools/winapi/util.pm b/tools/winapi/util.pm
index 2d3c86f..dfbf834 100644
--- a/tools/winapi/util.pm
+++ b/tools/winapi/util.pm
@@ -105,7 +105,7 @@
}
return $result;
-}
+}
########################################################################
# normalize_set
@@ -116,7 +116,7 @@
if(!defined($_)) {
return undef;
}
-
+
my %hash = ();
foreach my $key (split(/\s*&\s*/)) {
$hash{$key}++;
diff --git a/tools/winapi/winapi_check_options.pm b/tools/winapi/winapi_check_options.pm
index 389f41d..03c060e 100644
--- a/tools/winapi/winapi_check_options.pm
+++ b/tools/winapi/winapi_check_options.pm
@@ -50,7 +50,7 @@
"spec-mismatch" => { default => 0, description => "spec file mismatch checking" },
"local" => { default => 1, description => "local checking" },
- "module" => {
+ "module" => {
default => { active => 1, filter => 0, hash => {} },
parent => "local",
parser => \&parser_comma_list,
@@ -77,11 +77,11 @@
"misplaced" => { default => 1, parent => "local", description => "check for misplaced functions" },
"statements" => { default => 0, parent => "local", description => "check for statements inconsistances" },
"cross-call" => { default => 0, parent => "statements", description => "check for cross calling functions" },
- "cross-call-win32-win16" => {
+ "cross-call-win32-win16" => {
default => 0, parent => "cross-call", description => "check for cross calls between win32 and win16"
},
- "cross-call-unicode-ascii" => {
- default => 0, parent => "cross-call", description => "check for cross calls between Unicode and ASCII"
+ "cross-call-unicode-ascii" => {
+ default => 0, parent => "cross-call", description => "check for cross calls between Unicode and ASCII"
},
"debug-messages" => { default => 0, parent => "statements", description => "check for debug messages inconsistances" },
@@ -98,12 +98,12 @@
"documentation" => {
default => 1,
- parent => "local",
+ parent => "local",
description => "check for documentation inconsistances"
},
- "documentation-pedantic" => {
- default => 0,
- parent => "documentation",
+ "documentation-pedantic" => {
+ default => 0,
+ parent => "documentation",
description => "be pendantic when checking for documentation inconsistances"
},
@@ -113,11 +113,11 @@
description => "check for arguments documentation inconsistances\n"
},
"documentation-comment-indent" => {
- default => 0,
+ default => 0,
parent => "documentation", description => "check for documentation comment indent inconsistances"
},
"documentation-comment-width" => {
- default => 0,
+ default => 0,
parent => "documentation", description => "check for documentation comment width inconsistances"
},
"documentation-name" => {
@@ -168,23 +168,23 @@
sub report_module {
my $self = shift;
my $refvalue = $self->{MODULE};
-
+
my $name = shift;
if(defined($name)) {
- return $$refvalue->{active} && (!$$refvalue->{filter} || $$refvalue->{hash}->{$name});
+ return $$refvalue->{active} && (!$$refvalue->{filter} || $$refvalue->{hash}->{$name});
} else {
return 0;
- }
+ }
}
sub report_argument_forbidden {
- my $self = shift;
+ my $self = shift;
my $refargument_forbidden = $self->{ARGUMENT_FORBIDDEN};
my $type = shift;
- return $$refargument_forbidden->{active} && (!$$refargument_forbidden->{filter} || $$refargument_forbidden->{hash}->{$type});
+ return $$refargument_forbidden->{active} && (!$$refargument_forbidden->{filter} || $$refargument_forbidden->{hash}->{$type});
}
sub report_argument_kind {
@@ -193,7 +193,7 @@
my $kind = shift;
- return $$refargument_kind->{active} && (!$$refargument_kind->{filter} || $$refargument_kind->{hash}->{$kind});
+ return $$refargument_kind->{active} && (!$$refargument_kind->{filter} || $$refargument_kind->{hash}->{$kind});
}
diff --git a/tools/winapi/winapi_extract b/tools/winapi/winapi_extract
index a480b71..bb509e9 100755
--- a/tools/winapi/winapi_extract
+++ b/tools/winapi/winapi_extract
@@ -79,7 +79,7 @@
$module2type{$module} = $type;
} elsif(/^\d+|@/) {
$header = 0;
- $lookahead = 1;
+ $lookahead = 1;
}
next;
}
@@ -152,7 +152,7 @@
$output->write("$external_name ($module.$ordinal) already exists\n");
}
}
-
+
if($options->debug) {
$output->write("$external_name ($module.$ordinal)\n");
}
@@ -208,7 +208,7 @@
my $internal_name = $function->internal_name;
$functions{$internal_name} = $function;
-
+
$output->progress("$file (file $progress_current of $progress_max): $internal_name");
$output->prefix_callback(sub { return $function->prefix; });
@@ -286,14 +286,14 @@
foreach my $module (keys(%specifications)) {
my $spec_file = $module2spec_file{$module};
my $type = $module2type{$module};
-
+
if(!defined($spec_file) || !defined($type)) {
$output->write("$module: doesn't exist\n");
next;
}
-
+
$spec_file .= "2";
-
+
$output->progress("$spec_file");
open(OUT, "> $wine_dir/$spec_file");
@@ -304,7 +304,7 @@
print OUT "init " . $function->internal_name . "\n";
}
print OUT "\n";
-
+
my %debug_channels;
if(exists($specifications{$module}{init})) {
my $function = $specifications{$module}{init}{function};
@@ -319,7 +319,7 @@
}
}
foreach my $name (sort(keys(%{$specifications{$module}{unfixed}}))) {
- my $function = $specifications{$module}{unfixed}{$name}{function};
+ my $function = $specifications{$module}{unfixed}{$name}{function};
foreach my $debug_channel (@{$function->debug_channels}) {
$debug_channels{$debug_channel}++;
}
@@ -332,11 +332,11 @@
}
my @debug_channels = sort(keys(%debug_channels));
- if($#debug_channels >= 0) {
+ if($#debug_channels >= 0) {
print OUT "debug_channels (" . join(" ", @debug_channels) . ")\n";
print OUT "\n";
}
-
+
my $empty = 1;
if(!$empty) {
@@ -345,8 +345,8 @@
}
foreach my $external_name (sort(keys(%{$specifications{$module}{unknown}}))) {
my $entry = $specifications{$module}{unknown}{$external_name};
- my $ordinal = $entry->{ordinal};
- my $function = $entry->{function};
+ my $ordinal = $entry->{ordinal};
+ my $function = $entry->{function};
print OUT "# ";
output_function(\*OUT, $type, $ordinal, $external_name, $function);
$empty = 0;
@@ -358,8 +358,8 @@
}
foreach my $ordinal (sort {$a <=> $b} keys(%{$specifications{$module}{fixed}})) {
my $entry = $specifications{$module}{fixed}{$ordinal};
- my $external_name = $entry->{external_name};
- my $function = $entry->{function};
+ my $external_name = $entry->{external_name};
+ my $function = $entry->{function};
output_function(\*OUT, $type, $ordinal, $external_name, $function);
$empty = 0;
}
@@ -387,7 +387,7 @@
my %module_stub_count;
my %module_total_count;
-
+
foreach my $internal_name ($winapi->all_internal_functions,$winapi->all_functions_stub) {
foreach my $module (split(/ \& /, $winapi->function_internal_module($internal_name))) {
if($winapi->is_function_stub_in_module($module, $internal_name)) {
@@ -413,11 +413,11 @@
if(!defined($total)) { $total = 0;}
my $stubs = $real_stubs + $pseudo_stubs;
-
+
$output->write("*.c: $module: ");
$output->write("$stubs of $total functions are stubs ($real_stubs real, $pseudo_stubs pseudo)\n");
}
- }
+ }
}
if($options->winetest) {
@@ -448,9 +448,9 @@
my $n = 0;
foreach my $entry (@entries) {
- my $external_name = $entry->{external_name};
- my $ordinal = $entry->{ordinal};
- my $function = $entry->{function};
+ my $external_name = $entry->{external_name};
+ my $ordinal = $entry->{ordinal};
+ my $function = $entry->{function};
my $return_kind;
my $calling_convention;
diff --git a/tools/winapi/winapi_fixup b/tools/winapi/winapi_fixup
index 83c96c7..05a0baf 100755
--- a/tools/winapi/winapi_fixup
+++ b/tools/winapi/winapi_fixup
@@ -27,7 +27,7 @@
use config qw(
&file_type &files_filter
&file_skip &files_skip
- &file_normalize
+ &file_normalize
&get_spec_files
$current_dir $wine_dir $winapi_dir $winapi_check_dir
);
@@ -68,9 +68,9 @@
$_ = <IN>;
close(IN);
}
-
+
my $max_line = 0;
- {
+ {
local $_ = $_;
while(s/^.*?\n//) { $max_line++; }
if($_) { $max_line++; }
@@ -115,7 +115,7 @@
return 1;
};
- $parser->set_found_preprocessor_callback($found_preprocessor);
+ $parser->set_found_preprocessor_callback($found_preprocessor);
my $found_comment = sub {
my $begin_line = shift;
@@ -127,7 +127,7 @@
return 1;
};
- $parser->set_found_comment_callback($found_comment);
+ $parser->set_found_comment_callback($found_comment);
my $found_line = sub {
$line = shift;
@@ -152,7 +152,7 @@
return 1;
};
- $parser->set_found_declaration_callback($found_declaration);
+ $parser->set_found_declaration_callback($found_declaration);
my $found_function = sub {
$function = shift;
@@ -168,11 +168,11 @@
if($options->documentation) {
# fixup_documentation($function, $editor);
}
-
+
if($options->statements) {
fixup_statements($function, $editor);
}
-
+
my $statements = $function->statements;
if(!defined($statements)) {
$function = undef;
@@ -183,7 +183,7 @@
return 0;
};
-
+
$parser->set_found_function_callback($found_function);
my $found_variable = sub {
@@ -194,11 +194,11 @@
my $name = shift;
# $output->write("$begin_line.$begin_column: $linkage $type $name = /* ... */\n");
-
+
return 1;
};
- $parser->set_found_variable_callback($found_variable);
+ $parser->set_found_variable_callback($found_variable);
my $found_function_call = sub {
my $begin_line = shift;
@@ -227,4 +227,3 @@
$editor->flush;
}
-
diff --git a/tools/winapi/winapi_fixup_documentation.pm b/tools/winapi/winapi_fixup_documentation.pm
index 91d7e73..c8ea86c 100644
--- a/tools/winapi/winapi_fixup_documentation.pm
+++ b/tools/winapi/winapi_fixup_documentation.pm
@@ -48,14 +48,14 @@
my $calling_convention = $function->calling_convention;
my $internal_name = $function->internal_name;
my $statements = $function->statements;
-
+
if($linkage eq "static" ||
($linkage eq "extern" && !defined($statements)) ||
($linkage eq "" && !defined($statements)))
{
return;
}
-
+
my @external_names = $function->external_names;
if($#external_names < 0) {
return;
@@ -65,7 +65,7 @@
$documentation = undef;
}
$documentation_line_used{$file}{$documentation_line}++;
-
+
my @module_ordinal_entries = ();
foreach my $entry2 ($function->get_all_module_ordinal) {
(my $external_name2, my $module2, my $ordinal2) = @$entry2;
@@ -74,21 +74,21 @@
($win32api->is_module($module2) && !$win32api->is_function_stub_in_module($module2, $external_name2))) &&
$modules->is_allowed_module_in_file($module2, "$current_dir/$file"))
{
- push @module_ordinal_entries, $entry2;
+ push @module_ordinal_entries, $entry2;
}
}
-
+
my $spec_modified = 0;
-
+
if($options->stub && defined($documentation)) {
my $calling_convention16 = $function->calling_convention16;
my $calling_convention32 = $function->calling_convention32;
-
+
foreach my $winapi (@winapis) {
my @entries = ();
my $module = $winapi->function_internal_module($internal_name);
my $ordinal = $winapi->function_internal_ordinal($internal_name);
-
+
if($winapi->is_function_stub_in_module($module, $internal_name)) {
my $external_name = $internal_name;
if($winapi->name eq "win16") {
@@ -99,14 +99,14 @@
}
push @entries, [$external_name, $module, $ordinal];
}
-
+
foreach (split(/\n/, $documentation)) {
if(/^\s*\*\s*(\S+)\s*[\(\[]\s*(\w+)\s*\.\s*([^\s\)\]]*)\s*[\)\]].*?$/) {
my $external_name = $1;
my $module = lc($2);
my $ordinal = $3;
-
- if($external_name ne "@" &&
+
+ if($external_name ne "@" &&
$winapi->is_module($module) &&
$winapi->is_function_stub_in_module($module, $external_name) &&
$internal_name !~ /^\U$module\E_\Q$external_name\E$/)
@@ -115,16 +115,16 @@
}
}
}
-
+
foreach my $entry (@entries) {
(my $external_name, my $module, my $ordinal) = @$entry;
-
+
my $refargument_types = $function->argument_types;
-
+
if(!defined($refargument_types)) {
next;
}
-
+
my $abort = 0;
my $n;
my @argument_kinds = map {
@@ -133,7 +133,7 @@
if($type ne "..." && !defined($kind = $winapi->translate_argument($type))) {
$output->write("no translation defined: " . $type . "\n");
}
-
+
# FIXME: Kludge
if(defined($kind) && $kind eq "longlong") {
$n += 2;
@@ -154,7 +154,7 @@
"undef";
}
} @$refargument_types;
-
+
my $search = "^\\s*$ordinal\\s+stub\\s+$external_name\\s*(?:#.*?)?\$";
my $replace;
if($winapi->name eq "win16") {
@@ -167,28 +167,28 @@
$spec_modified = 1;
$editor->replace_spec_file($module, $search, $replace);
}
- }
+ }
}
}
-
+
my %found_external_names;
foreach my $external_name (@external_names) {
$found_external_names{$external_name} = {};
}
-
+
my $documentation_modified = 0;
-
+
if(!$spec_modified &&
(defined($documentation) && !$documentation_modified) &&
- ($options->documentation_name || $options->documentation_ordinal ||
+ ($options->documentation_name || $options->documentation_ordinal ||
$options->documentation_missing))
{
local $_;
-
+
my $line3;
my $search;
my $replace;
-
+
my $count = 0;
my $line2 = $documentation_line - 1;
foreach (split(/\n/, $documentation)) {
@@ -198,14 +198,14 @@
my $external_name = $2;
my $part3 = $3;
my $part4 = $4;
-
+
$part4 =~ s/\s*$//;
-
+
my @entries = ();
while($part3 =~ s/^\s*([\(\[]\s*(\w+)(?:\s*\.\s*([^\s\)\]]*)\s*)?[\)\]])//) {
push @entries, [$1, $2, $3];
}
-
+
my $found = 0;
foreach my $external_name2 (@external_names) {
if($external_name eq $external_name2) {
@@ -217,28 +217,28 @@
last;
}
}
-
+
my $replaced = 0;
my $replace2 = "";
foreach my $entry (@entries) {
my $part12 = $part1;
(my $part32, my $module, my $ordinal) = @$entry;
-
+
foreach my $entry2 (@module_ordinal_entries) {
(my $external_name2, my $module2, my $ordinal2) = @$entry2;
-
- if($options->documentation_name && lc($module) eq $module2 &&
- $external_name ne $external_name2)
+
+ if($options->documentation_name && lc($module) eq $module2 &&
+ $external_name ne $external_name2)
{
if(!$found && $part12 =~ s/\b\Q$external_name\E\b/$external_name2/) {
$external_name = $external_name2;
$replaced++;
}
}
-
+
if($options->documentation_ordinal &&
$external_name eq $external_name2 &&
- lc($module) eq $module2 &&
+ lc($module) eq $module2 &&
($#entries > 0 || !defined($ordinal) || ($ordinal ne $ordinal2)))
{
if(defined($ordinal)) {
@@ -255,7 +255,7 @@
if($replace2) { $replace2 .= "\n"; }
$replace2 .= "$part12$part32$part4";
}
-
+
if($replaced > 0) {
$line3 = $line2;
$search = "^\Q$_\E\$";
@@ -299,7 +299,7 @@
my $part3;
my $part4;
my $line3 = 0;
-
+
my $line2 = $documentation_line - 1;
foreach (split(/\n/, $documentation)) {
$line2++;
@@ -310,14 +310,14 @@
$part4 = $4;
$part2 =~ s/\S/ /g;
-
+
$line3 = $line2 + 1;
}
}
foreach my $entry2 (@module_ordinal_entries) {
(my $external_name2, my $module2, my $ordinal2) = @$entry2;
-
+
my $found = 0;
foreach my $external_name (keys(%found_external_names)) {
foreach my $module3 (keys(%{$found_external_names{$external_name}})) {
@@ -327,9 +327,9 @@
}
}
# FIXME: Not 100% correct
- if(!$found &&
- !$win16api->is_function_stub_in_module($module2, $internal_name) &&
- !$win32api->is_function_stub_in_module($module2, $internal_name))
+ if(!$found &&
+ !$win16api->is_function_stub_in_module($module2, $internal_name) &&
+ !$win32api->is_function_stub_in_module($module2, $internal_name))
{
if($line3 > 0) {
$documentation_modified = 1;
@@ -342,7 +342,7 @@
}
}
- if(!$documentation_modified &&
+ if(!$documentation_modified &&
defined($documentation) &&
$options->documentation_wrong)
{
@@ -353,14 +353,14 @@
my $external_name = $1;
my $module = $2;
my $ordinal = $3;
-
+
my $found = 0;
foreach my $entry2 (@module_ordinal_entries) {
(my $external_name2, my $module2, my $ordinal2) = @$entry2;
-
+
if($external_name eq $external_name2 &&
lc($module) eq $module2 &&
- $ordinal eq $ordinal2)
+ $ordinal eq $ordinal2)
{
$found = 1;
}
diff --git a/tools/winapi/winapi_fixup_editor.pm b/tools/winapi/winapi_fixup_editor.pm
index 6a09d90..3700f7d 100644
--- a/tools/winapi/winapi_fixup_editor.pm
+++ b/tools/winapi/winapi_fixup_editor.pm
@@ -64,7 +64,7 @@
my $replace = shift;
my $file = \${$self->{FILE}};
-
+
my $line = $begin_line;
my $action = {};
@@ -225,7 +225,7 @@
my $search = $substitute_line{$.}{search};
my $replace = $substitute_line{$.}{replace};
-
+
if(defined($search) && defined($replace)) {
my $modified2 = 0;
if(s/$search/$replace/) {
@@ -239,14 +239,14 @@
my $search2;
my $replace2;
if(!$modified2) {
- $search2 = "unmatched search";
- $replace2 = "unmatched replace";
+ $search2 = "unmatched search";
+ $replace2 = "unmatched replace";
} else {
- $search2 = "search";
+ $search2 = "search";
$replace2 = "replace";
}
$output->write("$file: $.: $search2 : '$search'\n");
-
+
my @replace2 = split(/\n/, $replace);
if($#replace2 > 0) {
$output->write("$file: $.: $replace2: \\\n");
@@ -288,7 +288,7 @@
}
foreach my $module (sort(keys(%spec_file))) {
- my $file;
+ my $file;
foreach my $winapi (@winapis) {
$file = ($winapi->module_file($module) || $file);
}
@@ -302,7 +302,7 @@
my $editor = sub {
local *IN = shift;
local *OUT = shift;
-
+
my $modified = 0;
while(<IN>) {
chomp;
@@ -328,7 +328,7 @@
print OUT "$_\n";
}
-
+
return $modified;
};
@@ -362,7 +362,7 @@
my $line = shift;
my $pattern = shift;
-
+
$delete_line{$line} = $pattern;
}
@@ -371,7 +371,7 @@
my $line = shift;
my $insert = shift;
-
+
$insert_line{$line} = $insert;
}
@@ -381,7 +381,7 @@
my $line = shift;
my $search = shift;
my $replace = shift;
-
+
$substitute_line{$line}{search} = $search;
$substitute_line{$line}{replace} = $replace;
}
@@ -392,15 +392,15 @@
my $module = shift;
my $search = shift;
my $replace = shift;
-
+
my $substitute = {};
$substitute->{search} = $search;
$substitute->{replace} = $replace;
-
+
if(!defined($spec_file{$module})) {
$spec_file{$module} = [];
}
-
+
push @{$spec_file{$module}}, $substitute;
}
diff --git a/tools/winapi/winapi_fixup_options.pm b/tools/winapi/winapi_fixup_options.pm
index 94be80c..fe496b4 100644
--- a/tools/winapi/winapi_fixup_options.pm
+++ b/tools/winapi/winapi_fixup_options.pm
@@ -52,7 +52,7 @@
"global" => { default => 1, description => "global fixup" },
- "modify" => { default => 0, description => "actually perform the fixups" },
+ "modify" => { default => 0, description => "actually perform the fixups" },
);
my %options_short = (
diff --git a/tools/winapi/winapi_fixup_statements.pm b/tools/winapi/winapi_fixup_statements.pm
index fb7c3ec..80185dc 100644
--- a/tools/winapi/winapi_fixup_statements.pm
+++ b/tools/winapi/winapi_fixup_statements.pm
@@ -67,7 +67,7 @@
my $line = 1;
my $column = 0;
if($parser->parse_c_function_call(\$_, \$line, \$column, \$name, \@arguments, \@argument_lines, \@argument_columns) &&
- $name =~ /^MAKE(?:LONG|LPARAM|LRESULT|WPARAM)$/)
+ $name =~ /^MAKE(?:LONG|LPARAM|LRESULT|WPARAM)$/)
{
$low = $arguments[0];
$high = $arguments[1];
@@ -95,7 +95,7 @@
if($msg !~ /^WM_/) {
return undef;
} elsif($msg =~ /^(?:WM_BEGINDRAG|WM_ENTERMENULOOP|WM_EXITMENULOOP|WM_HELP|
- WM_ISACTIVEICON|WM_LBTRACKPOINT|WM_NEXTMENU)$/x)
+ WM_ISACTIVEICON|WM_LBTRACKPOINT|WM_NEXTMENU)$/x)
{
return undef;
} elsif($msg =~ /^WM_(?:GET|SET)TEXT$/) {
@@ -284,13 +284,13 @@
my $statements_line = $function->statements_line;
my $statements_column = $function->statements_column;
my $statements = $function->statements;
-
+
if(!defined($statements)) {
return;
}
my $parser = new c_parser($file);
-
+
my $found_function_call = sub {
my $begin_line = shift;
my $begin_column = shift;
@@ -298,7 +298,7 @@
my $end_column = shift;
my $name = shift;
my $arguments = shift;
-
+
foreach my $argument (@$arguments) {
$argument =~ s/^\s*(.*?)\s*$/$1/;
}
@@ -311,7 +311,7 @@
} else {
$fixup_function_call = \&_fixup_user_message;
}
- }
+ }
if(defined($fixup_function_call)) {
my $replace = &$fixup_function_call($name, $arguments);
@@ -326,11 +326,11 @@
return 0;
};
-
+
$parser->set_found_function_call_callback($found_function_call);
-
+
my $line = $statements_line;
- my $column = 0;
+ my $column = 0;
if(!$parser->parse_c_statements(\$statements, \$line, \$column)) {
$output->write("error: can't parse statements\n");
}
diff --git a/tools/winapi/winapi_module_user.pm b/tools/winapi/winapi_module_user.pm
index e2df1fa..7c54bf7 100644
--- a/tools/winapi/winapi_module_user.pm
+++ b/tools/winapi/winapi_module_user.pm
@@ -110,9 +110,9 @@
id => 0x0301, result => "void", wparam => "void", lparam => "void" },
WM_COPYDATA => {
id => 0x004a, result => "", wparam => "", lparam => "" },
- WM_COMPACTING => {
+ WM_COMPACTING => {
id => 0x0041, result => "void", wparam => "UINT", lparam => "void" },
- WM_COMPAREITEM => {
+ WM_COMPAREITEM => {
id => 0x0039, result => "int", wparam => "UINT", lparam => "const COMPAREITEMSTRUCT *" },
WM_CREATE => {
id => 0x0001, result => "BOOL", wparam => "void", lparam => "LPCREATESTRUCT" },
@@ -143,7 +143,7 @@
id => 0x0103, result => "void", wparam => "TCHAR", lparam => ["", ""] },
WM_DEVICECHANGE => {
id => 0x0219, result => "BOOL", wparam => "UINT", lparam => "DWORD" },
- WM_DELETEITEM => {
+ WM_DELETEITEM => {
id => 0x002d, result => "void", wparam => "UINT", lparam => "const DELETEITEMSTRUCT *" },
WM_DEVMODECHANGE => {
id => 0x001b, result => "void", wparam => "void", lparam => "LPCTSTR" },
@@ -551,7 +551,7 @@
id => 0x0046, result => "BOOL", wparam => "void", lparam => "LPWINDOWPOS" },
WM_WINDOWPOSCHANGED => {
id => 0x0047, result => "void", wparam => "void", lparam => "const LPWINDOWPOS" },
- WM_WININICHANGE => {
+ WM_WININICHANGE => {
id => 0x001a, result => "void", wparam => "void", lparam => "LPCTSTR" }
};
@@ -699,7 +699,7 @@
if(!s/^\#\s*define\s*// || !/^FORWARD_WM_/) {
return 1;
}
-
+
my $name;
if(s/^FORWARD_(\w+)\([^\)]*\)\s*(.*?)\s*$/$2/s) {
$name = $1;
@@ -749,7 +749,7 @@
die "$name: '$_'";
}
}
- # $output->write("$1: $_\n");
+ # $output->write("$1: $_\n");
} else {
die "$name: '$_'";
}
@@ -763,7 +763,7 @@
return "";
}
}
-
+
};
my @entries = (
@@ -813,7 +813,7 @@
} else {
die "$name: '$_'";
}
- }
+ }
# $output->write("$result: '@names', '$wparam', '$lparam'\n");
@@ -878,7 +878,7 @@
if(/^\#\s*define\s+(WM_\w+)\s+(0x[0-9a-fA-F]+)\s*$/) {
my $name = $1;
my $id = lc($2);
-
+
if(exists($$message{$name})) {
my $id2 = sprintf("0x%04x", $$message{$name}{id});
if($id ne $id2) {
