oleaut32: Omit [lcid] parameter when rewriting FUNCDESC to FUNC_DISPATCH.

[lcid] parameters are supplied from IDispatch::Invoke's parameters, rather than via DISPPARAMS::rgvargs[] and should also be removed from the FUNC_DISPATCH translation. Signed-off-by: Kevin Puetz <PuetzKevinA@JohnDeere.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

oleaut32: Omit [lcid] parameter when rewriting FUNCDESC to FUNC_DISPATCH.
269207e6 · Kevin Puetz · Alexandre Julliard · 9bc78976 · 269207e6
Commit 269207e6 authored Sep 28, 2020 by Kevin Puetz Committed by Alexandre Julliard Sep 28, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

typelib.c dlls/oleaut32/typelib.c +4 -0

No files found.
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -5887,6 +5887,10 @@ static HRESULT TLB_AllocAndInitFuncDesc( const FUNCDESC *src, FUNCDESC **dest_pt
             * not pVarResult.  So the function signature should show no return value. */
            dest->elemdescFunc.tdesc.vt = VT_VOID;

+        /* The now-last (except [retval], removed above) parameter might be labeled [lcid].
+         * If so it will be supplied from Invoke(lcid), so also not via DISPPARAMS::rgvarg */
+        if (dest->cParams && (dest->lprgelemdescParam[dest->cParams - 1].u.paramdesc.wParamFlags & PARAMFLAG_FLCID))
+            dest->cParams--;
    }

    *dest_ptr = dest;