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 6d66efa3fee7f529bba6c478e71d54e0d66995f5.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2020-07-29 09:47:49 +10:00
parent f7013bb1b4
commit 261a981d77
4 changed files with 20 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
patches/ntdll-Exception/0002-ntdll-OutputDebugString-should-throw-the-exception-a.patch
View File

@@ -1,19 +1,19 @@
From bf3b9244f374b9926db04b63b29f77139280b44a Mon Sep 17 00:00:00 2001
From 1889b85c9e9eecdff6882fc9a3d1f1b7247bd08a Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 28 Sep 2014 23:39:51 +0200
Subject: ntdll: OutputDebugString should throw the exception a second time, if
a debugger is attached.
Subject: [PATCH] ntdll: OutputDebugString should throw the exception a second
time, if a debugger is attached.
---
dlls/kernelbase/debug.c | 17 +++++++++++++++++
dlls/ntdll/tests/exception.c | 11 +++++------
2 files changed, 22 insertions(+), 6 deletions(-)
dlls/ntdll/tests/exception.c | 9 ++++-----
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c
index 016c21109..a3d14d340 100644
index 20dd7d304a2..3b39f78cc7a 100644
--- a/dlls/kernelbase/debug.c
+++ b/dlls/kernelbase/debug.c
@@ -210,6 +210,23 @@ void WINAPI DECLSPEC_HOTPATCH OutputDebugStringA( LPCSTR str )
@@ -213,6 +213,23 @@ void WINAPI DECLSPEC_HOTPATCH OutputDebugStringA( LPCSTR str )
__ENDTRY
if (caught_by_dbg) return;
@@ -38,10 +38,10 @@ index 016c21109..a3d14d340 100644
if (!mutex_inited)
{
diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index 0a9dae138..b7b0f0e70 100644
index 3ced3d04b71..9a2ab8db02a 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -2751,7 +2751,7 @@ static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *Exce
@@ -3893,7 +3893,7 @@ static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *Exce
return EXCEPTION_CONTINUE_SEARCH;
}
@@ -50,7 +50,7 @@ index 0a9dae138..b7b0f0e70 100644
{
PVOID vectored_handler;
@@ -2767,7 +2767,6 @@ static void test_outputdebugstring(DWORD numexc, BOOL todo)
@@ -3909,7 +3909,6 @@ static void test_outputdebugstring(DWORD numexc, BOOL todo)
outputdebugstring_exceptions = 0;
OutputDebugStringA("Hello World");
@@ -58,7 +58,7 @@ index 0a9dae138..b7b0f0e70 100644
ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n",
outputdebugstring_exceptions, numexc);
@@ -3448,9 +3447,9 @@ START_TEST(exception)
@@ -4509,9 +4508,9 @@ START_TEST(exception)
run_rtlraiseexception_test(EXCEPTION_BREAKPOINT);
run_rtlraiseexception_test(EXCEPTION_INVALID_HANDLE);
test_stage = 3;
@@ -70,24 +70,15 @@ index 0a9dae138..b7b0f0e70 100644
test_stage = 5;
test_ripevent(0);
test_stage = 6;
@@ -3481,7 +3480,7 @@ START_TEST(exception)
test_exceptions();
test_rtlraiseexception();
test_debug_registers();
- test_outputdebugstring(1, FALSE);
+ test_outputdebugstring(1);
test_ripevent(1);
test_debug_service(1);
test_breakpoint(1);
@@ -3519,7 +3518,7 @@ START_TEST(exception)
"_setjmp" );
@@ -4588,7 +4587,7 @@ START_TEST(exception)
#endif
test_debug_registers();
test_thread_context();
- test_outputdebugstring(1, FALSE);
+ test_outputdebugstring(1);
test_ripevent(1);
test_debug_service(1);
test_breakpoint(1);
test_closehandle(0, (HANDLE)0xdeadbeef);
--
2.23.0
2.27.0