Changeset 80664 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray

Timestamp:

Sep 9, 2019 10:00:04 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard: More renaming + unification.

File:

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

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

@@ -87 +87 @@
 static SHCLCONTEXT g_Ctx = { NULL };
 /** Static window class name. */
-static char s_szClipWndClassName[] = VBOX_CLIPBOARD_WNDCLASS_NAME;
+static char s_szClipWndClassName[] = SHCL_WIN_WNDCLASS_NAME;
 
 
@@ -428 +428 @@
                 * Report available formats to the host. */
                SHCLFORMATDATA Formats;
-               int rc = VBoxClipboardWinGetFormats(&pCtx->Win, &Formats);
+               int rc = SharedClipboardWinGetFormats(&pCtx->Win, &Formats);
                if (RT_SUCCESS(rc))
                {
@@ -442 +442 @@
        {
            LogFunc(("WM_CHANGECBCHAIN\n"));
-           lresultRc = VBoxClipboardWinHandleWMChangeCBChain(pWinCtx, hwnd, msg, wParam, lParam);
+           lresultRc = SharedClipboardWinHandleWMChangeCBChain(pWinCtx, hwnd, msg, wParam, lParam);
            break;
        }
@@ -455 +455 @@
                /* WM_DRAWCLIPBOARD always expects a return code of 0, so don't change "rc" here. */
                SHCLFORMATDATA Formats;
-               int rc = VBoxClipboardWinGetFormats(pWinCtx, &Formats);
+               int rc = SharedClipboardWinGetFormats(pWinCtx, &Formats);
                if (RT_SUCCESS(rc))
                    rc = VbglR3ClipboardFormatsSend(&pCtx->CmdCtx, &Formats);
            }
 
-           lresultRc = VBoxClipboardWinChainPassToNext(pWinCtx, msg, wParam, lParam);
+           lresultRc = SharedClipboardWinChainPassToNext(pWinCtx, msg, wParam, lParam);
            break;
        }
@@ -466 +466 @@
        case WM_TIMER:
        {
-           int rc = VBoxClipboardWinHandleWMTimer(pWinCtx);
+           int rc = SharedClipboardWinHandleWMTimer(pWinCtx);
            AssertRC(rc);
 
@@ -485 +485 @@
            const UINT cfFormat = (UINT)wParam;
 
-           const SHCLFORMAT fFormat = VBoxClipboardWinClipboardFormatToVBox(cfFormat);
+           const SHCLFORMAT fFormat = SharedClipboardWinClipboardFormatToVBox(cfFormat);
 
            LogFunc(("WM_RENDERFORMAT: cfFormat=%u -> fFormat=0x%x\n", cfFormat, fFormat));
@@ -492 +492 @@
            {
                LogFunc(("WM_RENDERFORMAT: Unsupported format requested\n"));
-               VBoxClipboardWinClear();
+               SharedClipboardWinClear();
            }
            else
@@ -632 +632 @@
            LogFunc(("WM_RENDERALLFORMATS\n"));
 
-           int rc = VBoxClipboardWinHandleWMRenderAllFormats(pWinCtx, hwnd);
+           int rc = SharedClipboardWinHandleWMRenderAllFormats(pWinCtx, hwnd);
            AssertRC(rc);
 
@@ -638 +638 @@
        }
 
-       case VBOX_CLIPBOARD_WM_REPORT_FORMATS:
+       case SHCL_WIN_WM_REPORT_FORMATS:
        {
            LogFunc(("VBOX_CLIPBOARD_WM_REPORT_FORMATS\n"));
@@ -651 +651 @@
            if (fFormats != VBOX_SHARED_CLIPBOARD_FMT_NONE) /* Could arrive with some older GA versions. */
            {
-               int rc = VBoxClipboardWinOpen(hwnd);
+               int rc = SharedClipboardWinOpen(hwnd);
                if (RT_SUCCESS(rc))
                {
-                   VBoxClipboardWinClear();
+                   SharedClipboardWinClear();
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
@@ -665 +665 @@
                         if (pTransfer)
                         {
-                            rc = VBoxClipboardWinURITransferCreate(pWinCtx, pTransfer);
+                            rc = SharedClipboardWinURITransferCreate(pWinCtx, pTransfer);
 
                             /* Note: The actual requesting + retrieving of data will be done in the IDataObject implementation
@@ -673 +673 @@
                             AssertFailedStmt(rc = VERR_NOT_FOUND);
 
-                        /* Note: VBoxClipboardWinURITransferCreate() takes care of closing the clipboard. */
+                        /* Note: SharedClipboardWinURITransferCreate() takes care of closing the clipboard. */
                     }
                     else
                     {
 #endif
-                        rc = VBoxClipboardWinAnnounceFormats(pWinCtx, fFormats);
-
-                        VBoxClipboardWinClose();
+                        rc = SharedClipboardWinAnnounceFormats(pWinCtx, fFormats);
+
+                        SharedClipboardWinClose();
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
                     }
@@ -691 +691 @@
        }
 
-       case VBOX_CLIPBOARD_WM_READ_DATA:
+       case SHCL_WIN_WM_READ_DATA:
        {
            /* Send data in the specified format to the host. */
@@ -704 +704 @@
            LogFlowFunc(("VBOX_CLIPBOARD_WM_READ_DATA: uFormat=0x%x\n", uFormat));
 
-           int rc = VBoxClipboardWinOpen(hwnd);
+           int rc = SharedClipboardWinOpen(hwnd);
            if (RT_SUCCESS(rc))
            {
@@ -749 +749 @@
                else if (uFormat == VBOX_SHARED_CLIPBOARD_FMT_HTML)
                {
-                   UINT format = RegisterClipboardFormat(VBOX_CLIPBOARD_WIN_REGFMT_HTML);
+                   UINT format = RegisterClipboardFormat(SHCL_WIN_REGFMT_HTML);
                    if (format != 0)
                    {
@@ -777 +777 @@
                    LogFunc(("cTransfersRunning=%RU32\n", SharedClipboardURICtxGetRunningTransfers(&pCtx->URI)));
 
-                   int rc = VBoxClipboardWinOpen(hwnd);
+                   int rc = SharedClipboardWinOpen(hwnd);
                    if (RT_SUCCESS(rc))
                    {
@@ -799 +799 @@
                                        char    *papszList;
                                        uint32_t cbList;
-                                       rc = VBoxClipboardWinDropFilesToStringList((DROPFILES *)hDrop, &papszList, &cbList);
+                                       rc = SharedClipboardWinDropFilesToStringList((DROPFILES *)hDrop, &papszList, &cbList);
 
                                        GlobalUnlock(hClip);
@@ -840 +840 @@
                        }
 
-                       VBoxClipboardWinClose();
+                       SharedClipboardWinClose();
                    }
 
@@ -859 +859 @@
                }
 
-               VBoxClipboardWinClose();
+               SharedClipboardWinClose();
            }
            break;
@@ -871 +871 @@
                     SharedClipboardURICtxGetRunningTransfers(&pCtx->URI)));
 
-           int rc = VBoxClipboardWinOpen(hwnd);
+           int rc = SharedClipboardWinOpen(hwnd);
            if (RT_SUCCESS(rc))
            {
@@ -893 +893 @@
                                char    *papszList;
                                uint32_t cbList;
-                               rc = VBoxClipboardWinDropFilesToStringList((DROPFILES *)hDrop, &papszList, &cbList);
+                               rc = SharedClipboardWinDropFilesToStringList((DROPFILES *)hDrop, &papszList, &cbList);
 
                                GlobalUnlock(hClip);
@@ -934 +934 @@
                }
 
-               VBoxClipboardWinClose();
+               SharedClipboardWinClose();
            }
 
@@ -989 +989 @@
                        if (RT_SUCCESS(rc))
                        {
-                           rc = VBoxClipboardWinURITransferCreate(pWinCtx, pTransfer);
+                           rc = SharedClipboardWinURITransferCreate(pWinCtx, pTransfer);
                        }
                    }
@@ -1004 +1004 @@
            LogFunc(("WM_DESTROY\n"));
 
-           int rc = VBoxClipboardWinHandleWMDestroy(pWinCtx);
+           int rc = SharedClipboardWinHandleWMDestroy(pWinCtx);
            AssertRC(rc);
 
@@ -1074 +1074 @@
                          SWP_NOACTIVATE | SWP_HIDEWINDOW | SWP_NOCOPYBITS | SWP_NOREDRAW | SWP_NOSIZE);
 
-            VBoxClipboardWinChainAdd(pWinCtx);
-            if (!VBoxClipboardWinIsNewAPI(&pWinCtx->newAPI))
+            SharedClipboardWinChainAdd(pWinCtx);
+            if (!SharedClipboardWinIsNewAPI(&pWinCtx->newAPI))
                 pWinCtx->oldAPI.timerRefresh = SetTimer(pWinCtx->hWnd, 0, 10 * 1000 /* 10s */, NULL);
         }
@@ -1146 +1146 @@
     {
         /* Check if new Clipboard API is available. */
-        /* ignore rc */ VBoxClipboardWinCheckAndInitNewAPI(&pCtx->Win.newAPI);
+        /* ignore rc */ SharedClipboardWinCheckAndInitNewAPI(&pCtx->Win.newAPI);
 
         rc = VbglR3ClipboardConnectEx(&pCtx->CmdCtx);
@@ -1268 +1268 @@
                     * Forward the information to the window, so it can later
                     * respond to WM_RENDERFORMAT message. */
-                   ::PostMessage(pWinCtx->hWnd, VBOX_CLIPBOARD_WM_REPORT_FORMATS,
+                   ::PostMessage(pWinCtx->hWnd, SHCL_WIN_WM_REPORT_FORMATS,
                                  0 /* wParam */, (LPARAM)pEvent /* lParam */);
                    break;
@@ -1276 +1276 @@
                {
                    /* The host needs data in the specified format. */
-                   ::PostMessage(pWinCtx->hWnd, VBOX_CLIPBOARD_WM_READ_DATA,
+                   ::PostMessage(pWinCtx->hWnd, SHCL_WIN_WM_READ_DATA,
                                  0 /* wParam */, (LPARAM)pEvent /* lParam */);
                    break;