wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 6343dc6c9571fce20cd00102c5b0bd5c96861cfd.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2023-11-28 11:46:56 +11:00
parent e546e2f1e3
commit 0054ae2116
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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?= <michael@fds-team.de>
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

2
staging/upstream-commit
View File

@ -1 +1 @@
13c43cf3d06178dc39d98981f55d27e3cbd79ad0
6343dc6c9571fce20cd00102c5b0bd5c96861cfd