reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-29 14:40:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

msi: COM cleanup for the IEnumVARIANT iface.

Browse Source
This commit is contained in:
Michael Stefaniuc 2011-09-02 10:24:01 +02:00 committed by Alexandre Julliard
parent ccb05ceed9
commit f0be3d8139
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dlls/msi/automation.c
View File

@ -88,10 +88,7 @@ struct AutomationObject {
*/ */
typedef struct { typedef struct {
/* VTables */ IEnumVARIANT IEnumVARIANT_iface;
const IEnumVARIANTVtbl *lpVtbl;
/* Object reference count */
LONG ref; LONG ref;
/* Current position and pointer to AutomationObject that stores actual data */ /* Current position and pointer to AutomationObject that stores actual data */
@ -202,7 +199,7 @@ static HRESULT create_list_enumerator(IUnknown *pUnkOuter, LPVOID *ppObj, Automa
object = msi_alloc_zero( sizeof(ListEnumerator) ); object = msi_alloc_zero( sizeof(ListEnumerator) );
/* Set all the VTable references */ /* Set all the VTable references */
object->lpVtbl = &ListEnumerator_Vtbl; object->IEnumVARIANT_iface.lpVtbl = &ListEnumerator_Vtbl;
object->ref = 1; object->ref = 1;
/* Store data that was passed */ /* Store data that was passed */
@ -560,10 +557,16 @@ static const IProvideMultipleClassInfoVtbl AutomationObject_IProvideMultipleClas
* ListEnumerator methods * ListEnumerator methods
*/ */
/*** IUnknown methods ***/ static inline ListEnumerator *impl_from_IEnumVARIANT(IEnumVARIANT* iface)
static HRESULT WINAPI ListEnumerator_QueryInterface(IEnumVARIANT* iface, REFIID riid, void** ppvObject)
{ {
ListEnumerator *This = (ListEnumerator *)iface; return CONTAINING_RECORD(iface, ListEnumerator, IEnumVARIANT_iface);
}
/*** IUnknown methods ***/
static HRESULT WINAPI ListEnumerator_QueryInterface(IEnumVARIANT* iface, REFIID riid,
void** ppvObject)
{
ListEnumerator *This = impl_from_IEnumVARIANT(iface);
TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject);
@ -586,7 +589,7 @@ static HRESULT WINAPI ListEnumerator_QueryInterface(IEnumVARIANT* iface, REFIID
static ULONG WINAPI ListEnumerator_AddRef(IEnumVARIANT* iface) static ULONG WINAPI ListEnumerator_AddRef(IEnumVARIANT* iface)
{ {
ListEnumerator *This = (ListEnumerator *)iface; ListEnumerator *This = impl_from_IEnumVARIANT(iface);
TRACE("(%p/%p)\n", iface, This); TRACE("(%p/%p)\n", iface, This);
@ -595,7 +598,7 @@ static ULONG WINAPI ListEnumerator_AddRef(IEnumVARIANT* iface)
static ULONG WINAPI ListEnumerator_Release(IEnumVARIANT* iface) static ULONG WINAPI ListEnumerator_Release(IEnumVARIANT* iface)
{ {
ListEnumerator *This = (ListEnumerator *)iface; ListEnumerator *This = impl_from_IEnumVARIANT(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p/%p)\n", iface, This); TRACE("(%p/%p)\n", iface, This);
@ -611,9 +614,10 @@ static ULONG WINAPI ListEnumerator_Release(IEnumVARIANT* iface)
/* IEnumVARIANT methods */ /* IEnumVARIANT methods */
static HRESULT WINAPI ListEnumerator_Next(IEnumVARIANT* iface, ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) static HRESULT WINAPI ListEnumerator_Next(IEnumVARIANT* iface, ULONG celt, VARIANT* rgVar,
ULONG* pCeltFetched)
{ {
ListEnumerator *This = (ListEnumerator *)iface; ListEnumerator *This = impl_from_IEnumVARIANT(iface);
ListData *data = private_data(This->pObj); ListData *data = private_data(This->pObj);
ULONG idx, local; ULONG idx, local;
@ -640,7 +644,7 @@ static HRESULT WINAPI ListEnumerator_Next(IEnumVARIANT* iface, ULONG celt, VARIA
static HRESULT WINAPI ListEnumerator_Skip(IEnumVARIANT* iface, ULONG celt) static HRESULT WINAPI ListEnumerator_Skip(IEnumVARIANT* iface, ULONG celt)
{ {
ListEnumerator *This = (ListEnumerator *)iface; ListEnumerator *This = impl_from_IEnumVARIANT(iface);
ListData *data = private_data(This->pObj); ListData *data = private_data(This->pObj);
TRACE("(%p,%uld)\n", iface, celt); TRACE("(%p,%uld)\n", iface, celt);
@ -656,7 +660,7 @@ static HRESULT WINAPI ListEnumerator_Skip(IEnumVARIANT* iface, ULONG celt)
static HRESULT WINAPI ListEnumerator_Reset(IEnumVARIANT* iface) static HRESULT WINAPI ListEnumerator_Reset(IEnumVARIANT* iface)
{ {
ListEnumerator *This = (ListEnumerator *)iface; ListEnumerator *This = impl_from_IEnumVARIANT(iface);
TRACE("(%p)\n", iface); TRACE("(%p)\n", iface);
@ -666,7 +670,7 @@ static HRESULT WINAPI ListEnumerator_Reset(IEnumVARIANT* iface)
static HRESULT WINAPI ListEnumerator_Clone(IEnumVARIANT* iface, IEnumVARIANT **ppEnum) static HRESULT WINAPI ListEnumerator_Clone(IEnumVARIANT* iface, IEnumVARIANT **ppEnum)
{ {
ListEnumerator *This = (ListEnumerator *)iface; ListEnumerator *This = impl_from_IEnumVARIANT(iface);
HRESULT hr; HRESULT hr;
TRACE("(%p,%p)\n", iface, ppEnum); TRACE("(%p,%p)\n", iface, ppEnum);