mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
7e776b7a90
[kernel32-CompareString_Length] Removed patch to make sure CompareString aborts on first non-matching character (accepted upstream). [kernel32-GetLogicalProcessorInformationEx] Removed patch to return TRUE from GetLogicalProcessorInformationEx stub (accepted upstream). [user32-WM_CAPTURECHANGE] Removed patch to send WM_CAPTURECHANGE also when capture has not changed (accepted upstream). [wined3d-Multisampling] Removed patch to allow to override number of quality levels for D3DMULTISAMPLE_NONMASKABLE (fixed upstream).
102 lines
3.6 KiB
Diff
102 lines
3.6 KiB
Diff
From 21a4d707055fc3e7781fbefec814095cd109fcd2 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.
|
|
|
|
---
|
|
dlls/kernel32/debugger.c | 17 +++++++++++++++++
|
|
dlls/ntdll/tests/exception.c | 19 +++++++------------
|
|
2 files changed, 24 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c
|
|
index d4d66b2..981661b 100644
|
|
--- a/dlls/kernel32/debugger.c
|
|
+++ b/dlls/kernel32/debugger.c
|
|
@@ -277,6 +277,23 @@ void WINAPI OutputDebugStringA( LPCSTR str )
|
|
__ENDTRY
|
|
if (caught_by_dbg) return;
|
|
|
|
+ /* for some unknown reason Windows sends the exception a second time, if a
|
|
+ * debugger is attached, and the event wasn't handled in the first attempt */
|
|
+ if (NtCurrentTeb()->Peb->BeingDebugged)
|
|
+ {
|
|
+ __TRY
|
|
+ {
|
|
+ ULONG_PTR args[2];
|
|
+ args[0] = strlen(str) + 1;
|
|
+ args[1] = (ULONG_PTR)str;
|
|
+ RaiseException( DBG_PRINTEXCEPTION_C, 0, 2, args );
|
|
+ }
|
|
+ __EXCEPT(debug_exception_handler)
|
|
+ {
|
|
+ }
|
|
+ __ENDTRY
|
|
+ }
|
|
+
|
|
/* 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 440655c..70ccf82 100644
|
|
--- a/dlls/ntdll/tests/exception.c
|
|
+++ b/dlls/ntdll/tests/exception.c
|
|
@@ -1780,7 +1780,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;
|
|
|
|
@@ -1795,13 +1795,8 @@ static void test_outputdebugstring(DWORD numexc, BOOL todo)
|
|
|
|
outputdebugstring_exceptions = 0;
|
|
OutputDebugStringA("Hello World");
|
|
- if (todo)
|
|
- todo_wine
|
|
- ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n",
|
|
- outputdebugstring_exceptions, numexc);
|
|
- else
|
|
- ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n",
|
|
- outputdebugstring_exceptions, numexc);
|
|
+ ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n",
|
|
+ outputdebugstring_exceptions, numexc);
|
|
|
|
pRtlRemoveVectoredExceptionHandler(vectored_handler);
|
|
}
|
|
@@ -2249,9 +2244,9 @@ START_TEST(exception)
|
|
run_rtlraiseexception_test(EXCEPTION_BREAKPOINT);
|
|
run_rtlraiseexception_test(EXCEPTION_INVALID_HANDLE);
|
|
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;
|
|
@@ -2279,7 +2274,7 @@ START_TEST(exception)
|
|
test_unwind();
|
|
test_exceptions();
|
|
test_rtlraiseexception();
|
|
- test_outputdebugstring(1, FALSE);
|
|
+ test_outputdebugstring(1);
|
|
test_ripevent(1);
|
|
test_debug_service(1);
|
|
test_breakpoint(1);
|
|
@@ -2301,7 +2296,7 @@ START_TEST(exception)
|
|
pRtlLookupFunctionEntry = (void *)GetProcAddress( hntdll,
|
|
"RtlLookupFunctionEntry" );
|
|
|
|
- test_outputdebugstring(1, FALSE);
|
|
+ test_outputdebugstring(1);
|
|
test_ripevent(1);
|
|
test_debug_service(1);
|
|
test_breakpoint(1);
|
|
--
|
|
2.7.1
|
|
|