Update winapi and c2man so they know about -ret16. Remove support for
the obsolete pascal16 and -noimport. Update modules.dat so winapi knows about the new dlls.
This commit is contained in:
parent
4db578fa72
commit
7aa0f3c41d
|
@ -252,11 +252,11 @@ sub process_spec_file
|
||||||
|
|
||||||
for ($call_convention)
|
for ($call_convention)
|
||||||
{
|
{
|
||||||
/^(cdecl|stdcall|varargs|pascal|pascal16)$/
|
/^(cdecl|stdcall|varargs|pascal)$/
|
||||||
&& do { $spec_details->{NUM_FUNCS}++; last; };
|
&& do { $spec_details->{NUM_FUNCS}++; last; };
|
||||||
/^(variable|equate)$/
|
/^(variable|equate)$/
|
||||||
&& do { $spec_details->{NUM_VARS}++; last; };
|
&& do { $spec_details->{NUM_VARS}++; last; };
|
||||||
/^(forward|extern)$/
|
/^(extern)$/
|
||||||
&& do { $spec_details->{NUM_FORWARDS}++; last; };
|
&& do { $spec_details->{NUM_FORWARDS}++; last; };
|
||||||
/^stub$/ && do { $spec_details->{NUM_STUBS}++; last; };
|
/^stub$/ && do { $spec_details->{NUM_STUBS}++; last; };
|
||||||
if ($opt_verbose > 0)
|
if ($opt_verbose > 0)
|
||||||
|
|
|
@ -270,8 +270,8 @@ sub parse_spec_file {
|
||||||
|
|
||||||
my $ordinal;
|
my $ordinal;
|
||||||
if(/^(\d+|@)\s+
|
if(/^(\d+|@)\s+
|
||||||
(pascal|pascal16|stdcall|cdecl|varargs)\s+
|
(pascal|stdcall|cdecl|varargs)\s+
|
||||||
((?:(?:-noimport|-noname|-norelay|-i386|-ret64|-register|-interrupt|-private)\s+)*)(\S+)\s*\(\s*(.*?)\s*\)\s*(\S*)$/x)
|
((?:(?:-noname|-norelay|-i386|-ret16|-ret64|-register|-interrupt|-private)\s+)*)(\S+)\s*\(\s*(.*?)\s*\)\s*(\S*)$/x)
|
||||||
{
|
{
|
||||||
my $calling_convention = $2;
|
my $calling_convention = $2;
|
||||||
my $flags = $3;
|
my $flags = $3;
|
||||||
|
@ -380,7 +380,7 @@ sub parse_spec_file {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} elsif(/^(\d+|@)\s+stub(?:\s+(-noimport|-noname|-norelay|-i386|-ret64|-private))?\s+(\S+)$/) {
|
} elsif(/^(\d+|@)\s+stub(?:\s+(-noname|-norelay|-i386|-ret16|-ret64|-private))?\s+(\S+)$/) {
|
||||||
$ordinal = $1;
|
$ordinal = $1;
|
||||||
|
|
||||||
my $flags = $2;
|
my $flags = $2;
|
||||||
|
@ -429,7 +429,7 @@ sub parse_spec_file {
|
||||||
} else { # if($$function_external_module{$external_name} !~ /$module/) {
|
} else { # if($$function_external_module{$external_name} !~ /$module/) {
|
||||||
$$function_external_module{$external_name} .= " & $module";
|
$$function_external_module{$external_name} .= " & $module";
|
||||||
}
|
}
|
||||||
} elsif(/^(\d+|@)\s+extern(?:\s+(?:-noimport|-norelay|-i386|-ret64))?\s+(\S+)\s*(\S*)$/) {
|
} elsif(/^(\d+|@)\s+extern(?:\s+(?:-norelay|-i386|-ret16|-ret64))?\s+(\S+)\s*(\S*)$/) {
|
||||||
$ordinal = $1;
|
$ordinal = $1;
|
||||||
|
|
||||||
my $external_name = $2;
|
my $external_name = $2;
|
||||||
|
|
|
@ -193,7 +193,7 @@ dlls/imm32
|
||||||
|
|
||||||
dlls/iphlpapi
|
dlls/iphlpapi
|
||||||
|
|
||||||
% dlls/kernel/comm.spec
|
% dlls/kernel/comm.drv.spec
|
||||||
|
|
||||||
% dlls/kernel/krnl386.exe.spec
|
% dlls/kernel/krnl386.exe.spec
|
||||||
|
|
||||||
|
@ -255,7 +255,7 @@ dlls/mswsock
|
||||||
|
|
||||||
dlls/kernel
|
dlls/kernel
|
||||||
|
|
||||||
% dlls/kernel/system.spec
|
% dlls/kernel/system.drv.spec
|
||||||
|
|
||||||
memory
|
memory
|
||||||
misc
|
misc
|
||||||
|
@ -315,6 +315,14 @@ dlls/msacm/msg711
|
||||||
|
|
||||||
dlls/msacm/winemp3
|
dlls/msacm/winemp3
|
||||||
|
|
||||||
|
% dlls/mshtml/mshtml.spec
|
||||||
|
|
||||||
|
dlls/mshtml
|
||||||
|
|
||||||
|
% dlls/msi/msi.spec
|
||||||
|
|
||||||
|
dlls/msi
|
||||||
|
|
||||||
% dlls/msnet32/msnet32.spec
|
% dlls/msnet32/msnet32.spec
|
||||||
|
|
||||||
dlls/msnet32
|
dlls/msnet32
|
||||||
|
@ -496,17 +504,17 @@ dlls/urlmon
|
||||||
|
|
||||||
dlls/user/dde
|
dlls/user/dde
|
||||||
|
|
||||||
% dlls/user/display.spec
|
% dlls/user/display.drv.spec
|
||||||
|
|
||||||
dlls/user
|
dlls/user
|
||||||
objects
|
objects
|
||||||
|
|
||||||
% dlls/user/keyboard.spec
|
% dlls/user/keyboard.drv.spec
|
||||||
|
|
||||||
dlls/user
|
dlls/user
|
||||||
windows
|
windows
|
||||||
|
|
||||||
% dlls/user/mouse.spec
|
% dlls/user/mouse.drv.spec
|
||||||
|
|
||||||
dlls/user
|
dlls/user
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue