Changeset 78346 in vbox for trunk/src

Timestamp:

Apr 29, 2019 11:07:26 AM (6 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: Build fix.

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp (modified) (2 diffs)
• Additions/haiku/VBoxTray/VBoxClipboard.cpp (modified) (2 diffs)
• Additions/x11/VBoxClient/clipboard.cpp (modified) (1 diff)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp (modified) (1 diff)

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

@@ -775 +775 @@
          * Listener message - the host has new formats to offer.
          */
-        case WM_USER + VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS:
+        case WM_USER + VBOX_SHARED_CLIPBOARD_HOST_MSG_REPORT_FORMATS:
             vgsvcClipboardOs2AdvertiseHostFormats(LONGFROMMP(mp1));
             break;
@@ -895 +895 @@
                          * respond do WM_RENDERFORMAT message.
                          */
-                        case VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS:
-                            if (!WinPostMsg(g_hwndWorker, WM_USER + VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS,
+                        case VBOX_SHARED_CLIPBOARD_HOST_MSG_REPORT_FORMATS:
+                            if (!WinPostMsg(g_hwndWorker, WM_USER + VBOX_SHARED_CLIPBOARD_HOST_MSG_REPORT_FORMATS,
                                             MPFROMLONG(fFormats), 0))
                                 VGSvcError("WinPostMsg(%lx, FORMATS,,) failed, lasterr=%#lx\n",

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

@@ -380 +380 @@
             switch (u32Msg)
             {
-                case VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS:
+                case VBOX_SHARED_CLIPBOARD_HOST_MSG_REPORT_FORMATS:
                 {
                     /*
@@ -386 +386 @@
                      * the information to the handler.
                      */
-                    LogRelFlowFunc(("VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS u32Formats=%x\n", u32Formats));
+                    LogRelFlowFunc(("VBOX_SHARED_CLIPBOARD_HOST_MSG_REPORT_FORMATS u32Formats=%x\n", u32Formats));
                     BMessage msg(VBOX_GUEST_CLIPBOARD_HOST_MSG_FORMATS);
                     msg.AddInt32("Formats", (uint32)u32Formats);

trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp

@@ -235 +235 @@
                      * future requests from guest applications.
                      */
-                    LogRelFlowFunc(("VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS fFormats=%x\n", fFormats));
+                    LogRelFlowFunc(("VBOX_SHARED_CLIPBOARD_HOST_MSG_REPORT_FORMATS fFormats=%x\n", fFormats));
                     ClipAnnounceFormatToX11(g_ctx.pBackend, fFormats);
                     break;

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp

@@ -45 +45 @@
  * VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA (request that the guest send the
  * contents of its clipboard to the host) and
- * VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS (to notify the guest that new
+ * VBOX_SHARED_CLIPBOARD_HOST_MSG_REPORT_FORMATS (to notify the guest that new
  * clipboard data is available).  If a host message is sent while the guest is
  * not waiting, it will be queued until the guest requests it.  At most one