Sergey Khodych : shdocvw: Don' t use separate call of UrlApplySchemeW for default scheme.
Alexandre Julliard
julliard at winehq.org
Tue May 17 12:52:58 CDT 2011
Module: wine
Branch: master
Commit: 2034439d664d1bdfa032c3bd6daf8e43f5740c9c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2034439d664d1bdfa032c3bd6daf8e43f5740c9c
Author: Sergey Khodych <khodych at gmail.com>
Date: Sun May 15 00:18:10 2011 +0300
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;
More information about the wine-cvs
mailing list