September 2015 - Wine-Commits

Andrew Eikum : xaudio2: Add stub implementation of AudioVolumeMeter.
by Alexandre Julliard Sept. 9, 2015

Sept. 9, 2015

Module: wine Branch: master Commit: 395dc0f22cffa95ffcc4be5c4b3adf2678495503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=395dc0f22cffa95ffcc4be5c4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Sep 8 09:33:44 2015 -0500 xaudio2: Add stub implementation of AudioVolumeMeter. --- dlls/xaudio2_7/tests/xaudio2.c | 35 +++++- dlls/xaudio2_7/xaudio_classes.idl | 7 ++ dlls/xaudio2_7/xaudio_dll.c | 245 ++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_8/xaudio2_8.spec | 1 + dlls/xaudio2_8/xaudio_dll.c | 8 ++ include/Makefile.in | 1 + include/xaudio2fx.idl | 26 ++++ 7 files changed, 321 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=395dc0f22cffa95ffcc4b…

1 0

Nikolay Sivov : oledlg: Improve menu items localization for OleUIAddVerbMenuW().
by Alexandre Julliard Sept. 9, 2015

Sept. 9, 2015

Module: wine Branch: master Commit: 2a761320db4c8d4b5f1d4c0230a790b986778582 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a761320db4c8d4b5f1d4c023… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 8 16:45:18 2015 +0300 oledlg: Improve menu items localization for OleUIAddVerbMenuW(). --- dlls/oledlg/oledlg.rc | 2 + dlls/oledlg/oledlg_main.c | 36 +++++++++------- dlls/oledlg/resource.h | 2 + po/ar.po | 103 +++++++++++++++++++++++++--------------------- po/bg.po | 99 +++++++++++++++++++++++--------------------- po/ca.po | 103 +++++++++++++++++++++++++--------------------- po/cs.po | 103 +++++++++++++++++++++++++--------------------- po/da.po | 103 +++++++++++++++++++++++++--------------------- po/de.po | 103 +++++++++++++++++++++++++--------------------- po/el.po | 99 +++++++++++++++++++++++--------------------- po/en.po | 99 +++++++++++++++++++++++--------------------- po/en_US.po | 99 +++++++++++++++++++++++--------------------- po/eo.po | 99 +++++++++++++++++++++++--------------------- po/es.po | 103 +++++++++++++++++++++++++--------------------- po/fa.po | 99 +++++++++++++++++++++++--------------------- po/fi.po | 103 +++++++++++++++++++++++++--------------------- po/fr.po | 103 +++++++++++++++++++++++++--------------------- po/he.po | 103 +++++++++++++++++++++++++--------------------- po/hi.po | 99 +++++++++++++++++++++++--------------------- po/hr.po | 103 +++++++++++++++++++++++++--------------------- po/hu.po | 103 +++++++++++++++++++++++++--------------------- po/it.po | 103 +++++++++++++++++++++++++--------------------- po/ja.po | 103 +++++++++++++++++++++++++--------------------- po/ko.po | 103 +++++++++++++++++++++++++--------------------- po/lt.po | 103 +++++++++++++++++++++++++--------------------- po/ml.po | 99 +++++++++++++++++++++++--------------------- po/nb_NO.po | 103 +++++++++++++++++++++++++--------------------- po/nl.po | 103 +++++++++++++++++++++++++--------------------- po/or.po | 99 +++++++++++++++++++++++--------------------- po/pa.po | 99 +++++++++++++++++++++++--------------------- po/pl.po | 103 +++++++++++++++++++++++++--------------------- po/pt_BR.po | 103 +++++++++++++++++++++++++--------------------- po/pt_PT.po | 103 +++++++++++++++++++++++++--------------------- po/rm.po | 99 +++++++++++++++++++++++--------------------- po/ro.po | 103 +++++++++++++++++++++++++--------------------- po/ru.po | 103 +++++++++++++++++++++++++--------------------- po/sk.po | 103 +++++++++++++++++++++++++--------------------- po/sl.po | 103 +++++++++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 101 ++++++++++++++++++++++++--------------------- po/sr_RS(a)latin.po | 101 ++++++++++++++++++++++++--------------------- po/sv.po | 103 +++++++++++++++++++++++++--------------------- po/te.po | 99 +++++++++++++++++++++++--------------------- po/th.po | 99 +++++++++++++++++++++++--------------------- po/tr.po | 103 +++++++++++++++++++++++++--------------------- po/uk.po | 103 +++++++++++++++++++++++++--------------------- po/wa.po | 99 +++++++++++++++++++++++--------------------- po/wine.pot | 99 +++++++++++++++++++++++--------------------- po/zh_CN.po | 103 +++++++++++++++++++++++++--------------------- po/zh_TW.po | 103 +++++++++++++++++++++++++--------------------- 49 files changed, 2582 insertions(+), 2132 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a761320db4c8d4b5f1d4…

1 0

Andrew Eikum : include/xapo.idl: Add descriptions for IXAPO and IXAPOProperties.
by Alexandre Julliard Sept. 9, 2015

Sept. 9, 2015

Module: wine Branch: master Commit: 8f98d4e6c4877e821b82a6457e471d2e99575471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f98d4e6c4877e821b82a6457… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Sep 8 09:33:40 2015 -0500 include/xapo.idl: Add descriptions for IXAPO and IXAPOProperties. --- include/Makefile.in | 1 + include/xapo.idl | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index f4d853e..9ed7663 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -145,6 +145,7 @@ PUBLIC_IDL_H_SRCS = \ wpcapi.idl \ wtypes.idl \ wuapi.idl \ + xapo.idl \ xaudio2.idl \ xmllite.idl diff --git a/include/xapo.idl b/include/xapo.idl new file mode 100644 index 0000000..9055775 --- /dev/null +++ b/include/xapo.idl @@ -0,0 +1,131 @@ +/* + * Copyright (c) 2015 Andrew Eikum for CodeWeavers + * + * 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 + */ + +import "unknwn.idl"; + +#define XAPO_REGISTRATION_STRING_LENGTH 256 + +cpp_quote("#if 0") +typedef struct WAVEFORMATEX +{ + WORD wFormatTag; + WORD nChannels; + DWORD nSamplesPerSec; + DWORD nAvgBytesPerSec; + WORD nBlockAlign; + WORD wBitsPerSample; + WORD cbSize; +} WAVEFORMATEX; + +typedef struct { + WAVEFORMATEX Format; + union { + WORD wValidBitsPerSample; + WORD wSamplesPerBlock; + WORD wReserved; + } Samples; + DWORD dwChannelMask; + GUID SubFormat; +} WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE; +cpp_quote("#else") +cpp_quote("#include <mmreg.h>") +cpp_quote("#endif") + +typedef struct XAPO_REGISTRATION_PROPERTIES +{ + CLSID clsid; + WCHAR FriendlyName[XAPO_REGISTRATION_STRING_LENGTH]; + WCHAR CopyrightInfo[XAPO_REGISTRATION_STRING_LENGTH]; + UINT32 MajorVersion; + UINT32 MinorVersion; + UINT32 Flags; + UINT32 MinInputBufferCount; + UINT32 MaxInputBufferCount; + UINT32 MinOutputBufferCount; + UINT32 MaxOutputBufferCount; +} XAPO_REGISTRATION_PROPERTIES; + +typedef struct XAPO_LOCKFORPROCESS_BUFFER_PARAMETERS { + const WAVEFORMATEX *pFormat; + UINT32 MaxFrameCount; +} XAPO_LOCKFORPROCESS_BUFFER_PARAMETERS; + +typedef enum XAPO_BUFFER_FLAGS { + XAPO_BUFFER_SILENT, + XAPO_BUFFER_VALID +} XAPO_BUFFER_FLAGS; + +typedef struct XAPO_PROCESS_BUFFER_PARAMETERS { + void *pBuffer; + XAPO_BUFFER_FLAGS BufferFlags; + UINT32 ValidFrameCount; +} XAPO_PROCESS_BUFFER_PARAMETERS; + +/* XAudio2 2.8 version of IXAPO */ +[ + object, + local, + uuid(a410b984-9839-4819-a0be-2856ae6b3adb) +] +interface IXAPO : IUnknown +{ + HRESULT GetRegistrationProperties([out] XAPO_REGISTRATION_PROPERTIES **props); + + HRESULT IsInputFormatSupported(const WAVEFORMATEX *output_fmt, + const WAVEFORMATEX *input_fmt, WAVEFORMATEX **supported_fmt); + + HRESULT IsOutputFormatSupported(const WAVEFORMATEX *input_fmt, + const WAVEFORMATEX *output_fmt, WAVEFORMATEX **supported_fmt); + + HRESULT Initialize(const void *data, UINT32 data_len); + + HRESULT Reset(void); + + HRESULT LockForProcess(UINT32 in_params_count, const XAPO_LOCKFORPROCESS_BUFFER_PARAMETERS *in_params, + UINT32 out_params_count, const XAPO_LOCKFORPROCESS_BUFFER_PARAMETERS *out_params); + + void UnlockForProcess(void); + + void Process(UINT32 in_params_count, const XAPO_PROCESS_BUFFER_PARAMETERS *in_params, + UINT32 out_params_count, const XAPO_PROCESS_BUFFER_PARAMETERS *out_params, + BOOL enabled); + + UINT32 CalcInputFrames(UINT32 output_frames); + + UINT32 CalcOutputFrames(UINT32 input_frames); +} + +/* XAudio2 2.7 version of IXAPO is identical to 2.8 */ +cpp_quote("DEFINE_GUID(IID_IXAPO27, 0xa90bc001, 0xe897, 0xe897, 0x55, 0xe4, 0x9e, 0x47, 0x00, 0x00, 0x00, 0x00);") + + +/* XAudio2 2.8 version of IXAPOParameters */ +[ + object, + local, + uuid(26d95c66-80f2-499a-ad54-5ae7f01c6d98) +] +interface IXAPOParameters : IUnknown +{ + void SetParameters(const void *params, UINT32 params_len); + + void GetParameters(void *params, UINT32 params_len); +} + +/* XAudio2 2.7 version of IXAPOParameters is identical to 2.8 */ +cpp_quote("DEFINE_GUID(IID_IXAPO27Parameters, 0xa90bc001, 0xe897, 0xe897, 0x55, 0xe4, 0x9e, 0x47, 0x00, 0x00, 0x00, 0x01);")

1 0

Andrew Eikum : xaudio2: Add stub for AudioReverb class.
by Alexandre Julliard Sept. 9, 2015

Sept. 9, 2015

Module: wine Branch: master Commit: b3cb1e4d407dd5564846d989d356326bddc73b70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3cb1e4d407dd5564846d989d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Sep 8 09:33:47 2015 -0500 xaudio2: Add stub for AudioReverb class. --- dlls/xaudio2_7/xaudio_classes.idl | 7 ++ dlls/xaudio2_7/xaudio_dll.c | 241 ++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_8/xaudio_dll.c | 6 + include/xaudio2fx.idl | 7 ++ 4 files changed, 261 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_classes.idl b/dlls/xaudio2_7/xaudio_classes.idl index a39d082..a1ed611 100644 --- a/dlls/xaudio2_7/xaudio_classes.idl +++ b/dlls/xaudio2_7/xaudio_classes.idl @@ -33,3 +33,10 @@ coclass XAudio2 { interface IXAudio2; } uuid(cac1105f-619b-4d04-831a-44e1cbf12d57) ] coclass AudioVolumeMeter { interface IUnknown; } + +[ + helpstring("XAudio2 Reverb Class"), + threading(both), + uuid(6a93130e-1d53-41d1-a9cf-e758800bb179) +] +coclass AudioReverb { interface IUnknown; } diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 7a5f45b..739c919 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2435,6 +2435,206 @@ static const IXAPOParametersVtbl VUMXAPOParameters_Vtbl = { VUMXAPOParams_GetParameters }; +typedef struct _ReverbImpl { + IXAPO IXAPO_iface; + IXAPOParameters IXAPOParameters_iface; + + LONG ref; +} ReverbImpl; + +static ReverbImpl *ReverbImpl_from_IXAPO(IXAPO *iface) +{ + return CONTAINING_RECORD(iface, ReverbImpl, IXAPO_iface); +} + +static ReverbImpl *ReverbImpl_from_IXAPOParameters(IXAPOParameters *iface) +{ + return CONTAINING_RECORD(iface, ReverbImpl, IXAPOParameters_iface); +} + +static HRESULT WINAPI RVBXAPO_QueryInterface(IXAPO *iface, REFIID riid, void **ppvObject) +{ + ReverbImpl *This = ReverbImpl_from_IXAPO(iface); + + TRACE("%p, %s, %p\n", This, wine_dbgstr_guid(riid), ppvObject); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IXAPO) || + IsEqualGUID(riid, &IID_IXAPO27)) + *ppvObject = &This->IXAPO_iface; + else if(IsEqualGUID(riid, &IID_IXAPOParameters)) + *ppvObject = &This->IXAPOParameters_iface; + else + *ppvObject = NULL; + + if(*ppvObject){ + IUnknown_AddRef((IUnknown*)*ppvObject); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI RVBXAPO_AddRef(IXAPO *iface) +{ + ReverbImpl *This = ReverbImpl_from_IXAPO(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(): Refcount now %u\n", This, ref); + return ref; +} + +static ULONG WINAPI RVBXAPO_Release(IXAPO *iface) +{ + ReverbImpl *This = ReverbImpl_from_IXAPO(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(): Refcount now %u\n", This, ref); + + if(!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI RVBXAPO_GetRegistrationProperties(IXAPO *iface, + XAPO_REGISTRATION_PROPERTIES **props) +{ + ReverbImpl *This = ReverbImpl_from_IXAPO(iface); + TRACE("%p, %p\n", This, props); + return E_NOTIMPL; +} + +static HRESULT WINAPI RVBXAPO_IsInputFormatSupported(IXAPO *iface, + const WAVEFORMATEX *output_fmt, const WAVEFORMATEX *input_fmt, + WAVEFORMATEX **supported_fmt) +{ + ReverbImpl *This = ReverbImpl_from_IXAPO(iface); + TRACE("%p, %p, %p, %p\n", This, output_fmt, input_fmt, supported_fmt); + return E_NOTIMPL; +} + +static HRESULT WINAPI RVBXAPO_IsOutputFormatSupported(IXAPO *iface, + const WAVEFORMATEX *input_fmt, const WAVEFORMATEX *output_fmt, + WAVEFORMATEX **supported_fmt) +{ + ReverbImpl *This = ReverbImpl_from_IXAPO(iface); + TRACE("%p, %p, %p, %p\n", This, input_fmt, output_fmt, supported_fmt); + return E_NOTIMPL; +} + +static HRESULT WINAPI RVBXAPO_Initialize(IXAPO *iface, const void *data, + UINT32 data_len) +{ + ReverbImpl *This = ReverbImpl_from_IXAPO(iface); + TRACE("%p, %p, %u\n", This, data, data_len); + return E_NOTIMPL; +} + +static HRESULT WINAPI RVBXAPO_Reset(IXAPO *iface) +{ + ReverbImpl *This = ReverbImpl_from_IXAPO(iface); + TRACE("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI RVBXAPO_LockForProcess(IXAPO *iface, UINT32 in_params_count, + const XAPO_LOCKFORPROCESS_BUFFER_PARAMETERS *in_params, + UINT32 out_params_count, + const XAPO_LOCKFORPROCESS_BUFFER_PARAMETERS *out_params) +{ + ReverbImpl *This = ReverbImpl_from_IXAPO(iface); + TRACE("%p, %u, %p, %u, %p\n", This, in_params_count, in_params, + out_params_count, out_params); + return E_NOTIMPL; +} + +static void WINAPI RVBXAPO_UnlockForProcess(IXAPO *iface) +{ + ReverbImpl *This = ReverbImpl_from_IXAPO(iface); + TRACE("%p\n", This); +} + +static void WINAPI RVBXAPO_Process(IXAPO *iface, UINT32 in_params_count, + const XAPO_PROCESS_BUFFER_PARAMETERS *in_params, + UINT32 out_params_count, + const XAPO_PROCESS_BUFFER_PARAMETERS *out_params, BOOL enabled) +{ + ReverbImpl *This = ReverbImpl_from_IXAPO(iface); + TRACE("%p, %u, %p, %u, %p, %u\n", This, in_params_count, in_params, + out_params_count, out_params, enabled); +} + +static UINT32 WINAPI RVBXAPO_CalcInputFrames(IXAPO *iface, UINT32 output_frames) +{ + ReverbImpl *This = ReverbImpl_from_IXAPO(iface); + TRACE("%p, %u\n", This, output_frames); + return 0; +} + +static UINT32 WINAPI RVBXAPO_CalcOutputFrames(IXAPO *iface, UINT32 input_frames) +{ + ReverbImpl *This = ReverbImpl_from_IXAPO(iface); + TRACE("%p, %u\n", This, input_frames); + return 0; +} + +static const IXAPOVtbl RVBXAPO_Vtbl = { + RVBXAPO_QueryInterface, + RVBXAPO_AddRef, + RVBXAPO_Release, + RVBXAPO_GetRegistrationProperties, + RVBXAPO_IsInputFormatSupported, + RVBXAPO_IsOutputFormatSupported, + RVBXAPO_Initialize, + RVBXAPO_Reset, + RVBXAPO_LockForProcess, + RVBXAPO_UnlockForProcess, + RVBXAPO_Process, + RVBXAPO_CalcInputFrames, + RVBXAPO_CalcOutputFrames +}; + +static HRESULT WINAPI RVBXAPOParams_QueryInterface(IXAPOParameters *iface, + REFIID riid, void **ppvObject) +{ + ReverbImpl *This = ReverbImpl_from_IXAPOParameters(iface); + return RVBXAPO_QueryInterface(&This->IXAPO_iface, riid, ppvObject); +} + +static ULONG WINAPI RVBXAPOParams_AddRef(IXAPOParameters *iface) +{ + ReverbImpl *This = ReverbImpl_from_IXAPOParameters(iface); + return RVBXAPO_AddRef(&This->IXAPO_iface); +} + +static ULONG WINAPI RVBXAPOParams_Release(IXAPOParameters *iface) +{ + ReverbImpl *This = ReverbImpl_from_IXAPOParameters(iface); + return RVBXAPO_Release(&This->IXAPO_iface); +} + +static void WINAPI RVBXAPOParams_SetParameters(IXAPOParameters *iface, + const void *params, UINT32 params_len) +{ + ReverbImpl *This = ReverbImpl_from_IXAPOParameters(iface); + TRACE("%p, %p, %u\n", This, params, params_len); +} + +static void WINAPI RVBXAPOParams_GetParameters(IXAPOParameters *iface, void *params, + UINT32 params_len) +{ + ReverbImpl *This = ReverbImpl_from_IXAPOParameters(iface); + TRACE("%p, %p, %u\n", This, params, params_len); +} + +static const IXAPOParametersVtbl RVBXAPOParameters_Vtbl = { + RVBXAPOParams_QueryInterface, + RVBXAPOParams_AddRef, + RVBXAPOParams_Release, + RVBXAPOParams_SetParameters, + RVBXAPOParams_GetParameters +}; + static HRESULT WINAPI XAudio2CF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) { if(IsEqualGUID(riid, &IID_IUnknown) @@ -2615,6 +2815,35 @@ static HRESULT WINAPI VUMeterCF_CreateInstance(IClassFactory *iface, IUnknown *p return S_OK; } +static HRESULT WINAPI ReverbCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, + REFIID riid, void **ppobj) +{ + HRESULT hr; + ReverbImpl *object; + + TRACE("(static)->(%p,%s,%p)\n", pOuter, debugstr_guid(riid), ppobj); + + *ppobj = NULL; + + if(pOuter) + return CLASS_E_NOAGGREGATION; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if(!object) + return E_OUTOFMEMORY; + + object->IXAPO_iface.lpVtbl = &RVBXAPO_Vtbl; + object->IXAPOParameters_iface.lpVtbl = &RVBXAPOParameters_Vtbl; + + hr = IXAPO_QueryInterface(&object->IXAPO_iface, riid, ppobj); + if(FAILED(hr)){ + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + return S_OK; +} + static HRESULT WINAPI XAudio2CF_LockServer(IClassFactory *iface, BOOL dolock) { FIXME("(static)->(%d): stub!\n", dolock); @@ -2639,8 +2868,18 @@ static const IClassFactoryVtbl VUMeterCF_Vtbl = XAudio2CF_LockServer }; +static const IClassFactoryVtbl ReverbCF_Vtbl = +{ + XAudio2CF_QueryInterface, + XAudio2CF_AddRef, + XAudio2CF_Release, + ReverbCF_CreateInstance, + XAudio2CF_LockServer +}; + static IClassFactory xaudio2_cf = { &XAudio2CF_Vtbl }; static IClassFactory vumeter_cf = { &VUMeterCF_Vtbl }; +static IClassFactory reverb_cf = { &ReverbCF_Vtbl }; HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { @@ -2652,6 +2891,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) factory = &xaudio2_cf; }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter)) { factory = &vumeter_cf; + }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb)) { + factory = &reverb_cf; } if(!factory) return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/xaudio2_8/xaudio_dll.c b/dlls/xaudio2_8/xaudio_dll.c index 521cc29..4a73783 100644 --- a/dlls/xaudio2_8/xaudio_dll.c +++ b/dlls/xaudio2_8/xaudio_dll.c @@ -79,3 +79,9 @@ HRESULT WINAPI CreateAudioVolumeMeter(IUnknown **out) return CoCreateInstance(&CLSID_AudioVolumeMeter, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)out); } + +HRESULT WINAPI CreateAudioReverb(IUnknown **out) +{ + return CoCreateInstance(&CLSID_AudioReverb, NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)out); +} diff --git a/include/xaudio2fx.idl b/include/xaudio2fx.idl index 8d74264..a83b2f6 100644 --- a/include/xaudio2fx.idl +++ b/include/xaudio2fx.idl @@ -24,3 +24,10 @@ import "unknwn.idl"; coclass AudioVolumeMeter { interface IUnknown; } + +[ + uuid(6a93130e-1d53-41d1-a9cf-e758800bb179) +] +coclass AudioReverb { + interface IUnknown; +}

1 0

Bruno Jesus : msadp32.acm: Ensure we have enough memory before memcopying data.
by Alexandre Julliard Sept. 9, 2015

Sept. 9, 2015

Module: wine Branch: master Commit: f5d183e20eefc041e118da4c37e3465a6ba9583f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5d183e20eefc041e118da4c3… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Sep 9 12:10:21 2015 +0800 msadp32.acm: Ensure we have enough memory before memcopying data. --- dlls/msadp32.acm/msadp32.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index 83d1b46..2c61575 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -542,6 +542,8 @@ static LRESULT ADPCM_FormatSuggest(PACMDRVFORMATSUGGEST adfs) if (ADPCM_GetFormatIndex(adfs->pwfxDst) == 0xFFFFFFFF) return ACMERR_NOTPOSSIBLE; break; case WAVE_FORMAT_ADPCM: + if (adfs->cbwfxDst < sizeof(ADPCMWAVEFORMAT) + (7 - 1) * sizeof(ADPCMCOEFSET)) + return ACMERR_NOTPOSSIBLE; init_wfx_adpcm((ADPCMWAVEFORMAT*)adfs->pwfxDst); /* check if result is ok */ if (ADPCM_GetFormatIndex(adfs->pwfxDst) == 0xFFFFFFFF) return ACMERR_NOTPOSSIBLE;

1 0

Nikolay Sivov : oledlg/tests: Handle localized menu strings.
by Alexandre Julliard Sept. 9, 2015

Sept. 9, 2015

Module: wine Branch: master Commit: 88a97cd4320f4de238b5e9e1d4c0217866622cdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=88a97cd4320f4de238b5e9e1d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 8 16:32:17 2015 +0300 oledlg/tests: Handle localized menu strings. --- dlls/oledlg/tests/main.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/oledlg/tests/main.c b/dlls/oledlg/tests/main.c index d7f696a..9c5e4bd 100644 --- a/dlls/oledlg/tests/main.c +++ b/dlls/oledlg/tests/main.c @@ -26,6 +26,18 @@ #include "initguid.h" #include "oledlg.h" +static const WCHAR *strstrW( const WCHAR *str, const WCHAR *sub ) +{ + while (*str) + { + const WCHAR *p1 = str, *p2 = sub; + while (*p1 && *p2 && *p1 == *p2) { p1++; p2++; } + if (!*p2) return str; + str++; + } + return NULL; +} + static HRESULT WINAPI enumverbs_QueryInterface(IEnumOLEVERB *iface, REFIID riid, void **ppv) { if (IsEqualIID(riid, &IID_IEnumOLEVERB) || IsEqualIID(riid, &IID_IUnknown)) { @@ -396,8 +408,9 @@ static void test_OleUIAddVerbMenu(void) info.cch = sizeof(buffW)/sizeof(WCHAR); ret = GetMenuItemInfoW(hMenu, 4, TRUE, &info); ok(ret, "got %d\n", ret); - /* item string has a form of '<verb> <usertype> <Object>', where Object is localized */ - ok(!memcmp(buffW, verbW, sizeof(verbW) - sizeof(WCHAR)), "str %s\n", wine_dbgstr_w(buffW)); + /* Item string contains verb, usertype and localized string for 'Object' word, + exact format depends on localization. */ + ok(strstrW(buffW, verbW) != NULL, "str %s\n", wine_dbgstr_w(buffW)); ok(info.fState == 0, "got state 0x%08x\n", info.fState); ok(info.hSubMenu == NULL, "got submenu %p\n", info.hSubMenu);

1 0

Bruno Jesus : msacm32: Catch NULL parameters in acmFormatSuggest().
by Alexandre Julliard Sept. 9, 2015

Sept. 9, 2015

Module: wine Branch: master Commit: d08197f92aab2c52f257488d134f3bfc3a1a2ff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d08197f92aab2c52f257488d1… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Sep 9 12:10:32 2015 +0800 msacm32: Catch NULL parameters in acmFormatSuggest(). --- dlls/msacm32/format.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index f7f0fa4..1ab05ae 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -676,6 +676,9 @@ MMRESULT WINAPI acmFormatSuggest(HACMDRIVER had, PWAVEFORMATEX pwfxSrc, TRACE("(%p, %p, %p, %d, %d)\n", had, pwfxSrc, pwfxDst, cbwfxDst, fdwSuggest); + if (!pwfxSrc || !pwfxDst) + return MMSYSERR_INVALPARAM; + if (fdwSuggest & ~(ACM_FORMATSUGGESTF_NCHANNELS|ACM_FORMATSUGGESTF_NSAMPLESPERSEC| ACM_FORMATSUGGESTF_WBITSPERSAMPLE|ACM_FORMATSUGGESTF_WFORMATTAG)) return MMSYSERR_INVALFLAG;

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.51
by Jeremy Newman Sept. 8, 2015

Sept. 8, 2015

Module: website Branch: master Commit: 5bbe9a58820402ea9062d3e820d0942830dae33d URL: http://source.winehq.org/git/website.git/?a=commit;h=5bbe9a58820402ea9062d3… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Sep 5 07:20:57 2015 +0200 Polish translation for release 1.7.51 --- news/pl/2015090401.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2015090401.xml b/news/pl/2015090401.xml new file mode 100644 index 0000000..1fae45b --- /dev/null +++ b/news/pl/2015090401.xml @@ -0,0 +1,16 @@ +<news> +<date>Wrzesień 4, 2015</date> +<title>Wydano Wine 1.7.51</title> +<body> + Wydanie rozwojowe Wine 1.7.51 jest już dostępne. + <a href="{$root}/announce/1.7.51">Co nowego</a> w tym wydaniu: +<ul> + <li>Implementacja XAudio2 przy użyciu oprogramowania OpenAL.</li> + <li>Wsparcie dla nowej, uniwersalnej biblioteki uruchomieniowej DLL dla C.</li> + <li>Wsparcie dla menu rozwijanego w standardowym oknie dialogowym otwierania.</li> + <li>Tryb wyświetlania w odcieniach szarości w DirectWrite.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.51.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Julian Rüger : German translation for release 1.7.51
by Jeremy Newman Sept. 8, 2015

Sept. 8, 2015

Module: website Branch: master Commit: 28721c9a56eb63c9548b00eb9ab5e194eff41a98 URL: http://source.winehq.org/git/website.git/?a=commit;h=28721c9a56eb63c9548b00… Author: Julian Rüger <jr98(a)gmx.net> Date: Sat Sep 5 17:28:34 2015 +0200 German translation for release 1.7.51 --- news/de/2015090401.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2015090401.xml b/news/de/2015090401.xml new file mode 100644 index 0000000..d6e6774 --- /dev/null +++ b/news/de/2015090401.xml @@ -0,0 +1,16 @@ +<news> +<date>4. September 2015</date> +<title>Wine 1.7.51 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.51 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.51">Neuerungen (en)</a> in dieser Version: +<ul> + <li>XAudio2-Implementierung über OpenAL-Soft.</li> + <li>Unterstützung der neuen Universal-C-Laufzeit-DLL.</li> + <li>Dropdownmenü-Unterstützung im standard Öffnen-Dialog.</li> + <li>Graustufen-Rendermodus in DirectWrite.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.51.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Gerald Pfeifer : d3d9: Avoid shift overflow in render_state_test_data_init.
by Alexandre Julliard Sept. 8, 2015

Sept. 8, 2015

Module: wine Branch: master Commit: 601aa570f143d17a514dd7e21a53546fd14a71f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=601aa570f143d17a514dd7e21… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Sep 7 23:09:50 2015 +0200 d3d9: Avoid shift overflow in render_state_test_data_init. Same patch as just a minute ago, alas fro d3d9 instead of d3d8. Gerald --- dlls/d3d9/tests/stateblock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 1d033de..bb89ba0 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -1384,7 +1384,7 @@ static void render_state_test_data_init(struct render_state_data *data) data->states[idx++] = TRUE; /* ALPHABLENDENABLE */ data->states[idx++] = TRUE; /* FOGENABLE */ data->states[idx++] = TRUE; /* SPECULARENABLE */ - data->states[idx++] = 1 << 31; /* FOGCOLOR */ + data->states[idx++] = 1u << 31; /* FOGCOLOR */ data->states[idx++] = D3DFOG_EXP; /* FOGTABLEMODE */ data->states[idx++] = to_dword(0.1f); /* FOGSTART */ data->states[idx++] = to_dword(0.8f); /* FOGEND */

1 0