From 424fa9a7f333363946f83e2c7b5e13a6eaf78256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= <nerv@dawncrow.de>
Date: Sat, 25 Dec 2010 00:05:35 +0100
Subject: [PATCH] setupapi/tests: Better clean up if SetupUninstallOEMInf
 fails.

---
 dlls/setupapi/tests/misc.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c
index f2d885d990..35b21d1fb3 100644
--- a/dlls/setupapi/tests/misc.c
+++ b/dlls/setupapi/tests/misc.c
@@ -315,7 +315,14 @@ static void test_SetupCopyOEMInf(void)
         char *destfile = strrchr(dest, '\\') + 1;
 
         SetLastError(0xdeadbeef);
-        ok(pSetupUninstallOEMInfA(destfile, 0, NULL), "Failed to uninstall '%s' : %d\n", destfile, GetLastError());
+        res = pSetupUninstallOEMInfA(destfile, 0, NULL);
+        ok(res, "Failed to uninstall '%s' : %d\n", destfile, GetLastError());
+        if(!res)
+        {
+            SetLastError(0xdeadbeef);
+            res = DeleteFileA(dest);
+            ok(res, "Failed to delete file '%s' : %d\n", dest, GetLastError());
+        }
     }
     else
     {