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

core/contrib: whitespace/minor [ci skip]

Browse Source
This commit is contained in:
Viktor Szakats
2017-09-11 19:56:57 +00:00
parent 2e235ee4d8
commit ff3fbd8e40
29 changed files with 385 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/gtwvg/class.prg
View File

@@ -79,7 +79,7 @@
CREATE CLASS WvtDialog
/* To hold previous settings */
/* To hold previous settings */
VAR nOldRows
VAR nOldCols
VAR aOldFont
@@ -98,7 +98,7 @@ CREATE CLASS WvtDialog
VAR oldMenuBlock
VAR lGui
/* Dialog parameters */
/* Dialog parameters */
VAR nRows
VAR nCols
VAR cFont
@@ -109,7 +109,7 @@ CREATE CLASS WvtDialog
VAR cTitle
VAR cColor
/* Objects handling */
/* Objects handling */
VAR aObjects INIT {}
VAR oCurObj
VAR oLastObj
@@ -124,12 +124,12 @@ CREATE CLASS WvtDialog
VAR aDialogKeys INIT {}
VAR cDialogID INIT ""
/* Tooltip Management */
/* Tooltip Management */
VAR nTooltipWidth
VAR nTooltipBkColor
VAR nTooltipTextColor
/* Miscellaneous */
/* Miscellaneous */
VAR ClassName INIT "WVTDIALOG"
VAR cPaintBlockID
VAR nPaintID INIT 1
@@ -302,7 +302,7 @@ METHOD PROCEDURE WvtDialog:Destroy()
wvt_SetToolTipBkColor( ::oldTooltipBkColor )
wvt_SetToolTipTextColor( ::oldTooltipTextColor )
/* Here set mode is before setting the font */
/* Here set mode is before setting the font */
SetMode( ::nOldRows, ::nOldCols )
wvt_SetFont( ::aOldFont[ 1 ], ::aOldFont[ 2 ], ::aOldFont[ 3 ], ::aOldFont[ 4 ], ::aOldFont[ 5 ] )
wvt_SetTitle( ::cOldTitle )

12
contrib/gtwvg/crt.prg
View File

@@ -60,7 +60,7 @@ CREATE CLASS WvgCrt INHERIT WvgWindow, WvgPartHandler
VAR oMenu
/* CONFIGURATION */
/* Configuration */
VAR alwaysOnTop INIT .F. /* Determines whether the dialog can be covered by other windows */
VAR border INIT 0 /* Border type for the XbpCrt window */
VAR clipChildren INIT .F.
@@ -92,7 +92,7 @@ CREATE CLASS WvgCrt INHERIT WvgWindow, WvgPartHandler
VAR xSize INIT 640 READONLY
VAR ySize INIT 400 READONLY
/* GUI Specifics */
/* GUI Specifics */
VAR animate INIT .F.
VAR clipParent INIT .F.
VAR clipSiblings INIT .T.
@@ -100,7 +100,7 @@ CREATE CLASS WvgCrt INHERIT WvgWindow, WvgPartHandler
VAR sizeRedraw INIT .F.
VAR tabStop INIT .F.
/* CALLBACK SLOTS */
/* Callback slots */
VAR sl_enter
VAR sl_leave
VAR sl_lbClick
@@ -134,7 +134,7 @@ CREATE CLASS WvgCrt INHERIT WvgWindow, WvgPartHandler
VAR sl_dragLeave
VAR sl_dragDrop
/* Harbour implementation */
/* Harbour implementation */
VAR resizable INIT .T.
VAR resizeMode INIT HB_GTI_RESIZEMODE_FONT
VAR style INIT ( WS_OVERLAPPED + WS_CAPTION + WS_SYSMENU + WS_SIZEBOX + WS_MINIMIZEBOX + WS_MAXIMIZEBOX )
@@ -160,13 +160,13 @@ CREATE CLASS WvgCrt INHERIT WvgWindow, WvgPartHandler
METHOD refresh() INLINE ::invalidateRect()
METHOD refreshEx()
/* LIFE CYCLE */
/* Life cycle */
METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
METHOD destroy()
/* METHODS */
/* Methods */
METHOD currentPos()
METHOD currentSize()
METHOD captureMouse()

2
contrib/gtwvg/tests/demowvg.prg
View File

@@ -120,7 +120,7 @@ PROCEDURE Main()
pGT := SetGT( 1, hb_gtSelect() )
/* Force mouse pointer right below the Harbour label */
/* Force mouse pointer right below the Harbour label */
Wvt_SetMousePos( 2, 40 )
AAdd( aBlocks, {|| Wvt_SetIcon( GetResource( "vr_1.ico" ) ) } )

8
contrib/gtwvg/wnd.prg
View File

@@ -65,7 +65,7 @@
CREATE CLASS WvgWindow INHERIT WvgPartHandler
/* CONFIGURATION */
/* Configuration */
VAR animate INIT .F.
VAR clipChildren INIT .F.
VAR clipParent INIT .F.
@@ -77,18 +77,18 @@ CREATE CLASS WvgWindow INHERIT WvgPartHandler
VAR pointerFocus INIT .T.
/* RUNTIME VAR */
/* Runtime variables */
VAR dropZone INIT .F.
VAR helpLink
VAR s_tooltipText INIT ""
METHOD tooltipText SETGET
METHOD tooltipText( cText ) SETGET
VAR clr_FG
VAR clr_BG
VAR fnt_COMMPOUNDNAME
VAR fnt_hFont
/* CALLBACK SLOTS */
/* Callback slots */
VAR sl_enter
VAR sl_leave
VAR sl_lbClick

8
contrib/gtwvg/wvgcuig.c
View File

@@ -847,16 +847,16 @@ static void hb_wvg_Outline( PHB_GTWVT pWVT, PHB_GOBJS gObj, int iLeft, int iTop,
SelectObject( pWVT->hdc, gObj->hPen );
MoveToEx( hdc, iLeft, iTop, NULL ); /* Top */
MoveToEx( hdc, iLeft, iTop, NULL ); /* Top */
LineTo( hdc, iRight, iTop );
MoveToEx( hdc, iLeft, iTop, NULL ); /* Left */
MoveToEx( hdc, iLeft, iTop, NULL ); /* Left */
LineTo( hdc, iLeft, iBottom );
MoveToEx( hdc, iLeft, iBottom, NULL ); /* Bottom */
MoveToEx( hdc, iLeft, iBottom, NULL ); /* Bottom */
LineTo( hdc, iRight, iBottom );
MoveToEx( hdc, iRight, iTop, NULL ); /* Right */
MoveToEx( hdc, iRight, iTop, NULL ); /* Right */
LineTo( hdc, iRight, iBottom + 1 );
}

2
contrib/hbct/ctcom1.c
View File

@@ -308,7 +308,7 @@ HB_FUNC( COM_ERRCHR )
hb_retl( hb_comErrorChar( hb_parni( 1 ), hb_ctComCharParam( 2 ) ) != -1 );
}
/* com_Remote( <nComPort>, [<nCharacter|cCharacter>] ) --> <lActive>
/* com_Remote( <nComPort>, [<nCharacter|cCharacter>] ) --> <lActive>
*/
HB_FUNC( COM_REMOTE )
{

2
contrib/hbformat/hbfmtcls.prg
View File

@@ -576,7 +576,7 @@ METHOD FormatLine( cLine, lContinued ) CLASS HBFormatCode
IF nBegin > 1 .AND. SubStr( cLine, nBegin - 1, 1 ) == "." .AND. nEnd == nBegin
::ConvertBool( @cLine, nBegin, i )
IF Len( cLine ) != nLen
/* If .not. was converted to ! */
/* If .not. was converted to ! */
i -= ( nLen - Len( cLine ) )
nLen := Len( cLine )
ELSE

2
contrib/hbgd/gdwrp.c
View File

@@ -1700,7 +1700,7 @@ HB_FUNC( GDIMAGECOLORCLOSESTALPHA ) /* int gdImageColorClosestAlpha(gdImagePtr i
hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
HB_FUNC( GDIMAGECOLORCLOSESTHWB ) /* gdImageColorClosestHWB(gdImagePtr im, int r, int g, int b) */
HB_FUNC( GDIMAGECOLORCLOSESTHWB ) /* gdImageColorClosestHWB(gdImagePtr im, int r, int g, int b) */
{
if( hb_isGdImage( 1 ) &&
HB_ISNUM( 2 ) &&

4
contrib/hbnf/dispc.c
View File

@@ -519,8 +519,8 @@ HB_FUNC( _FT_DFINIT )
dispc->maxlin = hb_parni( 12 );
dispc->buffsize = hb_parns( 13 ); /* yes - load value */
dispc->buffer = ( char * ) hb_xalloc( dispc->buffsize ); /* allocate memory */
dispc->lbuff = ( char * ) hb_xalloc( dispc->maxlin + 1 ); /* for buffers */
dispc->buffer = ( char * ) hb_xalloc( dispc->buffsize ); /* allocate memory */
dispc->lbuff = ( char * ) hb_xalloc( dispc->maxlin + 1 ); /* for buffers */
dispc->bIsAllocated = ! ( dispc->buffer == NULL || dispc->lbuff == NULL || dispc->vseg == NULL );
/* memory allocated? */

145
contrib/hbtip/mime.c
View File

@@ -75,125 +75,124 @@ typedef struct tag_mime
static const MIME_ENTRY s_mimeTable[] =
{
/* MS-DOS/Windows executable */
/* 0*/ { 0, "MZ", "application/x-dosexec", 0, 0, 0 },
/* 0 */ { 0, "MZ", "application/x-dosexec", 0, 0, 0 },
/* ELF file */
/* 1*/ { 0, "\177ELF", NULL, 1, 0, 0 },
/* 2*/ { 4, "\x00", NULL, 3, 1, MIME_FLAG_CONTINUE },
/* 3*/ { 4, "\x01", NULL, 2, 1, MIME_FLAG_CONTINUE },
/* 4*/ { 4, "\x02", NULL, 1, 0, MIME_FLAG_CONTINUE },
/* 5*/ { 5, "\x00", NULL, 2, 1, MIME_FLAG_CONTINUE },
/* 6*/ { 5, "\x01", NULL, 1, 0, MIME_FLAG_CONTINUE },
/* 7*/ { 16, "\x00", "application/x-object", 0, 1, MIME_FLAG_CONTINUE },
/* 8*/ { 16, "\x01", "application/x-object", 0, 1, MIME_FLAG_CONTINUE },
/* 9*/ { 16, "\x02", "application/x-executable", 0, 1, MIME_FLAG_CONTINUE },
/* 10*/ { 16, "\x03", "application/x-sharedlib", 0, 1, MIME_FLAG_CONTINUE },
/* 11*/ { 16, "\x04", "application/x-coredump", 0, 0, MIME_FLAG_CONTINUE },
/* 1 */ { 0, "\177ELF", NULL, 1, 0, 0 },
/* 2 */ { 4, "\x00", NULL, 3, 1, MIME_FLAG_CONTINUE },
/* 3 */ { 4, "\x01", NULL, 2, 1, MIME_FLAG_CONTINUE },
/* 4 */ { 4, "\x02", NULL, 1, 0, MIME_FLAG_CONTINUE },
/* 5 */ { 5, "\x00", NULL, 2, 1, MIME_FLAG_CONTINUE },
/* 6 */ { 5, "\x01", NULL, 1, 0, MIME_FLAG_CONTINUE },
/* 7 */ { 16, "\x00", "application/x-object", 0, 1, MIME_FLAG_CONTINUE },
/* 8 */ { 16, "\x01", "application/x-object", 0, 1, MIME_FLAG_CONTINUE },
/* 9 */ { 16, "\x02", "application/x-executable", 0, 1, MIME_FLAG_CONTINUE },
/* 10 */ { 16, "\x03", "application/x-sharedlib", 0, 1, MIME_FLAG_CONTINUE },
/* 11 */ { 16, "\x04", "application/x-coredump", 0, 0, MIME_FLAG_CONTINUE },
/* Shell script */
/* 12*/ { 0, "#!/bin/sh", "application/x-shellscript", 0, 0, 0 },
/* 13*/ { 0, "#! /bin/sh", "application/x-shellscript", 0, 0, 0 },
/* 14*/ { 0, "#!/bin/csh", "application/x-shellscript", 0, 0, 0 },
/* 15*/ { 0, "#! /bin/csh", "application/x-shellscript", 0, 0, 0 },
/* 16*/ { 0, "#!/bin/ksh", "application/x-shellscript", 0, 0, 0 },
/* 17*/ { 0, "#! /bin/ksh", "application/x-shellscript", 0, 0, 0 },
/* 18*/ { 0, "#!/bin/tcsh", "application/x-shellscript", 0, 0, 0 },
/* 19*/ { 0, "#! /bin/tcsh", "application/x-shellscript", 0, 0, 0 },
/* 20*/ { 0, "#!/usr/local/bin/tcsh", "application/x-shellscript", 0, 0, 0 },
/* 21*/ { 0, "#! /usr/local/bin/tcsh", "application/x-shellscript", 0, 0, 0 },
/* 22*/ { 0, "#!/bin/bash", "application/x-shellscript", 0, 0, 0 },
/* 23*/ { 0, "#! /bin/bash", "application/x-shellscript", 0, 0, 0 },
/* 24*/ { 0, "#!/usr/local/bin/bash", "application/x-shellscript", 0, 0, 0 },
/* 25*/ { 0, "#! /usr/local/bin/bash", "application/x-shellscript", 0, 0, 0 },
/* 12 */ { 0, "#!/bin/sh", "application/x-shellscript", 0, 0, 0 },
/* 13 */ { 0, "#! /bin/sh", "application/x-shellscript", 0, 0, 0 },
/* 14 */ { 0, "#!/bin/csh", "application/x-shellscript", 0, 0, 0 },
/* 15 */ { 0, "#! /bin/csh", "application/x-shellscript", 0, 0, 0 },
/* 16 */ { 0, "#!/bin/ksh", "application/x-shellscript", 0, 0, 0 },
/* 17 */ { 0, "#! /bin/ksh", "application/x-shellscript", 0, 0, 0 },
/* 18 */ { 0, "#!/bin/tcsh", "application/x-shellscript", 0, 0, 0 },
/* 19 */ { 0, "#! /bin/tcsh", "application/x-shellscript", 0, 0, 0 },
/* 20 */ { 0, "#!/usr/local/bin/tcsh", "application/x-shellscript", 0, 0, 0 },
/* 21 */ { 0, "#! /usr/local/bin/tcsh", "application/x-shellscript", 0, 0, 0 },
/* 22 */ { 0, "#!/bin/bash", "application/x-shellscript", 0, 0, 0 },
/* 23 */ { 0, "#! /bin/bash", "application/x-shellscript", 0, 0, 0 },
/* 24 */ { 0, "#!/usr/local/bin/bash", "application/x-shellscript", 0, 0, 0 },
/* 25 */ { 0, "#! /usr/local/bin/bash", "application/x-shellscript", 0, 0, 0 },
/* Java object code*/
/* 26*/ { 0, "\xCA\xFE\xBA\xBE", "application/java", 0, 0, 0 },
/* 26 */ { 0, "\xCA\xFE\xBA\xBE", "application/java", 0, 0, 0 },
/* Perl */
/* 27*/ { 0, "#!/bin/perl", "application/x-perl", 0, 0, 0 },
/* 28*/ { 0, "#! /bin/perl", "application/x-perl", 0, 0, 0 },
/* 29*/ { 0, "eval \"exec /bin/perl", "application/x-perl", 0, 0, 0 },
/* 30*/ { 0, "#!/usr/bin/perl", "application/x-perl", 0, 0, 0 },
/* 31*/ { 0, "#! /usr/bin/perl", "application/x-perl", 0, 0, 0 },
/* 32*/ { 0, "eval \"exec /usr/bin/perl", "application/x-perl", 0, 0, 0 },
/* 33*/ { 0, "#!/usr/local/bin/perl", "application/x-perl", 0, 0, 0 },
/* 34*/ { 0, "#! /usr/local/bin/perl", "application/x-perl", 0, 0, 0 },
/* 35*/ { 0, "eval \"exec /usr/local/bin/perl", "application/x-perl", 0, 0, 0 },
/* 27 */ { 0, "#!/bin/perl", "application/x-perl", 0, 0, 0 },
/* 28 */ { 0, "#! /bin/perl", "application/x-perl", 0, 0, 0 },
/* 29 */ { 0, "eval \"exec /bin/perl", "application/x-perl", 0, 0, 0 },
/* 30 */ { 0, "#!/usr/bin/perl", "application/x-perl", 0, 0, 0 },
/* 31 */ { 0, "#! /usr/bin/perl", "application/x-perl", 0, 0, 0 },
/* 32 */ { 0, "eval \"exec /usr/bin/perl", "application/x-perl", 0, 0, 0 },
/* 33 */ { 0, "#!/usr/local/bin/perl", "application/x-perl", 0, 0, 0 },
/* 34 */ { 0, "#! /usr/local/bin/perl", "application/x-perl", 0, 0, 0 },
/* 35 */ { 0, "eval \"exec /usr/local/bin/perl", "application/x-perl", 0, 0, 0 },
/* Python */
/* 36*/ { 0, "#!/bin/python", "application/x-python", 0, 0, 0 },
/* 37*/ { 0, "#! /bin/python", "application/x-python", 0, 0, 0 },
/* 38*/ { 0, "eval \"exec /bin/python", "application/x-python", 0, 0, 0 },
/* 39*/ { 0, "#!/usr/bin/python", "application/x-python", 0, 0, 0 },
/* 40*/ { 0, "#! /usr/bin/python", "application/x-python", 0, 0, 0 },
/* 41*/ { 0, "eval \"exec /usr/bin/python", "application/x-python", 0, 0, 0 },
/* 42*/ { 0, "#!/usr/local/bin/python", "application/x-python", 0, 0, 0 },
/* 43*/ { 0, "#! /usr/local/bin/python", "application/x-python", 0, 0, 0 },
/* 44*/ { 0, "eval \"exec /usr/local/bin/python", "application/x-python", 0, 0, 0 },
/* 36 */ { 0, "#!/bin/python", "application/x-python", 0, 0, 0 },
/* 37 */ { 0, "#! /bin/python", "application/x-python", 0, 0, 0 },
/* 38 */ { 0, "eval \"exec /bin/python", "application/x-python", 0, 0, 0 },
/* 39 */ { 0, "#!/usr/bin/python", "application/x-python", 0, 0, 0 },
/* 40 */ { 0, "#! /usr/bin/python", "application/x-python", 0, 0, 0 },
/* 41 */ { 0, "eval \"exec /usr/bin/python", "application/x-python", 0, 0, 0 },
/* 42 */ { 0, "#!/usr/local/bin/python", "application/x-python", 0, 0, 0 },
/* 43 */ { 0, "#! /usr/local/bin/python", "application/x-python", 0, 0, 0 },
/* 44 */ { 0, "eval \"exec /usr/local/bin/python", "application/x-python", 0, 0, 0 },
/* Unix compress (.z) */
/* 45*/ { 0, "\x1F\x9D", "application/x-compress", 0, 0, 0 },
/* 45 */ { 0, "\x1F\x9D", "application/x-compress", 0, 0, 0 },
/* Unix gzip */
/* 46*/ { 0, "\x1F\x8B", "application/x-gzip", 0, 0, 0 },
/* 46 */ { 0, "\x1F\x8B", "application/x-gzip", 0, 0, 0 },
/* PKzip */
/* 47 { 0, "PK\x03\x04", "application/x-zip", 0, 0, 0 }, 2010-12-15 support of xlsx/ods */
/* 47 { 0, "PK\x03\x04", "application/x-zip", 0, 0, 0 }, 2010-12-15 support of xlsx/ods */
/* xml */
/* 48*/ { 0, "<?xml", "application/xml", 0, 0, MIME_FLAG_TRIMSPACES | MIME_FLAG_TRIMTABS | MIME_FLAG_CASEINSENS },
/* 48 */ { 0, "<?xml", "application/xml", 0, 0, MIME_FLAG_TRIMSPACES | MIME_FLAG_TRIMTABS | MIME_FLAG_CASEINSENS },
/* html */
/* 49*/ { 0, "<html", "text/html", 0, 0, MIME_FLAG_TRIMSPACES | MIME_FLAG_TRIMTABS | MIME_FLAG_CASEINSENS },
/* 50*/ { 0, "<title", "text/html", 0, 0, MIME_FLAG_TRIMSPACES | MIME_FLAG_TRIMTABS | MIME_FLAG_CASEINSENS },
/* 51*/ { 0, "<head", "text/html", 0, 0, MIME_FLAG_TRIMSPACES | MIME_FLAG_TRIMTABS | MIME_FLAG_CASEINSENS },
/* 52*/ { 0, "<body", "text/html", 0, 0, MIME_FLAG_TRIMSPACES | MIME_FLAG_TRIMTABS | MIME_FLAG_CASEINSENS },
/* 53*/ { 0, "<!--", "text/html", 0, 0, MIME_FLAG_TRIMSPACES | MIME_FLAG_TRIMTABS },
/* 54*/ { 0, "<h", "text/html", 0, 0, MIME_FLAG_TRIMSPACES | MIME_FLAG_TRIMTABS | MIME_FLAG_CASEINSENS },
/* 55*/ { 0, "<!", "text/html", 0, 0, MIME_FLAG_TRIMSPACES | MIME_FLAG_TRIMTABS | MIME_FLAG_CASEINSENS },
/* 49 */ { 0, "<html", "text/html", 0, 0, MIME_FLAG_TRIMSPACES | MIME_FLAG_TRIMTABS | MIME_FLAG_CASEINSENS },
/* 50 */ { 0, "<title", "text/html", 0, 0, MIME_FLAG_TRIMSPACES | MIME_FLAG_TRIMTABS | MIME_FLAG_CASEINSENS },
/* 51 */ { 0, "<head", "text/html", 0, 0, MIME_FLAG_TRIMSPACES | MIME_FLAG_TRIMTABS | MIME_FLAG_CASEINSENS },
/* 52 */ { 0, "<body", "text/html", 0, 0, MIME_FLAG_TRIMSPACES | MIME_FLAG_TRIMTABS | MIME_FLAG_CASEINSENS },
/* 53 */ { 0, "<!--", "text/html", 0, 0, MIME_FLAG_TRIMSPACES | MIME_FLAG_TRIMTABS },
/* 54 */ { 0, "<h", "text/html", 0, 0, MIME_FLAG_TRIMSPACES | MIME_FLAG_TRIMTABS | MIME_FLAG_CASEINSENS },
/* 55 */ { 0, "<!", "text/html", 0, 0, MIME_FLAG_TRIMSPACES | MIME_FLAG_TRIMTABS | MIME_FLAG_CASEINSENS },
/* Postscript */
/* 56*/ { 0, "%!", "application/postscript", 0, 0, 0 },
/* 57*/ { 0, "\x04%!", "application/postscript", 0, 0, 0 },
/* 56 */ { 0, "%!", "application/postscript", 0, 0, 0 },
/* 57 */ { 0, "\x04%!", "application/postscript", 0, 0, 0 },
/* PDF */
/* 58*/ { 0, "%PDF-", "application/pdf", 0, 0, 0 },
/* 58 */ { 0, "%PDF-", "application/pdf", 0, 0, 0 },
/* DVI */
/* 59*/ { 0, "\xF7\x02", "application/dvi", 0, 0, 0 },
/* 59 */ { 0, "\xF7\x02", "application/dvi", 0, 0, 0 },
/* PNG image */
/* 60*/ { 0, "\x89PNG", "image/png", 0, 0, 0 },
/* 60 */ { 0, "\x89PNG", "image/png", 0, 0, 0 },
/* XPM image */
/* 61*/ { 0, "/* XPM", "image/x-xpm", 0, 0, 0 },
/* 61 */ { 0, "/* XPM", "image/x-xpm", 0, 0, 0 },
/* TIFF image */
/* 62*/ { 0, "II", "image/tiff", 0, 0, 0 },
/* 63*/ { 0, "MM", "image/tiff", 0, 0, 0 },
/* 62 */ { 0, "II", "image/tiff", 0, 0, 0 },
/* 63 */ { 0, "MM", "image/tiff", 0, 0, 0 },
/* GIF image */
/* 64*/ { 0, "GIF89z", "image/x-compressed-gif", 0, 0, 0 },
/* 65*/ { 0, "GIF", "image/gif", 0, 0, 0 },
/* 64 */ { 0, "GIF89z", "image/x-compressed-gif", 0, 0, 0 },
/* 65 */ { 0, "GIF", "image/gif", 0, 0, 0 },
/* JPEG image */
/* 66*/ { 0, "\xFF\xD8", "image/jpeg", 0, 0, 0 },
/* 66 */ { 0, "\xFF\xD8", "image/jpeg", 0, 0, 0 },
/* ICO image */
/* 67*/ { 2, "\x01\x00", "image/x-icon", 0, 0, 0 },
/* 67 */ { 2, "\x01\x00", "image/x-icon", 0, 0, 0 },
/* OGG file */
/* 68*/ { 0, "OggS", "application/ogg", 0, 0, 0 },
/* 68 */ { 0, "OggS", "application/ogg", 0, 0, 0 },
/* FLV file */
/* 69*/ { 0, "FLV", "video/x-flv", 0, 0, 0 },
/* 69 */ { 0, "FLV", "video/x-flv", 0, 0, 0 },
/* SWF compressed file */
/* 70*/ { 0, "CWS", "application/x-shockwave-flash", 0, 0, 0 },
/* 70 */ { 0, "CWS", "application/x-shockwave-flash", 0, 0, 0 },
/* SWF uncompressed file */
/* 71*/ { 0, "FWS", "application/x-shockwave-flash", 0, 0, 0 }
/* 71 */ { 0, "FWS", "application/x-shockwave-flash", 0, 0, 0 }
};
/* Find MIME by extension */

212
contrib/hbzebra/code128.c
View File

@@ -48,112 +48,112 @@
static const unsigned short s_code[] = {
00633, /* 00 */
00663, /* ! ! 01 */
01463, /* " " 02 */
00311, /* # # 03 */
00611, /* $ $ 04 */
00621, /* % % 05 */
00231, /* & & 06 */
00431, /* ' ' 07 */
00461, /* ( ( 08 */
00223, /* ) ) 09 */
00423, /* * * 10 */
00443, /* + + 11 */
00715, /* , , 12 */
00731, /* - - 13 */
01631, /* . . 14 */
00635, /* / / 15 */
00671, /* 0 0 16 */
01471, /* 1 1 17 */
01163, /* 2 2 18 */
00723, /* 3 3 19 */
01623, /* 4 4 20 */
00473, /* 5 5 21 */
00563, /* 6 6 22 */
01667, /* 7 7 23 */
00627, /* 8 8 24 */
00647, /* 9 9 25 */
01447, /* : : 26 */
00467, /* ; ; 27 */
00547, /* < < 28 */
01147, /* = = 29 */
00333, /* > > 30 */
01433, /* ? ? 31 */
01543, /* @ @ 32 */
00305, /* A A 33 */
00321, /* B B 34 */
01421, /* C C 35 */
00215, /* D D 36 */
00261, /* E E 37 */
01061, /* F F 38 */
00213, /* G G 39 */
00243, /* H H 40 */
01043, /* I I 41 */
00355, /* J J 42 */
01615, /* K K 43 */
01661, /* L L 44 */
00335, /* M M 45 */
01435, /* N N 46 */
01561, /* O O 47 */
01567, /* P P 48 */
01613, /* Q Q 49 */
01643, /* R R 50 */
00273, /* S S 51 */
01073, /* T T 52 */
01673, /* U U 53 */
00327, /* V V 54 */
01427, /* W W 55 */
01507, /* X X 56 */
00267, /* Y Y 57 */
01067, /* Z Z 58 */
01307, /* [ [ 59 */
01367, /* \ \ 60 */
01023, /* ] ] 61 */
01217, /* ^ ^ 62 */
00145, /* _ _ 63 */
00605, /* NUL ` 64 */
00151, /* SOH a 65 */
01411, /* STX b 66 */
00641, /* ETX c 67 */
01441, /* EOT d 68 */
00115, /* ENQ e 69 */
00415, /* ACK f 70 */
00131, /* BEL g 71 */
01031, /* BS h 72 */
00541, /* HT i 73 */
01141, /* LF j 74 */
01103, /* VT k 75 */
00123, /* FF l 76 */
01357, /* CR m 77 */
00503, /* SO n 78 */
01361, /* SI o 79 */
00745, /* DLE p 80 */
00751, /* DC1 q 81 */
01711, /* DC2 r 82 */
00475, /* DC3 s 83 */
00571, /* DC4 t 84 */
01171, /* NAK u 85 */
00457, /* SYN v 86 */
00517, /* ETB w 87 */
01117, /* CAN x 88 */
01733, /* EM y 89 */
01573, /* SUB z 90 */
01557, /* ESC { 91 */
00365, /* FS | 92 */
01705, /* GS } 93 */
01721, /* RS ~ 94 */
00275, /* US DEL 95 */
01075, /* FNC3 FNC3 96 */
00257, /* FNC2 FNC2 97 */
01057, /* ShiB ShiA 98 */
01735, /* CodC CodC 99 */
01675, /* CodB FNC4 CodB 100 */
01727, /* FNC4 CodA CodA 101 */
01657, /* FNC1 FNC1 FNC1 102 */
00413, /* Start Code A 103 */
00113, /* Start Code B 104 */
00713 /* Start Code C 105 */
00633, /* 00 */
00663, /* ! ! 01 */
01463, /* " " 02 */
00311, /* # # 03 */
00611, /* $ $ 04 */
00621, /* % % 05 */
00231, /* & & 06 */
00431, /* ' ' 07 */
00461, /* ( ( 08 */
00223, /* ) ) 09 */
00423, /* * * 10 */
00443, /* + + 11 */
00715, /* , , 12 */
00731, /* - - 13 */
01631, /* . . 14 */
00635, /* / / 15 */
00671, /* 0 0 16 */
01471, /* 1 1 17 */
01163, /* 2 2 18 */
00723, /* 3 3 19 */
01623, /* 4 4 20 */
00473, /* 5 5 21 */
00563, /* 6 6 22 */
01667, /* 7 7 23 */
00627, /* 8 8 24 */
00647, /* 9 9 25 */
01447, /* : : 26 */
00467, /* ; ; 27 */
00547, /* < < 28 */
01147, /* = = 29 */
00333, /* > > 30 */
01433, /* ? ? 31 */
01543, /* @ @ 32 */
00305, /* A A 33 */
00321, /* B B 34 */
01421, /* C C 35 */
00215, /* D D 36 */
00261, /* E E 37 */
01061, /* F F 38 */
00213, /* G G 39 */
00243, /* H H 40 */
01043, /* I I 41 */
00355, /* J J 42 */
01615, /* K K 43 */
01661, /* L L 44 */
00335, /* M M 45 */
01435, /* N N 46 */
01561, /* O O 47 */
01567, /* P P 48 */
01613, /* Q Q 49 */
01643, /* R R 50 */
00273, /* S S 51 */
01073, /* T T 52 */
01673, /* U U 53 */
00327, /* V V 54 */
01427, /* W W 55 */
01507, /* X X 56 */
00267, /* Y Y 57 */
01067, /* Z Z 58 */
01307, /* [ [ 59 */
01367, /* \ \ 60 */
01023, /* ] ] 61 */
01217, /* ^ ^ 62 */
00145, /* _ _ 63 */
00605, /* NUL ` 64 */
00151, /* SOH a 65 */
01411, /* STX b 66 */
00641, /* ETX c 67 */
01441, /* EOT d 68 */
00115, /* ENQ e 69 */
00415, /* ACK f 70 */
00131, /* BEL g 71 */
01031, /* BS h 72 */
00541, /* HT i 73 */
01141, /* LF j 74 */
01103, /* VT k 75 */
00123, /* FF l 76 */
01357, /* CR m 77 */
00503, /* SO n 78 */
01361, /* SI o 79 */
00745, /* DLE p 80 */
00751, /* DC1 q 81 */
01711, /* DC2 r 82 */
00475, /* DC3 s 83 */
00571, /* DC4 t 84 */
01171, /* NAK u 85 */
00457, /* SYN v 86 */
00517, /* ETB w 87 */
01117, /* CAN x 88 */
01733, /* EM y 89 */
01573, /* SUB z 90 */
01557, /* ESC { 91 */
00365, /* FS | 92 */
01705, /* GS } 93 */
01721, /* RS ~ 94 */
00275, /* US DEL 95 */
01075, /* FNC3 FNC3 96 */
00257, /* FNC2 FNC2 97 */
01057, /* ShiB ShiA 98 */
01735, /* CodC CodC 99 */
01675, /* CodB FNC4 CodB 100 */
01727, /* FNC4 CodA CodA 101 */
01657, /* FNC1 FNC1 FNC1 102 */
00413, /* Start Code A 103 */
00113, /* Start Code B 104 */
00713 /* Start Code C 105 */
};
#define CODESET_A 0

2
contrib/hbzebra/qrcode.c
View File

@@ -651,7 +651,7 @@ static int _qr_dataencode( const char * szCode, HB_SIZE nSize, PHB_BITBUFFER pDa
iLen += 4; /* Mode indicator length */
/* Select version */
/* Select version */
iDataLen = 0; /* to pacify warning with some C compilers (MSVS 2010) */
iVersion = 0; /* to pacify warning */
for( i = 1; i <= 40; i++ )

12
contrib/rddads/ads1.c
View File

@@ -928,12 +928,12 @@ static HB_ERRCODE adsGoTo( ADSAREAP pArea, HB_ULONG ulRecNo )
u32RetVal = AdsGotoRecord( pArea->hTable, 0 );
}
/* Usually AdsGotoRecord( *, 0 ) is valid call and returns no error,
* but if previous error was AE_INVALID_RECORD_NUMBER, the following
* AdsGotoRecord( *, 0 ) returns the same error. I'm not sure if this
* AdsGotoRecord( *, 0 ) will position to phantom record and return
* empty fields. I hope I have not made any regressions in code, since
* it replicates previous behaviour. [Mindaugas]
/* Usually AdsGotoRecord( *, 0 ) is valid call and returns no error,
* but if previous error was AE_INVALID_RECORD_NUMBER, the following
* AdsGotoRecord( *, 0 ) returns the same error. I'm not sure if this
* AdsGotoRecord( *, 0 ) will position to phantom record and return
* empty fields. I hope I have not made any regressions in code, since
* it replicates previous behaviour. [Mindaugas]
*/
if( u32RetVal != AE_SUCCESS && u32RetVal != AE_INVALID_RECORD_NUMBER )
{

2
contrib/rddsql/sqlbase.c
View File

@@ -470,7 +470,7 @@ static HB_ERRCODE sqlbaseGetValue( SQLBASEAREAP pArea, HB_USHORT uiIndex, PHB_IT
static HB_ERRCODE sqlbaseGetVarLen( SQLBASEAREAP pArea, HB_USHORT uiIndex, HB_ULONG * pLength )
{
/* TODO: should we use this code? */
/* TODO: should we use this code? */
#if 0
if( pArea->area.lpFields[ uiIndex ].uiType == HB_IT_MEMO )
return pArea->pSDD->GetVarLen( pArea, uiIndex, pLength );

2
contrib/sddodbc/core.c
View File

@@ -552,7 +552,7 @@ static HB_ERRCODE odbcOpen( SQLBASEAREAP pArea )
dbFieldInfo.uiType = HB_FT_TIME;
break;
/* SQL_DATETIME = SQL_DATE = 9 */
/* SQL_DATETIME = SQL_DATE = 9 */
case SQL_TIMESTAMP:
#if ODBCVER >= 0x0300
case SQL_TYPE_TIMESTAMP:

122
src/common/expropt1.c
View File

@@ -119,64 +119,64 @@ static const char * s_OperTable[ HB_EXPR_COUNT ] = {
* HB_ET_NONE is used for invalid syntax, e.g. var := var1 += 2
*/
static const HB_BYTE s_PrecedTable[ HB_EXPR_COUNT ] = {
HB_ET_NIL, /* HB_ET_NONE = 0, */
HB_ET_NIL, /* HB_ET_NIL, */
HB_ET_NIL, /* HB_ET_NUMERIC, */
HB_ET_NIL, /* HB_ET_DATE, */
HB_ET_NIL, /* HB_ET_TIMESTAMP, */
HB_ET_NIL, /* HB_ET_STRING, */
HB_ET_NIL, /* HB_ET_CODEBLOCK, */
HB_ET_NIL, /* HB_ET_LOGICAL, */
HB_ET_NIL, /* HB_ET_SELF, */
HB_ET_NIL, /* HB_ET_ARRAY, */
HB_ET_NIL, /* HB_ET_HASH, */
HB_ET_NIL, /* HB_ET_FUNREF, */
HB_ET_NIL, /* HB_ET_VARREF, */
HB_ET_NIL, /* HB_ET_REFERENCE, */
HB_ET_NIL, /* HB_ET_IIF, */
HB_ET_NIL, /* HB_ET_LIST, */
HB_ET_NIL, /* HB_ET_ARGLIST, */
HB_ET_NIL, /* HB_ET_MACROARGLIST,*/
HB_ET_NIL, /* HB_ET_ARRAYAT, */
HB_ET_NIL, /* HB_ET_MACRO, */
HB_ET_NIL, /* HB_ET_FUNCALL, */
HB_ET_NIL, /* HB_ET_ALIASVAR, */
HB_ET_NIL, /* HB_ET_ALIASEXPR, */
HB_ET_NIL, /* HB_ET_SETGET, */
HB_ET_NIL, /* HB_ET_SEND, */
HB_ET_NIL, /* HB_ET_FUNNAME, */
HB_ET_NIL, /* HB_ET_ALIAS, */
HB_ET_NIL, /* HB_ET_RTVARIABLE, */
HB_ET_NIL, /* HB_ET_VARIABLE, */
HB_ET_NIL, /* HB_EO_POSTINC, post-operators */
HB_ET_NIL, /* HB_EO_POSTDEC, */
HB_ET_NONE, /* HB_EO_ASSIGN, assignments */
HB_ET_NONE, /* HB_EO_PLUSEQ, Invalid syntax */
HB_ET_NONE, /* HB_EO_MINUSEQ, */
HB_ET_NONE, /* HB_EO_MULTEQ, */
HB_ET_NONE, /* HB_EO_DIVEQ, */
HB_ET_NONE, /* HB_EO_MODEQ, */
HB_ET_NONE, /* HB_EO_EXPEQ, */
HB_EO_OR, /* HB_EO_OR, logical operators */
HB_EO_AND, /* HB_EO_AND, */
HB_ET_NIL, /* HB_EO_NOT, */
HB_EO_EQUAL, /* HB_EO_EQUAL, relational operators */
HB_EO_EQUAL, /* HB_EO_EQ, */
HB_EO_EQUAL, /* HB_EO_NE, */
HB_EO_LT, /* HB_EO_IN, */
HB_EO_LT, /* HB_EO_LT, */
HB_EO_LT, /* HB_EO_GT, */
HB_EO_LT, /* HB_EO_LE, */
HB_EO_LT, /* HB_EO_GE, */
HB_EO_PLUS, /* HB_EO_PLUS, addition */
HB_EO_PLUS, /* HB_EO_MINUS, */
HB_EO_MULT, /* HB_EO_MULT, multiple */
HB_EO_MULT, /* HB_EO_DIV, */
HB_EO_MULT, /* HB_EO_MOD, */
HB_EO_POWER, /* HB_EO_POWER, */
HB_ET_NIL, /* HB_EO_NEGATE, sign operator */
HB_ET_NIL, /* HB_EO_PREINC, */
HB_ET_NIL /* HB_EO_PREDEC, pre-operators */
HB_ET_NIL, /* HB_ET_NONE = 0, */
HB_ET_NIL, /* HB_ET_NIL, */
HB_ET_NIL, /* HB_ET_NUMERIC, */
HB_ET_NIL, /* HB_ET_DATE, */
HB_ET_NIL, /* HB_ET_TIMESTAMP, */
HB_ET_NIL, /* HB_ET_STRING, */
HB_ET_NIL, /* HB_ET_CODEBLOCK, */
HB_ET_NIL, /* HB_ET_LOGICAL, */
HB_ET_NIL, /* HB_ET_SELF, */
HB_ET_NIL, /* HB_ET_ARRAY, */
HB_ET_NIL, /* HB_ET_HASH, */
HB_ET_NIL, /* HB_ET_FUNREF, */
HB_ET_NIL, /* HB_ET_VARREF, */
HB_ET_NIL, /* HB_ET_REFERENCE, */
HB_ET_NIL, /* HB_ET_IIF, */
HB_ET_NIL, /* HB_ET_LIST, */
HB_ET_NIL, /* HB_ET_ARGLIST, */
HB_ET_NIL, /* HB_ET_MACROARGLIST,*/
HB_ET_NIL, /* HB_ET_ARRAYAT, */
HB_ET_NIL, /* HB_ET_MACRO, */
HB_ET_NIL, /* HB_ET_FUNCALL, */
HB_ET_NIL, /* HB_ET_ALIASVAR, */
HB_ET_NIL, /* HB_ET_ALIASEXPR, */
HB_ET_NIL, /* HB_ET_SETGET, */
HB_ET_NIL, /* HB_ET_SEND, */
HB_ET_NIL, /* HB_ET_FUNNAME, */
HB_ET_NIL, /* HB_ET_ALIAS, */
HB_ET_NIL, /* HB_ET_RTVARIABLE, */
HB_ET_NIL, /* HB_ET_VARIABLE, */
HB_ET_NIL, /* HB_EO_POSTINC, post-operators */
HB_ET_NIL, /* HB_EO_POSTDEC, */
HB_ET_NONE, /* HB_EO_ASSIGN, assignments */
HB_ET_NONE, /* HB_EO_PLUSEQ, Invalid syntax */
HB_ET_NONE, /* HB_EO_MINUSEQ, */
HB_ET_NONE, /* HB_EO_MULTEQ, */
HB_ET_NONE, /* HB_EO_DIVEQ, */
HB_ET_NONE, /* HB_EO_MODEQ, */
HB_ET_NONE, /* HB_EO_EXPEQ, */
HB_EO_OR, /* HB_EO_OR, logical operators */
HB_EO_AND, /* HB_EO_AND, */
HB_ET_NIL, /* HB_EO_NOT, */
HB_EO_EQUAL, /* HB_EO_EQUAL, relational operators */
HB_EO_EQUAL, /* HB_EO_EQ, */
HB_EO_EQUAL, /* HB_EO_NE, */
HB_EO_LT, /* HB_EO_IN, */
HB_EO_LT, /* HB_EO_LT, */
HB_EO_LT, /* HB_EO_GT, */
HB_EO_LT, /* HB_EO_LE, */
HB_EO_LT, /* HB_EO_GE, */
HB_EO_PLUS, /* HB_EO_PLUS, addition */
HB_EO_PLUS, /* HB_EO_MINUS, */
HB_EO_MULT, /* HB_EO_MULT, multiple */
HB_EO_MULT, /* HB_EO_DIV, */
HB_EO_MULT, /* HB_EO_MOD, */
HB_EO_POWER, /* HB_EO_POWER, */
HB_ET_NIL, /* HB_EO_NEGATE, sign operator */
HB_ET_NIL, /* HB_EO_PREINC, */
HB_ET_NIL /* HB_EO_PREDEC, pre-operators */
};
/* ************************************************************************* */
@@ -1285,7 +1285,7 @@ PHB_EXPR hb_compExprMacroAsAlias( PHB_EXPR pExpr )
return pExpr;
}
/* Return a number of elements on the linked list
/* Return a number of elements on the linked list
*/
HB_ULONG hb_compExprListLen( PHB_EXPR pExpr )
{
@@ -1319,7 +1319,7 @@ HB_BOOL hb_compExprListTypeCheck( PHB_EXPR pExpr, HB_EXPRTYPE ExprType )
return HB_FALSE;
}
/* Return a number of parameters passed to function or method
/* Return a number of parameters passed to function or method
*/
HB_ULONG hb_compExprParamListLen( PHB_EXPR pExpr )
{
@@ -1344,7 +1344,7 @@ HB_ULONG hb_compExprParamListLen( PHB_EXPR pExpr )
return nLen;
}
/* Check if expression is hb_ArrayToParams( aParams ) function call
/* Check if expression is hb_ArrayToParams( aParams ) function call
*/
HB_BOOL hb_compExprIsArrayToParams( PHB_EXPR pExpr )
{

20
src/common/hbstr.c
View File

@@ -371,16 +371,16 @@ char * hb_xstrcpy( char * szDest, const char * szSrc, ... )
static double hb_numPow10( int nPrecision )
{
static const double s_dPow10[ 16 ] = { 1.0, /* 0 */
10.0, /* 1 */
100.0, /* 2 */
1000.0, /* 3 */
10000.0, /* 4 */
100000.0, /* 5 */
1000000.0, /* 6 */
10000000.0, /* 7 */
100000000.0, /* 8 */
1000000000.0, /* 9 */
static const double s_dPow10[ 16 ] = { 1.0, /* 0 */
10.0, /* 1 */
100.0, /* 2 */
1000.0, /* 3 */
10000.0, /* 4 */
100000.0, /* 5 */
1000000.0, /* 6 */
10000000.0, /* 7 */
100000000.0, /* 8 */
1000000000.0, /* 9 */
10000000000.0, /* 10 */
100000000000.0, /* 11 */
1000000000000.0, /* 12 */

4
src/compiler/hbmain.c
View File

@@ -1693,7 +1693,9 @@ static void hb_compOptimizeFrames( HB_COMP_DECL, PHB_HFUNC pFunc )
/* NOTE: For some reason this will not work for the static init
function, so I'm using an ugly hack instead. [vszakats] */
/* if( !( pFunc->funFlags & HB_FUNF_USES_STATICS ) ) */
#if 0
if( !( pFunc->funFlags & HB_FUNF_USES_STATICS ) )
#endif
if( pFunc->pCode[ 8 ] == HB_P_ENDPROC )
{
pFunc->nPCodePos -= 3;

4
src/compiler/hbopt.c
View File

@@ -966,7 +966,7 @@ static HB_BOOL hb_compIsUncondJump( HB_BYTE bPCode )
return bPCode == HB_P_JUMPNEAR ||
bPCode == HB_P_JUMP ||
bPCode == HB_P_JUMPFAR;
/* || bPCode == HB_P_SEQEND;
/* || bPCode == HB_P_SEQEND;
BEGIN SEQUENCE/END SEQUENCE logic could not be processed using conditional/unconditional
jumps. I set HB_P_SEQEND as conditional jump though this PCode instruction is processed
as unconditional jump by Harbour VM. This hack solves 'Variable is assigned but not used'
@@ -1579,7 +1579,7 @@ static void hb_compPCodeEnumRenumberLocals( PHB_HFUNC pFunc, PHB_OPT_LOCAL pLoca
{
isVar = pLocals[ isVar - 1 ].isNumber;
assert( isVar > 0 ); /* We do not allow removal of detached locals */
assert( isVar > 0 ); /* We do not allow removal of detached locals */
pVar[ 0 ] = HB_LOBYTE( isVar );
pVar[ 1 ] = HB_HIBYTE( isVar );

7
src/rdd/dbffpt/dbffpt1.c
View File

@@ -516,10 +516,9 @@ static HB_ERRCODE hb_fptWriteGCitems( FPTAREAP pArea, LPMEMOGCTABLE pGCtable, HB
if( ( pArea->uiMemoVersion == DB_MEMOVER_FLEX ||
pArea->uiMemoVersion == DB_MEMOVER_CLIP ) &&
/* TODO: check what FLEX/CL53 exactly does in such situations */
/* Tests show that FLEX/CL53 does not reuse larger blocks
* which can leave 8 or less dummy bytes so such problem
* does not exists. [druzus]
*/
/* Tests show that FLEX/CL53 does not reuse larger blocks
which can leave 8 or less dummy bytes so such problem
does not exists. [druzus] */
pGCtable->pGCitems[ i ].ulSize * pArea->ulMemoBlockSize >=
sizeof( FPTBLOCK ) )
{

22
src/rtl/gtcrs/gtcrs.c
View File

@@ -1933,20 +1933,20 @@ static InOutBase * create_ioBase( char * term, int infd, int outfd, int errfd,
ioBase->attr_mask = ( chtype ) -1;
if( has_colors() )
{
/* DOS->CURSES color mapping
/* DOS->CURSES color mapping
DOS -> curses
--------------------------------
0 black -> COLOR_BLACK
1 blue -> COLOR_BLUE
2 green -> COLOR_GREEN
3 cyan -> COLOR_CYAN
4 red -> COLOR_RED
5 magenta -> COLOR_MAGENTA
6 yellow -> COLOR_YELLOW
7 light gray -> COLOR_WHITE
0 black -> COLOR_BLACK
1 blue -> COLOR_BLUE
2 green -> COLOR_GREEN
3 cyan -> COLOR_CYAN
4 red -> COLOR_RED
5 magenta -> COLOR_MAGENTA
6 yellow -> COLOR_YELLOW
7 light gray -> COLOR_WHITE
8 gray -> BOLD/BLINK BLACK
9 light blue -> BOLD/BLINK BLUE
8 gray -> BOLD/BLINK BLACK
9 light blue -> BOLD/BLINK BLUE
10 light green -> BOLD/BLINK GREEN
11 light cyan -> BOLD/BLINK CYAN
12 light red -> BOLD/BLINK RED

4
src/rtl/gtdos/gtdos.c
View File

@@ -1107,7 +1107,7 @@ static void vmode43x80( void )
{
union REGS regs;
regs.HB_XREGS.ax = 0x1201; /* select 350 scan line mode */
regs.HB_XREGS.ax = 0x1201; /* select 350 scan line mode */
regs.h.bl = 0x30;
HB_DOS_INT86( INT_VIDEO, &regs, &regs );
regs.HB_XREGS.ax = 0x0003; /* mode in AL, if higher bit is on, No CLS */
@@ -1126,7 +1126,7 @@ static void vmode50x80( void )
{
union REGS regs;
regs.HB_XREGS.ax = 0x1202; /* select 400 scan line mode */
regs.HB_XREGS.ax = 0x1202; /* select 400 scan line mode */
regs.h.bl = 0x30;
HB_DOS_INT86( INT_VIDEO, &regs, &regs );
regs.HB_XREGS.ax = 0x0003; /* mode in AL, if bit 7 is on, No CLS */

6
src/rtl/gtkeycod.c
View File

@@ -328,12 +328,12 @@ int hb_gt_dos_keyCodeTranslate( int iKey, int iFlags, PHB_CODEPAGE cdp )
iFlags |= iKeyPad;
break;
case 370: /* Ctrl + Print */
case 370: /* Ctrl + Print */
iKey = HB_KX_PRTSCR;
iFlags |= HB_KF_CTRL;
break;
case 371: /* Ctrl + Left arrow */
case 371: /* Ctrl + Left arrow */
iKey = HB_KX_LEFT;
iFlags |= HB_KF_CTRL | iKeyPad;
break;
@@ -357,7 +357,7 @@ int hb_gt_dos_keyCodeTranslate( int iKey, int iFlags, PHB_CODEPAGE cdp )
iKey = HB_KX_PGUP;
iFlags |= HB_KF_CTRL | iKeyPad;
break;
case 397: /* Ctrl + Up arrow */
case 397: /* Ctrl + Up arrow */
iKey = HB_KX_UP;
iFlags |= HB_KF_CTRL | iKeyPad;
break;

136
src/rtl/inkeyapi.c
View File

@@ -109,74 +109,74 @@ static const HB_KEY_VALUE s_transKeyFun[] = {
};
static const HB_KEY_VALUE s_transKeyStd[] = {
{ K_SPACE, 0, 0, 0 }, /* 32 */
{ '!', 0, 0, 0 }, /* 33 */
{ '"', 0, 0, 0 }, /* 34 */
{ '#', 0, 0, 0 }, /* 35 */
{ '$', 0, 0, 0 }, /* 36 */
{ '%', 0, 0, 0 }, /* 37 */
{ '&', 0, 0, 0 }, /* 38 */
{ '\'', K_ALT_QUOTE, 7, 0 }, /* 39 */
{ '(', 0, 0, 0 }, /* 40 */
{ ')', 0, 0, 0 }, /* 41 */
{ '*', 0, 0, 0 }, /* 42 */
{ '+', 0, 0, 0 }, /* 43 */
{ ',', K_ALT_COMMA, 0, 0 }, /* 44 */
{ '-', K_ALT_MINUS, 31, 0 }, /* 45 */
{ '.', K_ALT_PERIOD, 0, 0 }, /* 46 */
{ '/', K_CTRL_QUESTION, K_CTRL_BS, 0 }, /* 47 */
{ '0', K_ALT_0, 0, 0 }, /* 48 */
{ '1', K_ALT_1, 0, 0 }, /* 49 */
{ '2', K_ALT_2, 259, 0 }, /* 50 */
{ '3', K_ALT_3, 27, 0 }, /* 51 */
{ '4', K_ALT_4, 28, 0 }, /* 52 */
{ '5', K_ALT_5, 29, 0 }, /* 53 */
{ '6', K_ALT_6, 30, 0 }, /* 54 */
{ '7', K_ALT_7, 31, 0 }, /* 55 */
{ '8', K_ALT_8, 127, 0 }, /* 56 */
{ '9', K_ALT_9, 0, 0 }, /* 57 */
{ ':', 0, 0, 0 }, /* 58 */
{ ';', K_ALT_SC, 0, 0 }, /* 59 */
{ '<', 0, 0, 0 }, /* 60 */
{ '=', K_ALT_EQUALS, 0, 0 }, /* 61 */
{ '>', 0, 0, 0 }, /* 62 */
{ '?', 0, K_CTRL_QUESTION, 0 }, /* 63 */
{ '@', 0, 259, 0 }, /* 64 */
{ 'A', K_ALT_A, K_CTRL_A, 0 }, /* 65 */
{ 'B', K_ALT_B, K_CTRL_B, 0 }, /* 66 */
{ 'C', K_ALT_C, K_CTRL_C, 0 }, /* 67 */
{ 'D', K_ALT_D, K_CTRL_D, 0 }, /* 68 */
{ 'E', K_ALT_E, K_CTRL_E, 0 }, /* 69 */
{ 'F', K_ALT_F, K_CTRL_F, 0 }, /* 70 */
{ 'G', K_ALT_G, K_CTRL_G, 0 }, /* 71 */
{ 'H', K_ALT_H, K_CTRL_H, 0 }, /* 72 */
{ 'I', K_ALT_I, K_CTRL_I, 0 }, /* 73 */
{ 'J', K_ALT_J, K_CTRL_J, 0 }, /* 74 */
{ 'K', K_ALT_K, K_CTRL_K, 0 }, /* 75 */
{ 'L', K_ALT_L, K_CTRL_L, 0 }, /* 76 */
{ 'M', K_ALT_M, K_CTRL_M, 0 }, /* 77 */
{ 'N', K_ALT_N, K_CTRL_N, 0 }, /* 78 */
{ 'O', K_ALT_O, K_CTRL_O, 0 }, /* 79 */
{ 'P', K_ALT_P, K_CTRL_P, 0 }, /* 80 */
{ 'Q', K_ALT_Q, K_CTRL_Q, 0 }, /* 81 */
{ 'R', K_ALT_R, K_CTRL_R, 0 }, /* 82 */
{ 'S', K_ALT_S, K_CTRL_S, 0 }, /* 83 */
{ 'T', K_ALT_T, K_CTRL_T, 0 }, /* 84 */
{ 'U', K_ALT_U, K_CTRL_U, 0 }, /* 85 */
{ 'V', K_ALT_V, K_CTRL_V, 0 }, /* 86 */
{ 'W', K_ALT_W, K_CTRL_W, 0 }, /* 87 */
{ 'X', K_ALT_X, K_CTRL_X, 0 }, /* 88 */
{ 'Y', K_ALT_Y, K_CTRL_Y, 0 }, /* 89 */
{ 'Z', K_ALT_Z, K_CTRL_Z, 0 }, /* 90 */
{ '[', K_ALT_OSB, 27, 0 }, /* 91 */
{ '\\', K_ALT_BACKSLASH, 28, 0 }, /* 92 */
{ ']', K_ALT_CSB, 29, 0 }, /* 93 */
{ '^', K_ALT_6, 30, 0 }, /* 94 */
{ '_', K_ALT_MINUS, 31, 0 }, /* 95 */
{ '`', K_ALT_BACKQUOTE, K_ALT_BACKQUOTE, 0 }, /* 96 */
{ 'a', K_ALT_A, K_CTRL_A, 0 }, /* 97 */
{ 'b', K_ALT_B, K_CTRL_B, 0 }, /* 98 */
{ 'c', K_ALT_C, K_CTRL_C, 0 }, /* 99 */
{ K_SPACE, 0, 0, 0 }, /* 32 */
{ '!', 0, 0, 0 }, /* 33 */
{ '"', 0, 0, 0 }, /* 34 */
{ '#', 0, 0, 0 }, /* 35 */
{ '$', 0, 0, 0 }, /* 36 */
{ '%', 0, 0, 0 }, /* 37 */
{ '&', 0, 0, 0 }, /* 38 */
{ '\'', K_ALT_QUOTE, 7, 0 }, /* 39 */
{ '(', 0, 0, 0 }, /* 40 */
{ ')', 0, 0, 0 }, /* 41 */
{ '*', 0, 0, 0 }, /* 42 */
{ '+', 0, 0, 0 }, /* 43 */
{ ',', K_ALT_COMMA, 0, 0 }, /* 44 */
{ '-', K_ALT_MINUS, 31, 0 }, /* 45 */
{ '.', K_ALT_PERIOD, 0, 0 }, /* 46 */
{ '/', K_CTRL_QUESTION, K_CTRL_BS, 0 }, /* 47 */
{ '0', K_ALT_0, 0, 0 }, /* 48 */
{ '1', K_ALT_1, 0, 0 }, /* 49 */
{ '2', K_ALT_2, 259, 0 }, /* 50 */
{ '3', K_ALT_3, 27, 0 }, /* 51 */
{ '4', K_ALT_4, 28, 0 }, /* 52 */
{ '5', K_ALT_5, 29, 0 }, /* 53 */
{ '6', K_ALT_6, 30, 0 }, /* 54 */
{ '7', K_ALT_7, 31, 0 }, /* 55 */
{ '8', K_ALT_8, 127, 0 }, /* 56 */
{ '9', K_ALT_9, 0, 0 }, /* 57 */
{ ':', 0, 0, 0 }, /* 58 */
{ ';', K_ALT_SC, 0, 0 }, /* 59 */
{ '<', 0, 0, 0 }, /* 60 */
{ '=', K_ALT_EQUALS, 0, 0 }, /* 61 */
{ '>', 0, 0, 0 }, /* 62 */
{ '?', 0, K_CTRL_QUESTION, 0 }, /* 63 */
{ '@', 0, 259, 0 }, /* 64 */
{ 'A', K_ALT_A, K_CTRL_A, 0 }, /* 65 */
{ 'B', K_ALT_B, K_CTRL_B, 0 }, /* 66 */
{ 'C', K_ALT_C, K_CTRL_C, 0 }, /* 67 */
{ 'D', K_ALT_D, K_CTRL_D, 0 }, /* 68 */
{ 'E', K_ALT_E, K_CTRL_E, 0 }, /* 69 */
{ 'F', K_ALT_F, K_CTRL_F, 0 }, /* 70 */
{ 'G', K_ALT_G, K_CTRL_G, 0 }, /* 71 */
{ 'H', K_ALT_H, K_CTRL_H, 0 }, /* 72 */
{ 'I', K_ALT_I, K_CTRL_I, 0 }, /* 73 */
{ 'J', K_ALT_J, K_CTRL_J, 0 }, /* 74 */
{ 'K', K_ALT_K, K_CTRL_K, 0 }, /* 75 */
{ 'L', K_ALT_L, K_CTRL_L, 0 }, /* 76 */
{ 'M', K_ALT_M, K_CTRL_M, 0 }, /* 77 */
{ 'N', K_ALT_N, K_CTRL_N, 0 }, /* 78 */
{ 'O', K_ALT_O, K_CTRL_O, 0 }, /* 79 */
{ 'P', K_ALT_P, K_CTRL_P, 0 }, /* 80 */
{ 'Q', K_ALT_Q, K_CTRL_Q, 0 }, /* 81 */
{ 'R', K_ALT_R, K_CTRL_R, 0 }, /* 82 */
{ 'S', K_ALT_S, K_CTRL_S, 0 }, /* 83 */
{ 'T', K_ALT_T, K_CTRL_T, 0 }, /* 84 */
{ 'U', K_ALT_U, K_CTRL_U, 0 }, /* 85 */
{ 'V', K_ALT_V, K_CTRL_V, 0 }, /* 86 */
{ 'W', K_ALT_W, K_CTRL_W, 0 }, /* 87 */
{ 'X', K_ALT_X, K_CTRL_X, 0 }, /* 88 */
{ 'Y', K_ALT_Y, K_CTRL_Y, 0 }, /* 89 */
{ 'Z', K_ALT_Z, K_CTRL_Z, 0 }, /* 90 */
{ '[', K_ALT_OSB, 27, 0 }, /* 91 */
{ '\\', K_ALT_BACKSLASH, 28, 0 }, /* 92 */
{ ']', K_ALT_CSB, 29, 0 }, /* 93 */
{ '^', K_ALT_6, 30, 0 }, /* 94 */
{ '_', K_ALT_MINUS, 31, 0 }, /* 95 */
{ '`', K_ALT_BACKQUOTE, K_ALT_BACKQUOTE, 0 }, /* 96 */
{ 'a', K_ALT_A, K_CTRL_A, 0 }, /* 97 */
{ 'b', K_ALT_B, K_CTRL_B, 0 }, /* 98 */
{ 'c', K_ALT_C, K_CTRL_C, 0 }, /* 99 */
{ 'd', K_ALT_D, K_CTRL_D, 0 }, /* 100 */
{ 'e', K_ALT_E, K_CTRL_E, 0 }, /* 101 */
{ 'f', K_ALT_F, K_CTRL_F, 0 }, /* 102 */

4
src/rtl/philes.c
View File

@@ -279,8 +279,8 @@ HB_FUNC( HB_FREADLEN )
hb_fsSetFError( uiError );
}
/* NOTE: This function should not return the leading and trailing */
/* (back)slashes. [vszakats] */
/* NOTE: This function should not return the leading and trailing
(back)slashes. [vszakats] */
/* TODO: Xbase++ is able to change to the specified directory. */

2
src/rtl/treport.prg
View File

@@ -811,7 +811,7 @@ METHOD PROCEDURE ExecuteReport() CLASS HBReportForm
// Tack on the spacing for double/triple/etc.
IF ::aReportData[ RPT_SPACING ] > 1
/* Double space problem in REPORT FORM at the bottom of the page */
/* Double space problem in REPORT FORM at the bottom of the page */
IF ::nLinesLeft >= ::aReportData[ RPT_SPACING ] - 1
FOR nLine := 2 TO ::aReportData[ RPT_SPACING ]

6
src/vm/fm.c
View File

@@ -1296,7 +1296,7 @@ HB_SIZE hb_xquery( int iMode )
switch( iMode )
{
case HB_MEM_CHAR: /* (Free Variable Space [KB]) */
case HB_MEM_CHAR: /* (Free Variable Space [KB]) */
#if defined( HB_OS_WIN )
{
MEMORYSTATUS memorystatus;
@@ -1317,7 +1317,7 @@ HB_SIZE hb_xquery( int iMode )
#endif
break;
case HB_MEM_BLOCK: /* (Largest String [KB]) */
case HB_MEM_BLOCK: /* (Largest String [KB]) */
#if defined( HB_OS_WIN )
{
MEMORYSTATUS memorystatus;
@@ -1338,7 +1338,7 @@ HB_SIZE hb_xquery( int iMode )
#endif
break;
case HB_MEM_RUN: /* (RUN Memory [KB]) */
case HB_MEM_RUN: /* (RUN Memory [KB]) */
#if defined( HB_OS_WIN )
{
MEMORYSTATUS memorystatus;

5
src/vm/hvm.c
View File

@@ -3082,10 +3082,7 @@ void hb_vmExecute( const HB_BYTE * pCode, PHB_SYMB pSymbols )
}
}
/* ------------------------------- */
/* Operators ( mathematical */
/* character / misc ) */
/* ------------------------------- */
/* Operators (mathematical / character / misc) */
static void hb_vmAddInt( PHB_ITEM pResult, HB_LONG lAdd )
{

4
src/vm/memvars.c
View File

@@ -665,8 +665,8 @@ static void hb_memvarCreateFromDynSymbol( PHB_DYNS pDynVar, int iScope, PHB_ITEM
*/
pMemvar->type = HB_IT_LOGICAL;
/* NOTE: PUBLIC variables named CLIPPER and HARBOUR are initialized */
/* to .T., this is normal Clipper behaviour. [vszakats] */
/* NOTE: PUBLIC variables named CLIPPER and HARBOUR are initialized
to .T., this is normal Clipper behaviour. [vszakats] */
pMemvar->item.asLogical.value =
( strcmp( pDynVar->pSymbol->szName, "HARBOUR" ) == 0 ||