Changeset 21959 in vbox for trunk/src/VBox/Frontends/VBoxShell

Timestamp:

Aug 4, 2009 2:33:02 PM (16 years ago)

Author:

vboxsync

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

50658

Message:

Python shell: handle subtel COM/XPCOM difference

File:

• trunk/src/VBox/Frontends/VBoxShell/vboxshell.py (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxShell/vboxshell.py ¶

@@ -93 +93 @@
 
 class VBoxMonitor:
-    def __init__(self, vbox):
-        self.vbox = vbox
+    def __init__(self, params):
+        self.vbox = params[0]
+        self.isMscom = params[1]
         pass
 
@@ -105 +106 @@
     def onExtraDataCanChange(self, id, key, value):
         print "onExtraDataCanChange: %s %s=>%s" %(id, key, value)
-        return True, ""
+        # Witty COM bridge thinks if someone wishes to return tuple, hresult
+        # is one of values we want to return
+        if self.isMscom:
+            return True, "", 0
+        else:
+            return True, ""
 
     def onExtraDataChange(self, id, key, value):
@@ -315 +321 @@
 def monitorVBox(ctx, dur):
     vbox = ctx['vb']
-    cb = ctx['global'].createCallback('IVirtualBoxCallback', VBoxMonitor, vbox)
+    isMscom = (ctx['global'].type == 'MSCOM')
+    cb = ctx['global'].createCallback('IVirtualBoxCallback', VBoxMonitor, [vbox, isMscom])
+    
     vbox.registerCallback(cb)
     if dur == -1:
@@ -326 +334 @@
     # We need to catch all exceptions here, otherwise callback will never be unregistered
     except:
-        if g_verbose:
-                traceback.print_exc()
+        pass
     vbox.unregisterCallback(cb)