/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Run-Time Library
- * FILE: ntoskrnl/rtl/dbgprint.c
+ * FILE: lib/rtl/debug.c
* PURPOSE: Debug Print and Prompt routines
* PROGRAMMERS: Alex Ionescu (alex@relsoft.net)
* Royce Mitchel III
/* PRIVATE FUNCTIONS ********************************************************/
-#if 0
NTSTATUS
NTAPI
DebugPrint(IN PANSI_STRING DebugString,
DebugString->Buffer,
DebugString->Length,
UlongToPtr(ComponentId),
- UlongToPtr(Level));
+ UlongToPtr(Level));
}
-#else
-NTSTATUS
-NTAPI
-DebugPrint(IN PANSI_STRING DebugString,
- IN ULONG ComponentId,
- IN ULONG Level);
-#endif
NTSTATUS
NTAPI
NTSTATUS Status;
ANSI_STRING DebugString;
CHAR Buffer[512];
- PCHAR pBuffer = Buffer;
- ULONG pBufferSize = sizeof(Buffer);
- ULONG Length;
+ ULONG Length, PrefixLength;
EXCEPTION_RECORD ExceptionRecord;
/* Check if we should print it or not */
- if (ComponentId != -1 && !NtQueryDebugFilterState(ComponentId, Level))
+ if ((ComponentId != -1U) &&
+ !(NtQueryDebugFilterState(ComponentId, Level)))
{
/* This message is masked */
return STATUS_SUCCESS;
/* For user mode, don't recursively DbgPrint */
if (RtlpSetInDbgPrint(TRUE)) return STATUS_SUCCESS;
- /* Initialize the length to 8 */
- DebugString.Length = 0;
-
- /* Handle the prefix */
- if (Prefix && *Prefix)
+ /* Guard against incorrect pointers */
+ _SEH2_TRY
{
- /* Get the length */
- DebugString.Length = strlen(Prefix);
-
- /* Normalize it */
- if(DebugString.Length > sizeof(Buffer))
- {
- DebugString.Length = sizeof(Buffer);
- }
+ /* Get the length and normalize it */
+ PrefixLength = strlen(Prefix);
+ if (PrefixLength > sizeof(Buffer)) PrefixLength = sizeof(Buffer);
/* Copy it */
- strncpy(Buffer, Prefix, DebugString.Length);
+ strncpy(Buffer, Prefix, PrefixLength);
- /* Set the pointer and update the size */
- pBuffer = &Buffer[DebugString.Length];
- pBufferSize -= DebugString.Length;
+ /* Do the printf */
+ Length = _vsnprintf(Buffer + PrefixLength,
+ sizeof(Buffer) - PrefixLength,
+ Format,
+ ap);
}
-
- /* Setup the ANSI String */
- DebugString.Buffer = Buffer;
- DebugString.MaximumLength = sizeof(Buffer);
- Length = _vsnprintf(pBuffer, pBufferSize, Format, ap);
+ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+ {
+ /* Fail */
+ Length = PrefixLength = 0;
+ _SEH2_YIELD(return _SEH2_GetExceptionCode());
+ }
+ _SEH2_END;
/* Check if we went past the buffer */
- if (Length == -1)
+ if (Length == -1U)
{
/* Terminate it if we went over-board */
Buffer[sizeof(Buffer) - 1] = '\n';
/* Put maximum */
Length = sizeof(Buffer);
}
+ else
+ {
+ /* Add the prefix */
+ Length += PrefixLength;
+ }
- /* Update length */
- DebugString.Length += Length;
+ /* Build the string */
+ DebugString.Length = Length;
+ DebugString.Buffer = Buffer;
/* First, let the debugger know as well */
if (RtlpCheckForActiveDebugger(FALSE))
if (Status == STATUS_BREAKPOINT)
{
/* Breakpoint */
- DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C);
+ //DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C);
Status = STATUS_SUCCESS;
}
}
IN va_list ap)
{
/* Call the internal routine that also handles ControlC */
- return vDbgPrintExWithPrefixInternal(NULL,
+ return vDbgPrintExWithPrefixInternal("",
ComponentId,
Level,
Format,
DbgPrint(PCCH Format,
...)
{
+ ULONG n;
va_list ap;
/* Call the internal routine that also handles ControlC */
va_start(ap, Format);
- return vDbgPrintExWithPrefixInternal(NULL,
- -1,
- DPFLTR_ERROR_LEVEL,
- Format,
- ap,
- TRUE);
+ n = vDbgPrintExWithPrefixInternal("",
+ -1,
+ DPFLTR_ERROR_LEVEL,
+ Format,
+ ap,
+ TRUE);
va_end(ap);
+ return n;
}
/*
IN PCCH Format,
...)
{
+ ULONG n;
va_list ap;
/* Call the internal routine that also handles ControlC */
va_start(ap, Format);
- return vDbgPrintExWithPrefixInternal(NULL,
- ComponentId,
- Level,
- Format,
- ap,
- TRUE);
+ n = vDbgPrintExWithPrefixInternal("",
+ ComponentId,
+ Level,
+ Format,
+ ap,
+ TRUE);
va_end(ap);
+ return n;
}
/*
DbgPrintReturnControlC(PCH Format,
...)
{
+ ULONG n;
va_list ap;
/* Call the internal routine that also handles ControlC */
va_start(ap, Format);
- return vDbgPrintExWithPrefixInternal(NULL,
- -1,
- DPFLTR_ERROR_LEVEL,
- Format,
- ap,
- FALSE);
+ n = vDbgPrintExWithPrefixInternal("",
+ -1,
+ DPFLTR_ERROR_LEVEL,
+ Format,
+ ap,
+ FALSE);
+ va_end(ap);
+ return n;
}
/*
STRING Input;
/* Setup the input string */
- Input.MaximumLength = MaximumResponseLength;
+ Input.MaximumLength = (USHORT)MaximumResponseLength;
Input.Buffer = Response;
/* Setup the output string */
- Output.Length = strlen (Prompt);
+ Output.Length = strlen(Prompt);
Output.Buffer = Prompt;
/* Call the system service */
/*
* @implemented
*/
-BOOLEAN
+NTSTATUS
NTAPI
DbgQueryDebugFilterState(IN ULONG ComponentId,
IN ULONG Level)
NTAPI
DbgLoadImageSymbols(IN PANSI_STRING Name,
IN PVOID Base,
- IN ULONG ProcessId)
+ IN ULONG_PTR ProcessId)
{
PIMAGE_NT_HEADERS NtHeader;
KD_SYMBOLS_INFO SymbolInfo;
/* Setup the symbol data */
SymbolInfo.BaseOfDll = Base;
- SymbolInfo.ProcessId = UlongToPtr(ProcessId);
+ SymbolInfo.ProcessId = (ULONG)ProcessId;
/* Get NT Headers */
- NtHeader = NULL; //RtlImageNtHeader(Base);
+ NtHeader = RtlImageNtHeader(Base);
if (NtHeader)
{
/* Get the rest of the data */
DebugService2(Name, &SymbolInfo, BREAKPOINT_LOAD_SYMBOLS);
return STATUS_SUCCESS;
}
-/* EOF */
+
+/*
+ * @implemented
+ */
+VOID
+NTAPI
+DbgUnLoadImageSymbols(IN PANSI_STRING Name,
+ IN PVOID Base,
+ IN ULONG_PTR ProcessId)
+{
+ KD_SYMBOLS_INFO SymbolInfo;
+
+ /* Setup the symbol data */
+ SymbolInfo.BaseOfDll = Base;
+ SymbolInfo.ProcessId = (ULONG)ProcessId;
+ SymbolInfo.CheckSum = SymbolInfo.SizeOfImage = 0;
+
+ /* Load the symbols */
+ DebugService2(Name, &SymbolInfo, BREAKPOINT_UNLOAD_SYMBOLS);
+}
projects / reactos.git / blobdiff