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 52fbaeb2c44e585cacd7f0b57e902dfbcf54d09b.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-08-09 08:45:29 +02:00
parent 51d419bbeb
commit 6edf4d136c
11 changed files with 197 additions and 704 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/msi-Dummy_Thread/0001-msi-Create-dummy-thread-to-initialize-COM-for-custom.patch
View File

@@ -1,4 +1,4 @@
From 8d9234d5f431aedceaa46b3123671c283e50ff93 Mon Sep 17 00:00:00 2001
From 898e62a33f525084b08d5a3be634e7fcb4661f68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 26 Jun 2017 16:18:09 +0200
Subject: msi: Create dummy thread to initialize COM for custom actions.
@@ -8,7 +8,7 @@ Subject: msi: Create dummy thread to initialize COM for custom actions.
1 file changed, 48 insertions(+)
diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index fef076f96c5..d8b097d62f8 100644
index 64e01c48f57..d804323ff58 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -158,6 +158,13 @@ static const WCHAR szValidateProductID[] =
@@ -24,8 +24,8 @@ index fef076f96c5..d8b097d62f8 100644
+
static INT ui_actionstart(MSIPACKAGE *package, LPCWSTR action, LPCWSTR description, LPCWSTR template)
{
MSIRECORD *row = MSI_CreateRecord(3);
@@ -7910,6 +7917,42 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq)
WCHAR query[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',
@@ -7860,6 +7867,42 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq)
return rc;
}
@@ -68,7 +68,7 @@ index fef076f96c5..d8b097d62f8 100644
/****************************************************
* TOP level entry points
*****************************************************/
@@ -7921,6 +7964,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
@@ -7871,6 +7914,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
static const WCHAR szAction[] = {'A','C','T','I','O','N',0};
static const WCHAR szInstall[] = {'I','N','S','T','A','L','L',0};
WCHAR *reinstall, *remove, *patch, *productcode;
@@ -76,7 +76,7 @@ index fef076f96c5..d8b097d62f8 100644
BOOL ui_exists;
UINT rc;
@@ -7986,6 +8030,8 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
@@ -7936,6 +7980,8 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
msi_adjust_privilege_properties( package );
msi_set_context( package );
@@ -85,7 +85,7 @@ index fef076f96c5..d8b097d62f8 100644
productcode = msi_dup_property( package->db, szProductCode );
if (strcmpiW( productcode, package->ProductCode ))
{
@@ -8034,6 +8080,8 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
@@ -7984,6 +8030,8 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
/* finish up running custom actions */
ACTION_FinishCustomActions(package);