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

2017-05-12 22:17 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* contrib/hbwin/olecore.c
    ! do not use SafeArrayGetVartype() with some chosen builds C compilers
      which do not support it
This commit is contained in:
Przemysław Czerpak
2017-05-12 22:17:36 +02:00
parent 099222a923
commit c495cba8ca
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.txt
View File

@@ -10,6 +10,11 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2017-05-12 22:17 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* contrib/hbwin/olecore.c
! do not use SafeArrayGetVartype() with some chosen builds C compilers
which do not support it
2017-05-12 21:18 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* contrib/hbwin/olecore.c
* changed tagVARIANT member used in hack extracting variant value

10
contrib/hbwin/olecore.c
View File

@@ -66,6 +66,12 @@
#define HB_OLE_NO_LLREF
#endif
#if ! defined( HB_OLE_NO_SAFEARRAYGETVARTYPE ) && \
( defined( __DMC__ ) || \
defined( __MINGW32CE__ ) || \
( defined( __WATCOMC__ ) && ( __WATCOMC__ < 1270 ) ) )
#define HB_OLE_NO_SAFEARRAYGETVARTYPE
#endif
/* base date value in OLE (1899-12-30) as julian day */
#define HB_OLE_DATE_BASE 0x0024D9AB
@@ -758,10 +764,12 @@ static SAFEARRAY * hb_oleSafeArrayFromItem( PHB_ITEM pItem, VARTYPE vt )
static HB_BOOL hb_oleSafeArrayToString( PHB_ITEM pItem, SAFEARRAY * pSafeArray )
{
long lFrom, lTo;
VARTYPE vt;
VARTYPE vt = VT_UI1;
if( SafeArrayGetElemsize( pSafeArray ) == 1 &&
#if ! defined( HB_OLE_NO_SAFEARRAYGETVARTYPE )
SafeArrayGetVartype( pSafeArray, &vt ) == S_OK &&
#endif
( vt == VT_I1 || vt == VT_UI1 ) &&
SafeArrayGetLBound( pSafeArray, 1, &lFrom ) == S_OK &&
SafeArrayGetUBound( pSafeArray, 1, &lTo ) == S_OK &&