Commit c5129d6f authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard

ntdll: Reimplement DbgPrint* using DBG_PRINTEXCEPTION_C.

parent 1425363b
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include "ddk/ntddk.h" #include "ddk/ntddk.h"
WINE_DEFAULT_DEBUG_CHANNEL(ntdll); WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
WINE_DECLARE_DEBUG_CHANNEL(debugstr);
/* CRC polynomial 0xedb88320 */ /* CRC polynomial 0xedb88320 */
static const DWORD CRC_table[256] = static const DWORD CRC_table[256] =
...@@ -297,21 +298,24 @@ void WINAPI RtlDumpResource(LPRTL_RWLOCK rwl) ...@@ -297,21 +298,24 @@ void WINAPI RtlDumpResource(LPRTL_RWLOCK rwl)
* misc functions * misc functions
*/ */
static LONG WINAPI debug_exception_handler( EXCEPTION_POINTERS *eptr )
{
EXCEPTION_RECORD *rec = eptr->ExceptionRecord;
return (rec->ExceptionCode == DBG_PRINTEXCEPTION_C) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH;
}
/****************************************************************************** /******************************************************************************
* DbgPrint [NTDLL.@] * DbgPrint [NTDLL.@]
*/ */
NTSTATUS WINAPIV DbgPrint(LPCSTR fmt, ...) NTSTATUS WINAPIV DbgPrint(LPCSTR fmt, ...)
{ {
char buf[512]; NTSTATUS ret;
__ms_va_list args; __ms_va_list args;
__ms_va_start(args, fmt); __ms_va_start(args, fmt);
_vsnprintf(buf, sizeof(buf), fmt, args); ret = vDbgPrintEx(0, DPFLTR_ERROR_LEVEL, fmt, args);
__ms_va_end(args); __ms_va_end(args);
return ret;
MESSAGE("DbgPrint says: %s",buf);
/* hmm, raise exception? */
return STATUS_SUCCESS;
} }
...@@ -342,18 +346,36 @@ NTSTATUS WINAPI vDbgPrintEx( ULONG id, ULONG level, LPCSTR fmt, __ms_va_list arg ...@@ -342,18 +346,36 @@ NTSTATUS WINAPI vDbgPrintEx( ULONG id, ULONG level, LPCSTR fmt, __ms_va_list arg
*/ */
NTSTATUS WINAPI vDbgPrintExWithPrefix( LPCSTR prefix, ULONG id, ULONG level, LPCSTR fmt, __ms_va_list args ) NTSTATUS WINAPI vDbgPrintExWithPrefix( LPCSTR prefix, ULONG id, ULONG level, LPCSTR fmt, __ms_va_list args )
{ {
char buf[1024]; ULONG level_mask = level <= 31 ? (1 << level) : level;
SIZE_T len = strlen( prefix );
char buf[1024], *end;
strcpy( buf, prefix );
len += _vsnprintf( buf + len, sizeof(buf) - len, fmt, args );
end = buf + len - 1;
_vsnprintf(buf, sizeof(buf), fmt, args); WARN_(debugstr)(*end == '\n' ? "%08x:%08x: %s" : "%08x:%08x: %s\n", id, level_mask, buf);
switch (level & DPFLTR_MASK) if (level_mask & (1 << DPFLTR_ERROR_LEVEL) && NtCurrentTeb()->Peb->BeingDebugged)
{
__TRY
{
EXCEPTION_RECORD record;
record.ExceptionCode = DBG_PRINTEXCEPTION_C;
record.ExceptionFlags = 0;
record.ExceptionRecord = NULL;
record.ExceptionAddress = RtlRaiseException;
record.NumberParameters = 2;
record.ExceptionInformation[1] = (ULONG_PTR)buf;
record.ExceptionInformation[0] = strlen( buf ) + 1;
RtlRaiseException( &record );
}
__EXCEPT(debug_exception_handler)
{ {
case DPFLTR_ERROR_LEVEL: ERR("%s%x: %s", prefix, id, buf); break;
case DPFLTR_WARNING_LEVEL: WARN("%s%x: %s", prefix, id, buf); break;
case DPFLTR_TRACE_LEVEL:
case DPFLTR_INFO_LEVEL:
default: TRACE("%s%x: %s", prefix, id, buf); break;
} }
__ENDTRY
}
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
......
...@@ -3541,19 +3541,19 @@ static void test_DbgPrint(void) ...@@ -3541,19 +3541,19 @@ static void test_DbgPrint(void)
test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER;
status = DbgPrint( "test_DbgPrint: %s", "Hello World" ); status = DbgPrint( "test_DbgPrint: %s", "Hello World" );
ok( !status, "DbgPrint returned %x\n", status ); ok( !status, "DbgPrint returned %x\n", status );
todo_wine ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" );
test_dbg_print_except = FALSE; test_dbg_print_except = FALSE;
test_dbg_print_except_ret = (LONG)EXCEPTION_CONTINUE_EXECUTION; test_dbg_print_except_ret = (LONG)EXCEPTION_CONTINUE_EXECUTION;
status = DbgPrint( "test_DbgPrint: %s", "Hello World" ); status = DbgPrint( "test_DbgPrint: %s", "Hello World" );
ok( !status, "DbgPrint returned %x\n", status ); ok( !status, "DbgPrint returned %x\n", status );
todo_wine ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" );
test_dbg_print_except = FALSE; test_dbg_print_except = FALSE;
test_dbg_print_except_ret = (LONG)EXCEPTION_CONTINUE_SEARCH; test_dbg_print_except_ret = (LONG)EXCEPTION_CONTINUE_SEARCH;
status = DbgPrint( "test_DbgPrint: %s", "Hello World" ); status = DbgPrint( "test_DbgPrint: %s", "Hello World" );
ok( !status, "DbgPrint returned %x\n", status ); ok( !status, "DbgPrint returned %x\n", status );
todo_wine ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" );
/* FIXME: NtSetDebugFilterState / DbgSetDebugFilterState are probably what's controlling these */ /* FIXME: NtSetDebugFilterState / DbgSetDebugFilterState are probably what's controlling these */
...@@ -3562,7 +3562,7 @@ static void test_DbgPrint(void) ...@@ -3562,7 +3562,7 @@ static void test_DbgPrint(void)
test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER;
status = DbgPrintEx( 0, DPFLTR_ERROR_LEVEL, "test_DbgPrint: %s", "Hello World" ); status = DbgPrintEx( 0, DPFLTR_ERROR_LEVEL, "test_DbgPrint: %s", "Hello World" );
ok( !status, "DbgPrintEx returned %x\n", status ); ok( !status, "DbgPrintEx returned %x\n", status );
todo_wine ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" );
test_dbg_print_except = FALSE; test_dbg_print_except = FALSE;
test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER;
...@@ -3574,7 +3574,7 @@ static void test_DbgPrint(void) ...@@ -3574,7 +3574,7 @@ static void test_DbgPrint(void)
test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER;
status = DbgPrintEx( 0, DPFLTR_MASK|(1 << DPFLTR_ERROR_LEVEL), "test_DbgPrint: %s", "Hello World" ); status = DbgPrintEx( 0, DPFLTR_MASK|(1 << DPFLTR_ERROR_LEVEL), "test_DbgPrint: %s", "Hello World" );
ok( !status, "DbgPrintEx returned %x\n", status ); ok( !status, "DbgPrintEx returned %x\n", status );
todo_wine ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" );
test_dbg_print_except = FALSE; test_dbg_print_except = FALSE;
test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER;
...@@ -3587,13 +3587,13 @@ static void test_DbgPrint(void) ...@@ -3587,13 +3587,13 @@ static void test_DbgPrint(void)
test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER;
status = test_vDbgPrintEx( 0, 0xFFFFFFFF, "test_DbgPrint: %s", "Hello World" ); status = test_vDbgPrintEx( 0, 0xFFFFFFFF, "test_DbgPrint: %s", "Hello World" );
ok( !status, "vDbgPrintEx returned %x\n", status ); ok( !status, "vDbgPrintEx returned %x\n", status );
todo_wine ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" );
test_dbg_print_except = FALSE; test_dbg_print_except = FALSE;
test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER;
status = test_vDbgPrintExWithPrefix( "test_", 0, 0xFFFFFFFF, "DbgPrint: %s", "Hello World" ); status = test_vDbgPrintExWithPrefix( "test_", 0, 0xFFFFFFFF, "DbgPrint: %s", "Hello World" );
ok( !status, "vDbgPrintExWithPrefix returned %x\n", status ); ok( !status, "vDbgPrintExWithPrefix returned %x\n", status );
todo_wine ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" );
Peb->BeingDebugged = debugged; Peb->BeingDebugged = debugged;
RtlRemoveVectoredExceptionHandler( handler ); RtlRemoveVectoredExceptionHandler( handler );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment