Changeset 29874 in vbox for trunk/src/VBox

Timestamp:

May 28, 2010 6:14:44 PM (15 years ago)

Author:

vboxsync

Message:

first draft of OLE events support

Location:

trunk/src/VBox/Main

Files:

• VirtualBoxImpl.cpp (modified) (2 diffs)
• idl/VirtualBox.xidl (modified) (2 diffs)
• idl/midl.xsl (modified) (1 diff)

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -4463 +4463 @@
 }
 
+
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -4498 +4499 @@
 #if 0
     // WIP
+
+    LPTYPEINFO       ptinfo;
+    HRESULT          hr;
+    LPTYPELIB        ptlib;
+    DISPID           dispid;
+
+    /* Real solution must cache all needed dispids once, ofc */
+    hr = ::LoadRegTypeLib(LIBID_VirtualBox, kTypeLibraryMajorVersion, kTypeLibraryMinorVersion, LOCALE_SYSTEM_DEFAULT, &ptlib);
+    hr = ptlib->GetTypeInfoOfGuid(IID_IVirtualBoxCallback, &ptinfo);
+    ptlib->Release();
+
+    OLECHAR FAR* szMember = L"OnMachineStateChange";
+
+    hr = ::DispGetIDsOfNames(ptinfo, &szMember, 1, &dispid);
+    ptinfo->Release();
+
     int nConnections = mVirtualBox->m_vec.GetSize();
     for (int i=0; i<nConnections; i++)
     {
-        CComPtr<IUnknown> sp = mVirtualBox->m_vec.GetAt(i);
-        IVirtualBoxCallback* cb = reinterpret_cast<IVirtualBoxCallback*>(sp.p);
-        if (cb != NULL)
-        {
-            HRESULT hrc = handleCallback(cb);
+        ComPtr<IUnknown> sp = mVirtualBox->m_vec.GetAt(i);
+        ComPtr<IVirtualBoxCallback> cbI;
+        ComPtr<IDispatch> cbD;
+    
+        cbI = sp;
+        cbD = sp;
+
+        /**
+         * Would be like this in ideal world, unfortunately our consumers want to be invoked via IDispatch, 
+         * thus going the hard way.
+         */
+#if 0   
+        if (cbI != NULL)
+        {    
+            HRESULT hrc = handleCallback(cbI);
             if (hrc == VBOX_E_DONT_CALL_AGAIN)
             {
                 // need to handle that somehow, maybe just set element to 0
             }
+        }
+#endif
+        if (cbI != NULL && cbD != NULL)
+        {
+             CComVariant varResult, arg1, arg2;
+
+             ::VariantClear(&varResult);
+             ::VariantClear(&arg1); 
+             ::VariantClear(&arg2);
+             
+             VARIANTARG args[] = {arg1, arg2};
+             DISPPARAMS disp = { args, NULL, sizeof(args)/sizeof(args[0]), 0};
+
+             cbD->Invoke(dispid, IID_NULL,
+                         LOCALE_USER_DEFAULT, 
+                         DISPATCH_METHOD, 
+                         &disp, &varResult, 
+                         NULL, NULL);
         }
     }

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -14529 +14529 @@
            namespace="virtualbox.org">
       <interface name="IVirtualBox" default="yes"/>
+      <eventsink name="IVirtualBoxCallback" default="yes"/>
     </class>
   </module>
@@ -14536 +14537 @@
            namespace="virtualbox.org">
       <interface name="ISession" default="yes"/>
+      <eventsink name="IConsoleCallback" default="yes"/>
+
     </class>
     <class name="CallbackWrapper" uuid="49EE8561-5563-4715-B18C-A4B1A490DAFE"

trunk/src/VBox/Main/idl/midl.xsl

@@ -630 +630 @@
     </xsl:if>
     <xsl:text>interface </xsl:text>
+    <xsl:value-of select="@name"/>
+    <xsl:text>;&#x0A;</xsl:text>
+  </xsl:for-each>
+  <xsl:for-each select="eventsink">
+    <xsl:text>    </xsl:text>
+    <xsl:choose>
+      <xsl:when test="@default='yes'"><xsl:text>[default,source]</xsl:text></xsl:when>
+      <xsl:otherwise><xsl:text>[source]</xsl:text></xsl:otherwise>
+    </xsl:choose>
+    <xsl:text> interface </xsl:text>
     <xsl:value-of select="@name"/>
     <xsl:text>;&#x0A;</xsl:text>