[PATCH v2 1/9] d3d10core/tests: Allow passing any interface to get_refcount().
Józef Kucia
jkucia at codeweavers.com
Mon Apr 24 05:02:24 CDT 2017
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
Version 2: Avoid using macro.
---
dlls/d3d10core/tests/device.c | 133 +++++++++++++++++++++---------------------
1 file changed, 67 insertions(+), 66 deletions(-)
diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c
index f7f88f4..49de3f8 100644
--- a/dlls/d3d10core/tests/device.c
+++ b/dlls/d3d10core/tests/device.c
@@ -81,10 +81,11 @@ static void set_box(D3D10_BOX *box, UINT left, UINT top, UINT front, UINT right,
box->back = back;
}
-static ULONG get_refcount(IUnknown *iface)
+static ULONG get_refcount(void *iface)
{
- IUnknown_AddRef(iface);
- return IUnknown_Release(iface);
+ IUnknown *unknown = iface;
+ IUnknown_AddRef(unknown);
+ return IUnknown_Release(unknown);
}
static BOOL compare_float(float f, float g, unsigned int ulps)
@@ -1352,16 +1353,16 @@ static void test_create_texture2d(void)
hr = ID3D10Device_CreateTexture2D(device, &desc, &data, &texture);
ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
- expected_refcount = get_refcount((IUnknown *)device) + 1;
+ expected_refcount = get_refcount(device) + 1;
hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture);
ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount);
tmp = NULL;
expected_refcount = refcount + 1;
ID3D10Texture2D_GetDevice(texture, &tmp);
ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
ID3D10Device_Release(tmp);
@@ -1371,16 +1372,16 @@ static void test_create_texture2d(void)
ID3D10Texture2D_Release(texture);
desc.MipLevels = 0;
- expected_refcount = get_refcount((IUnknown *)device) + 1;
+ expected_refcount = get_refcount(device) + 1;
hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture);
ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount);
tmp = NULL;
expected_refcount = refcount + 1;
ID3D10Texture2D_GetDevice(texture, &tmp);
ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
ID3D10Device_Release(tmp);
@@ -1642,16 +1643,16 @@ static void test_create_texture3d(void)
hr = ID3D10Device_CreateTexture3D(device, &desc, &data, &texture);
ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
- expected_refcount = get_refcount((IUnknown *)device) + 1;
+ expected_refcount = get_refcount(device) + 1;
hr = ID3D10Device_CreateTexture3D(device, &desc, NULL, &texture);
ok(SUCCEEDED(hr), "Failed to create a 3d texture, hr %#x.\n", hr);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount);
tmp = NULL;
expected_refcount = refcount + 1;
ID3D10Texture3D_GetDevice(texture, &tmp);
ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
ID3D10Device_Release(tmp);
@@ -1661,16 +1662,16 @@ static void test_create_texture3d(void)
ID3D10Texture3D_Release(texture);
desc.MipLevels = 0;
- expected_refcount = get_refcount((IUnknown *)device) + 1;
+ expected_refcount = get_refcount(device) + 1;
hr = ID3D10Device_CreateTexture3D(device, &desc, NULL, &texture);
ok(SUCCEEDED(hr), "Failed to create a 3d texture, hr %#x.\n", hr);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount);
tmp = NULL;
expected_refcount = refcount + 1;
ID3D10Texture3D_GetDevice(texture, &tmp);
ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
ID3D10Device_Release(tmp);
@@ -1961,16 +1962,16 @@ static void test_create_depthstencil_view(void)
hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture);
ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x.\n", hr);
- expected_refcount = get_refcount((IUnknown *)device) + 1;
+ expected_refcount = get_refcount(device) + 1;
hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, NULL, &dsview);
ok(SUCCEEDED(hr), "Failed to create a depthstencil view, hr %#x.\n", hr);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount);
tmp = NULL;
expected_refcount = refcount + 1;
ID3D10DepthStencilView_GetDevice(dsview, &tmp);
ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
ID3D10Device_Release(tmp);
@@ -2005,10 +2006,10 @@ static void test_create_depthstencil_view(void)
get_dsv_desc(current_desc, &tests[i].dsv_desc);
}
- expected_refcount = get_refcount((IUnknown *)texture);
+ expected_refcount = get_refcount(texture);
hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, current_desc, &dsview);
ok(SUCCEEDED(hr), "Test %u: Failed to create depth stencil view, hr %#x.\n", i, hr);
- refcount = get_refcount((IUnknown *)texture);
+ refcount = get_refcount(texture);
ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount);
hr = ID3D10DepthStencilView_QueryInterface(dsview, &IID_ID3D11DepthStencilView, (void **)&iface);
@@ -2275,16 +2276,16 @@ static void test_create_rendertarget_view(void)
hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &data, &buffer);
ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
- expected_refcount = get_refcount((IUnknown *)device) + 1;
+ expected_refcount = get_refcount(device) + 1;
hr = ID3D10Device_CreateBuffer(device, &buffer_desc, NULL, &buffer);
ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x.\n", hr);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount);
tmp = NULL;
expected_refcount = refcount + 1;
ID3D10Buffer_GetDevice(buffer, &tmp);
ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
ID3D10Device_Release(tmp);
@@ -2296,16 +2297,16 @@ static void test_create_rendertarget_view(void)
hr = ID3D10Device_CreateRenderTargetView(device, NULL, &rtv_desc, &rtview);
ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
- expected_refcount = get_refcount((IUnknown *)device) + 1;
+ expected_refcount = get_refcount(device) + 1;
hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)buffer, &rtv_desc, &rtview);
ok(SUCCEEDED(hr), "Failed to create a rendertarget view, hr %#x.\n", hr);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount);
tmp = NULL;
expected_refcount = refcount + 1;
ID3D10RenderTargetView_GetDevice(rtview, &tmp);
ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
ID3D10Device_Release(tmp);
@@ -2368,10 +2369,10 @@ static void test_create_rendertarget_view(void)
get_rtv_desc(current_desc, &tests[i].rtv_desc);
}
- expected_refcount = get_refcount((IUnknown *)texture);
+ expected_refcount = get_refcount(texture);
hr = ID3D10Device_CreateRenderTargetView(device, texture, current_desc, &rtview);
ok(SUCCEEDED(hr), "Test %u: Failed to create render target view, hr %#x.\n", i, hr);
- refcount = get_refcount((IUnknown *)texture);
+ refcount = get_refcount(texture);
ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount);
hr = ID3D10RenderTargetView_QueryInterface(rtview, &IID_ID3D11RenderTargetView, (void **)&iface);
@@ -2917,16 +2918,16 @@ static void test_create_shader_resource_view(void)
U(srv_desc).Buffer.ElementOffset = 0;
U(srv_desc).Buffer.ElementWidth = 64;
- expected_refcount = get_refcount((IUnknown *)device) + 1;
+ expected_refcount = get_refcount(device) + 1;
hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)buffer, &srv_desc, &srview);
ok(SUCCEEDED(hr), "Failed to create a shader resource view, hr %#x.\n", hr);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount);
tmp = NULL;
expected_refcount = refcount + 1;
ID3D10ShaderResourceView_GetDevice(srview, &tmp);
ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
ID3D10Device_Release(tmp);
@@ -2996,10 +2997,10 @@ static void test_create_shader_resource_view(void)
get_srv_desc(current_desc, &tests[i].srv_desc);
}
- expected_refcount = get_refcount((IUnknown *)texture);
+ expected_refcount = get_refcount(texture);
hr = ID3D10Device_CreateShaderResourceView(device, texture, current_desc, &srview);
ok(SUCCEEDED(hr), "Test %u: Failed to create a shader resource view, hr %#x.\n", i, hr);
- refcount = get_refcount((IUnknown *)texture);
+ refcount = get_refcount(texture);
ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount);
hr = ID3D10ShaderResourceView_QueryInterface(srview, &IID_ID3D10ShaderResourceView1, (void **)&iface);
@@ -3228,17 +3229,17 @@ void main(point float4 vin[1] : POSITION, inout TriangleStream<gs_out> vout)
}
/* vertex shader */
- expected_refcount = get_refcount((IUnknown *)device) + 1;
+ expected_refcount = get_refcount(device) + 1;
hr = ID3D10Device_CreateVertexShader(device, vs_4_0, sizeof(vs_4_0), &vs);
ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x\n", hr);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount);
tmp = NULL;
expected_refcount = refcount + 1;
ID3D10VertexShader_GetDevice(vs, &tmp);
ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
ID3D10Device_Release(tmp);
@@ -3260,17 +3261,17 @@ void main(point float4 vin[1] : POSITION, inout TriangleStream<gs_out> vout)
ok(hr == E_INVALIDARG, "Created a SM4 vertex shader from a pixel shader source, hr %#x\n", hr);
/* pixel shader */
- expected_refcount = get_refcount((IUnknown *)device) + 1;
+ expected_refcount = get_refcount(device) + 1;
hr = ID3D10Device_CreatePixelShader(device, ps_4_0, sizeof(ps_4_0), &ps);
ok(SUCCEEDED(hr), "Failed to create SM4 pixel shader, hr %#x.\n", hr);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount);
tmp = NULL;
expected_refcount = refcount + 1;
ID3D10PixelShader_GetDevice(ps, &tmp);
ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
ID3D10Device_Release(tmp);
@@ -3283,17 +3284,17 @@ void main(point float4 vin[1] : POSITION, inout TriangleStream<gs_out> vout)
ok(!refcount, "Pixel shader has %u references left.\n", refcount);
/* geometry shader */
- expected_refcount = get_refcount((IUnknown *)device) + 1;
+ expected_refcount = get_refcount(device) + 1;
hr = ID3D10Device_CreateGeometryShader(device, gs_4_0, sizeof(gs_4_0), &gs);
ok(SUCCEEDED(hr), "Failed to create SM4 geometry shader, hr %#x.\n", hr);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount);
tmp = NULL;
expected_refcount = refcount + 1;
ID3D10GeometryShader_GetDevice(gs, &tmp);
ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
ID3D10Device_Release(tmp);
@@ -3376,19 +3377,19 @@ static void test_create_sampler_state(void)
desc.MinLOD = 0.0f;
desc.MaxLOD = 16.0f;
- expected_refcount = get_refcount((IUnknown *)device) + 1;
+ expected_refcount = get_refcount(device) + 1;
hr = ID3D10Device_CreateSamplerState(device, &desc, &sampler_state1);
ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr);
hr = ID3D10Device_CreateSamplerState(device, &desc, &sampler_state2);
ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr);
ok(sampler_state1 == sampler_state2, "Got different sampler state objects.\n");
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount);
tmp = NULL;
expected_refcount = refcount + 1;
ID3D10SamplerState_GetDevice(sampler_state1, &tmp);
ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
ID3D10Device_Release(tmp);
@@ -3541,19 +3542,19 @@ static void test_create_blend_state(void)
blend_desc.RenderTargetWriteMask[i] = D3D10_COLOR_WRITE_ENABLE_ALL;
}
- expected_refcount = get_refcount((IUnknown *)device) + 1;
+ expected_refcount = get_refcount(device) + 1;
hr = ID3D10Device_CreateBlendState(device, &blend_desc, &blend_state1);
ok(SUCCEEDED(hr), "Failed to create blend state, hr %#x.\n", hr);
hr = ID3D10Device_CreateBlendState(device, &blend_desc, &blend_state2);
ok(SUCCEEDED(hr), "Failed to create blend state, hr %#x.\n", hr);
ok(blend_state1 == blend_state2, "Got different blend state objects.\n");
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount);
tmp = NULL;
expected_refcount = refcount + 1;
ID3D10BlendState_GetDevice(blend_state1, &tmp);
ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
ID3D10Device_Release(tmp);
@@ -3727,19 +3728,19 @@ static void test_create_depthstencil_state(void)
ds_desc.BackFace.StencilPassOp = D3D10_STENCIL_OP_KEEP;
ds_desc.BackFace.StencilFunc = D3D10_COMPARISON_ALWAYS;
- expected_refcount = get_refcount((IUnknown *)device) + 1;
+ expected_refcount = get_refcount(device) + 1;
hr = ID3D10Device_CreateDepthStencilState(device, &ds_desc, &ds_state1);
ok(SUCCEEDED(hr), "Failed to create depthstencil state, hr %#x.\n", hr);
hr = ID3D10Device_CreateDepthStencilState(device, &ds_desc, &ds_state2);
ok(SUCCEEDED(hr), "Failed to create depthstencil state, hr %#x.\n", hr);
ok(ds_state1 == ds_state2, "Got different depthstencil state objects.\n");
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount);
tmp = NULL;
expected_refcount = refcount + 1;
ID3D10DepthStencilState_GetDevice(ds_state1, &tmp);
ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
ID3D10Device_Release(tmp);
@@ -3827,19 +3828,19 @@ static void test_create_rasterizer_state(void)
rast_desc.MultisampleEnable = FALSE;
rast_desc.AntialiasedLineEnable = FALSE;
- expected_refcount = get_refcount((IUnknown *)device) + 1;
+ expected_refcount = get_refcount(device) + 1;
hr = ID3D10Device_CreateRasterizerState(device, &rast_desc, &rast_state1);
ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr);
hr = ID3D10Device_CreateRasterizerState(device, &rast_desc, &rast_state2);
ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr);
ok(rast_state1 == rast_state2, "Got different rasterizer state objects.\n");
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount);
tmp = NULL;
expected_refcount = refcount + 1;
ID3D10RasterizerState_GetDevice(rast_state1, &tmp);
ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
ID3D10Device_Release(tmp);
@@ -3927,16 +3928,16 @@ static void test_create_query(void)
}
query_desc.Query = D3D10_QUERY_OCCLUSION_PREDICATE;
- expected_refcount = get_refcount((IUnknown *)device) + 1;
+ expected_refcount = get_refcount(device) + 1;
hr = ID3D10Device_CreatePredicate(device, &query_desc, &predicate);
ok(SUCCEEDED(hr), "Failed to create predicate, hr %#x.\n", hr);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount);
tmp = NULL;
expected_refcount = refcount + 1;
ID3D10Predicate_GetDevice(predicate, &tmp);
ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device);
- refcount = get_refcount((IUnknown *)device);
+ refcount = get_refcount(device);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
ID3D10Device_Release(tmp);
hr = ID3D10Predicate_QueryInterface(predicate, &IID_ID3D11Predicate, (void **)&iface);
@@ -7123,23 +7124,23 @@ static void test_private_data(void)
ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size);
IDXGIDevice_Release(dxgi_device);
- refcount = get_refcount((IUnknown *)test_object);
+ refcount = get_refcount(test_object);
hr = ID3D10Device_SetPrivateDataInterface(device, &test_guid,
(IUnknown *)test_object);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
expected_refcount = refcount + 1;
- refcount = get_refcount((IUnknown *)test_object);
+ refcount = get_refcount(test_object);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
hr = ID3D10Device_SetPrivateDataInterface(device, &test_guid,
(IUnknown *)test_object);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
- refcount = get_refcount((IUnknown *)test_object);
+ refcount = get_refcount(test_object);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
hr = ID3D10Device_SetPrivateDataInterface(device, &test_guid, NULL);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
--expected_refcount;
- refcount = get_refcount((IUnknown *)test_object);
+ refcount = get_refcount(test_object);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
hr = ID3D10Device_SetPrivateDataInterface(device, &test_guid,
@@ -7148,7 +7149,7 @@ static void test_private_data(void)
size = sizeof(data);
hr = ID3D10Device_SetPrivateData(device, &test_guid, size, data);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
- refcount = get_refcount((IUnknown *)test_object);
+ refcount = get_refcount(test_object);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
hr = ID3D10Device_SetPrivateData(device, &test_guid, 42, NULL);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
@@ -7165,7 +7166,7 @@ static void test_private_data(void)
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
ok(size == sizeof(test_object), "Got unexpected size %u.\n", size);
++expected_refcount;
- refcount = get_refcount((IUnknown *)test_object);
+ refcount = get_refcount(test_object);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
IUnknown_Release(ptr);
--expected_refcount;
@@ -7182,7 +7183,7 @@ static void test_private_data(void)
ok(ptr == (IUnknown *)test_object, "Got unexpected ptr %p, expected %p.\n", ptr, test_object);
IUnknown_Release(ptr);
ID3D11Device_Release(d3d11_device);
- refcount = get_refcount((IUnknown *)test_object);
+ refcount = get_refcount(test_object);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n",
refcount, expected_refcount);
}
@@ -7196,7 +7197,7 @@ static void test_private_data(void)
hr = ID3D10Device_GetPrivateData(device, &test_guid, &size, NULL);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
ok(size == sizeof(device), "Got unexpected size %u.\n", size);
- refcount = get_refcount((IUnknown *)test_object);
+ refcount = get_refcount(test_object);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
size = 1;
@@ -8334,7 +8335,7 @@ static void test_swapchain_views(void)
device = test_context.device;
- refcount = get_refcount((IUnknown *)test_context.backbuffer);
+ refcount = get_refcount(test_context.backbuffer);
ok(refcount == 1, "Got refcount %u.\n", refcount);
rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB;
--
2.10.2
More information about the wine-patches
mailing list