Changeset 49866 in vbox for trunk/src/VBox/Main

Timestamp:

Dec 10, 2013 12:41:47 PM (11 years ago)

Author:

vboxsync

Message:

Main/Medium: fix regression in the wrapper conversion which caused hangs on every IMedium.close call

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (1 diff)
• include/MediumImpl.h (modified) (1 diff)
• src-server/MediumImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -13849 +13849 @@
     </method>
 
-    <method name="close">
+    <method name="close" wrap-hint-server="passcaller">
       <desc>
         Closes this medium.

trunk/src/VBox/Main/include/MediumImpl.h

@@ -239 +239 @@
     HRESULT lockRead(ComPtr<IToken> &aToken);
     HRESULT lockWrite(ComPtr<IToken> &aToken);
-    HRESULT close();
+    HRESULT close(AutoCaller &aAutoCaller);
     HRESULT getProperty(const com::Utf8Str &aName,
                         com::Utf8Str &aValue);

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -2146 +2146 @@
 }
 
-HRESULT Medium::close()
-{
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
+HRESULT Medium::close(AutoCaller &aAutoCaller)
+{
     // make a copy of VirtualBox pointer which gets nulled by uninit()
     ComObjPtr<VirtualBox> pVirtualBox(m->pVirtualBox);
 
-    MultiResult mrc = i_close(autoCaller);
+    MultiResult mrc = i_close(aAutoCaller);
 
     pVirtualBox->saveModifiedRegistries();