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

2009-12-21 22:18 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* 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()
This commit is contained in:
Przemyslaw Czerpak
2009-12-21 21:19:44 +00:00
parent 43a0857846
commit bd6abe80e1
5 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
harbour/ChangeLog
View File

@@ -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

4
harbour/contrib/hbcairo/paths.c
View File

@@ -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 );
}
}

4
harbour/contrib/rddsql/hbrddsql.h
View File

@@ -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 */

4
harbour/contrib/rddsql/sqlbase.c
View File

@@ -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;

2
harbour/src/rdd/wafunc.c
View File

@@ -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 ) ) )