- added stubs for Set/GetConsoleHistoryInfo(), GetConsoleOriginalTitleA/W(), Set/GetConsoleScreenBufferInfoEx() and GetCurrentConsoleFontEx()

- added missing structure definitions

svn path=/trunk/; revision=17543

reactos/lib/aclui/aclui.xml

@@ -5,7 +5,7 @@
 	<define name="_UNICODE" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0500</define>
-	<define name="_WIN32_WINNT">0x501</define>
+	<define name="_WIN32_WINNT">0x0600</define>
 	<define name="WINVER">0x0600</define>
 	<library>ntdll</library>
 	<library>kernel32</library>

reactos/lib/advapi32/advapi32.xml

@@ -5,7 +5,7 @@
 	<define name="__USE_W32API" />
 	<define name="WINVER">0x600</define>
 	<define name="_WIN32_IE">0x0500</define>
-	<define name="_WIN32_WINNT">0x0501</define>
+	<define name="_WIN32_WINNT">0x0600</define>
 	<library>scm_client</library>
 	<library>ntdll</library>
 	<library>kernel32</library>

reactos/lib/kernel32/kernel32.def

@@ -773,6 +773,7 @@ SetConsoleCursorPosition@8
 SetConsoleDisplayMode@12
 SetConsoleFont@8
 SetConsoleHardwareState@12
+SetConsoleHistoryInfo@4
 SetConsoleIcon@4
 SetConsoleInputExeNameA@4
 SetConsoleInputExeNameW@4
@@ -787,6 +788,7 @@ SetConsoleNumberOfCommandsW@8
 ;SetConsoleOS2OemFormat
 SetConsoleOutputCP@4
 SetConsolePalette@12
+SetConsoleScreenBufferInfoEx@8
 SetConsoleScreenBufferSize@8
 SetConsoleTextAttribute@8
 SetConsoleTitleA@4

reactos/lib/kernel32/kernel32.xml

@@ -4,9 +4,9 @@
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_SEH_NO_NATIVE_NLG" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0502</define>
+	<define name="_WIN32_WINNT">0x0600</define>
 	<define name="__NO_CTYPE_INLINES" />
-	<define name="WINVER">0x0500</define>
+	<define name="WINVER">0x0600</define>
 	<pch>k32.h</pch>
 	<directory name="debug">
 		<file>break.c</file>

reactos/lib/kernel32/misc/console.c

@@ -3622,4 +3622,108 @@ GetConsoleInputExeNameA(DWORD nBufferLength, LPSTR lpBuffer)
   return Ret;
 }
 
+
+/*--------------------------------------------------------------
+ *  GetConsoleHistoryInfo
+ *
+ * @unimplemented
+ */
+BOOL STDCALL
+GetConsoleHistoryInfo(PCONSOLE_HISTORY_INFO lpConsoleHistoryInfo)
+{
+    DPRINT1("GetConsoleHistoryInfo(0x%p) UNIMPLEMENTED!\n", lpConsoleHistoryInfo);
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return FALSE;
+}
+
+
+/*--------------------------------------------------------------
+ *  SetConsoleHistoryInfo
+ *
+ * @unimplemented
+ */
+BOOL STDCALL
+SetConsoleHistoryInfo(IN PCONSOLE_HISTORY_INFO lpConsoleHistoryInfo)
+{
+    DPRINT1("SetConsoleHistoryInfo(0x%p) UNIMPLEMENTED!\n", lpConsoleHistoryInfo);
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return FALSE;
+}
+
+
+/*--------------------------------------------------------------
+ *  GetConsoleOriginalTitleW
+ *
+ * @unimplemented
+ */
+DWORD STDCALL
+GetConsoleOriginalTitleW(OUT LPWSTR lpConsoleTitle,
+                         IN DWORD nSize)
+{
+    DPRINT1("GetConsoleOriginalTitleW(0x%p, 0x%x) UNIMPLEMENTED!\n", lpConsoleTitle, nSize);
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return 0;
+}
+
+
+/*--------------------------------------------------------------
+ *  GetConsoleOriginalTitleA
+ *
+ * @unimplemented
+ */
+DWORD STDCALL
+GetConsoleOriginalTitleA(OUT LPSTR lpConsoleTitle,
+                         IN DWORD nSize)
+{
+    DPRINT1("GetConsoleOriginalTitleA(0x%p, 0x%x) UNIMPLEMENTED!\n", lpConsoleTitle, nSize);
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return 0;
+}
+
+
+/*--------------------------------------------------------------
+ *  GetConsoleScreenBufferInfoEx
+ *
+ * @unimplemented
+ */
+BOOL STDCALL
+GetConsoleScreenBufferInfoEx(IN HANDLE hConsoleOutput,
+                             OUT PCONSOLE_SCREEN_BUFFER_INFOEX lpConsoleScreenBufferInfoEx)
+{
+    DPRINT1("GetConsoleScreenBufferInfoEx(0x%p, 0x%p) UNIMPLEMENTED!\n", hConsoleOutput, lpConsoleScreenBufferInfoEx);
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return FALSE;
+}
+
+
+/*--------------------------------------------------------------
+ *  SetConsoleScreenBufferInfoEx
+ *
+ * @unimplemented
+ */
+BOOL STDCALL
+SetConsoleScreenBufferInfoEx(IN HANDLE hConsoleOutput,
+                             IN PCONSOLE_SCREEN_BUFFER_INFOEX lpConsoleScreenBufferInfoEx)
+{
+    DPRINT1("SetConsoleScreenBufferInfoEx(0x%p, 0x%p) UNIMPLEMENTED!\n", hConsoleOutput, lpConsoleScreenBufferInfoEx);
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return FALSE;
+}
+
+
+/*--------------------------------------------------------------
+ *  GetCurrentConsoleFontEx
+ *
+ * @unimplemented
+ */
+BOOL STDCALL
+GetCurrentConsoleFontEx(IN HANDLE hConsoleOutput,
+                        IN BOOL bMaximumWindow,
+                        OUT PCONSOLE_FONT_INFOEX lpConsoleCurrentFontEx)
+{
+    DPRINT1("GetCurrentConsoleFontEx(0x%p, 0x%x, 0x%p) UNIMPLEMENTED!\n", hConsoleOutput, bMaximumWindow, lpConsoleCurrentFontEx);
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return FALSE;
+}
+
 /* EOF */

reactos/lib/kernel32/misc/lcformat.c

@@ -28,8 +28,6 @@
  * -Gunnar
  */
 
-#define WINVER 0x0500
-
 #include <k32.h>
 
 #include "wine/config.h"

reactos/lib/ntdll/ntdll.xml

@@ -5,7 +5,7 @@
 	<define name="__NTDLL__" />
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0502</define>
+	<define name="_WIN32_WINNT">0x0600</define>
 	<define name="_NTOSKRNL_" />
 	<define name="__NO_CTYPE_INLINES" />
 	<library>rtl</library>

reactos/lib/ntmarta/ntmarta.xml

@@ -5,7 +5,7 @@
 	<define name="_UNICODE" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0500</define>
-	<define name="_WIN32_WINNT">0x501</define>
+	<define name="_WIN32_WINNT">0x600</define>
 	<define name="WINVER">0x0600</define>
 	<library>ntdll</library>
 	<library>kernel32</library>

reactos/w32api/include/wincon.h

@@ -107,7 +107,6 @@ typedef struct _KEY_EVENT_RECORD {
  PACKED
 #endif
 KEY_EVENT_RECORD;
-
 typedef struct _MOUSE_EVENT_RECORD {
 	COORD dwMousePosition;
 	DWORD dwButtonState;
@@ -128,8 +127,39 @@ typedef struct _INPUT_RECORD {
 	} Event;
 } INPUT_RECORD,*PINPUT_RECORD;
 
+#if (_WIN32_WINNT >= 0x0600)
+#define HISTORY_NO_DUP_FLAG 0x1
+#define CONSOLE_OVERSTRIKE  0x1
+typedef struct _CONSOLE_HISTORY_INFO {
+    UINT cbSize;
+    UINT HistoryBufferSize;
+    UINT NumberOfHistoryBuffers;
+    DWORD dwFlags;
+} CONSOLE_HISTORY_INFO, *PCONSOLE_HISTORY_INFO;
+
+typedef struct _CONSOLE_SCREEN_BUFFER_INFOEX {
+    ULONG cbSize;
+    COORD dwSize;
+    COORD dwCursorPosition;
+    WORD wAttributes;
+    SMALL_RECT srWindow;
+    COORD dwMaximumWindowSize;
+    WORD wPopupAttributes;
+    COLORREF ColorTable[16];
+} CONSOLE_SCREEN_BUFFER_INFOEX, *PCONSOLE_SCREEN_BUFFER_INFOEX;
+
+typedef struct _CONSOLE_FONT_INFOEX {
+    ULONG cbSize;
+    DWORD nFont;
+    COORD dwFontSize;
+    UINT FontFamily;
+    UINT FontWeight;
+    WCHAR FaceName[LF_FACESIZE];
+} CONSOLE_FONT_INFOEX, *PCONSOLE_FONT_INFOEX;
+#endif
+
 BOOL WINAPI AllocConsole(void);
-#if (_WIN32_WINNT >= 0x05001)
+#if (_WIN32_WINNT >= 0x0501)
 BOOL WINAPI AttachConsole(DWORD);
 #endif
 HANDLE WINAPI CreateConsoleScreenBuffer(DWORD,DWORD,CONST SECURITY_ATTRIBUTES*,DWORD,LPVOID);

reactos/w32api/include/windows.h

@@ -47,11 +47,11 @@
 #include <excpt.h>
 #include <stdarg.h>
 #include <windef.h>
-#include <wincon.h>
 #include <winbase.h>
 #if !(defined NOGDI || defined  _WINGDI_H)
 #include <wingdi.h>
 #endif
+#include <wincon.h>
 #ifndef _WINUSER_H
 #include <winuser.h>
 #endif