2024-03-07 13:41 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

* contrib/gtqtc/gtqtc.hbp
    ! do not detect QT5 when HB_BUILD_3RDEXT=no is set

  * debian/rules
    * removed LD_LIBRARY_PATH setting

  * src/rdd/dbcmd.c
  * src/rdd/wacore.c
    ! moved code checking WA number from DbSelectArea() PRG function
      to hb_rddSelectWorkAreaNumber() C function. It fixes few things
      like:
         DbSelectArea( 0 )
      and also:
         ? ( 0 )->( select() )
This commit is contained in:
Przemysław Czerpak
2024-03-07 13:41:15 +01:00
parent 050666d2d9
commit a5ad762cb0
5 changed files with 22 additions and 22 deletions

View File

@@ -747,19 +747,7 @@ HB_FUNC( DBSELECTAREA )
iNewArea = ( int ) hb_dynsymAreaHandle( pSymAlias->pDynSym );
}
}
/*
* NOTE: iNewArea >= HB_RDD_MAX_AREA_NUM used intentionally
* In Clipper area 65535 is reserved for "M" alias [druzus]
*/
if( iNewArea < 1 || iNewArea >= HB_RDD_MAX_AREA_NUM )
{
if( hb_rddSelectFirstAvailable() != HB_SUCCESS )
hb_rddSelectWorkAreaNumber( 0 );
}
else
{
hb_rddSelectWorkAreaNumber( iNewArea );
}
hb_rddSelectWorkAreaNumber( iNewArea );
}
}

View File

@@ -500,10 +500,11 @@ HB_ERRCODE hb_rddSelectWorkAreaNumber( int iArea )
HB_TRACE( HB_TR_DEBUG, ( "hb_rddSelectWorkAreaNumber(%d)", iArea ) );
pRddInfo = hb_stackRDD();
if( iArea < 1 || iArea > HB_RDD_MAX_AREA_NUM )
HB_SET_WA( 0 );
else
if( iArea >= 1 && iArea <= HB_RDD_MAX_AREA_NUM )
HB_SET_WA( ( HB_AREANO ) iArea );
else if( hb_rddSelectFirstAvailable() != HB_SUCCESS )
HB_SET_WA( 0 );
return ( pRddInfo->pCurrArea == NULL ) ? HB_FAILURE : HB_SUCCESS;
}