Changeset 62471 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Jul 22, 2016 6:04:30 PM (9 years ago)

Author:

vboxsync

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

109027

Message:

Misc: scm

File:

• trunk/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp (modified) (12 diffs)

trunk/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp

@@ -65 +65 @@
     UTF8,
     BMP,
-        HTML
+        HTML
 };
 
@@ -96 +96 @@
     { "image/x-bmp", BMP, VBOX_SHARED_CLIPBOARD_FMT_BITMAP },
     { "image/x-MS-bmp", BMP, VBOX_SHARED_CLIPBOARD_FMT_BITMAP }
-   
-        
+
+
     /* TODO: Inkscape exports image/png but not bmp... */
 };
@@ -339 +339 @@
     u32VBoxFormats |= clipVBoxFormatForX11Format(pCtx->X11HTMLFormat);
     LogRelFlowFunc(("clipReportFormatsToVBox format: %d\n", u32VBoxFormats));
-    LogRelFlowFunc(("clipReportFormatsToVBox txt: %d, bitm: %d, html:%d, u32VBoxFormats: %d\n", 
-                    pCtx->X11TextFormat, pCtx->X11BitmapFormat, pCtx->X11HTMLFormat, 
+    LogRelFlowFunc(("clipReportFormatsToVBox txt: %d, bitm: %d, html:%d, u32VBoxFormats: %d\n",
+                    pCtx->X11TextFormat, pCtx->X11BitmapFormat, pCtx->X11HTMLFormat,
                     u32VBoxFormats ));
     ClipReportX11Formats(pCtx->pFrontend, u32VBoxFormats);
@@ -450 +450 @@
 /**
  * Go through an array of X11 clipboard targets to see if they contain a HTML
- * format we can support, and if so choose the ones we prefer 
+ * format we can support, and if so choose the ones we prefer
  * @param  pCtx      the clipboard backend context structure
  * @param  pTargets  the list of targets
@@ -1206 +1206 @@
     if(pszDest == NULL)
         return VERR_NO_MEMORY;
-        
+
     memcpy(pszDest, pszSrc, cbSrc);
 
@@ -1213 +1213 @@
     *pcLenReturn = cbSrc;
     *piFormatReturn = 8;
-    
+
     return VINF_SUCCESS;
 }
@@ -1300 +1300 @@
         RTMemFree(pv);
     }
-    else if ( (format == HTML) 
+    else if ( (format == HTML)
             && (pCtx->vboxFormats & VBOX_SHARED_CLIPBOARD_FMT_HTML))
     {
@@ -1312 +1312 @@
         if (RT_SUCCESS(rc))
         {
-            /* 
-            * The common VBox HTML encoding will be - Utf8 
+            /*
+            * The common VBox HTML encoding will be - Utf8
             * becuase it more general for HTML formats then UTF16
-            * X11 clipboard returns UTF16, so before sending it we should 
+            * X11 clipboard returns UTF16, so before sending it we should
             * convert it to UTF8
             * It's very strange but here we get utf16 from x11 clipboard
@@ -1777 +1777 @@
             case HTML:
             {
-                /* The common VBox HTML encoding will be - Utf8 
+                /* The common VBox HTML encoding will be - Utf8
                 * becuase it more general for HTML formats then UTF16
-                * X11 clipboard returns UTF16, so before sending it we should 
-                * convert it to UTF8 
+                * X11 clipboard returns UTF16, so before sending it we should
+                * convert it to UTF8
                 */
                 pvDest = NULL;
                 cbDest = 0;
-                /* Some applications sends data in utf16, some in itf8, 
+                /* Some applications sends data in utf16, some in itf8,
                  * without indication it in MIME.
-                 * But in case of utf16, at least an OpenOffice adds Byte Order Mark - 0xfeff 
+                 * But in case of utf16, at least an OpenOffice adds Byte Order Mark - 0xfeff
                  * at start of clipboard data
                  */
@@ -1809 +1809 @@
                    }
                 }
-                                      
-                LogRelFlowFunc(("Source unicode %ls, cbSrc = %d\n, Byte Order Mark = %hx", 
+
+                LogRelFlowFunc(("Source unicode %ls, cbSrc = %d\n, Byte Order Mark = %hx",
                                 pvSrc, cbSrc, ((PRTUTF16)pvSrc)[0]));
                 LogRelFlowFunc(("converted to win unicode %s, cbDest = %d, rc = %Rrc\n", pvDest, cbDest, rc));
@@ -1924 +1924 @@
             getSelectionValue(pCtx, pCtx->X11HTMLFormat, pReq);
     }
-    else   
+    else
         rc = VERR_NOT_IMPLEMENTED;
     if (RT_FAILURE(rc))
@@ -2817 +2817 @@
 #endif /* SMOKETEST defined */
 
-