[ros-diffs] [reactos] 143/360: [WINESYNC] msi: Handle the remote case in MsiSummaryInfoGetPropertyCount.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=28c46d90e1f8174104a67…

commit 28c46d90e1f8174104a67a8b73770ce7f578c78e
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Sat Mar 12 23:57:40 2022 +0100
Commit:     Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Sun Mar 20 19:28:01 2022 +0100

    [WINESYNC] msi: Handle the remote case in MsiSummaryInfoGetPropertyCount.
    
    Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
    Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 00b8b3c5e0e04d229cfb9f8d8294113e5b30e9b4 by Dmitry Timoshkov
<dmitry(a)baikal.ru>
---
 dll/win32/msi/suminfo.c                 | 25 ++++++++++++++++++++++++-
 dll/win32/msi/winemsi.idl               |  2 ++
 modules/rostests/winetests/msi/custom.c |  3 ---
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/dll/win32/msi/suminfo.c b/dll/win32/msi/suminfo.c
index b3d605400f3..07ee1d4197e 100644
--- a/dll/win32/msi/suminfo.c
+++ b/dll/win32/msi/suminfo.c
@@ -615,7 +615,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 );
@@ -1261,3 +1279,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/dll/win32/msi/winemsi.idl b/dll/win32/msi/winemsi.idl
index 50f62fcbfd8..5a14ffdb796 100644
--- a/dll/win32/msi/winemsi.idl
+++ b/dll/win32/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 );
diff --git a/modules/rostests/winetests/msi/custom.c
b/modules/rostests/winetests/msi/custom.c
index 0ba5f10c88d..eb0ed625ef7 100644
--- a/modules/rostests/winetests/msi/custom.c
+++ b/modules/rostests/winetests/msi/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);