Alistair Leslie-Hughes : dsdmo: Add Compressor FX Support.

[Alexandre Julliard]

Module: wine
Branch: oldstable
Commit: 19cae551cddd5db372edff633db000c93e6c09d5
URL:    https://gitlab.winehq.org/wine/wine/-/commit/19cae551cddd5db372edff633db000c...

Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
Date:   Sat Aug 13 15:03:46 2022 +1000

dsdmo: Add Compressor FX Support.

(cherry picked from commit 39889f19c3db917703a8b42167ee4084dfa091d7)
Conflicts:
	dlls/dsdmo/tests/dsdmo.c
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/dsdmo/dsdmo.idl     |  8 ++++
 dlls/dsdmo/main.c        | 97 ++++++++++++++++++++++++++++++++++++++++++++++++
 dlls/dsdmo/tests/dsdmo.c |  8 ++--
 3 files changed, 109 insertions(+), 4 deletions(-)

diff --git a/dlls/dsdmo/dsdmo.idl b/dlls/dsdmo/dsdmo.idl
index c8130f8a1ce..3922b4d6778 100644
--- a/dlls/dsdmo/dsdmo.idl
+++ b/dlls/dsdmo/dsdmo.idl
@@ -49,3 +49,11 @@ coclass DirectSoundWavesReverbDMO {}
     vi_progid("Microsoft.DirectSoundEchoDMO")
 ]
 coclass DirectSoundEchoDMO {}
+
+[
+    uuid(ef011f79-4000-406d-87af-bffb3fc39d57),
+    threading(both),
+    progid("Microsoft.DirectSoundCompressorDMO.1"),
+    vi_progid("Microsoft.DirectSoundCompressorDMO")
+]
+coclass DirectSoundCompressorDMO {}
diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c
index bc5580df9bc..2f20c53d515 100644
--- a/dlls/dsdmo/main.c
+++ b/dlls/dsdmo/main.c
@@ -893,6 +893,102 @@ static HRESULT echo_create(IUnknown *outer, IUnknown **out)
     return S_OK;
 }
 
+struct dmo_compressorfx
+{
+    struct effect effect;
+    IDirectSoundFXCompressor IDirectSoundFXCompressor_iface;
+};
+
+static inline struct dmo_compressorfx *impl_from_IDirectSoundFXCompressor(IDirectSoundFXCompressor *iface)
+{
+    return CONTAINING_RECORD(iface, struct dmo_compressorfx, IDirectSoundFXCompressor_iface);
+}
+
+static HRESULT WINAPI compressorfx_QueryInterface(IDirectSoundFXCompressor *iface, REFIID iid, void **out)
+{
+    struct dmo_compressorfx *effect = impl_from_IDirectSoundFXCompressor(iface);
+    return IUnknown_QueryInterface(effect->effect.outer_unk, iid, out);
+}
+
+static ULONG WINAPI compressorfx_AddRef(IDirectSoundFXCompressor *iface)
+{
+    struct dmo_compressorfx *effect = impl_from_IDirectSoundFXCompressor(iface);
+    return IUnknown_AddRef(effect->effect.outer_unk);
+}
+
+static ULONG WINAPI compressorfx_Release(IDirectSoundFXCompressor *iface)
+{
+    struct dmo_compressorfx *effect = impl_from_IDirectSoundFXCompressor(iface);
+    return IUnknown_Release(effect->effect.outer_unk);
+}
+
+static HRESULT WINAPI compressorfx_SetAllParameters(IDirectSoundFXCompressor *iface, const DSFXCompressor *compressor)
+{
+    struct dmo_compressorfx *This = impl_from_IDirectSoundFXCompressor(iface);
+    FIXME("(%p) %p\n", This, compressor);
+
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI compressorfx_GetAllParameters(IDirectSoundFXCompressor *iface, DSFXCompressor *compressor)
+{
+    struct dmo_compressorfx *This = impl_from_IDirectSoundFXCompressor(iface);
+    FIXME("(%p) %p\n", This, compressor);
+
+    return E_NOTIMPL;
+}
+
+static const struct IDirectSoundFXCompressorVtbl compressor_vtbl =
+{
+    compressorfx_QueryInterface,
+    compressorfx_AddRef,
+    compressorfx_Release,
+    compressorfx_SetAllParameters,
+    compressorfx_GetAllParameters
+};
+
+static struct dmo_compressorfx *impl_compressor_from_effect(struct effect *iface)
+{
+    return CONTAINING_RECORD(iface, struct dmo_compressorfx, effect);
+}
+
+static void *compressor_query_interface(struct effect *iface, REFIID iid)
+{
+    struct dmo_compressorfx *effect = impl_compressor_from_effect(iface);
+
+    if (IsEqualGUID(iid, &IID_IDirectSoundFXCompressor))
+        return &effect->IDirectSoundFXCompressor_iface;
+    return NULL;
+}
+
+static void compressor_destroy(struct effect *iface)
+{
+    struct dmo_compressorfx *effect = impl_compressor_from_effect(iface);
+
+    free(effect);
+}
+
+static const struct effect_ops compressor_ops =
+{
+    .destroy = compressor_destroy,
+    .query_interface = compressor_query_interface,
+};
+
+static HRESULT compressor_create(IUnknown *outer, IUnknown **out)
+{
+    struct dmo_compressorfx *object;
+
+    if (!(object = calloc(1, sizeof(*object))))
+        return E_OUTOFMEMORY;
+
+    effect_init(&object->effect, outer, &compressor_ops);
+    object->IDirectSoundFXCompressor_iface.lpVtbl = &compressor_vtbl;
+
+    TRACE("Created compressor effect %p.\n", object);
+    *out = &object->effect.IUnknown_inner;
+    return S_OK;
+}
+
 struct class_factory
 {
     IClassFactory IClassFactory_iface;
@@ -978,6 +1074,7 @@ class_factories[] =
     {&GUID_DSFX_STANDARD_PARAMEQ,       {{&class_factory_vtbl}, eq_create}},
     {&GUID_DSFX_WAVES_REVERB,           {{&class_factory_vtbl}, waves_reverb_create}},
     {&GUID_DSFX_STANDARD_ECHO,          {{&class_factory_vtbl}, echo_create}},
+    {&GUID_DSFX_STANDARD_COMPRESSOR,    {{&class_factory_vtbl}, compressor_create}},
 };
 
 HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out)
diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c
index db22d5bdecb..58089a9d2ef 100644
--- a/dlls/dsdmo/tests/dsdmo.c
+++ b/dlls/dsdmo/tests/dsdmo.c
@@ -327,12 +327,12 @@ static void test_compressor_parameters(void)
 
     hr = CoCreateInstance(&GUID_DSFX_STANDARD_COMPRESSOR, NULL, CLSCTX_INPROC_SERVER,
             &IID_IDirectSoundFXCompressor, (void **)&compressor);
+    ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+    hr = IDirectSoundFXCompressor_GetAllParameters(compressor, ¶ms);
     todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr);
     if (hr != S_OK)
         return;
-
-    hr = IDirectSoundFXCompressor_GetAllParameters(compressor, ¶ms);
-    ok(hr == S_OK, "Got hr %#x.\n", hr);
     ok(params.fGain == 0.0f, "Got gain %.8e dB.\n", params.fGain);
     ok(params.fAttack == 10.0f, "Got attack time %.8e ms.\n", params.fAttack);
     ok(params.fThreshold == -20.0f, "Got threshold %.8e dB.\n", params.fThreshold);
@@ -537,7 +537,7 @@ START_TEST(dsdmo)
     tests[] =
     {
         {&GUID_DSFX_STANDARD_CHORUS,        &IID_IDirectSoundFXChorus, TRUE},
-        {&GUID_DSFX_STANDARD_COMPRESSOR,    &IID_IDirectSoundFXCompressor, TRUE},
+        {&GUID_DSFX_STANDARD_COMPRESSOR,    &IID_IDirectSoundFXCompressor},
         {&GUID_DSFX_STANDARD_DISTORTION,    &IID_IDirectSoundFXDistortion, TRUE},
         {&GUID_DSFX_STANDARD_ECHO,          &IID_IDirectSoundFXEcho},
         {&GUID_DSFX_STANDARD_FLANGER,       &IID_IDirectSoundFXFlanger, TRUE},