Skip to content

Commit

Permalink
cpan/Win32: import PR 39
Browse files Browse the repository at this point in the history
perl-libwin32/win32#37 was submitted in June
2022, it fixes a bug that causes tests to fail for Win32.pm for
32-bit builds on windows, including in perl (and in 5.40.)

Jan requested a minor change to that PR which wasn't followed up on, so
I submitted perl-libwin32/win32#39 which
includes that requested change in August 2023.

This still hasn't been acted on.

So import this change into blead.
  • Loading branch information
tonycoz committed Jul 17, 2024
1 parent ca8d60d commit 08962c5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cpan/Win32/Win32.pm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package Win32;
require DynaLoader;

@ISA = qw|Exporter DynaLoader|;
$VERSION = '0.59';
$VERSION = '0.59_01';
$XS_VERSION = $VERSION;
$VERSION = eval $VERSION;

Expand Down
6 changes: 5 additions & 1 deletion cpan/Win32/Win32.xs
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ typedef LONG (WINAPI *PFNRegGetValueA)(HKEY, LPCSTR, LPCSTR, DWORD, LPDWORD, PVO
# define CSIDL_FLAG_CREATE 0x8000
#endif

#ifndef RRF_SUBKEY_WOW6464KEY
# define RRF_SUBKEY_WOW6464KEY 0x00010000
#endif

/* Use explicit struct definition because wSuiteMask and
* wProductType are not defined in the VC++ 6.0 headers.
* WORD type has been replaced by unsigned short because
Expand Down Expand Up @@ -1693,7 +1697,7 @@ XS(w32_IsDeveloperModeEnabled)
HKEY_LOCAL_MACHINE,
"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\AppModelUnlock",
"AllowDevelopmentWithoutDevLicense",
RRF_RT_REG_DWORD | KEY_WOW64_64KEY,
RRF_RT_REG_DWORD | RRF_SUBKEY_WOW6464KEY,
NULL,
&val,
&val_size
Expand Down

0 comments on commit 08962c5

Please sign in to comment.