Rebase against 30cdd1fb8cea410cb9e363b16278528669e2c19a.

This commit is contained in:
Sebastian Lackner
2016-08-26 17:53:38 +02:00
parent deb73bfa7c
commit 43a640f8fd
25 changed files with 578 additions and 944 deletions

View File

@@ -1,4 +1,4 @@
From bdc7f21350a4dd7bc639bc6be69243bb6dd5dbf5 Mon Sep 17 00:00:00 2001
From d14f1523f3694d7bc2c7c79b6b7bd6f2a354bfb7 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
@@ -38,10 +38,10 @@ index a277f93..2fb9c73 100644
if (!mutex_inited)
{
diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index 3e22bed..3dab0bd 100644
index 7462024..151b67a 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -1903,7 +1903,7 @@ static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *Exce
@@ -2063,7 +2063,7 @@ static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *Exce
return EXCEPTION_CONTINUE_SEARCH;
}
@@ -50,7 +50,7 @@ index 3e22bed..3dab0bd 100644
{
PVOID vectored_handler;
@@ -1919,7 +1919,6 @@ static void test_outputdebugstring(DWORD numexc, BOOL todo)
@@ -2079,7 +2079,6 @@ static void test_outputdebugstring(DWORD numexc, BOOL todo)
outputdebugstring_exceptions = 0;
OutputDebugStringA("Hello World");
@@ -58,7 +58,7 @@ index 3e22bed..3dab0bd 100644
ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n",
outputdebugstring_exceptions, numexc);
@@ -2359,9 +2358,9 @@ START_TEST(exception)
@@ -2522,9 +2521,9 @@ START_TEST(exception)
run_rtlraiseexception_test(EXCEPTION_BREAKPOINT);
run_rtlraiseexception_test(EXCEPTION_INVALID_HANDLE);
test_stage = 3;
@@ -70,7 +70,7 @@ index 3e22bed..3dab0bd 100644
test_stage = 5;
test_ripevent(0);
test_stage = 6;
@@ -2390,7 +2389,7 @@ START_TEST(exception)
@@ -2553,7 +2552,7 @@ START_TEST(exception)
test_exceptions();
test_rtlraiseexception();
test_debug_registers();
@@ -79,8 +79,8 @@ index 3e22bed..3dab0bd 100644
test_ripevent(1);
test_debug_service(1);
test_breakpoint(1);
@@ -2415,7 +2414,7 @@ START_TEST(exception)
"__C_specific_handler" );
@@ -2586,7 +2585,7 @@ START_TEST(exception)
"_setjmp" );
test_debug_registers();
- test_outputdebugstring(1, FALSE);