Changeset 73939 in vbox for trunk/src/VBox/HostServices

Timestamp:

Aug 29, 2018 7:56:40 AM (7 years ago)

Author:

vboxsync

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

124666

Message:

DnD/HostService: Renaming, docs.

Location:

trunk/src/VBox/HostServices/DragAndDrop

Files:

• dndmanager.h (modified) (2 diffs)
• service.cpp (modified) (14 diffs)

trunk/src/VBox/HostServices/DragAndDrop/dndmanager.h

@@ -59 +59 @@
             return VERR_NO_DATA;
 
-        *puMsg = m_pNextMsg->message();
-        *pcParms = m_pNextMsg->paramsCount();
+        *puMsg = m_pNextMsg->GetType();
+        *pcParms = m_pNextMsg->GetParamCount();
 
         return VINF_SUCCESS;
@@ -70 +70 @@
         if (!m_pNextMsg)
             return VERR_NO_DATA;
-
-        int rc = m_pNextMsg->getData(uMsg, cParms, paParms);
+        int rc = m_pNextMsg->GetData(uMsg, cParms, paParms);
 
         clearNextMsg();

trunk/src/VBox/HostServices/DragAndDrop/service.cpp

@@ -474 +474 @@
     if (rc == VINF_SUCCESS) /* Note: rc might be VINF_HGCM_ASYNC_EXECUTE! */
     {
-        LogFlowFunc(("Client %RU32: Protocol v%RU32\n", pClient->clientId(), pClient->protocol()));
+        LogFlowFunc(("Client %RU32: Protocol v%RU32\n", pClient->GetClientID(), pClient->GetProtocolVer()));
 
         rc = VERR_INVALID_PARAMETER; /* Play safe. */
@@ -553 +553 @@
                         rc = paParms[idxProto + 1].getUInt32(&data.uFlags);
                     if (RT_SUCCESS(rc))
-                        rc = pClient->setProtocol(data.uProtocol);
-                    if (RT_SUCCESS(rc))
-                    {
-                        LogFlowFunc(("Client %RU32 is now using protocol v%RU32\n", pClient->clientId(), pClient->protocol()));
+                        rc = pClient->SetProtocolVer(data.uProtocol);
+                    if (RT_SUCCESS(rc))
+                    {
+                        LogFlowFunc(("Client %RU32 is now using protocol v%RU32\n", pClient->GetClientID(), pClient->GetProtocolVer()));
                         DO_HOST_CALLBACK();
                     }
@@ -570 +570 @@
                 data.hdr.uMagic = CB_MAGIC_DND_HG_ACK_OP;
 
-                switch (pClient->protocol())
+                switch (pClient->GetProtocolVer())
                 {
                     case 3:
@@ -603 +603 @@
                 data.hdr.uMagic = CB_MAGIC_DND_HG_REQ_DATA;
 
-                switch (pClient->protocol())
+                switch (pClient->GetProtocolVer())
                 {
                     case 3:
@@ -638 +638 @@
                 data.hdr.uMagic = CB_MAGIC_DND_HG_EVT_PROGRESS;
 
-                switch (pClient->protocol())
+                switch (pClient->GetProtocolVer())
                 {
                     case 3:
@@ -682 +682 @@
                 data.hdr.uMagic = CB_MAGIC_DND_GH_ACK_PENDING;
 
-                switch (pClient->protocol())
+                switch (pClient->GetProtocolVer())
                 {
                     case 3:
@@ -761 +761 @@
             {
                 LogFlowFunc(("GUEST_DND_GH_SND_DATA\n"));
-                switch (pClient->protocol())
+                switch (pClient->GetProtocolVer())
                 {
                     case 3:
@@ -810 +810 @@
                 data.hdr.uMagic = CB_MAGIC_DND_GH_SND_DIR;
 
-                switch (pClient->protocol())
+                switch (pClient->GetProtocolVer())
                 {
                     case 3:
@@ -877 +877 @@
                 LogFlowFunc(("GUEST_DND_GH_SND_FILE_DATA\n"));
 
-                switch (pClient->protocol())
+                switch (pClient->GetProtocolVer())
                 {
                     /* Protocol v3 adds (optional) checksums. */
@@ -958 +958 @@
                 data.hdr.uMagic = CB_MAGIC_DND_GH_EVT_ERROR;
 
-                switch (pClient->protocol())
+                switch (pClient->GetProtocolVer())
                 {
                     case 3:
@@ -1008 +1008 @@
                 data.hdr.uMagic = CB_MAGIC_DND_GH_EVT_ERROR;
 
-                switch (pClient->protocol())
+                switch (pClient->GetProtocolVer())
                 {
                     case 3:
@@ -1165 +1165 @@
                     int rc2 = pClient->addMessageInfo(HOST_DND_HG_EVT_CANCEL,
                                                       /* Protocol v3+ also contains the context ID. */
-                                                      pClient->protocol() >= 3 ? 1 : 0);
+                                                      pClient->GetProtocolVer() >= 3 ? 1 : 0);
                     pClient->completeDeferred(rc2);
 
@@ -1233 +1233 @@
              * count. The message itself has to be queued.
              */
-            uint32_t uMsgClient = pClient->message();
+            uint32_t uMsgClient = pClient->GetMsgType();
 
             uint32_t uMsgNext   = 0;
@@ -1265 +1265 @@
                 {
                     LogFunc(("Client ID=%RU32 in wrong state with uMsg=%RU32 (next message in queue: %RU32), cancelling\n",
-                             pClient->clientId(), uMsgClient, uMsgNext));
+                             pClient->GetClientID(), uMsgClient, uMsgNext));
 
                     pClient->completeDeferred(VERR_CANCELLED);