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 842b38e29166a429d59331be40761335807c85d2.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2020-12-05 10:25:39 +11:00
parent e002d94a8b
commit 7be9c41c35
10 changed files with 40 additions and 1061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From da42137e7187fddc47862f435f3f238c687dc109 Mon Sep 17 00:00:00 2001
From 869b1db8e2cc5e35976eaa751a3aa10dd017702d 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 ca6afcbe051..2b6f51d55ba 100644
index 67fd62ef6aa..d101104af1d 100644
--- a/dlls/kernel32/tests/loader.c
+++ b/dlls/kernel32/tests/loader.c
@@ -30,6 +30,7 @@
@@ -21,7 +21,7 @@ index ca6afcbe051..2b6f51d55ba 100644
#include "wine/test.h"
#include "delayloadhandler.h"
@@ -3945,6 +3946,79 @@ static void test_LoadPackagedLibrary(void)
@@ -3992,6 +3993,79 @@ static void test_LoadPackagedLibrary(void)
h, GetLastError());
}
@@ -101,7 +101,7 @@ index ca6afcbe051..2b6f51d55ba 100644
START_TEST(loader)
{
int argc;
@@ -4017,6 +4091,7 @@ START_TEST(loader)
@@ -4064,6 +4138,7 @@ START_TEST(loader)
test_InMemoryOrderModuleList();
test_LoadPackagedLibrary();
test_wow64_redirection();
@@ -110,10 +110,10 @@ index ca6afcbe051..2b6f51d55ba 100644
test_dll_file( "kernel32.dll" );
test_dll_file( "advapi32.dll" );
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 55588774b29..06f4571a008 100644
index d948913d7b8..d2663916149 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -124,6 +124,9 @@ struct file_id
@@ -115,6 +115,9 @@ struct file_id
BYTE ObjectId[16];
};
@@ -123,7 +123,7 @@ index 55588774b29..06f4571a008 100644
/* internal representation of loaded modules */
typedef struct _wine_modref
{
@@ -484,6 +487,52 @@ static void call_ldr_notifications( ULONG reason, LDR_DATA_TABLE_ENTRY *module )
@@ -455,6 +458,52 @@ static void call_ldr_notifications( ULONG reason, LDR_DATA_TABLE_ENTRY *module )
}
}
@@ -176,7 +176,7 @@ index 55588774b29..06f4571a008 100644
/*************************************************************************
* get_modref
*
@@ -1225,7 +1274,12 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name
@@ -1197,7 +1246,12 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name
&wm->ldr.InLoadOrderLinks);
InsertTailList(&NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList,
&wm->ldr.InMemoryOrderLinks);
@@ -189,7 +189,7 @@ index 55588774b29..06f4571a008 100644
if (!(nt->OptionalHeader.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_NX_COMPAT))
{
@@ -1956,6 +2010,7 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name,
@@ -1904,6 +1958,7 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name,
/* the module has only be inserted in the load & memory order lists */
RemoveEntryList(&wm->ldr.InLoadOrderLinks);
RemoveEntryList(&wm->ldr.InMemoryOrderLinks);
@@ -197,7 +197,7 @@ index 55588774b29..06f4571a008 100644
/* FIXME: there are several more dangling references
* left. Including dlls loaded by this dll before the
@@ -3330,6 +3385,7 @@ static void free_modref( WINE_MODREF *wm )
@@ -3269,6 +3324,7 @@ static void free_modref( WINE_MODREF *wm )
{
RemoveEntryList(&wm->ldr.InLoadOrderLinks);
RemoveEntryList(&wm->ldr.InMemoryOrderLinks);
@@ -205,7 +205,7 @@ index 55588774b29..06f4571a008 100644
if (wm->ldr.InInitializationOrderLinks.Flink)
RemoveEntryList(&wm->ldr.InInitializationOrderLinks);
@@ -4091,6 +4147,7 @@ static NTSTATUS process_init(void)
@@ -3988,6 +4044,7 @@ static NTSTATUS process_init(void)
INITIAL_TEB stack;
TEB *teb = NtCurrentTeb();
PEB *peb = teb->Peb;
@@ -213,7 +213,7 @@ index 55588774b29..06f4571a008 100644
peb->LdrData = &ldr;
peb->FastPebLock = &peb_lock;
@@ -4130,6 +4187,10 @@ static NTSTATUS process_init(void)
@@ -4024,6 +4081,10 @@ static NTSTATUS process_init(void)
load_global_options();
version_init();
@@ -222,9 +222,9 @@ index 55588774b29..06f4571a008 100644
+ InitializeListHead(&hash_table[i]);
+
/* setup the load callback and create ntdll modref */
RtlInitUnicodeString( &nt_name, ntdllW );
RtlInitUnicodeString( &nt_name, L"\\??\\C:\\windows\\system32\\ntdll.dll" );
NtQueryVirtualMemory( GetCurrentProcess(), process_init, MemoryBasicInformation,
@@ -4223,6 +4284,10 @@ static NTSTATUS process_init(void)
@@ -4118,6 +4179,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 55588774b29..06f4571a008 100644
}
diff --git a/include/winternl.h b/include/winternl.h
index 62395bbce38..2511fa37c05 100644
index c5f3ba04a8a..d5d16eff4f5 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -2680,8 +2680,8 @@ typedef struct _LDR_DATA_TABLE_ENTRY
@@ -2721,8 +2721,8 @@ typedef struct _LDR_DATA_TABLE_ENTRY
ULONG Flags;
SHORT LoadCount;
SHORT TlsIndex;
@@ -250,5 +250,5 @@ index 62395bbce38..2511fa37c05 100644
HANDLE ActivationContext;
void* Lock;
--
2.28.0
2.29.2