Jacek Caban : mshtml: Return INET_E_USE_DEFAULT_PROTOCOLHANDLER in ResProtocolInfo::CombineUrl.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 114a1a22aa7b88a69420d582e66e8b234002babe
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=114a1a22aa7b88a69420d582e66e8b234002babe

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Wed Aug  9 16:39:43 2006 +0200

mshtml: Return INET_E_USE_DEFAULT_PROTOCOLHANDLER in ResProtocolInfo::CombineUrl.

---

 dlls/mshtml/protocol.c       |    5 +++--
 dlls/mshtml/tests/protocol.c |   17 +++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c
index 05b4388..cf60004 100644
--- a/dlls/mshtml/protocol.c
+++ b/dlls/mshtml/protocol.c
@@ -841,9 +841,10 @@ static HRESULT WINAPI ResProtocolInfo_Co
         LPCWSTR pwzRelativeUrl, DWORD dwCombineFlags, LPWSTR pwzResult, DWORD cchResult,
         DWORD* pcchResult, DWORD dwReserved)
 {
-    FIXME("%p)->(%s %s %08lx %p %ld %p %ld)\n", iface, debugstr_w(pwzBaseUrl), debugstr_w(pwzRelativeUrl),
+    TRACE("%p)->(%s %s %08lx %p %ld %p %ld)\n", iface, debugstr_w(pwzBaseUrl), debugstr_w(pwzRelativeUrl),
             dwCombineFlags, pwzResult, cchResult, pcchResult, dwReserved);
-    return E_NOTIMPL;
+
+    return INET_E_USE_DEFAULT_PROTOCOLHANDLER;
 }
 
 static HRESULT WINAPI ResProtocolInfo_CompareUrl(IInternetProtocolInfo *iface, LPCWSTR pwzUrl1,
diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c
index dfed396..8451019 100644
--- a/dlls/mshtml/tests/protocol.c
+++ b/dlls/mshtml/tests/protocol.c
@@ -25,6 +25,7 @@ #include "windef.h"
 #include "winbase.h"
 #include "ole2.h"
 #include "urlmon.h"
+#include "shlwapi.h"
 
 #include "initguid.h"
 
@@ -247,6 +248,7 @@ static void test_res_protocol(void)
 
     static const WCHAR blank_url[] =
         {'r','e','s',':','/','/','m','s','h','t','m','l','.','d','l','l','/','b','l','a','n','k','.','h','t','m',0};
+    static const WCHAR test_part_url[] = {'r','e','s',':','/','/','C','S','S','/','t','e','s','t',0};
     static const WCHAR wrong_url1[] =
         {'m','s','h','t','m','l','.','d','l','l','/','b','l','a','n','k','.','m','t','h',0};
     static const WCHAR wrong_url2[] =
@@ -334,6 +336,21 @@ #endif
                 "ParseUrl failed: %08lx, expected INET_E_DEFAULT_ACTION\n", hres);
         ok(buf[0] == '?', "buf changed\n");
 
+        size = 0xdeadbeef;
+        hres = IInternetProtocolInfo_CombineUrl(protocol_info, blank_url, test_part_url,
+                0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0);
+        ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08lx\n", hres);
+
+        size = 0xdeadbeef;
+        hres = IInternetProtocolInfo_CombineUrl(protocol_info, blank_url, test_part_url,
+                URL_FILE_USE_PATHURL, buf, sizeof(buf)/sizeof(buf[0]), &size, 0);
+        ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08lx\n", hres);
+
+        size = 0xdeadbeef;
+        hres = IInternetProtocolInfo_CombineUrl(protocol_info, NULL, NULL,
+                URL_FILE_USE_PATHURL, NULL, 0xdeadbeef, NULL, 0);
+        ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08lx\n", hres);
+
         IInternetProtocolInfo_Release(protocol_info);
     }