diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 42560ea57c0..1366d98e6d1 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -43,7 +43,7 @@ typedef struct { nsIURI *referrer; char *content_type; char *charset; - PRUint32 response_status; + UINT32 response_status; REQUEST_METHOD request_method; struct list response_headers; struct list request_headers; diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index ccbdd597d91..dbb2d935a62 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -215,7 +215,7 @@ static nsISelection *get_ns_selection(HTMLDocument *This) static void remove_child_attr(nsIDOMElement *elem, LPCWSTR tag, nsAString *attr_str) { cpp_bool has_children; - PRUint32 child_cnt, i; + UINT32 child_cnt, i; nsIDOMNode *child_node; nsIDOMNodeList *node_list; UINT16 node_type; @@ -408,7 +408,7 @@ static void handle_arrow_key(HTMLDocument *This, nsIDOMKeyEvent *event, const ch void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) { nsIDOMKeyEvent *key_event; - PRUint32 code; + UINT32 code; nsIDOMEvent_QueryInterface(event, &IID_nsIDOMKeyEvent, (void**)&key_event); diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5fc9560890c..1dc35ae88c1 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1666,7 +1666,7 @@ static HRESULT dispid_from_elem_name(HTMLDocumentNode *This, BSTR name, DISPID * { nsIDOMNodeList *node_list; nsAString name_str; - PRUint32 len; + UINT32 len; unsigned i; nsresult nsres; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 8fba26d9882..6867a1733ad 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1649,7 +1649,7 @@ HRESULT HTMLElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *eve nsres = nsIDOMEvent_QueryInterface(event, &IID_nsIDOMKeyEvent, (void**)&key_event); if(NS_SUCCEEDED(nsres)) { - PRUint32 code = 0; + UINT32 code = 0; nsIDOMKeyEvent_GetKeyCode(key_event, &code); @@ -1716,7 +1716,7 @@ static HRESULT HTMLElement_populate_props(DispatchEx *dispex) BSTR name; VARIANT value; unsigned i; - PRUint32 len; + UINT32 len; DISPID id; nsresult nsres; HRESULT hres; diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 39e259c2718..102a438d208 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -496,7 +496,7 @@ static void create_all_list(HTMLDocumentNode *doc, HTMLDOMNode *elem, elem_vecto { nsIDOMNodeList *nsnode_list; nsIDOMNode *iter; - PRUint32 list_len = 0, i; + UINT32 list_len = 0, i; nsresult nsres; HRESULT hres; @@ -550,7 +550,7 @@ IHTMLElementCollection *create_all_collection(HTMLDOMNode *node, BOOL include_ro IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode *doc, nsIDOMNodeList *nslist) { - PRUint32 length = 0, i; + UINT32 length = 0, i; HTMLDOMNode *node; elem_vector_t buf; HRESULT hres; @@ -585,7 +585,7 @@ IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode *doc, n IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode *doc, nsIDOMHTMLCollection *nscol) { - PRUint32 length = 0, i; + UINT32 length = 0, i; elem_vector_t buf; HTMLDOMNode *node; HRESULT hres = S_OK; diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index f849d606109..98e592d611b 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -542,7 +542,7 @@ static HRESULT WINAPI HTMLEventObj_put_keyCode(IHTMLEventObj *iface, LONG v) static HRESULT WINAPI HTMLEventObj_get_keyCode(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - PRUint32 key_code = 0; + UINT32 key_code = 0; TRACE("(%p)->(%p)\n", This, p); diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index c48415a4831..a66f6e45a8d 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -510,7 +510,7 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, HTMLFormElement *This = impl_from_HTMLDOMNode(iface); nsIDOMHTMLCollection *elements; nsAString nsname, nsstr; - PRUint32 len, i; + UINT32 len, i; nsresult nsres; HRESULT hres = DISP_E_UNKNOWNNAME; diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index e5f94d1ff76..88827ea4c94 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -494,7 +494,7 @@ static HRESULT WINAPI HTMLImgElement_put_width(IHTMLImgElement *iface, LONG v) static HRESULT WINAPI HTMLImgElement_get_width(IHTMLImgElement *iface, LONG *p) { HTMLImgElement *This = impl_from_IHTMLImgElement(iface); - PRUint32 width; + UINT32 width; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -528,7 +528,7 @@ static HRESULT WINAPI HTMLImgElement_put_height(IHTMLImgElement *iface, LONG v) static HRESULT WINAPI HTMLImgElement_get_height(IHTMLImgElement *iface, LONG *p) { HTMLImgElement *This = impl_from_IHTMLImgElement(iface); - PRUint32 height; + UINT32 height; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 2c804b68f3e..c6938924384 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -137,7 +137,7 @@ static HRESULT WINAPI HTMLDOMChildrenCollection_Invoke(IHTMLDOMChildrenCollectio static HRESULT WINAPI HTMLDOMChildrenCollection_get_length(IHTMLDOMChildrenCollection *iface, LONG *p) { HTMLDOMChildrenCollection *This = impl_from_IHTMLDOMChildrenCollection(iface); - PRUint32 length=0; + UINT32 length=0; TRACE("(%p)->(%p)\n", This, p); @@ -158,7 +158,7 @@ static HRESULT WINAPI HTMLDOMChildrenCollection_item(IHTMLDOMChildrenCollection HTMLDOMChildrenCollection *This = impl_from_IHTMLDOMChildrenCollection(iface); nsIDOMNode *nsnode = NULL; HTMLDOMNode *node; - PRUint32 length=0; + UINT32 length=0; nsresult nsres; HRESULT hres; @@ -212,7 +212,7 @@ static HRESULT HTMLDOMChildrenCollection_get_dispid(DispatchEx *dispex, BSTR nam HTMLDOMChildrenCollection *This = impl_from_DispatchEx(dispex); WCHAR *ptr; DWORD idx=0; - PRUint32 len = 0; + UINT32 len = 0; for(ptr = name; *ptr && isdigitW(*ptr); ptr++) idx = idx*10 + (*ptr-'0'); diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index ff609ddf32b..ea96c851e47 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -415,7 +415,7 @@ static HRESULT WINAPI HTMLSelectElement_put_length(IHTMLSelectElement *iface, LO static HRESULT WINAPI HTMLSelectElement_get_length(IHTMLSelectElement *iface, LONG *p) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - PRUint32 length = 0; + UINT32 length = 0; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 3b855e5a500..e0c74bcf8b6 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -148,7 +148,7 @@ static HRESULT WINAPI HTMLStyleSheetRulesCollection_get_length(IHTMLStyleSheetRu LONG *p) { HTMLStyleSheetRulesCollection *This = impl_from_IHTMLStyleSheetRulesCollection(iface); - PRUint32 len = 0; + UINT32 len = 0; TRACE("(%p)->(%p)\n", This, p); @@ -294,7 +294,7 @@ static HRESULT WINAPI HTMLStyleSheetsCollection_get_length(IHTMLStyleSheetsColle LONG *p) { HTMLStyleSheetsCollection *This = impl_from_IHTMLStyleSheetsCollection(iface); - PRUint32 len = 0; + UINT32 len = 0; TRACE("(%p)->(%p)\n", This, p); diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index 1be260fee9f..feb7dc0e76e 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -122,7 +122,7 @@ static HRESULT WINAPI HTMLDOMTextNode_toString(IHTMLDOMTextNode *iface, BSTR *St static HRESULT WINAPI HTMLDOMTextNode_get_length(IHTMLDOMTextNode *iface, LONG *p) { HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - PRUint32 length = 0; + UINT32 length = 0; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 0318002c5da..9e3cb7255d3 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -323,11 +323,11 @@ static HRESULT WINAPI HTMLWindow2_Invoke(IHTMLWindow2 *iface, DISPID dispIdMembe pDispParams, pVarResult, pExcepInfo, puArgErr); } -static HRESULT get_frame_by_index(HTMLOuterWindow *This, PRUint32 index, HTMLOuterWindow **ret) +static HRESULT get_frame_by_index(HTMLOuterWindow *This, UINT32 index, HTMLOuterWindow **ret) { nsIDOMWindowCollection *nsframes; nsIDOMWindow *nswindow; - PRUint32 length; + UINT32 length; nsresult nsres; nsres = nsIDOMWindow_GetFrames(This->nswindow, &nsframes); @@ -363,7 +363,7 @@ HRESULT get_frame_by_name(HTMLOuterWindow *This, const WCHAR *name, BOOL deep, H HTMLOuterWindow *window = NULL; nsIDOMWindow *nswindow; nsAString name_str; - PRUint32 length, i; + UINT32 length, i; nsresult nsres; HRESULT hres = S_OK; @@ -476,7 +476,7 @@ static HRESULT WINAPI HTMLWindow2_get_length(IHTMLWindow2 *iface, LONG *p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); nsIDOMWindowCollection *nscollection; - PRUint32 length; + UINT32 length; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 678ef3ef5fd..75200c445e3 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -39,7 +39,7 @@ #include "nsiface.h" #define NS_ERROR_GENERATE_FAILURE(module,code) \ - ((nsresult) (((PRUint32)(1<<31)) | ((PRUint32)(module+0x45)<<16) | ((PRUint32)(code)))) + ((nsresult) (((UINT32)(1<<31)) | ((UINT32)(module+0x45)<<16) | ((UINT32)(code)))) #define NS_OK ((nsresult)0x00000000L) #define NS_ERROR_FAILURE ((nsresult)0x80004005L) @@ -793,13 +793,13 @@ void nsfree(void*) DECLSPEC_HIDDEN; void nsACString_InitDepend(nsACString*,const char*) DECLSPEC_HIDDEN; void nsACString_SetData(nsACString*,const char*) DECLSPEC_HIDDEN; -PRUint32 nsACString_GetData(const nsACString*,const char**) DECLSPEC_HIDDEN; +UINT32 nsACString_GetData(const nsACString*,const char**) DECLSPEC_HIDDEN; void nsACString_Finish(nsACString*) DECLSPEC_HIDDEN; BOOL nsAString_Init(nsAString*,const PRUnichar*) DECLSPEC_HIDDEN; void nsAString_InitDepend(nsAString*,const PRUnichar*) DECLSPEC_HIDDEN; void nsAString_SetData(nsAString*,const PRUnichar*) DECLSPEC_HIDDEN; -PRUint32 nsAString_GetData(const nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; +UINT32 nsAString_GetData(const nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; void nsAString_Finish(nsAString*) DECLSPEC_HIDDEN; HRESULT return_nsstr(nsresult,nsAString*,BSTR*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index c44efca3ffe..72afc10f774 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -145,8 +145,8 @@ static nsresult NSAPI nsInputStream_Available(nsIInputStream *iface, PRUint64 *_ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsInputStream_Read(nsIInputStream *iface, char *aBuf, PRUint32 aCount, - PRUint32 *_retval) +static nsresult NSAPI nsInputStream_Read(nsIInputStream *iface, char *aBuf, UINT32 aCount, + UINT32 *_retval) { nsProtocolStream *This = impl_from_nsIInputStream(iface); DWORD read = aCount; @@ -168,11 +168,11 @@ static nsresult NSAPI nsInputStream_Read(nsIInputStream *iface, char *aBuf, PRUi } static nsresult NSAPI nsInputStream_ReadSegments(nsIInputStream *iface, - nsresult (WINAPI *aWriter)(nsIInputStream*,void*,const char*,PRUint32,PRUint32,PRUint32*), - void *aClousure, PRUint32 aCount, PRUint32 *_retval) + nsresult (WINAPI *aWriter)(nsIInputStream*,void*,const char*,UINT32,UINT32,UINT32*), + void *aClousure, UINT32 aCount, UINT32 *_retval) { nsProtocolStream *This = impl_from_nsIInputStream(iface); - PRUint32 written = 0; + UINT32 written = 0; nsresult nsres; TRACE("(%p)->(%p %p %d %p)\n", This, aWriter, aClousure, aCount, _retval); @@ -1002,7 +1002,7 @@ HRESULT bind_mon_to_wstr(HTMLInnerWindow *window, IMoniker *mon, WCHAR **ret) static HRESULT read_post_data_stream(nsChannelBSC *This, nsChannel *nschannel) { PRUint64 available = 0; - PRUint32 data_len = 0; + UINT32 data_len = 0; char *data, *post_data; nsresult nsres; HRESULT hres = S_OK; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 215bb383cb6..7691849b0fa 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -53,6 +53,8 @@ WINE_DECLARE_DEBUG_CHANNEL(gecko); #define NS_STRING_CONTAINER_INIT_DEPEND 0x0002 #define NS_CSTRING_CONTAINER_INIT_DEPEND 0x0002 +typedef UINT32 PRUint32; + static nsresult (CDECL *NS_InitXPCOM2)(nsIServiceManager**,void*,void*); static nsresult (CDECL *NS_ShutdownXPCOM)(nsIServiceManager*); static nsresult (CDECL *NS_GetComponentRegistrar)(nsIComponentRegistrar**); @@ -798,7 +800,7 @@ void nsACString_SetData(nsACString *str, const char *data) NS_CStringSetData(str, data, PR_UINT32_MAX); } -PRUint32 nsACString_GetData(const nsACString *str, const char **data) +UINT32 nsACString_GetData(const nsACString *str, const char **data) { return NS_CStringGetData(str, data, NULL); } @@ -827,7 +829,7 @@ void nsAString_SetData(nsAString *str, const PRUnichar *data) NS_StringSetData(str, data, PR_UINT32_MAX); } -PRUint32 nsAString_GetData(const nsAString *str, const PRUnichar **data) +UINT32 nsAString_GetData(const nsAString *str, const PRUnichar **data) { return NS_StringGetData(str, data, NULL); } @@ -960,7 +962,7 @@ static HRESULT nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNo } if(has_children) { - PRUint32 child_cnt, i; + UINT32 child_cnt, i; nsIDOMNode *child_node; nsIDOMNode_GetChildNodes(nsnode, &node_list); @@ -1273,7 +1275,7 @@ static nsrefcnt NSAPI nsWebBrowserChrome_Release(nsIWebBrowserChrome *iface) } static nsresult NSAPI nsWebBrowserChrome_SetStatus(nsIWebBrowserChrome *iface, - PRUint32 statusType, const PRUnichar *status) + UINT32 statusType, const PRUnichar *status) { NSContainer *This = impl_from_nsIWebBrowserChrome(iface); TRACE("(%p)->(%d %s)\n", This, statusType, debugstr_w(status)); @@ -1310,7 +1312,7 @@ static nsresult NSAPI nsWebBrowserChrome_SetWebBrowser(nsIWebBrowserChrome *ifac } static nsresult NSAPI nsWebBrowserChrome_GetChromeFlags(nsIWebBrowserChrome *iface, - PRUint32 *aChromeFlags) + UINT32 *aChromeFlags) { NSContainer *This = impl_from_nsIWebBrowserChrome(iface); WARN("(%p)->(%p)\n", This, aChromeFlags); @@ -1318,7 +1320,7 @@ static nsresult NSAPI nsWebBrowserChrome_GetChromeFlags(nsIWebBrowserChrome *ifa } static nsresult NSAPI nsWebBrowserChrome_SetChromeFlags(nsIWebBrowserChrome *iface, - PRUint32 aChromeFlags) + UINT32 aChromeFlags) { NSContainer *This = impl_from_nsIWebBrowserChrome(iface); WARN("(%p)->(%08x)\n", This, aChromeFlags); @@ -1407,7 +1409,7 @@ static nsrefcnt NSAPI nsContextMenuListener_Release(nsIContextMenuListener *ifac } static nsresult NSAPI nsContextMenuListener_OnShowContextMenu(nsIContextMenuListener *iface, - PRUint32 aContextFlags, nsIDOMEvent *aEvent, nsIDOMNode *aNode) + UINT32 aContextFlags, nsIDOMEvent *aEvent, nsIDOMNode *aNode) { NSContainer *This = impl_from_nsIContextMenuListener(iface); nsIDOMMouseEvent *event; @@ -1667,7 +1669,7 @@ static nsrefcnt NSAPI nsEmbeddingSiteWindow_Release(nsIEmbeddingSiteWindow *ifac } static nsresult NSAPI nsEmbeddingSiteWindow_SetDimensions(nsIEmbeddingSiteWindow *iface, - PRUint32 flags, LONG x, LONG y, LONG cx, LONG cy) + UINT32 flags, LONG x, LONG y, LONG cx, LONG cy) { NSContainer *This = impl_from_nsIEmbeddingSiteWindow(iface); WARN("(%p)->(%08x %d %d %d %d)\n", This, flags, x, y, cx, cy); @@ -1675,7 +1677,7 @@ static nsresult NSAPI nsEmbeddingSiteWindow_SetDimensions(nsIEmbeddingSiteWindow } static nsresult NSAPI nsEmbeddingSiteWindow_GetDimensions(nsIEmbeddingSiteWindow *iface, - PRUint32 flags, LONG *x, LONG *y, LONG *cx, LONG *cy) + UINT32 flags, LONG *x, LONG *y, LONG *cx, LONG *cy) { NSContainer *This = impl_from_nsIEmbeddingSiteWindow(iface); WARN("(%p)->(%08x %p %p %p %p)\n", This, flags, x, y, cx, cy); diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 31bd347e235..d12b4659f33 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -43,7 +43,6 @@ typedef REFIID nsIIDRef; typedef nsIIDRef nsCIDRef; typedef WCHAR PRUnichar; -typedef ULONG PRUint32; typedef ULONGLONG PRUint64; /* @@ -57,7 +56,7 @@ typedef ULONGLONG PRUint64; #define uint8_t UINT8 #define uint16_t UINT16 -#define uint32_t PRUint32 +#define uint32_t UINT32 #define uint64_t PRUint64 typedef uint64_t DOMTimeStamp; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 9e35921406b..96191f7cd81 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1127,14 +1127,14 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen return nsres; } -static nsresult NSAPI nsChannel_GetContentDisposition(nsIHttpChannel *iface, PRUint32 *aContentDisposition) +static nsresult NSAPI nsChannel_GetContentDisposition(nsIHttpChannel *iface, UINT32 *aContentDisposition) { nsChannel *This = impl_from_nsIHttpChannel(iface); FIXME("(%p)->(%p)\n", This, aContentDisposition); return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsChannel_SetContentDisposition(nsIHttpChannel *iface, PRUint32 aContentDisposition) +static nsresult NSAPI nsChannel_SetContentDisposition(nsIHttpChannel *iface, UINT32 aContentDisposition) { nsChannel *This = impl_from_nsIHttpChannel(iface); FIXME("(%p)->(%u)\n", This, aContentDisposition); @@ -1270,7 +1270,7 @@ static nsresult NSAPI nsChannel_SetAllowPipelining(nsIHttpChannel *iface, cpp_bo return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsChannel_GetRedirectionLimit(nsIHttpChannel *iface, PRUint32 *aRedirectionLimit) +static nsresult NSAPI nsChannel_GetRedirectionLimit(nsIHttpChannel *iface, UINT32 *aRedirectionLimit) { nsChannel *This = impl_from_nsIHttpChannel(iface); @@ -1279,7 +1279,7 @@ static nsresult NSAPI nsChannel_GetRedirectionLimit(nsIHttpChannel *iface, PRUin return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsChannel_SetRedirectionLimit(nsIHttpChannel *iface, PRUint32 aRedirectionLimit) +static nsresult NSAPI nsChannel_SetRedirectionLimit(nsIHttpChannel *iface, UINT32 aRedirectionLimit) { nsChannel *This = impl_from_nsIHttpChannel(iface); @@ -1288,7 +1288,7 @@ static nsresult NSAPI nsChannel_SetRedirectionLimit(nsIHttpChannel *iface, PRUin return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsChannel_GetResponseStatus(nsIHttpChannel *iface, PRUint32 *aResponseStatus) +static nsresult NSAPI nsChannel_GetResponseStatus(nsIHttpChannel *iface, UINT32 *aResponseStatus) { nsChannel *This = impl_from_nsIHttpChannel(iface); @@ -1571,7 +1571,7 @@ static nsresult NSAPI nsHttpChannelInternal_SetDocumentURI(nsIHttpChannelInterna return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsHttpChannelInternal_GetRequestVersion(nsIHttpChannelInternal *iface, PRUint32 *major, PRUint32 *minor) +static nsresult NSAPI nsHttpChannelInternal_GetRequestVersion(nsIHttpChannelInternal *iface, UINT32 *major, UINT32 *minor) { nsChannel *This = impl_from_nsIHttpChannelInternal(iface); @@ -1580,7 +1580,7 @@ static nsresult NSAPI nsHttpChannelInternal_GetRequestVersion(nsIHttpChannelInte return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsHttpChannelInternal_GetResponseVersion(nsIHttpChannelInternal *iface, PRUint32 *major, PRUint32 *minor) +static nsresult NSAPI nsHttpChannelInternal_GetResponseVersion(nsIHttpChannelInternal *iface, UINT32 *major, UINT32 *minor) { nsChannel *This = impl_from_nsIHttpChannelInternal(iface); @@ -2862,7 +2862,7 @@ static nsresult NSAPI nsStandardURL_SetMutable(nsIStandardURL *iface, cpp_bool a return NS_OK; } -static nsresult NSAPI nsStandardURL_Init(nsIStandardURL *iface, PRUint32 aUrlType, LONG aDefaultPort, +static nsresult NSAPI nsStandardURL_Init(nsIStandardURL *iface, UINT32 aUrlType, LONG aDefaultPort, const nsACString *aSpec, const char *aOriginCharset, nsIURI *aBaseURI) { nsWineURI *This = impl_from_nsIStandardURL(iface); @@ -3109,7 +3109,7 @@ static nsresult NSAPI nsProtocolHandler_GetDefaultPort(nsIProtocolHandler *iface } static nsresult NSAPI nsProtocolHandler_GetProtocolFlags(nsIProtocolHandler *iface, - PRUint32 *aProtocolFlags) + UINT32 *aProtocolFlags) { nsProtocolHandler *This = impl_from_nsIProtocolHandler(iface); @@ -3220,7 +3220,7 @@ static nsresult NSAPI nsIOService_GetProtocolHandler(nsIIOService *iface, const } static nsresult NSAPI nsIOService_GetProtocolFlags(nsIIOService *iface, const char *aScheme, - PRUint32 *_retval) + UINT32 *_retval) { TRACE("(%s %p)\n", debugstr_a(aScheme), _retval); return nsIIOService_GetProtocolFlags(nsio, aScheme, _retval); @@ -3415,14 +3415,14 @@ static nsresult NSAPI nsNetUtil_ParseContentType(nsINetUtil *iface, const nsACSt return nsINetUtil_ParseContentType(net_util, aTypeHeader, aCharset, aHadCharset, aContentType); } -static nsresult NSAPI nsNetUtil_ProtocolHasFlags(nsINetUtil *iface, nsIURI *aURI, PRUint32 aFlags, cpp_bool *_retval) +static nsresult NSAPI nsNetUtil_ProtocolHasFlags(nsINetUtil *iface, nsIURI *aURI, UINT32 aFlags, cpp_bool *_retval) { TRACE("()\n"); return nsINetUtil_ProtocolHasFlags(net_util, aURI, aFlags, _retval); } -static nsresult NSAPI nsNetUtil_URIChainHasFlags(nsINetUtil *iface, nsIURI *aURI, PRUint32 aFlags, cpp_bool *_retval) +static nsresult NSAPI nsNetUtil_URIChainHasFlags(nsINetUtil *iface, nsIURI *aURI, UINT32 aFlags, cpp_bool *_retval) { TRACE("(%p %08x %p)\n", aURI, aFlags, _retval); @@ -3449,14 +3449,14 @@ static nsresult NSAPI nsNetUtil_NewSimpleNestedURI(nsINetUtil *iface, nsIURI *aU } static nsresult NSAPI nsNetUtil_EscapeString(nsINetUtil *iface, const nsACString *aString, - PRUint32 aEscapeType, nsACString *_retval) + UINT32 aEscapeType, nsACString *_retval) { TRACE("(%s %x %p)\n", debugstr_nsacstr(aString), aEscapeType, _retval); return nsINetUtil_EscapeString(net_util, aString, aEscapeType, _retval); } -static nsresult NSAPI nsNetUtil_EscapeURL(nsINetUtil *iface, const nsACString *aStr, PRUint32 aFlags, +static nsresult NSAPI nsNetUtil_EscapeURL(nsINetUtil *iface, const nsACString *aStr, UINT32 aFlags, nsACString *_retval) { TRACE("(%s %08x %p)\n", debugstr_nsacstr(aStr), aFlags, _retval); @@ -3465,7 +3465,7 @@ static nsresult NSAPI nsNetUtil_EscapeURL(nsINetUtil *iface, const nsACString *a } static nsresult NSAPI nsNetUtil_UnescapeString(nsINetUtil *iface, const nsACString *aStr, - PRUint32 aFlags, nsACString *_retval) + UINT32 aFlags, nsACString *_retval) { TRACE("(%s %08x %p)\n", debugstr_nsacstr(aStr), aFlags, _retval); diff --git a/dlls/mshtml/nsservice.c b/dlls/mshtml/nsservice.c index 2eefcbe69bd..6d34f3fa08c 100644 --- a/dlls/mshtml/nsservice.c +++ b/dlls/mshtml/nsservice.c @@ -124,7 +124,7 @@ static nsresult NSAPI nsPromptService_ConfirmCheck(nsIPromptService *iface, static nsresult NSAPI nsPromptService_ConfirmEx(nsIPromptService *iface, nsIDOMWindow *aParent, const PRUnichar *aDialogTitle, - const PRUnichar *aText, PRUint32 aButtonFlags, const PRUnichar *aButton0Title, + const PRUnichar *aText, UINT32 aButtonFlags, const PRUnichar *aButton0Title, const PRUnichar *aButton1Title, const PRUnichar *aButton2Title, const PRUnichar *aCheckMsg, cpp_bool *aCheckState, LONG *_retval) { @@ -185,7 +185,7 @@ static nsresult NSAPI nsPromptService_PromptPassword(nsIPromptService *iface, static nsresult NSAPI nsPromptService_Select(nsIPromptService *iface, nsIDOMWindow *aParent, const PRUnichar *aDialogTitle, - const PRUnichar *aText, PRUint32 aCount, const PRUnichar **aSelectList, + const PRUnichar *aText, UINT32 aCount, const PRUnichar **aSelectList, LONG *aOutSelection, cpp_bool *_retval) { FIXME("(%p %s %s %d %p %p %p)\n", aParent, debugstr_w(aDialogTitle), diff --git a/dlls/mshtml/propbag.c b/dlls/mshtml/propbag.c index 716f3837885..14cc55e40d2 100644 --- a/dlls/mshtml/propbag.c +++ b/dlls/mshtml/propbag.c @@ -273,7 +273,7 @@ static HRESULT fill_props(nsIDOMHTMLElement *nselem, PropertyBag *prop_bag) nsIDOMHTMLParamElement *nsparam; nsAString name_str, value_str; nsIDOMNodeList *params; - PRUint32 length, i; + UINT32 length, i; nsIDOMNode *nsnode; nsresult nsres; HRESULT hres = S_OK; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index a212b991df3..3174bd289f0 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1173,7 +1173,7 @@ void bind_event_scripts(HTMLDocumentNode *doc) nsIDOMNode *script_node; nsAString selector_str; IDispatch *event_disp; - PRUint32 length, i; + UINT32 length, i; WCHAR *event; nsresult nsres; HRESULT hres; diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 813fad7b360..e88d9604445 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -56,7 +56,7 @@ typedef struct { typedef struct { UINT16 type; nsIDOMNode *node; - PRUint32 off; + UINT32 off; nsAString str; const PRUnichar *p; } dompos_t; @@ -377,7 +377,7 @@ static nsIDOMNode *prev_node(HTMLTxtRange *This, nsIDOMNode *iter) return NULL; } -static nsIDOMNode *get_child_node(nsIDOMNode *node, PRUint32 off) +static nsIDOMNode *get_child_node(nsIDOMNode *node, UINT32 off) { nsIDOMNodeList *node_list; nsIDOMNode *ret = NULL;