Rebase against 908f9eb20ff7511fe7f717d1a72d0e2e8911887d.

This commit is contained in:
Paul Gofman
2025-04-01 12:25:44 -06:00
parent c103bbb0b6
commit 441fd5f422
4 changed files with 8 additions and 447 deletions

View File

@@ -1,4 +1,4 @@
From 1a1df38fe5f57d6c8872d0c92cc7b24512c8c72d Mon Sep 17 00:00:00 2001
From 79dff8725f056d8f420a2b1067e200f8da65ee71 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.
@@ -21,10 +21,10 @@ index 0983420a91f..d346b8984b1 100644
EXTRADLLFLAGS = -mconsole
diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index 57aa4335534..d15ed726530 100644
index 1bce8bab33a..c90c3e1d41c 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -77,6 +77,7 @@
@@ -78,6 +78,7 @@
#include <shlwapi.h>
#include <shellapi.h>
#include <setupapi.h>
@@ -32,10 +32,10 @@ index 57aa4335534..d15ed726530 100644
#include <newdev.h>
#include "resource.h"
@@ -1180,6 +1181,13 @@ static void create_volatile_environment_registry_key(void)
RegCloseKey( hkey );
@@ -1219,6 +1220,13 @@ static void create_known_dlls(void)
}
+static void create_proxy_settings(void)
+{
+ HINTERNET inet;
@@ -46,14 +46,14 @@ index 57aa4335534..d15ed726530 100644
/* Performs the rename operations dictated in %SystemRoot%\Wininit.ini.
* Returns FALSE if there was an error, or otherwise if all is ok.
*/
@@ -2019,6 +2027,7 @@ int __cdecl main( int argc, char *argv[] )
if (init || update) update_wineprefix( update );
@@ -2059,6 +2067,7 @@ int __cdecl main( int argc, char *argv[] )
create_volatile_environment_registry_key();
create_known_dlls();
+ create_proxy_settings();
ProcessRunKeys( HKEY_LOCAL_MACHINE, L"RunOnce", TRUE, TRUE );
--
2.45.2
2.49.0