[PATCH] msi: GetBinaryType() doesn't accept DLLs.
Hans Leidekker
hans at codeweavers.com
Fri Dec 10 05:51:43 CST 2021
With help from Dmitry Timoshkov.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51790
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
---
dlls/msi/custom.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 49 insertions(+), 1 deletion(-)
diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c
index fb03958eb11..19ad3917265 100644
--- a/dlls/msi/custom.c
+++ b/dlls/msi/custom.c
@@ -22,6 +22,9 @@
#include <stdarg.h>
#include <stdio.h>
+
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
@@ -697,6 +700,51 @@ static DWORD WINAPI custom_client_thread(void *arg)
return rc;
}
+/* based on kernel32.GetBinaryTypeW() */
+static BOOL get_binary_type( const WCHAR *name, DWORD *type )
+{
+ HANDLE hfile, mapping;
+ NTSTATUS status;
+
+ hfile = CreateFileW( name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 );
+ if (hfile == INVALID_HANDLE_VALUE)
+ return FALSE;
+
+ status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY, NULL, NULL, PAGE_READONLY,
+ SEC_IMAGE, hfile );
+ CloseHandle( hfile );
+
+ switch (status)
+ {
+ case STATUS_SUCCESS:
+ {
+ SECTION_IMAGE_INFORMATION info;
+
+ status = NtQuerySection( mapping, SectionImageInformation, &info, sizeof(info), NULL );
+ CloseHandle( mapping );
+ if (status) return FALSE;
+ switch (info.Machine)
+ {
+ case IMAGE_FILE_MACHINE_I386:
+ case IMAGE_FILE_MACHINE_ARMNT:
+ *type = SCS_32BIT_BINARY;
+ return TRUE;
+ case IMAGE_FILE_MACHINE_AMD64:
+ case IMAGE_FILE_MACHINE_ARM64:
+ *type = SCS_64BIT_BINARY;
+ return TRUE;
+ default:
+ return FALSE;
+ }
+ }
+ case STATUS_INVALID_IMAGE_WIN_64:
+ *type = SCS_64BIT_BINARY;
+ return TRUE;
+ default:
+ return FALSE;
+ }
+}
+
static msi_custom_action_info *do_msidbCustomActionTypeDll(
MSIPACKAGE *package, INT type, LPCWSTR source, LPCWSTR target, LPCWSTR action )
{
@@ -744,7 +792,7 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll(
info->package->rpc_server_started = 1;
}
- ret = GetBinaryTypeW(source, &info->arch);
+ ret = get_binary_type(source, &info->arch);
if (!ret)
info->arch = (sizeof(void *) == 8 ? SCS_64BIT_BINARY : SCS_32BIT_BINARY);
--
2.30.2
More information about the wine-devel
mailing list