vbox的更動 15051 路徑 trunk/src/VBox/Main/HardDisk2Impl.cpp

時間撮記:

2008-12-5 下午05:20:00 (16 年 以前)

作者:

vboxsync

訊息:

Main: Cleaned up the long standing const BSTR = const (OLECHAR *) on WIn32 vs (const PRunichar) * on XPCOM clash. Cleaned up BSTR/GUID macros (IN_BSTR replaces INPTR BSTR, IN_GUID replaces INPTR GUIDPARAM, OUT_GUID replaces GUIDPARAMOUT).

檔案:

• trunk/src/VBox/Main/HardDisk2Impl.cpp (修改) (10 筆差異)

trunk/src/VBox/Main/HardDisk2Impl.cpp

@@ -507 +507 @@
  * @param aLocaiton     Storage unit location.
  */
-HRESULT HardDisk2::init (VirtualBox *aVirtualBox, const BSTR aFormat,
-                         const BSTR aLocation)
+HRESULT HardDisk2::init (VirtualBox *aVirtualBox, CBSTR aFormat,
+                         CBSTR aLocation)
 {
     AssertReturn (aVirtualBox != NULL, E_FAIL);
@@ -587 +587 @@
  * @param aLocaiton     Storage unit location.
  */
-HRESULT HardDisk2::init (VirtualBox *aVirtualBox, const BSTR aLocation)
+HRESULT HardDisk2::init (VirtualBox *aVirtualBox, CBSTR aLocation)
 {
     AssertReturn (aVirtualBox, E_INVALIDARG);
@@ -1004 +1004 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-STDMETHODIMP HardDisk2::GetProperty (INPTR BSTR aName, BSTR *aValue)
+STDMETHODIMP HardDisk2::GetProperty (IN_BSTR aName, BSTR *aValue)
 {
     CheckComArgStrNotEmptyOrNull (aName);
@@ -1024 +1024 @@
 }
 
-STDMETHODIMP HardDisk2::SetProperty (INPTR BSTR aName, INPTR BSTR aValue)
+STDMETHODIMP HardDisk2::SetProperty (IN_BSTR aName, IN_BSTR aValue)
 {
     CheckComArgStrNotEmptyOrNull (aName);
@@ -1055 +1055 @@
 }
 
-STDMETHODIMP HardDisk2::GetProperties (INPTR BSTR aNames,
+STDMETHODIMP HardDisk2::GetProperties (IN_BSTR aNames,
                                        ComSafeArrayOut (BSTR, aReturnNames),
                                        ComSafeArrayOut (BSTR, aReturnValues))
@@ -1088 +1088 @@
 }
 
-STDMETHODIMP HardDisk2::SetProperties (ComSafeArrayIn (INPTR BSTR, aNames),
-                                       ComSafeArrayIn (INPTR BSTR, aValues))
+STDMETHODIMP HardDisk2::SetProperties (ComSafeArrayIn (IN_BSTR, aNames),
+                                       ComSafeArrayIn (IN_BSTR, aValues))
 {
     CheckComArgSafeArrayNotNull (aNames);
@@ -1100 +1100 @@
     AutoMultiWriteLock2 alock (mVirtualBox, this);
 
-    com::SafeArray <INPTR BSTR> names (ComSafeArrayInArg (aNames));
-    com::SafeArray <INPTR BSTR> values (ComSafeArrayInArg (aValues));
+    com::SafeArray <IN_BSTR> names (ComSafeArrayInArg (aNames));
+    com::SafeArray <IN_BSTR> values (ComSafeArrayInArg (aValues));
 
     /* first pass: validate names */
@@ -1296 +1296 @@
 }
 
-STDMETHODIMP HardDisk2::MergeTo (INPTR GUIDPARAM aTargetId, IProgress **aProgress)
+STDMETHODIMP HardDisk2::MergeTo (IN_GUID aTargetId, IProgress **aProgress)
 {
     AutoCaller autoCaller (this);
@@ -2432 +2432 @@
  * @note Must be called from under this object's write lock.
  */
-HRESULT HardDisk2::setLocation (const BSTR aLocation)
+HRESULT HardDisk2::setLocation (CBSTR aLocation)
 {
     /// @todo so far, we assert but later it makes sense to support null
@@ -2584 +2584 @@
  * @note Must be called from under this object's write lock.
  */
-HRESULT HardDisk2::setFormat (const BSTR aFormat)
+HRESULT HardDisk2::setFormat (CBSTR aFormat)
 {
     /* get the format object first */