Skip to content

W
wine-winehq
Commit 7ba0c5f3 authored by Marcus Meissner's avatar Marcus Meissner Committed by Alexandre Julliard
Browse files
Options

VarAdd: set 'rc' correctly from BSTR addition.

parent 84213a37
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
dlls/oleaut32/variant.c
View file @ 7ba0c5f3
......@@ -2692,7 +2692,7 @@ HRESULT WINAPI VarI2FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, short* psO
double dValue = 0.0;
LPSTR pNewString = NULL;
TRACE("( %p, 0x%08lx, 0x%08lx, %p ), stub\n", strIn, lcid, dwFlags, psOut );
TRACE("( %s, 0x%08lx, 0x%08lx, %p ), stub\n", debugstr_w(strIn), lcid, dwFlags, psOut );
/* Check if we have a valid argument
*/
......@@ -5345,7 +5345,7 @@ HRESULT WINAPI VarAdd(LPVARIANT left, LPVARIANT right, LPVARIANT result)
if ((V_VT(left)&VT_TYPEMASK) == VT_BSTR &&
(V_VT(right)&VT_TYPEMASK) == VT_BSTR) {
V_VT(result) = VT_BSTR;
VarBstrCat(V_BSTR(left), V_BSTR(right), &V_BSTR(result));
rc = VarBstrCat(V_BSTR(left), V_BSTR(right), &V_BSTR(result));
} else {
/* Integers */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment