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

msi: Validate the parameters of MsiEnumClients.

This commit is contained in:
James Hawkins 2007-12-16 20:27:22 -06:00 committed by Alexandre Julliard
parent 64c75d1e02
commit 5f7b95dadd
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/msi/registry.c
View File

@ -1284,6 +1284,9 @@ UINT WINAPI MsiEnumClientsA(LPCSTR szComponent, DWORD index, LPSTR szProduct)
TRACE("%s %d %p\n", debugstr_a(szComponent), index, szProduct);
if ( !szProduct )
return ERROR_INVALID_PARAMETER;
if( szComponent )
{
szwComponent = strdupAtoW( szComponent );
@ -1311,7 +1314,7 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct)
TRACE("%s %d %p\n", debugstr_w(szComponent), index, szProduct);
if (!szComponent || !szProduct)
if (!szComponent || !*szComponent || !szProduct)
return ERROR_INVALID_PARAMETER;
r = MSIREG_OpenComponentsKey(szComponent,&hkeyComp,FALSE);

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

@ -1618,18 +1618,12 @@ static void test_MsiEnumClients(void)
/* empty szComponent */
product[0] = '\0';
r = MsiEnumClientsA("", 0, product);
todo_wine
{
ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
}
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);
/* NULL lpProductBuf */
r = MsiEnumClientsA(component, 0, NULL);
todo_wine
{
ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
}
ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
/* all params correct, component missing */
product[0] = '\0';