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 48aeef69fc99ff1460da934f4933f0499ff33b13

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-05-18 11:31:57 +10:00
parent 7715ae4be5
commit 41b4cfa2c4
14 changed files with 109 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From ac83666eff8a7a92177d048f719d5494e32a098c Mon Sep 17 00:00:00 2001
From 225b86d4fb6f51854f173076564f6bea9a9e5ac0 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, 144 insertions(+), 2 deletions(-)
diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c
index f1c33eef84..5ea7f5ecd8 100644
index ac62d28..0f5ddf1 100644
--- a/dlls/kernel32/tests/loader.c
+++ b/dlls/kernel32/tests/loader.c
@@ -29,6 +29,7 @@
@@ -21,7 +21,7 @@ index f1c33eef84..5ea7f5ecd8 100644
#include "wine/test.h"
#include "delayloadhandler.h"
@@ -3546,6 +3547,79 @@ static void test_InMemoryOrderModuleList(void)
@@ -3573,6 +3574,79 @@ static void test_InMemoryOrderModuleList(void)
ok(entry2 == mark2, "expected entry2 == mark2, got %p and %p\n", entry2, mark2);
}
@@ -101,14 +101,14 @@ index f1c33eef84..5ea7f5ecd8 100644
START_TEST(loader)
{
int argc;
@@ -3610,4 +3684,5 @@ START_TEST(loader)
@@ -3637,4 +3711,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 7d7c29ec1e..a2a72dd571 100644
index 06915aa..722ab44 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -86,6 +86,9 @@ static const char * const reason_names[] =
@@ -121,11 +121,10 @@ index 7d7c29ec1e..a2a72dd571 100644
/* internal representation of 32bit modules. per process. */
typedef struct _wine_modref
{
@@ -347,6 +350,52 @@ static inline ULONG_PTR allocate_stub( const char *dll, const char *name ) { ret
#endif /* __i386__ */
@@ -349,6 +352,52 @@ static inline ULONG_PTR allocate_stub( const char *dll, const char *name ) { ret
+/*************************************************************************
/*************************************************************************
+ * hash_basename
+ *
+ * Calculates the bucket index of a dll using the basename.
@@ -171,10 +170,11 @@ index 7d7c29ec1e..a2a72dd571 100644
+ }
+}
+
/*************************************************************************
+/*************************************************************************
* get_modref
*
@@ -1059,7 +1108,12 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename, LPCWSTR fak
* Looks for the referenced HMODULE in the current process
@@ -1067,7 +1116,12 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename, LPCWSTR fak
&wm->ldr.InLoadOrderModuleList);
InsertTailList(&NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList,
&wm->ldr.InMemoryOrderModuleList);
@@ -187,7 +187,7 @@ index 7d7c29ec1e..a2a72dd571 100644
if (!(nt->OptionalHeader.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_NX_COMPAT))
{
@@ -1768,6 +1822,7 @@ static void load_builtin_callback( void *module, const char *filename )
@@ -1795,6 +1849,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);
@@ -195,7 +195,7 @@ index 7d7c29ec1e..a2a72dd571 100644
/* FIXME: free the modref */
builtin_load_info->status = STATUS_DLL_NOT_FOUND;
return;
@@ -2024,6 +2079,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, LPCWSTR fakemo
@@ -2055,6 +2110,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, LPCWSTR fakemo
/* the module has only be inserted in the load & memory order lists */
RemoveEntryList(&wm->ldr.InLoadOrderModuleList);
RemoveEntryList(&wm->ldr.InMemoryOrderModuleList);
@@ -203,7 +203,7 @@ index 7d7c29ec1e..a2a72dd571 100644
/* FIXME: there are several more dangling references
* left. Including dlls loaded by this dll before the
@@ -3171,6 +3227,7 @@ static void free_modref( WINE_MODREF *wm )
@@ -3230,6 +3286,7 @@ static void free_modref( WINE_MODREF *wm )
{
RemoveEntryList(&wm->ldr.InLoadOrderModuleList);
RemoveEntryList(&wm->ldr.InMemoryOrderModuleList);
@@ -211,7 +211,7 @@ index 7d7c29ec1e..a2a72dd571 100644
if (wm->ldr.InInitializationOrderModuleList.Flink)
RemoveEntryList(&wm->ldr.InInitializationOrderModuleList);
@@ -3568,6 +3625,9 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2,
@@ -3627,6 +3684,9 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2,
RemoveEntryList( &wm->ldr.InMemoryOrderModuleList );
InsertHeadList( &peb->LdrData->InMemoryOrderModuleList, &wm->ldr.InMemoryOrderModuleList );
@@ -221,7 +221,7 @@ index 7d7c29ec1e..a2a72dd571 100644
if ((status = virtual_alloc_thread_stack( NtCurrentTeb(), 0, 0, NULL )) != STATUS_SUCCESS)
{
ERR( "Main exe initialization for %s failed, status %x\n",
@@ -3717,6 +3777,7 @@ void __wine_process_init(void)
@@ -3773,6 +3833,7 @@ void __wine_process_init(void)
NTSTATUS status;
ANSI_STRING func_name;
void (* DECLSPEC_NORETURN CDECL init_func)(void);
@@ -229,7 +229,7 @@ index 7d7c29ec1e..a2a72dd571 100644
main_exe_file = thread_init();
@@ -3726,6 +3787,10 @@ void __wine_process_init(void)
@@ -3782,6 +3843,10 @@ void __wine_process_init(void)
load_global_options();
@@ -241,10 +241,10 @@ index 7d7c29ec1e..a2a72dd571 100644
wine_dll_set_callback( load_builtin_callback );
diff --git a/include/winternl.h b/include/winternl.h
index 8c7071071c..144c27a629 100644
index 3659db1..bd6a8af 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -2147,8 +2147,7 @@ typedef struct _LDR_MODULE
@@ -2164,8 +2164,7 @@ typedef struct _LDR_MODULE
ULONG Flags;
SHORT LoadCount;
SHORT TlsIndex;
@@ -254,7 +254,7 @@ index 8c7071071c..144c27a629 100644
ULONG TimeDateStamp;
HANDLE ActivationContext;
PVOID PatchInformation;
@@ -2158,6 +2157,9 @@ typedef struct _LDR_MODULE
@@ -2175,6 +2174,9 @@ typedef struct _LDR_MODULE
PVOID ContextInformation;
ULONG_PTR OriginalBase;
LARGE_INTEGER LoadTime;
@@ -263,7 +263,7 @@ index 8c7071071c..144c27a629 100644
+ HANDLE SectionHandle;
} LDR_MODULE, *PLDR_MODULE;
/* those defines are (some of the) regular LDR_MODULE.Flags values */
typedef struct _LDR_DLL_LOADED_NOTIFICATION_DATA
--
2.16.1
1.9.1