- Added a new tool winapi_test for generating tests.
- Added a data structure packing test to winapi_test.
- Reorganized and optimized a few things.

diff --git a/tools/winapi_check/winapi_function.pm b/tools/winapi_check/winapi_function.pm
index 96da183..4564d43 100644
--- a/tools/winapi_check/winapi_function.pm
+++ b/tools/winapi_check/winapi_function.pm
@@ -22,9 +22,10 @@
 use strict;
 
 use config qw($current_dir $wine_dir);
-use modules qw($modules);
 use util qw(&normalize_set);
-use winapi qw($win16api $win32api @winapis);
+
+my $import = 0;
+use vars qw($modules $win16api $win32api @winapis);
 
 ########################################################################
 # constructor
@@ -36,6 +37,15 @@
     my $self  = {};
     bless ($self, $class);
 
+    if (!$import) {
+	require modules;
+	import modules qw($modules);
+	
+	require winapi;
+	import winapi qw($win16api $win32api @winapis);
+
+	$import = 1;
+    }
     return $self;
 }