wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 330dc601978922aa1d5864d29d94882d6b1990d1.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2022-03-12 11:27:46 +11:00
parent 0e1d830578
commit f077cbe2d3
28 changed files with 467 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From a929cd0341d3b2a340a94fa74259676a43e21e06 Mon Sep 17 00:00:00 2001
From 1d120cc8d5c61d0642ac7d186b5cd172eadece08 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
@ -51,7 +51,7 @@ index b5b60054f2c..50524cf43e0 100644
}
needed--;
diff --git a/dlls/shdocvw/tests/shdocvw.c b/dlls/shdocvw/tests/shdocvw.c
index d54cf1613ac..167fcf1a92c 100644
index fcfd4a644db..f010062ac31 100644
--- a/dlls/shdocvw/tests/shdocvw.c
+++ b/dlls/shdocvw/tests/shdocvw.c
@@ -212,13 +212,13 @@ static void test_ParseURLFromOutsideSourceA(void)
@ -65,9 +65,9 @@ index d54cf1613ac..167fcf1a92c 100644
- ok( res != 0 && len == ParseURL_table[i].len &&
+ ok( res == (ParseURL_table[i].len+1) && len == ParseURL_table[i].len &&
!lstrcmpA(buffer, ParseURL_table[i].newurl),
- "#%d: got %d and %d with '%s' (expected '!=0' and %d with '%s')\n",
- "#%d: got %ld and %ld with '%s' (expected '!=0' and %ld with '%s')\n",
- i, res, len, buffer, ParseURL_table[i].len, ParseURL_table[i].newurl);
+ "#%d: got %d and %d with '%s' (expected %d and %d with '%s')\n",
+ "#%d: got %ld and %ld with '%s' (expected %ld and %ld with '%s')\n",
+ i, res, len, buffer, ParseURL_table[i].len+1, ParseURL_table[i].len, ParseURL_table[i].newurl);
@ -82,11 +82,11 @@ index d54cf1613ac..167fcf1a92c 100644
- ok( res != 0 && len == ParseURL_table[0].len &&
+ ok( res == 1 && len == ParseURL_table[0].len &&
!lstrcmpA(bufferA, ParseURL_table[0].newurl),
- "got %d and %d with '%s' (expected '!=0' and %d with '%s')\n",
+ "got %d and %d with '%s' (expected 1 and %d with '%s')\n",
- "got %ld and %ld with '%s' (expected '!=0' and %ld with '%s')\n",
+ "got %ld and %ld with '%s' (expected 1 and %d with '%s')\n",
res, len, bufferA, ParseURL_table[0].len, ParseURL_table[0].newurl);
--
2.34.1
2.35.1