Rebase against 4ac05afd39aff3030e3379ee06e32d6544ef5d62.

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

@@ -1,4 +1,4 @@
-From 5345a66f9403133fc7cdd9ec8273c7bb3d19020d Mon Sep 17 00:00:00 2001
+From d2dce4d7635b20ef76fc4b73594177ab8eae1575 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,7 +10,7 @@ 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 6acdf0f1ea9..edb95eace3f 100644
+index 91f36a3e6b3..0a3bf397725 100644
 --- a/dlls/kernelbase/debug.c
 +++ b/dlls/kernelbase/debug.c
 @@ -213,6 +213,23 @@ void WINAPI DECLSPEC_HOTPATCH OutputDebugStringA( LPCSTR str )
@@ -38,10 +38,10 @@ index 6acdf0f1ea9..edb95eace3f 100644
      if (!mutex_inited)
      {
 diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
-index 7ee191469ec..561ccf966d9 100644
+index 202a939b76f..476da44c6ed 100644
 --- a/dlls/ntdll/tests/exception.c
 +++ b/dlls/ntdll/tests/exception.c
-@@ -4532,7 +4532,7 @@ static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *Exce
+@@ -6018,7 +6018,7 @@ static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *Exce
      return EXCEPTION_CONTINUE_SEARCH;
  }
  
@@ -50,7 +50,7 @@ index 7ee191469ec..561ccf966d9 100644
  {
      PVOID vectored_handler;
  
-@@ -4548,7 +4548,6 @@ static void test_outputdebugstring(DWORD numexc, BOOL todo)
+@@ -6034,7 +6034,6 @@ static void test_outputdebugstring(DWORD numexc, BOOL todo)
      outputdebugstring_exceptions = 0;
      OutputDebugStringA("Hello World");
  
@@ -58,7 +58,7 @@ index 7ee191469ec..561ccf966d9 100644
      ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n",
         outputdebugstring_exceptions, numexc);
  
-@@ -5148,9 +5147,9 @@ START_TEST(exception)
+@@ -8251,9 +8250,9 @@ START_TEST(exception)
          else skip( "RtlRaiseException not found\n" );
  #endif
          test_stage = 3;
@@ -70,9 +70,9 @@ index 7ee191469ec..561ccf966d9 100644
          test_stage = 5;
          test_ripevent(0);
          test_stage = 6;
-@@ -5226,7 +5225,7 @@ START_TEST(exception)
- 
-     test_debugger();
+@@ -8349,7 +8348,7 @@ START_TEST(exception)
+     test_debugger(DBG_EXCEPTION_HANDLED);
+     test_debugger(DBG_CONTINUE);
      test_thread_context();
 -    test_outputdebugstring(1, FALSE);
 +    test_outputdebugstring(1);
@@ -80,5 +80,5 @@ index 7ee191469ec..561ccf966d9 100644
      test_breakpoint(1);
      test_closehandle(0, (HANDLE)0xdeadbeef);
 -- 
-2.27.0
+2.29.2
 

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "221fdb09b4c20da45e9834aa0cae27dcc75ea27b"
+	echo "4ac05afd39aff3030e3379ee06e32d6544ef5d62"
 }
 
 # Show version information

staging/upstream-commit

@@ -1 +1 @@
-221fdb09b4c20da45e9834aa0cae27dcc75ea27b
+4ac05afd39aff3030e3379ee06e32d6544ef5d62