Changeset 30159 in vbox for trunk/src/VBox/Main

Timestamp:

Jun 11, 2010 8:06:55 AM (15 years ago)

Author:

vboxsync

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

62586

Message:

Main: generic Java glue works (including callbacks on Win)

Location:

trunk/src/VBox/Main

Files:

• VirtualBoxImpl.cpp (modified) (5 diffs)
• glue/tests/Makefile.kmk (modified) (1 diff)
• glue/tests/TestVBox.java (modified) (4 diffs)
• win/VBoxComEvents.cpp (modified) (3 diffs)
• win/VBoxComEvents.h (modified) (5 diffs)

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -2606 +2606 @@
                 aEvDesc.add(id.toUtf16());
                 break;
-               
+
             case VirtualBoxCallbackRegistration::kOnMachineStateChange:
                 aEvDesc.init("OnMachineStateChange", 2);
@@ -2620 +2620 @@
                 AssertFailedReturn(S_OK);
          }
-         return S_OK;         
+         return S_OK;
     }
 #endif
@@ -2724 +2724 @@
        aEvDesc.init("OnExtraDataChange", 3);
        aEvDesc.add(machineId.toUtf16()).add(key).add(val);
-       return S_OK;         
+       return S_OK;
     }
 #endif
@@ -2885 +2885 @@
        aEvDesc.init("OnGuestPropertyChange", 4);
        aEvDesc.add(machineId.toUtf16()).add(name).add(value).add(flags);
-       return S_OK;         
+       return S_OK;
     }
 #endif
@@ -4583 +4583 @@
 
 
-#ifdef RT_OS_WINDOWS       
-#if 0
+#ifdef RT_OS_WINDOWS
+#if 1
     // WIP
     {

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

@@ -22 +22 @@
 
 ifeq ($(KBUILD_HOST),win)
- VBOX_SDK=e:/ws/out/win.amd64/debug/bin/sdk
- VBOX_BIN=e:/ws/out/win.amd64/debug/bin
- JACOB_DIR=e:/ws/src/libs/jacob-1.15-M3/
+ VBOX_SDK=c:/out/bin/sdk
+ VBOX_BIN=c:/out/bin
+ JACOB_DIR=s:/jacob-1.15-M3/
  JACOB_JAR=$(JACOB_DIR)/jacob.jar
  CLASSPATH += $(JACOB_JAR)$(SEP)

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

@@ -11 +11 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
-import org.virtualbox_3_2.*;
+import org.virtualbox_3_3.*;
 import java.util.List;
 
@@ -22 +22 @@
     public void onSnapshotChange(String machineId, String snapshotId)
     {
+        System.out.println("onSnapshotChange -- VM: " + machineId + ", snap: " + snapshotId);
+
     }
     public void onSnapshotDeleted(String machineId, String snapshotId)
     {
+        System.out.println("onSnapshotDeleted -- VM: " + machineId + ", snap: " + snapshotId);
     }
-    public void onSnapshotTaken(String machineId, String snapshotId) {}
+    public void onSnapshotTaken(String machineId, String snapshotId)
+    {
+        System.out.println("onSnapshotTaken -- VM: " + machineId + ", snap: " + snapshotId);
+    }
     public void onSessionStateChange(String machineId, SessionState state)
     {
         System.out.println("onSessionStateChange -- VM: " + machineId + ", state: " + state);
     }
-    public void onMachineRegistered(String machineId, Boolean registered) {}
-    public void onMediumRegistered(String mediumId, DeviceType mediumType, Boolean registered) {}
+    public void onMachineRegistered(String machineId, Boolean registered)
+    {
+        System.out.println("onMachineRegistered -- VM: " + machineId + ", registered: " + registered);
+    }
+    public void onMediumRegistered(String mediumId, DeviceType mediumType, Boolean registered)
+    {
+        System.out.println("onMediumRegistered -- ID: " + mediumId + ", type=" + mediumType + ", registered: " + registered);
+    }
     public void onExtraDataChange(String machineId, String key, String value)
     {
         System.out.println("onExtraDataChange -- VM: " + machineId + ": " + key+"->"+value);
     }
-    public Boolean onExtraDataCanChange(String machineId, String key, String value, Holder<String> error) { return true; }
+    public Boolean onExtraDataCanChange(String machineId, String key, String value, Holder<String> error)
+    {
+        return true;
+    }
     public void onMachineDataChange(String machineId)
-    {}
+    {
+        System.out.println("onMachineDataChange -- VM: " + machineId);
+    }
     public void onMachineStateChange(String machineId, MachineState state)
     {
@@ -50 +67 @@
     static void testCallbacks(VirtualBoxManager mgr, IVirtualBox vbox)
     {
-        IVirtualBoxCallback cbs = mgr.createIVirtualBoxCallback(new VBoxCallbacks());
-        vbox.registerCallback(cbs);
+
+        IVirtualBoxCallback cbs = new VBoxCallbacks();
+        mgr.registerGlobalCallback(vbox, cbs);
         for (int i=0; i<100; i++)
         {
             mgr.waitForEvents(500);
         }
-        vbox.unregisterCallback(cbs);
+        mgr.unregisterGlobalCallback(vbox, cbs);
     }
 
@@ -90 +108 @@
             testEnumeration(mgr, vbox);
             testStart(mgr, vbox);
-            //testCallbacks(mgr, vbox);
+            testCallbacks(mgr, vbox);
 
             System.out.println("done, press Enter...");

trunk/src/VBox/Main/win/VBoxComEvents.cpp

@@ -56 +56 @@
         DWORD         hContext; // help context
         BSTR          fName;
-        
+
         hr = ptinfo->GetFuncDesc(i, &pfuncdesc);
         if (FAILED(hr))
            break;
-         
+
         hr = ptinfo->GetDocumentation(pfuncdesc->memid, &fName, NULL, &hContext, NULL);
         if (FAILED(hr))
@@ -74 +74 @@
 
         }
-        SysFreeString(fName);  
+        SysFreeString(fName);
 
         pfuncdesc.Release();
@@ -105 +105 @@
      DISPPARAMS disp = { args, NULL, argc, 0};
      DISPID           dispid;
- 
+
      HRESULT          hr = lookup(event.mName, &dispid);
 

trunk/src/VBox/Main/win/VBoxComEvents.h

@@ -30 +30 @@
 
 class ComEventDesc
-{       
+{
 public:
- ComEventDesc() 
-   : mArgc(0), mArgs(0), mPos(0) 
+ ComEventDesc()
+   : mArgc(0), mArgs(0), mPos(0)
  {}
- ~ComEventDesc() 
- { 
+ ~ComEventDesc()
+ {
    if (mArgs)
       delete [] mArgs;
@@ -50 +50 @@
    mArgs = new CComVariant[mArgc];
    mPos = argc - 1;
- } 
+ }
 
  template <class T>
@@ -60 +60 @@
    return *this;
  }
- 
+
 private:
  com::Utf8Str mName;
@@ -79 +79 @@
     HRESULT lookup(com::Utf8Str &aName, DISPID *did);
     HRESULT fire(IDispatch* aObj, ComEventDesc& desc, CComVariant *pResult);
-    
+
 private:
     typedef std::map<com::Utf8Str, DISPID> ComEventsMap;
@@ -87 +87 @@
 
 #endif /* __VBOXCOMEVENTS_h__ */
-