Zebediah Figura : msi: Return ERROR_INVALID_HANDLE when MsiDatabaseImport( ) is called from a custom action.

[Alexandre Julliard]

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

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Mon Mar 25 22:42:04 2019 -0500

msi: Return ERROR_INVALID_HANDLE when MsiDatabaseImport() is called from a custom action.

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

---

 dlls/msi/database.c     | 13 ++-----------
 dlls/msi/tests/custom.c |  2 +-
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/dlls/msi/database.c b/dlls/msi/database.c
index d039903..11ed27d 100644
--- a/dlls/msi/database.c
+++ b/dlls/msi/database.c
@@ -870,17 +870,8 @@ UINT WINAPI MsiDatabaseImportW(MSIHANDLE handle, LPCWSTR szFolder, LPCWSTR szFil
 
     TRACE("%x %s %s\n",handle,debugstr_w(szFolder), debugstr_w(szFilename));
 
-    db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE );
-    if( !db )
-    {
-        MSIHANDLE remote_database = msi_get_remote( handle );
-        if ( !remote_database )
-            return ERROR_INVALID_HANDLE;
-
-        WARN("MsiDatabaseImport not allowed during a custom action!\n");
-
-        return ERROR_SUCCESS;
-    }
+    if (!(db = msihandle2msiinfo(handle, MSIHANDLETYPE_DATABASE)))
+        return ERROR_INVALID_HANDLE;
 
     r = MSI_DatabaseImport( db, szFolder, szFilename );
     msiobj_release( &db->hdr );
diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c
index d9d4689..b8da55e 100644
--- a/dlls/msi/tests/custom.c
+++ b/dlls/msi/tests/custom.c
@@ -1138,7 +1138,7 @@ static void test_invalid_functions(MSIHANDLE hinst)
     ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r);
 
     r = MsiDatabaseImportA(db, path, "bogus.idt");
-    todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r);
+    ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r);
 
     r = MsiDatabaseCommit(db);
     ok(hinst, r == ERROR_SUCCESS, "got %u\n", r);