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 21c4a25437969696cbf5ffecee191ba8302bb2dd.

Browse Source
This commit is contained in:
Zebediah Figura
2021-08-30 22:26:36 -05:00
parent 931daeffec
commit 24319dc308
8 changed files with 137 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/shlwapi-UrlCombine/0001-shlwapi-tests-Add-additional-tests-for-UrlCombine-and-.patch
View File

@@ -1,4 +1,4 @@
From 95dcb9cf88979d5894c300a71a080470dcefde87 Mon Sep 17 00:00:00 2001
From ba33fe7790adb2bbd335470b00a419bf051d9ae0 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 17 Jan 2014 01:19:41 +0100
Subject: [PATCH] shlwapi/tests: Add additional tests for UrlCombine and
@@ -9,7 +9,7 @@ Subject: [PATCH] shlwapi/tests: Add additional tests for UrlCombine and
1 file changed, 36 insertions(+), 10 deletions(-)
diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c
index 96635c98361..90e0d2e1b10 100644
index 4f1f15b6e2c..04281a7a77d 100644
--- a/dlls/shlwapi/tests/url.c
+++ b/dlls/shlwapi/tests/url.c
@@ -209,6 +209,14 @@ static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = {
@@ -51,7 +51,7 @@ index 96635c98361..90e0d2e1b10 100644
{"file:///C:\\dir\\file.txt", "test.txt", 0, S_OK, "file:///C:/dir/test.txt"},
{"file:///C:\\dir\\file.txt#hash\\hash", "test.txt", 0, S_OK, "file:///C:/dir/file.txt#hash/test.txt"},
{"file:///C:\\dir\\file.html#hash\\hash", "test.html", 0, S_OK, "file:///C:/dir/test.html"},
@@ -1201,7 +1219,7 @@ static void test_UrlCanonicalizeW(void)
@@ -1233,7 +1251,7 @@ static void test_UrlCanonicalizeW(void)
/* ########################### */
@@ -60,7 +60,7 @@ index 96635c98361..90e0d2e1b10 100644
{
HRESULT hr;
CHAR szReturnUrl[INTERNET_MAX_URL_LENGTH];
@@ -1226,34 +1244,42 @@ static void test_url_combine(const char *szUrl1, const char *szUrl2, DWORD dwFla
@@ -1258,34 +1276,42 @@ static void test_url_combine(const char *szUrl1, const char *szUrl2, DWORD dwFla
dwSize = 0;
hr = pUrlCombineA(szUrl1, szUrl2, NULL, &dwSize, dwFlags);
ok(hr == E_POINTER, "Checking length of string, return was 0x%08x, expected 0x%08x\n", hr, E_POINTER);
@@ -110,8 +110,8 @@ index 96635c98361..90e0d2e1b10 100644
+ ok(todo || dwSize == dwExpectLen, "Got length %d, expected %d\n", dwSize, dwExpectLen);
if(SUCCEEDED(hr)) {
wszConvertedUrl = GetWideString(szReturnUrl);
ok(lstrcmpW(wszReturnUrl, wszConvertedUrl)==0, "Strings didn't match between ascii and unicode UrlCombine!\n");
@@ -1273,7 +1299,7 @@ static void test_UrlCombine(void)
ok(lstrcmpW(wszReturnUrl, wszConvertedUrl)==0, "Strings didn't match between ansi and unicode UrlCombine!\n");
@@ -1305,7 +1331,7 @@ static void test_UrlCombine(void)
unsigned int i;
for (i = 0; i < ARRAY_SIZE(TEST_COMBINE); i++) {
test_url_combine(TEST_COMBINE[i].url1, TEST_COMBINE[i].url2, TEST_COMBINE[i].flags,
@@ -121,5 +121,5 @@ index 96635c98361..90e0d2e1b10 100644
}
--
2.17.1
2.33.0

1
patches/shlwapi-UrlCombine/definition
View File

@@ -1 +1,2 @@
Fixes: Workaround for shlwapi URLs with relative paths
Depends: shlwapi-UrlCanonicalize