wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 40b7831cd80607e42b9e1c910a62f022c45ac884.

Browse Source
This commit is contained in:
Sebastian Lackner 2017-11-02 09:00:51 +01:00
parent a44a43769b
commit 8596e77b21
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "d0f2361170d140ad2510bb26ad187d30fd1c1afa"
echo "40b7831cd80607e42b9e1c910a62f022c45ac884"
}
# Show version information

17
patches/version-VerQueryValue/0001-version-Test-for-VerQueryValueA-try-2.patch
View File

@ -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