Changeset 30156 in vbox

Timestamp:

Jun 10, 2010 5:54:11 PM (14 years ago)

Author:

vboxsync

Message:

Main: COM events work (smth along those lines could be done for generic events mechanisms too)

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• VirtualBoxImpl.cpp (modified) (11 diffs)
• win/VBoxComEvents.cpp (added)
• win/VBoxComEvents.h (added)

trunk/src/VBox/Main/Makefile.kmk

@@ -338 +338 @@
         win/svchlp.cpp \
         win/HostPowerWin.cpp \
-        win/VBoxSVC.rc
+        win/VBoxSVC.rc \
+        win/VBoxComEvents.cpp
 
 VBoxSVC_SOURCES.linux = \

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -74 +74 @@
 #ifdef RT_OS_WINDOWS
 # include "win/svchlp.h"
+# include "win/VBoxComEvents.h"
 #endif
 
@@ -203 +204 @@
 
     virtual HRESULT handleCallback(const ComPtr<IVirtualBoxCallback> &aCallback) = 0;
+#ifdef RT_OS_WINDOWS
+    virtual HRESULT prepareEventDesc(ComEventDesc& aEvDesc) = 0;
+#endif
 
 private:
@@ -348 +352 @@
     EventQueue * const                  pAsyncEventQ;
 
+#ifdef RT_OS_WINDOWS
+    ComEventsHelper                     aComEvHelper;
+#endif
 };
 
@@ -584 +591 @@
     }
 
+#ifdef RT_OS_WINDOWS
+    if (SUCCEEDED(rc))
+        rc = m->aComEvHelper.init(IID_IVirtualBoxCallback);
+#endif
+
     /* Confirm a successful initialization when it's the case */
     if (SUCCEEDED(rc))
@@ -2585 +2597 @@
         }
     }
+#ifdef RT_OS_WINDOWS
+    HRESULT prepareEventDesc(ComEventDesc& aEvDesc)
+    {
+        switch (mWhat)
+        {
+            case VirtualBoxCallbackRegistration::kOnMachineDataChange:
+                aEvDesc.init("OnMachineDataChange", 1);
+                aEvDesc.add(id.toUtf16());
+                break;
+               
+            case VirtualBoxCallbackRegistration::kOnMachineStateChange:
+                aEvDesc.init("OnMachineStateChange", 2);
+                aEvDesc.add(id.toUtf16()).add((int)state);
+                break;
+
+            case VirtualBoxCallbackRegistration::kOnMachineRegistered:
+                aEvDesc.init("OnMachineRegistered", 2);
+                aEvDesc.add(id.toUtf16()).add((BOOL)registered);
+                break;
+
+            default:
+                AssertFailedReturn(S_OK);
+         }
+         return S_OK;         
+    }
+#endif
 
     Guid id;
@@ -2681 +2719 @@
         return aCallback->OnExtraDataChange(machineId.toUtf16(), key, val);
     }
+#ifdef RT_OS_WINDOWS
+    HRESULT prepareEventDesc(ComEventDesc& aEvDesc)
+    {
+       aEvDesc.init("OnExtraDataChange", 3);
+       aEvDesc.add(machineId.toUtf16()).add(key).add(val);
+       return S_OK;         
+    }
+#endif
 
     Guid machineId;
@@ -2716 +2762 @@
         return aCallback->OnSessionStateChange(machineId.toUtf16(), sessionState);
     }
+
+#ifdef RT_OS_WINDOWS
+    HRESULT prepareEventDesc(ComEventDesc& aEvDesc)
+    {
+       aEvDesc.init("OnSessionStateChange", 2);
+       aEvDesc.add(machineId.toUtf16()).add((int)sessionState);
+       return S_OK;
+    }
+#endif
 
     Guid machineId;
@@ -2764 +2819 @@
         }
     }
+
+#ifdef RT_OS_WINDOWS
+    HRESULT prepareEventDesc(ComEventDesc& aEvDesc)
+    {
+       aEvDesc.init("OnSnapshotTaken", 2);
+       aEvDesc.add(machineId.toUtf16()).add(snapshotId.toUtf16());
+       return S_OK;
+    }
+#endif
+
 
     Guid machineId;
@@ -2814 +2879 @@
         return aCallback->OnGuestPropertyChange(machineId.toUtf16(), name, value, flags);
     }
+
+#ifdef RT_OS_WINDOWS
+    HRESULT prepareEventDesc(ComEventDesc& aEvDesc)
+    {
+       aEvDesc.init("OnGuestPropertyChange", 4);
+       aEvDesc.add(machineId.toUtf16()).add(name).add(value).add(flags);
+       return S_OK;         
+    }
+#endif
 
     Guid machineId;
@@ -4508 +4582 @@
     }
 
-#ifdef RT_OS_WINDOWS
+
+#ifdef RT_OS_WINDOWS       
 #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++)
-    {
+    {
+     ComEventDesc evDesc;
+
+     int nConnections = mVirtualBox->m_vec.GetSize();
+     /* Only prepare args if someone needs them */
+     if (nConnections)
+        prepareEventDesc(evDesc);
+
+     for (int i=0; i<nConnections; i++)
+     {
         ComPtr<IUnknown> sp = mVirtualBox->m_vec.GetAt(i);
         ComPtr<IVirtualBoxCallback> cbI;
@@ -4538 +4604 @@
 
         /**
-         * Would be like this in ideal world, unfortunately our consumers want to be invoked via IDispatch,
+         * Would be just handleCallback(cbI) 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);
-        }
+             CComVariant varResult;
+             mVirtualBox->m->aComEvHelper.fire(cbD, evDesc, &varResult);
+             // what we gonna do with the result?
+        }
+     }
     }
 #endif