commit f5f7a1822cd70d6e10d58bbf56c97d830172aa63
author Alexandre Julliard <julliard@winehq.org> Wed Sep 08 01:50:37 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Sep 08 01:50:37 2004 +0000
tree d43125785e3f8a9a3da85a146340c31f19abfd4f
parent 5e128dd470cb545b0f2ac9188e1c27b06eecb9f9

Removed some more uses of the non-standard ICOM_THIS macro.

dlls/quartz/videorenderer.c

diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c
index 7c6d44e..14cf573 100644
--- a/dlls/quartz/videorenderer.c
+++ b/dlls/quartz/videorenderer.c
@@ -117,7 +117,7 @@
     HRESULT hr;
     DDSURFACEDESC sdesc;
     DDSCAPS ddscaps;
-    ICOM_THIS(VideoRendererImpl, iface);
+    VideoRendererImpl *This = (VideoRendererImpl *)iface;
 	
     hr = DirectDrawCreate(NULL, &This->ddraw, NULL);
 
@@ -245,7 +245,7 @@
 
 static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample)
 {
-    ICOM_THIS(VideoRendererImpl, iface);
+    VideoRendererImpl *This = (VideoRendererImpl *)iface;
     LPBYTE pbSrcStream = NULL;
     long cbSrcStream = 0;
     REFERENCE_TIME tStart, tStop;
@@ -361,7 +361,7 @@
 
 static HRESULT WINAPI VideoRenderer_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv)
 {
-    ICOM_THIS(VideoRendererImpl, iface);
+    VideoRendererImpl *This = (VideoRendererImpl *)iface;
     TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv);
 
     *ppv = NULL;
@@ -392,14 +392,14 @@
 
 static ULONG WINAPI VideoRenderer_AddRef(IBaseFilter * iface)
 {
-    ICOM_THIS(VideoRendererImpl, iface);
+    VideoRendererImpl *This = (VideoRendererImpl *)iface;
     TRACE("(%p/%p)->() AddRef from %ld\n", This, iface, This->refCount);
     return InterlockedIncrement(&This->refCount);
 }
 
 static ULONG WINAPI VideoRenderer_Release(IBaseFilter * iface)
 {
-    ICOM_THIS(VideoRendererImpl, iface);
+    VideoRendererImpl *This = (VideoRendererImpl *)iface;
     TRACE("(%p/%p)->() Release from %ld\n", This, iface, This->refCount);
     if (!InterlockedDecrement(&This->refCount))
     {
@@ -424,7 +424,7 @@
 
 static HRESULT WINAPI VideoRenderer_GetClassID(IBaseFilter * iface, CLSID * pClsid)
 {
-    ICOM_THIS(VideoRendererImpl, iface);
+    VideoRendererImpl *This = (VideoRendererImpl *)iface;
 
     TRACE("(%p/%p)->(%p)\n", This, iface, pClsid);
 
@@ -437,7 +437,7 @@
 
 static HRESULT WINAPI VideoRenderer_Stop(IBaseFilter * iface)
 {
-    ICOM_THIS(VideoRendererImpl, iface);
+    VideoRendererImpl *This = (VideoRendererImpl *)iface;
 
     TRACE("(%p/%p)->()\n", This, iface);
 
@@ -452,7 +452,7 @@
 
 static HRESULT WINAPI VideoRenderer_Pause(IBaseFilter * iface)
 {
-    ICOM_THIS(VideoRendererImpl, iface);
+    VideoRendererImpl *This = (VideoRendererImpl *)iface;
     
     TRACE("(%p/%p)->()\n", This, iface);
 
@@ -467,7 +467,7 @@
 
 static HRESULT WINAPI VideoRenderer_Run(IBaseFilter * iface, REFERENCE_TIME tStart)
 {
-    ICOM_THIS(VideoRendererImpl, iface);
+    VideoRendererImpl *This = (VideoRendererImpl *)iface;
 
     TRACE("(%p/%p)->(%s)\n", This, iface, wine_dbgstr_longlong(tStart));
 
@@ -483,7 +483,7 @@
 
 static HRESULT WINAPI VideoRenderer_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState)
 {
-    ICOM_THIS(VideoRendererImpl, iface);
+    VideoRendererImpl *This = (VideoRendererImpl *)iface;
 
     TRACE("(%p/%p)->(%ld, %p)\n", This, iface, dwMilliSecsTimeout, pState);
 
@@ -498,7 +498,7 @@
 
 static HRESULT WINAPI VideoRenderer_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock)
 {
-    ICOM_THIS(VideoRendererImpl, iface);
+    VideoRendererImpl *This = (VideoRendererImpl *)iface;
 
     TRACE("(%p/%p)->(%p)\n", This, iface, pClock);
 
@@ -517,7 +517,7 @@
 
 static HRESULT WINAPI VideoRenderer_GetSyncSource(IBaseFilter * iface, IReferenceClock **ppClock)
 {
-    ICOM_THIS(VideoRendererImpl, iface);
+    VideoRendererImpl *This = (VideoRendererImpl *)iface;
 
     TRACE("(%p/%p)->(%p)\n", This, iface, ppClock);
 
@@ -536,7 +536,7 @@
 static HRESULT WINAPI VideoRenderer_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum)
 {
     ENUMPINDETAILS epd;
-    ICOM_THIS(VideoRendererImpl, iface);
+    VideoRendererImpl *This = (VideoRendererImpl *)iface;
 
     TRACE("(%p/%p)->(%p)\n", This, iface, ppEnum);
 
@@ -547,7 +547,7 @@
 
 static HRESULT WINAPI VideoRenderer_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin)
 {
-    ICOM_THIS(VideoRendererImpl, iface);
+    VideoRendererImpl *This = (VideoRendererImpl *)iface;
 
     TRACE("(%p/%p)->(%p,%p)\n", This, iface, debugstr_w(Id), ppPin);
 
@@ -560,7 +560,7 @@
 
 static HRESULT WINAPI VideoRenderer_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo)
 {
-    ICOM_THIS(VideoRendererImpl, iface);
+    VideoRendererImpl *This = (VideoRendererImpl *)iface;
 
     TRACE("(%p/%p)->(%p)\n", This, iface, pInfo);
 
@@ -575,7 +575,7 @@
 
 static HRESULT WINAPI VideoRenderer_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName)
 {
-    ICOM_THIS(VideoRendererImpl, iface);
+    VideoRendererImpl *This = (VideoRendererImpl *)iface;
 
     TRACE("(%p/%p)->(%p, %s)\n", This, iface, pGraph, debugstr_w(pName));
 
@@ -594,7 +594,7 @@
 
 static HRESULT WINAPI VideoRenderer_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo)
 {
-    ICOM_THIS(VideoRendererImpl, iface);
+    VideoRendererImpl *This = (VideoRendererImpl *)iface;
     TRACE("(%p/%p)->(%p)\n", This, iface, pVendorInfo);
     return E_NOTIMPL;
 }