diff --git a/harbour/ChangeLog b/harbour/ChangeLog index cfd4f6e0fb..af9a70596f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,52 @@ 2002-12-01 23:12 UTC+0100 Foo Bar */ +2004-05-21 13:30 UTC+0300 Alexander Kresin + * source/rdd/dbf1.c + * source/rdd/dbfdbt/dbfdbt1.c + * Calls of hb_cdpTranslate() are changed to hb_cdpnTranslate() + + source/codepage/cdpeldos.c + + source/codepage/cdpelwin.c + + Greek language codepage files added - provided by Pete Dionisopoulos. + * source/lang/msgel.c + * source/lang/msgelwin.c + + Greek language files added - provided by Pete Dionisopoulos. + * source/codepage/Makefile + * source/lang/Makefile + * hrbdll.bc + * hrbdll.vc + * makefile.bc + * makefile.nt + * makefile.vc + * Makefiles has been updated due to new codepage and lang files. + * source/codepage/cdp_tpl.c + * source/codepage/cdpesdos.c + * source/codepage/cdpeswin.c + * source/codepage/cdpgedos.c + * source/codepage/cdpgewin.c + * source/codepage/cdphu852.c + * source/codepage/cdphuwin.c + * source/codepage/cdpla850.c + * source/codepage/cdppl852.c + * source/codepage/cdppliso.c + * source/codepage/cdpplmaz.c + * source/codepage/cdpplwin.c + * source/codepage/cdppt850.c + * source/codepage/cdpptiso.c + * source/codepage/cdpru866.c + * source/codepage/cdprukoi.c + * source/codepage/cdpruwin.c + * source/codepage/cdpsk852.c + * source/codepage/cdpskiso.c + * source/codepage/cdpsl437.c + * source/codepage/cdpsl852.c + * source/codepage/cdpsliso.c + * source/codepage/cdpslwin.c + * source/codepage/cdpsrwin.c + * Few lines are replaced with HB_CODEPAGE_INIT( ), as was suggested by + Ilias Lazaridis + + 2004-05-19 13:25 UTC+0100 Ryszard Glab * source/codepage/cdpsrwin.c diff --git a/harbour/hrbdll.bc b/harbour/hrbdll.bc index 5986e486e8..a5a74e7289 100644 --- a/harbour/hrbdll.bc +++ b/harbour/hrbdll.bc @@ -334,6 +334,8 @@ HARBOUR_DLL_OBJS = \ $(OBJ_DIR)\msgcskam.obj \ $(OBJ_DIR)\msgcswin.obj \ $(OBJ_DIR)\msgde.obj \ + $(OBJ_DIR)\msgel.obj \ + $(OBJ_DIR)\msgelwin.obj \ $(OBJ_DIR)\msgen.obj \ $(OBJ_DIR)\msgeo.obj \ $(OBJ_DIR)\msges.obj \ @@ -380,6 +382,8 @@ HARBOUR_DLL_OBJS = \ $(OBJ_DIR)\gtwin.obj \ $(OBJ_DIR)\mousewin.obj \ \ + $(OBJ_DIR)\cdpeldos.obj \ + $(OBJ_DIR)\cdpelwin.obj \ $(OBJ_DIR)\cdpesdos.obj \ $(OBJ_DIR)\cdpeswin.obj \ $(OBJ_DIR)\cdpgedos.obj \ @@ -763,6 +767,8 @@ $(HARBOUR_DLL) : \ echo. $(OBJ_DIR)\msgcskam.obj + >> hdll.tmp echo. $(OBJ_DIR)\msgcswin.obj + >> hdll.tmp echo. $(OBJ_DIR)\msgde.obj + >> hdll.tmp + echo. $(OBJ_DIR)\msgel.obj + >> hdll.tmp + echo. $(OBJ_DIR)\msgelwin.obj + >> hdll.tmp echo. $(OBJ_DIR)\msgen.obj + >> hdll.tmp echo. $(OBJ_DIR)\msgeo.obj + >> hdll.tmp echo. $(OBJ_DIR)\msges.obj + >> hdll.tmp @@ -1830,6 +1836,12 @@ $(OBJ_DIR)\msgde.obj : $(LANG_DIR)\msgde.c $(OBJ_DIR)\msgdewin.obj : $(LANG_DIR)\msgdewin.c $(CC) $(CLIBFLAGS) -o$@ $** +$(OBJ_DIR)\msgel.obj : $(LANG_DIR)\msgel.c + $(CC) $(CLIBFLAGS) -o$@ $** + +$(OBJ_DIR)\msgelwin.obj : $(LANG_DIR)\msgelwin.c + $(CC) $(CLIBFLAGS) -o$@ $** + $(OBJ_DIR)\msgen.obj : $(LANG_DIR)\msgen.c $(CC) $(CLIBFLAGS) -o$@ $** @@ -2081,6 +2093,12 @@ $(OBJ_DIR)\mousewin.obj : $(RTL_DIR)\gtwin\mousewin.c $(CC) $(CLIBFLAGS) -o$@ $** +$(OBJ_DIR)\cdpeldos.obj : $(CODEPAGE_DIR)\cdpeldos.c + $(CC) $(CLIBFLAGS) -o$@ $** + +$(OBJ_DIR)\cdpelwin.obj : $(CODEPAGE_DIR)\cdpelwin.c + $(CC) $(CLIBFLAGS) -o$@ $** + $(OBJ_DIR)\cdpesdos.obj : $(CODEPAGE_DIR)\cdpesdos.c $(CC) $(CLIBFLAGS) -o$@ $** diff --git a/harbour/hrbdll.vc b/harbour/hrbdll.vc index 2a63beed7f..dfdf205d17 100644 --- a/harbour/hrbdll.vc +++ b/harbour/hrbdll.vc @@ -322,6 +322,8 @@ HARBOUR_DLL_OBJS = \ $(OBJ_DIR)\msgcskam.obj \ $(OBJ_DIR)\msgcswin.obj \ $(OBJ_DIR)\msgde.obj \ + $(OBJ_DIR)\msgel.obj \ + $(OBJ_DIR)\msgelwin.obj \ $(OBJ_DIR)\msgen.obj \ $(OBJ_DIR)\msgeo.obj \ $(OBJ_DIR)\msges.obj \ @@ -1487,6 +1489,12 @@ $(OBJ_DIR)\msgcswin.obj : $(LANG_DIR)\msgcswin.c $(OBJ_DIR)\msgde.obj : $(LANG_DIR)\msgde.c $(CC) $(CLIBFLAGS) /Fo$@ $** +$(OBJ_DIR)\msgel.obj : $(LANG_DIR)\msgel.c + $(CC) $(CLIBFLAGS) /Fo$@ $** + +$(OBJ_DIR)\msgelwin.obj : $(LANG_DIR)\msgelwin.c + $(CC) $(CLIBFLAGS) /Fo$@ $** + $(OBJ_DIR)\msgen.obj : $(LANG_DIR)\msgen.c $(CC) $(CLIBFLAGS) /Fo$@ $** diff --git a/harbour/makefile.bc b/harbour/makefile.bc index 65db3789ab..8da9b9c3d5 100644 --- a/harbour/makefile.bc +++ b/harbour/makefile.bc @@ -401,6 +401,8 @@ LANG_LIB_OBJS = \ $(OBJ_DIR)\msgcswin.obj \ $(OBJ_DIR)\msgde.obj \ $(OBJ_DIR)\msgdewin.obj \ + $(OBJ_DIR)\msgel.obj \ + $(OBJ_DIR)\msgelwin.obj \ $(OBJ_DIR)\msgen.obj \ $(OBJ_DIR)\msgeo.obj \ $(OBJ_DIR)\msges.obj \ @@ -439,6 +441,8 @@ LANG_LIB_OBJS = \ $(OBJ_DIR)\msgzhb5.obj CODEPAGE_LIB_OBJS = \ + $(OBJ_DIR)\cdpeldos.obj \ + $(OBJ_DIR)\cdpelwin.obj \ $(OBJ_DIR)\cdpesdos.obj \ $(OBJ_DIR)\cdpeswin.obj \ $(OBJ_DIR)\cdpgedos.obj \ @@ -2134,6 +2138,14 @@ $(OBJ_DIR)\msgdewin.obj : $(LANG_DIR)\msgdewin.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(LANG_LIB) $(ARFLAGS) -+$@,, +$(OBJ_DIR)\msgel.obj : $(LANG_DIR)\msgel.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(LANG_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\msgelwin.obj : $(LANG_DIR)\msgelwin.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(LANG_LIB) $(ARFLAGS) -+$@,, + $(OBJ_DIR)\msgen.obj : $(LANG_DIR)\msgen.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(LANG_LIB) $(ARFLAGS) -+$@,, @@ -2281,6 +2293,14 @@ $(OBJ_DIR)\msgzhgb.obj : $(LANG_DIR)\msgzhgb.c # # CODEPAGE.LIB dependencies # +$(OBJ_DIR)\cdpeldos.obj : $(CODEPAGE_DIR)\cdpeldos.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(CODEPAGE_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\cdpelwin.obj : $(CODEPAGE_DIR)\cdpelwin.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(CODEPAGE_LIB) $(ARFLAGS) -+$@,, + $(OBJ_DIR)\cdpesdos.obj : $(CODEPAGE_DIR)\cdpesdos.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(CODEPAGE_LIB) $(ARFLAGS) -+$@,, diff --git a/harbour/makefile.nt b/harbour/makefile.nt index df8abef1c3..89a5100638 100644 --- a/harbour/makefile.nt +++ b/harbour/makefile.nt @@ -457,6 +457,8 @@ LANG_LIB_OBJS = \ $(OBJ_DIR)\msgcswin.obj \ $(OBJ_DIR)\msgde.obj \ $(OBJ_DIR)\msgdewin.obj \ + $(OBJ_DIR)\msgel.obj \ + $(OBJ_DIR)\msgelwin.obj \ $(OBJ_DIR)\msgen.obj \ $(OBJ_DIR)\msgeo.obj \ $(OBJ_DIR)\msges.obj \ @@ -501,6 +503,8 @@ LANG_LIB_OBJS = \ $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< CODEPAGE_LIB_OBJS = \ + $(OBJ_DIR)\cdpeldos.obj \ + $(OBJ_DIR)\cdpelwin.obj \ $(OBJ_DIR)\cdpesdos.obj \ $(OBJ_DIR)\cdpeswin.obj \ $(OBJ_DIR)\cdpgedos.obj \ diff --git a/harbour/makefile.vc b/harbour/makefile.vc index dfd5fff9f6..e9fb1bc458 100644 --- a/harbour/makefile.vc +++ b/harbour/makefile.vc @@ -421,6 +421,8 @@ LANG_LIB_OBJS = \ $(OBJ_DIR)\msgcswin.obj \ $(OBJ_DIR)\msgde.obj \ $(OBJ_DIR)\msgdewin.obj \ + $(OBJ_DIR)\msgel.obj \ + $(OBJ_DIR)\msgelwin.obj \ $(OBJ_DIR)\msgen.obj \ $(OBJ_DIR)\msgeo.obj \ $(OBJ_DIR)\msges.obj \ @@ -466,6 +468,8 @@ LANG_LIB_OBJS = \ $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< CODEPAGE_LIB_OBJS = \ + $(OBJ_DIR)\cdpeldos.obj \ + $(OBJ_DIR)\cdpelwin.obj \ $(OBJ_DIR)\cdpesdos.obj \ $(OBJ_DIR)\cdpeswin.obj \ $(OBJ_DIR)\cdpgedos.obj \ diff --git a/harbour/source/codepage/Makefile b/harbour/source/codepage/Makefile index 684c76da0a..8bb50b4550 100644 --- a/harbour/source/codepage/Makefile +++ b/harbour/source/codepage/Makefile @@ -5,6 +5,8 @@ ROOT = ../../ C_SOURCES=\ + cdpeldos.c \ + cdpelwin.c \ cdpesdos.c \ cdpeswin.c \ cdpgedos.c \ diff --git a/harbour/source/codepage/cdp_tpl.c b/harbour/source/codepage/cdp_tpl.c index b1543cfb2e..9f979b9489 100644 --- a/harbour/source/codepage/cdp_tpl.c +++ b/harbour/source/codepage/cdp_tpl.c @@ -87,11 +87,8 @@ static HB_CODEPAGE s_codepage = { "EN",NUMBER_OF_CHARACTERS, "ABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwxyz", IS_LATIN,ACCENTED_EQUAL,ACCENTED_INTERLEAVED,0,NULL,NULL,NULL,NULL,0,NULL }; -HB_CODEPAGE_ANNOUNCE( EN ); +HB_CODEPAGE_INIT( EN ); -HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_EN ) - hb_cdpRegister( &s_codepage ); -HB_CALL_ON_STARTUP_END( hb_codepage_Init_EN ) #if ! defined(__GNUC__) && ! defined(_MSC_VER) #pragma startup hb_codepage_Init_EN #endif diff --git a/harbour/source/codepage/cdpeldos.c b/harbour/source/codepage/cdpeldos.c new file mode 100644 index 0000000000..8f35238508 --- /dev/null +++ b/harbour/source/codepage/cdpeldos.c @@ -0,0 +1,95 @@ +/* + * $Id$ +*/ + +/* + * Harbour Project source code: + * National Collation Support Module ( template ) + * + * Copyright 2004 Pete Dionisopoulos + * 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. + * + */ + +/* Language name: */ +/* ISO language code (2 chars): EL */ +/* Codepage: 737 */ + +#include +#include "hbapi.h" +#include "hbapicdp.h" + +#define NUMBER_OF_CHARACTERS 32 /* The number of single characters in the + alphabet, two-as-one aren't considered + here, accented - are considered. */ +#define IS_LATIN 0 /* Should be 1, if the national alphabet + is based on Latin */ +#define ACCENTED_EQUAL 1 /* Should be 1, if accented character + has the same weight as appropriate + unaccented. */ +#define ACCENTED_INTERLEAVED 0 /* Should be 1, if accented characters + sort after their unaccented counterparts + only if the unaccented versions of all + characters being compared are the same + ( interleaving ) */ + +/* If ACCENTED_EQUAL or ACCENTED_INTERLEAVED is 1, you need to mark the + accented characters with the symbol '~' before each of them, for example: + a~_ + If there is two-character sequence, which is considered as one, it should + be marked with '.' before and after it, for example: + ... h.ch.i ... + + The Upper case string and the Lower case string should be absolutely the + same excepting the characters case, of course. + */ + +static HB_CODEPAGE s_codepage = { "EL",NUMBER_OF_CHARACTERS, + "~ꁂ녆~쇈~퉊~~~","~ᙚ~❞~㟠~塢~槨~筮~", + IS_LATIN,ACCENTED_EQUAL,ACCENTED_INTERLEAVED,0,NULL,NULL,NULL,NULL,0,NULL }; + +HB_CODEPAGE_INIT( EL ); + +#if ! defined(__GNUC__) && ! defined(_MSC_VER) + #pragma startup hb_codepage_Init_EL +#endif + diff --git a/harbour/source/codepage/cdpelwin.c b/harbour/source/codepage/cdpelwin.c new file mode 100644 index 0000000000..e0126ed423 --- /dev/null +++ b/harbour/source/codepage/cdpelwin.c @@ -0,0 +1,95 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * National Collation Support Module ( Greek WIN ) + * + * Copyright 2004 Pete Dionisopoulos + * www - http://www.harbour-project.org + * v1.0 2004 Panayotis (Pete) Dionysopoulos + * + * 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. + * + */ + +/* Language name: Greek WIN*/ +/* ISO language code (2 chars): EL */ +/* Codepage: ANSI (1253) */ + +#include +#include "hbapi.h" +#include "hbapicdp.h" + +#define NUMBER_OF_CHARACTERS 32 /* The number of single characters in the + alphabet, two-as-one aren't considered + here, accented - are considered. */ +#define IS_LATIN 0 /* Should be 1, if the national alphabet + is based on Latin */ +#define ACCENTED_EQUAL 1 /* Should be 1, if accented character + has the same weight as appropriate + unaccented. */ +#define ACCENTED_INTERLEAVED 0 /* Should be 1, if accented characters + sort after their unaccented counterparts + only if the unaccented versions of all + characters being compared are the same + ( interleaving ) */ + +/* If ACCENTED_EQUAL or ACCENTED_INTERLEAVED is 1, you need to mark the + accented characters with the symbol '~' before each of them, for example: + a~ + If there is two-character sequence, which is considered as one, it should + be marked with '.' before and after it, for example: + ... h.ch.i ... + + The Upper case string and the Lower case string should be absolutely the + same excepting the characters case, of course. + */ + +static HB_CODEPAGE s_codepage = { "ELWIN",NUMBER_OF_CHARACTERS, + "~Ÿ~~~~~","~~~~~~~", + IS_LATIN,ACCENTED_EQUAL,ACCENTED_INTERLEAVED,0,NULL,NULL,NULL,NULL,0,NULL }; + +HB_CODEPAGE_INIT( ELWIN ); + +#if ! defined(__GNUC__) && ! defined(_MSC_VER) + #pragma startup hb_codepage_Init_ELWIN +#endif diff --git a/harbour/source/codepage/cdpeswin.c b/harbour/source/codepage/cdpeswin.c index acb9c98208..b1b3093324 100644 --- a/harbour/source/codepage/cdpeswin.c +++ b/harbour/source/codepage/cdpeswin.c @@ -88,11 +88,8 @@ static HB_CODEPAGE s_codepage = { "ESWIN", NUMBER_OF_CHARACTERS, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz", IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0,NULL, NULL,NULL,NULL,0,NULL }; -HB_CODEPAGE_ANNOUNCE( ESWIN ); +HB_CODEPAGE_INIT( ESWIN ); -HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_ESWIN ) - hb_cdpRegister( &s_codepage ); -HB_CALL_ON_STARTUP_END( hb_codepage_Init_ESWIN ) #if ! defined(__GNUC__) && ! defined(_MSC_VER) #pragma startup hb_codepage_Init_ESWIN #endif diff --git a/harbour/source/codepage/cdpgedos.c b/harbour/source/codepage/cdpgedos.c index 7f0fa84e64..ea74050178 100644 --- a/harbour/source/codepage/cdpgedos.c +++ b/harbour/source/codepage/cdpgedos.c @@ -88,11 +88,8 @@ static HB_CODEPAGE s_codepage = { "DE",NUMBER_OF_CHARACTERS, "ABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwxyz", IS_LATIN,ACCENTED_EQUAL,ACCENTED_INTERLEAVED,0,NULL,NULL,NULL,NULL,0,NULL }; -HB_CODEPAGE_ANNOUNCE( DE ); +HB_CODEPAGE_INIT( DE ); -HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_DE ) - hb_cdpRegister( &s_codepage ); -HB_CALL_ON_STARTUP_END( hb_codepage_Init_DE ) #if ! defined(__GNUC__) && ! defined(_MSC_VER) #pragma startup hb_codepage_Init_DE #endif diff --git a/harbour/source/codepage/cdpgewin.c b/harbour/source/codepage/cdpgewin.c index 0f1cbecfcf..bbc9b42380 100644 --- a/harbour/source/codepage/cdpgewin.c +++ b/harbour/source/codepage/cdpgewin.c @@ -88,11 +88,8 @@ static HB_CODEPAGE s_codepage = { "DEWIN",NUMBER_OF_CHARACTERS, "ABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwxyz", IS_LATIN,ACCENTED_EQUAL,ACCENTED_INTERLEAVED,0,NULL,NULL,NULL,NULL,0,NULL }; -HB_CODEPAGE_ANNOUNCE( DEWIN ); +HB_CODEPAGE_INIT( DEWIN ); -HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_DEWIN ) - hb_cdpRegister( &s_codepage ); -HB_CALL_ON_STARTUP_END( hb_codepage_Init_DEWIN ) #if ! defined(__GNUC__) && ! defined(_MSC_VER) #pragma startup hb_codepage_Init_DEWIN #endif diff --git a/harbour/source/codepage/cdphu852.c b/harbour/source/codepage/cdphu852.c index 1a0533b57a..0ea0217fa9 100644 --- a/harbour/source/codepage/cdphu852.c +++ b/harbour/source/codepage/cdphu852.c @@ -87,11 +87,8 @@ static HB_CODEPAGE s_codepage = { "HU852", NUMBER_OF_CHARACTERS, "ABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwxyz", IS_LATIN,ACCENTED_EQUAL,ACCENTED_INTERLEAVED,0,NULL,NULL,NULL,NULL,0,NULL }; -HB_CODEPAGE_ANNOUNCE( HU852 ); +HB_CODEPAGE_INIT( HU852 ); -HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_HU852 ) - hb_cdpRegister( &s_codepage ); -HB_CALL_ON_STARTUP_END( hb_codepage_Init_HU852 ) #if ! defined(__GNUC__) && ! defined(_MSC_VER) #pragma startup hb_codepage_Init_HU852 #endif diff --git a/harbour/source/codepage/cdphuwin.c b/harbour/source/codepage/cdphuwin.c index 4479fd50d3..f52d0b7acb 100644 --- a/harbour/source/codepage/cdphuwin.c +++ b/harbour/source/codepage/cdphuwin.c @@ -87,11 +87,8 @@ static HB_CODEPAGE s_codepage = { "HUWIN", NUMBER_OF_CHARACTERS, "ABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwxyz", IS_LATIN,ACCENTED_EQUAL,ACCENTED_INTERLEAVED,0,NULL,NULL,NULL,NULL,0,NULL }; -HB_CODEPAGE_ANNOUNCE( HUWIN ); +HB_CODEPAGE_INIT( HUWIN ); -HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_HUWIN ) - hb_cdpRegister( &s_codepage ); -HB_CALL_ON_STARTUP_END( hb_codepage_Init_HUWIN ) #if ! defined(__GNUC__) && ! defined(_MSC_VER) #pragma startup hb_codepage_Init_HUWIN #endif diff --git a/harbour/source/codepage/cdppl852.c b/harbour/source/codepage/cdppl852.c index 886192b499..5afde61696 100644 --- a/harbour/source/codepage/cdppl852.c +++ b/harbour/source/codepage/cdppl852.c @@ -88,11 +88,8 @@ static HB_CODEPAGE s_codepage = { "PL852",NUMBER_OF_CHARACTERS, "ABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwxyz", IS_LATIN,ACCENTED_EQUAL,ACCENTED_INTERLEAVED,0,NULL,NULL,NULL,NULL,0,NULL }; -HB_CODEPAGE_ANNOUNCE( PL852 ); +HB_CODEPAGE_INIT( PL852 ); -HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_PL852 ) - hb_cdpRegister( &s_codepage ); -HB_CALL_ON_STARTUP_END( hb_codepage_Init_PL852 ) #if ! defined(__GNUC__) && ! defined(_MSC_VER) #pragma startup hb_codepage_Init_PL852 #endif diff --git a/harbour/source/codepage/cdppliso.c b/harbour/source/codepage/cdppliso.c index 553ab39386..d90c0b85fa 100644 --- a/harbour/source/codepage/cdppliso.c +++ b/harbour/source/codepage/cdppliso.c @@ -88,11 +88,8 @@ static HB_CODEPAGE s_codepage = { "PLISO",NUMBER_OF_CHARACTERS, "ABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwxyz", IS_LATIN,ACCENTED_EQUAL,ACCENTED_INTERLEAVED,0,NULL,NULL,NULL,NULL,0,NULL }; -HB_CODEPAGE_ANNOUNCE( PLISO ); +HB_CODEPAGE_INIT( PLISO ); -HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_PLISO ) - hb_cdpRegister( &s_codepage ); -HB_CALL_ON_STARTUP_END( hb_codepage_Init_PLISO ) #if ! defined(__GNUC__) && ! defined(_MSC_VER) #pragma startup hb_codepage_Init_PLISO #endif diff --git a/harbour/source/codepage/cdpplmaz.c b/harbour/source/codepage/cdpplmaz.c index 9025afe11d..16d24eb10d 100644 --- a/harbour/source/codepage/cdpplmaz.c +++ b/harbour/source/codepage/cdpplmaz.c @@ -88,11 +88,8 @@ static HB_CODEPAGE s_codepage = { "PLMAZ",NUMBER_OF_CHARACTERS, "ABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwxyz", IS_LATIN,ACCENTED_EQUAL,ACCENTED_INTERLEAVED,0,NULL,NULL,NULL,NULL,0,NULL }; -HB_CODEPAGE_ANNOUNCE( PLMAZ ); +HB_CODEPAGE_INIT( PLMAZ ); -HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_PLMAZ ) - hb_cdpRegister( &s_codepage ); -HB_CALL_ON_STARTUP_END( hb_codepage_Init_PLMAZ ) #if ! defined(__GNUC__) && ! defined(_MSC_VER) #pragma startup hb_codepage_Init_PLMAZ #endif diff --git a/harbour/source/codepage/cdpplwin.c b/harbour/source/codepage/cdpplwin.c index bec2385993..3dcc85edee 100644 --- a/harbour/source/codepage/cdpplwin.c +++ b/harbour/source/codepage/cdpplwin.c @@ -88,11 +88,8 @@ static HB_CODEPAGE s_codepage = { "PLWIN",NUMBER_OF_CHARACTERS, "ABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwxyz", IS_LATIN,ACCENTED_EQUAL,ACCENTED_INTERLEAVED,0,NULL,NULL,NULL,NULL,0,NULL }; -HB_CODEPAGE_ANNOUNCE( PLWIN ); +HB_CODEPAGE_INIT( PLWIN ); -HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_PLWIN ) - hb_cdpRegister( &s_codepage ); -HB_CALL_ON_STARTUP_END( hb_codepage_Init_PLWIN ) #if ! defined(__GNUC__) && ! defined(_MSC_VER) #pragma startup hb_codepage_Init_PLWIN #endif diff --git a/harbour/source/codepage/cdppt850.c b/harbour/source/codepage/cdppt850.c index 5f4e6948b3..eea177fb45 100644 --- a/harbour/source/codepage/cdppt850.c +++ b/harbour/source/codepage/cdppt850.c @@ -89,11 +89,8 @@ static HB_CODEPAGE s_codepage = { "PT850",NUMBER_OF_CHARACTERS, "AǎBCDEFGHIJKLMNOPQRSTUVWXYZ","aƄbcdefghijklmnopqrstuvwxyz", IS_LATIN,ACCENTED_EQUAL,ACCENTED_INTERLEAVED,0,NULL,NULL,NULL,NULL,0,NULL }; -HB_CODEPAGE_ANNOUNCE( PT850 ); +HB_CODEPAGE_INIT( PT850 ); -HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_PT850 ) - hb_cdpRegister( &s_codepage ); -HB_CALL_ON_STARTUP_END( hb_codepage_Init_PT850 ) #if ! defined(__GNUC__) && ! defined(_MSC_VER) #pragma startup hb_codepage_Init_PT850 #endif diff --git a/harbour/source/codepage/cdpptiso.c b/harbour/source/codepage/cdpptiso.c index 0540c18d1b..ebeb6e9c98 100644 --- a/harbour/source/codepage/cdpptiso.c +++ b/harbour/source/codepage/cdpptiso.c @@ -89,11 +89,8 @@ static HB_CODEPAGE s_codepage = { "PTISO",NUMBER_OF_CHARACTERS, "ABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwxyz", IS_LATIN,ACCENTED_EQUAL,ACCENTED_INTERLEAVED,0,NULL,NULL,NULL,NULL,0,NULL }; -HB_CODEPAGE_ANNOUNCE( PTISO ); +HB_CODEPAGE_INIT( PTISO ); -HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_PTISO ) - hb_cdpRegister( &s_codepage ); -HB_CALL_ON_STARTUP_END( hb_codepage_Init_PTISO ) #if ! defined(__GNUC__) && ! defined(_MSC_VER) #pragma startup hb_codepage_Init_PTISO #endif diff --git a/harbour/source/codepage/cdpru866.c b/harbour/source/codepage/cdpru866.c index 416b6d3a65..1392072cec 100644 --- a/harbour/source/codepage/cdpru866.c +++ b/harbour/source/codepage/cdpru866.c @@ -62,11 +62,8 @@ static HB_CODEPAGE s_codepage = { "RU866",32, "","", 0,0,0,0,NULL,NULL,NULL,NULL,0,NULL }; -HB_CODEPAGE_ANNOUNCE( RU866 ); +HB_CODEPAGE_INIT( RU866 ); -HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_RU866 ) - hb_cdpRegister( &s_codepage ); -HB_CALL_ON_STARTUP_END( hb_codepage_Init_RU866 ) #if ! defined(__GNUC__) && ! defined(_MSC_VER) #pragma startup hb_codepage_Init_RU866 #endif diff --git a/harbour/source/codepage/cdprukoi.c b/harbour/source/codepage/cdprukoi.c index 9764f015e4..6de61e59f1 100644 --- a/harbour/source/codepage/cdprukoi.c +++ b/harbour/source/codepage/cdprukoi.c @@ -62,11 +62,8 @@ static HB_CODEPAGE s_codepage = { "RUKOI8",32, "","", 0,0,0,0,NULL,NULL,NULL,NULL,0,NULL }; -HB_CODEPAGE_ANNOUNCE( RUKOI8 ); +HB_CODEPAGE_INIT( RUKOI8 ); -HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_RUKOI8 ) - hb_cdpRegister( &s_codepage ); -HB_CALL_ON_STARTUP_END( hb_codepage_Init_RUKOI8 ) #if ! defined(__GNUC__) && ! defined(_MSC_VER) #pragma startup hb_codepage_Init_RUKOI8 #endif diff --git a/harbour/source/codepage/cdpruwin.c b/harbour/source/codepage/cdpruwin.c index aacf3e97c3..3caba65d09 100644 --- a/harbour/source/codepage/cdpruwin.c +++ b/harbour/source/codepage/cdpruwin.c @@ -62,11 +62,8 @@ static HB_CODEPAGE s_codepage = { "RU1251",32, "","", 0,0,0,0,NULL,NULL,NULL,NULL,0,NULL }; -HB_CODEPAGE_ANNOUNCE( RU1251 ); +HB_CODEPAGE_INIT( RU1251 ); -HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_RU1251 ) - hb_cdpRegister( &s_codepage ); -HB_CALL_ON_STARTUP_END( hb_codepage_Init_RU1251 ) #if ! defined(__GNUC__) && ! defined(_MSC_VER) #pragma startup hb_codepage_Init_RU1251 #endif diff --git a/harbour/source/codepage/cdpsl437.c b/harbour/source/codepage/cdpsl437.c index fa34feb843..6ec0ecfce0 100644 --- a/harbour/source/codepage/cdpsl437.c +++ b/harbour/source/codepage/cdpsl437.c @@ -88,11 +88,8 @@ static HB_CODEPAGE s_codepage = { "SL437",NUMBER_OF_CHARACTERS, "ABC^]D\EFGHIJKLMNOPQRS[TUVWZ@XY","abc~}d|efghijklmnopqrs{tuvwz`xy", IS_LATIN,ACCENTED_EQUAL,ACCENTED_INTERLEAVED,0,NULL,NULL,NULL,NULL,0,NULL }; -HB_CODEPAGE_ANNOUNCE( SL437 ); +HB_CODEPAGE_INIT( SL437 ); -HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_SL437 ) - hb_cdpRegister( &s_codepage ); -HB_CALL_ON_STARTUP_END( hb_codepage_Init_SL437 ) #if ! defined(__GNUC__) && ! defined(_MSC_VER) #pragma startup hb_codepage_Init_SL437 #endif diff --git a/harbour/source/codepage/cdpsl852.c b/harbour/source/codepage/cdpsl852.c index 247f34a12f..afc250c500 100644 --- a/harbour/source/codepage/cdpsl852.c +++ b/harbour/source/codepage/cdpsl852.c @@ -88,11 +88,8 @@ static HB_CODEPAGE s_codepage = { "SL852",NUMBER_OF_CHARACTERS, "ABCDEFGHIJKLMNOPQRSTUVWZXY","abcdefghijklmnopqrstuvwzxy", IS_LATIN,ACCENTED_EQUAL,ACCENTED_INTERLEAVED,0,NULL,NULL,NULL,NULL,0,NULL }; -HB_CODEPAGE_ANNOUNCE( SL852 ); +HB_CODEPAGE_INIT( SL852 ); -HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_SL852 ) - hb_cdpRegister( &s_codepage ); -HB_CALL_ON_STARTUP_END( hb_codepage_Init_SL852 ) #if ! defined(__GNUC__) && ! defined(_MSC_VER) #pragma startup hb_codepage_Init_SL852 #endif diff --git a/harbour/source/codepage/cdpsliso.c b/harbour/source/codepage/cdpsliso.c index 637512f8f9..6d35765d8f 100644 --- a/harbour/source/codepage/cdpsliso.c +++ b/harbour/source/codepage/cdpsliso.c @@ -88,11 +88,8 @@ static HB_CODEPAGE s_codepage = { "SLISO",NUMBER_OF_CHARACTERS, "ABCDEFGHIJKLMNOPQRSTUVWZXY","abcdefghijklmnopqrstuvwzxy", IS_LATIN,ACCENTED_EQUAL,ACCENTED_INTERLEAVED,0,NULL,NULL,NULL,NULL,0,NULL }; -HB_CODEPAGE_ANNOUNCE( SLISO ); +HB_CODEPAGE_INIT( SLISO ); -HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_SLISO ) - hb_cdpRegister( &s_codepage ); -HB_CALL_ON_STARTUP_END( hb_codepage_Init_SLISO ) #if ! defined(__GNUC__) && ! defined(_MSC_VER) #pragma startup hb_codepage_Init_SLISO #endif diff --git a/harbour/source/codepage/cdpslwin.c b/harbour/source/codepage/cdpslwin.c index 679c8f3faa..62241c1d7f 100644 --- a/harbour/source/codepage/cdpslwin.c +++ b/harbour/source/codepage/cdpslwin.c @@ -88,11 +88,8 @@ static HB_CODEPAGE s_codepage = { "SLWIN",NUMBER_OF_CHARACTERS, "ABCDEFGHIJKLMNOPQRSTUVWZXY","abcdefghijklmnopqrstuvwzxy", IS_LATIN,ACCENTED_EQUAL,ACCENTED_INTERLEAVED,0,NULL,NULL,NULL,NULL,0,NULL }; -HB_CODEPAGE_ANNOUNCE( SLWIN ); +HB_CODEPAGE_INIT( SLWIN ); -HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_SLWIN ) - hb_cdpRegister( &s_codepage ); -HB_CALL_ON_STARTUP_END( hb_codepage_Init_SLWIN ) #if ! defined(__GNUC__) && ! defined(_MSC_VER) #pragma startup hb_codepage_Init_SLWIN #endif diff --git a/harbour/source/codepage/cdpsrwin.c b/harbour/source/codepage/cdpsrwin.c index 1ee870f4bc..4739109c31 100644 --- a/harbour/source/codepage/cdpsrwin.c +++ b/harbour/source/codepage/cdpsrwin.c @@ -99,11 +99,8 @@ static HB_CODEPAGE s_codepage = { "SRWIN", 0, NULL }; -HB_CODEPAGE_ANNOUNCE( SRWIN ); +HB_CODEPAGE_INIT( SRWIN ); -HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_SRWIN ) - hb_cdpRegister( &s_codepage ); -HB_CALL_ON_STARTUP_END( hb_codepage_Init_SRWIN ) #if ! defined(__GNUC__) && ! defined(_MSC_VER) #pragma startup hb_codepage_Init_SRWIN #endif diff --git a/harbour/source/lang/Makefile b/harbour/source/lang/Makefile index 49a1c2aa44..4336e118b4 100644 --- a/harbour/source/lang/Makefile +++ b/harbour/source/lang/Makefile @@ -12,6 +12,8 @@ C_SOURCES=\ msgcswin.c \ msgde.c \ msgdewin.c \ + msgel.c \ + msgelwin.c \ msgen.c \ msgeo.c \ msges.c \ diff --git a/harbour/source/lang/msgel.c b/harbour/source/lang/msgel.c new file mode 100644 index 0000000000..0acf8cef57 --- /dev/null +++ b/harbour/source/lang/msgel.c @@ -0,0 +1,206 @@ +/* + * Harbour Project source code: + * Language Support Module (EL) + * + * Copyright 2004 Pete Dionisopoulos + * 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. + * + */ + +/* Language name: Greek */ +/* ISO language code (2 chars): EL */ +/* Codepage: 737 */ + +#include "hbapilng.h" + +static HB_LANG s_lang = +{ + { + /* Identification */ + + "EL", /* ID */ + "Greek", /* Name (in English) */ + "", /* Name (in native language) */ + "EL", /* RFC ID */ + "737", /* Codepage */ + "$Revision$ $Date$", /* Version */ + + /* Month names */ + + "ᨠ", + "ᨠ", + "ᨫ", + "墠", + "䦪", + "礠", + "碠", + "皦", + "⣙", + "陨", + "⣙", + "⣙", + + /* Day names */ + + "", + "⨘", + "嫞", + "ᨫ", + "⣧", + "", + "ᙙ", + + /* CA-Cl*pper compatible natmsg items */ + + " # .ਫ਼ .", + "櫜 嚣; ", + "囘 ", + "** *", + "* 礦 *", + "***礦 ***", + "", + " ", + " ", + "稦: ", + " - ", + "N/O", + " ", + + /* Error description names */ + + "੫ ៦", + "Argument error", + "Bound error", + "String overflow", + "Numeric overflow", + "Zero divisor", + "Numeric error", + "Syntax error", + "Operation too complex", + "", + "", + "Memory low", + "Undefined function", + "No exported method", + "Variable does not exist", + "Alias does not exist", + "No exported variable", + "Illegal characters in alias", + "Alias already in use", + "", + "Create error", + "Open error", + "Close error", + "៦ ᚤਫ਼", + "៦ ", + "៦ ਫ਼", + "", + "", + "", + "", + "Operation not supported", + "Limit exceeded", + "Corruption detected", + "Data type error", + "Data width error", + "Workarea not in use", + "Workarea not indexed", + "Exclusive required", + "Lock required", + "Write not allowed", + "Append lock failed", + "Lock Failure", + "", + "", + "", + "", + "array access", + "array assign", + "array dimension", + "not an array", + "conditional", + + /* Internal error names */ + + "Unrecoverable error %lu: ", + "Error recovery failure", + "No ERRORBLOCK() for error", + "Too many recursive error handler calls", + "RDD invalid or failed to load", + "Invalid method type from %s", + "hb_xgrab can't allocate memory", + "hb_xrealloc called with a NULL pointer", + "hb_xrealloc called with an invalid pointer", + "hb_xrealloc can't reallocate memory", + "hb_xfree called with an invalid pointer", + "hb_xfree called with a NULL pointer", + "Can\'t locate the starting procedure: \'%s\'", + "No starting procedure", + "Unsupported VM opcode", + "Symbol item expected from %s", + "Invalid symbol type for self from %s", + "Codeblock expected from %s", + "Incorrect item type on the stack trying to pop from %s", + "Stack underflow", + "An item was going to be copied to itself from %s", + "Invalid symbol item passed as memvar %s", + "Memory buffer overflow", + "hb_xgrab requested to allocate zero bytes", + "hb_xrealloc requested to resize to zero bytes", + "hb_xalloc requested to allocate zero bytes", + + /* Texts */ + + "DD/MM/YYYY", + "", + "" + } +}; + +HB_LANG_ANNOUNCE( EL ); + +HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_EL ) + hb_langRegister( &s_lang ); +HB_CALL_ON_STARTUP_END( hb_lang_Init_EL ) +#if ! defined(__GNUC__) && ! defined(_MSC_VER) + #pragma startup hb_lang_Init_EL +#endif diff --git a/harbour/source/rdd/dbf1.c b/harbour/source/rdd/dbf1.c index fe881f880e..66b496f9f8 100644 --- a/harbour/source/rdd/dbf1.c +++ b/harbour/source/rdd/dbf1.c @@ -1069,7 +1069,7 @@ static ERRCODE hb_dbfGetValue( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) case HB_IT_STRING: hb_itemPutCL( pItem, ( char * ) pArea->pRecord + pArea->pFieldOffset[ uiIndex ], pField->uiLen ); - hb_cdpTranslate( pItem->item.asString.value, pArea->cdPage, hb_cdp_page ); + hb_cdpnTranslate( pItem->item.asString.value, pArea->cdPage, hb_cdp_page, pField->uiLen ); break; case HB_IT_LOGICAL: diff --git a/harbour/source/rdd/dbfdbt/dbfdbt1.c b/harbour/source/rdd/dbfdbt/dbfdbt1.c index 448c757871..4c34e47d55 100644 --- a/harbour/source/rdd/dbfdbt/dbfdbt1.c +++ b/harbour/source/rdd/dbfdbt/dbfdbt1.c @@ -346,7 +346,7 @@ static void hb_dbtGetMemo( DBTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) hb_itemPutCPtr( pItem, ( char * ) pBuffer, ulSize ); #ifndef HB_CDP_SUPPORT_OFF - hb_cdpTranslate( pItem->item.asString.value, pArea->cdPage, hb_cdp_page ); + hb_cdpnTranslate( pItem->item.asString.value, pArea->cdPage, hb_cdp_page, pItem->item.asString.length ); #endif hb_itemSetCMemo( pItem ); } @@ -382,13 +382,13 @@ static void hb_dbtWriteMemo( DBTAREAP pArea, ULONG ulBlock, PHB_ITEM pItem, ULON * ulStoredBlock = ulNewBlock; #ifndef HB_CDP_SUPPORT_OFF - hb_cdpTranslate( pItem->item.asString.value, hb_cdp_page, pArea->cdPage ); + hb_cdpnTranslate( pItem->item.asString.value, hb_cdp_page, pArea->cdPage, pItem->item.asString.length ); #endif /* Write memo data and eof mark */ hb_fsWriteLarge( pArea->hMemoFile, ( BYTE * ) hb_itemGetCPtr( pItem ), ulLen ); hb_fsWrite( pArea->hMemoFile, pBlock, ( DBT_BLOCKSIZE - ( USHORT ) ( ulLen % DBT_BLOCKSIZE ) ) ); #ifndef HB_CDP_SUPPORT_OFF - hb_cdpTranslate( pItem->item.asString.value, pArea->cdPage, hb_cdp_page ); + hb_cdpnTranslate( pItem->item.asString.value, pArea->cdPage, hb_cdp_page, pItem->item.asString.length ); #endif if( bNewBlock )