virtualbox-com 0.10.4 → 0.10.5

data/ext/virtualbox-com/4.2/vbox.c

@@ -50,6 +50,7 @@ static VALUE oMin_s16		= Qundef;
 static VALUE oMin_s32		= Qundef;
 static VALUE oMin_s64		= Qundef;
 static VALUE oExceptionMap      = Qundef;
+static VALUE oUUIDparser	= Qnil;
 
 static VALUE sYes		= Qundef;
 static VALUE sNo		= Qundef;
@@ -78,6 +79,7 @@ static ID _symbol;
 static ID _value;
 static ID _const_get;
 static ID _new;
+static ID _call;
 
 static rb_encoding * _UTF8;
 
@@ -105,12 +107,40 @@ static void ns_check(uint32_t rcode) {
     }
 }
 
+
+static VALUE with_uuid_parser(VALUE self, VALUE val) {
+    if (!NIL_P(val) && 
+	rb_obj_is_instance_of(val, rb_cProc) != Qtrue)
+	rb_raise(rb_eArgError, "nil, proc, or lambda expected");
+    return oUUIDparser = val;
+}
+
+static VALUE uuid_parser_calling(VALUE arg) {
+    return rb_funcall(oUUIDparser, _call, 1, arg);
+}
+
+static VALUE to_uuid(VALUE val) {
+    int state = 0;
+
+    StringValue(val);
+    if (oUUIDparser != Qnil && oUUIDparser != Qundef) {
+	val = rb_protect(uuid_parser_calling, val, &state);
+	if (state) {
+	    rb_warn("Returning nil for uuid and discarding exception raised during uuid parsing to avoid memory leak. Fix the parser so that no exception is raised.");
+	}
+    }
+    return val;
+}
+
 /* Forward definition */
 static void nsISupports_free(struct obj *ptr);
 
 
 
 
+
+
+
 /*======================================================================*
  * Internal classes
  *  They are an intermediate to
@@ -118,10 +148,11 @@ static void nsISupports_free(struct obj *ptr);
  *   - perform garbage collection
  *======================================================================*/
 
+
 /* Class: IID
  */
 #define IID_STR_MAX 36  /* 8+1+4+1+4+1+4+1+12 */
-static VALUE iid__new(iid_t *iid) {
+static VALUE iid_new(iid_t *iid) {
     iid_t *a_iid = ALLOC(iid_t);
     *a_iid = *iid;
     return Data_Wrap_Struct(cIID, 0, free, a_iid);
@@ -136,11 +167,16 @@ static VALUE iid__to_s(VALUE self) {
 	     iid->m3[4], iid->m3[5], iid->m3[6], iid->m3[7]);
     return rb_str_new(str, IID_STR_MAX);
 }
+static void iid__to_raw(VALUE self) {
+    iid_t *iid = DATA_PTR(self);
+    return rb_str_new((char *)iid, sizeof(iid_t));
+}
 static void iid_init(VALUE under) {
     cIID = rb_define_class_under(under, "IID", rb_cObject);
     no_instantiation(cIID);
-    rb_define_method(cIID, "to_s", iid__to_s, 0);
-    rb_define_method(cIID, "to_str", iid__to_s, 0);
+    rb_define_method(cIID, "to_s",   iid__to_s,   0);
+    rb_define_method(cIID, "to_str", iid__to_s,   0);
+    rb_define_method(cIID, "to_raw", iid__to_raw, 0);
 }
 
 
@@ -334,6 +370,10 @@ static inline VALUE prepare_wstring(VALUE val) {
     return wstring__new(cWString, val);
 }
 
+static inline VALUE prepare_uuid(val) {
+    return wstring__new(cWString, val);
+}
+
 static VALUE prepare_enum(VALUE val, VALUE klass) {
     switch(rb_type(val)) {
     case T_FIXNUM:
@@ -531,6 +571,25 @@ static VALUE prepare_array_wstring(VALUE ary) {
     return res;
 }
 
+static VALUE prepare_array_uuid(VALUE ary) {
+    VALUE       res  = Qundef;
+    wstring_t  *data = NULL;
+    long        len, i;
+
+    ary  = rb_ary_dup(ensure_array(ary));
+    len  = RARRAY_LEN(ary);
+    data = ALLOC_N(wstring_t, len);
+    res  = carray_new(len, data, ary);
+
+    for (i = 0 ; i < len ; i++) {
+	VALUE val = prepare_uuid(rb_ary_entry(ary, i));
+	rb_ary_store(ary, i, val);
+	data[i] = (wstring_t)DATA_PTR(val);
+    }
+    OBJ_FREEZE(ary);
+    return res;
+}
+
 static VALUE prepare_array_enum(VALUE ary, VALUE klass) {
     VALUE       res  = Qundef;
     uint32_t   *data = NULL;
@@ -587,9 +646,11 @@ static VALUE prepare_array_interface(VALUE ary, VALUE klass) {
 #define extract_bool(val, data) 	     *(data) = (val) == Qtrue ? ~0 : 0
 #define extract_ptr(val, data) 	             *(data) = NUM2PTR(val)
 #define extract_wstring(val, data) 	     *(data) = DATA_PTR(val)
+#define extract_uuid(val, data) 	     *(data) = DATA_PTR(val)
 #define extract_enum(val, data, klass)       *(data) = NUM2UINT32(val)
 #define extract_interface(val, data, klass)  *(data) = DATA_PTR(val)
 
+
 static inline void extract_blob(VALUE val, uint32_t *size, void **data) {
     struct blob_info   * bi = ((struct blob_info   *)DATA_PTR(val));
     *size = bi->size;
@@ -621,6 +682,7 @@ static inline void extract_carray(VALUE val, uint32_t *size, void **data) {
 #define convert_bool(v)    ((v) ? Qtrue : Qfalse)
 #define convert_blob(s,d)  ((d) ? rb_str_to_str(blob_new(s,d))  : Qnil)
 #define convert_wstring(v) ((v) ? rb_str_to_str(wstring_new(v)) : Qnil)
+#define convert_uuid(v)    ((v) ? to_uuid(wstring_new(v)) : Qnil)
 
 static inline VALUE convert_enum(uint32_t v, VALUE klass) {
     VALUE val = ULL2NUM(v);
@@ -712,6 +774,19 @@ static inline VALUE convert_array_wstring(uint32_t size, void **array) {
     }
 }
 
+static inline VALUE convert_array_uuid(uint32_t size, void **array) {
+    if (array) {
+	VALUE res = rb_ary_new2(size);
+	uint32_t i;
+	for (i = 0 ; i < size ; i++)
+	    rb_ary_push(res, convert_uuid(array[i]));
+	xpcom->unalloc_mem(array); 
+	return res;
+    } else {
+	return Qnil;
+    }
+}
+
 
 
 /*======================================================================*
@@ -792,6 +867,7 @@ void RUBY_VBOX_INIT(void) {
     _value      = rb_intern("value");
     _const_get  = rb_intern("const_get");
     _new	= rb_intern("new");
+    _call       = rb_intern("call");
 
     p15         = rb_funcall(oTwo, _pow,   1, INT2FIX(15));
     p16         = rb_funcall(oTwo, _pow,   1, INT2FIX(16));
@@ -830,6 +906,8 @@ void RUBY_VBOX_INIT(void) {
     mVirtualBox        = rb_define_module("VirtualBox");
     mCOM               = rb_define_module_under(mVirtualBox, "COM");
     mModel             = rb_define_module_under(mCOM, "Model");
+    rb_define_module_function(mCOM, "with_uuid_parser", with_uuid_parser, 1);
+
 
     /* Define abstract enumerations / interfaces */
     cAbstractModel

data/ext/virtualbox-com/vbox.c

@@ -50,6 +50,7 @@ static VALUE oMin_s16		= Qundef;
 static VALUE oMin_s32		= Qundef;
 static VALUE oMin_s64		= Qundef;
 static VALUE oExceptionMap      = Qundef;
+static VALUE oUUIDparser	= Qnil;
 
 static VALUE sYes		= Qundef;
 static VALUE sNo		= Qundef;
@@ -78,6 +79,7 @@ static ID _symbol;
 static ID _value;
 static ID _const_get;
 static ID _new;
+static ID _call;
 
 static rb_encoding * _UTF8;
 
@@ -105,12 +107,40 @@ static void ns_check(uint32_t rcode) {
     }
 }
 
+
+static VALUE with_uuid_parser(VALUE self, VALUE val) {
+    if (!NIL_P(val) && 
+	rb_obj_is_instance_of(val, rb_cProc) != Qtrue)
+	rb_raise(rb_eArgError, "nil, proc, or lambda expected");
+    return oUUIDparser = val;
+}
+
+static VALUE uuid_parser_calling(VALUE arg) {
+    return rb_funcall(oUUIDparser, _call, 1, arg);
+}
+
+static VALUE to_uuid(VALUE val) {
+    int state = 0;
+
+    StringValue(val);
+    if (oUUIDparser != Qnil && oUUIDparser != Qundef) {
+	val = rb_protect(uuid_parser_calling, val, &state);
+	if (state) {
+	    rb_warn("Returning nil for uuid and discarding exception raised during uuid parsing to avoid memory leak. Fix the parser so that no exception is raised.");
+	}
+    }
+    return val;
+}
+
 /* Forward definition */
 static void nsISupports_free(struct obj *ptr);
 
 
 
 
+
+
+
 /*======================================================================*
  * Internal classes
  *  They are an intermediate to
@@ -118,10 +148,11 @@ static void nsISupports_free(struct obj *ptr);
  *   - perform garbage collection
  *======================================================================*/
 
+
 /* Class: IID
  */
 #define IID_STR_MAX 36  /* 8+1+4+1+4+1+4+1+12 */
-static VALUE iid__new(iid_t *iid) {
+static VALUE iid_new(iid_t *iid) {
     iid_t *a_iid = ALLOC(iid_t);
     *a_iid = *iid;
     return Data_Wrap_Struct(cIID, 0, free, a_iid);
@@ -136,11 +167,16 @@ static VALUE iid__to_s(VALUE self) {
 	     iid->m3[4], iid->m3[5], iid->m3[6], iid->m3[7]);
     return rb_str_new(str, IID_STR_MAX);
 }
+static void iid__to_raw(VALUE self) {
+    iid_t *iid = DATA_PTR(self);
+    return rb_str_new((char *)iid, sizeof(iid_t));
+}
 static void iid_init(VALUE under) {
     cIID = rb_define_class_under(under, "IID", rb_cObject);
     no_instantiation(cIID);
-    rb_define_method(cIID, "to_s", iid__to_s, 0);
-    rb_define_method(cIID, "to_str", iid__to_s, 0);
+    rb_define_method(cIID, "to_s",   iid__to_s,   0);
+    rb_define_method(cIID, "to_str", iid__to_s,   0);
+    rb_define_method(cIID, "to_raw", iid__to_raw, 0);
 }
 
 
@@ -334,6 +370,10 @@ static inline VALUE prepare_wstring(VALUE val) {
     return wstring__new(cWString, val);
 }
 
+static inline VALUE prepare_uuid(val) {
+    return wstring__new(cWString, val);
+}
+
 static VALUE prepare_enum(VALUE val, VALUE klass) {
     switch(rb_type(val)) {
     case T_FIXNUM:
@@ -531,6 +571,25 @@ static VALUE prepare_array_wstring(VALUE ary) {
     return res;
 }
 
+static VALUE prepare_array_uuid(VALUE ary) {
+    VALUE       res  = Qundef;
+    wstring_t  *data = NULL;
+    long        len, i;
+
+    ary  = rb_ary_dup(ensure_array(ary));
+    len  = RARRAY_LEN(ary);
+    data = ALLOC_N(wstring_t, len);
+    res  = carray_new(len, data, ary);
+
+    for (i = 0 ; i < len ; i++) {
+	VALUE val = prepare_uuid(rb_ary_entry(ary, i));
+	rb_ary_store(ary, i, val);
+	data[i] = (wstring_t)DATA_PTR(val);
+    }
+    OBJ_FREEZE(ary);
+    return res;
+}
+
 static VALUE prepare_array_enum(VALUE ary, VALUE klass) {
     VALUE       res  = Qundef;
     uint32_t   *data = NULL;
@@ -587,9 +646,11 @@ static VALUE prepare_array_interface(VALUE ary, VALUE klass) {
 #define extract_bool(val, data) 	     *(data) = (val) == Qtrue ? ~0 : 0
 #define extract_ptr(val, data) 	             *(data) = NUM2PTR(val)
 #define extract_wstring(val, data) 	     *(data) = DATA_PTR(val)
+#define extract_uuid(val, data) 	     *(data) = DATA_PTR(val)
 #define extract_enum(val, data, klass)       *(data) = NUM2UINT32(val)
 #define extract_interface(val, data, klass)  *(data) = DATA_PTR(val)
 
+
 static inline void extract_blob(VALUE val, uint32_t *size, void **data) {
     struct blob_info   * bi = ((struct blob_info   *)DATA_PTR(val));
     *size = bi->size;
@@ -621,6 +682,7 @@ static inline void extract_carray(VALUE val, uint32_t *size, void **data) {
 #define convert_bool(v)    ((v) ? Qtrue : Qfalse)
 #define convert_blob(s,d)  ((d) ? rb_str_to_str(blob_new(s,d))  : Qnil)
 #define convert_wstring(v) ((v) ? rb_str_to_str(wstring_new(v)) : Qnil)
+#define convert_uuid(v)    ((v) ? to_uuid(wstring_new(v)) : Qnil)
 
 static inline VALUE convert_enum(uint32_t v, VALUE klass) {
     VALUE val = ULL2NUM(v);
@@ -712,6 +774,19 @@ static inline VALUE convert_array_wstring(uint32_t size, void **array) {
     }
 }
 
+static inline VALUE convert_array_uuid(uint32_t size, void **array) {
+    if (array) {
+	VALUE res = rb_ary_new2(size);
+	uint32_t i;
+	for (i = 0 ; i < size ; i++)
+	    rb_ary_push(res, convert_uuid(array[i]));
+	xpcom->unalloc_mem(array); 
+	return res;
+    } else {
+	return Qnil;
+    }
+}
+
 
 
 /*======================================================================*
@@ -792,6 +867,7 @@ void RUBY_VBOX_INIT(void) {
     _value      = rb_intern("value");
     _const_get  = rb_intern("const_get");
     _new	= rb_intern("new");
+    _call       = rb_intern("call");
 
     p15         = rb_funcall(oTwo, _pow,   1, INT2FIX(15));
     p16         = rb_funcall(oTwo, _pow,   1, INT2FIX(16));
@@ -830,6 +906,8 @@ void RUBY_VBOX_INIT(void) {
     mVirtualBox        = rb_define_module("VirtualBox");
     mCOM               = rb_define_module_under(mVirtualBox, "COM");
     mModel             = rb_define_module_under(mCOM, "Model");
+    rb_define_module_function(mCOM, "with_uuid_parser", with_uuid_parser, 1);
+
 
     /* Define abstract enumerations / interfaces */
     cAbstractModel

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

@@ -834,7 +834,7 @@ end
 class VirtualBoxErrorInfo < NSIException
   iid      "e053d3c0-f493-491b-a735-3a9f0b1feed4"
   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
@@ -877,7 +877,7 @@ class VirtualBox < NSISupports
   property :internal_networks, [WSTRING], :readonly => true
   property :generic_network_drivers, [WSTRING], :readonly => true
   function :compose_machine_filename, WSTRING, [WSTRING, WSTRING]
-  function :create_machine, :Machine, [WSTRING, WSTRING, WSTRING, WSTRING, BOOL]
+  function :create_machine, :Machine, [WSTRING, WSTRING, WSTRING, UUID, BOOL]
   function :open_machine, :Machine, [WSTRING]
   function :register_machine, nil, [:Machine]
   function :find_machine, :Machine, [WSTRING]
@@ -885,7 +885,7 @@ class VirtualBox < NSISupports
   function :create_hard_disk, :Medium, [WSTRING, WSTRING]
   function :open_medium, :Medium, [WSTRING, :DeviceType, :AccessMode, BOOL]
   function :find_medium, :Medium, [WSTRING, :DeviceType]
-  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], []
@@ -943,8 +943,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]
@@ -953,7 +953,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]]]
@@ -1001,10 +1001,10 @@ 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 :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
@@ -1172,16 +1172,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
@@ -1189,7 +1189,7 @@ end
 class HostNetworkInterface < NSISupports
   iid      "ce6fae58-7642-4102-b5db-c9005c2320a8"
   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
@@ -1228,16 +1228,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
@@ -1349,7 +1349,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
@@ -1375,7 +1375,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
@@ -1402,7 +1402,7 @@ end
 
 class Medium < NSISupports
   iid      "53f9cc0c-e0fd-40a5-a404-a7a5272082cd"
-  property :id, WSTRING, :readonly => true
+  property :id, UUID, :readonly => true
   property :description, WSTRING
   property :state, :MediumState, :readonly => true
   property :variant, UINT32, :readonly => true
@@ -1422,10 +1422,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_i_ds, nil, [BOOL, WSTRING, BOOL, WSTRING]
+  property :machine_ids, [UUID], :readonly => true
+  function :set_i_ds, 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, []
@@ -1619,7 +1619,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
@@ -1709,7 +1709,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]]
@@ -1885,7 +1885,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
@@ -1900,7 +1900,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
@@ -1924,7 +1924,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
@@ -2062,7 +2062,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
@@ -2076,7 +2076,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