ddraw: Rename device_from_device2 to impl_from_IDirect3DDevice2.

1c045cbb · Ričardas Barkauskas · Alexandre Julliard · a870753d · 1c045cbb · 1c045cbb
Commit 1c045cbb authored Oct 17, 2011 by Ričardas Barkauskas Committed by Alexandre Julliard Oct 17, 2011
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

ddraw_private.h dlls/ddraw/ddraw_private.h +2 -2

device.c dlls/ddraw/device.c +0 -0

No files found.
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -330,9 +330,9 @@ static inline IDirect3DDeviceImpl *impl_from_IDirect3DDevice(IDirect3DDevice *if
    return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice_iface);
 }

-static inline IDirect3DDeviceImpl *device_from_device2(IDirect3DDevice2 *iface)
+static inline IDirect3DDeviceImpl *impl_from_IDirect3DDevice2(IDirect3DDevice2 *iface)
 {
-    return (IDirect3DDeviceImpl *)((char*)iface - FIELD_OFFSET(IDirect3DDeviceImpl, IDirect3DDevice2_vtbl));
+    return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice2_vtbl);
 }

 static inline IDirect3DDeviceImpl *device_from_device3(IDirect3DDevice3 *iface)

--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c