[PATCH] d3d9: Use the correct AddRef and Release Macros=0A=
Stefan Doesinger
stefan at codeweavers.com
Sun Nov 2 23:49:40 CST 2008
=0A=
In almost all the cases where we use IUnknown_AddRef and=0A=
IUnknown_Release, we know the specific type of the interface. Use=0A=
the specific macros instead.=0A=
=0A=
I stumbled uppon this when I tried to compile d3d9.dll using=0A=
Microsoft Visual Studio. For some reason IUnknown_* wasn't=0A=
defined. This is obviously a bug in my build setup, but I think=0A=
using the proper macros is a good idea nevertheless=0A=
---=0A=
dlls/d3d9/basetexture.c | 2 +-=0A=
dlls/d3d9/cubetexture.c | 6 +++---=0A=
dlls/d3d9/device.c | 6 +++---=0A=
dlls/d3d9/directx.c | 8 ++++----=0A=
dlls/d3d9/indexbuffer.c | 6 +++---=0A=
dlls/d3d9/pixelshader.c | 6 +++---=0A=
dlls/d3d9/query.c | 6 +++---=0A=
dlls/d3d9/resource.c | 2 +-=0A=
dlls/d3d9/stateblock.c | 10 +++++-----=0A=
dlls/d3d9/surface.c | 6 +++---=0A=
dlls/d3d9/swapchain.c | 8 ++++----=0A=
dlls/d3d9/texture.c | 6 +++---=0A=
dlls/d3d9/vertexbuffer.c | 6 +++---=0A=
dlls/d3d9/vertexdeclaration.c | 8 ++++----=0A=
dlls/d3d9/vertexshader.c | 6 +++---=0A=
dlls/d3d9/volume.c | 2 +-=0A=
dlls/d3d9/volumetexture.c | 6 +++---=0A=
17 files changed, 50 insertions(+), 50 deletions(-)=0A=
=0A=
diff --git a/dlls/d3d9/basetexture.c b/dlls/d3d9/basetexture.c=0A=
index f80eb78..b349f51 100644=0A=
--- a/dlls/d3d9/basetexture.c=0A=
+++ b/dlls/d3d9/basetexture.c=0A=
@@ -31,7 +31,7 @@ static HRESULT WINAPI =
IDirect3DBaseTexture9Impl_QueryInterface(LPDIRECT3DBASETEX=0A=
if (IsEqualGUID(riid, &IID_IUnknown)=0A=
|| IsEqualGUID(riid, &IID_IDirect3DResource9)=0A=
|| IsEqualGUID(riid, &IID_IDirect3DBaseTexture9)) {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DBaseTexture9_AddRef(iface);=0A=
*ppobj =3D This;=0A=
return S_OK;=0A=
}=0A=
diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c=0A=
index 9369fa5..bf88995 100644=0A=
--- a/dlls/d3d9/cubetexture.c=0A=
+++ b/dlls/d3d9/cubetexture.c=0A=
@@ -33,7 +33,7 @@ static HRESULT WINAPI =
IDirect3DCubeTexture9Impl_QueryInterface(LPDIRECT3DCUBETEX=0A=
|| IsEqualGUID(riid, &IID_IDirect3DResource9)=0A=
|| IsEqualGUID(riid, &IID_IDirect3DBaseTexture9)=0A=
|| IsEqualGUID(riid, &IID_IDirect3DCubeTexture9)) {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DCubeTexture9_AddRef(iface);=0A=
*ppobj =3D This;=0A=
return S_OK;=0A=
}=0A=
@@ -63,7 +63,7 @@ static ULONG WINAPI =
IDirect3DCubeTexture9Impl_Release(LPDIRECT3DCUBETEXTURE9 ifa=0A=
=0A=
EnterCriticalSection(&d3d9_cs);=0A=
IWineD3DCubeTexture_Destroy(This->wineD3DCubeTexture, =
D3D9CB_DestroySurface);=0A=
- IUnknown_Release(This->parentDevice);=0A=
+ IDirect3DDevice9Ex_Release(This->parentDevice);=0A=
LeaveCriticalSection(&d3d9_cs);=0A=
=0A=
HeapFree(GetProcessHeap(), 0, This);=0A=
@@ -365,7 +365,7 @@ HRESULT WINAPI =
IDirect3DDevice9Impl_CreateCubeTexture(LPDIRECT3DDEVICE9EX ifac=0A=
FIXME("(%p) call to IWineD3DDevice_CreateCubeTexture failed\n", =
This);=0A=
HeapFree(GetProcessHeap(), 0, object);=0A=
} else {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DDevice9Ex_AddRef(iface);=0A=
object->parentDevice =3D iface;=0A=
*ppCubeTexture =3D (LPDIRECT3DCUBETEXTURE9) object;=0A=
TRACE("(%p) : Created cube texture %p\n", This, object);=0A=
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c=0A=
index 426c8ab..5323eac 100644=0A=
--- a/dlls/d3d9/device.c=0A=
+++ b/dlls/d3d9/device.c=0A=
@@ -34,7 +34,7 @@ static HRESULT WINAPI =
IDirect3DDevice9Impl_QueryInterface(LPDIRECT3DDEVICE9EX if=0A=
=0A=
if (IsEqualGUID(riid, &IID_IUnknown)=0A=
|| IsEqualGUID(riid, &IID_IDirect3DDevice9)) {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DDevice9Ex_AddRef(iface);=0A=
*ppobj =3D This;=0A=
TRACE("Returning IDirect3DDevice9 interface at %p\n", *ppobj);=0A=
return S_OK;=0A=
@@ -514,7 +514,7 @@ static HRESULT WINAPI =
IDirect3DDevice9Impl_CreateSurface(LPDIRECT3DDEVICE9EX if=0A=
FIXME("(%p) call to IWineD3DDevice_CreateSurface failed\n", =
This);=0A=
HeapFree(GetProcessHeap(), 0, object);=0A=
} else {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DDevice9Ex_AddRef(iface);=0A=
object->parentDevice =3D iface;=0A=
TRACE("(%p) : Created surface %p\n", This, object);=0A=
*ppSurface =3D (LPDIRECT3DSURFACE9) object;=0A=
@@ -1721,7 +1721,7 @@ HRESULT WINAPI D3D9CB_CreateSurface(IUnknown =
*device, IUnknown *pSuperior, UINT=0A=
if (SUCCEEDED(res)) {=0A=
*ppSurface =3D d3dSurface->wineD3DSurface;=0A=
d3dSurface->container =3D pSuperior;=0A=
- IUnknown_Release(d3dSurface->parentDevice);=0A=
+ IDirect3DDevice9Ex_Release(d3dSurface->parentDevice);=0A=
d3dSurface->parentDevice =3D NULL;=0A=
d3dSurface->forwardReference =3D pSuperior;=0A=
} else {=0A=
diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c=0A=
index b44c632..cb04b1f 100644=0A=
--- a/dlls/d3d9/directx.c=0A=
+++ b/dlls/d3d9/directx.c=0A=
@@ -31,7 +31,7 @@ static HRESULT WINAPI =
IDirect3D9Impl_QueryInterface(LPDIRECT3D9EX iface, REFIID=0A=
=0A=
if (IsEqualGUID(riid, &IID_IUnknown)=0A=
|| IsEqualGUID(riid, &IID_IDirect3D9)) {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3D9Ex_AddRef(iface);=0A=
*ppobj =3D This;=0A=
TRACE("Returning IDirect3D9 interface at %p\n", *ppobj);=0A=
return S_OK;=0A=
@@ -346,7 +346,7 @@ HRESULT WINAPI D3D9CB_CreateRenderTarget(IUnknown =
*device, IUnknown *pSuperior,=0A=
d3dSurface->container =3D pSuperior;=0A=
d3dSurface->isImplicit =3D TRUE;=0A=
/* Implicit surfaces are created with an refcount of 0 */=0A=
- IUnknown_Release((IUnknown *)d3dSurface);=0A=
+ IDirect3DSurface9_Release((IDirect3DSurface9 *)d3dSurface);=0A=
} else {=0A=
*ppSurface =3D NULL;=0A=
}=0A=
@@ -393,7 +393,7 @@ static HRESULT WINAPI =
D3D9CB_CreateAdditionalSwapChain(IUnknown *device,=0A=
*ppSwapChain =3D d3dSwapChain->wineD3DSwapChain;=0A=
d3dSwapChain->isImplicit =3D TRUE;=0A=
/* Implicit swap chains are created with an refcount of 0 */=0A=
- IUnknown_Release((IUnknown *)d3dSwapChain);=0A=
+ IDirect3DSwapChain9_Release((IDirect3DSwapChain9 =
*)d3dSwapChain);=0A=
} else {=0A=
*ppSwapChain =3D NULL;=0A=
}=0A=
@@ -444,7 +444,7 @@ HRESULT WINAPI =
D3D9CB_CreateDepthStencilSurface(IUnknown *device, IUnknown *pSup=0A=
d3dSurface->container =3D device;=0A=
d3dSurface->isImplicit =3D TRUE;=0A=
/* Implicit surfaces are created with an refcount of 0 */=0A=
- IUnknown_Release((IUnknown *)d3dSurface);=0A=
+ IDirect3DSurface9_Release((IDirect3DSurface9 *)d3dSurface);=0A=
}=0A=
return res;=0A=
}=0A=
diff --git a/dlls/d3d9/indexbuffer.c b/dlls/d3d9/indexbuffer.c=0A=
index 1193c6a..c1860ff 100644=0A=
--- a/dlls/d3d9/indexbuffer.c=0A=
+++ b/dlls/d3d9/indexbuffer.c=0A=
@@ -31,7 +31,7 @@ static HRESULT WINAPI =
IDirect3DIndexBuffer9Impl_QueryInterface(LPDIRECT3DINDEXBU=0A=
if (IsEqualGUID(riid, &IID_IUnknown)=0A=
|| IsEqualGUID(riid, &IID_IDirect3DResource9)=0A=
|| IsEqualGUID(riid, &IID_IDirect3DIndexBuffer9)) {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DIndexBuffer9_AddRef(iface);=0A=
*ppobj =3D This;=0A=
return S_OK;=0A=
}=0A=
@@ -60,7 +60,7 @@ static ULONG WINAPI =
IDirect3DIndexBuffer9Impl_Release(LPDIRECT3DINDEXBUFFER9 ifa=0A=
EnterCriticalSection(&d3d9_cs);=0A=
IWineD3DIndexBuffer_Release(This->wineD3DIndexBuffer);=0A=
LeaveCriticalSection(&d3d9_cs);=0A=
- IUnknown_Release(This->parentDevice);=0A=
+ IDirect3DDevice9Ex_Release(This->parentDevice);=0A=
HeapFree(GetProcessHeap(), 0, This);=0A=
}=0A=
return ref;=0A=
@@ -237,7 +237,7 @@ HRESULT WINAPI =
IDirect3DDevice9Impl_CreateIndexBuffer(LPDIRECT3DDEVICE9EX iface,=0A=
FIXME("(%p) call to IWineD3DDevice_CreateIndexBuffer failed\n", =
This);=0A=
HeapFree(GetProcessHeap(), 0, object);=0A=
} else {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DDevice9Ex_AddRef(iface);=0A=
object->parentDevice =3D iface;=0A=
*ppIndexBuffer =3D (LPDIRECT3DINDEXBUFFER9) object;=0A=
TRACE("(%p) : Created index buffer %p\n", This, object);=0A=
diff --git a/dlls/d3d9/pixelshader.c b/dlls/d3d9/pixelshader.c=0A=
index 919b5a7..059116a 100644=0A=
--- a/dlls/d3d9/pixelshader.c=0A=
+++ b/dlls/d3d9/pixelshader.c=0A=
@@ -30,7 +30,7 @@ static HRESULT WINAPI =
IDirect3DPixelShader9Impl_QueryInterface(LPDIRECT3DPIXELSH=0A=
=0A=
if (IsEqualGUID(riid, &IID_IUnknown)=0A=
|| IsEqualGUID(riid, &IID_IDirect3DPixelShader9)) {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DPixelShader9_AddRef(iface);=0A=
*ppobj =3D This;=0A=
return S_OK;=0A=
}=0A=
@@ -59,7 +59,7 @@ static ULONG WINAPI =
IDirect3DPixelShader9Impl_Release(LPDIRECT3DPIXELSHADER9 ifa=0A=
EnterCriticalSection(&d3d9_cs);=0A=
IWineD3DPixelShader_Release(This->wineD3DPixelShader);=0A=
LeaveCriticalSection(&d3d9_cs);=0A=
- IUnknown_Release(This->parentDevice);=0A=
+ IDirect3DDevice9Ex_Release(This->parentDevice);=0A=
HeapFree(GetProcessHeap(), 0, This);=0A=
}=0A=
return ref;=0A=
@@ -136,7 +136,7 @@ HRESULT WINAPI =
IDirect3DDevice9Impl_CreatePixelShader(LPDIRECT3DDEVICE9EX iface,=0A=
FIXME("(%p) call to IWineD3DDevice_CreatePixelShader failed\n", =
This);=0A=
HeapFree(GetProcessHeap(), 0 , object);=0A=
} else {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DDevice9Ex_AddRef(iface);=0A=
object->parentDevice =3D iface;=0A=
*ppShader =3D (IDirect3DPixelShader9*) object;=0A=
TRACE("(%p) : Created pixel shader %p\n", This, object);=0A=
diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c=0A=
index 9eeabc8..9a15164 100644=0A=
--- a/dlls/d3d9/query.c=0A=
+++ b/dlls/d3d9/query.c=0A=
@@ -32,7 +32,7 @@ static HRESULT WINAPI =
IDirect3DQuery9Impl_QueryInterface(LPDIRECT3DQUERY9 iface,=0A=
=0A=
if (IsEqualGUID(riid, &IID_IUnknown)=0A=
|| IsEqualGUID(riid, &IID_IDirect3DQuery9)) {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DQuery9_AddRef(iface);=0A=
*ppobj =3D This;=0A=
return S_OK;=0A=
}=0A=
@@ -60,7 +60,7 @@ static ULONG WINAPI =
IDirect3DQuery9Impl_Release(LPDIRECT3DQUERY9 iface) {=0A=
EnterCriticalSection(&d3d9_cs);=0A=
IWineD3DQuery_Release(This->wineD3DQuery);=0A=
LeaveCriticalSection(&d3d9_cs);=0A=
- IUnknown_Release(This->parentDevice);=0A=
+ IDirect3DDevice9Ex_Release(This->parentDevice);=0A=
HeapFree(GetProcessHeap(), 0, This);=0A=
}=0A=
return ref;=0A=
@@ -179,7 +179,7 @@ HRESULT WINAPI =
IDirect3DDevice9Impl_CreateQuery(LPDIRECT3DDEVICE9EX iface, D3DQU=0A=
FIXME("(%p) call to IWineD3DDevice_CreateQuery failed\n", This);=0A=
HeapFree(GetProcessHeap(), 0, object);=0A=
} else {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DDevice9Ex_AddRef(iface);=0A=
object->parentDevice =3D iface;=0A=
*ppQuery =3D (LPDIRECT3DQUERY9) object;=0A=
TRACE("(%p) : Created query %p\n", This , object);=0A=
diff --git a/dlls/d3d9/resource.c b/dlls/d3d9/resource.c=0A=
index d07d1da..fac2570 100644=0A=
--- a/dlls/d3d9/resource.c=0A=
+++ b/dlls/d3d9/resource.c=0A=
@@ -30,7 +30,7 @@ static HRESULT WINAPI =
IDirect3DResource9Impl_QueryInterface(LPDIRECT3DRESOURCE9=0A=
=0A=
if (IsEqualGUID(riid, &IID_IUnknown)=0A=
|| IsEqualGUID(riid, &IID_IDirect3DResource9)) {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DResource9_AddRef(iface);=0A=
*ppobj =3D This;=0A=
return S_OK;=0A=
}=0A=
diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c=0A=
index 89e992c..22e1926 100644=0A=
--- a/dlls/d3d9/stateblock.c=0A=
+++ b/dlls/d3d9/stateblock.c=0A=
@@ -31,7 +31,7 @@ static HRESULT WINAPI =
IDirect3DStateBlock9Impl_QueryInterface(LPDIRECT3DSTATEBLO=0A=
=0A=
if (IsEqualGUID(riid, &IID_IUnknown)=0A=
|| IsEqualGUID(riid, &IID_IDirect3DStateBlock9)) {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DStateBlock9_AddRef(iface);=0A=
*ppobj =3D This;=0A=
return S_OK;=0A=
}=0A=
@@ -58,9 +58,9 @@ static ULONG WINAPI =
IDirect3DStateBlock9Impl_Release(LPDIRECT3DSTATEBLOCK9 iface=0A=
=0A=
if (ref =3D=3D 0) {=0A=
EnterCriticalSection(&d3d9_cs);=0A=
- IWineD3DStateBlock_Release(This->wineD3DStateBlock); =0A=
+ IWineD3DStateBlock_Release(This->wineD3DStateBlock);=0A=
LeaveCriticalSection(&d3d9_cs);=0A=
- IUnknown_Release(This->parentDevice);=0A=
+ IDirect3DDevice9Ex_Release(This->parentDevice);=0A=
HeapFree(GetProcessHeap(), 0, This);=0A=
}=0A=
return ref;=0A=
@@ -140,7 +140,7 @@ HRESULT WINAPI =
IDirect3DDevice9Impl_CreateStateBlock(LPDIRECT3DDEVICE9EX iface,=0A=
FIXME("(%p) Call to IWineD3DDevice_CreateStateBlock failed.\n", =
This);=0A=
HeapFree(GetProcessHeap(), 0, object);=0A=
} else {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DDevice9Ex_AddRef(iface);=0A=
object->parentDevice =3D iface;=0A=
*ppStateBlock =3D (IDirect3DStateBlock9*)object;=0A=
TRACE("(%p) : Created stateblock %p\n", This, object);=0A=
@@ -185,7 +185,7 @@ HRESULT WINAPI =
IDirect3DDevice9Impl_EndStateBlock(LPDIRECT3DDEVICE9EX iface, I=0A=
object->lpVtbl =3D &Direct3DStateBlock9_Vtbl;=0A=
object->wineD3DStateBlock =3D wineD3DStateBlock;=0A=
=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DDevice9Ex_AddRef(iface);=0A=
object->parentDevice =3D iface;=0A=
*ppSB=3D(IDirect3DStateBlock9*)object;=0A=
TRACE("(%p)Returning %p %p\n", This, *ppSB, wineD3DStateBlock);=0A=
diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c=0A=
index 54558b4..bdede77 100644=0A=
--- a/dlls/d3d9/surface.c=0A=
+++ b/dlls/d3d9/surface.c=0A=
@@ -31,7 +31,7 @@ static HRESULT WINAPI =
IDirect3DSurface9Impl_QueryInterface(LPDIRECT3DSURFACE9 if=0A=
if (IsEqualGUID(riid, &IID_IUnknown)=0A=
|| IsEqualGUID(riid, &IID_IDirect3DResource9)=0A=
|| IsEqualGUID(riid, &IID_IDirect3DSurface9)) {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DSurface9_AddRef(iface);=0A=
*ppobj =3D This;=0A=
return S_OK;=0A=
}=0A=
@@ -53,7 +53,7 @@ static ULONG WINAPI =
IDirect3DSurface9Impl_AddRef(LPDIRECT3DSURFACE9 iface) {=0A=
} else {=0A=
/* No container, handle our own refcounting */=0A=
ULONG ref =3D InterlockedIncrement(&This->ref);=0A=
- if(ref =3D=3D 1 && This->parentDevice) =
IUnknown_AddRef(This->parentDevice);=0A=
+ if(ref =3D=3D 1 && This->parentDevice) =
IDirect3DDevice9Ex_AddRef(This->parentDevice);=0A=
TRACE("(%p) : AddRef from %d\n", This, ref - 1);=0A=
=0A=
return ref;=0A=
@@ -76,7 +76,7 @@ static ULONG WINAPI =
IDirect3DSurface9Impl_Release(LPDIRECT3DSURFACE9 iface) {=0A=
TRACE("(%p) : ReleaseRef to %d\n", This, ref);=0A=
=0A=
if (ref =3D=3D 0) {=0A=
- if (This->parentDevice) =
IUnknown_Release(This->parentDevice);=0A=
+ if (This->parentDevice) =
IDirect3DDevice9Ex_Release(This->parentDevice);=0A=
if (!This->isImplicit) {=0A=
EnterCriticalSection(&d3d9_cs);=0A=
IWineD3DSurface_Release(This->wineD3DSurface);=0A=
diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c=0A=
index 6d12a00..eabe366 100644=0A=
--- a/dlls/d3d9/swapchain.c=0A=
+++ b/dlls/d3d9/swapchain.c=0A=
@@ -32,7 +32,7 @@ static HRESULT WINAPI =
IDirect3DSwapChain9Impl_QueryInterface(LPDIRECT3DSWAPCHAIN=0A=
=0A=
if (IsEqualGUID(riid, &IID_IUnknown)=0A=
|| IsEqualGUID(riid, &IID_IDirect3DSwapChain9)) {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DSwapChain9_AddRef(iface);=0A=
*ppobj =3D This;=0A=
return S_OK;=0A=
}=0A=
@@ -48,7 +48,7 @@ static ULONG WINAPI =
IDirect3DSwapChain9Impl_AddRef(LPDIRECT3DSWAPCHAIN9 iface) {=0A=
=0A=
TRACE("(%p) : AddRef from %d\n", This, ref - 1);=0A=
=0A=
- if(ref =3D=3D 1 && This->parentDevice) =
IUnknown_AddRef(This->parentDevice);=0A=
+ if(ref =3D=3D 1 && This->parentDevice) =
IDirect3DDevice9Ex_AddRef(This->parentDevice);=0A=
=0A=
return ref;=0A=
}=0A=
@@ -60,7 +60,7 @@ static ULONG WINAPI =
IDirect3DSwapChain9Impl_Release(LPDIRECT3DSWAPCHAIN9 iface)=0A=
TRACE("(%p) : ReleaseRef to %d\n", This, ref);=0A=
=0A=
if (ref =3D=3D 0) {=0A=
- if (This->parentDevice) IUnknown_Release(This->parentDevice);=0A=
+ if (This->parentDevice) =
IDirect3DDevice9Ex_Release(This->parentDevice);=0A=
if (!This->isImplicit) {=0A=
EnterCriticalSection(&d3d9_cs);=0A=
IWineD3DSwapChain_Destroy(This->wineD3DSwapChain, =
D3D9CB_DestroyRenderTarget);=0A=
@@ -251,7 +251,7 @@ HRESULT WINAPI =
IDirect3DDevice9Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE=0A=
FIXME("(%p) call to IWineD3DDevice_CreateSwapChain failed\n", =
This);=0A=
HeapFree(GetProcessHeap(), 0 , object);=0A=
} else {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DDevice9Ex_AddRef(iface);=0A=
object->parentDevice =3D iface;=0A=
*pSwapChain =3D (IDirect3DSwapChain9 *)object;=0A=
TRACE("(%p) : Created swapchain %p\n", This, *pSwapChain);=0A=
diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c=0A=
index a8a525a..71e1be3 100644=0A=
--- a/dlls/d3d9/texture.c=0A=
+++ b/dlls/d3d9/texture.c=0A=
@@ -33,7 +33,7 @@ static HRESULT WINAPI =
IDirect3DTexture9Impl_QueryInterface(LPDIRECT3DTEXTURE9 if=0A=
|| IsEqualGUID(riid, &IID_IDirect3DResource9)=0A=
|| IsEqualGUID(riid, &IID_IDirect3DBaseTexture9)=0A=
|| IsEqualGUID(riid, &IID_IDirect3DTexture9)) {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DTexture9_AddRef(iface);=0A=
*ppobj =3D This;=0A=
return S_OK;=0A=
}=0A=
@@ -62,7 +62,7 @@ static ULONG WINAPI =
IDirect3DTexture9Impl_Release(LPDIRECT3DTEXTURE9 iface) {=0A=
EnterCriticalSection(&d3d9_cs);=0A=
IWineD3DTexture_Destroy(This->wineD3DTexture, =
D3D9CB_DestroySurface);=0A=
LeaveCriticalSection(&d3d9_cs);=0A=
- IUnknown_Release(This->parentDevice);=0A=
+ IDirect3DDevice9Ex_Release(This->parentDevice);=0A=
HeapFree(GetProcessHeap(), 0, This);=0A=
}=0A=
return ref;=0A=
@@ -356,7 +356,7 @@ HRESULT WINAPI =
IDirect3DDevice9Impl_CreateTexture(LPDIRECT3DDEVICE9EX iface, U=0A=
FIXME("(%p) call to IWineD3DDevice_CreateTexture failed\n", =
This);=0A=
HeapFree(GetProcessHeap(), 0, object);=0A=
} else {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DDevice9Ex_AddRef(iface);=0A=
object->parentDevice =3D iface;=0A=
*ppTexture=3D (LPDIRECT3DTEXTURE9) object;=0A=
TRACE("(%p) Created Texture %p, %p\n", This, object, =
object->wineD3DTexture);=0A=
diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c=0A=
index 12ecd0b..002052e 100644=0A=
--- a/dlls/d3d9/vertexbuffer.c=0A=
+++ b/dlls/d3d9/vertexbuffer.c=0A=
@@ -32,7 +32,7 @@ static HRESULT WINAPI =
IDirect3DVertexBuffer9Impl_QueryInterface(LPDIRECT3DVERTEX=0A=
if (IsEqualGUID(riid, &IID_IUnknown)=0A=
|| IsEqualGUID(riid, &IID_IDirect3DResource9)=0A=
|| IsEqualGUID(riid, &IID_IDirect3DVertexBuffer9)) {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DVertexBuffer9_AddRef(iface);=0A=
*ppobj =3D This;=0A=
return S_OK;=0A=
}=0A=
@@ -61,7 +61,7 @@ static ULONG WINAPI =
IDirect3DVertexBuffer9Impl_Release(LPDIRECT3DVERTEXBUFFER9 i=0A=
EnterCriticalSection(&d3d9_cs);=0A=
IWineD3DVertexBuffer_Release(This->wineD3DVertexBuffer);=0A=
LeaveCriticalSection(&d3d9_cs);=0A=
- IUnknown_Release(This->parentDevice);=0A=
+ IDirect3DDevice9Ex_Release(This->parentDevice);=0A=
HeapFree(GetProcessHeap(), 0, This);=0A=
}=0A=
return ref;=0A=
@@ -234,7 +234,7 @@ HRESULT WINAPI =
IDirect3DDevice9Impl_CreateVertexBuffer(LPDIRECT3DDEVICE9EX iface=0A=
WARN("(%p) call to IWineD3DDevice_CreateVertexBuffer failed\n", =
This);=0A=
HeapFree(GetProcessHeap(), 0, object);=0A=
} else {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DDevice9Ex_AddRef(iface);=0A=
object->parentDevice =3D iface;=0A=
TRACE("(%p) : Created vertex buffer %p\n", This, object);=0A=
*ppVertexBuffer =3D (LPDIRECT3DVERTEXBUFFER9) object;=0A=
diff --git a/dlls/d3d9/vertexdeclaration.c =
b/dlls/d3d9/vertexdeclaration.c=0A=
index 327c741..42b46ce 100644=0A=
--- a/dlls/d3d9/vertexdeclaration.c=0A=
+++ b/dlls/d3d9/vertexdeclaration.c=0A=
@@ -187,7 +187,7 @@ static HRESULT WINAPI =
IDirect3DVertexDeclaration9Impl_QueryInterface(LPDIRECT3DV=0A=
=0A=
if (IsEqualGUID(riid, &IID_IUnknown)=0A=
|| IsEqualGUID(riid, &IID_IDirect3DVertexDeclaration9)) {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DVertexDeclaration9_AddRef(iface);=0A=
*ppobj =3D This;=0A=
return S_OK;=0A=
}=0A=
@@ -204,7 +204,7 @@ static ULONG WINAPI =
IDirect3DVertexDeclaration9Impl_AddRef(LPDIRECT3DVERTEXDECLA=0A=
TRACE("(%p) : AddRef from %d\n", This, ref - 1);=0A=
=0A=
if(ref =3D=3D 1) {=0A=
- IUnknown_AddRef(This->parentDevice);=0A=
+ IDirect3DDevice9Ex_AddRef(This->parentDevice);=0A=
}=0A=
=0A=
return ref;=0A=
@@ -236,7 +236,7 @@ static ULONG WINAPI =
IDirect3DVertexDeclaration9Impl_Release(LPDIRECT3DVERTEXDECL=0A=
if(!This->convFVF) {=0A=
IDirect3DVertexDeclaration9Impl_Release(iface);=0A=
}=0A=
- IUnknown_Release(parentDevice);=0A=
+ IDirect3DDevice9Ex_Release(parentDevice);=0A=
}=0A=
return ref;=0A=
}=0A=
@@ -374,7 +374,7 @@ HRESULT WINAPI =
IDirect3DDevice9Impl_CreateVertexDeclaration(LPDIRECT3DDEVICE9E=0A=
} else {=0A=
object->parentDevice =3D iface;=0A=
*ppDecl =3D (LPDIRECT3DVERTEXDECLARATION9) object;=0A=
- IUnknown_AddRef(*ppDecl);=0A=
+ IDirect3DVertexDeclaration9_AddRef(*ppDecl);=0A=
TRACE("(%p) : Created vertex declaration %p\n", This, object);=0A=
}=0A=
return hr;=0A=
diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c=0A=
index abe283d..66ce286 100644=0A=
--- a/dlls/d3d9/vertexshader.c=0A=
+++ b/dlls/d3d9/vertexshader.c=0A=
@@ -30,7 +30,7 @@ static HRESULT WINAPI =
IDirect3DVertexShader9Impl_QueryInterface(LPDIRECT3DVERTEX=0A=
=0A=
if (IsEqualGUID(riid, &IID_IUnknown)=0A=
|| IsEqualGUID(riid, &IID_IDirect3DVertexShader9)) {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DVertexShader9_AddRef(iface);=0A=
*ppobj =3D This;=0A=
return S_OK;=0A=
}=0A=
@@ -59,7 +59,7 @@ static ULONG WINAPI =
IDirect3DVertexShader9Impl_Release(LPDIRECT3DVERTEXSHADER9 i=0A=
EnterCriticalSection(&d3d9_cs);=0A=
IWineD3DVertexShader_Release(This->wineD3DVertexShader);=0A=
LeaveCriticalSection(&d3d9_cs);=0A=
- IUnknown_Release(This->parentDevice);=0A=
+ IDirect3DDevice9Ex_Release(This->parentDevice);=0A=
HeapFree(GetProcessHeap(), 0, This);=0A=
}=0A=
return ref;=0A=
@@ -135,7 +135,7 @@ HRESULT WINAPI =
IDirect3DDevice9Impl_CreateVertexShader(LPDIRECT3DDEVICE9EX iface=0A=
FIXME("Call to IWineD3DDevice_CreateVertexShader failed\n");=0A=
HeapFree(GetProcessHeap(), 0, object);=0A=
}else{=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DDevice9Ex_AddRef(iface);=0A=
object->parentDevice =3D iface;=0A=
*ppShader =3D (IDirect3DVertexShader9 *)object;=0A=
TRACE("(%p) : Created vertex shader %p\n", This, object);=0A=
diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c=0A=
index 2af611d..80146f9 100644=0A=
--- a/dlls/d3d9/volume.c=0A=
+++ b/dlls/d3d9/volume.c=0A=
@@ -30,7 +30,7 @@ static HRESULT WINAPI =
IDirect3DVolume9Impl_QueryInterface(LPDIRECT3DVOLUME9 ifac=0A=
=0A=
if (IsEqualGUID(riid, &IID_IUnknown)=0A=
|| IsEqualGUID(riid, &IID_IDirect3DVolume9)) {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DVolume9_AddRef(iface);=0A=
*ppobj =3D This;=0A=
return S_OK;=0A=
}=0A=
diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c=0A=
index 28a7460..3069771 100644=0A=
--- a/dlls/d3d9/volumetexture.c=0A=
+++ b/dlls/d3d9/volumetexture.c=0A=
@@ -32,7 +32,7 @@ static HRESULT WINAPI =
IDirect3DVolumeTexture9Impl_QueryInterface(LPDIRECT3DVOLUM=0A=
|| IsEqualGUID(riid, &IID_IDirect3DResource9)=0A=
|| IsEqualGUID(riid, &IID_IDirect3DBaseTexture9)=0A=
|| IsEqualGUID(riid, &IID_IDirect3DVolumeTexture9)) {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DVolumeTexture9_AddRef(iface);=0A=
*ppobj =3D This;=0A=
return S_OK;=0A=
}=0A=
@@ -59,7 +59,7 @@ static ULONG WINAPI =
IDirect3DVolumeTexture9Impl_Release(LPDIRECT3DVOLUMETEXTURE9=0A=
=0A=
if (ref =3D=3D 0) {=0A=
IWineD3DVolumeTexture_Destroy(This->wineD3DVolumeTexture, =
D3D9CB_DestroyVolume);=0A=
- IUnknown_Release(This->parentDevice);=0A=
+ IDirect3DDevice9Ex_Release(This->parentDevice);=0A=
HeapFree(GetProcessHeap(), 0, This);=0A=
}=0A=
return ref;=0A=
@@ -269,7 +269,7 @@ HRESULT WINAPI =
IDirect3DDevice9Impl_CreateVolumeTexture(LPDIRECT3DDEVICE9EX if=0A=
FIXME("(%p) call to IWineD3DDevice_CreateVolumeTexture =
failed\n", This);=0A=
HeapFree(GetProcessHeap(), 0, object);=0A=
} else {=0A=
- IUnknown_AddRef(iface);=0A=
+ IDirect3DDevice9Ex_AddRef(iface);=0A=
object->parentDevice =3D iface;=0A=
*ppVolumeTexture =3D (LPDIRECT3DVOLUMETEXTURE9) object;=0A=
TRACE("(%p) : Created volume texture %p\n", This, object);=0A=
-- =0A=
1.5.6.4=0A=
=0A=
------=_NextPart_000_0001_01C93DE3.87946650--
More information about the wine-patches
mailing list