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 54b8c8c7eaafd19780cb4d91b763fe2f20327f50.

Browse Source
This commit is contained in:
Zebediah Figura
2022-02-07 23:49:59 -06:00
parent 54850aa1ff
commit 773483f7f5
8 changed files with 27 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 65da921b514b01640d2715e4c323fc9cf5626612 Mon Sep 17 00:00:00 2001
From 11f4a6f3093e589ee31d88a872f35155a26e47aa 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,11 +9,10 @@ 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 3b78729dce6..1a804595c1c 100644
index 667f8f48702..4a1747ad047 100644
--- a/programs/wineboot/Makefile.in
+++ b/programs/wineboot/Makefile.in
@@ -1,7 +1,7 @@
EXTRADEFS = -DWINE_NO_LONG_TYPES
@@ -1,6 +1,6 @@
MODULE = wineboot.exe
IMPORTS = uuid advapi32 ws2_32 kernelbase
-DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev
@@ -22,7 +21,7 @@ index 3b78729dce6..1a804595c1c 100644
EXTRADLLFLAGS = -mconsole
diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index 14943b005ef..9aab3b68e5b 100644
index b82c5ec6524..2af77ee0d87 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -77,6 +77,7 @@
@@ -33,7 +32,7 @@ index 14943b005ef..9aab3b68e5b 100644
#include <newdev.h>
#include "resource.h"
@@ -1002,6 +1003,13 @@ static void create_volatile_environment_registry_key(void)
@@ -902,6 +903,13 @@ static void create_volatile_environment_registry_key(void)
RegCloseKey( hkey );
}
@@ -47,7 +46,7 @@ index 14943b005ef..9aab3b68e5b 100644
/* Performs the rename operations dictated in %SystemRoot%\Wininit.ini.
* Returns FALSE if there was an error, or otherwise if all is ok.
*/
@@ -1812,6 +1820,7 @@ int __cdecl main( int argc, char *argv[] )
@@ -1712,6 +1720,7 @@ int __cdecl main( int argc, char *argv[] )
if (init || update) update_wineprefix( update );
create_volatile_environment_registry_key();