Ros-diffs August 2013

ros-diffs@reactos.org

10 participants
327 discussions

[hbelusca] 59832: [CMD-HELP] Add a help.exe utility to replace the old built-in command "help" in cmd.exe (i.e. do it the Win2k3 way). This way, if somebody runs a personalized command-line environ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Aug 26 12:45:34 2013 New Revision: 59832 URL: http://svn.reactos.org/svn/reactos?rev=59832&view=rev Log: [CMD-HELP] Add a help.exe utility to replace the old built-in command "help" in cmd.exe (i.e. do it the Win2k3 way). This way, if somebody runs a personalized command-line environment which provides its own help command, one can use the personalized help command and not the standard one (e.g. the "help" command of RosBE). Adapted by myself from a patch by Lee Schroeder. CORE-5701 #resolve #comment Committed in revision 59832, thanks :) I use a trick to be able to compile the utility (use: ninja cmd_help) because doing "ninja help" has a signification in ninja (signaled by AmineKhaldi). Added: trunk/reactos/base/applications/cmdutils/help/ (with props) trunk/reactos/base/applications/cmdutils/help/CMakeLists.txt (with props) trunk/reactos/base/applications/cmdutils/help/help.c (with props) trunk/reactos/base/applications/cmdutils/help/help.h (with props) trunk/reactos/base/applications/cmdutils/help/help.rc (with props) trunk/reactos/base/applications/cmdutils/help/lang/ (with props) trunk/reactos/base/applications/cmdutils/help/lang/de-DE.rc (with props) trunk/reactos/base/applications/cmdutils/help/lang/el-GR.rc (with props) trunk/reactos/base/applications/cmdutils/help/lang/en-US.rc (with props) trunk/reactos/base/applications/cmdutils/help/lang/es-ES.rc (with props) trunk/reactos/base/applications/cmdutils/help/lang/fr-FR.rc (with props) trunk/reactos/base/applications/cmdutils/help/lang/hu-HU.rc (with props) trunk/reactos/base/applications/cmdutils/help/lang/id-ID.rc (with props) trunk/reactos/base/applications/cmdutils/help/lang/it-IT.rc (with props) trunk/reactos/base/applications/cmdutils/help/lang/ja-JP.rc (with props) trunk/reactos/base/applications/cmdutils/help/lang/no-NO.rc (with props) trunk/reactos/base/applications/cmdutils/help/lang/pl-PL.rc (with props) trunk/reactos/base/applications/cmdutils/help/lang/ro-RO.rc (with props) trunk/reactos/base/applications/cmdutils/help/lang/ru-RU.rc (with props) trunk/reactos/base/applications/cmdutils/help/lang/sk-SK.rc (with props) trunk/reactos/base/applications/cmdutils/help/lang/sv-SE.rc (with props) trunk/reactos/base/applications/cmdutils/help/lang/uk-UA.rc (with props) trunk/reactos/base/applications/cmdutils/help/lang/zh-CN.rc (with props) trunk/reactos/base/applications/cmdutils/help/resource.h (with props) trunk/reactos/base/applications/cmdutils/help/rsrc.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/cmdtable.c trunk/reactos/base/shell/cmd/internal.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/help/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/help/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/help/help.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/help/help.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/help/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/help/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/help/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/help/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/help/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/help/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/help/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/help/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/help/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/help/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/help/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/help/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/help/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/help/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/help/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/help/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/help/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/help/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/help/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=5… Modified: trunk/reactos/base/shell/cmd/cmdtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdtable.c?… Modified: trunk/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?…

11 years, 4 months

[ion] 59831: [SACDRV]: SAC expects its memory allocations to be zeroed out. [SACMSG]: Re-commit the .mc file with CRLF endings, this is essential for correct output. [SACDRV]: Fix bug in VTUTF8Chan...

by ion＠svn.reactos.org

Author: ion Date: Mon Aug 26 10:40:31 2013 New Revision: 59831 URL: http://svn.reactos.org/svn/reactos?rev=59831&view=rev Log: [SACDRV]: SAC expects its memory allocations to be zeroed out. [SACMSG]: Re-commit the .mc file with CRLF endings, this is essential for correct output. [SACDRV]: Fix bug in VTUTF8ChannelAnsiDispatch (freeing stack memory with pool API). [SACDRV]: Fix the way in which the cell buffer was being computed. This way works (tm) and is also much easier to read. [SACDRV]: Fix bug in VTUTF8ChannelIRead (incorrect char vs byte sizing). VT-UTF8 output and input works now in the !SAC channel. There's still some lurking bugs, however, such as when hitting the 24th row (probably an off-by-one memcpy). Modified: trunk/reactos/drivers/sac/driver/memory.c trunk/reactos/drivers/sac/driver/sacdrv.h trunk/reactos/drivers/sac/driver/vtutf8chan.c trunk/reactos/include/reactos/mc/sacmsg.mc Modified: trunk/reactos/drivers/sac/driver/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/memory.… ============================================================================== --- trunk/reactos/drivers/sac/driver/memory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/memory.c [iso-8859-1] Mon Aug 26 10:40:31 2013 @@ -94,7 +94,8 @@ IN ULONG Line) { PVOID p; - p = ExAllocatePoolWithTag(NonPagedPool, PoolSize, Tag); + p = ExAllocatePoolWithTag(NonPagedPool, PoolSize, 'HACK'); + RtlZeroMemory(p, PoolSize); SAC_DBG(SAC_DBG_MM, "Returning block 0x%X.\n", p); return p; #if 0 @@ -342,7 +343,7 @@ /* Release the lock, delete the address, and return */ KeReleaseSpinLock(&MemoryLock, OldIrql); #endif - ExFreePool(*Block); + SAC_DBG(SAC_DBG_MM, "exiting: 0x%p.\n", *Block); + ExFreePoolWithTag(*Block, 'HACK'); *Block = NULL; - SAC_DBG(SAC_DBG_MM, "exiting.\n"); } 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 10:40:31 2013 @@ -311,6 +311,14 @@ C_ASSERT(sizeof(SAC_CURSOR_DATA) == 6); // +// Screen buffer when in VT-UTF8 Mode +// +typedef struct _SAC_VTUTF8_SCREEN +{ + SAC_CURSOR_DATA Cell[SAC_VTUTF8_ROW_HEIGHT][SAC_VTUTF8_COL_WIDTH]; +} SAC_VTUTF8_SCREEN, *PSAC_VTUTF8_SCREEN; + +// // Small optimization to easily recognize the most common VT-100/ANSI codes // typedef struct _SAC_STATIC_ESCAPE_STRING 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 10:40:31 2013 @@ -71,7 +71,7 @@ IN ULONG Length) { NTSTATUS Status = STATUS_SUCCESS; - PCHAR LocalBuffer = NULL; + PCHAR LocalBuffer = NULL, Tmp; INT l; CHECK_PARAMETER1(Channel); @@ -80,17 +80,17 @@ { /* Send the [2J (Clear Screen and Reset Cursor) */ case SacAnsiClearScreen: - LocalBuffer = "\x1B[2J"; + Tmp = "\x1B[2J"; break; /* Send the [0J (Clear From Position Till End Of Screen) */ case SacAnsiClearEndOfScreen: - LocalBuffer = "\x1B[0J"; + Tmp = "\x1B[0J"; break; /* Send the [0K (Clear from Position Till End Of Line) */ case SacAnsiClearEndOfLine: - LocalBuffer = "\x1B[0K"; + Tmp = "\x1B[0K"; break; /* Send a combination of two [#m attribute changes */ @@ -111,6 +111,7 @@ l = sprintf(LocalBuffer, "\x1B[%dm\x1B[%dm", Data[1], Data[0]); ASSERT((l + 1)*sizeof(UCHAR) < SAC_VTUTF8_COL_WIDTH); ASSERT(LocalBuffer); + Tmp = LocalBuffer; break; /* Send the [#;#H (Cursor Positio) sequence */ @@ -131,41 +132,42 @@ l = sprintf(LocalBuffer, "\x1B[%d;%dH", Data[1] + 1, Data[0] + 1); ASSERT((l + 1)*sizeof(UCHAR) < SAC_VTUTF8_COL_WIDTH); ASSERT(LocalBuffer); + Tmp = LocalBuffer; break; /* Send the [0m sequence (Set Attribute 0) */ case SacAnsiClearAttributes: - LocalBuffer = "\x1B[0m"; + Tmp = "\x1B[0m"; break; /* Send the [7m sequence (Set Attribute 7) */ case SacAnsiSetInverseAttribute: - LocalBuffer = "\x1B[7m"; + Tmp = "\x1B[7m"; break; /* Send the [27m sequence (Set Attribute 27) */ case SacAnsiClearInverseAttribute: - LocalBuffer = "\x1B[27m"; + Tmp = "\x1B[27m"; break; /* Send the [5m sequence (Set Attribute 5) */ case SacAnsiSetBlinkAttribute: - LocalBuffer = "\x1B[5m"; + Tmp = "\x1B[5m"; break; /* Send the [25m sequence (Set Attribute 25) */ case SacAnsiClearBlinkAttribute: - LocalBuffer = "\x1B[25m"; + Tmp = "\x1B[25m"; break; /* Send the [1m sequence (Set Attribute 1) */ case SacAnsiSetBoldAttribute: - LocalBuffer = "\x1B[1m"; + Tmp = "\x1B[1m"; break; /* Send the [22m sequence (Set Attribute 22) */ case SacAnsiClearBoldAttribute: - LocalBuffer = "\x1B[22m"; + Tmp = "\x1B[22m"; break; /* We don't recognize it */ @@ -178,7 +180,7 @@ if (NT_SUCCESS(Status)) { /* Go write out the sequence */ - Status = ConMgrWriteData(Channel, LocalBuffer, strlen(LocalBuffer)); + Status = ConMgrWriteData(Channel, Tmp, strlen(Tmp)); if (NT_SUCCESS(Status)) { /* Now flush it */ @@ -242,7 +244,7 @@ { ULONG Number, Number2, Number3, i, Action, Result; PWCHAR Sequence; - PSAC_CURSOR_DATA Cursor; + PSAC_VTUTF8_SCREEN Cursor; ASSERT(String[0] == VT_ANSI_ESCAPE); /* Microsoft's driver does this after the O(n) check below. Be smarter. */ @@ -439,7 +441,7 @@ if (!Result) Result = Sequence - String + 1; /* Get the current cell buffer */ - Cursor = (PSAC_CURSOR_DATA)Channel->OBuffer; + Cursor = (PSAC_VTUTF8_SCREEN)Channel->OBuffer; VTUTF8ChannelAssertCursor(Channel); /* Handle all the supported SAC ANSI commands */ @@ -555,14 +557,10 @@ 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) + - (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 = ' '; + Cursor->Cell[Channel->CursorRow][i].CursorFlags = Channel->CursorFlags; + Cursor->Cell[Channel->CursorRow][i].CursorBackColor = Channel->CursorColor; + Cursor->Cell[Channel->CursorRow][i].CursorColor = Channel->CursorBackColor; + Cursor->Cell[Channel->CursorRow][i].CursorValue = ' '; } break; @@ -571,14 +569,10 @@ 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) + - (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 = ' '; + Cursor->Cell[Channel->CursorRow][i].CursorFlags = Channel->CursorFlags; + Cursor->Cell[Channel->CursorRow][i].CursorBackColor = Channel->CursorColor; + Cursor->Cell[Channel->CursorRow][i].CursorColor = Channel->CursorBackColor; + Cursor->Cell[Channel->CursorRow][i].CursorValue = ' '; } break; @@ -587,14 +581,10 @@ 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) + - (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 = ' '; + Cursor->Cell[Channel->CursorRow][i].CursorFlags = Channel->CursorFlags; + Cursor->Cell[Channel->CursorRow][i].CursorBackColor = Channel->CursorColor; + Cursor->Cell[Channel->CursorRow][i].CursorColor = Channel->CursorBackColor; + Cursor->Cell[Channel->CursorRow][i].CursorValue = ' '; } break; @@ -738,7 +728,7 @@ VTUTF8ChannelOFlush(IN PSAC_CHANNEL Channel) { NTSTATUS Status; - PSAC_CURSOR_DATA Cursor; + PSAC_VTUTF8_SCREEN Cursor; INT Color[2], Position[2]; ULONG Utf8ProcessedCount, Utf8Count, R, C, ForeColor, BackColor, Attribute; PWCHAR TmpBuffer; @@ -746,7 +736,7 @@ CHECK_PARAMETER(Channel); /* Set the cell buffer position */ - Cursor = (PSAC_CURSOR_DATA)Channel->OBuffer; + Cursor = (PSAC_VTUTF8_SCREEN)Channel->OBuffer; /* Allocate a temporary buffer */ TmpBuffer = SacAllocatePool(40, GLOBAL_BLOCK_TAG); @@ -802,10 +792,8 @@ for (C = 0; C < SAC_VTUTF8_COL_WIDTH; C++) { /* Check if there's been a change in colors */ - if ((Cursor[(R * SAC_VTUTF8_COL_WIDTH) + - (C * SAC_VTUTF8_ROW_HEIGHT)].CursorBackColor != BackColor) || - (Cursor[(R * SAC_VTUTF8_COL_WIDTH) + - (C * SAC_VTUTF8_ROW_HEIGHT)].CursorColor != ForeColor)) + if ((Cursor->Cell[R][C].CursorBackColor != BackColor) || + (Cursor->Cell[R][C].CursorColor != ForeColor)) { /* New colors are being drawn -- are we also on a new row now? */ if (Overflow) @@ -822,10 +810,8 @@ } /* Cache the new colors */ - ForeColor = Cursor[(R * SAC_VTUTF8_COL_WIDTH) + - (C * SAC_VTUTF8_ROW_HEIGHT)].CursorColor; - BackColor = Cursor[(R * SAC_VTUTF8_COL_WIDTH) + - (C * SAC_VTUTF8_ROW_HEIGHT)].CursorBackColor; + ForeColor = Cursor->Cell[R][C].CursorColor; + BackColor = Cursor->Cell[R][C].CursorBackColor; /* Set them on the screen */ Color[1] = BackColor; @@ -837,8 +823,8 @@ if (!NT_SUCCESS(Status)) goto Quickie; } - /* Check if there's been a chance in attributes */ - if (Cursor->CursorFlags != Attribute) + /* Check if there's been a change in attributes */ + if (Cursor->Cell[R][C].CursorFlags != Attribute) { /* Yep! Are we also on a new row now? */ if (Overflow) @@ -855,7 +841,7 @@ } /* Set the new attributes on screen */ - Attribute = Cursor->CursorFlags; + Attribute = Cursor->Cell[R][C].CursorFlags; Status = VTUTF8ChannelProcessAttributes(Channel, Attribute); if (!NT_SUCCESS(Status)) goto Quickie; } @@ -867,16 +853,15 @@ Position[1] = R; Position[0] = C; Status = VTUTF8ChannelAnsiDispatch(Channel, - SacAnsiSetPosition, - Position, - sizeof(Position)); + SacAnsiSetPosition, + Position, + sizeof(Position)); if (!NT_SUCCESS(Status)) goto Quickie; Overflow = FALSE; } /* Write the character into our temporary buffer */ - *TmpBuffer = Cursor[(R * SAC_VTUTF8_COL_WIDTH) + - (C * SAC_VTUTF8_ROW_HEIGHT)].CursorValue; + *TmpBuffer = Cursor->Cell[R][C].CursorValue; TmpBuffer[1] = UNICODE_NULL; /* Convert it to UTF-8 */ @@ -896,6 +881,7 @@ if (Utf8Count) { /* Write it out on the wire */ + SAC_DBG(1, "Row: %d\tCol : %d\t\tValue : (%c) -> (%c)\n", R, C, *TmpBuffer, *Utf8ConversionBuffer); Status = ConMgrWriteData(Channel, Utf8ConversionBuffer, Utf8Count); if (!NT_SUCCESS(Status)) goto Quickie; } @@ -947,10 +933,10 @@ NTSTATUS NTAPI VTUTF8ChannelOWrite2(IN PSAC_CHANNEL Channel, - IN PCHAR String, + IN PWCHAR String, IN ULONG Size) { - PSAC_CURSOR_DATA Cursor; + PSAC_VTUTF8_SCREEN Cursor; ULONG i, EscapeSize, R, C; PWSTR pwch; CHECK_PARAMETER1(Channel); @@ -958,11 +944,12 @@ VTUTF8ChannelAssertCursor(Channel); /* Loop every character */ - Cursor = (PSAC_CURSOR_DATA)Channel->OBuffer; + Cursor = (PSAC_VTUTF8_SCREEN) Channel->OBuffer; for (i = 0; i < Size; i++) { /* Check what the character is */ - pwch = (PWSTR)&String[i]; + pwch = &String[i]; + SAC_DBG(1, "Writing on VT-UTF8: (%lx)\n", *pwch); switch (*pwch) { /* It's an escape sequence... */ @@ -1010,17 +997,13 @@ 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)]; + Cursor->Cell[R][C] = Cursor->Cell[R + 1][C]; } } /* 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); + RtlZeroMemory(&Cursor[R], sizeof(Cursor[R])); /* Reset the row back by one */ Channel->CursorRow--; @@ -1037,14 +1020,10 @@ { /* 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 = ' '; + Cursor->Cell[Channel->CursorRow][Channel->CursorCol].CursorFlags = Channel->CursorFlags; + Cursor->Cell[Channel->CursorRow][Channel->CursorCol].CursorBackColor = Channel->CursorBackColor; + Cursor->Cell[Channel->CursorRow][Channel->CursorCol].CursorColor = Channel->CursorColor; + Cursor->Cell[Channel->CursorRow][Channel->CursorCol].CursorValue = ' '; /* Move to the next character position, but don't overflow */ Channel->CursorCol++; @@ -1075,14 +1054,10 @@ /* 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; + Cursor->Cell[Channel->CursorRow][Channel->CursorCol].CursorFlags = Channel->CursorFlags; + Cursor->Cell[Channel->CursorRow][Channel->CursorCol].CursorBackColor = Channel->CursorBackColor; + Cursor->Cell[Channel->CursorRow][Channel->CursorCol].CursorColor = Channel->CursorColor; + Cursor->Cell[Channel->CursorRow][Channel->CursorCol].CursorValue = *pwch; /* Move forward one character, but make sure not to overflow */ Channel->CursorCol++; @@ -1203,7 +1178,8 @@ CHECK_PARAMETER2(String); /* Call the lower level function */ - Status = VTUTF8ChannelOWrite2(Channel, String, Length / sizeof(WCHAR)); + SAC_DBG(1, "Writing on VT-UTF8: %S\n", String); + Status = VTUTF8ChannelOWrite2(Channel, (PWCHAR)String, Length / sizeof(WCHAR)); if (NT_SUCCESS(Status)) { /* Is the channel enabled for output? */ @@ -1266,7 +1242,7 @@ IN ULONG BufferSize, IN PULONG ReturnBufferSize) { - ULONG CopyChars; + ULONG CopyChars, ReadLength; CHECK_PARAMETER1(Channel); CHECK_PARAMETER2(Buffer); CHECK_PARAMETER_WITH_STATUS(BufferSize > 0, STATUS_INVALID_BUFFER_SIZE); @@ -1283,29 +1259,33 @@ else { /* Use the smallest number of bytes either in the buffer or requested */ - CopyChars = min(Channel->ChannelInputBufferLength(Channel) * sizeof(WCHAR), - BufferSize); + ReadLength = min(Channel->ChannelInputBufferLength(Channel) * sizeof(WCHAR), + BufferSize); + + /* Do some cheezy buffer alignment */ + CopyChars = ReadLength / sizeof(WCHAR); + ReadLength = CopyChars * sizeof(WCHAR); ASSERT(CopyChars <= Channel->ChannelInputBufferLength(Channel)); /* Copy them into the caller's buffer */ - RtlCopyMemory(Buffer, Channel->IBuffer, CopyChars); + RtlCopyMemory(Buffer, Channel->IBuffer, ReadLength); /* Update the channel's index past the copied (read) bytes */ VTUTF8ChannelSetIBufferIndex(Channel, - VTUTF8ChannelGetIBufferIndex(Channel) - CopyChars); + VTUTF8ChannelGetIBufferIndex(Channel) - ReadLength); /* Are there still bytes that haven't been read yet? */ if (Channel->ChannelInputBufferLength(Channel)) { /* Shift them up in the buffer */ RtlMoveMemory(Channel->IBuffer, - &Channel->IBuffer[CopyChars], + &Channel->IBuffer[ReadLength], Channel->ChannelInputBufferLength(Channel) * sizeof(WCHAR)); } /* Return the number of bytes we actually copied */ - *ReturnBufferSize = CopyChars; + *ReturnBufferSize = ReadLength; } /* Return success */ Modified: trunk/reactos/include/reactos/mc/sacmsg.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/sacmsg.… ============================================================================== --- trunk/reactos/include/reactos/mc/sacmsg.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/sacmsg.mc [iso-8859-1] Mon Aug 26 10:40:31 2013 @@ -1,760 +1,760 @@ -MessageId=1 -SymbolicName=SAC_INIT_STATUS -Language=English - -Computer is booting, SAC started and initialized. - -Use the "ch -?" command for information about using channels. -Use the "?" command for general help. - -. - -MessageId=2 -SymbolicName=SAC_NEWLINE -Language=English - -. - -MessageId=3 -SymbolicName=SAC_PROMPT -Language=English -SAC>%0 -. - -MessageId=4 -SymbolicName=SACDRV_4 -Language=English -The SAC is unavailable, it was directly unloaded. -. - -MessageId=5 -SymbolicName=SACDRV_5 -Language=English -The SAC will become unavailable soon. The computer is shutting down. - -. - -MessageId=6 -SymbolicName=SACDRV_6 -Language=English -A parameter was incorrect or missing. Try the 'help' command for more details. -. - -MessageId=7 -SymbolicName=SACDRV_7 -Language=English -Thread information is now ON. -. - -MessageId=8 -SymbolicName=SACDRV_8 -Language=English -Thread information is now OFF. -. - -MessageId=9 -SymbolicName=SACDRV_9 -Language=English -Paging is now ON. -. - -MessageId=10 -SymbolicName=SACDRV_10 -Language=English -Paging is now OFF. -. - -MessageId=11 -SymbolicName=SAC_OUT_OF_MEMORY_PROMPT -Language=English -THIS LOOKS LIKE A BUG??? -. - -MessageId=12 -SymbolicName=SACDRV_12 -Language=English -d Dump the current kernel log. -. - -MessageId=13 -SymbolicName=SACDRV_13 -Language=English -f Toggle detailed or abbreviated tlist info. -. - -MessageId=14 -SymbolicName=SACDRV_14 -Language=English -? or help Display this list. -. - -MessageId=15 -SymbolicName=SACDRV_15 -Language=English -i List all IP network numbers and their IP addresses. -. - -MessageId=16 -SymbolicName=SACDRV_16 -Language=English -i <#> <ip> <subnet> <gateway> Set IP addr., subnet and gateway. -. - -MessageId=18 -SymbolicName=SACDRV_18 -Language=English -k <pid> Kill the given process. -. - -MessageId=19 -SymbolicName=SACDRV_19 -Language=English -l <pid> Lower the priority of a process to the lowest possible. -. - -MessageId=20 -SymbolicName=SACDRV_20 -Language=English -m <pid> <MB-allow> Limit the memory usage of a process to <MB-allow>. -. - -MessageId=21 -SymbolicName=SACDRV_21 -Language=English -p Toggle paging the display. -. - -MessageId=22 -SymbolicName=SACDRV_22 -Language=English -r <pid> Raise the priority of a process by one. -. - -MessageId=23 -SymbolicName=SACDRV_23 -Language=English -s Display the current time and date (24 hour clock used). -. - -MessageId=24 -SymbolicName=SACDRV_24 -Language=English -s mm/dd/yyyy hh:mm Set the current time and date (24 hour clock used). -. - -MessageId=25 -SymbolicName=SACDRV_25 -Language=English -t Tlist. -. - -MessageId=27 -SymbolicName=SACDRV_27 -Language=English -restart Restart the system immediately. -. - -MessageId=28 -SymbolicName=SACDRV_28 -Language=English -shutdown Shutdown the system immediately. -. - -MessageId=29 -SymbolicName=SACDRV_29 -Language=English -crashdump Crash the system. You must have crash dump enabled. -. - -MessageId=31 -SymbolicName=SACDRV_31 -Language=English -id Display the computer identification information. -. - -MessageId=32 -SymbolicName=SACDRV_32 -Language=English -lock Lock access to Command Prompt channels. -. - -MessageId=48 -SymbolicName=SAC_FAIL_PROMPT -Language=English -Failed with status 0x%%X. -. - -MessageId=49 -SymbolicName=SACDRV_49 -Language=English -Date: %%02d/%%02d/%%02d Time (GMT): %%02d:%%02d:%%02d:%%04d -. - -MessageId=50 -SymbolicName=SACDRV_50 -Language=English -SAC could not retrieve the IP Address. -. - -MessageId=51 -SymbolicName=SACDRV_51 -Language=English -SAC could not clear the existing IP Address. -. - -MessageId=52 -SymbolicName=SACDRV_52 -Language=English -SAC could not set the IP Address. -. - -MessageId=54 -SymbolicName=SACDRV_54 -Language=English -SAC successfully set the IP Address, subnet mask, and gateway. -. - -MessageId=55 -SymbolicName=SACDRV_55 -Language=English -SAC failed to terminate the process. -. - -MessageId=56 -SymbolicName=SACDRV_56 -Language=English -SAC successfully terminated the process. -. - -MessageId=57 -SymbolicName=SACDRV_57 -Language=English -SAC failed to lower the process priority. -. - -MessageId=58 -SymbolicName=SACDRV_58 -Language=English -SAC successfully lowered the process priority. -. - -MessageId=59 -SymbolicName=SACDRV_59 -Language=English -SAC failed to raise the process priority. -. - -MessageId=60 -SymbolicName=SACDRV_60 -Language=English -SAC successfully raised the process priority. -. - -MessageId=61 -SymbolicName=SACDRV_61 -Language=English -SAC failed to limit the available process memory. -. - -MessageId=62 -SymbolicName=SACDRV_62 -Language=English -SAC successfully limited the available process memory. -. - -MessageId=63 -SymbolicName=SACDRV_63 -Language=English -SAC cannot raise the priority of a process that was not previously lowered. -. - -MessageId=64 -SymbolicName=SACDRV_64 -Language=English -SAC cannot raise the process priority any higher. -. - -MessageId=65 -SymbolicName=SAC_SHUTDOWN_FAIL_PROMPT -Language=English -SAC failed to shutdown the system. -. - -MessageId=66 -SymbolicName=SAC_RESTART_FAIL_PROMPT -Language=English -SAC failed to restart the system. -. - -MessageId=67 -SymbolicName=SACDRV_67 -Language=English -SAC failed to crashdump the system. -. - -MessageId=68 -SymbolicName=SACDRV_68 -Language=English -SAC failed to retrieve the task list. -. - -MessageId=69 -SymbolicName=SACDRV_69 -Language=English -memory: %%4ld kb uptime:%%3ld %%2ld:%%02ld:%%02ld.%%03ld - - -. - -MessageId=70 -SymbolicName=SACDRV_70 -Language=English -No pagefile in use. -. - -MessageId=71 -SymbolicName=SACDRV_71 -Language=English -PageFile: %%wZ -. - -MessageId=72 -SymbolicName=SACDRV_72 -Language=English - Current Size: %%6ld kb Total Used: %%6ld kb Peak Used %%6ld kb -. - -MessageId=73 -SymbolicName=SACDRV_73 -Language=English - - Memory:%%7ldK Avail:%%7ldK TotalWs:%%7ldK InRam Kernel:%%5ldK P:%%5ldK -. - -MessageId=74 -SymbolicName=SACDRV_74 -Language=English - Commit:%%7ldK/%%7ldK Limit:%%7ldK Peak:%%7ldK Pool N:%%5ldK P:%%5ldK -. - -MessageId=75 -SymbolicName=SACDRV_75 -Language=English - User Time Kernel Time Ws Faults Commit Pri Hnd Thd Pid Name -. - -MessageId=76 -SymbolicName=SACDRV_76 -Language=English - %%6ld %%8ld File Cache -. - -MessageId=77 -SymbolicName=SACDRV_77 -Language=English -%%3ld:%%02ld:%%02ld.%%03ld %%3ld:%%02ld:%%02ld.%%03ld%%6ld %%8ld %%7ld %%2ld %%4ld %%3ld %%4ld %%wZ -. - -MessageId=78 -SymbolicName=SACDRV_78 -Language=English -%%3ld:%%02ld:%%02ld.%%03ld %%3ld:%%02ld:%%02ld.%%03ld -. - -MessageId=79 -SymbolicName=SACDRV_79 -Language=English -pid:%%3lx pri:%%2ld Hnd:%%5ld Pf:%%7ld Ws:%%7ldK %%wZ -. - -MessageId=80 -SymbolicName=SACDRV_80 -Language=English - tid pri Ctx Swtch StrtAddr User Time Kernel Time State -. - -MessageId=81 -SymbolicName=SACDRV_81 -Language=English - %%3lx %%2ld %%9ld %%p %%2ld:%%02ld:%%02ld.%%03ld %%2ld:%%02ld:%%02ld.%%03ld %%s%%s -. - -MessageId=82 -SymbolicName=SACDRV_82 -Language=English -----Press <Enter> for more---- -. - -MessageId=83 -SymbolicName=SACDRV_83 -Language=English -SAC is retrieving IP Addresses... -. - -MessageId=84 -SymbolicName=SACDRV_84 -Language=English -Could not retrieve IP Address(es). -. - -MessageId=85 -SymbolicName=SACDRV_85 -Language=English -There are no IP Addresses available. -. - -MessageId=86 -SymbolicName=SACDRV_86 -Language=English -Net: %%d, Ip=%%d.%%d.%%d.%%d Subnet=%%d.%%d.%%d.%%d Gateway=%%d.%%d.%%d.%%d -. - -MessageId=87 -SymbolicName=SACDRV_87 -Language=English -Date: %%02d/%%02d/%%02d Time (GMT): %%02d:%%02d -. - -MessageId=88 -SymbolicName=SACDRV_88 -Language=English -The year is restricted from 1980 to 2099. -. - -MessageId=89 -SymbolicName=SACDRV_89 -Language=English -That process has been killed and is being cleaned up by the system. -. - -MessageId=90 -SymbolicName=SACDRV_90 -Language=English -A duplicate process id is being cleaned up by the system. Try the -command again in a few seconds. -. - -MessageId=92 -SymbolicName=SACDRV_92 -Language=English - Computer Name: %%ws -. - -MessageId=93 -SymbolicName=SACDRV_93 -Language=English - Computer GUID: %%ws -. - -MessageId=94 -SymbolicName=SACDRV_94 -Language=English - Processor Architecture: %%ws -. - -MessageId=95 -SymbolicName=SACDRV_95 -Language=English - Build Number: %%ws -. - -MessageId=96 -SymbolicName=SACDRV_96 -Language=English - Product: %%ws -. - -MessageId=97 -SymbolicName=SACDRV_97 -Language=English - Applied Service Pack: %%ws -. - -MessageId=98 -SymbolicName=SAC_NO_DATA_MSG -Language=English -None%0 -. - -MessageId=99 -SymbolicName=SACDRV_99 -Language=English - Version Number: %%ws -. - -MessageId=100 -SymbolicName=SAC_DATACENTER_SUITE_MSG -Language=English -Windows Server 2003 Datacenter Edition%0 -. - -MessageId=101 -SymbolicName=SAC_EMBEDDED_SUITE_MSG -Language=English -Windows Server 2003 Embedded%0 -. - -MessageId=102 -SymbolicName=SAC_ENTERPRISE_SUITE_MSG -Language=English -Windows Server 2003 Enterprise Edition%0 -. - -MessageId=103 -SymbolicName=SAC_NO_SUITE_MSG -Language=English -Windows Server 2003%0 -. - -MessageId=104 -SymbolicName=SACDRV_104 -Language=English -Computer identification information is unavailable. -. - -MessageId=105 -SymbolicName=SACDRV_105 -Language=English -Unrecognized command. Try the 'help' command for more details. -. - -MessageId=106 -SymbolicName=SACDRV_106 -Language=English -Error: The SAC channel cannot be closed. -. - -MessageId=107 -SymbolicName=SACDRV_107 -Language=English -Error: Could not find a channel with that name. -. - -MessageId=108 -SymbolicName=SACDRV_108 -Language=English -Channel List - -(Use "ch -?" for information on using channels) - -# Status Channel Name -. - -MessageId=109 -SymbolicName=SACDRV_109 -Language=English -EVENT: A new channel has been created. Use "ch -?" for channel help. -Channel: %%s -. - -MessageId=110 -SymbolicName=SACDRV_110 -Language=English -EVENT: A channel has been closed. -Channel: %%s -. - -MessageId=111 -SymbolicName=SACDRV_111 -Language=English -Name: %%s -Description: %%s -Type: %%s -Channel GUID: %%08lx-%%04x-%%04x-%%02x%%02x-%%02x%%02x%%02x%%02x%%02x%%02x -Application Type GUID: %%08lx-%%04x-%%04x-%%02x%%02x-%%02x%%02x%%02x%%02x%%02x%%02x - -Press <esc><tab> for next channel. -Press <esc><tab>0 to return to the SAC channel. -Use any other key to view this channel. - -. - -MessageId=112 -SymbolicName=SACDRV_112 -Language=English -ch Channel management commands. Use ch -? for more help. -. - -MessageId=113 -SymbolicName=SAC_RESTART_TIME_PROMPT -Language=English - Time since last reboot: %%d:%%02d:%%02d -. - -MessageId=114 -SymbolicName=SAC_RESTART_PROMPT -Language=English -SAC preparing to restart the system. -. - -MessageId=115 -SymbolicName=SAC_SHUTDOWN_PROMPT -Language=English -SAC preparing to shutdown the system. -. - -MessageId=116 -SymbolicName=SACDRV_116 -Language=English -Error! Failed to remove channel! - -Please contact your system administrator. - -. - -MessageId=119 -SymbolicName=SACDRV_119 -Language=English -cmd Create a Command Prompt channel. -. - -MessageId=120 -SymbolicName=SACDRV_120 -Language=English -Timeout: Unable to launch a Command Prompt. The service responsible for - launching Command Prompt channels has timed out. This may be - because the service is malfunctioning or is unresponsive. -. - -MessageId=121 -SymbolicName=SACDRV_121 -Language=English -The Command Prompt session was successfully launched. -. - -MessageId=128 -SymbolicName=SACDRV_128 -Language=English -Error: The SAC Command Console session failed to be created. -. - -MessageId=131 -SymbolicName=SACDRV_131 -Language=English -Error: Unable to launch a Command Prompt. The service responsible for launching - Command Prompt channels has not yet registered. This may be because the - service is not yet started, is disabled by the administrator, is - malfunctioning or is unresponsive. -. - -MessageId=132 -SymbolicName=SACDRV_132 -Language=English -EVENT: The CMD command is now available. -. - -MessageId=133 -SymbolicName=SACDRV_133 -Language=English -EVENT: The CMD command is unavailable. -. - -MessageId=134 -SymbolicName=SACDRV_134 -Language=English -EVENT: An attempt was made to close a channel but failed. -Channel: %%s -. - -MessageId=135 -SymbolicName=SACDRV_135 -Language=English -EVENT: An attempt to close a channel failed because it is already closed. -Channel: %%s -. - -MessageId=136 -SymbolicName=SACDRV_136 -Language=English -Channel management commands: - -ch List all channels. - -Status Legend: (AB) -A: Channel operational status - 'A' = Channel is active. - 'I' = Channel is inactive. -B: Channel Type - 'V' = VT-UTF8 emulation. - 'R' = Raw - no emulation. - -ch -si <#> Switch to a channel by its number. -ch -sn <name> Switch to a channel by its name. -ch -ci <#> Close a channel by its number. -ch -cn <name> Close a channel by its name. - -Press <esc><tab> to select a channel. -Press <esc><tab>0 to return to the SAC channel. -. - -MessageId=137 -SymbolicName=SACDRV_137 -Language=English -Error: There is no channel present at the specified index. -. - -MessageId=144 -SymbolicName=SAC_CHANNEL_NAME -Language=English -SAC%0 -. - -MessageId=145 -SymbolicName=SAC_CHANNEL_DESCRIPTION -Language=English -Special Administration Console%0 -. - -MessageId=146 -SymbolicName=SACDRV_146 -Language=English -Command Prompt%0 -. - -MessageId=147 -SymbolicName=SACDRV_147 -Language=English -Locked access to all Command Prompt channels. -. - -MessageId=148 -SymbolicName=SACDRV_148 -Language=English -Launching of Command Prompt channels is disabled. -. - -MessageId=149 -SymbolicName=SACDRV_149 -Language=English -The specified subnet mask is invalid. -. - -MessageId=150 -SymbolicName=SACDRV_150 -Language=English -Error, missing network interface number. -. - -MessageId=151 -SymbolicName=SACDRV_151 -Language=English -The specified IP address is invalid. -. - -MessageId=152 -SymbolicName=SACDRV_152 -Language=English -The specified gateway IP address is invalid. -. - -MessageId=153 -SymbolicName=SAC_UNINITIALIZED_MSG -Language=English -not yet initialized%0 -. - -MessageId=154 -SymbolicName=SACDRV_154 -Language=English -The maximum number of channels has been reached. -. +MessageId=1 +SymbolicName=SAC_INIT_STATUS +Language=English + +Computer is booting, SAC started and initialized. + +Use the "ch -?" command for information about using channels. +Use the "?" command for general help. + +. + +MessageId=2 +SymbolicName=SAC_NEWLINE +Language=English + +. + +MessageId=3 +SymbolicName=SAC_PROMPT +Language=English +SAC>%0 +. + +MessageId=4 +SymbolicName=SACDRV_4 +Language=English +The SAC is unavailable, it was directly unloaded. +. + +MessageId=5 +SymbolicName=SACDRV_5 +Language=English +The SAC will become unavailable soon. The computer is shutting down. + +. + +MessageId=6 +SymbolicName=SACDRV_6 +Language=English +A parameter was incorrect or missing. Try the 'help' command for more details. +. + +MessageId=7 +SymbolicName=SACDRV_7 +Language=English +Thread information is now ON. +. + +MessageId=8 +SymbolicName=SACDRV_8 +Language=English +Thread information is now OFF. +. + +MessageId=9 +SymbolicName=SACDRV_9 +Language=English +Paging is now ON. +. + +MessageId=10 +SymbolicName=SACDRV_10 +Language=English +Paging is now OFF. +. + +MessageId=11 +SymbolicName=SAC_OUT_OF_MEMORY_PROMPT +Language=English +THIS LOOKS LIKE A BUG??? +. + +MessageId=12 +SymbolicName=SACDRV_12 +Language=English +d Dump the current kernel log. +. + +MessageId=13 +SymbolicName=SACDRV_13 +Language=English +f Toggle detailed or abbreviated tlist info. +. + +MessageId=14 +SymbolicName=SACDRV_14 +Language=English +? or help Display this list. +. + +MessageId=15 +SymbolicName=SACDRV_15 +Language=English +i List all IP network numbers and their IP addresses. +. + +MessageId=16 +SymbolicName=SACDRV_16 +Language=English +i <#> <ip> <subnet> <gateway> Set IP addr., subnet and gateway. +. + +MessageId=18 +SymbolicName=SACDRV_18 +Language=English +k <pid> Kill the given process. +. + +MessageId=19 +SymbolicName=SACDRV_19 +Language=English +l <pid> Lower the priority of a process to the lowest possible. +. + +MessageId=20 +SymbolicName=SACDRV_20 +Language=English +m <pid> <MB-allow> Limit the memory usage of a process to <MB-allow>. +. + +MessageId=21 +SymbolicName=SACDRV_21 +Language=English +p Toggle paging the display. +. + +MessageId=22 +SymbolicName=SACDRV_22 +Language=English +r <pid> Raise the priority of a process by one. +. + +MessageId=23 +SymbolicName=SACDRV_23 +Language=English +s Display the current time and date (24 hour clock used). +. + +MessageId=24 +SymbolicName=SACDRV_24 +Language=English +s mm/dd/yyyy hh:mm Set the current time and date (24 hour clock used). +. + +MessageId=25 +SymbolicName=SACDRV_25 +Language=English +t Tlist. +. + +MessageId=27 +SymbolicName=SACDRV_27 +Language=English +restart Restart the system immediately. +. + +MessageId=28 +SymbolicName=SACDRV_28 +Language=English +shutdown Shutdown the system immediately. +. + +MessageId=29 +SymbolicName=SACDRV_29 +Language=English +crashdump Crash the system. You must have crash dump enabled. +. + +MessageId=31 +SymbolicName=SACDRV_31 +Language=English +id Display the computer identification information. +. + +MessageId=32 +SymbolicName=SACDRV_32 +Language=English +lock Lock access to Command Prompt channels. +. + +MessageId=48 +SymbolicName=SAC_FAIL_PROMPT +Language=English +Failed with status 0x%%X. +. + +MessageId=49 +SymbolicName=SACDRV_49 +Language=English +Date: %%02d/%%02d/%%02d Time (GMT): %%02d:%%02d:%%02d:%%04d +. + +MessageId=50 +SymbolicName=SACDRV_50 +Language=English +SAC could not retrieve the IP Address. +. + +MessageId=51 +SymbolicName=SACDRV_51 +Language=English +SAC could not clear the existing IP Address. +. + +MessageId=52 +SymbolicName=SACDRV_52 +Language=English +SAC could not set the IP Address. +. + +MessageId=54 +SymbolicName=SACDRV_54 +Language=English +SAC successfully set the IP Address, subnet mask, and gateway. +. + +MessageId=55 +SymbolicName=SACDRV_55 +Language=English +SAC failed to terminate the process. +. + +MessageId=56 +SymbolicName=SACDRV_56 +Language=English +SAC successfully terminated the process. +. + +MessageId=57 +SymbolicName=SACDRV_57 +Language=English +SAC failed to lower the process priority. +. + +MessageId=58 +SymbolicName=SACDRV_58 +Language=English +SAC successfully lowered the process priority. +. + +MessageId=59 +SymbolicName=SACDRV_59 +Language=English +SAC failed to raise the process priority. +. + +MessageId=60 +SymbolicName=SACDRV_60 +Language=English +SAC successfully raised the process priority. +. + +MessageId=61 +SymbolicName=SACDRV_61 +Language=English +SAC failed to limit the available process memory. +. + +MessageId=62 +SymbolicName=SACDRV_62 +Language=English +SAC successfully limited the available process memory. +. + +MessageId=63 +SymbolicName=SACDRV_63 +Language=English +SAC cannot raise the priority of a process that was not previously lowered. +. + +MessageId=64 +SymbolicName=SACDRV_64 +Language=English +SAC cannot raise the process priority any higher. +. + +MessageId=65 +SymbolicName=SAC_SHUTDOWN_FAIL_PROMPT +Language=English +SAC failed to shutdown the system. +. + +MessageId=66 +SymbolicName=SAC_RESTART_FAIL_PROMPT +Language=English +SAC failed to restart the system. +. + +MessageId=67 +SymbolicName=SACDRV_67 +Language=English +SAC failed to crashdump the system. +. + +MessageId=68 +SymbolicName=SACDRV_68 +Language=English +SAC failed to retrieve the task list. +. + +MessageId=69 +SymbolicName=SACDRV_69 +Language=English +memory: %%4ld kb uptime:%%3ld %%2ld:%%02ld:%%02ld.%%03ld + + +. + +MessageId=70 +SymbolicName=SACDRV_70 +Language=English +No pagefile in use. +. + +MessageId=71 +SymbolicName=SACDRV_71 +Language=English +PageFile: %%wZ +. + +MessageId=72 +SymbolicName=SACDRV_72 +Language=English + Current Size: %%6ld kb Total Used: %%6ld kb Peak Used %%6ld kb +. + +MessageId=73 +SymbolicName=SACDRV_73 +Language=English + + Memory:%%7ldK Avail:%%7ldK TotalWs:%%7ldK InRam Kernel:%%5ldK P:%%5ldK +. + +MessageId=74 +SymbolicName=SACDRV_74 +Language=English + Commit:%%7ldK/%%7ldK Limit:%%7ldK Peak:%%7ldK Pool N:%%5ldK P:%%5ldK +. + +MessageId=75 +SymbolicName=SACDRV_75 +Language=English + User Time Kernel Time Ws Faults Commit Pri Hnd Thd Pid Name +. + +MessageId=76 +SymbolicName=SACDRV_76 +Language=English + %%6ld %%8ld File Cache +. + +MessageId=77 +SymbolicName=SACDRV_77 +Language=English +%%3ld:%%02ld:%%02ld.%%03ld %%3ld:%%02ld:%%02ld.%%03ld%%6ld %%8ld %%7ld %%2ld %%4ld %%3ld %%4ld %%wZ +. + +MessageId=78 +SymbolicName=SACDRV_78 +Language=English +%%3ld:%%02ld:%%02ld.%%03ld %%3ld:%%02ld:%%02ld.%%03ld +. + +MessageId=79 +SymbolicName=SACDRV_79 +Language=English +pid:%%3lx pri:%%2ld Hnd:%%5ld Pf:%%7ld Ws:%%7ldK %%wZ +. + +MessageId=80 +SymbolicName=SACDRV_80 +Language=English + tid pri Ctx Swtch StrtAddr User Time Kernel Time State +. + +MessageId=81 +SymbolicName=SACDRV_81 +Language=English + %%3lx %%2ld %%9ld %%p %%2ld:%%02ld:%%02ld.%%03ld %%2ld:%%02ld:%%02ld.%%03ld %%s%%s +. + +MessageId=82 +SymbolicName=SACDRV_82 +Language=English +----Press <Enter> for more---- +. + +MessageId=83 +SymbolicName=SACDRV_83 +Language=English +SAC is retrieving IP Addresses... +. + +MessageId=84 +SymbolicName=SACDRV_84 +Language=English +Could not retrieve IP Address(es). +. + +MessageId=85 +SymbolicName=SACDRV_85 +Language=English +There are no IP Addresses available. +. + +MessageId=86 +SymbolicName=SACDRV_86 +Language=English +Net: %%d, Ip=%%d.%%d.%%d.%%d Subnet=%%d.%%d.%%d.%%d Gateway=%%d.%%d.%%d.%%d +. + +MessageId=87 +SymbolicName=SACDRV_87 +Language=English +Date: %%02d/%%02d/%%02d Time (GMT): %%02d:%%02d +. + +MessageId=88 +SymbolicName=SACDRV_88 +Language=English +The year is restricted from 1980 to 2099. +. + +MessageId=89 +SymbolicName=SACDRV_89 +Language=English +That process has been killed and is being cleaned up by the system. +. + +MessageId=90 +SymbolicName=SACDRV_90 +Language=English +A duplicate process id is being cleaned up by the system. Try the +command again in a few seconds. +. + +MessageId=92 +SymbolicName=SACDRV_92 +Language=English + Computer Name: %%ws +. + +MessageId=93 +SymbolicName=SACDRV_93 +Language=English + Computer GUID: %%ws +. + +MessageId=94 +SymbolicName=SACDRV_94 +Language=English + Processor Architecture: %%ws +. + +MessageId=95 +SymbolicName=SACDRV_95 +Language=English + Build Number: %%ws +. + +MessageId=96 +SymbolicName=SACDRV_96 +Language=English + Product: %%ws +. + +MessageId=97 +SymbolicName=SACDRV_97 +Language=English + Applied Service Pack: %%ws +. + +MessageId=98 +SymbolicName=SAC_NO_DATA_MSG +Language=English +None%0 +. + +MessageId=99 +SymbolicName=SACDRV_99 +Language=English + Version Number: %%ws +. + +MessageId=100 +SymbolicName=SAC_DATACENTER_SUITE_MSG +Language=English +Windows Server 2003 Datacenter Edition%0 +. + +MessageId=101 +SymbolicName=SAC_EMBEDDED_SUITE_MSG +Language=English +Windows Server 2003 Embedded%0 +. + +MessageId=102 +SymbolicName=SAC_ENTERPRISE_SUITE_MSG +Language=English +Windows Server 2003 Enterprise Edition%0 +. + +MessageId=103 +SymbolicName=SAC_NO_SUITE_MSG +Language=English +Windows Server 2003%0 +. + +MessageId=104 +SymbolicName=SACDRV_104 +Language=English +Computer identification information is unavailable. +. + +MessageId=105 +SymbolicName=SACDRV_105 +Language=English +Unrecognized command. Try the 'help' command for more details. +. + +MessageId=106 +SymbolicName=SACDRV_106 +Language=English +Error: The SAC channel cannot be closed. +. + +MessageId=107 +SymbolicName=SACDRV_107 +Language=English +Error: Could not find a channel with that name. +. + +MessageId=108 +SymbolicName=SACDRV_108 +Language=English +Channel List + +(Use "ch -?" for information on using channels) + +# Status Channel Name +. + +MessageId=109 +SymbolicName=SACDRV_109 +Language=English +EVENT: A new channel has been created. Use "ch -?" for channel help. +Channel: %%s +. + +MessageId=110 +SymbolicName=SACDRV_110 +Language=English +EVENT: A channel has been closed. +Channel: %%s +. + +MessageId=111 +SymbolicName=SACDRV_111 +Language=English +Name: %%s +Description: %%s +Type: %%s +Channel GUID: %%08lx-%%04x-%%04x-%%02x%%02x-%%02x%%02x%%02x%%02x%%02x%%02x +Application Type GUID: %%08lx-%%04x-%%04x-%%02x%%02x-%%02x%%02x%%02x%%02x%%02x%%02x + +Press <esc><tab> for next channel. +Press <esc><tab>0 to return to the SAC channel. +Use any other key to view this channel. + +. + +MessageId=112 +SymbolicName=SACDRV_112 +Language=English +ch Channel management commands. Use ch -? for more help. +. + +MessageId=113 +SymbolicName=SAC_RESTART_TIME_PROMPT +Language=English + Time since last reboot: %%d:%%02d:%%02d +. + +MessageId=114 +SymbolicName=SAC_RESTART_PROMPT +Language=English +SAC preparing to restart the system. +. + +MessageId=115 +SymbolicName=SAC_SHUTDOWN_PROMPT +Language=English +SAC preparing to shutdown the system. +. + +MessageId=116 +SymbolicName=SACDRV_116 +Language=English +Error! Failed to remove channel! + +Please contact your system administrator. + +. + +MessageId=119 +SymbolicName=SACDRV_119 +Language=English +cmd Create a Command Prompt channel. +. + +MessageId=120 +SymbolicName=SACDRV_120 +Language=English +Timeout: Unable to launch a Command Prompt. The service responsible for + launching Command Prompt channels has timed out. This may be + because the service is malfunctioning or is unresponsive. +. + +MessageId=121 +SymbolicName=SACDRV_121 +Language=English +The Command Prompt session was successfully launched. +. + +MessageId=128 +SymbolicName=SACDRV_128 +Language=English +Error: The SAC Command Console session failed to be created. +. + +MessageId=131 +SymbolicName=SACDRV_131 +Language=English +Error: Unable to launch a Command Prompt. The service responsible for launching + Command Prompt channels has not yet registered. This may be because the + service is not yet started, is disabled by the administrator, is + malfunctioning or is unresponsive. +. + +MessageId=132 +SymbolicName=SACDRV_132 +Language=English +EVENT: The CMD command is now available. +. + +MessageId=133 +SymbolicName=SACDRV_133 +Language=English +EVENT: The CMD command is unavailable. +. + +MessageId=134 +SymbolicName=SACDRV_134 +Language=English +EVENT: An attempt was made to close a channel but failed. +Channel: %%s +. + +MessageId=135 +SymbolicName=SACDRV_135 +Language=English +EVENT: An attempt to close a channel failed because it is already closed. +Channel: %%s +. + +MessageId=136 +SymbolicName=SACDRV_136 +Language=English +Channel management commands: + +ch List all channels. + +Status Legend: (AB) +A: Channel operational status + 'A' = Channel is active. + 'I' = Channel is inactive. +B: Channel Type + 'V' = VT-UTF8 emulation. + 'R' = Raw - no emulation. + +ch -si <#> Switch to a channel by its number. +ch -sn <name> Switch to a channel by its name. +ch -ci <#> Close a channel by its number. +ch -cn <name> Close a channel by its name. + +Press <esc><tab> to select a channel. +Press <esc><tab>0 to return to the SAC channel. +. + +MessageId=137 +SymbolicName=SACDRV_137 +Language=English +Error: There is no channel present at the specified index. +. + +MessageId=144 +SymbolicName=SAC_CHANNEL_NAME +Language=English +SAC%0 +. + +MessageId=145 +SymbolicName=SAC_CHANNEL_DESCRIPTION +Language=English +Special Administration Console%0 +. + +MessageId=146 +SymbolicName=SACDRV_146 +Language=English +Command Prompt%0 +. + +MessageId=147 +SymbolicName=SACDRV_147 +Language=English +Locked access to all Command Prompt channels. +. + +MessageId=148 +SymbolicName=SACDRV_148 +Language=English +Launching of Command Prompt channels is disabled. +. + +MessageId=149 +SymbolicName=SACDRV_149 +Language=English +The specified subnet mask is invalid. +. + +MessageId=150 +SymbolicName=SACDRV_150 +Language=English +Error, missing network interface number. +. + +MessageId=151 +SymbolicName=SACDRV_151 +Language=English +The specified IP address is invalid. +. + +MessageId=152 +SymbolicName=SACDRV_152 +Language=English +The specified gateway IP address is invalid. +. + +MessageId=153 +SymbolicName=SAC_UNINITIALIZED_MSG +Language=English +not yet initialized%0 +. + +MessageId=154 +SymbolicName=SACDRV_154 +Language=English +The maximum number of channels has been reached. +.

11 years, 4 months

[ion] 59830: [SACDRV]: Implement VTUTF8ChannelProcessAttributes and VTUTF8ChannelOFlush, since these are also needed for output. Time to test for real now.

by ion＠svn.reactos.org

Author: ion Date: Mon Aug 26 08:12:52 2013 New Revision: 59830 URL: http://svn.reactos.org/svn/reactos?rev=59830&view=rev Log: [SACDRV]: Implement VTUTF8ChannelProcessAttributes and VTUTF8ChannelOFlush, since these are also needed for output. Time to test for real 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 08:12:52 2013 @@ -193,12 +193,37 @@ NTSTATUS NTAPI -VTUTF8ChannelProcessAttributes( - IN PSAC_CHANNEL Channel, - IN UCHAR Attribute - ) -{ - return STATUS_NOT_IMPLEMENTED; +VTUTF8ChannelProcessAttributes(IN PSAC_CHANNEL Channel, + IN UCHAR Attribute) +{ + NTSTATUS Status; + CHECK_PARAMETER(Channel); + + /* Set bold if needed */ + Status = VTUTF8ChannelAnsiDispatch(Channel, + Attribute & SAC_CURSOR_FLAG_BOLD ? + SacAnsiSetBoldAttribute : + SacAnsiClearBoldAttribute, + NULL, + 0); + if (!NT_SUCCESS(Status)) return Status; + + /* Set blink if needed */ + Status = VTUTF8ChannelAnsiDispatch(Channel, + Attribute & SAC_CURSOR_FLAG_BLINK ? + SacAnsiSetBlinkAttribute : + SacAnsiClearBlinkAttribute, + NULL, + 0); + if (!NT_SUCCESS(Status)) return Status; + + /* Set inverse if needed */ + return VTUTF8ChannelAnsiDispatch(Channel, + Attribute & SAC_CURSOR_FLAG_INVERTED ? + SacAnsiSetInverseAttribute : + SacAnsiClearInverseAttribute, + NULL, + 0); } // @@ -712,8 +737,211 @@ NTAPI VTUTF8ChannelOFlush(IN PSAC_CHANNEL Channel) { - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + PSAC_CURSOR_DATA Cursor; + INT Color[2], Position[2]; + ULONG Utf8ProcessedCount, Utf8Count, R, C, ForeColor, BackColor, Attribute; + PWCHAR TmpBuffer; + BOOLEAN Overflow = FALSE; + CHECK_PARAMETER(Channel); + + /* Set the cell buffer position */ + Cursor = (PSAC_CURSOR_DATA)Channel->OBuffer; + + /* Allocate a temporary buffer */ + TmpBuffer = SacAllocatePool(40, GLOBAL_BLOCK_TAG); + if (!TmpBuffer) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + /* First, clear the screen */ + Status = VTUTF8ChannelAnsiDispatch(Channel, + SacAnsiClearScreen, + NULL, + 0); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Next, reset the cursor position */ + Position[1] = 0; + Position[0] = 0; + Status = VTUTF8ChannelAnsiDispatch(Channel, + SacAnsiSetPosition, + Position, + sizeof(Position)); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Finally, reset the attributes */ + Status = VTUTF8ChannelAnsiDispatch(Channel, + SacAnsiClearAttributes, + NULL, + 0); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Now set the current cursor attributes */ + Attribute = Channel->CursorFlags; + Status = VTUTF8ChannelProcessAttributes(Channel, Attribute); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* And set the current cursor colors */ + ForeColor = Channel->CursorColor; + BackColor = Channel->CursorBackColor; + Color[1] = BackColor; + Color[0] = ForeColor; + Status = VTUTF8ChannelAnsiDispatch(Channel, + SacAnsiSetColors, + Color, + sizeof(Color)); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Now loop all the characters in the cell buffer */ + for (R = 0; R < SAC_VTUTF8_ROW_HEIGHT; R++) + { + /* Accross every row */ + for (C = 0; C < SAC_VTUTF8_COL_WIDTH; C++) + { + /* Check if there's been a change in colors */ + if ((Cursor[(R * SAC_VTUTF8_COL_WIDTH) + + (C * SAC_VTUTF8_ROW_HEIGHT)].CursorBackColor != BackColor) || + (Cursor[(R * SAC_VTUTF8_COL_WIDTH) + + (C * SAC_VTUTF8_ROW_HEIGHT)].CursorColor != ForeColor)) + { + /* New colors are being drawn -- are we also on a new row now? */ + if (Overflow) + { + /* Reposition the cursor correctly */ + Position[1] = R; + Position[0] = C; + Status = VTUTF8ChannelAnsiDispatch(Channel, + SacAnsiSetPosition, + Position, + sizeof(Position)); + if (!NT_SUCCESS(Status)) goto Quickie; + Overflow = FALSE; + } + + /* Cache the new colors */ + ForeColor = Cursor[(R * SAC_VTUTF8_COL_WIDTH) + + (C * SAC_VTUTF8_ROW_HEIGHT)].CursorColor; + BackColor = Cursor[(R * SAC_VTUTF8_COL_WIDTH) + + (C * SAC_VTUTF8_ROW_HEIGHT)].CursorBackColor; + + /* Set them on the screen */ + Color[1] = BackColor; + Color[0] = ForeColor; + Status = VTUTF8ChannelAnsiDispatch(Channel, + SacAnsiSetColors, + Color, + sizeof(Color)); + if (!NT_SUCCESS(Status)) goto Quickie; + } + + /* Check if there's been a chance in attributes */ + if (Cursor->CursorFlags != Attribute) + { + /* Yep! Are we also on a new row now? */ + if (Overflow) + { + /* Reposition the cursor correctly */ + Position[1] = R; + Position[0] = C; + Status = VTUTF8ChannelAnsiDispatch(Channel, + SacAnsiSetPosition, + Position, + sizeof(Position)); + if (!NT_SUCCESS(Status)) goto Quickie; + Overflow = FALSE; + } + + /* Set the new attributes on screen */ + Attribute = Cursor->CursorFlags; + Status = VTUTF8ChannelProcessAttributes(Channel, Attribute); + if (!NT_SUCCESS(Status)) goto Quickie; + } + + /* Time to write the character -- are we on a new row now? */ + if (Overflow) + { + /* Reposition the cursor correctly */ + Position[1] = R; + Position[0] = C; + Status = VTUTF8ChannelAnsiDispatch(Channel, + SacAnsiSetPosition, + Position, + sizeof(Position)); + if (!NT_SUCCESS(Status)) goto Quickie; + Overflow = FALSE; + } + + /* Write the character into our temporary buffer */ + *TmpBuffer = Cursor[(R * SAC_VTUTF8_COL_WIDTH) + + (C * SAC_VTUTF8_ROW_HEIGHT)].CursorValue; + TmpBuffer[1] = UNICODE_NULL; + + /* Convert it to UTF-8 */ + if (!SacTranslateUnicodeToUtf8(TmpBuffer, + 1, + Utf8ConversionBuffer, + Utf8ConversionBufferSize, + &Utf8Count, + &Utf8ProcessedCount)) + { + /* Bail out if this failed */ + Status = STATUS_UNSUCCESSFUL; + goto Quickie; + } + + /* Make sure we have a remaining valid character */ + if (Utf8Count) + { + /* Write it out on the wire */ + Status = ConMgrWriteData(Channel, Utf8ConversionBuffer, Utf8Count); + if (!NT_SUCCESS(Status)) goto Quickie; + } + } + + /* All the characters on the row are done, indicate we need a reset */ + Overflow = TRUE; + } + + /* Everything is done, set the positition one last time */ + Position[1] = Channel->CursorRow; + Position[0] = Channel->CursorCol; + Status = VTUTF8ChannelAnsiDispatch(Channel, + SacAnsiSetPosition, + Position, + sizeof(Position)); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Set the current attribute one last time */ + Status = VTUTF8ChannelProcessAttributes(Channel, Channel->CursorFlags); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Set the current colors one last time */ + Color[1] = Channel->CursorBackColor; + Color[0] = Channel->CursorColor; + Status = VTUTF8ChannelAnsiDispatch(Channel, + SacAnsiSetColors, + Color, + sizeof(Color)); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Flush all the data out on the wire */ + Status = ConMgrFlushData(Channel); + +Quickie: + /* We're done, free the temporary buffer */ + if (TmpBuffer) SacFreePool(TmpBuffer); + + /* Indicate that all new data has been flushed now */ + if (NT_SUCCESS(Status)) + { + _InterlockedExchange(&Channel->ChannelHasNewOBufferData, 0); + } + + /* Return the result */ + return Status; } NTSTATUS

11 years, 4 months

[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

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

11 years, 4 months

[ion] 59828: [SACDRV]: Implement VTUTF8ChannelOWrite2. Time to try out the !SAC on VT-UTF8 mode now.

by ion＠svn.reactos.org

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

11 years, 4 months

[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

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; }

11 years, 4 months

[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

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++;

11 years, 4 months

[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

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)

11 years, 4 months

[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

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

11 years, 4 months

[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

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

11 years, 4 months

← Newer
1
...
8
9
10
11
12
13
14
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2013