From 733cf0e6755caad1b48786334f1f79359ca54aea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= Date: Thu, 12 Dec 2024 21:18:01 +0100 Subject: [PATCH] 2024-12-12 21:18 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * ChangeLog.txt * contrib/gtqtc/gtqtc.h * contrib/gtqtc/gtqtc1.cpp * contrib/hbzebra/datamtrx.c * contrib/sddoci/core.c * src/compiler/genc.c ! reverted my unintentional commit from dummy branch --- ChangeLog.txt | 31 +-- contrib/gtqtc/gtqtc.h | 37 --- contrib/gtqtc/gtqtc1.cpp | 468 +------------------------------------ contrib/hbzebra/datamtrx.c | 2 - contrib/sddoci/core.c | 6 - src/compiler/genc.c | 3 +- 6 files changed, 15 insertions(+), 532 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index affbec463b..12e28c1377 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -7,31 +7,14 @@ Entries may not always be in chronological/commit order. See license at the end of file. */ -2024-12-12 20:46 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) - * contrib/xhb/hbcompat.ch - ! fixed HSetAACompatibility() #xtranslate - - * contrib/hbzebra/code39.c - * pacified warning, it's also fix for possible buffer overflow. - - * include/hbcomp.h - * src/compiler/genc.c - * src/compiler/hbmain.c - * replaced function hb_compFunctionMarkStatic() with - hb_compFunctionSetScope() - +2024-12-12 21:18 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * ChangeLog.txt + * contrib/gtqtc/gtqtc.h + * contrib/gtqtc/gtqtc1.cpp + * contrib/hbzebra/datamtrx.c + * contrib/sddoci/core.c * src/compiler/genc.c - * detect public prg functions written in C inside - #pragma BEGINDUMP / #pragma ENDDUMP and mark them as LOCAL ones - - * src/vm/hvm.c - ! removed my pseudo fix from 2023-01-30 15:18 UTC+0100 Przemyslaw Czerpak. - It was ugly hack which can work only with some linkers. - This modification fixes FILE() function used with C functions written - without own symbol table - - * src/rdd/dbf1.c - * minor code formatting + ! reverted my unintentional commit from dummy branch 2024-12-11 19:35 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * contrib/xhb/hbcompat.ch diff --git a/contrib/gtqtc/gtqtc.h b/contrib/gtqtc/gtqtc.h index 7ae09f83e2..b1f13ab1ca 100644 --- a/contrib/gtqtc/gtqtc.h +++ b/contrib/gtqtc/gtqtc.h @@ -53,7 +53,6 @@ #include #include -#include #include #include @@ -75,8 +74,6 @@ #include #include #include -#include -#include #ifdef HB_QT_SOUND #include #endif @@ -88,10 +85,6 @@ #include #include #include -#include -#if QT_VERSION >= 0x040600 -#include -#endif #ifdef HB_QT_SOUND #include #endif @@ -380,7 +373,6 @@ class QTConsole : public QWidget void setImageSize( void ); void copySelection( void ); void repaintChars( const QRect & rx ); - void updateArea( const QRect & rx ); protected: void inputMethodEvent( QInputMethodEvent * evt ); @@ -416,33 +408,4 @@ class QTCWindow : public QMainWindow void closeEvent( QCloseEvent * evt ); }; - -class QTCRegion : public QWidget -{ - Q_OBJECT - -public: - QTCRegion( PHB_GTQTC pStructQTC, int iTop, int iLeft, int iBottom, int iRight ); - virtual ~QTCRegion( void ); - - void setPos( int iR, int iC ); - void setSize( int iH, int iW ); - void setColor( PHB_ITEM pColor, PHB_ITEM pShadow = NULL ); - void setLabel( PHB_ITEM pLabel ); - void updateSize( void ); - - PHB_GTQTC pQTC; - QTConsole * qConsole; - QLabel * label; - - int iRow; - int iCol; - int iHeight; - int iWidth; - double dTxtSize; - -protected: - void paintEvent( QPaintEvent * evt ); -}; - #endif /* HB_QTC_H_ */ diff --git a/contrib/gtqtc/gtqtc1.cpp b/contrib/gtqtc/gtqtc1.cpp index 86eb381450..17589f609a 100644 --- a/contrib/gtqtc/gtqtc1.cpp +++ b/contrib/gtqtc/gtqtc1.cpp @@ -1428,18 +1428,18 @@ static void hb_gt_qtc_updateCursor( PHB_GTQTC pQTC ) } if( pQTC->lastCursorType != SC_NONE ) { - pQTC->qWnd->qConsole->updateArea( QRect( pQTC->lastCursorCol * pQTC->cellX, - pQTC->lastCursorRow * pQTC->cellY, - pQTC->cellX, pQTC->cellY ) ); + pQTC->qWnd->qConsole->update( pQTC->lastCursorCol * pQTC->cellX + pQTC->marginLeft, + pQTC->lastCursorRow * pQTC->cellY + pQTC->marginTop, + pQTC->cellX, pQTC->cellY ); } if( pQTC->cursorSize != 0 && ( pQTC->lastCursorType == SC_NONE || pQTC->lastCursorCol != pQTC->cursorCol || pQTC->lastCursorRow != pQTC->cursorRow ) ) { - pQTC->qWnd->qConsole->updateArea( QRect( pQTC->cursorCol * pQTC->cellX, - pQTC->cursorRow * pQTC->cellY, - pQTC->cellX, pQTC->cellY ) ); + pQTC->qWnd->qConsole->update( pQTC->cursorCol * pQTC->cellX + pQTC->marginLeft, + pQTC->cursorRow * pQTC->cellY + pQTC->marginTop, + pQTC->cellX, pQTC->cellY ); } pQTC->lastCursorType = cursorType; pQTC->lastCursorCol = pQTC->cursorCol; @@ -1755,65 +1755,6 @@ static int hb_gt_qtc_messageBox( PHB_GTQTC pQTC, PHB_ITEM pText, PHB_ITEM pButto return iRet; } -/* --- */ - -#define HB4QT_DESTRUCT "HB4QT_DEL" - -static void s_widget_delete( QPointer ** wdgPtr ) -{ - if( wdgPtr && *wdgPtr ) - { - QWidget * wdg = **wdgPtr; - - delete *wdgPtr; - *wdgPtr = NULL; - - if( wdg && ! wdg->property( HB4QT_DESTRUCT ).isValid() ) - { - wdg->hide(); - wdg->setProperty( HB4QT_DESTRUCT, QVariant( bool( true ) ) ); - delete wdg; - } - } -} - -static HB_GARBAGE_FUNC( s_widget_destructor ) -{ - s_widget_delete( static_cast**>( Cargo ) ); -} - -static const HB_GC_FUNCS s_gcWidgetFuncs = -{ - s_widget_destructor, - hb_gcDummyMark -}; - -static PHB_ITEM hb_gt_qtc_widgetItemPut( PHB_ITEM pItem, QWidget * widget ) -{ - QPointer ** pPtr = - static_cast**>( - hb_gcAllocate( sizeof( QPointer * ), &s_gcWidgetFuncs ) ); - - *pPtr = new QPointer( widget ); - - return hb_itemPutPtrGC( pItem, pPtr ); -} - -static QWidget * hb_gt_qtc_widgetItemGet( PHB_ITEM pItem ) -{ - QPointer ** pPtr = NULL; - - //if( pItem && HB_IS_HASH( pItem ) ) - // pItem = hb4qt_hashGetItem( pItem, "PTR" ); - - if( pItem && HB_IS_POINTER( pItem ) ) - pPtr = static_cast**>( - hb_itemGetPtrGC( pItem, &s_gcWidgetFuncs ) ); - - return pPtr && *pPtr ? **pPtr : NULL; -} - - /* --- */ static void hb_gt_qtc_InitMT( void ); @@ -2646,84 +2587,6 @@ static HB_BOOL hb_gt_qtc_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) } break; #endif - case 1001: // HB_GTI_SHADOWSET - if( pQTC->qWnd && ( hb_itemType( pInfo->pNewVal ) & HB_IT_ARRAY ) && - hb_arrayLen( pInfo->pNewVal ) >= 4 ) - { - int iTop = hb_arrayGetNI( pInfo->pNewVal, 1 ), - iLeft = hb_arrayGetNI( pInfo->pNewVal, 2 ), - iBottom = hb_arrayGetNI( pInfo->pNewVal, 3 ), - iRight = hb_arrayGetNI( pInfo->pNewVal, 4 ); - - QTCRegion * region = new QTCRegion( pQTC, iTop, iLeft, iBottom, iRight ); - - region->setColor( hb_arrayGetItemPtr( pInfo->pNewVal, 5 ), - hb_arrayGetItemPtr( pInfo->pNewVal, 6 ) ); - region->setLabel( hb_arrayGetItemPtr( pInfo->pNewVal, 7 ) ); - - region->show(); - - pInfo->pResult = hb_gt_qtc_widgetItemPut( pInfo->pResult, region ); - - //printf( "iTop=%d, iLeft=%d, iBottom=%d, iRight=%d, iOffset=%d, iRadius=%d !\n", - // iTop, iLeft, iBottom, iRight, iOffset, iRadius ); - } - break; - - case 1002: // HB_GTI_SHADOWMOVE - if( pQTC->qWnd && ( hb_itemType( pInfo->pNewVal ) & HB_IT_POINTER ) && - pInfo->pNewVal2 != NULL && HB_IS_ARRAY( pInfo->pNewVal2 ) && - hb_arrayLen( pInfo->pNewVal2 ) >= 2 ) - { - QTCRegion * region = qobject_cast( hb_gt_qtc_widgetItemGet( pInfo->pNewVal ) ); - if( region ) - region->setPos( hb_arrayGetNI( pInfo->pNewVal2, 1 ), - hb_arrayGetNI( pInfo->pNewVal2, 2 ) ); - } - break; - - case 1003: // HB_GTI_SHADOWVISIBLE - iVal = 0; - if( pQTC->qWnd && ( hb_itemType( pInfo->pNewVal ) & HB_IT_POINTER ) ) - { - QWidget * widget = hb_gt_qtc_widgetItemGet( pInfo->pNewVal ); - if( widget ) - { - iVal = widget->isVisible() ? 1 : 0; - if( pInfo->pNewVal2 != NULL && HB_IS_LOGICAL( pInfo->pNewVal2 ) ) - widget->setVisible( hb_itemGetL( pInfo->pNewVal2 ) ); - } - } - pInfo->pResult = hb_itemPutL( pInfo->pResult, iVal != 0 ); - break; - - case 1004: // HB_GTI_SHADOWRAISE - if( pQTC->qWnd && ( hb_itemType( pInfo->pNewVal ) & HB_IT_POINTER ) ) - { - QWidget * widget = hb_gt_qtc_widgetItemGet( pInfo->pNewVal ); - if( widget ) - widget->raise(); - } - break; - - case 1005: // HB_GTI_SHADOWLOWER - if( pQTC->qWnd && ( hb_itemType( pInfo->pNewVal ) & HB_IT_POINTER ) ) - { - QWidget * widget = hb_gt_qtc_widgetItemGet( pInfo->pNewVal ); - if( widget ) - widget->lower(); - } - break; - - case 1006: // HB_GTI_SHADOWCOLOR - if( pQTC->qWnd && ( hb_itemType( pInfo->pNewVal ) & HB_IT_POINTER ) && - pInfo->pNewVal2 != NULL && HB_IS_NUMERIC( pInfo->pNewVal2 ) ) - { - QTCRegion * region = qobject_cast( hb_gt_qtc_widgetItemGet( pInfo->pNewVal ) ); - if( region ) - region->setColor( pInfo->pNewVal2 ); - } - break; default: return HB_GTSUPER_INFO( pGT, iType, pInfo ); @@ -3091,15 +2954,6 @@ void QTConsole::resizeEvent( QResizeEvent * evt ) else setFontSize( iHeight / pQTC->iRows, iWidth / pQTC->iCols ); -#if QT_VERSION >= 0x050000 - foreach( QTCRegion * qtcRect, findChildren( QString(), Qt::FindDirectChildrenOnly ) ) -#else - foreach( QTCRegion * qtcRect, findChildren( QString() ) ) -#endif - { - qtcRect->updateSize(); - } - update(); } else @@ -3254,28 +3108,7 @@ void QTConsole::repaintChars( const QRect & rx ) } } - //update( rx.translated( pQTC->marginLeft, pQTC->marginTop ) ); - updateArea( rx ); -} - -void QTConsole::updateArea( const QRect & rx ) -{ -#if 0 - QRect ru = rx.translated( pQTC->marginLeft, pQTC->marginTop ); - update( ru ); - QWidget * chld = childAt( ru.topLeft() ); - if( chld ) - { - chld->update( ru.translated( -chld->pos() ) ); - } -#else - QRect ru = rx.translated( pQTC->marginLeft, pQTC->marginTop ); - QWidget * chld = childAt( ru.topLeft() ); - if( chld ) - chld->update( ru.translated( -chld->pos() ) ); - else - update( ru ); -#endif + update( rx.translated( pQTC->marginLeft, pQTC->marginTop ) ); } void QTConsole::paintEvent( QPaintEvent * evt ) @@ -4034,15 +3867,6 @@ void QTCWindow::setWindowSize( void ) resize( qConsole->image->size() ); } setResizing(); - -#if QT_VERSION >= 0x050000 - foreach( QTCRegion * qtcRect, qConsole->findChildren( QString(), Qt::FindDirectChildrenOnly ) ) -#else - foreach( QTCRegion * qtcRect, qConsole->findChildren( QString() ) ) -#endif - { - qtcRect->updateSize(); - } } void QTCWindow::setResizing( void ) @@ -4082,284 +3906,6 @@ void QTCWindow::setResizing( void ) /* --- */ -#if QT_VERSION >= 0x040600 -static QGraphicsDropShadowEffect * hb_gt_qtc_shadowEffect( PHB_GTQTC pQTC, PHB_ITEM pShadow ) -{ - if( pShadow && HB_IS_ARRAY( pShadow ) ) - { - int iOffset = pQTC->cellY >> 1, iRadius = 20, iVal; - - if( hb_arrayGetType( pShadow, 1 ) & HB_IT_NUMERIC ) - iOffset = hb_arrayGetNI( pShadow, 1 ); - if( hb_arrayGetType( pShadow, 2 ) & HB_IT_NUMERIC ) - iRadius = hb_arrayGetNI( pShadow, 2 ); - - QGraphicsDropShadowEffect * effect = new QGraphicsDropShadowEffect(); - effect->setBlurRadius( iRadius ); - effect->setXOffset( iOffset ); - effect->setYOffset( iOffset ); - - if( hb_arrayGetType( pShadow, 3 ) & HB_IT_STRING ) - effect->setColor( hb_arrayGetCPtr( pShadow, 3 ) ); - else if( ( hb_arrayGetType( pShadow, 3 ) & HB_IT_NUMERIC ) && - ( iVal = hb_arrayGetNI( pShadow, 3 ) ) >= 0 && iVal < 16 ) - effect->setColor( pQTC->colors[ iVal ] ); - else - effect->setColor( Qt::black ); - - return effect; - } - return NULL; -} -#endif - -QTCRegion::QTCRegion( PHB_GTQTC pStructQTC, - int iTop, int iLeft, int iBottom, int iRight ) - : QWidget( pStructQTC->qWnd->qConsole ) -{ - // HB_GTI_SHADOWSET = 1001 - pQTC = pStructQTC; - qConsole = pStructQTC->qWnd->qConsole; - label = NULL; - dTxtSize = 0; - - setSize( iBottom - iTop + 1, iRight - iLeft + 1 ); - setPos( iTop, iLeft ); - - setAutoFillBackground( true ); -} - -QTCRegion::~QTCRegion( void ) -{ - hide(); -} - -void QTCRegion::setPos( int iR, int iC ) -{ - // HB_GTI_SHADOWMOVE = 1002 - iRow = iR; - iCol = iC; - move( iCol * pQTC->cellX + pQTC->marginLeft, - iRow * pQTC->cellY + pQTC->marginTop ); -} - -void QTCRegion::setSize( int iH, int iW ) -{ - // HB_GTI_SHADOWSIZE - - iHeight = iH; - iWidth = iW; - - setFixedSize( iWidth * pQTC->cellX, iHeight * pQTC->cellY ); - if( label ) - { - label->resize( size() ); - if( dTxtSize > 0 ) - { - QFont fnt = label->font(); - fnt.setPixelSize( pQTC->cellY * dTxtSize ); - label->setFont( fnt ); - } - } -} - -void QTCRegion::setColor( PHB_ITEM pColor, PHB_ITEM pShadow ) -{ - if( pColor ) - { - if( HB_IS_STRING( pColor ) ) - { - QPalette pal = palette(); - pal.setColor( QPalette::Window, QColor( hb_itemGetCPtr( pColor ) ) ); - setPalette( pal ); - } - else if( HB_IS_NUMERIC( pColor ) ) - { - int iVal = hb_itemGetNI( pColor ); - if( iVal >= 0 && iVal < 256 ) - { - QPalette pal = palette(); - pal.setColor( QPalette::WindowText, pQTC->colors[ iVal & 0x0F ] ); - pal.setColor( QPalette::Window, pQTC->colors[ ( iVal & 0xF0 ) >> 4 ] ); - //printf( "fg=%X->%06X, bg=%X->%06X\n", iVal & 0x0F, QTC_RGB2NUM( pQTC->colors[ iVal & 0x0F ] ), - // ( iVal & 0xF0 ) >> 4, QTC_RGB2NUM( pQTC->colors[ ( iVal & 0xF0 ) >> 4 ] ) ); - setPalette( pal ); - } - } - } - - if( pShadow ) - { -#if QT_VERSION >= 0x040600 - QGraphicsDropShadowEffect * effect = hb_gt_qtc_shadowEffect( pQTC, pShadow ); - if( effect ) - setGraphicsEffect( effect ); -#endif - } -} - -void QTCRegion::setLabel( PHB_ITEM pLabel ) -{ - if( pLabel && HB_IS_ARRAY( pLabel ) ) - { - PHB_ITEM pShadow = hb_arrayGetItemPtr( pLabel, 2 ); - double dSize = hb_arrayGetND( pLabel, 3 ); - int iWeight = hb_arrayGetND( pLabel, 4 ); - int iFrame = hb_arrayGetNI( pLabel, 5 ); - QString text; - hb_gt_qtc_itemGetQString( hb_arrayGetItemPtr( pLabel, 1 ), &text ); - - if( label ) - label->setText( text ); - else - { - label = new QLabel( text, this ); - label->setAlignment( Qt::AlignCenter ); - label->setScaledContents( true ); - label->resize( size() ); - } - - if( iFrame > 0 ) - { - label->setFrameStyle( iFrame ); - label->setMidLineWidth( 0 ); - label->setLineWidth( 1 ); - } - - if( pShadow ) - { -#if QT_VERSION >= 0x040600 - QGraphicsDropShadowEffect * effect = hb_gt_qtc_shadowEffect( pQTC, pShadow ); - if( effect ) - label->setGraphicsEffect( effect ); - else if( ( effect = ( QGraphicsDropShadowEffect * ) label->graphicsEffect() ) != NULL ) - delete effect; -#endif - } - - if( dSize > 0 || iWeight > 0 ) - { - QFont fnt = label->font(); - - if( dSize > 0 ) - { - dTxtSize = dSize; - fnt.setPixelSize( pQTC->cellY * dTxtSize ); - } - if( iWeight > 0 ) - fnt.setWeight( iWeight ); - - label->setFont( fnt ); - } - } - else if( label ) - { - delete label; - label = NULL; - } - -} - -void QTCRegion::updateSize( void ) -{ - setPos( iRow, iCol ); - setSize( iHeight, iWidth ); -} - -void QTCRegion::paintEvent( QPaintEvent * evt ) -{ - QPainter painter( this ); - int iDx = -( iCol * pQTC->cellX + pQTC->marginLeft ), - iDy = -( iRow * pQTC->cellY + pQTC->marginTop ); - QRect rEvt = evt->rect().translated( -iDx, -iDy ); - - if( label ) - { - QWidget::paintEvent( evt ); - return; - } - - if( rEvt.left() < pQTC->marginLeft ) - { - QRect rc = rEvt; - rc.setRight( pQTC->marginLeft ); - painter.fillRect( rc, QBrush( BLACK ) ); - rEvt.setLeft( pQTC->marginLeft ); - } - if( rEvt.top() < pQTC->marginTop ) - { - QRect rc = rEvt; - rc.setBottom( pQTC->marginTop ); - painter.fillRect( rc.translated( iDx, iDy ), QBrush( BLACK ) ); - rEvt.setTop( pQTC->marginTop ); - } - if( rEvt.right() > pQTC->marginLeft + qConsole->image->width() ) - { - QRect rc = rEvt; - rc.setLeft( pQTC->marginLeft + qConsole->image->width() ); - painter.fillRect( rc.translated( iDx, iDy ), QBrush( BLACK ) ); - rEvt.setRight( pQTC->marginLeft + qConsole->image->width() - 1 ); - } - if( rEvt.bottom() > pQTC->marginTop + qConsole->image->height() ) - { - QRect rc = rEvt; - rc.setTop( pQTC->marginTop + qConsole->image->height() ); - painter.fillRect( rc.translated( iDx, iDy ), QBrush( BLACK ) ); - rEvt.setBottom( pQTC->marginTop + qConsole->image->height() - 1 ); - } - - painter.drawImage( rEvt.translated( iDx, iDy ), *qConsole->image, rEvt.translated( -pQTC->marginLeft, -pQTC->marginTop ) ); - - if( qConsole->selectMode ) - { - /* Display selection */ - QRect rSel = hb_gt_qtc_unmapRect( pQTC, hb_gt_qtc_mapRect( pQTC, qConsole->image, qConsole->selectRect ) ); - if( rSel.intersects( rEvt ) ) - { -#if defined( HB_OS_DARWIN ) - /* RasterOp operations are not supported in macOS */ - rEvt &= rSel; - qConsole->image->invertPixels(); - painter.drawImage( rEvt.translated( iDx, iDy ), *qConsole->image, rEvt.translated( -pQTC->marginLeft, -pQTC->marginTop ) ); - qConsole->image->invertPixels(); -#else - painter.setCompositionMode( QPainter::RasterOp_SourceXorDestination ); - painter.fillRect( rSel & rEvt, Qt::color0 ); -#endif - } - } - else if( pQTC->cursorType != SC_NONE && pQTC->cursorSize != 0 ) - { - /* Display cursor */ - QRect rCrs( pQTC->cursorCol * pQTC->cellX + pQTC->marginLeft, - pQTC->cursorRow * pQTC->cellY + pQTC->marginTop + pQTC->cursorOffset, - pQTC->cellX, pQTC->cursorSize ); - if( rEvt.intersects( rCrs ) ) - { -#if defined( HB_OS_DARWIN ) - /* RasterOp operations are not supported in macOS, - * use foreground cell color like hardware VGA cursor - */ - HB_BYTE bAttr; - HB_USHORT usChar; - int iColor; - - if( HB_GTSELF_GETSCRCHAR( pQTC->pGT, pQTC->cursorRow, pQTC->cursorCol, - &iColor, &bAttr, &usChar ) ) - { - painter.fillRect( rCrs.translated( iDx, iDy ), pQTC->colors[ iColor & 0x0F ] ); - } -#else - painter.setCompositionMode( QPainter::RasterOp_SourceXorDestination ); - /* TODO? use foreground cell color like hardware VGA cursor ? */ - painter.fillRect( rCrs.translated( iDx, iDy ), Qt::color0 ); -#endif - } - } -} - -/* --- */ - #ifdef HB_XLIB_NEEDLOCKS #include diff --git a/contrib/hbzebra/datamtrx.c b/contrib/hbzebra/datamtrx.c index 7af6a5417d..c06a6cafce 100644 --- a/contrib/hbzebra/datamtrx.c +++ b/contrib/hbzebra/datamtrx.c @@ -329,8 +329,6 @@ static void _datamatrix_do_placement( PHB_BITBUFFER pBits, unsigned char * pCW, /* Calculate placement size without L-patterns and clock tracks */ iPRow = pSize->iRow - 2 * ( pSize->iRow / pSize->iRegionRow ); iPCol = pSize->iCol - 2 * ( pSize->iCol / pSize->iRegionCol ); - if( iPCol < 0 ) - iPCol = 0; pArr = ( int * ) hb_xgrab( sizeof( int ) * iPCol * iPRow ); hb_xmemset( pArr, 0, sizeof( int ) * iPCol * iPRow ); diff --git a/contrib/sddoci/core.c b/contrib/sddoci/core.c index dd8bf63979..89d1a3f29f 100644 --- a/contrib/sddoci/core.c +++ b/contrib/sddoci/core.c @@ -80,9 +80,6 @@ #define D_HB_ITEMPUTSTR( itm, str ) hb_itemPutStrU16( itm, HB_CDP_ENDIAN_NATIVE, str ) #define D_HB_ITEMPUTSTRLEN( itm, str, len ) hb_itemPutStrLenU16( itm, HB_CDP_ENDIAN_NATIVE, str, len ) #define D_HB_CHAR HB_WCHAR - #ifndef ostrlen - #define ostrlen wcslen - #endif #else #define D_HB_ARRAYGETSTR( arr, n, phstr, plen ) hb_arrayGetStr( arr, n, hb_setGetOSCP(), phstr, plen ) #define D_HB_ITEMCOPYSTR( itm, str, len ) hb_itemCopyStr( itm, hb_setGetOSCP(), str, len ) @@ -90,9 +87,6 @@ #define D_HB_ITEMPUTSTR( itm, str ) hb_itemPutStr( itm, hb_setGetOSCP(), str ) #define D_HB_ITEMPUTSTRLEN( itm, str, len ) hb_itemPutStrLen( itm, hb_setGetOSCP(), str, len ) #define D_HB_CHAR char - #ifndef ostrlen - #define ostrlen strlen - #endif #endif diff --git a/src/compiler/genc.c b/src/compiler/genc.c index 79be8b78ca..2b3261811c 100644 --- a/src/compiler/genc.c +++ b/src/compiler/genc.c @@ -61,14 +61,13 @@ static void hb_compDumpFindCFunc( HB_COMP_DECL ) if( ch == 'H' && strncmp( pszCCode, "B_FUNC", 6 ) == 0 ) { HB_SYMBOLSCOPE scope = HB_FS_LOCAL; - printf( "HB_FUNC detected\n" ); pszCCode += 6; if( strncmp( pszCCode, "_STATIC", 7 ) == 0 ) { - printf( "HB_FUNC_STATIC detected\n" ); pszCCode += 7; scope |= HB_FS_STATIC; } + pszCCode += 13; while( HB_ISSPACE( *pszCCode ) ) ++pszCCode; if( *pszCCode == '(' )