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

Rebase against 21763489982177f4db9e5f8cc8ccb751441f5a2e.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-07-25 17:24:47 +02:00
parent d943e0bd51
commit 2c12e538dd
10 changed files with 94 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From cd82af4ce885a2541e75c4adb3527197eb940569 Mon Sep 17 00:00:00 2001
From 7f456e63bf51237bdd161fb6110a68f14d4e84ac 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
@@ -10,7 +10,7 @@ Subject: ntdll: Throw exception if invalid handle is passed to NtClose and
2 files changed, 92 insertions(+)
diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c
index 1279f2b..35c3672 100644
index c13934a89bd..098229cc094 100644
--- a/dlls/ntdll/om.c
+++ b/dlls/ntdll/om.c
@@ -38,6 +38,7 @@
@@ -62,10 +62,10 @@ index 1279f2b..35c3672 100644
}
diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index f1bfee6..3e22bed 100644
index 6e901e92b6d..0f369dd672d 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);
@@ -52,6 +52,7 @@ static NTSTATUS (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code);
static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG);
static NTSTATUS (WINAPI *pNtSetInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG);
static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL);
@@ -73,7 +73,7 @@ index f1bfee6..3e22bed 100644
#if defined(__x86_64__)
typedef struct
@@ -989,6 +990,16 @@ static void test_debugger(void)
@@ -1025,6 +1026,16 @@ static void test_debugger(void)
if (stage == 10) continuestatus = DBG_EXCEPTION_NOT_HANDLED;
}
@@ -90,7 +90,7 @@ index f1bfee6..3e22bed 100644
else
ok(FALSE, "unexpected stage %x\n", stage);
@@ -2194,6 +2205,53 @@ static void test_breakpoint(DWORD numexc)
@@ -2511,6 +2522,53 @@ static void test_breakpoint(DWORD numexc)
pRtlRemoveVectoredExceptionHandler(vectored_handler);
}
@@ -144,15 +144,15 @@ index f1bfee6..3e22bed 100644
static void test_vectored_continue_handler(void)
{
PVOID handler1, handler2;
@@ -2245,6 +2303,7 @@ START_TEST(exception)
@@ -2565,6 +2623,7 @@ START_TEST(exception)
pNtGetContextThread = (void *)GetProcAddress( hntdll, "NtGetContextThread" );
pNtSetContextThread = (void *)GetProcAddress( hntdll, "NtSetContextThread" );
pNtReadVirtualMemory = (void *)GetProcAddress( hntdll, "NtReadVirtualMemory" );
+ pNtClose = (void *)GetProcAddress( hntdll, "NtClose" );
pRtlUnwind = (void *)GetProcAddress( hntdll, "RtlUnwind" );
pRtlRaiseException = (void *)GetProcAddress( hntdll, "RtlRaiseException" );
pNtTerminateProcess = (void *)GetProcAddress( hntdll, "NtTerminateProcess" );
@@ -2315,6 +2374,10 @@ START_TEST(exception)
pRtlCaptureContext = (void *)GetProcAddress( hntdll, "RtlCaptureContext" );
@@ -2636,6 +2695,10 @@ START_TEST(exception)
test_breakpoint(0);
test_stage = 10;
test_breakpoint(1);
@@ -163,7 +163,7 @@ index f1bfee6..3e22bed 100644
}
else
skip( "RtlRaiseException not found\n" );
@@ -2331,6 +2394,7 @@ START_TEST(exception)
@@ -2652,6 +2715,7 @@ START_TEST(exception)
test_ripevent(1);
test_debug_service(1);
test_breakpoint(1);
@@ -171,7 +171,7 @@ index f1bfee6..3e22bed 100644
test_vectored_continue_handler();
test_debugger();
test_simd_exceptions();
@@ -2355,6 +2419,7 @@ START_TEST(exception)
@@ -2685,6 +2749,7 @@ START_TEST(exception)
test_ripevent(1);
test_debug_service(1);
test_breakpoint(1);
@@ -180,5 +180,5 @@ index f1bfee6..3e22bed 100644
test_virtual_unwind();
test___C_specific_handler();
--
2.9.0
2.13.1