Jacek Caban : mshtml: Don't mix PRBool pointers with BOOL pointers.
Alexandre Julliard
julliard at winehq.org
Thu Nov 17 12:52:35 CST 2011
Module: wine
Branch: master
Commit: 5471f357c0b675035517c238f6e8b6daf2b5c2ee
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5471f357c0b675035517c238f6e8b6daf2b5c2ee
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Nov 17 16:11:58 2011 +0100
mshtml: Don't mix PRBool pointers with BOOL pointers.
They will be different things after the next Gecko update.
---
dlls/mshtml/nsio.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c
index a5a974f..b1497dc 100644
--- a/dlls/mshtml/nsio.c
+++ b/dlls/mshtml/nsio.c
@@ -2216,8 +2216,15 @@ static nsresult NSAPI nsURI_Equals(nsIURL *iface, nsIURI *other, PRBool *_retval
}
if(ensure_uri(This) && ensure_uri(other_obj)) {
- hres = IUri_IsEqual(This->uri, other_obj->uri, _retval);
- nsres = SUCCEEDED(hres) ? NS_OK : NS_ERROR_FAILURE;
+ BOOL b;
+
+ hres = IUri_IsEqual(This->uri, other_obj->uri, &b);
+ if(SUCCEEDED(hres)) {
+ *_retval = b;
+ nsres = NS_OK;
+ }else {
+ nsres = NS_ERROR_FAILURE;
+ }
}else {
nsres = NS_ERROR_UNEXPECTED;
}
More information about the wine-cvs
mailing list