2002-03-16 Tor Lillqvist <tml@iki.fi>
glib/giowin32.c (g_io_win32_dispatch): Check buffer condition
here, too.
2002-03-16 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c: Some debugging output formatting changes. The
2002-03-16 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c: Some debugging output formatting changes. The
- following two changes fixes a problem with buffered GIOChannels,
- noticed with the help of Owen's test program, thanks!
+ following changes fix a problem with buffered GIOChannels, noticed
+ with the help of Owen's test program, thanks! (#59969)
(g_io_win32_prepare): Return value that takes the buffer condition
into account, like g_io_unix_prepare() does.
(g_io_win32_check): Ditto, like g_io_unix_check().
(g_io_win32_prepare): Return value that takes the buffer condition
into account, like g_io_unix_prepare() does.
(g_io_win32_check): Ditto, like g_io_unix_check().
+ (g_io_win32_dispatch): Ditto, like g_io_unix_dispatch().
Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com>
Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com>
2002-03-16 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c: Some debugging output formatting changes. The
2002-03-16 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c: Some debugging output formatting changes. The
- following two changes fixes a problem with buffered GIOChannels,
- noticed with the help of Owen's test program, thanks!
+ following changes fix a problem with buffered GIOChannels, noticed
+ with the help of Owen's test program, thanks! (#59969)
(g_io_win32_prepare): Return value that takes the buffer condition
into account, like g_io_unix_prepare() does.
(g_io_win32_check): Ditto, like g_io_unix_check().
(g_io_win32_prepare): Return value that takes the buffer condition
into account, like g_io_unix_prepare() does.
(g_io_win32_check): Ditto, like g_io_unix_check().
+ (g_io_win32_dispatch): Ditto, like g_io_unix_dispatch().
Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com>
Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com>
2002-03-16 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c: Some debugging output formatting changes. The
2002-03-16 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c: Some debugging output formatting changes. The
- following two changes fixes a problem with buffered GIOChannels,
- noticed with the help of Owen's test program, thanks!
+ following changes fix a problem with buffered GIOChannels, noticed
+ with the help of Owen's test program, thanks! (#59969)
(g_io_win32_prepare): Return value that takes the buffer condition
into account, like g_io_unix_prepare() does.
(g_io_win32_check): Ditto, like g_io_unix_check().
(g_io_win32_prepare): Return value that takes the buffer condition
into account, like g_io_unix_prepare() does.
(g_io_win32_check): Ditto, like g_io_unix_check().
+ (g_io_win32_dispatch): Ditto, like g_io_unix_dispatch().
Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com>
Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com>
2002-03-16 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c: Some debugging output formatting changes. The
2002-03-16 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c: Some debugging output formatting changes. The
- following two changes fixes a problem with buffered GIOChannels,
- noticed with the help of Owen's test program, thanks!
+ following changes fix a problem with buffered GIOChannels, noticed
+ with the help of Owen's test program, thanks! (#59969)
(g_io_win32_prepare): Return value that takes the buffer condition
into account, like g_io_unix_prepare() does.
(g_io_win32_check): Ditto, like g_io_unix_check().
(g_io_win32_prepare): Return value that takes the buffer condition
into account, like g_io_unix_prepare() does.
(g_io_win32_check): Ditto, like g_io_unix_check().
+ (g_io_win32_dispatch): Ditto, like g_io_unix_dispatch().
Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com>
Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com>
2002-03-16 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c: Some debugging output formatting changes. The
2002-03-16 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c: Some debugging output formatting changes. The
- following two changes fixes a problem with buffered GIOChannels,
- noticed with the help of Owen's test program, thanks!
+ following changes fix a problem with buffered GIOChannels, noticed
+ with the help of Owen's test program, thanks! (#59969)
(g_io_win32_prepare): Return value that takes the buffer condition
into account, like g_io_unix_prepare() does.
(g_io_win32_check): Ditto, like g_io_unix_check().
(g_io_win32_prepare): Return value that takes the buffer condition
into account, like g_io_unix_prepare() does.
(g_io_win32_check): Ditto, like g_io_unix_check().
+ (g_io_win32_dispatch): Ditto, like g_io_unix_dispatch().
Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com>
Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com>
2002-03-16 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c: Some debugging output formatting changes. The
2002-03-16 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c: Some debugging output formatting changes. The
- following two changes fixes a problem with buffered GIOChannels,
- noticed with the help of Owen's test program, thanks!
+ following changes fix a problem with buffered GIOChannels, noticed
+ with the help of Owen's test program, thanks! (#59969)
(g_io_win32_prepare): Return value that takes the buffer condition
into account, like g_io_unix_prepare() does.
(g_io_win32_check): Ditto, like g_io_unix_check().
(g_io_win32_prepare): Return value that takes the buffer condition
into account, like g_io_unix_prepare() does.
(g_io_win32_check): Ditto, like g_io_unix_check().
+ (g_io_win32_dispatch): Ditto, like g_io_unix_dispatch().
Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com>
Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com>
2002-03-16 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c: Some debugging output formatting changes. The
2002-03-16 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c: Some debugging output formatting changes. The
- following two changes fixes a problem with buffered GIOChannels,
- noticed with the help of Owen's test program, thanks!
+ following changes fix a problem with buffered GIOChannels, noticed
+ with the help of Owen's test program, thanks! (#59969)
(g_io_win32_prepare): Return value that takes the buffer condition
into account, like g_io_unix_prepare() does.
(g_io_win32_check): Ditto, like g_io_unix_check().
(g_io_win32_prepare): Return value that takes the buffer condition
into account, like g_io_unix_prepare() does.
(g_io_win32_check): Ditto, like g_io_unix_check().
+ (g_io_win32_dispatch): Ditto, like g_io_unix_dispatch().
Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com>
Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com>
{
GIOFunc func = (GIOFunc)callback;
GIOWin32Watch *watch = (GIOWin32Watch *)source;
{
GIOFunc func = (GIOFunc)callback;
GIOWin32Watch *watch = (GIOWin32Watch *)source;
+ GIOCondition buffer_condition = g_io_channel_get_buffer_condition (watch->channel);
}
return (*func) (watch->channel,
}
return (*func) (watch->channel,
- watch->pollfd.revents & watch->condition,
+ (watch->pollfd.revents | buffer_condition) & watch->condition,