Update Win32 from CPAN (from 0.40 to 0.41)

1 files changed, 11 insertions, 2 deletions

diff --git a/cpan/Win32/Win32.xs b/cpan/Win32/Win32.xs
index 2799290597..f6d96b4374 100644
--- a/cpan/Win32/Win32.xs
+++ b/cpan/Win32/Win32.xs
@@ -39,6 +39,7 @@ typedef BOOL (__stdcall *PFNEqualSid)(PSID, PSID);
 typedef void* (__stdcall *PFNFreeSid)(PSID);

 typedef BOOL (__stdcall *PFNIsUserAnAdmin)(void);

 typedef BOOL (WINAPI *PFNGetProductInfo)(DWORD, DWORD, DWORD, DWORD, DWORD*);

+typedef void (WINAPI *PFNGetNativeSystemInfo)(LPSYSTEM_INFO lpSystemInfo);

 

 #ifndef CSIDL_MYMUSIC

 #   define CSIDL_MYMUSIC              0x000D

@@ -792,9 +793,17 @@ XS(w32_GetChipName)
 {

     dXSARGS;

     SYSTEM_INFO sysinfo;

+    HMODULE module;

+    PFNGetNativeSystemInfo pfnGetNativeSystemInfo;

 

     Zero(&sysinfo,1,SYSTEM_INFO);

-    GetSystemInfo(&sysinfo);

+    module = GetModuleHandle("kernel32.dll");

+    GETPROC(GetNativeSystemInfo);

+    if (pfnGetNativeSystemInfo)

+        pfnGetNativeSystemInfo(&sysinfo);

+    else

+        GetSystemInfo(&sysinfo);

+

     /* XXX docs say dwProcessorType is deprecated on NT */

     XSRETURN_IV(sysinfo.dwProcessorType);

 }

@@ -1659,7 +1668,7 @@ XS(w32_GetSystemMetrics)
     if (items != 1)

 	Perl_croak(aTHX_ "usage: Win32::GetSystemMetrics($index)");

 

-    XSRETURN_IV(GetSystemMetrics(SvIV(ST(0))));

+    XSRETURN_IV(GetSystemMetrics((int)SvIV(ST(0))));

 }

 

 XS(w32_GetProductInfo)