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

2009-02-12 10:57 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* include/hbsetup.h
  * include/hbapi.h
  * source/common/hbprintf.c
  * source/common/hbstr.c
    + Temporarily enabled local hb_snprintf() implementation.
    ; Please test. If it's okay, we can enable it permanently.

  * contrib/rddsql/sddmy/make_b32.bat
  * contrib/rddsql/sddmy/make_vc.bat
  * contrib/rddsql/sddpg/make_b32.bat
  * contrib/rddsql/sddpg/make_vc.bat
  * contrib/rddsql/sddfb/make_b32.bat
  * contrib/rddsql/sddfb/make_vc.bat
    ! Fixed typos for VC flavours.
    % Removed unnecessary INCLUDE path.

  * source/vm/maindllp.c
    ! Updated dll name for Borland and MSVC.

  * source/lang/msguawin.c
  * source/lang/msgua866.c
  * source/lang/msguakoi.c
    ! Fixed corrupted equal char in code.
    ! Fixed date format.
    ! Fixed CP IDs and descriptions in UA866 and UAKOI.
    ! Restored 'CA-Cl*pper' in comment.
    ; Please verify me.
This commit is contained in:
Viktor Szakats
2009-02-12 10:03:45 +00:00
parent b48e515893
commit bc6e1a9b3e
15 changed files with 73 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
harbour/ChangeLog
View File

@@ -8,6 +8,35 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-02-12 10:57 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* include/hbsetup.h
* include/hbapi.h
* source/common/hbprintf.c
* source/common/hbstr.c
+ Temporarily enabled local hb_snprintf() implementation.
; Please test. If it's okay, we can enable it permanently.
* contrib/rddsql/sddmy/make_b32.bat
* contrib/rddsql/sddmy/make_vc.bat
* contrib/rddsql/sddpg/make_b32.bat
* contrib/rddsql/sddpg/make_vc.bat
* contrib/rddsql/sddfb/make_b32.bat
* contrib/rddsql/sddfb/make_vc.bat
! Fixed typos for VC flavours.
% Removed unnecessary INCLUDE path.
* source/vm/maindllp.c
! Updated dll name for Borland and MSVC.
* source/lang/msguawin.c
* source/lang/msgua866.c
* source/lang/msguakoi.c
! Fixed corrupted equal char in code.
! Fixed date format.
! Fixed CP IDs and descriptions in UA866 and UAKOI.
! Restored 'CA-Cl*pper' in comment.
; Please verify me.
2009-02-12 11:43 UTC+0200 Petr Chornyj (myorg63 at mail.ru)
* /source/lang/msguawin.c
* /source/lang/msgua866.c
@@ -18,7 +47,7 @@
* /source/lang/msguawin.c
* /source/lang/msgua866.c
* /source/lang/msguakoi.c
* Corrected bad Ukrainian localization
* Corrected bad Ukrainian localization
2009-12-11 18:09 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* harbour/contrib/gtwvg/wvgwin.c
@@ -35,7 +64,7 @@
* harbour/contrib/gtwvg/wvgstatc.prg
* harbour/contrib/gtwvg/wvgtoolb.prg
* harbour/contrib/gtwvg/wvgwnd.prg
! Numerous enhancements and fixes, difficult to remember as
! Numerous enhancements and fixes, difficult to remember as
most are spread over a long time and where I had no means
to update them. But all are synchronized with changes
effected till date by others.

2
harbour/contrib/rddsql/sddfb/make_b32.bat
View File

@@ -21,7 +21,7 @@ if "%HB_INC_FIREBIRD%" == "" set HB_INC_FIREBIRD=%HB_DIR_FIREBIRD%\include
set _HB_DLL_NAME=fbclient
set HB_ROOT=..\..\..
set HB_MAKEFILE=..\..\mtpl_b32.mak
set CFLAGS=-I"%HB_INC_FIREBIRD%";..\..\..\include
set CFLAGS=-I"%HB_INC_FIREBIRD%"
rem ---------------------------------------------------------------

2
harbour/contrib/rddsql/sddfb/make_vc.bat
View File

@@ -67,4 +67,4 @@ if "%1" == "INSTALL" goto POST_INSTALL
set CFLAGS=
set _HB_DLL_NAME=
set _HB_INSTALL_PREFIX=
set _HB_LIB_INSTALL=
set _HB_LIB_INSTALL=

2
harbour/contrib/rddsql/sddmy/make_b32.bat
View File

@@ -22,7 +22,7 @@ set _HB_DLL_NAME=libmySQL
set _HB_DLL_DIR=%HB_DIR_MYSQL%\bin
set HB_ROOT=..\..\..
set HB_MAKEFILE=..\..\mtpl_b32.mak
set CFLAGS=-I"%HB_INC_MYSQL%";..\..\..\include
set CFLAGS=-I"%HB_INC_MYSQL%"
rem ---------------------------------------------------------------

4
harbour/contrib/rddsql/sddmy/make_vc.bat
View File

@@ -20,8 +20,8 @@ goto POST_EXIT
if "%HB_INC_MYSQL%" == "" set HB_INC_MYSQL=%HB_DIR_MYSQL%\include
set _HB_DLL_NAME=libmySQL
set HB_ROOT=..\..\..
set HB_MAKEFILE=..\..\mtpl_b32.mak
set CFLAGS=-I"%HB_INC_MYSQL%";..\..\..\include
set HB_MAKEFILE=..\..\mtpl_vc.mak
set CFLAGS=-I"%HB_INC_MYSQL%"
rem ---------------------------------------------------------------

2
harbour/contrib/rddsql/sddpg/make_b32.bat
View File

@@ -21,7 +21,7 @@ if "%HB_INC_PGSQL%" == "" set HB_INC_PGSQL=%HB_DIR_PGSQL%\include
set _HB_DLL_NAME=libpq
set HB_ROOT=..\..\..
set HB_MAKEFILE=..\..\mtpl_b32.mak
set CFLAGS=-I"%HB_INC_PGSQL%";..\..\..\include
set CFLAGS=-I"%HB_INC_PGSQL%"
rem ---------------------------------------------------------------

4
harbour/contrib/rddsql/sddpg/make_vc.bat
View File

@@ -20,8 +20,8 @@ goto POST_EXIT
if "%HB_INC_PGSQL%" == "" set HB_INC_PGSQL=%HB_DIR_PGSQL%\include
set _HB_DLL_NAME=libpq
set HB_ROOT=..\..\..
set HB_MAKEFILE=..\..\mtpl_b32.mak
set CFLAGS=-I"%HB_INC_PGSQL%";..\..\..\include
set HB_MAKEFILE=..\..\mtpl_vc.mak
set CFLAGS=-I"%HB_INC_PGSQL%"
rem ---------------------------------------------------------------

4
harbour/include/hbapi.h
View File

@@ -827,7 +827,11 @@ extern HB_EXPORT BOOL hb_compStrToNum( const char * szNum, ULONG ulLen, HB_
extern HB_EXPORT BOOL hb_valStrnToNum( const char * szNum, ULONG ulLen, HB_LONG * plVal, double * pdVal, int * piDec, int * piWidth ); /* converts string to number, sets iDec, iWidth and returns TRUE if results is double, used by VAL() */
extern HB_EXPORT BOOL hb_strToNum( const char * szNum, HB_LONG * plVal, double * pdVal ); /* converts string to number, returns TRUE if results is double */
extern HB_EXPORT BOOL hb_strnToNum( const char * szNum, ULONG ulLen, HB_LONG * plVal, double * pdVal ); /* converts string to number, returns TRUE if results is double */
#if defined( HB__USE_OWN_SNPRINTF )
extern HB_EXPORT int hb_snprintf( char * buffer, size_t bufsize, const char * format, ... ) HB_PRINTF_FORMAT( 3, 4 ); /* snprintf() equivalent */
#else
extern HB_EXPORT ULONG hb_snprintf( char * buffer, ULONG nSize, const char * format, ... ) HB_PRINTF_FORMAT( 3, 4 ); /* snprintf() wrapper */
#endif
extern HB_EXPORT BOOL hb_strMatchFile( const char * pszString, const char * szPattern ); /* compare two strings using platform dependent rules for file matching */
extern HB_EXPORT BOOL hb_strMatchRegExp( const char * szString, const char * szPattern ); /* compare two strings using a regular expression pattern */

1
harbour/include/hbsetup.h
View File

@@ -55,6 +55,7 @@
#include <limits.h>
#define HB__USE_OWN_SNPRINTF /* temp, for initial live testing */
/* ***********************************************************************
* Include settings common for .prg and .c files

13
harbour/source/common/hbprintf.c
View File

@@ -50,8 +50,6 @@
*
*/
#if 1
/*
patterm format:
'%' [<flags>*] [<field width>] [.<precision>] [<length modifier>]
@@ -102,6 +100,8 @@ optimized.
#include "hbapi.h"
#include "hbmath.h"
#if defined( HB__USE_OWN_SNPRINTF )
#if defined( __BORLANDC__ ) || defined( __WATCOMC__ ) || defined( _MSC_VER )
# include <float.h>
#elif defined(__DJGPP__)
@@ -110,13 +110,6 @@ optimized.
# include <ieeefp.h> /* for finite() */
#endif
HB_EXTERN_BEGIN
int hb_snprintf_c( char *buffer, size_t bufsize, const char *format, ... )
HB_PRINTF_FORMAT( 3, 4 );
HB_EXTERN_END
#if defined( HB_LONG_DOUBLE_OFF ) && !defined( __NO_LONGDOUBLE__ )
# define __NO_LONGDOUBLE__
#endif
@@ -843,7 +836,7 @@ static size_t put_str( char *buffer, size_t bufsize, size_t size,
return size;
}
int hb_snprintf_c( char * buffer, size_t bufsize, const char * format, ... )
int hb_snprintf( char * buffer, size_t bufsize, const char * format, ... )
{
va_list args;
size_t size;

4
harbour/source/common/hbstr.c
View File

@@ -1090,6 +1090,8 @@ char * hb_compDecodeString( int iMethod, const char * szText, ULONG * pulLen )
return pBuffer;
}
#if ! defined( HB__USE_OWN_SNPRINTF )
#undef _HB_SNPRINTF_ADD_EOS
#undef hb_snprintf
/* NOTE: The full size of the buffer is expected as nSize. [vszakats] */
@@ -1125,3 +1127,5 @@ ULONG hb_snprintf( char * buffer, ULONG nSize, const char * format, ... )
return result;
}
#endif

19
harbour/source/lang/msgua866.c
View File

@@ -56,12 +56,12 @@
#include "hbapilng.h"
static HB_LANG s_lang €
static HB_LANG s_lang =
{
{
/* Identification */
"UAWIN", /* ID */
"UA866", /* ID */
"Ukrainian", /* Name (in English) */
"“ªà ù­á쪠", /* Name (in native language) */
"UA", /* RFC ID */
@@ -93,7 +93,7 @@ static HB_LANG s_lang
"<EFBFBD>'ïâ­¨æï",
"‘ã¡®â ",
/* CA-Clipper compatible natmsg items */
/* CA-Cl*pper compatible natmsg items */
"” ©«¨ ¤ ­¨å # ‡ ¯¨á¨ Žáâ ­­ï §¬. <20>®§¬÷à",
"<EFBFBD>®âà÷¡­÷ é¥ ¯à¨ª« ¤¨ ?",
@@ -194,26 +194,25 @@ static HB_LANG s_lang
/* Texts */
"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>/ŒŒ/„„",
"MM/DD/YYYY",
"’",
"<EFBFBD>"
}
};
HB_LANG_ANNOUNCE( UAWIN );
HB_LANG_ANNOUNCE( UA866 );
HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_UAWIN )
HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_UA866 )
hb_langRegister( &s_lang );
HB_CALL_ON_STARTUP_END( hb_lang_Init_UAWIN )
HB_CALL_ON_STARTUP_END( hb_lang_Init_UA866 )
#if defined( HB_PRAGMA_STARTUP )
#pragma startup hb_lang_Init_UAWIN
#pragma startup hb_lang_Init_UA866
#elif defined( HB_MSC_STARTUP )
#if defined( HB_OS_WIN_64 )
#pragma section( HB_MSC_START_SEGMENT, long, read )
#endif
#pragma data_seg( HB_MSC_START_SEGMENT )
static HB_$INITSYM hb_vm_auto_hb_lang_Init_UAWIN € hb_lang_Init_UAWIN;
static HB_$INITSYM hb_vm_auto_hb_lang_Init_UA866 = hb_lang_Init_UA866;
#pragma data_seg()
#endif

19
harbour/source/lang/msguakoi.c
View File

@@ -56,12 +56,12 @@
#include "hbapilng.h"
static HB_LANG s_lang €
static HB_LANG s_lang =
{
{
/* Identification */
"UAWIN", /* ID */
"UAKOI8", /* ID */
"Ukrainian", /* Name (in English) */
"õËÒÁ§ÎÓØËÁ", /* Name (in native language) */
"UA", /* RFC ID */
@@ -93,7 +93,7 @@ static HB_LANG s_lang
"ð?ÑÔÎÉÃÑ",
"óÕÂÏÔÁ",
/* CA-Clipper compatible natmsg items */
/* CA-Cl*pper compatible natmsg items */
"æÁÊÌÉ ÄÁÎÉÈ # úÁÐÉÓÉ ïÓÔÁÎÎÑ ÚÍ. òÏÚͦÒ",
"ðÏÔÒ¦ÂΦ ÝÅ ÐÒÉËÌÁÄÉ ?",
@@ -194,26 +194,25 @@ static HB_LANG s_lang
/* Texts */
"òòòò/íí/ää",
"MM/DD/YYYY",
"ô",
"î"
}
};
HB_LANG_ANNOUNCE( UAWIN );
HB_LANG_ANNOUNCE( UAKOI8 );
HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_UAWIN )
HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_UAKOI8 )
hb_langRegister( &s_lang );
HB_CALL_ON_STARTUP_END( hb_lang_Init_UAWIN )
HB_CALL_ON_STARTUP_END( hb_lang_Init_UAKOI8 )
#if defined( HB_PRAGMA_STARTUP )
#pragma startup hb_lang_Init_UAWIN
#pragma startup hb_lang_Init_UAKOI8
#elif defined( HB_MSC_STARTUP )
#if defined( HB_OS_WIN_64 )
#pragma section( HB_MSC_START_SEGMENT, long, read )
#endif
#pragma data_seg( HB_MSC_START_SEGMENT )
static HB_$INITSYM hb_vm_auto_hb_lang_Init_UAWIN € hb_lang_Init_UAWIN;
static HB_$INITSYM hb_vm_auto_hb_lang_Init_UAKOI8 = hb_lang_Init_UAKOI8;
#pragma data_seg()
#endif

5
harbour/source/lang/msguawin.c
View File

@@ -93,7 +93,7 @@ static HB_LANG s_lang =
"Ï’ÿòíèöÿ",
"Ñóáîòà",
/* CA-Clipper compatible natmsg items */
/* CA-Cl*pper compatible natmsg items */
"Ôàéëè äàíèõ # Çàïèñè Îñòàííÿ çì. Ðîçì³ð",
"Ïîòð³áí³ ùå ïðèêëàäè ?",
@@ -194,7 +194,7 @@ static HB_LANG s_lang =
/* Texts */
"ÐÐÐÐ/ÌÌ/ÄÄ",
"MM/DD/YYYY",
"Ò",
"Í"
}
@@ -216,4 +216,3 @@ HB_CALL_ON_STARTUP_END( hb_lang_Init_UAWIN )
static HB_$INITSYM hb_vm_auto_hb_lang_Init_UAWIN = hb_lang_Init_UAWIN;
#pragma data_seg()
#endif

4
harbour/source/vm/maindllp.c
View File

@@ -61,9 +61,9 @@
#define HB_DLL_NAME "harbour.dll"
#if defined( __BORLANDC__ )
#define HB_DLL_NAME2 "harbour-b32.dll"
#define HB_DLL_NAME2 "harbour-11-b32.dll"
#elif defined( _MSC_VER )
#define HB_DLL_NAME2 "harbour-vc.dll"
#define HB_DLL_NAME2 "harbour-11-vc.dll"
#endif
#if defined(HB_OS_WIN)