Paul Vriens : msi/tests: Cleanup properly on Win9x.

Alexandre Julliard julliard at winehq.org
Mon Nov 15 13:28:47 CST 2010


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

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Sun Nov 14 19:39:42 2010 +0100

msi/tests: Cleanup properly on Win9x.

---

 dlls/msi/tests/install.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index ab73289..58bc681 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -5896,7 +5896,6 @@ static void test_icon_table(void)
     record = MsiCreateRecord(1);
     res = MsiRecordSetStream(record, 1, "icon.ico");
     ok(res == ERROR_SUCCESS, "Failed to add stream data to record: %d\n", res);
-    DeleteFile("icon.ico");
 
     query = "INSERT INTO `Icon` (`Name`, `Data`) VALUES ('testicon', ?)";
     res = run_query(hdb, record, query);
@@ -5904,6 +5903,8 @@ static void test_icon_table(void)
 
     res = MsiCloseHandle(record);
     ok(res == ERROR_SUCCESS, "Failed to close record handle: %d\n", res);
+    /* Delete the icon file after the handle is closed to make sure it's deleted on Win9x */
+    DeleteFileA("icon.ico");
     res = MsiDatabaseCommit(hdb);
     ok(res == ERROR_SUCCESS, "Failed to commit database: %d\n", res);
     res = MsiCloseHandle(hdb);




More information about the wine-cvs mailing list