wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 70c5dc64fc02408c6f7233c996e0ffdc5dc4a5a0

Browse Source
This commit is contained in:
Zebediah Figura
2018-04-16 18:15:29 -05:00
parent 8fd6d103e3
commit de87a73aac
7 changed files with 71 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
patches/msi-MsiGetDatabaseState/0001-msi-Always-return-MSIDBSTATE_ERROR-when-MsiGetDataba.patch
View File

@@ -1,28 +1,25 @@
From abb41fbea240e18b6bec38f0c582b7445a60915f Mon Sep 17 00:00:00 2001
From 21028049055c1f65d72baf685ad9464187aada25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 31 May 2017 03:53:05 +0200
Subject: msi: Always return MSIDBSTATE_ERROR when MsiGetDatabaseState is
called from a custom action.
---
dlls/msi/database.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
dlls/msi/database.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/dlls/msi/database.c b/dlls/msi/database.c
index d3104b0ff22..6a138d6b816 100644
index d3eb910..47a99fa 100644
--- a/dlls/msi/database.c
+++ b/dlls/msi/database.c
@@ -2005,16 +2005,8 @@ MSIDBSTATE WINAPI MsiGetDatabaseState( MSIHANDLE handle )
@@ -1890,13 +1890,8 @@ MSIDBSTATE WINAPI MsiGetDatabaseState( MSIHANDLE handle )
db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE );
if( !db )
{
- IWineMsiRemoteDatabase *remote_database;
-
- remote_database = (IWineMsiRemoteDatabase *)msi_get_remote( handle );
- MSIHANDLE remote_database = msi_get_remote(handle);
- if ( !remote_database )
- return MSIDBSTATE_ERROR;
-
- IWineMsiRemoteDatabase_Release( remote_database );
WARN("MsiGetDatabaseState not allowed during a custom action!\n");
-
- return MSIDBSTATE_READ;
@@ -31,5 +28,5 @@ index d3104b0ff22..6a138d6b816 100644
if (db->mode != MSIDBOPEN_READONLY )
--
2.13.1
2.7.4