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 0d42388095e4fd5c7702a61824b01ce0f9fc4d74.

Browse Source
This commit is contained in:
Zebediah Figura
2020-07-24 18:41:25 -05:00
parent 99c296e10c
commit f7013bb1b4
35 changed files with 57 additions and 6115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 1532ada677d566e60146cbe246f31d133b4dc955 Mon Sep 17 00:00:00 2001
From 9bf96d63c4815fd6f4480102be400517e9c8d387 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.
@@ -110,7 +110,7 @@ index 757a230ae15..466e5a444f4 100644
test_dll_file( "kernel32.dll", TRUE );
test_dll_file( "advapi32.dll", TRUE );
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 3513102b6f0..485fd895787 100644
index 6290cbcb4e6..9953746bdaa 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -118,6 +118,9 @@ struct file_id
@@ -205,15 +205,15 @@ index 3513102b6f0..485fd895787 100644
if (wm->ldr.InInitializationOrderLinks.Flink)
RemoveEntryList(&wm->ldr.InInitializationOrderLinks);
@@ -3931,6 +3987,7 @@ void __wine_process_init(void)
ULONG_PTR val;
@@ -3908,6 +3964,7 @@ void __wine_process_init(void)
INITIAL_TEB stack;
TEB *teb = NtCurrentTeb();
PEB *peb = teb->Peb;
+ DWORD i;
peb->LdrData = &ldr;
peb->FastPebLock = &peb_lock;
@@ -3968,6 +4025,10 @@ void __wine_process_init(void)
@@ -3946,6 +4003,10 @@ void __wine_process_init(void)
load_global_options();
version_init();
@@ -224,7 +224,7 @@ index 3513102b6f0..485fd895787 100644
/* setup the load callback and create ntdll modref */
RtlInitUnicodeString( &nt_name, ntdllW );
NtQueryVirtualMemory( GetCurrentProcess(), __wine_process_init, MemoryBasicInformation,
@@ -4043,6 +4104,9 @@ void __wine_process_init(void)
@@ -4032,6 +4093,9 @@ void __wine_process_init(void)
teb->Tib.StackLimit = stack.StackLimit;
teb->DeallocationStack = stack.DeallocationStack;
@@ -235,10 +235,10 @@ index 3513102b6f0..485fd895787 100644
}
diff --git a/include/winternl.h b/include/winternl.h
index 9a70a2014f1..424481b1a6d 100644
index 8efdaf31193..2ed26e397c4 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -2370,8 +2370,8 @@ typedef struct _LDR_DATA_TABLE_ENTRY
@@ -2672,8 +2672,8 @@ typedef struct _LDR_DATA_TABLE_ENTRY
ULONG Flags;
SHORT LoadCount;
SHORT TlsIndex;