Changeset 41232 in vbox for trunk

Timestamp:

May 10, 2012 12:08:43 PM (13 years ago)

Author:

vboxsync

Message:

various fixes for openMedium->findMedium change 6130 inc return statuses

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManage.h (modified) (1 diff)
• Main/src-server/ApplianceImpl.cpp (modified) (1 diff)
• Main/src-server/ApplianceImplExport.cpp (modified) (1 diff)
• Main/src-server/VirtualBoxImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

@@ -226 +226 @@
 /* VBoxManageDisk.cpp */
 HRESULT findMedium(HandlerArg *a, const char *pszFilenameOrUuid,
-                                   DeviceType_T enmDevType, bool fSilent,
-                                                      ComPtr<IMedium> &pMedium);
+                   DeviceType_T enmDevType, bool fSilent,
+                   ComPtr<IMedium> &pMedium);
 HRESULT findOrOpenMedium(HandlerArg *a, const char *pszFilenameOrUuid,
                          DeviceType_T enmDevType, ComPtr<IMedium> &pMedium,

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

@@ -627 +627 @@
     /** @todo: Maybe too cost-intensive; try to find a lighter way */
     while (    RTPathExists(tmpName)
-            || mVirtualBox->OpenMedium(Bstr(tmpName).raw(), DeviceType_HardDisk, AccessMode_ReadWrite, FALSE /* fForceNewUuid */,  &harddisk)
+            || mVirtualBox->OpenMedium(Bstr(tmpName).raw(), DeviceType_HardDisk, AccessMode_ReadWrite, FALSE /* fForceNewUuid */,  &harddisk) != VBOX_E_OBJECT_NOT_FOUND 
           )
     {

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

@@ -795 +795 @@
 
         Log(("Finding source disk \"%ls\"\n", bstrSrcFilePath.raw()));
-        HRESULT rc = mVirtualBox->OpenMedium(bstrSrcFilePath.raw(), DeviceType_HardDisk, AccessMode_ReadWrite, FALSE /* fForceNewUuid */,  pSourceDisk.asOutParam());
+        HRESULT rc = mVirtualBox->OpenMedium(bstrSrcFilePath.raw(), DeviceType_HardDisk, AccessMode_ReadWrite, FALSE /* fForceNewUuid */,  pSourceDisk.asOutParam());
         if (FAILED(rc)) throw rc;
 

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

@@ -1695 +1695 @@
                                     IMedium **aMedium)
 {
+    HRESULT rc = S_OK;
     CheckComArgStrNotEmptyOrNull(aLocation);
     CheckComArgOutPointerValid(aMedium);
@@ -1713 +1714 @@
     {
         case DeviceType_HardDisk:
-            findHardDiskByLocation(aLocation,
+            rc = findHardDiskByLocation(aLocation,
                                    false, /* aSetError */
                                    &pMedium);
@@ -1720 +1721 @@
         case DeviceType_Floppy:
         case DeviceType_DVD:
-            findDVDOrFloppyImage(deviceType,
+            rc = findDVDOrFloppyImage(deviceType,
                                  NULL, /* guid */
                                  aLocation,
@@ -1732 +1733 @@
 
         default:
-            return setError(E_INVALIDARG, "Device type must be HardDisk, DVD or Floppy");
-    }
-
-    HRESULT rc = S_OK;
+            return setError(E_INVALIDARG, "Device type must be HardDisk, DVD or Floppy %d", deviceType);
+    }
+
 
     if (pMedium.isNull())
@@ -1758 +1758 @@
              * with the parent and this association needs to be broken. */
 
-            if (FAILED(rc))
+            if (FAILED(rc)){
                 pMedium->uninit();
-        }
+                rc = VBOX_E_OBJECT_NOT_FOUND;
+            }
+        }
+        else
+            rc = VBOX_E_OBJECT_NOT_FOUND;
     }