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

2011-10-10 20:59 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/src/rtl/natmsg.c
    ! modified __NATISAFFIRM() and __NATISNEGATIVE() to work with
      multibyte CPs
This commit is contained in:
Przemyslaw Czerpak
2011-10-10 18:59:35 +00:00
parent 69bfb809d4
commit 1725166be3
2 changed files with 48 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -16,6 +16,11 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-10-10 20:59 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/src/rtl/natmsg.c
! modified __NATISAFFIRM() and __NATISNEGATIVE() to work with
multibyte CPs
2011-10-10 19:50 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/include/hbapi.h
* harbour/src/rtl/cdpapi.c

47
harbour/src/rtl/natmsg.c
View File

@@ -65,6 +65,7 @@
#include "hbapi.h"
#include "hbapiitm.h"
#include "hbapilng.h"
#include "hbapicdp.h"
/* NOTE: Ad-hoc names mostly taken from various Clipper source files.
These should be named properly if exported outside this file.
@@ -93,16 +94,54 @@ static const char * hb_nationGetMsg( int iMsg )
HB_FUNC( __NATISAFFIRM )
{
PHB_ITEM pItem = hb_param( 1, HB_IT_STRING );
HB_SIZE nLen = hb_parclen( 1 );
HB_BOOL fIS = HB_FALSE;
hb_retl( pItem && hb_itemGetCLen( pItem ) >= 1 && hb_charUpper( hb_itemGetCPtr( pItem )[ 0 ] ) == hb_langDGetItem( HB_LANG_ITEM_BASE_NATMSG + _LF_YN - 1 )[ 0 ] );
if( nLen > 0 )
{
const char * szYesNo = hb_langDGetItem( HB_LANG_ITEM_BASE_NATMSG + _LF_YN - 1 );
HB_SIZE nStr = 0;
while( szYesNo[ nStr ] && szYesNo[ nStr ] != '/' )
++nStr;
if( nStr && nLen >= nStr )
{
PHB_CODEPAGE cdp = hb_vmCDP();
if( cdp )
fIS = hb_cdpicmp( hb_parc( 1 ), nLen, szYesNo, nStr, cdp, HB_FALSE );
else
fIS = hb_strnicmp( hb_parc( 1 ), szYesNo, nStr );
}
}
hb_retl( fIS );
}
HB_FUNC( __NATISNEGATIVE )
{
PHB_ITEM pItem = hb_param( 1, HB_IT_STRING );
HB_SIZE nLen = hb_parclen( 1 );
HB_BOOL fIS = HB_FALSE;
hb_retl( pItem && hb_itemGetCLen( pItem ) >= 1 && hb_charUpper( hb_itemGetCPtr( pItem )[ 0 ] ) == hb_langDGetItem( HB_LANG_ITEM_BASE_NATMSG + _LF_YN - 1 )[ 2 ] );
if( nLen > 0 )
{
const char * szYesNo = hb_langDGetItem( HB_LANG_ITEM_BASE_NATMSG + _LF_YN - 1 );
HB_SIZE nStr;
while( *szYesNo )
if( *szYesNo++ == '/' )
break;
nStr = strlen( szYesNo );
if( nStr && nLen >= nStr )
{
PHB_CODEPAGE cdp = hb_vmCDP();
if( cdp )
fIS = hb_cdpicmp( hb_parc( 1 ), nLen, szYesNo, nStr, cdp, HB_FALSE );
else
fIS = hb_strnicmp( hb_parc( 1 ), szYesNo, nStr );
}
}
hb_retl( fIS );
}
HB_FUNC( __NATMSG )