virtualbox 0.8.6 → 0.9.0

data/lib/virtualbox/com/ffi_interface.rb

@@ -1,3 +1,6 @@
+require 'ffi'
+require 'virtualbox/ext/logger'
+
 module VirtualBox
   module COM
     class FFIInterface < BaseInterface
@@ -72,7 +75,7 @@ module VirtualBox
         logger.debug("FFI init: Trying version #{version}")
 
         # Setup the FFI classes
-        VirtualBox::COM::FFI.setup(version)
+        COM::Util.set_interface_version(version)
         virtualbox_klass = COM::Util.versioned_interface(:VirtualBox)
         session_klass = COM::Util.versioned_interface(:Session)
 
@@ -85,9 +88,12 @@ module VirtualBox
         @virtualbox = virtualbox_klass.new(Implementer::FFI, self, virtualbox_ptr.get_pointer(0))
         @session = session_klass.new(Implementer::FFI, self, session_ptr.get_pointer(0))
 
+        # Make a call to version to verify no exceptions are raised
+        @virtualbox.implementer.valid? && @session.implementer.valid?
+
         logger.debug("    -- Valid version")
         true
-      rescue Exception => e
+      rescue ::FFI::NullPointerError => e
         logger.debug("    -- Invalid version")
         false
       end

data/lib/virtualbox/com/implementer.rb

@@ -0,0 +1,10 @@
+module VirtualBox
+  module COM
+    module Implementer
+      autoload :Base, 'virtualbox/com/implementer/base'
+      autoload :FFI, 'virtualbox/com/implementer/ffi'
+      autoload :MSCOM, 'virtualbox/com/implementer/mscom'
+      autoload :Nil, 'virtualbox/com/implementer/nil'
+    end
+  end
+end

data/lib/virtualbox/com/implementer/base.rb

@@ -1,3 +1,5 @@
+require 'virtualbox/ext/logger'
+
 module VirtualBox
   module COM
     module Implementer
@@ -43,10 +45,15 @@ module VirtualBox
 
               # Depending on the class type, we're either dealing with an interface
               # or an enum
-              type = :interface if interface.superclass == COM::AbstractInterface
-              type = :enum if interface.superclass == COM::AbstractEnum
+              if interface.superclass == COM::AbstractInterface
+                type = :interface
+                c_type = :pointer
+              elsif interface.superclass == COM::AbstractEnum
+                type = :enum
+                c_type = :uint32
+              end
             end
-          rescue NameError
+          rescue NameError,LoadError
             # Do nothing
           end
 

data/lib/virtualbox/com/implementer/ffi.rb

@@ -2,8 +2,6 @@ module VirtualBox
   module COM
     module Implementer
       class FFI < Base
-        attr_reader :ffi_interface
-
         # Initializes the FFI implementer which takes an {VirtualBox::COM::AbstractInterface AbstractInterface}
         # instant and FFI pointer and initializes everything required to
         # communicate with that interface via FFI.
@@ -13,7 +11,20 @@ module VirtualBox
         def initialize(interface, lib_base, pointer)
           super(interface, lib_base)
 
-          @ffi_interface = ffi_class.new(pointer)
+          # Store the pointer which is used later to instantiate the actual
+          # structure. We don't instantiate here to save some CPU cycles.
+          @pointer = pointer
+        end
+
+        # This checks if the interface pointer was valid.
+        def valid?
+          !ffi_interface.nil?
+        end
+
+        # Instantiates the FFI class with the given pointer and caches the
+        # result for later.
+        def ffi_interface
+          @ffi_interface ||= ffi_class.new(@pointer)
         end
 
         # Gets the FFI struct class associated with the interface. This works
@@ -28,7 +39,7 @@ module VirtualBox
           klass_name = interface.class.to_s.split("::").last
 
           # Get the associated FFI class
-          COM::FFI.const_get(::VirtualBox::COM::Util.version_const).const_get(klass_name)
+          COM::FFI::Util.versioned_interface(klass_name)
         end
 
         # Reads a property from the interface with the given name.
@@ -65,7 +76,7 @@ module VirtualBox
           formal_args = spec_to_args(spec, args)
 
           # Call the function.
-          logger.debug("FFI call: #{name} #{args.inspect} #{formal_args.inspect}")
+          logger.debug("FFI call: #{name} #{spec.inspect} #{args.inspect} #{formal_args.inspect}")
           call_and_check(name, ffi_interface.vtbl_parent, *formal_args)
 
           # Extract the values from the formal args array, again based on the
@@ -114,10 +125,11 @@ module VirtualBox
             0x80BB_0009 => Exceptions::NotSupportedException,
             0x80BB_000A => Exceptions::XMLErrorException,
             0x80BB_000B => Exceptions::InvalidSessionStateException,
-            0x80BB_000C => Exceptions::ObjectInUseException
+            0x80BB_000C => Exceptions::ObjectInUseException,
+            0x8007_0057 => Exceptions::InvalidArgException
           }
 
-          map[code] || Exceptions::FFIException
+          map[code] || Exceptions::COMException
         end
 
         # Converts a function spec to a proper argument list with the given
@@ -156,9 +168,16 @@ module VirtualBox
             # If its a regular type (int, bool, etc.) then just make it an
             # array of that
             if type != :interface
-              results << data.inject([]) do |converted_data, single|
-                single_type_to_arg([single], item[0], converted_data)
+              # Build a pointer to an array of values
+              result = ::FFI::MemoryPointer.new(c_type, data.length)
+              adder = result.method("put_#{c_type}")
+              data.each_with_index do |single, index|
+                value = []
+                single_type_to_arg([single], item[0], value)
+                adder.call(index, value.first)
               end
+
+              results << result
             else
               # Then convert the rest into a raw MemoryPointer
               array = ::FFI::MemoryPointer.new(:pointer, data.length)
@@ -217,14 +236,22 @@ module VirtualBox
                 # the first has the size and the second has the contents
                 return_values << dereference_pointer_array(formal[i+1], spec[1][0], dereference_pointer(formal[i], T_UINT32))
 
-                # Increment once more to skip the size param
-                i += 1
+                # Skip 2: size param + pointer
+                i += 2
               else
                 return_values << dereference_pointer(formal[i], spec[1])
+
+                # Skip 1: Pointer
+                i += 1
               end
+            elsif spec.is_a?(Array) && spec.length == 1
+              # This is an array argument, meaning it takes two arguments:
+              # one for size and one is a pointer to the array items. Therefore,
+              # skip two items.
+              i += 2
+            else
+              i += 1
             end
-
-            i += 1
           end
 
           if return_values.empty?

data/lib/virtualbox/com/implementer/mscom.rb

@@ -1,3 +1,5 @@
+require 'virtualbox/ext/platform'
+
 module VirtualBox
   module COM
     module Implementer
@@ -12,6 +14,8 @@ module VirtualBox
           super(interface, lib_base)
 
           @object = object
+
+          require 'java' if Platform.jruby?
         end
 
         # Reads a property from the interface with the given name.
@@ -45,9 +49,22 @@ module VirtualBox
 
         # Calls a function from the interface with the given name
         def call_function(name, args, opts)
+          # This is a special exception only if we're on JRuby
+          jruby_exception = nil
+          jruby_exception = org.racob.com.ComFailException if Platform.jruby?
+
           # Convert args to proper values to send and send em!
           args = spec_to_args(opts[:spec], args)
-          value = @object.send(COM::FFI::Util.camelize(name.to_s), *args)
+
+          value = nil
+          begin
+            value = @object.send(COM::FFI::Util.camelize(name.to_s), *args)
+          rescue jruby_exception
+            # JRuby exception is screwed up. We just throw a generic
+            # COMException and call it good.
+            raise Exceptions::COMException.new(:function => name,
+                                               :result_code => 0)
+          end
 
           # TODO: Multiple return values
           returnable_value(value, opts[:value_type])

data/lib/virtualbox/com/interface/4.0.x/{access_mode.rb → AccessMode.rb}

@@ -3,7 +3,7 @@ module VirtualBox
     module Interface
       module Version_4_0_X
         class AccessMode < AbstractEnum
-          map [:null, :access_mode_read_only, :access_mode_read_write]
+          map [:null, :read_only, :read_write]
         end
       end
     end

data/lib/virtualbox/com/interface/4.0.x/{audio_adapter.rb → AudioAdapter.rb}

@@ -12,4 +12,4 @@ module VirtualBox
       end
     end
   end
-end
+end

data/lib/virtualbox/com/interface/4.0.x/{bios_settings.rb → BIOSSettings.rb}

@@ -18,4 +18,4 @@ module VirtualBox
       end
     end
   end
-end
+end

data/lib/virtualbox/com/interface/4.0.x/{host.rb → Host.rb}

@@ -10,17 +10,17 @@ module VirtualBox
           property :usb_devices, [:HostUSBDevice], :readonly => true
           property :usb_device_filters, [:HostUSBDeviceFilter], :readonly => true
           property :network_interfaces, [:HostNetworkInterface], :readonly => true
-          property :processor_count, T_ULONG, :readonly => true
-          property :processor_online_count, T_ULONG, :readonly => true
-          property :processor_core_count, T_ULONG, :readonly => true
-          property :memory_size, T_ULONG, :readonly => true
-          property :memory_available, T_ULONG, :readonly => true
+          property :processor_count, T_UINT32, :readonly => true
+          property :processor_online_count, T_UINT64, :readonly => true
+          property :processor_core_count, T_UINT64, :readonly => true
+          property :memory_size, T_UINT64, :readonly => true
+          property :memory_available, T_UINT64, :readonly => true
           property :operating_system, WSTRING, :readonly => true
           property :os_version, WSTRING, :readonly => true
           property :utc_time, T_INT64, :readonly => true
           property :acceleration_3d_available, T_BOOL, :readonly => true
 
-          function :get_processor_speed, T_ULONG, [T_UINT32]
+          function :get_processor_speed, T_UINT64, [T_UINT32]
           function :get_processor_feature, T_BOOL, [T_UINT32] # TODO ENUM
           function :get_processor_description, WSTRING, [T_UINT32]
           function :get_processor_cpu_id_leaf, nil, [T_UINT32, T_UINT32, T_UINT32, [:out, T_UINT32], [:out, T_UINT32], [:out, T_UINT32], [:out, T_UINT32]]

data/lib/virtualbox/com/interface/4.0.x/{host_usb_device.rb → HostUSBDevice.rb}

@@ -5,9 +5,11 @@ module VirtualBox
         class HostUSBDevice < AbstractInterface
           IID = "173b4b44-d268-4334-a00d-b6521c9a740a"
 
+          parent :USBDevice
+
           property :state, :USBDeviceState, :readonly => true
         end
       end
     end
   end
-end
+end

data/lib/virtualbox/com/interface/4.0.x/{host_usb_device_filter.rb → HostUSBDeviceFilter.rb}

@@ -5,9 +5,11 @@ module VirtualBox
         class HostUSBDeviceFilter < AbstractInterface
           IID = "4cc70246-d74a-400f-8222-3900489c0374"
 
+          parent :USBDeviceFilter
+
           property :action, :USBDeviceFilterAction
         end
       end
     end
   end
-end
+end

data/lib/virtualbox/com/interface/4.0.x/{nsisupports.rb → NSISupports.rb}

@@ -5,6 +5,9 @@ module VirtualBox
         # This interface is actually only used with the FFI implementer but
         # is created here to allow easier usage with the FFI abstractions.
         class NSISupports < AbstractInterface
+          # This has no parent
+          parent nil
+
           function :QueryInterface, :pointer, [:pointer]
           function :AddRef, nil, []
           function :Release, nil, []

data/lib/virtualbox/com/interface/4.0.x/{virtualbox.rb → VirtualBox.rb}

@@ -6,7 +6,7 @@ module VirtualBox
           IID_STR = "D2DE270C-1D4B-4C9E-843F-BBB9B47269FF"
 
           property :version, WSTRING, :readonly => true
-          property :revision, T_ULONG, :readonly => true
+          property :revision, T_UINT64, :readonly => true
           property :package_type, WSTRING, :readonly => true
           property :home_folder, WSTRING, :readonly => true
           property :settings_file_path, WSTRING, :readonly => true

data/lib/virtualbox/com/interface/4.0.x/{virtual_box_error_info.rb → VirtualBoxErrorInfo.rb}

@@ -5,6 +5,8 @@ module VirtualBox
         class VirtualBoxErrorInfo < AbstractInterface
           IID = "4b86d186-407e-4f9e-8be8-e50061be8725"
 
+          parent :NSIException
+
           property :result_code, T_UINT32, :readonly => true
           property :interface_i_d, WSTRING, :readonly => true
           property :component, WSTRING, :readonly => true
@@ -14,4 +16,4 @@ module VirtualBox
       end
     end
   end
-end
+end