[PATCH 2/7] msi: Return MSIDBSTATE_ERROR when MsiGetDatabaseState() is called from a custom action.
Zebediah Figura
z.figura12 at gmail.com
Mon Mar 25 22:42:01 CDT 2019
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46812
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/msi/database.c | 13 ++-----------
dlls/msi/tests/custom.c | 4 ++--
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/dlls/msi/database.c b/dlls/msi/database.c
index 4537ed5836..1992661922 100644
--- a/dlls/msi/database.c
+++ b/dlls/msi/database.c
@@ -1993,17 +1993,8 @@ MSIDBSTATE WINAPI MsiGetDatabaseState( MSIHANDLE handle )
TRACE("%d\n", handle);
- db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE );
- if( !db )
- {
- MSIHANDLE remote_database = msi_get_remote(handle);
- if ( !remote_database )
- return MSIDBSTATE_ERROR;
-
- WARN("MsiGetDatabaseState not allowed during a custom action!\n");
-
- return MSIDBSTATE_READ;
- }
+ if (!(db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE )))
+ return MSIDBSTATE_ERROR;
if (db->mode != MSIDBOPEN_READONLY )
ret = MSIDBSTATE_WRITE;
diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c
index 6ae5bfc30a..9e9e2bf938 100644
--- a/dlls/msi/tests/custom.c
+++ b/dlls/msi/tests/custom.c
@@ -1119,7 +1119,7 @@ static void test_invalid_functions(MSIHANDLE hinst)
UINT r;
r = MsiGetDatabaseState(hinst);
- todo_wine ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r);
+ ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r);
db = MsiGetActiveDatabase(hinst);
ok(hinst, db, "MsiGetActiveDatabase failed\n");
@@ -1147,7 +1147,7 @@ static void test_invalid_functions(MSIHANDLE hinst)
ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r);
r = MsiGetDatabaseState(db);
- todo_wine ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r);
+ ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r);
r = MsiEnableUIPreview(db, &preview);
todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r);
--
2.17.1
More information about the wine-devel
mailing list