Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 22:52:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] msi: Return ERROR_INVALID_HANDLE when MsiDatabaseApplyTransform() 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 ed5f4bd14f5cece4bca63918b924606a09a3300d by Zebediah Figura <z.figura12@gmail.com>
This commit is contained in:
winesync 2022-03-13 01:21:39 +01:00 • committed by Mark Jansen
parent 72c4091cef
commit 115d04ba20
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
2 changed files with 3 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
dll/win32/msi/msiquery.c
View file

@ -884,19 +884,9 @@ UINT WINAPI MsiDatabaseApplyTransformW( MSIHANDLE hdb, const WCHAR *transform, i
if (error_cond) FIXME( "ignoring error conditions\n" ); if (error_cond) FIXME( "ignoring error conditions\n" );
db = msihandle2msiinfo( hdb, MSIHANDLETYPE_DATABASE ); if (!(db = msihandle2msiinfo(hdb, MSIHANDLETYPE_DATABASE)))
if (!db)
{
MSIHANDLE remote;
if (!(remote = msi_get_remote(hdb)))
return ERROR_INVALID_HANDLE; return ERROR_INVALID_HANDLE;
WARN("MsiDatabaseApplyTransform not allowed during a custom action!\n");
return ERROR_SUCCESS;
}
r = MSI_DatabaseApplyTransformW( db, transform, error_cond ); r = MSI_DatabaseApplyTransformW( db, transform, error_cond );
msiobj_release( &db->hdr ); msiobj_release( &db->hdr );
return r; return r;

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

@ -1128,7 +1128,7 @@ static void test_invalid_functions(MSIHANDLE hinst)
todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r);
r = MsiDatabaseApplyTransformA(db, "bogus.mst", 0); r = MsiDatabaseApplyTransformA(db, "bogus.mst", 0);
todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r);
r = MsiCreateTransformSummaryInfoA(db, db, "bogus.mst", 0, 0); r = MsiCreateTransformSummaryInfoA(db, db, "bogus.mst", 0, 0);
todo_wine ok(hinst, r == ERROR_INSTALL_PACKAGE_OPEN_FAILED, "got %u\n", r); todo_wine ok(hinst, r == ERROR_INSTALL_PACKAGE_OPEN_FAILED, "got %u\n", r);