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

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2022-02-19 14:06:25 +11:00
parent dec87df6ec
commit 99c88fee27
5 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 64c5030300ca302fcc36f471feb27d9e46b56f30 Mon Sep 17 00:00:00 2001
From a929cd0341d3b2a340a94fa74259676a43e21e06 Mon Sep 17 00:00:00 2001
From: Christian Costa <titan.costa@gmail.com>
Date: Tue, 3 Sep 2013 23:28:14 +0200
Subject: [PATCH] shdocvw: Check precisely ParseURLFromOutsideSourceX returned
@@ -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 52c622c609..ef9e3a7dfb 100644
index b5b60054f2c..50524cf43e0 100644
--- a/dlls/shdocvw/shdocvw_main.c
+++ b/dlls/shdocvw/shdocvw_main.c
@@ -379,8 +379,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L
@@ -344,8 +344,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L
HRESULT hr;
DWORD needed;
DWORD len;
@@ -26,11 +26,11 @@ index 52c622c609..ef9e3a7dfb 100644
-
+ DWORD res;
TRACE("(%s, %p, %p, %p) len: %d, unknown: 0x%x\n", debugstr_w(url), out, plen, unknown,
TRACE("(%s, %p, %p, %p) len: %ld, unknown: 0x%lx\n", debugstr_w(url), out, plen, unknown,
plen ? *plen : 0, unknown ? *unknown : 0);
@@ -406,10 +405,12 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L
@@ -371,10 +370,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);
TRACE("got 0x%lx with %s (need %ld)\n", hr, debugstr_w(buffer_out), needed);
+ res = 0;
if (*plen >= needed) {
@@ -42,7 +42,7 @@ index 52c622c609..ef9e3a7dfb 100644
}
needed--;
}
@@ -452,6 +453,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD
@@ -417,6 +418,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 52c622c609..ef9e3a7dfb 100644
}
needed--;
diff --git a/dlls/shdocvw/tests/shdocvw.c b/dlls/shdocvw/tests/shdocvw.c
index d54cf1613a..167fcf1a92 100644
index d54cf1613ac..167fcf1a92c 100644
--- a/dlls/shdocvw/tests/shdocvw.c
+++ b/dlls/shdocvw/tests/shdocvw.c
@@ -212,13 +212,13 @@ static void test_ParseURLFromOutsideSourceA(void)
@@ -88,5 +88,5 @@ index d54cf1613a..167fcf1a92 100644
--
2.17.1
2.34.1