Attachment #45141 for issue #77422

View | Details | Raw Unified | Return to issue 77422
Collapse All | Expand All




extern "C" { static void s_pull(va_list param)
{
       uno_EnvCallee * pCallee = va_arg(param, uno_EnvCallee *);
       va_list       * xparam  = va_arg(param, va_list *);

       pCallee(*xparam);
}}

static void s_callInto_v(uno_Environment * pEnv, uno_EnvCallee * pCallee, va_list param)
{
       cppu::Enterable * pEnterable = reinterpret_cast<cppu::Enterable *>(pEnv->pReserved);
       if (pEnterable)
               pEnterable->callInto(s_pull, pCallee, &param);
                               
       else
               pCallee(param);

       uno_Environment * pCurrEnv    = va_arg(param, uno_Environment *);
       uno_Environment * pTargetEnv  = va_arg(param, uno_Environment *);
       uno_EnvCallee   * pCallee = va_arg(param, uno_EnvCallee *);
       va_list         *  xparam  = va_arg(param, va_list *);

       s_environment_invoke_v(pCurrEnv, pTargetEnv, pCallee, *xparam);
}}

static void s_environment_invoke_v(uno_Environment * pCurrEnv, uno_Environment * pTargetEnv, uno_EnvCallee * pCallee, va_list para

       {
       case -1:
               s_setCurrent(pNextEnv);
               s_callOut(pCurrEnv, s_environment_invoke_vv, pNextEnv, pTargetEnv, pCallee, &param);
               s_setCurrent(pCurrEnv);
               break;



       case 1:
               s_setCurrent(pNextEnv);
               s_callInto(pNextEnv, s_environment_invoke_vv, pNextEnv, pTargetEnv, pCallee, &param);
               s_setCurrent(pCurrEnv);
               break;
       }

Return to issue 77422

Lines 228-243 static int s_getNextEnv(uno_Environment Link Here

(-)EnvStack.cxx (-7 / +7 lines)
228	extern "C" { static void s_pull(va_list param)	228	extern "C" { static void s_pull(va_list param)
229	{	229	{
230	uno_EnvCallee * pCallee = va_arg(param, uno_EnvCallee *);	230	uno_EnvCallee * pCallee = va_arg(param, uno_EnvCallee *);
231	va_list xparam = va_arg(param, va_list);	231	va_list * xparam = va_arg(param, va_list *);
232		232
233	pCallee(xparam);	233	pCallee(*xparam);
234	}}	234	}}
235		235
236	static void s_callInto_v(uno_Environment * pEnv, uno_EnvCallee * pCallee, va_list param)	236	static void s_callInto_v(uno_Environment * pEnv, uno_EnvCallee * pCallee, va_list param)
237	{	237	{
238	cppu::Enterable * pEnterable = reinterpret_cast<cppu::Enterable *>(pEnv->pReserved);	238	cppu::Enterable * pEnterable = reinterpret_cast<cppu::Enterable *>(pEnv->pReserved);
239	if (pEnterable)	239	if (pEnterable)
240	pEnterable->callInto(s_pull, pCallee, param);	240	pEnterable->callInto(s_pull, pCallee, &param);
241		241
242	else	242	else
243	pCallee(param);	243	pCallee(param);
Lines 278-286 extern "C" { static void s_environment_i Link Here
278	uno_Environment * pCurrEnv = va_arg(param, uno_Environment *);	278	uno_Environment * pCurrEnv = va_arg(param, uno_Environment *);
279	uno_Environment * pTargetEnv = va_arg(param, uno_Environment *);	279	uno_Environment * pTargetEnv = va_arg(param, uno_Environment *);
280	uno_EnvCallee * pCallee = va_arg(param, uno_EnvCallee *);	280	uno_EnvCallee * pCallee = va_arg(param, uno_EnvCallee *);
281	va_list xparam = va_arg(param, va_list);	281	va_list * xparam = va_arg(param, va_list *);
282		282
283	s_environment_invoke_v(pCurrEnv, pTargetEnv, pCallee, xparam);	283	s_environment_invoke_v(pCurrEnv, pTargetEnv, pCallee, *xparam);
284	}}	284	}}
285		285
286	static void s_environment_invoke_v(uno_Environment * pCurrEnv, uno_Environment * pTargetEnv, uno_EnvCallee * pCallee, va_list para	286	static void s_environment_invoke_v(uno_Environment * pCurrEnv, uno_Environment * pTargetEnv, uno_EnvCallee * pCallee, va_list para
Lines 290-296 static void s_environment_invoke_v(uno_E Link Here
290	{	290	{
291	case -1:	291	case -1:
292	s_setCurrent(pNextEnv);	292	s_setCurrent(pNextEnv);
293	s_callOut(pCurrEnv, s_environment_invoke_vv, pNextEnv, pTargetEnv, pCallee, param);	293	s_callOut(pCurrEnv, s_environment_invoke_vv, pNextEnv, pTargetEnv, pCallee, &param);
294	s_setCurrent(pCurrEnv);	294	s_setCurrent(pCurrEnv);
295	break;	295	break;
296		296
Lines 304-310 static void s_environment_invoke_v(uno_E Link Here
304		304
305	case 1:	305	case 1:
306	s_setCurrent(pNextEnv);	306	s_setCurrent(pNextEnv);
307	s_callInto(pNextEnv, s_environment_invoke_vv, pNextEnv, pTargetEnv, pCallee, param);	307	s_callInto(pNextEnv, s_environment_invoke_vv, pNextEnv, pTargetEnv, pCallee, &param);
308	s_setCurrent(pCurrEnv);	308	s_setCurrent(pCurrEnv);
309	break;	309	break;
310	}	310	}