November 2012 - Wine-commits

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

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

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

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

Jacek Caban : wininet: Use generic ReadFileEx entry in InternetReadFileExA and get rid of ReadFileExA entry .
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 5554292284db0bb5e7815a5c0419983689547984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5554292284db0bb5e7815a5c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 23 15:18:52 2012 +0100 wininet: Use generic ReadFileEx entry in InternetReadFileExA and get rid of ReadFileExA entry. --- dlls/wininet/ftp.c | 8 ---- dlls/wininet/http.c | 106 +---------------------------------------------- dlls/wininet/internet.c | 11 ++++- dlls/wininet/internet.h | 7 --- 4 files changed, 10 insertions(+), 122 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 4233bb3..f816898 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1201,12 +1201,6 @@ static DWORD FTPFILE_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW return error; } -static DWORD FTPFILE_ReadFileExA(object_header_t *hdr, INTERNET_BUFFERSA *buffers, - DWORD flags, DWORD_PTR context) -{ - return FTPFILE_ReadFile(hdr, buffers->lpvBuffer, buffers->dwBufferLength, &buffers->dwBufferLength); -} - static DWORD FTPFILE_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWORD *ret_size, DWORD flags, DWORD_PTR context) { @@ -1299,7 +1293,6 @@ static const object_vtbl_t FTPFILEVtbl = { FTPFILE_QueryOption, INET_SetOption, FTPFILE_ReadFile, - FTPFILE_ReadFileExA, FTPFILE_ReadFileEx, FTPFILE_WriteFile, FTPFILE_QueryDataAvailable, @@ -3479,7 +3472,6 @@ static const object_vtbl_t FTPFINDNEXTVtbl = { NULL, NULL, NULL, - NULL, FTPFINDNEXT_FindNextFileW }; diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c4a98e5..383b907 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2877,107 +2877,6 @@ static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW return res; } -static void HTTPREQ_AsyncReadFileExAProc(WORKREQUEST *workRequest) -{ - struct WORKREQ_INTERNETREADFILEEXA const *data = &workRequest->u.InternetReadFileExA; - http_request_t *req = (http_request_t*)workRequest->hdr; - DWORD res; - - TRACE("INTERNETREADFILEEXA %p\n", workRequest->hdr); - - res = HTTPREQ_Read(req, data->lpBuffersOut->lpvBuffer, - data->lpBuffersOut->dwBufferLength, &data->lpBuffersOut->dwBufferLength, TRUE); - - send_request_complete(req, res == ERROR_SUCCESS, res); -} - -static DWORD HTTPREQ_ReadFileExA(object_header_t *hdr, INTERNET_BUFFERSA *buffers, - DWORD flags, DWORD_PTR context) -{ - http_request_t *req = (http_request_t*)hdr; - DWORD res, size, read, 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) - { - WORKREQUEST workRequest; - - if (TryEnterCriticalSection( &req->read_section )) - { - if (get_avail_data(req)) - { - res = HTTPREQ_Read(req, buffers->lpvBuffer, buffers->dwBufferLength, - &buffers->dwBufferLength, FALSE); - size = buffers->dwBufferLength; - LeaveCriticalSection( &req->read_section ); - goto done; - } - LeaveCriticalSection( &req->read_section ); - } - - workRequest.asyncproc = HTTPREQ_AsyncReadFileExAProc; - workRequest.hdr = WININET_AddRef(&req->hdr); - workRequest.u.InternetReadFileExA.lpBuffersOut = buffers; - - INTERNET_AsyncCall(&workRequest); - - return ERROR_IO_PENDING; - } - - read = 0; - size = buffers->dwBufferLength; - - EnterCriticalSection( &req->read_section ); - if(hdr->dwError == ERROR_SUCCESS) - hdr->dwError = INTERNET_HANDLE_IN_USE; - else if(hdr->dwError == INTERNET_HANDLE_IN_USE) - hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR; - - while(1) { - res = HTTPREQ_Read(req, (char*)buffers->lpvBuffer+read, size-read, - &buffers->dwBufferLength, !(flags & IRF_NO_WAIT)); - if(res != ERROR_SUCCESS) - break; - - read += buffers->dwBufferLength; - 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)); - INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, - INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); - - EnterCriticalSection( &req->read_section ); - } - - if(hdr->dwError == INTERNET_HANDLE_IN_USE) - hdr->dwError = ERROR_SUCCESS; - else - error = hdr->dwError; - - LeaveCriticalSection( &req->read_section ); - size = buffers->dwBufferLength; - buffers->dwBufferLength = read; - -done: - if (res == ERROR_SUCCESS) { - INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, - &size, sizeof(size)); - } - - return res==ERROR_SUCCESS ? error : res; -} - static void HTTPREQ_AsyncReadFileExWProc(WORKREQUEST *workRequest) { struct WORKREQ_HTTPREADFILEEX const *data = &workRequest->u.HttpReadFileEx; @@ -2991,7 +2890,7 @@ static void HTTPREQ_AsyncReadFileExWProc(WORKREQUEST *workRequest) send_request_complete(req, res == ERROR_SUCCESS, res); } -static DWORD HTTPREQ_ReadFileExW(object_header_t *hdr, void *buf, DWORD size, DWORD *ret_read, +static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWORD *ret_read, DWORD flags, DWORD_PTR context) { @@ -3144,8 +3043,7 @@ static const object_vtbl_t HTTPREQVtbl = { HTTPREQ_QueryOption, HTTPREQ_SetOption, HTTPREQ_ReadFile, - HTTPREQ_ReadFileExA, - HTTPREQ_ReadFileExW, + HTTPREQ_ReadFileEx, HTTPREQ_WriteFile, HTTPREQ_QueryDataAvailable, NULL diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 48fe41d..88fe037 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -927,7 +927,6 @@ static const object_vtbl_t APPINFOVtbl = { NULL, NULL, NULL, - NULL, NULL }; @@ -2237,14 +2236,20 @@ BOOL WINAPI InternetReadFileExA(HINTERNET hFile, LPINTERNET_BUFFERSA lpBuffersOu TRACE("(%p %p 0x%x 0x%lx)\n", hFile, lpBuffersOut, dwFlags, dwContext); + if (lpBuffersOut->dwStructSize != sizeof(*lpBuffersOut)) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + hdr = get_handle_object(hFile); if (!hdr) { INTERNET_SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if(hdr->vtbl->ReadFileExA) - res = hdr->vtbl->ReadFileExA(hdr, lpBuffersOut, dwFlags, dwContext); + if(hdr->vtbl->ReadFileEx) + res = hdr->vtbl->ReadFileEx(hdr, lpBuffersOut->lpvBuffer, lpBuffersOut->dwBufferLength, + &lpBuffersOut->dwBufferLength, dwFlags, dwContext); WININET_Release(hdr); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 4e25a93..10002d4 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -233,7 +233,6 @@ typedef struct { DWORD (*QueryOption)(object_header_t*,DWORD,void*,DWORD*,BOOL); 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 (*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); @@ -462,11 +461,6 @@ struct WORKREQ_INTERNETOPENURLW DWORD_PTR dwContext; }; -struct WORKREQ_INTERNETREADFILEEXA -{ - LPINTERNET_BUFFERSA lpBuffersOut; -}; - struct WORKREQ_HTTPREADFILEEX { void *buf; @@ -495,7 +489,6 @@ typedef struct WORKREQ struct WORKREQ_HTTPENDREQUESTW HttpEndRequestW; struct WORKREQ_SENDCALLBACK SendCallback; struct WORKREQ_INTERNETOPENURLW InternetOpenUrlW; - struct WORKREQ_INTERNETREADFILEEXA InternetReadFileExA; struct WORKREQ_HTTPREADFILEEX HttpReadFileEx; } u;

1 0

Dmitry Timoshkov : windowscodecs: Add a test to show that QueryCapability initializes the decoder.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 37892c2f282794377a6b04386a42d42957908464 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37892c2f282794377a6b04386… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 23 15:40:37 2012 +0800 windowscodecs: Add a test to show that QueryCapability initializes the decoder. --- dlls/windowscodecs/tests/tiffformat.c | 12 ++++++++++++ dlls/windowscodecs/tiffformat.c | 2 +- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index d8cb10a..f32f6a5 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -185,6 +185,7 @@ static void test_QueryCapability(void) HRESULT hr; IStream *stream; IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; static const DWORD exp_caps = WICBitmapDecoderCapabilityCanDecodeAllImages | WICBitmapDecoderCapabilityCanDecodeSomeImages | WICBitmapDecoderCapabilityCanEnumerateMetadata; @@ -206,6 +207,9 @@ static void test_QueryCapability(void) ok(hr == S_OK || broken(hr == E_POINTER) /* XP */, "GetFrameCount error %#x\n", hr); ok(frame_count == 0, "expected 0, got %u\n", frame_count); + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == WINCODEC_ERR_FRAMEMISSING || broken(hr == E_POINTER) /* XP */, "expected WINCODEC_ERR_FRAMEMISSING, got %#x\n", hr); + pos.QuadPart = 4; hr = IStream_Seek(stream, pos, SEEK_SET, NULL); ok(hr == S_OK, "IStream_Seek error %#x\n", hr); @@ -221,6 +225,10 @@ static void test_QueryCapability(void) ok(hr == S_OK, "GetFrameCount error %#x\n", hr); ok(frame_count == 1, "expected 1, got %u\n", frame_count); + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + IWICBitmapFrameDecode_Release(frame); + pos.QuadPart = 0; hr = IStream_Seek(stream, pos, SEEK_CUR, &cur_pos); ok(hr == S_OK, "IStream_Seek error %#x\n", hr); @@ -251,6 +259,10 @@ todo_wine ok(hr == S_OK, "GetFrameCount error %#x\n", hr); ok(frame_count == 1, "expected 1, got %u\n", frame_count); + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + IWICBitmapFrameDecode_Release(frame); + hr = IWICBitmapDecoder_Initialize(decoder, stream, WICDecodeMetadataCacheOnDemand); ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index bacc9c5..6c29bab 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -702,7 +702,7 @@ static HRESULT WINAPI TiffDecoder_GetFrame(IWICBitmapDecoder *iface, TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); if (!This->tiff) - return WINCODEC_ERR_WRONGSTATE; + return WINCODEC_ERR_FRAMEMISSING; EnterCriticalSection(&This->lock); res = pTIFFSetDirectory(This->tiff, index);

1 0

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

23 Nov '12

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

Francois Gouget : msvcp60: Make some codecvt_xxx() functions static or remove them.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: ebd28d5034c2a19d3ae7cd380a71e8a01c05095e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebd28d5034c2a19d3ae7cd380… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 22 18:38:39 2012 +0100 msvcp60: Make some codecvt_xxx() functions static or remove them. --- dlls/msvcp60/locale.c | 22 +--------------------- dlls/msvcp60/msvcp.h | 3 --- 2 files changed, 1 insertions(+), 24 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 1ad21ae..80920c0 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -2551,15 +2551,6 @@ int __thiscall codecvt_char_do_unshift(const codecvt_char *this, return CODECVT_noconv; } -/* ?unshift@?$codecvt(a)DDH@std@@QBEHAAHPAD1AAPAD(a)Z */ -/* ?unshift@?$codecvt(a)DDH@std@@QEBAHAEAHPEAD1AEAPEAD(a)Z */ -int codecvt_char_unshift(const codecvt_char *this, - int *state, char *to, char *to_end, char **to_next) -{ - TRACE("(%p %p %p %p %p)\n", this, state, to, to_end, to_next); - return call_codecvt_char_do_unshift(this, state, to, to_end, to_next); -} - /* ?do_length@?$codecvt(a)DDH@std@@MBEHABHPBD1I(a)Z */ /* ?do_length@?$codecvt(a)DDH@std@@MEBAHAEBHPEBD1_K(a)Z */ #define call_codecvt_char_do_length(this, state, from, from_end, max) CALL_VTBL_FUNC(this, 28, \ @@ -2696,7 +2687,7 @@ static MSVCP_size_t codecvt_wchar__Getcat(const locale_facet **facet, const loca return LC_CTYPE; } -codecvt_wchar* codecvt_wchar_use_facet(const locale *loc) +static codecvt_wchar* codecvt_wchar_use_facet(const locale *loc) { static codecvt_wchar *obj = NULL; @@ -2926,17 +2917,6 @@ int __thiscall codecvt_wchar_do_unshift(const codecvt_wchar *this, return CODECVT_ok; } -/* ?unshift@?$codecvt(a)GDH@std@@QBEHAAHPAD1AAPAD(a)Z */ -/* ?unshift@?$codecvt(a)GDH@std@@QEBAHAEAHPEAD1AEAPEAD(a)Z */ -/* ?unshift@?$codecvt(a)_WDH@std@@QBEHAAHPAD1AAPAD(a)Z */ -/* ?unshift@?$codecvt(a)_WDH@std@@QEBAHAEAHPEAD1AEAPEAD(a)Z */ -int codecvt_wchar_unshift(const codecvt_wchar *this, - int *state, char *to, char *to_end, char **to_next) -{ - TRACE("(%p %p %p %p %p)\n", this, state, to, to_end, to_next); - return call_codecvt_wchar_do_unshift(this, state, to, to_end, to_next); -} - /* ?do_length@?$codecvt(a)GDH@std@@MBEHABHPBD1I(a)Z */ /* ?do_length@?$codecvt(a)GDH@std@@MEBAHAEBHPEBD1_K(a)Z */ /* ?do_length@?$codecvt(a)_WDH@std@@MBEHABHPBD1I(a)Z */ diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index da23e31..cc0e688 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -107,7 +107,6 @@ typedef struct { } codecvt_char; MSVCP_bool __thiscall codecvt_base_always_noconv(const codecvt_base*); -int codecvt_char_unshift(const codecvt_char*, int*, char*, char*, char**); int __thiscall codecvt_char_out(const codecvt_char*, int*, const char*, const char*, const char**, char*, char*, char**); int __thiscall codecvt_char_in(const codecvt_char*, int*, const char*, @@ -125,7 +124,6 @@ typedef struct { _Cvtvec cvt; } codecvt_wchar; -int codecvt_wchar_unshift(const codecvt_wchar*, int*, char*, char*, char**); int __thiscall codecvt_wchar_out(const codecvt_wchar*, int*, const wchar_t*, const wchar_t*, const wchar_t**, char*, char*, char**); int __thiscall codecvt_wchar_in(const codecvt_wchar*, int*, const char*, @@ -171,7 +169,6 @@ void __thiscall locale_dtor(locale*); void free_locale(void); locale* __thiscall locale__Addfac(locale*, locale_facet*, MSVCP_size_t, MSVCP_size_t); codecvt_char* codecvt_char_use_facet(const locale*); -codecvt_wchar* codecvt_wchar_use_facet(const locale*); codecvt_wchar* codecvt_short_use_facet(const locale*); ctype_char* ctype_char_use_facet(const locale*); ctype_wchar* ctype_wchar_use_facet(const locale*);

1 0

Francois Gouget : winegstreamer: Make the GST_QualityControl methods static .
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 86c3f683031ca077c1b0a7a03846d644966e9e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86c3f683031ca077c1b0a7a03… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 22 18:38:51 2012 +0100 winegstreamer: Make the GST_QualityControl methods static. --- dlls/winegstreamer/gstdemux.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index dd160eb..41158ff 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1400,19 +1400,19 @@ static inline GSTOutPin *impl_from_IQualityControl( IQualityControl *iface ) return (GSTOutPin*)CONTAINING_RECORD(iface, GSTOutPin, IQualityControl_iface); } -HRESULT WINAPI GST_QualityControl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) +static HRESULT WINAPI GST_QualityControl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) { GSTOutPin *pin = impl_from_IQualityControl(iface); return IPin_QueryInterface((IPin*)pin, riid, ppv); } -ULONG WINAPI GST_QualityControl_AddRef(IQualityControl *iface) +static ULONG WINAPI GST_QualityControl_AddRef(IQualityControl *iface) { GSTOutPin *pin = impl_from_IQualityControl(iface); return IPin_AddRef((IPin*)pin); } -ULONG WINAPI GST_QualityControl_Release(IQualityControl *iface) +static ULONG WINAPI GST_QualityControl_Release(IQualityControl *iface) { GSTOutPin *pin = impl_from_IQualityControl(iface); return IPin_Release((IPin*)pin); @@ -1427,7 +1427,7 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil return S_OK; } -HRESULT WINAPI GST_QualityControl_SetSink(IQualityControl *iface, IQualityControl *tonotify) +static HRESULT WINAPI GST_QualityControl_SetSink(IQualityControl *iface, IQualityControl *tonotify) { /* Do nothing */ return S_OK;

1 0

Francois Gouget : server: Print the usage to stdout when invoked with --help.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: e32647094977deac99976337c94a2a8a82525c73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e32647094977deac99976337c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 22 18:39:45 2012 +0100 server: Print the usage to stdout when invoked with --help. --- server/main.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/server/main.c b/server/main.c index 2d841e8..7aed338 100644 --- a/server/main.c +++ b/server/main.c @@ -46,18 +46,18 @@ const char *server_argv0; /* parse-line args */ -static void usage(void) +static void usage( FILE *fh ) { - fprintf(stderr, "Usage: %s [options]\n\n", server_argv0); - fprintf(stderr, "Options:\n"); - fprintf(stderr, " -d[n], --debug[=n] set debug level to n or +1 if n not specified\n"); - fprintf(stderr, " -f, --foreground remain in the foreground for debugging\n"); - fprintf(stderr, " -h, --help display this help message\n"); - fprintf(stderr, " -k[n], --kill[=n] kill the current wineserver, optionally with signal n\n"); - fprintf(stderr, " -p[n], --persistent[=n] make server persistent, optionally for n seconds\n"); - fprintf(stderr, " -v, --version display version information and exit\n"); - fprintf(stderr, " -w, --wait wait until the current wineserver terminates\n"); - fprintf(stderr, "\n"); + fprintf(fh, "Usage: %s [options]\n\n", server_argv0); + fprintf(fh, "Options:\n"); + fprintf(fh, " -d[n], --debug[=n] set debug level to n or +1 if n not specified\n"); + fprintf(fh, " -f, --foreground remain in the foreground for debugging\n"); + fprintf(fh, " -h, --help display this help message\n"); + fprintf(fh, " -k[n], --kill[=n] kill the current wineserver, optionally with signal n\n"); + fprintf(fh, " -p[n], --persistent[=n] make server persistent, optionally for n seconds\n"); + fprintf(fh, " -v, --version display version information and exit\n"); + fprintf(fh, " -w, --wait wait until the current wineserver terminates\n"); + fprintf(fh, "\n"); } static void parse_args( int argc, char *argv[] ) @@ -92,7 +92,7 @@ static void parse_args( int argc, char *argv[] ) foreground = 1; break; case 'h': - usage(); + usage(stdout); exit(0); break; case 'k': @@ -114,7 +114,7 @@ static void parse_args( int argc, char *argv[] ) wait_for_lock(); exit(0); default: - usage(); + usage(stderr); exit(1); } }

1 0