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

2010-02-04 21:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* src/rtl/console.c
  * src/rtl/shadow.c
    ! Fixed three remaining places where color value was cast to BYTE type.
    ; QUESTION1: What to do with BYTE in hb_fs*Drv() calls?
                 Should it be int or unsigned int?
    ; QUESTION2: What to do with BYTE types in checksum calculations and 
                 low level color storage, is HB_U8 type good?

  * src/rtl/transfrm.c
  * src/rtl/memofile.c
    * BYTE -> char

  * src/rtl/gtkbstat.c
    * Formatting.
This commit is contained in:
Viktor Szakats
2010-02-04 20:02:22 +00:00
parent 6550f580d3
commit f48a61fa58
6 changed files with 63 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
harbour/ChangeLog
View File

@@ -17,6 +17,22 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-02-04 21:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/console.c
* src/rtl/shadow.c
! Fixed three remaining places where color value was cast to BYTE type.
; QUESTION1: What to do with BYTE in hb_fs*Drv() calls?
Should it be int or unsigned int?
; QUESTION2: What to do with BYTE types in checksum calculations and
low level color storage, is HB_U8 type good?
* src/rtl/transfrm.c
* src/rtl/memofile.c
* BYTE -> char
* src/rtl/gtkbstat.c
* Formatting.
2010-02-04 20:24 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/src/rtl/achoice.prg
! exit with 0 without activating user function when empty item array

2
harbour/src/rtl/console.c
View File

@@ -641,7 +641,7 @@ HB_FUNC( HB_DISPOUTATBOX )
iColor = hb_gtGetCurrColor();
while( nStringLen-- )
hb_gtPutChar( iRow, iCol++, ( BYTE ) iColor, HB_GT_ATTR_BOX, ( unsigned char ) *pszString++ );
hb_gtPutChar( iRow, iCol++, iColor, HB_GT_ATTR_BOX, ( unsigned char ) *pszString++ );
}
HB_FUNC( HB_GETSTDIN ) /* Return handle for STDIN */

68
harbour/src/rtl/gtkbstat.c
View File

@@ -61,55 +61,55 @@
int hb_gt_winapi_getKbdState( void )
{
BYTE kbState[256];
BYTE kbState[ 256 ];
int iKbdState = 0;
GetKeyboardState( kbState );
if( kbState[VK_SHIFT ] & 0x80 ) iKbdState |= HB_GTI_KBD_SHIFT;
if( kbState[VK_CONTROL ] & 0x80 ) iKbdState |= HB_GTI_KBD_CTRL;
if( kbState[VK_MENU ] & 0x80 ) iKbdState |= HB_GTI_KBD_ALT;
if( kbState[VK_LWIN ] & 0x80 ) iKbdState |= HB_GTI_KBD_LWIN;
if( kbState[VK_RWIN ] & 0x80 ) iKbdState |= HB_GTI_KBD_RWIN;
if( kbState[VK_APPS ] & 0x80 ) iKbdState |= HB_GTI_KBD_MENU;
if( kbState[VK_SCROLL ] & 0x01 ) iKbdState |= HB_GTI_KBD_SCROLOCK;
if( kbState[VK_NUMLOCK ] & 0x01 ) iKbdState |= HB_GTI_KBD_NUMLOCK;
if( kbState[VK_CAPITAL ] & 0x01 ) iKbdState |= HB_GTI_KBD_CAPSLOCK;
if( kbState[VK_INSERT ] & 0x01 ) iKbdState |= HB_GTI_KBD_INSERT;
if( kbState[ VK_SHIFT ] & 0x80 ) iKbdState |= HB_GTI_KBD_SHIFT;
if( kbState[ VK_CONTROL ] & 0x80 ) iKbdState |= HB_GTI_KBD_CTRL;
if( kbState[ VK_MENU ] & 0x80 ) iKbdState |= HB_GTI_KBD_ALT;
if( kbState[ VK_LWIN ] & 0x80 ) iKbdState |= HB_GTI_KBD_LWIN;
if( kbState[ VK_RWIN ] & 0x80 ) iKbdState |= HB_GTI_KBD_RWIN;
if( kbState[ VK_APPS ] & 0x80 ) iKbdState |= HB_GTI_KBD_MENU;
if( kbState[ VK_SCROLL ] & 0x01 ) iKbdState |= HB_GTI_KBD_SCROLOCK;
if( kbState[ VK_NUMLOCK ] & 0x01 ) iKbdState |= HB_GTI_KBD_NUMLOCK;
if( kbState[ VK_CAPITAL ] & 0x01 ) iKbdState |= HB_GTI_KBD_CAPSLOCK;
if( kbState[ VK_INSERT ] & 0x01 ) iKbdState |= HB_GTI_KBD_INSERT;
if( kbState[VK_LSHIFT ] & 0x80 ) iKbdState |= HB_GTI_KBD_LSHIFT;
if( kbState[VK_RSHIFT ] & 0x80 ) iKbdState |= HB_GTI_KBD_RSHIFT;
if( kbState[VK_LCONTROL] & 0x80 ) iKbdState |= HB_GTI_KBD_LCTRL;
if( kbState[VK_RCONTROL] & 0x80 ) iKbdState |= HB_GTI_KBD_RCTRL;
if( kbState[VK_LMENU ] & 0x80 ) iKbdState |= HB_GTI_KBD_LALT;
if( kbState[VK_RMENU ] & 0x80 ) iKbdState |= HB_GTI_KBD_RALT;
if( kbState[ VK_LSHIFT ] & 0x80 ) iKbdState |= HB_GTI_KBD_LSHIFT;
if( kbState[ VK_RSHIFT ] & 0x80 ) iKbdState |= HB_GTI_KBD_RSHIFT;
if( kbState[ VK_LCONTROL ] & 0x80 ) iKbdState |= HB_GTI_KBD_LCTRL;
if( kbState[ VK_RCONTROL ] & 0x80 ) iKbdState |= HB_GTI_KBD_RCTRL;
if( kbState[ VK_LMENU ] & 0x80 ) iKbdState |= HB_GTI_KBD_LALT;
if( kbState[ VK_RMENU ] & 0x80 ) iKbdState |= HB_GTI_KBD_RALT;
return iKbdState;
}
void hb_gt_winapi_setKbdState( int iKbdState )
{
BYTE kbState[256];
BYTE kbState[ 256 ];
GetKeyboardState( kbState );
kbState[VK_SHIFT ] = ( iKbdState & HB_GTI_KBD_SHIFT ) ? 0x80 : 0;
kbState[VK_CONTROL] = ( iKbdState & HB_GTI_KBD_CTRL ) ? 0x80 : 0;
kbState[VK_MENU ] = ( iKbdState & HB_GTI_KBD_ALT ) ? 0x80 : 0;
kbState[VK_LWIN ] = ( iKbdState & HB_GTI_KBD_LWIN ) ? 0x80 : 0;
kbState[VK_RWIN ] = ( iKbdState & HB_GTI_KBD_RWIN ) ? 0x80 : 0;
kbState[VK_APPS ] = ( iKbdState & HB_GTI_KBD_MENU ) ? 0x80 : 0;
kbState[VK_SCROLL ] = ( iKbdState & HB_GTI_KBD_SCROLOCK ) ? 0x01 : 0;
kbState[VK_NUMLOCK] = ( iKbdState & HB_GTI_KBD_NUMLOCK ) ? 0x01 : 0;
kbState[VK_CAPITAL] = ( iKbdState & HB_GTI_KBD_CAPSLOCK ) ? 0x01 : 0;
kbState[VK_INSERT ] = ( iKbdState & HB_GTI_KBD_INSERT ) ? 0x01 : 0;
kbState[ VK_SHIFT ] = ( iKbdState & HB_GTI_KBD_SHIFT ) ? 0x80 : 0;
kbState[ VK_CONTROL ] = ( iKbdState & HB_GTI_KBD_CTRL ) ? 0x80 : 0;
kbState[ VK_MENU ] = ( iKbdState & HB_GTI_KBD_ALT ) ? 0x80 : 0;
kbState[ VK_LWIN ] = ( iKbdState & HB_GTI_KBD_LWIN ) ? 0x80 : 0;
kbState[ VK_RWIN ] = ( iKbdState & HB_GTI_KBD_RWIN ) ? 0x80 : 0;
kbState[ VK_APPS ] = ( iKbdState & HB_GTI_KBD_MENU ) ? 0x80 : 0;
kbState[ VK_SCROLL ] = ( iKbdState & HB_GTI_KBD_SCROLOCK ) ? 0x01 : 0;
kbState[ VK_NUMLOCK ] = ( iKbdState & HB_GTI_KBD_NUMLOCK ) ? 0x01 : 0;
kbState[ VK_CAPITAL ] = ( iKbdState & HB_GTI_KBD_CAPSLOCK ) ? 0x01 : 0;
kbState[ VK_INSERT ] = ( iKbdState & HB_GTI_KBD_INSERT ) ? 0x01 : 0;
kbState[VK_LSHIFT ] = ( iKbdState & HB_GTI_KBD_LSHIFT ) ? 0x80 : 0;
kbState[VK_RSHIFT ] = ( iKbdState & HB_GTI_KBD_RSHIFT ) ? 0x80 : 0;
kbState[VK_LCONTROL] = ( iKbdState & HB_GTI_KBD_LCTRL ) ? 0x80 : 0;
kbState[VK_RCONTROL] = ( iKbdState & HB_GTI_KBD_RCTRL ) ? 0x80 : 0;
kbState[VK_LMENU ] = ( iKbdState & HB_GTI_KBD_LALT ) ? 0x80 : 0;
kbState[VK_RMENU ] = ( iKbdState & HB_GTI_KBD_RALT ) ? 0x80 : 0;
kbState[ VK_LSHIFT ] = ( iKbdState & HB_GTI_KBD_LSHIFT ) ? 0x80 : 0;
kbState[ VK_RSHIFT ] = ( iKbdState & HB_GTI_KBD_RSHIFT ) ? 0x80 : 0;
kbState[ VK_LCONTROL ] = ( iKbdState & HB_GTI_KBD_LCTRL ) ? 0x80 : 0;
kbState[ VK_RCONTROL ] = ( iKbdState & HB_GTI_KBD_RCTRL ) ? 0x80 : 0;
kbState[ VK_LMENU ] = ( iKbdState & HB_GTI_KBD_LALT ) ? 0x80 : 0;
kbState[ VK_RMENU ] = ( iKbdState & HB_GTI_KBD_RALT ) ? 0x80 : 0;
SetKeyboardState( kbState );
}

10
harbour/src/rtl/memofile.c
View File

@@ -79,12 +79,12 @@ static void hb_memoread( HB_BOOL bHandleEOF )
#if ! defined( HB_OS_UNIX )
if( bHandleEOF )
{
BYTE byEOF = HB_CHAR_NUL;
char cEOF = HB_CHAR_NUL;
hb_fsSeek( fhnd, -1, FS_END );
hb_fsRead( fhnd, &byEOF, sizeof( BYTE ) );
hb_fsRead( fhnd, &cEOF, sizeof( char ) );
if( byEOF == HB_CHAR_EOF )
if( cEOF == HB_CHAR_EOF )
ulSize--;
}
#else
@@ -141,8 +141,8 @@ static HB_BOOL hb_memowrit( HB_BOOL bHandleEOF )
#if ! defined( HB_OS_UNIX )
if( bHandleEOF ) /* if true, then write EOF */
{
BYTE byEOF = HB_CHAR_EOF;
hb_fsWrite( fhnd, &byEOF, sizeof( BYTE ) );
char cEOF = HB_CHAR_EOF;
hb_fsWrite( fhnd, &cEOF, sizeof( char ) );
}
#else
HB_SYMBOL_UNUSED( bHandleEOF );

4
harbour/src/rtl/shadow.c
View File

@@ -60,7 +60,7 @@ HB_FUNC( HB_SHADOW )
hb_parni( 2 ),
hb_parni( 3 ),
hb_parni( 4 ),
HB_ISNUM( 5 ) ? ( BYTE ) hb_parni( 5 ) : 7 );
HB_ISNUM( 5 ) ? hb_parni( 5 ) : 7 );
}
HB_FUNC( HB_CLRAREA )
@@ -70,5 +70,5 @@ HB_FUNC( HB_CLRAREA )
hb_parni( 2 ),
hb_parni( 3 ),
hb_parni( 4 ),
( BYTE ) hb_parni( 5 ) );
hb_parni( 5 ) );
}

10
harbour/src/rtl/transfrm.c
View File

@@ -100,8 +100,8 @@ HB_FUNC( TRANSFORM )
HB_SIZE ulPicLen = hb_itemGetCLen( pPic );
USHORT uiPicFlags; /* Function flags */
HB_SIZE ulParamS = 0; /* To avoid GCC -O2 warning */
BYTE byParamL = '\0'; /* To avoid GCC -O2 warning */
HB_SIZE ulParamS = 0; /* To avoid GCC -O2 warning */
char cParamL = '\0'; /* To avoid GCC -O2 warning */
char * szResult;
HB_SIZE ulResultPos;
@@ -149,7 +149,7 @@ HB_FUNC( TRANSFORM )
case 'L':
case '0':
uiPicFlags |= PF_PADL; /* FoxPro/XPP extension */
byParamL = '0';
cParamL = '0';
break;
#endif
case 'B':
@@ -500,7 +500,7 @@ HB_FUNC( TRANSFORM )
if( uiPicFlags & PF_PADL )
{
for( i = 0; szResult[ i ] == ' '; i++ )
szResult[ i ] = byParamL;
szResult[ i ] = cParamL;
/* please test it with FoxPro and Xbase++ to check
* if they made the same [druzus]
@@ -508,7 +508,7 @@ HB_FUNC( TRANSFORM )
if( i && szResult[ i ] == '-' )
{
szResult[ 0 ] = '-';
szResult[ i ] = byParamL;
szResult[ i ] = cParamL;
}
}