Commit 39a696a1 authored by Alexandre Julliard's avatar Alexandre Julliard

Removed some uses of the non-standard ICOM_THIS macro.

parent 5512ae26
...@@ -58,7 +58,7 @@ HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) ...@@ -58,7 +58,7 @@ HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj)
/*** IUnknown methods ***/ /*** IUnknown methods ***/
static HRESULT WINAPI IAMMultiMediaStreamImpl_QueryInterface(IAMMultiMediaStream* iface, REFIID riid, void** ppvObject) static HRESULT WINAPI IAMMultiMediaStreamImpl_QueryInterface(IAMMultiMediaStream* iface, REFIID riid, void** ppvObject)
{ {
ICOM_THIS(IAMMultiMediaStreamImpl, iface); IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface;
FIXME("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); FIXME("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject);
...@@ -76,7 +76,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_QueryInterface(IAMMultiMediaStream ...@@ -76,7 +76,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_QueryInterface(IAMMultiMediaStream
static ULONG WINAPI IAMMultiMediaStreamImpl_AddRef(IAMMultiMediaStream* iface) static ULONG WINAPI IAMMultiMediaStreamImpl_AddRef(IAMMultiMediaStream* iface)
{ {
ICOM_THIS(IAMMultiMediaStreamImpl, iface); IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface;
FIXME("(%p/%p)\n", iface, This); FIXME("(%p/%p)\n", iface, This);
...@@ -86,7 +86,7 @@ static ULONG WINAPI IAMMultiMediaStreamImpl_AddRef(IAMMultiMediaStream* iface) ...@@ -86,7 +86,7 @@ static ULONG WINAPI IAMMultiMediaStreamImpl_AddRef(IAMMultiMediaStream* iface)
static ULONG WINAPI IAMMultiMediaStreamImpl_Release(IAMMultiMediaStream* iface) static ULONG WINAPI IAMMultiMediaStreamImpl_Release(IAMMultiMediaStream* iface)
{ {
ICOM_THIS(IAMMultiMediaStreamImpl, iface); IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface;
FIXME("(%p/%p)\n", iface, This); FIXME("(%p/%p)\n", iface, This);
...@@ -99,7 +99,7 @@ static ULONG WINAPI IAMMultiMediaStreamImpl_Release(IAMMultiMediaStream* iface) ...@@ -99,7 +99,7 @@ static ULONG WINAPI IAMMultiMediaStreamImpl_Release(IAMMultiMediaStream* iface)
/*** IMultiMediaStream methods ***/ /*** IMultiMediaStream methods ***/
static HRESULT WINAPI IAMMultiMediaStreamImpl_GetInformation(IAMMultiMediaStream* iface, char* pdwFlags, STREAM_TYPE* pStreamType) static HRESULT WINAPI IAMMultiMediaStreamImpl_GetInformation(IAMMultiMediaStream* iface, char* pdwFlags, STREAM_TYPE* pStreamType)
{ {
ICOM_THIS(IAMMultiMediaStreamImpl, iface); IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface;
FIXME("(%p/%p)->(%p,%p) stub!\n", This, iface, pdwFlags, pStreamType); FIXME("(%p/%p)->(%p,%p) stub!\n", This, iface, pdwFlags, pStreamType);
...@@ -108,7 +108,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetInformation(IAMMultiMediaStream ...@@ -108,7 +108,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetInformation(IAMMultiMediaStream
static HRESULT WINAPI IAMMultiMediaStreamImpl_GetMediaStream(IAMMultiMediaStream* iface, REFMSPID idPurpose, IMediaStream** ppMediaStream) static HRESULT WINAPI IAMMultiMediaStreamImpl_GetMediaStream(IAMMultiMediaStream* iface, REFMSPID idPurpose, IMediaStream** ppMediaStream)
{ {
ICOM_THIS(IAMMultiMediaStreamImpl, iface); IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface;
FIXME("(%p/%p)->(%p,%p) stub!\n", This, iface, idPurpose, ppMediaStream); FIXME("(%p/%p)->(%p,%p) stub!\n", This, iface, idPurpose, ppMediaStream);
...@@ -117,7 +117,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetMediaStream(IAMMultiMediaStream ...@@ -117,7 +117,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetMediaStream(IAMMultiMediaStream
static HRESULT WINAPI IAMMultiMediaStreamImpl_EnumMediaStreams(IAMMultiMediaStream* iface, long Index, IMediaStream** ppMediaStream) static HRESULT WINAPI IAMMultiMediaStreamImpl_EnumMediaStreams(IAMMultiMediaStream* iface, long Index, IMediaStream** ppMediaStream)
{ {
ICOM_THIS(IAMMultiMediaStreamImpl, iface); IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface;
FIXME("(%p/%p)->(%ld,%p) stub!\n", This, iface, Index, ppMediaStream); FIXME("(%p/%p)->(%ld,%p) stub!\n", This, iface, Index, ppMediaStream);
...@@ -126,7 +126,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_EnumMediaStreams(IAMMultiMediaStre ...@@ -126,7 +126,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_EnumMediaStreams(IAMMultiMediaStre
static HRESULT WINAPI IAMMultiMediaStreamImpl_GetState(IAMMultiMediaStream* iface, STREAM_STATE* pCurrentState) static HRESULT WINAPI IAMMultiMediaStreamImpl_GetState(IAMMultiMediaStream* iface, STREAM_STATE* pCurrentState)
{ {
ICOM_THIS(IAMMultiMediaStreamImpl, iface); IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface;
FIXME("(%p/%p)->(%p) stub!\n", This, iface, pCurrentState); FIXME("(%p/%p)->(%p) stub!\n", This, iface, pCurrentState);
...@@ -135,7 +135,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetState(IAMMultiMediaStream* ifac ...@@ -135,7 +135,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetState(IAMMultiMediaStream* ifac
static HRESULT WINAPI IAMMultiMediaStreamImpl_SetState(IAMMultiMediaStream* iface, STREAM_STATE NewState) static HRESULT WINAPI IAMMultiMediaStreamImpl_SetState(IAMMultiMediaStream* iface, STREAM_STATE NewState)
{ {
ICOM_THIS(IAMMultiMediaStreamImpl, iface); IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface;
FIXME("(%p/%p)->() stub!\n", This, iface); FIXME("(%p/%p)->() stub!\n", This, iface);
...@@ -144,7 +144,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_SetState(IAMMultiMediaStream* ifac ...@@ -144,7 +144,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_SetState(IAMMultiMediaStream* ifac
static HRESULT WINAPI IAMMultiMediaStreamImpl_GetTime(IAMMultiMediaStream* iface, STREAM_TIME* pCurrentTime) static HRESULT WINAPI IAMMultiMediaStreamImpl_GetTime(IAMMultiMediaStream* iface, STREAM_TIME* pCurrentTime)
{ {
ICOM_THIS(IAMMultiMediaStreamImpl, iface); IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface;
FIXME("(%p/%p)->(%p) stub!\n", This, iface, pCurrentTime); FIXME("(%p/%p)->(%p) stub!\n", This, iface, pCurrentTime);
...@@ -153,7 +153,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetTime(IAMMultiMediaStream* iface ...@@ -153,7 +153,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetTime(IAMMultiMediaStream* iface
static HRESULT WINAPI IAMMultiMediaStreamImpl_GetDuration(IAMMultiMediaStream* iface, STREAM_TIME* pDuration) static HRESULT WINAPI IAMMultiMediaStreamImpl_GetDuration(IAMMultiMediaStream* iface, STREAM_TIME* pDuration)
{ {
ICOM_THIS(IAMMultiMediaStreamImpl, iface); IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface;
FIXME("(%p/%p)->(%p) stub!\n", This, iface, pDuration); FIXME("(%p/%p)->(%p) stub!\n", This, iface, pDuration);
...@@ -162,7 +162,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetDuration(IAMMultiMediaStream* i ...@@ -162,7 +162,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetDuration(IAMMultiMediaStream* i
static HRESULT WINAPI IAMMultiMediaStreamImpl_Seek(IAMMultiMediaStream* iface, STREAM_TIME SeekTime) static HRESULT WINAPI IAMMultiMediaStreamImpl_Seek(IAMMultiMediaStream* iface, STREAM_TIME SeekTime)
{ {
ICOM_THIS(IAMMultiMediaStreamImpl, iface); IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface;
FIXME("(%p/%p)->() stub!\n", This, iface); FIXME("(%p/%p)->() stub!\n", This, iface);
...@@ -171,7 +171,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Seek(IAMMultiMediaStream* iface, S ...@@ -171,7 +171,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Seek(IAMMultiMediaStream* iface, S
static HRESULT WINAPI IAMMultiMediaStreamImpl_GetEndOfStream(IAMMultiMediaStream* iface, HANDLE* phEOS) static HRESULT WINAPI IAMMultiMediaStreamImpl_GetEndOfStream(IAMMultiMediaStream* iface, HANDLE* phEOS)
{ {
ICOM_THIS(IAMMultiMediaStreamImpl, iface); IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface;
FIXME("(%p/%p)->(%p) stub!\n", This, iface, phEOS); FIXME("(%p/%p)->(%p) stub!\n", This, iface, phEOS);
...@@ -181,7 +181,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetEndOfStream(IAMMultiMediaStream ...@@ -181,7 +181,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetEndOfStream(IAMMultiMediaStream
/*** IAMMultiMediaStream methods ***/ /*** IAMMultiMediaStream methods ***/
static HRESULT WINAPI IAMMultiMediaStreamImpl_Initialize(IAMMultiMediaStream* iface, STREAM_TYPE StreamType, DWORD dwFlags, IGraphBuilder* pFilterGraph) static HRESULT WINAPI IAMMultiMediaStreamImpl_Initialize(IAMMultiMediaStream* iface, STREAM_TYPE StreamType, DWORD dwFlags, IGraphBuilder* pFilterGraph)
{ {
ICOM_THIS(IAMMultiMediaStreamImpl, iface); IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface;
FIXME("(%p/%p)->(%lx,%lx,%p) stub!\n", This, iface, (DWORD)StreamType, dwFlags, pFilterGraph); FIXME("(%p/%p)->(%lx,%lx,%p) stub!\n", This, iface, (DWORD)StreamType, dwFlags, pFilterGraph);
...@@ -190,7 +190,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Initialize(IAMMultiMediaStream* if ...@@ -190,7 +190,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Initialize(IAMMultiMediaStream* if
static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilterGraph(IAMMultiMediaStream* iface, IGraphBuilder** ppGraphBuilder) static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilterGraph(IAMMultiMediaStream* iface, IGraphBuilder** ppGraphBuilder)
{ {
ICOM_THIS(IAMMultiMediaStreamImpl, iface); IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface;
FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppGraphBuilder); FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppGraphBuilder);
...@@ -199,7 +199,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilterGraph(IAMMultiMediaStream ...@@ -199,7 +199,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilterGraph(IAMMultiMediaStream
static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilter(IAMMultiMediaStream* iface, IMediaStreamFilter** ppFilter) static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilter(IAMMultiMediaStream* iface, IMediaStreamFilter** ppFilter)
{ {
ICOM_THIS(IAMMultiMediaStreamImpl, iface); IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface;
FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppFilter); FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppFilter);
...@@ -209,7 +209,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilter(IAMMultiMediaStream* ifa ...@@ -209,7 +209,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilter(IAMMultiMediaStream* ifa
static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream* iface, IUnknown* pStreamObject, const MSPID* PurposeId, static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream* iface, IUnknown* pStreamObject, const MSPID* PurposeId,
DWORD dwFlags, IMediaStream** ppNewStream) DWORD dwFlags, IMediaStream** ppNewStream)
{ {
ICOM_THIS(IAMMultiMediaStreamImpl, iface); IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface;
FIXME("(%p/%p)->(%p,%p,%lx,%p) stub!\n", This, iface, pStreamObject, PurposeId, dwFlags, ppNewStream); FIXME("(%p/%p)->(%p,%p,%lx,%p) stub!\n", This, iface, pStreamObject, PurposeId, dwFlags, ppNewStream);
...@@ -218,7 +218,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream ...@@ -218,7 +218,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream
static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* iface, LPCWSTR pszFileName, DWORD dwFlags) static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* iface, LPCWSTR pszFileName, DWORD dwFlags)
{ {
ICOM_THIS(IAMMultiMediaStreamImpl, iface); IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface;
FIXME("(%p/%p)->(%p,%lx) stub!\n", This, iface, pszFileName, dwFlags); FIXME("(%p/%p)->(%p,%lx) stub!\n", This, iface, pszFileName, dwFlags);
...@@ -227,7 +227,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac ...@@ -227,7 +227,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac
static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenMoniker(IAMMultiMediaStream* iface, IBindCtx* pCtx, IMoniker* pMoniker, DWORD dwFlags) static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenMoniker(IAMMultiMediaStream* iface, IBindCtx* pCtx, IMoniker* pMoniker, DWORD dwFlags)
{ {
ICOM_THIS(IAMMultiMediaStreamImpl, iface); IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface;
FIXME("(%p/%p)->(%p,%p,%lx) stub!\n", This, iface, pCtx, pMoniker, dwFlags); FIXME("(%p/%p)->(%p,%p,%lx) stub!\n", This, iface, pCtx, pMoniker, dwFlags);
...@@ -236,7 +236,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenMoniker(IAMMultiMediaStream* i ...@@ -236,7 +236,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenMoniker(IAMMultiMediaStream* i
static HRESULT WINAPI IAMMultiMediaStreamImpl_Render(IAMMultiMediaStream* iface, DWORD dwFlags) static HRESULT WINAPI IAMMultiMediaStreamImpl_Render(IAMMultiMediaStream* iface, DWORD dwFlags)
{ {
ICOM_THIS(IAMMultiMediaStreamImpl, iface); IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface;
FIXME("(%p/%p)->(%lx) stub!\n", This, iface, dwFlags); FIXME("(%p/%p)->(%lx) stub!\n", This, iface, dwFlags);
......
...@@ -81,7 +81,7 @@ static const struct object_creation_info object_creation[] = ...@@ -81,7 +81,7 @@ static const struct object_creation_info object_creation[] =
static HRESULT WINAPI static HRESULT WINAPI
AMCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) AMCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj)
{ {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
if (IsEqualGUID(riid, &IID_IUnknown) if (IsEqualGUID(riid, &IID_IUnknown)
|| IsEqualGUID(riid, &IID_IClassFactory)) || IsEqualGUID(riid, &IID_IClassFactory))
...@@ -96,12 +96,12 @@ AMCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) ...@@ -96,12 +96,12 @@ AMCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj)
} }
static ULONG WINAPI AMCF_AddRef(LPCLASSFACTORY iface) { static ULONG WINAPI AMCF_AddRef(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
return ++(This->ref); return ++(This->ref);
} }
static ULONG WINAPI AMCF_Release(LPCLASSFACTORY iface) { static ULONG WINAPI AMCF_Release(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
ULONG ref = --This->ref; ULONG ref = --This->ref;
...@@ -114,7 +114,7 @@ static ULONG WINAPI AMCF_Release(LPCLASSFACTORY iface) { ...@@ -114,7 +114,7 @@ static ULONG WINAPI AMCF_Release(LPCLASSFACTORY iface) {
static HRESULT WINAPI AMCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, static HRESULT WINAPI AMCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter,
REFIID riid, LPVOID *ppobj) { REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
HRESULT hres; HRESULT hres;
LPUNKNOWN punk; LPUNKNOWN punk;
...@@ -135,7 +135,7 @@ static HRESULT WINAPI AMCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter ...@@ -135,7 +135,7 @@ static HRESULT WINAPI AMCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter
} }
static HRESULT WINAPI AMCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { static HRESULT WINAPI AMCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p)->(%d),stub!\n",This,dolock); FIXME("(%p)->(%d),stub!\n",This,dolock);
return S_OK; return S_OK;
} }
......
...@@ -129,7 +129,7 @@ HRESULT AVIFILE_CreateACMStream(REFIID riid, LPVOID *ppv) ...@@ -129,7 +129,7 @@ HRESULT AVIFILE_CreateACMStream(REFIID riid, LPVOID *ppv)
static HRESULT WINAPI ACMStream_fnQueryInterface(IAVIStream *iface, static HRESULT WINAPI ACMStream_fnQueryInterface(IAVIStream *iface,
REFIID refiid, LPVOID *obj) REFIID refiid, LPVOID *obj)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p,%s,%p)\n", iface, debugstr_guid(refiid), obj); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(refiid), obj);
...@@ -146,7 +146,7 @@ static HRESULT WINAPI ACMStream_fnQueryInterface(IAVIStream *iface, ...@@ -146,7 +146,7 @@ static HRESULT WINAPI ACMStream_fnQueryInterface(IAVIStream *iface,
static ULONG WINAPI ACMStream_fnAddRef(IAVIStream *iface) static ULONG WINAPI ACMStream_fnAddRef(IAVIStream *iface)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p) -> %ld\n", iface, This->ref + 1); TRACE("(%p) -> %ld\n", iface, This->ref + 1);
...@@ -159,7 +159,7 @@ static ULONG WINAPI ACMStream_fnAddRef(IAVIStream *iface) ...@@ -159,7 +159,7 @@ static ULONG WINAPI ACMStream_fnAddRef(IAVIStream *iface)
static ULONG WINAPI ACMStream_fnRelease(IAVIStream* iface) static ULONG WINAPI ACMStream_fnRelease(IAVIStream* iface)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p) -> %ld\n", iface, This->ref - 1); TRACE("(%p) -> %ld\n", iface, This->ref - 1);
...@@ -211,7 +211,7 @@ static ULONG WINAPI ACMStream_fnRelease(IAVIStream* iface) ...@@ -211,7 +211,7 @@ static ULONG WINAPI ACMStream_fnRelease(IAVIStream* iface)
static HRESULT WINAPI ACMStream_fnCreate(IAVIStream *iface, LPARAM lParam1, static HRESULT WINAPI ACMStream_fnCreate(IAVIStream *iface, LPARAM lParam1,
LPARAM lParam2) LPARAM lParam2)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p,0x%08lX,0x%08lX)\n", iface, lParam1, lParam2); TRACE("(%p,0x%08lX,0x%08lX)\n", iface, lParam1, lParam2);
...@@ -264,7 +264,7 @@ static HRESULT WINAPI ACMStream_fnCreate(IAVIStream *iface, LPARAM lParam1, ...@@ -264,7 +264,7 @@ static HRESULT WINAPI ACMStream_fnCreate(IAVIStream *iface, LPARAM lParam1,
static HRESULT WINAPI ACMStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi, static HRESULT WINAPI ACMStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi,
LONG size) LONG size)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p,%p,%ld)\n", iface, psi, size); TRACE("(%p,%p,%ld)\n", iface, psi, size);
...@@ -291,7 +291,7 @@ static HRESULT WINAPI ACMStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi, ...@@ -291,7 +291,7 @@ static HRESULT WINAPI ACMStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi,
static LONG WINAPI ACMStream_fnFindSample(IAVIStream *iface, LONG pos, static LONG WINAPI ACMStream_fnFindSample(IAVIStream *iface, LONG pos,
LONG flags) LONG flags)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p,%ld,0x%08lX)\n",iface,pos,flags); TRACE("(%p,%ld,0x%08lX)\n",iface,pos,flags);
...@@ -319,7 +319,7 @@ static LONG WINAPI ACMStream_fnFindSample(IAVIStream *iface, LONG pos, ...@@ -319,7 +319,7 @@ static LONG WINAPI ACMStream_fnFindSample(IAVIStream *iface, LONG pos,
static HRESULT WINAPI ACMStream_fnReadFormat(IAVIStream *iface, LONG pos, static HRESULT WINAPI ACMStream_fnReadFormat(IAVIStream *iface, LONG pos,
LPVOID format, LONG *formatsize) LPVOID format, LONG *formatsize)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p,%ld,%p,%p)\n", iface, pos, format, formatsize); TRACE("(%p,%ld,%p,%p)\n", iface, pos, format, formatsize);
...@@ -354,7 +354,7 @@ static HRESULT WINAPI ACMStream_fnReadFormat(IAVIStream *iface, LONG pos, ...@@ -354,7 +354,7 @@ static HRESULT WINAPI ACMStream_fnReadFormat(IAVIStream *iface, LONG pos,
static HRESULT WINAPI ACMStream_fnSetFormat(IAVIStream *iface, LONG pos, static HRESULT WINAPI ACMStream_fnSetFormat(IAVIStream *iface, LONG pos,
LPVOID format, LONG formatsize) LPVOID format, LONG formatsize)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
HRESULT hr; HRESULT hr;
...@@ -401,7 +401,7 @@ static HRESULT WINAPI ACMStream_fnRead(IAVIStream *iface, LONG start, ...@@ -401,7 +401,7 @@ static HRESULT WINAPI ACMStream_fnRead(IAVIStream *iface, LONG start,
LONG buffersize, LPLONG bytesread, LONG buffersize, LPLONG bytesread,
LPLONG samplesread) LPLONG samplesread)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
HRESULT hr; HRESULT hr;
DWORD size; DWORD size;
...@@ -523,7 +523,7 @@ static HRESULT WINAPI ACMStream_fnWrite(IAVIStream *iface, LONG start, ...@@ -523,7 +523,7 @@ static HRESULT WINAPI ACMStream_fnWrite(IAVIStream *iface, LONG start,
LPLONG sampwritten, LPLONG sampwritten,
LPLONG byteswritten) LPLONG byteswritten)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
HRESULT hr; HRESULT hr;
ULONG size; ULONG size;
...@@ -617,7 +617,7 @@ static HRESULT WINAPI ACMStream_fnWrite(IAVIStream *iface, LONG start, ...@@ -617,7 +617,7 @@ static HRESULT WINAPI ACMStream_fnWrite(IAVIStream *iface, LONG start,
static HRESULT WINAPI ACMStream_fnDelete(IAVIStream *iface, LONG start, static HRESULT WINAPI ACMStream_fnDelete(IAVIStream *iface, LONG start,
LONG samples) LONG samples)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p,%ld,%ld)\n", iface, start, samples); TRACE("(%p,%ld,%ld)\n", iface, start, samples);
...@@ -651,7 +651,7 @@ static HRESULT WINAPI ACMStream_fnDelete(IAVIStream *iface, LONG start, ...@@ -651,7 +651,7 @@ static HRESULT WINAPI ACMStream_fnDelete(IAVIStream *iface, LONG start,
static HRESULT WINAPI ACMStream_fnReadData(IAVIStream *iface, DWORD fcc, static HRESULT WINAPI ACMStream_fnReadData(IAVIStream *iface, DWORD fcc,
LPVOID lp, LPLONG lpread) LPVOID lp, LPLONG lpread)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p,0x%08lX,%p,%p)\n", iface, fcc, lp, lpread); TRACE("(%p,0x%08lX,%p,%p)\n", iface, fcc, lp, lpread);
...@@ -663,7 +663,7 @@ static HRESULT WINAPI ACMStream_fnReadData(IAVIStream *iface, DWORD fcc, ...@@ -663,7 +663,7 @@ static HRESULT WINAPI ACMStream_fnReadData(IAVIStream *iface, DWORD fcc,
static HRESULT WINAPI ACMStream_fnWriteData(IAVIStream *iface, DWORD fcc, static HRESULT WINAPI ACMStream_fnWriteData(IAVIStream *iface, DWORD fcc,
LPVOID lp, LONG size) LPVOID lp, LONG size)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p,0x%08lx,%p,%ld)\n", iface, fcc, lp, size); TRACE("(%p,0x%08lx,%p,%ld)\n", iface, fcc, lp, size);
......
...@@ -259,7 +259,7 @@ HRESULT AVIFILE_CreateAVIFile(REFIID riid, LPVOID *ppv) ...@@ -259,7 +259,7 @@ HRESULT AVIFILE_CreateAVIFile(REFIID riid, LPVOID *ppv)
static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile *iface, REFIID refiid, static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile *iface, REFIID refiid,
LPVOID *obj) LPVOID *obj)
{ {
ICOM_THIS(IAVIFileImpl,iface); IAVIFileImpl *This = (IAVIFileImpl *)iface;
TRACE("(%p,%s,%p)\n", This, debugstr_guid(refiid), obj); TRACE("(%p,%s,%p)\n", This, debugstr_guid(refiid), obj);
...@@ -281,7 +281,7 @@ static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile *iface, REFIID refiid, ...@@ -281,7 +281,7 @@ static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile *iface, REFIID refiid,
static ULONG WINAPI IAVIFile_fnAddRef(IAVIFile *iface) static ULONG WINAPI IAVIFile_fnAddRef(IAVIFile *iface)
{ {
ICOM_THIS(IAVIFileImpl,iface); IAVIFileImpl *This = (IAVIFileImpl *)iface;
TRACE("(%p) -> %ld\n", iface, This->ref + 1); TRACE("(%p) -> %ld\n", iface, This->ref + 1);
return ++(This->ref); return ++(This->ref);
...@@ -289,7 +289,7 @@ static ULONG WINAPI IAVIFile_fnAddRef(IAVIFile *iface) ...@@ -289,7 +289,7 @@ static ULONG WINAPI IAVIFile_fnAddRef(IAVIFile *iface)
static ULONG WINAPI IAVIFile_fnRelease(IAVIFile *iface) static ULONG WINAPI IAVIFile_fnRelease(IAVIFile *iface)
{ {
ICOM_THIS(IAVIFileImpl,iface); IAVIFileImpl *This = (IAVIFileImpl *)iface;
UINT i; UINT i;
TRACE("(%p) -> %ld\n", iface, This->ref - 1); TRACE("(%p) -> %ld\n", iface, This->ref - 1);
...@@ -342,7 +342,7 @@ static ULONG WINAPI IAVIFile_fnRelease(IAVIFile *iface) ...@@ -342,7 +342,7 @@ static ULONG WINAPI IAVIFile_fnRelease(IAVIFile *iface)
static HRESULT WINAPI IAVIFile_fnInfo(IAVIFile *iface, LPAVIFILEINFOW afi, static HRESULT WINAPI IAVIFile_fnInfo(IAVIFile *iface, LPAVIFILEINFOW afi,
LONG size) LONG size)
{ {
ICOM_THIS(IAVIFileImpl,iface); IAVIFileImpl *This = (IAVIFileImpl *)iface;
TRACE("(%p,%p,%ld)\n",iface,afi,size); TRACE("(%p,%p,%ld)\n",iface,afi,size);
...@@ -363,7 +363,7 @@ static HRESULT WINAPI IAVIFile_fnInfo(IAVIFile *iface, LPAVIFILEINFOW afi, ...@@ -363,7 +363,7 @@ static HRESULT WINAPI IAVIFile_fnInfo(IAVIFile *iface, LPAVIFILEINFOW afi,
static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, PAVISTREAM *avis, static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, PAVISTREAM *avis,
DWORD fccType, LONG lParam) DWORD fccType, LONG lParam)
{ {
ICOM_THIS(IAVIFileImpl,iface); IAVIFileImpl *This = (IAVIFileImpl *)iface;
ULONG nStream; ULONG nStream;
...@@ -390,7 +390,7 @@ static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, PAVISTREAM *avis, ...@@ -390,7 +390,7 @@ static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, PAVISTREAM *avis,
static HRESULT WINAPI IAVIFile_fnCreateStream(IAVIFile *iface,PAVISTREAM *avis, static HRESULT WINAPI IAVIFile_fnCreateStream(IAVIFile *iface,PAVISTREAM *avis,
LPAVISTREAMINFOW asi) LPAVISTREAMINFOW asi)
{ {
ICOM_THIS(IAVIFileImpl,iface); IAVIFileImpl *This = (IAVIFileImpl *)iface;
DWORD n; DWORD n;
...@@ -444,7 +444,7 @@ static HRESULT WINAPI IAVIFile_fnCreateStream(IAVIFile *iface,PAVISTREAM *avis, ...@@ -444,7 +444,7 @@ static HRESULT WINAPI IAVIFile_fnCreateStream(IAVIFile *iface,PAVISTREAM *avis,
static HRESULT WINAPI IAVIFile_fnWriteData(IAVIFile *iface, DWORD ckid, static HRESULT WINAPI IAVIFile_fnWriteData(IAVIFile *iface, DWORD ckid,
LPVOID lpData, LONG size) LPVOID lpData, LONG size)
{ {
ICOM_THIS(IAVIFileImpl,iface); IAVIFileImpl *This = (IAVIFileImpl *)iface;
TRACE("(%p,0x%08lX,%p,%ld)\n", iface, ckid, lpData, size); TRACE("(%p,0x%08lX,%p,%ld)\n", iface, ckid, lpData, size);
...@@ -466,7 +466,7 @@ static HRESULT WINAPI IAVIFile_fnWriteData(IAVIFile *iface, DWORD ckid, ...@@ -466,7 +466,7 @@ static HRESULT WINAPI IAVIFile_fnWriteData(IAVIFile *iface, DWORD ckid,
static HRESULT WINAPI IAVIFile_fnReadData(IAVIFile *iface, DWORD ckid, static HRESULT WINAPI IAVIFile_fnReadData(IAVIFile *iface, DWORD ckid,
LPVOID lpData, LONG *size) LPVOID lpData, LONG *size)
{ {
ICOM_THIS(IAVIFileImpl,iface); IAVIFileImpl *This = (IAVIFileImpl *)iface;
TRACE("(%p,0x%08lX,%p,%p)\n", iface, ckid, lpData, size); TRACE("(%p,0x%08lX,%p,%p)\n", iface, ckid, lpData, size);
...@@ -475,7 +475,7 @@ static HRESULT WINAPI IAVIFile_fnReadData(IAVIFile *iface, DWORD ckid, ...@@ -475,7 +475,7 @@ static HRESULT WINAPI IAVIFile_fnReadData(IAVIFile *iface, DWORD ckid,
static HRESULT WINAPI IAVIFile_fnEndRecord(IAVIFile *iface) static HRESULT WINAPI IAVIFile_fnEndRecord(IAVIFile *iface)
{ {
ICOM_THIS(IAVIFileImpl,iface); IAVIFileImpl *This = (IAVIFileImpl *)iface;
TRACE("(%p)\n",iface); TRACE("(%p)\n",iface);
...@@ -517,7 +517,7 @@ static HRESULT WINAPI IAVIFile_fnEndRecord(IAVIFile *iface) ...@@ -517,7 +517,7 @@ static HRESULT WINAPI IAVIFile_fnEndRecord(IAVIFile *iface)
static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile *iface, DWORD fccType, static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile *iface, DWORD fccType,
LONG lParam) LONG lParam)
{ {
ICOM_THIS(IAVIFileImpl,iface); IAVIFileImpl *This = (IAVIFileImpl *)iface;
ULONG nStream; ULONG nStream;
...@@ -558,7 +558,7 @@ static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile *iface, DWORD fccType, ...@@ -558,7 +558,7 @@ static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile *iface, DWORD fccType,
static HRESULT WINAPI IPersistFile_fnQueryInterface(IPersistFile *iface, static HRESULT WINAPI IPersistFile_fnQueryInterface(IPersistFile *iface,
REFIID refiid, LPVOID *obj) REFIID refiid, LPVOID *obj)
{ {
ICOM_THIS(IPersistFileImpl,iface); IPersistFileImpl *This = (IPersistFileImpl *)iface;
assert(This->paf != NULL); assert(This->paf != NULL);
...@@ -567,7 +567,7 @@ static HRESULT WINAPI IPersistFile_fnQueryInterface(IPersistFile *iface, ...@@ -567,7 +567,7 @@ static HRESULT WINAPI IPersistFile_fnQueryInterface(IPersistFile *iface,
static ULONG WINAPI IPersistFile_fnAddRef(IPersistFile *iface) static ULONG WINAPI IPersistFile_fnAddRef(IPersistFile *iface)
{ {
ICOM_THIS(IPersistFileImpl,iface); IPersistFileImpl *This = (IPersistFileImpl *)iface;
assert(This->paf != NULL); assert(This->paf != NULL);
...@@ -576,7 +576,7 @@ static ULONG WINAPI IPersistFile_fnAddRef(IPersistFile *iface) ...@@ -576,7 +576,7 @@ static ULONG WINAPI IPersistFile_fnAddRef(IPersistFile *iface)
static ULONG WINAPI IPersistFile_fnRelease(IPersistFile *iface) static ULONG WINAPI IPersistFile_fnRelease(IPersistFile *iface)
{ {
ICOM_THIS(IPersistFileImpl,iface); IPersistFileImpl *This = (IPersistFileImpl *)iface;
assert(This->paf != NULL); assert(This->paf != NULL);
...@@ -598,7 +598,7 @@ static HRESULT WINAPI IPersistFile_fnGetClassID(IPersistFile *iface, ...@@ -598,7 +598,7 @@ static HRESULT WINAPI IPersistFile_fnGetClassID(IPersistFile *iface,
static HRESULT WINAPI IPersistFile_fnIsDirty(IPersistFile *iface) static HRESULT WINAPI IPersistFile_fnIsDirty(IPersistFile *iface)
{ {
ICOM_THIS(IPersistFileImpl,iface); IPersistFileImpl *This = (IPersistFileImpl *)iface;
TRACE("(%p)\n", iface); TRACE("(%p)\n", iface);
...@@ -610,7 +610,7 @@ static HRESULT WINAPI IPersistFile_fnIsDirty(IPersistFile *iface) ...@@ -610,7 +610,7 @@ static HRESULT WINAPI IPersistFile_fnIsDirty(IPersistFile *iface)
static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile *iface, static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile *iface,
LPCOLESTR pszFileName, DWORD dwMode) LPCOLESTR pszFileName, DWORD dwMode)
{ {
ICOM_THIS(IPersistFileImpl,iface); IPersistFileImpl *This = (IPersistFileImpl *)iface;
int len; int len;
...@@ -688,7 +688,7 @@ static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile *iface, ...@@ -688,7 +688,7 @@ static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile *iface,
static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile *iface, static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile *iface,
LPOLESTR *ppszFileName) LPOLESTR *ppszFileName)
{ {
ICOM_THIS(IPersistFileImpl,iface); IPersistFileImpl *This = (IPersistFileImpl *)iface;
TRACE("(%p,%p)\n", iface, ppszFileName); TRACE("(%p,%p)\n", iface, ppszFileName);
...@@ -717,7 +717,7 @@ static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile *iface, ...@@ -717,7 +717,7 @@ static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile *iface,
static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream *iface, static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream *iface,
REFIID refiid, LPVOID *obj) REFIID refiid, LPVOID *obj)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p,%s,%p)\n", iface, debugstr_guid(refiid), obj); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(refiid), obj);
...@@ -735,7 +735,7 @@ static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream *iface, ...@@ -735,7 +735,7 @@ static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream *iface,
static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream *iface) static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream *iface)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p) -> %ld\n", iface, This->ref + 1); TRACE("(%p) -> %ld\n", iface, This->ref + 1);
...@@ -748,7 +748,7 @@ static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream *iface) ...@@ -748,7 +748,7 @@ static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream *iface)
static ULONG WINAPI IAVIStream_fnRelease(IAVIStream* iface) static ULONG WINAPI IAVIStream_fnRelease(IAVIStream* iface)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p) -> %ld\n", iface, This->ref - 1); TRACE("(%p) -> %ld\n", iface, This->ref - 1);
...@@ -778,7 +778,7 @@ static HRESULT WINAPI IAVIStream_fnCreate(IAVIStream *iface, LPARAM lParam1, ...@@ -778,7 +778,7 @@ static HRESULT WINAPI IAVIStream_fnCreate(IAVIStream *iface, LPARAM lParam1,
static HRESULT WINAPI IAVIStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi, static HRESULT WINAPI IAVIStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi,
LONG size) LONG size)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p,%p,%ld)\n", iface, psi, size); TRACE("(%p,%p,%ld)\n", iface, psi, size);
...@@ -797,7 +797,7 @@ static HRESULT WINAPI IAVIStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi, ...@@ -797,7 +797,7 @@ static HRESULT WINAPI IAVIStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi,
static LONG WINAPI IAVIStream_fnFindSample(IAVIStream *iface, LONG pos, static LONG WINAPI IAVIStream_fnFindSample(IAVIStream *iface, LONG pos,
LONG flags) LONG flags)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
LONG offset = 0; LONG offset = 0;
...@@ -897,7 +897,7 @@ static LONG WINAPI IAVIStream_fnFindSample(IAVIStream *iface, LONG pos, ...@@ -897,7 +897,7 @@ static LONG WINAPI IAVIStream_fnFindSample(IAVIStream *iface, LONG pos,
static HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream *iface, LONG pos, static HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream *iface, LONG pos,
LPVOID format, LONG *formatsize) LPVOID format, LONG *formatsize)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p,%ld,%p,%p)\n", iface, pos, format, formatsize); TRACE("(%p,%ld,%p,%p)\n", iface, pos, format, formatsize);
...@@ -936,7 +936,7 @@ static HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream *iface, LONG pos, ...@@ -936,7 +936,7 @@ static HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream *iface, LONG pos,
static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream *iface, LONG pos, static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream *iface, LONG pos,
LPVOID format, LONG formatsize) LPVOID format, LONG formatsize)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
LPBITMAPINFOHEADER lpbiNew = (LPBITMAPINFOHEADER)format; LPBITMAPINFOHEADER lpbiNew = (LPBITMAPINFOHEADER)format;
...@@ -1046,7 +1046,7 @@ static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start, ...@@ -1046,7 +1046,7 @@ static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start,
LONG buffersize, LPLONG bytesread, LONG buffersize, LPLONG bytesread,
LPLONG samplesread) LPLONG samplesread)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
DWORD size; DWORD size;
HRESULT hr; HRESULT hr;
...@@ -1157,7 +1157,7 @@ static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream *iface, LONG start, ...@@ -1157,7 +1157,7 @@ static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream *iface, LONG start,
LPLONG sampwritten, LPLONG sampwritten,
LPLONG byteswritten) LPLONG byteswritten)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
FOURCC ckid; FOURCC ckid;
HRESULT hr; HRESULT hr;
...@@ -1248,7 +1248,7 @@ static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream *iface, LONG start, ...@@ -1248,7 +1248,7 @@ static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream *iface, LONG start,
static HRESULT WINAPI IAVIStream_fnDelete(IAVIStream *iface, LONG start, static HRESULT WINAPI IAVIStream_fnDelete(IAVIStream *iface, LONG start,
LONG samples) LONG samples)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
FIXME("(%p,%ld,%ld): stub\n", iface, start, samples); FIXME("(%p,%ld,%ld): stub\n", iface, start, samples);
...@@ -1287,7 +1287,7 @@ static HRESULT WINAPI IAVIStream_fnDelete(IAVIStream *iface, LONG start, ...@@ -1287,7 +1287,7 @@ static HRESULT WINAPI IAVIStream_fnDelete(IAVIStream *iface, LONG start,
static HRESULT WINAPI IAVIStream_fnReadData(IAVIStream *iface, DWORD fcc, static HRESULT WINAPI IAVIStream_fnReadData(IAVIStream *iface, DWORD fcc,
LPVOID lp, LPLONG lpread) LPVOID lp, LPLONG lpread)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p,0x%08lX,%p,%p)\n", iface, fcc, lp, lpread); TRACE("(%p,0x%08lX,%p,%p)\n", iface, fcc, lp, lpread);
...@@ -1311,7 +1311,7 @@ static HRESULT WINAPI IAVIStream_fnReadData(IAVIStream *iface, DWORD fcc, ...@@ -1311,7 +1311,7 @@ static HRESULT WINAPI IAVIStream_fnReadData(IAVIStream *iface, DWORD fcc,
static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream *iface, DWORD fcc, static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream *iface, DWORD fcc,
LPVOID lp, LONG size) LPVOID lp, LONG size)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p,0x%08lx,%p,%ld)\n", iface, fcc, lp, size); TRACE("(%p,0x%08lx,%p,%ld)\n", iface, fcc, lp, size);
......
...@@ -348,7 +348,7 @@ static BOOL AVIFILE_FormatsEqual(PAVISTREAM avi1, PAVISTREAM avi2) ...@@ -348,7 +348,7 @@ static BOOL AVIFILE_FormatsEqual(PAVISTREAM avi1, PAVISTREAM avi2)
static HRESULT WINAPI IAVIEditStream_fnQueryInterface(IAVIEditStream*iface,REFIID refiid,LPVOID *obj) static HRESULT WINAPI IAVIEditStream_fnQueryInterface(IAVIEditStream*iface,REFIID refiid,LPVOID *obj)
{ {
ICOM_THIS(IAVIEditStreamImpl,iface); IAVIEditStreamImpl *This = (IAVIEditStreamImpl *)iface;
TRACE("(%p,%s,%p)\n", This, debugstr_guid(refiid), obj); TRACE("(%p,%s,%p)\n", This, debugstr_guid(refiid), obj);
...@@ -375,7 +375,7 @@ static HRESULT WINAPI IAVIEditStream_fnQueryInterface(IAVIEditStream*iface,REFII ...@@ -375,7 +375,7 @@ static HRESULT WINAPI IAVIEditStream_fnQueryInterface(IAVIEditStream*iface,REFII
static ULONG WINAPI IAVIEditStream_fnAddRef(IAVIEditStream*iface) static ULONG WINAPI IAVIEditStream_fnAddRef(IAVIEditStream*iface)
{ {
ICOM_THIS(IAVIEditStreamImpl,iface); IAVIEditStreamImpl *This = (IAVIEditStreamImpl *)iface;
TRACE("(%p) -> %ld\n", iface, This->ref + 1); TRACE("(%p) -> %ld\n", iface, This->ref + 1);
return ++(This->ref); return ++(This->ref);
...@@ -383,7 +383,7 @@ static ULONG WINAPI IAVIEditStream_fnAddRef(IAVIEditStream*iface) ...@@ -383,7 +383,7 @@ static ULONG WINAPI IAVIEditStream_fnAddRef(IAVIEditStream*iface)
static ULONG WINAPI IAVIEditStream_fnRelease(IAVIEditStream*iface) static ULONG WINAPI IAVIEditStream_fnRelease(IAVIEditStream*iface)
{ {
ICOM_THIS(IAVIEditStreamImpl,iface); IAVIEditStreamImpl *This = (IAVIEditStreamImpl *)iface;
DWORD i; DWORD i;
TRACE("(%p) -> %ld\n", iface, This->ref - 1); TRACE("(%p) -> %ld\n", iface, This->ref - 1);
...@@ -409,7 +409,7 @@ static ULONG WINAPI IAVIEditStream_fnRelease(IAVIEditStream*iface) ...@@ -409,7 +409,7 @@ static ULONG WINAPI IAVIEditStream_fnRelease(IAVIEditStream*iface)
static HRESULT WINAPI IAVIEditStream_fnCut(IAVIEditStream*iface,LONG*plStart, static HRESULT WINAPI IAVIEditStream_fnCut(IAVIEditStream*iface,LONG*plStart,
LONG*plLength,PAVISTREAM*ppResult) LONG*plLength,PAVISTREAM*ppResult)
{ {
ICOM_THIS(IAVIEditStreamImpl,iface); IAVIEditStreamImpl *This = (IAVIEditStreamImpl *)iface;
PAVISTREAM stream; PAVISTREAM stream;
DWORD start, len, streamPos, streamNr; DWORD start, len, streamPos, streamNr;
HRESULT hr; HRESULT hr;
...@@ -493,7 +493,7 @@ static HRESULT WINAPI IAVIEditStream_fnCut(IAVIEditStream*iface,LONG*plStart, ...@@ -493,7 +493,7 @@ static HRESULT WINAPI IAVIEditStream_fnCut(IAVIEditStream*iface,LONG*plStart,
static HRESULT WINAPI IAVIEditStream_fnCopy(IAVIEditStream*iface,LONG*plStart, static HRESULT WINAPI IAVIEditStream_fnCopy(IAVIEditStream*iface,LONG*plStart,
LONG*plLength,PAVISTREAM*ppResult) LONG*plLength,PAVISTREAM*ppResult)
{ {
ICOM_THIS(IAVIEditStreamImpl,iface); IAVIEditStreamImpl *This = (IAVIEditStreamImpl *)iface;
IAVIEditStreamImpl* pEdit; IAVIEditStreamImpl* pEdit;
HRESULT hr; HRESULT hr;
LONG start = 0; LONG start = 0;
...@@ -539,7 +539,7 @@ static HRESULT WINAPI IAVIEditStream_fnPaste(IAVIEditStream*iface,LONG*plStart, ...@@ -539,7 +539,7 @@ static HRESULT WINAPI IAVIEditStream_fnPaste(IAVIEditStream*iface,LONG*plStart,
LONG*plLength,PAVISTREAM pSource, LONG*plLength,PAVISTREAM pSource,
LONG lStart,LONG lLength) LONG lStart,LONG lLength)
{ {
ICOM_THIS(IAVIEditStreamImpl,iface); IAVIEditStreamImpl *This = (IAVIEditStreamImpl *)iface;
AVISTREAMINFOW srcInfo; AVISTREAMINFOW srcInfo;
IEditStreamInternal*pInternal = NULL; IEditStreamInternal*pInternal = NULL;
IAVIEditStreamImpl *pEdit = NULL; IAVIEditStreamImpl *pEdit = NULL;
...@@ -731,7 +731,7 @@ static HRESULT WINAPI IAVIEditStream_fnPaste(IAVIEditStream*iface,LONG*plStart, ...@@ -731,7 +731,7 @@ static HRESULT WINAPI IAVIEditStream_fnPaste(IAVIEditStream*iface,LONG*plStart,
static HRESULT WINAPI IAVIEditStream_fnClone(IAVIEditStream*iface, static HRESULT WINAPI IAVIEditStream_fnClone(IAVIEditStream*iface,
PAVISTREAM*ppResult) PAVISTREAM*ppResult)
{ {
ICOM_THIS(IAVIEditStreamImpl,iface); IAVIEditStreamImpl *This = (IAVIEditStreamImpl *)iface;
IAVIEditStreamImpl* pEdit; IAVIEditStreamImpl* pEdit;
DWORD i; DWORD i;
...@@ -767,7 +767,7 @@ static HRESULT WINAPI IAVIEditStream_fnClone(IAVIEditStream*iface, ...@@ -767,7 +767,7 @@ static HRESULT WINAPI IAVIEditStream_fnClone(IAVIEditStream*iface,
static HRESULT WINAPI IAVIEditStream_fnSetInfo(IAVIEditStream*iface, static HRESULT WINAPI IAVIEditStream_fnSetInfo(IAVIEditStream*iface,
LPAVISTREAMINFOW asi,LONG size) LPAVISTREAMINFOW asi,LONG size)
{ {
ICOM_THIS(IAVIEditStreamImpl,iface); IAVIEditStreamImpl *This = (IAVIEditStreamImpl *)iface;
TRACE("(%p,%p,%ld)\n",iface,asi,size); TRACE("(%p,%p,%ld)\n",iface,asi,size);
...@@ -799,7 +799,7 @@ static HRESULT WINAPI IAVIEditStream_fnSetInfo(IAVIEditStream*iface, ...@@ -799,7 +799,7 @@ static HRESULT WINAPI IAVIEditStream_fnSetInfo(IAVIEditStream*iface,
static HRESULT WINAPI IEditAVIStream_fnQueryInterface(IAVIStream*iface, static HRESULT WINAPI IEditAVIStream_fnQueryInterface(IAVIStream*iface,
REFIID refiid,LPVOID*obj) REFIID refiid,LPVOID*obj)
{ {
ICOM_THIS(IEditAVIStreamImpl,iface); IEditAVIStreamImpl *This = (IEditAVIStreamImpl *)iface;
assert(This->pae != NULL); assert(This->pae != NULL);
...@@ -808,7 +808,7 @@ static HRESULT WINAPI IEditAVIStream_fnQueryInterface(IAVIStream*iface, ...@@ -808,7 +808,7 @@ static HRESULT WINAPI IEditAVIStream_fnQueryInterface(IAVIStream*iface,
static ULONG WINAPI IEditAVIStream_fnAddRef(IAVIStream*iface) static ULONG WINAPI IEditAVIStream_fnAddRef(IAVIStream*iface)
{ {
ICOM_THIS(IEditAVIStreamImpl,iface); IEditAVIStreamImpl *This = (IEditAVIStreamImpl *)iface;
assert(This->pae != NULL); assert(This->pae != NULL);
...@@ -817,7 +817,7 @@ static ULONG WINAPI IEditAVIStream_fnAddRef(IAVIStream*iface) ...@@ -817,7 +817,7 @@ static ULONG WINAPI IEditAVIStream_fnAddRef(IAVIStream*iface)
static ULONG WINAPI IEditAVIStream_fnRelease(IAVIStream*iface) static ULONG WINAPI IEditAVIStream_fnRelease(IAVIStream*iface)
{ {
ICOM_THIS(IEditAVIStreamImpl,iface); IEditAVIStreamImpl *This = (IEditAVIStreamImpl *)iface;
assert(This->pae != NULL); assert(This->pae != NULL);
...@@ -854,7 +854,7 @@ static HRESULT WINAPI IEditAVIStream_fnCreate(IAVIStream*iface, ...@@ -854,7 +854,7 @@ static HRESULT WINAPI IEditAVIStream_fnCreate(IAVIStream*iface,
static HRESULT WINAPI IEditAVIStream_fnInfo(IAVIStream*iface, static HRESULT WINAPI IEditAVIStream_fnInfo(IAVIStream*iface,
AVISTREAMINFOW *psi,LONG size) AVISTREAMINFOW *psi,LONG size)
{ {
ICOM_THIS(IEditAVIStreamImpl,iface); IEditAVIStreamImpl *This = (IEditAVIStreamImpl *)iface;
TRACE("(%p,%p,%ld)\n",iface,psi,size); TRACE("(%p,%p,%ld)\n",iface,psi,size);
...@@ -1074,7 +1074,7 @@ static HRESULT WINAPI IEditAVIStream_fnWrite(IAVIStream*iface,LONG start, ...@@ -1074,7 +1074,7 @@ static HRESULT WINAPI IEditAVIStream_fnWrite(IAVIStream*iface,LONG start,
static HRESULT WINAPI IEditAVIStream_fnDelete(IAVIStream*iface,LONG start, static HRESULT WINAPI IEditAVIStream_fnDelete(IAVIStream*iface,LONG start,
LONG samples) LONG samples)
{ {
ICOM_THIS(IEditAVIStreamImpl,iface); IEditAVIStreamImpl *This = (IEditAVIStreamImpl *)iface;
TRACE("(%p,%ld,%ld)\n",iface,start,samples); TRACE("(%p,%ld,%ld)\n",iface,start,samples);
...@@ -1116,7 +1116,7 @@ static HRESULT WINAPI IEditAVIStream_fnWriteData(IAVIStream*iface,DWORD fcc, ...@@ -1116,7 +1116,7 @@ static HRESULT WINAPI IEditAVIStream_fnWriteData(IAVIStream*iface,DWORD fcc,
static HRESULT WINAPI IEditAVIStream_fnSetInfo(IAVIStream*iface, static HRESULT WINAPI IEditAVIStream_fnSetInfo(IAVIStream*iface,
AVISTREAMINFOW*info,LONG len) AVISTREAMINFOW*info,LONG len)
{ {
ICOM_THIS(IEditAVIStreamImpl,iface); IEditAVIStreamImpl *This = (IEditAVIStreamImpl *)iface;
TRACE("(%p,%p,%ld)\n",iface,info,len); TRACE("(%p,%p,%ld)\n",iface,info,len);
...@@ -1125,7 +1125,7 @@ static HRESULT WINAPI IEditAVIStream_fnSetInfo(IAVIStream*iface, ...@@ -1125,7 +1125,7 @@ static HRESULT WINAPI IEditAVIStream_fnSetInfo(IAVIStream*iface,
static HRESULT WINAPI IEditStreamInternal_fnQueryInterface(IEditStreamInternal*iface,REFIID refiid,LPVOID*obj) static HRESULT WINAPI IEditStreamInternal_fnQueryInterface(IEditStreamInternal*iface,REFIID refiid,LPVOID*obj)
{ {
ICOM_THIS(IEditStreamInternalImpl,iface); IEditStreamInternalImpl *This = (IEditStreamInternalImpl *)iface;
assert(This->pae != NULL); assert(This->pae != NULL);
...@@ -1134,7 +1134,7 @@ static HRESULT WINAPI IEditStreamInternal_fnQueryInterface(IEditStreamInternal*i ...@@ -1134,7 +1134,7 @@ static HRESULT WINAPI IEditStreamInternal_fnQueryInterface(IEditStreamInternal*i
static ULONG WINAPI IEditStreamInternal_fnAddRef(IEditStreamInternal*iface) static ULONG WINAPI IEditStreamInternal_fnAddRef(IEditStreamInternal*iface)
{ {
ICOM_THIS(IEditStreamInternalImpl,iface); IEditStreamInternalImpl *This = (IEditStreamInternalImpl *)iface;
assert(This->pae != NULL); assert(This->pae != NULL);
...@@ -1143,7 +1143,7 @@ static ULONG WINAPI IEditStreamInternal_fnAddRef(IEditStreamInternal*iface) ...@@ -1143,7 +1143,7 @@ static ULONG WINAPI IEditStreamInternal_fnAddRef(IEditStreamInternal*iface)
static ULONG WINAPI IEditStreamInternal_fnRelease(IEditStreamInternal*iface) static ULONG WINAPI IEditStreamInternal_fnRelease(IEditStreamInternal*iface)
{ {
ICOM_THIS(IEditStreamInternalImpl,iface); IEditStreamInternalImpl *This = (IEditStreamInternalImpl *)iface;
assert(This->pae != NULL); assert(This->pae != NULL);
...@@ -1152,7 +1152,7 @@ static ULONG WINAPI IEditStreamInternal_fnRelease(IEditStreamInternal*iface) ...@@ -1152,7 +1152,7 @@ static ULONG WINAPI IEditStreamInternal_fnRelease(IEditStreamInternal*iface)
static HRESULT WINAPI IEditStreamInternal_fnGetEditStreamImpl(IEditStreamInternal*iface,LPVOID*ppimpl) static HRESULT WINAPI IEditStreamInternal_fnGetEditStreamImpl(IEditStreamInternal*iface,LPVOID*ppimpl)
{ {
ICOM_THIS(IEditStreamInternalImpl,iface); IEditStreamInternalImpl *This = (IEditStreamInternalImpl *)iface;
TRACE("(%p,%p) -> %p\n", iface, ppimpl, This->pae); TRACE("(%p,%p) -> %p\n", iface, ppimpl, This->pae);
......
...@@ -107,7 +107,7 @@ static HRESULT WINAPI IClassFactory_fnQueryInterface(LPCLASSFACTORY iface, ...@@ -107,7 +107,7 @@ static HRESULT WINAPI IClassFactory_fnQueryInterface(LPCLASSFACTORY iface,
static ULONG WINAPI IClassFactory_fnAddRef(LPCLASSFACTORY iface) static ULONG WINAPI IClassFactory_fnAddRef(LPCLASSFACTORY iface)
{ {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
TRACE("(%p)\n", iface); TRACE("(%p)\n", iface);
...@@ -116,7 +116,7 @@ static ULONG WINAPI IClassFactory_fnAddRef(LPCLASSFACTORY iface) ...@@ -116,7 +116,7 @@ static ULONG WINAPI IClassFactory_fnAddRef(LPCLASSFACTORY iface)
static ULONG WINAPI IClassFactory_fnRelease(LPCLASSFACTORY iface) static ULONG WINAPI IClassFactory_fnRelease(LPCLASSFACTORY iface)
{ {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
TRACE("(%p)\n", iface); TRACE("(%p)\n", iface);
if ((--(This->dwRef)) > 0) if ((--(This->dwRef)) > 0)
...@@ -129,7 +129,7 @@ static HRESULT WINAPI IClassFactory_fnCreateInstance(LPCLASSFACTORY iface, ...@@ -129,7 +129,7 @@ static HRESULT WINAPI IClassFactory_fnCreateInstance(LPCLASSFACTORY iface,
LPUNKNOWN pOuter, LPUNKNOWN pOuter,
REFIID riid,LPVOID *ppobj) REFIID riid,LPVOID *ppobj)
{ {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
TRACE("(%p,%p,%s,%p)\n", iface, pOuter, debugstr_guid(riid), TRACE("(%p,%p,%s,%p)\n", iface, pOuter, debugstr_guid(riid),
ppobj); ppobj);
......
...@@ -139,7 +139,7 @@ PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pStream) ...@@ -139,7 +139,7 @@ PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pStream)
static HRESULT WINAPI IGetFrame_fnQueryInterface(IGetFrame *iface, static HRESULT WINAPI IGetFrame_fnQueryInterface(IGetFrame *iface,
REFIID refiid, LPVOID *obj) REFIID refiid, LPVOID *obj)
{ {
ICOM_THIS(IGetFrameImpl,iface); IGetFrameImpl *This = (IGetFrameImpl *)iface;
TRACE("(%p,%s,%p)\n", This, debugstr_guid(refiid), obj); TRACE("(%p,%s,%p)\n", This, debugstr_guid(refiid), obj);
...@@ -154,7 +154,7 @@ static HRESULT WINAPI IGetFrame_fnQueryInterface(IGetFrame *iface, ...@@ -154,7 +154,7 @@ static HRESULT WINAPI IGetFrame_fnQueryInterface(IGetFrame *iface,
static ULONG WINAPI IGetFrame_fnAddRef(IGetFrame *iface) static ULONG WINAPI IGetFrame_fnAddRef(IGetFrame *iface)
{ {
ICOM_THIS(IGetFrameImpl,iface); IGetFrameImpl *This = (IGetFrameImpl *)iface;
TRACE("(%p)\n", iface); TRACE("(%p)\n", iface);
...@@ -163,7 +163,7 @@ static ULONG WINAPI IGetFrame_fnAddRef(IGetFrame *iface) ...@@ -163,7 +163,7 @@ static ULONG WINAPI IGetFrame_fnAddRef(IGetFrame *iface)
static ULONG WINAPI IGetFrame_fnRelease(IGetFrame *iface) static ULONG WINAPI IGetFrame_fnRelease(IGetFrame *iface)
{ {
ICOM_THIS(IGetFrameImpl,iface); IGetFrameImpl *This = (IGetFrameImpl *)iface;
TRACE("(%p)\n", iface); TRACE("(%p)\n", iface);
...@@ -183,7 +183,7 @@ static ULONG WINAPI IGetFrame_fnRelease(IGetFrame *iface) ...@@ -183,7 +183,7 @@ static ULONG WINAPI IGetFrame_fnRelease(IGetFrame *iface)
static LPVOID WINAPI IGetFrame_fnGetFrame(IGetFrame *iface, LONG lPos) static LPVOID WINAPI IGetFrame_fnGetFrame(IGetFrame *iface, LONG lPos)
{ {
ICOM_THIS(IGetFrameImpl,iface); IGetFrameImpl *This = (IGetFrameImpl *)iface;
LONG readBytes; LONG readBytes;
LONG readSamples; LONG readSamples;
...@@ -302,7 +302,7 @@ static LPVOID WINAPI IGetFrame_fnGetFrame(IGetFrame *iface, LONG lPos) ...@@ -302,7 +302,7 @@ static LPVOID WINAPI IGetFrame_fnGetFrame(IGetFrame *iface, LONG lPos)
static HRESULT WINAPI IGetFrame_fnBegin(IGetFrame *iface, LONG lStart, static HRESULT WINAPI IGetFrame_fnBegin(IGetFrame *iface, LONG lStart,
LONG lEnd, LONG lRate) LONG lEnd, LONG lRate)
{ {
ICOM_THIS(IGetFrameImpl,iface); IGetFrameImpl *This = (IGetFrameImpl *)iface;
TRACE("(%p,%ld,%ld,%ld)\n", iface, lStart, lEnd, lRate); TRACE("(%p,%ld,%ld,%ld)\n", iface, lStart, lEnd, lRate);
...@@ -313,7 +313,7 @@ static HRESULT WINAPI IGetFrame_fnBegin(IGetFrame *iface, LONG lStart, ...@@ -313,7 +313,7 @@ static HRESULT WINAPI IGetFrame_fnBegin(IGetFrame *iface, LONG lStart,
static HRESULT WINAPI IGetFrame_fnEnd(IGetFrame *iface) static HRESULT WINAPI IGetFrame_fnEnd(IGetFrame *iface)
{ {
ICOM_THIS(IGetFrameImpl,iface); IGetFrameImpl *This = (IGetFrameImpl *)iface;
TRACE("(%p)\n", iface); TRACE("(%p)\n", iface);
...@@ -327,7 +327,7 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface, ...@@ -327,7 +327,7 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface,
LPVOID lpBits, INT x, INT y, LPVOID lpBits, INT x, INT y,
INT dx, INT dy) INT dx, INT dy)
{ {
ICOM_THIS(IGetFrameImpl,iface); IGetFrameImpl *This = (IGetFrameImpl *)iface;
AVISTREAMINFOW sInfo; AVISTREAMINFOW sInfo;
LPBITMAPINFOHEADER lpbi = lpbiWanted; LPBITMAPINFOHEADER lpbi = lpbiWanted;
......
...@@ -145,7 +145,7 @@ HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppv) ...@@ -145,7 +145,7 @@ HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppv)
static HRESULT WINAPI ICMStream_fnQueryInterface(IAVIStream *iface, static HRESULT WINAPI ICMStream_fnQueryInterface(IAVIStream *iface,
REFIID refiid, LPVOID *obj) REFIID refiid, LPVOID *obj)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p,%s,%p)\n", iface, debugstr_guid(refiid), obj); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(refiid), obj);
...@@ -162,7 +162,7 @@ static HRESULT WINAPI ICMStream_fnQueryInterface(IAVIStream *iface, ...@@ -162,7 +162,7 @@ static HRESULT WINAPI ICMStream_fnQueryInterface(IAVIStream *iface,
static ULONG WINAPI ICMStream_fnAddRef(IAVIStream *iface) static ULONG WINAPI ICMStream_fnAddRef(IAVIStream *iface)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p) -> %ld\n", iface, This->ref + 1); TRACE("(%p) -> %ld\n", iface, This->ref + 1);
...@@ -175,7 +175,7 @@ static ULONG WINAPI ICMStream_fnAddRef(IAVIStream *iface) ...@@ -175,7 +175,7 @@ static ULONG WINAPI ICMStream_fnAddRef(IAVIStream *iface)
static ULONG WINAPI ICMStream_fnRelease(IAVIStream* iface) static ULONG WINAPI ICMStream_fnRelease(IAVIStream* iface)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p) -> %ld\n", iface, This->ref - 1); TRACE("(%p) -> %ld\n", iface, This->ref - 1);
...@@ -233,7 +233,7 @@ static ULONG WINAPI ICMStream_fnRelease(IAVIStream* iface) ...@@ -233,7 +233,7 @@ static ULONG WINAPI ICMStream_fnRelease(IAVIStream* iface)
static HRESULT WINAPI ICMStream_fnCreate(IAVIStream *iface, LPARAM lParam1, static HRESULT WINAPI ICMStream_fnCreate(IAVIStream *iface, LPARAM lParam1,
LPARAM lParam2) LPARAM lParam2)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
ICINFO icinfo; ICINFO icinfo;
ICCOMPRESSFRAMES icFrames; ICCOMPRESSFRAMES icFrames;
...@@ -322,7 +322,7 @@ static HRESULT WINAPI ICMStream_fnCreate(IAVIStream *iface, LPARAM lParam1, ...@@ -322,7 +322,7 @@ static HRESULT WINAPI ICMStream_fnCreate(IAVIStream *iface, LPARAM lParam1,
static HRESULT WINAPI ICMStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi, static HRESULT WINAPI ICMStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi,
LONG size) LONG size)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p,%p,%ld)\n", iface, psi, size); TRACE("(%p,%p,%ld)\n", iface, psi, size);
...@@ -341,7 +341,7 @@ static HRESULT WINAPI ICMStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi, ...@@ -341,7 +341,7 @@ static HRESULT WINAPI ICMStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi,
static LONG WINAPI ICMStream_fnFindSample(IAVIStream *iface, LONG pos, static LONG WINAPI ICMStream_fnFindSample(IAVIStream *iface, LONG pos,
LONG flags) LONG flags)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p,%ld,0x%08lX)\n",iface,pos,flags); TRACE("(%p,%ld,0x%08lX)\n",iface,pos,flags);
...@@ -378,7 +378,7 @@ static LONG WINAPI ICMStream_fnFindSample(IAVIStream *iface, LONG pos, ...@@ -378,7 +378,7 @@ static LONG WINAPI ICMStream_fnFindSample(IAVIStream *iface, LONG pos,
static HRESULT WINAPI ICMStream_fnReadFormat(IAVIStream *iface, LONG pos, static HRESULT WINAPI ICMStream_fnReadFormat(IAVIStream *iface, LONG pos,
LPVOID format, LONG *formatsize) LPVOID format, LONG *formatsize)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
LPBITMAPINFOHEADER lpbi; LPBITMAPINFOHEADER lpbi;
HRESULT hr; HRESULT hr;
...@@ -429,7 +429,7 @@ static HRESULT WINAPI ICMStream_fnReadFormat(IAVIStream *iface, LONG pos, ...@@ -429,7 +429,7 @@ static HRESULT WINAPI ICMStream_fnReadFormat(IAVIStream *iface, LONG pos,
static HRESULT WINAPI ICMStream_fnSetFormat(IAVIStream *iface, LONG pos, static HRESULT WINAPI ICMStream_fnSetFormat(IAVIStream *iface, LONG pos,
LPVOID format, LONG formatsize) LPVOID format, LONG formatsize)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p,%ld,%p,%ld)\n", iface, pos, format, formatsize); TRACE("(%p,%ld,%p,%ld)\n", iface, pos, format, formatsize);
...@@ -583,7 +583,7 @@ static HRESULT WINAPI ICMStream_fnRead(IAVIStream *iface, LONG start, ...@@ -583,7 +583,7 @@ static HRESULT WINAPI ICMStream_fnRead(IAVIStream *iface, LONG start,
LONG buffersize, LPLONG bytesread, LONG buffersize, LPLONG bytesread,
LPLONG samplesread) LPLONG samplesread)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
LPBITMAPINFOHEADER lpbi; LPBITMAPINFOHEADER lpbi;
...@@ -677,7 +677,7 @@ static HRESULT WINAPI ICMStream_fnWrite(IAVIStream *iface, LONG start, ...@@ -677,7 +677,7 @@ static HRESULT WINAPI ICMStream_fnWrite(IAVIStream *iface, LONG start,
LPLONG sampwritten, LPLONG sampwritten,
LPLONG byteswritten) LPLONG byteswritten)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
HRESULT hr; HRESULT hr;
...@@ -722,7 +722,7 @@ static HRESULT WINAPI ICMStream_fnWrite(IAVIStream *iface, LONG start, ...@@ -722,7 +722,7 @@ static HRESULT WINAPI ICMStream_fnWrite(IAVIStream *iface, LONG start,
static HRESULT WINAPI ICMStream_fnDelete(IAVIStream *iface, LONG start, static HRESULT WINAPI ICMStream_fnDelete(IAVIStream *iface, LONG start,
LONG samples) LONG samples)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p,%ld,%ld)\n", iface, start, samples); TRACE("(%p,%ld,%ld)\n", iface, start, samples);
...@@ -732,7 +732,7 @@ static HRESULT WINAPI ICMStream_fnDelete(IAVIStream *iface, LONG start, ...@@ -732,7 +732,7 @@ static HRESULT WINAPI ICMStream_fnDelete(IAVIStream *iface, LONG start,
static HRESULT WINAPI ICMStream_fnReadData(IAVIStream *iface, DWORD fcc, static HRESULT WINAPI ICMStream_fnReadData(IAVIStream *iface, DWORD fcc,
LPVOID lp, LPLONG lpread) LPVOID lp, LPLONG lpread)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p,0x%08lX,%p,%p)\n", iface, fcc, lp, lpread); TRACE("(%p,0x%08lX,%p,%p)\n", iface, fcc, lp, lpread);
...@@ -744,7 +744,7 @@ static HRESULT WINAPI ICMStream_fnReadData(IAVIStream *iface, DWORD fcc, ...@@ -744,7 +744,7 @@ static HRESULT WINAPI ICMStream_fnReadData(IAVIStream *iface, DWORD fcc,
static HRESULT WINAPI ICMStream_fnWriteData(IAVIStream *iface, DWORD fcc, static HRESULT WINAPI ICMStream_fnWriteData(IAVIStream *iface, DWORD fcc,
LPVOID lp, LONG size) LPVOID lp, LONG size)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p,0x%08lx,%p,%ld)\n", iface, fcc, lp, size); TRACE("(%p,0x%08lx,%p,%ld)\n", iface, fcc, lp, size);
......
...@@ -134,7 +134,7 @@ PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, PAVISTREAM *ppStreams) { ...@@ -134,7 +134,7 @@ PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, PAVISTREAM *ppStreams) {
static HRESULT WINAPI ITmpFile_fnQueryInterface(IAVIFile *iface, REFIID refiid, static HRESULT WINAPI ITmpFile_fnQueryInterface(IAVIFile *iface, REFIID refiid,
LPVOID *obj) LPVOID *obj)
{ {
ICOM_THIS(ITmpFileImpl,iface); ITmpFileImpl *This = (ITmpFileImpl *)iface;
TRACE("(%p,%s,%p)\n", This, debugstr_guid(refiid), obj); TRACE("(%p,%s,%p)\n", This, debugstr_guid(refiid), obj);
...@@ -151,7 +151,7 @@ static HRESULT WINAPI ITmpFile_fnQueryInterface(IAVIFile *iface, REFIID refiid, ...@@ -151,7 +151,7 @@ static HRESULT WINAPI ITmpFile_fnQueryInterface(IAVIFile *iface, REFIID refiid,
static ULONG WINAPI ITmpFile_fnAddRef(IAVIFile *iface) static ULONG WINAPI ITmpFile_fnAddRef(IAVIFile *iface)
{ {
ICOM_THIS(ITmpFileImpl,iface); ITmpFileImpl *This = (ITmpFileImpl *)iface;
TRACE("(%p) -> %ld\n", iface, This->ref + 1); TRACE("(%p) -> %ld\n", iface, This->ref + 1);
return ++(This->ref); return ++(This->ref);
...@@ -159,7 +159,7 @@ static ULONG WINAPI ITmpFile_fnAddRef(IAVIFile *iface) ...@@ -159,7 +159,7 @@ static ULONG WINAPI ITmpFile_fnAddRef(IAVIFile *iface)
static ULONG WINAPI ITmpFile_fnRelease(IAVIFile *iface) static ULONG WINAPI ITmpFile_fnRelease(IAVIFile *iface)
{ {
ICOM_THIS(ITmpFileImpl,iface); ITmpFileImpl *This = (ITmpFileImpl *)iface;
TRACE("(%p) -> %ld\n", iface, This->ref - 1); TRACE("(%p) -> %ld\n", iface, This->ref - 1);
...@@ -184,7 +184,7 @@ static ULONG WINAPI ITmpFile_fnRelease(IAVIFile *iface) ...@@ -184,7 +184,7 @@ static ULONG WINAPI ITmpFile_fnRelease(IAVIFile *iface)
static HRESULT WINAPI ITmpFile_fnInfo(IAVIFile *iface, static HRESULT WINAPI ITmpFile_fnInfo(IAVIFile *iface,
AVIFILEINFOW *afi, LONG size) AVIFILEINFOW *afi, LONG size)
{ {
ICOM_THIS(ITmpFileImpl,iface); ITmpFileImpl *This = (ITmpFileImpl *)iface;
TRACE("(%p,%p,%ld)\n",iface,afi,size); TRACE("(%p,%p,%ld)\n",iface,afi,size);
...@@ -203,7 +203,7 @@ static HRESULT WINAPI ITmpFile_fnInfo(IAVIFile *iface, ...@@ -203,7 +203,7 @@ static HRESULT WINAPI ITmpFile_fnInfo(IAVIFile *iface,
static HRESULT WINAPI ITmpFile_fnGetStream(IAVIFile *iface, PAVISTREAM *avis, static HRESULT WINAPI ITmpFile_fnGetStream(IAVIFile *iface, PAVISTREAM *avis,
DWORD fccType, LONG lParam) DWORD fccType, LONG lParam)
{ {
ICOM_THIS(ITmpFileImpl,iface); ITmpFileImpl *This = (ITmpFileImpl *)iface;
ULONG nStream = (ULONG)-1; ULONG nStream = (ULONG)-1;
......
...@@ -246,7 +246,7 @@ HRESULT AVIFILE_CreateWAVFile(REFIID riid, LPVOID *ppv) ...@@ -246,7 +246,7 @@ HRESULT AVIFILE_CreateWAVFile(REFIID riid, LPVOID *ppv)
static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile *iface, REFIID refiid, static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile *iface, REFIID refiid,
LPVOID *obj) LPVOID *obj)
{ {
ICOM_THIS(IAVIFileImpl,iface); IAVIFileImpl *This = (IAVIFileImpl *)iface;
TRACE("(%p,%s,%p)\n", This, debugstr_guid(refiid), obj); TRACE("(%p,%s,%p)\n", This, debugstr_guid(refiid), obj);
...@@ -268,7 +268,7 @@ static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile *iface, REFIID refiid, ...@@ -268,7 +268,7 @@ static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile *iface, REFIID refiid,
static ULONG WINAPI IAVIFile_fnAddRef(IAVIFile *iface) static ULONG WINAPI IAVIFile_fnAddRef(IAVIFile *iface)
{ {
ICOM_THIS(IAVIFileImpl,iface); IAVIFileImpl *This = (IAVIFileImpl *)iface;
TRACE("(%p)\n",iface); TRACE("(%p)\n",iface);
...@@ -277,7 +277,7 @@ static ULONG WINAPI IAVIFile_fnAddRef(IAVIFile *iface) ...@@ -277,7 +277,7 @@ static ULONG WINAPI IAVIFile_fnAddRef(IAVIFile *iface)
static ULONG WINAPI IAVIFile_fnRelease(IAVIFile *iface) static ULONG WINAPI IAVIFile_fnRelease(IAVIFile *iface)
{ {
ICOM_THIS(IAVIFileImpl,iface); IAVIFileImpl *This = (IAVIFileImpl *)iface;
TRACE("(%p)\n",iface); TRACE("(%p)\n",iface);
...@@ -315,7 +315,7 @@ static ULONG WINAPI IAVIFile_fnRelease(IAVIFile *iface) ...@@ -315,7 +315,7 @@ static ULONG WINAPI IAVIFile_fnRelease(IAVIFile *iface)
static HRESULT WINAPI IAVIFile_fnInfo(IAVIFile *iface, LPAVIFILEINFOW afi, static HRESULT WINAPI IAVIFile_fnInfo(IAVIFile *iface, LPAVIFILEINFOW afi,
LONG size) LONG size)
{ {
ICOM_THIS(IAVIFileImpl,iface); IAVIFileImpl *This = (IAVIFileImpl *)iface;
TRACE("(%p,%p,%ld)\n",iface,afi,size); TRACE("(%p,%p,%ld)\n",iface,afi,size);
...@@ -349,7 +349,7 @@ static HRESULT WINAPI IAVIFile_fnInfo(IAVIFile *iface, LPAVIFILEINFOW afi, ...@@ -349,7 +349,7 @@ static HRESULT WINAPI IAVIFile_fnInfo(IAVIFile *iface, LPAVIFILEINFOW afi,
static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, PAVISTREAM *avis, static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, PAVISTREAM *avis,
DWORD fccType, LONG lParam) DWORD fccType, LONG lParam)
{ {
ICOM_THIS(IAVIFileImpl,iface); IAVIFileImpl *This = (IAVIFileImpl *)iface;
TRACE("(%p,%p,0x%08lX,%ld)\n", iface, avis, fccType, lParam); TRACE("(%p,%p,0x%08lX,%ld)\n", iface, avis, fccType, lParam);
...@@ -374,7 +374,7 @@ static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, PAVISTREAM *avis, ...@@ -374,7 +374,7 @@ static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, PAVISTREAM *avis,
static HRESULT WINAPI IAVIFile_fnCreateStream(IAVIFile *iface,PAVISTREAM *avis, static HRESULT WINAPI IAVIFile_fnCreateStream(IAVIFile *iface,PAVISTREAM *avis,
LPAVISTREAMINFOW asi) LPAVISTREAMINFOW asi)
{ {
ICOM_THIS(IAVIFileImpl,iface); IAVIFileImpl *This = (IAVIFileImpl *)iface;
TRACE("(%p,%p,%p)\n", iface, avis, asi); TRACE("(%p,%p,%p)\n", iface, avis, asi);
...@@ -425,7 +425,7 @@ static HRESULT WINAPI IAVIFile_fnCreateStream(IAVIFile *iface,PAVISTREAM *avis, ...@@ -425,7 +425,7 @@ static HRESULT WINAPI IAVIFile_fnCreateStream(IAVIFile *iface,PAVISTREAM *avis,
static HRESULT WINAPI IAVIFile_fnWriteData(IAVIFile *iface, DWORD ckid, static HRESULT WINAPI IAVIFile_fnWriteData(IAVIFile *iface, DWORD ckid,
LPVOID lpData, LONG size) LPVOID lpData, LONG size)
{ {
ICOM_THIS(IAVIFileImpl,iface); IAVIFileImpl *This = (IAVIFileImpl *)iface;
TRACE("(%p,0x%08lX,%p,%ld)\n", iface, ckid, lpData, size); TRACE("(%p,0x%08lX,%p,%ld)\n", iface, ckid, lpData, size);
...@@ -447,7 +447,7 @@ static HRESULT WINAPI IAVIFile_fnWriteData(IAVIFile *iface, DWORD ckid, ...@@ -447,7 +447,7 @@ static HRESULT WINAPI IAVIFile_fnWriteData(IAVIFile *iface, DWORD ckid,
static HRESULT WINAPI IAVIFile_fnReadData(IAVIFile *iface, DWORD ckid, static HRESULT WINAPI IAVIFile_fnReadData(IAVIFile *iface, DWORD ckid,
LPVOID lpData, LONG *size) LPVOID lpData, LONG *size)
{ {
ICOM_THIS(IAVIFileImpl,iface); IAVIFileImpl *This = (IAVIFileImpl *)iface;
TRACE("(%p,0x%08lX,%p,%p)\n", iface, ckid, lpData, size); TRACE("(%p,0x%08lX,%p,%p)\n", iface, ckid, lpData, size);
...@@ -467,7 +467,7 @@ static HRESULT WINAPI IAVIFile_fnEndRecord(IAVIFile *iface) ...@@ -467,7 +467,7 @@ static HRESULT WINAPI IAVIFile_fnEndRecord(IAVIFile *iface)
static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile *iface, DWORD fccType, static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile *iface, DWORD fccType,
LONG lParam) LONG lParam)
{ {
ICOM_THIS(IAVIFileImpl,iface); IAVIFileImpl *This = (IAVIFileImpl *)iface;
TRACE("(%p,0x%08lX,%ld)\n", iface, fccType, lParam); TRACE("(%p,0x%08lX,%ld)\n", iface, fccType, lParam);
...@@ -510,7 +510,7 @@ static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile *iface, DWORD fccType, ...@@ -510,7 +510,7 @@ static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile *iface, DWORD fccType,
static HRESULT WINAPI IPersistFile_fnQueryInterface(IPersistFile *iface, static HRESULT WINAPI IPersistFile_fnQueryInterface(IPersistFile *iface,
REFIID refiid, LPVOID *obj) REFIID refiid, LPVOID *obj)
{ {
ICOM_THIS(IPersistFileImpl,iface); IPersistFileImpl *This = (IPersistFileImpl *)iface;
assert(This->paf != NULL); assert(This->paf != NULL);
...@@ -519,7 +519,7 @@ static HRESULT WINAPI IPersistFile_fnQueryInterface(IPersistFile *iface, ...@@ -519,7 +519,7 @@ static HRESULT WINAPI IPersistFile_fnQueryInterface(IPersistFile *iface,
static ULONG WINAPI IPersistFile_fnAddRef(IPersistFile *iface) static ULONG WINAPI IPersistFile_fnAddRef(IPersistFile *iface)
{ {
ICOM_THIS(IPersistFileImpl,iface); IPersistFileImpl *This = (IPersistFileImpl *)iface;
assert(This->paf != NULL); assert(This->paf != NULL);
...@@ -528,7 +528,7 @@ static ULONG WINAPI IPersistFile_fnAddRef(IPersistFile *iface) ...@@ -528,7 +528,7 @@ static ULONG WINAPI IPersistFile_fnAddRef(IPersistFile *iface)
static ULONG WINAPI IPersistFile_fnRelease(IPersistFile *iface) static ULONG WINAPI IPersistFile_fnRelease(IPersistFile *iface)
{ {
ICOM_THIS(IPersistFileImpl,iface); IPersistFileImpl *This = (IPersistFileImpl *)iface;
assert(This->paf != NULL); assert(This->paf != NULL);
...@@ -550,7 +550,7 @@ static HRESULT WINAPI IPersistFile_fnGetClassID(IPersistFile *iface, ...@@ -550,7 +550,7 @@ static HRESULT WINAPI IPersistFile_fnGetClassID(IPersistFile *iface,
static HRESULT WINAPI IPersistFile_fnIsDirty(IPersistFile *iface) static HRESULT WINAPI IPersistFile_fnIsDirty(IPersistFile *iface)
{ {
ICOM_THIS(IPersistFileImpl,iface); IPersistFileImpl *This = (IPersistFileImpl *)iface;
TRACE("(%p)\n", iface); TRACE("(%p)\n", iface);
...@@ -648,7 +648,7 @@ static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile *iface, ...@@ -648,7 +648,7 @@ static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile *iface,
static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile *iface, static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile *iface,
LPOLESTR *ppszFileName) LPOLESTR *ppszFileName)
{ {
ICOM_THIS(IPersistFileImpl,iface); IPersistFileImpl *This = (IPersistFileImpl *)iface;
TRACE("(%p,%p)\n", iface, ppszFileName); TRACE("(%p,%p)\n", iface, ppszFileName);
...@@ -677,7 +677,7 @@ static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile *iface, ...@@ -677,7 +677,7 @@ static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile *iface,
static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream *iface, static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream *iface,
REFIID refiid, LPVOID *obj) REFIID refiid, LPVOID *obj)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
assert(This->paf != NULL); assert(This->paf != NULL);
...@@ -686,7 +686,7 @@ static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream *iface, ...@@ -686,7 +686,7 @@ static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream *iface,
static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream *iface) static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream *iface)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
assert(This->paf != NULL); assert(This->paf != NULL);
...@@ -695,7 +695,7 @@ static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream *iface) ...@@ -695,7 +695,7 @@ static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream *iface)
static ULONG WINAPI IAVIStream_fnRelease(IAVIStream* iface) static ULONG WINAPI IAVIStream_fnRelease(IAVIStream* iface)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
assert(This->paf != NULL); assert(This->paf != NULL);
...@@ -714,7 +714,7 @@ static HRESULT WINAPI IAVIStream_fnCreate(IAVIStream *iface, LPARAM lParam1, ...@@ -714,7 +714,7 @@ static HRESULT WINAPI IAVIStream_fnCreate(IAVIStream *iface, LPARAM lParam1,
static HRESULT WINAPI IAVIStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi, static HRESULT WINAPI IAVIStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi,
LONG size) LONG size)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p,%p,%ld)\n", iface, psi, size); TRACE("(%p,%p,%ld)\n", iface, psi, size);
...@@ -770,7 +770,7 @@ static LONG WINAPI IAVIStream_fnFindSample(IAVIStream *iface, LONG pos, ...@@ -770,7 +770,7 @@ static LONG WINAPI IAVIStream_fnFindSample(IAVIStream *iface, LONG pos,
static HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream *iface, LONG pos, static HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream *iface, LONG pos,
LPVOID format, LONG *formatsize) LPVOID format, LONG *formatsize)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
TRACE("(%p,%ld,%p,%p)\n", iface, pos, format, formatsize); TRACE("(%p,%ld,%p,%p)\n", iface, pos, format, formatsize);
...@@ -1029,7 +1029,7 @@ static HRESULT WINAPI IAVIStream_fnDelete(IAVIStream *iface, LONG start, ...@@ -1029,7 +1029,7 @@ static HRESULT WINAPI IAVIStream_fnDelete(IAVIStream *iface, LONG start,
static HRESULT WINAPI IAVIStream_fnReadData(IAVIStream *iface, DWORD fcc, static HRESULT WINAPI IAVIStream_fnReadData(IAVIStream *iface, DWORD fcc,
LPVOID lp, LPLONG lpread) LPVOID lp, LPLONG lpread)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
assert(This->paf != NULL); assert(This->paf != NULL);
...@@ -1039,7 +1039,7 @@ static HRESULT WINAPI IAVIStream_fnReadData(IAVIStream *iface, DWORD fcc, ...@@ -1039,7 +1039,7 @@ static HRESULT WINAPI IAVIStream_fnReadData(IAVIStream *iface, DWORD fcc,
static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream *iface, DWORD fcc, static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream *iface, DWORD fcc,
LPVOID lp, LONG size) LPVOID lp, LONG size)
{ {
ICOM_THIS(IAVIStreamImpl,iface); IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
return IAVIFile_WriteData((PAVIFILE)This->paf, fcc, lp, size); return IAVIFile_WriteData((PAVIFILE)This->paf, fcc, lp, size);
} }
......
...@@ -34,7 +34,7 @@ static HRESULT WINAPI COMCAT_IClassFactory_QueryInterface( ...@@ -34,7 +34,7 @@ static HRESULT WINAPI COMCAT_IClassFactory_QueryInterface(
REFIID riid, REFIID riid,
LPVOID *ppvObj) LPVOID *ppvObj)
{ {
ICOM_THIS(ClassFactoryImpl, iface); ClassFactoryImpl *This = (ClassFactoryImpl *)iface;
TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
if (This == NULL || ppvObj == NULL) return E_POINTER; if (This == NULL || ppvObj == NULL) return E_POINTER;
...@@ -55,7 +55,7 @@ static HRESULT WINAPI COMCAT_IClassFactory_QueryInterface( ...@@ -55,7 +55,7 @@ static HRESULT WINAPI COMCAT_IClassFactory_QueryInterface(
*/ */
static ULONG WINAPI COMCAT_IClassFactory_AddRef(LPCLASSFACTORY iface) static ULONG WINAPI COMCAT_IClassFactory_AddRef(LPCLASSFACTORY iface)
{ {
ICOM_THIS(ClassFactoryImpl, iface); ClassFactoryImpl *This = (ClassFactoryImpl *)iface;
TRACE("\n"); TRACE("\n");
if (This == NULL) return E_POINTER; if (This == NULL) return E_POINTER;
...@@ -71,7 +71,7 @@ static ULONG WINAPI COMCAT_IClassFactory_AddRef(LPCLASSFACTORY iface) ...@@ -71,7 +71,7 @@ static ULONG WINAPI COMCAT_IClassFactory_AddRef(LPCLASSFACTORY iface)
*/ */
static ULONG WINAPI COMCAT_IClassFactory_Release(LPCLASSFACTORY iface) static ULONG WINAPI COMCAT_IClassFactory_Release(LPCLASSFACTORY iface)
{ {
ICOM_THIS(ClassFactoryImpl, iface); ClassFactoryImpl *This = (ClassFactoryImpl *)iface;
TRACE("\n"); TRACE("\n");
if (This == NULL) return E_POINTER; if (This == NULL) return E_POINTER;
...@@ -91,7 +91,7 @@ static HRESULT WINAPI COMCAT_IClassFactory_CreateInstance( ...@@ -91,7 +91,7 @@ static HRESULT WINAPI COMCAT_IClassFactory_CreateInstance(
REFIID riid, REFIID riid,
LPVOID *ppvObj) LPVOID *ppvObj)
{ {
ICOM_THIS(ClassFactoryImpl, iface); ClassFactoryImpl *This = (ClassFactoryImpl *)iface;
HRESULT res; HRESULT res;
TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
......
...@@ -306,7 +306,7 @@ typedef struct ...@@ -306,7 +306,7 @@ typedef struct
static ULONG WINAPI COMCAT_IEnumCATEGORYINFO_AddRef(LPENUMCATEGORYINFO iface) static ULONG WINAPI COMCAT_IEnumCATEGORYINFO_AddRef(LPENUMCATEGORYINFO iface)
{ {
ICOM_THIS(IEnumCATEGORYINFOImpl, iface); IEnumCATEGORYINFOImpl *This = (IEnumCATEGORYINFOImpl *)iface;
TRACE("\n"); TRACE("\n");
if (This == NULL) return E_POINTER; if (This == NULL) return E_POINTER;
...@@ -319,7 +319,7 @@ static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_QueryInterface( ...@@ -319,7 +319,7 @@ static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_QueryInterface(
REFIID riid, REFIID riid,
LPVOID *ppvObj) LPVOID *ppvObj)
{ {
ICOM_THIS(IEnumCATEGORYINFOImpl, iface); IEnumCATEGORYINFOImpl *This = (IEnumCATEGORYINFOImpl *)iface;
TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
if (This == NULL || ppvObj == NULL) return E_POINTER; if (This == NULL || ppvObj == NULL) return E_POINTER;
...@@ -337,7 +337,7 @@ static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_QueryInterface( ...@@ -337,7 +337,7 @@ static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_QueryInterface(
static ULONG WINAPI COMCAT_IEnumCATEGORYINFO_Release(LPENUMCATEGORYINFO iface) static ULONG WINAPI COMCAT_IEnumCATEGORYINFO_Release(LPENUMCATEGORYINFO iface)
{ {
ICOM_THIS(IEnumCATEGORYINFOImpl, iface); IEnumCATEGORYINFOImpl *This = (IEnumCATEGORYINFOImpl *)iface;
TRACE("\n"); TRACE("\n");
if (This == NULL) return E_POINTER; if (This == NULL) return E_POINTER;
...@@ -356,7 +356,7 @@ static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Next( ...@@ -356,7 +356,7 @@ static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Next(
CATEGORYINFO *rgelt, CATEGORYINFO *rgelt,
ULONG *pceltFetched) ULONG *pceltFetched)
{ {
ICOM_THIS(IEnumCATEGORYINFOImpl, iface); IEnumCATEGORYINFOImpl *This = (IEnumCATEGORYINFOImpl *)iface;
ULONG fetched = 0; ULONG fetched = 0;
TRACE("\n"); TRACE("\n");
...@@ -398,7 +398,7 @@ static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Skip( ...@@ -398,7 +398,7 @@ static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Skip(
LPENUMCATEGORYINFO iface, LPENUMCATEGORYINFO iface,
ULONG celt) ULONG celt)
{ {
ICOM_THIS(IEnumCATEGORYINFOImpl, iface); IEnumCATEGORYINFOImpl *This = (IEnumCATEGORYINFOImpl *)iface;
TRACE("\n"); TRACE("\n");
...@@ -410,7 +410,7 @@ static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Skip( ...@@ -410,7 +410,7 @@ static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Skip(
static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Reset(LPENUMCATEGORYINFO iface) static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Reset(LPENUMCATEGORYINFO iface)
{ {
ICOM_THIS(IEnumCATEGORYINFOImpl, iface); IEnumCATEGORYINFOImpl *This = (IEnumCATEGORYINFOImpl *)iface;
TRACE("\n"); TRACE("\n");
...@@ -423,7 +423,7 @@ static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Clone( ...@@ -423,7 +423,7 @@ static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Clone(
LPENUMCATEGORYINFO iface, LPENUMCATEGORYINFO iface,
IEnumCATEGORYINFO **ppenum) IEnumCATEGORYINFO **ppenum)
{ {
ICOM_THIS(IEnumCATEGORYINFOImpl, iface); IEnumCATEGORYINFOImpl *This = (IEnumCATEGORYINFOImpl *)iface;
WCHAR keyname[21] = { 'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n', WCHAR keyname[21] = { 'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n',
't', ' ', 'C', 'a', 't', 'e', 'g', 'o', 't', ' ', 'C', 'a', 't', 'e', 'g', 'o',
'r', 'i', 'e', 's', 0 }; 'r', 'i', 'e', 's', 0 };
...@@ -608,7 +608,7 @@ typedef struct ...@@ -608,7 +608,7 @@ typedef struct
static ULONG WINAPI COMCAT_CLSID_IEnumGUID_AddRef(LPENUMGUID iface) static ULONG WINAPI COMCAT_CLSID_IEnumGUID_AddRef(LPENUMGUID iface)
{ {
ICOM_THIS(CLSID_IEnumGUIDImpl, iface); CLSID_IEnumGUIDImpl *This = (CLSID_IEnumGUIDImpl *)iface;
TRACE("\n"); TRACE("\n");
if (This == NULL) return E_POINTER; if (This == NULL) return E_POINTER;
...@@ -621,7 +621,7 @@ static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_QueryInterface( ...@@ -621,7 +621,7 @@ static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_QueryInterface(
REFIID riid, REFIID riid,
LPVOID *ppvObj) LPVOID *ppvObj)
{ {
ICOM_THIS(CLSID_IEnumGUIDImpl, iface); CLSID_IEnumGUIDImpl *This = (CLSID_IEnumGUIDImpl *)iface;
TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
if (This == NULL || ppvObj == NULL) return E_POINTER; if (This == NULL || ppvObj == NULL) return E_POINTER;
...@@ -639,7 +639,7 @@ static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_QueryInterface( ...@@ -639,7 +639,7 @@ static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_QueryInterface(
static ULONG WINAPI COMCAT_CLSID_IEnumGUID_Release(LPENUMGUID iface) static ULONG WINAPI COMCAT_CLSID_IEnumGUID_Release(LPENUMGUID iface)
{ {
ICOM_THIS(CLSID_IEnumGUIDImpl, iface); CLSID_IEnumGUIDImpl *This = (CLSID_IEnumGUIDImpl *)iface;
TRACE("\n"); TRACE("\n");
if (This == NULL) return E_POINTER; if (This == NULL) return E_POINTER;
...@@ -659,7 +659,7 @@ static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_Next( ...@@ -659,7 +659,7 @@ static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_Next(
GUID *rgelt, GUID *rgelt,
ULONG *pceltFetched) ULONG *pceltFetched)
{ {
ICOM_THIS(CLSID_IEnumGUIDImpl, iface); CLSID_IEnumGUIDImpl *This = (CLSID_IEnumGUIDImpl *)iface;
ULONG fetched = 0; ULONG fetched = 0;
TRACE("\n"); TRACE("\n");
...@@ -699,7 +699,7 @@ static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_Skip( ...@@ -699,7 +699,7 @@ static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_Skip(
LPENUMGUID iface, LPENUMGUID iface,
ULONG celt) ULONG celt)
{ {
ICOM_THIS(CLSID_IEnumGUIDImpl, iface); CLSID_IEnumGUIDImpl *This = (CLSID_IEnumGUIDImpl *)iface;
TRACE("\n"); TRACE("\n");
...@@ -711,7 +711,7 @@ static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_Skip( ...@@ -711,7 +711,7 @@ static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_Skip(
static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_Reset(LPENUMGUID iface) static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_Reset(LPENUMGUID iface)
{ {
ICOM_THIS(CLSID_IEnumGUIDImpl, iface); CLSID_IEnumGUIDImpl *This = (CLSID_IEnumGUIDImpl *)iface;
TRACE("\n"); TRACE("\n");
...@@ -724,7 +724,7 @@ static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_Clone( ...@@ -724,7 +724,7 @@ static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_Clone(
LPENUMGUID iface, LPENUMGUID iface,
IEnumGUID **ppenum) IEnumGUID **ppenum)
{ {
ICOM_THIS(CLSID_IEnumGUIDImpl, iface); CLSID_IEnumGUIDImpl *This = (CLSID_IEnumGUIDImpl *)iface;
WCHAR keyname[6] = { 'C', 'L', 'S', 'I', 'D', 0 }; WCHAR keyname[6] = { 'C', 'L', 'S', 'I', 'D', 0 };
CLSID_IEnumGUIDImpl *new_this; CLSID_IEnumGUIDImpl *new_this;
DWORD size; DWORD size;
...@@ -800,7 +800,7 @@ typedef struct ...@@ -800,7 +800,7 @@ typedef struct
static ULONG WINAPI COMCAT_CATID_IEnumGUID_AddRef(LPENUMGUID iface) static ULONG WINAPI COMCAT_CATID_IEnumGUID_AddRef(LPENUMGUID iface)
{ {
ICOM_THIS(CATID_IEnumGUIDImpl, iface); CATID_IEnumGUIDImpl *This = (CATID_IEnumGUIDImpl *)iface;
TRACE("\n"); TRACE("\n");
if (This == NULL) return E_POINTER; if (This == NULL) return E_POINTER;
...@@ -813,7 +813,7 @@ static HRESULT WINAPI COMCAT_CATID_IEnumGUID_QueryInterface( ...@@ -813,7 +813,7 @@ static HRESULT WINAPI COMCAT_CATID_IEnumGUID_QueryInterface(
REFIID riid, REFIID riid,
LPVOID *ppvObj) LPVOID *ppvObj)
{ {
ICOM_THIS(CATID_IEnumGUIDImpl, iface); CATID_IEnumGUIDImpl *This = (CATID_IEnumGUIDImpl *)iface;
TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
if (This == NULL || ppvObj == NULL) return E_POINTER; if (This == NULL || ppvObj == NULL) return E_POINTER;
...@@ -831,7 +831,7 @@ static HRESULT WINAPI COMCAT_CATID_IEnumGUID_QueryInterface( ...@@ -831,7 +831,7 @@ static HRESULT WINAPI COMCAT_CATID_IEnumGUID_QueryInterface(
static ULONG WINAPI COMCAT_CATID_IEnumGUID_Release(LPENUMGUID iface) static ULONG WINAPI COMCAT_CATID_IEnumGUID_Release(LPENUMGUID iface)
{ {
ICOM_THIS(CATID_IEnumGUIDImpl, iface); CATID_IEnumGUIDImpl *This = (CATID_IEnumGUIDImpl *)iface;
TRACE("\n"); TRACE("\n");
if (This == NULL) return E_POINTER; if (This == NULL) return E_POINTER;
...@@ -850,7 +850,7 @@ static HRESULT WINAPI COMCAT_CATID_IEnumGUID_Next( ...@@ -850,7 +850,7 @@ static HRESULT WINAPI COMCAT_CATID_IEnumGUID_Next(
GUID *rgelt, GUID *rgelt,
ULONG *pceltFetched) ULONG *pceltFetched)
{ {
ICOM_THIS(CATID_IEnumGUIDImpl, iface); CATID_IEnumGUIDImpl *This = (CATID_IEnumGUIDImpl *)iface;
ULONG fetched = 0; ULONG fetched = 0;
TRACE("\n"); TRACE("\n");
...@@ -882,7 +882,7 @@ static HRESULT WINAPI COMCAT_CATID_IEnumGUID_Skip( ...@@ -882,7 +882,7 @@ static HRESULT WINAPI COMCAT_CATID_IEnumGUID_Skip(
LPENUMGUID iface, LPENUMGUID iface,
ULONG celt) ULONG celt)
{ {
ICOM_THIS(CATID_IEnumGUIDImpl, iface); CATID_IEnumGUIDImpl *This = (CATID_IEnumGUIDImpl *)iface;
TRACE("\n"); TRACE("\n");
...@@ -894,7 +894,7 @@ static HRESULT WINAPI COMCAT_CATID_IEnumGUID_Skip( ...@@ -894,7 +894,7 @@ static HRESULT WINAPI COMCAT_CATID_IEnumGUID_Skip(
static HRESULT WINAPI COMCAT_CATID_IEnumGUID_Reset(LPENUMGUID iface) static HRESULT WINAPI COMCAT_CATID_IEnumGUID_Reset(LPENUMGUID iface)
{ {
ICOM_THIS(CATID_IEnumGUIDImpl, iface); CATID_IEnumGUIDImpl *This = (CATID_IEnumGUIDImpl *)iface;
TRACE("\n"); TRACE("\n");
...@@ -907,7 +907,7 @@ static HRESULT WINAPI COMCAT_CATID_IEnumGUID_Clone( ...@@ -907,7 +907,7 @@ static HRESULT WINAPI COMCAT_CATID_IEnumGUID_Clone(
LPENUMGUID iface, LPENUMGUID iface,
IEnumGUID **ppenum) IEnumGUID **ppenum)
{ {
ICOM_THIS(CATID_IEnumGUIDImpl, iface); CATID_IEnumGUIDImpl *This = (CATID_IEnumGUIDImpl *)iface;
CATID_IEnumGUIDImpl *new_this; CATID_IEnumGUIDImpl *new_this;
TRACE("\n"); TRACE("\n");
......
...@@ -175,7 +175,7 @@ HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface, ...@@ -175,7 +175,7 @@ HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface,
REFIID riid, REFIID riid,
LPVOID *ppvObj) LPVOID *ppvObj)
{ {
ICOM_THIS(IShellBrowserImpl, iface); IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
TRACE("(%p)\n\t%s\n", This, debugstr_guid(riid)); TRACE("(%p)\n\t%s\n", This, debugstr_guid(riid));
...@@ -213,7 +213,7 @@ HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface, ...@@ -213,7 +213,7 @@ HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface,
*/ */
ULONG WINAPI IShellBrowserImpl_AddRef(IShellBrowser * iface) ULONG WINAPI IShellBrowserImpl_AddRef(IShellBrowser * iface)
{ {
ICOM_THIS(IShellBrowserImpl, iface); IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
TRACE("(%p,%lu)\n", This, This->ref); TRACE("(%p,%lu)\n", This, This->ref);
...@@ -225,7 +225,7 @@ ULONG WINAPI IShellBrowserImpl_AddRef(IShellBrowser * iface) ...@@ -225,7 +225,7 @@ ULONG WINAPI IShellBrowserImpl_AddRef(IShellBrowser * iface)
*/ */
ULONG WINAPI IShellBrowserImpl_Release(IShellBrowser * iface) ULONG WINAPI IShellBrowserImpl_Release(IShellBrowser * iface)
{ {
ICOM_THIS(IShellBrowserImpl, iface); IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
TRACE("(%p,%lu)\n", This, This->ref); TRACE("(%p,%lu)\n", This, This->ref);
...@@ -255,7 +255,7 @@ ULONG WINAPI IShellBrowserImpl_Release(IShellBrowser * iface) ...@@ -255,7 +255,7 @@ ULONG WINAPI IShellBrowserImpl_Release(IShellBrowser * iface)
HRESULT WINAPI IShellBrowserImpl_GetWindow(IShellBrowser * iface, HRESULT WINAPI IShellBrowserImpl_GetWindow(IShellBrowser * iface,
HWND * phwnd) HWND * phwnd)
{ {
ICOM_THIS(IShellBrowserImpl, iface); IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
...@@ -274,7 +274,7 @@ HRESULT WINAPI IShellBrowserImpl_GetWindow(IShellBrowser * iface, ...@@ -274,7 +274,7 @@ HRESULT WINAPI IShellBrowserImpl_GetWindow(IShellBrowser * iface,
HRESULT WINAPI IShellBrowserImpl_ContextSensitiveHelp(IShellBrowser * iface, HRESULT WINAPI IShellBrowserImpl_ContextSensitiveHelp(IShellBrowser * iface,
BOOL fEnterMode) BOOL fEnterMode)
{ {
ICOM_THIS(IShellBrowserImpl, iface); IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
...@@ -308,7 +308,7 @@ HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface, ...@@ -308,7 +308,7 @@ HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface,
BOOL bViewHasFocus; BOOL bViewHasFocus;
RECT rectView; RECT rectView;
ICOM_THIS(IShellBrowserImpl, iface); IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
TRACE("(%p)(pidl=%p,flags=0x%08x(%s))\n", This, pidl, wFlags, TRACE("(%p)(pidl=%p,flags=0x%08x(%s))\n", This, pidl, wFlags,
(wFlags & SBSP_RELATIVE) ? "SBSP_RELATIVE" : (wFlags & SBSP_RELATIVE) ? "SBSP_RELATIVE" :
...@@ -437,7 +437,7 @@ HRESULT WINAPI IShellBrowserImpl_EnableModelessSB(IShellBrowser *iface, ...@@ -437,7 +437,7 @@ HRESULT WINAPI IShellBrowserImpl_EnableModelessSB(IShellBrowser *iface,
BOOL fEnable) BOOL fEnable)
{ {
ICOM_THIS(IShellBrowserImpl, iface); IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
...@@ -453,7 +453,7 @@ HRESULT WINAPI IShellBrowserImpl_GetControlWindow(IShellBrowser *iface, ...@@ -453,7 +453,7 @@ HRESULT WINAPI IShellBrowserImpl_GetControlWindow(IShellBrowser *iface,
HWND *lphwnd) HWND *lphwnd)
{ {
ICOM_THIS(IShellBrowserImpl, iface); IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
...@@ -468,7 +468,7 @@ HRESULT WINAPI IShellBrowserImpl_GetViewStateStream(IShellBrowser *iface, ...@@ -468,7 +468,7 @@ HRESULT WINAPI IShellBrowserImpl_GetViewStateStream(IShellBrowser *iface,
LPSTREAM *ppStrm) LPSTREAM *ppStrm)
{ {
ICOM_THIS(IShellBrowserImpl, iface); IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
FIXME("(%p 0x%08lx %p)\n", This, grfMode, ppStrm); FIXME("(%p 0x%08lx %p)\n", This, grfMode, ppStrm);
...@@ -483,7 +483,7 @@ HRESULT WINAPI IShellBrowserImpl_InsertMenusSB(IShellBrowser *iface, ...@@ -483,7 +483,7 @@ HRESULT WINAPI IShellBrowserImpl_InsertMenusSB(IShellBrowser *iface,
LPOLEMENUGROUPWIDTHS lpMenuWidths) LPOLEMENUGROUPWIDTHS lpMenuWidths)
{ {
ICOM_THIS(IShellBrowserImpl, iface); IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
...@@ -497,7 +497,7 @@ HRESULT WINAPI IShellBrowserImpl_OnViewWindowActive(IShellBrowser *iface, ...@@ -497,7 +497,7 @@ HRESULT WINAPI IShellBrowserImpl_OnViewWindowActive(IShellBrowser *iface,
IShellView *ppshv) IShellView *ppshv)
{ {
ICOM_THIS(IShellBrowserImpl, iface); IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
...@@ -511,7 +511,7 @@ HRESULT WINAPI IShellBrowserImpl_QueryActiveShellView(IShellBrowser *iface, ...@@ -511,7 +511,7 @@ HRESULT WINAPI IShellBrowserImpl_QueryActiveShellView(IShellBrowser *iface,
IShellView **ppshv) IShellView **ppshv)
{ {
ICOM_THIS(IShellBrowserImpl, iface); IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
FileOpenDlgInfos *fodInfos; FileOpenDlgInfos *fodInfos;
...@@ -533,7 +533,7 @@ HRESULT WINAPI IShellBrowserImpl_RemoveMenusSB(IShellBrowser *iface, ...@@ -533,7 +533,7 @@ HRESULT WINAPI IShellBrowserImpl_RemoveMenusSB(IShellBrowser *iface,
HMENU hmenuShared) HMENU hmenuShared)
{ {
ICOM_THIS(IShellBrowserImpl, iface); IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
...@@ -551,7 +551,7 @@ HRESULT WINAPI IShellBrowserImpl_SendControlMsg(IShellBrowser *iface, ...@@ -551,7 +551,7 @@ HRESULT WINAPI IShellBrowserImpl_SendControlMsg(IShellBrowser *iface,
LRESULT *pret) LRESULT *pret)
{ {
ICOM_THIS(IShellBrowserImpl, iface); IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
LRESULT lres; LRESULT lres;
TRACE("(%p)->(0x%08x 0x%08x 0x%08x 0x%08lx %p)\n", This, id, uMsg, wParam, lParam, pret); TRACE("(%p)->(0x%08x 0x%08x 0x%08x 0x%08lx %p)\n", This, id, uMsg, wParam, lParam, pret);
...@@ -577,7 +577,7 @@ HRESULT WINAPI IShellBrowserImpl_SetMenuSB(IShellBrowser *iface, ...@@ -577,7 +577,7 @@ HRESULT WINAPI IShellBrowserImpl_SetMenuSB(IShellBrowser *iface,
HWND hwndActiveObject) HWND hwndActiveObject)
{ {
ICOM_THIS(IShellBrowserImpl, iface); IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
...@@ -591,7 +591,7 @@ HRESULT WINAPI IShellBrowserImpl_SetStatusTextSB(IShellBrowser *iface, ...@@ -591,7 +591,7 @@ HRESULT WINAPI IShellBrowserImpl_SetStatusTextSB(IShellBrowser *iface,
LPCOLESTR lpszStatusText) LPCOLESTR lpszStatusText)
{ {
ICOM_THIS(IShellBrowserImpl, iface); IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
...@@ -607,7 +607,7 @@ HRESULT WINAPI IShellBrowserImpl_SetToolbarItems(IShellBrowser *iface, ...@@ -607,7 +607,7 @@ HRESULT WINAPI IShellBrowserImpl_SetToolbarItems(IShellBrowser *iface,
UINT uFlags) UINT uFlags)
{ {
ICOM_THIS(IShellBrowserImpl, iface); IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
...@@ -622,7 +622,7 @@ HRESULT WINAPI IShellBrowserImpl_TranslateAcceleratorSB(IShellBrowser *iface, ...@@ -622,7 +622,7 @@ HRESULT WINAPI IShellBrowserImpl_TranslateAcceleratorSB(IShellBrowser *iface,
WORD wID) WORD wID)
{ {
ICOM_THIS(IShellBrowserImpl, iface); IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
......
...@@ -80,7 +80,7 @@ static const struct object_creation_info object_creation[] = ...@@ -80,7 +80,7 @@ static const struct object_creation_info object_creation[] =
static HRESULT WINAPI XFCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid, LPVOID *ppobj) static HRESULT WINAPI XFCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid, LPVOID *ppobj)
{ {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
if (IsEqualGUID(riid, &IID_IUnknown) if (IsEqualGUID(riid, &IID_IUnknown)
|| IsEqualGUID(riid, &IID_IClassFactory)) || IsEqualGUID(riid, &IID_IClassFactory))
...@@ -96,13 +96,13 @@ static HRESULT WINAPI XFCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid, LPVO ...@@ -96,13 +96,13 @@ static HRESULT WINAPI XFCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid, LPVO
static ULONG WINAPI XFCF_AddRef(LPCLASSFACTORY iface) static ULONG WINAPI XFCF_AddRef(LPCLASSFACTORY iface)
{ {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
return ++(This->ref); return ++(This->ref);
} }
static ULONG WINAPI XFCF_Release(LPCLASSFACTORY iface) static ULONG WINAPI XFCF_Release(LPCLASSFACTORY iface)
{ {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
ULONG ref = --This->ref; ULONG ref = --This->ref;
...@@ -114,7 +114,7 @@ static ULONG WINAPI XFCF_Release(LPCLASSFACTORY iface) ...@@ -114,7 +114,7 @@ static ULONG WINAPI XFCF_Release(LPCLASSFACTORY iface)
static HRESULT WINAPI XFCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) static HRESULT WINAPI XFCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj)
{ {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
HRESULT hres; HRESULT hres;
LPUNKNOWN punk; LPUNKNOWN punk;
...@@ -136,7 +136,7 @@ static HRESULT WINAPI XFCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter ...@@ -136,7 +136,7 @@ static HRESULT WINAPI XFCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter
static HRESULT WINAPI XFCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) static HRESULT WINAPI XFCF_LockServer(LPCLASSFACTORY iface, BOOL dolock)
{ {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p)->(%d),stub!\n",This,dolock); FIXME("(%p)->(%d),stub!\n",This,dolock);
return S_OK; return S_OK;
} }
......
...@@ -56,7 +56,7 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_QueryInterface( ...@@ -56,7 +56,7 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_QueryInterface(
REFIID riid, REFIID riid,
LPVOID *ppvObj) LPVOID *ppvObj)
{ {
ICOM_THIS(CreateDevEnumImpl, iface); CreateDevEnumImpl *This = (CreateDevEnumImpl *)iface;
TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
if (This == NULL || ppvObj == NULL) return E_POINTER; if (This == NULL || ppvObj == NULL) return E_POINTER;
...@@ -78,7 +78,7 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_QueryInterface( ...@@ -78,7 +78,7 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_QueryInterface(
*/ */
static ULONG WINAPI DEVENUM_ICreateDevEnum_AddRef(ICreateDevEnum * iface) static ULONG WINAPI DEVENUM_ICreateDevEnum_AddRef(ICreateDevEnum * iface)
{ {
ICOM_THIS(CreateDevEnumImpl, iface); CreateDevEnumImpl *This = (CreateDevEnumImpl *)iface;
TRACE("\n"); TRACE("\n");
if (This == NULL) return E_POINTER; if (This == NULL) return E_POINTER;
...@@ -94,7 +94,7 @@ static ULONG WINAPI DEVENUM_ICreateDevEnum_AddRef(ICreateDevEnum * iface) ...@@ -94,7 +94,7 @@ static ULONG WINAPI DEVENUM_ICreateDevEnum_AddRef(ICreateDevEnum * iface)
*/ */
static ULONG WINAPI DEVENUM_ICreateDevEnum_Release(ICreateDevEnum * iface) static ULONG WINAPI DEVENUM_ICreateDevEnum_Release(ICreateDevEnum * iface)
{ {
ICOM_THIS(CreateDevEnumImpl, iface); CreateDevEnumImpl *This = (CreateDevEnumImpl *)iface;
TRACE("\n"); TRACE("\n");
if (This == NULL) return E_POINTER; if (This == NULL) return E_POINTER;
...@@ -118,7 +118,7 @@ HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( ...@@ -118,7 +118,7 @@ HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator(
EnumMonikerImpl * pEnumMoniker; EnumMonikerImpl * pEnumMoniker;
HKEY hkey; HKEY hkey;
HKEY hbasekey; HKEY hbasekey;
ICOM_THIS(CreateDevEnumImpl, iface); CreateDevEnumImpl *This = (CreateDevEnumImpl *)iface;
TRACE("(%p)->(%s, %p, %lx)\n\tDeviceClass:\t%s\n", This, debugstr_guid(clsidDeviceClass), ppEnumMoniker, dwFlags, debugstr_guid(clsidDeviceClass)); TRACE("(%p)->(%s, %p, %lx)\n\tDeviceClass:\t%s\n", This, debugstr_guid(clsidDeviceClass), ppEnumMoniker, dwFlags, debugstr_guid(clsidDeviceClass));
......
...@@ -33,7 +33,7 @@ static HRESULT WINAPI DEVENUM_IClassFactory_QueryInterface( ...@@ -33,7 +33,7 @@ static HRESULT WINAPI DEVENUM_IClassFactory_QueryInterface(
REFIID riid, REFIID riid,
LPVOID *ppvObj) LPVOID *ppvObj)
{ {
ICOM_THIS(ClassFactoryImpl, iface); ClassFactoryImpl *This = (ClassFactoryImpl *)iface;
TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
if (This == NULL || ppvObj == NULL) return E_POINTER; if (This == NULL || ppvObj == NULL) return E_POINTER;
...@@ -59,7 +59,7 @@ static HRESULT WINAPI DEVENUM_IClassFactory_QueryInterface( ...@@ -59,7 +59,7 @@ static HRESULT WINAPI DEVENUM_IClassFactory_QueryInterface(
*/ */
static ULONG WINAPI DEVENUM_IClassFactory_AddRef(LPCLASSFACTORY iface) static ULONG WINAPI DEVENUM_IClassFactory_AddRef(LPCLASSFACTORY iface)
{ {
ICOM_THIS(ClassFactoryImpl, iface); ClassFactoryImpl *This = (ClassFactoryImpl *)iface;
TRACE("\n"); TRACE("\n");
if (This == NULL) return E_POINTER; if (This == NULL) return E_POINTER;
...@@ -77,7 +77,7 @@ static ULONG WINAPI DEVENUM_IClassFactory_AddRef(LPCLASSFACTORY iface) ...@@ -77,7 +77,7 @@ static ULONG WINAPI DEVENUM_IClassFactory_AddRef(LPCLASSFACTORY iface)
*/ */
static ULONG WINAPI DEVENUM_IClassFactory_Release(LPCLASSFACTORY iface) static ULONG WINAPI DEVENUM_IClassFactory_Release(LPCLASSFACTORY iface)
{ {
ICOM_THIS(ClassFactoryImpl, iface); ClassFactoryImpl *This = (ClassFactoryImpl *)iface;
TRACE("\n"); TRACE("\n");
if (This == NULL) return E_POINTER; if (This == NULL) return E_POINTER;
...@@ -97,7 +97,7 @@ static HRESULT WINAPI DEVENUM_IClassFactory_CreateInstance( ...@@ -97,7 +97,7 @@ static HRESULT WINAPI DEVENUM_IClassFactory_CreateInstance(
REFIID riid, REFIID riid,
LPVOID *ppvObj) LPVOID *ppvObj)
{ {
ICOM_THIS(ClassFactoryImpl, iface); ClassFactoryImpl *This = (ClassFactoryImpl *)iface;
TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
if (This == NULL || ppvObj == NULL) return E_POINTER; if (This == NULL || ppvObj == NULL) return E_POINTER;
......
...@@ -43,7 +43,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_QueryInterface( ...@@ -43,7 +43,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_QueryInterface(
REFIID riid, REFIID riid,
LPVOID *ppvObj) LPVOID *ppvObj)
{ {
ICOM_THIS(RegPropBagImpl, iface); RegPropBagImpl *This = (RegPropBagImpl *)iface;
TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
if (This == NULL || ppvObj == NULL) return E_POINTER; if (This == NULL || ppvObj == NULL) return E_POINTER;
...@@ -65,7 +65,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_QueryInterface( ...@@ -65,7 +65,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_QueryInterface(
*/ */
static ULONG WINAPI DEVENUM_IPropertyBag_AddRef(LPPROPERTYBAG iface) static ULONG WINAPI DEVENUM_IPropertyBag_AddRef(LPPROPERTYBAG iface)
{ {
ICOM_THIS(RegPropBagImpl, iface); RegPropBagImpl *This = (RegPropBagImpl *)iface;
TRACE("\n"); TRACE("\n");
return InterlockedIncrement(&This->ref); return InterlockedIncrement(&This->ref);
...@@ -76,7 +76,7 @@ static ULONG WINAPI DEVENUM_IPropertyBag_AddRef(LPPROPERTYBAG iface) ...@@ -76,7 +76,7 @@ static ULONG WINAPI DEVENUM_IPropertyBag_AddRef(LPPROPERTYBAG iface)
*/ */
static ULONG WINAPI DEVENUM_IPropertyBag_Release(LPPROPERTYBAG iface) static ULONG WINAPI DEVENUM_IPropertyBag_Release(LPPROPERTYBAG iface)
{ {
ICOM_THIS(RegPropBagImpl, iface); RegPropBagImpl *This = (RegPropBagImpl *)iface;
TRACE("\n"); TRACE("\n");
...@@ -97,7 +97,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Read( ...@@ -97,7 +97,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Read(
LPVOID pData = NULL; LPVOID pData = NULL;
LONG received; LONG received;
DWORD type = 0; DWORD type = 0;
ICOM_THIS(RegPropBagImpl, iface); RegPropBagImpl *This = (RegPropBagImpl *)iface;
HRESULT res = S_OK; HRESULT res = S_OK;
LONG reswin32; LONG reswin32;
...@@ -202,7 +202,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Write( ...@@ -202,7 +202,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Write(
LPCOLESTR pszPropName, LPCOLESTR pszPropName,
VARIANT* pVar) VARIANT* pVar)
{ {
ICOM_THIS(RegPropBagImpl, iface); RegPropBagImpl *This = (RegPropBagImpl *)iface;
LPVOID lpData = NULL; LPVOID lpData = NULL;
DWORD cbData = 0; DWORD cbData = 0;
DWORD dwType = 0; DWORD dwType = 0;
...@@ -269,7 +269,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_QueryInterface( ...@@ -269,7 +269,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_QueryInterface(
REFIID riid, REFIID riid,
LPVOID *ppvObj) LPVOID *ppvObj)
{ {
ICOM_THIS(MediaCatMoniker, iface); MediaCatMoniker *This = (MediaCatMoniker *)iface;
TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
if (This == NULL || ppvObj == NULL) return E_POINTER; if (This == NULL || ppvObj == NULL) return E_POINTER;
...@@ -295,7 +295,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_QueryInterface( ...@@ -295,7 +295,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_QueryInterface(
*/ */
static ULONG WINAPI DEVENUM_IMediaCatMoniker_AddRef(LPMONIKER iface) static ULONG WINAPI DEVENUM_IMediaCatMoniker_AddRef(LPMONIKER iface)
{ {
ICOM_THIS(MediaCatMoniker, iface); MediaCatMoniker *This = (MediaCatMoniker *)iface;
TRACE("\n"); TRACE("\n");
if (This == NULL) return E_POINTER; if (This == NULL) return E_POINTER;
...@@ -308,7 +308,7 @@ static ULONG WINAPI DEVENUM_IMediaCatMoniker_AddRef(LPMONIKER iface) ...@@ -308,7 +308,7 @@ static ULONG WINAPI DEVENUM_IMediaCatMoniker_AddRef(LPMONIKER iface)
*/ */
static ULONG WINAPI DEVENUM_IMediaCatMoniker_Release(LPMONIKER iface) static ULONG WINAPI DEVENUM_IMediaCatMoniker_Release(LPMONIKER iface)
{ {
ICOM_THIS(MediaCatMoniker, iface); MediaCatMoniker *This = (MediaCatMoniker *)iface;
ULONG ref; ULONG ref;
TRACE("\n"); TRACE("\n");
...@@ -326,7 +326,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_GetClassID( ...@@ -326,7 +326,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_GetClassID(
LPMONIKER iface, LPMONIKER iface,
CLSID* pClassID) CLSID* pClassID)
{ {
ICOM_THIS(MediaCatMoniker, iface); MediaCatMoniker *This = (MediaCatMoniker *)iface;
FIXME("(%p)->(%p)\n", This, pClassID); FIXME("(%p)->(%p)\n", This, pClassID);
if (pClassID == NULL) if (pClassID == NULL)
...@@ -380,7 +380,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_BindToObject( ...@@ -380,7 +380,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_BindToObject(
VARIANT var; VARIANT var;
HRESULT res = E_FAIL; HRESULT res = E_FAIL;
ICOM_THIS(MediaCatMoniker, iface); MediaCatMoniker *This = (MediaCatMoniker *)iface;
VariantClear(&var); VariantClear(&var);
...@@ -434,7 +434,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_BindToStorage( ...@@ -434,7 +434,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_BindToStorage(
REFIID riid, REFIID riid,
void** ppvObj) void** ppvObj)
{ {
ICOM_THIS(MediaCatMoniker, iface); MediaCatMoniker *This = (MediaCatMoniker *)iface;
TRACE("(%p)->(%p, %p, %s, %p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppvObj); TRACE("(%p)->(%p, %p, %s, %p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppvObj);
*ppvObj = NULL; *ppvObj = NULL;
...@@ -585,7 +585,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_GetDisplayName( ...@@ -585,7 +585,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_GetDisplayName(
IMoniker* pmkToLeft, IMoniker* pmkToLeft,
LPOLESTR* ppszDisplayName) LPOLESTR* ppszDisplayName)
{ {
ICOM_THIS(MediaCatMoniker, iface); MediaCatMoniker *This = (MediaCatMoniker *)iface;
WCHAR wszBuffer[MAX_PATH]; WCHAR wszBuffer[MAX_PATH];
static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0};
LONG received = sizeof(wszFriendlyName); LONG received = sizeof(wszFriendlyName);
...@@ -681,7 +681,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_QueryInterface( ...@@ -681,7 +681,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_QueryInterface(
REFIID riid, REFIID riid,
LPVOID *ppvObj) LPVOID *ppvObj)
{ {
ICOM_THIS(EnumMonikerImpl, iface); EnumMonikerImpl *This = (EnumMonikerImpl *)iface;
TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
if (This == NULL || ppvObj == NULL) return E_POINTER; if (This == NULL || ppvObj == NULL) return E_POINTER;
...@@ -703,7 +703,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_QueryInterface( ...@@ -703,7 +703,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_QueryInterface(
*/ */
static ULONG WINAPI DEVENUM_IEnumMoniker_AddRef(LPENUMMONIKER iface) static ULONG WINAPI DEVENUM_IEnumMoniker_AddRef(LPENUMMONIKER iface)
{ {
ICOM_THIS(EnumMonikerImpl, iface); EnumMonikerImpl *This = (EnumMonikerImpl *)iface;
TRACE("\n"); TRACE("\n");
...@@ -717,7 +717,7 @@ static ULONG WINAPI DEVENUM_IEnumMoniker_AddRef(LPENUMMONIKER iface) ...@@ -717,7 +717,7 @@ static ULONG WINAPI DEVENUM_IEnumMoniker_AddRef(LPENUMMONIKER iface)
*/ */
static ULONG WINAPI DEVENUM_IEnumMoniker_Release(LPENUMMONIKER iface) static ULONG WINAPI DEVENUM_IEnumMoniker_Release(LPENUMMONIKER iface)
{ {
ICOM_THIS(EnumMonikerImpl, iface); EnumMonikerImpl *This = (EnumMonikerImpl *)iface;
TRACE("\n"); TRACE("\n");
...@@ -736,7 +736,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(LPENUMMONIKER iface, ULONG celt, ...@@ -736,7 +736,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(LPENUMMONIKER iface, ULONG celt,
LONG res; LONG res;
ULONG fetched = 0; ULONG fetched = 0;
MediaCatMoniker * pMoniker; MediaCatMoniker * pMoniker;
ICOM_THIS(EnumMonikerImpl, iface); EnumMonikerImpl *This = (EnumMonikerImpl *)iface;
TRACE("(%ld, %p, %p)\n", celt, rgelt, pceltFetched); TRACE("(%ld, %p, %p)\n", celt, rgelt, pceltFetched);
...@@ -775,7 +775,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(LPENUMMONIKER iface, ULONG celt, ...@@ -775,7 +775,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(LPENUMMONIKER iface, ULONG celt,
static HRESULT WINAPI DEVENUM_IEnumMoniker_Skip(LPENUMMONIKER iface, ULONG celt) static HRESULT WINAPI DEVENUM_IEnumMoniker_Skip(LPENUMMONIKER iface, ULONG celt)
{ {
ICOM_THIS(EnumMonikerImpl, iface); EnumMonikerImpl *This = (EnumMonikerImpl *)iface;
TRACE("(%ld)\n", celt); TRACE("(%ld)\n", celt);
...@@ -786,7 +786,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Skip(LPENUMMONIKER iface, ULONG celt) ...@@ -786,7 +786,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Skip(LPENUMMONIKER iface, ULONG celt)
static HRESULT WINAPI DEVENUM_IEnumMoniker_Reset(LPENUMMONIKER iface) static HRESULT WINAPI DEVENUM_IEnumMoniker_Reset(LPENUMMONIKER iface)
{ {
ICOM_THIS(EnumMonikerImpl, iface); EnumMonikerImpl *This = (EnumMonikerImpl *)iface;
TRACE("()\n"); TRACE("()\n");
......
...@@ -32,7 +32,7 @@ static HRESULT WINAPI DEVENUM_IParseDisplayName_QueryInterface( ...@@ -32,7 +32,7 @@ static HRESULT WINAPI DEVENUM_IParseDisplayName_QueryInterface(
REFIID riid, REFIID riid,
LPVOID *ppvObj) LPVOID *ppvObj)
{ {
ICOM_THIS(ParseDisplayNameImpl, iface); ParseDisplayNameImpl *This = (ParseDisplayNameImpl *)iface;
TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
if (This == NULL || ppvObj == NULL) return E_POINTER; if (This == NULL || ppvObj == NULL) return E_POINTER;
...@@ -54,7 +54,7 @@ static HRESULT WINAPI DEVENUM_IParseDisplayName_QueryInterface( ...@@ -54,7 +54,7 @@ static HRESULT WINAPI DEVENUM_IParseDisplayName_QueryInterface(
*/ */
static ULONG WINAPI DEVENUM_IParseDisplayName_AddRef(LPPARSEDISPLAYNAME iface) static ULONG WINAPI DEVENUM_IParseDisplayName_AddRef(LPPARSEDISPLAYNAME iface)
{ {
ICOM_THIS(ParseDisplayNameImpl, iface); ParseDisplayNameImpl *This = (ParseDisplayNameImpl *)iface;
TRACE("\n"); TRACE("\n");
if (This == NULL) return E_POINTER; if (This == NULL) return E_POINTER;
...@@ -71,7 +71,7 @@ static ULONG WINAPI DEVENUM_IParseDisplayName_AddRef(LPPARSEDISPLAYNAME iface) ...@@ -71,7 +71,7 @@ static ULONG WINAPI DEVENUM_IParseDisplayName_AddRef(LPPARSEDISPLAYNAME iface)
*/ */
static ULONG WINAPI DEVENUM_IParseDisplayName_Release(LPPARSEDISPLAYNAME iface) static ULONG WINAPI DEVENUM_IParseDisplayName_Release(LPPARSEDISPLAYNAME iface)
{ {
ICOM_THIS(ParseDisplayNameImpl, iface); ParseDisplayNameImpl *This = (ParseDisplayNameImpl *)iface;
ULONG ref; ULONG ref;
TRACE("\n"); TRACE("\n");
......
...@@ -32,30 +32,30 @@ typedef struct { ...@@ -32,30 +32,30 @@ typedef struct {
*/ */
static HRESULT WINAPI BandCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { static HRESULT WINAPI BandCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p, %s, %p): stub\n",This, debugstr_dmguid(riid), ppobj); FIXME("(%p, %s, %p): stub\n",This, debugstr_dmguid(riid), ppobj);
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI BandCF_AddRef(LPCLASSFACTORY iface) { static ULONG WINAPI BandCF_AddRef(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
return ++(This->ref); return ++(This->ref);
} }
static ULONG WINAPI BandCF_Release(LPCLASSFACTORY iface) { static ULONG WINAPI BandCF_Release(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
/* static class, won't be freed */ /* static class, won't be freed */
return --(This->ref); return --(This->ref);
} }
static HRESULT WINAPI BandCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI BandCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj); TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj);
return DMUSIC_CreateDirectMusicBandImpl (riid, ppobj, pOuter); return DMUSIC_CreateDirectMusicBandImpl (riid, ppobj, pOuter);
} }
static HRESULT WINAPI BandCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { static HRESULT WINAPI BandCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p, %d): stub\n", This, dolock); FIXME("(%p, %d): stub\n", This, dolock);
return S_OK; return S_OK;
} }
...@@ -76,31 +76,31 @@ static IClassFactoryImpl Band_CF = {&BandCF_Vtbl, 1 }; ...@@ -76,31 +76,31 @@ static IClassFactoryImpl Band_CF = {&BandCF_Vtbl, 1 };
*/ */
static HRESULT WINAPI BandTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { static HRESULT WINAPI BandTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p, %s, %p): stub\n", This, debugstr_dmguid(riid), ppobj); FIXME("(%p, %s, %p): stub\n", This, debugstr_dmguid(riid), ppobj);
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI BandTrackCF_AddRef(LPCLASSFACTORY iface) { static ULONG WINAPI BandTrackCF_AddRef(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
return ++(This->ref); return ++(This->ref);
} }
static ULONG WINAPI BandTrackCF_Release(LPCLASSFACTORY iface) { static ULONG WINAPI BandTrackCF_Release(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
/* static class, won't be freed */ /* static class, won't be freed */
return --(This->ref); return --(This->ref);
} }
static HRESULT WINAPI BandTrackCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI BandTrackCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj); TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj);
return DMUSIC_CreateDirectMusicBandTrack (riid, ppobj, pOuter); return DMUSIC_CreateDirectMusicBandTrack (riid, ppobj, pOuter);
} }
static HRESULT WINAPI BandTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { static HRESULT WINAPI BandTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p, %d): stub\n", This, dolock); FIXME("(%p, %d): stub\n", This, dolock);
return S_OK; return S_OK;
} }
......
...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmcompos); ...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmcompos);
/* IDirectMusicComposerImpl IUnknown part: */ /* IDirectMusicComposerImpl IUnknown part: */
HRESULT WINAPI IDirectMusicComposerImpl_QueryInterface (LPDIRECTMUSICCOMPOSER iface, REFIID riid, LPVOID *ppobj) { HRESULT WINAPI IDirectMusicComposerImpl_QueryInterface (LPDIRECTMUSICCOMPOSER iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IDirectMusicComposerImpl,iface); IDirectMusicComposerImpl *This = (IDirectMusicComposerImpl *)iface;
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
if (IsEqualIID (riid, &IID_IUnknown) || if (IsEqualIID (riid, &IID_IUnknown) ||
...@@ -37,13 +37,13 @@ HRESULT WINAPI IDirectMusicComposerImpl_QueryInterface (LPDIRECTMUSICCOMPOSER if ...@@ -37,13 +37,13 @@ HRESULT WINAPI IDirectMusicComposerImpl_QueryInterface (LPDIRECTMUSICCOMPOSER if
} }
ULONG WINAPI IDirectMusicComposerImpl_AddRef (LPDIRECTMUSICCOMPOSER iface) { ULONG WINAPI IDirectMusicComposerImpl_AddRef (LPDIRECTMUSICCOMPOSER iface) {
ICOM_THIS(IDirectMusicComposerImpl,iface); IDirectMusicComposerImpl *This = (IDirectMusicComposerImpl *)iface;
TRACE("(%p): AddRef from %ld\n", This, This->ref); TRACE("(%p): AddRef from %ld\n", This, This->ref);
return ++(This->ref); return ++(This->ref);
} }
ULONG WINAPI IDirectMusicComposerImpl_Release (LPDIRECTMUSICCOMPOSER iface) { ULONG WINAPI IDirectMusicComposerImpl_Release (LPDIRECTMUSICCOMPOSER iface) {
ICOM_THIS(IDirectMusicComposerImpl,iface); IDirectMusicComposerImpl *This = (IDirectMusicComposerImpl *)iface;
ULONG ref = --This->ref; ULONG ref = --This->ref;
TRACE("(%p): ReleaseRef to %ld\n", This, This->ref); TRACE("(%p): ReleaseRef to %ld\n", This, This->ref);
if (ref == 0) { if (ref == 0) {
...@@ -54,37 +54,37 @@ ULONG WINAPI IDirectMusicComposerImpl_Release (LPDIRECTMUSICCOMPOSER iface) { ...@@ -54,37 +54,37 @@ ULONG WINAPI IDirectMusicComposerImpl_Release (LPDIRECTMUSICCOMPOSER iface) {
/* IDirectMusicComposerImpl IDirectMusicComposer part: */ /* IDirectMusicComposerImpl IDirectMusicComposer part: */
HRESULT WINAPI IDirectMusicComposerImpl_ComposeSegmentFromTemplate (LPDIRECTMUSICCOMPOSER iface, IDirectMusicStyle* pStyle, IDirectMusicSegment* pTemplate, WORD wActivity, IDirectMusicChordMap* pChordMap, IDirectMusicSegment** ppSegment) { HRESULT WINAPI IDirectMusicComposerImpl_ComposeSegmentFromTemplate (LPDIRECTMUSICCOMPOSER iface, IDirectMusicStyle* pStyle, IDirectMusicSegment* pTemplate, WORD wActivity, IDirectMusicChordMap* pChordMap, IDirectMusicSegment** ppSegment) {
ICOM_THIS(IDirectMusicComposerImpl,iface); IDirectMusicComposerImpl *This = (IDirectMusicComposerImpl *)iface;
FIXME("(%p, %p, %p, %d, %p, %p): stub\n", This, pStyle, pTemplate, wActivity, pChordMap, ppSegment); FIXME("(%p, %p, %p, %d, %p, %p): stub\n", This, pStyle, pTemplate, wActivity, pChordMap, ppSegment);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicComposerImpl_ComposeSegmentFromShape (LPDIRECTMUSICCOMPOSER iface, IDirectMusicStyle* pStyle, WORD wNumMeasures, WORD wShape, WORD wActivity, BOOL fIntro, BOOL fEnd, IDirectMusicChordMap* pChordMap, IDirectMusicSegment** ppSegment) { HRESULT WINAPI IDirectMusicComposerImpl_ComposeSegmentFromShape (LPDIRECTMUSICCOMPOSER iface, IDirectMusicStyle* pStyle, WORD wNumMeasures, WORD wShape, WORD wActivity, BOOL fIntro, BOOL fEnd, IDirectMusicChordMap* pChordMap, IDirectMusicSegment** ppSegment) {
ICOM_THIS(IDirectMusicComposerImpl,iface); IDirectMusicComposerImpl *This = (IDirectMusicComposerImpl *)iface;
FIXME("(%p, %p, %d, %d, %d, %d, %d, %p, %p): stub\n", This, pStyle, wNumMeasures, wShape, wActivity, fIntro, fEnd, pChordMap, ppSegment); FIXME("(%p, %p, %d, %d, %d, %d, %d, %p, %p): stub\n", This, pStyle, wNumMeasures, wShape, wActivity, fIntro, fEnd, pChordMap, ppSegment);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicComposerImpl_ComposeTransition (LPDIRECTMUSICCOMPOSER iface, IDirectMusicSegment* pFromSeg, IDirectMusicSegment* pToSeg, MUSIC_TIME mtTime, WORD wCommand, DWORD dwFlags, IDirectMusicChordMap* pChordMap, IDirectMusicSegment** ppTransSeg) { HRESULT WINAPI IDirectMusicComposerImpl_ComposeTransition (LPDIRECTMUSICCOMPOSER iface, IDirectMusicSegment* pFromSeg, IDirectMusicSegment* pToSeg, MUSIC_TIME mtTime, WORD wCommand, DWORD dwFlags, IDirectMusicChordMap* pChordMap, IDirectMusicSegment** ppTransSeg) {
ICOM_THIS(IDirectMusicComposerImpl,iface); IDirectMusicComposerImpl *This = (IDirectMusicComposerImpl *)iface;
FIXME("(%p, %p, %p, %ld, %d, %ld, %p, %p): stub\n", This, pFromSeg, pToSeg, mtTime, wCommand, dwFlags, pChordMap, ppTransSeg); FIXME("(%p, %p, %p, %ld, %d, %ld, %p, %p): stub\n", This, pFromSeg, pToSeg, mtTime, wCommand, dwFlags, pChordMap, ppTransSeg);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicComposerImpl_AutoTransition (LPDIRECTMUSICCOMPOSER iface, IDirectMusicPerformance* pPerformance, IDirectMusicSegment* pToSeg, WORD wCommand, DWORD dwFlags, IDirectMusicChordMap* pChordMap, IDirectMusicSegment** ppTransSeg, IDirectMusicSegmentState** ppToSegState, IDirectMusicSegmentState** ppTransSegState) { HRESULT WINAPI IDirectMusicComposerImpl_AutoTransition (LPDIRECTMUSICCOMPOSER iface, IDirectMusicPerformance* pPerformance, IDirectMusicSegment* pToSeg, WORD wCommand, DWORD dwFlags, IDirectMusicChordMap* pChordMap, IDirectMusicSegment** ppTransSeg, IDirectMusicSegmentState** ppToSegState, IDirectMusicSegmentState** ppTransSegState) {
ICOM_THIS(IDirectMusicComposerImpl,iface); IDirectMusicComposerImpl *This = (IDirectMusicComposerImpl *)iface;
FIXME("(%p, %p, %d, %ld, %p, %p, %p, %p): stub\n", This, pPerformance, wCommand, dwFlags, pChordMap, ppTransSeg, ppToSegState, ppTransSegState); FIXME("(%p, %p, %d, %ld, %p, %p, %p, %p): stub\n", This, pPerformance, wCommand, dwFlags, pChordMap, ppTransSeg, ppToSegState, ppTransSegState);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicComposerImpl_ComposeTemplateFromShape (LPDIRECTMUSICCOMPOSER iface, WORD wNumMeasures, WORD wShape, BOOL fIntro, BOOL fEnd, WORD wEndLength, IDirectMusicSegment** ppTemplate) { HRESULT WINAPI IDirectMusicComposerImpl_ComposeTemplateFromShape (LPDIRECTMUSICCOMPOSER iface, WORD wNumMeasures, WORD wShape, BOOL fIntro, BOOL fEnd, WORD wEndLength, IDirectMusicSegment** ppTemplate) {
ICOM_THIS(IDirectMusicComposerImpl,iface); IDirectMusicComposerImpl *This = (IDirectMusicComposerImpl *)iface;
FIXME("(%p, %d, %d, %d, %d, %d, %p): stub\n", This, wNumMeasures, wShape, fIntro, fEnd, wEndLength, ppTemplate); FIXME("(%p, %d, %d, %d, %d, %d, %p): stub\n", This, wNumMeasures, wShape, fIntro, fEnd, wEndLength, ppTemplate);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicComposerImpl_ChangeChordMap (LPDIRECTMUSICCOMPOSER iface, IDirectMusicSegment* pSegment, BOOL fTrackScale, IDirectMusicChordMap* pChordMap) { HRESULT WINAPI IDirectMusicComposerImpl_ChangeChordMap (LPDIRECTMUSICCOMPOSER iface, IDirectMusicSegment* pSegment, BOOL fTrackScale, IDirectMusicChordMap* pChordMap) {
ICOM_THIS(IDirectMusicComposerImpl,iface); IDirectMusicComposerImpl *This = (IDirectMusicComposerImpl *)iface;
FIXME("(%p, %p, %d, %p): stub\n", This, pSegment, fTrackScale, pChordMap); FIXME("(%p, %p, %d, %p): stub\n", This, pSegment, fTrackScale, pChordMap);
return S_OK; return S_OK;
} }
......
...@@ -31,30 +31,30 @@ typedef struct { ...@@ -31,30 +31,30 @@ typedef struct {
* DirectMusicChordMap ClassFactory * DirectMusicChordMap ClassFactory
*/ */
static HRESULT WINAPI ChordMapCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { static HRESULT WINAPI ChordMapCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p, %s, %p): stub\n", This, debugstr_dmguid(riid), ppobj); FIXME("(%p, %s, %p): stub\n", This, debugstr_dmguid(riid), ppobj);
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI ChordMapCF_AddRef(LPCLASSFACTORY iface) { static ULONG WINAPI ChordMapCF_AddRef(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
return ++(This->ref); return ++(This->ref);
} }
static ULONG WINAPI ChordMapCF_Release(LPCLASSFACTORY iface) { static ULONG WINAPI ChordMapCF_Release(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
/* static class, won't be freed */ /* static class, won't be freed */
return --(This->ref); return --(This->ref);
} }
static HRESULT WINAPI ChordMapCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI ChordMapCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj); TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj);
return DMUSIC_CreateDirectMusicChordMapImpl (riid, ppobj, pOuter); return DMUSIC_CreateDirectMusicChordMapImpl (riid, ppobj, pOuter);
} }
static HRESULT WINAPI ChordMapCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { static HRESULT WINAPI ChordMapCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p, %d): stub\n", This, dolock); FIXME("(%p, %d): stub\n", This, dolock);
return S_OK; return S_OK;
} }
...@@ -73,30 +73,30 @@ static IClassFactoryImpl ChordMap_CF = {&ChordMapCF_Vtbl, 1 }; ...@@ -73,30 +73,30 @@ static IClassFactoryImpl ChordMap_CF = {&ChordMapCF_Vtbl, 1 };
* DirectMusicComposer ClassFactory * DirectMusicComposer ClassFactory
*/ */
static HRESULT WINAPI ComposerCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { static HRESULT WINAPI ComposerCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p, %s, %p): stub\n",This,debugstr_dmguid(riid),ppobj); FIXME("(%p, %s, %p): stub\n",This,debugstr_dmguid(riid),ppobj);
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI ComposerCF_AddRef(LPCLASSFACTORY iface) { static ULONG WINAPI ComposerCF_AddRef(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
return ++(This->ref); return ++(This->ref);
} }
static ULONG WINAPI ComposerCF_Release(LPCLASSFACTORY iface) { static ULONG WINAPI ComposerCF_Release(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
/* static class, won't be freed */ /* static class, won't be freed */
return --(This->ref); return --(This->ref);
} }
static HRESULT WINAPI ComposerCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI ComposerCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj); TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj);
return DMUSIC_CreateDirectMusicComposerImpl (riid, ppobj, pOuter); return DMUSIC_CreateDirectMusicComposerImpl (riid, ppobj, pOuter);
} }
static HRESULT WINAPI ComposerCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { static HRESULT WINAPI ComposerCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p, %d): stub\n", This, dolock); FIXME("(%p, %d): stub\n", This, dolock);
return S_OK; return S_OK;
} }
...@@ -115,30 +115,30 @@ static IClassFactoryImpl Composer_CF = {&ComposerCF_Vtbl, 1 }; ...@@ -115,30 +115,30 @@ static IClassFactoryImpl Composer_CF = {&ComposerCF_Vtbl, 1 };
* DirectMusicChordMapTrack ClassFactory * DirectMusicChordMapTrack ClassFactory
*/ */
static HRESULT WINAPI ChordMapTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { static HRESULT WINAPI ChordMapTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p, %s, %p): stub\n",This,debugstr_dmguid(riid),ppobj); FIXME("(%p, %s, %p): stub\n",This,debugstr_dmguid(riid),ppobj);
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI ChordMapTrackCF_AddRef(LPCLASSFACTORY iface) { static ULONG WINAPI ChordMapTrackCF_AddRef(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
return ++(This->ref); return ++(This->ref);
} }
static ULONG WINAPI ChordMapTrackCF_Release(LPCLASSFACTORY iface) { static ULONG WINAPI ChordMapTrackCF_Release(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
/* static class, won't be freed */ /* static class, won't be freed */
return --(This->ref); return --(This->ref);
} }
static HRESULT WINAPI ChordMapTrackCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI ChordMapTrackCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj); TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj);
return DMUSIC_CreateDirectMusicChordMapTrack (riid, ppobj, pOuter); return DMUSIC_CreateDirectMusicChordMapTrack (riid, ppobj, pOuter);
} }
static HRESULT WINAPI ChordMapTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { static HRESULT WINAPI ChordMapTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p, %d): stub\n", This, dolock); FIXME("(%p, %d): stub\n", This, dolock);
return S_OK; return S_OK;
} }
...@@ -157,24 +157,24 @@ static IClassFactoryImpl ChordMapTrack_CF = {&ChordMapTrackCF_Vtbl, 1 }; ...@@ -157,24 +157,24 @@ static IClassFactoryImpl ChordMapTrack_CF = {&ChordMapTrackCF_Vtbl, 1 };
* DirectMusicTemplate ClassFactory * DirectMusicTemplate ClassFactory
*/ */
static HRESULT WINAPI TemplateCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { static HRESULT WINAPI TemplateCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p, %s, %p): stub\n", This, debugstr_dmguid(riid), ppobj); FIXME("(%p, %s, %p): stub\n", This, debugstr_dmguid(riid), ppobj);
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI TemplateCF_AddRef(LPCLASSFACTORY iface) { static ULONG WINAPI TemplateCF_AddRef(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
return ++(This->ref); return ++(This->ref);
} }
static ULONG WINAPI TemplateCF_Release(LPCLASSFACTORY iface) { static ULONG WINAPI TemplateCF_Release(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
/* static class, won't be freed */ /* static class, won't be freed */
return --(This->ref); return --(This->ref);
} }
static HRESULT WINAPI TemplateCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI TemplateCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj); TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj);
/* nothing yet */ /* nothing yet */
WARN("(%p, %s,%p): not found\n", This, debugstr_dmguid(riid), ppobj); WARN("(%p, %s,%p): not found\n", This, debugstr_dmguid(riid), ppobj);
...@@ -182,7 +182,7 @@ static HRESULT WINAPI TemplateCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN ...@@ -182,7 +182,7 @@ static HRESULT WINAPI TemplateCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN
} }
static HRESULT WINAPI TemplateCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { static HRESULT WINAPI TemplateCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p, %d): stub\n", This, dolock); FIXME("(%p, %d): stub\n", This, dolock);
return S_OK; return S_OK;
} }
...@@ -201,30 +201,30 @@ static IClassFactoryImpl Template_CF = {&TemplateCF_Vtbl, 1 }; ...@@ -201,30 +201,30 @@ static IClassFactoryImpl Template_CF = {&TemplateCF_Vtbl, 1 };
* DirectMusicSignPostTrack ClassFactory * DirectMusicSignPostTrack ClassFactory
*/ */
static HRESULT WINAPI SignPostTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { static HRESULT WINAPI SignPostTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p, %s, %p): stub\n",This,debugstr_dmguid(riid),ppobj); FIXME("(%p, %s, %p): stub\n",This,debugstr_dmguid(riid),ppobj);
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI SignPostTrackCF_AddRef(LPCLASSFACTORY iface) { static ULONG WINAPI SignPostTrackCF_AddRef(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
return ++(This->ref); return ++(This->ref);
} }
static ULONG WINAPI SignPostTrackCF_Release(LPCLASSFACTORY iface) { static ULONG WINAPI SignPostTrackCF_Release(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
/* static class, won't be freed */ /* static class, won't be freed */
return --(This->ref); return --(This->ref);
} }
static HRESULT WINAPI SignPostTrackCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI SignPostTrackCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj); TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj);
return DMUSIC_CreateDirectMusicSignPostTrack (riid, ppobj, pOuter); return DMUSIC_CreateDirectMusicSignPostTrack (riid, ppobj, pOuter);
} }
static HRESULT WINAPI SignPostTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { static HRESULT WINAPI SignPostTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p, %d): stub\n", This, dolock); FIXME("(%p, %d): stub\n", This, dolock);
return S_OK; return S_OK;
} }
......
...@@ -106,7 +106,7 @@ HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_EndPlay (LPDIRECTMUSI ...@@ -106,7 +106,7 @@ HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_EndPlay (LPDIRECTMUSI
} }
HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_Play (LPDIRECTMUSICTRACK8 iface, void* pStateData, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, IDirectMusicPerformance* pPerf, IDirectMusicSegmentState* pSegSt, DWORD dwVirtualID) { HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_Play (LPDIRECTMUSICTRACK8 iface, void* pStateData, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, IDirectMusicPerformance* pPerf, IDirectMusicSegmentState* pSegSt, DWORD dwVirtualID) {
ICOM_THIS(IDirectMusicSignPostTrack,iface); IDirectMusicSignPostTrack *This = (IDirectMusicSignPostTrack *)iface;
FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID);
return S_OK; return S_OK;
} }
...@@ -168,7 +168,7 @@ HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_SetParamEx (LPDIRECTM ...@@ -168,7 +168,7 @@ HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_SetParamEx (LPDIRECTM
} }
HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_Compose (LPDIRECTMUSICTRACK8 iface, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) { HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_Compose (LPDIRECTMUSICTRACK8 iface, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) {
ICOM_THIS(IDirectMusicSignPostTrack,iface); IDirectMusicSignPostTrack *This = (IDirectMusicSignPostTrack *)iface;
FIXME("(%p, %p, %ld, %p): stub\n", This, pContext, dwTrackGroup, ppResultTrack); FIXME("(%p, %p, %ld, %p): stub\n", This, pContext, dwTrackGroup, ppResultTrack);
return S_OK; return S_OK;
} }
......
...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); ...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime);
/* IDirectMusicPatternTrack IUnknown parts follow: */ /* IDirectMusicPatternTrack IUnknown parts follow: */
HRESULT WINAPI IDirectMusicPatternTrackImpl_QueryInterface (LPDIRECTMUSICPATTERNTRACK iface, REFIID riid, LPVOID *ppobj) { HRESULT WINAPI IDirectMusicPatternTrackImpl_QueryInterface (LPDIRECTMUSICPATTERNTRACK iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IDirectMusicPatternTrackImpl,iface); IDirectMusicPatternTrackImpl *This = (IDirectMusicPatternTrackImpl *)iface;
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
if (IsEqualIID (riid, &IID_IUnknown) || if (IsEqualIID (riid, &IID_IUnknown) ||
...@@ -38,13 +38,13 @@ HRESULT WINAPI IDirectMusicPatternTrackImpl_QueryInterface (LPDIRECTMUSICPATTERN ...@@ -38,13 +38,13 @@ HRESULT WINAPI IDirectMusicPatternTrackImpl_QueryInterface (LPDIRECTMUSICPATTERN
} }
ULONG WINAPI IDirectMusicPatternTrackImpl_AddRef (LPDIRECTMUSICPATTERNTRACK iface) { ULONG WINAPI IDirectMusicPatternTrackImpl_AddRef (LPDIRECTMUSICPATTERNTRACK iface) {
ICOM_THIS(IDirectMusicPatternTrackImpl,iface); IDirectMusicPatternTrackImpl *This = (IDirectMusicPatternTrackImpl *)iface;
TRACE("(%p): AddRef from %ld\n", This, This->ref); TRACE("(%p): AddRef from %ld\n", This, This->ref);
return ++(This->ref); return ++(This->ref);
} }
ULONG WINAPI IDirectMusicPatternTrackImpl_Release (LPDIRECTMUSICPATTERNTRACK iface) { ULONG WINAPI IDirectMusicPatternTrackImpl_Release (LPDIRECTMUSICPATTERNTRACK iface) {
ICOM_THIS(IDirectMusicPatternTrackImpl,iface); IDirectMusicPatternTrackImpl *This = (IDirectMusicPatternTrackImpl *)iface;
ULONG ref = --This->ref; ULONG ref = --This->ref;
TRACE("(%p): ReleaseRef to %ld\n", This, This->ref); TRACE("(%p): ReleaseRef to %ld\n", This, This->ref);
if (ref == 0) { if (ref == 0) {
...@@ -55,19 +55,19 @@ ULONG WINAPI IDirectMusicPatternTrackImpl_Release (LPDIRECTMUSICPATTERNTRACK ifa ...@@ -55,19 +55,19 @@ ULONG WINAPI IDirectMusicPatternTrackImpl_Release (LPDIRECTMUSICPATTERNTRACK ifa
/* IDirectMusicPatternTrack Interface follow: */ /* IDirectMusicPatternTrack Interface follow: */
HRESULT WINAPI IDirectMusicPatternTrackImpl_CreateSegment (LPDIRECTMUSICPATTERNTRACK iface, IDirectMusicStyle* pStyle, IDirectMusicSegment** ppSegment) { HRESULT WINAPI IDirectMusicPatternTrackImpl_CreateSegment (LPDIRECTMUSICPATTERNTRACK iface, IDirectMusicStyle* pStyle, IDirectMusicSegment** ppSegment) {
ICOM_THIS(IDirectMusicPatternTrackImpl,iface); IDirectMusicPatternTrackImpl *This = (IDirectMusicPatternTrackImpl *)iface;
FIXME("(%p, %p, %p): stub\n", This, pStyle, ppSegment); FIXME("(%p, %p, %p): stub\n", This, pStyle, ppSegment);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicPatternTrackImpl_SetVariation (LPDIRECTMUSICPATTERNTRACK iface, IDirectMusicSegmentState* pSegState, DWORD dwVariationFlags, DWORD dwPart) { HRESULT WINAPI IDirectMusicPatternTrackImpl_SetVariation (LPDIRECTMUSICPATTERNTRACK iface, IDirectMusicSegmentState* pSegState, DWORD dwVariationFlags, DWORD dwPart) {
ICOM_THIS(IDirectMusicPatternTrackImpl,iface); IDirectMusicPatternTrackImpl *This = (IDirectMusicPatternTrackImpl *)iface;
FIXME("(%p, %p, %ld, %ld): stub\n", This, pSegState, dwVariationFlags, dwPart); FIXME("(%p, %p, %ld, %ld): stub\n", This, pSegState, dwVariationFlags, dwPart);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicPatternTrackImpl_SetPatternByName (LPDIRECTMUSICPATTERNTRACK iface, IDirectMusicSegmentState* pSegState, WCHAR* wszName, IDirectMusicStyle* pStyle, DWORD dwPatternType, DWORD* pdwLength) { HRESULT WINAPI IDirectMusicPatternTrackImpl_SetPatternByName (LPDIRECTMUSICPATTERNTRACK iface, IDirectMusicSegmentState* pSegState, WCHAR* wszName, IDirectMusicStyle* pStyle, DWORD dwPatternType, DWORD* pdwLength) {
ICOM_THIS(IDirectMusicPatternTrackImpl,iface); IDirectMusicPatternTrackImpl *This = (IDirectMusicPatternTrackImpl *)iface;
FIXME("(%p, %p, %p, %p, %ld, %p): stub\n", This, pSegState, wszName, pStyle, dwPatternType, pdwLength); FIXME("(%p, %p, %p, %p, %ld, %p): stub\n", This, pSegState, wszName, pStyle, dwPatternType, pdwLength);
return S_OK; return S_OK;
} }
......
...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); ...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime);
/* IDirectMusicSegmentState8Impl IUnknown part: */ /* IDirectMusicSegmentState8Impl IUnknown part: */
HRESULT WINAPI IDirectMusicSegmentState8Impl_QueryInterface (LPDIRECTMUSICSEGMENTSTATE8 iface, REFIID riid, LPVOID *ppobj) { HRESULT WINAPI IDirectMusicSegmentState8Impl_QueryInterface (LPDIRECTMUSICSEGMENTSTATE8 iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IDirectMusicSegmentState8Impl,iface); IDirectMusicSegmentState8Impl *This = (IDirectMusicSegmentState8Impl *)iface;
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
if (IsEqualIID(riid, &IID_IUnknown) || if (IsEqualIID(riid, &IID_IUnknown) ||
...@@ -38,13 +38,13 @@ HRESULT WINAPI IDirectMusicSegmentState8Impl_QueryInterface (LPDIRECTMUSICSEGMEN ...@@ -38,13 +38,13 @@ HRESULT WINAPI IDirectMusicSegmentState8Impl_QueryInterface (LPDIRECTMUSICSEGMEN
} }
ULONG WINAPI IDirectMusicSegmentState8Impl_AddRef (LPDIRECTMUSICSEGMENTSTATE8 iface) { ULONG WINAPI IDirectMusicSegmentState8Impl_AddRef (LPDIRECTMUSICSEGMENTSTATE8 iface) {
ICOM_THIS(IDirectMusicSegmentState8Impl,iface); IDirectMusicSegmentState8Impl *This = (IDirectMusicSegmentState8Impl *)iface;
TRACE("(%p): AddRef from %ld\n", This, This->ref); TRACE("(%p): AddRef from %ld\n", This, This->ref);
return ++(This->ref); return ++(This->ref);
} }
ULONG WINAPI IDirectMusicSegmentState8Impl_Release (LPDIRECTMUSICSEGMENTSTATE8 iface) { ULONG WINAPI IDirectMusicSegmentState8Impl_Release (LPDIRECTMUSICSEGMENTSTATE8 iface) {
ICOM_THIS(IDirectMusicSegmentState8Impl,iface); IDirectMusicSegmentState8Impl *This = (IDirectMusicSegmentState8Impl *)iface;
ULONG ref = --This->ref; ULONG ref = --This->ref;
TRACE("(%p): ReleaseRef to %ld\n", This, This->ref); TRACE("(%p): ReleaseRef to %ld\n", This, This->ref);
if (ref == 0) { if (ref == 0) {
...@@ -55,44 +55,44 @@ ULONG WINAPI IDirectMusicSegmentState8Impl_Release (LPDIRECTMUSICSEGMENTSTATE8 i ...@@ -55,44 +55,44 @@ ULONG WINAPI IDirectMusicSegmentState8Impl_Release (LPDIRECTMUSICSEGMENTSTATE8 i
/* IDirectMusicSegmentState8Impl IDirectMusicSegmentState part: */ /* IDirectMusicSegmentState8Impl IDirectMusicSegmentState part: */
HRESULT WINAPI IDirectMusicSegmentState8Impl_GetRepeats (LPDIRECTMUSICSEGMENTSTATE8 iface, DWORD* pdwRepeats) { HRESULT WINAPI IDirectMusicSegmentState8Impl_GetRepeats (LPDIRECTMUSICSEGMENTSTATE8 iface, DWORD* pdwRepeats) {
ICOM_THIS(IDirectMusicSegmentState8Impl,iface); IDirectMusicSegmentState8Impl *This = (IDirectMusicSegmentState8Impl *)iface;
FIXME("(%p, %p): stub\n", This, pdwRepeats); FIXME("(%p, %p): stub\n", This, pdwRepeats);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSegmentState8Impl_GetSegment (LPDIRECTMUSICSEGMENTSTATE8 iface, IDirectMusicSegment** ppSegment) { HRESULT WINAPI IDirectMusicSegmentState8Impl_GetSegment (LPDIRECTMUSICSEGMENTSTATE8 iface, IDirectMusicSegment** ppSegment) {
ICOM_THIS(IDirectMusicSegmentState8Impl,iface); IDirectMusicSegmentState8Impl *This = (IDirectMusicSegmentState8Impl *)iface;
FIXME("(%p, %p): stub\n", This, ppSegment); FIXME("(%p, %p): stub\n", This, ppSegment);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSegmentState8Impl_GetStartTime (LPDIRECTMUSICSEGMENTSTATE8 iface, MUSIC_TIME* pmtStart) { HRESULT WINAPI IDirectMusicSegmentState8Impl_GetStartTime (LPDIRECTMUSICSEGMENTSTATE8 iface, MUSIC_TIME* pmtStart) {
ICOM_THIS(IDirectMusicSegmentState8Impl,iface); IDirectMusicSegmentState8Impl *This = (IDirectMusicSegmentState8Impl *)iface;
FIXME("(%p, %p): stub\n", This, pmtStart); FIXME("(%p, %p): stub\n", This, pmtStart);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSegmentState8Impl_GetSeek (LPDIRECTMUSICSEGMENTSTATE8 iface, MUSIC_TIME* pmtSeek) { HRESULT WINAPI IDirectMusicSegmentState8Impl_GetSeek (LPDIRECTMUSICSEGMENTSTATE8 iface, MUSIC_TIME* pmtSeek) {
ICOM_THIS(IDirectMusicSegmentState8Impl,iface); IDirectMusicSegmentState8Impl *This = (IDirectMusicSegmentState8Impl *)iface;
FIXME("(%p, %p): stub\n", This, pmtSeek); FIXME("(%p, %p): stub\n", This, pmtSeek);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSegmentState8Impl_GetStartPoint (LPDIRECTMUSICSEGMENTSTATE8 iface, MUSIC_TIME* pmtStart) { HRESULT WINAPI IDirectMusicSegmentState8Impl_GetStartPoint (LPDIRECTMUSICSEGMENTSTATE8 iface, MUSIC_TIME* pmtStart) {
ICOM_THIS(IDirectMusicSegmentState8Impl,iface); IDirectMusicSegmentState8Impl *This = (IDirectMusicSegmentState8Impl *)iface;
FIXME("(%p, %p): stub\n", This, pmtStart); FIXME("(%p, %p): stub\n", This, pmtStart);
return S_OK; return S_OK;
} }
/* IDirectMusicSegmentState8Impl IDirectMusicSegmentState8 part: */ /* IDirectMusicSegmentState8Impl IDirectMusicSegmentState8 part: */
HRESULT WINAPI IDirectMusicSegmentState8Impl_SetTrackConfig (LPDIRECTMUSICSEGMENTSTATE8 iface, REFGUID rguidTrackClassID, DWORD dwGroupBits, DWORD dwIndex, DWORD dwFlagsOn, DWORD dwFlagsOff) { HRESULT WINAPI IDirectMusicSegmentState8Impl_SetTrackConfig (LPDIRECTMUSICSEGMENTSTATE8 iface, REFGUID rguidTrackClassID, DWORD dwGroupBits, DWORD dwIndex, DWORD dwFlagsOn, DWORD dwFlagsOff) {
ICOM_THIS(IDirectMusicSegmentState8Impl,iface); IDirectMusicSegmentState8Impl *This = (IDirectMusicSegmentState8Impl *)iface;
FIXME("(%p, %s, %ld, %ld, %ld, %ld): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); FIXME("(%p, %s, %ld, %ld, %ld, %ld): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSegmentState8Impl_GetObjectInPath (LPDIRECTMUSICSEGMENTSTATE8 iface, DWORD dwPChannel, DWORD dwStage, DWORD dwBuffer, REFGUID guidObject, DWORD dwIndex, REFGUID iidInterface, void** ppObject) { HRESULT WINAPI IDirectMusicSegmentState8Impl_GetObjectInPath (LPDIRECTMUSICSEGMENTSTATE8 iface, DWORD dwPChannel, DWORD dwStage, DWORD dwBuffer, REFGUID guidObject, DWORD dwIndex, REFGUID iidInterface, void** ppObject) {
ICOM_THIS(IDirectMusicSegmentState8Impl,iface); IDirectMusicSegmentState8Impl *This = (IDirectMusicSegmentState8Impl *)iface;
FIXME("(%p, %ld, %ld, %ld, %s, %ld, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), dwIndex, debugstr_dmguid(iidInterface), ppObject); FIXME("(%p, %ld, %ld, %ld, %s, %ld, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), dwIndex, debugstr_dmguid(iidInterface), ppObject);
return S_OK; return S_OK;
} }
......
...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); ...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime);
/* IDirectMusicTool8Impl IUnknown part: */ /* IDirectMusicTool8Impl IUnknown part: */
HRESULT WINAPI IDirectMusicTool8Impl_QueryInterface (LPDIRECTMUSICTOOL8 iface, REFIID riid, LPVOID *ppobj) { HRESULT WINAPI IDirectMusicTool8Impl_QueryInterface (LPDIRECTMUSICTOOL8 iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IDirectMusicTool8Impl,iface); IDirectMusicTool8Impl *This = (IDirectMusicTool8Impl *)iface;
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
if (IsEqualIID (riid, &IID_IUnknown) || if (IsEqualIID (riid, &IID_IUnknown) ||
IsEqualIID (riid, &IID_IDirectMusicTool) || IsEqualIID (riid, &IID_IDirectMusicTool) ||
...@@ -37,13 +37,13 @@ HRESULT WINAPI IDirectMusicTool8Impl_QueryInterface (LPDIRECTMUSICTOOL8 iface, R ...@@ -37,13 +37,13 @@ HRESULT WINAPI IDirectMusicTool8Impl_QueryInterface (LPDIRECTMUSICTOOL8 iface, R
} }
ULONG WINAPI IDirectMusicTool8Impl_AddRef (LPDIRECTMUSICTOOL8 iface) { ULONG WINAPI IDirectMusicTool8Impl_AddRef (LPDIRECTMUSICTOOL8 iface) {
ICOM_THIS(IDirectMusicTool8Impl,iface); IDirectMusicTool8Impl *This = (IDirectMusicTool8Impl *)iface;
TRACE("(%p) : AddRef from %ld\n", This, This->ref); TRACE("(%p) : AddRef from %ld\n", This, This->ref);
return ++(This->ref); return ++(This->ref);
} }
ULONG WINAPI IDirectMusicTool8Impl_Release (LPDIRECTMUSICTOOL8 iface) { ULONG WINAPI IDirectMusicTool8Impl_Release (LPDIRECTMUSICTOOL8 iface) {
ICOM_THIS(IDirectMusicTool8Impl,iface); IDirectMusicTool8Impl *This = (IDirectMusicTool8Impl *)iface;
ULONG ref = --This->ref; ULONG ref = --This->ref;
TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref);
if (ref == 0) { if (ref == 0) {
...@@ -54,44 +54,44 @@ ULONG WINAPI IDirectMusicTool8Impl_Release (LPDIRECTMUSICTOOL8 iface) { ...@@ -54,44 +54,44 @@ ULONG WINAPI IDirectMusicTool8Impl_Release (LPDIRECTMUSICTOOL8 iface) {
/* IDirectMusicTool8Impl IDirectMusicTool part: */ /* IDirectMusicTool8Impl IDirectMusicTool part: */
HRESULT WINAPI IDirectMusicTool8Impl_Init (LPDIRECTMUSICTOOL8 iface, IDirectMusicGraph* pGraph) { HRESULT WINAPI IDirectMusicTool8Impl_Init (LPDIRECTMUSICTOOL8 iface, IDirectMusicGraph* pGraph) {
ICOM_THIS(IDirectMusicTool8Impl,iface); IDirectMusicTool8Impl *This = (IDirectMusicTool8Impl *)iface;
FIXME("(%p, %p): stub\n", This, pGraph); FIXME("(%p, %p): stub\n", This, pGraph);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicTool8Impl_GetMsgDeliveryType (LPDIRECTMUSICTOOL8 iface, DWORD* pdwDeliveryType) { HRESULT WINAPI IDirectMusicTool8Impl_GetMsgDeliveryType (LPDIRECTMUSICTOOL8 iface, DWORD* pdwDeliveryType) {
ICOM_THIS(IDirectMusicTool8Impl,iface); IDirectMusicTool8Impl *This = (IDirectMusicTool8Impl *)iface;
FIXME("(%p, %p): stub\n", This, pdwDeliveryType); FIXME("(%p, %p): stub\n", This, pdwDeliveryType);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicTool8Impl_GetMediaTypeArraySize (LPDIRECTMUSICTOOL8 iface, DWORD* pdwNumElements) { HRESULT WINAPI IDirectMusicTool8Impl_GetMediaTypeArraySize (LPDIRECTMUSICTOOL8 iface, DWORD* pdwNumElements) {
ICOM_THIS(IDirectMusicTool8Impl,iface); IDirectMusicTool8Impl *This = (IDirectMusicTool8Impl *)iface;
FIXME("(%p, %p): stub\n", This, pdwNumElements); FIXME("(%p, %p): stub\n", This, pdwNumElements);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicTool8Impl_GetMediaTypes (LPDIRECTMUSICTOOL8 iface, DWORD** padwMediaTypes, DWORD dwNumElements) { HRESULT WINAPI IDirectMusicTool8Impl_GetMediaTypes (LPDIRECTMUSICTOOL8 iface, DWORD** padwMediaTypes, DWORD dwNumElements) {
ICOM_THIS(IDirectMusicTool8Impl,iface); IDirectMusicTool8Impl *This = (IDirectMusicTool8Impl *)iface;
FIXME("(%p, %p, %ld): stub\n", This, padwMediaTypes, dwNumElements); FIXME("(%p, %p, %ld): stub\n", This, padwMediaTypes, dwNumElements);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicTool8Impl_ProcessPMsg (LPDIRECTMUSICTOOL8 iface, IDirectMusicPerformance* pPerf, DMUS_PMSG* pPMSG) { HRESULT WINAPI IDirectMusicTool8Impl_ProcessPMsg (LPDIRECTMUSICTOOL8 iface, IDirectMusicPerformance* pPerf, DMUS_PMSG* pPMSG) {
ICOM_THIS(IDirectMusicTool8Impl,iface); IDirectMusicTool8Impl *This = (IDirectMusicTool8Impl *)iface;
FIXME("(%p, %p, %p): stub\n", This, pPerf, pPMSG); FIXME("(%p, %p, %p): stub\n", This, pPerf, pPMSG);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicTool8Impl_Flush (LPDIRECTMUSICTOOL8 iface, IDirectMusicPerformance* pPerf, DMUS_PMSG* pPMSG, REFERENCE_TIME rtTime) { HRESULT WINAPI IDirectMusicTool8Impl_Flush (LPDIRECTMUSICTOOL8 iface, IDirectMusicPerformance* pPerf, DMUS_PMSG* pPMSG, REFERENCE_TIME rtTime) {
ICOM_THIS(IDirectMusicTool8Impl,iface); IDirectMusicTool8Impl *This = (IDirectMusicTool8Impl *)iface;
FIXME("(%p, %p, %p, %lli): stub\n", This, pPerf, pPMSG, rtTime); FIXME("(%p, %p, %p, %lli): stub\n", This, pPerf, pPMSG, rtTime);
return S_OK; return S_OK;
} }
/* IDirectMusicTool8Impl IDirectMusicTool8 part: */ /* IDirectMusicTool8Impl IDirectMusicTool8 part: */
HRESULT WINAPI IDirectMusicTool8Impl_Clone (LPDIRECTMUSICTOOL8 iface, IDirectMusicTool** ppTool) { HRESULT WINAPI IDirectMusicTool8Impl_Clone (LPDIRECTMUSICTOOL8 iface, IDirectMusicTool** ppTool) {
ICOM_THIS(IDirectMusicTool8Impl,iface); IDirectMusicTool8Impl *This = (IDirectMusicTool8Impl *)iface;
FIXME("(%p, %p): stub\n", This, ppTool); FIXME("(%p, %p): stub\n", This, ppTool);
return S_OK; return S_OK;
} }
......
...@@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmloader); ...@@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmloader);
* IDirectMusicLoaderCF implementation * IDirectMusicLoaderCF implementation
*/ */
HRESULT WINAPI IDirectMusicLoaderCF_QueryInterface (LPCLASSFACTORY iface, REFIID riid, LPVOID *ppobj) { HRESULT WINAPI IDirectMusicLoaderCF_QueryInterface (LPCLASSFACTORY iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IDirectMusicLoaderCF, iface); IDirectMusicLoaderCF *This = (IDirectMusicLoaderCF *)iface;
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
if (IsEqualIID (riid, &IID_IUnknown) || if (IsEqualIID (riid, &IID_IUnknown) ||
...@@ -41,13 +41,13 @@ HRESULT WINAPI IDirectMusicLoaderCF_QueryInterface (LPCLASSFACTORY iface, REFIID ...@@ -41,13 +41,13 @@ HRESULT WINAPI IDirectMusicLoaderCF_QueryInterface (LPCLASSFACTORY iface, REFIID
} }
ULONG WINAPI IDirectMusicLoaderCF_AddRef (LPCLASSFACTORY iface) { ULONG WINAPI IDirectMusicLoaderCF_AddRef (LPCLASSFACTORY iface) {
ICOM_THIS(IDirectMusicLoaderCF, iface); IDirectMusicLoaderCF *This = (IDirectMusicLoaderCF *)iface;
TRACE("(%p): AddRef from %ld\n", This, This->dwRef); TRACE("(%p): AddRef from %ld\n", This, This->dwRef);
return InterlockedIncrement (&This->dwRef); return InterlockedIncrement (&This->dwRef);
} }
ULONG WINAPI IDirectMusicLoaderCF_Release (LPCLASSFACTORY iface) { ULONG WINAPI IDirectMusicLoaderCF_Release (LPCLASSFACTORY iface) {
ICOM_THIS(IDirectMusicLoaderCF, iface); IDirectMusicLoaderCF *This = (IDirectMusicLoaderCF *)iface;
DWORD dwRef = InterlockedDecrement (&This->dwRef); DWORD dwRef = InterlockedDecrement (&This->dwRef);
TRACE("(%p): ReleaseRef to %ld\n", This, dwRef); TRACE("(%p): ReleaseRef to %ld\n", This, dwRef);
...@@ -61,7 +61,7 @@ ULONG WINAPI IDirectMusicLoaderCF_Release (LPCLASSFACTORY iface) { ...@@ -61,7 +61,7 @@ ULONG WINAPI IDirectMusicLoaderCF_Release (LPCLASSFACTORY iface) {
} }
HRESULT WINAPI IDirectMusicLoaderCF_CreateInstance (LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { HRESULT WINAPI IDirectMusicLoaderCF_CreateInstance (LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IDirectMusicLoaderCF, iface); IDirectMusicLoaderCF *This = (IDirectMusicLoaderCF *)iface;
TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj); TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj);
if (pOuter) { if (pOuter) {
...@@ -73,7 +73,7 @@ HRESULT WINAPI IDirectMusicLoaderCF_CreateInstance (LPCLASSFACTORY iface, LPUNKN ...@@ -73,7 +73,7 @@ HRESULT WINAPI IDirectMusicLoaderCF_CreateInstance (LPCLASSFACTORY iface, LPUNKN
} }
HRESULT WINAPI IDirectMusicLoaderCF_LockServer (LPCLASSFACTORY iface, BOOL dolock) { HRESULT WINAPI IDirectMusicLoaderCF_LockServer (LPCLASSFACTORY iface, BOOL dolock) {
ICOM_THIS(IDirectMusicLoaderCF, iface); IDirectMusicLoaderCF *This = (IDirectMusicLoaderCF *)iface;
TRACE("(%p, %d)\n", This, dolock); TRACE("(%p, %d)\n", This, dolock);
if (dolock == TRUE) if (dolock == TRUE)
InterlockedIncrement (&dwDirectMusicLoader); InterlockedIncrement (&dwDirectMusicLoader);
...@@ -113,7 +113,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderCF (LPCGUID lpcGUID, LPVOID *ppobj, ...@@ -113,7 +113,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderCF (LPCGUID lpcGUID, LPVOID *ppobj,
* IDirectMusicContainerCF implementation * IDirectMusicContainerCF implementation
*/ */
HRESULT WINAPI IDirectMusicContainerCF_QueryInterface (LPCLASSFACTORY iface, REFIID riid, LPVOID *ppobj) { HRESULT WINAPI IDirectMusicContainerCF_QueryInterface (LPCLASSFACTORY iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IDirectMusicContainerCF, iface); IDirectMusicContainerCF *This = (IDirectMusicContainerCF *)iface;
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
if (IsEqualIID (riid, &IID_IUnknown) || if (IsEqualIID (riid, &IID_IUnknown) ||
...@@ -128,13 +128,13 @@ HRESULT WINAPI IDirectMusicContainerCF_QueryInterface (LPCLASSFACTORY iface, REF ...@@ -128,13 +128,13 @@ HRESULT WINAPI IDirectMusicContainerCF_QueryInterface (LPCLASSFACTORY iface, REF
} }
ULONG WINAPI IDirectMusicContainerCF_AddRef (LPCLASSFACTORY iface) { ULONG WINAPI IDirectMusicContainerCF_AddRef (LPCLASSFACTORY iface) {
ICOM_THIS(IDirectMusicContainerCF, iface); IDirectMusicContainerCF *This = (IDirectMusicContainerCF *)iface;
TRACE("(%p): AddRef from %ld\n", This, This->dwRef); TRACE("(%p): AddRef from %ld\n", This, This->dwRef);
return InterlockedIncrement (&This->dwRef); return InterlockedIncrement (&This->dwRef);
} }
ULONG WINAPI IDirectMusicContainerCF_Release (LPCLASSFACTORY iface) { ULONG WINAPI IDirectMusicContainerCF_Release (LPCLASSFACTORY iface) {
ICOM_THIS(IDirectMusicContainerCF, iface); IDirectMusicContainerCF *This = (IDirectMusicContainerCF *)iface;
DWORD dwRef = InterlockedDecrement (&This->dwRef); DWORD dwRef = InterlockedDecrement (&This->dwRef);
TRACE("(%p): ReleaseRef to %ld\n", This, dwRef); TRACE("(%p): ReleaseRef to %ld\n", This, dwRef);
...@@ -148,7 +148,7 @@ ULONG WINAPI IDirectMusicContainerCF_Release (LPCLASSFACTORY iface) { ...@@ -148,7 +148,7 @@ ULONG WINAPI IDirectMusicContainerCF_Release (LPCLASSFACTORY iface) {
} }
HRESULT WINAPI IDirectMusicContainerCF_CreateInstance (LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { HRESULT WINAPI IDirectMusicContainerCF_CreateInstance (LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IDirectMusicContainerCF, iface); IDirectMusicContainerCF *This = (IDirectMusicContainerCF *)iface;
TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj); TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj);
if (pOuter) { if (pOuter) {
...@@ -160,7 +160,7 @@ HRESULT WINAPI IDirectMusicContainerCF_CreateInstance (LPCLASSFACTORY iface, LPU ...@@ -160,7 +160,7 @@ HRESULT WINAPI IDirectMusicContainerCF_CreateInstance (LPCLASSFACTORY iface, LPU
} }
HRESULT WINAPI IDirectMusicContainerCF_LockServer (LPCLASSFACTORY iface, BOOL dolock) { HRESULT WINAPI IDirectMusicContainerCF_LockServer (LPCLASSFACTORY iface, BOOL dolock) {
ICOM_THIS(IDirectMusicContainerCF, iface); IDirectMusicContainerCF *This = (IDirectMusicContainerCF *)iface;
TRACE("(%p, %d)\n", This, dolock); TRACE("(%p, %d)\n", This, dolock);
if (dolock == TRUE) if (dolock == TRUE)
InterlockedIncrement (&dwDirectMusicContainer); InterlockedIncrement (&dwDirectMusicContainer);
......
...@@ -33,30 +33,30 @@ typedef struct { ...@@ -33,30 +33,30 @@ typedef struct {
* DirectMusicSynth ClassFactory * DirectMusicSynth ClassFactory
*/ */
static HRESULT WINAPI SynthCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { static HRESULT WINAPI SynthCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p, %s, %p): stub\n", This, debugstr_dmguid(riid), ppobj); FIXME("(%p, %s, %p): stub\n", This, debugstr_dmguid(riid), ppobj);
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI SynthCF_AddRef(LPCLASSFACTORY iface) { static ULONG WINAPI SynthCF_AddRef(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
return ++(This->ref); return ++(This->ref);
} }
static ULONG WINAPI SynthCF_Release(LPCLASSFACTORY iface) { static ULONG WINAPI SynthCF_Release(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
/* static class, won't be freed */ /* static class, won't be freed */
return --(This->ref); return --(This->ref);
} }
static HRESULT WINAPI SynthCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI SynthCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj); TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj);
return DMUSIC_CreateDirectMusicSynthImpl (riid, ppobj, pOuter); return DMUSIC_CreateDirectMusicSynthImpl (riid, ppobj, pOuter);
} }
static HRESULT WINAPI SynthCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { static HRESULT WINAPI SynthCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p, %d): stub\n", This, dolock); FIXME("(%p, %d): stub\n", This, dolock);
return S_OK; return S_OK;
} }
...@@ -75,30 +75,30 @@ static IClassFactoryImpl Synth_CF = {&SynthCF_Vtbl, 1 }; ...@@ -75,30 +75,30 @@ static IClassFactoryImpl Synth_CF = {&SynthCF_Vtbl, 1 };
* DirectMusicSynthSink ClassFactory * DirectMusicSynthSink ClassFactory
*/ */
static HRESULT WINAPI SynthSinkCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { static HRESULT WINAPI SynthSinkCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p, %s, %p): stub\n", This, debugstr_dmguid(riid), ppobj); FIXME("(%p, %s, %p): stub\n", This, debugstr_dmguid(riid), ppobj);
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI SynthSinkCF_AddRef(LPCLASSFACTORY iface) { static ULONG WINAPI SynthSinkCF_AddRef(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
return ++(This->ref); return ++(This->ref);
} }
static ULONG WINAPI SynthSinkCF_Release(LPCLASSFACTORY iface) { static ULONG WINAPI SynthSinkCF_Release(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
/* static class, won't be freed */ /* static class, won't be freed */
return --(This->ref); return --(This->ref);
} }
static HRESULT WINAPI SynthSinkCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI SynthSinkCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj); TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj);
return DMUSIC_CreateDirectMusicSynthSinkImpl (riid, ppobj, pOuter); return DMUSIC_CreateDirectMusicSynthSinkImpl (riid, ppobj, pOuter);
} }
static HRESULT WINAPI SynthSinkCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { static HRESULT WINAPI SynthSinkCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p, %d): stub\n", This, dolock); FIXME("(%p, %d): stub\n", This, dolock);
return S_OK; return S_OK;
} }
......
...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmsynth); ...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmsynth);
/* IDirectMusicSynth8Impl IUnknown part: */ /* IDirectMusicSynth8Impl IUnknown part: */
HRESULT WINAPI IDirectMusicSynth8Impl_QueryInterface (LPDIRECTMUSICSYNTH8 iface, REFIID riid, LPVOID *ppobj) { HRESULT WINAPI IDirectMusicSynth8Impl_QueryInterface (LPDIRECTMUSICSYNTH8 iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IDirectMusicSynth8Impl,iface); IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
if (IsEqualIID (riid, &IID_IUnknown) || if (IsEqualIID (riid, &IID_IUnknown) ||
...@@ -38,13 +38,13 @@ HRESULT WINAPI IDirectMusicSynth8Impl_QueryInterface (LPDIRECTMUSICSYNTH8 iface, ...@@ -38,13 +38,13 @@ HRESULT WINAPI IDirectMusicSynth8Impl_QueryInterface (LPDIRECTMUSICSYNTH8 iface,
} }
ULONG WINAPI IDirectMusicSynth8Impl_AddRef (LPDIRECTMUSICSYNTH8 iface) { ULONG WINAPI IDirectMusicSynth8Impl_AddRef (LPDIRECTMUSICSYNTH8 iface) {
ICOM_THIS(IDirectMusicSynth8Impl,iface); IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
TRACE("(%p): AddRef from %ld\n", This, This->ref); TRACE("(%p): AddRef from %ld\n", This, This->ref);
return ++(This->ref); return ++(This->ref);
} }
ULONG WINAPI IDirectMusicSynth8Impl_Release (LPDIRECTMUSICSYNTH8 iface) { ULONG WINAPI IDirectMusicSynth8Impl_Release (LPDIRECTMUSICSYNTH8 iface) {
ICOM_THIS(IDirectMusicSynth8Impl,iface); IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
ULONG ref = --This->ref; ULONG ref = --This->ref;
TRACE("(%p): ReleaseRef to %ld\n", This, This->ref); TRACE("(%p): ReleaseRef to %ld\n", This, This->ref);
if (ref == 0) { if (ref == 0) {
...@@ -55,139 +55,139 @@ ULONG WINAPI IDirectMusicSynth8Impl_Release (LPDIRECTMUSICSYNTH8 iface) { ...@@ -55,139 +55,139 @@ ULONG WINAPI IDirectMusicSynth8Impl_Release (LPDIRECTMUSICSYNTH8 iface) {
/* IDirectMusicSynth8Impl IDirectMusicSynth part: */ /* IDirectMusicSynth8Impl IDirectMusicSynth part: */
HRESULT WINAPI IDirectMusicSynth8Impl_Open (LPDIRECTMUSICSYNTH8 iface, LPDMUS_PORTPARAMS pPortParams) { HRESULT WINAPI IDirectMusicSynth8Impl_Open (LPDIRECTMUSICSYNTH8 iface, LPDMUS_PORTPARAMS pPortParams) {
ICOM_THIS(IDirectMusicSynth8Impl,iface); IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
FIXME("(%p, %p): stub\n", This, pPortParams); FIXME("(%p, %p): stub\n", This, pPortParams);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynth8Impl_Close (LPDIRECTMUSICSYNTH8 iface) { HRESULT WINAPI IDirectMusicSynth8Impl_Close (LPDIRECTMUSICSYNTH8 iface) {
ICOM_THIS(IDirectMusicSynth8Impl,iface); IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
FIXME("(%p): stub\n", This); FIXME("(%p): stub\n", This);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynth8Impl_SetNumChannelGroups (LPDIRECTMUSICSYNTH8 iface, DWORD dwGroups) { HRESULT WINAPI IDirectMusicSynth8Impl_SetNumChannelGroups (LPDIRECTMUSICSYNTH8 iface, DWORD dwGroups) {
ICOM_THIS(IDirectMusicSynth8Impl,iface); IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
FIXME("(%p, %ld): stub\n", This, dwGroups); FIXME("(%p, %ld): stub\n", This, dwGroups);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynth8Impl_Download (LPDIRECTMUSICSYNTH8 iface, LPHANDLE phDownload, LPVOID pvData, LPBOOL pbFree) { HRESULT WINAPI IDirectMusicSynth8Impl_Download (LPDIRECTMUSICSYNTH8 iface, LPHANDLE phDownload, LPVOID pvData, LPBOOL pbFree) {
ICOM_THIS(IDirectMusicSynth8Impl,iface); IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
FIXME("(%p, %p, %p, %p): stub\n", This, phDownload, pvData, pbFree); FIXME("(%p, %p, %p, %p): stub\n", This, phDownload, pvData, pbFree);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynth8Impl_Unload (LPDIRECTMUSICSYNTH8 iface, HANDLE hDownload, HRESULT (CALLBACK* lpFreeHandle)(HANDLE,HANDLE), HANDLE hUserData) { HRESULT WINAPI IDirectMusicSynth8Impl_Unload (LPDIRECTMUSICSYNTH8 iface, HANDLE hDownload, HRESULT (CALLBACK* lpFreeHandle)(HANDLE,HANDLE), HANDLE hUserData) {
ICOM_THIS(IDirectMusicSynth8Impl,iface); IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
FIXME("(%p, %p, %p): stub\n", This, hDownload, hUserData); FIXME("(%p, %p, %p): stub\n", This, hDownload, hUserData);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynth8Impl_PlayBuffer (LPDIRECTMUSICSYNTH8 iface, REFERENCE_TIME rt, LPBYTE pbBuffer, DWORD cbBuffer) { HRESULT WINAPI IDirectMusicSynth8Impl_PlayBuffer (LPDIRECTMUSICSYNTH8 iface, REFERENCE_TIME rt, LPBYTE pbBuffer, DWORD cbBuffer) {
ICOM_THIS(IDirectMusicSynth8Impl,iface); IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
FIXME("(%p, %lli, %p, %ld): stub\n", This, rt, pbBuffer, cbBuffer); FIXME("(%p, %lli, %p, %ld): stub\n", This, rt, pbBuffer, cbBuffer);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynth8Impl_GetRunningStats (LPDIRECTMUSICSYNTH8 iface, LPDMUS_SYNTHSTATS pStats) { HRESULT WINAPI IDirectMusicSynth8Impl_GetRunningStats (LPDIRECTMUSICSYNTH8 iface, LPDMUS_SYNTHSTATS pStats) {
ICOM_THIS(IDirectMusicSynth8Impl,iface); IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
FIXME("(%p, %p): stub\n", This, pStats); FIXME("(%p, %p): stub\n", This, pStats);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynth8Impl_GetPortCaps (LPDIRECTMUSICSYNTH8 iface, LPDMUS_PORTCAPS pCaps) { HRESULT WINAPI IDirectMusicSynth8Impl_GetPortCaps (LPDIRECTMUSICSYNTH8 iface, LPDMUS_PORTCAPS pCaps) {
ICOM_THIS(IDirectMusicSynth8Impl,iface); IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
TRACE("(%p, %p)\n", This, pCaps); TRACE("(%p, %p)\n", This, pCaps);
*pCaps = This->pCaps; *pCaps = This->pCaps;
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynth8Impl_SetMasterClock (LPDIRECTMUSICSYNTH8 iface, IReferenceClock* pClock) { HRESULT WINAPI IDirectMusicSynth8Impl_SetMasterClock (LPDIRECTMUSICSYNTH8 iface, IReferenceClock* pClock) {
ICOM_THIS(IDirectMusicSynth8Impl,iface); IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
FIXME("(%p, %p): stub\n", This, pClock); FIXME("(%p, %p): stub\n", This, pClock);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynth8Impl_GetLatencyClock (LPDIRECTMUSICSYNTH8 iface, IReferenceClock** ppClock) { HRESULT WINAPI IDirectMusicSynth8Impl_GetLatencyClock (LPDIRECTMUSICSYNTH8 iface, IReferenceClock** ppClock) {
ICOM_THIS(IDirectMusicSynth8Impl,iface); IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
TRACE("(%p, %p)\n", This, ppClock); TRACE("(%p, %p)\n", This, ppClock);
*ppClock = This->pLatencyClock; *ppClock = This->pLatencyClock;
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynth8Impl_Activate (LPDIRECTMUSICSYNTH8 iface, BOOL fEnable) { HRESULT WINAPI IDirectMusicSynth8Impl_Activate (LPDIRECTMUSICSYNTH8 iface, BOOL fEnable) {
ICOM_THIS(IDirectMusicSynth8Impl,iface); IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
TRACE("(%p, %d)\n", This, fEnable); TRACE("(%p, %d)\n", This, fEnable);
This->fActive = fEnable; This->fActive = fEnable;
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynth8Impl_SetSynthSink (LPDIRECTMUSICSYNTH8 iface, IDirectMusicSynthSink* pSynthSink) { HRESULT WINAPI IDirectMusicSynth8Impl_SetSynthSink (LPDIRECTMUSICSYNTH8 iface, IDirectMusicSynthSink* pSynthSink) {
ICOM_THIS(IDirectMusicSynth8Impl,iface); IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
TRACE("(%p, %p)\n", This, pSynthSink); TRACE("(%p, %p)\n", This, pSynthSink);
This->pSynthSink = (IDirectMusicSynthSinkImpl*)pSynthSink; This->pSynthSink = (IDirectMusicSynthSinkImpl*)pSynthSink;
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynth8Impl_Render (LPDIRECTMUSICSYNTH8 iface, short* pBuffer, DWORD dwLength, LONGLONG llPosition) { HRESULT WINAPI IDirectMusicSynth8Impl_Render (LPDIRECTMUSICSYNTH8 iface, short* pBuffer, DWORD dwLength, LONGLONG llPosition) {
ICOM_THIS(IDirectMusicSynth8Impl,iface); IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
FIXME("(%p, %p, %ld, %lli): stub\n", This, pBuffer, dwLength, llPosition); FIXME("(%p, %p, %ld, %lli): stub\n", This, pBuffer, dwLength, llPosition);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynth8Impl_SetChannelPriority (LPDIRECTMUSICSYNTH8 iface, DWORD dwChannelGroup, DWORD dwChannel, DWORD dwPriority) { HRESULT WINAPI IDirectMusicSynth8Impl_SetChannelPriority (LPDIRECTMUSICSYNTH8 iface, DWORD dwChannelGroup, DWORD dwChannel, DWORD dwPriority) {
/*ICOM_THIS(IDirectMusicSynth8Impl,iface); */ /*IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface; */
/* silenced because of too many messages - 1000 groups * 16 channels ;=) */ /* silenced because of too many messages - 1000 groups * 16 channels ;=) */
/*FIXME("(%p, %ld, %ld, %ld): stub\n", This, dwChannelGroup, dwChannel, dwPriority); */ /*FIXME("(%p, %ld, %ld, %ld): stub\n", This, dwChannelGroup, dwChannel, dwPriority); */
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynth8Impl_GetChannelPriority (LPDIRECTMUSICSYNTH8 iface, DWORD dwChannelGroup, DWORD dwChannel, LPDWORD pdwPriority) { HRESULT WINAPI IDirectMusicSynth8Impl_GetChannelPriority (LPDIRECTMUSICSYNTH8 iface, DWORD dwChannelGroup, DWORD dwChannel, LPDWORD pdwPriority) {
ICOM_THIS(IDirectMusicSynth8Impl,iface); IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
FIXME("(%p, %ld, %ld, %p): stub\n", This, dwChannelGroup, dwChannel, pdwPriority); FIXME("(%p, %ld, %ld, %p): stub\n", This, dwChannelGroup, dwChannel, pdwPriority);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynth8Impl_GetFormat (LPDIRECTMUSICSYNTH8 iface, LPWAVEFORMATEX pWaveFormatEx, LPDWORD pdwWaveFormatExSiz) { HRESULT WINAPI IDirectMusicSynth8Impl_GetFormat (LPDIRECTMUSICSYNTH8 iface, LPWAVEFORMATEX pWaveFormatEx, LPDWORD pdwWaveFormatExSiz) {
ICOM_THIS(IDirectMusicSynth8Impl,iface); IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
FIXME("(%p, %p, %p): stub\n", This, pWaveFormatEx, pdwWaveFormatExSiz); FIXME("(%p, %p, %p): stub\n", This, pWaveFormatEx, pdwWaveFormatExSiz);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynth8Impl_GetAppend (LPDIRECTMUSICSYNTH8 iface, DWORD* pdwAppend) { HRESULT WINAPI IDirectMusicSynth8Impl_GetAppend (LPDIRECTMUSICSYNTH8 iface, DWORD* pdwAppend) {
ICOM_THIS(IDirectMusicSynth8Impl,iface); IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
FIXME("(%p, %p): stub\n", This, pdwAppend); FIXME("(%p, %p): stub\n", This, pdwAppend);
return S_OK; return S_OK;
} }
/* IDirectMusicSynth8Impl IDirectMusicSynth8 part: */ /* IDirectMusicSynth8Impl IDirectMusicSynth8 part: */
HRESULT WINAPI IDirectMusicSynth8Impl_PlayVoice (LPDIRECTMUSICSYNTH8 iface, REFERENCE_TIME rt, DWORD dwVoiceId, DWORD dwChannelGroup, DWORD dwChannel, DWORD dwDLId, long prPitch, long vrVolume, SAMPLE_TIME stVoiceStart, SAMPLE_TIME stLoopStart, SAMPLE_TIME stLoopEnd) { HRESULT WINAPI IDirectMusicSynth8Impl_PlayVoice (LPDIRECTMUSICSYNTH8 iface, REFERENCE_TIME rt, DWORD dwVoiceId, DWORD dwChannelGroup, DWORD dwChannel, DWORD dwDLId, long prPitch, long vrVolume, SAMPLE_TIME stVoiceStart, SAMPLE_TIME stLoopStart, SAMPLE_TIME stLoopEnd) {
ICOM_THIS(IDirectMusicSynth8Impl,iface); IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
FIXME("(%p, %lli, %ld, %ld, %ld, %ld, %li, %li,%lli, %lli, %lli): stub\n", This, rt, dwVoiceId, dwChannelGroup, dwChannel, dwDLId, prPitch, vrVolume, stVoiceStart, stLoopStart, stLoopEnd); FIXME("(%p, %lli, %ld, %ld, %ld, %ld, %li, %li,%lli, %lli, %lli): stub\n", This, rt, dwVoiceId, dwChannelGroup, dwChannel, dwDLId, prPitch, vrVolume, stVoiceStart, stLoopStart, stLoopEnd);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynth8Impl_StopVoice (LPDIRECTMUSICSYNTH8 iface, REFERENCE_TIME rt, DWORD dwVoiceId) { HRESULT WINAPI IDirectMusicSynth8Impl_StopVoice (LPDIRECTMUSICSYNTH8 iface, REFERENCE_TIME rt, DWORD dwVoiceId) {
ICOM_THIS(IDirectMusicSynth8Impl,iface); IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
FIXME("(%p, %lli, %ld): stub\n", This, rt, dwVoiceId); FIXME("(%p, %lli, %ld): stub\n", This, rt, dwVoiceId);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynth8Impl_GetVoiceState (LPDIRECTMUSICSYNTH8 iface, DWORD dwVoice[], DWORD cbVoice, DMUS_VOICE_STATE dwVoiceState[]) { HRESULT WINAPI IDirectMusicSynth8Impl_GetVoiceState (LPDIRECTMUSICSYNTH8 iface, DWORD dwVoice[], DWORD cbVoice, DMUS_VOICE_STATE dwVoiceState[]) {
ICOM_THIS(IDirectMusicSynth8Impl,iface); IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
FIXME("(%p, %p, %ld, %p): stub\n", This, dwVoice, cbVoice, dwVoiceState); FIXME("(%p, %p, %ld, %p): stub\n", This, dwVoice, cbVoice, dwVoiceState);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynth8Impl_Refresh (LPDIRECTMUSICSYNTH8 iface, DWORD dwDownloadID, DWORD dwFlags) { HRESULT WINAPI IDirectMusicSynth8Impl_Refresh (LPDIRECTMUSICSYNTH8 iface, DWORD dwDownloadID, DWORD dwFlags) {
ICOM_THIS(IDirectMusicSynth8Impl,iface); IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
FIXME("(%p, %ld, %ld): stub\n", This, dwDownloadID, dwFlags); FIXME("(%p, %ld, %ld): stub\n", This, dwDownloadID, dwFlags);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynth8Impl_AssignChannelToBuses (LPDIRECTMUSICSYNTH8 iface, DWORD dwChannelGroup, DWORD dwChannel, LPDWORD pdwBuses, DWORD cBuses) { HRESULT WINAPI IDirectMusicSynth8Impl_AssignChannelToBuses (LPDIRECTMUSICSYNTH8 iface, DWORD dwChannelGroup, DWORD dwChannel, LPDWORD pdwBuses, DWORD cBuses) {
ICOM_THIS(IDirectMusicSynth8Impl,iface); IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
FIXME("(%p, %ld, %ld, %p, %ld): stub\n", This, dwChannelGroup, dwChannel, pdwBuses, cBuses); FIXME("(%p, %ld, %ld, %p, %ld): stub\n", This, dwChannelGroup, dwChannel, pdwBuses, cBuses);
return S_OK; return S_OK;
} }
......
...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmsynth); ...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmsynth);
/* IDirectMusicSynthSinkImpl IUnknown part: */ /* IDirectMusicSynthSinkImpl IUnknown part: */
HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface (LPDIRECTMUSICSYNTHSINK iface, REFIID riid, LPVOID *ppobj) { HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface (LPDIRECTMUSICSYNTHSINK iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IDirectMusicSynthSinkImpl,iface); IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface;
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
if (IsEqualIID (riid, &IID_IUnknown) || if (IsEqualIID (riid, &IID_IUnknown) ||
...@@ -37,13 +37,13 @@ HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface (LPDIRECTMUSICSYNTHSINK ...@@ -37,13 +37,13 @@ HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface (LPDIRECTMUSICSYNTHSINK
} }
ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef (LPDIRECTMUSICSYNTHSINK iface) { ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef (LPDIRECTMUSICSYNTHSINK iface) {
ICOM_THIS(IDirectMusicSynthSinkImpl,iface); IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface;
TRACE("(%p): AddRef from %ld\n", This, This->ref); TRACE("(%p): AddRef from %ld\n", This, This->ref);
return ++(This->ref); return ++(This->ref);
} }
ULONG WINAPI IDirectMusicSynthSinkImpl_Release (LPDIRECTMUSICSYNTHSINK iface) { ULONG WINAPI IDirectMusicSynthSinkImpl_Release (LPDIRECTMUSICSYNTHSINK iface) {
ICOM_THIS(IDirectMusicSynthSinkImpl,iface); IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface;
ULONG ref = --This->ref; ULONG ref = --This->ref;
TRACE("(%p): ReleaseRef to %ld\n", This, This->ref); TRACE("(%p): ReleaseRef to %ld\n", This, This->ref);
if (ref == 0) { if (ref == 0) {
...@@ -54,49 +54,49 @@ ULONG WINAPI IDirectMusicSynthSinkImpl_Release (LPDIRECTMUSICSYNTHSINK iface) { ...@@ -54,49 +54,49 @@ ULONG WINAPI IDirectMusicSynthSinkImpl_Release (LPDIRECTMUSICSYNTHSINK iface) {
/* IDirectMusicSynthSinkImpl IDirectMusicSynthSink part: */ /* IDirectMusicSynthSinkImpl IDirectMusicSynthSink part: */
HRESULT WINAPI IDirectMusicSynthSinkImpl_Init (LPDIRECTMUSICSYNTHSINK iface, IDirectMusicSynth* pSynth) { HRESULT WINAPI IDirectMusicSynthSinkImpl_Init (LPDIRECTMUSICSYNTHSINK iface, IDirectMusicSynth* pSynth) {
ICOM_THIS(IDirectMusicSynthSinkImpl,iface); IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface;
FIXME("(%p, %p): stub\n", This, pSynth); FIXME("(%p, %p): stub\n", This, pSynth);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynthSinkImpl_SetMasterClock (LPDIRECTMUSICSYNTHSINK iface, IReferenceClock* pClock) { HRESULT WINAPI IDirectMusicSynthSinkImpl_SetMasterClock (LPDIRECTMUSICSYNTHSINK iface, IReferenceClock* pClock) {
ICOM_THIS(IDirectMusicSynthSinkImpl,iface); IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface;
FIXME("(%p, %p): stub\n", This, pClock); FIXME("(%p, %p): stub\n", This, pClock);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynthSinkImpl_GetLatencyClock (LPDIRECTMUSICSYNTHSINK iface, IReferenceClock** ppClock) { HRESULT WINAPI IDirectMusicSynthSinkImpl_GetLatencyClock (LPDIRECTMUSICSYNTHSINK iface, IReferenceClock** ppClock) {
ICOM_THIS(IDirectMusicSynthSinkImpl,iface); IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface;
FIXME("(%p, %p): stub\n", This, ppClock); FIXME("(%p, %p): stub\n", This, ppClock);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynthSinkImpl_Activate (LPDIRECTMUSICSYNTHSINK iface, BOOL fEnable) { HRESULT WINAPI IDirectMusicSynthSinkImpl_Activate (LPDIRECTMUSICSYNTHSINK iface, BOOL fEnable) {
ICOM_THIS(IDirectMusicSynthSinkImpl,iface); IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface;
FIXME("(%p, %d): stub\n", This, fEnable); FIXME("(%p, %d): stub\n", This, fEnable);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynthSinkImpl_SampleToRefTime (LPDIRECTMUSICSYNTHSINK iface, LONGLONG llSampleTime, REFERENCE_TIME* prfTime) { HRESULT WINAPI IDirectMusicSynthSinkImpl_SampleToRefTime (LPDIRECTMUSICSYNTHSINK iface, LONGLONG llSampleTime, REFERENCE_TIME* prfTime) {
ICOM_THIS(IDirectMusicSynthSinkImpl,iface); IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface;
FIXME("(%p, %lli, %p): stub\n", This, llSampleTime, prfTime); FIXME("(%p, %lli, %p): stub\n", This, llSampleTime, prfTime);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynthSinkImpl_RefTimeToSample (LPDIRECTMUSICSYNTHSINK iface, REFERENCE_TIME rfTime, LONGLONG* pllSampleTime) { HRESULT WINAPI IDirectMusicSynthSinkImpl_RefTimeToSample (LPDIRECTMUSICSYNTHSINK iface, REFERENCE_TIME rfTime, LONGLONG* pllSampleTime) {
ICOM_THIS(IDirectMusicSynthSinkImpl,iface); IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface;
FIXME("(%p, %lli, %p): stub\n", This, rfTime, pllSampleTime ); FIXME("(%p, %lli, %p): stub\n", This, rfTime, pllSampleTime );
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynthSinkImpl_SetDirectSound (LPDIRECTMUSICSYNTHSINK iface, LPDIRECTSOUND pDirectSound, LPDIRECTSOUNDBUFFER pDirectSoundBuffer) { HRESULT WINAPI IDirectMusicSynthSinkImpl_SetDirectSound (LPDIRECTMUSICSYNTHSINK iface, LPDIRECTSOUND pDirectSound, LPDIRECTSOUNDBUFFER pDirectSoundBuffer) {
ICOM_THIS(IDirectMusicSynthSinkImpl,iface); IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface;
FIXME("(%p, %p, %p): stub\n", This, pDirectSound, pDirectSoundBuffer); FIXME("(%p, %p, %p): stub\n", This, pDirectSound, pDirectSoundBuffer);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicSynthSinkImpl_GetDesiredBufferSize (LPDIRECTMUSICSYNTHSINK iface, LPDWORD pdwBufferSizeInSamples) { HRESULT WINAPI IDirectMusicSynthSinkImpl_GetDesiredBufferSize (LPDIRECTMUSICSYNTHSINK iface, LPDWORD pdwBufferSizeInSamples) {
ICOM_THIS(IDirectMusicSynthSinkImpl,iface); IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface;
FIXME("(%p, %p): stub\n", This, pdwBufferSizeInSamples); FIXME("(%p, %p): stub\n", This, pdwBufferSizeInSamples);
return S_OK; return S_OK;
} }
......
...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); ...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
/* IDirectMusicBufferImpl IUnknown part: */ /* IDirectMusicBufferImpl IUnknown part: */
HRESULT WINAPI IDirectMusicBufferImpl_QueryInterface (LPDIRECTMUSICBUFFER iface, REFIID riid, LPVOID *ppobj) { HRESULT WINAPI IDirectMusicBufferImpl_QueryInterface (LPDIRECTMUSICBUFFER iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IDirectMusicBufferImpl,iface); IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface;
TRACE("(%p, (%s, %p)\n",This,debugstr_dmguid(riid),ppobj); TRACE("(%p, (%s, %p)\n",This,debugstr_dmguid(riid),ppobj);
if (IsEqualIID (riid, &IID_IUnknown) if (IsEqualIID (riid, &IID_IUnknown)
|| IsEqualIID (riid, &IID_IDirectMusicBuffer)) { || IsEqualIID (riid, &IID_IDirectMusicBuffer)) {
...@@ -36,13 +36,13 @@ HRESULT WINAPI IDirectMusicBufferImpl_QueryInterface (LPDIRECTMUSICBUFFER iface, ...@@ -36,13 +36,13 @@ HRESULT WINAPI IDirectMusicBufferImpl_QueryInterface (LPDIRECTMUSICBUFFER iface,
} }
ULONG WINAPI IDirectMusicBufferImpl_AddRef (LPDIRECTMUSICBUFFER iface) { ULONG WINAPI IDirectMusicBufferImpl_AddRef (LPDIRECTMUSICBUFFER iface) {
ICOM_THIS(IDirectMusicBufferImpl,iface); IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface;
TRACE("(%p): AddRef from %ld\n", This, This->ref); TRACE("(%p): AddRef from %ld\n", This, This->ref);
return ++(This->ref); return ++(This->ref);
} }
ULONG WINAPI IDirectMusicBufferImpl_Release (LPDIRECTMUSICBUFFER iface) { ULONG WINAPI IDirectMusicBufferImpl_Release (LPDIRECTMUSICBUFFER iface) {
ICOM_THIS(IDirectMusicBufferImpl,iface); IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface;
ULONG ref = --This->ref; ULONG ref = --This->ref;
TRACE("(%p): ReleaseRef to %ld\n", This, This->ref); TRACE("(%p): ReleaseRef to %ld\n", This, This->ref);
if (ref == 0) { if (ref == 0) {
...@@ -53,79 +53,79 @@ ULONG WINAPI IDirectMusicBufferImpl_Release (LPDIRECTMUSICBUFFER iface) { ...@@ -53,79 +53,79 @@ ULONG WINAPI IDirectMusicBufferImpl_Release (LPDIRECTMUSICBUFFER iface) {
/* IDirectMusicBufferImpl IDirectMusicBuffer part: */ /* IDirectMusicBufferImpl IDirectMusicBuffer part: */
HRESULT WINAPI IDirectMusicBufferImpl_Flush (LPDIRECTMUSICBUFFER iface) { HRESULT WINAPI IDirectMusicBufferImpl_Flush (LPDIRECTMUSICBUFFER iface) {
ICOM_THIS(IDirectMusicBufferImpl,iface); IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface;
FIXME("(%p): stub\n", This); FIXME("(%p): stub\n", This);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicBufferImpl_TotalTime (LPDIRECTMUSICBUFFER iface, LPREFERENCE_TIME prtTime) { HRESULT WINAPI IDirectMusicBufferImpl_TotalTime (LPDIRECTMUSICBUFFER iface, LPREFERENCE_TIME prtTime) {
ICOM_THIS(IDirectMusicBufferImpl,iface); IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface;
FIXME("(%p, %p): stub\n", This, prtTime); FIXME("(%p, %p): stub\n", This, prtTime);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicBufferImpl_PackStructured (LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt, DWORD dwChannelGroup, DWORD dwChannelMessage) { HRESULT WINAPI IDirectMusicBufferImpl_PackStructured (LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt, DWORD dwChannelGroup, DWORD dwChannelMessage) {
ICOM_THIS(IDirectMusicBufferImpl,iface); IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface;
FIXME("(%p, %lli, %ld, %ld): stub\n", This, rt, dwChannelGroup, dwChannelMessage); FIXME("(%p, %lli, %ld, %ld): stub\n", This, rt, dwChannelGroup, dwChannelMessage);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicBufferImpl_PackUnstructured (LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt, DWORD dwChannelGroup, DWORD cb, LPBYTE lpb) { HRESULT WINAPI IDirectMusicBufferImpl_PackUnstructured (LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt, DWORD dwChannelGroup, DWORD cb, LPBYTE lpb) {
ICOM_THIS(IDirectMusicBufferImpl,iface); IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface;
FIXME("(%p, %lli, %ld, %ld, %p): stub\n", This, rt, dwChannelGroup, cb, lpb); FIXME("(%p, %lli, %ld, %ld, %p): stub\n", This, rt, dwChannelGroup, cb, lpb);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicBufferImpl_ResetReadPtr (LPDIRECTMUSICBUFFER iface) { HRESULT WINAPI IDirectMusicBufferImpl_ResetReadPtr (LPDIRECTMUSICBUFFER iface) {
ICOM_THIS(IDirectMusicBufferImpl,iface); IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface;
FIXME("(%p): stub\n", This); FIXME("(%p): stub\n", This);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicBufferImpl_GetNextEvent (LPDIRECTMUSICBUFFER iface, LPREFERENCE_TIME prt, LPDWORD pdwChannelGroup, LPDWORD pdwLength, LPBYTE* ppData) { HRESULT WINAPI IDirectMusicBufferImpl_GetNextEvent (LPDIRECTMUSICBUFFER iface, LPREFERENCE_TIME prt, LPDWORD pdwChannelGroup, LPDWORD pdwLength, LPBYTE* ppData) {
ICOM_THIS(IDirectMusicBufferImpl,iface); IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface;
FIXME("(%p, %p, %p, %p, %p): stub\n", This, prt, pdwChannelGroup, pdwLength, ppData); FIXME("(%p, %p, %p, %p, %p): stub\n", This, prt, pdwChannelGroup, pdwLength, ppData);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicBufferImpl_GetRawBufferPtr (LPDIRECTMUSICBUFFER iface, LPBYTE* ppData) { HRESULT WINAPI IDirectMusicBufferImpl_GetRawBufferPtr (LPDIRECTMUSICBUFFER iface, LPBYTE* ppData) {
ICOM_THIS(IDirectMusicBufferImpl,iface); IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface;
FIXME("(%p, %p): stub\n", This, ppData); FIXME("(%p, %p): stub\n", This, ppData);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicBufferImpl_GetStartTime (LPDIRECTMUSICBUFFER iface, LPREFERENCE_TIME prt) { HRESULT WINAPI IDirectMusicBufferImpl_GetStartTime (LPDIRECTMUSICBUFFER iface, LPREFERENCE_TIME prt) {
ICOM_THIS(IDirectMusicBufferImpl,iface); IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface;
FIXME("(%p, %p): stub\n", This, prt); FIXME("(%p, %p): stub\n", This, prt);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicBufferImpl_GetUsedBytes (LPDIRECTMUSICBUFFER iface, LPDWORD pcb) { HRESULT WINAPI IDirectMusicBufferImpl_GetUsedBytes (LPDIRECTMUSICBUFFER iface, LPDWORD pcb) {
ICOM_THIS(IDirectMusicBufferImpl,iface); IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface;
FIXME("(%p, %p): stub\n", This, pcb); FIXME("(%p, %p): stub\n", This, pcb);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicBufferImpl_GetMaxBytes (LPDIRECTMUSICBUFFER iface, LPDWORD pcb) { HRESULT WINAPI IDirectMusicBufferImpl_GetMaxBytes (LPDIRECTMUSICBUFFER iface, LPDWORD pcb) {
ICOM_THIS(IDirectMusicBufferImpl,iface); IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface;
FIXME("(%p, %p): stub\n", This, pcb); FIXME("(%p, %p): stub\n", This, pcb);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicBufferImpl_GetBufferFormat (LPDIRECTMUSICBUFFER iface, LPGUID pGuidFormat) { HRESULT WINAPI IDirectMusicBufferImpl_GetBufferFormat (LPDIRECTMUSICBUFFER iface, LPGUID pGuidFormat) {
ICOM_THIS(IDirectMusicBufferImpl,iface); IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface;
FIXME("(%p, %p): stub\n", This, pGuidFormat); FIXME("(%p, %p): stub\n", This, pGuidFormat);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicBufferImpl_SetStartTime (LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt) { HRESULT WINAPI IDirectMusicBufferImpl_SetStartTime (LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt) {
ICOM_THIS(IDirectMusicBufferImpl,iface); IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface;
FIXME("(%p, %lli): stub\n", This, rt); FIXME("(%p, %lli): stub\n", This, rt);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicBufferImpl_SetUsedBytes (LPDIRECTMUSICBUFFER iface, DWORD cb) { HRESULT WINAPI IDirectMusicBufferImpl_SetUsedBytes (LPDIRECTMUSICBUFFER iface, DWORD cb) {
ICOM_THIS(IDirectMusicBufferImpl,iface); IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface;
FIXME("(%p, %ld): stub\n", This, cb); FIXME("(%p, %ld): stub\n", This, cb);
return S_OK; return S_OK;
} }
......
...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); ...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
/* IReferenceClockImpl IUnknown part: */ /* IReferenceClockImpl IUnknown part: */
HRESULT WINAPI IReferenceClockImpl_QueryInterface (IReferenceClock *iface, REFIID riid, LPVOID *ppobj) { HRESULT WINAPI IReferenceClockImpl_QueryInterface (IReferenceClock *iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IReferenceClockImpl,iface); IReferenceClockImpl *This = (IReferenceClockImpl *)iface;
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
if (IsEqualIID (riid, &IID_IUnknown) || if (IsEqualIID (riid, &IID_IUnknown) ||
...@@ -37,13 +37,13 @@ HRESULT WINAPI IReferenceClockImpl_QueryInterface (IReferenceClock *iface, REFII ...@@ -37,13 +37,13 @@ HRESULT WINAPI IReferenceClockImpl_QueryInterface (IReferenceClock *iface, REFII
} }
ULONG WINAPI IReferenceClockImpl_AddRef (IReferenceClock *iface) { ULONG WINAPI IReferenceClockImpl_AddRef (IReferenceClock *iface) {
ICOM_THIS(IReferenceClockImpl,iface); IReferenceClockImpl *This = (IReferenceClockImpl *)iface;
TRACE("(%p): AddRef from %ld\n", This, This->ref); TRACE("(%p): AddRef from %ld\n", This, This->ref);
return ++(This->ref); return ++(This->ref);
} }
ULONG WINAPI IReferenceClockImpl_Release (IReferenceClock *iface) { ULONG WINAPI IReferenceClockImpl_Release (IReferenceClock *iface) {
ICOM_THIS(IReferenceClockImpl,iface); IReferenceClockImpl *This = (IReferenceClockImpl *)iface;
ULONG ref = --This->ref; ULONG ref = --This->ref;
TRACE("(%p): ReleaseRef to %ld\n", This, This->ref); TRACE("(%p): ReleaseRef to %ld\n", This, This->ref);
if (ref == 0) { if (ref == 0) {
...@@ -54,26 +54,26 @@ ULONG WINAPI IReferenceClockImpl_Release (IReferenceClock *iface) { ...@@ -54,26 +54,26 @@ ULONG WINAPI IReferenceClockImpl_Release (IReferenceClock *iface) {
/* IReferenceClockImpl IReferenceClock part: */ /* IReferenceClockImpl IReferenceClock part: */
HRESULT WINAPI IReferenceClockImpl_GetTime (IReferenceClock *iface, REFERENCE_TIME* pTime) { HRESULT WINAPI IReferenceClockImpl_GetTime (IReferenceClock *iface, REFERENCE_TIME* pTime) {
ICOM_THIS(IReferenceClockImpl,iface); IReferenceClockImpl *This = (IReferenceClockImpl *)iface;
TRACE("(%p, %p)\n", This, pTime); TRACE("(%p, %p)\n", This, pTime);
*pTime = This->rtTime; *pTime = This->rtTime;
return S_OK; return S_OK;
} }
HRESULT WINAPI IReferenceClockImpl_AdviseTime (IReferenceClock *iface, REFERENCE_TIME baseTime, REFERENCE_TIME streamTime, HANDLE hEvent, DWORD* pdwAdviseCookie) { HRESULT WINAPI IReferenceClockImpl_AdviseTime (IReferenceClock *iface, REFERENCE_TIME baseTime, REFERENCE_TIME streamTime, HANDLE hEvent, DWORD* pdwAdviseCookie) {
ICOM_THIS(IReferenceClockImpl,iface); IReferenceClockImpl *This = (IReferenceClockImpl *)iface;
FIXME("(%p, %lli, %lli, %p, %p): stub\n", This, baseTime, streamTime, hEvent, pdwAdviseCookie); FIXME("(%p, %lli, %lli, %p, %p): stub\n", This, baseTime, streamTime, hEvent, pdwAdviseCookie);
return S_OK; return S_OK;
} }
HRESULT WINAPI IReferenceClockImpl_AdvisePeriodic (IReferenceClock *iface, REFERENCE_TIME startTime, REFERENCE_TIME periodTime, HANDLE hSemaphore, DWORD* pdwAdviseCookie) { HRESULT WINAPI IReferenceClockImpl_AdvisePeriodic (IReferenceClock *iface, REFERENCE_TIME startTime, REFERENCE_TIME periodTime, HANDLE hSemaphore, DWORD* pdwAdviseCookie) {
ICOM_THIS(IReferenceClockImpl,iface); IReferenceClockImpl *This = (IReferenceClockImpl *)iface;
FIXME("(%p, %lli, %lli, %p, %p): stub\n", This, startTime, periodTime, hSemaphore, pdwAdviseCookie); FIXME("(%p, %lli, %lli, %p, %p): stub\n", This, startTime, periodTime, hSemaphore, pdwAdviseCookie);
return S_OK; return S_OK;
} }
HRESULT WINAPI IReferenceClockImpl_Unadvise (IReferenceClock *iface, DWORD dwAdviseCookie) { HRESULT WINAPI IReferenceClockImpl_Unadvise (IReferenceClock *iface, DWORD dwAdviseCookie) {
ICOM_THIS(IReferenceClockImpl,iface); IReferenceClockImpl *This = (IReferenceClockImpl *)iface;
FIXME("(%p, %ld): stub\n", This, dwAdviseCookie); FIXME("(%p, %ld): stub\n", This, dwAdviseCookie);
return S_OK; return S_OK;
} }
......
...@@ -22,7 +22,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); ...@@ -22,7 +22,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
/* IDirectMusic8Impl IUnknown part: */ /* IDirectMusic8Impl IUnknown part: */
HRESULT WINAPI IDirectMusic8Impl_QueryInterface (LPDIRECTMUSIC8 iface, REFIID riid, LPVOID *ppobj) { HRESULT WINAPI IDirectMusic8Impl_QueryInterface (LPDIRECTMUSIC8 iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IDirectMusic8Impl,iface); IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface;
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
if (IsEqualIID (riid, &IID_IUnknown) || if (IsEqualIID (riid, &IID_IUnknown) ||
...@@ -39,13 +39,13 @@ HRESULT WINAPI IDirectMusic8Impl_QueryInterface (LPDIRECTMUSIC8 iface, REFIID ri ...@@ -39,13 +39,13 @@ HRESULT WINAPI IDirectMusic8Impl_QueryInterface (LPDIRECTMUSIC8 iface, REFIID ri
} }
ULONG WINAPI IDirectMusic8Impl_AddRef (LPDIRECTMUSIC8 iface) { ULONG WINAPI IDirectMusic8Impl_AddRef (LPDIRECTMUSIC8 iface) {
ICOM_THIS(IDirectMusic8Impl,iface); IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface;
TRACE("(%p): AddRef from %ld\n", This, This->ref); TRACE("(%p): AddRef from %ld\n", This, This->ref);
return ++(This->ref); return ++(This->ref);
} }
ULONG WINAPI IDirectMusic8Impl_Release (LPDIRECTMUSIC8 iface) { ULONG WINAPI IDirectMusic8Impl_Release (LPDIRECTMUSIC8 iface) {
ICOM_THIS(IDirectMusic8Impl,iface); IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface;
ULONG ref = --This->ref; ULONG ref = --This->ref;
TRACE("(%p): ReleaseRef to %ld\n", This, This->ref); TRACE("(%p): ReleaseRef to %ld\n", This, This->ref);
if (ref == 0) { if (ref == 0) {
...@@ -56,7 +56,7 @@ ULONG WINAPI IDirectMusic8Impl_Release (LPDIRECTMUSIC8 iface) { ...@@ -56,7 +56,7 @@ ULONG WINAPI IDirectMusic8Impl_Release (LPDIRECTMUSIC8 iface) {
/* IDirectMusic8Impl IDirectMusic part: */ /* IDirectMusic8Impl IDirectMusic part: */
HRESULT WINAPI IDirectMusic8Impl_EnumPort(LPDIRECTMUSIC8 iface, DWORD dwIndex, LPDMUS_PORTCAPS pPortCaps) { HRESULT WINAPI IDirectMusic8Impl_EnumPort(LPDIRECTMUSIC8 iface, DWORD dwIndex, LPDMUS_PORTCAPS pPortCaps) {
ICOM_THIS(IDirectMusic8Impl,iface); IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface;
TRACE("(%p, %ld, %p)\n", This, dwIndex, pPortCaps); TRACE("(%p, %ld, %p)\n", This, dwIndex, pPortCaps);
/* i guess the first port shown is always software synthesizer */ /* i guess the first port shown is always software synthesizer */
...@@ -97,13 +97,13 @@ HRESULT WINAPI IDirectMusic8Impl_EnumPort(LPDIRECTMUSIC8 iface, DWORD dwIndex, L ...@@ -97,13 +97,13 @@ HRESULT WINAPI IDirectMusic8Impl_EnumPort(LPDIRECTMUSIC8 iface, DWORD dwIndex, L
} }
HRESULT WINAPI IDirectMusic8Impl_CreateMusicBuffer (LPDIRECTMUSIC8 iface, LPDMUS_BUFFERDESC pBufferDesc, LPDIRECTMUSICBUFFER** ppBuffer, LPUNKNOWN pUnkOuter) { HRESULT WINAPI IDirectMusic8Impl_CreateMusicBuffer (LPDIRECTMUSIC8 iface, LPDMUS_BUFFERDESC pBufferDesc, LPDIRECTMUSICBUFFER** ppBuffer, LPUNKNOWN pUnkOuter) {
ICOM_THIS(IDirectMusic8Impl,iface); IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface;
FIXME("(%p, %p, %p, %p): stub\n", This, pBufferDesc, ppBuffer, pUnkOuter); FIXME("(%p, %p, %p, %p): stub\n", This, pBufferDesc, ppBuffer, pUnkOuter);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusic8Impl_CreatePort (LPDIRECTMUSIC8 iface, REFCLSID rclsidPort, LPDMUS_PORTPARAMS pPortParams, LPDIRECTMUSICPORT* ppPort, LPUNKNOWN pUnkOuter) { HRESULT WINAPI IDirectMusic8Impl_CreatePort (LPDIRECTMUSIC8 iface, REFCLSID rclsidPort, LPDMUS_PORTPARAMS pPortParams, LPDIRECTMUSICPORT* ppPort, LPUNKNOWN pUnkOuter) {
ICOM_THIS(IDirectMusic8Impl,iface); IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface;
int i/*, j*/; int i/*, j*/;
DMUS_PORTCAPS PortCaps; DMUS_PORTCAPS PortCaps;
...@@ -159,13 +159,13 @@ HRESULT WINAPI IDirectMusic8Impl_CreatePort (LPDIRECTMUSIC8 iface, REFCLSID rcls ...@@ -159,13 +159,13 @@ HRESULT WINAPI IDirectMusic8Impl_CreatePort (LPDIRECTMUSIC8 iface, REFCLSID rcls
} }
HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock (LPDIRECTMUSIC8 iface, DWORD dwIndex, LPDMUS_CLOCKINFO lpClockInfo) { HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock (LPDIRECTMUSIC8 iface, DWORD dwIndex, LPDMUS_CLOCKINFO lpClockInfo) {
ICOM_THIS(IDirectMusic8Impl,iface); IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface;
FIXME("(%p, %ld, %p): stub\n", This, dwIndex, lpClockInfo); FIXME("(%p, %ld, %p): stub\n", This, dwIndex, lpClockInfo);
return S_FALSE; return S_FALSE;
} }
HRESULT WINAPI IDirectMusic8Impl_GetMasterClock (LPDIRECTMUSIC8 iface, LPGUID pguidClock, IReferenceClock** ppReferenceClock) { HRESULT WINAPI IDirectMusic8Impl_GetMasterClock (LPDIRECTMUSIC8 iface, LPGUID pguidClock, IReferenceClock** ppReferenceClock) {
ICOM_THIS(IDirectMusic8Impl,iface); IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface;
TRACE("(%p, %p, %p)\n", This, pguidClock, ppReferenceClock); TRACE("(%p, %p, %p)\n", This, pguidClock, ppReferenceClock);
if (pguidClock) if (pguidClock)
...@@ -177,13 +177,13 @@ HRESULT WINAPI IDirectMusic8Impl_GetMasterClock (LPDIRECTMUSIC8 iface, LPGUID pg ...@@ -177,13 +177,13 @@ HRESULT WINAPI IDirectMusic8Impl_GetMasterClock (LPDIRECTMUSIC8 iface, LPGUID pg
} }
HRESULT WINAPI IDirectMusic8Impl_SetMasterClock (LPDIRECTMUSIC8 iface, REFGUID rguidClock) { HRESULT WINAPI IDirectMusic8Impl_SetMasterClock (LPDIRECTMUSIC8 iface, REFGUID rguidClock) {
ICOM_THIS(IDirectMusic8Impl,iface); IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface;
FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidClock)); FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidClock));
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusic8Impl_Activate (LPDIRECTMUSIC8 iface, BOOL fEnable) { HRESULT WINAPI IDirectMusic8Impl_Activate (LPDIRECTMUSIC8 iface, BOOL fEnable) {
ICOM_THIS(IDirectMusic8Impl,iface); IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface;
int i; int i;
FIXME("(%p, %d): stub\n", This, fEnable); FIXME("(%p, %d): stub\n", This, fEnable);
...@@ -195,7 +195,7 @@ HRESULT WINAPI IDirectMusic8Impl_Activate (LPDIRECTMUSIC8 iface, BOOL fEnable) { ...@@ -195,7 +195,7 @@ HRESULT WINAPI IDirectMusic8Impl_Activate (LPDIRECTMUSIC8 iface, BOOL fEnable) {
} }
HRESULT WINAPI IDirectMusic8Impl_GetDefaultPort (LPDIRECTMUSIC8 iface, LPGUID pguidPort) { HRESULT WINAPI IDirectMusic8Impl_GetDefaultPort (LPDIRECTMUSIC8 iface, LPGUID pguidPort) {
ICOM_THIS(IDirectMusic8Impl,iface); IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface;
HKEY hkGUID; HKEY hkGUID;
DWORD returnTypeGUID, sizeOfReturnBuffer = 50; DWORD returnTypeGUID, sizeOfReturnBuffer = 50;
char returnBuffer[51]; char returnBuffer[51];
...@@ -219,13 +219,13 @@ HRESULT WINAPI IDirectMusic8Impl_GetDefaultPort (LPDIRECTMUSIC8 iface, LPGUID pg ...@@ -219,13 +219,13 @@ HRESULT WINAPI IDirectMusic8Impl_GetDefaultPort (LPDIRECTMUSIC8 iface, LPGUID pg
} }
HRESULT WINAPI IDirectMusic8Impl_SetDirectSound (LPDIRECTMUSIC8 iface, LPDIRECTSOUND pDirectSound, HWND hWnd) { HRESULT WINAPI IDirectMusic8Impl_SetDirectSound (LPDIRECTMUSIC8 iface, LPDIRECTSOUND pDirectSound, HWND hWnd) {
ICOM_THIS(IDirectMusic8Impl,iface); IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface;
FIXME("(%p, %p, %p): stub\n", This, pDirectSound, hWnd); FIXME("(%p, %p, %p): stub\n", This, pDirectSound, hWnd);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusic8Impl_SetExternalMasterClock (LPDIRECTMUSIC8 iface, IReferenceClock* pClock) { HRESULT WINAPI IDirectMusic8Impl_SetExternalMasterClock (LPDIRECTMUSIC8 iface, IReferenceClock* pClock) {
ICOM_THIS(IDirectMusic8Impl,iface); IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface;
FIXME("(%p, %p): stub\n", This, pClock); FIXME("(%p, %p): stub\n", This, pClock);
return S_OK; return S_OK;
} }
......
...@@ -33,30 +33,30 @@ typedef struct { ...@@ -33,30 +33,30 @@ typedef struct {
* DirectMusic ClassFactory * DirectMusic ClassFactory
*/ */
static HRESULT WINAPI DirectMusicCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { static HRESULT WINAPI DirectMusicCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p, %s, %p): stub\n",This,debugstr_dmguid(riid),ppobj); FIXME("(%p, %s, %p): stub\n",This,debugstr_dmguid(riid),ppobj);
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI DirectMusicCF_AddRef(LPCLASSFACTORY iface) { static ULONG WINAPI DirectMusicCF_AddRef(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
return ++(This->ref); return ++(This->ref);
} }
static ULONG WINAPI DirectMusicCF_Release(LPCLASSFACTORY iface) { static ULONG WINAPI DirectMusicCF_Release(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
/* static class, won't be freed */ /* static class, won't be freed */
return --(This->ref); return --(This->ref);
} }
static HRESULT WINAPI DirectMusicCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI DirectMusicCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj); TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj);
return DMUSIC_CreateDirectMusicImpl (riid, (LPVOID*) ppobj, pOuter); return DMUSIC_CreateDirectMusicImpl (riid, (LPVOID*) ppobj, pOuter);
} }
static HRESULT WINAPI DirectMusicCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { static HRESULT WINAPI DirectMusicCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p, %d): stub\n", This, dolock); FIXME("(%p, %d): stub\n", This, dolock);
return S_OK; return S_OK;
} }
...@@ -75,30 +75,30 @@ static IClassFactoryImpl DirectMusic_CF = {&DirectMusicCF_Vtbl, 1 }; ...@@ -75,30 +75,30 @@ static IClassFactoryImpl DirectMusic_CF = {&DirectMusicCF_Vtbl, 1 };
* DirectMusicCollection ClassFactory * DirectMusicCollection ClassFactory
*/ */
static HRESULT WINAPI CollectionCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { static HRESULT WINAPI CollectionCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p, %s, %p): stub\n",This,debugstr_dmguid(riid),ppobj); FIXME("(%p, %s, %p): stub\n",This,debugstr_dmguid(riid),ppobj);
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI CollectionCF_AddRef(LPCLASSFACTORY iface) { static ULONG WINAPI CollectionCF_AddRef(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
return ++(This->ref); return ++(This->ref);
} }
static ULONG WINAPI CollectionCF_Release(LPCLASSFACTORY iface) { static ULONG WINAPI CollectionCF_Release(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
/* static class, won't be freed */ /* static class, won't be freed */
return --(This->ref); return --(This->ref);
} }
static HRESULT WINAPI CollectionCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI CollectionCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj); TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj);
return DMUSIC_CreateDirectMusicCollectionImpl (riid, ppobj, pOuter); return DMUSIC_CreateDirectMusicCollectionImpl (riid, ppobj, pOuter);
} }
static HRESULT WINAPI CollectionCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { static HRESULT WINAPI CollectionCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p, %d): stub\n", This, dolock); FIXME("(%p, %d): stub\n", This, dolock);
return S_OK; return S_OK;
} }
......
...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); ...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
/* IDirectMusicDownloadImpl IUnknown part: */ /* IDirectMusicDownloadImpl IUnknown part: */
HRESULT WINAPI IDirectMusicDownloadImpl_QueryInterface (LPDIRECTMUSICDOWNLOAD iface, REFIID riid, LPVOID *ppobj) { HRESULT WINAPI IDirectMusicDownloadImpl_QueryInterface (LPDIRECTMUSICDOWNLOAD iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IDirectMusicDownloadImpl,iface); IDirectMusicDownloadImpl *This = (IDirectMusicDownloadImpl *)iface;
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
if (IsEqualIID (riid, &IID_IUnknown) if (IsEqualIID (riid, &IID_IUnknown)
...@@ -37,13 +37,13 @@ HRESULT WINAPI IDirectMusicDownloadImpl_QueryInterface (LPDIRECTMUSICDOWNLOAD if ...@@ -37,13 +37,13 @@ HRESULT WINAPI IDirectMusicDownloadImpl_QueryInterface (LPDIRECTMUSICDOWNLOAD if
} }
ULONG WINAPI IDirectMusicDownloadImpl_AddRef (LPDIRECTMUSICDOWNLOAD iface) { ULONG WINAPI IDirectMusicDownloadImpl_AddRef (LPDIRECTMUSICDOWNLOAD iface) {
ICOM_THIS(IDirectMusicDownloadImpl,iface); IDirectMusicDownloadImpl *This = (IDirectMusicDownloadImpl *)iface;
TRACE("(%p): AddRef from %ld\n", This, This->ref); TRACE("(%p): AddRef from %ld\n", This, This->ref);
return ++(This->ref); return ++(This->ref);
} }
ULONG WINAPI IDirectMusicDownloadImpl_Release (LPDIRECTMUSICDOWNLOAD iface) { ULONG WINAPI IDirectMusicDownloadImpl_Release (LPDIRECTMUSICDOWNLOAD iface) {
ICOM_THIS(IDirectMusicDownloadImpl,iface); IDirectMusicDownloadImpl *This = (IDirectMusicDownloadImpl *)iface;
ULONG ref = --This->ref; ULONG ref = --This->ref;
TRACE("(%p): ReleaseRef to %ld\n", This, This->ref); TRACE("(%p): ReleaseRef to %ld\n", This, This->ref);
if (ref == 0) { if (ref == 0) {
...@@ -54,7 +54,7 @@ ULONG WINAPI IDirectMusicDownloadImpl_Release (LPDIRECTMUSICDOWNLOAD iface) { ...@@ -54,7 +54,7 @@ ULONG WINAPI IDirectMusicDownloadImpl_Release (LPDIRECTMUSICDOWNLOAD iface) {
/* IDirectMusicDownloadImpl IDirectMusicDownload part: */ /* IDirectMusicDownloadImpl IDirectMusicDownload part: */
HRESULT WINAPI IDirectMusicDownloadImpl_GetBuffer (LPDIRECTMUSICDOWNLOAD iface, void** ppvBuffer, DWORD* pdwSize) { HRESULT WINAPI IDirectMusicDownloadImpl_GetBuffer (LPDIRECTMUSICDOWNLOAD iface, void** ppvBuffer, DWORD* pdwSize) {
ICOM_THIS(IDirectMusicDownloadImpl,iface); IDirectMusicDownloadImpl *This = (IDirectMusicDownloadImpl *)iface;
FIXME("(%p, %p, %p): stub\n", This, ppvBuffer, pdwSize); FIXME("(%p, %p, %p): stub\n", This, ppvBuffer, pdwSize);
return S_OK; return S_OK;
} }
......
...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); ...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
/* IDirectMusicDownloadedInstrumentImpl IUnknown part: */ /* IDirectMusicDownloadedInstrumentImpl IUnknown part: */
HRESULT WINAPI IDirectMusicDownloadedInstrumentImpl_QueryInterface (LPDIRECTMUSICDOWNLOADEDINSTRUMENT iface, REFIID riid, LPVOID *ppobj) { HRESULT WINAPI IDirectMusicDownloadedInstrumentImpl_QueryInterface (LPDIRECTMUSICDOWNLOADEDINSTRUMENT iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IDirectMusicDownloadedInstrumentImpl,iface); IDirectMusicDownloadedInstrumentImpl *This = (IDirectMusicDownloadedInstrumentImpl *)iface;
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
if (IsEqualIID (riid, &IID_IUnknown) if (IsEqualIID (riid, &IID_IUnknown)
...@@ -37,13 +37,13 @@ HRESULT WINAPI IDirectMusicDownloadedInstrumentImpl_QueryInterface (LPDIRECTMUSI ...@@ -37,13 +37,13 @@ HRESULT WINAPI IDirectMusicDownloadedInstrumentImpl_QueryInterface (LPDIRECTMUSI
} }
ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_AddRef (LPDIRECTMUSICDOWNLOADEDINSTRUMENT iface) { ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_AddRef (LPDIRECTMUSICDOWNLOADEDINSTRUMENT iface) {
ICOM_THIS(IDirectMusicDownloadedInstrumentImpl,iface); IDirectMusicDownloadedInstrumentImpl *This = (IDirectMusicDownloadedInstrumentImpl *)iface;
TRACE("(%p): AddRef from %ld\n", This, This->ref); TRACE("(%p): AddRef from %ld\n", This, This->ref);
return ++(This->ref); return ++(This->ref);
} }
ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_Release (LPDIRECTMUSICDOWNLOADEDINSTRUMENT iface) { ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_Release (LPDIRECTMUSICDOWNLOADEDINSTRUMENT iface) {
ICOM_THIS(IDirectMusicDownloadedInstrumentImpl,iface); IDirectMusicDownloadedInstrumentImpl *This = (IDirectMusicDownloadedInstrumentImpl *)iface;
ULONG ref = --This->ref; ULONG ref = --This->ref;
TRACE("(%p): ReleaseRef to %ld\n", This, This->ref); TRACE("(%p): ReleaseRef to %ld\n", This, This->ref);
if (ref == 0) { if (ref == 0) {
......
...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); ...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
/* IDirectMusicPortImpl IUnknown part: */ /* IDirectMusicPortImpl IUnknown part: */
HRESULT WINAPI IDirectMusicPortImpl_QueryInterface (LPDIRECTMUSICPORT iface, REFIID riid, LPVOID *ppobj) { HRESULT WINAPI IDirectMusicPortImpl_QueryInterface (LPDIRECTMUSICPORT iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IDirectMusicPortImpl,iface); IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface;
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
if (IsEqualIID (riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusicPort)) { if (IsEqualIID (riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusicPort)) {
...@@ -36,13 +36,13 @@ HRESULT WINAPI IDirectMusicPortImpl_QueryInterface (LPDIRECTMUSICPORT iface, REF ...@@ -36,13 +36,13 @@ HRESULT WINAPI IDirectMusicPortImpl_QueryInterface (LPDIRECTMUSICPORT iface, REF
} }
ULONG WINAPI IDirectMusicPortImpl_AddRef (LPDIRECTMUSICPORT iface) { ULONG WINAPI IDirectMusicPortImpl_AddRef (LPDIRECTMUSICPORT iface) {
ICOM_THIS(IDirectMusicPortImpl,iface); IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface;
TRACE("(%p): AddRef from %ld\n", This, This->ref); TRACE("(%p): AddRef from %ld\n", This, This->ref);
return ++(This->ref); return ++(This->ref);
} }
ULONG WINAPI IDirectMusicPortImpl_Release (LPDIRECTMUSICPORT iface) { ULONG WINAPI IDirectMusicPortImpl_Release (LPDIRECTMUSICPORT iface) {
ICOM_THIS(IDirectMusicPortImpl,iface); IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface;
ULONG ref = --This->ref; ULONG ref = --This->ref;
TRACE("(%p): ReleaseRef to %ld\n", This, This->ref); TRACE("(%p): ReleaseRef to %ld\n", This, This->ref);
if (ref == 0) { if (ref == 0) {
...@@ -53,37 +53,37 @@ ULONG WINAPI IDirectMusicPortImpl_Release (LPDIRECTMUSICPORT iface) { ...@@ -53,37 +53,37 @@ ULONG WINAPI IDirectMusicPortImpl_Release (LPDIRECTMUSICPORT iface) {
/* IDirectMusicPortImpl IDirectMusicPort part: */ /* IDirectMusicPortImpl IDirectMusicPort part: */
HRESULT WINAPI IDirectMusicPortImpl_PlayBuffer (LPDIRECTMUSICPORT iface, LPDIRECTMUSICBUFFER pBuffer) { HRESULT WINAPI IDirectMusicPortImpl_PlayBuffer (LPDIRECTMUSICPORT iface, LPDIRECTMUSICBUFFER pBuffer) {
ICOM_THIS(IDirectMusicPortImpl,iface); IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface;
FIXME("(%p, %p): stub\n", This, pBuffer); FIXME("(%p, %p): stub\n", This, pBuffer);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicPortImpl_SetReadNotificationHandle (LPDIRECTMUSICPORT iface, HANDLE hEvent) { HRESULT WINAPI IDirectMusicPortImpl_SetReadNotificationHandle (LPDIRECTMUSICPORT iface, HANDLE hEvent) {
ICOM_THIS(IDirectMusicPortImpl,iface); IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface;
FIXME("(%p, %p): stub\n", This, hEvent); FIXME("(%p, %p): stub\n", This, hEvent);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicPortImpl_Read (LPDIRECTMUSICPORT iface, LPDIRECTMUSICBUFFER pBuffer) { HRESULT WINAPI IDirectMusicPortImpl_Read (LPDIRECTMUSICPORT iface, LPDIRECTMUSICBUFFER pBuffer) {
ICOM_THIS(IDirectMusicPortImpl,iface); IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface;
FIXME("(%p, %p): stub\n", This, pBuffer); FIXME("(%p, %p): stub\n", This, pBuffer);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicPortImpl_DownloadInstrument (LPDIRECTMUSICPORT iface, IDirectMusicInstrument* pInstrument, IDirectMusicDownloadedInstrument** ppDownloadedInstrument, DMUS_NOTERANGE* pNoteRanges, DWORD dwNumNoteRanges) { HRESULT WINAPI IDirectMusicPortImpl_DownloadInstrument (LPDIRECTMUSICPORT iface, IDirectMusicInstrument* pInstrument, IDirectMusicDownloadedInstrument** ppDownloadedInstrument, DMUS_NOTERANGE* pNoteRanges, DWORD dwNumNoteRanges) {
ICOM_THIS(IDirectMusicPortImpl,iface); IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface;
FIXME("(%p, %p, %p, %p, %ld): stub\n", This, pInstrument, ppDownloadedInstrument, pNoteRanges, dwNumNoteRanges); FIXME("(%p, %p, %p, %p, %ld): stub\n", This, pInstrument, ppDownloadedInstrument, pNoteRanges, dwNumNoteRanges);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicPortImpl_UnloadInstrument (LPDIRECTMUSICPORT iface, IDirectMusicDownloadedInstrument *pDownloadedInstrument) { HRESULT WINAPI IDirectMusicPortImpl_UnloadInstrument (LPDIRECTMUSICPORT iface, IDirectMusicDownloadedInstrument *pDownloadedInstrument) {
ICOM_THIS(IDirectMusicPortImpl,iface); IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface;
FIXME("(%p, %p): stub\n", This, pDownloadedInstrument); FIXME("(%p, %p): stub\n", This, pDownloadedInstrument);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicPortImpl_GetLatencyClock (LPDIRECTMUSICPORT iface, IReferenceClock** ppClock) { HRESULT WINAPI IDirectMusicPortImpl_GetLatencyClock (LPDIRECTMUSICPORT iface, IReferenceClock** ppClock) {
ICOM_THIS(IDirectMusicPortImpl,iface); IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface;
TRACE("(%p, %p)\n", This, ppClock); TRACE("(%p, %p)\n", This, ppClock);
*ppClock = This->pLatencyClock; *ppClock = This->pLatencyClock;
IReferenceClock_AddRef (*ppClock); IReferenceClock_AddRef (*ppClock);
...@@ -91,53 +91,53 @@ HRESULT WINAPI IDirectMusicPortImpl_GetLatencyClock (LPDIRECTMUSICPORT iface, IR ...@@ -91,53 +91,53 @@ HRESULT WINAPI IDirectMusicPortImpl_GetLatencyClock (LPDIRECTMUSICPORT iface, IR
} }
HRESULT WINAPI IDirectMusicPortImpl_GetRunningStats (LPDIRECTMUSICPORT iface, LPDMUS_SYNTHSTATS pStats) { HRESULT WINAPI IDirectMusicPortImpl_GetRunningStats (LPDIRECTMUSICPORT iface, LPDMUS_SYNTHSTATS pStats) {
ICOM_THIS(IDirectMusicPortImpl,iface); IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface;
FIXME("(%p, %p): stub\n", This, pStats); FIXME("(%p, %p): stub\n", This, pStats);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicPortImpl_Compact (LPDIRECTMUSICPORT iface) { HRESULT WINAPI IDirectMusicPortImpl_Compact (LPDIRECTMUSICPORT iface) {
ICOM_THIS(IDirectMusicPortImpl,iface); IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface;
FIXME("(%p): stub\n", This); FIXME("(%p): stub\n", This);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicPortImpl_GetCaps (LPDIRECTMUSICPORT iface, LPDMUS_PORTCAPS pPortCaps) { HRESULT WINAPI IDirectMusicPortImpl_GetCaps (LPDIRECTMUSICPORT iface, LPDMUS_PORTCAPS pPortCaps) {
ICOM_THIS(IDirectMusicPortImpl,iface); IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface;
TRACE("(%p, %p)\n", This, pPortCaps); TRACE("(%p, %p)\n", This, pPortCaps);
pPortCaps = This->pCaps; pPortCaps = This->pCaps;
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicPortImpl_DeviceIoControl (LPDIRECTMUSICPORT iface, DWORD dwIoControlCode, LPVOID lpInBuffer, DWORD nInBufferSize, LPVOID lpOutBuffer, DWORD nOutBufferSize, LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped) { HRESULT WINAPI IDirectMusicPortImpl_DeviceIoControl (LPDIRECTMUSICPORT iface, DWORD dwIoControlCode, LPVOID lpInBuffer, DWORD nInBufferSize, LPVOID lpOutBuffer, DWORD nOutBufferSize, LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped) {
ICOM_THIS(IDirectMusicPortImpl,iface); IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface;
FIXME("(%p, %ld, %p, %ld, %p, %ld, %p, %p): stub\n", This, dwIoControlCode, lpInBuffer, nInBufferSize, lpOutBuffer, nOutBufferSize, lpBytesReturned, lpOverlapped); FIXME("(%p, %ld, %p, %ld, %p, %ld, %p, %p): stub\n", This, dwIoControlCode, lpInBuffer, nInBufferSize, lpOutBuffer, nOutBufferSize, lpBytesReturned, lpOverlapped);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicPortImpl_SetNumChannelGroups (LPDIRECTMUSICPORT iface, DWORD dwChannelGroups) { HRESULT WINAPI IDirectMusicPortImpl_SetNumChannelGroups (LPDIRECTMUSICPORT iface, DWORD dwChannelGroups) {
ICOM_THIS(IDirectMusicPortImpl,iface); IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface;
FIXME("(%p, %ld): semi-stub\n", This, dwChannelGroups); FIXME("(%p, %ld): semi-stub\n", This, dwChannelGroups);
This->nrofgroups = dwChannelGroups; This->nrofgroups = dwChannelGroups;
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicPortImpl_GetNumChannelGroups (LPDIRECTMUSICPORT iface, LPDWORD pdwChannelGroups) { HRESULT WINAPI IDirectMusicPortImpl_GetNumChannelGroups (LPDIRECTMUSICPORT iface, LPDWORD pdwChannelGroups) {
ICOM_THIS(IDirectMusicPortImpl,iface); IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface;
TRACE("(%p, %p)\n", This, pdwChannelGroups); TRACE("(%p, %p)\n", This, pdwChannelGroups);
*pdwChannelGroups = This->nrofgroups; *pdwChannelGroups = This->nrofgroups;
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicPortImpl_Activate (LPDIRECTMUSICPORT iface, BOOL fActive) { HRESULT WINAPI IDirectMusicPortImpl_Activate (LPDIRECTMUSICPORT iface, BOOL fActive) {
ICOM_THIS(IDirectMusicPortImpl,iface); IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface;
TRACE("(%p, %d)\n", This, fActive); TRACE("(%p, %d)\n", This, fActive);
This->fActive = fActive; This->fActive = fActive;
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicPortImpl_SetChannelPriority (LPDIRECTMUSICPORT iface, DWORD dwChannelGroup, DWORD dwChannel, DWORD dwPriority) { HRESULT WINAPI IDirectMusicPortImpl_SetChannelPriority (LPDIRECTMUSICPORT iface, DWORD dwChannelGroup, DWORD dwChannel, DWORD dwPriority) {
ICOM_THIS(IDirectMusicPortImpl,iface); IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface;
FIXME("(%p, %ld, %ld, %ld): semi-stub\n", This, dwChannelGroup, dwChannel, dwPriority); FIXME("(%p, %ld, %ld, %ld): semi-stub\n", This, dwChannelGroup, dwChannel, dwPriority);
if (dwChannel > 16) { if (dwChannel > 16) {
WARN("isn't there supposed to be 16 channels (no. %ld requested)?! (faking as it is ok)\n", dwChannel); WARN("isn't there supposed to be 16 channels (no. %ld requested)?! (faking as it is ok)\n", dwChannel);
...@@ -147,20 +147,20 @@ HRESULT WINAPI IDirectMusicPortImpl_SetChannelPriority (LPDIRECTMUSICPORT iface, ...@@ -147,20 +147,20 @@ HRESULT WINAPI IDirectMusicPortImpl_SetChannelPriority (LPDIRECTMUSICPORT iface,
} }
HRESULT WINAPI IDirectMusicPortImpl_GetChannelPriority (LPDIRECTMUSICPORT iface, DWORD dwChannelGroup, DWORD dwChannel, LPDWORD pdwPriority) { HRESULT WINAPI IDirectMusicPortImpl_GetChannelPriority (LPDIRECTMUSICPORT iface, DWORD dwChannelGroup, DWORD dwChannel, LPDWORD pdwPriority) {
ICOM_THIS(IDirectMusicPortImpl,iface); IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface;
TRACE("(%p, %ld, %ld, %p)\n", This, dwChannelGroup, dwChannel, pdwPriority); TRACE("(%p, %ld, %ld, %p)\n", This, dwChannelGroup, dwChannel, pdwPriority);
*pdwPriority = This->group[dwChannelGroup-1].channel[dwChannel].priority; *pdwPriority = This->group[dwChannelGroup-1].channel[dwChannel].priority;
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicPortImpl_SetDirectSound (LPDIRECTMUSICPORT iface, LPDIRECTSOUND pDirectSound, LPDIRECTSOUNDBUFFER pDirectSoundBuffer) { HRESULT WINAPI IDirectMusicPortImpl_SetDirectSound (LPDIRECTMUSICPORT iface, LPDIRECTSOUND pDirectSound, LPDIRECTSOUNDBUFFER pDirectSoundBuffer) {
ICOM_THIS(IDirectMusicPortImpl,iface); IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface;
FIXME("(%p, %p, %p): stub\n", This, pDirectSound, pDirectSoundBuffer); FIXME("(%p, %p, %p): stub\n", This, pDirectSound, pDirectSoundBuffer);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicPortImpl_GetFormat (LPDIRECTMUSICPORT iface, LPWAVEFORMATEX pWaveFormatEx, LPDWORD pdwWaveFormatExSize, LPDWORD pdwBufferSize) { HRESULT WINAPI IDirectMusicPortImpl_GetFormat (LPDIRECTMUSICPORT iface, LPWAVEFORMATEX pWaveFormatEx, LPDWORD pdwWaveFormatExSize, LPDWORD pdwBufferSize) {
ICOM_THIS(IDirectMusicPortImpl,iface); IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface;
FIXME("(%p, %p, %p, %p): stub\n", This, pWaveFormatEx, pdwWaveFormatExSize, pdwBufferSize); FIXME("(%p, %p, %p, %p): stub\n", This, pWaveFormatEx, pdwWaveFormatExSize, pdwBufferSize);
return S_OK; return S_OK;
} }
......
...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); ...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
/* IDirectMusicPortDownload IUnknown parts follow: */ /* IDirectMusicPortDownload IUnknown parts follow: */
HRESULT WINAPI IDirectMusicPortDownloadImpl_QueryInterface (LPDIRECTMUSICPORTDOWNLOAD iface, REFIID riid, LPVOID *ppobj) { HRESULT WINAPI IDirectMusicPortDownloadImpl_QueryInterface (LPDIRECTMUSICPORTDOWNLOAD iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IDirectMusicPortDownloadImpl,iface); IDirectMusicPortDownloadImpl *This = (IDirectMusicPortDownloadImpl *)iface;
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
if (IsEqualIID (riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusicPortDownload)) { if (IsEqualIID (riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusicPortDownload)) {
...@@ -36,13 +36,13 @@ HRESULT WINAPI IDirectMusicPortDownloadImpl_QueryInterface (LPDIRECTMUSICPORTDOW ...@@ -36,13 +36,13 @@ HRESULT WINAPI IDirectMusicPortDownloadImpl_QueryInterface (LPDIRECTMUSICPORTDOW
} }
ULONG WINAPI IDirectMusicPortDownloadImpl_AddRef (LPDIRECTMUSICPORTDOWNLOAD iface) { ULONG WINAPI IDirectMusicPortDownloadImpl_AddRef (LPDIRECTMUSICPORTDOWNLOAD iface) {
ICOM_THIS(IDirectMusicPortDownloadImpl,iface); IDirectMusicPortDownloadImpl *This = (IDirectMusicPortDownloadImpl *)iface;
TRACE("(%p): AddRef from %ld\n", This, This->ref); TRACE("(%p): AddRef from %ld\n", This, This->ref);
return ++(This->ref); return ++(This->ref);
} }
ULONG WINAPI IDirectMusicPortDownloadImpl_Release (LPDIRECTMUSICPORTDOWNLOAD iface) { ULONG WINAPI IDirectMusicPortDownloadImpl_Release (LPDIRECTMUSICPORTDOWNLOAD iface) {
ICOM_THIS(IDirectMusicPortDownloadImpl,iface); IDirectMusicPortDownloadImpl *This = (IDirectMusicPortDownloadImpl *)iface;
ULONG ref = --This->ref; ULONG ref = --This->ref;
TRACE("(%p): ReleaseRef to %ld\n", This, This->ref); TRACE("(%p): ReleaseRef to %ld\n", This, This->ref);
if (ref == 0) { if (ref == 0) {
...@@ -53,37 +53,37 @@ ULONG WINAPI IDirectMusicPortDownloadImpl_Release (LPDIRECTMUSICPORTDOWNLOAD ifa ...@@ -53,37 +53,37 @@ ULONG WINAPI IDirectMusicPortDownloadImpl_Release (LPDIRECTMUSICPORTDOWNLOAD ifa
/* IDirectMusicPortDownload Interface follow: */ /* IDirectMusicPortDownload Interface follow: */
HRESULT WINAPI IDirectMusicPortDownloadImpl_GetBuffer (LPDIRECTMUSICPORTDOWNLOAD iface, DWORD dwDLId, IDirectMusicDownload** ppIDMDownload) { HRESULT WINAPI IDirectMusicPortDownloadImpl_GetBuffer (LPDIRECTMUSICPORTDOWNLOAD iface, DWORD dwDLId, IDirectMusicDownload** ppIDMDownload) {
ICOM_THIS(IDirectMusicPortDownloadImpl,iface); IDirectMusicPortDownloadImpl *This = (IDirectMusicPortDownloadImpl *)iface;
FIXME("(%p, %ld, %p): stub\n", This, dwDLId, ppIDMDownload); FIXME("(%p, %ld, %p): stub\n", This, dwDLId, ppIDMDownload);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicPortDownloadImpl_AllocateBuffer (LPDIRECTMUSICPORTDOWNLOAD iface, DWORD dwSize, IDirectMusicDownload** ppIDMDownload) { HRESULT WINAPI IDirectMusicPortDownloadImpl_AllocateBuffer (LPDIRECTMUSICPORTDOWNLOAD iface, DWORD dwSize, IDirectMusicDownload** ppIDMDownload) {
ICOM_THIS(IDirectMusicPortDownloadImpl,iface); IDirectMusicPortDownloadImpl *This = (IDirectMusicPortDownloadImpl *)iface;
FIXME("(%p, %ld, %p): stub\n", This, dwSize, ppIDMDownload); FIXME("(%p, %ld, %p): stub\n", This, dwSize, ppIDMDownload);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicPortDownloadImpl_GetDLId (LPDIRECTMUSICPORTDOWNLOAD iface, DWORD* pdwStartDLId, DWORD dwCount) { HRESULT WINAPI IDirectMusicPortDownloadImpl_GetDLId (LPDIRECTMUSICPORTDOWNLOAD iface, DWORD* pdwStartDLId, DWORD dwCount) {
ICOM_THIS(IDirectMusicPortDownloadImpl,iface); IDirectMusicPortDownloadImpl *This = (IDirectMusicPortDownloadImpl *)iface;
FIXME("(%p, %p, %ld): stub\n", This, pdwStartDLId, dwCount); FIXME("(%p, %p, %ld): stub\n", This, pdwStartDLId, dwCount);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicPortDownloadImpl_GetAppend (LPDIRECTMUSICPORTDOWNLOAD iface, DWORD* pdwAppend) { HRESULT WINAPI IDirectMusicPortDownloadImpl_GetAppend (LPDIRECTMUSICPORTDOWNLOAD iface, DWORD* pdwAppend) {
ICOM_THIS(IDirectMusicPortDownloadImpl,iface); IDirectMusicPortDownloadImpl *This = (IDirectMusicPortDownloadImpl *)iface;
FIXME("(%p, %p): stub\n", This, pdwAppend); FIXME("(%p, %p): stub\n", This, pdwAppend);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicPortDownloadImpl_Download (LPDIRECTMUSICPORTDOWNLOAD iface, IDirectMusicDownload* pIDMDownload) { HRESULT WINAPI IDirectMusicPortDownloadImpl_Download (LPDIRECTMUSICPORTDOWNLOAD iface, IDirectMusicDownload* pIDMDownload) {
ICOM_THIS(IDirectMusicPortDownloadImpl,iface); IDirectMusicPortDownloadImpl *This = (IDirectMusicPortDownloadImpl *)iface;
FIXME("(%p, %p): stub\n", This, pIDMDownload); FIXME("(%p, %p): stub\n", This, pIDMDownload);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicPortDownloadImpl_Unload (LPDIRECTMUSICPORTDOWNLOAD iface, IDirectMusicDownload* pIDMDownload) { HRESULT WINAPI IDirectMusicPortDownloadImpl_Unload (LPDIRECTMUSICPORTDOWNLOAD iface, IDirectMusicDownload* pIDMDownload) {
ICOM_THIS(IDirectMusicPortDownloadImpl,iface); IDirectMusicPortDownloadImpl *This = (IDirectMusicPortDownloadImpl *)iface;
FIXME("(%p, %p): stub\n", This, pIDMDownload); FIXME("(%p, %p): stub\n", This, pIDMDownload);
return S_OK; return S_OK;
} }
......
...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); ...@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
/* IDirectMusicThru IUnknown parts follow: */ /* IDirectMusicThru IUnknown parts follow: */
HRESULT WINAPI IDirectMusicThruImpl_QueryInterface (LPDIRECTMUSICTHRU iface, REFIID riid, LPVOID *ppobj) { HRESULT WINAPI IDirectMusicThruImpl_QueryInterface (LPDIRECTMUSICTHRU iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IDirectMusicThruImpl,iface); IDirectMusicThruImpl *This = (IDirectMusicThruImpl *)iface;
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
if (IsEqualIID (riid, &IID_IUnknown) || if (IsEqualIID (riid, &IID_IUnknown) ||
...@@ -37,13 +37,13 @@ HRESULT WINAPI IDirectMusicThruImpl_QueryInterface (LPDIRECTMUSICTHRU iface, REF ...@@ -37,13 +37,13 @@ HRESULT WINAPI IDirectMusicThruImpl_QueryInterface (LPDIRECTMUSICTHRU iface, REF
} }
ULONG WINAPI IDirectMusicThruImpl_AddRef (LPDIRECTMUSICTHRU iface) { ULONG WINAPI IDirectMusicThruImpl_AddRef (LPDIRECTMUSICTHRU iface) {
ICOM_THIS(IDirectMusicThruImpl,iface); IDirectMusicThruImpl *This = (IDirectMusicThruImpl *)iface;
TRACE("(%p): AddRef from %ld\n", This, This->ref); TRACE("(%p): AddRef from %ld\n", This, This->ref);
return ++(This->ref); return ++(This->ref);
} }
ULONG WINAPI IDirectMusicThruImpl_Release (LPDIRECTMUSICTHRU iface) { ULONG WINAPI IDirectMusicThruImpl_Release (LPDIRECTMUSICTHRU iface) {
ICOM_THIS(IDirectMusicThruImpl,iface); IDirectMusicThruImpl *This = (IDirectMusicThruImpl *)iface;
ULONG ref = --This->ref; ULONG ref = --This->ref;
TRACE("(%p): ReleaseRef to %ld\n", This, This->ref); TRACE("(%p): ReleaseRef to %ld\n", This, This->ref);
if (ref == 0) { if (ref == 0) {
...@@ -54,7 +54,7 @@ ULONG WINAPI IDirectMusicThruImpl_Release (LPDIRECTMUSICTHRU iface) { ...@@ -54,7 +54,7 @@ ULONG WINAPI IDirectMusicThruImpl_Release (LPDIRECTMUSICTHRU iface) {
/* IDirectMusicThru Interface follow: */ /* IDirectMusicThru Interface follow: */
HRESULT WINAPI IDirectMusicThruImpl_ThruChannel (LPDIRECTMUSICTHRU iface, DWORD dwSourceChannelGroup, DWORD dwSourceChannel, DWORD dwDestinationChannelGroup, DWORD dwDestinationChannel, LPDIRECTMUSICPORT pDestinationPort) { HRESULT WINAPI IDirectMusicThruImpl_ThruChannel (LPDIRECTMUSICTHRU iface, DWORD dwSourceChannelGroup, DWORD dwSourceChannel, DWORD dwDestinationChannelGroup, DWORD dwDestinationChannel, LPDIRECTMUSICPORT pDestinationPort) {
ICOM_THIS(IDirectMusicThruImpl,iface); IDirectMusicThruImpl *This = (IDirectMusicThruImpl *)iface;
FIXME("(%p, %ld, %ld, %ld, %ld, %p): stub\n", This, dwSourceChannelGroup, dwSourceChannel, dwDestinationChannelGroup, dwDestinationChannel, pDestinationPort); FIXME("(%p, %ld, %ld, %ld, %ld, %p): stub\n", This, dwSourceChannelGroup, dwSourceChannel, dwDestinationChannelGroup, dwDestinationChannel, pDestinationPort);
return S_OK; return S_OK;
} }
......
...@@ -42,7 +42,7 @@ typedef struct ...@@ -42,7 +42,7 @@ typedef struct
static HRESULT WINAPI static HRESULT WINAPI
DP_and_DPL_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { DP_and_DPL_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj); FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj);
...@@ -51,12 +51,12 @@ DP_and_DPL_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { ...@@ -51,12 +51,12 @@ DP_and_DPL_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
static ULONG WINAPI static ULONG WINAPI
DP_and_DPL_AddRef(LPCLASSFACTORY iface) { DP_and_DPL_AddRef(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
return ++(This->ref); return ++(This->ref);
} }
static ULONG WINAPI DP_and_DPL_Release(LPCLASSFACTORY iface) { static ULONG WINAPI DP_and_DPL_Release(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
/* static class (reference starts @ 1), won't ever be freed */ /* static class (reference starts @ 1), won't ever be freed */
return --(This->ref); return --(This->ref);
} }
...@@ -64,7 +64,7 @@ static ULONG WINAPI DP_and_DPL_Release(LPCLASSFACTORY iface) { ...@@ -64,7 +64,7 @@ static ULONG WINAPI DP_and_DPL_Release(LPCLASSFACTORY iface) {
static HRESULT WINAPI DP_and_DPL_CreateInstance( static HRESULT WINAPI DP_and_DPL_CreateInstance(
LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj
) { ) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj);
...@@ -81,7 +81,7 @@ static HRESULT WINAPI DP_and_DPL_CreateInstance( ...@@ -81,7 +81,7 @@ static HRESULT WINAPI DP_and_DPL_CreateInstance(
} }
static HRESULT WINAPI DP_and_DPL_LockServer(LPCLASSFACTORY iface,BOOL dolock) { static HRESULT WINAPI DP_and_DPL_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p)->(%d),stub!\n",This,dolock); FIXME("(%p)->(%d),stub!\n",This,dolock);
return S_OK; return S_OK;
} }
......
...@@ -101,7 +101,7 @@ HRESULT DPSP_CreateInterface( REFIID riid, LPVOID* ppvObj, IDirectPlay2Impl* dp ...@@ -101,7 +101,7 @@ HRESULT DPSP_CreateInterface( REFIID riid, LPVOID* ppvObj, IDirectPlay2Impl* dp
if( IsEqualGUID( &IID_IDirectPlaySP, riid ) ) if( IsEqualGUID( &IID_IDirectPlaySP, riid ) )
{ {
ICOM_THIS(IDirectPlaySPImpl,*ppvObj); IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)*ppvObj;
This->lpVtbl = &directPlaySPVT; This->lpVtbl = &directPlaySPVT;
} }
else else
...@@ -134,7 +134,7 @@ HRESULT DPSP_CreateInterface( REFIID riid, LPVOID* ppvObj, IDirectPlay2Impl* dp ...@@ -134,7 +134,7 @@ HRESULT DPSP_CreateInterface( REFIID riid, LPVOID* ppvObj, IDirectPlay2Impl* dp
static BOOL DPSP_CreateIUnknown( LPVOID lpSP ) static BOOL DPSP_CreateIUnknown( LPVOID lpSP )
{ {
ICOM_THIS(IDirectPlaySPImpl,lpSP); IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)lpSP;
This->unk = (DirectPlaySPIUnknownData*)HeapAlloc( GetProcessHeap(), This->unk = (DirectPlaySPIUnknownData*)HeapAlloc( GetProcessHeap(),
HEAP_ZERO_MEMORY, HEAP_ZERO_MEMORY,
...@@ -152,7 +152,7 @@ static BOOL DPSP_CreateIUnknown( LPVOID lpSP ) ...@@ -152,7 +152,7 @@ static BOOL DPSP_CreateIUnknown( LPVOID lpSP )
static BOOL DPSP_DestroyIUnknown( LPVOID lpSP ) static BOOL DPSP_DestroyIUnknown( LPVOID lpSP )
{ {
ICOM_THIS(IDirectPlaySPImpl,lpSP); IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)lpSP;
DeleteCriticalSection( &This->unk->DPSP_lock ); DeleteCriticalSection( &This->unk->DPSP_lock );
HeapFree( GetProcessHeap(), 0, This->unk ); HeapFree( GetProcessHeap(), 0, This->unk );
...@@ -163,7 +163,7 @@ static BOOL DPSP_DestroyIUnknown( LPVOID lpSP ) ...@@ -163,7 +163,7 @@ static BOOL DPSP_DestroyIUnknown( LPVOID lpSP )
static BOOL DPSP_CreateDirectPlaySP( LPVOID lpSP, IDirectPlay2Impl* dp ) static BOOL DPSP_CreateDirectPlaySP( LPVOID lpSP, IDirectPlay2Impl* dp )
{ {
ICOM_THIS(IDirectPlaySPImpl,lpSP); IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)lpSP;
This->sp = (DirectPlaySPData*)HeapAlloc( GetProcessHeap(), This->sp = (DirectPlaySPData*)HeapAlloc( GetProcessHeap(),
HEAP_ZERO_MEMORY, HEAP_ZERO_MEMORY,
...@@ -196,7 +196,7 @@ static BOOL DPSP_CreateDirectPlaySP( LPVOID lpSP, IDirectPlay2Impl* dp ) ...@@ -196,7 +196,7 @@ static BOOL DPSP_CreateDirectPlaySP( LPVOID lpSP, IDirectPlay2Impl* dp )
static BOOL DPSP_DestroyDirectPlaySP( LPVOID lpSP ) static BOOL DPSP_DestroyDirectPlaySP( LPVOID lpSP )
{ {
ICOM_THIS(IDirectPlaySPImpl,lpSP); IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)lpSP;
/* Normally we should be keeping a reference, but since only the dplay /* Normally we should be keeping a reference, but since only the dplay
* interface that created us can destroy us, we do not keep a reference * interface that created us can destroy us, we do not keep a reference
...@@ -222,7 +222,7 @@ static HRESULT WINAPI DPSP_QueryInterface ...@@ -222,7 +222,7 @@ static HRESULT WINAPI DPSP_QueryInterface
REFIID riid, REFIID riid,
LPVOID* ppvObj ) LPVOID* ppvObj )
{ {
ICOM_THIS(IDirectPlaySPImpl,iface); IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
TRACE("(%p)->(%s,%p)\n", This, debugstr_guid( riid ), ppvObj ); TRACE("(%p)->(%s,%p)\n", This, debugstr_guid( riid ), ppvObj );
*ppvObj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, *ppvObj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY,
...@@ -238,7 +238,7 @@ static HRESULT WINAPI DPSP_QueryInterface ...@@ -238,7 +238,7 @@ static HRESULT WINAPI DPSP_QueryInterface
if( IsEqualGUID( &IID_IDirectPlaySP, riid ) ) if( IsEqualGUID( &IID_IDirectPlaySP, riid ) )
{ {
ICOM_THIS(IDirectPlaySPImpl,*ppvObj); IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)*ppvObj;
This->lpVtbl = &directPlaySPVT; This->lpVtbl = &directPlaySPVT;
} }
else else
...@@ -259,7 +259,7 @@ static ULONG WINAPI DPSP_AddRef ...@@ -259,7 +259,7 @@ static ULONG WINAPI DPSP_AddRef
( LPDIRECTPLAYSP iface ) ( LPDIRECTPLAYSP iface )
{ {
ULONG ulInterfaceRefCount, ulObjRefCount; ULONG ulInterfaceRefCount, ulObjRefCount;
ICOM_THIS(IDirectPlaySPImpl,iface); IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef ); ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef );
ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef ); ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef );
...@@ -274,7 +274,7 @@ static ULONG WINAPI DPSP_Release ...@@ -274,7 +274,7 @@ static ULONG WINAPI DPSP_Release
( LPDIRECTPLAYSP iface ) ( LPDIRECTPLAYSP iface )
{ {
ULONG ulInterfaceRefCount, ulObjRefCount; ULONG ulInterfaceRefCount, ulObjRefCount;
ICOM_THIS(IDirectPlaySPImpl,iface); IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef ); ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef );
ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef ); ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef );
...@@ -306,7 +306,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_AddMRUEntry ...@@ -306,7 +306,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_AddMRUEntry
DWORD dwMaxEntries DWORD dwMaxEntries
) )
{ {
ICOM_THIS(IDirectPlaySPImpl,iface); IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
/* Should be able to call the comctl32 undocumented MRU routines. /* Should be able to call the comctl32 undocumented MRU routines.
I suspect that the interface works appropriately */ I suspect that the interface works appropriately */
...@@ -326,7 +326,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_CreateAddress ...@@ -326,7 +326,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_CreateAddress
LPDWORD lpdwAddressSize LPDWORD lpdwAddressSize
) )
{ {
ICOM_THIS(IDirectPlaySPImpl,iface); IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
FIXME( "(%p)->(%s,%s,%p,0x%08lx,%p,%p): stub\n", FIXME( "(%p)->(%s,%s,%p,0x%08lx,%p,%p): stub\n",
This, debugstr_guid(guidSP), debugstr_guid(guidDataType), This, debugstr_guid(guidSP), debugstr_guid(guidDataType),
...@@ -343,7 +343,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_EnumAddress ...@@ -343,7 +343,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_EnumAddress
LPVOID lpContext LPVOID lpContext
) )
{ {
ICOM_THIS(IDirectPlaySPImpl,iface); IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
TRACE( "(%p)->(%p,%p,0x%08lx,%p)\n", TRACE( "(%p)->(%p,%p,0x%08lx,%p)\n",
This, lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext ); This, lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext );
...@@ -361,7 +361,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_EnumMRUEntries ...@@ -361,7 +361,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_EnumMRUEntries
LPVOID lpContext LPVOID lpContext
) )
{ {
ICOM_THIS(IDirectPlaySPImpl,iface); IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
/* Should be able to call the comctl32 undocumented MRU routines. /* Should be able to call the comctl32 undocumented MRU routines.
I suspect that the interface works appropriately */ I suspect that the interface works appropriately */
...@@ -377,7 +377,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetPlayerFlags ...@@ -377,7 +377,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetPlayerFlags
LPDWORD lpdwPlayerFlags LPDWORD lpdwPlayerFlags
) )
{ {
ICOM_THIS(IDirectPlaySPImpl,iface); IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
FIXME( "(%p)->(0x%08lx,%p): stub\n", FIXME( "(%p)->(0x%08lx,%p): stub\n",
This, idPlayer, lpdwPlayerFlags ); This, idPlayer, lpdwPlayerFlags );
...@@ -395,7 +395,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetSPPlayerData ...@@ -395,7 +395,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetSPPlayerData
{ {
HRESULT hr; HRESULT hr;
LPDP_SPPLAYERDATA lpPlayerData; LPDP_SPPLAYERDATA lpPlayerData;
ICOM_THIS(IDirectPlaySPImpl,iface); IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
TRACE( "(%p)->(0x%08lx,%p,%p,0x%08lx)\n", TRACE( "(%p)->(0x%08lx,%p,%p,0x%08lx)\n",
This, idPlayer, lplpData, lpdwDataSize, dwFlags ); This, idPlayer, lplpData, lpdwDataSize, dwFlags );
...@@ -451,7 +451,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage ...@@ -451,7 +451,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage
WORD wVersion; WORD wVersion;
DPSP_REPLYDATA data; DPSP_REPLYDATA data;
ICOM_THIS(IDirectPlaySPImpl,iface); IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
FIXME( "(%p)->(%p,0x%08lx,%p): mostly stub\n", FIXME( "(%p)->(%p,0x%08lx,%p): mostly stub\n",
This, lpMessageBody, dwMessageBodySize, lpMessageHeader ); This, lpMessageBody, dwMessageBodySize, lpMessageHeader );
...@@ -764,7 +764,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPPlayerData ...@@ -764,7 +764,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPPlayerData
LPDP_SPPLAYERDATA lpPlayerEntry; LPDP_SPPLAYERDATA lpPlayerEntry;
LPVOID lpPlayerData; LPVOID lpPlayerData;
ICOM_THIS(IDirectPlaySPImpl,iface); IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
/* TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */ /* TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */
TRACE( "(%p)->(0x%08lx,%p,0x%08lx,0x%08lx)\n", TRACE( "(%p)->(0x%08lx,%p,0x%08lx,0x%08lx)\n",
...@@ -804,7 +804,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_CreateCompoundAddress ...@@ -804,7 +804,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_CreateCompoundAddress
LPDWORD lpdwAddressSize LPDWORD lpdwAddressSize
) )
{ {
ICOM_THIS(IDirectPlaySPImpl,iface); IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
FIXME( "(%p)->(%p,0x%08lx,%p,%p): stub\n", FIXME( "(%p)->(%p,0x%08lx,%p,%p): stub\n",
This, lpElements, dwElementCount, lpAddress, lpdwAddressSize ); This, lpElements, dwElementCount, lpAddress, lpdwAddressSize );
...@@ -820,7 +820,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetSPData ...@@ -820,7 +820,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetSPData
) )
{ {
HRESULT hr = DP_OK; HRESULT hr = DP_OK;
ICOM_THIS(IDirectPlaySPImpl,iface); IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
/* TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */ /* TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */
TRACE( "(%p)->(%p,%p,0x%08lx)\n", TRACE( "(%p)->(%p,%p,0x%08lx)\n",
...@@ -879,7 +879,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPData ...@@ -879,7 +879,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPData
{ {
LPVOID lpSpData; LPVOID lpSpData;
ICOM_THIS(IDirectPlaySPImpl,iface); IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
/* TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */ /* TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */
TRACE( "(%p)->(%p,0x%08lx,0x%08lx)\n", TRACE( "(%p)->(%p,0x%08lx,0x%08lx)\n",
...@@ -936,7 +936,7 @@ static VOID WINAPI IDirectPlaySPImpl_SendComplete ...@@ -936,7 +936,7 @@ static VOID WINAPI IDirectPlaySPImpl_SendComplete
DWORD unknownB DWORD unknownB
) )
{ {
ICOM_THIS(IDirectPlaySPImpl,iface); IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface;
FIXME( "(%p)->(%p,0x%08lx): stub\n", FIXME( "(%p)->(%p,0x%08lx): stub\n",
This, unknownA, unknownB ); This, unknownA, unknownB );
......
...@@ -77,7 +77,7 @@ HRESULT DPLSP_CreateInterface( REFIID riid, LPVOID* ppvObj, IDirectPlay2Impl* dp ...@@ -77,7 +77,7 @@ HRESULT DPLSP_CreateInterface( REFIID riid, LPVOID* ppvObj, IDirectPlay2Impl* dp
if( IsEqualGUID( &IID_IDPLobbySP, riid ) ) if( IsEqualGUID( &IID_IDPLobbySP, riid ) )
{ {
ICOM_THIS(IDPLobbySPImpl,*ppvObj); IDPLobbySPImpl *This = (IDPLobbySPImpl *)*ppvObj;
This->lpVtbl = &dpLobbySPVT; This->lpVtbl = &dpLobbySPVT;
} }
else else
...@@ -110,7 +110,7 @@ HRESULT DPLSP_CreateInterface( REFIID riid, LPVOID* ppvObj, IDirectPlay2Impl* dp ...@@ -110,7 +110,7 @@ HRESULT DPLSP_CreateInterface( REFIID riid, LPVOID* ppvObj, IDirectPlay2Impl* dp
static BOOL DPLSP_CreateIUnknown( LPVOID lpSP ) static BOOL DPLSP_CreateIUnknown( LPVOID lpSP )
{ {
ICOM_THIS(IDPLobbySPImpl,lpSP); IDPLobbySPImpl *This = (IDPLobbySPImpl *)lpSP;
This->unk = (DPLobbySPIUnknownData*)HeapAlloc( GetProcessHeap(), This->unk = (DPLobbySPIUnknownData*)HeapAlloc( GetProcessHeap(),
HEAP_ZERO_MEMORY, HEAP_ZERO_MEMORY,
...@@ -128,7 +128,7 @@ static BOOL DPLSP_CreateIUnknown( LPVOID lpSP ) ...@@ -128,7 +128,7 @@ static BOOL DPLSP_CreateIUnknown( LPVOID lpSP )
static BOOL DPLSP_DestroyIUnknown( LPVOID lpSP ) static BOOL DPLSP_DestroyIUnknown( LPVOID lpSP )
{ {
ICOM_THIS(IDPLobbySPImpl,lpSP); IDPLobbySPImpl *This = (IDPLobbySPImpl *)lpSP;
DeleteCriticalSection( &This->unk->DPLSP_lock ); DeleteCriticalSection( &This->unk->DPLSP_lock );
HeapFree( GetProcessHeap(), 0, This->unk ); HeapFree( GetProcessHeap(), 0, This->unk );
...@@ -138,7 +138,7 @@ static BOOL DPLSP_DestroyIUnknown( LPVOID lpSP ) ...@@ -138,7 +138,7 @@ static BOOL DPLSP_DestroyIUnknown( LPVOID lpSP )
static BOOL DPLSP_CreateDPLobbySP( LPVOID lpSP, IDirectPlay2Impl* dp ) static BOOL DPLSP_CreateDPLobbySP( LPVOID lpSP, IDirectPlay2Impl* dp )
{ {
ICOM_THIS(IDPLobbySPImpl,lpSP); IDPLobbySPImpl *This = (IDPLobbySPImpl *)lpSP;
This->sp = (DPLobbySPData*)HeapAlloc( GetProcessHeap(), This->sp = (DPLobbySPData*)HeapAlloc( GetProcessHeap(),
HEAP_ZERO_MEMORY, HEAP_ZERO_MEMORY,
...@@ -172,7 +172,7 @@ static BOOL DPLSP_CreateDPLobbySP( LPVOID lpSP, IDirectPlay2Impl* dp ) ...@@ -172,7 +172,7 @@ static BOOL DPLSP_CreateDPLobbySP( LPVOID lpSP, IDirectPlay2Impl* dp )
static BOOL DPLSP_DestroyDPLobbySP( LPVOID lpSP ) static BOOL DPLSP_DestroyDPLobbySP( LPVOID lpSP )
{ {
ICOM_THIS(IDPLobbySPImpl,lpSP); IDPLobbySPImpl *This = (IDPLobbySPImpl *)lpSP;
HeapFree( GetProcessHeap(), 0, This->sp ); HeapFree( GetProcessHeap(), 0, This->sp );
...@@ -186,7 +186,7 @@ HRESULT WINAPI DPLSP_QueryInterface ...@@ -186,7 +186,7 @@ HRESULT WINAPI DPLSP_QueryInterface
LPVOID* ppvObj LPVOID* ppvObj
) )
{ {
ICOM_THIS(IDPLobbySPImpl,iface); IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface;
TRACE("(%p)->(%s,%p)\n", This, debugstr_guid( riid ), ppvObj ); TRACE("(%p)->(%s,%p)\n", This, debugstr_guid( riid ), ppvObj );
*ppvObj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, *ppvObj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY,
...@@ -202,7 +202,7 @@ HRESULT WINAPI DPLSP_QueryInterface ...@@ -202,7 +202,7 @@ HRESULT WINAPI DPLSP_QueryInterface
if( IsEqualGUID( &IID_IDPLobbySP, riid ) ) if( IsEqualGUID( &IID_IDPLobbySP, riid ) )
{ {
ICOM_THIS(IDPLobbySPImpl,*ppvObj); IDPLobbySPImpl *This = (IDPLobbySPImpl *)*ppvObj;
This->lpVtbl = &dpLobbySPVT; This->lpVtbl = &dpLobbySPVT;
} }
else else
...@@ -224,7 +224,7 @@ ULONG WINAPI DPLSP_AddRef ...@@ -224,7 +224,7 @@ ULONG WINAPI DPLSP_AddRef
( LPDPLOBBYSP iface ) ( LPDPLOBBYSP iface )
{ {
ULONG ulInterfaceRefCount, ulObjRefCount; ULONG ulInterfaceRefCount, ulObjRefCount;
ICOM_THIS(IDPLobbySPImpl,iface); IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface;
ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef ); ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef );
ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef ); ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef );
...@@ -240,7 +240,7 @@ ULONG WINAPI DPLSP_Release ...@@ -240,7 +240,7 @@ ULONG WINAPI DPLSP_Release
( LPDPLOBBYSP iface ) ( LPDPLOBBYSP iface )
{ {
ULONG ulInterfaceRefCount, ulObjRefCount; ULONG ulInterfaceRefCount, ulObjRefCount;
ICOM_THIS(IDPLobbySPImpl,iface); IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface;
ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef ); ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef );
ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef ); ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef );
...@@ -269,7 +269,7 @@ HRESULT WINAPI IDPLobbySPImpl_AddGroupToGroup ...@@ -269,7 +269,7 @@ HRESULT WINAPI IDPLobbySPImpl_AddGroupToGroup
LPSPDATA_ADDREMOTEGROUPTOGROUP argtg LPSPDATA_ADDREMOTEGROUPTOGROUP argtg
) )
{ {
ICOM_THIS(IDPLobbySPImpl,iface); IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface;
FIXME( "(%p)->(%p):stub\n", This, argtg ); FIXME( "(%p)->(%p):stub\n", This, argtg );
return DP_OK; return DP_OK;
} }
...@@ -280,7 +280,7 @@ HRESULT WINAPI IDPLobbySPImpl_AddPlayerToGroup ...@@ -280,7 +280,7 @@ HRESULT WINAPI IDPLobbySPImpl_AddPlayerToGroup
LPSPDATA_ADDREMOTEPLAYERTOGROUP arptg LPSPDATA_ADDREMOTEPLAYERTOGROUP arptg
) )
{ {
ICOM_THIS(IDPLobbySPImpl,iface); IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface;
FIXME( "(%p)->(%p):stub\n", This, arptg ); FIXME( "(%p)->(%p):stub\n", This, arptg );
return DP_OK; return DP_OK;
} }
...@@ -291,7 +291,7 @@ HRESULT WINAPI IDPLobbySPImpl_CreateGroup ...@@ -291,7 +291,7 @@ HRESULT WINAPI IDPLobbySPImpl_CreateGroup
LPSPDATA_CREATEREMOTEGROUP crg LPSPDATA_CREATEREMOTEGROUP crg
) )
{ {
ICOM_THIS(IDPLobbySPImpl,iface); IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface;
FIXME( "(%p)->(%p):stub\n", This, crg ); FIXME( "(%p)->(%p):stub\n", This, crg );
return DP_OK; return DP_OK;
} }
...@@ -302,7 +302,7 @@ HRESULT WINAPI IDPLobbySPImpl_CreateGroupInGroup ...@@ -302,7 +302,7 @@ HRESULT WINAPI IDPLobbySPImpl_CreateGroupInGroup
LPSPDATA_CREATEREMOTEGROUPINGROUP crgig LPSPDATA_CREATEREMOTEGROUPINGROUP crgig
) )
{ {
ICOM_THIS(IDPLobbySPImpl,iface); IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface;
FIXME( "(%p)->(%p):stub\n", This, crgig ); FIXME( "(%p)->(%p):stub\n", This, crgig );
return DP_OK; return DP_OK;
} }
...@@ -313,7 +313,7 @@ HRESULT WINAPI IDPLobbySPImpl_DeleteGroupFromGroup ...@@ -313,7 +313,7 @@ HRESULT WINAPI IDPLobbySPImpl_DeleteGroupFromGroup
LPSPDATA_DELETEREMOTEGROUPFROMGROUP drgfg LPSPDATA_DELETEREMOTEGROUPFROMGROUP drgfg
) )
{ {
ICOM_THIS(IDPLobbySPImpl,iface); IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface;
FIXME( "(%p)->(%p):stub\n", This, drgfg ); FIXME( "(%p)->(%p):stub\n", This, drgfg );
return DP_OK; return DP_OK;
} }
...@@ -324,7 +324,7 @@ HRESULT WINAPI IDPLobbySPImpl_DeletePlayerFromGroup ...@@ -324,7 +324,7 @@ HRESULT WINAPI IDPLobbySPImpl_DeletePlayerFromGroup
LPSPDATA_DELETEREMOTEPLAYERFROMGROUP drpfg LPSPDATA_DELETEREMOTEPLAYERFROMGROUP drpfg
) )
{ {
ICOM_THIS(IDPLobbySPImpl,iface); IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface;
FIXME( "(%p)->(%p):stub\n", This, drpfg ); FIXME( "(%p)->(%p):stub\n", This, drpfg );
return DP_OK; return DP_OK;
} }
...@@ -335,7 +335,7 @@ HRESULT WINAPI IDPLobbySPImpl_DestroyGroup ...@@ -335,7 +335,7 @@ HRESULT WINAPI IDPLobbySPImpl_DestroyGroup
LPSPDATA_DESTROYREMOTEGROUP drg LPSPDATA_DESTROYREMOTEGROUP drg
) )
{ {
ICOM_THIS(IDPLobbySPImpl,iface); IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface;
FIXME( "(%p)->(%p):stub\n", This, drg ); FIXME( "(%p)->(%p):stub\n", This, drg );
return DP_OK; return DP_OK;
} }
...@@ -346,7 +346,7 @@ HRESULT WINAPI IDPLobbySPImpl_EnumSessionsResponse ...@@ -346,7 +346,7 @@ HRESULT WINAPI IDPLobbySPImpl_EnumSessionsResponse
LPSPDATA_ENUMSESSIONSRESPONSE er LPSPDATA_ENUMSESSIONSRESPONSE er
) )
{ {
ICOM_THIS(IDPLobbySPImpl,iface); IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface;
FIXME( "(%p)->(%p):stub\n", This, er ); FIXME( "(%p)->(%p):stub\n", This, er );
return DP_OK; return DP_OK;
} }
...@@ -357,7 +357,7 @@ HRESULT WINAPI IDPLobbySPImpl_GetSPDataPointer ...@@ -357,7 +357,7 @@ HRESULT WINAPI IDPLobbySPImpl_GetSPDataPointer
LPVOID* lplpData LPVOID* lplpData
) )
{ {
ICOM_THIS(IDPLobbySPImpl,iface); IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface;
FIXME( "(%p)->(%p):stub\n", This, lplpData ); FIXME( "(%p)->(%p):stub\n", This, lplpData );
return DP_OK; return DP_OK;
} }
...@@ -368,7 +368,7 @@ HRESULT WINAPI IDPLobbySPImpl_HandleMessage ...@@ -368,7 +368,7 @@ HRESULT WINAPI IDPLobbySPImpl_HandleMessage
LPSPDATA_HANDLEMESSAGE hm LPSPDATA_HANDLEMESSAGE hm
) )
{ {
ICOM_THIS(IDPLobbySPImpl,iface); IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface;
FIXME( "(%p)->(%p):stub\n", This, hm ); FIXME( "(%p)->(%p):stub\n", This, hm );
return DP_OK; return DP_OK;
} }
...@@ -379,7 +379,7 @@ HRESULT WINAPI IDPLobbySPImpl_SendChatMessage ...@@ -379,7 +379,7 @@ HRESULT WINAPI IDPLobbySPImpl_SendChatMessage
LPSPDATA_CHATMESSAGE cm LPSPDATA_CHATMESSAGE cm
) )
{ {
ICOM_THIS(IDPLobbySPImpl,iface); IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface;
FIXME( "(%p)->(%p):stub\n", This, cm ); FIXME( "(%p)->(%p):stub\n", This, cm );
return DP_OK; return DP_OK;
} }
...@@ -390,7 +390,7 @@ HRESULT WINAPI IDPLobbySPImpl_SetGroupName ...@@ -390,7 +390,7 @@ HRESULT WINAPI IDPLobbySPImpl_SetGroupName
LPSPDATA_SETREMOTEGROUPNAME srgn LPSPDATA_SETREMOTEGROUPNAME srgn
) )
{ {
ICOM_THIS(IDPLobbySPImpl,iface); IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface;
FIXME( "(%p)->(%p):stub\n", This, srgn ); FIXME( "(%p)->(%p):stub\n", This, srgn );
return DP_OK; return DP_OK;
} }
...@@ -401,7 +401,7 @@ HRESULT WINAPI IDPLobbySPImpl_SetPlayerName ...@@ -401,7 +401,7 @@ HRESULT WINAPI IDPLobbySPImpl_SetPlayerName
LPSPDATA_SETREMOTEPLAYERNAME srpn LPSPDATA_SETREMOTEPLAYERNAME srpn
) )
{ {
ICOM_THIS(IDPLobbySPImpl,iface); IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface;
FIXME( "(%p)->(%p):stub\n", This, srpn ); FIXME( "(%p)->(%p):stub\n", This, srpn );
return DP_OK; return DP_OK;
} }
...@@ -412,7 +412,7 @@ HRESULT WINAPI IDPLobbySPImpl_SetSessionDesc ...@@ -412,7 +412,7 @@ HRESULT WINAPI IDPLobbySPImpl_SetSessionDesc
LPSPDATA_SETSESSIONDESC ssd LPSPDATA_SETSESSIONDESC ssd
) )
{ {
ICOM_THIS(IDPLobbySPImpl,iface); IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface;
FIXME( "(%p)->(%p):stub\n", This, ssd ); FIXME( "(%p)->(%p):stub\n", This, ssd );
return DP_OK; return DP_OK;
} }
...@@ -423,7 +423,7 @@ HRESULT WINAPI IDPLobbySPImpl_SetSPDataPointer ...@@ -423,7 +423,7 @@ HRESULT WINAPI IDPLobbySPImpl_SetSPDataPointer
LPVOID lpData LPVOID lpData
) )
{ {
ICOM_THIS(IDPLobbySPImpl,iface); IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface;
FIXME( "(%p)->(%p):stub\n", This, lpData ); FIXME( "(%p)->(%p):stub\n", This, lpData );
return DP_OK; return DP_OK;
} }
...@@ -434,7 +434,7 @@ HRESULT WINAPI IDPLobbySPImpl_StartSession ...@@ -434,7 +434,7 @@ HRESULT WINAPI IDPLobbySPImpl_StartSession
LPSPDATA_STARTSESSIONCOMMAND ssc LPSPDATA_STARTSESSIONCOMMAND ssc
) )
{ {
ICOM_THIS(IDPLobbySPImpl,iface); IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface;
FIXME( "(%p)->(%p):stub\n", This, ssc ); FIXME( "(%p)->(%p):stub\n", This, ssc );
return DP_OK; return DP_OK;
} }
......
...@@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dpnet); ...@@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dpnet);
/* IDirectPlay8Address IUnknown parts follow: */ /* IDirectPlay8Address IUnknown parts follow: */
HRESULT WINAPI IDirectPlay8AddressImpl_QueryInterface(PDIRECTPLAY8ADDRESS iface, REFIID riid, LPVOID *ppobj) HRESULT WINAPI IDirectPlay8AddressImpl_QueryInterface(PDIRECTPLAY8ADDRESS iface, REFIID riid, LPVOID *ppobj)
{ {
ICOM_THIS(IDirectPlay8AddressImpl,iface); IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface;
if (IsEqualGUID(riid, &IID_IUnknown) if (IsEqualGUID(riid, &IID_IUnknown)
|| IsEqualGUID(riid, &IID_IDirectPlay8Address)) { || IsEqualGUID(riid, &IID_IDirectPlay8Address)) {
...@@ -53,13 +53,13 @@ HRESULT WINAPI IDirectPlay8AddressImpl_QueryInterface(PDIRECTPLAY8ADDRESS iface, ...@@ -53,13 +53,13 @@ HRESULT WINAPI IDirectPlay8AddressImpl_QueryInterface(PDIRECTPLAY8ADDRESS iface,
} }
ULONG WINAPI IDirectPlay8AddressImpl_AddRef(PDIRECTPLAY8ADDRESS iface) { ULONG WINAPI IDirectPlay8AddressImpl_AddRef(PDIRECTPLAY8ADDRESS iface) {
ICOM_THIS(IDirectPlay8AddressImpl,iface); IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface;
TRACE("(%p) : AddRef from %ld\n", This, This->ref); TRACE("(%p) : AddRef from %ld\n", This, This->ref);
return ++(This->ref); return ++(This->ref);
} }
ULONG WINAPI IDirectPlay8AddressImpl_Release(PDIRECTPLAY8ADDRESS iface) { ULONG WINAPI IDirectPlay8AddressImpl_Release(PDIRECTPLAY8ADDRESS iface) {
ICOM_THIS(IDirectPlay8AddressImpl,iface); IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface;
ULONG ref = --This->ref; ULONG ref = --This->ref;
TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref);
if (ref == 0) { if (ref == 0) {
...@@ -71,101 +71,101 @@ ULONG WINAPI IDirectPlay8AddressImpl_Release(PDIRECTPLAY8ADDRESS iface) { ...@@ -71,101 +71,101 @@ ULONG WINAPI IDirectPlay8AddressImpl_Release(PDIRECTPLAY8ADDRESS iface) {
/* IDirectPlay8Address Interface follow: */ /* IDirectPlay8Address Interface follow: */
HRESULT WINAPI IDirectPlay8AddressImpl_BuildFromURLW(PDIRECTPLAY8ADDRESS iface, WCHAR* pwszSourceURL) { HRESULT WINAPI IDirectPlay8AddressImpl_BuildFromURLW(PDIRECTPLAY8ADDRESS iface, WCHAR* pwszSourceURL) {
ICOM_THIS(IDirectPlay8AddressImpl,iface); IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface;
TRACE("(%p, %s): stub\n", This, debugstr_w(pwszSourceURL)); TRACE("(%p, %s): stub\n", This, debugstr_w(pwszSourceURL));
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8AddressImpl_BuildFromURLA(PDIRECTPLAY8ADDRESS iface, CHAR* pszSourceURL) { HRESULT WINAPI IDirectPlay8AddressImpl_BuildFromURLA(PDIRECTPLAY8ADDRESS iface, CHAR* pszSourceURL) {
ICOM_THIS(IDirectPlay8AddressImpl,iface); IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface;
TRACE("(%p, %s): stub\n", This, pszSourceURL); TRACE("(%p, %s): stub\n", This, pszSourceURL);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8AddressImpl_Duplicate(PDIRECTPLAY8ADDRESS iface, PDIRECTPLAY8ADDRESS* ppdpaNewAddress) { HRESULT WINAPI IDirectPlay8AddressImpl_Duplicate(PDIRECTPLAY8ADDRESS iface, PDIRECTPLAY8ADDRESS* ppdpaNewAddress) {
ICOM_THIS(IDirectPlay8AddressImpl,iface); IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface;
TRACE("(%p, %p): stub\n", This, ppdpaNewAddress); TRACE("(%p, %p): stub\n", This, ppdpaNewAddress);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8AddressImpl_SetEqual(PDIRECTPLAY8ADDRESS iface, PDIRECTPLAY8ADDRESS pdpaAddress) { HRESULT WINAPI IDirectPlay8AddressImpl_SetEqual(PDIRECTPLAY8ADDRESS iface, PDIRECTPLAY8ADDRESS pdpaAddress) {
ICOM_THIS(IDirectPlay8AddressImpl,iface); IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface;
TRACE("(%p, %p): stub\n", This, pdpaAddress); TRACE("(%p, %p): stub\n", This, pdpaAddress);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8AddressImpl_IsEqual(PDIRECTPLAY8ADDRESS iface, PDIRECTPLAY8ADDRESS pdpaAddress) { HRESULT WINAPI IDirectPlay8AddressImpl_IsEqual(PDIRECTPLAY8ADDRESS iface, PDIRECTPLAY8ADDRESS pdpaAddress) {
ICOM_THIS(IDirectPlay8AddressImpl,iface); IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface;
TRACE("(%p, %p): stub\n", This, pdpaAddress); TRACE("(%p, %p): stub\n", This, pdpaAddress);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8AddressImpl_Clear(PDIRECTPLAY8ADDRESS iface) { HRESULT WINAPI IDirectPlay8AddressImpl_Clear(PDIRECTPLAY8ADDRESS iface) {
ICOM_THIS(IDirectPlay8AddressImpl,iface); IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface;
TRACE("(%p): stub\n", This); TRACE("(%p): stub\n", This);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8AddressImpl_GetURLW(PDIRECTPLAY8ADDRESS iface, WCHAR* pwszURL, PDWORD pdwNumChars) { HRESULT WINAPI IDirectPlay8AddressImpl_GetURLW(PDIRECTPLAY8ADDRESS iface, WCHAR* pwszURL, PDWORD pdwNumChars) {
ICOM_THIS(IDirectPlay8AddressImpl,iface); IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface;
TRACE("(%p): stub\n", This); TRACE("(%p): stub\n", This);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8AddressImpl_GetURLA(PDIRECTPLAY8ADDRESS iface, CHAR* pszURL, PDWORD pdwNumChars) { HRESULT WINAPI IDirectPlay8AddressImpl_GetURLA(PDIRECTPLAY8ADDRESS iface, CHAR* pszURL, PDWORD pdwNumChars) {
ICOM_THIS(IDirectPlay8AddressImpl,iface); IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface;
TRACE("(%p): stub\n", This); TRACE("(%p): stub\n", This);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8AddressImpl_GetSP(PDIRECTPLAY8ADDRESS iface, GUID* pguidSP) { HRESULT WINAPI IDirectPlay8AddressImpl_GetSP(PDIRECTPLAY8ADDRESS iface, GUID* pguidSP) {
ICOM_THIS(IDirectPlay8AddressImpl,iface); IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface;
TRACE("(%p, %p)\n", iface, pguidSP); TRACE("(%p, %p)\n", iface, pguidSP);
memcpy(pguidSP, &This->SP_guid, sizeof(GUID)); memcpy(pguidSP, &This->SP_guid, sizeof(GUID));
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8AddressImpl_GetUserData(PDIRECTPLAY8ADDRESS iface, LPVOID pvUserData, PDWORD pdwBufferSize) { HRESULT WINAPI IDirectPlay8AddressImpl_GetUserData(PDIRECTPLAY8ADDRESS iface, LPVOID pvUserData, PDWORD pdwBufferSize) {
ICOM_THIS(IDirectPlay8AddressImpl,iface); IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface;
TRACE("(%p): stub\n", This); TRACE("(%p): stub\n", This);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8AddressImpl_SetSP(PDIRECTPLAY8ADDRESS iface, CONST GUID* CONST pguidSP) { HRESULT WINAPI IDirectPlay8AddressImpl_SetSP(PDIRECTPLAY8ADDRESS iface, CONST GUID* CONST pguidSP) {
ICOM_THIS(IDirectPlay8AddressImpl,iface); IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface;
TRACE("(%p, %s)\n", iface, debugstr_SP(pguidSP)); TRACE("(%p, %s)\n", iface, debugstr_SP(pguidSP));
memcpy(&This->SP_guid, pguidSP, sizeof(GUID)); memcpy(&This->SP_guid, pguidSP, sizeof(GUID));
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8AddressImpl_SetUserData(PDIRECTPLAY8ADDRESS iface, CONST void* CONST pvUserData, CONST DWORD dwDataSize) { HRESULT WINAPI IDirectPlay8AddressImpl_SetUserData(PDIRECTPLAY8ADDRESS iface, CONST void* CONST pvUserData, CONST DWORD dwDataSize) {
ICOM_THIS(IDirectPlay8AddressImpl,iface); IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface;
TRACE("(%p): stub\n", This); TRACE("(%p): stub\n", This);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8AddressImpl_GetNumComponents(PDIRECTPLAY8ADDRESS iface, PDWORD pdwNumComponents) { HRESULT WINAPI IDirectPlay8AddressImpl_GetNumComponents(PDIRECTPLAY8ADDRESS iface, PDWORD pdwNumComponents) {
ICOM_THIS(IDirectPlay8AddressImpl,iface); IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface;
TRACE("(%p): stub\n", This); TRACE("(%p): stub\n", This);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByName(PDIRECTPLAY8ADDRESS iface, CONST WCHAR* CONST pwszName, LPVOID pvBuffer, PDWORD pdwBufferSize, PDWORD pdwDataType) { HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByName(PDIRECTPLAY8ADDRESS iface, CONST WCHAR* CONST pwszName, LPVOID pvBuffer, PDWORD pdwBufferSize, PDWORD pdwDataType) {
ICOM_THIS(IDirectPlay8AddressImpl,iface); IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface;
TRACE("(%p): stub\n", This); TRACE("(%p): stub\n", This);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByIndex(PDIRECTPLAY8ADDRESS iface, CONST DWORD dwComponentID, WCHAR* pwszName, HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByIndex(PDIRECTPLAY8ADDRESS iface, CONST DWORD dwComponentID, WCHAR* pwszName,
PDWORD pdwNameLen, void* pvBuffer, PDWORD pdwBufferSize, PDWORD pdwDataType) { PDWORD pdwNameLen, void* pvBuffer, PDWORD pdwBufferSize, PDWORD pdwDataType) {
ICOM_THIS(IDirectPlay8AddressImpl,iface); IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface;
TRACE("(%p): stub\n", This); TRACE("(%p): stub\n", This);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(PDIRECTPLAY8ADDRESS iface, CONST WCHAR* CONST pwszName, HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(PDIRECTPLAY8ADDRESS iface, CONST WCHAR* CONST pwszName,
CONST void* CONST lpvData, CONST DWORD dwDataSize, CONST DWORD dwDataType) { CONST void* CONST lpvData, CONST DWORD dwDataSize, CONST DWORD dwDataType) {
ICOM_THIS(IDirectPlay8AddressImpl,iface); IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface;
TRACE("(%p, %s, %p, %lu, %lx): stub\n", This, debugstr_w(pwszName), lpvData, dwDataSize, dwDataType); TRACE("(%p, %s, %p, %lu, %lx): stub\n", This, debugstr_w(pwszName), lpvData, dwDataSize, dwDataType);
if (NULL == lpvData) return DPNERR_INVALIDPOINTER; if (NULL == lpvData) return DPNERR_INVALIDPOINTER;
...@@ -190,19 +190,19 @@ HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(PDIRECTPLAY8ADDRESS iface, C ...@@ -190,19 +190,19 @@ HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(PDIRECTPLAY8ADDRESS iface, C
} }
HRESULT WINAPI IDirectPlay8AddressImpl_GetDevice(PDIRECTPLAY8ADDRESS iface, GUID* pDevGuid) { HRESULT WINAPI IDirectPlay8AddressImpl_GetDevice(PDIRECTPLAY8ADDRESS iface, GUID* pDevGuid) {
ICOM_THIS(IDirectPlay8AddressImpl,iface); IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface;
TRACE("(%p): stub\n", This); TRACE("(%p): stub\n", This);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8AddressImpl_SetDevice(PDIRECTPLAY8ADDRESS iface, CONST GUID* CONST devGuid) { HRESULT WINAPI IDirectPlay8AddressImpl_SetDevice(PDIRECTPLAY8ADDRESS iface, CONST GUID* CONST devGuid) {
ICOM_THIS(IDirectPlay8AddressImpl,iface); IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface;
TRACE("(%p, %s): stub\n", This, debugstr_guid(devGuid)); TRACE("(%p, %s): stub\n", This, debugstr_guid(devGuid));
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8AddressImpl_BuildFromDirectPlay4Address(PDIRECTPLAY8ADDRESS iface, LPVOID pvAddress, DWORD dwDataSize) { HRESULT WINAPI IDirectPlay8AddressImpl_BuildFromDirectPlay4Address(PDIRECTPLAY8ADDRESS iface, LPVOID pvAddress, DWORD dwDataSize) {
ICOM_THIS(IDirectPlay8AddressImpl,iface); IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface;
TRACE("(%p): stub\n", This); TRACE("(%p): stub\n", This);
return DPN_OK; return DPN_OK;
} }
......
...@@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dpnet); ...@@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dpnet);
/* IDirectPlay8Client IUnknown parts follow: */ /* IDirectPlay8Client IUnknown parts follow: */
HRESULT WINAPI IDirectPlay8ClientImpl_QueryInterface(PDIRECTPLAY8CLIENT iface, REFIID riid, LPVOID *ppobj) HRESULT WINAPI IDirectPlay8ClientImpl_QueryInterface(PDIRECTPLAY8CLIENT iface, REFIID riid, LPVOID *ppobj)
{ {
ICOM_THIS(IDirectPlay8ClientImpl,iface); IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
if (IsEqualGUID(riid, &IID_IUnknown) if (IsEqualGUID(riid, &IID_IUnknown)
|| IsEqualGUID(riid, &IID_IDirectPlay8Client)) { || IsEqualGUID(riid, &IID_IDirectPlay8Client)) {
...@@ -53,13 +53,13 @@ HRESULT WINAPI IDirectPlay8ClientImpl_QueryInterface(PDIRECTPLAY8CLIENT iface, R ...@@ -53,13 +53,13 @@ HRESULT WINAPI IDirectPlay8ClientImpl_QueryInterface(PDIRECTPLAY8CLIENT iface, R
} }
ULONG WINAPI IDirectPlay8ClientImpl_AddRef(PDIRECTPLAY8CLIENT iface) { ULONG WINAPI IDirectPlay8ClientImpl_AddRef(PDIRECTPLAY8CLIENT iface) {
ICOM_THIS(IDirectPlay8ClientImpl,iface); IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
TRACE("(%p) : AddRef from %ld\n", This, This->ref); TRACE("(%p) : AddRef from %ld\n", This, This->ref);
return ++(This->ref); return ++(This->ref);
} }
ULONG WINAPI IDirectPlay8ClientImpl_Release(PDIRECTPLAY8CLIENT iface) { ULONG WINAPI IDirectPlay8ClientImpl_Release(PDIRECTPLAY8CLIENT iface) {
ICOM_THIS(IDirectPlay8ClientImpl,iface); IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
ULONG ref = --This->ref; ULONG ref = --This->ref;
TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref);
if (ref == 0) { if (ref == 0) {
...@@ -71,7 +71,7 @@ ULONG WINAPI IDirectPlay8ClientImpl_Release(PDIRECTPLAY8CLIENT iface) { ...@@ -71,7 +71,7 @@ ULONG WINAPI IDirectPlay8ClientImpl_Release(PDIRECTPLAY8CLIENT iface) {
/* IDirectPlay8Client Interface follow: */ /* IDirectPlay8Client Interface follow: */
HRESULT WINAPI IDirectPlay8ClientImpl_Initialize(PDIRECTPLAY8CLIENT iface, PVOID CONST pvUserContext, CONST PFNDPNMESSAGEHANDLER pfn, CONST DWORD dwFlags) { HRESULT WINAPI IDirectPlay8ClientImpl_Initialize(PDIRECTPLAY8CLIENT iface, PVOID CONST pvUserContext, CONST PFNDPNMESSAGEHANDLER pfn, CONST DWORD dwFlags) {
ICOM_THIS(IDirectPlay8ClientImpl,iface); IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
FIXME("(%p):(%p,%p,%lx): Stub\n", This, pvUserContext, pfn, dwFlags); FIXME("(%p):(%p,%p,%lx): Stub\n", This, pvUserContext, pfn, dwFlags);
return DPN_OK; return DPN_OK;
} }
...@@ -83,7 +83,7 @@ HRESULT WINAPI IDirectPlay8ClientImpl_EnumServiceProviders(PDIRECTPLAY8CLIENT if ...@@ -83,7 +83,7 @@ HRESULT WINAPI IDirectPlay8ClientImpl_EnumServiceProviders(PDIRECTPLAY8CLIENT if
PDWORD CONST pcbEnumData, PDWORD CONST pcbEnumData,
PDWORD CONST pcReturned, PDWORD CONST pcReturned,
CONST DWORD dwFlags) { CONST DWORD dwFlags) {
ICOM_THIS(IDirectPlay8ClientImpl,iface); IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
FIXME("(%p):(%lx): Stub\n", This, dwFlags); FIXME("(%p):(%lx): Stub\n", This, dwFlags);
return DPN_OK; return DPN_OK;
} }
...@@ -98,14 +98,14 @@ HRESULT WINAPI IDirectPlay8ClientImpl_EnumHosts(PDIRECTPLAY8CLIENT iface, ...@@ -98,14 +98,14 @@ HRESULT WINAPI IDirectPlay8ClientImpl_EnumHosts(PDIRECTPLAY8CLIENT iface,
PVOID CONST pvUserContext, PVOID CONST pvUserContext,
DPNHANDLE * CONST pAsyncHandle, DPNHANDLE * CONST pAsyncHandle,
CONST DWORD dwFlags) { CONST DWORD dwFlags) {
ICOM_THIS(IDirectPlay8ClientImpl,iface); IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
/*FIXME("(%p):(%p,%p,%p,%p,%lu,%lu,%lu,%lu): Stub\n", This, pApplicationDesc, pAddrHost, pDeviceInfo, pUserEnumData, dwUserEnumDataSize, dwEnumCount, dwRetryInterval, dwTimeOut);*/ /*FIXME("(%p):(%p,%p,%p,%p,%lu,%lu,%lu,%lu): Stub\n", This, pApplicationDesc, pAddrHost, pDeviceInfo, pUserEnumData, dwUserEnumDataSize, dwEnumCount, dwRetryInterval, dwTimeOut);*/
FIXME("(%p):(%p,%p,%lx): Stub\n", This, pvUserContext, pAsyncHandle, dwFlags); FIXME("(%p):(%p,%p,%lx): Stub\n", This, pvUserContext, pAsyncHandle, dwFlags);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8ClientImpl_CancelAsyncOperation(PDIRECTPLAY8CLIENT iface, CONST DPNHANDLE hAsyncHandle, CONST DWORD dwFlags) { HRESULT WINAPI IDirectPlay8ClientImpl_CancelAsyncOperation(PDIRECTPLAY8CLIENT iface, CONST DPNHANDLE hAsyncHandle, CONST DWORD dwFlags) {
ICOM_THIS(IDirectPlay8ClientImpl,iface); IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
FIXME("(%p):(%lu,%lx): Stub\n", This, hAsyncHandle, dwFlags); FIXME("(%p):(%lu,%lx): Stub\n", This, hAsyncHandle, dwFlags);
return DPN_OK; return DPN_OK;
} }
...@@ -121,7 +121,7 @@ HRESULT WINAPI IDirectPlay8ClientImpl_Connect(PDIRECTPLAY8CLIENT iface, ...@@ -121,7 +121,7 @@ HRESULT WINAPI IDirectPlay8ClientImpl_Connect(PDIRECTPLAY8CLIENT iface,
void * CONST pvAsyncContext, void * CONST pvAsyncContext,
DPNHANDLE * CONST phAsyncHandle, DPNHANDLE * CONST phAsyncHandle,
CONST DWORD dwFlags) { CONST DWORD dwFlags) {
ICOM_THIS(IDirectPlay8ClientImpl,iface); IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
FIXME("(%p):(%p,%p,%lx): Stub\n", This, pvAsyncContext, phAsyncHandle, dwFlags); FIXME("(%p):(%p,%p,%lx): Stub\n", This, pvAsyncContext, phAsyncHandle, dwFlags);
return DPN_OK; return DPN_OK;
} }
...@@ -133,19 +133,19 @@ HRESULT WINAPI IDirectPlay8ClientImpl_Send(PDIRECTPLAY8CLIENT iface, ...@@ -133,19 +133,19 @@ HRESULT WINAPI IDirectPlay8ClientImpl_Send(PDIRECTPLAY8CLIENT iface,
void * CONST pvAsyncContext, void * CONST pvAsyncContext,
DPNHANDLE * CONST phAsyncHandle, DPNHANDLE * CONST phAsyncHandle,
CONST DWORD dwFlags) { CONST DWORD dwFlags) {
ICOM_THIS(IDirectPlay8ClientImpl,iface); IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
FIXME("(%p):(%p,%p,%lx): Stub\n", This, pvAsyncContext, phAsyncHandle, dwFlags); FIXME("(%p):(%p,%p,%lx): Stub\n", This, pvAsyncContext, phAsyncHandle, dwFlags);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8ClientImpl_GetSendQueueInfo(PDIRECTPLAY8CLIENT iface, DWORD * CONST pdwNumMsgs, DWORD * CONST pdwNumBytes, CONST DWORD dwFlags) { HRESULT WINAPI IDirectPlay8ClientImpl_GetSendQueueInfo(PDIRECTPLAY8CLIENT iface, DWORD * CONST pdwNumMsgs, DWORD * CONST pdwNumBytes, CONST DWORD dwFlags) {
ICOM_THIS(IDirectPlay8ClientImpl,iface); IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
FIXME("(%p):(%lx): Stub\n", This, dwFlags); FIXME("(%p):(%lx): Stub\n", This, dwFlags);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8ClientImpl_GetApplicationDesc(PDIRECTPLAY8CLIENT iface, DPN_APPLICATION_DESC * CONST pAppDescBuffer, DWORD * CONST pcbDataSize, CONST DWORD dwFlags) { HRESULT WINAPI IDirectPlay8ClientImpl_GetApplicationDesc(PDIRECTPLAY8CLIENT iface, DPN_APPLICATION_DESC * CONST pAppDescBuffer, DWORD * CONST pcbDataSize, CONST DWORD dwFlags) {
ICOM_THIS(IDirectPlay8ClientImpl,iface); IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
FIXME("(%p):(%lx): Stub\n", This, dwFlags); FIXME("(%p):(%lx): Stub\n", This, dwFlags);
return DPN_OK; return DPN_OK;
} }
...@@ -155,67 +155,67 @@ HRESULT WINAPI IDirectPlay8ClientImpl_SetClientInfo(PDIRECTPLAY8CLIENT iface, ...@@ -155,67 +155,67 @@ HRESULT WINAPI IDirectPlay8ClientImpl_SetClientInfo(PDIRECTPLAY8CLIENT iface,
PVOID CONST pvAsyncContext, PVOID CONST pvAsyncContext,
DPNHANDLE * CONST phAsyncHandle, DPNHANDLE * CONST phAsyncHandle,
CONST DWORD dwFlags) { CONST DWORD dwFlags) {
ICOM_THIS(IDirectPlay8ClientImpl,iface); IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
FIXME("(%p):(%p,%p,%lx): Stub\n", This, pvAsyncContext, phAsyncHandle, dwFlags); FIXME("(%p):(%p,%p,%lx): Stub\n", This, pvAsyncContext, phAsyncHandle, dwFlags);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8ClientImpl_GetServerInfo(PDIRECTPLAY8CLIENT iface, DPN_PLAYER_INFO * CONST pdpnPlayerInfo, DWORD * CONST pdwSize, CONST DWORD dwFlags) { HRESULT WINAPI IDirectPlay8ClientImpl_GetServerInfo(PDIRECTPLAY8CLIENT iface, DPN_PLAYER_INFO * CONST pdpnPlayerInfo, DWORD * CONST pdwSize, CONST DWORD dwFlags) {
ICOM_THIS(IDirectPlay8ClientImpl,iface); IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
FIXME("(%p):(%lx): Stub\n", This, dwFlags); FIXME("(%p):(%lx): Stub\n", This, dwFlags);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8ClientImpl_GetServerAddress(PDIRECTPLAY8CLIENT iface, IDirectPlay8Address ** CONST pAddress, CONST DWORD dwFlags) { HRESULT WINAPI IDirectPlay8ClientImpl_GetServerAddress(PDIRECTPLAY8CLIENT iface, IDirectPlay8Address ** CONST pAddress, CONST DWORD dwFlags) {
ICOM_THIS(IDirectPlay8ClientImpl,iface); IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
FIXME("(%p):(%lx): Stub\n", This, dwFlags); FIXME("(%p):(%lx): Stub\n", This, dwFlags);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8ClientImpl_Close(PDIRECTPLAY8CLIENT iface, CONST DWORD dwFlags) { HRESULT WINAPI IDirectPlay8ClientImpl_Close(PDIRECTPLAY8CLIENT iface, CONST DWORD dwFlags) {
ICOM_THIS(IDirectPlay8ClientImpl,iface); IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
FIXME("(%p):(%lx): Stub\n", This, dwFlags); FIXME("(%p):(%lx): Stub\n", This, dwFlags);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8ClientImpl_ReturnBuffer(PDIRECTPLAY8CLIENT iface, CONST DPNHANDLE hBufferHandle, CONST DWORD dwFlags) { HRESULT WINAPI IDirectPlay8ClientImpl_ReturnBuffer(PDIRECTPLAY8CLIENT iface, CONST DPNHANDLE hBufferHandle, CONST DWORD dwFlags) {
ICOM_THIS(IDirectPlay8ClientImpl,iface); IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
FIXME("(%p):(%lx): Stub\n", This, dwFlags); FIXME("(%p):(%lx): Stub\n", This, dwFlags);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8ClientImpl_GetCaps(PDIRECTPLAY8CLIENT iface, DPN_CAPS * CONST pdpCaps, CONST DWORD dwFlags) { HRESULT WINAPI IDirectPlay8ClientImpl_GetCaps(PDIRECTPLAY8CLIENT iface, DPN_CAPS * CONST pdpCaps, CONST DWORD dwFlags) {
ICOM_THIS(IDirectPlay8ClientImpl,iface); IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
FIXME("(%p):(%lx): Stub\n", This, dwFlags); FIXME("(%p):(%lx): Stub\n", This, dwFlags);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8ClientImpl_SetCaps(PDIRECTPLAY8CLIENT iface, CONST DPN_CAPS * CONST pdpCaps, CONST DWORD dwFlags) { HRESULT WINAPI IDirectPlay8ClientImpl_SetCaps(PDIRECTPLAY8CLIENT iface, CONST DPN_CAPS * CONST pdpCaps, CONST DWORD dwFlags) {
ICOM_THIS(IDirectPlay8ClientImpl,iface); IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
FIXME("(%p):(%lx): Stub\n", This, dwFlags); FIXME("(%p):(%lx): Stub\n", This, dwFlags);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8ClientImpl_SetSPCaps(PDIRECTPLAY8CLIENT iface, CONST GUID * CONST pguidSP, CONST DPN_SP_CAPS * CONST pdpspCaps, CONST DWORD dwFlags ) { HRESULT WINAPI IDirectPlay8ClientImpl_SetSPCaps(PDIRECTPLAY8CLIENT iface, CONST GUID * CONST pguidSP, CONST DPN_SP_CAPS * CONST pdpspCaps, CONST DWORD dwFlags ) {
ICOM_THIS(IDirectPlay8ClientImpl,iface); IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
FIXME("(%p):(%lx): Stub\n", This, dwFlags); FIXME("(%p):(%lx): Stub\n", This, dwFlags);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8ClientImpl_GetSPCaps(PDIRECTPLAY8CLIENT iface, CONST GUID * CONST pguidSP, DPN_SP_CAPS * CONST pdpspCaps, CONST DWORD dwFlags) { HRESULT WINAPI IDirectPlay8ClientImpl_GetSPCaps(PDIRECTPLAY8CLIENT iface, CONST GUID * CONST pguidSP, DPN_SP_CAPS * CONST pdpspCaps, CONST DWORD dwFlags) {
ICOM_THIS(IDirectPlay8ClientImpl,iface); IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
FIXME("(%p):(%lx): Stub\n", This, dwFlags); FIXME("(%p):(%lx): Stub\n", This, dwFlags);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8ClientImpl_GetConnectionInfo(PDIRECTPLAY8CLIENT iface, DPN_CONNECTION_INFO * CONST pdpConnectionInfo, CONST DWORD dwFlags) { HRESULT WINAPI IDirectPlay8ClientImpl_GetConnectionInfo(PDIRECTPLAY8CLIENT iface, DPN_CONNECTION_INFO * CONST pdpConnectionInfo, CONST DWORD dwFlags) {
ICOM_THIS(IDirectPlay8ClientImpl,iface); IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
FIXME("(%p):(%lx): Stub\n", This, dwFlags); FIXME("(%p):(%lx): Stub\n", This, dwFlags);
return DPN_OK; return DPN_OK;
} }
HRESULT WINAPI IDirectPlay8ClientImpl_RegisterLobby(PDIRECTPLAY8CLIENT iface, CONST DPNHANDLE dpnHandle, struct IDirectPlay8LobbiedApplication * CONST pIDP8LobbiedApplication, CONST DWORD dwFlags) { HRESULT WINAPI IDirectPlay8ClientImpl_RegisterLobby(PDIRECTPLAY8CLIENT iface, CONST DPNHANDLE dpnHandle, struct IDirectPlay8LobbiedApplication * CONST pIDP8LobbiedApplication, CONST DWORD dwFlags) {
ICOM_THIS(IDirectPlay8ClientImpl,iface); IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
FIXME("(%p):(%lx): Stub\n", This, dwFlags); FIXME("(%p):(%lx): Stub\n", This, dwFlags);
return DPN_OK; return DPN_OK;
} }
......
...@@ -72,32 +72,32 @@ typedef struct ...@@ -72,32 +72,32 @@ typedef struct
} IClassFactoryImpl; } IClassFactoryImpl;
static HRESULT WINAPI DICF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { static HRESULT WINAPI DICF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj); FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj);
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI DICF_AddRef(LPCLASSFACTORY iface) { static ULONG WINAPI DICF_AddRef(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
return ++(This->ref); return ++(This->ref);
} }
static ULONG WINAPI DICF_Release(LPCLASSFACTORY iface) { static ULONG WINAPI DICF_Release(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
/* static class, won't be freed */ /* static class, won't be freed */
return --(This->ref); return --(This->ref);
} }
static HRESULT WINAPI DICF_CreateInstance(LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj) { static HRESULT WINAPI DICF_CreateInstance(LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj);
return This->pfnCreateInstanceFactory(iface, pOuter, riid, ppobj); return This->pfnCreateInstanceFactory(iface, pOuter, riid, ppobj);
} }
static HRESULT WINAPI DICF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { static HRESULT WINAPI DICF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p)->(%d),stub!\n",This,dolock); FIXME("(%p)->(%d),stub!\n",This,dolock);
return S_OK; return S_OK;
} }
......
...@@ -33,30 +33,30 @@ typedef struct { ...@@ -33,30 +33,30 @@ typedef struct {
* DirectMusicWave ClassFactory * DirectMusicWave ClassFactory
*/ */
static HRESULT WINAPI WaveCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { static HRESULT WINAPI WaveCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p, %s, %p): stub\n", This, debugstr_dmguid(riid), ppobj); FIXME("(%p, %s, %p): stub\n", This, debugstr_dmguid(riid), ppobj);
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI WaveCF_AddRef(LPCLASSFACTORY iface) { static ULONG WINAPI WaveCF_AddRef(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
return ++(This->ref); return ++(This->ref);
} }
static ULONG WINAPI WaveCF_Release(LPCLASSFACTORY iface) { static ULONG WINAPI WaveCF_Release(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
/* static class, won't be freed */ /* static class, won't be freed */
return --(This->ref); return --(This->ref);
} }
static HRESULT WINAPI WaveCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI WaveCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj); TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj);
return DMUSIC_CreateDirectMusicWaveImpl (riid, ppobj, pOuter); return DMUSIC_CreateDirectMusicWaveImpl (riid, ppobj, pOuter);
} }
static HRESULT WINAPI WaveCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { static HRESULT WINAPI WaveCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p, %d): stub\n", This, dolock); FIXME("(%p, %d): stub\n", This, dolock);
return S_OK; return S_OK;
} }
......
...@@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); ...@@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxdiag);
/* IDxDiagContainer IUnknown parts follow: */ /* IDxDiagContainer IUnknown parts follow: */
HRESULT WINAPI IDxDiagContainerImpl_QueryInterface(PDXDIAGCONTAINER iface, REFIID riid, LPVOID *ppobj) HRESULT WINAPI IDxDiagContainerImpl_QueryInterface(PDXDIAGCONTAINER iface, REFIID riid, LPVOID *ppobj)
{ {
ICOM_THIS(IDxDiagContainerImpl,iface); IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface;
if (IsEqualGUID(riid, &IID_IUnknown) if (IsEqualGUID(riid, &IID_IUnknown)
|| IsEqualGUID(riid, &IID_IDxDiagContainer)) { || IsEqualGUID(riid, &IID_IDxDiagContainer)) {
...@@ -43,13 +43,13 @@ HRESULT WINAPI IDxDiagContainerImpl_QueryInterface(PDXDIAGCONTAINER iface, REFII ...@@ -43,13 +43,13 @@ HRESULT WINAPI IDxDiagContainerImpl_QueryInterface(PDXDIAGCONTAINER iface, REFII
} }
ULONG WINAPI IDxDiagContainerImpl_AddRef(PDXDIAGCONTAINER iface) { ULONG WINAPI IDxDiagContainerImpl_AddRef(PDXDIAGCONTAINER iface) {
ICOM_THIS(IDxDiagContainerImpl,iface); IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface;
TRACE("(%p) : AddRef from %ld\n", This, This->ref); TRACE("(%p) : AddRef from %ld\n", This, This->ref);
return ++(This->ref); return ++(This->ref);
} }
ULONG WINAPI IDxDiagContainerImpl_Release(PDXDIAGCONTAINER iface) { ULONG WINAPI IDxDiagContainerImpl_Release(PDXDIAGCONTAINER iface) {
ICOM_THIS(IDxDiagContainerImpl,iface); IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface;
ULONG ref = --This->ref; ULONG ref = --This->ref;
TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref);
if (ref == 0) { if (ref == 0) {
...@@ -60,7 +60,7 @@ ULONG WINAPI IDxDiagContainerImpl_Release(PDXDIAGCONTAINER iface) { ...@@ -60,7 +60,7 @@ ULONG WINAPI IDxDiagContainerImpl_Release(PDXDIAGCONTAINER iface) {
/* IDxDiagContainer Interface follow: */ /* IDxDiagContainer Interface follow: */
HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfChildContainers(PDXDIAGCONTAINER iface, DWORD* pdwCount) { HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfChildContainers(PDXDIAGCONTAINER iface, DWORD* pdwCount) {
ICOM_THIS(IDxDiagContainerImpl,iface); IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface;
TRACE("(%p)\n", iface); TRACE("(%p)\n", iface);
if (NULL == pdwCount) { if (NULL == pdwCount) {
return E_INVALIDARG; return E_INVALIDARG;
...@@ -72,7 +72,7 @@ HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfChildContainers(PDXDIAGCONTAINER ...@@ -72,7 +72,7 @@ HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfChildContainers(PDXDIAGCONTAINER
HRESULT WINAPI IDxDiagContainerImpl_EnumChildContainerNames(PDXDIAGCONTAINER iface, DWORD dwIndex, LPWSTR pwszContainer, DWORD cchContainer) { HRESULT WINAPI IDxDiagContainerImpl_EnumChildContainerNames(PDXDIAGCONTAINER iface, DWORD dwIndex, LPWSTR pwszContainer, DWORD cchContainer) {
IDxDiagContainerImpl_SubContainer* p = NULL; IDxDiagContainerImpl_SubContainer* p = NULL;
DWORD i = 0; DWORD i = 0;
ICOM_THIS(IDxDiagContainerImpl,iface); IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface;
TRACE("(%p, %lu, %s, %lu)\n", iface, dwIndex, debugstr_w(pwszContainer), cchContainer); TRACE("(%p, %lu, %s, %lu)\n", iface, dwIndex, debugstr_w(pwszContainer), cchContainer);
...@@ -100,7 +100,7 @@ HRESULT WINAPI IDxDiagContainerImpl_EnumChildContainerNames(PDXDIAGCONTAINER ifa ...@@ -100,7 +100,7 @@ HRESULT WINAPI IDxDiagContainerImpl_EnumChildContainerNames(PDXDIAGCONTAINER ifa
HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(PDXDIAGCONTAINER iface, LPCWSTR pwszContainer, IDxDiagContainer** ppInstance) { HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(PDXDIAGCONTAINER iface, LPCWSTR pwszContainer, IDxDiagContainer** ppInstance) {
IDxDiagContainerImpl_SubContainer* p = NULL; IDxDiagContainerImpl_SubContainer* p = NULL;
ICOM_THIS(IDxDiagContainerImpl,iface); IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface;
FIXME("(%p, %s, %p)\n", iface, debugstr_w(pwszContainer), ppInstance); FIXME("(%p, %s, %p)\n", iface, debugstr_w(pwszContainer), ppInstance);
...@@ -121,19 +121,19 @@ HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(PDXDIAGCONTAINER iface, LP ...@@ -121,19 +121,19 @@ HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(PDXDIAGCONTAINER iface, LP
} }
HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfProps(PDXDIAGCONTAINER iface, DWORD* pdwCount) { HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfProps(PDXDIAGCONTAINER iface, DWORD* pdwCount) {
/* ICOM_THIS(IDxDiagContainerImpl,iface); */ /* IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; */
FIXME("(%p, %p): stub\n", iface, pdwCount); FIXME("(%p, %p): stub\n", iface, pdwCount);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDxDiagContainerImpl_EnumPropNames(PDXDIAGCONTAINER iface, DWORD dwIndex, LPWSTR pwszPropName, DWORD cchPropName) { HRESULT WINAPI IDxDiagContainerImpl_EnumPropNames(PDXDIAGCONTAINER iface, DWORD dwIndex, LPWSTR pwszPropName, DWORD cchPropName) {
/* ICOM_THIS(IDxDiagContainerImpl,iface); */ /* IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; */
FIXME("(%p, %lu, %s, %lu): stub\n", iface, dwIndex, debugstr_w(pwszPropName), cchPropName); FIXME("(%p, %lu, %s, %lu): stub\n", iface, dwIndex, debugstr_w(pwszPropName), cchPropName);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDxDiagContainerImpl_GetProp(PDXDIAGCONTAINER iface, LPCWSTR pwszPropName, VARIANT* pvarProp) { HRESULT WINAPI IDxDiagContainerImpl_GetProp(PDXDIAGCONTAINER iface, LPCWSTR pwszPropName, VARIANT* pvarProp) {
/* ICOM_THIS(IDxDiagContainerImpl,iface); */ /* IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; */
FIXME("(%p, %s, %p): stub\n", iface, debugstr_w(pwszPropName), pvarProp); FIXME("(%p, %s, %p): stub\n", iface, debugstr_w(pwszPropName), pvarProp);
return S_OK; return S_OK;
} }
......
...@@ -47,32 +47,32 @@ typedef struct { ...@@ -47,32 +47,32 @@ typedef struct {
} IClassFactoryImpl; } IClassFactoryImpl;
static HRESULT WINAPI DXDiagCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { static HRESULT WINAPI DXDiagCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj); FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj);
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI DXDiagCF_AddRef(LPCLASSFACTORY iface) { static ULONG WINAPI DXDiagCF_AddRef(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
return ++(This->ref); return ++(This->ref);
} }
static ULONG WINAPI DXDiagCF_Release(LPCLASSFACTORY iface) { static ULONG WINAPI DXDiagCF_Release(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
/* static class, won't be freed */ /* static class, won't be freed */
return --(This->ref); return --(This->ref);
} }
static HRESULT WINAPI DXDiagCF_CreateInstance(LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj) { static HRESULT WINAPI DXDiagCF_CreateInstance(LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj);
return This->pfnCreateInstanceFactory(iface, pOuter, riid, ppobj); return This->pfnCreateInstanceFactory(iface, pOuter, riid, ppobj);
} }
static HRESULT WINAPI DXDiagCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { static HRESULT WINAPI DXDiagCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p)->(%d),stub!\n",This,dolock); FIXME("(%p)->(%d),stub!\n",This,dolock);
return S_OK; return S_OK;
} }
......
...@@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); ...@@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxdiag);
/* IDxDiagProvider IUnknown parts follow: */ /* IDxDiagProvider IUnknown parts follow: */
HRESULT WINAPI IDxDiagProviderImpl_QueryInterface(PDXDIAGPROVIDER iface, REFIID riid, LPVOID *ppobj) HRESULT WINAPI IDxDiagProviderImpl_QueryInterface(PDXDIAGPROVIDER iface, REFIID riid, LPVOID *ppobj)
{ {
ICOM_THIS(IDxDiagProviderImpl,iface); IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface;
if (IsEqualGUID(riid, &IID_IUnknown) if (IsEqualGUID(riid, &IID_IUnknown)
|| IsEqualGUID(riid, &IID_IDxDiagProvider)) { || IsEqualGUID(riid, &IID_IDxDiagProvider)) {
...@@ -42,13 +42,13 @@ HRESULT WINAPI IDxDiagProviderImpl_QueryInterface(PDXDIAGPROVIDER iface, REFIID ...@@ -42,13 +42,13 @@ HRESULT WINAPI IDxDiagProviderImpl_QueryInterface(PDXDIAGPROVIDER iface, REFIID
} }
ULONG WINAPI IDxDiagProviderImpl_AddRef(PDXDIAGPROVIDER iface) { ULONG WINAPI IDxDiagProviderImpl_AddRef(PDXDIAGPROVIDER iface) {
ICOM_THIS(IDxDiagProviderImpl,iface); IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface;
TRACE("(%p) : AddRef from %ld\n", This, This->ref); TRACE("(%p) : AddRef from %ld\n", This, This->ref);
return ++(This->ref); return ++(This->ref);
} }
ULONG WINAPI IDxDiagProviderImpl_Release(PDXDIAGPROVIDER iface) { ULONG WINAPI IDxDiagProviderImpl_Release(PDXDIAGPROVIDER iface) {
ICOM_THIS(IDxDiagProviderImpl,iface); IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface;
ULONG ref = --This->ref; ULONG ref = --This->ref;
TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref);
if (ref == 0) { if (ref == 0) {
...@@ -59,7 +59,7 @@ ULONG WINAPI IDxDiagProviderImpl_Release(PDXDIAGPROVIDER iface) { ...@@ -59,7 +59,7 @@ ULONG WINAPI IDxDiagProviderImpl_Release(PDXDIAGPROVIDER iface) {
/* IDxDiagProvider Interface follow: */ /* IDxDiagProvider Interface follow: */
HRESULT WINAPI IDxDiagProviderImpl_Initialize(PDXDIAGPROVIDER iface, DXDIAG_INIT_PARAMS* pParams) { HRESULT WINAPI IDxDiagProviderImpl_Initialize(PDXDIAGPROVIDER iface, DXDIAG_INIT_PARAMS* pParams) {
ICOM_THIS(IDxDiagProviderImpl, iface); IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface;
TRACE("(%p,%p)\n", iface, pParams); TRACE("(%p,%p)\n", iface, pParams);
if (NULL == pParams) { if (NULL == pParams) {
...@@ -76,7 +76,7 @@ HRESULT WINAPI IDxDiagProviderImpl_Initialize(PDXDIAGPROVIDER iface, DXDIAG_INIT ...@@ -76,7 +76,7 @@ HRESULT WINAPI IDxDiagProviderImpl_Initialize(PDXDIAGPROVIDER iface, DXDIAG_INIT
HRESULT WINAPI IDxDiagProviderImpl_GetRootContainer(PDXDIAGPROVIDER iface, IDxDiagContainer** ppInstance) { HRESULT WINAPI IDxDiagProviderImpl_GetRootContainer(PDXDIAGPROVIDER iface, IDxDiagContainer** ppInstance) {
HRESULT hr = S_OK; HRESULT hr = S_OK;
ICOM_THIS(IDxDiagProviderImpl, iface); IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface;
TRACE("(%p,%p)\n", iface, ppInstance); TRACE("(%p,%p)\n", iface, ppInstance);
if (NULL == ppInstance) { if (NULL == ppInstance) {
......
...@@ -89,7 +89,7 @@ static const struct object_creation_info object_creation[] = ...@@ -89,7 +89,7 @@ static const struct object_creation_info object_creation[] =
static HRESULT WINAPI static HRESULT WINAPI
ITSSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) ITSSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj)
{ {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
if (IsEqualGUID(riid, &IID_IUnknown) if (IsEqualGUID(riid, &IID_IUnknown)
|| IsEqualGUID(riid, &IID_IClassFactory)) || IsEqualGUID(riid, &IID_IClassFactory))
...@@ -104,12 +104,12 @@ ITSSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) ...@@ -104,12 +104,12 @@ ITSSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj)
} }
static ULONG WINAPI ITSSCF_AddRef(LPCLASSFACTORY iface) { static ULONG WINAPI ITSSCF_AddRef(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
return ++(This->ref); return ++(This->ref);
} }
static ULONG WINAPI ITSSCF_Release(LPCLASSFACTORY iface) { static ULONG WINAPI ITSSCF_Release(LPCLASSFACTORY iface) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
ULONG ref = --This->ref; ULONG ref = --This->ref;
...@@ -122,7 +122,7 @@ static ULONG WINAPI ITSSCF_Release(LPCLASSFACTORY iface) { ...@@ -122,7 +122,7 @@ static ULONG WINAPI ITSSCF_Release(LPCLASSFACTORY iface) {
static HRESULT WINAPI ITSSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, static HRESULT WINAPI ITSSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter,
REFIID riid, LPVOID *ppobj) { REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
HRESULT hres; HRESULT hres;
LPUNKNOWN punk; LPUNKNOWN punk;
...@@ -143,7 +143,7 @@ static HRESULT WINAPI ITSSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOut ...@@ -143,7 +143,7 @@ static HRESULT WINAPI ITSSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOut
} }
static HRESULT WINAPI ITSSCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { static HRESULT WINAPI ITSSCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
ICOM_THIS(IClassFactoryImpl,iface); IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p)->(%d),stub!\n",This,dolock); FIXME("(%p)->(%d),stub!\n",This,dolock);
return S_OK; return S_OK;
} }
...@@ -211,7 +211,7 @@ HRESULT WINAPI ITStorageImpl_QueryInterface( ...@@ -211,7 +211,7 @@ HRESULT WINAPI ITStorageImpl_QueryInterface(
REFIID riid, REFIID riid,
void** ppvObject) void** ppvObject)
{ {
ICOM_THIS(ITStorageImpl,iface); ITStorageImpl *This = (ITStorageImpl *)iface;
if (IsEqualGUID(riid, &IID_IUnknown) if (IsEqualGUID(riid, &IID_IUnknown)
|| IsEqualGUID(riid, &IID_IITStorage)) || IsEqualGUID(riid, &IID_IITStorage))
{ {
...@@ -227,7 +227,7 @@ HRESULT WINAPI ITStorageImpl_QueryInterface( ...@@ -227,7 +227,7 @@ HRESULT WINAPI ITStorageImpl_QueryInterface(
ULONG WINAPI ITStorageImpl_AddRef( ULONG WINAPI ITStorageImpl_AddRef(
IITStorage* iface) IITStorage* iface)
{ {
ICOM_THIS(ITStorageImpl,iface); ITStorageImpl *This = (ITStorageImpl *)iface;
TRACE("%p\n", This); TRACE("%p\n", This);
return ++(This->ref); return ++(This->ref);
} }
...@@ -235,7 +235,7 @@ ULONG WINAPI ITStorageImpl_AddRef( ...@@ -235,7 +235,7 @@ ULONG WINAPI ITStorageImpl_AddRef(
ULONG WINAPI ITStorageImpl_Release( ULONG WINAPI ITStorageImpl_Release(
IITStorage* iface) IITStorage* iface)
{ {
ICOM_THIS(ITStorageImpl,iface); ITStorageImpl *This = (ITStorageImpl *)iface;
ULONG ref = --This->ref; ULONG ref = --This->ref;
if (ref == 0) if (ref == 0)
...@@ -251,7 +251,7 @@ HRESULT WINAPI ITStorageImpl_StgCreateDocfile( ...@@ -251,7 +251,7 @@ HRESULT WINAPI ITStorageImpl_StgCreateDocfile(
DWORD reserved, DWORD reserved,
IStorage** ppstgOpen) IStorage** ppstgOpen)
{ {
ICOM_THIS(ITStorageImpl,iface); ITStorageImpl *This = (ITStorageImpl *)iface;
TRACE("%p %s %lu %lu %p\n", This, TRACE("%p %s %lu %lu %p\n", This,
debugstr_w(pwcsName), grfMode, reserved, ppstgOpen ); debugstr_w(pwcsName), grfMode, reserved, ppstgOpen );
...@@ -267,7 +267,7 @@ HRESULT WINAPI ITStorageImpl_StgCreateDocfileOnILockBytes( ...@@ -267,7 +267,7 @@ HRESULT WINAPI ITStorageImpl_StgCreateDocfileOnILockBytes(
DWORD reserved, DWORD reserved,
IStorage** ppstgOpen) IStorage** ppstgOpen)
{ {
ICOM_THIS(ITStorageImpl,iface); ITStorageImpl *This = (ITStorageImpl *)iface;
FIXME("%p\n", This); FIXME("%p\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -276,7 +276,7 @@ HRESULT WINAPI ITStorageImpl_StgIsStorageFile( ...@@ -276,7 +276,7 @@ HRESULT WINAPI ITStorageImpl_StgIsStorageFile(
IITStorage* iface, IITStorage* iface,
const WCHAR* pwcsName) const WCHAR* pwcsName)
{ {
ICOM_THIS(ITStorageImpl,iface); ITStorageImpl *This = (ITStorageImpl *)iface;
FIXME("%p\n", This); FIXME("%p\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -285,7 +285,7 @@ HRESULT WINAPI ITStorageImpl_StgIsStorageILockBytes( ...@@ -285,7 +285,7 @@ HRESULT WINAPI ITStorageImpl_StgIsStorageILockBytes(
IITStorage* iface, IITStorage* iface,
ILockBytes* plkbyt) ILockBytes* plkbyt)
{ {
ICOM_THIS(ITStorageImpl,iface); ITStorageImpl *This = (ITStorageImpl *)iface;
FIXME("%p\n", This); FIXME("%p\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -299,7 +299,7 @@ HRESULT WINAPI ITStorageImpl_StgOpenStorage( ...@@ -299,7 +299,7 @@ HRESULT WINAPI ITStorageImpl_StgOpenStorage(
DWORD reserved, DWORD reserved,
IStorage** ppstgOpen) IStorage** ppstgOpen)
{ {
ICOM_THIS(ITStorageImpl,iface); ITStorageImpl *This = (ITStorageImpl *)iface;
TRACE("%p %s %p %ld %p\n", This, debugstr_w( pwcsName ), TRACE("%p %s %p %ld %p\n", This, debugstr_w( pwcsName ),
pstgPriority, grfMode, snbExclude ); pstgPriority, grfMode, snbExclude );
...@@ -317,7 +317,7 @@ HRESULT WINAPI ITStorageImpl_StgOpenStorageOnILockBytes( ...@@ -317,7 +317,7 @@ HRESULT WINAPI ITStorageImpl_StgOpenStorageOnILockBytes(
DWORD reserved, DWORD reserved,
IStorage** ppstgOpen) IStorage** ppstgOpen)
{ {
ICOM_THIS(ITStorageImpl,iface); ITStorageImpl *This = (ITStorageImpl *)iface;
FIXME("%p\n", This); FIXME("%p\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -329,7 +329,7 @@ HRESULT WINAPI ITStorageImpl_StgSetTimes( ...@@ -329,7 +329,7 @@ HRESULT WINAPI ITStorageImpl_StgSetTimes(
FILETIME* patime, FILETIME* patime,
FILETIME* pmtime) FILETIME* pmtime)
{ {
ICOM_THIS(ITStorageImpl,iface); ITStorageImpl *This = (ITStorageImpl *)iface;
FIXME("%p\n", This); FIXME("%p\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -338,7 +338,7 @@ HRESULT WINAPI ITStorageImpl_SetControlData( ...@@ -338,7 +338,7 @@ HRESULT WINAPI ITStorageImpl_SetControlData(
IITStorage* iface, IITStorage* iface,
PITS_Control_Data pControlData) PITS_Control_Data pControlData)
{ {
ICOM_THIS(ITStorageImpl,iface); ITStorageImpl *This = (ITStorageImpl *)iface;
FIXME("%p\n", This); FIXME("%p\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -347,7 +347,7 @@ HRESULT WINAPI ITStorageImpl_DefaultControlData( ...@@ -347,7 +347,7 @@ HRESULT WINAPI ITStorageImpl_DefaultControlData(
IITStorage* iface, IITStorage* iface,
PITS_Control_Data* ppControlData) PITS_Control_Data* ppControlData)
{ {
ICOM_THIS(ITStorageImpl,iface); ITStorageImpl *This = (ITStorageImpl *)iface;
FIXME("%p\n", This); FIXME("%p\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -357,7 +357,7 @@ HRESULT WINAPI ITStorageImpl_Compact( ...@@ -357,7 +357,7 @@ HRESULT WINAPI ITStorageImpl_Compact(
const WCHAR* pwcsName, const WCHAR* pwcsName,
ECompactionLev iLev) ECompactionLev iLev)
{ {
ICOM_THIS(ITStorageImpl,iface); ITStorageImpl *This = (ITStorageImpl *)iface;
FIXME("%p\n", This); FIXME("%p\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment