diff options
| author | Tor Lillqvist <tml@iki.fi> | 2000-08-27 10:53:36 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2000-08-27 10:53:36 +0000 |
| commit | 3d0a1b3b221d32a53557a3512ab6eeadbf816352 (patch) | |
| tree | d2ca82c09d07caa083af5cc359fd33c1769e94bd /gwin32.c | |
| parent | a435aaff030e440c910d76f354f0e2157545b33e (diff) | |
| download | glib-3d0a1b3b221d32a53557a3512ab6eeadbf816352.tar.gz | |
New function, otherwise like g_io_channel_win32_wait_for_condition(), but
2000-08-27 Tor Lillqvist <tml@iki.fi>
* giowin32.c (g_io_channel_win32_poll): New function, otherwise
like g_io_channel_win32_wait_for_condition(), but accept several
GIOChannels.
(g_io_channel_win32_wait_for_condition): Call
g_io_channel_win32_poll().
* glib.h: Declare g_io_channel_win32_poll().
* gwin32.c (g_win32_error_message): Don't believe return value
from FormatMessage.
Diffstat (limited to 'gwin32.c')
| -rw-r--r-- | gwin32.c | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -806,11 +806,13 @@ g_win32_error_message (gint error) gchar *retval; int nbytes; - nbytes = FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER - |FORMAT_MESSAGE_IGNORE_INSERTS - |FORMAT_MESSAGE_FROM_SYSTEM, - NULL, error, 0, - (LPTSTR) &msg, 0, NULL); + FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER + |FORMAT_MESSAGE_IGNORE_INSERTS + |FORMAT_MESSAGE_FROM_SYSTEM, + NULL, error, 0, + (LPTSTR) &msg, 0, NULL); + nbytes = strlen (msg); + if (nbytes > 2 && msg[nbytes-1] == '\n' && msg[nbytes-2] == '\r') msg[nbytes-2] = '\0'; |