marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Get rid of PRBool from nsembed.c and nsservice.c.

oldstable
Jacek Caban 2012-03-15 11:54:48 +01:00 committed by Alexandre Julliard
parent d6e76a1619
commit d1a116fae4
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/mshtml/nsembed.c
View File

@ -62,9 +62,9 @@ static nsresult (CDECL *NS_StringContainerFinish)(nsStringContainer*);
static nsresult (CDECL *NS_CStringContainerFinish)(nsCStringContainer*);
static nsresult (CDECL *NS_StringSetData)(nsAString*,const PRUnichar*,PRUint32);
static nsresult (CDECL *NS_CStringSetData)(nsACString*,const char*,PRUint32);
static nsresult (CDECL *NS_NewLocalFile)(const nsAString*,PRBool,nsIFile**);
static PRUint32 (CDECL *NS_StringGetData)(const nsAString*,const PRUnichar **,PRBool*);
static PRUint32 (CDECL *NS_CStringGetData)(const nsACString*,const char**,PRBool*);
static nsresult (CDECL *NS_NewLocalFile)(const nsAString*,cpp_bool,nsIFile**);
static PRUint32 (CDECL *NS_StringGetData)(const nsAString*,const PRUnichar **,cpp_bool*);
static PRUint32 (CDECL *NS_CStringGetData)(const nsACString*,const char**,cpp_bool*);
static HINSTANCE xul_handle = NULL;
@ -114,7 +114,7 @@ static nsresult create_profile_directory(void)
WCHAR path[MAX_PATH + sizeof(wine_geckoW)/sizeof(WCHAR)];
nsAString str;
PRBool exists;
cpp_bool exists;
nsresult nsres;
HRESULT hres;
@ -149,7 +149,7 @@ static nsresult create_profile_directory(void)
}
static nsresult NSAPI nsDirectoryServiceProvider_GetFile(nsIDirectoryServiceProvider *iface,
const char *prop, PRBool *persistent, nsIFile **_retval)
const char *prop, cpp_bool *persistent, nsIFile **_retval)
{
TRACE("(%s %p %p)\n", debugstr_a(prop), persistent, _retval);
@ -748,7 +748,7 @@ nsresult get_nsinterface(nsISupports *iface, REFIID riid, void **ppv)
static HRESULT nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNode *nsnode, nsAString *str)
{
nsIDOMNodeList *node_list = NULL;
PRBool has_children = FALSE;
cpp_bool has_children = FALSE;
nsIContent *nscontent;
PRUint16 type;
nsresult nsres;
@ -1178,7 +1178,7 @@ static nsresult NSAPI nsWebBrowserChrome_ShowAsModal(nsIWebBrowserChrome *iface)
return NS_ERROR_NOT_IMPLEMENTED;
}
static nsresult NSAPI nsWebBrowserChrome_IsWindowModal(nsIWebBrowserChrome *iface, PRBool *_retval)
static nsresult NSAPI nsWebBrowserChrome_IsWindowModal(nsIWebBrowserChrome *iface, cpp_bool *_retval)
{
NSContainer *This = impl_from_nsIWebBrowserChrome(iface);
WARN("(%p)->(%p)\n", This, _retval);
@ -1326,7 +1326,7 @@ static nsrefcnt NSAPI nsURIContentListener_Release(nsIURIContentListener *iface)
}
static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener *iface,
nsIURI *aURI, PRBool *_retval)
nsIURI *aURI, cpp_bool *_retval)
{
NSContainer *This = impl_from_nsIURIContentListener(iface);
nsACString spec_str;
@ -1351,8 +1351,8 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener
}
static nsresult NSAPI nsURIContentListener_DoContent(nsIURIContentListener *iface,
const char *aContentType, PRBool aIsContentPreferred, nsIRequest *aRequest,
nsIStreamListener **aContentHandler, PRBool *_retval)
const char *aContentType, cpp_bool aIsContentPreferred, nsIRequest *aRequest,
nsIStreamListener **aContentHandler, cpp_bool *_retval)
{
NSContainer *This = impl_from_nsIURIContentListener(iface);
@ -1366,7 +1366,7 @@ static nsresult NSAPI nsURIContentListener_DoContent(nsIURIContentListener *ifac
}
static nsresult NSAPI nsURIContentListener_IsPreferred(nsIURIContentListener *iface,
const char *aContentType, char **aDesiredContentType, PRBool *_retval)
const char *aContentType, char **aDesiredContentType, cpp_bool *_retval)
{
NSContainer *This = impl_from_nsIURIContentListener(iface);
@ -1382,8 +1382,8 @@ static nsresult NSAPI nsURIContentListener_IsPreferred(nsIURIContentListener *if
}
static nsresult NSAPI nsURIContentListener_CanHandleContent(nsIURIContentListener *iface,
const char *aContentType, PRBool aIsContentPreferred, char **aDesiredContentType,
PRBool *_retval)
const char *aContentType, cpp_bool aIsContentPreferred, char **aDesiredContentType,
cpp_bool *_retval)
{
NSContainer *This = impl_from_nsIURIContentListener(iface);
@ -1522,7 +1522,7 @@ static nsresult NSAPI nsEmbeddingSiteWindow_SetFocus(nsIEmbeddingSiteWindow *ifa
}
static nsresult NSAPI nsEmbeddingSiteWindow_GetVisibility(nsIEmbeddingSiteWindow *iface,
PRBool *aVisibility)
cpp_bool *aVisibility)
{
NSContainer *This = impl_from_nsIEmbeddingSiteWindow(iface);
@ -1533,7 +1533,7 @@ static nsresult NSAPI nsEmbeddingSiteWindow_GetVisibility(nsIEmbeddingSiteWindow
}
static nsresult NSAPI nsEmbeddingSiteWindow_SetVisibility(nsIEmbeddingSiteWindow *iface,
PRBool aVisibility)
cpp_bool aVisibility)
{
NSContainer *This = impl_from_nsIEmbeddingSiteWindow(iface);

24
dlls/mshtml/nsservice.c
View File

@ -90,7 +90,7 @@ static nsresult NSAPI nsWindowCreator_CreateChromeWindow(nsIWindowCreator2 *ifac
static nsresult NSAPI nsWindowCreator_CreateChromeWindow2(nsIWindowCreator2 *iface,
nsIWebBrowserChrome *parent, PRUint32 chromeFlags, PRUint32 contextFlags,
nsIURI *uri, PRBool *cancel, nsIWebBrowserChrome **_retval)
nsIURI *uri, cpp_bool *cancel, nsIWebBrowserChrome **_retval)
{
TRACE("(%p %08x %08x %p %p %p)\n", parent, chromeFlags, contextFlags, uri,
cancel, _retval);
@ -164,7 +164,7 @@ static nsresult NSAPI nsPromptService_Alert(nsIPromptService *iface, nsIDOMWindo
static nsresult NSAPI nsPromptService_AlertCheck(nsIPromptService *iface,
nsIDOMWindow *aParent, const PRUnichar *aDialogTitle,
const PRUnichar *aText, const PRUnichar *aCheckMsg, PRBool *aCheckState)
const PRUnichar *aText, const PRUnichar *aCheckMsg, cpp_bool *aCheckState)
{
FIXME("(%p %s %s %s %p)\n", aParent, debugstr_w(aDialogTitle), debugstr_w(aText),
debugstr_w(aCheckMsg), aCheckState);
@ -173,7 +173,7 @@ static nsresult NSAPI nsPromptService_AlertCheck(nsIPromptService *iface,
static nsresult NSAPI nsPromptService_Confirm(nsIPromptService *iface,
nsIDOMWindow *aParent, const PRUnichar *aDialogTitle, const PRUnichar *aText,
PRBool *_retval)
cpp_bool *_retval)
{
FIXME("(%p %s %s %p)\n", aParent, debugstr_w(aDialogTitle), debugstr_w(aText), _retval);
return NS_ERROR_NOT_IMPLEMENTED;
@ -181,8 +181,8 @@ static nsresult NSAPI nsPromptService_Confirm(nsIPromptService *iface,
static nsresult NSAPI nsPromptService_ConfirmCheck(nsIPromptService *iface,
nsIDOMWindow *aParent, const PRUnichar *aDialogTitle,
const PRUnichar *aText, const PRUnichar *aCheckMsg, PRBool *aCheckState,
PRBool *_retval)
const PRUnichar *aText, const PRUnichar *aCheckMsg, cpp_bool *aCheckState,
cpp_bool *_retval)
{
FIXME("(%p %s %s %s %p %p)\n", aParent, debugstr_w(aDialogTitle), debugstr_w(aText),
debugstr_w(aCheckMsg), aCheckState, _retval);
@ -193,7 +193,7 @@ static nsresult NSAPI nsPromptService_ConfirmEx(nsIPromptService *iface,
nsIDOMWindow *aParent, const PRUnichar *aDialogTitle,
const PRUnichar *aText, PRUint32 aButtonFlags, const PRUnichar *aButton0Title,
const PRUnichar *aButton1Title, const PRUnichar *aButton2Title,
const PRUnichar *aCheckMsg, PRBool *aCheckState, PRInt32 *_retval)
const PRUnichar *aCheckMsg, cpp_bool *aCheckState, PRInt32 *_retval)
{
static const PRUnichar wszContinue[] = {'C','o','n','t','i','n','u','e',0};
@ -222,7 +222,7 @@ static nsresult NSAPI nsPromptService_ConfirmEx(nsIPromptService *iface,
static nsresult NSAPI nsPromptService_Prompt(nsIPromptService *iface,
nsIDOMWindow *aParent, const PRUnichar *aDialogTitle,
const PRUnichar *aText, PRUnichar **aValue, const PRUnichar *aCheckMsg,
PRBool *aCheckState, PRBool *_retval)
cpp_bool *aCheckState, cpp_bool *_retval)
{
FIXME("(%p %s %s %p %s %p %p)\n", aParent, debugstr_w(aDialogTitle), debugstr_w(aText),
aValue, debugstr_w(aCheckMsg), aCheckState, _retval);
@ -232,7 +232,7 @@ static nsresult NSAPI nsPromptService_Prompt(nsIPromptService *iface,
static nsresult NSAPI nsPromptService_PromptUsernameAndPassword(nsIPromptService *iface,
nsIDOMWindow *aParent, const PRUnichar *aDialogTitle,
const PRUnichar *aText, PRUnichar **aUsername, PRUnichar **aPassword,
const PRUnichar *aCheckMsg, PRBool *aCheckState, PRBool *_retval)
const PRUnichar *aCheckMsg, cpp_bool *aCheckState, cpp_bool *_retval)
{
FIXME("(%p %s %s %p %p %s %p %p)\n", aParent, debugstr_w(aDialogTitle),
debugstr_w(aText), aUsername, aPassword, debugstr_w(aCheckMsg), aCheckState,
@ -243,7 +243,7 @@ static nsresult NSAPI nsPromptService_PromptUsernameAndPassword(nsIPromptService
static nsresult NSAPI nsPromptService_PromptPassword(nsIPromptService *iface,
nsIDOMWindow *aParent, const PRUnichar *aDialogTitle,
const PRUnichar *aText, PRUnichar **aPassword, const PRUnichar *aCheckMsg,
PRBool *aCheckState, PRBool *_retval)
cpp_bool *aCheckState, cpp_bool *_retval)
{
FIXME("(%p %s %s %p %s %p %p)\n", aParent, debugstr_w(aDialogTitle),
debugstr_w(aText), aPassword, debugstr_w(aCheckMsg), aCheckState, _retval);
@ -253,7 +253,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,
PRInt32 *aOutSelection, PRBool *_retval)
PRInt32 *aOutSelection, cpp_bool *_retval)
{
FIXME("(%p %s %s %d %p %p %p)\n", aParent, debugstr_w(aDialogTitle),
debugstr_w(aText), aCount, aSelectList, aOutSelection, _retval);
@ -310,7 +310,7 @@ static nsrefcnt NSAPI nsTooltipTextProvider_Release(nsITooltipTextProvider *ifac
}
static nsresult NSAPI nsTooltipTextProvider_GetNodeText(nsITooltipTextProvider *iface,
nsIDOMNode *aNode, PRUnichar **aText, PRBool *_retval)
nsIDOMNode *aNode, PRUnichar **aText, cpp_bool *_retval)
{
nsIDOMHTMLElement *nselem;
nsIDOMNode *node = aNode, *parent;
@ -427,7 +427,7 @@ static nsresult NSAPI nsServiceFactory_CreateInstance(nsIFactory *iface,
return nsISupports_QueryInterface(This->service, iid, result);
}
static nsresult NSAPI nsServiceFactory_LockFactory(nsIFactory *iface, PRBool lock)
static nsresult NSAPI nsServiceFactory_LockFactory(nsIFactory *iface, cpp_bool lock)
{
nsServiceFactory *This = impl_from_nsIFactory(iface);
WARN("(%p)->(%x)\n", This, lock);