=?UTF-8?Q?Ri=C4=8Dardas=20Barkauskas=20?=: ddraw: Use unsafe_impl_from_IDirect3DDevice2 for application provided interfaces.
Alexandre Julliard
julliard at winehq.org
Mon Oct 17 13:08:56 CDT 2011
Module: wine
Branch: master
Commit: a870753dba5e14191cbbaeb585cc3909ce25dd62
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a870753dba5e14191cbbaeb585cc3909ce25dd62
Author: Ričardas Barkauskas <rbarkauskas at codeweavers.com>
Date: Mon Oct 17 16:57:19 2011 +0300
ddraw: Use unsafe_impl_from_IDirect3DDevice2 for application provided interfaces.
---
dlls/ddraw/ddraw_private.h | 1 +
dlls/ddraw/device.c | 7 +++++++
dlls/ddraw/material.c | 9 +++++----
dlls/ddraw/surface.c | 3 ++-
4 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index 39b103b..c8553c2 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -341,6 +341,7 @@ static inline IDirect3DDeviceImpl *device_from_device3(IDirect3DDevice3 *iface)
}
IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface) DECLSPEC_HIDDEN;
+IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice2(IDirect3DDevice2 *iface) DECLSPEC_HIDDEN;
/*****************************************************************************
* IDirectDrawClipper implementation structure
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index 37a778b..4d109e4 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -6737,6 +6737,13 @@ static const struct IDirect3DDeviceVtbl d3d_device1_vtbl =
IDirect3DDeviceImpl_1_GetDirect3D
};
+IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice2(IDirect3DDevice2 *iface)
+{
+ if (!iface) return NULL;
+ assert(iface->lpVtbl == &d3d_device2_vtbl);
+ return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice2_vtbl);
+}
+
IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface)
{
if (!iface) return NULL;
diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c
index f873726..236b647 100644
--- a/dlls/ddraw/material.c
+++ b/dlls/ddraw/material.c
@@ -324,14 +324,15 @@ static HRESULT WINAPI IDirect3DMaterialImpl_GetHandle(IDirect3DMaterial3 *iface,
}
static HRESULT WINAPI IDirect3DMaterialImpl_2_GetHandle(IDirect3DMaterial2 *iface,
- IDirect3DDevice2 *lpDirect3DDevice2, D3DMATERIALHANDLE *lpHandle)
+ IDirect3DDevice2 *device, D3DMATERIALHANDLE *handle)
{
IDirect3DMaterialImpl *This = impl_from_IDirect3DMaterial2(iface);
+ IDirect3DDeviceImpl *device_impl = unsafe_impl_from_IDirect3DDevice2(device);
- TRACE("iface %p, device %p, handle %p.\n", iface, lpDirect3DDevice2, lpHandle);
+ TRACE("iface %p, device %p, handle %p.\n", iface, device, handle);
- return IDirect3DMaterial3_GetHandle(&This->IDirect3DMaterial3_iface, lpDirect3DDevice2 ?
- (IDirect3DDevice3 *)&device_from_device2(lpDirect3DDevice2)->IDirect3DDevice3_vtbl : NULL, lpHandle);
+ return IDirect3DMaterial3_GetHandle(&This->IDirect3DMaterial3_iface, device_impl ?
+ (IDirect3DDevice3 *)&device_impl->IDirect3DDevice3_vtbl : NULL, handle);
}
static HRESULT WINAPI IDirect3DMaterialImpl_1_GetHandle(IDirect3DMaterial *iface,
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index beb759f..9ef33b3 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -4521,6 +4521,7 @@ static HRESULT WINAPI d3d_texture2_GetHandle(IDirect3DTexture2 *iface,
IDirect3DDevice2 *device, D3DTEXTUREHANDLE *handle)
{
IDirectDrawSurfaceImpl *surface = impl_from_IDirect3DTexture2(iface);
+ IDirect3DDeviceImpl *device_impl = unsafe_impl_from_IDirect3DDevice2(device);
TRACE("iface %p, device %p, handle %p.\n", iface, device, handle);
@@ -4528,7 +4529,7 @@ static HRESULT WINAPI d3d_texture2_GetHandle(IDirect3DTexture2 *iface,
if (!surface->Handle)
{
- DWORD h = ddraw_allocate_handle(&device_from_device2(device)->handle_table, surface, DDRAW_HANDLE_SURFACE);
+ DWORD h = ddraw_allocate_handle(&device_impl->handle_table, surface, DDRAW_HANDLE_SURFACE);
if (h == DDRAW_INVALID_HANDLE)
{
ERR("Failed to allocate a texture handle.\n");
More information about the wine-cvs
mailing list