Module: wine Branch: master Commit: 0aa7d402d2326d8d3e3d79e9c498efa5106a660e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa7d402d2326d8d3e3d79e9c4...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Sep 27 21:41:31 2016 +0900
winex11: Remove support for exporting the CF_OEMTEXT and CF_LOCALE formats.
They can be synthesized from CF_UNICODETEXT.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/winex11.drv/clipboard.c | 2 -- dlls/winex11.drv/x11drv.h | 2 -- dlls/winex11.drv/x11drv_main.c | 2 -- 3 files changed, 6 deletions(-)
diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 776e579..314b916 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -157,14 +157,12 @@ static const struct { 0, CF_SYLK, XATOM_WCF_SYLK, import_data, export_data }, { 0, CF_DIF, XATOM_WCF_DIF, import_data, export_data }, { 0, CF_TIFF, XATOM_WCF_TIFF, import_data, export_data }, - { 0, CF_OEMTEXT, XATOM_WCF_OEMTEXT, import_data, export_data }, { 0, CF_DIB, XA_PIXMAP, import_pixmap, export_pixmap }, { 0, CF_PENDATA, XATOM_WCF_PENDATA, import_data, export_data }, { 0, CF_RIFF, XATOM_WCF_RIFF, import_data, export_data }, { 0, CF_WAVE, XATOM_WCF_WAVE, import_data, export_data }, { 0, CF_ENHMETAFILE, XATOM_WCF_ENHMETAFILE, import_enhmetafile, export_enhmetafile }, { 0, CF_HDROP, XATOM_text_uri_list, import_text_uri_list, export_hdrop }, - { 0, CF_LOCALE, XATOM_WCF_LOCALE, import_data, export_data }, { 0, CF_DIB, XATOM_image_bmp, import_image_bmp, export_image_bmp }, { RichTextFormatW, 0, XATOM_text_rtf, import_data, export_data }, { RichTextFormatW, 0, XATOM_text_richtext, import_data, export_data }, diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 2cf2ed5..116e9ae 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -461,8 +461,6 @@ enum x11drv_atoms XATOM_WCF_DIF, XATOM_WCF_ENHMETAFILE, XATOM_WCF_HDROP, - XATOM_WCF_LOCALE, - XATOM_WCF_OEMTEXT, XATOM_WCF_PENDATA, XATOM_WCF_RIFF, XATOM_WCF_SYLK, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 0b38b74..7e7835b 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -172,8 +172,6 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "WCF_DIF", "WCF_ENHMETAFILE", "WCF_HDROP", - "WCF_LOCALE", - "WCF_OEMTEXT", "WCF_PENDATA", "WCF_RIFF", "WCF_SYLK",