Commit 8b2d0d3e authored by Misha Koshelev's avatar Misha Koshelev Committed by Alexandre Julliard

msi: suminfo: Return ERROR_UNKNOWN_PROPERTY as native.

parent b9ea2572
...@@ -529,16 +529,16 @@ static UINT get_prop( MSIHANDLE handle, UINT uiProperty, UINT *puiDataType, ...@@ -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);
si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO );
if( !si )
return ERROR_INVALID_HANDLE;
if ( uiProperty >= MSI_MAX_PROPS ) if ( uiProperty >= MSI_MAX_PROPS )
{ {
*puiDataType = VT_EMPTY; if (puiDataType) *puiDataType = VT_EMPTY;
return ret; return ERROR_UNKNOWN_PROPERTY;
} }
si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO );
if( !si )
return ERROR_INVALID_HANDLE;
prop = &si->property[uiProperty]; prop = &si->property[uiProperty];
if( puiDataType ) if( puiDataType )
......
...@@ -99,15 +99,11 @@ static void test_suminfo(void) ...@@ -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 */
if (0)
{
r = MsiSummaryInfoGetProperty(hsuminfo, -1, NULL, NULL, NULL, 0, NULL); r = MsiSummaryInfoGetProperty(hsuminfo, -1, NULL, NULL, NULL, 0, NULL);
ok(r == ERROR_UNKNOWN_PROPERTY, "MsiSummaryInfoGetProperty wrong error\n"); 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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment