wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against d9f3ea328785d4146a095ce2efbdbb7c1f69f1cf.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2022-02-10 11:11:48 +11:00
parent 00b2e468d3
commit b5193cb799
8 changed files with 146 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
patches/shlwapi-UrlCanonicalize/0001-shlwapi-Support-.-in-UrlCanonicalize.patch
View File

@@ -1,4 +1,4 @@
From d1a351c80c4c8c7133d76ace60271736d5220c01 Mon Sep 17 00:00:00 2001
From ad58ff0d742084c451a36ba46c53363752fcb8aa Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Fri, 28 Jun 2019 09:57:31 +1000
Subject: [PATCH] shlwapi: Support ./ in UrlCanonicalize.
@@ -11,10 +11,10 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
2 files changed, 19 insertions(+)
diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c
index 82708be544..83922c0278 100644
index 5f983895576..07457dcfc1b 100644
--- a/dlls/kernelbase/path.c
+++ b/dlls/kernelbase/path.c
@@ -3593,6 +3593,7 @@ HRESULT WINAPI UrlCanonicalizeW(const WCHAR *src_url, WCHAR *canonicalized, DWOR
@@ -3562,6 +3562,7 @@ HRESULT WINAPI UrlCanonicalizeW(const WCHAR *src_url, WCHAR *canonicalized, DWOR
* 4 have // 5,3
* 5 have 1[+] alnum 6,3
* 6 have location (found /) save root location
@@ -22,7 +22,7 @@ index 82708be544..83922c0278 100644
*/
wk1 = url;
@@ -3619,6 +3620,11 @@ HRESULT WINAPI UrlCanonicalizeW(const WCHAR *src_url, WCHAR *canonicalized, DWOR
@@ -3588,6 +3589,11 @@ HRESULT WINAPI UrlCanonicalizeW(const WCHAR *src_url, WCHAR *canonicalized, DWOR
state = 5;
is_file_url = TRUE;
}
@@ -34,7 +34,7 @@ index 82708be544..83922c0278 100644
while (*wk1)
{
@@ -3823,6 +3829,15 @@ HRESULT WINAPI UrlCanonicalizeW(const WCHAR *src_url, WCHAR *canonicalized, DWOR
@@ -3792,6 +3798,15 @@ HRESULT WINAPI UrlCanonicalizeW(const WCHAR *src_url, WCHAR *canonicalized, DWOR
}
*wk2 = '\0';
break;
@@ -51,20 +51,20 @@ index 82708be544..83922c0278 100644
FIXME("how did we get here - state=%d\n", state);
heap_free(url_copy);
diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c
index d30737f60a..96635c9836 100644
index 703bdcd0a55..eea254442c6 100644
--- a/dlls/shlwapi/tests/url.c
+++ b/dlls/shlwapi/tests/url.c
@@ -204,6 +204,10 @@ static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = {
{"///A/../B", URL_WININET_COMPATIBILITY, S_OK, "///B", FALSE},
{"A", 0, S_OK, "A", FALSE},
{"../A", 0, S_OK, "../A", FALSE},
+ {"./A", 0, S_OK, "A", FALSE},
+ {"./A/./B", 0, S_OK, "A/B", FALSE},
+ {"./A", URL_DONT_SIMPLIFY, S_OK, "./A", FALSE},
+ {"A/./B", 0, S_OK, "A/B", TRUE},
{"A/../B", 0, S_OK, "B", TRUE},
{"/uri-res/N2R?urn:sha1:B3K", URL_DONT_ESCAPE_EXTRA_INFO | URL_WININET_COMPATIBILITY /*0x82000000*/, S_OK, "/uri-res/N2R?urn:sha1:B3K", FALSE} /*LimeWire online installer calls this*/,
{"http:www.winehq.org/dir/../index.html", 0, S_OK, "http:www.winehq.org/index.html"},
@@ -185,6 +185,10 @@ static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = {
{"///A/../B", URL_WININET_COMPATIBILITY, "///B", FALSE},
{"A", 0, "A", FALSE},
{"../A", 0, "../A", FALSE},
+ {"./A", 0, "A", FALSE},
+ {"./A/./B", 0, "A/B", FALSE},
+ {"./A", URL_DONT_SIMPLIFY, "./A", FALSE},
+ {"A/./B", 0, "A/B", TRUE},
{"A/../B", 0, "B", TRUE},
{"/uri-res/N2R?urn:sha1:B3K", URL_DONT_ESCAPE_EXTRA_INFO | URL_WININET_COMPATIBILITY /*0x82000000*/, "/uri-res/N2R?urn:sha1:B3K", FALSE} /*LimeWire online installer calls this*/,
{"http:www.winehq.org/dir/../index.html", 0, "http:www.winehq.org/index.html"},
--
2.17.1
2.34.1