From 41f05c984e94ed7fe4eb676fa275171294f666c6 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 27 Mar 2010 12:27:08 +0000 Subject: [PATCH] 2010-03-27 13:24 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbmisc/Makefile * contrib/hbmisc/blinker.prg + contrib/hbmisc/blinker.ch ! Fixed BLICPUREL(). + Added blinker.ch header. This contains some stuff missing from original Blinker and some runtime mockup/emulation for following linker commands: BLINKER EXECUTABLE SERIAL <"String"> /* Harbour needs double quotes around the string */ BLINKER DEMONSTRATION DATE BLINKER DEMONSTRATION MINUTES * src/rtl/tgetlist.prg * Minor formatting. --- harbour/ChangeLog | 15 ++++++ harbour/contrib/hbmisc/Makefile | 4 ++ harbour/contrib/hbmisc/blinker.ch | 86 ++++++++++++++++++++++++++++++ harbour/contrib/hbmisc/blinker.prg | 28 +--------- harbour/src/rtl/tgetlist.prg | 2 +- 5 files changed, 108 insertions(+), 27 deletions(-) create mode 100644 harbour/contrib/hbmisc/blinker.ch diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2ffb8dde5e..72a74b5a5b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,21 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-03-27 13:24 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbmisc/Makefile + * contrib/hbmisc/blinker.prg + + contrib/hbmisc/blinker.ch + ! Fixed BLICPUREL(). + + Added blinker.ch header. This contains some stuff missing + from original Blinker and some runtime mockup/emulation for + following linker commands: + BLINKER EXECUTABLE SERIAL <"String"> /* Harbour needs double quotes around the string */ + BLINKER DEMONSTRATION DATE + BLINKER DEMONSTRATION MINUTES + + * src/rtl/tgetlist.prg + * Minor formatting. + 2010-03-26 22:00 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbmisc/Makefile + contrib/hbmisc/blinker.prg diff --git a/harbour/contrib/hbmisc/Makefile b/harbour/contrib/hbmisc/Makefile index 4554a558ac..20409c7b36 100644 --- a/harbour/contrib/hbmisc/Makefile +++ b/harbour/contrib/hbmisc/Makefile @@ -26,4 +26,8 @@ PRG_SOURCES := \ stringp.prg \ twirler.prg \ +PRG_HEADERS := \ + blinker.ch \ + +include $(TOP)$(ROOT)config/header.mk include $(TOP)$(ROOT)config/lib.mk diff --git a/harbour/contrib/hbmisc/blinker.ch b/harbour/contrib/hbmisc/blinker.ch new file mode 100644 index 0000000000..3373d4ed8f --- /dev/null +++ b/harbour/contrib/hbmisc/blinker.ch @@ -0,0 +1,86 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * Blinker compatibility functions. + * + * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ + +#ifndef BLINKER_CH_ +#define BLINKER_CH_ + +#xtranslate BLINKER EXECUTABLE SERIAL => INIT PROCEDURE _init_hb_blivernum() ; HB_BLIVERNUM( ) ; RETURN +#xtranslate BLINKER DEMONSTRATION DATE => INIT PROCEDURE _init_hb_blidemdte() ; HB_BLIDEMDTE( hb_SToD( ) ) ; RETURN +#xtranslate BLINKER DEMONSTRATION MINUTES => INIT PROCEDURE _init_hb_blidemmin() ; HB_BLIDEMMIN( ) ; RETURN + +/* BLIMGRSTS() parameters */ +#define BliCacheLoc 1 /* Get location of real mode overlay cache (EMS/XMS) */ +#define BliCacheSize 2 /* Get size of overlay cache */ +#define BliExtMemAvail 3 /* Get bytes extended memory available to the extender */ +#define BliHostMode 4 /* Get DOS extender host mode (DPMI/VCPI/XMS) */ +#define BliMachineMode 5 /* Get current machine mode (real, protected) */ +#define BliOverlayLoc 6 /* Get location of overlay area */ +#define BliOverlaySize 7 /* Get size of overlay area */ +#define BliRealMemAvail 8 /* Get bytes real memory available to the extender */ +#define BliVirMemAvail 9 /* Get bytes virtual memory available to the extender */ + +/* BLIMGRSTS() BliCacheLoc values */ +#define BliCacheNone 0 /* No overlay cache */ +#define BliCacheEMS 1 /* Overlay cache is in EMS */ +#define BliCacheXMS 2 /* Overlay cache is in XMS */ + +/* BLIMGRSTS() BliHostMode values */ +#define BliHostNone 0 +#define BliHostDPMI 1 +#define BliHostVCPI 2 +#define BliHostXMS 3 + +/* BLIMGRSTS() BliMachineMode values */ +#define BliModeReal 0 +#define BliMode286Prot 1 + +#endif /* BLINKER_CH_ */ diff --git a/harbour/contrib/hbmisc/blinker.prg b/harbour/contrib/hbmisc/blinker.prg index bec59b432f..a36c2ec6dd 100644 --- a/harbour/contrib/hbmisc/blinker.prg +++ b/harbour/contrib/hbmisc/blinker.prg @@ -55,31 +55,7 @@ #include "hbhrb.ch" #include "hbmemory.ch" -/* BLIMGRSTS() parameters */ -#define BliCacheLoc 1 /* Get location of real mode overlay cache (EMS/XMS) */ -#define BliCacheSize 2 /* Get size of overlay cache */ -#define BliExtMemAvail 3 /* Get bytes extended memory available to the extender */ -#define BliHostMode 4 /* Get DOS extender host mode (DPMI/VCPI/XMS) */ -#define BliMachineMode 5 /* Get current machine mode (real, protected) */ -#define BliOverlayLoc 6 /* Get location of overlay area */ -#define BliOverlaySize 7 /* Get size of overlay area */ -#define BliRealMemAvail 8 /* Get bytes real memory available to the extender */ -#define BliVirMemAvail 9 /* Get bytes virtual memory available to the extender */ - -/* BLIMGRSTS() BliCacheLoc values */ -#define BliCacheNone 0 /* No overlay cache */ -#define BliCacheEMS 1 /* Overlay cache is in EMS */ -#define BliCacheXMS 2 /* Overlay cache is in XMS */ - -/* BLIMGRSTS() BliHostMode values */ -#define BliHostNone 0 -#define BliHostDPMI 1 -#define BliHostVCPI 2 -#define BliHostXMS 3 - -/* BLIMGRSTS() BliMachineMode values */ -#define BliModeReal 0 -#define BliMode286Prot 1 +#include "blinker.ch" STATIC s_cSerialNum := "" STATIC s_cDemoDate := "" @@ -233,7 +209,7 @@ FUNCTION BLIVERNUM() RETURN 700 FUNCTION BLICPUREL() - RETURN hb_idleRelease() + RETURN hb_releaseCPU() FUNCTION BLIMGRSTS( nParam ) SWITCH nParam diff --git a/harbour/src/rtl/tgetlist.prg b/harbour/src/rtl/tgetlist.prg index bbdcbf714b..1d94317f59 100644 --- a/harbour/src/rtl/tgetlist.prg +++ b/harbour/src/rtl/tgetlist.prg @@ -991,7 +991,7 @@ METHOD GUIApplyKey( oGet, oGUI, nKey, oMenu, aMsg ) CLASS HBGetList nKey := 0 ENDIF - ELSEIF ( nButton := oGUI:FindText( chr(nKey), oGUI:Value + 1, .F., .F. ) ) != 0 + ELSEIF ( nButton := oGUI:FindText( Chr( nKey ), oGUI:Value + 1, .F., .F. ) ) != 0 oGUI:Select( nButton ) ENDIF