Minor bugfixes.
This commit is contained in:
parent
0c61028734
commit
ad00529bd8
|
@ -26,13 +26,9 @@ ULONGLONG
|
||||||
|
|
||||||
%ptr
|
%ptr
|
||||||
|
|
||||||
CHAR *
|
|
||||||
DWORD *
|
DWORD *
|
||||||
LPCVOID
|
|
||||||
LPDWORD *
|
LPDWORD *
|
||||||
LPINT
|
|
||||||
LPTHREAD_START_ROUTINE
|
LPTHREAD_START_ROUTINE
|
||||||
LPVOID
|
|
||||||
MSVCRT__INITTERMFUN *
|
MSVCRT__INITTERMFUN *
|
||||||
MSVCRT_EXCEPTION_FRAME *
|
MSVCRT_EXCEPTION_FRAME *
|
||||||
MSVCRT_FILE *
|
MSVCRT_FILE *
|
||||||
|
|
|
@ -35,6 +35,7 @@ WORD
|
||||||
|
|
||||||
int
|
int
|
||||||
short
|
short
|
||||||
|
signed char
|
||||||
unsigned int
|
unsigned int
|
||||||
|
|
||||||
%ptr
|
%ptr
|
||||||
|
|
|
@ -3,13 +3,15 @@
|
||||||
BOOL
|
BOOL
|
||||||
BYTE
|
BYTE
|
||||||
HANDLE
|
HANDLE
|
||||||
|
INT
|
||||||
UINT
|
UINT
|
||||||
WORD
|
WORD
|
||||||
int
|
|
||||||
|
|
||||||
%ptr
|
%ptr
|
||||||
|
|
||||||
CONTEXT86 *
|
CONTEXT86 *
|
||||||
|
DOSRELAY
|
||||||
LPDOSTASK
|
LPDOSTASK
|
||||||
LPVOID
|
LPVOID
|
||||||
|
|
||||||
|
|
|
@ -351,7 +351,7 @@ sub parse_spec_file {
|
||||||
} elsif($$function_module{$internal_name} !~ /$module/) {
|
} elsif($$function_module{$internal_name} !~ /$module/) {
|
||||||
$$function_module{$internal_name} .= " & $module";
|
$$function_module{$internal_name} .= " & $module";
|
||||||
}
|
}
|
||||||
} elsif(/^(\d+|@)\s+forward\s+(\S+)\s+(\S+)\.(\S+)$/) {
|
} elsif(/^(\d+|@)\s+forward(?:\s+(?:-noimport|-norelay|-i386|-ret64))?\s+(\S+)\s+(\S+)\.(\S+)$/) {
|
||||||
$ordinal = $1;
|
$ordinal = $1;
|
||||||
|
|
||||||
my $external_name = $2;
|
my $external_name = $2;
|
||||||
|
|
|
@ -148,6 +148,8 @@ my %includes;
|
||||||
my $header = $1;
|
my $header = $1;
|
||||||
if(-e "$file_dir/$header") {
|
if(-e "$file_dir/$header") {
|
||||||
$includes{$file}{includes}{"$file_dir/$header"}++;
|
$includes{$file}{includes}{"$file_dir/$header"}++;
|
||||||
|
} elsif(-e "$file_dir/../$header") { # FIXME: This is not correct
|
||||||
|
$includes{$file}{includes}{"$file_dir/../$header"}++; # FIXME: This is not correct
|
||||||
} elsif(-e "$wine_dir/include/$header") {
|
} elsif(-e "$wine_dir/include/$header") {
|
||||||
$includes{$file}{includes}{"include/$header"}++;
|
$includes{$file}{includes}{"include/$header"}++;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -50,7 +50,7 @@ sub check_function {
|
||||||
}
|
}
|
||||||
|
|
||||||
my $segmented = 0;
|
my $segmented = 0;
|
||||||
if($implemented_return_kind =~ /^segptr|segstr$/) {
|
if(defined($implemented_return_kind) && $implemented_return_kind =~ /^segptr|segstr$/) {
|
||||||
$segmented = 1;
|
$segmented = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -73,7 +73,7 @@ sub check_function {
|
||||||
} elsif($calling_convention =~ /^VFWAPIV|WINAPIV$/) {
|
} elsif($calling_convention =~ /^VFWAPIV|WINAPIV$/) {
|
||||||
$implemented_calling_convention = "varargs";
|
$implemented_calling_convention = "varargs";
|
||||||
} elsif($calling_convention =~ /^__stdcall|VFWAPI|WINAPI|CALLBACK$/) {
|
} elsif($calling_convention =~ /^__stdcall|VFWAPI|WINAPI|CALLBACK$/) {
|
||||||
if($implemented_return_kind =~ /^longlong$/) {
|
if(defined($implemented_return_kind) && $implemented_return_kind =~ /^longlong$/) {
|
||||||
$implemented_calling_convention = "stdcall"; # FIXME: Check entry flags
|
$implemented_calling_convention = "stdcall"; # FIXME: Check entry flags
|
||||||
} else {
|
} else {
|
||||||
$implemented_calling_convention = "stdcall";
|
$implemented_calling_convention = "stdcall";
|
||||||
|
|
Loading…
Reference in New Issue