Kevin Puetz : wtypes.idl: Support OLESTR macro with non-native wchar_t.

Alexandre Julliard julliard at winehq.org
Thu Feb 13 15:36:29 CST 2020


Module: wine
Branch: master
Commit: 3bc14e79ebdf2d810bddefadea3d50a1e43fcf89
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3bc14e79ebdf2d810bddefadea3d50a1e43fcf89

Author: Kevin Puetz <PuetzKevinA at JohnDeere.com>
Date:   Thu Feb 13 11:36:05 2020 +0100

wtypes.idl: Support OLESTR macro with non-native wchar_t.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 include/wtypes.idl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/wtypes.idl b/include/wtypes.idl
index 032d64b984..a6682212b5 100644
--- a/include/wtypes.idl
+++ b/include/wtypes.idl
@@ -287,7 +287,11 @@ typedef WCHAR OLECHAR;
 typedef [string] OLECHAR *LPOLESTR;
 typedef [string] const OLECHAR *LPCOLESTR;
 cpp_quote("#ifndef __WINESRC__")
-cpp_quote("#define OLESTR(str) L##str")
+cpp_quote("# ifdef WINE_UNICODE_NATIVE")
+cpp_quote("#  define OLESTR(str) L##str")
+cpp_quote("# else")
+cpp_quote("#  define OLESTR(str) u##str")
+cpp_quote("# endif")
 cpp_quote("#endif")
 
 typedef LONG SCODE;




More information about the wine-cvs mailing list