November 2012 - Wine-Commits

Christian Costa : strmbase: Display new ref in AddRef and Release for IEnumMediaTypes.
by Alexandre Julliard Nov. 23, 2012

Nov. 23, 2012

Module: wine Branch: master Commit: 930c9dd972f3ee22c1fba104565fbf9762b1798d URL: http://source.winehq.org/git/wine.git/?a=commit;h=930c9dd972f3ee22c1fba1045… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Nov 23 09:46:50 2012 +0100 strmbase: Display new ref in AddRef and Release for IEnumMediaTypes. --- dlls/strmbase/mediatype.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index fef2739..82c7d23 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -170,21 +170,21 @@ static HRESULT WINAPI IEnumMediaTypesImpl_QueryInterface(IEnumMediaTypes * iface static ULONG WINAPI IEnumMediaTypesImpl_AddRef(IEnumMediaTypes * iface) { IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); - ULONG refCount = InterlockedIncrement(&This->refCount); + ULONG ref = InterlockedIncrement(&This->refCount); - TRACE("(%p)->() AddRef from %d\n", iface, refCount - 1); + TRACE("(%p)->(): new ref = %u\n", iface, ref); - return refCount; + return ref; } static ULONG WINAPI IEnumMediaTypesImpl_Release(IEnumMediaTypes * iface) { IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); - ULONG refCount = InterlockedDecrement(&This->refCount); + ULONG ref = InterlockedDecrement(&This->refCount); - TRACE("(%p)->() Release from %d\n", iface, refCount + 1); + TRACE("(%p)->(): new ref = %u\n", iface, ref); - if (!refCount) + if (!ref) { ULONG i; for (i = 0; i < This->enumMediaDetails.cMediaTypes; i++) @@ -193,7 +193,7 @@ static ULONG WINAPI IEnumMediaTypesImpl_Release(IEnumMediaTypes * iface) IPin_Release(&This->basePin->IPin_iface); CoTaskMemFree(This); } - return refCount; + return ref; } static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes * iface, ULONG cMediaTypes, AM_MEDIA_TYPE ** ppMediaTypes, ULONG * pcFetched)

1 0

Andrew Talbot : winhttp: Remove unused variables.
by Alexandre Julliard Nov. 23, 2012

Nov. 23, 2012

Module: wine Branch: master Commit: 4be1fce0d113a6a2dc246dfe797a68fe68844dfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4be1fce0d113a6a2dc246dfe7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 22 21:02:02 2012 +0000 winhttp: Remove unused variables. --- dlls/winhttp/net.c | 3 +-- dlls/winhttp/request.c | 8 +++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 5ec4e1a..ff0b0ff 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -927,14 +927,13 @@ BOOL netconn_get_next_line( netconn_t *conn, char *buffer, DWORD *buflen ) DWORD netconn_set_timeout( netconn_t *netconn, BOOL send, int value ) { - int res; struct timeval tv; /* value is in milliseconds, convert to struct timeval */ tv.tv_sec = value / 1000; tv.tv_usec = (value % 1000) * 1000; - if ((res = setsockopt( netconn->socket, SOL_SOCKET, send ? SO_SNDTIMEO : SO_RCVTIMEO, (void*)&tv, sizeof(tv) ) == -1)) + if (setsockopt( netconn->socket, SOL_SOCKET, send ? SO_SNDTIMEO : SO_RCVTIMEO, (void*)&tv, sizeof(tv) ) == -1) { WARN("setsockopt failed (%s)\n", strerror( errno )); return sock_get_error( errno ); diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 7c0d3ab..0d44ed1 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2814,7 +2814,7 @@ static DWORD wait_for_completion( struct winhttp_request *request ) static HRESULT request_receive( struct winhttp_request *request ) { - DWORD err, size, total_bytes_read, buflen = 4096; + DWORD err, size, buflen = 4096; wait_set_status_callback( request, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE ); if (!WinHttpReceiveResponse( request->hrequest, NULL )) @@ -2829,7 +2829,7 @@ static HRESULT request_receive( struct winhttp_request *request ) } if (!(request->buffer = heap_alloc( buflen ))) return E_OUTOFMEMORY; request->buffer[0] = 0; - size = total_bytes_read = 0; + size = 0; do { wait_set_status_callback( request, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE ); @@ -2860,7 +2860,6 @@ static HRESULT request_receive( struct winhttp_request *request ) goto error; } if ((err = wait_for_completion( request ))) goto error; - total_bytes_read += request->bytes_read; request->offset += request->bytes_read; } while (request->bytes_read); @@ -2913,7 +2912,6 @@ static HRESULT request_send( struct winhttp_request *request ) char *ptr = NULL; LONG size = 0; HRESULT hr; - BOOL ret; DWORD err; if ((err = request_set_parameters( request ))) return HRESULT_FROM_WIN32( err ); @@ -2952,7 +2950,7 @@ static HRESULT request_send( struct winhttp_request *request ) } } wait_set_status_callback( request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT ); - if (!(ret = WinHttpSendRequest( request->hrequest, NULL, 0, ptr, size, size, 0 ))) + if (!WinHttpSendRequest( request->hrequest, NULL, 0, ptr, size, size, 0 )) { err = get_last_error(); goto error;

1 0

Dmitry Timoshkov : windowscodecs: Make GetFrame return WINCODEC_ERR_FRAMEMISSING without an image data.
by Alexandre Julliard Nov. 23, 2012

Nov. 23, 2012

Module: wine Branch: master Commit: a8eaeaf511d6deb1fe025b5893fdfbcb0734e095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8eaeaf511d6deb1fe025b589… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 23 15:41:33 2012 +0800 windowscodecs: Make GetFrame return WINCODEC_ERR_FRAMEMISSING without an image data. --- dlls/windowscodecs/bmpdecode.c | 2 +- dlls/windowscodecs/gifformat.c | 2 +- dlls/windowscodecs/icoformat.c | 2 +- dlls/windowscodecs/jpegformat.c | 2 +- dlls/windowscodecs/pngformat.c | 2 +- dlls/windowscodecs/tgaformat.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 1a1ee0a..7b3f82d 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -1124,7 +1124,7 @@ static HRESULT WINAPI BmpDecoder_GetFrame(IWICBitmapDecoder *iface, if (index != 0) return E_INVALIDARG; - if (!This->stream) return WINCODEC_ERR_WRONGSTATE; + if (!This->stream) return WINCODEC_ERR_FRAMEMISSING; *ppIBitmapFrame = &This->IWICBitmapFrameDecode_iface; IWICBitmapDecoder_AddRef(iface); diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index d87a6e7..ce63af9 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1271,7 +1271,7 @@ static HRESULT WINAPI GifDecoder_GetFrame(IWICBitmapDecoder *iface, GifFrameDecode *result; TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); - if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; + if (!This->initialized) return WINCODEC_ERR_FRAMEMISSING; if (index >= This->gif->ImageCount) return E_INVALIDARG; diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index 4e83ec0..6b454c2 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -631,7 +631,7 @@ static HRESULT WINAPI IcoDecoder_GetFrame(IWICBitmapDecoder *iface, if (!This->initialized) { - hr = WINCODEC_ERR_NOTINITIALIZED; + hr = WINCODEC_ERR_FRAMEMISSING; goto fail; } diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 2c77d4f..eab50f0 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -440,7 +440,7 @@ static HRESULT WINAPI JpegDecoder_GetFrame(IWICBitmapDecoder *iface, JpegDecoder *This = impl_from_IWICBitmapDecoder(iface); TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); - if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; + if (!This->initialized) return WINCODEC_ERR_FRAMEMISSING; if (index != 0) return E_INVALIDARG; diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 6d6117e..4c94489 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -650,7 +650,7 @@ static HRESULT WINAPI PngDecoder_GetFrame(IWICBitmapDecoder *iface, PngDecoder *This = impl_from_IWICBitmapDecoder(iface); TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); - if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; + if (!This->initialized) return WINCODEC_ERR_FRAMEMISSING; if (index != 0) return E_INVALIDARG; diff --git a/dlls/windowscodecs/tgaformat.c b/dlls/windowscodecs/tgaformat.c index eac3406..cd615c7 100644 --- a/dlls/windowscodecs/tgaformat.c +++ b/dlls/windowscodecs/tgaformat.c @@ -415,7 +415,7 @@ static HRESULT WINAPI TgaDecoder_GetFrame(IWICBitmapDecoder *iface, TgaDecoder *This = impl_from_IWICBitmapDecoder(iface); TRACE("(%p,%p)\n", iface, ppIBitmapFrame); - if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; + if (!This->initialized) return WINCODEC_ERR_FRAMEMISSING; if (index != 0) return E_INVALIDARG;

1 0

Alexandre Julliard : widl: Print large enum constants in hex.
by Alexandre Julliard Nov. 23, 2012

Nov. 23, 2012

Module: wine Branch: master Commit: 756d33ddae316c71b1241e7c8684c07cd82b9e05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=756d33ddae316c71b1241e7c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 23 17:39:55 2012 +0100 widl: Print large enum constants in hex. --- tools/widl/parser.y | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 616a538..9c2281f 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -620,7 +620,10 @@ enum_list: enum { if (!$1->eval) | enum_list ',' enum { if (!$3->eval) { var_t *last = LIST_ENTRY( list_tail($$), var_t, entry ); - $3->eval = make_exprl(EXPR_NUM, last->eval->cval + 1); + enum expr_type type = EXPR_NUM; + if (last->eval->type == EXPR_HEXNUM) type = EXPR_HEXNUM; + if (last->eval->cval + 1 < 0) type = EXPR_HEXNUM; + $3->eval = make_exprl(type, last->eval->cval + 1); } $$ = append_var( $1, $3 ); }

1 0

Christian Costa : amstream: Initialize correctly AM_MEDIA_TYPE struct.
by Alexandre Julliard Nov. 23, 2012

Nov. 23, 2012

Module: wine Branch: master Commit: 56c0151f6d9b078c79b95ffdf41fa0b9cc0892b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56c0151f6d9b078c79b95ffdf… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Nov 16 16:46:07 2012 +0100 amstream: Initialize correctly AM_MEDIA_TYPE struct. --- dlls/amstream/mediastreamfilter.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 9b2bd8e..3c0777c 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -132,6 +132,9 @@ static HRESULT WINAPI BasePinImp_GetMediaType(BasePin *This, int index, AM_MEDIA MSPID purpose_id; int i; + /* FIXME: Reset structure as we only fill majortype and minortype for now */ + ZeroMemory(amt, sizeof(*amt)); + /* Find which stream is associated with the pin */ for (i = 0; i < filter->nb_streams; i++) if (&This->IPin_iface == filter->pins[i])

1 0

Nikolay Sivov : include: Added error codes enum, cleanup existing enums.
by Alexandre Julliard Nov. 23, 2012

Nov. 23, 2012

Module: wine Branch: master Commit: 9cf630fc9809e96a7ba5a0427ad1b4eafad47c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cf630fc9809e96a7ba5a0427… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 23 10:31:16 2012 -0500 include: Added error codes enum, cleanup existing enums. --- include/xmllite.idl | 156 ++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 123 insertions(+), 33 deletions(-) diff --git a/include/xmllite.idl b/include/xmllite.idl index 9bf406c..c1c0b88 100644 --- a/include/xmllite.idl +++ b/include/xmllite.idl @@ -79,45 +79,135 @@ interface IXmlReader : IUnknown } /* IXmlReader state */ -cpp_quote("typedef enum XmlReadState") -cpp_quote("{") -cpp_quote(" XmlReadState_Initial = 0,") -cpp_quote(" XmlReadState_Interactive = 1,") -cpp_quote(" XmlReadState_Error = 2,") -cpp_quote(" XmlReadState_EndOfFile = 3,") -cpp_quote(" XmlReadState_Closed = 4") -cpp_quote("} XmlReadState;") +typedef enum XmlReadState +{ + XmlReadState_Initial, + XmlReadState_Interactive, + XmlReadState_Error, + XmlReadState_EndOfFile, + XmlReadState_Closed +} XmlReadState; /* conformance levels */ -cpp_quote("typedef enum XmlConformanceLevel") -cpp_quote("{") -cpp_quote(" XmlConformanceLevel_Auto = 0,") -cpp_quote(" XmlConformanceLevel_Fragment = 1,") -cpp_quote(" XmlConformanceLevel_Document = 2,") -cpp_quote(" _XmlConformanceLevel_Last = 2") -cpp_quote("} XmlConformanceLevel;") +typedef enum XmlConformanceLevel +{ + XmlConformanceLevel_Auto, + XmlConformanceLevel_Fragment, + XmlConformanceLevel_Document, + _XmlConformanceLevel_Last = XmlConformanceLevel_Document +} XmlConformanceLevel; /* DTD processing mode */ -cpp_quote("typedef enum DtdProcessing") -cpp_quote("{") -cpp_quote(" DtdProcessing_Prohibit = 0,") -cpp_quote(" DtdProcessing_Parse = DtdProcessing_Prohibit + 1,") -cpp_quote(" _DtdProcessing_Last = DtdProcessing_Parse") -cpp_quote("} DtdProcessing;") +typedef enum DtdProcessing +{ + DtdProcessing_Prohibit, + DtdProcessing_Parse, + _DtdProcessing_Last = DtdProcessing_Parse +} DtdProcessing; /* IXmlReader properties */ -cpp_quote("typedef enum XmlReaderProperty") -cpp_quote("{") -cpp_quote(" XmlReaderProperty_MultiLanguage = 0,") -cpp_quote(" XmlReaderProperty_ConformanceLevel = XmlReaderProperty_MultiLanguage + 1,") -cpp_quote(" XmlReaderProperty_RandomAccess = XmlReaderProperty_ConformanceLevel + 1,") -cpp_quote(" XmlReaderProperty_XmlResolver = XmlReaderProperty_RandomAccess + 1,") -cpp_quote(" XmlReaderProperty_DtdProcessing = XmlReaderProperty_XmlResolver + 1,") -cpp_quote(" XmlReaderProperty_ReadState = XmlReaderProperty_DtdProcessing + 1,") -cpp_quote(" XmlReaderProperty_MaxElementDepth = XmlReaderProperty_ReadState + 1,") -cpp_quote(" XmlReaderProperty_MaxEntityExpansion = XmlReaderProperty_MaxElementDepth + 1,") -cpp_quote(" _XmlReaderProperty_Last = XmlReaderProperty_MaxEntityExpansion") -cpp_quote("} XmlReaderProperty;") +typedef enum XmlReaderProperty +{ + XmlReaderProperty_MultiLanguage, + XmlReaderProperty_ConformanceLevel, + XmlReaderProperty_RandomAccess, + XmlReaderProperty_XmlResolver, + XmlReaderProperty_DtdProcessing, + XmlReaderProperty_ReadState, + XmlReaderProperty_MaxElementDepth, + XmlReaderProperty_MaxEntityExpansion, + _XmlReaderProperty_Last = XmlReaderProperty_MaxEntityExpansion +} XmlReaderProperty; + +/* reader error codes */ +typedef enum XmlError +{ + MX_E_MX = 0xc00cee00, + MX_E_INPUTEND, + MX_E_ENCODING, + MX_E_ENCODINGSWITCH, + MX_E_ENCODINGSIGNATURE, + WC_E_WC = 0xc00cee20, + WC_E_WHITESPACE, + WC_E_SEMICOLON, + WC_E_GREATERTHAN, + WC_E_QUOTE, + WC_E_EQUAL, + WC_E_LESSTHAN, + WC_E_HEXDIGIT, + WC_E_DIGIT, + WC_E_LEFTBRACKET, + WC_E_LEFTPAREN, + WC_E_XMLCHARACTER, + WC_E_NAMECHARACTER, + WC_E_SYNTAX, + WC_E_CDSECT, + WC_E_COMMENT, + WC_E_CONDSECT, + WC_E_DECLATTLIST, + WC_E_DECLDOCTYPE, + WC_E_DECLELEMENT, + WC_E_DECLENTITY, + WC_E_DECLNOTATION, + WC_E_NDATA, + WC_E_PUBLIC, + WC_E_SYSTEM, + WC_E_NAME, + WC_E_ROOTELEMENT, + WC_E_ELEMENTMATCH, + WC_E_UNIQUEATTRIBUTE, + WC_E_TEXTXMLDECL, + WC_E_LEADINGXML, + WC_E_TEXTDECL, + WC_E_XMLDECL, + WC_E_ENCNAME, + WC_E_PUBLICID, + WC_E_PESINTERNALSUBSET, + WC_E_PESBETWEENDECLS, + WC_E_NORECURSION, + WC_E_ENTITYCONTENT, + WC_E_UNDECLAREDENTITY, + WC_E_PARSEDENTITY, + WC_E_NOEXTERNALENTITYREF, + WC_E_PI, + WC_E_SYSTEMID, + WC_E_QUESTIONMARK, + WC_E_CDSECTEND, + WC_E_MOREDATA, + WC_E_DTDPROHIBITED, + WC_E_INVALIDXMLSPACE, + NC_E_NC = 0xc00cee60, + NC_E_QNAMECHARACTER, + NC_E_QNAMECOLON, + NC_E_NAMECOLON, + NC_E_DECLAREDPREFIX, + NC_E_UNDECLAREDPREFIX, + NC_E_EMPTYURI, + NC_E_XMLPREFIXRESERVED, + NC_E_XMLNSPREFIXRESERVED, + NC_E_XMLURIRESERVED, + NC_E_XMLNSURIRESERVED, + SC_E_SC = 0xc00cee80, + SC_E_MAXELEMENTDEPTH, + SC_E_MAXENTITYEXPANSION, + WR_E_WR = 0xc00cef00, + WR_E_NONWHITESPACE, + WR_E_NSPREFIXDECLARED, + WR_E_NSPREFIXWITHEMPTYNSURI, + WR_E_DUPLICATEATTRIBUTE, + WR_E_XMLNSPREFIXDECLARATION, + WR_E_XMLPREFIXDECLARATION, + WR_E_XMLURIDECLARATION, + WR_E_XMLNSURIDECLARATION, + WR_E_NAMESPACEUNDECLARED, + WR_E_INVALIDXMLSPACE, + WR_E_INVALIDACTION, + WR_E_INVALIDSURROGATEPAIR, + XML_E_INVALID_DECIMAL = 0xc00ce01d, + XML_E_INVALID_HEXIDECIMAL, + XML_E_INVALID_UNICODE, + XML_E_INVALIDENCODING = 0xc00ce06e +} XmlError; /* IXmlReader construction */ cpp_quote("STDAPI CreateXmlReader(REFIID riid, void **ppvObject, IMalloc *pMalloc);")

1 0

Jacek Caban : wininet: Don't take INTERNET_BUFFERSW as argument in object' s ReadFileEx entry.
by Alexandre Julliard Nov. 23, 2012

Nov. 23, 2012

Module: wine Branch: master Commit: 52144829d143a52ae868a590bd6ba7a764be1dae URL: http://source.winehq.org/git/wine.git/?a=commit;h=52144829d143a52ae868a590b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 23 15:18:31 2012 +0100 wininet: Don't take INTERNET_BUFFERSW as argument in object's ReadFileEx entry. --- dlls/wininet/ftp.c | 6 +++--- dlls/wininet/http.c | 33 +++++++++++++-------------------- dlls/wininet/internet.c | 10 ++++++++-- dlls/wininet/internet.h | 10 ++++++---- 4 files changed, 30 insertions(+), 29 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 54dd655..4233bb3 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1207,10 +1207,10 @@ static DWORD FTPFILE_ReadFileExA(object_header_t *hdr, INTERNET_BUFFERSA *buffer return FTPFILE_ReadFile(hdr, buffers->lpvBuffer, buffers->dwBufferLength, &buffers->dwBufferLength); } -static DWORD FTPFILE_ReadFileExW(object_header_t *hdr, INTERNET_BUFFERSW *buffers, +static DWORD FTPFILE_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWORD *ret_size, DWORD flags, DWORD_PTR context) { - return FTPFILE_ReadFile(hdr, buffers->lpvBuffer, buffers->dwBufferLength, &buffers->dwBufferLength); + return FTPFILE_ReadFile(hdr, buf, size, ret_size); } static DWORD FTPFILE_WriteFile(object_header_t *hdr, const void *buffer, DWORD size, DWORD *written) @@ -1300,7 +1300,7 @@ static const object_vtbl_t FTPFILEVtbl = { INET_SetOption, FTPFILE_ReadFile, FTPFILE_ReadFileExA, - FTPFILE_ReadFileExW, + FTPFILE_ReadFileEx, FTPFILE_WriteFile, FTPFILE_QueryDataAvailable, NULL diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 39978b2..c4a98e5 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2980,31 +2980,27 @@ done: static void HTTPREQ_AsyncReadFileExWProc(WORKREQUEST *workRequest) { - struct WORKREQ_INTERNETREADFILEEXW const *data = &workRequest->u.InternetReadFileExW; + struct WORKREQ_HTTPREADFILEEX const *data = &workRequest->u.HttpReadFileEx; http_request_t *req = (http_request_t*)workRequest->hdr; DWORD res; TRACE("INTERNETREADFILEEXW %p\n", workRequest->hdr); - res = HTTPREQ_Read(req, data->lpBuffersOut->lpvBuffer, - data->lpBuffersOut->dwBufferLength, &data->lpBuffersOut->dwBufferLength, TRUE); + res = HTTPREQ_Read(req, data->buf, data->size, data->ret_read, TRUE); send_request_complete(req, res == ERROR_SUCCESS, res); } -static DWORD HTTPREQ_ReadFileExW(object_header_t *hdr, INTERNET_BUFFERSW *buffers, +static DWORD HTTPREQ_ReadFileExW(object_header_t *hdr, void *buf, DWORD size, DWORD *ret_read, DWORD flags, DWORD_PTR context) { http_request_t *req = (http_request_t*)hdr; - DWORD res, size, read, error = ERROR_SUCCESS; + DWORD res, read, cread, error = ERROR_SUCCESS; if (flags & ~(IRF_ASYNC|IRF_NO_WAIT)) FIXME("these dwFlags aren't implemented: 0x%x\n", flags & ~(IRF_ASYNC|IRF_NO_WAIT)); - if (buffers->dwStructSize != sizeof(*buffers)) - return ERROR_INVALID_PARAMETER; - INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); if (hdr->dwFlags & INTERNET_FLAG_ASYNC) @@ -3015,9 +3011,7 @@ static DWORD HTTPREQ_ReadFileExW(object_header_t *hdr, INTERNET_BUFFERSW *buffer { if (get_avail_data(req)) { - res = HTTPREQ_Read(req, buffers->lpvBuffer, buffers->dwBufferLength, - &buffers->dwBufferLength, FALSE); - size = buffers->dwBufferLength; + res = HTTPREQ_Read(req, buf, size, &read, FALSE); LeaveCriticalSection( &req->read_section ); goto done; } @@ -3026,7 +3020,9 @@ static DWORD HTTPREQ_ReadFileExW(object_header_t *hdr, INTERNET_BUFFERSW *buffer workRequest.asyncproc = HTTPREQ_AsyncReadFileExWProc; workRequest.hdr = WININET_AddRef(&req->hdr); - workRequest.u.InternetReadFileExW.lpBuffersOut = buffers; + workRequest.u.HttpReadFileEx.buf = buf; + workRequest.u.HttpReadFileEx.size = size; + workRequest.u.HttpReadFileEx.ret_read = ret_read; INTERNET_AsyncCall(&workRequest); @@ -3034,7 +3030,6 @@ static DWORD HTTPREQ_ReadFileExW(object_header_t *hdr, INTERNET_BUFFERSW *buffer } read = 0; - size = buffers->dwBufferLength; EnterCriticalSection( &req->read_section ); if(hdr->dwError == ERROR_SUCCESS) @@ -3043,19 +3038,18 @@ static DWORD HTTPREQ_ReadFileExW(object_header_t *hdr, INTERNET_BUFFERSW *buffer hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR; while(1) { - res = HTTPREQ_Read(req, (char*)buffers->lpvBuffer+read, size-read, - &buffers->dwBufferLength, !(flags & IRF_NO_WAIT)); + res = HTTPREQ_Read(req, (char*)buf+read, size-read, &cread, !(flags & IRF_NO_WAIT)); if(res != ERROR_SUCCESS) break; - read += buffers->dwBufferLength; + read += cread; if(read == size || end_of_read_data(req)) break; LeaveCriticalSection( &req->read_section ); INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, - &buffers->dwBufferLength, sizeof(buffers->dwBufferLength)); + &cread, sizeof(cread)); INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); @@ -3068,13 +3062,12 @@ static DWORD HTTPREQ_ReadFileExW(object_header_t *hdr, INTERNET_BUFFERSW *buffer error = hdr->dwError; LeaveCriticalSection( &req->read_section ); - size = buffers->dwBufferLength; - buffers->dwBufferLength = read; done: + *ret_read = read; if (res == ERROR_SUCCESS) { INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, - &size, sizeof(size)); + &read, sizeof(read)); } return res==ERROR_SUCCESS ? error : res; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 8d610c3..48fe41d 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2269,14 +2269,20 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, TRACE("(%p %p 0x%x 0x%lx)\n", hFile, lpBuffer, dwFlags, dwContext); + if (lpBuffer->dwStructSize != sizeof(*lpBuffer)) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + hdr = get_handle_object(hFile); if (!hdr) { INTERNET_SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if(hdr->vtbl->ReadFileExW) - res = hdr->vtbl->ReadFileExW(hdr, lpBuffer, dwFlags, dwContext); + if(hdr->vtbl->ReadFileEx) + res = hdr->vtbl->ReadFileEx(hdr, lpBuffer->lpvBuffer, lpBuffer->dwBufferLength, &lpBuffer->dwBufferLength, + dwFlags, dwContext); WININET_Release(hdr); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 09db338..4e25a93 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -234,7 +234,7 @@ typedef struct { DWORD (*SetOption)(object_header_t*,DWORD,void*,DWORD); DWORD (*ReadFile)(object_header_t*,void*,DWORD,DWORD*); DWORD (*ReadFileExA)(object_header_t*,INTERNET_BUFFERSA*,DWORD,DWORD_PTR); - DWORD (*ReadFileExW)(object_header_t*,INTERNET_BUFFERSW*,DWORD,DWORD_PTR); + DWORD (*ReadFileEx)(object_header_t*,void*,DWORD,DWORD*,DWORD,DWORD_PTR); DWORD (*WriteFile)(object_header_t*,const void*,DWORD,DWORD*); DWORD (*QueryDataAvailable)(object_header_t*,DWORD*,DWORD,DWORD_PTR); DWORD (*FindNextFileW)(object_header_t*,void*); @@ -467,9 +467,11 @@ struct WORKREQ_INTERNETREADFILEEXA LPINTERNET_BUFFERSA lpBuffersOut; }; -struct WORKREQ_INTERNETREADFILEEXW +struct WORKREQ_HTTPREADFILEEX { - LPINTERNET_BUFFERSW lpBuffersOut; + void *buf; + DWORD size; + DWORD *ret_read; }; typedef struct WORKREQ @@ -494,7 +496,7 @@ typedef struct WORKREQ struct WORKREQ_SENDCALLBACK SendCallback; struct WORKREQ_INTERNETOPENURLW InternetOpenUrlW; struct WORKREQ_INTERNETREADFILEEXA InternetReadFileExA; - struct WORKREQ_INTERNETREADFILEEXW InternetReadFileExW; + struct WORKREQ_HTTPREADFILEEX HttpReadFileEx; } u; } WORKREQUEST, *LPWORKREQUEST;

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXFILE.
by Alexandre Julliard Nov. 23, 2012

Nov. 23, 2012

Module: wine Branch: master Commit: 7ecfb2e52dcdc3f54bfbf34b49735f689ffcfc1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ecfb2e52dcdc3f54bfbf34b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 21:13:35 2012 +0100 d3dx9: Avoid LPD3DXFILE. --- include/d3dx9anim.h | 2 +- include/d3dx9xof.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index c8378e2..975f1df 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -198,7 +198,7 @@ DECLARE_INTERFACE(ID3DXSaveUserData) ID3DXFileSaveObject *save_obj, ID3DXFileSaveData *mesh_data) PURE; STDMETHOD(AddTopLevelDataObjectsPre)(ID3DXFileSaveObject *save_obj) PURE; STDMETHOD(AddTopLevelDataObjectsPost)(ID3DXFileSaveObject *save_obj) PURE; - STDMETHOD(RegisterTemplates)(LPD3DXFILE xfile) PURE; + STDMETHOD(RegisterTemplates)(ID3DXFile *file) PURE; STDMETHOD(SaveTemplates)(ID3DXFileSaveObject *save_obj) PURE; }; #undef INTERFACE diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h index 593fca5..4bcb769 100644 --- a/include/d3dx9xof.h +++ b/include/d3dx9xof.h @@ -66,7 +66,7 @@ typedef interface ID3DXFileSaveData *LPD3DXFILESAVEDATA, **LPLPD3DXFILESAVEDATA; typedef interface ID3DXFileEnumObject *LPD3DXFILEENUMOBJECT, **LPLPD3DXFILEENUMOBJECT; typedef interface ID3DXFileData *LPD3DXFILEDATA, **LPLPD3DXFILEDATA; -STDAPI D3DXFileCreate(LPD3DXFILE*); +STDAPI D3DXFileCreate(struct ID3DXFile **file); #define INTERFACE ID3DXFile DECLARE_INTERFACE_IID_(ID3DXFile,IUnknown,"cef08cf9-7b4f-4429-9624-2a690a933201") @@ -93,7 +93,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileSaveObject,IUnknown,"cef08cfa-7b4f-4429-9624-2a6 STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** ID3DXFileSaveObject methods ***/ - STDMETHOD(GetFile)(THIS_ LPD3DXFILE*) PURE; + STDMETHOD(GetFile)(THIS_ ID3DXFile **file) PURE; STDMETHOD(AddDataObject)(THIS_ REFGUID template_guid, const char *name, const GUID *guid, SIZE_T data_size, const void *data, struct ID3DXFileSaveData **obj) PURE; STDMETHOD(Save)(THIS) PURE; @@ -127,7 +127,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileEnumObject,IUnknown,"cef08cfc-7b4f-4429-9624-2a6 STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** ID3DXFileEnumObject methods ***/ - STDMETHOD(GetFile)(THIS_ LPD3DXFILE*) PURE; + STDMETHOD(GetFile)(THIS_ ID3DXFile **file) PURE; STDMETHOD(GetChildren)(THIS_ SIZE_T*) PURE; STDMETHOD(GetChild)(THIS_ SIZE_T id, struct ID3DXFileData **child) PURE; STDMETHOD(GetDataObjectById)(THIS_ REFGUID guid, struct ID3DXFileData **obj) PURE;

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXCONSTANTTABLE.
by Alexandre Julliard Nov. 23, 2012

Nov. 23, 2012

Module: wine Branch: master Commit: 63acbcbf8a4ba7dd98cfed92b8ad96924d5fe062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63acbcbf8a4ba7dd98cfed92b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 21:13:36 2012 +0100 d3dx9: Avoid LPD3DXCONSTANTTABLE. --- dlls/d3dx9_36/effect.c | 3 +- dlls/d3dx9_36/shader.c | 70 ++++++++++------------------------------- dlls/d3dx9_36/tests/shader.c | 2 +- include/d3dx9effect.h | 4 +- include/d3dx9shader.h | 72 ++++++++++------------------------------- 5 files changed, 40 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63acbcbf8a4ba7dd98cfe…

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_SOSetTargets().
by Alexandre Julliard Nov. 23, 2012

Nov. 23, 2012

Module: wine Branch: master Commit: 5b781d709d40aa3b706a072807b1e4a903f96442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b781d709d40aa3b706a07280… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 21:13:37 2012 +0100 d3d10core: Implement d3d10_device_SOSetTargets(). --- dlls/d3d10core/device.c | 19 +++++++++++++++++- dlls/wined3d/device.c | 41 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 8 +++++++ include/wine/wined3d.h | 2 + 5 files changed, 70 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 78c9d1b..3b09a04 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -347,7 +347,24 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetDepthStencilState(ID3D10Device * static void STDMETHODCALLTYPE d3d10_device_SOSetTargets(ID3D10Device *iface, UINT target_count, ID3D10Buffer *const *targets, const UINT *offsets) { - FIXME("iface %p, target_count %u, targets %p, offsets %p stub!\n", iface, target_count, targets, offsets); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int count, i; + + TRACE("iface %p, target_count %u, targets %p, offsets %p.\n", iface, target_count, targets, offsets); + + count = min(target_count, 4); + for (i = 0; i < count; ++i) + { + struct d3d10_buffer *buffer = unsafe_impl_from_ID3D10Buffer(targets[i]); + + wined3d_device_set_stream_output(device->wined3d_device, i, + buffer ? buffer->wined3d_buffer : NULL, offsets[i]); + } + + for (i = count; i < 4; ++i) + { + wined3d_device_set_stream_output(device->wined3d_device, i, NULL, 0); + } } static void STDMETHODCALLTYPE d3d10_device_DrawAuto(ID3D10Device *iface) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3211038..b0e7ac2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1559,6 +1559,47 @@ UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device return device->adapter->TextureRam - device->adapter->UsedTextureRam; } +void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, + struct wined3d_buffer *buffer, UINT offset) +{ + struct wined3d_buffer *prev_buffer; + + TRACE("device %p, idx %u, buffer %p, offset %u.\n", device, idx, buffer, offset); + + if (idx >= MAX_STREAM_OUT) + { + WARN("Invalid stream output %u.\n", idx); + return; + } + + prev_buffer = device->updateStateBlock->state.stream_output[idx].buffer; + device->updateStateBlock->state.stream_output[idx].buffer = buffer; + device->updateStateBlock->state.stream_output[idx].offset = offset; + + if (device->isRecordingState) + { + if (buffer) + wined3d_buffer_incref(buffer); + if (prev_buffer) + wined3d_buffer_decref(buffer); + return; + } + + if (prev_buffer != buffer) + { + if (buffer) + { + InterlockedIncrement(&buffer->resource.bind_count); + wined3d_buffer_incref(buffer); + } + if (prev_buffer) + { + InterlockedDecrement(&prev_buffer->resource.bind_count); + wined3d_buffer_decref(prev_buffer); + } + } +} + HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index cb8304a..56e73e9 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -129,6 +129,7 @@ @ cdecl wined3d_device_set_sampler_state(ptr long long long) @ cdecl wined3d_device_set_scissor_rect(ptr ptr) @ cdecl wined3d_device_set_software_vertex_processing(ptr long) +@ cdecl wined3d_device_set_stream_output(ptr long ptr long) @ cdecl wined3d_device_set_stream_source(ptr long ptr long long) @ cdecl wined3d_device_set_stream_source_freq(ptr long long) @ cdecl wined3d_device_set_texture(ptr long ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ec7c3bf..ea3010f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -154,6 +154,7 @@ void wined3d_rb_free(void *ptr) DECLSPEC_HIDDEN; /* Device caps */ #define MAX_PALETTES 65536 +#define MAX_STREAM_OUT 4 #define MAX_STREAMS 16 #define MAX_TEXTURES 8 #define MAX_FRAGMENT_SAMPLERS 16 @@ -2273,6 +2274,12 @@ struct StageState { DWORD state; }; +struct wined3d_stream_output +{ + struct wined3d_buffer *buffer; + UINT offset; +}; + struct wined3d_stream_state { struct wined3d_buffer *buffer; @@ -2287,6 +2294,7 @@ struct wined3d_state const struct wined3d_fb_state *fb; struct wined3d_vertex_declaration *vertex_declaration; + struct wined3d_stream_output stream_output[MAX_STREAM_OUT]; struct wined3d_stream_state streams[MAX_STREAMS + 1 /* tesselated pseudo-stream */]; BOOL user_stream; struct wined3d_buffer *index_buffer; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index cf86df6..76e44f1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2226,6 +2226,8 @@ void __cdecl wined3d_device_set_sampler_state(struct wined3d_device *device, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value); void __cdecl wined3d_device_set_scissor_rect(struct wined3d_device *device, const RECT *rect); void __cdecl wined3d_device_set_software_vertex_processing(struct wined3d_device *device, BOOL software); +void __cdecl wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, + struct wined3d_buffer *buffer, UINT offset); HRESULT __cdecl wined3d_device_set_stream_source(struct wined3d_device *device, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride); HRESULT __cdecl wined3d_device_set_stream_source_freq(struct wined3d_device *device, UINT stream_idx, UINT divider);

1 0