Alexandre Julliard : winex11: Remove support for exporting the CF_BITMAP, CF_PALETTE and CF_DIBV5 formats.
Alexandre Julliard
julliard at winehq.org
Tue Sep 27 11:08:52 CDT 2016
Module: wine
Branch: master
Commit: c837adf38e7ff94a4a9798eee082b5decf81c0de
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c837adf38e7ff94a4a9798eee082b5decf81c0de
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Sep 27 21:41:06 2016 +0900
winex11: Remove support for exporting the CF_BITMAP, CF_PALETTE and CF_DIBV5 formats.
They can be synthesized from CF_DIB.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winex11.drv/clipboard.c | 3 ---
dlls/winex11.drv/x11drv.h | 4 ----
dlls/winex11.drv/x11drv_main.c | 4 ----
3 files changed, 11 deletions(-)
diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c
index 4ee8604..776e579 100644
--- a/dlls/winex11.drv/clipboard.c
+++ b/dlls/winex11.drv/clipboard.c
@@ -154,20 +154,17 @@ static const struct
{ 0, CF_UNICODETEXT, XATOM_COMPOUND_TEXT, import_compound_text, export_compound_text },
{ 0, CF_UNICODETEXT, XA_STRING, import_string, export_string },
{ 0, CF_UNICODETEXT, XATOM_text_plain, import_string, export_string },
- { 0, CF_BITMAP, XATOM_WCF_BITMAP, import_data, NULL },
{ 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_PALETTE, XATOM_WCF_PALETTE, import_data, export_data },
{ 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_DIBV5, XATOM_WCF_DIBV5, 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 f50b798..2cf2ed5 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -458,15 +458,11 @@ enum x11drv_atoms
XATOM_XdndSelection,
XATOM_XdndTypeList,
XATOM_HTML_Format,
- XATOM_WCF_BITMAP,
- XATOM_WCF_DIB,
- XATOM_WCF_DIBV5,
XATOM_WCF_DIF,
XATOM_WCF_ENHMETAFILE,
XATOM_WCF_HDROP,
XATOM_WCF_LOCALE,
XATOM_WCF_OEMTEXT,
- XATOM_WCF_PALETTE,
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 e67b4c4..0b38b74 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -169,15 +169,11 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] =
"XdndSelection",
"XdndTypeList",
"HTML Format",
- "WCF_BITMAP",
- "WCF_DIB",
- "WCF_DIBV5",
"WCF_DIF",
"WCF_ENHMETAFILE",
"WCF_HDROP",
"WCF_LOCALE",
"WCF_OEMTEXT",
- "WCF_PALETTE",
"WCF_PENDATA",
"WCF_RIFF",
"WCF_SYLK",
More information about the wine-cvs
mailing list