From 0054ae21165bdbf68e1efa60d55b4a2e64ce8a58 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 28 Nov 2023 11:46:56 +1100 Subject: [PATCH] Rebase against 6343dc6c9571fce20cd00102c5b0bd5c96861cfd. --- ...mplement-HashLinks-field-in-LDR-module-data.patch | 12 ++++++------ staging/upstream-commit | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/patches/ntdll-HashLinks/0001-ntdll-Implement-HashLinks-field-in-LDR-module-data.patch b/patches/ntdll-HashLinks/0001-ntdll-Implement-HashLinks-field-in-LDR-module-data.patch index bf6a2e16..3c17359c 100644 --- a/patches/ntdll-HashLinks/0001-ntdll-Implement-HashLinks-field-in-LDR-module-data.patch +++ b/patches/ntdll-HashLinks/0001-ntdll-Implement-HashLinks-field-in-LDR-module-data.patch @@ -1,4 +1,4 @@ -From a97f56374e65a2c1edb0d9b2bbd6ca433e598aca Mon Sep 17 00:00:00 2001 +From e8fe190b8e6352987961e1da946d125b99309034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Mon, 3 Apr 2017 05:30:27 +0200 Subject: [PATCH] ntdll: Implement HashLinks field in LDR module data. @@ -109,7 +109,7 @@ index ec6f2d5c6a7..654a83c92f9 100644 test_dll_file( "kernel32.dll" ); test_dll_file( "advapi32.dll" ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c -index f1ec6848f56..60e219e9f6b 100644 +index 851fdcf3535..ed169d7bced 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -133,6 +133,9 @@ struct file_id @@ -185,15 +185,15 @@ index f1ec6848f56..60e219e9f6b 100644 if (wm->ldr.InInitializationOrderLinks.Flink) RemoveEntryList(&wm->ldr.InInitializationOrderLinks); -@@ -4275,6 +4312,7 @@ void loader_init( CONTEXT *context, void **entry ) - MEMORY_BASIC_INFORMATION meminfo; +@@ -4276,6 +4313,7 @@ void loader_init( CONTEXT *context, void **entry ) + ANSI_STRING ctrl_routine = RTL_CONSTANT_STRING( "CtrlRoutine" ); WINE_MODREF *kernel32; PEB *peb = NtCurrentTeb()->Peb; + unsigned int i; NtQueryVirtualMemory( GetCurrentProcess(), LdrInitializeThunk, MemoryBasicInformation, &meminfo, sizeof(meminfo), NULL ); -@@ -4293,6 +4331,10 @@ void loader_init( CONTEXT *context, void **entry ) +@@ -4294,6 +4332,10 @@ void loader_init( CONTEXT *context, void **entry ) RtlSetBits( peb->TlsBitmap, 0, NtCurrentTeb()->WowTebOffset ? WOW64_TLS_MAX_NUMBER : 1 ); RtlSetBits( peb->TlsBitmap, NTDLL_TLS_ERRNO, 1 ); @@ -205,5 +205,5 @@ index f1ec6848f56..60e219e9f6b 100644 load_global_options(); version_init(); -- -2.42.0 +2.43.0 diff --git a/staging/upstream-commit b/staging/upstream-commit index ae13fac1..c7b77350 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -13c43cf3d06178dc39d98981f55d27e3cbd79ad0 +6343dc6c9571fce20cd00102c5b0bd5c96861cfd