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 9ef8fa2a0bfb559475e17d2562892085f0e2a90f

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-06-22 10:17:35 +10:00
parent c3a5e9290e
commit 7c9f9bc0c1
6 changed files with 57 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,8 @@
From 51710ebbc5afe6c6e9eb4a74dda121b8355f4f33 Mon Sep 17 00:00:00 2001
From 77f892d376d01bce431b582e046f6bc1c34a824f 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.
Subject: [PATCH] wininet: Resize buffer when call to InternetCanonicalizeUrlW
fails in InternetCrackUrlW.
---
dlls/wininet/internet.c | 21 ++++++++++++++++++---
@@ -10,10 +10,10 @@ Subject: wininet: Resize buffer when call to InternetCanonicalizeUrlW fails in
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 4e1f3b9..c525b79 100644
index 0a0f8a7..1fbfd66 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -1666,7 +1666,7 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF
@@ -1664,7 +1664,7 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF
if (dwFlags & ICU_DECODE)
{
@@ -22,7 +22,7 @@ index 4e1f3b9..c525b79 100644
DWORD len = dwUrlLength + 1;
BOOL ret;
@@ -1675,9 +1675,24 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF
@@ -1673,9 +1673,24 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF
SetLastError(ERROR_OUTOFMEMORY);
return FALSE;
}
@@ -50,12 +50,12 @@ index 4e1f3b9..c525b79 100644
return ret;
}
diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c
index 7b1fd72..b774f1b 100644
index 18c77b6..19ae7c3 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]);
comp.dwUrlPathLength = ARRAY_SIZE(urlpart);
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));
@@ -67,5 +67,5 @@ index 7b1fd72..b774f1b 100644
static void fill_url_components(URL_COMPONENTSA *lpUrlComponents)
--
2.8.0
1.9.1