Rebase against 975d0632a19efd41338cb73a97f1b0bdbe7bc0cc.

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

@@ -1,4 +1,4 @@
-From 6b2e1e7f5021f8f8652c33c38693c53e1a745e28 Mon Sep 17 00:00:00 2001
+From 584eecc73a8cba537b8f50932769729a29fe7d3d 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,19 @@ 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 0a1f5e4152f..7d8642694c3 100644
+index 667f8f48702..4a1747ad047 100644
 --- a/programs/wineboot/Makefile.in
 +++ b/programs/wineboot/Makefile.in
-@@ -1,7 +1,7 @@
+@@ -1,6 +1,6 @@
  MODULE    = wineboot.exe
- APPMODE   = -mconsole
  IMPORTS   = uuid advapi32 ws2_32 kernelbase
 -DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev
 +DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev wininet
  
- EXTRADLLFLAGS = -mno-cygwin
+ EXTRADLLFLAGS = -mconsole
  
 diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
-index 27ba8b2eead..518444a4787 100644
+index 14943b005ef..9aab3b68e5b 100644
 --- a/programs/wineboot/wineboot.c
 +++ b/programs/wineboot/wineboot.c
 @@ -77,6 +77,7 @@
@@ -47,7 +46,7 @@ index 27ba8b2eead..518444a4787 100644
  /* Performs the rename operations dictated in %SystemRoot%\Wininit.ini.
   * Returns FALSE if there was an error, or otherwise if all is ok.
   */
-@@ -1813,6 +1821,7 @@ int __cdecl main( int argc, char *argv[] )
+@@ -1812,6 +1820,7 @@ int __cdecl main( int argc, char *argv[] )
      if (init || update) update_wineprefix( update );
  
      create_volatile_environment_registry_key();
@@ -56,5 +55,5 @@ index 27ba8b2eead..518444a4787 100644
      ProcessRunKeys( HKEY_LOCAL_MACHINE, L"RunOnce", TRUE, TRUE );
  
 -- 
-2.30.2
+2.33.0