WineHQ:winetest: use more info from the reports 1/2

[Ferenc Wagner]

ChangeLog: * Copy build info and OS version blocks into
             separate files.
           * Make Wine a separate version.

Feri.

Index: winetest/dissect
===================================================================
RCS file: /home/wine/tools/winetest/dissect,v
retrieving revision 1.15
diff -u -r1.15 dissect
--- winetest/dissect	2 Sep 2004 19:02:58 -0000	1.15
+++ winetest/dissect	5 Jan 2005 22:14:52 -0000
@@ -87,12 +87,18 @@
 
 $_ = <IN>;
 /^Build info:\r?$/ or mydie "no Build info header: $_";
-while (($_ = <IN>) =~ /^    /) { }
+open BINFO, ">$tmpdir/build.txt" or mydie "can't write $tmpdir/build.txt: $!";
+while (($_ = <IN>) =~ s/^    //) { print BINFO; }
+close BINFO or mydie "error writing $tmpdir/build.txt: $!";
 
-my ($version, $major, $minor, $plid);
+my ($wine, $version, $major, $minor, $plid);
 /^Operating system version:\r?$/ or mydie "no OS header: $_";
+open OSVER, ">$tmpdir/version.txt" or mydie "can't write $tmpdir/version.txt: $!";
 while (($_ = <IN>) =~ /^\s*([a-zA-Z]+)=(.*?)\r?$/) {
-    if ($1 eq "dwMajorVersion") {
+    print OSVER "$1=$2\n";
+    if      ($1 eq "bRunningUnderWine") {
+        $wine = $2;
+    } elsif ($1 eq "dwMajorVersion") {
         $major = $2;
     } elsif ($1 eq "dwMinorVersion") {
         $minor = $2;
@@ -100,6 +106,8 @@
         $plid = $2;
     }
 }
+close OSVER or mydie "error writing $tmpdir/version.txt: $!";
+
 $version = "unknown";
 if ($plid==1 && $major==4) {
     if      ($minor==0) {
@@ -126,6 +134,9 @@
 } elsif ($plid==3) {
     $version = "ce$major$minor";
 }
+if ($wine) {
+    $version = "wine";
+}
 
 /Test output:\r?/ or mydie "no test header: $_";
 my ($unit, $test, $source, $rev, $result);
@@ -163,7 +174,7 @@
     $result = "failed - -";
     goto FINISH;
 }
-close SUM;
+close SUM or mydie "error writing $tmpdir/summary.txt: $!";
 close IN;
 
 my $builddir = "$datadir/$testbuild";