wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 433b9081ba7c862feb947400f507228e793d7d4c.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2021-02-03 10:11:33 +11:00
parent 32b29ad4d8
commit cae1b3eba0
10 changed files with 86 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
patches/ntdll-HashLinks/0001-ntdll-Implement-HashLinks-field-in-LDR-module-data.patch
View File

@@ -1,4 +1,4 @@
From 869b1db8e2cc5e35976eaa751a3aa10dd017702d Mon Sep 17 00:00:00 2001
From 676ef7076ef33a21649a07acdc5e6e7fee761165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 3 Apr 2017 05:30:27 +0200
Subject: [PATCH] ntdll: Implement HashLinks field in LDR module data.
@@ -10,7 +10,7 @@ Subject: [PATCH] ntdll: Implement HashLinks field in LDR module data.
3 files changed, 141 insertions(+), 1 deletion(-)
diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c
index 67fd62ef6aa..d101104af1d 100644
index 861fc321729..28b0edacd0a 100644
--- a/dlls/kernel32/tests/loader.c
+++ b/dlls/kernel32/tests/loader.c
@@ -30,6 +30,7 @@
@@ -21,7 +21,7 @@ index 67fd62ef6aa..d101104af1d 100644
#include "wine/test.h"
#include "delayloadhandler.h"
@@ -3992,6 +3993,79 @@ static void test_LoadPackagedLibrary(void)
@@ -4003,6 +4004,79 @@ static void test_LoadPackagedLibrary(void)
h, GetLastError());
}
@@ -101,7 +101,7 @@ index 67fd62ef6aa..d101104af1d 100644
START_TEST(loader)
{
int argc;
@@ -4064,6 +4138,7 @@ START_TEST(loader)
@@ -4075,6 +4149,7 @@ START_TEST(loader)
test_InMemoryOrderModuleList();
test_LoadPackagedLibrary();
test_wow64_redirection();
@@ -110,7 +110,7 @@ index 67fd62ef6aa..d101104af1d 100644
test_dll_file( "kernel32.dll" );
test_dll_file( "advapi32.dll" );
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index d948913d7b8..d2663916149 100644
index dad7bae6ccf..0727d4d15f5 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -115,6 +115,9 @@ struct file_id
@@ -197,7 +197,7 @@ index d948913d7b8..d2663916149 100644
/* FIXME: there are several more dangling references
* left. Including dlls loaded by this dll before the
@@ -3269,6 +3324,7 @@ static void free_modref( WINE_MODREF *wm )
@@ -3291,6 +3346,7 @@ static void free_modref( WINE_MODREF *wm )
{
RemoveEntryList(&wm->ldr.InLoadOrderLinks);
RemoveEntryList(&wm->ldr.InMemoryOrderLinks);
@@ -205,7 +205,7 @@ index d948913d7b8..d2663916149 100644
if (wm->ldr.InInitializationOrderLinks.Flink)
RemoveEntryList(&wm->ldr.InInitializationOrderLinks);
@@ -3988,6 +4044,7 @@ static NTSTATUS process_init(void)
@@ -4010,6 +4066,7 @@ static NTSTATUS process_init(void)
INITIAL_TEB stack;
TEB *teb = NtCurrentTeb();
PEB *peb = teb->Peb;
@@ -213,7 +213,7 @@ index d948913d7b8..d2663916149 100644
peb->LdrData = &ldr;
peb->FastPebLock = &peb_lock;
@@ -4024,6 +4081,10 @@ static NTSTATUS process_init(void)
@@ -4046,6 +4103,10 @@ static NTSTATUS process_init(void)
load_global_options();
version_init();
@@ -221,10 +221,10 @@ index d948913d7b8..d2663916149 100644
+ for (i = 0; i < HASH_MAP_SIZE; i++)
+ InitializeListHead(&hash_table[i]);
+
/* setup the load callback and create ntdll modref */
RtlInitUnicodeString( &nt_name, L"\\??\\C:\\windows\\system32\\ntdll.dll" );
NtQueryVirtualMemory( GetCurrentProcess(), process_init, MemoryBasicInformation,
@@ -4118,6 +4179,10 @@ static NTSTATUS process_init(void)
if (!(status = load_dll( params->DllPath.Buffer, params->ImagePathName.Buffer, NULL,
DONT_RESOLVE_DLL_REFERENCES, &wm )))
{
@@ -4133,6 +4194,10 @@ static NTSTATUS process_init(void)
teb->Tib.StackBase = stack.StackBase;
teb->Tib.StackLimit = stack.StackLimit;
teb->DeallocationStack = stack.DeallocationStack;
@@ -236,10 +236,10 @@ index d948913d7b8..d2663916149 100644
}
diff --git a/include/winternl.h b/include/winternl.h
index c5f3ba04a8a..d5d16eff4f5 100644
index 2ff60a35004..8cc8a166608 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -2721,8 +2721,8 @@ typedef struct _LDR_DATA_TABLE_ENTRY
@@ -2731,8 +2731,8 @@ typedef struct _LDR_DATA_TABLE_ENTRY
ULONG Flags;
SHORT LoadCount;
SHORT TlsIndex;