diff --git a/patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch b/patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch index 9f7fd4b3..51fbc6ae 100644 --- a/patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch +++ b/patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch @@ -1,15 +1,15 @@ -From a4d9189613ecacb289595663302c1db8676c8d9d Mon Sep 17 00:00:00 2001 +From e51b05c3a9d03e4dd84a107a30841d95f8a519c3 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 2 Oct 2014 19:44:31 +0200 Subject: [PATCH] ntdll: Print a warning message specifying the wine-staging branch name and version. --- - dlls/ntdll/loader.c | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) + dlls/ntdll/loader.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c -index 7a714a5aa6d..e5325ec31ff 100644 +index ee453700e51..c2d4b3c2f86 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 7a714a5aa6d..e5325ec31ff 100644 #ifdef _WIN64 #define DEFAULT_SECURITY_COOKIE_64 (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232) -@@ -3235,6 +3236,7 @@ void WINAPI LdrShutdownProcess(void) +@@ -3307,6 +3308,7 @@ void WINAPI LdrShutdownProcess(void) process_detach(); } @@ -28,7 +28,7 @@ index 7a714a5aa6d..e5325ec31ff 100644 /****************************************************************** * RtlExitUserProcess (NTDLL.@) -@@ -3597,6 +3599,9 @@ static void init_wow64(void) +@@ -3673,6 +3675,9 @@ static void init_wow64(void) */ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR unknown3, ULONG_PTR unknown4 ) { @@ -38,9 +38,9 @@ index 7a714a5aa6d..e5325ec31ff 100644 static int attach_done; int i; NTSTATUS status; -@@ -3614,6 +3619,16 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR - entry = (void **)&context->u.s.X0; - #endif +@@ -3753,6 +3758,17 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR + } + else wm = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); + RtlInitUnicodeString( &staging_event_string, L"\\__wine_staging_warn_event" ); + InitializeObjectAttributes( &staging_event_attr, &staging_event_string, OBJ_OPENIF, NULL, NULL ); @@ -52,9 +52,10 @@ index 7a714a5aa6d..e5325ec31ff 100644 + else + WARN_(winediag)("wine-staging %s is a testing version containing experimental patches.\n", wine_get_version()); + - if (process_detaching) NtTerminateThread( GetCurrentThread(), 0 ); - - RtlEnterCriticalSection( &loader_section ); ++ + RtlAcquirePebLock(); + InsertHeadList( &tls_links, &NtCurrentTeb()->TlsLinks ); + RtlReleasePebLock(); -- 2.30.2