August 2012 - Wine-Commits - list.winehq.org

Henri Verbeet : winex11: Try harder to get usable RandR screen resources.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: e426fa9cb9fce2219dc6099b4d0ca7ab27b3150c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e426fa9cb9fce2219dc6099b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 20 08:12:07 2012 +0200 winex11: Try harder to get usable RandR screen resources. --- dlls/winex11.drv/xrandr.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 16b5d9a..e17150b 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -53,8 +53,9 @@ MAKE_FUNCPTR(XRRFreeOutputInfo) MAKE_FUNCPTR(XRRFreeScreenResources) MAKE_FUNCPTR(XRRGetCrtcInfo) MAKE_FUNCPTR(XRRGetOutputInfo) +MAKE_FUNCPTR(XRRGetScreenResources) MAKE_FUNCPTR(XRRSetCrtcConfig) -static typeof(XRRGetScreenResources) *xrandr_get_screen_resources; +static typeof(XRRGetScreenResources) *pXRRGetScreenResourcesCurrent; static RRMode *xrandr12_modes; #endif @@ -96,6 +97,7 @@ static int load_xrandr(void) LOAD_FUNCPTR(XRRFreeScreenResources) LOAD_FUNCPTR(XRRGetCrtcInfo) LOAD_FUNCPTR(XRRGetOutputInfo) + LOAD_FUNCPTR(XRRGetScreenResources) LOAD_FUNCPTR(XRRSetCrtcConfig) r = 2; #endif @@ -267,7 +269,7 @@ static int xrandr12_get_current_mode(void) XRRCrtcInfo *crtc_info; int i, ret = -1; - if (!(resources = xrandr_get_screen_resources( gdi_display, root_window ))) + if (!(resources = pXRRGetScreenResourcesCurrent( gdi_display, root_window ))) { ERR("Failed to get screen resources.\n"); return 0; @@ -312,7 +314,7 @@ static LONG xrandr12_set_current_mode( int mode ) mode = mode % xrandr_mode_count; - if (!(resources = xrandr_get_screen_resources( gdi_display, root_window ))) + if (!(resources = pXRRGetScreenResourcesCurrent( gdi_display, root_window ))) { ERR("Failed to get screen resources.\n"); return DISP_CHANGE_FAILED; @@ -352,12 +354,22 @@ static int xrandr12_init_modes(void) int ret = -1; int i, j; - if (!(resources = xrandr_get_screen_resources( gdi_display, root_window ))) + if (!(resources = pXRRGetScreenResourcesCurrent( gdi_display, root_window ))) { ERR("Failed to get screen resources.\n"); return ret; } + if (!resources->ncrtc) + { + pXRRFreeScreenResources( resources ); + if (!(resources = pXRRGetScreenResources( gdi_display, root_window ))) + { + ERR("Failed to get screen resources.\n"); + return ret; + } + } + if (!resources->ncrtc || !(crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[0] ))) { pXRRFreeScreenResources( resources ); @@ -450,12 +462,12 @@ void X11DRV_XRandR_Init(void) if (ret >= 2 && (major > 1 || (major == 1 && minor >= 2))) { if (major > 1 || (major == 1 && minor >= 3)) - xrandr_get_screen_resources = wine_dlsym( xrandr_handle, "XRRGetScreenResourcesCurrent", NULL, 0 ); - if (!xrandr_get_screen_resources) - xrandr_get_screen_resources = wine_dlsym( xrandr_handle, "XRRGetScreenResources", NULL, 0 ); + pXRRGetScreenResourcesCurrent = wine_dlsym( xrandr_handle, "XRRGetScreenResourcesCurrent", NULL, 0 ); + if (!pXRRGetScreenResourcesCurrent) + pXRRGetScreenResourcesCurrent = pXRRGetScreenResources; } - if (!xrandr_get_screen_resources || xrandr12_init_modes() < 0) + if (!pXRRGetScreenResourcesCurrent || xrandr12_init_modes() < 0) #endif xrandr10_init_modes(); }

1 0

Rico Schüller : d3dx9: Move technique name handling to technique handle validation.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: c1193ab79b28e0e309e13d9002cb2c9344bec9bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1193ab79b28e0e309e13d900… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Aug 18 14:59:31 2012 +0200 d3dx9: Move technique name handling to technique handle validation. --- dlls/d3dx9_36/effect.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 2ae8bd2..ef8fb86 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -469,17 +469,21 @@ static struct d3dx_technique *get_technique_by_name(struct ID3DXBaseEffectImpl * static struct d3dx_technique *is_valid_technique(struct ID3DXBaseEffectImpl *base, D3DXHANDLE technique) { + struct d3dx_technique *tech = NULL; unsigned int i; for (i = 0; i < base->technique_count; ++i) { if (base->technique_handles[i] == technique) { - return get_technique_struct(technique); + tech = get_technique_struct(technique); + break; } } - return NULL; + if (!tech) tech = get_technique_by_name(base, technique); + + return tech; } static struct d3dx_pass *is_valid_pass(struct ID3DXBaseEffectImpl *base, D3DXHANDLE pass) @@ -1462,8 +1466,6 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetPass(ID3DXBaseEffect *iface, D3D TRACE("iface %p, technique %p, index %u\n", This, technique, index); - if (!tech) tech = get_technique_struct(iface->lpVtbl->GetTechniqueByName(iface, technique)); - if (tech && index < tech->pass_count) { TRACE("Returning pass %p\n", tech->pass_handles[index]); @@ -1482,8 +1484,6 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetPassByName(ID3DXBaseEffect *ifac TRACE("iface %p, technique %p, name %s\n", This, technique, debugstr_a(name)); - if (!tech) tech = get_technique_struct(iface->lpVtbl->GetTechniqueByName(iface, technique)); - if (tech && name) { unsigned int i; @@ -3525,8 +3525,6 @@ static HRESULT WINAPI ID3DXEffectImpl_SetTechnique(ID3DXEffect *iface, D3DXHANDL TRACE("iface %p, technique %p\n", This, technique); - if (!tech) tech = get_technique_struct(iface->lpVtbl->GetTechniqueByName(iface, technique)); - if (tech) { UINT i;

1 0

Nikolay Sivov : msctf: Call interface methods properly.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: 955e27d0e37fc084a92dd392a7abb2783b7a13bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=955e27d0e37fc084a92dd392a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 19 22:01:36 2012 +0400 msctf: Call interface methods properly. --- dlls/msctf/categorymgr.c | 2 +- dlls/msctf/compartmentmgr.c | 6 +++--- dlls/msctf/context.c | 8 ++++---- dlls/msctf/displayattributemgr.c | 2 +- dlls/msctf/documentmgr.c | 6 +++--- dlls/msctf/inputprocessor.c | 6 +++--- dlls/msctf/langbarmgr.c | 2 +- dlls/msctf/range.c | 2 +- dlls/msctf/tests/inputprocessor.c | 16 ++++++++-------- dlls/msctf/threadmgr.c | 8 ++++---- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/msctf/categorymgr.c b/dlls/msctf/categorymgr.c index a487404..167e059 100644 --- a/dlls/msctf/categorymgr.c +++ b/dlls/msctf/categorymgr.c @@ -68,7 +68,7 @@ static HRESULT WINAPI CategoryMgr_QueryInterface(ITfCategoryMgr *iface, REFIID i if (*ppvOut) { - IUnknown_AddRef(iface); + ITfCategoryMgr_AddRef(iface); return S_OK; } diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c index bb55d69..a5bae3f 100644 --- a/dlls/msctf/compartmentmgr.c +++ b/dlls/msctf/compartmentmgr.c @@ -131,7 +131,7 @@ static HRESULT WINAPI CompartmentMgr_QueryInterface(ITfCompartmentMgr *iface, RE if (*ppvOut) { - IUnknown_AddRef(iface); + ITfCompartmentMgr_AddRef(iface); return S_OK; } @@ -304,7 +304,7 @@ static HRESULT WINAPI CompartmentEnumGuid_QueryInterface(IEnumGUID *iface, REFII if (*ppvOut) { - IUnknown_AddRef(iface); + IEnumGUID_AddRef(iface); return S_OK; } @@ -464,7 +464,7 @@ static HRESULT WINAPI Compartment_QueryInterface(ITfCompartment *iface, REFIID i if (*ppvOut) { - IUnknown_AddRef(iface); + ITfCompartment_AddRef(iface); return S_OK; } diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index c013cf9..c8d3ac4 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -141,10 +141,10 @@ static void Context_Destructor(Context *This) } if (This->pITextStoreACP) - ITextStoreACPSink_Release(This->pITextStoreACP); + ITextStoreACP_Release(This->pITextStoreACP); if (This->pITfContextOwnerCompositionSink) - ITextStoreACPSink_Release(This->pITfContextOwnerCompositionSink); + ITfContextOwnerCompositionSink_Release(This->pITfContextOwnerCompositionSink); if (This->defaultCookie) { @@ -216,7 +216,7 @@ static HRESULT WINAPI Context_QueryInterface(ITfContext *iface, REFIID iid, LPVO if (*ppvOut) { - IUnknown_AddRef(iface); + ITfContext_AddRef(iface); return S_OK; } @@ -896,7 +896,7 @@ static HRESULT WINAPI TextStoreACPSink_QueryInterface(ITextStoreACPSink *iface, if (*ppvOut) { - IUnknown_AddRef(iface); + ITextStoreACPSink_AddRef(iface); return S_OK; } diff --git a/dlls/msctf/displayattributemgr.c b/dlls/msctf/displayattributemgr.c index 44c61ab..0893a8f 100644 --- a/dlls/msctf/displayattributemgr.c +++ b/dlls/msctf/displayattributemgr.c @@ -61,7 +61,7 @@ static HRESULT WINAPI DisplayAttributeMgr_QueryInterface(ITfDisplayAttributeMgr if (*ppvOut) { - IUnknown_AddRef(iface); + ITfDisplayAttributeMgr_AddRef(iface); return S_OK; } diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index 4e21624..884b098 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -113,7 +113,7 @@ static HRESULT WINAPI DocumentMgr_QueryInterface(ITfDocumentMgr *iface, REFIID i if (*ppvOut) { - IUnknown_AddRef(iface); + ITfDocumentMgr_AddRef(iface); return S_OK; } @@ -161,7 +161,7 @@ static HRESULT WINAPI DocumentMgr_Push(ITfDocumentMgr *iface, ITfContext *pic) if (This->contextStack[1]) /* FUll */ return TF_E_STACKFULL; - if (!pic || FAILED(IUnknown_QueryInterface(pic,&IID_ITfContext,(LPVOID*) &check))) + if (!pic || FAILED(ITfContext_QueryInterface(pic,&IID_ITfContext,(LPVOID*) &check))) return E_INVALIDARG; if (This->contextStack[0] == NULL) @@ -364,7 +364,7 @@ static HRESULT WINAPI EnumTfContext_QueryInterface(IEnumTfContexts *iface, REFII if (*ppvOut) { - IUnknown_AddRef(iface); + IEnumTfContexts_AddRef(iface); return S_OK; } diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 5242f14..2340604 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -172,7 +172,7 @@ static HRESULT WINAPI InputProcessorProfiles_QueryInterface(ITfInputProcessorPro if (*ppvOut) { - IUnknown_AddRef(iface); + ITfInputProcessorProfiles_AddRef(iface); return S_OK; } @@ -803,7 +803,7 @@ static HRESULT WINAPI ProfilesEnumGuid_QueryInterface(IEnumGUID *iface, REFIID i if (*ppvOut) { - IUnknown_AddRef(iface); + IEnumGUID_AddRef(iface); return S_OK; } @@ -959,7 +959,7 @@ static HRESULT WINAPI EnumTfLanguageProfiles_QueryInterface(IEnumTfLanguageProfi if (*ppvOut) { - IUnknown_AddRef(iface); + IEnumTfLanguageProfiles_AddRef(iface); return S_OK; } diff --git a/dlls/msctf/langbarmgr.c b/dlls/msctf/langbarmgr.c index 5e814a7..cf9e4a3 100644 --- a/dlls/msctf/langbarmgr.c +++ b/dlls/msctf/langbarmgr.c @@ -61,7 +61,7 @@ static HRESULT WINAPI LangBarMgr_QueryInterface(ITfLangBarMgr *iface, REFIID iid if (*ppvOut) { - IUnknown_AddRef(iface); + ITfLangBarMgr_AddRef(iface); return S_OK; } diff --git a/dlls/msctf/range.c b/dlls/msctf/range.c index 3412954..ae5129b 100644 --- a/dlls/msctf/range.c +++ b/dlls/msctf/range.c @@ -77,7 +77,7 @@ static HRESULT WINAPI Range_QueryInterface(ITfRange *iface, REFIID iid, LPVOID * if (*ppvOut) { - IUnknown_AddRef(iface); + ITfRange_AddRef(iface); return S_OK; } diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 8f409c3..a732730 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -203,7 +203,7 @@ static HRESULT WINAPI TextStoreACP_QueryInterface(ITextStoreACP *iface, REFIID i if (*ppvOut) { - IUnknown_AddRef(iface); + ITextStoreACP_AddRef(iface); return S_OK; } @@ -492,7 +492,7 @@ static HRESULT WINAPI ThreadMgrEventSink_QueryInterface(ITfThreadMgrEventSink *i if (*ppvOut) { - IUnknown_AddRef(iface); + ITfThreadMgrEventSink_AddRef(iface); return S_OK; } @@ -752,7 +752,7 @@ static HRESULT WINAPI TextService_QueryInterface(ITfTextInputProcessor *iface, R if (*ppvOut) { - IUnknown_AddRef(iface); + ITfTextInputProcessor_AddRef(iface); return S_OK; } @@ -1079,7 +1079,7 @@ static HRESULT WINAPI KeyEventSink_QueryInterface(ITfKeyEventSink *iface, REFIID if (*ppvOut) { - IUnknown_AddRef(iface); + ITfKeyEventSink_AddRef(iface); return S_OK; } @@ -1305,8 +1305,8 @@ static void test_EnumDocumentMgr(ITfThreadMgr *tm, ITfDocumentMgr *search, ITfDo static inline int check_context_refcount(ITfContext *iface) { - IUnknown_AddRef(iface); - return IUnknown_Release(iface); + ITfContext_AddRef(iface); + return ITfContext_Release(iface); } @@ -1341,7 +1341,7 @@ static HRESULT WINAPI TextEditSink_QueryInterface(ITfTextEditSink *iface, REFIID if (*ppvOut) { - IUnknown_AddRef(iface); + ITfTextEditSink_AddRef(iface); return S_OK; } @@ -1697,7 +1697,7 @@ static HRESULT WINAPI EditSession_QueryInterface(ITfEditSession *iface, REFIID i if (*ppvOut) { - IUnknown_AddRef(iface); + ITfEditSession_AddRef(iface); return S_OK; } diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index af3ebbf..5a18b39 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -279,7 +279,7 @@ static HRESULT WINAPI ThreadMgr_QueryInterface(ITfThreadMgr *iface, REFIID iid, if (*ppvOut) { - IUnknown_AddRef(iface); + ITfThreadMgr_AddRef(iface); return S_OK; } @@ -422,7 +422,7 @@ static HRESULT WINAPI ThreadMgr_SetFocus( ITfThreadMgr* iface, ITfDocumentMgr *p if (!pdimFocus) check = NULL; - else if (FAILED(IUnknown_QueryInterface(pdimFocus,&IID_ITfDocumentMgr,(LPVOID*) &check))) + else if (FAILED(ITfDocumentMgr_QueryInterface(pdimFocus,&IID_ITfDocumentMgr,(LPVOID*) &check))) return E_INVALIDARG; ITfThreadMgrEventSink_OnSetFocus((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, check, This->focus); @@ -724,7 +724,7 @@ static HRESULT WINAPI KeystrokeMgr_AdviseKeyEventSink(ITfKeystrokeMgr *iface, if (check != NULL) return CONNECT_E_ADVISELIMIT; - if (FAILED(IUnknown_QueryInterface(pSink,&IID_ITfKeyEventSink,(LPVOID*) &check))) + if (FAILED(ITfKeyEventSink_QueryInterface(pSink,&IID_ITfKeyEventSink,(LPVOID*) &check))) return E_INVALIDARG; set_textservice_sink(tid, &IID_ITfKeyEventSink, (IUnknown*)check); @@ -1333,7 +1333,7 @@ static HRESULT WINAPI EnumTfDocumentMgr_QueryInterface(IEnumTfDocumentMgrs *ifac if (*ppvOut) { - IUnknown_AddRef(iface); + IEnumTfDocumentMgrs_AddRef(iface); return S_OK; }

1 0

Nikolay Sivov : gameux: Call interface methods properly.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: fa4148d2ae70396c60c6f70b1542794377b79572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4148d2ae70396c60c6f70b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 19 19:41:52 2012 +0400 gameux: Call interface methods properly. --- dlls/gameux/gameexplorer.c | 2 +- dlls/gameux/gamestatistics.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 556bf36..1f51f12 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -376,7 +376,7 @@ static HRESULT GAMEUX_ParseGameDefinition( IXMLDOMElement_Release(nextElement); } - IXMLDOMElement_Release(nextNode); + IXMLDOMNode_Release(nextNode); } } while(hr == S_OK); diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 0116304..f069708 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -261,7 +261,7 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) SysFreeString(V_BSTR(&vValue)); if(SUCCEEDED(hr)) - hr = IXMLDOMElement_appendChild(categoryNode, statisticsNode, &statisticsNode); + hr = IXMLDOMNode_appendChild(categoryNode, statisticsNode, &statisticsNode); IXMLDOMElement_Release(statisticsElement); IXMLDOMNode_Release(statisticsNode);

1 0

Nikolay Sivov : amstream: Call interface methods properly.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: bd102b527690dd4e937021da82f6f68b3a6573d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd102b527690dd4e937021da8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 19 19:11:05 2012 +0400 amstream: Call interface methods properly. --- dlls/amstream/amstream.c | 6 +++--- dlls/amstream/audiodata.c | 2 +- dlls/amstream/mediastream.c | 4 ++-- dlls/amstream/tests/amstream.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index c61fcd0..293e2b9 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -87,8 +87,8 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_QueryInterface(IAMMultiMediaStream IsEqualGUID(riid, &IID_IMultiMediaStream) || IsEqualGUID(riid, &IID_IAMMultiMediaStream)) { - IUnknown_AddRef(iface); - *ppvObject = This; + IAMMultiMediaStream_AddRef(iface); + *ppvObject = iface; return S_OK; } @@ -306,7 +306,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilterGraph(IAMMultiMediaStream return E_POINTER; if (This->pFilterGraph) - return IFilterGraph_QueryInterface(This->pFilterGraph, &IID_IGraphBuilder, (void**)ppGraphBuilder); + return IGraphBuilder_QueryInterface(This->pFilterGraph, &IID_IGraphBuilder, (void**)ppGraphBuilder); else *ppGraphBuilder = NULL; diff --git a/dlls/amstream/audiodata.c b/dlls/amstream/audiodata.c index 7d3c38a..2bd57da 100644 --- a/dlls/amstream/audiodata.c +++ b/dlls/amstream/audiodata.c @@ -48,7 +48,7 @@ static HRESULT WINAPI IAudioDataImpl_QueryInterface(IAudioData *iface, REFIID ri IsEqualGUID(riid, &IID_IMemoryData) || IsEqualGUID(riid, &IID_IAudioData)) { - IUnknown_AddRef(iface); + IAudioData_AddRef(iface); *ret_iface = iface; return S_OK; } diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 6656bf7..295796b 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -60,8 +60,8 @@ static HRESULT WINAPI IDirectDrawMediaStreamImpl_QueryInterface(IDirectDrawMedia IsEqualGUID(riid, &IID_IMediaStream) || IsEqualGUID(riid, &IID_IDirectDrawMediaStream)) { - IUnknown_AddRef(iface); - *ppv = This; + IDirectDrawMediaStream_AddRef(iface); + *ppv = iface; return S_OK; } diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index ffc6fe0..06fb330 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -155,7 +155,7 @@ static void test_renderfile(void) error: if (pddsample) - IDirectDrawMediaSample_Release(pddsample); + IDirectDrawStreamSample_Release(pddsample); if (pddstream) IDirectDrawMediaStream_Release(pddstream); if (pvidstream) @@ -260,7 +260,7 @@ static void test_media_streams(void) } if (ddraw_sample) - IDirectDrawMediaSample_Release(ddraw_sample); + IDirectDrawStreamSample_Release(ddraw_sample); if (ddraw_stream) IDirectDrawMediaStream_Release(ddraw_stream); }

1 0

Marcus Meissner : hhctrl.ocx: Initialize ret on some error paths (Coverity) .
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: 2461466ba0689534081f51fe3fac7ec9cd84ee34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2461466ba0689534081f51fe3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Aug 18 11:55:52 2012 +0200 hhctrl.ocx: Initialize ret on some error paths (Coverity). --- dlls/hhctrl.ocx/chm.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 02931f4..6c2904d 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -326,7 +326,7 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) HH_WINTYPEW wintype; HRESULT hr; DWORD cbRead; - BOOL ret; + BOOL ret = FALSE; static const WCHAR null[] = {0}; static const WCHAR toc_extW[] = {'h','h','c',0}; @@ -357,8 +357,6 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) pszJump2 = ConvertChmString(info, &wintype.pszJump2); pszUrlJump1 = ConvertChmString(info, &wintype.pszUrlJump1); pszUrlJump2 = ConvertChmString(info, &wintype.pszUrlJump2); - - ret = SUCCEEDED(hr); } else { @@ -378,7 +376,6 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) wintype.dwExStyles = 0; wintype.nShowState = SW_SHOW; wintype.curNavType = HHWIN_NAVTYPE_TOC; - ret = TRUE; } /* merge the new data with any pre-existing HH_WINTYPE structure */ @@ -400,6 +397,7 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) heap_free(pszJump2); heap_free(pszUrlJump1); heap_free(pszUrlJump2); + ret = TRUE; done: if (pStream)

1 0

Marcus Meissner : qcap: Fixed another use-after free (Coverity).
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: 985d2ba18ed736423fb161985faf45adcc505b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=985d2ba18ed736423fb161985… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Aug 17 23:07:11 2012 +0200 qcap: Fixed another use-after free (Coverity). --- dlls/qcap/vfwcapture.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 7be59cc..227a671 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -793,11 +793,11 @@ VfwPin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) VfwPinImpl *This = (VfwPinImpl *)iface; hr = qcap_driver_get_format(This->driver_info, &pmt); - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr)) { hr = BasePinImpl_EnumMediaTypes(iface, ppEnum); + DeleteMediaType(pmt); + } TRACE("%p -- %x\n", This, hr); - DeleteMediaType(pmt); - return hr; }

1 0

Marcus Meissner : joy.cpl: Avoid uninitialized variable usage (Coverity).
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: f51b6e7847167c984234815842e1e17f72212504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f51b6e7847167c98423481584… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Aug 18 11:51:24 2012 +0200 joy.cpl: Avoid uninitialized variable usage (Coverity). --- dlls/joy.cpl/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 354dfd7..b84a0aa 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -289,6 +289,7 @@ static DWORD WINAPI input_thread(void *param) r.left = (TEST_AXIS_X + TEST_NEXT_AXIS_X*i + axes_pos[i][0]); r.top = (TEST_AXIS_Y + axes_pos[i][1]); + r.bottom = r.right = 0; /* unused */ MapDialogRect(data->graphics.hwnd, &r); SetWindowPos(data->graphics.axes[i], 0, r.left, r.top, 0, 0, SWP_NOZORDER | SWP_NOSIZE); @@ -549,6 +550,7 @@ static DWORD WINAPI ff_input_thread(void *param) r.left = FF_AXIS_X + state.lX; r.top = FF_AXIS_Y + state.lY; + r.right = r.bottom = 0; /* unused */ MapDialogRect(data->graphics.hwnd, &r); SetWindowPos(data->graphics.ff_axis, 0, r.left, r.top, 0, 0, SWP_NOZORDER | SWP_NOSIZE);

1 0

Marcus Meissner : winecfg: Fixed use-after-free (Coverity).
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: f1b4c331622d77e5bd33a1bef6d30ed4fe4c1b50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1b4c331622d77e5bd33a1bef… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Aug 17 20:53:43 2012 +0200 winecfg: Fixed use-after-free (Coverity). --- programs/winecfg/drivedetect.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/drivedetect.c b/programs/winecfg/drivedetect.c index 34b113e..b0d827d 100644 --- a/programs/winecfg/drivedetect.c +++ b/programs/winecfg/drivedetect.c @@ -287,7 +287,6 @@ static void ensure_drive_c_is_mapped(void) len = snprintf(NULL, 0, "%s/../drive_c", configdir); drive_c_dir = HeapAlloc(GetProcessHeap(), 0, len); snprintf(drive_c_dir, len, "%s/../drive_c", configdir); - HeapFree(GetProcessHeap(), 0, drive_c_dir); if (stat(drive_c_dir, &buf) == 0) { @@ -300,6 +299,7 @@ static void ensure_drive_c_is_mapped(void) { report_error(NO_DRIVE_C); } + HeapFree(GetProcessHeap(), 0, drive_c_dir); } int autodetect_drives(void)

1 0

Dmitry Timoshkov : gdi32: Make sure that pattern info is initialized before being used.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: c8d61899dbb3e8930881a212943d368e8390b8c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d61899dbb3e8930881a2129… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Aug 18 02:09:17 2012 +0900 gdi32: Make sure that pattern info is initialized before being used. --- dlls/gdi32/dibdrv/objects.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 4712dc1..98bbb91 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1897,9 +1897,6 @@ static BOOL select_pattern_brush( dibdrv_physdev *pdev, dib_brush *brush, BOOL * dib_info pattern; BOOL dither = (brush->dib.bit_count == 1); - if (pattern.bit_count == 1 && !pattern.color_table) - dither = FALSE; /* monochrome DDB pattern brushes don't get dithered */ - if (brush->pattern.info->bmiHeader.biClrUsed && brush->pattern.usage == DIB_PAL_COLORS) { copy_bitmapinfo( info, brush->pattern.info ); @@ -1912,6 +1909,9 @@ static BOOL select_pattern_brush( dibdrv_physdev *pdev, dib_brush *brush, BOOL * init_dib_info_from_bitmapinfo( &pattern, brush->pattern.info, brush->pattern.bits.ptr ); } + if (pattern.bit_count == 1 && !pattern.color_table) + dither = FALSE; /* monochrome DDB pattern brushes don't get dithered */ + if (pattern.bit_count == 1 && !pattern.color_table && (pdev->dib.bit_count != 1 || pdev->dib.color_table)) {

1 0