msi: Check return value of GetBinaryType().

Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Hans Leidekker <hans@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msi: Check return value of GetBinaryType().
deb4f970 · Zebediah Figura · Alexandre Julliard · b8c27cca · deb4f970
Commit deb4f970 authored May 04, 2018 by Zebediah Figura Committed by Alexandre Julliard May 04, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

custom.c dlls/msi/custom.c +3 -2

No files found.
--- 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));