Added patch to implement support for msiexec /passive command line option.

This commit is contained in:
Sebastian Lackner 2015-10-04 23:57:13 +02:00
parent 1d3eb97763
commit 76aa292beb
5 changed files with 61 additions and 1 deletions

View File

@ -34,6 +34,11 @@ Wine. All those differences are also documented on the
Included bug fixes and improvements
-----------------------------------
**Bug fixes and features included in the next upcoming release [1]:**
* Add support for /passive command line option to msiexec ([Wine Bug #21813](https://bugs.winehq.org/show_bug.cgi?id=21813))
**Bug fixes and features in Wine Staging 1.7.52 [268]:**
*Note: The following list only contains features and bug fixes which are not

4
debian/changelog vendored
View File

@ -1,3 +1,7 @@
wine-staging (1.7.53) UNRELEASED; urgency=low
* Added patch to implement support for msiexec /passive command line option.
-- Sebastian Lackner <sebastian@fds-team.de> Sun, 04 Oct 2015 23:56:05 +0200
wine-staging (1.7.52) unstable; urgency=low
* Added patch to return STATUS_INVALID_DEVICE_REQUEST when trying to call
NtReadFile on directory.

View File

@ -0,0 +1,31 @@
From ead7f173a46031c20d7771c34e7c231f98332700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 4 Oct 2015 23:48:16 +0200
Subject: msiexec: Add support for /passive command line option.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Michael Müller <michael@fds-team.de>
---
programs/msiexec/msiexec.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c
index cb0984d..22554de 100644
--- a/programs/msiexec/msiexec.c
+++ b/programs/msiexec/msiexec.c
@@ -931,6 +931,10 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
wine_dbgstr_w(argvW[i]+2));
}
}
+ else if(msi_option_equal(argvW[i], "passive"))
+ {
+ InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY|INSTALLUILEVEL_HIDECANCEL;
+ }
else if(msi_option_equal(argvW[i], "y"))
{
FunctionDllRegisterServer = TRUE;
--
2.6.0

View File

@ -0,0 +1 @@
Fixes: [21813] Add support for /passive command line option to msiexec

View File

@ -58,7 +58,7 @@ upstream_commit()
# Show version information
version()
{
echo "Wine Staging 1.7.52"
echo "Wine Staging 1.7.53 (unreleased)"
echo "Copyright (C) 2014-2015 the Wine Staging project authors."
echo ""
echo "Patchset to be applied on upstream Wine:"
@ -180,6 +180,7 @@ patch_enable_all ()
enable_msi_Parse_Double_Quotes="$1"
enable_msi_msi_get_property="$1"
enable_msidb_Implementation="$1"
enable_msiexec_Passive="$1"
enable_msvcp90_basic_string_dtor="$1"
enable_msvcrt_Math_Precision="$1"
enable_msvcrt_StdHandle_RefCount="$1"
@ -645,6 +646,9 @@ patch_enable ()
msidb-Implementation)
enable_msidb_Implementation="$2"
;;
msiexec-Passive)
enable_msiexec_Passive="$2"
;;
msvcp90-basic_string_dtor)
enable_msvcp90_basic_string_dtor="$2"
;;
@ -3899,6 +3903,21 @@ if test "$enable_msidb_Implementation" -eq 1; then
) >> "$patchlist"
fi
# Patchset msiexec-Passive
# |
# | This patchset fixes the following Wine bugs:
# | * [#21813] Add support for /passive command line option to msiexec
# |
# | Modified files:
# | * programs/msiexec/msiexec.c
# |
if test "$enable_msiexec_Passive" -eq 1; then
patch_apply msiexec-Passive/0001-msiexec-Add-support-for-passive-command-line-option.patch
(
echo '+ { "Michael Müller", "msiexec: Add support for /passive command line option.", 1 },';
) >> "$patchlist"
fi
# Patchset msvcp90-basic_string_dtor
# |
# | This patchset fixes the following Wine bugs: