Changeset 45600 in vbox

Timestamp:

Apr 18, 2013 9:58:31 AM (12 years ago)

Author:

vboxsync

Message:

ApplianceImplExport.cpp: Added check for pAudioAdapter->COMGETTER(Enabled) result. Removed unused Bstr variables (confusing). Moved variables to where they are used.

File:

• trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp (modified) (2 diffs)

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

@@ -87 +87 @@
         pNewDesc->m->pMachine = this;
 
-        // now fill it with description items
-        Bstr bstrName1;
-        Bstr bstrDescription;
-        Bstr bstrGuestOSType;
-        uint32_t cCPUs;
-        uint32_t ulMemSizeMB;
+        // first, call the COM methods, as they request locks
+        ComPtr<IUSBController> pUsbController;
+        rc = COMGETTER(USBController)(pUsbController.asOutParam());
         BOOL fUSBEnabled;
-        BOOL fAudioEnabled;
-        AudioControllerType_T audioController;
-
-        ComPtr<IUSBController> pUsbController;
-        ComPtr<IAudioAdapter> pAudioAdapter;
-
-        // first, call the COM methods, as they request locks
-        rc = COMGETTER(USBController)(pUsbController.asOutParam());
         if (FAILED(rc))
             fUSBEnabled = false;
         else
+        {
             rc = pUsbController->COMGETTER(Enabled)(&fUSBEnabled);
+            if (FAILED(rc)) throw rc;
+        }
 
         // request the machine lock while accessing internal members
         AutoReadLock alock1(this COMMA_LOCKVAL_SRC_POS);
 
-        pAudioAdapter = mAudioAdapter;
+        ComPtr<IAudioAdapter> pAudioAdapter = mAudioAdapter;
+        BOOL fAudioEnabled;
         rc = pAudioAdapter->COMGETTER(Enabled)(&fAudioEnabled);
         if (FAILED(rc)) throw rc;
+        AudioControllerType_T audioController;
         rc = pAudioAdapter->COMGETTER(AudioController)(&audioController);
         if (FAILED(rc)) throw rc;
@@ -123 +117 @@
         Utf8Str strOsTypeVBox = mUserData->s.strOsType;
         // CPU count
-        cCPUs = mHWData->mCPUCount;
+        uint32_t cCPUs = mHWData->mCPUCount;
         // memory size in MB
-        ulMemSizeMB = mHWData->mMemorySize;
+        uint32_t ulMemSizeMB = mHWData->mMemorySize;
         // VRAM size?
         // BIOS settings?