From bd6abe80e1e77917d8595ebb38198294a68f110c Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Mon, 21 Dec 2009 21:19:44 +0000 Subject: [PATCH] 2009-12-21 22:18 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/src/rdd/wafunc.c * harbour/contrib/rddsql/hbrddsql.h * harbour/contrib/rddsql/sqlbase.c ! casting fod C++ builds * harbour/contrib/hbcairo/paths.c ! fixed very bad typo which probably cause GPF in function CAIRO_GET_CURRENT_POINT() --- harbour/ChangeLog | 10 ++++++++++ harbour/contrib/hbcairo/paths.c | 4 ++-- harbour/contrib/rddsql/hbrddsql.h | 4 ++-- harbour/contrib/rddsql/sqlbase.c | 4 ++-- harbour/src/rdd/wafunc.c | 2 +- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7b463000a8..e8162c579c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,16 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-12-21 22:18 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/src/rdd/wafunc.c + * harbour/contrib/rddsql/hbrddsql.h + * harbour/contrib/rddsql/sqlbase.c + ! casting fod C++ builds + + * harbour/contrib/hbcairo/paths.c + ! fixed very bad typo which probably cause GPF in function + CAIRO_GET_CURRENT_POINT() + 2009-12-21 13:07 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbqt/qtgui/QMenu.cpp * contrib/hbqt/qth/QMenu.qth diff --git a/harbour/contrib/hbcairo/paths.c b/harbour/contrib/hbcairo/paths.c index cadc1336c0..d410658e21 100644 --- a/harbour/contrib/hbcairo/paths.c +++ b/harbour/contrib/hbcairo/paths.c @@ -121,8 +121,8 @@ HB_FUNC( CAIRO_GET_CURRENT_POINT ) double x, y; hb_arrayNew( pItem, 2 ); cairo_get_current_point( pCairo, &x, &y ); - hb_arraySetND( pCairo, 1, x ); - hb_arraySetND( pCairo, 2, y ); + hb_arraySetND( pItem, 1, x ); + hb_arraySetND( pItem, 2, y ); } } diff --git a/harbour/contrib/rddsql/hbrddsql.h b/harbour/contrib/rddsql/hbrddsql.h index f203bb1b79..0493b46e95 100644 --- a/harbour/contrib/rddsql/hbrddsql.h +++ b/harbour/contrib/rddsql/hbrddsql.h @@ -95,10 +95,10 @@ typedef struct _SQLBASEAREA ULONG ulRecCount; /* Total records */ ULONG ulRecMax; /* Size of pRow, pRowFlags buffer */ - void ** pRow; /* array of native pointers or cached PHB_ITEM */ + PHB_ITEM * pRow; /* array of native pointers or cached PHB_ITEM */ BYTE * pRowFlags; - void * pRecord; + PHB_ITEM pRecord; BYTE bRecordFlags; void * pResult; /* SQL result */ diff --git a/harbour/contrib/rddsql/sqlbase.c b/harbour/contrib/rddsql/sqlbase.c index 91160ab12c..9a52d57dce 100644 --- a/harbour/contrib/rddsql/sqlbase.c +++ b/harbour/contrib/rddsql/sqlbase.c @@ -427,7 +427,7 @@ static HB_ERRCODE sqlbaseAppend( SQLBASEAREAP pArea, BOOL bUnLockAll ) if ( pArea->ulRecCount + 1 >= pArea->ulRecMax ) { - pArea->pRow = ( void ** ) hb_xrealloc( pArea->pRow, ( pArea->ulRecMax + SQLDD_ROWSET_RESIZE ) * sizeof( void * ) ); + pArea->pRow = ( PHB_ITEM * ) hb_xrealloc( pArea->pRow, ( pArea->ulRecMax + SQLDD_ROWSET_RESIZE ) * sizeof( PHB_ITEM ) ); pArea->pRowFlags = ( BYTE * ) hb_xrealloc( pArea->pRowFlags, ( pArea->ulRecMax + SQLDD_ROWSET_RESIZE ) * sizeof( BYTE ) ); pArea->ulRecMax += SQLDD_ROWSET_RESIZE; } @@ -746,7 +746,7 @@ static HB_ERRCODE sqlbaseCreate( SQLBASEAREAP pArea, LPDBOPENINFO pOpenInfo ) pArea->ulRecCount = 0; - pArea->pRow = ( void ** ) hb_xalloc( SQLDD_ROWSET_RESIZE * sizeof( void * ) ); + pArea->pRow = ( PHB_ITEM * ) hb_xalloc( SQLDD_ROWSET_RESIZE * sizeof( PHB_ITEM ) ); pArea->pRowFlags = ( BYTE * ) hb_xalloc( SQLDD_ROWSET_RESIZE * sizeof( BYTE ) ); pArea->ulRecMax = SQLDD_ROWSET_RESIZE; diff --git a/harbour/src/rdd/wafunc.c b/harbour/src/rdd/wafunc.c index d623f2a19b..0a9155112d 100644 --- a/harbour/src/rdd/wafunc.c +++ b/harbour/src/rdd/wafunc.c @@ -1248,7 +1248,7 @@ static HB_ERRCODE hb_rddEvalWABlock( AREAP pArea, void * pBlock ) PHB_ITEM pItem; hb_rddSelectWorkAreaNumber( pArea->uiArea ); - pItem = hb_vmEvalBlockOrMacro( pBlock ); + pItem = hb_vmEvalBlockOrMacro( ( PHB_ITEM ) pBlock ); if( hb_vmRequestQuery() != 0 || ( HB_IS_LOGICAL( pItem ) && ! hb_itemGetL( pItem ) ) )