James Hawkins : msi: INSTALLPROPERTY_AUTHORIZED_LUA_APP is only available with msi >= 3.0.
Alexandre Julliard
julliard at winehq.org
Mon Mar 24 07:54:53 CDT 2008
Module: wine
Branch: master
Commit: 9048ecef83c8dbef301da28a0ad8a5ed2d61d061
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9048ecef83c8dbef301da28a0ad8a5ed2d61d061
Author: James Hawkins <jhawkins at codeweavers.com>
Date: Sun Mar 23 17:52:27 2008 -0700
msi: INSTALLPROPERTY_AUTHORIZED_LUA_APP is only available with msi >= 3.0.
---
dlls/msi/tests/msi.c | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c
index 62219fd..bb45d8d 100644
--- a/dlls/msi/tests/msi.c
+++ b/dlls/msi/tests/msi.c
@@ -3206,9 +3206,12 @@ static void test_MsiGetProductInfo(void)
sz = MAX_PATH;
lstrcpyA(buf, "apple");
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_AUTHORIZED_LUA_APP, buf, &sz);
- ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ if (r != ERROR_UNKNOWN_PROPERTY)
+ {
+ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+ ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
+ ok(sz == 0, "Expected 0, got %d\n", sz);
+ }
res = RegSetValueExA(propkey, "AuthorizedLUAApp", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
@@ -3218,9 +3221,12 @@ static void test_MsiGetProductInfo(void)
sz = MAX_PATH;
lstrcpyA(buf, "apple");
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_AUTHORIZED_LUA_APP, buf, &sz);
- ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
- ok(sz == 0, "Expected 0, got %d\n", sz);
+ if (r != ERROR_UNKNOWN_PROPERTY)
+ {
+ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+ ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
+ ok(sz == 0, "Expected 0, got %d\n", sz);
+ }
res = RegSetValueExA(prodkey, "AuthorizedLUAApp", 0, REG_SZ, (LPBYTE)"auth", 5);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@@ -3229,9 +3235,12 @@ static void test_MsiGetProductInfo(void)
sz = MAX_PATH;
lstrcpyA(buf, "apple");
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_AUTHORIZED_LUA_APP, buf, &sz);
- ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(!lstrcmpA(buf, "auth"), "Expected \"auth\", got \"%s\"\n", buf);
- ok(sz == 4, "Expected 4, got %d\n", sz);
+ if (r != ERROR_UNKNOWN_PROPERTY)
+ {
+ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+ ok(!lstrcmpA(buf, "auth"), "Expected \"auth\", got \"%s\"\n", buf);
+ ok(sz == 4, "Expected 4, got %d\n", sz);
+ }
res = RegSetValueExA(prodkey, "AuthorizedLUAApp", 0, REG_DWORD,
(const BYTE *)&val, sizeof(DWORD));
@@ -3241,9 +3250,12 @@ static void test_MsiGetProductInfo(void)
sz = MAX_PATH;
lstrcpyA(buf, "apple");
r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_AUTHORIZED_LUA_APP, buf, &sz);
- ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
- ok(sz == 2, "Expected 2, got %d\n", sz);
+ if (r != ERROR_UNKNOWN_PROPERTY)
+ {
+ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+ ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
+ ok(sz == 2, "Expected 2, got %d\n", sz);
+ }
RegDeleteValueA(propkey, "HelpLink");
RegDeleteValueA(propkey, "DisplayName");
More information about the wine-cvs
mailing list