Skip to content

Commit

Permalink
[MSI] CORE-18707 hack. Allow MSI under ROS amd64 to continue when Get…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
julenuri committed May 21, 2024
1 parent 1a16237 commit 1139f56
Showing 1 changed file with 22 additions and 0 deletions.
22 changes: 22 additions & 0 deletions dll/win32/msi/custom.c
Original file line number Diff line number Diff line change
Expand Up @@ -867,6 +867,17 @@ static UINT HANDLE_CustomType1( MSIPACKAGE *package, const WCHAR *source, const
if (!(binary = get_temp_binary(package, source)))
return ERROR_FUNCTION_FAILED;

#if defined(__REACTOS__) && defined(_M_AMD64)
{
DWORD arch;
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
}
}
#endif

TRACE("Calling function %s from %s\n", debugstr_w(target), debugstr_w(binary->tmpfile));

if (!(info = do_msidbCustomActionTypeDll( package, type, binary->tmpfile, target, action )))
Expand Down Expand Up @@ -975,6 +986,17 @@ static UINT HANDLE_CustomType17( MSIPACKAGE *package, const WCHAR *source, const
return ERROR_FUNCTION_FAILED;
}

#if defined(__REACTOS__) && defined(_M_AMD64)
{
DWORD arch;
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
}
}
#endif

if (!(info = do_msidbCustomActionTypeDll( package, type, file->TargetPath, target, action )))
return ERROR_FUNCTION_FAILED;
return wait_thread_handle( info );
Expand Down

0 comments on commit 1139f56

Please sign in to comment.