Skip to content

Commit

Permalink
patches: rebase wine staging
Browse files Browse the repository at this point in the history
  • Loading branch information
GloriousEggroll committed Apr 3, 2023
1 parent d350036 commit e4f88dd
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 1 deletion.
2 changes: 1 addition & 1 deletion patches/protonprep-valve-staging.sh
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
patch -Np1 < ../patches/wine-hotfixes/staging/windows.networking.connectivity-new-dll/0008-windows.networking.connectivity-IConnectionProfile-G.patch

# wineboot-ProxySettings
patch -Np1 < ../wine-staging/patches/wineboot-ProxySettings/0001-wineboot-Initialize-proxy-settings-registry-key.patch
patch -Np1 < ../patches/wine-hotfixes/staging/wineboot-ProxySettings/0001-wineboot-Initialize-proxy-settings-registry-key.patch

# winex11-UpdateLayeredWindow
patch -Np1 < ../wine-staging/patches/winex11-UpdateLayeredWindow/0001-winex11-Fix-alpha-blending-in-X11DRV_UpdateLayeredWi.patch
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
From 584eecc73a8cba537b8f50932769729a29fe7d3d 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.

---
programs/wineboot/Makefile.in | 2 +-
programs/wineboot/wineboot.c | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in
index 667f8f48702..4a1747ad047 100644
--- a/programs/wineboot/Makefile.in
+++ b/programs/wineboot/Makefile.in
@@ -1,6 +1,6 @@
MODULE = wineboot.exe
IMPORTS = uuid advapi32 ws2_32 kernelbase
-DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev crypt32
+DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev crypt32 wininet

EXTRADLLFLAGS = -mconsole

diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index 14943b005ef..9aab3b68e5b 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -77,6 +77,7 @@
#include <shlwapi.h>
#include <shellapi.h>
#include <setupapi.h>
+#include <wininet.h>
#include <newdev.h>
#include "resource.h"

@@ -1002,6 +1003,13 @@ static void create_volatile_environment_registry_key(void)
RegCloseKey( hkey );
}

+static void create_proxy_settings(void)
+{
+ HINTERNET inet;
+ inet = InternetOpenA( "Wine", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0 );
+ if (inet) InternetCloseHandle( inet );
+}
+
/* 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[] )
if (init || update) update_wineprefix( update );

create_volatile_environment_registry_key();
+ create_proxy_settings();

ProcessRunKeys( HKEY_LOCAL_MACHINE, L"RunOnce", TRUE, TRUE );

--
2.33.0

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixes: [42024] Create ProxyEnable key on wineprefix update

0 comments on commit e4f88dd

Please sign in to comment.