Changeset 61724 in vbox

Timestamp:

Jun 15, 2016 3:43:04 PM (9 years ago)

Author:

vboxsync

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

108094

Message:

Additions/SharedClipboard: fix for ​​bugref:8363: fixed hieroglyphs in result of copying hyperlink from OpenOffice in VM to OpenOffice on host. Fixed code style.

Location:

trunk/src/VBox

Files:

• GuestHost/SharedClipboard/x11-clipboard.cpp (modified) (1 diff)
• HostServices/SharedClipboard/VBoxClipboard-win.cpp (modified) (12 diffs)

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

@@ -1784 +1784 @@
                 pvDest = NULL;
                 cbDest = 0;
-                rc = clipUTF16ToWinHTML((RTUTF16*)pvSrc, cbSrc,
-                    (char**)&pvDest, &cbDest);
-                LogRelFlowFunc(("Source unicode %ls, cbSrc = %d\n", pvSrc, cbSrc));
+                /* 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 
+                 * at start of clipboard data
+                 */
+                if( *(PRTUTF16)pvSrc == 0xfeff )
+                {
+                    LogRelFlowFunc((" \n"));
+                    rc = clipUTF16ToWinHTML((RTUTF16*)pvSrc, cbSrc,
+                        (char**)&pvDest, &cbDest);
+                }
+                else
+                {
+                   pvDest = RTMemAlloc(cbSrc);
+                   if(pvDest)
+                   {
+                        memcpy(pvDest, pvSrc, cbSrc);
+                        cbDest = cbSrc;
+                   }
+                   else
+                   {
+                        rc = VERR_NO_MEMORY;
+                        break;
+                   }
+                }
+                                      
+                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));
                 rc = VINF_SUCCESS;

trunk/src/VBox/HostServices/SharedClipboard/VBoxClipboard-win.cpp

@@ -986 +986 @@
     if (cb > 0)
     {
-        char* result = NULL;
+        char* pszResult = NULL;
         size_t cch;
 
@@ -993 +993 @@
         {
             /* check that this is not already CF_HTML */
-            int rc = ConvertMimeToCFHTML((const char*)pv, cb, &result, &cch);
+            int rc = ConvertMimeToCFHTML((const char*)pv, cb, &pszResult, &cch);
             if (RT_SUCCESS(rc))
             {
-                if (result != NULL && cch != 0)
+                if (pszResult != NULL && cch != 0)
                 {
-                    pClient->data.pv = result;
+                    pClient->data.pv = pszResult;
                     pClient->data.cb = cch;
                     pClient->data.u32Format = u32Format;
@@ -1032 +1032 @@
 EndFragment  = Header length + fragment length - 40(ending length)
 */
-char strFormatSample[] =
+const char pcszFormatSample[] =
     "Version:1.0\r\n"
     "StartHTML:000000101\r\n"
@@ -1051 +1051 @@
 * returns RC result code
 */
-int GetHeaderValue(const char *src, const char *option, size_t *value)
-{
-    size_t optionLenght;
+int GetHeaderValue(const char *pcszSrc, const char *pcszOption, size_t *pcValue)
+{
+    size_t cOptionLenght = 0;
     int rc = VERR_INVALID_PARAMETER;
 
-    Assert(src);
-    Assert(option);
-
-    char* optionValue = RTStrStr(src, option);
-    if (optionValue)
-    {
-        rc = RTStrNLenEx(option, RTSTR_MAX, &optionLenght);
-        Assert(optionLenght);
+    Assert(pcszSrc);
+    Assert(pcszOption);
+
+    char* pcszOptionValue = RTStrStr(pcszSrc, pcszOption);
+    if (pcszOptionValue)
+    {
+        rc = RTStrNLenEx(pcszOption, RTSTR_MAX, &cOptionLenght);
+        Assert(cOptionLenght);
         if (RT_SUCCESS(rc))
         {
             int32_t tmpValue;
-            rc = RTStrToInt32Ex(optionValue + optionLenght, NULL, 10, &tmpValue);
+            rc = RTStrToInt32Ex(pcszOptionValue + cOptionLenght, NULL, 10, &tmpValue);
             if (RT_SUCCESS(rc))
             {
-                *value = tmpValue;
+                *pcValue = tmpValue;
                 rc = VINF_SUCCESS;
             }
@@ -1082 +1082 @@
  * returns true if the @source string is in CF_HTML format
  */
-bool IsWindowsHTML(const char *source)
-{
-    return RTStrStr(source, "Version:") != NULL
-        && RTStrStr(source, "StartHTML:") != NULL;
+bool IsWindowsHTML(const char *pcszSource)
+{
+    return RTStrStr(pcszSource, "Version:") != NULL
+        && RTStrStr(pcszSource, "StartHTML:") != NULL;
 }
 
@@ -1097 +1097 @@
 * Allocated buffer should be destroyed by RTMemFree after usage
 */
-int ConvertCFHtmlToMime(const char *source, const uint32_t cch, char **output, size_t *pcch)
+int ConvertCFHtmlToMime(const char *pcszSource, const uint32_t cch, char **ppszOutput, size_t *pcCh)
 {
     char* result = NULL;
 
-    Assert(source);
+    Assert(pcszSource);
     Assert(cch);
-    Assert(output);
-    Assert(pcch);
-
-    size_t startOffset, endOffset;
-    int rc = GetHeaderValue(source, "StartFragment:", &startOffset);
+    Assert(ppszOutput);
+    Assert(pcCh);
+
+    size_t cStartOffset, cEndOffset;
+    int rc = GetHeaderValue(pcszSource, "StartFragment:", &cStartOffset);
     if (!RT_SUCCESS(rc))
     {
@@ -1113 +1113 @@
         return VERR_INVALID_PARAMETER;
     }
-    rc = GetHeaderValue(source, "EndFragment:", &endOffset);
+    rc = GetHeaderValue(pcszSource, "EndFragment:", &cEndOffset);
     if (!RT_SUCCESS(rc))
     {
@@ -1119 +1119 @@
         return VERR_INVALID_PARAMETER;
     }
-    if (startOffset > 0 && endOffset > 0 && endOffset > startOffset)
-    {
-        size_t substrlen = endOffset - startOffset;
-        result = (char*)RTMemAlloc(substrlen + 1);
+    if (cStartOffset > 0 && cEndOffset > 0 && cEndOffset > cStartOffset)
+    {
+        size_t cSubstrlen = cEndOffset - cStartOffset;
+        result = (char*)RTMemAlloc(cSubstrlen + 1);
         if (result)
         {
-            RT_BZERO(result, substrlen + 1);
-            rc = RTStrCopyEx(result, substrlen + 1, source + startOffset, substrlen);
+            RT_BZERO(result, cSubstrlen + 1);
+            rc = RTStrCopyEx(result, cSubstrlen + 1, pcszSource + cStartOffset, cSubstrlen);
             if (RT_SUCCESS(rc))
             {
-                *output = result;
-                *pcch = substrlen + 1;
+                *ppszOutput = result;
+                *pcCh = cSubstrlen + 1;
             }
             else
@@ -1166 +1166 @@
 * @note: Everything inside of fragment can be UTF8. Windows allows it. Everything in header should be Latin1.
 */
-int ConvertMimeToCFHTML(const char *source, size_t cb, char **output, size_t *pcch)
-{
-    Assert(output);
-    Assert(pcch);
-    Assert(source);
+int ConvertMimeToCFHTML(const char *pcszSource, size_t cb, char **pcszOutput, size_t *pcCh)
+{
+    Assert(pcszOutput);
+    Assert(pcCh);
+    Assert(pcszSource);
     Assert(cb);
 
-    size_t fragmentLength = 0;
-
-    char* buf = (char*)source;
+    size_t cFragmentLength = 0;
+
+    char* pszBuf = (char*)pcszSource;
     
     /* construct CF_HTML formatted string */
-    char* result = NULL;
-    int rc = RTStrNLenEx(buf, RTSTR_MAX, &fragmentLength);
+    char* pszResult = NULL;
+    int rc = RTStrNLenEx(pszBuf, RTSTR_MAX, &cFragmentLength);
     if (!RT_SUCCESS(rc))
     {
@@ -1187 +1187 @@
 
     /* caluclate parameters of CF_HTML header */
-    size_t headerLength = (sizeof(strFormatSample) - 1) + 8;
-    size_t endHtml = headerLength + fragmentLength;
-    size_t endFragment = headerLength + fragmentLength - 38;
-    result = (char*)RTMemAlloc(endHtml + 1);
-    if (result == NULL)
+    size_t cHeaderLength = (sizeof(pcszFormatSample) - 1) + 8;
+    size_t cEndHtml = cHeaderLength + cFragmentLength;
+    size_t cEndFragment = cHeaderLength + cFragmentLength - 38;
+    pszResult = (char*)RTMemAlloc(cEndHtml + 1);
+    if (pszResult == NULL)
     {
         LogRelFlowFunc(("Error: Cannot allocate memory for result buffer. rc = %Rrc.\n"));
@@ -1198 +1198 @@
 
     /* format result CF_HTML string */
-    rc = RTStrPrintf(result, endHtml + 1, strFormatSample, endHtml, endFragment, buf);
+    rc = RTStrPrintf(pszResult, cEndHtml + 1, pcszFormatSample, cEndHtml, cEndFragment, pszBuf);
     if (rc == -1)
     {
@@ -1204 +1204 @@
         return VERR_CANT_CREATE;
     }
-    Assert(endHtml == rc);
+    Assert(cEndHtml == rc);
 
 #ifdef DEBUG
     {
         /*Control calculations. check consistency.*/
-        const char strStartFragment[] = "<!--StartFragment-->";
-        const char strEndFragment[] = "<!--EndFragment-->";
+        const char pcszStartFragment[] = "<!--StartFragment-->";
+        const char pcszEndFragment[] = "<!--EndFragment-->";
 
         /* check 'StartFragment:' value */
-        const char* realStartFragment = RTStrStr(result, strStartFragment);
-        Assert((realStartFragment + sizeof(strStartFragment) - 1) - result == 137);//141);
+        const char* pcszRealStartFragment = RTStrStr(pszResult, pcszStartFragment);
+        Assert((pcszRealStartFragment + sizeof(pcszStartFragment) - 1) - pszResult == 137);//141);
 
         /* check 'EndFragment:' value */
-        const char* realEndFragment = RTStrStr(result, strEndFragment);
-        Assert((realEndFragment - result) == endFragment);
+        const char* pcszRealEndFragment = RTStrStr(pszResult, pcszEndFragment);
+        Assert((pcszRealEndFragment - pszResult) == cEndFragment);
     }
 #endif
 
-    *output = result;
-    *pcch = rc+1;
+    *pcszOutput = pszResult;
+    *pcCh = rc+1;
 
     return VINF_SUCCESS;