Rebase against e956c4ec71dd0f41090df3863e6f937963b2b7d9.

This commit is contained in:
Elizabeth Figura
2025-04-02 18:32:00 -05:00
parent e1b2c45272
commit 8924ee42d8
12 changed files with 47 additions and 263 deletions

View File

@@ -1,4 +1,4 @@
From caa1fa1ebb2ffe9bb8f0f298c4738fd631314ddb Mon Sep 17 00:00:00 2001
From cae15d2a3e900333e829a2df790a19e9fa154bbf 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 4f83d9eef32..23ffc1f5845 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 4f83d9eef32..23ffc1f5845 100644
#include <newdev.h>
#include "resource.h"
@@ -1083,6 +1084,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,10 +46,10 @@ index 4f83d9eef32..23ffc1f5845 100644
/* Performs the rename operations dictated in %SystemRoot%\Wininit.ini.
* Returns FALSE if there was an error, or otherwise if all is ok.
*/
@@ -1922,6 +1930,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 );