[PATCH] msi: Check return value of GetBinaryType().

Zebediah Figura z.figura12 at gmail.com
Fri May 4 00:32:57 CDT 2018


Fixes test failures on 64-bit Wine.

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 dlls/msi/custom.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c
index ca0362b..956b3e9 100644
--- a/dlls/msi/custom.c
+++ b/dlls/msi/custom.c
@@ -585,6 +585,7 @@ static DWORD WINAPI DllThread( LPVOID arg )
     void *cookie;
     BOOL wow64;
     DWORD arch;
+    BOOL ret;
     DWORD rc;
 
     TRACE("custom action (%x) started\n", GetCurrentThreadId() );
@@ -607,9 +608,9 @@ static DWORD WINAPI DllThread( LPVOID arg )
     }
 
     info = find_action_by_guid(guid);
-    GetBinaryTypeW(info->source, &arch);
+    ret = GetBinaryTypeW(info->source, &arch);
 
-    if (sizeof(void *) == 8 && arch == SCS_32BIT_BINARY)
+    if (sizeof(void *) == 8 && ret && arch == SCS_32BIT_BINARY)
         GetSystemWow64DirectoryW(buffer, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR));
     else
         GetSystemDirectoryW(buffer, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR));
-- 
2.7.4




More information about the wine-devel mailing list