wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against a2460b2424163bbf5b885db6a5423c3d98f883e0.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-03-04 18:31:06 +01:00
parent 88c85f01c3
commit a644cbf827
4 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From b9c35ad92af95d7ee45a698d7282fd896247c128 Mon Sep 17 00:00:00 2001
From 342951349469b7a84f3226d02f04ca5401982273 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: dxdiagn: Enumerate DirectSound devices and add some basic properties.
@@ -10,18 +10,18 @@ Subject: dxdiagn: Enumerate DirectSound devices and add some basic properties.
3 files changed, 233 insertions(+), 1 deletion(-)
diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in
index df3fc77..9d67410 100644
index 3a1017e9d0a..87f6177aadf 100644
--- a/dlls/dxdiagn/Makefile.in
+++ b/dlls/dxdiagn/Makefile.in
@@ -1,5 +1,5 @@
MODULE = dxdiagn.dll
-IMPORTS = strmiids dxguid uuid d3d9 ddraw version ole32 oleaut32 psapi user32 advapi32
+IMPORTS = strmiids dxguid uuid d3d9 ddraw version ole32 oleaut32 psapi user32 advapi32 dsound
-IMPORTS = strmiids dxguid uuid d3d9 ddraw version ole32 oleaut32 user32 advapi32
+IMPORTS = strmiids dxguid uuid d3d9 ddraw version ole32 oleaut32 user32 advapi32 dsound
C_SRCS = \
container.c \
diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c
index 3b5fcab..a5f06e3 100644
index 5665d01d5b8..20998bc9aba 100644
--- a/dlls/dxdiagn/provider.c
+++ b/dlls/dxdiagn/provider.c
@@ -38,6 +38,7 @@
@@ -32,7 +32,7 @@ index 3b5fcab..a5f06e3 100644
#include "wine/debug.h"
@@ -1189,11 +1190,85 @@ static HRESULT build_displaydevices_tree(IDxDiagContainerImpl_Container *node)
@@ -1195,11 +1196,85 @@ static HRESULT build_displaydevices_tree(IDxDiagContainerImpl_Container *node)
return fill_display_information_fallback(node);
}
@@ -118,7 +118,7 @@ index 3b5fcab..a5f06e3 100644
IDxDiagContainerImpl_Container *cont;
cont = allocate_information_node(DxDiag_SoundDevices);
@@ -1202,12 +1277,28 @@ static HRESULT build_directsound_tree(IDxDiagContainerImpl_Container *node)
@@ -1208,12 +1283,28 @@ static HRESULT build_directsound_tree(IDxDiagContainerImpl_Container *node)
add_subcontainer(node, cont);
@@ -148,7 +148,7 @@ index 3b5fcab..a5f06e3 100644
}
diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c
index 5bc5161..2ffe0fb 100644
index 5bc5161635a..2ffe0fb685b 100644
--- a/dlls/dxdiagn/tests/container.c
+++ b/dlls/dxdiagn/tests/container.c
@@ -36,6 +36,11 @@ static IDxDiagContainer *pddc;
@@ -313,5 +313,5 @@ index 5bc5161..2ffe0fb 100644
CoUninitialize();
}
--
2.5.0
2.11.0