[PATCH 4/5] msi: Handle the remote case in MsiSummaryInfoGetProperty.

29 Aug 2018

This patch fixes the regression introduced by bf5589311de8ac2c74e3bd73bef32337a2ce8df2.

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
 dlls/msi/suminfo.c      | 58 +++++++++++++++++++++++++++++++++++++++++
 dlls/msi/tests/custom.c |  7 -----
 dlls/msi/winemsi.idl    |  2 ++
 3 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c
index af8b03cacd..2045123c42 100644
--- a/dlls/msi/suminfo.c
+++ b/dlls/msi/suminfo.c
@@ -725,7 +725,27 @@ UINT WINAPI MsiSummaryInfoGetPropertyA(
     }
 
     if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO )))
+    {
+        MSIHANDLE remote;
+
+        if ((remote = msi_get_remote( handle )))
+        {
+            WCHAR *buf = NULL;
+
+            /* FIXME: should use SEH */
+            if (!puiDataType || !piValue || !pftValue || !szValueBuf || !pcchValueBuf)
+                return RPC_X_NULL_REF_POINTER;
+
+            r = remote_SummaryInfoGetProperty( remote, uiProperty, puiDataType, piValue, pftValue, &buf );
+            if (!r)
+                r = msi_strncpyWtoA( buf, -1, szValueBuf, pcchValueBuf, TRUE );
+
+            midl_user_free( buf );
+            return r;
+        }
+
         return ERROR_INVALID_HANDLE;
+    }
 
     str.unicode = FALSE;
     str.str.a = szValueBuf;
@@ -753,7 +773,27 @@ UINT WINAPI MsiSummaryInfoGetPropertyW(
     }
 
     if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO )))
+    {
+        MSIHANDLE remote;
+
+        if ((remote = msi_get_remote( handle )))
+        {
+            WCHAR *buf = NULL;
+
+            /* FIXME: should use SEH */
+            if (!puiDataType || !piValue || !pftValue || !szValueBuf || !pcchValueBuf)
+                return RPC_X_NULL_REF_POINTER;
+
+            r = remote_SummaryInfoGetProperty( remote, uiProperty, puiDataType, piValue, pftValue, &buf );
+            if (!r)
+                r = msi_strncpyW( buf, -1, szValueBuf, pcchValueBuf );
+
+            midl_user_free( buf );
+            return r;
+        }
+
         return ERROR_INVALID_HANDLE;
+    }
 
     str.unicode = TRUE;
     str.str.w = szValueBuf;
@@ -1134,3 +1174,21 @@ UINT __cdecl s_remote_SummaryInfoGetPropertyCount( MSIHANDLE suminfo, UINT *coun
 {
     return MsiSummaryInfoGetPropertyCount( suminfo, count );
 }
+
+UINT __cdecl s_remote_SummaryInfoGetProperty( MSIHANDLE suminfo, UINT property, UINT *type,
+                                              INT *value, FILETIME *ft, LPWSTR *buf )
+{
+    WCHAR empty[1];
+    DWORD size = 0;
+    UINT r;
+
+    r = MsiSummaryInfoGetPropertyW( suminfo, property, type, value, ft, empty, &size );
+    if (r == ERROR_MORE_DATA)
+    {
+        size++;
+        *buf = midl_user_allocate( size * sizeof(WCHAR) );
+        if (!*buf) return ERROR_OUTOFMEMORY;
+        r = MsiSummaryInfoGetPropertyW( suminfo, property, type, value, ft, *buf, &size );
+    }
+    return r;
+}
diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c
index eb0ed625ef..a727bbd4df 100644
--- a/dlls/msi/tests/custom.c
+++ b/dlls/msi/tests/custom.c
@@ -464,7 +464,6 @@ static void test_db(MSIHANDLE hinst)
     ok(hinst, count == 5, "got %u\n", count);
 
     r = MsiSummaryInfoGetPropertyA(suminfo, 0, NULL, NULL, NULL, NULL, NULL);
-todo_wine
     ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r);
 
     type = 0xdeadbeef;
@@ -472,11 +471,8 @@ todo_wine
     strcpy(buffer, "deadbeef");
     sz = sizeof(buffer);
     r = MsiSummaryInfoGetPropertyA(suminfo, PID_AUTHOR, &type, &int_value, &ft, buffer, &sz);
-todo_wine
     ok(hinst, !r, "got %u\n", r);
-todo_wine
     ok(hinst, type == 0, "got %u\n", type);
-todo_wine
     ok(hinst, int_value == 0, "got %u\n", int_value);
     ok(hinst, sz == sizeof(buffer), "got %u\n", sz);
     ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer);
@@ -486,11 +482,8 @@ todo_wine
     strcpy(buffer, "deadbeef");
     sz = sizeof(buffer);
     r = MsiSummaryInfoGetPropertyA(suminfo, PID_CODEPAGE, &type, &int_value, &ft, buffer, &sz);
-todo_wine
     ok(hinst, !r, "got %u\n", r);
-todo_wine
     ok(hinst, type == 0, "got %u\n", type);
-todo_wine
     ok(hinst, int_value == 0, "got %u\n", int_value);
     ok(hinst, sz == sizeof(buffer), "got %u\n", sz);
     ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer);
diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl
index 5a14ffdb79..ebbca82a16 100644
--- a/dlls/msi/winemsi.idl
+++ b/dlls/msi/winemsi.idl
@@ -75,6 +75,8 @@ interface IWineMsiRemote
     UINT remote_DatabaseOpenView( [in] MSIHANDLE db, [in, string] LPCWSTR query, [out] MSIHANDLE *view );
 
     UINT remote_SummaryInfoGetPropertyCount( [in] MSIHANDLE suminfo, [out] UINT *count );
+    UINT remote_SummaryInfoGetProperty( [in] MSIHANDLE suminfo, [in] UINT property, [out] UINT *type, [out] INT *value,
+                                        [out] FILETIME *ft, [out, string] LPWSTR *buf );
 
     MSIHANDLE remote_GetActiveDatabase( [in] MSIHANDLE hinst );
     UINT remote_GetProperty( [in] MSIHANDLE hinst, [in, string] LPCWSTR property, [out, string] LPWSTR *value, [out] DWORD *size );
-- 
2.17.1

    

Dmitry Timoshkov

Nikolay Sivov

Dmitry Timoshkov

Zebediah Figura

Marvin

tags

participants (4)