From 8a270250e800498ce168d2b3b097d2f6acf13dd8 Mon Sep 17 00:00:00 2001 From: James Ross-Gowan Date: Thu, 11 Dec 2014 23:20:35 +1100 Subject: pipe-win32: possible fix for Windows XP deadlock This fixes a hang with the VirtualBox OpenGL drivers. It might help with #1325 as well. --- input/pipe-win32.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'input') diff --git a/input/pipe-win32.c b/input/pipe-win32.c index 816bdcffed..4077ea84ee 100644 --- a/input/pipe-win32.c +++ b/input/pipe-win32.c @@ -45,6 +45,16 @@ static void read_pipe_thread(struct mp_input_src *src, void *param) goto done; } + // If we're reading from stdin, unset it. All I/O on synchronous handles is + // serialized, so stupid DLLs that call GetFileType on stdin can hang the + // process if they do it while we're reading from it. At least, the + // VirtualBox OpenGL ICD is affected by this, but only on Windows XP. + // GetFileType works differently in later versions of Windows. See: + // https://support.microsoft.com/kb/2009703 + // http://blogs.msdn.com/b/oldnewthing/archive/2011/12/02/10243553.aspx + if ((void*)_get_osfhandle(fd) == GetStdHandle(STD_INPUT_HANDLE)) + SetStdHandle(STD_INPUT_HANDLE, NULL); + waio = waio_alloc((void *)_get_osfhandle(fd), 0, NULL, NULL); if (!waio) { MP_ERR(src, "Can't initialize win32 file reader.\n"); -- cgit v1.2.3