wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against a94938819280aa52fbc545911ca70a6c3a83ab49.

Browse Source
This commit is contained in:
Sebastian Lackner 2017-07-09 05:59:05 +02:00
parent f9ad524910
commit 8b3a73a4df
2 changed files with 8 additions and 8 deletions
Show Stats 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 3bd544b02b3d3c64bd2db3db2317b8ede9000636 Mon Sep 17 00:00:00 2001
From 8d9234d5f431aedceaa46b3123671c283e50ff93 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 e016b43a8c1..e661275c719 100644
index fef076f96c5..d8b097d62f8 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -158,6 +158,13 @@ static const WCHAR szValidateProductID[] =
@ -22,10 +22,10 @@ index e016b43a8c1..e661275c719 100644
+ HANDLE thread;
+};
+
static void ui_actionstart(MSIPACKAGE *package, LPCWSTR action, LPCWSTR description, LPCWSTR template)
static INT ui_actionstart(MSIPACKAGE *package, LPCWSTR action, LPCWSTR description, LPCWSTR template)
{
MSIRECORD *row = MSI_CreateRecord(3);
@@ -7916,6 +7923,42 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq)
@@ -7910,6 +7917,42 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq)
return rc;
}
@ -68,7 +68,7 @@ index e016b43a8c1..e661275c719 100644
/****************************************************
* TOP level entry points
*****************************************************/
@@ -7927,6 +7970,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
@@ -7921,6 +7964,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 e016b43a8c1..e661275c719 100644
BOOL ui_exists;
UINT rc;
@@ -7992,6 +8036,8 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
@@ -7986,6 +8030,8 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
msi_adjust_privilege_properties( package );
msi_set_context( package );
@ -85,7 +85,7 @@ index e016b43a8c1..e661275c719 100644
productcode = msi_dup_property( package->db, szProductCode );
if (strcmpiW( productcode, package->ProductCode ))
{
@@ -8040,6 +8086,8 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
@@ -8034,6 +8080,8 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
/* finish up running custom actions */
ACTION_FinishCustomActions(package);

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "9f16e42e209f1afb6918ee8821a42f0438cf9c3b"
echo "a94938819280aa52fbc545911ca70a6c3a83ab49"
}
# Show version information