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.

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

[MSI] CORE-18707 workaround. Allow MSI under ROS amd64 to continue when GetSystemWow64DirectoryW is called #6887

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

julenuri
Copy link
Contributor

@julenuri julenuri commented May 14, 2024

[MSI] CORE-18707 hack. Allow MSI under ROS amd64 to continue when GetSystemWow64DirectoryW is called

Purpose

Workaround (with a hack) a temporary situation since we have the WOW64 unimplemented (neither GetSystemWow64DirectoryW).

JIRA issue: CORE-18707

Proposed changes

  • Temporary workaround that avoids MSI to continue under our ROS Amd64.

TODO

  • Once merged, be careful in the future if the thing goes implemented.

@oleg-dubinskiy oleg-dubinskiy added the hackfix PRs that look like hacks/workarounds for deeper problems label May 14, 2024
dll/win32/msi/custom.c Outdated Show resolved Hide resolved
dll/win32/msi/custom.c Outdated Show resolved Hide resolved
dll/win32/msi/custom.c Outdated Show resolved Hide resolved
Copy link
Contributor

@HBelusca HBelusca left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

forgotten changes there too.

dll/win32/msi/custom.c Outdated Show resolved Hide resolved
dll/win32/msi/custom.c Outdated Show resolved Hide resolved
dll/win32/msi/custom.c Outdated Show resolved Hide resolved
Copy link
Contributor

@JoachimHenze JoachimHenze left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved, although it is a workaround. But if it helps you guys for now, why not. Thanks for using the preprocessor to make sure, that it definitely won't break anything for 32bit builds. Thumbs up.

ReactOS PRs automation moved this from New PRs to Approved by reviewers May 21, 2024
…SystemWow64DirectoryW is called

[MSI] Fix minor indentation and spaces before brackets.

[MSI] Minor fixes and correctly reporting ERR instead of WARN

[MSI] Fixing a warning and the whitespaces

[MSI] Minor fix whitespaces
Copy link
Member

@learn-more learn-more left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a big fan of the java style braces, but there's been too much whitespace nitpicking on this PR already.

get_binary_type(binary->tmpfile, &arch);
if (arch == SCS_32BIT_BINARY) {
ERR("%s is a 32 bit custom action. Returning as ERROR_SUCCESS\n", debugstr_w(source));
return ERROR_SUCCESS; // NO WOW64! return as executed though it's not true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return ERROR_SUCCESS; // NO WOW64! return as executed though it's not true
return ERROR_SUCCESS; // HACK: NO WOW64! return as executed though it's not true

get_binary_type(file->TargetPath, &arch);
if (arch == SCS_32BIT_BINARY) {
ERR("%s is a 32 bit custom action. Returning as ERROR_SUCCESS\n", debugstr_w(source));
return ERROR_SUCCESS; // NO WOW64! return as executed though it's not true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return ERROR_SUCCESS; // NO WOW64! return as executed though it's not true
return ERROR_SUCCESS; // HACK: NO WOW64! return as executed though it's not true

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hackfix PRs that look like hacks/workarounds for deeper problems
Projects
ReactOS PRs
  
Approved by reviewers
7 participants