Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sam Joan Roque-Worcel
wine
Commits
69cf835c
Commit
69cf835c
authored
21 years ago
by
Uwe Bonnes
Committed by
Alexandre Julliard
21 years ago
Browse files
Options
Downloads
Patches
Plain Diff
UrlCanonicalizeW: Remove \r and \n at the end of lpszUrlCpy, with test
cases.
parent
25efbc9d
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/shlwapi/tests/path.c
+44
-3
44 additions, 3 deletions
dlls/shlwapi/tests/path.c
dlls/shlwapi/url.c
+3
-0
3 additions, 0 deletions
dlls/shlwapi/url.c
with
47 additions
and
3 deletions
dlls/shlwapi/tests/path.c
+
44
−
3
View file @
69cf835c
...
...
@@ -43,6 +43,10 @@ typedef struct _TEST_URL_CANONICALIZE {
const
TEST_URL_CANONICALIZE
TEST_CANONICALIZE
[]
=
{
{
"http://www.winehq.org/tests/../tests"
,
0
,
S_OK
,
"http://www.winehq.org/tests"
},
{
"http://www.winehq.org/tests
\n
"
,
URL_WININET_COMPATIBILITY
|
URL_ESCAPE_SPACES_ONLY
|
URL_ESCAPE_UNSAFE
,
S_OK
,
"http://www.winehq.org/tests"
},
{
"http://www.winehq.org/tests
\r
"
,
URL_WININET_COMPATIBILITY
|
URL_ESCAPE_SPACES_ONLY
|
URL_ESCAPE_UNSAFE
,
S_OK
,
"http://www.winehq.org/tests"
},
{
"http://www.winehq.org/tests
\r
"
,
0
,
S_OK
,
"http://www.winehq.org/tests"
},
{
"http://www.winehq.org/tests
\r
"
,
URL_DONT_SIMPLIFY
,
S_OK
,
"http://www.winehq.org/tests"
},
{
"http://www.winehq.org/tests/../tests/"
,
0
,
S_OK
,
"http://www.winehq.org/tests/"
},
{
"http://www.winehq.org/tests/../tests/.."
,
0
,
S_OK
,
"http://www.winehq.org/"
},
{
"http://www.winehq.org/tests/../tests/../"
,
0
,
S_OK
,
"http://www.winehq.org/"
},
...
...
@@ -55,6 +59,24 @@ const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = {
{
"http://www.winehq.org/tests/../#example"
,
URL_DONT_SIMPLIFY
,
S_OK
,
"http://www.winehq.org/tests/../#example"
},
};
typedef
struct
_TEST_URL_ESCAPE
{
char
*
url
;
DWORD
flags
;
DWORD
expectescaped
;
HRESULT
expectret
;
char
*
expecturl
;
}
TEST_URL_ESCAPE
;
const
TEST_URL_ESCAPE
TEST_ESCAPE
[]
=
{
{
"http://www.winehq.org/tests0"
,
0
,
0
,
S_OK
,
"http://www.winehq.org/tests0"
},
{
"http://www.winehq.org/tests1
\n
"
,
0
,
0
,
S_OK
,
"http://www.winehq.org/tests1%0A"
},
{
"http://www.winehq.org/tests2
\r
"
,
0
,
0
,
S_OK
,
"http://www.winehq.org/tests2%0D"
},
{
"http://www.winehq.org/tests3
\r
"
,
URL_ESCAPE_SPACES_ONLY
|
URL_ESCAPE_UNSAFE
,
0
,
S_OK
,
"http://www.winehq.org/tests3
\r
"
},
{
"http://www.winehq.org/tests4
\r
"
,
URL_ESCAPE_SPACES_ONLY
,
0
,
S_OK
,
"http://www.winehq.org/tests4
\r
"
},
{
"http://www.winehq.org/tests5
\r
"
,
URL_WININET_COMPATIBILITY
|
URL_ESCAPE_SPACES_ONLY
,
0
,
S_OK
,
"http://www.winehq.org/tests5
\r
"
},
{
"/direct/swhelp/series6/6.2i_latestservicepack.dat
\r
"
,
URL_ESCAPE_SPACES_ONLY
,
0
,
S_OK
,
"/direct/swhelp/series6/6.2i_latestservicepack.dat
\r
"
},
};
static
LPWSTR
GetWideString
(
const
char
*
szString
)
{
LPWSTR
wszString
=
(
LPWSTR
)
HeapAlloc
(
GetProcessHeap
(),
0
,
...
...
@@ -102,7 +124,7 @@ static void test_url_part(const char* szUrl, DWORD dwPart, DWORD dwFlags, const
DWORD
dwSize
;
dwSize
=
INTERNET_MAX_URL_LENGTH
;
ok
(
UrlGetPartA
(
szUrl
,
szPart
,
&
dwSize
,
dwPart
,
dwFlags
)
==
S_OK
,
"UrlGetPartA
didn't return S_OK
\n
"
);
ok
(
UrlGetPartA
(
szUrl
,
szPart
,
&
dwSize
,
dwPart
,
dwFlags
)
==
S_OK
,
"UrlGetPartA
for
\"
%s
\"
part 0x%08lx didn't return S_OK but
\"
%s
\"\n
"
,
szUrl
,
dwPart
,
szPart
);
dwSize
=
INTERNET_MAX_URL_LENGTH
;
ok
(
UrlGetPartW
(
wszUrl
,
wszPart
,
&
dwSize
,
dwPart
,
dwFlags
)
==
S_OK
,
"UrlGetPartW didn't return S_OK
\n
"
);
...
...
@@ -129,6 +151,15 @@ static void test_UrlGetPart(void)
test_url_part
(
TEST_URL_3
,
URL_PART_QUERY
,
0
,
"?query=x&return=y"
);
}
static
void
test_url_escape
(
const
char
*
szUrl
,
DWORD
dwFlags
,
HRESULT
dwExpectReturn
,
const
char
*
szExpectUrl
)
{
CHAR
szReturnUrl
[
INTERNET_MAX_URL_LENGTH
];
DWORD
dwEscaped
;
dwEscaped
=
INTERNET_MAX_URL_LENGTH
;
ok
(
UrlEscapeA
(
szUrl
,
szReturnUrl
,
&
dwEscaped
,
dwFlags
)
==
dwExpectReturn
,
"UrlEscapeA didn't return 0x%08lx
\n
"
,
dwExpectReturn
);
ok
(
strcmp
(
szReturnUrl
,
szExpectUrl
)
==
0
,
"Expected
\"
%s
\"
, but got
\"
%s
\"\n
"
,
szExpectUrl
,
szReturnUrl
);
}
static
void
test_url_canonicalize
(
const
char
*
szUrl
,
DWORD
dwFlags
,
HRESULT
dwExpectReturn
,
const
char
*
szExpectUrl
)
{
CHAR
szReturnUrl
[
INTERNET_MAX_URL_LENGTH
];
...
...
@@ -141,20 +172,29 @@ static void test_url_canonicalize(const char *szUrl, DWORD dwFlags, HRESULT dwEx
dwSize
=
INTERNET_MAX_URL_LENGTH
;
ok
(
UrlCanonicalizeA
(
szUrl
,
szReturnUrl
,
&
dwSize
,
dwFlags
)
==
dwExpectReturn
,
"UrlCanonicalizeA didn't return 0x%08lx
\n
"
,
dwExpectReturn
);
ok
(
strcmp
(
szReturnUrl
,
szExpectUrl
)
==
0
,
"Expected %s, but got %s
\n
"
,
szExpectUrl
,
szReturnUrl
);
dwSize
=
INTERNET_MAX_URL_LENGTH
;
ok
(
UrlCanonicalizeW
(
wszUrl
,
wszReturnUrl
,
&
dwSize
,
dwFlags
)
==
dwExpectReturn
,
"UrlCanonicalizeW didn't return 0x%08lx
\n
"
,
dwExpectReturn
);
wszConvertedUrl
=
GetWideString
(
szReturnUrl
);
ok
(
strcmpW
(
wszReturnUrl
,
wszConvertedUrl
)
==
0
,
"Strings didn't match between ascii and unicode UrlCanonicalize!
\n
"
);
FreeWideString
(
wszConvertedUrl
);
ok
(
strcmp
(
szReturnUrl
,
szExpectUrl
)
==
0
,
"Expected %s, but got %s
\n
"
,
szExpectUrl
,
szReturnUrl
);
FreeWideString
(
wszUrl
);
FreeWideString
(
wszExpectUrl
);
}
static
void
test_UrlEscape
(
void
)
{
int
i
;
for
(
i
=
0
;
i
<
sizeof
(
TEST_ESCAPE
)
/
sizeof
(
TEST_ESCAPE
[
0
]);
i
++
)
{
test_url_escape
(
TEST_ESCAPE
[
i
].
url
,
TEST_ESCAPE
[
i
].
flags
,
TEST_ESCAPE
[
i
].
expectret
,
TEST_ESCAPE
[
i
].
expecturl
);
}
}
static
void
test_UrlCanonicalize
(
void
)
{
int
i
;
...
...
@@ -169,4 +209,5 @@ START_TEST(path)
test_UrlHash
();
test_UrlGetPart
();
test_UrlCanonicalize
();
test_UrlEscape
();
}
This diff is collapsed.
Click to expand it.
dlls/shlwapi/url.c
+
3
−
0
View file @
69cf835c
...
...
@@ -581,6 +581,9 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized,
TRACE
(
"Simplified, orig <%s>, simple <%s>
\n
"
,
debugstr_w
(
pszUrl
),
debugstr_w
(
lpszUrlCpy
));
}
nLen
=
lstrlenW
(
lpszUrlCpy
);
while
((
nLen
>
0
)
&&
((
lpszUrlCpy
[
nLen
-
1
]
==
'\r'
)
||
(
lpszUrlCpy
[
nLen
-
1
]
==
'\n'
)))
lpszUrlCpy
[
--
nLen
]
=
0
;
if
(
dwFlags
&
URL_UNESCAPE
)
UrlUnescapeW
(
lpszUrlCpy
,
NULL
,
NULL
,
URL_UNESCAPE_INPLACE
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment