[PATCH 3/3] dlls/oleau32/tests: convert I8Copy to existing integer test scheme (vartype.c)

Eric Pouech eric.pouech at gmail.com
Fri Mar 11 02:06:22 CST 2022


Signed-off-by: Eric Pouech <eric.pouech at gmail.com>

---
 dlls/oleaut32/tests/vartype.c |   22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c
index 220a5f59c9f..1f8cafc82b8 100644
--- a/dlls/oleaut32/tests/vartype.c
+++ b/dlls/oleaut32/tests/vartype.c
@@ -2057,33 +2057,13 @@ static void test_VarI8FromStr(void)
 
 static void test_VarI8Copy(void)
 {
-  HRESULT hres;
-  VARIANTARG vSrc, vDst;
-  LONGLONG in = 1;
-
   if (!has_i8)
   {
     win_skip("I8 and UI8 data types are not available\n");
     return;
   }
 
-  VariantInit(&vSrc);
-  VariantInit(&vDst);
-  V_VT(&vSrc) = VT_I8;
-  V_I8(&vSrc) = in;
-  hres = VariantCopy(&vDst, &vSrc);
-  ok(hres == S_OK && V_VT(&vDst) == VT_I8 && V_I8(&vDst) == in,
-     "copy hres 0x%X, type %d, value (%x%08x) %x%08x\n",
-     hres, V_VT(&vDst), (UINT)(in >> 32), (UINT)in, (UINT)(V_I8(&vDst) >> 32), (UINT)V_I8(&vDst) );
-  V_VT(&vSrc) = VT_I8|VT_BYREF;
-  V_I8REF(&vSrc) = ∈
-  hres = VariantCopy(&vDst, &vSrc);
-  ok(hres == S_OK && V_VT(&vDst) == (VT_I8|VT_BYREF) && V_I8REF(&vDst) == &in,
-     "ref hres 0x%X, type %d, ref (%p) %p\n", hres, V_VT(&vDst), &in, V_I8REF(&vDst));
-  hres = VariantCopyInd(&vDst, &vSrc);
-  ok(hres == S_OK && V_VT(&vDst) == VT_I8 && V_I8(&vDst) == in,
-     "copy hres 0x%X, type %d, value (%x%08x) %x%08x\n",
-     hres, V_VT(&vDst), (UINT)(in >> 32), (UINT)in, (UINT)(V_I8(&vDst) >> 32), (UINT)V_I8(&vDst) );
+  COPYTEST(1ll, VT_I8, V_I8(&vSrc), V_I8(&vDst), V_I8REF(&vSrc), V_I8REF(&vDst), "%I64d");
 }
 
 static void test_VarI8ChangeTypeEx(void)




More information about the wine-devel mailing list