wine-commits September 2008

wine-commits@winehq.org

3 participants
1215 discussions

Rob Shearman : include: Use placeholder structures with at least one field in vmr9.idl.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: b49835229e333e0075215afef9ed151107d23da7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49835229e333e0075215afef… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Sep 8 23:20:51 2008 +0100 include: Use placeholder structures with at least one field in vmr9.idl. MIDL won't parse structures with no fields. --- include/vmr9.idl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/vmr9.idl b/include/vmr9.idl index b7f916c..bb3681c 100644 --- a/include/vmr9.idl +++ b/include/vmr9.idl @@ -25,8 +25,8 @@ typedef LONGLONG REFERENCE_TIME; typedef DWORD D3DFORMAT; typedef DWORD D3DPOOL; typedef HANDLE HMONITOR; -typedef struct { } AM_MEDIA_TYPE; -typedef struct { } D3DCOLOR; +typedef struct { char dummy; } AM_MEDIA_TYPE; +typedef struct { char dummy; } D3DCOLOR; cpp_quote("#endif") interface IVMRSurface9;

1 0

Rob Shearman : include: Add XMLDOMDocumentEvents dispinterface to xmldom. idl.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: fa441c9dd07f091d16e6a904fa5e632e74b85721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa441c9dd07f091d16e6a904f… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Sep 8 23:20:47 2008 +0100 include: Add XMLDOMDocumentEvents dispinterface to xmldom.idl. --- include/xmldom.idl | 14 ++++++++++++++ include/xmldomdid.h | 4 ++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/include/xmldom.idl b/include/xmldom.idl index bf85acf..31c5e66 100644 --- a/include/xmldom.idl +++ b/include/xmldom.idl @@ -720,6 +720,20 @@ interface IXMLDOMParseError : IDispatch HRESULT filepos([retval, out] long * filePos); } +[ + hidden, + uuid(3efaa427-272f-11d2-836f-0000f87a7782) +] +dispinterface XMLDOMDocumentEvents +{ + properties: + methods: + [id(DISPID_XMLDOMEVENT_ONDATAAVAILABLE)] + HRESULT ondataavailable(); + + [id(DISPID_XMLDOMEVENT_ONREADYSTATECHANGE)] + HRESULT onreadystatechange(); +} [ uuid(2933bf90-7b36-11d2-b20e-00c04f983e60) diff --git a/include/xmldomdid.h b/include/xmldomdid.h index a299157..d241a9c 100644 --- a/include/xmldomdid.h +++ b/include/xmldomdid.h @@ -197,5 +197,9 @@ #define DISPID_DOM_ERROR_FILEPOS 0x000000b7 #define DISPID_DOM_ERROR__TOP 0x000000b8 +#define DISPID_XMLDOMEVENT 197 +#define DISPID_XMLDOMEVENT_ONREADYSTATECHANGE DISPID_READYSTATECHANGE +#define DISPID_XMLDOMEVENT_ONDATAAVAILABLE 198 +#define DISPID_XMLDOMEVENT__TOP 199 #endif /* __XMLDOMDID_H__ */

1 0

Rob Shearman : include: The INewShortcutHookA, INewShortcutHookW and IRunnableTask interface in shobjidl. idl should be local.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: d65920df77590097905d13bbaf8b997ab40392be URL: http://source.winehq.org/git/wine.git/?a=commit;h=d65920df77590097905d13bba… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Sep 8 23:20:42 2008 +0100 include: The INewShortcutHookA, INewShortcutHookW and IRunnableTask interface in shobjidl.idl should be local. They are declared such that they cannot be used over the network and cause errors in MIDL when they are not declared local. --- include/shobjidl.idl | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 23a1fde..7a4bd88 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1248,7 +1248,8 @@ cpp_quote("#define INewShortcutHook WINELIB_NAME_AW(INewShortcutHook)") [ object, uuid(000214e1-0000-0000-c000-000000000046), - pointer_default(unique) + pointer_default(unique), + local ] interface INewShortcutHookA : IUnknown { @@ -1278,7 +1279,8 @@ interface INewShortcutHookA : IUnknown [ object, uuid(000214f7-0000-0000-c000-000000000046), - pointer_default(unique) + pointer_default(unique), + local ] interface INewShortcutHookW : IUnknown { @@ -1307,7 +1309,8 @@ interface INewShortcutHookW : IUnknown [ object, uuid(85788d00-6807-11d0-b810-00c04fd706ec), - pointer_default(unique) + pointer_default(unique), + local ] interface IRunnableTask : IUnknown {

1 0

Rob Shearman : include: Fix signature of NearestPoint function of IInkDisp interface in msinkaut. idl.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: c36682685a5c713fd93145ee28b27d9f0645f467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c36682685a5c713fd93145ee2… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Sep 8 23:20:33 2008 +0100 include: Fix signature of NearestPoint function of IInkDisp interface in msinkaut.idl. Since the PointOnStroke and DistanceFromPacket parameters are [in, out] parameters the must be pointers. --- include/msinkaut.idl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/msinkaut.idl b/include/msinkaut.idl index 607229d..12dc107 100644 --- a/include/msinkaut.idl +++ b/include/msinkaut.idl @@ -637,8 +637,8 @@ cpp_quote("#endif /* _WINGDI_ */") HRESULT NearestPoint( [in] long X, [in] long Y, - [in, out] float PointOnStroke, - [in, out] float DistanceFromPacket, + [in, out] float *PointOnStroke, + [in, out] float *DistanceFromPacket, [out, retval] IInkStrokeDisp **Stroke); HRESULT CreateStrokes( [in] VARIANT StrokeIds,

1 0

Rob Shearman : include: Fix level of indirection of parameters in GetNotifyCmdLine function of IBackgroundCopyJob2 interface in bits1_5 .idl.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: 244b14ba36e4ff89338138b64fb4cd0b29c81454 URL: http://source.winehq.org/git/wine.git/?a=commit;h=244b14ba36e4ff89338138b64… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Sep 8 23:20:22 2008 +0100 include: Fix level of indirection of parameters in GetNotifyCmdLine function of IBackgroundCopyJob2 interface in bits1_5.idl. The parameters should be double pointers to strings, not pointers to strings. --- dlls/qmgr/job.c | 4 ++-- include/bits1_5.idl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 32dadd8..e344027 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -456,8 +456,8 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_SetNotifyCmdLine( static HRESULT WINAPI BITS_IBackgroundCopyJob_GetNotifyCmdLine( IBackgroundCopyJob2 *iface, - LPWSTR prog, - LPWSTR params) + LPWSTR *prog, + LPWSTR *params) { FIXME("Not implemented\n"); return E_NOTIMPL; diff --git a/include/bits1_5.idl b/include/bits1_5.idl index 0bb27ca..274a7de 100644 --- a/include/bits1_5.idl +++ b/include/bits1_5.idl @@ -30,7 +30,7 @@ import "bits.idl"; interface IBackgroundCopyJob2 : IBackgroundCopyJob { HRESULT SetNotifyCmdLine([unique] LPCWSTR prog, [unique] LPCWSTR params); - HRESULT GetNotifyCmdLine([out] LPWSTR prog, [out] LPWSTR params); + HRESULT GetNotifyCmdLine([out] LPWSTR *prog, [out] LPWSTR *params); typedef struct _BG_JOB_REPLY_PROGRESS {

1 0

Rob Shearman : include: Uncomment declaration of IDirectShowStream in amstream.idl.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: 10208999c53dd647a08890a6a61a6b90a7389f50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10208999c53dd647a08890a6a… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Sep 8 23:20:14 2008 +0100 include: Uncomment declaration of IDirectShowStream in amstream.idl. Also remove incorrect [optional] attributes from parameters. --- include/amstream.idl | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/include/amstream.idl b/include/amstream.idl index 1433f7a..d1cdd4c 100644 --- a/include/amstream.idl +++ b/include/amstream.idl @@ -64,7 +64,6 @@ typedef [v1_enum] enum { RenderData = 2 } OUTPUT_STATE; -/* [ object, uuid(7DB01C96-C0C3-11d0-8FF1-00C04FD9189D), @@ -81,7 +80,6 @@ interface IDirectShowStream : IDispatch [propget, id(3), helpstring("property Audio")] HRESULT Audio([out, retval] OUTPUT_STATE *pVal); [propput, id(3), helpstring("propetry Audio")] HRESULT Audio([in] OUTPUT_STATE newVal); }; -*/ [ object, @@ -93,7 +91,7 @@ interface IAMMultiMediaStream : IMultiMediaStream HRESULT Initialize( [in] STREAM_TYPE StreamType, [in] DWORD dwFlags, - [in, optional] IGraphBuilder *pFilterGraph); + [in] IGraphBuilder *pFilterGraph); HRESULT GetFilterGraph( [out] IGraphBuilder **ppGraphBuilder); @@ -102,10 +100,10 @@ interface IAMMultiMediaStream : IMultiMediaStream [out] IMediaStreamFilter **ppFilter); HRESULT AddMediaStream( - [in, optional] IUnknown *pStreamObject, - [in, optional] const MSPID *PurposeId, + [in] IUnknown *pStreamObject, + [in] const MSPID *PurposeId, [in] DWORD dwFlags, - [out, optional] IMediaStream **ppNewStream); + [out] IMediaStream **ppNewStream); HRESULT OpenFile( [in] LPCWSTR pszFileName, @@ -129,7 +127,7 @@ pointer_default(unique) interface IAMMediaStream : IMediaStream { HRESULT Initialize( - [in, optional] IUnknown *pSourceObject, + [in] IUnknown *pSourceObject, [in] DWORD dwFlags, [in] REFMSPID PurposeId, [in] const STREAM_TYPE StreamType); @@ -233,9 +231,9 @@ interface IAMMediaTypeStream : IMediaStream HRESULT CreateSample( [in] long lSampleSize, - [in, optional] BYTE * pbBuffer, + [in] BYTE * pbBuffer, [in] DWORD dwFlags, - [in, optional] IUnknown *pUnkOuter, + [in] IUnknown *pUnkOuter, [out] IAMMediaTypeSample ** ppAMMediaTypeSample); HRESULT GetStreamAllocatorRequirements(

1 0

Rob Shearman : include: Remove incorrect [optional] attributes from parameters in ddstream.idl.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: f399e6ecf2fa6e7fa5ed0aac12bd207478583194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f399e6ecf2fa6e7fa5ed0aac1… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Sep 8 23:20:06 2008 +0100 include: Remove incorrect [optional] attributes from parameters in ddstream.idl. --- include/ddstream.idl | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/ddstream.idl b/include/ddstream.idl index 6444015..947e2bc 100644 --- a/include/ddstream.idl +++ b/include/ddstream.idl @@ -44,14 +44,14 @@ pointer_default(unique) interface IDirectDrawMediaStream : IMediaStream { HRESULT GetFormat( - [out, optional] DDSURFACEDESC *pDDSDCurrent, - [out, optional] IDirectDrawPalette **ppDirectDrawPalette, - [out, optional] DDSURFACEDESC *pDDSDDesired, - [out, optional] DWORD *pdwFlags); + [out] DDSURFACEDESC *pDDSDCurrent, + [out] IDirectDrawPalette **ppDirectDrawPalette, + [out] DDSURFACEDESC *pDDSDDesired, + [out] DWORD *pdwFlags); HRESULT SetFormat( [in] const DDSURFACEDESC *pDDSurfaceDesc, - [in, optional] IDirectDrawPalette *pDirectDrawPalette); + [in] IDirectDrawPalette *pDirectDrawPalette); HRESULT GetDirectDraw( [out] IDirectDraw **ppDirectDraw); @@ -60,8 +60,8 @@ interface IDirectDrawMediaStream : IMediaStream [in] IDirectDraw *pDirectDraw); HRESULT CreateSample( - [in, optional] IDirectDrawSurface *pSurface, - [in, optional] const RECT *pRect, + [in] IDirectDrawSurface *pSurface, + [in] const RECT *pRect, [in] DWORD dwFlags, [out] IDirectDrawStreamSample **ppSample); @@ -79,8 +79,8 @@ pointer_default(unique) interface IDirectDrawStreamSample : IStreamSample { HRESULT GetSurface( - [out, optional] IDirectDrawSurface ** ppDirectDrawSurface, - [out, optional] RECT * pRect); + [out] IDirectDrawSurface ** ppDirectDrawSurface, + [out] RECT * pRect); HRESULT SetRect( [in] const RECT * pRect);

1 0

Rob Shearman : include: Define sigset_t in pthread.h if HAVE_SIGSET_T isn' t defined.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: dc2bee5f4259a878aef9d5e29028a40de3326997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc2bee5f4259a878aef9d5e29… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Sep 8 23:19:41 2008 +0100 include: Define sigset_t in pthread.h if HAVE_SIGSET_T isn't defined. --- include/wine/pthread.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/wine/pthread.h b/include/wine/pthread.h index 1971ebb..a8d5ba3 100644 --- a/include/wine/pthread.h +++ b/include/wine/pthread.h @@ -25,6 +25,11 @@ struct wine_pthread_callbacks; #include <signal.h> +#ifndef HAVE_SIGSET_T +struct sigset_t; +typedef struct sigset_t sigset_t; +#endif + #ifdef HAVE_PTHREAD_H #define _GNU_SOURCE

1 0

Hans Leidekker : winhttp: Make sure not to read more data than expected on a redirect.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: 7f28c5f87e23fe4a079d1f1fb184228212a39709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f28c5f87e23fe4a079d1f1fb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 8 22:02:21 2008 +0200 winhttp: Make sure not to read more data than expected on a redirect. Fixes a bug in automatic redirects with content. --- dlls/winhttp/request.c | 213 ++++++++++++++++++++++++------------------------ 1 files changed, 106 insertions(+), 107 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 46c6d6d..b11c426 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1132,16 +1132,120 @@ static BOOL receive_data( request_t *request, void *buffer, DWORD size, DWORD *r return TRUE; } +static DWORD get_chunk_size( const char *buffer ) +{ + const char *p; + DWORD size = 0; + + for (p = buffer; *p; p++) + { + if (*p >= '0' && *p <= '9') size = size * 16 + *p - '0'; + else if (*p >= 'a' && *p <= 'f') size = size * 16 + *p - 'a' + 10; + else if (*p >= 'A' && *p <= 'F') size = size * 16 + *p - 'A' + 10; + else if (*p == ';') break; + } + return size; +} + +static BOOL receive_data_chunked( request_t *request, void *buffer, DWORD size, DWORD *read, BOOL async ) +{ + char reply[MAX_REPLY_LEN], *p = buffer; + DWORD buflen, to_read, to_write = size; + int bytes_read; + + *read = 0; + for (;;) + { + if (*read == size) break; + + if (request->content_length == ~0UL) /* new chunk */ + { + buflen = sizeof(reply); + if (!netconn_get_next_line( &request->netconn, reply, &buflen )) break; + + if (!(request->content_length = get_chunk_size( reply ))) + { + /* zero sized chunk marks end of transfer; read any trailing headers and return */ + read_reply( request, FALSE ); + break; + } + } + to_read = min( to_write, request->content_length - request->content_read ); + + if (!netconn_recv( &request->netconn, p, to_read, async ? 0 : MSG_WAITALL, &bytes_read )) + { + if (bytes_read != to_read) + { + ERR("Not all data received %d/%d\n", bytes_read, to_read); + } + /* always return success, even if the network layer returns an error */ + *read = 0; + break; + } + if (!bytes_read) break; + + request->content_read += bytes_read; + to_write -= bytes_read; + *read += bytes_read; + p += bytes_read; + + if (request->content_read == request->content_length) /* chunk complete */ + { + request->content_read = 0; + request->content_length = ~0UL; + + buflen = sizeof(reply); + if (!netconn_get_next_line( &request->netconn, reply, &buflen )) + { + ERR("Malformed chunk\n"); + *read = 0; + break; + } + } + } + return TRUE; +} + +static BOOL read_data( request_t *request, void *buffer, DWORD to_read, DWORD *read, BOOL async ) +{ + static const WCHAR chunked[] = {'c','h','u','n','k','e','d',0}; + + BOOL ret; + WCHAR encoding[20]; + DWORD num_bytes, buflen = sizeof(encoding); + + if (query_headers( request, WINHTTP_QUERY_TRANSFER_ENCODING, NULL, encoding, &buflen, NULL ) && + !strcmpiW( encoding, chunked )) + { + ret = receive_data_chunked( request, buffer, to_read, &num_bytes, async ); + } + else + ret = receive_data( request, buffer, to_read, &num_bytes, async ); + + if (async) + { + if (ret) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, buffer, num_bytes ); + else + { + WINHTTP_ASYNC_RESULT result; + result.dwResult = API_READ_DATA; + result.dwError = get_last_error(); + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + } + } + if (ret && read) *read = num_bytes; + return ret; +} + /* read any content returned by the server so that the connection can be reused */ static void drain_content( request_t *request ) { DWORD bytes_read; char buffer[2048]; - if (request->content_length == ~0UL) return; for (;;) { - if (!receive_data( request, buffer, sizeof(buffer), &bytes_read, FALSE ) || !bytes_read) return; + if (!read_data( request, buffer, sizeof(buffer), &bytes_read, FALSE ) || !bytes_read) return; } } @@ -1321,111 +1425,6 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) return ret; } -static DWORD get_chunk_size( const char *buffer ) -{ - const char *p; - DWORD size = 0; - - for (p = buffer; *p; p++) - { - if (*p >= '0' && *p <= '9') size = size * 16 + *p - '0'; - else if (*p >= 'a' && *p <= 'f') size = size * 16 + *p - 'a' + 10; - else if (*p >= 'A' && *p <= 'F') size = size * 16 + *p - 'A' + 10; - else if (*p == ';') break; - } - return size; -} - -static BOOL receive_data_chunked( request_t *request, void *buffer, DWORD size, DWORD *read, BOOL async ) -{ - char reply[MAX_REPLY_LEN], *p = buffer; - DWORD buflen, to_read, to_write = size; - int bytes_read; - - *read = 0; - for (;;) - { - if (*read == size) break; - - if (request->content_length == ~0UL) /* new chunk */ - { - buflen = sizeof(reply); - if (!netconn_get_next_line( &request->netconn, reply, &buflen )) break; - - if (!(request->content_length = get_chunk_size( reply ))) - { - /* zero sized chunk marks end of transfer; read any trailing headers and return */ - read_reply( request, FALSE ); - break; - } - } - to_read = min( to_write, request->content_length - request->content_read ); - - if (!netconn_recv( &request->netconn, p, to_read, async ? 0 : MSG_WAITALL, &bytes_read )) - { - if (bytes_read != to_read) - { - ERR("Not all data received %d/%d\n", bytes_read, to_read); - } - /* always return success, even if the network layer returns an error */ - *read = 0; - break; - } - if (!bytes_read) break; - - request->content_read += bytes_read; - to_write -= bytes_read; - *read += bytes_read; - p += bytes_read; - - if (request->content_read == request->content_length) /* chunk complete */ - { - request->content_read = 0; - request->content_length = ~0UL; - - buflen = sizeof(reply); - if (!netconn_get_next_line( &request->netconn, reply, &buflen )) - { - ERR("Malformed chunk\n"); - *read = 0; - break; - } - } - } - return TRUE; -} - -static BOOL read_data( request_t *request, void *buffer, DWORD to_read, DWORD *read, BOOL async ) -{ - static const WCHAR chunked[] = {'c','h','u','n','k','e','d',0}; - - BOOL ret; - WCHAR encoding[20]; - DWORD num_bytes, buflen = sizeof(encoding); - - if (query_headers( request, WINHTTP_QUERY_TRANSFER_ENCODING, NULL, encoding, &buflen, NULL ) && - !strcmpiW( encoding, chunked )) - { - ret = receive_data_chunked( request, buffer, to_read, &num_bytes, async ); - } - else - ret = receive_data( request, buffer, to_read, &num_bytes, async ); - - if (async) - { - if (ret) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, buffer, num_bytes ); - else - { - WINHTTP_ASYNC_RESULT result; - result.dwResult = API_READ_DATA; - result.dwError = get_last_error(); - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); - } - } - if (ret && read) *read = num_bytes; - return ret; -} - static void task_read_data( task_header_t *task ) { read_data_t *r = (read_data_t *)task;

1 0

Hans Leidekker : winhttp: WinHttpQueryDataAvailable should do a blocking read if more data is expected .
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: 01e7d128483cf4bec401dee3fc8a479109d7a072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01e7d128483cf4bec401dee3f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 8 22:02:01 2008 +0200 winhttp: WinHttpQueryDataAvailable should do a blocking read if more data is expected. Spotted by Henri Verbeet. --- dlls/winhttp/net.c | 6 +----- dlls/winhttp/request.c | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 1abfbdd..450366b 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -464,11 +464,7 @@ BOOL netconn_query_data_available( netconn_t *conn, DWORD *available ) return TRUE; } #ifdef FIONREAD - if (!(ret = ioctl( conn->socket, FIONREAD, &unread ))) - { - TRACE("%d bytes of queued, but unread data\n", unread); - *available += unread; - } + if (!(ret = ioctl( conn->socket, FIONREAD, &unread ))) *available = unread; #endif return TRUE; } diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d1fc005..46c6d6d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1238,7 +1238,26 @@ static BOOL query_data( request_t *request, LPDWORD available, BOOL async ) BOOL ret; DWORD num_bytes; - ret = netconn_query_data_available( &request->netconn, &num_bytes ); + if ((ret = netconn_query_data_available( &request->netconn, &num_bytes ))) + { + if (request->content_read < request->content_length) + { + if (!num_bytes) + { + char buffer[4096]; + size_t to_read = min( sizeof(buffer), request->content_length - request->content_read ); + + ret = netconn_recv( &request->netconn, buffer, to_read, MSG_PEEK, (int *)&num_bytes ); + if (ret && !num_bytes) WARN("expected more data to be available\n"); + } + } + else if (num_bytes) + { + WARN("extra data available %u\n", num_bytes); + ret = FALSE; + } + } + TRACE("%u bytes available\n", num_bytes); if (async) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2008