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

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

Browse Source 
* harbour/contrib/rddsql/hbrddsql.h
  * harbour/contrib/rddsql/sqlbase.c
    ! reverted recent modification which forces updating also low level
      SDD code
    ! fixed casting in C++ mode with local only modification
This commit is contained in:
Przemyslaw Czerpak
2009-12-21 22:19:55 +00:00
parent d4e28fc895
commit 6c75734a3c
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -17,6 +17,13 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-12-21 23:19 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/contrib/rddsql/hbrddsql.h
* harbour/contrib/rddsql/sqlbase.c
! reverted recent modification which forces updating also low level
SDD code
! fixed casting in C++ mode with local only modification
2009-12-21 13:07 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* contrib/hbqt/qtgui/QMenuBar.cpp
* contrib/hbqt/qth/QMenuBar.qth

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 */
PHB_ITEM * pRow; /* array of native pointers or cached PHB_ITEM */
void ** pRow; /* array of native pointers or cached PHB_ITEM */
BYTE * pRowFlags;
PHB_ITEM pRecord;
void * pRecord;
BYTE bRecordFlags;
void * pResult; /* SQL result */

8
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 = ( PHB_ITEM * ) hb_xrealloc( pArea->pRow, ( pArea->ulRecMax + SQLDD_ROWSET_RESIZE ) * sizeof( PHB_ITEM ) );
pArea->pRow = ( void ** ) hb_xrealloc( pArea->pRow, ( pArea->ulRecMax + SQLDD_ROWSET_RESIZE ) * sizeof( void * ) );
pArea->pRowFlags = ( BYTE * ) hb_xrealloc( pArea->pRowFlags, ( pArea->ulRecMax + SQLDD_ROWSET_RESIZE ) * sizeof( BYTE ) );
pArea->ulRecMax += SQLDD_ROWSET_RESIZE;
}
@@ -464,7 +464,7 @@ static HB_ERRCODE sqlbaseGetValue( SQLBASEAREAP pArea, USHORT uiIndex, PHB_ITEM
{
if ( pArea->bRecordFlags & SQLDD_FLAG_CACHED )
{
hb_arrayGet( pArea->pRecord, uiIndex, pItem );
hb_arrayGet( ( PHB_ITEM ) pArea->pRecord, uiIndex, pItem );
return HB_SUCCESS;
}
return pArea->pSDD->GetValue( pArea, uiIndex, pItem );
@@ -543,7 +543,7 @@ static HB_ERRCODE sqlbasePutValue( SQLBASEAREAP pArea, USHORT uiIndex, PHB_ITEM
( HB_IS_LOGICAL( pItem ) && pField->uiType == HB_FT_LOGICAL ) ||
HB_IS_NIL( pItem ) )
{
hb_arraySet( pArea->pRecord, uiIndex, pItem );
hb_arraySet( ( PHB_ITEM ) pArea->pRecord, uiIndex, pItem );
}
else
{
@@ -746,7 +746,7 @@ static HB_ERRCODE sqlbaseCreate( SQLBASEAREAP pArea, LPDBOPENINFO pOpenInfo )
pArea->ulRecCount = 0;
pArea->pRow = ( PHB_ITEM * ) hb_xalloc( SQLDD_ROWSET_RESIZE * sizeof( PHB_ITEM ) );
pArea->pRow = ( void ** ) hb_xalloc( SQLDD_ROWSET_RESIZE * sizeof( void * ) );
pArea->pRowFlags = ( BYTE * ) hb_xalloc( SQLDD_ROWSET_RESIZE * sizeof( BYTE ) );
pArea->ulRecMax = SQLDD_ROWSET_RESIZE;