vbox的更動 58370 路徑 trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp

時間撮記:

2015-10-22 上午10:34:26 (9 年 以前)

作者:

vboxsync

訊息:

DnD: Warnings.

檔案:

• trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp (修改) (8 筆差異)

trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp

@@ -243 +243 @@
                               DnDAction_T                      aDefaultAction,
                               const std::vector<DnDAction_T>  &aAllowedActions,
-                              const GuestDnDMIMEList           &aFormats,
+                              const GuestDnDMIMEList          &aFormats,
                               DnDAction_T                     *aResultAction)
 {
@@ -281 +281 @@
      * as GuestDnDTarget acts as a source for the guest.
      */
-    Utf8Str strFormats = GuestDnD::toFormatString(GuestDnD::toFilteredFormatList(m_lstFmtSupported, aFormats));
+    Utf8Str strFormats       = GuestDnD::toFormatString(GuestDnD::toFilteredFormatList(m_lstFmtSupported, aFormats));
     if (strFormats.isEmpty())
         return setError(E_INVALIDARG, tr("No or not supported format(s) specified"));
+    const uint32_t cbFormats = (uint32_t)strFormats.length() + 1; /* Include terminating zero. */
 
     LogRel2(("DnD: Offered formats to guest:\n"));
@@ -310 +311 @@
         Msg.setNextUInt32(uDefAction);
         Msg.setNextUInt32(uAllowedActions);
-        Msg.setNextPointer((void*)strFormats.c_str(), strFormats.length() + 1);
-        Msg.setNextUInt32(strFormats.length() + 1);
+        Msg.setNextPointer((void *)strFormats.c_str(), cbFormats);
+        Msg.setNextUInt32(cbFormats);
 
         rc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
@@ -368 +369 @@
      * as GuestDnDTarget acts as a source for the guest.
      */
-    Utf8Str strFormats = GuestDnD::toFormatString(GuestDnD::toFilteredFormatList(m_lstFmtSupported, aFormats));
+    Utf8Str strFormats       = GuestDnD::toFormatString(GuestDnD::toFilteredFormatList(m_lstFmtSupported, aFormats));
     if (strFormats.isEmpty())
         return setError(E_INVALIDARG, tr("No or not supported format(s) specified"));
+    const uint32_t cbFormats = (uint32_t)strFormats.length() + 1; /* Include terminating zero. */
 
     HRESULT hr = S_OK;
@@ -386 +388 @@
         Msg.setNextUInt32(uDefAction);
         Msg.setNextUInt32(uAllowedActions);
-        Msg.setNextPointer((void*)strFormats.c_str(), strFormats.length() + 1);
-        Msg.setNextUInt32(strFormats.length() + 1);
+        Msg.setNextPointer((void *)strFormats.c_str(), cbFormats);
+        Msg.setNextUInt32(cbFormats);
 
         rc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
@@ -483 +485 @@
      * as GuestDnDTarget acts as a source for the guest.
      */
-    Utf8Str strFormats = GuestDnD::toFormatString(GuestDnD::toFilteredFormatList(m_lstFmtSupported, aFormats));
+    Utf8Str strFormats       = GuestDnD::toFormatString(GuestDnD::toFilteredFormatList(m_lstFmtSupported, aFormats));
     if (strFormats.isEmpty())
         return setError(E_INVALIDARG, tr("No or not supported format(s) specified"));
+    const uint32_t cbFormats = (uint32_t)strFormats.length() + 1; /* Include terminating zero. */
 
     /* Adjust the coordinates in a multi-monitor setup. */
@@ -500 +503 @@
         Msg.setNextUInt32(uDefAction);
         Msg.setNextUInt32(uAllowedActions);
-        Msg.setNextPointer((void*)strFormats.c_str(), strFormats.length() + 1);
-        Msg.setNextUInt32(strFormats.length() + 1);
+        Msg.setNextPointer((void*)strFormats.c_str(), cbFormats);
+        Msg.setNextUInt32(cbFormats);
 
         int rc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
@@ -1325 +1328 @@
          */
         void    *pvFmt = (void *)pCtx->mFmtReq.c_str();
-        uint32_t cbFmt = pCtx->mFmtReq.length() + 1;        /* Include terminating zero. */
+        uint32_t cbFmt = (uint32_t)pCtx->mFmtReq.length() + 1;           /* Include terminating zero. */
 
         pData->setFmt(pvFmt, cbFmt);