From 9d45f44c90fcf800d1b865351fd083b19570ca57 Mon Sep 17 00:00:00 2001
From: Daniel Silverstone <dsilvers@digital-scurf.org>
Date: Mon, 10 Sep 2012 19:14:49 +0100
Subject: unsigned long -> uint32_t, signed long and long -> int32_t, plus
 collateral fixes.  Test suite does not pass

---
 include/dom/core/attr.h                      |  6 ++--
 include/dom/core/characterdata.h             | 46 ++++++++++++++--------------
 include/dom/core/exceptions.h                |  2 +-
 include/dom/core/namednodemap.h              |  6 ++--
 include/dom/core/nodelist.h                  |  6 ++--
 include/dom/core/text.h                      |  6 ++--
 include/dom/events/mouse_event.h             | 32 +++++++++----------
 include/dom/events/mouse_multi_wheel_event.h | 26 ++++++++--------
 include/dom/events/mouse_wheel_event.h       | 14 ++++-----
 include/dom/events/ui_event.h                | 12 ++++----
 include/dom/html/html_button_element.h       |  4 +--
 include/dom/html/html_collection.h           |  4 +--
 include/dom/html/html_form_element.h         |  2 +-
 include/dom/html/html_input_element.h        |  8 ++---
 include/dom/html/html_options_collection.h   |  6 ++--
 include/dom/html/html_select_element.h       | 16 +++++-----
 include/dom/html/html_text_area_element.h    | 12 ++++----
 17 files changed, 104 insertions(+), 104 deletions(-)

(limited to 'include')

diff --git a/include/dom/core/attr.h b/include/dom/core/attr.h
index 69612f7..1ae5be5 100644
--- a/include/dom/core/attr.h
+++ b/include/dom/core/attr.h
@@ -114,7 +114,7 @@ static inline dom_exception dom_attr_is_id(struct dom_attr *attr, bool *result)
  * Following are our implementation specific APIs.
  *
  * These APIs are defined for the purpose that there are some attributes in
- * HTML and other DOM module whose type is not DOMString, but unsigned long or
+ * HTML and other DOM module whose type is not DOMString, but uint32_t or
  * boolean, for those types of attributes, clients should call one of the
  * following APIs to set it. 
  *
@@ -135,8 +135,8 @@ static inline dom_exception dom_attr_is_id(struct dom_attr *attr, bool *result)
  * dom_attr_get_* functions.
  */
 dom_attr_type dom_attr_get_type(dom_attr *a);
-dom_exception dom_attr_get_integer(dom_attr *a, unsigned long *value);
-dom_exception dom_attr_set_integer(dom_attr *a, unsigned long value);
+dom_exception dom_attr_get_integer(dom_attr *a, uint32_t *value);
+dom_exception dom_attr_set_integer(dom_attr *a, uint32_t value);
 dom_exception dom_attr_get_short(dom_attr *a, unsigned short *value);
 dom_exception dom_attr_set_short(dom_attr *a, unsigned short value);
 dom_exception dom_attr_get_bool(dom_attr *a, bool *value);
diff --git a/include/dom/core/characterdata.h b/include/dom/core/characterdata.h
index 174be89..6b894fb 100644
--- a/include/dom/core/characterdata.h
+++ b/include/dom/core/characterdata.h
@@ -25,22 +25,22 @@ typedef struct dom_characterdata_vtable {
 			dom_string *data);
 	dom_exception (*dom_characterdata_get_length)(
 			struct dom_characterdata *cdata,
-			unsigned long *length);
+			uint32_t *length);
 	dom_exception (*dom_characterdata_substring_data)(
-			struct dom_characterdata *cdata, unsigned long offset,
-			unsigned long count, dom_string **data);
+			struct dom_characterdata *cdata, uint32_t offset,
+			uint32_t count, dom_string **data);
 	dom_exception (*dom_characterdata_append_data)(
 			struct dom_characterdata *cdata,
 			dom_string *data);
 	dom_exception (*dom_characterdata_insert_data)(
 			struct dom_characterdata *cdata,
-			unsigned long offset, dom_string *data);
+			uint32_t offset, dom_string *data);
 	dom_exception (*dom_characterdata_delete_data)(
 			struct dom_characterdata *cdata,
-			unsigned long offset, unsigned long count);
+			uint32_t offset, uint32_t count);
 	dom_exception (*dom_characterdata_replace_data)(
-			struct dom_characterdata *cdata, unsigned long offset,
-			unsigned long count, dom_string *data);
+			struct dom_characterdata *cdata, uint32_t offset,
+			uint32_t count, dom_string *data);
 } dom_characterdata_vtable;
 
 
@@ -63,17 +63,17 @@ static inline dom_exception dom_characterdata_set_data(
 		(struct dom_characterdata *) (c), (d))
 
 static inline dom_exception dom_characterdata_get_length(
-		struct dom_characterdata *cdata, unsigned long *length)
+		struct dom_characterdata *cdata, uint32_t *length)
 {
 	return ((dom_characterdata_vtable *) ((dom_node *) cdata)->vtable)->
 			dom_characterdata_get_length(cdata, length);
 }
 #define dom_characterdata_get_length(c, l) dom_characterdata_get_length( \
-		(struct dom_characterdata *) (c), (unsigned long *) (l))
+		(struct dom_characterdata *) (c), (uint32_t *) (l))
 
 static inline dom_exception dom_characterdata_substring_data(
-		struct dom_characterdata *cdata, unsigned long offset,
-		unsigned long count, dom_string **data)
+		struct dom_characterdata *cdata, uint32_t offset,
+		uint32_t count, dom_string **data)
 {
 	return ((dom_characterdata_vtable *) ((dom_node *) cdata)->vtable)->
 			dom_characterdata_substring_data(cdata, offset, count,
@@ -81,8 +81,8 @@ static inline dom_exception dom_characterdata_substring_data(
 }
 #define dom_characterdata_substring_data(c, o, ct, d) \
 		dom_characterdata_substring_data( \
-		(struct dom_characterdata *) (c), (unsigned long) (o), \
-		(unsigned long) (ct), (d))
+		(struct dom_characterdata *) (c), (uint32_t) (o), \
+		(uint32_t) (ct), (d))
 
 static inline dom_exception dom_characterdata_append_data(
 		struct dom_characterdata *cdata, dom_string *data)
@@ -94,29 +94,29 @@ static inline dom_exception dom_characterdata_append_data(
 		(struct dom_characterdata *) (c), (d))
 
 static inline dom_exception dom_characterdata_insert_data(
-		struct dom_characterdata *cdata, unsigned long offset, 
+		struct dom_characterdata *cdata, uint32_t offset, 
 		dom_string *data)
 {
 	return ((dom_characterdata_vtable *) ((dom_node *) cdata)->vtable)->
 			dom_characterdata_insert_data(cdata, offset, data);
 }
 #define dom_characterdata_insert_data(c, o, d) dom_characterdata_insert_data( \
-		(struct dom_characterdata *) (c), (unsigned long) (o), (d))
+		(struct dom_characterdata *) (c), (uint32_t) (o), (d))
 
 static inline dom_exception dom_characterdata_delete_data(
-		struct dom_characterdata *cdata, unsigned long offset, 
-		unsigned long count)
+		struct dom_characterdata *cdata, uint32_t offset, 
+		uint32_t count)
 {
 	return ((dom_characterdata_vtable *) ((dom_node *) cdata)->vtable)->
 			dom_characterdata_delete_data(cdata, offset, count);
 }
 #define dom_characterdata_delete_data(c, o, ct) dom_characterdata_delete_data(\
-		(struct dom_characterdata *) (c), (unsigned long) (o), \
-		(unsigned long) (ct))
+		(struct dom_characterdata *) (c), (uint32_t) (o), \
+		(uint32_t) (ct))
 
 static inline dom_exception dom_characterdata_replace_data(
-		struct dom_characterdata *cdata, unsigned long offset, 
-		unsigned long count, dom_string *data)
+		struct dom_characterdata *cdata, uint32_t offset, 
+		uint32_t count, dom_string *data)
 {
 	return ((dom_characterdata_vtable *) ((dom_node *) cdata)->vtable)->
 			dom_characterdata_replace_data(cdata, offset, count, 
@@ -124,7 +124,7 @@ static inline dom_exception dom_characterdata_replace_data(
 }
 #define dom_characterdata_replace_data(c, o, ct, d) \
 		dom_characterdata_replace_data(\
-		(struct dom_characterdata *) (c), (unsigned long) (o),\
-		(unsigned long) (ct), (d))
+		(struct dom_characterdata *) (c), (uint32_t) (o),\
+		(uint32_t) (ct), (d))
 
 #endif
diff --git a/include/dom/core/exceptions.h b/include/dom/core/exceptions.h
index 04c7f18..67160d1 100644
--- a/include/dom/core/exceptions.h
+++ b/include/dom/core/exceptions.h
@@ -12,7 +12,7 @@
  * Class of a DOM exception.
  *
  * The top 16 bits of a dom_exception are a bitfield 
- * indicating which class the exception belongs to.
+ * indicating which class the exception beint32_ts to.
  */
 typedef enum {
 	DOM_EXCEPTION_CLASS_NORMAL = 0,
diff --git a/include/dom/core/namednodemap.h b/include/dom/core/namednodemap.h
index fc5e886..f44e553 100644
--- a/include/dom/core/namednodemap.h
+++ b/include/dom/core/namednodemap.h
@@ -19,7 +19,7 @@ void dom_namednodemap_ref(struct dom_namednodemap *map);
 void dom_namednodemap_unref(struct dom_namednodemap *map);
 
 dom_exception dom_namednodemap_get_length(struct dom_namednodemap *map,
-		unsigned long *length);
+		uint32_t *length);
 
 dom_exception _dom_namednodemap_get_named_item(struct dom_namednodemap *map,
 		dom_string *name, struct dom_node **node);
@@ -47,10 +47,10 @@ dom_exception _dom_namednodemap_remove_named_item(
 
 
 dom_exception _dom_namednodemap_item(struct dom_namednodemap *map,
-		unsigned long index, struct dom_node **node);
+		uint32_t index, struct dom_node **node);
 
 #define dom_namednodemap_item(m, i, n) _dom_namednodemap_item( \
-		(dom_namednodemap *) (m), (unsigned long) (i), \
+		(dom_namednodemap *) (m), (uint32_t) (i), \
 		(dom_node **) (n))
 
 
diff --git a/include/dom/core/nodelist.h b/include/dom/core/nodelist.h
index 2aad313..369a42b 100644
--- a/include/dom/core/nodelist.h
+++ b/include/dom/core/nodelist.h
@@ -18,11 +18,11 @@ void dom_nodelist_ref(struct dom_nodelist *list);
 void dom_nodelist_unref(struct dom_nodelist *list);
 
 dom_exception dom_nodelist_get_length(struct dom_nodelist *list,
-		unsigned long *length);
+		uint32_t *length);
 dom_exception _dom_nodelist_item(struct dom_nodelist *list,
-		unsigned long index, struct dom_node **node);
+		uint32_t index, struct dom_node **node);
 
 #define dom_nodelist_item(l, i, n) _dom_nodelist_item((dom_nodelist *) (l), \
-		(unsigned long) (i), (dom_node **) (n))
+		(uint32_t) (i), (dom_node **) (n))
 
 #endif
diff --git a/include/dom/core/text.h b/include/dom/core/text.h
index 1750aec..7bafc8c 100644
--- a/include/dom/core/text.h
+++ b/include/dom/core/text.h
@@ -21,7 +21,7 @@ typedef struct dom_text_vtable {
 	struct dom_characterdata_vtable base;
 
 	dom_exception (*dom_text_split_text)(struct dom_text *text,
-			unsigned long offset, struct dom_text **result);
+			uint32_t offset, struct dom_text **result);
 	dom_exception (*dom_text_get_is_element_content_whitespace)(
 			struct dom_text *text, bool *result);
 	dom_exception (*dom_text_get_whole_text)(struct dom_text *text,
@@ -31,13 +31,13 @@ typedef struct dom_text_vtable {
 } dom_text_vtable;
 
 static inline dom_exception dom_text_split_text(struct dom_text *text,
-		unsigned long offset, struct dom_text **result)
+		uint32_t offset, struct dom_text **result)
 {
 	return ((dom_text_vtable *) ((dom_node *) text)->vtable)->
 			dom_text_split_text(text, offset, result);
 }
 #define dom_text_split_text(t, o, r) dom_text_split_text((dom_text *) (t), \
-		(unsigned long) (o), (dom_text **) (r))
+		(uint32_t) (o), (dom_text **) (r))
 
 static inline dom_exception dom_text_get_is_element_content_whitespace(
 		struct dom_text *text, bool *result)
diff --git a/include/dom/events/mouse_event.h b/include/dom/events/mouse_event.h
index 8212c72..9cf84bb 100644
--- a/include/dom/events/mouse_event.h
+++ b/include/dom/events/mouse_event.h
@@ -18,24 +18,24 @@ struct dom_abstract_view;
 typedef struct dom_mouse_event dom_mouse_event;
 
 dom_exception _dom_mouse_event_get_screen_x(dom_mouse_event *evt,
-		long *x);
+		int32_t *x);
 #define dom_mouse_event_get_screen_x(e, x) _dom_mouse_event_get_screen_x(\
-		(dom_mouse_event *) (e), (long *) (x))
+		(dom_mouse_event *) (e), (int32_t *) (x))
 
 dom_exception _dom_mouse_event_get_screen_y(dom_mouse_event *evt,
-		long *y);
+		int32_t *y);
 #define dom_mouse_event_get_screen_y(e, y) _dom_mouse_event_get_screen_y(\
-		(dom_mouse_event *) (e), (long *) (y))
+		(dom_mouse_event *) (e), (int32_t *) (y))
 
 dom_exception _dom_mouse_event_get_client_x(dom_mouse_event *evt,
-		long *x);
+		int32_t *x);
 #define dom_mouse_event_get_client_x(e, x) _dom_mouse_event_get_client_x(\
-		(dom_mouse_event *) (e), (long *) (x))
+		(dom_mouse_event *) (e), (int32_t *) (x))
 
 dom_exception _dom_mouse_event_get_client_y(dom_mouse_event *evt,
-		long *y);
+		int32_t *y);
 #define dom_mouse_event_get_client_y(e, y) _dom_mouse_event_get_client_y(\
-		(dom_mouse_event *) (e), (long *) (y))
+		(dom_mouse_event *) (e), (int32_t *) (y))
 
 dom_exception _dom_mouse_event_get_ctrl_key(dom_mouse_event *evt,
 		bool *key);
@@ -76,32 +76,32 @@ dom_exception _dom_mouse_event_get_modifier_state(dom_mouse_event *evt,
 
 dom_exception _dom_mouse_event_init(dom_mouse_event *evt, 
 		dom_string *type, bool bubble, bool cancelable, 
-		struct dom_abstract_view *view, long detail, long screen_x,
-		long screen_y, long client_x, long client_y, bool ctrl,
+		struct dom_abstract_view *view, int32_t detail, int32_t screen_x,
+		int32_t screen_y, int32_t client_x, int32_t client_y, bool ctrl,
 		bool alt, bool shift, bool meta, unsigned short button,
 		dom_event_target *et);
 #define dom_mouse_event_init(e, t, b, c, v, d, sx, sy, cx, cy, ctrl, alt, \
 		shift, meta, button, et) \
 		_dom_mouse_event_init((dom_mouse_event *) (e), \
 		(dom_string *) (t), (bool) (b), (bool) (c),\
-		(struct dom_abstract_view *) (v), (long) (d), (long) (sx), \
-		(long) (sy), (long) (cx), (long) (cy), (bool) (ctrl),\
+		(struct dom_abstract_view *) (v), (int32_t) (d), (int32_t) (sx), \
+		(int32_t) (sy), (int32_t) (cx), (int32_t) (cy), (bool) (ctrl),\
 		(bool) (alt), (bool) (shift), (bool) (meta), \
 		(unsigned short) (button), (dom_event_target *) (et))
 
 dom_exception _dom_mouse_event_init_ns(dom_mouse_event *evt,
 		dom_string *namespace, dom_string *type,
 		bool bubble, bool cancelable, struct dom_abstract_view *view,
-		long detail, long screen_x, long screen_y, long client_x,
-		long client_y, bool ctrl, bool alt, bool shift, bool meta,
+		int32_t detail, int32_t screen_x, int32_t screen_y, int32_t client_x,
+		int32_t client_y, bool ctrl, bool alt, bool shift, bool meta,
 		unsigned short button, dom_event_target *et);
 #define dom_mouse_event_init_ns(e, n, t, b, c, v, d, sx, sy, cx, cy, ctrl, alt,\
 		shift, meta, button, et) \
 		_dom_mouse_event_init_ns((dom_mouse_event *) (e), \
 		(dom_string *) (n), (dom_string *) (t),\
 		(bool) (b), (bool) (c), (struct dom_abstract_view *) (v),\
-		(long) (d), (long) (sx), (long) (sy), (long) (cx),\
-		(long) (cy), (bool) (ctrl), (bool) (alt), (bool) (shift),\
+		(int32_t) (d), (int32_t) (sx), (int32_t) (sy), (int32_t) (cx),\
+		(int32_t) (cy), (bool) (ctrl), (bool) (alt), (bool) (shift),\
 		(bool) (meta), (unsigned short) (button),\
 		(dom_event_target *) (et))
 
diff --git a/include/dom/events/mouse_multi_wheel_event.h b/include/dom/events/mouse_multi_wheel_event.h
index 8d2a4eb..d8115ad 100644
--- a/include/dom/events/mouse_multi_wheel_event.h
+++ b/include/dom/events/mouse_multi_wheel_event.h
@@ -18,39 +18,39 @@ struct dom_abstract_view;
 typedef struct dom_mouse_multi_wheel_event dom_mouse_multi_wheel_event;
 
 dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_x(
-		dom_mouse_multi_wheel_event *evt, long *x);
+		dom_mouse_multi_wheel_event *evt, int32_t *x);
 #define dom_mouse_multi_wheel_event_get_wheel_delta_x(e, x) \
 		_dom_mouse_multi_wheel_event_get_wheel_delta_x( \
-		(dom_mouse_multi_wheel_event *) (e), (long *) (x))
+		(dom_mouse_multi_wheel_event *) (e), (int32_t *) (x))
 
 dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_y(
-		dom_mouse_multi_wheel_event *evt, long *y);
+		dom_mouse_multi_wheel_event *evt, int32_t *y);
 #define dom_mouse_multi_wheel_event_get_wheel_delta_y(e, y) \
 		_dom_mouse_multi_wheel_event_get_wheel_delta_y( \
-		(dom_mouse_multi_wheel_event *) (e), (long *) (y))
+		(dom_mouse_multi_wheel_event *) (e), (int32_t *) (y))
 
 dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_z(
-		dom_mouse_multi_wheel_event *evt, long *z);
+		dom_mouse_multi_wheel_event *evt, int32_t *z);
 #define dom_mouse_multi_wheel_event_get_wheel_delta_z(e, z) \
 		_dom_mouse_multi_wheel_event_get_wheel_delta_z( \
-		(dom_mouse_multi_wheel_event *) (e), (long *) (z))
+		(dom_mouse_multi_wheel_event *) (e), (int32_t *) (z))
 
 dom_exception _dom_mouse_multi_wheel_event_init_ns(
 		dom_mouse_multi_wheel_event *evt, dom_string *namespace,
 		dom_string *type,  bool bubble, bool cancelable,
-		struct dom_abstract_view *view, long detail, long screen_x,
-		long screen_y, long client_x, long client_y,
+		struct dom_abstract_view *view, int32_t detail, int32_t screen_x,
+		int32_t screen_y, int32_t client_x, int32_t client_y,
 		unsigned short button, dom_event_target *et,
-		dom_string *modifier_list, long wheel_delta_x,
-		long wheel_delta_y, long wheel_delta_z);
+		dom_string *modifier_list, int32_t wheel_delta_x,
+		int32_t wheel_delta_y, int32_t wheel_delta_z);
 #define dom_mouse_multi_wheel_event_init_ns(e, n, t, b, c, v, \
 		d, sx, sy, cx, cy, button, et, ml, x, y, z) \
 		_dom_mouse_multi_wheel_event_init_ns( \
 		(dom_mouse_multi_wheel_event *) (e), (dom_string *) (n),\
 		(dom_string *) (t), (bool) (b), (bool) (c), \
-		(struct dom_abstract_view *) (v), (long) (d), (long) (sx), \
-		(long) (sy), (long) (cx), (long) (cy),\
+		(struct dom_abstract_view *) (v), (int32_t) (d), (int32_t) (sx), \
+		(int32_t) (sy), (int32_t) (cx), (int32_t) (cy),\
 		(unsigned short) (button), (dom_event_target *) (et),\
-		(dom_string *) (ml), (long) (x), (long) (y), (long) (z))
+		(dom_string *) (ml), (int32_t) (x), (int32_t) (y), (int32_t) (z))
 
 #endif
diff --git a/include/dom/events/mouse_wheel_event.h b/include/dom/events/mouse_wheel_event.h
index 34f5e75..f753b68 100644
--- a/include/dom/events/mouse_wheel_event.h
+++ b/include/dom/events/mouse_wheel_event.h
@@ -17,26 +17,26 @@ struct dom_abstract_view;
 typedef struct dom_mouse_wheel_event dom_mouse_wheel_event;
 
 dom_exception _dom_mouse_wheel_event_get_wheel_delta(
-		dom_mouse_wheel_event *evt, long *d);
+		dom_mouse_wheel_event *evt, int32_t *d);
 #define dom_mouse_wheel_event_get_wheel_delta(e, d) \
 		_dom_mouse_wheel_event_get_wheel_delta( \
-		(dom_mouse_wheel_event *) (e), (long *) (d))
+		(dom_mouse_wheel_event *) (e), (int32_t *) (d))
 
 dom_exception _dom_mouse_wheel_event_init_ns(
 		dom_mouse_wheel_event *evt, dom_string *namespace,
 		dom_string *type,  bool bubble, bool cancelable,
-		struct dom_abstract_view *view, long detail, long screen_x,
-		long screen_y, long client_x, long client_y,
+		struct dom_abstract_view *view, int32_t detail, int32_t screen_x,
+		int32_t screen_y, int32_t client_x, int32_t client_y,
 		unsigned short button, dom_event_target *et,
-		dom_string *modifier_list, long wheel_delta);
+		dom_string *modifier_list, int32_t wheel_delta);
 #define dom_mouse_wheel_event_init_ns(e, n, t, b, c, v, \
 		d, sx, sy, cx, cy, button, et, ml, dt) \
 		_dom_mouse_wheel_event_init_ns((dom_mouse_wheel_event *) (e), \
 		(dom_string *) (n), (dom_string *) (t), \
 		(bool) (b), (bool) (c), (struct dom_abstract_view *) (v),\
-		(long) (d), (long) (sx), (long) (sy), (long) (cx), (long) (cy),\
+		(int32_t) (d), (int32_t) (sx), (int32_t) (sy), (int32_t) (cx), (int32_t) (cy),\
 		(unsigned short) (button), (dom_event_target *) (et),\
-		(dom_string *) (ml), (long) (dt))
+		(dom_string *) (ml), (int32_t) (dt))
 
 #endif
 
diff --git a/include/dom/events/ui_event.h b/include/dom/events/ui_event.h
index da321e5..0979a3b 100644
--- a/include/dom/events/ui_event.h
+++ b/include/dom/events/ui_event.h
@@ -22,24 +22,24 @@ dom_exception _dom_ui_event_get_view(dom_ui_event *evt,
 		(dom_ui_event *) (e), (struct dom_abstract_view **) (v))
 
 dom_exception _dom_ui_event_get_detail(dom_ui_event *evt,
-		long *detail);
+		int32_t *detail);
 #define dom_ui_event_get_detail(e, d) _dom_ui_event_get_detail(\
-		(dom_ui_event *) (e), (long *) (d))
+		(dom_ui_event *) (e), (int32_t *) (d))
 
 dom_exception _dom_ui_event_init(dom_ui_event *evt, dom_string *type, 
 		bool bubble, bool cancelable, struct dom_abstract_view *view,
-		long detail);
+		int32_t detail);
 #define dom_ui_event_init(e, t, b, c, v, d) _dom_ui_event_init( \
 		(dom_ui_event *) (e), (dom_string *) (t), (bool) (b), \
-		(bool) (c), (struct dom_abstract_view *) (v), (long) (d))
+		(bool) (c), (struct dom_abstract_view *) (v), (int32_t) (d))
 
 dom_exception _dom_ui_event_init_ns(dom_ui_event *evt,
 		dom_string *namespace, dom_string *type,
 		bool bubble, bool cancelable, struct dom_abstract_view *view,
-		long detail);
+		int32_t detail);
 #define dom_ui_event_init_ns(e, n, t, b, c, v, d) _dom_ui_event_init_ns( \
 		(dom_ui_event *) (e), (dom_string *) (n), \
 		(dom_string *) (t), (bool) (b), (bool) (c), \
-		(struct dom_abstract_view *) (v), (long) (d))
+		(struct dom_abstract_view *) (v), (int32_t) (d))
 
 #endif
diff --git a/include/dom/html/html_button_element.h b/include/dom/html/html_button_element.h
index 9bbd562..155d125 100644
--- a/include/dom/html/html_button_element.h
+++ b/include/dom/html/html_button_element.h
@@ -37,10 +37,10 @@ dom_exception dom_html_button_element_set_name(
 	dom_html_button_element *button, dom_string *name);
 
 dom_exception dom_html_button_element_get_tab_index(
-	dom_html_button_element *button, long *tab_index);
+	dom_html_button_element *button, int32_t *tab_index);
 
 dom_exception dom_html_button_element_set_tab_index(
-	dom_html_button_element *button, unsigned long tab_index);
+	dom_html_button_element *button, uint32_t tab_index);
 
 dom_exception dom_html_button_element_get_type(
 	dom_html_button_element *button, dom_string **type);
diff --git a/include/dom/html/html_collection.h b/include/dom/html/html_collection.h
index 7322ea8..9521f94 100644
--- a/include/dom/html/html_collection.h
+++ b/include/dom/html/html_collection.h
@@ -16,9 +16,9 @@ struct dom_node;
 typedef struct dom_html_collection dom_html_collection;
 
 dom_exception dom_html_collection_get_length(dom_html_collection *col,
-		unsigned long *len);
+		uint32_t *len);
 dom_exception dom_html_collection_item(dom_html_collection *col,
-		unsigned long index, struct dom_node **node);
+		uint32_t index, struct dom_node **node);
 dom_exception dom_html_collection_named_item(dom_html_collection *col,
 		dom_string *name, struct dom_node **node);
 
diff --git a/include/dom/html/html_form_element.h b/include/dom/html/html_form_element.h
index c4ee1d8..81637a3 100644
--- a/include/dom/html/html_form_element.h
+++ b/include/dom/html/html_form_element.h
@@ -18,7 +18,7 @@ typedef struct dom_html_form_element dom_html_form_element;
 dom_exception dom_html_form_element_get_elements(dom_html_form_element *ele,
 		struct dom_html_collection **col);
 dom_exception dom_html_form_element_get_length(dom_html_form_element *ele,
-		unsigned long *len);
+		uint32_t *len);
 
 dom_exception dom_html_form_element_get_accept_charset(
 	dom_html_form_element *ele, dom_string **accept_charset);
diff --git a/include/dom/html/html_input_element.h b/include/dom/html/html_input_element.h
index 6d87bd9..eb6aecd 100644
--- a/include/dom/html/html_input_element.h
+++ b/include/dom/html/html_input_element.h
@@ -67,10 +67,10 @@ dom_exception dom_html_input_element_set_disabled(
 	dom_html_input_element *input, bool disabled);
 
 dom_exception dom_html_input_element_get_max_length(
-	dom_html_input_element *input, long *max_length);
+	dom_html_input_element *input, int32_t *max_length);
 
 dom_exception dom_html_input_element_set_max_length(
-	dom_html_input_element *input, unsigned long max_length);
+	dom_html_input_element *input, uint32_t max_length);
 
 dom_exception dom_html_input_element_get_name(
 	dom_html_input_element *input, dom_string **name);
@@ -97,10 +97,10 @@ dom_exception dom_html_input_element_set_src(
 	dom_html_input_element *input, dom_string *src);
 
 dom_exception dom_html_input_element_get_tab_index(
-	dom_html_input_element *input, long *tab_index);
+	dom_html_input_element *input, int32_t *tab_index);
 
 dom_exception dom_html_input_element_set_tab_index(
-	dom_html_input_element *input, unsigned long tab_index);
+	dom_html_input_element *input, uint32_t tab_index);
 
 dom_exception dom_html_input_element_get_type(
 	dom_html_input_element *input, dom_string **type);
diff --git a/include/dom/html/html_options_collection.h b/include/dom/html/html_options_collection.h
index d11221a..5825fb0 100644
--- a/include/dom/html/html_options_collection.h
+++ b/include/dom/html/html_options_collection.h
@@ -16,11 +16,11 @@ struct dom_node;
 typedef struct dom_html_options_collection dom_html_options_collection;
 
 dom_exception dom_html_options_collection_get_length(
-		dom_html_options_collection *col, unsigned long *len);
+		dom_html_options_collection *col, uint32_t *len);
 dom_exception dom_html_options_collection_set_length(
-		dom_html_options_collection *col, unsigned long len);
+		dom_html_options_collection *col, uint32_t len);
 dom_exception dom_html_options_collection_item(
-		dom_html_options_collection *col, unsigned long index,
+		dom_html_options_collection *col, uint32_t index,
 		struct dom_node **node);
 dom_exception dom_html_options_collection_named_item(
 		dom_html_options_collection *col, dom_string *name,
diff --git a/include/dom/html/html_select_element.h b/include/dom/html/html_select_element.h
index 10c002a..a052be1 100644
--- a/include/dom/html/html_select_element.h
+++ b/include/dom/html/html_select_element.h
@@ -18,13 +18,13 @@ struct dom_html_options_collection;
 struct dom_html_element;
 
 dom_exception dom_html_select_element_get_selected_index(
-		dom_html_select_element *ele, unsigned long *index);
+		dom_html_select_element *ele, uint32_t *index);
 dom_exception dom_html_select_element_set_selected_index(
-		dom_html_select_element *ele, unsigned long index);
+		dom_html_select_element *ele, uint32_t index);
 dom_exception dom_html_select_element_get_length(
-		dom_html_select_element *ele, unsigned long *len);
+		dom_html_select_element *ele, uint32_t *len);
 dom_exception dom_html_select_element_set_length(
-		dom_html_select_element *ele, unsigned long len);
+		dom_html_select_element *ele, uint32_t len);
 dom_exception dom_html_select_element_get_options(
 		dom_html_select_element *ele,
 		struct dom_html_options_collection **col);
@@ -37,13 +37,13 @@ dom_exception dom_html_select_element_get_multiple(
 dom_exception dom_html_select_element_set_multiple(
 		dom_html_select_element *ele, bool multiple);
 dom_exception dom_html_select_element_get_size(
-		dom_html_select_element *ele, unsigned long *size);
+		dom_html_select_element *ele, uint32_t *size);
 dom_exception dom_html_select_element_set_size(
-		dom_html_select_element *ele, unsigned long size);
+		dom_html_select_element *ele, uint32_t size);
 dom_exception dom_html_select_element_get_tab_index(
-		dom_html_select_element *ele, unsigned long *tab_index);
+		dom_html_select_element *ele, uint32_t *tab_index);
 dom_exception dom_html_select_element_set_tab_index(
-		dom_html_select_element *ele, unsigned long tab_index);
+		dom_html_select_element *ele, uint32_t tab_index);
 
 /* Functions */
 dom_exception dom_html_select_element_add(struct dom_html_element *ele,
diff --git a/include/dom/html/html_text_area_element.h b/include/dom/html/html_text_area_element.h
index ce610ad..9954e04 100644
--- a/include/dom/html/html_text_area_element.h
+++ b/include/dom/html/html_text_area_element.h
@@ -37,16 +37,16 @@ dom_exception dom_html_text_area_element_set_disabled(
 	dom_html_text_area_element *text_area, bool disabled);
 
 dom_exception dom_html_text_area_element_get_cols(
-	dom_html_text_area_element *text_area, long *cols);
+	dom_html_text_area_element *text_area, int32_t *cols);
 
 dom_exception dom_html_text_area_element_set_cols(
-	dom_html_text_area_element *text_area, unsigned long cols);
+	dom_html_text_area_element *text_area, uint32_t cols);
 
 dom_exception dom_html_text_area_element_get_rows(
-	dom_html_text_area_element *text_area, long *rows);
+	dom_html_text_area_element *text_area, int32_t *rows);
 
 dom_exception dom_html_text_area_element_set_rows(
-	dom_html_text_area_element *text_area, unsigned long rows);
+	dom_html_text_area_element *text_area, uint32_t rows);
 
 dom_exception dom_html_text_area_element_get_name(
 	dom_html_text_area_element *text_area, dom_string **name);
@@ -61,10 +61,10 @@ dom_exception dom_html_text_area_element_set_read_only(
 	dom_html_text_area_element *text_area, bool read_only);
 
 dom_exception dom_html_text_area_element_get_tab_index(
-	dom_html_text_area_element *text_area, long *tab_index);
+	dom_html_text_area_element *text_area, int32_t *tab_index);
 
 dom_exception dom_html_text_area_element_set_tab_index(
-	dom_html_text_area_element *text_area, unsigned long tab_index);
+	dom_html_text_area_element *text_area, uint32_t tab_index);
 
 dom_exception dom_html_text_area_element_get_type(
 	dom_html_text_area_element *text_area, dom_string **type);
-- 
cgit v1.2.3