André Hentschel : d3drm: Fix initial specular value of the Material2 interface.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b2de41308ef095f6b854c1027c23d59d45643f1f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b2de41308ef095f6b854c1027c...

Author: André Hentschel 
Date:   Sun Jun 17 15:38:50 2012 +0200

d3drm: Fix initial specular value of the Material2 interface.

---

dlls/d3drm/material.c    |    4 ++++
 dlls/d3drm/tests/d3drm.c |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/dlls/d3drm/material.c b/dlls/d3drm/material.c
index 6ac08e3..0c1fa8c 100644
--- a/dlls/d3drm/material.c
+++ b/dlls/d3drm/material.c
@@ -320,6 +320,10 @@ HRESULT Direct3DRMMaterial_create(IDirect3DRMMaterial2** ret_iface)
     object->IDirect3DRMMaterial2_iface.lpVtbl = &Direct3DRMMaterial2_Vtbl;
     object->ref = 1;

+    object->specular.r = 1.0f;
+    object->specular.g = 1.0f;
+    object->specular.b = 1.0f;
+
     *ret_iface = &object->IDirect3DRMMaterial2_iface;

return S_OK;
diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
index 8753653..dbfd7d1 100644
--- a/dlls/d3drm/tests/d3drm.c
+++ b/dlls/d3drm/tests/d3drm.c
@@ -1006,7 +1006,7 @@ static void test_Material2(void)

hr = IDirect3DRMMaterial2_GetSpecular(pMaterial2, &r, &g, &b);
     ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr);
-    todo_wine ok(r == 1.0f && g == 1.0f && b == 1.0f, "wrong specular r=%f g=%f b=%f, expected r=1.0 g=1.0 b=1.0\n", r, g, b);
+    ok(r == 1.0f && g == 1.0f && b == 1.0f, "wrong specular r=%f g=%f b=%f, expected r=1.0 g=1.0 b=1.0\n", r, g, b);

hr = IDirect3DRMMaterial2_GetAmbient(pMaterial2, &r, &g, &b);
     ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr);