Changeset 22305 in vbox for trunk/src/VBox/Main/glue

Timestamp:

Aug 17, 2009 5:37:41 PM (16 years ago)

Author:

vboxsync

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

51179

Message:

Main: generic callback wrappers mechanism

File:

• trunk/src/VBox/Main/glue/vboxapi.py (modified) (3 diffs)

trunk/src/VBox/Main/glue/vboxapi.py

@@ -218 +218 @@
             win32com.client.gencache.EnsureDispatch('VirtualBox.Session')
             win32com.client.gencache.EnsureDispatch('VirtualBox.VirtualBox')
+            win32com.client.gencache.EnsureDispatch('VirtualBox.VirtualBoxCallback')
 
     def getSessionObject(self, vbox):
         import win32com
         from win32com.client import Dispatch
-        return win32com.client.Dispatch("VirtualBox.Session")
+        return win32com.client.Dispatch("VirtualBox.Session")
 
     def getVirtualBox(self):
-        import win32com
+        import win32com
         from win32com.client import Dispatch
         return win32com.client.Dispatch("VirtualBox.VirtualBox")
@@ -267 +268 @@
 
         str += "   def __init__(self): BaseClass.__init__(self, arg)\n"
-        str += "result = win32com.server.util.wrap("+iface+"Impl())\n"
+        str += "result = win32com.client.Dispatch('VirtualBox.VirtualBoxCallback')\n"
+        str += "result.SetLocalObject(win32com.server.util.wrap("+iface+"Impl())\n"
         exec (str,d,d)
         return d['result']
@@ -342 +344 @@
         str += "   _com_interfaces_ = xpcom.components.interfaces."+iface+"\n"
         str += "   def __init__(self): BaseClass.__init__(self, arg)\n"
-        str += "result = "+iface+"Impl()\n"
+        str += "result = xpcom.components.classes['@virtualbox.org/VirtualBoxCallback;1'].createInstance()\n"
+        str += "result.setLocalObject("+iface+"Impl())\n"
         exec (str,d,d)
         return d['result']