Module: wine Branch: master Commit: 49041569462fffbfe779738860fc73567f2e1ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49041569462fffbfe779738860...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Tue Nov 20 22:40:20 2012 +0100
d3drm: Avoid LPDIRECT3DDEVICE.
---
dlls/d3drm/d3drm.c | 3 ++- dlls/d3drm/device.c | 18 ++++++++---------- include/d3drm.h | 3 ++- include/d3drmobj.h | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index dd33a2f..7261eb2 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -251,7 +251,8 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromSurface(IDirect3DRM *iface return Direct3DRMDevice_create(&IID_IDirect3DRMDevice, (IUnknown**)ppDevice); }
-static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromD3D(IDirect3DRM* iface, LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev, LPDIRECT3DRMDEVICE * ppDevice) +static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromD3D(IDirect3DRM *iface, + IDirect3D *pD3D, IDirect3DDevice *pD3DDev, IDirect3DRMDevice **ppDevice) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface);
diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 5d2b249..ed6055b 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -212,9 +212,8 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_Init(IDirect3DRMDevice2* iface, ULO }
/*** IDirect3DRMDevice2 methods ***/ -static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromD3D(IDirect3DRMDevice2* iface, - LPDIRECT3D lpD3D, - LPDIRECT3DDEVICE lpD3DDev) +static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromD3D(IDirect3DRMDevice2 *iface, + IDirect3D *lpD3D, IDirect3DDevice *lpD3DDev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface);
@@ -411,8 +410,8 @@ static D3DRMTEXTUREQUALITY WINAPI IDirect3DRMDevice2Impl_GetTextureQuality(IDire return E_NOTIMPL; }
-static HRESULT WINAPI IDirect3DRMDevice2Impl_GetDirect3DDevice(IDirect3DRMDevice2* iface, - LPDIRECT3DDEVICE * dev) +static HRESULT WINAPI IDirect3DRMDevice2Impl_GetDirect3DDevice(IDirect3DRMDevice2 *iface, + IDirect3DDevice **dev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface);
@@ -639,9 +638,8 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_Init(IDirect3DRMDevice3* iface, ULO return D3DRM_OK; }
-static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromD3D(IDirect3DRMDevice3* iface, - LPDIRECT3D lpD3D, - LPDIRECT3DDEVICE lpD3DDev) +static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromD3D(IDirect3DRMDevice3 *iface, + IDirect3D *lpD3D, IDirect3DDevice *lpD3DDev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface);
@@ -844,8 +842,8 @@ static D3DRMTEXTUREQUALITY WINAPI IDirect3DRMDevice3Impl_GetTextureQuality(IDire return E_NOTIMPL; }
-static HRESULT WINAPI IDirect3DRMDevice3Impl_GetDirect3DDevice(IDirect3DRMDevice3* iface, - LPDIRECT3DDEVICE * dev) +static HRESULT WINAPI IDirect3DRMDevice3Impl_GetDirect3DDevice(IDirect3DRMDevice3 *iface, + IDirect3DDevice **dev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface);
diff --git a/include/d3drm.h b/include/d3drm.h index 4125e8a..8311759 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -71,7 +71,8 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(CreateDevice)(THIS_ DWORD, DWORD, LPDIRECT3DRMDEVICE *) PURE; STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice **device) PURE; - STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev, LPDIRECT3DRMDEVICE *) PURE; + STDMETHOD(CreateDeviceFromD3D)(THIS_ IDirect3D *d3d, IDirect3DDevice *d3d_device, + IDirect3DRMDevice **device) PURE; STDMETHOD(CreateDeviceFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height, IDirect3DRMDevice **device) PURE; STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface, diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 1df113d..5e50abe 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -376,7 +376,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice,IUnknown) STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMDevice methods ***/ STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE; - STDMETHOD(InitFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev) PURE; + STDMETHOD(InitFromD3D)(THIS_ IDirect3D *d3d, IDirect3DDevice *d3d_device) PURE; STDMETHOD(InitFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height) PURE; STDMETHOD(Update)(THIS) PURE; STDMETHOD(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; @@ -397,7 +397,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice,IUnknown) STDMETHOD_(D3DRMRENDERQUALITY, GetQuality)(THIS) PURE; STDMETHOD_(D3DCOLORMODEL, GetColorModel)(THIS) PURE; STDMETHOD_(D3DRMTEXTUREQUALITY, GetTextureQuality)(THIS) PURE; - STDMETHOD(GetDirect3DDevice)(THIS_ LPDIRECT3DDEVICE *) PURE; + STDMETHOD(GetDirect3DDevice)(THIS_ IDirect3DDevice **d3d_device) PURE; }; #undef INTERFACE
@@ -503,7 +503,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice2,IDirect3DRMDevice) STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMDevice methods ***/ STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE; - STDMETHOD(InitFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev) PURE; + STDMETHOD(InitFromD3D)(THIS_ IDirect3D *d3d, IDirect3DDevice *d3d_device) PURE; STDMETHOD(InitFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height) PURE; STDMETHOD(Update)(THIS) PURE; STDMETHOD(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; @@ -524,7 +524,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice2,IDirect3DRMDevice) STDMETHOD_(D3DRMRENDERQUALITY, GetQuality)(THIS) PURE; STDMETHOD_(D3DCOLORMODEL, GetColorModel)(THIS) PURE; STDMETHOD_(D3DRMTEXTUREQUALITY, GetTextureQuality)(THIS) PURE; - STDMETHOD(GetDirect3DDevice)(THIS_ LPDIRECT3DDEVICE *) PURE; + STDMETHOD(GetDirect3DDevice)(THIS_ IDirect3DDevice **d3d_device) PURE; /*** IDirect3DRMDevice2 methods ***/ STDMETHOD(InitFromD3D2)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *device) PURE; STDMETHOD(InitFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface) PURE; @@ -648,7 +648,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject) STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMDevice methods ***/ STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE; - STDMETHOD(InitFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev) PURE; + STDMETHOD(InitFromD3D)(THIS_ IDirect3D *d3d, IDirect3DDevice *d3d_device) PURE; STDMETHOD(InitFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height) PURE; STDMETHOD(Update)(THIS) PURE; STDMETHOD(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; @@ -669,7 +669,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject) STDMETHOD_(D3DRMRENDERQUALITY, GetQuality)(THIS) PURE; STDMETHOD_(D3DCOLORMODEL, GetColorModel)(THIS) PURE; STDMETHOD_(D3DRMTEXTUREQUALITY, GetTextureQuality)(THIS) PURE; - STDMETHOD(GetDirect3DDevice)(THIS_ LPDIRECT3DDEVICE *) PURE; + STDMETHOD(GetDirect3DDevice)(THIS_ IDirect3DDevice **d3d_device) PURE; /*** IDirect3DRMDevice2 methods ***/ STDMETHOD(InitFromD3D2)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *device) PURE; STDMETHOD(InitFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface) PURE;
-
Alexandre Julliard