Jacek Caban : mshtml: Get rid of PRUint16 type.
Alexandre Julliard
julliard at winehq.org
Wed Jan 23 16:40:19 CST 2013
Module: wine
Branch: master
Commit: cef2907da7389d3f000c0fb43acb2146a0e6d543
URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef2907da7389d3f000c0fb43acb2146a0e6d543
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Jan 23 18:43:55 2013 +0100
mshtml: Get rid of PRUint16 type.
---
dlls/mshtml/editor.c | 4 ++--
dlls/mshtml/htmlanchor.c | 2 +-
dlls/mshtml/htmldoc3.c | 2 +-
dlls/mshtml/htmlelemcol.c | 2 +-
dlls/mshtml/htmlevent.c | 4 ++--
dlls/mshtml/htmlnode.c | 4 ++--
dlls/mshtml/nsembed.c | 2 +-
dlls/mshtml/nsiface.idl | 3 +--
dlls/mshtml/txtrange.c | 6 +++---
9 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c
index 6fee9c7..ccbdd59 100644
--- a/dlls/mshtml/editor.c
+++ b/dlls/mshtml/editor.c
@@ -218,7 +218,7 @@ static void remove_child_attr(nsIDOMElement *elem, LPCWSTR tag, nsAString *attr_
PRUint32 child_cnt, i;
nsIDOMNode *child_node;
nsIDOMNodeList *node_list;
- PRUint16 node_type;
+ UINT16 node_type;
nsIDOMElement_HasChildNodes(elem, &has_children);
if(!has_children)
@@ -266,7 +266,7 @@ static void get_font_size(HTMLDocument *This, WCHAR *ret)
nsIDOMNode *node = NULL, *tmp_node;
nsAString tag_str;
LPCWSTR tag;
- PRUint16 node_type;
+ UINT16 node_type;
nsresult nsres;
*ret = 0;
diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c
index a7b87a8..bfcf466 100644
--- a/dlls/mshtml/htmlanchor.c
+++ b/dlls/mshtml/htmlanchor.c
@@ -646,7 +646,7 @@ static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, eventid_t eid,
if(eid == EVENTID_CLICK) {
nsIDOMMouseEvent *mouse_event;
- PRUint16 button;
+ UINT16 button;
nsresult nsres;
TRACE("CLICK\n");
diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c
index f5e2f54..e1efa7a 100644
--- a/dlls/mshtml/htmldoc3.c
+++ b/dlls/mshtml/htmldoc3.c
@@ -74,7 +74,7 @@ HRESULT get_doc_elem_by_id(HTMLDocumentNode *doc, const WCHAR *id, HTMLElement *
assert(nsres == NS_OK);
if(nsnode && nselem) {
- PRUint16 pos;
+ UINT16 pos;
nsres = nsIDOMNode_CompareDocumentPosition(nsnode, (nsIDOMNode*)nselem, &pos);
if(NS_FAILED(nsres)) {
diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c
index 11cc5a5..39e259c 100644
--- a/dlls/mshtml/htmlelemcol.c
+++ b/dlls/mshtml/htmlelemcol.c
@@ -79,7 +79,7 @@ static void elem_vector_normalize(elem_vector_t *buf)
static inline BOOL is_elem_node(nsIDOMNode *node)
{
- PRUint16 type=0;
+ UINT16 type=0;
nsIDOMNode_GetNodeType(node, &type);
diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c
index 68a3942..f849d60 100644
--- a/dlls/mshtml/htmlevent.c
+++ b/dlls/mshtml/htmlevent.c
@@ -564,7 +564,7 @@ static HRESULT WINAPI HTMLEventObj_get_keyCode(IHTMLEventObj *iface, LONG *p)
static HRESULT WINAPI HTMLEventObj_get_button(IHTMLEventObj *iface, LONG *p)
{
HTMLEventObj *This = impl_from_IHTMLEventObj(iface);
- PRUint16 button = 0;
+ UINT16 button = 0;
TRACE("(%p)->(%p)\n", This, p);
@@ -1049,7 +1049,7 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e
BOOL prevent_default = FALSE;
HTMLInnerWindow *window;
HTMLDOMNode *node;
- PRUint16 node_type;
+ UINT16 node_type;
nsresult nsres;
HRESULT hres;
diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c
index 4269f6c..2c804b6 100644
--- a/dlls/mshtml/htmlnode.c
+++ b/dlls/mshtml/htmlnode.c
@@ -373,7 +373,7 @@ static HRESULT WINAPI HTMLDOMNode_Invoke(IHTMLDOMNode *iface, DISPID dispIdMembe
static HRESULT WINAPI HTMLDOMNode_get_nodeType(IHTMLDOMNode *iface, LONG *p)
{
HTMLDOMNode *This = impl_from_IHTMLDOMNode(iface);
- PRUint16 type = -1;
+ UINT16 type = -1;
TRACE("(%p)->(%p)\n", This, p);
@@ -1085,7 +1085,7 @@ void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsno
static HRESULT create_node(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDOMNode **ret)
{
- PRUint16 node_type;
+ UINT16 node_type;
HRESULT hres;
nsIDOMNode_GetNodeType(nsnode, &node_type);
diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c
index 6086846..215bb38 100644
--- a/dlls/mshtml/nsembed.c
+++ b/dlls/mshtml/nsembed.c
@@ -914,7 +914,7 @@ static HRESULT nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNo
nsIDOMNodeList *node_list = NULL;
cpp_bool has_children = FALSE;
nsIContent *nscontent;
- PRUint16 type;
+ UINT16 type;
nsresult nsres;
nsIDOMNode_HasChildNodes(nsnode, &has_children);
diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl
index b6692fb..31bd347 100644
--- a/dlls/mshtml/nsiface.idl
+++ b/dlls/mshtml/nsiface.idl
@@ -44,7 +44,6 @@ typedef nsIIDRef nsCIDRef;
typedef WCHAR PRUnichar;
typedef ULONG PRUint32;
-typedef WORD PRUint16;
typedef ULONGLONG PRUint64;
/*
@@ -57,7 +56,7 @@ typedef ULONGLONG PRUint64;
#define int64_t INT64
#define uint8_t UINT8
-#define uint16_t PRUint16
+#define uint16_t UINT16
#define uint32_t PRUint32
#define uint64_t PRUint64
diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c
index 085aa84..813fad7 100644
--- a/dlls/mshtml/txtrange.c
+++ b/dlls/mshtml/txtrange.c
@@ -54,7 +54,7 @@ typedef struct {
} wstrbuf_t;
typedef struct {
- PRUint16 type;
+ UINT16 type;
nsIDOMNode *node;
PRUint32 off;
nsAString str;
@@ -116,9 +116,9 @@ static int string_to_nscmptype(LPCWSTR str)
return -1;
}
-static PRUint16 get_node_type(nsIDOMNode *node)
+static UINT16 get_node_type(nsIDOMNode *node)
{
- PRUint16 type = 0;
+ UINT16 type = 0;
if(node)
nsIDOMNode_GetNodeType(node, &type);
More information about the wine-cvs
mailing list