mirror of
https://github.com/reactos/reactos.git
synced 2025-02-22 16:36:33 +00:00
[DPRINT12345]
Silence more annoying DPRINTs, and add one that hopefully helps to debug a problem. svn path=/trunk/; revision=65334
This commit is contained in:
parent
6990cd2172
commit
612333a5c0
12 changed files with 40 additions and 36 deletions
|
@ -124,7 +124,7 @@ AddConsoleAliasW(LPCWSTR lpSource,
|
|||
USHORT SourceBufferLength = (USHORT)wcslen(lpSource) * sizeof(WCHAR);
|
||||
USHORT TargetBufferLength = (USHORT)(lpTarget ? wcslen(lpTarget) * sizeof(WCHAR) : 0);
|
||||
|
||||
DPRINT1("AddConsoleAliasW entered with lpSource '%S' lpTarget '%S' lpExeName '%S'\n",
|
||||
DPRINT("AddConsoleAliasW entered with lpSource '%S' lpTarget '%S' lpExeName '%S'\n",
|
||||
lpSource, lpTarget, lpExeName);
|
||||
|
||||
return IntAddConsoleAlias(lpSource,
|
||||
|
@ -149,7 +149,7 @@ AddConsoleAliasA(LPCSTR lpSource,
|
|||
USHORT SourceBufferLength = (USHORT)strlen(lpSource) * sizeof(CHAR);
|
||||
USHORT TargetBufferLength = (USHORT)(lpTarget ? strlen(lpTarget) * sizeof(CHAR) : 0);
|
||||
|
||||
DPRINT1("AddConsoleAliasA entered with lpSource '%s' lpTarget '%s' lpExeName '%s'\n",
|
||||
DPRINT("AddConsoleAliasA entered with lpSource '%s' lpTarget '%s' lpExeName '%s'\n",
|
||||
lpSource, lpTarget, lpExeName);
|
||||
|
||||
return IntAddConsoleAlias(lpSource,
|
||||
|
@ -262,7 +262,7 @@ GetConsoleAliasW(LPWSTR lpSource,
|
|||
DWORD TargetBufferLength,
|
||||
LPWSTR lpExeName)
|
||||
{
|
||||
DPRINT1("GetConsoleAliasW entered with lpSource '%S' lpExeName '%S'\n",
|
||||
DPRINT("GetConsoleAliasW entered with lpSource '%S' lpExeName '%S'\n",
|
||||
lpSource, lpExeName);
|
||||
|
||||
return IntGetConsoleAlias(lpSource,
|
||||
|
@ -285,7 +285,7 @@ GetConsoleAliasA(LPSTR lpSource,
|
|||
DWORD TargetBufferLength,
|
||||
LPSTR lpExeName)
|
||||
{
|
||||
DPRINT1("GetConsoleAliasA entered with lpSource '%s' lpExeName '%s'\n",
|
||||
DPRINT("GetConsoleAliasA entered with lpSource '%s' lpExeName '%s'\n",
|
||||
lpSource, lpExeName);
|
||||
|
||||
return IntGetConsoleAlias(lpSource,
|
||||
|
@ -377,7 +377,7 @@ GetConsoleAliasesW(LPWSTR AliasBuffer,
|
|||
DWORD AliasBufferLength,
|
||||
LPWSTR ExeName)
|
||||
{
|
||||
DPRINT1("GetConsoleAliasesW entered with lpExeName '%S'\n",
|
||||
DPRINT("GetConsoleAliasesW entered with lpExeName '%S'\n",
|
||||
ExeName);
|
||||
|
||||
return IntGetConsoleAliases(AliasBuffer,
|
||||
|
@ -397,7 +397,7 @@ GetConsoleAliasesA(LPSTR AliasBuffer,
|
|||
DWORD AliasBufferLength,
|
||||
LPSTR ExeName)
|
||||
{
|
||||
DPRINT1("GetConsoleAliasesA entered with lpExeName '%s'\n",
|
||||
DPRINT("GetConsoleAliasesA entered with lpExeName '%s'\n",
|
||||
ExeName);
|
||||
|
||||
return IntGetConsoleAliases(AliasBuffer,
|
||||
|
@ -535,7 +535,7 @@ DECLSPEC_HOTPATCH
|
|||
GetConsoleAliasExesW(LPWSTR lpExeNameBuffer,
|
||||
DWORD ExeNameBufferLength)
|
||||
{
|
||||
DPRINT1("GetConsoleAliasExesW called\n");
|
||||
DPRINT("GetConsoleAliasExesW called\n");
|
||||
return IntGetConsoleAliasExes(lpExeNameBuffer, ExeNameBufferLength, TRUE);
|
||||
}
|
||||
|
||||
|
@ -549,7 +549,7 @@ DECLSPEC_HOTPATCH
|
|||
GetConsoleAliasExesA(LPSTR lpExeNameBuffer,
|
||||
DWORD ExeNameBufferLength)
|
||||
{
|
||||
DPRINT1("GetConsoleAliasExesA called\n");
|
||||
DPRINT("GetConsoleAliasExesA called\n");
|
||||
return IntGetConsoleAliasExes(lpExeNameBuffer, ExeNameBufferLength, FALSE);
|
||||
}
|
||||
|
||||
|
@ -585,7 +585,7 @@ WINAPI
|
|||
DECLSPEC_HOTPATCH
|
||||
GetConsoleAliasExesLengthW(VOID)
|
||||
{
|
||||
DPRINT1("GetConsoleAliasExesLengthW called\n");
|
||||
DPRINT("GetConsoleAliasExesLengthW called\n");
|
||||
return IntGetConsoleAliasExesLength(TRUE);
|
||||
}
|
||||
|
||||
|
@ -598,7 +598,7 @@ WINAPI
|
|||
DECLSPEC_HOTPATCH
|
||||
GetConsoleAliasExesLengthA(VOID)
|
||||
{
|
||||
DPRINT1("GetConsoleAliasExesLengthA called\n");
|
||||
DPRINT("GetConsoleAliasExesLengthA called\n");
|
||||
return IntGetConsoleAliasExesLength(FALSE);
|
||||
}
|
||||
|
||||
|
|
|
@ -4035,7 +4035,7 @@ StartScan:
|
|||
if (lpCurrentDirectory)
|
||||
{
|
||||
/* Allocate a buffer so we can keep a Unicode copy */
|
||||
DPRINT1("Current directory: %S\n", lpCurrentDirectory);
|
||||
DPRINT("Current directory: %S\n", lpCurrentDirectory);
|
||||
CurrentDirectory = RtlAllocateHeap(RtlGetProcessHeap(),
|
||||
0,
|
||||
(MAX_PATH * sizeof(WCHAR)) +
|
||||
|
|
|
@ -3719,7 +3719,7 @@ GreExtTextOutW(
|
|||
DestRect.bottom = lprc->bottom + dc->ptlDCOrig.y;
|
||||
}
|
||||
MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom);
|
||||
IntEngMaskBlt(
|
||||
if (!IntEngMaskBlt(
|
||||
SurfObj,
|
||||
SourceGlyphSurf,
|
||||
&dc->co.ClipObj,
|
||||
|
@ -3728,7 +3728,11 @@ GreExtTextOutW(
|
|||
&DestRect,
|
||||
(PPOINTL)&MaskRect,
|
||||
&dc->eboText.BrushObject,
|
||||
&BrushOrigin);
|
||||
&BrushOrigin))
|
||||
{
|
||||
DPRINT1("Failed to MaskBlt a glyph!\n");
|
||||
}
|
||||
|
||||
MouseSafetyOnDrawEnd(dc->ppdev) ;
|
||||
|
||||
EngUnlockSurface(SourceGlyphSurf);
|
||||
|
|
|
@ -454,7 +454,7 @@ CSR_API(SrvAddConsoleAlias)
|
|||
PALIAS_ENTRY Entry;
|
||||
PVOID lpTarget;
|
||||
|
||||
DPRINT1("SrvAddConsoleAlias entered ApiMessage %p\n", ApiMessage);
|
||||
DPRINT("SrvAddConsoleAlias entered ApiMessage %p\n", ApiMessage);
|
||||
|
||||
if ( !CsrValidateMessageBuffer(ApiMessage,
|
||||
(PVOID*)&ConsoleAliasRequest->Source,
|
||||
|
@ -545,7 +545,7 @@ CSR_API(SrvGetConsoleAlias)
|
|||
UINT Length;
|
||||
PVOID lpTarget;
|
||||
|
||||
DPRINT1("SrvGetConsoleAlias entered ApiMessage %p\n", ApiMessage);
|
||||
DPRINT("SrvGetConsoleAlias entered ApiMessage %p\n", ApiMessage);
|
||||
|
||||
if ( !CsrValidateMessageBuffer(ApiMessage,
|
||||
(PVOID*)&ConsoleAliasRequest->Source,
|
||||
|
@ -635,7 +635,7 @@ CSR_API(SrvGetConsoleAliases)
|
|||
ULONG BytesWritten = 0;
|
||||
PALIAS_HEADER Header;
|
||||
|
||||
DPRINT1("SrvGetConsoleAliases entered ApiMessage %p\n", ApiMessage);
|
||||
DPRINT("SrvGetConsoleAliases entered ApiMessage %p\n", ApiMessage);
|
||||
|
||||
if ( !CsrValidateMessageBuffer(ApiMessage,
|
||||
(PVOID)&GetAllAliasesRequest->ExeName,
|
||||
|
@ -740,7 +740,7 @@ CSR_API(SrvGetConsoleAliasesLength)
|
|||
PCONSRV_CONSOLE Console;
|
||||
PALIAS_HEADER Header;
|
||||
|
||||
DPRINT1("SrvGetConsoleAliasesLength entered ApiMessage %p\n", ApiMessage);
|
||||
DPRINT("SrvGetConsoleAliasesLength entered ApiMessage %p\n", ApiMessage);
|
||||
|
||||
if (!CsrValidateMessageBuffer(ApiMessage,
|
||||
(PVOID)&GetAllAliasesLengthRequest->ExeName,
|
||||
|
@ -781,7 +781,7 @@ CSR_API(SrvGetConsoleAliasExes)
|
|||
PCONSRV_CONSOLE Console;
|
||||
UINT BytesWritten = 0;
|
||||
|
||||
DPRINT1("SrvGetConsoleAliasExes entered\n");
|
||||
DPRINT("SrvGetConsoleAliasExes entered\n");
|
||||
|
||||
if (!CsrValidateMessageBuffer(ApiMessage,
|
||||
(PVOID*)&GetAliasesExesRequest->ExeNames,
|
||||
|
@ -867,7 +867,7 @@ CSR_API(SrvGetConsoleAliasExesLength)
|
|||
PCONSOLE_GETALIASESEXESLENGTH GetAliasesExesLengthRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetAliasesExesLengthRequest;
|
||||
PCONSRV_CONSOLE Console;
|
||||
|
||||
DPRINT1("SrvGetConsoleAliasExesLength entered ApiMessage %p\n", ApiMessage);
|
||||
DPRINT("SrvGetConsoleAliasExesLength entered ApiMessage %p\n", ApiMessage);
|
||||
|
||||
Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process),
|
||||
&Console, TRUE);
|
||||
|
|
|
@ -44,7 +44,7 @@ InsertConsole(IN PCONSOLE Console)
|
|||
/* All went right, so add the console to the list */
|
||||
ConDrvLockConsoleListExclusive();
|
||||
|
||||
DPRINT1("Insert in the list\n");
|
||||
DPRINT("Insert in the list\n");
|
||||
InsertTailList(&ConsoleList, &Console->ListEntry);
|
||||
|
||||
// FIXME: Move this code to the caller function!!
|
||||
|
|
|
@ -294,7 +294,7 @@ ConioResizeBuffer(PCONSOLE Console,
|
|||
Buffer = ConsoleAllocHeap(HEAP_ZERO_MEMORY, Size.X * Size.Y * sizeof(CHAR_INFO));
|
||||
if (!Buffer) return STATUS_NO_MEMORY;
|
||||
|
||||
DPRINT1("Resizing (%d,%d) to (%d,%d)\n", ScreenBuffer->ScreenBufferSize.X, ScreenBuffer->ScreenBufferSize.Y, Size.X, Size.Y);
|
||||
DPRINT("Resizing (%d,%d) to (%d,%d)\n", ScreenBuffer->ScreenBufferSize.X, ScreenBuffer->ScreenBufferSize.Y, Size.X, Size.Y);
|
||||
OldBuffer = ScreenBuffer->Buffer;
|
||||
|
||||
for (CurrentY = 0; CurrentY < ScreenBuffer->ScreenBufferSize.Y && CurrentY < Size.Y; CurrentY++)
|
||||
|
|
|
@ -363,7 +363,7 @@ ReadChars(IN PGET_INPUT_INFO InputInfo,
|
|||
Buffer = ReadConsoleRequest->Buffer;
|
||||
}
|
||||
|
||||
DPRINT1("Calling ConDrvReadConsole(%wZ)\n", &ExeName);
|
||||
DPRINT("Calling ConDrvReadConsole(%wZ)\n", &ExeName);
|
||||
Status = ConDrvReadConsole(InputBuffer->Header.Console,
|
||||
InputBuffer,
|
||||
&ExeName,
|
||||
|
@ -372,7 +372,7 @@ ReadChars(IN PGET_INPUT_INFO InputInfo,
|
|||
&ReadControl,
|
||||
ReadConsoleRequest->NumBytes / CharSize, // NrCharactersToRead
|
||||
&NrCharactersRead);
|
||||
DPRINT1("ConDrvReadConsole returned (%d ; Status = 0x%08x)\n",
|
||||
DPRINT("ConDrvReadConsole returned (%d ; Status = 0x%08x)\n",
|
||||
NrCharactersRead, Status);
|
||||
|
||||
// ReadConsoleRequest->ControlKeyState = ReadControl.dwControlKeyState;
|
||||
|
|
|
@ -61,7 +61,7 @@ InsertConsole(OUT PHANDLE Handle,
|
|||
|
||||
/* All went right, so add the console to the list */
|
||||
ConSrvLockConsoleListExclusive();
|
||||
DPRINT1("Insert in the list\n");
|
||||
DPRINT("Insert in the list\n");
|
||||
|
||||
if (ConsoleList)
|
||||
{
|
||||
|
@ -73,7 +73,7 @@ InsertConsole(OUT PHANDLE Handle,
|
|||
|
||||
if (i >= ConsoleListSize)
|
||||
{
|
||||
DPRINT1("Creation of a new handles table\n");
|
||||
DPRINT("Creation of a new handles table\n");
|
||||
/* Allocate a new handles table */
|
||||
Block = ConsoleAllocHeap(HEAP_ZERO_MEMORY,
|
||||
(ConsoleListSize +
|
||||
|
@ -476,7 +476,7 @@ Finish:
|
|||
|
||||
// ConsoleInitInfo->ConsoleStartInfo->IconIndex = 0;
|
||||
}
|
||||
DPRINT1("IconPath = '%S' ; IconIndex = %lu\n",
|
||||
DPRINT("IconPath = '%S' ; IconIndex = %lu\n",
|
||||
IconPath, ConsoleInitInfo->ConsoleStartInfo->IconIndex);
|
||||
if (IconPath && *IconPath)
|
||||
{
|
||||
|
@ -486,7 +486,7 @@ Finish:
|
|||
&hIcon,
|
||||
&hIconSm,
|
||||
1);
|
||||
DPRINT1("hIcon = 0x%p ; hIconSm = 0x%p\n", hIcon, hIconSm);
|
||||
DPRINT("hIcon = 0x%p ; hIconSm = 0x%p\n", hIcon, hIconSm);
|
||||
if (hIcon != NULL) ConsoleInitInfo->ConsoleStartInfo->hIcon = hIcon;
|
||||
if (hIconSm != NULL) ConsoleInitInfo->ConsoleStartInfo->hIconSm = hIconSm;
|
||||
}
|
||||
|
|
|
@ -286,7 +286,7 @@ SendMenuEvent(PCONSRV_CONSOLE Console, UINT CmdId)
|
|||
{
|
||||
INPUT_RECORD er;
|
||||
|
||||
DPRINT1("Menu item ID: %d\n", CmdId);
|
||||
DPRINT("Menu item ID: %d\n", CmdId);
|
||||
|
||||
if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return;
|
||||
|
||||
|
|
|
@ -181,7 +181,7 @@ GuiConsoleSwitchFullScreen(PGUI_CONSOLE_DATA GuiData)
|
|||
|
||||
/* Switch to full-screen or to windowed mode */
|
||||
FullScreen = !GuiData->GuiInfo.FullScreen;
|
||||
DPRINT1("GuiConsoleSwitchFullScreen - Switch to %s ...\n",
|
||||
DPRINT("GuiConsoleSwitchFullScreen - Switch to %s ...\n",
|
||||
(FullScreen ? "full-screen" : "windowed mode"));
|
||||
|
||||
SwitchFullScreen(GuiData, FullScreen);
|
||||
|
|
|
@ -675,7 +675,7 @@ GuiSetActiveScreenBuffer(IN OUT PFRONTEND This)
|
|||
hPalette = ActiveBuffer->PaletteHandle;
|
||||
}
|
||||
|
||||
DPRINT1("GuiSetActiveScreenBuffer using palette 0x%p\n", hPalette);
|
||||
DPRINT("GuiSetActiveScreenBuffer using palette 0x%p\n", hPalette);
|
||||
|
||||
/* Set the new palette for the framebuffer */
|
||||
SelectPalette(GuiData->hMemDC, hPalette, FALSE);
|
||||
|
|
|
@ -587,7 +587,7 @@ CSR_API(SrvSetConsoleCommandHistoryMode)
|
|||
PCONSOLE_SETHISTORYMODE SetHistoryModeRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetHistoryModeRequest;
|
||||
PCONSRV_CONSOLE Console;
|
||||
|
||||
DPRINT1("SrvSetConsoleCommandHistoryMode(Mode = %d) is not yet implemented\n",
|
||||
DPRINT("SrvSetConsoleCommandHistoryMode(Mode = %d) is not yet implemented\n",
|
||||
SetHistoryModeRequest->Mode);
|
||||
|
||||
Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process),
|
||||
|
|
Loading…
Reference in a new issue