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 08df007e802dfa2845a5b4f33bbf8a04202258bb.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-07-03 00:08:58 +02:00
parent de09d74c97
commit 46514b9952
4 changed files with 25 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 0763c73423ae069023b54e669b0c9bd648e1f27e Mon Sep 17 00:00:00 2001
From 3bd544b02b3d3c64bd2db3db2317b8ede9000636 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,10 +8,10 @@ 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 16652000ee5..62f01044bf1 100644
index e016b43a8c1..e661275c719 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -156,6 +156,13 @@ static const WCHAR szValidateProductID[] =
@@ -158,6 +158,13 @@ static const WCHAR szValidateProductID[] =
static const WCHAR szWriteEnvironmentStrings[] =
{'W','r','i','t','e','E','n','v','i','r','o','n','m','e','n','t','S','t','r','i','n','g','s',0};
@@ -22,10 +22,10 @@ index 16652000ee5..62f01044bf1 100644
+ HANDLE thread;
+};
+
static void ui_actionstart(MSIPACKAGE *package, LPCWSTR action)
static void ui_actionstart(MSIPACKAGE *package, LPCWSTR action, LPCWSTR description, LPCWSTR template)
{
static const WCHAR Query_t[] =
@@ -7912,6 +7919,42 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq)
MSIRECORD *row = MSI_CreateRecord(3);
@@ -7916,6 +7923,42 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq)
return rc;
}
@@ -68,7 +68,7 @@ index 16652000ee5..62f01044bf1 100644
/****************************************************
* TOP level entry points
*****************************************************/
@@ -7923,6 +7966,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
@@ -7927,6 +7970,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 16652000ee5..62f01044bf1 100644
BOOL ui_exists;
UINT rc;
@@ -7988,6 +8032,8 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
@@ -7992,6 +8036,8 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
msi_adjust_privilege_properties( package );
msi_set_context( package );
@@ -85,7 +85,7 @@ index 16652000ee5..62f01044bf1 100644
productcode = msi_dup_property( package->db, szProductCode );
if (strcmpiW( productcode, package->ProductCode ))
{
@@ -8036,6 +8082,8 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
@@ -8040,6 +8086,8 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
/* finish up running custom actions */
ACTION_FinishCustomActions(package);