André Hentschel : setupapi/tests: Better clean up if SetupUninstallOEMInf fails.

Alexandre Julliard julliard at winehq.org
Mon Dec 27 10:03:57 CST 2010


Module: wine
Branch: master
Commit: 424fa9a7f333363946f83e2c7b5e13a6eaf78256
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=424fa9a7f333363946f83e2c7b5e13a6eaf78256

Author: André Hentschel <nerv at dawncrow.de>
Date:   Sat Dec 25 00:05:35 2010 +0100

setupapi/tests: Better clean up if SetupUninstallOEMInf fails.

---

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

diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c
index f2d885d..35b21d1 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
     {




More information about the wine-cvs mailing list