Rebase against 123c0543e0bb4c99fbee0a568e786405ff886a93.

This commit is contained in:
Zebediah Figura
2020-03-27 16:55:10 -05:00
parent e5da84dc36
commit f9d1798edb
7 changed files with 72 additions and 79 deletions

View File

@@ -1,4 +1,4 @@
From bcf36a9100a2452469c0058798073a72e1dba8f9 Mon Sep 17 00:00:00 2001
From 6e41aeac02672253805dbadf694965cd1fb925bf 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:56:19 +0200
Subject: ntdll: Use HashLinks when searching for a dll using the basename.
@@ -8,11 +8,11 @@ Subject: ntdll: Use HashLinks when searching for a dll using the basename.
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index d9b6b7d1c7..7f0d2e7375 100644
index 289c15a7be3..88fd86ce2be 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -509,10 +509,10 @@ static WINE_MODREF *find_basename_module( LPCWSTR name )
if (cached_modref && !strcmpiW( name, cached_modref->ldr.BaseDllName.Buffer ))
@@ -541,10 +541,10 @@ static WINE_MODREF *find_basename_module( LPCWSTR name )
if (cached_modref && RtlEqualUnicodeString( &name_str, &cached_modref->ldr.BaseDllName, TRUE ))
return cached_modref;
- mark = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList;
@@ -21,9 +21,9 @@ index d9b6b7d1c7..7f0d2e7375 100644
{
- LDR_MODULE *mod = CONTAINING_RECORD(entry, LDR_MODULE, InLoadOrderModuleList);
+ LDR_MODULE *mod = CONTAINING_RECORD(entry, LDR_MODULE, HashLinks);
if (!strcmpiW( name, mod->BaseDllName.Buffer ))
if (RtlEqualUnicodeString( &name_str, &mod->BaseDllName, TRUE ))
{
cached_modref = CONTAINING_RECORD(mod, WINE_MODREF, ldr);
--
2.11.0
2.25.1