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

Timestamp:

Mar 24, 2010 2:45:55 PM (15 years ago)

Author:

vboxsync

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

59248

Message:

VBoxManage, Main: fixed creating VM, Bstr fixes.

Location:

trunk/src/VBox/Main

Files:

• VirtualBoxImpl.cpp (modified) (5 diffs)
• include/VirtualBoxImpl.h (modified) (1 diff)

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -1074 +1074 @@
         id.create();
 
-    GuestOSType *osType;
-    rc = findGuestOSType(aOsTypeId, osType);
+    GuestOSType *osType = NULL;
+    rc = findGuestOSType(Bstr(aOsTypeId), osType);
     if (FAILED(rc)) return rc;
 
@@ -1129 +1129 @@
         id.create();
 
-    GuestOSType *osType;
-    rc = findGuestOSType(aOsTypeId, osType);
+    GuestOSType *osType = NULL;
+    rc = findGuestOSType(Bstr(aOsTypeId), osType);
     if (FAILED(rc)) return rc;
 
@@ -3035 +3035 @@
 }
 
-HRESULT VirtualBox::findGuestOSType(CBSTR bstrOSType,
+HRESULT VirtualBox::findGuestOSType(const Bstr &bstrOSType,
                                     GuestOSType*& pGuestOSType)
 {
@@ -3042 +3042 @@
               ("Guest OS types array must be filled"));
 
-    if (bstrOSType == NULL)
+    if (bstrOSType.isEmpty())
     {
         pGuestOSType = NULL;
@@ -3062 +3062 @@
     return setError(VBOX_E_OBJECT_NOT_FOUND,
                     tr("Guest OS type '%ls' is invalid"),
-                    bstrOSType);
+                    bstrOSType.raw());
 }
 

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

@@ -253 +253 @@
                             bool aSetError, ComObjPtr<Medium> *aImage = NULL);
 
-    HRESULT findGuestOSType(CBSTR bstrOSType,
+    HRESULT findGuestOSType(const Bstr &bstrOSType,
                             GuestOSType*& pGuestOSType);