[PATCH 6/7] msi: Return ERROR_INVALID_HANDLE when MsiEnableUIPreview() is called from a custom action.

[Zebediah Figura]

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 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 a3e54815c0..153ff214d6 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 b8da55e1ce..454966e914 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);
-- 
2.17.1