Changeset 50380 in vbox for trunk/src

Timestamp:

Feb 10, 2014 10:31:35 AM (11 years ago)

Author:

vboxsync

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

92135

Message:

Main: fixed attribute type of IVirtualBox::getGuestOSType(). It's a string, not a Guid.

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -2382 +2382 @@
 
       </desc>
-      <param name="id" type="uuid" mod="string" dir="in">
+      <param name="id" type="wstring" dir="in">
         <desc>Guest OS type ID string.</desc>
       </param>

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

@@ -297 +297 @@
                        BOOL aForceNewUuid,
                        ComPtr<IMedium> &aMedium);
-    HRESULT getGuestOSType(const com::Guid &aId,
+    HRESULT getGuestOSType(const com::Utf8Str &aId,
                            ComPtr<IGuestOSType> &aType);
     HRESULT createSharedFolder(const com::Utf8Str &aName,

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

@@ -1842 +1842 @@
 
 /** @note Locks this object for reading. */
-HRESULT VirtualBox::getGuestOSType(const com::Guid &aId,
+HRESULT VirtualBox::getGuestOSType(const com::Utf8Str &aId,
                                    ComPtr<IGuestOSType> &aType)
 {
     aType = NULL;
     AutoReadLock alock(m->allGuestOSTypes.getLockHandle() COMMA_LOCKVAL_SRC_POS);
-    IN_BSTR strId = Bstr(aId.toUtf16()).raw();
 
     HRESULT rc = S_OK;
@@ -1856 +1855 @@
         const Bstr &typeId = (*it)->i_id();
         AssertMsg(!typeId.isEmpty(), ("ID must not be NULL"));
-        if (com::Guid(typeId) == aId)
+        if (typeId == aId)
         {
             (*it).queryInterfaceTo(aType.asOutParam());
@@ -1864 +1863 @@
     return (aType) ? S_OK :
         setError(E_INVALIDARG,
-                 tr("'%ls' is not a valid Guest OS type"),
-                 strId);
+                 tr("'%s' is not a valid Guest OS type"),
+                 aId.c_str());
     return rc;
 }