André Hentschel : msi: Fix test failure on some 2k3 machines.

Alexandre Julliard julliard at winehq.org
Mon Dec 13 10:43:20 CST 2010


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

Author: André Hentschel <nerv at dawncrow.de>
Date:   Mon Dec 13 12:34:53 2010 +0100

msi: Fix test failure on some 2k3 machines.

---

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

diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c
index e08f6bb..bb0d65f 100644
--- a/dlls/msi/tests/msi.c
+++ b/dlls/msi/tests/msi.c
@@ -7946,6 +7946,11 @@ static void test_MsiOpenProduct(void)
     /* LocalPackage has just the package name */
     hprod = 0xdeadbeef;
     r = MsiOpenProductA(prodcode, &hprod);
+    if (r == ERROR_INSTALL_PACKAGE_REJECTED)
+    {
+        skip("Not enough rights to perform tests\n");
+        goto error;
+    }
     ok(r == ERROR_INSTALL_PACKAGE_OPEN_FAILED || r == ERROR_SUCCESS,
        "Expected ERROR_INSTALL_PACKAGE_OPEN_FAILED or ERROR_SUCCESS, got %d\n", r);
     if (r == ERROR_SUCCESS)
@@ -7968,6 +7973,7 @@ static void test_MsiOpenProduct(void)
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(hprod == 0xdeadbeef, "Expected hprod to be unchanged\n");
 
+error:
     RegDeleteValueA(props, "LocalPackage");
     delete_key(props, "", access & KEY_WOW64_64KEY);
     RegCloseKey(props);




More information about the wine-cvs mailing list