Changeset 80847 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Sep 17, 2019 9:38:16 AM (6 years ago)

Author:

vboxsync

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

133417

Message:

Shared Clipboard/URI: More renaming to make code base more uniform.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp (modified) (11 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp

@@ -307 +307 @@
                  * Do the format advertising.
                  */
-                if (fFormats & (VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT/* | VBOX_SHARED_CLIPBOARD_FMT_HTML ?? */))
+                if (fFormats & (VBOX_SHCL_FMT_UNICODETEXT/* | VBOX_SHCL_FMT_HTML ?? */))
                 {
                     if (!WinSetClipbrdData(g_habWorker, 0, CF_TEXT, CFI_POINTER))
@@ -315 +315 @@
                         VGSvcError("WinSetClipbrdData(,,g_atomOdin32UnicodeText,) failed, lasterr=%lx\n", WinGetLastError(g_habWorker));
                 }
-                if (fFormats & VBOX_SHARED_CLIPBOARD_FMT_BITMAP)
+                if (fFormats & VBOX_SHCL_FMT_BITMAP)
                 {
                     /** @todo bitmaps */
@@ -413 +413 @@
          * -lazybird
          */
-        Assert(fFormat & VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT);
+        Assert(fFormat & VBOX_SHCL_FMT_UNICODETEXT);
         char *pszUtf8;
         int rc = RTUtf16ToUtf8((PCRTUTF16)pv, &pszUtf8);
@@ -464 +464 @@
     if (    usFmt == CF_TEXT
         ||  usFmt == g_atomOdin32UnicodeText)
-        fFormat = VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT;
+        fFormat = VBOX_SHCL_FMT_UNICODETEXT;
     else /** @todo bitmaps */
         fFormat = 0;
@@ -544 +544 @@
         uint32_t cb = 0;
 
-        if (fFormat & VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
+        if (fFormat & VBOX_SHCL_FMT_UNICODETEXT)
         {
             /* Got any odin32 unicode text? */
@@ -607 +607 @@
         if (    ulFormat == CF_TEXT
             ||  ulFormat == g_atomOdin32UnicodeText)
-            fFormats |= VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT;
+            fFormats |= VBOX_SHCL_FMT_UNICODETEXT;
         /** @todo else bitmaps and stuff. */
     }
@@ -775 +775 @@
          * Listener message - the host has new formats to offer.
          */
-        case WM_USER + VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_REPORT:
+        case WM_USER + VBOX_SHCL_HOST_MSG_FORMATS_REPORT:
             vgsvcClipboardOs2AdvertiseHostFormats(LONGFROMMP(mp1));
             break;
@@ -782 +782 @@
          * Listener message - the host wish to read our clipboard data.
          */
-        case WM_USER + VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA:
+        case WM_USER + VBOX_SHCL_HOST_MSG_READ_DATA:
             vgsvcClipboardOs2SendDataToHost(LONGFROMMP(mp1));
             break;
@@ -895 +895 @@
                          * respond do WM_RENDERFORMAT message.
                          */
-                        case VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_REPORT:
-                            if (!WinPostMsg(g_hwndWorker, WM_USER + VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_REPORT,
+                        case VBOX_SHCL_HOST_MSG_FORMATS_REPORT:
+                            if (!WinPostMsg(g_hwndWorker, WM_USER + VBOX_SHCL_HOST_MSG_FORMATS_REPORT,
                                             MPFROMLONG(fFormats), 0))
                                 VGSvcError("WinPostMsg(%lx, FORMATS,,) failed, lasterr=%#lx\n",
@@ -905 +905 @@
                          * The host needs data in the specified format.
                          */
-                        case VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA:
-                            if (!WinPostMsg(g_hwndWorker, WM_USER + VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA,
+                        case VBOX_SHCL_HOST_MSG_READ_DATA:
+                            if (!WinPostMsg(g_hwndWorker, WM_USER + VBOX_SHCL_HOST_MSG_READ_DATA,
                                             MPFROMLONG(fFormats), 0))
                                 VGSvcError("WinPostMsg(%lx, READ_DATA,,) failed, lasterr=%#lx\n",
@@ -915 +915 @@
                          * The host is terminating.
                          */
-                        case VBOX_SHARED_CLIPBOARD_HOST_MSG_QUIT:
+                        case VBOX_SHCL_HOST_MSG_QUIT:
                             fQuit = true;
                             break;