[PATCH 7/7] msi: Return ERROR_INVALID_HANDLE when MsiOpenPackage() is called from a custom action.
Zebediah Figura
z.figura12 at gmail.com
Mon Mar 25 22:42:06 CDT 2019
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/msi/package.c | 14 ++------------
dlls/msi/tests/custom.c | 2 +-
2 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/dlls/msi/package.c b/dlls/msi/package.c
index 563f55a123..490c687d78 100644
--- a/dlls/msi/package.c
+++ b/dlls/msi/package.c
@@ -1471,18 +1471,8 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, DWORD dwOptions, MSIPACKAGE **pPackage)
if( szPackage[0] == '#' )
{
handle = atoiW(&szPackage[1]);
- db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE );
- if( !db )
- {
- MSIHANDLE remote;
-
- if (!(remote = msi_get_remote(handle)))
- return ERROR_INVALID_HANDLE;
-
- WARN("MsiOpenPackage not allowed during a custom action!\n");
-
- return ERROR_FUNCTION_FAILED;
- }
+ if (!(db = msihandle2msiinfo(handle, MSIHANDLETYPE_DATABASE)))
+ return ERROR_INVALID_HANDLE;
}
else
{
diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c
index 454966e914..43b8369b17 100644
--- a/dlls/msi/tests/custom.c
+++ b/dlls/msi/tests/custom.c
@@ -1154,7 +1154,7 @@ static void test_invalid_functions(MSIHANDLE hinst)
sprintf(package_name, "#%u", db);
r = MsiOpenPackageA(package_name, &package);
- todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r);
+ ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r);
MsiCloseHandle(db);
}
--
2.17.1
More information about the wine-devel
mailing list