Dmitry Timoshkov : msi: Handle the remote case in MsiSummaryInfoGetPropertyCount.
Alexandre Julliard
julliard at winehq.org
Mon Sep 10 16:01:07 CDT 2018
Module: wine
Branch: master
Commit: 00b8b3c5e0e04d229cfb9f8d8294113e5b30e9b4
URL: https://source.winehq.org/git/wine.git/?a=commit;h=00b8b3c5e0e04d229cfb9f8d8294113e5b30e9b4
Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date: Sat Sep 8 11:45:35 2018 +0800
msi: Handle the remote case in MsiSummaryInfoGetPropertyCount.
Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msi/suminfo.c | 25 ++++++++++++++++++++++++-
dlls/msi/tests/custom.c | 3 ---
dlls/msi/winemsi.idl | 2 ++
3 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c
index 8c844a6..d2bf678 100644
--- a/dlls/msi/suminfo.c
+++ b/dlls/msi/suminfo.c
@@ -600,7 +600,25 @@ UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIHANDLE hSummaryInfo, PUINT pCount)
si = msihandle2msiinfo( hSummaryInfo, MSIHANDLETYPE_SUMMARYINFO );
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 )
*pCount = get_property_count( si->property );
@@ -1127,3 +1145,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 0ba5f10..eb0ed62 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 50f62fc..5a14ffd 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 );
More information about the wine-cvs
mailing list