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 MsiEnableUIPreview() 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 4bb40d1a95e525c63f1f6f1f20f0c054d46f2fff by Zebediah Figura <z.figura12@gmail.com>
This commit is contained in:
winesync 2022-03-13 01:21:41 +01:00 committed by Mark Jansen
parent 6d0c1c59ca
commit df4fa37bf9
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
2 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dll/win32/msi/dialog.c
View file

@ -4219,19 +4219,9 @@ UINT WINAPI MsiEnableUIPreview( MSIHANDLE hdb, MSIHANDLE *phPreview )
TRACE("%d %p\n", hdb, phPreview); TRACE("%d %p\n", hdb, phPreview);
db = msihandle2msiinfo( hdb, MSIHANDLETYPE_DATABASE ); if (!(db = msihandle2msiinfo(hdb, MSIHANDLETYPE_DATABASE)))
if (!db) return ERROR_INVALID_HANDLE;
{
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");
return ERROR_FUNCTION_FAILED;
}
preview = MSI_EnableUIPreview( db ); preview = MSI_EnableUIPreview( db );
if (preview) if (preview)
{ {

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

@ -1150,7 +1150,7 @@ static void test_invalid_functions(MSIHANDLE hinst)
ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r);
r = MsiEnableUIPreview(db, &preview); 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); sprintf(package_name, "#%u", db);
r = MsiOpenPackageA(package_name, &package); r = MsiOpenPackageA(package_name, &package);