Module: wine Branch: master Commit: 55ee76431ccb593ae19e98e255406cff65a36b00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55ee76431ccb593ae19e98e255...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Tue Nov 20 22:40:19 2012 +0100
d3drm: Avoid LPDIRECT3DDEVICE2.
---
dlls/d3drm/d3drm.c | 10 ++++------ dlls/d3drm/device.c | 18 ++++++++---------- include/d3drm.h | 6 ++++-- include/d3drmobj.h | 8 ++++---- 4 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index e90ce30..dd33a2f 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -629,9 +629,8 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromSurface(IDirect3DRM2 *ifa return Direct3DRMDevice_create(&IID_IDirect3DRMDevice2, (IUnknown**)ppDevice); }
-static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromD3D(IDirect3DRM2* iface, LPDIRECT3D2 pD3D, - LPDIRECT3DDEVICE2 pD3DDev, - LPDIRECT3DRMDEVICE2 * ppDevice) +static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromD3D(IDirect3DRM2 *iface, + IDirect3D2 *pD3D, IDirect3DDevice2 *pD3DDev, IDirect3DRMDevice2 **ppDevice) { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface);
@@ -1073,9 +1072,8 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromSurface(IDirect3DRM3 *ifa return Direct3DRMDevice_create(&IID_IDirect3DRMDevice3, (IUnknown**)device); }
-static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromD3D(IDirect3DRM3* iface, LPDIRECT3D2 d3d, - LPDIRECT3DDEVICE2 d3ddev, - LPDIRECT3DRMDEVICE3* device) +static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromD3D(IDirect3DRM3 *iface, + IDirect3D2 *d3d, IDirect3DDevice2 *d3ddev, IDirect3DRMDevice3 **device) { IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface);
diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 05ca080..5d2b249 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -421,9 +421,8 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_GetDirect3DDevice(IDirect3DRMDevice return E_NOTIMPL; }
-static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromD3D2(IDirect3DRMDevice2* iface, - LPDIRECT3D2 lpD3D, - LPDIRECT3DDEVICE2 lpD3DDev) +static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromD3D2(IDirect3DRMDevice2 *iface, + IDirect3D2 *lpD3D, IDirect3DDevice2 *lpD3DDev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface);
@@ -460,8 +459,8 @@ static DWORD WINAPI IDirect3DRMDevice2Impl_GetRenderMode(IDirect3DRMDevice2* ifa return IDirect3DRMDevice3_GetRenderMode(&This->IDirect3DRMDevice3_iface); }
-static HRESULT WINAPI IDirect3DRMDevice2Impl_GetDirect3DDevice2(IDirect3DRMDevice2* iface, - LPDIRECT3DDEVICE2 * dev) +static HRESULT WINAPI IDirect3DRMDevice2Impl_GetDirect3DDevice2(IDirect3DRMDevice2 *iface, + IDirect3DDevice2 **dev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface);
@@ -856,9 +855,8 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_GetDirect3DDevice(IDirect3DRMDevice }
/*** IDirect3DRMDevice2 methods ***/ -static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromD3D2(IDirect3DRMDevice3* iface, - LPDIRECT3D2 lpD3D, - LPDIRECT3DDEVICE2 lpD3DDev) +static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromD3D2(IDirect3DRMDevice3 *iface, + IDirect3D2 *lpD3D, IDirect3DDevice2 *lpD3DDev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface);
@@ -897,8 +895,8 @@ static DWORD WINAPI IDirect3DRMDevice3Impl_GetRenderMode(IDirect3DRMDevice3* ifa return This->rendermode; }
-static HRESULT WINAPI IDirect3DRMDevice3Impl_GetDirect3DDevice2(IDirect3DRMDevice3* iface, - LPDIRECT3DDEVICE2 * dev) +static HRESULT WINAPI IDirect3DRMDevice3Impl_GetDirect3DDevice2(IDirect3DRMDevice3 *iface, + IDirect3DDevice2 **dev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface);
diff --git a/include/d3drm.h b/include/d3drm.h index 3ec1183..4125e8a 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -206,7 +206,8 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(CreateDevice)(THIS_ DWORD, DWORD, LPDIRECT3DRMDEVICE2 *) PURE; STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice2 **device) PURE; - STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev, LPDIRECT3DRMDEVICE2 *) PURE; + STDMETHOD(CreateDeviceFromD3D)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device, + IDirect3DRMDevice2 **device) PURE; STDMETHOD(CreateDeviceFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height, IDirect3DRMDevice2 **device) PURE; STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface, @@ -344,7 +345,8 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) STDMETHOD(CreateDevice)(THIS_ DWORD, DWORD, LPDIRECT3DRMDEVICE3 *) PURE; STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice3 **device) PURE; - STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev, LPDIRECT3DRMDEVICE3 *) PURE; + STDMETHOD(CreateDeviceFromD3D)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device, + IDirect3DRMDevice3 **device) PURE; STDMETHOD(CreateDeviceFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height, IDirect3DRMDevice3 **device) PURE; STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface, diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 2265b56..1df113d 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -526,11 +526,11 @@ DECLARE_INTERFACE_(IDirect3DRMDevice2,IDirect3DRMDevice) STDMETHOD_(D3DRMTEXTUREQUALITY, GetTextureQuality)(THIS) PURE; STDMETHOD(GetDirect3DDevice)(THIS_ LPDIRECT3DDEVICE *) PURE; /*** IDirect3DRMDevice2 methods ***/ - STDMETHOD(InitFromD3D2)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev) PURE; + STDMETHOD(InitFromD3D2)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *device) PURE; STDMETHOD(InitFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface) PURE; STDMETHOD(SetRenderMode)(THIS_ DWORD flags) PURE; STDMETHOD_(DWORD, GetRenderMode)(THIS) PURE; - STDMETHOD(GetDirect3DDevice2)(THIS_ LPDIRECT3DDEVICE2 *) PURE; + STDMETHOD(GetDirect3DDevice2)(THIS_ IDirect3DDevice2 **device) PURE; }; #undef INTERFACE
@@ -671,11 +671,11 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject) STDMETHOD_(D3DRMTEXTUREQUALITY, GetTextureQuality)(THIS) PURE; STDMETHOD(GetDirect3DDevice)(THIS_ LPDIRECT3DDEVICE *) PURE; /*** IDirect3DRMDevice2 methods ***/ - STDMETHOD(InitFromD3D2)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev) PURE; + STDMETHOD(InitFromD3D2)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *device) PURE; STDMETHOD(InitFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface) PURE; STDMETHOD(SetRenderMode)(THIS_ DWORD flags) PURE; STDMETHOD_(DWORD, GetRenderMode)(THIS) PURE; - STDMETHOD(GetDirect3DDevice2)(THIS_ LPDIRECT3DDEVICE2 *) PURE; + STDMETHOD(GetDirect3DDevice2)(THIS_ IDirect3DDevice2 **device) PURE; /*** IDirect3DRMDevice3 methods ***/ STDMETHOD(FindPreferredTextureFormat)(THIS_ DWORD BitDepths, DWORD flags, LPDDPIXELFORMAT pDDPF) PURE; STDMETHOD(RenderStateChange)(THIS_ D3DRENDERSTATETYPE drsType, DWORD val, DWORD flags) PURE;