Changeset 6449 in vbox

Timestamp:

Jan 22, 2008 4:13:28 PM (17 years ago)

Author:

vboxsync

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

27425

Message:

Main: Fixed build after r27415.

Location:

trunk

Files:

• include/VBox/com/ptr.h (modified) (3 diffs)
• src/VBox/Main/MachineImpl.cpp (modified) (4 diffs)
• src/VBox/Main/include/MachineImpl.h (modified) (1 diff)

trunk/include/VBox/com/ptr.h ¶

@@ -80 +80 @@
 
 /**
- *  Equality operations for the ComPtrBase template.
- */
-template <class C>
-class ComPtrEqOps
-{
-protected:
-
-    template <class I>
-    static bool equals (C *aThis, I *aThat)
-    {
-        IUnknown *thatUnk = NULL, *thisUnk = NULL;
-        if (aThat)
-            aThat->QueryInterface (COM_IIDOF (IUnknown), (void **) &thatUnk);
-        if (aThis)
-            aThis->QueryInterface (COM_IIDOF (IUnknown), (void **) &thisUnk);
-        bool equal = thisUnk == thatUnk;
-        if (thisUnk)
-            thisUnk->Release();
-        if (thatUnk)
-            thatUnk->Release();
-        return equal;
-    }
-
-    /* specialization for IUnknown */
-    template<>
-    static bool equals <IUnknown> (C *aThis, IUnknown *aThat)
-    {
-        IUnknown *thisUnk = NULL;
-        if (aThis)
-            aThis->QueryInterface (COM_IIDOF (IUnknown), (void **) &thisUnk);
-        bool equal = thisUnk == aThat;
-        if (thisUnk)
-            thisUnk->Release();
-        return equal;
-    }
-};
-
-/** Specialization for IUnknown */
+ *  Returns @c true if two interface pointers are equal.
+ *  
+ *  According to the COM Identity Rule, interface pointers are considered to be
+ *  equal if and only if IUnknown pointers queried on these interfaces pointers
+ *  are equal (e.g. have the same binary value). Equal interface pointers
+ *  represent the same object even if they are pointers to different interfaces.
+ *  
+ *  @param I1   Class of the first interface pointer (must be derived from
+ *              IUnknown).
+ *  @param I2   Class of the second interface pointer (must be derived from
+ *              IUnknown).
+ */
+template <class I1, class I2>
+inline bool ComPtrEquals (I1 *aThis, I2 *aThat)
+{
+    IUnknown *thatUnk = NULL, *thisUnk = NULL;
+    if (aThat)
+        aThat->QueryInterface (COM_IIDOF (IUnknown), (void **) &thatUnk);
+    if (aThis)
+        aThis->QueryInterface (COM_IIDOF (IUnknown), (void **) &thisUnk);
+    bool equal = thisUnk == thatUnk;
+    if (thisUnk)
+        thisUnk->Release();
+    if (thatUnk)
+        thatUnk->Release();
+    return equal;
+}
+
+/* specialization for <Any, IUnknown> */
+template <class I1>
+inline bool ComPtrEquals (I1 *aThis, IUnknown *aThat)
+{
+    IUnknown *thisUnk = NULL;
+    if (aThis)
+        aThis->QueryInterface (COM_IIDOF (IUnknown), (void **) &thisUnk);
+    bool equal = thisUnk == aThat;
+    if (thisUnk)
+        thisUnk->Release();
+    return equal;
+}
+
+/** Specialization for <IUnknown, Any> */
+template <class I2>
+inline bool ComPtrEquals (IUnknown *aThis, I2 *aThat)
+{
+    IUnknown *thatUnk = NULL;
+    if (aThat)
+        aThat->QueryInterface (COM_IIDOF (IUnknown), (void **) &thatUnk);
+    bool equal = aThis == thatUnk;
+    if (thatUnk)
+        thatUnk->Release();
+    return equal;
+}
+
+/* specialization for IUnknown */
 template<>
-class ComPtrEqOps <IUnknown>
-{
-protected:
-
-    template <class I>
-    static bool equals (IUnknown *aThis, I *aThat)
-    {
-        IUnknown *thatUnk = NULL;
-        if (aThat)
-            aThat->QueryInterface (COM_IIDOF (IUnknown), (void **) &thatUnk);
-        bool equal = aThis == thatUnk;
-        if (thatUnk)
-            thatUnk->Release();
-        return equal;
-    }
-
-    /* specialization for IUnknown */
-    template<>
-    static bool equals <IUnknown> (IUnknown *aThis, IUnknown *aThat)
-    {
-        return aThis == aThat;
-    }
-};
+inline bool ComPtrEquals <IUnknown, IUnknown> (IUnknown *aThis, IUnknown *aThat)
+{
+    return aThis == aThat;
+}
 
 /** 
@@ -147 +145 @@
  */
 template <class C, template <class> class RefOps = ComStrongRef>
-class ComPtrBase : protected RefOps <C>, protected ComPtrEqOps <C>
+class ComPtrBase : protected RefOps <C>
 {
 public:
@@ -206 +204 @@
     bool equalsTo (I *aThat) const
     {
-        return equals (p, aThat);
+        return ComPtrEquals (p, aThat);
     }
 

trunk/src/VBox/Main/MachineImpl.cpp ¶

@@ -2961 +2961 @@
         /* memorize the direct session control and cache IUnknown for it */
         mData->mSession.mDirectControl = aControl;
-        mData->mSession.mDirectControlUnk = aControl;
         mData->mSession.mState = SessionState_SessionOpen;
         /* associate the SessionMachine with this Machine */
         mData->mSession.mMachine = sessionMachine;
+
+        /* request an IUnknown pointer early from the remote party for later
+         * identity checks (it will be internally cached within mDirectControl
+         * at least on XPCOM) */
+        ComPtr <IUnknown> unk = mData->mSession.mDirectControl;
+        NOREF (unk);
     }
 
@@ -7308 +7313 @@
     {
         mData->mSession.mDirectControl.setNull();
-        mData->mSession.mDirectControlUnk.setNull();
     }
     else
@@ -7535 +7539 @@
     AutoMultiLock <2> alock (mParent->wlock(), this->wlock());
 
-    if (control.equalsTo (mData->mSession.mDirectControlUnk))
+    if (control.equalsTo (mData->mSession.mDirectControl))
     {
         ComAssertRet (aProgress, E_POINTER);
@@ -7549 +7553 @@
         /* set direct control to NULL to release the remote instance */
         mData->mSession.mDirectControl.setNull();
-        mData->mSession.mDirectControlUnk.setNull();
         LogFlowThisFunc (("Direct control is set to NULL\n"));
 

trunk/src/VBox/Main/include/MachineImpl.h ¶

@@ -103 +103 @@
             /** Control of the direct session opened by openSession() */
             ComPtr <IInternalSessionControl> mDirectControl;
-            /** Cached IUnknown of mDirectControl (IPC) for fast comparison */
-            ComPtr <IUnknown> mDirectControlUnk;
 
             typedef std::list <ComPtr <IInternalSessionControl> > RemoteControlList;