Alexandre Julliard : winex11: Remove support for owner-displayed clipboard formats.
Alexandre Julliard
julliard at winehq.org
Tue Sep 27 11:08:51 CDT 2016
Module: wine
Branch: master
Commit: 82dfbba5c6f79b3668cfe846ba5744635ac8caa6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=82dfbba5c6f79b3668cfe846ba5744635ac8caa6
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Sep 27 21:40:15 2016 +0900
winex11: Remove support for owner-displayed clipboard formats.
It cannot work across prefixes, and it didn't work previously either.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winex11.drv/clipboard.c | 5 -----
dlls/winex11.drv/x11drv.h | 5 -----
dlls/winex11.drv/x11drv_main.c | 5 -----
3 files changed, 15 deletions(-)
diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c
index 611ecee..63d11dd 100644
--- a/dlls/winex11.drv/clipboard.c
+++ b/dlls/winex11.drv/clipboard.c
@@ -171,11 +171,6 @@ static const struct
{ 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_DIBV5, XATOM_WCF_DIBV5, import_data, export_data },
- { 0, CF_OWNERDISPLAY, XATOM_WCF_OWNERDISPLAY, import_data, export_data },
- { 0, CF_DSPTEXT, XATOM_WCF_DSPTEXT, import_data, export_data },
- { 0, CF_DSPBITMAP, XATOM_WCF_DSPBITMAP, import_data, export_data },
- { 0, CF_DSPMETAFILEPICT, XATOM_WCF_DSPMETAFILEPICT, import_data, export_data },
- { 0, CF_DSPENHMETAFILE, XATOM_WCF_DSPENHMETAFILE, 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 d622468..ae0bc9c 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -462,16 +462,11 @@ enum x11drv_atoms
XATOM_WCF_DIB,
XATOM_WCF_DIBV5,
XATOM_WCF_DIF,
- XATOM_WCF_DSPBITMAP,
- XATOM_WCF_DSPENHMETAFILE,
- XATOM_WCF_DSPMETAFILEPICT,
- XATOM_WCF_DSPTEXT,
XATOM_WCF_ENHMETAFILE,
XATOM_WCF_HDROP,
XATOM_WCF_LOCALE,
XATOM_WCF_METAFILEPICT,
XATOM_WCF_OEMTEXT,
- XATOM_WCF_OWNERDISPLAY,
XATOM_WCF_PALETTE,
XATOM_WCF_PENDATA,
XATOM_WCF_RIFF,
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index 41097f4..4391360 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -173,16 +173,11 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] =
"WCF_DIB",
"WCF_DIBV5",
"WCF_DIF",
- "WCF_DSPBITMAP",
- "WCF_DSPENHMETAFILE",
- "WCF_DSPMETAFILEPICT",
- "WCF_DSPTEXT",
"WCF_ENHMETAFILE",
"WCF_HDROP",
"WCF_LOCALE",
"WCF_METAFILEPICT",
"WCF_OEMTEXT",
- "WCF_OWNERDISPLAY",
"WCF_PALETTE",
"WCF_PENDATA",
"WCF_RIFF",
More information about the wine-cvs
mailing list