[3/6] d3drm: Implement IDirect3DRMViewportX_[Get|Set]Field

André Hentschel nerv at dawncrow.de
Thu Jul 26 09:28:50 CDT 2012


---
 dlls/d3drm/viewport.c |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c
index 0aed98e..093b57a 100644
--- a/dlls/d3drm/viewport.c
+++ b/dlls/d3drm/viewport.c
@@ -38,6 +38,7 @@ typedef struct {
     LONG ref;
     D3DVALUE back;
     D3DVALUE front;
+    D3DVALUE field;
 } IDirect3DRMViewportImpl;
 
 static inline IDirect3DRMViewportImpl *impl_from_IDirect3DRMViewport(IDirect3DRMViewport *iface)
@@ -239,9 +240,9 @@ static HRESULT WINAPI IDirect3DRMViewportImpl_SetField(IDirect3DRMViewport* ifac
 {
     IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport(iface);
 
-    FIXME("(%p/%p)->(%f): stub\n", iface, This, field);
+    TRACE("(%p/%p)->(%f)\n", iface, This, field);
 
-    return E_NOTIMPL;
+    return IDirect3DRMViewport2_SetField(&This->IDirect3DRMViewport2_iface, field);
 }
 
 static HRESULT WINAPI IDirect3DRMViewportImpl_SetUniformScaling(IDirect3DRMViewport* iface, BOOL b)
@@ -414,9 +415,9 @@ static D3DVALUE WINAPI IDirect3DRMViewportImpl_GetField(IDirect3DRMViewport* ifa
 {
     IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport(iface);
 
-    FIXME("(%p/%p)->(): stub\n", iface, This);
+    TRACE("(%p/%p)->()\n", iface, This);
 
-    return E_NOTIMPL;
+    return IDirect3DRMViewport2_GetField(&This->IDirect3DRMViewport2_iface);
 }
 
 static D3DVALUE WINAPI IDirect3DRMViewportImpl_GetBack(IDirect3DRMViewport* iface)
@@ -664,9 +665,11 @@ static HRESULT WINAPI IDirect3DRMViewport2Impl_SetField(IDirect3DRMViewport2* if
 {
     IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport2(iface);
 
-    FIXME("(%p/%p)->(%f): stub\n", iface, This, field);
+    TRACE("(%p/%p)->(%f)\n", iface, This, field);
 
-    return E_NOTIMPL;
+    This->field = field;
+
+    return D3DRM_OK;
 }
 
 static HRESULT WINAPI IDirect3DRMViewport2Impl_SetUniformScaling(IDirect3DRMViewport2* iface, BOOL b)
@@ -839,9 +842,9 @@ static D3DVALUE WINAPI IDirect3DRMViewport2Impl_GetField(IDirect3DRMViewport2* i
 {
     IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport2(iface);
 
-    FIXME("(%p/%p)->(): stub\n", iface, This);
+    TRACE("(%p/%p)->()\n", iface, This);
 
-    return E_NOTIMPL;
+    return This->field;
 }
 
 static D3DVALUE WINAPI IDirect3DRMViewport2Impl_GetBack(IDirect3DRMViewport2* iface)
-- 

Best Regards, André Hentschel


More information about the wine-patches mailing list