diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 8dfa4bbfe98..fe728a8741e 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -317,24 +317,20 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateUserVisual(IDirect3DRM* iface, D3DRM return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMImpl_LoadTexture(IDirect3DRM* iface, const char* filename, - LPDIRECT3DRMTEXTURE* Texture) +static HRESULT WINAPI IDirect3DRMImpl_LoadTexture(IDirect3DRM *iface, + const char *filename, IDirect3DRMTexture **texture) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM(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_IDirect3DRMTexture, (IUnknown **)Texture); + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture, (IUnknown **)texture); } -static HRESULT WINAPI IDirect3DRMImpl_LoadTextureFromResource(IDirect3DRM* iface, HRSRC rs, - LPDIRECT3DRMTEXTURE* Texture) +static HRESULT WINAPI IDirect3DRMImpl_LoadTextureFromResource(IDirect3DRM *iface, + HRSRC resource, IDirect3DRMTexture **texture) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); + FIXME("iface %p, resource %p, texture %p stub!\n", iface, resource, texture); - FIXME("(%p/%p)->(%p,%p): stub\n", iface, This, rs, Texture); - - return Direct3DRMTexture_create(&IID_IDirect3DRMTexture, (IUnknown **)Texture); + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture, (IUnknown **)texture); } static HRESULT WINAPI IDirect3DRMImpl_SetSearchPath(IDirect3DRM* iface, LPCSTR path) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 3603e1410c2..7b4543bde6c 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -781,12 +781,9 @@ static D3DRMSORTMODE WINAPI IDirect3DRMFrame2Impl_GetSortMode(IDirect3DRMFrame2* return D3DRMSORT_FROMPARENT; } -static HRESULT WINAPI IDirect3DRMFrame2Impl_GetTexture(IDirect3DRMFrame2* iface, - LPDIRECT3DRMTEXTURE * tex) +static HRESULT WINAPI IDirect3DRMFrame2Impl_GetTexture(IDirect3DRMFrame2 *iface, IDirect3DRMTexture **texture) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, tex); + FIXME("iface %p, texture %p stub!\n", iface, texture); return E_NOTIMPL; } @@ -1041,12 +1038,10 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_SetSceneBackgroundDepth(IDirect3DRMF return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame2Impl_SetSceneBackgroundImage(IDirect3DRMFrame2* iface, - LPDIRECT3DRMTEXTURE texture) +static HRESULT WINAPI IDirect3DRMFrame2Impl_SetSceneBackgroundImage(IDirect3DRMFrame2 *iface, + IDirect3DRMTexture *texture) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, texture); + FIXME("iface %p, texture %p stub!\n", iface, texture); return E_NOTIMPL; } @@ -1165,12 +1160,9 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_SetSortMode(IDirect3DRMFrame2* iface return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame2Impl_SetTexture(IDirect3DRMFrame2* iface, - LPDIRECT3DRMTEXTURE texture) +static HRESULT WINAPI IDirect3DRMFrame2Impl_SetTexture(IDirect3DRMFrame2 *iface, IDirect3DRMTexture *texture) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, texture); + FIXME("iface %p, texture %p stub!\n", iface, texture); return E_NOTIMPL; } diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index eecf6296b70..c563be19744 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -658,8 +658,8 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetColor(IDirect3DRMMeshBuilde return IDirect3DRMMeshBuilder3_SetColor(&This->IDirect3DRMMeshBuilder3_iface, color); } -static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetTexture(IDirect3DRMMeshBuilder2* iface, - LPDIRECT3DRMTEXTURE texture) +static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetTexture(IDirect3DRMMeshBuilder2 *iface, + IDirect3DRMTexture *texture) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); LPDIRECT3DRMTEXTURE3 texture3 = NULL; @@ -2169,7 +2169,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil hr = IDirect3DRMMesh_SetGroupMaterial(*mesh, group, (LPDIRECT3DRMMATERIAL)This->materials[k].material); if (SUCCEEDED(hr) && This->materials[k].texture) { - LPDIRECT3DRMTEXTURE texture; + IDirect3DRMTexture *texture; IDirect3DRMTexture3_QueryInterface(This->materials[k].texture, &IID_IDirect3DRMTexture, (LPVOID*)&texture); hr = IDirect3DRMMesh_SetGroupTexture(*mesh, group, texture); @@ -2857,8 +2857,8 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_SetGroupMaterial(IDirect3DRMMesh* ifac return D3DRM_OK; } -static HRESULT WINAPI IDirect3DRMMeshImpl_SetGroupTexture(IDirect3DRMMesh* iface, - D3DRMGROUPINDEX id, LPDIRECT3DRMTEXTURE texture) +static HRESULT WINAPI IDirect3DRMMeshImpl_SetGroupTexture(IDirect3DRMMesh *iface, + D3DRMGROUPINDEX id, IDirect3DRMTexture *texture) { IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); @@ -2981,8 +2981,8 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_GetGroupMaterial(IDirect3DRMMesh* ifac return D3DRM_OK; } -static HRESULT WINAPI IDirect3DRMMeshImpl_GetGroupTexture(IDirect3DRMMesh* iface, - D3DRMGROUPINDEX id, LPDIRECT3DRMTEXTURE *texture) +static HRESULT WINAPI IDirect3DRMMeshImpl_GetGroupTexture(IDirect3DRMMesh *iface, + D3DRMGROUPINDEX id, IDirect3DRMTexture **texture) { IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 31ba044960b..2c882708bf8 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -451,7 +451,7 @@ static void test_MeshBuilder(void) unsigned nb_vertices, nb_faces, nb_face_vertices; DWORD data_size; LPDIRECT3DRMMATERIAL material = (LPDIRECT3DRMMATERIAL)0xdeadbeef; - LPDIRECT3DRMTEXTURE texture = (LPDIRECT3DRMTEXTURE)0xdeadbeef; + IDirect3DRMTexture *texture = (IDirect3DRMTexture *)0xdeadbeef; D3DVALUE values[3]; nb_groups = IDirect3DRMMesh_GetGroupCount(mesh); @@ -1435,7 +1435,7 @@ static void test_Texture(void) { HRESULT hr; IDirect3DRM *d3drm; - LPDIRECT3DRMTEXTURE pTexture; + IDirect3DRMTexture *texture; D3DRMIMAGE initimg = { 2, 2, 1, 1, 32, TRUE, 2 * sizeof(DWORD), NULL, NULL, @@ -1449,23 +1449,23 @@ static void test_Texture(void) ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); initimg.buffer1 = &pixel; - hr = IDirect3DRM_CreateTexture(d3drm, &initimg, &pTexture); + hr = IDirect3DRM_CreateTexture(d3drm, &initimg, &texture); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMTexture interface (hr = %x)\n", hr); - hr = IDirect3DRMTexture_GetClassName(pTexture, NULL, cname); + hr = IDirect3DRMTexture_GetClassName(texture, NULL, cname); ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); - hr = IDirect3DRMTexture_GetClassName(pTexture, NULL, NULL); + hr = IDirect3DRMTexture_GetClassName(texture, NULL, NULL); ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); size = 1; - hr = IDirect3DRMTexture_GetClassName(pTexture, &size, cname); + hr = IDirect3DRMTexture_GetClassName(texture, &size, cname); ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); size = sizeof(cname); - hr = IDirect3DRMTexture_GetClassName(pTexture, &size, cname); + hr = IDirect3DRMTexture_GetClassName(texture, &size, cname); ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); ok(size == sizeof("Texture"), "wrong size: %u\n", size); ok(!strcmp(cname, "Texture"), "Expected cname to be \"Texture\", but got \"%s\"\n", cname); - IDirect3DRMTexture_Release(pTexture); + IDirect3DRMTexture_Release(texture); IDirect3DRM_Release(d3drm); } diff --git a/include/d3drm.h b/include/d3drm.h index bdd5559460b..44163fe44a0 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -87,8 +87,8 @@ DECLARE_INTERFACE_(IDirect3DRM,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 *, LPDIRECT3DRMTEXTURE *) PURE; - STDMETHOD(LoadTextureFromResource)(THIS_ HRSRC rs, LPDIRECT3DRMTEXTURE *) PURE; + STDMETHOD(LoadTexture)(THIS_ const char *filename, IDirect3DRMTexture **texture) PURE; + STDMETHOD(LoadTextureFromResource)(THIS_ HRSRC resource, IDirect3DRMTexture **texture) PURE; STDMETHOD(SetSearchPath)(THIS_ LPCSTR) PURE; STDMETHOD(AddSearchPath)(THIS_ LPCSTR) PURE; STDMETHOD(GetSearchPath)(THIS_ DWORD *size_return, LPSTR path_return) PURE; diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 61164e14323..814b5076db7 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -162,7 +162,7 @@ typedef void (__cdecl *D3DRMDEVICE3UPDATECALLBACK)(struct IDirect3DRMDevice3 *de int count, D3DRECT *rects); typedef int (__cdecl *D3DRMUSERVISUALCALLBACK)(struct IDirect3DRMUserVisual *visual, void *ctx, D3DRMUSERVISUALREASON reason, struct IDirect3DRMDevice *device, struct IDirect3DRMViewport *viewport); -typedef HRESULT (__cdecl *D3DRMLOADTEXTURECALLBACK)(char *tex_name, void *arg, LPDIRECT3DRMTEXTURE *); +typedef HRESULT (__cdecl *D3DRMLOADTEXTURECALLBACK)(char *tex_name, void *arg, struct IDirect3DRMTexture **texture); typedef HRESULT (__cdecl *D3DRMLOADTEXTURE3CALLBACK)(char *tex_name, void *arg, LPDIRECT3DRMTEXTURE3 *); typedef void (__cdecl *D3DRMLOADCALLBACK)(struct IDirect3DRMObject *object, REFIID objectguid, void *arg); typedef HRESULT (__cdecl *D3DRMDOWNSAMPLECALLBACK)(struct IDirect3DRMTexture3 *texture, void *ctx, @@ -1113,7 +1113,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame,IDirect3DRMVisual) STDMETHOD(GetRotation)(THIS_ IDirect3DRMFrame *reference, D3DVECTOR *axis, D3DVALUE *return_theta) PURE; STDMETHOD(GetScene)(THIS_ IDirect3DRMFrame **scene) PURE; STDMETHOD_(D3DRMSORTMODE, GetSortMode)(THIS) PURE; - STDMETHOD(GetTexture)(THIS_ LPDIRECT3DRMTEXTURE *) PURE; + STDMETHOD(GetTexture)(THIS_ struct IDirect3DRMTexture **texture) PURE; STDMETHOD(GetTransform)(THIS_ D3DRMMATRIX4D return_matrix) PURE; STDMETHOD(GetVelocity)(THIS_ IDirect3DRMFrame *reference, D3DVECTOR *return_velocity, BOOL with_rotation) PURE; STDMETHOD(GetOrientation)(THIS_ IDirect3DRMFrame *reference, D3DVECTOR *dir, D3DVECTOR *up) PURE; @@ -1138,7 +1138,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame,IDirect3DRMVisual) STDMETHOD(SetSceneBackground)(THIS_ D3DCOLOR) PURE; STDMETHOD(SetSceneBackgroundRGB)(THIS_ D3DVALUE red, D3DVALUE green, D3DVALUE blue) PURE; STDMETHOD(SetSceneBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE; - STDMETHOD(SetSceneBackgroundImage)(THIS_ LPDIRECT3DRMTEXTURE) PURE; + STDMETHOD(SetSceneBackgroundImage)(THIS_ struct IDirect3DRMTexture *texture) PURE; STDMETHOD(SetSceneFogEnable)(THIS_ BOOL) PURE; STDMETHOD(SetSceneFogColor)(THIS_ D3DCOLOR) PURE; STDMETHOD(SetSceneFogMode)(THIS_ D3DRMFOGMODE) PURE; @@ -1152,7 +1152,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame,IDirect3DRMVisual) STDMETHOD(SetPosition)(THIS_ IDirect3DRMFrame *reference, D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; STDMETHOD(SetRotation)(THIS_ IDirect3DRMFrame *reference, D3DVALUE x, D3DVALUE y, D3DVALUE z, D3DVALUE theta) PURE; STDMETHOD(SetSortMode)(THIS_ D3DRMSORTMODE) PURE; - STDMETHOD(SetTexture)(THIS_ LPDIRECT3DRMTEXTURE) PURE; + STDMETHOD(SetTexture)(THIS_ struct IDirect3DRMTexture *texture) PURE; STDMETHOD(SetTextureTopology)(THIS_ BOOL wrap_u, BOOL wrap_v) PURE; STDMETHOD(SetVelocity)(THIS_ IDirect3DRMFrame *reference, D3DVALUE x, D3DVALUE y, D3DVALUE z, BOOL with_rotation) PURE; @@ -1346,7 +1346,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) STDMETHOD(GetRotation)(THIS_ IDirect3DRMFrame *reference, D3DVECTOR *axis, D3DVALUE *return_theta) PURE; STDMETHOD(GetScene)(THIS_ IDirect3DRMFrame **scene) PURE; STDMETHOD_(D3DRMSORTMODE, GetSortMode)(THIS) PURE; - STDMETHOD(GetTexture)(THIS_ LPDIRECT3DRMTEXTURE *) PURE; + STDMETHOD(GetTexture)(THIS_ struct IDirect3DRMTexture **texture) PURE; STDMETHOD(GetTransform)(THIS_ D3DRMMATRIX4D return_matrix) PURE; STDMETHOD(GetVelocity)(THIS_ IDirect3DRMFrame *reference, D3DVECTOR *return_velocity, BOOL with_rotation) PURE; STDMETHOD(GetOrientation)(THIS_ IDirect3DRMFrame *reference, D3DVECTOR *dir, D3DVECTOR *up) PURE; @@ -1371,7 +1371,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) STDMETHOD(SetSceneBackground)(THIS_ D3DCOLOR) PURE; STDMETHOD(SetSceneBackgroundRGB)(THIS_ D3DVALUE red, D3DVALUE green, D3DVALUE blue) PURE; STDMETHOD(SetSceneBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE; - STDMETHOD(SetSceneBackgroundImage)(THIS_ LPDIRECT3DRMTEXTURE) PURE; + STDMETHOD(SetSceneBackgroundImage)(THIS_ struct IDirect3DRMTexture *texture) PURE; STDMETHOD(SetSceneFogEnable)(THIS_ BOOL) PURE; STDMETHOD(SetSceneFogColor)(THIS_ D3DCOLOR) PURE; STDMETHOD(SetSceneFogMode)(THIS_ D3DRMFOGMODE) PURE; @@ -1385,7 +1385,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) STDMETHOD(SetPosition)(THIS_ IDirect3DRMFrame *reference, D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; STDMETHOD(SetRotation)(THIS_ IDirect3DRMFrame *reference, D3DVALUE x, D3DVALUE y, D3DVALUE z, D3DVALUE theta) PURE; STDMETHOD(SetSortMode)(THIS_ D3DRMSORTMODE) PURE; - STDMETHOD(SetTexture)(THIS_ LPDIRECT3DRMTEXTURE) PURE; + STDMETHOD(SetTexture)(THIS_ struct IDirect3DRMTexture *texture) PURE; STDMETHOD(SetTextureTopology)(THIS_ BOOL wrap_u, BOOL wrap_v) PURE; STDMETHOD(SetVelocity)(THIS_ IDirect3DRMFrame *reference, D3DVALUE x, D3DVALUE y, D3DVALUE z, BOOL with_rotation) PURE; @@ -1921,7 +1921,7 @@ DECLARE_INTERFACE_(IDirect3DRMMesh,IDirect3DRMVisual) STDMETHOD(SetGroupMapping)(THIS_ D3DRMGROUPINDEX id, D3DRMMAPPING value) PURE; STDMETHOD(SetGroupQuality)(THIS_ D3DRMGROUPINDEX id, D3DRMRENDERQUALITY value) PURE; STDMETHOD(SetGroupMaterial)(THIS_ D3DRMGROUPINDEX id, LPDIRECT3DRMMATERIAL value) PURE; - STDMETHOD(SetGroupTexture)(THIS_ D3DRMGROUPINDEX id, LPDIRECT3DRMTEXTURE value) PURE; + STDMETHOD(SetGroupTexture)(THIS_ D3DRMGROUPINDEX id, struct IDirect3DRMTexture *texture) PURE; STDMETHOD_(unsigned, GetGroupCount)(THIS) PURE; STDMETHOD(GetGroup)(THIS_ D3DRMGROUPINDEX id, unsigned *vCount, unsigned *fCount, unsigned *vPerFace, DWORD *fDataSize, unsigned *fData) PURE; @@ -1930,7 +1930,7 @@ DECLARE_INTERFACE_(IDirect3DRMMesh,IDirect3DRMVisual) STDMETHOD_(D3DRMMAPPING, GetGroupMapping)(THIS_ D3DRMGROUPINDEX id) PURE; STDMETHOD_(D3DRMRENDERQUALITY, GetGroupQuality)(THIS_ D3DRMGROUPINDEX id) PURE; STDMETHOD(GetGroupMaterial)(THIS_ D3DRMGROUPINDEX id, LPDIRECT3DRMMATERIAL *returnPtr) PURE; - STDMETHOD(GetGroupTexture)(THIS_ D3DRMGROUPINDEX id, LPDIRECT3DRMTEXTURE *returnPtr) PURE; + STDMETHOD(GetGroupTexture)(THIS_ D3DRMGROUPINDEX id, struct IDirect3DRMTexture **texture) PURE; }; #undef INTERFACE @@ -2285,7 +2285,7 @@ DECLARE_INTERFACE_(IDirect3DRMFace,IDirect3DRMObject) STDMETHOD(AddVertexAndNormalIndexed)(THIS_ DWORD vertex, DWORD normal) PURE; STDMETHOD(SetColorRGB)(THIS_ D3DVALUE, D3DVALUE, D3DVALUE) PURE; STDMETHOD(SetColor)(THIS_ D3DCOLOR) PURE; - STDMETHOD(SetTexture)(THIS_ LPDIRECT3DRMTEXTURE) PURE; + STDMETHOD(SetTexture)(THIS_ struct IDirect3DRMTexture *texture) PURE; STDMETHOD(SetTextureCoordinates)(THIS_ DWORD vertex, D3DVALUE u, D3DVALUE v) PURE; STDMETHOD(SetMaterial)(THIS_ LPDIRECT3DRMMATERIAL) PURE; STDMETHOD(SetTextureTopology)(THIS_ BOOL wrap_u, BOOL wrap_v) PURE; @@ -2294,7 +2294,7 @@ DECLARE_INTERFACE_(IDirect3DRMFace,IDirect3DRMObject) STDMETHOD(GetTextureCoordinates)(THIS_ DWORD vertex, D3DVALUE *u, D3DVALUE *v) PURE; STDMETHOD(GetTextureTopology)(THIS_ BOOL *wrap_u, BOOL *wrap_v) PURE; STDMETHOD(GetNormal)(THIS_ D3DVECTOR *) PURE; - STDMETHOD(GetTexture)(THIS_ LPDIRECT3DRMTEXTURE *) PURE; + STDMETHOD(GetTexture)(THIS_ struct IDirect3DRMTexture **texture) PURE; STDMETHOD(GetMaterial)(THIS_ LPDIRECT3DRMMATERIAL *) PURE; STDMETHOD_(int, GetVertexCount)(THIS) PURE; STDMETHOD_(int, GetVertexIndex)(THIS_ DWORD which) PURE; @@ -2518,7 +2518,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder,IDirect3DRMVisual) STDMETHOD(ReserveSpace)(THIS_ DWORD vertex_Count, DWORD normal_count, DWORD face_count) PURE; STDMETHOD(SetColorRGB)(THIS_ D3DVALUE red, D3DVALUE green, D3DVALUE blue) PURE; STDMETHOD(SetColor)(THIS_ D3DCOLOR) PURE; - STDMETHOD(SetTexture)(THIS_ LPDIRECT3DRMTEXTURE) PURE; + STDMETHOD(SetTexture)(THIS_ struct IDirect3DRMTexture *texture) PURE; STDMETHOD(SetMaterial)(THIS_ LPDIRECT3DRMMATERIAL) PURE; STDMETHOD(SetTextureTopology)(THIS_ BOOL wrap_u, BOOL wrap_v) PURE; STDMETHOD(SetQuality)(THIS_ D3DRMRENDERQUALITY) PURE; @@ -2689,7 +2689,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder) STDMETHOD(ReserveSpace)(THIS_ DWORD vertex_Count, DWORD normal_count, DWORD face_count) PURE; STDMETHOD(SetColorRGB)(THIS_ D3DVALUE red, D3DVALUE green, D3DVALUE blue) PURE; STDMETHOD(SetColor)(THIS_ D3DCOLOR) PURE; - STDMETHOD(SetTexture)(THIS_ LPDIRECT3DRMTEXTURE) PURE; + STDMETHOD(SetTexture)(THIS_ struct IDirect3DRMTexture *texture) PURE; STDMETHOD(SetMaterial)(THIS_ LPDIRECT3DRMMATERIAL) PURE; STDMETHOD(SetTextureTopology)(THIS_ BOOL wrap_u, BOOL wrap_v) PURE; STDMETHOD(SetQuality)(THIS_ D3DRMRENDERQUALITY) PURE;