ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed console output for non wrapped mode.

This commit is contained in:
Eric Pouech 2003-05-13 04:46:24 +00:00 committed by Alexandre Julliard
parent f06a996a07
commit d3446a441b
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dlls/kernel/console.c
View File

@ -1579,11 +1579,12 @@ BOOL WINAPI SetConsoleMode(HANDLE hcon, DWORD mode)
/****************************************************************** /******************************************************************
* write_char * CONSOLE_WriteChars
* *
* WriteConsoleOutput helper: hides server call semantics * WriteConsoleOutput helper: hides server call semantics
* writes a string at a given pos with standard attribute
*/ */
static int write_char(HANDLE hCon, LPCWSTR lpBuffer, int nc, COORD* pos) int CONSOLE_WriteChars(HANDLE hCon, LPCWSTR lpBuffer, int nc, COORD* pos)
{ {
int written = -1; int written = -1;
@ -1651,18 +1652,17 @@ static int write_block(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi,
DWORD mode, LPWSTR ptr, int len) DWORD mode, LPWSTR ptr, int len)
{ {
int blk; /* number of chars to write on current line */ int blk; /* number of chars to write on current line */
int done; /* number of chars already written */
if (len <= 0) return 1; if (len <= 0) return 1;
if (mode & ENABLE_WRAP_AT_EOL_OUTPUT) /* writes remaining on next line */ if (mode & ENABLE_WRAP_AT_EOL_OUTPUT) /* writes remaining on next line */
{ {
int done;
for (done = 0; done < len; done += blk) for (done = 0; done < len; done += blk)
{ {
blk = min(len - done, csbi->dwSize.X - csbi->dwCursorPosition.X); blk = min(len - done, csbi->dwSize.X - csbi->dwCursorPosition.X);
if (write_char(hCon, ptr + done, blk, &csbi->dwCursorPosition) != blk) if (CONSOLE_WriteChars(hCon, ptr + done, blk, &csbi->dwCursorPosition) != blk)
return 0; return 0;
if (csbi->dwCursorPosition.X == csbi->dwSize.X && !next_line(hCon, csbi)) if (csbi->dwCursorPosition.X == csbi->dwSize.X && !next_line(hCon, csbi))
return 0; return 0;
@ -1670,19 +1670,19 @@ static int write_block(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi,
} }
else else
{ {
blk = min(len, csbi->dwSize.X - csbi->dwCursorPosition.X); int pos = csbi->dwCursorPosition.X;
/* FIXME: we could reduce the number of loops
if (write_char(hCon, ptr, blk, &csbi->dwCursorPosition) != blk) * but, in most cases we wouldn't gain lots of time (it would only
return 0; * happen if we're asked to overwrite more than twice the part of the line,
if (blk < len) * which is unlikely
{
csbi->dwCursorPosition.X = csbi->dwSize.X - 1;
/* all remaining chars should be written on last column,
* so only overwrite the last column with last char in block
*/ */
if (write_char(hCon, ptr + len - 1, 1, &csbi->dwCursorPosition) != 1) for (blk = done = 0; done < len; done += blk)
{
blk = min(len - done, csbi->dwSize.X - csbi->dwCursorPosition.X);
csbi->dwCursorPosition.X = pos;
if (CONSOLE_WriteChars(hCon, ptr + done, blk, &csbi->dwCursorPosition) != blk)
return 0; return 0;
csbi->dwCursorPosition.X = csbi->dwSize.X - 1;
} }
} }