Update Win32 to CPAN version 0.48

  [DELTA]

0.48    [2013-11-20]
        - Typo fixes by David Steinbrunner.
        - Fix required perl version 5.6 -> 5.006.
        - Don't call note() in t/GetOSName.t when it has not been
          imported from Test::More.
        - Convert t/GetOSName.t to Unix line endings like the rest of
          this repo.

2 files changed, 174 insertions, 174 deletions

diff --git a/cpan/Win32/Win32.pm b/cpan/Win32/Win32.pm
index 4f6d1ff47d..7d933039eb 100644
--- a/cpan/Win32/Win32.pm
+++ b/cpan/Win32/Win32.pm
@@ -8,7 +8,7 @@ package Win32;
     require DynaLoader;
 
     @ISA = qw|Exporter DynaLoader|;
-    $VERSION = '0.47';
+    $VERSION = '0.48';
     $XS_VERSION = $VERSION;
     $VERSION = eval $VERSION;
 
@@ -985,7 +985,7 @@ On Windows NT 4 SP6 and later this function returns the following
 additional values: SPMAJOR, SPMINOR, SUITEMASK, PRODUCTTYPE.
 
 The version numbers for Windows 2003 and Windows Home Server are
-identical; the SUITEMASK field must be used to differentiate between\
+identical; the SUITEMASK field must be used to differentiate between
 them.
 
 The version numbers for Windows Vista and Windows Server 2008 are
@@ -1000,7 +1000,7 @@ The version numbers for Windows 8 and Windows Server 2012 are
 identical; the PRODUCTTYPE field must be used to differentiate between
 them.
 
-SPMAJOR and SPMINOR are are the version numbers of the latest
+SPMAJOR and SPMINOR are the version numbers of the latest
 installed service pack.
 
 SUITEMASK is a bitfield identifying the product suites available on
@@ -1023,7 +1023,7 @@ the system.  Known bits are:
     VER_SUITE_COMPUTE_SERVER            0x00004000
     VER_SUITE_WH_SERVER                 0x00008000
 
-The VER_SUITE_xxx names are listed here to crossreference the Microsoft
+The VER_SUITE_xxx names are listed here to cross reference the Microsoft
 documentation.  The Win32 module does not provide symbolic names for these
 constants.
 
@@ -1145,7 +1145,7 @@ and the SID type.
 
 =item Win32::MsgBox(MESSAGE [, FLAGS [, TITLE]])
 
-Create a dialogbox containing MESSAGE.  FLAGS specifies the
+Create a dialog box containing MESSAGE.  FLAGS specifies the
 required icon and buttons according to the following table:
 
 	0 = OK
diff --git a/cpan/Win32/t/GetOSName.t b/cpan/Win32/t/GetOSName.t
index 07fed88f40..098a169658 100644
--- a/cpan/Win32/t/GetOSName.t
+++ b/cpan/Win32/t/GetOSName.t
@@ -1,169 +1,169 @@
-use strict;

-use Test::More;

-use Win32;

-

-# The "description" value is extracted from the $pretty field:

-#

-#     "2000 [Server]" => "Server"

-#     "{Home Server}" => "Windows Home Server" (prefixed with "Windows ")

-#     "Anything R2"   => "R2 Anything"         (R2 moved to front)

-#

-# The "display name" value is the same as the $pretty field,

-# prefixed by "Windows ", with all "[]{}" characters removed.

-

-# $pretty, $os $id, $major, $minor, $sm, $pt, $metric

-

-my @intel_tests = (

-["Win32s",                          "Win32s",  0                     ],

-

-["95",                              "95",      1, 4, 0               ],

-["98",                              "98",      1, 4, 10              ],

-["Me",                              "Me",      1, 4, 90              ],

-

-["NT 3.51",                         "NT3.51",  2, 3, 51              ],

-["NT 4",                            "NT4",     2, 4, 0               ],

-

-["2000 [Professional]",             "2000",    2, 5, 0, 0x0000, 1,  0],

-["2000 [Server]",                   "2000",    2, 5, 0, 0x0000, 2,  0],

-["[Small Business Server] 2000",    "2000",    2, 5, 0, 0x0020, 2,  0],

-["2000 [Advanced Server]",          "2000",    2, 5, 0, 0x0002, 2,  0],

-["2000 [Datacenter Server]",        "2000",    2, 5, 0, 0x0080, 2,  0],

-

-["XP [Home Edition]",               "XP/.Net", 2, 5, 1, 0x0200, 1,  0],

-["XP [Professional]",               "XP/.Net", 2, 5, 1, 0x0000, 1,  0],

-["XP [Tablet PC Edition]",          "XP/.Net", 2, 5, 1, 0x0000, 1, 86],

-["XP [Media Center Edition]",       "XP/.Net", 2, 5, 1, 0x0000, 1, 87],

-["XP [Starter Edition]",            "XP/.Net", 2, 5, 1, 0x0000, 1, 88],

-

-["2003 [Standard Edition]",         "2003",    2, 5, 2, 0x0000, 2,  0],

-["[Small Business Server] 2003",    "2003",    2, 5, 2, 0x0020, 2,  0],

-["{Storage Server} 2003",           "2003",    2, 5, 2, 0x2000, 2,  0],

-["{Home Server}",                   "2003",    2, 5, 2, 0x8000, 2,  0],

-

-["{Compute Cluster Server} 2003",   "2003",    2, 5, 2, 0x4000, 2,  0],

-["2003 [Datacenter Edition]",       "2003",    2, 5, 2, 0x0080, 2,  0],

-["2003 [Enterprise Edition]",       "2003",    2, 5, 2, 0x0002, 2,  0],

-["2003 [Web Edition]",              "2003",    2, 5, 2, 0x0400, 2,  0],

-

-["2003 [R2 Standard Edition]",      "2003",    2, 5, 2, 0x0000, 2, 89],

-["[Small Business Server] 2003 R2", "2003",    2, 5, 2, 0x0020, 2, 89],

-["{Storage Server} 2003 R2",        "2003",    2, 5, 2, 0x2000, 2, 89],

-# ??? test for more R2 versions?

-);

-

-my @amd64_tests = (

-["{XP Professional x64 Edition}",   "2003",    2, 5, 2, 0x0000, 1,  0],

-["2003 [Datacenter x64 Edition]",   "2003",    2, 5, 2, 0x0080, 2,  0],

-["2003 [Enterprise x64 Edition]",   "2003",    2, 5, 2, 0x0002, 2,  0],

-["2003 [Standard x64 Edition]",     "2003",    2, 5, 2, 0x0000, 2,  0],

-);

-

-my @dual_tests = (

-["Vista",                           "Vista",   2, 6, 0               ],

-

-["Vista [Starter]",                 "Vista",   2, 6, 0, 0x0b         ],

-["Vista [Home Basic]",              "Vista",   2, 6, 0, 0x02         ],

-["Vista [Home Premium]",            "Vista",   2, 6, 0, 0x03         ],

-["Vista [Business]",                "Vista",   2, 6, 0, 0x06         ],

-["Vista [Enterprise]",              "Vista",   2, 6, 0, 0x04         ],

-["Vista [Ultimate]",                "Vista",   2, 6, 0, 0x01         ],

-

-#["Vista Business for Embedded Systems", "Vista",   2, 6, 0           ],

-#["Vista Ultimate for Embedded Systems", "Vista",   2, 6, 0           ],

-

-["2008 [Standard]",                 "2008",    2, 6, 0, 0x07, 2      ],

-["2008 [Enterprise]",               "2008",    2, 6, 0, 0x04, 2      ],

-["[HPC Server] 2008",               "2008",    2, 6, 0, 0x12, 2      ],

-["[Web Server] 2008",               "2008",    2, 6, 0, 0x11, 2      ],

-#["[Storage Server] 2008",           "2008",    2, 6, 0, ????, 2      ],

-["[Small Business Server] 2008",    "2008",    2, 6, 0, 0x09, 2,  0  ],

-

-#    * Windows Server 2008 Standard (x86 and x86-64)

-#    * Windows Server 2008 Enterprise (x86 and x86-64)

-#    * Windows HPC Server 2008 (replacing Windows Compute Cluster Server 2003)

-#    * Windows Web Server 2008 (x86 and x86-64)

-#    * Windows Storage Server 2008 (x86 and x86-64)

-#    * Windows Small Business Server 2008 (Codenamed "Cougar") (x86-64) for small businesses

-#    * Windows Essential Business Server 2008 (Codenamed "Centro") (x86-64) for medium-sized businesses [25]

-#    * Windows Server 2008 for Itanium-based Systems

-#    * Windows Server 2008 Foundation

-#

-# Server Core is available in the Web, Standard, Enterprise and Datacenter editions.

-

-["7",                               "7",       2, 6, 1               ],

-["7 [Starter]",                     "7",       2, 6, 1, 0x0b         ],

-["7 [Home Basic]",                  "7",       2, 6, 1, 0x02         ],

-["7 [Home Premium]",                "7",       2, 6, 1, 0x03         ],

-["7 [Professional]",                "7",       2, 6, 1, 0x06         ],

-["7 [Professional]",                "7",       2, 6, 1, 0x30         ],

-["7 [Enterprise]",                  "7",       2, 6, 1, 0x04         ],

-["7 [Ultimate]",                    "7",       2, 6, 1, 0x01         ],

-

-["8",                               "8",       2, 6, 2               ],

-["2008 [R2]",                       "2008",    2, 6, 1, 0x00, 2, 89  ],

-["2012",                            "2012",    2, 6, 2, 0x00, 2, 89  ],

-["[Small Business Server] 2008 R2", "2008",    2, 6, 1, 0x09, 2, 89  ],

-

-);

-

-my @ia64_tests = (

-["2003 [Datacenter Edition for Itanium-based Systems]", "2003", 2, 5, 2, 0x0080, 2, 0],

-["2003 [Enterprise Edition for Itanium-based Systems]", "2003", 2, 5, 2, 0x0002, 2, 0],

-);

-

-plan tests => 6 * (@intel_tests + @amd64_tests + 2*@dual_tests + @ia64_tests);

-

-# Test internal implementation function

-sub check {

-    my($test, $arch) = @_;

-    my($pretty, $expect, $id, $major, $minor, $sm, $pt, $metrics) = @$test;

-    $metrics = [$metrics] if defined($metrics) && not ref $metrics;

-

-    my $tag = "";

-    ($pretty, $tag) = ("$1$2$3", "$2") if $pretty =~ /^(.*)\[(.*)\](.*)$/;

-    ($pretty, $tag) = ("$1$2$3", "Windows $2") if $pretty =~ /^(.*)\{(.*)\}(.*)$/;

-    $tag = "R2 $tag" if $tag !~ /R2/ && $pretty =~ /R2$/;

-

-    # All display names start with "Windows";

-    # and 2003/2008 start with "Windows Server"

-    unless ($pretty eq "Win32s") {

-	my $prefix = "Windows";

-	$prefix .= " Server" if $pretty =~ /^20(03|08|12)/;

-	$pretty = "$prefix $pretty";

-    }

-

-    # @dual_tests: Vista and later all come in both 32-bit and 64-bit versions

-    if ($id == 2 && $major >= 6) {

-	my $suffix = "";

-	$suffix = " (32-bit)" if $arch == Win32::PROCESSOR_ARCHITECTURE_INTEL;

-	$suffix = " (64-bit)" if $arch == Win32::PROCESSOR_ARCHITECTURE_AMD64;

-	$_ .= $suffix for $pretty, $tag;

-	$tag =~ s/^\s*//;

-    }

-

-    # We pass the same value for $suitemask and $productinfo.  The former is

-    # used for Windows up to 2003, the latter is used for Vista and later.

-    my($os, $desc) = Win32::_GetOSName("", $major||0, $minor||0, 0,

-				       $id, $sm||0, $pt||1, $sm||0, $arch, $metrics);

-    my $display = Win32::GetOSDisplayName($os, $desc);

-

-    note($pretty);

-    is($display, $pretty);

-    is($os, "Win$expect", "os:   $os");

-    is($desc, $tag, "desc: $desc");

-

-    my $sp = "Service Pack 42";

-    ($os, $desc) = Win32::_GetOSName($sp, $major||0, $minor||0, 0,

-				     $id, $sm||0, $pt||1, $sm||0, $arch, $metrics);

-    $display = Win32::GetOSDisplayName($os, $desc);

-

-    is($display, "$pretty $sp", "display: $display");

-    is($os,      "Win$expect",  "os:      $os");

-    $expect = length($tag) ? "$tag $sp" : $sp;

-    is($desc,    $expect,       "desc:    $desc");

-}

-

-check($_, Win32::PROCESSOR_ARCHITECTURE_INTEL) for @intel_tests, @dual_tests;

-check($_, Win32::PROCESSOR_ARCHITECTURE_AMD64) for @amd64_tests, @dual_tests;

-check($_, Win32::PROCESSOR_ARCHITECTURE_IA64)  for @ia64_tests;

-

+use strict;
+use Test::More;
+use Win32;
+
+# The "description" value is extracted from the $pretty field:
+#
+#     "2000 [Server]" => "Server"
+#     "{Home Server}" => "Windows Home Server" (prefixed with "Windows ")
+#     "Anything R2"   => "R2 Anything"         (R2 moved to front)
+#
+# The "display name" value is the same as the $pretty field,
+# prefixed by "Windows ", with all "[]{}" characters removed.
+
+# $pretty, $os $id, $major, $minor, $sm, $pt, $metric
+
+my @intel_tests = (
+["Win32s",                          "Win32s",  0                     ],
+
+["95",                              "95",      1, 4, 0               ],
+["98",                              "98",      1, 4, 10              ],
+["Me",                              "Me",      1, 4, 90              ],
+
+["NT 3.51",                         "NT3.51",  2, 3, 51              ],
+["NT 4",                            "NT4",     2, 4, 0               ],
+
+["2000 [Professional]",             "2000",    2, 5, 0, 0x0000, 1,  0],
+["2000 [Server]",                   "2000",    2, 5, 0, 0x0000, 2,  0],
+["[Small Business Server] 2000",    "2000",    2, 5, 0, 0x0020, 2,  0],
+["2000 [Advanced Server]",          "2000",    2, 5, 0, 0x0002, 2,  0],
+["2000 [Datacenter Server]",        "2000",    2, 5, 0, 0x0080, 2,  0],
+
+["XP [Home Edition]",               "XP/.Net", 2, 5, 1, 0x0200, 1,  0],
+["XP [Professional]",               "XP/.Net", 2, 5, 1, 0x0000, 1,  0],
+["XP [Tablet PC Edition]",          "XP/.Net", 2, 5, 1, 0x0000, 1, 86],
+["XP [Media Center Edition]",       "XP/.Net", 2, 5, 1, 0x0000, 1, 87],
+["XP [Starter Edition]",            "XP/.Net", 2, 5, 1, 0x0000, 1, 88],
+
+["2003 [Standard Edition]",         "2003",    2, 5, 2, 0x0000, 2,  0],
+["[Small Business Server] 2003",    "2003",    2, 5, 2, 0x0020, 2,  0],
+["{Storage Server} 2003",           "2003",    2, 5, 2, 0x2000, 2,  0],
+["{Home Server}",                   "2003",    2, 5, 2, 0x8000, 2,  0],
+
+["{Compute Cluster Server} 2003",   "2003",    2, 5, 2, 0x4000, 2,  0],
+["2003 [Datacenter Edition]",       "2003",    2, 5, 2, 0x0080, 2,  0],
+["2003 [Enterprise Edition]",       "2003",    2, 5, 2, 0x0002, 2,  0],
+["2003 [Web Edition]",              "2003",    2, 5, 2, 0x0400, 2,  0],
+
+["2003 [R2 Standard Edition]",      "2003",    2, 5, 2, 0x0000, 2, 89],
+["[Small Business Server] 2003 R2", "2003",    2, 5, 2, 0x0020, 2, 89],
+["{Storage Server} 2003 R2",        "2003",    2, 5, 2, 0x2000, 2, 89],
+# ??? test for more R2 versions?
+);
+
+my @amd64_tests = (
+["{XP Professional x64 Edition}",   "2003",    2, 5, 2, 0x0000, 1,  0],
+["2003 [Datacenter x64 Edition]",   "2003",    2, 5, 2, 0x0080, 2,  0],
+["2003 [Enterprise x64 Edition]",   "2003",    2, 5, 2, 0x0002, 2,  0],
+["2003 [Standard x64 Edition]",     "2003",    2, 5, 2, 0x0000, 2,  0],
+);
+
+my @dual_tests = (
+["Vista",                           "Vista",   2, 6, 0               ],
+
+["Vista [Starter]",                 "Vista",   2, 6, 0, 0x0b         ],
+["Vista [Home Basic]",              "Vista",   2, 6, 0, 0x02         ],
+["Vista [Home Premium]",            "Vista",   2, 6, 0, 0x03         ],
+["Vista [Business]",                "Vista",   2, 6, 0, 0x06         ],
+["Vista [Enterprise]",              "Vista",   2, 6, 0, 0x04         ],
+["Vista [Ultimate]",                "Vista",   2, 6, 0, 0x01         ],
+
+#["Vista Business for Embedded Systems", "Vista",   2, 6, 0           ],
+#["Vista Ultimate for Embedded Systems", "Vista",   2, 6, 0           ],
+
+["2008 [Standard]",                 "2008",    2, 6, 0, 0x07, 2      ],
+["2008 [Enterprise]",               "2008",    2, 6, 0, 0x04, 2      ],
+["[HPC Server] 2008",               "2008",    2, 6, 0, 0x12, 2      ],
+["[Web Server] 2008",               "2008",    2, 6, 0, 0x11, 2      ],
+#["[Storage Server] 2008",           "2008",    2, 6, 0, ????, 2      ],
+["[Small Business Server] 2008",    "2008",    2, 6, 0, 0x09, 2,  0  ],
+
+#    * Windows Server 2008 Standard (x86 and x86-64)
+#    * Windows Server 2008 Enterprise (x86 and x86-64)
+#    * Windows HPC Server 2008 (replacing Windows Compute Cluster Server 2003)
+#    * Windows Web Server 2008 (x86 and x86-64)
+#    * Windows Storage Server 2008 (x86 and x86-64)
+#    * Windows Small Business Server 2008 (Codenamed "Cougar") (x86-64) for small businesses
+#    * Windows Essential Business Server 2008 (Codenamed "Centro") (x86-64) for medium-sized businesses [25]
+#    * Windows Server 2008 for Itanium-based Systems
+#    * Windows Server 2008 Foundation
+#
+# Server Core is available in the Web, Standard, Enterprise and Datacenter editions.
+
+["7",                               "7",       2, 6, 1               ],
+["7 [Starter]",                     "7",       2, 6, 1, 0x0b         ],
+["7 [Home Basic]",                  "7",       2, 6, 1, 0x02         ],
+["7 [Home Premium]",                "7",       2, 6, 1, 0x03         ],
+["7 [Professional]",                "7",       2, 6, 1, 0x06         ],
+["7 [Professional]",                "7",       2, 6, 1, 0x30         ],
+["7 [Enterprise]",                  "7",       2, 6, 1, 0x04         ],
+["7 [Ultimate]",                    "7",       2, 6, 1, 0x01         ],
+
+["8",                               "8",       2, 6, 2               ],
+["2008 [R2]",                       "2008",    2, 6, 1, 0x00, 2, 89  ],
+["2012",                            "2012",    2, 6, 2, 0x00, 2, 89  ],
+["[Small Business Server] 2008 R2", "2008",    2, 6, 1, 0x09, 2, 89  ],
+
+);
+
+my @ia64_tests = (
+["2003 [Datacenter Edition for Itanium-based Systems]", "2003", 2, 5, 2, 0x0080, 2, 0],
+["2003 [Enterprise Edition for Itanium-based Systems]", "2003", 2, 5, 2, 0x0002, 2, 0],
+);
+
+plan tests => 6 * (@intel_tests + @amd64_tests + 2*@dual_tests + @ia64_tests);
+
+# Test internal implementation function
+sub check {
+    my($test, $arch) = @_;
+    my($pretty, $expect, $id, $major, $minor, $sm, $pt, $metrics) = @$test;
+    $metrics = [$metrics] if defined($metrics) && not ref $metrics;
+
+    my $tag = "";
+    ($pretty, $tag) = ("$1$2$3", "$2") if $pretty =~ /^(.*)\[(.*)\](.*)$/;
+    ($pretty, $tag) = ("$1$2$3", "Windows $2") if $pretty =~ /^(.*)\{(.*)\}(.*)$/;
+    $tag = "R2 $tag" if $tag !~ /R2/ && $pretty =~ /R2$/;
+
+    # All display names start with "Windows";
+    # and 2003/2008 start with "Windows Server"
+    unless ($pretty eq "Win32s") {
+	my $prefix = "Windows";
+	$prefix .= " Server" if $pretty =~ /^20(03|08|12)/;
+	$pretty = "$prefix $pretty";
+    }
+
+    # @dual_tests: Vista and later all come in both 32-bit and 64-bit versions
+    if ($id == 2 && $major >= 6) {
+	my $suffix = "";
+	$suffix = " (32-bit)" if $arch == Win32::PROCESSOR_ARCHITECTURE_INTEL;
+	$suffix = " (64-bit)" if $arch == Win32::PROCESSOR_ARCHITECTURE_AMD64;
+	$_ .= $suffix for $pretty, $tag;
+	$tag =~ s/^\s*//;
+    }
+
+    # We pass the same value for $suitemask and $productinfo.  The former is
+    # used for Windows up to 2003, the latter is used for Vista and later.
+    my($os, $desc) = Win32::_GetOSName("", $major||0, $minor||0, 0,
+				       $id, $sm||0, $pt||1, $sm||0, $arch, $metrics);
+    my $display = Win32::GetOSDisplayName($os, $desc);
+
+    note($pretty) if defined &note;
+    is($display, $pretty);
+    is($os, "Win$expect", "os:   $os");
+    is($desc, $tag, "desc: $desc");
+
+    my $sp = "Service Pack 42";
+    ($os, $desc) = Win32::_GetOSName($sp, $major||0, $minor||0, 0,
+				     $id, $sm||0, $pt||1, $sm||0, $arch, $metrics);
+    $display = Win32::GetOSDisplayName($os, $desc);
+
+    is($display, "$pretty $sp", "display: $display");
+    is($os,      "Win$expect",  "os:      $os");
+    $expect = length($tag) ? "$tag $sp" : $sp;
+    is($desc,    $expect,       "desc:    $desc");
+}
+
+check($_, Win32::PROCESSOR_ARCHITECTURE_INTEL) for @intel_tests, @dual_tests;
+check($_, Win32::PROCESSOR_ARCHITECTURE_AMD64) for @amd64_tests, @dual_tests;
+check($_, Win32::PROCESSOR_ARCHITECTURE_IA64)  for @ia64_tests;
+