mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Updated ntdll-User_Shared_Data patchset
This commit is contained in:
parent
1977c70f7d
commit
a85bb970af
@ -1,4 +1,4 @@
|
||||
From 0e13445877dfa876f22d7ab6e564260d3a516bd0 Mon Sep 17 00:00:00 2001
|
||||
From 235e57cb0305f1e9a1184318f74f897d527b24cc Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Fri, 5 May 2017 05:40:50 +0200
|
||||
Subject: [PATCH] ntdll: Create thread to update user_shared_data time values
|
||||
@ -13,7 +13,7 @@ Subject: [PATCH] ntdll: Create thread to update user_shared_data time values
|
||||
5 files changed, 116 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c
|
||||
index 2a15dad..50b26ff 100644
|
||||
index 2a15dadbe6..50b26fff9f 100644
|
||||
--- a/dlls/kernel32/cpu.c
|
||||
+++ b/dlls/kernel32/cpu.c
|
||||
@@ -46,7 +46,7 @@
|
||||
@ -35,10 +35,10 @@ index 2a15dad..50b26ff 100644
|
||||
return FALSE;
|
||||
}
|
||||
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
|
||||
index bd27b6e..444ea33 100644
|
||||
index 773f95e059..4d0267f0a6 100644
|
||||
--- a/dlls/ntdll/loader.c
|
||||
+++ b/dlls/ntdll/loader.c
|
||||
@@ -3226,6 +3226,36 @@ static void load_global_options(void)
|
||||
@@ -3272,6 +3272,36 @@ static void load_global_options(void)
|
||||
}
|
||||
|
||||
|
||||
@ -75,16 +75,16 @@ index bd27b6e..444ea33 100644
|
||||
/******************************************************************
|
||||
* LdrInitializeThunk (NTDLL.@)
|
||||
*
|
||||
@@ -3257,6 +3287,7 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2,
|
||||
@@ -3302,6 +3332,7 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2,
|
||||
if (!peb->ProcessParameters->WindowTitle.Buffer)
|
||||
peb->ProcessParameters->WindowTitle = wm->ldr.FullDllName;
|
||||
version_init( wm->ldr.FullDllName.Buffer );
|
||||
+ user_shared_data_init();
|
||||
hidden_exports_init( wm->ldr.FullDllName.Buffer );
|
||||
virtual_set_large_address_space();
|
||||
|
||||
LdrQueryImageFileExecutionOptions( &peb->ProcessParameters->ImagePathName, globalflagW,
|
||||
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
|
||||
index 90ff20c..a01fcf4 100644
|
||||
index 8624399354..7e5439dec9 100644
|
||||
--- a/dlls/ntdll/ntdll_misc.h
|
||||
+++ b/dlls/ntdll/ntdll_misc.h
|
||||
@@ -190,6 +190,9 @@ extern void VIRTUAL_SetForceExec( BOOL enable ) DECLSPEC_HIDDEN;
|
||||
@ -98,7 +98,7 @@ index 90ff20c..a01fcf4 100644
|
||||
/* completion */
|
||||
extern NTSTATUS NTDLL_AddCompletion( HANDLE hFile, ULONG_PTR CompletionValue,
|
||||
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
|
||||
index ff14a5e..44ffa9d 100644
|
||||
index ff14a5e757..44ffa9d733 100644
|
||||
--- a/dlls/ntdll/thread.c
|
||||
+++ b/dlls/ntdll/thread.c
|
||||
@@ -44,6 +44,7 @@
|
||||
@ -207,7 +207,7 @@ index ff14a5e..44ffa9d 100644
|
||||
|
||||
/* allocate and initialize the PEB */
|
||||
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
|
||||
index 8303a03..7d71497 100644
|
||||
index 8303a03eba..7d7149732f 100644
|
||||
--- a/dlls/ntdll/virtual.c
|
||||
+++ b/dlls/ntdll/virtual.c
|
||||
@@ -2013,6 +2013,7 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack )
|
||||
@ -243,5 +243,5 @@ index 8303a03..7d71497 100644
|
||||
}
|
||||
|
||||
--
|
||||
1.9.1
|
||||
2.16.1
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user