[ros-diffs] [reactos] 15/360: [WINESYNC] msi: Make MsiGetActiveDatabase() RPC-compatible.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7cc54a4f487cd38668332…

commit 7cc54a4f487cd38668332c02a405459f15856b60
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Sat Mar 12 15:11:51 2022 +0100
Commit:     Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Sun Mar 20 19:27:36 2022 +0100

    [WINESYNC] 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>
    
    wine commit id a6934768d1070d91c764d5c88fe276a9d6163683 by Zebediah Figura
<z.figura12(a)gmail.com>
---
 dll/win32/msi/package.c                 |  9 ++++-----
 dll/win32/msi/winemsi.idl               |  2 +-
 modules/rostests/winetests/msi/custom.c | 13 +++++++++++++
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/dll/win32/msi/package.c b/dll/win32/msi/package.c
index 49fe7900412..b4379fe81a3 100644
--- a/dll/win32/msi/package.c
+++ b/dll/win32/msi/package.c
@@ -1693,7 +1693,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;
@@ -2427,11 +2428,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/dll/win32/msi/winemsi.idl b/dll/win32/msi/winemsi.idl
index d97db4c0571..c1585834db8 100644
--- a/dll/win32/msi/winemsi.idl
+++ b/dll/win32/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 );
diff --git a/modules/rostests/winetests/msi/custom.c
b/modules/rostests/winetests/msi/custom.c
index 8d3234876ce..00dcab36b0d 100644
--- a/modules/rostests/winetests/msi/custom.c
+++ b/modules/rostests/winetests/msi/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;
 }