September 2019 - Wine-devel

[PATCH] mfplat/tests: Fix the spelling of a comment.
by Francois Gouget 30 Sep '19

30 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/mfplat/tests/mfplat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 721ec120efc..832b52713c7 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1499,7 +1499,7 @@ static void test_system_memory_buffer(void) ok(length == 10, "got %u\n", length); ok(max == 1024, "got %u\n", max); - /* Attempt to lock the bufer twice */ + /* Attempt to lock the buffer twice */ hr = IMFMediaBuffer_Lock(buffer, &data2, &max, &length); ok(hr == S_OK, "got 0x%08x\n", hr); ok(data == data2, "got 0x%08x\n", hr); -- 2.20.1

2 1

[PATCH] mmdevapi/tests: Fix the spelling of ok() messages.
by Francois Gouget 30 Sep '19

30 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/mmdevapi/tests/propstore.c | 2 +- dlls/mmdevapi/tests/render.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index bbd4ffe10fb..bdba19d158c 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -111,7 +111,7 @@ static void test_getat(IPropertyStore *store) hr = IPropertyStore_GetCount(store, &propcount); ok(hr == S_OK, "Failed with %08x\n", hr); - ok(propcount > 0, "Propcount %d should be greather than zero\n", propcount); + ok(propcount > 0, "Propcount %d should be greater than zero\n", propcount); for (prop = 0; prop < propcount; prop++) { hr = IPropertyStore_GetAt(store, prop, &pkey); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index a4e94b15e00..7de6d9adc92 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -744,7 +744,7 @@ static void test_padding(void) /* win10 appears not to clear the buffer */ for(i = 0; i < psize * pwfx->nBlockAlign; ++i){ if(buf[i] != silence){ - ok(0, "buffer has data in it already, i: %u, valu: %f\n", i, *((float*)buf)); + ok(0, "buffer has data in it already, i: %u, value: %f\n", i, *((float*)buf)); break; } } -- 2.20.1

2 1

[PATCH 4/4] dsdmo: Implement IDirectSoundFXEcho SetAllParameters.
by Alistair Leslie-Hughes 30 Sep '19

30 Sep '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dsdmo/echo.c | 20 ++++++++++++++++++-- dlls/dsound/tests/dsound8.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/dsdmo/echo.c b/dlls/dsdmo/echo.c index e9add8a019..f0084dca24 100644 --- a/dlls/dsdmo/echo.c +++ b/dlls/dsdmo/echo.c @@ -352,9 +352,25 @@ static ULONG WINAPI echofx_Release(IDirectSoundFXEcho *iface) static HRESULT WINAPI echofx_SetAllParameters(IDirectSoundFXEcho *iface, const DSFXEcho *echo) { struct dmo_echofx *This = impl_from_IDirectSoundFXEcho(iface); - FIXME("(%p) %p\n", This, echo); - return E_NOTIMPL; + TRACE("(%p) %p\n", This, echo); + + if(!echo) + return E_POINTER; + + /* Out of Range values */ + if( (echo->fWetDryMix < DSFXECHO_WETDRYMIX_MIN || echo->fWetDryMix > DSFXECHO_WETDRYMIX_MAX) || + (echo->fFeedback < DSFXECHO_FEEDBACK_MIN || echo->fFeedback > DSFXECHO_FEEDBACK_MAX) || + (echo->fLeftDelay < DSFXECHO_LEFTDELAY_MIN || echo->fLeftDelay > DSFXECHO_LEFTDELAY_MAX) || + (echo->fRightDelay < DSFXECHO_RIGHTDELAY_MIN || echo->fRightDelay > DSFXECHO_RIGHTDELAY_MAX) || + (echo->lPanDelay != DSFXECHO_PANDELAY_MIN && echo->lPanDelay != DSFXECHO_PANDELAY_MAX) ) + { + return E_INVALIDARG; + } + + This->params = *echo; + + return S_OK; } static HRESULT WINAPI echofx_GetAllParameters(IDirectSoundFXEcho *iface, DSFXEcho *echo) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 9e76afac4e..446c67f894 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1446,6 +1446,37 @@ static void test_echo_parameters(IDirectSoundBuffer8 *secondary8) ok(params.lPanDelay == 0, "got %d\n", params.lPanDelay); } + rc = IDirectSoundFXEcho_SetAllParameters(echo, NULL); + ok(rc == E_POINTER, "got: %08x\n", rc); + + /* Out of range Min */ + params.fWetDryMix = -1.0f; + + rc = IDirectSoundFXEcho_SetAllParameters(echo, &params); + ok(rc == E_INVALIDARG, "got: %08x\n", rc); + + /* Out of range Max */ + params.fWetDryMix = 101.0f; + + rc = IDirectSoundFXEcho_SetAllParameters(echo, &params); + ok(rc == E_INVALIDARG, "got: %08x\n", rc); + + params.fWetDryMix = DSFXECHO_WETDRYMIX_MIN; + + rc = IDirectSoundFXEcho_SetAllParameters(echo, &params); + ok(rc == S_OK, "Failed: %08x\n", rc); + + rc = IDirectSoundFXEcho_GetAllParameters(echo, &params); + ok(rc == DS_OK, "Failed: %08x\n", rc); + if (rc == DS_OK ) + { + ok(params.fWetDryMix == DSFXECHO_WETDRYMIX_MIN, "got %f\n", params.fWetDryMix); + ok(params.fFeedback == 50.0f, "got %f\n", params.fFeedback); + ok(params.fLeftDelay == 500.0f,"got %f\n", params.fLeftDelay); + ok(params.fRightDelay == 500.0f,"got %f\n", params.fRightDelay); + ok(params.lPanDelay == 0, "got %d\n", params.lPanDelay); + } + IDirectSoundFXEcho_Release(echo); } } -- 2.17.1

1 0

[PATCH 3/4] dsdmo: Implement IDirectSoundFXEcho GetAllParameters.
by Alistair Leslie-Hughes 30 Sep '19

30 Sep '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dsdmo/echo.c | 18 ++++++++++++++++-- dlls/dsound/tests/dsound8.c | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/dsdmo/echo.c b/dlls/dsdmo/echo.c index 3e8b0be115..e9add8a019 100644 --- a/dlls/dsdmo/echo.c +++ b/dlls/dsdmo/echo.c @@ -27,6 +27,8 @@ struct dmo_echofx IMediaObject IMediaObject_iface; IMediaObjectInPlace IMediaObjectInPlace_iface; LONG ref; + + DSFXEcho params; }; static inline struct dmo_echofx *impl_from_IDirectSoundFXEcho(IDirectSoundFXEcho *iface) @@ -358,9 +360,15 @@ static HRESULT WINAPI echofx_SetAllParameters(IDirectSoundFXEcho *iface, const D static HRESULT WINAPI echofx_GetAllParameters(IDirectSoundFXEcho *iface, DSFXEcho *echo) { struct dmo_echofx *This = impl_from_IDirectSoundFXEcho(iface); - FIXME("(%p) %p\n", This, echo); - return E_NOTIMPL; + TRACE("(%p) %p\n", This, echo); + + if(!echo) + return E_INVALIDARG; + + *echo = This->params; + + return S_OK; } static const struct IDirectSoundFXEchoVtbl echofxVtbl = @@ -390,6 +398,12 @@ HRESULT WINAPI EchoFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, object->IMediaObjectInPlace_iface.lpVtbl = &echo_mediainplaceVtbl; object->ref = 1; + object->params.fWetDryMix = 50.0f; + object->params.fFeedback = 50.0f; + object->params.fLeftDelay = 500.0f; + object->params.fRightDelay = 500.0f; + object->params.lPanDelay = 0; + ret = echofx_QueryInterface(&object->IDirectSoundFXEcho_iface, riid, ppv); echofx_Release(&object->IDirectSoundFXEcho_iface); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index b66275973f..9e76afac4e 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1436,7 +1436,7 @@ static void test_echo_parameters(IDirectSoundBuffer8 *secondary8) DSFXEcho params; rc = IDirectSoundFXEcho_GetAllParameters(echo, &params); - todo_wine ok(rc == DS_OK, "Failed: %08x\n", rc); + ok(rc == DS_OK, "Failed: %08x\n", rc); if (rc == DS_OK ) { ok(params.fWetDryMix == 50.0f, "got %f\n", params.fWetDryMix); -- 2.17.1

1 0

[PATCH 2/4] dsdmo: Add IDirectSoundFXEcho support
by Alistair Leslie-Hughes 30 Sep '19

30 Sep '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dsdmo/Makefile.in | 5 +- dlls/dsdmo/dsdmo_classes.idl | 28 +++ dlls/dsdmo/dsdmo_private.h | 32 +++ dlls/dsdmo/echo.c | 397 +++++++++++++++++++++++++++++++++++ dlls/dsdmo/main.c | 57 ++++- 5 files changed, 517 insertions(+), 2 deletions(-) create mode 100644 dlls/dsdmo/dsdmo_classes.idl create mode 100644 dlls/dsdmo/dsdmo_private.h create mode 100644 dlls/dsdmo/echo.c diff --git a/dlls/dsdmo/Makefile.in b/dlls/dsdmo/Makefile.in index 99816ae0c0..cb4f8f8a4b 100644 --- a/dlls/dsdmo/Makefile.in +++ b/dlls/dsdmo/Makefile.in @@ -1,6 +1,9 @@ MODULE = dsdmo.dll - +IMPORTS = uuid EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + echo.c \ main.c + +IDL_SRCS = dsdmo_classes.idl diff --git a/dlls/dsdmo/dsdmo_classes.idl b/dlls/dsdmo/dsdmo_classes.idl new file mode 100644 index 0000000000..649db8f61b --- /dev/null +++ b/dlls/dsdmo/dsdmo_classes.idl @@ -0,0 +1,28 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#pragma makedep register + +[ + uuid(ef3e932c-d40b-4f51-8ccf-3f98f1b29d5d), + threading(both), + progid("Microsoft.DirectSoundEchoDMO.1"), + vi_progid("Microsoft.DirectSoundEchoDMO") +] +coclass DirectSoundEchoDMO +{ +} diff --git a/dlls/dsdmo/dsdmo_private.h b/dlls/dsdmo/dsdmo_private.h new file mode 100644 index 0000000000..4abe5a9f60 --- /dev/null +++ b/dlls/dsdmo/dsdmo_private.h @@ -0,0 +1,32 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef WINE_DSDMO_PRIVATE +#define WINE_DSDMO_PRIVATE + +#include "windows.h" +#include "mmsystem.h" +#include "mediaobj.h" + +#include "wine/heap.h" +#include "wine/debug.h" + +#include "dsound.h" + +extern HRESULT WINAPI EchoFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) DECLSPEC_HIDDEN; + +#endif diff --git a/dlls/dsdmo/echo.c b/dlls/dsdmo/echo.c new file mode 100644 index 0000000000..3e8b0be115 --- /dev/null +++ b/dlls/dsdmo/echo.c @@ -0,0 +1,397 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#define COBJMACROS + +#include "dsdmo_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dsdmo); + +struct dmo_echofx +{ + IDirectSoundFXEcho IDirectSoundFXEcho_iface; + IMediaObject IMediaObject_iface; + IMediaObjectInPlace IMediaObjectInPlace_iface; + LONG ref; +}; + +static inline struct dmo_echofx *impl_from_IDirectSoundFXEcho(IDirectSoundFXEcho *iface) +{ + return CONTAINING_RECORD(iface, struct dmo_echofx, IDirectSoundFXEcho_iface); +} + +static inline struct dmo_echofx *impl_from_IMediaObject(IMediaObject *iface) +{ + return CONTAINING_RECORD(iface, struct dmo_echofx, IMediaObject_iface); +} + +static inline struct dmo_echofx *impl_from_IMediaObjectInPlace(IMediaObjectInPlace *iface) +{ + return CONTAINING_RECORD(iface, struct dmo_echofx, IMediaObjectInPlace_iface); +} + +static HRESULT WINAPI echo_mediaobj_QueryInterface(IMediaObject *iface, REFIID riid, void **obj) +{ + struct dmo_echofx *This = impl_from_IMediaObject(iface); + return IDirectSoundFXEcho_QueryInterface(&This->IDirectSoundFXEcho_iface, riid, obj); +} + +static ULONG WINAPI echo_mediaobj_AddRef(IMediaObject *iface) +{ + struct dmo_echofx *This = impl_from_IMediaObject(iface); + return IDirectSoundFXEcho_AddRef(&This->IDirectSoundFXEcho_iface); +} + +static ULONG WINAPI echo_mediaobj_Release(IMediaObject *iface) +{ + struct dmo_echofx *This = impl_from_IMediaObject(iface); + return IDirectSoundFXEcho_Release(&This->IDirectSoundFXEcho_iface); +} + +static HRESULT WINAPI echo_mediaobj_GetStreamCount(IMediaObject *iface, DWORD *inputs, DWORD *outputs) +{ + struct dmo_echofx *This = impl_from_IMediaObject(iface); + FIXME("%p, %p, %p\n", This, inputs, outputs); + return E_NOTIMPL; +} + +static HRESULT WINAPI echo_mediaobj_GetInputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) +{ + struct dmo_echofx *This = impl_from_IMediaObject(iface); + FIXME("%p, %d, %p\n", This, index, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI echo_mediaobj_GetOutputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) +{ + struct dmo_echofx *This = impl_from_IMediaObject(iface); + FIXME("%p, %d, %p\n", This, index, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI echo_mediaobj_GetInputType(IMediaObject *iface, DWORD index, DWORD type, DMO_MEDIA_TYPE *pmt) +{ + struct dmo_echofx *This = impl_from_IMediaObject(iface); + FIXME("%p, %d, %d, %p\n", This, index, type, pmt); + return E_NOTIMPL; +} + +static HRESULT WINAPI echo_mediaobj_GetOutputType(IMediaObject *iface, DWORD index, DWORD type, DMO_MEDIA_TYPE *pmt) +{ + struct dmo_echofx *This = impl_from_IMediaObject(iface); + FIXME("%p, %d, %d, %p\n", This, index, type, pmt); + return E_NOTIMPL; +} + +static HRESULT WINAPI echo_mediaobj_SetInputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *pmt, DWORD flags) +{ + struct dmo_echofx *This = impl_from_IMediaObject(iface); + FIXME("%p, %d, %p, %x\n", This, index, pmt, flags); + return S_OK; +} + +static HRESULT WINAPI echo_mediaobj_SetOutputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *pmt, DWORD flags) +{ + struct dmo_echofx *This = impl_from_IMediaObject(iface); + FIXME("%p, %d, %p, %x\n", This, index, pmt, flags); + return S_OK; +} + +static HRESULT WINAPI echo_mediaobj_GetInputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *pmt) +{ + struct dmo_echofx *This = impl_from_IMediaObject(iface); + FIXME("%p, %d, %p\n", This, index, pmt); + return E_NOTIMPL; +} + +static HRESULT WINAPI echo_mediaobj_GetOutputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *pmt) +{ + struct dmo_echofx *This = impl_from_IMediaObject(iface); + FIXME("%p, %d, %p\n", This, index, pmt); + return E_NOTIMPL; +} + +static HRESULT WINAPI echo_mediaobj_GetInputSizeInfo(IMediaObject *iface, DWORD index, DWORD *size, DWORD *ahead, DWORD *alignment) +{ + struct dmo_echofx *This = impl_from_IMediaObject(iface); + FIXME("%p, %d, %p, %p, %p\n", This, index, size, ahead, alignment); + return E_NOTIMPL; +} + +static HRESULT WINAPI echo_mediaobj_GetOutputSizeInfo(IMediaObject *iface, DWORD index, DWORD *size, DWORD *alignment) +{ + struct dmo_echofx *This = impl_from_IMediaObject(iface); + FIXME("%p, %d, %p, %p\n", This, index, size, alignment); + return E_NOTIMPL; +} + +static HRESULT WINAPI echo_mediaobj_GetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME *latency) +{ + struct dmo_echofx *This = impl_from_IMediaObject(iface); + FIXME("%p, %d, %p\n", This, index, latency); + return E_NOTIMPL; +} + +static HRESULT WINAPI echo_mediaobj_SetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME latency) +{ + struct dmo_echofx *This = impl_from_IMediaObject(iface); + FIXME("%p, %d, %s\n", This, index, wine_dbgstr_longlong(latency)); + return E_NOTIMPL; +} + +static HRESULT WINAPI echo_mediaobj_Flush(IMediaObject *iface) +{ + struct dmo_echofx *This = impl_from_IMediaObject(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI echo_mediaobj_Discontinuity(IMediaObject *iface, DWORD index) +{ + struct dmo_echofx *This = impl_from_IMediaObject(iface); + FIXME("%p, %d\n", This, index); + return E_NOTIMPL; +} + +static HRESULT WINAPI echo_mediaobj_AllocateStreamingResources(IMediaObject *iface) +{ + struct dmo_echofx *This = impl_from_IMediaObject(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI echo_mediaobj_FreeStreamingResources(IMediaObject *iface) +{ + struct dmo_echofx *This = impl_from_IMediaObject(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI echo_mediaobj_GetInputStatus(IMediaObject *iface, DWORD index, DWORD *flags) +{ + struct dmo_echofx *This = impl_from_IMediaObject(iface); + FIXME("%p, %d, %p\n", This, index, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI echo_mediaobj_ProcessInput(IMediaObject *iface, DWORD index, IMediaBuffer *buffer, + DWORD flags, REFERENCE_TIME timestamp, REFERENCE_TIME length) +{ + struct dmo_echofx *This = impl_from_IMediaObject(iface); + FIXME("%p, %d, %p, %x, %s, %s\n", This, index, buffer, flags, wine_dbgstr_longlong(timestamp), wine_dbgstr_longlong(length)); + return E_NOTIMPL; +} + +static HRESULT WINAPI echo_mediaobj_ProcessOutput(IMediaObject *iface, DWORD flags, DWORD count, + DMO_OUTPUT_DATA_BUFFER *buffers, DWORD *status) +{ + struct dmo_echofx *This = impl_from_IMediaObject(iface); + FIXME("%p, %x, %d, %p, %p\n", This, flags, count, buffers, status); + return E_NOTIMPL; +} + +static HRESULT WINAPI echo_mediaobj_Lock(IMediaObject *iface, LONG lock) +{ + struct dmo_echofx *This = impl_from_IMediaObject(iface); + FIXME("%p, %d\n", This, lock); + return E_NOTIMPL; +} + +static const IMediaObjectVtbl echo_mediaobjectVtbl = +{ + echo_mediaobj_QueryInterface, + echo_mediaobj_AddRef, + echo_mediaobj_Release, + echo_mediaobj_GetStreamCount, + echo_mediaobj_GetInputStreamInfo, + echo_mediaobj_GetOutputStreamInfo, + echo_mediaobj_GetInputType, + echo_mediaobj_GetOutputType, + echo_mediaobj_SetInputType, + echo_mediaobj_SetOutputType, + echo_mediaobj_GetInputCurrentType, + echo_mediaobj_GetOutputCurrentType, + echo_mediaobj_GetInputSizeInfo, + echo_mediaobj_GetOutputSizeInfo, + echo_mediaobj_GetInputMaxLatency, + echo_mediaobj_SetInputMaxLatency, + echo_mediaobj_Flush, + echo_mediaobj_Discontinuity, + echo_mediaobj_AllocateStreamingResources, + echo_mediaobj_FreeStreamingResources, + echo_mediaobj_GetInputStatus, + echo_mediaobj_ProcessInput, + echo_mediaobj_ProcessOutput, + echo_mediaobj_Lock +}; + +static HRESULT WINAPI echo_mediainplace_QueryInterface(IMediaObjectInPlace *iface, REFIID riid, void **obj) +{ + struct dmo_echofx *This = impl_from_IMediaObjectInPlace(iface); + return IDirectSoundFXEcho_QueryInterface(&This->IDirectSoundFXEcho_iface, riid, obj); +} + +static ULONG WINAPI echo_mediainplace_AddRef(IMediaObjectInPlace *iface) +{ + struct dmo_echofx *This = impl_from_IMediaObjectInPlace(iface); + return IDirectSoundFXEcho_AddRef(&This->IDirectSoundFXEcho_iface); +} + +static ULONG WINAPI echo_mediainplace_Release(IMediaObjectInPlace *iface) +{ + struct dmo_echofx *This = impl_from_IMediaObjectInPlace(iface); + return IDirectSoundFXEcho_Release(&This->IDirectSoundFXEcho_iface); +} + +static HRESULT WINAPI echo_mediainplace_Process(IMediaObjectInPlace *iface, ULONG size, BYTE *data, REFERENCE_TIME start, DWORD flags) +{ + struct dmo_echofx *This = impl_from_IMediaObjectInPlace(iface); + static BOOL once = 0; + if(!once++) + FIXME("%p, %d, %p, %s, %x\n", This, size, data, wine_dbgstr_longlong(start), flags); + else + TRACE("%p, %d, %p, %s, %x\n", This, size, data, wine_dbgstr_longlong(start), flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI echo_mediainplace_Clone(IMediaObjectInPlace *iface, IMediaObjectInPlace **object) +{ + struct dmo_echofx *This = impl_from_IMediaObjectInPlace(iface); + FIXME("%p, %p\n", This, object); + return E_NOTIMPL; +} + +static HRESULT WINAPI echo_mediainplace_GetLatency(IMediaObjectInPlace *iface, REFERENCE_TIME *latency) +{ + struct dmo_echofx *This = impl_from_IMediaObjectInPlace(iface); + FIXME("%p, %p\n", This, latency); + return E_NOTIMPL; +} + +static const IMediaObjectInPlaceVtbl echo_mediainplaceVtbl = +{ + echo_mediainplace_QueryInterface, + echo_mediainplace_AddRef, + echo_mediainplace_Release, + echo_mediainplace_Process, + echo_mediainplace_Clone, + echo_mediainplace_GetLatency +}; + +static HRESULT WINAPI echofx_QueryInterface(IDirectSoundFXEcho *iface, REFIID riid, void **ppv) +{ + struct dmo_echofx *This = impl_from_IDirectSoundFXEcho(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDirectSoundFXEcho)) + { + *ppv = &This->IDirectSoundFXEcho_iface; + } + else if(IsEqualGUID(riid, &IID_IMediaObject)) + { + *ppv = &This->IMediaObject_iface; + } + else if(IsEqualGUID(riid, &IID_IMediaObjectInPlace)) + { + *ppv = &This->IMediaObjectInPlace_iface; + } + + if(!*ppv) + { + FIXME("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + + return S_OK; +} + +static ULONG WINAPI echofx_AddRef(IDirectSoundFXEcho *iface) +{ + struct dmo_echofx *This = impl_from_IDirectSoundFXEcho(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI echofx_Release(IDirectSoundFXEcho *iface) +{ + struct dmo_echofx *This = impl_from_IDirectSoundFXEcho(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI echofx_SetAllParameters(IDirectSoundFXEcho *iface, const DSFXEcho *echo) +{ + struct dmo_echofx *This = impl_from_IDirectSoundFXEcho(iface); + FIXME("(%p) %p\n", This, echo); + + return E_NOTIMPL; +} + +static HRESULT WINAPI echofx_GetAllParameters(IDirectSoundFXEcho *iface, DSFXEcho *echo) +{ + struct dmo_echofx *This = impl_from_IDirectSoundFXEcho(iface); + FIXME("(%p) %p\n", This, echo); + + return E_NOTIMPL; +} + +static const struct IDirectSoundFXEchoVtbl echofxVtbl = +{ + echofx_QueryInterface, + echofx_AddRef, + echofx_Release, + echofx_SetAllParameters, + echofx_GetAllParameters +}; + +HRESULT WINAPI EchoFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +{ + struct dmo_echofx *object; + HRESULT ret; + + TRACE("(%p, %s, %p)\n", outer, debugstr_guid(riid), ppv); + + *ppv = NULL; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IDirectSoundFXEcho_iface.lpVtbl = &echofxVtbl; + object->IMediaObject_iface.lpVtbl = &echo_mediaobjectVtbl; + object->IMediaObjectInPlace_iface.lpVtbl = &echo_mediainplaceVtbl; + object->ref = 1; + + ret = echofx_QueryInterface(&object->IDirectSoundFXEcho_iface, riid, ppv); + echofx_Release(&object->IDirectSoundFXEcho_iface); + + return ret; +} diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index 61a67f44d8..d751f90dc9 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -17,10 +17,12 @@ */ #define COBJMACROS +#include "windows.h" #include "ole2.h" #include "rpcproxy.h" -#include "wine/debug.h" +#include "initguid.h" +#include "dsdmo_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dsdmo); @@ -49,11 +51,64 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) return TRUE; } +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IClassFactory, riid)) { + *ppv = iface; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + WARN("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 1; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("(%p)->(%x)\n", iface, fLock); + return S_OK; +} + +static const IClassFactoryVtbl EchoFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + EchoFactory_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory echofx_factory = { &EchoFactoryVtbl }; + /*********************************************************************** * DllGetClassObject */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { + TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + if(IsEqualGUID(&GUID_DSFX_STANDARD_ECHO, rclsid)) + { + TRACE("GUID_DSFX_STANDARD_ECHO\n"); + return IClassFactory_QueryInterface(&echofx_factory, riid, ppv); + } + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; } -- 2.17.1

1 0

[PATCH 1/4] dsdmo: Added dll
by Alistair Leslie-Hughes 30 Sep '19

30 Sep '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure | 2 + configure.ac | 1 + dlls/dsdmo/Makefile.in | 6 +++ dlls/dsdmo/dsdmo.spec | 4 ++ dlls/dsdmo/main.c | 85 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 98 insertions(+) create mode 100644 dlls/dsdmo/Makefile.in create mode 100644 dlls/dsdmo/dsdmo.spec create mode 100644 dlls/dsdmo/main.c diff --git a/configure b/configure index e3ade280be..d257e19df7 100755 --- a/configure +++ b/configure @@ -1257,6 +1257,7 @@ enable_dpnlobby enable_dpvoice enable_dpwsockx enable_drmclien +enable_dsdmo enable_dsound enable_dsquery enable_dssenh @@ -20384,6 +20385,7 @@ wine_fn_config_makefile dlls/dpvoice enable_dpvoice wine_fn_config_makefile dlls/dpvoice/tests enable_tests wine_fn_config_makefile dlls/dpwsockx enable_dpwsockx wine_fn_config_makefile dlls/drmclien enable_drmclien +wine_fn_config_makefile dlls/dsdmo enable_dsdmo wine_fn_config_makefile dlls/dsound enable_dsound wine_fn_config_makefile dlls/dsound/tests enable_tests wine_fn_config_makefile dlls/dsquery enable_dsquery diff --git a/configure.ac b/configure.ac index b9339b90aa..9c0df567d8 100644 --- a/configure.ac +++ b/configure.ac @@ -3237,6 +3237,7 @@ WINE_CONFIG_MAKEFILE(dlls/dpvoice) WINE_CONFIG_MAKEFILE(dlls/dpvoice/tests) WINE_CONFIG_MAKEFILE(dlls/dpwsockx) WINE_CONFIG_MAKEFILE(dlls/drmclien) +WINE_CONFIG_MAKEFILE(dlls/dsdmo) WINE_CONFIG_MAKEFILE(dlls/dsound) WINE_CONFIG_MAKEFILE(dlls/dsound/tests) WINE_CONFIG_MAKEFILE(dlls/dsquery) diff --git a/dlls/dsdmo/Makefile.in b/dlls/dsdmo/Makefile.in new file mode 100644 index 0000000000..99816ae0c0 --- /dev/null +++ b/dlls/dsdmo/Makefile.in @@ -0,0 +1,6 @@ +MODULE = dsdmo.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + main.c diff --git a/dlls/dsdmo/dsdmo.spec b/dlls/dsdmo/dsdmo.spec new file mode 100644 index 0000000000..b16365d0c9 --- /dev/null +++ b/dlls/dsdmo/dsdmo.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c new file mode 100644 index 0000000000..61a67f44d8 --- /dev/null +++ b/dlls/dsdmo/main.c @@ -0,0 +1,85 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#define COBJMACROS + +#include "ole2.h" +#include "rpcproxy.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dsdmo); + +static HINSTANCE dsdmo_instance; + +/****************************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv); + + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + dsdmo_instance = hInstDLL; + DisableThreadLibraryCalls(dsdmo_instance); + break; + case DLL_PROCESS_DETACH: + if (lpv) break; + break; + } + + return TRUE; +} + +/*********************************************************************** + * DllGetClassObject + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllCanUnloadNow + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer + */ +HRESULT WINAPI DllRegisterServer(void) +{ + TRACE("()\n"); + return __wine_register_resources(dsdmo_instance); +} + +/*********************************************************************** + * DllUnregisterServer + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + TRACE("()\n"); + return __wine_unregister_resources(dsdmo_instance); +} -- 2.17.1

1 0

[PATCH] mshtml: Fix the spelling of some comments.
by Francois Gouget 30 Sep '19

30 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/mshtml/nsiface.idl | 2 +- dlls/mshtml/persist.c | 2 +- dlls/mshtml/tests/htmldoc.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 09148aa9d1f..6074edebca9 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -2989,7 +2989,7 @@ interface nsIDOMEvent : nsISupports nsresult DuplicatePrivateData(); nsresult SetTarget(nsIDOMEventTarget *aTarget); bool IsDispatchStopped(); - /*WidgedEvent*/ void *WidgetEventPtr(); + /*WidgetEvent*/ void *WidgetEventPtr(); void SetTrusted(bool aTrusted); void Serialize(/*IPC::Message*/ void *aMsg, bool aSerializeInterfaceType); bool Deserialize(const /*IPC::Message*/ void *aMsg, void **aIter); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index e239fb5b16a..e87ca47c390 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -354,7 +354,7 @@ HRESULT set_moniker(HTMLOuterWindow *window, IMoniker *mon, IUri *nav_uri, IBind hres = IMoniker_GetDisplayName(mon, pibc, NULL, &url); if(FAILED(hres)) { - WARN("GetDiaplayName failed: %08x\n", hres); + WARN("GetDisplayName failed: %08x\n", hres); return hres; } diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index f8ae785b390..d13381aa0ab 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -5133,7 +5133,7 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG * STopLevelBrowser * IHTMLWindow2 * IInternetProtocol - * UrlHostory + * UrlHistory * IHTMLEditHost * IHlinkFrame */ -- 2.20.1

2 1

[PATCH] winspool.drv/tests: Avoid an unneeded strlen() call.
by Francois Gouget 29 Sep '19

29 Sep '19

Note that buffer is an array and thus cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winspool.drv/tests/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index bfc80ce0f6d..03a2e3cd32a 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -1456,7 +1456,7 @@ static void test_GetDefaultPrinter(void) SetLastError(ERROR_SUCCESS); retval = pGetDefaultPrinterA(buffer, &exact); - if (!retval || !exact || !strlen(buffer) || + if (!retval || !exact || !*buffer || (ERROR_SUCCESS != GetLastError())) { if ((ERROR_FILE_NOT_FOUND == GetLastError()) || (ERROR_INVALID_NAME == GetLastError())) -- 2.20.1

1 0

[PATCH] msg711.acm: Fix the spelling of the copyright notice.
by Francois Gouget 29 Sep '19

29 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msg711.acm/msg711.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index 9c44c65b299..6909494e29f 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -161,7 +161,7 @@ static inline void W16(unsigned char* dst, short s) * charge. * * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING - * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR + * THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. * * Sun source code is provided with no support and without any obligation on -- 2.20.1

1 0

[PATCH] ntdll: Add exception handling around DbgBreakPoint.
by Akihiro Sagawa 29 Sep '19

29 Sep '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47509 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/tests/debugger.c | 32 ++++++++++++++++++++++++-------- dlls/ntdll/process.c | 19 ++++++++++++++++++- 2 files changed, 42 insertions(+), 9 deletions(-)

2 1