November 2012 - Wine-Commits

Christian Costa : quartz: Fix case in some methods name.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: 0c0b229717b94b08bf80186fe67e338dd55c96e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c0b229717b94b08bf80186fe… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Nov 27 09:15:08 2012 +0100 quartz: Fix case in some methods name. --- dlls/quartz/videorenderer.c | 42 ++++++++++++++++++++++++------------------ 1 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index a7f0a59..9afa7bf 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -796,7 +796,7 @@ static const IBaseFilterVtbl VideoRenderer_Vtbl = }; /*** IUnknown methods ***/ -static HRESULT WINAPI Basicvideo_QueryInterface(IBasicVideo *iface, REFIID riid, LPVOID *ppvObj) +static HRESULT WINAPI BasicVideo_QueryInterface(IBasicVideo *iface, REFIID riid, LPVOID *ppvObj) { VideoRendererImpl *This = impl_from_IBasicVideo(iface); @@ -805,7 +805,8 @@ static HRESULT WINAPI Basicvideo_QueryInterface(IBasicVideo *iface, REFIID riid, return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); } -static ULONG WINAPI Basicvideo_AddRef(IBasicVideo *iface) { +static ULONG WINAPI BasicVideo_AddRef(IBasicVideo *iface) +{ VideoRendererImpl *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->()\n", This, iface); @@ -813,7 +814,8 @@ static ULONG WINAPI Basicvideo_AddRef(IBasicVideo *iface) { return IUnknown_AddRef(This->outer_unk); } -static ULONG WINAPI Basicvideo_Release(IBasicVideo *iface) { +static ULONG WINAPI BasicVideo_Release(IBasicVideo *iface) +{ VideoRendererImpl *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->()\n", This, iface); @@ -823,9 +825,9 @@ static ULONG WINAPI Basicvideo_Release(IBasicVideo *iface) { static const IBasicVideoVtbl IBasicVideo_VTable = { - Basicvideo_QueryInterface, - Basicvideo_AddRef, - Basicvideo_Release, + BasicVideo_QueryInterface, + BasicVideo_AddRef, + BasicVideo_Release, BaseControlVideoImpl_GetTypeInfoCount, BaseControlVideoImpl_GetTypeInfo, BaseControlVideoImpl_GetIDsOfNames, @@ -866,7 +868,7 @@ static const IBasicVideoVtbl IBasicVideo_VTable = /*** IUnknown methods ***/ -static HRESULT WINAPI Videowindow_QueryInterface(IVideoWindow *iface, REFIID riid, LPVOID *ppvObj) +static HRESULT WINAPI VideoWindow_QueryInterface(IVideoWindow *iface, REFIID riid, LPVOID *ppvObj) { VideoRendererImpl *This = impl_from_IVideoWindow(iface); @@ -875,7 +877,8 @@ static HRESULT WINAPI Videowindow_QueryInterface(IVideoWindow *iface, REFIID rii return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); } -static ULONG WINAPI Videowindow_AddRef(IVideoWindow *iface) { +static ULONG WINAPI VideoWindow_AddRef(IVideoWindow *iface) +{ VideoRendererImpl *This = impl_from_IVideoWindow(iface); TRACE("(%p/%p)->()\n", This, iface); @@ -883,7 +886,8 @@ static ULONG WINAPI Videowindow_AddRef(IVideoWindow *iface) { return IUnknown_AddRef(This->outer_unk); } -static ULONG WINAPI Videowindow_Release(IVideoWindow *iface) { +static ULONG WINAPI VideoWindow_Release(IVideoWindow *iface) +{ VideoRendererImpl *This = impl_from_IVideoWindow(iface); TRACE("(%p/%p)->()\n", This, iface); @@ -891,8 +895,9 @@ static ULONG WINAPI Videowindow_Release(IVideoWindow *iface) { return IUnknown_Release(This->outer_unk); } -static HRESULT WINAPI Videowindow_get_FullScreenMode(IVideoWindow *iface, - LONG *FullScreenMode) { +static HRESULT WINAPI VideoWindow_get_FullScreenMode(IVideoWindow *iface, + LONG *FullScreenMode) +{ VideoRendererImpl *This = impl_from_IVideoWindow(iface); FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, FullScreenMode); @@ -900,8 +905,9 @@ static HRESULT WINAPI Videowindow_get_FullScreenMode(IVideoWindow *iface, return S_OK; } -static HRESULT WINAPI Videowindow_put_FullScreenMode(IVideoWindow *iface, - LONG FullScreenMode) { +static HRESULT WINAPI VideoWindow_put_FullScreenMode(IVideoWindow *iface, + LONG FullScreenMode) +{ VideoRendererImpl *This = impl_from_IVideoWindow(iface); FIXME("(%p/%p)->(%d): stub !!!\n", This, iface, FullScreenMode); @@ -928,9 +934,9 @@ static HRESULT WINAPI Videowindow_put_FullScreenMode(IVideoWindow *iface, static const IVideoWindowVtbl IVideoWindow_VTable = { - Videowindow_QueryInterface, - Videowindow_AddRef, - Videowindow_Release, + VideoWindow_QueryInterface, + VideoWindow_AddRef, + VideoWindow_Release, BaseControlWindowImpl_GetTypeInfoCount, BaseControlWindowImpl_GetTypeInfo, BaseControlWindowImpl_GetIDsOfNames, @@ -963,8 +969,8 @@ static const IVideoWindowVtbl IVideoWindow_VTable = BaseControlWindowImpl_get_MessageDrain, BaseControlWindowImpl_get_BorderColor, BaseControlWindowImpl_put_BorderColor, - Videowindow_get_FullScreenMode, - Videowindow_put_FullScreenMode, + VideoWindow_get_FullScreenMode, + VideoWindow_put_FullScreenMode, BaseControlWindowImpl_SetWindowForeground, BaseControlWindowImpl_NotifyOwnerMessage, BaseControlWindowImpl_SetWindowPosition,

1 0

Dmitry Timoshkov : windowscodecs: Add a NULL check to GetFrameCount of the TGA decoder.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: 03efd5c0f78354e1182133ec8246d09594ac38eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=03efd5c0f78354e1182133ec8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 23 11:50:20 2012 +0800 windowscodecs: Add a NULL check to GetFrameCount of the TGA decoder. --- dlls/windowscodecs/tgaformat.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tgaformat.c b/dlls/windowscodecs/tgaformat.c index cd615c7..ac57e54 100644 --- a/dlls/windowscodecs/tgaformat.c +++ b/dlls/windowscodecs/tgaformat.c @@ -405,6 +405,8 @@ static HRESULT WINAPI TgaDecoder_GetThumbnail(IWICBitmapDecoder *iface, static HRESULT WINAPI TgaDecoder_GetFrameCount(IWICBitmapDecoder *iface, UINT *pCount) { + if (!pCount) return E_INVALIDARG; + *pCount = 1; return S_OK; }

1 0

Dmitry Timoshkov : windowscodecs: Implement QueryCapability of the TGA decoder.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: 380d0cd0233f1f3721a7417eb52a34423d57a71a URL: http://source.winehq.org/git/wine.git/?a=commit;h=380d0cd0233f1f3721a7417eb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 23 11:50:33 2012 +0800 windowscodecs: Implement QueryCapability of the TGA decoder. --- dlls/windowscodecs/tgaformat.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/tgaformat.c b/dlls/windowscodecs/tgaformat.c index ac57e54..bb6d969 100644 --- a/dlls/windowscodecs/tgaformat.c +++ b/dlls/windowscodecs/tgaformat.c @@ -182,11 +182,21 @@ static ULONG WINAPI TgaDecoder_Release(IWICBitmapDecoder *iface) return ref; } -static HRESULT WINAPI TgaDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *pIStream, - DWORD *pdwCapability) +static HRESULT WINAPI TgaDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *stream, + DWORD *capability) { - FIXME("(%p,%p,%p): stub\n", iface, pIStream, pdwCapability); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p,%p,%p)\n", iface, stream, capability); + + if (!stream || !capability) return E_INVALIDARG; + + hr = IWICBitmapDecoder_Initialize(iface, stream, WICDecodeMetadataCacheOnDemand); + if (hr != S_OK) return hr; + + *capability = WICBitmapDecoderCapabilityCanDecodeAllImages | + WICBitmapDecoderCapabilityCanDecodeSomeImages; + return S_OK; } static HRESULT WINAPI TgaDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream,

1 0

Dmitry Timoshkov : windowscodecs: Implement QueryCapability of the PNG decoder.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: 92d445bcca7c00a3759c84abdecd17763c250b12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92d445bcca7c00a3759c84abd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 23 11:50:05 2012 +0800 windowscodecs: Implement QueryCapability of the PNG decoder. --- dlls/windowscodecs/pngformat.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 46a1908..009532d 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -351,11 +351,22 @@ static ULONG WINAPI PngDecoder_Release(IWICBitmapDecoder *iface) return ref; } -static HRESULT WINAPI PngDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *pIStream, - DWORD *pdwCapability) +static HRESULT WINAPI PngDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *stream, + DWORD *capability) { - FIXME("(%p,%p,%p): stub\n", iface, pIStream, pdwCapability); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p,%p,%p)\n", iface, stream, capability); + + if (!stream || !capability) return E_INVALIDARG; + + hr = IWICBitmapDecoder_Initialize(iface, stream, WICDecodeMetadataCacheOnDemand); + if (hr != S_OK) return hr; + + *capability = WICBitmapDecoderCapabilityCanDecodeAllImages | + WICBitmapDecoderCapabilityCanDecodeSomeImages; + /* FIXME: WICBitmapDecoderCapabilityCanEnumerateMetadata */ + return S_OK; } static void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length)

1 0

Dmitry Timoshkov : windowscodecs: Add a NULL check to GetFrameCount of the PNG decoder.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: 5285756f938371457c3577ec9ad03ccacbcb658d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5285756f938371457c3577ec9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 23 11:49:44 2012 +0800 windowscodecs: Add a NULL check to GetFrameCount of the PNG decoder. --- dlls/windowscodecs/pngformat.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 4c94489..46a1908 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -640,6 +640,8 @@ static HRESULT WINAPI PngDecoder_GetThumbnail(IWICBitmapDecoder *iface, static HRESULT WINAPI PngDecoder_GetFrameCount(IWICBitmapDecoder *iface, UINT *pCount) { + if (!pCount) return E_INVALIDARG; + *pCount = 1; return S_OK; }

1 0

Daniel Jelinski : comctl32: Properly initialize internal structures.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: c1157b79fd2d3963e02020cbcc0c8d02c709938c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1157b79fd2d3963e02020cbc… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Mon Nov 26 21:39:01 2012 +0100 comctl32: Properly initialize internal structures. --- dlls/comctl32/listview.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index d8d11ca..4bac508 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9423,6 +9423,7 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) /* init item size to avoid division by 0 */ LISTVIEW_UpdateItemSize (infoPtr); + LISTVIEW_UpdateSize (infoPtr); if (infoPtr->uView == LV_VIEW_DETAILS) {

1 0

Jason Edmeades : cmd: Prevent overflow for long command string.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: d71f5c9483b87e16ce36e9d992541c8968cb1d47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d71f5c9483b87e16ce36e9d99… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Mon Nov 19 22:34:09 2012 +0000 cmd: Prevent overflow for long command string. --- programs/cmd/batch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index e9b98dc..8cd48e8 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -153,7 +153,7 @@ WCHAR *WCMD_parameter_with_delims (WCHAR *s, int n, WCHAR **start, BOOL raw, BOOL wholecmdline, const WCHAR *delims) { int curParamNb = 0; - static WCHAR param[MAX_PATH]; + static WCHAR param[MAXSTRING]; WCHAR *p = s, *begin; if (start != NULL) *start = NULL;

1 0

Detlef Riekenberg : shell32/tests: Remove wrong comment.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: c0ff5872031354b821c0972ff3f16c6b8b1e97f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0ff5872031354b821c0972ff… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Nov 26 16:53:05 2012 +0100 shell32/tests: Remove wrong comment. --- dlls/shell32/tests/shelllink.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index f2f33aa..b22079c 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -16,9 +16,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * This is a test program for the SHGet{Special}Folder{Path|Location} functions - * of shell32, that get either a filesystem path or a LPITEMIDLIST (shell - * namespace) path for a given folder (CSIDL value). * */

1 0

Frédéric Delanoy : ole32: Add helper for string table memory freeing.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: 02da0411e148ccb21ab2dc8f72764d3491adb7aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=02da0411e148ccb21ab2dc8f7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 26 12:41:41 2012 +0100 ole32: Add helper for string table memory freeing. --- dlls/ole32/filemoniker.c | 43 +++++++++++++++++-------------------------- 1 files changed, 17 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index b3a5cc2..37c86ca 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -657,6 +657,15 @@ FileMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar, return MK_S_REDUCED_TO_SELF; } +static void free_stringtable(LPOLESTR *stringTable) +{ + int i; + + for (i=0; stringTable[i]!=NULL; i++) + CoTaskMemFree(stringTable[i]); + CoTaskMemFree(stringTable); +} + /****************************************************************************** * FileMoniker_ComposeWith */ @@ -731,12 +740,8 @@ FileMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, } else res = E_OUTOFMEMORY; - for(i=0; strDec1[i]!=NULL;i++) - CoTaskMemFree(strDec1[i]); - for(i=0; strDec2[i]!=NULL;i++) - CoTaskMemFree(strDec2[i]); - CoTaskMemFree(strDec1); - CoTaskMemFree(strDec2); + free_stringtable(strDec1); + free_stringtable(strDec2); CoTaskMemFree(str1); CoTaskMemFree(str2); @@ -1004,17 +1009,9 @@ FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** p { for(i=0;i<sameIdx;i++) strcatW(commonPath,stringTable1[i]); - - for(i=0;i<nb1;i++) - CoTaskMemFree(stringTable1[i]); - - CoTaskMemFree(stringTable1); - - for(i=0;i<nb2;i++) - CoTaskMemFree(stringTable2[i]); - - CoTaskMemFree(stringTable2); - + + free_stringtable(stringTable1); + free_stringtable(stringTable2); ret = CreateFileMoniker(commonPath,ppmkPrefix); } HeapFree(GetProcessHeap(),0,commonPath); @@ -1167,12 +1164,8 @@ FileMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppm res=CreateFileMoniker(relPath,ppmkRelPath); - for(j=0; tabStr1[j]!=NULL;j++) - CoTaskMemFree(tabStr1[j]); - for(j=0; tabStr2[j]!=NULL;j++) - CoTaskMemFree(tabStr2[j]); - CoTaskMemFree(tabStr1); - CoTaskMemFree(tabStr2); + free_stringtable(tabStr1); + free_stringtable(tabStr2); CoTaskMemFree(str1); CoTaskMemFree(str2); HeapFree(GetProcessHeap(),0,relPath); @@ -1410,9 +1403,7 @@ static HRESULT FileMonikerImpl_Construct(FileMonikerImpl* This, LPCOLESTR lpszPa strcatW(This->filePathName,bkSlash); } - for(i=0; tabStr[i]!=NULL;i++) - CoTaskMemFree(tabStr[i]); - CoTaskMemFree(tabStr); + free_stringtable(tabStr); return S_OK; }

1 0

Frédéric Delanoy : ole32: Fix some leaks ( coverity).
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: 8ddb00b22b02004640c6c316faacf6d971ed2620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ddb00b22b02004640c6c316f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 26 12:41:42 2012 +0100 ole32: Fix some leaks (coverity). --- dlls/ole32/filemoniker.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 37c86ca..7a97100 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -973,10 +973,17 @@ FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** p return nb1; nb2=FileMonikerImpl_DecomposePath(pathOther,&stringTable2); if (FAILED(nb2)) + { + free_stringtable(stringTable1); return nb2; + } if (nb1==0 || nb2==0) + { + free_stringtable(stringTable1); + free_stringtable(stringTable2); return MK_E_NOPREFIX; + } commonPath=HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(min(lstrlenW(pathThis),lstrlenW(pathOther))+1)); if (!commonPath) @@ -1136,10 +1143,15 @@ FileMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppm return res; len1=FileMonikerImpl_DecomposePath(str1,&tabStr1); + if (FAILED(len1)) + return E_OUTOFMEMORY; len2=FileMonikerImpl_DecomposePath(str2,&tabStr2); - if (FAILED(len1) || FAILED(len2)) - return E_OUTOFMEMORY; + if (FAILED(len2)) + { + free_stringtable(tabStr1); + return E_OUTOFMEMORY; + } /* count the number of similar items from the begin of the two paths */ for(sameIdx=0; ( (tabStr1[sameIdx]!=NULL) &&

1 0