Module: wine Branch: master Commit: 33f0e190f25d98ec3c350b569c965c970d3e07cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=33f0e190f25d98ec3c350b569c...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Mon Jan 28 11:15:36 2013 +0100
d3drm: Avoid LPD3DRMIMAGE.
---
dlls/d3drm/d3drm.c | 24 ++++++++++++------------ dlls/d3drm/texture.c | 4 ++-- include/d3drm.h | 6 +++--- include/d3drmobj.h | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 709a2f8..48b362d 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -191,14 +191,14 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateAnimationSet(IDirect3DRM* iface, LPD return E_NOTIMPL; }
-static HRESULT WINAPI IDirect3DRMImpl_CreateTexture(IDirect3DRM* iface, LPD3DRMIMAGE pImage, - LPDIRECT3DRMTEXTURE * ppTexture) +static HRESULT WINAPI IDirect3DRMImpl_CreateTexture(IDirect3DRM *iface, + D3DRMIMAGE *image, IDirect3DRMTexture **texture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface);
- FIXME("(%p/%p)->(%p,%p): partial stub\n", iface, This, pImage, ppTexture); + FIXME("(%p/%p)->(%p,%p): partial stub\n", iface, This, image, texture);
- return Direct3DRMTexture_create(&IID_IDirect3DRMTexture, (IUnknown**)ppTexture); + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture, (IUnknown **)texture); }
static HRESULT WINAPI IDirect3DRMImpl_CreateLight(IDirect3DRM* iface, D3DRMLIGHTTYPE type, @@ -568,14 +568,14 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateAnimationSet(IDirect3DRM2* iface, return E_NOTIMPL; }
-static HRESULT WINAPI IDirect3DRM2Impl_CreateTexture(IDirect3DRM2* iface, LPD3DRMIMAGE pImage, - LPDIRECT3DRMTEXTURE2 * ppTexture) +static HRESULT WINAPI IDirect3DRM2Impl_CreateTexture(IDirect3DRM2 *iface, + D3DRMIMAGE *image, IDirect3DRMTexture2 **texture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface);
- FIXME("(%p/%p)->(%p,%p): partial stub\n", iface, This, pImage, ppTexture); + FIXME("(%p/%p)->(%p,%p): partial stub\n", iface, This, image, texture);
- return Direct3DRMTexture_create(&IID_IDirect3DRMTexture2, (IUnknown**)ppTexture); + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture2, (IUnknown **)texture); }
static HRESULT WINAPI IDirect3DRM2Impl_CreateLight(IDirect3DRM2* iface, D3DRMLIGHTTYPE type, @@ -988,14 +988,14 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateAnimationSet(IDirect3DRM3* iface, return E_NOTIMPL; }
-static HRESULT WINAPI IDirect3DRM3Impl_CreateTexture(IDirect3DRM3* iface, LPD3DRMIMAGE Image, - LPDIRECT3DRMTEXTURE3* Texture) +static HRESULT WINAPI IDirect3DRM3Impl_CreateTexture(IDirect3DRM3 *iface, + D3DRMIMAGE *image, IDirect3DRMTexture3 **texture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface);
- FIXME("(%p/%p)->(%p,%p): partial stub\n", iface, This, Image, Texture); + FIXME("(%p/%p)->(%p,%p): partial stub\n", iface, This, image, texture);
- return Direct3DRMTexture_create(&IID_IDirect3DRMTexture3, (IUnknown**)Texture); + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture3, (IUnknown **)texture); }
static HRESULT WINAPI IDirect3DRM3Impl_CreateLight(IDirect3DRM3* iface, D3DRMLIGHTTYPE type, diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 21ac96b..f72dcaa 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -346,7 +346,7 @@ static D3DCOLOR WINAPI IDirect3DRMTexture2Impl_GetDecalTransparentColor(IDirect3 }
/*** IDirect3DRMTexture2 methods ***/ -static HRESULT WINAPI IDirect3DRMTexture2Impl_InitFromImage(IDirect3DRMTexture2* iface, LPD3DRMIMAGE image) +static HRESULT WINAPI IDirect3DRMTexture2Impl_InitFromImage(IDirect3DRMTexture2 *iface, D3DRMIMAGE *image) { IDirect3DRMTextureImpl *This = impl_from_IDirect3DRMTexture2(iface);
@@ -722,7 +722,7 @@ static D3DCOLOR WINAPI IDirect3DRMTexture3Impl_GetDecalTransparentColor(IDirect3 return 0; }
-static HRESULT WINAPI IDirect3DRMTexture3Impl_InitFromImage(IDirect3DRMTexture3* iface, LPD3DRMIMAGE image) +static HRESULT WINAPI IDirect3DRMTexture3Impl_InitFromImage(IDirect3DRMTexture3 *iface, D3DRMIMAGE *image) { IDirect3DRMTextureImpl *This = impl_from_IDirect3DRMTexture3(iface);
diff --git a/include/d3drm.h b/include/d3drm.h index 8311759..93330d8 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -64,7 +64,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE *) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE; - STDMETHOD(CreateTexture)(THIS_ LPD3DRMIMAGE, LPDIRECT3DRMTEXTURE *) PURE; + STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture **texture) PURE; STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE, D3DCOLOR, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE, D3DVALUE, D3DVALUE, D3DVALUE, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateMaterial)(THIS_ D3DVALUE, LPDIRECT3DRMMATERIAL *) PURE; @@ -200,7 +200,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE *) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE; - STDMETHOD(CreateTexture)(THIS_ LPD3DRMIMAGE, LPDIRECT3DRMTEXTURE2 *) PURE; + STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture2 **texture) PURE; STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE, D3DCOLOR, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE, D3DVALUE, D3DVALUE, D3DVALUE, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateMaterial)(THIS_ D3DVALUE, LPDIRECT3DRMMATERIAL *) PURE; @@ -339,7 +339,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE2 *) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION2 *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET2 *) PURE; - STDMETHOD(CreateTexture)(THIS_ LPD3DRMIMAGE, LPDIRECT3DRMTEXTURE3 *) PURE; + STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture3 **texture) PURE; STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE, D3DCOLOR, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE, D3DVALUE, D3DVALUE, D3DVALUE, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateMaterial)(THIS_ D3DVALUE, LPDIRECT3DRMMATERIAL2 *) PURE; diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 7c7a913..14f8a7e 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -3327,7 +3327,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture2, IDirect3DRMTexture) STDMETHOD_(BOOL, GetDecalTransparency)(THIS) PURE; STDMETHOD_(D3DCOLOR, GetDecalTransparentColor)(THIS) PURE; /*** IDirect3DRMTexture2 methods ***/ - STDMETHOD(InitFromImage)(THIS_ LPD3DRMIMAGE) PURE; + STDMETHOD(InitFromImage)(THIS_ D3DRMIMAGE *image) PURE; STDMETHOD(InitFromResource2)(THIS_ HMODULE hModule, LPCSTR /* LPCTSTR */ strName, LPCSTR /* LPCTSTR */ strType) PURE; STDMETHOD(GenerateMIPMap)(THIS_ DWORD) PURE; }; @@ -3450,7 +3450,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture3, IDirect3DRMVisual) STDMETHOD_(DWORD, GetDecalScale)(THIS) PURE; STDMETHOD_(BOOL, GetDecalTransparency)(THIS) PURE; STDMETHOD_(D3DCOLOR, GetDecalTransparentColor)(THIS) PURE; - STDMETHOD(InitFromImage)(THIS_ LPD3DRMIMAGE) PURE; + STDMETHOD(InitFromImage)(THIS_ D3DRMIMAGE *image) PURE; STDMETHOD(InitFromResource2)(THIS_ HMODULE hModule, LPCSTR /* LPCTSTR */ strName, LPCSTR /* LPCTSTR */ strType) PURE; STDMETHOD(GenerateMIPMap)(THIS_ DWORD) PURE; STDMETHOD(GetSurface)(THIS_ DWORD flags, IDirectDrawSurface **surface) PURE;