diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3e569aa535..20ca2c4bc7 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,21 @@ past entries belonging to these authors: Viktor Szakats. */ +2009-05-08 14:53 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * source/rtl/tget.prg + * source/rtl/tclass.prg + * hb_SToT( "" ) -> hb_SToT(). + + * contrib/hbodbc/odbc.c + + Added copyright, after extensive cleanup/fixing work. + * ISCHAR() protected hb_parcx() calls changed to hb_parc(). + + * contrib/hbole/tests/testole.prg + * Checking for object creation in ADO example. + + * contrib/rddado/adordd.prg + * Minor formatting. + 2009-05-08 14:35 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/vm/Makefile * respect HB_HVM_ALL user settings diff --git a/harbour/contrib/hbodbc/odbc.c b/harbour/contrib/hbodbc/odbc.c index f52f8d89a4..5de976554f 100644 --- a/harbour/contrib/hbodbc/odbc.c +++ b/harbour/contrib/hbodbc/odbc.c @@ -6,6 +6,7 @@ * Harbour Project source code * This file contains source for first ODBC routines. * + * Copyright 2009 Viktor Szakats * Copyright 1999 Antonio Linares * www - http://www.harbour-project.org * @@ -509,12 +510,12 @@ HB_FUNC( SQLSETCONNECTATTR ) /* hDbc, nOption, uOption */ #if ODBCVER >= 0x0300 hb_retni( SQLSetConnectAttr( ( SQLHDBC ) hb_parptr( 1 ), ( SQLINTEGER ) hb_parnl( 2 ), - ISCHAR( 3 ) ? ( SQLPOINTER ) hb_parcx( 3 ) : ( SQLPOINTER ) ( HB_PTRUINT ) hb_parnint( 3 ), + ISCHAR( 3 ) ? ( SQLPOINTER ) hb_parc( 3 ) : ( SQLPOINTER ) ( HB_PTRUINT ) hb_parnint( 3 ), ISCHAR( 3 ) ? ( SQLINTEGER ) hb_parclen( 3 ) : ( SQLINTEGER ) SQL_IS_INTEGER ) ); #else hb_retni( SQLSetConnectOption( ( SQLHDBC ) hb_parptr( 1 ), ( SQLUSMALLINT ) hb_parnl( 2 ), - ( SQLULEN ) ISCHAR( 3 ) ? ( SQLULEN ) hb_parcx( 3 ) : hb_parnl( 3 ) ) ); + ( SQLULEN ) ISCHAR( 3 ) ? ( SQLULEN ) hb_parc( 3 ) : hb_parnl( 3 ) ) ); #endif } @@ -523,12 +524,12 @@ HB_FUNC( SQLSETSTMTATTR ) /* hStmt, nOption, uOption --> nRetCode */ #if ODBCVER >= 0x0300 hb_retni( SQLSetStmtAttr( ( SQLHSTMT ) hb_parptr( 1 ), ( SQLINTEGER ) hb_parnl( 2 ), - ISCHAR( 3 ) ? ( SQLPOINTER ) hb_parcx( 3 ) : ( SQLPOINTER ) ( HB_PTRUINT ) hb_parnint( 3 ), + ISCHAR( 3 ) ? ( SQLPOINTER ) hb_parc( 3 ) : ( SQLPOINTER ) ( HB_PTRUINT ) hb_parnint( 3 ), ISCHAR( 3 ) ? ( SQLINTEGER ) hb_parclen( 3 ) : ( SQLINTEGER ) SQL_IS_INTEGER ) ); #else hb_retni( SQLSetStmtOption( ( SQLHSTMT ) hb_parptr( 1 ), ( SQLUSMALLINT ) hb_parnl( 2 ), - ( SQLULEN ) ISCHAR( 3 ) ? ( SQLULEN ) hb_parcx( 3 ) : hb_parnl( 3 ) ) ); + ( SQLULEN ) ISCHAR( 3 ) ? ( SQLULEN ) hb_parc( 3 ) : hb_parnl( 3 ) ) ); #endif } diff --git a/harbour/contrib/hbole/tests/testole.prg b/harbour/contrib/hbole/tests/testole.prg index ee3151346b..66b0536391 100644 --- a/harbour/contrib/hbole/tests/testole.prg +++ b/harbour/contrib/hbole/tests/testole.prg @@ -409,18 +409,21 @@ STATIC PROCEDURE Exm_CDO() STATIC PROCEDURE Exm_ADODB() - LOCAL oRs := CreateObject( "ADODB.Recordset" ) + LOCAL oRs - oRs:Open( "SELECT * FROM test ORDER BY First", ; - "Provider=Microsoft.Jet.OLEDB.4.0;Data Source=" + hb_DirBase() + "\..\..\hbodbc\tests\test.mdb",; - adOpenForwardOnly,; - adLockReadOnly ) + IF ( oRs := CreateObject( "ADODB.Recordset" ) ) != NIL - DO WHILE ! oRs:EOF - ? oRs:Fields( "First" ):Value - oRs:MoveNext() - ENDDO + oRs:Open( "SELECT * FROM test ORDER BY First", ; + "Provider=Microsoft.Jet.OLEDB.4.0;Data Source=" + hb_DirBase() + "\..\..\hbodbc\tests\test.mdb",; + adOpenForwardOnly,; + adLockReadOnly ) - oRs:Close() + DO WHILE ! oRs:EOF + ? oRs:Fields( "First" ):Value + oRs:MoveNext() + ENDDO + + oRs:Close() + ENDIF RETURN diff --git a/harbour/contrib/rddado/adordd.prg b/harbour/contrib/rddado/adordd.prg index 047fea091a..6526151db2 100644 --- a/harbour/contrib/rddado/adordd.prg +++ b/harbour/contrib/rddado/adordd.prg @@ -240,9 +240,9 @@ STATIC FUNCTION ADO_CREATE( nWA, aOpenInfo ) oError:CanDefault := .T. FOR n := 0 To oConnection:Errors:Count - 1 - oError:Description += oConnection:Errors(n):Description + oError:Description += oConnection:Errors(n):Description #ifdef __XHARBOUR__ - __OutDebug( oConnection:Errors(n):Description ) + __OutDebug( oConnection:Errors(n):Description ) #endif NEXT diff --git a/harbour/source/rtl/tclass.prg b/harbour/source/rtl/tclass.prg index 85cbb98057..67d66fc492 100644 --- a/harbour/source/rtl/tclass.prg +++ b/harbour/source/rtl/tclass.prg @@ -317,7 +317,7 @@ STATIC PROCEDURE AddData( cData, xInit, cType, nScope, lNoinit ) xInit := hb_SToD() EXIT CASE "T" /* Timestamp */ - xInit := hb_SToT( "" ) + xInit := hb_SToT() EXIT ENDSWITCH ENDIF @@ -359,7 +359,7 @@ STATIC PROCEDURE AddClassData( cData, xInit, cType, nScope, lNoInit ) xInit := hb_SToD() EXIT CASE "T" /* Timestamp */ - xInit := hb_SToT( "" ) + xInit := hb_SToT() EXIT ENDSWITCH ENDIF diff --git a/harbour/source/rtl/tget.prg b/harbour/source/rtl/tget.prg index e9f6822cfa..b6d1274c7e 100644 --- a/harbour/source/rtl/tget.prg +++ b/harbour/source/rtl/tget.prg @@ -1476,7 +1476,7 @@ METHOD badDate() CLASS GET RETURN ( xValue := ::unTransform() ) == hb_SToD() .AND. ; !( ::cBuffer == Transform( xValue, ::cPicture ) ) CASE "T" - RETURN ( xValue := ::unTransform() ) == hb_SToT( "" ) .AND. ; + RETURN ( xValue := ::unTransform() ) == hb_SToT() .AND. ; !( ::cBuffer == Transform( xValue, ::cPicture ) ) ENDSWITCH ENDIF @@ -1692,7 +1692,7 @@ METHOD DeleteAll() CLASS GET CASE ::cType == "D" xValue := hb_SToD() CASE ::cType == "T" - xValue := hb_SToT( "" ) + xValue := hb_SToT() CASE ::cType == "L" xValue := .F. ENDCASE