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 47b02e8c1ea4ad82cd572dc3dcf60af753222f39.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2022-03-19 15:02:16 +11:00
parent 62db3313d5
commit e3a9010df6
6 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From d2dce4d7635b20ef76fc4b73594177ab8eae1575 Mon Sep 17 00:00:00 2001
From 6cfa7d9011879898a079614077a605c812cb440e Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 28 Sep 2014 23:39:51 +0200
Subject: [PATCH] ntdll: OutputDebugString should throw the exception a second
@@ -10,10 +10,10 @@ Subject: [PATCH] ntdll: OutputDebugString should throw the exception a second
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c
index 91f36a3e6b3..0a3bf397725 100644
index 9488f2e2399..1cea4b5ba3c 100644
--- a/dlls/kernelbase/debug.c
+++ b/dlls/kernelbase/debug.c
@@ -213,6 +213,23 @@ void WINAPI DECLSPEC_HOTPATCH OutputDebugStringA( LPCSTR str )
@@ -200,6 +200,23 @@ void WINAPI DECLSPEC_HOTPATCH OutputDebugStringA( LPCSTR str )
__ENDTRY
if (caught_by_dbg) return;
@@ -38,10 +38,10 @@ index 91f36a3e6b3..0a3bf397725 100644
if (!mutex_inited)
{
diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index 202a939b76f..476da44c6ed 100644
index c4413d4d66e..4fe2c2b04db 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -6018,7 +6018,7 @@ static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *Exce
@@ -8327,7 +8327,7 @@ static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *Exce
return EXCEPTION_CONTINUE_SEARCH;
}
@@ -50,15 +50,15 @@ index 202a939b76f..476da44c6ed 100644
{
PVOID vectored_handler;
@@ -6034,7 +6034,6 @@ static void test_outputdebugstring(DWORD numexc, BOOL todo)
@@ -8343,7 +8343,6 @@ static void test_outputdebugstring(DWORD numexc, BOOL todo)
outputdebugstring_exceptions = 0;
OutputDebugStringA("Hello World");
- todo_wine_if(todo)
ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n",
ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %ld exceptions, expected %ld\n",
outputdebugstring_exceptions, numexc);
@@ -8251,9 +8250,9 @@ START_TEST(exception)
@@ -10660,9 +10659,9 @@ START_TEST(exception)
else skip( "RtlRaiseException not found\n" );
#endif
test_stage = 3;
@@ -70,7 +70,7 @@ index 202a939b76f..476da44c6ed 100644
test_stage = 5;
test_ripevent(0);
test_stage = 6;
@@ -8349,7 +8348,7 @@ START_TEST(exception)
@@ -10766,7 +10765,7 @@ START_TEST(exception)
test_debugger(DBG_EXCEPTION_HANDLED);
test_debugger(DBG_CONTINUE);
test_thread_context();
@@ -80,5 +80,5 @@ index 202a939b76f..476da44c6ed 100644
test_breakpoint(1);
test_closehandle(0, (HANDLE)0xdeadbeef);
--
2.29.2
2.35.1