msi: Handle the remote case in MsiSummaryInfoGetPropertyCount.
Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru> Signed-off-by: Hans Leidekker <hans@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
190ef475fa
commit
00b8b3c5e0
|
@ -600,7 +600,25 @@ UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIHANDLE hSummaryInfo, PUINT pCount)
|
||||||
|
|
||||||
si = msihandle2msiinfo( hSummaryInfo, MSIHANDLETYPE_SUMMARYINFO );
|
si = msihandle2msiinfo( hSummaryInfo, MSIHANDLETYPE_SUMMARYINFO );
|
||||||
if( !si )
|
if( !si )
|
||||||
return ERROR_INVALID_HANDLE;
|
{
|
||||||
|
MSIHANDLE remote;
|
||||||
|
UINT ret;
|
||||||
|
|
||||||
|
if (!(remote = msi_get_remote( hSummaryInfo )))
|
||||||
|
return ERROR_INVALID_HANDLE;
|
||||||
|
|
||||||
|
__TRY
|
||||||
|
{
|
||||||
|
ret = remote_SummaryInfoGetPropertyCount( remote, pCount );
|
||||||
|
}
|
||||||
|
__EXCEPT(rpc_filter)
|
||||||
|
{
|
||||||
|
ret = GetExceptionCode();
|
||||||
|
}
|
||||||
|
__ENDTRY
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
if( pCount )
|
if( pCount )
|
||||||
*pCount = get_property_count( si->property );
|
*pCount = get_property_count( si->property );
|
||||||
|
@ -1127,3 +1145,8 @@ UINT msi_load_suminfo_properties( MSIPACKAGE *package )
|
||||||
msiobj_release( &si->hdr );
|
msiobj_release( &si->hdr );
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
UINT __cdecl s_remote_SummaryInfoGetPropertyCount( MSIHANDLE suminfo, UINT *count )
|
||||||
|
{
|
||||||
|
return MsiSummaryInfoGetPropertyCount( suminfo, count );
|
||||||
|
}
|
||||||
|
|
|
@ -456,14 +456,11 @@ static void test_db(MSIHANDLE hinst)
|
||||||
ok(hinst, !r, "got %u\n", r);
|
ok(hinst, !r, "got %u\n", r);
|
||||||
|
|
||||||
r = MsiSummaryInfoGetPropertyCount(suminfo, NULL);
|
r = MsiSummaryInfoGetPropertyCount(suminfo, NULL);
|
||||||
todo_wine
|
|
||||||
ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r);
|
ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r);
|
||||||
|
|
||||||
count = 0xdeadbeef;
|
count = 0xdeadbeef;
|
||||||
r = MsiSummaryInfoGetPropertyCount(suminfo, &count);
|
r = MsiSummaryInfoGetPropertyCount(suminfo, &count);
|
||||||
todo_wine
|
|
||||||
ok(hinst, !r, "got %u\n", r);
|
ok(hinst, !r, "got %u\n", r);
|
||||||
todo_wine
|
|
||||||
ok(hinst, count == 5, "got %u\n", count);
|
ok(hinst, count == 5, "got %u\n", count);
|
||||||
|
|
||||||
r = MsiSummaryInfoGetPropertyA(suminfo, 0, NULL, NULL, NULL, NULL, NULL);
|
r = MsiSummaryInfoGetPropertyA(suminfo, 0, NULL, NULL, NULL, NULL, NULL);
|
||||||
|
|
|
@ -74,6 +74,8 @@ interface IWineMsiRemote
|
||||||
UINT remote_DatabaseGetSummaryInformation( [in] MSIHANDLE db, [in] UINT updatecount, [out] MSIHANDLE *suminfo );
|
UINT remote_DatabaseGetSummaryInformation( [in] MSIHANDLE db, [in] UINT updatecount, [out] MSIHANDLE *suminfo );
|
||||||
UINT remote_DatabaseOpenView( [in] MSIHANDLE db, [in, string] LPCWSTR query, [out] MSIHANDLE *view );
|
UINT remote_DatabaseOpenView( [in] MSIHANDLE db, [in, string] LPCWSTR query, [out] MSIHANDLE *view );
|
||||||
|
|
||||||
|
UINT remote_SummaryInfoGetPropertyCount( [in] MSIHANDLE suminfo, [out] UINT *count );
|
||||||
|
|
||||||
MSIHANDLE remote_GetActiveDatabase( [in] MSIHANDLE hinst );
|
MSIHANDLE remote_GetActiveDatabase( [in] MSIHANDLE hinst );
|
||||||
UINT remote_GetProperty( [in] MSIHANDLE hinst, [in, string] LPCWSTR property, [out, string] LPWSTR *value, [out] DWORD *size );
|
UINT remote_GetProperty( [in] MSIHANDLE hinst, [in, string] LPCWSTR property, [out, string] LPWSTR *value, [out] DWORD *size );
|
||||||
UINT remote_SetProperty( [in] MSIHANDLE hinst, [in, string, unique] LPCWSTR property, [in, string, unique] LPCWSTR value );
|
UINT remote_SetProperty( [in] MSIHANDLE hinst, [in, string, unique] LPCWSTR property, [in, string, unique] LPCWSTR value );
|
||||||
|
|
Loading…
Reference in New Issue