>From f31fc83fffcc32807a4276a5f7375d9586d2d9b4 Mon Sep 17 00:00:00 2001 From: Paul Vriens Date: Thu, 25 Mar 2010 10:52:37 +0100 Subject: [PATCH 3/3] 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"), -- 1.6.2.5