Module: wine Branch: master Commit: bda6decd473f0dd5a32ed6fe4a6cc55ab7a14bad URL: https://gitlab.winehq.org/wine/wine/-/commit/bda6decd473f0dd5a32ed6fe4a6cc55...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Sun Nov 26 23:29:32 2023 +0100
oleaut32: Fully initialize VarMod() return value for Empty % x case.
---
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; }