From 595838c3d48817a492ffbbca91554f4304256121 Mon Sep 17 00:00:00 2001 From: Mindaugas Kavaliauskas Date: Fri, 27 Nov 2009 03:21:53 +0000 Subject: [PATCH] 2009-11-27 05:21 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) * harbour/contrib/hbwin/olecore.c ! added missing VARIANT initialization --- harbour/ChangeLog | 4 ++++ harbour/contrib/hbwin/olecore.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 03e1384b98..ca858c756b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,10 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-11-27 05:21 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) + * harbour/contrib/hbwin/olecore.c + ! added missing VARIANT initialization + 2009-11-27 04:29 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) * harbour/contrib/hbwin/olecore.c + added support (VARIANT to ITEM) for multidimensional arrays diff --git a/harbour/contrib/hbwin/olecore.c b/harbour/contrib/hbwin/olecore.c index 4cf741533b..bc6e59c076 100644 --- a/harbour/contrib/hbwin/olecore.c +++ b/harbour/contrib/hbwin/olecore.c @@ -511,7 +511,9 @@ static void hb_oleSafeArrayToItem( PHB_ITEM pItem, SAFEARRAY * pSafeArray, int i SafeArrayGetLBound( pSafeArray, iDim, &lFrom ); SafeArrayGetUBound( pSafeArray, iDim, &lTo ); - iDim--; + if( --iDim == 0 ) + VariantInit( &vItem ); + if( lFrom <= lTo ) { hb_arrayNew( pItem, lTo - lFrom + 1 ); @@ -528,7 +530,6 @@ static void hb_oleSafeArrayToItem( PHB_ITEM pItem, SAFEARRAY * pSafeArray, int i } else hb_oleSafeArrayToItem( hb_arrayGetItemPtr( pItem, ++ul ), pSafeArray, iDim, plIndex ); - } while( ++lFrom <= lTo ); }