Jacek Caban : mshtml: Don't use wine_url in nsURI::Clone implementation.
Alexandre Julliard
julliard at winehq.org
Thu Nov 25 11:18:56 CST 2010
Module: wine
Branch: master
Commit: 74aabe94b1a287749b30169e61e38e4d1b8944ca
URL: http://source.winehq.org/git/wine.git/?a=commit;h=74aabe94b1a287749b30169e61e38e4d1b8944ca
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Nov 25 13:55:33 2010 +0100
mshtml: Don't use wine_url in nsURI::Clone implementation.
---
dlls/mshtml/nsio.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c
index 650745b..01da4ac 100644
--- a/dlls/mshtml/nsio.c
+++ b/dlls/mshtml/nsio.c
@@ -2058,6 +2058,9 @@ static nsresult NSAPI nsURI_Clone(nsIURL *iface, nsIURI **_retval)
TRACE("(%p)->(%p)\n", This, _retval);
+ if(!ensure_uri(This))
+ return NS_ERROR_UNEXPECTED;
+
if(This->nsuri) {
nsres = nsIURI_Clone(This->nsuri, &nsuri);
if(NS_FAILED(nsres)) {
@@ -2072,12 +2075,9 @@ static nsresult NSAPI nsURI_Clone(nsIURL *iface, nsIURI **_retval)
return nsres;
}
- set_wine_url(wine_uri, This->wine_url);
-
- if(This->uri) {
- IUri_AddRef(This->uri);
- wine_uri->uri = This->uri;
- }
+ wine_uri->uri = This->uri;
+ IUri_AddRef(wine_uri->uri);
+ sync_wine_url(wine_uri);
*_retval = NSURI(wine_uri);
return NS_OK;
More information about the wine-cvs
mailing list