2002-03-19 09:30 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>

This commit is contained in:
Alexander S.Kresin
2002-03-19 06:26:11 +00:00
parent b274fec976
commit 16a9c301c0
3 changed files with 19 additions and 8 deletions

View File

@@ -7,6 +7,12 @@
For example:
2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
* Fix bug in PICTURE '@S'
2002-03-19 13:07 UTC+0100 Antonio Linares <alinares@fivetech.com>
* source/vm/memvars.c
* __MVSAVE() saves all variables (publics and privates)
Of course if a public variable is overriden by a private one,
the private value it is saved. I have not compared the saved
files with Cl*pper ones. Once this is checked, then we may

View File

@@ -2858,13 +2858,18 @@ HB_FUNC( ORDSCOPE )
SELF_SCOPEINFO( ( AREAP ) s_pCurrArea->pArea, sInfo.nScope, pScopeValue );
if( hb_pcount() < 2 || ISNIL( 2 ) ) /* explicitly passed NIL, clear it */
sInfo.scopeValue = NULL;
else
sInfo.scopeValue = hb_param( 2, HB_IT_ANY) ;
if( hb_pcount() > 1 )
{
if ( ISNIL( 2 ) ) /* explicitly passed NIL, clear it */
sInfo.scopeValue = NULL;
else
sInfo.scopeValue = hb_param( 2, HB_IT_ANY) ;
/* rdd must not alter the scopeValue item -- it's not a copy */
SELF_SETSCOPE( ( AREAP ) s_pCurrArea->pArea, (LPDBORDSCOPEINFO) &sInfo );
/* rdd must not alter the scopeValue item -- it's not a copy */
SELF_SETSCOPE( ( AREAP ) s_pCurrArea->pArea, (LPDBORDSCOPEINFO) &sInfo );
}else
sInfo.scopeValue = NULL;
hb_itemRelease( hb_itemReturn( pScopeValue ) );
}

View File

@@ -159,7 +159,7 @@ static void commonError( NTXAREAP pArea, USHORT uiGenCode, USHORT uiSubCode, cha
static void hb_IncString( char* s, int slen )
{
unsigned char *ptr;
char *ptr;
unsigned int nsymb;
for( ptr=s+slen-1;ptr>=s;ptr-- )
@@ -167,7 +167,7 @@ static void hb_IncString( char* s, int slen )
nsymb = (unsigned int) *ptr;
if( nsymb < 255 )
{
*ptr = (unsigned char) ++nsymb;
*ptr = (char) ++nsymb;
break;
}
}