Changeset 103631 in vbox for trunk/src/VBox/Additions

Timestamp:

Mar 1, 2024 11:00:38 AM (13 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

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (25 diffs)

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

@@ -103 +103 @@
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
 /**
- * @copydoc SharedClipboardWinDataObject::CALLBACKS::pfnTransferBegin
- *
- * Called by SharedClipboardWinDataObject::GetData() when the user wants to paste data.
+ * @copydoc ShClWinDataObject::CALLBACKS::pfnTransferBegin
+ *
+ * Called by ShClWinDataObject::GetData() when the user wants to paste data.
  * This then requests a new transfer on the host.
  *
  * @thread  Clipboard main thread.
  */
-static DECLCALLBACK(int) vbtrShClDataObjectTransferBeginCallback(SharedClipboardWinDataObject::PCALLBACKCTX pCbCtx)
+static DECLCALLBACK(int) vbtrShClDataObjectTransferBeginCallback(ShClWinDataObject::PCALLBACKCTX pCbCtx)
 {
     LogFlowFuncEnter();
@@ -137 +137 @@
     AssertPtr(pCtx);
 
-    int rc = SharedClipboardWinTransferCreate(&pCtx->Win, pCbCtx->pTransfer);
+    int rc = ShClWinTransferCreate(&pCtx->Win, pCbCtx->pTransfer);
 
     LogFlowFuncLeaveRC(rc);
@@ -156 +156 @@
     AssertPtr(pCtx);
 
-    SharedClipboardWinTransferDestroy(&pCtx->Win, pCbCtx->pTransfer);
+    ShClWinTransferDestroy(&pCtx->Win, pCbCtx->pTransfer);
 
     LogFlowFuncLeave();
@@ -186 +186 @@
         case SHCLTRANSFERDIR_FROM_REMOTE: /* H->G */
         {
-            rc = SharedClipboardWinTransferInitialize(&pCtx->Win, pTransfer);
+            rc = ShClWinTransferInitialize(&pCtx->Win, pTransfer);
             break;
         }
@@ -192 +192 @@
         case SHCLTRANSFERDIR_TO_REMOTE: /* G->H */
         {
-            rc = SharedClipboardWinTransferGetRootsFromClipboard(&pCtx->Win, pTransfer);
+            rc = ShClWinTransferGetRootsFromClipboard(&pCtx->Win, pTransfer);
             break;
         }
@@ -229 +229 @@
         case SHCLTRANSFERDIR_FROM_REMOTE: /* H->G */
         {
-            rc = SharedClipboardWinTransferStart(&pCtx->Win, pTransfer);
+            rc = ShClWinTransferStart(&pCtx->Win, pTransfer);
             break;
         }
@@ -305 +305 @@
     if (enmDir == SHCLTRANSFERDIR_TO_REMOTE) /* G->H */
     {
-        rc = SharedClipboardWinTransferGetRootsFromClipboard(&pCtx->Win, pTransfer);
+        rc = ShClWinTransferGetRootsFromClipboard(&pCtx->Win, pTransfer);
     }
     else if (enmDir == SHCLTRANSFERDIR_FROM_REMOTE) /* H->G */
@@ -411 +411 @@
                      * Report available formats to the host. */
                     SHCLFORMATS fFormats;
-                    rc = SharedClipboardWinGetFormats(pWinCtx, &fFormats);
+                    rc = ShClWinGetFormats(pWinCtx, &fFormats);
                     if (RT_SUCCESS(rc))
                     {
@@ -434 +434 @@
         {
             LogFunc(("WM_CHANGECBCHAIN\n"));
-            lresultRc = SharedClipboardWinHandleWMChangeCBChain(pWinCtx, hwnd, msg, wParam, lParam);
+            lresultRc = ShClWinHandleWMChangeCBChain(pWinCtx, hwnd, msg, wParam, lParam);
             break;
         }
@@ -458 +458 @@
                     /* WM_DRAWCLIPBOARD always expects a return code of 0, so don't change "rc" here. */
                     SHCLFORMATS fFormats;
-                    rc = SharedClipboardWinGetFormats(pWinCtx, &fFormats);
+                    rc = ShClWinGetFormats(pWinCtx, &fFormats);
                     if (   RT_SUCCESS(rc)
                         && fFormats != VBOX_SHCL_FMT_NONE)
@@ -470 +470 @@
             }
 
-            lresultRc = SharedClipboardWinChainPassToNext(pWinCtx, msg, wParam, lParam);
+            lresultRc = ShClWinChainPassToNext(pWinCtx, msg, wParam, lParam);
             break;
         }
@@ -476 +476 @@
         case WM_TIMER:
         {
-            int rc = SharedClipboardWinHandleWMTimer(pWinCtx);
+            int rc = ShClWinHandleWMTimer(pWinCtx);
             AssertRC(rc);
 
@@ -492 +492 @@
             /* Insert the requested clipboard format data into the clipboard. */
             const UINT       uFmtWin  = (UINT)wParam;
-            const SHCLFORMAT uFmtVBox = SharedClipboardWinClipboardFormatToVBox(uFmtWin);
+            const SHCLFORMAT uFmtVBox = ShClWinClipboardFormatToVBox(uFmtWin);
 
             LogFunc(("WM_RENDERFORMAT: uFmtWin=%u -> uFmtVBox=0x%x\n", uFmtWin, uFmtVBox));
@@ -504 +504 @@
             {
                 LogRel(("Shared Clipboard: Unsupported format (%#x) requested\n", uFmtWin));
-                SharedClipboardWinClear();
+                ShClWinClear();
             }
             else
@@ -529 +529 @@
                     {
                         /* Wrap content into CF_HTML clipboard format if needed. */
-                        if (!SharedClipboardWinIsCFHTML((const char *)pvData))
+                        if (!ShClWinIsCFHTML((const char *)pvData))
                         {
                             char    *pszWrapped = NULL;
                             uint32_t cbWrapped  = 0;
-                            rc = SharedClipboardWinConvertMIMEToCFHTML((const char *)pvData, cbData, &pszWrapped, &cbWrapped);
+                            rc = ShClWinConvertMIMEToCFHTML((const char *)pvData, cbData, &pszWrapped, &cbWrapped);
                             if (RT_SUCCESS(rc))
                             {
@@ -588 +588 @@
             LogFunc(("WM_RENDERALLFORMATS\n"));
 
-            int rc = SharedClipboardWinHandleWMRenderAllFormats(pWinCtx, hwnd);
+            int rc = ShClWinHandleWMRenderAllFormats(pWinCtx, hwnd);
             AssertRC(rc);
 
@@ -613 +613 @@
             if (fFormats != VBOX_SHCL_FMT_NONE) /* Could arrive with some older GA versions. */
             {
-                int rc = SharedClipboardWinClearAndAnnounceFormats(pWinCtx, fFormats, hwnd);
+                int rc = ShClWinClearAndAnnounceFormats(pWinCtx, fFormats, hwnd);
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
                 if (   RT_SUCCESS(rc)
@@ -622 +622 @@
                      * That way Windows will recognize that there is a data transfer available.
                      */
-                    SharedClipboardWinDataObject::CALLBACKS Callbacks;
+                    ShClWinDataObject::CALLBACKS Callbacks;
                     RT_ZERO(Callbacks);
                     Callbacks.pfnTransferBegin = vbtrShClDataObjectTransferBeginCallback;
 
-                    rc = SharedClipboardWinTransferCreateAndSetDataObject(pWinCtx, pCtx, &Callbacks);
+                    rc = ShClWinTransferCreateAndSetDataObject(pWinCtx, pCtx, &Callbacks);
                 }
 #else
@@ -653 +653 @@
             RTStrFree(pszFmts);
 #endif
-            int rc = SharedClipboardWinOpen(hwnd);
+            int rc = ShClWinOpen(hwnd);
             HANDLE hClip = NULL;
             if (RT_SUCCESS(rc))
@@ -704 +704 @@
 
                                 /* Unwrap clipboard content from CF_HTML format if needed. */
-                                if (SharedClipboardWinIsCFHTML((const char *)pvClip))
+                                if (ShClWinIsCFHTML((const char *)pvClip))
                                 {
                                     char        *pszBuf = NULL;
                                     uint32_t    cbBuf   = 0;
-                                    rc = SharedClipboardWinConvertCFHTMLToMIME((const char *)pvClip, cbClip, &pszBuf, &cbBuf);
+                                    rc = ShClWinConvertCFHTMLToMIME((const char *)pvClip, cbClip, &pszBuf, &cbBuf);
                                     if (RT_SUCCESS(rc))
                                     {
@@ -731 +731 @@
                     LogFunc(("SHCL_WIN_WM_READ_DATA: hClip=NULL, lastError=%ld\n", GetLastError()));
 
-                SharedClipboardWinClose();
+                ShClWinClose();
             }
 
@@ -744 +744 @@
             LogFunc(("WM_DESTROY\n"));
 
-            int rc = SharedClipboardWinHandleWMDestroy(pWinCtx);
+            int rc = ShClWinHandleWMDestroy(pWinCtx);
             AssertRC(rc);
 
@@ -816 +816 @@
                          SWP_NOACTIVATE | SWP_HIDEWINDOW | SWP_NOCOPYBITS | SWP_NOREDRAW | SWP_NOSIZE);
 
-            rc = SharedClipboardWinChainAdd(pWinCtx);
+            rc = ShClWinChainAdd(pWinCtx);
             if (RT_SUCCESS(rc))
             {
-                if (!SharedClipboardWinIsNewAPI(&pWinCtx->newAPI))
+                if (!ShClWinIsNewAPI(&pWinCtx->newAPI))
                     pWinCtx->oldAPI.timerRefresh = SetTimer(pWinCtx->hWnd, 0, 10 * 1000 /* 10s */, NULL);
             }
@@ -933 +933 @@
     AssertRCReturn(rc, rc);
 
-    rc = SharedClipboardWinCtxInit(&pCtx->Win);
+    rc = ShClWinCtxInit(&pCtx->Win);
     if (RT_SUCCESS(rc))
         rc = VbglR3ClipboardConnectEx(&pCtx->CmdCtx, VBOX_SHCL_GF_0_CONTEXT_ID);
@@ -1198 +1198 @@
     UnregisterClass(s_szClipWndClassName, pCtx->pEnv->hInstance);
 
-    SharedClipboardWinCtxDestroy(&pCtx->Win);
+    ShClWinCtxDestroy(&pCtx->Win);
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS