wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against c20abdb856139f156ceab0afbb8454e0ad79f0a4.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2025-09-10 07:47:02 +10:00
parent 5f55fc20dc
commit 91b4afcd38
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/Staging/0001-ntdll-Print-a-warning-message-specifying-the-wine-st.patch
View File

@@ -1,4 +1,4 @@
From 3dc4a148d7c91afea8f589f47daca82c5c27b7c1 Mon Sep 17 00:00:00 2001
From efd5485d5026fceb01c7a25bb47a780505adea68 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Thu, 2 Oct 2014 19:44:31 +0200
Subject: [PATCH] ntdll: Print a warning message specifying the wine-staging
@@ -9,7 +9,7 @@ Subject: [PATCH] ntdll: Print a warning message specifying the wine-staging
1 file changed, 19 insertions(+)
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 74eb1b7f500..95639558155 100644
index c20d6a5d87b..717f321bc6e 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -43,6 +43,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay);
@@ -20,7 +20,7 @@ index 74eb1b7f500..95639558155 100644
#ifdef _WIN64
#define DEFAULT_SECURITY_COOKIE_64 (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232)
@@ -3870,6 +3871,7 @@ void WINAPI LdrShutdownProcess(void)
@@ -3879,6 +3880,7 @@ void WINAPI LdrShutdownProcess(void)
process_detach();
}
@@ -28,7 +28,7 @@ index 74eb1b7f500..95639558155 100644
/******************************************************************
* RtlExitUserProcess (NTDLL.@)
@@ -4366,6 +4368,9 @@ static void release_address_space(void)
@@ -4388,6 +4390,9 @@ static void release_address_space(void)
*/
void loader_init( CONTEXT *context, void **entry )
{
@@ -38,9 +38,9 @@ index 74eb1b7f500..95639558155 100644
static int attach_done;
NTSTATUS status;
ULONG_PTR cookie, port = 0;
@@ -4455,6 +4460,20 @@ void loader_init( CONTEXT *context, void **entry )
arm64ec_thread_init();
#endif
@@ -4485,6 +4490,20 @@ void loader_init( CONTEXT *context, void **entry )
}
wm = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress );
+ /* This hunk occasionally applies in the wrong place;
+ * add a comment here to try to prevent that. */
@@ -60,5 +60,5 @@ index 74eb1b7f500..95639558155 100644
NtCurrentTeb()->FlsSlots = fls_alloc_data();
--
2.47.2
2.51.0