>From c6a3dfe69694b1a0f787d4764540ba496429dde8 Mon Sep 17 00:00:00 2001 From: Sergey Khodych Date: Sun, 15 May 2011 00:18:10 +0300 Subject: [PATCH 1/5] shdocvw: Don't use separate call of UrlApplySchemeW for default scheme. --- dlls/shdocvw/shdocvw_main.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index a0070b4..4386ddc 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -333,14 +333,8 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L if (!PathIsURLW(ptr)) { len = sizeof(buffer_in) / sizeof(buffer_in[0]); buffer_in[0] = 0; - hr = UrlApplySchemeW(ptr, buffer_in, &len, URL_APPLY_GUESSSCHEME); + hr = UrlApplySchemeW(ptr, buffer_in, &len, URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT); TRACE("got 0x%x with %s\n", hr, debugstr_w(buffer_in)); - if (hr != S_OK) { - /* when we can't guess the scheme, use the default scheme */ - len = sizeof(buffer_in) / sizeof(buffer_in[0]); - hr = UrlApplySchemeW(ptr, buffer_in, &len, URL_APPLY_DEFAULT); - } - if (hr == S_OK) { /* we parsed the url to buffer_in */ ptr = buffer_in; -- 1.7.5.rc3