[PATCH 3/5] msi: Handle the remote case in MsiSummaryInfoGetPropertyCount.
Dmitry Timoshkov
dmitry at baikal.ru
Wed Aug 29 04:28:53 CDT 2018
Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
---
dlls/msi/suminfo.c | 17 +++++++++++++++++
dlls/msi/tests/custom.c | 3 ---
dlls/msi/winemsi.idl | 2 ++
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c
index 347303acd5..af8b03cacd 100644
--- a/dlls/msi/suminfo.c
+++ b/dlls/msi/suminfo.c
@@ -590,7 +590,19 @@ UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIHANDLE hSummaryInfo, PUINT pCount)
si = msihandle2msiinfo( hSummaryInfo, MSIHANDLETYPE_SUMMARYINFO );
if( !si )
+ {
+ MSIHANDLE remote;
+
+ if ((remote = msi_get_remote( hSummaryInfo )))
+ {
+ /* FIXME: should use SEH */
+ if (!pCount) return RPC_X_NULL_REF_POINTER;
+
+ return remote_SummaryInfoGetPropertyCount( remote, pCount );
+ }
+
return ERROR_INVALID_HANDLE;
+ }
if( pCount )
*pCount = get_property_count( si->property );
@@ -1117,3 +1129,8 @@ UINT msi_load_suminfo_properties( MSIPACKAGE *package )
msiobj_release( &si->hdr );
return r;
}
+
+UINT __cdecl s_remote_SummaryInfoGetPropertyCount( MSIHANDLE suminfo, UINT *count )
+{
+ return MsiSummaryInfoGetPropertyCount( suminfo, count );
+}
diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c
index 0ba5f10c88..eb0ed625ef 100644
--- a/dlls/msi/tests/custom.c
+++ b/dlls/msi/tests/custom.c
@@ -456,14 +456,11 @@ static void test_db(MSIHANDLE hinst)
ok(hinst, !r, "got %u\n", r);
r = MsiSummaryInfoGetPropertyCount(suminfo, NULL);
-todo_wine
ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r);
count = 0xdeadbeef;
r = MsiSummaryInfoGetPropertyCount(suminfo, &count);
-todo_wine
ok(hinst, !r, "got %u\n", r);
-todo_wine
ok(hinst, count == 5, "got %u\n", count);
r = MsiSummaryInfoGetPropertyA(suminfo, 0, NULL, NULL, NULL, NULL, NULL);
diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl
index 50f62fcbfd..5a14ffdb79 100644
--- a/dlls/msi/winemsi.idl
+++ b/dlls/msi/winemsi.idl
@@ -74,6 +74,8 @@ interface IWineMsiRemote
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_SummaryInfoGetPropertyCount( [in] MSIHANDLE suminfo, [out] UINT *count );
+
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_SetProperty( [in] MSIHANDLE hinst, [in, string, unique] LPCWSTR property, [in, string, unique] LPCWSTR value );
--
2.17.1
More information about the wine-devel
mailing list