From c5587de21bd934d421b6c3603ab23bdd34b4bca4 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 8 Dec 2009 11:03:40 +0000 Subject: [PATCH] 2009-12-08 12:02 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * include/Makefile + include/hbwinuni.h * contrib/hbwin/wapi_shellapi.c * include/hbwince.h + Moved new UNICODE translation macros to separate header. --- harbour/ChangeLog | 7 +++ harbour/contrib/hbwin/wapi_shellapi.c | 2 +- harbour/include/Makefile | 1 + harbour/include/hbwince.h | 12 ----- harbour/include/hbwinuni.h | 78 +++++++++++++++++++++++++++ 5 files changed, 87 insertions(+), 13 deletions(-) create mode 100644 harbour/include/hbwinuni.h diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 53eb4318ff..d128697a19 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,13 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-12-08 12:02 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * include/Makefile + + include/hbwinuni.h + * contrib/hbwin/wapi_shellapi.c + * include/hbwince.h + + Moved new UNICODE translation macros to separate header. + 2009-12-08 11:43 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * src/macro/Makefile - src/macro/macro.l diff --git a/harbour/contrib/hbwin/wapi_shellapi.c b/harbour/contrib/hbwin/wapi_shellapi.c index ac804ec5e0..02cc641e8f 100644 --- a/harbour/contrib/hbwin/wapi_shellapi.c +++ b/harbour/contrib/hbwin/wapi_shellapi.c @@ -53,7 +53,7 @@ #define HB_OS_WIN_USED #include "hbapi.h" -#include "hbapistr.h" +#include "hbwinuni.h" #include diff --git a/harbour/include/Makefile b/harbour/include/Makefile index 197c43773b..17d08b7963 100644 --- a/harbour/include/Makefile +++ b/harbour/include/Makefile @@ -63,6 +63,7 @@ C_HEADERS := \ hbvmpub.h \ hbxvm.h \ hbwince.h \ + hbwinuni.h \ hbzlib.h \ hb_io.h \ diff --git a/harbour/include/hbwince.h b/harbour/include/hbwince.h index 92dca63a0f..96f7e243df 100644 --- a/harbour/include/hbwince.h +++ b/harbour/include/hbwince.h @@ -201,12 +201,6 @@ extern HB_EXPORT void hb_wctombget( char *dstA, const wchar_t *srcW, unsigned lo #if defined( UNICODE ) - #define HB_PARSTR( n, h, len ) hb_parstr_u16( n, HB_CDP_ENDIAN_NATIVE, h, len ) - #define HB_RETSTR( str ) hb_retstr_u16( HB_CDP_ENDIAN_NATIVE, str ) - #define HB_RETSTRLEN( str, len ) hb_retstr_u16( HB_CDP_ENDIAN_NATIVE, str, len ) - #define HB_STORSTR( str, n ) hb_storstr_u16( HB_CDP_ENDIAN_NATIVE, str, n ) - #define HB_STORSTRLEN( str, len, n ) hb_storstrlen_u16( HB_CDP_ENDIAN_NATIVE, str, len, n ) - #define HB_TCHAR_CPTO(d,s,l) hb_mbtowccpy(d,s,l) #define HB_TCHAR_GETFROM(d,s,l) hb_wctombget(d,s,l) #define HB_TCHAR_SETTO(d,s,l) hb_mbtowcset(d,s,l) @@ -219,12 +213,6 @@ extern HB_EXPORT void hb_wctombget( char *dstA, const wchar_t *srcW, unsigned lo #else - #define HB_PARSTR( n, h, len ) hb_parstr( n, hb_setGetOSCP(), h, len ) - #define HB_RETSTR( str ) hb_retstr( hb_setGetOSCP(), str ) - #define HB_RETSTRLEN( str, len ) hb_retstr( hb_setGetOSCP(), str, len ) - #define HB_STORSTR( str, n ) hb_storstr( hb_setGetOSCP(), str, n ) - #define HB_STORSTRLEN( str, len, n ) hb_storstrlen( hb_setGetOSCP(), str, len, n ) - #define HB_TCHAR_CPTO(d,s,l) hb_strncpy(d,s,l) #define HB_TCHAR_SETTO(d,s,l) memcpy(d,s,l) #define HB_TCHAR_GETFROM(d,s,l) memcpy(d,s,l) diff --git a/harbour/include/hbwinuni.h b/harbour/include/hbwinuni.h new file mode 100644 index 0000000000..c1d77d8cbb --- /dev/null +++ b/harbour/include/hbwinuni.h @@ -0,0 +1,78 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * Windows UNICODE helper macros + * + * Copyright 2009 Viktor Szakats (harbour.01 syenar.hu) + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ + +#ifndef HB_WINUNI_H_ +#define HB_WINUNI_H_ + +#include "hbapistr.h" + +#if defined( HB_OS_WIN ) + +#include "hbset.h" + +#if defined( UNICODE ) + #define HB_PARSTR( n, h, len ) hb_parstr_u16( n, HB_CDP_ENDIAN_NATIVE, h, len ) + #define HB_RETSTR( str ) hb_retstr_u16( HB_CDP_ENDIAN_NATIVE, str ) + #define HB_RETSTRLEN( str, len ) hb_retstr_u16( HB_CDP_ENDIAN_NATIVE, str, len ) + #define HB_STORSTR( str, n ) hb_storstr_u16( HB_CDP_ENDIAN_NATIVE, str, n ) + #define HB_STORSTRLEN( str, len, n ) hb_storstrlen_u16( HB_CDP_ENDIAN_NATIVE, str, len, n ) +#else + #define HB_PARSTR( n, h, len ) hb_parstr( n, hb_setGetOSCP(), h, len ) + #define HB_RETSTR( str ) hb_retstr( hb_setGetOSCP(), str ) + #define HB_RETSTRLEN( str, len ) hb_retstr( hb_setGetOSCP(), str, len ) + #define HB_STORSTR( str, n ) hb_storstr( hb_setGetOSCP(), str, n ) + #define HB_STORSTRLEN( str, len, n ) hb_storstrlen( hb_setGetOSCP(), str, len, n ) +#endif + +#endif /* HB_OS_WIN */ + +#endif /* HB_WINUNI_H_ */