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 5fd3090f522a9c2a4cfb077c9b7cdc1ae1304c4c

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-06-06 08:44:57 +10:00
parent 5ffb34bc71
commit 6b93eac6ad
6 changed files with 11 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/shdocvw-ParseURLFromOutsideSource_Tests/0001-shdocvw-Check-precisely-ParseURLFromOutsideSourceX-r.patch
View File

@@ -1,8 +1,8 @@
From 8c77eaf04997422d4febc835d0331dba89a17a79 Mon Sep 17 00:00:00 2001
From 64c5030300ca302fcc36f471feb27d9e46b56f30 Mon Sep 17 00:00:00 2001
From: Christian Costa <titan.costa@gmail.com>
Date: Tue, 3 Sep 2013 23:28:14 +0200
Subject: shdocvw: Check precisely ParseURLFromOutsideSourceX returned values
in tests and make code clearer about that. (try 3)
Subject: [PATCH] shdocvw: Check precisely ParseURLFromOutsideSourceX returned
values in tests and make code clearer about that. (try 3)
Try 3:
- fix test check for ansi version
@@ -15,10 +15,10 @@ Try 2:
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c
index 3ce5df1..8020526 100644
index 52c622c609..ef9e3a7dfb 100644
--- a/dlls/shdocvw/shdocvw_main.c
+++ b/dlls/shdocvw/shdocvw_main.c
@@ -378,8 +378,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L
@@ -379,8 +379,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L
HRESULT hr;
DWORD needed;
DWORD len;
@@ -28,7 +28,7 @@ index 3ce5df1..8020526 100644
TRACE("(%s, %p, %p, %p) len: %d, unknown: 0x%x\n", debugstr_w(url), out, plen, unknown,
plen ? *plen : 0, unknown ? *unknown : 0);
@@ -405,10 +404,12 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L
@@ -406,10 +405,12 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L
needed = lstrlenW(buffer_out)+1;
TRACE("got 0x%x with %s (need %d)\n", hr, debugstr_w(buffer_out), needed);
@@ -42,7 +42,7 @@ index 3ce5df1..8020526 100644
}
needed--;
}
@@ -451,6 +452,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD
@@ -452,6 +453,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD
if (*plen >= needed) {
if (out != NULL) {
WideCharToMultiByte(CP_ACP, 0, buffer, -1, out, *plen, NULL, NULL);
@@ -51,7 +51,7 @@ index 3ce5df1..8020526 100644
}
needed--;
diff --git a/dlls/shdocvw/tests/shdocvw.c b/dlls/shdocvw/tests/shdocvw.c
index 7b4eccf..cdf1814 100644
index d54cf1613a..167fcf1a92 100644
--- a/dlls/shdocvw/tests/shdocvw.c
+++ b/dlls/shdocvw/tests/shdocvw.c
@@ -212,13 +212,13 @@ static void test_ParseURLFromOutsideSourceA(void)
@@ -74,7 +74,7 @@ index 7b4eccf..cdf1814 100644
/* use the size test only for the first examples */
@@ -308,11 +308,12 @@ static void test_ParseURLFromOutsideSourceW(void)
/* len is in characters */
len = sizeof(bufferW)/sizeof(bufferW[0]);
len = ARRAY_SIZE(bufferW);
dummy = 0;
+ /* on success, 1 is returned for unicode version */
res = pParseURLFromOutsideSourceW(urlW, bufferW, &len, &dummy);
@@ -88,5 +88,5 @@ index 7b4eccf..cdf1814 100644
--
2.1.2
2.17.1