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

Timestamp:

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

Author:

vboxsync

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/VirtualBox

Files:

• include/COMDefs.h (modified) (1 diff)
• src/VBoxConsoleView.cpp (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (11 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/COMDefs.h

@@ -90 +90 @@
  * Additional COM / XPCOM defines and includes
  */
-
-#define IN_BSTRPARAM    INPTR BSTR
-#define IN_GUIDPARAM    INPTR GUIDPARAM
 
 #if !defined (VBOX_WITH_XPCOM)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -529 +529 @@
     }
 
-    STDMETHOD(OnRuntimeError)(BOOL fatal, IN_BSTRPARAM id, IN_BSTRPARAM message)
+    STDMETHOD(OnRuntimeError)(BOOL fatal, IN_BSTR id, IN_BSTR message)
     {
         QApplication::postEvent (mView,

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -696 +696 @@
     // a deadlock.
 
-    STDMETHOD(OnMachineStateChange) (IN_GUIDPARAM id, MachineState_T state)
+    STDMETHOD(OnMachineStateChange) (IN_GUID id, MachineState_T state)
     {
         postEvent (new VBoxMachineStateChangeEvent (COMBase::ToQUuid (id),
@@ -703 +703 @@
     }
 
-    STDMETHOD(OnMachineDataChange) (IN_GUIDPARAM id)
+    STDMETHOD(OnMachineDataChange) (IN_GUID id)
     {
         postEvent (new VBoxMachineDataChangeEvent (COMBase::ToQUuid (id)));
@@ -709 +709 @@
     }
 
-    STDMETHOD(OnExtraDataCanChange)(IN_GUIDPARAM id,
-                                    IN_BSTRPARAM key, IN_BSTRPARAM value,
+    STDMETHOD(OnExtraDataCanChange)(IN_GUID id,
+                                    IN_BSTR key, IN_BSTR value,
                                     BSTR *error, BOOL *allowChange)
     {
@@ -762 +762 @@
     }
 
-    STDMETHOD(OnExtraDataChange) (IN_GUIDPARAM id,
-                                  IN_BSTRPARAM key, IN_BSTRPARAM value)
+    STDMETHOD(OnExtraDataChange) (IN_GUID id,
+                                  IN_BSTR key, IN_BSTR value)
     {
         if (COMBase::ToQUuid (id).isNull())
@@ -796 +796 @@
     }
 
-    STDMETHOD(OnMediaRegistered) (IN_GUIDPARAM id, DeviceType_T type,
+    STDMETHOD(OnMediaRegistered) (IN_GUID id, DeviceType_T type,
                                   BOOL registered)
     {
@@ -806 +806 @@
     }
 
-    STDMETHOD(OnMachineRegistered) (IN_GUIDPARAM id, BOOL registered)
+    STDMETHOD(OnMachineRegistered) (IN_GUID id, BOOL registered)
     {
         postEvent (new VBoxMachineRegisteredEvent (COMBase::ToQUuid (id),
@@ -813 +813 @@
     }
 
-    STDMETHOD(OnSessionStateChange) (IN_GUIDPARAM id, SessionState_T state)
+    STDMETHOD(OnSessionStateChange) (IN_GUID id, SessionState_T state)
     {
         postEvent (new VBoxSessionStateChangeEvent (COMBase::ToQUuid (id),
@@ -820 +820 @@
     }
 
-    STDMETHOD(OnSnapshotTaken) (IN_GUIDPARAM aMachineId, IN_GUIDPARAM aSnapshotId)
+    STDMETHOD(OnSnapshotTaken) (IN_GUID aMachineId, IN_GUID aSnapshotId)
     {
         postEvent (new VBoxSnapshotEvent (COMBase::ToQUuid (aMachineId),
@@ -828 +828 @@
     }
 
-    STDMETHOD(OnSnapshotDiscarded) (IN_GUIDPARAM aMachineId, IN_GUIDPARAM aSnapshotId)
+    STDMETHOD(OnSnapshotDiscarded) (IN_GUID aMachineId, IN_GUID aSnapshotId)
     {
         postEvent (new VBoxSnapshotEvent (COMBase::ToQUuid (aMachineId),
@@ -836 +836 @@
     }
 
-    STDMETHOD(OnSnapshotChange) (IN_GUIDPARAM aMachineId, IN_GUIDPARAM aSnapshotId)
+    STDMETHOD(OnSnapshotChange) (IN_GUID aMachineId, IN_GUID aSnapshotId)
     {
         postEvent (new VBoxSnapshotEvent (COMBase::ToQUuid (aMachineId),
@@ -844 +844 @@
     }
 
-    STDMETHOD(OnGuestPropertyChange) (IN_GUIDPARAM /* id */,
-                                      IN_BSTRPARAM /* key */,
-                                      IN_BSTRPARAM /* value */,
-                                      IN_BSTRPARAM /* flags */)
+    STDMETHOD(OnGuestPropertyChange) (IN_GUID /* id */,
+                                      IN_BSTR /* key */,
+                                      IN_BSTR /* value */,
+                                      IN_BSTR /* flags */)
     {
         return S_OK;