Changeset 103631 in vbox for trunk/src/VBox/HostServices/SharedClipboard/testcase

Timestamp:

Mar 1, 2024 11:00:38 AM (14 months ago)

Author:

vboxsync

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

161991

Message:

Shared Clipboard: More cleanups (renaming Windows parts to match the other platforms). bugref:9437

Location:

trunk/src/VBox/HostServices/SharedClipboard/testcase

Files:

• tstClipboardMockHGCM.cpp (modified) (1 diff)
• tstClipboardServiceImpl.cpp (modified) (3 diffs)

trunk/src/VBox/HostServices/SharedClipboard/testcase/tstClipboardMockHGCM.cpp

@@ -605 +605 @@
     ShClBackendSetCallbacks(pBackend, &ShClCallbacks);
 #elif defined (RT_OS_WINDOWS)
-    rc = SharedClipboardWinOpen(GetDesktopWindow());
+    rc = ShClWinOpen(GetDesktopWindow());
     if (RT_SUCCESS(rc))
     {
-        rc = SharedClipboardWinDataWrite(CF_UNICODETEXT, pTask->pvData, (uint32_t)pTask->cbData);
-        SharedClipboardWinClose();
+        rc = ShClWinDataWrite(CF_UNICODETEXT, pTask->pvData, (uint32_t)pTask->cbData);
+        ShClWinClose();
     }
 #endif /* defined (RT_OS_LINUX) || defined (RT_OS_SOLARIS) */

trunk/src/VBox/HostServices/SharedClipboard/testcase/tstClipboardServiceImpl.cpp

@@ -106 +106 @@
     uint32_t cbOutput  = UINT32_MAX/2;
     RTTestIDisableAssertions();
-    RTTESTI_CHECK_RC(SharedClipboardWinConvertCFHTMLToMIME("", 0, &pszOutput, &cbOutput), VERR_INVALID_PARAMETER);
+    RTTESTI_CHECK_RC(ShClWinConvertCFHTMLToMIME("", 0, &pszOutput, &cbOutput), VERR_INVALID_PARAMETER);
     RTTestIRestoreAssertions();
 
     pszOutput = NULL;
     cbOutput  = UINT32_MAX/2;
-    RTTESTI_CHECK_RC(SharedClipboardWinConvertCFHTMLToMIME((char *)&g_abVBoxOrgCfHtml1[0], g_cbVBoxOrgCfHtml1,
+    RTTESTI_CHECK_RC(ShClWinConvertCFHTMLToMIME((char *)&g_abVBoxOrgCfHtml1[0], g_cbVBoxOrgCfHtml1,
                                                            &pszOutput, &cbOutput), VINF_SUCCESS);
     RTTESTI_CHECK(cbOutput == g_cbVBoxOrgMimeHtml1);
@@ -141 +141 @@
         char    *pszCfHtml = NULL;
         uint32_t cbCfHtml  = UINT32_MAX/2;
-        rc = SharedClipboardWinConvertMIMEToCFHTML(s_aRoundTrips[i].psz, s_aRoundTrips[i].cch + 1, &pszCfHtml, &cbCfHtml);
+        rc = ShClWinConvertMIMEToCFHTML(s_aRoundTrips[i].psz, s_aRoundTrips[i].cch + 1, &pszCfHtml, &cbCfHtml);
         if (rc == VINF_SUCCESS)
         {
             if (strlen(pszCfHtml) + 1 != cbCfHtml)
-                RTTestIFailed("#%u: SharedClipboardWinConvertMIMEToCFHTML(%s, %#zx,,) returned incorrect length: %#x, actual %#zx",
+                RTTestIFailed("#%u: ShClWinConvertMIMEToCFHTML(%s, %#zx,,) returned incorrect length: %#x, actual %#zx",
                               i, s_aRoundTrips[i].psz, s_aRoundTrips[i].cch, cbCfHtml, strlen(pszCfHtml) + 1);
 
             char     *pszHtml = NULL;
             uint32_t  cbHtml  = UINT32_MAX/4;
-            rc = SharedClipboardWinConvertCFHTMLToMIME(pszCfHtml, (uint32_t)strlen(pszCfHtml), &pszHtml, &cbHtml);
+            rc = ShClWinConvertCFHTMLToMIME(pszCfHtml, (uint32_t)strlen(pszCfHtml), &pszHtml, &cbHtml);
             if (rc == VINF_SUCCESS)
             {
                 if (strlen(pszHtml) + 1 != cbHtml)
-                    RTTestIFailed("#%u: SharedClipboardWinConvertCFHTMLToMIME(%s, %#zx,,) returned incorrect length: %#x, actual %#zx",
+                    RTTestIFailed("#%u: ShClWinConvertCFHTMLToMIME(%s, %#zx,,) returned incorrect length: %#x, actual %#zx",
                                   i, pszHtml, strlen(pszHtml), cbHtml, strlen(pszHtml) + 1);
                 if (strcmp(pszHtml, s_aRoundTrips[i].psz) != 0)
@@ -162 +162 @@
             }
             else
-                RTTestIFailed("#%u: SharedClipboardWinConvertCFHTMLToMIME(%s, %#zx,,) returned %Rrc, expected VINF_SUCCESS",
+                RTTestIFailed("#%u: ShClWinConvertCFHTMLToMIME(%s, %#zx,,) returned %Rrc, expected VINF_SUCCESS",
                               i, pszCfHtml, strlen(pszCfHtml), rc);
             RTMemFree(pszCfHtml);
         }
         else
-            RTTestIFailed("#%u: SharedClipboardWinConvertMIMEToCFHTML(%s, %#zx,,) returned %Rrc, expected VINF_SUCCESS",
+            RTTestIFailed("#%u: ShClWinConvertMIMEToCFHTML(%s, %#zx,,) returned %Rrc, expected VINF_SUCCESS",
                           i, s_aRoundTrips[i].psz, s_aRoundTrips[i].cch, rc);
     }