Rebase against ec9eddf86b144cc0fcf975a9cc864cf08ba84eaf

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "4ccdf3e58a816ebf9c58000e985fd21737ffd485"
+	echo "ec9eddf86b144cc0fcf975a9cc864cf08ba84eaf"
 }
 
 # Show version information

patches/wineboot-drivers_etc_Stubs/0001-wineboot-Init-system32-drivers-etc-host-networks-pro.patch

@@ -1,4 +1,4 @@
-From 21098077b467295c38b3257cbb8b4919b58fe62c Mon Sep 17 00:00:00 2001
+From 047267c6f3ce198fb7e3d28f086c3c23b6fd275e Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Wed, 13 May 2015 06:58:16 +0200
 Subject: [PATCH] wineboot: Init
@@ -10,10 +10,10 @@ Based on a patch by Jactry Zeng.
  1 file changed, 36 insertions(+)
 
 diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
-index 9710b78ab..80511584a 100644
+index 0f8ddc2a0ea..958bf3039a0 100644
 --- a/programs/wineboot/wineboot.c
 +++ b/programs/wineboot/wineboot.c
-@@ -570,6 +570,41 @@ static void create_volatile_environment_registry_key(void)
+@@ -702,6 +702,41 @@ static void create_volatile_environment_registry_key(void)
      RegCloseKey( hkey );
  }
  
@@ -55,14 +55,14 @@ index 9710b78ab..80511584a 100644
  /* Performs the rename operations dictated in %SystemRoot%\Wininit.ini.
   * Returns FALSE if there was an error, or otherwise if all is ok.
   */
-@@ -1261,6 +1296,7 @@ static void update_wineprefix( BOOL force )
+@@ -1385,6 +1420,7 @@ static void update_wineprefix( BOOL force )
          }
          install_root_pnp_devices();
          update_user_profile();
 +        create_etc_stub_files();
  
-         WINE_MESSAGE( "wine: configuration in '%s' has been updated.\n", prettyprint_configdir() );
+         WINE_MESSAGE( "wine: configuration in %s has been updated.\n", debugstr_w(prettyprint_configdir()) );
      }
 -- 
-2.23.0
+2.17.1