mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-01-12 07:26:15 +01:00
*giowin32.c: G_IO_WIN32_WINDOWS_MESSAGES channels
not handled correctly in g_io_win32_check()
This commit is contained in:
parent
fbb5eebbad
commit
4cebfd6349
@ -511,6 +511,7 @@ g_io_win32_prepare (GSource *source,
|
||||
static gboolean
|
||||
g_io_win32_check (GSource *source)
|
||||
{
|
||||
MSG msg;
|
||||
GIOWin32Watch *watch = (GIOWin32Watch *)source;
|
||||
GIOWin32Channel *channel = (GIOWin32Channel *)watch->channel;
|
||||
|
||||
@ -521,7 +522,13 @@ g_io_win32_check (GSource *source)
|
||||
watch->pollfd.events, watch->pollfd.revents, channel->revents);
|
||||
|
||||
if (channel->type != G_IO_WIN32_WINDOWS_MESSAGES)
|
||||
watch->pollfd.revents = (watch->pollfd.events & channel->revents);
|
||||
{
|
||||
watch->pollfd.revents = (watch->pollfd.events & channel->revents);
|
||||
}
|
||||
else
|
||||
{
|
||||
return (PeekMessage (&msg, channel->hwnd, 0, 0, PM_NOREMOVE));
|
||||
}
|
||||
|
||||
if (channel->type == G_IO_WIN32_SOCKET)
|
||||
{
|
||||
|
@ -511,6 +511,7 @@ g_io_win32_prepare (GSource *source,
|
||||
static gboolean
|
||||
g_io_win32_check (GSource *source)
|
||||
{
|
||||
MSG msg;
|
||||
GIOWin32Watch *watch = (GIOWin32Watch *)source;
|
||||
GIOWin32Channel *channel = (GIOWin32Channel *)watch->channel;
|
||||
|
||||
@ -521,7 +522,13 @@ g_io_win32_check (GSource *source)
|
||||
watch->pollfd.events, watch->pollfd.revents, channel->revents);
|
||||
|
||||
if (channel->type != G_IO_WIN32_WINDOWS_MESSAGES)
|
||||
watch->pollfd.revents = (watch->pollfd.events & channel->revents);
|
||||
{
|
||||
watch->pollfd.revents = (watch->pollfd.events & channel->revents);
|
||||
}
|
||||
else
|
||||
{
|
||||
return (PeekMessage (&msg, channel->hwnd, 0, 0, PM_NOREMOVE));
|
||||
}
|
||||
|
||||
if (channel->type == G_IO_WIN32_SOCKET)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user