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 8c34add3bd747d8ff267974de67880b7eb50bc8d

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-07-06 12:41:27 +10:00
parent 52076762ec
commit eba1e9b28a
17 changed files with 165 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
From 86c5e611e38486f957c9f59c62559be15ae1a4ab Mon Sep 17 00:00:00 2001
From d22de677b47898569530c3989ed560e26075c027 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: wineboot: Initialize proxy settings registry key.
Subject: [PATCH] wineboot: Initialize proxy settings registry key.
---
programs/wineboot/Makefile.in | 2 +-
@@ -9,7 +9,7 @@ Subject: 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 419ec16..1cacab1 100644
index eaea154057f..517010b6823 100644
--- a/programs/wineboot/Makefile.in
+++ b/programs/wineboot/Makefile.in
@@ -1,7 +1,7 @@
@@ -19,13 +19,13 @@ index 419ec16..1cacab1 100644
-DELAYIMPORTS = shell32 shlwapi version user32
+DELAYIMPORTS = shell32 shlwapi version user32 wininet
C_SRCS = \
shutdown.c \
EXTRADLLFLAGS = -mno-cygwin
diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index 8994cab..814fe90 100644
index fb67051e7d0..9302f8703a9 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -82,6 +82,7 @@
@@ -70,6 +70,7 @@
#include <shlwapi.h>
#include <shellapi.h>
#include <ntsecapi.h>
@@ -33,7 +33,7 @@ index 8994cab..814fe90 100644
#include "resource.h"
WINE_DEFAULT_DEBUG_CHANNEL(wineboot);
@@ -554,6 +555,13 @@ static void create_volatile_environment_registry_key(void)
@@ -690,6 +691,13 @@ static void create_volatile_environment_registry_key(void)
RegCloseKey( hkey );
}
@@ -47,7 +47,7 @@ index 8994cab..814fe90 100644
static void create_etc_stub_files(void)
{
static const WCHAR drivers_etcW[] = {'\\','d','r','i','v','e','r','s','\\','e','t','c',0};
@@ -1418,6 +1426,7 @@ int main( int argc, char *argv[] )
@@ -1548,6 +1556,7 @@ int __cdecl main( int argc, char *argv[] )
if (init || update) update_wineprefix( update );
create_volatile_environment_registry_key();
@@ -56,5 +56,5 @@ index 8994cab..814fe90 100644
ProcessRunKeys( HKEY_LOCAL_MACHINE, RunOnceW, TRUE, TRUE );
--
2.9.0
2.20.1