[weiden] 17543: - added stubs for Set/GetConsoleHistoryInfo(), GetConsoleOriginalTitleA/W(), Set/GetConsoleScreenBufferInfoEx() and GetCurrentConsoleFontEx()
- added stubs for Set/GetConsoleHistoryInfo(), GetConsoleOriginalTitleA/W(), Set/GetConsoleScreenBufferInfoEx() and GetCurrentConsoleFontEx() - added missing structure definitions Modified: trunk/reactos/lib/aclui/aclui.xml Modified: trunk/reactos/lib/advapi32/advapi32.xml Modified: trunk/reactos/lib/kernel32/kernel32.def Modified: trunk/reactos/lib/kernel32/kernel32.xml Modified: trunk/reactos/lib/kernel32/misc/console.c Modified: trunk/reactos/lib/kernel32/misc/lcformat.c Modified: trunk/reactos/lib/ntdll/ntdll.xml Modified: trunk/reactos/lib/ntmarta/ntmarta.xml Modified: trunk/reactos/w32api/include/wincon.h Modified: trunk/reactos/w32api/include/windows.h _____
Modified: trunk/reactos/lib/aclui/aclui.xml --- trunk/reactos/lib/aclui/aclui.xml 2005-08-25 18:21:50 UTC (rev 17542) +++ trunk/reactos/lib/aclui/aclui.xml 2005-08-25 19:47:44 UTC (rev 17543) @@ -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> _____
Modified: trunk/reactos/lib/advapi32/advapi32.xml --- trunk/reactos/lib/advapi32/advapi32.xml 2005-08-25 18:21:50 UTC (rev 17542) +++ trunk/reactos/lib/advapi32/advapi32.xml 2005-08-25 19:47:44 UTC (rev 17543) @@ -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> _____
Modified: trunk/reactos/lib/kernel32/kernel32.def --- trunk/reactos/lib/kernel32/kernel32.def 2005-08-25 18:21:50 UTC (rev 17542) +++ trunk/reactos/lib/kernel32/kernel32.def 2005-08-25 19:47:44 UTC (rev 17543) @@ -773,6 +773,7 @@
SetConsoleDisplayMode@12 SetConsoleFont@8 SetConsoleHardwareState@12 +SetConsoleHistoryInfo@4 SetConsoleIcon@4 SetConsoleInputExeNameA@4 SetConsoleInputExeNameW@4 @@ -787,6 +788,7 @@ ;SetConsoleOS2OemFormat SetConsoleOutputCP@4 SetConsolePalette@12 +SetConsoleScreenBufferInfoEx@8 SetConsoleScreenBufferSize@8 SetConsoleTextAttribute@8 SetConsoleTitleA@4 _____
Modified: trunk/reactos/lib/kernel32/kernel32.xml --- trunk/reactos/lib/kernel32/kernel32.xml 2005-08-25 18:21:50 UTC (rev 17542) +++ trunk/reactos/lib/kernel32/kernel32.xml 2005-08-25 19:47:44 UTC (rev 17543) @@ -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> _____
Modified: trunk/reactos/lib/kernel32/misc/console.c --- trunk/reactos/lib/kernel32/misc/console.c 2005-08-25 18:21:50 UTC (rev 17542) +++ trunk/reactos/lib/kernel32/misc/console.c 2005-08-25 19:47:44 UTC (rev 17543) @@ -3622,4 +3622,108 @@
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 */ _____
Modified: trunk/reactos/lib/kernel32/misc/lcformat.c --- trunk/reactos/lib/kernel32/misc/lcformat.c 2005-08-25 18:21:50 UTC (rev 17542) +++ trunk/reactos/lib/kernel32/misc/lcformat.c 2005-08-25 19:47:44 UTC (rev 17543) @@ -28,8 +28,6 @@
* -Gunnar */
-#define WINVER 0x0500 - #include <k32.h>
#include "wine/config.h" _____
Modified: trunk/reactos/lib/ntdll/ntdll.xml --- trunk/reactos/lib/ntdll/ntdll.xml 2005-08-25 18:21:50 UTC (rev 17542) +++ trunk/reactos/lib/ntdll/ntdll.xml 2005-08-25 19:47:44 UTC (rev 17543) @@ -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> _____
Modified: trunk/reactos/lib/ntmarta/ntmarta.xml --- trunk/reactos/lib/ntmarta/ntmarta.xml 2005-08-25 18:21:50 UTC (rev 17542) +++ trunk/reactos/lib/ntmarta/ntmarta.xml 2005-08-25 19:47:44 UTC (rev 17543) @@ -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> _____
Modified: trunk/reactos/w32api/include/wincon.h --- trunk/reactos/w32api/include/wincon.h 2005-08-25 18:21:50 UTC (rev 17542) +++ trunk/reactos/w32api/include/wincon.h 2005-08-25 19:47:44 UTC (rev 17543) @@ -107,7 +107,6 @@
PACKED #endif KEY_EVENT_RECORD; - typedef struct _MOUSE_EVENT_RECORD { COORD dwMousePosition; DWORD dwButtonState; @@ -128,8 +127,39 @@ } 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); _____
Modified: trunk/reactos/w32api/include/windows.h --- trunk/reactos/w32api/include/windows.h 2005-08-25 18:21:50 UTC (rev 17542) +++ trunk/reactos/w32api/include/windows.h 2005-08-25 19:47:44 UTC (rev 17543) @@ -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
-
weiden＠svn.reactos.com