luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 09:16:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

win32: handle ERROR_MORE_DATA

Browse Source 
If a named pipe is being read in message mode and the next message is
longer than the nNumberOfBytesToRead parameter specifies, ReadFile
returns FALSE and GetLastError returns ERROR_MORE_DATA.

Since the API doesn't allow to return both a GError and the number of
bytes read so far, it makes more sense to return nread, and let the
client call GetLastError() himself to check if ERROR_MORE_DATA.

The current alternative loses the nread information.

https://bugzilla.gnome.org/show_bug.cgi?id=679288
This commit is contained in:
Marc-André Lureau 2012-08-08 01:08:15 +02:00
parent 23d80a04da
commit 4b5d762d5d
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gio/gwin32inputstream.c
View File

@ -326,8 +326,17 @@ g_win32_input_stream_read (GInputStream *stream,
goto end;
errsv = GetLastError ();
if (errsv == ERROR_HANDLE_EOF ||
errsv == ERROR_BROKEN_PIPE)
if (errsv == ERROR_MORE_DATA)
{
/* If a named pipe is being read in message mode and the
* next message is longer than the nNumberOfBytesToRead
* parameter specifies, ReadFile returns FALSE and
* GetLastError returns ERROR_MORE_DATA */
retval = nread;
goto end;
}
else if (errsv == ERROR_HANDLE_EOF ||
errsv == ERROR_BROKEN_PIPE)
{
/* TODO: the other end of a pipe may call the WriteFile
* function with nNumberOfBytesToWrite set to zero. In this