Module: wine Branch: master Commit: 24ccf11739dc0af0861a38da87e04730fba05c79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24ccf11739dc0af0861a38da8...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Wed Apr 13 09:21:47 2022 +0300
d3dxof/tests: Simplify refcount helper.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Matteo Bruni mbruni@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3dxof/tests/d3dxof.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 05f92bab8cb..edb5d8547e6 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -394,10 +394,11 @@ static void init_function_pointers(void) pDirectXFileCreate = (void *)GetProcAddress(hd3dxof, "DirectXFileCreate"); }
-static ULONG getRefcount(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 void test_refcount(void) @@ -423,7 +424,7 @@ static void test_refcount(void) return; }
- ref = getRefcount( (IUnknown *) lpDirectXFile); + ref = get_refcount(lpDirectXFile); ok(ref == 1, "Unexpected refcount %ld.\n", ref); ref = IDirectXFile_AddRef(lpDirectXFile); ok(ref == 2, "Unexpected refcount %ld.\n", ref); @@ -437,33 +438,33 @@ static void test_refcount(void) dxflm.dSize = sizeof(object) - 1; hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - ref = getRefcount( (IUnknown *) lpDirectXFile); + ref = get_refcount(lpDirectXFile); ok(ref == 1, "Unexpected refcount %ld.\n", ref); - ref = getRefcount( (IUnknown *) lpdxfeo); + ref = get_refcount(lpdxfeo); ok(ref == 1, "Unexpected refcount %ld.\n", ref);
hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - ref = getRefcount( (IUnknown *) lpDirectXFile); + ref = get_refcount(lpDirectXFile); ok(ref == 1, "Unexpected refcount %ld.\n", ref); - ref = getRefcount( (IUnknown *) lpdxfeo); + ref = get_refcount(lpdxfeo); ok(ref == 1, "Unexpected refcount %ld.\n", ref); /* Enum object gets references to all top level objects */ - ref = getRefcount( (IUnknown *) lpdxfd); + ref = get_refcount(lpdxfd); ok(ref == 2, "Unexpected refcount %ld.\n", ref);
ref = IDirectXFile_Release(lpDirectXFile); ok(!ref, "Unexpected refcount %ld.\n", ref); /* Nothing changes for all other objects */ - ref = getRefcount( (IUnknown *) lpdxfeo); + ref = get_refcount(lpdxfeo); ok(ref == 1, "Unexpected refcount %ld.\n", ref); - ref = getRefcount( (IUnknown *) lpdxfd); + ref = get_refcount(lpdxfd); ok(ref == 2, "Unexpected refcount %ld.\n", ref);
ref = IDirectXFileEnumObject_Release(lpdxfeo); ok(!ref, "Unexpected refcount %ld.\n", ref); /* Enum object releases references to all top level objects */ - ref = getRefcount( (IUnknown *) lpdxfd); + ref = get_refcount(lpdxfd); ok(ref == 1, "Unexpected refcount %ld.\n", ref);
ref = IDirectXFileData_Release(lpdxfd);