Rebase against 707d299da62414e6582c5c0c8cfec0cd43c3ac97.

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

@@ -1,19 +1,18 @@
-From da81169743bd7f070186ec5e58c89bab53d0bb7f Mon Sep 17 00:00:00 2001
+From 6e2509a34fb6f8f06438ee9908eb61320b73697f 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
  time, if a debugger is attached.
 
 ---
- dlls/kernelbase/debug.c      | 17 +++++++++++++++++
- dlls/ntdll/tests/exception.c |  9 ++++-----
- 2 files changed, 21 insertions(+), 5 deletions(-)
+ dlls/kernelbase/debug.c | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
 
 diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c
-index 9e954e3ffbe..a6793c20204 100644
+index e1976777b7f..7294f99da7e 100644
 --- a/dlls/kernelbase/debug.c
 +++ b/dlls/kernelbase/debug.c
-@@ -200,6 +200,23 @@ void WINAPI DECLSPEC_HOTPATCH OutputDebugStringA( LPCSTR str )
+@@ -202,6 +202,23 @@ void WINAPI DECLSPEC_HOTPATCH OutputDebugStringA( LPCSTR str )
      __ENDTRY
      if (caught_by_dbg) return;
  
@@ -37,48 +36,6 @@ index 9e954e3ffbe..a6793c20204 100644
      /* send string to a system-wide monitor */
      if (!mutex_inited)
      {
-diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
-index 3e76b001147..0c02486e19c 100644
---- a/dlls/ntdll/tests/exception.c
-+++ b/dlls/ntdll/tests/exception.c
-@@ -8345,7 +8345,7 @@ static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *Exce
-     return EXCEPTION_CONTINUE_SEARCH;
- }
- 
--static void test_outputdebugstring(DWORD numexc, BOOL todo)
-+static void test_outputdebugstring(DWORD numexc)
- {
-     PVOID vectored_handler;
- 
-@@ -8361,7 +8361,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 %ld exceptions, expected %ld\n",
-        outputdebugstring_exceptions, numexc);
- 
-@@ -10785,9 +10784,9 @@ START_TEST(exception)
-         else skip( "RtlRaiseException not found\n" );
- #endif
-         test_stage = 3;
--        test_outputdebugstring(0, FALSE);
-+        test_outputdebugstring(0);
-         test_stage = 4;
--        test_outputdebugstring(2, TRUE); /* is this a Windows bug? */
-+        test_outputdebugstring(2);
-         test_stage = 5;
-         test_ripevent(0);
-         test_stage = 6;
-@@ -10900,7 +10899,7 @@ START_TEST(exception)
-     test_debugger(DBG_EXCEPTION_HANDLED);
-     test_debugger(DBG_CONTINUE);
-     test_thread_context();
--    test_outputdebugstring(1, FALSE);
-+    test_outputdebugstring(1);
-     test_ripevent(1);
-     test_fastfail();
-     test_breakpoint(1);
 -- 
-2.36.1
+2.40.1
 

staging/upstream-commit

@@ -1 +1 @@
-797a8bb192d49a44b8cec468e3421444feb03f8a
+707d299da62414e6582c5c0c8cfec0cd43c3ac97