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

[Alexandre Julliard]

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

Author: Zebediah Figura <z.figura12(a)gmail.com>
Date:   Mon Mar 25 22:42:05 2019 -0500

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

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/dialog.c       | 14 ++------------
 dlls/msi/tests/custom.c |  2 +-
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index a3e5481..153ff21 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -4216,19 +4216,9 @@ UINT WINAPI MsiEnableUIPreview( MSIHANDLE hdb, MSIHANDLE *phPreview )
 
     TRACE("%d %p\n", hdb, phPreview);
 
-    db = msihandle2msiinfo( hdb, MSIHANDLETYPE_DATABASE );
-    if (!db)
-    {
-        MSIHANDLE remote_database = msi_get_remote( hdb );
-        if (!remote_database)
-            return ERROR_INVALID_HANDLE;
-
-        *phPreview = 0;
-
-        WARN("MsiEnableUIPreview not allowed during a custom action!\n");
+    if (!(db = msihandle2msiinfo(hdb, MSIHANDLETYPE_DATABASE)))
+        return ERROR_INVALID_HANDLE;
 
-        return ERROR_FUNCTION_FAILED;
-    }
     preview = MSI_EnableUIPreview( db );
     if (preview)
     {
diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c
index b8da55e..454966e 100644
--- a/dlls/msi/tests/custom.c
+++ b/dlls/msi/tests/custom.c
@@ -1150,7 +1150,7 @@ static void test_invalid_functions(MSIHANDLE hinst)
     ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r);
 
     r = MsiEnableUIPreview(db, &preview);
-    todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r);
+    ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r);
 
     sprintf(package_name, "#%u", db);
     r = MsiOpenPackageA(package_name, &package);