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 5ea3a044b83c4cd55a3c647f5e80511a85b9f536

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-08-20 08:39:18 +10:00
parent fb4fcb4da6
commit 2007f010ac
8 changed files with 105 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
patches/ntdll-WRITECOPY/0003-ntdll-Setup-a-temporary-signal-handler-during-proces.patch
View File

@@ -1,4 +1,4 @@
From 0b50cf88e6437b19809352533c714c4f7fcc66f4 Mon Sep 17 00:00:00 2001
From 2ccd84075a6b14f3e361f32b141283af6571a7a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 4 Oct 2014 02:53:22 +0200
Subject: [PATCH] ntdll: Setup a temporary signal handler during process
@@ -15,10 +15,10 @@ Subject: [PATCH] ntdll: Setup a temporary signal handler during process
7 files changed, 79 insertions(+)
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index d61263c13..881843fe9 100644
index 17d1361beea..a6beec0b4d1 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -68,6 +68,7 @@ extern NTSTATUS signal_alloc_thread( TEB **teb ) DECLSPEC_HIDDEN;
@@ -74,6 +74,7 @@ extern NTSTATUS signal_alloc_thread( TEB **teb ) DECLSPEC_HIDDEN;
extern void signal_free_thread( TEB *teb ) DECLSPEC_HIDDEN;
extern void signal_init_thread( TEB *teb ) DECLSPEC_HIDDEN;
extern void signal_init_process(void) DECLSPEC_HIDDEN;
@@ -27,10 +27,10 @@ index d61263c13..881843fe9 100644
extern void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) DECLSPEC_HIDDEN;
extern void DECLSPEC_NORETURN signal_exit_thread( int status ) DECLSPEC_HIDDEN;
diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c
index 32205ea39..5c311a135 100644
index ae0b4932a9e..7adcae31393 100644
--- a/dlls/ntdll/signal_arm.c
+++ b/dlls/ntdll/signal_arm.c
@@ -1048,6 +1048,12 @@ void signal_init_process(void)
@@ -1054,6 +1054,12 @@ void signal_init_process(void)
exit(1);
}
@@ -41,13 +41,13 @@ index 32205ea39..5c311a135 100644
+{
+}
/**********************************************************************
* RtlAddFunctionTable (NTDLL.@)
/***********************************************************************
* RtlUnwind (NTDLL.@)
diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c
index 94520c95c..4b97a693a 100644
index 5966259081a..ba119c865cf 100644
--- a/dlls/ntdll/signal_arm64.c
+++ b/dlls/ntdll/signal_arm64.c
@@ -927,6 +927,12 @@ void signal_init_thread( TEB *teb )
@@ -928,6 +928,12 @@ void signal_init_thread( TEB *teb )
pthread_setspecific( teb_key, teb );
}
@@ -61,10 +61,10 @@ index 94520c95c..4b97a693a 100644
/**********************************************************************
* signal_init_process
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index 053c87da8..868189743 100644
index 59255ed7493..72a9a0ea53c 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -2029,6 +2029,31 @@ static void WINAPI raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *cont
@@ -2084,6 +2084,31 @@ static void WINAPI raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *cont
}
@@ -96,7 +96,7 @@ index 053c87da8..868189743 100644
/**********************************************************************
* segv_handler
*
@@ -2443,6 +2468,34 @@ void signal_init_process(void)
@@ -2500,6 +2525,34 @@ void signal_init_process(void)
exit(1);
}
@@ -132,7 +132,7 @@ index 053c87da8..868189743 100644
/*******************************************************************
* RtlUnwind (NTDLL.@)
diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c
index 86398d8f5..7b0895202 100644
index f23265445df..8e29e0cd793 100644
--- a/dlls/ntdll/signal_powerpc.c
+++ b/dlls/ntdll/signal_powerpc.c
@@ -1068,6 +1068,12 @@ void signal_init_thread( TEB *teb )
@@ -149,10 +149,10 @@ index 86398d8f5..7b0895202 100644
/**********************************************************************
* signal_init_process
diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index 21e709887..6256a97e7 100644
index c6f16e5fae8..c23a01999ce 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -3441,6 +3441,12 @@ void signal_init_process(void)
@@ -3335,6 +3335,12 @@ void signal_init_process(void)
exit(1);
}
@@ -163,13 +163,13 @@ index 21e709887..6256a97e7 100644
+{
+}
/**********************************************************************
* RtlAddFunctionTable (NTDLL.@)
static ULONG64 get_int_reg( CONTEXT *context, int reg )
{
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index 40d662a76..1046bc5b1 100644
index 5c1a4c02e90..83d5b20a532 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -252,6 +252,7 @@ void thread_init(void)
@@ -256,6 +256,7 @@ void thread_init(void)
struct ntdll_thread_data *thread_data;
virtual_init();
@@ -178,5 +178,5 @@ index 40d662a76..1046bc5b1 100644
/* reserve space for shared user data */
--
2.20.1
2.17.1