Synchronize with trunk revision 59781.

[reactos.git] / dll / cpl / console / console.h

diff --git a/dll/cpl/console/console.h b/dll/cpl/console/console.h
index 1a07871..3d96a43 100644 (file)
--- a/dll/cpl/console/console.h
+++ b/dll/cpl/console/console.h
@@ -1,59 +1,36 @@
 #ifndef CONSOLE_H__
 #define CONSOLE_H__
 
-#include "ntstatus.h"
 #define WIN32_NO_STATUS
-#include <windows.h>
+#include <limits.h> // just for UINT_MAX in layout.c
+#include <tchar.h>
+
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <wincon.h>
 #include <commctrl.h>
 #include <cpl.h>
-#include <tchar.h>
-#include <stdio.h>
-#include <limits.h>
+
 #include "resource.h"
 
+/* Shared header with the GUI Terminal Front-End from consrv.dll */
+#include "consolecpl.h"
+
 typedef struct
 {
-  int idIcon;
-  int idName;
-  int idDescription;
-  APPLET_PROC AppletProc;
+    int idIcon;
+    int idName;
+    int idDescription;
+    APPLET_PROC AppletProc;
 } APPLET, *PAPPLET;
 
-typedef struct TAGConsoleInfo
-{
-  HWND hConsoleWindow;
-  WCHAR szProcessName[MAX_PATH];
-  BOOLEAN AppliedConfig;
-  DWORD UseRasterFonts;
-  DWORD FontSize;
-  DWORD FontWeight;
-  FONTSIGNATURE FontSignature;
-  DWORD CursorSize;
-  DWORD NumberOfHistoryBuffers;
-  DWORD HistoryBufferSize;
-  DWORD HistoryNoDup;
-  DWORD FullScreen;
-  DWORD QuickEdit;
-  DWORD InsertMode;
-  DWORD ScreenBuffer;
-  DWORD WindowSize;
-  DWORD WindowPosition;
-  DWORD ActiveStaticControl;
-  COLORREF ScreenText;
-  COLORREF ScreenBackground;
-  COLORREF PopupText;
-  COLORREF PopupBackground;
-  COLORREF Colors[16];
-} ConsoleInfo, *PConsoleInfo;
-
-void ApplyConsoleInfo(HWND hwndDlg, PConsoleInfo pConInfo);
-void PaintConsole(LPDRAWITEMSTRUCT drawItem, PConsoleInfo pConInfo);
-void PaintText(LPDRAWITEMSTRUCT drawItem, PConsoleInfo pConInfo);
-
-#define PM_APPLY_CONSOLE_INFO (WM_APP + 100)
-
-
-//globals
+BOOL ApplyConsoleInfo(HWND hwndDlg, PCONSOLE_PROPS pConInfo);
+VOID PaintConsole(LPDRAWITEMSTRUCT drawItem, PCONSOLE_PROPS pConInfo);
+VOID PaintText(LPDRAWITEMSTRUCT drawItem, PCONSOLE_PROPS pConInfo);
+
+// Globals
 extern HINSTANCE hApplet;
 
 #endif /* CONSOLE_H__ */