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

Remove several patches (accepted upstream).

Browse Source
This commit is contained in:
Sebastian Lackner
2014-06-13 20:07:34 +02:00
parent 719c65ebb0
commit 6578707ac2
7 changed files with 1 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
patches/98-Miscellaneous/0005-ntdll-tests-Fix-exception-test-failures-on-x86_64.patch
View File

@@ -1,51 +0,0 @@
From bd3cb03661dfab43f6feff572d4a4bd37a47d137 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 31 May 2014 06:29:33 +0200
Subject: ntdll/tests: Fix exception test failures on x86_64.
---
dlls/ntdll/signal_x86_64.c | 1 +
dlls/ntdll/tests/exception.c | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index c6e9a9b..bd8f3c7 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -2684,6 +2684,7 @@ PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry( ULONG64 pc, ULONG64 *base, UNWI
func = lookup_function_info( pc, base, &module );
if (!func)
{
+ *base = NULL;
if (module)
WARN( "no exception table found in module %p pc %lx\n", module->BaseAddress, pc );
else
diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index 817a19c..8a80928 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -1487,8 +1487,8 @@ static void test_dynamic_unwind(void)
func = pRtlLookupFunctionEntry( (ULONG_PTR)code_mem + code_offset + 16, &base, NULL );
ok( func == NULL,
"RtlLookupFunctionEntry returned unexpected function, expected: NULL, got: %p\n", func );
- ok( base == 0xdeadbeef,
- "RtlLookupFunctionEntry modified base address, expected: 0xdeadbeef, got: %lx\n", base );
+ ok( !base || broken(base == 0xdeadbeef),
+ "RtlLookupFunctionEntry modified base address, expected: 0, got: %lx\n", base );
/* Test with pointer inside of our function */
base = 0xdeadbeef;
@@ -1546,8 +1546,8 @@ static void test_dynamic_unwind(void)
func = pRtlLookupFunctionEntry( (ULONG_PTR)code_mem + code_offset + 32, &base, NULL );
ok( func == NULL,
"RtlLookupFunctionEntry returned unexpected function, expected: NULL, got: %p\n", func );
- ok( base == 0xdeadbeef,
- "RtlLookupFunctionEntry modified base address, expected: 0xdeadbeef, got: %lx\n", base );
+ ok( !base || broken(base == 0xdeadbeef),
+ "RtlLookupFunctionEntry modified base address, expected: 0, got: %lx\n", base );
ok( !count,
"RtlLookupFunctionEntry issued %d unexpected calls to dynamic_unwind_callback\n", count );
--
1.7.9.5

3
patches/98-Miscellaneous/d69df50e-8cb7-43f6-833f-d2cfd68a096e.def
View File

@@ -1,3 +0,0 @@
Revision: 1
Author: Sebastian Lackner
Title: Fix exception test failures for ntdll on x86_64.