mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Merge pull request #4 from omega13a/patch-4
Update 0001-ntdll-Move-code-to-update-user-shared-data-into-a-se.patch
This commit is contained in:
commit
7f6818cf31
@ -23,7 +23,7 @@ diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
|
||||
index 830dd3a030..a2c0cf48fd 100644
|
||||
--- a/dlls/ntdll/thread.c
|
||||
+++ b/dlls/ntdll/thread.c
|
||||
@@ -251,6 +251,26 @@ static ULONG_PTR get_image_addr(void)
|
||||
@@ -351,6 +351,26 @@ static ULONG_PTR get_image_addr(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -50,15 +50,15 @@ index 830dd3a030..a2c0cf48fd 100644
|
||||
/***********************************************************************
|
||||
* thread_init
|
||||
*
|
||||
@@ -264,7 +284,6 @@ HANDLE thread_init(void)
|
||||
void *addr;
|
||||
@@ -365,7 +385,6 @@ HANDLE thread_init(void)
|
||||
BOOL suspend;
|
||||
SIZE_T size, info_size;
|
||||
HANDLE exe_file = 0;
|
||||
- LARGE_INTEGER now;
|
||||
NTSTATUS status;
|
||||
struct ntdll_thread_data *thread_data;
|
||||
static struct debug_info debug_info; /* debug info for initial thread */
|
||||
@@ -375,15 +394,8 @@ HANDLE thread_init(void)
|
||||
@@ -477,15 +496,8 @@ HANDLE thread_init(void)
|
||||
wine_server_fd_to_handle( 2, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, ¶ms.hStdError );
|
||||
}
|
||||
|
||||
@ -78,4 +78,3 @@ index 830dd3a030..a2c0cf48fd 100644
|
||||
NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 );
|
||||
--
|
||||
2.12.2
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user