Rebase against 238c6be5b81cbfcf8cd147b1cbb25d16803efbe1

patches/dxdiagn-Enumerate_DirectSound/0001-dxdiagn-Enumerate-DirectSound-devices-and-add-some-b.patch

@@ -1,4 +1,4 @@
-From 3c3c84a7c1ff6ba6b785bd3d70b5a93912c39d0a Mon Sep 17 00:00:00 2001
+From cec8dd343a831fb7016a219c8e7228b8872e1fb9 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 15 Aug 2015 02:59:17 +0200
 Subject: [PATCH] dxdiagn: Enumerate DirectSound devices and add some basic
@@ -22,7 +22,7 @@ index fa4b611f245..88c99803b06 100644
  EXTRADLLFLAGS = -mno-cygwin
  
 diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c
-index 6b6f4e640cc..2626e4e77cb 100644
+index 6b6f4e640cc..4ae5046b818 100644
 --- a/dlls/dxdiagn/provider.c
 +++ b/dlls/dxdiagn/provider.c
 @@ -36,6 +36,7 @@
@@ -149,7 +149,7 @@ index 6b6f4e640cc..2626e4e77cb 100644
  }
  
 diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c
-index 936707632a4..c80717cd392 100644
+index 90287ad0e74..e8d5ac33a83 100644
 --- a/dlls/dxdiagn/tests/container.c
 +++ b/dlls/dxdiagn/tests/container.c
 @@ -36,6 +36,11 @@ static IDxDiagContainer *pddc;
@@ -162,9 +162,9 @@ index 936707632a4..c80717cd392 100644
 +                                                   'D','x','D','i','a','g','_','S','o','u','n','d','C','a','p','t','u','r','e',
 +                                                   'D','e','v','i','c','e','s',0};
  
- /* Based on debugstr_variant in dlls/jscript/jsutils.c. */
- static const char *debugstr_variant(const VARIANT *var)
-@@ -1022,6 +1027,140 @@ cleanup:
+ static BOOL create_root_IDxDiagContainer(void)
+ {
+@@ -993,6 +998,140 @@ cleanup:
      IDxDiagProvider_Release(pddp);
  }
  
@@ -305,7 +305,7 @@ index 936707632a4..c80717cd392 100644
  START_TEST(container)
  {
      CoInitialize(NULL);
-@@ -1036,5 +1175,7 @@ START_TEST(container)
+@@ -1007,5 +1146,7 @@ START_TEST(container)
      test_root_children();
      test_DxDiag_SystemInfo();
      test_DxDiag_DisplayDevices();
@@ -314,5 +314,5 @@ index 936707632a4..c80717cd392 100644
      CoUninitialize();
  }
 -- 
-2.20.1
+2.24.0
 

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "6e986bbd810890339569f82aca39273e41427f24"
+	echo "238c6be5b81cbfcf8cd147b1cbb25d16803efbe1"
 }
 
 # Show version information