Changeset 55427 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Apr 24, 2015 2:49:11 PM (10 years ago)

Author:

vboxsync

Message:

No more auto_ptr.

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestDnDSourceImpl.cpp (modified) (4 diffs)
• GuestDnDTargetImpl.cpp (modified) (4 diffs)

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

@@ -27 +27 @@
 #include "AutoCaller.h"
 
-#include <memory>           /* For auto_ptr (deprecated) / unique_ptr, seee #7179. */
-
 #include <iprt/dir.h>
 #include <iprt/file.h>
@@ -328 +326 @@
             pRecvCtx->mFormat   = aFormat;
 
-            std::auto_ptr <RecvDataTask> pTask(new RecvDataTask(this, pRecvCtx));
+            RecvDataTask *pTask = new RecvDataTask(this, pRecvCtx);
             AssertReturn(pTask->isOk(), pTask->getRC());
 
             rc = RTThreadCreate(NULL, GuestDnDSource::i_receiveDataThread,
-                                (void *)pTask.get(), 0, RTTHREADTYPE_MAIN_WORKER, 0, "dndSrcRcvData");
+                                (void *)pTask, 0, RTTHREADTYPE_MAIN_WORKER, 0, "dndSrcRcvData");
             if (RT_SUCCESS(rc))
             {
@@ -338 +336 @@
                 ComAssertComRC(hr);
 
-                /* pTask is now owned by i_receiveDataThread(), so release it. */
-                pTask.release();
+                /* Note: pTask is now owned by the worker thread. */
             }
             else if (pRecvCtx)
@@ -700 +697 @@
     LogFlowFunc(("pvUser=%p\n", pvUser));
 
-    std::auto_ptr<RecvDataTask> pTask(static_cast<RecvDataTask*>(pvUser));
-    AssertPtr(pTask.get());
-
-    const ComObjPtr<GuestDnDSource> pTarget(pTask->getSource());
-    Assert(!pTarget.isNull());
-
-    AutoCaller autoCaller(pTarget);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    int rc = pTarget->i_receiveData(pTask->getCtx());
-    /* Nothing to do here anymore. */
-
-    LogFlowFunc(("pSource=%p returning rc=%Rrc\n", (GuestDnDSource *)pTarget, rc));
+    RecvDataTask *pTask = (RecvDataTask *)pvUser;
+    AssertPtrReturn(pTask, VERR_INVALID_POINTER);
+
+    const ComObjPtr<GuestDnDSource> pSource(pTask->getSource());
+    Assert(!pSource.isNull());
+
+    int rc;
+
+    AutoCaller autoCaller(pSource);
+    if (SUCCEEDED(autoCaller.rc()))
+    {
+        rc = pSource->i_receiveData(pTask->getCtx());
+        /* Nothing to do here anymore. */
+    }
+    else
+         rc = VERR_COM_INVALID_OBJECT_STATE;
+
+    LogFlowFunc(("pSource=%p returning rc=%Rrc\n", (GuestDnDSource *)pSource, rc));
+
+    delete pTask;
     return rc;
 }

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

@@ -28 +28 @@
 
 #include <algorithm>        /* For std::find(). */
-#include <memory>           /* For auto_ptr (deprecated) / unique_ptr, seee #7179. */
 
 #include <iprt/file.h>
@@ -485 +484 @@
     LogFlowFunc(("pvUser=%p\n", pvUser));
 
-    std::auto_ptr<SendDataTask> pTask(static_cast<SendDataTask*>(pvUser));
-    AssertPtr(pTask.get());
+    SendDataTask *pTask = (SendDataTask *)pvUser;
+    AssertPtrReturn(pTask, VERR_INVALID_POINTER);
 
     const ComObjPtr<GuestDnDTarget> pTarget(pTask->getTarget());
     Assert(!pTarget.isNull());
 
+    int rc;
+
     AutoCaller autoCaller(pTarget);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    int rc = pTarget->i_sendData(pTask->getCtx());
-    /* Nothing to do here anymore. */
+    if (SUCCEEDED(autoCaller.rc()))
+    {
+        rc = pTarget->i_sendData(pTask->getCtx());
+        /* Nothing to do here anymore. */
+    }
+    else
+         rc = VERR_COM_INVALID_OBJECT_STATE;
 
     LogFlowFunc(("pTarget=%p returning rc=%Rrc\n", (GuestDnDTarget *)pTarget, rc));
+
+    delete pTask;
     return rc;
 }
@@ -544 +550 @@
             pSendCtx->mData     = aData;
 
-            std::auto_ptr<SendDataTask> pTask(new SendDataTask(this, pSendCtx));
+            SendDataTask *pTask = new SendDataTask(this, pSendCtx);
             AssertReturn(pTask->isOk(), pTask->getRC());
 
             vrc = RTThreadCreate(NULL, GuestDnDTarget::i_sendDataThread,
-                                 (void *)pTask.get(), 0, RTTHREADTYPE_MAIN_WORKER, 0, "dndTgtSndData");
+                                 (void *)pTask, 0, RTTHREADTYPE_MAIN_WORKER, 0, "dndTgtSndData");
             if (RT_SUCCESS(vrc))
             {
@@ -554 +560 @@
                 ComAssertComRC(hr);
 
-                /* pTask is now owned by i_sendDataThread(), so release it. */
-                pTask.release();
+                /* Note: pTask is now owned by the worker thread. */
             }
             else if (pSendCtx)