marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi/tests: Don't test function directly when reporting GetLastError().

oldstable
André Hentschel 2010-12-30 02:40:43 +01:00 committed by Alexandre Julliard
parent cea221caa0
commit 648025881f
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/msi/tests/automation.c
View File

@ -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)),

9
dlls/msi/tests/install.c
View File

@ -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");