wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Removed patch for vectored continue handler stubs (accepted upstream).

Browse Source
This commit is contained in:
Sebastian Lackner
2014-11-13 16:26:33 +01:00
parent 82d94a776d
commit 917b9ce280
6 changed files with 13 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/ntdll-Exception/0001-ntdll-Throw-exception-if-invalid-handle-is-passed-to.patch
View File

@ -1,4 +1,4 @@
From 05a69d408bc84fa489f297973e3a0ab384dad635 Mon Sep 17 00:00:00 2001
From 63e3716b712d4ad9e811fe550906f72ec916a813 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 28 Sep 2014 22:42:46 +0200
Subject: ntdll: Throw exception if invalid handle is passed to NtClose and
@ -62,7 +62,7 @@ index 47a2614..bcc6d69 100644
}
diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index 2074f0a..bc36242 100644
index a94ed3a..4df8fe5 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -51,6 +51,7 @@ static NTSTATUS (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code);
@ -91,9 +91,10 @@ index 2074f0a..bc36242 100644
ok(FALSE, "unexpected stage %x\n", stage);
@@ -1788,6 +1799,53 @@ static void test_ripevent(DWORD numexc)
pRtlRemoveVectoredExceptionHandler(vectored_handler);
}
+
+static DWORD invalid_handle_exceptions;
+
+static LONG CALLBACK invalid_handle_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo)
@ -140,11 +141,10 @@ index 2074f0a..bc36242 100644
+
+ pRtlRemoveVectoredExceptionHandler(vectored_handler);
+}
+
#endif /* defined(__i386__) || defined(__x86_64__) */
START_TEST(exception)
{
HMODULE hntdll = GetModuleHandleA("ntdll.dll");
@@ -1802,6 +1860,7 @@ START_TEST(exception)
@@ -1804,6 +1862,7 @@ START_TEST(exception)
pNtGetContextThread = (void *)GetProcAddress( hntdll, "NtGetContextThread" );
pNtSetContextThread = (void *)GetProcAddress( hntdll, "NtSetContextThread" );
pNtReadVirtualMemory = (void *)GetProcAddress( hntdll, "NtReadVirtualMemory" );
@ -152,7 +152,7 @@ index 2074f0a..bc36242 100644
pRtlUnwind = (void *)GetProcAddress( hntdll, "RtlUnwind" );
pRtlRaiseException = (void *)GetProcAddress( hntdll, "RtlRaiseException" );
pNtTerminateProcess = (void *)GetProcAddress( hntdll, "NtTerminateProcess" );
@@ -1865,6 +1924,10 @@ START_TEST(exception)
@@ -1867,6 +1926,10 @@ START_TEST(exception)
test_ripevent(0);
test_stage = 6;
test_ripevent(1);
@ -163,7 +163,7 @@ index 2074f0a..bc36242 100644
}
else
skip( "RtlRaiseException not found\n" );
@@ -1878,6 +1941,7 @@ START_TEST(exception)
@@ -1880,6 +1943,7 @@ START_TEST(exception)
test_rtlraiseexception();
test_outputdebugstring(1, FALSE);
test_ripevent(1);
@ -171,7 +171,7 @@ index 2074f0a..bc36242 100644
test_debugger();
test_simd_exceptions();
test_fpu_exceptions();
@@ -1896,6 +1960,7 @@ START_TEST(exception)
@@ -1898,6 +1962,7 @@ START_TEST(exception)
test_outputdebugstring(1, FALSE);
test_ripevent(1);
@ -180,5 +180,5 @@ index 2074f0a..bc36242 100644
if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry)
--
2.1.1
2.1.3