November 2012 - Wine-Commits

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

Nov. 27, 2012

Module: wine Branch: master Commit: 67eafab883e9a9c5c22aa990806d35154d4e9dec URL: http://source.winehq.org/git/wine.git/?a=commit;h=67eafab883e9a9c5c22aa9908… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 23 11:49:23 2012 +0800 windowscodecs: Implement QueryCapability of the JPEG decoder. --- dlls/windowscodecs/jpegformat.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index e9c722e..57f1b55 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -220,11 +220,22 @@ static ULONG WINAPI JpegDecoder_Release(IWICBitmapDecoder *iface) return ref; } -static HRESULT WINAPI JpegDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *pIStream, - DWORD *pdwCapability) +static HRESULT WINAPI JpegDecoder_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 source_mgr_init_source(j_decompress_ptr cinfo)

1 0

Jacek Caban : mshtml: Use UTF-8 encoding in is_gecko_path.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: fbeb1b4acf1fe33cbaa1b2fe5d5d3849d697cb31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbeb1b4acf1fe33cbaa1b2fe5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 27 14:53:29 2012 +0100 mshtml: Use UTF-8 encoding in is_gecko_path. --- dlls/mshtml/nsembed.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 5593c6b..109b6ad 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1100,8 +1100,8 @@ BOOL is_gecko_path(const char *path) WCHAR *buf, *ptr; BOOL ret; - buf = heap_strdupAtoW(path); - if(strlenW(buf) < gecko_path_len) + buf = heap_strdupUtoW(path); + if(!buf || strlenW(buf) < gecko_path_len) return FALSE; buf[gecko_path_len] = 0;

1 0

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

Nov. 27, 2012

Module: wine Branch: master Commit: 5e10f2e0ec896a275d69b77bfe699e841dc0b7c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e10f2e0ec896a275d69b77bf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 23 11:48:49 2012 +0800 windowscodecs: Implement QueryCapability of the ICO decoder. --- dlls/windowscodecs/icoformat.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index 6606341..7aec245 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -489,11 +489,20 @@ static ULONG WINAPI IcoDecoder_Release(IWICBitmapDecoder *iface) return ref; } -static HRESULT WINAPI IcoDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *pIStream, - DWORD *pdwCapability) +static HRESULT WINAPI IcoDecoder_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; + return S_OK; } static HRESULT WINAPI IcoDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream,

1 0

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

Nov. 27, 2012

Module: wine Branch: master Commit: eb26db27a75bb0332f8877feec06558aaeab9db1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb26db27a75bb0332f8877fee… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 23 11:48:04 2012 +0800 windowscodecs: Reimplement QueryCapability of the BMP decoder. --- dlls/windowscodecs/bmpdecode.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 54de0f1..e029369 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -1010,22 +1010,20 @@ static ULONG WINAPI BmpDecoder_Release(IWICBitmapDecoder *iface) return ref; } -static HRESULT WINAPI BmpDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *pIStream, - DWORD *pdwCapability) +static HRESULT WINAPI BmpDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *stream, + DWORD *capability) { HRESULT hr; BmpDecoder *This = impl_from_IWICBitmapDecoder(iface); - EnterCriticalSection(&This->lock); - hr = BmpDecoder_ReadHeaders(This, pIStream); - LeaveCriticalSection(&This->lock); - if (FAILED(hr)) return hr; + TRACE("(%p,%p,%p)\n", iface, stream, capability); - if (This->read_data_func == BmpFrameDecode_ReadUnsupported) - *pdwCapability = 0; - else - *pdwCapability = WICBitmapDecoderCapabilityCanDecodeAllImages; + if (!stream || !capability) return E_INVALIDARG; + + hr = IWICBitmapDecoder_Initialize(iface, stream, WICDecodeMetadataCacheOnDemand); + if (hr != S_OK) return hr; + *capability = This->read_data_func == BmpFrameDecode_ReadUnsupported ? 0 : WICBitmapDecoderCapabilityCanDecodeAllImages; return S_OK; }

1 0

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

Nov. 27, 2012

Module: wine Branch: master Commit: afd1ddbe0d34ea2ab2bd9867aedf3e1cf9f41f8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=afd1ddbe0d34ea2ab2bd9867a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 23 11:47:35 2012 +0800 windowscodecs: Add a NULL check to GetFrameCount of the BMP decoder. --- dlls/windowscodecs/bmpdecode.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 7b3f82d..54de0f1 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -1113,6 +1113,8 @@ static HRESULT WINAPI BmpDecoder_GetThumbnail(IWICBitmapDecoder *iface, static HRESULT WINAPI BmpDecoder_GetFrameCount(IWICBitmapDecoder *iface, UINT *pCount) { + if (!pCount) return E_INVALIDARG; + *pCount = 1; return S_OK; }

1 0

Jacek Caban : jscript: Fixed some Coverity issues.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: ac41380b944e8409961a65c146f925bd2e056cda URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac41380b944e8409961a65c14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 27 12:29:06 2012 +0100 jscript: Fixed some Coverity issues. --- dlls/jscript/array.c | 2 +- dlls/jscript/compile.c | 2 ++ dlls/jscript/dispex.c | 1 + 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index e255880..fef37e6 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -325,7 +325,7 @@ static HRESULT array_join(script_ctx_t *ctx, jsdisp_t *array, DWORD length, cons TRACE("= %s\n", debugstr_jsstr(ret)); if(r) - *r = ret ? jsval_string(ret) : jsval_string(jsstr_empty()); + *r = jsval_string(ret); else jsstr_release(ret); return S_OK; diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 2e18c50..501c340 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1395,6 +1395,8 @@ static HRESULT compile_continue_statement(compiler_ctx_t *ctx, branch_statement_ WARN("Label is not a loop\n"); return JS_E_INVALID_CONTINUE; } + + assert(pop_ctx != NULL); }else { for(pop_ctx = ctx->stat_ctx; pop_ctx; pop_ctx = pop_ctx->next) { if(pop_ctx->continue_label) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 8bc4d1d..4eda704 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -454,6 +454,7 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val, IServi vdisp_release(&vthis); return hres; } + /* fall through */ case PROP_PROTREF: prop->type = PROP_JSVAL; prop->flags = PROPF_ENUM;

1 0

Alexandre Julliard : gdi32: Fully reset the DC state before deleting it.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: 4ad528749641dd42859f4adfcc4cd0f85ab35f27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ad528749641dd42859f4adfc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 27 13:24:18 2012 +0100 gdi32: Fully reset the DC state before deleting it. --- dlls/gdi32/dc.c | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index b59c154..5df55bc 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -815,21 +815,7 @@ BOOL WINAPI DeleteDC( HDC hdc ) release_dc_ptr( dc ); return TRUE; } - - while (dc->saveLevel) - { - DC *dcs = dc->saved_dc; - dc->saved_dc = dcs->saved_dc; - dc->saveLevel--; - free_dc_state( dcs ); - } - - AbortPath( hdc ); - SelectObject( hdc, GetStockObject(BLACK_PEN) ); - SelectObject( hdc, GetStockObject(WHITE_BRUSH) ); - SelectObject( hdc, GetStockObject(SYSTEM_FONT) ); - SelectObject( hdc, GetStockObject(DEFAULT_BITMAP) ); - + reset_dc_state( hdc ); free_dc_ptr( dc ); return TRUE; }

1 0

Jacek Caban : mshtml: Fixed a few coverity issues.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: df53b501714089f30626664a0daa226c0e80a3aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=df53b501714089f30626664a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 27 12:16:34 2012 +0100 mshtml: Fixed a few coverity issues. --- dlls/mshtml/navigate.c | 16 ++++++++-------- dlls/mshtml/nsembed.c | 1 + dlls/mshtml/nsio.c | 12 +++++++++--- dlls/mshtml/pluginhost.c | 4 +++- dlls/mshtml/protocol.c | 9 +++++++-- 5 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 346524d..fb4f1e8 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -800,15 +800,16 @@ HRESULT start_binding(HTMLInnerWindow *inner_window, BSCallback *bscallback, IBi /* NOTE: IE7 calls IsSystemMoniker here*/ if(bctx) { - RegisterBindStatusCallback(bctx, &bscallback->IBindStatusCallback_iface, NULL, 0); - IBindCtx_AddRef(bctx); + hres = RegisterBindStatusCallback(bctx, &bscallback->IBindStatusCallback_iface, NULL, 0); + if(SUCCEEDED(hres)) + IBindCtx_AddRef(bctx); }else { hres = CreateAsyncBindCtx(0, &bscallback->IBindStatusCallback_iface, NULL, &bctx); - if(FAILED(hres)) { - WARN("CreateAsyncBindCtx failed: %08x\n", hres); - bscallback->vtbl->stop_binding(bscallback, hres); - return hres; - } + } + + if(FAILED(hres)) { + bscallback->vtbl->stop_binding(bscallback, hres); + return hres; } hres = IMoniker_BindToStorage(bscallback->mon, bctx, NULL, &IID_IStream, (void**)&str); @@ -1473,7 +1474,6 @@ static void handle_navigation_error(nsChannelBSC *This, DWORD result) return; if(!doc->client_cmdtrg) - if(FAILED(hres)) return; bound.lLbound = 0; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index c93673a..5593c6b 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -280,6 +280,7 @@ static nsresult NSAPI nsDirectoryServiceProvider2_GetFile(nsIDirectoryServicePro return nsres; } + assert(profile_directory != NULL); return nsIFile_Clone(profile_directory, _retval); } diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 89a7fe8..c8bbdd8 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1042,10 +1042,16 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen return NS_ERROR_FAILURE; if(TRACE_ON(mshtml)) { + HRESULT hres; BSTR uri_str; - IUri_GetDisplayUri(This->uri->uri, &uri_str); - TRACE("opening %s\n", debugstr_w(uri_str)); - SysFreeString(uri_str); + + hres = IUri_GetDisplayUri(This->uri->uri, &uri_str); + if(SUCCEEDED(hres)) { + TRACE("opening %s\n", debugstr_w(uri_str)); + SysFreeString(uri_str); + }else { + WARN("GetDisplayUri failed: %08x\n", hres); + } } if(This->uri->is_doc_uri) { diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 4f088ad..38a8fd5 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -1301,8 +1301,10 @@ static HRESULT WINAPI PHInPlaceSite_GetWindowContext(IOleInPlaceSiteEx *iface, return hres; hres = create_ip_window(ppDoc); - if(FAILED(hres)) + if(FAILED(hres)) { + IOleInPlaceFrame_Release(ip_frame); return hres; + } *ppFrame = ip_frame; *lprcPosRect = This->rect; diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index d9a008c..021ce55 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -218,6 +218,7 @@ static HRESULT WINAPI AboutProtocol_Start(IInternetProtocol *iface, LPCWSTR szUr LPCWSTR text = NULL; DWORD data_len; BYTE *data; + HRESULT hres; static const WCHAR html_begin[] = {0xfeff,'<','H','T','M','L','>',0}; static const WCHAR html_end[] = {'<','/','H','T','M','L','>',0}; @@ -237,7 +238,9 @@ static HRESULT WINAPI AboutProtocol_Start(IInternetProtocol *iface, LPCWSTR szUr memset(&bindinfo, 0, sizeof(bindinfo)); bindinfo.cbSize = sizeof(BINDINFO); - IInternetBindInfo_GetBindInfo(pOIBindInfo, &grfBINDF, &bindinfo); + hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &grfBINDF, &bindinfo); + if(FAILED(hres)) + return hres; ReleaseBindInfo(&bindinfo); TRACE("bindf %x\n", grfBINDF); @@ -605,7 +608,9 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, memset(&bindinfo, 0, sizeof(bindinfo)); bindinfo.cbSize = sizeof(BINDINFO); - IInternetBindInfo_GetBindInfo(pOIBindInfo, &grfBINDF, &bindinfo); + hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &grfBINDF, &bindinfo); + if(FAILED(hres)) + return hres; ReleaseBindInfo(&bindinfo); len = strlenW(szUrl)+16;

1 0

Dmitry Timoshkov : windowscodecs: Reimplement GetFrameCount of the ICO decoder.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: 075d28d8570341060af65e0fb3b218efe8399da8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=075d28d8570341060af65e0fb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 23 11:48:28 2012 +0800 windowscodecs: Reimplement GetFrameCount of the ICO decoder. --- dlls/windowscodecs/icoformat.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index 6b454c2..6606341 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -603,12 +603,14 @@ static HRESULT WINAPI IcoDecoder_GetFrameCount(IWICBitmapDecoder *iface, UINT *pCount) { IcoDecoder *This = impl_from_IWICBitmapDecoder(iface); - TRACE("(%p,%p)\n", iface, pCount); - if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; + if (!pCount) return E_INVALIDARG; - *pCount = This->header.idCount; - TRACE("<-- %u\n", *pCount); + EnterCriticalSection(&This->lock); + *pCount = This->initialized ? This->header.idCount : 0; + LeaveCriticalSection(&This->lock); + + TRACE("(%p) <-- %d\n", iface, *pCount); return S_OK; }

1 0

Huw Davies : oledb32: Add a 'fall through' comment.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: 71d185d7fe29944a51b43497860866ba8552b683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d185d7fe29944a51b434978… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 27 10:24:47 2012 +0000 oledb32: Add a 'fall through' comment. --- dlls/oledb32/convert.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 1691792..badb899 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -870,6 +870,7 @@ static HRESULT WINAPI convert_CanConvert(IDataConvert* iface, case DBTYPE_BOOL: if(dst_base_type == DBTYPE_DATE) return S_OK; + /* fall through */ case DBTYPE_NUMERIC: case DBTYPE_CY: if(common_class(dst_class)) return S_OK;

1 0