From 3f4fbb20d77a767ca0e72ec1d59ca96a776c348f Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Sat, 22 May 2010 11:41:38 +0000 Subject: [PATCH] 2010-05-22 13:41 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/hbwin/olecore.c * minor modification in hb_oleDispInvoke() function --- harbour/ChangeLog | 4 ++++ harbour/contrib/hbwin/olecore.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ae582c4acd..5686287ddf 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,10 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-05-22 13:41 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/contrib/hbwin/olecore.c + * minor modification in hb_oleDispInvoke() function + 2010-05-22 10:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg ! -hbimplib extended for pocc to first look for any existing diff --git a/harbour/contrib/hbwin/olecore.c b/harbour/contrib/hbwin/olecore.c index fc45f0590d..6baae1ff4e 100644 --- a/harbour/contrib/hbwin/olecore.c +++ b/harbour/contrib/hbwin/olecore.c @@ -1060,7 +1060,7 @@ HB_BOOL hb_oleDispInvoke( PHB_SYMB pSym, PHB_ITEM pObject, PHB_ITEM pParam, pObject = NULL; } - if( ( pSym || ( pObject && HB_IS_BLOCK( pObject ) ) ) && + if( ( pSym || pObject ) && hb_vmRequestReenter() ) { HB_OLE_PARAM_REF refArray[ 32 ]; @@ -1102,7 +1102,7 @@ HB_BOOL hb_oleDispInvoke( PHB_SYMB pSym, PHB_ITEM pObject, PHB_ITEM pParam, &pParams->rgvarg[ iCount - i ] ); } - if( pObject ) + if( pObject && !HB_IS_HASH( pObject ) ) hb_vmSend( ( HB_USHORT ) iParams ); else hb_vmProc( ( HB_USHORT ) iParams );