[8/10] d3drm: Move GetTextureCoordinates from IDirect3DRMMeshBuilder2 to IDirect3DRMMeshBuilder3 (try 2)

[André Hentschel]

---
 dlls/d3drm/meshbuilder.c |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c
index 0fd7537..9709a7e 100644
--- a/dlls/d3drm/meshbuilder.c
+++ b/dlls/d3drm/meshbuilder.c
@@ -772,15 +772,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetTextureCoordinates(IDirect3
 {
     IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface);
 
-    FIXME("(%p)->(%d,%p,%p): stub\n", This, index, u, v);
+    TRACE("(%p)->(%d,%p,%p)\n", This, index, u, v);
 
-    if (index >= This->nb_coords2d)
-        return D3DRMERR_NOTFOUND;
-
-    *u = This->pCoords2d[index].u;
-    *v = This->pCoords2d[index].v;
-
-    return D3DRM_OK;
+    return IDirect3DRMMeshBuilder_GetTextureCoordinates(&This->IDirect3DRMMeshBuilder3_iface,
+                                                        index, u, v);
 }
 
 static int WINAPI IDirect3DRMMeshBuilder2Impl_AddVertex(IDirect3DRMMeshBuilder2* iface,
@@ -1579,9 +1574,15 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetTextureCoordinates(IDirect3
 {
     IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface);
 
-    FIXME("(%p)->(%d,%p,%p): stub\n", This, index, u, v);
+    TRACE("(%p)->(%d,%p,%p)\n", This, index, u, v);
 
-    return E_NOTIMPL;
+    if (index >= This->nb_coords2d)
+        return D3DRMERR_NOTFOUND;
+
+    *u = This->pCoords2d[index].u;
+    *v = This->pCoords2d[index].v;
+
+    return D3DRM_OK;
 }
 
 
-- 

Best Regards, André Hentschel
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: Nachrichtenteil als Anhang
URL: <http://www.winehq.org/pipermail/wine-patches/attachments/20120113/894357c4/attachment.ksh>