Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 12:47:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Code polishing

Browse source 
svn path=/trunk/; revision=42880
This commit is contained in:
Johannes Anderwald 2009-08-23 13:08:28 +00:00
parent 8e1d22f818
commit 612682d56c
1 changed files with 11 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

35
reactos/drivers/ksfilter/ks/unknown.c
View file

@ -29,7 +29,7 @@ typedef struct
CLSID m_ClassId; CLSID m_ClassId;
IUnknown* m_UnknownOuter; IUnknown* m_UnknownOuter;
}IBaseUnknownImpl; }CBaseUnknownImpl;
@ -40,7 +40,7 @@ INonDelegatedUnknown_fnQueryInterface(
IN REFIID refiid, IN REFIID refiid,
OUT PVOID* Output) OUT PVOID* Output)
{ {
IBaseUnknownImpl * This = (IBaseUnknownImpl*)CONTAINING_RECORD(iface, IBaseUnknownImpl, lpVtbl); CBaseUnknownImpl * This = (CBaseUnknownImpl*)CONTAINING_RECORD(iface, CBaseUnknownImpl, lpVtbl);
if (IsEqualGUIDAligned(refiid, &IID_IUnknown)) if (IsEqualGUIDAligned(refiid, &IID_IUnknown))
{ {
@ -56,7 +56,7 @@ NTAPI
INonDelegatedUnknown_fnAddRef( INonDelegatedUnknown_fnAddRef(
INonDelegatedUnknown * iface) INonDelegatedUnknown * iface)
{ {
IBaseUnknownImpl * This = (IBaseUnknownImpl*)CONTAINING_RECORD(iface, IBaseUnknownImpl, lpVtbl); CBaseUnknownImpl * This = (CBaseUnknownImpl*)CONTAINING_RECORD(iface, CBaseUnknownImpl, lpVtbl);
return InterlockedIncrement(&This->m_RefCount); return InterlockedIncrement(&This->m_RefCount);
} }
@ -66,7 +66,7 @@ NTAPI
INonDelegatedUnknown_fnRelease( INonDelegatedUnknown_fnRelease(
INonDelegatedUnknown * iface) INonDelegatedUnknown * iface)
{ {
IBaseUnknownImpl * This = (IBaseUnknownImpl*)CONTAINING_RECORD(iface, IBaseUnknownImpl, lpVtbl); CBaseUnknownImpl * This = (CBaseUnknownImpl*)CONTAINING_RECORD(iface, CBaseUnknownImpl, lpVtbl);
InterlockedDecrement(&This->m_RefCount); InterlockedDecrement(&This->m_RefCount);
@ -88,7 +88,7 @@ IIndirectedUnknown_fnQueryInterface(
IN REFIID refiid, IN REFIID refiid,
OUT PVOID* Output) OUT PVOID* Output)
{ {
IBaseUnknownImpl * This = (IBaseUnknownImpl*)CONTAINING_RECORD(iface, IBaseUnknownImpl, lpVtblIndirectedUnknown); CBaseUnknownImpl * This = (CBaseUnknownImpl*)CONTAINING_RECORD(iface, CBaseUnknownImpl, lpVtblIndirectedUnknown);
return This->m_UnknownOuter->lpVtbl->QueryInterface(This->m_UnknownOuter, refiid, Output); return This->m_UnknownOuter->lpVtbl->QueryInterface(This->m_UnknownOuter, refiid, Output);
} }
@ -98,7 +98,7 @@ NTAPI
IIndirectedUnknown_fnAddRef( IIndirectedUnknown_fnAddRef(
IIndirectedUnknown * iface) IIndirectedUnknown * iface)
{ {
IBaseUnknownImpl * This = (IBaseUnknownImpl*)CONTAINING_RECORD(iface, IBaseUnknownImpl, lpVtblIndirectedUnknown); CBaseUnknownImpl * This = (CBaseUnknownImpl*)CONTAINING_RECORD(iface, CBaseUnknownImpl, lpVtblIndirectedUnknown);
return This->m_UnknownOuter->lpVtbl->AddRef(This->m_UnknownOuter); return This->m_UnknownOuter->lpVtbl->AddRef(This->m_UnknownOuter);
} }
@ -108,7 +108,7 @@ NTAPI
IIndirectedUnknown_fnRelease( IIndirectedUnknown_fnRelease(
IIndirectedUnknown * iface) IIndirectedUnknown * iface)
{ {
IBaseUnknownImpl * This = (IBaseUnknownImpl*)CONTAINING_RECORD(iface, IBaseUnknownImpl, lpVtblIndirectedUnknown); CBaseUnknownImpl * This = (CBaseUnknownImpl*)CONTAINING_RECORD(iface, CBaseUnknownImpl, lpVtblIndirectedUnknown);
return This->m_UnknownOuter->lpVtbl->Release(This->m_UnknownOuter); return This->m_UnknownOuter->lpVtbl->Release(This->m_UnknownOuter);
} }
@ -121,9 +121,7 @@ static IIndirectedUnknownVtbl vt_IIndirectedUnknownVtbl =
}; };
// On x86, the function is named @__CBaseUnknown_ConstructorWithGUID@16 KS_DECL_CXX(CBaseUnknownImpl *) CBaseUnknown_ConstructorWithGUID(KS_THIS(CBaseUnknownImpl), const GUID *lpGUID, IUnknown * OuterUnknown)
// On non-x86, the function is named __CBaseUnknown_ConstructorWithGUID
KS_DECL_CXX(IBaseUnknownImpl *) CBaseUnknown_ConstructorWithGUID(KS_THIS(IBaseUnknownImpl), const GUID *lpGUID, IUnknown * OuterUnknown)
{ {
This->lpVtbl = &vt_INonDelegatedUnknownVtbl; This->lpVtbl = &vt_INonDelegatedUnknownVtbl;
@ -153,9 +151,7 @@ KS_DECL_CXX(IBaseUnknownImpl *) CBaseUnknown_ConstructorWithGUID(KS_THIS(IBaseUn
return This; return This;
} }
// On x86, the function is named @__CBaseUnknown_Constructor@12 KS_DECL_CXX(CBaseUnknownImpl *) CBaseUnknown_Constructor(KS_THIS(CBaseUnknownImpl), IUnknown * OuterUnknown)
// On non-x86, the function is named ___CBaseUnknown_Constructor
KS_DECL_CXX(IBaseUnknownImpl *) CBaseUnknown_Constructor(KS_THIS(IBaseUnknownImpl), IUnknown * OuterUnknown)
{ {
This->lpVtbl = &vt_INonDelegatedUnknownVtbl; This->lpVtbl = &vt_INonDelegatedUnknownVtbl;
@ -182,9 +178,7 @@ KS_DECL_CXX(IBaseUnknownImpl *) CBaseUnknown_Constructor(KS_THIS(IBaseUnknownImp
return This; return This;
} }
// On x86, the function is named @__CBaseUnknown_Destructor@12 KS_DECL_CXX(VOID) CBaseUnknown_Destructor(KS_THIS(CBaseUnknownImpl), IUnknown * OuterUnknown)
// On non-x86, the function is named __CBaseUnknown_Destructor
KS_DECL_CXX(IBaseUnknownImpl *) CBaseUnknown_Destructor(KS_THIS(IBaseUnknownImpl), IUnknown * OuterUnknown)
{ {
/* restore vtbl's */ /* restore vtbl's */
This->lpVtbl = &vt_INonDelegatedUnknownVtbl; This->lpVtbl = &vt_INonDelegatedUnknownVtbl;
@ -201,19 +195,12 @@ KS_DECL_CXX(IBaseUnknownImpl *) CBaseUnknown_Destructor(KS_THIS(IBaseUnknownImpl
/* use unknown from INonDelegatedUnknown */ /* use unknown from INonDelegatedUnknown */
This->m_UnknownOuter = (PUNKNOWN)&This->lpVtbl; This->m_UnknownOuter = (PUNKNOWN)&This->lpVtbl;
} }
/* return result */
return This;
} }
KS_DECL_CXX(IBaseUnknownImpl *) CBaseUnknown_DefaultDestructor(KS_THIS(IBaseUnknownImpl)) KS_DECL_CXX(VOID) CBaseUnknown_DefaultDestructor(KS_THIS(CBaseUnknownImpl))
{ {
/* restore vtbl's */ /* restore vtbl's */
This->lpVtbl = &vt_INonDelegatedUnknownVtbl; This->lpVtbl = &vt_INonDelegatedUnknownVtbl;
This->lpVtblIndirectedUnknown = &vt_IIndirectedUnknownVtbl; This->lpVtblIndirectedUnknown = &vt_IIndirectedUnknownVtbl;
/* return result */
return This;
} }