From f421b674e691c899bcd63446e18bffa8720b75c9 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 6 Dec 2009 11:40:52 +0000 Subject: [PATCH] 2009-12-06 12:39 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/Makefile * contrib/hbwin/win_reg.prg * contrib/hbwin/win_os.prg * contrib/hbwin/win_tprn.prg * contrib/hbwin/hbwin.ch * contrib/hbwin/win_tcom.prg * contrib/hbwin/win_com.c * contrib/hbwin/win_regc.c * contrib/hbwin/win_prn1.c * contrib/hbwin/win_osc.c * contrib/hbwin/win_dll.c * contrib/hbide/ideparseexpr.c * Formatting. --- harbour/ChangeLog | 15 ++++++++++++++ harbour/contrib/Makefile | 4 ++-- harbour/contrib/hbide/ideparseexpr.c | 2 +- harbour/contrib/hbwin/hbwin.ch | 3 +-- harbour/contrib/hbwin/win_com.c | 2 +- harbour/contrib/hbwin/win_dll.c | 10 +++++----- harbour/contrib/hbwin/win_os.prg | 30 +++++++++++++--------------- harbour/contrib/hbwin/win_osc.c | 15 +++++++------- harbour/contrib/hbwin/win_prn1.c | 15 ++++++-------- harbour/contrib/hbwin/win_reg.prg | 16 +++++++-------- harbour/contrib/hbwin/win_regc.c | 14 ++++++------- harbour/contrib/hbwin/win_tcom.prg | 2 +- harbour/contrib/hbwin/win_tprn.prg | 16 +++++++-------- 13 files changed, 75 insertions(+), 69 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6f08da25e7..652c8559c6 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,21 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-12-06 12:39 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/Makefile + * contrib/hbwin/win_reg.prg + * contrib/hbwin/win_os.prg + * contrib/hbwin/win_tprn.prg + * contrib/hbwin/hbwin.ch + * contrib/hbwin/win_tcom.prg + * contrib/hbwin/win_com.c + * contrib/hbwin/win_regc.c + * contrib/hbwin/win_prn1.c + * contrib/hbwin/win_osc.c + * contrib/hbwin/win_dll.c + * contrib/hbide/ideparseexpr.c + * Formatting. + 2009-12-06 04:10 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbide/ideparseexpr.c ! Fixed to use hb_strncpy() instead of strncpy(). diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile index c4f4c20b7c..2168617280 100644 --- a/harbour/contrib/Makefile +++ b/harbour/contrib/Makefile @@ -63,7 +63,7 @@ endif DIRS += $(HB_CONTRIB_ADDONS) ifneq ($(DIRS),) -include $(TOP)$(ROOT)config/dir.mk + include $(TOP)$(ROOT)config/dir.mk else -include $(TOP)$(ROOT)config/none.mk + include $(TOP)$(ROOT)config/none.mk endif diff --git a/harbour/contrib/hbide/ideparseexpr.c b/harbour/contrib/hbide/ideparseexpr.c index 7a83aacdc4..91aef6f0cd 100644 --- a/harbour/contrib/hbide/ideparseexpr.c +++ b/harbour/contrib/hbide/ideparseexpr.c @@ -202,7 +202,7 @@ static int ide_getword( const char * pszText, HB_BOOL bHonorSpacing, char * pszW ch = pszText[ npos ]; } - if( !bHonorSpacing ) + if( ! bHonorSpacing ) { pszWord[ 0 ] = ' '; /* reduce spaces to 1 */ wordlen = 1; diff --git a/harbour/contrib/hbwin/hbwin.ch b/harbour/contrib/hbwin/hbwin.ch index 242d1bb846..b1fe7af818 100644 --- a/harbour/contrib/hbwin/hbwin.ch +++ b/harbour/contrib/hbwin/hbwin.ch @@ -7,8 +7,7 @@ * hbwin header * * Copyright 2008 Viktor Szakats (harbour.01 syenar.hu) - * Copyright 2004 Peter Rees - * Rees Software & Systems Ltd + * Copyright 2004 Peter Rees Rees Software & Systems Ltd * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify diff --git a/harbour/contrib/hbwin/win_com.c b/harbour/contrib/hbwin/win_com.c index cfb72d02e4..5b500b75e5 100644 --- a/harbour/contrib/hbwin/win_com.c +++ b/harbour/contrib/hbwin/win_com.c @@ -41,7 +41,7 @@ * 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 o such modified files, you must delete + * 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 diff --git a/harbour/contrib/hbwin/win_dll.c b/harbour/contrib/hbwin/win_dll.c index 4312fb3330..c9432db32c 100644 --- a/harbour/contrib/hbwin/win_dll.c +++ b/harbour/contrib/hbwin/win_dll.c @@ -16,18 +16,18 @@ * * 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 ) + * 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 + * 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 + * 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/ ). + * 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. @@ -45,7 +45,7 @@ * 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 + * 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. * diff --git a/harbour/contrib/hbwin/win_os.prg b/harbour/contrib/hbwin/win_os.prg index 829a4049c0..ad83ac1909 100644 --- a/harbour/contrib/hbwin/win_os.prg +++ b/harbour/contrib/hbwin/win_os.prg @@ -5,25 +5,23 @@ /* * Harbour Project source code: * - * Copyright 2004 Peter Rees - * Rees Software & Systems Ltd - * + * Copyright 2004 Peter Rees Rees Software & Systems Ltd * 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 ) + * 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 + * 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 + * 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/ ). + * 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. @@ -41,15 +39,15 @@ * 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 + * 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. - -*/ + * + */ /* * Operating system functions for Windows @@ -107,7 +105,7 @@ FUNCTION WIN_OSNETREGOK( lSetIt, lDoVista ) bRetVal := bRetVal .AND. win_regQuery( HKEY_LOCAL_MACHINE, cKeyWks, "UtilizeNtCaching", 0, lSetIt ) bRetVal := bRetVal .AND. win_regQuery( HKEY_LOCAL_MACHINE, cKeyWks, "UseLockReadUnlock", 0, lSetIt ) - IF win_osis2000OrUpper() + IF win_osIs2000OrUpper() bRetVal := bRetVal .AND. win_regQuery( HKEY_LOCAL_MACHINE, "System\CurrentControlSet\Services\MRXSmb\Parameters", "OpLocksDisabled", 1, lSetIt ) ENDIF ENDIF @@ -115,16 +113,16 @@ FUNCTION WIN_OSNETREGOK( lSetIt, lDoVista ) RETURN bRetVal FUNCTION WIN_OSNETVREDIROK( /* @ */ nResult ) - LOCAL a + LOCAL aFiles nResult := 0 IF win_osIs9X() - a := Directory( hb_GetEnv( "WINDIR", "C:\WINDOWS" ) + "\SYSTEM\VREDIR.VXD" ) /* Check for faulty files. */ - IF ! Empty( a ) - IF a[ 1, F_SIZE ] == 156749 .AND. a[ 1, F_TIME ] == "11:11:10" + aFiles := Directory( hb_GetEnv( "WINDIR", "C:\WINDOWS" ) + "\SYSTEM\VREDIR.VXD" ) /* Check for faulty files. */ + IF ! Empty( aFiles ) + IF aFiles[ 1 ][ F_SIZE ] == 156749 .AND. aFiles[ 1 ][ F_TIME ] == "11:11:10" nResult := 1111 - ELSEIF a[ 1, F_SIZE ] == 140343 .AND. a[ 1, F_TIME ] == "09:50:00" + ELSEIF aFiles[ 1 ][ F_SIZE ] == 140343 .AND. aFiles[ 1 ][ F_TIME ] == "09:50:00" nResult := 950 ENDIF ENDIF diff --git a/harbour/contrib/hbwin/win_osc.c b/harbour/contrib/hbwin/win_osc.c index cd3382d131..f6467cc5a1 100644 --- a/harbour/contrib/hbwin/win_osc.c +++ b/harbour/contrib/hbwin/win_osc.c @@ -4,26 +4,25 @@ /* * Harbour Project source code: + * Windows OS version information * - * Copyright 2004 Peter Rees - * Rees Software & Systems Ltd - * + * Copyright 2004 Peter Rees Rees Software & Systems Ltd * 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 ) + * 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 + * 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 + * 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/ ). + * 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. @@ -41,7 +40,7 @@ * 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 + * 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. * diff --git a/harbour/contrib/hbwin/win_prn1.c b/harbour/contrib/hbwin/win_prn1.c index 2f445e4af7..92ab175a88 100644 --- a/harbour/contrib/hbwin/win_prn1.c +++ b/harbour/contrib/hbwin/win_prn1.c @@ -5,27 +5,24 @@ /* * Harbour Project source code: * Printing subsystem for Windows using GUI printing - * Copyright 2004 Peter Rees - * Rees Software & Systems Ltd - * - * See COPYING for licensing terms. * + * Copyright 2004 Peter Rees Rees Software & Systems Ltd * 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 ) + * 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 + * 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 + * 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/ ). + * 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. @@ -43,7 +40,7 @@ * 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 + * 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. * diff --git a/harbour/contrib/hbwin/win_reg.prg b/harbour/contrib/hbwin/win_reg.prg index 06db737625..c3adf7fda9 100644 --- a/harbour/contrib/hbwin/win_reg.prg +++ b/harbour/contrib/hbwin/win_reg.prg @@ -7,24 +7,23 @@ * Windows registry API * * Copyright 2008-2009 Viktor Szakats (harbour.01 syenar.hu) - * Copyright 2004 Peter Rees - * Rees Software & Systems Ltd + * Copyright 2004 Peter Rees Rees Software & Systems Ltd * 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 ) + * 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 + * 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 + * 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/ ). + * 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. @@ -42,14 +41,15 @@ * 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 + * 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. -*/ + * + */ #include "common.ch" #include "hbwin.ch" diff --git a/harbour/contrib/hbwin/win_regc.c b/harbour/contrib/hbwin/win_regc.c index 5b6f1c15c9..92d013b099 100644 --- a/harbour/contrib/hbwin/win_regc.c +++ b/harbour/contrib/hbwin/win_regc.c @@ -6,25 +6,23 @@ * Harbour Project source code: * * Copyright 2008-2009 Viktor Szakats (harbour.01 syenar.hu) - * Copyright 2004 Peter Rees - * Rees Software & Systems Ltd - * + * Copyright 2004 Peter Rees Rees Software & Systems Ltd * 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 ) + * 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 + * 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 + * 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/ ). + * 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. @@ -42,7 +40,7 @@ * 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 + * 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. * diff --git a/harbour/contrib/hbwin/win_tcom.prg b/harbour/contrib/hbwin/win_tcom.prg index 39ec01add7..95a03465be 100644 --- a/harbour/contrib/hbwin/win_tcom.prg +++ b/harbour/contrib/hbwin/win_tcom.prg @@ -41,7 +41,7 @@ * 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 o such modified files, you must delete + * 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 diff --git a/harbour/contrib/hbwin/win_tprn.prg b/harbour/contrib/hbwin/win_tprn.prg index d1d1fe96bd..7e9857a4b0 100644 --- a/harbour/contrib/hbwin/win_tprn.prg +++ b/harbour/contrib/hbwin/win_tprn.prg @@ -6,24 +6,23 @@ * Harbour Project source code: * Printing subsystem for Windows using GUI printing * - * Copyright 2004 Peter Rees - * Rees Software & Systems Ltd + * Copyright 2004 Peter Rees Rees Software & Systems Ltd * 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 ) + * 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 + * 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 + * 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/ ). + * 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. @@ -41,14 +40,15 @@ * 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 + * 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. -*/ + * + */ /* TPRINT() was designed to make it easy to emulate Clipper Dot Matrix printing.