virtualbox-com 0.10.4 → 0.10.5

data/lib/virtualbox/com/model/4.2-generated.rb

@@ -959,7 +959,7 @@ end
 class VirtualBoxErrorInfo < NSIException
   iid      "f91e6e91-49e1-4fd2-b21e-269003350d06"
   property :result_code, INT32, :readonly => true
-  property :interface_i_d, WSTRING, :readonly => true
+  property :interface_i_d, UUID, :readonly => true
   property :component, WSTRING, :readonly => true
   property :text, WSTRING, :readonly => true
   property :next, :VirtualBoxErrorInfo, :readonly => true
@@ -1013,7 +1013,7 @@ class VirtualBox < NSISupports
   function :create_appliance, :Appliance, []
   function :create_hard_disk, :Medium, [WSTRING, WSTRING]
   function :open_medium, :Medium, [WSTRING, :DeviceType, :AccessMode, BOOL]
-  function :get_guest_os_type, :GuestOSType, [WSTRING]
+  function :get_guest_os_type, :GuestOSType, [UUID]
   function :create_shared_folder, nil, [WSTRING, WSTRING, BOOL, BOOL]
   function :remove_shared_folder, nil, [WSTRING]
   function :get_extra_data_keys, [WSTRING], []
@@ -1072,8 +1072,8 @@ class InternalMachineControl < NSISupports
   function :begin_powering_down, nil, [[:out, :Progress]]
   function :end_powering_down, nil, [INT32, WSTRING]
   function :run_usb_device_filters, nil, [:USBDevice, [:out, BOOL], [:out, UINT32]]
-  function :capture_usb_device, nil, [WSTRING]
-  function :detach_usb_device, nil, [WSTRING, BOOL]
+  function :capture_usb_device, nil, [UUID]
+  function :detach_usb_device, nil, [UUID, BOOL]
   function :auto_capture_usb_devices, nil, []
   function :detach_all_usb_devices, nil, [BOOL]
   function :on_session_end, :Progress, [:Session]
@@ -1082,7 +1082,7 @@ class InternalMachineControl < NSISupports
   function :adopt_saved_state, nil, [WSTRING]
   function :begin_taking_snapshot, nil, [:Console, WSTRING, WSTRING, :Progress, BOOL, [:out, WSTRING]]
   function :end_taking_snapshot, nil, [BOOL]
-  function :delete_snapshot, :Progress, [:Console, WSTRING, WSTRING, BOOL, [:out, :MachineState]]
+  function :delete_snapshot, :Progress, [:Console, UUID, UUID, BOOL, [:out, :MachineState]]
   function :finish_online_merge_medium, nil, [:MediumAttachment, :Medium, :Medium, BOOL, :Medium, [:Medium]]
   function :restore_snapshot, :Progress, [:Console, :Snapshot, [:out, :MachineState]]
   function :pull_guest_properties, nil, [[:out, [WSTRING]], [:out, [WSTRING]], [:out, [INT64]], [:out, [WSTRING]]]
@@ -1130,11 +1130,11 @@ class Machine < NSISupports
   property :access_error, :VirtualBoxErrorInfo, :readonly => true
   property :name, WSTRING
   property :description, WSTRING
-  property :id, WSTRING, :readonly => true
+  property :id, UUID, :readonly => true
   property :groups, [WSTRING]
   property :os_type_id, WSTRING
   property :hardware_version, WSTRING
-  property :hardware_uuid, WSTRING
+  property :hardware_uuid, UUID
   property :cpu_count, UINT32
   property :cpu_hot_plug_enabled, BOOL
   property :cpu_execution_cap, UINT32
@@ -1318,16 +1318,16 @@ class Console < NSISupports
   function :adopt_saved_state, nil, [WSTRING]
   function :discard_saved_state, nil, [BOOL]
   function :get_device_activity, :DeviceActivity, [:DeviceType]
-  function :attach_usb_device, nil, [WSTRING]
-  function :detach_usb_device, :USBDevice, [WSTRING]
+  function :attach_usb_device, nil, [UUID]
+  function :detach_usb_device, :USBDevice, [UUID]
   function :find_usb_device_by_address, :USBDevice, [WSTRING]
-  function :find_usb_device_by_id, :USBDevice, [WSTRING]
+  function :find_usb_device_by_id, :USBDevice, [UUID]
   function :create_shared_folder, nil, [WSTRING, WSTRING, BOOL, BOOL]
   function :remove_shared_folder, nil, [WSTRING]
   function :take_snapshot, :Progress, [WSTRING, WSTRING]
-  function :delete_snapshot, :Progress, [WSTRING]
-  function :delete_snapshot_and_all_children, :Progress, [WSTRING]
-  function :delete_snapshot_range, :Progress, [WSTRING, WSTRING]
+  function :delete_snapshot, :Progress, [UUID]
+  function :delete_snapshot_and_all_children, :Progress, [UUID]
+  function :delete_snapshot_range, :Progress, [UUID, UUID]
   function :restore_snapshot, :Progress, [:Snapshot]
   function :teleport, :Progress, [WSTRING, UINT32, WSTRING, UINT32]
 end
@@ -1335,7 +1335,7 @@ end
 class HostNetworkInterface < NSISupports
   iid      "87a4153d-6889-4dd6-9654-2e9ff0ae8dec"
   property :name, WSTRING, :readonly => true
-  property :id, WSTRING, :readonly => true
+  property :id, UUID, :readonly => true
   property :network_name, WSTRING, :readonly => true
   property :dhcp_enabled, BOOL, :readonly => true
   property :ip_address, WSTRING, :readonly => true
@@ -1374,16 +1374,16 @@ class Host < NSISupports
   function :get_processor_description, WSTRING, [UINT32]
   function :get_processor_cpuid_leaf, nil, [UINT32, UINT32, UINT32, [:out, UINT32], [:out, UINT32], [:out, UINT32], [:out, UINT32]]
   function :create_host_only_network_interface, :Progress, [[:out, :HostNetworkInterface]]
-  function :remove_host_only_network_interface, :Progress, [WSTRING]
+  function :remove_host_only_network_interface, :Progress, [UUID]
   function :create_usb_device_filter, :HostUSBDeviceFilter, [WSTRING]
   function :insert_usb_device_filter, nil, [UINT32, :HostUSBDeviceFilter]
   function :remove_usb_device_filter, nil, [UINT32]
   function :find_host_dvd_drive, :Medium, [WSTRING]
   function :find_host_floppy_drive, :Medium, [WSTRING]
   function :find_host_network_interface_by_name, :HostNetworkInterface, [WSTRING]
-  function :find_host_network_interface_by_id, :HostNetworkInterface, [WSTRING]
+  function :find_host_network_interface_by_id, :HostNetworkInterface, [UUID]
   function :find_host_network_interfaces_of_type, [:HostNetworkInterface], [:HostNetworkInterfaceType]
-  function :find_usb_device_by_id, :HostUSBDevice, [WSTRING]
+  function :find_usb_device_by_id, :HostUSBDevice, [UUID]
   function :find_usb_device_by_address, :HostUSBDevice, [WSTRING]
   function :generate_mac_address, WSTRING, []
 end
@@ -1621,7 +1621,7 @@ end
 
 class Progress < NSISupports
   iid      "c20238e4-3221-4d3f-8891-81ce92d9f913"
-  property :id, WSTRING, :readonly => true
+  property :id, UUID, :readonly => true
   property :description, WSTRING, :readonly => true
   property :initiator, :NSISupports, :readonly => true
   property :cancelable, BOOL, :readonly => true
@@ -1647,7 +1647,7 @@ end
 
 class Snapshot < NSISupports
   iid      "0472823b-c6e7-472a-8e9f-d732e86b8463"
-  property :id, WSTRING, :readonly => true
+  property :id, UUID, :readonly => true
   property :name, WSTRING
   property :description, WSTRING
   property :time_stamp, INT64, :readonly => true
@@ -1675,7 +1675,7 @@ end
 
 class Medium < NSISupports
   iid      "29989373-b111-4654-8493-2e1176cba890"
-  property :id, WSTRING, :readonly => true
+  property :id, UUID, :readonly => true
   property :description, WSTRING
   property :state, :MediumState, :readonly => true
   property :variant, UINT32, :readonly => true
@@ -1695,10 +1695,10 @@ class Medium < NSISupports
   property :logical_size, INT64, :readonly => true
   property :auto_reset, BOOL
   property :last_access_error, WSTRING, :readonly => true
-  property :machine_ids, [WSTRING], :readonly => true
-  function :set_ids, nil, [BOOL, WSTRING, BOOL, WSTRING]
+  property :machine_ids, [UUID], :readonly => true
+  function :set_ids, nil, [BOOL, UUID, BOOL, UUID]
   function :refresh_state, :MediumState, []
-  function :get_snapshot_ids, [WSTRING], [WSTRING]
+  function :get_snapshot_ids, [UUID], [UUID]
   function :lock_read, :MediumState, []
   function :unlock_read, :MediumState, []
   function :lock_write, :MediumState, []
@@ -1897,7 +1897,7 @@ end
 
 class USBDevice < NSISupports
   iid      "f8967b0b-4483-400f-92b5-8b675d98a85b"
-  property :id, WSTRING, :readonly => true
+  property :id, UUID, :readonly => true
   property :vendor_id, UINT16, :readonly => true
   property :product_id, UINT16, :readonly => true
   property :revision, UINT16, :readonly => true
@@ -1989,7 +1989,7 @@ class InternalSessionControl < NSISupports
   function :on_usb_controller_change, nil, []
   function :on_shared_folder_change, nil, [BOOL]
   function :on_usb_device_attach, nil, [:USBDevice, :VirtualBoxErrorInfo, UINT32]
-  function :on_usb_device_detach, nil, [WSTRING, :VirtualBoxErrorInfo]
+  function :on_usb_device_detach, nil, [UUID, :VirtualBoxErrorInfo]
   function :on_show_window, nil, [BOOL, [:out, BOOL], [:out, INT64]]
   function :on_bandwidth_group_change, nil, [:BandwidthGroup]
   function :access_guest_property, nil, [WSTRING, WSTRING, WSTRING, BOOL, [:out, WSTRING], [:out, INT64], [:out, WSTRING]]
@@ -2164,7 +2164,7 @@ end
 
 class MachineEvent < Event
   iid      "92ed7b1a-0d96-40ed-ae46-a564d484325e"
-  property :machine_id, WSTRING, :readonly => true
+  property :machine_id, UUID, :readonly => true
 end
 
 class MachineStateChangedEvent < MachineEvent
@@ -2179,7 +2179,7 @@ end
 
 class MediumRegisteredEvent < Event
   iid      "53fac49a-b7f1-4a5a-a4ef-a11dd9c2a458"
-  property :medium_id, WSTRING, :readonly => true
+  property :medium_id, UUID, :readonly => true
   property :medium_type, :DeviceType, :readonly => true
   property :registered, BOOL, :readonly => true
 end
@@ -2203,7 +2203,7 @@ end
 
 class SnapshotEvent < MachineEvent
   iid      "21637b0e-34b8-42d3-acfb-7e96daf77c22"
-  property :snapshot_id, WSTRING, :readonly => true
+  property :snapshot_id, UUID, :readonly => true
 end
 
 class SnapshotTakenEvent < SnapshotEvent
@@ -2351,7 +2351,7 @@ end
 
 class ExtraDataChangedEvent < Event
   iid      "024F00CE-6E0B-492A-A8D0-968472A94DC7"
-  property :machine_id, WSTRING, :readonly => true
+  property :machine_id, UUID, :readonly => true
   property :key, WSTRING, :readonly => true
   property :value, WSTRING, :readonly => true
 end
@@ -2365,7 +2365,7 @@ end
 
 class ExtraDataCanChangeEvent < VetoEvent
   iid      "245d88bd-800a-40f8-87a6-170d02249a55"
-  property :machine_id, WSTRING, :readonly => true
+  property :machine_id, UUID, :readonly => true
   property :key, WSTRING, :readonly => true
   property :value, WSTRING, :readonly => true
 end

data/lib/virtualbox/com/version.rb

@@ -1,5 +1,5 @@
 module VirtualBox
 module COM
-    VERSION = "0.10.4"
+    VERSION = "0.10.5"
 end
 end

data/scripts/sig.rb

@@ -31,19 +31,19 @@ class Sig
             case way
             when :out
                 if is_array
-                then [PTR, PTR] 
-                else PTR
+                then [type_to_c(PTR), type_to_c(PTR)] 
+                else type_to_c(PTR)
                 end
             when :in
-                if is_array then [UINT32,  PTR] 
+                if is_array then [type_to_c(UINT32),  type_to_c(PTR)] 
                 elsif model = Model.fetch(type)
-                    if    model <= COM::AbstractInterface then PTR
-                    elsif model <= COM::AbstractEnum      then UINT32
+                    if    model <= COM::AbstractInterface then type_to_c(PTR)
+                    elsif model <= COM::AbstractEnum      then type_to_c(UINT32)
                     end
-                else type
+                else type_to_c(type)
                 end
             end
-        }.unshift(PTR).flatten	# Add `this` element
+        }.unshift(type_to_c(PTR)).flatten	# Add `this` element
     end
 
 
@@ -66,8 +66,24 @@ class Sig
 
 
 
-
-
+    def type_to_c(t)
+        case t
+        when UUID    then 'wstring_t'
+        when WSTRING then 'wstring_t'
+        when BOOL    then 'bool_t'
+        when OCTET   then 'char'
+        when PTR     then 'void *'
+        when INT8    then 'int8_t'
+        when INT16   then 'int16_t'
+        when INT32   then 'int32_t'
+        when INT64   then 'int64_t'
+        when UINT8   then 'uint8_t'
+        when UINT16  then 'uint16_t'
+        when UINT32  then 'uint32_t'
+        when UINT64  then 'uint64_t'
+        else raise "Unknown conversion to c type for #{t}"
+        end
+    end
 
     def to_c_func(name, vtbl, fun)
         ins = self.in;
@@ -84,7 +100,7 @@ class Sig
 
         args.each{|type, way, *vdecl|
             vdecl.each{|var, decl|
-                OUT << "  #{decl} #{var};\n"
+                OUT << "  #{type_to_c(decl)} #{var};\n"
             }
         }
 
@@ -184,6 +200,7 @@ class Sig
         when UINT32  then :uint32
         when UINT64  then :uint64
         when WSTRING then :wstring
+        when UUID    then :uuid
         else
             if model = Model.fetch(type)
                 kind = if    model <= AbstractInterface then :interface

data/scripts/to_c.rb

@@ -3,18 +3,19 @@ require 'getoptlong'
 
 module VirtualBox
     module COM
-        WSTRING = 'wstring_t'
-        BOOL    = 'bool_t'
-        OCTET   = 'char'
-        PTR     = 'void *'
-        INT8    = 'int8_t'
-        INT16   = 'int16_t'
-        INT32   = 'int32_t'
-        INT64   = 'int64_t'
-        UINT8   = 'uint8_t'
-        UINT16  = 'uint16_t'
-        UINT32  = 'uint32_t'
-        UINT64  = 'uint64_t'
+        UUID    = 'uuid'
+        WSTRING = 'wstring'
+        BOOL    = 'bool'
+        OCTET   = 'octet'
+        PTR     = 'ptr'
+        INT8    = 'int8'
+        INT16   = 'int16'
+        INT32   = 'int32'
+        INT64   = 'int64'
+        UINT8   = 'uint8'
+        UINT16  = 'uint16'
+        UINT32  = 'uint32'
+        UINT64  = 'uint64'
         
         module Model
             def self.get(name)
@@ -127,7 +128,7 @@ M.constants.each {|name| model = VirtualBox::COM::Model.get(name)
     OUT << "    VALUE c    = c#{name}\n"
     OUT << "      = rb_define_class_under(under, \"#{name}\", #{kAbstract});\n"
     OUT << "    no_instantiation(c);\n"
-    OUT << "    rb_const_set(c, _IID, iid__new(&iid));\n"
+    OUT << "    rb_const_set(c, _IID, iid_new(&iid));\n"
     
     if model <= VirtualBox::COM::AbstractEnum
         OUT << "    VALUE h    = rb_hash_new();\n"

data/scripts/xidl-conv.rb

@@ -106,7 +106,7 @@ def cnv_type(name, array=nil, ptr=nil)
         when 'long long'          then 'INT64'
         when 'unsigned long'      then 'UINT32'
         when 'unsigned long long' then 'UINT64'
-        when 'uuid'               then 'WSTRING'
+        when 'uuid'               then 'UUID'
         when 'wstring'            then 'WSTRING'
         when '$unknown'           then ':NSISupports'
         when '$errorinfo'         then ':NSIException'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: virtualbox-com
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1599445118927892971
+      hash: 1923609477400548225
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1599445118927892971
+      hash: 1923609477400548225
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25