From 62a2aa4ae486d307eb3616bf715924983c6d3458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Mon, 3 Apr 2017 05:30:27 +0200 Subject: [PATCH] ntdll: Implement HashLinks field in LDR module data. --- dlls/kernel32/tests/loader.c | 75 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/loader.c | 65 ++++++++++++++++++++++++++++++++++++++ include/winternl.h | 6 ++-- 3 files changed, 144 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index e7a1a43..7528098 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -29,6 +29,7 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" +#include "winuser.h" #include "wine/test.h" #include "delayloadhandler.h" @@ -3600,6 +3601,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; @@ -3664,4 +3738,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 da83b27..9493770 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -93,6 +93,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 { @@ -376,6 +379,52 @@ static void call_ldr_notifications( ULONG reason, LDR_MODULE *module ) } /************************************************************************* + * 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 @@ -1094,7 +1143,12 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) &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 InInitializationOrderModuleList */ + wm->ldr.InInitializationOrderModuleList.Flink = NULL; + wm->ldr.InInitializationOrderModuleList.Blink = NULL; if (!(nt->OptionalHeader.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_NX_COMPAT)) { @@ -1768,6 +1822,7 @@ static void load_builtin_callback( void *module, const char *filename ) /* 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; @@ -2028,6 +2083,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, /* 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 @@ -3030,6 +3086,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); @@ -3357,6 +3414,9 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, 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", @@ -3505,6 +3565,7 @@ void __wine_process_init(void) NTSTATUS status; ANSI_STRING func_name; void (* DECLSPEC_NORETURN CDECL init_func)(void); + DWORD i; thread_init(); @@ -3514,6 +3575,10 @@ void __wine_process_init(void) 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 c07cdec..4f04a28 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2192,8 +2192,7 @@ typedef struct _LDR_MODULE ULONG Flags; SHORT LoadCount; SHORT TlsIndex; - HANDLE SectionHandle; - ULONG CheckSum; + LIST_ENTRY HashLinks; ULONG TimeDateStamp; HANDLE ActivationContext; PVOID PatchInformation; @@ -2203,6 +2202,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; typedef struct _LDR_DLL_LOADED_NOTIFICATION_DATA -- 2.7.4