d3drm/tests: Release two retrieved interfaces to allow proper cleanup. (try 3)

[Bernhard Übelacker]

Valgrind shows two possible leaks in d3drm/tests/d3drm.c
https://bugs.winehq.org/show_bug.cgi?id=36748

==10558== 120 bytes in 1 blocks are possibly lost in loss record 800 of 1,583
==10558==    at 0x7BC4F6B7: initialize_block (heap.c:232)
==10558==    by 0x7BC4F6B7: RtlAllocateHeap (???:0)
==10558==    by 0x4D66128: Direct3DRMFrame_create (frame.c:2280)
==10558==    by 0x4D55225: d3drm1_CreateFrame (d3drm.c:152)
==10558==    by 0x4C1F88C: test_Frame (d3drm.c:902)
==10558==    by 0x4C29085: func_d3drm (d3drm.c:3701)
==10558==    by 0x4C195D8: main (test.h:584)
==10558==
==10558== 120 bytes in 1 blocks are possibly lost in loss record 801 of 1,583
==10558==    at 0x7BC4F6B7: initialize_block (heap.c:232)
==10558==    by 0x7BC4F6B7: RtlAllocateHeap (???:0)
==10558==    by 0x4D66128: Direct3DRMFrame_create (frame.c:2280)
==10558==    by 0x4D55225: d3drm1_CreateFrame (d3drm.c:152)
==10558==    by 0x4C1FCE9: test_Frame (d3drm.c:941)
==10558==    by 0x4C29085: func_d3drm (d3drm.c:3701)
==10558==    by 0x4C195D8: main (test.h:584)

Try 1: https://www.winehq.org/pipermail/wine-patches/2015-October/143274.html
Review 1: https://www.winehq.org/pipermail/wine-devel/2015-October/109767.html
          https://www.winehq.org/pipermail/wine-devel/2015-October/109782.html
          https://www.winehq.org/pipermail/wine-devel/2015-October/109783.html

Changes in try 2:
- No explicit IDirect3DRMFrame_DeleteChild needed.

Try 2: https://www.winehq.org/pipermail/wine-patches/2015-October/143327.html

No changes in try 3.

Signed-off-by: Bernhard Übelacker <bernhardu at vr-web.de>
---
 dlls/d3drm/tests/d3drm.c | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
index d973d88..c94d31e 100644
--- a/dlls/d3drm/tests/d3drm.c
+++ b/dlls/d3drm/tests/d3drm.c
@@ -994,6 +994,8 @@ static void test_Frame(void)
     ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
     ok(pFrameTmp == pFrameP1, "pFrameTmp = %p\n", pFrameTmp);
     CHECK_REFCOUNT(pFrameP1, 2);
+    IDirect3DRMFrame_Release(pFrameTmp);
+    CHECK_REFCOUNT(pFrameP1, 1);
 
     /* Add child to second parent */
     hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrameP2);
@@ -1037,6 +1039,8 @@ static void test_Frame(void)
     ok(pFrameTmp == pFrameP2, "pFrameTmp = %p\n", pFrameTmp);
     CHECK_REFCOUNT(pFrameP2, 2);
     CHECK_REFCOUNT(pFrameC, 2);
+    IDirect3DRMFrame_Release(pFrameTmp);
+    CHECK_REFCOUNT(pFrameP2, 1);
 
     /* Add child again */
     hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC);
@@ -1088,7 +1092,7 @@ static void test_Frame(void)
 
     hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameP1);
     ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
-    CHECK_REFCOUNT(pFrameP1, 3);
+    CHECK_REFCOUNT(pFrameP1, 2);
 
     frame_array = NULL;
     hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array);
@@ -1111,11 +1115,11 @@ static void test_Frame(void)
     /* [Add/Delete]Visual with NULL pointer */
     hr = IDirect3DRMFrame_AddVisual(pFrameP1, NULL);
     ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
-    CHECK_REFCOUNT(pFrameP1, 3);
+    CHECK_REFCOUNT(pFrameP1, 2);
 
     hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, NULL);
     ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
-    CHECK_REFCOUNT(pFrameP1, 3);
+    CHECK_REFCOUNT(pFrameP1, 2);
 
     /* Create Visual */
     hr = IDirect3DRM_CreateMeshBuilder(d3drm, &mesh_builder);
@@ -1125,7 +1129,7 @@ static void test_Frame(void)
     /* Add Visual to first parent */
     hr = IDirect3DRMFrame_AddVisual(pFrameP1, visual1);
     ok(hr == D3DRM_OK, "Cannot add visual (hr = %x)\n", hr);
-    CHECK_REFCOUNT(pFrameP1, 3);
+    CHECK_REFCOUNT(pFrameP1, 2);
     CHECK_REFCOUNT(visual1, 2);
 
     visual_array = NULL;
@@ -1145,17 +1149,17 @@ static void test_Frame(void)
     /* Delete Visual */
     hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, visual1);
     ok(hr == D3DRM_OK, "Cannot delete visual (hr = %x)\n", hr);
-    CHECK_REFCOUNT(pFrameP1, 3);
+    CHECK_REFCOUNT(pFrameP1, 2);
     IDirect3DRMMeshBuilder_Release(mesh_builder);
 
     /* [Add/Delete]Light with NULL pointer */
     hr = IDirect3DRMFrame_AddLight(pFrameP1, NULL);
     ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
-    CHECK_REFCOUNT(pFrameP1, 3);
+    CHECK_REFCOUNT(pFrameP1, 2);
 
     hr = IDirect3DRMFrame_DeleteLight(pFrameP1, NULL);
     ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
-    CHECK_REFCOUNT(pFrameP1, 3);
+    CHECK_REFCOUNT(pFrameP1, 2);
 
     /* Create Light */
     hr = IDirect3DRM_CreateLightRGB(d3drm, D3DRMLIGHT_SPOT, 0.1, 0.2, 0.3, &light1);
@@ -1164,7 +1168,7 @@ static void test_Frame(void)
     /* Add Light to first parent */
     hr = IDirect3DRMFrame_AddLight(pFrameP1, light1);
     ok(hr == D3DRM_OK, "Cannot add light (hr = %x)\n", hr);
-    CHECK_REFCOUNT(pFrameP1, 3);
+    CHECK_REFCOUNT(pFrameP1, 2);
     CHECK_REFCOUNT(light1, 2);
 
     light_array = NULL;
@@ -1184,7 +1188,7 @@ static void test_Frame(void)
     /* Delete Light */
     hr = IDirect3DRMFrame_DeleteLight(pFrameP1, light1);
     ok(hr == D3DRM_OK, "Cannot delete light (hr = %x)\n", hr);
-    CHECK_REFCOUNT(pFrameP1, 3);
+    CHECK_REFCOUNT(pFrameP1, 2);
     IDirect3DRMLight_Release(light1);
 
     /* Test SceneBackground on first parent */
@@ -1203,8 +1207,8 @@ static void test_Frame(void)
 
     /* Cleanup */
     IDirect3DRMFrame_Release(pFrameP2);
-    CHECK_REFCOUNT(pFrameC, 2);
-    CHECK_REFCOUNT(pFrameP1, 3);
+    CHECK_REFCOUNT(pFrameC, 1);
+    CHECK_REFCOUNT(pFrameP1, 1);
 
     IDirect3DRMFrame_Release(pFrameC);
     IDirect3DRMFrame_Release(pFrameP1);
-- 
2.1.4