Changeset 74459 in vbox for trunk

Timestamp:

Sep 25, 2018 2:29:05 PM (6 years ago)

Author:

vboxsync

Message:

DnD/VBoxClient: Logging, renaming.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp (modified) (7 diffs)

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

@@ -513 +513 @@
     /* Guest -> Host handling. */
     int ghIsDnDPending(void);
-    int ghDropped(const RTCString &strFormat, uint32_t action);
+    int ghDropped(const RTCString &strFormat, VBOXDNDACTION dndActionRequested);
 #endif
 
@@ -1672 +1672 @@
 {
     LogFlowThisFunc(("mode=%RU32, state=%RU32\n", m_enmMode, m_enmState));
-    LogFlowThisFunc(("uPosX=%RU32, uPosY=%RU32, dndActionDefault=%RU32\n", uPosX, uPosY, dndActionDefault));
+    LogFlowThisFunc(("uPosX=%RU32, uPosY=%RU32, dndActionDefault=0x%x\n", uPosX, uPosY, dndActionDefault));
 
     if (   m_enmMode  != HG
@@ -1869 +1869 @@
     RT_NOREF3(uPosX, uPosY, dndActionDefault);
     LogFlowThisFunc(("wndCur=%RU32, wndProxy=%RU32, mode=%RU32, state=%RU32\n", m_wndCur, m_wndProxy.hWnd, m_enmMode, m_enmState));
-    LogFlowThisFunc(("uPosX=%RU32, uPosY=%RU32, dndActionDefault=%RU32\n", uPosX, uPosY, dndActionDefault));
+    LogFlowThisFunc(("uPosX=%RU32, uPosY=%RU32, dndActionDefault=0x%x\n", uPosX, uPosY, dndActionDefault));
 
     if (   m_enmMode  != HG
@@ -2106 +2106 @@
     rc2 = VbglR3DnDGHSendAckPending(&m_dndCtx, dndActionDefault, dndActionList,
                                     strFormats.c_str(), strFormats.length() + 1 /* Include termination */);
-    LogFlowThisFunc(("uClientID=%RU32, uDefAction=0x%x, uLstActions=0x%x, strFormats=%s, rc=%Rrc\n",
+    LogFlowThisFunc(("uClientID=%RU32, dndActionDefault=0x%x, dndActionList=0x%x, strFormats=%s, rc=%Rrc\n",
                      m_dndCtx.uClientID, dndActionDefault, dndActionList, strFormats.c_str(), rc2));
     if (RT_FAILURE(rc2))
@@ -2125 +2125 @@
  * @returns IPRT status code.
  * @param   strFormat               Requested format to send to the host.
- * @param   uAction                 Requested action to perform on the guest.
- */
-int DragInstance::ghDropped(const RTCString &strFormat, uint32_t uAction)
-{
-    LogFlowThisFunc(("mode=%RU32, state=%RU32, strFormat=%s, uAction=%RU32\n",
-                     m_enmMode, m_enmState, strFormat.c_str(), uAction));
+ * @param   dndActionRequested      Requested action to perform on the guest.
+ */
+int DragInstance::ghDropped(const RTCString &strFormat, VBOXDNDACTION dndActionRequested)
+{
+    LogFlowThisFunc(("mode=%RU32, state=%RU32, strFormat=%s, dndActionRequested=0x%x\n",
+                     m_enmMode, m_enmState, strFormat.c_str(), dndActionRequested));
 
     /* Currently in wrong mode? Bail out. */
@@ -2264 +2264 @@
                     if (RT_SUCCESS(rc))
                     {
-                        rc = m_wndProxy.sendFinished(wndSource, uAction);
+                        rc = m_wndProxy.sendFinished(wndSource, dndActionRequested);
                     }
                     else
@@ -2933 +2933 @@
     bool fDropAccepted = dndAction > VBOX_DND_ACTION_IGNORE;
 
-    LogFlowFunc(("dndAction=%RU32\n", dndAction));
+    LogFlowFunc(("dndAction=0x%x\n", dndAction));
 
     /* Confirm the result of the transfer to the target window. */