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

2001-11-05 03:59 UTC+0100 Viktor Szakats <viktor.szakats@syenar.hu>

Browse Source
This commit is contained in:
Viktor Szakats
2001-11-05 02:59:25 +00:00
parent 7dbe2926e8
commit 4783f82fbe
10 changed files with 61 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
harbour/ChangeLog
View File

@@ -1,3 +1,31 @@
2001-11-05 03:59 UTC+0100 Viktor Szakats <viktor.szakats@syenar.hu>
* utils/hbtest/hbtest.prg
+ Enhanced the display of errors, now the correct and incorrect
results are below each other, so it's much easier to spot the
difference.
* source/common/hbver.c
* "Mingw32" -> "MinGW" name of the compiler changed.
* source/rtl/filesys.c
* 0L -> 0, where the former was superfluous.
* include/hbsetup.h
! Fixed WIN32 platform detection under Cygwin 1.3.3
* config/w32/mingw32.cf
! Added winspool lib...
* makefile.bc
- Removed -M switch from hbmake. Please use set CFLAGS= to add
optional switches.
* source/rtl/gtwin/gtwin.c
* source/vm/arrays.c
* source/vm/pvalue.c
* Minor changes in formatting.
2001-11-04 18:34 UTC+0100 Viktor Szakats <viktor.szakats@syenar.hu>
* source/compiler/cmdcheck.c

2
harbour/config/w32/mingw32.cf
View File

@@ -34,7 +34,7 @@ LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(lib))
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
# This library is needed for CharToOemBuff() and OemToCharBuff() support.
LINKLIBS += -luser32
LINKLIBS += -luser32 -lwinspool
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)

2
harbour/include/hbsetup.h
View File

@@ -293,7 +293,7 @@
#endif
#ifndef HB_OS_WIN_32
#if defined(WINNT) || defined(_Windows) || defined(__NT__) || defined(_WIN32) || defined(_WINDOWS_) || defined(__WINDOWS_386__) || defined(__WIN32__)
#if defined(WINNT) || defined(_Windows) || defined(__NT__) || defined(_WIN32) || defined(_WINDOWS_) || defined(__WINDOWS_386__) || defined(__WIN32__) || defined(__CYGWIN__)
#define HB_OS_WIN_32
#endif
#endif

4
harbour/makefile.bc
View File

@@ -79,7 +79,7 @@ ARFLAGS = /P32
!endif
!if !$d(BCC_NOOPTIM)
CFLAGS = -O2 $(CFLAGS)
CFLAGS = -O2 $(CFLAGS)
!endif
#
@@ -2581,7 +2581,7 @@ $(OBJ_DIR)\pdfhbdoc.obj : $(HBPDF_DIR)\pdfhbdoc.c
$(HBMAKE_EXE) : $(HBMAKE_EXE_OBJS)
$(ECHO) $(CFLAGS) > make.tmp
$(ECHO) -M -e$(HBMAKE_EXE) >> make.tmp
$(ECHO) -e$(HBMAKE_EXE) >> make.tmp
$(ECHO) $(OBJ_DIR)\hbmake.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\hbmutils.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\radios.obj >> make.tmp

2
harbour/source/common/hbver.c
View File

@@ -366,7 +366,7 @@ char * hb_verCompiler( void )
#elif defined(__CYGWIN__)
pszName = "Cygnus Cygwin GNU C";
#elif defined(__MINGW32__)
pszName = "Cygnus Mingw32 GNU C";
pszName = "Cygnus MinGW GNU C";
#elif defined(__RSX32__)
pszName = "EMX/RSXNT/DOS GNU C";
#elif defined(__RSXNT__)

4
harbour/source/rtl/filesys.c
View File

@@ -719,7 +719,7 @@ ULONG hb_fsReadLarge( FHANDLE hFileHandle, BYTE * pBuff, ULONG ulCount )
else
{
uiToRead = ( USHORT ) ulLeftToRead;
ulLeftToRead = 0L;
ulLeftToRead = 0;
}
uiRead = read( hFileHandle, pPtr, uiToRead );
/* -1 on bad hFileHandle
@@ -786,7 +786,7 @@ ULONG hb_fsWriteLarge( FHANDLE hFileHandle, BYTE * pBuff, ULONG ulCount )
else
{
uiToWrite = ( USHORT ) ulLeftToWrite;
ulLeftToWrite = 0L;
ulLeftToWrite = 0;
}
uiWritten = write( hFileHandle, pPtr, uiToWrite );
/* -1 on bad hFileHandle

4
harbour/source/rtl/gtwin/gtwin.c
View File

@@ -1,7 +1,7 @@
/*
* $Id$
*/
/* #define HB_DEBUG_KEYBOARD */
/*
* Harbour Project source code:
* Video subsystem for Win32 compilers
@@ -73,6 +73,8 @@
/* NOTE: User programs should never call this layer directly! */
/* #define HB_DEBUG_KEYBOARD */
#include <stdlib.h>
#include <string.h>
#include <ctype.h>

2
harbour/source/vm/arrays.c
View File

@@ -639,7 +639,7 @@ BOOL hb_arrayRelease( PHB_ITEM pArray )
hb_xfree( pBaseArray->pItems );
}
hb_gcFree( (void *)pBaseArray );
hb_gcFree( ( void * ) pBaseArray );
pArray->type = HB_IT_NIL;
pArray->item.asArray.value = NULL;

4
harbour/source/vm/pvalue.c
View File

@@ -59,8 +59,8 @@ HB_FUNC( HB_PVALUE )
USHORT uiParam = hb_parni( 1 );
PHB_ITEM *pBase = hb_stack.pItems + ( hb_stackBaseItem() )->item.asSymbol.stackbase; /* Skip function + self */
if( uiParam && uiParam <= (*pBase)->item.asSymbol.paramcnt ) /* Valid number */
hb_itemReturn( *(pBase + 1 + uiParam) );
if( uiParam && uiParam <= ( *pBase )->item.asSymbol.paramcnt ) /* Valid number */
hb_itemReturn( *( pBase + 1 + uiParam ) );
else
hb_ret(); /* return NIL */
}

26
harbour/utils/hbtest/hbtest.prg
View File

@@ -368,13 +368,27 @@ FUNCTION TEST_CALL( cBlock, bBlock, xResultExpected )
IF s_lShowAll .OR. lFailed .OR. lSkipped .OR. lPPError
FWrite( s_nFhnd, PadR( iif( lFailed, "!", iif( lSkipped, "S", " " ) ), TEST_RESULT_COL1_WIDTH ) + " " +;
PadR( Str( s_nCount, 4 ) + " " + ProcName( 1 ) + "(" + LTrim( Str( ProcLine( 1 ), 5 ) ) + ")", TEST_RESULT_COL2_WIDTH ) + " " +;
PadR( cBlock, TEST_RESULT_COL3_WIDTH ) + " -> " +;
PadR( XToStr( xResult ), TEST_RESULT_COL4_WIDTH ) + " | " +;
PadR( XToStr( xResultExpected ), TEST_RESULT_COL5_WIDTH ) +;
HB_OSNewLine() )
IF lFailed
FWrite( s_nFhnd, PadR( iif( lFailed, "!", iif( lSkipped, "S", " " ) ), TEST_RESULT_COL1_WIDTH ) + " " +;
PadR( Str( s_nCount, 4 ) + " " + ProcName( 1 ) + "(" + LTrim( Str( ProcLine( 1 ), 5 ) ) + ")", TEST_RESULT_COL2_WIDTH ) + " " +;
PadR( cBlock, TEST_RESULT_COL3_WIDTH ) +;
HB_OSNewLine() +;
Space( 5 ) + " Result: " + XToStr( xResult ) +;
HB_OSNewLine() +;
Space( 5 ) + "Expected: " + XToStr( xResultExpected ) +;
HB_OSNewLine() )
ELSE
FWrite( s_nFhnd, PadR( iif( lFailed, "!", iif( lSkipped, "S", " " ) ), TEST_RESULT_COL1_WIDTH ) + " " +;
PadR( Str( s_nCount, 4 ) + " " + ProcName( 1 ) + "(" + LTrim( Str( ProcLine( 1 ), 5 ) ) + ")", TEST_RESULT_COL2_WIDTH ) + " " +;
PadR( cBlock, TEST_RESULT_COL3_WIDTH ) + " -> " +;
PadR( XToStr( xResult ), TEST_RESULT_COL4_WIDTH ) + " | " +;
PadR( XToStr( xResultExpected ), TEST_RESULT_COL5_WIDTH ) +;
HB_OSNewLine() )
ENDIF
ENDIF
IF lFailed