[PATCH] shlwapi/tests: Avoid casts from COM object to interface

[Michael Stefaniuc]

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
 dlls/shlwapi/tests/ordinal.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c
index 919cac8563f..bf43d35b1c2 100644
--- a/dlls/shlwapi/tests/ordinal.c
+++ b/dlls/shlwapi/tests/ordinal.c
@@ -1423,7 +1423,7 @@ static HRESULT WINAPI Contain_FindConnectionPoint(
     else
     {
         *ppCP = iface->pt[0];
-        IUnknown_AddRef((IUnknown*)*ppCP);
+        IConnectionPoint_AddRef(*ppCP);
     }
 
     return S_OK;
@@ -1459,7 +1459,8 @@ static void test_IConnectionPoint(void)
     dispatch->IDispatch_iface.lpVtbl = &disp_vtbl;
     dispatch->refCount = 1;
 
-    rc = pConnectToConnectionPoint((IUnknown*)dispatch, &IID_NULL, TRUE, (IUnknown*)container, &cookie, &point);
+    rc = pConnectToConnectionPoint((IUnknown*)&dispatch->IDispatch_iface, &IID_NULL, TRUE,
+                                   (IUnknown*)&container->IConnectionPointContainer_iface, &cookie, &point);
     ok(rc == S_OK, "pConnectToConnectionPoint failed with %x\n",rc);
     ok(point != NULL, "returned ConnectionPoint is NULL\n");
     ok(cookie != 0xffffffff, "invalid cookie returned\n");
@@ -1475,15 +1476,16 @@ static void test_IConnectionPoint(void)
     rc = pIConnectionPoint_SimpleInvoke(point,0xa1,¶ms);
     ok(rc == S_OK, "pConnectToConnectionPoint failed with %x\n",rc);
 
-    rc = pConnectToConnectionPoint(NULL, &IID_NULL, FALSE, (IUnknown*)container, &cookie, NULL);
+    rc = pConnectToConnectionPoint(NULL, &IID_NULL, FALSE,
+                                   (IUnknown*)&container->IConnectionPointContainer_iface, &cookie, NULL);
     ok(rc == S_OK, "pConnectToConnectionPoint failed with %x\n",rc);
 
 /* MSDN says this should be required but it crashes on XP
     IUnknown_Release(point);
 */
-    ref = IUnknown_Release((IUnknown*)container);
+    ref = IConnectionPointContainer_Release(&container->IConnectionPointContainer_iface);
     ok(ref == 0, "leftover IConnectionPointContainer reference %i\n",ref);
-    ref = IUnknown_Release((IUnknown*)dispatch);
+    ref = IDispatch_Release(&dispatch->IDispatch_iface);
     ok(ref == 0, "leftover IDispatch reference %i\n",ref);
 }
 
@@ -1593,7 +1595,7 @@ static void test_SHPropertyBag_ReadLONG(void)
     rc = pSHPropertyBag_ReadLONG(&pb->IPropertyBag_iface, szName1, &out);
     ok(rc == DISP_E_BADVARTYPE || broken(rc == S_OK) || broken(rc == S_FALSE), "incorrect return %x\n",rc);
     ok(out == 0xfeedface  || broken(out == 0xfeedfa00), "value should not have changed %x\n",out);
-    IUnknown_Release((IUnknown*)pb);
+    IPropertyBag_Release(&pb->IPropertyBag_iface);
 }
 
 static void test_SHSetWindowBits(void)
-- 
2.31.1

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=96352

Your paranoid android.


=== debiant2 (32 bit Hindi:India report) ===

shlwapi:
ordinal.c:1727: Test failed: expected ( ), got (03:16)
ordinal.c:1734: Test failed: expected ( ), got (03:16:09)
ordinal.c:1742: Test failed: expected ( ), got (03:16:09)
ordinal.c:1749: Test failed: expected ( ), got (26-08-2021)
ordinal.c:1756: Test failed: expected ( ), got (26 ????? 2021)
ordinal.c:1764: Test failed: expected ( ), got (26 ????? 2021)
ordinal.c:1772: Test failed: expected (F), got (6) for time part
ordinal.c:1786: Test failed: expected (F), got (9) for time part
ordinal.c:1804: Test failed: expected (  F), got (26-08-2021 03:16)
ordinal.c:1815: Test failed: expected (  F F), got (26-08-2021 03:16:09)