Rebase against 85cb1ff91ed4d48559c5500e2ccb0b15801edc05.

This commit is contained in:
Alistair Leslie-Hughes
2022-01-28 12:48:29 +11:00
parent b1a5648b37
commit cafb155af5
15 changed files with 96 additions and 90 deletions

View File

@ -1,4 +1,4 @@
From 584eecc73a8cba537b8f50932769729a29fe7d3d Mon Sep 17 00:00:00 2001
From 65da921b514b01640d2715e4c323fc9cf5626612 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,10 +9,11 @@ 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 667f8f48702..4a1747ad047 100644
index 3b78729dce6..1a804595c1c 100644
--- a/programs/wineboot/Makefile.in
+++ b/programs/wineboot/Makefile.in
@@ -1,6 +1,6 @@
@@ -1,7 +1,7 @@
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = wineboot.exe
IMPORTS = uuid advapi32 ws2_32 kernelbase
-DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev
@ -55,5 +56,5 @@ index 14943b005ef..9aab3b68e5b 100644
ProcessRunKeys( HKEY_LOCAL_MACHINE, L"RunOnce", TRUE, TRUE );
--
2.33.0
2.34.1