Changeset 22381 in vbox for trunk

Timestamp:

Aug 21, 2009 9:13:15 AM (16 years ago)

Author:

vboxsync

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

51324

Message:

Main, Python glue: Windows updates

Location:

trunk/src/VBox/Main

Files:

• glue/vboxapi.py (modified) (3 diffs)
• idl/VirtualBox.xidl (modified) (2 diffs)
• include/VirtualBoxCallbackImpl.h (modified) (1 diff)

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

@@ -260 +260 @@
         str += "   _typelib_guid_ = tlb_guid\n"
         str += "   _typelib_version_ = 1, 0\n"
+        str += "   _reg_clsctx_ = pythoncom.CLSCTX_INPROC_SERVER\n"
+        # Maybe we'd better implement Dynamic invoke policy, to be more flexible here
+        str += "   _reg_policy_spec_ = 'win32com.server.policy.EventHandlerPolicy'\n"
 
         # generate capitalized version of callback methods - 
@@ -269 +272 @@
         str += "   def __init__(self): BaseClass.__init__(self, arg)\n"
         str += "result = win32com.client.Dispatch('VirtualBox.CallbackWrapper')\n"
-        str += "result.SetLocalObject("+iface+"Impl())\n"
+        str += "result.SetLocalObject(win32com.server.util.wrap("+iface+"Impl()))\n"
         exec (str,d,d)
         return d['result']
@@ -347 +350 @@
         str += "   def __init__(self): BaseClass.__init__(self, arg)\n"
         str += "result = xpcom.components.classes['@virtualbox.org/CallbackWrapper;1'].createInstance()\n"
-        str += "result.setLocalObject("+iface+"Impl())\n"
+        # This wrapping is not entirely correct - we shall create a local object
+        str += "result.setLocalObject(win32com.server.util.wrap("+iface+"Impl()))\n"
         exec (str,d,d)
         return d['result']

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

@@ -1076 +1076 @@
 
   <interface
-     name="ILocalOwner" extends="$unknown"
-     uuid="308ff42a-dc45-49d4-a950-b1eee5e00bb5" wsmap="suppress"
+     name="ILocalOwner" extends="$dispatched"
+     uuid="308FF42A-DC45-49D4-A950-B1EEE5E00BB5" wsmap="suppress"
      >
     <desc>
@@ -12335 +12335 @@
   <interface
      name="ISession" extends="$dispatched"
-     uuid="12F4DCDB-12B2-4ec1-B7CD-DDD9F6C5BF4D"
+     uuid="12F4DCDB-12B2-4EC1-B7CD-DDD9F6C5BF4D"
      wsmap="managed"
      >

trunk/src/VBox/Main/include/VirtualBoxCallbackImpl.h

@@ -44 +44 @@
 
     BEGIN_COM_MAP(CallbackWrapper)
-        COM_INTERFACE_ENTRY2(IDispatch, IVirtualBoxCallback)
-        COM_INTERFACE_ENTRY2(IDispatch, IConsoleCallback)
         COM_INTERFACE_ENTRY2(IDispatch, ILocalOwner)
         COM_INTERFACE_ENTRY(ISupportErrorInfo)