Rebase against 38938bdb6f752cb68d13d833be97d0c524fe827e.

patches/ntdll-ForceBottomUpAlloc/0004-ntdll-Exclude-natively-mapped-areas-from-free-areas-.patch

@@ -1,4 +1,4 @@
-From f918a9c53c678d3234cc6b51083af524087966bb Mon Sep 17 00:00:00 2001
+From 238af21a74a01c54ae3e24b6873b6b4fd66d7368 Mon Sep 17 00:00:00 2001
 From: Paul Gofman <pgofman@codeweavers.com>
 Date: Fri, 1 Dec 2023 14:55:20 -0600
 Subject: [PATCH] ntdll: Exclude natively mapped areas from free areas list.
@@ -8,7 +8,7 @@ Subject: [PATCH] ntdll: Exclude natively mapped areas from free areas list.
  1 file changed, 96 insertions(+), 9 deletions(-)
 
 diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
-index a5270649c0d..0fe761a3b85 100644
+index b5115693758..a08c75dd2c1 100644
 --- a/dlls/ntdll/unix/virtual.c
 +++ b/dlls/ntdll/unix/virtual.c
 @@ -144,6 +144,7 @@ struct file_view
@@ -31,7 +31,7 @@ index a5270649c0d..0fe761a3b85 100644
 @@ -1380,7 +1383,9 @@ static void dump_view( struct file_view *view )
      BYTE prot = get_page_vprot( addr );
  
-     TRACE( "View: %p - %p", addr, addr + view->size - 1 );
+     TRACE( "View: %p - %p %s", addr, addr + view->size - 1, get_prot_str(view->protect) );
 -    if (view->protect & VPROT_SYSTEM)
 +    if (view->protect & VPROT_NATIVE)
 +        TRACE(" (native)\n");
@@ -197,7 +197,7 @@ index a5270649c0d..0fe761a3b85 100644
      }
  done:
      status = create_view( view_ret, ptr, size, vprot );
-@@ -4746,7 +4828,12 @@ void virtual_set_force_exec( BOOL enable )
+@@ -4882,7 +4964,12 @@ void virtual_set_force_exec( BOOL enable )
          WINE_RB_FOR_EACH_ENTRY( view, &views_tree, struct file_view, entry )
          {
              /* file mappings are always accessible */
@@ -212,5 +212,5 @@ index a5270649c0d..0fe761a3b85 100644
              mprotect_range( view->base, view->size, commit, 0 );
          }
 -- 
-2.47.2
+2.51.0
 

patches/wineboot-ProxySettings/0001-wineboot-Initialize-proxy-settings-registry-key.patch

@@ -1,59 +0,0 @@
-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.
-
----
- 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 0983420a91f..d346b8984b1 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 gdi32 setupapi newdev
-+DELAYIMPORTS = shell32 shlwapi version user32 gdi32 setupapi newdev wininet
- 
- EXTRADLLFLAGS = -mconsole
- 
-diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
-index 1bce8bab33a..c90c3e1d41c 100644
---- a/programs/wineboot/wineboot.c
-+++ b/programs/wineboot/wineboot.c
-@@ -78,6 +78,7 @@
- #include <shlwapi.h>
- #include <shellapi.h>
- #include <setupapi.h>
-+#include <wininet.h>
- #include <newdev.h>
- #include "resource.h"
- 
-@@ -1219,6 +1220,13 @@ static void create_known_dlls(void)
- }
- 
- 
-+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.
-  */
-@@ -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.47.2
-

patches/wineboot-ProxySettings/definition

@@ -1 +0,0 @@
-Fixes: [42024] Create ProxyEnable key on wineprefix update

staging/upstream-commit

@@ -1 +1 @@
-606d2f48bf8149bf45153f11ef3501eece20762c
+38938bdb6f752cb68d13d833be97d0c524fe827e