Nikolay Sivov : oleaut32: Remove some local variables in Invoke() that don't improve readability.
Alexandre Julliard
julliard at winehq.org
Fri Sep 17 16:03:09 CDT 2021
Module: wine
Branch: master
Commit: 82f71d8bbef0e81a8d8e67b3ac5d5dd549336e91
URL: https://source.winehq.org/git/wine.git/?a=commit;h=82f71d8bbef0e81a8d8e67b3ac5d5dd549336e91
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Fri Sep 17 14:12:53 2021 +0300
oleaut32: Remove some local variables in Invoke() that don't improve readability.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/oleaut32/typelib.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 5c5aca63538..70f15679811 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -7269,7 +7269,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
case FUNC_VIRTUAL: {
void *buffer = heap_alloc_zero(INVBUF_ELEMENT_SIZE * func_desc->cParams);
VARIANT varresult;
- VARIANT retval; /* pointer for storing byref retvals in */
+ VARIANT retval = {{{0}}}; /* pointer for storing byref retvals in */
VARIANTARG **prgpvarg = INVBUF_GET_ARG_PTR_ARRAY(buffer, func_desc->cParams);
VARIANTARG *rgvarg = INVBUF_GET_ARG_ARRAY(buffer, func_desc->cParams);
VARTYPE *rgvt = INVBUF_GET_ARG_TYPE_ARRAY(buffer, func_desc->cParams);
@@ -7315,10 +7315,9 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
if (wParamFlags & PARAMFLAG_FLCID)
{
- VARIANTARG *arg;
- arg = prgpvarg[i] = &rgvarg[i];
- V_VT(arg) = VT_I4;
- V_I4(arg) = This->pTypeLib->lcid;
+ prgpvarg[i] = &rgvarg[i];
+ V_VT(prgpvarg[i]) = VT_I4;
+ V_I4(prgpvarg[i]) = This->pTypeLib->lcid;
continue;
}
@@ -7359,11 +7358,9 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
* native does */
if (i == func_desc->cParams - 1)
{
- VARIANTARG *arg;
- arg = prgpvarg[i] = &rgvarg[i];
- V_VT(arg) = rgvt[i];
- memset(&retval, 0, sizeof(retval));
- V_BYREF(arg) = &retval;
+ prgpvarg[i] = &rgvarg[i];
+ V_BYREF(prgpvarg[i]) = &retval;
+ V_VT(prgpvarg[i]) = rgvt[i];
}
else
{
More information about the wine-cvs
mailing list