Fix Rebase

This commit is contained in:
Alistair Leslie-Hughes 2022-06-16 10:08:01 +10:00
parent 3d9f724967
commit f0e38f512c

View File

@ -1,16 +1,16 @@
From 809bba6e809a3557c9b37deecfc7faab57337764 Mon Sep 17 00:00:00 2001
From 5d29a2de174042ce7bdd52d92337591933e0f761 Mon Sep 17 00:00:00 2001
From: Mark Harmstone <mark@harmstone.com>
Date: Fri, 27 Mar 2015 20:58:37 +0000
Subject: [PATCH] dsound: Add EAX init and free stubs.
---
dlls/dsound/buffer.c | 6 ++++++
dlls/dsound/buffer.c | 4 ++++
dlls/dsound/dsound_private.h | 2 ++
dlls/dsound/eax.c | 28 +++++++++++++++++++++++++++-
3 files changed, 35 insertions(+), 1 deletion(-)
3 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
index e8b3fb4a832..6c5c18b6f1e 100644
index e8b3fb4a832..28f2e95994e 100644
--- a/dlls/dsound/buffer.c
+++ b/dlls/dsound/buffer.c
@@ -1153,6 +1153,8 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds
@ -22,13 +22,11 @@ index e8b3fb4a832..6c5c18b6f1e 100644
/* register buffer */
err = DirectSoundDevice_AddBuffer(device, dsb);
@@ -1194,6 +1196,10 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This)
@@ -1194,6 +1196,8 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This)
HeapFree(GetProcessHeap(), 0, This->filters);
}
+ free_eax_buffer(This);
+
+ HeapFree(GetProcessHeap(), 0, This);
+
TRACE("(%p) released\n", This);