Paul Vriens : msi/tests: Fix test failures on W2K with Windows Installer 3. 0.

Alexandre Julliard julliard at winehq.org
Thu Mar 25 11:44:45 CDT 2010


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

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Thu Mar 25 10:52:37 2010 +0100

msi/tests: Fix test failures on W2K with Windows Installer 3.0.

---

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

diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c
index e4ae619..428f4f5 100644
--- a/dlls/msi/tests/msi.c
+++ b/dlls/msi/tests/msi.c
@@ -8221,7 +8221,9 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds
     r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
                            MSIPATCHSTATE_APPLIED, 0, patchcode, targetprod,
                            &context, targetsid, &size);
-    ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
+    ok(r == ERROR_NO_MORE_ITEMS ||
+       broken(r == ERROR_BAD_CONFIGURATION), /* Windows Installer 3.0 */
+       "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
     ok(!lstrcmpA(patchcode, "apple"),
        "Expected patchcode to be unchanged, got %s\n", patchcode);
     ok(!lstrcmpA(targetprod, "banana"),
@@ -8245,7 +8247,9 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds
     r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
                            MSIPATCHSTATE_APPLIED, 0, patchcode, targetprod,
                            &context, targetsid, &size);
-    ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
+    ok(r == ERROR_NO_MORE_ITEMS ||
+       broken(r == ERROR_BAD_CONFIGURATION), /* Windows Installer 3.0 */
+       "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
     ok(!lstrcmpA(patchcode, "apple"),
        "Expected patchcode to be unchanged, got %s\n", patchcode);
     ok(!lstrcmpA(targetprod, "banana"),




More information about the wine-cvs mailing list