Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIXBUG:4681 #218

Merged
merged 1 commit into from Mar 4, 2015
Merged

WIXBUG:4681 #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions History.md
View file
Open in desktop
@@ -1,3 +1,5 @@
* thfabba: WIXBUG:4681 - Corrected return type on the lone WOW64 redirection function that returns a BOOLEAN instead of BOOL.

* SeanHall: WIXBUG:4689 - Fix hidden numeric and version variables.

## WixBuild: Version 3.10.0.1502
Expand Down
4 changes: 2 additions & 2 deletions src/libs/dutil/xmlutil.cpp
View file
Open in desktop
Expand Up @@ -130,7 +130,7 @@ extern "C" HRESULT DAPI XmlCreateDocument(
{
HRESULT hr = S_OK;
BOOL (WINAPI *pfnDisableWow64)(__out PVOID* ) = NULL;
BOOL (WINAPI *pfnEnableWow64)(__in BOOLEAN ) = NULL;
BOOLEAN (WINAPI *pfnEnableWow64)(__in BOOLEAN ) = NULL;
BOOL (WINAPI *pfnRevertWow64)(__in PVOID ) = NULL;
BOOL fWow64Available = FALSE;
void *pvWow64State = NULL;
Expand All @@ -147,7 +147,7 @@ extern "C" HRESULT DAPI XmlCreateDocument(
if (NULL != GetProcAddress(hKernel32, "IsWow64Process"))
{
pfnDisableWow64 = (BOOL (WINAPI *)(PVOID *))::GetProcAddress(hKernel32, "Wow64DisableWow64FsRedirection");
pfnEnableWow64 = (BOOL (WINAPI *)(BOOLEAN))::GetProcAddress(hKernel32, "Wow64EnableWow64FsRedirection");
pfnEnableWow64 = (BOOLEAN (WINAPI *)(BOOLEAN))::GetProcAddress(hKernel32, "Wow64EnableWow64FsRedirection");
pfnRevertWow64 = (BOOL (WINAPI *)(PVOID))::GetProcAddress(hKernel32, "Wow64RevertWow64FsRedirection");

fWow64Available = pfnDisableWow64 && pfnEnableWow64 && pfnRevertWow64;
Expand Down