Rebase against c92fddae8661233e7699e1914987f0cc4caa8217

This commit is contained in:
Alistair Leslie-Hughes
2019-06-04 09:10:22 +10:00
parent 671295089e
commit 3287f0fc9b
5 changed files with 84 additions and 76 deletions

View File

@@ -1,10 +1,10 @@
From 85367d69fb057ba4557d9195b324425bd0e84316 Mon Sep 17 00:00:00 2001
From 0204d4b3482b55cf3b4d74bbcabd8e95e6e192ef Mon Sep 17 00:00:00 2001
From: Mark Harmstone <mark@harmstone.com>
Date: Sun, 15 Mar 2015 18:04:16 +0000
Subject: dsound: Add EAX v1 constants and structs.
Subject: [PATCH] dsound: Add EAX v1 constants and structs.
---
dlls/dsound/dsound_eax.h | 89 ++++++++++++++++++++++++++++++++++++++++++++
dlls/dsound/dsound_eax.h | 89 ++++++++++++++++++++++++++++++++++++
dlls/dsound/dsound_private.h | 1 +
2 files changed, 90 insertions(+)
create mode 100644 dlls/dsound/dsound_eax.h
@@ -105,7 +105,7 @@ index 00000000000..600029fa94f
+
+#endif
diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
index 45232cbd729..58163646fd7 100644
index b19acba2b98..eb9f5c9e3bc 100644
--- a/dlls/dsound/dsound_private.h
+++ b/dlls/dsound/dsound_private.h
@@ -29,6 +29,7 @@
@@ -115,7 +115,7 @@ index 45232cbd729..58163646fd7 100644
+#include "dsound_eax.h"
#include "wine/list.h"
#include "wine/unicode.h"
--
2.13.1
2.17.1