From: Aaryaman Vasishta Subject: [PATCH 1/3] d3drm: Thunk relevant IDirect3DRMDevice2 stubs to version 3. Message-Id: <1437477898-59211-1-git-send-email-jem456.vasishta@gmail.com> Date: Tue, 21 Jul 2015 16:54:56 +0530 --- dlls/d3drm/device.c | 72 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 24 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 4bea11c..f878188 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -83,53 +83,60 @@ static ULONG WINAPI d3drm_device2_Release(IDirect3DRMDevice2 *iface) static HRESULT WINAPI d3drm_device2_Clone(IDirect3DRMDevice2 *iface, IUnknown *outer, REFIID iid, void **out) { + struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); FIXME("iface %p, outer %p, iid %s, out %p stub!\n", iface, outer, debugstr_guid(iid), out); - return E_NOTIMPL; + return IDirect3DRMDevice3_Clone(&device->IDirect3DRMDevice3_iface, outer, iid, out); } static HRESULT WINAPI d3drm_device2_AddDestroyCallback(IDirect3DRMDevice2 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { + struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); - return E_NOTIMPL; + return IDirect3DRMDevice3_AddDestroyCallback(&device->IDirect3DRMDevice3_iface, cb, ctx); } static HRESULT WINAPI d3drm_device2_DeleteDestroyCallback(IDirect3DRMDevice2 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { + struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); - return E_NOTIMPL; + return IDirect3DRMDevice3_DeleteDestroyCallback(&device->IDirect3DRMDevice3_iface, cb, ctx); } static HRESULT WINAPI d3drm_device2_SetAppData(IDirect3DRMDevice2 *iface, DWORD data) { + struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); FIXME("iface %p, data %#x stub!\n", iface, data); - return E_NOTIMPL; + return IDirect3DRMDevice3_SetAppData(&device->IDirect3DRMDevice3_iface, data); } static DWORD WINAPI d3drm_device2_GetAppData(IDirect3DRMDevice2 *iface) { + struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); FIXME("iface %p stub!\n", iface); - return 0; + return IDirect3DRMDevice3_GetAppData(&device->IDirect3DRMDevice3_iface); } static HRESULT WINAPI d3drm_device2_SetName(IDirect3DRMDevice2 *iface, const char *name) { + struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name)); - return E_NOTIMPL; + return IDirect3DRMDevice3_SetName(&device->IDirect3DRMDevice3_iface, name); } static HRESULT WINAPI d3drm_device2_GetName(IDirect3DRMDevice2 *iface, DWORD *size, char *name) { + struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); FIXME("iface %p, size %p, name %p stub!\n", iface, size, name); - return E_NOTIMPL; + return IDirect3DRMDevice3_GetName(&device->IDirect3DRMDevice3_iface, size, name); } static HRESULT WINAPI d3drm_device2_GetClassName(IDirect3DRMDevice2 *iface, DWORD *size, char *name) @@ -153,9 +160,10 @@ static HRESULT WINAPI d3drm_device2_Init(IDirect3DRMDevice2 *iface, ULONG width, static HRESULT WINAPI d3drm_device2_InitFromD3D(IDirect3DRMDevice2 *iface, IDirect3D *d3d, IDirect3DDevice *d3d_device) { + struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); FIXME("iface %p, d3d %p, d3d_device %p stub!\n", iface, d3d, d3d_device); - return E_NOTIMPL; + return IDirect3DRMDevice3_InitFromD3D(&device->IDirect3DRMDevice3_iface, d3d, d3d_device); } static HRESULT WINAPI d3drm_device2_InitFromClipper(IDirect3DRMDevice2 *iface, @@ -195,16 +203,18 @@ static HRESULT WINAPI d3drm_device2_DeleteUpdateCallback(IDirect3DRMDevice2 *ifa static HRESULT WINAPI d3drm_device2_SetBufferCount(IDirect3DRMDevice2 *iface, DWORD count) { + struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); FIXME("iface %p, count %u.\n", iface, count); - return E_NOTIMPL; + return IDirect3DRMDevice3_SetBufferCount(&device->IDirect3DRMDevice3_iface, count); } static DWORD WINAPI d3drm_device2_GetBufferCount(IDirect3DRMDevice2 *iface) { + struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + return IDirect3DRMDevice3_GetBufferCount(&device->IDirect3DRMDevice3_iface); } static HRESULT WINAPI d3drm_device2_SetDither(IDirect3DRMDevice2 *iface, BOOL enable) @@ -218,9 +228,10 @@ static HRESULT WINAPI d3drm_device2_SetDither(IDirect3DRMDevice2 *iface, BOOL en static HRESULT WINAPI d3drm_device2_SetShades(IDirect3DRMDevice2 *iface, DWORD count) { + struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); FIXME("iface %p, count %u stub!\n", iface, count); - return E_NOTIMPL; + return IDirect3DRMDevice3_SetShades(&device->IDirect3DRMDevice3_iface, count); } static HRESULT WINAPI d3drm_device2_SetQuality(IDirect3DRMDevice2 *iface, D3DRMRENDERQUALITY quality) @@ -234,16 +245,18 @@ static HRESULT WINAPI d3drm_device2_SetQuality(IDirect3DRMDevice2 *iface, D3DRMR static HRESULT WINAPI d3drm_device2_SetTextureQuality(IDirect3DRMDevice2 *iface, D3DRMTEXTUREQUALITY quality) { + struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); FIXME("iface %p, quality %u stub!\n", iface, quality); - return E_NOTIMPL; + return IDirect3DRMDevice3_SetTextureQuality(&device->IDirect3DRMDevice3_iface, quality); } static HRESULT WINAPI d3drm_device2_GetViewports(IDirect3DRMDevice2 *iface, IDirect3DRMViewportArray **array) { + struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); FIXME("iface %p, array %p stub!\n", iface, array); - return E_NOTIMPL; + return IDirect3DRMDevice3_GetViewports(&device->IDirect3DRMDevice3_iface, array); } static BOOL WINAPI d3drm_device2_GetDither(IDirect3DRMDevice2 *iface) @@ -257,9 +270,10 @@ static BOOL WINAPI d3drm_device2_GetDither(IDirect3DRMDevice2 *iface) static DWORD WINAPI d3drm_device2_GetShades(IDirect3DRMDevice2 *iface) { + struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + return IDirect3DRMDevice3_GetShades(&device->IDirect3DRMDevice3_iface); } static DWORD WINAPI d3drm_device2_GetHeight(IDirect3DRMDevice2 *iface) @@ -282,16 +296,18 @@ static DWORD WINAPI d3drm_device2_GetWidth(IDirect3DRMDevice2 *iface) static DWORD WINAPI d3drm_device2_GetTrianglesDrawn(IDirect3DRMDevice2 *iface) { + struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + return IDirect3DRMDevice3_GetTrianglesDrawn(&device->IDirect3DRMDevice3_iface); } static DWORD WINAPI d3drm_device2_GetWireframeOptions(IDirect3DRMDevice2 *iface) { + struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + return IDirect3DRMDevice3_GetWireframeOptions(&device->IDirect3DRMDevice3_iface); } static D3DRMRENDERQUALITY WINAPI d3drm_device2_GetQuality(IDirect3DRMDevice2 *iface) @@ -305,40 +321,45 @@ static D3DRMRENDERQUALITY WINAPI d3drm_device2_GetQuality(IDirect3DRMDevice2 *if static D3DCOLORMODEL WINAPI d3drm_device2_GetColorModel(IDirect3DRMDevice2 *iface) { + struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + return IDirect3DRMDevice3_GetColorModel(&device->IDirect3DRMDevice3_iface); } static D3DRMTEXTUREQUALITY WINAPI d3drm_device2_GetTextureQuality(IDirect3DRMDevice2 *iface) { + struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + return IDirect3DRMDevice3_GetTextureQuality(&device->IDirect3DRMDevice3_iface); } static HRESULT WINAPI d3drm_device2_GetDirect3DDevice(IDirect3DRMDevice2 *iface, IDirect3DDevice **d3d_device) { + struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); FIXME("iface %p, d3d_device %p stub!\n", iface, d3d_device); - return E_NOTIMPL; + return IDirect3DRMDevice3_GetDirect3DDevice(&device->IDirect3DRMDevice3_iface, d3d_device); } static HRESULT WINAPI d3drm_device2_InitFromD3D2(IDirect3DRMDevice2 *iface, IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device) { + struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); FIXME("iface %p, d3d %p, d3d_device %p stub!\n", iface, d3d, d3d_device); - return E_NOTIMPL; + return IDirect3DRMDevice3_InitFromD3D2(&device->IDirect3DRMDevice3_iface, d3d, d3d_device); } static HRESULT WINAPI d3drm_device2_InitFromSurface(IDirect3DRMDevice2 *iface, GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *backbuffer) { + struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); FIXME("iface %p, guid %s, ddraw %p, backbuffer %p stub!\n", iface, debugstr_guid(guid), ddraw, backbuffer); - return E_NOTIMPL; + return IDirect3DRMDevice3_InitFromSurface(&device->IDirect3DRMDevice3_iface, guid, ddraw, backbuffer); } static HRESULT WINAPI d3drm_device2_SetRenderMode(IDirect3DRMDevice2 *iface, DWORD flags) @@ -361,9 +382,10 @@ static DWORD WINAPI d3drm_device2_GetRenderMode(IDirect3DRMDevice2 *iface) static HRESULT WINAPI d3drm_device2_GetDirect3DDevice2(IDirect3DRMDevice2 *iface, IDirect3DDevice2 **d3d_device) { + struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); FIXME("iface %p, d3d_device %p stub!\n", iface, d3d_device); - return E_NOTIMPL; + return IDirect3DRMDevice3_GetDirect3DDevice2(&device->IDirect3DRMDevice3_iface, d3d_device); } static const struct IDirect3DRMDevice2Vtbl d3drm_device2_vtbl = @@ -915,16 +937,18 @@ static DWORD WINAPI d3drm_device_win_GetAppData(IDirect3DRMWinDevice *iface) static HRESULT WINAPI d3drm_device_win_SetName(IDirect3DRMWinDevice *iface, const char *name) { + struct d3drm_device *device = impl_from_IDirect3DRMWinDevice(iface); FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name)); - return E_NOTIMPL; + return IDirect3DRMDevice3_SetName(&device->IDirect3DRMDevice3_iface, name); } static HRESULT WINAPI d3drm_device_win_GetName(IDirect3DRMWinDevice *iface, DWORD *size, char *name) { + struct d3drm_device *device = impl_from_IDirect3DRMWinDevice(iface); FIXME("iface %p, size %p, name %p stub!\n", iface, size, name); - return E_NOTIMPL; + return IDirect3DRMDevice3_GetName(&device->IDirect3DRMDevice3_iface, size, name); } static HRESULT WINAPI d3drm_device_win_GetClassName(IDirect3DRMWinDevice *iface, DWORD *size, char *name) -- 2.3.2 (Apple Git-55)