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 abb221fa81b60f53c14f6864bbfb9453455aeeeb.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-07-10 00:46:11 +02:00
parent a0cb1797f4
commit a3e5cd8f58
5 changed files with 30 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/wininet-InternetCrackUrlW/0001-wininet-Set-lpszUrlPath-to-the-end-of-the-string-in-.patch
View File

@@ -1,26 +0,0 @@
From 17acd93aa2405f5c5032f982e77174e4133c8a36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 16 May 2016 22:34:53 +0200
Subject: wininet: Set lpszUrlPath to the end of the string in
InternetCrackUrlW when dwUrlPathLength > 0.
---
dlls/wininet/internet.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 5359794..8149973 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -1941,6 +1941,8 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF
{
if (lpUC->lpszUrlPath && (lpUC->dwUrlPathLength > 0))
lpUC->lpszUrlPath[0] = 0;
+ else if (lpUC->dwUrlPathLength > 0)
+ lpUC->lpszUrlPath = (WCHAR*)lpszcp;
lpUC->dwUrlPathLength = 0;
}
--
2.8.0

30
patches/wininet-InternetCrackUrlW/0002-wininet-Resize-buffer-when-call-to-InternetCanonical.patch
View File

@@ -1,18 +1,19 @@
From 3179cb380b56e3a86385a32ad4b7a3430ff6ae8b Mon Sep 17 00:00:00 2001
From 51710ebbc5afe6c6e9eb4a74dda121b8355f4f33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 16 May 2016 22:36:25 +0200
Subject: wininet: Resize buffer when call to InternetCanonicalizeUrlW fails in
InternetCrackUrlW.
---
dlls/wininet/internet.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
dlls/wininet/internet.c | 21 ++++++++++++++++++---
dlls/wininet/tests/url.c | 6 +++---
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 8149973..e7dc577 100644
index 4e1f3b9..c525b79 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -1688,7 +1688,7 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF
@@ -1666,7 +1666,7 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF
if (dwFlags & ICU_DECODE)
{
@@ -21,7 +22,7 @@ index 8149973..e7dc577 100644
DWORD len = dwUrlLength + 1;
BOOL ret;
@@ -1697,9 +1697,24 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF
@@ -1675,9 +1675,24 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF
SetLastError(ERROR_OUTOFMEMORY);
return FALSE;
}
@@ -48,6 +49,23 @@ index 8149973..e7dc577 100644
heap_free(url_tmp);
return ret;
}
diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c
index 7b1fd72..b774f1b 100644
--- a/dlls/wininet/tests/url.c
+++ b/dlls/wininet/tests/url.c
@@ -816,9 +816,9 @@ static void InternetCrackUrlW_test(void)
comp.lpszUrlPath = urlpart;
comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]);
r = InternetCrackUrlW(url3, 0, ICU_DECODE, &comp);
- todo_wine ok(r, "InternetCrackUrlW failed unexpectedly\n");
- todo_wine ok(!strcmp_wa(host, "x.org"), "host is %s, should be x.org\n", wine_dbgstr_w(host));
- ok(urlpart[0] == 0, "urlpart should be empty\n");
+ ok(r, "InternetCrackUrlW failed unexpectedly\n");
+ ok(!strcmp_wa(host, "x.org"), "host is %s, should be x.org\n", wine_dbgstr_w(host));
+ todo_wine ok(urlpart[0] == 0, "urlpart should be empty\n");
}
static void fill_url_components(URL_COMPONENTSA *lpUrlComponents)
--
2.8.0

27
patches/wininet-InternetCrackUrlW/0004-wininet-tests-Add-test-to-verify-correct-handling-of.patch
View File

@@ -1,27 +0,0 @@
From 0fda54552d97d22985e050c0c3b9cca36142c945 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 16 May 2016 22:40:28 +0200
Subject: wininet/tests: Add test to verify correct handling of urls without a
path component.
---
dlls/wininet/tests/url.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c
index 00a457a..0af1d77 100644
--- a/dlls/wininet/tests/url.c
+++ b/dlls/wininet/tests/url.c
@@ -130,6 +130,9 @@ static const crack_url_test_t crack_url_tests[] = {
{"HtTp://www.winehq.org/scheme",
0, 4, INTERNET_SCHEME_HTTP, 7, 14, 23, 80, -1, 0, -1, 0, 21, 7, -1, 0,
"HtTp", "www.winehq.org", "", "", "/scheme", ""},
+ {"http://www.winehq.org",
+ 0, 4, INTERNET_SCHEME_HTTP, 7, 14, 23, 80, -1, 0, -1, 0, 21, 0, -1, 0,
+ "http", "www.winehq.org", "", "", "", ""},
{"file:///C:/Program%20Files/Atmel/AVR%20Tools/STK500/STK500.xml",
0, 4, INTERNET_SCHEME_FILE, -1, 0, -1, 0, -1, 0, -1, 0, 7, 55, -1, 0,
"file", "", "", "", "C:\\Program Files\\Atmel\\AVR Tools\\STK500\\STK500.xml", ""},
--
2.8.0