From 0b31064d1b3d00b66c2f8f8cb05396c6f308388d Mon Sep 17 00:00:00 2001 From: winesync Date: Sun, 13 Mar 2022 01:21:40 +0100 Subject: [PATCH] [WINESYNC] msi: Return ERROR_INVALID_HANDLE when MsiDatabaseExport() is called from a custom action. Signed-off-by: Zebediah Figura Signed-off-by: Hans Leidekker Signed-off-by: Alexandre Julliard wine commit id 3ff7d30520e4450fd9efbf5569eb28b82fb81aeb by Zebediah Figura --- dll/win32/msi/database.c | 13 ++----------- modules/rostests/winetests/msi/custom.c | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dll/win32/msi/database.c b/dll/win32/msi/database.c index 19926619225..d0399039447 100644 --- a/dll/win32/msi/database.c +++ b/dll/win32/msi/database.c @@ -1194,17 +1194,8 @@ UINT WINAPI MsiDatabaseExportW( MSIHANDLE handle, LPCWSTR szTable, TRACE("%x %s %s %s\n", handle, debugstr_w(szTable), 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("MsiDatabaseExport not allowed during a custom action!\n"); - - return ERROR_SUCCESS; - } + if (!(db = msihandle2msiinfo(handle, MSIHANDLETYPE_DATABASE))) + return ERROR_INVALID_HANDLE; r = MSI_DatabaseExport( db, szTable, szFolder, szFilename ); msiobj_release( &db->hdr ); diff --git a/modules/rostests/winetests/msi/custom.c b/modules/rostests/winetests/msi/custom.c index 526c4a211d2..d9d4689c4e7 100644 --- a/modules/rostests/winetests/msi/custom.c +++ b/modules/rostests/winetests/msi/custom.c @@ -1135,7 +1135,7 @@ static void test_invalid_functions(MSIHANDLE hinst) GetCurrentDirectoryA(sizeof(path), path); r = MsiDatabaseExportA(db, "Test", 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 = MsiDatabaseImportA(db, path, "bogus.idt"); todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r);