2009-10-30 17:54 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

* harbour/src/common/hbffind.c * small buffer size fix * harbour/src/rtl/cdpapi.c * harbour/include/hbapicdp.h + added HB_WCAHR * changed USHORT to HB_WCHAR * harbour/src/codepage/ucmacce.c * harbour/src/codepage/uckoi8.c * harbour/src/codepage/uc885910.c * harbour/src/codepage/ucmacice.c * harbour/src/codepage/uc885914.c * harbour/src/codepage/uc874.c * harbour/src/codepage/uc857.c * harbour/src/codepage/uc1250.c * harbour/src/codepage/uc1254.c * harbour/src/codepage/uc1258.c * harbour/src/codepage/uckoi8u.c * harbour/src/codepage/uckam.c * harbour/src/codepage/uc424.c * harbour/src/codepage/ucmacrom.c * harbour/src/codepage/uc862.c * harbour/src/codepage/uc866.c * harbour/src/codepage/uc8859_3.c * harbour/src/codepage/uc8859_7.c * harbour/src/codepage/ucmacgrk.c * harbour/src/codepage/uc037.c * harbour/src/codepage/uc850.c * harbour/src/codepage/uc885911.c * harbour/src/codepage/uc885915.c * harbour/src/codepage/uc875.c * harbour/src/codepage/uc1251.c * harbour/src/codepage/uc1255.c * harbour/src/codepage/uc863.c * harbour/src/codepage/ucmaz.c * harbour/src/codepage/uc1026.c * harbour/src/codepage/uc8859_4.c * harbour/src/codepage/uc8859_8.c * harbour/src/codepage/uc855.c * harbour/src/codepage/uc885916.c * harbour/src/codepage/ucascii.c * harbour/src/codepage/uc1252.c * harbour/src/codepage/uc1256.c * harbour/src/codepage/ucatari.c * harbour/src/codepage/uc860.c * harbour/src/codepage/ucmaccyr.c * harbour/src/codepage/ucmik.c * harbour/src/codepage/uc864.c * harbour/src/codepage/uc1006.c * harbour/src/codepage/uc1125.c * harbour/src/codepage/uc8859_1.c * harbour/src/codepage/uc88591b.c * harbour/src/codepage/uc8859_5.c * harbour/src/codepage/uc8859_9.c * harbour/src/codepage/uc852.c * harbour/src/codepage/ucnext.c * harbour/src/codepage/uc737.c * harbour/src/codepage/uc885913.c * harbour/src/codepage/ucmactrk.c * harbour/src/codepage/uc856.c * harbour/src/codepage/uc775.c * harbour/src/codepage/uc1253.c * harbour/src/codepage/uc1257.c * harbour/src/codepage/uc500.c * harbour/src/codepage/uc861.c * harbour/src/codepage/uc865.c * harbour/src/codepage/uc869.c * harbour/src/codepage/uc8859_2.c * harbour/src/codepage/uc8859_6.c * changed USHORT to HB_WCHAR
2009-10-30 16:56:47 +00:00
parent 48c7f008ce
commit ec05ab3c34
66 changed files with 180 additions and 105 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,79 @@
   past entries belonging to author(s): Viktor Szakats.
 */

+2009-10-30 17:54 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/src/common/hbffind.c
+    * small buffer size fix
+
+  * harbour/src/rtl/cdpapi.c
+  * harbour/include/hbapicdp.h
+    + added HB_WCAHR
+    * changed USHORT to HB_WCHAR
+
+  * harbour/src/codepage/ucmacce.c
+  * harbour/src/codepage/uckoi8.c
+  * harbour/src/codepage/uc885910.c
+  * harbour/src/codepage/ucmacice.c
+  * harbour/src/codepage/uc885914.c
+  * harbour/src/codepage/uc874.c
+  * harbour/src/codepage/uc857.c
+  * harbour/src/codepage/uc1250.c
+  * harbour/src/codepage/uc1254.c
+  * harbour/src/codepage/uc1258.c
+  * harbour/src/codepage/uckoi8u.c
+  * harbour/src/codepage/uckam.c
+  * harbour/src/codepage/uc424.c
+  * harbour/src/codepage/ucmacrom.c
+  * harbour/src/codepage/uc862.c
+  * harbour/src/codepage/uc866.c
+  * harbour/src/codepage/uc8859_3.c
+  * harbour/src/codepage/uc8859_7.c
+  * harbour/src/codepage/ucmacgrk.c
+  * harbour/src/codepage/uc037.c
+  * harbour/src/codepage/uc850.c
+  * harbour/src/codepage/uc885911.c
+  * harbour/src/codepage/uc885915.c
+  * harbour/src/codepage/uc875.c
+  * harbour/src/codepage/uc1251.c
+  * harbour/src/codepage/uc1255.c
+  * harbour/src/codepage/uc863.c
+  * harbour/src/codepage/ucmaz.c
+  * harbour/src/codepage/uc1026.c
+  * harbour/src/codepage/uc8859_4.c
+  * harbour/src/codepage/uc8859_8.c
+  * harbour/src/codepage/uc855.c
+  * harbour/src/codepage/uc885916.c
+  * harbour/src/codepage/ucascii.c
+  * harbour/src/codepage/uc1252.c
+  * harbour/src/codepage/uc1256.c
+  * harbour/src/codepage/ucatari.c
+  * harbour/src/codepage/uc860.c
+  * harbour/src/codepage/ucmaccyr.c
+  * harbour/src/codepage/ucmik.c
+  * harbour/src/codepage/uc864.c
+  * harbour/src/codepage/uc1006.c
+  * harbour/src/codepage/uc1125.c
+  * harbour/src/codepage/uc8859_1.c
+  * harbour/src/codepage/uc88591b.c
+  * harbour/src/codepage/uc8859_5.c
+  * harbour/src/codepage/uc8859_9.c
+  * harbour/src/codepage/uc852.c
+  * harbour/src/codepage/ucnext.c
+  * harbour/src/codepage/uc737.c
+  * harbour/src/codepage/uc885913.c
+  * harbour/src/codepage/ucmactrk.c
+  * harbour/src/codepage/uc856.c
+  * harbour/src/codepage/uc775.c
+  * harbour/src/codepage/uc1253.c
+  * harbour/src/codepage/uc1257.c
+  * harbour/src/codepage/uc500.c
+  * harbour/src/codepage/uc861.c
+  * harbour/src/codepage/uc865.c
+  * harbour/src/codepage/uc869.c
+  * harbour/src/codepage/uc8859_2.c
+  * harbour/src/codepage/uc8859_6.c
+    * changed USHORT to HB_WCHAR
+
 2009-10-30 17:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
  * INSTALL
    * Minor fix to UPX supported platforms.
--- a/harbour/include/hbapicdp.h
+++ b/harbour/include/hbapicdp.h
@@ -74,13 +74,14 @@ HB_EXTERN_BEGIN
                                       hb_cdpRegister( &s_codepage ); \
                                       HB_CALL_ON_STARTUP_END( hb_codepage_Init_##id )

+typedef USHORT    HB_WCHAR;

 typedef struct _HB_UNITABLE
 {
   const char *   uniID;
   int            nChars;
   BOOL           lMulti;
-   USHORT *       uniCodes;
+   HB_WCHAR *     uniCodes;
 } HB_UNITABLE, * PHB_UNITABLE;

 typedef struct _HB_MULTICHAR
@@ -327,13 +328,13 @@ extern HB_EXPORT ULONG         hb_cdpnDup2Len( const char *, ULONG, ULONG, PHB_C
 extern HB_EXPORT void          hb_cdpTranslate( char *, PHB_CODEPAGE, PHB_CODEPAGE );
 extern HB_EXPORT void          hb_cdpnTranslate( char *, PHB_CODEPAGE, PHB_CODEPAGE, ULONG );

-extern HB_EXPORT USHORT        hb_cdpGetU16( PHB_CODEPAGE, BOOL, UCHAR );
-extern HB_EXPORT UCHAR         hb_cdpGetChar( PHB_CODEPAGE, BOOL, USHORT );
-extern HB_EXPORT BOOL          hb_cdpGetFromUTF8( PHB_CODEPAGE, BOOL, UCHAR, int *, USHORT * );
+extern HB_EXPORT HB_WCHAR      hb_cdpGetU16( PHB_CODEPAGE, BOOL, UCHAR );
+extern HB_EXPORT UCHAR         hb_cdpGetChar( PHB_CODEPAGE, BOOL, HB_WCHAR );
+extern HB_EXPORT BOOL          hb_cdpGetFromUTF8( PHB_CODEPAGE, BOOL, UCHAR, int *, HB_WCHAR * );
 extern HB_EXPORT ULONG         hb_cdpStrnToUTF8( PHB_CODEPAGE, BOOL, const char *, ULONG, char * );
 extern HB_EXPORT ULONG         hb_cdpStrnToUTF8n( PHB_CODEPAGE, BOOL, const char *, ULONG, char *, ULONG );
-extern HB_EXPORT ULONG         hb_cdpStrnToU16( PHB_CODEPAGE, BOOL, const char *, ULONG, char * );
-extern HB_EXPORT ULONG         hb_cdpStrnToU16LE( PHB_CODEPAGE, BOOL, const char *, ULONG, char * );
+extern HB_EXPORT ULONG         hb_cdpStrnToU16( PHB_CODEPAGE, BOOL, const char *, ULONG, HB_WCHAR * );
+extern HB_EXPORT ULONG         hb_cdpStrnToU16LE( PHB_CODEPAGE, BOOL, const char *, ULONG, HB_WCHAR * );
 extern HB_EXPORT ULONG         hb_cdpStringInU16Length( PHB_CODEPAGE, BOOL, const char *, ULONG );
 extern HB_EXPORT ULONG         hb_cdpStringInUTF8Length( PHB_CODEPAGE, BOOL, const char *, ULONG );
 extern HB_EXPORT ULONG         hb_cdpStringInUTF8Length2( PHB_CODEPAGE, BOOL, const char *, ULONG, ULONG );
--- a/harbour/src/codepage/uc037.c
+++ b/harbour/src/codepage/uc037.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc1006.c
+++ b/harbour/src/codepage/uc1006.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc1026.c
+++ b/harbour/src/codepage/uc1026.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc1125.c
+++ b/harbour/src/codepage/uc1125.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc1250.c
+++ b/harbour/src/codepage/uc1250.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc1251.c
+++ b/harbour/src/codepage/uc1251.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc1252.c
+++ b/harbour/src/codepage/uc1252.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc1253.c
+++ b/harbour/src/codepage/uc1253.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc1254.c
+++ b/harbour/src/codepage/uc1254.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc1255.c
+++ b/harbour/src/codepage/uc1255.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc1256.c
+++ b/harbour/src/codepage/uc1256.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc1257.c
+++ b/harbour/src/codepage/uc1257.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc1258.c
+++ b/harbour/src/codepage/uc1258.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc424.c
+++ b/harbour/src/codepage/uc424.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc500.c
+++ b/harbour/src/codepage/uc500.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc737.c
+++ b/harbour/src/codepage/uc737.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc775.c
+++ b/harbour/src/codepage/uc775.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc850.c
+++ b/harbour/src/codepage/uc850.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc852.c
+++ b/harbour/src/codepage/uc852.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc855.c
+++ b/harbour/src/codepage/uc855.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc856.c
+++ b/harbour/src/codepage/uc856.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc857.c
+++ b/harbour/src/codepage/uc857.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc860.c
+++ b/harbour/src/codepage/uc860.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc861.c
+++ b/harbour/src/codepage/uc861.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc862.c
+++ b/harbour/src/codepage/uc862.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc863.c
+++ b/harbour/src/codepage/uc863.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc864.c
+++ b/harbour/src/codepage/uc864.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc865.c
+++ b/harbour/src/codepage/uc865.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc866.c
+++ b/harbour/src/codepage/uc866.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc869.c
+++ b/harbour/src/codepage/uc869.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc874.c
+++ b/harbour/src/codepage/uc874.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc875.c
+++ b/harbour/src/codepage/uc875.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc885910.c
+++ b/harbour/src/codepage/uc885910.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc885911.c
+++ b/harbour/src/codepage/uc885911.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc885913.c
+++ b/harbour/src/codepage/uc885913.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc885914.c
+++ b/harbour/src/codepage/uc885914.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc885915.c
+++ b/harbour/src/codepage/uc885915.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc885916.c
+++ b/harbour/src/codepage/uc885916.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc88591b.c
+++ b/harbour/src/codepage/uc88591b.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc8859_1.c
+++ b/harbour/src/codepage/uc8859_1.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc8859_2.c
+++ b/harbour/src/codepage/uc8859_2.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc8859_3.c
+++ b/harbour/src/codepage/uc8859_3.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc8859_4.c
+++ b/harbour/src/codepage/uc8859_4.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc8859_5.c
+++ b/harbour/src/codepage/uc8859_5.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc8859_6.c
+++ b/harbour/src/codepage/uc8859_6.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc8859_7.c
+++ b/harbour/src/codepage/uc8859_7.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc8859_8.c
+++ b/harbour/src/codepage/uc8859_8.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uc8859_9.c
+++ b/harbour/src/codepage/uc8859_9.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/ucascii.c
+++ b/harbour/src/codepage/ucascii.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/ucatari.c
+++ b/harbour/src/codepage/ucatari.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uckam.c
+++ b/harbour/src/codepage/uckam.c
@@ -56,7 +56,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uckoi8.c
+++ b/harbour/src/codepage/uckoi8.c
@@ -56,7 +56,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/uckoi8u.c
+++ b/harbour/src/codepage/uckoi8u.c
@@ -56,7 +56,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/ucmacce.c
+++ b/harbour/src/codepage/ucmacce.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/ucmaccyr.c
+++ b/harbour/src/codepage/ucmaccyr.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/ucmacgrk.c
+++ b/harbour/src/codepage/ucmacgrk.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/ucmacice.c
+++ b/harbour/src/codepage/ucmacice.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/ucmacrom.c
+++ b/harbour/src/codepage/ucmacrom.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/ucmactrk.c
+++ b/harbour/src/codepage/ucmactrk.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/ucmaz.c
+++ b/harbour/src/codepage/ucmaz.c
@@ -56,7 +56,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/ucmik.c
+++ b/harbour/src/codepage/ucmik.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/codepage/ucnext.c
+++ b/harbour/src/codepage/ucnext.c
@@ -55,7 +55,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
--- a/harbour/src/common/hbffind.c
+++ b/harbour/src/common/hbffind.c
@@ -533,10 +533,11 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind )
            ffind->bFirst = FALSE;
            ffind->szName[ 0 ] = '\0';

-            bFound = GetVolumeInformation( lpFileMask, szName, sizeof( szName ) - 1, NULL, NULL, NULL, NULL, 0 );
+            bFound = GetVolumeInformation( lpFileMask, szName, sizeof( szName ), NULL, NULL, NULL, NULL, 0 );

            HB_TCHAR_FREE( lpFileMask );
            HB_TCHAR_GETFROM( ffind->szName, szName, sizeof( ffind->szName ) );
+            ffind->szName[ sizeof( ffind->szName ) - 1 ] = '\0';
         }
 #endif
      }
--- a/harbour/src/rtl/cdpapi.c
+++ b/harbour/src/rtl/cdpapi.c
@@ -71,7 +71,7 @@

 #define NUMBER_OF_CHARS    256

-static USHORT s_uniCodes[ NUMBER_OF_CHARS ] =
+static HB_WCHAR s_uniCodes[ NUMBER_OF_CHARS ] =
 {
   0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
   0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
@@ -120,7 +120,7 @@ static PHB_CODEPAGE s_cdpList[HB_CDP_MAX_] = { &s_en_codepage };
 static HB_CODEPAGE s_utf8_codepage =
   { "UTF8", HB_CPID_437, HB_UNITB_437, 0, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, 0, NULL };

-static int utf8Size( USHORT uc )
+static int utf8Size( HB_WCHAR uc )
 {
   if( uc < 0x0080 )
      return 1;
@@ -130,7 +130,7 @@ static int utf8Size( USHORT uc )
      return 3;
 }

-static int u16toutf8( char * szUTF8, USHORT uc )
+static int u16toutf8( char * szUTF8, HB_WCHAR uc )
 {
   int n;

@@ -161,7 +161,7 @@ static int u16toutf8( char * szUTF8, USHORT uc )
   return n;
 }

-static BOOL utf8tou16nextchar( UCHAR ucChar, int *n, USHORT * uc )
+static BOOL utf8tou16nextchar( UCHAR ucChar, int *n, HB_WCHAR * uc )
 {
   if( *n > 0 )
   {
@@ -206,7 +206,7 @@ static BOOL utf8tou16nextchar( UCHAR ucChar, int *n, USHORT * uc )
 }

 #   if 0                        /* currently unused, it will in the future */
-static int utf8tou16( const char * szUTF8, USHORT * uc )
+static int utf8tou16( const char * szUTF8, HB_WCHAR * uc )
 {
   int n = 1, m = 1;
   UINT32 u32;
@@ -249,7 +249,7 @@ static int utf8tou16( const char * szUTF8, USHORT * uc )
      }
   }

-   *uc = ( USHORT ) u32;
+   *uc = ( HB_WCHAR ) u32;
   return n;
 }
 #   endif
@@ -259,7 +259,7 @@ static ULONG utf8pos( const char * szUTF8, ULONG ulLen, ULONG ulUTF8Pos )
   if( ulUTF8Pos )
   {
      ULONG ul, ul2;
-      USHORT uc;
+      HB_WCHAR uc;
      int n = 0;

      for( ul = ul2 = 0; ul < ulLen; ++ul )
@@ -666,7 +666,7 @@ void hb_cdpnTranslate( char *psz, PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut, ULONG
   }
 }

-USHORT hb_cdpGetU16( PHB_CODEPAGE cdp, BOOL fCtrl, UCHAR ch )
+HB_WCHAR hb_cdpGetU16( PHB_CODEPAGE cdp, BOOL fCtrl, UCHAR ch )
 {
   if( ( fCtrl || ch >= 32 ) && cdp && cdp->uniTable &&
       cdp->uniTable->uniCodes && ch < cdp->uniTable->nChars )
@@ -675,7 +675,7 @@ USHORT hb_cdpGetU16( PHB_CODEPAGE cdp, BOOL fCtrl, UCHAR ch )
      return ch;
 }

-UCHAR hb_cdpGetChar( PHB_CODEPAGE cdp, BOOL fCtrl, USHORT uc )
+UCHAR hb_cdpGetChar( PHB_CODEPAGE cdp, BOOL fCtrl, HB_WCHAR uc )
 {
   if( ( fCtrl || uc >= 32 ) && cdp && cdp->uniTable && cdp->uniTable->uniCodes )
   {
@@ -685,7 +685,7 @@ UCHAR hb_cdpGetChar( PHB_CODEPAGE cdp, BOOL fCtrl, USHORT uc )
      {
         if( cdp->uniTable->uniCodes[ i ] == uc )
         {
-            uc = ( USHORT ) i;
+            uc = ( HB_WCHAR ) i;
            break;
         }
      }
@@ -698,7 +698,7 @@ char *hb_cdpUTF8StringSubstr( const char * pSrc, ULONG ulLen,
                              ULONG ulFrom, ULONG ulCount, ULONG * pulDest )
 {
   ULONG ul, ulCnt, ulDst = 0;
-   USHORT uc;
+   HB_WCHAR uc;
   int n;
   char *pDst = NULL;

@@ -747,7 +747,7 @@ ULONG hb_cdpUTF8StringPeek( const char * pSrc, ULONG ulLen, ULONG ulPos )
   if( ulLen )
   {
      ULONG ul;
-      USHORT uc = 0;
+      HB_WCHAR uc = 0;
      int n = 0;

      for( ul = 0; ul < ulLen && ulPos; ++ul )
@@ -780,7 +780,7 @@ ULONG hb_cdpUTF8StringPeek( const char * pSrc, ULONG ulLen, ULONG ulPos )
 ULONG hb_cdpUTF8StringLength( const char * pSrc, ULONG ulLen )
 {
   ULONG ul, ulDst;
-   USHORT uc;
+   HB_WCHAR uc;
   int n = 0;

   for( ul = ulDst = 0; ul < ulLen; ++ul )
@@ -830,7 +830,7 @@ ULONG hb_cdpUTF8ToStrn( PHB_CODEPAGE cdp, BOOL fCtrl,
                        char * pDst, ULONG ulDst )
 {
   ULONG ulS, ulD;
-   USHORT uc = 0;
+   HB_WCHAR uc = 0;
   int n = 0;

   for( ulS = ulD = 0; ulS < ulSrc; ++ulS )
@@ -849,7 +849,7 @@ ULONG hb_cdpUTF8ToStrn( PHB_CODEPAGE cdp, BOOL fCtrl,
                  {
                     if( cdp->uniTable->uniCodes[ i ] == uc )
                     {
-                        uc = ( USHORT ) i;
+                        uc = ( HB_WCHAR ) i;
                        break;
                     }
                  }
@@ -868,7 +868,7 @@ ULONG hb_cdpUTF8ToStrn( PHB_CODEPAGE cdp, BOOL fCtrl,
 }

 BOOL hb_cdpGetFromUTF8( PHB_CODEPAGE cdp, BOOL fCtrl, UCHAR ch,
-                        int *n, USHORT * uc )
+                        int *n, HB_WCHAR * uc )
 {
   if( utf8tou16nextchar( ch, n, uc ) )
   {
@@ -880,7 +880,7 @@ BOOL hb_cdpGetFromUTF8( PHB_CODEPAGE cdp, BOOL fCtrl, UCHAR ch,
         {
            if( cdp->uniTable->uniCodes[ i ] == *uc )
            {
-               *uc = ( USHORT ) i;
+               *uc = ( HB_WCHAR ) i;
               break;
            }
         }
@@ -893,7 +893,7 @@ BOOL hb_cdpGetFromUTF8( PHB_CODEPAGE cdp, BOOL fCtrl, UCHAR ch,
 ULONG hb_cdpStrnToUTF8( PHB_CODEPAGE cdp, BOOL fCtrl,
                        const char * pSrc, ULONG ulLen, char * pDst )
 {
-   USHORT u, *uniCodes, nChars;
+   HB_WCHAR u, *uniCodes, nChars;
   ULONG i, n;

   if( cdp && cdp->uniTable )
@@ -914,7 +914,7 @@ ULONG hb_cdpStrnToUTF8( PHB_CODEPAGE cdp, BOOL fCtrl,
      else
      {
         uniCodes = cdp->uniTable->uniCodes;
-         nChars = ( USHORT ) cdp->uniTable->nChars;
+         nChars = ( HB_WCHAR ) cdp->uniTable->nChars;
      }
   }
   else
@@ -939,7 +939,7 @@ ULONG hb_cdpStrnToUTF8n( PHB_CODEPAGE cdp, BOOL fCtrl,
                         const char * pSrc, ULONG ulLen,
                         char * pDst, ULONG ulDst )
 {
-   USHORT u, *uniCodes, nChars;
+   HB_WCHAR u, *uniCodes, nChars;
   ULONG i, n, l;

   if( cdp && cdp->uniTable )
@@ -968,7 +968,7 @@ ULONG hb_cdpStrnToUTF8n( PHB_CODEPAGE cdp, BOOL fCtrl,
      else
      {
         uniCodes = cdp->uniTable->uniCodes;
-         nChars = ( USHORT ) cdp->uniTable->nChars;
+         nChars = ( HB_WCHAR ) cdp->uniTable->nChars;
      }
   }
   else
@@ -1015,9 +1015,9 @@ ULONG hb_cdpStringInU16Length( PHB_CODEPAGE cdp, BOOL fCtrl,
 }

 ULONG hb_cdpStrnToU16( PHB_CODEPAGE cdp, BOOL fCtrl,
-                       const char * pSrc, ULONG ulLen, char * pDst )
+                       const char * pSrc, ULONG ulLen, HB_WCHAR * pDst )
 {
-   USHORT u, *uniCodes, nChars;
+   HB_WCHAR u, *uniCodes, nChars;
   ULONG i;

   if( cdp && cdp->uniTable )
@@ -1027,7 +1027,7 @@ ULONG hb_cdpStrnToU16( PHB_CODEPAGE cdp, BOOL fCtrl,
         /*
          * TODO: this translation is bad, please fix me!!!
          */
-         for( i = 0; i < ulLen; i++, pDst += 2 )
+         for( i = 0; i < ulLen; i++, pDst++ )
         {
            u = hb_cdpGetU16( cdp, fCtrl, ( UCHAR ) pSrc[ i ] );
            HB_PUT_BE_UINT16( pDst, u );
@@ -1037,7 +1037,7 @@ ULONG hb_cdpStrnToU16( PHB_CODEPAGE cdp, BOOL fCtrl,
      else
      {
         uniCodes = cdp->uniTable->uniCodes;
-         nChars = ( USHORT ) cdp->uniTable->nChars;
+         nChars = ( HB_WCHAR ) cdp->uniTable->nChars;
      }
   }
   else
@@ -1046,20 +1046,20 @@ ULONG hb_cdpStrnToU16( PHB_CODEPAGE cdp, BOOL fCtrl,
      uniCodes = NULL;
   }

-   for( i = 0; i < ulLen; i++, pDst += 2 )
+   for( i = 0; i < ulLen; i++, pDst++ )
   {
      u = ( UCHAR ) pSrc[ i ];
      if( uniCodes && u < nChars && ( fCtrl || u >= 32 ) )
         u = uniCodes[ u ];
      HB_PUT_BE_UINT16( pDst, u );
   }
-   return i << 1;
+   return i;
 }

 ULONG hb_cdpStrnToU16LE( PHB_CODEPAGE cdp, BOOL fCtrl,
-                         const char * pSrc, ULONG ulLen, char * pDst )
+                         const char * pSrc, ULONG ulLen, HB_WCHAR * pDst )
 {
-   USHORT u, *uniCodes, nChars;
+   HB_WCHAR u, *uniCodes, nChars;
   ULONG i;

   if( cdp && cdp->uniTable )
@@ -1069,7 +1069,7 @@ ULONG hb_cdpStrnToU16LE( PHB_CODEPAGE cdp, BOOL fCtrl,
         /*
          * TODO: this translation is bad, please fix me!!!
          */
-         for( i = 0; i < ulLen; i++, pDst += 2 )
+         for( i = 0; i < ulLen; i++, pDst++ )
         {
            u = hb_cdpGetU16( cdp, fCtrl, ( UCHAR ) pSrc[ i ] );
            HB_PUT_LE_UINT16( pDst, u );
@@ -1079,7 +1079,7 @@ ULONG hb_cdpStrnToU16LE( PHB_CODEPAGE cdp, BOOL fCtrl,
      else
      {
         uniCodes = cdp->uniTable->uniCodes;
-         nChars = ( USHORT ) cdp->uniTable->nChars;
+         nChars = ( HB_WCHAR) cdp->uniTable->nChars;
      }
   }
   else
@@ -1088,14 +1088,14 @@ ULONG hb_cdpStrnToU16LE( PHB_CODEPAGE cdp, BOOL fCtrl,
      uniCodes = NULL;
   }

-   for( i = 0; i < ulLen; i++, pDst += 2 )
+   for( i = 0; i < ulLen; i++, pDst++ )
   {
      u = ( UCHAR ) pSrc[ i ];
      if( uniCodes && u < nChars && ( fCtrl || u >= 32 ) )
         u = uniCodes[ u ];
      HB_PUT_LE_UINT16( pDst, u );
   }
-   return i << 1;
+   return i;
 }

 ULONG hb_cdpnDupLen( const char * pszSrc, ULONG ulLen,
@@ -1672,7 +1672,7 @@ HB_FUNC( HB_UTF8CHR )
      char utf8Char[ HB_MAX_UTF8 ];
      int iLen;

-      iLen = u16toutf8( utf8Char, ( USHORT ) hb_parni( 1 ) );
+      iLen = u16toutf8( utf8Char, ( HB_WCHAR ) hb_parni( 1 ) );
      hb_retclen( utf8Char, iLen );
   }
   else
@@ -1826,11 +1826,11 @@ HB_FUNC( HB_UTF8POKE )
      ulPos = utf8pos( szString, ulLen, hb_parnl( 2 ) );
      if( ulPos )
      {
-         USHORT uc, uc2;
+         HB_WCHAR uc, uc2;
         int n, n2;

         --ulPos;
-         uc = ( USHORT ) hb_parni( 3 );
+         uc = ( HB_WCHAR ) hb_parni( 3 );
         n = utf8Size( uc );
         n2 = 0;
         utf8tou16nextchar( szString[ulPos], &n2, &uc2 );