Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 06:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CONSRV]

Browse source 
Shut-up almost all the dprints.

svn path=/branches/ros-csrss/; revision=58689
This commit is contained in:
Hermès Bélusca-Maïto 2013-04-06 13:40:34 +00:00
parent 431cf24bb1
commit cae17bc374
4 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

18
win32ss/user/consrv/console.c
View file

@ -544,15 +544,15 @@ ConSrvInitConsole(OUT PCONSOLE* NewConsole,
} }
} }
DPRINT1("Terminal initialized\n"); DPRINT("Terminal initialized\n");
/* 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");
InsertTailList(&ConsoleList, &Console->Entry); InsertTailList(&ConsoleList, &Console->Entry);
/* The initialization is finished */ /* The initialization is finished */
DPRINT1("Change state\n"); DPRINT("Change state\n");
Console->State = CONSOLE_RUNNING; Console->State = CONSOLE_RUNNING;
/* Unlock the console */ /* Unlock the console */
@ -563,7 +563,7 @@ ConSrvInitConsole(OUT PCONSOLE* NewConsole,
/* Copy buffer contents to screen */ /* Copy buffer contents to screen */
ConioDrawConsole(Console); ConioDrawConsole(Console);
DPRINT1("Console drawn\n"); DPRINT("Console drawn\n");
/* Return the newly created console to the caller and a success code too */ /* Return the newly created console to the caller and a success code too */
*NewConsole = Console; *NewConsole = Console;
@ -576,7 +576,7 @@ ConSrvDeleteConsole(PCONSOLE Console)
PLIST_ENTRY CurrentEntry; PLIST_ENTRY CurrentEntry;
ConsoleInput* Event; ConsoleInput* Event;
DPRINT1("ConSrvDeleteConsole\n"); DPRINT("ConSrvDeleteConsole\n");
/* /*
* Forbid validation of any console by other threads * Forbid validation of any console by other threads
@ -683,14 +683,14 @@ ConSrvDeleteConsole(PCONSOLE Console)
RtlFreeUnicodeString(&Console->Title); RtlFreeUnicodeString(&Console->Title);
IntDeleteAllAliases(Console->Aliases); IntDeleteAllAliases(Console->Aliases);
DPRINT1("ConSrvDeleteConsole - Unlocking\n"); DPRINT("ConSrvDeleteConsole - Unlocking\n");
LeaveCriticalSection(&Console->Lock); LeaveCriticalSection(&Console->Lock);
DPRINT1("ConSrvDeleteConsole - Destroying lock\n"); DPRINT("ConSrvDeleteConsole - Destroying lock\n");
DeleteCriticalSection(&Console->Lock); DeleteCriticalSection(&Console->Lock);
DPRINT1("ConSrvDeleteConsole - Lock destroyed ; freeing console\n"); DPRINT("ConSrvDeleteConsole - Lock destroyed ; freeing console\n");
RtlFreeHeap(ConSrvHeap, 0, Console); RtlFreeHeap(ConSrvHeap, 0, Console);
DPRINT1("ConSrvDeleteConsole - Console freed\n"); DPRINT("ConSrvDeleteConsole - Console freed\n");
/* Unlock the console list and return */ /* Unlock the console list and return */
ConSrvUnlockConsoleList(); ConSrvUnlockConsoleList();

36
win32ss/user/consrv/frontends/gui/guiterm.c
View file

@ -375,7 +375,7 @@ GuiConsoleHandleNcCreate(HWND hWnd, LPCREATESTRUCTW Create)
TEXTMETRICW Metrics; TEXTMETRICW Metrics;
SIZE CharSize; SIZE CharSize;
DPRINT1("GuiConsoleHandleNcCreate\n"); DPRINT("GuiConsoleHandleNcCreate\n");
if (NULL == GuiData) if (NULL == GuiData)
{ {
@ -459,7 +459,7 @@ GuiConsoleHandleNcCreate(HWND hWnd, LPCREATESTRUCTW Create)
SetTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER, CONGUI_UPDATE_TIME, NULL); SetTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER, CONGUI_UPDATE_TIME, NULL);
GuiConsoleCreateSysMenu(GuiData->hWindow); GuiConsoleCreateSysMenu(GuiData->hWindow);
DPRINT1("GuiConsoleHandleNcCreate - setting start event\n"); DPRINT("GuiConsoleHandleNcCreate - setting start event\n");
SetEvent(GuiData->hGuiInitEvent); SetEvent(GuiData->hGuiInitEvent);
return (BOOL)DefWindowProcW(GuiData->hWindow, WM_NCCREATE, 0, (LPARAM)Create); return (BOOL)DefWindowProcW(GuiData->hWindow, WM_NCCREATE, 0, (LPARAM)Create);
@ -1767,16 +1767,16 @@ GuiConsoleNotifyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
WindowCount++; WindowCount++;
SetWindowLongW(hWnd, GWL_USERDATA, WindowCount); SetWindowLongW(hWnd, GWL_USERDATA, WindowCount);
DPRINT1("Set icons via PM_CREATE_CONSOLE\n"); DPRINT("Set icons via PM_CREATE_CONSOLE\n");
if (GuiData->hIcon == NULL) if (GuiData->hIcon == NULL)
{ {
DPRINT1("Not really /o\\...\n"); DPRINT("Not really /o\\...\n");
GuiData->hIcon = ghDefaultIcon; GuiData->hIcon = ghDefaultIcon;
GuiData->hIconSm = ghDefaultIconSm; GuiData->hIconSm = ghDefaultIconSm;
} }
else if (GuiData->hIcon != ghDefaultIcon) else if (GuiData->hIcon != ghDefaultIcon)
{ {
DPRINT1("Yes \\o/\n"); DPRINT("Yes \\o/\n");
SendMessageW(GuiData->hWindow, WM_SETICON, ICON_BIG, (LPARAM)GuiData->hIcon); SendMessageW(GuiData->hWindow, WM_SETICON, ICON_BIG, (LPARAM)GuiData->hIcon);
SendMessageW(GuiData->hWindow, WM_SETICON, ICON_SMALL, (LPARAM)GuiData->hIconSm); SendMessageW(GuiData->hWindow, WM_SETICON, ICON_SMALL, (LPARAM)GuiData->hIconSm);
} }
@ -1790,7 +1790,7 @@ GuiConsoleNotifyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
// ShowWindow(NewWindow, (int)wParam); // ShowWindow(NewWindow, (int)wParam);
ShowWindowAsync(NewWindow, (int)wParam); ShowWindowAsync(NewWindow, (int)wParam);
DPRINT1("Window showed\n"); DPRINT("Window showed\n");
} }
return (LRESULT)NewWindow; return (LRESULT)NewWindow;
@ -1824,7 +1824,7 @@ GuiConsoleNotifyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
NotifyWnd = NULL; NotifyWnd = NULL;
DestroyWindow(hWnd); DestroyWindow(hWnd);
DPRINT1("CONSRV: Going to quit the Gui Thread!!\n"); DPRINT("CONSRV: Going to quit the Gui Thread!!\n");
PostQuitMessage(0); PostQuitMessage(0);
} }
} }
@ -1876,7 +1876,7 @@ GuiConsoleGuiThread(PVOID Data)
DispatchMessageW(&msg); DispatchMessageW(&msg);
} }
DPRINT1("CONSRV: Quit the Gui Thread!!\n"); DPRINT("CONSRV: Quit the Gui Thread!!\n");
PrivateCsrssManualGuiCheck(-1); PrivateCsrssManualGuiCheck(-1);
return 1; return 1;
@ -2004,16 +2004,16 @@ GuiCleanupConsole(PCONSOLE Console)
SendMessageW(NotifyWnd, PM_DESTROY_CONSOLE, 0, (LPARAM)GuiData); SendMessageW(NotifyWnd, PM_DESTROY_CONSOLE, 0, (LPARAM)GuiData);
DPRINT1("Destroying icons !! - GuiData->hIcon = 0x%p ; ghDefaultIcon = 0x%p ; GuiData->hIconSm = 0x%p ; ghDefaultIconSm = 0x%p\n", DPRINT("Destroying icons !! - GuiData->hIcon = 0x%p ; ghDefaultIcon = 0x%p ; GuiData->hIconSm = 0x%p ; ghDefaultIconSm = 0x%p\n",
GuiData->hIcon, ghDefaultIcon, GuiData->hIconSm, ghDefaultIconSm); GuiData->hIcon, ghDefaultIcon, GuiData->hIconSm, ghDefaultIconSm);
if (GuiData->hIcon != NULL && GuiData->hIcon != ghDefaultIcon) if (GuiData->hIcon != NULL && GuiData->hIcon != ghDefaultIcon)
{ {
DPRINT1("Destroy hIcon\n"); DPRINT("Destroy hIcon\n");
DestroyIcon(GuiData->hIcon); DestroyIcon(GuiData->hIcon);
} }
if (GuiData->hIconSm != NULL && GuiData->hIconSm != ghDefaultIconSm) if (GuiData->hIconSm != NULL && GuiData->hIconSm != ghDefaultIconSm)
{ {
DPRINT1("Destroy hIconSm\n"); DPRINT("Destroy hIconSm\n");
DestroyIcon(GuiData->hIconSm); DestroyIcon(GuiData->hIconSm);
} }
@ -2021,7 +2021,7 @@ GuiCleanupConsole(PCONSOLE Console)
DeleteCriticalSection(&GuiData->Lock); DeleteCriticalSection(&GuiData->Lock);
RtlFreeHeap(ConSrvHeap, 0, GuiData); RtlFreeHeap(ConSrvHeap, 0, GuiData);
DPRINT1("Quit GuiCleanupConsole\n"); DPRINT("Quit GuiCleanupConsole\n");
} }
static VOID WINAPI static VOID WINAPI
@ -2306,7 +2306,7 @@ GuiChangeIcon(PCONSOLE Console, HICON hWindowIcon)
GuiData->hIcon = hIcon; GuiData->hIcon = hIcon;
GuiData->hIconSm = hIconSm; GuiData->hIconSm = hIconSm;
DPRINT1("Set icons in GuiChangeIcon\n"); DPRINT("Set icons in GuiChangeIcon\n");
PostMessageW(GuiData->hWindow, WM_SETICON, ICON_BIG, (LPARAM)GuiData->hIcon); PostMessageW(GuiData->hWindow, WM_SETICON, ICON_BIG, (LPARAM)GuiData->hIcon);
PostMessageW(GuiData->hWindow, WM_SETICON, ICON_SMALL, (LPARAM)GuiData->hIconSm); PostMessageW(GuiData->hWindow, WM_SETICON, ICON_SMALL, (LPARAM)GuiData->hIconSm);
} }
@ -2439,7 +2439,7 @@ GuiInitConsole(PCONSOLE Console,
IconPath = ConsoleStartInfo->AppPath; IconPath = ConsoleStartInfo->AppPath;
IconIndex = 0; IconIndex = 0;
} }
DPRINT1("IconPath = %S ; IconIndex = %lu\n", (IconPath ? IconPath : L"n/a"), IconIndex); DPRINT("IconPath = %S ; IconIndex = %lu\n", (IconPath ? IconPath : L"n/a"), IconIndex);
if (IconPath) if (IconPath)
{ {
HICON hIcon = NULL, hIconSm = NULL; HICON hIcon = NULL, hIconSm = NULL;
@ -2448,10 +2448,10 @@ GuiInitConsole(PCONSOLE Console,
&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) if (hIcon != NULL)
{ {
DPRINT1("Effectively set the icons\n"); DPRINT("Effectively set the icons\n");
GuiData->hIcon = hIcon; GuiData->hIcon = hIcon;
GuiData->hIconSm = hIconSm; GuiData->hIconSm = hIconSm;
} }
@ -2470,14 +2470,14 @@ GuiInitConsole(PCONSOLE Console,
/* Wait until initialization has finished */ /* Wait until initialization has finished */
WaitForSingleObject(GuiData->hGuiInitEvent, INFINITE); WaitForSingleObject(GuiData->hGuiInitEvent, INFINITE);
DPRINT1("OK we created the console window\n"); DPRINT("OK we created the console window\n");
CloseHandle(GuiData->hGuiInitEvent); CloseHandle(GuiData->hGuiInitEvent);
GuiData->hGuiInitEvent = NULL; GuiData->hGuiInitEvent = NULL;
/* Check whether we really succeeded in initializing the terminal window */ /* Check whether we really succeeded in initializing the terminal window */
if (GuiData->hWindow == NULL) if (GuiData->hWindow == NULL)
{ {
DPRINT1("GuiInitConsole - We failed at creating a new terminal window\n"); DPRINT("GuiInitConsole - We failed at creating a new terminal window\n");
// ConioCleanupConsole(Console); // ConioCleanupConsole(Console);
GuiCleanupConsole(Console); GuiCleanupConsole(Console);
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;

8
win32ss/user/consrv/handle.c
View file

@ -94,7 +94,7 @@ ConSrvCloseHandleEntry(PCONSOLE_IO_HANDLE Entry)
} }
else if (Object->Type == CONIO_INPUT_BUFFER_MAGIC) else if (Object->Type == CONIO_INPUT_BUFFER_MAGIC)
{ {
DPRINT1("Closing the input buffer\n"); DPRINT("Closing the input buffer\n");
} }
} }
@ -533,14 +533,14 @@ ConSrvRemoveConsole(PCONSOLE_PROCESS_DATA ProcessData)
{ {
PCONSOLE Console = ProcessData->Console; PCONSOLE Console = ProcessData->Console;
DPRINT1("ConSrvRemoveConsole\n"); DPRINT("ConSrvRemoveConsole\n");
RtlEnterCriticalSection(&ProcessData->HandleTableLock); RtlEnterCriticalSection(&ProcessData->HandleTableLock);
/* Validate and lock the console */ /* Validate and lock the console */
if (ConSrvValidateConsole(Console, CONSOLE_RUNNING, TRUE)) if (ConSrvValidateConsole(Console, CONSOLE_RUNNING, TRUE))
{ {
DPRINT1("ConSrvRemoveConsole - Locking OK\n"); DPRINT("ConSrvRemoveConsole - Locking OK\n");
/* Close all console handles and free the handles table */ /* Close all console handles and free the handles table */
ConSrvFreeHandlesTable(ProcessData); ConSrvFreeHandlesTable(ProcessData);
@ -555,7 +555,7 @@ ConSrvRemoveConsole(PCONSOLE_PROCESS_DATA ProcessData)
ConioRefreshInternalInfo(Console); ConioRefreshInternalInfo(Console);
/* Release the console */ /* Release the console */
DPRINT1("ConSrvRemoveConsole - Decrement Console->ReferenceCount = %lu\n", Console->ReferenceCount); DPRINT("ConSrvRemoveConsole - Decrement Console->ReferenceCount = %lu\n", Console->ReferenceCount);
ConSrvReleaseConsole(Console, TRUE); ConSrvReleaseConsole(Console, TRUE);
//CloseHandle(ProcessData->ConsoleEvent); //CloseHandle(ProcessData->ConsoleEvent);
//ProcessData->ConsoleEvent = NULL; //ProcessData->ConsoleEvent = NULL;

6
win32ss/user/consrv/init.c
View file

@ -398,7 +398,7 @@ ConSrvConnect(IN PCSR_PROCESS CsrProcess,
if (!ConnectInfo->Console || if (!ConnectInfo->Console ||
ConnectInfo->Console != ProcessData->ParentConsole) ConnectInfo->Console != ProcessData->ParentConsole)
{ {
DPRINT1("ConSrvConnect - Allocate a new console\n"); DPRINT("ConSrvConnect - Allocate a new console\n");
/* /*
* We are about to create a new console. However when ConSrvNewProcess * We are about to create a new console. However when ConSrvNewProcess
@ -426,7 +426,7 @@ ConSrvConnect(IN PCSR_PROCESS CsrProcess,
} }
else /* We inherit it from the parent */ else /* We inherit it from the parent */
{ {
DPRINT1("ConSrvConnect - Reuse current (parent's) console\n"); DPRINT("ConSrvConnect - Reuse current (parent's) console\n");
/* Reuse our current console */ /* Reuse our current console */
Status = ConSrvInheritConsole(ProcessData, Status = ConSrvInheritConsole(ProcessData,
@ -470,7 +470,7 @@ ConSrvDisconnect(PCSR_PROCESS Process)
if ( ProcessData->Console != NULL || if ( ProcessData->Console != NULL ||
ProcessData->HandleTable != NULL ) ProcessData->HandleTable != NULL )
{ {
DPRINT1("ConSrvDisconnect - calling ConSrvRemoveConsole\n"); DPRINT("ConSrvDisconnect - calling ConSrvRemoveConsole\n");
ConSrvRemoveConsole(ProcessData); ConSrvRemoveConsole(ProcessData);
} }