msi: suminfo: Return ERROR_UNKNOWN_PROPERTY as native.

This commit is contained in:
Misha Koshelev 2007-06-04 09:25:47 -05:00 committed by Alexandre Julliard
parent b9ea25721b
commit 8b2d0d3e34
2 changed files with 10 additions and 14 deletions

View File

@ -529,16 +529,16 @@ static UINT get_prop( MSIHANDLE handle, UINT uiProperty, UINT *puiDataType,
TRACE("%ld %d %p %p %p %p %p\n", handle, uiProperty, puiDataType, TRACE("%ld %d %p %p %p %p %p\n", handle, uiProperty, puiDataType,
piValue, pftValue, str, pcchValueBuf); piValue, pftValue, str, pcchValueBuf);
if ( uiProperty >= MSI_MAX_PROPS )
{
if (puiDataType) *puiDataType = VT_EMPTY;
return ERROR_UNKNOWN_PROPERTY;
}
si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ); si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO );
if( !si ) if( !si )
return ERROR_INVALID_HANDLE; return ERROR_INVALID_HANDLE;
if ( uiProperty >= MSI_MAX_PROPS )
{
*puiDataType = VT_EMPTY;
return ret;
}
prop = &si->property[uiProperty]; prop = &si->property[uiProperty];
if( puiDataType ) if( puiDataType )

View File

@ -99,15 +99,11 @@ static void test_suminfo(void)
r = MsiSummaryInfoGetProperty(hsuminfo, 0, NULL, NULL, NULL, 0, NULL); r = MsiSummaryInfoGetProperty(hsuminfo, 0, NULL, NULL, NULL, 0, NULL);
ok(r == ERROR_SUCCESS, "getpropcount failed\n"); ok(r == ERROR_SUCCESS, "getpropcount failed\n");
/* Page faults in wine */ r = MsiSummaryInfoGetProperty(hsuminfo, -1, NULL, NULL, NULL, 0, NULL);
if (0) ok(r == ERROR_UNKNOWN_PROPERTY, "MsiSummaryInfoGetProperty wrong error\n");
{
r = MsiSummaryInfoGetProperty(hsuminfo, -1, NULL, NULL, NULL, 0, NULL);
ok(r == ERROR_UNKNOWN_PROPERTY, "MsiSummaryInfoGetProperty wrong error\n");
r = MsiSummaryInfoGetProperty(hsuminfo, PID_SECURITY+1, NULL, NULL, NULL, 0, NULL); r = MsiSummaryInfoGetProperty(hsuminfo, PID_SECURITY+1, NULL, NULL, NULL, 0, NULL);
ok(r == ERROR_UNKNOWN_PROPERTY, "MsiSummaryInfoGetProperty wrong error\n"); ok(r == ERROR_UNKNOWN_PROPERTY, "MsiSummaryInfoGetProperty wrong error\n");
}
type = -1; type = -1;
r = MsiSummaryInfoGetProperty(hsuminfo, 0, &type, NULL, NULL, 0, NULL); r = MsiSummaryInfoGetProperty(hsuminfo, 0, &type, NULL, NULL, 0, NULL);