Henri Verbeet : d3drm: Avoid LPDIRECT3DRMDEVICE3.
Alexandre Julliard
julliard at winehq.org
Thu Apr 18 13:57:25 CDT 2013
Module: wine
Branch: master
Commit: 2c557b9b5f8bab5b50479ebd33383787a8cac2b9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c557b9b5f8bab5b50479ebd33383787a8cac2b9
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Apr 18 09:35:15 2013 +0200
d3drm: Avoid LPDIRECT3DRMDEVICE3.
---
dlls/d3drm/d3drm.c | 25 +++++++++----------------
dlls/d3drm/viewport.c | 19 ++++++-------------
include/d3drm.h | 6 +++---
include/d3drmobj.h | 6 +++---
4 files changed, 21 insertions(+), 35 deletions(-)
diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c
index 719a438..94628b1 100644
--- a/dlls/d3drm/d3drm.c
+++ b/dlls/d3drm/d3drm.c
@@ -1040,14 +1040,12 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateMaterial(IDirect3DRM3* iface, D3DVA
return ret;
}
-static HRESULT WINAPI IDirect3DRM3Impl_CreateDevice(IDirect3DRM3* iface, DWORD width, DWORD height,
- LPDIRECT3DRMDEVICE3* device)
+static HRESULT WINAPI IDirect3DRM3Impl_CreateDevice(IDirect3DRM3 *iface,
+ DWORD width, DWORD height, IDirect3DRMDevice3 **device)
{
- IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface);
-
- FIXME("(%p/%p)->(%d,%d,%p): partial stub\n", iface, This, width, height, device);
+ FIXME("iface %p, width %u, height %u, device %p partial stub!\n", iface, width, height, device);
- return Direct3DRMDevice_create(&IID_IDirect3DRMDevice3, (IUnknown**)device);
+ return Direct3DRMDevice_create(&IID_IDirect3DRMDevice3, (IUnknown **)device);
}
static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromSurface(IDirect3DRM3 *iface, GUID *pGUID,
@@ -1106,18 +1104,13 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateTextureFromSurface(IDirect3DRM3 *if
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirect3DRM3Impl_CreateViewport(IDirect3DRM3* iface,
- LPDIRECT3DRMDEVICE3 Device,
- LPDIRECT3DRMFRAME3 frame, DWORD xpos,
- DWORD ypos, DWORD width, DWORD height,
- LPDIRECT3DRMVIEWPORT2* viewport)
+static HRESULT WINAPI IDirect3DRM3Impl_CreateViewport(IDirect3DRM3 *iface, IDirect3DRMDevice3 *device,
+ IDirect3DRMFrame3 *camera, DWORD x, DWORD y, DWORD width, DWORD height, IDirect3DRMViewport2 **viewport)
{
- IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface);
-
- FIXME("(%p/%p)->(%p,%p,%d,%d,%d,%d,%p): stub\n", iface, This, Device, frame, xpos, ypos, width,
- height, viewport);
+ FIXME("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p partial stub!\n",
+ iface, device, camera, x, y, width, height, viewport);
- return Direct3DRMViewport_create(&IID_IDirect3DRMViewport2, (IUnknown**)viewport);
+ return Direct3DRMViewport_create(&IID_IDirect3DRMViewport2, (IUnknown **)viewport);
}
static HRESULT WINAPI IDirect3DRM3Impl_CreateWrap(IDirect3DRM3* iface, D3DRMWRAPTYPE type,
diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c
index 007fd07..859edcc 100644
--- a/dlls/d3drm/viewport.c
+++ b/dlls/d3drm/viewport.c
@@ -607,15 +607,11 @@ static HRESULT WINAPI IDirect3DRMViewport2Impl_GetClassName(IDirect3DRMViewport2
}
/*** IDirect3DRMViewport methods ***/
-static HRESULT WINAPI IDirect3DRMViewport2Impl_Init(IDirect3DRMViewport2* iface,
- LPDIRECT3DRMDEVICE3 dev, LPDIRECT3DRMFRAME3 camera,
- DWORD xpos, DWORD ypos,
- DWORD width, DWORD height)
+static HRESULT WINAPI IDirect3DRMViewport2Impl_Init(IDirect3DRMViewport2 *iface, IDirect3DRMDevice3 *device,
+ IDirect3DRMFrame3 *camera, DWORD x, DWORD y, DWORD width, DWORD height)
{
- IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport2(iface);
-
- FIXME("(%p/%p)->(%p, %p, %u, %u, %u, %u): stub\n", iface, This, dev, camera,
- xpos, ypos, width, height);
+ FIXME("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u stub!\n",
+ iface, device, camera, x, y, width, height);
return E_NOTIMPL;
}
@@ -764,12 +760,9 @@ static HRESULT WINAPI IDirect3DRMViewport2Impl_GetCamera(IDirect3DRMViewport2* i
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirect3DRMViewport2Impl_GetDevice(IDirect3DRMViewport2* iface,
- LPDIRECT3DRMDEVICE3 * device)
+static HRESULT WINAPI IDirect3DRMViewport2Impl_GetDevice(IDirect3DRMViewport2 *iface, IDirect3DRMDevice3 **device)
{
- IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport2(iface);
-
- FIXME("(%p/%p)->(%p): stub\n", iface, This, device);
+ FIXME("iface %p, device %p stub!\n", iface, device);
return E_NOTIMPL;
}
diff --git a/include/d3drm.h b/include/d3drm.h
index b140efb..da88dab 100644
--- a/include/d3drm.h
+++ b/include/d3drm.h
@@ -343,7 +343,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown)
STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE, D3DCOLOR, LPDIRECT3DRMLIGHT *) PURE;
STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE, D3DVALUE, D3DVALUE, D3DVALUE, LPDIRECT3DRMLIGHT *) PURE;
STDMETHOD(CreateMaterial)(THIS_ D3DVALUE, LPDIRECT3DRMMATERIAL2 *) PURE;
- STDMETHOD(CreateDevice)(THIS_ DWORD, DWORD, LPDIRECT3DRMDEVICE3 *) PURE;
+ STDMETHOD(CreateDevice)(THIS_ DWORD width, DWORD height, IDirect3DRMDevice3 **device) PURE;
STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw,
IDirectDrawSurface *surface, IDirect3DRMDevice3 **device) PURE;
STDMETHOD(CreateDeviceFromD3D)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device,
@@ -354,8 +354,8 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown)
IDirect3DRMTexture3 **texture) PURE;
STDMETHOD(CreateShadow)(THIS_ LPUNKNOWN, LPDIRECT3DRMLIGHT, D3DVALUE px, D3DVALUE py, D3DVALUE pz,
D3DVALUE nx, D3DVALUE ny, D3DVALUE nz, LPDIRECT3DRMSHADOW2 *) PURE;
- STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DRMDEVICE3, LPDIRECT3DRMFRAME3, DWORD, DWORD, DWORD, DWORD,
- LPDIRECT3DRMVIEWPORT2 *) PURE;
+ STDMETHOD(CreateViewport)(THIS_ IDirect3DRMDevice3 *device, IDirect3DRMFrame3 *camera,
+ DWORD x, DWORD y, DWORD width, DWORD height, IDirect3DRMViewport2 **viewport) PURE;
STDMETHOD(CreateWrap)(THIS_ D3DRMWRAPTYPE, LPDIRECT3DRMFRAME3, D3DVALUE ox, D3DVALUE oy, D3DVALUE oz,
D3DVALUE dx, D3DVALUE dy, D3DVALUE dz, D3DVALUE ux, D3DVALUE uy, D3DVALUE uz, D3DVALUE ou, D3DVALUE ov,
D3DVALUE su, D3DVALUE sv, LPDIRECT3DRMWRAP *) PURE;
diff --git a/include/d3drmobj.h b/include/d3drmobj.h
index a3676d3..fa3559e 100644
--- a/include/d3drmobj.h
+++ b/include/d3drmobj.h
@@ -948,8 +948,8 @@ DECLARE_INTERFACE_(IDirect3DRMViewport2,IDirect3DRMObject)
STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE;
STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE;
/*** IDirect3DRMViewport2 methods ***/
- STDMETHOD(Init) (THIS_ LPDIRECT3DRMDEVICE3 dev, LPDIRECT3DRMFRAME3 camera, DWORD xpos, DWORD ypos,
- DWORD width, DWORD height) PURE;
+ STDMETHOD(Init) (THIS_ IDirect3DRMDevice3 *device, struct IDirect3DRMFrame3 *camera,
+ DWORD x, DWORD y, DWORD width, DWORD height) PURE;
STDMETHOD(Clear)(THIS_ DWORD flags) PURE;
STDMETHOD(Render)(THIS_ LPDIRECT3DRMFRAME3) PURE;
STDMETHOD(SetFront)(THIS_ D3DVALUE) PURE;
@@ -964,7 +964,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport2,IDirect3DRMObject)
STDMETHOD(ForceUpdate)(THIS_ DWORD x1, DWORD y1, DWORD x2, DWORD y2) PURE;
STDMETHOD(SetPlane)(THIS_ D3DVALUE left, D3DVALUE right, D3DVALUE bottom, D3DVALUE top) PURE;
STDMETHOD(GetCamera)(THIS_ LPDIRECT3DRMFRAME3 *) PURE;
- STDMETHOD(GetDevice)(THIS_ LPDIRECT3DRMDEVICE3 *) PURE;
+ STDMETHOD(GetDevice)(THIS_ IDirect3DRMDevice3 **device) PURE;
STDMETHOD(GetPlane)(THIS_ D3DVALUE *left, D3DVALUE *right, D3DVALUE *bottom, D3DVALUE *top) PURE;
STDMETHOD(Pick)(THIS_ LONG x, LONG y, LPDIRECT3DRMPICKEDARRAY *return_visuals) PURE;
STDMETHOD_(BOOL, GetUniformScaling)(THIS) PURE;
More information about the wine-cvs
mailing list