[PATCH 4/4] d3drm: Implement DeleteKey()
Nikolay Sivov
nsivov at codeweavers.com
Tue Jul 4 02:43:14 CDT 2017
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
dlls/d3drm/frame.c | 45 ++++++++++++++++++++++--------
dlls/d3drm/tests/d3drm.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 106 insertions(+), 11 deletions(-)
diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c
index fe339a2239..e8028a47ef 100644
--- a/dlls/d3drm/frame.c
+++ b/dlls/d3drm/frame.c
@@ -3363,8 +3363,10 @@ static BOOL d3drm_animation_get_range(struct d3drm_animation_keys *keys, D3DVALU
if (time_min > keys->keys[keys->count - 1].time || time_max < keys->keys[0].time)
return FALSE;
- *min = d3drm_animation_get_index(keys, time_min, d3drm_animation_cmp_min);
- *max = d3drm_animation_get_index(keys, time_max, d3drm_animation_cmp_max);
+ if (min)
+ *min = d3drm_animation_get_index(keys, time_min, d3drm_animation_cmp_min);
+ if (max)
+ *max = d3drm_animation_get_index(keys, time_max, d3drm_animation_cmp_max);
return TRUE;
}
@@ -3500,11 +3502,39 @@ static HRESULT WINAPI d3drm_animation1_AddScaleKey(IDirect3DRMAnimation *iface,
return d3drm_animation2_AddScaleKey(&animation->IDirect3DRMAnimation2_iface, time, x, y, z);
}
+static void d3drm_animation_delete_key(struct d3drm_animation_keys *keys, DWORD index)
+{
+ if (index < keys->count - 1)
+ memmove(keys->keys + index, keys->keys + index + 1, sizeof(*keys->keys) * (keys->count - index - 1));
+ keys->count--;
+}
+
+static HRESULT WINAPI d3drm_animation2_DeleteKey(IDirect3DRMAnimation2 *iface, D3DVALUE time)
+{
+ struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface);
+ DWORD index;
+
+ TRACE("iface %p, time %.8e.\n", iface, time);
+
+ if (d3drm_animation_get_range(&animation->rotate, time, time, &index, NULL))
+ d3drm_animation_delete_key(&animation->rotate, index);
+
+ if (d3drm_animation_get_range(&animation->position, time, time, &index, NULL))
+ d3drm_animation_delete_key(&animation->position, index);
+
+ if (d3drm_animation_get_range(&animation->scale, time, time, &index, NULL))
+ d3drm_animation_delete_key(&animation->scale, index);
+
+ return D3DRM_OK;
+}
+
static HRESULT WINAPI d3drm_animation1_DeleteKey(IDirect3DRMAnimation *iface, D3DVALUE time)
{
- FIXME("iface %p, time %.8e.\n", iface, time);
+ struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface);
- return E_NOTIMPL;
+ TRACE("iface %p, time %.8e.\n", iface, time);
+
+ return d3drm_animation2_DeleteKey(&animation->IDirect3DRMAnimation2_iface, time);
}
static HRESULT WINAPI d3drm_animation1_SetFrame(IDirect3DRMAnimation *iface, IDirect3DRMFrame *frame)
@@ -3551,13 +3581,6 @@ static D3DRMANIMATIONOPTIONS WINAPI d3drm_animation1_GetOptions(IDirect3DRMAnima
return d3drm_animation2_GetOptions(&animation->IDirect3DRMAnimation2_iface);
}
-static HRESULT WINAPI d3drm_animation2_DeleteKey(IDirect3DRMAnimation2 *iface, D3DVALUE time)
-{
- FIXME("iface %p, time %.8e.\n", iface, time);
-
- return E_NOTIMPL;
-}
-
static HRESULT WINAPI d3drm_animation2_SetFrame(IDirect3DRMAnimation2 *iface, IDirect3DRMFrame3 *frame)
{
struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface);
diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
index f19558e248..c59763d602 100644
--- a/dlls/d3drm/tests/d3drm.c
+++ b/dlls/d3drm/tests/d3drm.c
@@ -7013,9 +7013,81 @@ static void test_animation(void)
memset(&key, 0, sizeof(key));
key.dwSize = sizeof(key);
key.dwKeyType = D3DRMANIMATION_POSITIONKEY;
+ key.dvPositionKey.x = 8.0f;
hr = IDirect3DRMAnimation2_AddKey(animation2, &key);
ok(SUCCEEDED(hr), "Failed to add key, hr %#x.\n", hr);
+ /* Delete tests. */
+ hr = IDirect3DRMAnimation_AddRotateKey(animation, 0.0f, &q);
+ ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#.x\n", hr);
+
+ hr = IDirect3DRMAnimation_AddScaleKey(animation, 0.0f, 1.0f, 2.0f, 1.0f);
+ ok(SUCCEEDED(hr), "Failed to add scale key, hr %#x.\n", hr);
+
+ count = 0;
+ memset(keys, 0, sizeof(keys));
+ hr = IDirect3DRMAnimation2_GetKeys(animation2, -1000.0f, 1000.0f, &count, keys);
+ ok(SUCCEEDED(hr), "Failed to get key count, hr %#x.\n", hr);
+ ok(count == 9, "Unexpected key count %u.\n", count);
+
+ ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[0].dwKeyType);
+ ok(keys[1].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[1].dwKeyType);
+ ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[2].dwKeyType);
+ ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[3].dwKeyType);
+ ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[4].dwKeyType);
+ ok(keys[5].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[5].dwKeyType);
+ ok(keys[6].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[6].dwKeyType);
+ ok(keys[7].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[7].dwKeyType);
+ ok(keys[8].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[8].dwKeyType);
+
+ ok(keys[0].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[0].dvTime);
+ ok(keys[1].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[1].dvTime);
+ ok(keys[2].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[2].dvTime);
+ ok(keys[3].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[3].dvTime);
+ ok(keys[4].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[4].dvTime);
+ ok(keys[5].dvTime == 80.0f, "Unexpected key time %.8e.\n", keys[5].dvTime);
+ ok(keys[6].dvTime == 99.0f, "Unexpected key time %.8e.\n", keys[6].dvTime);
+ ok(keys[7].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[7].dvTime);
+ ok(keys[8].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[8].dvTime);
+
+ hr = IDirect3DRMAnimation_DeleteKey(animation, -100.0f);
+ ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr);
+
+ hr = IDirect3DRMAnimation_DeleteKey(animation, 100.0f);
+ ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr);
+
+ /* Only first Position keys are not removed. */
+ hr = IDirect3DRMAnimation_DeleteKey(animation, 0.0f);
+ ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr);
+
+ count = 0;
+ memset(keys, 0, sizeof(keys));
+ hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 100.0f, &count, keys);
+ ok(SUCCEEDED(hr), "Failed to get key count, hr %#x.\n", hr);
+ ok(count == 6, "Unexpected key count %u.\n", count);
+
+ ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[0].dwKeyType);
+ ok(keys[1].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[1].dwKeyType);
+ ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[2].dwKeyType);
+ ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[3].dwKeyType);
+ ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[4].dwKeyType);
+ ok(keys[5].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[5].dwKeyType);
+
+ ok(keys[0].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[0].dvTime);
+ ok(keys[1].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[1].dvTime);
+ ok(keys[2].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[2].dvTime);
+ ok(keys[3].dvTime == 80.0f, "Unexpected key time %.8e.\n", keys[3].dvTime);
+ ok(keys[4].dvTime == 99.0f, "Unexpected key time %.8e.\n", keys[4].dvTime);
+ ok(keys[5].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[5].dvTime);
+
+ hr = IDirect3DRMAnimation_DeleteKey(animation, 0.0f);
+ ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr);
+
+ count = 0;
+ hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 100.0f, &count, NULL);
+ ok(SUCCEEDED(hr), "Failed to get key count, hr %#x.\n", hr);
+ ok(count == 3, "Unexpected key count %u.\n", count);
+
IDirect3DRMAnimation2_Release(animation2);
IDirect3DRMAnimation_Release(animation);
--
2.13.2
More information about the wine-patches
mailing list