Skip to content

W
wine-cw
Commit 0a9633dc authored by Vincent Béron's avatar Vincent Béron Committed by Alexandre Julliard
Browse files
Options

Teach winapi_check about other calling convention shorthands (they all

are really stdcall).
parent 1d5df043
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
tools/winapi_check/winapi_function.pm
View file @ 0a9633dc
......@@ -309,7 +309,7 @@ sub calling_convention16($) {
} elsif(/^(?:VFWAPIV|WINAPIV)$/) {
if(!defined($suffix)) { return undef; }
return "pascal$suffix"; # FIXME: Is this correct?
} elsif(/^(?:__stdcall|VFWAPI|WINAPI|CALLBACK)$/) {
} elsif(/^(?:__stdcall|NET_API_FUNCTION|RPC_ENTRY|VFWAPI|WINAPI|CALLBACK)$/) {
if(!defined($suffix)) { return undef; }
return "pascal$suffix";
} elsif($_ eq "__asm") {
......@@ -327,7 +327,7 @@ sub calling_convention32($) {
return "cdecl";
} elsif(/^(?:VFWAPIV|WINAPIV)$/) {
return "varargs";
} elsif(/^(?:__stdcall|VFWAPI|WINAPI|CALLBACK)$/) {
} elsif(/^(?:__stdcall|NET_API_FUNCTION|RPC_ENTRY|VFWAPI|WINAPI|CALLBACK)$/) {
return "stdcall";
} elsif($_ eq "__asm") {
return "asm";
......
tools/winapi_check/winapi_local.pm
View file @ 0a9633dc
......@@ -85,7 +85,7 @@ sub _check_function($$$$$$) {
$implemented_calling_convention = "cdecl";
} elsif($calling_convention =~ /^(?:VFWAPIV|WINAPIV)$/) {
$implemented_calling_convention = "varargs";
} elsif($calling_convention =~ /^(?:__stdcall|VFWAPI|WINAPI|CALLBACK)$/) {
} elsif($calling_convention =~ /^(?:__stdcall|NET_API_FUNCTION|RPC_ENTRY|VFWAPI|WINAPI|CALLBACK)$/) {
if(defined($implemented_return_kind) && $implemented_return_kind =~ /^(?:s_word|word|void)$/) {
$implemented_calling_convention = "pascal16";
} else {
......@@ -101,7 +101,7 @@ sub _check_function($$$$$$) {
$implemented_calling_convention = "cdecl";
} elsif($calling_convention =~ /^(?:VFWAPIV|WINAPIV)$/) {
$implemented_calling_convention = "varargs";
} elsif($calling_convention =~ /^(?:__stdcall|VFWAPI|WINAPI|CALLBACK)$/) {
} elsif($calling_convention =~ /^(?:__stdcall|NET_API_FUNCTION|RPC_ENTRY|VFWAPI|WINAPI|CALLBACK)$/) {
if(defined($implemented_return_kind) && $implemented_return_kind eq "longlong") {
$implemented_calling_convention = "stdcall"; # FIXME: Check entry flags
} else {
......
tools/winapi_check/winapi_parser.pm
View file @ 0a9633dc
......@@ -370,7 +370,7 @@ sub parse_c_file($$) {
}
next;
} elsif(/(extern\s+|static\s+)?((struct\s+|union\s+|enum\s+|signed\s+|unsigned\s+)?\w+((\s*\*)+\s*|\s+))
((__cdecl|__stdcall|CDECL|VFWAPIV|VFWAPI|WINAPIV|WINAPI|CALLBACK)\s+)?
((__cdecl|__stdcall|CDECL|NET_API_FUNCTION|RPC_ENTRY|VFWAPIV|VFWAPI|WINAPIV|WINAPI|CALLBACK)\s+)?
(\w+(\(\w+\))?)\s*\((.*?)\)\s*(\{|\;)/sx)
{
my @lines = split(/\n/, $&);
......@@ -443,8 +443,8 @@ sub parse_c_file($$) {
((?:struct\s+|union\s+|enum\s+|register\s+|(?:signed\s+|unsigned\s+)
(?:short\s+(?=int)|long\s+(?=int))?)?\w+)\s*
((?:const)?\s*(?:\*\s*(?:const)?\s*?)*)\s*
(?:__cdecl\s+|__stdcall\s+|CALLBACK\s+|WINAPI\s+)?
\(\s*(?:__cdecl|__stdcall|CALLBACK|WINAPI)?\s*\*\s*((?:\w+)?)\s*\)\s*
(?:__cdecl\s+|__stdcall\s+|CALLBACK\s+|CDECL\s+|NET_API_FUNCTION\s+|RPC_ENTRY\s+|VFWAPIV\s+|VFWAPI\s+|WINAPIV\s+|WINAPI\s+)?
\(\s*(?:__cdecl|__stdcall|CALLBACK|CDECL|NET_API_FUNCTION|RPC_ENTRY|VFWAPIV|VFWAPI|WINAPIV|WINAPI)?\s*\*\s*((?:\w+)?)\s*\)\s*
\(\s*(.*?)\s*\)$/x)
{
my $return_type = $1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment