fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2017-05-10 16:39 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* contrib/hbwin/olecore.c
    - removed support for VT_DECIMAL and VT_PTR arrays from
      __oleVariantNew() - I found in MSDN that such types are
      unsupported in SAFEARRAYs
    ! fixed indexes in array conversion in __oleVariantNew()
    ! fixed conversion to VT_BSTR arrays in __oleVariantNew()
This commit is contained in:
Przemysław Czerpak
2017-05-10 16:39:38 +02:00
parent a13eebf540
commit 79df0b6559
2 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog.txt
View File

@@ -10,6 +10,14 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2017-05-10 16:39 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* contrib/hbwin/olecore.c
- removed support for VT_DECIMAL and VT_PTR arrays from
__oleVariantNew() - I found in MSDN that such types are
unsupported in SAFEARRAYs
! fixed indexes in array conversion in __oleVariantNew()
! fixed conversion to VT_BSTR arrays in __oleVariantNew()
2017-05-10 12:27 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* contrib/hbwin/olecore.c
+ automatically add WIN_VT_ARRAY bit in 1-st parameter of

23
contrib/hbwin/olecore.c
View File

@@ -602,13 +602,6 @@ static SAFEARRAY * hb_oleSafeArrayFromItem( PHB_ITEM pItem, VARTYPE vt )
ptr = &V_CY( &v );
}
break;
case VT_DECIMAL:
if( pStr == NULL )
{
VarDecFromR8( hb_arrayGetND( pItem, uiPos ), &HB_WIN_U1( &v, decVal ) /*&V_DECIMAL( &v )*/ );
ptr = &HB_WIN_U1( &v, decVal ); /*&V_DECIMAL( &v )*/
}
break;
case VT_DATE:
if( pStr == NULL )
{
@@ -616,28 +609,16 @@ static SAFEARRAY * hb_oleSafeArrayFromItem( PHB_ITEM pItem, VARTYPE vt )
ptr = &V_R8( &v );
}
break;
#ifdef HB_OLE_PASS_POINTERS
case VT_PTR:
if( pStr == NULL )
{
V_BYREF( &v ) = hb_arrayGetPtr( pItem, uiPos );
ptr = &V_BYREF( &v );
}
break;
#endif
case VT_BSTR:
if( pStr == NULL )
{
V_BSTR( &v ) = hb_oleItemToString( hb_arrayGetItemPtr( pItem, uiPos ) );
ptr = &V_BSTR( &v );
}
ptr = hb_oleItemToString( hb_arrayGetItemPtr( pItem, uiPos ) );
break;
}
if( ptr != NULL )
{
long lIndex[ 1 ];
lIndex[ 0 ] = ( long ) uiPos;
lIndex[ 0 ] = ( long ) uiPos - 1;
SafeArrayPutElement( pSafeArray, lIndex, ptr );
}
else