diff --git a/patches/Staging/0001-ntdll-Print-a-warning-message-specifying-the-wine-st.patch b/patches/Staging/0001-ntdll-Print-a-warning-message-specifying-the-wine-st.patch index 1d755ec0..0446e678 100644 --- a/patches/Staging/0001-ntdll-Print-a-warning-message-specifying-the-wine-st.patch +++ b/patches/Staging/0001-ntdll-Print-a-warning-message-specifying-the-wine-st.patch @@ -1,4 +1,4 @@ -From e6354103c243e13c177f6a534a9e786cfdcf7c92 Mon Sep 17 00:00:00 2001 +From f48fa2ff628c3262245593301a141dee31118fd4 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 @@ -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 1a87f4d1f5e..31c0a3bae94 100644 +index 021f7941969..68cb4b25d85 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -42,6 +42,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); @@ -20,7 +20,7 @@ index 1a87f4d1f5e..31c0a3bae94 100644 #ifdef _WIN64 #define DEFAULT_SECURITY_COOKIE_64 (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232) -@@ -3749,6 +3750,7 @@ void WINAPI LdrShutdownProcess(void) +@@ -3822,6 +3823,7 @@ void WINAPI LdrShutdownProcess(void) process_detach(); } @@ -28,7 +28,7 @@ index 1a87f4d1f5e..31c0a3bae94 100644 /****************************************************************** * RtlExitUserProcess (NTDLL.@) -@@ -4195,6 +4197,9 @@ static void release_address_space(void) +@@ -4244,6 +4246,9 @@ static void release_address_space(void) */ void loader_init( CONTEXT *context, void **entry ) { @@ -37,8 +37,8 @@ index 1a87f4d1f5e..31c0a3bae94 100644 + HANDLE staging_event; static int attach_done; NTSTATUS status; - ULONG_PTR cookie; -@@ -4274,6 +4279,16 @@ void loader_init( CONTEXT *context, void **entry ) + ULONG_PTR cookie, port = 0; +@@ -4317,6 +4322,16 @@ void loader_init( CONTEXT *context, void **entry ) if (NtCurrentTeb()->WowTebOffset) init_wow64( context ); #endif @@ -56,5 +56,5 @@ index 1a87f4d1f5e..31c0a3bae94 100644 InsertHeadList( &tls_links, &NtCurrentTeb()->TlsLinks ); RtlReleasePebLock(); -- -2.42.0 +2.43.0 diff --git a/staging/upstream-commit b/staging/upstream-commit index 955d820c..08b80e73 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -35ac0e7ac0511ef766f3f35220869565ce07906e +d81c4ce1ba700cca040afcf89c75c683b23e531d