wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 88d30985ddd534e8bafed531e619846bc8d10839

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-11-08 10:13:27 +11:00
parent e1ac8f20fe
commit 0a469905c2
18 changed files with 147 additions and 1092 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 169d29bc138015c6d54cc71c817bad9ff25ba7f3 Mon Sep 17 00:00:00 2001
From 627cc81a90af23437264ec65017725911cc6b20f 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.
@@ -10,7 +10,7 @@ Subject: [PATCH] ntdll: Implement HashLinks field in LDR module data.
3 files changed, 145 insertions(+), 1 deletion(-)
diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c
index d48c422e432..1d246ec7a71 100644
index 3a507622070..4bc043e161d 100644
--- a/dlls/kernel32/tests/loader.c
+++ b/dlls/kernel32/tests/loader.c
@@ -30,6 +30,7 @@
@@ -21,7 +21,7 @@ index d48c422e432..1d246ec7a71 100644
#include "wine/test.h"
#include "delayloadhandler.h"
@@ -4039,6 +4040,79 @@ static void test_dll_file( const char *name )
@@ -4047,6 +4048,79 @@ static void test_dll_file( const char *name )
#undef OK_FIELD
}
@@ -101,7 +101,7 @@ index d48c422e432..1d246ec7a71 100644
START_TEST(loader)
{
int argc;
@@ -4110,10 +4184,12 @@ START_TEST(loader)
@@ -4118,10 +4192,12 @@ START_TEST(loader)
test_ExitProcess();
test_InMemoryOrderModuleList();
test_wow64_redirection();
@@ -115,10 +115,10 @@ index d48c422e432..1d246ec7a71 100644
test_Loader();
}
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 432369e40a8..b00d9ce13bb 100644
index fc44dcfe3e5..4cf566d311e 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -119,6 +119,9 @@ static const char * const reason_names[] =
@@ -121,6 +121,9 @@ static const char * const reason_names[] =
static const WCHAR dllW[] = {'.','d','l','l',0};
@@ -128,7 +128,7 @@ index 432369e40a8..b00d9ce13bb 100644
/* internal representation of 32bit modules. per process. */
typedef struct _wine_modref
{
@@ -461,6 +464,52 @@ static void call_ldr_notifications( ULONG reason, LDR_MODULE *module )
@@ -464,6 +467,52 @@ static void call_ldr_notifications( ULONG reason, LDR_MODULE *module )
}
}
@@ -181,7 +181,7 @@ index 432369e40a8..b00d9ce13bb 100644
/*************************************************************************
* get_modref
*
@@ -1208,7 +1257,12 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name
@@ -1211,7 +1260,12 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name
&wm->ldr.InLoadOrderModuleList);
InsertTailList(&NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList,
&wm->ldr.InMemoryOrderModuleList);
@@ -194,7 +194,7 @@ index 432369e40a8..b00d9ce13bb 100644
if (!(nt->OptionalHeader.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_NX_COMPAT))
{
@@ -1953,6 +2007,7 @@ static void load_builtin_callback( void *module, const char *filename )
@@ -1956,6 +2010,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);
@@ -202,7 +202,7 @@ index 432369e40a8..b00d9ce13bb 100644
/* FIXME: free the modref */
builtin_load_info->status = STATUS_DLL_NOT_FOUND;
return;
@@ -2476,6 +2531,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, const UNICODE_STRING *nt_nam
@@ -2479,6 +2534,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, const UNICODE_STRING *nt_nam
/* the module has only be inserted in the load & memory order lists */
RemoveEntryList(&wm->ldr.InLoadOrderModuleList);
RemoveEntryList(&wm->ldr.InMemoryOrderModuleList);
@@ -210,7 +210,7 @@ index 432369e40a8..b00d9ce13bb 100644
/* FIXME: there are several more dangling references
* left. Including dlls loaded by this dll before the
@@ -3650,6 +3706,7 @@ static void free_modref( WINE_MODREF *wm )
@@ -3661,6 +3717,7 @@ static void free_modref( WINE_MODREF *wm )
{
RemoveEntryList(&wm->ldr.InLoadOrderModuleList);
RemoveEntryList(&wm->ldr.InMemoryOrderModuleList);
@@ -218,17 +218,17 @@ index 432369e40a8..b00d9ce13bb 100644
if (wm->ldr.InInitializationOrderModuleList.Flink)
RemoveEntryList(&wm->ldr.InInitializationOrderModuleList);
@@ -4376,6 +4433,7 @@ void __wine_process_init(void)
UNICODE_STRING nt_name;
void * (CDECL *init_func)(void);
INITIAL_TEB stack;
@@ -4397,6 +4454,7 @@ void __wine_process_init(void)
SIZE_T info_size;
TEB *teb = thread_init();
PEB *peb = teb->Peb;
+ DWORD i;
thread_init();
@@ -4385,6 +4443,10 @@ void __wine_process_init(void)
/* setup the server connection */
server_init_process();
@@ -4417,6 +4475,10 @@ void __wine_process_init(void)
load_global_options();
version_init();
+ /* initialize hash table */
+ for (i = 0; i < HASH_MAP_SIZE; i++)
@@ -237,16 +237,15 @@ index 432369e40a8..b00d9ce13bb 100644
/* setup the load callback and create ntdll modref */
wine_dll_set_callback( load_builtin_callback );
@@ -4439,6 +4501,9 @@ void __wine_process_init(void)
RemoveEntryList( &wm->ldr.InMemoryOrderModuleList );
InsertHeadList( &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList, &wm->ldr.InMemoryOrderModuleList );
@@ -4489,5 +4551,8 @@ void __wine_process_init(void)
teb->Tib.StackLimit = stack.StackLimit;
teb->DeallocationStack = stack.DeallocationStack;
+ /* the windows version was not set yet when ntdll and kernel32 were loaded */
+ recompute_hash_map();
+
if ((status = virtual_alloc_thread_stack( &stack, 0, 0, NULL )) != STATUS_SUCCESS)
{
ERR( "Main exe initialization for %s failed, status %x\n",
server_init_process_done();
}
diff --git a/include/winternl.h b/include/winternl.h
index df1418477ad..2d7c86c389c 100644
--- a/include/winternl.h