WineHQ: winetest: more version logic fixes

[Ferenc Wagner]

Hi Jer,

Hope it will be the last round in the middle term at least.
The numbers are based on a different source now, and
somewhat less strict in almost any respect.

After applying this patch, do something like

[wineowner at wine winetest]$ k=0; for i in data/*/unknown_*; do mv $i queue/rep${k}_$(basename $i); k=$((k+1)); done

(find shouldn't be necessary as all the unknown_* files
reside in one level -- hopefully), then run the cronjob.  If
it still has something to say, please come back at me.

ChangeLog: Don't check the build number when determining the
           Windows version.

Index: winetest/dissect
===================================================================
RCS file: /home/wine/tools/winetest/dissect,v
retrieving revision 1.13
diff -u -r1.13 dissect
--- winetest/dissect	14 Jul 2004 18:28:31 -0000	1.13
+++ winetest/dissect	14 Jul 2004 19:38:18 -0000
@@ -89,7 +89,7 @@
 /^Build info:\r?$/ or mydie "no Build info header: $_";
 while (($_ = <IN>) =~ /^    /) { }
 
-my ($version, $major, $minor, $build, $plid);
+my ($version, $major, $minor, $plid);
 /^Operating system version:\r?$/ or mydie "no OS header: $_";
 while (($_ = <IN>) =~ /^\s*([a-zA-Z]+)=(.*?)\r?$/) {
     if ($1 eq "dwMajorVersion") {
@@ -98,30 +98,28 @@
         $minor = $2;
     } elsif ($1 eq "PlatformId") {
         $plid = $2;
-    } elsif ($1 eq "dwBuildNumber") {
-        $build = $2;
     }
 }
 $version = "unknown";
 if ($plid==1 && $major==4) {
-    if ($minor<10) {
+    if      ($minor==0) {
         $version = "95";
     } elsif ($minor==10) {
         $version = "98";
-    } elsif ($minor==90 && $build==3000) {
+    } elsif ($minor==90) {
         $version = "me";
     }
 } elsif ($plid==2) {
-    if      ($major==3 && $minor==51 && $build==1057) {
+    if      ($major==3 && $minor==51) {
         $version = "nt3";
-    } elsif ($major==4 && $minor== 0 && $build==1381) {
+    } elsif ($major==4 && $minor== 0) {
         $version = "nt4";
     } elsif ($major==5) {
-        if      ($minor==0 && $build==2195) {
+        if      ($minor==0) {
             $version = "2000";
-        } elsif ($minor==1 && $build==2600) {
+        } elsif ($minor==1) {
             $version = "xp";
-        } elsif ($minor==2 && $build==3790) {
+        } elsif ($minor==2) {
             $version = "2003";
         }
     }