Ros-diffs April 2013

ros-diffs@reactos.org

14 participants
265 discussions

[akhaldi] 58736: [DPLAY][DPLAYX] * Sync with Wine 1.5.26.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Apr 13 13:08:11 2013 New Revision: 58736 URL: http://svn.reactos.org/svn/reactos?rev=58736&view=rev Log: [DPLAY][DPLAYX] * Sync with Wine 1.5.26. Added: trunk/reactos/dll/directx/dplayx/dplayx.idl (with props) trunk/reactos/dll/directx/dplayx/dplayx.rgs (with props) trunk/reactos/include/reactos/wine/dplaysp.h (with props) Removed: trunk/reactos/dll/directx/dplayx/dplaysp.h trunk/reactos/dll/directx/dplayx/regsvr.c Modified: trunk/reactos/dll/directx/dplay/CMakeLists.txt trunk/reactos/dll/directx/dplay/version.rc trunk/reactos/dll/directx/dplayx/CMakeLists.txt trunk/reactos/dll/directx/dplayx/dpclassfactory.c trunk/reactos/dll/directx/dplayx/dpinit.h trunk/reactos/dll/directx/dplayx/dplay.c trunk/reactos/dll/directx/dplayx/dplay_global.h trunk/reactos/dll/directx/dplayx/dplaysp.c trunk/reactos/dll/directx/dplayx/dplayx_global.c trunk/reactos/dll/directx/dplayx/dplayx_global.h trunk/reactos/dll/directx/dplayx/dplayx_main.c trunk/reactos/dll/directx/dplayx/dplayx_messages.c trunk/reactos/dll/directx/dplayx/dplayx_messages.h trunk/reactos/dll/directx/dplayx/dplayx_queue.h trunk/reactos/dll/directx/dplayx/dplobby.c trunk/reactos/dll/directx/dplayx/lobbysp.c trunk/reactos/dll/directx/dplayx/lobbysp.h trunk/reactos/dll/directx/dplayx/name_server.c trunk/reactos/dll/directx/dplayx/name_server.h trunk/reactos/dll/directx/dplayx/version.rc trunk/reactos/include/psdk/dplay.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/dplay/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplay/CMakeLis… Modified: trunk/reactos/dll/directx/dplay/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplay/version.… Modified: trunk/reactos/dll/directx/dplayx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/CMakeLi… Modified: trunk/reactos/dll/directx/dplayx/dpclassfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dpclass… Modified: trunk/reactos/dll/directx/dplayx/dpinit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dpinit.… Modified: trunk/reactos/dll/directx/dplayx/dplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dplay.c… Modified: trunk/reactos/dll/directx/dplayx/dplay_global.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dplay_g… Modified: trunk/reactos/dll/directx/dplayx/dplaysp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dplaysp… Removed: trunk/reactos/dll/directx/dplayx/dplaysp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dplaysp… Added: trunk/reactos/dll/directx/dplayx/dplayx.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dplayx.… Added: trunk/reactos/dll/directx/dplayx/dplayx.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dplayx.… Modified: trunk/reactos/dll/directx/dplayx/dplayx_global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dplayx_… Modified: trunk/reactos/dll/directx/dplayx/dplayx_global.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dplayx_… Modified: trunk/reactos/dll/directx/dplayx/dplayx_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dplayx_… Modified: trunk/reactos/dll/directx/dplayx/dplayx_messages.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dplayx_… Modified: trunk/reactos/dll/directx/dplayx/dplayx_messages.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dplayx_… Modified: trunk/reactos/dll/directx/dplayx/dplayx_queue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dplayx_… Modified: trunk/reactos/dll/directx/dplayx/dplobby.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dplobby… Modified: trunk/reactos/dll/directx/dplayx/lobbysp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/lobbysp… Modified: trunk/reactos/dll/directx/dplayx/lobbysp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/lobbysp… Modified: trunk/reactos/dll/directx/dplayx/name_server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/name_se… Modified: trunk/reactos/dll/directx/dplayx/name_server.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/name_se… Removed: trunk/reactos/dll/directx/dplayx/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/regsvr.… Modified: trunk/reactos/dll/directx/dplayx/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/version… Modified: trunk/reactos/include/psdk/dplay.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dplay.h?rev=5… Added: trunk/reactos/include/reactos/wine/dplaysp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/dplay… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

11 years, 5 months

[akhaldi] 58735: [CMAKE] * Invoke the linker directly instead of through the compiler in MSVC builds.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Apr 13 10:37:24 2013 New Revision: 58735 URL: http://svn.reactos.org/svn/reactos?rev=58735&view=rev Log: [CMAKE] * Invoke the linker directly instead of through the compiler in MSVC builds. Modified: trunk/reactos/cmake/Platform/Windows-MSVC.cmake Modified: trunk/reactos/cmake/Platform/Windows-MSVC.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/Platform/Windows-MSV… ============================================================================== --- trunk/reactos/cmake/Platform/Windows-MSVC.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/Platform/Windows-MSVC.cmake [iso-8859-1] Sat Apr 13 10:37:24 2013 @@ -229,7 +229,8 @@ set(CMAKE_${lang}_COMPILER_LINKER_OPTION_FLAG_EXECUTABLE "/link") set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_OBJECTS 1) - set(CMAKE_${lang}_LINK_EXECUTABLE "${_CMAKE_VS_LINK_EXE}<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} <FLAGS> /Fe<TARGET> <OBJECTS> /link /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}") + set(CMAKE_${lang}_LINK_EXECUTABLE + "${_CMAKE_VS_LINK_EXE}<CMAKE_LINKER> ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}") set(CMAKE_${lang}_FLAGS_INIT "") set(CMAKE_${lang}_FLAGS_DEBUG_INIT "")

11 years, 5 months

[hbelusca] 58734: [CSRSRV] Deactivate few breakpoints.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Apr 12 21:13:25 2013 New Revision: 58734 URL: http://svn.reactos.org/svn/reactos?rev=58734&view=rev Log: [CSRSRV] Deactivate few breakpoints. Modified: branches/ros-csrss/subsystems/win32/csrsrv/api.c Modified: branches/ros-csrss/subsystems/win32/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] Fri Apr 12 21:13:25 2013 @@ -81,7 +81,7 @@ ServerDll->ValidTable[ApiId], ((ServerDll->NameTable) && (ServerDll->NameTable[ApiId])) ? ServerDll->NameTable[ApiId] : "*** UNKNOWN ***", &ServerDll->Name); - DbgBreakPoint(); + // DbgBreakPoint(); ReplyMsg->Status = (ULONG)STATUS_ILLEGAL_FUNCTION; return STATUS_ILLEGAL_FUNCTION; } @@ -547,7 +547,7 @@ /* We are beyond the Maximum Server ID */ DPRINT1("CSRSS: %lx is invalid ServerDllIndex (%08x)\n", ServerId, ServerDll); - DbgBreakPoint(); + // DbgBreakPoint(); ReplyMsg = NULL; ReplyPort = CsrApiPort; @@ -747,7 +747,7 @@ /* We are beyond the Maximum Server ID */ DPRINT1("CSRSS: %lx is invalid ServerDllIndex (%08x)\n", ServerId, ServerDll); - DbgBreakPoint(); + // DbgBreakPoint(); ReplyPort = CsrApiPort; ReplyMsg = &ReceiveMsg;

11 years, 5 months

[zguo] 58733: [RTL8139] Add header files for RTL8139 drivers holding function definitions and register addresses. Still incomplete/some holdovers from old ne2000 driver which will get pruned as mor...

by zguo＠svn.reactos.org

Author: zguo Date: Fri Apr 12 15:06:11 2013 New Revision: 58733 URL: http://svn.reactos.org/svn/reactos?rev=58733&view=rev Log: [RTL8139] Add header files for RTL8139 drivers holding function definitions and register addresses. Still incomplete/some holdovers from old ne2000 driver which will get pruned as more of the driver is rewritten. Not committing the actual driver code yet due to the need to massively clean it up. Not yet added to compilation. CORE-7081 Added: trunk/reactos/drivers/network/dd/rtl8139/ (with props) trunk/reactos/drivers/network/dd/rtl8139/include/ (with props) trunk/reactos/drivers/network/dd/rtl8139/include/8139.h (with props) trunk/reactos/drivers/network/dd/rtl8139/include/debug.h (with props) trunk/reactos/drivers/network/dd/rtl8139/include/nic.h (with props) Propchange: trunk/reactos/drivers/network/dd/rtl8139/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Apr 12 15:06:11 2013 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/drivers/network/dd/rtl8139/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/drivers/network/dd/rtl8139/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/drivers/network/dd/rtl8139/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Propchange: trunk/reactos/drivers/network/dd/rtl8139/include/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Apr 12 15:06:11 2013 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/drivers/network/dd/rtl8139/include/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/drivers/network/dd/rtl8139/include/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/drivers/network/dd/rtl8139/include/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/drivers/network/dd/rtl8139/include/8139.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/rtl8139… ============================================================================== --- trunk/reactos/drivers/network/dd/rtl8139/include/8139.h (added) +++ trunk/reactos/drivers/network/dd/rtl8139/include/8139.h [iso-8859-1] Fri Apr 12 15:06:11 2013 @@ -1,0 +1,146 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS RTL8139 Driver + * FILE: include/8139.h + * PURPOSE: 8139 NIC definitions + */ + +#pragma once +//Register addresses +#define R_MAC 0x00 //MAC address uses bytes 0-5, 6 and 7 are reserved +#define R_MCAST0 0x08 //Multicast registers +#define R_MCAST1 0x09 //Multicast registers +#define R_MCAST2 0x0A +#define R_MCAST3 0x0B +#define R_MCAST4 0x0C +#define R_MCAST5 0x0D +#define R_MCAST6 0x0E +#define R_MCAST7 0x0F +#define R_TXSTS0 0x10 //TX status, 0x10-0x13, 4 bytes +#define R_TXSTS1 0x14 +#define R_TXSTS2 0x18 +#define R_TXSTS3 0x1C +#define R_TXSAD0 0x20 //TX start address of descriptor 0 +#define R_TXSAD1 0x24 +#define R_TXSAD2 0x28 +#define R_TXSAD3 0x2C +#define R_RXSA 0x30 //RX buffer start address +#define R_ERXBC 0x34 //Early RX byte count register +#define R_ERXSTS 0x36 //Early RX status register + +#define R_CMD 0x37 //Command register +#define B_CMD_TXE 0x04 //Enable TX +#define B_CMD_RXE 0x08 //Enable RX +#define B_CMD_RST 0x10 //Reset bit + +#define R_CAPR 0x38 //Current address of packet read +#define R_CBA 0x3A //Current buffer address +#define R_IM 0x3C //Interrupt mask register +#define R_IS 0x3E //Interrupt status register +#define R_TC 0x40 //Transmit configuration register + +#define R_RC 0x44 //Receive configuration register +#define B_RC_AAP 0x01 //Accept all packets +#define B_RC_APM 0x02 //Accept packets sent to device MAC +#define B_RC_AM 0x04 //Accept multicast packets +#define B_RC_AB 0x08 //Accept broadcast packets +#define B_RC_AR 0x10 //Accept runt (smaller than 64bytes) packets + +#define R_TCTR 0x48 //Timer counter register +#define R_MPC 0x4C //Missed packet counter +#define R_9346CR 0x50 //93C46 command register +#define R_CFG0 0x51 //Configuration register 0 +#define R_CFG1 0x52 +#define R_TINTR 0x54 //Timer interrupt register +#define R_MS 0x58 //Media status register +#define R_CFG3 0x59 //Configuration register 3 +#define R_CFG4 0x5A //Configuration register 4 +#define R_MINTS 0x5C //Multiple interrupt select +#define R_PCIID 0x5E //PCI Revision ID = 0x10 +#define R_DTSTS 0x60 //TX status of all descriptors +#define R_BMC 0x62 //Basic mode control register +#define R_BMSTS 0x64 //Basic mode status register +#define R_ANA 0x66 //Auto-negotiation advertisement +#define R_ANLP 0x68 //Auto-negotiation link partner +#define R_ANEX 0x6A //Auto-negotiation expansion +#define R_DCTR 0x6C //Disconnect counter +#define R_FCSCTR 0x6E //False carrier sense counter +#define R_NWT 0x70 //N-way test register +#define R_RXERRCTR 0x72 //RX error counter +#define R_CSCFG 0x74 //CS configuration register +#define R_PHYP1 0x78 //PHY parameter 1 +#define R_TWP 0x7C //Twister parameter +#define R_PHYP2 0x80 //PHY parameter 2 +#define R_PCRC0 0x84 //Power management CRC for wakeup frame 0 +#define R_PCRC1 0x85 +#define R_PCRC2 0x86 +#define R_PCRC3 0x87 +#define R_PCRC4 0x88 +#define R_PCRC5 0x89 +#define R_PCRC6 0x8A +#define R_PCRC7 0x8B +#define R_WAKE0 0x8C //Power management wakeup frame 0 +#define R_WAKE1 0x94 +#define R_WAKE2 0x9C +#define R_WAKE3 0xA4 +#define R_WAKE4 0xAC +#define R_WAKE5 0xB4 +#define R_WAKE6 0xBC +#define R_WAKE7 0xC4 +#define R_LSBCRC0 0xCC //LSB of the mask byte of wakeup frame 0 within offset 12 to 75 +#define R_LSBCRC0 0xCD +#define R_LSBCRC0 0xCE +#define R_LSBCRC0 0xCF +#define R_LSBCRC0 0xD0 +#define R_LSBCRC0 0xD1 +#define R_LSBCRC0 0xD2 +#define R_LSBCRC0 0xD3 +#define R_CFG5 0xD8 //Configuration register 5 + +//EEPROM Control Bytes +#define EE_DATA_READ 0x01 //Chip data out +#define EE_DATA_WRITE 0x02 //Chip data in +#define EE_SHIFT_CLK 0x04 //Chip shift clock +#define EE_CS 0x08 //Chip select +#define EE_ENB 0x88 //Chip enable + + +//EEPROM Commands +#define EE_READ_CMD 0x06 + + +/* NIC prepended structure to a received packet */ +typedef struct _PACKET_HEADER { + UCHAR Status; /* See RSR_* constants */ + UCHAR NextPacket; /* Pointer to next packet in chain */ + USHORT PacketLength; /* Length of packet including this header */ +} PACKET_HEADER, *PPACKET_HEADER; + +#define IEEE_802_ADDR_LENGTH 6 + +/* Ethernet frame header */ +typedef struct _ETH_HEADER { + UCHAR Destination[IEEE_802_ADDR_LENGTH]; + UCHAR Source[IEEE_802_ADDR_LENGTH]; + USHORT PayloadType; +} ETH_HEADER, *PETH_HEADER; + +typedef struct _DISCARD_HEADER { + PACKET_HEADER HWHeader; + ETH_HEADER EthernetHeader; +} DISCARD_HEADER, *PDISCARD_HEADER; + +#define NICDisableInterrupts(Adapter) { \ + NDIS_DbgPrint(MAX_TRACE, ("NICDisableInterrupts()\n")); \ + NdisRawWritePortUchar((Adapter)->IOBase + PG0_IMR, 0x00); \ +} + +#define NICEnableInterrupts(Adapter) { \ + NDIS_DbgPrint(MAX_TRACE, ("NICEnableInterrupts() Mask (0x%X)\n", (Adapter)->InterruptMask)); \ + NdisRawWritePortUchar((Adapter)->IOBase + PG0_IMR, (Adapter)->InterruptMask); \ +} + +VOID NTAPI MiniportHandleInterrupt( + IN NDIS_HANDLE MiniportAdapterContext); + +/* EOF */ Propchange: trunk/reactos/drivers/network/dd/rtl8139/include/8139.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/network/dd/rtl8139/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/rtl8139… ============================================================================== --- trunk/reactos/drivers/network/dd/rtl8139/include/debug.h (added) +++ trunk/reactos/drivers/network/dd/rtl8139/include/debug.h [iso-8859-1] Fri Apr 12 15:06:11 2013 @@ -1,0 +1,82 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Novell Eagle 2000 driver + * FILE: include/debug.h + * PURPOSE: Debugging support macros + * DEFINES: DBG - Enable debug output + * NASSERT - Disable assertions + */ + +#pragma once + +#define NORMAL_MASK 0x000000FF +#define SPECIAL_MASK 0xFFFFFF00 +#define MIN_TRACE 0x00000001 +#define MID_TRACE 0x00000002 +#define MAX_TRACE 0x00000003 + +#define DEBUG_MEMORY 0x00000100 +#define DEBUG_ULTRA 0xFFFFFFFF + +#if DBG + +extern ULONG DebugTraceLevel; + +#ifdef _MSC_VER + +#define NDIS_DbgPrint(_t_, _x_) \ + if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ + ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + DbgPrint("(%s:%d) ", __FILE__, __LINE__); \ + DbgPrint _x_ ; \ + } + +#else /* _MSC_VER */ + +#define NDIS_DbgPrint(_t_, _x_) \ + if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ + ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + DbgPrint("(%s:%d)(%s) ", __FILE__, __LINE__, __FUNCTION__); \ + DbgPrint _x_ ; \ + } + +#endif /* _MSC_VER */ + + +#define ASSERT_IRQL(x) ASSERT(KeGetCurrentIrql() <= (x)) +#define ASSERT_IRQL_EQUAL(x) ASSERT(KeGetCurrentIrql() == (x)) + +#else /* DBG */ + +#define NDIS_DbgPrint(_t_, _x_) + +#define ASSERT_IRQL(x) +#define ASSERT_IRQL_EQUAL(x) +/* #define ASSERT(x) */ /* ndis.h */ + +#endif /* DBG */ + + +#define assert(x) ASSERT(x) +#define assert_irql(x) ASSERT_IRQL(x) + + +#ifdef _MSC_VER + +#define UNIMPLEMENTED \ + NDIS_DbgPrint(MIN_TRACE, ("The function at %s:%d is unimplemented, \ + but come back another day.\n", __FILE__, __LINE__)); + +#else /* _MSC_VER */ + +#define UNIMPLEMENTED \ + NDIS_DbgPrint(MIN_TRACE, ("%s at %s:%d is unimplemented, \ + but come back another day.\n", __FUNCTION__, __FILE__, __LINE__)); + +#endif /* _MSC_VER */ + + +#define CHECKPOINT \ + do { NDIS_DbgPrint(MIN_TRACE, ("%s:%d\n", __FILE__, __LINE__)); } while(0); + +/* EOF */ Propchange: trunk/reactos/drivers/network/dd/rtl8139/include/debug.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/network/dd/rtl8139/include/nic.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/rtl8139… ============================================================================== --- trunk/reactos/drivers/network/dd/rtl8139/include/nic.h (added) +++ trunk/reactos/drivers/network/dd/rtl8139/include/nic.h [iso-8859-1] Fri Apr 12 15:06:11 2013 @@ -1,0 +1,247 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Novell Eagle 2000 driver + * FILE: include/ne2000.h + * PURPOSE: NE2000 driver definitions + */ + +#define NDIS_MINIPORT_DRIVER 1 +#define NDIS_LEGACY_MINIPORT 1 +#define NDIS51_MINIPORT 1 +#include <ndis.h> +#include <8139.h> +#include <debug.h> + +/* Define NOCARD to test NDIS without a card */ +//#define NOCARD + +/* NE2000 sepcific constants */ +#define NIC_DATA 0x10 /* Data register */ +#define NIC_RESET 0x1F /* Reset register */ + + +/* Global constants */ + +#define DRIVER_NDIS_MAJOR_VERSION 0x05 +#define DRIVER_NDIS_MINOR_VERSION 0 + +#define DRIVER_DEFAULT_IO_BASE_ADDRESS 0x280 /* bochs default */ +#define DRIVER_DEFAULT_INTERRUPT_NUMBER 9 /* bochs default */ +#define DRIVER_DEFAULT_INTERRUPT_SHARED FALSE +#define DRIVER_DEFAULT_INTERRUPT_MODE NdisInterruptLatched + +#define DRIVER_MAX_MULTICAST_LIST_SIZE 8 + +#define DRIVER_VENDOR_DESCRIPTION "RTL 8139 Adapter." +#define DRIVER_VENDOR_DRIVER_VERSION 0x0100 /* 1.0 */ + +#define DRIVER_FRAME_SIZE 1514 /* Size of an ethernet frame */ +#define DRIVER_HEADER_SIZE 14 /* Size of an ethernet header */ +#define DRIVER_LENGTH_OF_ADDRESS 6 /* Size of an ethernet address */ + +/* Maximum lookahead buffer size */ +#define DRIVER_MAXIMUM_LOOKAHEAD (252 - DRIVER_HEADER_SIZE) + +/* Size of a block in a buffer ring */ +#define DRIVER_BLOCK_SIZE 256 + + +/* Default number of transmit buffers */ +#define DRIVER_DEFAULT_TX_BUFFER_COUNT 12 +#define BUFFERS_PER_TX_BUF 1 + +/* Interrupt Mask Register value */ +#define DRIVER_INTERRUPT_MASK IMR_ALLE - IMR_RDCE + +/* Maximum number of interrupts handled per call to MiniportHandleInterrupt */ +#define INTERRUPT_LIMIT 10 + +/* Global structures */ + +typedef struct _MINIPORT_RESERVED +{ + PNDIS_PACKET Next; +} MINIPORT_RESERVED, *PMINIPORT_RESERVED; + +#define RESERVED(Packet) ((PMINIPORT_RESERVED)((Packet)->MiniportReserved)) + +typedef UCHAR DRIVER_HARDWARE_ADDRESS[DRIVER_LENGTH_OF_ADDRESS]; + +/* Information about an adapter */ +typedef struct _NIC_ADAPTER +{ + /* Entry on global adapter list */ + LIST_ENTRY ListEntry; + /* Adapter handle */ + NDIS_HANDLE MiniportAdapterHandle; + /* NDIS interrupt object */ + NDIS_MINIPORT_INTERRUPT Interrupt; + + /* I/O base address and interrupt number of adapter */ + ULONG_PTR IoBaseAddress; + ULONG InterruptLevel; + ULONG InterruptVector; + BOOLEAN InterruptShared; + KINTERRUPT_MODE InterruptMode; + + /* Mapped address of the I/O base port */ + PUCHAR IOBase; + + /* TRUE if the NIC can transfer in word mode */ + BOOLEAN WordMode; + + /* Base address and size of the onboard memory window */ + PUCHAR RamBase; + UINT RamSize; + + /* Station Address PROM (SAPROM) */ + UCHAR SAPROM[16]; + + /* Onboard ethernet address from the manufacturer */ + DRIVER_HARDWARE_ADDRESS PermanentAddress; + + /* Ethernet address currently in use */ + DRIVER_HARDWARE_ADDRESS StationAddress; + + /* Maximum number of multicast addresses this adapter supports */ + ULONG MaxMulticastListSize; + + /* List of multicast addresses in use */ + DRIVER_HARDWARE_ADDRESS Addresses[DRIVER_MAX_MULTICAST_LIST_SIZE]; + + /* Current multicast address mask */ + UCHAR MulticastAddressMask[8]; + + /* Masked interrupts (IMR value) */ + ULONG InterruptMask; + + /* Interrupts that have occurred */ + UCHAR InterruptStatus; + + /* Current packet filter */ + ULONG PacketFilter; + + /* Lookahead buffer */ + UINT LookaheadSize; + UCHAR Lookahead[DRIVER_MAXIMUM_LOOKAHEAD + DRIVER_HEADER_SIZE]; + + /* Receive buffer ring */ + UINT PageStart; + UINT PageStop; + UINT CurrentPage; + UINT NextPacket; + + /* TRUE if there was a buffer overflow */ + BOOLEAN BufferOverflow; + + /* TRUE if an error occurred during reception of a packet */ + BOOLEAN ReceiveError; + + /* TRUE if an error occurred during transmission of a packet */ + BOOLEAN TransmitError; + + /* TRUE if a transmit interrupt is pending */ + BOOLEAN TransmitPending; + + /* Received packet header */ + PACKET_HEADER PacketHeader; + + /* Offset in onboard RAM of received packet */ + ULONG PacketOffset; + + /* TRUE if receive indications are done and should be completed */ + BOOLEAN DoneIndicating; + + /* Transmit buffers */ + UINT TXStart; /* Start block of transmit buffer ring */ + UINT TXCount; /* Number of blocks in transmit buffer ring */ + UINT TXFree; /* Number of free transmit buffers */ + UINT TXNext; /* Next buffer to use */ + /* Length of packet. 0 means buffer is unused */ + UINT TXSize[DRIVER_DEFAULT_TX_BUFFER_COUNT]; + INT TXCurrent; /* Current buffer beeing transmitted. -1 means none */ + + /* Head of transmit queue */ + PNDIS_PACKET TXQueueHead; + /* Tail of transmit queue */ + PNDIS_PACKET TXQueueTail; + + /* Statistics */ + ULONG FrameAlignmentErrors; + ULONG CrcErrors; + ULONG MissedPackets; + + /* Flags used for driver cleanup */ + BOOLEAN IOPortRangeRegistered; + BOOLEAN InterruptRegistered; + BOOLEAN ShutdownHandlerRegistered; +} NIC_ADAPTER, *PNIC_ADAPTER; + +/* Global driver information */ +typedef struct _DRIVER_INFORMATION +{ + NDIS_HANDLE NdisWrapperHandle; /* Returned from NdisInitializeWrapper */ + NDIS_HANDLE NdisMacHandle; /* Returned from NdisRegisterMac */ + LIST_ENTRY AdapterListHead; /* Adapters this driver control */ +} DRIVER_INFORMATION, *PDRIVER_INFORMATION; + + + +/* Global variable */ + +extern DRIVER_INFORMATION DriverInfo; +extern NDIS_PHYSICAL_ADDRESS HighestAcceptableMax; + + + +/* Prototypes */ + +BOOLEAN NICCheck( + PNIC_ADAPTER Adapter); + +NDIS_STATUS NICInitialize( + PNIC_ADAPTER Adapter); + +NDIS_STATUS NICSetup( + PNIC_ADAPTER Adapter); + +NDIS_STATUS NICStart( + PNIC_ADAPTER Adapter); + +NDIS_STATUS NICStop( + PNIC_ADAPTER Adapter); + +NDIS_STATUS NICReset( + PNIC_ADAPTER Adapter); + +VOID NICUpdateCounters( + PNIC_ADAPTER Adapter); + +VOID NICReadDataAlign( + PNIC_ADAPTER Adapter, + PUSHORT Target, + ULONG_PTR Source, + USHORT Length); + +VOID NICWriteDataAlign( + PNIC_ADAPTER Adapter, + ULONG_PTR Target, + PUSHORT Source, + USHORT Length); + +VOID NICReadData( + PNIC_ADAPTER Adapter, + PUCHAR Target, + ULONG_PTR Source, + USHORT Length); + +VOID NICWriteData( + PNIC_ADAPTER Adapter, + ULONG_PTR Target, + PUCHAR Source, + USHORT Length); + +VOID NICTransmit( + PNIC_ADAPTER Adapter); + +/* EOF */ Propchange: trunk/reactos/drivers/network/dd/rtl8139/include/nic.h ------------------------------------------------------------------------------ svn:eol-style = native

11 years, 5 months

[hbelusca] 58732: [CONSRV] - Reintegrate the text-only frontend, deactivated in revision r58447. - Use a (temporary) helper ConioIsBufferResizeSupported to know whether or not the frontend supports...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Apr 11 23:37:09 2013 New Revision: 58732 URL: http://svn.reactos.org/svn/reactos?rev=58732&view=rev Log: [CONSRV] - Reintegrate the text-only frontend, deactivated in revision r58447. - Use a (temporary) helper ConioIsBufferResizeSupported to know whether or not the frontend supports screenbuffer resizing. In a near future, all the frontends will support that so this function will be removed. - Promote ConioResizeBuffer to be a function of the console server (not only reserved for the GUI frontend). [WIN32K] - Remove the support of registrating TUI notification window class (feature such as knowing at which console app the notification window belongs to is unneeded when using the TUI). - Start to introduce ConsoleAcquireDisplayOwnership, a win32k console control to let win32k release the display so that we can own it (it is step 0.0.1 on a scale of 0.0.0 to 1.0.0). Note that, as in trunk, getting a text-only interface when booting with the /CONSOLE switch still doesn't work (clash between text-mode and video-mode enabled by win32k). Modified: branches/ros-csrss/win32ss/include/ntuser.h branches/ros-csrss/win32ss/user/consrv/alias.c branches/ros-csrss/win32ss/user/consrv/coninput.c branches/ros-csrss/win32ss/user/consrv/conio.h branches/ros-csrss/win32ss/user/consrv/conoutput.c branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.c branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.h branches/ros-csrss/win32ss/user/consrv/include/conio.h branches/ros-csrss/win32ss/user/ntuser/ntstubs.c branches/ros-csrss/win32ss/user/ntuser/ntuser.c branches/ros-csrss/win32ss/user/ntuser/ntuser.h branches/ros-csrss/win32ss/user/ntuser/window.c Modified: branches/ros-csrss/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/include/ntuse… ============================================================================== --- branches/ros-csrss/win32ss/include/ntuser.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/include/ntuser.h [iso-8859-1] Thu Apr 11 23:37:09 2013 @@ -1566,7 +1566,7 @@ typedef enum _CONSOLECONTROL { GuiConsoleWndClassAtom, - TuiConsoleWndClassAtom, + ConsoleAcquireDisplayOwnership, } CONSOLECONTROL, *PCONSOLECONTROL; NTSTATUS Modified: branches/ros-csrss/win32ss/user/consrv/alias.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/a… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/alias.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/alias.c [iso-8859-1] Thu Apr 11 23:37:09 2013 @@ -40,7 +40,7 @@ PALIAS_HEADER IntFindAliasHeader(PALIAS_HEADER RootHeader, LPCWSTR lpExeName) { - while(RootHeader) + while (RootHeader) { INT diff = _wcsicmp(RootHeader->lpExeName, lpExeName); if (!diff) return RootHeader; @@ -93,7 +93,7 @@ if (Header == NULL) return NULL; RootHeader = Header->Data; - while(RootHeader) + while (RootHeader) { INT diff; DPRINT("IntGetAliasEntry->lpSource %S\n", RootHeader->lpSource); @@ -151,7 +151,7 @@ { UINT length = 0; - while(RootHeader) + while (RootHeader) { length += (wcslen(RootHeader->lpExeName) + 1) * sizeof(WCHAR); RootHeader = RootHeader->Next; @@ -169,7 +169,7 @@ UINT Length; TargetBufferSize /= sizeof(WCHAR); - while(RootHeader) + while (RootHeader) { Length = wcslen(RootHeader->lpExeName) + 1; if (TargetBufferSize > Offset + Length) @@ -194,7 +194,7 @@ UINT Length = 0; PALIAS_ENTRY CurEntry = Header->Data; - while(CurEntry) + while (CurEntry) { Length += wcslen(CurEntry->lpSource); Length += wcslen(CurEntry->lpTarget); @@ -217,7 +217,7 @@ UINT SrcLength, TargetLength; TargetBufferLength /= sizeof(WCHAR); - while(CurEntry) + while (CurEntry) { SrcLength = wcslen(CurEntry->lpSource) + 1; TargetLength = wcslen(CurEntry->lpTarget) + 1; Modified: branches/ros-csrss/win32ss/user/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] Thu Apr 11 23:37:09 2013 @@ -772,7 +772,7 @@ GetInputRequest->InputsRead = 0; Status = ConSrvGetInputBufferAndHandleEntry(ProcessData, GetInputRequest->InputHandle, &InputBuffer, &HandleEntry, GENERIC_READ, TRUE); - if(!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) return Status; InputInfo.CallingThread = CsrGetClientThread(); InputInfo.HandleEntry = HandleEntry; @@ -855,7 +855,7 @@ &InputBuffer, GENERIC_WRITE, TRUE); - if(!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) return Status; /* Discard all entries in the input event queue */ while (!IsListEmpty(&InputBuffer->InputEvents)) Modified: branches/ros-csrss/win32ss/user/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] Thu Apr 11 23:37:09 2013 @@ -10,27 +10,35 @@ /* Macros used to call functions in the FRONTEND_VTBL virtual table */ -#define ConioDrawRegion(Console, Region) (Console)->TermIFace.Vtbl->DrawRegion((Console), (Region)) +#define ConioDrawRegion(Console, Region) \ + (Console)->TermIFace.Vtbl->DrawRegion((Console), (Region)) #define ConioWriteStream(Console, Block, CurStartX, CurStartY, ScrolledLines, Buffer, Length) \ - (Console)->TermIFace.Vtbl->WriteStream((Console), (Block), (CurStartX), (CurStartY), \ - (ScrolledLines), (Buffer), (Length)) -#define ConioSetCursorInfo(Console, Buff) (Console)->TermIFace.Vtbl->SetCursorInfo((Console), (Buff)) + (Console)->TermIFace.Vtbl->WriteStream((Console), (Block), (CurStartX), (CurStartY), \ + (ScrolledLines), (Buffer), (Length)) +#define ConioSetCursorInfo(Console, Buff) \ + (Console)->TermIFace.Vtbl->SetCursorInfo((Console), (Buff)) #define ConioSetScreenInfo(Console, Buff, OldCursorX, OldCursorY) \ - (Console)->TermIFace.Vtbl->SetScreenInfo((Console), (Buff), (OldCursorX), (OldCursorY)) + (Console)->TermIFace.Vtbl->SetScreenInfo((Console), (Buff), (OldCursorX), (OldCursorY)) #define ConioUpdateScreenInfo(Console, Buff) \ - (Console)->TermIFace.Vtbl->UpdateScreenInfo((Console), (Buff)) -#define ConioChangeTitle(Console) (Console)->TermIFace.Vtbl->ChangeTitle(Console) -#define ConioCleanupConsole(Console) (Console)->TermIFace.Vtbl->CleanupConsole(Console) -#define ConioChangeIcon(Console, hWindowIcon) (Console)->TermIFace.Vtbl->ChangeIcon((Console), (hWindowIcon)) -#define ConioResizeBuffer(Console, Buff, Size) (Console)->TermIFace.Vtbl->ResizeBuffer((Console), (Buff), (Size)) -#define ConioResizeTerminal(Console) (Console)->TermIFace.Vtbl->ResizeTerminal((Console)) + (Console)->TermIFace.Vtbl->UpdateScreenInfo((Console), (Buff)) +#define ConioIsBufferResizeSupported(Console) \ + (Console)->TermIFace.Vtbl->IsBufferResizeSupported(Console) +#define ConioChangeTitle(Console) \ + (Console)->TermIFace.Vtbl->ChangeTitle(Console) +#define ConioCleanupConsole(Console) \ + (Console)->TermIFace.Vtbl->CleanupConsole(Console) +#define ConioChangeIcon(Console, hWindowIcon) \ + (Console)->TermIFace.Vtbl->ChangeIcon((Console), (hWindowIcon)) +// #define ConioResizeBuffer(Console, Buff, Size) (Console)->TermIFace.Vtbl->ResizeBuffer((Console), (Buff), (Size)) +#define ConioResizeTerminal(Console) \ + (Console)->TermIFace.Vtbl->ResizeTerminal(Console) #define ConioProcessKeyCallback(Console, Msg, KeyStateMenu, ShiftState, VirtualKeyCode, Down) \ - (Console)->TermIFace.Vtbl->ProcessKeyCallback((Console), (Msg), (KeyStateMenu), (ShiftState), (VirtualKeyCode), (Down)) + (Console)->TermIFace.Vtbl->ProcessKeyCallback((Console), (Msg), (KeyStateMenu), (ShiftState), (VirtualKeyCode), (Down)) #define ConioGetLargestConsoleWindowSize(Console, pSize) \ - (Console)->TermIFace.Vtbl->GetLargestConsoleWindowSize((Console), (pSize)) + (Console)->TermIFace.Vtbl->GetLargestConsoleWindowSize((Console), (pSize)) #define ConioGetConsoleWindowHandle(Console) \ - (Console)->TermIFace.Vtbl->GetConsoleWindowHandle((Console)) + (Console)->TermIFace.Vtbl->GetConsoleWindowHandle(Console) #define ConioRefreshInternalInfo(Console) \ - (Console)->TermIFace.Vtbl->RefreshInternalInfo((Console)) + (Console)->TermIFace.Vtbl->RefreshInternalInfo(Console) /* EOF */ Modified: branches/ros-csrss/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] Thu Apr 11 23:37:09 2013 @@ -30,7 +30,7 @@ ((Rect)->Left) = left; \ ((Rect)->Bottom) = bottom; \ ((Rect)->Right) = right; \ -} while(0) +} while (0) #define ConioIsRectEmpty(Rect) \ (((Rect)->Left > (Rect)->Right) || ((Rect)->Top > (Rect)->Bottom)) @@ -401,6 +401,119 @@ } } +NTSTATUS FASTCALL +ConioResizeBuffer(PCONSOLE Console, + PCONSOLE_SCREEN_BUFFER ScreenBuffer, + COORD Size) +{ + BYTE * Buffer; + DWORD Offset = 0; + BYTE * OldPtr; + USHORT CurrentY; + BYTE * OldBuffer; +#ifdef HAVE_WMEMSET + USHORT value = MAKEWORD(' ', ScreenBuffer->ScreenDefaultAttrib); +#else + DWORD i; +#endif + DWORD diff; + + /* Buffer size is not allowed to be smaller than window size */ + if (Size.X < Console->ConsoleSize.X || Size.Y < Console->ConsoleSize.Y) + return STATUS_INVALID_PARAMETER; + + if (Size.X == ScreenBuffer->ScreenBufferSize.X && Size.Y == ScreenBuffer->ScreenBufferSize.Y) + { + // FIXME: Trigger a buffer resize event ?? + return STATUS_SUCCESS; + } + + if (!ConioIsBufferResizeSupported(Console)) return STATUS_NOT_SUPPORTED; + + Buffer = RtlAllocateHeap(ConSrvHeap, 0, Size.X * Size.Y * 2); + if (!Buffer) return STATUS_NO_MEMORY; + + DPRINT1("Resizing (%d,%d) to (%d,%d)\n", ScreenBuffer->ScreenBufferSize.X, ScreenBuffer->ScreenBufferSize.Y, Size.X, Size.Y); + OldBuffer = ScreenBuffer->Buffer; + + for (CurrentY = 0; CurrentY < ScreenBuffer->ScreenBufferSize.Y && CurrentY < Size.Y; CurrentY++) + { + OldPtr = ConioCoordToPointer(ScreenBuffer, 0, CurrentY); + if (Size.X <= ScreenBuffer->ScreenBufferSize.X) + { + /* reduce size */ + RtlCopyMemory(&Buffer[Offset], OldPtr, Size.X * 2); + Offset += (Size.X * 2); + } + else + { + /* enlarge size */ + RtlCopyMemory(&Buffer[Offset], OldPtr, ScreenBuffer->ScreenBufferSize.X * 2); + Offset += (ScreenBuffer->ScreenBufferSize.X * 2); + + diff = Size.X - ScreenBuffer->ScreenBufferSize.X; + /* zero new part of it */ +#ifdef HAVE_WMEMSET + wmemset((PWCHAR)&Buffer[Offset], value, diff); +#else + for (i = 0; i < diff; i++) + { + Buffer[Offset++] = ' '; + Buffer[Offset++] = ScreenBuffer->ScreenDefaultAttrib; + } +#endif + } + } + + if (Size.Y > ScreenBuffer->ScreenBufferSize.Y) + { + diff = Size.X * (Size.Y - ScreenBuffer->ScreenBufferSize.Y); +#ifdef HAVE_WMEMSET + wmemset((PWCHAR)&Buffer[Offset], value, diff); +#else + for (i = 0; i < diff; i++) + { + Buffer[Offset++] = ' '; + Buffer[Offset++] = ScreenBuffer->ScreenDefaultAttrib; + } +#endif + } + + (void)InterlockedExchangePointer((PVOID volatile*)&ScreenBuffer->Buffer, Buffer); + RtlFreeHeap(ConSrvHeap, 0, OldBuffer); + ScreenBuffer->ScreenBufferSize = Size; + ScreenBuffer->VirtualY = 0; + + /* Ensure cursor and window are within buffer */ + if (ScreenBuffer->CursorPosition.X >= Size.X) + ScreenBuffer->CursorPosition.X = Size.X - 1; + if (ScreenBuffer->CursorPosition.Y >= Size.Y) + ScreenBuffer->CursorPosition.Y = Size.Y - 1; + if (ScreenBuffer->ShowX > Size.X - Console->ConsoleSize.X) + ScreenBuffer->ShowX = Size.X - Console->ConsoleSize.X; + if (ScreenBuffer->ShowY > Size.Y - Console->ConsoleSize.Y) + ScreenBuffer->ShowY = Size.Y - Console->ConsoleSize.Y; + + /* + * Trigger a buffer resize event + */ + if (Console->InputBuffer.Mode & ENABLE_WINDOW_INPUT) + { + INPUT_RECORD er; + + er.EventType = WINDOW_BUFFER_SIZE_EVENT; + er.Event.WindowBufferSizeEvent.dwSize = ScreenBuffer->ScreenBufferSize; + + ConioProcessInputEvent(Console, &er); + } + + /* TODO: Should update scrollbar, but can't use anything that + * calls SendMessage or it could cause deadlock --> Use PostMessage */ + // TODO: Tell the terminal to resize its scrollbars. + + return STATUS_SUCCESS; +} + VOID WINAPI ConioDeleteScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer) { @@ -1148,8 +1261,8 @@ CursorInfoRequest->Info.bVisible = Buff->CursorInfo.bVisible; CursorInfoRequest->Info.dwSize = Buff->CursorInfo.dwSize; + ConSrvReleaseScreenBuffer(Buff, TRUE); - return STATUS_SUCCESS; } @@ -1195,7 +1308,6 @@ } ConSrvReleaseScreenBuffer(Buff, TRUE); - return STATUS_SUCCESS; } @@ -1237,7 +1349,6 @@ } ConSrvReleaseScreenBuffer(Buff, TRUE); - return STATUS_SUCCESS; } @@ -1266,7 +1377,6 @@ } ConSrvReleaseScreenBuffer(Buff, TRUE); - return STATUS_SUCCESS; } @@ -1374,7 +1484,6 @@ pInfo->dwMaximumWindowSize = Buff->ScreenBufferSize; ConSrvReleaseScreenBuffer(Buff, TRUE); - return STATUS_SUCCESS; } @@ -1411,7 +1520,6 @@ ConioDrawConsole(Console); ConSrvReleaseScreenBuffer(Buff, TRUE); - return STATUS_SUCCESS; } @@ -1503,7 +1611,6 @@ } ConSrvReleaseScreenBuffer(Buff, TRUE); - return STATUS_SUCCESS; } @@ -1517,8 +1624,8 @@ if (!NT_SUCCESS(Status)) return Status; Status = ConioResizeBuffer(Buff->Header.Console, Buff, SetScreenBufferSizeRequest->Size); + ConSrvReleaseScreenBuffer(Buff, TRUE); - return Status; } Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Thu Apr 11 23:37:09 2013 @@ -25,10 +25,7 @@ #include "include/settings.h" #include "frontends/gui/guiterm.h" - -#ifdef TUI_CONSOLE - #include "frontends/tui/tuiterm.h" -#endif +#include "frontends/tui/tuiterm.h" #include "include/console.h" #include "console.h" @@ -57,13 +54,11 @@ /* PRIVATE FUNCTIONS **********************************************************/ -#ifdef TUI_CONSOLE static BOOL DtbgIsDesktopVisible(VOID) { return !((BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_ISCONSOLEMODE)); } -#endif static ULONG ConSrvConsoleCtrlEventTimeout(DWORD Event, @@ -640,13 +635,8 @@ * If we are not in GUI-mode, start the text-mode terminal emulator. * If we fail, try to start the GUI-mode terminal emulator. */ -#ifdef TUI_CONSOLE GuiMode = DtbgIsDesktopVisible(); -#else - GuiMode = TRUE; -#endif - -#ifdef TUI_CONSOLE + if (!GuiMode) { DPRINT1("CONSRV: Opening text-mode terminal emulator\n"); @@ -660,7 +650,6 @@ GuiMode = TRUE; } } -#endif /* * Try to open the GUI-mode terminal emulator. Two cases are possible: Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1] Thu Apr 11 23:37:09 2013 @@ -70,7 +70,7 @@ ConsoleLeaderCID = ProcessData->Process->ClientId; \ SetWindowLongPtrW((GuiData)->hWindow, GWLP_CONSOLE_LEADER_PID, (LONG_PTR)(ConsoleLeaderCID.UniqueProcess)); \ SetWindowLongPtrW((GuiData)->hWindow, GWLP_CONSOLE_LEADER_TID, (LONG_PTR)(ConsoleLeaderCID.UniqueThread )); \ -} while(0) +} while (0) /**************************************************************/ static BOOL ConsInitialized = FALSE; @@ -185,7 +185,7 @@ NULL); } i++; - } while(!(Items[i].uID == 0 && Items[i].SubMenu == NULL && Items[i].wCmdID == 0)); + } while (!(Items[i].uID == 0 && Items[i].SubMenu == NULL && Items[i].wCmdID == 0)); } static VOID @@ -209,8 +209,6 @@ GuiConsoleUpdateSelection(PCONSOLE Console, PCOORD coord); static VOID WINAPI GuiDrawRegion(PCONSOLE Console, SMALL_RECT* Region); -static NTSTATUS WINAPI -GuiResizeBuffer(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer, COORD Size); static VOID GuiConsoleResizeWindow(PGUI_CONSOLE_DATA GuiData); @@ -510,7 +508,7 @@ { if ((rgn2 = CreateRectRgnIndirect(&newRect))) { - if(CombineRgn(rgn1, rgn2, rgn1, RGN_XOR) != ERROR) + if (CombineRgn(rgn1, rgn2, rgn1, RGN_XOR) != ERROR) { InvalidateRgn(GuiData->hWindow, rgn1, FALSE); } @@ -861,7 +859,7 @@ GuiInvalidateCell(Console, Buff->CursorPosition.X, Buff->CursorPosition.Y); Buff->CursorBlinkOn = !Buff->CursorBlinkOn; - if((GuiData->OldCursor.x != Buff->CursorPosition.X) || (GuiData->OldCursor.y != Buff->CursorPosition.Y)) + if ((GuiData->OldCursor.x != Buff->CursorPosition.X) || (GuiData->OldCursor.y != Buff->CursorPosition.Y)) { SCROLLINFO xScroll; int OldScrollX = -1, OldScrollY = -1; @@ -870,16 +868,16 @@ xScroll.cbSize = sizeof(SCROLLINFO); xScroll.fMask = SIF_POS; // Capture the original position of the scroll bars and save them. - if(GetScrollInfo(GuiData->hWindow, SB_HORZ, &xScroll))OldScrollX = xScroll.nPos; - if(GetScrollInfo(GuiData->hWindow, SB_VERT, &xScroll))OldScrollY = xScroll.nPos; + if (GetScrollInfo(GuiData->hWindow, SB_HORZ, &xScroll))OldScrollX = xScroll.nPos; + if (GetScrollInfo(GuiData->hWindow, SB_VERT, &xScroll))OldScrollY = xScroll.nPos; // If we successfully got the info for the horizontal scrollbar - if(OldScrollX >= 0) - { - if((Buff->CursorPosition.X < Buff->ShowX)||(Buff->CursorPosition.X >= (Buff->ShowX + Console->ConsoleSize.X))) + if (OldScrollX >= 0) + { + if ((Buff->CursorPosition.X < Buff->ShowX)||(Buff->CursorPosition.X >= (Buff->ShowX + Console->ConsoleSize.X))) { // Handle the horizontal scroll bar - if(Buff->CursorPosition.X >= Console->ConsoleSize.X) NewScrollX = Buff->CursorPosition.X - Console->ConsoleSize.X + 1; + if (Buff->CursorPosition.X >= Console->ConsoleSize.X) NewScrollX = Buff->CursorPosition.X - Console->ConsoleSize.X + 1; else NewScrollX = 0; } else @@ -888,12 +886,12 @@ } } // If we successfully got the info for the vertical scrollbar - if(OldScrollY >= 0) - { - if((Buff->CursorPosition.Y < Buff->ShowY) || (Buff->CursorPosition.Y >= (Buff->ShowY + Console->ConsoleSize.Y))) + if (OldScrollY >= 0) + { + if ((Buff->CursorPosition.Y < Buff->ShowY) || (Buff->CursorPosition.Y >= (Buff->ShowY + Console->ConsoleSize.Y))) { // Handle the vertical scroll bar - if(Buff->CursorPosition.Y >= Console->ConsoleSize.Y) NewScrollY = Buff->CursorPosition.Y - Console->ConsoleSize.Y + 1; + if (Buff->CursorPosition.Y >= Console->ConsoleSize.Y) NewScrollY = Buff->CursorPosition.Y - Console->ConsoleSize.Y + 1; else NewScrollY = 0; } else @@ -906,7 +904,7 @@ // NOTE: OldScroll# and NewScroll# will both be -1 (initial value) if the info for the respective scrollbar // was not obtained successfully in the previous steps. This means their difference is 0 (no scrolling) // and their associated scrollbar is left alone. - if((OldScrollX != NewScrollX) || (OldScrollY != NewScrollY)) + if ((OldScrollX != NewScrollX) || (OldScrollY != NewScrollY)) { Buff->ShowX = NewScrollX; Buff->ShowY = NewScrollY; @@ -918,12 +916,12 @@ NULL, NULL, SW_INVALIDATE); - if(NewScrollX >= 0) + if (NewScrollX >= 0) { xScroll.nPos = NewScrollX; SetScrollInfo(GuiData->hWindow, SB_HORZ, &xScroll, TRUE); } - if(NewScrollY >= 0) + if (NewScrollY >= 0) { xScroll.nPos = NewScrollY; SetScrollInfo(GuiData->hWindow, SB_VERT, &xScroll, TRUE); @@ -1338,8 +1336,8 @@ windx = (Console->ActiveBuffer->ScreenBufferSize.X) * GuiData->CharWidth + 2 * (GetSystemMetrics(SM_CXFRAME) + GetSystemMetrics(SM_CXEDGE)); windy = (Console->ActiveBuffer->ScreenBufferSize.Y) * GuiData->CharHeight + 2 * (GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYEDGE)) + GetSystemMetrics(SM_CYCAPTION); - if(Console->ConsoleSize.X < Console->ActiveBuffer->ScreenBufferSize.X) windy += GetSystemMetrics(SM_CYHSCROLL); // window currently has a horizontal scrollbar - if(Console->ConsoleSize.Y < Console->ActiveBuffer->ScreenBufferSize.Y) windx += GetSystemMetrics(SM_CXVSCROLL); // window currently has a vertical scrollbar + if (Console->ConsoleSize.X < Console->ActiveBuffer->ScreenBufferSize.X) windy += GetSystemMetrics(SM_CYHSCROLL); // window currently has a horizontal scrollbar + if (Console->ConsoleSize.Y < Console->ActiveBuffer->ScreenBufferSize.Y) windx += GetSystemMetrics(SM_CXVSCROLL); // window currently has a vertical scrollbar minMaxInfo->ptMaxTrackSize.x = windx; minMaxInfo->ptMaxTrackSize.y = windy; @@ -1366,29 +1364,29 @@ windy = HIWORD(lParam); // Compensate for existing scroll bars (because lParam values do not accommodate scroll bar) - if(Console->ConsoleSize.X < Buff->ScreenBufferSize.X) windy += GetSystemMetrics(SM_CYHSCROLL); // window currently has a horizontal scrollbar - if(Console->ConsoleSize.Y < Buff->ScreenBufferSize.Y) windx += GetSystemMetrics(SM_CXVSCROLL); // window currently has a vertical scrollbar + if (Console->ConsoleSize.X < Buff->ScreenBufferSize.X) windy += GetSystemMetrics(SM_CYHSCROLL); // window currently has a horizontal scrollbar + if (Console->ConsoleSize.Y < Buff->ScreenBufferSize.Y) windx += GetSystemMetrics(SM_CXVSCROLL); // window currently has a vertical scrollbar charx = windx / GuiData->CharWidth; chary = windy / GuiData->CharHeight; // Character alignment (round size up or down) - if((windx % GuiData->CharWidth) >= (GuiData->CharWidth / 2)) ++charx; - if((windy % GuiData->CharHeight) >= (GuiData->CharHeight / 2)) ++chary; + if ((windx % GuiData->CharWidth) >= (GuiData->CharWidth / 2)) ++charx; + if ((windy % GuiData->CharHeight) >= (GuiData->CharHeight / 2)) ++chary; // Compensate for added scroll bars in new window - if(charx < Buff->ScreenBufferSize.X)windy -= GetSystemMetrics(SM_CYHSCROLL); // new window will have a horizontal scroll bar - if(chary < Buff->ScreenBufferSize.Y)windx -= GetSystemMetrics(SM_CXVSCROLL); // new window will have a vertical scroll bar + if (charx < Buff->ScreenBufferSize.X)windy -= GetSystemMetrics(SM_CYHSCROLL); // new window will have a horizontal scroll bar + if (chary < Buff->ScreenBufferSize.Y)windx -= GetSystemMetrics(SM_CXVSCROLL); // new window will have a vertical scroll bar charx = windx / GuiData->CharWidth; chary = windy / GuiData->CharHeight; // Character alignment (round size up or down) - if((windx % GuiData->CharWidth) >= (GuiData->CharWidth / 2)) ++charx; - if((windy % GuiData->CharHeight) >= (GuiData->CharHeight / 2)) ++chary; + if ((windx % GuiData->CharWidth) >= (GuiData->CharWidth / 2)) ++charx; + if ((windy % GuiData->CharHeight) >= (GuiData->CharHeight / 2)) ++chary; // Resize window - if((charx != Console->ConsoleSize.X) || (chary != Console->ConsoleSize.Y)) + if ((charx != Console->ConsoleSize.X) || (chary != Console->ConsoleSize.Y)) { Console->ConsoleSize.X = (charx <= Buff->ScreenBufferSize.X) ? charx : Buff->ScreenBufferSize.X; Console->ConsoleSize.Y = (chary <= Buff->ScreenBufferSize.Y) ? chary : Buff->ScreenBufferSize.Y; @@ -1397,8 +1395,8 @@ GuiConsoleResizeWindow(GuiData); // Adjust the start of the visible area if we are attempting to show nonexistent areas - if((Buff->ScreenBufferSize.X - Buff->ShowX) < Console->ConsoleSize.X) Buff->ShowX = Buff->ScreenBufferSize.X - Console->ConsoleSize.X; - if((Buff->ScreenBufferSize.Y - Buff->ShowY) < Console->ConsoleSize.Y) Buff->ShowY = Buff->ScreenBufferSize.Y - Console->ConsoleSize.Y; + if ((Buff->ScreenBufferSize.X - Buff->ShowX) < Console->ConsoleSize.X) Buff->ShowX = Buff->ScreenBufferSize.X - Console->ConsoleSize.X; + if ((Buff->ScreenBufferSize.Y - Buff->ShowY) < Console->ConsoleSize.Y) Buff->ShowY = Buff->ScreenBufferSize.Y - Console->ConsoleSize.Y; InvalidateRect(GuiData->hWindow, NULL, TRUE); GuiData->WindowSizeLock = FALSE; @@ -1809,7 +1807,7 @@ * So first empty the message queue. */ /* - while(PeekMessageW(&Msg, NULL, 0, 0, PM_REMOVE)) + while (PeekMessageW(&Msg, NULL, 0, 0, PM_REMOVE)) { TranslateMessage(&Msg); DispatchMessageW(&Msg); @@ -1873,7 +1871,7 @@ SetEvent(*GraphicsStartupEvent); - while(GetMessageW(&msg, NULL, 0, 0)) + while (GetMessageW(&msg, NULL, 0, 0)) { TranslateMessage(&msg); DispatchMessageW(&msg); @@ -2122,114 +2120,10 @@ return TRUE; } -static NTSTATUS WINAPI -GuiResizeBuffer(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer, COORD Size) -{ - BYTE * Buffer; - DWORD Offset = 0; - BYTE * OldPtr; - USHORT CurrentY; - BYTE * OldBuffer; -#ifdef HAVE_WMEMSET - USHORT value = MAKEWORD(' ', ScreenBuffer->ScreenDefaultAttrib); -#else - DWORD i; -#endif - DWORD diff; - - /* Buffer size is not allowed to be smaller than window size */ - if (Size.X < Console->ConsoleSize.X || Size.Y < Console->ConsoleSize.Y) - return STATUS_INVALID_PARAMETER; - - if (Size.X == ScreenBuffer->ScreenBufferSize.X && Size.Y == ScreenBuffer->ScreenBufferSize.Y) - { - // FIXME: Trigger a buffer resize event ?? - return STATUS_SUCCESS; - } - - Buffer = RtlAllocateHeap(ConSrvHeap, 0, Size.X * Size.Y * 2); - if (!Buffer) - return STATUS_NO_MEMORY; - - DPRINT1("Resizing (%d,%d) to (%d,%d)\n", ScreenBuffer->ScreenBufferSize.X, ScreenBuffer->ScreenBufferSize.Y, Size.X, Size.Y); - OldBuffer = ScreenBuffer->Buffer; - - for (CurrentY = 0; CurrentY < ScreenBuffer->ScreenBufferSize.Y && CurrentY < Size.Y; CurrentY++) - { - OldPtr = ConioCoordToPointer(ScreenBuffer, 0, CurrentY); - if (Size.X <= ScreenBuffer->ScreenBufferSize.X) - { - /* reduce size */ - RtlCopyMemory(&Buffer[Offset], OldPtr, Size.X * 2); - Offset += (Size.X * 2); - } - else - { - /* enlarge size */ - RtlCopyMemory(&Buffer[Offset], OldPtr, ScreenBuffer->ScreenBufferSize.X * 2); - Offset += (ScreenBuffer->ScreenBufferSize.X * 2); - - diff = Size.X - ScreenBuffer->ScreenBufferSize.X; - /* zero new part of it */ -#ifdef HAVE_WMEMSET - wmemset((PWCHAR)&Buffer[Offset], value, diff); -#else - for (i = 0; i < diff; i++) - { - Buffer[Offset++] = ' '; - Buffer[Offset++] = ScreenBuffer->ScreenDefaultAttrib; - } -#endif - } - } - - if (Size.Y > ScreenBuffer->ScreenBufferSize.Y) - { - diff = Size.X * (Size.Y - ScreenBuffer->ScreenBufferSize.Y); -#ifdef HAVE_WMEMSET - wmemset((PWCHAR)&Buffer[Offset], value, diff); -#else - for (i = 0; i < diff; i++) - { - Buffer[Offset++] = ' '; - Buffer[Offset++] = ScreenBuffer->ScreenDefaultAttrib; - } -#endif - } - - (void)InterlockedExchangePointer((PVOID volatile*)&ScreenBuffer->Buffer, Buffer); - RtlFreeHeap(ConSrvHeap, 0, OldBuffer); - ScreenBuffer->ScreenBufferSize = Size; - ScreenBuffer->VirtualY = 0; - - /* Ensure cursor and window are within buffer */ - if (ScreenBuffer->CursorPosition.X >= Size.X) - ScreenBuffer->CursorPosition.X = Size.X - 1; - if (ScreenBuffer->CursorPosition.Y >= Size.Y) - ScreenBuffer->CursorPosition.Y = Size.Y - 1; - if (ScreenBuffer->ShowX > Size.X - Console->ConsoleSize.X) - ScreenBuffer->ShowX = Size.X - Console->ConsoleSize.X; - if (ScreenBuffer->ShowY > Size.Y - Console->ConsoleSize.Y) - ScreenBuffer->ShowY = Size.Y - Console->ConsoleSize.Y; - - /* - * Trigger a buffer resize event - */ - if (Console->InputBuffer.Mode & ENABLE_WINDOW_INPUT) - { - INPUT_RECORD er; - - er.EventType = WINDOW_BUFFER_SIZE_EVENT; - er.Event.WindowBufferSizeEvent.dwSize = ScreenBuffer->ScreenBufferSize; - - ConioProcessInputEvent(Console, &er); - } - - /* TODO: Should update scrollbar, but can't use anything that - * calls SendMessage or it could cause deadlock --> Use PostMessage */ - // TODO: Tell the terminal to resize its scrollbars. - - return STATUS_SUCCESS; +static BOOL WINAPI +GuiIsBufferResizeSupported(PCONSOLE Console) +{ + return TRUE; } static VOID WINAPI @@ -2365,7 +2259,7 @@ GuiSetCursorInfo, GuiSetScreenInfo, GuiUpdateScreenInfo, - GuiResizeBuffer, + GuiIsBufferResizeSupported, GuiResizeTerminal, GuiProcessKeyCallback, GuiRefreshInternalInfo, Modified: branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.c [iso-8859-1] Thu Apr 11 23:37:09 2013 @@ -2,18 +2,18 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/frontends/tui/tuiterm.c - * PURPOSE: TUI Terminal Front-End + * PURPOSE: TUI Terminal Front-End - Virtual Consoles... * PROGRAMMERS: David Welch * Gé van Geldorp * Jeffrey Morlan * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -#ifdef TUI_CONSOLE - #include "consrv.h" -#include "settings.h" -#include "tuiconsole.h" +#include "include/conio.h" +// #include "include/console.h" +#include "include/settings.h" +#include "tuiterm.h" #include <drivers/blue/ntddblue.h> #define NDEBUG @@ -22,24 +22,35 @@ /* GLOBALS ********************************************************************/ +#define GetNextConsole(Console) \ + CONTAINING_RECORD(Console->Entry.Flink, TUI_CONSOLE_DATA, Entry) + +#define GetPrevConsole(Console) \ + CONTAINING_RECORD(Console->Entry.Blink, TUI_CONSOLE_DATA, Entry) + + /* TUI Console Window Class name */ #define TUI_CONSOLE_WINDOW_CLASS L"TuiConsoleWindowClass" typedef struct _TUI_CONSOLE_DATA { CRITICAL_SECTION Lock; + LIST_ENTRY Entry; /* Entry in the list of virtual consoles */ // HANDLE hTuiInitEvent; - HWND hWindow; - - PCONSOLE Console; - // TUI_CONSOLE_INFO TuiInfo; + HWND hWindow; /* Handle to the console's window (used for the window's procedure */ + + PCONSOLE Console; /* Pointer to the owned console */ + // TUI_CONSOLE_INFO TuiInfo; /* TUI terminal settings */ } TUI_CONSOLE_DATA, *PTUI_CONSOLE_DATA; -CRITICAL_SECTION ActiveConsoleLock; +/* List of the maintained virtual consoles and its lock */ +static LIST_ENTRY VirtConsList; +static PTUI_CONSOLE_DATA ActiveConsole; /* The active console on screen */ +static CRITICAL_SECTION ActiveVirtConsLock; + static COORD PhysicalConsoleSize; static HANDLE ConsoleDeviceHandle; -static PCONSOLE ActiveConsole; static BOOL ConsInitialized = FALSE; @@ -153,24 +164,10 @@ /**\ \******************************************************************************/ -static LRESULT CALLBACK -TuiConsoleWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - if (msg == WM_ACTIVATE) - { - if (LOWORD(wParam) != WA_INACTIVE) - { - SetFocus(hWnd); - ConioDrawConsole(ActiveConsole); - } - } - return DefWindowProcW(hWnd, msg, wParam, lParam); -} - static BOOL FASTCALL TuiSwapConsole(INT Next) { - static PCONSOLE SwapConsole = NULL; /* console we are thinking about swapping with */ + static PTUI_CONSOLE_DATA SwapConsole = NULL; /* Console we are thinking about swapping with */ DWORD BytesReturned; ANSI_STRING Title; PVOID Buffer; @@ -178,28 +175,26 @@ if (0 != Next) { - /* alt-tab, swap consoles */ - /* move SwapConsole to next console, and print its title */ - EnterCriticalSection(&ActiveConsoleLock); - if (!SwapConsole) - { - SwapConsole = ActiveConsole; - } - - SwapConsole = (0 < Next ? SwapConsole->Next : SwapConsole->Prev); - Title.MaximumLength = RtlUnicodeStringToAnsiSize(&SwapConsole->Title); + /* + * Alt-Tab, swap consoles. + * move SwapConsole to next console, and print its title. + */ + EnterCriticalSection(&ActiveVirtConsLock); + if (!SwapConsole) SwapConsole = ActiveConsole; + + SwapConsole = (0 < Next ? GetNextConsole(SwapConsole) : GetPrevConsole(SwapConsole)); + Title.MaximumLength = RtlUnicodeStringToAnsiSize(&SwapConsole->Console->Title); Title.Length = 0; - Buffer = RtlAllocateHeap(ConSrvHeap, - 0, - sizeof(COORD) + Title.MaximumLength); - pos = (PCOORD )Buffer; - Title.Buffer = (PVOID)((ULONG_PTR)Buffer + sizeof( COORD )); - - RtlUnicodeStringToAnsiString(&Title, &SwapConsole->Title, FALSE); + Buffer = RtlAllocateHeap(ConSrvHeap, 0, + sizeof(COORD) + Title.MaximumLength); + pos = (PCOORD)Buffer; + Title.Buffer = (PVOID)((ULONG_PTR)Buffer + sizeof(COORD)); + + RtlUnicodeStringToAnsiString(&Title, &SwapConsole->Console->Title, FALSE); + pos->X = (PhysicalConsoleSize.X - Title.Length) / 2; pos->Y = PhysicalConsoleSize.Y / 2; - pos->X = (PhysicalConsoleSize.X - Title.Length) / 2; - /* redraw the console to clear off old title */ - ConioDrawConsole(ActiveConsole); + /* Redraw the console to clear off old title */ + ConioDrawConsole(ActiveConsole->Console); if (!DeviceIoControl(ConsoleDeviceHandle, IOCTL_CONSOLE_WRITE_OUTPUT_CHARACTER, NULL, 0, Buffer, sizeof(COORD) + Title.Length, &BytesReturned, NULL)) @@ -207,120 +202,34 @@ DPRINT1( "Error writing to console\n" ); } RtlFreeHeap(ConSrvHeap, 0, Buffer); - LeaveCriticalSection(&ActiveConsoleLock); + LeaveCriticalSection(&ActiveVirtConsLock); return TRUE; } else if (NULL != SwapConsole) { - EnterCriticalSection(&ActiveConsoleLock); + EnterCriticalSection(&ActiveVirtConsLock); if (SwapConsole != ActiveConsole) { - /* first remove swapconsole from the list */ - SwapConsole->Prev->Next = SwapConsole->Next; - SwapConsole->Next->Prev = SwapConsole->Prev; - /* now insert before activeconsole */ - SwapConsole->Next = ActiveConsole; - SwapConsole->Prev = ActiveConsole->Prev; - ActiveConsole->Prev->Next = SwapConsole; - ActiveConsole->Prev = SwapConsole; + /* First remove swapconsole from the list */ + SwapConsole->Entry.Blink->Flink = SwapConsole->Entry.Flink; + SwapConsole->Entry.Flink->Blink = SwapConsole->Entry.Blink; + /* Now insert before activeconsole */ + SwapConsole->Entry.Flink = &ActiveConsole->Entry; + SwapConsole->Entry.Blink = ActiveConsole->Entry.Blink; + ActiveConsole->Entry.Blink->Flink = &SwapConsole->Entry; + ActiveConsole->Entry.Blink = &SwapConsole->Entry; } ActiveConsole = SwapConsole; SwapConsole = NULL; - ConioDrawConsole(ActiveConsole); - LeaveCriticalSection(&ActiveConsoleLock); + ConioDrawConsole(ActiveConsole->Console); + LeaveCriticalSection(&ActiveVirtConsLock); return TRUE; } else { return FALSE; } -} - -static BOOL WINAPI -TuiProcessKeyCallback(PCONSOLE Console, MSG* msg, BYTE KeyStateMenu, DWORD ShiftState, UINT VirtualKeyCode, BOOL Down) -{ - if (0 != (ShiftState & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED)) && - VK_TAB == VirtualKeyCode) - { - if (Down) - { - TuiSwapConsole(ShiftState & SHIFT_PRESSED ? -1 : 1); - } - - return TRUE; - } - else if (VK_MENU == VirtualKeyCode && !Down) - { - return TuiSwapConsole(0); - } - - return FALSE; -} - -static BOOL FASTCALL -TuiInit(DWORD OemCP) -{ - CONSOLE_SCREEN_BUFFER_INFO ScrInfo; - DWORD BytesReturned; - WNDCLASSEXW wc; - ATOM ConsoleClassAtom; - USHORT TextAttribute = FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED; - - ScmLoadDriver(L"Blue"); - - ConsoleDeviceHandle = CreateFileW(L"\\\\.\\BlueScreen", FILE_ALL_ACCESS, 0, NULL, - OPEN_EXISTING, 0, NULL); - if (INVALID_HANDLE_VALUE == ConsoleDeviceHandle) - { - DPRINT1("Failed to open BlueScreen.\n"); - return FALSE; - } - - if (!DeviceIoControl(ConsoleDeviceHandle, IOCTL_CONSOLE_LOADFONT, - &OemCP, sizeof(OemCP), NULL, 0, - &BytesReturned, NULL)) - { - DPRINT1("Failed to load the font for codepage %d\n", OemCP); - /* Let's suppose the font is good enough to continue */ - } - - if (!DeviceIoControl(ConsoleDeviceHandle, IOCTL_CONSOLE_SET_TEXT_ATTRIBUTE, - &TextAttribute, sizeof(TextAttribute), NULL, 0, - &BytesReturned, NULL)) - { - DPRINT1("Failed to set text attribute\n"); - } - - ActiveConsole = NULL; - InitializeCriticalSection(&ActiveConsoleLock); - if (!DeviceIoControl(ConsoleDeviceHandle, IOCTL_CONSOLE_GET_SCREEN_BUFFER_INFO, - NULL, 0, &ScrInfo, sizeof(ScrInfo), &BytesReturned, NULL)) - { - DPRINT1("Failed to get console info\n"); - return FALSE; - } - PhysicalConsoleSize = ScrInfo.dwSize; - - RtlZeroMemory(&wc, sizeof(WNDCLASSEXW)); - wc.cbSize = sizeof(WNDCLASSEXW); - wc.lpszClassName = TUI_CONSOLE_WINDOW_CLASS; - wc.lpfnWndProc = TuiConsoleWndProc; - wc.cbWndExtra = GWLP_CONSOLEWND_ALLOC; - wc.hInstance = ConSrvDllInstance; - - ConsoleClassAtom = RegisterClassExW(&wc); - if (ConsoleClassAtom == 0) - { - DPRINT1("Failed to register TUI console wndproc\n"); - return FALSE; - } - else - { - NtUserConsoleControl(TuiConsoleWndClassAtom, &ConsoleClassAtom, sizeof(ATOM)); - } - - return TRUE; } static VOID FASTCALL @@ -346,174 +255,25 @@ } } -static VOID WINAPI -TuiDrawRegion(PCONSOLE Console, SMALL_RECT* Region) -{ - DWORD BytesReturned; - PCONSOLE_SCREEN_BUFFER Buff = Console->ActiveBuffer; - PCONSOLE_DRAW ConsoleDraw; - UINT ConsoleDrawSize; - - if (ActiveConsole != Console) - { - return; - } - - ConsoleDrawSize = sizeof(CONSOLE_DRAW) + - (ConioRectWidth(Region) * ConioRectHeight(Region)) * 2; - ConsoleDraw = RtlAllocateHeap(ConSrvHeap, 0, ConsoleDrawSize); - if (NULL == ConsoleDraw) - { - DPRINT1("RtlAllocateHeap failed\n"); - return; - } - ConsoleDraw->X = Region->Left; - ConsoleDraw->Y = Region->Top; - ConsoleDraw->SizeX = ConioRectWidth(Region); - ConsoleDraw->SizeY = ConioRectHeight(Region); - ConsoleDraw->CursorX = Buff->CursorPosition.X; - ConsoleDraw->CursorY = Buff->CursorPosition.Y; - - TuiCopyRect((char *) (ConsoleDraw + 1), Buff, Region); - - if (!DeviceIoControl(ConsoleDeviceHandle, IOCTL_CONSOLE_DRAW, - NULL, 0, ConsoleDraw, ConsoleDrawSize, &BytesReturned, NULL)) - { - DPRINT1("Failed to draw console\n"); - RtlFreeHeap(ConSrvHeap, 0, ConsoleDraw); - return; - } - - RtlFreeHeap(ConSrvHeap, 0, ConsoleDraw); -} - -static VOID WINAPI -TuiWriteStream(PCONSOLE Console, SMALL_RECT* Region, LONG CursorStartX, LONG CursorStartY, - UINT ScrolledLines, CHAR *Buffer, UINT Length) -{ - DWORD BytesWritten; - PCONSOLE_SCREEN_BUFFER Buff = Console->ActiveBuffer; - - if (ActiveConsole->ActiveBuffer != Buff) - { - return; - } - - if (!WriteFile(ConsoleDeviceHandle, Buffer, Length, &BytesWritten, NULL)) - { - DPRINT1("Error writing to BlueScreen\n"); - } -} - -static BOOL WINAPI -TuiSetCursorInfo(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff) -{ - CONSOLE_CURSOR_INFO Info; - DWORD BytesReturned; - - if (ActiveConsole->ActiveBuffer != Buff) - { - return TRUE; - } - - Info.dwSize = ConioEffectiveCursorSize(Console, 100); - Info.bVisible = Buff->CursorInfo.bVisible; - - if (!DeviceIoControl(ConsoleDeviceHandle, IOCTL_CONSOLE_SET_CURSOR_INFO, - &Info, sizeof(Info), NULL, 0, &BytesReturned, NULL)) - { - DPRINT1( "Failed to set cursor info\n" ); - return FALSE; - } - - return TRUE; -} - -static BOOL WINAPI -TuiSetScreenInfo(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff, UINT OldCursorX, UINT OldCursorY) -{ - CONSOLE_SCREEN_BUFFER_INFO Info; - DWORD BytesReturned; - - if (ActiveConsole->ActiveBuffer != Buff) - { - return TRUE; - } - - Info.dwCursorPosition = Buff->CursorPosition; - Info.wAttributes = Buff->ScreenDefaultAttrib; - - if (!DeviceIoControl(ConsoleDeviceHandle, IOCTL_CONSOLE_SET_SCREEN_BUFFER_INFO, - &Info, sizeof(CONSOLE_SCREEN_BUFFER_INFO), NULL, 0, - &BytesReturned, NULL)) - { - DPRINT1( "Failed to set cursor position\n" ); - return FALSE; - } - - return TRUE; -} - -static BOOL WINAPI -TuiUpdateScreenInfo(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff) -{ - return TRUE; -} - -static VOID WINAPI -TuiChangeTitle(PCONSOLE Console) -{ -} - -static VOID WINAPI -TuiCleanupConsole(PCONSOLE Console) -{ - DestroyWindow(Console->hWindow); - - EnterCriticalSection(&ActiveConsoleLock); - - /* Switch to next console */ - if (ActiveConsole == Console) - { - ActiveConsole = Console->Next != Console ? Console->Next : NULL; - } - - if (Console->Next != Console) - { - Console->Prev->Next = Console->Next; - Console->Next->Prev = Console->Prev; - } - LeaveCriticalSection(&ActiveConsoleLock); - - if (NULL != ActiveConsole) - { - ConioDrawConsole(ActiveConsole); - } -} - -static BOOL WINAPI -TuiChangeIcon(PCONSOLE Console, HICON hWindowIcon) -{ - return TRUE; -} - -static HWND WINAPI -TuiGetConsoleWindowHandle(PCONSOLE Console) -{ - return Console->hWindow; -} - -static NTSTATUS WINAPI -TuiResizeBuffer(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer, COORD Size) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; +static LRESULT CALLBACK +TuiConsoleWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if (msg == WM_ACTIVATE) + { + if (LOWORD(wParam) != WA_INACTIVE) + { + SetFocus(hWnd); + ConioDrawConsole(ActiveConsole->Console); + } + } + return DefWindowProcW(hWnd, msg, wParam, lParam); } static DWORD WINAPI TuiConsoleThread(PVOID Data) { - PCONSOLE Console = (PCONSOLE) Data; + PTUI_CONSOLE_DATA TuiData = (PTUI_CONSOLE_DATA)Data; + PCONSOLE Console = TuiData->Console; HWND NewWindow; MSG msg; @@ -529,15 +289,15 @@ DPRINT1("CONSRV: Unable to create console window\n"); return 1; } - Console->hWindow = NewWindow; - - SetForegroundWindow(Console->hWindow); - - while (TRUE) - { - GetMessageW(&msg, 0, 0, 0); - DispatchMessage(&msg); + TuiData->hWindow = NewWindow; + + SetForegroundWindow(TuiData->hWindow); + NtUserConsoleControl(ConsoleAcquireDisplayOwnership, NULL, 0); + + while (GetMessageW(&msg, NULL, 0, 0)) + { TranslateMessage(&msg); + DispatchMessageW(&msg); if (msg.message == WM_CHAR || msg.message == WM_SYSCHAR || msg.message == WM_KEYDOWN || msg.message == WM_SYSKEYDOWN || @@ -550,7 +310,306 @@ return 0; } -static TERMINAL_VTBL TuiVtbl = +static BOOL +TuiInit(DWORD OemCP) +{ + BOOL Ret = FALSE; + CONSOLE_SCREEN_BUFFER_INFO ScrInfo; + DWORD BytesReturned; + WNDCLASSEXW wc; + ATOM ConsoleClassAtom; + USHORT TextAttribute = FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED; + + /* Exit if we were already initialized */ + if (ConsInitialized) return TRUE; + + /* + * Initialize the TUI front-end: + * - load the console driver, + * - set default screen attributes, + * - grab the console size. + */ + ScmLoadDriver(L"Blue"); + + ConsoleDeviceHandle = CreateFileW(L"\\\\.\\BlueScreen", + FILE_ALL_ACCESS, + 0, NULL, + OPEN_EXISTING, + 0, NULL); + if (INVALID_HANDLE_VALUE == ConsoleDeviceHandle) + { + DPRINT1("Failed to open BlueScreen.\n"); + return FALSE; + } + + if (!DeviceIoControl(ConsoleDeviceHandle, IOCTL_CONSOLE_LOADFONT, + &OemCP, sizeof(OemCP), NULL, 0, + &BytesReturned, NULL)) + { + DPRINT1("Failed to load the font for codepage %d\n", OemCP); + /* Let's suppose the font is good enough to continue */ + } + + if (!DeviceIoControl(ConsoleDeviceHandle, IOCTL_CONSOLE_SET_TEXT_ATTRIBUTE, + &TextAttribute, sizeof(TextAttribute), NULL, 0, + &BytesReturned, NULL)) + { + DPRINT1("Failed to set text attribute\n"); + } + + ActiveConsole = NULL; + InitializeListHead(&VirtConsList); + InitializeCriticalSection(&ActiveVirtConsLock); + + if (!DeviceIoControl(ConsoleDeviceHandle, IOCTL_CONSOLE_GET_SCREEN_BUFFER_INFO, + NULL, 0, &ScrInfo, sizeof(ScrInfo), &BytesReturned, NULL)) + { + DPRINT1("Failed to get console info\n"); + Ret = FALSE; + goto Quit; + } + PhysicalConsoleSize = ScrInfo.dwSize; + + /* Register the TUI notification window class */ + RtlZeroMemory(&wc, sizeof(WNDCLASSEXW)); + wc.cbSize = sizeof(WNDCLASSEXW); + wc.lpszClassName = TUI_CONSOLE_WINDOW_CLASS; + wc.lpfnWndProc = TuiConsoleWndProc; + wc.cbWndExtra = 0; + wc.hInstance = ConSrvDllInstance; + + ConsoleClassAtom = RegisterClassExW(&wc); + if (ConsoleClassAtom == 0) + { + DPRINT1("Failed to register TUI console wndproc\n"); + Ret = FALSE; + } + else + { + Ret = TRUE; + } + +Quit: + if (Ret == FALSE) + { + DeleteCriticalSection(&ActiveVirtConsLock); + CloseHandle(ConsoleDeviceHandle); + } + + ConsInitialized = Ret; + return Ret; +} + + + +/****************************************************************************** + * TUI Console Driver * + ******************************************************************************/ + +static VOID WINAPI +TuiCleanupConsole(PCONSOLE Console) +{ + PTUI_CONSOLE_DATA TuiData = Console->TermIFace.Data; + + /* Close the notification window */ + DestroyWindow(TuiData->hWindow); + + /* + * Set the active console to the next one + * and remove the console from the list. + */ + EnterCriticalSection(&ActiveVirtConsLock); + ActiveConsole = GetNextConsole(TuiData); + RemoveEntryList(&TuiData->Entry); + + // /* Switch to next console */ + // if (ActiveConsole == TuiData) + // if (ActiveConsole->Console == Console) + // { + // ActiveConsole = (TuiData->Entry.Flink != TuiData->Entry ? GetNextConsole(TuiData) : NULL); + // } + + // if (GetNextConsole(TuiData) != TuiData) + // { + // TuiData->Entry.Blink->Flink = TuiData->Entry.Flink; + // TuiData->Entry.Flink->Blink = TuiData->Entry.Blink; + // } + + LeaveCriticalSection(&ActiveVirtConsLock); + + /* Switch to the next console */ + if (NULL != ActiveConsole) ConioDrawConsole(ActiveConsole->Console); + + Console->TermIFace.Data = NULL; + DeleteCriticalSection(&TuiData->Lock); + RtlFreeHeap(ConSrvHeap, 0, TuiData); +} + +static VOID WINAPI +TuiWriteStream(PCONSOLE Console, SMALL_RECT* Region, LONG CursorStartX, LONG CursorStartY, + UINT ScrolledLines, CHAR *Buffer, UINT Length) +{ + DWORD BytesWritten; + PCONSOLE_SCREEN_BUFFER Buff = Console->ActiveBuffer; + + if (ActiveConsole->Console->ActiveBuffer != Buff) return; + + if (!WriteFile(ConsoleDeviceHandle, Buffer, Length, &BytesWritten, NULL)) + { + DPRINT1("Error writing to BlueScreen\n"); + } +} + +static VOID WINAPI +TuiDrawRegion(PCONSOLE Console, SMALL_RECT* Region) +{ + DWORD BytesReturned; + PCONSOLE_SCREEN_BUFFER Buff = Console->ActiveBuffer; + PCONSOLE_DRAW ConsoleDraw; + UINT ConsoleDrawSize; + + if (ActiveConsole->Console != Console) return; + + ConsoleDrawSize = sizeof(CONSOLE_DRAW) + + (ConioRectWidth(Region) * ConioRectHeight(Region)) * 2; + ConsoleDraw = RtlAllocateHeap(ConSrvHeap, 0, ConsoleDrawSize); + if (NULL == ConsoleDraw) + { + DPRINT1("RtlAllocateHeap failed\n"); + return; + } + ConsoleDraw->X = Region->Left; + ConsoleDraw->Y = Region->Top; + ConsoleDraw->SizeX = ConioRectWidth(Region); + ConsoleDraw->SizeY = ConioRectHeight(Region); + ConsoleDraw->CursorX = Buff->CursorPosition.X; + ConsoleDraw->CursorY = Buff->CursorPosition.Y; + + TuiCopyRect((char *) (ConsoleDraw + 1), Buff, Region); + + if (!DeviceIoControl(ConsoleDeviceHandle, IOCTL_CONSOLE_DRAW, + NULL, 0, ConsoleDraw, ConsoleDrawSize, &BytesReturned, NULL)) + { + DPRINT1("Failed to draw console\n"); + RtlFreeHeap(ConSrvHeap, 0, ConsoleDraw); + return; + } + + RtlFreeHeap(ConSrvHeap, 0, ConsoleDraw); +} + +static BOOL WINAPI +TuiSetCursorInfo(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff) +{ + CONSOLE_CURSOR_INFO Info; + DWORD BytesReturned; + + if (ActiveConsole->Console->ActiveBuffer != Buff) return TRUE; + + Info.dwSize = ConioEffectiveCursorSize(Console, 100); + Info.bVisible = Buff->CursorInfo.bVisible; + + if (!DeviceIoControl(ConsoleDeviceHandle, IOCTL_CONSOLE_SET_CURSOR_INFO, + &Info, sizeof(Info), NULL, 0, &BytesReturned, NULL)) + { + DPRINT1( "Failed to set cursor info\n" ); + return FALSE; + } + + return TRUE; +} + +static BOOL WINAPI +TuiSetScreenInfo(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff, UINT OldCursorX, UINT OldCursorY) +{ + CONSOLE_SCREEN_BUFFER_INFO Info; + DWORD BytesReturned; + + if (ActiveConsole->Console->ActiveBuffer != Buff) return TRUE; + + Info.dwCursorPosition = Buff->CursorPosition; + Info.wAttributes = Buff->ScreenDefaultAttrib; + + if (!DeviceIoControl(ConsoleDeviceHandle, IOCTL_CONSOLE_SET_SCREEN_BUFFER_INFO, + &Info, sizeof(CONSOLE_SCREEN_BUFFER_INFO), NULL, 0, + &BytesReturned, NULL)) + { + DPRINT1( "Failed to set cursor position\n" ); + return FALSE; + } + + return TRUE; +} + +static BOOL WINAPI +TuiUpdateScreenInfo(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff) +{ + return TRUE; +} + +static BOOL WINAPI +TuiIsBufferResizeSupported(PCONSOLE Console) +{ + return (Console && Console->State == CONSOLE_INITIALIZING ? TRUE : FALSE); +} + +static VOID WINAPI +TuiResizeTerminal(PCONSOLE Console) +{ +} + +static BOOL WINAPI +TuiProcessKeyCallback(PCONSOLE Console, MSG* msg, BYTE KeyStateMenu, DWORD ShiftState, UINT VirtualKeyCode, BOOL Down) +{ + if (0 != (ShiftState & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED)) && + VK_TAB == VirtualKeyCode) + { + if (Down) + { + TuiSwapConsole(ShiftState & SHIFT_PRESSED ? -1 : 1); + } + + return TRUE; + } + else if (VK_MENU == VirtualKeyCode && !Down) + { + return TuiSwapConsole(0); + } + + return FALSE; +} + +static VOID WINAPI +TuiRefreshInternalInfo(PCONSOLE Console) +{ +} + +static VOID WINAPI +TuiChangeTitle(PCONSOLE Console) +{ +} + +static BOOL WINAPI +TuiChangeIcon(PCONSOLE Console, HICON hWindowIcon) +{ + return TRUE; +} + +static HWND WINAPI +TuiGetConsoleWindowHandle(PCONSOLE Console) +{ + PTUI_CONSOLE_DATA TuiData = Console->TermIFace.Data; + return TuiData->hWindow; +} + +static VOID WINAPI +TuiGetLargestConsoleWindowSize(PCONSOLE Console, PCOORD pSize) +{ + if (!pSize) return; + *pSize = PhysicalConsoleSize; +} + +static FRONTEND_VTBL TuiVtbl = { TuiCleanupConsole, TuiWriteStream, @@ -558,72 +617,86 @@ TuiSetCursorInfo, TuiSetScreenInfo, TuiUpdateScreenInfo, + TuiIsBufferResizeSupported, + TuiResizeTerminal, + TuiProcessKeyCallback, + TuiRefreshInternalInfo, TuiChangeTitle, TuiChangeIcon, TuiGetConsoleWindowHandle, - TuiResizeBuffer, - TuiProcessKeyCallback + TuiGetLargestConsoleWindowSize }; NTSTATUS FASTCALL TuiInitConsole(PCONSOLE Console, - PCONSOLE_INFO ConsoleInfo) -{ + /*IN*/ PCONSOLE_START_INFO ConsoleStartInfo, + PCONSOLE_INFO ConsoleInfo, + DWORD ProcessId) +{ + PTUI_CONSOLE_DATA TuiData; HANDLE ThreadHandle; - if (!ConsInitialized) - { - ConsInitialized = TRUE; - if (!TuiInit(Console->CodePage)) - { - ConsInitialized = FALSE; - return STATUS_UNSUCCESSFUL; - } - } - + if (Console == NULL || ConsoleInfo == NULL) + return STATUS_INVALID_PARAMETER; + + /* Initialize the TUI terminal emulator */ + if (!TuiInit(Console->CodePage)) return STATUS_UNSUCCESSFUL; + + /* Initialize the console */ Console->TermIFace.Vtbl = &TuiVtbl; - Console->hWindow = NULL; - Console->Size = PhysicalConsoleSize; - Console->ActiveBuffer->ScreenBufferSize = PhysicalConsoleSize; - + + TuiData = RtlAllocateHeap(ConSrvHeap, HEAP_ZERO_MEMORY, + sizeof(TUI_CONSOLE_DATA)); + if (!TuiData) + { + DPRINT1("CONSRV: Failed to create TUI_CONSOLE_DATA\n"); + return STATUS_UNSUCCESSFUL; + } + Console->TermIFace.Data = (PVOID)TuiData; + TuiData->Console = Console; + TuiData->hWindow = NULL; + + InitializeCriticalSection(&TuiData->Lock); + + /* + * HACK: Resize the console since we don't support for now changing + * the console size when we display it with the hardware. + */ + Console->ConsoleSize = PhysicalConsoleSize; + ConioResizeBuffer(Console, Console->ActiveBuffer, PhysicalConsoleSize); + Console->ActiveBuffer->DisplayMode |= CONSOLE_FULLSCREEN_MODE; + // ConioResizeTerminal(Console); + + /* + * Contrary to what we do in the GUI front-end, here we create + * an input thread for each console. It will dispatch all the + * input messages to the proper console (on the GUI it is done + * via the default GUI dispatch thread). + */ ThreadHandle = CreateThread(NULL, 0, TuiConsoleThread, - (PVOID)Console, + (PVOID)TuiData, 0, NULL); if (NULL == ThreadHandle) { DPRINT1("CONSRV: Unable to create console thread\n"); + TuiCleanupConsole(Console); return STATUS_UNSUCCESSFUL; } CloseHandle(ThreadHandle); - EnterCriticalSection(&ActiveConsoleLock); - if (NULL != ActiveConsole) - { - Console->Prev = ActiveConsole; - Console->Next = ActiveConsole->Next; - ActiveConsole->Next->Prev = Console; - ActiveConsole->Next = Console; - } - else - { - Console->Prev = Console; - Console->Next = Console; - } - ActiveConsole = Console; - LeaveCriticalSection(&ActiveConsoleLock); + /* + * Insert the newly created console in the list of virtual consoles + * and activate it (give it the focus). + */ + EnterCriticalSection(&ActiveVirtConsLock); + InsertTailList(&VirtConsList, &TuiData->Entry); + ActiveConsole = TuiData; + LeaveCriticalSection(&ActiveVirtConsLock); return STATUS_SUCCESS; } -PCONSOLE FASTCALL -TuiGetFocusConsole(VOID) -{ - return ActiveConsole; -} - -#endif - /* EOF */ Modified: branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.h [iso-8859-1] Thu Apr 11 23:37:09 2013 @@ -9,10 +9,11 @@ * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -#include "conio.h" +#pragma once NTSTATUS FASTCALL TuiInitConsole(PCONSOLE Console, - PCONSOLE_INFO ConsoleInfo); -PCONSOLE FASTCALL TuiGetFocusConsole(VOID); + /*IN*/ PCONSOLE_START_INFO ConsoleStartInfo, + PCONSOLE_INFO ConsoleInfo, + DWORD ProcessId); /* EOF */ Modified: branches/ros-csrss/win32ss/user/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/i… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/include/conio.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/include/conio.h [iso-8859-1] Thu Apr 11 23:37:09 2013 @@ -108,9 +108,7 @@ UINT OldCursorY); BOOL (WINAPI *UpdateScreenInfo)(struct _CONSOLE* Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer); - NTSTATUS (WINAPI *ResizeBuffer)(struct _CONSOLE* Console, - PCONSOLE_SCREEN_BUFFER ScreenBuffer, - COORD Size); + BOOL (WINAPI *IsBufferResizeSupported)(struct _CONSOLE* Console); VOID (WINAPI *ResizeTerminal)(struct _CONSOLE* Console); BOOL (WINAPI *ProcessKeyCallback)(struct _CONSOLE* Console, MSG* msg, @@ -156,7 +154,6 @@ CRITICAL_SECTION Lock; CONSOLE_STATE State; /* State of the console */ - // struct _CONSOLE *Prev, *Next; /* Next and Prev consoles in console wheel */ LIST_ENTRY Entry; /* Entry in the list of consoles */ LIST_ENTRY ProcessList; /* List of processes owning the console. The first one is the so-called "Console Leader Process" */ @@ -230,10 +227,19 @@ #define ConioRectWidth(Rect) \ (((Rect)->Left) > ((Rect)->Right) ? 0 : ((Rect)->Right) - ((Rect)->Left) + 1) -PBYTE FASTCALL ConioCoordToPointer(PCONSOLE_SCREEN_BUFFER Buf, ULONG X, ULONG Y); +PBYTE FASTCALL ConioCoordToPointer(PCONSOLE_SCREEN_BUFFER Buf, + ULONG X, + ULONG Y); VOID FASTCALL ConioDrawConsole(PCONSOLE Console); -NTSTATUS FASTCALL ConioWriteConsole(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff, - CHAR *Buffer, DWORD Length, BOOL Attrib); -DWORD FASTCALL ConioEffectiveCursorSize(PCONSOLE Console, DWORD Scale); +NTSTATUS FASTCALL ConioResizeBuffer(PCONSOLE Console, + PCONSOLE_SCREEN_BUFFER ScreenBuffer, + COORD Size); +NTSTATUS FASTCALL ConioWriteConsole(PCONSOLE Console, + PCONSOLE_SCREEN_BUFFER Buff, + CHAR *Buffer, + DWORD Length, + BOOL Attrib); +DWORD FASTCALL ConioEffectiveCursorSize(PCONSOLE Console, + DWORD Scale); /* EOF */ Modified: branches/ros-csrss/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/n… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Thu Apr 11 23:37:09 2013 @@ -584,20 +584,8 @@ break; } - case TuiConsoleWndClassAtom: + case ConsoleAcquireDisplayOwnership: { - _SEH2_TRY - { - ProbeForRead(ConsoleCtrlInfo, ConsoleCtrlInfoLength, 1); - ASSERT(ConsoleCtrlInfoLength == sizeof(ATOM)); - gaTuiConsoleWndClass = *(ATOM*)ConsoleCtrlInfo; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - break; } Modified: branches/ros-csrss/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/n… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/ntuser.c [iso-8859-1] Thu Apr 11 23:37:09 2013 @@ -22,7 +22,6 @@ BOOL ClientPfnInit = FALSE; PEPROCESS gpepCSRSS = NULL; ATOM gaGuiConsoleWndClass; -ATOM gaTuiConsoleWndClass; /* PRIVATE FUNCTIONS *********************************************************/ Modified: branches/ros-csrss/win32ss/user/ntuser/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/n… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/ntuser.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/ntuser.h [iso-8859-1] Thu Apr 11 23:37:09 2013 @@ -17,7 +17,6 @@ extern PPROCESSINFO gppiInputProvider; extern PEPROCESS gpepCSRSS; extern ATOM gaGuiConsoleWndClass; -extern ATOM gaTuiConsoleWndClass; INIT_FUNCTION NTSTATUS NTAPI InitUserImpl(VOID); VOID FASTCALL CleanupUserImpl(VOID); Modified: branches/ros-csrss/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/w… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/window.c [iso-8859-1] Thu Apr 11 23:37:09 2013 @@ -3741,8 +3741,7 @@ case QUERY_WINDOW_UNIQUE_PROCESS_ID: { if ( (pWnd->head.pti->TIF_flags & TIF_CSRSSTHREAD) && - ( (pWnd->pcls->atomClassName == gaGuiConsoleWndClass) || - (pWnd->pcls->atomClassName == gaTuiConsoleWndClass) ) ) + (pWnd->pcls->atomClassName == gaGuiConsoleWndClass) ) { // IntGetWindowLong(offset == GWLP_CONSOLE_LEADER_PID) Result = (DWORD)(*((LONG_PTR*)((PCHAR)(pWnd + 1) + GWLP_CONSOLE_LEADER_PID))); @@ -3757,8 +3756,7 @@ case QUERY_WINDOW_UNIQUE_THREAD_ID: { if ( (pWnd->head.pti->TIF_flags & TIF_CSRSSTHREAD) && - ( (pWnd->pcls->atomClassName == gaGuiConsoleWndClass) || - (pWnd->pcls->atomClassName == gaTuiConsoleWndClass) ) ) + (pWnd->pcls->atomClassName == gaGuiConsoleWndClass) ) { // IntGetWindowLong(offset == GWLP_CONSOLE_LEADER_TID) Result = (DWORD)(*((LONG_PTR*)((PCHAR)(pWnd + 1) + GWLP_CONSOLE_LEADER_TID)));

11 years, 5 months

[hbelusca] 58731: [KERNEL32] Fix here also paternity of some code.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Apr 10 20:33:30 2013 New Revision: 58731 URL: http://svn.reactos.org/svn/reactos?rev=58731&view=rev Log: [KERNEL32] Fix here also paternity of some code. Modified: branches/ros-csrss/dll/win32/kernel32/client/console/console.c branches/ros-csrss/dll/win32/kernel32/client/console/init.c branches/ros-csrss/dll/win32/kernel32/client/console/vista.c Modified: branches/ros-csrss/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/client/console/console.c [iso-8859-1] Wed Apr 10 20:33:30 2013 @@ -3,7 +3,7 @@ * PROJECT: ReactOS system libraries * FILE: dll/win32/kernel32/client/console/console.c * PURPOSE: Win32 server console functions - * PROGRAMMER: James Tabor + * PROGRAMMERS: James Tabor * <jimtabor(a)adsl-64-217-116-74.dsl.hstntx.swbell.net> */ Modified: branches/ros-csrss/dll/win32/kernel32/client/console/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/client/console/init.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/client/console/init.c [iso-8859-1] Wed Apr 10 20:33:30 2013 @@ -3,7 +3,9 @@ * PROJECT: ReactOS system libraries * FILE: dll/win32/kernel32/client/console/init.c * PURPOSE: Console API Client Initialization - * PROGRAMMERS: Hermes Belusca - Maito + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Aleksey Bragin (aleksey(a)reactos.org) + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ /* INCLUDES *******************************************************************/ Modified: branches/ros-csrss/dll/win32/kernel32/client/console/vista.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/client/console/vista.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/client/console/vista.c [iso-8859-1] Wed Apr 10 20:33:30 2013 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * PURPOSE: Vista functions - * PROGRAMMER: Thomas Weidenmueller (w3seek(a)reactos.com) + * PROGRAMMERS: Thomas Weidenmueller (w3seek(a)reactos.com) * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */

11 years, 5 months

[hbelusca] 58730: [CONSRV] Try to do some archaeology of names: attempt to attribute some files to programmers who spent lot of time on them, based on SVN history (I might have forget some other on...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Apr 10 20:22:30 2013 New Revision: 58730 URL: http://svn.reactos.org/svn/reactos?rev=58730&view=rev Log: [CONSRV] Try to do some archaeology of names: attempt to attribute some files to programmers who spent lot of time on them, based on SVN history (I might have forget some other ones). Modified: branches/ros-csrss/win32ss/user/consrv/coninput.c branches/ros-csrss/win32ss/user/consrv/coninput.h branches/ros-csrss/win32ss/user/consrv/conio.h branches/ros-csrss/win32ss/user/consrv/conoutput.c branches/ros-csrss/win32ss/user/consrv/conoutput.h branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/frontends/gui/guisettings.c branches/ros-csrss/win32ss/user/consrv/frontends/gui/guisettings.h branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.h branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.c branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.h branches/ros-csrss/win32ss/user/consrv/handle.c branches/ros-csrss/win32ss/user/consrv/handle.h branches/ros-csrss/win32ss/user/consrv/include/conio.h branches/ros-csrss/win32ss/user/consrv/include/settings.h branches/ros-csrss/win32ss/user/consrv/settings.c Modified: branches/ros-csrss/win32ss/user/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] Wed Apr 10 20:22:30 2013 @@ -3,7 +3,8 @@ * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/coninput.c * PURPOSE: Console Input functions - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROGRAMMERS: Jeffrey Morlan + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ /* INCLUDES *******************************************************************/ Modified: branches/ros-csrss/win32ss/user/consrv/coninput.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/coninput.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/coninput.h [iso-8859-1] Wed Apr 10 20:22:30 2013 @@ -3,7 +3,8 @@ * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/coninput.h * PURPOSE: Console Input functions - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROGRAMMERS: Jeffrey Morlan + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ #pragma once Modified: branches/ros-csrss/win32ss/user/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] Wed Apr 10 20:22:30 2013 @@ -9,6 +9,7 @@ #pragma once /* Macros used to call functions in the FRONTEND_VTBL virtual table */ + #define ConioDrawRegion(Console, Region) (Console)->TermIFace.Vtbl->DrawRegion((Console), (Region)) #define ConioWriteStream(Console, Block, CurStartX, CurStartY, ScrolledLines, Buffer, Length) \ (Console)->TermIFace.Vtbl->WriteStream((Console), (Block), (CurStartX), (CurStartY), \ Modified: branches/ros-csrss/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] Wed Apr 10 20:22:30 2013 @@ -3,7 +3,8 @@ * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/conoutput.c * PURPOSE: Console Output functions - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROGRAMMERS: Jeffrey Morlan + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ /* INCLUDES *******************************************************************/ Modified: branches/ros-csrss/win32ss/user/consrv/conoutput.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conoutput.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conoutput.h [iso-8859-1] Wed Apr 10 20:22:30 2013 @@ -3,7 +3,8 @@ * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/conoutput.h * PURPOSE: Console Output functions - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROGRAMMERS: Jeffrey Morlan + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ #pragma once Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Wed Apr 10 20:22:30 2013 @@ -3,7 +3,9 @@ * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/console.c * PURPOSE: Console Management Functions - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROGRAMMERS: Gé van Geldorp + * Jeffrey Morlan + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ /* INCLUDES *******************************************************************/ Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/guisettings.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/guisettings.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/guisettings.c [iso-8859-1] Wed Apr 10 20:22:30 2013 @@ -3,7 +3,8 @@ * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/frontends/gui/guisettings.c * PURPOSE: GUI Terminal Front-End Settings Management - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROGRAMMERS: Johannes Anderwald + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ /* INCLUDES *******************************************************************/ Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/guisettings.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/guisettings.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/guisettings.h [iso-8859-1] Wed Apr 10 20:22:30 2013 @@ -3,7 +3,8 @@ * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/guisettings.h * PURPOSE: GUI front-end settings management - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROGRAMMERS: Johannes Anderwald + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) * * NOTE: Also used by console.dll */ Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1] Wed Apr 10 20:22:30 2013 @@ -3,7 +3,10 @@ * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/frontends/gui/guiterm.c * PURPOSE: GUI Terminal Front-End - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROGRAMMERS: Gé van Geldorp + * Johannes Anderwald + * Jeffrey Morlan + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ /* INCLUDES *******************************************************************/ Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.h [iso-8859-1] Wed Apr 10 20:22:30 2013 @@ -3,7 +3,10 @@ * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/frontends/gui/guiterm.h * PURPOSE: GUI Terminal Front-End - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROGRAMMERS: Gé van Geldorp + * Johannes Anderwald + * Jeffrey Morlan + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ #pragma once Modified: branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.c [iso-8859-1] Wed Apr 10 20:22:30 2013 @@ -3,7 +3,10 @@ * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/frontends/tui/tuiterm.c * PURPOSE: TUI Terminal Front-End - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROGRAMMERS: David Welch + * Gé van Geldorp + * Jeffrey Morlan + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ #ifdef TUI_CONSOLE Modified: branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.h [iso-8859-1] Wed Apr 10 20:22:30 2013 @@ -3,7 +3,10 @@ * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/frontends/tui/tuiterm.h * PURPOSE: TUI Terminal Front-End - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROGRAMMERS: David Welch + * Gé van Geldorp + * Jeffrey Morlan + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ #include "conio.h" Modified: branches/ros-csrss/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/h… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] Wed Apr 10 20:22:30 2013 @@ -3,7 +3,9 @@ * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/handle.c * PURPOSE: Console I/O Handles functions - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROGRAMMERS: David Welch + * Jeffrey Morlan + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ /* INCLUDES *******************************************************************/ Modified: branches/ros-csrss/win32ss/user/consrv/handle.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/h… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/handle.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/handle.h [iso-8859-1] Wed Apr 10 20:22:30 2013 @@ -3,7 +3,9 @@ * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/handle.h * PURPOSE: Console I/O Handles functions - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROGRAMMERS: David Welch + * Jeffrey Morlan + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ #pragma once Modified: branches/ros-csrss/win32ss/user/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/i… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/include/conio.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/include/conio.h [iso-8859-1] Wed Apr 10 20:22:30 2013 @@ -3,7 +3,9 @@ * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/include/conio.h * PURPOSE: Public Console I/O Interface - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROGRAMMERS: Gé van Geldorp + * Jeffrey Morlan + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ #pragma once Modified: branches/ros-csrss/win32ss/user/consrv/include/settings.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/i… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/include/settings.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/include/settings.h [iso-8859-1] Wed Apr 10 20:22:30 2013 @@ -3,9 +3,8 @@ * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/include/settings.h * PURPOSE: Public Console Settings Management Interface - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) - * - * NOTE: Adapted from existing code. + * PROGRAMMERS: Johannes Anderwald + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ #pragma once Modified: branches/ros-csrss/win32ss/user/consrv/settings.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/s… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/settings.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/settings.c [iso-8859-1] Wed Apr 10 20:22:30 2013 @@ -3,9 +3,8 @@ * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/settings.c * PURPOSE: Console settings management - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) - * - * NOTE: Adapted from existing code. + * PROGRAMMERS: Johannes Anderwald + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ /* INCLUDES *******************************************************************/

11 years, 5 months

[pschweitzer] 58729: [RTL] Fix incorrect assignation. Patch by Victor Martinez Reviewed by Timo Kreuzer CORE-7067 #comment Committed in r58729 #resolve

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Apr 10 19:02:54 2013 New Revision: 58729 URL: http://svn.reactos.org/svn/reactos?rev=58729&view=rev Log: [RTL] Fix incorrect assignation. Patch by Victor Martinez Reviewed by Timo Kreuzer CORE-7067 #comment Committed in r58729 #resolve Modified: trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=58729… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Wed Apr 10 19:02:54 2013 @@ -787,7 +787,7 @@ while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, end)) { attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_name); + attr_valueU = xmlstr2unicode(&attr_value); DPRINT1( "unexpected attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); }

11 years, 5 months

[jgardou] 58728: [NTDLL_APITEST] * Enable the test for committing regions larger than the section again * Test behaviour of NtFreeVirtualMemory(MEM_DECOMMIT) for section-backed virtual memory

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Apr 9 23:27:35 2013 New Revision: 58728 URL: http://svn.reactos.org/svn/reactos?rev=58728&view=rev Log: [NTDLL_APITEST] * Enable the test for committing regions larger than the section again * Test behaviour of NtFreeVirtualMemory(MEM_DECOMMIT) for section-backed virtual memory Modified: trunk/rostests/apitests/ntdll/NtMapViewOfSection.c Modified: trunk/rostests/apitests/ntdll/NtMapViewOfSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtMapViewO… ============================================================================== --- trunk/rostests/apitests/ntdll/NtMapViewOfSection.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtMapViewOfSection.c [iso-8859-1] Tue Apr 9 23:27:35 2013 @@ -103,9 +103,11 @@ MEM_COMMIT, PAGE_READWRITE); ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed with Status %lx\n", Status); -#ifndef CORE_7065_FIXED - ok(0, "Committing a range larger than the section crashes. See CORE-7065\n"); -#else + Status = NtFreeVirtualMemory(NtCurrentProcess(), + &BaseAddress, + &ViewSize, + MEM_DECOMMIT); + ok(Status == STATUS_UNABLE_TO_DELETE_SECTION, "NtFreeVirtualMemory returned wrong Status %lx\n", Status); /* Try to commit a range larger than the section */ BaseAddress = (PVOID)0x30000000; ViewSize = 0x3000; @@ -117,7 +119,7 @@ PAGE_READWRITE); ok(Status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory failed with wrong Status %lx\n", Status); -#endif + /* Try to commit a page after the section */ BaseAddress = (PVOID)0x30002000; ViewSize = 0x1000;

11 years, 5 months

[jgardou] 58727: [NTOS/MM] - Fix check for address range fitting the VAD when commiting memory CORE-7065 #comment Should be fixed with r58627 #resolve

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Apr 9 23:24:50 2013 New Revision: 58727 URL: http://svn.reactos.org/svn/reactos?rev=58727&view=rev Log: [NTOS/MM] - Fix check for address range fitting the VAD when commiting memory CORE-7065 #comment Should be fixed with r58627 #resolve Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Tue Apr 9 23:24:50 2013 @@ -4081,7 +4081,7 @@ // // Make sure that this address range actually fits within the VAD for it // - if (((StartingAddress >> PAGE_SHIFT) < FoundVad->StartingVpn) && + if (((StartingAddress >> PAGE_SHIFT) < FoundVad->StartingVpn) || ((EndingAddress >> PAGE_SHIFT) > FoundVad->EndingVpn)) { DPRINT1("Address range does not fit into the VAD\n");

11 years, 5 months

← Newer
1
...
14
15
16
17
18
19
20
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2013