Author: akhaldi
Date: Tue Nov 17 12:45:43 2015
New Revision: 69919
URL:
http://svn.reactos.org/svn/reactos?rev=69919&view=rev
Log:
[ADVPACK] Sync with Wine Staging 1.7.55. CORE-10536
Modified:
trunk/reactos/dll/win32/advpack/install.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/advpack/install.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/install.…
==============================================================================
--- trunk/reactos/dll/win32/advpack/install.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advpack/install.c [iso-8859-1] Tue Nov 17 12:45:43 2015
@@ -762,7 +762,11 @@
str_flags = get_parameter(&cmdline_ptr, ',', TRUE);
if (str_flags)
- flags = atolW(str_flags);
+ {
+ DWORD inf_flags = atolW(str_flags);
+ if (inf_flags & LIS_QUIET) flags |= RSC_FLAG_QUIET;
+ if (inf_flags & LIS_NOGRPCONV) flags |= RSC_FLAG_NGCONV;
+ }
ZeroMemory(&info, sizeof(ADVInfo));
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Nov 17 12:45:43 2015
@@ -44,7 +44,7 @@
reactos/dll/win32/activeds # Synced to WineStaging-1.7.47
reactos/dll/win32/actxprxy # Synced to WineStaging-1.7.47
-reactos/dll/win32/advpack # Synced to WineStaging-1.7.47
+reactos/dll/win32/advpack # Synced to WineStaging-1.7.55
reactos/dll/win32/atl # Synced to WineStaging-1.7.47
reactos/dll/win32/atl80 # Synced to WineStaging-1.7.47
reactos/dll/win32/atl100 # Synced to WineStaging-1.7.47