From de4df47aec6c11b4f948de69fb0f699a7b073f5c Mon Sep 17 00:00:00 2001 From: Stefan Ginsberg Date: Fri, 9 Oct 2009 11:51:07 +0000 Subject: [PATCH] - Fix DbgLoadImageSymbols -- it doesn't return anything. - Fix DbgQueryDebugFilterState -- it returns NTSTATUS, not BOOLEAN! Also fix the callers that depended on this. svn path=/trunk/; revision=43341 --- reactos/include/ddk/winddk.h | 10 +++++++++- reactos/include/ndk/rtlfuncs.h | 2 +- reactos/lib/drivers/ip/network/routines.c | 8 ++++---- reactos/lib/rtl/debug.c | 3 +-- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/reactos/include/ddk/winddk.h b/reactos/include/ddk/winddk.h index 41a4dcc49c1..950ad751fef 100644 --- a/reactos/include/ddk/winddk.h +++ b/reactos/include/ddk/winddk.h @@ -10317,8 +10317,16 @@ DbgPrintReturnControlC( IN PCH Format, IN ...); +ULONG +NTAPI +DbgPrompt( + IN PCCH Prompt, + OUT PCH Response, + IN ULONG MaximumResponseLength +); + NTKERNELAPI -BOOLEAN +NTSTATUS NTAPI DbgQueryDebugFilterState( IN ULONG ComponentId, diff --git a/reactos/include/ndk/rtlfuncs.h b/reactos/include/ndk/rtlfuncs.h index 9f1957f7c9f..fa2199c828c 100644 --- a/reactos/include/ndk/rtlfuncs.h +++ b/reactos/include/ndk/rtlfuncs.h @@ -2666,7 +2666,7 @@ DbgBreakPoint( VOID ); -NTSTATUS +VOID NTAPI DbgLoadImageSymbols( IN PANSI_STRING Name, diff --git a/reactos/lib/drivers/ip/network/routines.c b/reactos/lib/drivers/ip/network/routines.c index c421695e220..df31ddd49b8 100644 --- a/reactos/lib/drivers/ip/network/routines.c +++ b/reactos/lib/drivers/ip/network/routines.c @@ -94,8 +94,8 @@ VOID DisplayTCPPacket( UINT Length; PCHAR Buffer; - if (!DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_PBUFFER | DPFLTR_MASK) || - !DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_TCP | DPFLTR_MASK)) { + if (!NT_SUCCESS(DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_PBUFFER | DPFLTR_MASK)) || + !NT_SUCCESS(DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_TCP | DPFLTR_MASK))) { return; } @@ -139,8 +139,8 @@ VOID DisplayIPPacket( PNDIS_BUFFER NextBuffer; PCHAR CharBuffer; - if (!DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_PBUFFER | DPFLTR_MASK) || - !DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_IP | DPFLTR_MASK)) { + if (!NT_SUCCESS(DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_PBUFFER | DPFLTR_MASK)) || + !NT_SUCCESS(DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_IP | DPFLTR_MASK))) { return; } diff --git a/reactos/lib/rtl/debug.c b/reactos/lib/rtl/debug.c index 49887587f73..7c42ebca8f4 100644 --- a/reactos/lib/rtl/debug.c +++ b/reactos/lib/rtl/debug.c @@ -317,7 +317,7 @@ DbgSetDebugFilterState(IN ULONG ComponentId, /* * @implemented */ -NTSTATUS +VOID NTAPI DbgLoadImageSymbols(IN PANSI_STRING Name, IN PVOID Base, @@ -346,7 +346,6 @@ DbgLoadImageSymbols(IN PANSI_STRING Name, /* Load the symbols */ DebugService2(Name, &SymbolInfo, BREAKPOINT_LOAD_SYMBOLS); - return STATUS_SUCCESS; } /*