wine-commits August 2012

wine-commits@winehq.org

2 participants
541 discussions

Nikolay Sivov : qcap: Call interface methods properly.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 1bd91a4fd2f4a12e6c8ba5bbe48bdfbd72a1a3b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd91a4fd2f4a12e6c8ba5bbe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 19 22:21:46 2012 +0400 qcap: Call interface methods properly. --- dlls/qcap/capturegraph.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index aa5c0a4..fd619aa 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -184,7 +184,7 @@ fnCaptureGraphBuilder2_SetFilterGraph(ICaptureGraphBuilder2 * iface, This->mygraph = pfg; IGraphBuilder_AddRef(This->mygraph); - if (SUCCEEDED(IUnknown_QueryInterface(This->mygraph, + if (SUCCEEDED(IGraphBuilder_QueryInterface(This->mygraph, &IID_IMediaEvent, (LPVOID *)&pmev))) { IMediaEvent_CancelDefaultHandling(pmev, EC_REPAINT); @@ -290,7 +290,7 @@ fnCaptureGraphBuilder2_RenderStream(ICaptureGraphBuilder2 * iface, } /* Uses 'Intelligent Connect', so Connect, not ConnectDirect here */ - hr = IFilterGraph2_Connect(This->mygraph, pin_in, pin_out); + hr = IGraphBuilder_Connect(This->mygraph, pin_in, pin_out); IPin_Release(pin_in); IPin_Release(pin_out); return hr; @@ -474,7 +474,7 @@ fnCaptureGraphBuilder_QueryInterface(ICaptureGraphBuilder * iface, { CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder(iface); TRACE("%p --> Forwarding to v2 (%p)\n", iface, This); - return IUnknown_QueryInterface(&This->ICaptureGraphBuilder2_iface, riid, ppv); + return ICaptureGraphBuilder2_QueryInterface(&This->ICaptureGraphBuilder2_iface, riid, ppv); } static ULONG WINAPI @@ -482,7 +482,7 @@ fnCaptureGraphBuilder_AddRef(ICaptureGraphBuilder * iface) { CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder(iface); TRACE("%p --> Forwarding to v2 (%p)\n", iface, This); - return IUnknown_AddRef(&This->ICaptureGraphBuilder2_iface); + return ICaptureGraphBuilder2_AddRef(&This->ICaptureGraphBuilder2_iface); } static ULONG WINAPI @@ -490,7 +490,7 @@ fnCaptureGraphBuilder_Release(ICaptureGraphBuilder * iface) { CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder(iface); TRACE("%p --> Forwarding to v2 (%p)\n", iface, This); - return IUnknown_Release(&This->ICaptureGraphBuilder2_iface); + return ICaptureGraphBuilder2_Release(&This->ICaptureGraphBuilder2_iface); } static HRESULT WINAPI

1 0

Nikolay Sivov : mstask: Call interface methods properly.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: b92ea61e71716d6f7facadf328b049fdf9ea4b68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b92ea61e71716d6f7facadf32… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 19 22:11:15 2012 +0400 mstask: Call interface methods properly. --- dlls/mstask/factory.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/mstask/factory.c b/dlls/mstask/factory.c index 9dc1e29..f85a5f9 100644 --- a/dlls/mstask/factory.c +++ b/dlls/mstask/factory.c @@ -56,14 +56,14 @@ static HRESULT WINAPI MSTASK_IClassFactory_QueryInterface( return E_NOINTERFACE; } -static ULONG WINAPI MSTASK_IClassFactory_AddRef(LPCLASSFACTORY iface) +static ULONG WINAPI MSTASK_IClassFactory_AddRef(IClassFactory *face) { TRACE("\n"); InterlockedIncrement(&dll_ref); return 2; } -static ULONG WINAPI MSTASK_IClassFactory_Release(LPCLASSFACTORY iface) +static ULONG WINAPI MSTASK_IClassFactory_Release(IClassFactory *iface) { TRACE("\n"); InterlockedDecrement(&dll_ref); @@ -71,8 +71,8 @@ static ULONG WINAPI MSTASK_IClassFactory_Release(LPCLASSFACTORY iface) } static HRESULT WINAPI MSTASK_IClassFactory_CreateInstance( - LPCLASSFACTORY iface, - LPUNKNOWN pUnkOuter, + IClassFactory *iface, + IUnknown *pUnkOuter, REFIID riid, LPVOID *ppvObj) { @@ -89,21 +89,21 @@ static HRESULT WINAPI MSTASK_IClassFactory_CreateInstance( if (FAILED(res)) return res; - res = ITaskScheduler_QueryInterface(punk, riid, ppvObj); - ITaskScheduler_Release(punk); + res = IUnknown_QueryInterface(punk, riid, ppvObj); + IUnknown_Release(punk); return res; } static HRESULT WINAPI MSTASK_IClassFactory_LockServer( - LPCLASSFACTORY iface, + IClassFactory *iface, BOOL fLock) { TRACE("\n"); - if (fLock != FALSE) - MSTASK_IClassFactory_AddRef(iface); + if (fLock) + IClassFactory_AddRef(iface); else - MSTASK_IClassFactory_Release(iface); + IClassFactory_Release(iface); return S_OK; }

1 0

Nikolay Sivov : msctf: Call interface methods properly.
by Alexandre Julliard 20 Aug '12

20 Aug '12

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 : mscoree: Call interface methods properly.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: de37c1d57f43d7d56da59091c93971808e5fa80a URL: http://source.winehq.org/git/wine.git/?a=commit;h=de37c1d57f43d7d56da59091c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 19 21:50:52 2012 +0400 mscoree: Call interface methods properly. --- dlls/mscoree/cordebug.c | 4 ++-- dlls/mscoree/corruntimehost.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/cordebug.c b/dlls/mscoree/cordebug.c index da06f49..1a62e14 100644 --- a/dlls/mscoree/cordebug.c +++ b/dlls/mscoree/cordebug.c @@ -88,7 +88,7 @@ static HRESULT WINAPI cordebugprocess_QueryInterface(ICorDebugProcess *iface, return E_NOINTERFACE; } - ICorDebug_AddRef(iface); + ICorDebugProcess_AddRef(iface); return S_OK; } @@ -458,7 +458,7 @@ static HRESULT WINAPI process_enum_QueryInterface(ICorDebugProcessEnum *iface, R return E_NOINTERFACE; } - ICorDebug_AddRef(iface); + ICorDebugProcessEnum_AddRef(iface); return S_OK; } diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 0262757..b5ee842 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -941,7 +941,7 @@ static void CDECL ReallyFixupVTable(struct dll_fixup *fixup) } if (info != NULL) - ICLRRuntimeHost_Release(info); + ICLRRuntimeInfo_Release(info); HeapFree(GetProcessHeap(), 0, filenameA);

1 0

Nikolay Sivov : mlang: Call interface methods properly.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 64e94c22c9648c5ac2a604602cb33ef85cf4933d URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e94c22c9648c5ac2a604602… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 19 19:55:54 2012 +0400 mlang: Call interface methods properly. --- dlls/mlang/mlang.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 2c6e6f7..775a723 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2883,7 +2883,7 @@ static HRESULT WINAPI fnIMultiLanguage2_GetLcidFromRfc1766( if (!pLocale || !bstrRfc1766) return E_INVALIDARG; - hr = IMultiLanguage2_EnumRfc1766(iface, 0, &rfc1766); + hr = IMultiLanguage3_EnumRfc1766(iface, 0, &rfc1766); if (FAILED(hr)) return hr; @@ -3094,7 +3094,7 @@ static HRESULT WINAPI fnIMultiLanguage2_ValidateCodePage( UINT uiCodePage, HWND hwnd) { - return IMultiLanguage2_ValidateCodePageEx(iface,uiCodePage,hwnd,0); + return IMultiLanguage3_ValidateCodePageEx(iface,uiCodePage,hwnd,0); } static HRESULT WINAPI fnIMultiLanguage2_GetCodePageDescription( @@ -3132,7 +3132,7 @@ static HRESULT WINAPI fnIMultiLanguage2_IsCodePageInstallable( TRACE("%u\n", uiCodePage); /* FIXME: the installable set is usually larger than the set of valid codepages */ - return IMultiLanguage2_ValidateCodePageEx(iface, uiCodePage, NULL, CPIOD_PEEK); + return IMultiLanguage3_ValidateCodePageEx(iface, uiCodePage, NULL, CPIOD_PEEK); } static HRESULT WINAPI fnIMultiLanguage2_SetMimeDBSource(

1 0

Nikolay Sivov : mciqtz: Call interface methods properly.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 7f4d634e80dd30859b750ca04d19bb244e276174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f4d634e80dd30859b750ca04… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 19 19:53:45 2012 +0400 mciqtz: Call interface methods properly. --- dlls/mciqtz32/mciqtz.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index b05e681..546f3ed 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -241,13 +241,13 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, err: if (wma->vidbasic) - IUnknown_Release(wma->vidbasic); + IBasicVideo_Release(wma->vidbasic); wma->vidbasic = NULL; if (wma->seek) - IUnknown_Release(wma->seek); + IMediaSeeking_Release(wma->seek); wma->seek = NULL; if (wma->vidwin) - IUnknown_Release(wma->vidwin); + IVideoWindow_Release(wma->vidwin); wma->vidwin = NULL; if (wma->pgraph) IGraphBuilder_Release(wma->pgraph); @@ -282,9 +282,9 @@ static DWORD MCIQTZ_mciClose(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP MCIQTZ_mciStop(wDevID, MCI_WAIT, NULL); if (wma->opened) { - IUnknown_Release(wma->vidwin); - IUnknown_Release(wma->vidbasic); - IUnknown_Release(wma->seek); + IVideoWindow_Release(wma->vidwin); + IBasicVideo_Release(wma->vidbasic); + IMediaSeeking_Release(wma->seek); IMediaEvent_Release(wma->mevent); IGraphBuilder_Release(wma->pgraph); IMediaControl_Release(wma->pmctrl);

1 0

Nikolay Sivov : itss: Call interface methods properly.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 316ca9edacfb56bfa2d8157de99e3929f1446312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=316ca9edacfb56bfa2d8157de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 19 19:48:22 2012 +0400 itss: Call interface methods properly. --- dlls/itss/itss.c | 4 ++-- dlls/itss/moniker.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c index fc2eb37..94687d8 100644 --- a/dlls/itss/itss.c +++ b/dlls/itss/itss.c @@ -196,8 +196,8 @@ static HRESULT WINAPI ITStorageImpl_QueryInterface( if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IITStorage)) { - IClassFactory_AddRef(iface); - *ppvObject = This; + IITStorage_AddRef(iface); + *ppvObject = iface; return S_OK; } diff --git a/dlls/itss/moniker.c b/dlls/itss/moniker.c index 02edd49..dedf4e5 100644 --- a/dlls/itss/moniker.c +++ b/dlls/itss/moniker.c @@ -65,8 +65,8 @@ static HRESULT WINAPI ITS_IMonikerImpl_QueryInterface( if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IParseDisplayName)) { - IClassFactory_AddRef(iface); - *ppvObject = This; + IMoniker_AddRef(iface); + *ppvObject = iface; return S_OK; } @@ -395,8 +395,8 @@ static HRESULT WINAPI ITS_IParseDisplayNameImpl_QueryInterface( if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IParseDisplayName)) { - IClassFactory_AddRef(iface); - *ppvObject = This; + IParseDisplayName_AddRef(iface); + *ppvObject = iface; return S_OK; }

1 0

Nikolay Sivov : gameux: Call interface methods properly.
by Alexandre Julliard 20 Aug '12

20 Aug '12

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 : comctl32: Call interface methods properly.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 21897a96892c49e45271dd88dd4c5ca9ccc0fd5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=21897a96892c49e45271dd88d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 19 19:19:41 2012 +0400 comctl32: Call interface methods properly. --- dlls/comctl32/imagelist.c | 6 +++--- dlls/comctl32/tests/imagelist.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 4d18597..6142ba7 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3366,7 +3366,7 @@ static HRESULT WINAPI ImageListImpl_Copy(IImageList *iface, int iDst, return E_FAIL; /* TODO: Add test for IID_ImageList2 too */ - if (FAILED(IImageList_QueryInterface(punkSrc, &IID_IImageList, + if (FAILED(IUnknown_QueryInterface(punkSrc, &IID_IImageList, (void **) &src))) return E_FAIL; @@ -3390,7 +3390,7 @@ static HRESULT WINAPI ImageListImpl_Merge(IImageList *iface, int i1, TRACE("(%p)->(%d %p %d %d %d %s %p)\n", iface, i1, punk2, i2, dx, dy, debugstr_guid(riid), ppv); /* TODO: Add test for IID_ImageList2 too */ - if (FAILED(IImageList_QueryInterface(punk2, &IID_IImageList, + if (FAILED(IUnknown_QueryInterface(punk2, &IID_IImageList, (void **) &iml2))) return E_FAIL; @@ -3523,7 +3523,7 @@ static HRESULT WINAPI ImageListImpl_SetDragCursorImage(IImageList *iface, return E_FAIL; /* TODO: Add test for IID_ImageList2 too */ - if (FAILED(IImageList_QueryInterface(punk, &IID_IImageList, + if (FAILED(IUnknown_QueryInterface(punk, &IID_IImageList, (void **) &iml2))) return E_FAIL; diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 2e316f7..98b84a6 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1423,7 +1423,7 @@ static void test_iimagelist(void) /* test reference counting on destruction */ imgl = (IImageList*)createImageList(32, 32); - ret = IUnknown_AddRef(imgl); + ret = IImageList_AddRef(imgl); ok(ret == 2, "Expected 2, got %d\n", ret); ret = ImageList_Destroy((HIMAGELIST)imgl); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -1433,7 +1433,7 @@ static void test_iimagelist(void) ok(ret == FALSE, "Expected FALSE, got %d\n", ret); imgl = (IImageList*)createImageList(32, 32); - ret = IUnknown_AddRef(imgl); + ret = IImageList_AddRef(imgl); ok(ret == 2, "Expected 2, got %d\n", ret); ret = ImageList_Destroy((HIMAGELIST)imgl); ok(ret == TRUE, "Expected TRUE, got %d\n", ret);

1 0

Nikolay Sivov : browseui: Call interface methods properly.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: ab5c3ad8dafd6a8fd7ad3ea38bfb4cb6e5ada1bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab5c3ad8dafd6a8fd7ad3ea38… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 19 19:15:15 2012 +0400 browseui: Call interface methods properly. --- dlls/browseui/aclmulti.c | 2 +- dlls/browseui/aclsource.c | 2 +- dlls/browseui/progressdlg.c | 2 +- dlls/browseui/tests/progressdlg.c | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c index 0ca6758..bfb200c 100644 --- a/dlls/browseui/aclmulti.c +++ b/dlls/browseui/aclmulti.c @@ -113,7 +113,7 @@ static HRESULT WINAPI ACLMulti_QueryInterface(IEnumString *iface, REFIID iid, LP if (*ppvOut) { - IUnknown_AddRef(iface); + IEnumString_AddRef(iface); return S_OK; } diff --git a/dlls/browseui/aclsource.c b/dlls/browseui/aclsource.c index c151878..8b3530f 100644 --- a/dlls/browseui/aclsource.c +++ b/dlls/browseui/aclsource.c @@ -72,7 +72,7 @@ static HRESULT WINAPI ACLShellSource_QueryInterface(IACList2 *iface, REFIID iid, if (*ppvOut) { - IUnknown_AddRef(iface); + IACList2_AddRef(iface); return S_OK; } diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index e91d9cb..7d478cc 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -291,7 +291,7 @@ static HRESULT WINAPI ProgressDialog_QueryInterface(IProgressDialog *iface, REFI if (*ppvOut) { - IUnknown_AddRef(iface); + IProgressDialog_AddRef(iface); return S_OK; } diff --git a/dlls/browseui/tests/progressdlg.c b/dlls/browseui/tests/progressdlg.c index e4d0e2f..2203714 100644 --- a/dlls/browseui/tests/progressdlg.c +++ b/dlls/browseui/tests/progressdlg.c @@ -39,19 +39,19 @@ static void test_IProgressDialog_QueryInterface(void) return; } - hr = IUnknown_QueryInterface(dlg, &IID_IUnknown, NULL); + hr = IProgressDialog_QueryInterface(dlg, &IID_IUnknown, NULL); ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr); - hr = IUnknown_QueryInterface(dlg, &IID_IUnknown, (void**)&unk); + hr = IProgressDialog_QueryInterface(dlg, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface (IUnknown) returned 0x%x\n", hr); if (SUCCEEDED(hr)) { IUnknown_Release(unk); } - hr = IUnknown_QueryInterface(dlg, &IID_IOleWindow, (void**)&olewindow); + hr = IProgressDialog_QueryInterface(dlg, &IID_IOleWindow, (void**)&olewindow); ok(hr == S_OK, "QueryInterface (IOleWindow) returned 0x%x\n", hr); if (SUCCEEDED(hr)) { - hr = IUnknown_QueryInterface(olewindow, &IID_IProgressDialog, (void**)&dlg2); + hr = IOleWindow_QueryInterface(olewindow, &IID_IProgressDialog, (void**)&dlg2); ok(hr == S_OK, "QueryInterface (IProgressDialog) returned 0x%x\n", hr); if (SUCCEEDED(hr)) { IProgressDialog_Release(dlg2);

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2012