>From 87f27f339d3ad0c55c9c2c1460ffbc68bb63e40c Mon Sep 17 00:00:00 2001 From: Sergey Khodych Date: Sun, 15 May 2011 01:34:03 +0300 Subject: [PATCH 4/5] shdocvw: Use UrlApplyScheme with URL_APPLY_GUESSFILE for local paths in create_moniker. --- dlls/shdocvw/navigate.c | 21 ++++++--------------- 1 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 09135a8..211aee5 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -578,21 +578,12 @@ static HRESULT create_moniker(LPCWSTR url, IMoniker **mon) if(PathIsURLW(url)) return CreateURLMoniker(NULL, url, mon); - if(url[1] == ':') { - size = sizeof(new_url); - hres = UrlCreateFromPathW(url, new_url, &size, 0); - if(FAILED(hres)) { - WARN("UrlCreateFromPathW failed: %08x\n", hres); - return hres; - } - }else { - size = sizeof(new_url)/sizeof(WCHAR); - hres = UrlApplySchemeW(url, new_url, &size, URL_APPLY_GUESSSCHEME); - TRACE("got %s\n", debugstr_w(new_url)); - if(FAILED(hres)) { - WARN("UrlApplyScheme failed: %08x\n", hres); - return hres; - } + size = sizeof(new_url)/sizeof(WCHAR); + hres = UrlApplySchemeW(url, new_url, &size, URL_APPLY_GUESSSCHEME | URL_APPLY_GUESSFILE); + TRACE("was %s got %s\n", debugstr_w(url), debugstr_w(new_url)); + if(FAILED(hres)) { + WARN("UrlApplyScheme failed: %08x\n", hres); + return hres; } return CreateURLMoniker(NULL, new_url, mon); -- 1.7.5.rc3