include: Introduce WINE_UNICODE_CHAR16 that allows using char16_t as Windows WCHAR.

This is useful for winelib applications that don't use -fshort-wchar. They may use u"" for string literals and u16string. However, C++ has builtin char16_t type, so we need WCHAR to be compatible with that. Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

include: Introduce WINE_UNICODE_CHAR16 that allows using char16_t as Windows WCHAR.
c2679945 · Kevin Puetz · Alexandre Julliard · d1373e8a · c2679945 · c2679945
Commit c2679945 authored Feb 11, 2020 by Kevin Puetz Committed by Alexandre Julliard Feb 12, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 7 deletions

sqltypes.h include/sqltypes.h +3 -1

tchar.h include/tchar.h +3 -1

winnt.h include/winnt.h +6 -3

winnt.rh include/winnt.rh +4 -2

No files found.
--- a/include/sqltypes.h
+++ b/include/sqltypes.h
@@ -28,8 +28,10 @@ extern "C" {
 #endif
 typedef unsigned char   SQLCHAR;
-#ifdef WINE_UNICODE_NATIVE
+#if defined(WINE_UNICODE_NATIVE)
 typedef wchar_t         SQLWCHAR;
+#elif defined(WINE_UNICODE_CHAR16)
+typedef char16_t        SQLWCHAR;
 #else
 typedef unsigned short  SQLWCHAR;
 #endif

--- a/include/tchar.h
+++ b/include/tchar.h
@@ -244,8 +244,10 @@ typedef unsigned short wctype_t;
 #endif
 #ifndef __TCHAR_DEFINED
-#ifdef WINE_UNICODE_NATIVE
+#if defined(WINE_UNICODE_NATIVE)
 typedef wchar_t       _TCHAR;
+#elif defined(WINE_UNICODE_CHAR16)
+typedef char16_t      _TCHAR;
 #else
 typedef unsigned short _TCHAR;
 #endif

--- a/include/winnt.h
+++ b/include/winnt.h
@@ -463,11 +463,14 @@ typedef int             LONG,       *PLONG;
 #endif
 /* Some systems might have wchar_t, but we really need 16 bit characters */
-#ifdef WINE_UNICODE_NATIVE
+#if defined(WINE_UNICODE_NATIVE)
-typedef wchar_t         WCHAR,      *PWCHAR;
+typedef wchar_t         WCHAR;
+#elif defined(WINE_UNICODE_CHAR16)
+typedef char16_t        WCHAR;
 #else
-typedef unsigned short  WCHAR,      *PWCHAR;
+typedef unsigned short  WCHAR;
 #endif
+typedef WCHAR          *PWCHAR;
 typedef ULONG           UCSCHAR;
 #define MIN_UCSCHAR                 (0)

--- a/include/winnt.rh
+++ b/include/winnt.rh
@@ -24,10 +24,12 @@
 * macro which only exists in the user's code.
 */
 #ifndef WINE_NO_UNICODE_MACROS
-# ifdef UNICODE
+# ifndef UNICODE
+#  define __TEXT(string) string
+# elif defined(WINE_UNICODE_NATIVE)
 #  define __TEXT(string) L##string
 # else
-#  define __TEXT(string) string
+#  define __TEXT(string) u##string
 # endif
 # define TEXT(string) __TEXT(string)
 #endif