wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against d3a71dec7ee99e9c65630d080c02d7d4182e61a6

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2018-05-31 09:12:45 +10:00
parent d28e1388c0
commit b69aa1fa72
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
patches/dxdiagn-GetChildContainer_Leaf_Nodes/0001-dxdiagn-Calling-GetChildContainer-with-an-empty-stri.patch
View File

@ -1,8 +1,8 @@
From 0b45d42b25aecc86e19aba20d9114b4c76947c9c Mon Sep 17 00:00:00 2001
From 2c3c01aeaef843cbebf27f6c72384bbd353755a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 15 Aug 2015 03:58:04 +0200
Subject: dxdiagn: Calling GetChildContainer with an empty string on a leaf
container returns the object itself
Subject: [PATCH] dxdiagn: Calling GetChildContainer with an empty string on a
leaf container returns the object itself
---
dlls/dxdiagn/container.c | 12 ++++++++++--
@ -47,7 +47,7 @@ index d167043..6e068e5 100644
return hr;
}
diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c
index 2ffe0fb..aab6122 100644
index c80717c..7f09fb5 100644
--- a/dlls/dxdiagn/tests/container.c
+++ b/dlls/dxdiagn/tests/container.c
@@ -901,7 +901,8 @@ static void test_DxDiag_SystemInfo(void)
@ -73,7 +73,7 @@ index 2ffe0fb..aab6122 100644
@@ -917,6 +921,14 @@ static void test_DxDiag_SystemInfo(void)
{
trace("Testing container DxDiag_SystemInfo\n");
test_container_properties(container, property_tests, sizeof(property_tests)/sizeof(property_tests[0]));
test_container_properties(container, property_tests, ARRAY_SIZE(property_tests));
+
+ container2 = NULL;
+ hr = IDxDiagContainer_GetChildContainer(container, empty, &container2);
@ -85,7 +85,7 @@ index 2ffe0fb..aab6122 100644
IDxDiagContainer_Release(container);
}
@@ -1031,6 +1043,7 @@ static void test_DxDiag_SoundDevices(void)
@@ -1033,6 +1045,7 @@ static void test_DxDiag_SoundDevices(void)
static const WCHAR szGuidDeviceID[] = {'s','z','G','u','i','d','D','e','v','i','c','e','I','D',0};
static const WCHAR szDriverPath[] = {'s','z','D','r','i','v','e','r','P','a','t','h',0};
static const WCHAR szDriverName[] = {'s','z','D','r','i','v','e','r','N','a','m','e',0};
@ -93,7 +93,7 @@ index 2ffe0fb..aab6122 100644
static const struct property_test property_tests[] =
{
@@ -1070,7 +1083,7 @@ static void test_DxDiag_SoundDevices(void)
@@ -1072,7 +1085,7 @@ static void test_DxDiag_SoundDevices(void)
for (i = 0; i < count; i++)
{
WCHAR child_container[256];
@ -102,7 +102,7 @@ index 2ffe0fb..aab6122 100644
hr = IDxDiagContainer_EnumChildContainerNames(sound_cont, i, child_container, sizeof(child_container)/sizeof(WCHAR));
ok(hr == S_OK, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr);
@@ -1083,6 +1096,14 @@ static void test_DxDiag_SoundDevices(void)
@@ -1085,6 +1098,14 @@ static void test_DxDiag_SoundDevices(void)
trace("Testing container %s\n", wine_dbgstr_w(child_container));
test_container_properties(child, property_tests, sizeof(property_tests)/sizeof(property_tests[0]));
}
@ -118,5 +118,5 @@ index 2ffe0fb..aab6122 100644
}
--
2.5.0
1.9.1

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "37e837113ce6654c436211031712719e8f9f29a2"
echo "d3a71dec7ee99e9c65630d080c02d7d4182e61a6"
}
# Show version information