diff --git a/patches/version-VerQueryValue/0001-version-Test-for-VerQueryValueA-try-2.patch b/patches/version-VerQueryValue/0001-version-Test-for-VerQueryValueA-try-2.patch index 9faab29e..e6f56f89 100644 --- a/patches/version-VerQueryValue/0001-version-Test-for-VerQueryValueA-try-2.patch +++ b/patches/version-VerQueryValue/0001-version-Test-for-VerQueryValueA-try-2.patch @@ -1,7 +1,7 @@ -From df1414dcc9a03f581a7c524eda84824192f72ca3 Mon Sep 17 00:00:00 2001 +From 3b4b41d03d84560e9da893815d5f4b820bdb8be9 Mon Sep 17 00:00:00 2001 From: Mark Jansen Date: Fri, 27 Feb 2015 21:24:58 +0100 -Subject: version: Test for VerQueryValueA (try 2) +Subject: [PATCH] version: Test for VerQueryValueA (try 2) This patch supersedes both '[2/2] version: Test for VerQueryValueA' and '[1/2] version: Fix wrong length reported when selecting a block. @@ -14,14 +14,14 @@ and windows' VerQueryValue when selecting a 'BLOCK' object. Implemented pointer checking and commented the binary structure as suggested by nsivov from #winehackers. --- - dlls/version/tests/info.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++ + dlls/version/tests/info.c | 124 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c -index b99a335d81a..6f16999b086 100644 +index 31d4a8d11dc..586e02d4a85 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c -@@ -578,6 +578,129 @@ static void test_VerQueryValueA(void) +@@ -715,6 +715,129 @@ static void test_VerQueryValue_EmptyData(void) HeapFree(GetProcessHeap(), 0, ver); } @@ -151,14 +151,14 @@ index b99a335d81a..6f16999b086 100644 static void test_extra_block(void) { WORD extra_block[] = { -@@ -738,6 +861,7 @@ START_TEST(info) - test_info(); +@@ -875,6 +998,7 @@ START_TEST(info) test_32bit_win(); test_VerQueryValueA(); + test_VerQueryValue_EmptyData(); + test_VerQueryValue_InvalidLength(); test_extra_block(); test_GetFileVersionInfoEx(); } -- -2.14.2 +2.47.2 diff --git a/staging/upstream-commit b/staging/upstream-commit index 701a6593..e753c189 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -32a81ee2135c67e393e49cce60ef8ebfbaefb531 +0bf15e3e0715ebda735e9857cbcb36ebc491293f