ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Also check the local system component key for the clients.

This commit is contained in:
James Hawkins 2007-12-16 20:28:42 -06:00 committed by Alexandre Julliard
parent fced2fee2f
commit 3edd258fcd
2 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/msi/registry.c
View File

@ -1317,8 +1317,8 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct)
if (!szComponent || !*szComponent || !szProduct)
return ERROR_INVALID_PARAMETER;
r = MSIREG_OpenUserDataComponentKey(szComponent, &hkeyComp, FALSE);
if (r != ERROR_SUCCESS)
if (MSIREG_OpenUserDataComponentKey(szComponent, &hkeyComp, FALSE) != ERROR_SUCCESS &&
MSIREG_OpenLocalSystemComponentKey(szComponent, &hkeyComp, FALSE) != ERROR_SUCCESS)
return ERROR_UNKNOWN_COMPONENT;
sz = SQUISH_GUID_SIZE;

43
dlls/msi/tests/msi.c
View File

@ -1719,7 +1719,10 @@ static void test_MsiEnumClients(void)
/* user local component key exists */
product[0] = '\0';
r = MsiEnumClientsA(component, 0, product);
ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r);
todo_wine
{
ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r);
}
ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product);
/* index > 0, no products exist */
@ -1737,28 +1740,18 @@ static void test_MsiEnumClients(void)
/* product value exists */
product[0] = '\0';
r = MsiEnumClientsA(component, 0, product);
todo_wine
{
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(product, prodcode), "Expected %s, got %s\n", prodcode, product);
}
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(product, prodcode), "Expected %s, got %s\n", prodcode, product);
/* try index 0 again */
product[0] = '\0';
r = MsiEnumClientsA(component, 0, product);
todo_wine
{
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(product, prodcode), "Expected %s, got %s\n", prodcode, product);
}
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
/* try index 1, second product value does not exist */
product[0] = '\0';
r = MsiEnumClientsA(component, 1, product);
todo_wine
{
ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
}
ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product);
res = RegSetValueExA(compkey, prod2_squashed, 0, REG_SZ, (const BYTE *)"C:\\another", 10);
@ -1770,28 +1763,22 @@ static void test_MsiEnumClients(void)
todo_wine
{
ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product);
}
ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product);
/* start the enumeration over */
product[0] = '\0';
r = MsiEnumClientsA(component, 0, product);
todo_wine
{
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(product, prodcode) || !lstrcmpA(product, prodcode2),
"Expected %s or %s, got %s\n", prodcode, prodcode2, product);
}
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(product, prodcode) || !lstrcmpA(product, prodcode2),
"Expected %s or %s, got %s\n", prodcode, prodcode2, product);
/* correctly query second product */
product[0] = '\0';
r = MsiEnumClientsA(component, 1, product);
todo_wine
{
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(product, prodcode) || !lstrcmpA(product, prodcode2),
"Expected %s or %s, got %s\n", prodcode, prodcode2, product);
}
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(product, prodcode) || !lstrcmpA(product, prodcode2),
"Expected %s or %s, got %s\n", prodcode, prodcode2, product);
RegDeleteValueA(compkey, prod_squashed);
RegDeleteValueA(compkey, prod2_squashed);