luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-25 11:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Further patch by Vlad Grecescu: Drop the code path that called

Browse Source 
2008-02-26  Tor Lillqvist  <tml@novell.com>

	* glib/gmain.c (g_poll): Further patch by Vlad Grecescu: Drop
	the code path that called WaitMessage(), as WaitMessage()
	doesn't offer any chance for APCs to run. Instead just use the
	code path with MsgWaitForMultipleObjectsEx() even for the
	wait-only-for-messages case. (#517484)


svn path=/trunk/; revision=6597
This commit is contained in:
Tor Lillqvist 2008-02-26 17:26:28 +00:00 committed by Tor Lillqvist
parent ec071a4986
commit d01acfe811
2 changed files with 19 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-02-26 Tor Lillqvist <tml@novell.com>
* glib/gmain.c (g_poll): Further patch by Vlad Grecescu: Drop the
code path that called WaitMessage(), as WaitMessage() doesn't
offer any chance for APCs to run. Instead just use the code path
with MsgWaitForMultipleObjectsEx() even for the
wait-only-for--messages case. (#517484)
2008-02-25 Matthias Clasen <mclasen@redhat.com> 2008-02-25 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version * configure.in: Bump version

84
glib/gmain.c
View File

@ -328,7 +328,6 @@ g_poll (GPollFD *fds,
GPollFD *f; GPollFD *f;
DWORD ready; DWORD ready;
MSG msg; MSG msg;
UINT timer;
gint nhandles = 0; gint nhandles = 0;
for (f = fds; f < &fds[nfds]; ++f) for (f = fds; f < &fds[nfds]; ++f)
@ -365,81 +364,20 @@ g_poll (GPollFD *fds,
ready = WAIT_OBJECT_0 + nhandles; ready = WAIT_OBJECT_0 + nhandles;
else else
{ {
if (nhandles == 0) /* Wait for either message or event
{ * -> Use MsgWaitForMultipleObjectsEx
/* Waiting just for messages */ */
if (timeout == INFINITE)
{
/* Infinite timeout
* -> WaitMessage
*/
#ifdef G_MAIN_POLL_DEBUG #ifdef G_MAIN_POLL_DEBUG
g_print ("WaitMessage\n"); g_print ("MsgWaitForMultipleObjectsEx(%d, %d)\n", nhandles, timeout);
#endif #endif
if (!WaitMessage ()) ready = MsgWaitForMultipleObjectsEx (nhandles, handles, timeout,
{ QS_ALLINPUT, MWMO_ALERTABLE);
gchar *emsg = g_win32_error_message (GetLastError ());
g_warning (G_STRLOC ": WaitMessage() failed: %s", emsg);
g_free (emsg);
}
ready = WAIT_OBJECT_0 + nhandles;
}
else if (timeout == 0)
{
/* Waiting just for messages, zero timeout.
* If we got here, there was no message
*/
ready = WAIT_TIMEOUT;
}
else
{
/* Waiting just for messages, some timeout
* -> Set a timer, wait for message,
* kill timer, use PeekMessage
*/
timer = SetTimer (NULL, 0, timeout, NULL);
if (timer == 0)
{
gchar *emsg = g_win32_error_message (GetLastError ());
g_warning (G_STRLOC ": SetTimer() failed: %s", emsg);
g_free (emsg);
ready = WAIT_TIMEOUT;
}
else
{
#ifdef G_MAIN_POLL_DEBUG
g_print ("WaitMessage\n");
#endif
WaitMessage ();
KillTimer (NULL, timer);
#ifdef G_MAIN_POLL_DEBUG
g_print ("PeekMessage\n");
#endif
if (PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE)
&& msg.message != WM_TIMER)
ready = WAIT_OBJECT_0;
else
ready = WAIT_TIMEOUT;
}
}
}
else
{
/* Wait for either message or event
* -> Use MsgWaitForMultipleObjectsEx
*/
#ifdef G_MAIN_POLL_DEBUG
g_print ("MsgWaitForMultipleObjectsEx(%d, %d)\n", nhandles, timeout);
#endif
ready = MsgWaitForMultipleObjectsEx (nhandles, handles, timeout,
QS_ALLINPUT, MWMO_ALERTABLE);
if (ready == WAIT_FAILED) if (ready == WAIT_FAILED)
{ {
gchar *emsg = g_win32_error_message (GetLastError ()); gchar *emsg = g_win32_error_message (GetLastError ());
g_warning (G_STRLOC ": MsgWaitForMultipleObjectsEx() failed: %s", emsg); g_warning (G_STRLOC ": MsgWaitForMultipleObjectsEx() failed: %s", emsg);
g_free (emsg); g_free (emsg);
}
} }
} }
} }