Rebase against 8f8fa9182af7a2995940a5e17cf074bc849f2c0f.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "4ccf7498aac20b2b0afa2118f8d919718e5fcbbe"
+	echo "8f8fa9182af7a2995940a5e17cf074bc849f2c0f"
 }
 
 # Show version information

patches/wineboot-ProxySettings/0001-wineboot-Initialize-proxy-settings-registry-key.patch

@@ -1,4 +1,4 @@
-From abf369c95bc4fbaa146f2ababb41a01b03af9057 Mon Sep 17 00:00:00 2001
+From 6b2e1e7f5021f8f8652c33c38693c53e1a745e28 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 26 Dec 2016 16:37:40 +0100
 Subject: [PATCH] wineboot: Initialize proxy settings registry key.
@@ -9,20 +9,20 @@ Subject: [PATCH] wineboot: Initialize proxy settings registry key.
  2 files changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in
-index 2552f69990a..769ad7ee511 100644
+index 0a1f5e4152f..7d8642694c3 100644
 --- a/programs/wineboot/Makefile.in
 +++ b/programs/wineboot/Makefile.in
 @@ -1,7 +1,7 @@
  MODULE    = wineboot.exe
  APPMODE   = -mconsole
- IMPORTS   = uuid advapi32 ws2_32
+ IMPORTS   = uuid advapi32 ws2_32 kernelbase
 -DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev
 +DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev wininet
  
  EXTRADLLFLAGS = -mno-cygwin
  
 diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
-index 3dfa39ad7c0..88335a2549e 100644
+index 27ba8b2eead..518444a4787 100644
 --- a/programs/wineboot/wineboot.c
 +++ b/programs/wineboot/wineboot.c
 @@ -77,6 +77,7 @@
@@ -33,7 +33,7 @@ index 3dfa39ad7c0..88335a2549e 100644
  #include <newdev.h>
  #include "resource.h"
  
-@@ -902,6 +903,13 @@ static void create_volatile_environment_registry_key(void)
+@@ -1002,6 +1003,13 @@ static void create_volatile_environment_registry_key(void)
      RegCloseKey( hkey );
  }
  
@@ -47,7 +47,7 @@ index 3dfa39ad7c0..88335a2549e 100644
  /* Performs the rename operations dictated in %SystemRoot%\Wininit.ini.
   * Returns FALSE if there was an error, or otherwise if all is ok.
   */
-@@ -1711,6 +1719,7 @@ int __cdecl main( int argc, char *argv[] )
+@@ -1813,6 +1821,7 @@ int __cdecl main( int argc, char *argv[] )
      if (init || update) update_wineprefix( update );
  
      create_volatile_environment_registry_key();

staging/upstream-commit

@@ -1 +1 @@
-4ccf7498aac20b2b0afa2118f8d919718e5fcbbe
+8f8fa9182af7a2995940a5e17cf074bc849f2c0f