wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

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

23 Nov '12

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

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

23 Nov '12

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

Alexandre Julliard : widl: Print large enum constants in hex.
by Alexandre Julliard 23 Nov '12

23 Nov '12

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 : cabinet: Simplify concatenation of path and filename.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: db497bdc44f7ab1da6e2b996e33df57478fb8bc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db497bdc44f7ab1da6e2b996e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Nov 22 10:08:00 2012 +0100 cabinet: Simplify concatenation of path and filename. --- dlls/cabinet/fdi.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 2680e72..d36178d 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2479,7 +2479,6 @@ BOOL __cdecl FDICopy( FDICABINETINFO fdici; FDINOTIFICATION fdin; INT_PTR cabhf, filehf = 0; - int idx; unsigned int i; char fullpath[MAX_PATH]; size_t pathlen, filenamelen; @@ -2503,8 +2502,8 @@ BOOL __cdecl FDICopy( } ZeroMemory(decomp_state, sizeof(fdi_decomp_state)); - pathlen = (pszCabPath) ? strlen(pszCabPath) : 0; - filenamelen = (pszCabinet) ? strlen(pszCabinet) : 0; + pathlen = pszCabPath ? strlen(pszCabPath) : 0; + filenamelen = pszCabinet ? strlen(pszCabinet) : 0; /* slight overestimation here to save CPU cycles in the developer's brain */ if ((pathlen + filenamelen + 3) > MAX_PATH) { @@ -2515,12 +2514,11 @@ BOOL __cdecl FDICopy( } /* paste the path and filename together */ - idx = 0; - if (pathlen) { - for (i = 0; i < pathlen; i++) fullpath[idx++] = pszCabPath[i]; - } - if (filenamelen) for (i = 0; i < filenamelen; i++) fullpath[idx++] = pszCabinet[i]; - fullpath[idx] = '\0'; + fullpath[0] = '\0'; + if (pathlen) + strcpy(fullpath, pszCabPath); + if (filenamelen) + strcat(fullpath, pszCabinet); TRACE("full cab path/file name: %s\n", debugstr_a(fullpath)); @@ -2540,7 +2538,7 @@ BOOL __cdecl FDICopy( fdi->close(cabhf); return FALSE; } - + /* cabinet notification */ ZeroMemory(&fdin, sizeof(FDINOTIFICATION)); fdin.setID = fdici.setID;

1 0

Christian Costa : amstream: Initialize correctly AM_MEDIA_TYPE struct.
by Alexandre Julliard 23 Nov '12

23 Nov '12

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

Christian Costa : strmbase: Simplify IEnumMediaTypesImpl_QueryInterface and turn FIXME into WARN.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 3070dcee3b05e3124eae522fa210ec728b6bac21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3070dcee3b05e3124eae522fa… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Nov 23 09:47:05 2012 +0100 strmbase: Simplify IEnumMediaTypesImpl_QueryInterface and turn FIXME into WARN. --- dlls/strmbase/mediatype.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index a168755..d100cc9 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -145,24 +145,21 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e return S_OK; } -static HRESULT WINAPI IEnumMediaTypesImpl_QueryInterface(IEnumMediaTypes * iface, REFIID riid, LPVOID * ppv) +static HRESULT WINAPI IEnumMediaTypesImpl_QueryInterface(IEnumMediaTypes * iface, REFIID riid, void ** ret_iface) { - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ret_iface); - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IEnumMediaTypes)) - *ppv = iface; - - if (*ppv) + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IEnumMediaTypes)) { - IUnknown_AddRef((IUnknown *)(*ppv)); + IEnumMediaTypes_AddRef(iface); + *ret_iface = iface; return S_OK; } - FIXME("No interface for %s!\n", debugstr_guid(riid)); + *ret_iface = NULL; + + WARN("No interface for %s\n", debugstr_guid(riid)); return E_NOINTERFACE; }

1 0

Christian Costa : strmbase: Display iface in TRACEs.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 9bde31b3eeec1d42fcc0c5d73ae6dbad883d644a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bde31b3eeec1d42fcc0c5d73… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Nov 23 09:46:58 2012 +0100 strmbase: Display iface in TRACEs. --- dlls/strmbase/mediatype.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index 82c7d23..a168755 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -147,7 +147,7 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e static HRESULT WINAPI IEnumMediaTypesImpl_QueryInterface(IEnumMediaTypes * iface, REFIID riid, LPVOID * ppv) { - TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); *ppv = NULL; @@ -201,12 +201,13 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes * iface, ULONG cM ULONG cFetched; IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); + TRACE("(%p)->(%u, %p, %p)\n", iface, cMediaTypes, ppMediaTypes, pcFetched); + cFetched = min(This->enumMediaDetails.cMediaTypes, This->uIndex + cMediaTypes) - This->uIndex; if (This->currentVersion != This->mediaVersionFunction(This->basePin)) return VFW_E_ENUM_OUT_OF_SYNC; - TRACE("(%u, %p, %p)\n", cMediaTypes, ppMediaTypes, pcFetched); TRACE("Next uIndex: %u, cFetched: %u\n", This->uIndex, cFetched); if (cFetched > 0) @@ -236,7 +237,8 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Skip(IEnumMediaTypes * iface, ULONG cM { IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); - TRACE("(%u)\n", cMediaTypes); + TRACE("(%p)->(%u)\n", iface, cMediaTypes); + if (This->currentVersion != This->mediaVersionFunction(This->basePin)) return VFW_E_ENUM_OUT_OF_SYNC; @@ -254,7 +256,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Reset(IEnumMediaTypes * iface) AM_MEDIA_TYPE amt; IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); - TRACE("()\n"); + TRACE("(%p)->()\n", iface); for (i = 0; i < This->enumMediaDetails.cMediaTypes; i++) FreeMediaType(&This->enumMediaDetails.pMediaTypes[i]); @@ -288,7 +290,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Clone(IEnumMediaTypes * iface, IEnumMe HRESULT hr; IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); - TRACE("(%p)\n", ppEnum); + TRACE("(%p)->(%p)\n", iface, ppEnum); hr = EnumMediaTypes_Construct(This->basePin, This->enumMediaFunction, This->mediaVersionFunction, ppEnum); if (FAILED(hr))

1 0

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

23 Nov '12

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 : cryptdll: Remove unused variable.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 6b43027c7e9cb6a5d1bb3a7f675d1d7400f68347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b43027c7e9cb6a5d1bb3a7f6… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 22 21:01:54 2012 +0000 cryptdll: Remove unused variable. --- dlls/cryptdll/cryptdll.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/cryptdll/cryptdll.c b/dlls/cryptdll/cryptdll.c index 72fcf68..c30046f 100644 --- a/dlls/cryptdll/cryptdll.c +++ b/dlls/cryptdll/cryptdll.c @@ -25,8 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cryptdll); -static HMODULE CRYPTDLL_hModule; - BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); @@ -37,7 +35,6 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: { DisableThreadLibraryCalls(hinstDLL); - CRYPTDLL_hModule = hinstDLL; break; } case DLL_PROCESS_DETACH:

1 0

Andrew Talbot : dnsapi: Remove unused variable.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 5ca89eaf6ca51f8fabbed838ecdbfe71a695c40a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ca89eaf6ca51f8fabbed838e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 22 21:01:58 2012 +0000 dnsapi: Remove unused variable. --- dlls/dnsapi/main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index 1889552..f157230 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -30,8 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); -static HINSTANCE hdnsapi; - BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { TRACE( "(%p, %d, %p)\n", hinst, reason, reserved ); @@ -41,7 +39,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: - hdnsapi = hinst; DisableThreadLibraryCalls( hinst ); break; case DLL_PROCESS_DETACH:

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
71
Older →

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 November 2012