Jacek Caban : mshtml: Always set use_wine_url if there is no necko nsIURI available.
Module: wine Branch: master Commit: d0dbf57c36a0eb2ecc6e02d7bb62dcd481083859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0dbf57c36a0eb2ecc6e02d7bb... Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 17:59:29 2009 +0100 mshtml: Always set use_wine_url if there is no necko nsIURI available. --- dlls/mshtml/nsio.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 9792747..9e5b2e2 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2267,11 +2267,15 @@ static nsresult NSAPI nsURI_SetWineURL(nsIWineURI *iface, LPCWSTR aURL) This->wine_url = heap_alloc(len*sizeof(WCHAR)); memcpy(This->wine_url, aURL, len*sizeof(WCHAR)); - /* FIXME: Always use wine url */ - This->use_wine_url = - strncmpW(aURL, wszFtp, sizeof(wszFtp)/sizeof(WCHAR)) - && strncmpW(aURL, wszHttp, sizeof(wszHttp)/sizeof(WCHAR)) - && strncmpW(aURL, wszHttps, sizeof(wszHttps)/sizeof(WCHAR)); + if(This->uri) { + /* FIXME: Always use wine url */ + This->use_wine_url = + strncmpW(aURL, wszFtp, sizeof(wszFtp)/sizeof(WCHAR)) + && strncmpW(aURL, wszHttp, sizeof(wszHttp)/sizeof(WCHAR)) + && strncmpW(aURL, wszHttps, sizeof(wszHttps)/sizeof(WCHAR)); + }else { + This->use_wine_url = TRUE; + } }else { This->wine_url = NULL; This->use_wine_url = FALSE;
participants (1)
-
Alexandre Julliard