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

20000130-22:41 GMT+1 Victor Szel <info@szelvesz.hu>

Browse Source
This commit is contained in:
Viktor Szakats
2000-01-30 21:43:48 +00:00
parent df8095f881
commit c8982877aa
5 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -1,3 +1,12 @@
20000130-22:41 GMT+1 Victor Szel <info@szelvesz.hu>
* source/rtl/mlcount.c
source/rtl/memoline.c
source/rtl/mlpos.c
! Fixed GPF when the first passed parameter was not a string.
* source/rtl/environ.c
! Fixed VERSION() reporing service pack level on NT/2000.
! Fixed minor doc formatting problem.
20000130-17:05 GMT+3 Alexander Kresin
* source/pp/hbpp.c
* Bug fixed, noted by Ryszard Glab

18
harbour/source/rtl/environ.c
View File

@@ -95,6 +95,7 @@
#define INT_86 int86
#endif
#endif
/* $DOC$
* $FUNCNAME$
* OS()
@@ -219,15 +220,15 @@ HARBOUR HB_OS( void )
hb_osletter = LOWORD(osVer.dwBuildNumber);
if( hb_osmajor == 3 && hb_osminor == 10 )
hb_os = "Windows NT 3.1";
hb_os = "Windows NT 3.1";
else if( hb_osmajor == 3 && hb_osminor == 50 )
hb_os = "Windows NT 3.5";
hb_os = "Windows NT 3.5";
else if( hb_osmajor == 3 && hb_osminor == 51 )
hb_os = "Windows NT 3.51";
hb_os = "Windows NT 3.51";
else if( hb_osmajor == 4 )
hb_os = "Windows NT 4";
hb_os = "Windows NT 4";
else if( hb_osmajor == 5 )
hb_os = "Windows 2000";
hb_os = "Windows 2000";
else
hb_os = "Windows NT";
@@ -240,7 +241,8 @@ HARBOUR HB_OS( void )
i++;
wServicePack = (WORD)( atoi( &osVer.szCSDVersion[ i ] ) );
sprintf( szBuild, "%i", wServicePack );
if( wServicePack )
sprintf( szBuild, " SP%i", wServicePack );
}
/* TODO: Add support for:
* NT Stand Alone Server
@@ -591,8 +593,8 @@ HARBOUR HB_VERSION( void )
* can be found, the value of the function will be a empty string.
* $EXAMPLES$
* ? QOUT(GETENV('PATH'))
? QOUT(GETENV('CONFIG'))
? QOUT(GETENV('HARBOURCMD', '-n -l -es2'))
* ? QOUT(GETENV('CONFIG'))
* ? QOUT(GETENV('HARBOURCMD', '-n -l -es2'))
* $TESTS$
*
* $STATUS$

2
harbour/source/rtl/memoline.c
View File

@@ -37,7 +37,7 @@
HARBOUR HB_MEMOLINE( void )
{
char * pszString = hb_parc( 1 );
char * pszString = ISCHAR( 1 ) ? hb_parc( 1 ) : "";
ULONG ulLineLength = ISNUM( 2 ) ? hb_parni( 2 ) : 79;
ULONG ulLineNumber = ISNUM( 3 ) ? hb_parni( 3 ) : 1;
ULONG ulTabLength = ISNUM( 4 ) ? hb_parni( 4 ) : 4;

2
harbour/source/rtl/mlcount.c
View File

@@ -37,7 +37,7 @@
HARBOUR HB_MLCOUNT( void )
{
char * pszString = hb_parc( 1 );
char * pszString = ISCHAR( 1 ) ? hb_parc( 1 ) : "";
ULONG ulLineLength = ISNUM( 2 ) ? hb_parni( 2 ) : 79;
ULONG ulTabLength = ISNUM( 3 ) ? hb_parni( 3 ) : 4;
ULONG ulLastSpace = 0;

2
harbour/source/rtl/mlpos.c
View File

@@ -37,7 +37,7 @@
HARBOUR HB_MLPOS( void )
{
char * pszString = hb_parc( 1 );
char * pszString = ISCHAR( 1 ) ? hb_parc( 1 ) : "";
ULONG ulLineLength = hb_parni( 2 );
ULONG ulLine = hb_parni( 3 );
ULONG ulTabLength = ISNUM( 4 ) ? hb_parni( 4 ) : 4;