ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

itss: Fixed fragment part handling in IInternetProtocolInfo::CombineUrl.

This commit is contained in:
Jacek Caban 2012-12-05 18:38:40 +01:00 committed by Alexandre Julliard
parent fa53a8ccef
commit 60195ff6a9
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/itss/protocol.c
View File

@ -469,7 +469,9 @@ static HRESULT WINAPI ITSProtocolInfo_CombineUrl(IInternetProtocolInfo *iface,
if(strchrW(pwzRelativeUrl, ':')) if(strchrW(pwzRelativeUrl, ':'))
return STG_E_INVALIDNAME; return STG_E_INVALIDNAME;
if(pwzRelativeUrl[0] != '/') { if(pwzRelativeUrl[0] == '#') {
base_end += strlenW(base_end);
}else if(pwzRelativeUrl[0] != '/') {
ptr = strrchrW(base_end, '/'); ptr = strrchrW(base_end, '/');
if(ptr) if(ptr)
base_end = ptr+1; base_end = ptr+1;

6
dlls/itss/tests/protocol.c
View File

@ -483,6 +483,12 @@ static const struct {
{"mk:@MSITStore:test.chm::/dir/blank.html", "test.html", 0, S_OK, "mk:@MSITStore:test.chm::/dir/test.html"}, {"mk:@MSITStore:test.chm::/dir/blank.html", "test.html", 0, S_OK, "mk:@MSITStore:test.chm::/dir/test.html"},
{"xxx:test.chm::/dir/blank.html", "test.html", 0, INET_E_USE_DEFAULT_PROTOCOLHANDLER, NULL}, {"xxx:test.chm::/dir/blank.html", "test.html", 0, INET_E_USE_DEFAULT_PROTOCOLHANDLER, NULL},
{"its:test.chm::/dir/blank.html", "/test.html", 0, S_OK, "its:test.chm::/test.html"}, {"its:test.chm::/dir/blank.html", "/test.html", 0, S_OK, "its:test.chm::/test.html"},
{"its:test.chm::/blank.html", "#frag", 0, S_OK, "its:test.chm::/blank.html#frag"},
{"its:test.chm::/blank.html#hash", "#frag", 0, S_OK, "its:test.chm::/blank.html#hash#frag"},
{"its:test.chm::/blank.html", "test.html#frag", 0, S_OK, "its:test.chm::/test.html#frag"},
{"its:test.chm::/blank.html", "/test.html#frag", 0, S_OK, "its:test.chm::/test.html#frag"},
{"its:test.chm::/blank.html", "?query", 0, S_OK, "its:test.chm::/?query"},
{"its:test.chm::/blank.html#frag/blank", "test.html", 0, S_OK, "its:test.chm::/blank.html#frag/test.html"},
}; };
static void test_its_protocol_info(IInternetProtocol *protocol) static void test_its_protocol_info(IInternetProtocol *protocol)