diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b23361abf9..8dee35fbd9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,14 @@ The license applies to all entries newer than 2009-04-28. */ +2012-09-17 14:47 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * harbour/contrib/hbwin/olecore.c + ! fixed problems reported by Jose F. Gimenez + * renamed recently added PRG functions to follow Mindaugas suggestion: + __oleVariantNew( [, ] ) -> + __oleVariantGetValue( ) -> + __oleVariantGetType( ) -> + 2012-09-17 14:03 UTC+0200 Viktor Szakats (harbour syenar.net) + contrib/hbwin/oemansi.c * contrib/hbwin/hbwin.hbp diff --git a/harbour/contrib/hbwin/olecore.c b/harbour/contrib/hbwin/olecore.c index 0ca5e05c04..1d2945ad95 100644 --- a/harbour/contrib/hbwin/olecore.c +++ b/harbour/contrib/hbwin/olecore.c @@ -438,7 +438,7 @@ VARIANT * hb_oleItemGetVariant( PHB_ITEM pItem ) PHB_ITEM hb_oleItemPutVariant( PHB_ITEM pItem, VARIANT * pVariant, HB_BOOL fMove ) { - VARIANT * pDestVariant = ( VARIANT * ) hb_gcAllocate( sizeof( VARIANT ), &s_gcOleFuncs ); + VARIANT * pDestVariant = ( VARIANT * ) hb_gcAllocate( sizeof( VARIANT ), &s_gcVariantFuncs ); if( fMove ) { @@ -2075,8 +2075,8 @@ HB_FUNC( __OLEINVOKEPUT ) } -/* __oleVariantValue( ) -> */ -HB_FUNC( __OLEVARIANTVALUE ) +/* __oleVariantGetValue( ) -> */ +HB_FUNC( __OLEVARIANTGETVALUE ) { VARIANT * pVariant = hb_oleVariantParam( 1 ); @@ -2084,8 +2084,8 @@ HB_FUNC( __OLEVARIANTVALUE ) hb_oleVariantToItemEx( hb_stackReturnItem(), pVariant, 0 ); } -/* __oleVariantType( ) -> */ -HB_FUNC( __OLEVARIANTTYPE ) +/* __oleVariantGetType( ) -> */ +HB_FUNC( __OLEVARIANTGETTYPE ) { VARIANT * pVariant = hb_oleVariantParam( 1 ); @@ -2093,8 +2093,8 @@ HB_FUNC( __OLEVARIANTTYPE ) hb_retni( V_VT( pVariant ) ); } -/* __oleVariant( [, ] ) -> */ -HB_FUNC( __OLEVARIANT ) +/* __oleVariantNew( [, ] ) -> */ +HB_FUNC( __OLEVARIANTNEW ) { int iType = hb_parni( 1 ); PHB_ITEM pInit = hb_param( 2, HB_IT_ANY ); @@ -2244,7 +2244,7 @@ HB_FUNC( __OLEVARIANT ) if( pInit == NULL || HB_IS_NUMERIC( pInit ) ) { V_VT( &variant ) = VT_DECIMAL; - VarDecFromR8( hb_itemGetND( pInit ), &V_DECIMAL( &variant ) ); + VarDecFromR8( hb_itemGetND( pInit ), &HB_WIN_U1( &variant, decVal ) /*&V_DECIMAL( &variant )*/ ); } break;