From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 19 Feb 2019 20:51:32 +0000 (-0800)
Subject: Changes to common source files not directly applicable to open-vm-tools.
X-Git-Tag: stable-11.0.0~203
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a62dd61cc798cf311fa23449534eb22470997ee7;p=thirdparty%2Fopen-vm-tools.git

Changes to common source files not directly applicable to open-vm-tools.
---

diff --git a/open-vm-tools/services/plugins/dndcp/dnd/dnd.h b/open-vm-tools/services/plugins/dndcp/dnd/dnd.h
index 4b8d4856e..168c32a5e 100644
--- a/open-vm-tools/services/plugins/dndcp/dnd/dnd.h
+++ b/open-vm-tools/services/plugins/dndcp/dnd/dnd.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2005-2017 VMware, Inc. All rights reserved.
+ * Copyright (C) 2005-2019 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -228,6 +228,8 @@ size_t DnD_LocalStringToCPString(utf16_t *bufIn,
                                  char **bufOut);
 Bool DnD_SetCPClipboardFromLocalText(CPClipboard *clip,
                                      utf16_t *bufIn);
+Bool DnD_SetCPClipboardAndTruncateLocalText(CPClipboard *clip,
+                                            utf16_t *bufIn);
 Bool DnD_SetCPClipboardFromLocalRtf(CPClipboard *clip,
                                     char *bufIn);
 Bool DnD_SetCPClipboardFromSpecifiedFormat(CPClipboard *clip,
diff --git a/open-vm-tools/services/plugins/dndcp/dnd/dndClipboard.c b/open-vm-tools/services/plugins/dndcp/dnd/dndClipboard.c
index 8f8117ad8..a7b990277 100644
--- a/open-vm-tools/services/plugins/dndcp/dnd/dndClipboard.c
+++ b/open-vm-tools/services/plugins/dndcp/dnd/dndClipboard.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2007-2017 VMware, Inc. All rights reserved.
+ * Copyright (C) 2007-2019 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -276,11 +276,15 @@ CPClipboard_SetItem(CPClipboard *clip,          // IN/OUT: the clipboard
    CPClipItem *item;
    uint8 *newBuf = NULL;
    /*
-    * Microsoft Office Text Effects i.e. HTML Format, image, rtf and text may
-    * be put into a clipboard at same time, and total size may be more than
-    * limit. HTML format will be first dropped, then image and then rtf data.
+    * Microsoft Office Text Effects i.e. HTML Format, BIFF, GVML, image, rtf
+    * and text may be put into a clipboard at same time, and total size may be
+    * more than limit. The order in filterList determines the order in which
+    * the format will be fiiltered, e.g. HTML format will be first dropped,
+    * then GVML,..., at last TEXT
     */
    DND_CPFORMAT filterList[] = {CPFORMAT_HTML_FORMAT,
+                                CPFORMAT_ART_GVML_CLIPFORMAT,
+                                CPFORMAT_BIFF12,
                                 CPFORMAT_IMG_PNG,
                                 CPFORMAT_RTF,
                                 CPFORMAT_TEXT};