vbox的更動 77436 路徑 trunk/src/VBox/Main/src-client/USBDeviceImpl.cpp

時間撮記:

2019-2-22 下午05:40:00 (6 年 以前)

作者:

vboxsync

訊息:

Main: Eradicate the use of BSTR in regular API code, there were leaks in almost every occurrence. Also do some Bstr->Utf8Str shuffling to reduce the number of conversions.

檔案:

• trunk/src/VBox/Main/src-client/USBDeviceImpl.cpp (修改) (1 筆差異)

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

@@ -71 +71 @@
     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(Backend)(bptr);
-    ComAssertComRCRet(hrc, hrc);
-    unconst(mData.backend) = Utf8Str(tmp);
+    Bstr bstr;
+
+    hrc = aUSBDevice->COMGETTER(Manufacturer)(bstr.asOutParam());
+    ComAssertComRCRet(hrc, hrc);
+    unconst(mData.manufacturer) = bstr;
+
+    hrc = aUSBDevice->COMGETTER(Product)(bstr.asOutParam());
+    ComAssertComRCRet(hrc, hrc);
+    unconst(mData.product) = bstr;
+
+    hrc = aUSBDevice->COMGETTER(SerialNumber)(bstr.asOutParam());
+    ComAssertComRCRet(hrc, hrc);
+    unconst(mData.serialNumber) = bstr;
+
+    hrc = aUSBDevice->COMGETTER(Address)(bstr.asOutParam());
+    ComAssertComRCRet(hrc, hrc);
+    unconst(mData.address) = bstr;
+
+    hrc = aUSBDevice->COMGETTER(Backend)(bstr.asOutParam());
+    ComAssertComRCRet(hrc, hrc);
+    unconst(mData.backend) = bstr;
 
     hrc = aUSBDevice->COMGETTER(Port)(&unconst(mData.port));