Changeset 2436 in vbox

Timestamp:

Apr 30, 2007 3:11:56 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

20845

Message:

HTML format for shared clipboard (Windows guest, Windows host).

Location:

trunk

Files:

• include/VBox/HostServices/VBoxClipboardSvc.h (modified) (1 diff)
• include/VBox/vrdpapi.h (modified) (1 diff)
• src/VBox/Additions/WINNT/VBoxService/VBoxClipboard.cpp (modified) (4 diffs)

trunk/include/VBox/HostServices/VBoxClipboardSvc.h

@@ -41 +41 @@
 #define VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT 0x01
 #define VBOX_SHARED_CLIPBOARD_FMT_BITMAP      0x02
+#define VBOX_SHARED_CLIPBOARD_FMT_HTML        0x04
 
 /*

trunk/include/VBox/vrdpapi.h

@@ -545 +545 @@
 #define VRDP_CLIPBOARD_FORMAT_UNICODE_TEXT (0x1)
 #define VRDP_CLIPBOARD_FORMAT_BITMAP       (0x2)
+#define VRDP_CLIPBOARD_FORMAT_HTML         (0x4)
 
 #define VRDP_CLIPBOARD_FUNCTION_FORMAT_ANNOUNCE (0)

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxClipboard.cpp

@@ -334 +334 @@
 
                 default:
-                     break;
+                    if (format >= 0xC000)
+                    {
+                        TCHAR szFormatName[256];
+
+                        int cActual = GetClipboardFormatName(format, szFormatName, sizeof(szFormatName)/sizeof (TCHAR));
+                        
+                        if (cActual)
+                        {
+                            if (strcmp (szFormatName, "HTML Format") == 0)
+                            {
+                                u32Formats |= VBOX_SHARED_CLIPBOARD_FMT_HTML;
+                            }
+                        }
+                    }
+                    break;
             }
         }
@@ -410 +424 @@
 
                 default:
-                     break;
+                    if (format >= 0xC000)
+                    {
+                        TCHAR szFormatName[256];
+
+                        int cActual = GetClipboardFormatName(format, szFormatName, sizeof(szFormatName)/sizeof (TCHAR));
+                        
+                        if (cActual)
+                        {
+                            if (strcmp (szFormatName, "HTML Format") == 0)
+                            {
+                                u32Format |= VBOX_SHARED_CLIPBOARD_FMT_HTML;
+                            }
+                        }
+                    }
+                    break;
             }
             
@@ -568 +596 @@
                 }
 
+                if (u32Formats & VBOX_SHARED_CLIPBOARD_FMT_HTML)
+                {
+                    UINT format = RegisterClipboardFormat ("HTML Format");
+                    dprintf(("window proc WM_USER: VBOX_SHARED_CLIPBOARD_FMT_HTML 0x%04X\n", format));
+                    if (format != 0)
+                    {
+                        hClip = SetClipboardData (format, NULL);
+                    }
+                }
+
                 CloseClipboard();
 
@@ -632 +670 @@
                         {
                             hClip = NULL;
+                        }
+                    }
+                }
+                else if (u32Formats & VBOX_SHARED_CLIPBOARD_FMT_HTML)
+                {
+                    UINT format = RegisterClipboardFormat ("HTML Format");
+                    
+                    if (format != 0)
+                    {
+                        hClip = GetClipboardData (format);
+
+                        if (hClip != NULL)
+                        {
+                            LPVOID lp = GlobalLock (hClip);
+
+                            if (lp != NULL)
+                            {
+                                dprintf(("CF_HTML\n"));
+
+                                vboxClipboardWriteData (pCtx, VBOX_SHARED_CLIPBOARD_FMT_HTML,
+                                                        lp, GlobalSize (hClip));
+
+                                GlobalUnlock(hClip);
+                            }
+                            else
+                            {
+                                hClip = NULL;
+                            }
                         }
                     }