Module: wine Branch: master Commit: e42e5247dd3548936d938897d865efc885e479ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=e42e5247dd3548936d938897d8...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Mon Jan 17 18:49:29 2011 +0100
wined3d: Pass an IWineD3DResourceImpl pointer to wined3d_rendertarget_view_init().
---
dlls/wined3d/device.c | 2 +- dlls/wined3d/view.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a225e53..a099c90 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1088,7 +1088,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateRendertargetView(IWineD3DDevice * return E_OUTOFMEMORY; }
- wined3d_rendertarget_view_init(object, resource, parent); + wined3d_rendertarget_view_init(object, (IWineD3DResourceImpl *)resource, parent);
TRACE("Created render target view %p.\n", object); *rendertarget_view = (IWineD3DRendertargetView *)object; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index e4e40fc..28dc401 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -107,11 +107,11 @@ static const struct IWineD3DRendertargetViewVtbl wined3d_rendertarget_view_vtbl };
void wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *view, - IWineD3DResource *resource, void *parent) + struct IWineD3DResourceImpl *resource, void *parent) { view->vtbl = &wined3d_rendertarget_view_vtbl; view->refcount = 1; - IWineD3DResource_AddRef(resource); - view->resource = resource; + IWineD3DResource_AddRef((IWineD3DResource *)resource); + view->resource = (IWineD3DResource *)resource; view->parent = parent; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fb39dad..e53d1a1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2574,7 +2574,7 @@ struct wined3d_rendertarget_view };
void wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *view, - IWineD3DResource *resource, void *parent) DECLSPEC_HIDDEN; + struct IWineD3DResourceImpl *resource, void *parent) DECLSPEC_HIDDEN;
/***************************************************************************** * IWineD3DSwapChainImpl implementation structure (extends IUnknown)