[tkreuzer] 65334: [DPRINT12345] Silence more annoying DPRINTs, and add one that hopefully helps to debug a problem.
Author: tkreuzer Date: Sat Nov 8 22:19:07 2014 New Revision: 65334
URL: http://svn.reactos.org/svn/reactos?rev=65334&view=rev Log: [DPRINT12345] Silence more annoying DPRINTs, and add one that hopefully helps to debug a problem.
Modified: trunk/reactos/dll/win32/kernel32/client/console/alias.c trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/win32ss/gdi/ntgdi/freetype.c trunk/reactos/win32ss/user/winsrv/consrv/alias.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c trunk/reactos/win32ss/user/winsrv/consrv/coninput.c trunk/reactos/win32ss/user/winsrv/consrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c trunk/reactos/win32ss/user/winsrv/consrv/history.c
Modified: trunk/reactos/dll/win32/kernel32/client/console/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/c... ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/alias.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/alias.c [iso-8859-1] Sat Nov 8 22:19:07 2014 @@ -124,7 +124,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ GetConsoleAliasExesW(LPWSTR lpExeNameBuffer, DWORD ExeNameBufferLength) { - DPRINT1("GetConsoleAliasExesW called\n"); + DPRINT("GetConsoleAliasExesW called\n"); return IntGetConsoleAliasExes(lpExeNameBuffer, ExeNameBufferLength, TRUE); }
@@ -549,7 +549,7 @@ GetConsoleAliasExesA(LPSTR lpExeNameBuffer, DWORD ExeNameBufferLength) { - DPRINT1("GetConsoleAliasExesA called\n"); + DPRINT("GetConsoleAliasExesA called\n"); return IntGetConsoleAliasExes(lpExeNameBuffer, ExeNameBufferLength, FALSE); }
@@ -585,7 +585,7 @@ DECLSPEC_HOTPATCH GetConsoleAliasExesLengthW(VOID) { - DPRINT1("GetConsoleAliasExesLengthW called\n"); + DPRINT("GetConsoleAliasExesLengthW called\n"); return IntGetConsoleAliasExesLength(TRUE); }
@@ -598,7 +598,7 @@ DECLSPEC_HOTPATCH GetConsoleAliasExesLengthA(VOID) { - DPRINT1("GetConsoleAliasExesLengthA called\n"); + DPRINT("GetConsoleAliasExesLengthA called\n"); return IntGetConsoleAliasExesLength(FALSE); }
Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/p... ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sat Nov 8 22:19:07 2014 @@ -4035,7 +4035,7 @@ 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)) +
Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype.... ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sat Nov 8 22:19:07 2014 @@ -2175,7 +2175,7 @@ break; if (needed > cjBuf) return GDI_ERROR; - + get_bezier_glyph_outline(outline, cjBuf, pvBuf); break; } @@ -3367,7 +3367,7 @@
psurf = dc->dclevel.pSurface;
- if(!psurf) + if(!psurf) psurf = psurfDefaultBitmap;
if ((fuOptions & ETO_OPAQUE) && lprc) @@ -3719,7 +3719,7 @@ 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 @@ &DestRect, (PPOINTL)&MaskRect, &dc->eboText.BrushObject, - &BrushOrigin); + &BrushOrigin)) + { + DPRINT1("Failed to MaskBlt a glyph!\n"); + } + MouseSafetyOnDrawEnd(dc->ppdev) ;
EngUnlockSurface(SourceGlyphSurf); @@ -3750,7 +3754,7 @@ Scale = pdcattr->mxWorldToDevice.efM11; if (_FLOATOBJ_Equal0(&Scale)) FLOATOBJ_Set1(&Scale); - + FLOATOBJ_MulLong(&Scale, Dx[i<<DxShift] << 6); // do the shift before multiplying to preserve precision TextLeft += FLOATOBJ_GetLong(&Scale); DPRINT("New TextLeft2: %I64d\n", TextLeft);
Modified: trunk/reactos/win32ss/user/winsrv/consrv/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/alias.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/alias.c [iso-8859-1] Sat Nov 8 22:19:07 2014 @@ -454,7 +454,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ PCONSRV_CONSOLE Console; UINT BytesWritten = 0;
- DPRINT1("SrvGetConsoleAliasExes entered\n"); + DPRINT("SrvGetConsoleAliasExes entered\n");
if (!CsrValidateMessageBuffer(ApiMessage, (PVOID*)&GetAliasesExesRequest->ExeNames, @@ -867,7 +867,7 @@ 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);
Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] Sat Nov 8 22:19:07 2014 @@ -44,7 +44,7 @@ /* 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!!
Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Sat Nov 8 22:19:07 2014 @@ -294,7 +294,7 @@ 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++)
Modified: trunk/reactos/win32ss/user/winsrv/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] Sat Nov 8 22:19:07 2014 @@ -363,7 +363,7 @@ 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 @@ &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;
Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Sat Nov 8 22:19:07 2014 @@ -61,7 +61,7 @@
/* 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 @@
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 + @@ -393,7 +393,7 @@ /* Get a pointer to the IShellLink interface */ IShellLinkW* pshl = NULL; hRes = CoCreateInstance(&CLSID_ShellLink, - NULL, + NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID*)&pshl); @@ -476,8 +476,8 @@
// ConsoleInitInfo->ConsoleStartInfo->IconIndex = 0; } - DPRINT1("IconPath = '%S' ; IconIndex = %lu\n", - IconPath, ConsoleInitInfo->ConsoleStartInfo->IconIndex); + DPRINT("IconPath = '%S' ; IconIndex = %lu\n", + IconPath, ConsoleInitInfo->ConsoleStartInfo->IconIndex); if (IconPath && *IconPath) { HICON hIcon = NULL, hIconSm = NULL; @@ -486,7 +486,7 @@ &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; }
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Sat Nov 8 22:19:07 2014 @@ -286,7 +286,7 @@ { INPUT_RECORD er;
- DPRINT1("Menu item ID: %d\n", CmdId); + DPRINT("Menu item ID: %d\n", CmdId);
if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return;
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c [iso-8859-1] Sat Nov 8 22:19:07 2014 @@ -181,7 +181,7 @@
/* 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);
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Sat Nov 8 22:19:07 2014 @@ -675,7 +675,7 @@ 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);
Modified: trunk/reactos/win32ss/user/winsrv/consrv/history.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/history.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/history.c [iso-8859-1] Sat Nov 8 22:19:07 2014 @@ -587,7 +587,7 @@ 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),
-
tkreuzer＠svn.reactos.org