VirtualBox

Ignore:
Timestamp:
Jan 23, 2019 6:23:04 PM (6 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
128342
Message:

Guest Control: Unifying terminology for (client/host) commands, functions and messages; it's all about messages now. Renaming, no functional changes.

Location:
trunk/src/VBox
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox

    • Property svn:mergeinfo

      •  

        old new  
        88/branches/VBox-5.0/src/VBox:104938,104943,104950,104987-104988,104990,106453
        99/branches/VBox-5.1/src/VBox:112367,116543,116550,116568,116573
        10 /branches/VBox-5.2/src/VBox:119536,120083,120099,120213,120221,120239,123597-123598,123600-123601,123755,124263,124273,124277-124279,124284-124286,124288-124290,125768,125779-125780,125812
         10/branches/VBox-5.2/src/VBox:119536,120083,120099,120213,120221,120239,123597-123598,123600-123601,123755,124263,124273,124277-124279,124284-124286,124288-124290,125768,125779-125780,125812,127158-127159,127162-127167,127180
        1111/branches/andy/draganddrop/src/VBox:90781-91268
        1212/branches/andy/guestctrl20/src/VBox:78916,78930

  • trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp

    r76553 r76958  
    245245    Assert(g_idControlSvcClient > 0);
    246246
    247     /* Allocate a scratch buffer for commands which also send
     247    /* Allocate a scratch buffer for messages which also send
    248248     * payload data with them. */
    249249    uint32_t cbScratchBuf = _64K; /** @todo Make buffer size configurable via guest properties/argv! */
    … …  
    264264            cRetrievalFailed = 0; /* Reset failed retrieval count. */
    265265            VGSvcVerbose(4, "idMsg=%RU32 (%s) (%RU32 parms) retrieved\n",
    266                          idMsg, GstCtrlHostFnName((eHostFn)idMsg), ctxHost.uNumParms);
     266                         idMsg, GstCtrlHostMsgtoStr((eHostMsg)idMsg), ctxHost.uNumParms);
    267267
    268268            /*
    … …  
    271271            switch (idMsg)
    272272            {
    273                 case HOST_CANCEL_PENDING_WAITS:
     273                case HOST_MSG_CANCEL_PENDING_WAITS:
    274274                    VGSvcVerbose(1, "We were asked to quit ...\n");
    275275                    break;
    276276
    277                 case HOST_SESSION_CREATE:
     277                case HOST_MSG_SESSION_CREATE:
    278278                    rc = vgsvcGstCtrlHandleSessionOpen(&ctxHost);
    279279                    break;
    280280
    281281                /* This message is also sent to the child session process (by the host). */
    282                 case HOST_SESSION_CLOSE:
     282                case HOST_MSG_SESSION_CLOSE:
    283283                    rc = vgsvcGstCtrlHandleSessionClose(&ctxHost);
    284284                    break;
    … …  
    289289                        rc = VbglR3GuestCtrlMsgSkip(g_idControlSvcClient, VERR_NOT_SUPPORTED, idMsg);
    290290                        VGSvcVerbose(1, "Skipped unexpected message idMsg=%RU32 (%s), cParms=%RU32 (rc=%Rrc)\n",
    291                                      idMsg, GstCtrlHostFnName((eHostFn)idMsg), ctxHost.uNumParms, rc);
     291                                     idMsg, GstCtrlHostMsgtoStr((eHostMsg)idMsg), ctxHost.uNumParms, rc);
    292292                    }
    293293                    else
    … …  
    300300
    301301            /* Do we need to shutdown? */
    302             if (idMsg == HOST_CANCEL_PENDING_WAITS)
     302            if (idMsg == HOST_MSG_CANCEL_PENDING_WAITS)
    303303                break;
    304304
    … …  
    561561#endif
    562562    "    --control-interval      Specifies the interval at which to check for\n"
    563     "                            new control commands. The default is 1000 ms.\n"
     563    "                            new control messages. The default is 1000 ms.\n"
    564564    ,
    565565    /* methods */

  • trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp

    r76553 r76958  
    939939                                                *ppvScratchBuf, RT_MIN(cbInput, *pcbScratchBuf));
    940940            if (RT_FAILURE(rc))
    941                 VGSvcError("Error handling input command for PID=%RU32, rc=%Rrc\n", uPID, rc);
     941                VGSvcError("Error handling input message for PID=%RU32, rc=%Rrc\n", uPID, rc);
    942942            VGSvcGstCtrlProcessRelease(pProcess);
    943943        }
    … …  
    11291129    switch (uMsg)
    11301130    {
    1131         case HOST_SESSION_CLOSE:
     1131        case HOST_MSG_SESSION_CLOSE:
    11321132            /* Shutdown (this spawn). */
    11331133            rc = VGSvcGstCtrlSessionClose(pSession);
    … …  
    11351135            break;
    11361136
    1137         case HOST_DIR_REMOVE:
     1137        case HOST_MSG_DIR_REMOVE:
    11381138            if (fImpersonated)
    11391139                rc = vgsvcGstCtrlSessionHandleDirRemove(pSession, pHostCtx);
    11401140            break;
    11411141
    1142         case HOST_EXEC_CMD:
     1142        case HOST_MSG_EXEC_CMD:
    11431143            rc = vgsvcGstCtrlSessionHandleProcExec(pSession, pHostCtx);
    11441144            break;
    11451145
    1146         case HOST_EXEC_SET_INPUT:
     1146        case HOST_MSG_EXEC_SET_INPUT:
    11471147            rc = vgsvcGstCtrlSessionHandleProcInput(pSession, pHostCtx, ppvScratchBuf, pcbScratchBuf);
    11481148            break;
    11491149
    1150         case HOST_EXEC_GET_OUTPUT:
     1150        case HOST_MSG_EXEC_GET_OUTPUT:
    11511151            rc = vgsvcGstCtrlSessionHandleProcOutput(pSession, pHostCtx);
    11521152            break;
    11531153
    1154         case HOST_EXEC_TERMINATE:
     1154        case HOST_MSG_EXEC_TERMINATE:
    11551155            rc = vgsvcGstCtrlSessionHandleProcTerminate(pSession, pHostCtx);
    11561156            break;
    11571157
    1158         case HOST_EXEC_WAIT_FOR:
     1158        case HOST_MSG_EXEC_WAIT_FOR:
    11591159            rc = vgsvcGstCtrlSessionHandleProcWaitFor(pSession, pHostCtx);
    11601160            break;
    11611161
    1162         case HOST_FILE_OPEN:
     1162        case HOST_MSG_FILE_OPEN:
    11631163            if (fImpersonated)
    11641164                rc = vgsvcGstCtrlSessionHandleFileOpen(pSession, pHostCtx);
    11651165            break;
    11661166
    1167         case HOST_FILE_CLOSE:
     1167        case HOST_MSG_FILE_CLOSE:
    11681168            if (fImpersonated)
    11691169                rc = vgsvcGstCtrlSessionHandleFileClose(pSession, pHostCtx);
    11701170            break;
    11711171
    1172         case HOST_FILE_READ:
     1172        case HOST_MSG_FILE_READ:
    11731173            if (fImpersonated)
    11741174                rc = vgsvcGstCtrlSessionHandleFileRead(pSession, pHostCtx, ppvScratchBuf, pcbScratchBuf);
    11751175            break;
    11761176
    1177         case HOST_FILE_READ_AT:
     1177        case HOST_MSG_FILE_READ_AT:
    11781178            if (fImpersonated)
    11791179                rc = vgsvcGstCtrlSessionHandleFileReadAt(pSession, pHostCtx, ppvScratchBuf, pcbScratchBuf);
    11801180            break;
    11811181
    1182         case HOST_FILE_WRITE:
     1182        case HOST_MSG_FILE_WRITE:
    11831183            if (fImpersonated)
    11841184                rc = vgsvcGstCtrlSessionHandleFileWrite(pSession, pHostCtx, ppvScratchBuf, pcbScratchBuf);
    11851185            break;
    11861186
    1187         case HOST_FILE_WRITE_AT:
     1187        case HOST_MSG_FILE_WRITE_AT:
    11881188            if (fImpersonated)
    11891189                rc = vgsvcGstCtrlSessionHandleFileWriteAt(pSession, pHostCtx, ppvScratchBuf, pcbScratchBuf);
    11901190            break;
    11911191
    1192         case HOST_FILE_SEEK:
     1192        case HOST_MSG_FILE_SEEK:
    11931193            if (fImpersonated)
    11941194                rc = vgsvcGstCtrlSessionHandleFileSeek(pSession, pHostCtx);
    11951195            break;
    11961196
    1197         case HOST_FILE_TELL:
     1197        case HOST_MSG_FILE_TELL:
    11981198            if (fImpersonated)
    11991199                rc = vgsvcGstCtrlSessionHandleFileTell(pSession, pHostCtx);
    12001200            break;
    12011201
    1202         case HOST_PATH_RENAME:
     1202        case HOST_MSG_PATH_RENAME:
    12031203            if (fImpersonated)
    12041204                rc = vgsvcGstCtrlSessionHandlePathRename(pSession, pHostCtx);
    12051205            break;
    12061206
    1207         case HOST_PATH_USER_DOCUMENTS:
     1207        case HOST_MSG_PATH_USER_DOCUMENTS:
    12081208            if (fImpersonated)
    12091209                rc = vgsvcGstCtrlSessionHandlePathUserDocuments(pSession, pHostCtx);
    12101210            break;
    12111211
    1212         case HOST_PATH_USER_HOME:
     1212        case HOST_MSG_PATH_USER_HOME:
    12131213            if (fImpersonated)
    12141214                rc = vgsvcGstCtrlSessionHandlePathUserHome(pSession, pHostCtx);
    … …  
    15291529        {
    15301530            /*
    1531              * Allocate a scratch buffer for commands which also send payload data with them.
     1531             * Allocate a scratch buffer for messages which also send payload data with them.
    15321532             * This buffer may grow if the host sends us larger chunks of data.
    15331533             */
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette