Changeset 85318 in vbox for trunk/src/VBox/HostServices/common

Timestamp:

Jul 13, 2020 9:07:41 PM (5 years ago)

Author:

vboxsync

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

139296

Message:

HostServices: Clang 11++ adjustments. Eliminated pointless auto_ptr. Added a whole bunch of RT_NOEXCEPT to the DnD service abstraction. Misc cleanups. bugref:9790

Location:

trunk/src/VBox/HostServices/common

Files:

• client.cpp (modified) (16 diffs)
• message.cpp (modified) (15 diffs)

trunk/src/VBox/HostServices/common/client.cpp

@@ -27 +27 @@
 using namespace HGCM;
 
-Client::Client(uint32_t uClientID)
-    : m_uClientID(uClientID)
+Client::Client(uint32_t idClient)
+    : m_idClient(idClient)
     , m_uProtocolVer(0)
     , m_fDeferred(false)
@@ -49 +49 @@
  * @param   rcOp                Return code to return to the guest side.
  */
-int Client::completeInternal(VBOXHGCMCALLHANDLE hHandle, int rcOp)
-{
-    LogFlowThisFunc(("uClientID=%RU32\n", m_uClientID));
+int Client::completeInternal(VBOXHGCMCALLHANDLE hHandle, int rcOp) RT_NOEXCEPT
+{
+    LogFlowThisFunc(("idClient=%RU32\n", m_idClient));
 
     if (   m_SvcCtx.pHelpers
@@ -68 +68 @@
  * Resets the client's internal state.
  */
-void Client::reset(void)
+void Client::reset(void) RT_NOEXCEPT
 {
    m_fDeferred = false;
@@ -83 +83 @@
  * @param   rcOp                Return code to return to the guest side.
  */
-int Client::Complete(VBOXHGCMCALLHANDLE hHandle, int rcOp /* = VINF_SUCCESS */)
+int Client::Complete(VBOXHGCMCALLHANDLE hHandle, int rcOp /* = VINF_SUCCESS */) RT_NOEXCEPT
 {
     return completeInternal(hHandle, rcOp);
@@ -95 +95 @@
  * @param   rcOp                Return code to return to the guest side.
  */
-int Client::CompleteDeferred(int rcOp)
+int Client::CompleteDeferred(int rcOp) RT_NOEXCEPT
 {
     if (m_fDeferred)
@@ -108 +108 @@
     }
 
-    AssertMsg(m_fDeferred, ("Client %RU32 is not in deferred mode\n", m_uClientID));
+    AssertMsg(m_fDeferred, ("Client %RU32 is not in deferred mode\n", m_idClient));
     return VERR_INVALID_STATE;
 }
@@ -117 +117 @@
  * @returns HGCM handle.
  */
-VBOXHGCMCALLHANDLE Client::GetHandle(void) const
+VBOXHGCMCALLHANDLE Client::GetHandle(void) const RT_NOEXCEPT
 {
     return m_Deferred.hHandle;
@@ -127 +127 @@
  * @returns HGCM handle.
  */
-uint32_t Client::GetMsgType(void) const
+uint32_t Client::GetMsgType(void) const RT_NOEXCEPT
 {
     return m_Deferred.uType;
 }
 
-uint32_t Client::GetMsgParamCount(void) const
+uint32_t Client::GetMsgParamCount(void) const RT_NOEXCEPT
 {
     return m_Deferred.cParms;
@@ -142 +142 @@
  * @returns The client's (HGCM) ID.
  */
-uint32_t Client::GetClientID(void) const
-{
-    return m_uClientID;
+uint32_t Client::GetClientID(void) const RT_NOEXCEPT
+{
+    return m_idClient;
 }
 
@@ -152 +152 @@
  * @returns Protocol version, or 0 if not set.
  */
-uint32_t Client::GetProtocolVer(void) const
+uint32_t Client::GetProtocolVer(void) const RT_NOEXCEPT
 {
     return m_uProtocolVer;
@@ -162 +162 @@
  * @returns \c True if in deferred mode, \c False if not.
  */
-bool Client::IsDeferred(void) const
+bool Client::IsDeferred(void) const RT_NOEXCEPT
 {
     return m_fDeferred;
@@ -171 +171 @@
  * until CompleteDeferred() has been called.
  */
-void Client::SetDeferred(VBOXHGCMCALLHANDLE hHandle, uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
-{
-    LogFlowThisFunc(("uClient=%RU32\n", m_uClientID));
+void Client::SetDeferred(VBOXHGCMCALLHANDLE hHandle, uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM paParms[]) RT_NOEXCEPT
+{
+    LogFlowThisFunc(("uClient=%RU32\n", m_idClient));
 
 #ifndef DEBUG_bird /** r=bird: This bugger triggers in the DnD service when restoring saved state.  Not tested?  */
@@ -192 +192 @@
  * @param   uVersion            Version number to set.
  */
-void Client::SetProtocolVer(uint32_t uVersion)
+void Client::SetProtocolVer(uint32_t uVersion) RT_NOEXCEPT
 {
     m_uProtocolVer = uVersion;
@@ -202 +202 @@
  * @param   SvcCtx              Service context to set.
  */
-void Client::SetSvcContext(const VBOXHGCMSVCTX &SvcCtx)
+void Client::SetSvcContext(const VBOXHGCMSVCTX &SvcCtx) RT_NOEXCEPT
 {
     m_SvcCtx = SvcCtx;
@@ -216 +216 @@
  * @param   cParms              Number of parameters the message needs.
  */
-int Client::SetDeferredMsgInfo(uint32_t uMsg, uint32_t cParms)
+int Client::SetDeferredMsgInfo(uint32_t uMsg, uint32_t cParms) RT_NOEXCEPT
 {
     if (m_fDeferred)
@@ -243 +243 @@
  * @param   pMessage            Message to get message type and required parameters from.
  */
-int Client::SetDeferredMsgInfo(const Message *pMessage)
+int Client::SetDeferredMsgInfo(const Message *pMessage) RT_NOEXCEPT
 {
     AssertPtrReturn(pMessage, VERR_INVALID_POINTER);

trunk/src/VBox/HostServices/common/message.cpp

@@ -23 +23 @@
     : m_uMsg(0)
     , m_cParms(0)
-    , m_paParms(NULL) { }
+    , m_paParms(NULL)
+{
+}
 
 Message::Message(uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM aParms[])
@@ -41 +43 @@
  * Resets the message by free'ing all allocated parameters and resetting the rest.
  */
-void Message::reset(void)
+void Message::reset(void) RT_NOEXCEPT
 {
     if (m_paParms)
@@ -67 +69 @@
  * @returns Parameter count.
  */
-uint32_t Message::GetParamCount(void) const
+uint32_t Message::GetParamCount(void) const RT_NOEXCEPT
 {
     return m_cParms;
@@ -80 +82 @@
  * @param   aParms          Where to store the HGCM parameter data.
  */
-int Message::GetData(uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM aParms[]) const
+int Message::GetData(uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM aParms[]) const RT_NOEXCEPT
 {
     if (m_uMsg != uMsg)
@@ -103 +105 @@
  * @param   pu32Info        Where to store the parameter value.
  */
-int Message::GetParmU32(uint32_t uParm, uint32_t *pu32Info) const
+int Message::GetParmU32(uint32_t uParm, uint32_t *pu32Info) const RT_NOEXCEPT
 {
     AssertPtrNullReturn(pu32Info, VERR_INVALID_PARAMETER);
@@ -121 +123 @@
  * @param   pu64Info        Where to store the parameter value.
  */
-int Message::GetParmU64(uint32_t uParm, uint64_t *pu64Info) const
+int Message::GetParmU64(uint32_t uParm, uint64_t *pu64Info) const RT_NOEXCEPT
 {
     AssertPtrNullReturn(pu64Info, VERR_INVALID_PARAMETER);
@@ -142 +144 @@
  * @remarks Does not copy (store) the actual content of the pointer (deep copy).
  */
-int Message::GetParmPtr(uint32_t uParm, void **ppvAddr, uint32_t *pcbSize) const
+int Message::GetParmPtr(uint32_t uParm, void **ppvAddr, uint32_t *pcbSize) const RT_NOEXCEPT
 {
     AssertPtrNullReturn(ppvAddr, VERR_INVALID_PARAMETER);
@@ -160 +162 @@
  * @returns Message type.
  */
-uint32_t Message::GetType(void) const
+uint32_t Message::GetType(void) const RT_NOEXCEPT
 {
     return m_uMsg;
@@ -180 +182 @@
 int Message::CopyParms(PVBOXHGCMSVCPARM paParmsDst, uint32_t cParmsDst,
                        PVBOXHGCMSVCPARM paParmsSrc, uint32_t cParmsSrc,
-                       bool fDeepCopy)
+                       bool fDeepCopy) RT_NOEXCEPT
 {
     AssertPtrReturn(paParmsSrc, VERR_INVALID_POINTER);
@@ -188 +190 @@
         return VERR_BUFFER_OVERFLOW;
 
-    int rc = VINF_SUCCESS;
     for (uint32_t i = 0; i < cParmsSrc; i++)
     {
@@ -215 +216 @@
                         paParmsDst[i].u.pointer.addr = RTMemAlloc(paParmsDst[i].u.pointer.size);
                         if (!paParmsDst[i].u.pointer.addr)
-                        {
-                            rc = VERR_NO_MEMORY;
-                            break;
-                        }
+                            return VERR_NO_MEMORY;
                     }
                 }
@@ -225 +223 @@
                     /* No, but we have to check if there is enough room. */
                     if (paParmsDst[i].u.pointer.size < paParmsSrc[i].u.pointer.size)
-                    {
-                        rc = VERR_BUFFER_OVERFLOW;
-                        break;
-                    }
+                        return VERR_BUFFER_OVERFLOW;
                 }
 
@@ -235 +230 @@
                     if (   paParmsDst[i].u.pointer.addr
                         && paParmsDst[i].u.pointer.size)
-                    {
                         memcpy(paParmsDst[i].u.pointer.addr,
                                paParmsSrc[i].u.pointer.addr,
                                RT_MIN(paParmsDst[i].u.pointer.size, paParmsSrc[i].u.pointer.size));
-                    }
                     else
-                        rc = VERR_INVALID_POINTER;
+                        return VERR_INVALID_POINTER;
                 }
                 break;
@@ -248 +241 @@
             {
                 AssertMsgFailed(("Unknown HGCM type %u\n", paParmsSrc[i].type));
-                rc = VERR_INVALID_PARAMETER;
-                break;
+                return VERR_INVALID_PARAMETER;
             }
         }
-        if (RT_FAILURE(rc))
-            break;
-    }
-    return rc;
+    }
+    return VINF_SUCCESS;
 }
 
@@ -266 +256 @@
  * @param   aParms          Array of parameters to set.
  */
-int Message::initData(uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM aParms[])
-{
+int Message::initData(uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM aParms[]) RT_NOEXCEPT
+{
+    /** @todo r=bird: There is a define for the max number of HGCM parameters,
+     *        it's way smaller than 256, something like 61 IIRC. */
     AssertReturn(cParms < 256, VERR_INVALID_PARAMETER);
     AssertPtrNullReturn(aParms, VERR_INVALID_PARAMETER);