=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: d3drm: Fix the order of the IDirect3DRM methods.
Alexandre Julliard
julliard at winehq.org
Tue Dec 27 11:27:55 CST 2011
Module: wine
Branch: master
Commit: a1a1cbcff0df98e398167d7d8952593cedc8a09f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1a1cbcff0df98e398167d7d8952593cedc8a09f
Author: André Hentschel <nerv at dawncrow.de>
Date: Sun Dec 25 19:27:35 2011 +0100
d3drm: Fix the order of the IDirect3DRM methods.
---
dlls/d3drm/d3drm.c | 10 +++++-----
include/d3drm.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c
index 977c879..d02ec3d 100644
--- a/dlls/d3drm/d3drm.c
+++ b/dlls/d3drm/d3drm.c
@@ -239,20 +239,20 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromClipper(IDirect3DRM* iface
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirect3DRMImpl_CreateShadow(IDirect3DRM* iface, LPDIRECT3DRMVISUAL pVisual, LPDIRECT3DRMLIGHT pLight, D3DVALUE px, D3DVALUE py, D3DVALUE pz, D3DVALUE nx, D3DVALUE ny, D3DVALUE nz, LPDIRECT3DRMVISUAL * ppVisual)
+static HRESULT WINAPI IDirect3DRMImpl_CreateTextureFromSurface(IDirect3DRM* iface, LPDIRECTDRAWSURFACE pDDS, LPDIRECT3DRMTEXTURE * ppTexture)
{
IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface);
- FIXME("(%p/%p)->(%p,%p,%f,%f,%f,%f,%f,%f,%p): stub\n", iface, This, pVisual, pLight, px, py, pz, nx, ny, nz, ppVisual);
+ FIXME("(%p/%p)->(%p,%p): stub\n", iface, This, pDDS, ppTexture);
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirect3DRMImpl_CreateTextureFromSurface(IDirect3DRM* iface, LPDIRECTDRAWSURFACE pDDS, LPDIRECT3DRMTEXTURE * ppTexture)
+static HRESULT WINAPI IDirect3DRMImpl_CreateShadow(IDirect3DRM* iface, LPDIRECT3DRMVISUAL pVisual, LPDIRECT3DRMLIGHT pLight, D3DVALUE px, D3DVALUE py, D3DVALUE pz, D3DVALUE nx, D3DVALUE ny, D3DVALUE nz, LPDIRECT3DRMVISUAL * ppVisual)
{
IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface);
- FIXME("(%p/%p)->(%p,%p): stub\n", iface, This, pDDS, ppTexture);
+ FIXME("(%p/%p)->(%p,%p,%f,%f,%f,%f,%f,%f,%p): stub\n", iface, This, pVisual, pLight, px, py, pz, nx, ny, nz, ppVisual);
return E_NOTIMPL;
}
@@ -412,8 +412,8 @@ static const struct IDirect3DRMVtbl Direct3DRM_Vtbl =
IDirect3DRMImpl_CreateDeviceFromSurface,
IDirect3DRMImpl_CreateDeviceFromD3D,
IDirect3DRMImpl_CreateDeviceFromClipper,
- IDirect3DRMImpl_CreateShadow,
IDirect3DRMImpl_CreateTextureFromSurface,
+ IDirect3DRMImpl_CreateShadow,
IDirect3DRMImpl_CreateViewport,
IDirect3DRMImpl_CreateWrap,
IDirect3DRMImpl_CreateUserVisual,
diff --git a/include/d3drm.h b/include/d3drm.h
index 1a1bcce..4b8f0e7 100644
--- a/include/d3drm.h
+++ b/include/d3drm.h
@@ -74,9 +74,9 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown)
STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev, LPDIRECT3DRMDEVICE *) PURE;
STDMETHOD(CreateDeviceFromClipper)(THIS_ LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height,
LPDIRECT3DRMDEVICE *) PURE;
+ STDMETHOD(CreateTextureFromSurface)(THIS_ LPDIRECTDRAWSURFACE pDDS, LPDIRECT3DRMTEXTURE *) PURE;
STDMETHOD(CreateShadow)(THIS_ LPDIRECT3DRMVISUAL, LPDIRECT3DRMLIGHT, D3DVALUE px, D3DVALUE py, D3DVALUE pz,
D3DVALUE nx, D3DVALUE ny, D3DVALUE nz, LPDIRECT3DRMVISUAL *) PURE;
- STDMETHOD(CreateTextureFromSurface)(THIS_ LPDIRECTDRAWSURFACE pDDS, LPDIRECT3DRMTEXTURE *) PURE;
STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DRMDEVICE, LPDIRECT3DRMFRAME, DWORD, DWORD, DWORD, DWORD,
LPDIRECT3DRMVIEWPORT *) PURE;
STDMETHOD(CreateWrap)(THIS_ D3DRMWRAPTYPE, LPDIRECT3DRMFRAME, D3DVALUE ox, D3DVALUE oy, D3DVALUE oz,
More information about the wine-cvs
mailing list