[PATCH 0/2] MR4515: oleaut32: VarMod() fixes

[PATCH 1/2] oleaut32: Fully initialize VarMod() return value for Empty % x case.

[Nikolay Sivov]

From: Nikolay Sivov

---
 dlls/oleaut32/tests/vartest.c | 3 ++-
 dlls/oleaut32/variant.c       | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c
index cf93e4cd5fc..c2b5b4113d7 100644
--- a/dlls/oleaut32/tests/vartest.c
+++ b/dlls/oleaut32/tests/vartest.c
@@ -3513,7 +3513,8 @@ static void test_Mod( int line, VARIANT *left, VARIANT *right, VARIANT *expected
     VARIANT result;
     HRESULT hres;

-    memset( &result, 0, sizeof(result) );
+    V_VT(&result) = 15;
+    V_I4(&result) = 0x12345;
     hres = pVarMod( left, right, &result );
     ok_(__FILE__,line)( hres == expres, "wrong result %lx/%lx\n", hres, expres );
     if (hres == S_OK)
diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c
index b3c96b18c2b..9e1fefe9705 100644
--- a/dlls/oleaut32/variant.c
+++ b/dlls/oleaut32/variant.c
@@ -5499,6 +5499,7 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result)
       if(V_VT(left) == VT_EMPTY)
       {
    V_VT(result) = VT_I4;
+        V_I4(result) = 0;
         rc = S_OK;
         goto end;
       }

[PATCH 2/2] oleaut32: Always reset return type for VarMod().

[Nikolay Sivov]

From: Nikolay Sivov

---
 dlls/oleaut32/tests/vartest.c | 7 +++++++
 dlls/oleaut32/variant.c       | 1 +
 2 files changed, 8 insertions(+)

diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c
index c2b5b4113d7..4751070827c 100644
--- a/dlls/oleaut32/tests/vartest.c
+++ b/dlls/oleaut32/tests/vartest.c
@@ -3518,8 +3518,15 @@ static void test_Mod( int line, VARIANT *left, VARIANT *right, VARIANT *expected
     hres = pVarMod( left, right, &result );
     ok_(__FILE__,line)( hres == expres, "wrong result %lx/%lx\n", hres, expres );
     if (hres == S_OK)
+    {
         ok_(__FILE__,line)( is_expected_variant( &result, expected ),
                             "got %s expected %s\n", variantstr(&result), variantstr(expected) );
+    }
+    else
+    {
+        ok_(__FILE__,line)( V_VT(&result) == VT_EMPTY, "Unexpected type %d.\n", V_VT(&result) );
+        ok_(__FILE__,line)( V_I4(&result) == 0x12345, "Unexpected value %ld.\n", V_I4(&result) );
+    }
 }

#define VARMOD(vt1,vt2,val1,val2,rvt,rval)               \
diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c
index 9e1fefe9705..bb1e83e9b7e 100644
--- a/dlls/oleaut32/variant.c
+++ b/dlls/oleaut32/variant.c
@@ -5410,6 +5410,7 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result)
     VariantInit(&tempRight);
     VariantInit(&lv);
     VariantInit(&rv);
+    V_VT(result) = VT_EMPTY;

TRACE("(%s,%s,%p)\n", debugstr_variant(left), debugstr_variant(right), result);

[PATCH 2/2] oleaut32: Always reset return type for VarMod().

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=140410

Your paranoid android.

=== debian11b (64 bit WoW report) ===

Report validation errors:
kernel32:console crashed (c0000005)