Module: wine Branch: master Commit: 9ba36da7111b696bfd75637b6068f4435f3a7fa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ba36da7111b696bfd75637b60...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Fri Jun 30 10:41:23 2017 +0300
d3drm: Use AddKey() method internally to add all types of keys.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3drm/frame.c | 106 +++++++++++++++++++++++++++++++---------------- dlls/d3drm/tests/d3drm.c | 1 + 2 files changed, 71 insertions(+), 36 deletions(-)
diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 79a3cb0..a2643fb 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -3272,27 +3272,91 @@ static HRESULT WINAPI d3drm_animation1_SetOptions(IDirect3DRMAnimation *iface, D return d3drm_animation2_SetOptions(&animation->IDirect3DRMAnimation2_iface, options); }
-static HRESULT WINAPI d3drm_animation1_AddRotateKey(IDirect3DRMAnimation *iface, D3DVALUE time, D3DRMQUATERNION *q) +static HRESULT WINAPI d3drm_animation2_AddKey(IDirect3DRMAnimation2 *iface, D3DRMANIMATIONKEY *key) { - FIXME("iface %p, time %.8e, q %p.\n", iface, time, q); + FIXME("iface %p, key %p.\n", iface, key);
return E_NOTIMPL; }
+static HRESULT WINAPI d3drm_animation2_AddRotateKey(IDirect3DRMAnimation2 *iface, D3DVALUE time, D3DRMQUATERNION *q) +{ + D3DRMANIMATIONKEY key; + + TRACE("iface %p, time %.8e, q %p.\n", iface, time, q); + + key.dwSize = sizeof(key); + key.dwKeyType = D3DRMANIMATION_ROTATEKEY; + key.dvTime = time; + key.dwID = 0; + key.u.dqRotateKey = *q; + + return d3drm_animation2_AddKey(iface, &key); +} + +static HRESULT WINAPI d3drm_animation1_AddRotateKey(IDirect3DRMAnimation *iface, D3DVALUE time, D3DRMQUATERNION *q) +{ + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface); + + TRACE("iface %p, time %.8e, q %p.\n", iface, time, q); + + return d3drm_animation2_AddRotateKey(&animation->IDirect3DRMAnimation2_iface, time, q); +} + +static HRESULT WINAPI d3drm_animation2_AddPositionKey(IDirect3DRMAnimation2 *iface, D3DVALUE time, + D3DVALUE x, D3DVALUE y, D3DVALUE z) +{ + D3DRMANIMATIONKEY key; + + TRACE("iface %p, time %.8e, x %.8e, y %.8e, z %.8e.\n", iface, time, x, y, z); + + key.dwSize = sizeof(key); + key.dwKeyType = D3DRMANIMATION_POSITIONKEY; + key.dvTime = time; + key.dwID = 0; + key.u.dvPositionKey.u1.x = x; + key.u.dvPositionKey.u2.y = y; + key.u.dvPositionKey.u3.z = z; + + return d3drm_animation2_AddKey(iface, &key); +} + static HRESULT WINAPI d3drm_animation1_AddPositionKey(IDirect3DRMAnimation *iface, D3DVALUE time, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, time %.8e, x %.8e, y %.8e, z %.8e.\n", iface, time, x, y, z); + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface);
- return E_NOTIMPL; + TRACE("iface %p, time %.8e, x %.8e, y %.8e, z %.8e.\n", iface, time, x, y, z); + + return d3drm_animation2_AddPositionKey(&animation->IDirect3DRMAnimation2_iface, time, x, y, z); +} + +static HRESULT WINAPI d3drm_animation2_AddScaleKey(IDirect3DRMAnimation2 *iface, D3DVALUE time, + D3DVALUE x, D3DVALUE y, D3DVALUE z) +{ + D3DRMANIMATIONKEY key; + + TRACE("iface %p, time %.8e, x %.8e, y %.8e, z %.8e.\n", iface, time, x, y, z); + + key.dwSize = sizeof(key); + key.dwKeyType = D3DRMANIMATION_SCALEKEY; + key.dvTime = time; + key.dwID = 0; + key.u.dvScaleKey.u1.x = x; + key.u.dvScaleKey.u2.y = y; + key.u.dvScaleKey.u3.z = z; + + return d3drm_animation2_AddKey(iface, &key); }
static HRESULT WINAPI d3drm_animation1_AddScaleKey(IDirect3DRMAnimation *iface, D3DVALUE time, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, time %.8e, x %.8e, y %.8e, z %.8e.\n", iface, time, x, y, z); + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface);
- return E_NOTIMPL; + TRACE("iface %p, time %.8e, x %.8e, y %.8e, z %.8e.\n", iface, time, x, y, z); + + return d3drm_animation2_AddScaleKey(&animation->IDirect3DRMAnimation2_iface, time, x, y, z); }
static HRESULT WINAPI d3drm_animation1_DeleteKey(IDirect3DRMAnimation *iface, D3DVALUE time) @@ -3346,29 +3410,6 @@ static D3DRMANIMATIONOPTIONS WINAPI d3drm_animation1_GetOptions(IDirect3DRMAnima return d3drm_animation2_GetOptions(&animation->IDirect3DRMAnimation2_iface); }
-static HRESULT WINAPI d3drm_animation2_AddRotateKey(IDirect3DRMAnimation2 *iface, D3DVALUE time, D3DRMQUATERNION *q) -{ - FIXME("iface %p, time %.8e, q %p.\n", iface, time, q); - - return E_NOTIMPL; -} - -static HRESULT WINAPI d3drm_animation2_AddPositionKey(IDirect3DRMAnimation2 *iface, D3DVALUE time, - D3DVALUE x, D3DVALUE y, D3DVALUE z) -{ - FIXME("iface %p, time %.8e, x %.8e, y %.8e, z %.8e.\n", iface, time, x, y, z); - - return E_NOTIMPL; -} - -static HRESULT WINAPI d3drm_animation2_AddScaleKey(IDirect3DRMAnimation2 *iface, D3DVALUE time, - D3DVALUE x, D3DVALUE y, D3DVALUE z) -{ - FIXME("iface %p, time %.8e, x %.8e, y %.8e, z %.8e.\n", iface, time, x, y, z); - - return E_NOTIMPL; -} - static HRESULT WINAPI d3drm_animation2_DeleteKey(IDirect3DRMAnimation2 *iface, D3DVALUE time) { FIXME("iface %p, time %.8e.\n", iface, time); @@ -3417,13 +3458,6 @@ static HRESULT WINAPI d3drm_animation2_DeleteKeyByID(IDirect3DRMAnimation2 *ifac return E_NOTIMPL; }
-static HRESULT WINAPI d3drm_animation2_AddKey(IDirect3DRMAnimation2 *iface, D3DRMANIMATIONKEY *key) -{ - FIXME("iface %p, key %p.\n", iface, key); - - return E_NOTIMPL; -} - static HRESULT WINAPI d3drm_animation2_ModifyKey(IDirect3DRMAnimation2 *iface, D3DRMANIMATIONKEY *key) { FIXME("iface %p, key %p.\n", iface, key); diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index dcc6dd2..3613b57 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6858,6 +6858,7 @@ if (hr == S_OK) v.z = 0.0f; D3DRMQuaternionFromRotation(&q, &v, 1.0f);
+ /* NULL quaternion pointer leads to a crash on Windows. */ hr = IDirect3DRMAnimation_AddRotateKey(animation, 0.0f, &q); ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#.x\n", hr);
-
Alexandre Julliard