Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
3f6142e0
Commit
3f6142e0
authored
Mar 08, 2012
by
Piotr Caban
Committed by
Alexandre Julliard
Mar 08, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shlwapi: Lowercase schemes in UrlCombine function.
parent
bb06ec77
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
4 deletions
+12
-4
url.c
dlls/shlwapi/tests/url.c
+2
-2
url.c
dlls/shlwapi/url.c
+10
-2
No files found.
dlls/shlwapi/tests/url.c
View file @
3f6142e0
...
...
@@ -343,7 +343,7 @@ static const TEST_URL_COMBINE TEST_COMBINE[] = {
{
"foo:today"
,
"foo:calendar"
,
0
,
S_OK
,
"foo:calendar"
},
{
"foo:today"
,
"bar:calendar"
,
0
,
S_OK
,
"bar:calendar"
},
{
"foo:/today"
,
"foo:calendar"
,
0
,
S_OK
,
"foo:/calendar"
},
{
"
foo:/today/"
,
"fo
o:calendar"
,
0
,
S_OK
,
"foo:/today/calendar"
},
{
"
Foo:/today/"
,
"fO
o:calendar"
,
0
,
S_OK
,
"foo:/today/calendar"
},
{
"mk:@MSITStore:dir/test.chm::dir/index.html"
,
"image.jpg"
,
0
,
S_OK
,
"mk:@MSITStore:dir/test.chm::dir/image.jpg"
},
{
"mk:@MSITStore:dir/test.chm::dir/dir2/index.html"
,
"../image.jpg"
,
0
,
S_OK
,
"mk:@MSITStore:dir/test.chm::dir/image.jpg"
},
/* UrlCombine case 2 tests. Schemes do not match */
...
...
@@ -365,7 +365,7 @@ static const TEST_URL_COMBINE TEST_COMBINE[] = {
{
"outbind://xxxxxxxxx/"
,
"http:wine16/dir"
,
0
,
S_OK
,
"http:wine16/dir"
},
{
"http://xxxxxxxxx"
,
"outbind:wine17/dir"
,
URL_PLUGGABLE_PROTOCOL
,
S_OK
,
"outbind:wine17/dir"
},
{
"xxx://xxxxxxxxx"
,
"ftp:wine18/dir"
,
URL_PLUGGABLE_PROTOCOL
,
S_OK
,
"ftp:wine18/dir"
},
{
"ftp://xxxxxxxxx/"
,
"x
x
x:wine19/dir"
,
URL_PLUGGABLE_PROTOCOL
,
S_OK
,
"xxx:wine19/dir"
},
{
"ftp://xxxxxxxxx/"
,
"x
X
x:wine19/dir"
,
URL_PLUGGABLE_PROTOCOL
,
S_OK
,
"xxx:wine19/dir"
},
{
"outbind://xxxxxxxxx/"
,
"http:wine20/dir"
,
URL_PLUGGABLE_PROTOCOL
,
S_OK
,
"http:wine20/dir"
},
{
"file:///c:/dir/file.txt"
,
"index.html?test=c:/abc"
,
URL_ESCAPE_SPACES_ONLY
|
URL_DONT_ESCAPE_EXTRA_INFO
,
S_OK
,
"file:///c:/dir/index.html?test=c:/abc"
}
};
...
...
dlls/shlwapi/url.c
View file @
3f6142e0
...
...
@@ -662,7 +662,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative,
{
PARSEDURLW
base
,
relative
;
DWORD
myflags
,
sizeloc
=
0
;
DWORD
len
,
res1
,
res2
,
process_case
=
0
;
DWORD
i
,
len
,
res1
,
res2
,
process_case
=
0
;
LPWSTR
work
,
preliminary
,
mbase
,
mrelative
;
static
const
WCHAR
myfilestr
[]
=
{
'f'
,
'i'
,
'l'
,
'e'
,
':'
,
'/'
,
'/'
,
'/'
,
'\0'
};
HRESULT
ret
;
...
...
@@ -703,6 +703,10 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative,
else
do
{
BOOL
manual_search
=
FALSE
;
work
=
(
LPWSTR
)
base
.
pszProtocol
;
for
(
i
=
0
;
i
<
base
.
cchProtocol
;
i
++
)
work
[
i
]
=
tolowerW
(
work
[
i
]);
/* mk is a special case */
if
(
base
.
nScheme
==
URL_SCHEME_MK
)
{
static
const
WCHAR
wsz
[]
=
{
':'
,
':'
,
0
};
...
...
@@ -826,7 +830,11 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative,
}
process_case
=
(
*
base
.
pszSuffix
==
'/'
||
base
.
nScheme
==
URL_SCHEME_MK
)
?
5
:
3
;
break
;
}
}
else
{
work
=
(
LPWSTR
)
relative
.
pszProtocol
;
for
(
i
=
0
;
i
<
relative
.
cchProtocol
;
i
++
)
work
[
i
]
=
tolowerW
(
work
[
i
]);
}
/* handle cases where pszRelative has scheme */
if
((
base
.
cchProtocol
==
relative
.
cchProtocol
)
&&
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment