msdmo: Remove a helper only used once.

This commit is contained in:
Nikolay Sivov 2015-04-22 23:06:35 +03:00 committed by Alexandre Julliard
parent e7548fc421
commit 65bf359d6f
1 changed files with 9 additions and 24 deletions

View File

@ -19,6 +19,8 @@
#include <stdarg.h>
#define COBJMACROS
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
@ -358,23 +360,6 @@ HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR name[])
return S_FALSE;
}
/**************************************************************************
* IEnumDMOImpl_Destructor
*/
static BOOL IEnumDMOImpl_Destructor(IEnumDMOImpl* This)
{
TRACE("%p\n", This);
if (This->hkey)
RegCloseKey(This->hkey);
HeapFree(GetProcessHeap(), 0, This->pInTypes);
HeapFree(GetProcessHeap(), 0, This->pOutTypes);
return TRUE;
}
/**************************************************************************
* IEnumDMO_Constructor
*/
@ -450,10 +435,7 @@ static HRESULT IEnumDMO_Constructor(
lerr:
if (FAILED(hr))
{
IEnumDMOImpl_Destructor(lpedmo);
HeapFree(GetProcessHeap(), 0, lpedmo);
}
IEnumDMO_Release(&lpedmo->IEnumDMO_iface);
else
{
TRACE("returning %p\n", lpedmo);
@ -489,7 +471,7 @@ static HRESULT WINAPI IEnumDMO_fnQueryInterface(IEnumDMO* iface, REFIID riid, vo
IsEqualIID(riid, &IID_IUnknown))
{
*ppvObj = iface;
IEnumDMO_fnAddRef(iface);
IEnumDMO_AddRef(iface);
}
return *ppvObj ? S_OK : E_NOINTERFACE;
@ -507,8 +489,11 @@ static ULONG WINAPI IEnumDMO_fnRelease(IEnumDMO * iface)
if (!refCount)
{
IEnumDMOImpl_Destructor(This);
HeapFree(GetProcessHeap(),0,This);
if (This->hkey)
RegCloseKey(This->hkey);
HeapFree(GetProcessHeap(), 0, This->pInTypes);
HeapFree(GetProcessHeap(), 0, This->pOutTypes);
HeapFree(GetProcessHeap(), 0, This);
}
return refCount;
}