[PATCH 4/7] msi: Return ERROR_INVALID_HANDLE when MsiDatabaseExport() is called from a custom action.
Zebediah Figura
z.figura12 at gmail.com
Mon Mar 25 22:42:03 CDT 2019
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
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 1992661922..d039903944 100644
--- a/dlls/msi/database.c
+++ b/dlls/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/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c
index 526c4a211d..d9d4689c4e 100644
--- a/dlls/msi/tests/custom.c
+++ b/dlls/msi/tests/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);
--
2.17.1
More information about the wine-devel
mailing list