From 8596e77b21c247a2d49a4cfe0316d1e199f12ce1 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Thu, 2 Nov 2017 09:00:51 +0100
Subject: [PATCH] Rebase against 40b7831cd80607e42b9e1c910a62f022c45ac884.

---
 patches/patchinstall.sh                         |  2 +-
 ...-version-Test-for-VerQueryValueA-try-2.patch | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 988aa3a4..daa053b6 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "d0f2361170d140ad2510bb26ad187d30fd1c1afa"
+	echo "40b7831cd80607e42b9e1c910a62f022c45ac884"
 }
 
 # Show version information
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 09ac6d18..934ab4bc 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,4 +1,4 @@
-From 0aa5808311611480120f1e07614ba0dca286d26c Mon Sep 17 00:00:00 2001
+From df1414dcc9a03f581a7c524eda84824192f72ca3 Mon Sep 17 00:00:00 2001
 From: Mark Jansen <learn0more+wine@gmail.com>
 Date: Fri, 27 Feb 2015 21:24:58 +0100
 Subject: version: Test for VerQueryValueA (try 2)
@@ -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 | 127 ++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 127 insertions(+)
+ 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 d3420bcbbe3..9c850e6f637 100644
+index b99a335d81a..6f16999b086 100644
 --- a/dlls/version/tests/info.c
 +++ b/dlls/version/tests/info.c
-@@ -577,6 +577,132 @@ static void test_VerQueryValueA(void)
+@@ -578,6 +578,129 @@ static void test_VerQueryValueA(void)
      HeapFree(GetProcessHeap(), 0, ver);
  }
  
@@ -97,7 +97,6 @@ index d3420bcbbe3..9c850e6f637 100644
 +    SetLastError(0xdeadbeef);
 +    ret = VerQueryValueA(preparedbuffer, "StringFileInfo", (LPVOID *)&p, &len);
 +    ok(ret, "VerQueryValueA error %u\n", GetLastError());
-+    todo_wine
 +    ok(len == 0, "VerQueryValueA returned %u, expected 0\n", len);
 +    todo_wine
 +    ok(p == preparedbuffer + 0x7e, "p was %p, expected %p\n", p, preparedbuffer + 0x7e);
@@ -107,7 +106,6 @@ index d3420bcbbe3..9c850e6f637 100644
 +    SetLastError(0xdeadbeef);
 +    ret = VerQueryValueA(preparedbuffer, "\\StringFileInfo", (LPVOID *)&p, &len);
 +    ok(ret, "VerQueryValueA error %u\n", GetLastError());
-+    todo_wine
 +    ok(len == 0, "VerQueryValueA returned %u, expected 0\n", len);
 +    todo_wine
 +    ok(p == preparedbuffer + 0x7e, "p was %p, expected %p\n", p, preparedbuffer + 0x7e);
@@ -117,7 +115,6 @@ index d3420bcbbe3..9c850e6f637 100644
 +    SetLastError(0xdeadbeef);
 +    ret = VerQueryValueA(preparedbuffer, "\\\\StringFileInfo", (LPVOID *)&p, &len);
 +    ok(ret, "VerQueryValueA error %u\n", GetLastError());
-+    todo_wine
 +    ok(len == 0, "VerQueryValueA returned %u, expected 0\n", len);
 +    todo_wine
 +    ok(p == preparedbuffer + 0x7e, "p was %p, expected %p\n", p, preparedbuffer + 0x7e);
@@ -154,7 +151,7 @@ index d3420bcbbe3..9c850e6f637 100644
  static void test_extra_block(void)
  {
      WORD extra_block[] = {
-@@ -730,6 +856,7 @@ START_TEST(info)
+@@ -738,6 +861,7 @@ START_TEST(info)
      test_info();
      test_32bit_win();
      test_VerQueryValueA();
@@ -163,5 +160,5 @@ index d3420bcbbe3..9c850e6f637 100644
      test_GetFileVersionInfoEx();
  }
 -- 
-2.11.0
+2.14.2