Changeset 2567 in vbox for trunk/src/VBox/Main/DVDImageImpl.cpp

Timestamp:

May 9, 2007 4:38:24 PM (18 years ago)

Author:

vboxsync

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

21034

Message:

Main & All Frontends: replaced the IGuestOSType IMachine::OSType property with the wstring IMachine::OSTypeId property (+ converted IGuest and IGuestOSType to VirtualBoxBaseNEXT semantics).

File:

• trunk/src/VBox/Main/DVDImageImpl.cpp (modified) (8 diffs)

trunk/src/VBox/Main/DVDImageImpl.cpp

@@ -32 +32 @@
 /////////////////////////////////////////////////////////////////////////////
 
+DEFINE_EMPTY_CTOR_DTOR (DVDImage)
+
 HRESULT DVDImage::FinalConstruct()
 {
@@ -49 +51 @@
  *  Initializes the DVD image object.
  *
- *  @param parent
+ *  @param aParent
  *      parent object
- *  @param filePath
+ *  @param aFilePath
  *      local file system path to the image file
  *      (can be relative to the VirtualBox config dir)
- *  @param isRegistered
+ *  @param aRegistered
  *      whether this object is being initialized by the VirtualBox init code
  *      because it is present in the registry
- *  @param id
+ *  @param aId
  *      ID of the DVD image to assign
  *
  *  @return          COM result indicator
  */
-HRESULT DVDImage::init (VirtualBox *parent, const BSTR filePath,
-                        BOOL isRegistered, const Guid &id)
-{
-    LogFlowMember (("DVDImage::init(): filePath={%ls}, id={%s}\n",
-                    filePath, id.toString().raw()));
-
-    ComAssertRet (parent && filePath && !!id, E_INVALIDARG);
-
-    AutoLock alock (this);
-    ComAssertRet (!isReady(), E_UNEXPECTED);
+HRESULT DVDImage::init (VirtualBox *aParent, const BSTR aFilePath,
+                        BOOL aRegistered, const Guid &aId)
+{
+    LogFlowThisFunc (("aFilePath={%ls}, aId={%s}\n",
+                      aFilePath, aId.toString().raw()));
+
+    ComAssertRet (aParent && aFilePath && !!aId, E_INVALIDARG);
+
+    /* Enclose the state transition NotReady->InInit->Ready */
+    AutoInitSpan autoInitSpan (this);
+    AssertReturn (autoInitSpan.isOk(), E_UNEXPECTED);
 
     HRESULT rc = S_OK;
 
-    mParent = parent;
-
-    unconst (mImageFile) = filePath;
-    unconst (mUuid) = id;
+    /* share the parent weakly */
+    unconst (mParent) = aParent;
+
+    /* register with parent early, since uninit() will unconditionally
+     * unregister on failure */
+    mParent->addDependentChild (this);
+
+    unconst (mImageFile) = aFilePath;
+    unconst (mUuid) = aId;
 
     /* get the full file name */
     char filePathFull [RTPATH_MAX];
-    int vrc = RTPathAbsEx (mParent->homeDir(), Utf8Str (filePath),
+    int vrc = RTPathAbsEx (mParent->homeDir(), Utf8Str (aFilePath),
                            filePathFull, sizeof (filePathFull));
     if (VBOX_FAILURE (vrc))
-        return setError (E_FAIL, tr ("Invalid image file path: '%ls' (%Vrc)"),
-                                 filePath, vrc);
+        return setError (E_FAIL,
+            tr ("Invalid image file path: '%ls' (%Vrc)"),
+                aFilePath, vrc);
 
     unconst (mImageFileFull) = filePathFull;
-    LogFlowMember (("              filePathFull={%ls}\n", mImageFileFull.raw()));
-
-    if (!isRegistered)
+    LogFlowThisFunc (("...filePathFull={%ls}\n", mImageFileFull.raw()));
+
+    if (!aRegistered)
     {
         /* check whether the given file exists or not */
@@ -109 +118 @@
     }
 
+    /* Confirm a successful initialization when it's the case */
     if (SUCCEEDED (rc))
-    {
-        mParent->addDependentChild (this);
-    }
-
-    setReady (SUCCEEDED (rc));
+        autoInitSpan.setSucceeded();
 
     return rc;
@@ -125 +131 @@
 void DVDImage::uninit()
 {
-    LogFlowMember (("DVDImage::uninit()\n"));
-
-    AutoLock alock (this);
-
-    LogFlowMember (("DVDImage::uninit(): isReady=%d\n", isReady()));
-
-    if (!isReady())
+    LogFlowThisFunc (("\n"));
+
+    /* Enclose the state transition Ready->InUninit->NotReady */
+    AutoUninitSpan autoUninitSpan (this);
+    if (autoUninitSpan.uninitDone())
         return;
 
-    setReady (false);
-
-    alock.leave();
+    LogFlowThisFunc (("initFailed()=%RTbool\n", autoUninitSpan.initFailed()));
+
     mParent->removeDependentChild (this);
-    alock.enter();
-
-    mParent.setNull();
+
+    unconst (mParent).setNull();
 }
 
@@ -146 +148 @@
 /////////////////////////////////////////////////////////////////////////////
 
-STDMETHODIMP DVDImage::COMGETTER(Id) (GUIDPARAMOUT id)
-{
-    if (!id)
-        return E_POINTER;
+STDMETHODIMP DVDImage::COMGETTER(Id) (GUIDPARAMOUT aId)
+{
+    if (!aId)
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    /* mUuid is constant during life time, no need to lock */
+    mUuid.cloneTo (aId);
+
+    return S_OK;
+}
+
+STDMETHODIMP DVDImage::COMGETTER(FilePath) (BSTR *aFilePath)
+{
+    if (!aFilePath)
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReaderLock alock (this);
+
+    mImageFileFull.cloneTo (aFilePath);
+
+    return S_OK;
+}
+
+STDMETHODIMP DVDImage::COMGETTER(Accessible) (BOOL *aAccessible)
+{
+    if (!aAccessible)
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
 
     AutoLock alock (this);
-    CHECK_READY();
-
-    mUuid.cloneTo (id);
-    return S_OK;
-}
-
-STDMETHODIMP DVDImage::COMGETTER(FilePath) (BSTR *filePath)
-{
-    if (!filePath)
-        return E_POINTER;
-
-    AutoLock alock (this);
-    CHECK_READY();
-
-    mImageFileFull.cloneTo (filePath);
-    return S_OK;
-}
-
-STDMETHODIMP DVDImage::COMGETTER(Accessible) (BOOL *accessible)
-{
-    if (!accessible)
-        return E_POINTER;
-
-    AutoLock alock (this);
-    CHECK_READY();
 
     HRESULT rc = S_OK;
@@ -196 +205 @@
     }
 
-    *accessible = mAccessible;
+    *aAccessible = mAccessible;
 
     return rc;
 }
 
-STDMETHODIMP DVDImage::COMGETTER(Size) (ULONG64 *size)
-{
-    if (!size)
+STDMETHODIMP DVDImage::COMGETTER(Size) (ULONG64 *aSize)
+{
+    if (!aSize)
         return E_POINTER;
 
     HRESULT rc = S_OK;
 
-    AutoLock alock (this);
-    CHECK_READY();
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReaderLock alock (this);
 
     RTFILE file;
@@ -227 +238 @@
 
         if (VBOX_SUCCESS (vrc))
-            *size = u64Size;
+            *aSize = u64Size;
         else
             rc = setError (E_FAIL,
@@ -258 +269 @@
     AssertReturnVoid (aNewPath);
 
+    AutoCaller autoCaller (this);
+    AssertComRCReturnVoid (autoCaller.rc());
+
     AutoLock alock (this);
-    AssertReturnVoid (isReady());
 
     unconst (mImageFileFull) = aNewFullPath;