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 2ee75bf9ade3e90f10ffe4236c8c95d817402392.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2020-09-29 12:58:11 +10:00
parent 9acfa3b899
commit 639755741e
9 changed files with 116 additions and 109 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 47fc492aea5790880546171f7baeceb5fb4f96f4 Mon Sep 17 00:00:00 2001
From 4e43757350f1104b73d6aef09fd277ef8a245412 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,23 +9,23 @@ 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 3921fa96444..9575b45beca 100644
index 2552f69990a..769ad7ee511 100644
--- a/programs/wineboot/Makefile.in
+++ b/programs/wineboot/Makefile.in
@@ -1,7 +1,7 @@
MODULE = wineboot.exe
APPMODE = -mconsole
IMPORTS = uuid advapi32
IMPORTS = uuid advapi32 ws2_32
-DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev
+DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev wininet
EXTRADLLFLAGS = -mno-cygwin
diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index 2946a17c7b3..b622f47def1 100644
index 119fef90c10..05d695a7d4a 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -73,6 +73,7 @@
@@ -78,6 +78,7 @@
#include <shellapi.h>
#include <setupapi.h>
#include <ntsecapi.h>
@@ -33,7 +33,7 @@ index 2946a17c7b3..b622f47def1 100644
#include <newdev.h>
#include "resource.h"
@@ -744,6 +745,13 @@ static void create_volatile_environment_registry_key(void)
@@ -1032,6 +1033,13 @@ static void create_volatile_environment_registry_key(void)
RegCloseKey( hkey );
}
@@ -47,7 +47,7 @@ index 2946a17c7b3..b622f47def1 100644
static void create_etc_stub_files(void)
{
static const WCHAR drivers_etcW[] = {'\\','d','r','i','v','e','r','s','\\','e','t','c',0};
@@ -1587,6 +1595,7 @@ int __cdecl main( int argc, char *argv[] )
@@ -1877,6 +1885,7 @@ int __cdecl main( int argc, char *argv[] )
if (init || update) update_wineprefix( update );
create_volatile_environment_registry_key();
@@ -56,5 +56,5 @@ index 2946a17c7b3..b622f47def1 100644
ProcessRunKeys( HKEY_LOCAL_MACHINE, L"RunOnce", TRUE, TRUE );
--
2.26.2
2.28.0