Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] msi: Return ERROR_INVALID_HANDLE when MsiDatabaseExport() is called from a custom action.

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

wine commit id 3ff7d30520e4450fd9efbf5569eb28b82fb81aeb by Zebediah Figura <z.figura12@gmail.com>
This commit is contained in:
winesync 2022-03-13 01:21:40 +01:00 committed by Mark Jansen
parent 115d04ba20
commit 0b31064d1b
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
dll/win32/msi/database.c
View file

@ -1194,17 +1194,8 @@ UINT WINAPI MsiDatabaseExportW( MSIHANDLE handle, LPCWSTR szTable,
TRACE("%x %s %s %s\n", handle, debugstr_w(szTable), TRACE("%x %s %s %s\n", handle, debugstr_w(szTable),
debugstr_w(szFolder), debugstr_w(szFilename)); debugstr_w(szFolder), debugstr_w(szFilename));
db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE ); if (!(db = msihandle2msiinfo(handle, MSIHANDLETYPE_DATABASE)))
if( !db ) return ERROR_INVALID_HANDLE;
{
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;
}
r = MSI_DatabaseExport( db, szTable, szFolder, szFilename ); r = MSI_DatabaseExport( db, szTable, szFolder, szFilename );
msiobj_release( &db->hdr ); msiobj_release( &db->hdr );

2
modules/rostests/winetests/msi/custom.c
View file

@ -1135,7 +1135,7 @@ static void test_invalid_functions(MSIHANDLE hinst)
GetCurrentDirectoryA(sizeof(path), path); GetCurrentDirectoryA(sizeof(path), path);
r = MsiDatabaseExportA(db, "Test", path, "bogus.idt"); 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"); r = MsiDatabaseImportA(db, path, "bogus.idt");
todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r);