[PATCH] winemac.drv: Use the public UTF-16 type for Unicode text.

Charles Davis cdavis5x at gmail.com
Tue Aug 20 22:49:55 CDT 2013


In the Windows world, "Unicode" almost universally means "UTF-16". So,
use the well-known UTF-16 type instead of making up our own.

I have to wonder if there was a good reason Ken didn't use this
initially.
---
 dlls/winemac.drv/clipboard.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c
index 53b1448..0227caa 100644
--- a/dlls/winemac.drv/clipboard.c
+++ b/dlls/winemac.drv/clipboard.c
@@ -164,9 +164,9 @@ static const struct
     { CF_TIFF,              CFSTR("public.tiff"),                           import_clipboard_data,          export_clipboard_data,      FALSE },
     { CF_WAVE,              CFSTR("com.microsoft.waveform-audio"),          import_clipboard_data,          export_clipboard_data,      FALSE },
 
-    { CF_UNICODETEXT,       CFSTR("org.winehq.builtin.unicodetext"),        import_clipboard_data,          export_clipboard_data,      FALSE },
-    { CF_TEXT,              CFSTR("org.winehq.builtin.unicodetext"),        import_unicodetext_to_text,     NULL,                       TRUE },
-    { CF_OEMTEXT,           CFSTR("org.winehq.builtin.unicodetext"),        import_unicodetext_to_oemtext,  NULL,                       TRUE },
+    { CF_UNICODETEXT,       CFSTR("public.utf16-plain-text"),               import_clipboard_data,          export_clipboard_data,      FALSE },
+    { CF_TEXT,              CFSTR("public.utf16-plain-text"),               import_unicodetext_to_text,     NULL,                       TRUE },
+    { CF_OEMTEXT,           CFSTR("public.utf16-plain-text"),               import_unicodetext_to_oemtext,  NULL,                       TRUE },
 
     { CF_TEXT,              CFSTR("org.winehq.builtin.text"),               import_clipboard_data,          export_clipboard_data,      FALSE },
     { CF_UNICODETEXT,       CFSTR("org.winehq.builtin.text"),               import_text_to_unicodetext,     NULL,                       TRUE },
-- 
1.7.5.4




More information about the wine-patches mailing list