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

* fhandler_console.cc (region_split): New function.

Browse Source 
(delta): Ditto.
(ReadConsoleOutputWrapper): Ditto.
(fhandler_console::char_command): Use ReadConsoleOutputWrapper to avoid OOM
condition from ReadConsoleOutputW.  Add more debugging.
This commit is contained in:
Christopher Faylor 2013-12-31 22:19:07 +00:00
parent 5ac847c629
commit 7b52fd6713
2 changed files with 92 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,11 @@
2013-12-31 Christopher Faylor <me.cygwin2013@cgf.cx>
* fhandler_console.cc (region_split): New function.
(delta): Ditto.
(ReadConsoleOutputWrapper): Ditto.
(fhandler_console::char_command): Use ReadConsoleOutputWrapper to avoid
OOM condition from ReadConsoleOutputW. Add more debugging.
2013-12-22 Christopher Faylor <me.cygwin2013@cgf.cx> 2013-12-22 Christopher Faylor <me.cygwin2013@cgf.cx>
* strace.cc (strace::vsprntf): Fix potential (if unlikely) use of * strace.cc (strace::vsprntf): Fix potential (if unlikely) use of

90
winsup/cygwin/fhandler_console.cc
View File

@ -315,6 +315,71 @@ fhandler_console::mouse_aware (MOUSE_EVENT_RECORD& mouse_event)
|| dev_state.use_mouse >= 3)); || dev_state.use_mouse >= 3));
} }
/* The following three functions were adapted (i.e., mildly modified) from
http://stackoverflow.com/questions/14699043/replacement-to-systemcolor */
/* Split a rectangular region into two smaller rectangles based on the
largest dimension. */
static void
region_split (SHORT width, SHORT height, COORD coord,
const SMALL_RECT& region, COORD& coord_a,
SMALL_RECT& region_a, COORD& coord_b,
SMALL_RECT& region_b)
{
coord_a = coord_b = coord;
region_a = region_b = region;
if (height >= width)
{
SHORT half = height / 2;
coord_b.Y += half;
region_b.Top += half;
region_a.Bottom = region_b.Top - 1;
}
else
{
SHORT half = width / 2;
coord_b.X += half;
region_b.Left += half;
region_a.Right = region_b.Left - 1;
}
}
/* Utility function to figure out the distance between two points. */
static SHORT
delta (SHORT first, SHORT second)
{
return (second >= first) ? (second - first + 1) : 0;
}
/* Subdivide the ReadConsoleInput operation into smaller and smaller chunks as
needed until it succeeds in reading the entire screen buffer. */
static BOOL
ReadConsoleOutputWrapper (HANDLE h, PCHAR_INFO buf,
COORD bufsiz, COORD coord,
SMALL_RECT& region)
{
SHORT width = delta (region.Left, region.Right);
SHORT height = delta (region.Top, region.Bottom);
if ((width == 0) || (height == 0))
return TRUE;
BOOL success = ReadConsoleOutputW (h, buf, bufsiz, coord, &region);
if (success)
/* it worked */;
else if (GetLastError () == ERROR_NOT_ENOUGH_MEMORY && (width * height) > 1)
{
COORD coord_a, coord_b;
SMALL_RECT region_a, region_b;
region_split (width, height, coord, region, coord_a, region_a,
coord_b, region_b);
success = ReadConsoleOutputWrapper (h, buf, bufsiz, coord_a, region_a)
&& ReadConsoleOutputWrapper (h, buf, bufsiz, coord_b, region_b);
}
return success;
}
void __reg3 void __reg3
fhandler_console::read (void *pv, size_t& buflen) fhandler_console::read (void *pv, size_t& buflen)
{ {
@ -1573,25 +1638,34 @@ fhandler_console::char_command (char c)
if (dev_state.savebuf) if (dev_state.savebuf)
cfree (dev_state.savebuf); cfree (dev_state.savebuf);
dev_state.savebuf = (PCHAR_INFO) cmalloc_abort (HEAP_1_BUF, sizeof (CHAR_INFO) * size_t screen_size = sizeof (CHAR_INFO) * dev_state.savebufsiz.X * dev_state.savebufsiz.Y;
dev_state.savebufsiz.X * dev_state.savebufsiz.Y); dev_state.savebuf = (PCHAR_INFO) cmalloc_abort (HEAP_1_BUF, screen_size);
ReadConsoleOutputW (get_output_handle (), dev_state.savebuf, BOOL res = ReadConsoleOutputWrapper (get_output_handle (),
dev_state.savebufsiz, cob, &now.srWindow); dev_state.savebuf,
dev_state.savebufsiz, cob,
now.srWindow);
if (!res)
debug_printf ("ReadConsoleOutputWrapper failed, %E");
} }
else /* restore */ else /* restore */
{ {
if (!dev_state.savebuf)
break;
CONSOLE_SCREEN_BUFFER_INFO now; CONSOLE_SCREEN_BUFFER_INFO now;
COORD cob = { 0, 0 }; COORD cob = { 0, 0 };
if (!GetConsoleScreenBufferInfo (get_output_handle (), &now)) if (!GetConsoleScreenBufferInfo (get_output_handle (), &now))
{
debug_printf ("GetConsoleScreenBufferInfo(%y, %y), %E", get_output_handle (), &now);
break; break;
}
if (!dev_state.savebuf) BOOL res = WriteConsoleOutputW (get_output_handle (), dev_state.savebuf,
break;
WriteConsoleOutputW (get_output_handle (), dev_state.savebuf,
dev_state.savebufsiz, cob, &now.srWindow); dev_state.savebufsiz, cob, &now.srWindow);
if (!res)
debug_printf ("WriteConsoleOutputW failed, %E");
cfree (dev_state.savebuf); cfree (dev_state.savebuf);
dev_state.savebuf = NULL; dev_state.savebuf = NULL;