mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
273 lines
9.0 KiB
Diff
273 lines
9.0 KiB
Diff
From 5b8f46cbd6c338fe8fc080e5fea870627f266de1 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: ntdll: Implement HashLinks field in LDR module data.
|
|
|
|
---
|
|
dlls/kernel32/tests/loader.c | 75 ++++++++++++++++++++++++++++++++++++++++++++
|
|
dlls/ntdll/loader.c | 63 +++++++++++++++++++++++++++++++++++--
|
|
include/winternl.h | 6 ++--
|
|
3 files changed, 140 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c
|
|
index 1f6f3176760..f51ac62b976 100644
|
|
--- a/dlls/kernel32/tests/loader.c
|
|
+++ b/dlls/kernel32/tests/loader.c
|
|
@@ -28,6 +28,7 @@
|
|
#include "windef.h"
|
|
#include "winbase.h"
|
|
#include "winternl.h"
|
|
+#include "winuser.h"
|
|
#include "wine/test.h"
|
|
#include "delayloadhandler.h"
|
|
|
|
@@ -3036,6 +3037,79 @@ static void test_InMemoryOrderModuleList(void)
|
|
ok(entry2 == mark2, "expected entry2 == mark2, got %p and %p\n", entry2, mark2);
|
|
}
|
|
|
|
+static inline WCHAR toupperW(WCHAR c)
|
|
+{
|
|
+ WCHAR tmp = c;
|
|
+ CharUpperBuffW(&tmp, 1);
|
|
+ return tmp;
|
|
+}
|
|
+
|
|
+static ULONG hash_basename(const WCHAR *basename)
|
|
+{
|
|
+ WORD version = MAKEWORD(NtCurrentTeb()->Peb->OSMinorVersion,
|
|
+ NtCurrentTeb()->Peb->OSMajorVersion);
|
|
+ ULONG hash = 0;
|
|
+
|
|
+ if (version >= 0x0602)
|
|
+ {
|
|
+ for (; *basename; basename++)
|
|
+ hash = hash * 65599 + toupperW(*basename);
|
|
+ }
|
|
+ else if (version == 0x0601)
|
|
+ {
|
|
+ for (; *basename; basename++)
|
|
+ hash = hash + 65599 * toupperW(*basename);
|
|
+ }
|
|
+ else
|
|
+ hash = toupperW(basename[0]) - 'A';
|
|
+
|
|
+ return hash & 31;
|
|
+}
|
|
+
|
|
+static void test_HashLinks(void)
|
|
+{
|
|
+ static WCHAR ntdllW[] = {'n','t','d','l','l','.','d','l','l',0};
|
|
+ static WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0};
|
|
+
|
|
+ LIST_ENTRY *hash_map, *entry, *mark;
|
|
+ LDR_MODULE *module;
|
|
+ BOOL found;
|
|
+
|
|
+ entry = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList;
|
|
+ entry = entry->Flink;
|
|
+
|
|
+ module = CONTAINING_RECORD(entry, LDR_MODULE, InLoadOrderModuleList);
|
|
+ entry = module->HashLinks.Blink;
|
|
+
|
|
+ hash_map = entry - hash_basename(module->BaseDllName.Buffer);
|
|
+
|
|
+ mark = &hash_map[hash_basename(ntdllW)];
|
|
+ found = FALSE;
|
|
+ for (entry = mark->Flink; entry != mark; entry = entry->Flink)
|
|
+ {
|
|
+ module = CONTAINING_RECORD(entry, LDR_MODULE, HashLinks);
|
|
+ if (!lstrcmpiW(module->BaseDllName.Buffer, ntdllW))
|
|
+ {
|
|
+ found = TRUE;
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+ ok(found, "Could not find ntdll\n");
|
|
+
|
|
+ mark = &hash_map[hash_basename(kernel32W)];
|
|
+ found = FALSE;
|
|
+ for (entry = mark->Flink; entry != mark; entry = entry->Flink)
|
|
+ {
|
|
+ module = CONTAINING_RECORD(entry, LDR_MODULE, HashLinks);
|
|
+ if (!lstrcmpiW(module->BaseDllName.Buffer, kernel32W))
|
|
+ {
|
|
+ found = TRUE;
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+ ok(found, "Could not find kernel32\n");
|
|
+}
|
|
+
|
|
START_TEST(loader)
|
|
{
|
|
int argc;
|
|
@@ -3097,4 +3171,5 @@ START_TEST(loader)
|
|
test_import_resolution();
|
|
test_ExitProcess();
|
|
test_InMemoryOrderModuleList();
|
|
+ test_HashLinks();
|
|
}
|
|
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
|
|
index 4ff69b674a3..691eb60e865 100644
|
|
--- a/dlls/ntdll/loader.c
|
|
+++ b/dlls/ntdll/loader.c
|
|
@@ -83,6 +83,9 @@ static const char * const reason_names[]
|
|
|
|
static const WCHAR dllW[] = {'.','d','l','l',0};
|
|
|
|
+#define HASH_MAP_SIZE 32
|
|
+static LIST_ENTRY hash_table[HASH_MAP_SIZE];
|
|
+
|
|
/* internal representation of 32bit modules. per process. */
|
|
typedef struct _wine_modref
|
|
{
|
|
@@ -420,6 +423,52 @@ static BOOL load_mscoree( void )
|
|
|
|
|
|
/*************************************************************************
|
|
+ * hash_basename
|
|
+ *
|
|
+ * Calculates the bucket index of a dll using the basename.
|
|
+ */
|
|
+static ULONG hash_basename(const WCHAR *basename)
|
|
+{
|
|
+ WORD version = MAKEWORD(NtCurrentTeb()->Peb->OSMinorVersion,
|
|
+ NtCurrentTeb()->Peb->OSMajorVersion);
|
|
+ ULONG hash = 0;
|
|
+
|
|
+ if (version >= 0x0602)
|
|
+ {
|
|
+ for (; *basename; basename++)
|
|
+ hash = hash * 65599 + toupperW(*basename);
|
|
+ }
|
|
+ else if (version == 0x0601)
|
|
+ {
|
|
+ for (; *basename; basename++)
|
|
+ hash = hash + 65599 * toupperW(*basename);
|
|
+ }
|
|
+ else
|
|
+ hash = toupperW(basename[0]) - 'A';
|
|
+
|
|
+ return hash & (HASH_MAP_SIZE-1);
|
|
+}
|
|
+
|
|
+/*************************************************************************
|
|
+ * recompute_hash_maps
|
|
+ *
|
|
+ * Recomputes the LDR hash map (necessary when windows version changes).
|
|
+ */
|
|
+static void recompute_hash_map(void)
|
|
+{
|
|
+ PLIST_ENTRY mark, entry;
|
|
+ PLDR_MODULE mod;
|
|
+
|
|
+ mark = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList;
|
|
+ for (entry = mark->Flink; entry != mark; entry = entry->Flink)
|
|
+ {
|
|
+ mod = CONTAINING_RECORD(entry, LDR_MODULE, InLoadOrderModuleList);
|
|
+ RemoveEntryList( &mod->HashLinks );
|
|
+ InsertTailList( &hash_table[hash_basename(mod->BaseDllName.Buffer)], &mod->HashLinks );
|
|
+ }
|
|
+}
|
|
+
|
|
+/*************************************************************************
|
|
* get_modref
|
|
*
|
|
* Looks for the referenced HMODULE in the current process
|
|
@@ -1063,7 +1112,6 @@ static WINE_MODREF *alloc_module( HMODUL
|
|
wm->ldr.TlsIndex = -1;
|
|
wm->ldr.LoadCount = 1;
|
|
wm->ldr.SectionHandle = NULL;
|
|
- wm->ldr.CheckSum = 0;
|
|
wm->ldr.TimeDateStamp = 0;
|
|
wm->ldr.ActivationContext = 0;
|
|
|
|
@@ -1084,6 +1132,8 @@ static WINE_MODREF *alloc_module( HMODUL
|
|
&wm->ldr.InLoadOrderModuleList);
|
|
InsertTailList(&NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList,
|
|
&wm->ldr.InMemoryOrderModuleList);
|
|
+ InsertTailList(&hash_table[hash_basename(wm->ldr.BaseDllName.Buffer)],
|
|
+ &wm->ldr.HashLinks);
|
|
|
|
/* wait until init is called for inserting into this list */
|
|
wm->ldr.InInitializationOrderModuleList.Flink = NULL;
|
|
@@ -1837,6 +1887,7 @@ static void load_builtin_callback( void
|
|
/* the module has only be inserted in the load & memory order lists */
|
|
RemoveEntryList(&wm->ldr.InLoadOrderModuleList);
|
|
RemoveEntryList(&wm->ldr.InMemoryOrderModuleList);
|
|
+ RemoveEntryList(&wm->ldr.HashLinks);
|
|
/* FIXME: free the modref */
|
|
builtin_load_info->status = STATUS_DLL_NOT_FOUND;
|
|
return;
|
|
@@ -2079,6 +2130,7 @@ static NTSTATUS load_native_dll( LPCWSTR
|
|
/* the module has only be inserted in the load & memory order lists */
|
|
RemoveEntryList(&wm->ldr.InLoadOrderModuleList);
|
|
RemoveEntryList(&wm->ldr.InMemoryOrderModuleList);
|
|
+ RemoveEntryList(&wm->ldr.HashLinks);
|
|
|
|
/* FIXME: there are several more dangling references
|
|
* left. Including dlls loaded by this dll before the
|
|
@@ -3196,6 +3248,7 @@ static void free_modref( WINE_MODREF *wm
|
|
{
|
|
RemoveEntryList(&wm->ldr.InLoadOrderModuleList);
|
|
RemoveEntryList(&wm->ldr.InMemoryOrderModuleList);
|
|
+ RemoveEntryList(&wm->ldr.HashLinks);
|
|
if (wm->ldr.InInitializationOrderModuleList.Flink)
|
|
RemoveEntryList(&wm->ldr.InInitializationOrderModuleList);
|
|
|
|
@@ -3589,6 +3642,9 @@ void WINAPI LdrInitializeThunk( void *ke
|
|
RemoveEntryList( &wm->ldr.InMemoryOrderModuleList );
|
|
InsertHeadList( &peb->LdrData->InMemoryOrderModuleList, &wm->ldr.InMemoryOrderModuleList );
|
|
|
|
+ /* the windows version was not set yet when ntdll and kernel32 were loaded */
|
|
+ recompute_hash_map();
|
|
+
|
|
if ((status = virtual_alloc_thread_stack( NtCurrentTeb(), 0, 0, NULL )) != STATUS_SUCCESS)
|
|
{
|
|
ERR( "Main exe initialization for %s failed, status %x\n",
|
|
@@ -3782,6 +3838,7 @@ void __wine_process_init(void)
|
|
NTSTATUS status;
|
|
ANSI_STRING func_name;
|
|
void (* DECLSPEC_NORETURN CDECL init_func)(void);
|
|
+ DWORD i;
|
|
|
|
main_exe_file = thread_init();
|
|
|
|
@@ -3790,6 +3847,10 @@ void __wine_process_init(void)
|
|
umask( FILE_umask );
|
|
|
|
load_global_options();
|
|
+
|
|
+ /* initialize hash table */
|
|
+ for (i = 0; i < HASH_MAP_SIZE; i++)
|
|
+ InitializeListHead(&hash_table[i]);
|
|
|
|
/* setup the load callback and create ntdll modref */
|
|
wine_dll_set_callback( load_builtin_callback );
|
|
diff --git a/include/winternl.h b/include/winternl.h
|
|
index 4e7d2e966c2..c70d1bd837e 100644
|
|
--- a/include/winternl.h
|
|
+++ b/include/winternl.h
|
|
@@ -2099,8 +2099,7 @@ typedef struct _LDR_MODULE
|
|
ULONG Flags;
|
|
SHORT LoadCount;
|
|
SHORT TlsIndex;
|
|
- HANDLE SectionHandle;
|
|
- ULONG CheckSum;
|
|
+ LIST_ENTRY HashLinks;
|
|
ULONG TimeDateStamp;
|
|
HANDLE ActivationContext;
|
|
PVOID PatchInformation;
|
|
@@ -2110,6 +2109,9 @@ typedef struct _LDR_MODULE
|
|
PVOID ContextInformation;
|
|
ULONG_PTR OriginalBase;
|
|
LARGE_INTEGER LoadTime;
|
|
+
|
|
+ /* Not part of Win7 but used by Wine */
|
|
+ HANDLE SectionHandle;
|
|
} LDR_MODULE, *PLDR_MODULE;
|
|
|
|
/* those defines are (some of the) regular LDR_MODULE.Flags values */
|
|
--
|
|
2.14.1
|