mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Updated ntdll-HashLinks patchset
Warning fixes.
This commit is contained in:
parent
508669b7f7
commit
76a8aff953
@ -1,18 +1,18 @@
|
||||
From b4ff0ed25c0f95d720d7a7ace07f024512d27af2 Mon Sep 17 00:00:00 2001
|
||||
From ddd05cd2289136f417a8de210aef68a076da8399 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: [PATCH] ntdll: Use HashLinks when searching for a dll using the
|
||||
basename.
|
||||
|
||||
---
|
||||
dlls/ntdll/loader.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
dlls/ntdll/loader.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
|
||||
index 272ad323444..f3d39e001c6 100644
|
||||
index 3e275e8c409..7f4aa8eba06 100644
|
||||
--- a/dlls/ntdll/loader.c
|
||||
+++ b/dlls/ntdll/loader.c
|
||||
@@ -547,10 +547,10 @@ static WINE_MODREF *find_basename_module( LPCWSTR name )
|
||||
@@ -543,13 +543,13 @@ static WINE_MODREF *find_basename_module( LPCWSTR name )
|
||||
if (cached_modref && RtlEqualUnicodeString( &name_str, &cached_modref->ldr.BaseDllName, TRUE ))
|
||||
return cached_modref;
|
||||
|
||||
@ -24,7 +24,11 @@ index 272ad323444..f3d39e001c6 100644
|
||||
+ WINE_MODREF *mod = CONTAINING_RECORD(entry, WINE_MODREF, ldr.HashLinks);
|
||||
if (RtlEqualUnicodeString( &name_str, &mod->ldr.BaseDllName, TRUE ) && !mod->system)
|
||||
{
|
||||
cached_modref = CONTAINING_RECORD(mod, WINE_MODREF, ldr);
|
||||
- cached_modref = CONTAINING_RECORD(mod, WINE_MODREF, ldr);
|
||||
+ cached_modref = CONTAINING_RECORD(&mod->ldr, WINE_MODREF, ldr);
|
||||
return cached_modref;
|
||||
}
|
||||
}
|
||||
--
|
||||
2.33.0
|
||||
2.35.1
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user