Commit f6990085 authored by Greg Geldorp's avatar Greg Geldorp Committed by Alexandre Julliard

setupapi/tests: Uninstall .pnf if uninstall of .inf failed.

parent b00117d4
...@@ -312,17 +312,34 @@ static void test_SetupCopyOEMInf(void) ...@@ -312,17 +312,34 @@ static void test_SetupCopyOEMInf(void)
if (pSetupUninstallOEMInfA) if (pSetupUninstallOEMInfA)
{ {
char pnf[MAX_PATH];
char *pnffile;
char *destfile = strrchr(dest, '\\') + 1; char *destfile = strrchr(dest, '\\') + 1;
strcpy(pnf, dest);
*(strrchr(pnf, '.') + 1) = 'p';
pnffile = strrchr(pnf, '\\') + 1;
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
res = pSetupUninstallOEMInfA(destfile, 0, NULL); res = pSetupUninstallOEMInfA(destfile, 0, NULL);
ok(res, "Failed to uninstall '%s' : %d\n", destfile, GetLastError());
if(!res) if(!res)
res = pSetupUninstallOEMInfA(pnffile, 0, NULL);
ok(res, "Failed to uninstall '%s'/'%s' : %d\n", destfile,
pnffile, GetLastError());
todo_wine ok(!file_exists(dest), "Expected inf '%s' to not exist\n", dest);
if(file_exists(dest))
{ {
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
res = DeleteFileA(dest); res = DeleteFileA(dest);
ok(res, "Failed to delete file '%s' : %d\n", dest, GetLastError()); ok(res, "Failed to delete file '%s' : %d\n", dest, GetLastError());
} }
ok(!file_exists(pnf), "Expected pnf '%s' to not exist\n", pnf);
if(file_exists(pnf))
{
SetLastError(0xdeadbeef);
res = DeleteFileA(pnf);
ok(res, "Failed to delete file '%s' : %d\n", pnf, GetLastError());
}
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment