winetest: Generate the list of test resources in make_makefiles.

programs/winetest/.gitignore

-/tests.rc
+/*_test.exe

programs/winetest/dist.rc

@@ -19,6 +19,7 @@
  */
 
 #include "winetest.rc"
+#include "tests.rc"
 
 WINE_BUILD STRINGRES "build.id"
 BUILD_INFO STRINGRES "build.nfo"

programs/winetest/maketest

@@ -4,7 +4,6 @@ TOPSRCDIR="$1"
 shift
 
 echo "/* Automatically generated -- do not edit! */"
-echo "#include \"resource.h\""
 echo "STRINGTABLE {"
 
 i=0
@@ -24,8 +23,3 @@ while read line; do
 done
 
 echo "}"
-
-for test
-do
-    echo "$test TESTRES \"$test\""
-done

programs/winetest/winetest.rc

@@ -21,10 +21,9 @@
 #include <windows.h>
 #include <winres.h>
 #include "resource.h"
-#include "tests.rc"
 
 IDD_TAG DIALOG 0, 0, 150, 65
-STYLE WS_POPUP
+STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "No tag supplied"
 BEGIN
     CTEXT "Please supply a tag for your report.  You can use letters, digits, dashes and periods."
@@ -144,3 +143,59 @@ IDI_WINE ICON "wine.ico"
  '00 00 FC 0F 00 00 FE 07 00 00 FE F7 00 00 FF 77'
  '00 00 FF 0F 00 00'
 } */
+
+/* list of tests (automatically generated by make_makefiles) */
+
+advapi32_test.exe TESTRES "advapi32_test.exe"
+advpack_test.exe TESTRES "advpack_test.exe"
+cabinet_test.exe TESTRES "cabinet_test.exe"
+comcat_test.exe TESTRES "comcat_test.exe"
+comctl32_test.exe TESTRES "comctl32_test.exe"
+comdlg32_test.exe TESTRES "comdlg32_test.exe"
+crypt32_test.exe TESTRES "crypt32_test.exe"
+d3d8_test.exe TESTRES "d3d8_test.exe"
+d3d9_test.exe TESTRES "d3d9_test.exe"
+ddraw_test.exe TESTRES "ddraw_test.exe"
+dinput_test.exe TESTRES "dinput_test.exe"
+dnsapi_test.exe TESTRES "dnsapi_test.exe"
+dsound_test.exe TESTRES "dsound_test.exe"
+gdi32_test.exe TESTRES "gdi32_test.exe"
+hlink_test.exe TESTRES "hlink_test.exe"
+infosoft_test.exe TESTRES "infosoft_test.exe"
+iphlpapi_test.exe TESTRES "iphlpapi_test.exe"
+kernel32_test.exe TESTRES "kernel32_test.exe"
+lz32_test.exe TESTRES "lz32_test.exe"
+mapi32_test.exe TESTRES "mapi32_test.exe"
+mlang_test.exe TESTRES "mlang_test.exe"
+msacm32_test.exe TESTRES "msacm32_test.exe"
+mscms_test.exe TESTRES "mscms_test.exe"
+mshtml_test.exe TESTRES "mshtml_test.exe"
+msi_test.exe TESTRES "msi_test.exe"
+msvcrt_test.exe TESTRES "msvcrt_test.exe"
+msvcrtd_test.exe TESTRES "msvcrtd_test.exe"
+msxml3_test.exe TESTRES "msxml3_test.exe"
+netapi32_test.exe TESTRES "netapi32_test.exe"
+ntdll_test.exe TESTRES "ntdll_test.exe"
+ole32_test.exe TESTRES "ole32_test.exe"
+oleaut32_test.exe TESTRES "oleaut32_test.exe"
+psapi_test.exe TESTRES "psapi_test.exe"
+quartz_test.exe TESTRES "quartz_test.exe"
+riched20_test.exe TESTRES "riched20_test.exe"
+rpcrt4_test.exe TESTRES "rpcrt4_test.exe"
+rsabase_test.exe TESTRES "rsabase_test.exe"
+rsaenh_test.exe TESTRES "rsaenh_test.exe"
+secur32_test.exe TESTRES "secur32_test.exe"
+setupapi_test.exe TESTRES "setupapi_test.exe"
+shdocvw_test.exe TESTRES "shdocvw_test.exe"
+shell32_test.exe TESTRES "shell32_test.exe"
+shlwapi_test.exe TESTRES "shlwapi_test.exe"
+urlmon_test.exe TESTRES "urlmon_test.exe"
+user32_test.exe TESTRES "user32_test.exe"
+usp10_test.exe TESTRES "usp10_test.exe"
+uxtheme_test.exe TESTRES "uxtheme_test.exe"
+version_test.exe TESTRES "version_test.exe"
+wininet_test.exe TESTRES "wininet_test.exe"
+winmm_test.exe TESTRES "winmm_test.exe"
+winspool.drv_test.exe TESTRES "winspool.drv_test.exe"
+wintrust_test.exe TESTRES "wintrust_test.exe"
+ws2_32_test.exe TESTRES "ws2_32_test.exe"

tools/make_makefiles

@@ -93,7 +93,7 @@ replace_in_file( "configure.ac", '^AC_CONFIG_FILES\(', '\]\)$',
 
 
 ################################################################
-# update the tests list in programs/winetest/Makefile.in
+# update the tests list in programs/winetest/Makefile.in and programs/winetest/winetest.rc
 
 my %modules = ( "kernel" => "kernel32", "gdi" => "gdi32", "user" => "user32" );
 my %tests;
@@ -106,7 +106,7 @@ foreach my $file (sort grep /^dlls\/.*\/tests\/Makefile/, @makefiles)
         my $dir = $1;
         my $mod = $modules{$dir} || $dir;
         $tests{$mod} = $dir;
-        push @lines, " \\\n\t${mod}_test.exe\$(DLLEXT)";
+        push @lines, " \\\n\t${mod}_test.exe";
     }
 }
 push @lines, "\n\n";
@@ -114,13 +114,20 @@ push @lines, "\n\n";
 foreach my $test (sort keys %tests)
 {
     my $dir = $tests{$test};
-    push @lines, "${test}_test.exe\$(DLLEXT): \$(DLLDIR)/$dir/tests/${test}_test.exe\$(DLLEXT)\n";
+    push @lines, "${test}_test.exe: \$(DLLDIR)/$dir/tests/${test}_test.exe\$(DLLEXT)\n";
     push @lines, "\tcp \$(DLLDIR)/$dir/tests/${test}_test.exe\$(DLLEXT) \$\@ && \$(STRIP) \$\@\n";
 }
 push @lines, "\n# Special rules\n";
 
 replace_in_file( "programs/winetest/Makefile.in", '^TESTBINS\s*=', '^# Special rules', @lines );
 
+@lines = ();
+foreach my $test (sort keys %tests)
+{
+    push @lines, "${test}_test.exe TESTRES \"${test}_test.exe\"\n";
+}
+
+replace_in_file( "programs/winetest/winetest.rc", ' TESTRES ', undef, @lines );
 
 ################################################################
 # update dlls/Makefile.in