Refactor Windows 10 support to include ProductInfo settings

Also add some tests for 8.1, 10, 2012 R2

Author: jandubois

Win32.pm

@@ -477,8 +477,13 @@ sub _GetOSName {
 		    $desc = "R2";
 		}
 	    }
+        }
+	elsif ($major == 10) {
+            $os = '10';
+        }
 
-        if ($productinfo == PRODUCT_ULTIMATE) {
+        if ($major >= 6) {
+            if ($productinfo == PRODUCT_ULTIMATE) {
 		$desc .= " Ultimate";
 	    }
             elsif ($productinfo == PRODUCT_HOME_PREMIUM) {
@@ -541,11 +546,6 @@ sub _GetOSName {
 		$desc .= " (64-bit)";
 	    }
 	} 
-	elsif ($major == 10) {
-	    if ($minor == 0) {
-                $os = '10';
-            }
-        }
     }
 
     unless (defined $os) {

t/GetOSName.t

@@ -104,6 +104,11 @@ my @dual_tests = (
 ["2012",                            "2012",    2, 6, 2, 0x00, 2, 89  ],
 ["[Small Business Server] 2008 R2", "2008",    2, 6, 1, 0x09, 2, 89  ],
 
+["8.1",                             "8.1",     2, 6, 3               ],
+["2012 [R2]",                       "2012",    2, 6, 3, 0x00, 2, 89  ],
+
+["10",                              "10",      2, 10, 0              ],
+
 );
 
 my @ia64_tests = (