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

29
patches/ntdll-NtContinue/0001-ntdll-Add-stub-for-NtContinue.patch
View File

@@ -1,20 +1,28 @@
From 36164f1194aca4922459b0bd65dcf1d27158839c Mon Sep 17 00:00:00 2001
From 9ea4f081689959bd393eab2caaa0ed8237846117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 25 May 2017 05:04:26 +0200
Subject: ntdll: Add stub for NtContinue.
Subject: [PATCH] ntdll: Add stub for NtContinue.
---
dlls/ntdll/exception.c | 10 ++++++++++
dlls/ntdll/exception.c | 10 +++++++++-
dlls/ntdll/ntdll.spec | 4 ++--
2 files changed, 12 insertions(+), 2 deletions(-)
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c
index daca45aa836..4429a4217a1 100644
index c35312fd1d1..3b85f1efa04 100644
--- a/dlls/ntdll/exception.c
+++ b/dlls/ntdll/exception.c
@@ -301,6 +301,16 @@ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler )
@@ -328,7 +328,6 @@ LONG WINAPI call_unhandled_exception_filter( PEXCEPTION_POINTERS eptr )
return unhandled_exception_filter( eptr );
}
-
#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__)
struct dynamic_unwind_entry
@@ -667,6 +666,15 @@ PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry( ULONG_PTR pc, ULONG_PTR *base,
#endif /* __x86_64__ || __arm__ || __aarch64__ */
+/*********************************************************************
+ * NtContinue (NTDLL.@)
@@ -24,16 +32,15 @@ index daca45aa836..4429a4217a1 100644
+ FIXME( "(%p, %d) stub!\n", context, alert );
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+
/*************************************************************
* __wine_spec_unimplemented_stub
*
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 9adf1edd4a5..877a845dfa9 100644
index 81faf7fc280..d21a6f08ac2 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -128,7 +128,7 @@
@@ -150,7 +150,7 @@
@ stdcall NtCompleteConnectPort(ptr)
# @ stub NtCompressKey
@ stdcall NtConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr)
@@ -42,7 +49,7 @@ index 9adf1edd4a5..877a845dfa9 100644
# @ stub NtCreateDebugObject
@ stdcall NtCreateDirectoryObject(ptr long ptr)
@ stdcall NtCreateEvent(ptr long ptr long long)
@@ -1055,7 +1055,7 @@
@@ -1105,7 +1105,7 @@
@ stdcall -private ZwCompleteConnectPort(ptr) NtCompleteConnectPort
# @ stub ZwCompressKey
@ stdcall -private ZwConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr) NtConnectPort
@@ -52,5 +59,5 @@ index 9adf1edd4a5..877a845dfa9 100644
@ stdcall -private ZwCreateDirectoryObject(ptr long ptr) NtCreateDirectoryObject
@ stdcall -private ZwCreateEvent(ptr long ptr long long) NtCreateEvent
--
2.12.2
2.17.1

16
patches/ntdll-NtContinue/0002-Use-NtContinue-to-continue-execution-after-exception.patch
View File

@@ -1,4 +1,4 @@
From a5df41839d388e3bb0f8aefde70edcc8476429b2 Mon Sep 17 00:00:00 2001
From 2c63306841e4cca19e722282efab78af21d3f5eb Mon Sep 17 00:00:00 2001
From: Andrew Wesie <awesie@gmail.com>
Date: Fri, 27 Jul 2018 01:26:56 -0500
Subject: [PATCH] Use NtContinue to continue execution after exceptions.
@@ -19,10 +19,10 @@ third-party.
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c
index 664b620..236f600 100644
index 3b85f1efa04..411d2bf5b8f 100644
--- a/dlls/ntdll/exception.c
+++ b/dlls/ntdll/exception.c
@@ -311,8 +311,13 @@ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler )
@@ -671,8 +671,13 @@ PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry( ULONG_PTR pc, ULONG_PTR *base,
*/
NTSTATUS WINAPI NtContinue( CONTEXT *context, BOOLEAN alert )
{
@@ -37,12 +37,12 @@ index 664b620..236f600 100644
+ return NtSetContextThread( GetCurrentThread(), context );
}
/*************************************************************
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index f0de17a..d1ae9b8 100644
index 50152370b49..59255ed7493 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -2605,6 +2605,7 @@ __ASM_STDCALL_FUNC( RtlUnwind, 16,
@@ -2589,6 +2589,7 @@ __ASM_STDCALL_FUNC( RtlUnwind, 16,
__ASM_CFI(".cfi_same_value %ebp\n\t")
"ret $16" ) /* actually never returns */
@@ -50,7 +50,7 @@ index f0de17a..d1ae9b8 100644
/*******************************************************************
* NtRaiseException (NTDLL.@)
@@ -2612,7 +2613,7 @@ __ASM_STDCALL_FUNC( RtlUnwind, 16,
@@ -2596,7 +2597,7 @@ __ASM_STDCALL_FUNC( RtlUnwind, 16,
NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance )
{
NTSTATUS status = raise_exception( rec, context, first_chance );
@@ -60,5 +60,5 @@ index f0de17a..d1ae9b8 100644
}
--
1.9.1
2.17.1