Changeset 44249 in vbox for trunk/src/VBox

Timestamp:

Jan 8, 2013 11:08:44 AM (12 years ago)

Author:

vboxsync

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

83109

Message:

GuestControl/service: const, HostCmd -> VBOXGUESTCTRLHOSTCMD.

File:

• trunk/src/VBox/HostServices/GuestControl/service.cpp (modified) (7 diffs)

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

@@ -128 +128 @@
  * Structure for holding a buffered host command.
  */
-struct HostCmd
+typedef struct VBOXGUESTCTRLHOSTCMD
 {
     /** The context ID this command belongs to. Will be extracted
@@ -140 +140 @@
 
     /** The standard constructor. */
-    HostCmd() : mContextID(0), mTries(0) {}
+    VBOXGUESTCTRLHOSTCMD() : mContextID(0), mTries(0) {}
 };
 /** The host cmd list + iterator type */
-typedef std::list< HostCmd > HostCmdList;
-typedef std::list< HostCmd >::iterator HostCmdListIter;
-typedef std::list< HostCmd >::const_iterator HostCmdListIterConst;
+typedef std::list< VBOXGUESTCTRLHOSTCMD > HostCmdList;
+typedef std::list< VBOXGUESTCTRLHOSTCMD >::iterator HostCmdListIter;
+typedef std::list< VBOXGUESTCTRLHOSTCMD >::const_iterator HostCmdListIterConst;
 
 /**
@@ -281 +281 @@
     int paramBufferAllocate(PVBOXGUESTCTRPARAMBUFFER pBuf, uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
     void paramBufferFree(PVBOXGUESTCTRPARAMBUFFER pBuf);
-    int paramBufferAssign(VBOXHGCMSVCPARM paDstParms[], uint32_t cDstParms, PVBOXGUESTCTRPARAMBUFFER pSrcBuf);
+    int paramBufferAssign(VBOXHGCMSVCPARM paDstParms[], uint32_t cDstParms, const VBOXGUESTCTRPARAMBUFFER *pSrcBuf);
     int prepareExecute(uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
     int clientConnect(uint32_t u32ClientID, void *pvClient);
     int clientDisconnect(uint32_t u32ClientID, void *pvClient);
-    int assignHostCmdToGuest(HostCmd *pCmd, VBOXHGCMCALLHANDLE callHandle, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
+    int assignHostCmdToGuest(const VBOXGUESTCTRLHOSTCMD *pCmd, VBOXHGCMCALLHANDLE callHandle, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
     int retrieveNextHostCmd(uint32_t u32ClientID, VBOXHGCMCALLHANDLE callHandle, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
     int cancelHostCmd(uint32_t u32ContextID);
@@ -415 +415 @@
  * @param   pSrcBuf                 Parameter buffer to assign.
  */
-int Service::paramBufferAssign(VBOXHGCMSVCPARM paDstParms[], uint32_t cDstParms, PVBOXGUESTCTRPARAMBUFFER pSrcBuf)
+int Service::paramBufferAssign(VBOXHGCMSVCPARM paDstParms[], uint32_t cDstParms, const VBOXGUESTCTRPARAMBUFFER *pSrcBuf)
 {
     AssertPtr(pSrcBuf);
@@ -614 +614 @@
  * @param   paParms                 Array of parameters.
  */
-int Service::assignHostCmdToGuest(HostCmd *pCmd, VBOXHGCMCALLHANDLE callHandle, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
+int Service::assignHostCmdToGuest(const VBOXGUESTCTRLHOSTCMD *pCmd, VBOXHGCMCALLHANDLE callHandle, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
 {
     AssertPtrReturn(pCmd, VERR_INVALID_POINTER);
@@ -701 +701 @@
          * Get the next unassigned host command in the list.
          */
-         HostCmd &curCmd = mHostCmds.front();
+         VBOXGUESTCTRLHOSTCMD &curCmd = mHostCmds.front();
          rc = assignHostCmdToGuest(&curCmd, callHandle, cParms, paParms);
          if (RT_SUCCESS(rc))
@@ -883 +883 @@
     if (mNumClients == 0)
         return VERR_NOT_FOUND;
-    HostCmd newCmd;
+    VBOXGUESTCTRLHOSTCMD newCmd;
     int rc = paramBufferAllocate(&newCmd.mParmBuf, eFunction, cParms, paParms);
     if (   RT_SUCCESS(rc)