From 428a6cdcd06dbc5f73f710d2952d882b604f5686 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Sat, 14 Oct 2023 09:49:00 +1100 Subject: [PATCH] Rebase against 9d78031de6261f29d42e18db04f9925cfba24108. --- ...warning-message-specifying-the-wine-st.patch} | 16 ++++++++-------- staging/upstream-commit | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) rename patches/Staging/{0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch => 0001-ntdll-Print-a-warning-message-specifying-the-wine-st.patch} (79%) diff --git a/patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch b/patches/Staging/0001-ntdll-Print-a-warning-message-specifying-the-wine-st.patch similarity index 79% rename from patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch rename to patches/Staging/0001-ntdll-Print-a-warning-message-specifying-the-wine-st.patch index e0ad19a3..1d755ec0 100644 --- a/patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch +++ b/patches/Staging/0001-ntdll-Print-a-warning-message-specifying-the-wine-st.patch @@ -1,4 +1,4 @@ -From 36b4dbb687232d783cc3203da1dee4a797606ba7 Mon Sep 17 00:00:00 2001 +From e6354103c243e13c177f6a534a9e786cfdcf7c92 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,10 +9,10 @@ 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 255d5afef79..00add6728cc 100644 +index 1a87f4d1f5e..31c0a3bae94 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c -@@ -44,6 +44,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); +@@ -42,6 +42,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); WINE_DECLARE_DEBUG_CHANNEL(snoop); WINE_DECLARE_DEBUG_CHANNEL(loaddll); WINE_DECLARE_DEBUG_CHANNEL(imports); @@ -20,7 +20,7 @@ index 255d5afef79..00add6728cc 100644 #ifdef _WIN64 #define DEFAULT_SECURITY_COOKIE_64 (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232) -@@ -3536,6 +3537,7 @@ void WINAPI LdrShutdownProcess(void) +@@ -3749,6 +3750,7 @@ void WINAPI LdrShutdownProcess(void) process_detach(); } @@ -28,9 +28,9 @@ index 255d5afef79..00add6728cc 100644 /****************************************************************** * RtlExitUserProcess (NTDLL.@) -@@ -3955,6 +3957,9 @@ static void release_address_space(void) +@@ -4195,6 +4197,9 @@ static void release_address_space(void) */ - void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR unknown3, ULONG_PTR unknown4 ) + void loader_init( CONTEXT *context, void **entry ) { + OBJECT_ATTRIBUTES staging_event_attr; + UNICODE_STRING staging_event_string; @@ -38,7 +38,7 @@ index 255d5afef79..00add6728cc 100644 static int attach_done; NTSTATUS status; ULONG_PTR cookie; -@@ -4041,6 +4046,16 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR +@@ -4274,6 +4279,16 @@ void loader_init( CONTEXT *context, void **entry ) if (NtCurrentTeb()->WowTebOffset) init_wow64( context ); #endif @@ -56,5 +56,5 @@ index 255d5afef79..00add6728cc 100644 InsertHeadList( &tls_links, &NtCurrentTeb()->TlsLinks ); RtlReleasePebLock(); -- -2.33.0 +2.42.0 diff --git a/staging/upstream-commit b/staging/upstream-commit index 99e722f9..f8b07115 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -d177709b10ce07ddd234b0e8e00764ae4b1d8488 +9d78031de6261f29d42e18db04f9925cfba24108