Module: wine Branch: master Commit: 434b696c460b0d80ecac5fe41379b4def6245c43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=434b696c460b0d80ecac5fe413...
Author: Jacek Caban jacek@codeweavers.com Date: Tue Aug 28 11:10:56 2012 +0200
Fixed remaining wrong iface call helpers.
---
dlls/d3dx9_36/surface.c | 4 ++-- dlls/dxgi/device.c | 2 +- dlls/explorerframe/tests/nstc.c | 2 +- dlls/mshtml/tests/script.c | 4 +++- dlls/wbemprox/tests/services.c | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 1cf77b0..56e6b8e 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -622,7 +622,7 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D IWICImagingFactory_CreateStream(factory, &stream); IWICStream_InitializeFromMemory(stream, (BYTE*)data, datasize); hr = IWICImagingFactory_CreateDecoderFromStream(factory, (IStream*)stream, NULL, 0, &decoder); - IStream_Release(stream); + IWICStream_Release(stream); IWICImagingFactory_Release(factory); }
@@ -912,7 +912,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface,
hr = IWICImagingFactory_CreateDecoderFromStream(factory, (IStream*)stream, NULL, 0, &decoder);
- IStream_Release(stream); + IWICStream_Release(stream); IWICImagingFactory_Release(factory);
if (FAILED(hr)) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 79a757b..7bbc5e0 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -122,7 +122,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetParent(IWineDXGIDevice *iface, R
TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent);
- hr = IDXGIDevice_GetAdapter(iface, &adapter); + hr = IWineDXGIDevice_GetAdapter(iface, &adapter); if (FAILED(hr)) { ERR("Failed to get adapter, hr %#x.\n", hr); diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 59654ac..6287078 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -754,7 +754,7 @@ static void verify_root_order_(INameSpaceTreeControl *pnstc, IShellItem **roots, IShellItem_Release(psi); } } - IShellItem_Release(psia); + IShellItemArray_Release(psia); } } #define verify_root_order(pnstc, psi_a) \ diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index dcad5f7..b5bd91b 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -50,12 +50,14 @@ const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY = #define CTXARG_T DWORDLONG #define IActiveScriptParseVtbl IActiveScriptParse64Vtbl #define IActiveScriptParseProcedure2Vtbl IActiveScriptParseProcedure2_64Vtbl +#define IActiveScriptSiteDebug_Release IActiveScriptSiteDebug64_Release
#else
#define CTXARG_T DWORD #define IActiveScriptParseVtbl IActiveScriptParse32Vtbl #define IActiveScriptParseProcedure2Vtbl IActiveScriptParseProcedure2_32Vtbl +#define IActiveScriptSiteDebug_Release IActiveScriptSiteDebug32_Release
#endif
@@ -2366,7 +2368,7 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc hres = IActiveScriptSite_QueryInterface(pass, &IID_IActiveScriptSiteDebug, (void**)&debug); ok(hres == S_OK, "Could not get IActiveScriptSiteDebug interface: %08x\n", hres); if(SUCCEEDED(hres)) - IActiveScriptSiteDebug32_Release(debug); + IActiveScriptSiteDebug_Release(debug);
hres = IActiveScriptSite_QueryInterface(pass, &IID_ICanHandleException, (void**)&canexpection); ok(hres == E_NOINTERFACE, "Could not get IID_ICanHandleException interface: %08x\n", hres); diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index ff798a3..5d659b1 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -77,7 +77,7 @@ static void test_IClientSecurity(void) refs = IWbemServices_Release( services ); todo_wine ok( refs == 1, "unexpected refcount %u\n", refs );
- refs = IWbemServices_Release( security ); + refs = IClientSecurity_Release( security ); todo_wine ok( refs == 0, "unexpected refcount %u\n", refs );
IWbemLocator_Release( locator );