Minor modifications and improvements.

This commit is contained in:
Patrik Stridvall 2002-10-23 18:44:46 +00:00 committed by Alexandre Julliard
parent 03adaea165
commit 3007bd437e
2 changed files with 37 additions and 20 deletions

View file

@ -6,13 +6,17 @@
Unit tests for data structure packing
%include
%header
basetsd.h
winnt.h
windef.h
wingdi.h
%include
windows.h
%struct
ABC
@ -161,13 +165,17 @@ XFORM
Unit tests for data structure packing
%include
%header
basetsd.h
winnt.h
windef.h
winbase.h
%include
windows.h
%struct
BY_HANDLE_FILE_INFORMATION
@ -200,7 +208,7 @@ RIP_INFO
SECURITY_ATTRIBUTES
STARTUPINFOA
STARTUPINFOW
SYSLEVEL
# SYSLEVEL
SYSTEMTIME
# SYSTEM_INFO
SYSTEM_POWER_STATUS
@ -219,19 +227,22 @@ WIN32_STREAM_ID
Unit tests for data structure packing
%include
%header
basetsd.h
winnt.h
windef.h
%include
windows.h
%struct
ACCESS_ALLOWED_ACE
ACCESS_DENIED_ACE
ACE_HEADER
ACL
CONTEXT86
# EXCEPTION_FRAME
EXCEPTION_POINTERS
EXCEPTION_RECORD
@ -309,7 +320,7 @@ TOKEN_USER
Unit tests for data structure packing
%include
%header
basetsd.h
winnt.h
@ -318,6 +329,10 @@ winbase.h
wingdi.h
winuser.h
%include
windows.h
%struct
ACCEL

View file

@ -55,9 +55,9 @@ my @files = ();
foreach my $test (@tests) {
my @test_dirs = $tests->get_test_dirs($test);
foreach my $test_dir (@test_dirs) {
my @includes = $tests->get_section($test_dir, $test, "include");
foreach my $include (@includes) {
$files{"include/$include"} = 1;
my @headers = $tests->get_section($test_dir, $test, "header");
foreach my $header (@headers) {
$files{"include/$header"} = 1;
}
}
}
@ -65,11 +65,11 @@ my @files = ();
foreach my $test (@tests) {
my @test_dirs = $tests->get_test_dirs($test);
foreach my $test_dir (@test_dirs) {
my @includes = $tests->get_section($test_dir, $test, "include");
foreach my $include (@includes) {
if($files{"include/$include"}) {
push @files, "include/$include";
$files{"include/$include"} = 0;
my @headers = $tests->get_section($test_dir, $test, "header");
foreach my $header (@headers) {
if($files{"include/$header"}) {
push @files, "include/$header";
$files{"include/$header"} = 0;
}
}
}
@ -102,6 +102,7 @@ my %defines = (
"MAX_PROFILE_LEN" => 80,
"OFS_MAXPATHNAME" => 128,
"SIZE_OF_80387_REGISTERS" => 80,
"TOKEN_SOURCE_LENGTH" => 8,
);
my %align_kludge_reported = ("FILETIME" => 1, "LARGE_INTEGER" => 1);
@ -387,9 +388,9 @@ sub output_header {
print OUT " */\n";
print OUT "\n";
print OUT "#include <stdio.h>\n";
print OUT "#define WINVER 0x0501\n";
print OUT "#define WINE_NOWINSOCK\n";
print OUT "\n";
print OUT "#include \"wine/test.h\"\n";
foreach my $test (@tests) {
my @includes = $tests->get_section($test_dir, $test, "include");
foreach my $include (@includes) {
@ -397,7 +398,8 @@ sub output_header {
}
}
print OUT "\n";
print OUT "#include \"wine/test.h\"\n";
print OUT "\n";
print OUT "/***********************************************************************\n";
print OUT " * Windows API extension\n";
@ -476,7 +478,7 @@ sub output_test_pack {
my $test_dir = shift;
my $test = shift;
my @includes = $tests->get_section($test_dir, $test, "include");
my @headers = $tests->get_section($test_dir, $test, "header");
my @type_names = $tests->get_section($test_dir, $test, "struct");
my %type_name_not_used;
@ -485,8 +487,8 @@ sub output_test_pack {
$type_name_not_used{$type_name} = 1;
}
foreach my $include (@includes) {
my $types = $file2types{"include/$include"};
foreach my $header (@headers) {
my $types = $file2types{"include/$header"};
foreach my $type_name (@type_names) {
my $type = $$types{$type_name};