[PATCH 2/2] d3drm/tests: Add tests for IDirect3DRMObject::Add/DeleteDestroyCallback (v3).
Aaryaman Vasishta
jem456.vasishta at gmail.com
Mon Apr 11 13:04:32 CDT 2016
v3: Added tests to check call order.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta at gmail.com>
---
dlls/d3drm/tests/d3drm.c | 240 ++++++++++++++++++++++-------------------------
1 file changed, 114 insertions(+), 126 deletions(-)
diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
index 72691f7..a8f9c40 100644
--- a/dlls/d3drm/tests/d3drm.c
+++ b/dlls/d3drm/tests/d3drm.c
@@ -1219,15 +1219,23 @@ static void test_Frame(void)
struct destroy_context
{
IDirect3DRMObject *obj;
+ unsigned int test_idx;
int called;
};
+struct callback_order
+{
+ void *callback;
+ void *context;
+} corder[3], d3drm_corder[3];
+
static void CDECL destroy_callback(IDirect3DRMObject *obj, void *arg)
{
struct destroy_context *ctxt = arg;
ok(ctxt->called == 1 || ctxt->called == 2, "got called counter %d\n", ctxt->called);
ok(obj == ctxt->obj, "called with %p, expected %p\n", obj, ctxt->obj);
- ctxt->called++;
+ d3drm_corder[ctxt->called].callback = &destroy_callback;
+ d3drm_corder[ctxt->called++].context = ctxt;
}
static void CDECL destroy_callback1(IDirect3DRMObject *obj, void *arg)
@@ -1235,7 +1243,108 @@ static void CDECL destroy_callback1(IDirect3DRMObject *obj, void *arg)
struct destroy_context *ctxt = (struct destroy_context*)arg;
ok(ctxt->called == 0, "got called counter %d\n", ctxt->called);
ok(obj == ctxt->obj, "called with %p, expected %p\n", obj, ctxt->obj);
- ctxt->called++;
+ d3drm_corder[ctxt->called].callback = &destroy_callback1;
+ d3drm_corder[ctxt->called++].context = ctxt;
+}
+
+static void test_destroy_callback(unsigned int test_idx, REFCLSID clsid, REFIID iid)
+{
+ struct destroy_context context;
+ IDirect3DRMObject *obj;
+ IUnknown *unknown;
+ IDirect3DRM *d3drm;
+ HRESULT hr;
+ int i;
+
+ hr = Direct3DRMCreate(&d3drm);
+ ok(SUCCEEDED(hr), "Test %u: Cannot get IDirect3DRM interface (hr = %x).\n", test_idx, hr);
+
+ hr = IDirect3DRM_CreateObject(d3drm, clsid, NULL, iid, (void **)&unknown);
+ ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface (hr = %x).\n", test_idx, hr);
+ hr = IUnknown_QueryInterface(unknown, &IID_IDirect3DRMObject, (void**)&obj);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ IUnknown_Release(unknown);
+
+ context.called = 0;
+ context.test_idx = test_idx;
+ context.obj = obj;
+
+ hr = IDirect3DRMObject_AddDestroyCallback(obj, NULL, &context);
+ ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRMERR_BADVALUE (hr = %x).\n", test_idx, hr);
+
+ hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ corder[2].callback = &destroy_callback;
+ corder[2].context = &context;
+
+ /* same callback added twice */
+ hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ corder[1].callback = &destroy_callback;
+ corder[1].context = &context;
+
+ hr = IDirect3DRMObject_DeleteDestroyCallback(obj, destroy_callback1, NULL);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+
+ hr = IDirect3DRMObject_DeleteDestroyCallback(obj, destroy_callback1, &context);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+
+ /* add one more */
+ hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback1, &context);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ corder[0].callback = &destroy_callback1;
+ corder[0].context = &context;
+
+ hr = IDirect3DRMObject_DeleteDestroyCallback(obj, NULL, NULL);
+ ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRM_BADVALUE (hr = %x).\n", test_idx, hr);
+
+ context.called = 0;
+ IDirect3DRMObject_Release(obj);
+ ok(context.called == 3, "Test %u: got %d, expected 3.\n", test_idx, context.called);
+ for (i = 0; i < context.called; i++)
+ {
+ ok(corder[i].callback == d3drm_corder[i].callback
+ && corder[i].context == d3drm_corder[i].context,
+ "Expected callback = %p, context = %p. Got callback = %p, context = %p.\n", d3drm_corder[i].callback,
+ d3drm_corder[i].context, corder[i].callback, corder[i].context);
+ }
+
+ /* test this pattern - add cb1, add cb2, add cb1, delete cb1 */
+ hr = IDirect3DRM_CreateObject(d3drm, clsid, NULL, iid, (void **)&unknown);
+ ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface (hr = %x).\n", test_idx, hr);
+ hr = IUnknown_QueryInterface(unknown, &IID_IDirect3DRMObject, (void**)&obj);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ IUnknown_Release(unknown);
+
+ hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ corder[1].callback = &destroy_callback;
+ corder[1].context = &context;
+
+ hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback1, &context);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ corder[0].callback = &destroy_callback1;
+ corder[0].context = &context;
+
+ hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+
+ hr = IDirect3DRMObject_DeleteDestroyCallback(obj, destroy_callback, &context);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+
+ context.called = 0;
+ hr = IDirect3DRMObject_QueryInterface(obj, &IID_IDirect3DRMObject, (void**)&context.obj);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ IDirect3DRMObject_Release(context.obj);
+ IUnknown_Release(unknown);
+ ok(context.called == 2, "Test %u: got %d, expected 2.\n", test_idx, context.called);
+ for (i = 0; i < context.called; i++)
+ {
+ ok(corder[i].callback == d3drm_corder[i].callback
+ && corder[i].context == d3drm_corder[i].context,
+ "Expected callback = %p, context = %p. Got callback = %p, context = %p.\n", d3drm_corder[i].callback,
+ d3drm_corder[i].context, corder[i].callback, corder[i].context);
+ }
}
static void test_object(void)
@@ -1300,6 +1409,9 @@ static void test_object(void)
ref4 = get_refcount((IUnknown *)d3drm3);
ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+ /* test Add/Destroy callbacks */
+ test_destroy_callback(i, tests[i].clsid, tests[i].iid);
+
hr = IDirect3DRM2_CreateObject(d3drm2, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown);
ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr);
ref2 = get_refcount((IUnknown *)d3drm1);
@@ -1341,7 +1453,6 @@ static void test_object(void)
static void test_Viewport(void)
{
- struct destroy_context context;
IDirectDrawClipper *pClipper;
HRESULT hr;
IDirect3DRM *d3drm;
@@ -1427,129 +1538,6 @@ static void test_Viewport(void)
ok(data == 1, "got %x\n", data);
IDirect3DRMViewport2_Release(viewport2);
- /* destroy callback */
- context.called = 0;
- hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMObject, (void**)&context.obj);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
- IDirect3DRMObject_Release(context.obj);
-
- hr = IDirect3DRMViewport_AddDestroyCallback(viewport, NULL, &context);
- ok(hr == D3DRMERR_BADVALUE, "expected D3DRMERR_BADVALUE (hr = %x)\n", hr);
-
- hr = IDirect3DRMViewport_AddDestroyCallback(viewport, destroy_callback, &context);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
-
- /* same callback added twice */
- hr = IDirect3DRMViewport_AddDestroyCallback(viewport, destroy_callback, &context);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
-
- hr = IDirect3DRMViewport_DeleteDestroyCallback(viewport, destroy_callback1, NULL);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
-
- hr = IDirect3DRMViewport_DeleteDestroyCallback(viewport, destroy_callback1, &context);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
-
- /* add one more */
- hr = IDirect3DRMViewport_AddDestroyCallback(viewport, destroy_callback1, &context);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
-
- hr = IDirect3DRMViewport_DeleteDestroyCallback(viewport, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "expected D3DRM_BADVALUE (hr = %x)\n", hr);
-
- context.called = 0;
- IDirect3DRMViewport_Release(viewport);
- ok(context.called == 3, "got %d, expected 3\n", context.called);
-
- /* test this pattern - add cb1, add cb2, add cb1, delete cb1 */
- hr = IDirect3DRM_CreateViewport(d3drm, device, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr);
-
- hr = IDirect3DRMViewport_AddDestroyCallback(viewport, destroy_callback, &context);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
-
- hr = IDirect3DRMViewport_AddDestroyCallback(viewport, destroy_callback1, &context);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
-
- hr = IDirect3DRMViewport_AddDestroyCallback(viewport, destroy_callback, &context);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
-
- hr = IDirect3DRMViewport_DeleteDestroyCallback(viewport, destroy_callback, &context);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
-
- context.called = 0;
- hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMObject, (void**)&context.obj);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
- IDirect3DRMObject_Release(context.obj);
- IDirect3DRMViewport_Release(viewport);
- ok(context.called == 2, "got %d, expected 2\n", context.called);
-
- /* destroy from Viewport2 */
- hr = IDirect3DRM_CreateViewport(d3drm, device, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr);
-
- hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMViewport2, (void**)&viewport2);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
- IDirect3DRMViewport_Release(viewport);
-
- context.called = 0;
- hr = IDirect3DRMViewport2_QueryInterface(viewport2, &IID_IDirect3DRMObject, (void**)&context.obj);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
- IDirect3DRMObject_Release(context.obj);
-
- hr = IDirect3DRMViewport2_AddDestroyCallback(viewport2, NULL, &context);
- ok(hr == D3DRMERR_BADVALUE, "expected D3DRMERR_BADVALUE (hr = %x)\n", hr);
-
- hr = IDirect3DRMViewport2_AddDestroyCallback(viewport2, destroy_callback, &context);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
-
- /* same callback added twice */
- hr = IDirect3DRMViewport2_AddDestroyCallback(viewport2, destroy_callback, &context);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
-
- hr = IDirect3DRMViewport2_DeleteDestroyCallback(viewport2, destroy_callback1, NULL);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
-
- hr = IDirect3DRMViewport2_DeleteDestroyCallback(viewport2, destroy_callback1, &context);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
-
- /* add one more */
- hr = IDirect3DRMViewport2_AddDestroyCallback(viewport2, destroy_callback1, &context);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
-
- hr = IDirect3DRMViewport2_DeleteDestroyCallback(viewport2, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "expected D3DRM_BADVALUE (hr = %x)\n", hr);
-
- context.called = 0;
- IDirect3DRMViewport2_Release(viewport2);
- ok(context.called == 3, "got %d, expected 3\n", context.called);
-
- /* test this pattern - add cb1, add cb2, add cb1, delete cb1 */
- hr = IDirect3DRM_CreateViewport(d3drm, device, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr);
-
- hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMViewport2, (void**)&viewport2);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
- IDirect3DRMViewport_Release(viewport);
-
- hr = IDirect3DRMViewport2_AddDestroyCallback(viewport2, destroy_callback, &context);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
-
- hr = IDirect3DRMViewport2_AddDestroyCallback(viewport2, destroy_callback1, &context);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
-
- hr = IDirect3DRMViewport2_AddDestroyCallback(viewport2, destroy_callback, &context);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
-
- hr = IDirect3DRMViewport2_DeleteDestroyCallback(viewport2, destroy_callback, &context);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
-
- context.called = 0;
- hr = IDirect3DRMViewport2_QueryInterface(viewport2, &IID_IDirect3DRMObject, (void**)&context.obj);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
- IDirect3DRMObject_Release(context.obj);
- IDirect3DRMViewport2_Release(viewport2);
- ok(context.called == 2, "got %d, expected 2\n", context.called);
-
IDirect3DRMFrame_Release(frame);
IDirect3DRMDevice_Release(device);
IDirectDrawClipper_Release(pClipper);
--
2.3.2 (Apple Git-55)
More information about the wine-patches
mailing list