[PSDK]

[reactos.git] / reactos / include / psdk / wincon.h

diff --git a/reactos/include/psdk/wincon.h b/reactos/include/psdk/wincon.h
index 2d6faab..505f03f 100644 (file)
--- a/reactos/include/psdk/wincon.h
+++ b/reactos/include/psdk/wincon.h
@@ -5,6 +5,15 @@
 extern "C" {
 #endif
 
+#if (_WIN32_WINNT >= 0x0600) && !defined(NOGDI)
+#  include "wingdi.h"
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4820)
+#endif
+
 #define FOREGROUND_BLUE        1
 #define FOREGROUND_GREEN       2
 #define FOREGROUND_RED 4
@@ -132,6 +141,7 @@ typedef struct _INPUT_RECORD {
 #if (_WIN32_WINNT >= 0x0600)
 #define HISTORY_NO_DUP_FLAG 0x1
 #define CONSOLE_OVERSTRIKE  0x1
+
 typedef struct _CONSOLE_HISTORY_INFO {
     UINT cbSize;
     UINT HistoryBufferSize;
@@ -150,6 +160,7 @@ typedef struct _CONSOLE_SCREEN_BUFFER_INFOEX {
     COLORREF ColorTable[16];
 } CONSOLE_SCREEN_BUFFER_INFOEX, *PCONSOLE_SCREEN_BUFFER_INFOEX;
 
+#ifndef NOGDI
 typedef struct _CONSOLE_FONT_INFOEX {
     ULONG cbSize;
     DWORD nFont;
@@ -159,6 +170,7 @@ typedef struct _CONSOLE_FONT_INFOEX {
     WCHAR FaceName[LF_FACESIZE];
 } CONSOLE_FONT_INFOEX, *PCONSOLE_FONT_INFOEX;
 #endif
+#endif
 
 BOOL WINAPI AllocConsole(void);
 #if (_WIN32_WINNT >= 0x0501)
@@ -218,8 +230,8 @@ BOOL WINAPI SetConsoleTextAttribute(HANDLE,WORD);
 BOOL WINAPI SetConsoleTitleA(LPCSTR);
 BOOL WINAPI SetConsoleTitleW(LPCWSTR);
 BOOL WINAPI SetConsoleWindowInfo(HANDLE,BOOL,const SMALL_RECT*);
-BOOL WINAPI WriteConsoleA(HANDLE,PCVOID,DWORD,PDWORD,PVOID);
-BOOL WINAPI WriteConsoleW(HANDLE,PCVOID,DWORD,PDWORD,PVOID);
+BOOL WINAPI WriteConsoleA(HANDLE,CONST VOID*,DWORD,LPDWORD,LPVOID);
+BOOL WINAPI WriteConsoleW(HANDLE,CONST VOID*,DWORD,LPDWORD,LPVOID);
 BOOL WINAPI WriteConsoleInputA(HANDLE,const INPUT_RECORD*,DWORD,PDWORD);
 BOOL WINAPI WriteConsoleInputW(HANDLE,const INPUT_RECORD*,DWORD,PDWORD);
 BOOL WINAPI WriteConsoleOutputA(HANDLE,const CHAR_INFO*,COORD,COORD,PSMALL_RECT);
@@ -266,6 +278,10 @@ BOOL WINAPI WriteConsoleOutputCharacterW(HANDLE,LPCWSTR,DWORD,COORD,PDWORD);
 #define WriteConsoleOutputCharacter WriteConsoleOutputCharacterA
 #endif
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #ifdef __cplusplus
 }
 #endif