diff --git a/patches/wineboot-ProxySettings/0001-wineboot-Initialize-proxy-settings-registry-key.patch b/patches/wineboot-ProxySettings/0001-wineboot-Initialize-proxy-settings-registry-key.patch index f9bb3110..ff7d6c3f 100644 --- a/patches/wineboot-ProxySettings/0001-wineboot-Initialize-proxy-settings-registry-key.patch +++ b/patches/wineboot-ProxySettings/0001-wineboot-Initialize-proxy-settings-registry-key.patch @@ -1,4 +1,4 @@ -From 11f4a6f3093e589ee31d88a872f35155a26e47aa Mon Sep 17 00:00:00 2001 +From 1a1df38fe5f57d6c8872d0c92cc7b24512c8c72d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Mon, 26 Dec 2016 16:37:40 +0100 Subject: [PATCH] wineboot: Initialize proxy settings registry key. @@ -9,19 +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 667f8f48702..4a1747ad047 100644 +index 0983420a91f..d346b8984b1 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -1,6 +1,6 @@ MODULE = wineboot.exe IMPORTS = uuid advapi32 ws2_32 kernelbase --DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev -+DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev wininet +-DELAYIMPORTS = shell32 shlwapi version user32 gdi32 setupapi newdev ++DELAYIMPORTS = shell32 shlwapi version user32 gdi32 setupapi newdev wininet EXTRADLLFLAGS = -mconsole diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c -index b82c5ec6524..2af77ee0d87 100644 +index 57aa4335534..d15ed726530 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -77,6 +77,7 @@ @@ -32,7 +32,7 @@ index b82c5ec6524..2af77ee0d87 100644 #include #include "resource.h" -@@ -902,6 +903,13 @@ static void create_volatile_environment_registry_key(void) +@@ -1180,6 +1181,13 @@ static void create_volatile_environment_registry_key(void) RegCloseKey( hkey ); } @@ -46,7 +46,7 @@ index b82c5ec6524..2af77ee0d87 100644 /* Performs the rename operations dictated in %SystemRoot%\Wininit.ini. * Returns FALSE if there was an error, or otherwise if all is ok. */ -@@ -1712,6 +1720,7 @@ int __cdecl main( int argc, char *argv[] ) +@@ -2019,6 +2027,7 @@ int __cdecl main( int argc, char *argv[] ) if (init || update) update_wineprefix( update ); create_volatile_environment_registry_key(); @@ -55,5 +55,5 @@ index b82c5ec6524..2af77ee0d87 100644 ProcessRunKeys( HKEY_LOCAL_MACHINE, L"RunOnce", TRUE, TRUE ); -- -2.34.1 +2.45.2 diff --git a/staging/upstream-commit b/staging/upstream-commit index b2cc0026..918dcfca 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -4161e62e478f61fdcd0365d9bd7b21e3b1a5197b +448fcbc0c60d7228ed52f1f5d90f62be0a58289a