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

Timestamp:

Jun 15, 2010 3:49:27 PM (15 years ago)

Author:

vboxsync

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

62689

Message:

Main: console COM events, cleanup, locking

Location:

trunk/src/VBox/Main/glue

Files:

• tests/Makefile.kmk (modified) (1 diff)
• tests/TestVBox.java (modified) (3 diffs)
• vboxapi.py (modified) (1 diff)

trunk/src/VBox/Main/glue/tests/Makefile.kmk

@@ -17 +17 @@
 
 ifeq ($(KBUILD_HOST),linux)
- VBOX_SDK=/home/nike/work/ws/out/linux.amd64/debug/bin/sdk
  VBOX_BIN=/home/nike/work/ws/out/linux.amd64/debug/bin
+ VBOX_SDK=$(VBOX_BIN)/sdk
 endif
 
 ifeq ($(KBUILD_HOST),win)
- VBOX_SDK=c:/out/bin/sdk
- VBOX_BIN=c:/out/bin
+ VBOX_BIN=e:/ws/out/win.amd64/debug/bin
+ VBOX_SDK=$(VBOX_BIN)/sdk
  JACOB_DIR=s:/jacob-1.15-M3/
  JACOB_JAR=$(JACOB_DIR)/jacob.jar

trunk/src/VBox/Main/glue/tests/TestVBox.java

@@ -13 +13 @@
 import org.virtualbox_3_3.*;
 import java.util.List;
+import java.math.BigInteger;
 
 class VBoxCallbacks extends VBoxObjectBase implements IVirtualBoxCallback
@@ -63 +64 @@
 }
 
+class ConsoleCallbacks extends VBoxObjectBase implements IConsoleCallback
+{
+    String mach;
+    ConsoleCallbacks(String mach)
+    {
+       this.mach = mach;
+    }
+    public void onMousePointerShapeChange(Boolean visible, Boolean alpha, Long xHot, Long yHot, Long width, Long height, List<Short> shape)
+    {
+       System.out.println("onMousePointerShapeChange -- VM: " + mach);
+    }
+    public void onMouseCapabilityChange(Boolean supportsAbsolute, Boolean supportsRelative, Boolean needsHostCursor)
+    {
+       System.out.println("onMouseCapabilityChange -- VM: " + mach+" abs="+supportsAbsolute+ " rel="+supportsRelative+" need host="+needsHostCursor);
+    }
+    public void onKeyboardLedsChange(Boolean numLock, Boolean capsLock, Boolean scrollLock)
+    {
+       System.out.println("onKeyboardLedsChange -- VM: " + mach);
+    }
+    public void onStateChange(org.virtualbox_3_3.MachineState state)
+    {
+       System.out.println("onStateChange -- VM: " + mach);
+    }
+    public void onAdditionsStateChange()
+    {
+       System.out.println("onAdditionsStateChange -- VM: " + mach);
+    }
+    public void onNetworkAdapterChange(org.virtualbox_3_3.INetworkAdapter networkAdapter)
+    {
+       System.out.println("onNetworkAdapterChange -- VM: " + mach);
+    }
+    public void onSerialPortChange(org.virtualbox_3_3.ISerialPort serialPort)
+    {
+       System.out.println("onSerialPortChange -- VM: " + mach);
+    }
+    public void onParallelPortChange(org.virtualbox_3_3.IParallelPort parallelPort)
+    {
+       System.out.println("onParallelPortChange -- VM: " + mach);
+    }
+    public void onStorageControllerChange()
+    {
+       System.out.println("onStorageControllerChange -- VM: " + mach);
+    }
+    public void onMediumChange(org.virtualbox_3_3.IMediumAttachment mediumAttachment)
+    {
+       System.out.println("onMediumChange -- VM: " + mach);
+    }
+    public void onCPUChange(Long cpu, Boolean add)
+    {
+       System.out.println("onCPUChange -- VM: " + mach);
+    }
+    public void onVRDPServerChange()
+    {
+       System.out.println("onVRDPServerChange -- VM: " + mach);
+    }
+    public void onRemoteDisplayInfoChange()
+    {
+       System.out.println("onRemoteDisplayInfoChange -- VM: " + mach);
+    }
+    public void onUSBControllerChange()
+    {
+       System.out.println("onUSBControllerChange -- VM: " + mach);
+    }
+    public void onUSBDeviceStateChange(org.virtualbox_3_3.IUSBDevice device, Boolean attached, org.virtualbox_3_3.IVirtualBoxErrorInfo error)
+    {
+       System.out.println("onUSBDeviceStateChange -- VM: " + mach);
+    }
+    public void onSharedFolderChange(org.virtualbox_3_3.Scope scope)
+    {
+       System.out.println("onSharedFolderChange -- VM: " + mach);
+    }
+
+    public void onRuntimeError(Boolean fatal, String id, String message)
+    {
+       System.out.println("onRuntimeError -- VM: " + mach);
+    }
+
+    public Boolean onCanShowWindow()
+    {
+       System.out.println("onCanShowWindow -- VM: " + mach);
+       return true;
+    }
+
+    public BigInteger onShowWindow()
+    {
+       System.out.println("onShowWindow -- VM: " + mach);
+       return BigInteger.ZERO;
+    }
+}
+
 public class TestVBox
 {
@@ -70 +161 @@
         IVirtualBoxCallback cbs = new VBoxCallbacks();
         mgr.registerGlobalCallback(vbox, cbs);
-        for (int i=0; i<100; i++)
-        {
+
+        IMachine mach = vbox.getMachines().get(0);
+        IConsoleCallback mcbs = new ConsoleCallbacks(mach.getName());
+
+        ISession session = null;
+        try {
+          session = mgr.openMachineSession(mach);
+          mgr.registerMachineCallback(session, mcbs);
+
+          for (int i=0; i<100; i++)
+          {
             mgr.waitForEvents(500);
+          }
+
+          System.out.println("done waiting");
+
+          mgr.unregisterMachineCallback(session, mcbs);
+        } catch (Exception e) {
+          e.printStackTrace();
+        } finally { 
+          mgr.closeMachineSession(session);
         }
         mgr.unregisterGlobalCallback(vbox, cbs);

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

@@ -217 +217 @@
             win32com.client.gencache.EnsureDispatch('VirtualBox.Session')
             win32com.client.gencache.EnsureDispatch('VirtualBox.VirtualBox')
+            win32com.client.gencache.EnsureDispatch('VirtualBox.Console')
             win32com.client.gencache.EnsureDispatch('VirtualBox.CallbackWrapper')