Rebase against 46367d1ecc8a016ab7c7af9ec107e33c6d46fc26.

This commit is contained in:
Alistair Leslie-Hughes
2021-11-04 10:15:32 +11:00
parent fe634350d2
commit 00ab8180c0
13 changed files with 76 additions and 193 deletions

View File

@@ -1,4 +1,4 @@
From 916189d1cdf149f16867870121171e20f129da9f Mon Sep 17 00:00:00 2001
From 36b4dbb687232d783cc3203da1dee4a797606ba7 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, 15 insertions(+)
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 3339596944a..1d435f88755 100644
index 255d5afef79..00add6728cc 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -44,6 +44,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay);
@@ -20,7 +20,7 @@ index 3339596944a..1d435f88755 100644
#ifdef _WIN64
#define DEFAULT_SECURITY_COOKIE_64 (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232)
@@ -3373,6 +3374,7 @@ void WINAPI LdrShutdownProcess(void)
@@ -3536,6 +3537,7 @@ void WINAPI LdrShutdownProcess(void)
process_detach();
}
@@ -28,7 +28,7 @@ index 3339596944a..1d435f88755 100644
/******************************************************************
* RtlExitUserProcess (NTDLL.@)
@@ -3783,6 +3785,9 @@ static void init_wow64( CONTEXT *context )
@@ -3955,6 +3957,9 @@ static void release_address_space(void)
*/
void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR unknown3, ULONG_PTR unknown4 )
{
@@ -36,9 +36,9 @@ index 3339596944a..1d435f88755 100644
+ UNICODE_STRING staging_event_string;
+ HANDLE staging_event;
static int attach_done;
int i;
NTSTATUS status;
@@ -3869,6 +3874,16 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
ULONG_PTR cookie;
@@ -4041,6 +4046,16 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
if (NtCurrentTeb()->WowTebOffset) init_wow64( context );
#endif
@@ -56,5 +56,5 @@ index 3339596944a..1d435f88755 100644
InsertHeadList( &tls_links, &NtCurrentTeb()->TlsLinks );
RtlReleasePebLock();
--
2.30.2
2.33.0