November 2012 - Wine-Commits

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

Nov. 23, 2012

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

Andrew Talbot : dnsapi: Remove unused variable.
by Alexandre Julliard Nov. 23, 2012

Nov. 23, 2012

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

Andrew Talbot : cryptdll: Remove unused variable.
by Alexandre Julliard Nov. 23, 2012

Nov. 23, 2012

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

Christian Costa : cabinet: Simplify concatenation of path and filename.
by Alexandre Julliard Nov. 23, 2012

Nov. 23, 2012

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

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

Nov. 23, 2012

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

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

Nov. 23, 2012

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

Andrew Talbot : winspool.drv: Remove unused variable.
by Alexandre Julliard Nov. 23, 2012

Nov. 23, 2012

Module: wine Branch: master Commit: 26671c8f361b2b19dd41dda3170927131e3eef5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=26671c8f361b2b19dd41dda31… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 22 21:02:13 2012 +0000 winspool.drv: Remove unused variable. --- dlls/winspool.drv/info.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 172f892..d8a78b0 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -5582,7 +5582,6 @@ BOOL WINAPI EnumPrinterDriversW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, if (pEnvironment && !strcmpW(pEnvironment, allW)) { DWORD i, needed, bufsize = cbBuf; - DWORD total_needed = 0; DWORD total_found = 0; DWORD data_offset; @@ -5594,7 +5593,6 @@ BOOL WINAPI EnumPrinterDriversW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, ret = WINSPOOL_EnumPrinterDrivers(pName, all_printenv[i]->envname, Level, NULL, 0, 0, &needed, &found, 0); if (!ret && GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FALSE; - total_needed += needed; total_found += found; }

1 0

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

Nov. 23, 2012

Module: wine Branch: master Commit: ff04207e29ff4636898b462a0924facdd97ca9ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff04207e29ff4636898b462a0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 21:13:34 2012 +0100 d3dx9: Avoid LPD3DXFILESAVEOBJECT. --- include/d3dx9anim.h | 6 +++--- include/d3dx9xof.h | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 9a25ec8..c8378e2 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -196,10 +196,10 @@ DECLARE_INTERFACE(ID3DXSaveUserData) ID3DXFileSaveObject *save_obj, ID3DXFileSaveData *frame_data) PURE; STDMETHOD(AddMeshChildData)(const D3DXMESHCONTAINER *mesh_container, ID3DXFileSaveObject *save_obj, ID3DXFileSaveData *mesh_data) PURE; - STDMETHOD(AddTopLevelDataObjectsPre)(LPD3DXFILESAVEOBJECT save_obj) PURE; - STDMETHOD(AddTopLevelDataObjectsPost)(LPD3DXFILESAVEOBJECT save_obj) PURE; + STDMETHOD(AddTopLevelDataObjectsPre)(ID3DXFileSaveObject *save_obj) PURE; + STDMETHOD(AddTopLevelDataObjectsPost)(ID3DXFileSaveObject *save_obj) PURE; STDMETHOD(RegisterTemplates)(LPD3DXFILE xfile) PURE; - STDMETHOD(SaveTemplates)(LPD3DXFILESAVEOBJECT save_obj) PURE; + STDMETHOD(SaveTemplates)(ID3DXFileSaveObject *save_obj) PURE; }; #undef INTERFACE diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h index 8e08cca..593fca5 100644 --- a/include/d3dx9xof.h +++ b/include/d3dx9xof.h @@ -78,7 +78,8 @@ DECLARE_INTERFACE_IID_(ID3DXFile,IUnknown,"cef08cf9-7b4f-4429-9624-2a690a933201" /*** ID3DXFile methods ***/ STDMETHOD(CreateEnumObject)(THIS_ const void *src, D3DXF_FILELOADOPTIONS type, struct ID3DXFileEnumObject **enum_obj) PURE; - STDMETHOD(CreateSaveObject)(THIS_ LPCVOID, D3DXF_FILESAVEOPTIONS, D3DXF_FILEFORMAT, LPD3DXFILESAVEOBJECT*) PURE; + STDMETHOD(CreateSaveObject)(THIS_ const void *data, D3DXF_FILESAVEOPTIONS flags, + D3DXF_FILEFORMAT format, struct ID3DXFileSaveObject **save_obj) PURE; STDMETHOD(RegisterTemplates)(THIS_ LPCVOID, SIZE_T) PURE; STDMETHOD(RegisterEnumTemplates)(THIS_ struct ID3DXFileEnumObject *enum_obj) PURE; }; @@ -107,7 +108,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileSaveData,IUnknown,"cef08cfb-7b4f-4429-9624-2a690 STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** ID3DXFileSaveObject methods ***/ - STDMETHOD(GetSave)(THIS_ LPD3DXFILESAVEOBJECT*) PURE; + STDMETHOD(GetSave)(THIS_ ID3DXFileSaveObject **save_obj) PURE; STDMETHOD(GetName)(THIS_ LPSTR, SIZE_T*) PURE; STDMETHOD(GetId)(THIS_ LPGUID) PURE; STDMETHOD(GetType)(THIS_ GUID*) PURE;

1 0

Francois Gouget : winegstreamer: Make the GST_QualityControl methods static .
by Alexandre Julliard Nov. 23, 2012

Nov. 23, 2012

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 Nov. 23, 2012

Nov. 23, 2012

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