}
}
- DPRINT1("Terminal initialized\n");
+ DPRINT("Terminal initialized\n");
/* All went right, so add the console to the list */
ConSrvLockConsoleListExclusive();
- DPRINT1("Insert in the list\n");
+ DPRINT("Insert in the list\n");
InsertTailList(&ConsoleList, &Console->Entry);
/* The initialization is finished */
- DPRINT1("Change state\n");
+ DPRINT("Change state\n");
Console->State = CONSOLE_RUNNING;
/* Unlock the console */
/* Copy buffer contents to screen */
ConioDrawConsole(Console);
- DPRINT1("Console drawn\n");
+ DPRINT("Console drawn\n");
/* Return the newly created console to the caller and a success code too */
*NewConsole = Console;
PLIST_ENTRY CurrentEntry;
ConsoleInput* Event;
- DPRINT1("ConSrvDeleteConsole\n");
+ DPRINT("ConSrvDeleteConsole\n");
/*
* Forbid validation of any console by other threads
RtlFreeUnicodeString(&Console->Title);
IntDeleteAllAliases(Console->Aliases);
- DPRINT1("ConSrvDeleteConsole - Unlocking\n");
+ DPRINT("ConSrvDeleteConsole - Unlocking\n");
LeaveCriticalSection(&Console->Lock);
- DPRINT1("ConSrvDeleteConsole - Destroying lock\n");
+ DPRINT("ConSrvDeleteConsole - Destroying lock\n");
DeleteCriticalSection(&Console->Lock);
- DPRINT1("ConSrvDeleteConsole - Lock destroyed ; freeing console\n");
+ DPRINT("ConSrvDeleteConsole - Lock destroyed ; freeing console\n");
RtlFreeHeap(ConSrvHeap, 0, Console);
- DPRINT1("ConSrvDeleteConsole - Console freed\n");
+ DPRINT("ConSrvDeleteConsole - Console freed\n");
/* Unlock the console list and return */
ConSrvUnlockConsoleList();
TEXTMETRICW Metrics;
SIZE CharSize;
- DPRINT1("GuiConsoleHandleNcCreate\n");
+ DPRINT("GuiConsoleHandleNcCreate\n");
if (NULL == GuiData)
{
SetTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER, CONGUI_UPDATE_TIME, NULL);
GuiConsoleCreateSysMenu(GuiData->hWindow);
- DPRINT1("GuiConsoleHandleNcCreate - setting start event\n");
+ DPRINT("GuiConsoleHandleNcCreate - setting start event\n");
SetEvent(GuiData->hGuiInitEvent);
return (BOOL)DefWindowProcW(GuiData->hWindow, WM_NCCREATE, 0, (LPARAM)Create);
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)
{
- DPRINT1("Not really /o\\...\n");
+ DPRINT("Not really /o\\...\n");
GuiData->hIcon = ghDefaultIcon;
GuiData->hIconSm = ghDefaultIconSm;
}
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_SMALL, (LPARAM)GuiData->hIconSm);
}
// ShowWindow(NewWindow, (int)wParam);
ShowWindowAsync(NewWindow, (int)wParam);
- DPRINT1("Window showed\n");
+ DPRINT("Window showed\n");
}
return (LRESULT)NewWindow;
{
NotifyWnd = NULL;
DestroyWindow(hWnd);
- DPRINT1("CONSRV: Going to quit the Gui Thread!!\n");
+ DPRINT("CONSRV: Going to quit the Gui Thread!!\n");
PostQuitMessage(0);
}
}
DispatchMessageW(&msg);
}
- DPRINT1("CONSRV: Quit the Gui Thread!!\n");
+ DPRINT("CONSRV: Quit the Gui Thread!!\n");
PrivateCsrssManualGuiCheck(-1);
return 1;
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);
if (GuiData->hIcon != NULL && GuiData->hIcon != ghDefaultIcon)
{
- DPRINT1("Destroy hIcon\n");
+ DPRINT("Destroy hIcon\n");
DestroyIcon(GuiData->hIcon);
}
if (GuiData->hIconSm != NULL && GuiData->hIconSm != ghDefaultIconSm)
{
- DPRINT1("Destroy hIconSm\n");
+ DPRINT("Destroy hIconSm\n");
DestroyIcon(GuiData->hIconSm);
}
DeleteCriticalSection(&GuiData->Lock);
RtlFreeHeap(ConSrvHeap, 0, GuiData);
- DPRINT1("Quit GuiCleanupConsole\n");
+ DPRINT("Quit GuiCleanupConsole\n");
}
static VOID WINAPI
GuiData->hIcon = hIcon;
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_SMALL, (LPARAM)GuiData->hIconSm);
}
IconPath = ConsoleStartInfo->AppPath;
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)
{
HICON hIcon = NULL, hIconSm = NULL;
&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)
{
- DPRINT1("Effectively set the icons\n");
+ DPRINT("Effectively set the icons\n");
GuiData->hIcon = hIcon;
GuiData->hIconSm = hIconSm;
}
/* Wait until initialization has finished */
WaitForSingleObject(GuiData->hGuiInitEvent, INFINITE);
- DPRINT1("OK we created the console window\n");
+ DPRINT("OK we created the console window\n");
CloseHandle(GuiData->hGuiInitEvent);
GuiData->hGuiInitEvent = NULL;
/* Check whether we really succeeded in initializing the terminal window */
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);
GuiCleanupConsole(Console);
return STATUS_UNSUCCESSFUL;
}
else if (Object->Type == CONIO_INPUT_BUFFER_MAGIC)
{
- DPRINT1("Closing the input buffer\n");
+ DPRINT("Closing the input buffer\n");
}
}
{
PCONSOLE Console = ProcessData->Console;
- DPRINT1("ConSrvRemoveConsole\n");
+ DPRINT("ConSrvRemoveConsole\n");
RtlEnterCriticalSection(&ProcessData->HandleTableLock);
/* Validate and lock the console */
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 */
ConSrvFreeHandlesTable(ProcessData);
ConioRefreshInternalInfo(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);
//CloseHandle(ProcessData->ConsoleEvent);
//ProcessData->ConsoleEvent = NULL;