From a08a97ffdcb0ea039dba775cfb61688d22eb8c42 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 16 Oct 1999 12:37:17 +0000 Subject: [PATCH] 19991016-14:25 GMT+1 --- harbour/ChangeLog | 7 +++++++ harbour/source/rtl/gt/gtwin.c | 10 +++++----- harbour/source/rtl/inkey.c | 6 +++--- harbour/tests/Makefile | 1 + 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 529a46c14c..bda34f4016 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,10 @@ +19991016-14:25 GMT+1 Victor Szel + * source/rtl/gt/gtwin.c + source/rtl/inkey.c + * Renamed variable name HInput to hb_gtHInput + * tests/Makefile + + testbrdb.prg added + 19991016-10:06 GMT+1 Victor Szel * source/rtl/Makefile + browse.prg added diff --git a/harbour/source/rtl/gt/gtwin.c b/harbour/source/rtl/gt/gtwin.c index e7b66c2187..dba02ffe05 100644 --- a/harbour/source/rtl/gt/gtwin.c +++ b/harbour/source/rtl/gt/gtwin.c @@ -77,7 +77,7 @@ static HANDLE HOsave; /* static HANDLE HSsave; */ static HANDLE HDOutput = INVALID_HANDLE_VALUE; /* static HANDLE HDStealth = INVALID_HANDLE_VALUE; */ -HANDLE HInput = INVALID_HANDLE_VALUE; +HANDLE hb_gtHInput = INVALID_HANDLE_VALUE; static HANDLE HOutput = INVALID_HANDLE_VALUE; static HANDLE HStealth = INVALID_HANDLE_VALUE; /* DispBegin buffer */ static HANDLE HOriginal; /* used to restore before quit */ @@ -109,8 +109,8 @@ do void hb_gt_Init( void ) { LOG( "Initializing" ); - HInput = GetStdHandle( STD_INPUT_HANDLE ); - SetConsoleMode( HInput, 0 ); + hb_gtHInput = GetStdHandle( STD_INPUT_HANDLE ); + SetConsoleMode( hb_gtHInput, 0 ); /* ptucker */ HOriginal = HOutput = HCursor = CreateFile( "CONOUT$", /* filename */ GENERIC_READ | GENERIC_WRITE, /* Access flag */ @@ -135,8 +135,8 @@ void hb_gt_Done( void ) } /* NOTE: There's no need to close these explicitly, moreover if we close them functions using stdout will not show anything. - CloseHandle( HInput ); - HInput = INVALID_HANDLE_VALUE; + CloseHandle( hb_gtHInput ); + hb_gtHInput = INVALID_HANDLE_VALUE; CloseHandle( HOutput ); HOutput = INVALID_HANDLE_VALUE; */ diff --git a/harbour/source/rtl/inkey.c b/harbour/source/rtl/inkey.c index 9705370866..042ef0fa25 100644 --- a/harbour/source/rtl/inkey.c +++ b/harbour/source/rtl/inkey.c @@ -86,7 +86,7 @@ #define WIN32_LEAN_AND_MEAN #include #define INPUT_BUFFER_LEN 128 - extern HANDLE HInput; /* This variable is located in source/rtl/gt/gtwin.c */ + extern HANDLE hb_gtHInput; /* This variable is located in source/rtl/gt/gtwin.c */ DWORD cNumRead = 0; /* Ok to use DWORD here, because this is specific... */ DWORD cNumIndex = 0; /* ...to the Windows API, which defines DWORD, etc. */ INPUT_RECORD irInBuf[INPUT_BUFFER_LEN]; @@ -296,12 +296,12 @@ void hb_inkeyPoll( void ) /* Poll the console keyboard to stuff the Harbour { /* Check for keyboard input */ cNumRead = 0; - GetNumberOfConsoleInputEvents( HInput, &cNumRead ); + GetNumberOfConsoleInputEvents( hb_gtHInput, &cNumRead ); if( cNumRead ) { /* Read keyboard input */ ReadConsoleInput( - HInput, /* input buffer handle */ + hb_gtHInput, /* input buffer handle */ irInBuf, /* buffer to read into */ INPUT_BUFFER_LEN, /* size of read buffer */ &cNumRead); /* number of records read */ diff --git a/harbour/tests/Makefile b/harbour/tests/Makefile index e17ad215c1..89496ecb27 100644 --- a/harbour/tests/Makefile +++ b/harbour/tests/Makefile @@ -131,6 +131,7 @@ PRG_SOURCES=\ t1.prg \ test.prg \ test_all.prg \ + testbrdb.prg \ testbrw.prg \ testcgi.prg \ testdbf.prg \