Zebediah Figura : msi: Make MsiGetActiveDatabase() RPC-compatible.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a6934768d1070d91c764d5c88fe276a9d6163683
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=a6934768d1070d91c764d5c88...

Author: Zebediah Figura <z.figura12(a)gmail.com>
Date:   Wed Apr 18 18:40:02 2018 -0500

msi: Make MsiGetActiveDatabase() RPC-compatible.

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/msi/package.c      |  9 ++++-----
 dlls/msi/tests/custom.c | 13 +++++++++++++
 dlls/msi/winemsi.idl    |  2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/dlls/msi/package.c b/dlls/msi/package.c
index e7f51a6..d18736b 100644
--- a/dlls/msi/package.c
+++ b/dlls/msi/package.c
@@ -1686,7 +1686,8 @@ MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE hInstall)
     }
     else if ((remote = msi_get_remote(hInstall)))
     {
-        remote_GetActiveDatabase(remote, &handle);
+        handle = remote_GetActiveDatabase(remote);
+        handle = alloc_msi_remote_handle(handle);
     }
 
     return handle;
@@ -2420,11 +2421,9 @@ UINT WINAPI MsiGetPropertyW( MSIHANDLE hInstall, LPCWSTR szName,
     return MSI_GetProperty( hInstall, szName, &val, pchValueBuf );
 }
 
-HRESULT __cdecl remote_GetActiveDatabase(MSIHANDLE hinst, MSIHANDLE *handle)
+MSIHANDLE __cdecl remote_GetActiveDatabase(MSIHANDLE hinst)
 {
-    *handle = MsiGetActiveDatabase(hinst);
-
-    return S_OK;
+    return MsiGetActiveDatabase(hinst);
 }
 
 UINT __cdecl remote_GetProperty(MSIHANDLE hinst, LPCWSTR property, LPWSTR *value, DWORD *size)
diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c
index 8d32348..00dcab3 100644
--- a/dlls/msi/tests/custom.c
+++ b/dlls/msi/tests/custom.c
@@ -241,6 +241,18 @@ static void test_props(MSIHANDLE hinst)
     ok(hinst, !memcmp(buffer, "a\0\0\0\xcc", 5), "wrong data\n");
 }
 
+static void test_db(MSIHANDLE hinst)
+{
+    MSIHANDLE hdb;
+    UINT r;
+
+    hdb = MsiGetActiveDatabase(hinst);
+    ok(hinst, hdb, "MsiGetActiveDatabase failed\n");
+
+    r = MsiCloseHandle(hdb);
+    ok(hinst, !r, "got %u\n", r);
+}
+
 /* Main test. Anything that doesn't depend on a specific install configuration
  * or have undesired side effects should go here. */
 UINT WINAPI main_test(MSIHANDLE hinst)
@@ -265,6 +277,7 @@ UINT WINAPI main_test(MSIHANDLE hinst)
     todo_wine_ok(hinst, res == MSIDBSTATE_ERROR, "expected MSIDBSTATE_ERROR, got %u\n", res);
 
     test_props(hinst);
+    test_db(hinst);
 
     return ERROR_SUCCESS;
 }
diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl
index d97db4c..c158583 100644
--- a/dlls/msi/winemsi.idl
+++ b/dlls/msi/winemsi.idl
@@ -61,7 +61,7 @@ interface IWineMsiRemote
     HRESULT remote_DatabaseGetSummaryInformation( [in] MSIHANDLE db, [in] UINT updatecount, [out] MSIHANDLE *suminfo );
     HRESULT remote_DatabaseOpenView( [in] MSIHANDLE db, [in] LPCWSTR query, [out] MSIHANDLE *view );
 
-    HRESULT remote_GetActiveDatabase( [in] MSIHANDLE hinst, [out] MSIHANDLE *handle );
+    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 );
     int remote_ProcessMessage( [in] MSIHANDLE hinst, [in] INSTALLMESSAGE message, [in] struct wire_record *record );