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

2009-03-27 14:35 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* contrib/hbodbc/odbc.c
    * BYTE -> char
    ! GetDesktopWindow() -> NULL

  * contrib/hbmsql/tmsql.prg
  * contrib/hbqt/tests/demoqt.prg
  * contrib/hbpgsql/postgres.c
    * Formatting.

  * contrib/examples/hbapollo/Makefile
    ! Changed root dir after recent move.
This commit is contained in:
Viktor Szakats
2009-03-27 13:36:27 +00:00
parent 5169794a3d
commit d107d113af
6 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
harbour/ChangeLog
View File

@@ -8,6 +8,19 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-03-27 14:35 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbodbc/odbc.c
* BYTE -> char
! GetDesktopWindow() -> NULL
* contrib/hbmsql/tmsql.prg
* contrib/hbqt/tests/demoqt.prg
* contrib/hbpgsql/postgres.c
* Formatting.
* contrib/examples/hbapollo/Makefile
! Changed root dir after recent move.
2009-03-27 14:02 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/include/hbvm.h
* harbour/source/vm/hvm.c
@@ -46,7 +59,7 @@
* contrib/hbqt/tests/hbqt.hbp
+ Added C++ and runtime MinGW lib.
; TOFIX: I still get:
; TOFIX: I still get: [SOLVED]
harbour/lib/win/mingw/libhbvm.a(fm.o):fm.c:(.text+0x39b): undefined reference to `__mingw_vfprintf'
+ gui=yes

2
harbour/contrib/examples/hbapollo/Makefile
View File

@@ -2,7 +2,7 @@
# $Id$
#
ROOT = ../../
ROOT = ../../../
LIBNAME=hbapollo

8
harbour/contrib/hbmsql/tmsql.prg
View File

@@ -58,7 +58,7 @@
// Every single row of an answer
CLASS TmSQLRow
CREATE CLASS TmSQLRow
DATA aRow // a single row of answer
DATA aDirty // array of booleans set to .T. if corresponding field of aRow has been changed
@@ -167,7 +167,7 @@ return ""
/* ----------------------------------------------------------------------------------------*/
// Every single query submitted to mSQL server
CLASS TmSQLQuery
CREATE CLASS TmSQLQuery
DATA nSocket // connection handle to mSQL server
DATA nResultHandle // result handle received from mSQL
@@ -352,7 +352,7 @@ return msqlGetErr()
// A Table is a query without joins; this way I can Insert() e Delete() rows.
// NOTE: it's always a SELECT result, so it will contain a full table only if
// SELECT * FROM ... was issued
CLASS TmSQLTable FROM TmSQLQuery
CREATE CLASS TmSQLTable FROM TmSQLQuery
DATA cTable // name of table
@@ -587,7 +587,7 @@ return TmSQLRow():New(aRow, ::aFieldStruct, ::cTable, .F.)
/* ----------------------------------------------------------------------------------------*/
// Every available mSQL server
CLASS TmSQLServer
CREATE CLASS TmSQLServer
DATA nSocket // connection handle to server
DATA cServer // server name

12
harbour/contrib/hbodbc/odbc.c
View File

@@ -131,7 +131,7 @@ HB_FUNC( SQLDRIVERCONNECT ) /* hDbc, @cConnectString --> nRetCode */
SQLTCHAR buffer[ 1024 ];
buffer[ 0 ] = '\0';
ret = SQLDriverConnect( ( SQLHDBC ) hb_parptr( 1 ),
( SQLHWND ) GetDesktopWindow(),
( SQLHWND ) NULL,
( SQLTCHAR * ) lpStr,
( SQLSMALLINT ) hb_parclen( 2 ),
( SQLTCHAR * ) buffer,
@@ -149,7 +149,7 @@ HB_FUNC( SQLDRIVERCONNECT ) /* hDbc, @cConnectString --> nRetCode */
SQLTCHAR buffer[ 1024 ];
buffer[ 0 ] = '\0';
ret = SQLDriverConnect( ( SQLHDBC ) hb_parptr( 1 ),
( SQLHWND ) GetDesktopWindow(),
( SQLHWND ) NULL,
( SQLTCHAR * ) hb_parcx( 2 ),
( SQLSMALLINT ) hb_parclen( 2 ),
( SQLTCHAR * ) buffer,
@@ -492,7 +492,7 @@ HB_FUNC( SQLROWCOUNT )
HB_FUNC( SQLGETINFO ) /* hDbc, nType, @cResult */
{
BYTE bBuffer[ 512 ];
char bBuffer[ 512 ];
SQLSMALLINT wLen;
SQLRETURN result = SQLGetInfo( ( SQLHDBC ) hb_parptr( 1 ),
( SQLUSMALLINT ) hb_parnl( 2 ),
@@ -545,7 +545,7 @@ HB_FUNC( SQLGETCONNECTATTR ) /* hDbc, nOption, @cOption */
hb_storclen( result == SQL_SUCCESS ? ( char * ) buffer : NULL, len, 3 );
hb_retni( result );
#else
BYTE bBuffer[ 512 ];
char bBuffer[ 512 ];
SQLRETURN result = SQLGetConnectOption( ( SQLHDBC ) hb_parptr( 1 ),
( SQLSMALLINT ) hb_parni( 2 ),
( SQLPOINTER ) bBuffer );
@@ -569,7 +569,7 @@ HB_FUNC( SQLGETSTMTATTR ) /* hStmt, nOption, @cOption */
hb_storclen( result == SQL_SUCCESS ? ( char * ) buffer : NULL, len, 3 );
hb_retni( result );
#else
BYTE bBuffer[ 512 ];
char bBuffer[ 512 ];
SQLRETURN result = SQLGetStmtOption( ( SQLHSTMT ) hb_parptr( 1 ),
( SQLSMALLINT ) hb_parni( 2 ),
( SQLPOINTER ) bBuffer );
@@ -634,7 +634,7 @@ HB_FUNC( SQLEXECUTESCALAR )
result = SQLFetch( ( SQLHSTMT ) hStmt );
if( result != SQL_NO_DATA )
{
BYTE bBuffer[ 256 ];
char bBuffer[ 256 ];
SQLLEN lLen;
result = SQLGetData( ( SQLHSTMT ) hStmt,
( SQLUSMALLINT ) 1,

2
harbour/contrib/hbpgsql/postgres.c
View File

@@ -526,7 +526,7 @@ HB_FUNC( PQSTATUS )
HB_FUNC( PQRESULTERRORMESSAGE )
{
if( hb_parinfo( 1 ) )
hb_retc( PQresultErrorMessage( ( PGresult * ) hb_parptr( 1 ) ) );
hb_retc( PQresultErrorMessage( ( PGresult * ) hb_parptr( 1 ) ) );
}
HB_FUNC( PQRESULTSTATUS )

5
harbour/contrib/hbqt/tests/demoqt.prg
View File

@@ -52,7 +52,7 @@
*/
/*----------------------------------------------------------------------*/
Procedure Main ()
Procedure Main()
Local oApplication, oMainWindow
@@ -62,9 +62,8 @@ Procedure Main ()
Qt_QWidget_SetWindowTitle( oMainWindow, "Testing Harbour-QT Implementation" )
Qt_QWidget_Resize( oMainWindow, 640, 480)
Qt_QWidget_Show( oMainWindow )
Qt_QWidget_Show( oMainWindow )
Qt_QApplication_exec()
Return