diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 49cdca3bfb3..46178b80bd0 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -2103,7 +2103,8 @@ static void test_Installer_RegistryValue(void) "RegSetValueExW failed\n"); ok(!RegSetValueExW(hkey,szThree,0,REG_BINARY, (const BYTE *)qw, 4), "RegSetValueExW failed\n"); - ok(SetEnvironmentVariableA("MSITEST", "Four"), "SetEnvironmentVariableA failed %d\n", GetLastError()); + bRet = SetEnvironmentVariableA("MSITEST", "Four"); + ok(bRet, "SetEnvironmentVariableA failed %d\n", GetLastError()); ok(!RegSetValueExW(hkey,szFour,0,REG_EXPAND_SZ, (const BYTE *)szExpand, sizeof(szExpand)), "RegSetValueExW failed\n"); ok(!RegSetValueExW(hkey,szFive,0,REG_MULTI_SZ, (const BYTE *)szFive, sizeof(szFive)), diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index ad5a35598a0..54613873e07 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -5546,6 +5546,7 @@ static void process_pending_renames(HKEY hkey) for (src = buf; *src; src = dst + strlen(dst) + 1) { DWORD flags = MOVEFILE_COPY_ALLOWED; + BOOL fileret; dst = src + strlen(src) + 1; @@ -5573,10 +5574,14 @@ static void process_pending_renames(HKEY hkey) if (*dst) { if (dst[0] == '\\' && dst[1] == '?' && dst[2] == '?' && dst[3] == '\\') dst += 4; - ok(MoveFileExA(src, dst, flags), "Failed to move file %s -> %s (%u)\n", src, dst, GetLastError()); + fileret = MoveFileExA(src, dst, flags); + ok(fileret, "Failed to move file %s -> %s (%u)\n", src, dst, GetLastError()); } else - ok(DeleteFileA(src), "Failed to delete file %s (%u)\n", src, GetLastError()); + { + fileret = DeleteFileA(src); + ok(fileret, "Failed to delete file %s (%u)\n", src, GetLastError()); + } } ok(found, "Expected a 'msitest' entry\n");