Nikolay Sivov : propsys: Add support for VT_VECTOR|VT_UI1 type in PropVariantCompareEx().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e91b05bb5be6fd70a767bea9991e818a49cc5547
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=e91b05bb5be6fd70a767bea9991e818a49cc5547

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Mon May 31 13:31:11 2021 +0300

propsys: Add support for VT_VECTOR|VT_UI1 type in PropVariantCompareEx().

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/propsys/propvar.c       | 13 +++++++-
 dlls/propsys/tests/propsys.c | 75 ++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 85 insertions(+), 3 deletions(-)

diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c
index a18d83eabab..977fbebb918 100644
--- a/dlls/propsys/propvar.c
+++ b/dlls/propsys/propvar.c
@@ -798,7 +798,10 @@ static BOOL isemptyornull(const PROPVARIANT *propvar)
     if (propvar->vt == VT_CLSID)
         return !propvar->puuid;
 
-    /* FIXME: vectors, byrefs, errors? */
+    if (propvar->vt & VT_VECTOR)
+        return !propvar->caub.cElems;
+
+    /* FIXME: byrefs, errors? */
     return FALSE;
 }
 
@@ -807,6 +810,7 @@ INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2
 {
     const PROPVARIANT *propvar2_converted;
     PROPVARIANT propvar2_static;
+    unsigned int count;
     HRESULT hr;
     INT res=-1;
 
@@ -894,6 +898,13 @@ INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2
         res = memcmp(propvar1->puuid, propvar2->puuid, sizeof(*propvar1->puuid));
         if (res) res = res > 0 ? 1 : -1;
         break;
+    case VT_VECTOR | VT_UI1:
+        count = min(propvar1->caub.cElems, propvar2->caub.cElems);
+        res = count ? memcmp(propvar1->caub.pElems, propvar2->caub.pElems, sizeof(*propvar1->caub.pElems) * count) : 0;
+        if (res) res = res > 0 ? 1 : -1;
+        if (!res && propvar1->caub.cElems != propvar2->caub.cElems)
+            res = propvar1->caub.cElems > propvar2->caub.cElems ? 1 : -1;
+        break;
     default:
         FIXME("vartype %#x not handled\n", propvar1->vt);
         res = -1;
diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c
index 07d035376d9..9ffa048a8b7 100644
--- a/dlls/propsys/tests/propsys.c
+++ b/dlls/propsys/tests/propsys.c
@@ -666,15 +666,18 @@ static void test_PropVariantToStringAlloc(void)
     CoTaskMemFree(str);
 }
 
-static void test_PropVariantCompare(void)
+static void test_PropVariantCompareEx(void)
 {
     PROPVARIANT empty, null, emptyarray, i2_0, i2_2, i4_large, i4_largeneg, i4_2, str_2, str_02, str_b;
     PROPVARIANT clsid_null, clsid, clsid2, r4_0, r4_2, r8_0, r8_2;
+    PROPVARIANT var1, var2;
     INT res;
     static const WCHAR str_2W[] = {'2', 0};
     static const WCHAR str_02W[] = {'0', '2', 0};
     static const WCHAR str_bW[] = {'b', 0};
     SAFEARRAY emptysafearray;
+    unsigned char bytevector1[] = {1,2,3};
+    unsigned char bytevector2[] = {4,5,6};
 
     PropVariantInit(&empty);
     PropVariantInit(&null);
@@ -847,6 +850,74 @@ todo_wine
     res = PropVariantCompareEx(&r8_2, &r8_0, 0, 0);
     ok(res == 1, "res=%i\n", res);
 
+    /* VT_VECTOR | VT_UI1 */
+    var1.vt = VT_VECTOR | VT_UI1;
+    var1.caub.cElems = 1;
+    var1.caub.pElems = bytevector1;
+    var2.vt = VT_VECTOR | VT_UI1;
+    var2.caub.cElems = 1;
+    var2.caub.pElems = bytevector2;
+
+    res = PropVariantCompareEx(&var1, &var2, 0, 0);
+    ok(res == -1, "res=%i\n", res);
+
+    res = PropVariantCompareEx(&var2, &var1, 0, 0);
+    ok(res == 1, "res=%i\n", res);
+
+    /* Vector length mismatch */
+    var1.caub.cElems = 2;
+    res = PropVariantCompareEx(&var1, &var2, 0, 0);
+    ok(res == -1, "res=%i\n", res);
+
+    res = PropVariantCompareEx(&var2, &var1, 0, 0);
+    ok(res == 1, "res=%i\n", res);
+
+    var1.caub.pElems = bytevector2;
+    var2.caub.pElems = bytevector1;
+    res = PropVariantCompareEx(&var1, &var2, 0, 0);
+    ok(res == 1, "res=%i\n", res);
+
+    var1.caub.pElems = bytevector1;
+    var2.caub.pElems = bytevector2;
+
+    var1.caub.cElems = 1;
+    var2.caub.cElems = 2;
+    res = PropVariantCompareEx(&var1, &var2, 0, 0);
+    ok(res == -1, "res=%i\n", res);
+
+    res = PropVariantCompareEx(&var2, &var1, 0, 0);
+    ok(res == 1, "res=%i\n", res);
+
+    /* Length mismatch over same data */
+    var1.caub.pElems = bytevector1;
+    var2.caub.pElems = bytevector1;
+
+    res = PropVariantCompareEx(&var1, &var2, 0, 0);
+    ok(res == -1, "res=%i\n", res);
+
+    res = PropVariantCompareEx(&var2, &var1, 0, 0);
+    ok(res == 1, "res=%i\n", res);
+
+    var1.caub.cElems = 1;
+    var2.caub.cElems = 1;
+    res = PropVariantCompareEx(&var1, &var2, 0, 0);
+    ok(res == 0, "res=%i\n", res);
+
+    var1.caub.cElems = 0;
+    res = PropVariantCompareEx(&var1, &var2, 0, PVCF_TREATEMPTYASGREATERTHAN);
+    ok(res == 1, "res=%i\n", res);
+    res = PropVariantCompareEx(&var2, &var1, 0, PVCF_TREATEMPTYASGREATERTHAN);
+    ok(res == -1, "res=%i\n", res);
+
+    res = PropVariantCompareEx(&var1, &var2, 0, 0);
+    ok(res == -1, "res=%i\n", res);
+    res = PropVariantCompareEx(&var2, &var1, 0, 0);
+    ok(res == 1, "res=%i\n", res);
+
+    var2.caub.cElems = 0;
+    res = PropVariantCompareEx(&var1, &var2, 0, 0);
+    ok(res == 0, "res=%i\n", res);
+
     SysFreeString(str_2.bstrVal);
     SysFreeString(str_02.bstrVal);
     SysFreeString(str_b.bstrVal);
@@ -1957,7 +2028,7 @@ START_TEST(propsys)
     test_InitPropVariantFromBuffer();
     test_PropVariantToGUID();
     test_PropVariantToStringAlloc();
-    test_PropVariantCompare();
+    test_PropVariantCompareEx();
     test_intconversions();
     test_PropVariantChangeType_LPWSTR();
     test_PropVariantToBoolean();