msvcmaker: produces invalid testlist.c files

[Saulius Krasuckas]

Hello,

is anyone working on this?  Or are we going to get rid of 
tools/winapi/msvcmaker.  If not, this is my try to fix the tool.


ChangeLog:
        Saulius Krasuckas <saulius.krasuckas(a)ieee.org>
        Sync msvcmaker with make_ctests to generate valid code.


Index: tools/winapi/msvcmaker
===================================================================
RCS file: /home/wine/wine/tools/winapi/msvcmaker,v
retrieving revision 1.37
diff -w -p -u -r1.37 msvcmaker
--- tools/winapi/msvcmaker      9 Jun 2005 10:24:51 -0000       1.37
+++ tools/winapi/msvcmaker      18 Jun 2005 06:12:35 -0000
@@ -1079,26 +1079,20 @@ sub _generate_testlist_c($$) {
     print OUT "#include \"windef.h\"\n";
     print OUT "#include \"winbase.h\"\n";
     print OUT "\n";
+    print OUT "#define STANDALONE\n";
+    print OUT "#include \"wine/test.h\"\n";
+    print OUT "\n";
     foreach my $test (@tests) {
        print OUT "extern void func_$test(void);\n";
     }
     print OUT "\n";
-    print OUT "struct test\n";
-    print OUT "{\n";
-    print OUT "    const char *name;\n";
-    print OUT "    void (*func)(void);\n";
-    print OUT "};\n";
-    print OUT "\n";
-    print OUT "static const struct test winetest_testlist[] =\n";
+    print OUT "const struct test winetest_testlist[] =\n";
     print OUT "{\n";
     foreach my $test (@tests) {
        print OUT "    { \"$test\", func_$test },\n";
     }
     print OUT "    { 0, 0 }\n";
     print OUT "};\n";
-    print OUT "\n";
-    print OUT "#define WINETEST_WANT_MAIN\n";
-    print OUT "#include \"wine/test.h\"\n";
 }
 
 if ($options->winetest) {