-/* $Id$
+/* $Id: guiconsole.c 57326 2012-09-18 21:45:00Z akhaldi $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
- * FILE: subsys/csrss/win32csr/guiconsole.c
+ * FILE: win32ss/user/consrv/guiconsole.c
* PURPOSE: Implementation of gui-mode consoles
*/
#include <debug.h>
/* Not defined in any header file */
-extern VOID WINAPI PrivateCsrssManualGuiCheck(LONG Check);
+// extern VOID WINAPI PrivateCsrssManualGuiCheck(LONG Check);
+// From win32ss/user/win32csr/dllmain.c
+VOID
+WINAPI
+PrivateCsrssManualGuiCheck(LONG Check)
+{
+ NtUserCallOneParam(Check, ONEPARAM_ROUTINE_CSRSS_GUICHECK);
+}
/* GLOBALS *******************************************************************/
{
DPRINT1("GuiConsoleNcCreate: CreateFont failed\n");
DeleteCriticalSection(&GuiData->Lock);
- HeapFree(Win32CsrApiHeap, 0, GuiData);
+ HeapFree(ConSrvHeap, 0, GuiData);
return FALSE;
}
Dc = GetDC(hWnd);
DPRINT1("GuiConsoleNcCreate: GetDC failed\n");
DeleteObject(GuiData->Font);
DeleteCriticalSection(&GuiData->Lock);
- HeapFree(Win32CsrApiHeap, 0, GuiData);
+ HeapFree(ConSrvHeap, 0, GuiData);
return FALSE;
}
OldFont = SelectObject(Dc, GuiData->Font);
ReleaseDC(hWnd, Dc);
DeleteObject(GuiData->Font);
DeleteCriticalSection(&GuiData->Lock);
- HeapFree(Win32CsrApiHeap, 0, GuiData);
+ HeapFree(ConSrvHeap, 0, GuiData);
return FALSE;
}
if (! GetTextMetricsW(Dc, &Metrics))
ReleaseDC(hWnd, Dc);
DeleteObject(GuiData->Font);
DeleteCriticalSection(&GuiData->Lock);
- HeapFree(Win32CsrApiHeap, 0, GuiData);
+ HeapFree(ConSrvHeap, 0, GuiData);
return FALSE;
}
GuiData->CharWidth = Metrics.tmMaxCharWidth;
if (GuiData->ConsoleLibrary)
FreeLibrary(GuiData->ConsoleLibrary);
- HeapFree(Win32CsrApiHeap, 0, GuiData);
+ HeapFree(ConSrvHeap, 0, GuiData);
}
static COORD
if (Size.X == ScreenBuffer->MaxX && Size.Y == ScreenBuffer->MaxY)
return STATUS_SUCCESS;
- Buffer = HeapAlloc(Win32CsrApiHeap, 0, Size.X * Size.Y * 2);
+ Buffer = HeapAlloc(ConSrvHeap, 0, Size.X * Size.Y * 2);
if (!Buffer)
return STATUS_NO_MEMORY;
}
(void)InterlockedExchangePointer((PVOID volatile *)&ScreenBuffer->Buffer, Buffer);
- HeapFree(Win32CsrApiHeap, 0, OldBuffer);
+ HeapFree(ConSrvHeap, 0, OldBuffer);
ScreenBuffer->MaxX = Size.X;
ScreenBuffer->MaxY = Size.Y;
ScreenBuffer->VirtualY = 0;
SetWindowLongW(hWnd, GWL_USERDATA, 0);
return 0;
case PM_CREATE_CONSOLE:
- Buffer = HeapAlloc(Win32CsrApiHeap, 0,
+ Buffer = HeapAlloc(ConSrvHeap, 0,
Console->Title.Length + sizeof(WCHAR));
if (NULL != Buffer)
{
(PVOID) Console);
if (NULL != Buffer)
{
- HeapFree(Win32CsrApiHeap, 0, Buffer);
+ HeapFree(ConSrvHeap, 0, Buffer);
}
if (NULL != NewWindow)
{
{
PWCHAR Buffer, Title;
- Buffer = HeapAlloc(Win32CsrApiHeap, 0,
+ Buffer = HeapAlloc(ConSrvHeap, 0,
Console->Title.Length + sizeof(WCHAR));
if (NULL != Buffer)
{
if (NULL != Buffer)
{
- HeapFree(Win32CsrApiHeap, 0, Buffer);
+ HeapFree(ConSrvHeap, 0, Buffer);
}
return TRUE;
return STATUS_UNSUCCESSFUL;
}
}
- GuiData = HeapAlloc(Win32CsrApiHeap, HEAP_ZERO_MEMORY,
+ GuiData = HeapAlloc(ConSrvHeap, HEAP_ZERO_MEMORY,
sizeof(GUI_CONSOLE_DATA));
if (!GuiData)
{