Rebase against 8e2aea6290e823d2f5023e2bff5c2fec0880a65d.

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

@@ -1,4 +1,4 @@
-From 79dff8725f056d8f420a2b1067e200f8da65ee71 Mon Sep 17 00:00:00 2001
+From caa1fa1ebb2ffe9bb8f0f298c4738fd631314ddb 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.
@@ -21,10 +21,10 @@ index 0983420a91f..d346b8984b1 100644
  EXTRADLLFLAGS = -mconsole
  
 diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
-index 1bce8bab33a..c90c3e1d41c 100644
+index 4f83d9eef32..23ffc1f5845 100644
 --- a/programs/wineboot/wineboot.c
 +++ b/programs/wineboot/wineboot.c
-@@ -78,6 +78,7 @@
+@@ -77,6 +77,7 @@
  #include <shlwapi.h>
  #include <shellapi.h>
  #include <setupapi.h>
@@ -32,10 +32,10 @@ index 1bce8bab33a..c90c3e1d41c 100644
  #include <newdev.h>
  #include "resource.h"
  
-@@ -1219,6 +1220,13 @@ static void create_known_dlls(void)
+@@ -1083,6 +1084,13 @@ static void create_volatile_environment_registry_key(void)
+     RegCloseKey( hkey );
  }
  
- 
 +static void create_proxy_settings(void)
 +{
 +    HINTERNET inet;
@@ -46,14 +46,14 @@ index 1bce8bab33a..c90c3e1d41c 100644
  /* Performs the rename operations dictated in %SystemRoot%\Wininit.ini.
   * Returns FALSE if there was an error, or otherwise if all is ok.
   */
-@@ -2059,6 +2067,7 @@ int __cdecl main( int argc, char *argv[] )
+@@ -1922,6 +1930,7 @@ int __cdecl main( int argc, char *argv[] )
+     if (init || update) update_wineprefix( update );
  
      create_volatile_environment_registry_key();
-     create_known_dlls();
 +    create_proxy_settings();
  
      ProcessRunKeys( HKEY_LOCAL_MACHINE, L"RunOnce", TRUE, TRUE );
  
 -- 
-2.49.0
+2.47.2
 

staging/upstream-commit

@@ -1 +1 @@
-cf6bdfd2260b4e2a29e72a241ad60f6f39712fa3
+8e2aea6290e823d2f5023e2bff5c2fec0880a65d