Changeset 16932 in vbox for trunk

Timestamp:

Feb 18, 2009 8:42:18 PM (16 years ago)

Author:

vboxsync

Message:

OVF: try to fix windows burn

Location:

trunk/src/VBox/Main

Files:

• ApplianceImpl.cpp (modified) (10 diffs)
• include/ApplianceImpl.h (modified) (1 diff)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -1681 +1681 @@
     HRESULT rc = S_OK;
 
+    ComPtr<IVirtualBox> pVirtualBox(app->mVirtualBox);
+
     // rollback for errors:
     // 1) a list of images that we created/imported
@@ -1726 +1728 @@
             /* Now that we know the base system get our internal defaults based on that. */
             ComPtr<IGuestOSType> osType;
-            CHECK_ERROR_THROW(app->mVirtualBox, GetGuestOSType(Bstr(strOsTypeVBox), osType.asOutParam()));
+            CHECK_ERROR_THROW(pVirtualBox, GetGuestOSType(Bstr(strOsTypeVBox), osType.asOutParam()));
 
             /* Create the machine */
@@ -1735 +1737 @@
                                tr("Missing VM name"));
             const Utf8Str &strNameVBox = vsdeName.front()->strConfig;
-            CHECK_ERROR_THROW(app->mVirtualBox, CreateMachine(Bstr(strNameVBox), Bstr(strOsTypeVBox),
-                                                              Bstr(), Guid(),
-                                                              pNewMachine.asOutParam()));
+            CHECK_ERROR_THROW(pVirtualBox, CreateMachine(Bstr(strNameVBox), Bstr(strOsTypeVBox),
+                                                         Bstr(), Guid(),
+                                                         pNewMachine.asOutParam()));
 
             if (!task->progress.isNull())
@@ -1889 +1891 @@
 
             /* Now its time to register the machine before we add any hard disks */
-            CHECK_ERROR_THROW(app->mVirtualBox, RegisterMachine(pNewMachine));
+            CHECK_ERROR_THROW(pVirtualBox, RegisterMachine(pNewMachine));
 
             Guid newMachineId;
@@ -1913 +1915 @@
                     /* In order to attach hard disks we need to open a session
                      * for the new machine */
-                    CHECK_ERROR_THROW(app->mVirtualBox, OpenSession(session, newMachineId));
+                    CHECK_ERROR_THROW(pVirtualBox, OpenSession(session, newMachineId));
                     fSessionOpen = true;
 
@@ -1972 +1974 @@
                                 srcFormat = L"VMDK";
                             /* Create an empty hard disk */
-                            CHECK_ERROR_THROW(app->mVirtualBox, CreateHardDisk(srcFormat, Bstr(pcszDstFilePath), dstHdVBox.asOutParam()));
+                            CHECK_ERROR_THROW(pVirtualBox, CreateHardDisk(srcFormat, Bstr(pcszDstFilePath), dstHdVBox.asOutParam()));
 
                             /* Create a dynamic growing disk image with the given capacity */
@@ -1998 +2000 @@
 
                             /* First open the existing disk image */
-                            CHECK_ERROR_THROW(app->mVirtualBox, OpenHardDisk(Bstr(strSrcFilePath), srcHdVBox.asOutParam()));
+                            CHECK_ERROR_THROW(pVirtualBox, OpenHardDisk(Bstr(strSrcFilePath), srcHdVBox.asOutParam()));
                             fSourceHdNeedsClosing = true;
 
@@ -2005 +2007 @@
                             CHECK_ERROR_THROW(srcHdVBox, COMGETTER(Format)(srcFormat.asOutParam()));
                             /* Create a new hard disk interface for the destination disk image */
-                            CHECK_ERROR_THROW(app->mVirtualBox, CreateHardDisk(srcFormat, Bstr(pcszDstFilePath), dstHdVBox.asOutParam()));
+                            CHECK_ERROR_THROW(pVirtualBox, CreateHardDisk(srcFormat, Bstr(pcszDstFilePath), dstHdVBox.asOutParam()));
                             /* Clone the source disk image */
                             CHECK_ERROR_THROW(srcHdVBox, CloneTo(dstHdVBox, progress.asOutParam()));
@@ -2143 +2145 @@
         {
             const MyHardDiskAttachment &mhda = *itM;
-            rc2 = app->mVirtualBox->OpenSession(session, mhda.uuid);
+            rc2 = pVirtualBox->OpenSession(session, mhda.uuid);
             if (SUCCEEDED(rc2))
             {
@@ -2177 +2179 @@
             const Guid &guid = *itID;
             ComPtr<IMachine> failedMachine;
-            rc2 = app->mVirtualBox->UnregisterMachine(guid, failedMachine.asOutParam());
+            rc2 = pVirtualBox->UnregisterMachine(guid, failedMachine.asOutParam());
             if (SUCCEEDED(rc2))
                 rc2 = failedMachine->DeleteSettings();

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

@@ -83 +83 @@
 private:
     /** weak VirtualBox parent */
-    VirtualBox*         mVirtualBox;
+    const ComObjPtr <VirtualBox, ComWeakRef> mVirtualBox;
 
     struct Task; /* Worker thread for import */