Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 59829: [SACDRV]: Switch !SAC back to VT-UTF8 and remove the previous hacks. [SACDRV]: We need VTUTF8ChannelOEcho. Implement VTUTF8ChannelAnsiDispatch in anticipation.
by ion＠svn.reactos.org 26 Aug '13

26 Aug '13

Author: ion Date: Mon Aug 26 07:16:10 2013 New Revision: 59829 URL: http://svn.reactos.org/svn/reactos?rev=59829&view=rev Log: [SACDRV]: Switch !SAC back to VT-UTF8 and remove the previous hacks. [SACDRV]: We need VTUTF8ChannelOEcho. Implement VTUTF8ChannelAnsiDispatch in anticipation. Modified: trunk/reactos/drivers/sac/driver/conmgr.c trunk/reactos/drivers/sac/driver/sacdrv.h trunk/reactos/drivers/sac/driver/vtutf8chan.c Modified: trunk/reactos/drivers/sac/driver/conmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/conmgr.… ============================================================================== --- trunk/reactos/drivers/sac/driver/conmgr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/conmgr.c [iso-8859-1] Mon Aug 26 07:16:10 2013 @@ -169,7 +169,7 @@ /* Setup the attributes for the raw SAC channel */ RtlZeroMemory(&SacChannelAttributes, sizeof(SacChannelAttributes)); - SacChannelAttributes.ChannelType = Raw; /* FIXME: Should be VtUtf8 */ + SacChannelAttributes.ChannelType = VtUtf8; /* Get the right name for it */ pcwch = GetMessage(SAC_CHANNEL_NAME); @@ -725,7 +725,7 @@ /* Read every character in the channel, and strip whitespace */ ChannelIRead(CurrentChannel, ReadBuffer, - sizeof(CHAR), /* FIXME: Should be sizeof(ReadBuffer) */ + sizeof(ReadBuffer), &ReadBufferSize); } while ((ReadBufferSize) && ((ReadBuffer[0] == ' ') || (ReadBuffer[0] == '\t'))); @@ -740,7 +740,7 @@ /* Read each character -- there should be max 80 */ ChannelIRead(CurrentChannel, ReadBuffer, - sizeof(CHAR), /* FIXME: Should be sizeof(ReadBuffer) */ + sizeof(ReadBuffer), &ReadBufferSize); ASSERT(i < SAC_VTUTF8_COL_WIDTH); InputBuffer[i++] = ReadBuffer[0]; Modified: trunk/reactos/drivers/sac/driver/sacdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/sacdrv.… ============================================================================== --- trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] Mon Aug 26 07:16:10 2013 @@ -11,6 +11,7 @@ #include <ntifs.h> #include <intrin.h> #include <wchar.h> +#include <stdio.h> #include <ndk/obtypes.h> #include <ndk/exfuncs.h> #include <ndk/rtlfuncs.h> @@ -211,7 +212,7 @@ } SAC_MESSAGE_ENTRY, *PSAC_MESSAGE_ENTRY; // -// These are the VT-100/220/ANSI Escape Codes supported by SAC +// These are the VT-100/220/ANSI Escape Codes supported by SAC as input // typedef enum _SAC_ANSI_COMMANDS { @@ -240,6 +241,25 @@ SacSetFontColor, SacSetColorsAndAttributes } SAC_ANSI_COMMANDS; + +// +// These are the VT-100/220/ANSI Escape Codes send by SAC as output +// +typedef enum _SAC_ANSI_DISPATCH +{ + SacAnsiClearScreen, + SacAnsiClearEndOfScreen, + SacAnsiClearEndOfLine, + SacAnsiSetColors, + SacAnsiSetPosition, + SacAnsiClearAttributes, + SacAnsiSetInverseAttribute, + SacAnsiClearInverseAttribute, + SacAnsiSetBlinkAttribute, + SacAnsiClearBlinkAttribute, + SacAnsiSetBoldAttribute, + SacAnsiClearBoldAttribute +} SAC_ANSI_DISPATCH; // // SAC supports 3 different channel output types Modified: trunk/reactos/drivers/sac/driver/vtutf8chan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/vtutf8c… ============================================================================== --- trunk/reactos/drivers/sac/driver/vtutf8chan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/vtutf8chan.c [iso-8859-1] Mon Aug 26 07:16:10 2013 @@ -65,14 +65,130 @@ NTSTATUS NTAPI -VTUTF8ChannelAnsiDispatch( - IN NTSTATUS Status, - IN ULONG AnsiCode, - IN PWCHAR Data, - IN ULONG Length - ) -{ - return STATUS_NOT_IMPLEMENTED; +VTUTF8ChannelAnsiDispatch(IN PSAC_CHANNEL Channel, + IN SAC_ANSI_DISPATCH AnsiCode, + IN INT* Data, + IN ULONG Length) +{ + NTSTATUS Status = STATUS_SUCCESS; + PCHAR LocalBuffer = NULL; + INT l; + CHECK_PARAMETER1(Channel); + + /* Check which ANSI sequence we should output */ + switch (AnsiCode) + { + /* Send the [2J (Clear Screen and Reset Cursor) */ + case SacAnsiClearScreen: + LocalBuffer = "\x1B[2J"; + break; + + /* Send the [0J (Clear From Position Till End Of Screen) */ + case SacAnsiClearEndOfScreen: + LocalBuffer = "\x1B[0J"; + break; + + /* Send the [0K (Clear from Position Till End Of Line) */ + case SacAnsiClearEndOfLine: + LocalBuffer = "\x1B[0K"; + break; + + /* Send a combination of two [#m attribute changes */ + case SacAnsiSetColors: + + /* Allocate a small local buffer for it */ + LocalBuffer = SacAllocatePool(SAC_VTUTF8_COL_WIDTH, GLOBAL_BLOCK_TAG); + CHECK_ALLOCATION(LocalBuffer); + + /* Caller should have sent two colors as two integers */ + if (!(Data) || (Length != 8)) + { + Status = STATUS_INVALID_PARAMETER; + break; + } + + /* Create the escape sequence string */ + l = sprintf(LocalBuffer, "\x1B[%dm\x1B[%dm", Data[1], Data[0]); + ASSERT((l + 1)*sizeof(UCHAR) < SAC_VTUTF8_COL_WIDTH); + ASSERT(LocalBuffer); + break; + + /* Send the [#;#H (Cursor Positio) sequence */ + case SacAnsiSetPosition: + + /* Allocate a small local buffer for it */ + LocalBuffer = SacAllocatePool(SAC_VTUTF8_COL_WIDTH, GLOBAL_BLOCK_TAG); + CHECK_ALLOCATION(LocalBuffer); + + /* Caller should have sent the position as two integers */ + if (!(Data) || (Length != 8)) + { + Status = STATUS_INVALID_PARAMETER; + break; + } + + /* Create the escape sequence string */ + l = sprintf(LocalBuffer, "\x1B[%d;%dH", Data[1] + 1, Data[0] + 1); + ASSERT((l + 1)*sizeof(UCHAR) < SAC_VTUTF8_COL_WIDTH); + ASSERT(LocalBuffer); + break; + + /* Send the [0m sequence (Set Attribute 0) */ + case SacAnsiClearAttributes: + LocalBuffer = "\x1B[0m"; + break; + + /* Send the [7m sequence (Set Attribute 7) */ + case SacAnsiSetInverseAttribute: + LocalBuffer = "\x1B[7m"; + break; + + /* Send the [27m sequence (Set Attribute 27) */ + case SacAnsiClearInverseAttribute: + LocalBuffer = "\x1B[27m"; + break; + + /* Send the [5m sequence (Set Attribute 5) */ + case SacAnsiSetBlinkAttribute: + LocalBuffer = "\x1B[5m"; + break; + + /* Send the [25m sequence (Set Attribute 25) */ + case SacAnsiClearBlinkAttribute: + LocalBuffer = "\x1B[25m"; + break; + + /* Send the [1m sequence (Set Attribute 1) */ + case SacAnsiSetBoldAttribute: + LocalBuffer = "\x1B[1m"; + break; + + /* Send the [22m sequence (Set Attribute 22) */ + case SacAnsiClearBoldAttribute: + LocalBuffer = "\x1B[22m"; + break; + + /* We don't recognize it */ + default: + Status = STATUS_INVALID_PARAMETER; + break; + } + + /* Did everything work above? */ + if (NT_SUCCESS(Status)) + { + /* Go write out the sequence */ + Status = ConMgrWriteData(Channel, LocalBuffer, strlen(LocalBuffer)); + if (NT_SUCCESS(Status)) + { + /* Now flush it */ + Status = ConMgrFlushData(Channel); + } + } + + /* Free the temporary buffer, if any, and return the status */ + if (LocalBuffer) SacFreePool(LocalBuffer); + return Status; } NTSTATUS

1 0

[ion] 59828: [SACDRV]: Implement VTUTF8ChannelOWrite2. Time to try out the !SAC on VT-UTF8 mode now.
by ion＠svn.reactos.org 26 Aug '13

26 Aug '13

Author: ion Date: Mon Aug 26 06:25:41 2013 New Revision: 59828 URL: http://svn.reactos.org/svn/reactos?rev=59828&view=rev Log: [SACDRV]: Implement VTUTF8ChannelOWrite2. Time to try out the !SAC on VT-UTF8 mode now. Modified: trunk/reactos/drivers/sac/driver/vtutf8chan.c Modified: trunk/reactos/drivers/sac/driver/vtutf8chan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/vtutf8c… ============================================================================== --- trunk/reactos/drivers/sac/driver/vtutf8chan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/vtutf8chan.c [iso-8859-1] Mon Aug 26 06:25:41 2013 @@ -305,86 +305,115 @@ switch (Action) { case SacCursorUp: + /* Check if we are scrolling too high */ if (Channel->CursorRow < Number) { + /* Reset the row to the top */ Channel->CursorRow = 0; } else { + /* We're fine -- scroll up by that much */ Channel->CursorRow -= Number; } + + /* All done */ VTUTF8ChannelAssertCursor(Channel); break; case SacCursorDown: + /* Check if we are scrolling too low */ if (Channel->CursorRow >= SAC_VTUTF8_ROW_HEIGHT) { + /* Reset the row to the bottom */ Channel->CursorRow = SAC_VTUTF8_ROW_HEIGHT; } else { + /* We're fine -- scroll down by that much */ Channel->CursorRow += Number; } + + /* All done */ VTUTF8ChannelAssertCursor(Channel); break; case SacCursorLeft: + /* Check if we're scrolling too much to the left */ if (Channel->CursorCol < Number) { + /* Reset the column to the left-most margin */ Channel->CursorCol = 0; } else { + /* We're fine -- scroll left by that much */ Channel->CursorCol -= Number; } + + /* All done */ VTUTF8ChannelAssertCursor(Channel); break; case SacCursorRight: + /* Check if we're scrolling too much to the right */ if (Channel->CursorCol >= SAC_VTUTF8_COL_WIDTH) { + /* Reset the column to the right-most margin */ Channel->CursorCol = SAC_VTUTF8_COL_WIDTH; } else { + /* We're fine -- scroll right by that much */ Channel->CursorCol += Number; } + + /* All done */ VTUTF8ChannelAssertCursor(Channel); break; case SacFontNormal: + /* Reset the cursor attributes */ Channel->CursorFlags = 0; Channel->CursorBackColor = SetBackColorBlack; Channel->CursorColor = SetColorWhite; break; case SacFontBlink: + /* Set the appropriate flag */ Channel->CursorFlags |= SAC_CURSOR_FLAG_BLINK; break; case SacFontBlinkOff: + /* Clear the appropriate flag */ Channel->CursorFlags &= ~SAC_CURSOR_FLAG_BLINK; break; case SacFontBold: + /* Set the appropriate flag */ Channel->CursorFlags |= SAC_CURSOR_FLAG_BOLD; break; case SacFontBoldOff: + /* Clear the appropriate flag */ Channel->CursorFlags &= ~SAC_CURSOR_FLAG_BOLD; break; case SacFontInverse: + /* Set the appropriate flag */ Channel->CursorFlags |= SAC_CURSOR_FLAG_INVERTED; break; case SacFontInverseOff: + /* Clear the appropriate flag */ Channel->CursorFlags &= ~SAC_CURSOR_FLAG_INVERTED; break; case SacEraseEndOfLine: + /* Loop all columns in this line past the current position */ for (i = Channel->CursorCol; i < SAC_VTUTF8_COL_WIDTH; i++) { + /* Replace everything after the current position with blanks */ Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorFlags = Channel->CursorFlags; Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + @@ -397,8 +426,10 @@ break; case SacEraseStartOfLine: + /* Loop all columns in this line, before the current position */ for (i = 0; i < (Channel->CursorCol + 1); i++) { + /* Replace everything after the current position with blanks */ Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorFlags = Channel->CursorFlags; Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + @@ -411,8 +442,10 @@ break; case SacEraseLine: + /* Loop all the columns in this line */ for (i = 0; i < SAC_VTUTF8_COL_WIDTH; i++) { + /* Replace them all with blanks */ Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorFlags = Channel->CursorFlags; Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + @@ -445,24 +478,30 @@ break; case SacSetColors: + /* Set the cursor colors */ Channel->CursorColor = Number; Channel->CursorBackColor = Number2; break; case SacSetBackgroundColor: + /* Set the cursor back color */ Channel->CursorBackColor = Number; break; case SacSetFontColor: + /* Set the cursor text color */ Channel->CursorColor = Number; break; case SacSetColorsAndAttributes: + /* Set the cursor flag and colors */ Channel->CursorFlags = Number; Channel->CursorColor = Number2; Channel->CursorBackColor = Number3; break; + default: + /* Unknown, do nothing */ break; } @@ -549,16 +588,16 @@ IN ULONG BufferSize, OUT PULONG ByteCount) { + ASSERT(FALSE); return STATUS_NOT_IMPLEMENTED; } NTSTATUS NTAPI -VTUTF8ChannelOFlush( - IN PSAC_CHANNEL Channel - ) -{ - return STATUS_NOT_IMPLEMENTED; +VTUTF8ChannelOFlush(IN PSAC_CHANNEL Channel) +{ + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; } NTSTATUS @@ -567,7 +606,156 @@ IN PCHAR String, IN ULONG Size) { - return STATUS_NOT_IMPLEMENTED; + PSAC_CURSOR_DATA Cursor; + ULONG i, EscapeSize, R, C; + PWSTR pwch; + CHECK_PARAMETER1(Channel); + CHECK_PARAMETER2(String); + VTUTF8ChannelAssertCursor(Channel); + + /* Loop every character */ + Cursor = (PSAC_CURSOR_DATA)Channel->OBuffer; + for (i = 0; i < Size; i++) + { + /* Check what the character is */ + pwch = (PWSTR)&String[i]; + switch (*pwch) + { + /* It's an escape sequence... */ + case L'\x1B': + + /* Send it to the parser, see how long the sequence was */ + EscapeSize = VTUTF8ChannelConsumeEscapeSequence(Channel, pwch); + if (EscapeSize) + { + /* Consume that many characters for next time*/ + i += EscapeSize - 1; + } + else + { + /* Invalid escape sequence, skip just the ESC character */ + i++; + } + + /* Keep going*/ + break; + + /* It's a line feed */ + case L'\n': + + /* Simply reset the column to zero on the current line */ + Channel->CursorCol = 0; + break; + + /* It's a carriage feed */ + case L'\r': + + /* Move to the next row */ + Channel->CursorRow++; + + /* Check if we hit the last row on the screen */ + if (Channel->CursorRow >= SAC_VTUTF8_ROW_HEIGHT) + { + /* Go over every row before the last one */ + for (R = 0; R < (SAC_VTUTF8_ROW_HEIGHT - 1); R++) + { + /* Sanity check, since we always copy one row below */ + ASSERT((R + 1) < SAC_VTUTF8_ROW_HEIGHT); + + /* Loop every character on the row */ + for (C = 0; C < SAC_VTUTF8_COL_WIDTH; C++) + { + /* And replace it with one from the row below */ + Cursor[(R * SAC_VTUTF8_COL_WIDTH) + + (C * SAC_VTUTF8_ROW_HEIGHT)] = + Cursor[((R + 1)* SAC_VTUTF8_COL_WIDTH) + + (C * SAC_VTUTF8_ROW_HEIGHT)]; + } + } + + /* Now we're left with the before-last row, zero it out */ + ASSERT(R == (SAC_VTUTF8_ROW_HEIGHT - 1)); + RtlZeroMemory(&Cursor[SAC_VTUTF8_COL_WIDTH * R], + sizeof(SAC_CURSOR_DATA) * SAC_VTUTF8_COL_WIDTH); + + /* Reset the row back by one */ + Channel->CursorRow--; + VTUTF8ChannelAssertCursor(Channel); + } + break; + + /* It's a TAB character */ + case L'\t': + + /* Loop the remaining characters until a multiple of 4 */ + VTUTF8ChannelAssertCursor(Channel); + for (C = (4 - Channel->CursorCol % 4); C; C--) + { + /* Fill each remaining character with a space */ + VTUTF8ChannelAssertCursor(Channel); + Cursor[(SAC_VTUTF8_COL_WIDTH * Channel->CursorRow) + + (SAC_VTUTF8_ROW_HEIGHT * Channel->CursorCol)].CursorFlags = Channel->CursorFlags; + Cursor[(SAC_VTUTF8_COL_WIDTH * Channel->CursorRow) + + (SAC_VTUTF8_ROW_HEIGHT * Channel->CursorCol)].CursorBackColor = Channel->CursorBackColor; + Cursor[(SAC_VTUTF8_COL_WIDTH * Channel->CursorRow) + + (SAC_VTUTF8_ROW_HEIGHT * Channel->CursorCol)].CursorColor = Channel->CursorColor; + Cursor[(SAC_VTUTF8_COL_WIDTH * Channel->CursorRow) + + (SAC_VTUTF8_ROW_HEIGHT * Channel->CursorCol)].CursorValue = ' '; + + /* Move to the next character position, but don't overflow */ + Channel->CursorCol++; + if (Channel->CursorCol >= SAC_VTUTF8_COL_WIDTH) + { + Channel->CursorCol = SAC_VTUTF8_COL_WIDTH - 1; + } + } + + /* All done, move to the next one */ + VTUTF8ChannelAssertCursor(Channel); + break; + + /* It's a backspace or delete character */ + case L'\b': + case L'\x7F': + + /* Move back one character, unless we had nothing typed */ + if (Channel->CursorCol) Channel->CursorCol--; + VTUTF8ChannelAssertCursor(Channel); + break; + + /* It's some other character */ + default: + + /* Is it non-printable? Ignore it and keep parsing */ + if (*pwch < L' ') continue; + + /* Otherwise, print it out with the current attributes */ + VTUTF8ChannelAssertCursor(Channel); + Cursor[(SAC_VTUTF8_COL_WIDTH * Channel->CursorRow) + + (SAC_VTUTF8_ROW_HEIGHT * Channel->CursorCol)].CursorFlags = Channel->CursorFlags; + Cursor[(SAC_VTUTF8_COL_WIDTH * Channel->CursorRow) + + (SAC_VTUTF8_ROW_HEIGHT * Channel->CursorCol)].CursorBackColor = Channel->CursorBackColor; + Cursor[(SAC_VTUTF8_COL_WIDTH * Channel->CursorRow) + + (SAC_VTUTF8_ROW_HEIGHT * Channel->CursorCol)].CursorColor = Channel->CursorColor; + Cursor[(SAC_VTUTF8_COL_WIDTH * Channel->CursorRow) + + (SAC_VTUTF8_ROW_HEIGHT * Channel->CursorCol)].CursorValue = *pwch; + + /* Move forward one character, but make sure not to overflow */ + Channel->CursorCol++; + if (Channel->CursorCol == SAC_VTUTF8_COL_WIDTH) + { + Channel->CursorCol = SAC_VTUTF8_COL_WIDTH - 1; + } + + /* All done, move to the next one */ + VTUTF8ChannelAssertCursor(Channel); + break; + } + } + + /* Parsing of the input string completed -- string was written */ + VTUTF8ChannelAssertCursor(Channel); + return STATUS_SUCCESS; } NTSTATUS

1 0

[ion] 59827: [SACDRV]: Last WIP pass at VTUTF8ChannelConsumeEscapeSequence. Document the last few commands, and comment the entire parser so that it makes sense (within MS's definition of making se...
by ion＠svn.reactos.org 25 Aug '13

25 Aug '13

Author: ion Date: Sun Aug 25 23:44:13 2013 New Revision: 59827 URL: http://svn.reactos.org/svn/reactos?rev=59827&view=rev Log: [SACDRV]: Last WIP pass at VTUTF8ChannelConsumeEscapeSequence. Document the last few commands, and comment the entire parser so that it makes sense (within MS's definition of making sense). The erase/clear commands need cleanup/implementation, will take a pass at those later. Modified: trunk/reactos/drivers/sac/driver/sacdrv.h trunk/reactos/drivers/sac/driver/vtutf8chan.c Modified: trunk/reactos/drivers/sac/driver/sacdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/sacdrv.… ============================================================================== --- trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] Sun Aug 25 23:44:13 2013 @@ -235,8 +235,10 @@ SacEraseScreen, SacSetCursorPosition, SacSetScrollRegion, - SacSetBackgroundColor = 21, - SacSetFontColor + SacSetColors, + SacSetBackgroundColor, + SacSetFontColor, + SacSetColorsAndAttributes } SAC_ANSI_COMMANDS; // @@ -1325,3 +1327,154 @@ /* Return if there's any new data in the input buffer */ return Channel->ChannelHasNewIBufferData; } + +// +// FIXME: ANSI.H +// +// +// Source: http://en.wikipedia.org/wiki/ANSI_escape_code +// +typedef enum _VT_ANSI_ATTRIBUTES +{ + // + // Attribute modifiers (mostly supported) + // + Normal, + Bold, + Faint, + Italic, + Underline, + SlowBlink, + FastBlink, + Inverse, + Conceal, + Strikethrough, + + // + // Font selectors (not supported) + // + PrimaryFont, + AlternateFont1, + AlternateFont2, + AlternateFont3, + Alternatefont4, + AlteronateFont5, + AlteronateFont6, + AlternateFont7, + AlternatEfont8, + Alternatefont9, + + // + // Additional attributes (not supported) + // + Fraktur, + DoubleUnderline, + + // + // Attribute Un-modifiers (mostly supported) + // + BoldOff, + ItalicOff, + UnderlineOff, + BlinkOff, + Reserved, + InverseOff, + ConcealOff, + StrikethroughOff, + + // + // Standard Text Color + // + SetColorStart, + SetColorBlack = SetColorStart, + SetColorRed, + SetColorGreen, + SetColorYellow, + SetColorBlue, + SetcolorMAgent, + SetColorCyan, + SetColorWhite, + SetColorMax = SetColorWhite, + + // + // Extended Text Color (not supported) + // + SetColor256, + SeTextColorDefault, + + // + // Standard Background Color + // + SetBackColorStart, + SetBackColorBlack = SetBackColorStart, + SetBackColorRed, + SetBackColorGreen, + SetBackColorYellow, + SetBackColorBlue, + SetBackcolorMAgent, + SetBackColorCyan, + SetBackColorWhite, + SetBackColorMax = SetBackColorWhite, + + // + // Extended Background Color (not supported) + // + SetBackColor256, + SetBackColorDefault, + + // + // Extra Attributes (not supported) + // + Reserved1, + Framed, + Encircled, + Overlined, + FramedOff, + OverlinedOff, + Reserved2, + Reserved3, + Reserved4, + Reserved5 + + // + // Ideograms (not supported) + // +} VT_ANSI_ATTRIBUTES; + +// +// The following site is a good reference on VT100/ANSI escape codes +// http://www.termsys.demon.co.uk/vtansi.htm +// +#define VT_ANSI_ESCAPE L'\x1B' +#define VT_ANSI_COMMAND L'[' + +#define VT_ANSI_CURSOR_UP_CHAR L'A' +#define VT_ANSI_CURSOR_UP L"[A" + +#define VT_ANSI_CURSOR_DOWN_CHAR L'B' +#define VT_ANSI_CURSOR_DOWN L"[B" + +#define VT_ANSI_CURSOR_RIGHT_CHAR L'C' +#define VT_ANSI_CURSOR_RIGHT L"[C" + +#define VT_ANSI_CURSOR_LEFT_CHAR L'D' +#define VT_ANSI_CURSOR_LEFT L"[D" + +#define VT_ANSI_ERASE_LINE_CHAR L'K' +#define VT_ANSI_ERASE_END_LINE L"[K" +#define VT_ANSI_ERASE_START_LINE L"[1K" +#define VT_ANSI_ERASE_ENTIRE_LINE L"[2K" + +#define VT_ANSI_ERASE_SCREEN_CHAR L'J' +#define VT_ANSI_ERASE_DOWN_SCREEN L"[J" +#define VT_ANSI_ERASE_UP_SCREEN L"[1J" +#define VT_ANSI_ERASE_ENTIRE_SCREEN L"[2J" + +#define VT_ANSI_BACKTAB_CHAR L'Z' +#define VT_220_BACKTAB L"[0Z" + +#define VT_ANSI_SET_ATTRIBUTE_CHAR L'm' +#define VT_ANSI_SEPARATOR_CHAR L';' +#define VT_ANSI_HVP_CURSOR_CHAR L'f' +#define VT_ANSI_CUP_CURSOR_CHAR L'H' +#define VT_ANSI_SCROLL_CHAR L'r' Modified: trunk/reactos/drivers/sac/driver/vtutf8chan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/vtutf8c… ============================================================================== --- trunk/reactos/drivers/sac/driver/vtutf8chan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/vtutf8chan.c [iso-8859-1] Sun Aug 25 23:44:13 2013 @@ -14,156 +14,6 @@ CHAR IncomingUtf8ConversionBuffer[4]; WCHAR IncomingUnicodeValue; - -/* FUNCTIONS *****************************************************************/ - -// -// Source: http://en.wikipedia.org/wiki/ANSI_escape_code -// -typedef enum _VT_ANSI_ATTRIBUTES -{ - // - // Attribute modifiers (mostly supported) - // - Normal, - Bold, - Faint, - Italic, - Underline, - SlowBlink, - FastBlink, - Inverse, - Conceal, - Strikethrough, - - // - // Font selectors (not supported) - // - PrimaryFont, - AlternateFont1, - AlternateFont2, - AlternateFont3, - Alternatefont4, - AlteronateFont5, - AlteronateFont6, - AlternateFont7, - AlternatEfont8, - Alternatefont9, - - // - // Additional attributes (not supported) - // - Fraktur, - DoubleUnderline, - - // - // Attribute Un-modifiers (mostly supported) - // - BoldOff, - ItalicOff, - UnderlineOff, - BlinkOff, - Reserved, - InverseOff, - ConcealOff, - StrikethroughOff, - - // - // Standard Text Color - // - SetColorStart, - SetColorBlack = SetColorStart, - SetColorRed, - SetColorGreen, - SetColorYellow, - SetColorBlue, - SetcolorMAgent, - SetColorCyan, - SetColorWhite, - SetColorMax = SetColorWhite, - - // - // Extended Text Color (not supported) - // - SetColor256, - SeTextColorDefault, - - // - // Standard Background Color - // - SetBackColorStart, - SetBackColorBlack = SetBackColorStart, - SetBackColorRed, - SetBackColorGreen, - SetBackColorYellow, - SetBackColorBlue, - SetBackcolorMAgent, - SetBackColorCyan, - SetBackColorWhite, - SetBackColorMax = SetBackColorWhite, - - // - // Extended Background Color (not supported) - // - SetBackColor256, - SetBackColorDefault, - - // - // Extra Attributes (not supported) - // - Reserved1, - Framed, - Encircled, - Overlined, - FramedOff, - OverlinedOff, - Reserved2, - Reserved3, - Reserved4, - Reserved5 - - // - // Ideograms (not supported) - // -} VT_ANSI_ATTRIBUTES; - -// -// The following site is a good reference on VT100/ANSI escape codes -// http://www.termsys.demon.co.uk/vtansi.htm -// -#define VT_ANSI_ESCAPE L'\x1B' -#define VT_ANSI_COMMAND L'[' - -#define VT_ANSI_CURSOR_UP_CHAR L'A' -#define VT_ANSI_CURSOR_UP L"[A" - -#define VT_ANSI_CURSOR_DOWN_CHAR L'B' -#define VT_ANSI_CURSOR_DOWN L"[B" - -#define VT_ANSI_CURSOR_RIGHT_CHAR L'C' -#define VT_ANSI_CURSOR_RIGHT L"[C" - -#define VT_ANSI_CURSOR_LEFT_CHAR L'D' -#define VT_ANSI_CURSOR_LEFT L"[D" - -#define VT_ANSI_ERASE_LINE_CHAR L'K' -#define VT_ANSI_ERASE_END_LINE L"[K" -#define VT_ANSI_ERASE_START_LINE L"[1K" -#define VT_ANSI_ERASE_ENTIRE_LINE L"[2K" - -#define VT_ANSI_ERASE_SCREEN_CHAR L'J' -#define VT_ANSI_ERASE_DOWN_SCREEN L"[J" -#define VT_ANSI_ERASE_UP_SCREEN L"[1J" -#define VT_ANSI_ERASE_ENTIRE_SCREEN L"[2J" - -#define VT_ANSI_BACKTAB_CHAR L'Z' -#define VT_220_BACKTAB L"[0Z" - -#define VT_ANSI_SET_ATTRIBUTE_CHAR L'm' -#define VT_ANSI_SEPARATOR_CHAR L';' -#define VT_ANSI_HVP_CURSOR_CHAR L'f' -#define VT_ANSI_CUP_CURSOR_CHAR L'H' -#define VT_ANSI_SCROLL_CHAR L'r' SAC_STATIC_ESCAPE_STRING SacStaticEscapeStrings [] = { @@ -180,6 +30,16 @@ { VT_ANSI_ERASE_ENTIRE_SCREEN, 3, SacEraseScreen }, }; +/* FUNCTIONS *****************************************************************/ + +FORCEINLINE +VOID +VTUTF8ChannelAssertCursor(IN PSAC_CHANNEL Channel) +{ + ASSERT(Channel->CursorRow < SAC_VTUTF8_ROW_HEIGHT); + ASSERT(Channel->CursorCol < SAC_VTUTF8_COL_WIDTH); +} + BOOLEAN NTAPI VTUTF8ChannelScanForNumber(IN PWCHAR String, @@ -225,16 +85,14 @@ return STATUS_NOT_IMPLEMENTED; } -FORCEINLINE -VOID -VTUTF8ChannelAssertCursor(IN PSAC_CHANNEL Channel) -{ - ASSERT(Channel->CursorRow < SAC_VTUTF8_ROW_HEIGHT); - ASSERT(Channel->CursorCol < SAC_VTUTF8_COL_WIDTH); -} - // -// Not a +// This function is the guts of the sequences that SAC supports. +// +// It is written to conform to the way that Microsoft's SAC driver interprets +// the ANSI standard. If you want to extend and/or "fix" it, please use a flag +// that can be set in the Registry to enable "extended" ANSI support or etc... +// +// Hermes, I'm looking at you, buddy. // ULONG NTAPI @@ -246,12 +104,18 @@ PSAC_CURSOR_DATA Cursor; ASSERT(String[0] == VT_ANSI_ESCAPE); + /* Microsoft's driver does this after the O(n) check below. Be smarter. */ + if (String[1] != VT_ANSI_COMMAND) return 0; + + /* Now that we know it's a valid command, look through the common cases */ for (i = 0; i < RTL_NUMBER_OF(SacStaticEscapeStrings); i++) { + /* Check if an optimized sequence was detected */ if (!wcsncmp(String + 1, SacStaticEscapeStrings[i].Sequence, SacStaticEscapeStrings[i].Size)) { + /* Yep, return the right action, length, and set optionals to 1 */ Action = SacStaticEscapeStrings[i].Action; Result = SacStaticEscapeStrings[i].Size + 1; Number = Number2 = Number3 = 1; @@ -259,10 +123,11 @@ } } - if (String[1] != VT_ANSI_COMMAND) return 0; - + /* It's a more complex sequence, start parsing it */ Result = 0; Sequence = String + 2; + + /* First, check for the cursor sequences. This is useless due to above. */ switch (*Sequence) { case VT_ANSI_CURSOR_UP_CHAR: @@ -289,113 +154,154 @@ break; } + /* This must be a sequence starting with ESC[# */ if (!VTUTF8ChannelScanForNumber(Sequence, &Number)) return 0; while ((*Sequence >= L'0') && (*Sequence <= L'9')) Sequence++; + /* Check if this is ESC[#m */ if (*Sequence == VT_ANSI_SET_ATTRIBUTE_CHAR) { + /* Some attribute is being set, go over the ones we support */ switch (Number) { + /* Make the font standard */ case Normal: Action = SacFontNormal; break; + /* Make the font bold */ case Bold: Action = SacFontBold; break; + /* Make the font blink */ case SlowBlink: Action = SacFontBlink; break; + /* Make the font colors inverted */ case Inverse: Action = SacFontInverse; break; + /* Make the font standard intensity */ case BoldOff: Action = SacFontBoldOff; break; + /* Turn off blinking */ case BlinkOff: Action = SacFontBlinkOff; break; + /* Turn off inverted colors */ case InverseOff: Action = SacFontInverseOff; break; + /* Something else... */ default: + + /* Is a background color being set? */ if ((Number < SetBackColorStart) || (Number > SetBackColorMax)) { + /* Nope... is it the foreground color? */ if ((Number < SetColorStart) || (Number > SetColorMax)) { + /* Nope. SAC expects no other attributes so bail out */ ASSERT(FALSE); return 0; } + /* Yep -- the number will tell us which */ Action = SacSetFontColor; } else { + /* Yep -- the number will tell us which */ Action = SacSetBackgroundColor; } break; } + /* In all cases, we're done here */ goto ProcessString; } + /* The only allowed possibility now is ESC[#;# */ if (*Sequence != VT_ANSI_SEPARATOR_CHAR) return 0; - Sequence++; if (!VTUTF8ChannelScanForNumber(Sequence, &Number2)) return 0; while ((*Sequence >= L'0') && (*Sequence <= L'9')) Sequence++; - if (*Sequence == VT_ANSI_SET_ATTRIBUTE_CHAR) - { - Action = 20; - goto ProcessString; - } - - if (*Sequence == VT_ANSI_CUP_CURSOR_CHAR) - { - Action = SacSetCursorPosition; - goto ProcessString; - } - - if (*Sequence != VT_ANSI_SEPARATOR_CHAR) return 0; - - Sequence++; - - if ((*Sequence == VT_ANSI_CUP_CURSOR_CHAR) || - (*Sequence == VT_ANSI_HVP_CURSOR_CHAR)) - { - Action = SacSetCursorPosition; - goto ProcessString; - } - - if (*Sequence == VT_ANSI_SCROLL_CHAR) - { - Action = SacSetScrollRegion; - goto ProcessString; - } - + /* There's two valid forms accepted at this point: ESC[#;#m and ESC[#;#H */ + switch (*Sequence) + { + /* This is ESC[#;#m -- used to set both colors at once */ + case VT_ANSI_SET_ATTRIBUTE_CHAR: + Action = SacSetColors; + goto ProcessString; + + /* This is ESC[#;#H -- used to set the cursor position */ + case VT_ANSI_CUP_CURSOR_CHAR: + Action = SacSetCursorPosition; + goto ProcessString; + + /* Finally, this *could* be ESC[#;#; -- we'll keep parsing */ + case VT_ANSI_SEPARATOR_CHAR: + Sequence++; + break; + + /* Abandon anything else */ + default: + return 0; + } + + /* The SAC seems to accept a few more possibilities if a ';' follows... */ + switch (*Sequence) + { + /* Both ESC[#;#;H and ESC[#;#;f are really the same command */ + case VT_ANSI_CUP_CURSOR_CHAR: + case VT_ANSI_HVP_CURSOR_CHAR: + /* It's unclear why MS doesn't allow the HVP sequence on its own */ + Action = SacSetCursorPosition; + goto ProcessString; + + /* And this is the ESC[#;#;r command to set the scroll region... */ + case VT_ANSI_SCROLL_CHAR: + /* Again, not clear why ESC[#;#r isn't supported */ + Action = SacSetScrollRegion; + goto ProcessString; + + /* Anything else must be ESC[#;#;# */ + default: + break; + } + + /* Get the last "#" */ if (!VTUTF8ChannelScanForNumber(Sequence, &Number3)) return 0; while ((*Sequence >= L'0') && (*Sequence <= L'9')) Sequence++; + /* And now the only remaining possibility is ESC[#;#;#;m */ if (*Sequence == VT_ANSI_SET_ATTRIBUTE_CHAR) { - Action = 23; + /* Which sets both color and attributes in one command */ + Action = SacSetColorsAndAttributes; goto ProcessString; } + /* No other sequences supported */ return 0; ProcessString: + /* Unless we got here from the optimized path, calculate the length */ if (!Result) Result = Sequence - String + 1; + /* Get the current cell buffer */ Cursor = (PSAC_CURSOR_DATA)Channel->OBuffer; VTUTF8ChannelAssertCursor(Channel); + + /* Handle all the supported SAC ANSI commands */ switch (Action) { case SacCursorUp: @@ -519,21 +425,26 @@ break; case SacEraseEndOfScreen: + ASSERT(FALSE); // todo break; case SacEraseStartOfScreen: + ASSERT(FALSE); // todo break; case SacEraseScreen: + ASSERT(FALSE); // todo break; case SacSetCursorPosition: + ASSERT(FALSE); // todo break; case SacSetScrollRegion: - break; - - case 20: + ASSERT(FALSE); // todo + break; + + case SacSetColors: Channel->CursorColor = Number; Channel->CursorBackColor = Number2; break; @@ -546,7 +457,7 @@ Channel->CursorColor = Number; break; - case 23: + case SacSetColorsAndAttributes: Channel->CursorFlags = Number; Channel->CursorColor = Number2; Channel->CursorBackColor = Number3; @@ -555,6 +466,7 @@ break; } + /* Return the length of the sequence */ return Result; }

1 0

[ion] 59826: [SACDRV]: A few more ANSI commands. Also now that I grok ANSI, CursorX and CursorY were actually back/fore colors. Also define cursor flags/attributes that SAC supports (bold, inverted...
by ion＠svn.reactos.org 25 Aug '13

25 Aug '13

Author: ion Date: Sun Aug 25 23:13:00 2013 New Revision: 59826 URL: http://svn.reactos.org/svn/reactos?rev=59826&view=rev Log: [SACDRV]: A few more ANSI commands. Also now that I grok ANSI, CursorX and CursorY were actually back/fore colors. Also define cursor flags/attributes that SAC supports (bold, inverted, blinking). WANTED: The fact that the SAC developers cherry-picked *which* ANSI standard and VT standard they were going to follow, threw in ANSI.SYS compatibility, and then added a bunch of bugs, makes me wonder if real people use SAC on Windows... Modified: trunk/reactos/drivers/sac/driver/sacdrv.h trunk/reactos/drivers/sac/driver/vtutf8chan.c Modified: trunk/reactos/drivers/sac/driver/sacdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/sacdrv.… ============================================================================== --- trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] Sun Aug 25 23:13:00 2013 @@ -174,6 +174,13 @@ #define SAC_CHANNEL_FLAG_LOCK_EVENT 0x8 #define SAC_CHANNEL_FLAG_REDRAW_EVENT 0x10 #define SAC_CHANNEL_FLAG_APPLICATION 0x20 + +// +// Cursor Flags +// +#define SAC_CURSOR_FLAG_BLINK 1 +#define SAC_CURSOR_FLAG_BOLD 2 +#define SAC_CURSOR_FLAG_INVERTED 4 // // Forward definitions @@ -226,6 +233,8 @@ SacEraseEndOfScreen, SacEraseStartOfScreen, SacEraseScreen, + SacSetCursorPosition, + SacSetScrollRegion, SacSetBackgroundColor = 21, SacSetFontColor } SAC_ANSI_COMMANDS; @@ -272,9 +281,9 @@ // typedef struct _SAC_CURSOR_DATA { - UCHAR CursorX; - UCHAR CursorY; - UCHAR CursorVisible; + UCHAR CursorBackColor; + UCHAR CursorColor; + UCHAR CursorFlags; WCHAR CursorValue; } SAC_CURSOR_DATA, *PSAC_CURSOR_DATA; C_ASSERT(sizeof(SAC_CURSOR_DATA) == 6); @@ -403,9 +412,9 @@ LONG ChannelHasNewIBufferData; UCHAR CursorRow; UCHAR CursorCol; - UCHAR CursorY; - UCHAR CursorX; - UCHAR CursorVisible; + UCHAR CursorColor; + UCHAR CursorBackColor; + UCHAR CursorFlags; PCHAR OBuffer; ULONG OBufferIndex; ULONG OBufferFirstGoodIndex; Modified: trunk/reactos/drivers/sac/driver/vtutf8chan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/vtutf8c… ============================================================================== --- trunk/reactos/drivers/sac/driver/vtutf8chan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/vtutf8chan.c [iso-8859-1] Sun Aug 25 23:13:00 2013 @@ -161,6 +161,9 @@ #define VT_ANSI_SET_ATTRIBUTE_CHAR L'm' #define VT_ANSI_SEPARATOR_CHAR L';' +#define VT_ANSI_HVP_CURSOR_CHAR L'f' +#define VT_ANSI_CUP_CURSOR_CHAR L'H' +#define VT_ANSI_SCROLL_CHAR L'r' SAC_STATIC_ESCAPE_STRING SacStaticEscapeStrings [] = { @@ -343,8 +346,8 @@ } if (*Sequence != VT_ANSI_SEPARATOR_CHAR) return 0; + Sequence++; - if (!VTUTF8ChannelScanForNumber(Sequence, &Number2)) return 0; while ((*Sequence >= L'0') && (*Sequence <= L'9')) Sequence++; @@ -354,9 +357,9 @@ goto ProcessString; } - if (*Sequence == L'H') - { - Action = 18; + if (*Sequence == VT_ANSI_CUP_CURSOR_CHAR) + { + Action = SacSetCursorPosition; goto ProcessString; } @@ -364,15 +367,16 @@ Sequence++; - if ((*Sequence == L'H') || (*Sequence == L'f')) - { - Action = 18; + if ((*Sequence == VT_ANSI_CUP_CURSOR_CHAR) || + (*Sequence == VT_ANSI_HVP_CURSOR_CHAR)) + { + Action = SacSetCursorPosition; goto ProcessString; } - if (*Sequence == L'r') - { - Action = 19; + if (*Sequence == VT_ANSI_SCROLL_CHAR) + { + Action = SacSetScrollRegion; goto ProcessString; } @@ -394,7 +398,7 @@ VTUTF8ChannelAssertCursor(Channel); switch (Action) { - case 0: + case SacCursorUp: if (Channel->CursorRow < Number) { Channel->CursorRow = 0; @@ -406,7 +410,7 @@ VTUTF8ChannelAssertCursor(Channel); break; - case 1: + case SacCursorDown: if (Channel->CursorRow >= SAC_VTUTF8_ROW_HEIGHT) { Channel->CursorRow = SAC_VTUTF8_ROW_HEIGHT; @@ -418,7 +422,7 @@ VTUTF8ChannelAssertCursor(Channel); break; - case 3: + case SacCursorLeft: if (Channel->CursorCol < Number) { Channel->CursorCol = 0; @@ -430,7 +434,7 @@ VTUTF8ChannelAssertCursor(Channel); break; - case 2: + case SacCursorRight: if (Channel->CursorCol >= SAC_VTUTF8_COL_WIDTH) { Channel->CursorCol = SAC_VTUTF8_COL_WIDTH; @@ -442,110 +446,110 @@ VTUTF8ChannelAssertCursor(Channel); break; - case 4: - Channel->CursorVisible = 0; - Channel->CursorX = 40; - Channel->CursorY = 37; - break; - - case 5: - Channel->CursorVisible |= 1; - break; - - case 6: - Channel->CursorVisible &= ~1; - break; - - case 7: - Channel->CursorVisible |= 2; - break; - - case 8: - Channel->CursorVisible &= ~2; - break; - - case 9: - Channel->CursorVisible |= 4; - break; - - case 10: - Channel->CursorVisible &= ~4; - break; - - case 12: + case SacFontNormal: + Channel->CursorFlags = 0; + Channel->CursorBackColor = SetBackColorBlack; + Channel->CursorColor = SetColorWhite; + break; + + case SacFontBlink: + Channel->CursorFlags |= SAC_CURSOR_FLAG_BLINK; + break; + + case SacFontBlinkOff: + Channel->CursorFlags &= ~SAC_CURSOR_FLAG_BLINK; + break; + + case SacFontBold: + Channel->CursorFlags |= SAC_CURSOR_FLAG_BOLD; + break; + + case SacFontBoldOff: + Channel->CursorFlags &= ~SAC_CURSOR_FLAG_BOLD; + break; + + case SacFontInverse: + Channel->CursorFlags |= SAC_CURSOR_FLAG_INVERTED; + break; + + case SacFontInverseOff: + Channel->CursorFlags &= ~SAC_CURSOR_FLAG_INVERTED; + break; + + case SacEraseEndOfLine: for (i = Channel->CursorCol; i < SAC_VTUTF8_COL_WIDTH; i++) { Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + - (i * SAC_VTUTF8_ROW_HEIGHT)].CursorVisible = Channel->CursorVisible; - Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + - (i * SAC_VTUTF8_ROW_HEIGHT)].CursorX = Channel->CursorY; - Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + - (i * SAC_VTUTF8_ROW_HEIGHT)].CursorY = Channel->CursorX; + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorFlags = Channel->CursorFlags; + Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorBackColor = Channel->CursorColor; + Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorColor = Channel->CursorBackColor; Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorValue = ' '; } break; - case 13: + case SacEraseStartOfLine: for (i = 0; i < (Channel->CursorCol + 1); i++) { Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + - (i * SAC_VTUTF8_ROW_HEIGHT)].CursorVisible = Channel->CursorVisible; - Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + - (i * SAC_VTUTF8_ROW_HEIGHT)].CursorX = Channel->CursorY; - Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + - (i * SAC_VTUTF8_ROW_HEIGHT)].CursorY = Channel->CursorX; + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorFlags = Channel->CursorFlags; + Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorBackColor = Channel->CursorColor; + Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorColor = Channel->CursorBackColor; Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorValue = ' '; } break; - case 14: + case SacEraseLine: for (i = 0; i < SAC_VTUTF8_COL_WIDTH; i++) { Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + - (i * SAC_VTUTF8_ROW_HEIGHT)].CursorVisible = Channel->CursorVisible; - Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + - (i * SAC_VTUTF8_ROW_HEIGHT)].CursorX = Channel->CursorY; - Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + - (i * SAC_VTUTF8_ROW_HEIGHT)].CursorY = Channel->CursorX; + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorFlags = Channel->CursorFlags; + Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorBackColor = Channel->CursorColor; + Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorColor = Channel->CursorBackColor; Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorValue = ' '; } break; - case 15: - break; - - case 16: - break; - - case 17: - break; - - case 18: - break; - - case 19: + case SacEraseEndOfScreen: + break; + + case SacEraseStartOfScreen: + break; + + case SacEraseScreen: + break; + + case SacSetCursorPosition: + break; + + case SacSetScrollRegion: break; case 20: - Channel->CursorY = Number; - Channel->CursorX = Number2; - break; - - case 21: - Channel->CursorX = Number; - break; - - case 22: - Channel->CursorY = Number; + Channel->CursorColor = Number; + Channel->CursorBackColor = Number2; + break; + + case SacSetBackgroundColor: + Channel->CursorBackColor = Number; + break; + + case SacSetFontColor: + Channel->CursorColor = Number; break; case 23: - Channel->CursorVisible = Number; - Channel->CursorY = Number2; - Channel->CursorX = Number3; + Channel->CursorFlags = Number; + Channel->CursorColor = Number2; + Channel->CursorBackColor = Number3; break; default: break; @@ -563,13 +567,13 @@ CHECK_PARAMETER(Channel); /* Set the current channel cursor parameters */ - Channel->CursorVisible = 0; - Channel->CursorX = 40; - Channel->CursorY = 37; + Channel->CursorFlags = 0; + Channel->CursorBackColor = SetBackColorBlack; + Channel->CursorColor = SetColorWhite; /* Loop the output buffer height by width */ Cursor = (PSAC_CURSOR_DATA)Channel->OBuffer; - y = SAC_VTUTF8_COL_HEIGHT - 1; + y = SAC_VTUTF8_ROW_HEIGHT; do { x = SAC_VTUTF8_COL_WIDTH; @@ -577,8 +581,8 @@ { /* For every character, set the defaults */ Cursor->CursorValue = ' '; - Cursor->CursorX = 40; - Cursor->CursorY = 38; + Cursor->CursorBackColor = SetBackColorBlack; + Cursor->CursorColor = SetColorWhite; /* Move to the next character */ Cursor++;

1 0

[ion] 59825: [SACDRV]: Start adding definitions/macros/etc based on my reading of ANSI standards (which MS-DOS ANSI.sys of course doesn't respect...). Still WIP. Sources (URLs) listed as appropriate.
by ion＠svn.reactos.org 25 Aug '13

25 Aug '13

Author: ion Date: Sun Aug 25 22:49:32 2013 New Revision: 59825 URL: http://svn.reactos.org/svn/reactos?rev=59825&view=rev Log: [SACDRV]: Start adding definitions/macros/etc based on my reading of ANSI standards (which MS-DOS ANSI.sys of course doesn't respect...). Still WIP. Sources (URLs) listed as appropriate. Modified: trunk/reactos/drivers/sac/driver/rawchan.c trunk/reactos/drivers/sac/driver/sacdrv.h trunk/reactos/drivers/sac/driver/vtutf8chan.c Modified: trunk/reactos/drivers/sac/driver/rawchan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/rawchan… ============================================================================== --- trunk/reactos/drivers/sac/driver/rawchan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/rawchan.c [iso-8859-1] Sun Aug 25 22:49:32 2013 @@ -13,9 +13,6 @@ /* GLOBALS *******************************************************************/ /* FUNCTIONS *****************************************************************/ - -#define SAC_RAW_OBUFFER_SIZE 0x2000 -#define SAC_RAW_IBUFFER_SIZE 0x2000 NTSTATUS NTAPI Modified: trunk/reactos/drivers/sac/driver/sacdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/sacdrv.… ============================================================================== --- trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] Sun Aug 25 22:49:32 2013 @@ -160,6 +160,10 @@ #define SAC_VTUTF8_COL_HEIGHT 25 #define SAC_VTUTF8_ROW_HEIGHT 24 #define MAX_UTF8_ENCODE_BLOCK_LENGTH (Utf8ConversionBufferSize / 3 - 1) +#define SAC_VTUTF8_OBUFFER_SIZE 0x2D00 +#define SAC_VTUTF8_IBUFFER_SIZE 0x2000 +#define SAC_RAW_OBUFFER_SIZE 0x2000 +#define SAC_RAW_IBUFFER_SIZE 0x2000 // // Channel flags @@ -200,6 +204,33 @@ } SAC_MESSAGE_ENTRY, *PSAC_MESSAGE_ENTRY; // +// These are the VT-100/220/ANSI Escape Codes supported by SAC +// +typedef enum _SAC_ANSI_COMMANDS +{ + SacCursorUp, + SacCursorDown, + SacCursorRight, + SacCursorLeft, + SacFontNormal, + SacFontBlink, + SacFontBlinkOff, + SacFontBold, + SacFontBoldOff, + SacFontInverse, + SacFontInverseOff, + SacBackTab, + SacEraseEndOfLine, + SacEraseStartOfLine, + SacEraseLine, + SacEraseEndOfScreen, + SacEraseStartOfScreen, + SacEraseScreen, + SacSetBackgroundColor = 21, + SacSetFontColor +} SAC_ANSI_COMMANDS; + +// // SAC supports 3 different channel output types // typedef enum _SAC_CHANNEL_TYPE @@ -235,6 +266,28 @@ LONG RefCount; KSEMAPHORE Lock; } SAC_CHANNEL_LOCK, *PSAC_CHANNEL_LOCK; + +// +// Structure of the cell-buffer when in VT-UTF8 Mode +// +typedef struct _SAC_CURSOR_DATA +{ + UCHAR CursorX; + UCHAR CursorY; + UCHAR CursorVisible; + WCHAR CursorValue; +} SAC_CURSOR_DATA, *PSAC_CURSOR_DATA; +C_ASSERT(sizeof(SAC_CURSOR_DATA) == 6); + +// +// Small optimization to easily recognize the most common VT-100/ANSI codes +// +typedef struct _SAC_STATIC_ESCAPE_STRING +{ + WCHAR Sequence[10]; + ULONG Size; + ULONG Action; +} SAC_STATIC_ESCAPE_STRING, *PSAC_STATIC_ESCAPE_STRING; // // Channel callbacks Modified: trunk/reactos/drivers/sac/driver/vtutf8chan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/vtutf8c… ============================================================================== --- trunk/reactos/drivers/sac/driver/vtutf8chan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/vtutf8chan.c [iso-8859-1] Sun Aug 25 22:49:32 2013 @@ -17,40 +17,165 @@ /* FUNCTIONS *****************************************************************/ -typedef struct _SAC_CURSOR_DATA -{ - UCHAR CursorX; - UCHAR CursorY; - UCHAR CursorVisible; - WCHAR CursorValue; -} SAC_CURSOR_DATA, *PSAC_CURSOR_DATA; - -C_ASSERT(sizeof(SAC_CURSOR_DATA) == 6); - -typedef struct _SAC_STATIC_ESCAPE_STRING -{ - WCHAR Sequence[10]; - ULONG Size; - ULONG Action; -} SAC_STATIC_ESCAPE_STRING, *PSAC_STATIC_ESCAPE_STRING; +// +// Source: http://en.wikipedia.org/wiki/ANSI_escape_code +// +typedef enum _VT_ANSI_ATTRIBUTES +{ + // + // Attribute modifiers (mostly supported) + // + Normal, + Bold, + Faint, + Italic, + Underline, + SlowBlink, + FastBlink, + Inverse, + Conceal, + Strikethrough, + + // + // Font selectors (not supported) + // + PrimaryFont, + AlternateFont1, + AlternateFont2, + AlternateFont3, + Alternatefont4, + AlteronateFont5, + AlteronateFont6, + AlternateFont7, + AlternatEfont8, + Alternatefont9, + + // + // Additional attributes (not supported) + // + Fraktur, + DoubleUnderline, + + // + // Attribute Un-modifiers (mostly supported) + // + BoldOff, + ItalicOff, + UnderlineOff, + BlinkOff, + Reserved, + InverseOff, + ConcealOff, + StrikethroughOff, + + // + // Standard Text Color + // + SetColorStart, + SetColorBlack = SetColorStart, + SetColorRed, + SetColorGreen, + SetColorYellow, + SetColorBlue, + SetcolorMAgent, + SetColorCyan, + SetColorWhite, + SetColorMax = SetColorWhite, + + // + // Extended Text Color (not supported) + // + SetColor256, + SeTextColorDefault, + + // + // Standard Background Color + // + SetBackColorStart, + SetBackColorBlack = SetBackColorStart, + SetBackColorRed, + SetBackColorGreen, + SetBackColorYellow, + SetBackColorBlue, + SetBackcolorMAgent, + SetBackColorCyan, + SetBackColorWhite, + SetBackColorMax = SetBackColorWhite, + + // + // Extended Background Color (not supported) + // + SetBackColor256, + SetBackColorDefault, + + // + // Extra Attributes (not supported) + // + Reserved1, + Framed, + Encircled, + Overlined, + FramedOff, + OverlinedOff, + Reserved2, + Reserved3, + Reserved4, + Reserved5 + + // + // Ideograms (not supported) + // +} VT_ANSI_ATTRIBUTES; + +// +// The following site is a good reference on VT100/ANSI escape codes +// http://www.termsys.demon.co.uk/vtansi.htm +// +#define VT_ANSI_ESCAPE L'\x1B' +#define VT_ANSI_COMMAND L'[' + +#define VT_ANSI_CURSOR_UP_CHAR L'A' +#define VT_ANSI_CURSOR_UP L"[A" + +#define VT_ANSI_CURSOR_DOWN_CHAR L'B' +#define VT_ANSI_CURSOR_DOWN L"[B" + +#define VT_ANSI_CURSOR_RIGHT_CHAR L'C' +#define VT_ANSI_CURSOR_RIGHT L"[C" + +#define VT_ANSI_CURSOR_LEFT_CHAR L'D' +#define VT_ANSI_CURSOR_LEFT L"[D" + +#define VT_ANSI_ERASE_LINE_CHAR L'K' +#define VT_ANSI_ERASE_END_LINE L"[K" +#define VT_ANSI_ERASE_START_LINE L"[1K" +#define VT_ANSI_ERASE_ENTIRE_LINE L"[2K" + +#define VT_ANSI_ERASE_SCREEN_CHAR L'J' +#define VT_ANSI_ERASE_DOWN_SCREEN L"[J" +#define VT_ANSI_ERASE_UP_SCREEN L"[1J" +#define VT_ANSI_ERASE_ENTIRE_SCREEN L"[2J" + +#define VT_ANSI_BACKTAB_CHAR L'Z' +#define VT_220_BACKTAB L"[0Z" + +#define VT_ANSI_SET_ATTRIBUTE_CHAR L'm' +#define VT_ANSI_SEPARATOR_CHAR L';' SAC_STATIC_ESCAPE_STRING SacStaticEscapeStrings [] = { - { L"[A", 2, 0 }, - { L"[B", 2, 1 }, - { L"[C", 2, 2 }, - { L"[D", 2, 3 }, - { L"[0Z", 3, 11 }, - { L"[K", 2, 12 }, - { L"[1K", 3, 13 }, - { L"[2K", 3, 14 }, - { L"[J", 2, 15 }, - { L"[1J", 3, 16 }, - { L"[2J", 3, 17 }, + { VT_ANSI_CURSOR_UP, 2, SacCursorUp }, + { VT_ANSI_CURSOR_DOWN, 2, SacCursorDown }, + { VT_ANSI_CURSOR_RIGHT, 2, SacCursorRight }, + { VT_ANSI_CURSOR_LEFT, 2, SacCursorLeft }, + { VT_220_BACKTAB, 3, SacBackTab }, + { VT_ANSI_ERASE_END_LINE, 2, SacEraseEndOfLine }, + { VT_ANSI_ERASE_START_LINE, 3, SacEraseStartOfLine }, + { VT_ANSI_ERASE_ENTIRE_LINE, 3, SacEraseLine }, + { VT_ANSI_ERASE_DOWN_SCREEN, 2, SacEraseEndOfScreen }, + { VT_ANSI_ERASE_UP_SCREEN, 3, SacEraseStartOfScreen }, + { VT_ANSI_ERASE_ENTIRE_SCREEN, 3, SacEraseScreen }, }; - -#define SAC_VTUTF8_OBUFFER_SIZE 0x2D00 -#define SAC_VTUTF8_IBUFFER_SIZE 0x2000 BOOLEAN NTAPI @@ -105,6 +230,9 @@ ASSERT(Channel->CursorCol < SAC_VTUTF8_COL_WIDTH); } +// +// Not a +// ULONG NTAPI VTUTF8ChannelConsumeEscapeSequence(IN PSAC_CHANNEL Channel, @@ -113,7 +241,7 @@ ULONG Number, Number2, Number3, i, Action, Result; PWCHAR Sequence; PSAC_CURSOR_DATA Cursor; - ASSERT(String[0] == L'\x1B'); + ASSERT(String[0] == VT_ANSI_ESCAPE); for (i = 0; i < RTL_NUMBER_OF(SacStaticEscapeStrings); i++) { @@ -128,133 +256,140 @@ } } - if (String[1] != L'[') return 0; - + if (String[1] != VT_ANSI_COMMAND) return 0; + + Result = 0; Sequence = String + 2; switch (*Sequence) { - case L'A': - Action = 0; - break; - case L'B': - Action = 1; - break; - case L'C': - Action = 3; //bug - break; - case L'D': - Action = 2; //bug - break; - case L'K': - Action = 12; - break; + case VT_ANSI_CURSOR_UP_CHAR: + Action = SacCursorUp; + goto ProcessString; + + case VT_ANSI_CURSOR_DOWN_CHAR: + Action = SacCursorDown; + goto ProcessString; + + case VT_ANSI_CURSOR_RIGHT_CHAR: + Action = SacCursorLeft; //bug + goto ProcessString; + + case VT_ANSI_CURSOR_LEFT_CHAR: + Action = SacCursorRight; //bug + goto ProcessString; + + case VT_ANSI_ERASE_LINE_CHAR: + Action = SacEraseEndOfLine; + goto ProcessString; + default: - if (!VTUTF8ChannelScanForNumber(Sequence, &Number)) return 0; - - while ((*Sequence >= L'0') && (*Sequence <= L'9')) Sequence++; - - if (*Sequence == 'm') - { - switch (Number) + break; + } + + if (!VTUTF8ChannelScanForNumber(Sequence, &Number)) return 0; + while ((*Sequence >= L'0') && (*Sequence <= L'9')) Sequence++; + + if (*Sequence == VT_ANSI_SET_ATTRIBUTE_CHAR) + { + switch (Number) + { + case Normal: + Action = SacFontNormal; + break; + + case Bold: + Action = SacFontBold; + break; + + case SlowBlink: + Action = SacFontBlink; + break; + + case Inverse: + Action = SacFontInverse; + break; + + case BoldOff: + Action = SacFontBoldOff; + break; + + case BlinkOff: + Action = SacFontBlinkOff; + break; + + case InverseOff: + Action = SacFontInverseOff; + break; + + default: + if ((Number < SetBackColorStart) || (Number > SetBackColorMax)) { - case 0: - Action = 4; - break; - case 1: - Action = 7; - break; - - case 5: - Action = 5; - break; - - case 7: - Action = 9; - break; - - case 22: - Action = 8; - break; - - case 25: - Action = 6; - break; - - case 27: - Action = 10; - break; - - default: - if ((Number < 40) || (Number > 47)) - { - if ((Number < 30) || (Number > 39)) - { - ASSERT(FALSE); - return 0; - } - - Action = 22; - } - else - { - Action = 21; - } - } - } - else - { - if (*Sequence != L';') return 0; - Sequence++; - - if (!VTUTF8ChannelScanForNumber(Sequence, &Number2)) return 0; - - while ((*Sequence >= L'0') && (*Sequence <= L'9')) Sequence++; - - if (*Sequence == L'm') - { - Action = 20; + if ((Number < SetColorStart) || (Number > SetColorMax)) + { + ASSERT(FALSE); + return 0; + } + + Action = SacSetFontColor; } else { - if (*Sequence == L'H') - { - Action = 18; - } - - if (*Sequence != L';') return 0; - - Sequence++; - - if ((*Sequence == L'H') || (*Sequence == L'f')) - { - Action = 18; - } - else if (*Sequence == L'r') - { - Action = 19; - } - else - { - if (!VTUTF8ChannelScanForNumber(Sequence, &Number3)) return 0; - - while ((*Sequence >= L'0') && (*Sequence <= L'9')) Sequence++; - - if (*Sequence == L'm') - { - Action = 23; - } - else - { - return 0; - } - } + Action = SacSetBackgroundColor; } - } - } - - Result = Sequence - String + 1; + break; + } + + goto ProcessString; + } + + if (*Sequence != VT_ANSI_SEPARATOR_CHAR) return 0; + Sequence++; + + if (!VTUTF8ChannelScanForNumber(Sequence, &Number2)) return 0; + while ((*Sequence >= L'0') && (*Sequence <= L'9')) Sequence++; + + if (*Sequence == VT_ANSI_SET_ATTRIBUTE_CHAR) + { + Action = 20; + goto ProcessString; + } + + if (*Sequence == L'H') + { + Action = 18; + goto ProcessString; + } + + if (*Sequence != VT_ANSI_SEPARATOR_CHAR) return 0; + + Sequence++; + + if ((*Sequence == L'H') || (*Sequence == L'f')) + { + Action = 18; + goto ProcessString; + } + + if (*Sequence == L'r') + { + Action = 19; + goto ProcessString; + } + + if (!VTUTF8ChannelScanForNumber(Sequence, &Number3)) return 0; + while ((*Sequence >= L'0') && (*Sequence <= L'9')) Sequence++; + + if (*Sequence == VT_ANSI_SET_ATTRIBUTE_CHAR) + { + Action = 23; + goto ProcessString; + } + + return 0; ProcessString: + if (!Result) Result = Sequence - String + 1; + Cursor = (PSAC_CURSOR_DATA)Channel->OBuffer; VTUTF8ChannelAssertCursor(Channel); switch (Action)

1 0

[ion] 59824: [SACDRV]: Implement VTUTF8ChannelScanForNumber. [SACDRV]: Implement VTUTF8ChannelOEcho. [SACDRV]: WIP-lement VTUTF8ChannelConsumeEscapeSequence. Have to do some reading up on ANSI to g...
by ion＠svn.reactos.org 25 Aug '13

25 Aug '13

Author: ion Date: Sun Aug 25 21:56:20 2013 New Revision: 59824 URL: http://svn.reactos.org/svn/reactos?rev=59824&view=rev Log: [SACDRV]: Implement VTUTF8ChannelScanForNumber. [SACDRV]: Implement VTUTF8ChannelOEcho. [SACDRV]: WIP-lement VTUTF8ChannelConsumeEscapeSequence. Have to do some reading up on ANSI to get this right. Modified: trunk/reactos/drivers/sac/driver/sacdrv.h trunk/reactos/drivers/sac/driver/vtutf8chan.c Modified: trunk/reactos/drivers/sac/driver/sacdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/sacdrv.… ============================================================================== --- trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] Sun Aug 25 21:56:20 2013 @@ -158,6 +158,8 @@ #define SAC_MAX_MESSAGES 200 #define SAC_VTUTF8_COL_WIDTH 80 #define SAC_VTUTF8_COL_HEIGHT 25 +#define SAC_VTUTF8_ROW_HEIGHT 24 +#define MAX_UTF8_ENCODE_BLOCK_LENGTH (Utf8ConversionBufferSize / 3 - 1) // // Channel flags @@ -1012,6 +1014,17 @@ OUT PVOID *ActualWaitObject ); +BOOLEAN +NTAPI +SacTranslateUnicodeToUtf8( + IN PWCHAR SourceBuffer, + IN ULONG SourceBufferLength, + OUT PCHAR DestinationBuffer, + IN ULONG DestinationBufferSize, + OUT PULONG UTF8Count, + OUT PULONG ProcessedCount +); + // // SAC Command Functions // Modified: trunk/reactos/drivers/sac/driver/vtutf8chan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/vtutf8c… ============================================================================== --- trunk/reactos/drivers/sac/driver/vtutf8chan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/vtutf8chan.c [iso-8859-1] Sun Aug 25 21:56:20 2013 @@ -27,101 +27,52 @@ C_ASSERT(sizeof(SAC_CURSOR_DATA) == 6); +typedef struct _SAC_STATIC_ESCAPE_STRING +{ + WCHAR Sequence[10]; + ULONG Size; + ULONG Action; +} SAC_STATIC_ESCAPE_STRING, *PSAC_STATIC_ESCAPE_STRING; + +SAC_STATIC_ESCAPE_STRING SacStaticEscapeStrings [] = +{ + { L"[A", 2, 0 }, + { L"[B", 2, 1 }, + { L"[C", 2, 2 }, + { L"[D", 2, 3 }, + { L"[0Z", 3, 11 }, + { L"[K", 2, 12 }, + { L"[1K", 3, 13 }, + { L"[2K", 3, 14 }, + { L"[J", 2, 15 }, + { L"[1J", 3, 16 }, + { L"[2J", 3, 17 }, +}; + #define SAC_VTUTF8_OBUFFER_SIZE 0x2D00 #define SAC_VTUTF8_IBUFFER_SIZE 0x2000 -NTSTATUS -NTAPI -VTUTF8ChannelOInit(IN PSAC_CHANNEL Channel) -{ - PSAC_CURSOR_DATA Cursor; - ULONG x, y; - CHECK_PARAMETER(Channel); - - /* Set the current channel cursor parameters */ - Channel->CursorVisible = 0; - Channel->CursorX = 40; - Channel->CursorY = 37; - - /* Loop the output buffer height by width */ - Cursor = (PSAC_CURSOR_DATA)Channel->OBuffer; - y = SAC_VTUTF8_COL_HEIGHT - 1; - do - { - x = SAC_VTUTF8_COL_WIDTH; - do - { - /* For every character, set the defaults */ - Cursor->CursorValue = ' '; - Cursor->CursorX = 40; - Cursor->CursorY = 38; - - /* Move to the next character */ - Cursor++; - } while (--x); - } while (--y); +BOOLEAN +NTAPI +VTUTF8ChannelScanForNumber(IN PWCHAR String, + OUT PULONG Number) +{ + /* If the first character is invalid, fail early */ + if ((*String < L'0') || (*String > L'9')) return FALSE; + + /* Otherwise, initialize the output and loop the string */ + *Number = 0; + while ((*String >= L'0') && (*String <= L'9')) + { + /* Save the first decimal */ + *Number = 10 * *Number; + + /* Compute and add the second one */ + *Number += *++String - L'0'; + } /* All done */ - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -VTUTF8ChannelCreate(IN PSAC_CHANNEL Channel) -{ - NTSTATUS Status; - CHECK_PARAMETER(Channel); - - /* Allocate the output buffer */ - Channel->OBuffer = SacAllocatePool(SAC_VTUTF8_OBUFFER_SIZE, GLOBAL_BLOCK_TAG); - CHECK_ALLOCATION(Channel->OBuffer); - - /* Allocate the input buffer */ - Channel->IBuffer = SacAllocatePool(SAC_VTUTF8_IBUFFER_SIZE, GLOBAL_BLOCK_TAG); - CHECK_ALLOCATION(Channel->IBuffer); - - /* Initialize the output stream */ - Status = VTUTF8ChannelOInit(Channel); - if (NT_SUCCESS(Status)) return Status; - - /* Reset all flags and return success */ - _InterlockedExchange(&Channel->ChannelHasNewOBufferData, 0); - _InterlockedExchange(&Channel->ChannelHasNewIBufferData, 0); - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -VTUTF8ChannelDestroy(IN PSAC_CHANNEL Channel) -{ - CHECK_PARAMETER(Channel); - - /* Free the buffer and then destroy the channel */ - if (Channel->OBuffer) SacFreePool(Channel->OBuffer); - if (Channel->IBuffer) SacFreePool(Channel->IBuffer); - return ChannelDestroy(Channel); -} - -NTSTATUS -NTAPI -VTUTF8ChannelORead( - IN PSAC_CHANNEL Channel, - IN PCHAR Buffer, - IN ULONG BufferSize, - OUT PULONG ByteCount - ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -BOOLEAN -NTAPI -VTUTF8ChannelScanForNumber( - IN PWCHAR String, - OUT PULONG Number - ) -{ - return FALSE; + return TRUE; } NTSTATUS @@ -146,14 +97,408 @@ return STATUS_NOT_IMPLEMENTED; } -NTSTATUS -NTAPI -VTUTF8ChannelConsumeEscapeSequence( - IN PSAC_CHANNEL Channel, - IN PWCHAR String - ) -{ - return STATUS_NOT_IMPLEMENTED; +FORCEINLINE +VOID +VTUTF8ChannelAssertCursor(IN PSAC_CHANNEL Channel) +{ + ASSERT(Channel->CursorRow < SAC_VTUTF8_ROW_HEIGHT); + ASSERT(Channel->CursorCol < SAC_VTUTF8_COL_WIDTH); +} + +ULONG +NTAPI +VTUTF8ChannelConsumeEscapeSequence(IN PSAC_CHANNEL Channel, + IN PWCHAR String) +{ + ULONG Number, Number2, Number3, i, Action, Result; + PWCHAR Sequence; + PSAC_CURSOR_DATA Cursor; + ASSERT(String[0] == L'\x1B'); + + for (i = 0; i < RTL_NUMBER_OF(SacStaticEscapeStrings); i++) + { + if (!wcsncmp(String + 1, + SacStaticEscapeStrings[i].Sequence, + SacStaticEscapeStrings[i].Size)) + { + Action = SacStaticEscapeStrings[i].Action; + Result = SacStaticEscapeStrings[i].Size + 1; + Number = Number2 = Number3 = 1; + goto ProcessString; + } + } + + if (String[1] != L'[') return 0; + + Sequence = String + 2; + switch (*Sequence) + { + case L'A': + Action = 0; + break; + case L'B': + Action = 1; + break; + case L'C': + Action = 3; //bug + break; + case L'D': + Action = 2; //bug + break; + case L'K': + Action = 12; + break; + default: + if (!VTUTF8ChannelScanForNumber(Sequence, &Number)) return 0; + + while ((*Sequence >= L'0') && (*Sequence <= L'9')) Sequence++; + + if (*Sequence == 'm') + { + switch (Number) + { + case 0: + Action = 4; + break; + case 1: + Action = 7; + break; + + case 5: + Action = 5; + break; + + case 7: + Action = 9; + break; + + case 22: + Action = 8; + break; + + case 25: + Action = 6; + break; + + case 27: + Action = 10; + break; + + default: + if ((Number < 40) || (Number > 47)) + { + if ((Number < 30) || (Number > 39)) + { + ASSERT(FALSE); + return 0; + } + + Action = 22; + } + else + { + Action = 21; + } + } + } + else + { + if (*Sequence != L';') return 0; + Sequence++; + + if (!VTUTF8ChannelScanForNumber(Sequence, &Number2)) return 0; + + while ((*Sequence >= L'0') && (*Sequence <= L'9')) Sequence++; + + if (*Sequence == L'm') + { + Action = 20; + } + else + { + if (*Sequence == L'H') + { + Action = 18; + } + + if (*Sequence != L';') return 0; + + Sequence++; + + if ((*Sequence == L'H') || (*Sequence == L'f')) + { + Action = 18; + } + else if (*Sequence == L'r') + { + Action = 19; + } + else + { + if (!VTUTF8ChannelScanForNumber(Sequence, &Number3)) return 0; + + while ((*Sequence >= L'0') && (*Sequence <= L'9')) Sequence++; + + if (*Sequence == L'm') + { + Action = 23; + } + else + { + return 0; + } + } + } + } + } + + Result = Sequence - String + 1; + +ProcessString: + Cursor = (PSAC_CURSOR_DATA)Channel->OBuffer; + VTUTF8ChannelAssertCursor(Channel); + switch (Action) + { + case 0: + if (Channel->CursorRow < Number) + { + Channel->CursorRow = 0; + } + else + { + Channel->CursorRow -= Number; + } + VTUTF8ChannelAssertCursor(Channel); + break; + + case 1: + if (Channel->CursorRow >= SAC_VTUTF8_ROW_HEIGHT) + { + Channel->CursorRow = SAC_VTUTF8_ROW_HEIGHT; + } + else + { + Channel->CursorRow += Number; + } + VTUTF8ChannelAssertCursor(Channel); + break; + + case 3: + if (Channel->CursorCol < Number) + { + Channel->CursorCol = 0; + } + else + { + Channel->CursorCol -= Number; + } + VTUTF8ChannelAssertCursor(Channel); + break; + + case 2: + if (Channel->CursorCol >= SAC_VTUTF8_COL_WIDTH) + { + Channel->CursorCol = SAC_VTUTF8_COL_WIDTH; + } + else + { + Channel->CursorCol += Number; + } + VTUTF8ChannelAssertCursor(Channel); + break; + + case 4: + Channel->CursorVisible = 0; + Channel->CursorX = 40; + Channel->CursorY = 37; + break; + + case 5: + Channel->CursorVisible |= 1; + break; + + case 6: + Channel->CursorVisible &= ~1; + break; + + case 7: + Channel->CursorVisible |= 2; + break; + + case 8: + Channel->CursorVisible &= ~2; + break; + + case 9: + Channel->CursorVisible |= 4; + break; + + case 10: + Channel->CursorVisible &= ~4; + break; + + case 12: + for (i = Channel->CursorCol; i < SAC_VTUTF8_COL_WIDTH; i++) + { + Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorVisible = Channel->CursorVisible; + Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorX = Channel->CursorY; + Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorY = Channel->CursorX; + Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorValue = ' '; + } + break; + + case 13: + for (i = 0; i < (Channel->CursorCol + 1); i++) + { + Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorVisible = Channel->CursorVisible; + Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorX = Channel->CursorY; + Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorY = Channel->CursorX; + Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorValue = ' '; + } + break; + + case 14: + for (i = 0; i < SAC_VTUTF8_COL_WIDTH; i++) + { + Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorVisible = Channel->CursorVisible; + Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorX = Channel->CursorY; + Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorY = Channel->CursorX; + Cursor[(Channel->CursorRow * SAC_VTUTF8_COL_WIDTH) + + (i * SAC_VTUTF8_ROW_HEIGHT)].CursorValue = ' '; + } + break; + + case 15: + break; + + case 16: + break; + + case 17: + break; + + case 18: + break; + + case 19: + break; + + case 20: + Channel->CursorY = Number; + Channel->CursorX = Number2; + break; + + case 21: + Channel->CursorX = Number; + break; + + case 22: + Channel->CursorY = Number; + break; + + case 23: + Channel->CursorVisible = Number; + Channel->CursorY = Number2; + Channel->CursorX = Number3; + break; + default: + break; + } + + return Result; +} + +NTSTATUS +NTAPI +VTUTF8ChannelOInit(IN PSAC_CHANNEL Channel) +{ + PSAC_CURSOR_DATA Cursor; + ULONG x, y; + CHECK_PARAMETER(Channel); + + /* Set the current channel cursor parameters */ + Channel->CursorVisible = 0; + Channel->CursorX = 40; + Channel->CursorY = 37; + + /* Loop the output buffer height by width */ + Cursor = (PSAC_CURSOR_DATA)Channel->OBuffer; + y = SAC_VTUTF8_COL_HEIGHT - 1; + do + { + x = SAC_VTUTF8_COL_WIDTH; + do + { + /* For every character, set the defaults */ + Cursor->CursorValue = ' '; + Cursor->CursorX = 40; + Cursor->CursorY = 38; + + /* Move to the next character */ + Cursor++; + } while (--x); + } while (--y); + + /* All done */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +VTUTF8ChannelCreate(IN PSAC_CHANNEL Channel) +{ + NTSTATUS Status; + CHECK_PARAMETER(Channel); + + /* Allocate the output buffer */ + Channel->OBuffer = SacAllocatePool(SAC_VTUTF8_OBUFFER_SIZE, GLOBAL_BLOCK_TAG); + CHECK_ALLOCATION(Channel->OBuffer); + + /* Allocate the input buffer */ + Channel->IBuffer = SacAllocatePool(SAC_VTUTF8_IBUFFER_SIZE, GLOBAL_BLOCK_TAG); + CHECK_ALLOCATION(Channel->IBuffer); + + /* Initialize the output stream */ + Status = VTUTF8ChannelOInit(Channel); + if (NT_SUCCESS(Status)) return Status; + + /* Reset all flags and return success */ + _InterlockedExchange(&Channel->ChannelHasNewOBufferData, 0); + _InterlockedExchange(&Channel->ChannelHasNewIBufferData, 0); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +VTUTF8ChannelDestroy(IN PSAC_CHANNEL Channel) +{ + CHECK_PARAMETER(Channel); + + /* Free the buffer and then destroy the channel */ + if (Channel->OBuffer) SacFreePool(Channel->OBuffer); + if (Channel->IBuffer) SacFreePool(Channel->IBuffer); + return ChannelDestroy(Channel); +} + +NTSTATUS +NTAPI +VTUTF8ChannelORead(IN PSAC_CHANNEL Channel, + IN PCHAR Buffer, + IN ULONG BufferSize, + OUT PULONG ByteCount) +{ + return STATUS_NOT_IMPLEMENTED; } NTSTATUS @@ -180,7 +525,88 @@ IN PCHAR String, IN ULONG Size) { - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status = STATUS_SUCCESS; + PWSTR pwch; + ULONG i, k, TranslatedCount, UTF8TranslationSize; + BOOLEAN Result; + CHECK_PARAMETER1(Channel); + CHECK_PARAMETER2(String); + + /* Return success if there's nothing to echo */ + if (!(Size / sizeof(WCHAR))) return Status; + + /* Start with the input string*/ + pwch = (PWCHAR)String; + + /* First, figure out how much is outside of the block length alignment */ + k = (Size / sizeof(WCHAR)) % MAX_UTF8_ENCODE_BLOCK_LENGTH; + if (k) + { + /* Translate the misaligned portion */ + Result = SacTranslateUnicodeToUtf8(pwch, + k, + Utf8ConversionBuffer, + Utf8ConversionBufferSize, + &UTF8TranslationSize, + &TranslatedCount); + ASSERT(k == TranslatedCount); + if (!Result) + { + /* If we couldn't translate, write failure to break out below */ + Status = STATUS_UNSUCCESSFUL; + } + else + { + /* Write the misaligned portion into the buffer */ + Status = ConMgrWriteData(Channel, + Utf8ConversionBuffer, + UTF8TranslationSize); + } + + /* If translation or write failed, bail out */ + if (!NT_SUCCESS(Status)) goto Return; + } + + /* Push the string to its new location (this could be a noop if aligned) */ + pwch += k; + + /* Now figure out how many aligned blocks we have, and loop each one */ + k = (Size / sizeof(WCHAR)) / MAX_UTF8_ENCODE_BLOCK_LENGTH; + for (i = 0; i < k; i++) + { + /* Translate the aligned block */ + Result = SacTranslateUnicodeToUtf8(pwch, + MAX_UTF8_ENCODE_BLOCK_LENGTH, + Utf8ConversionBuffer, + Utf8ConversionBufferSize, + &UTF8TranslationSize, + &TranslatedCount); + ASSERT(MAX_UTF8_ENCODE_BLOCK_LENGTH == TranslatedCount); + ASSERT(UTF8TranslationSize > 0); + if (!Result) + { + /* Set failure here, we'll break out below */ + Status = STATUS_UNSUCCESSFUL; + } + else + { + /* Move the string location to the next aligned block */ + pwch += MAX_UTF8_ENCODE_BLOCK_LENGTH; + + /* Write the aligned block into the buffer */ + Status = ConMgrWriteData(Channel, + Utf8ConversionBuffer, + UTF8TranslationSize); + } + + /* If translation or write failed, bail out */ + if (!NT_SUCCESS(Status)) break; + } + +Return: + ASSERT(pwch == (PWSTR)(String + Size)); + if (NT_SUCCESS(Status)) Status = ConMgrFlushData(Channel); + return Status; } NTSTATUS

1 0

[ekohl] 59823: [MMC] - Fix all bugs that keep MMC from starting and terminating properly. - Implement an MDI client window. - Add menuitem "File/New" in order to create a new console window (MDI ch...
by ekohl＠svn.reactos.org 25 Aug '13

25 Aug '13

Author: ekohl Date: Sun Aug 25 21:43:46 2013 New Revision: 59823 URL: http://svn.reactos.org/svn/reactos?rev=59823&view=rev Log: [MMC] - Fix all bugs that keep MMC from starting and terminating properly. - Implement an MDI client window. - Add menuitem "File/New" in order to create a new console window (MDI child). - Add a "large" menu that is used when console windows are visible. Modified: trunk/reactos/base/applications/mmc/console.c trunk/reactos/base/applications/mmc/lang/bg-BG.rc trunk/reactos/base/applications/mmc/lang/ca-ES.rc trunk/reactos/base/applications/mmc/lang/cs-CZ.rc trunk/reactos/base/applications/mmc/lang/de-DE.rc trunk/reactos/base/applications/mmc/lang/el-GR.rc trunk/reactos/base/applications/mmc/lang/en-US.rc trunk/reactos/base/applications/mmc/lang/es-ES.rc trunk/reactos/base/applications/mmc/lang/fr-FR.rc trunk/reactos/base/applications/mmc/lang/he-IL.rc trunk/reactos/base/applications/mmc/lang/it-IT.rc trunk/reactos/base/applications/mmc/lang/ko-KR.rc trunk/reactos/base/applications/mmc/lang/lt-LT.rc trunk/reactos/base/applications/mmc/lang/no-NO.rc trunk/reactos/base/applications/mmc/lang/pl-PL.rc trunk/reactos/base/applications/mmc/lang/pt-BR.rc trunk/reactos/base/applications/mmc/lang/ro-RO.rc trunk/reactos/base/applications/mmc/lang/ru-RU.rc trunk/reactos/base/applications/mmc/lang/sk-SK.rc trunk/reactos/base/applications/mmc/lang/sv-SE.rc trunk/reactos/base/applications/mmc/lang/tr-TR.rc trunk/reactos/base/applications/mmc/lang/uk-UA.rc trunk/reactos/base/applications/mmc/lang/zh-CN.rc trunk/reactos/base/applications/mmc/lang/zh-TW.rc trunk/reactos/base/applications/mmc/mmc.c trunk/reactos/base/applications/mmc/precomp.h trunk/reactos/base/applications/mmc/resource.h Modified: trunk/reactos/base/applications/mmc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/cons… ============================================================================== --- trunk/reactos/base/applications/mmc/console.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/console.c [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -22,7 +22,6 @@ static const TCHAR szMMCMainFrame[] = TEXT("MMCMainFrame"); static const TCHAR szMMCChildFrm[] = TEXT("MMCChildFrm"); -static LONG MainFrameWndCount = 0; static ULONG NewConsoleCount = 0; static LPTSTR @@ -41,11 +40,16 @@ return lpTitle; } + typedef struct _CONSOLE_MAINFRAME_WND { HWND hwnd; + HWND hwndMDIClient; + LPCTSTR lpConsoleTitle; - HMENU hMenuConsoleRoot; + HMENU hMenuConsoleSmall; + HMENU hMenuConsoleLarge; + INT nConsoleCount; union { DWORD Flags; @@ -56,6 +60,173 @@ }; } CONSOLE_MAINFRAME_WND, *PCONSOLE_MAINFRAME_WND; + +HWND +CreateNewMDIChild(PCONSOLE_MAINFRAME_WND Info, + HWND hwndMDIClient) +{ + MDICREATESTRUCT mcs; + HWND hChild; + + mcs.szTitle = CreateNewConsoleTitle(); + mcs.szClass = szMMCChildFrm; + mcs.hOwner = GetModuleHandle(NULL); + mcs.x = mcs.cx = CW_USEDEFAULT; + mcs.y = mcs.cy = CW_USEDEFAULT; + mcs.style = MDIS_ALLCHILDSTYLES; + + hChild = (HWND)SendMessage(hwndMDIClient, WM_MDICREATE, 0, (LONG)&mcs); + if (hChild) + { + Info->nConsoleCount++; + } + + return hChild; +} + + +static LRESULT +FrameOnCreate(HWND hwnd, + LPARAM lParam) +{ + PCONSOLE_MAINFRAME_WND Info; + CLIENTCREATESTRUCT ccs; + LPCTSTR lpFileName = (LPCTSTR)(((LPCREATESTRUCT)lParam)->lpCreateParams); + + Info = HeapAlloc(hAppHeap, + 0, + sizeof(CONSOLE_MAINFRAME_WND)); + if (Info == NULL) + return -1; + + ZeroMemory(Info, + sizeof(CONSOLE_MAINFRAME_WND)); + + Info->hwnd = hwnd; + + SetWindowLongPtr(hwnd, + 0, + (LONG_PTR)Info); + + Info->hMenuConsoleSmall = LoadMenu(hAppInstance, + MAKEINTRESOURCE(IDM_CONSOLE_SMALL)); + + Info->hMenuConsoleLarge = LoadMenu(hAppInstance, + MAKEINTRESOURCE(IDM_CONSOLE_LARGE)); + + if (lpFileName == NULL) + { + /* FIXME */ + Info->AppAuthorMode = TRUE; + Info->lpConsoleTitle = TEXT("ReactOS Management Console"); + } + else + { + Info->AppAuthorMode = TRUE; + Info->lpConsoleTitle = CreateNewConsoleTitle(); + } + + SetMenu(Info->hwnd, + Info->hMenuConsoleSmall); + + SetWindowText(Info->hwnd, + Info->lpConsoleTitle); + + ccs.hWindowMenu = GetSubMenu(Info->hMenuConsoleLarge, 1); + ccs.idFirstChild = IDM_MDI_FIRSTCHILD; + + /* Create the MDI client window */ + hwndMDIClient = CreateWindowEx(WS_EX_CLIENTEDGE, + L"MDICLIENT", + (LPCTSTR)NULL, + WS_CHILD | WS_CLIPCHILDREN | WS_VSCROLL | WS_HSCROLL | WS_VISIBLE | WS_BORDER, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + hwnd, + (HMENU)0xCAC, + hAppInstance, + (LPVOID)&ccs); + + ShowWindow(Info->hwndMDIClient, SW_SHOW); + + return 0; +} + + +static VOID +FrameOnCommand(HWND hwnd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PCONSOLE_MAINFRAME_WND Info; + HWND hChild; + + Info = (PCONSOLE_MAINFRAME_WND)GetWindowLongPtr(hwnd, 0); + + switch (LOWORD(wParam)) + { + case IDM_FILE_NEW: + CreateNewMDIChild(Info, hwndMDIClient); + SetMenu(Info->hwnd, + Info->hMenuConsoleLarge); + break; + + case IDM_FILE_EXIT: + PostMessage(hwnd, WM_CLOSE, 0, 0); + break; + + default: + if (LOWORD(wParam) >= IDM_MDI_FIRSTCHILD) + { + DefFrameProc(hwnd, hwndMDIClient, uMsg, wParam, lParam); + } + else + { + hChild = (HWND)SendMessage(hwndMDIClient, WM_MDIGETACTIVE, 0, 0); + if (hChild) + { + SendMessage(hChild, WM_COMMAND, wParam, lParam); + } + } + break; + } +} + + +static VOID +FrameOnSize(HWND hMainWnd, + WORD cx, + WORD cy) +{ + RECT rcClient; //, rcTool, rcStatus; +// int lvHeight, iToolHeight, iStatusHeight; + + /* Size toolbar and get height */ +// SendMessage(Info->hTool, TB_AUTOSIZE, 0, 0); +// GetWindowRect(Info->hTool, &rcTool); +// iToolHeight = rcTool.bottom - rcTool.top; + + /* Size status bar and get height */ +// SendMessage(Info->hStatus, WM_SIZE, 0, 0); +// GetWindowRect(Info->hStatus, &rcStatus); +// iStatusHeight = rcStatus.bottom - rcStatus.top; + + /* Calculate remaining height and size list view */ + GetClientRect(hMainWnd, &rcClient); +// lvHeight = rcClient.bottom - iToolHeight - iStatusHeight; + SetWindowPos(hwndMDIClient, //Info->hTreeView, + NULL, + 0, + 0, //iToolHeight, + rcClient.right, + rcClient.bottom, //lvHeight, + SWP_NOZORDER); +} + + static LRESULT CALLBACK ConsoleMainFrameWndProc(IN HWND hwnd, IN UINT uMsg, @@ -63,111 +234,79 @@ IN LPARAM lParam) { PCONSOLE_MAINFRAME_WND Info; - LRESULT Ret = FALSE; Info = (PCONSOLE_MAINFRAME_WND)GetWindowLongPtr(hwnd, 0); - if (Info != NULL || uMsg == WM_NCCREATE) - { - switch (uMsg) - { - case WM_COMMAND: + switch (uMsg) + { + case WM_CREATE: + return FrameOnCreate(hwnd, + lParam); + + case WM_COMMAND: + FrameOnCommand(hwnd, + uMsg, + wParam, + lParam); + break; + + case WM_SIZE: + FrameOnSize(hwnd, + LOWORD(lParam), + HIWORD(lParam)); + break; + + case WM_CLOSE: + DestroyWindow(hwnd); + break; + + case WM_DESTROY: + if (Info != NULL) { - switch (LOWORD(wParam)) - { - case ID_FILE_EXIT: - PostMessage(hwnd, - WM_CLOSE, - 0, - 0); - break; - } - break; - } - - case WM_NCCREATE: - { - MainFrameWndCount++; - - Info = HeapAlloc(hAppHeap, - 0, - sizeof(*Info)); - if (Info != NULL) - { - ZeroMemory(Info, - sizeof(*Info)); - - Info->hwnd = hwnd; - - SetWindowLongPtr(hwnd, - 0, - (LONG_PTR)Info); - - Info->hMenuConsoleRoot = LoadMenu(hAppInstance, - MAKEINTRESOURCE(IDM_CONSOLEROOT)); - Ret = TRUE; - } - break; - } - - case WM_CREATE: - { - LPCTSTR lpFileName = (LPCTSTR)(((LPCREATESTRUCT)lParam)->lpCreateParams); - - if (lpFileName != NULL) - { - /* FIXME */ - } - else - { - Info->AppAuthorMode = TRUE; - Info->lpConsoleTitle = CreateNewConsoleTitle(); - } - - SetWindowText(Info->hwnd, - Info->lpConsoleTitle); - break; - } - - case WM_NCDESTROY: SetMenu(Info->hwnd, NULL); - if (Info->hMenuConsoleRoot != NULL) + if (Info->hMenuConsoleSmall != NULL) { - DestroyMenu(Info->hMenuConsoleRoot); - Info->hMenuConsoleRoot = NULL; + DestroyMenu(Info->hMenuConsoleSmall); + Info->hMenuConsoleSmall = NULL; + } + + if (Info->hMenuConsoleLarge != NULL) + { + DestroyMenu(Info->hMenuConsoleLarge); + Info->hMenuConsoleLarge = NULL; } HeapFree(hAppHeap, 0, Info); - - if (--MainFrameWndCount == 0) - PostQuitMessage(0); - break; - - - case WM_CLOSE: - DestroyWindow(hwnd); - break; - - default: - goto HandleDefaultMsg; - } - } - else - { -HandleDefaultMsg: - Ret = DefWindowProc(hwnd, - uMsg, - wParam, - lParam); - } - - return Ret; -} + } + + PostQuitMessage(0); + break; + + case WM_USER_CLOSE_CHILD: + Info->nConsoleCount--; + if (Info->nConsoleCount == 0) + { + SetMenu(Info->hwnd, + Info->hMenuConsoleSmall); + } + break; + + default: + return DefFrameProc(hwnd, + hwndMDIClient, + uMsg, + wParam, + lParam); + } + + return 0; +} + typedef struct _CONSOLE_CHILDFRM_WND { @@ -182,65 +321,52 @@ IN LPARAM lParam) { PCONSOLE_CHILDFRM_WND Info; - LRESULT Ret = FALSE; Info = (PCONSOLE_CHILDFRM_WND)GetWindowLongPtr(hwnd, 0); - if (Info != NULL || uMsg == WM_NCCREATE) - { - switch (uMsg) - { - case WM_NCCREATE: - Info = HeapAlloc(hAppHeap, + switch (uMsg) + { + case WM_CREATE: + Info = HeapAlloc(hAppHeap, + 0, + sizeof(CONSOLE_CHILDFRM_WND)); + if (Info != NULL) + { + ZeroMemory(Info, + sizeof(CONSOLE_CHILDFRM_WND)); + + Info->hwnd = hwnd; + + SetWindowLongPtr(hwnd, 0, - sizeof(*Info)); - if (Info != NULL) - { - ZeroMemory(Info, - sizeof(*Info)); - - Info->hwnd = hwnd; - - SetWindowLongPtr(hwnd, - 0, - (LONG_PTR)Info); - - Ret = TRUE; - } - break; - - - case WM_NCDESTROY: - HeapFree(hAppHeap, - 0, - Info); - break; - - default: - goto HandleDefaultMsg; - } - } - else - { -HandleDefaultMsg: - Ret = DefWindowProc(hwnd, - uMsg, - wParam, - lParam); - } - - return Ret; - -} + (LONG_PTR)Info); + } + break; + + case WM_DESTROY: + if (Info != NULL) + HeapFree(hAppHeap, 0, Info); + + PostMessage(hwndMainConsole, WM_USER_CLOSE_CHILD, 0, 0); + break; + + default: + return DefMDIChildProc(hwnd, uMsg, wParam, lParam); + } + + return 0; +} + BOOL RegisterMMCWndClasses(VOID) { - WNDCLASS wc; + WNDCLASSEX wc = {0}; BOOL Ret; /* Register the MMCMainFrame window class */ + wc.cbSize = sizeof(WNDCLASSEX); wc.style = 0; wc.lpfnWndProc = ConsoleMainFrameWndProc; wc.cbClsExtra = 0; @@ -254,15 +380,25 @@ wc.lpszMenuName = NULL; wc.lpszClassName = szMMCMainFrame; - Ret = (RegisterClass(&wc) != (ATOM)0); + Ret = (RegisterClassEx(&wc) != (ATOM)0); + if (Ret) { /* Register the MMCChildFrm window class */ + wc.cbSize = sizeof(WNDCLASSEX); + wc.style = CS_HREDRAW | CS_VREDRAW; wc.lpfnWndProc = ConsoleChildFrmProc; + wc.cbClsExtra = 0; wc.cbWndExtra = sizeof(PCONSOLE_CHILDFRM_WND); + wc.hInstance = hAppInstance; + wc.hIcon = LoadIcon(NULL, IDI_APPLICATION); + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_3DFACE+1); + wc.lpszMenuName = NULL; wc.lpszClassName = szMMCChildFrm; - - Ret = (RegisterClass(&wc) != (ATOM)0); + wc.hIconSm = LoadIcon(NULL, IDI_APPLICATION); + + Ret = (RegisterClassEx(&wc) != (ATOM)0); if (!Ret) { UnregisterClass(szMMCMainFrame, @@ -283,7 +419,8 @@ } HWND -CreateConsoleWindow(IN LPCTSTR lpFileName OPTIONAL) +CreateConsoleWindow(IN LPCTSTR lpFileName OPTIONAL, + int nCmdShow) { HWND hWndConsole; LONG_PTR FileName = (LONG_PTR)lpFileName; @@ -291,7 +428,7 @@ hWndConsole = CreateWindowEx(WS_EX_WINDOWEDGE, szMMCMainFrame, NULL, - WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS, + WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, @@ -303,8 +440,7 @@ if (hWndConsole != NULL) { - ShowWindow(hWndConsole, - SW_SHOWDEFAULT); + ShowWindow(hWndConsole, nCmdShow); } return hWndConsole; Modified: trunk/reactos/base/applications/mmc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/bg-BG.rc [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -1,16 +1,37 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT -IDM_CONSOLEROOT MENU DISCARDABLE +IDM_CONSOLE_SMALL MENU DISCARDABLE BEGIN POPUP "&Ð¤Ð°Ð¹Ð»" BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW MENUITEM SEPARATOR - MENUITEM "ÐÐ·&ÑÐ¾Ð´\tAlt+F4", ID_FILE_EXIT + MENUITEM "ÐÐ·&ÑÐ¾Ð´\tAlt+F4", IDM_FILE_EXIT END POPUP "ÐÐ¾Ð¼Ð¾&Ñ" BEGIN - MENUITEM "&ÐÐ° ÐÑÐ¸Ð±Ð¾ÑÐ° Ð·Ð° ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡...", ID_HELP_ABOUT + MENUITEM "&ÐÐ° ÐÑÐ¸Ð±Ð¾ÑÐ° Ð·Ð° ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡...", IDM_HELP_ABOUT + END +END + +IDM_CONSOLE_LARGE MENU DISCARDABLE +BEGIN + POPUP "&Ð¤Ð°Ð¹Ð»" + BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "ÐÐ·&ÑÐ¾Ð´\tAlt+F4", IDM_FILE_EXIT + END + + POPUP "&Windows" + BEGIN + MENUITEM "List", IDM_WINDOWS_LIST + END + + POPUP "ÐÐ¾Ð¼Ð¾&Ñ" + BEGIN + MENUITEM "&ÐÐ° ÐÑÐ¸Ð±Ð¾ÑÐ° Ð·Ð° ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡...", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/mmc/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/ca-ES.rc [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -1,16 +1,37 @@ LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT -IDM_CONSOLEROOT MENU DISCARDABLE +IDM_CONSOLE_SMALL MENU DISCARDABLE BEGIN POPUP "&Fitxer" BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW MENUITEM SEPARATOR - MENUITEM "&Sortida\tAlt+F4", ID_FILE_EXIT + MENUITEM "&Sortida\tAlt+F4", IDM_FILE_EXIT END POPUP "&Ajuda" BEGIN - MENUITEM "&En quant a Consola d'administracio de ReactOS...", ID_HELP_ABOUT + MENUITEM "&En quant a Consola d'administracio de ReactOS...", IDM_HELP_ABOUT + END +END + +IDM_CONSOLE_LARGE MENU DISCARDABLE +BEGIN + POPUP "&Fitxer" + BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "&Sortida\tAlt+F4", IDM_FILE_EXIT + END + + POPUP "&Windows" + BEGIN + MENUITEM "List", IDM_WINDOWS_LIST + END + + POPUP "&Ajuda" + BEGIN + MENUITEM "&En quant a Consola d'administracio de ReactOS...", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/mmc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/cs-CZ.rc [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -5,17 +5,38 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -IDM_CONSOLEROOT MENU DISCARDABLE +IDM_CONSOLE_SMALL MENU DISCARDABLE BEGIN POPUP "&Soubor" BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW MENUITEM SEPARATOR - MENUITEM "Uk&onÄit\tAlt+F4", ID_FILE_EXIT + MENUITEM "Uk&onÄit\tAlt+F4", IDM_FILE_EXIT END POPUP "&NÃ¡povÄda" BEGIN - MENUITEM "&O konzoli ÅÃzenÃ systÃ©mu ReactOS...", ID_HELP_ABOUT + MENUITEM "&O konzoli ÅÃzenÃ systÃ©mu ReactOS...", IDM_HELP_ABOUT + END +END + +IDM_CONSOLE_LARGE MENU DISCARDABLE +BEGIN + POPUP "&Soubor" + BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "Uk&onÄit\tAlt+F4", IDM_FILE_EXIT + END + + POPUP "&Windows" + BEGIN + MENUITEM "List", IDM_WINDOWS_LIST + END + + POPUP "&NÃ¡povÄda" + BEGIN + MENUITEM "&O konzoli ÅÃzenÃ systÃ©mu ReactOS...", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/mmc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/de-DE.rc [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -1,18 +1,40 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -IDM_CONSOLEROOT MENU DISCARDABLE +IDM_CONSOLE_SMALL MENU DISCARDABLE BEGIN POPUP "&Datei" BEGIN + MENUITEM "Neu\tStrg+N", IDM_FILE_NEW MENUITEM SEPARATOR - MENUITEM "B&eenden\tAlt+F4", ID_FILE_EXIT + MENUITEM "B&eenden\tAlt+F4", IDM_FILE_EXIT END POPUP "&Hilfe" BEGIN - MENUITEM "Ã&ber ReactOS Management Console...", ID_HELP_ABOUT + MENUITEM "Ã&ber ReactOS Management Console...", IDM_HELP_ABOUT END END + +IDM_CONSOLE_LARGE MENU DISCARDABLE +BEGIN + POPUP "&Datei" + BEGIN + MENUITEM "Neu\tStrg+N", IDM_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "B&eenden\tAlt+F4", IDM_FILE_EXIT + END + + POPUP "&Fenster" + BEGIN + MENUITEM "Liste", IDM_WINDOWS_LIST + END + + POPUP "&Hilfe" + BEGIN + MENUITEM "Ã&ber ReactOS Management Console...", IDM_HELP_ABOUT + END +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/applications/mmc/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/el-GR.rc [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -1,16 +1,37 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT -IDM_CONSOLEROOT MENU DISCARDABLE +IDM_CONSOLE_SMALL MENU DISCARDABLE BEGIN POPUP "&ÎÏÏÎµÎ¯Î¿" BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW MENUITEM SEPARATOR - MENUITEM "Î&Î¾Î¿Î´Î¿Ï\tAlt+F4", ID_FILE_EXIT + MENUITEM "Î&Î¾Î¿Î´Î¿Ï\tAlt+F4", IDM_FILE_EXIT END POPUP "&ÎÎ¿Î®Î¸ÎµÎ¹Î±" BEGIN - MENUITEM "&Î£ÏÎµÏÎ¹ÎºÎ¬ Î¼Îµ ÏÎ·Î½ ÎÎ¿Î½ÏÏÎ»Î± ÎÎ¹Î±ÏÎµÎ¯ÏÎ¹ÏÎ·Ï ÏÎ¿Ï ReactOS...", ID_HELP_ABOUT + MENUITEM "&Î£ÏÎµÏÎ¹ÎºÎ¬ Î¼Îµ ÏÎ·Î½ ÎÎ¿Î½ÏÏÎ»Î± ÎÎ¹Î±ÏÎµÎ¯ÏÎ¹ÏÎ·Ï ÏÎ¿Ï ReactOS...", IDM_HELP_ABOUT + END +END + +IDM_CONSOLE_LARGE MENU DISCARDABLE +BEGIN + POPUP "&ÎÏÏÎµÎ¯Î¿" + BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "Î&Î¾Î¿Î´Î¿Ï\tAlt+F4", IDM_FILE_EXIT + END + + POPUP "&Windows" + BEGIN + MENUITEM "List", IDM_WINDOWS_LIST + END + + POPUP "&ÎÎ¿Î®Î¸ÎµÎ¹Î±" + BEGIN + MENUITEM "&Î£ÏÎµÏÎ¹ÎºÎ¬ Î¼Îµ ÏÎ·Î½ ÎÎ¿Î½ÏÏÎ»Î± ÎÎ¹Î±ÏÎµÎ¯ÏÎ¹ÏÎ·Ï ÏÎ¿Ï ReactOS...", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/mmc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/en-US.rc [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -1,16 +1,37 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDM_CONSOLEROOT MENU DISCARDABLE +IDM_CONSOLE_SMALL MENU DISCARDABLE BEGIN POPUP "&File" BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW MENUITEM SEPARATOR - MENUITEM "E&xit\tAlt+F4", ID_FILE_EXIT + MENUITEM "E&xit\tAlt+F4", IDM_FILE_EXIT END POPUP "&Help" BEGIN - MENUITEM "&About ReactOS Management Console...", ID_HELP_ABOUT + MENUITEM "&About ReactOS Management Console...", IDM_HELP_ABOUT + END +END + +IDM_CONSOLE_LARGE MENU DISCARDABLE +BEGIN + POPUP "&File" + BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "E&xit\tAlt+F4", IDM_FILE_EXIT + END + + POPUP "&Windows" + BEGIN + MENUITEM "List", IDM_WINDOWS_LIST + END + + POPUP "&Help" + BEGIN + MENUITEM "&About ReactOS Management Console...", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/mmc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/es-ES.rc [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -5,17 +5,38 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -IDM_CONSOLEROOT MENU DISCARDABLE +IDM_CONSOLE_SMALL MENU DISCARDABLE BEGIN POPUP "&Archivo" BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW MENUITEM SEPARATOR - MENUITEM "Sa&lir\tAlt+F4", ID_FILE_EXIT + MENUITEM "Sa&lir\tAlt+F4", IDM_FILE_EXIT END POPUP "&Ayuda" BEGIN - MENUITEM "&Acerca de la Consola de AdministraciÃ³n de ReactOS...", ID_HELP_ABOUT + MENUITEM "&Acerca de la Consola de AdministraciÃ³n de ReactOS...", IDM_HELP_ABOUT + END +END + +IDM_CONSOLE_LARGE MENU DISCARDABLE +BEGIN + POPUP "&Archivo" + BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "Sa&lir\tAlt+F4", IDM_FILE_EXIT + END + + POPUP "&Windows" + BEGIN + MENUITEM "List", IDM_WINDOWS_LIST + END + + POPUP "&Ayuda" + BEGIN + MENUITEM "&Acerca de la Consola de AdministraciÃ³n de ReactOS...", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/mmc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/fr-FR.rc [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -1,16 +1,37 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -IDM_CONSOLEROOT MENU DISCARDABLE +IDM_CONSOLE_SMALL MENU DISCARDABLE BEGIN POPUP "&Fichier" BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW MENUITEM SEPARATOR - MENUITEM "Quitter\tAlt+F4", ID_FILE_EXIT + MENUITEM "Quitter\tAlt+F4", IDM_FILE_EXIT END POPUP "Aide" BEGIN - MENUITEM "Ã propos de l&a Console de Gestion ReactOS...", ID_HELP_ABOUT + MENUITEM "Ã propos de l&a Console de Gestion ReactOS...", IDM_HELP_ABOUT + END +END + +IDM_CONSOLE_LARGE MENU DISCARDABLE +BEGIN + POPUP "&Fichier" + BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "Quitter\tAlt+F4", IDM_FILE_EXIT + END + + POPUP "&Windows" + BEGIN + MENUITEM "List", IDM_WINDOWS_LIST + END + + POPUP "Aide" + BEGIN + MENUITEM "Ã propos de l&a Console de Gestion ReactOS...", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/mmc/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/he-IL.rc [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -1,16 +1,37 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT -IDM_CONSOLEROOT MENU DISCARDABLE +IDM_CONSOLE_SMALL MENU DISCARDABLE BEGIN POPUP "&×§×××¥" BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW MENUITEM SEPARATOR - MENUITEM "&××¦×××\tAlt+F4", ID_FILE_EXIT + MENUITEM "&××¦×××\tAlt+F4", IDM_FILE_EXIT END POPUP "&×¢××¨×" BEGIN - MENUITEM "&×××××ª ReactOS Management Console...", ID_HELP_ABOUT + MENUITEM "&×××××ª ReactOS Management Console...", IDM_HELP_ABOUT + END +END + +IDM_CONSOLE_LARGE MENU DISCARDABLE +BEGIN + POPUP "&×§×××¥" + BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "&××¦×××\tAlt+F4", IDM_FILE_EXIT + END + + POPUP "&Windows" + BEGIN + MENUITEM "List", IDM_WINDOWS_LIST + END + + POPUP "&×¢××¨×" + BEGIN + MENUITEM "&×××××ª ReactOS Management Console...", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/mmc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/it-IT.rc [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -1,16 +1,37 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -IDM_CONSOLEROOT MENU DISCARDABLE +IDM_CONSOLE_SMALL MENU DISCARDABLE BEGIN POPUP "&File" BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW MENUITEM SEPARATOR - MENUITEM "E&sci\tAlt+F4", ID_FILE_EXIT + MENUITEM "E&sci\tAlt+F4", IDM_FILE_EXIT END POPUP "&Aiuto" BEGIN - MENUITEM "&Informazioni su ReactOS Management Console...", ID_HELP_ABOUT + MENUITEM "&Informazioni su ReactOS Management Console...", IDM_HELP_ABOUT + END +END + +IDM_CONSOLE_LARGE MENU DISCARDABLE +BEGIN + POPUP "&File" + BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "E&sci\tAlt+F4", IDM_FILE_EXIT + END + + POPUP "&Windows" + BEGIN + MENUITEM "List", IDM_WINDOWS_LIST + END + + POPUP "&Aiuto" + BEGIN + MENUITEM "&Informazioni su ReactOS Management Console...", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/mmc/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/ko-KR.rc [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -4,17 +4,38 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT -IDM_CONSOLEROOT MENU DISCARDABLE +IDM_CONSOLE_SMALL MENU DISCARDABLE BEGIN POPUP "íì¼(&F)" BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW MENUITEM SEPARATOR - MENUITEM "ì¢ë£(&E)\tAlt+F4", ID_FILE_EXIT + MENUITEM "ì¢ë£(&E)\tAlt+F4", IDM_FILE_EXIT END POPUP "ëìë§(&H)" BEGIN - MENUITEM "ReactOS ê´ë¦¬ ì½ìì ëíì¬...(&A)", ID_HELP_ABOUT + MENUITEM "ReactOS ê´ë¦¬ ì½ìì ëíì¬...(&A)", IDM_HELP_ABOUT + END +END + +IDM_CONSOLE_LARGE MENU DISCARDABLE +BEGIN + POPUP "íì¼(&F)" + BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "ì¢ë£(&E)\tAlt+F4", IDM_FILE_EXIT + END + + POPUP "&Windows" + BEGIN + MENUITEM "List", IDM_WINDOWS_LIST + END + + POPUP "ëìë§(&H)" + BEGIN + MENUITEM "ReactOS ê´ë¦¬ ì½ìì ëíì¬...(&A)", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/mmc/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/lt-LT.rc [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -2,17 +2,38 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT -IDM_CONSOLEROOT MENU DISCARDABLE +IDM_CONSOLE_SMALL MENU DISCARDABLE BEGIN POPUP "&Byla" BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW MENUITEM SEPARATOR - MENUITEM "&Baigti\tAlt+F4", ID_FILE_EXIT + MENUITEM "&Baigti\tAlt+F4", IDM_FILE_EXIT END POPUP "&Pagalba" BEGIN - MENUITEM "&Apie ReactOS Valdymo PultÄ...", ID_HELP_ABOUT + MENUITEM "&Apie ReactOS Valdymo PultÄ...", IDM_HELP_ABOUT + END +END + +IDM_CONSOLE_LARGE MENU DISCARDABLE +BEGIN + POPUP "&Byla" + BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "&Baigti\tAlt+F4", IDM_FILE_EXIT + END + + POPUP "&Windows" + BEGIN + MENUITEM "List", IDM_WINDOWS_LIST + END + + POPUP "&Pagalba" + BEGIN + MENUITEM "&Apie ReactOS Valdymo PultÄ...", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/mmc/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/no-NO.rc [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -1,16 +1,37 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL -IDM_CONSOLEROOT MENU DISCARDABLE +IDM_CONSOLE_SMALL MENU DISCARDABLE BEGIN POPUP "&Fil" BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW MENUITEM SEPARATOR - MENUITEM "&Avslutt\tAlt+F4", ID_FILE_EXIT + MENUITEM "&Avslutt\tAlt+F4", IDM_FILE_EXIT END POPUP "&Hjelp" BEGIN - MENUITEM "&Om ReactOS Management Console...", ID_HELP_ABOUT + MENUITEM "&Om ReactOS Management Console...", IDM_HELP_ABOUT + END +END + +IDM_CONSOLE_LARGE MENU DISCARDABLE +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "&Avslutt\tAlt+F4", IDM_FILE_EXIT + END + + POPUP "&Windows" + BEGIN + MENUITEM "List", IDM_WINDOWS_LIST + END + + POPUP "&Hjelp" + BEGIN + MENUITEM "&Om ReactOS Management Console...", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/mmc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/pl-PL.rc [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -7,17 +7,38 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -IDM_CONSOLEROOT MENU DISCARDABLE +IDM_CONSOLE_SMALL MENU DISCARDABLE BEGIN POPUP "Pl&ik" BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW MENUITEM SEPARATOR - MENUITEM "Za&koÅcz\tAlt+F4", ID_FILE_EXIT + MENUITEM "Za&koÅcz\tAlt+F4", IDM_FILE_EXIT END POPUP "&Pomoc" BEGIN - MENUITEM "Konsola ZarzÄdzania ReactOS - i&nformacje...", ID_HELP_ABOUT + MENUITEM "Konsola ZarzÄdzania ReactOS - i&nformacje...", IDM_HELP_ABOUT + END +END + +IDM_CONSOLE_LARGE MENU DISCARDABLE +BEGIN + POPUP "Pl&ik" + BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "Za&koÅcz\tAlt+F4", IDM_FILE_EXIT + END + + POPUP "&Windows" + BEGIN + MENUITEM "List", IDM_WINDOWS_LIST + END + + POPUP "&Pomoc" + BEGIN + MENUITEM "Konsola ZarzÄdzania ReactOS - i&nformacje...", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/mmc/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/pt-BR.rc [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -1,16 +1,37 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL -IDM_CONSOLEROOT MENU DISCARDABLE +IDM_CONSOLE_SMALL MENU DISCARDABLE BEGIN POPUP "&Arquivo" BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW MENUITEM SEPARATOR - MENUITEM "Sai&r\tAlt+F4", ID_FILE_EXIT + MENUITEM "Sai&r\tAlt+F4", IDM_FILE_EXIT END POPUP "Aj&uda" BEGIN - MENUITEM "&Sobre o Console de gerenciamento ReactOS...", ID_HELP_ABOUT + MENUITEM "&Sobre o Console de gerenciamento ReactOS...", IDM_HELP_ABOUT + END +END + +IDM_CONSOLE_LARGE MENU DISCARDABLE +BEGIN + POPUP "&Arquivo" + BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "Sai&r\tAlt+F4", IDM_FILE_EXIT + END + + POPUP "&Windows" + BEGIN + MENUITEM "List", IDM_WINDOWS_LIST + END + + POPUP "Aj&uda" + BEGIN + MENUITEM "&Sobre o Console de gerenciamento ReactOS...", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/mmc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/ro-RO.rc [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -7,17 +7,38 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL -IDM_CONSOLEROOT MENU DISCARDABLE +IDM_CONSOLE_SMALL MENU DISCARDABLE BEGIN POPUP "&FiÈier" BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW MENUITEM SEPARATOR - MENUITEM "I&eÈire\tAlt+F4", ID_FILE_EXIT + MENUITEM "I&eÈire\tAlt+F4", IDM_FILE_EXIT END POPUP "&?" BEGIN - MENUITEM "&Despreâ¦", ID_HELP_ABOUT + MENUITEM "&Despreâ¦", IDM_HELP_ABOUT + END +END + +IDM_CONSOLE_LARGE MENU DISCARDABLE +BEGIN + POPUP "&FiÈier" + BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "I&eÈire\tAlt+F4", IDM_FILE_EXIT + END + + POPUP "&Windows" + BEGIN + MENUITEM "List", IDM_WINDOWS_LIST + END + + POPUP "&?" + BEGIN + MENUITEM "&Despreâ¦", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/mmc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/ru-RU.rc [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -2,17 +2,38 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -IDM_CONSOLEROOT MENU DISCARDABLE +IDM_CONSOLE_SMALL MENU DISCARDABLE BEGIN POPUP "&Ð¤Ð°Ð¹Ð»" BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW MENUITEM SEPARATOR - MENUITEM "&ÐÑÑÐ¾Ð´\tAlt+F4", ID_FILE_EXIT + MENUITEM "&ÐÑÑÐ¾Ð´\tAlt+F4", IDM_FILE_EXIT END POPUP "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°" BEGIN - MENUITEM "&Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ...", ID_HELP_ABOUT + MENUITEM "&Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ...", IDM_HELP_ABOUT + END +END + +IDM_CONSOLE_LARGE MENU DISCARDABLE +BEGIN + POPUP "&Ð¤Ð°Ð¹Ð»" + BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "&ÐÑÑÐ¾Ð´\tAlt+F4", IDM_FILE_EXIT + END + + POPUP "&Windows" + BEGIN + MENUITEM "List", IDM_WINDOWS_LIST + END + + POPUP "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°" + BEGIN + MENUITEM "&Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ...", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/mmc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/sk-SK.rc [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -8,17 +8,38 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT -IDM_CONSOLEROOT MENU DISCARDABLE +IDM_CONSOLE_SMALL MENU DISCARDABLE BEGIN POPUP "&SÃºbor" BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW MENUITEM SEPARATOR - MENUITEM "&SkonÄiÅ¥\tAlt+F4", ID_FILE_EXIT + MENUITEM "&SkonÄiÅ¥\tAlt+F4", IDM_FILE_EXIT END POPUP "&PomocnÃk" BEGIN - MENUITEM "Ä&o je Konzola na sprÃ¡vu systÃ©mu ReactOS", ID_HELP_ABOUT + MENUITEM "Ä&o je Konzola na sprÃ¡vu systÃ©mu ReactOS", IDM_HELP_ABOUT + END +END + +IDM_CONSOLE_LARGE MENU DISCARDABLE +BEGIN + POPUP "&SÃºbor" + BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "&SkonÄiÅ¥\tAlt+F4", IDM_FILE_EXIT + END + + POPUP "&Windows" + BEGIN + MENUITEM "List", IDM_WINDOWS_LIST + END + + POPUP "&PomocnÃk" + BEGIN + MENUITEM "Ä&o je Konzola na sprÃ¡vu systÃ©mu ReactOS", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/mmc/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/sv-SE.rc [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -7,17 +7,38 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL -IDM_CONSOLEROOT MENU DISCARDABLE +IDM_CONSOLE_SMALL MENU DISCARDABLE BEGIN POPUP "&Arkiv" BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW MENUITEM SEPARATOR - MENUITEM "&Avsluta\tAlt+F4", ID_FILE_EXIT + MENUITEM "&Avsluta\tAlt+F4", IDM_FILE_EXIT END POPUP "&HjÃ¤lp" BEGIN - MENUITEM "&Om ReactOS Management Console...", ID_HELP_ABOUT + MENUITEM "&Om ReactOS Management Console...", IDM_HELP_ABOUT + END +END + +IDM_CONSOLE_LARGE MENU DISCARDABLE +BEGIN + POPUP "&Arkiv" + BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "&Avsluta\tAlt+F4", IDM_FILE_EXIT + END + + POPUP "&Windows" + BEGIN + MENUITEM "List", IDM_WINDOWS_LIST + END + + POPUP "&HjÃ¤lp" + BEGIN + MENUITEM "&Om ReactOS Management Console...", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/mmc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/tr-TR.rc [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -4,17 +4,38 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT -IDM_CONSOLEROOT MENU DISCARDABLE +IDM_CONSOLE_SMALL MENU DISCARDABLE BEGIN POPUP "&KÃ¼tÃ¼k" BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW MENUITEM SEPARATOR - MENUITEM "&ÃÄ±kÄ±Å\tAlt+F4", ID_FILE_EXIT + MENUITEM "&ÃÄ±kÄ±Å\tAlt+F4", IDM_FILE_EXIT END POPUP "&YardÄ±m" BEGIN - MENUITEM "&HakkÄ±nda...", ID_HELP_ABOUT + MENUITEM "&HakkÄ±nda...", IDM_HELP_ABOUT + END +END + +IDM_CONSOLE_LARGE MENU DISCARDABLE +BEGIN + POPUP "&KÃ¼tÃ¼k" + BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "&ÃÄ±kÄ±Å\tAlt+F4", IDM_FILE_EXIT + END + + POPUP "&Windows" + BEGIN + MENUITEM "List", IDM_WINDOWS_LIST + END + + POPUP "&YardÄ±m" + BEGIN + MENUITEM "&HakkÄ±nda...", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/mmc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/uk-UA.rc [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -8,17 +8,38 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -IDM_CONSOLEROOT MENU DISCARDABLE +IDM_CONSOLE_SMALL MENU DISCARDABLE BEGIN POPUP "&Ð¤Ð°Ð¹Ð»" BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW MENUITEM SEPARATOR - MENUITEM "Ð&Ð¸ÑÑÐ´\tAlt+F4", ID_FILE_EXIT + MENUITEM "Ð&Ð¸ÑÑÐ´\tAlt+F4", IDM_FILE_EXIT END POPUP "&ÐÐ¾Ð²ÑÐ´ÐºÐ°" BEGIN - MENUITEM "&ÐÑÐ¾ ÐºÐ¾Ð½ÑÐ¾Ð»Ñ ÐºÐµÑÑÐ²Ð°Ð½Ð½Ñ ReactOS...", ID_HELP_ABOUT + MENUITEM "&ÐÑÐ¾ ÐºÐ¾Ð½ÑÐ¾Ð»Ñ ÐºÐµÑÑÐ²Ð°Ð½Ð½Ñ ReactOS...", IDM_HELP_ABOUT + END +END + +IDM_CONSOLE_LARGE MENU DISCARDABLE +BEGIN + POPUP "&Ð¤Ð°Ð¹Ð»" + BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "Ð&Ð¸ÑÑÐ´\tAlt+F4", IDM_FILE_EXIT + END + + POPUP "&Windows" + BEGIN + MENUITEM "List", IDM_WINDOWS_LIST + END + + POPUP "&ÐÐ¾Ð²ÑÐ´ÐºÐ°" + BEGIN + MENUITEM "&ÐÑÐ¾ ÐºÐ¾Ð½ÑÐ¾Ð»Ñ ÐºÐµÑÑÐ²Ð°Ð½Ð½Ñ ReactOS...", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/mmc/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/zh-CN.rc [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -8,17 +8,38 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -IDM_CONSOLEROOT MENU DISCARDABLE +IDM_CONSOLE_SMALL MENU DISCARDABLE BEGIN POPUP "æ¡£æ¡(&F)" BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW MENUITEM SEPARATOR - MENUITEM "ç»æ(&X)\tAlt+F4", ID_FILE_EXIT + MENUITEM "ç»æ(&X)\tAlt+F4", IDM_FILE_EXIT END POPUP "å¸®å©(&H)" BEGIN - MENUITEM "å³äº ReactOS æ§å¶å°(&A)...", ID_HELP_ABOUT + MENUITEM "å³äº ReactOS æ§å¶å°(&A)...", IDM_HELP_ABOUT + END +END + +IDM_CONSOLE_LARGE MENU DISCARDABLE +BEGIN + POPUP "æ¡£æ¡(&F)" + BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "ç»æ(&X)\tAlt+F4", IDM_FILE_EXIT + END + + POPUP "&Windows" + BEGIN + MENUITEM "List", IDM_WINDOWS_LIST + END + + POPUP "å¸®å©(&H)" + BEGIN + MENUITEM "å³äº ReactOS æ§å¶å°(&A)...", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/mmc/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/zh-TW.rc [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -8,17 +8,38 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL -IDM_CONSOLEROOT MENU DISCARDABLE +IDM_CONSOLE_SMALL MENU DISCARDABLE BEGIN POPUP "æªæ¡(&F)" BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW MENUITEM SEPARATOR - MENUITEM "çµæ(&X)\tAlt+F4", ID_FILE_EXIT + MENUITEM "çµæ(&X)\tAlt+F4", IDM_FILE_EXIT END POPUP "èªªæ(&H)" BEGIN - MENUITEM "éæ¼ ReactOS æ§å¶å°(&A)...", ID_HELP_ABOUT + MENUITEM "éæ¼ ReactOS æ§å¶å°(&A)...", IDM_HELP_ABOUT + END +END + +IDM_CONSOLE_LARGE MENU DISCARDABLE +BEGIN + POPUP "æªæ¡(&F)" + BEGIN + MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "çµæ(&X)\tAlt+F4", IDM_FILE_EXIT + END + + POPUP "&Windows" + BEGIN + MENUITEM "List", IDM_WINDOWS_LIST + END + + POPUP "èªªæ(&H)" + BEGIN + MENUITEM "éæ¼ ReactOS æ§å¶å°(&A)...", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/mmc/mmc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/mmc.… ============================================================================== --- trunk/reactos/base/applications/mmc/mmc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/mmc.c [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -21,16 +21,19 @@ HINSTANCE hAppInstance; HANDLE hAppHeap; +HWND hwndMainConsole; +HWND hwndMDIClient; -int -_tmain(IN int argc, - IN const TCHAR *argv[]) + +int WINAPI +_tWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPTSTR lpCmdLine, + int nCmdShow) { - HWND hMainConsole; MSG Msg; - BOOL bRet; - hAppInstance = GetModuleHandle(NULL); + hAppInstance = hInstance; // GetModuleHandle(NULL); hAppHeap = GetProcessHeap(); InitCommonControls(); @@ -41,25 +44,20 @@ return 1; } - hMainConsole = CreateConsoleWindow(argc > 1 ? argv[1] : NULL); - if (hMainConsole != NULL) + hwndMainConsole = CreateConsoleWindow(NULL /*argc > 1 ? argv[1] : NULL*/, nCmdShow); + if (hwndMainConsole != NULL) { - for (;;) + while (GetMessage(&Msg, NULL, 0, 0)) { - bRet = GetMessage(&Msg, - NULL, - 0, - 0); - if (bRet != 0 && bRet != -1) + if (!TranslateMDISysAccel(hwndMDIClient, &Msg)) { TranslateMessage(&Msg); DispatchMessage(&Msg); } - else if (bRet == 0) - break; } } UnregisterMMCWndClasses(); + return 0; } Modified: trunk/reactos/base/applications/mmc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/prec… ============================================================================== --- trunk/reactos/base/applications/mmc/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/precomp.h [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -6,6 +6,9 @@ #include <tchar.h> #include "resource.h" + +#define WM_USER_CLOSE_CHILD (WM_USER + 1) + /* console.c */ @@ -16,7 +19,8 @@ UnregisterMMCWndClasses(VOID); HWND -CreateConsoleWindow(IN LPCTSTR lpFileName OPTIONAL); +CreateConsoleWindow(IN LPCTSTR lpFileName OPTIONAL, + int nCmdShow); /* misc.c */ @@ -34,3 +38,5 @@ extern HINSTANCE hAppInstance; extern HANDLE hAppHeap; +extern HWND hwndMainConsole; +extern HWND hwndMDIClient; Modified: trunk/reactos/base/applications/mmc/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/reso… ============================================================================== --- trunk/reactos/base/applications/mmc/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/resource.h [iso-8859-1] Sun Aug 25 21:43:46 2013 @@ -1,11 +1,17 @@ #pragma once -#define IDS_APPTITLE 101 +#define IDS_APPTITLE 101 #define IDS_CONSOLETITLE 102 -#define IDI_MAINAPP 101 +#define IDI_MAINAPP 101 -#define IDM_CONSOLEROOT 101 +#define IDM_CONSOLE_SMALL 1000 +#define IDM_CONSOLE_LARGE 1001 -#define ID_FILE_EXIT 1001 -#define ID_HELP_ABOUT 9001 +#define IDM_FILE_NEW 1002 +#define IDM_FILE_OPEN 1003 +#define IDM_FILE_EXIT 1010 +#define IDM_WINDOWS_LIST 2001 +#define IDM_HELP_ABOUT 9001 + +#define IDM_MDI_FIRSTCHILD 9500

1 0

[spetreolle] 59822: [NEWDEV] Fix controls positions in French. Spotted by gigaherz.
by spetreolle＠svn.reactos.org 25 Aug '13

25 Aug '13

Author: spetreolle Date: Sun Aug 25 16:36:04 2013 New Revision: 59822 URL: http://svn.reactos.org/svn/reactos?rev=59822&view=rev Log: [NEWDEV] Fix controls positions in French. Spotted by gigaherz. Modified: trunk/reactos/dll/win32/newdev/lang/fr-FR.rc Modified: trunk/reactos/dll/win32/newdev/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/fr-FR.rc [iso-8859-1] Sun Aug 25 16:36:04 2013 @@ -11,7 +11,7 @@ IDC_STATIC,115,21,195,16 LTEXT "Cliquer sur Suivant pour continuer.",IDC_STATIC,115,169,195,17 LTEXT "MATERIEL INCONNU",IDC_DEVICE,129,36,164,11 - LTEXT "ATTENTION ! L'INSTALLATION D'UN PILOTE PEUT ENTRAINER LE BLOCAGE DE VOTRE ORDINATEUR OU LE RENDRE INDEMARRABLE !",IDC_STATIC,105,59,210,25 + LTEXT "ATTENTION ! L'INSTALLATION D'UN PILOTE PEUT ENTRAINER LE BLOCAGE DE VOTRE ORDINATEUR OU LE RENDRE INDEMARRABLE !",IDC_STATIC,115,59,200,25 CONTROL "Installer le pilote automatiquement",IDC_RADIO_AUTO,"Button", BS_AUTORADIOBUTTON,115,112,178,13 CONTROL "Installer le pilote depuis un endroit spÃ©cifiÃ©",IDC_RADIO_MANUAL,

1 0

[akhaldi] 59821: [CRT] * Annotate search_s.h.
by akhaldi＠svn.reactos.org 25 Aug '13

25 Aug '13

Author: akhaldi Date: Sun Aug 25 15:53:31 2013 New Revision: 59821 URL: http://svn.reactos.org/svn/reactos?rev=59821&view=rev Log: [CRT] * Annotate search_s.h. Modified: trunk/reactos/include/crt/sec_api/search_s.h Modified: trunk/reactos/include/crt/sec_api/search_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/search… ============================================================================== --- trunk/reactos/include/crt/sec_api/search_s.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sec_api/search_s.h [iso-8859-1] Sun Aug 25 15:53:31 2013 @@ -3,6 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ + #ifndef _INC_SEARCH_S #define _INC_SEARCH_S @@ -14,12 +15,34 @@ extern "C" { #endif - _CRTIMP void *__cdecl _lfind_s(const void *_Key,const void *_Base,unsigned int *_NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(void *,const void *,const void *),void *_Context); - _CRTIMP void *__cdecl _lsearch_s(const void *_Key,void *_Base,unsigned int *_NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(void *,const void *,const void *),void *_Context); + _Check_return_ + _CRTIMP + void * + __cdecl + _lfind_s( + _In_ const void *_Key, + _In_reads_bytes_((*_NumOfElements) * _SizeOfElements) const void *_Base, + _Inout_ unsigned int *_NumOfElements, + _In_ size_t _SizeOfElements, + _In_ int(__cdecl *_PtFuncCompare)(void *, const void *, const void *), + void *_Context); + + _Check_return_ + _CRTIMP + void * + __cdecl + _lsearch_s( + _In_ const void *_Key, + _Inout_updates_bytes_((*_NumOfElements) * _SizeOfElements) void *_Base, + _Inout_ unsigned int *_NumOfElements, + _In_ size_t _SizeOfElements, + _In_ int(__cdecl *_PtFuncCompare)(void *, const void *, const void *), + void *_Context); #ifdef __cplusplus } #endif #endif -#endif + +#endif /* _INC_SEARCH_S */

1 0

[akhaldi] 59820: [PSDK] * Add a missing inclusion in wincrypt.h.
by akhaldi＠svn.reactos.org 25 Aug '13

25 Aug '13

Author: akhaldi Date: Sun Aug 25 15:11:58 2013 New Revision: 59820 URL: http://svn.reactos.org/svn/reactos?rev=59820&view=rev Log: [PSDK] * Add a missing inclusion in wincrypt.h. Modified: trunk/reactos/include/psdk/wincrypt.h Modified: trunk/reactos/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincrypt.h?re… ============================================================================== --- trunk/reactos/include/psdk/wincrypt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincrypt.h [iso-8859-1] Sun Aug 25 15:11:58 2013 @@ -20,6 +20,8 @@ #ifndef __WINE_WINCRYPT_H #define __WINE_WINCRYPT_H + +#include <specstrings.h> #ifdef __cplusplus extern "C" {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs