Changeset 50403 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Feb 10, 2014 6:53:47 PM (11 years ago)

Author:

vboxsync

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

92164

Message:

6813 - src-client/USBDeviceImpl.cpp

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl.cpp (modified) (5 diffs)
• USBDeviceImpl.cpp (modified) (13 diffs)
• xpcom/module.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -2938 +2938 @@
     while (it != mUSBDevices.end())
     {
-        if ((*it)->id() == uuid)
+        if ((*it)->i_id() == uuid)
         {
             pUSBDevice = *it;
@@ -5211 +5211 @@
     while (it != mUSBDevices.end())
     {
-        LogFlowThisFunc(("it={%RTuuid}\n", (*it)->id().raw()));
-        if ((*it)->id() == Uuid)
+        LogFlowThisFunc(("it={%RTuuid}\n", (*it)->i_id().raw()));
+        if ((*it)->i_id() == Uuid)
         {
             pUSBDevice = *it;
@@ -8287 +8287 @@
         AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
         mUSBDevices.push_back(pUSBDevice);
-        LogFlowFunc(("Attached device {%RTuuid}\n", pUSBDevice->id().raw()));
+        LogFlowFunc(("Attached device {%RTuuid}\n", pUSBDevice->i_id().raw()));
 
         /* notify callbacks */
@@ -8365 +8365 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
     LogFlowThisFunc(("Detaching USB proxy device {%RTuuid}...\n",
-                     aHostDevice->id().raw()));
+                     aHostDevice->i_id().raw()));
 
     /*
@@ -8377 +8377 @@
         setErrorStatic(hrc2, "GetRemote() failed");
 
-    PCRTUUID pUuid = aHostDevice->id().raw();
+    PCRTUUID pUuid = aHostDevice->i_id().raw();
     if (fRemote)
     {

trunk/src/VBox/Main/src-client/USBDeviceImpl.cpp

@@ -68 +68 @@
     ComAssertComRCRet(hrc, hrc);
 
-    hrc = aUSBDevice->COMGETTER(Manufacturer)(unconst(mData.manufacturer).asOutParam());
-    ComAssertComRCRet(hrc, hrc);
-
-    hrc = aUSBDevice->COMGETTER(Product)(unconst(mData.product).asOutParam());
-    ComAssertComRCRet(hrc, hrc);
-
-    hrc = aUSBDevice->COMGETTER(SerialNumber)(unconst(mData.serialNumber).asOutParam());
-    ComAssertComRCRet(hrc, hrc);
-
-    hrc = aUSBDevice->COMGETTER(Address)(unconst(mData.address).asOutParam());
-    ComAssertComRCRet(hrc, hrc);
+    BSTR tmp;
+    BSTR *bptr = &tmp;
+
+    hrc = aUSBDevice->COMGETTER(Manufacturer)(bptr);
+    ComAssertComRCRet(hrc, hrc);
+    unconst(mData.manufacturer) = Utf8Str(tmp);
+
+    hrc = aUSBDevice->COMGETTER(Product)(bptr);
+    ComAssertComRCRet(hrc, hrc);
+    unconst(mData.product) = Utf8Str(tmp);
+
+    hrc = aUSBDevice->COMGETTER(SerialNumber)(bptr);
+    ComAssertComRCRet(hrc, hrc);
+    unconst(mData.serialNumber) = Utf8Str(tmp);
+
+    hrc = aUSBDevice->COMGETTER(Address)(bptr);
+    ComAssertComRCRet(hrc, hrc);
+    unconst(mData.address) = Utf8Str(tmp);
 
     hrc = aUSBDevice->COMGETTER(Port)(&unconst(mData.port));
@@ -86 +93 @@
     ComAssertComRCRet(hrc, hrc);
 
-    hrc = aUSBDevice->COMGETTER(Port)(&unconst(mData.portVersion));
+    hrc = aUSBDevice->COMGETTER(Version)(&unconst(mData.portVersion));
     ComAssertComRCRet(hrc, hrc);
 
@@ -144 +151 @@
  * @param   aId   Address of result variable.
  */
-STDMETHODIMP OUSBDevice::COMGETTER(Id)(BSTR *aId)
-{
-    CheckComArgOutPointerValid(aId);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    /* this is const, no need to lock */
-    Guid(mData.id).toUtf16().detachTo(aId);
+HRESULT OUSBDevice::getId(com::Guid &aId)
+{
+    /* this is const, no need to lock */
+    aId = mData.id;
 
     return S_OK;
@@ -164 +166 @@
  * @param   aVendorId   Where to store the vendor id.
  */
-STDMETHODIMP OUSBDevice::COMGETTER(VendorId)(USHORT *aVendorId)
-{
-    CheckComArgOutPointerValid(aVendorId);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
+HRESULT OUSBDevice::getVendorId(USHORT *aVendorId)
+{
     /* this is const, no need to lock */
     *aVendorId = mData.vendorId;
@@ -184 +181 @@
  * @param   aProductId  Where to store the product id.
  */
-STDMETHODIMP OUSBDevice::COMGETTER(ProductId)(USHORT *aProductId)
-{
-    CheckComArgOutPointerValid(aProductId);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
+HRESULT OUSBDevice::getProductId(USHORT *aProductId)
+{
     /* this is const, no need to lock */
     *aProductId = mData.productId;
@@ -204 +196 @@
  * @param   aRevision  Where to store the revision BCD.
  */
-STDMETHODIMP OUSBDevice::COMGETTER(Revision)(USHORT *aRevision)
-{
-    CheckComArgOutPointerValid(aRevision);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
+HRESULT OUSBDevice::getRevision(USHORT *aRevision)
+{
     /* this is const, no need to lock */
     *aRevision = mData.revision;
@@ -223 +210 @@
  * @param   aManufacturer     Where to put the return string.
  */
-STDMETHODIMP OUSBDevice::COMGETTER(Manufacturer)(BSTR *aManufacturer)
-{
-    CheckComArgOutPointerValid(aManufacturer);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    /* this is const, no need to lock */
-    mData.manufacturer.cloneTo(aManufacturer);
+HRESULT OUSBDevice::getManufacturer(com::Utf8Str &aManufacturer)
+{
+    /* this is const, no need to lock */
+    aManufacturer = mData.manufacturer;
 
     return S_OK;
@@ -243 +225 @@
  * @param   aProduct          Where to put the return string.
  */
-STDMETHODIMP OUSBDevice::COMGETTER(Product)(BSTR *aProduct)
-{
-    CheckComArgOutPointerValid(aProduct);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    /* this is const, no need to lock */
-    mData.product.cloneTo(aProduct);
+HRESULT OUSBDevice::getProduct(com::Utf8Str &aProduct)
+{
+    /* this is const, no need to lock */
+    aProduct = mData.product;
 
     return S_OK;
@@ -263 +240 @@
  * @param   aSerialNumber     Where to put the return string.
  */
-STDMETHODIMP OUSBDevice::COMGETTER(SerialNumber)(BSTR *aSerialNumber)
-{
-    CheckComArgOutPointerValid(aSerialNumber);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    /* this is const, no need to lock */
-    mData.serialNumber.cloneTo(aSerialNumber);
+HRESULT OUSBDevice::getSerialNumber(com::Utf8Str &aSerialNumber)
+{
+    /* this is const, no need to lock */
+    aSerialNumber = mData.serialNumber;
 
     return S_OK;
@@ -283 +255 @@
  * @param   aAddress          Where to put the return string.
  */
-STDMETHODIMP OUSBDevice::COMGETTER(Address)(BSTR *aAddress)
-{
-    CheckComArgOutPointerValid(aAddress);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    /* this is const, no need to lock */
-    mData.address.cloneTo(aAddress);
-
-    return S_OK;
-}
-
-STDMETHODIMP OUSBDevice::COMGETTER(Port)(USHORT *aPort)
-{
-    CheckComArgOutPointerValid(aPort);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
+HRESULT OUSBDevice::getAddress(com::Utf8Str &aAddress)
+{
+    /* this is const, no need to lock */
+    aAddress = mData.address;
+
+    return S_OK;
+}
+
+HRESULT OUSBDevice::getPort(USHORT *aPort)
+{
     /* this is const, no need to lock */
     *aPort = mData.port;
@@ -309 +271 @@
 }
 
-STDMETHODIMP OUSBDevice::COMGETTER(Version)(USHORT *aVersion)
-{
-    CheckComArgOutPointerValid(aVersion);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
+HRESULT OUSBDevice::getVersion(USHORT *aVersion)
+{
     /* this is const, no need to lock */
     *aVersion = mData.version;
@@ -322 +279 @@
 }
 
-STDMETHODIMP OUSBDevice::COMGETTER(PortVersion)(USHORT *aPortVersion)
-{
-    CheckComArgOutPointerValid(aPortVersion);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
+HRESULT OUSBDevice::getPortVersion(USHORT *aPortVersion)
+{
     /* this is const, no need to lock */
     *aPortVersion = mData.portVersion;
@@ -335 +287 @@
 }
 
-STDMETHODIMP OUSBDevice::COMGETTER(Remote)(BOOL *aRemote)
-{
-    CheckComArgOutPointerValid(aRemote);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
+HRESULT OUSBDevice::getRemote(BOOL *aRemote)
+{
     /* this is const, no need to lock */
     *aRemote = mData.remote;

trunk/src/VBox/Main/src-client/xpcom/module.cpp

@@ -90 +90 @@
 NS_DECL_CLASSINFO(Progress)
 NS_IMPL_THREADSAFE_ISUPPORTS1_CI(Progress, IProgress)
-NS_DECL_CLASSINFO(OUSBDevice)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI(OUSBDevice, IUSBDevice)
 NS_DECL_CLASSINFO(RemoteUSBDevice)
 NS_IMPL_THREADSAFE_ISUPPORTS2_CI(RemoteUSBDevice, IHostUSBDevice, IUSBDevice)