Rebase against 39263558a2088940aaacd6eda19ca23d40b63495.

This commit is contained in:
Zebediah Figura
2021-04-16 00:26:25 -05:00
parent 425f75f839
commit 30c9d5a0f8
11 changed files with 54 additions and 476 deletions

View File

@@ -1,4 +1,4 @@
From 4e43757350f1104b73d6aef09fd277ef8a245412 Mon Sep 17 00:00:00 2001
From 16060eb72cc435d6073f1e4cd6b73093b16ac972 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.
@@ -22,7 +22,7 @@ index 2552f69990a..769ad7ee511 100644
EXTRADLLFLAGS = -mno-cygwin
diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index 119fef90c10..05d695a7d4a 100644
index 8d2050c2f4b..c79bab3a25c 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -78,6 +78,7 @@
@@ -33,7 +33,7 @@ index 119fef90c10..05d695a7d4a 100644
#include <newdev.h>
#include "resource.h"
@@ -1032,6 +1033,13 @@ static void create_volatile_environment_registry_key(void)
@@ -933,6 +934,13 @@ static void create_volatile_environment_registry_key(void)
RegCloseKey( hkey );
}
@@ -44,10 +44,10 @@ index 119fef90c10..05d695a7d4a 100644
+ if (inet) InternetCloseHandle( inet );
+}
+
static void create_etc_stub_files(void)
{
static const WCHAR drivers_etcW[] = {'\\','d','r','i','v','e','r','s','\\','e','t','c',0};
@@ -1877,6 +1885,7 @@ int __cdecl main( int argc, char *argv[] )
/* Performs the rename operations dictated in %SystemRoot%\Wininit.ini.
* Returns FALSE if there was an error, or otherwise if all is ok.
*/
@@ -1742,6 +1750,7 @@ int __cdecl main( int argc, char *argv[] )
if (init || update) update_wineprefix( update );
create_volatile_environment_registry_key();
@@ -56,5 +56,5 @@ index 119fef90c10..05d695a7d4a 100644
ProcessRunKeys( HKEY_LOCAL_MACHINE, L"RunOnce", TRUE, TRUE );
--
2.28.0
2.30.2

View File

@@ -1,3 +1,2 @@
Fixes: [42024] Create ProxyEnable key on wineprefix update
Depends: wineboot-drivers_etc_Stubs
Depends: wineboot-DriveSerial