wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against b65ca133052ed9053e48c571155a764d4d711277.

Browse Source
This commit is contained in:
Zebediah Figura
2020-05-21 20:17:05 -05:00
parent 5246a035e9
commit 4501d49149
7 changed files with 57 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 709d05ddf763bcfbcb708158a5302ba4e2587ee1 Mon Sep 17 00:00:00 2001
From 47fc492aea5790880546171f7baeceb5fb4f96f4 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,7 +9,7 @@ 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 3921fa9644..9575b45bec 100644
index 3921fa96444..9575b45beca 100644
--- a/programs/wineboot/Makefile.in
+++ b/programs/wineboot/Makefile.in
@@ -1,7 +1,7 @@
@@ -22,10 +22,10 @@ index 3921fa9644..9575b45bec 100644
EXTRADLLFLAGS = -mno-cygwin
diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index ab255ac107..d85be900e0 100644
index 2946a17c7b3..b622f47def1 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -71,6 +71,7 @@
@@ -73,6 +73,7 @@
#include <shellapi.h>
#include <setupapi.h>
#include <ntsecapi.h>
@@ -33,7 +33,7 @@ index ab255ac107..d85be900e0 100644
#include <newdev.h>
#include "resource.h"
@@ -595,6 +596,13 @@ static void create_volatile_environment_registry_key(void)
@@ -744,6 +745,13 @@ static void create_volatile_environment_registry_key(void)
RegCloseKey( hkey );
}
@@ -47,14 +47,14 @@ index ab255ac107..d85be900e0 100644
static void create_etc_stub_files(void)
{
static const WCHAR drivers_etcW[] = {'\\','d','r','i','v','e','r','s','\\','e','t','c',0};
@@ -1505,6 +1513,7 @@ int __cdecl main( int argc, char *argv[] )
@@ -1587,6 +1595,7 @@ int __cdecl main( int argc, char *argv[] )
if (init || update) update_wineprefix( update );
create_volatile_environment_registry_key();
+ create_proxy_settings();
ProcessRunKeys( HKEY_LOCAL_MACHINE, RunOnceW, TRUE, TRUE );
ProcessRunKeys( HKEY_LOCAL_MACHINE, L"RunOnce", TRUE, TRUE );
--
2.17.1
2.26.2