In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/1ead70b69c083888045d5803581dd8e65b62fec2?hp=897dbee7508ba058731206ed578e00c32077d61c>
- Log ----------------------------------------------------------------- commit 1ead70b69c083888045d5803581dd8e65b62fec2 Author: Chris 'BinGOs' Williams <[email protected]> Date: Mon Jan 26 23:43:50 2015 +0000 Update Win32 to CPAN version 0.51 [DELTA] 0.51 [2015-01-26] - Win32-0.50 was released to CPAN from an out-dated Git repo, so didn't actually include the merged pull requests. 0.50 [2015-01-26] - add GetOSName support for Windows 8.1 (thanks to Tony Cook) [PR/6] - Fix build in C++ mode (thanks to Steve Hay and Daniel Dragan) [PR/7] ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 2 +- cpan/Win32/Win32.pm | 11 ++++++++++- cpan/Win32/Win32.xs | 6 +++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index ac5f552..4b37146 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -1280,7 +1280,7 @@ use File::Glob qw(:case); }, 'Win32' => { - 'DISTRIBUTION' => "JDB/Win32-0.49.tar.gz", + 'DISTRIBUTION' => "JDB/Win32-0.51.tar.gz", 'FILES' => q[cpan/Win32], }, diff --git a/cpan/Win32/Win32.pm b/cpan/Win32/Win32.pm index 027af0e..4cc880b 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.49'; + $VERSION = '0.51'; $XS_VERSION = $VERSION; $VERSION = eval $VERSION; @@ -468,6 +468,15 @@ sub _GetOSName { $os = "2012"; } } + elsif ($minor == 3) { + if ($producttype == VER_NT_WORKSTATION) { + $os = "8.1"; + } + else { + $os = "2012"; + $desc = "R2"; + } + } if ($productinfo == PRODUCT_ULTIMATE) { $desc .= " Ultimate"; diff --git a/cpan/Win32/Win32.xs b/cpan/Win32/Win32.xs index b47df40..de3764e 100644 --- a/cpan/Win32/Win32.xs +++ b/cpan/Win32/Win32.xs @@ -237,7 +237,7 @@ get_unicode_env(pTHX_ WCHAR *name) pfnCreateEnvironmentBlock(&env, token, FALSE)) { size_t name_len = wcslen(name); - WCHAR *entry = env; + WCHAR *entry = (WCHAR *)env; while (*entry) { size_t i; size_t entry_len = wcslen(entry); @@ -818,7 +818,11 @@ XS(w32_GuidGen) if (SUCCEEDED(hr)) { LPOLESTR pStr = NULL; +#ifdef __cplusplus + if (SUCCEEDED(StringFromCLSID(guid, &pStr))) { +#else if (SUCCEEDED(StringFromCLSID(&guid, &pStr))) { +#endif WideCharToMultiByte(CP_ACP, 0, pStr, (int)wcslen(pStr), szGUID, sizeof(szGUID), NULL, NULL); CoTaskMemFree(pStr); -- Perl5 Master Repository
