JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cygwin: console: store replacement char directly 

Rather than relying on an index variable, store the current
replacement char and use that directly in WriteConsoleW.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2018-09-07 13:48:35 +02:00
parent 60471176fd
commit 7a720bfe08
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/fhandler_console.cc
View File

@ -1981,7 +1981,7 @@ static const wchar_t replacement_char[NUM_REPLACEMENT_CHARS] =
}; };
/* nFont member is always 0 so we have to use the facename. */ /* nFont member is always 0 so we have to use the facename. */
static WCHAR cons_facename[LF_FACESIZE]; static WCHAR cons_facename[LF_FACESIZE];
static int rp_char_idx; static WCHAR rp_char;
static NO_COPY HDC cdc; static NO_COPY HDC cdc;
static int CALLBACK static int CALLBACK
@ -2045,7 +2045,7 @@ check_font (HANDLE hdl)
break; break;
if (i == NUM_REPLACEMENT_CHARS) if (i == NUM_REPLACEMENT_CHARS)
i = 0; i = 0;
rp_char_idx = i; rp_char = replacement_char[i];
/* Note that we copy the original name returned by /* Note that we copy the original name returned by
GetCurrentConsoleFontEx, even if it was broken. GetCurrentConsoleFontEx, even if it was broken.
This allows an early return, rather than to store This allows an early return, rather than to store
@ -2066,8 +2066,7 @@ fhandler_console::write_replacement_char ()
check_font (get_output_handle ()); check_font (get_output_handle ());
DWORD done; DWORD done;
WriteConsoleW (get_output_handle (), &replacement_char[rp_char_idx], 1, WriteConsoleW (get_output_handle (), &rp_char, 1, &done, 0);
&done, 0);
} }
const unsigned char * const unsigned char *