ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3drm: Avoid LPDIRECT3DRMTEXTURE2.

This commit is contained in:
Henri Verbeet 2013-05-27 09:22:52 +02:00 committed by Alexandre Julliard
parent 769efb1f63
commit 41fe35583d
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/d3drm/d3drm.c
View File

@ -697,25 +697,21 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateUserVisual(IDirect3DRM2* iface,
return E_NOTIMPL;
}
static HRESULT WINAPI IDirect3DRM2Impl_LoadTexture(IDirect3DRM2* iface, const char* filename,
LPDIRECT3DRMTEXTURE2* Texture)
static HRESULT WINAPI IDirect3DRM2Impl_LoadTexture(IDirect3DRM2 *iface,
const char *filename, IDirect3DRMTexture2 **texture)
{
IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface);
FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture);
FIXME("(%p/%p)->(%s,%p): stub\n", iface, This, filename, Texture);
return Direct3DRMTexture_create(&IID_IDirect3DRMTexture2, (IUnknown **)Texture);
return Direct3DRMTexture_create(&IID_IDirect3DRMTexture2, (IUnknown **)texture);
}
static HRESULT WINAPI IDirect3DRM2Impl_LoadTextureFromResource(IDirect3DRM2* iface, HMODULE hModule,
LPCSTR strName, LPCSTR strType,
LPDIRECT3DRMTEXTURE2* Texture)
static HRESULT WINAPI IDirect3DRM2Impl_LoadTextureFromResource(IDirect3DRM2 *iface, HMODULE module,
const char *resource_name, const char *resource_type, IDirect3DRMTexture2 **texture)
{
IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface);
FIXME("iface %p, resource_name %s, resource_type %s, texture %p stub!\n",
iface, debugstr_a(resource_name), debugstr_a(resource_type), texture);
FIXME("(%p/%p)->(%p,%p,%p,%p): stub\n", iface, This, hModule, strName, strType, Texture);
return Direct3DRMTexture_create(&IID_IDirect3DRMTexture2, (IUnknown **)Texture);
return Direct3DRMTexture_create(&IID_IDirect3DRMTexture2, (IUnknown **)texture);
}
static HRESULT WINAPI IDirect3DRM2Impl_SetSearchPath(IDirect3DRM2* iface, LPCSTR path)

5
include/d3drm.h
View File

@ -226,8 +226,9 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown)
D3DVALUE dx, D3DVALUE dy, D3DVALUE dz, D3DVALUE ux, D3DVALUE uy, D3DVALUE uz, D3DVALUE ou, D3DVALUE ov,
D3DVALUE su, D3DVALUE sv, IDirect3DRMWrap **wrap) PURE;
STDMETHOD(CreateUserVisual)(THIS_ D3DRMUSERVISUALCALLBACK, LPVOID pArg, LPDIRECT3DRMUSERVISUAL *) PURE;
STDMETHOD(LoadTexture)(THIS_ const char *, LPDIRECT3DRMTEXTURE2 *) PURE;
STDMETHOD(LoadTextureFromResource)(THIS_ HMODULE hModule, LPCSTR /* LPCTSTR */ strName, LPCSTR /* LPCTSTR */ strType, LPDIRECT3DRMTEXTURE2 *) PURE;
STDMETHOD(LoadTexture)(THIS_ const char *filename, IDirect3DRMTexture2 **texture) PURE;
STDMETHOD(LoadTextureFromResource)(THIS_ HMODULE module, const char *resource_name,
const char *resource_type, IDirect3DRMTexture2 **texture) PURE;
STDMETHOD(SetSearchPath)(THIS_ LPCSTR) PURE;
STDMETHOD(AddSearchPath)(THIS_ LPCSTR) PURE;
STDMETHOD(GetSearchPath)(THIS_ DWORD *size_return, LPSTR path_return) PURE;