Changeset 15051 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Dec 5, 2008 5:20:00 PM (16 years ago)

Author:

vboxsync

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

40436

Message:

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).

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.cpp (modified) (2 diffs)
• VBoxManageGuestProp.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -121 +121 @@
     }
 
-    STDMETHOD(COMGETTER(Id))(GUIDPARAMOUT a_pId)                { return E_NOTIMPL; }
+    STDMETHOD(COMGETTER(Id))(OUT_GUID a_pId)                    { return E_NOTIMPL; }
     STDMETHOD(COMGETTER(VendorId))(USHORT *a_pusVendorId)       { *a_pusVendorId    = m_usVendorId;     return S_OK; }
     STDMETHOD(COMGETTER(ProductId))(USHORT *a_pusProductId)     { *a_pusProductId   = m_usProductId;    return S_OK; }
@@ -5303 +5303 @@
             {
                 if (fReset)
-                    CHECK_ERROR(debugger, ResetStats(Bstr(pszPattern).raw()));
+                    CHECK_ERROR(debugger, ResetStats(Bstr(pszPattern)));
                 else
                 {
                     Bstr stats;
-                    CHECK_ERROR(debugger, GetStats(Bstr(pszPattern).raw(), fWithDescriptions, stats.asOutParam()));
+                    CHECK_ERROR(debugger, GetStats(Bstr(pszPattern), fWithDescriptions, stats.asOutParam()));
                     if (SUCCEEDED(rc))
                     {

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp

@@ -94 +94 @@
     NS_DECL_ISUPPORTS
 
-    STDMETHOD(OnMachineStateChange)(INPTR GUIDPARAM machineId,
+    STDMETHOD(OnMachineStateChange)(IN_GUID machineId,
                                     MachineState_T state)
     {
@@ -100 +100 @@
     }
 
-    STDMETHOD(OnMachineDataChange)(INPTR GUIDPARAM machineId)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnExtraDataCanChange)(INPTR GUIDPARAM machineId, INPTR BSTR key,
-                                    INPTR BSTR value, BSTR *error,
+    STDMETHOD(OnMachineDataChange)(IN_GUID machineId)
+    {
+        return S_OK;
+    }
+
+    STDMETHOD(OnExtraDataCanChange)(IN_GUID machineId, IN_BSTR key,
+                                    IN_BSTR value, BSTR *error,
                                     BOOL *changeAllowed)
     {
@@ -116 +116 @@
     }
 
-    STDMETHOD(OnExtraDataChange)(INPTR GUIDPARAM machineId, INPTR BSTR key,
-                                 INPTR BSTR value)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnMediaRegistered) (INPTR GUIDPARAM mediaId,
+    STDMETHOD(OnExtraDataChange)(IN_GUID machineId, IN_BSTR key,
+                                 IN_BSTR value)
+    {
+        return S_OK;
+    }
+
+    STDMETHOD(OnMediaRegistered) (IN_GUID mediaId,
                                   DeviceType_T mediaType, BOOL registered)
     {
@@ -131 +131 @@
     }
 
-    STDMETHOD(OnMachineRegistered)(INPTR GUIDPARAM machineId, BOOL registered)
-    {
-        return S_OK;
-    }
-
-     STDMETHOD(OnSessionStateChange)(INPTR GUIDPARAM machineId,
+    STDMETHOD(OnMachineRegistered)(IN_GUID machineId, BOOL registered)
+    {
+        return S_OK;
+    }
+
+     STDMETHOD(OnSessionStateChange)(IN_GUID machineId,
                                     SessionState_T state)
     {
@@ -142 +142 @@
     }
 
-    STDMETHOD(OnSnapshotTaken) (INPTR GUIDPARAM aMachineId,
-                                INPTR GUIDPARAM aSnapshotId)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnSnapshotDiscarded) (INPTR GUIDPARAM aMachineId,
-                                    INPTR GUIDPARAM aSnapshotId)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnSnapshotChange) (INPTR GUIDPARAM aMachineId,
-                                 INPTR GUIDPARAM aSnapshotId)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnGuestPropertyChange)(INPTR GUIDPARAM machineId,
-                                     INPTR BSTR name, INPTR BSTR value,
-                                     INPTR BSTR flags)
+    STDMETHOD(OnSnapshotTaken) (IN_GUID aMachineId,
+                                IN_GUID aSnapshotId)
+    {
+        return S_OK;
+    }
+
+    STDMETHOD(OnSnapshotDiscarded) (IN_GUID aMachineId,
+                                    IN_GUID aSnapshotId)
+    {
+        return S_OK;
+    }
+
+    STDMETHOD(OnSnapshotChange) (IN_GUID aMachineId,
+                                 IN_GUID aSnapshotId)
+    {
+        return S_OK;
+    }
+
+    STDMETHOD(OnGuestPropertyChange)(IN_GUID machineId,
+                                     IN_BSTR name, IN_BSTR value,
+                                     IN_BSTR flags)
     {
         int rc = S_OK;