Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 00:45:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DPRINT12345]

Browse source 
Silence more annoying DPRINTs, and add one that hopefully helps to debug a problem.

svn path=/trunk/; revision=65334
This commit is contained in:
Timo Kreuzer 2014-11-08 22:19:07 +00:00
parent 6990cd2172
commit 612333a5c0
12 changed files with 40 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
reactos/dll/win32/kernel32/client/console/alias.c
View file

@ -124,7 +124,7 @@ AddConsoleAliasW(LPCWSTR lpSource,
USHORT SourceBufferLength = (USHORT)wcslen(lpSource) * sizeof(WCHAR); USHORT SourceBufferLength = (USHORT)wcslen(lpSource) * sizeof(WCHAR);
USHORT TargetBufferLength = (USHORT)(lpTarget ? wcslen(lpTarget) * sizeof(WCHAR) : 0); 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); lpSource, lpTarget, lpExeName);
return IntAddConsoleAlias(lpSource, return IntAddConsoleAlias(lpSource,
@ -149,7 +149,7 @@ AddConsoleAliasA(LPCSTR lpSource,
USHORT SourceBufferLength = (USHORT)strlen(lpSource) * sizeof(CHAR); USHORT SourceBufferLength = (USHORT)strlen(lpSource) * sizeof(CHAR);
USHORT TargetBufferLength = (USHORT)(lpTarget ? strlen(lpTarget) * sizeof(CHAR) : 0); 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); lpSource, lpTarget, lpExeName);
return IntAddConsoleAlias(lpSource, return IntAddConsoleAlias(lpSource,
@ -262,7 +262,7 @@ GetConsoleAliasW(LPWSTR lpSource,
DWORD TargetBufferLength, DWORD TargetBufferLength,
LPWSTR lpExeName) LPWSTR lpExeName)
{ {
DPRINT1("GetConsoleAliasW entered with lpSource '%S' lpExeName '%S'\n", DPRINT("GetConsoleAliasW entered with lpSource '%S' lpExeName '%S'\n",
lpSource, lpExeName); lpSource, lpExeName);
return IntGetConsoleAlias(lpSource, return IntGetConsoleAlias(lpSource,
@ -285,7 +285,7 @@ GetConsoleAliasA(LPSTR lpSource,
DWORD TargetBufferLength, DWORD TargetBufferLength,
LPSTR lpExeName) LPSTR lpExeName)
{ {
DPRINT1("GetConsoleAliasA entered with lpSource '%s' lpExeName '%s'\n", DPRINT("GetConsoleAliasA entered with lpSource '%s' lpExeName '%s'\n",
lpSource, lpExeName); lpSource, lpExeName);
return IntGetConsoleAlias(lpSource, return IntGetConsoleAlias(lpSource,
@ -377,7 +377,7 @@ GetConsoleAliasesW(LPWSTR AliasBuffer,
DWORD AliasBufferLength, DWORD AliasBufferLength,
LPWSTR ExeName) LPWSTR ExeName)
{ {
DPRINT1("GetConsoleAliasesW entered with lpExeName '%S'\n", DPRINT("GetConsoleAliasesW entered with lpExeName '%S'\n",
ExeName); ExeName);
return IntGetConsoleAliases(AliasBuffer, return IntGetConsoleAliases(AliasBuffer,
@ -397,7 +397,7 @@ GetConsoleAliasesA(LPSTR AliasBuffer,
DWORD AliasBufferLength, DWORD AliasBufferLength,
LPSTR ExeName) LPSTR ExeName)
{ {
DPRINT1("GetConsoleAliasesA entered with lpExeName '%s'\n", DPRINT("GetConsoleAliasesA entered with lpExeName '%s'\n",
ExeName); ExeName);
return IntGetConsoleAliases(AliasBuffer, return IntGetConsoleAliases(AliasBuffer,
@ -535,7 +535,7 @@ DECLSPEC_HOTPATCH
GetConsoleAliasExesW(LPWSTR lpExeNameBuffer, GetConsoleAliasExesW(LPWSTR lpExeNameBuffer,
DWORD ExeNameBufferLength) DWORD ExeNameBufferLength)
{ {
DPRINT1("GetConsoleAliasExesW called\n"); DPRINT("GetConsoleAliasExesW called\n");
return IntGetConsoleAliasExes(lpExeNameBuffer, ExeNameBufferLength, TRUE); return IntGetConsoleAliasExes(lpExeNameBuffer, ExeNameBufferLength, TRUE);
} }
@ -549,7 +549,7 @@ DECLSPEC_HOTPATCH
GetConsoleAliasExesA(LPSTR lpExeNameBuffer, GetConsoleAliasExesA(LPSTR lpExeNameBuffer,
DWORD ExeNameBufferLength) DWORD ExeNameBufferLength)
{ {
DPRINT1("GetConsoleAliasExesA called\n"); DPRINT("GetConsoleAliasExesA called\n");
return IntGetConsoleAliasExes(lpExeNameBuffer, ExeNameBufferLength, FALSE); return IntGetConsoleAliasExes(lpExeNameBuffer, ExeNameBufferLength, FALSE);
} }
@ -585,7 +585,7 @@ WINAPI
DECLSPEC_HOTPATCH DECLSPEC_HOTPATCH
GetConsoleAliasExesLengthW(VOID) GetConsoleAliasExesLengthW(VOID)
{ {
DPRINT1("GetConsoleAliasExesLengthW called\n"); DPRINT("GetConsoleAliasExesLengthW called\n");
return IntGetConsoleAliasExesLength(TRUE); return IntGetConsoleAliasExesLength(TRUE);
} }
@ -598,7 +598,7 @@ WINAPI
DECLSPEC_HOTPATCH DECLSPEC_HOTPATCH
GetConsoleAliasExesLengthA(VOID) GetConsoleAliasExesLengthA(VOID)
{ {
DPRINT1("GetConsoleAliasExesLengthA called\n"); DPRINT("GetConsoleAliasExesLengthA called\n");
return IntGetConsoleAliasExesLength(FALSE); return IntGetConsoleAliasExesLength(FALSE);
} }

2
reactos/dll/win32/kernel32/client/proc.c
View file

@ -4035,7 +4035,7 @@ StartScan:
if (lpCurrentDirectory) if (lpCurrentDirectory)
{ {
/* Allocate a buffer so we can keep a Unicode copy */ /* 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(), CurrentDirectory = RtlAllocateHeap(RtlGetProcessHeap(),
0, 0,
(MAX_PATH * sizeof(WCHAR)) + (MAX_PATH * sizeof(WCHAR)) +

8
reactos/win32ss/gdi/ntgdi/freetype.c
View file

@ -3719,7 +3719,7 @@ GreExtTextOutW(
DestRect.bottom = lprc->bottom + dc->ptlDCOrig.y; DestRect.bottom = lprc->bottom + dc->ptlDCOrig.y;
} }
MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom);
IntEngMaskBlt( if (!IntEngMaskBlt(
SurfObj, SurfObj,
SourceGlyphSurf, SourceGlyphSurf,
&dc->co.ClipObj, &dc->co.ClipObj,
@ -3728,7 +3728,11 @@ GreExtTextOutW(
&DestRect, &DestRect,
(PPOINTL)&MaskRect, (PPOINTL)&MaskRect,
&dc->eboText.BrushObject, &dc->eboText.BrushObject,
&BrushOrigin); &BrushOrigin))
{
DPRINT1("Failed to MaskBlt a glyph!\n");
}
MouseSafetyOnDrawEnd(dc->ppdev) ; MouseSafetyOnDrawEnd(dc->ppdev) ;
EngUnlockSurface(SourceGlyphSurf); EngUnlockSurface(SourceGlyphSurf);

12
reactos/win32ss/user/winsrv/consrv/alias.c
View file

@ -454,7 +454,7 @@ CSR_API(SrvAddConsoleAlias)
PALIAS_ENTRY Entry; PALIAS_ENTRY Entry;
PVOID lpTarget; PVOID lpTarget;
DPRINT1("SrvAddConsoleAlias entered ApiMessage %p\n", ApiMessage); DPRINT("SrvAddConsoleAlias entered ApiMessage %p\n", ApiMessage);
if ( !CsrValidateMessageBuffer(ApiMessage, if ( !CsrValidateMessageBuffer(ApiMessage,
(PVOID*)&ConsoleAliasRequest->Source, (PVOID*)&ConsoleAliasRequest->Source,
@ -545,7 +545,7 @@ CSR_API(SrvGetConsoleAlias)
UINT Length; UINT Length;
PVOID lpTarget; PVOID lpTarget;
DPRINT1("SrvGetConsoleAlias entered ApiMessage %p\n", ApiMessage); DPRINT("SrvGetConsoleAlias entered ApiMessage %p\n", ApiMessage);
if ( !CsrValidateMessageBuffer(ApiMessage, if ( !CsrValidateMessageBuffer(ApiMessage,
(PVOID*)&ConsoleAliasRequest->Source, (PVOID*)&ConsoleAliasRequest->Source,
@ -635,7 +635,7 @@ CSR_API(SrvGetConsoleAliases)
ULONG BytesWritten = 0; ULONG BytesWritten = 0;
PALIAS_HEADER Header; PALIAS_HEADER Header;
DPRINT1("SrvGetConsoleAliases entered ApiMessage %p\n", ApiMessage); DPRINT("SrvGetConsoleAliases entered ApiMessage %p\n", ApiMessage);
if ( !CsrValidateMessageBuffer(ApiMessage, if ( !CsrValidateMessageBuffer(ApiMessage,
(PVOID)&GetAllAliasesRequest->ExeName, (PVOID)&GetAllAliasesRequest->ExeName,
@ -740,7 +740,7 @@ CSR_API(SrvGetConsoleAliasesLength)
PCONSRV_CONSOLE Console; PCONSRV_CONSOLE Console;
PALIAS_HEADER Header; PALIAS_HEADER Header;
DPRINT1("SrvGetConsoleAliasesLength entered ApiMessage %p\n", ApiMessage); DPRINT("SrvGetConsoleAliasesLength entered ApiMessage %p\n", ApiMessage);
if (!CsrValidateMessageBuffer(ApiMessage, if (!CsrValidateMessageBuffer(ApiMessage,
(PVOID)&GetAllAliasesLengthRequest->ExeName, (PVOID)&GetAllAliasesLengthRequest->ExeName,
@ -781,7 +781,7 @@ CSR_API(SrvGetConsoleAliasExes)
PCONSRV_CONSOLE Console; PCONSRV_CONSOLE Console;
UINT BytesWritten = 0; UINT BytesWritten = 0;
DPRINT1("SrvGetConsoleAliasExes entered\n"); DPRINT("SrvGetConsoleAliasExes entered\n");
if (!CsrValidateMessageBuffer(ApiMessage, if (!CsrValidateMessageBuffer(ApiMessage,
(PVOID*)&GetAliasesExesRequest->ExeNames, (PVOID*)&GetAliasesExesRequest->ExeNames,
@ -867,7 +867,7 @@ CSR_API(SrvGetConsoleAliasExesLength)
PCONSOLE_GETALIASESEXESLENGTH GetAliasesExesLengthRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetAliasesExesLengthRequest; PCONSOLE_GETALIASESEXESLENGTH GetAliasesExesLengthRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetAliasesExesLengthRequest;
PCONSRV_CONSOLE Console; PCONSRV_CONSOLE Console;
DPRINT1("SrvGetConsoleAliasExesLength entered ApiMessage %p\n", ApiMessage); DPRINT("SrvGetConsoleAliasExesLength entered ApiMessage %p\n", ApiMessage);
Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process),
&Console, TRUE); &Console, TRUE);

2
reactos/win32ss/user/winsrv/consrv/condrv/console.c
View file

@ -44,7 +44,7 @@ InsertConsole(IN PCONSOLE Console)
/* All went right, so add the console to the list */ /* All went right, so add the console to the list */
ConDrvLockConsoleListExclusive(); ConDrvLockConsoleListExclusive();
DPRINT1("Insert in the list\n"); DPRINT("Insert in the list\n");
InsertTailList(&ConsoleList, &Console->ListEntry); InsertTailList(&ConsoleList, &Console->ListEntry);
// FIXME: Move this code to the caller function!! // FIXME: Move this code to the caller function!!

2
reactos/win32ss/user/winsrv/consrv/condrv/text.c
View file

@ -294,7 +294,7 @@ ConioResizeBuffer(PCONSOLE Console,
Buffer = ConsoleAllocHeap(HEAP_ZERO_MEMORY, Size.X * Size.Y * sizeof(CHAR_INFO)); Buffer = ConsoleAllocHeap(HEAP_ZERO_MEMORY, Size.X * Size.Y * sizeof(CHAR_INFO));
if (!Buffer) return STATUS_NO_MEMORY; 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; OldBuffer = ScreenBuffer->Buffer;
for (CurrentY = 0; CurrentY < ScreenBuffer->ScreenBufferSize.Y && CurrentY < Size.Y; CurrentY++) for (CurrentY = 0; CurrentY < ScreenBuffer->ScreenBufferSize.Y && CurrentY < Size.Y; CurrentY++)

4
reactos/win32ss/user/winsrv/consrv/coninput.c
View file

@ -363,7 +363,7 @@ ReadChars(IN PGET_INPUT_INFO InputInfo,
Buffer = ReadConsoleRequest->Buffer; Buffer = ReadConsoleRequest->Buffer;
} }
DPRINT1("Calling ConDrvReadConsole(%wZ)\n", &ExeName); DPRINT("Calling ConDrvReadConsole(%wZ)\n", &ExeName);
Status = ConDrvReadConsole(InputBuffer->Header.Console, Status = ConDrvReadConsole(InputBuffer->Header.Console,
InputBuffer, InputBuffer,
&ExeName, &ExeName,
@ -372,7 +372,7 @@ ReadChars(IN PGET_INPUT_INFO InputInfo,
&ReadControl, &ReadControl,
ReadConsoleRequest->NumBytes / CharSize, // NrCharactersToRead ReadConsoleRequest->NumBytes / CharSize, // NrCharactersToRead
&NrCharactersRead); &NrCharactersRead);
DPRINT1("ConDrvReadConsole returned (%d ; Status = 0x%08x)\n", DPRINT("ConDrvReadConsole returned (%d ; Status = 0x%08x)\n",
NrCharactersRead, Status); NrCharactersRead, Status);
// ReadConsoleRequest->ControlKeyState = ReadControl.dwControlKeyState; // ReadConsoleRequest->ControlKeyState = ReadControl.dwControlKeyState;

8
reactos/win32ss/user/winsrv/consrv/console.c
View file

@ -61,7 +61,7 @@ InsertConsole(OUT PHANDLE Handle,
/* All went right, so add the console to the list */ /* All went right, so add the console to the list */
ConSrvLockConsoleListExclusive(); ConSrvLockConsoleListExclusive();
DPRINT1("Insert in the list\n"); DPRINT("Insert in the list\n");
if (ConsoleList) if (ConsoleList)
{ {
@ -73,7 +73,7 @@ InsertConsole(OUT PHANDLE Handle,
if (i >= ConsoleListSize) if (i >= ConsoleListSize)
{ {
DPRINT1("Creation of a new handles table\n"); DPRINT("Creation of a new handles table\n");
/* Allocate a new handles table */ /* Allocate a new handles table */
Block = ConsoleAllocHeap(HEAP_ZERO_MEMORY, Block = ConsoleAllocHeap(HEAP_ZERO_MEMORY,
(ConsoleListSize + (ConsoleListSize +
@ -476,7 +476,7 @@ Finish:
// ConsoleInitInfo->ConsoleStartInfo->IconIndex = 0; // ConsoleInitInfo->ConsoleStartInfo->IconIndex = 0;
} }
DPRINT1("IconPath = '%S' ; IconIndex = %lu\n", DPRINT("IconPath = '%S' ; IconIndex = %lu\n",
IconPath, ConsoleInitInfo->ConsoleStartInfo->IconIndex); IconPath, ConsoleInitInfo->ConsoleStartInfo->IconIndex);
if (IconPath && *IconPath) if (IconPath && *IconPath)
{ {
@ -486,7 +486,7 @@ Finish:
&hIcon, &hIcon,
&hIconSm, &hIconSm,
1); 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 (hIcon != NULL) ConsoleInitInfo->ConsoleStartInfo->hIcon = hIcon;
if (hIconSm != NULL) ConsoleInitInfo->ConsoleStartInfo->hIconSm = hIconSm; if (hIconSm != NULL) ConsoleInitInfo->ConsoleStartInfo->hIconSm = hIconSm;
} }

2
reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
View file

@ -286,7 +286,7 @@ SendMenuEvent(PCONSRV_CONSOLE Console, UINT CmdId)
{ {
INPUT_RECORD er; INPUT_RECORD er;
DPRINT1("Menu item ID: %d\n", CmdId); DPRINT("Menu item ID: %d\n", CmdId);
if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return;

2
reactos/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c
View file

@ -181,7 +181,7 @@ GuiConsoleSwitchFullScreen(PGUI_CONSOLE_DATA GuiData)
/* Switch to full-screen or to windowed mode */ /* Switch to full-screen or to windowed mode */
FullScreen = !GuiData->GuiInfo.FullScreen; FullScreen = !GuiData->GuiInfo.FullScreen;
DPRINT1("GuiConsoleSwitchFullScreen - Switch to %s ...\n", DPRINT("GuiConsoleSwitchFullScreen - Switch to %s ...\n",
(FullScreen ? "full-screen" : "windowed mode")); (FullScreen ? "full-screen" : "windowed mode"));
SwitchFullScreen(GuiData, FullScreen); SwitchFullScreen(GuiData, FullScreen);

2
reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
View file

@ -675,7 +675,7 @@ GuiSetActiveScreenBuffer(IN OUT PFRONTEND This)
hPalette = ActiveBuffer->PaletteHandle; 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 */ /* Set the new palette for the framebuffer */
SelectPalette(GuiData->hMemDC, hPalette, FALSE); SelectPalette(GuiData->hMemDC, hPalette, FALSE);

2
reactos/win32ss/user/winsrv/consrv/history.c
View file

@ -587,7 +587,7 @@ CSR_API(SrvSetConsoleCommandHistoryMode)
PCONSOLE_SETHISTORYMODE SetHistoryModeRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetHistoryModeRequest; PCONSOLE_SETHISTORYMODE SetHistoryModeRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetHistoryModeRequest;
PCONSRV_CONSOLE Console; PCONSRV_CONSOLE Console;
DPRINT1("SrvSetConsoleCommandHistoryMode(Mode = %d) is not yet implemented\n", DPRINT("SrvSetConsoleCommandHistoryMode(Mode = %d) is not yet implemented\n",
SetHistoryModeRequest->Mode); SetHistoryModeRequest->Mode);
Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process),