- wine-devel - winehq.org

[PATCH v2 3/5] Don't use ZeroBits argument in NtAllocateVirtualMemory as alignment
by Las＠protonmail.ch 02 Mar '19

02 Mar '19

Empty Message

2 1

[PATCH v2 2/5] Add comment explaining what ZeroBits argument of NtMapViewOfSection is for
by Las＠protonmail.ch 02 Mar '19

02 Mar '19

Empty Message

1 0

[PATCH 1/3] wmvcore: move IWMReader implementation to separate file
by Vijay Kiran Kamuju 02 Mar '19

02 Mar '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/wmvcore/Makefile.in | 1 + dlls/wmvcore/reader.c | 2073 +++++++++++++++++++++++++++++++++++ dlls/wmvcore/wmvcore_main.c | 2048 ---------------------------------- 3 files changed, 2074 insertions(+), 2048 deletions(-) create mode 100644 dlls/wmvcore/reader.c diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in index 0ee6f9761c..19d32f673c 100644 --- a/dlls/wmvcore/Makefile.in +++ b/dlls/wmvcore/Makefile.in @@ -3,6 +3,7 @@ IMPORTLIB = wmvcore IMPORTS = kernel32 C_SRCS = \ + reader.c \ wmvcore_main.c \ writer.c diff --git a/dlls/wmvcore/reader.c b/dlls/wmvcore/reader.c new file mode 100644 index 0000000000..8856985e98 --- /dev/null +++ b/dlls/wmvcore/reader.c @@ -0,0 +1,2073 @@ +/* + * Copyright 2012 Austin English + * + * 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 + */ + +#include "wmvcore.h" + +#include "wmsdk.h" +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); + +typedef struct { + IWMReader IWMReader_iface; + IWMReaderAdvanced6 IWMReaderAdvanced6_iface; + IWMReaderAccelerator IWMReaderAccelerator_iface; + IWMReaderNetworkConfig2 IWMReaderNetworkConfig2_iface; + IWMReaderStreamClock IWMReaderStreamClock_iface; + IWMReaderTypeNegotiation IWMReaderTypeNegotiation_iface; + IWMReaderTimecode IWMReaderTimecode_iface; + IWMReaderPlaylistBurn IWMReaderPlaylistBurn_iface; + IWMHeaderInfo3 IWMHeaderInfo3_iface; + IWMLanguageList IWMLanguageList_iface; + IReferenceClock IReferenceClock_iface; + IWMProfile3 IWMProfile3_iface; + IWMPacketSize2 IWMPacketSize2_iface; + LONG ref; +} WMReader; + +static inline WMReader *impl_from_IWMReader(IWMReader *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMReader_iface); +} + +static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMReader(iface); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IWMReader_iface; + }else if(IsEqualGUID(riid, &IID_IWMReader)) { + TRACE("(%p)->(IID_IWMReader %p)\n", This, ppv); + *ppv = &This->IWMReader_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced)) { + TRACE("(%p)->(IID_IWMReaderAdvanced %p)\n", This, ppv); + *ppv = &This->IWMReaderAdvanced6_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced2)) { + TRACE("(%p)->(IID_IWMReaderAdvanced2 %p)\n", This, ppv); + *ppv = &This->IWMReaderAdvanced6_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced3)) { + TRACE("(%p)->(IID_IWMReaderAdvanced3 %p)\n", This, ppv); + *ppv = &This->IWMReaderAdvanced6_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced4)) { + TRACE("(%p)->(IID_IWMReaderAdvanced4 %p)\n", This, ppv); + *ppv = &This->IWMReaderAdvanced6_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced5)) { + TRACE("(%p)->(IID_IWMReaderAdvanced5 %p)\n", This, ppv); + *ppv = &This->IWMReaderAdvanced6_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced6)) { + TRACE("(%p)->(IID_IWMReaderAdvanced6 %p)\n", This, ppv); + *ppv = &This->IWMReaderAdvanced6_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderAccelerator)) { + TRACE("(%p)->(IID_IWMReaderAccelerator %p)\n", This, ppv); + *ppv = &This->IWMReaderAccelerator_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderNetworkConfig)) { + TRACE("(%p)->(IWMReaderNetworkConfig %p)\n", This, ppv); + *ppv = &This->IWMReaderNetworkConfig2_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderNetworkConfig2)) { + TRACE("(%p)->(IWMReaderNetworkConfig2 %p)\n", This, ppv); + *ppv = &This->IWMReaderNetworkConfig2_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderStreamClock)) { + TRACE("(%p)->(IWMReaderStreamClock %p)\n", This, ppv); + *ppv = &This->IWMReaderStreamClock_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderTypeNegotiation)) { + TRACE("(%p)->(IWMReaderTypeNegotiation %p)\n", This, ppv); + *ppv = &This->IWMReaderTypeNegotiation_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderTimecode)) { + TRACE("(%p)->(IWMReaderTimecode %p)\n", This, ppv); + *ppv = &This->IWMReaderTimecode_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderPlaylistBurn)) { + TRACE("(%p)->(IWMReaderPlaylistBurn %p)\n", This, ppv); + *ppv = &This->IWMReaderPlaylistBurn_iface; + }else if(IsEqualGUID(riid, &IID_IWMHeaderInfo)) { + TRACE("(%p)->(IWMHeaderInfo %p)\n", This, ppv); + *ppv = &This->IWMHeaderInfo3_iface; + }else if(IsEqualGUID(riid, &IID_IWMHeaderInfo2)) { + TRACE("(%p)->(IWMHeaderInfo2 %p)\n", This, ppv); + *ppv = &This->IWMHeaderInfo3_iface; + }else if(IsEqualGUID(riid, &IID_IWMHeaderInfo3)) { + TRACE("(%p)->(IWMHeaderInfo3 %p)\n", This, ppv); + *ppv = &This->IWMHeaderInfo3_iface; + }else if(IsEqualGUID(riid, &IID_IWMLanguageList)) { + TRACE("(%p)->(IWMLanguageList %p)\n", This, ppv); + *ppv = &This->IWMLanguageList_iface; + }else if(IsEqualGUID(riid, &IID_IReferenceClock)) { + TRACE("(%p)->(IWMLanguageList %p)\n", This, ppv); + *ppv = &This->IReferenceClock_iface; + }else if(IsEqualGUID(riid, &IID_IWMProfile)) { + TRACE("(%p)->(IWMProfile %p)\n", This, ppv); + *ppv = &This->IWMProfile3_iface; + }else if(IsEqualGUID(riid, &IID_IWMProfile2)) { + TRACE("(%p)->(IWMProfile2 %p)\n", This, ppv); + *ppv = &This->IWMProfile3_iface; + }else if(IsEqualGUID(riid, &IID_IWMProfile3)) { + TRACE("(%p)->(IWMProfile3 %p)\n", This, ppv); + *ppv = &This->IWMProfile3_iface; + }else if(IsEqualGUID(riid, &IID_IWMPacketSize)) { + TRACE("(%p)->(IWMPacketSize %p)\n", This, ppv); + *ppv = &This->IWMPacketSize2_iface; + }else if(IsEqualGUID(riid, &IID_IWMPacketSize2)) { + TRACE("(%p)->(IWMPacketSize2 %p)\n", This, ppv); + *ppv = &This->IWMPacketSize2_iface; + }else { + *ppv = NULL; + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WMReader_AddRef(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI WMReader_Release(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI WMReader_Open(IWMReader *iface, const WCHAR *url, IWMReaderCallback *callback, void *context) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(url), callback, context); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Close(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_GetOutputCount(IWMReader *iface, DWORD *outputs) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%p)\n", This, outputs); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_GetOutputProps(IWMReader *iface, DWORD output_num, IWMOutputMediaProps **output) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%u %p)\n", This, output_num, output); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_SetOutputProps(IWMReader *iface, DWORD output_num, IWMOutputMediaProps *output) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%u %p)\n", This, output_num, output); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_GetOutputFormatCount(IWMReader *iface, DWORD output_num, DWORD *formats) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%u %p)\n", This, output_num, formats); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_GetOutputFormat(IWMReader *iface, DWORD output_num, DWORD format_num, IWMOutputMediaProps **props) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%u %u %p)\n", This, output_num, format_num, props); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Start(IWMReader *iface, QWORD start, QWORD duration, float rate, void *context) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%s %s %f %p)\n", This, wine_dbgstr_longlong(start), wine_dbgstr_longlong(duration), rate, context); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Stop(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Pause(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Resume(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static const IWMReaderVtbl WMReaderVtbl = { + WMReader_QueryInterface, + WMReader_AddRef, + WMReader_Release, + WMReader_Open, + WMReader_Close, + WMReader_GetOutputCount, + WMReader_GetOutputProps, + WMReader_SetOutputProps, + WMReader_GetOutputFormatCount, + WMReader_GetOutputFormat, + WMReader_Start, + WMReader_Stop, + WMReader_Pause, + WMReader_Resume +}; + +static inline WMReader *impl_from_IWMReaderAdvanced6(IWMReaderAdvanced6 *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMReaderAdvanced6_iface); +} + +static HRESULT WINAPI WMReaderAdvanced_QueryInterface(IWMReaderAdvanced6 *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); +} + +static ULONG WINAPI WMReaderAdvanced_AddRef(IWMReaderAdvanced6 *iface) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + return IWMReader_AddRef(&This->IWMReader_iface); +} + +static ULONG WINAPI WMReaderAdvanced_Release(IWMReaderAdvanced6 *iface) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + return IWMReader_Release(&This->IWMReader_iface); +} + +static HRESULT WINAPI WMReaderAdvanced_SetUserProvidedClock(IWMReaderAdvanced6 *iface, BOOL user_clock) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%x)\n", This, user_clock); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_GetUserProvidedClock(IWMReaderAdvanced6 *iface, BOOL *user_clock) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p)\n", This, user_clock); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_DeliverTime(IWMReaderAdvanced6 *iface, QWORD time) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%s)\n", This, wine_dbgstr_longlong(time)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_SetManualStreamSelection(IWMReaderAdvanced6 *iface, BOOL selection) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%x)\n", This, selection); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_GetManualStreamSelection(IWMReaderAdvanced6 *iface, BOOL *selection) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p)\n", This, selection); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_SetStreamsSelected(IWMReaderAdvanced6 *iface, WORD stream_count, + WORD *stream_numbers, WMT_STREAM_SELECTION *selections) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %p %p)\n", This, stream_count, stream_numbers, selections); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_GetStreamSelected(IWMReaderAdvanced6 *iface, WORD stream_num, + WMT_STREAM_SELECTION *selection) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %p)\n", This, stream_num, selection); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_SetReceiveSelectionCallbacks(IWMReaderAdvanced6 *iface, BOOL get_callbacks) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%x)\n", This, get_callbacks); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_GetReceiveSelectionCallbacks(IWMReaderAdvanced6 *iface, BOOL *get_callbacks) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p)\n", This, get_callbacks); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_SetReceiveStreamSamples(IWMReaderAdvanced6 *iface, WORD stream_num, + BOOL receive_stream_samples) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %x)\n", This, stream_num, receive_stream_samples); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_GetReceiveStreamSamples(IWMReaderAdvanced6 *iface, WORD stream_num, + BOOL *receive_stream_samples) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %p)\n", This, stream_num, receive_stream_samples); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_SetAllocateForOutput(IWMReaderAdvanced6 *iface, DWORD output_num, BOOL allocate) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %x)\n", This, output_num, allocate); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_GetAllocateForOutput(IWMReaderAdvanced6 *iface, DWORD output_num, BOOL *allocate) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %p)\n", This, output_num, allocate); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_SetAllocateForStream(IWMReaderAdvanced6 *iface, WORD output_num, BOOL allocate) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %x)\n", This, output_num, allocate); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_GetAllocateForStream(IWMReaderAdvanced6 *iface, WORD output_num, BOOL *allocate) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %p)\n", This, output_num, allocate); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_GetStatistics(IWMReaderAdvanced6 *iface, WM_READER_STATISTICS *statistics) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p)\n", This, statistics); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_SetClientInfo(IWMReaderAdvanced6 *iface, WM_READER_CLIENTINFO *client_info) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p)\n", This, client_info); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_GetMaxOutputSampleSize(IWMReaderAdvanced6 *iface, DWORD output, DWORD *max) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %p)\n", This, output, max); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_GetMaxStreamSampleSize(IWMReaderAdvanced6 *iface, WORD stream, DWORD *max) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %p)\n", This, stream, max); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_NotifyLateDelivery(IWMReaderAdvanced6 *iface, QWORD lateness) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%s)\n", This, wine_dbgstr_longlong(lateness)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_SetPlayMode(IWMReaderAdvanced6 *iface, WMT_PLAY_MODE mode) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d)\n", This, mode); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_GetPlayMode(IWMReaderAdvanced6 *iface, WMT_PLAY_MODE *mode) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p)\n", This, mode); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_GetBufferProgress(IWMReaderAdvanced6 *iface, DWORD *percent, QWORD *buffering) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p %p)\n", This, percent, buffering); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_GetDownloadProgress(IWMReaderAdvanced6 *iface, DWORD *percent, + QWORD *bytes_downloaded, QWORD *download) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p %p %p)\n", This, percent, bytes_downloaded, download); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_GetSaveAsProgress(IWMReaderAdvanced6 *iface, DWORD *percent) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p)\n", This, percent); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_SaveFileAs(IWMReaderAdvanced6 *iface, const WCHAR *filename) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(filename)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_GetProtocolName(IWMReaderAdvanced6 *iface, WCHAR *protocol, DWORD *protocol_len) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p %p)\n", This, protocol, protocol_len); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_StartAtMarker(IWMReaderAdvanced6 *iface, WORD marker_index, + QWORD duration, float rate, void *context) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %s %f %p)\n", This, marker_index, wine_dbgstr_longlong(duration), rate, context); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_GetOutputSetting(IWMReaderAdvanced6 *iface, DWORD output_num, + const WCHAR *name, WMT_ATTR_DATATYPE *type, BYTE *value, WORD *length) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %s %p %p %p)\n", This, output_num, debugstr_w(name), type, value, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_SetOutputSetting(IWMReaderAdvanced6 *iface, DWORD output_num, + const WCHAR *name, WMT_ATTR_DATATYPE type, const BYTE *value, WORD length) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %s %d %p %d)\n", This, output_num, debugstr_w(name), type, value, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_Preroll(IWMReaderAdvanced6 *iface, QWORD start, QWORD duration, float rate) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%s %s %f)\n", This, wine_dbgstr_longlong(start), wine_dbgstr_longlong(duration), rate); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_SetLogClientID(IWMReaderAdvanced6 *iface, BOOL log_client_id) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%x)\n", This, log_client_id); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_GetLogClientID(IWMReaderAdvanced6 *iface, BOOL *log_client_id) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p)\n", This, log_client_id); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_StopBuffering(IWMReaderAdvanced6 *iface) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_OpenStream(IWMReaderAdvanced6 *iface, IStream *stream, + IWMReaderCallback *callback, void *context) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p %p %p)\n", This, stream, callback, context); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced3_StopNetStreaming(IWMReaderAdvanced6 *iface) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced3_StartAtPosition(IWMReaderAdvanced6 *iface, WORD stream_num, + void *offset_start, void *duration, WMT_OFFSET_FORMAT format, float rate, void *context) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %p %p %d %f %p)\n", This, stream_num, offset_start, duration, format, rate, context); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced4_GetLanguageCount(IWMReaderAdvanced6 *iface, DWORD output_num, WORD *language_count) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %p)\n", This, output_num, language_count); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced4_GetLanguage(IWMReaderAdvanced6 *iface, DWORD output_num, + WORD language, WCHAR *language_string, WORD *language_string_len) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %x %p %p)\n", This, output_num, language, language_string, language_string_len); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced4_GetMaxSpeedFactor(IWMReaderAdvanced6 *iface, double *factor) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p)\n", This, factor); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced4_IsUsingFastCache(IWMReaderAdvanced6 *iface, BOOL *using_fast_cache) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p)\n", This, using_fast_cache); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced4_AddLogParam(IWMReaderAdvanced6 *iface, const WCHAR *namespace, + const WCHAR *name, const WCHAR *value) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%s %s %s)\n", This, debugstr_w(namespace), debugstr_w(name), debugstr_w(value)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced4_SendLogParams(IWMReaderAdvanced6 *iface) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced4_CanSaveFileAs(IWMReaderAdvanced6 *iface, BOOL *can_save) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p)\n", This, can_save); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced4_CancelSaveFileAs(IWMReaderAdvanced6 *iface) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced4_GetURL(IWMReaderAdvanced6 *iface, WCHAR *url, DWORD *url_len) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p %p)\n", This, url, url_len); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced5_SetPlayerHook(IWMReaderAdvanced6 *iface, DWORD output_num, IWMPlayerHook *hook) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %p)\n", This, output_num, hook); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced6_SetProtextStreamSamples(IWMReaderAdvanced6 *iface, BYTE *cert, + DWORD cert_size, DWORD cert_type, DWORD flags, BYTE *initialization_vector, DWORD *initialization_vector_size) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p %d %d %x %p %p)\n", This, cert, cert_size, cert_type, flags, initialization_vector, + initialization_vector_size); + return E_NOTIMPL; +} + +static const IWMReaderAdvanced6Vtbl WMReaderAdvanced6Vtbl = { + WMReaderAdvanced_QueryInterface, + WMReaderAdvanced_AddRef, + WMReaderAdvanced_Release, + WMReaderAdvanced_SetUserProvidedClock, + WMReaderAdvanced_GetUserProvidedClock, + WMReaderAdvanced_DeliverTime, + WMReaderAdvanced_SetManualStreamSelection, + WMReaderAdvanced_GetManualStreamSelection, + WMReaderAdvanced_SetStreamsSelected, + WMReaderAdvanced_GetStreamSelected, + WMReaderAdvanced_SetReceiveSelectionCallbacks, + WMReaderAdvanced_GetReceiveSelectionCallbacks, + WMReaderAdvanced_SetReceiveStreamSamples, + WMReaderAdvanced_GetReceiveStreamSamples, + WMReaderAdvanced_SetAllocateForOutput, + WMReaderAdvanced_GetAllocateForOutput, + WMReaderAdvanced_SetAllocateForStream, + WMReaderAdvanced_GetAllocateForStream, + WMReaderAdvanced_GetStatistics, + WMReaderAdvanced_SetClientInfo, + WMReaderAdvanced_GetMaxOutputSampleSize, + WMReaderAdvanced_GetMaxStreamSampleSize, + WMReaderAdvanced_NotifyLateDelivery, + WMReaderAdvanced2_SetPlayMode, + WMReaderAdvanced2_GetPlayMode, + WMReaderAdvanced2_GetBufferProgress, + WMReaderAdvanced2_GetDownloadProgress, + WMReaderAdvanced2_GetSaveAsProgress, + WMReaderAdvanced2_SaveFileAs, + WMReaderAdvanced2_GetProtocolName, + WMReaderAdvanced2_StartAtMarker, + WMReaderAdvanced2_GetOutputSetting, + WMReaderAdvanced2_SetOutputSetting, + WMReaderAdvanced2_Preroll, + WMReaderAdvanced2_SetLogClientID, + WMReaderAdvanced2_GetLogClientID, + WMReaderAdvanced2_StopBuffering, + WMReaderAdvanced2_OpenStream, + WMReaderAdvanced3_StopNetStreaming, + WMReaderAdvanced3_StartAtPosition, + WMReaderAdvanced4_GetLanguageCount, + WMReaderAdvanced4_GetLanguage, + WMReaderAdvanced4_GetMaxSpeedFactor, + WMReaderAdvanced4_IsUsingFastCache, + WMReaderAdvanced4_AddLogParam, + WMReaderAdvanced4_SendLogParams, + WMReaderAdvanced4_CanSaveFileAs, + WMReaderAdvanced4_CancelSaveFileAs, + WMReaderAdvanced4_GetURL, + WMReaderAdvanced5_SetPlayerHook, + WMReaderAdvanced6_SetProtextStreamSamples +}; + +static inline WMReader *impl_from_IWMReaderAccelerator(IWMReaderAccelerator *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMReaderAccelerator_iface); +} + +static HRESULT WINAPI reader_accl_QueryInterface(IWMReaderAccelerator *iface, REFIID riid, void **object) +{ + WMReader *This = impl_from_IWMReaderAccelerator(iface); + return IWMReader_QueryInterface(&This->IWMReader_iface, riid, object); +} + +static ULONG WINAPI reader_accl_AddRef(IWMReaderAccelerator *iface) +{ + WMReader *This = impl_from_IWMReaderAccelerator(iface); + return IWMReader_AddRef(&This->IWMReader_iface); +} + +static ULONG WINAPI reader_accl_Release(IWMReaderAccelerator *iface) +{ + WMReader *This = impl_from_IWMReaderAccelerator(iface); + return IWMReader_Release(&This->IWMReader_iface); +} + +static HRESULT WINAPI reader_accl_GetCodecInterface(IWMReaderAccelerator *iface, DWORD output, REFIID riid, void **codec) +{ + WMReader *This = impl_from_IWMReaderAccelerator(iface); + + FIXME("%p, %d, %s, %p\n", This, output, debugstr_guid(riid), codec); + + return E_NOTIMPL; +} + +static HRESULT WINAPI reader_accl_Notify(IWMReaderAccelerator *iface, DWORD output, WM_MEDIA_TYPE *subtype) +{ + WMReader *This = impl_from_IWMReaderAccelerator(iface); + + FIXME("%p, %d, %p\n", This, output, subtype); + + return E_NOTIMPL; +} + +static const IWMReaderAcceleratorVtbl WMReaderAcceleratorVtbl = { + reader_accl_QueryInterface, + reader_accl_AddRef, + reader_accl_Release, + reader_accl_GetCodecInterface, + reader_accl_Notify +}; + +static inline WMReader *impl_from_IWMReaderNetworkConfig2(IWMReaderNetworkConfig2 *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMReaderNetworkConfig2_iface); +} + +static HRESULT WINAPI networkconfig_QueryInterface(IWMReaderNetworkConfig2 *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); +} + +static ULONG WINAPI networkconfig_AddRef(IWMReaderNetworkConfig2 *iface) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + return IWMReader_AddRef(&This->IWMReader_iface); +} + +static ULONG WINAPI networkconfig_Release(IWMReaderNetworkConfig2 *iface) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + return IWMReader_Release(&This->IWMReader_iface); +} + +static HRESULT WINAPI networkconfig_GetBufferingTime(IWMReaderNetworkConfig2 *iface, QWORD *buffering_time) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %p\n", This, buffering_time); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_SetBufferingTime(IWMReaderNetworkConfig2 *iface, QWORD buffering_time) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %s\n", This, wine_dbgstr_longlong(buffering_time)); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_GetUDPPortRanges(IWMReaderNetworkConfig2 *iface, WM_PORT_NUMBER_RANGE *array, + DWORD *ranges) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %p, %p\n", This, array, ranges); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_SetUDPPortRanges(IWMReaderNetworkConfig2 *iface, WM_PORT_NUMBER_RANGE *array, + DWORD ranges) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %p, %u\n", This, array, ranges); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_GetProxySettings(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, + WMT_PROXY_SETTINGS *proxy) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %s, %p\n", This, debugstr_w(protocol), proxy); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_SetProxySettings(IWMReaderNetworkConfig2 *iface, LPCWSTR protocol, + WMT_PROXY_SETTINGS proxy) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %s, %d\n", This, debugstr_w(protocol), proxy); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_GetProxyHostName(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, + WCHAR *hostname, DWORD *size) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %s, %p, %p\n", This, debugstr_w(protocol), hostname, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_SetProxyHostName(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, + const WCHAR *hostname) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %s, %s\n", This, debugstr_w(protocol), debugstr_w(hostname)); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_GetProxyPort(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, + DWORD *port) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %s, %p\n", This, debugstr_w(protocol), port); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_SetProxyPort(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, + DWORD port) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %s, %u\n", This, debugstr_w(protocol), port); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_GetProxyExceptionList(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, + WCHAR *exceptions, DWORD *count) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %s, %p, %p\n", This, debugstr_w(protocol), exceptions, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_SetProxyExceptionList(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, + const WCHAR *exceptions) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %s, %s\n", This, debugstr_w(protocol), debugstr_w(exceptions)); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_GetProxyBypassForLocal(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, + BOOL *bypass) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %s, %p\n", This, debugstr_w(protocol), bypass); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_SetProxyBypassForLocal(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, + BOOL bypass) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %s, %d\n", This, debugstr_w(protocol), bypass); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_GetForceRerunAutoProxyDetection(IWMReaderNetworkConfig2 *iface, + BOOL *detection) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %p\n", This, detection); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_SetForceRerunAutoProxyDetection(IWMReaderNetworkConfig2 *iface, + BOOL detection) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %d\n", This, detection); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_GetEnableMulticast(IWMReaderNetworkConfig2 *iface, BOOL *multicast) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %p\n", This, multicast); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_SetEnableMulticast(IWMReaderNetworkConfig2 *iface, BOOL multicast) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %d\n", This, multicast); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_GetEnableHTTP(IWMReaderNetworkConfig2 *iface, BOOL *enable) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %p\n", This, enable); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_SetEnableHTTP(IWMReaderNetworkConfig2 *iface, BOOL enable) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %d\n", This, enable); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_GetEnableUDP(IWMReaderNetworkConfig2 *iface, BOOL *enable) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %p\n", This, enable); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_SetEnableUDP(IWMReaderNetworkConfig2 *iface, BOOL enable) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %d\n", This, enable); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_GetEnableTCP(IWMReaderNetworkConfig2 *iface, BOOL *enable) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %p\n", This, enable); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_SetEnableTCP(IWMReaderNetworkConfig2 *iface, BOOL enable) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %d\n", This, enable); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_ResetProtocolRollover(IWMReaderNetworkConfig2 *iface) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_GetConnectionBandwidth(IWMReaderNetworkConfig2 *iface, DWORD *bandwidth) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %p\n", This, bandwidth); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_SetConnectionBandwidth(IWMReaderNetworkConfig2 *iface, DWORD bandwidth) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %u\n", This, bandwidth); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_GetNumProtocolsSupported(IWMReaderNetworkConfig2 *iface, DWORD *protocols) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %p\n", This, protocols); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_GetSupportedProtocolName(IWMReaderNetworkConfig2 *iface, DWORD protocol_num, + WCHAR *protocol, DWORD *size) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %u, %p %p\n", This, protocol_num, protocol, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_AddLoggingUrl(IWMReaderNetworkConfig2 *iface, const WCHAR *url) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %s\n", This, debugstr_w(url)); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_GetLoggingUrl(IWMReaderNetworkConfig2 *iface, DWORD index, WCHAR *url, + DWORD *size) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %u, %p, %p\n", This, index, url, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_GetLoggingUrlCount(IWMReaderNetworkConfig2 *iface, DWORD *count) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %p\n", This, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_ResetLoggingUrlList(IWMReaderNetworkConfig2 *iface) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_GetEnableContentCaching(IWMReaderNetworkConfig2 *iface, BOOL *enable) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %p\n", This, enable); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_SetEnableContentCaching(IWMReaderNetworkConfig2 *iface, BOOL enable) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %d\n", This, enable); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_GetEnableFastCache(IWMReaderNetworkConfig2 *iface, BOOL *enable) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %p\n", This, enable); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_SetEnableFastCache(IWMReaderNetworkConfig2 *iface, BOOL enable) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %d\n", This, enable); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_GetAcceleratedStreamingDuration(IWMReaderNetworkConfig2 *iface, + QWORD *duration) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %p\n", This, duration); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_SetAcceleratedStreamingDuration(IWMReaderNetworkConfig2 *iface, + QWORD duration) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %s\n", This, wine_dbgstr_longlong(duration)); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_GetAutoReconnectLimit(IWMReaderNetworkConfig2 *iface, DWORD *limit) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %p\n", This, limit); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_SetAutoReconnectLimit(IWMReaderNetworkConfig2 *iface, DWORD limit) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %u\n", This, limit); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_GetEnableResends(IWMReaderNetworkConfig2 *iface, BOOL *enable) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %p\n", This, enable); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_SetEnableResends(IWMReaderNetworkConfig2 *iface, BOOL enable) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %u\n", This, enable); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_GetEnableThinning(IWMReaderNetworkConfig2 *iface, BOOL *enable) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %p\n", This, enable); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_SetEnableThinning(IWMReaderNetworkConfig2 *iface, BOOL enable) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %u\n", This, enable); + return E_NOTIMPL; +} + +static HRESULT WINAPI networkconfig_GetMaxNetPacketSize(IWMReaderNetworkConfig2 *iface, DWORD *packet_size) +{ + WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); + FIXME("%p, %p\n", This, packet_size); + return E_NOTIMPL; +} + +static const IWMReaderNetworkConfig2Vtbl WMReaderNetworkConfig2Vtbl = +{ + networkconfig_QueryInterface, + networkconfig_AddRef, + networkconfig_Release, + networkconfig_GetBufferingTime, + networkconfig_SetBufferingTime, + networkconfig_GetUDPPortRanges, + networkconfig_SetUDPPortRanges, + networkconfig_GetProxySettings, + networkconfig_SetProxySettings, + networkconfig_GetProxyHostName, + networkconfig_SetProxyHostName, + networkconfig_GetProxyPort, + networkconfig_SetProxyPort, + networkconfig_GetProxyExceptionList, + networkconfig_SetProxyExceptionList, + networkconfig_GetProxyBypassForLocal, + networkconfig_SetProxyBypassForLocal, + networkconfig_GetForceRerunAutoProxyDetection, + networkconfig_SetForceRerunAutoProxyDetection, + networkconfig_GetEnableMulticast, + networkconfig_SetEnableMulticast, + networkconfig_GetEnableHTTP, + networkconfig_SetEnableHTTP, + networkconfig_GetEnableUDP, + networkconfig_SetEnableUDP, + networkconfig_GetEnableTCP, + networkconfig_SetEnableTCP, + networkconfig_ResetProtocolRollover, + networkconfig_GetConnectionBandwidth, + networkconfig_SetConnectionBandwidth, + networkconfig_GetNumProtocolsSupported, + networkconfig_GetSupportedProtocolName, + networkconfig_AddLoggingUrl, + networkconfig_GetLoggingUrl, + networkconfig_GetLoggingUrlCount, + networkconfig_ResetLoggingUrlList, + networkconfig_GetEnableContentCaching, + networkconfig_SetEnableContentCaching, + networkconfig_GetEnableFastCache, + networkconfig_SetEnableFastCache, + networkconfig_GetAcceleratedStreamingDuration, + networkconfig_SetAcceleratedStreamingDuration, + networkconfig_GetAutoReconnectLimit, + networkconfig_SetAutoReconnectLimit, + networkconfig_GetEnableResends, + networkconfig_SetEnableResends, + networkconfig_GetEnableThinning, + networkconfig_SetEnableThinning, + networkconfig_GetMaxNetPacketSize +}; + +static inline WMReader *impl_from_IWMReaderStreamClock(IWMReaderStreamClock *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMReaderStreamClock_iface); +} + +static HRESULT WINAPI readclock_QueryInterface(IWMReaderStreamClock *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMReaderStreamClock(iface); + return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); +} + +static ULONG WINAPI readclock_AddRef(IWMReaderStreamClock *iface) +{ + WMReader *This = impl_from_IWMReaderStreamClock(iface); + return IWMReader_AddRef(&This->IWMReader_iface); +} + +static ULONG WINAPI readclock_Release(IWMReaderStreamClock *iface) +{ + WMReader *This = impl_from_IWMReaderStreamClock(iface); + return IWMReader_Release(&This->IWMReader_iface); +} + +static HRESULT WINAPI readclock_GetTime(IWMReaderStreamClock *iface, QWORD *now) +{ + WMReader *This = impl_from_IWMReaderStreamClock(iface); + FIXME("%p, %p\n", This, now); + return E_NOTIMPL; +} + +static HRESULT WINAPI readclock_SetTimer(IWMReaderStreamClock *iface, QWORD when, void *param, DWORD *id) +{ + WMReader *This = impl_from_IWMReaderStreamClock(iface); + FIXME("%p, %s, %p, %p\n", This, wine_dbgstr_longlong(when), param, id); + return E_NOTIMPL; +} + +static HRESULT WINAPI readclock_KillTimer(IWMReaderStreamClock *iface, DWORD id) +{ + WMReader *This = impl_from_IWMReaderStreamClock(iface); + FIXME("%p, %d\n", This, id); + return E_NOTIMPL; +} + +static const IWMReaderStreamClockVtbl WMReaderStreamClockVtbl = +{ + readclock_QueryInterface, + readclock_AddRef, + readclock_Release, + readclock_GetTime, + readclock_SetTimer, + readclock_KillTimer +}; + +static inline WMReader *impl_from_IWMReaderTypeNegotiation(IWMReaderTypeNegotiation *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMReaderTypeNegotiation_iface); +} + +static HRESULT WINAPI negotiation_QueryInterface(IWMReaderTypeNegotiation *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMReaderTypeNegotiation(iface); + return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); +} + +static ULONG WINAPI negotiation_AddRef(IWMReaderTypeNegotiation *iface) +{ + WMReader *This = impl_from_IWMReaderTypeNegotiation(iface); + return IWMReader_AddRef(&This->IWMReader_iface); +} + +static ULONG WINAPI negotiation_Release(IWMReaderTypeNegotiation *iface) +{ + WMReader *This = impl_from_IWMReaderTypeNegotiation(iface); + return IWMReader_Release(&This->IWMReader_iface); +} + +static HRESULT WINAPI negotiation_TryOutputProps(IWMReaderTypeNegotiation *iface, DWORD output, IWMOutputMediaProps *props) +{ + WMReader *This = impl_from_IWMReaderTypeNegotiation(iface); + FIXME("%p, %d, %p\n", This, output, props); + return E_NOTIMPL; +} + +static const IWMReaderTypeNegotiationVtbl WMReaderTypeNegotiationVtbl = +{ + negotiation_QueryInterface, + negotiation_AddRef, + negotiation_Release, + negotiation_TryOutputProps +}; + +static inline WMReader *impl_from_IWMReaderTimecode(IWMReaderTimecode *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMReaderTimecode_iface); +} + +static HRESULT WINAPI timecode_QueryInterface(IWMReaderTimecode *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMReaderTimecode(iface); + return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); +} + +static ULONG WINAPI timecode_AddRef(IWMReaderTimecode *iface) +{ + WMReader *This = impl_from_IWMReaderTimecode(iface); + return IWMReader_AddRef(&This->IWMReader_iface); +} + +static ULONG WINAPI timecode_Release(IWMReaderTimecode *iface) +{ + WMReader *This = impl_from_IWMReaderTimecode(iface); + return IWMReader_Release(&This->IWMReader_iface); +} + +static HRESULT WINAPI timecode_GetTimecodeRangeCount(IWMReaderTimecode *iface, WORD num, WORD *count) +{ + WMReader *This = impl_from_IWMReaderTimecode(iface); + FIXME("%p, %d, %p\n", This, num, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI timecode_GetTimecodeRangeBounds(IWMReaderTimecode *iface, WORD stream, WORD range, + DWORD *start_timecode, DWORD *end_timecode) +{ + WMReader *This = impl_from_IWMReaderTimecode(iface); + FIXME("%p, %d, %d, %p, %p\n", This, stream, range, start_timecode, end_timecode); + return E_NOTIMPL; +} + +static const IWMReaderTimecodeVtbl WMReaderTimecodeVtbl = +{ + timecode_QueryInterface, + timecode_AddRef, + timecode_Release, + timecode_GetTimecodeRangeCount, + timecode_GetTimecodeRangeBounds +}; + + +static inline WMReader *impl_from_IWMReaderPlaylistBurn(IWMReaderPlaylistBurn *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMReaderPlaylistBurn_iface); +} + +static HRESULT WINAPI playlist_QueryInterface(IWMReaderPlaylistBurn *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); + return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); +} + +static ULONG WINAPI playlist_AddRef(IWMReaderPlaylistBurn *iface) +{ + WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); + return IWMReader_AddRef(&This->IWMReader_iface); +} + +static ULONG WINAPI playlist_Release(IWMReaderPlaylistBurn *iface) +{ + WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); + return IWMReader_Release(&This->IWMReader_iface); +} + +static HRESULT WINAPI playlist_InitPlaylistBurn(IWMReaderPlaylistBurn *iface, DWORD count, + LPCWSTR_WMSDK_TYPE_SAFE *filenames, IWMStatusCallback *callback, void *context) +{ + WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); + FIXME("%p, %d, %p, %p, %p\n", This, count, filenames, callback, context); + return E_NOTIMPL; +} + +static HRESULT WINAPI playlist_GetInitResults(IWMReaderPlaylistBurn *iface, DWORD count, HRESULT *stat) +{ + WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); + FIXME("%p, %d, %p\n", This, count, stat); + return E_NOTIMPL; +} + +static HRESULT WINAPI playlist_Cancel(IWMReaderPlaylistBurn *iface) +{ + WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI playlist_EndPlaylistBurn(IWMReaderPlaylistBurn *iface, HRESULT result) +{ + WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); + FIXME("%p, 0x%08x\n", This, result); + return E_NOTIMPL; +} + +static const IWMReaderPlaylistBurnVtbl WMReaderPlaylistBurnVtbl = +{ + playlist_QueryInterface, + playlist_AddRef, + playlist_Release, + playlist_InitPlaylistBurn, + playlist_GetInitResults, + playlist_Cancel, + playlist_EndPlaylistBurn +}; + +static inline WMReader *impl_from_IWMHeaderInfo3(IWMHeaderInfo3 *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMHeaderInfo3_iface); +} + +static HRESULT WINAPI headerinfo_QueryInterface(IWMHeaderInfo3 *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMHeaderInfo3(iface); + return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); +} + +static ULONG WINAPI headerinfo_AddRef(IWMHeaderInfo3 *iface) +{ + WMReader *This = impl_from_IWMHeaderInfo3(iface); + return IWMReader_AddRef(&This->IWMReader_iface); +} + +static ULONG WINAPI headerinfo_Release(IWMHeaderInfo3 *iface) +{ + WMReader *This = impl_from_IWMHeaderInfo3(iface); + return IWMReader_Release(&This->IWMReader_iface); +} + +static HRESULT WINAPI headerinfo_GetAttributeCount(IWMHeaderInfo3 *iface, WORD stream_num, WORD *attributes) +{ + WMReader *This = impl_from_IWMHeaderInfo3(iface); + FIXME("%p, %d, %p\n", This, stream_num, attributes); + return E_NOTIMPL; +} + +static HRESULT WINAPI headerinfo_GetAttributeByIndex(IWMHeaderInfo3 *iface, WORD index, WORD *stream_num, + WCHAR *name, WORD *name_len, WMT_ATTR_DATATYPE *type, BYTE *value, WORD *length) +{ + WMReader *This = impl_from_IWMHeaderInfo3(iface); + FIXME("%p, %d, %p, %p, %p, %p, %p, %p\n", This, index, stream_num, name, name_len, type, + value, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI headerinfo_GetAttributeByName(IWMHeaderInfo3 *iface, WORD *stream_num, LPCWSTR name, + WMT_ATTR_DATATYPE *type, BYTE *value, WORD *length) +{ + WMReader *This = impl_from_IWMHeaderInfo3(iface); + FIXME("%p, %p, %s, %p, %p, %p\n", This, stream_num, debugstr_w(name), type, value, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI headerinfo_SetAttribute(IWMHeaderInfo3 *iface, WORD stream_num, LPCWSTR name, + WMT_ATTR_DATATYPE type, const BYTE *value, WORD length) +{ + WMReader *This = impl_from_IWMHeaderInfo3(iface); + FIXME("%p, %d, %s, %d, %p, %d\n", This, stream_num, debugstr_w(name), type, value, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI headerinfo_GetMarkerCount(IWMHeaderInfo3 *iface, WORD *markers) +{ + WMReader *This = impl_from_IWMHeaderInfo3(iface); + FIXME("%p, %p\n", This, markers); + return E_NOTIMPL; +} + +static HRESULT WINAPI headerinfo_GetMarker(IWMHeaderInfo3 *iface, WORD index, WCHAR *marker_name, + WORD *marker_len, QWORD *marker_time) +{ + WMReader *This = impl_from_IWMHeaderInfo3(iface); + FIXME("%p, %d, %p, %p, %p\n", This, index, marker_name, marker_len, marker_time); + return E_NOTIMPL; +} + +static HRESULT WINAPI headerinfo_AddMarker(IWMHeaderInfo3 *iface, LPCWSTR_WMSDK_TYPE_SAFE marker_name, + QWORD marker_time) +{ + WMReader *This = impl_from_IWMHeaderInfo3(iface); + FIXME("%p, %p, %s\n", This, marker_name, wine_dbgstr_longlong(marker_time)); + return E_NOTIMPL; +} + +static HRESULT WINAPI headerinfo_RemoveMarker(IWMHeaderInfo3 *iface, WORD index) +{ + WMReader *This = impl_from_IWMHeaderInfo3(iface); + FIXME("%p, %d\n", This, index); + return E_NOTIMPL; +} + +static HRESULT WINAPI headerinfo_GetScriptCount(IWMHeaderInfo3 *iface, WORD *scripts) +{ + WMReader *This = impl_from_IWMHeaderInfo3(iface); + FIXME("%p, %p\n", This, scripts); + return E_NOTIMPL; +} + +static HRESULT WINAPI headerinfo_GetScript(IWMHeaderInfo3 *iface, WORD index, WCHAR *type, + WORD *type_len, WCHAR *command, WORD *command_len, QWORD *script_time) +{ + WMReader *This = impl_from_IWMHeaderInfo3(iface); + FIXME("%p, %d, %p, %p, %p, %p, %p\n", This, index, type, type_len, command, command_len, script_time); + return E_NOTIMPL; +} + +static HRESULT WINAPI headerinfo_AddScript(IWMHeaderInfo3 *iface, LPCWSTR_WMSDK_TYPE_SAFE type, + LPCWSTR_WMSDK_TYPE_SAFE command, QWORD script_time) +{ + WMReader *This = impl_from_IWMHeaderInfo3(iface); + FIXME("%p, %s, %s, %s\n", This, debugstr_w(type), debugstr_w(command), wine_dbgstr_longlong(script_time)); + return E_NOTIMPL; +} + +static HRESULT WINAPI headerinfo_RemoveScript(IWMHeaderInfo3 *iface, WORD index) +{ + WMReader *This = impl_from_IWMHeaderInfo3(iface); + FIXME("%p, %d\n", This, index); + return E_NOTIMPL; +} + +static HRESULT WINAPI headerinfo_GetCodecInfoCount(IWMHeaderInfo3 *iface, DWORD *codec_infos) +{ + WMReader *This = impl_from_IWMHeaderInfo3(iface); + FIXME("%p, %p\n", This, codec_infos); + return E_NOTIMPL; +} + +static HRESULT WINAPI headerinfo_GetCodecInfo(IWMHeaderInfo3 *iface, DWORD index, WORD *name_len, + WCHAR *name, WORD *description_len, WCHAR *description, WMT_CODEC_INFO_TYPE *codec_type, + WORD *codec_info_cnt, BYTE *codec_info) +{ + WMReader *This = impl_from_IWMHeaderInfo3(iface); + FIXME("%p, %d, %p, %p, %p, %p, %p, %p, %p\n", This, index, name_len, name, description_len, + description, codec_type, codec_info_cnt, codec_info); + return E_NOTIMPL; +} + +static HRESULT WINAPI headerinfo_GetAttributeCountEx(IWMHeaderInfo3 *iface, WORD stream_num, WORD *attributes) +{ + WMReader *This = impl_from_IWMHeaderInfo3(iface); + FIXME("%p, %d, %p\n", This, stream_num, attributes); + return E_NOTIMPL; +} + +static HRESULT WINAPI headerinfo_GetAttributeIndices(IWMHeaderInfo3 *iface, WORD stream_num, LPCWSTR name, + WORD *lang_index, WORD *indices, WORD *count) +{ + WMReader *This = impl_from_IWMHeaderInfo3(iface); + FIXME("%p, %d, %s, %p, %p, %p\n", This, stream_num, debugstr_w(name), lang_index, indices, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI headerinfo_GetAttributeByIndexEx(IWMHeaderInfo3 *iface, WORD stream_num, + WORD index, LPWSTR name, WORD *name_len, WMT_ATTR_DATATYPE *type, WORD *lang_index, + BYTE *value, DWORD *data_len) +{ + WMReader *This = impl_from_IWMHeaderInfo3(iface); + FIXME("%p, %d, %d, %s, %p, %p, %p, %p, %p\n", This, stream_num, index, debugstr_w(name), name_len, + type, lang_index, value, data_len); + return E_NOTIMPL; +} + +static HRESULT WINAPI headerinfo_ModifyAttribute(IWMHeaderInfo3 *iface, WORD stream_num, + WORD index, WMT_ATTR_DATATYPE type, WORD lang_index, const BYTE *value, DWORD length) +{ + WMReader *This = impl_from_IWMHeaderInfo3(iface); + FIXME("%p, %d, %d, %d, %d, %p, %d\n", This, stream_num, index, type, lang_index, value, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI headerinfo_AddAttribute(IWMHeaderInfo3 *iface, WORD stream_num, LPCWSTR name, + WORD *index, WMT_ATTR_DATATYPE type, WORD lang_index, const BYTE *value, DWORD length) +{ + WMReader *This = impl_from_IWMHeaderInfo3(iface); + FIXME("%p, %d, %s, %p, %d, %d, %p, %d\n", This, stream_num, debugstr_w(name), index, + type, lang_index, value, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI headerinfo_DeleteAttribute(IWMHeaderInfo3 *iface, WORD stream_num, WORD index) +{ + WMReader *This = impl_from_IWMHeaderInfo3(iface); + FIXME("%p, %d, %d\n", This, stream_num, index); + return E_NOTIMPL; +} + +static HRESULT WINAPI headerinfo_AddCodecInfo(IWMHeaderInfo3 *iface, LPCWSTR_WMSDK_TYPE_SAFE name, + LPCWSTR_WMSDK_TYPE_SAFE description, WMT_CODEC_INFO_TYPE codec_type, WORD codec_info_cnt, + BYTE *codec_info) +{ + WMReader *This = impl_from_IWMHeaderInfo3(iface); + FIXME("%p, %p, %p, %d, %d, %p\n", This, name, description, codec_type, codec_info_cnt, + codec_info); + return E_NOTIMPL; +} + +static const IWMHeaderInfo3Vtbl WMHeaderInfo3Vtbl = +{ + headerinfo_QueryInterface, + headerinfo_AddRef, + headerinfo_Release, + headerinfo_GetAttributeCount, + headerinfo_GetAttributeByIndex, + headerinfo_GetAttributeByName, + headerinfo_SetAttribute, + headerinfo_GetMarkerCount, + headerinfo_GetMarker, + headerinfo_AddMarker, + headerinfo_RemoveMarker, + headerinfo_GetScriptCount, + headerinfo_GetScript, + headerinfo_AddScript, + headerinfo_RemoveScript, + headerinfo_GetCodecInfoCount, + headerinfo_GetCodecInfo, + headerinfo_GetAttributeCountEx, + headerinfo_GetAttributeIndices, + headerinfo_GetAttributeByIndexEx, + headerinfo_ModifyAttribute, + headerinfo_AddAttribute, + headerinfo_DeleteAttribute, + headerinfo_AddCodecInfo +}; + + +static inline WMReader *impl_from_IWMLanguageList(IWMLanguageList *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMLanguageList_iface); +} + +static HRESULT WINAPI langlist_QueryInterface(IWMLanguageList *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMLanguageList(iface); + return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); +} + +static ULONG WINAPI langlist_AddRef(IWMLanguageList *iface) +{ + WMReader *This = impl_from_IWMLanguageList(iface); + return IWMReader_AddRef(&This->IWMReader_iface); +} + +static ULONG WINAPI langlist_Release(IWMLanguageList *iface) +{ + WMReader *This = impl_from_IWMLanguageList(iface); + return IWMReader_Release(&This->IWMReader_iface); +} + +static HRESULT WINAPI langlist_GetLanguageCount(IWMLanguageList *iface, WORD *count) +{ + WMReader *This = impl_from_IWMLanguageList(iface); + FIXME("%p, %p\n", This, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI langlist_GetLanguageDetails(IWMLanguageList *iface, WORD index, + WCHAR *language, WORD *length) +{ + WMReader *This = impl_from_IWMLanguageList(iface); + FIXME("%p, %d, %p, %p\n", This, index, language, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI langlist_AddLanguageByRFC1766String(IWMLanguageList *iface, LPCWSTR_WMSDK_TYPE_SAFE language, + WORD *index) +{ + WMReader *This = impl_from_IWMLanguageList(iface); + FIXME("%p, %p, %p\n", This, language, index); + return E_NOTIMPL; +} + +static const IWMLanguageListVtbl WMLanguageListVtbl = +{ + langlist_QueryInterface, + langlist_AddRef, + langlist_Release, + langlist_GetLanguageCount, + langlist_GetLanguageDetails, + langlist_AddLanguageByRFC1766String +}; + +static inline WMReader *impl_from_IReferenceClock(IReferenceClock *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IReferenceClock_iface); +} + +static HRESULT WINAPI refclock_QueryInterface(IReferenceClock *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IReferenceClock(iface); + return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); +} + +static ULONG WINAPI refclock_AddRef(IReferenceClock *iface) +{ + WMReader *This = impl_from_IReferenceClock(iface); + return IWMReader_AddRef(&This->IWMReader_iface); +} + +static ULONG WINAPI refclock_Release(IReferenceClock *iface) +{ + WMReader *This = impl_from_IReferenceClock(iface); + return IWMReader_Release(&This->IWMReader_iface); +} + +static HRESULT WINAPI refclock_GetTime(IReferenceClock *iface, REFERENCE_TIME *time) +{ + WMReader *This = impl_from_IReferenceClock(iface); + FIXME("%p, %p\n", This, time); + return E_NOTIMPL; +} + +static HRESULT WINAPI refclock_AdviseTime(IReferenceClock *iface, REFERENCE_TIME basetime, + REFERENCE_TIME streamtime, HEVENT event, DWORD_PTR *cookie) +{ + WMReader *This = impl_from_IReferenceClock(iface); + FIXME("%p, %s, %s, %lu, %p\n", This, wine_dbgstr_longlong(basetime), + wine_dbgstr_longlong(streamtime), event, cookie); + return E_NOTIMPL; +} + +static HRESULT WINAPI refclock_AdvisePeriodic(IReferenceClock *iface, REFERENCE_TIME starttime, + REFERENCE_TIME period, HSEMAPHORE semaphore, DWORD_PTR *cookie) +{ + WMReader *This = impl_from_IReferenceClock(iface); + FIXME("%p, %s, %s, %lu, %p\n", This, wine_dbgstr_longlong(starttime), + wine_dbgstr_longlong(period), semaphore, cookie); + return E_NOTIMPL; +} + +static HRESULT WINAPI refclock_Unadvise(IReferenceClock *iface, DWORD_PTR cookie) +{ + WMReader *This = impl_from_IReferenceClock(iface); + FIXME("%p, %lu\n", This, cookie); + return E_NOTIMPL; +} + +static const IReferenceClockVtbl ReferenceClockVtbl = +{ + refclock_QueryInterface, + refclock_AddRef, + refclock_Release, + refclock_GetTime, + refclock_AdviseTime, + refclock_AdvisePeriodic, + refclock_Unadvise +}; + +static inline WMReader *impl_from_IWMProfile3(IWMProfile3 *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMProfile3_iface); +} + +static HRESULT WINAPI profile3_QueryInterface(IWMProfile3 *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMProfile3(iface); + return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); +} + +static ULONG WINAPI profile3_AddRef(IWMProfile3 *iface) +{ + WMReader *This = impl_from_IWMProfile3(iface); + return IWMReader_AddRef(&This->IWMReader_iface); +} + +static ULONG WINAPI profile3_Release(IWMProfile3 *iface) +{ + WMReader *This = impl_from_IWMProfile3(iface); + return IWMReader_Release(&This->IWMReader_iface); +} + +static HRESULT WINAPI profile3_GetVersion(IWMProfile3 *iface, WMT_VERSION *version) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %p\n", This, version); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_GetName(IWMProfile3 *iface, WCHAR *name, DWORD *length) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %p, %p\n", This, name, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_SetName(IWMProfile3 *iface, const WCHAR *name) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %s\n", This, debugstr_w(name)); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_GetDescription(IWMProfile3 *iface, WCHAR *description, DWORD *length) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %p, %p\n", This, description, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_SetDescription(IWMProfile3 *iface, const WCHAR *description) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %s\n", This, debugstr_w(description)); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_GetStreamCount(IWMProfile3 *iface, DWORD *count) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %p\n", This, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_GetStream(IWMProfile3 *iface, DWORD index, IWMStreamConfig **config) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %d, %p\n", This, index, config); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_GetStreamByNumber(IWMProfile3 *iface, WORD stream, IWMStreamConfig **config) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %d, %p\n", This, stream, config); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_RemoveStream(IWMProfile3 *iface, IWMStreamConfig *config) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %p\n", This, config); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_RemoveStreamByNumber(IWMProfile3 *iface, WORD stream) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %d\n", This, stream); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_AddStream(IWMProfile3 *iface, IWMStreamConfig *config) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %p\n", This, config); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_ReconfigStream(IWMProfile3 *iface, IWMStreamConfig *config) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %p\n", This, config); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_CreateNewStream(IWMProfile3 *iface, REFGUID type, IWMStreamConfig **config) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %s, %p\n", This, debugstr_guid(type), config); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_GetMutualExclusionCount(IWMProfile3 *iface, DWORD *count) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %p\n", This, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_GetMutualExclusion(IWMProfile3 *iface, DWORD index, IWMMutualExclusion **mutual) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %d, %p\n", This, index, mutual); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_RemoveMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion *mutual) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %p\n", This, mutual); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_AddMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion *mutual) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %p\n", This, mutual); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_CreateNewMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion **mutual) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %p\n", This, mutual); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_GetProfileID(IWMProfile3 *iface, GUID *guid) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %p\n", This, guid); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_GetStorageFormat(IWMProfile3 *iface, WMT_STORAGE_FORMAT *storage) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %p\n", This, storage); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_SetStorageFormat(IWMProfile3 *iface, WMT_STORAGE_FORMAT storage) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %d\n", This, storage); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_GetBandwidthSharingCount(IWMProfile3 *iface, DWORD *count) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %p\n", This, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_GetBandwidthSharing(IWMProfile3 *iface, DWORD index, IWMBandwidthSharing **bandwidth) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %d, %p\n", This, index, bandwidth); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_RemoveBandwidthSharing( IWMProfile3 *iface, IWMBandwidthSharing *bandwidth) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %p\n", This, bandwidth); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_AddBandwidthSharing(IWMProfile3 *iface, IWMBandwidthSharing *bandwidth) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %p\n", This, bandwidth); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_CreateNewBandwidthSharing( IWMProfile3 *iface, IWMBandwidthSharing **bandwidth) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %p\n", This, bandwidth); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_GetStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization **stream) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %p\n", This, stream); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_SetStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization *stream) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %p\n", This, stream); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_RemoveStreamPrioritization(IWMProfile3 *iface) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_CreateNewStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization **stream) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %p\n", This, stream); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile3_GetExpectedPacketCount(IWMProfile3 *iface, QWORD duration, QWORD *packets) +{ + WMReader *This = impl_from_IWMProfile3(iface); + FIXME("%p, %s, %p\n", This, wine_dbgstr_longlong(duration), packets); + return E_NOTIMPL; +} + +static const IWMProfile3Vtbl WMProfile3Vtbl = +{ + profile3_QueryInterface, + profile3_AddRef, + profile3_Release, + profile3_GetVersion, + profile3_GetName, + profile3_SetName, + profile3_GetDescription, + profile3_SetDescription, + profile3_GetStreamCount, + profile3_GetStream, + profile3_GetStreamByNumber, + profile3_RemoveStream, + profile3_RemoveStreamByNumber, + profile3_AddStream, + profile3_ReconfigStream, + profile3_CreateNewStream, + profile3_GetMutualExclusionCount, + profile3_GetMutualExclusion, + profile3_RemoveMutualExclusion, + profile3_AddMutualExclusion, + profile3_CreateNewMutualExclusion, + profile3_GetProfileID, + profile3_GetStorageFormat, + profile3_SetStorageFormat, + profile3_GetBandwidthSharingCount, + profile3_GetBandwidthSharing, + profile3_RemoveBandwidthSharing, + profile3_AddBandwidthSharing, + profile3_CreateNewBandwidthSharing, + profile3_GetStreamPrioritization, + profile3_SetStreamPrioritization, + profile3_RemoveStreamPrioritization, + profile3_CreateNewStreamPrioritization, + profile3_GetExpectedPacketCount +}; + +static inline WMReader *impl_from_IWMPacketSize2(IWMPacketSize2 *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMPacketSize2_iface); +} + +static HRESULT WINAPI packetsize_QueryInterface(IWMPacketSize2 *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMPacketSize2(iface); + return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); +} + +static ULONG WINAPI packetsize_AddRef(IWMPacketSize2 *iface) +{ + WMReader *This = impl_from_IWMPacketSize2(iface); + return IWMReader_AddRef(&This->IWMReader_iface); +} + +static ULONG WINAPI packetsize_Release(IWMPacketSize2 *iface) +{ + WMReader *This = impl_from_IWMPacketSize2(iface); + return IWMReader_Release(&This->IWMReader_iface); +} + +static HRESULT WINAPI packetsize_GetMaxPacketSize(IWMPacketSize2 *iface, DWORD *size) +{ + WMReader *This = impl_from_IWMPacketSize2(iface); + FIXME("%p, %p\n", This, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI packetsize_SetMaxPacketSize(IWMPacketSize2 *iface, DWORD size) +{ + WMReader *This = impl_from_IWMPacketSize2(iface); + FIXME("%p, %d\n", This, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI packetsize_GetMinPacketSize(IWMPacketSize2 *iface, DWORD *size) +{ + WMReader *This = impl_from_IWMPacketSize2(iface); + FIXME("%p, %p\n", This, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI packetsize_SetMinPacketSize(IWMPacketSize2 *iface, DWORD size) +{ + WMReader *This = impl_from_IWMPacketSize2(iface); + FIXME("%p, %d\n", This, size); + return E_NOTIMPL; +} + +static const IWMPacketSize2Vtbl WMPacketSize2Vtbl = +{ + packetsize_QueryInterface, + packetsize_AddRef, + packetsize_Release, + packetsize_GetMaxPacketSize, + packetsize_SetMaxPacketSize, + packetsize_GetMinPacketSize, + packetsize_SetMinPacketSize +}; + +HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader) +{ + WMReader *reader; + + TRACE("(%p, %x, %p)\n", reserved, rights, ret_reader); + + reader = heap_alloc(sizeof(*reader)); + if(!reader) + return E_OUTOFMEMORY; + + reader->IWMReader_iface.lpVtbl = &WMReaderVtbl; + reader->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl; + reader->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl; + reader->IWMReaderNetworkConfig2_iface.lpVtbl = &WMReaderNetworkConfig2Vtbl; + reader->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl; + reader->IWMReaderTypeNegotiation_iface.lpVtbl = &WMReaderTypeNegotiationVtbl; + reader->IWMReaderTimecode_iface.lpVtbl = &WMReaderTimecodeVtbl; + reader->IWMReaderPlaylistBurn_iface.lpVtbl = &WMReaderPlaylistBurnVtbl; + reader->IWMHeaderInfo3_iface.lpVtbl = &WMHeaderInfo3Vtbl; + reader->IWMLanguageList_iface.lpVtbl = &WMLanguageListVtbl; + reader->IReferenceClock_iface.lpVtbl = &ReferenceClockVtbl; + reader->IWMProfile3_iface.lpVtbl = &WMProfile3Vtbl; + reader->IWMPacketSize2_iface.lpVtbl = &WMPacketSize2Vtbl; + reader->ref = 1; + + *ret_reader = &reader->IWMReader_iface; + return S_OK; +} + +HRESULT WINAPI WMCreateReaderPriv(IWMReader **ret_reader) +{ + return WMCreateReader(NULL, 0, ret_reader); +} + +HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader **syncreader) +{ + FIXME("(%p, %x, %p): stub\n", pcert, rights, syncreader); + + *syncreader = NULL; + + return E_NOTIMPL; +} diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 14014ee59a..d7eb1ebb5f 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -74,2054 +74,6 @@ HRESULT WINAPI WMCreateEditor(IWMMetadataEditor **editor) return E_NOTIMPL; } -typedef struct { - IWMReader IWMReader_iface; - IWMReaderAdvanced6 IWMReaderAdvanced6_iface; - IWMReaderAccelerator IWMReaderAccelerator_iface; - IWMReaderNetworkConfig2 IWMReaderNetworkConfig2_iface; - IWMReaderStreamClock IWMReaderStreamClock_iface; - IWMReaderTypeNegotiation IWMReaderTypeNegotiation_iface; - IWMReaderTimecode IWMReaderTimecode_iface; - IWMReaderPlaylistBurn IWMReaderPlaylistBurn_iface; - IWMHeaderInfo3 IWMHeaderInfo3_iface; - IWMLanguageList IWMLanguageList_iface; - IReferenceClock IReferenceClock_iface; - IWMProfile3 IWMProfile3_iface; - IWMPacketSize2 IWMPacketSize2_iface; - LONG ref; -} WMReader; - -static inline WMReader *impl_from_IWMReader(IWMReader *iface) -{ - return CONTAINING_RECORD(iface, WMReader, IWMReader_iface); -} - -static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, void **ppv) -{ - WMReader *This = impl_from_IWMReader(iface); - - if(IsEqualGUID(riid, &IID_IUnknown)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IWMReader_iface; - }else if(IsEqualGUID(riid, &IID_IWMReader)) { - TRACE("(%p)->(IID_IWMReader %p)\n", This, ppv); - *ppv = &This->IWMReader_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced)) { - TRACE("(%p)->(IID_IWMReaderAdvanced %p)\n", This, ppv); - *ppv = &This->IWMReaderAdvanced6_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced2)) { - TRACE("(%p)->(IID_IWMReaderAdvanced2 %p)\n", This, ppv); - *ppv = &This->IWMReaderAdvanced6_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced3)) { - TRACE("(%p)->(IID_IWMReaderAdvanced3 %p)\n", This, ppv); - *ppv = &This->IWMReaderAdvanced6_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced4)) { - TRACE("(%p)->(IID_IWMReaderAdvanced4 %p)\n", This, ppv); - *ppv = &This->IWMReaderAdvanced6_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced5)) { - TRACE("(%p)->(IID_IWMReaderAdvanced5 %p)\n", This, ppv); - *ppv = &This->IWMReaderAdvanced6_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced6)) { - TRACE("(%p)->(IID_IWMReaderAdvanced6 %p)\n", This, ppv); - *ppv = &This->IWMReaderAdvanced6_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAccelerator)) { - TRACE("(%p)->(IID_IWMReaderAccelerator %p)\n", This, ppv); - *ppv = &This->IWMReaderAccelerator_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderNetworkConfig)) { - TRACE("(%p)->(IWMReaderNetworkConfig %p)\n", This, ppv); - *ppv = &This->IWMReaderNetworkConfig2_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderNetworkConfig2)) { - TRACE("(%p)->(IWMReaderNetworkConfig2 %p)\n", This, ppv); - *ppv = &This->IWMReaderNetworkConfig2_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderStreamClock)) { - TRACE("(%p)->(IWMReaderStreamClock %p)\n", This, ppv); - *ppv = &This->IWMReaderStreamClock_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderTypeNegotiation)) { - TRACE("(%p)->(IWMReaderTypeNegotiation %p)\n", This, ppv); - *ppv = &This->IWMReaderTypeNegotiation_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderTimecode)) { - TRACE("(%p)->(IWMReaderTimecode %p)\n", This, ppv); - *ppv = &This->IWMReaderTimecode_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderPlaylistBurn)) { - TRACE("(%p)->(IWMReaderPlaylistBurn %p)\n", This, ppv); - *ppv = &This->IWMReaderPlaylistBurn_iface; - }else if(IsEqualGUID(riid, &IID_IWMHeaderInfo)) { - TRACE("(%p)->(IWMHeaderInfo %p)\n", This, ppv); - *ppv = &This->IWMHeaderInfo3_iface; - }else if(IsEqualGUID(riid, &IID_IWMHeaderInfo2)) { - TRACE("(%p)->(IWMHeaderInfo2 %p)\n", This, ppv); - *ppv = &This->IWMHeaderInfo3_iface; - }else if(IsEqualGUID(riid, &IID_IWMHeaderInfo3)) { - TRACE("(%p)->(IWMHeaderInfo3 %p)\n", This, ppv); - *ppv = &This->IWMHeaderInfo3_iface; - }else if(IsEqualGUID(riid, &IID_IWMLanguageList)) { - TRACE("(%p)->(IWMLanguageList %p)\n", This, ppv); - *ppv = &This->IWMLanguageList_iface; - }else if(IsEqualGUID(riid, &IID_IReferenceClock)) { - TRACE("(%p)->(IWMLanguageList %p)\n", This, ppv); - *ppv = &This->IReferenceClock_iface; - }else if(IsEqualGUID(riid, &IID_IWMProfile)) { - TRACE("(%p)->(IWMProfile %p)\n", This, ppv); - *ppv = &This->IWMProfile3_iface; - }else if(IsEqualGUID(riid, &IID_IWMProfile2)) { - TRACE("(%p)->(IWMProfile2 %p)\n", This, ppv); - *ppv = &This->IWMProfile3_iface; - }else if(IsEqualGUID(riid, &IID_IWMProfile3)) { - TRACE("(%p)->(IWMProfile3 %p)\n", This, ppv); - *ppv = &This->IWMProfile3_iface; - }else if(IsEqualGUID(riid, &IID_IWMPacketSize)) { - TRACE("(%p)->(IWMPacketSize %p)\n", This, ppv); - *ppv = &This->IWMPacketSize2_iface; - }else if(IsEqualGUID(riid, &IID_IWMPacketSize2)) { - TRACE("(%p)->(IWMPacketSize2 %p)\n", This, ppv); - *ppv = &This->IWMPacketSize2_iface; - }else { - *ppv = NULL; - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - -static ULONG WINAPI WMReader_AddRef(IWMReader *iface) -{ - WMReader *This = impl_from_IWMReader(iface); - LONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - return ref; -} - -static ULONG WINAPI WMReader_Release(IWMReader *iface) -{ - WMReader *This = impl_from_IWMReader(iface); - LONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - if(!ref) - heap_free(This); - - return ref; -} - -static HRESULT WINAPI WMReader_Open(IWMReader *iface, const WCHAR *url, IWMReaderCallback *callback, void *context) -{ - WMReader *This = impl_from_IWMReader(iface); - FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(url), callback, context); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReader_Close(IWMReader *iface) -{ - WMReader *This = impl_from_IWMReader(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReader_GetOutputCount(IWMReader *iface, DWORD *outputs) -{ - WMReader *This = impl_from_IWMReader(iface); - FIXME("(%p)->(%p)\n", This, outputs); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReader_GetOutputProps(IWMReader *iface, DWORD output_num, IWMOutputMediaProps **output) -{ - WMReader *This = impl_from_IWMReader(iface); - FIXME("(%p)->(%u %p)\n", This, output_num, output); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReader_SetOutputProps(IWMReader *iface, DWORD output_num, IWMOutputMediaProps *output) -{ - WMReader *This = impl_from_IWMReader(iface); - FIXME("(%p)->(%u %p)\n", This, output_num, output); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReader_GetOutputFormatCount(IWMReader *iface, DWORD output_num, DWORD *formats) -{ - WMReader *This = impl_from_IWMReader(iface); - FIXME("(%p)->(%u %p)\n", This, output_num, formats); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReader_GetOutputFormat(IWMReader *iface, DWORD output_num, DWORD format_num, IWMOutputMediaProps **props) -{ - WMReader *This = impl_from_IWMReader(iface); - FIXME("(%p)->(%u %u %p)\n", This, output_num, format_num, props); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReader_Start(IWMReader *iface, QWORD start, QWORD duration, float rate, void *context) -{ - WMReader *This = impl_from_IWMReader(iface); - FIXME("(%p)->(%s %s %f %p)\n", This, wine_dbgstr_longlong(start), wine_dbgstr_longlong(duration), rate, context); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReader_Stop(IWMReader *iface) -{ - WMReader *This = impl_from_IWMReader(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReader_Pause(IWMReader *iface) -{ - WMReader *This = impl_from_IWMReader(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReader_Resume(IWMReader *iface) -{ - WMReader *This = impl_from_IWMReader(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; -} - -static const IWMReaderVtbl WMReaderVtbl = { - WMReader_QueryInterface, - WMReader_AddRef, - WMReader_Release, - WMReader_Open, - WMReader_Close, - WMReader_GetOutputCount, - WMReader_GetOutputProps, - WMReader_SetOutputProps, - WMReader_GetOutputFormatCount, - WMReader_GetOutputFormat, - WMReader_Start, - WMReader_Stop, - WMReader_Pause, - WMReader_Resume -}; - -static inline WMReader *impl_from_IWMReaderAdvanced6(IWMReaderAdvanced6 *iface) -{ - return CONTAINING_RECORD(iface, WMReader, IWMReaderAdvanced6_iface); -} - -static HRESULT WINAPI WMReaderAdvanced_QueryInterface(IWMReaderAdvanced6 *iface, REFIID riid, void **ppv) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI WMReaderAdvanced_AddRef(IWMReaderAdvanced6 *iface) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI WMReaderAdvanced_Release(IWMReaderAdvanced6 *iface) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI WMReaderAdvanced_SetUserProvidedClock(IWMReaderAdvanced6 *iface, BOOL user_clock) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%x)\n", This, user_clock); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_GetUserProvidedClock(IWMReaderAdvanced6 *iface, BOOL *user_clock) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p)\n", This, user_clock); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_DeliverTime(IWMReaderAdvanced6 *iface, QWORD time) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%s)\n", This, wine_dbgstr_longlong(time)); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_SetManualStreamSelection(IWMReaderAdvanced6 *iface, BOOL selection) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%x)\n", This, selection); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_GetManualStreamSelection(IWMReaderAdvanced6 *iface, BOOL *selection) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p)\n", This, selection); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_SetStreamsSelected(IWMReaderAdvanced6 *iface, WORD stream_count, - WORD *stream_numbers, WMT_STREAM_SELECTION *selections) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p %p)\n", This, stream_count, stream_numbers, selections); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_GetStreamSelected(IWMReaderAdvanced6 *iface, WORD stream_num, - WMT_STREAM_SELECTION *selection) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p)\n", This, stream_num, selection); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_SetReceiveSelectionCallbacks(IWMReaderAdvanced6 *iface, BOOL get_callbacks) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%x)\n", This, get_callbacks); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_GetReceiveSelectionCallbacks(IWMReaderAdvanced6 *iface, BOOL *get_callbacks) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p)\n", This, get_callbacks); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_SetReceiveStreamSamples(IWMReaderAdvanced6 *iface, WORD stream_num, - BOOL receive_stream_samples) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %x)\n", This, stream_num, receive_stream_samples); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_GetReceiveStreamSamples(IWMReaderAdvanced6 *iface, WORD stream_num, - BOOL *receive_stream_samples) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p)\n", This, stream_num, receive_stream_samples); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_SetAllocateForOutput(IWMReaderAdvanced6 *iface, DWORD output_num, BOOL allocate) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %x)\n", This, output_num, allocate); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_GetAllocateForOutput(IWMReaderAdvanced6 *iface, DWORD output_num, BOOL *allocate) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p)\n", This, output_num, allocate); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_SetAllocateForStream(IWMReaderAdvanced6 *iface, WORD output_num, BOOL allocate) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %x)\n", This, output_num, allocate); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_GetAllocateForStream(IWMReaderAdvanced6 *iface, WORD output_num, BOOL *allocate) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p)\n", This, output_num, allocate); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_GetStatistics(IWMReaderAdvanced6 *iface, WM_READER_STATISTICS *statistics) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p)\n", This, statistics); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_SetClientInfo(IWMReaderAdvanced6 *iface, WM_READER_CLIENTINFO *client_info) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p)\n", This, client_info); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_GetMaxOutputSampleSize(IWMReaderAdvanced6 *iface, DWORD output, DWORD *max) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p)\n", This, output, max); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_GetMaxStreamSampleSize(IWMReaderAdvanced6 *iface, WORD stream, DWORD *max) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p)\n", This, stream, max); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_NotifyLateDelivery(IWMReaderAdvanced6 *iface, QWORD lateness) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%s)\n", This, wine_dbgstr_longlong(lateness)); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_SetPlayMode(IWMReaderAdvanced6 *iface, WMT_PLAY_MODE mode) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d)\n", This, mode); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_GetPlayMode(IWMReaderAdvanced6 *iface, WMT_PLAY_MODE *mode) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p)\n", This, mode); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_GetBufferProgress(IWMReaderAdvanced6 *iface, DWORD *percent, QWORD *buffering) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p %p)\n", This, percent, buffering); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_GetDownloadProgress(IWMReaderAdvanced6 *iface, DWORD *percent, - QWORD *bytes_downloaded, QWORD *download) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p %p %p)\n", This, percent, bytes_downloaded, download); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_GetSaveAsProgress(IWMReaderAdvanced6 *iface, DWORD *percent) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p)\n", This, percent); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_SaveFileAs(IWMReaderAdvanced6 *iface, const WCHAR *filename) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(filename)); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_GetProtocolName(IWMReaderAdvanced6 *iface, WCHAR *protocol, DWORD *protocol_len) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p %p)\n", This, protocol, protocol_len); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_StartAtMarker(IWMReaderAdvanced6 *iface, WORD marker_index, - QWORD duration, float rate, void *context) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %s %f %p)\n", This, marker_index, wine_dbgstr_longlong(duration), rate, context); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_GetOutputSetting(IWMReaderAdvanced6 *iface, DWORD output_num, - const WCHAR *name, WMT_ATTR_DATATYPE *type, BYTE *value, WORD *length) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %s %p %p %p)\n", This, output_num, debugstr_w(name), type, value, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_SetOutputSetting(IWMReaderAdvanced6 *iface, DWORD output_num, - const WCHAR *name, WMT_ATTR_DATATYPE type, const BYTE *value, WORD length) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %s %d %p %d)\n", This, output_num, debugstr_w(name), type, value, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_Preroll(IWMReaderAdvanced6 *iface, QWORD start, QWORD duration, float rate) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%s %s %f)\n", This, wine_dbgstr_longlong(start), wine_dbgstr_longlong(duration), rate); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_SetLogClientID(IWMReaderAdvanced6 *iface, BOOL log_client_id) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%x)\n", This, log_client_id); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_GetLogClientID(IWMReaderAdvanced6 *iface, BOOL *log_client_id) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p)\n", This, log_client_id); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_StopBuffering(IWMReaderAdvanced6 *iface) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_OpenStream(IWMReaderAdvanced6 *iface, IStream *stream, - IWMReaderCallback *callback, void *context) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p %p %p)\n", This, stream, callback, context); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced3_StopNetStreaming(IWMReaderAdvanced6 *iface) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced3_StartAtPosition(IWMReaderAdvanced6 *iface, WORD stream_num, - void *offset_start, void *duration, WMT_OFFSET_FORMAT format, float rate, void *context) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p %p %d %f %p)\n", This, stream_num, offset_start, duration, format, rate, context); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced4_GetLanguageCount(IWMReaderAdvanced6 *iface, DWORD output_num, WORD *language_count) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p)\n", This, output_num, language_count); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced4_GetLanguage(IWMReaderAdvanced6 *iface, DWORD output_num, - WORD language, WCHAR *language_string, WORD *language_string_len) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %x %p %p)\n", This, output_num, language, language_string, language_string_len); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced4_GetMaxSpeedFactor(IWMReaderAdvanced6 *iface, double *factor) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p)\n", This, factor); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced4_IsUsingFastCache(IWMReaderAdvanced6 *iface, BOOL *using_fast_cache) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p)\n", This, using_fast_cache); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced4_AddLogParam(IWMReaderAdvanced6 *iface, const WCHAR *namespace, - const WCHAR *name, const WCHAR *value) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%s %s %s)\n", This, debugstr_w(namespace), debugstr_w(name), debugstr_w(value)); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced4_SendLogParams(IWMReaderAdvanced6 *iface) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced4_CanSaveFileAs(IWMReaderAdvanced6 *iface, BOOL *can_save) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p)\n", This, can_save); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced4_CancelSaveFileAs(IWMReaderAdvanced6 *iface) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced4_GetURL(IWMReaderAdvanced6 *iface, WCHAR *url, DWORD *url_len) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p %p)\n", This, url, url_len); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced5_SetPlayerHook(IWMReaderAdvanced6 *iface, DWORD output_num, IWMPlayerHook *hook) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p)\n", This, output_num, hook); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced6_SetProtextStreamSamples(IWMReaderAdvanced6 *iface, BYTE *cert, - DWORD cert_size, DWORD cert_type, DWORD flags, BYTE *initialization_vector, DWORD *initialization_vector_size) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p %d %d %x %p %p)\n", This, cert, cert_size, cert_type, flags, initialization_vector, - initialization_vector_size); - return E_NOTIMPL; -} - -static const IWMReaderAdvanced6Vtbl WMReaderAdvanced6Vtbl = { - WMReaderAdvanced_QueryInterface, - WMReaderAdvanced_AddRef, - WMReaderAdvanced_Release, - WMReaderAdvanced_SetUserProvidedClock, - WMReaderAdvanced_GetUserProvidedClock, - WMReaderAdvanced_DeliverTime, - WMReaderAdvanced_SetManualStreamSelection, - WMReaderAdvanced_GetManualStreamSelection, - WMReaderAdvanced_SetStreamsSelected, - WMReaderAdvanced_GetStreamSelected, - WMReaderAdvanced_SetReceiveSelectionCallbacks, - WMReaderAdvanced_GetReceiveSelectionCallbacks, - WMReaderAdvanced_SetReceiveStreamSamples, - WMReaderAdvanced_GetReceiveStreamSamples, - WMReaderAdvanced_SetAllocateForOutput, - WMReaderAdvanced_GetAllocateForOutput, - WMReaderAdvanced_SetAllocateForStream, - WMReaderAdvanced_GetAllocateForStream, - WMReaderAdvanced_GetStatistics, - WMReaderAdvanced_SetClientInfo, - WMReaderAdvanced_GetMaxOutputSampleSize, - WMReaderAdvanced_GetMaxStreamSampleSize, - WMReaderAdvanced_NotifyLateDelivery, - WMReaderAdvanced2_SetPlayMode, - WMReaderAdvanced2_GetPlayMode, - WMReaderAdvanced2_GetBufferProgress, - WMReaderAdvanced2_GetDownloadProgress, - WMReaderAdvanced2_GetSaveAsProgress, - WMReaderAdvanced2_SaveFileAs, - WMReaderAdvanced2_GetProtocolName, - WMReaderAdvanced2_StartAtMarker, - WMReaderAdvanced2_GetOutputSetting, - WMReaderAdvanced2_SetOutputSetting, - WMReaderAdvanced2_Preroll, - WMReaderAdvanced2_SetLogClientID, - WMReaderAdvanced2_GetLogClientID, - WMReaderAdvanced2_StopBuffering, - WMReaderAdvanced2_OpenStream, - WMReaderAdvanced3_StopNetStreaming, - WMReaderAdvanced3_StartAtPosition, - WMReaderAdvanced4_GetLanguageCount, - WMReaderAdvanced4_GetLanguage, - WMReaderAdvanced4_GetMaxSpeedFactor, - WMReaderAdvanced4_IsUsingFastCache, - WMReaderAdvanced4_AddLogParam, - WMReaderAdvanced4_SendLogParams, - WMReaderAdvanced4_CanSaveFileAs, - WMReaderAdvanced4_CancelSaveFileAs, - WMReaderAdvanced4_GetURL, - WMReaderAdvanced5_SetPlayerHook, - WMReaderAdvanced6_SetProtextStreamSamples -}; - -static inline WMReader *impl_from_IWMReaderAccelerator(IWMReaderAccelerator *iface) -{ - return CONTAINING_RECORD(iface, WMReader, IWMReaderAccelerator_iface); -} - -static HRESULT WINAPI reader_accl_QueryInterface(IWMReaderAccelerator *iface, REFIID riid, void **object) -{ - WMReader *This = impl_from_IWMReaderAccelerator(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, object); -} - -static ULONG WINAPI reader_accl_AddRef(IWMReaderAccelerator *iface) -{ - WMReader *This = impl_from_IWMReaderAccelerator(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI reader_accl_Release(IWMReaderAccelerator *iface) -{ - WMReader *This = impl_from_IWMReaderAccelerator(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI reader_accl_GetCodecInterface(IWMReaderAccelerator *iface, DWORD output, REFIID riid, void **codec) -{ - WMReader *This = impl_from_IWMReaderAccelerator(iface); - - FIXME("%p, %d, %s, %p\n", This, output, debugstr_guid(riid), codec); - - return E_NOTIMPL; -} - -static HRESULT WINAPI reader_accl_Notify(IWMReaderAccelerator *iface, DWORD output, WM_MEDIA_TYPE *subtype) -{ - WMReader *This = impl_from_IWMReaderAccelerator(iface); - - FIXME("%p, %d, %p\n", This, output, subtype); - - return E_NOTIMPL; -} - -static const IWMReaderAcceleratorVtbl WMReaderAcceleratorVtbl = { - reader_accl_QueryInterface, - reader_accl_AddRef, - reader_accl_Release, - reader_accl_GetCodecInterface, - reader_accl_Notify -}; - -static inline WMReader *impl_from_IWMReaderNetworkConfig2(IWMReaderNetworkConfig2 *iface) -{ - return CONTAINING_RECORD(iface, WMReader, IWMReaderNetworkConfig2_iface); -} - -static HRESULT WINAPI networkconfig_QueryInterface(IWMReaderNetworkConfig2 *iface, REFIID riid, void **ppv) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI networkconfig_AddRef(IWMReaderNetworkConfig2 *iface) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI networkconfig_Release(IWMReaderNetworkConfig2 *iface) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI networkconfig_GetBufferingTime(IWMReaderNetworkConfig2 *iface, QWORD *buffering_time) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, buffering_time); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetBufferingTime(IWMReaderNetworkConfig2 *iface, QWORD buffering_time) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s\n", This, wine_dbgstr_longlong(buffering_time)); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetUDPPortRanges(IWMReaderNetworkConfig2 *iface, WM_PORT_NUMBER_RANGE *array, - DWORD *ranges) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p, %p\n", This, array, ranges); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetUDPPortRanges(IWMReaderNetworkConfig2 *iface, WM_PORT_NUMBER_RANGE *array, - DWORD ranges) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p, %u\n", This, array, ranges); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetProxySettings(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, - WMT_PROXY_SETTINGS *proxy) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s, %p\n", This, debugstr_w(protocol), proxy); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetProxySettings(IWMReaderNetworkConfig2 *iface, LPCWSTR protocol, - WMT_PROXY_SETTINGS proxy) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s, %d\n", This, debugstr_w(protocol), proxy); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetProxyHostName(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, - WCHAR *hostname, DWORD *size) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s, %p, %p\n", This, debugstr_w(protocol), hostname, size); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetProxyHostName(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, - const WCHAR *hostname) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s, %s\n", This, debugstr_w(protocol), debugstr_w(hostname)); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetProxyPort(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, - DWORD *port) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s, %p\n", This, debugstr_w(protocol), port); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetProxyPort(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, - DWORD port) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s, %u\n", This, debugstr_w(protocol), port); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetProxyExceptionList(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, - WCHAR *exceptions, DWORD *count) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s, %p, %p\n", This, debugstr_w(protocol), exceptions, count); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetProxyExceptionList(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, - const WCHAR *exceptions) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s, %s\n", This, debugstr_w(protocol), debugstr_w(exceptions)); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetProxyBypassForLocal(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, - BOOL *bypass) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s, %p\n", This, debugstr_w(protocol), bypass); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetProxyBypassForLocal(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, - BOOL bypass) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s, %d\n", This, debugstr_w(protocol), bypass); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetForceRerunAutoProxyDetection(IWMReaderNetworkConfig2 *iface, - BOOL *detection) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, detection); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetForceRerunAutoProxyDetection(IWMReaderNetworkConfig2 *iface, - BOOL detection) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %d\n", This, detection); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetEnableMulticast(IWMReaderNetworkConfig2 *iface, BOOL *multicast) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, multicast); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetEnableMulticast(IWMReaderNetworkConfig2 *iface, BOOL multicast) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %d\n", This, multicast); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetEnableHTTP(IWMReaderNetworkConfig2 *iface, BOOL *enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetEnableHTTP(IWMReaderNetworkConfig2 *iface, BOOL enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %d\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetEnableUDP(IWMReaderNetworkConfig2 *iface, BOOL *enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetEnableUDP(IWMReaderNetworkConfig2 *iface, BOOL enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %d\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetEnableTCP(IWMReaderNetworkConfig2 *iface, BOOL *enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetEnableTCP(IWMReaderNetworkConfig2 *iface, BOOL enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %d\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_ResetProtocolRollover(IWMReaderNetworkConfig2 *iface) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetConnectionBandwidth(IWMReaderNetworkConfig2 *iface, DWORD *bandwidth) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, bandwidth); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetConnectionBandwidth(IWMReaderNetworkConfig2 *iface, DWORD bandwidth) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %u\n", This, bandwidth); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetNumProtocolsSupported(IWMReaderNetworkConfig2 *iface, DWORD *protocols) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, protocols); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetSupportedProtocolName(IWMReaderNetworkConfig2 *iface, DWORD protocol_num, - WCHAR *protocol, DWORD *size) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %u, %p %p\n", This, protocol_num, protocol, size); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_AddLoggingUrl(IWMReaderNetworkConfig2 *iface, const WCHAR *url) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s\n", This, debugstr_w(url)); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetLoggingUrl(IWMReaderNetworkConfig2 *iface, DWORD index, WCHAR *url, - DWORD *size) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %u, %p, %p\n", This, index, url, size); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetLoggingUrlCount(IWMReaderNetworkConfig2 *iface, DWORD *count) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, count); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_ResetLoggingUrlList(IWMReaderNetworkConfig2 *iface) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetEnableContentCaching(IWMReaderNetworkConfig2 *iface, BOOL *enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetEnableContentCaching(IWMReaderNetworkConfig2 *iface, BOOL enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %d\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetEnableFastCache(IWMReaderNetworkConfig2 *iface, BOOL *enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetEnableFastCache(IWMReaderNetworkConfig2 *iface, BOOL enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %d\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetAcceleratedStreamingDuration(IWMReaderNetworkConfig2 *iface, - QWORD *duration) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, duration); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetAcceleratedStreamingDuration(IWMReaderNetworkConfig2 *iface, - QWORD duration) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s\n", This, wine_dbgstr_longlong(duration)); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetAutoReconnectLimit(IWMReaderNetworkConfig2 *iface, DWORD *limit) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, limit); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetAutoReconnectLimit(IWMReaderNetworkConfig2 *iface, DWORD limit) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %u\n", This, limit); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetEnableResends(IWMReaderNetworkConfig2 *iface, BOOL *enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetEnableResends(IWMReaderNetworkConfig2 *iface, BOOL enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %u\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetEnableThinning(IWMReaderNetworkConfig2 *iface, BOOL *enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetEnableThinning(IWMReaderNetworkConfig2 *iface, BOOL enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %u\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetMaxNetPacketSize(IWMReaderNetworkConfig2 *iface, DWORD *packet_size) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, packet_size); - return E_NOTIMPL; -} - -static const IWMReaderNetworkConfig2Vtbl WMReaderNetworkConfig2Vtbl = -{ - networkconfig_QueryInterface, - networkconfig_AddRef, - networkconfig_Release, - networkconfig_GetBufferingTime, - networkconfig_SetBufferingTime, - networkconfig_GetUDPPortRanges, - networkconfig_SetUDPPortRanges, - networkconfig_GetProxySettings, - networkconfig_SetProxySettings, - networkconfig_GetProxyHostName, - networkconfig_SetProxyHostName, - networkconfig_GetProxyPort, - networkconfig_SetProxyPort, - networkconfig_GetProxyExceptionList, - networkconfig_SetProxyExceptionList, - networkconfig_GetProxyBypassForLocal, - networkconfig_SetProxyBypassForLocal, - networkconfig_GetForceRerunAutoProxyDetection, - networkconfig_SetForceRerunAutoProxyDetection, - networkconfig_GetEnableMulticast, - networkconfig_SetEnableMulticast, - networkconfig_GetEnableHTTP, - networkconfig_SetEnableHTTP, - networkconfig_GetEnableUDP, - networkconfig_SetEnableUDP, - networkconfig_GetEnableTCP, - networkconfig_SetEnableTCP, - networkconfig_ResetProtocolRollover, - networkconfig_GetConnectionBandwidth, - networkconfig_SetConnectionBandwidth, - networkconfig_GetNumProtocolsSupported, - networkconfig_GetSupportedProtocolName, - networkconfig_AddLoggingUrl, - networkconfig_GetLoggingUrl, - networkconfig_GetLoggingUrlCount, - networkconfig_ResetLoggingUrlList, - networkconfig_GetEnableContentCaching, - networkconfig_SetEnableContentCaching, - networkconfig_GetEnableFastCache, - networkconfig_SetEnableFastCache, - networkconfig_GetAcceleratedStreamingDuration, - networkconfig_SetAcceleratedStreamingDuration, - networkconfig_GetAutoReconnectLimit, - networkconfig_SetAutoReconnectLimit, - networkconfig_GetEnableResends, - networkconfig_SetEnableResends, - networkconfig_GetEnableThinning, - networkconfig_SetEnableThinning, - networkconfig_GetMaxNetPacketSize -}; - -static inline WMReader *impl_from_IWMReaderStreamClock(IWMReaderStreamClock *iface) -{ - return CONTAINING_RECORD(iface, WMReader, IWMReaderStreamClock_iface); -} - -static HRESULT WINAPI readclock_QueryInterface(IWMReaderStreamClock *iface, REFIID riid, void **ppv) -{ - WMReader *This = impl_from_IWMReaderStreamClock(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI readclock_AddRef(IWMReaderStreamClock *iface) -{ - WMReader *This = impl_from_IWMReaderStreamClock(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI readclock_Release(IWMReaderStreamClock *iface) -{ - WMReader *This = impl_from_IWMReaderStreamClock(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI readclock_GetTime(IWMReaderStreamClock *iface, QWORD *now) -{ - WMReader *This = impl_from_IWMReaderStreamClock(iface); - FIXME("%p, %p\n", This, now); - return E_NOTIMPL; -} - -static HRESULT WINAPI readclock_SetTimer(IWMReaderStreamClock *iface, QWORD when, void *param, DWORD *id) -{ - WMReader *This = impl_from_IWMReaderStreamClock(iface); - FIXME("%p, %s, %p, %p\n", This, wine_dbgstr_longlong(when), param, id); - return E_NOTIMPL; -} - -static HRESULT WINAPI readclock_KillTimer(IWMReaderStreamClock *iface, DWORD id) -{ - WMReader *This = impl_from_IWMReaderStreamClock(iface); - FIXME("%p, %d\n", This, id); - return E_NOTIMPL; -} - -static const IWMReaderStreamClockVtbl WMReaderStreamClockVtbl = -{ - readclock_QueryInterface, - readclock_AddRef, - readclock_Release, - readclock_GetTime, - readclock_SetTimer, - readclock_KillTimer -}; - -static inline WMReader *impl_from_IWMReaderTypeNegotiation(IWMReaderTypeNegotiation *iface) -{ - return CONTAINING_RECORD(iface, WMReader, IWMReaderTypeNegotiation_iface); -} - -static HRESULT WINAPI negotiation_QueryInterface(IWMReaderTypeNegotiation *iface, REFIID riid, void **ppv) -{ - WMReader *This = impl_from_IWMReaderTypeNegotiation(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI negotiation_AddRef(IWMReaderTypeNegotiation *iface) -{ - WMReader *This = impl_from_IWMReaderTypeNegotiation(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI negotiation_Release(IWMReaderTypeNegotiation *iface) -{ - WMReader *This = impl_from_IWMReaderTypeNegotiation(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI negotiation_TryOutputProps(IWMReaderTypeNegotiation *iface, DWORD output, IWMOutputMediaProps *props) -{ - WMReader *This = impl_from_IWMReaderTypeNegotiation(iface); - FIXME("%p, %d, %p\n", This, output, props); - return E_NOTIMPL; -} - -static const IWMReaderTypeNegotiationVtbl WMReaderTypeNegotiationVtbl = -{ - negotiation_QueryInterface, - negotiation_AddRef, - negotiation_Release, - negotiation_TryOutputProps -}; - -static inline WMReader *impl_from_IWMReaderTimecode(IWMReaderTimecode *iface) -{ - return CONTAINING_RECORD(iface, WMReader, IWMReaderTimecode_iface); -} - -static HRESULT WINAPI timecode_QueryInterface(IWMReaderTimecode *iface, REFIID riid, void **ppv) -{ - WMReader *This = impl_from_IWMReaderTimecode(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI timecode_AddRef(IWMReaderTimecode *iface) -{ - WMReader *This = impl_from_IWMReaderTimecode(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI timecode_Release(IWMReaderTimecode *iface) -{ - WMReader *This = impl_from_IWMReaderTimecode(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI timecode_GetTimecodeRangeCount(IWMReaderTimecode *iface, WORD num, WORD *count) -{ - WMReader *This = impl_from_IWMReaderTimecode(iface); - FIXME("%p, %d, %p\n", This, num, count); - return E_NOTIMPL; -} - -static HRESULT WINAPI timecode_GetTimecodeRangeBounds(IWMReaderTimecode *iface, WORD stream, WORD range, - DWORD *start_timecode, DWORD *end_timecode) -{ - WMReader *This = impl_from_IWMReaderTimecode(iface); - FIXME("%p, %d, %d, %p, %p\n", This, stream, range, start_timecode, end_timecode); - return E_NOTIMPL; -} - -static const IWMReaderTimecodeVtbl WMReaderTimecodeVtbl = -{ - timecode_QueryInterface, - timecode_AddRef, - timecode_Release, - timecode_GetTimecodeRangeCount, - timecode_GetTimecodeRangeBounds -}; - - -static inline WMReader *impl_from_IWMReaderPlaylistBurn(IWMReaderPlaylistBurn *iface) -{ - return CONTAINING_RECORD(iface, WMReader, IWMReaderPlaylistBurn_iface); -} - -static HRESULT WINAPI playlist_QueryInterface(IWMReaderPlaylistBurn *iface, REFIID riid, void **ppv) -{ - WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI playlist_AddRef(IWMReaderPlaylistBurn *iface) -{ - WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI playlist_Release(IWMReaderPlaylistBurn *iface) -{ - WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI playlist_InitPlaylistBurn(IWMReaderPlaylistBurn *iface, DWORD count, - LPCWSTR_WMSDK_TYPE_SAFE *filenames, IWMStatusCallback *callback, void *context) -{ - WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); - FIXME("%p, %d, %p, %p, %p\n", This, count, filenames, callback, context); - return E_NOTIMPL; -} - -static HRESULT WINAPI playlist_GetInitResults(IWMReaderPlaylistBurn *iface, DWORD count, HRESULT *stat) -{ - WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); - FIXME("%p, %d, %p\n", This, count, stat); - return E_NOTIMPL; -} - -static HRESULT WINAPI playlist_Cancel(IWMReaderPlaylistBurn *iface) -{ - WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); - FIXME("%p\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI playlist_EndPlaylistBurn(IWMReaderPlaylistBurn *iface, HRESULT result) -{ - WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); - FIXME("%p, 0x%08x\n", This, result); - return E_NOTIMPL; -} - -static const IWMReaderPlaylistBurnVtbl WMReaderPlaylistBurnVtbl = -{ - playlist_QueryInterface, - playlist_AddRef, - playlist_Release, - playlist_InitPlaylistBurn, - playlist_GetInitResults, - playlist_Cancel, - playlist_EndPlaylistBurn -}; - -static inline WMReader *impl_from_IWMHeaderInfo3(IWMHeaderInfo3 *iface) -{ - return CONTAINING_RECORD(iface, WMReader, IWMHeaderInfo3_iface); -} - -static HRESULT WINAPI headerinfo_QueryInterface(IWMHeaderInfo3 *iface, REFIID riid, void **ppv) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI headerinfo_AddRef(IWMHeaderInfo3 *iface) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI headerinfo_Release(IWMHeaderInfo3 *iface) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI headerinfo_GetAttributeCount(IWMHeaderInfo3 *iface, WORD stream_num, WORD *attributes) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d, %p\n", This, stream_num, attributes); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_GetAttributeByIndex(IWMHeaderInfo3 *iface, WORD index, WORD *stream_num, - WCHAR *name, WORD *name_len, WMT_ATTR_DATATYPE *type, BYTE *value, WORD *length) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d, %p, %p, %p, %p, %p, %p\n", This, index, stream_num, name, name_len, type, - value, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_GetAttributeByName(IWMHeaderInfo3 *iface, WORD *stream_num, LPCWSTR name, - WMT_ATTR_DATATYPE *type, BYTE *value, WORD *length) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %p, %s, %p, %p, %p\n", This, stream_num, debugstr_w(name), type, value, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_SetAttribute(IWMHeaderInfo3 *iface, WORD stream_num, LPCWSTR name, - WMT_ATTR_DATATYPE type, const BYTE *value, WORD length) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d, %s, %d, %p, %d\n", This, stream_num, debugstr_w(name), type, value, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_GetMarkerCount(IWMHeaderInfo3 *iface, WORD *markers) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %p\n", This, markers); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_GetMarker(IWMHeaderInfo3 *iface, WORD index, WCHAR *marker_name, - WORD *marker_len, QWORD *marker_time) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d, %p, %p, %p\n", This, index, marker_name, marker_len, marker_time); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_AddMarker(IWMHeaderInfo3 *iface, LPCWSTR_WMSDK_TYPE_SAFE marker_name, - QWORD marker_time) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %p, %s\n", This, marker_name, wine_dbgstr_longlong(marker_time)); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_RemoveMarker(IWMHeaderInfo3 *iface, WORD index) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d\n", This, index); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_GetScriptCount(IWMHeaderInfo3 *iface, WORD *scripts) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %p\n", This, scripts); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_GetScript(IWMHeaderInfo3 *iface, WORD index, WCHAR *type, - WORD *type_len, WCHAR *command, WORD *command_len, QWORD *script_time) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d, %p, %p, %p, %p, %p\n", This, index, type, type_len, command, command_len, script_time); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_AddScript(IWMHeaderInfo3 *iface, LPCWSTR_WMSDK_TYPE_SAFE type, - LPCWSTR_WMSDK_TYPE_SAFE command, QWORD script_time) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %s, %s, %s\n", This, debugstr_w(type), debugstr_w(command), wine_dbgstr_longlong(script_time)); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_RemoveScript(IWMHeaderInfo3 *iface, WORD index) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d\n", This, index); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_GetCodecInfoCount(IWMHeaderInfo3 *iface, DWORD *codec_infos) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %p\n", This, codec_infos); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_GetCodecInfo(IWMHeaderInfo3 *iface, DWORD index, WORD *name_len, - WCHAR *name, WORD *description_len, WCHAR *description, WMT_CODEC_INFO_TYPE *codec_type, - WORD *codec_info_cnt, BYTE *codec_info) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d, %p, %p, %p, %p, %p, %p, %p\n", This, index, name_len, name, description_len, - description, codec_type, codec_info_cnt, codec_info); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_GetAttributeCountEx(IWMHeaderInfo3 *iface, WORD stream_num, WORD *attributes) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d, %p\n", This, stream_num, attributes); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_GetAttributeIndices(IWMHeaderInfo3 *iface, WORD stream_num, LPCWSTR name, - WORD *lang_index, WORD *indices, WORD *count) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d, %s, %p, %p, %p\n", This, stream_num, debugstr_w(name), lang_index, indices, count); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_GetAttributeByIndexEx(IWMHeaderInfo3 *iface, WORD stream_num, - WORD index, LPWSTR name, WORD *name_len, WMT_ATTR_DATATYPE *type, WORD *lang_index, - BYTE *value, DWORD *data_len) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d, %d, %s, %p, %p, %p, %p, %p\n", This, stream_num, index, debugstr_w(name), name_len, - type, lang_index, value, data_len); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_ModifyAttribute(IWMHeaderInfo3 *iface, WORD stream_num, - WORD index, WMT_ATTR_DATATYPE type, WORD lang_index, const BYTE *value, DWORD length) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d, %d, %d, %d, %p, %d\n", This, stream_num, index, type, lang_index, value, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_AddAttribute(IWMHeaderInfo3 *iface, WORD stream_num, LPCWSTR name, - WORD *index, WMT_ATTR_DATATYPE type, WORD lang_index, const BYTE *value, DWORD length) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d, %s, %p, %d, %d, %p, %d\n", This, stream_num, debugstr_w(name), index, - type, lang_index, value, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_DeleteAttribute(IWMHeaderInfo3 *iface, WORD stream_num, WORD index) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d, %d\n", This, stream_num, index); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_AddCodecInfo(IWMHeaderInfo3 *iface, LPCWSTR_WMSDK_TYPE_SAFE name, - LPCWSTR_WMSDK_TYPE_SAFE description, WMT_CODEC_INFO_TYPE codec_type, WORD codec_info_cnt, - BYTE *codec_info) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %p, %p, %d, %d, %p\n", This, name, description, codec_type, codec_info_cnt, - codec_info); - return E_NOTIMPL; -} - -static const IWMHeaderInfo3Vtbl WMHeaderInfo3Vtbl = -{ - headerinfo_QueryInterface, - headerinfo_AddRef, - headerinfo_Release, - headerinfo_GetAttributeCount, - headerinfo_GetAttributeByIndex, - headerinfo_GetAttributeByName, - headerinfo_SetAttribute, - headerinfo_GetMarkerCount, - headerinfo_GetMarker, - headerinfo_AddMarker, - headerinfo_RemoveMarker, - headerinfo_GetScriptCount, - headerinfo_GetScript, - headerinfo_AddScript, - headerinfo_RemoveScript, - headerinfo_GetCodecInfoCount, - headerinfo_GetCodecInfo, - headerinfo_GetAttributeCountEx, - headerinfo_GetAttributeIndices, - headerinfo_GetAttributeByIndexEx, - headerinfo_ModifyAttribute, - headerinfo_AddAttribute, - headerinfo_DeleteAttribute, - headerinfo_AddCodecInfo -}; - - -static inline WMReader *impl_from_IWMLanguageList(IWMLanguageList *iface) -{ - return CONTAINING_RECORD(iface, WMReader, IWMLanguageList_iface); -} - -static HRESULT WINAPI langlist_QueryInterface(IWMLanguageList *iface, REFIID riid, void **ppv) -{ - WMReader *This = impl_from_IWMLanguageList(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI langlist_AddRef(IWMLanguageList *iface) -{ - WMReader *This = impl_from_IWMLanguageList(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI langlist_Release(IWMLanguageList *iface) -{ - WMReader *This = impl_from_IWMLanguageList(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI langlist_GetLanguageCount(IWMLanguageList *iface, WORD *count) -{ - WMReader *This = impl_from_IWMLanguageList(iface); - FIXME("%p, %p\n", This, count); - return E_NOTIMPL; -} - -static HRESULT WINAPI langlist_GetLanguageDetails(IWMLanguageList *iface, WORD index, - WCHAR *language, WORD *length) -{ - WMReader *This = impl_from_IWMLanguageList(iface); - FIXME("%p, %d, %p, %p\n", This, index, language, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI langlist_AddLanguageByRFC1766String(IWMLanguageList *iface, LPCWSTR_WMSDK_TYPE_SAFE language, - WORD *index) -{ - WMReader *This = impl_from_IWMLanguageList(iface); - FIXME("%p, %p, %p\n", This, language, index); - return E_NOTIMPL; -} - -static const IWMLanguageListVtbl WMLanguageListVtbl = -{ - langlist_QueryInterface, - langlist_AddRef, - langlist_Release, - langlist_GetLanguageCount, - langlist_GetLanguageDetails, - langlist_AddLanguageByRFC1766String -}; - -static inline WMReader *impl_from_IReferenceClock(IReferenceClock *iface) -{ - return CONTAINING_RECORD(iface, WMReader, IReferenceClock_iface); -} - -static HRESULT WINAPI refclock_QueryInterface(IReferenceClock *iface, REFIID riid, void **ppv) -{ - WMReader *This = impl_from_IReferenceClock(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI refclock_AddRef(IReferenceClock *iface) -{ - WMReader *This = impl_from_IReferenceClock(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI refclock_Release(IReferenceClock *iface) -{ - WMReader *This = impl_from_IReferenceClock(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI refclock_GetTime(IReferenceClock *iface, REFERENCE_TIME *time) -{ - WMReader *This = impl_from_IReferenceClock(iface); - FIXME("%p, %p\n", This, time); - return E_NOTIMPL; -} - -static HRESULT WINAPI refclock_AdviseTime(IReferenceClock *iface, REFERENCE_TIME basetime, - REFERENCE_TIME streamtime, HEVENT event, DWORD_PTR *cookie) -{ - WMReader *This = impl_from_IReferenceClock(iface); - FIXME("%p, %s, %s, %lu, %p\n", This, wine_dbgstr_longlong(basetime), - wine_dbgstr_longlong(streamtime), event, cookie); - return E_NOTIMPL; -} - -static HRESULT WINAPI refclock_AdvisePeriodic(IReferenceClock *iface, REFERENCE_TIME starttime, - REFERENCE_TIME period, HSEMAPHORE semaphore, DWORD_PTR *cookie) -{ - WMReader *This = impl_from_IReferenceClock(iface); - FIXME("%p, %s, %s, %lu, %p\n", This, wine_dbgstr_longlong(starttime), - wine_dbgstr_longlong(period), semaphore, cookie); - return E_NOTIMPL; -} - -static HRESULT WINAPI refclock_Unadvise(IReferenceClock *iface, DWORD_PTR cookie) -{ - WMReader *This = impl_from_IReferenceClock(iface); - FIXME("%p, %lu\n", This, cookie); - return E_NOTIMPL; -} - -static const IReferenceClockVtbl ReferenceClockVtbl = -{ - refclock_QueryInterface, - refclock_AddRef, - refclock_Release, - refclock_GetTime, - refclock_AdviseTime, - refclock_AdvisePeriodic, - refclock_Unadvise -}; - -static inline WMReader *impl_from_IWMProfile3(IWMProfile3 *iface) -{ - return CONTAINING_RECORD(iface, WMReader, IWMProfile3_iface); -} - -static HRESULT WINAPI profile3_QueryInterface(IWMProfile3 *iface, REFIID riid, void **ppv) -{ - WMReader *This = impl_from_IWMProfile3(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI profile3_AddRef(IWMProfile3 *iface) -{ - WMReader *This = impl_from_IWMProfile3(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI profile3_Release(IWMProfile3 *iface) -{ - WMReader *This = impl_from_IWMProfile3(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI profile3_GetVersion(IWMProfile3 *iface, WMT_VERSION *version) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, version); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetName(IWMProfile3 *iface, WCHAR *name, DWORD *length) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p, %p\n", This, name, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_SetName(IWMProfile3 *iface, const WCHAR *name) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %s\n", This, debugstr_w(name)); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetDescription(IWMProfile3 *iface, WCHAR *description, DWORD *length) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p, %p\n", This, description, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_SetDescription(IWMProfile3 *iface, const WCHAR *description) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %s\n", This, debugstr_w(description)); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetStreamCount(IWMProfile3 *iface, DWORD *count) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, count); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetStream(IWMProfile3 *iface, DWORD index, IWMStreamConfig **config) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %d, %p\n", This, index, config); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetStreamByNumber(IWMProfile3 *iface, WORD stream, IWMStreamConfig **config) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %d, %p\n", This, stream, config); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_RemoveStream(IWMProfile3 *iface, IWMStreamConfig *config) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, config); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_RemoveStreamByNumber(IWMProfile3 *iface, WORD stream) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %d\n", This, stream); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_AddStream(IWMProfile3 *iface, IWMStreamConfig *config) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, config); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_ReconfigStream(IWMProfile3 *iface, IWMStreamConfig *config) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, config); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_CreateNewStream(IWMProfile3 *iface, REFGUID type, IWMStreamConfig **config) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %s, %p\n", This, debugstr_guid(type), config); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetMutualExclusionCount(IWMProfile3 *iface, DWORD *count) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, count); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetMutualExclusion(IWMProfile3 *iface, DWORD index, IWMMutualExclusion **mutual) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %d, %p\n", This, index, mutual); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_RemoveMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion *mutual) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, mutual); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_AddMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion *mutual) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, mutual); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_CreateNewMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion **mutual) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, mutual); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetProfileID(IWMProfile3 *iface, GUID *guid) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, guid); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetStorageFormat(IWMProfile3 *iface, WMT_STORAGE_FORMAT *storage) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, storage); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_SetStorageFormat(IWMProfile3 *iface, WMT_STORAGE_FORMAT storage) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %d\n", This, storage); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetBandwidthSharingCount(IWMProfile3 *iface, DWORD *count) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, count); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetBandwidthSharing(IWMProfile3 *iface, DWORD index, IWMBandwidthSharing **bandwidth) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %d, %p\n", This, index, bandwidth); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_RemoveBandwidthSharing( IWMProfile3 *iface, IWMBandwidthSharing *bandwidth) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, bandwidth); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_AddBandwidthSharing(IWMProfile3 *iface, IWMBandwidthSharing *bandwidth) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, bandwidth); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_CreateNewBandwidthSharing( IWMProfile3 *iface, IWMBandwidthSharing **bandwidth) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, bandwidth); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization **stream) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, stream); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_SetStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization *stream) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, stream); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_RemoveStreamPrioritization(IWMProfile3 *iface) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_CreateNewStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization **stream) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, stream); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetExpectedPacketCount(IWMProfile3 *iface, QWORD duration, QWORD *packets) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %s, %p\n", This, wine_dbgstr_longlong(duration), packets); - return E_NOTIMPL; -} - -static const IWMProfile3Vtbl WMProfile3Vtbl = -{ - profile3_QueryInterface, - profile3_AddRef, - profile3_Release, - profile3_GetVersion, - profile3_GetName, - profile3_SetName, - profile3_GetDescription, - profile3_SetDescription, - profile3_GetStreamCount, - profile3_GetStream, - profile3_GetStreamByNumber, - profile3_RemoveStream, - profile3_RemoveStreamByNumber, - profile3_AddStream, - profile3_ReconfigStream, - profile3_CreateNewStream, - profile3_GetMutualExclusionCount, - profile3_GetMutualExclusion, - profile3_RemoveMutualExclusion, - profile3_AddMutualExclusion, - profile3_CreateNewMutualExclusion, - profile3_GetProfileID, - profile3_GetStorageFormat, - profile3_SetStorageFormat, - profile3_GetBandwidthSharingCount, - profile3_GetBandwidthSharing, - profile3_RemoveBandwidthSharing, - profile3_AddBandwidthSharing, - profile3_CreateNewBandwidthSharing, - profile3_GetStreamPrioritization, - profile3_SetStreamPrioritization, - profile3_RemoveStreamPrioritization, - profile3_CreateNewStreamPrioritization, - profile3_GetExpectedPacketCount -}; - -static inline WMReader *impl_from_IWMPacketSize2(IWMPacketSize2 *iface) -{ - return CONTAINING_RECORD(iface, WMReader, IWMPacketSize2_iface); -} - -static HRESULT WINAPI packetsize_QueryInterface(IWMPacketSize2 *iface, REFIID riid, void **ppv) -{ - WMReader *This = impl_from_IWMPacketSize2(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI packetsize_AddRef(IWMPacketSize2 *iface) -{ - WMReader *This = impl_from_IWMPacketSize2(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI packetsize_Release(IWMPacketSize2 *iface) -{ - WMReader *This = impl_from_IWMPacketSize2(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI packetsize_GetMaxPacketSize(IWMPacketSize2 *iface, DWORD *size) -{ - WMReader *This = impl_from_IWMPacketSize2(iface); - FIXME("%p, %p\n", This, size); - return E_NOTIMPL; -} - -static HRESULT WINAPI packetsize_SetMaxPacketSize(IWMPacketSize2 *iface, DWORD size) -{ - WMReader *This = impl_from_IWMPacketSize2(iface); - FIXME("%p, %d\n", This, size); - return E_NOTIMPL; -} - -static HRESULT WINAPI packetsize_GetMinPacketSize(IWMPacketSize2 *iface, DWORD *size) -{ - WMReader *This = impl_from_IWMPacketSize2(iface); - FIXME("%p, %p\n", This, size); - return E_NOTIMPL; -} - -static HRESULT WINAPI packetsize_SetMinPacketSize(IWMPacketSize2 *iface, DWORD size) -{ - WMReader *This = impl_from_IWMPacketSize2(iface); - FIXME("%p, %d\n", This, size); - return E_NOTIMPL; -} - -static const IWMPacketSize2Vtbl WMPacketSize2Vtbl = -{ - packetsize_QueryInterface, - packetsize_AddRef, - packetsize_Release, - packetsize_GetMaxPacketSize, - packetsize_SetMaxPacketSize, - packetsize_GetMinPacketSize, - packetsize_SetMinPacketSize -}; - -HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader) -{ - WMReader *reader; - - TRACE("(%p, %x, %p)\n", reserved, rights, ret_reader); - - reader = heap_alloc(sizeof(*reader)); - if(!reader) - return E_OUTOFMEMORY; - - reader->IWMReader_iface.lpVtbl = &WMReaderVtbl; - reader->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl; - reader->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl; - reader->IWMReaderNetworkConfig2_iface.lpVtbl = &WMReaderNetworkConfig2Vtbl; - reader->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl; - reader->IWMReaderTypeNegotiation_iface.lpVtbl = &WMReaderTypeNegotiationVtbl; - reader->IWMReaderTimecode_iface.lpVtbl = &WMReaderTimecodeVtbl; - reader->IWMReaderPlaylistBurn_iface.lpVtbl = &WMReaderPlaylistBurnVtbl; - reader->IWMHeaderInfo3_iface.lpVtbl = &WMHeaderInfo3Vtbl; - reader->IWMLanguageList_iface.lpVtbl = &WMLanguageListVtbl; - reader->IReferenceClock_iface.lpVtbl = &ReferenceClockVtbl; - reader->IWMProfile3_iface.lpVtbl = &WMProfile3Vtbl; - reader->IWMPacketSize2_iface.lpVtbl = &WMPacketSize2Vtbl; - reader->ref = 1; - - *ret_reader = &reader->IWMReader_iface; - return S_OK; -} - -HRESULT WINAPI WMCreateReaderPriv(IWMReader **ret_reader) -{ - return WMCreateReader(NULL, 0, ret_reader); -} - -HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader **syncreader) -{ - FIXME("(%p, %x, %p): stub\n", pcert, rights, syncreader); - - *syncreader = NULL; - - return E_NOTIMPL; -} - typedef struct { IWMProfileManager IWMProfileManager_iface; LONG ref; -- 2.21.0

2 4

[PATCH v2] po: Update French translation.
by Isira Seneviratne 02 Mar '19

02 Mar '19

1 0

[PATCH] po: Update French translation.
by Isira Seneviratne 02 Mar '19

02 Mar '19

1 0

Retrieving LOCALE_FONTSIGNATURE value
by Isira Seneviratne 01 Mar '19

01 Mar '19

I used the following code to retrieve the LOCALE_FONTSIGNATURE value for Sinhala and print it to a text file (I used GetLocaleInfoA because MinGW was returning an error saying that GetLocaleInfoEx could not be found). I was able to retrieve the LOCALE_SSCRIPTS value on Windows using this method as well by replacing LOCALE_FONTSIGNATURE with LOCALE_SSCRIPTS in GetLocaleInfoA: #include <windows.h> #include <winnls.h> #include <fstream> using namespace std; int main() { ofstream ofs ("locale.txt", std::ofstream::out); char s[100]; GetLocaleInfoA(MAKELCID(MAKELANGID(LANG_SINHALESE, SUBLANG_SINHALESE_SRI_LANKA), SORT_DEFAULT), LOCALE_FONTSIGNATURE, s, 100); ofs << s << endl; ofs.close(); } I then used hexdump to get the following from the output file: 0000000 0a0d 0000002 How should this be converted to the format used in the NLS files?

1 0

[PATCH 1/2] ntdll/tests: Add test for preserving x87 fpu state when capturing context.
by Paul Gofman 01 Mar '19

01 Mar '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ntdll/tests/exception.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index b8bd186632..5d108bade1 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1509,7 +1509,8 @@ static void test_thread_context(void) struct expected { DWORD Eax, Ebx, Ecx, Edx, Esi, Edi, Ebp, Esp, Eip, - SegCs, SegDs, SegEs, SegFs, SegGs, SegSs, EFlags, prev_frame; + SegCs, SegDs, SegEs, SegFs, SegGs, SegSs, EFlags, prev_frame, + x87_control, save_x87_control, new_x87_control; } expect; NTSTATUS (*func_ptr)( struct expected *res, void *func, void *arg1, void *arg2 ) = (void *)code_mem; @@ -1542,10 +1543,23 @@ static void test_thread_context(void) 0x8f, 0x40, 0x3c, /* popl 0x3c(%eax) */ 0xff, 0x75, 0x00, /* pushl 0x0(%ebp) ; previous stack frame */ 0x8f, 0x40, 0x40, /* popl 0x40(%eax) */ + + 0x9b, 0xd9, 0x78, 0x48, /* fstcw 0x48(%eax) */ + 0x68, 0x7f, 0x04, 0x00, 0x00, /* pushl $0x47f */ + 0x8f, 0x40, 0x44, /* popl 0x44(%eax) */ + 0xd9, 0x68, 0x44, /* fldcw 0x44(%eax); */ + 0x8b, 0x00, /* mov (%eax),%eax */ 0xff, 0x75, 0x14, /* pushl 0x14(%ebp) */ 0xff, 0x75, 0x10, /* pushl 0x10(%ebp) */ 0xff, 0x55, 0x0c, /* call *0xc(%ebp) */ + + 0x50, /* pushl %eax */ + 0x8b, 0x45, 0x08, /* mov 0x8(%ebp),%eax */ + 0x9b, 0xd9, 0x78, 0x4c, /* fstcw 0x4c(%eax) */ + 0xd9, 0x68, 0x48, /* fldcw 0x48(%eax); */ + 0x58, /* popl %eax */ + 0xc9, /* leave */ 0xc3, /* ret */ }; @@ -1593,7 +1607,8 @@ static void test_thread_context(void) memset( &context, 0xcc, sizeof(context) ); memset( &expect, 0xcc, sizeof(expect) ); - context.ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS; + context.ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT; + status = func_ptr( &expect, pNtGetContextThread, (void *)GetCurrentThread(), &context ); ok( status == STATUS_SUCCESS, "NtGetContextThread failed %08x\n", status ); trace( "expect: eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x ebp=%08x esp=%08x " @@ -1625,6 +1640,13 @@ static void test_thread_context(void) ok( context.SegFs == LOWORD(expect.SegFs), "wrong SegFs %08x/%08x\n", context.SegFs, expect.SegFs ); ok( context.SegGs == LOWORD(expect.SegGs), "wrong SegGs %08x/%08x\n", context.SegGs, expect.SegGs ); ok( context.SegSs == LOWORD(expect.SegSs), "wrong SegSs %08x/%08x\n", context.SegSs, expect.SegGs ); + + ok( LOWORD(context.FloatSave.ControlWord) == LOWORD(expect.x87_control), + "wrong x87 control word %#x/%#x.\n", context.FloatSave.ControlWord, expect.x87_control ); + todo_wine ok( LOWORD(expect.x87_control) == LOWORD(expect.new_x87_control), + "x87 control word changed in NtGetContextThread() %#x/%#x.\n", + LOWORD(expect.x87_control), LOWORD(expect.new_x87_control) ); + #undef COMPARE } -- 2.20.1

1 1

[PATCH] user32/tests: Remove useless casts to self
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/dde.c | 10 +++++----- dlls/user32/tests/msg.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index eed2ac437e..934252008c 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2123,7 +2123,7 @@ static void test_PackDDElParam(void) lparam = PackDDElParam(WM_DDE_INITIATE, 0xcafe, 0xbeef); /* value gets sign-extended despite being an LPARAM */ - ok(lparam == (int)0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); + ok(lparam == 0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); lo = hi = 0; ret = UnpackDDElParam(WM_DDE_INITIATE, lparam, &lo, &hi); @@ -2135,7 +2135,7 @@ static void test_PackDDElParam(void) ok(ret == TRUE, "Expected TRUE, got %d\n", ret); lparam = PackDDElParam(WM_DDE_TERMINATE, 0xcafe, 0xbeef); - ok(lparam == (int)0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); + ok(lparam == 0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); lo = hi = 0; ret = UnpackDDElParam(WM_DDE_TERMINATE, lparam, &lo, &hi); @@ -2170,7 +2170,7 @@ static void test_PackDDElParam(void) ok(ret == TRUE, "Expected TRUE, got %d\n", ret); lparam = PackDDElParam(WM_DDE_UNADVISE, 0xcafe, 0xbeef); - ok(lparam == (int)0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); + ok(lparam == 0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); lo = hi = 0; ret = UnpackDDElParam(WM_DDE_UNADVISE, lparam, &lo, &hi); @@ -2183,7 +2183,7 @@ static void test_PackDDElParam(void) lparam = PackDDElParam(WM_DDE_ACK, 0xcafe, 0xbeef); /* win9x returns the input (0xbeef<<16 | 0xcafe) here */ - if (lparam != (int)0xbeefcafe) { + if (lparam != 0xbeefcafe) { ptr = GlobalLock((HGLOBAL)lparam); ok(ptr != NULL, "Expected non-NULL ptr\n"); ok(ptr[0] == 0xcafe, "Expected 0xcafe, got %08lx\n", ptr[0]); @@ -2228,7 +2228,7 @@ static void test_PackDDElParam(void) ok(ret == TRUE, "Expected TRUE, got %d\n", ret); lparam = PackDDElParam(WM_DDE_REQUEST, 0xcafe, 0xbeef); - ok(lparam == (int)0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); + ok(lparam == 0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); lo = hi = 0; ret = UnpackDDElParam(WM_DDE_REQUEST, lparam, &lo, &hi); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6d0f0637ee..acf131f2d9 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -17552,7 +17552,7 @@ START_TEST(msg) { unsigned int arg; /* Child process. */ - sscanf (test_argv[2], "%d", (unsigned int *) &arg); + sscanf (test_argv[2], "%d", &arg); do_wait_idle_child( arg ); return; } -- 2.20.1

2 1

[PATCH 1/6] d3d9: Release system memory wined3d buffer only after the draw buffer is destroyed.
by Matteo Bruni 01 Mar '19

01 Mar '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3d9/buffer.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index dcd7e287264..43321b3202b 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -59,9 +59,10 @@ static ULONG WINAPI d3d9_vertexbuffer_AddRef(IDirect3DVertexBuffer9 *iface) { IDirect3DDevice9Ex_AddRef(buffer->parent_device); wined3d_mutex_lock(); - wined3d_buffer_incref(buffer->wined3d_buffer); if (buffer->draw_buffer) wined3d_buffer_incref(buffer->draw_buffer); + else + wined3d_buffer_incref(buffer->wined3d_buffer); wined3d_mutex_unlock(); } @@ -81,9 +82,10 @@ static ULONG WINAPI d3d9_vertexbuffer_Release(IDirect3DVertexBuffer9 *iface) IDirect3DDevice9Ex *device = buffer->parent_device; wined3d_mutex_lock(); - wined3d_buffer_decref(buffer->wined3d_buffer); if (draw_buffer) wined3d_buffer_decref(draw_buffer); + else + wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ @@ -270,6 +272,9 @@ static const IDirect3DVertexBuffer9Vtbl d3d9_vertexbuffer_vtbl = static void STDMETHODCALLTYPE d3d9_vertexbuffer_wined3d_object_destroyed(void *parent) { struct d3d9_vertexbuffer *buffer = parent; + + if (buffer->draw_buffer) + wined3d_buffer_decref(buffer->wined3d_buffer); d3d9_resource_cleanup(&buffer->resource); heap_free(buffer); } @@ -387,9 +392,10 @@ static ULONG WINAPI d3d9_indexbuffer_AddRef(IDirect3DIndexBuffer9 *iface) { IDirect3DDevice9Ex_AddRef(buffer->parent_device); wined3d_mutex_lock(); - wined3d_buffer_incref(buffer->wined3d_buffer); if (buffer->draw_buffer) wined3d_buffer_incref(buffer->draw_buffer); + else + wined3d_buffer_incref(buffer->wined3d_buffer); wined3d_mutex_unlock(); } @@ -409,9 +415,10 @@ static ULONG WINAPI d3d9_indexbuffer_Release(IDirect3DIndexBuffer9 *iface) IDirect3DDevice9Ex *device = buffer->parent_device; wined3d_mutex_lock(); - wined3d_buffer_decref(buffer->wined3d_buffer); if (draw_buffer) wined3d_buffer_decref(draw_buffer); + else + wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ @@ -596,6 +603,9 @@ static const IDirect3DIndexBuffer9Vtbl d3d9_indexbuffer_vtbl = static void STDMETHODCALLTYPE d3d9_indexbuffer_wined3d_object_destroyed(void *parent) { struct d3d9_indexbuffer *buffer = parent; + + if (buffer->draw_buffer) + wined3d_buffer_decref(buffer->wined3d_buffer); d3d9_resource_cleanup(&buffer->resource); heap_free(buffer); } -- 2.19.2

5 17

[PATCH] ieframe/tests: Remove useless cast to self
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 706d5071a9..0e7311796f 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -4069,7 +4069,7 @@ static void test_SetAdvise(void) ok(!flags, "got %08x\n", aspects); ok(sink == NULL, "got %p\n", sink); - hr = IViewObject2_SetAdvise(view, DVASPECT_CONTENT, 0, (IAdviseSink *)&test_sink); + hr = IViewObject2_SetAdvise(view, DVASPECT_CONTENT, 0, &test_sink); ok(hr == S_OK, "got %08x\n", hr); aspects = flags = 0xdeadbeef; -- 2.20.1

2 1

[PATCH] winebus.sys: Remove useless casts to self
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 2 +- dlls/winebus.sys/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 64b245e630..1f671cf568 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1086,7 +1086,7 @@ static int parse_uevent_info(const char *uevent, DWORD *vendor_id, /* The caller has to free the serial number */ if (*value) { - *serial_number = (WCHAR*)strdupAtoW(value); + *serial_number = strdupAtoW(value); found_serial = 1; } } diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 299cec5034..fd68833ac3 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -380,7 +380,7 @@ static NTSTATUS build_device_relations(DEVICE_RELATIONS **devices) i = 0; LIST_FOR_EACH_ENTRY(ptr, &pnp_devset, struct pnp_device, entry) { - (*devices)->Objects[i] = (DEVICE_OBJECT*)ptr->device; + (*devices)->Objects[i] = ptr->device; i++; } LeaveCriticalSection(&device_list_cs); -- 2.20.1

1 0

[PATCH] comctl32/tests: Remove redundant not-NULL check (coccinellery)
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 86d0fabf9e..0e62ab9e0c 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1559,8 +1559,7 @@ cleanup: if(hbmDst) DeleteObject(hbmDst); - if(hdcDst) - DeleteDC(hdcDst); + DeleteDC(hdcDst); if(hbmMask) DeleteObject(hbmMask); -- 2.20.1

1 0

[PATCH] progman: Avoid using the comma operator
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/progman/grpfile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/progman/grpfile.c b/programs/progman/grpfile.c index 4a71ce51d3..f3a084d290 100644 --- a/programs/progman/grpfile.c +++ b/programs/progman/grpfile.c @@ -667,8 +667,8 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) PUT_SHORT(buffer, 0, 0x8000); PUT_SHORT(buffer, 2, 0xffff); PUT_SHORT(buffer, 4, 0x000a); - buffer[6] = 'P', buffer[7] = 'M'; - buffer[8] = 'C', buffer[9] = 'C'; + buffer[6] = 'P'; buffer[7] = 'M'; + buffer[8] = 'C'; buffer[9] = 'C'; if ((UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, buffer, 10)) return FALSE; -- 2.20.1

1 0

[PATCH] winedump: Remove useless casts to self
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/winedump/debug.c | 4 ++-- tools/winedump/msc.c | 4 ++-- tools/winedump/msmangle.c | 10 +++++----- tools/winedump/pdb.c | 4 ++-- tools/winedump/search.c | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index 221c079851..7fa5f4ecee 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -413,7 +413,7 @@ static void dump_codeview_headers(unsigned long base, unsigned long len) if (memcmp(signature, "NB10", 4) == 0) { const CODEVIEW_PDB_DATA* pdb_data; - pdb_data = (const void *)cv_base; + pdb_data = cv_base; printf(" Filepos: 0x%08lX\n", pdb_data->filepos); printf(" TimeStamp: %08X (%s)\n", @@ -426,7 +426,7 @@ static void dump_codeview_headers(unsigned long base, unsigned long len) { const OMFSignatureRSDS* rsds_data; - rsds_data = (const void *)cv_base; + rsds_data = cv_base; printf(" Guid: %s\n", get_guid_str(&rsds_data->guid)); printf(" Age: %08X\n", rsds_data->age); printf(" Filename: %s\n", rsds_data->name); diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 5890b2926b..5f7765f4d3 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -91,7 +91,7 @@ static int full_numeric_leaf(struct full_value* fv, const unsigned short int* le case LF_USHORT: length += 2; - fv->v.i = *(const unsigned short*)leaf; + fv->v.i = *leaf; break; case LF_LONG: @@ -1490,7 +1490,7 @@ void codeview_dump_linetab2(const char* linetab, DWORD size, const char* strimag break; default: printf("%sblock end %x\n", pfx, lt2->header); - lt2 = (const struct codeview_linetab2*)((const char*)linetab + size); + lt2 = (const struct codeview_linetab2*)(linetab + size); continue; } lt2 = codeview_linetab2_next_block(lt2); diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index 39e4f3a173..f9fe75b7d5 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -590,7 +590,7 @@ static char *demangle_datatype (char **str, compound_type *ct, if (!ct->expression) return NULL; - return (char *)(*str = iter); + return *str = iter; } @@ -629,7 +629,7 @@ static char *get_constraints_convention_1 (char **str, compound_type *ct) char *iter = *str, **retval = str; if (ct->have_qualifiers) - return (char *)*str; /* Previously got constraints for this type */ + return *str; /* Previously got constraints for this type */ if (*iter == '?' || *iter == 'A') { @@ -651,7 +651,7 @@ static char *get_constraints_convention_1 (char **str, compound_type *ct) } } - return (char *)(*retval = iter); + return *retval = iter; } @@ -666,7 +666,7 @@ static char *get_constraints_convention_2 (char **str, compound_type *ct) /* FIXME: Why do arrays have both convention 1 & 2 constraints? */ if (ct->have_qualifiers && ct->dest_type != 'Q') - return (char *)*str; /* Previously got constraints for this type */ + return *str; /* Previously got constraints for this type */ ct->have_qualifiers = TRUE; /* Even if none, we've got all we're getting */ @@ -687,7 +687,7 @@ static char *get_constraints_convention_2 (char **str, compound_type *ct) break; } - return (char *)(*retval = iter); + return *retval = iter; } diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 6fd70ce9e5..dcfbea85b4 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -336,7 +336,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx for (j = cfile; j < src->nSrcFiles && j < cfile + indx[i]; j++) { /* FIXME: in some cases, it's a p_string but WHEN ? */ - if (cstr + offset[j] >= (const char*)start_cstr /* wrap around */ && + if (cstr + offset[j] >= start_cstr /* wrap around */ && cstr + offset[j] < (const char*)src + symbols->srcmodule_size) printf("\t\t\tSource file: %s\n", cstr + offset[j]); else @@ -367,7 +367,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx "\t\tAge: %08u\n" "\t\tfile1: %s\n" "\t\tfile2: %s\n", - (ULONG_PTR)((const char*)imp - (const char*)first), + (ULONG_PTR)((const char*)imp - first), imp->unknown1, imp->unknown2, imp->TimeDateStamp, diff --git a/tools/winedump/search.c b/tools/winedump/search.c index 08aa8e125d..49f83ca70f 100644 --- a/tools/winedump/search.c +++ b/tools/winedump/search.c @@ -311,7 +311,7 @@ static const char *get_type (parsed_symbol *sym, const char *proto, int arg) if (arg < 0) { - sym->return_text = (char*)type_str; + sym->return_text = type_str; sym->return_type = dest_type; } else @@ -332,7 +332,7 @@ static const char *get_type (parsed_symbol *sym, const char *proto, int arg) sym->arg_name [arg] = str_substring (proto_str, iter); proto_str = iter; } - sym->arg_text [arg] = (char*)type_str; + sym->arg_text [arg] = type_str; } return proto_str; -- 2.20.1

1 0

[PATCH] ntdll/tests: Avoid using the comma operator
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/tests/directory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index a69b31b6df..1109f7f3a4 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -619,7 +619,7 @@ static void test_NtQueryDirectoryFile(void) ok( filename[0] == '.' && filename[1] == '.', "incorrect long file name: %s\n", wine_dbgstr_wn(next->FileName, next->FileNameLength/sizeof(WCHAR))); - data_size = fbdi->NextEntryOffset + offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[1] ), + data_size = fbdi->NextEntryOffset + offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[1] ); memset( data, 0x55, data_size ); U(io).Status = 0xdeadbeef; U(io).Information = 0xdeadbeef; @@ -636,7 +636,7 @@ static void test_NtQueryDirectoryFile(void) next = (FILE_BOTH_DIRECTORY_INFORMATION *)&fbdi->FileName[1]; ok( next->NextEntryOffset == 0x55555555, "wrong offset %x\n", next->NextEntryOffset ); - data_size = fbdi->NextEntryOffset + offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[2] ), + data_size = fbdi->NextEntryOffset + offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[2] ); memset( data, 0x55, data_size ); U(io).Status = 0xdeadbeef; U(io).Information = 0xdeadbeef; -- 2.20.1

1 0

[PATCH 1/2] user32/combo: Add more tests for listbox_size
by Fabian Maurer 01 Mar '19

01 Mar '19

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/tests/combo.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index 0d3b1b170f..12e4ed5862 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -692,18 +692,21 @@ static void test_listbox_size(DWORD style) {2, 41, TRUE}, {2, 42, FALSE}, {2, 50, FALSE}, - {2, 60}, - {2, 80}, - {2, 89}, - {2, 90}, - {2, 100}, + {2, 60, FALSE}, + {2, 80, FALSE}, + {2, 89, FALSE}, + {2, 90, FALSE}, + {2, 100, FALSE}, + {3, 73, TRUE}, {10, 24, FALSE}, + {10, 40, TRUE}, {10, 41, TRUE}, {10, 42, FALSE}, {10, 50, FALSE}, {10, 60, FALSE}, {10, 80, FALSE}, + {10, 88, FALSE}, {10, 89, TRUE}, {10, 90, FALSE}, {10, 100, FALSE}, -- 2.20.1

3 7

[PATCH 8/8] d3d12/tests: Use multiple command lists in test_swapchain_size_mismatch().
by Józef Kucia 01 Mar '19

01 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/tests/d3d12.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 5cb9a2991639..16e5c4ba5374 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -954,6 +954,7 @@ static void test_swapchain_draw(void) static void test_swapchain_size_mismatch(void) { static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + UINT64 frame_fence_value[MAX_FRAME_COUNT] = {0}; ID3D12GraphicsCommandList *command_list; D3D12_CPU_DESCRIPTOR_HANDLE rtv; struct test_context_desc desc; @@ -963,6 +964,8 @@ static void test_swapchain_size_mismatch(void) ID3D12CommandQueue *queue; unsigned int index, i; ID3D12Device *device; + ID3D12Fence *fence; + UINT64 fence_value; ULONG refcount; HWND window; HRESULT hr; @@ -1010,12 +1013,28 @@ static void test_swapchain_size_mismatch(void) window = create_window(WS_VISIBLE); ret = GetClientRect(window, &rect); ok(ret, "Failed to get client rect.\n"); - swapchain = create_swapchain(&context, window, 2, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); + swapchain = create_swapchain(&context, window, 4, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); + + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(context.list); ++i) + { + hr = ID3D12GraphicsCommandList_Close(context.list[i]); + ok(hr == S_OK, "Failed to close command list %u, hr %#x.\n", i, hr); + } + fence_value = 1; for (i = 0; i < 20; ++i) { index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); + + hr = wait_for_fence(fence, frame_fence_value[index]); + ok(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr); + + reset_command_list(&context, index); backbuffer = context.render_target[index]; + command_list = context.list[index]; rtv = context.rtv[index]; transition_sub_resource_state(command_list, backbuffer, 0, @@ -1030,13 +1049,21 @@ static void test_swapchain_size_mismatch(void) hr = IDXGISwapChain3_Present(swapchain, 1, 0); ok(hr == S_OK, "Failed to present, hr %#x.\n", hr); - wait_queue_idle(device, queue); - reset_command_list(&context, 0); - if (i == 6) + { + wait_queue_idle(device, queue); MoveWindow(window, 0, 0, 100, 100, TRUE); + } + + frame_fence_value[index] = fence_value; + hr = ID3D12CommandQueue_Signal(queue, fence, fence_value); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + ++fence_value; } + wait_queue_idle(device, queue); + + ID3D12Fence_Release(fence); destroy_render_targets(&context); refcount = IDXGISwapChain3_Release(swapchain); ok(!refcount, "Swapchain has %u references left.\n", refcount); -- 2.19.2

3 2

[PATCH 7/8] d3d12/tests: Use multiple command lists in test_swapchain_backbuffer_index().
by Józef Kucia 01 Mar '19

01 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/tests/d3d12.c | 271 +++++++++++++++++++++++---------------- 1 file changed, 161 insertions(+), 110 deletions(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index dec7cf855839..5cb9a2991639 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include <stdlib.h> #define COBJMACROS #include "initguid.h" @@ -274,37 +275,25 @@ static ID3D12PipelineState *create_pipeline_state_(unsigned int line, ID3D12Devi return pipeline_state; } -#define reset_command_list(a, b) reset_command_list_(__LINE__, a, b) -static void reset_command_list_(unsigned int line, - ID3D12GraphicsCommandList *list, ID3D12CommandAllocator *allocator) -{ - HRESULT hr; - - hr = ID3D12CommandAllocator_Reset(allocator); - ok_(__FILE__, line)(hr == S_OK, "Failed to reset command allocator, hr %#x.\n", hr); - hr = ID3D12GraphicsCommandList_Reset(list, allocator, NULL); - ok_(__FILE__, line)(hr == S_OK, "Failed to reset command list, hr %#x.\n", hr); -} - struct test_context_desc { BOOL no_pipeline; const D3D12_SHADER_BYTECODE *ps; }; +#define MAX_FRAME_COUNT 4 + struct test_context { ID3D12Device *device; ID3D12CommandQueue *queue; - ID3D12CommandAllocator *allocator; - ID3D12GraphicsCommandList *list; - - D3D12_RESOURCE_DESC render_target_desc; - ID3D12Resource *render_target; + ID3D12CommandAllocator *allocator[MAX_FRAME_COUNT]; + ID3D12GraphicsCommandList *list[MAX_FRAME_COUNT]; ID3D12DescriptorHeap *rtv_heap; - D3D12_CPU_DESCRIPTOR_HANDLE rtv; + D3D12_CPU_DESCRIPTOR_HANDLE rtv[MAX_FRAME_COUNT]; + ID3D12Resource *render_target[MAX_FRAME_COUNT]; ID3D12RootSignature *root_signature; ID3D12PipelineState *pipeline_state; @@ -313,15 +302,43 @@ struct test_context RECT scissor_rect; }; -#define create_render_target(context, a, b) create_render_target_(__LINE__, context, a, b) -static void create_render_target_(unsigned int line, struct test_context *context, - ID3D12Resource **render_target, const D3D12_CPU_DESCRIPTOR_HANDLE *rtv) +#define reset_command_list(a, b) reset_command_list_(__LINE__, a, b) +static void reset_command_list_(unsigned int line, struct test_context *context, unsigned int index) +{ + HRESULT hr; + + assert(index < MAX_FRAME_COUNT); + + hr = ID3D12CommandAllocator_Reset(context->allocator[index]); + ok_(__FILE__, line)(hr == S_OK, "Failed to reset command allocator, hr %#x.\n", hr); + hr = ID3D12GraphicsCommandList_Reset(context->list[index], context->allocator[index], NULL); + ok_(__FILE__, line)(hr == S_OK, "Failed to reset command list, hr %#x.\n", hr); +} + +static void destroy_render_targets(struct test_context *context) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(context->render_target); ++i) + { + if (context->render_target[i]) + { + ID3D12Resource_Release(context->render_target[i]); + context->render_target[i] = NULL; + } + } +} + +#define create_render_target(context) create_render_target_(__LINE__, context) +static void create_render_target_(unsigned int line, struct test_context *context) { D3D12_HEAP_PROPERTIES heap_properties; D3D12_RESOURCE_DESC resource_desc; D3D12_CLEAR_VALUE clear_value; HRESULT hr; + destroy_render_targets(context); + memset(&heap_properties, 0, sizeof(heap_properties)); heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; @@ -344,13 +361,13 @@ static void create_render_target_(unsigned int line, struct test_context *contex hr = ID3D12Device_CreateCommittedResource(context->device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, - &IID_ID3D12Resource, (void **)render_target); + &IID_ID3D12Resource, (void **)&context->render_target[0]); ok_(__FILE__, line)(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); - context->render_target_desc = resource_desc; + set_viewport(&context->viewport, 0.0f, 0.0f, resource_desc.Width, resource_desc.Height, 0.0f, 1.0f); + SetRect(&context->scissor_rect, 0, 0, resource_desc.Width, resource_desc.Height); - if (rtv) - ID3D12Device_CreateRenderTargetView(context->device, *render_target, NULL, *rtv); + ID3D12Device_CreateRenderTargetView(context->device, context->render_target[0], NULL, context->rtv[0]); } #define init_test_context(a, b) init_test_context_(__LINE__, a, b) @@ -359,7 +376,9 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context, { D3D12_COMMAND_QUEUE_DESC command_queue_desc; D3D12_DESCRIPTOR_HEAP_DESC rtv_heap_desc; + unsigned int rtv_size; ID3D12Device *device; + unsigned int i; HRESULT hr; memset(context, 0, sizeof(*context)); @@ -379,15 +398,21 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context, &IID_ID3D12CommandQueue, (void **)&context->queue); ok_(__FILE__, line)(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); - hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT, - &IID_ID3D12CommandAllocator, (void **)&context->allocator); - ok_(__FILE__, line)(hr == S_OK, "Failed to create command allocator, hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(context->allocator); ++i) + { + hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT, + &IID_ID3D12CommandAllocator, (void **)&context->allocator[i]); + ok_(__FILE__, line)(hr == S_OK, "Failed to create command allocator %u, hr %#x.\n", i, hr); + } - hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, - context->allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&context->list); - ok_(__FILE__, line)(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(context->list); ++i) + { + hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, + context->allocator[i], NULL, &IID_ID3D12GraphicsCommandList, (void **)&context->list[i]); + ok_(__FILE__, line)(hr == S_OK, "Failed to create command list %u, hr %#x.\n", i, hr); + } - rtv_heap_desc.NumDescriptors = 16; + rtv_heap_desc.NumDescriptors = MAX_FRAME_COUNT; rtv_heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_RTV; rtv_heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE; rtv_heap_desc.NodeMask = 0; @@ -395,14 +420,12 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context, &IID_ID3D12DescriptorHeap, (void **)&context->rtv_heap); ok_(__FILE__, line)(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr); - context->rtv = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(context->rtv_heap); - - create_render_target_(line, context, &context->render_target, &context->rtv); - - set_viewport(&context->viewport, 0.0f, 0.0f, - context->render_target_desc.Width, context->render_target_desc.Height, 0.0f, 1.0f); - SetRect(&context->scissor_rect, 0, 0, - context->render_target_desc.Width, context->render_target_desc.Height); + rtv_size = ID3D12Device_GetDescriptorHandleIncrementSize(device, D3D12_DESCRIPTOR_HEAP_TYPE_RTV); + for (i = 0; i < ARRAY_SIZE(context->rtv); ++i) + { + context->rtv[i] = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(context->rtv_heap); + context->rtv[i].ptr += i * rtv_size; + } context->root_signature = create_default_root_signature(device); @@ -410,8 +433,7 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context, return TRUE; context->pipeline_state = create_pipeline_state_(line, device, - context->root_signature, context->render_target_desc.Format, - desc ? desc->ps : NULL); + context->root_signature, DXGI_FORMAT_B8G8R8A8_UNORM, desc ? desc->ps : NULL); return TRUE; } @@ -419,6 +441,7 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context, #define destroy_test_context(context) destroy_test_context_(__LINE__, context) static void destroy_test_context_(unsigned int line, struct test_context *context) { + unsigned int i; ULONG refcount; if (context->pipeline_state) @@ -428,12 +451,13 @@ static void destroy_test_context_(unsigned int line, struct test_context *contex if (context->rtv_heap) ID3D12DescriptorHeap_Release(context->rtv_heap); - if (context->render_target) - ID3D12Resource_Release(context->render_target); + destroy_render_targets(context); - ID3D12CommandAllocator_Release(context->allocator); + for (i = 0; i < ARRAY_SIZE(context->allocator); ++i) + ID3D12CommandAllocator_Release(context->allocator[i]); ID3D12CommandQueue_Release(context->queue); - ID3D12GraphicsCommandList_Release(context->list); + for (i = 0; i < ARRAY_SIZE(context->list); ++i) + ID3D12GraphicsCommandList_Release(context->list[i]); refcount = ID3D12Device_Release(context->device); ok_(__FILE__, line)(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); @@ -546,15 +570,22 @@ static HWND create_window(DWORD style) return CreateWindowA("static", "d3d12_test", style, 0, 0, 256, 256, NULL, NULL, NULL, NULL); } -static IDXGISwapChain3 *create_swapchain(ID3D12CommandQueue *queue, HWND window, - DXGI_FORMAT format, unsigned int width, unsigned int height) +static IDXGISwapChain3 *create_swapchain(struct test_context *context, HWND window, + unsigned int buffer_count, DXGI_FORMAT format, unsigned int width, unsigned int height) { + ID3D12CommandQueue *queue = context->queue; + ID3D12Device *device = context->device; IDXGISwapChain1 *swapchain1; DXGI_SWAP_CHAIN_DESC1 desc; IDXGISwapChain3 *swapchain; IDXGIFactory4 *factory; + unsigned int i; HRESULT hr; + assert(buffer_count <= MAX_FRAME_COUNT); + + destroy_render_targets(context); + hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory); ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr); @@ -565,7 +596,7 @@ static IDXGISwapChain3 *create_swapchain(ID3D12CommandQueue *queue, HWND window, desc.SampleDesc.Count = 1; desc.SampleDesc.Quality = 0; desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; - desc.BufferCount = 2; + desc.BufferCount = buffer_count; desc.Scaling = DXGI_SCALING_STRETCH; desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD; desc.AlphaMode = DXGI_ALPHA_MODE_UNSPECIFIED; @@ -578,6 +609,17 @@ static IDXGISwapChain3 *create_swapchain(ID3D12CommandQueue *queue, HWND window, hr = IDXGISwapChain1_QueryInterface(swapchain1, &IID_IDXGISwapChain3, (void **)&swapchain); ok(hr == S_OK, "Failed to query IDXGISwapChain3, hr %#x.\n", hr); IDXGISwapChain1_Release(swapchain1); + + for (i = 0; i < buffer_count; ++i) + { + hr = IDXGISwapChain3_GetBuffer(swapchain, i, &IID_ID3D12Resource, (void **)&context->render_target[i]); + ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", i, hr); + ID3D12Device_CreateRenderTargetView(device, context->render_target[i], NULL, context->rtv[i]); + } + + set_viewport(&context->viewport, 0.0f, 0.0f, width, height, 0.0f, 1.0f); + SetRect(&context->scissor_rect, 0, 0, width, height); + return swapchain; } @@ -768,12 +810,14 @@ static void test_draw(void) if (!init_test_context(&context, NULL)) return; - command_list = context.list; + command_list = context.list[0]; queue = context.queue; - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + create_render_target(&context); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv[0], white, 0, NULL); - ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv[0], FALSE, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); @@ -781,10 +825,10 @@ static void test_draw(void) ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); - transition_sub_resource_state(command_list, context.render_target, 0, + transition_sub_resource_state(command_list, context.render_target[0], 0, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + check_sub_resource_uint(context.render_target[0], 0, queue, command_list, 0xff00ff00, 0); destroy_test_context(&context); } @@ -793,6 +837,7 @@ static void test_swapchain_draw(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; ID3D12GraphicsCommandList *command_list; + D3D12_CPU_DESCRIPTOR_HANDLE rtv; struct test_context_desc desc; struct test_context context; ID3D12Resource *backbuffer; @@ -845,7 +890,7 @@ static void test_swapchain_draw(void) if (!init_test_context(&context, &desc)) return; device = context.device; - command_list = context.list; + command_list = context.list[0]; queue = context.queue; window = create_window(WS_VISIBLE); @@ -858,18 +903,17 @@ static void test_swapchain_draw(void) context.pipeline_state = create_pipeline_state(device, context.root_signature, tests[i].format, &ps); - swapchain = create_swapchain(queue, window, tests[i].format, rect.right, rect.bottom); + swapchain = create_swapchain(&context, window, 2, tests[i].format, rect.right, rect.bottom); index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); - hr = IDXGISwapChain3_GetBuffer(swapchain, index, &IID_ID3D12Resource, (void **)&backbuffer); - ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", index, hr); - ID3D12Device_CreateRenderTargetView(device, backbuffer, NULL, context.rtv); + backbuffer = context.render_target[index]; + rtv = context.rtv[index]; transition_sub_resource_state(command_list, backbuffer, 0, D3D12_RESOURCE_STATE_PRESENT, D3D12_RESOURCE_STATE_RENDER_TARGET); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv, white, 0, NULL); - ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtv, FALSE, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); @@ -882,7 +926,7 @@ static void test_swapchain_draw(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_uint(backbuffer, 0, queue, command_list, tests[i].color, 0); - reset_command_list(command_list, context.allocator); + reset_command_list(&context, 0); transition_sub_resource_state(command_list, backbuffer, 0, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_PRESENT); hr = ID3D12GraphicsCommandList_Close(command_list); @@ -894,14 +938,13 @@ static void test_swapchain_draw(void) wait_queue_idle(device, queue); - refcount = ID3D12Resource_Release(backbuffer); - ok(!refcount, "Backbuffer has %u references left.\n", refcount); + destroy_render_targets(&context); refcount = IDXGISwapChain3_Release(swapchain); ok(!refcount, "Swapchain has %u references left.\n", refcount); ID3D12PipelineState_Release(context.pipeline_state); context.pipeline_state = NULL; - reset_command_list(command_list, context.allocator); + reset_command_list(&context, 0); } DestroyWindow(window); @@ -912,7 +955,7 @@ static void test_swapchain_size_mismatch(void) { static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; ID3D12GraphicsCommandList *command_list; - ID3D12Resource *backbuffers[2]; + D3D12_CPU_DESCRIPTOR_HANDLE rtv; struct test_context_desc desc; struct test_context context; ID3D12Resource *backbuffer; @@ -930,24 +973,23 @@ static void test_swapchain_size_mismatch(void) if (!init_test_context(&context, &desc)) return; device = context.device; - command_list = context.list; + command_list = context.list[0]; queue = context.queue; window = CreateWindowA("static", "d3d12_test", WS_VISIBLE, 0, 0, 200, 200, NULL, NULL, NULL, NULL); - swapchain = create_swapchain(queue, window, DXGI_FORMAT_B8G8R8A8_UNORM, 400, 400); + swapchain = create_swapchain(&context, window, 2, DXGI_FORMAT_B8G8R8A8_UNORM, 400, 400); index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); - hr = IDXGISwapChain3_GetBuffer(swapchain, index, &IID_ID3D12Resource, (void **)&backbuffer); - ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", index, hr); - ID3D12Device_CreateRenderTargetView(device, backbuffer, NULL, context.rtv); + backbuffer = context.render_target[index]; + rtv = context.rtv[index]; transition_sub_resource_state(command_list, backbuffer, 0, D3D12_RESOURCE_STATE_PRESENT, D3D12_RESOURCE_STATE_RENDER_TARGET); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, green, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv, green, 0, NULL); transition_sub_resource_state(command_list, backbuffer, 0, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_uint(backbuffer, 0, queue, command_list, 0xff00ff00, 0); - reset_command_list(command_list, context.allocator); + reset_command_list(&context, 0); transition_sub_resource_state(command_list, backbuffer, 0, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_PRESENT); hr = ID3D12GraphicsCommandList_Close(command_list); @@ -958,10 +1000,9 @@ static void test_swapchain_size_mismatch(void) ok(hr == S_OK, "Failed to present, hr %#x.\n", hr); wait_queue_idle(device, queue); - reset_command_list(command_list, context.allocator); + reset_command_list(&context, 0); - refcount = ID3D12Resource_Release(backbuffer); - ok(!refcount, "Backbuffer has %u references left.\n", refcount); + destroy_render_targets(&context); refcount = IDXGISwapChain3_Release(swapchain); ok(!refcount, "Swapchain has %u references left.\n", refcount); DestroyWindow(window); @@ -969,23 +1010,18 @@ static void test_swapchain_size_mismatch(void) window = create_window(WS_VISIBLE); ret = GetClientRect(window, &rect); ok(ret, "Failed to get client rect.\n"); - swapchain = create_swapchain(queue, window, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); - - for (i = 0; i < ARRAY_SIZE(backbuffers); ++i) - { - hr = IDXGISwapChain3_GetBuffer(swapchain, i, &IID_ID3D12Resource, (void **)&backbuffers[i]); - ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", i, hr); - } + swapchain = create_swapchain(&context, window, 2, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); for (i = 0; i < 20; ++i) { index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); - ID3D12Device_CreateRenderTargetView(device, backbuffers[index], NULL, context.rtv); + backbuffer = context.render_target[index]; + rtv = context.rtv[index]; - transition_sub_resource_state(command_list, backbuffers[index], 0, + transition_sub_resource_state(command_list, backbuffer, 0, D3D12_RESOURCE_STATE_PRESENT, D3D12_RESOURCE_STATE_RENDER_TARGET); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, green, 0, NULL); - transition_sub_resource_state(command_list, backbuffers[index], 0, + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv, green, 0, NULL); + transition_sub_resource_state(command_list, backbuffer, 0, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_PRESENT); hr = ID3D12GraphicsCommandList_Close(command_list); ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); @@ -995,14 +1031,13 @@ static void test_swapchain_size_mismatch(void) ok(hr == S_OK, "Failed to present, hr %#x.\n", hr); wait_queue_idle(device, queue); - reset_command_list(command_list, context.allocator); + reset_command_list(&context, 0); if (i == 6) MoveWindow(window, 0, 0, 100, 100, TRUE); } - for (i = 0; i < ARRAY_SIZE(backbuffers); ++i) - ID3D12Resource_Release(backbuffers[i]); + destroy_render_targets(&context); refcount = IDXGISwapChain3_Release(swapchain); ok(!refcount, "Swapchain has %u references left.\n", refcount); DestroyWindow(window); @@ -1012,15 +1047,20 @@ static void test_swapchain_size_mismatch(void) static void test_swapchain_backbuffer_index(void) { static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; - unsigned int previous_index, expected_index, index, i; + UINT64 frame_fence_value[MAX_FRAME_COUNT] = {0}; ID3D12GraphicsCommandList *command_list; - ID3D12Resource *backbuffers[2]; + unsigned int expected_index, index, i; + const unsigned int buffer_count = 2; + D3D12_CPU_DESCRIPTOR_HANDLE rtv; struct test_context_desc desc; struct test_context context; + ID3D12Resource *backbuffer; unsigned int sync_interval; IDXGISwapChain3 *swapchain; ID3D12CommandQueue *queue; ID3D12Device *device; + ID3D12Fence *fence; + UINT64 fence_value; ULONG refcount; HWND window; HRESULT hr; @@ -1031,33 +1071,42 @@ static void test_swapchain_backbuffer_index(void) if (!init_test_context(&context, &desc)) return; device = context.device; - command_list = context.list; queue = context.queue; window = create_window(WS_VISIBLE); ret = GetClientRect(window, &rect); ok(ret, "Failed to get client rect.\n"); - swapchain = create_swapchain(queue, window, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); + swapchain = create_swapchain(&context, window, buffer_count, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); - for (i = 0; i < ARRAY_SIZE(backbuffers); ++i) + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(context.list); ++i) { - hr = IDXGISwapChain3_GetBuffer(swapchain, i, &IID_ID3D12Resource, (void **)&backbuffers[i]); - ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", i, hr); + hr = ID3D12GraphicsCommandList_Close(context.list[i]); + ok(hr == S_OK, "Failed to close command list %u, hr %#x.\n", i, hr); } - previous_index = 1; + index = 1; + fence_value = 1; for (i = 0; i < 20; ++i) { + expected_index = (index + 1) % buffer_count; index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); - ID3D12Device_CreateRenderTargetView(device, backbuffers[index], NULL, context.rtv); - - expected_index = (previous_index + 1) % 2; ok(index == expected_index, "Test %u: Got index %u, expected %u.\n", i, index, expected_index); - transition_sub_resource_state(command_list, backbuffers[index], 0, + hr = wait_for_fence(fence, frame_fence_value[index]); + ok(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr); + + reset_command_list(&context, index); + backbuffer = context.render_target[index]; + command_list = context.list[index]; + rtv = context.rtv[index]; + + transition_sub_resource_state(command_list, backbuffer, 0, D3D12_RESOURCE_STATE_PRESENT, D3D12_RESOURCE_STATE_RENDER_TARGET); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, green, 0, NULL); - transition_sub_resource_state(command_list, backbuffers[index], 0, + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv, green, 0, NULL); + transition_sub_resource_state(command_list, backbuffer, 0, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_PRESENT); hr = ID3D12GraphicsCommandList_Close(command_list); ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); @@ -1071,14 +1120,16 @@ static void test_swapchain_backbuffer_index(void) hr = IDXGISwapChain3_Present(swapchain, sync_interval, 0); ok(hr == S_OK, "Failed to present, hr %#x.\n", hr); - wait_queue_idle(device, queue); - reset_command_list(command_list, context.allocator); - - previous_index = index; + frame_fence_value[index] = fence_value; + hr = ID3D12CommandQueue_Signal(queue, fence, fence_value); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + ++fence_value; } - for (i = 0; i < ARRAY_SIZE(backbuffers); ++i) - ID3D12Resource_Release(backbuffers[i]); + wait_queue_idle(device, queue); + + ID3D12Fence_Release(fence); + destroy_render_targets(&context); refcount = IDXGISwapChain3_Release(swapchain); ok(!refcount, "Swapchain has %u references left.\n", refcount); DestroyWindow(window); -- 2.19.2

3 2

[PATCH 6/8] dxgi: Handle VK_ERROR_OUT_OF_DATE_KHR returned from vkAcquireNextImageKHR().
by Józef Kucia 01 Mar '19

01 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 22feeaeb825f..991a505ef6fa 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1421,7 +1421,7 @@ static VkResult d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapc if ((vr = vk_funcs->p_vkAcquireNextImageKHR(vk_device, swapchain->vk_swapchain, UINT64_MAX, VK_NULL_HANDLE, vk_fence, &swapchain->current_buffer_index)) < 0) { - ERR("Failed to acquire next Vulkan image, vr %d.\n", vr); + WARN("Failed to acquire next Vulkan image, vr %d.\n", vr); return vr; } @@ -2136,6 +2136,14 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface } vr = d3d12_swapchain_acquire_next_image(swapchain); + if (vr == VK_ERROR_OUT_OF_DATE_KHR) + { + TRACE("Recreating Vulkan swapchain.\n"); + d3d12_swapchain_destroy_buffers(swapchain, FALSE); + return d3d12_swapchain_recreate_vulkan_swapchain(swapchain); + } + if (vr < 0) + ERR("Failed to acquire next Vulkan image, vr %d.\n", vr); return hresult_from_vk_result(vr); } @@ -2570,6 +2578,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if ((vr = d3d12_swapchain_acquire_next_image(swapchain)) < 0) { + ERR("Failed to acquire Vulkan image, vr %d.\n", vr); d3d12_swapchain_destroy(swapchain); return hresult_from_vk_result(vr); } -- 2.19.2

3 2

[PATCH 5/8] dxgi: Factor out d3d12_swapchain_recreate_vulkan_swapchain().
by Józef Kucia 01 Mar '19

01 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 64 +++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 36 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index f2f89b9f7a84..22feeaeb825f 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1411,7 +1411,7 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, return S_OK; } -static HRESULT d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapchain) +static VkResult d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkDevice vk_device = swapchain->vk_device; @@ -1422,21 +1422,18 @@ static HRESULT d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapch VK_NULL_HANDLE, vk_fence, &swapchain->current_buffer_index)) < 0) { ERR("Failed to acquire next Vulkan image, vr %d.\n", vr); - return hresult_from_vk_result(vr); + return vr; } if ((vr = vk_funcs->p_vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX)) != VK_SUCCESS) { ERR("Failed to wait for fence, vr %d.\n", vr); - return hresult_from_vk_result(vr); + return vr; } if ((vr = vk_funcs->p_vkResetFences(vk_device, 1, &vk_fence)) < 0) - { ERR("Failed to reset fence, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } - return S_OK; + return vr; } static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain, BOOL destroy_user_buffers) @@ -1594,6 +1591,23 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s return d3d12_swapchain_create_buffers(swapchain, vk_swapchain_format, vk_format); } +static HRESULT d3d12_swapchain_recreate_vulkan_swapchain(struct d3d12_swapchain *swapchain) +{ + VkResult vr; + HRESULT hr; + + if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) + { + ERR("Failed to recreate Vulkan swapchain, hr %#x.\n", hr); + return hr; + } + + if ((vr = d3d12_swapchain_acquire_next_image(swapchain)) < 0) + ERR("Failed to acquire Vulkan image after recreating swapchain, vr %d.\n", vr); + + return hresult_from_vk_result(vr); +} + static inline struct d3d12_swapchain *d3d12_swapchain_from_IDXGISwapChain3(IDXGISwapChain3 *iface) { return CONTAINING_RECORD(iface, struct d3d12_swapchain, IDXGISwapChain3_iface); @@ -1811,7 +1825,6 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 * DXGI_SWAP_CHAIN_DESC1 *desc, new_desc; unsigned int i; ULONG refcount; - HRESULT hr; TRACE("iface %p, buffer_count %u, width %u, height %u, format %s, flags %#x.\n", iface, buffer_count, width, height, debug_dxgi_format(format), flags); @@ -1864,13 +1877,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 * d3d12_swapchain_destroy_buffers(swapchain, TRUE); swapchain->desc = new_desc; - if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) - { - ERR("Failed to recreate Vulkan swapchain, hr %#x.\n", hr); - return hr; - } - - return d3d12_swapchain_acquire_next_image(swapchain); + return d3d12_swapchain_recreate_vulkan_swapchain(swapchain); } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeTarget(IDXGISwapChain3 *iface, @@ -1971,7 +1978,6 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha unsigned int sync_interval) { VkPresentModeKHR present_mode; - HRESULT hr; switch (sync_interval) { @@ -2011,16 +2017,8 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha } d3d12_swapchain_destroy_buffers(swapchain, FALSE); - swapchain->present_mode = present_mode; - - if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) - { - ERR("Failed to recreate Vulkan swapchain, hr %#x.\n", hr); - return hr; - } - - return d3d12_swapchain_acquire_next_image(swapchain); + return d3d12_swapchain_recreate_vulkan_swapchain(swapchain); } static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkQueue vk_queue) @@ -2116,13 +2114,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface TRACE("Recreating Vulkan swapchain.\n"); d3d12_swapchain_destroy_buffers(swapchain, FALSE); - if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) - { - ERR("Failed to recreate Vulkan swapchain, hr %#x.\n", hr); - return hr; - } - - if (FAILED(hr = d3d12_swapchain_acquire_next_image(swapchain))) + if (FAILED(hr = d3d12_swapchain_recreate_vulkan_swapchain(swapchain))) return hr; if (!(vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) @@ -2143,7 +2135,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface return hresult_from_vk_result(vr); } - return d3d12_swapchain_acquire_next_image(swapchain); + vr = d3d12_swapchain_acquire_next_image(swapchain); + return hresult_from_vk_result(vr); } static BOOL STDMETHODCALLTYPE d3d12_swapchain_IsTemporaryMonoSupported(IDXGISwapChain3 *iface) @@ -2575,11 +2568,10 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI } swapchain->vk_fence = vk_fence; - if (FAILED(hr = d3d12_swapchain_acquire_next_image(swapchain))) + if ((vr = d3d12_swapchain_acquire_next_image(swapchain)) < 0) { - WARN("Failed to acquire Vulkan image, hr %#x.\n", hr); d3d12_swapchain_destroy(swapchain); - return hr; + return hresult_from_vk_result(vr); } IWineDXGIFactory_AddRef(swapchain->factory = factory); -- 2.19.2

3 2

[PATCH 4/8] dxgi: Introduce d3d12_swapchain_have_user_images().
by Józef Kucia 01 Mar '19

01 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 68 ++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 39 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 3c0951635f69..f2f89b9f7a84 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1067,6 +1067,11 @@ static BOOL d3d12_swapchain_is_present_mode_supported(struct d3d12_swapchain *sw return supported; } +static BOOL d3d12_swapchain_have_user_images(struct d3d12_swapchain *swapchain) +{ + return !!swapchain->vk_images[0]; +} + static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapchain, VkFormat vk_format) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; @@ -1081,7 +1086,7 @@ static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapc VkResult vr; HRESULT hr; - if (swapchain->vk_images[0]) + if (d3d12_swapchain_have_user_images(swapchain)) return S_OK; memset(&image_info, 0, sizeof(image_info)); @@ -1437,7 +1442,6 @@ static HRESULT d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapch static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain, BOOL destroy_user_buffers) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - BOOL have_user_images; VkQueue vk_queue; unsigned int i; @@ -1455,11 +1459,9 @@ static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain, B } } - have_user_images = swapchain->vk_images[0]; - for (i = 0; i < swapchain->buffer_count; ++i) { - if (swapchain->buffers[i] && (destroy_user_buffers || !have_user_images)) + if (swapchain->buffers[i] && (destroy_user_buffers || !d3d12_swapchain_have_user_images(swapchain))) { vkd3d_resource_decref(swapchain->buffers[i]); swapchain->buffers[i] = NULL; @@ -1589,10 +1591,7 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s swapchain->vk_swapchain_width = width; swapchain->vk_swapchain_height = height; - if (FAILED(hr = d3d12_swapchain_create_buffers(swapchain, vk_swapchain_format, vk_format))) - return hr; - - return S_OK; + return d3d12_swapchain_create_buffers(swapchain, vk_swapchain_format, vk_format); } static inline struct d3d12_swapchain *d3d12_swapchain_from_IDXGISwapChain3(IDXGISwapChain3 *iface) @@ -1999,7 +1998,7 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha return S_OK; } - if (!swapchain->vk_images[swapchain->current_buffer_index]) + if (!d3d12_swapchain_have_user_images(swapchain)) { FIXME("Cannot recreate swapchain without user images.\n"); return S_OK; @@ -2024,39 +2023,13 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha return d3d12_swapchain_acquire_next_image(swapchain); } -static VkResult d3d12_swapchain_blit_buffer(struct d3d12_swapchain *swapchain, VkQueue vk_queue) -{ - const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - VkSubmitInfo submit_info; - VkResult vr; - - submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; - submit_info.pNext = NULL; - submit_info.waitSemaphoreCount = 0; - submit_info.pWaitSemaphores = NULL; - submit_info.pWaitDstStageMask = NULL; - submit_info.commandBufferCount = 1; - submit_info.pCommandBuffers = &swapchain->vk_cmd_buffers[swapchain->current_buffer_index]; - submit_info.signalSemaphoreCount = 1; - submit_info.pSignalSemaphores = &swapchain->vk_semaphores[swapchain->current_buffer_index]; - - if ((vr = vk_funcs->p_vkQueueSubmit(vk_queue, 1, &submit_info, VK_NULL_HANDLE)) < 0) - ERR("Failed to blit swapchain buffer, vr %d.\n", vr); - return vr; -} - static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkQueue vk_queue) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkPresentInfoKHR present_info; + VkSubmitInfo submit_info; VkResult vr; - if (swapchain->vk_images[swapchain->current_buffer_index]) - { - if ((vr = d3d12_swapchain_blit_buffer(swapchain, vk_queue)) < 0) - return vr; - } - present_info.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; present_info.pNext = NULL; present_info.waitSemaphoreCount = 0; @@ -2066,8 +2039,25 @@ static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, present_info.pImageIndices = &swapchain->current_buffer_index; present_info.pResults = NULL; - if (swapchain->vk_semaphores[swapchain->current_buffer_index]) + if (d3d12_swapchain_have_user_images(swapchain)) { + /* blit */ + submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; + submit_info.pNext = NULL; + submit_info.waitSemaphoreCount = 0; + submit_info.pWaitSemaphores = NULL; + submit_info.pWaitDstStageMask = NULL; + submit_info.commandBufferCount = 1; + submit_info.pCommandBuffers = &swapchain->vk_cmd_buffers[swapchain->current_buffer_index]; + submit_info.signalSemaphoreCount = 1; + submit_info.pSignalSemaphores = &swapchain->vk_semaphores[swapchain->current_buffer_index]; + + if ((vr = vk_funcs->p_vkQueueSubmit(vk_queue, 1, &submit_info, VK_NULL_HANDLE)) < 0) + { + ERR("Failed to blit swapchain buffer, vr %d.\n", vr); + return vr; + } + present_info.waitSemaphoreCount = 1; present_info.pWaitSemaphores = &swapchain->vk_semaphores[swapchain->current_buffer_index]; } @@ -2117,7 +2107,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface { vkd3d_release_vk_queue(swapchain->command_queue); - if (!swapchain->vk_images[swapchain->current_buffer_index]) + if (!d3d12_swapchain_have_user_images(swapchain)) { FIXME("Cannot recreate swapchain without user images.\n"); return DXGI_STATUS_MODE_CHANGED; -- 2.19.2

3 2

[PATCH 3/8] maintainers: Add d3d12 to Direct3D section.
by Józef Kucia 01 Mar '19

01 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index e72a9e835556..344282727fc5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -68,6 +68,7 @@ P: Józef Kucia <jkucia(a)codeweavers.com> P: Matteo Bruni <mbruni(a)codeweavers.com> F: dlls/d3d10*/ F: dlls/d3d11/ +F: dlls/d3d12/ F: dlls/d3d8/ F: dlls/d3d9/ F: dlls/d3drm/ -- 2.19.2

2 1

[PATCH 1/8] d3d11: Add D3D11_FORMAT_SUPPORT_TEXTURE1D to d3d11_device_CheckFormatSupport().
by Józef Kucia 01 Mar '19

01 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7ad3d9b5e9b6..877775fdd3ac 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3302,6 +3302,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * } flag_mapping[] = { + {WINED3D_RTYPE_TEXTURE_1D, WINED3D_BIND_SHADER_RESOURCE, D3D11_FORMAT_SUPPORT_TEXTURE1D}, {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, D3D11_FORMAT_SUPPORT_TEXTURE2D}, {WINED3D_RTYPE_TEXTURE_3D, WINED3D_BIND_SHADER_RESOURCE, D3D11_FORMAT_SUPPORT_TEXTURE3D}, {WINED3D_RTYPE_NONE, WINED3D_BIND_RENDER_TARGET, D3D11_FORMAT_SUPPORT_RENDER_TARGET}, -- 2.19.2

3 2

[PATCH 2/8] wined3d: Add R8G8_UNORM vertex format.
by Józef Kucia 01 Mar '19

01 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 3 ++- dlls/wined3d/utils.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 90488edef6f3..4a02b3f51f69 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -16341,6 +16341,7 @@ static void test_create_input_layout(void) DXGI_FORMAT_R32_SINT, DXGI_FORMAT_R16_UINT, DXGI_FORMAT_R16_SINT, + DXGI_FORMAT_R8G8_UNORM, DXGI_FORMAT_R8_UINT, DXGI_FORMAT_R8_SINT, }; @@ -16357,7 +16358,7 @@ static void test_create_input_layout(void) layout_desc->Format = vertex_formats[i]; hr = ID3D11Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), vs_code, sizeof(vs_code), &input_layout); - ok(SUCCEEDED(hr), "Failed to create input layout for format %#x, hr %#x.\n", + ok(hr == S_OK, "Failed to create input layout for format %#x, hr %#x.\n", vertex_formats[i], hr); refcount = get_refcount(device); ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 062f8662aa72..469ce1bdacfd 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -633,6 +633,7 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, GL_HALF_FLOAT, ARB_HALF_FLOAT_VERTEX}, {WINED3DFMT_R8G8B8A8_SNORM, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, {WINED3DFMT_R8G8B8A8_SINT, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, + {WINED3DFMT_R8G8_UNORM, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_BYTE}, {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_SHORT}, {WINED3DFMT_R8_UNORM, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_BYTE}, {WINED3DFMT_R8_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_BYTE}, -- 2.19.2

3 2

[PATCH] vbscript: Move variable declaration outside of for.
by Alistair Leslie-Hughes 01 Mar '19

01 Mar '19

This stops a compile error under gcc 4.8.4. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/vbscript/tests/run.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 49066ce..6be6c7f 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -828,8 +828,9 @@ static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD { "resume", DISPID_TESTOBJ_KEYWORD, NULL }, { "goto", DISPID_TESTOBJ_KEYWORD, NULL }, }; + int i; - for (int i = 0; i < ARRAY_SIZE(dispids); i++) { + for (i = 0; i < ARRAY_SIZE(dispids); i++) { if(!stricmp_wa(bstrName, dispids[i].name)) { dispid_t *d = &dispids[i]; if(d->expect) { -- 1.9.1

3 2

[PATCH 5/6] jscript: Pass string as jsstr_t to push_instr_str.
by Jacek Caban 01 Mar '19

01 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)

1 0

[PATCH 4/6] jscript: Return regexp string as jsstr_t from lexer.
by Jacek Caban 01 Mar '19

01 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 24 +++++------------------- dlls/jscript/lex.c | 3 +-- dlls/jscript/parser.h | 8 +++++--- dlls/jscript/parser.y | 5 ++++- 4 files changed, 15 insertions(+), 25 deletions(-)

1 0

[PATCH 6/6] jscript: Add support for string literals with embedded null bytes.
by Jacek Caban 01 Mar '19

01 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 4 ++-- dlls/jscript/lex.c | 34 +++++++++++++++++++++------------- dlls/jscript/parser.h | 2 +- dlls/jscript/parser.y | 12 ++++++------ dlls/jscript/tests/lang.js | 3 +++ 5 files changed, 33 insertions(+), 22 deletions(-)

1 0

[PATCH 3/6] jscript: Support embedded null bytes in unescape.
by Jacek Caban 01 Mar '19

01 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/json.c | 4 ++-- dlls/jscript/lex.c | 25 +++++++++++++++---------- dlls/jscript/parser.h | 2 +- 3 files changed, 18 insertions(+), 13 deletions(-)

1 0

[PATCH 2/6] jscript: Use jsstr_t as string argument type in OP_obj_prop.
by Jacek Caban 01 Mar '19

01 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 39 ++++++++++++++++++++------------------- dlls/jscript/engine.c | 8 ++++++-- dlls/jscript/engine.h | 2 +- 3 files changed, 27 insertions(+), 22 deletions(-)

1 0

[PATCH 1/6] jscript/tests: Allow GetTypeInfo calls.
by Jacek Caban 01 Mar '19

01 Mar '19

Those are called by some versions of jscript.dll. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/tests/run.c | 1 - 1 file changed, 1 deletion(-)

1 0

[PATCH v2 3/3] dnsapi: No longer prefer native.
by Hans Leidekker 01 Mar '19

01 Mar '19

v2: Get rid of DllMain. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dnsapi/main.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index 93528a2302..6cb3b493b7 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -30,21 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) -{ - TRACE( "(%p, %d, %p)\n", hinst, reason, reserved ); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinst ); - break; - } - return TRUE; -} - /****************************************************************************** * DnsAcquireContextHandle_A [DNSAPI.@] * -- 2.11.0

1 0

[PATCH v2 2/3] dnsapi: Fix data length returned for records that contain Unicode strings.
by Hans Leidekker 01 Mar '19

01 Mar '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dnsapi/record.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 8d7b17af64..dc6a1137d9 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -21,6 +21,7 @@ #include "config.h" #include "wine/port.h" #include "wine/debug.h" +#include "wine/unicode.h" #include <stdarg.h> #include <stdio.h> @@ -480,6 +481,11 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET heap_free( dst->Data.MINFO.pNameMailbox ); goto error; } + + dst->wDataLength = sizeof(dst->Data.MINFO); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.MINFO.pNameMailbox ) + 1) * sizeof(WCHAR) + + (strlenW( dst->Data.MINFO.pNameErrorsMailbox ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_AFSDB: @@ -489,6 +495,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.MX.pNameExchange = dns_strcpyX( src->Data.MX.pNameExchange, in, out ); if (!dst->Data.MX.pNameExchange) goto error; + + dst->wDataLength = sizeof(dst->Data.MX); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.MX.pNameExchange ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_NXT: @@ -496,6 +506,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.NXT.pNameNext = dns_strcpyX( src->Data.NXT.pNameNext, in, out ); if (!dst->Data.NXT.pNameNext) goto error; + + dst->wDataLength = sizeof(dst->Data.NXT); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.NXT.pNameNext ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_CNAME: @@ -510,6 +524,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.PTR.pNameHost = dns_strcpyX( src->Data.PTR.pNameHost, in, out ); if (!dst->Data.PTR.pNameHost) goto error; + + dst->wDataLength = sizeof(dst->Data.PTR); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.PTR.pNameHost ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_SIG: @@ -517,6 +535,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.SIG.pNameSigner = dns_strcpyX( src->Data.SIG.pNameSigner, in, out ); if (!dst->Data.SIG.pNameSigner) goto error; + + dst->wDataLength = sizeof(dst->Data.SIG); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.SIG.pNameSigner ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_SOA: @@ -532,6 +554,11 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET heap_free( dst->Data.SOA.pNamePrimaryServer ); goto error; } + + dst->wDataLength = sizeof(dst->Data.SOA); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.SOA.pNamePrimaryServer ) + 1) * sizeof(WCHAR) + + (strlenW( dst->Data.SOA.pNameAdministrator ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_SRV: @@ -539,6 +566,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.SRV.pNameTarget = dns_strcpyX( src->Data.SRV.pNameTarget, in, out ); if (!dst->Data.SRV.pNameTarget) goto error; + + dst->wDataLength = sizeof(dst->Data.SRV); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.SRV.pNameTarget ) + 1) * sizeof(WCHAR); break; } default: -- 2.11.0

1 0

[PATCH v2 1/3] dnsapi: Add support for DNS_TYPE_OPT records.
by Hans Leidekker 01 Mar '19

01 Mar '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46704 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dnsapi/query.c | 10 ++++++++++ dlls/dnsapi/record.c | 10 ++++++++++ include/windns.h | 10 ++++++++++ 3 files changed, 30 insertions(+) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 19eecfded1..e601191c5d 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -218,6 +218,7 @@ static unsigned int dns_get_record_size( const ns_rr *rr ) break; } case ns_t_null: + case ns_t_opt: { size += rr->rdlength - 1; break; @@ -313,6 +314,15 @@ static DNS_STATUS dns_copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, W *dlen = sizeof(DNS_NULL_DATA) + rr->rdlength - 1; break; } + case ns_t_opt: + { + r->Data.OPT.wDataLength = rr->rdlength; + r->Data.OPT.wPad = 0; + memcpy( r->Data.OPT.Data, rr->rdata, rr->rdlength ); + + *dlen = sizeof(DNS_OPT_DATA) + rr->rdlength - 1; + break; + } case ns_t_cname: case ns_t_ns: case ns_t_mb: diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 7882b2290f..8d7b17af64 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -222,6 +222,16 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) return FALSE; break; } + case DNS_TYPE_OPT: + { + if (r1->Data.Opt.wDataLength != r2->Data.Opt.wDataLength) + return FALSE; + /* ignore wPad */ + if (memcmp( r1->Data.Opt.Data, + r2->Data.Opt.Data, r1->Data.Opt.wDataLength )) + return FALSE; + break; + } case DNS_TYPE_AAAA: { for (i = 0; i < sizeof(IP6_ADDRESS)/sizeof(DWORD); i++) diff --git a/include/windns.h b/include/windns.h index f150919b42..d9a4b9adb0 100644 --- a/include/windns.h +++ b/include/windns.h @@ -519,6 +519,14 @@ typedef struct DECL_WINELIB_TYPE_AW(DNS_WINSR_DATA) DECL_WINELIB_TYPE_AW(PDNS_WINSR_DATA) +typedef struct +{ + WORD wDataLength; + WORD wPad; + BYTE Data[1]; +} +DNS_OPT_DATA, *PDNS_OPT_DATA; + typedef struct _DnsRecordA { struct _DnsRecordA *pNext; @@ -552,6 +560,7 @@ typedef struct _DnsRecordA DNS_TSIG_DATAA TSIG, Tsig; DNS_WINS_DATA WINS, Wins; DNS_WINSR_DATAA WINSR, WinsR, NBSTAT, Nbstat; + DNS_OPT_DATA OPT, Opt; } Data; } DNS_RECORDA, *PDNS_RECORDA; @@ -588,6 +597,7 @@ typedef struct _DnsRecordW DNS_TSIG_DATAW TSIG, Tsig; DNS_WINS_DATA WINS, Wins; DNS_WINSR_DATAW WINSR, WinsR, NBSTAT, Nbstat; + DNS_OPT_DATA OPT, Opt; } Data; } DNS_RECORDW, *PDNS_RECORDW; -- 2.11.0

1 0

[PATCH] wpcap: Fix compilation with recent pcap/pcap.h versions.
by Dmitry Timoshkov 01 Mar '19

01 Mar '19

Recent libpcap versions have added inclusion of pcap/socket.h to pcap.h that includes sys/socket.h and other system .h files that lead to conflicts with winsock2.h. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wpcap/wpcap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index e7908cd038..f163235138 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -24,6 +24,7 @@ #undef SOCKET #undef INVALID_SOCKET +#define USE_WS_PREFIX #include "winsock2.h" #include "windef.h" #include "winbase.h" -- 2.20.1

2 1

[PATCH 3/3] dnsapi: No longer prefer native.
by Hans Leidekker 01 Mar '19

01 Mar '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dnsapi/main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index 93528a2302..3272470209 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -36,8 +36,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinst ); break; -- 2.11.0

2 1

[PATCH] msacm32: Remove redundant not-NULL check (coccinellery)
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- return MMSYSERR_NOMEM if pad is NULL. dlls/msacm32/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index e0c5fdd90e..2d7862cb73 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -600,7 +600,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe return MMSYSERR_NOERROR; gotError: WARN("failed: ret = %08x\n", ret); - if (pad && !pad->hDrvr) + if (!pad->hDrvr) HeapFree(MSACM_hHeap, 0, pad); return ret; } -- 2.20.1

2 1

[PATCH] mshtml: Open pages in the native browser in HlinkTarget_Navigate().
by Zebediah Figura 01 Mar '19

01 Mar '19

This matches native Windows behaviour as well, as demonstrated by running the interactive hlink:hlink tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44423 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/mshtml/persist.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index b82750a85e..0607306586 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -30,6 +30,7 @@ #include "shlguid.h" #include "idispids.h" #include "mimeole.h" +#include "shellapi.h" #define NO_SHLWAPI_REG #include "shlwapi.h" @@ -1187,8 +1188,19 @@ static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, L if(pwzJumpLocation) FIXME("JumpLocation not supported\n"); - if(!This->doc_obj->client) - return navigate_new_window(This->window, This->window->uri, NULL, NULL, NULL); + if(!This->doc_obj->client) { + static const WCHAR szOpen[] = {'o','p','e','n',0}; + HRESULT hres; + BSTR uri; + + hres = IUri_GetAbsoluteUri(This->window->uri, &uri); + if (FAILED(hres)) + return hres; + + ShellExecuteW(NULL, szOpen, uri, NULL, NULL, SW_SHOW); + SysFreeString(uri); + return S_OK; + } return IOleObject_DoVerb(&This->IOleObject_iface, OLEIVERB_SHOW, NULL, NULL, -1, NULL, NULL); } -- 2.20.1

2 1

[PATCH] urlmon: Remove useless casts to self
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/bindctx.c | 2 +- dlls/urlmon/file.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 2759f3d226..61917518c0 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -45,7 +45,7 @@ static void *get_callback_iface(BindStatusCallback *This, REFIID riid) void *ret; HRESULT hres; - hres = IBindStatusCallback_QueryInterface(This->callback, riid, (void**)&ret); + hres = IBindStatusCallback_QueryInterface(This->callback, riid, &ret); if(FAILED(hres) && This->serv_prov) hres = IServiceProvider_QueryService(This->serv_prov, riid, riid, &ret); diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index 11e6ecee90..cc1ba81606 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -434,7 +434,7 @@ HRESULT FileProtocol_Construct(IUnknown *outer, LPVOID *ppobj) ret->file = INVALID_HANDLE_VALUE; ret->priority = 0; ret->ref = 1; - ret->outer = outer ? outer : (IUnknown*)&ret->IUnknown_outer; + ret->outer = outer ? outer : &ret->IUnknown_outer; *ppobj = &ret->IUnknown_outer; return S_OK; -- 2.20.1

2 1

[PATCH v3] po: Update German translation.
by Isira Seneviratne 01 Mar '19

01 Mar '19

1 0

[PATCH v2] po: Update German translation.
by Isira Seneviratne 01 Mar '19

01 Mar '19

2 1

[PATCH] riched20/tests: Avoid using the comma operator
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched20/tests/editor.c | 2 +- dlls/riched20/tests/richole.c | 62 +++++++++++++++++------------------ dlls/riched32/tests/editor.c | 2 +- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index ddb101810e..f6158d9a3d 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4970,7 +4970,7 @@ static void test_EM_EXSETSEL(void) /* Test with multibyte character */ SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); /* 012345 6 78901 */ - cr.cpMin = 4, cr.cpMax = 8; + cr.cpMin = 4; cr.cpMax = 8; result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); ok(result == 8, "EM_EXSETSEL return %ld expected 8\n", result); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(bufA), (LPARAM)bufA); diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index d3ffdce4a7..52399047ad 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -531,21 +531,21 @@ static void test_GetText(void) SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); /* ITextSelection */ - first = 0, lim = 4; + first = 0; lim = 4; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == S_OK, "ITextSelection_GetText\n"); ok(!lstrcmpW(bstr, bufW1), "got wrong text: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); - first = 4, lim = 0; + first = 4; lim = 0; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == S_OK, "ITextSelection_GetText\n"); ok(!lstrcmpW(bstr, bufW1), "got wrong text: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); - first = 1, lim = 1; + first = 1; lim = 1; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == S_OK, "ITextSelection_GetText\n"); @@ -557,35 +557,35 @@ static void test_GetText(void) ok(hres == E_INVALIDARG, "ITextSelection_GetText\n"); } - first = 8, lim = 12; + first = 8; lim = 12; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == S_OK, "ITextSelection_GetText\n"); ok(!lstrcmpW(bstr, bufW3), "got wrong text: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); - first = 8, lim = 13; + first = 8; lim = 13; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == S_OK, "ITextSelection_GetText\n"); ok(!lstrcmpW(bstr, bufW2), "got wrong text: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); - first = 12, lim = 13; + first = 12; lim = 13; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == S_OK, "ITextSelection_GetText\n"); ok(!lstrcmpW(bstr, bufW5), "got wrong text: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); - first = 0, lim = -1; + first = 0; lim = -1; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == S_OK, "ITextSelection_GetText\n"); ok(!lstrcmpW(bstr, bufW4), "got wrong text: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); - first = -1, lim = 9; + first = -1; lim = 9; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == S_OK, "ITextSelection_GetText\n"); @@ -757,7 +757,7 @@ static void test_ITextRange_GetChar(void) ITextRange_Release(txtRge); release_interfaces(&w, &reOle, &txtDoc, NULL); - first = 0, lim = 0; + first = 0; lim = 0; create_interfaces(&w, &reOle, &txtDoc, NULL); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); @@ -769,7 +769,7 @@ static void test_ITextRange_GetChar(void) ITextRange_Release(txtRge); release_interfaces(&w, &reOle, &txtDoc, NULL); - first = 12, lim = 12; + first = 12; lim = 12; create_interfaces(&w, &reOle, &txtDoc, NULL); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); @@ -781,7 +781,7 @@ static void test_ITextRange_GetChar(void) ITextRange_Release(txtRge); release_interfaces(&w, &reOle, &txtDoc, NULL); - first = 13, lim = 13; + first = 13; lim = 13; create_interfaces(&w, &reOle, &txtDoc, NULL); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); @@ -795,7 +795,7 @@ static void test_ITextRange_GetChar(void) create_interfaces(&w, &reOle, &txtDoc, NULL); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - first = 12, lim = 12; + first = 12; lim = 12; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_GetChar(txtRge, NULL); @@ -885,28 +885,28 @@ static void test_ITextSelection_GetChar(void) create_interfaces(&w, &reOle, &txtDoc, &txtSel); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - first = 0, lim = 4; + first = 0; lim = 4; SendMessageA(w, EM_SETSEL, first, lim); pch = 0xdeadbeef; hres = ITextSelection_GetChar(txtSel, &pch); ok(hres == S_OK, "ITextSelection_GetChar\n"); ok(pch == 'T', "got wrong char: %c\n", pch); - first = 0, lim = 0; + first = 0; lim = 0; SendMessageA(w, EM_SETSEL, first, lim); pch = 0xdeadbeef; hres = ITextSelection_GetChar(txtSel, &pch); ok(hres == S_OK, "ITextSelection_GetChar\n"); ok(pch == 'T', "got wrong char: %c\n", pch); - first = 12, lim = 12; + first = 12; lim = 12; SendMessageA(w, EM_SETSEL, first, lim); pch = 0xdeadbeef; hres = ITextSelection_GetChar(txtSel, &pch); ok(hres == S_OK, "ITextSelection_GetChar\n"); ok(pch == '\r', "got wrong char: %c\n", pch); - first = 13, lim = 13; + first = 13; lim = 13; SendMessageA(w, EM_SETSEL, first, lim); pch = 0xdeadbeef; hres = ITextSelection_GetChar(txtSel, &pch); @@ -940,7 +940,7 @@ static void test_ITextRange_GetStart_GetEnd(void) create_interfaces(&w, &reOle, &txtDoc, NULL); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - first = 1, lim = 6; + first = 1; lim = 6; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); start = 0xdeadbeef; @@ -953,7 +953,7 @@ static void test_ITextRange_GetStart_GetEnd(void) ok(end == 6, "got wrong end value: %d\n", end); ITextRange_Release(txtRge); - first = 6, lim = 1; + first = 6; lim = 1; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); start = 0xdeadbeef; @@ -966,7 +966,7 @@ static void test_ITextRange_GetStart_GetEnd(void) ok(end == 6, "got wrong end value: %d\n", end); ITextRange_Release(txtRge); - first = -1, lim = 13; + first = -1; lim = 13; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); start = 0xdeadbeef; @@ -979,7 +979,7 @@ static void test_ITextRange_GetStart_GetEnd(void) ok(end == 13, "got wrong end value: %d\n", end); ITextRange_Release(txtRge); - first = 13, lim = 13; + first = 13; lim = 13; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); start = 0xdeadbeef; @@ -1159,7 +1159,7 @@ static void test_ITextSelection_GetStart_GetEnd(void) create_interfaces(&w, &reOle, &txtDoc, &txtSel); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - first = 2, lim = 5; + first = 2; lim = 5; SendMessageA(w, EM_SETSEL, first, lim); start = 0xdeadbeef; hres = ITextSelection_GetStart(txtSel, &start); @@ -1170,7 +1170,7 @@ static void test_ITextSelection_GetStart_GetEnd(void) ok(hres == S_OK, "ITextSelection_GetEnd\n"); ok(end == 5, "got wrong end value: %d\n", end); - first = 5, lim = 2; + first = 5; lim = 2; SendMessageA(w, EM_SETSEL, first, lim); start = 0xdeadbeef; hres = ITextSelection_GetStart(txtSel, &start); @@ -1181,7 +1181,7 @@ static void test_ITextSelection_GetStart_GetEnd(void) ok(hres == S_OK, "ITextSelection_GetEnd\n"); ok(end == 5, "got wrong end value: %d\n", end); - first = 0, lim = -1; + first = 0; lim = -1; SendMessageA(w, EM_SETSEL, first, lim); start = 0xdeadbeef; hres = ITextSelection_GetStart(txtSel, &start); @@ -1192,7 +1192,7 @@ static void test_ITextSelection_GetStart_GetEnd(void) ok(hres == S_OK, "ITextSelection_GetEnd\n"); ok(end == 13, "got wrong end value: %d\n", end); - first = 13, lim = 13; + first = 13; lim = 13; SendMessageA(w, EM_SETSEL, first, lim); start = 0xdeadbeef; hres = ITextSelection_GetStart(txtSel, &start); @@ -1365,7 +1365,7 @@ static void test_ITextRange_GetDuplicate(void) create_interfaces(&w, &reOle, &txtDoc, NULL); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - first = 0, lim = 4; + first = 0; lim = 4; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "ITextDocument_Range fails 0x%x.\n", hres); @@ -1408,7 +1408,7 @@ static void test_ITextRange_Collapse(void) create_interfaces(&w, &reOle, &txtDoc, NULL); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - first = 4, lim = 8; + first = 4; lim = 8; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_Collapse(txtRge, tomTrue); @@ -1470,7 +1470,7 @@ static void test_ITextRange_Collapse(void) ok(end == 4, "got wrong end value: %d\n", end); ITextRange_Release(txtRge); - first = 6, lim = 6; + first = 6; lim = 6; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_Collapse(txtRge, tomEnd); @@ -1483,7 +1483,7 @@ static void test_ITextRange_Collapse(void) ok(end == 6, "got wrong end value: %d\n", end); ITextRange_Release(txtRge); - first = 8, lim = 8; + first = 8; lim = 8; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_Collapse(txtRge, tomStart); @@ -1519,7 +1519,7 @@ static void test_ITextSelection_Collapse(void) create_interfaces(&w, &reOle, &txtDoc, &txtSel); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - first = 4, lim = 8; + first = 4; lim = 8; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_Collapse(txtSel, tomTrue); ok(hres == S_OK, "ITextSelection_Collapse\n"); @@ -1556,7 +1556,7 @@ static void test_ITextSelection_Collapse(void) ok(start == 4, "got wrong start value: %d\n", start); ok(end == 4, "got wrong end value: %d\n", end); - first = 6, lim = 6; + first = 6; lim = 6; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_Collapse(txtSel, tomEnd); ok(hres == S_FALSE, "ITextSelection_Collapse\n"); @@ -1564,7 +1564,7 @@ static void test_ITextSelection_Collapse(void) ok(start == 6, "got wrong start value: %d\n", start); ok(end == 6, "got wrong end value: %d\n", end); - first = 8, lim = 8; + first = 8; lim = 8; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_Collapse(txtSel, tomStart); ok(hres == S_FALSE, "ITextSelection_Collapse\n"); diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index dd9773c3f6..7394203cb7 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -1358,7 +1358,7 @@ static void test_EM_EXSETSEL(void) /* Test with multibyte character */ SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); /* 012345 6 7 8901 */ - cr.cpMin = 4, cr.cpMax = 8; + cr.cpMin = 4; cr.cpMax = 8; result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); todo_wine ok(result == 7, "EM_EXSETSEL return %ld expected 7\n", result); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(bufA), (LPARAM)bufA); -- 2.20.1

2 1

[PATCH] ole32: Remove useless casts to self
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole32/datacache.c | 2 +- dlls/ole32/tests/compobj.c | 6 +++--- dlls/ole32/tests/marshal.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 3eff56908d..6d4bcca96a 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1003,7 +1003,7 @@ static HRESULT save_mfpict(DataCacheEntry *entry, BOOL contents, IStream *stream meta_place_rec.bounding_box[3] = (LONGLONG)mfpict->yExt * meta_place_rec.inch / 2540; GlobalUnlock(entry->stgmedium.u.hMetaFilePict); - for (check = (WORD *)&meta_place_rec; check != (WORD *)&meta_place_rec.checksum; check++) + for (check = (WORD *)&meta_place_rec; check != &meta_place_rec.checksum; check++) meta_place_rec.checksum ^= *check; hr = IStream_Write(stream, &meta_place_rec, sizeof(struct meta_placeable), NULL); if (hr == S_OK && data_size) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b4dd83e63d..aebe9674a1 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1031,7 +1031,7 @@ static HRESULT WINAPI PSFactoryBuffer_CreateStub( { CHECK_EXPECT(CreateStub); - ok(pUnkServer == (IUnknown*)&Test_Unknown, "unexpected pUnkServer %p\n", pUnkServer); + ok(pUnkServer == &Test_Unknown, "unexpected pUnkServer %p\n", pUnkServer); if(!ps_factory_buffer) return E_NOTIMPL; @@ -3753,10 +3753,10 @@ static DWORD CALLBACK implicit_mta_proc(void *param) hr = CoRegisterMessageFilter(NULL, NULL); ok(hr == CO_E_NOT_SUPPORTED, "got %#x\n", hr); - hr = CoLockObjectExternal((IUnknown *)&Test_Unknown, TRUE, TRUE); + hr = CoLockObjectExternal(&Test_Unknown, TRUE, TRUE); ok_ole_success(hr, "CoLockObjectExternal"); - hr = CoDisconnectObject((IUnknown *)&Test_Unknown, 0); + hr = CoDisconnectObject(&Test_Unknown, 0); ok_ole_success(hr, "CoDisconnectObject"); return 0; diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index c53acf236c..33b155d474 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -329,7 +329,7 @@ static HRESULT WINAPI Test_IClassFactory_CreateInstance( LPVOID *ppvObj) { if (pUnkOuter) return CLASS_E_NOAGGREGATION; - return IUnknown_QueryInterface((IUnknown*)&Test_Unknown, riid, ppvObj); + return IUnknown_QueryInterface(&Test_Unknown, riid, ppvObj); } static HRESULT WINAPI Test_IClassFactory_LockServer( -- 2.20.1

3 2

[PATCH 1/5] user32/listbox: Use a helper to set item data by index
by Gabriel Ivăncescu 01 Mar '19

01 Mar '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/user32/listbox.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 826ce01..9bf9f90 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -156,6 +156,11 @@ static ULONG_PTR get_item_data( const LB_DESCR *descr, UINT index ) return (descr->style & LBS_NODATA) ? 0 : descr->items[index].data; } +static void set_item_data( LB_DESCR *descr, UINT index, ULONG_PTR data ) +{ + if (!(descr->style & LBS_NODATA)) descr->items[index].data = data; +} + static WCHAR *get_item_string( const LB_DESCR *descr, UINT index ) { return HAS_STRINGS(descr) ? descr->items[index].str : NULL; @@ -2743,7 +2748,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - if (!(descr->style & LBS_NODATA)) descr->items[wParam].data = lParam; + set_item_data(descr, wParam, lParam); /* undocumented: returns TRUE, not LB_OKAY (0) */ return TRUE; -- 2.20.1

3 13

[PATCH] dwrite: Remove useless casts to self
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwrite/font.c | 2 +- dlls/dwrite/layout.c | 4 ++-- dlls/dwrite/opentype.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 948c1dfa05..374236657b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2420,7 +2420,7 @@ static HRESULT create_fontfamily(struct dwrite_fontcollection *collection, UINT3 BOOL is_system_collection(IDWriteFontCollection *collection) { void *obj; - return IDWriteFontCollection_QueryInterface(collection, &IID_issystemcollection, (void**)&obj) == S_OK; + return IDWriteFontCollection_QueryInterface(collection, &IID_issystemcollection, &obj) == S_OK; } static HRESULT WINAPI dwritesystemfontcollection_QueryInterface(IDWriteFontCollection1 *iface, REFIID riid, void **obj) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index de79fd4c7f..4cd5ce445f 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2520,7 +2520,7 @@ static BOOL set_layout_range_attrval(struct layout_range_header *h, enum layout_ changed = set_layout_range_iface_attr((IUnknown**)&dest->object, (IUnknown*)value->u.object); break; case LAYOUT_RANGE_ATTR_EFFECT: - changed = set_layout_range_iface_attr((IUnknown**)&dest_iface->iface, (IUnknown*)value->u.effect); + changed = set_layout_range_iface_attr(&dest_iface->iface, value->u.effect); break; case LAYOUT_RANGE_ATTR_UNDERLINE: changed = dest_bool->value != value->u.underline; @@ -2560,7 +2560,7 @@ static BOOL set_layout_range_attrval(struct layout_range_header *h, enum layout_ dest_spacing->min_advance = value->u.spacing.min_advance; break; case LAYOUT_RANGE_ATTR_TYPOGRAPHY: - changed = set_layout_range_iface_attr((IUnknown**)&dest_iface->iface, (IUnknown*)value->u.typography); + changed = set_layout_range_iface_attr(&dest_iface->iface, (IUnknown*)value->u.typography); break; default: ; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b13f424019..4772236770 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -538,7 +538,7 @@ struct ot_lookup_table WORD subtable[1]; }; -#define GLYPH_NOT_COVERED ((unsigned int)~0u) +#define GLYPH_NOT_COVERED (~0u) struct ot_coverage_format1 { -- 2.20.1

2 1

[v2 PATCH 01/10] mfplat/tests: Add a test for deferred item posting.
by Nikolay Sivov 01 Mar '19

01 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fixes test failures on Windows. dlls/mfplat/mfplat.spec | 6 ++-- dlls/mfplat/queue.c | 47 +++++++++++++++++++++++++++++ dlls/mfplat/tests/mfplat.c | 62 ++++++++++++++++++++++++++++++++++++-- include/mfapi.h | 2 ++ 4 files changed, 112 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index c4e0b2abfa..39fd7a9d44 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -28,7 +28,7 @@ @ stub MFCalculateBitmapImageSize @ stub MFCalculateImageSize @ stub MFCancelCreateFile -@ stub MFCancelWorkItem +@ stdcall MFCancelWorkItem(int64) @ stub MFCompareFullToPartialMediaType @ stub MFCompareSockaddrAddresses @ stub MFConvertColorInfoFromDXVA @@ -124,8 +124,8 @@ @ stdcall MFPutWorkItemEx(long ptr) @ stub MFRecordError @ stub MFRemovePeriodicCallback -@ stub MFScheduleWorkItem -@ stub MFScheduleWorkItemEx +@ stdcall MFScheduleWorkItem(ptr ptr int64 ptr) +@ stdcall MFScheduleWorkItemEx(ptr int64 ptr) @ stub MFSerializeAttributesToStream @ stub MFSerializeEvent @ stub MFSerializeMediaTypeToStream diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index ebc2ad487b..7c8790b52c 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -385,3 +385,50 @@ HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result) return hr; } + +static HRESULT schedule_work_item(IMFAsyncResult *result, INT64 timeout, MFWORKITEM_KEY *key) +{ + FIXME("%p, %s, %p.\n", result, wine_dbgstr_longlong(timeout), key); + + return E_NOTIMPL; +} + +/*********************************************************************** + * MFScheduleWorkItemEx (mfplat.@) + */ +HRESULT WINAPI MFScheduleWorkItemEx(IMFAsyncResult *result, INT64 timeout, MFWORKITEM_KEY *key) +{ + TRACE("%p, %s, %p.\n", result, wine_dbgstr_longlong(timeout), key); + + return schedule_work_item(result, timeout, key); +} + +/*********************************************************************** + * MFScheduleWorkItemEx (mfplat.@) + */ +HRESULT WINAPI MFScheduleWorkItem(IMFAsyncCallback *callback, IUnknown *state, INT64 timeout, MFWORKITEM_KEY *key) +{ + IMFAsyncResult *result; + HRESULT hr; + + TRACE("%p, %p, %s, %p.\n", callback, state, wine_dbgstr_longlong(timeout), key); + + if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result))) + return hr; + + hr = schedule_work_item(result, timeout, key); + + IMFAsyncResult_Release(result); + + return hr; +} + +/*********************************************************************** + * MFCancelWorkItem (mfplat.@) + */ +HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key) +{ + FIXME("%s.\n", wine_dbgstr_longlong(key)); + + return E_NOTIMPL; +} diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 609faa5d00..cc8a0f47b8 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -43,6 +43,7 @@ static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteS static HRESULT (WINAPI *pMFCreateMemoryBuffer)(DWORD max_length, IMFMediaBuffer **buffer); static void* (WINAPI *pMFHeapAlloc)(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type); static void (WINAPI *pMFHeapFree)(void *p); +static HRESULT (WINAPI *pMFPutWaitingWorkItem)(HANDLE event, LONG priority, IMFAsyncResult *result, MFWORKITEM_KEY *key); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -318,6 +319,7 @@ static void init_functions(void) X(MFCreateMemoryBuffer); X(MFHeapAlloc); X(MFHeapFree); + X(MFPutWaitingWorkItem); #undef X } @@ -718,13 +720,13 @@ static ULONG WINAPI testcallback_Release(IMFAsyncCallback *iface) static HRESULT WINAPI testcallback_GetParameters(IMFAsyncCallback *iface, DWORD *flags, DWORD *queue) { - ok(0, "Unexpected call.\n"); + ok(flags != NULL && queue != NULL, "Unexpected arguments.\n"); return E_NOTIMPL; } static HRESULT WINAPI testcallback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { - ok(0, "Unexpected call.\n"); + ok(result != NULL, "Unexpected result object.\n"); return E_NOTIMPL; } @@ -1035,6 +1037,61 @@ static void test_MFHeapAlloc(void) pMFHeapFree(res); } +static void test_scheduled_items(void) +{ + IMFAsyncCallback callback = { &testcallbackvtbl }; + IMFAsyncResult *result; + MFWORKITEM_KEY key, key2; + HRESULT hr; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + hr = MFScheduleWorkItem(&callback, NULL, -5000, &key); +todo_wine + ok(hr == S_OK, "Failed to schedule item, hr %#x.\n", hr); + + hr = MFCancelWorkItem(key); +todo_wine + ok(hr == S_OK, "Failed to cancel item, hr %#x.\n", hr); + + hr = MFCancelWorkItem(key); +todo_wine + ok(hr == MF_E_NOT_FOUND || broken(hr == S_OK) /* < win10 */, "Unexpected hr %#x.\n", hr); + + if (!pMFPutWaitingWorkItem) + { + skip("Waiting items are not supported.\n"); + return; + } + + hr = MFCreateAsyncResult(NULL, &callback, NULL, &result); + ok(hr == S_OK, "Failed to create result, hr %#x.\n", hr); + + hr = pMFPutWaitingWorkItem(NULL, 0, result, &key); + ok(hr == S_OK, "Failed to add waiting item, hr %#x.\n", hr); + + hr = pMFPutWaitingWorkItem(NULL, 0, result, &key2); + ok(hr == S_OK, "Failed to add waiting item, hr %#x.\n", hr); + + hr = MFCancelWorkItem(key); + ok(hr == S_OK, "Failed to cancel item, hr %#x.\n", hr); + + hr = MFCancelWorkItem(key2); + ok(hr == S_OK, "Failed to cancel item, hr %#x.\n", hr); + + IMFAsyncResult_Release(result); + + hr = MFScheduleWorkItem(&callback, NULL, -5000, &key); + ok(hr == S_OK, "Failed to schedule item, hr %#x.\n", hr); + + hr = MFCancelWorkItem(key); + ok(hr == S_OK, "Failed to cancel item, hr %#x.\n", hr); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shutdown, hr %#x.\n", hr); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -1056,6 +1113,7 @@ START_TEST(mfplat) test_MFCopyImage(); test_MFCreateCollection(); test_MFHeapAlloc(); + test_scheduled_items(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 7c47213d85..4b7d758488 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -115,6 +115,8 @@ HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result); HRESULT WINAPI MFLockPlatform(void); HRESULT WINAPI MFPutWorkItem(DWORD queue, IMFAsyncCallback *callback, IUnknown *state); HRESULT WINAPI MFPutWorkItemEx(DWORD queue, IMFAsyncResult *result); +HRESULT WINAPI MFScheduleWorkItem(IMFAsyncCallback *callback, IUnknown *state, INT64 timeout, MFWORKITEM_KEY *key); +HRESULT WINAPI MFScheduleWorkItemEx(IMFAsyncResult *result, INT64 timeout, MFWORKITEM_KEY *key); HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags, UINT32 cinput, MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, MFT_REGISTER_TYPE_INFO *output_types, IMFAttributes *attributes); -- 2.20.1

1 9

[PATCH] winevulkan: Use VkBase{In, Out}Structure instead of custom structure.
by Józef Kucia 01 Mar '19

01 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/vulkan.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 1c721039f2f3..3893f1c85e4d 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -34,17 +34,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); */ #define WINE_VULKAN_ICD_VERSION 4 -/* All Vulkan structures use this structure for the first elements. */ -struct wine_vk_structure_header -{ - VkStructureType sType; - void *pNext; -}; - #define wine_vk_find_struct(s, t) wine_vk_find_struct_((void *)s, VK_STRUCTURE_TYPE_##t) static void *wine_vk_find_struct_(void *s, VkStructureType t) { - struct wine_vk_structure_header *header; + VkBaseOutStructure *header; for (header = s; header; header = header->pNext) { @@ -250,7 +243,7 @@ static VkResult wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src */ if (src->pNext) { - const struct wine_vk_structure_header *header; + const VkBaseInStructure *header; dst->pNext = NULL; for (header = src->pNext; header; header = header->pNext) @@ -369,7 +362,7 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo */ if (src->pNext) { - const struct wine_vk_structure_header *header; + const VkBaseInStructure *header; for (header = src->pNext; header; header = header->pNext) { @@ -997,8 +990,8 @@ void WINAPI wine_vkGetDeviceQueue(VkDevice device, uint32_t family_index, void WINAPI wine_vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *info, VkQueue *queue) { - const struct wine_vk_structure_header *chain; struct VkQueue_T *matching_queue; + const VkBaseInStructure *chain; TRACE("%p, %p, %p\n", device, info, queue); @@ -1111,7 +1104,7 @@ VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t count, { ERR("Unable to allocate memory for comman buffers!\n"); res = VK_ERROR_OUT_OF_HOST_MEMORY; - goto err; + goto done; } for (j = 0; j < num_command_buffers; j++) @@ -1123,7 +1116,7 @@ VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t count, res = queue->device->funcs.p_vkQueueSubmit(queue->queue, count, submits_host, fence); -err: +done: for (i = 0; i < count; i++) { heap_free((void *)submits_host[i].pCommandBuffers); -- 2.19.2

1 0

[PATCH 2/3] dnsapi: Fix data length returned for records that contain Unicode strings.
by Hans Leidekker 01 Mar '19

01 Mar '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dnsapi/record.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 8d7b17af64..dc6a1137d9 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -21,6 +21,7 @@ #include "config.h" #include "wine/port.h" #include "wine/debug.h" +#include "wine/unicode.h" #include <stdarg.h> #include <stdio.h> @@ -480,6 +481,11 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET heap_free( dst->Data.MINFO.pNameMailbox ); goto error; } + + dst->wDataLength = sizeof(dst->Data.MINFO); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.MINFO.pNameMailbox ) + 1) * sizeof(WCHAR) + + (strlenW( dst->Data.MINFO.pNameErrorsMailbox ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_AFSDB: @@ -489,6 +495,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.MX.pNameExchange = dns_strcpyX( src->Data.MX.pNameExchange, in, out ); if (!dst->Data.MX.pNameExchange) goto error; + + dst->wDataLength = sizeof(dst->Data.MX); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.MX.pNameExchange ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_NXT: @@ -496,6 +506,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.NXT.pNameNext = dns_strcpyX( src->Data.NXT.pNameNext, in, out ); if (!dst->Data.NXT.pNameNext) goto error; + + dst->wDataLength = sizeof(dst->Data.NXT); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.NXT.pNameNext ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_CNAME: @@ -510,6 +524,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.PTR.pNameHost = dns_strcpyX( src->Data.PTR.pNameHost, in, out ); if (!dst->Data.PTR.pNameHost) goto error; + + dst->wDataLength = sizeof(dst->Data.PTR); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.PTR.pNameHost ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_SIG: @@ -517,6 +535,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.SIG.pNameSigner = dns_strcpyX( src->Data.SIG.pNameSigner, in, out ); if (!dst->Data.SIG.pNameSigner) goto error; + + dst->wDataLength = sizeof(dst->Data.SIG); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.SIG.pNameSigner ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_SOA: @@ -532,6 +554,11 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET heap_free( dst->Data.SOA.pNamePrimaryServer ); goto error; } + + dst->wDataLength = sizeof(dst->Data.SOA); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.SOA.pNamePrimaryServer ) + 1) * sizeof(WCHAR) + + (strlenW( dst->Data.SOA.pNameAdministrator ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_SRV: @@ -539,6 +566,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.SRV.pNameTarget = dns_strcpyX( src->Data.SRV.pNameTarget, in, out ); if (!dst->Data.SRV.pNameTarget) goto error; + + dst->wDataLength = sizeof(dst->Data.SRV); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.SRV.pNameTarget ) + 1) * sizeof(WCHAR); break; } default: -- 2.11.0

1 0

[PATCH 1/3] dnsapi: Add support for DNS_TYPE_OPT records.
by Hans Leidekker 01 Mar '19

01 Mar '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46704 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dnsapi/query.c | 10 ++++++++++ dlls/dnsapi/record.c | 10 ++++++++++ include/windns.h | 10 ++++++++++ 3 files changed, 30 insertions(+) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 19eecfded1..e601191c5d 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -218,6 +218,7 @@ static unsigned int dns_get_record_size( const ns_rr *rr ) break; } case ns_t_null: + case ns_t_opt: { size += rr->rdlength - 1; break; @@ -313,6 +314,15 @@ static DNS_STATUS dns_copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, W *dlen = sizeof(DNS_NULL_DATA) + rr->rdlength - 1; break; } + case ns_t_opt: + { + r->Data.OPT.wDataLength = rr->rdlength; + r->Data.OPT.wPad = 0; + memcpy( r->Data.OPT.Data, rr->rdata, rr->rdlength ); + + *dlen = sizeof(DNS_OPT_DATA) + rr->rdlength - 1; + break; + } case ns_t_cname: case ns_t_ns: case ns_t_mb: diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 7882b2290f..8d7b17af64 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -222,6 +222,16 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) return FALSE; break; } + case DNS_TYPE_OPT: + { + if (r1->Data.Opt.wDataLength != r2->Data.Opt.wDataLength) + return FALSE; + /* ignore wPad */ + if (memcmp( r1->Data.Opt.Data, + r2->Data.Opt.Data, r1->Data.Opt.wDataLength )) + return FALSE; + break; + } case DNS_TYPE_AAAA: { for (i = 0; i < sizeof(IP6_ADDRESS)/sizeof(DWORD); i++) diff --git a/include/windns.h b/include/windns.h index f150919b42..d9a4b9adb0 100644 --- a/include/windns.h +++ b/include/windns.h @@ -519,6 +519,14 @@ typedef struct DECL_WINELIB_TYPE_AW(DNS_WINSR_DATA) DECL_WINELIB_TYPE_AW(PDNS_WINSR_DATA) +typedef struct +{ + WORD wDataLength; + WORD wPad; + BYTE Data[1]; +} +DNS_OPT_DATA, *PDNS_OPT_DATA; + typedef struct _DnsRecordA { struct _DnsRecordA *pNext; @@ -552,6 +560,7 @@ typedef struct _DnsRecordA DNS_TSIG_DATAA TSIG, Tsig; DNS_WINS_DATA WINS, Wins; DNS_WINSR_DATAA WINSR, WinsR, NBSTAT, Nbstat; + DNS_OPT_DATA OPT, Opt; } Data; } DNS_RECORDA, *PDNS_RECORDA; @@ -588,6 +597,7 @@ typedef struct _DnsRecordW DNS_TSIG_DATAW TSIG, Tsig; DNS_WINS_DATA WINS, Wins; DNS_WINSR_DATAW WINSR, WinsR, NBSTAT, Nbstat; + DNS_OPT_DATA OPT, Opt; } Data; } DNS_RECORDW, *PDNS_RECORDW; -- 2.11.0

1 0

[PATCH 01/10] mfplat/tests: Add a test for deferred item posting.
by Nikolay Sivov 01 Mar '19

01 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mfplat.spec | 6 ++-- dlls/mfplat/queue.c | 47 +++++++++++++++++++++++++++++ dlls/mfplat/tests/mfplat.c | 62 ++++++++++++++++++++++++++++++++++++-- include/mfapi.h | 2 ++ 4 files changed, 112 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index c4e0b2abfa..39fd7a9d44 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -28,7 +28,7 @@ @ stub MFCalculateBitmapImageSize @ stub MFCalculateImageSize @ stub MFCancelCreateFile -@ stub MFCancelWorkItem +@ stdcall MFCancelWorkItem(int64) @ stub MFCompareFullToPartialMediaType @ stub MFCompareSockaddrAddresses @ stub MFConvertColorInfoFromDXVA @@ -124,8 +124,8 @@ @ stdcall MFPutWorkItemEx(long ptr) @ stub MFRecordError @ stub MFRemovePeriodicCallback -@ stub MFScheduleWorkItem -@ stub MFScheduleWorkItemEx +@ stdcall MFScheduleWorkItem(ptr ptr int64 ptr) +@ stdcall MFScheduleWorkItemEx(ptr int64 ptr) @ stub MFSerializeAttributesToStream @ stub MFSerializeEvent @ stub MFSerializeMediaTypeToStream diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index ebc2ad487b..7c8790b52c 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -385,3 +385,50 @@ HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result) return hr; } + +static HRESULT schedule_work_item(IMFAsyncResult *result, INT64 timeout, MFWORKITEM_KEY *key) +{ + FIXME("%p, %s, %p.\n", result, wine_dbgstr_longlong(timeout), key); + + return E_NOTIMPL; +} + +/*********************************************************************** + * MFScheduleWorkItemEx (mfplat.@) + */ +HRESULT WINAPI MFScheduleWorkItemEx(IMFAsyncResult *result, INT64 timeout, MFWORKITEM_KEY *key) +{ + TRACE("%p, %s, %p.\n", result, wine_dbgstr_longlong(timeout), key); + + return schedule_work_item(result, timeout, key); +} + +/*********************************************************************** + * MFScheduleWorkItemEx (mfplat.@) + */ +HRESULT WINAPI MFScheduleWorkItem(IMFAsyncCallback *callback, IUnknown *state, INT64 timeout, MFWORKITEM_KEY *key) +{ + IMFAsyncResult *result; + HRESULT hr; + + TRACE("%p, %p, %s, %p.\n", callback, state, wine_dbgstr_longlong(timeout), key); + + if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result))) + return hr; + + hr = schedule_work_item(result, timeout, key); + + IMFAsyncResult_Release(result); + + return hr; +} + +/*********************************************************************** + * MFCancelWorkItem (mfplat.@) + */ +HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key) +{ + FIXME("%s.\n", wine_dbgstr_longlong(key)); + + return E_NOTIMPL; +} diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 609faa5d00..cc8a0f47b8 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -43,6 +43,7 @@ static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteS static HRESULT (WINAPI *pMFCreateMemoryBuffer)(DWORD max_length, IMFMediaBuffer **buffer); static void* (WINAPI *pMFHeapAlloc)(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type); static void (WINAPI *pMFHeapFree)(void *p); +static HRESULT (WINAPI *pMFPutWaitingWorkItem)(HANDLE event, LONG priority, IMFAsyncResult *result, MFWORKITEM_KEY *key); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -318,6 +319,7 @@ static void init_functions(void) X(MFCreateMemoryBuffer); X(MFHeapAlloc); X(MFHeapFree); + X(MFPutWaitingWorkItem); #undef X } @@ -718,13 +720,13 @@ static ULONG WINAPI testcallback_Release(IMFAsyncCallback *iface) static HRESULT WINAPI testcallback_GetParameters(IMFAsyncCallback *iface, DWORD *flags, DWORD *queue) { - ok(0, "Unexpected call.\n"); + ok(flags != NULL && queue != NULL, "Unexpected arguments.\n"); return E_NOTIMPL; } static HRESULT WINAPI testcallback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { - ok(0, "Unexpected call.\n"); + ok(result != NULL, "Unexpected result object.\n"); return E_NOTIMPL; } @@ -1035,6 +1037,61 @@ static void test_MFHeapAlloc(void) pMFHeapFree(res); } +static void test_scheduled_items(void) +{ + IMFAsyncCallback callback = { &testcallbackvtbl }; + IMFAsyncResult *result; + MFWORKITEM_KEY key, key2; + HRESULT hr; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + hr = MFScheduleWorkItem(&callback, NULL, -5000, &key); +todo_wine + ok(hr == S_OK, "Failed to schedule item, hr %#x.\n", hr); + + hr = MFCancelWorkItem(key); +todo_wine + ok(hr == S_OK, "Failed to cancel item, hr %#x.\n", hr); + + hr = MFCancelWorkItem(key); +todo_wine + ok(hr == MF_E_NOT_FOUND || broken(hr == S_OK) /* < win10 */, "Unexpected hr %#x.\n", hr); + + if (!pMFPutWaitingWorkItem) + { + skip("Waiting items are not supported.\n"); + return; + } + + hr = MFCreateAsyncResult(NULL, &callback, NULL, &result); + ok(hr == S_OK, "Failed to create result, hr %#x.\n", hr); + + hr = pMFPutWaitingWorkItem(NULL, 0, result, &key); + ok(hr == S_OK, "Failed to add waiting item, hr %#x.\n", hr); + + hr = pMFPutWaitingWorkItem(NULL, 0, result, &key2); + ok(hr == S_OK, "Failed to add waiting item, hr %#x.\n", hr); + + hr = MFCancelWorkItem(key); + ok(hr == S_OK, "Failed to cancel item, hr %#x.\n", hr); + + hr = MFCancelWorkItem(key2); + ok(hr == S_OK, "Failed to cancel item, hr %#x.\n", hr); + + IMFAsyncResult_Release(result); + + hr = MFScheduleWorkItem(&callback, NULL, -5000, &key); + ok(hr == S_OK, "Failed to schedule item, hr %#x.\n", hr); + + hr = MFCancelWorkItem(key); + ok(hr == S_OK, "Failed to cancel item, hr %#x.\n", hr); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shutdown, hr %#x.\n", hr); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -1056,6 +1113,7 @@ START_TEST(mfplat) test_MFCopyImage(); test_MFCreateCollection(); test_MFHeapAlloc(); + test_scheduled_items(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 7c47213d85..4b7d758488 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -115,6 +115,8 @@ HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result); HRESULT WINAPI MFLockPlatform(void); HRESULT WINAPI MFPutWorkItem(DWORD queue, IMFAsyncCallback *callback, IUnknown *state); HRESULT WINAPI MFPutWorkItemEx(DWORD queue, IMFAsyncResult *result); +HRESULT WINAPI MFScheduleWorkItem(IMFAsyncCallback *callback, IUnknown *state, INT64 timeout, MFWORKITEM_KEY *key); +HRESULT WINAPI MFScheduleWorkItemEx(IMFAsyncResult *result, INT64 timeout, MFWORKITEM_KEY *key); HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags, UINT32 cinput, MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, MFT_REGISTER_TYPE_INFO *output_types, IMFAttributes *attributes); -- 2.20.1

2 10

[PATCH v2] po: Update Sinhala translation.
by Isira Seneviratne 01 Mar '19

01 Mar '19

2 1

[PATCH] po: Update Sinhala translation.
by Isira Seneviratne 01 Mar '19

01 Mar '19

2 1

Creating the Sinhala NLS file
by Isira Seneviratne 01 Mar '19

01 Mar '19

Hi, I've created a NLS file for the Sinhala language, which is available through the attached patch. I created it by using the Tamil NLS file as a base and altered as many strings as I could by referring to Microsoft's Style Guide for Sinhala. I would like to know if the following statements to obtain the value of LOCALE_FONTSIGNATURE for Sinhala are correct, or if any corrections should be made: WCHAR s[100]; GetLocaleInfoEx(L"si", LOCALE_FONTSIGNATURE, s, 100); Isira

3 6

[PATCH] kernel32: Add LOCALE_SSCRIPTS value to Sinhala NLS file.
by Isira Seneviratne 01 Mar '19

01 Mar '19

1 0

[PATCH 1/5] quartz/mpegsplit: Fix sink pin name.
by Zebediah Figura 01 Mar '19

01 Mar '19

This fixes a bug with Neocron 2, which uses FindPin() to retrieve the sink pin. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/avisplit.c | 7 ++++++- dlls/quartz/mpegsplit.c | 6 +++++- dlls/quartz/parser.c | 10 +++++++--- dlls/quartz/parser.h | 7 +++++-- dlls/quartz/waveparser.c | 6 +++++- 5 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 6f27c29321..40020bbfa9 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -1429,6 +1429,7 @@ static const IBaseFilterVtbl AVISplitterImpl_Vtbl = HRESULT AVISplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) { + static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; HRESULT hr; AVISplitterImpl * This; @@ -1445,7 +1446,11 @@ HRESULT AVISplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) This->streams = NULL; This->oldindex = NULL; - hr = Parser_Create(&(This->Parser), &AVISplitterImpl_Vtbl, &CLSID_AviSplitter, AVISplitter_Sample, AVISplitter_QueryAccept, AVISplitter_InputPin_PreConnect, AVISplitter_Flush, AVISplitter_Disconnect, AVISplitter_first_request, AVISplitter_done_process, NULL, AVISplitter_seek, NULL); + hr = Parser_Create(&This->Parser, &AVISplitterImpl_Vtbl, &CLSID_AviSplitter, + sink_name, AVISplitter_Sample, AVISplitter_QueryAccept, + AVISplitter_InputPin_PreConnect, AVISplitter_Flush, + AVISplitter_Disconnect, AVISplitter_first_request, + AVISplitter_done_process, NULL, AVISplitter_seek, NULL); if (FAILED(hr)) return hr; diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 5869f1664c..226fcacff5 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -870,6 +870,7 @@ static const IAMStreamSelectVtbl AMStreamSelectVtbl = HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) { + static const WCHAR sink_name[] = {'I','n','p','u','t',0}; MPEGSplitterImpl *This; HRESULT hr = E_FAIL; @@ -885,7 +886,10 @@ HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) return E_OUTOFMEMORY; ZeroMemory(This, sizeof(MPEGSplitterImpl)); - hr = Parser_Create(&(This->Parser), &MPEGSplitter_Vtbl, &CLSID_MPEG1Splitter, MPEGSplitter_process_sample, MPEGSplitter_query_accept, MPEGSplitter_pre_connect, MPEGSplitter_cleanup, MPEGSplitter_disconnect, MPEGSplitter_first_request, NULL, NULL, MPEGSplitter_seek, NULL); + hr = Parser_Create(&This->Parser, &MPEGSplitter_Vtbl, &CLSID_MPEG1Splitter, + sink_name, MPEGSplitter_process_sample, MPEGSplitter_query_accept, + MPEGSplitter_pre_connect, MPEGSplitter_cleanup, MPEGSplitter_disconnect, + MPEGSplitter_first_request, NULL, NULL, MPEGSplitter_seek, NULL); if (FAILED(hr)) { CoTaskMemFree(This); diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 664cecf07d..b0cb500c56 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -35,7 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; static const IMediaSeekingVtbl Parser_Seeking_Vtbl; static const IPinVtbl Parser_OutputPin_Vtbl; static const IPinVtbl Parser_InputPin_Vtbl; @@ -93,7 +92,12 @@ static const BaseFilterFuncTable BaseFuncTable = { Parser_GetPinCount }; -HRESULT Parser_Create(ParserImpl* pParser, const IBaseFilterVtbl *Parser_Vtbl, const CLSID* pClsid, PFN_PROCESS_SAMPLE fnProcessSample, PFN_QUERY_ACCEPT fnQueryAccept, PFN_PRE_CONNECT fnPreConnect, PFN_CLEANUP fnCleanup, PFN_DISCONNECT fnDisconnect, REQUESTPROC fnRequest, STOPPROCESSPROC fnDone, SourceSeeking_ChangeStop stop, SourceSeeking_ChangeStart start, SourceSeeking_ChangeRate rate) +HRESULT Parser_Create(ParserImpl *pParser, const IBaseFilterVtbl *Parser_Vtbl, + const CLSID* pClsid, const WCHAR *sink_name, PFN_PROCESS_SAMPLE fnProcessSample, + PFN_QUERY_ACCEPT fnQueryAccept, PFN_PRE_CONNECT fnPreConnect, + PFN_CLEANUP fnCleanup, PFN_DISCONNECT fnDisconnect, REQUESTPROC fnRequest, + STOPPROCESSPROC fnDone, SourceSeeking_ChangeStop stop, + SourceSeeking_ChangeStart start, SourceSeeking_ChangeRate rate) { HRESULT hr; PIN_INFO piInput; @@ -109,7 +113,7 @@ HRESULT Parser_Create(ParserImpl* pParser, const IBaseFilterVtbl *Parser_Vtbl, c /* construct input pin */ piInput.dir = PINDIR_INPUT; piInput.pFilter = &pParser->filter.IBaseFilter_iface; - lstrcpynW(piInput.achName, wcsInputPinName, ARRAY_SIZE(piInput.achName)); + lstrcpynW(piInput.achName, sink_name, ARRAY_SIZE(piInput.achName)); if (!start) start = Parser_ChangeStart; diff --git a/dlls/quartz/parser.h b/dlls/quartz/parser.h index 840e475ee2..8660cf2cde 100644 --- a/dlls/quartz/parser.h +++ b/dlls/quartz/parser.h @@ -53,8 +53,11 @@ typedef struct Parser_OutputPin extern HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PROPERTIES * props, const AM_MEDIA_TYPE * amt); -extern HRESULT Parser_Create(ParserImpl*, const IBaseFilterVtbl *, const CLSID*, PFN_PROCESS_SAMPLE, PFN_QUERY_ACCEPT, PFN_PRE_CONNECT, - PFN_CLEANUP, PFN_DISCONNECT, REQUESTPROC, STOPPROCESSPROC, SourceSeeking_ChangeStop stop, SourceSeeking_ChangeStart start, SourceSeeking_ChangeRate rate); +HRESULT Parser_Create(ParserImpl *parser, const IBaseFilterVtbl *vtbl, + const CLSID *clsid, const WCHAR *sink_name, PFN_PROCESS_SAMPLE, + PFN_QUERY_ACCEPT, PFN_PRE_CONNECT, PFN_CLEANUP, PFN_DISCONNECT, + REQUESTPROC, STOPPROCESSPROC, SourceSeeking_ChangeStop, + SourceSeeking_ChangeStart, SourceSeeking_ChangeRate) DECLSPEC_HIDDEN; /* Override the _Release function and call this when releasing */ extern void Parser_Destroy(ParserImpl *This); diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index fa9cd45d27..834b6344d2 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -417,6 +417,7 @@ static const IBaseFilterVtbl WAVEParser_Vtbl = HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv) { + static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; HRESULT hr; WAVEParserImpl * This; @@ -430,7 +431,10 @@ HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv) /* Note: This memory is managed by the transform filter once created */ This = CoTaskMemAlloc(sizeof(WAVEParserImpl)); - hr = Parser_Create(&(This->Parser), &WAVEParser_Vtbl, &CLSID_WAVEParser, WAVEParser_Sample, WAVEParser_QueryAccept, WAVEParser_InputPin_PreConnect, WAVEParser_Cleanup, WAVEParser_disconnect, WAVEParser_first_request, NULL, NULL, WAVEParserImpl_seek, NULL); + hr = Parser_Create(&This->Parser, &WAVEParser_Vtbl, &CLSID_WAVEParser, + sink_name, WAVEParser_Sample, WAVEParser_QueryAccept, + WAVEParser_InputPin_PreConnect, WAVEParser_Cleanup, WAVEParser_disconnect, + WAVEParser_first_request, NULL, NULL, WAVEParserImpl_seek, NULL); if (FAILED(hr)) return hr; -- 2.20.1

2 8

[v2 PATCH 1/2] user32: Do not touch some of the values on 64-bit with SetWindowLong().
by Nikolay Sivov 28 Feb '19

28 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: added some tests for GetWindowWord(), moved filtering. dlls/user32/tests/win.c | 230 ++++++++++++++++++++++++++++++++++++++++ dlls/user32/win.c | 31 +++++- 2 files changed, 258 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 3444abaf96..d9a8e85d7b 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6330,6 +6330,233 @@ static int check_error(DWORD actual, DWORD expected) return (!sets_last_error && (actual == 0xdeadbeef)) || (actual == expected); } +static void test_set_window_long_size(void) +{ +#ifdef _WIN64 + WNDPROC wnd_proc, wnd_proc_2; + LONG_PTR retval; + HWND hwnd; + LONG ret; + + /* It's not allowed to set or get 64-bit pointer values using 32-bit functions. */ + hwnd = CreateWindowExA(0, "MainWindowClass", "Child window", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_CHILD | + WS_MAXIMIZEBOX | WS_VISIBLE, 100, 100, 200, 200, hwndMain, 0, GetModuleHandleA(NULL), NULL); + ok(hwnd != NULL, "Failed to create test window.\n"); + + /* GWLP_WNDPROC */ + SetLastError(0xdeadbeef); + wnd_proc = (WNDPROC)(LONG_PTR)GetWindowLongA(hwnd, GWLP_WNDPROC); +todo_wine + ok(!wnd_proc && GetLastError() == ERROR_INVALID_INDEX, "Unexpected window proc.\n"); + + wnd_proc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_WNDPROC); + ok(!!wnd_proc, "Unexpected window proc.\n"); + + SetLastError(0xdeadbeef); + wnd_proc_2 = (WNDPROC)(LONG_PTR)SetWindowLongA(hwnd, GWLP_WNDPROC, 0xdeadbeef); + ok(!wnd_proc_2 && GetLastError() == ERROR_INVALID_INDEX, "Unexpected window proc.\n"); + + wnd_proc_2 = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_WNDPROC); + ok(wnd_proc_2 == wnd_proc, "Unexpected window proc.\n"); + + SetLastError(0xdeadbeef); + ret = GetWindowWord(hwnd, GWLP_WNDPROC); + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected return value.\n"); + + /* GWLP_USERDATA */ + SetWindowLongPtrA(hwnd, GWLP_USERDATA, ((LONG_PTR)1 << 32) | 123); + ret = GetWindowLongA(hwnd, GWLP_USERDATA); + ok(ret == 123, "Unexpected user data %#x.\n", ret); + retval = GetWindowLongPtrA(hwnd, GWLP_USERDATA); + ok(retval > 123, "Unexpected user data.\n"); + ret = GetWindowWord(hwnd, GWLP_USERDATA); +todo_wine + ok(ret == 123, "Unexpected user data %#x.\n", ret); + ret = SetWindowWord(hwnd, GWLP_USERDATA, 124); +todo_wine + ok(ret == 123, "Unexpected user data %#x.\n", ret); + ret = GetWindowLongA(hwnd, GWLP_USERDATA); +todo_wine + ok(ret == 124, "Unexpected user data %#x.\n", ret); + retval = GetWindowLongPtrA(hwnd, GWLP_USERDATA); +todo_wine + ok(retval == 124, "Unexpected user data.\n"); + + SetWindowLongA(hwnd, GWLP_USERDATA, (1 << 16) | 123); + ret = GetWindowLongA(hwnd, GWLP_USERDATA); + ok(ret == ((1 << 16) | 123), "Unexpected user data %#x.\n", ret); + ret = GetWindowWord(hwnd, GWLP_USERDATA); +todo_wine + ok(ret == 123, "Unexpected user data %#x.\n", ret); + + ret = SetWindowWord(hwnd, GWLP_USERDATA, 124); +todo_wine + ok(ret == 123, "Unexpected user data %#x.\n", ret); + ret = GetWindowLongA(hwnd, GWLP_USERDATA); +todo_wine + ok(ret == ((1 << 16) | 124), "Unexpected user data %#x.\n", ret); + ret = GetWindowWord(hwnd, GWLP_USERDATA); +todo_wine + ok(ret == 124, "Unexpected user data %#x.\n", ret); + + /* GWLP_ID */ + ret = SetWindowLongA(hwnd, GWLP_ID, 1); + ok(!ret, "Unexpected id %#x.\n", ret); + + ret = GetWindowLongA(hwnd, GWLP_ID); + ok(ret == 1, "Unexpected id %#x.\n", ret); + + ret = GetWindowLongW(hwnd, GWLP_ID); + ok(ret == 1, "Unexpected id %#x.\n", ret); + + SetWindowLongPtrA(hwnd, GWLP_ID, ((LONG_PTR)1 << 32) | 123); + ret = GetWindowLongA(hwnd, GWLP_ID); + ok(ret == 123, "Unexpected id %#x.\n", ret); + ret = GetWindowLongW(hwnd, GWLP_ID); + ok(ret == 123, "Unexpected id %#x.\n", ret); + retval = GetWindowLongPtrA(hwnd, GWLP_ID); + ok(retval > 123, "Unexpected id.\n"); + SetLastError(0xdeadbeef); + ret = GetWindowWord(hwnd, GWLP_ID); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected id %#x.\n", ret); + + /* GWLP_HINSTANCE */ + retval = GetWindowLongPtrA(hwnd, GWLP_HINSTANCE); + ok(retval == (LONG_PTR)GetModuleHandleA(NULL), "Unexpected instance %#lx.\n", retval); + + SetLastError(0xdeadbeef); + ret = GetWindowLongA(hwnd, GWLP_HINSTANCE); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret); + + SetLastError(0xdeadbeef); + ret = GetWindowLongW(hwnd, GWLP_HINSTANCE); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret); + + SetLastError(0xdeadbeef); + ret = GetWindowWord(hwnd, GWLP_HINSTANCE); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret); + + SetLastError(0xdeadbeef); + ret = SetWindowLongA(hwnd, GWLP_HINSTANCE, 1); + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret); + + SetLastError(0xdeadbeef); + ret = SetWindowLongW(hwnd, GWLP_HINSTANCE, 1); + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret); + + /* GWLP_HWNDPARENT */ + SetLastError(0xdeadbeef); + ret = GetWindowLongA(hwnd, GWLP_HWNDPARENT); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#x.\n", ret); + + SetLastError(0xdeadbeef); + ret = SetWindowLongA(hwnd, GWLP_HWNDPARENT, 0); + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#x.\n", ret); + + SetLastError(0xdeadbeef); + ret = SetWindowLongW(hwnd, GWLP_HWNDPARENT, 0); + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#x.\n", ret); + + SetLastError(0xdeadbeef); + ret = GetWindowWord(hwnd, GWLP_HWNDPARENT); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#x.\n", ret); + + DestroyWindow(hwnd); +#endif +} + +static void test_set_window_word_size(void) +{ + WNDPROC wnd_proc, wnd_proc_2; + LONG_PTR retval; + HWND hwnd; + LONG ret; + + /* It's not allowed to set or get 64-bit pointer values using 32-bit functions. */ + hwnd = CreateWindowExA(0, "MainWindowClass", "Child window", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_CHILD | + WS_MAXIMIZEBOX | WS_VISIBLE, 100, 100, 200, 200, hwndMain, 0, GetModuleHandleA(NULL), NULL); + ok(hwnd != NULL, "Failed to create test window.\n"); + + /* GWLP_WNDPROC */ + wnd_proc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_WNDPROC); + ok(!!wnd_proc, "Unexpected window proc.\n"); + + SetLastError(0xdeadbeef); + ret = GetWindowWord(hwnd, GWLP_WNDPROC); + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected window proc.\n"); + + SetLastError(0xdeadbeef); + ret = SetWindowWord(hwnd, GWLP_WNDPROC, 0xbeef); + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected window proc.\n"); + + wnd_proc_2 = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_WNDPROC); + ok(wnd_proc_2 == wnd_proc, "Unexpected window proc.\n"); + + /* GWLP_USERDATA */ + ret = SetWindowLongA(hwnd, GWLP_USERDATA, (1 << 16) | 123); + ok(!ret, "Unexpected user data %#x.\n", ret); + ret = GetWindowLongA(hwnd, GWLP_USERDATA); + ok(ret > 123, "Unexpected user data %#x.\n", ret); + ret = GetWindowWord(hwnd, GWLP_USERDATA); +todo_wine + ok(ret == 123, "Unexpected user data %#x.\n", ret); + ret = SetWindowWord(hwnd, GWLP_USERDATA, 124); +todo_wine + ok(ret == 123, "Unexpected user data %#x.\n", ret); + ret = GetWindowWord(hwnd, GWLP_USERDATA); +todo_wine + ok(ret == 124, "Unexpected user data %#x.\n", ret); + ret = GetWindowLongA(hwnd, GWLP_USERDATA); +todo_wine + ok(ret == ((1 << 16) | 124), "Unexpected user data %#x.\n", ret); + + /* GWLP_ID */ + ret = SetWindowLongA(hwnd, GWLP_ID, 1); + ok(!ret, "Unexpected id %#x.\n", ret); + ret = GetWindowLongA(hwnd, GWLP_ID); + ok(ret == 1, "Unexpected id %#x.\n", ret); + + SetLastError(0xdeadbeef); + ret = GetWindowWord(hwnd, GWLP_ID); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected id %#x.\n", ret); + SetLastError(0xdeadbeef); + ret = SetWindowWord(hwnd, GWLP_ID, 2); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected id %#x.\n", ret); + + /* GWLP_HINSTANCE */ + retval = GetWindowLongPtrA(hwnd, GWLP_HINSTANCE); + ok(retval == (LONG_PTR)GetModuleHandleA(NULL), "Unexpected instance %#lx.\n", retval); + + SetLastError(0xdeadbeef); + ret = GetWindowWord(hwnd, GWLP_HINSTANCE); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret); + + SetLastError(0xdeadbeef); + ret = SetWindowWord(hwnd, GWLP_HINSTANCE, 0xdead); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret); + + /* GWLP_HWNDPARENT */ + retval = GetWindowLongPtrA(hwnd, GWLP_HWNDPARENT); + ok(!!retval, "Unexpected parent window %#x.\n", ret); + + SetLastError(0xdeadbeef); + ret = GetWindowWord(hwnd, GWLP_HWNDPARENT); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#x.\n", ret); + + DestroyWindow(hwnd); +} + static void test_SetWindowLong(void) { LONG_PTR retval; @@ -6371,6 +6598,9 @@ static void test_SetWindowLong(void) /* set it back to ANSI */ SetWindowLongPtrA(hwndMain, GWLP_WNDPROC, 0); } + + test_set_window_long_size(); + test_set_window_word_size(); } static LRESULT WINAPI check_style_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 24b2a2ffd5..f5ac867d2b 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2734,7 +2734,19 @@ WORD WINAPI SetWindowWord( HWND hwnd, INT offset, WORD newval ) */ LONG WINAPI DECLSPEC_HOTPATCH SetWindowLongA( HWND hwnd, INT offset, LONG newval ) { - return WIN_SetWindowLong( hwnd, offset, sizeof(LONG), newval, FALSE ); + switch (offset) + { +#ifdef _WIN64 + case GWLP_WNDPROC: + case GWLP_HINSTANCE: + case GWLP_HWNDPARENT: + WARN( "Invalid offset %d\n", offset ); + SetLastError( ERROR_INVALID_INDEX ); + return 0; +#endif + default: + return WIN_SetWindowLong( hwnd, offset, sizeof(LONG), newval, FALSE ); + } } @@ -2808,8 +2820,21 @@ LONG WINAPI DECLSPEC_HOTPATCH SetWindowLongW( HWND hwnd, /* [in] window to alter */ INT offset, /* [in] offset, in bytes, of location to alter */ LONG newval /* [in] new value of location */ -) { - return WIN_SetWindowLong( hwnd, offset, sizeof(LONG), newval, TRUE ); +) +{ + switch (offset) + { +#ifdef _WIN64 + case GWLP_WNDPROC: + case GWLP_HINSTANCE: + case GWLP_HWNDPARENT: + WARN("Invalid offset %d\n", offset ); + SetLastError( ERROR_INVALID_INDEX ); + return 0; +#endif + default: + return WIN_SetWindowLong( hwnd, offset, sizeof(LONG), newval, TRUE ); + } } -- 2.20.1

2 2

[PATCH] msxml3: Remove redundant not-NULL check (coccinellery)
by Michael Stefaniuc 28 Feb '19

28 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- return E_OUTOFMEMORY if This is NULL dlls/msxml3/selection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index b7c560a9a5..31be4d8f10 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -831,7 +831,7 @@ HRESULT create_selection(xmlNodePtr node, xmlChar* query, IXMLDOMNodeList **out) TRACE("found %d matches\n", xmlXPathNodeSetGetLength(This->result->nodesetval)); cleanup: - if (This && FAILED(hr)) + if (FAILED(hr)) IXMLDOMSelection_Release( &This->IXMLDOMSelection_iface ); xmlXPathFreeContext(ctxt); return hr; -- 2.20.1

2 1

[PATCH] Add support for ast locale
by Enol Puente 28 Feb '19

28 Feb '19

2 1

[PATCH] jscript: Use flatten string in create_regexp debug traces.
by Jacek Caban 28 Feb '19

28 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jsregexp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH] ucrtbase: Add ilogb* functions.
by Piotr Caban 28 Feb '19

28 Feb '19

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 2 ++ .../api-ms-win-crt-math-l1-1-0.spec | 6 ++-- dlls/msvcr120/msvcr120.spec | 6 ++-- dlls/msvcr120_app/msvcr120_app.spec | 6 ++-- dlls/msvcrt/math.c | 31 +++++++++++++++++++ dlls/msvcrt/msvcrt.h | 4 +++ dlls/ucrtbase/ucrtbase.spec | 6 ++-- 7 files changed, 49 insertions(+), 12 deletions(-)

1 0

[PATCH] Add support for ast locale
by Enol Puente 28 Feb '19

28 Feb '19

>From 51daf3510046138056a4699790da46446aaaa08e Mon Sep 17 00:00:00 2001 From: Enol P <enolp(a)softastur.org> Date: Thu, 28 Feb 2019 19:46:40 +0100 Subject: [PATCH] Add support for ast locale --- dlls/kernel32/nls/ast.nls | 170 + po/Makefile.in | 1 + po/ast.po | 15908 ++++++++++++++++++++++++++++++++++++ 3 files changed, 16079 insertions(+) create mode 100644 dlls/kernel32/nls/ast.nls create mode 100644 po/ast.po diff --git a/dlls/kernel32/nls/ast.nls b/dlls/kernel32/nls/ast.nls new file mode 100644 index 0000000000..cb6f1e8b37 --- /dev/null +++ b/dlls/kernel32/nls/ast.nls @@ -0,0 +1,170 @@ +/* + * Locale definitions for Asturian + * + * Copyright 2019 Softastur for WineHQ + * + * 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 code_page(65001) /* UTF-8 */ + +STRINGTABLE LANGUAGE LANG_ASTURIAN, SUBLANG_DEFAULT +{ + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0003\x0000\x0000\xc5d4" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "34" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "3" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "1252" + LOCALE_IDEFAULTCODEPAGE "850" + LOCALE_IDEFAULTCOUNTRY "34" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "040a" + LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTUNIXCODEPAGE "28605" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0403" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "8" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "1" + LOCALE_INEGSYMPRECEDES "0" + LOCALE_INEUTRAL "0" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "1" + LOCALE_IPOSSYMPRECEDES "0" + LOCALE_IREADINGLAYOUT "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "1" + LOCALE_S1159 "" + LOCALE_S2359 "" + LOCALE_SABBREVCTRYNAME "ESP" + LOCALE_SABBREVDAYNAME1 "Llu" + LOCALE_SABBREVDAYNAME2 "Mar" + LOCALE_SABBREVDAYNAME3 "Mié" + LOCALE_SABBREVDAYNAME4 "Xue" + LOCALE_SABBREVDAYNAME5 "Vie" + LOCALE_SABBREVDAYNAME6 "Sáb" + LOCALE_SABBREVDAYNAME7 "Dom" + LOCALE_SABBREVLANGNAME "AST" + LOCALE_SABBREVMONTHNAME1 "Xin" + LOCALE_SABBREVMONTHNAME2 "Feb" + LOCALE_SABBREVMONTHNAME3 "Mar" + LOCALE_SABBREVMONTHNAME4 "Abr" + LOCALE_SABBREVMONTHNAME5 "May" + LOCALE_SABBREVMONTHNAME6 "Xun" + LOCALE_SABBREVMONTHNAME7 "Xnt" + LOCALE_SABBREVMONTHNAME8 "Ago" + LOCALE_SABBREVMONTHNAME9 "Set" + LOCALE_SABBREVMONTHNAME10 "Och" + LOCALE_SABBREVMONTHNAME11 "Pay" + LOCALE_SABBREVMONTHNAME12 "Avi" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Spain" + LOCALE_SCURRENCY "€" + LOCALE_SDATE "/" + LOCALE_SDAYNAME1 "Llunes" + LOCALE_SDAYNAME2 "Martes" + LOCALE_SDAYNAME3 "Miércoles" + LOCALE_SDAYNAME4 "Xueves" + LOCALE_SDAYNAME5 "Vienres" + LOCALE_SDAYNAME6 "Sábadu" + LOCALE_SDAYNAME7 "Domingu" + LOCALE_SDECIMAL "," + LOCALE_SENGCOUNTRY "Spain" + LOCALE_SENGCURRNAME "Euro" + LOCALE_SENGLANGUAGE "Asturian" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "EUR" + LOCALE_SISO3166CTRYNAME "ES" + LOCALE_SISO639LANGNAME "ast" + LOCALE_SLANGUAGE "Asturian" + LOCALE_SLIST ";" + LOCALE_SLONGDATE "dddd, d' / 'MMMM' / 'yyyy" + LOCALE_SMONDECIMALSEP "," + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "Xineru" + LOCALE_SMONTHNAME2 "Febreru" + LOCALE_SMONTHNAME3 "Marzu" + LOCALE_SMONTHNAME4 "Abril" + LOCALE_SMONTHNAME5 "Mayu" + LOCALE_SMONTHNAME6 "Xunu" + LOCALE_SMONTHNAME7 "Xunetu" + LOCALE_SMONTHNAME8 "Agostu" + LOCALE_SMONTHNAME9 "Setiembre" + LOCALE_SMONTHNAME10 "Ochobre" + LOCALE_SMONTHNAME11 "Payares" + LOCALE_SMONTHNAME12 "Avientu" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "." + LOCALE_SNAME "ast" + LOCALE_SNAN "NaN" + LOCALE_SNATIVECTRYNAME "España" + LOCALE_SNATIVECURRNAME "Euru" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVEDISPLAYNAME "Asturianu" + LOCALE_SNATIVELANGNAME "Asturianu" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SOPENTYPELANGUAGETAG "AST " + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Latn;" + LOCALE_SPARENT "ast" + LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSHORTESTDAYNAME1 "Ll" + LOCALE_SSHORTESTDAYNAME2 "Ma" + LOCALE_SSHORTESTDAYNAME3 "Mi" + LOCALE_SSHORTESTDAYNAME4 "Xu" + LOCALE_SSHORTESTDAYNAME5 "Vi" + LOCALE_SSHORTESTDAYNAME6 "Sá" + LOCALE_SSHORTESTDAYNAME7 "Do" + LOCALE_SSHORTTIME "HH:mm" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "." + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "MMMM' / 'yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +} diff --git a/po/Makefile.in b/po/Makefile.in index 6b94c51fad..cbf799cf27 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -1,5 +1,6 @@ PO_SRCS = \ ar.po \ + ast.po \ bg.po \ ca.po \ cs.po \ diff --git a/po/ast.po b/po/ast.po new file mode 100644 index 0000000000..9ecf498ad8 --- /dev/null +++ b/po/ast.po @@ -0,0 +1,15908 @@ +# enolp <enolp(a)softastur.org>, 2019. +msgid "" +msgstr "" +"Project-Id-Version: Wine\n" +"Report-Msgid-Bugs-To: https://bugs.winehq.org\n" +"POT-Creation-Date: N/A\n" +"PO-Revision-Date: 2019-02-28 19:21+0100\n" +"Last-Translator: enolp <enolp(a)softastur.org>\n" +"Language-Team: Asturian <alministradores(a)softastur.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ast\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 18.12.2\n" + +#: appwiz.rc:58 +msgid "Install/Uninstall" +msgstr "" + +#: appwiz.rc:61 +msgid "" +"To install a new program from a floppy disk, CD-ROM drive, or your hard " +"drive, click Install." +msgstr "" +"Pa instalar un programa nuevu dende un disquete, CD-ROM o" +"discu duru, calca Instalar." + +#: appwiz.rc:62 +msgid "&Install..." +msgstr "&Instalar..." + +#: appwiz.rc:65 +msgid "" +"The following software can be automatically removed. To remove a program or " +"to modify its installed components, select it from the list and click Modify/" +"Remove." +msgstr "" + +#: appwiz.rc:67 +msgid "&Support Information" +msgstr "" + +#: appwiz.rc:68 regedit.rc:133 regedit.rc:232 +msgid "&Modify..." +msgstr "&Modificar..." + +#: appwiz.rc:69 appwiz.rc:45 cryptui.rc:351 msacm32.rc:40 winecfg.rc:200 +#: winecfg.rc:237 wordpad.rc:256 +msgid "&Remove" +msgstr "" + +#: appwiz.rc:75 +msgid "Support Information" +msgstr "" + +#: appwiz.rc:78 avifil32.rc:54 comctl32.rc:71 comctl32.rc:55 comdlg32.rc:232 +#: comdlg32.rc:262 comdlg32.rc:305 comdlg32.rc:388 comdlg32.rc:422 +#: comdlg32.rc:453 credui.rc:52 cryptui.rc:268 cryptui.rc:280 cryptui.rc:370 +#: cryptui.rc:462 dinput.rc:37 ieframe.rc:96 localui.rc:44 localui.rc:57 +#: mpr.rc:49 msacm32.rc:53 mshtml.rc:47 mshtml.rc:57 msvfw32.rc:36 oledlg.rc:62 +#: oledlg.rc:94 serialui.rc:41 setupapi.rc:59 shell32.rc:276 shell32.rc:300 +#: shell32.rc:322 shell32.rc:341 shlwapi.rc:44 twain.rc:32 user32.rc:83 +#: user32.rc:98 wininet.rc:51 wininet.rc:71 winspool.rc:42 net.rc:47 +#: notepad.rc:117 oleview.rc:161 oleview.rc:174 progman.rc:106 progman.rc:124 +#: progman.rc:142 progman.rc:158 progman.rc:180 progman.rc:199 progman.rc:216 +#: regedit.rc:296 regedit.rc:307 regedit.rc:320 regedit.rc:336 regedit.rc:349 +#: regedit.rc:362 taskmgr.rc:442 taskmgr.rc:517 winecfg.rc:214 winecfg.rc:224 +#: wineconsole.rc:135 winefile.rc:128 winefile.rc:151 winefile.rc:181 +#: winemine.rc:73 winemine.rc:84 winemine.rc:98 wordpad.rc:215 wordpad.rc:226 +#: wordpad.rc:244 wordpad.rc:257 +msgid "OK" +msgstr "" + +#: appwiz.rc:79 +msgid "The following information can be used to get technical support for %s:" +msgstr "La información de darréu pue usase pa consiguir sofitu téunicu pa %s:" + +#: appwiz.rc:80 +msgid "Publisher:" +msgstr "" + +#: appwiz.rc:81 winefile.rc:166 +msgid "Version:" +msgstr "Versión:" + +#: appwiz.rc:82 +msgid "Contact:" +msgstr "Contautu:" + +#: appwiz.rc:83 +msgid "Support Information:" +msgstr "" + +#: appwiz.rc:84 +msgid "Support Telephone:" +msgstr "" + +#: appwiz.rc:85 +msgid "Readme:" +msgstr "Lleime:" + +#: appwiz.rc:86 +msgid "Product Updates:" +msgstr "Anovamientos del productu:" + +#: appwiz.rc:87 +msgid "Comments:" +msgstr "Comentarios:" + +#: appwiz.rc:100 +msgid "Wine Gecko Installer" +msgstr "Instalador de Wine Gecko" + +#: appwiz.rc:103 +msgid "" +"Wine could not find a Gecko package which is needed for applications " +"embedding HTML to work correctly. Wine can automatically download and " +"install it for you.\n" +"\n" +"Note: it is recommended to use your distribution's packages instead. See <a " +"href=\"https://wiki.winehq.org/Gecko\">https://wiki.winehq.org/Gecko</a> for " +"details." +msgstr "" +"Wine nun pudo alcontrar un paquete de Gecko que se precisa pa que les " +"aplicaciones incrustaes en HTML funcionen correutamente. Wine pue " +"baxalu ya instalalu automáticamente por ti.\n" +"\n" +"Nota: aconséyase qu'uses el paquete de la to distribución. Mira <a " +"href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Gecko</a> pa " +"los detalles." + +#: appwiz.rc:109 appwiz.rc:124 +msgid "&Install" +msgstr "&Instalar" + +#: appwiz.rc:110 appwiz.rc:125 avifil32.rc:55 browseui.rc:45 comctl32.rc:72 +#: comctl32.rc:87 comctl32.rc:56 comdlg32.rc:171 comdlg32.rc:193 +#: comdlg32.rc:211 comdlg32.rc:233 comdlg32.rc:263 comdlg32.rc:306 +#: comdlg32.rc:328 comdlg32.rc:348 comdlg32.rc:389 comdlg32.rc:423 +#: comdlg32.rc:454 comdlg32.rc:479 comdlg32.rc:505 comdlg32.rc:528 credui.rc:53 +#: cryptui.rc:269 cryptui.rc:281 cryptui.rc:371 cryptui.rc:463 dinput.rc:38 +#: ieframe.rc:97 inetcpl.rc:81 localui.rc:45 localui.rc:58 mpr.rc:50 +#: msacm32.rc:54 mshtml.rc:48 mshtml.rc:58 msvfw32.rc:37 oledlg.rc:63 +#: oledlg.rc:95 serialui.rc:42 setupapi.rc:42 setupapi.rc:60 shell32.rc:277 +#: shell32.rc:301 shell32.rc:312 shell32.rc:342 shlwapi.rc:45 twain.rc:33 +#: user32.rc:84 user32.rc:99 wininet.rc:52 wininet.rc:72 winspool.rc:43 +#: notepad.rc:118 oleview.rc:162 oleview.rc:175 progman.rc:107 progman.rc:125 +#: progman.rc:143 progman.rc:159 progman.rc:181 progman.rc:200 progman.rc:217 +#: regedit.rc:297 regedit.rc:308 regedit.rc:321 regedit.rc:337 regedit.rc:350 +#: regedit.rc:363 taskmgr.rc:443 taskmgr.rc:518 wineboot.rc:34 winecfg.rc:215 +#: winecfg.rc:225 wineconsole.rc:136 winefile.rc:129 winefile.rc:152 +#: winefile.rc:182 winemine.rc:99 wordpad.rc:216 wordpad.rc:227 wordpad.rc:245 +#: wordpad.rc:258 +msgid "Cancel" +msgstr "Encaboxar" + +#: appwiz.rc:115 +msgid "Wine Mono Installer" +msgstr "Instalador de Wine Mono" + +#: appwiz.rc:118 +msgid "" +"Wine could not find a wine-mono package which is needed for .NET " +"applications to work correctly. Wine can automatically download and install " +"it for you.\n" +"\n" +"Note: it is recommended to use your distribution's packages instead. See <a " +"href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a> for " +"details." +msgstr "" +"Wine nun pudo alcontrar un paquete wine-mono que se precisa pa que les " +"aplicaciones en .NET funcionen correutamente. Wine pue baxalu ya " +"instalalu automáticamente por ti.\n" +"\n" +"Nota: aconséyase qu'uses el paquete de la to distribución. Mira <a " +"href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a> pa " +"los detalles." + +#: appwiz.rc:31 +msgid "Add/Remove Programs" +msgstr "" + +#: appwiz.rc:32 +msgid "" +"Allows you to install new software, or remove existing software from your " +"computer." +msgstr "" +"Permítete instalar software nuevu o desaniciar que que yá tea instaláu " +"nel ordenador." + +#: appwiz.rc:33 taskmgr.rc:262 winecfg.rc:33 +msgid "Applications" +msgstr "Aplicaciones" + +#: appwiz.rc:35 +msgid "" +"Unable to execute the uninstaller, '%s'. Do you want to remove the uninstall " +"entry for this program from the registry?" +msgstr "" + +#: appwiz.rc:36 +msgid "Not specified" +msgstr "" + +#: appwiz.rc:38 shell32.rc:144 shell32.rc:241 regedit.rc:147 winefile.rc:107 +msgid "Name" +msgstr "Nome" + +#: appwiz.rc:39 +msgid "Publisher" +msgstr "" + +#: appwiz.rc:40 cryptui.rc:54 +msgid "Version" +msgstr "Versión" + +#: appwiz.rc:41 +msgid "Installation programs" +msgstr "Programes d'instalación" + +#: appwiz.rc:42 +msgid "Programs (*.exe)" +msgstr "Programes (*.exe)" + +#: appwiz.rc:43 avifil32.rc:33 cryptui.rc:83 shell32.rc:199 notepad.rc:76 +#: oleview.rc:103 progman.rc:82 regedit.rc:225 winedbg.rc:43 winhlp32.rc:90 +msgid "All files (*.*)" +msgstr "Tolos ficheros (*.*)" + +#: appwiz.rc:46 +msgid "&Modify/Remove" +msgstr "" + +#: appwiz.rc:51 +msgid "Downloading..." +msgstr "Baxando..." + +#: appwiz.rc:52 +msgid "Installing..." +msgstr "Instalando..." + +#: appwiz.rc:53 +msgid "" +"Unexpected checksum of downloaded file. Aborting installation of corrupted " +"file." +msgstr "" + +#: avifil32.rc:42 +msgid "Compress options" +msgstr "" + +#: avifil32.rc:45 +msgid "&Choose a stream:" +msgstr "" + +#: avifil32.rc:48 wordpad.rc:76 +msgid "&Options..." +msgstr "&Opciones..." + +#: avifil32.rc:49 +msgid "&Interleave every" +msgstr "" + +#: avifil32.rc:51 msvfw32.rc:51 +msgid "frames" +msgstr "" + +#: avifil32.rc:52 +msgid "Current format:" +msgstr "" + +#: avifil32.rc:30 +msgid "Waveform: %s" +msgstr "" + +#: avifil32.rc:31 +msgid "Waveform" +msgstr "" + +#: avifil32.rc:32 +msgid "All multimedia files" +msgstr "" + +#: avifil32.rc:34 +msgid "video" +msgstr "" + +#: avifil32.rc:35 +msgid "audio" +msgstr "audio" + +#: avifil32.rc:36 +msgid "Wine AVI-default-filehandler" +msgstr "" + +#: avifil32.rc:37 +msgid "uncompressed" +msgstr "" + +#: browseui.rc:28 +msgid "Canceling..." +msgstr "Encaboxando..." + +#: browseui.rc:29 +msgid "%1!u! %2 remaining" +msgstr "%1!u! %2 restantes" + +#: browseui.rc:30 +msgid "%1!u! %2 and %3!u! %4 remaining" +msgstr "%1!u! %2 y %3!u! %4 restantes" + +#: browseui.rc:31 +msgid "seconds" +msgstr "segundos" + +#: browseui.rc:32 +msgid "minutes" +msgstr "" + +#: browseui.rc:33 +msgid "hours" +msgstr "" + +#: comctl32.rc:68 winefile.rc:157 +msgid "Properties for %s" +msgstr "Propiedaes de %s" + +#: comctl32.rc:73 comdlg32.rc:264 +msgid "&Apply" +msgstr "&Aplicar" + +#: comctl32.rc:74 comctl32.rc:88 comdlg32.rc:307 user32.rc:88 +msgid "Help" +msgstr "" + +#: comctl32.rc:81 +msgid "Wizard" +msgstr "Encontu" + +#: comctl32.rc:84 +msgid "< &Back" +msgstr "< &Atrás" + +#: comctl32.rc:85 +msgid "&Next >" +msgstr "&Siguiente >" + +#: comctl32.rc:86 +msgid "Finish" +msgstr "" + +#: comctl32.rc:97 +msgid "Customize Toolbar" +msgstr "" + +#: comctl32.rc:100 comctl32.rc:57 cryptui.rc:356 ieframe.rc:43 oleview.rc:83 +#: oleview.rc:187 oleview.rc:200 oleview.rc:212 taskmgr.rc:139 +msgid "&Close" +msgstr "&Zarrar" + +#: comctl32.rc:101 +msgid "R&eset" +msgstr "" + +#: comctl32.rc:102 comdlg32.rc:172 comdlg32.rc:194 comdlg32.rc:265 +#: comdlg32.rc:329 comdlg32.rc:349 comdlg32.rc:390 comdlg32.rc:424 +#: comdlg32.rc:480 comdlg32.rc:506 comdlg32.rc:529 ieframe.rc:58 msacm32.rc:52 +#: oledlg.rc:96 shell32.rc:128 clock.rc:44 notepad.rc:60 notepad.rc:119 +#: oleview.rc:72 progman.rc:55 progman.rc:108 progman.rc:126 progman.rc:144 +#: progman.rc:160 progman.rc:184 progman.rc:202 progman.rc:219 regedit.rc:77 +#: taskmgr.rc:87 winefile.rc:82 winemine.rc:53 winhlp32.rc:57 wordpad.rc:102 +msgid "&Help" +msgstr "&Ayuda" + +#: comctl32.rc:103 +msgid "Move &Up" +msgstr "" + +#: comctl32.rc:104 +msgid "Move &Down" +msgstr "" + +#: comctl32.rc:105 +msgid "A&vailable buttons:" +msgstr "Botones &disponibles:" + +#: comctl32.rc:107 +msgid "&Add ->" +msgstr "&Amestar ->" + +#: comctl32.rc:108 +msgid "<- &Remove" +msgstr "<- &Desaniciar" + +#: comctl32.rc:109 +msgid "&Toolbar buttons:" +msgstr "" + +#: comctl32.rc:42 +msgid "Separator" +msgstr "Separtador" + +#: comctl32.rc:47 progman.rc:81 +msgctxt "hotkey" +msgid "None" +msgstr "" + +#: comctl32.rc:52 shell32.rc:309 shlwapi.rc:46 user32.rc:79 +msgid "&Yes" +msgstr "&Sí" + +#: comctl32.rc:53 shell32.rc:311 shlwapi.rc:47 user32.rc:80 +msgid "&No" +msgstr "&Non" + +#: comctl32.rc:54 user32.rc:82 +msgid "&Retry" +msgstr "&Retentar" + +#: comctl32.rc:62 +msgid "Hide details" +msgstr "" + +#: comctl32.rc:63 +msgid "See details" +msgstr "" + +#: comctl32.rc:31 cryptui.rc:235 regedit.rc:286 taskmgr.rc:434 winedbg.rc:61 +#: winedbg.rc:76 wordpad.rc:180 +msgid "Close" +msgstr "" + +#: comctl32.rc:36 +msgid "Today:" +msgstr "Güei:" + +#: comctl32.rc:37 +msgid "Go to today" +msgstr "Dir a güei" + +#: comdlg32.rc:157 comdlg32.rc:170 comdlg32.rc:460 comdlg32.rc:485 +#: comdlg32.rc:512 shell32.rc:167 oleview.rc:101 +msgid "Open" +msgstr "" + +#: comdlg32.rc:160 comdlg32.rc:182 +msgid "File &Name:" +msgstr "" + +#: comdlg32.rc:163 comdlg32.rc:185 +msgid "&Directories:" +msgstr "&Direutorios:" + +#: comdlg32.rc:166 comdlg32.rc:188 +msgid "List Files of &Type:" +msgstr "" + +#: comdlg32.rc:168 comdlg32.rc:190 +msgid "Dri&ves:" +msgstr "" + +#: comdlg32.rc:173 comdlg32.rc:195 shell32.rc:370 shell32.rc:407 +#: winefile.rc:173 +msgid "&Read Only" +msgstr "" + +#: comdlg32.rc:179 +msgid "Save As..." +msgstr "" + +#: comdlg32.rc:192 comdlg32.rc:145 +msgid "Save As" +msgstr "" + +#: comdlg32.rc:201 comdlg32.rc:210 comdlg32.rc:356 comdlg32.rc:54 hhctrl.rc:49 +#: wordpad.rc:173 +msgid "Print" +msgstr "" + +#: comdlg32.rc:204 +msgid "Printer:" +msgstr "Imprentadora:" + +#: comdlg32.rc:206 comdlg32.rc:373 +msgid "Print range" +msgstr "" + +#: comdlg32.rc:207 comdlg32.rc:374 regedit.rc:268 +msgid "&All" +msgstr "" + +#: comdlg32.rc:208 +msgid "S&election" +msgstr "E&sbilla" + +#: comdlg32.rc:209 +msgid "&Pages" +msgstr "&Páxines" + +#: comdlg32.rc:212 comdlg32.rc:234 +msgid "&Setup" +msgstr "" + +#: comdlg32.rc:213 +msgid "&From:" +msgstr "" + +#: comdlg32.rc:214 +msgid "&To:" +msgstr "" + +#: comdlg32.rc:215 wineps.rc:42 +msgid "Print &Quality:" +msgstr "" + +#: comdlg32.rc:217 +msgid "Print to Fi&le" +msgstr "" + +#: comdlg32.rc:218 +msgid "Condensed" +msgstr "" + +#: comdlg32.rc:224 comdlg32.rc:395 +msgid "Print Setup" +msgstr "" + +#: comdlg32.rc:227 comdlg32.rc:359 comdlg32.rc:398 +msgid "Printer" +msgstr "" + +#: comdlg32.rc:228 +msgid "&Default Printer" +msgstr "" + +#: comdlg32.rc:229 +msgid "[none]" +msgstr "" + +#: comdlg32.rc:230 +msgid "Specific &Printer" +msgstr "" + +#: comdlg32.rc:235 comdlg32.rc:417 comdlg32.rc:441 wineps.rc:34 +msgid "Orientation" +msgstr "Orientación" + +#: comdlg32.rc:236 +msgid "Po&rtrait" +msgstr "" + +#: comdlg32.rc:237 comdlg32.rc:443 wineps.rc:37 +msgid "&Landscape" +msgstr "" + +#: comdlg32.rc:240 comdlg32.rc:411 comdlg32.rc:436 wineps.rc:28 +msgid "Paper" +msgstr "Papel" + +#: comdlg32.rc:241 +msgid "Si&ze" +msgstr "" + +#: comdlg32.rc:242 +msgid "&Source" +msgstr "" + +#: comdlg32.rc:250 wineconsole.rc:85 +msgid "Font" +msgstr "" + +#: comdlg32.rc:253 +msgid "&Font:" +msgstr "" + +#: comdlg32.rc:256 +msgid "Font St&yle:" +msgstr "" + +#: comdlg32.rc:259 comdlg32.rc:437 winecfg.rc:294 +msgid "&Size:" +msgstr "&Tamañu:" + +#: comdlg32.rc:266 +msgid "Effects" +msgstr "" + +#: comdlg32.rc:267 +msgid "Stri&keout" +msgstr "" + +#: comdlg32.rc:268 +msgid "&Underline" +msgstr "" + +#: comdlg32.rc:269 winecfg.rc:292 +msgid "&Color:" +msgstr "&Color:" + +#: comdlg32.rc:272 +msgid "Sample" +msgstr "" + +#: comdlg32.rc:274 +msgid "Scr&ipt:" +msgstr "" + +#: comdlg32.rc:282 +msgid "Color" +msgstr "Color" + +#: comdlg32.rc:285 +msgid "&Basic Colors:" +msgstr "Colores &básicos:" + +#: comdlg32.rc:286 +msgid "&Custom Colors:" +msgstr "" + +#: comdlg32.rc:287 comdlg32.rc:310 +msgid "Color | Sol&id" +msgstr "" + +#: comdlg32.rc:288 +msgid "&Red:" +msgstr "&Bermeyu:" + +#: comdlg32.rc:290 +msgid "&Green:" +msgstr "&Verde:" + +#: comdlg32.rc:292 +msgid "&Blue:" +msgstr "&Azul:" + +#: comdlg32.rc:294 +msgid "&Hue:" +msgstr "" + +#: comdlg32.rc:296 +msgctxt "Saturation" +msgid "&Sat:" +msgstr "" + +#: comdlg32.rc:298 +msgctxt "Luminance" +msgid "&Lum:" +msgstr "" + +#: comdlg32.rc:308 +msgid "&Add to Custom Colors" +msgstr "" + +#: comdlg32.rc:309 +msgid "&Define Custom Colors >>" +msgstr "" + +#: comdlg32.rc:316 regedit.rc:275 regedit.rc:285 +msgid "Find" +msgstr "" + +#: comdlg32.rc:319 comdlg32.rc:338 +msgid "Fi&nd What:" +msgstr "" + +#: comdlg32.rc:321 comdlg32.rc:342 +msgid "Match &Whole Word Only" +msgstr "" + +#: comdlg32.rc:322 comdlg32.rc:343 +msgid "Match &Case" +msgstr "" + +#: comdlg32.rc:323 joy.rc:71 +msgid "Direction" +msgstr "Direición" + +#: comdlg32.rc:324 view.rc:42 +msgid "&Up" +msgstr "&Arriba" + +#: comdlg32.rc:325 view.rc:43 +msgid "&Down" +msgstr "&Abaxo" + +#: comdlg32.rc:327 comdlg32.rc:345 +msgid "&Find Next" +msgstr "" + +#: comdlg32.rc:335 +msgid "Replace" +msgstr "" + +#: comdlg32.rc:340 +msgid "Re&place With:" +msgstr "" + +#: comdlg32.rc:346 +msgid "&Replace" +msgstr "&Trocar" + +#: comdlg32.rc:347 +msgid "Replace &All" +msgstr "Trocar &too" + +#: comdlg32.rc:361 comdlg32.rc:401 ieframe.rc:42 shdoclc.rc:61 shell32.rc:108 +#: clock.rc:31 wineconsole.rc:30 +msgid "&Properties" +msgstr "&Propiedaes" + +#: comdlg32.rc:362 +msgid "Print to fi&le" +msgstr "" + +#: comdlg32.rc:363 comdlg32.rc:399 msacm32.rc:34 winefile.rc:138 +msgid "&Name:" +msgstr "&Nome:" + +#: comdlg32.rc:364 comdlg32.rc:402 +msgid "Status:" +msgstr "Estáu:" + +#: comdlg32.rc:366 comdlg32.rc:404 +msgid "Type:" +msgstr "" + +#: comdlg32.rc:368 comdlg32.rc:406 +msgid "Where:" +msgstr "" + +#: comdlg32.rc:370 comdlg32.rc:408 +msgid "Comment:" +msgstr "" + +#: comdlg32.rc:375 +msgid "Pa&ges" +msgstr "" + +#: comdlg32.rc:376 +msgid "&Selection" +msgstr "&Esbilla" + +#: comdlg32.rc:379 +msgid "&from:" +msgstr "" + +#: comdlg32.rc:380 +msgid "&to:" +msgstr "" + +#: comdlg32.rc:382 +msgid "Copies" +msgstr "" + +#: comdlg32.rc:383 +msgid "Number of &copies:" +msgstr "Númberu de &copies:" + +#: comdlg32.rc:385 +msgid "C&ollate" +msgstr "" + +#: comdlg32.rc:412 winecfg.rc:300 +msgid "Si&ze:" +msgstr "" + +#: comdlg32.rc:414 +msgid "&Source:" +msgstr "" + +#: comdlg32.rc:419 +msgid "P&ortrait" +msgstr "" + +#: comdlg32.rc:420 +msgid "L&andscape" +msgstr "" + +#: comdlg32.rc:430 +msgid "Setup Page" +msgstr "" + +#: comdlg32.rc:439 +msgid "&Tray:" +msgstr "" + +#: comdlg32.rc:442 wineps.rc:35 +msgid "&Portrait" +msgstr "" + +#: comdlg32.rc:445 +msgid "L&eft:" +msgstr "" + +#: comdlg32.rc:447 notepad.rc:112 +msgid "&Right:" +msgstr "" + +#: comdlg32.rc:449 +msgid "T&op:" +msgstr "" + +#: comdlg32.rc:451 notepad.rc:114 +msgid "&Bottom:" +msgstr "" + +#: comdlg32.rc:455 +msgid "P&rinter..." +msgstr "" + +#: comdlg32.rc:463 comdlg32.rc:488 +msgid "Look &in:" +msgstr "Guetar &en:" + +#: comdlg32.rc:469 comdlg32.rc:495 +msgid "File &name:" +msgstr "" + +#: comdlg32.rc:473 comdlg32.rc:499 +msgid "Files of &type:" +msgstr "Ficheros de la &triba:" + +#: comdlg32.rc:476 comdlg32.rc:502 +msgid "Open as &read-only" +msgstr "Abrir como &namái llectura" + +#: comdlg32.rc:478 comdlg32.rc:504 comdlg32.rc:522 shdoclc.rc:127 shell32.rc:99 +msgid "&Open" +msgstr "&Abrir" + +#: comdlg32.rc:515 +msgid "File name:" +msgstr "" + +#: comdlg32.rc:518 +msgid "Files of type:" +msgstr "Ficheros de la triba:" + +#: comdlg32.rc:32 +msgid "File not found" +msgstr "Nun s'alcontró'l ficheru" + +#: comdlg32.rc:33 +msgid "Please verify that the correct file name was given" +msgstr "" + +#: comdlg32.rc:34 +msgid "" +"File does not exist.\n" +"Do you want to create file?" +msgstr "" +"El ficheru nun esiste.\n" +"¿Quies crealu?" + +#: comdlg32.rc:35 +msgid "" +"File already exists.\n" +"Do you want to replace it?" +msgstr "" +"Yá esiste'l ficheru.\n" +"¿Quies trocalu?" + +#: comdlg32.rc:36 +msgid "Invalid character(s) in path" +msgstr "" + +#: comdlg32.rc:37 +msgid "" +"A filename cannot contain any of the following characters:\n" +" / : < > |" +msgstr "" +"Un nome de ficheru nun pue contener dengún de los caráuteres de darréu:\n" +" / : < > |" + +#: comdlg32.rc:38 +msgid "Path does not exist" +msgstr "El camín nun esiste" + +#: comdlg32.rc:39 +msgid "File does not exist" +msgstr "El ficheru nun esiste" + +#: comdlg32.rc:40 +msgid "The selection contains a non-folder object" +msgstr "" + +#: comdlg32.rc:45 +msgid "Up One Level" +msgstr "Xubir un nivel" + +#: comdlg32.rc:46 +msgid "Create New Folder" +msgstr "Crear una carpeta nueva" + +#: comdlg32.rc:47 +msgid "List" +msgstr "" + +#: comdlg32.rc:48 cryptui.rc:201 +msgid "Details" +msgstr "" + +#: comdlg32.rc:49 +msgid "Browse to Desktop" +msgstr "Restolar hasta l'escritoriu" + +#: comdlg32.rc:113 +msgid "Regular" +msgstr "" + +#: comdlg32.rc:114 +msgid "Bold" +msgstr "Negrina" + +#: comdlg32.rc:115 +msgid "Italic" +msgstr "Cursiva" + +#: comdlg32.rc:116 +msgid "Bold Italic" +msgstr "Cursiva negrina" + +#: comdlg32.rc:121 wordpad.rc:125 +msgid "Black" +msgstr "" + +#: comdlg32.rc:122 wordpad.rc:126 +msgid "Maroon" +msgstr "" + +#: comdlg32.rc:123 wordpad.rc:127 +msgid "Green" +msgstr "" + +#: comdlg32.rc:124 wordpad.rc:128 +msgid "Olive" +msgstr "" + +#: comdlg32.rc:125 wordpad.rc:129 +msgid "Navy" +msgstr "" + +#: comdlg32.rc:126 wordpad.rc:130 +msgid "Purple" +msgstr "" + +#: comdlg32.rc:127 wordpad.rc:131 +msgid "Teal" +msgstr "" + +#: comdlg32.rc:128 wordpad.rc:132 +msgid "Gray" +msgstr "" + +#: comdlg32.rc:129 wordpad.rc:133 +msgid "Silver" +msgstr "" + +#: comdlg32.rc:130 wordpad.rc:134 +msgid "Red" +msgstr "" + +#: comdlg32.rc:131 wordpad.rc:135 +msgid "Lime" +msgstr "" + +#: comdlg32.rc:132 wordpad.rc:136 +msgid "Yellow" +msgstr "" + +#: comdlg32.rc:133 wordpad.rc:137 +msgid "Blue" +msgstr "" + +#: comdlg32.rc:134 wordpad.rc:138 +msgid "Fuchsia" +msgstr "" + +#: comdlg32.rc:135 wordpad.rc:139 +msgid "Aqua" +msgstr "" + +#: comdlg32.rc:136 wordpad.rc:140 +msgid "White" +msgstr "" + +#: comdlg32.rc:56 +msgid "Unreadable Entry" +msgstr "" + +#: comdlg32.rc:58 +msgid "" +"This value does not lie within the page range.\n" +"Please enter a value between %1!d! and %2!d!." +msgstr "" + +#: comdlg32.rc:60 +msgid "The 'from' entry cannot exceed the 'to' entry." +msgstr "" + +#: comdlg32.rc:62 +msgid "" +"Margins overlap or fall outside Paper boundaries.\n" +"Please reenter margins." +msgstr "" + +#: comdlg32.rc:64 +msgid "The 'Number of copies' field cannot be empty." +msgstr "El campu «Númberu de copies» nun pue tar baleru." + +#: comdlg32.rc:66 +msgid "" +"This large number of copies is not supported by your printer.\n" +"Please enter a value between 1 and %d." +msgstr "" +"Esti númberu grande de copies nun lu sofita la imprentadora.\n" +"Introduz un valor ente 1 y %d." + +#: comdlg32.rc:67 +msgid "A printer error occurred." +msgstr "" + +#: comdlg32.rc:68 +msgid "No default printer defined." +msgstr "" + +#: comdlg32.rc:69 +msgid "Cannot find the printer." +msgstr "Nun pue alcontrase la imprentadora." + +#: comdlg32.rc:70 progman.rc:76 +msgid "Out of memory." +msgstr "Ensin memoria." + +#: comdlg32.rc:71 +msgid "An error occurred." +msgstr "Asocedió un fallu." + +#: comdlg32.rc:72 +msgid "Unknown printer driver." +msgstr "" + +#: comdlg32.rc:75 +msgid "" +"Before you can perform printer-related tasks such as page setup or printing " +"a document, you need to install a printer. Please install one and retry." +msgstr "" + +#: comdlg32.rc:141 +msgid "Select a font size between %1!d! and %2!d! points." +msgstr "" + +#: comdlg32.rc:142 ieframe.rc:35 +msgid "&Save" +msgstr "&Guardar" + +#: comdlg32.rc:143 +msgid "Save &in:" +msgstr "" + +#: comdlg32.rc:144 +msgid "Save" +msgstr "" + +#: comdlg32.rc:146 +msgid "Open File" +msgstr "" + +#: comdlg32.rc:147 +msgid "Select Folder" +msgstr "" + +#: comdlg32.rc:148 +msgid "Font size has to be a number." +msgstr "El tamañu de fonte ha ser un númberu." + +#: comdlg32.rc:83 oleview.rc:98 +msgid "Ready" +msgstr "" + +#: comdlg32.rc:84 +msgid "Paused; " +msgstr "" + +#: comdlg32.rc:85 +msgid "Error; " +msgstr "Fallu; " + +#: comdlg32.rc:86 +msgid "Pending deletion; " +msgstr "" + +#: comdlg32.rc:87 +msgid "Paper jam; " +msgstr "" + +#: comdlg32.rc:88 +msgid "Out of paper; " +msgstr "" + +#: comdlg32.rc:89 +msgid "Feed paper manual; " +msgstr "" + +#: comdlg32.rc:90 +msgid "Paper problem; " +msgstr "" + +#: comdlg32.rc:91 +msgid "Printer offline; " +msgstr "" + +#: comdlg32.rc:92 +msgid "I/O Active; " +msgstr "" + +#: comdlg32.rc:93 +msgid "Busy; " +msgstr "" + +#: comdlg32.rc:94 +msgid "Printing; " +msgstr "" + +#: comdlg32.rc:95 +msgid "Output tray is full; " +msgstr "La bandexa de salida ta enllena;" + +#: comdlg32.rc:96 +msgid "Not available; " +msgstr "" + +#: comdlg32.rc:97 +msgid "Waiting; " +msgstr "Esperando;" + +#: comdlg32.rc:98 +msgid "Processing; " +msgstr "Procesando;" + +#: comdlg32.rc:99 +msgid "Initializing; " +msgstr "" + +#: comdlg32.rc:100 +msgid "Warming up; " +msgstr "" + +#: comdlg32.rc:101 +msgid "Toner low; " +msgstr "" + +#: comdlg32.rc:102 +msgid "No toner; " +msgstr "" + +#: comdlg32.rc:103 +msgid "Page punt; " +msgstr "" + +#: comdlg32.rc:104 +msgid "Interrupted by user; " +msgstr "" + +#: comdlg32.rc:105 +msgid "Out of memory; " +msgstr "Ensin memoria;" + +#: comdlg32.rc:106 +msgid "The printer door is open; " +msgstr "" + +#: comdlg32.rc:107 +msgid "Print server unknown; " +msgstr "" + +#: comdlg32.rc:108 +msgid "Power save mode; " +msgstr "" + +#: comdlg32.rc:77 +msgid "Default Printer; " +msgstr "" + +#: comdlg32.rc:78 +msgid "There are %d documents in the queue" +msgstr "Hai %d documentos na cola" + +#: comdlg32.rc:79 +msgid "Margins [inches]" +msgstr "" + +#: comdlg32.rc:80 +msgid "Margins [mm]" +msgstr "" + +#: comdlg32.rc:81 sane.rc:33 +msgctxt "unit: millimeters" +msgid "mm" +msgstr "mm" + +#: credui.rc:45 +msgid "&User name:" +msgstr "" + +#: credui.rc:48 cryptui.rc:402 +msgid "&Password:" +msgstr "&Contraseña:" + +#: credui.rc:50 +msgid "&Remember my password" +msgstr "" + +#: credui.rc:30 +msgid "Connect to %s" +msgstr "" + +#: credui.rc:31 +msgid "Connecting to %s" +msgstr "" + +#: credui.rc:32 +msgid "Logon unsuccessful" +msgstr "" + +#: credui.rc:33 +msgid "" +"Make sure that your user name\n" +"and password are correct." +msgstr "" + +#: credui.rc:35 +msgid "" +"Having Caps Lock on may cause you to enter your password incorrectly.\n" +"\n" +"Press the Caps Lock key on your keyboard to turn off Caps Lock before\n" +"entering your password." +msgstr "" + +#: credui.rc:34 +msgid "Caps Lock is On" +msgstr "" + +#: crypt32.rc:30 +msgid "Authority Key Identifier" +msgstr "" + +#: crypt32.rc:31 +msgid "Key Attributes" +msgstr "" + +#: crypt32.rc:32 +msgid "Key Usage Restriction" +msgstr "" + +#: crypt32.rc:33 +msgid "Subject Alternative Name" +msgstr "" + +#: crypt32.rc:34 +msgid "Issuer Alternative Name" +msgstr "" + +#: crypt32.rc:35 +msgid "Basic Constraints" +msgstr "" + +#: crypt32.rc:36 +msgid "Key Usage" +msgstr "" + +#: crypt32.rc:37 +msgid "Certificate Policies" +msgstr "" + +#: crypt32.rc:38 +msgid "Subject Key Identifier" +msgstr "" + +#: crypt32.rc:39 +msgid "CRL Reason Code" +msgstr "" + +#: crypt32.rc:40 +msgid "CRL Distribution Points" +msgstr "" + +#: crypt32.rc:41 +msgid "Enhanced Key Usage" +msgstr "" + +#: crypt32.rc:42 +msgid "Authority Information Access" +msgstr "" + +#: crypt32.rc:43 +msgid "Certificate Extensions" +msgstr "" + +#: crypt32.rc:44 +msgid "Next Update Location" +msgstr "" + +#: crypt32.rc:45 +msgid "Yes or No Trust" +msgstr "" + +#: crypt32.rc:46 +msgid "Email Address" +msgstr "" + +#: crypt32.rc:47 +msgid "Unstructured Name" +msgstr "" + +#: crypt32.rc:48 +msgid "Content Type" +msgstr "" + +#: crypt32.rc:49 +msgid "Message Digest" +msgstr "" + +#: crypt32.rc:50 +msgid "Signing Time" +msgstr "" + +#: crypt32.rc:51 +msgid "Counter Sign" +msgstr "" + +#: crypt32.rc:52 +msgid "Challenge Password" +msgstr "" + +#: crypt32.rc:53 +msgid "Unstructured Address" +msgstr "" + +#: crypt32.rc:54 +msgid "S/MIME Capabilities" +msgstr "" + +#: crypt32.rc:55 +msgid "Prefer Signed Data" +msgstr "" + +#: crypt32.rc:56 cryptdlg.rc:34 +msgctxt "Certification Practice Statement" +msgid "CPS" +msgstr "" + +#: crypt32.rc:57 cryptdlg.rc:35 +msgid "User Notice" +msgstr "" + +#: crypt32.rc:58 +msgid "On-line Certificate Status Protocol" +msgstr "" + +#: crypt32.rc:59 +msgid "Certification Authority Issuer" +msgstr "" + +#: crypt32.rc:60 +msgid "Certification Template Name" +msgstr "" + +#: crypt32.rc:61 +msgid "Certificate Type" +msgstr "" + +#: crypt32.rc:62 +msgid "Certificate Manifold" +msgstr "" + +#: crypt32.rc:63 +msgid "Netscape Cert Type" +msgstr "" + +#: crypt32.rc:64 +msgid "Netscape Base URL" +msgstr "" + +#: crypt32.rc:65 +msgid "Netscape Revocation URL" +msgstr "" + +#: crypt32.rc:66 +msgid "Netscape CA Revocation URL" +msgstr "" + +#: crypt32.rc:67 +msgid "Netscape Cert Renewal URL" +msgstr "" + +#: crypt32.rc:68 +msgid "Netscape CA Policy URL" +msgstr "" + +#: crypt32.rc:69 +msgid "Netscape SSL ServerName" +msgstr "" + +#: crypt32.rc:70 +msgid "Netscape Comment" +msgstr "" + +#: crypt32.rc:71 +msgid "Country/Region" +msgstr "País/rexón" + +#: crypt32.rc:72 +msgid "Organization" +msgstr "Organización" + +#: crypt32.rc:73 +msgid "Organizational Unit" +msgstr "" + +#: crypt32.rc:74 +msgid "Common Name" +msgstr "Nome común" + +#: crypt32.rc:75 +msgid "Locality" +msgstr "" + +#: crypt32.rc:76 +msgid "State or Province" +msgstr "Estáu o provincia" + +#: crypt32.rc:77 +msgid "Title" +msgstr "Títulu" + +#: crypt32.rc:78 +msgid "Given Name" +msgstr "" + +#: crypt32.rc:79 +msgid "Initials" +msgstr "Iniciales" + +#: crypt32.rc:80 +msgid "Surname" +msgstr "" + +#: crypt32.rc:81 +msgid "Domain Component" +msgstr "" + +#: crypt32.rc:82 +msgid "Street Address" +msgstr "" + +#: crypt32.rc:83 +msgid "Serial Number" +msgstr "" + +#: crypt32.rc:84 +msgid "CA Version" +msgstr "" + +#: crypt32.rc:85 +msgid "Cross CA Version" +msgstr "" + +#: crypt32.rc:86 +msgid "Serialized Signature Serial Number" +msgstr "" + +#: crypt32.rc:87 +msgid "Principal Name" +msgstr "Nome principal" + +#: crypt32.rc:88 +msgid "Windows Product Update" +msgstr "" + +#: crypt32.rc:89 +msgid "Enrollment Name Value Pair" +msgstr "" + +#: crypt32.rc:90 +msgid "OS Version" +msgstr "" + +#: crypt32.rc:91 +msgid "Enrollment CSP" +msgstr "" + +#: crypt32.rc:92 +msgid "CRL Number" +msgstr "Númberu CRL" + +#: crypt32.rc:93 +msgid "Delta CRL Indicator" +msgstr "" + +#: crypt32.rc:94 +msgid "Issuing Distribution Point" +msgstr "" + +#: crypt32.rc:95 +msgid "Freshest CRL" +msgstr "" + +#: crypt32.rc:96 +msgid "Name Constraints" +msgstr "" + +#: crypt32.rc:97 +msgid "Policy Mappings" +msgstr "" + +#: crypt32.rc:98 +msgid "Policy Constraints" +msgstr "" + +#: crypt32.rc:99 +msgid "Cross-Certificate Distribution Points" +msgstr "" + +#: crypt32.rc:100 +msgid "Application Policies" +msgstr "" + +#: crypt32.rc:101 +msgid "Application Policy Mappings" +msgstr "" + +#: crypt32.rc:102 +msgid "Application Policy Constraints" +msgstr "" + +#: crypt32.rc:103 +msgid "CMC Data" +msgstr "" + +#: crypt32.rc:104 +msgid "CMC Response" +msgstr "Rempuesta CMC" + +#: crypt32.rc:105 +msgid "Unsigned CMC Request" +msgstr "" + +#: crypt32.rc:106 +msgid "CMC Status Info" +msgstr "" + +#: crypt32.rc:107 +msgid "CMC Extensions" +msgstr "Estensiones CMC" + +#: crypt32.rc:108 +msgid "CMC Attributes" +msgstr "Atributos CMC" + +#: crypt32.rc:109 +msgid "PKCS 7 Data" +msgstr "" + +#: crypt32.rc:110 +msgid "PKCS 7 Signed" +msgstr "" + +#: crypt32.rc:111 +msgid "PKCS 7 Enveloped" +msgstr "" + +#: crypt32.rc:112 +msgid "PKCS 7 Signed Enveloped" +msgstr "" + +#: crypt32.rc:113 +msgid "PKCS 7 Digested" +msgstr "" + +#: crypt32.rc:114 +msgid "PKCS 7 Encrypted" +msgstr "" + +#: crypt32.rc:115 +msgid "Previous CA Certificate Hash" +msgstr "" + +#: crypt32.rc:116 +msgid "Virtual Base CRL Number" +msgstr "" + +#: crypt32.rc:117 +msgid "Next CRL Publish" +msgstr "" + +#: crypt32.rc:118 +msgid "CA Encryption Certificate" +msgstr "" + +#: crypt32.rc:119 cryptui.rc:148 +msgid "Key Recovery Agent" +msgstr "" + +#: crypt32.rc:120 +msgid "Certificate Template Information" +msgstr "" + +#: crypt32.rc:121 +msgid "Enterprise Root OID" +msgstr "" + +#: crypt32.rc:122 +msgid "Dummy Signer" +msgstr "Roblador maniquín" + +#: crypt32.rc:123 +msgid "Encrypted Private Key" +msgstr "" + +#: crypt32.rc:124 +msgid "Published CRL Locations" +msgstr "" + +#: crypt32.rc:125 +msgid "Enforce Certificate Chain Policy" +msgstr "" + +#: crypt32.rc:126 +msgid "Transaction Id" +msgstr "" + +#: crypt32.rc:127 +msgid "Sender Nonce" +msgstr "" + +#: crypt32.rc:128 +msgid "Recipient Nonce" +msgstr "" + +#: crypt32.rc:129 +msgid "Reg Info" +msgstr "" + +#: crypt32.rc:130 +msgid "Get Certificate" +msgstr "" + +#: crypt32.rc:131 +msgid "Get CRL" +msgstr "" + +#: crypt32.rc:132 +msgid "Revoke Request" +msgstr "" + +#: crypt32.rc:133 +msgid "Query Pending" +msgstr "" + +#: crypt32.rc:134 cryptui.rc:95 +msgid "Certificate Trust List" +msgstr "" + +#: crypt32.rc:135 +msgid "Archived Key Certificate Hash" +msgstr "" + +#: crypt32.rc:136 +msgid "Private Key Usage Period" +msgstr "" + +#: crypt32.rc:137 +msgid "Client Information" +msgstr "" + +#: crypt32.rc:138 +msgid "Server Authentication" +msgstr "" + +#: crypt32.rc:139 +msgid "Client Authentication" +msgstr "" + +#: crypt32.rc:140 +msgid "Code Signing" +msgstr "" + +#: crypt32.rc:141 +msgid "Secure Email" +msgstr "" + +#: crypt32.rc:142 +msgid "Time Stamping" +msgstr "" + +#: crypt32.rc:143 +msgid "Microsoft Trust List Signing" +msgstr "" + +#: crypt32.rc:144 +msgid "Microsoft Time Stamping" +msgstr "" + +#: crypt32.rc:145 +msgid "IP security end system" +msgstr "" + +#: crypt32.rc:146 +msgid "IP security tunnel termination" +msgstr "" + +#: crypt32.rc:147 +msgid "IP security user" +msgstr "" + +#: crypt32.rc:148 +msgid "Encrypting File System" +msgstr "" + +#: crypt32.rc:149 cryptui.rc:133 +msgid "Windows Hardware Driver Verification" +msgstr "" + +#: crypt32.rc:150 cryptui.rc:134 +msgid "Windows System Component Verification" +msgstr "" + +#: crypt32.rc:151 cryptui.rc:135 +msgid "OEM Windows System Component Verification" +msgstr "" + +#: crypt32.rc:152 cryptui.rc:136 +msgid "Embedded Windows System Component Verification" +msgstr "" + +#: crypt32.rc:153 cryptui.rc:143 +msgid "Key Pack Licenses" +msgstr "" + +#: crypt32.rc:154 cryptui.rc:144 +msgid "License Server Verification" +msgstr "" + +#: crypt32.rc:155 cryptui.rc:146 +msgid "Smart Card Logon" +msgstr "" + +#: crypt32.rc:156 cryptui.rc:142 +msgid "Digital Rights" +msgstr "Drechos dixitales" + +#: crypt32.rc:157 cryptui.rc:138 +msgid "Qualified Subordination" +msgstr "" + +#: crypt32.rc:158 cryptui.rc:139 +msgid "Key Recovery" +msgstr "" + +#: crypt32.rc:159 cryptui.rc:140 +msgid "Document Signing" +msgstr "" + +#: crypt32.rc:160 +msgid "IP security IKE intermediate" +msgstr "" + +#: crypt32.rc:161 cryptui.rc:132 +msgid "File Recovery" +msgstr "" + +#: crypt32.rc:162 cryptui.rc:137 +msgid "Root List Signer" +msgstr "" + +#: crypt32.rc:163 +msgid "All application policies" +msgstr "" + +#: crypt32.rc:164 cryptui.rc:149 +msgid "Directory Service Email Replication" +msgstr "" + +#: crypt32.rc:165 cryptui.rc:145 +msgid "Certificate Request Agent" +msgstr "" + +#: crypt32.rc:166 cryptui.rc:141 +msgid "Lifetime Signing" +msgstr "" + +#: crypt32.rc:167 +msgid "All issuance policies" +msgstr "" + +#: crypt32.rc:172 +msgid "Trusted Root Certification Authorities" +msgstr "" + +#: crypt32.rc:173 +msgid "Personal" +msgstr "Personal" + +#: crypt32.rc:174 +msgid "Intermediate Certification Authorities" +msgstr "" + +#: crypt32.rc:175 +msgid "Other People" +msgstr "" + +#: crypt32.rc:176 +msgid "Trusted Publishers" +msgstr "Espublizadores d'enfotu" + +#: crypt32.rc:177 +msgid "Untrusted Certificates" +msgstr "" + +#: crypt32.rc:182 +msgid "KeyID=" +msgstr "" + +#: crypt32.rc:183 +msgid "Certificate Issuer" +msgstr "" + +#: crypt32.rc:184 +msgid "Certificate Serial Number=" +msgstr "" + +#: crypt32.rc:185 +msgid "Other Name=" +msgstr "Otru nome=" + +#: crypt32.rc:186 +msgid "Email Address=" +msgstr "" + +#: crypt32.rc:187 +msgid "DNS Name=" +msgstr "" + +#: crypt32.rc:188 +msgid "Directory Address" +msgstr "" + +#: crypt32.rc:189 +msgid "URL=" +msgstr "URL=" + +#: crypt32.rc:190 +msgid "IP Address=" +msgstr "Direición IP=" + +#: crypt32.rc:191 +msgid "Mask=" +msgstr "" + +#: crypt32.rc:192 +msgid "Registered ID=" +msgstr "" + +#: crypt32.rc:193 +msgid "Unknown Key Usage" +msgstr "" + +#: crypt32.rc:194 +msgid "Subject Type=" +msgstr "" + +#: crypt32.rc:195 +msgctxt "Certificate Authority" +msgid "CA" +msgstr "" + +#: crypt32.rc:196 +msgid "End Entity" +msgstr "" + +#: crypt32.rc:197 +msgid "Path Length Constraint=" +msgstr "" + +#: crypt32.rc:198 +msgctxt "path length" +msgid "None" +msgstr "" + +#: crypt32.rc:199 +msgid "Information Not Available" +msgstr "" + +#: crypt32.rc:200 +msgid "Authority Info Access" +msgstr "" + +#: crypt32.rc:201 +msgid "Access Method=" +msgstr "" + +#: crypt32.rc:202 +msgctxt "Online Certificate Status Protocol" +msgid "OCSP" +msgstr "OCSP" + +#: crypt32.rc:203 +msgid "CA Issuers" +msgstr "" + +#: crypt32.rc:204 +msgid "Unknown Access Method" +msgstr "" + +#: crypt32.rc:205 +msgid "Alternative Name" +msgstr "" + +#: crypt32.rc:206 +msgid "CRL Distribution Point" +msgstr "" + +#: crypt32.rc:207 +msgid "Distribution Point Name" +msgstr "" + +#: crypt32.rc:208 +msgid "Full Name" +msgstr "Nome completu" + +#: crypt32.rc:209 +msgid "RDN Name" +msgstr "" + +#: crypt32.rc:210 +msgid "CRL Reason=" +msgstr "" + +#: crypt32.rc:211 +msgid "CRL Issuer" +msgstr "" + +#: crypt32.rc:212 +msgid "Key Compromise" +msgstr "" + +#: crypt32.rc:213 +msgid "CA Compromise" +msgstr "" + +#: crypt32.rc:214 +msgid "Affiliation Changed" +msgstr "" + +#: crypt32.rc:215 +msgid "Superseded" +msgstr "" + +#: crypt32.rc:216 +msgid "Operation Ceased" +msgstr "" + +#: crypt32.rc:217 +msgid "Certificate Hold" +msgstr "" + +#: crypt32.rc:218 +msgid "Financial Information=" +msgstr "Información financiera=" + +#: crypt32.rc:219 taskmgr.rc:397 +msgid "Available" +msgstr "" + +#: crypt32.rc:220 +msgid "Not Available" +msgstr "" + +#: crypt32.rc:221 +msgid "Meets Criteria=" +msgstr "" + +#: crypt32.rc:222 cryptui.rc:166 oleaut32.rc:32 wininet.rc:83 ipconfig.rc:47 +msgid "Yes" +msgstr "Sí" + +#: crypt32.rc:223 cryptui.rc:167 oleaut32.rc:33 wininet.rc:84 ipconfig.rc:48 +msgid "No" +msgstr "Non" + +#: crypt32.rc:224 +msgid "Digital Signature" +msgstr "Robla dixital" + +#: crypt32.rc:225 +msgid "Non-Repudiation" +msgstr "" + +#: crypt32.rc:226 +msgid "Key Encipherment" +msgstr "" + +#: crypt32.rc:227 +msgid "Data Encipherment" +msgstr "" + +#: crypt32.rc:228 +msgid "Key Agreement" +msgstr "" + +#: crypt32.rc:229 +msgid "Certificate Signing" +msgstr "" + +#: crypt32.rc:230 +msgid "Off-line CRL Signing" +msgstr "" + +#: crypt32.rc:231 +msgid "CRL Signing" +msgstr "" + +#: crypt32.rc:232 +msgid "Encipher Only" +msgstr "" + +#: crypt32.rc:233 +msgid "Decipher Only" +msgstr "" + +#: crypt32.rc:234 +msgid "SSL Client Authentication" +msgstr "" + +#: crypt32.rc:235 +msgid "SSL Server Authentication" +msgstr "" + +#: crypt32.rc:236 +msgid "S/MIME" +msgstr "S/MIME" + +#: crypt32.rc:237 +msgid "Signature" +msgstr "" + +#: crypt32.rc:238 +msgid "SSL CA" +msgstr "" + +#: crypt32.rc:239 +msgid "S/MIME CA" +msgstr "" + +#: crypt32.rc:240 +msgid "Signature CA" +msgstr "" + +#: cryptdlg.rc:30 +msgid "Certificate Policy" +msgstr "" + +#: cryptdlg.rc:31 +msgid "Policy Identifier: " +msgstr "" + +#: cryptdlg.rc:32 +msgid "Policy Qualifier Info" +msgstr "" + +#: cryptdlg.rc:33 +msgid "Policy Qualifier Id=" +msgstr "" + +#: cryptdlg.rc:36 +msgid "Qualifier" +msgstr "" + +#: cryptdlg.rc:37 +msgid "Notice Reference" +msgstr "" + +#: cryptdlg.rc:38 +msgid "Organization=" +msgstr "Organización=" + +#: cryptdlg.rc:39 +msgid "Notice Number=" +msgstr "" + +#: cryptdlg.rc:40 +msgid "Notice Text=" +msgstr "" + +#: cryptui.rc:185 cryptui.rc:240 inetcpl.rc:46 shell32.rc:348 shell32.rc:377 +msgid "General" +msgstr "Xeneral" + +#: cryptui.rc:196 +msgid "&Install Certificate..." +msgstr "" + +#: cryptui.rc:197 +msgid "Issuer &Statement" +msgstr "" + +#: cryptui.rc:205 +msgid "&Show:" +msgstr "" + +#: cryptui.rc:210 +msgid "&Edit Properties..." +msgstr "" + +#: cryptui.rc:211 +msgid "&Copy to File..." +msgstr "" + +#: cryptui.rc:215 +msgid "Certification Path" +msgstr "" + +#: cryptui.rc:219 +msgid "Certification path" +msgstr "" + +#: cryptui.rc:222 cryptui.rc:464 +msgid "&View Certificate" +msgstr "" + +#: cryptui.rc:223 +msgid "Certificate &status:" +msgstr "" + +#: cryptui.rc:229 +msgid "Disclaimer" +msgstr "" + +#: cryptui.rc:236 +msgid "More &Info" +msgstr "Más &información" + +#: cryptui.rc:244 +msgid "&Friendly name:" +msgstr "Nome &amigable:" + +#: cryptui.rc:246 progman.rc:154 progman.rc:170 +msgid "&Description:" +msgstr "&Descripción:" + +#: cryptui.rc:248 +msgid "Certificate purposes" +msgstr "" + +#: cryptui.rc:249 +msgid "&Enable all purposes for this certificate" +msgstr "" + +#: cryptui.rc:251 +msgid "D&isable all purposes for this certificate" +msgstr "" + +#: cryptui.rc:253 +msgid "Enable &only the following purposes for this certificate:" +msgstr "" + +#: cryptui.rc:258 +msgid "Add &Purpose..." +msgstr "" + +#: cryptui.rc:262 +msgid "Add Purpose" +msgstr "" + +#: cryptui.rc:265 +msgid "" +"Add the object identifier (OID) for the certificate purpose you wish to add:" +msgstr "" + +#: cryptui.rc:273 cryptui.rc:69 +msgid "Select Certificate Store" +msgstr "" + +#: cryptui.rc:276 +msgid "Select the certificate store you want to use:" +msgstr "" + +#: cryptui.rc:279 +msgid "&Show physical stores" +msgstr "" + +#: cryptui.rc:285 cryptui.rc:296 cryptui.rc:313 cryptui.rc:327 cryptui.rc:71 +msgid "Certificate Import Wizard" +msgstr "Encontu pa la importación de certificaos" + +#: cryptui.rc:288 +msgid "Welcome to the Certificate Import Wizard" +msgstr "Afáyate nel encontu pa la importación de certificaos" + +#: cryptui.rc:291 +msgid "" +"This wizard helps you import certificates, certificate revocation lists, and " +"certificate trust lists from a file to a certificate store.\n" +"\n" +"A certificate can be used to identify you or the computer with which you are " +"communicating. It can also be used for authentication, and to sign messages. " +"Certificate stores are collections of certificates, certificate revocation " +"lists, and certificate trust lists.\n" +"\n" +"To continue, click Next." +msgstr "" + +#: cryptui.rc:299 cryptui.rc:435 +msgid "&File name:" +msgstr "" + +#: cryptui.rc:301 cryptui.rc:323 cryptui.rc:437 winecfg.rc:313 +msgid "B&rowse..." +msgstr "R&estolar..." + +#: cryptui.rc:302 +msgid "" +"Note: The following file formats may contain more than one certificate, " +"certificate revocation list, or certificate trust list:" +msgstr "" + +#: cryptui.rc:304 +msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" +msgstr "" + +#: cryptui.rc:306 +msgid "Personal Information Exchange/PKCS #12 (*.pfx; *.p12)" +msgstr "" + +#: cryptui.rc:308 cryptui.rc:81 cryptui.rc:162 +msgid "Microsoft Serialized Certificate Store (*.sst)" +msgstr "" + +#: cryptui.rc:316 +msgid "" +"Wine can automatically select the certificate store, or you can specify a " +"location for the certificates." +msgstr "" + +#: cryptui.rc:318 +msgid "&Automatically select certificate store" +msgstr "" + +#: cryptui.rc:320 +msgid "&Place all certificates in the following store:" +msgstr "" + +#: cryptui.rc:330 +msgid "Completing the Certificate Import Wizard" +msgstr "" + +#: cryptui.rc:332 +msgid "You have successfully completed the Certificate Import Wizard." +msgstr "" + +#: cryptui.rc:334 cryptui.rc:448 +msgid "You have specified the following settings:" +msgstr "" + +#: cryptui.rc:342 cryptui.rc:122 inetcpl.rc:111 +msgid "Certificates" +msgstr "Certificaos" + +#: cryptui.rc:345 +msgid "I&ntended purpose:" +msgstr "" + +#: cryptui.rc:349 +msgid "&Import..." +msgstr "&Importar..." + +#: cryptui.rc:350 regedit.rc:91 regedit.rc:112 +msgid "&Export..." +msgstr "&Esportar..." + +#: cryptui.rc:352 +msgid "&Advanced..." +msgstr "" + +#: cryptui.rc:353 +msgid "Certificate intended purposes" +msgstr "" + +#: cryptui.rc:355 ieframe.rc:45 shell32.rc:43 shell32.rc:120 oleview.rc:59 +#: oleview.rc:61 oleview.rc:85 regedit.rc:64 taskmgr.rc:52 winefile.rc:48 +#: wordpad.rc:69 +msgid "&View" +msgstr "" + +#: cryptui.rc:360 +msgid "Advanced Options" +msgstr "Opciones avanzaes" + +#: cryptui.rc:363 +msgid "Certificate purpose" +msgstr "" + +#: cryptui.rc:364 +msgid "" +"Select one or more purposes to be listed when Advanced Purposes is selected." +msgstr "" + +#: cryptui.rc:366 +msgid "&Certificate purposes:" +msgstr "" + +#: cryptui.rc:375 cryptui.rc:386 cryptui.rc:399 cryptui.rc:409 cryptui.rc:432 +#: cryptui.rc:441 cryptui.rc:150 +msgid "Certificate Export Wizard" +msgstr "Encontu pa la esportación de certificaos" + +#: cryptui.rc:378 +msgid "Welcome to the Certificate Export Wizard" +msgstr "Afáyate nel encontu pa la esportación de certificaos" + +#: cryptui.rc:381 +msgid "" +"This wizard helps you export certificates, certificate revocation lists, and " +"certificate trust lists from a certificate store to a file.\n" +"\n" +"A certificate can be used to identify you or the computer with which you are " +"communicating. It can also be used for authentication, and to sign messages. " +"Certificate stores are collections of certificates, certificate revocation " +"lists, and certificate trust lists.\n" +"\n" +"To continue, click Next." +msgstr "" + +#: cryptui.rc:389 +msgid "" +"If you choose to export the private key, you will be prompted for a password " +"to protect the private key on a later page." +msgstr "" + +#: cryptui.rc:390 +msgid "Do you wish to export the private key?" +msgstr "¿Deseyes esportar la clave privada?" + +#: cryptui.rc:391 +msgid "&Yes, export the private key" +msgstr "" + +#: cryptui.rc:393 +msgid "N&o, do not export the private key" +msgstr "" + +#: cryptui.rc:404 +msgid "&Confirm password:" +msgstr "" + +#: cryptui.rc:412 +msgid "Select the format you want to use:" +msgstr "" + +#: cryptui.rc:413 +msgid "&DER-encoded X.509 (*.cer)" +msgstr "" + +#: cryptui.rc:415 +msgid "Ba&se64-encoded X.509 (*.cer):" +msgstr "" + +#: cryptui.rc:417 +msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" +msgstr "" + +#: cryptui.rc:419 +msgid "&Include all certificates in the certification path if possible" +msgstr "" + +#: cryptui.rc:421 +msgid "&Personal Information Exchange/PKCS #12 (*.pfx)" +msgstr "" + +#: cryptui.rc:423 +msgid "Incl&ude all certificates in the certification path if possible" +msgstr "" + +#: cryptui.rc:425 +msgid "&Enable strong encryption" +msgstr "" + +#: cryptui.rc:427 +msgid "Delete the private &key if the export is successful" +msgstr "" + +#: cryptui.rc:444 +msgid "Completing the Certificate Export Wizard" +msgstr "" + +#: cryptui.rc:446 +msgid "You have successfully completed the Certificate Export Wizard." +msgstr "" + +#: cryptui.rc:456 cryptui.rc:179 +msgid "Select Certificate" +msgstr "" + +#: cryptui.rc:459 +msgid "Select a certificate you want to use" +msgstr "" + +#: cryptui.rc:30 cryptui.rc:93 +msgid "Certificate" +msgstr "" + +#: cryptui.rc:31 +msgid "Certificate Information" +msgstr "" + +#: cryptui.rc:32 +msgid "" +"This certificate has an invalid signature. The certificate may have been " +"altered or corrupted." +msgstr "" + +#: cryptui.rc:33 +msgid "" +"This root certificate is not trusted. To trust it, add it to your system's " +"trusted root certificate store." +msgstr "" + +#: cryptui.rc:34 +msgid "This certificate could not be validated to a trusted root certificate." +msgstr "" + +#: cryptui.rc:35 +msgid "This certificate's issuer could not be found." +msgstr "" + +#: cryptui.rc:36 +msgid "All the intended purposes of this certificate could not be verified." +msgstr "" + +#: cryptui.rc:37 +msgid "This certificate is intended for the following purposes:" +msgstr "" + +#: cryptui.rc:38 +msgid "Issued to: " +msgstr "" + +#: cryptui.rc:39 +msgid "Issued by: " +msgstr "" + +#: cryptui.rc:40 +msgid "Valid from " +msgstr "" + +#: cryptui.rc:41 +msgid " to " +msgstr "" + +#: cryptui.rc:42 +msgid "This certificate has an invalid signature." +msgstr "Esti certificáu nun tien una robla que nun ye válida." + +#: cryptui.rc:43 +msgid "This certificate has expired or is not yet valid." +msgstr "Esti certificáu caducó o entá nun ye válidu." + +#: cryptui.rc:44 +msgid "This certificate's validity period exceeds that of its issuer." +msgstr "" + +#: cryptui.rc:45 +msgid "This certificate was revoked by its issuer." +msgstr "" + +#: cryptui.rc:46 +msgid "This certificate is OK." +msgstr "" + +#: cryptui.rc:47 +msgid "Field" +msgstr "Campu" + +#: cryptui.rc:48 +msgid "Value" +msgstr "" + +#: cryptui.rc:49 cryptui.rc:102 cryptui.rc:108 +msgid "<All>" +msgstr "" + +#: cryptui.rc:50 +msgid "Version 1 Fields Only" +msgstr "" + +#: cryptui.rc:51 +msgid "Extensions Only" +msgstr "" + +#: cryptui.rc:52 +msgid "Critical Extensions Only" +msgstr "" + +#: cryptui.rc:53 +msgid "Properties Only" +msgstr "" + +#: cryptui.rc:55 +msgid "Serial number" +msgstr "" + +#: cryptui.rc:56 +msgid "Issuer" +msgstr "" + +#: cryptui.rc:57 +msgid "Valid from" +msgstr "" + +#: cryptui.rc:58 +msgid "Valid to" +msgstr "" + +#: cryptui.rc:59 +msgid "Subject" +msgstr "" + +#: cryptui.rc:60 +msgid "Public key" +msgstr "Clave pública" + +#: cryptui.rc:61 +msgid "%1 (%2!d! bits)" +msgstr "" + +#: cryptui.rc:62 +msgid "SHA1 hash" +msgstr "" + +#: cryptui.rc:63 +msgid "Enhanced key usage (property)" +msgstr "" + +#: cryptui.rc:64 +msgid "Friendly name" +msgstr "" + +#: cryptui.rc:65 shell32.rc:242 ipconfig.rc:44 +msgid "Description" +msgstr "Descripción" + +#: cryptui.rc:66 +msgid "Certificate Properties" +msgstr "" + +#: cryptui.rc:67 +msgid "Please enter an OID in the form 1.2.3.4" +msgstr "" + +#: cryptui.rc:68 +msgid "The OID you entered already exists." +msgstr "" + +#: cryptui.rc:70 +msgid "Please select a certificate store." +msgstr "" + +#: cryptui.rc:72 +msgid "" +"The file contains objects that do not match the given criteria. Please " +"select another file." +msgstr "" + +#: cryptui.rc:73 +msgid "File to Import" +msgstr "Ficheru a importar" + +#: cryptui.rc:74 +msgid "Specify the file you want to import." +msgstr "" + +#: cryptui.rc:75 cryptui.rc:98 +msgid "Certificate Store" +msgstr "" + +#: cryptui.rc:76 +msgid "" +"Certificate stores are collections of certificates, certificate revocation " +"lists, and certificate trust lists." +msgstr "" + +#: cryptui.rc:77 +msgid "X.509 Certificate (*.cer; *.crt)" +msgstr "Certificáu X.509 (*.cer; *.crt)" + +#: cryptui.rc:78 +msgid "Personal Information Exchange (*.pfx; *.p12)" +msgstr "" + +#: cryptui.rc:79 cryptui.rc:158 +msgid "Certificate Revocation List (*.crl)" +msgstr "" + +#: cryptui.rc:80 cryptui.rc:159 +msgid "Certificate Trust List (*.stl)" +msgstr "" + +#: cryptui.rc:82 +msgid "CMS/PKCS #7 Messages (*.spc; *.p7b)" +msgstr "" + +#: cryptui.rc:84 +msgid "Please select a file." +msgstr "" + +#: cryptui.rc:85 +msgid "The file format is not recognized. Please select another file." +msgstr "" + +#: cryptui.rc:86 +msgid "Could not open " +msgstr "" + +#: cryptui.rc:87 +msgid "Determined by the program" +msgstr "" + +#: cryptui.rc:88 +msgid "Please select a store" +msgstr "" + +#: cryptui.rc:89 +msgid "Certificate Store Selected" +msgstr "" + +#: cryptui.rc:90 +msgid "Automatically determined by the program" +msgstr "" + +#: cryptui.rc:91 shell32.rc:137 +msgid "File" +msgstr "" + +#: cryptui.rc:92 inetcpl.rc:108 +msgid "Content" +msgstr "Conteníu" + +#: cryptui.rc:94 +msgid "Certificate Revocation List" +msgstr "" + +#: cryptui.rc:96 +msgid "CMS/PKCS #7 Message" +msgstr "" + +#: cryptui.rc:97 +msgid "Personal Information Exchange" +msgstr "" + +#: cryptui.rc:99 +msgid "The import was successful." +msgstr "La importación tuvo ésitu." + +#: cryptui.rc:100 +msgid "The import failed." +msgstr "Falló la importación." + +#: cryptui.rc:101 +msgid "Arial" +msgstr "" + +#: cryptui.rc:103 +msgid "<Advanced Purposes>" +msgstr "" + +#: cryptui.rc:104 +msgid "Issued To" +msgstr "" + +#: cryptui.rc:105 +msgid "Issued By" +msgstr "" + +#: cryptui.rc:106 +msgid "Expiration Date" +msgstr "Data de caducidá" + +#: cryptui.rc:107 +msgid "Friendly Name" +msgstr "" + +#: cryptui.rc:109 cryptui.rc:123 +msgid "<None>" +msgstr "" + +#: cryptui.rc:110 +msgid "" +"You will no longer be able to decrypt messages with this certificate, or " +"sign messages with it.\n" +"Are you sure you want to remove this certificate?" +msgstr "" + +#: cryptui.rc:111 +msgid "" +"You will no longer be able to decrypt messages with these certificates, or " +"sign messages with them.\n" +"Are you sure you want to remove these certificates?" +msgstr "" + +#: cryptui.rc:112 +msgid "" +"You will no longer be able to encrypt messages with this certificate, or " +"verify messages signed with it.\n" +"Are you sure you want to remove this certificate?" +msgstr "" + +#: cryptui.rc:113 +msgid "" +"You will no longer be able to encrypt messages with these certificates, or " +"verify messages signed with them.\n" +"Are you sure you want to remove these certificates?" +msgstr "" + +#: cryptui.rc:114 +msgid "" +"Certificates issued by this certification authority will no longer be " +"trusted.\n" +"Are you sure you want to remove this certificate?" +msgstr "" + +#: cryptui.rc:115 +msgid "" +"Certificates issued by these certification authorities will no longer be " +"trusted.\n" +"Are you sure you want to remove these certificates?" +msgstr "" + +#: cryptui.rc:116 +msgid "" +"Certificates issued by this root certification authority, or any " +"certification authorities it issued, will no longer be trusted.\n" +"Are you sure you want to remove this trusted root certificate?" +msgstr "" + +#: cryptui.rc:117 +msgid "" +"Certificates issued by these root certification authorities, or any " +"certification authorities they issued, will no longer be trusted.\n" +"Are you sure you want to remove these trusted root certificates?" +msgstr "" + +#: cryptui.rc:118 +msgid "" +"Software signed by this publisher will no longer be trusted.\n" +"Are you sure you want to remove this certificate?" +msgstr "" + +#: cryptui.rc:119 +msgid "" +"Software signed by these publishers will no longer be trusted.\n" +"Are you sure you want to remove these certificates?" +msgstr "" + +#: cryptui.rc:120 +msgid "Are you sure you want to remove this certificate?" +msgstr "¿De xuru que quies desaniciar esti certificáu?" + +#: cryptui.rc:121 +msgid "Are you sure you want to remove these certificates?" +msgstr "¿De xuru que quies desaniciar estos certificaos?" + +#: cryptui.rc:124 +msgid "Ensures the identity of a remote computer" +msgstr "" + +#: cryptui.rc:125 +msgid "Proves your identity to a remote computer" +msgstr "" + +#: cryptui.rc:126 +msgid "" +"Ensures software came from software publisher\n" +"Protects software from alteration after publication" +msgstr "" + +#: cryptui.rc:127 +msgid "Protects e-mail messages" +msgstr "" + +#: cryptui.rc:128 +msgid "Allows secure communication over the Internet" +msgstr "" + +#: cryptui.rc:129 +msgid "Allows data to be signed with the current time" +msgstr "Permite que los datos se roblen cola hora actual" + +#: cryptui.rc:130 +msgid "Allows you to digitally sign a certificate trust list" +msgstr "" + +#: cryptui.rc:131 +msgid "Allows data on disk to be encrypted" +msgstr "" + +#: cryptui.rc:147 +msgid "Private Key Archival" +msgstr "" + +#: cryptui.rc:151 +msgid "Export Format" +msgstr "" + +#: cryptui.rc:152 +msgid "Choose the format in which the content will be saved." +msgstr "Escueyi'l formatu nel que va guardase'l conteníu." + +#: cryptui.rc:153 +msgid "Export Filename" +msgstr "" + +#: cryptui.rc:154 +msgid "Specify the name of the file in which the content will be saved." +msgstr "" + +#: cryptui.rc:155 +msgid "The specified file already exists. Do you want to replace it?" +msgstr "Yá esiste'l ficheru especificáu. ¿Quies trocalu?" + +#: cryptui.rc:156 +msgid "DER-Encoded Binary X.509 (*.cer)" +msgstr "" + +#: cryptui.rc:157 +msgid "Base64-Encoded X.509 (*.cer)" +msgstr "" + +#: cryptui.rc:160 +msgid "CMS/PKCS #7 Messages (*.p7b)" +msgstr "" + +#: cryptui.rc:161 +msgid "Personal Information Exchange (*.pfx)" +msgstr "" + +#: cryptui.rc:163 +msgid "File Format" +msgstr "" + +#: cryptui.rc:164 +msgid "Include all certificates in certificate path" +msgstr "" + +#: cryptui.rc:165 +msgid "Export keys" +msgstr "" + +#: cryptui.rc:168 +msgid "The export was successful." +msgstr "La esportación tuvo esitu." + +#: cryptui.rc:169 +msgid "The export failed." +msgstr "Falló la esportación." + +#: cryptui.rc:170 +msgid "Export Private Key" +msgstr "" + +#: cryptui.rc:171 +msgid "" +"The certificate contains a private key which may be exported along with the " +"certificate." +msgstr "" + +#: cryptui.rc:172 +msgid "Enter Password" +msgstr "" + +#: cryptui.rc:173 +msgid "You may password-protect a private key." +msgstr "" + +#: cryptui.rc:174 +msgid "The passwords do not match." +msgstr "Les contraseñes nun concasen." + +#: cryptui.rc:175 +msgid "Note: The private key for this certificate could not be opened." +msgstr "Nota: Nun pudo abrise la clave privada d'esti certificáu." + +#: cryptui.rc:176 +msgid "Note: The private key for this certificate is not exportable." +msgstr "" + +#: cryptui.rc:177 +msgid "Intended Use" +msgstr "" + +#: cryptui.rc:178 shell32.rc:152 +msgid "Location" +msgstr "Allugamientu" + +#: cryptui.rc:180 +msgid "Select a certificate" +msgstr "" + +#: cryptui.rc:181 winefile.rc:102 winhlp32.rc:110 winhlp32.rc:85 +msgid "Not yet implemented" +msgstr "Entá nun s'implementó" + +#: dinput.rc:34 +msgid "Configure Devices" +msgstr "" + +#: dinput.rc:39 +msgid "Reset" +msgstr "" + +#: dinput.rc:42 +msgid "Player" +msgstr "" + +#: dinput.rc:43 winecfg.rc:89 +msgid "Device" +msgstr "Preséu" + +#: dinput.rc:44 +msgid "Actions" +msgstr "Aiciones" + +#: dinput.rc:45 +msgid "Mapping" +msgstr "" + +#: dinput.rc:47 +msgid "Show Assigned First" +msgstr "" + +#: dinput.rc:28 +msgid "Action" +msgstr "Aición" + +#: dinput.rc:29 +msgid "Object" +msgstr "Oxetu" + +#: dxdiagn.rc:28 +msgid "Regional Setting" +msgstr "Axuste rexonal" + +#: dxdiagn.rc:29 +msgid "%1!u!MB used, %2!u!MB available" +msgstr "" + +#: gdi32.rc:28 +msgid "Western" +msgstr "" + +#: gdi32.rc:29 +msgid "Central European" +msgstr "" + +#: gdi32.rc:30 +msgid "Cyrillic" +msgstr "" + +#: gdi32.rc:31 +msgid "Greek" +msgstr "" + +#: gdi32.rc:32 +msgid "Turkish" +msgstr "" + +#: gdi32.rc:33 +msgid "Hebrew" +msgstr "" + +#: gdi32.rc:34 +msgid "Arabic" +msgstr "" + +#: gdi32.rc:35 +msgid "Baltic" +msgstr "" + +#: gdi32.rc:36 +msgid "Vietnamese" +msgstr "" + +#: gdi32.rc:37 +msgid "Thai" +msgstr "" + +#: gdi32.rc:38 +msgid "Japanese" +msgstr "" + +#: gdi32.rc:39 +msgid "CHINESE_GB2312" +msgstr "CHINESE_GB2312" + +#: gdi32.rc:40 +msgid "Hangul" +msgstr "Hangul" + +#: gdi32.rc:41 +msgid "CHINESE_BIG5" +msgstr "CHINESE_BIG5" + +#: gdi32.rc:42 +msgid "Hangul(Johab)" +msgstr "" + +#: gdi32.rc:43 +msgid "Symbol" +msgstr "Símbolu" + +#: gdi32.rc:44 +msgid "OEM/DOS" +msgstr "OEM/DOS" + +#: gdi32.rc:45 wldap32.rc:112 +msgid "Other" +msgstr "" + +#: gphoto2.rc:30 +msgid "Files on Camera" +msgstr "" + +#: gphoto2.rc:34 +msgid "Import Selected" +msgstr "" + +#: gphoto2.rc:35 +msgid "Preview" +msgstr "" + +#: gphoto2.rc:36 +msgid "Import All" +msgstr "" + +#: gphoto2.rc:37 +msgid "Skip This Dialog" +msgstr "" + +#: gphoto2.rc:38 +msgid "Exit" +msgstr "" + +#: gphoto2.rc:43 +msgid "Transferring" +msgstr "" + +#: gphoto2.rc:46 +msgid "Transferring... Please Wait" +msgstr "Tresfiriendo... Espera" + +#: gphoto2.rc:51 +msgid "Connecting to camera" +msgstr "" + +#: gphoto2.rc:55 +msgid "Connecting to camera... Please Wait" +msgstr "" + +#: hhctrl.rc:59 +msgid "S&ync" +msgstr "S&incronizar" + +#: hhctrl.rc:60 hhctrl.rc:73 shdoclc.rc:41 winhlp32.rc:89 +msgid "&Back" +msgstr "" + +#: hhctrl.rc:61 hhctrl.rc:74 +msgid "&Forward" +msgstr "" + +#: hhctrl.rc:62 +msgctxt "table of contents" +msgid "&Home" +msgstr "" + +#: hhctrl.rc:63 +msgid "&Stop" +msgstr "" + +#: hhctrl.rc:64 hhctrl.rc:81 shdoclc.rc:59 +msgid "&Refresh" +msgstr "" + +#: hhctrl.rc:65 hhctrl.rc:80 winhlp32.rc:34 +msgid "&Print..." +msgstr "" + +#: hhctrl.rc:76 hhctrl.rc:90 shdoclc.rc:49 shdoclc.rc:98 shdoclc.rc:120 +#: user32.rc:65 +msgid "Select &All" +msgstr "" + +#: hhctrl.rc:78 shdoclc.rc:54 +msgid "&View Source" +msgstr "" + +#: hhctrl.rc:83 +msgid "Proper&ties" +msgstr "Propie&daes" + +#: hhctrl.rc:87 shdoclc.rc:79 shdoclc.rc:93 shdoclc.rc:117 shdoclc.rc:159 +#: shdoclc.rc:183 user32.rc:60 wordpad.rc:112 +msgid "Cu&t" +msgstr "Cor&tar" + +#: hhctrl.rc:88 shdoclc.rc:80 shdoclc.rc:94 shdoclc.rc:118 shdoclc.rc:133 +#: shdoclc.rc:160 shdoclc.rc:184 shell32.rc:102 user32.rc:61 wineconsole.rc:32 +#: winhlp32.rc:40 wordpad.rc:113 +msgid "&Copy" +msgstr "&Copiar" + +#: hhctrl.rc:89 shdoclc.rc:119 shell32.rc:64 +msgid "Paste" +msgstr "Apegar" + +#: hhctrl.rc:91 shdoclc.rc:121 +msgid "&Print" +msgstr "&Imprentar" + +#: hhctrl.rc:31 taskmgr.rc:89 +msgid "&Contents" +msgstr "&Conteníu" + +#: hhctrl.rc:32 +msgid "I&ndex" +msgstr "" + +#: hhctrl.rc:33 notepad.rc:55 +msgid "&Search" +msgstr "" + +#: hhctrl.rc:34 +msgid "Favor&ites" +msgstr "Favor&itos" + +#: hhctrl.rc:36 +msgid "Hide &Tabs" +msgstr "" + +#: hhctrl.rc:37 +msgid "Show &Tabs" +msgstr "" + +#: hhctrl.rc:42 +msgid "Show" +msgstr "" + +#: hhctrl.rc:43 winemac.rc:34 +msgid "Hide" +msgstr "" + +#: hhctrl.rc:44 ieframe.rc:68 shdoclc.rc:167 shdoclc.rc:191 +msgid "Stop" +msgstr "" + +#: hhctrl.rc:45 ieframe.rc:69 shell32.rc:62 +msgid "Refresh" +msgstr "" + +#: hhctrl.rc:46 ieframe.rc:66 +msgid "Back" +msgstr "" + +#: hhctrl.rc:47 +msgctxt "table of contents" +msgid "Home" +msgstr "" + +#: hhctrl.rc:48 +msgid "Sync" +msgstr "" + +#: hhctrl.rc:50 wineconsole.rc:60 wordpad.rc:166 +msgid "Options" +msgstr "Opciones" + +#: hhctrl.rc:51 ieframe.rc:67 +msgid "Forward" +msgstr "" + +#: iccvid.rc:28 iccvid.rc:29 +msgid "Cinepak Video codec" +msgstr "Códec de vídeu Cinepak" + +#: ieframe.rc:28 shell32.rc:114 notepad.rc:29 oleview.rc:30 oleview.rc:80 +#: progman.rc:32 taskmgr.rc:35 view.rc:31 winefile.rc:28 winhlp32.rc:31 +#: wordpad.rc:29 +msgid "&File" +msgstr "" + +#: ieframe.rc:30 regedit.rc:45 regedit.rc:97 regedit.rc:119 +msgid "&New" +msgstr "" + +#: ieframe.rc:32 winefile.rc:73 +msgid "&Window" +msgstr "" + +#: ieframe.rc:34 view.rc:33 winhlp32.rc:32 +msgid "&Open..." +msgstr "&Abrir..." + +#: ieframe.rc:36 notepad.rc:33 wordpad.rc:34 +msgid "Save &as..." +msgstr "Guardar &como..." + +#: ieframe.rc:38 +msgid "Print &format..." +msgstr "" + +#: ieframe.rc:39 +msgid "Pr&int..." +msgstr "" + +#: ieframe.rc:40 wordpad.rc:37 +msgid "Print previe&w" +msgstr "" + +#: ieframe.rc:47 +msgid "&Toolbars" +msgstr "" + +#: ieframe.rc:49 +msgid "&Standard bar" +msgstr "Barra &estándar" + +#: ieframe.rc:50 +msgid "&Address bar" +msgstr "Barra de &direiciones" + +#: ieframe.rc:53 regedit.rc:72 +msgid "&Favorites" +msgstr "&Favoritos" + +#: ieframe.rc:55 regedit.rc:74 +msgid "&Add to Favorites..." +msgstr "&Amestar a Favoritos..." + +#: ieframe.rc:60 +msgid "&About Internet Explorer" +msgstr "&Tocante a Esplorador d'internet" + +#: ieframe.rc:90 +msgid "Open URL" +msgstr "" + +#: ieframe.rc:93 +msgid "Specify the URL you wish to open in Internet Explorer" +msgstr "" + +#: ieframe.rc:94 +msgid "Open:" +msgstr "" + +#: ieframe.rc:70 +msgctxt "home page" +msgid "Home" +msgstr "" + +#: ieframe.rc:71 winhlp32.rc:69 +msgid "Print..." +msgstr "" + +#: ieframe.rc:76 +msgid "Address" +msgstr "Direición" + +#: ieframe.rc:81 +msgid "Searching for %s" +msgstr "" + +#: ieframe.rc:82 +msgid "Start downloading %s" +msgstr "" + +#: ieframe.rc:83 +msgid "Downloading %s" +msgstr "" + +#: ieframe.rc:84 +msgid "Asking for %s" +msgstr "" + +#: inetcpl.rc:49 +msgid "Home page" +msgstr "" + +#: inetcpl.rc:50 +msgid "You can choose the address that will be used as your home page." +msgstr "Pues escoyer la direición que va usase como páxina d'aniciu." + +#: inetcpl.rc:53 +msgid "&Current page" +msgstr "Páxina &actual" + +#: inetcpl.rc:54 +msgid "&Default page" +msgstr "&Páxina predeterminada" + +#: inetcpl.rc:55 +msgid "&Blank page" +msgstr "Páxina &balera" + +#: inetcpl.rc:56 +msgid "Browsing history" +msgstr "Historial de restolar" + +#: inetcpl.rc:57 +msgid "You can delete cached pages, cookies and other data." +msgstr "Pues desaniciar páxines, cookies y otros datos de la caché." + +#: inetcpl.rc:59 +msgid "Delete &files..." +msgstr "Desaniciar &ficheros..." + +#: inetcpl.rc:60 +msgid "&Settings..." +msgstr "&Axustes..." + +#: inetcpl.rc:68 +msgid "Delete browsing history" +msgstr "" + +#: inetcpl.rc:71 +msgid "" +"Temporary internet files\n" +"Cached copies of web pages, images and certificates." +msgstr "" +"Ficheros temporales d'internet\n" +"Copies de páxines web, imáxenes y certificaos na caché." + +#: inetcpl.rc:73 +msgid "" +"Cookies\n" +"Files saved on your computer by websites, which store things like user " +"preferences and login information." +msgstr "" + +#: inetcpl.rc:75 +msgid "" +"History\n" +"List of websites you have accessed." +msgstr "" + +#: inetcpl.rc:77 +msgid "" +"Form data\n" +"Usernames and other information you have entered into forms." +msgstr "" +"Datos de formularios\n" +"Los nomes d'usuariu y otra información qu'introduxeres en formularios." + +#: inetcpl.rc:79 +msgid "" +"Passwords\n" +"Saved passwords you have entered into forms." +msgstr "" +"Contraseñes\n" +"Les contraseñes guardaes qu'introduxeres nos formularios." + +#: inetcpl.rc:82 progman.rc:67 +msgid "Delete" +msgstr "" + +#: inetcpl.rc:90 winefile.rc:115 +msgid "Security" +msgstr "Seguranza" + +#: inetcpl.rc:112 +msgid "" +"Certificates are used for your personal identification and to identify " +"certificate authorities and publishers." +msgstr "" + +#: inetcpl.rc:114 +msgid "Certificates..." +msgstr "Certificaos..." + +#: inetcpl.rc:115 +msgid "Publishers..." +msgstr "Espublizadores..." + +#: inetcpl.rc:123 +msgid "Connections" +msgstr "Conexones" + +#: inetcpl.rc:125 +msgid "Automatic configuration" +msgstr "Configuración automática" + +#: inetcpl.rc:126 +msgid "Use Web Proxy Auto-Discovery (WPAD)" +msgstr "" + +#: inetcpl.rc:127 +msgid "Use Proxy Auto-Config (PAC) script" +msgstr "" + +#: inetcpl.rc:128 inetcpl.rc:132 +msgid "Address:" +msgstr "Direición:" + +#: inetcpl.rc:130 +msgid "Proxy server" +msgstr "Sirvidor proxy" + +#: inetcpl.rc:131 +msgid "Use a proxy server" +msgstr "Usar un sirvidor proxy" + +#: inetcpl.rc:134 +msgid "Port:" +msgstr "Puertu:" + +#: inetcpl.rc:31 +msgid "Internet Settings" +msgstr "Axustes d'internet" + +#: inetcpl.rc:32 +msgid "Configure Wine Internet Browser and related settings" +msgstr "" + +#: inetcpl.rc:33 +msgid "Security settings for zone: " +msgstr "" + +#: inetcpl.rc:34 +msgid "Custom" +msgstr "" + +#: inetcpl.rc:35 +msgid "Very Low" +msgstr "" + +#: inetcpl.rc:36 +msgid "Low" +msgstr "" + +#: inetcpl.rc:37 +msgid "Medium" +msgstr "" + +#: inetcpl.rc:38 +msgid "Increased" +msgstr "" + +#: inetcpl.rc:39 +msgid "High" +msgstr "" + +#: joy.rc:36 +msgid "Joysticks" +msgstr "Joysticks" + +#: joy.rc:39 winecfg.rc:213 +msgid "&Disable" +msgstr "&Inhabilitar" + +#: joy.rc:40 +msgid "&Enable" +msgstr "&Habilitar" + +#: joy.rc:41 +msgid "Connected" +msgstr "" + +#: joy.rc:43 +msgid "Disabled" +msgstr "" + +#: joy.rc:45 +msgid "" +"After disabling or enabling a device, the connected joysticks won't be " +"updated here until you restart this applet." +msgstr "" +"Tres in/habilitar un preséu, los joysticks coneutaos nun van anovase " +"equí hasta que reanicies esti applet." + +#: joy.rc:50 +msgid "Test Joystick" +msgstr "" + +#: joy.rc:54 +msgid "Buttons" +msgstr "Botones" + +#: joy.rc:63 +msgid "Test Force Feedback" +msgstr "" + +#: joy.rc:67 +msgid "Available Effects" +msgstr "Efeutos disponibles" + +#: joy.rc:69 +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." +msgstr "" + +#: joy.rc:31 +msgid "Game Controllers" +msgstr "" + +#: jscript.rc:28 +msgid "Error converting object to primitive type" +msgstr "" + +#: jscript.rc:29 +msgid "Invalid procedure call or argument" +msgstr "" + +#: jscript.rc:30 +msgid "Subscript out of range" +msgstr "" + +#: jscript.rc:31 +msgid "Object required" +msgstr "" + +#: jscript.rc:32 +msgid "Automation server can't create object" +msgstr "" + +#: jscript.rc:33 +msgid "Object doesn't support this property or method" +msgstr "L'oxetu nun sofita esta propiedá o métodu" + +#: jscript.rc:34 +msgid "Object doesn't support this action" +msgstr "L'oxetu nun sofita esta aición" + +#: jscript.rc:35 +msgid "Argument not optional" +msgstr "L'argumentu nun ye opcional" + +#: jscript.rc:36 +msgid "Syntax error" +msgstr "" + +#: jscript.rc:37 +msgid "Expected ';'" +msgstr "Esperábase «;»" + +#: jscript.rc:38 +msgid "Expected '('" +msgstr "Esperábase «(»" + +#: jscript.rc:39 +msgid "Expected ')'" +msgstr "Esperábase «)»" + +#: jscript.rc:40 +msgid "Expected identifier" +msgstr "" + +#: jscript.rc:41 +msgid "Expected '='" +msgstr "Esperábase «=»" + +#: jscript.rc:42 +msgid "Invalid character" +msgstr "El caráuter nun ye válidu" + +#: jscript.rc:43 +msgid "Unterminated string constant" +msgstr "" + +#: jscript.rc:44 +msgid "'return' statement outside of function" +msgstr "" + +#: jscript.rc:45 +msgid "Can't have 'break' outside of loop" +msgstr "" + +#: jscript.rc:46 +msgid "Can't have 'continue' outside of loop" +msgstr "" + +#: jscript.rc:47 +msgid "Label redefined" +msgstr "" + +#: jscript.rc:48 +msgid "Label not found" +msgstr "" + +#: jscript.rc:49 +msgid "Expected '@end'" +msgstr "Esperábase «@end»" + +#: jscript.rc:50 +msgid "Conditional compilation is turned off" +msgstr "" + +#: jscript.rc:51 +msgid "Expected '@'" +msgstr "Esperábase «@»" + +#: jscript.rc:54 +msgid "Number expected" +msgstr "" + +#: jscript.rc:52 +msgid "Function expected" +msgstr "" + +#: jscript.rc:53 +msgid "'[object]' is not a date object" +msgstr "" + +#: jscript.rc:55 +msgid "Object expected" +msgstr "" + +#: jscript.rc:56 +msgid "Illegal assignment" +msgstr "Asignación illegal" + +#: jscript.rc:57 +msgid "'|' is undefined" +msgstr "«|» nun se definió" + +#: jscript.rc:58 +msgid "Boolean object expected" +msgstr "" + +#: jscript.rc:59 +msgid "Cannot delete '|'" +msgstr "" + +#: jscript.rc:60 +msgid "VBArray object expected" +msgstr "" + +#: jscript.rc:61 +msgid "JScript object expected" +msgstr "" + +#: jscript.rc:62 +msgid "Syntax error in regular expression" +msgstr "" + +#: jscript.rc:64 +msgid "URI to be encoded contains invalid characters" +msgstr "" + +#: jscript.rc:63 +msgid "URI to be decoded is incorrect" +msgstr "" + +#: jscript.rc:65 +msgid "Number of fraction digits is out of range" +msgstr "" + +#: jscript.rc:66 +msgid "Precision is out of range" +msgstr "" + +#: jscript.rc:67 +msgid "Array length must be a finite positive integer" +msgstr "" + +#: jscript.rc:68 +msgid "Array object expected" +msgstr "" + +#: jscript.rc:69 +msgid "" +"'writable' attribute on the property descriptor cannot be set to 'true' on " +"this object" +msgstr "" + +#: jscript.rc:70 +msgid "Cannot redefine non-configurable property '|'" +msgstr "" + +#: jscript.rc:71 +msgid "Cannot modify non-writable property '|'" +msgstr "" + +#: jscript.rc:72 +msgid "Property cannot have both accessors and a value" +msgstr "" + +#: ../../include/wine/wine_common_ver.rc:129 +msgid "Wine kernel DLL" +msgstr "" + +#: ../../include/wine/wine_common_ver.rc:134 winemac.rc:32 wineboot.rc:42 +msgid "Wine" +msgstr "Wine" + +#: winerror.mc:28 +msgid "Success.\n" +msgstr "Ésitu.\n" + +#: winerror.mc:33 +msgid "Invalid function.\n" +msgstr "La función nun ye válida.\n" + +#: winerror.mc:38 +msgid "File not found.\n" +msgstr "Nun s'alcontró'l ficheru.\n" + +#: winerror.mc:43 +msgid "Path not found.\n" +msgstr "Nun s'alcontró'l camín.\n" + +#: winerror.mc:48 +msgid "Too many open files.\n" +msgstr "Milenta ficheros abiertos.\n" + +#: winerror.mc:53 +msgid "Access denied.\n" +msgstr "" + +#: winerror.mc:58 +msgid "Invalid handle.\n" +msgstr "" + +#: winerror.mc:63 +msgid "Memory trashed.\n" +msgstr "" + +#: winerror.mc:68 +msgid "Not enough memory.\n" +msgstr "" + +#: winerror.mc:73 +msgid "Invalid block.\n" +msgstr "" + +#: winerror.mc:78 +msgid "Bad environment.\n" +msgstr "" + +#: winerror.mc:83 +msgid "Bad format.\n" +msgstr "" + +#: winerror.mc:88 +msgid "Invalid access.\n" +msgstr "" + +#: winerror.mc:93 +msgid "Invalid data.\n" +msgstr "Los datos nun son válidos.\n" + +#: winerror.mc:98 +msgid "Out of memory.\n" +msgstr "Ensin memoria.\n" + +#: winerror.mc:103 +msgid "Invalid drive.\n" +msgstr "La unidá nun ye válida.\n" + +#: winerror.mc:108 +msgid "Can't delete current directory.\n" +msgstr "" + +#: winerror.mc:113 +msgid "Not same device.\n" +msgstr "" + +#: winerror.mc:118 +msgid "No more files.\n" +msgstr "" + +#: winerror.mc:123 +msgid "Write protected.\n" +msgstr "" + +#: winerror.mc:128 +msgid "Bad unit.\n" +msgstr "" + +#: winerror.mc:133 +msgid "Not ready.\n" +msgstr "" + +#: winerror.mc:138 +msgid "Bad command.\n" +msgstr "" + +#: winerror.mc:143 +msgid "CRC error.\n" +msgstr "" + +#: winerror.mc:148 +msgid "Bad length.\n" +msgstr "" + +#: winerror.mc:153 winerror.mc:528 +msgid "Seek error.\n" +msgstr "" + +#: winerror.mc:158 +msgid "Not DOS disk.\n" +msgstr "" + +#: winerror.mc:163 +msgid "Sector not found.\n" +msgstr "" + +#: winerror.mc:168 +msgid "Out of paper.\n" +msgstr "" + +#: winerror.mc:173 +msgid "Write fault.\n" +msgstr "Fallu d'escritura.\n" + +#: winerror.mc:178 +msgid "Read fault.\n" +msgstr "Fallu de llectura.\n" + +#: winerror.mc:183 +msgid "General failure.\n" +msgstr "Fallu xeneral.\n" + +#: winerror.mc:188 +msgid "Sharing violation.\n" +msgstr "" + +#: winerror.mc:193 +msgid "Lock violation.\n" +msgstr "" + +#: winerror.mc:198 +msgid "Wrong disk.\n" +msgstr "" + +#: winerror.mc:203 +msgid "Sharing buffer exceeded.\n" +msgstr "" + +#: winerror.mc:208 +msgid "End of file.\n" +msgstr "" + +#: winerror.mc:213 winerror.mc:438 +msgid "Disk full.\n" +msgstr "El discu ta enllén.\n" + +#: winerror.mc:218 +msgid "Request not supported.\n" +msgstr "La solicitú nun se sofita.\n" + +#: winerror.mc:223 +msgid "Remote machine not listening.\n" +msgstr "" + +#: winerror.mc:228 +msgid "Duplicate network name.\n" +msgstr "" + +#: winerror.mc:233 +msgid "Bad network path.\n" +msgstr "" + +#: winerror.mc:238 +msgid "Network busy.\n" +msgstr "La rede ta ocupada.\n" + +#: winerror.mc:243 +msgid "Device does not exist.\n" +msgstr "El preséu nun esiste.\n" + +#: winerror.mc:248 +msgid "Too many commands.\n" +msgstr "Milenta comandos.\n" + +#: winerror.mc:253 +msgid "Adapter hardware error.\n" +msgstr "" + +#: winerror.mc:258 +msgid "Bad network response.\n" +msgstr "" + +#: winerror.mc:263 +msgid "Unexpected network error.\n" +msgstr "" + +#: winerror.mc:268 +msgid "Bad remote adapter.\n" +msgstr "" + +#: winerror.mc:273 +msgid "Print queue full.\n" +msgstr "" + +#: winerror.mc:278 +msgid "No spool space.\n" +msgstr "Nun hai espaciu na cola.\n" + +#: winerror.mc:283 +msgid "Print canceled.\n" +msgstr "" + +#: winerror.mc:288 +msgid "Network name deleted.\n" +msgstr "" + +#: winerror.mc:293 +msgid "Network access denied.\n" +msgstr "" + +#: winerror.mc:298 +msgid "Bad device type.\n" +msgstr "" + +#: winerror.mc:303 +msgid "Bad network name.\n" +msgstr "" + +#: winerror.mc:308 +msgid "Too many network names.\n" +msgstr "Milenta nomes de rede.\n" + +#: winerror.mc:313 +msgid "Too many network sessions.\n" +msgstr "Milenta sesiones de rede.\n" + +#: winerror.mc:318 +msgid "Sharing paused.\n" +msgstr "" + +#: winerror.mc:323 +msgid "Request not accepted.\n" +msgstr "" + +#: winerror.mc:328 +msgid "Redirector paused.\n" +msgstr "" + +#: winerror.mc:333 +msgid "File exists.\n" +msgstr "El ficheru esiste.\n" + +#: winerror.mc:338 +msgid "Cannot create.\n" +msgstr "Nun pue crease.\n" + +#: winerror.mc:343 +msgid "Int24 failure.\n" +msgstr "Fallu d'Int24.\n" + +#: winerror.mc:348 +msgid "Out of structures.\n" +msgstr "" + +#: winerror.mc:353 +msgid "Already assigned.\n" +msgstr "" + +#: winerror.mc:358 winerror.mc:1713 +msgid "Invalid password.\n" +msgstr "La contraseña nun ye válida.\n" + +#: winerror.mc:363 +msgid "Invalid parameter.\n" +msgstr "El parámetru nun ye válidu.\n" + +#: winerror.mc:368 +msgid "Net write fault.\n" +msgstr "" + +#: winerror.mc:373 +msgid "No process slots.\n" +msgstr "" + +#: winerror.mc:378 +msgid "Too many semaphores.\n" +msgstr "Milenta semáforos.\n" + +#: winerror.mc:383 +msgid "Exclusive semaphore already owned.\n" +msgstr "" + +#: winerror.mc:388 +msgid "Semaphore is set.\n" +msgstr "" + +#: winerror.mc:393 +msgid "Too many semaphore requests.\n" +msgstr "" + +#: winerror.mc:398 +msgid "Invalid at interrupt time.\n" +msgstr "" + +#: winerror.mc:403 +msgid "Semaphore owner died.\n" +msgstr "" + +#: winerror.mc:408 +msgid "Semaphore user limit.\n" +msgstr "" + +#: winerror.mc:413 +msgid "Insert disk for drive %1.\n" +msgstr "" + +#: winerror.mc:418 +msgid "Drive locked.\n" +msgstr "" + +#: winerror.mc:423 +msgid "Broken pipe.\n" +msgstr "" + +#: winerror.mc:428 +msgid "Open failed.\n" +msgstr "Falló l'apertura.\n" + +#: winerror.mc:433 +msgid "Buffer overflow.\n" +msgstr "" + +#: winerror.mc:443 +msgid "No more search handles.\n" +msgstr "" + +#: winerror.mc:448 +msgid "Invalid target handle.\n" +msgstr "" + +#: winerror.mc:453 +msgid "Invalid IOCTL.\n" +msgstr "" + +#: winerror.mc:458 +msgid "Invalid verify switch.\n" +msgstr "" + +#: winerror.mc:463 +msgid "Bad driver level.\n" +msgstr "" + +#: winerror.mc:468 +msgid "Call not implemented.\n" +msgstr "" + +#: winerror.mc:473 +msgid "Semaphore timeout.\n" +msgstr "" + +#: winerror.mc:478 +msgid "Insufficient buffer.\n" +msgstr "" + +#: winerror.mc:483 +msgid "Invalid name.\n" +msgstr "El nome nun ye válidu.\n" + +#: winerror.mc:488 +msgid "Invalid level.\n" +msgstr "El nivel nun ye válidu.\n" + +#: winerror.mc:493 +msgid "No volume label.\n" +msgstr "" + +#: winerror.mc:498 +msgid "Module not found.\n" +msgstr "Nun s'alcontró'l módulu.\n" + +#: winerror.mc:503 +msgid "Procedure not found.\n" +msgstr "" + +#: winerror.mc:508 +msgid "No children to wait for.\n" +msgstr "" + +#: winerror.mc:513 +msgid "Child process has not completed.\n" +msgstr "" + +#: winerror.mc:518 +msgid "Invalid use of direct access handle.\n" +msgstr "" + +#: winerror.mc:523 +msgid "Negative seek.\n" +msgstr "" + +#: winerror.mc:533 +msgid "Drive is a JOIN target.\n" +msgstr "" + +#: winerror.mc:538 +msgid "Drive is already JOINed.\n" +msgstr "" + +#: winerror.mc:543 +msgid "Drive is already SUBSTed.\n" +msgstr "" + +#: winerror.mc:548 +msgid "Drive is not JOINed.\n" +msgstr "" + +#: winerror.mc:553 +msgid "Drive is not SUBSTed.\n" +msgstr "" + +#: winerror.mc:558 +msgid "Attempt to JOIN onto a JOINed drive.\n" +msgstr "" + +#: winerror.mc:563 +msgid "Attempt to SUBST onto a SUBSTed drive.\n" +msgstr "" + +#: winerror.mc:568 +msgid "Attempt to JOIN to a SUBSTed drive.\n" +msgstr "" + +#: winerror.mc:573 +msgid "Attempt to SUBST to a JOINed drive.\n" +msgstr "" + +#: winerror.mc:578 +msgid "Drive is busy.\n" +msgstr "La unidá ta ocupada.\n" + +#: winerror.mc:583 +msgid "Same drive.\n" +msgstr "" + +#: winerror.mc:588 +msgid "Not top-level directory.\n" +msgstr "" + +#: winerror.mc:593 +msgid "Directory is not empty.\n" +msgstr "" + +#: winerror.mc:598 +msgid "Path is in use as a SUBST.\n" +msgstr "" + +#: winerror.mc:603 +msgid "Path is in use as a JOIN.\n" +msgstr "" + +#: winerror.mc:608 +msgid "Path is busy.\n" +msgstr "El camín ta ocupáu.\n" + +#: winerror.mc:613 +msgid "Already a SUBST target.\n" +msgstr "" + +#: winerror.mc:618 +msgid "System trace not specified or disallowed.\n" +msgstr "" + +#: winerror.mc:623 +msgid "Event count for DosMuxSemWait incorrect.\n" +msgstr "" + +#: winerror.mc:628 +msgid "Too many waiters for DosMuxSemWait.\n" +msgstr "" + +#: winerror.mc:633 +msgid "DosSemMuxWait list invalid.\n" +msgstr "" + +#: winerror.mc:638 +msgid "Volume label too long.\n" +msgstr "" + +#: winerror.mc:643 +msgid "Too many TCBs.\n" +msgstr "Milenta TCBs.\n" + +#: winerror.mc:648 +msgid "Signal refused.\n" +msgstr "" + +#: winerror.mc:653 +msgid "Segment discarded.\n" +msgstr "" + +#: winerror.mc:658 +msgid "Segment not locked.\n" +msgstr "" + +#: winerror.mc:663 +msgid "Bad thread ID address.\n" +msgstr "" + +#: winerror.mc:668 +msgid "Bad arguments to DosExecPgm.\n" +msgstr "" + +#: winerror.mc:673 +msgid "Path is invalid.\n" +msgstr "El camín nun ye válidu.\n" + +#: winerror.mc:678 +msgid "Signal pending.\n" +msgstr "" + +#: winerror.mc:683 +msgid "Max system-wide thread count reached.\n" +msgstr "" + +#: winerror.mc:688 +msgid "Lock failed.\n" +msgstr "" + +#: winerror.mc:693 +msgid "Resource in use.\n" +msgstr "" + +#: winerror.mc:698 +msgid "Cancel violation.\n" +msgstr "" + +#: winerror.mc:703 +msgid "Atomic locks not supported.\n" +msgstr "" + +#: winerror.mc:708 +msgid "Invalid segment number.\n" +msgstr "" + +#: winerror.mc:713 +msgid "Invalid ordinal for %1.\n" +msgstr "" + +#: winerror.mc:718 +msgid "File already exists.\n" +msgstr "El ficheru yá esiste.\n" + +#: winerror.mc:723 +msgid "Invalid flag number.\n" +msgstr "" + +#: winerror.mc:728 +msgid "Semaphore name not found.\n" +msgstr "" + +#: winerror.mc:733 +msgid "Invalid starting code segment for %1.\n" +msgstr "" + +#: winerror.mc:738 +msgid "Invalid starting stack segment for %1.\n" +msgstr "" + +#: winerror.mc:743 +msgid "Invalid module type for %1.\n" +msgstr "" + +#: winerror.mc:748 +msgid "Invalid EXE signature in %1.\n" +msgstr "" + +#: winerror.mc:753 +msgid "EXE %1 is marked invalid.\n" +msgstr "" + +#: winerror.mc:758 +msgid "Bad EXE format for %1.\n" +msgstr "" + +#: winerror.mc:763 +msgid "Iterated data exceeds 64k in %1.\n" +msgstr "" + +#: winerror.mc:768 +msgid "Invalid MinAllocSize in %1.\n" +msgstr "" + +#: winerror.mc:773 +msgid "Dynlink from invalid ring.\n" +msgstr "" + +#: winerror.mc:778 +msgid "IOPL not enabled.\n" +msgstr "IOPL nun s'activó.\n" + +#: winerror.mc:783 +msgid "Invalid SEGDPL in %1.\n" +msgstr "" + +#: winerror.mc:788 +msgid "Auto data segment exceeds 64k.\n" +msgstr "" + +#: winerror.mc:793 +msgid "Ring 2 segment must be movable.\n" +msgstr "" + +#: winerror.mc:798 +msgid "Relocation chain exceeds segment limit in %1.\n" +msgstr "" + +#: winerror.mc:803 +msgid "Infinite loop in relocation chain in %1.\n" +msgstr "" + +#: winerror.mc:808 +msgid "Environment variable not found.\n" +msgstr "Nun s'alcontró la variable d'entornu.\n" + +#: winerror.mc:813 +msgid "No signal sent.\n" +msgstr "" + +#: winerror.mc:818 +msgid "File name is too long.\n" +msgstr "" + +#: winerror.mc:823 +msgid "Ring 2 stack in use.\n" +msgstr "" + +#: winerror.mc:828 +msgid "Error in use of filename wildcards.\n" +msgstr "" + +#: winerror.mc:833 +msgid "Invalid signal number.\n" +msgstr "" + +#: winerror.mc:838 +msgid "Error setting signal handler.\n" +msgstr "" + +#: winerror.mc:843 +msgid "Segment locked.\n" +msgstr "" + +#: winerror.mc:848 +msgid "Too many modules.\n" +msgstr "Milenta módulos.\n" + +#: winerror.mc:853 +msgid "Nesting LoadModule calls not allowed.\n" +msgstr "" + +#: winerror.mc:858 +msgid "Machine type mismatch.\n" +msgstr "" + +#: winerror.mc:863 +msgid "Bad pipe.\n" +msgstr "" + +#: winerror.mc:868 +msgid "Pipe busy.\n" +msgstr "" + +#: winerror.mc:873 +msgid "Pipe closed.\n" +msgstr "" + +#: winerror.mc:878 +msgid "Pipe not connected.\n" +msgstr "" + +#: winerror.mc:883 +msgid "More data available.\n" +msgstr "Más datos disponibles.\n" + +#: winerror.mc:888 +msgid "Session canceled.\n" +msgstr "" + +#: winerror.mc:893 +msgid "Invalid extended attribute name.\n" +msgstr "" + +#: winerror.mc:898 +msgid "Extended attribute list inconsistent.\n" +msgstr "" + +#: winerror.mc:903 +msgid "No more data available.\n" +msgstr "" + +#: winerror.mc:908 +msgid "Cannot use Copy API.\n" +msgstr "" + +#: winerror.mc:913 +msgid "Directory name invalid.\n" +msgstr "" + +#: winerror.mc:918 +msgid "Extended attributes didn't fit.\n" +msgstr "" + +#: winerror.mc:923 +msgid "Extended attribute file corrupt.\n" +msgstr "" + +#: winerror.mc:928 +msgid "Extended attribute table full.\n" +msgstr "" + +#: winerror.mc:933 +msgid "Invalid extended attribute handle.\n" +msgstr "" + +#: winerror.mc:938 +msgid "Extended attributes not supported.\n" +msgstr "" + +#: winerror.mc:943 +msgid "Mutex not owned by caller.\n" +msgstr "" + +#: winerror.mc:948 +msgid "Too many posts to semaphore.\n" +msgstr "" + +#: winerror.mc:953 +msgid "Read/WriteProcessMemory partially completed.\n" +msgstr "" + +#: winerror.mc:958 +msgid "The oplock wasn't granted.\n" +msgstr "" + +#: winerror.mc:963 +msgid "Invalid oplock message received.\n" +msgstr "" + +#: winerror.mc:968 +msgid "Message 0x%1 not found in file %2.\n" +msgstr "" + +#: winerror.mc:973 +msgid "Invalid address.\n" +msgstr "La direición nun ye válida.\n" + +#: winerror.mc:978 +msgid "Arithmetic overflow.\n" +msgstr "Sobrecarga aritmética.\n" + +#: winerror.mc:983 +msgid "Pipe connected.\n" +msgstr "" + +#: winerror.mc:988 +msgid "Pipe listening.\n" +msgstr "" + +#: winerror.mc:993 +msgid "Extended attribute access denied.\n" +msgstr "" + +#: winerror.mc:998 +msgid "I/O operation aborted.\n" +msgstr "" + +#: winerror.mc:1003 +msgid "Overlapped I/O incomplete.\n" +msgstr "" + +#: winerror.mc:1008 +msgid "Overlapped I/O pending.\n" +msgstr "" + +#: winerror.mc:1013 +msgid "No access to memory location.\n" +msgstr "" + +#: winerror.mc:1018 +msgid "Swap error.\n" +msgstr "" + +#: winerror.mc:1023 +msgid "Stack overflow.\n" +msgstr "" + +#: winerror.mc:1028 +msgid "Invalid message.\n" +msgstr "El mensaxe nun ye válidu.\n" + +#: winerror.mc:1033 +msgid "Cannot complete.\n" +msgstr "" + +#: winerror.mc:1038 +msgid "Invalid flags.\n" +msgstr "Les banderes nun son válides.\n" + +#: winerror.mc:1043 +msgid "Unrecognized volume.\n" +msgstr "" + +#: winerror.mc:1048 +msgid "File invalid.\n" +msgstr "El ficheru nun ye válidu.\n" + +#: winerror.mc:1053 +msgid "Cannot run full-screen.\n" +msgstr "" + +#: winerror.mc:1058 +msgid "Nonexistent token.\n" +msgstr "" + +#: winerror.mc:1063 +msgid "Registry corrupt.\n" +msgstr "" + +#: winerror.mc:1068 +msgid "Invalid key.\n" +msgstr "La clave nun ye válida.\n" + +#: winerror.mc:1073 +msgid "Can't open registry key.\n" +msgstr "" + +#: winerror.mc:1078 +msgid "Can't read registry key.\n" +msgstr "" + +#: winerror.mc:1083 +msgid "Can't write registry key.\n" +msgstr "" + +#: winerror.mc:1088 +msgid "Registry has been recovered.\n" +msgstr "" + +#: winerror.mc:1093 +msgid "Registry is corrupt.\n" +msgstr "" + +#: winerror.mc:1098 +msgid "I/O to registry failed.\n" +msgstr "" + +#: winerror.mc:1103 +msgid "Not registry file.\n" +msgstr "" + +#: winerror.mc:1108 +msgid "Key deleted.\n" +msgstr "" + +#: winerror.mc:1113 +msgid "No registry log space.\n" +msgstr "" + +#: winerror.mc:1118 +msgid "Registry key has subkeys.\n" +msgstr "" + +#: winerror.mc:1123 +msgid "Subkey must be volatile.\n" +msgstr "" + +#: winerror.mc:1128 +msgid "Notify change request in progress.\n" +msgstr "" + +#: winerror.mc:1133 +msgid "Dependent services are running.\n" +msgstr "" + +#: winerror.mc:1138 +msgid "Invalid service control.\n" +msgstr "" + +#: winerror.mc:1143 +msgid "Service request timeout.\n" +msgstr "" + +#: winerror.mc:1148 +msgid "Cannot create service thread.\n" +msgstr "" + +#: winerror.mc:1153 +msgid "Service database locked.\n" +msgstr "" + +#: winerror.mc:1158 +msgid "Service already running.\n" +msgstr "El serviciu yá ta n'execución.\n" + +#: winerror.mc:1163 +msgid "Invalid service account.\n" +msgstr "" + +#: winerror.mc:1168 +msgid "Service is disabled.\n" +msgstr "El serviciu ta desactiváu.\n" + +#: winerror.mc:1173 +msgid "Circular dependency.\n" +msgstr "Dependencia circular.\n" + +#: winerror.mc:1178 +msgid "Service does not exist.\n" +msgstr "El serviciu nun esiste.\n" + +#: winerror.mc:1183 +msgid "Service cannot accept control message.\n" +msgstr "" + +#: winerror.mc:1188 +msgid "Service not active.\n" +msgstr "" + +#: winerror.mc:1193 +msgid "Service controller connect failed.\n" +msgstr "" + +#: winerror.mc:1198 +msgid "Exception in service.\n" +msgstr "" + +#: winerror.mc:1203 +msgid "Database does not exist.\n" +msgstr "" + +#: winerror.mc:1208 +msgid "Service-specific error.\n" +msgstr "" + +#: winerror.mc:1213 +msgid "Process aborted.\n" +msgstr "" + +#: winerror.mc:1218 +msgid "Service dependency failed.\n" +msgstr "" + +#: winerror.mc:1223 +msgid "Service login failed.\n" +msgstr "" + +#: winerror.mc:1228 +msgid "Service start-hang.\n" +msgstr "" + +#: winerror.mc:1233 +msgid "Invalid service lock.\n" +msgstr "" + +#: winerror.mc:1238 +msgid "Service marked for delete.\n" +msgstr "" + +#: winerror.mc:1243 +msgid "Service exists.\n" +msgstr "El serviciu esiste.\n" + +#: winerror.mc:1248 +msgid "System running last-known-good config.\n" +msgstr "" + +#: winerror.mc:1253 +msgid "Service dependency deleted.\n" +msgstr "" + +#: winerror.mc:1258 +msgid "Boot already accepted as last-good config.\n" +msgstr "" + +#: winerror.mc:1263 +msgid "Service not started since last boot.\n" +msgstr "" + +#: winerror.mc:1268 +msgid "Duplicate service name.\n" +msgstr "" + +#: winerror.mc:1273 +msgid "Different service account.\n" +msgstr "" + +#: winerror.mc:1278 +msgid "Driver failure cannot be detected.\n" +msgstr "" + +#: winerror.mc:1283 +msgid "Process abort cannot be detected.\n" +msgstr "" + +#: winerror.mc:1288 +msgid "No recovery program for service.\n" +msgstr "" + +#: winerror.mc:1293 +msgid "Service not implemented by exe.\n" +msgstr "" + +#: winerror.mc:1298 +msgid "End of media.\n" +msgstr "" + +#: winerror.mc:1303 +msgid "Filemark detected.\n" +msgstr "" + +#: winerror.mc:1308 +msgid "Beginning of media.\n" +msgstr "" + +#: winerror.mc:1313 +msgid "Setmark detected.\n" +msgstr "" + +#: winerror.mc:1318 +msgid "No data detected.\n" +msgstr "" + +#: winerror.mc:1323 +msgid "Partition failure.\n" +msgstr "" + +#: winerror.mc:1328 +msgid "Invalid block length.\n" +msgstr "" + +#: winerror.mc:1333 +msgid "Device not partitioned.\n" +msgstr "El preséu nun ta particionáu.\n" + +#: winerror.mc:1338 +msgid "Unable to lock media.\n" +msgstr "" + +#: winerror.mc:1343 +msgid "Unable to unload media.\n" +msgstr "" + +#: winerror.mc:1348 +msgid "Media changed.\n" +msgstr "" + +#: winerror.mc:1353 +msgid "I/O bus reset.\n" +msgstr "" + +#: winerror.mc:1358 +msgid "No media in drive.\n" +msgstr "" + +#: winerror.mc:1363 +msgid "No Unicode translation.\n" +msgstr "" + +#: winerror.mc:1368 +msgid "DLL initialization failed.\n" +msgstr "" + +#: winerror.mc:1373 +msgid "Shutdown in progress.\n" +msgstr "" + +#: winerror.mc:1378 +msgid "No shutdown in progress.\n" +msgstr "" + +#: winerror.mc:1383 +msgid "I/O device error.\n" +msgstr "" + +#: winerror.mc:1388 +msgid "No serial devices found.\n" +msgstr "" + +#: winerror.mc:1393 +msgid "Shared IRQ busy.\n" +msgstr "" + +#: winerror.mc:1398 +msgid "Serial I/O completed.\n" +msgstr "" + +#: winerror.mc:1403 +msgid "Serial I/O counter timeout.\n" +msgstr "" + +#: winerror.mc:1408 +msgid "Floppy ID address mark not found.\n" +msgstr "" + +#: winerror.mc:1413 +msgid "Floppy reports wrong cylinder.\n" +msgstr "" + +#: winerror.mc:1418 +msgid "Unknown floppy error.\n" +msgstr "" + +#: winerror.mc:1423 +msgid "Floppy registers inconsistent.\n" +msgstr "" + +#: winerror.mc:1428 +msgid "Hard disk recalibrate failed.\n" +msgstr "" + +#: winerror.mc:1433 +msgid "Hard disk operation failed.\n" +msgstr "" + +#: winerror.mc:1438 +msgid "Hard disk reset failed.\n" +msgstr "" + +#: winerror.mc:1443 +msgid "End of tape media.\n" +msgstr "" + +#: winerror.mc:1448 +msgid "Not enough server memory.\n" +msgstr "" + +#: winerror.mc:1453 +msgid "Possible deadlock.\n" +msgstr "" + +#: winerror.mc:1458 +msgid "Incorrect alignment.\n" +msgstr "" + +#: winerror.mc:1463 +msgid "Set-power-state vetoed.\n" +msgstr "" + +#: winerror.mc:1468 +msgid "Set-power-state failed.\n" +msgstr "" + +#: winerror.mc:1473 +msgid "Too many links.\n" +msgstr "Milenta enllaces.\n" + +#: winerror.mc:1478 +msgid "Newer windows version needed.\n" +msgstr "" + +#: winerror.mc:1483 +msgid "Wrong operating system.\n" +msgstr "" + +#: winerror.mc:1488 +msgid "Single-instance application.\n" +msgstr "" + +#: winerror.mc:1493 +msgid "Real-mode application.\n" +msgstr "" + +#: winerror.mc:1498 +msgid "Invalid DLL.\n" +msgstr "" + +#: winerror.mc:1503 +msgid "No associated application.\n" +msgstr "" + +#: winerror.mc:1508 +msgid "DDE failure.\n" +msgstr "" + +#: winerror.mc:1513 +msgid "DLL not found.\n" +msgstr "" + +#: winerror.mc:1518 +msgid "Out of user handles.\n" +msgstr "" + +#: winerror.mc:1523 +msgid "Message can only be used in synchronous calls.\n" +msgstr "" + +#: winerror.mc:1528 +msgid "The source element is empty.\n" +msgstr "" + +#: winerror.mc:1533 +msgid "The destination element is full.\n" +msgstr "L'elementu de destín ta enllén.\n" + +#: winerror.mc:1538 +msgid "The element address is invalid.\n" +msgstr "" + +#: winerror.mc:1543 +msgid "The magazine is not present.\n" +msgstr "" + +#: winerror.mc:1548 +msgid "The device needs reinitialization.\n" +msgstr "" + +#: winerror.mc:1553 +msgid "The device requires cleaning.\n" +msgstr "" + +#: winerror.mc:1558 +msgid "The device door is open.\n" +msgstr "" + +#: winerror.mc:1563 +msgid "The device is not connected.\n" +msgstr "" + +#: winerror.mc:1568 +msgid "Element not found.\n" +msgstr "" + +#: winerror.mc:1573 +msgid "No match found.\n" +msgstr "" + +#: winerror.mc:1578 +msgid "Property set not found.\n" +msgstr "" + +#: winerror.mc:1583 +msgid "Point not found.\n" +msgstr "" + +#: winerror.mc:1588 +msgid "No running tracking service.\n" +msgstr "" + +#: winerror.mc:1593 +msgid "No such volume ID.\n" +msgstr "" + +#: winerror.mc:1598 +msgid "Unable to remove the file to be replaced.\n" +msgstr "Nun pue desaniciase'l ficheru que va trocase.\n" + +#: winerror.mc:1603 +msgid "Unable to move the replacement file into place.\n" +msgstr "" + +#: winerror.mc:1608 +msgid "Moving the replacement file failed.\n" +msgstr "" + +#: winerror.mc:1613 +msgid "The journal is being deleted.\n" +msgstr "" + +#: winerror.mc:1618 +msgid "The journal is not active.\n" +msgstr "El diariu nun ta activu.\n" + +#: winerror.mc:1623 +msgid "Potential matching file found.\n" +msgstr "" + +#: winerror.mc:1628 +msgid "The journal entry was deleted.\n" +msgstr "" + +#: winerror.mc:1633 +msgid "Invalid device name.\n" +msgstr "" + +#: winerror.mc:1638 +msgid "Connection unavailable.\n" +msgstr "La conexón nun ta disponible.\n" + +#: winerror.mc:1643 +msgid "Device already remembered.\n" +msgstr "" + +#: winerror.mc:1648 +msgid "No network or bad path.\n" +msgstr "" + +#: winerror.mc:1653 +msgid "Invalid network provider name.\n" +msgstr "" + +#: winerror.mc:1658 +msgid "Cannot open network connection profile.\n" +msgstr "" + +#: winerror.mc:1663 +msgid "Corrupt network connection profile.\n" +msgstr "" + +#: winerror.mc:1668 +msgid "Not a container.\n" +msgstr "" + +#: winerror.mc:1673 +msgid "Extended error.\n" +msgstr "" + +#: winerror.mc:1678 +msgid "Invalid group name.\n" +msgstr "" + +#: winerror.mc:1683 +msgid "Invalid computer name.\n" +msgstr "" + +#: winerror.mc:1688 +msgid "Invalid event name.\n" +msgstr "" + +#: winerror.mc:1693 +msgid "Invalid domain name.\n" +msgstr "" + +#: winerror.mc:1698 +msgid "Invalid service name.\n" +msgstr "" + +#: winerror.mc:1703 +msgid "Invalid network name.\n" +msgstr "" + +#: winerror.mc:1708 +msgid "Invalid share name.\n" +msgstr "" + +#: winerror.mc:1718 +msgid "Invalid message name.\n" +msgstr "" + +#: winerror.mc:1723 +msgid "Invalid message destination.\n" +msgstr "" + +#: winerror.mc:1728 +msgid "Session credential conflict.\n" +msgstr "" + +#: winerror.mc:1733 +msgid "Remote session limit exceeded.\n" +msgstr "" + +#: winerror.mc:1738 +msgid "Duplicate domain or workgroup name.\n" +msgstr "" + +#: winerror.mc:1743 +msgid "No network.\n" +msgstr "Nun hai rede.\n" + +#: winerror.mc:1748 +msgid "Operation canceled by user.\n" +msgstr "" + +#: winerror.mc:1753 +msgid "File has a user-mapped section.\n" +msgstr "" + +#: winerror.mc:1758 winerror.mc:3753 +msgid "Connection refused.\n" +msgstr "Refugóse la conexón.\n" + +#: winerror.mc:1763 +msgid "Connection gracefully closed.\n" +msgstr "" + +#: winerror.mc:1768 +msgid "Address already associated with transport endpoint.\n" +msgstr "" + +#: winerror.mc:1773 +msgid "Address not associated with transport endpoint.\n" +msgstr "" + +#: winerror.mc:1778 +msgid "Connection invalid.\n" +msgstr "La conexón nun ye válida.\n" + +#: winerror.mc:1783 +msgid "Connection is active.\n" +msgstr "La conexón ta activa.\n" + +#: winerror.mc:1788 +msgid "Network unreachable.\n" +msgstr "" + +#: winerror.mc:1793 +msgid "Host unreachable.\n" +msgstr "" + +#: winerror.mc:1798 +msgid "Protocol unreachable.\n" +msgstr "" + +#: winerror.mc:1803 +msgid "Port unreachable.\n" +msgstr "" + +#: winerror.mc:1808 +msgid "Request aborted.\n" +msgstr "" + +#: winerror.mc:1813 +msgid "Connection aborted.\n" +msgstr "Albortóse la conexón.\n" + +#: winerror.mc:1818 +msgid "Please retry operation.\n" +msgstr "" + +#: winerror.mc:1823 +msgid "Connection count limit reached.\n" +msgstr "" + +#: winerror.mc:1828 +msgid "Login time restriction.\n" +msgstr "" + +#: winerror.mc:1833 +msgid "Login workstation restriction.\n" +msgstr "" + +#: winerror.mc:1838 +msgid "Incorrect network address.\n" +msgstr "" + +#: winerror.mc:1843 +msgid "Service already registered.\n" +msgstr "El serviciu yá ta rexistráu.\n" + +#: winerror.mc:1848 +msgid "Service not found.\n" +msgstr "Nun s'alcontró'l serviciu.\n" + +#: winerror.mc:1853 +msgid "User not authenticated.\n" +msgstr "L'usuariu nun ta autenticáu.\n" + +#: winerror.mc:1858 +msgid "User not logged on.\n" +msgstr "" + +#: winerror.mc:1863 +msgid "Continue work in progress.\n" +msgstr "" + +#: winerror.mc:1868 +msgid "Already initialized.\n" +msgstr "" + +#: winerror.mc:1873 +msgid "No more local devices.\n" +msgstr "Nun hai más preseos llocales.\n" + +#: winerror.mc:1878 +msgid "The site does not exist.\n" +msgstr "El sitiu nun esiste.\n" + +#: winerror.mc:1883 +msgid "The domain controller already exists.\n" +msgstr "" + +#: winerror.mc:1888 +msgid "Supported only when connected.\n" +msgstr "" + +#: winerror.mc:1893 +msgid "Perform operation even when nothing changed.\n" +msgstr "" + +#: winerror.mc:1898 +msgid "The user profile is invalid.\n" +msgstr "" + +#: winerror.mc:1903 +msgid "Not supported on Small Business Server.\n" +msgstr "" + +#: winerror.mc:1908 +msgid "Not all privileges assigned.\n" +msgstr "" + +#: winerror.mc:1913 +msgid "Some security IDs not mapped.\n" +msgstr "" + +#: winerror.mc:1918 +msgid "No quotas for account.\n" +msgstr "" + +#: winerror.mc:1923 +msgid "Local user session key.\n" +msgstr "" + +#: winerror.mc:1928 +msgid "Password too complex for LM.\n" +msgstr "" + +#: winerror.mc:1933 +msgid "Unknown revision.\n" +msgstr "" + +#: winerror.mc:1938 +msgid "Incompatible revision levels.\n" +msgstr "" + +#: winerror.mc:1943 +msgid "Invalid owner.\n" +msgstr "" + +#: winerror.mc:1948 +msgid "Invalid primary group.\n" +msgstr "" + +#: winerror.mc:1953 +msgid "No impersonation token.\n" +msgstr "" + +#: winerror.mc:1958 +msgid "Can't disable mandatory group.\n" +msgstr "" + +#: winerror.mc:1963 +msgid "No logon servers available.\n" +msgstr "" + +#: winerror.mc:1968 +msgid "No such logon session.\n" +msgstr "" + +#: winerror.mc:1973 +msgid "No such privilege.\n" +msgstr "" + +#: winerror.mc:1978 +msgid "Privilege not held.\n" +msgstr "" + +#: winerror.mc:1983 +msgid "Invalid account name.\n" +msgstr "" + +#: winerror.mc:1988 +msgid "User already exists.\n" +msgstr "L'usuariu yá esiste.\n" + +#: winerror.mc:1993 +msgid "No such user.\n" +msgstr "" + +#: winerror.mc:1998 +msgid "Group already exists.\n" +msgstr "" + +#: winerror.mc:2003 +msgid "No such group.\n" +msgstr "" + +#: winerror.mc:2008 +msgid "User already in group.\n" +msgstr "L'usuariu yá ta nel grupu.\n" + +#: winerror.mc:2013 +msgid "User not in group.\n" +msgstr "L'usuariu nun ta nel grupu.\n" + +#: winerror.mc:2018 +msgid "Can't delete last admin user.\n" +msgstr "" + +#: winerror.mc:2023 +msgid "Wrong password.\n" +msgstr "" + +#: winerror.mc:2028 +msgid "Ill-formed password.\n" +msgstr "" + +#: winerror.mc:2033 +msgid "Password restriction.\n" +msgstr "" + +#: winerror.mc:2038 +msgid "Logon failure.\n" +msgstr "" + +#: winerror.mc:2043 +msgid "Account restriction.\n" +msgstr "" + +#: winerror.mc:2048 +msgid "Invalid logon hours.\n" +msgstr "" + +#: winerror.mc:2053 +msgid "Invalid workstation.\n" +msgstr "" + +#: winerror.mc:2058 +msgid "Password expired.\n" +msgstr "" + +#: winerror.mc:2063 +msgid "Account disabled.\n" +msgstr "" + +#: winerror.mc:2068 +msgid "No security ID mapped.\n" +msgstr "" + +#: winerror.mc:2073 +msgid "Too many LUIDs requested.\n" +msgstr "" + +#: winerror.mc:2078 +msgid "LUIDs exhausted.\n" +msgstr "" + +#: winerror.mc:2083 +msgid "Invalid sub authority.\n" +msgstr "" + +#: winerror.mc:2088 +msgid "Invalid ACL.\n" +msgstr "" + +#: winerror.mc:2093 +msgid "Invalid SID.\n" +msgstr "" + +#: winerror.mc:2098 +msgid "Invalid security descriptor.\n" +msgstr "" + +#: winerror.mc:2103 +msgid "Bad inherited ACL.\n" +msgstr "" + +#: winerror.mc:2108 +msgid "Server disabled.\n" +msgstr "" + +#: winerror.mc:2113 +msgid "Server not disabled.\n" +msgstr "El sirvidor nun ta desactiváu.\n" + +#: winerror.mc:2118 +msgid "Invalid ID authority.\n" +msgstr "" + +#: winerror.mc:2123 +msgid "Allotted space exceeded.\n" +msgstr "" + +#: winerror.mc:2128 +msgid "Invalid group attributes.\n" +msgstr "" + +#: winerror.mc:2133 +msgid "Bad impersonation level.\n" +msgstr "" + +#: winerror.mc:2138 +msgid "Can't open anonymous security token.\n" +msgstr "" + +#: winerror.mc:2143 +msgid "Bad validation class.\n" +msgstr "" + +#: winerror.mc:2148 +msgid "Bad token type.\n" +msgstr "" + +#: winerror.mc:2153 +msgid "No security on object.\n" +msgstr "" + +#: winerror.mc:2158 +msgid "Can't access domain information.\n" +msgstr "" + +#: winerror.mc:2163 +msgid "Invalid server state.\n" +msgstr "" + +#: winerror.mc:2168 +msgid "Invalid domain state.\n" +msgstr "" + +#: winerror.mc:2173 +msgid "Invalid domain role.\n" +msgstr "" + +#: winerror.mc:2178 +msgid "No such domain.\n" +msgstr "" + +#: winerror.mc:2183 +msgid "Domain already exists.\n" +msgstr "" + +#: winerror.mc:2188 +msgid "Domain limit exceeded.\n" +msgstr "" + +#: winerror.mc:2193 +msgid "Internal database corruption.\n" +msgstr "" + +#: winerror.mc:2198 +msgid "Internal error.\n" +msgstr "Fallu internu.\n" + +#: winerror.mc:2203 +msgid "Generic access types not mapped.\n" +msgstr "" + +#: winerror.mc:2208 +msgid "Bad descriptor format.\n" +msgstr "" + +#: winerror.mc:2213 +msgid "Not a logon process.\n" +msgstr "" + +#: winerror.mc:2218 +msgid "Logon session ID exists.\n" +msgstr "" + +#: winerror.mc:2223 +msgid "Unknown authentication package.\n" +msgstr "" + +#: winerror.mc:2228 +msgid "Bad logon session state.\n" +msgstr "" + +#: winerror.mc:2233 +msgid "Logon session ID collision.\n" +msgstr "" + +#: winerror.mc:2238 +msgid "Invalid logon type.\n" +msgstr "" + +#: winerror.mc:2243 +msgid "Cannot impersonate.\n" +msgstr "" + +#: winerror.mc:2248 +msgid "Invalid transaction state.\n" +msgstr "" + +#: winerror.mc:2253 +msgid "Security DB commit failure.\n" +msgstr "" + +#: winerror.mc:2258 +msgid "Account is built-in.\n" +msgstr "" + +#: winerror.mc:2263 +msgid "Group is built-in.\n" +msgstr "" + +#: winerror.mc:2268 +msgid "User is built-in.\n" +msgstr "L'usuariu ye integráu.\n" + +#: winerror.mc:2273 +msgid "Group is primary for user.\n" +msgstr "" + +#: winerror.mc:2278 +msgid "Token already in use.\n" +msgstr "" + +#: winerror.mc:2283 +msgid "No such local group.\n" +msgstr "" + +#: winerror.mc:2288 +msgid "User not in local group.\n" +msgstr "L'usuariu nun ta nel grupu llocal.\n" + +#: winerror.mc:2293 +msgid "User already in local group.\n" +msgstr "L'usuariu yá ta nel grupu llocal.\n" + +#: winerror.mc:2298 +msgid "Local group already exists.\n" +msgstr "El grupu llocal yá esiste.\n" + +#: winerror.mc:2303 winerror.mc:2328 +msgid "Logon type not granted.\n" +msgstr "" + +#: winerror.mc:2308 +msgid "Too many secrets.\n" +msgstr "Milenta secretos.\n" + +#: winerror.mc:2313 +msgid "Secret too long.\n" +msgstr "" + +#: winerror.mc:2318 +msgid "Internal security DB error.\n" +msgstr "" + +#: winerror.mc:2323 +msgid "Too many context IDs.\n" +msgstr "" + +#: winerror.mc:2333 +msgid "Cross-encrypted NT password required.\n" +msgstr "" + +#: winerror.mc:2338 +msgid "No such member.\n" +msgstr "" + +#: winerror.mc:2343 +msgid "Invalid member.\n" +msgstr "El miembru nun ye válidu.\n" + +#: winerror.mc:2348 +msgid "Too many SIDs.\n" +msgstr "Milenta SIDs.\n" + +#: winerror.mc:2353 +msgid "Cross-encrypted LM password required.\n" +msgstr "" + +#: winerror.mc:2358 +msgid "No inheritable components.\n" +msgstr "" + +#: winerror.mc:2363 +msgid "File or directory corrupt.\n" +msgstr "" + +#: winerror.mc:2368 +msgid "Disk is corrupt.\n" +msgstr "El discu ta toyíu.\n" + +#: winerror.mc:2373 +msgid "No user session key.\n" +msgstr "" + +#: winerror.mc:2378 +msgid "License quota exceeded.\n" +msgstr "" + +#: winerror.mc:2383 +msgid "Wrong target name.\n" +msgstr "" + +#: winerror.mc:2388 +msgid "Mutual authentication failed.\n" +msgstr "" + +#: winerror.mc:2393 +msgid "Time skew between client and server.\n" +msgstr "" + +#: winerror.mc:2398 +msgid "Invalid window handle.\n" +msgstr "" + +#: winerror.mc:2403 +msgid "Invalid menu handle.\n" +msgstr "" + +#: winerror.mc:2408 +msgid "Invalid cursor handle.\n" +msgstr "" + +#: winerror.mc:2413 +msgid "Invalid accelerator table handle.\n" +msgstr "" + +#: winerror.mc:2418 +msgid "Invalid hook handle.\n" +msgstr "" + +#: winerror.mc:2423 +msgid "Invalid DWP handle.\n" +msgstr "" + +#: winerror.mc:2428 +msgid "Can't create top-level child window.\n" +msgstr "" + +#: winerror.mc:2433 +msgid "Can't find window class.\n" +msgstr "" + +#: winerror.mc:2438 +msgid "Window owned by another thread.\n" +msgstr "" + +#: winerror.mc:2443 +msgid "Hotkey already registered.\n" +msgstr "" + +#: winerror.mc:2448 +msgid "Class already exists.\n" +msgstr "La clas yá esiste.\n" + +#: winerror.mc:2453 +msgid "Class does not exist.\n" +msgstr "La clas nun esiste.\n" + +#: winerror.mc:2458 +msgid "Class has open windows.\n" +msgstr "La clas tien ventanes abiertes.\n" + +#: winerror.mc:2463 +msgid "Invalid index.\n" +msgstr "" + +#: winerror.mc:2468 +msgid "Invalid icon handle.\n" +msgstr "" + +#: winerror.mc:2473 +msgid "Private dialog index.\n" +msgstr "" + +#: winerror.mc:2478 +msgid "List box ID not found.\n" +msgstr "" + +#: winerror.mc:2483 +msgid "No wildcard characters.\n" +msgstr "" + +#: winerror.mc:2488 +msgid "Clipboard not open.\n" +msgstr "El cartafueyu nun ta abiertu.\n" + +#: winerror.mc:2493 +msgid "Hotkey not registered.\n" +msgstr "" + +#: winerror.mc:2498 +msgid "Not a dialog window.\n" +msgstr "" + +#: winerror.mc:2503 +msgid "Control ID not found.\n" +msgstr "" + +#: winerror.mc:2508 +msgid "Invalid combo box message.\n" +msgstr "" + +#: winerror.mc:2513 +msgid "Not a combo box window.\n" +msgstr "" + +#: winerror.mc:2518 +msgid "Invalid edit height.\n" +msgstr "" + +#: winerror.mc:2523 +msgid "DC not found.\n" +msgstr "" + +#: winerror.mc:2528 +msgid "Invalid hook filter.\n" +msgstr "" + +#: winerror.mc:2533 +msgid "Invalid filter procedure.\n" +msgstr "" + +#: winerror.mc:2538 +msgid "Hook procedure needs module handle.\n" +msgstr "" + +#: winerror.mc:2543 +msgid "Global-only hook procedure.\n" +msgstr "" + +#: winerror.mc:2548 +msgid "Journal hook already set.\n" +msgstr "" + +#: winerror.mc:2553 +msgid "Hook procedure not installed.\n" +msgstr "" + +#: winerror.mc:2558 +msgid "Invalid list box message.\n" +msgstr "" + +#: winerror.mc:2563 +msgid "Invalid LB_SETCOUNT sent.\n" +msgstr "" + +#: winerror.mc:2568 +msgid "No tab stops on this list box.\n" +msgstr "" + +#: winerror.mc:2573 +msgid "Can't destroy object owned by another thread.\n" +msgstr "" + +#: winerror.mc:2578 +msgid "Child window menus not allowed.\n" +msgstr "" + +#: winerror.mc:2583 +msgid "Window has no system menu.\n" +msgstr "" + +#: winerror.mc:2588 +msgid "Invalid message box style.\n" +msgstr "" + +#: winerror.mc:2593 +msgid "Invalid SPI parameter.\n" +msgstr "" + +#: winerror.mc:2598 +msgid "Screen already locked.\n" +msgstr "" + +#: winerror.mc:2603 +msgid "Window handles have different parents.\n" +msgstr "" + +#: winerror.mc:2608 +msgid "Not a child window.\n" +msgstr "" + +#: winerror.mc:2613 +msgid "Invalid GW command.\n" +msgstr "" + +#: winerror.mc:2618 +msgid "Invalid thread ID.\n" +msgstr "" + +#: winerror.mc:2623 +msgid "Not an MDI child window.\n" +msgstr "" + +#: winerror.mc:2628 +msgid "Popup menu already active.\n" +msgstr "" + +#: winerror.mc:2633 +msgid "No scrollbars.\n" +msgstr "" + +#: winerror.mc:2638 +msgid "Invalid scrollbar range.\n" +msgstr "" + +#: winerror.mc:2643 +msgid "Invalid ShowWin command.\n" +msgstr "" + +#: winerror.mc:2648 +msgid "No system resources.\n" +msgstr "" + +#: winerror.mc:2653 +msgid "No non-paged system resources.\n" +msgstr "" + +#: winerror.mc:2658 +msgid "No paged system resources.\n" +msgstr "" + +#: winerror.mc:2663 +msgid "No working set quota.\n" +msgstr "" + +#: winerror.mc:2668 +msgid "No page file quota.\n" +msgstr "" + +#: winerror.mc:2673 +msgid "Exceeded commitment limit.\n" +msgstr "" + +#: winerror.mc:2678 +msgid "Menu item not found.\n" +msgstr "" + +#: winerror.mc:2683 +msgid "Invalid keyboard handle.\n" +msgstr "" + +#: winerror.mc:2688 +msgid "Hook type not allowed.\n" +msgstr "" + +#: winerror.mc:2693 +msgid "Interactive window station required.\n" +msgstr "" + +#: winerror.mc:2698 +msgid "Timeout.\n" +msgstr "" + +#: winerror.mc:2703 +msgid "Invalid monitor handle.\n" +msgstr "" + +#: winerror.mc:2708 +msgid "Event log file corrupt.\n" +msgstr "" + +#: winerror.mc:2713 +msgid "Event log can't start.\n" +msgstr "" + +#: winerror.mc:2718 +msgid "Event log file full.\n" +msgstr "" + +#: winerror.mc:2723 +msgid "Event log file changed.\n" +msgstr "" + +#: winerror.mc:2728 +msgid "Installer service failed.\n" +msgstr "" + +#: winerror.mc:2733 +msgid "Installation aborted by user.\n" +msgstr "" + +#: winerror.mc:2738 +msgid "Installation failure.\n" +msgstr "" + +#: winerror.mc:2743 +msgid "Installation suspended.\n" +msgstr "" + +#: winerror.mc:2748 +msgid "Unknown product.\n" +msgstr "" + +#: winerror.mc:2753 +msgid "Unknown feature.\n" +msgstr "" + +#: winerror.mc:2758 +msgid "Unknown component.\n" +msgstr "" + +#: winerror.mc:2763 +msgid "Unknown property.\n" +msgstr "" + +#: winerror.mc:2768 +msgid "Invalid handle state.\n" +msgstr "" + +#: winerror.mc:2773 +msgid "Bad configuration.\n" +msgstr "" + +#: winerror.mc:2778 +msgid "Index is missing.\n" +msgstr "" + +#: winerror.mc:2783 +msgid "Installation source is missing.\n" +msgstr "" + +#: winerror.mc:2788 +msgid "Wrong installation package version.\n" +msgstr "" + +#: winerror.mc:2793 +msgid "Product uninstalled.\n" +msgstr "" + +#: winerror.mc:2798 +msgid "Invalid query syntax.\n" +msgstr "" + +#: winerror.mc:2803 +msgid "Invalid field.\n" +msgstr "El campu nun ye válidu.\n" + +#: winerror.mc:2808 +msgid "Device removed.\n" +msgstr "" + +#: winerror.mc:2813 +msgid "Installation already running.\n" +msgstr "" + +#: winerror.mc:2818 +msgid "Installation package failed to open.\n" +msgstr "" + +#: winerror.mc:2823 +msgid "Installation package is invalid.\n" +msgstr "" + +#: winerror.mc:2828 +msgid "Installer user interface failed.\n" +msgstr "" + +#: winerror.mc:2833 +msgid "Failed to open installation log file.\n" +msgstr "" + +#: winerror.mc:2838 +msgid "Installation language not supported.\n" +msgstr "" + +#: winerror.mc:2843 +msgid "Installation transform failed to apply.\n" +msgstr "" + +#: winerror.mc:2848 +msgid "Installation package rejected.\n" +msgstr "" + +#: winerror.mc:2853 +msgid "Function could not be called.\n" +msgstr "" + +#: winerror.mc:2858 +msgid "Function failed.\n" +msgstr "" + +#: winerror.mc:2863 +msgid "Invalid table.\n" +msgstr "" + +#: winerror.mc:2868 +msgid "Data type mismatch.\n" +msgstr "" + +#: winerror.mc:2873 winerror.mc:3083 +msgid "Unsupported type.\n" +msgstr "" + +#: winerror.mc:2878 +msgid "Creation failed.\n" +msgstr "" + +#: winerror.mc:2883 +msgid "Temporary directory not writable.\n" +msgstr "" + +#: winerror.mc:2888 +msgid "Installation platform not supported.\n" +msgstr "" + +#: winerror.mc:2893 +msgid "Installer not used.\n" +msgstr "" + +#: winerror.mc:2898 +msgid "Failed to open the patch package.\n" +msgstr "" + +#: winerror.mc:2903 +msgid "Invalid patch package.\n" +msgstr "" + +#: winerror.mc:2908 +msgid "Unsupported patch package.\n" +msgstr "" + +#: winerror.mc:2913 +msgid "Another version is installed.\n" +msgstr "" + +#: winerror.mc:2918 +msgid "Invalid command line.\n" +msgstr "" + +#: winerror.mc:2923 +msgid "Remote installation not allowed.\n" +msgstr "" + +#: winerror.mc:2928 +msgid "Reboot initiated after successful install.\n" +msgstr "" + +#: winerror.mc:2933 +msgid "Invalid string binding.\n" +msgstr "" + +#: winerror.mc:2938 +msgid "Wrong kind of binding.\n" +msgstr "" + +#: winerror.mc:2943 +msgid "Invalid binding.\n" +msgstr "" + +#: winerror.mc:2948 +msgid "RPC protocol sequence not supported.\n" +msgstr "" + +#: winerror.mc:2953 +msgid "Invalid RPC protocol sequence.\n" +msgstr "" + +#: winerror.mc:2958 +msgid "Invalid string UUID.\n" +msgstr "" + +#: winerror.mc:2963 +msgid "Invalid endpoint format.\n" +msgstr "" + +#: winerror.mc:2968 +msgid "Invalid network address.\n" +msgstr "" + +#: winerror.mc:2973 +msgid "No endpoint found.\n" +msgstr "" + +#: winerror.mc:2978 +msgid "Invalid timeout value.\n" +msgstr "" + +#: winerror.mc:2983 +msgid "Object UUID not found.\n" +msgstr "" + +#: winerror.mc:2988 +msgid "UUID already registered.\n" +msgstr "" + +#: winerror.mc:2993 +msgid "UUID type already registered.\n" +msgstr "" + +#: winerror.mc:2998 +msgid "Server already listening.\n" +msgstr "" + +#: winerror.mc:3003 +msgid "No protocol sequences registered.\n" +msgstr "" + +#: winerror.mc:3008 +msgid "RPC server not listening.\n" +msgstr "" + +#: winerror.mc:3013 +msgid "Unknown manager type.\n" +msgstr "" + +#: winerror.mc:3018 +msgid "Unknown interface.\n" +msgstr "" + +#: winerror.mc:3023 +msgid "No bindings.\n" +msgstr "" + +#: winerror.mc:3028 +msgid "No protocol sequences.\n" +msgstr "" + +#: winerror.mc:3033 +msgid "Can't create endpoint.\n" +msgstr "" + +#: winerror.mc:3038 +msgid "Out of resources.\n" +msgstr "" + +#: winerror.mc:3043 +msgid "RPC server unavailable.\n" +msgstr "El sirvidor RPC nun ta disponible.\n" + +#: winerror.mc:3048 +msgid "RPC server too busy.\n" +msgstr "El sirvidor RPC ta perocupáu.\n" + +#: winerror.mc:3053 +msgid "Invalid network options.\n" +msgstr "" + +#: winerror.mc:3058 +msgid "No RPC call active.\n" +msgstr "" + +#: winerror.mc:3063 +msgid "RPC call failed.\n" +msgstr "" + +#: winerror.mc:3068 +msgid "RPC call failed and didn't execute.\n" +msgstr "" + +#: winerror.mc:3073 +msgid "RPC protocol error.\n" +msgstr "Fallu del protocolu RPC.\n" + +#: winerror.mc:3078 +msgid "Unsupported transfer syntax.\n" +msgstr "" + +#: winerror.mc:3088 +msgid "Invalid tag.\n" +msgstr "" + +#: winerror.mc:3093 +msgid "Invalid array bounds.\n" +msgstr "" + +#: winerror.mc:3098 +msgid "No entry name.\n" +msgstr "" + +#: winerror.mc:3103 +msgid "Invalid name syntax.\n" +msgstr "" + +#: winerror.mc:3108 +msgid "Unsupported name syntax.\n" +msgstr "" + +#: winerror.mc:3113 +msgid "No network address.\n" +msgstr "" + +#: winerror.mc:3118 +msgid "Duplicate endpoint.\n" +msgstr "" + +#: winerror.mc:3123 +msgid "Unknown authentication type.\n" +msgstr "" + +#: winerror.mc:3128 +msgid "Maximum calls too low.\n" +msgstr "" + +#: winerror.mc:3133 +msgid "String too long.\n" +msgstr "La cadena ye perllarga.\n" + +#: winerror.mc:3138 +msgid "Protocol sequence not found.\n" +msgstr "" + +#: winerror.mc:3143 +msgid "Procedure number out of range.\n" +msgstr "" + +#: winerror.mc:3148 +msgid "Binding has no authentication data.\n" +msgstr "" + +#: winerror.mc:3153 +msgid "Unknown authentication service.\n" +msgstr "" + +#: winerror.mc:3158 +msgid "Unknown authentication level.\n" +msgstr "" + +#: winerror.mc:3163 +msgid "Invalid authentication identity.\n" +msgstr "" + +#: winerror.mc:3168 +msgid "Unknown authorization service.\n" +msgstr "" + +#: winerror.mc:3173 +msgid "Invalid entry.\n" +msgstr "La entrada nun ye válida.\n" + +#: winerror.mc:3178 +msgid "Can't perform operation.\n" +msgstr "" + +#: winerror.mc:3183 +msgid "Endpoints not registered.\n" +msgstr "" + +#: winerror.mc:3188 +msgid "Nothing to export.\n" +msgstr "" + +#: winerror.mc:3193 +msgid "Incomplete name.\n" +msgstr "" + +#: winerror.mc:3198 +msgid "Invalid version option.\n" +msgstr "" + +#: winerror.mc:3203 +msgid "No more members.\n" +msgstr "" + +#: winerror.mc:3208 +msgid "Not all objects unexported.\n" +msgstr "" + +#: winerror.mc:3213 +msgid "Interface not found.\n" +msgstr "" + +#: winerror.mc:3218 +msgid "Entry already exists.\n" +msgstr "" + +#: winerror.mc:3223 +msgid "Entry not found.\n" +msgstr "" + +#: winerror.mc:3228 +msgid "Name service unavailable.\n" +msgstr "" + +#: winerror.mc:3233 +msgid "Invalid network address family.\n" +msgstr "" + +#: winerror.mc:3238 +msgid "Operation not supported.\n" +msgstr "Nun se sofita la operación.\n" + +#: winerror.mc:3243 +msgid "No security context available.\n" +msgstr "" + +#: winerror.mc:3248 +msgid "RPCInternal error.\n" +msgstr "" + +#: winerror.mc:3253 +msgid "RPC divide-by-zero.\n" +msgstr "" + +#: winerror.mc:3258 +msgid "Address error.\n" +msgstr "" + +#: winerror.mc:3263 +msgid "Floating-point divide-by-zero.\n" +msgstr "" + +#: winerror.mc:3268 +msgid "Floating-point underflow.\n" +msgstr "" + +#: winerror.mc:3273 +msgid "Floating-point overflow.\n" +msgstr "" + +#: winerror.mc:3278 +msgid "No more entries.\n" +msgstr "Nun hai más entraes.\n" + +#: winerror.mc:3283 +msgid "Character translation table open failed.\n" +msgstr "" + +#: winerror.mc:3288 +msgid "Character translation table file too small.\n" +msgstr "" + +#: winerror.mc:3293 +msgid "Null context handle.\n" +msgstr "" + +#: winerror.mc:3298 +msgid "Context handle damaged.\n" +msgstr "" + +#: winerror.mc:3303 +msgid "Binding handle mismatch.\n" +msgstr "" + +#: winerror.mc:3308 +msgid "Cannot get call handle.\n" +msgstr "" + +#: winerror.mc:3313 +msgid "Null reference pointer.\n" +msgstr "" + +#: winerror.mc:3318 +msgid "Enumeration value out of range.\n" +msgstr "" + +#: winerror.mc:3323 +msgid "Byte count too small.\n" +msgstr "" + +#: winerror.mc:3328 +msgid "Bad stub data.\n" +msgstr "" + +#: winerror.mc:3333 +msgid "Invalid user buffer.\n" +msgstr "" + +#: winerror.mc:3338 +msgid "Unrecognized media.\n" +msgstr "" + +#: winerror.mc:3343 +msgid "No trust secret.\n" +msgstr "" + +#: winerror.mc:3348 +msgid "No trust SAM account.\n" +msgstr "" + +#: winerror.mc:3353 +msgid "Trusted domain failure.\n" +msgstr "" + +#: winerror.mc:3358 +msgid "Trusted relationship failure.\n" +msgstr "" + +#: winerror.mc:3363 +msgid "Trust logon failure.\n" +msgstr "" + +#: winerror.mc:3368 +msgid "RPC call already in progress.\n" +msgstr "" + +#: winerror.mc:3373 +msgid "NETLOGON is not started.\n" +msgstr "" + +#: winerror.mc:3378 +msgid "Account expired.\n" +msgstr "" + +#: winerror.mc:3383 +msgid "Redirector has open handles.\n" +msgstr "" + +#: winerror.mc:3388 +msgid "Printer driver already installed.\n" +msgstr "" + +#: winerror.mc:3393 +msgid "Unknown port.\n" +msgstr "" + +#: winerror.mc:3398 +msgid "Unknown printer driver.\n" +msgstr "" + +#: winerror.mc:3403 +msgid "Unknown print processor.\n" +msgstr "" + +#: winerror.mc:3408 +msgid "Invalid separator file.\n" +msgstr "" + +#: winerror.mc:3413 +msgid "Invalid priority.\n" +msgstr "La prioridá nun ye válida.\n" + +#: winerror.mc:3418 +msgid "Invalid printer name.\n" +msgstr "" + +#: winerror.mc:3423 +msgid "Printer already exists.\n" +msgstr "" + +#: winerror.mc:3428 +msgid "Invalid printer command.\n" +msgstr "" + +#: winerror.mc:3433 +msgid "Invalid data type.\n" +msgstr "" + +#: winerror.mc:3438 +msgid "Invalid environment.\n" +msgstr "L'entornu nun ye válidu.\n" + +#: winerror.mc:3443 +msgid "No more bindings.\n" +msgstr "" + +#: winerror.mc:3448 +msgid "Can't log on with inter-domain trust account.\n" +msgstr "" + +#: winerror.mc:3453 +msgid "Can't log on with workstation trust account.\n" +msgstr "" + +#: winerror.mc:3458 +msgid "Can't log on with server trust account.\n" +msgstr "" + +#: winerror.mc:3463 +msgid "Domain trust information inconsistent.\n" +msgstr "" + +#: winerror.mc:3468 +msgid "Server has open handles.\n" +msgstr "" + +#: winerror.mc:3473 +msgid "Resource data not found.\n" +msgstr "" + +#: winerror.mc:3478 +msgid "Resource type not found.\n" +msgstr "" + +#: winerror.mc:3483 +msgid "Resource name not found.\n" +msgstr "" + +#: winerror.mc:3488 +msgid "Resource language not found.\n" +msgstr "" + +#: winerror.mc:3493 +msgid "Not enough quota.\n" +msgstr "" + +#: winerror.mc:3498 +msgid "No interfaces.\n" +msgstr "" + +#: winerror.mc:3503 +msgid "RPC call canceled.\n" +msgstr "" + +#: winerror.mc:3508 +msgid "Binding incomplete.\n" +msgstr "" + +#: winerror.mc:3513 +msgid "RPC comm failure.\n" +msgstr "" + +#: winerror.mc:3518 +msgid "Unsupported authorization level.\n" +msgstr "" + +#: winerror.mc:3523 +msgid "No principal name registered.\n" +msgstr "" + +#: winerror.mc:3528 +msgid "Not an RPC error.\n" +msgstr "" + +#: winerror.mc:3533 +msgid "UUID is local only.\n" +msgstr "" + +#: winerror.mc:3538 +msgid "Security package error.\n" +msgstr "" + +#: winerror.mc:3543 +msgid "Thread not canceled.\n" +msgstr "Nun s'encaboxó'l filu.\n" + +#: winerror.mc:3548 +msgid "Invalid handle operation.\n" +msgstr "" + +#: winerror.mc:3553 +msgid "Wrong serializing package version.\n" +msgstr "" + +#: winerror.mc:3558 +msgid "Wrong stub version.\n" +msgstr "" + +#: winerror.mc:3563 +msgid "Invalid pipe object.\n" +msgstr "" + +#: winerror.mc:3568 +msgid "Wrong pipe order.\n" +msgstr "" + +#: winerror.mc:3573 +msgid "Wrong pipe version.\n" +msgstr "" + +#: winerror.mc:3578 +msgid "Group member not found.\n" +msgstr "" + +#: winerror.mc:3583 +msgid "Can't create endpoint mapper DB.\n" +msgstr "" + +#: winerror.mc:3588 +msgid "Invalid object.\n" +msgstr "L'oxetu nun ye válidu.\n" + +#: winerror.mc:3593 +msgid "Invalid time.\n" +msgstr "" + +#: winerror.mc:3598 +msgid "Invalid form name.\n" +msgstr "" + +#: winerror.mc:3603 +msgid "Invalid form size.\n" +msgstr "" + +#: winerror.mc:3608 +msgid "Already awaiting printer handle.\n" +msgstr "" + +#: winerror.mc:3613 +msgid "Printer deleted.\n" +msgstr "" + +#: winerror.mc:3618 +msgid "Invalid printer state.\n" +msgstr "" + +#: winerror.mc:3623 +msgid "User must change password.\n" +msgstr "L'usuariu ha camudar la contraseña.\n" + +#: winerror.mc:3628 +msgid "Domain controller not found.\n" +msgstr "" + +#: winerror.mc:3633 +msgid "Account locked out.\n" +msgstr "" + +#: winerror.mc:3638 +msgid "Invalid pixel format.\n" +msgstr "" + +#: winerror.mc:3643 +msgid "Invalid driver.\n" +msgstr "El controlador nun ye válidu.\n" + +#: winerror.mc:3648 +msgid "Invalid object resolver set.\n" +msgstr "" + +#: winerror.mc:3653 +msgid "Incomplete RPC send.\n" +msgstr "" + +#: winerror.mc:3658 +msgid "Invalid asynchronous RPC handle.\n" +msgstr "" + +#: winerror.mc:3663 +msgid "Invalid asynchronous RPC call.\n" +msgstr "" + +#: winerror.mc:3668 +msgid "RPC pipe closed.\n" +msgstr "" + +#: winerror.mc:3673 +msgid "Discipline error on RPC pipe.\n" +msgstr "" + +#: winerror.mc:3678 +msgid "No data on RPC pipe.\n" +msgstr "" + +#: winerror.mc:3683 +msgid "No site name available.\n" +msgstr "" + +#: winerror.mc:3688 +msgid "The file cannot be accessed.\n" +msgstr "Nun pue accedese al ficheru.\n" + +#: winerror.mc:3693 +msgid "The filename cannot be resolved.\n" +msgstr "" + +#: winerror.mc:3698 +msgid "RPC entry type mismatch.\n" +msgstr "" + +#: winerror.mc:3703 +msgid "Not all objects could be exported.\n" +msgstr "" + +#: winerror.mc:3708 +msgid "The interface could not be exported.\n" +msgstr "La interfaz nun pudo esportase.\n" + +#: winerror.mc:3713 +msgid "The profile could not be added.\n" +msgstr "El perfil nun pudo amestase.\n" + +#: winerror.mc:3718 +msgid "The profile element could not be added.\n" +msgstr "" + +#: winerror.mc:3723 +msgid "The profile element could not be removed.\n" +msgstr "" + +#: winerror.mc:3728 +msgid "The group element could not be added.\n" +msgstr "" + +#: winerror.mc:3733 +msgid "The group element could not be removed.\n" +msgstr "" + +#: winerror.mc:3738 +msgid "The username could not be found.\n" +msgstr "" + +#: winerror.mc:3743 +msgid "This network connection does not exist.\n" +msgstr "" + +#: winerror.mc:3748 +msgid "Connection reset by peer.\n" +msgstr "" + +#: winerror.mc:3760 +msgid "No Signature found in file.\n" +msgstr "" + +#: localspl.rc:31 localui.rc:31 winspool.rc:30 +msgid "Local Port" +msgstr "Puertu llocal" + +#: localspl.rc:32 +msgid "Local Monitor" +msgstr "" + +#: localui.rc:39 +msgid "Add a Local Port" +msgstr "" + +#: localui.rc:42 +msgid "&Enter the port name to add:" +msgstr "" + +#: localui.rc:51 +msgid "Configure LPT Port" +msgstr "" + +#: localui.rc:54 +msgid "Timeout (seconds)" +msgstr "" + +#: localui.rc:55 +msgid "&Transmission Retry:" +msgstr "" + +#: localui.rc:32 +msgid "'%s' is not a valid port name" +msgstr "" + +#: localui.rc:33 +msgid "Port %s already exists" +msgstr "" + +#: localui.rc:34 +msgid "This port has no options to configure" +msgstr "" + +#: mapi32.rc:31 +msgid "Mail sending failed as you do not have a MAPI mail client installed." +msgstr "" + +#: mapi32.rc:32 +msgid "Send Mail" +msgstr "" + +#: mpr.rc:35 wininet.rc:37 +msgid "Enter Network Password" +msgstr "" + +#: mpr.rc:38 wininet.rc:40 wininet.rc:60 +msgid "Please enter your username and password:" +msgstr "" + +#: mpr.rc:39 wininet.rc:41 +msgid "Proxy" +msgstr "Proxy" + +#: mpr.rc:41 wininet.rc:43 wininet.rc:63 +msgid "User" +msgstr "" + +#: mpr.rc:42 wininet.rc:44 wininet.rc:64 +msgid "Password" +msgstr "Contraseña" + +#: mpr.rc:47 wininet.rc:49 wininet.rc:69 +msgid "&Save this password (insecure)" +msgstr "" + +#: mpr.rc:30 +msgid "Entire Network" +msgstr "" + +#: msacm32.rc:30 +msgid "Sound Selection" +msgstr "" + +#: msacm32.rc:39 winedbg.rc:77 +msgid "&Save As..." +msgstr "&Guardar como..." + +#: msacm32.rc:42 +msgid "&Format:" +msgstr "" + +#: msacm32.rc:47 +msgid "&Attributes:" +msgstr "&Atributos:" + +#: mshtml.rc:39 +msgid "Hyperlink" +msgstr "" + +#: mshtml.rc:42 +msgid "Hyperlink Information" +msgstr "" + +#: mshtml.rc:43 winecfg.rc:245 +msgid "&Type:" +msgstr "" + +#: mshtml.rc:45 +msgid "&URL:" +msgstr "&URL:" + +#: mshtml.rc:34 +msgid "HTML Document" +msgstr "Documentu HTML" + +#: mshtml.rc:29 +msgid "Downloading from %s..." +msgstr "" + +#: mshtml.rc:28 +msgid "Done" +msgstr "" + +#: msi.rc:31 +msgid "" +"The specified installation package could not be opened. Please check the " +"file path and try again." +msgstr "" + +#: msi.rc:32 +msgid "path %s not found" +msgstr "" + +#: msi.rc:33 +msgid "insert disk %s" +msgstr "" + +#: msi.rc:34 +msgid "" +"Windows Installer %s\n" +"\n" +"Usage:\n" +"msiexec command {required parameter} [optional parameter]\n" +"\n" +"Install a product:\n" +"\t/i {package|product_code} [property]\n" +"\t/package {package|product_code} [property]\n" +"\t/a package [property]\n" +"Repair an installation:\n" +"\t/f[p|o|e|d|c|a|u|m|s|v] {package|product_code}\n" +"Uninstall a product:\n" +"\t/uninstall {package|product_code} [property]\n" +"\t/x {package|product_code} [property]\n" +"Advertise a product:\n" +"\t/j[u|m] package [/t transform] [/g languageid]\n" +"Apply a patch:\n" +"\t/p patch_package [property]\n" +"\t/p patch_package /a package [property]\n" +"Log and user interface modifiers for the above commands:\n" +"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] log_file\n" +"\t/q{|n|b|r|f|n+|b+|b-}\n" +"Register the MSI Service:\n" +"\t/y\n" +"Unregister the MSI Service:\n" +"\t/z\n" +"Display this help:\n" +"\t/help\n" +"\t/?\n" +msgstr "" + +#: msi.rc:61 +msgid "enter which folder contains %s" +msgstr "" + +#: msi.rc:62 +msgid "install source for feature missing" +msgstr "" + +#: msi.rc:63 +msgid "network drive for feature missing" +msgstr "" + +#: msi.rc:64 +msgid "feature from:" +msgstr "" + +#: msi.rc:65 +msgid "choose which folder contains %s" +msgstr "" + +#: msi.rc:66 shell32.rc:238 +msgid "New Folder" +msgstr "Carpeta nueva" + +#: msi.rc:91 +msgid "Allocating registry space" +msgstr "" + +#: msi.rc:92 +msgid "Searching for installed applications" +msgstr "" + +#: msi.rc:93 +msgid "Binding executables" +msgstr "" + +#: msi.rc:94 msi.rc:137 +msgid "Searching for qualifying products" +msgstr "" + +#: msi.rc:95 msi.rc:96 msi.rc:101 +msgid "Computing space requirements" +msgstr "" + +#: msi.rc:97 +msgid "Creating folders" +msgstr "" + +#: msi.rc:98 +msgid "Creating shortcuts" +msgstr "" + +#: msi.rc:99 +msgid "Deleting services" +msgstr "" + +#: msi.rc:100 +msgid "Creating duplicate files" +msgstr "" + +#: msi.rc:102 +msgid "Searching for related applications" +msgstr "" + +#: msi.rc:103 +msgid "Copying network install files" +msgstr "" + +#: msi.rc:104 +msgid "Copying new files" +msgstr "" + +#: msi.rc:105 +msgid "Installing ODBC components" +msgstr "" + +#: msi.rc:106 +msgid "Installing new services" +msgstr "" + +#: msi.rc:107 +msgid "Installing system catalog" +msgstr "" + +#: msi.rc:108 +msgid "Validating install" +msgstr "" + +#: msi.rc:109 +msgid "Evaluating launch conditions" +msgstr "" + +#: msi.rc:110 +msgid "Migrating feature states from related applications" +msgstr "" + +#: msi.rc:111 +msgid "Moving files" +msgstr "" + +#: msi.rc:112 +msgid "Publishing assembly information" +msgstr "" + +#: msi.rc:113 +msgid "Unpublishing assembly information" +msgstr "" + +#: msi.rc:114 +msgid "Patching files" +msgstr "" + +#: msi.rc:115 +msgid "Updating component registration" +msgstr "" + +#: msi.rc:116 +msgid "Publishing Qualified Components" +msgstr "" + +#: msi.rc:117 +msgid "Publishing Product Features" +msgstr "" + +#: msi.rc:118 +msgid "Publishing product information" +msgstr "" + +#: msi.rc:119 +msgid "Registering Class servers" +msgstr "" + +#: msi.rc:120 +msgid "Registering COM+ Applications and Components" +msgstr "" + +#: msi.rc:121 +msgid "Registering extension servers" +msgstr "" + +#: msi.rc:122 +msgid "Registering fonts" +msgstr "" + +#: msi.rc:123 +msgid "Registering MIME info" +msgstr "" + +#: msi.rc:124 +msgid "Registering product" +msgstr "" + +#: msi.rc:125 +msgid "Registering program identifiers" +msgstr "" + +#: msi.rc:126 +msgid "Registering type libraries" +msgstr "" + +#: msi.rc:127 +msgid "Registering user" +msgstr "" + +#: msi.rc:128 +msgid "Removing duplicated files" +msgstr "" + +#: msi.rc:129 msi.rc:153 +msgid "Updating environment strings" +msgstr "" + +#: msi.rc:130 +msgid "Removing applications" +msgstr "" + +#: msi.rc:131 +msgid "Removing files" +msgstr "" + +#: msi.rc:132 +msgid "Removing folders" +msgstr "" + +#: msi.rc:133 +msgid "Removing INI files entries" +msgstr "" + +#: msi.rc:134 +msgid "Removing ODBC components" +msgstr "" + +#: msi.rc:135 +msgid "Removing system registry values" +msgstr "" + +#: msi.rc:136 +msgid "Removing shortcuts" +msgstr "" + +#: msi.rc:138 +msgid "Registering modules" +msgstr "" + +#: msi.rc:139 +msgid "Unregistering modules" +msgstr "" + +#: msi.rc:140 +msgid "Initializing ODBC directories" +msgstr "" + +#: msi.rc:141 +msgid "Starting services" +msgstr "" + +#: msi.rc:142 +msgid "Stopping services" +msgstr "" + +#: msi.rc:143 +msgid "Unpublishing Qualified Components" +msgstr "" + +#: msi.rc:144 +msgid "Unpublishing Product Features" +msgstr "" + +#: msi.rc:145 +msgid "Unpublishing product information" +msgstr "" + +#: msi.rc:146 +msgid "Unregister Class servers" +msgstr "" + +#: msi.rc:147 +msgid "Unregistering COM+ Applications and Components" +msgstr "" + +#: msi.rc:148 +msgid "Unregistering extension servers" +msgstr "" + +#: msi.rc:149 +msgid "Unregistering fonts" +msgstr "" + +#: msi.rc:150 +msgid "Unregistering MIME info" +msgstr "" + +#: msi.rc:151 +msgid "Unregistering program identifiers" +msgstr "" + +#: msi.rc:152 +msgid "Unregistering type libraries" +msgstr "" + +#: msi.rc:154 +msgid "Writing INI files values" +msgstr "" + +#: msi.rc:155 +msgid "Writing system registry values" +msgstr "" + +#: msi.rc:161 +msgid "Free space: [1]" +msgstr "" + +#: msi.rc:162 +msgid "Property: [1], Signature: [2]" +msgstr "" + +#: msi.rc:163 +msgid "File: [1]" +msgstr "Ficheru: [1]" + +#: msi.rc:164 msi.rc:191 +msgid "Folder: [1]" +msgstr "Carpeta: [1]" + +#: msi.rc:165 msi.rc:194 +msgid "Shortcut: [1]" +msgstr "" + +#: msi.rc:166 msi.rc:197 msi.rc:198 +msgid "Service: [1]" +msgstr "Serviciu: [1]" + +#: msi.rc:167 msi.rc:170 msi.rc:174 +msgid "File: [1], Directory: [9], Size: [6]" +msgstr "Ficheru: [1], Direutoriu: [9], Tamañu: [6]" + +#: msi.rc:168 +msgid "Found application: [1]" +msgstr "" + +#: msi.rc:169 +msgid "File: [1], Directory: [9], Size: [6]" +msgstr "Ficheru: [1], Direutoriu: [9], Tamañu: [6]" + +#: msi.rc:171 +msgid "Service: [2]" +msgstr "Serviciu: [2]" + +#: msi.rc:172 +msgid "File: [1], Dependencies: [2]" +msgstr "Ficheru: [1], Dependencies: [2]" + +#: msi.rc:173 +msgid "Application: [1]" +msgstr "Aplicación: [1]" + +#: msi.rc:175 msi.rc:176 +msgid "Application Context:[1], Assembly Name:[2]" +msgstr "" + +#: msi.rc:177 +msgid "File: [1], Directory: [2], Size: [3]" +msgstr "Ficheru: [1], Direutoriu: [2], Tamañu: [3]" + +#: msi.rc:178 msi.rc:199 +msgid "Component ID: [1], Qualifier: [2]" +msgstr "" + +#: msi.rc:179 msi.rc:200 +msgid "Feature: [1]" +msgstr "Carauterística: [1]" + +#: msi.rc:180 msi.rc:201 +msgid "Class Id: [1]" +msgstr "" + +#: msi.rc:181 +msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" +msgstr "" + +#: msi.rc:182 msi.rc:203 +msgid "Extension: [1]" +msgstr "Estensión: [1]" + +#: msi.rc:183 msi.rc:204 +msgid "Font: [1]" +msgstr "" + +#: msi.rc:184 msi.rc:205 +msgid "MIME Content Type: [1], Extension: [2]" +msgstr "" + +#: msi.rc:185 msi.rc:206 +msgid "ProgId: [1]" +msgstr "" + +#: msi.rc:186 msi.rc:207 +msgid "LibID: [1]" +msgstr "LibID: [1]" + +#: msi.rc:187 msi.rc:190 +msgid "File: [1], Directory: [9]" +msgstr "Ficheru: [1], Direutoriu: [9]" + +#: msi.rc:188 msi.rc:208 +msgid "Name: [1], Value: [2], Action [3]" +msgstr "" + +#: msi.rc:189 +msgid "Application: [1], Command line: [2]" +msgstr "" + +#: msi.rc:192 msi.rc:209 +msgid "File: [1], Section: [2], Key: [3], Value: [4]" +msgstr "Ficheru: [1], Seición: [2], Clave: [3], Valor: [4]" + +#: msi.rc:193 +msgid "Key: [1], Name: [2]" +msgstr "" + +#: msi.rc:195 msi.rc:196 +msgid "File: [1], Folder: [2]" +msgstr "Ficheru: [1], Carpeta: [2]" + +#: msi.rc:202 +msgid "AppId: [1]{{, AppType: [2]}}" +msgstr "" + +#: msi.rc:210 +msgid "Key: [1], Name: [2], Value: [3]" +msgstr "" + +#: msi.rc:72 +msgid "{{Fatal error: }}" +msgstr "{{Fallu fatal: }}" + +#: msi.rc:73 +msgid "{{Error [1]. }}" +msgstr "{{Fallu [1]. }}" + +#: msi.rc:74 +msgid "Warning [1]." +msgstr "" + +#: msi.rc:75 +msgid "Info [1]." +msgstr "" + +#: msi.rc:76 +msgid "" +"The installer has encountered an unexpected error installing this package. " +"This may indicate a problem with this package. The error code is [1]. {{The " +"arguments are: [2], [3], [4]}}" +msgstr "" + +#: msi.rc:77 +msgid "{{Disk full: }}" +msgstr "{{Discu enllén: }}" + +#: msi.rc:78 +msgid "Action [Time]: [1]. [2]" +msgstr "" + +#: msi.rc:79 +msgid "Message type: [1], Argument: [2]{, [3]}" +msgstr "" + +#: msi.rc:82 +msgid "=== Logging started: [Date] [Time] ===" +msgstr "" + +#: msi.rc:80 +msgid "Action start [Time]: [1]." +msgstr "" + +#: msi.rc:81 +msgid "Action ended [Time]: [1]. Return value [2]." +msgstr "" + +#: msi.rc:84 +msgid "Please insert the disk: [2]" +msgstr "" + +#: msi.rc:85 +msgid "" +"Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " +"that you can access it." +msgstr "" + +#: msrle32.rc:31 +msgid "Wine MS-RLE video codec" +msgstr "" + +#: msrle32.rc:32 +msgid "" +"Wine MS-RLE video codec\n" +"Copyright 2002 by Michael Guennewig" +msgstr "" +"Códec de videu MS-RLE de Wine\n" +"Copyright 2002 por Michael Guennewig" + +#: msvfw32.rc:33 +msgid "Video Compression" +msgstr "" + +#: msvfw32.rc:39 +msgid "&Compressor:" +msgstr "&Compresor:" + +#: msvfw32.rc:42 +msgid "Con&figure..." +msgstr "" + +#: msvfw32.rc:43 +msgid "&About" +msgstr "&Tocante a" + +#: msvfw32.rc:47 +msgid "Compression &Quality:" +msgstr "" + +#: msvfw32.rc:49 +msgid "&Key Frame Every" +msgstr "" + +#: msvfw32.rc:53 +msgid "&Data Rate" +msgstr "" + +#: msvfw32.rc:55 +msgid "kB/s" +msgstr "" + +#: msvfw32.rc:28 +msgid "Full Frames (Uncompressed)" +msgstr "" + +#: msvidc32.rc:29 +msgid "Wine Video 1 video codec" +msgstr "" + +#: oleacc.rc:31 +msgid "unknown object" +msgstr "" + +#: oleacc.rc:32 +msgid "title bar" +msgstr "" + +#: oleacc.rc:33 +msgid "menu bar" +msgstr "" + +#: oleacc.rc:34 +msgid "scroll bar" +msgstr "barra de desplazamientu" + +#: oleacc.rc:35 +msgid "grip" +msgstr "" + +#: oleacc.rc:36 +msgid "sound" +msgstr "" + +#: oleacc.rc:37 +msgid "cursor" +msgstr "" + +#: oleacc.rc:38 +msgid "caret" +msgstr "" + +#: oleacc.rc:39 +msgid "alert" +msgstr "" + +#: oleacc.rc:40 +msgid "window" +msgstr "" + +#: oleacc.rc:41 +msgid "client" +msgstr "veceru" + +#: oleacc.rc:42 +msgid "popup menu" +msgstr "menú emerxente" + +#: oleacc.rc:43 +msgid "menu item" +msgstr "" + +#: oleacc.rc:44 +msgid "tool tip" +msgstr "" + +#: oleacc.rc:45 +msgid "application" +msgstr "aplicación" + +#: oleacc.rc:46 +msgid "document" +msgstr "" + +#: oleacc.rc:47 +msgid "pane" +msgstr "" + +#: oleacc.rc:48 +msgid "chart" +msgstr "" + +#: oleacc.rc:49 +msgid "dialog" +msgstr "" + +#: oleacc.rc:50 +msgid "border" +msgstr "berbesu" + +#: oleacc.rc:51 +msgid "grouping" +msgstr "" + +#: oleacc.rc:52 +msgid "separator" +msgstr "separtador" + +#: oleacc.rc:53 +msgid "tool bar" +msgstr "" + +#: oleacc.rc:54 +msgid "status bar" +msgstr "" + +#: oleacc.rc:55 +msgid "table" +msgstr "" + +#: oleacc.rc:56 +msgid "column header" +msgstr "" + +#: oleacc.rc:57 +msgid "row header" +msgstr "" + +#: oleacc.rc:58 +msgid "column" +msgstr "columna" + +#: oleacc.rc:59 +msgid "row" +msgstr "filera" + +#: oleacc.rc:60 +msgid "cell" +msgstr "" + +#: oleacc.rc:61 +msgid "link" +msgstr "" + +#: oleacc.rc:62 +msgid "help balloon" +msgstr "" + +#: oleacc.rc:63 +msgid "character" +msgstr "caráuter" + +#: oleacc.rc:64 +msgid "list" +msgstr "" + +#: oleacc.rc:65 +msgid "list item" +msgstr "" + +#: oleacc.rc:66 +msgid "outline" +msgstr "" + +#: oleacc.rc:67 +msgid "outline item" +msgstr "" + +#: oleacc.rc:68 +msgid "page tab" +msgstr "" + +#: oleacc.rc:69 +msgid "property page" +msgstr "" + +#: oleacc.rc:70 +msgid "indicator" +msgstr "" + +#: oleacc.rc:71 +msgid "graphic" +msgstr "" + +#: oleacc.rc:72 +msgid "static text" +msgstr "testu estáticu" + +#: oleacc.rc:73 +msgid "text" +msgstr "testu" + +#: oleacc.rc:74 +msgid "push button" +msgstr "" + +#: oleacc.rc:75 +msgid "check button" +msgstr "" + +#: oleacc.rc:76 +msgid "radio button" +msgstr "" + +#: oleacc.rc:77 +msgid "combo box" +msgstr "" + +#: oleacc.rc:78 +msgid "drop down" +msgstr "" + +#: oleacc.rc:79 +msgid "progress bar" +msgstr "" + +#: oleacc.rc:80 +msgid "dial" +msgstr "" + +#: oleacc.rc:81 +msgid "hot key field" +msgstr "" + +#: oleacc.rc:82 +msgid "slider" +msgstr "deslizador" + +#: oleacc.rc:83 +msgid "spin box" +msgstr "" + +#: oleacc.rc:84 +msgid "diagram" +msgstr "" + +#: oleacc.rc:85 +msgid "animation" +msgstr "animación" + +#: oleacc.rc:86 +msgid "equation" +msgstr "" + +#: oleacc.rc:87 +msgid "drop down button" +msgstr "" + +#: oleacc.rc:88 +msgid "menu button" +msgstr "" + +#: oleacc.rc:89 +msgid "grid drop down button" +msgstr "" + +#: oleacc.rc:90 +msgid "white space" +msgstr "" + +#: oleacc.rc:91 +msgid "page tab list" +msgstr "" + +#: oleacc.rc:92 +msgid "clock" +msgstr "" + +#: oleacc.rc:93 +msgid "split button" +msgstr "" + +#: oleacc.rc:94 +msgid "IP address" +msgstr "Direición IP" + +#: oleacc.rc:95 +msgid "outline button" +msgstr "" + +#: oleacc.rc:97 +msgctxt "object state" +msgid "normal" +msgstr "normal" + +#: oleacc.rc:98 +msgctxt "object state" +msgid "unavailable" +msgstr "" + +#: oleacc.rc:99 +msgctxt "object state" +msgid "selected" +msgstr "" + +#: oleacc.rc:100 +msgctxt "object state" +msgid "focused" +msgstr "" + +#: oleacc.rc:101 +msgctxt "object state" +msgid "pressed" +msgstr "" + +#: oleacc.rc:102 +msgctxt "object state" +msgid "checked" +msgstr "" + +#: oleacc.rc:103 +msgctxt "object state" +msgid "mixed" +msgstr "" + +#: oleacc.rc:104 +msgctxt "object state" +msgid "read only" +msgstr "namái llectura" + +#: oleacc.rc:105 +msgctxt "object state" +msgid "hot tracked" +msgstr "" + +#: oleacc.rc:106 +msgctxt "object state" +msgid "default" +msgstr "por defeutu" + +#: oleacc.rc:107 +msgctxt "object state" +msgid "expanded" +msgstr "" + +#: oleacc.rc:108 +msgctxt "object state" +msgid "collapsed" +msgstr "" + +#: oleacc.rc:109 +msgctxt "object state" +msgid "busy" +msgstr "" + +#: oleacc.rc:110 +msgctxt "object state" +msgid "floating" +msgstr "flotante" + +#: oleacc.rc:111 +msgctxt "object state" +msgid "marqueed" +msgstr "" + +#: oleacc.rc:112 +msgctxt "object state" +msgid "animated" +msgstr "" + +#: oleacc.rc:113 +msgctxt "object state" +msgid "invisible" +msgstr "invisible" + +#: oleacc.rc:114 +msgctxt "object state" +msgid "offscreen" +msgstr "" + +#: oleacc.rc:115 +msgctxt "object state" +msgid "sizeable" +msgstr "" + +#: oleacc.rc:116 +msgctxt "object state" +msgid "moveable" +msgstr "movible" + +#: oleacc.rc:117 +msgctxt "object state" +msgid "self voicing" +msgstr "" + +#: oleacc.rc:118 +msgctxt "object state" +msgid "focusable" +msgstr "enfocable" + +#: oleacc.rc:119 +msgctxt "object state" +msgid "selectable" +msgstr "esbillable" + +#: oleacc.rc:120 +msgctxt "object state" +msgid "linked" +msgstr "" + +#: oleacc.rc:121 +msgctxt "object state" +msgid "traversed" +msgstr "" + +#: oleacc.rc:122 +msgctxt "object state" +msgid "multi selectable" +msgstr "" + +#: oleacc.rc:123 +msgctxt "object state" +msgid "extended selectable" +msgstr "" + +#: oleacc.rc:124 +msgctxt "object state" +msgid "alert low" +msgstr "" + +#: oleacc.rc:125 +msgctxt "object state" +msgid "alert medium" +msgstr "" + +#: oleacc.rc:126 +msgctxt "object state" +msgid "alert high" +msgstr "" + +#: oleacc.rc:127 +msgctxt "object state" +msgid "protected" +msgstr "" + +#: oleacc.rc:128 +msgctxt "object state" +msgid "has popup" +msgstr "" + +#: oleaut32.rc:30 oleview.rc:146 +msgid "True" +msgstr "" + +#: oleaut32.rc:31 oleview.rc:147 +msgid "False" +msgstr "" + +#: oleaut32.rc:34 +msgid "On" +msgstr "" + +#: oleaut32.rc:35 +msgid "Off" +msgstr "" + +#: oledlg.rc:55 +msgid "Insert Object" +msgstr "" + +#: oledlg.rc:61 +msgid "Object Type:" +msgstr "" + +#: oledlg.rc:64 oledlg.rc:102 +msgid "Result" +msgstr "" + +#: oledlg.rc:65 +msgid "Create New" +msgstr "" + +#: oledlg.rc:67 +msgid "Create Control" +msgstr "" + +#: oledlg.rc:69 +msgid "Create From File" +msgstr "" + +#: oledlg.rc:72 +msgid "&Add Control..." +msgstr "" + +#: oledlg.rc:73 +msgid "Display As Icon" +msgstr "" + +#: oledlg.rc:75 setupapi.rc:61 +msgid "Browse..." +msgstr "" + +#: oledlg.rc:76 +msgid "File:" +msgstr "Ficheru:" + +#: oledlg.rc:82 +msgid "Paste Special" +msgstr "" + +#: oledlg.rc:85 setupapi.rc:43 +msgid "Source:" +msgstr "" + +#: oledlg.rc:86 shdoclc.rc:50 shdoclc.rc:82 shdoclc.rc:95 shdoclc.rc:135 +#: shdoclc.rc:162 shdoclc.rc:186 user32.rc:62 wineconsole.rc:33 wordpad.rc:114 +msgid "&Paste" +msgstr "&Apegar" + +#: oledlg.rc:88 +msgid "Paste &Link" +msgstr "" + +#: oledlg.rc:90 +msgid "&As:" +msgstr "" + +#: oledlg.rc:97 +msgid "&Display As Icon" +msgstr "" + +#: oledlg.rc:99 +msgid "Change &Icon..." +msgstr "" + +#: oledlg.rc:28 +msgid "Insert a new %s object into your document" +msgstr "" + +#: oledlg.rc:29 +msgid "" +"Insert the contents of the file as an object into your document so that you " +"may activate it using the program which created it." +msgstr "" + +#: oledlg.rc:30 shell32.rc:197 +msgid "Browse" +msgstr "" + +#: oledlg.rc:31 +msgid "" +"File does not appear to be a valid OLE module. Unable to register OLE " +"control." +msgstr "" + +#: oledlg.rc:32 +msgid "Add Control" +msgstr "" + +#: oledlg.rc:35 +msgid "&Convert..." +msgstr "" + +#: oledlg.rc:36 +msgid "%1 %2 &Object" +msgstr "" + +#: oledlg.rc:34 +msgid "%1 &Object" +msgstr "" + +#: oledlg.rc:33 oleview.rc:40 +msgid "&Object" +msgstr "&Oxetu" + +#: oledlg.rc:41 +msgid "Inserts the contents of the clipboard into your document as %s." +msgstr "" + +#: oledlg.rc:42 +msgid "" +"Inserts the contents of the clipboard into your document so that you can " +"activate it using %s." +msgstr "" + +#: oledlg.rc:43 +msgid "" +"Inserts the contents of the clipboard into your document so that you can " +"activate it using %s. It will be displayed as an icon." +msgstr "" + +#: oledlg.rc:44 +msgid "" +"Inserts the contents of the clipboard into your document as %s. The data is " +"linked to the source file so that changes to the file will be reflected in " +"your document." +msgstr "" + +#: oledlg.rc:45 +msgid "" +"Inserts a picture of the clipboard contents into your document. The picture " +"is linked to the source file so that changes to the file will be reflected " +"in your document." +msgstr "" + +#: oledlg.rc:46 +msgid "" +"Inserts a shortcut which points to the location of the clipboard contents. " +"The shortcut is linked to the source file so that changes to the file will " +"be reflected in your document." +msgstr "" + +#: oledlg.rc:47 +msgid "Inserts the contents of the clipboard into your document." +msgstr "" + +#: oledlg.rc:48 regedit.rc:430 +msgid "Unknown Type" +msgstr "" + +#: oledlg.rc:49 +msgid "Unknown Source" +msgstr "" + +#: oledlg.rc:50 +msgid "the program which created it" +msgstr "" + +#: sane.rc:41 +msgid "Scanning" +msgstr "" + +#: sane.rc:44 +msgid "SCANNING... Please Wait" +msgstr "" + +#: sane.rc:31 +msgctxt "unit: pixels" +msgid "px" +msgstr "px" + +#: sane.rc:32 +msgctxt "unit: bits" +msgid "b" +msgstr "b" + +#: sane.rc:34 wineps.rc:49 winecfg.rc:183 +msgctxt "unit: dots/inch" +msgid "dpi" +msgstr "dpi" + +#: sane.rc:35 +msgctxt "unit: percent" +msgid "%" +msgstr "%" + +#: sane.rc:36 +msgctxt "unit: microseconds" +msgid "us" +msgstr "µs" + +#: serialui.rc:28 +msgid "Settings for %s" +msgstr "" + +#: serialui.rc:31 +msgid "Baud Rate" +msgstr "" + +#: serialui.rc:33 +msgid "Parity" +msgstr "" + +#: serialui.rc:35 +msgid "Flow Control" +msgstr "" + +#: serialui.rc:37 +msgid "Data Bits" +msgstr "" + +#: serialui.rc:39 +msgid "Stop Bits" +msgstr "" + +#: setupapi.rc:39 +msgid "Copying Files..." +msgstr "Copiando ficheros..." + +#: setupapi.rc:45 +msgid "Destination:" +msgstr "" + +#: setupapi.rc:52 +msgid "Files Needed" +msgstr "" + +#: setupapi.rc:55 +msgid "" +"Insert the manufacturer's installation disk, and then\n" +"make sure the correct drive is selected below" +msgstr "" + +#: setupapi.rc:57 +msgid "Copy manufacturer's files from:" +msgstr "" + +#: setupapi.rc:31 +msgid "The file '%1' on %2 is needed" +msgstr "" + +#: setupapi.rc:32 ipconfig.rc:34 +msgid "Unknown" +msgstr "" + +#: setupapi.rc:33 +msgid "Copy files from:" +msgstr "" + +#: setupapi.rc:34 +msgid "Type the path where the file is located, and then click OK." +msgstr "" + +#: shdoclc.rc:42 +msgid "F&orward" +msgstr "" + +#: shdoclc.rc:44 +msgid "&Save Background As..." +msgstr "" + +#: shdoclc.rc:45 +msgid "Set As Back&ground" +msgstr "" + +#: shdoclc.rc:46 +msgid "&Copy Background" +msgstr "" + +#: shdoclc.rc:47 +msgid "Set as &Desktop Item" +msgstr "" + +#: shdoclc.rc:52 +msgid "Create Shor&tcut" +msgstr "" + +#: shdoclc.rc:53 shdoclc.rc:84 shdoclc.rc:137 shdoclc.rc:164 shdoclc.rc:188 +msgid "Add to &Favorites..." +msgstr "" + +#: shdoclc.rc:56 +msgid "&Encoding" +msgstr "&Codificación" + +#: shdoclc.rc:58 +msgid "Pr&int" +msgstr "" + +#: shdoclc.rc:66 shdoclc.rc:149 shdoclc.rc:173 +msgid "&Open Link" +msgstr "" + +#: shdoclc.rc:67 shdoclc.rc:150 shdoclc.rc:174 +msgid "Open Link in &New Window" +msgstr "" + +#: shdoclc.rc:68 shdoclc.rc:129 shdoclc.rc:151 shdoclc.rc:175 +msgid "Save Target &As..." +msgstr "" + +#: shdoclc.rc:69 shdoclc.rc:130 shdoclc.rc:152 shdoclc.rc:176 +msgid "&Print Target" +msgstr "" + +#: shdoclc.rc:71 shdoclc.rc:154 shdoclc.rc:178 +msgid "S&how Picture" +msgstr "" + +#: shdoclc.rc:72 shdoclc.rc:179 +msgid "&Save Picture As..." +msgstr "" + +#: shdoclc.rc:73 +msgid "&E-mail Picture..." +msgstr "" + +#: shdoclc.rc:74 +msgid "Pr&int Picture..." +msgstr "" + +#: shdoclc.rc:75 +msgid "&Go to My Pictures" +msgstr "" + +#: shdoclc.rc:76 shdoclc.rc:156 shdoclc.rc:180 +msgid "Set as Back&ground" +msgstr "" + +#: shdoclc.rc:77 shdoclc.rc:157 shdoclc.rc:181 +msgid "Set as &Desktop Item..." +msgstr "" + +#: shdoclc.rc:81 shdoclc.rc:134 shdoclc.rc:161 shdoclc.rc:185 +msgid "Copy Shor&tcut" +msgstr "" + +#: shdoclc.rc:86 shdoclc.rc:139 shdoclc.rc:168 shdoclc.rc:194 +msgid "P&roperties" +msgstr "" + +#: shdoclc.rc:91 user32.rc:58 +msgid "&Undo" +msgstr "" + +#: shdoclc.rc:96 shell32.rc:105 user32.rc:63 +msgid "&Delete" +msgstr "&Desaniciar" + +#: shdoclc.rc:103 shell32.rc:97 +msgid "&Select" +msgstr "" + +#: shdoclc.rc:105 +msgid "&Cell" +msgstr "" + +#: shdoclc.rc:106 +msgid "&Row" +msgstr "&Filera" + +#: shdoclc.rc:107 +msgid "&Column" +msgstr "&Columna" + +#: shdoclc.rc:108 +msgid "&Table" +msgstr "" + +#: shdoclc.rc:111 +msgid "&Cell Properties" +msgstr "" + +#: shdoclc.rc:112 +msgid "&Table Properties" +msgstr "" + +#: shdoclc.rc:128 +msgid "Open in &New Window" +msgstr "" + +#: shdoclc.rc:132 +msgid "Cut" +msgstr "" + +#: shdoclc.rc:155 +msgid "&Save Video As..." +msgstr "" + +#: shdoclc.rc:166 shdoclc.rc:190 +msgid "Play" +msgstr "" + +#: shdoclc.rc:192 +msgid "Rewind" +msgstr "" + +#: shdoclc.rc:199 +msgid "Trace Tags" +msgstr "" + +#: shdoclc.rc:200 +msgid "Resource Failures" +msgstr "" + +#: shdoclc.rc:201 +msgid "Dump Tracking Info" +msgstr "" + +#: shdoclc.rc:202 +msgid "Debug Break" +msgstr "" + +#: shdoclc.rc:203 +msgid "Debug View" +msgstr "" + +#: shdoclc.rc:204 +msgid "Dump Tree" +msgstr "" + +#: shdoclc.rc:205 +msgid "Dump Lines" +msgstr "" + +#: shdoclc.rc:206 +msgid "Dump DisplayTree" +msgstr "" + +#: shdoclc.rc:207 +msgid "Dump FormatCaches" +msgstr "" + +#: shdoclc.rc:208 +msgid "Dump LayoutRects" +msgstr "" + +#: shdoclc.rc:209 +msgid "Memory Monitor" +msgstr "" + +#: shdoclc.rc:210 +msgid "Performance Meters" +msgstr "" + +#: shdoclc.rc:211 +msgid "Save HTML" +msgstr "" + +#: shdoclc.rc:213 +msgid "&Browse View" +msgstr "" + +#: shdoclc.rc:214 +msgid "&Edit View" +msgstr "" + +#: shdoclc.rc:219 shdoclc.rc:233 +msgid "Scroll Here" +msgstr "" + +#: shdoclc.rc:221 +msgid "Top" +msgstr "" + +#: shdoclc.rc:222 +msgid "Bottom" +msgstr "" + +#: shdoclc.rc:224 +msgid "Page Up" +msgstr "" + +#: shdoclc.rc:225 +msgid "Page Down" +msgstr "" + +#: shdoclc.rc:227 +msgid "Scroll Up" +msgstr "" + +#: shdoclc.rc:228 +msgid "Scroll Down" +msgstr "" + +#: shdoclc.rc:235 +msgid "Left Edge" +msgstr "" + +#: shdoclc.rc:236 +msgid "Right Edge" +msgstr "" + +#: shdoclc.rc:238 +msgid "Page Left" +msgstr "" + +#: shdoclc.rc:239 +msgid "Page Right" +msgstr "" + +#: shdoclc.rc:241 +msgid "Scroll Left" +msgstr "" + +#: shdoclc.rc:242 +msgid "Scroll Right" +msgstr "" + +#: shdoclc.rc:28 +msgid "Wine Internet Explorer" +msgstr "Esplorador d'internet de Wine" + +#: shdoclc.rc:33 +msgid "&w&bPage &p" +msgstr "" + +#: shell32.rc:30 shell32.rc:45 shell32.rc:122 shell32.rc:162 taskmgr.rc:65 +#: taskmgr.rc:110 taskmgr.rc:252 +msgid "Lar&ge Icons" +msgstr "Iconos &grandes" + +#: shell32.rc:31 shell32.rc:46 shell32.rc:123 shell32.rc:163 taskmgr.rc:66 +#: taskmgr.rc:111 taskmgr.rc:253 +msgid "S&mall Icons" +msgstr "Iconos &pequeños" + +#: shell32.rc:32 shell32.rc:47 shell32.rc:124 shell32.rc:164 +msgid "&List" +msgstr "" + +#: shell32.rc:33 shell32.rc:48 shell32.rc:125 shell32.rc:165 taskmgr.rc:67 +#: taskmgr.rc:112 taskmgr.rc:254 +msgid "&Details" +msgstr "&Detalles" + +#: shell32.rc:51 winefile.rc:78 +msgid "Arrange &Icons" +msgstr "" + +#: shell32.rc:53 +msgid "By &Name" +msgstr "" + +#: shell32.rc:54 +msgid "By &Type" +msgstr "" + +#: shell32.rc:55 +msgid "By &Size" +msgstr "" + +#: shell32.rc:56 +msgid "By &Date" +msgstr "" + +#: shell32.rc:58 +msgid "&Auto Arrange" +msgstr "" + +#: shell32.rc:60 +msgid "Line up Icons" +msgstr "" + +#: shell32.rc:65 +msgid "Paste as Link" +msgstr "" + +#: shell32.rc:67 progman.rc:100 wordpad.rc:221 +msgid "New" +msgstr "" + +#: shell32.rc:69 +msgid "New &Folder" +msgstr "&Carpeta nueva" + +#: shell32.rc:70 +msgid "New &Link" +msgstr "&Enllaz nuevu" + +#: shell32.rc:74 +msgid "Properties" +msgstr "Propiedaes" + +#: shell32.rc:85 +msgctxt "recycle bin" +msgid "&Restore" +msgstr "&Restaurar" + +#: shell32.rc:86 +msgid "&Erase" +msgstr "" + +#: shell32.rc:98 +msgid "E&xplore" +msgstr "" + +#: shell32.rc:101 +msgid "C&ut" +msgstr "" + +#: shell32.rc:104 +msgid "Create &Link" +msgstr "Crear un &enllaz" + +#: shell32.rc:106 +msgid "&Rename" +msgstr "&Renomar" + +#: shell32.rc:117 notepad.rc:39 oleview.rc:38 regedit.rc:41 view.rc:34 +#: winefile.rc:40 winemine.rc:51 winhlp32.rc:37 wordpad.rc:40 +msgid "E&xit" +msgstr "&Colar" + +#: shell32.rc:130 +msgid "&About Control Panel" +msgstr "&Tocante a Panel de control" + +#: shell32.rc:273 shell32.rc:288 +msgid "Browse for Folder" +msgstr "" + +#: shell32.rc:293 +msgid "Folder:" +msgstr "Carpeta:" + +#: shell32.rc:299 +msgid "&Make New Folder" +msgstr "" + +#: shell32.rc:306 +msgid "Message" +msgstr "" + +#: shell32.rc:310 +msgid "Yes to &all" +msgstr "Sí a &too" + +#: shell32.rc:319 +msgid "About %s" +msgstr "" + +#: shell32.rc:323 +msgid "Wine &license" +msgstr "&Llicencia de Wine" + +#: shell32.rc:328 +msgid "Running on %s" +msgstr "Executándose en %s" + +#: shell32.rc:329 +msgid "Wine was brought to you by:" +msgstr "Wine úfrentelu:" + +#: shell32.rc:334 +msgid "Run" +msgstr "" + +#: shell32.rc:338 +msgid "" +"Type the name of a program, folder, document, or Internet resource, and Wine " +"will open it for you." +msgstr "" +"Teclexa'l nome d'un programa, documentu, recursu n'internet o una carpeta y " +"Wine va abrilu pa ti." + +#: shell32.rc:339 +msgid "&Open:" +msgstr "" + +#: shell32.rc:343 progman.rc:182 progman.rc:201 progman.rc:218 winecfg.rc:243 +#: winefile.rc:130 +msgid "&Browse..." +msgstr "&Restolar..." + +#: shell32.rc:355 shell32.rc:384 +msgid "File type:" +msgstr "" + +#: shell32.rc:359 shell32.rc:392 urlmon.rc:37 explorer.rc:32 +msgid "Location:" +msgstr "Allugamientu:" + +#: shell32.rc:361 shell32.rc:394 winefile.rc:170 +msgid "Size:" +msgstr "Tamañu:" + +#: shell32.rc:365 shell32.rc:398 +msgid "Creation date:" +msgstr "Data de creación:" + +#: shell32.rc:369 shell32.rc:406 +msgid "Attributes:" +msgstr "Atributos:" + +#: shell32.rc:371 shell32.rc:408 winefile.rc:174 +msgid "H&idden" +msgstr "" + +#: shell32.rc:372 shell32.rc:409 winefile.rc:175 +msgid "&Archive" +msgstr "" + +#: shell32.rc:386 +msgid "Open with:" +msgstr "" + +#: shell32.rc:389 +msgid "&Change..." +msgstr "&Camudar..." + +#: shell32.rc:400 +msgid "Last modified:" +msgstr "" + +#: shell32.rc:402 +msgid "Last accessed:" +msgstr "" + +#: shell32.rc:138 shell32.rc:142 winefile.rc:108 +msgid "Size" +msgstr "Tamañu" + +#: shell32.rc:139 regedit.rc:148 +msgid "Type" +msgstr "Triba" + +#: shell32.rc:140 +msgid "Modified" +msgstr "Data de modificación" + +#: shell32.rc:141 winefile.rc:172 winefile.rc:114 +msgid "Attributes" +msgstr "Atributos" + +#: shell32.rc:143 +msgid "Size available" +msgstr "" + +#: shell32.rc:145 +msgid "Comments" +msgstr "" + +#: shell32.rc:146 +msgid "Owner" +msgstr "" + +#: shell32.rc:147 +msgid "Group" +msgstr "" + +#: shell32.rc:148 +msgid "Original location" +msgstr "Allugamientu orixinal" + +#: shell32.rc:149 +msgid "Date deleted" +msgstr "" + +#: shell32.rc:156 winecfg.rc:101 winefile.rc:100 +msgctxt "display name" +msgid "Desktop" +msgstr "Escritoriu" + +#: shell32.rc:157 regedit.rc:238 +msgid "My Computer" +msgstr "" + +#: shell32.rc:159 +msgid "Control Panel" +msgstr "Panel de control" + +#: shell32.rc:166 +msgid "Select" +msgstr "" + +#: shell32.rc:189 +msgid "Restart" +msgstr "" + +#: shell32.rc:190 +msgid "Do you want to simulate a Windows reboot?" +msgstr "¿Quies simular un reaniciu de Windows?" + +#: shell32.rc:191 +msgid "Shutdown" +msgstr "" + +#: shell32.rc:192 +msgid "Do you want to shutdown your Wine session?" +msgstr "" + +#: shell32.rc:203 progman.rc:83 +msgid "Programs" +msgstr "Programes" + +#: shell32.rc:204 +msgid "My Documents" +msgstr "" + +#: shell32.rc:205 +msgid "Favorites" +msgstr "Favoritos" + +#: shell32.rc:206 +msgid "StartUp" +msgstr "" + +#: shell32.rc:207 +msgid "Start Menu" +msgstr "" + +#: shell32.rc:208 +msgid "My Music" +msgstr "" + +#: shell32.rc:209 +msgid "My Videos" +msgstr "" + +#: shell32.rc:210 +msgctxt "directory" +msgid "Desktop" +msgstr "Escritoriu" + +#: shell32.rc:211 +msgid "NetHood" +msgstr "" + +#: shell32.rc:212 +msgid "Templates" +msgstr "Plantíes" + +#: shell32.rc:213 +msgid "PrintHood" +msgstr "" + +#: shell32.rc:214 winhlp32.rc:49 +msgid "History" +msgstr "Historial" + +#: shell32.rc:215 +msgid "Program Files" +msgstr "" + +#: shell32.rc:217 +msgid "My Pictures" +msgstr "" + +#: shell32.rc:218 +msgid "Common Files" +msgstr "Ficheros comunes" + +#: shell32.rc:219 shell32.rc:150 shell32.rc:235 +msgid "Documents" +msgstr "Documentos" + +#: shell32.rc:220 +msgid "Administrative Tools" +msgstr "Ferramientes alministratives" + +#: shell32.rc:221 +msgid "Music" +msgstr "" + +#: shell32.rc:222 +msgid "Pictures" +msgstr "Semeyes" + +#: shell32.rc:223 +msgid "Videos" +msgstr "Vídeos" + +#: shell32.rc:216 +msgid "Program Files (x86)" +msgstr "" + +#: shell32.rc:224 +msgid "Contacts" +msgstr "" + +#: shell32.rc:225 winefile.rc:113 +msgid "Links" +msgstr "" + +#: shell32.rc:226 +msgid "Slide Shows" +msgstr "" + +#: shell32.rc:227 +msgid "Playlists" +msgstr "Llistes de reproducción" + +#: shell32.rc:151 taskmgr.rc:326 +msgid "Status" +msgstr "Estáu" + +#: shell32.rc:153 +msgid "Model" +msgstr "Modelu" + +#: shell32.rc:228 +msgid "Sample Music" +msgstr "" + +#: shell32.rc:229 +msgid "Sample Pictures" +msgstr "" + +#: shell32.rc:230 +msgid "Sample Playlists" +msgstr "" + +#: shell32.rc:231 +msgid "Sample Videos" +msgstr "" + +#: shell32.rc:232 +msgid "Saved Games" +msgstr "" + +#: shell32.rc:233 +msgid "Searches" +msgstr "" + +#: shell32.rc:234 +msgid "Users" +msgstr "Usuarios" + +#: shell32.rc:236 +msgid "Downloads" +msgstr "" + +#: shell32.rc:169 +msgid "Unable to create new Folder: Permission denied." +msgstr "Nun pue crease una carpeta nueva: Ñegóse'l permisu." + +#: shell32.rc:170 +msgid "Error during creation of a new folder" +msgstr "" + +#: shell32.rc:171 +msgid "Confirm file deletion" +msgstr "" + +#: shell32.rc:172 +msgid "Confirm folder deletion" +msgstr "" + +#: shell32.rc:173 +msgid "Are you sure you want to delete '%1'?" +msgstr "¿De xuru que quies desaniciar «%1»?" + +#: shell32.rc:174 +msgid "Are you sure you want to delete these %1 items?" +msgstr "¿De xuru que quies desaniciar estos %1 elementos?" + +#: shell32.rc:181 +msgid "Confirm file overwrite" +msgstr "" + +#: shell32.rc:180 +msgid "" +"This folder already contains a file called '%1'.\n" +"\n" +"Do you want to replace it?" +msgstr "" +"Esta carpeta yá contién un ficheru col nome «%1».\n" +"\n" +"¿Quies trocalu?" + +#: shell32.rc:175 +msgid "Are you sure you want to delete the selected item(s)?" +msgstr "¿De xuru que quies desaniciar los elementos esbillaos?" + +#: shell32.rc:177 +msgid "" +"Are you sure that you want to send '%1' and all its content to the Trash?" +msgstr "" + +#: shell32.rc:176 +msgid "Are you sure that you want to send '%1' to the Trash?" +msgstr "" + +#: shell32.rc:178 +msgid "Are you sure that you want to send these %1 items to the Trash?" +msgstr "¿De xuru que quies unviar a la papalera estos %1 elementos?" + +#: shell32.rc:179 +msgid "The item '%1' can't be sent to Trash. Do you want to delete it instead?" +msgstr "L'elementu «%1» nun pue unviase a la papelera. ¿Quies desanicialu?" + +#: shell32.rc:186 +msgid "" +"This folder already contains a folder named '%1'.\n" +"\n" +"If the files in the destination folder have the same names as files in the\n" +"selected folder they will be replaced. Do you still want to move or copy\n" +"the folder?" +msgstr "" +"Esta carpeta yá contién otra col nome «%1».\n" +"\n" +"Si los ficheros de la carpeta de destín tienen los mesmos nomes que los " +"de la carpeta esbillada, estos van trocase. ¿Entá quies mover o copiar la " +"carpeta?" + +#: shell32.rc:240 +msgid "Wine Control Panel" +msgstr "Panel de control de Wine" + +#: shell32.rc:195 +msgid "Unable to display Run dialog box (internal error)" +msgstr "" + +#: shell32.rc:196 +msgid "Unable to display Browse dialog box (internal error)" +msgstr "" + +#: shell32.rc:198 +msgid "Executable files (*.exe)" +msgstr "Ficheros executables (*.exe)" + +#: shell32.rc:244 +msgid "There is no Windows program configured to open this type of file." +msgstr "" + +#: shell32.rc:246 +msgid "Are you sure you wish to permanently delete '%1'?" +msgstr "" + +#: shell32.rc:247 +msgid "Are you sure you wish to permanently delete these %1 items?" +msgstr "" + +#: shell32.rc:248 +msgid "Confirm deletion" +msgstr "" + +#: shell32.rc:249 +msgid "" +"A file already exists at the path %1.\n" +"\n" +"Do you want to replace it?" +msgstr "" +"Yá esiste un ficheru nel camín %1.\n" +"\n" +"¿Quies trocalu?" + +#: shell32.rc:250 +msgid "" +"A folder already exists at the path %1.\n" +"\n" +"Do you want to replace it?" +msgstr "" +"Yá esiste una carpeta nel camín %1.\n" +"\n" +"¿Quies trocalu?" + +#: shell32.rc:251 +msgid "Confirm overwrite" +msgstr "" + +#: shell32.rc:268 +msgid "" +"Wine 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.\n" +"\n" +"Wine 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.\n" +"\n" +"You should have received a copy of the GNU Lesser General Public License " +"along with Wine; if not, write to the Free Software Foundation, Inc., 51 " +"Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." +msgstr "" + +#: shell32.rc:256 +msgid "Wine License" +msgstr "Llicencia de Wine" + +#: shell32.rc:158 +msgid "Trash" +msgstr "" + +#: shlwapi.rc:38 user32.rc:71 regedit.rc:204 winecfg.rc:87 winefile.rc:97 +msgid "Error" +msgstr "Fallu" + +#: shlwapi.rc:43 +msgid "Don't show me th&is message again" +msgstr "" + +#: shlwapi.rc:30 +msgid "%d bytes" +msgstr "%d bytes" + +#: shlwapi.rc:31 +msgctxt "time unit: hours" +msgid " hr" +msgstr " h" + +#: shlwapi.rc:32 +msgctxt "time unit: minutes" +msgid " min" +msgstr " m" + +#: shlwapi.rc:33 +msgctxt "time unit: seconds" +msgid " sec" +msgstr " s" + +#: twain.rc:29 +msgid "Select Source" +msgstr "" + +#: tzres.rc:82 +msgid "China Standard Time" +msgstr "Hora estándar de China" + +#: tzres.rc:83 +msgid "China Daylight Time" +msgstr "Hora braniega de China" + +#: tzres.rc:160 +msgid "North Asia Standard Time" +msgstr "Hora estándar d'Asia del Norte" + +#: tzres.rc:161 +msgid "North Asia Daylight Time" +msgstr "Hora braniega d'Asia del Norte" + +#: tzres.rc:104 +msgid "Georgian Standard Time" +msgstr "" + +#: tzres.rc:105 +msgid "Georgian Daylight Time" +msgstr "" + +#: tzres.rc:152 +msgid "Nepal Standard Time" +msgstr "Hora estándar de Nepal" + +#: tzres.rc:153 +msgid "Nepal Daylight Time" +msgstr "Hora braniega de Nepal" + +#: tzres.rc:60 +msgid "Cape Verde Standard Time" +msgstr "Hora estándar de Cabu Verde" + +#: tzres.rc:61 +msgid "Cape Verde Daylight Time" +msgstr "Hora braniega de Cabu Verde" + +#: tzres.rc:74 +msgid "Central European Standard Time" +msgstr "" + +#: tzres.rc:75 +msgid "Central European Daylight Time" +msgstr "" + +#: tzres.rc:140 +msgid "Morocco Standard Time" +msgstr "Hora estándar de Marruecos" + +#: tzres.rc:141 +msgid "Morocco Daylight Time" +msgstr "Hora braniega de Marruecos" + +#: tzres.rc:72 +msgid "Central Europe Standard Time" +msgstr "Hora estándar d'Europa Central" + +#: tzres.rc:73 +msgid "Central Europe Daylight Time" +msgstr "Hora braniega d'Europa Central" + +#: tzres.rc:118 +msgid "Iran Standard Time" +msgstr "Hora estándar d'Iran" + +#: tzres.rc:119 +msgid "Iran Daylight Time" +msgstr "" + +#: tzres.rc:150 +msgid "Namibia Standard Time" +msgstr "Hora estándar de Namibia" + +#: tzres.rc:151 +msgid "Namibia Daylight Time" +msgstr "Hora braniega de Namibia" + +#: tzres.rc:200 +msgid "Tonga Standard Time" +msgstr "" + +#: tzres.rc:201 +msgid "Tonga Daylight Time" +msgstr "" + +#: tzres.rc:144 +msgid "Mountain Standard Time (Mexico)" +msgstr "" + +#: tzres.rc:145 +msgid "Mountain Daylight Time (Mexico)" +msgstr "" + +#: tzres.rc:106 +msgid "GMT Standard Time" +msgstr "Hora estándar de GMT" + +#: tzres.rc:107 +msgid "GMT Daylight Time" +msgstr "Hora braniega de GMT" + +#: tzres.rc:68 +msgid "Central Asia Standard Time" +msgstr "Hora estándar d'Asia Central" + +#: tzres.rc:69 +msgid "Central Asia Daylight Time" +msgstr "Hora braniega d'Asia Central" + +#: tzres.rc:38 +msgid "Arabic Standard Time" +msgstr "" + +#: tzres.rc:39 +msgid "Arabic Daylight Time" +msgstr "" + +#: tzres.rc:132 +msgid "Magadan Standard Time" +msgstr "" + +#: tzres.rc:133 +msgid "Magadan Daylight Time" +msgstr "" + +#: tzres.rc:156 +msgid "Newfoundland Standard Time" +msgstr "Hora estándar de Newfoundland" + +#: tzres.rc:157 +msgid "Newfoundland Daylight Time" +msgstr "Hora braniega de Newfoundland" + +#: tzres.rc:224 +msgid "West Pacific Standard Time" +msgstr "" + +#: tzres.rc:225 +msgid "West Pacific Daylight Time" +msgstr "" + +#: tzres.rc:164 +msgid "Pacific Standard Time" +msgstr "" + +#: tzres.rc:165 +msgid "Pacific Daylight Time" +msgstr "" + +#: tzres.rc:48 +msgid "Azerbaijan Standard Time" +msgstr "Hora estándar d'Azerbaixán" + +#: tzres.rc:49 +msgid "Azerbaijan Daylight Time" +msgstr "Hora braniega d'Azerbaixán" + +#: tzres.rc:182 +msgid "Samoa Standard Time" +msgstr "Hora estándar de Samoa" + +#: tzres.rc:183 +msgid "Samoa Daylight Time" +msgstr "Hora braniega de Samoa" + +#: tzres.rc:124 +msgid "Kaliningrad Standard Time" +msgstr "Hora estándar de Kaliningráu" + +#: tzres.rc:125 +msgid "Kaliningrad Daylight Time" +msgstr "Hora braniega de Kaliningráu" + +#: tzres.rc:166 +msgid "Pacific Standard Time (Mexico)" +msgstr "" + +#: tzres.rc:167 +msgid "Pacific Daylight Time (Mexico)" +msgstr "" + +#: tzres.rc:136 +msgid "Middle East Standard Time" +msgstr "Hora estándar d'Oriente Mediu" + +#: tzres.rc:137 +msgid "Middle East Daylight Time" +msgstr "" + +#: tzres.rc:198 +msgid "Tokyo Standard Time" +msgstr "Hora estándar de Tokiu" + +#: tzres.rc:199 +msgid "Tokyo Daylight Time" +msgstr "Hora braniega de Tokiu" + +#: tzres.rc:130 +msgid "Line Islands Standard Time" +msgstr "" + +#: tzres.rc:131 +msgid "Line Islands Daylight Time" +msgstr "" + +#: tzres.rc:122 +msgid "Jordan Standard Time" +msgstr "Hora estándar de Xordania" + +#: tzres.rc:123 +msgid "Jordan Daylight Time" +msgstr "" + +#: tzres.rc:78 +msgid "Central Standard Time" +msgstr "Hora estándar central" + +#: tzres.rc:79 +msgid "Central Daylight Time" +msgstr "Hora braniega central" + +#: tzres.rc:50 +msgid "Azores Standard Time" +msgstr "" + +#: tzres.rc:51 +msgid "Azores Daylight Time" +msgstr "" + +#: tzres.rc:158 +msgid "North Asia East Standard Time" +msgstr "" + +#: tzres.rc:159 +msgid "North Asia East Daylight Time" +msgstr "Hora braniega d'Asia del Noreste" + +#: tzres.rc:40 +msgid "Argentina Standard Time" +msgstr "Hora estándar d'Arxentina" + +#: tzres.rc:41 +msgid "Argentina Daylight Time" +msgstr "Hora braniega d'Arxentina" + +#: tzres.rc:146 +msgid "Myanmar Standard Time" +msgstr "" + +#: tzres.rc:147 +msgid "Myanmar Daylight Time" +msgstr "" + +#: tzres.rc:210 tzres.rc:211 +msgid "Coordinated Universal Time" +msgstr "" + +#: tzres.rc:116 +msgid "India Standard Time" +msgstr "Hora estándar d'Irán" + +#: tzres.rc:117 +msgid "India Daylight Time" +msgstr "Hora braniega d'India" + +#: tzres.rc:112 +msgid "GTB Standard Time" +msgstr "Hora estándar de GTB" + +#: tzres.rc:113 +msgid "GTB Daylight Time" +msgstr "Hora braniega de GTB" + +#: tzres.rc:202 +msgid "Turkey Standard Time" +msgstr "Hora estándar de Turquía" + +#: tzres.rc:203 +msgid "Turkey Daylight Time" +msgstr "Hora braniega de Turquía" + +#: tzres.rc:100 +msgid "Fiji Standard Time" +msgstr "Hora estándar de Les Islles Fixi" + +#: tzres.rc:101 +msgid "Fiji Daylight Time" +msgstr "Hora braniega de Les Islles Fixi" + +#: tzres.rc:58 +msgid "Canada Central Standard Time" +msgstr "Hora estándar de Canadá Central" + +#: tzres.rc:59 +msgid "Canada Central Daylight Time" +msgstr "Hora braniega de Canadá Central" + +#: tzres.rc:194 +msgid "Taipei Standard Time" +msgstr "Hora estándar de Taipéi" + +#: tzres.rc:195 +msgid "Taipei Daylight Time" +msgstr "Hora braniega de Taipéi" + +#: tzres.rc:220 +msgid "W. Europe Standard Time" +msgstr "Hora estándar d'Europa del Oeste" + +#: tzres.rc:221 +msgid "W. Europe Daylight Time" +msgstr "Hora braniega d'Europa del Oeste" + +#: tzres.rc:138 +msgid "Montevideo Standard Time" +msgstr "Hora estándar de Montevidéu" + +#: tzres.rc:139 +msgid "Montevideo Daylight Time" +msgstr "" + +#: tzres.rc:168 +msgid "Pakistan Standard Time" +msgstr "Hora estándar de Paquistán" + +#: tzres.rc:169 +msgid "Pakistan Daylight Time" +msgstr "Hora braniega de Paquistán" + +#: tzres.rc:62 +msgid "Caucasus Standard Time" +msgstr "" + +#: tzres.rc:63 +msgid "Caucasus Daylight Time" +msgstr "" + +#: tzres.rc:46 +msgid "AUS Eastern Standard Time" +msgstr "" + +#: tzres.rc:47 +msgid "AUS Eastern Daylight Time" +msgstr "" + +#: tzres.rc:148 +msgid "N. Central Asia Standard Time" +msgstr "" + +#: tzres.rc:149 +msgid "N. Central Asia Daylight Time" +msgstr "" + +#: tzres.rc:94 +msgid "Eastern Standard Time" +msgstr "" + +#: tzres.rc:95 +msgid "Eastern Daylight Time" +msgstr "Hora braniega oriental" + +#: tzres.rc:80 +msgid "Central Standard Time (Mexico)" +msgstr "Hora estándar central (Méxicu)" + +#: tzres.rc:81 +msgid "Central Daylight Time (Mexico)" +msgstr "Hora braniega central (Méxicu)" + +#: tzres.rc:42 +msgid "Atlantic Standard Time" +msgstr "" + +#: tzres.rc:43 +msgid "Atlantic Daylight Time" +msgstr "" + +#: tzres.rc:142 +msgid "Mountain Standard Time" +msgstr "" + +#: tzres.rc:143 +msgid "Mountain Daylight Time" +msgstr "" + +#: tzres.rc:206 +msgid "US Eastern Standard Time" +msgstr "" + +#: tzres.rc:207 +msgid "US Eastern Daylight Time" +msgstr "" + +#: tzres.rc:196 +msgid "Tasmania Standard Time" +msgstr "Hora estándar de Tasmania" + +#: tzres.rc:197 +msgid "Tasmania Daylight Time" +msgstr "Hora braniega de Tasmania" + +#: tzres.rc:66 +msgid "Central America Standard Time" +msgstr "Hora estándar d'América Central" + +#: tzres.rc:67 +msgid "Central America Daylight Time" +msgstr "Hora braniega d'América Central" + +#: tzres.rc:208 +msgid "US Mountain Standard Time" +msgstr "" + +#: tzres.rc:209 +msgid "US Mountain Daylight Time" +msgstr "" + +#: tzres.rc:188 +msgid "South Africa Standard Time" +msgstr "Hora estándar de Sudáfrica" + +#: tzres.rc:189 +msgid "South Africa Daylight Time" +msgstr "Hora braniega de Sudáfrica" + +#: tzres.rc:64 +msgid "Cen. Australia Standard Time" +msgstr "Hora estándar d'Australia Central" + +#: tzres.rc:65 +msgid "Cen. Australia Daylight Time" +msgstr "Hora braniega d'Australia Central" + +#: tzres.rc:190 +msgid "Sri Lanka Standard Time" +msgstr "Hora estándar de Sri Lanka" + +#: tzres.rc:191 +msgid "Sri Lanka Daylight Time" +msgstr "Hora braniega de Sri Lanka" + +#: tzres.rc:30 +msgid "Afghanistan Standard Time" +msgstr "Hos estándar d'Afganistán" + +#: tzres.rc:31 +msgid "Afghanistan Daylight Time" +msgstr "Hora braniega d'Afganistán" + +#: tzres.rc:226 +msgid "Yakutsk Standard Time" +msgstr "Hora estándar de Yakutsk" + +#: tzres.rc:227 +msgid "Yakutsk Daylight Time" +msgstr "" + +#: tzres.rc:176 +msgid "SA Eastern Standard Time" +msgstr "" + +#: tzres.rc:177 +msgid "SA Eastern Daylight Time" +msgstr "" + +#: tzres.rc:34 +msgid "Arab Standard Time" +msgstr "" + +#: tzres.rc:35 +msgid "Arab Daylight Time" +msgstr "" + +#: tzres.rc:36 +msgid "Arabian Standard Time" +msgstr "" + +#: tzres.rc:37 +msgid "Arabian Daylight Time" +msgstr "" + +#: tzres.rc:174 +msgid "Russian Standard Time" +msgstr "Hora estándar de Rusia" + +#: tzres.rc:175 +msgid "Russian Daylight Time" +msgstr "Hora braniega de Russia" + +#: tzres.rc:172 +msgid "Romance Standard Time" +msgstr "" + +#: tzres.rc:173 +msgid "Romance Daylight Time" +msgstr "" + +#: tzres.rc:98 +msgid "Ekaterinburg Standard Time" +msgstr "" + +#: tzres.rc:99 +msgid "Ekaterinburg Daylight Time" +msgstr "" + +#: tzres.rc:192 +msgid "Syria Standard Time" +msgstr "Hora estándar de Siria" + +#: tzres.rc:193 +msgid "Syria Daylight Time" +msgstr "Hora braniega de Siria" + +#: tzres.rc:44 +msgid "AUS Central Standard Time" +msgstr "" + +#: tzres.rc:45 +msgid "AUS Central Daylight Time" +msgstr "" + +#: tzres.rc:110 +msgid "Greenwich Standard Time" +msgstr "" + +#: tzres.rc:111 +msgid "Greenwich Daylight Time" +msgstr "" + +#: tzres.rc:204 +msgid "Ulaanbaatar Standard Time" +msgstr "Hora estándar d'Ulán Bátor" + +#: tzres.rc:205 +msgid "Ulaanbaatar Daylight Time" +msgstr "Hora braniega d'Ulán Bátor" + +#: tzres.rc:120 +msgid "Israel Standard Time" +msgstr "Hora estándar d'Israel" + +#: tzres.rc:121 +msgid "Israel Daylight Time" +msgstr "" + +#: tzres.rc:54 +msgid "Bangladesh Standard Time" +msgstr "Hora estándar de Bangladex" + +#: tzres.rc:55 +msgid "Bangladesh Daylight Time" +msgstr "Hora braniega de Bangladex" + +#: tzres.rc:178 +msgid "SA Pacific Standard Time" +msgstr "" + +#: tzres.rc:179 +msgid "SA Pacific Daylight Time" +msgstr "" + +#: tzres.rc:222 +msgid "West Asia Standard Time" +msgstr "Hora estándar d'Asia del Oeste" + +#: tzres.rc:223 +msgid "West Asia Daylight Time" +msgstr "Hora braniega d'Asia del Oeste" + +#: tzres.rc:32 +msgid "Alaskan Standard Time" +msgstr "" + +#: tzres.rc:33 +msgid "Alaskan Daylight Time" +msgstr "" + +#: tzres.rc:170 +msgid "Paraguay Standard Time" +msgstr "Hora estándar de Paraguái" + +#: tzres.rc:171 +msgid "Paraguay Daylight Time" +msgstr "Hora braniega de Paraguái" + +#: tzres.rc:84 +msgid "Dateline Standard Time" +msgstr "" + +#: tzres.rc:85 +msgid "Dateline Daylight Time" +msgstr "" + +#: tzres.rc:128 +msgid "Libya Standard Time" +msgstr "Hora estándar de Libia" + +#: tzres.rc:129 +msgid "Libya Daylight Time" +msgstr "Hora braniega de Libia" + +#: tzres.rc:52 +msgid "Bahia Standard Time" +msgstr "" + +#: tzres.rc:53 +msgid "Bahia Daylight Time" +msgstr "" + +#: tzres.rc:212 +msgid "Venezuela Standard Time" +msgstr "Hora estándar de Venezuela" + +#: tzres.rc:213 +msgid "Venezuela Daylight Time" +msgstr "Hora braniega de Venezuela" + +#: tzres.rc:114 +msgid "Hawaiian Standard Time" +msgstr "" + +#: tzres.rc:115 +msgid "Hawaiian Daylight Time" +msgstr "" + +#: tzres.rc:184 +msgid "SE Asia Standard Time" +msgstr "" + +#: tzres.rc:185 +msgid "SE Asia Daylight Time" +msgstr "" + +#: tzres.rc:154 +msgid "New Zealand Standard Time" +msgstr "Hora estándar de Nueva Zelanda" + +#: tzres.rc:155 +msgid "New Zealand Daylight Time" +msgstr "Hora braniega de Nueva Zelanda" + +#: tzres.rc:70 +msgid "Central Brazilian Standard Time" +msgstr "" + +#: tzres.rc:71 +msgid "Central Brazilian Daylight Time" +msgstr "" + +#: tzres.rc:56 +msgid "Belarus Standard Time" +msgstr "Hora estándar de Bielorrusia" + +#: tzres.rc:57 +msgid "Belarus Daylight Time" +msgstr "Hora braniega de Bielorrusia" + +#: tzres.rc:180 +msgid "SA Western Standard Time" +msgstr "" + +#: tzres.rc:181 +msgid "SA Western Daylight Time" +msgstr "" + +#: tzres.rc:108 +msgid "Greenland Standard Time" +msgstr "" + +#: tzres.rc:109 +msgid "Greenland Daylight Time" +msgstr "" + +#: tzres.rc:92 +msgid "Easter Island Standard Time" +msgstr "" + +#: tzres.rc:93 +msgid "Easter Island Daylight Time" +msgstr "Hora braniega d'Islla de Pascua" + +#: tzres.rc:96 +msgid "Egypt Standard Time" +msgstr "Hora estándar d'Exiptu" + +#: tzres.rc:97 +msgid "Egypt Daylight Time" +msgstr "Hora braniega d'Exiptu" + +#: tzres.rc:134 +msgid "Mauritius Standard Time" +msgstr "" + +#: tzres.rc:135 +msgid "Mauritius Daylight Time" +msgstr "" + +#: tzres.rc:214 +msgid "Vladivostok Standard Time" +msgstr "Hora estándar de Vladivostok" + +#: tzres.rc:215 +msgid "Vladivostok Daylight Time" +msgstr "Hora braniega de Vladivostok" + +#: tzres.rc:186 +msgid "Singapore Standard Time" +msgstr "Hora estándar de Singapur" + +#: tzres.rc:187 +msgid "Singapore Daylight Time" +msgstr "Hora braniega de Singapur" + +#: tzres.rc:126 +msgid "Korea Standard Time" +msgstr "Hora estándar de Corea" + +#: tzres.rc:127 +msgid "Korea Daylight Time" +msgstr "Hora braniega de Corea" + +#: tzres.rc:86 +msgid "E. Africa Standard Time" +msgstr "" + +#: tzres.rc:87 +msgid "E. Africa Daylight Time" +msgstr "Hora braniega d'África del Este" + +#: tzres.rc:102 +msgid "FLE Standard Time" +msgstr "" + +#: tzres.rc:103 +msgid "FLE Daylight Time" +msgstr "" + +#: tzres.rc:90 +msgid "E. South America Standard Time" +msgstr "" + +#: tzres.rc:91 +msgid "E. South America Daylight Time" +msgstr "Hora braniega de Suramérica del Este" + +#: tzres.rc:76 +msgid "Central Pacific Standard Time" +msgstr "" + +#: tzres.rc:77 +msgid "Central Pacific Daylight Time" +msgstr "" + +#: tzres.rc:218 +msgid "W. Central Africa Standard Time" +msgstr "Hora estándar d'África del Oeste Central" + +#: tzres.rc:219 +msgid "W. Central Africa Daylight Time" +msgstr "Hora braniega d'África del Oeste Central" + +#: tzres.rc:162 +msgid "Pacific SA Standard Time" +msgstr "" + +#: tzres.rc:163 +msgid "Pacific SA Daylight Time" +msgstr "" + +#: tzres.rc:88 +msgid "E. Australia Standard Time" +msgstr "" + +#: tzres.rc:89 +msgid "E. Australia Daylight Time" +msgstr "Hora braniega d'Austrália del Este" + +#: tzres.rc:216 +msgid "W. Australia Standard Time" +msgstr "Hora estándar d'Australia del Oeste" + +#: tzres.rc:217 +msgid "W. Australia Daylight Time" +msgstr "Hora braniega d'Australia del Oeste" + +#: urlmon.rc:32 wininet.rc:77 +msgid "Security Warning" +msgstr "Alvertencia de seguranza" + +#: urlmon.rc:35 +msgid "Do you want to install this software?" +msgstr "¿Quies instalar esti software?" + +#: urlmon.rc:39 +msgid "Don't install" +msgstr "" + +#: urlmon.rc:43 +msgid "" +"When installed, an ActiveX component has full access to your computer. Do " +"not click install unless you have absolute trust in the above source." +msgstr "" + +#: urlmon.rc:51 +msgid "Installation of component failed: %08x" +msgstr "" + +#: urlmon.rc:52 +msgid "Install (%d)" +msgstr "" + +#: urlmon.rc:53 +msgid "Install" +msgstr "" + +#: user32.rc:30 user32.rc:43 taskmgr.rc:138 +msgctxt "window" +msgid "&Restore" +msgstr "&Restaurar" + +#: user32.rc:31 user32.rc:44 +msgid "&Move" +msgstr "&Mover" + +#: user32.rc:32 user32.rc:45 wineconsole.rc:93 +msgid "&Size" +msgstr "&Tamañu" + +#: user32.rc:33 user32.rc:46 +msgid "Mi&nimize" +msgstr "" + +#: user32.rc:34 user32.rc:47 taskmgr.rc:83 taskmgr.rc:99 taskmgr.rc:126 +msgid "Ma&ximize" +msgstr "" + +#: user32.rc:36 +msgid "&Close\tAlt+F4" +msgstr "&Zarrar\tAlt+F4" + +#: user32.rc:38 +msgid "&About Wine" +msgstr "&Tocante a Wine" + +#: user32.rc:49 +msgid "&Close\tCtrl+F4" +msgstr "&Zarrar\tCtrl+F4" + +#: user32.rc:51 +msgid "Nex&t\tCtrl+F6" +msgstr "" + +#: user32.rc:81 +msgid "&Abort" +msgstr "&Albortar" + +#: user32.rc:85 +msgid "&Ignore" +msgstr "&Inorar" + +#: user32.rc:86 +msgid "&Try Again" +msgstr "" + +#: user32.rc:87 +msgid "&Continue" +msgstr "&Siguir" + +#: user32.rc:94 +msgid "Select Window" +msgstr "" + +#: user32.rc:72 +msgid "&More Windows..." +msgstr "" + +#: winemac.rc:33 +msgid "Hide %@" +msgstr "" + +#: winemac.rc:35 +msgid "Hide Others" +msgstr "" + +#: winemac.rc:36 +msgid "Show All" +msgstr "" + +#: winemac.rc:37 +msgid "Quit %@" +msgstr "" + +#: winemac.rc:38 +msgid "Quit" +msgstr "" + +#: winemac.rc:40 +msgid "Window" +msgstr "" + +#: winemac.rc:41 +msgid "Minimize" +msgstr "" + +#: winemac.rc:42 +msgid "Zoom" +msgstr "Zoom" + +#: winemac.rc:43 +msgid "Enter Full Screen" +msgstr "" + +#: winemac.rc:44 +msgid "Bring All to Front" +msgstr "" + +#: wineps.rc:31 +msgid "Paper Si&ze:" +msgstr "" + +#: wineps.rc:39 +msgid "Duplex:" +msgstr "" + +#: wineps.rc:50 +msgid "Setup" +msgstr "" + +#: wininet.rc:42 wininet.rc:62 +msgid "Realm" +msgstr "" + +#: wininet.rc:57 +msgid "Authentication Required" +msgstr "Ríquese l'autenticación" + +#: wininet.rc:61 +msgid "Server" +msgstr "" + +#: wininet.rc:80 +msgid "There is a problem with the certificate for this site." +msgstr "Hai un problema col certificáu d'esti sitiu." + +#: wininet.rc:82 +msgid "Do you want to continue anyway?" +msgstr "¿Quies siguir de toes toes?" + +#: wininet.rc:28 +msgid "LAN Connection" +msgstr "Conexón LAN" + +#: wininet.rc:29 +msgid "The certificate is issued by an unknown or untrusted publisher." +msgstr "" + +#: wininet.rc:30 +msgid "The date on the certificate is invalid." +msgstr "" + +#: wininet.rc:31 +msgid "The name on the certificate does not match the site." +msgstr "" + +#: wininet.rc:32 +msgid "" +"There is at least one unspecified security problem with this certificate." +msgstr "" + +#: winineterror.mc:26 +msgid "The request has timed out.\n" +msgstr "Escosó'l tiempu d'espera de la solicitú.\n" + +#: winineterror.mc:31 +msgid "An internal error has occurred.\n" +msgstr "Asocedió un fallu internu.\n" + +#: winineterror.mc:36 +msgid "The URL is invalid.\n" +msgstr "La URL nun ye válida.\n" + +#: winineterror.mc:41 +msgid "The URL scheme could not be recognized or is not supported.\n" +msgstr "" + +#: winineterror.mc:46 +msgid "The server name could not be resolved.\n" +msgstr "" + +#: winineterror.mc:51 +msgid "The requested operation is invalid.\n" +msgstr "La operación solicitada nun ye válida.\n" + +#: winineterror.mc:56 +msgid "" +"The operation was canceled, usually because the handle on which the request " +"was operating was closed before the operation completed.\n" +msgstr "" + +#: winineterror.mc:61 +msgid "The requested item could not be located.\n" +msgstr "Nun pudo allugase l'elementu solicitáu.\n" + +#: winineterror.mc:66 +msgid "The attempt to connect to the server failed.\n" +msgstr "Falló l'intentu de coneutase col sirvidor.\n" + +#: winineterror.mc:71 +msgid "The connection with the server has been terminated.\n" +msgstr "Terminó la conexón col sirvidor.\n" + +#: winineterror.mc:76 +msgid "" +"SSL certificate date that was received from the server is bad. The " +"certificate is expired.\n" +msgstr "" + +#: winineterror.mc:81 +msgid "SSL certificate common name (host name field) is incorrect.\n" +msgstr "" + +#: winmm.rc:32 +msgid "The specified command was carried out." +msgstr "" + +#: winmm.rc:33 +msgid "Undefined external error." +msgstr "" + +#: winmm.rc:34 +msgid "A device ID has been used that is out of range for your system." +msgstr "" + +#: winmm.rc:35 +msgid "The driver was not enabled." +msgstr "El controlador nun s'activó." + +#: winmm.rc:36 +msgid "" +"The specified device is already in use. Wait until it is free, and then try " +"again." +msgstr "" + +#: winmm.rc:37 +msgid "The specified device handle is invalid." +msgstr "" + +#: winmm.rc:38 +msgid "There is no driver installed on your system!" +msgstr "¡Nun s'instaló dengún controlador nel sistema!" + +#: winmm.rc:39 winmm.rc:65 +msgid "" +"Not enough memory available for this task. Quit one or more applications to " +"increase available memory, and then try again." +msgstr "" + +#: winmm.rc:40 +msgid "" +"This function is not supported. Use the Capabilities function to determine " +"which functions and messages the driver supports." +msgstr "" + +#: winmm.rc:41 +msgid "An error number was specified that is not defined in the system." +msgstr "Especificóse un númberu de fallu que nun ta definíu nel sistema." + +#: winmm.rc:42 +msgid "An invalid flag was passed to a system function." +msgstr "" + +#: winmm.rc:43 +msgid "An invalid parameter was passed to a system function." +msgstr "" + +#: winmm.rc:46 +msgid "" +"The specified format is not supported or cannot be translated. Use the " +"Capabilities function to determine the supported formats." +msgstr "" + +#: winmm.rc:47 winmm.rc:53 +msgid "" +"Cannot perform this operation while media data is still playing. Reset the " +"device, or wait until the data is finished playing." +msgstr "" + +#: winmm.rc:48 +msgid "" +"The wave header was not prepared. Use the Prepare function to prepare the " +"header, and then try again." +msgstr "" + +#: winmm.rc:49 +msgid "" +"Cannot open the device without using the WAVE_ALLOWSYNC flag. Use the flag, " +"and then try again." +msgstr "" +"Nun pue abrise'l preséu ensin usar la bandera WAVE_ALLOWSYNC. Úsala y " +"volvi tentalo darréu." + +#: winmm.rc:52 +msgid "" +"The MIDI header was not prepared. Use the Prepare function to prepare the " +"header, and then try again." +msgstr "" + +#: winmm.rc:54 +msgid "" +"A MIDI map was not found. There may be a problem with the driver, or the " +"MIDIMAP.CFG file may be corrupt or missing." +msgstr "" + +#: winmm.rc:55 +msgid "" +"The port is transmitting data to the device. Wait until the data has been " +"transmitted, and then try again." +msgstr "" +"El puertu ta tresmitiendo datos al preséu. Espera hasta que los datos se " +"tresmitan y volvi tentalo dempués." + +#: winmm.rc:56 winmm.rc:129 +msgid "" +"The current MIDI Mapper setup refers to a MIDI device that is not installed " +"on the system." +msgstr "" + +#: winmm.rc:57 +msgid "" +"The current MIDI setup is damaged. Copy the original MIDIMAP.CFG file to the " +"Windows SYSTEM directory, and then try again." +msgstr "" + +#: winmm.rc:60 +msgid "Invalid MCI device ID. Use the ID returned when opening the MCI device." +msgstr "" + +#: winmm.rc:61 +msgid "The driver cannot recognize the specified command parameter." +msgstr "" + +#: winmm.rc:62 +msgid "The driver cannot recognize the specified command." +msgstr "El controlador nun reconoció'l comandu especificáu." + +#: winmm.rc:63 +msgid "" +"There is a problem with your media device. Make sure it is working correctly " +"or contact the device manufacturer." +msgstr "" + +#: winmm.rc:64 +msgid "The specified device is not open or is not recognized by MCI." +msgstr "" + +#: winmm.rc:66 +msgid "" +"The device name is already being used as an alias by this application. Use a " +"unique alias." +msgstr "" + +#: winmm.rc:67 +msgid "" +"There is an undetectable problem in loading the specified device driver." +msgstr "" + +#: winmm.rc:68 +msgid "No command was specified." +msgstr "" + +#: winmm.rc:69 +msgid "" +"The output string was too large to fit in the return buffer. Increase the " +"size of the buffer." +msgstr "" + +#: winmm.rc:70 +msgid "" +"The specified command requires a character-string parameter. Please provide " +"one." +msgstr "" + +#: winmm.rc:71 +msgid "The specified integer is invalid for this command." +msgstr "" + +#: winmm.rc:72 +msgid "" +"The device driver returned an invalid return type. Check with the device " +"manufacturer about obtaining a new driver." +msgstr "" + +#: winmm.rc:73 +msgid "" +"There is a problem with the device driver. Check with the device " +"manufacturer about obtaining a new driver." +msgstr "" + +#: winmm.rc:74 +msgid "The specified command requires a parameter. Please supply one." +msgstr "El comandu especificáu rique un parámetru. Apurri unu, por favor." + +#: winmm.rc:75 +msgid "The MCI device you are using does not support the specified command." +msgstr "" + +#: winmm.rc:76 +msgid "" +"Cannot find the specified file. Make sure the path and filename are correct." +msgstr "" + +#: winmm.rc:77 +msgid "The device driver is not ready." +msgstr "" + +#: winmm.rc:78 +msgid "A problem occurred in initializing MCI. Try restarting Windows." +msgstr "" + +#: winmm.rc:79 +msgid "" +"There is a problem with the device driver. The driver has closed. Cannot " +"access error." +msgstr "" + +#: winmm.rc:80 +msgid "Cannot use 'all' as the device name with the specified command." +msgstr "" + +#: winmm.rc:81 +msgid "" +"Errors occurred in more than one device. Specify each command and device " +"separately to determine which devices caused the error." +msgstr "" + +#: winmm.rc:82 +msgid "Cannot determine the device type from the given filename extension." +msgstr "" + +#: winmm.rc:83 +msgid "The specified parameter is out of range for the specified command." +msgstr "" + +#: winmm.rc:84 +msgid "The specified parameters cannot be used together." +msgstr "Los parámetros especificaos nun puen usase xuntos." + +#: winmm.rc:85 +msgid "" +"Cannot save the specified file. Make sure you have enough disk space or are " +"still connected to the network." +msgstr "" + +#: winmm.rc:86 +msgid "" +"Cannot find the specified device. Make sure it is installed and that the " +"device name is spelled correctly." +msgstr "" + +#: winmm.rc:87 +msgid "" +"The specified device is now being closed. Wait a few seconds, and then try " +"again." +msgstr "" + +#: winmm.rc:88 +msgid "" +"The specified alias is already being used in this application. Use a unique " +"alias." +msgstr "" + +#: winmm.rc:89 +msgid "The specified parameter is invalid for this command." +msgstr "" + +#: winmm.rc:90 +msgid "" +"The device driver is already in use. To share it, use the 'shareable' " +"parameter with each 'open' command." +msgstr "" + +#: winmm.rc:91 +msgid "" +"The specified command requires an alias, file, driver, or device name. " +"Please supply one." +msgstr "" + +#: winmm.rc:92 +msgid "" +"The specified value for the time format is invalid. Refer to the MCI " +"documentation for valid formats." +msgstr "" + +#: winmm.rc:93 +msgid "" +"A closing double-quotation mark is missing from the parameter value. Please " +"supply one." +msgstr "" + +#: winmm.rc:94 +msgid "A parameter or value was specified twice. Only specify it once." +msgstr "" + +#: winmm.rc:95 +msgid "" +"The specified file cannot be played on the specified MCI device. The file " +"may be corrupt, or not in the correct format." +msgstr "" + +#: winmm.rc:96 +msgid "A null parameter block was passed to MCI." +msgstr "" + +#: winmm.rc:97 +msgid "Cannot save an unnamed file. Supply a filename." +msgstr "" + +#: winmm.rc:98 +msgid "You must specify an alias when using the 'new' parameter." +msgstr "" + +#: winmm.rc:99 +msgid "Cannot use the 'notify' flag with auto-opened devices." +msgstr "" + +#: winmm.rc:100 +msgid "Cannot use a filename with the specified device." +msgstr "" + +#: winmm.rc:101 +msgid "" +"Cannot carry out the commands in the order specified. Correct the command " +"sequence, and then try again." +msgstr "" + +#: winmm.rc:102 +msgid "" +"Cannot carry out the specified command on an auto-opened device. Wait until " +"the device is closed, and then try again." +msgstr "" + +#: winmm.rc:103 +msgid "" +"The filename is invalid. Make sure the filename is not longer than 8 " +"characters, followed by a period and an extension." +msgstr "" + +#: winmm.rc:104 +msgid "" +"Cannot specify extra characters after a string enclosed in quotation marks." +msgstr "" + +#: winmm.rc:105 +msgid "" +"The specified device is not installed on the system. Use the Drivers option " +"in Control Panel to install the device." +msgstr "" + +#: winmm.rc:106 +msgid "" +"Cannot access the specified file or MCI device. Try changing directories or " +"restarting your computer." +msgstr "" + +#: winmm.rc:107 +msgid "" +"Cannot access the specified file or MCI device because the application " +"cannot change directories." +msgstr "" + +#: winmm.rc:108 +msgid "" +"Cannot access specified file or MCI device because the application cannot " +"change drives." +msgstr "" + +#: winmm.rc:109 +msgid "Specify a device or driver name that is less than 79 characters." +msgstr "" + +#: winmm.rc:110 +msgid "Specify a device or driver name that is less than 69 characters." +msgstr "" + +#: winmm.rc:111 +msgid "" +"The specified command requires an integer parameter. Please provide one." +msgstr "" + +#: winmm.rc:112 +msgid "" +"All wave devices that can play files in the current format are in use. Wait " +"until a wave device is free, and then try again." +msgstr "" + +#: winmm.rc:113 +msgid "" +"Cannot set the current wave device for play back because it is in use. Wait " +"until the device is free, and then try again." +msgstr "" + +#: winmm.rc:114 +msgid "" +"All wave devices that can record files in the current format are in use. " +"Wait until a wave device is free, and then try again." +msgstr "" + +#: winmm.rc:115 +msgid "" +"Cannot set the current wave device for recording because it is in use. Wait " +"until the device is free, and then try again." +msgstr "" + +#: winmm.rc:116 +msgid "Any compatible waveform playback device may be used." +msgstr "" + +#: winmm.rc:117 +msgid "Any compatible waveform recording device may be used." +msgstr "" + +#: winmm.rc:118 +msgid "" +"No wave device that can play files in the current format is installed. Use " +"the Drivers option to install the wave device." +msgstr "" + +#: winmm.rc:119 +msgid "" +"The device you are trying to play to cannot recognize the current file " +"format." +msgstr "" + +#: winmm.rc:120 +msgid "" +"No wave device that can record files in the current format is installed. Use " +"the Drivers option to install the wave device." +msgstr "" + +#: winmm.rc:121 +msgid "" +"The device you are trying to record from cannot recognize the current file " +"format." +msgstr "" + +#: winmm.rc:126 +msgid "" +"The time formats of the \"song pointer\" and SMPTE are mutually exclusive. " +"You can't use them together." +msgstr "" + +#: winmm.rc:128 +msgid "" +"The specified MIDI port is already in use. Wait until it is free; then try " +"again." +msgstr "" + +#: winmm.rc:131 +msgid "" +"The specified MIDI device is not installed on the system. Use the Drivers " +"option from the Control Panel to install a MIDI device." +msgstr "" + +#: winmm.rc:130 +msgid "An error occurred with the specified port." +msgstr "Asocedió un fallu col puertu especificáu." + +#: winmm.rc:133 +msgid "" +"All multimedia timers are being used by other applications. Quit one of " +"these applications; then, try again." +msgstr "" + +#: winmm.rc:132 +msgid "The system doesn't have a current MIDI port specified." +msgstr "" + +#: winmm.rc:127 +msgid "" +"The system has no installed MIDI devices. Use the Drivers option from the " +"Control Panel to install a MIDI driver." +msgstr "" + +#: winmm.rc:122 +msgid "There is no display window." +msgstr "" + +#: winmm.rc:123 +msgid "Could not create or use window." +msgstr "" + +#: winmm.rc:124 +msgid "" +"Cannot read the specified file. Make sure the file is still present, or " +"check your disk or network connection." +msgstr "" + +#: winmm.rc:125 +msgid "" +"Cannot write to the specified file. Make sure you have enough disk space or " +"are still connected to the network." +msgstr "" + +#: winmm.rc:136 +msgid "Wine Sound Mapper" +msgstr "" + +#: winmm.rc:137 +msgid "Volume" +msgstr "Volume" + +#: winmm.rc:138 +msgid "Master Volume" +msgstr "Volume maestru" + +#: winmm.rc:139 +msgid "Mute" +msgstr "" + +#: winspool.rc:37 +msgid "Print to File" +msgstr "" + +#: winspool.rc:40 +msgid "&Output File Name:" +msgstr "" + +#: winspool.rc:31 +msgid "The output file already exists. Click OK to overwrite." +msgstr "" + +#: winspool.rc:32 +msgid "Unable to create the output file." +msgstr "Nun pue crease'l ficheru de salida." + +#: wldap32.rc:32 +msgid "Success" +msgstr "Ésitu" + +#: wldap32.rc:33 +msgid "Operations Error" +msgstr "Fallu d'operaciones" + +#: wldap32.rc:34 +msgid "Protocol Error" +msgstr "" + +#: wldap32.rc:35 +msgid "Time Limit Exceeded" +msgstr "" + +#: wldap32.rc:36 +msgid "Size Limit Exceeded" +msgstr "" + +#: wldap32.rc:37 +msgid "Compare False" +msgstr "" + +#: wldap32.rc:38 +msgid "Compare True" +msgstr "" + +#: wldap32.rc:39 +msgid "Authentication Method Not Supported" +msgstr "" + +#: wldap32.rc:40 +msgid "Strong Authentication Required" +msgstr "" + +#: wldap32.rc:41 +msgid "Referral (v2)" +msgstr "" + +#: wldap32.rc:42 +msgid "Referral" +msgstr "" + +#: wldap32.rc:43 +msgid "Administration Limit Exceeded" +msgstr "" + +#: wldap32.rc:44 +msgid "Unavailable Critical Extension" +msgstr "" + +#: wldap32.rc:45 +msgid "Confidentiality Required" +msgstr "" + +#: wldap32.rc:46 +msgid "SASL Bind in Progress" +msgstr "" + +#: wldap32.rc:48 +msgid "No Such Attribute" +msgstr "" + +#: wldap32.rc:49 +msgid "Undefined Type" +msgstr "" + +#: wldap32.rc:50 +msgid "Inappropriate Matching" +msgstr "" + +#: wldap32.rc:51 +msgid "Constraint Violation" +msgstr "" + +#: wldap32.rc:52 +msgid "Attribute Or Value Exists" +msgstr "" + +#: wldap32.rc:53 +msgid "Invalid Syntax" +msgstr "La sintaxis nun ye válida" + +#: wldap32.rc:64 +msgid "No Such Object" +msgstr "" + +#: wldap32.rc:65 +msgid "Alias Problem" +msgstr "" + +#: wldap32.rc:66 +msgid "Invalid DN Syntax" +msgstr "" + +#: wldap32.rc:67 +msgid "Is Leaf" +msgstr "" + +#: wldap32.rc:68 +msgid "Alias Dereference Problem" +msgstr "" + +#: wldap32.rc:80 +msgid "Inappropriate Authentication" +msgstr "" + +#: wldap32.rc:81 +msgid "Invalid Credentials" +msgstr "Les credenciales nun son válides" + +#: wldap32.rc:82 +msgid "Insufficient Rights" +msgstr "" + +#: wldap32.rc:83 +msgid "Busy" +msgstr "" + +#: wldap32.rc:84 +msgid "Unavailable" +msgstr "" + +#: wldap32.rc:85 +msgid "Unwilling To Perform" +msgstr "" + +#: wldap32.rc:86 +msgid "Loop Detected" +msgstr "" + +#: wldap32.rc:92 +msgid "Sort Control Missing" +msgstr "" + +#: wldap32.rc:93 +msgid "Index range error" +msgstr "" + +#: wldap32.rc:96 +msgid "Naming Violation" +msgstr "" + +#: wldap32.rc:97 +msgid "Object Class Violation" +msgstr "" + +#: wldap32.rc:98 +msgid "Not allowed on Non-leaf" +msgstr "" + +#: wldap32.rc:99 +msgid "Not allowed on RDN" +msgstr "" + +#: wldap32.rc:100 +msgid "Already Exists" +msgstr "" + +#: wldap32.rc:101 +msgid "No Object Class Mods" +msgstr "" + +#: wldap32.rc:102 +msgid "Results Too Large" +msgstr "" + +#: wldap32.rc:103 +msgid "Affects Multiple DSAs" +msgstr "" + +#: wldap32.rc:113 +msgid "Server Down" +msgstr "" + +#: wldap32.rc:114 +msgid "Local Error" +msgstr "Fallu llocal" + +#: wldap32.rc:115 +msgid "Encoding Error" +msgstr "" + +#: wldap32.rc:116 +msgid "Decoding Error" +msgstr "" + +#: wldap32.rc:117 +msgid "Timeout" +msgstr "" + +#: wldap32.rc:118 +msgid "Auth Unknown" +msgstr "" + +#: wldap32.rc:119 +msgid "Filter Error" +msgstr "" + +#: wldap32.rc:120 +msgid "User Canceled" +msgstr "" + +#: wldap32.rc:121 +msgid "Parameter Error" +msgstr "" + +#: wldap32.rc:122 +msgid "No Memory" +msgstr "" + +#: wldap32.rc:123 +msgid "Can't connect to the LDAP server" +msgstr "Nun pue coneutase col sirvidor LDAP" + +#: wldap32.rc:124 +msgid "Operation not supported by this version of the LDAP protocol" +msgstr "" + +#: wldap32.rc:125 +msgid "Specified control was not found in message" +msgstr "" + +#: wldap32.rc:126 +msgid "No result present in message" +msgstr "" + +#: wldap32.rc:127 +msgid "More results returned" +msgstr "" + +#: wldap32.rc:128 +msgid "Loop while handling referrals" +msgstr "" + +#: wldap32.rc:129 +msgid "Referral hop limit exceeded" +msgstr "" + +#: attrib.rc:30 cmd.rc:373 +msgid "" +"Not Yet Implemented\n" +"\n" +msgstr "" +"Entá nun s'implementó\n" +"\n" + +#: attrib.rc:31 cmd.rc:376 +msgid "%1: File Not Found\n" +msgstr "%1: Nun s'alcontró'l ficheru\n" + +#: attrib.rc:50 +msgid "" +"ATTRIB - Displays or changes file attributes.\n" +"\n" +"Syntax:\n" +"ATTRIB [+R | -R] [+A | -A ] [+S | -S] [+H | -H] [drive:][path][filename]\n" +" [/S [/D]]\n" +"\n" +"Where:\n" +"\n" +" + Sets an attribute.\n" +" - Clears an attribute.\n" +" R Read-only file attribute.\n" +" A Archive file attribute.\n" +" S System file attribute.\n" +" H Hidden file attribute.\n" +" [drive:][path][filename]\n" +" Specifies a file or files for attrib to process.\n" +" /S Processes matching files in the current folder and all subfolders.\n" +" /D Processes folders as well.\n" +msgstr "" + +#: clock.rc:32 +msgid "Ana&log" +msgstr "Ana&lóxicu" + +#: clock.rc:33 +msgid "Digi&tal" +msgstr "Dixi&tal" + +#: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84 +msgid "&Font..." +msgstr "" + +#: clock.rc:37 +msgid "&Without Titlebar" +msgstr "" + +#: clock.rc:39 +msgid "&Seconds" +msgstr "&Segundos" + +#: clock.rc:40 +msgid "&Date" +msgstr "&Data" + +#: clock.rc:42 taskmgr.rc:43 taskmgr.rc:141 +msgid "&Always on Top" +msgstr "&Siempres enriba" + +#: clock.rc:45 +msgid "&About Clock" +msgstr "&Tocante a Reló" + +#: clock.rc:51 +msgid "Clock" +msgstr "" + +#: cmd.rc:40 +msgid "" +"CALL <batchfilename> is used within a batch file to execute commands from\n" +"another batch file. When the batch file exits, control returns to the file\n" +"which called it. The CALL command may supply parameters to the called\n" +"procedure.\n" +"\n" +"Changes to default directory, environment variables etc made within a\n" +"called procedure are inherited by the caller.\n" +msgstr "" + +#: cmd.rc:44 +msgid "" +"CD <directory> is the short version of CHDIR. It changes the current\n" +"default directory.\n" +msgstr "" +"CD <direutoriu> ye la versión acurtiada de CHDIR. Camuda'l " +"direutoriu predetermináu actual.\n" + +#: cmd.rc:47 +msgid "CHDIR <directory> changes the current default directory.\n" +msgstr "CHDIR <direutoriu> camuda'l direutoriu predetermináu actual.\n" + +#: cmd.rc:50 +msgid "CLS clears the console screen.\n" +msgstr "CLS llimpia la pantalla de la consola.\n" + +#: cmd.rc:53 +msgid "COPY <filename> copies a file.\n" +msgstr "" + +#: cmd.rc:56 +msgid "CTTY changes the input/output device.\n" +msgstr "" + +#: cmd.rc:59 +msgid "DATE shows or changes the system date.\n" +msgstr "" + +#: cmd.rc:62 +msgid "DEL <filename> deletes a file or set of files.\n" +msgstr "DEL <nome_ficheru> desanicia un ficheru o conxuntu de ficheros.\n" + +#: cmd.rc:65 +msgid "DIR lists the contents of a directory.\n" +msgstr "DIR llista'l conteníu d'un direutoriu.\n" + +#: cmd.rc:75 +msgid "" +"ECHO <string> displays <string> on the current terminal device.\n" +"\n" +"ECHO ON causes all subsequent commands in a batch file to be displayed on\n" +"the terminal device before they are executed.\n" +"\n" +"ECHO OFF reverses the effect of a previous ECHO ON (ECHO is OFF by\n" +"default). The ECHO OFF command can be prevented from displaying by\n" +"preceding it with an @ sign.\n" +msgstr "" + +#: cmd.rc:78 +msgid "ERASE <filename> deletes a file or set of files.\n" +msgstr "" + +#: cmd.rc:85 +msgid "" +"The FOR command is used to execute a command for each of a set of files.\n" +"\n" +"Usage: FOR %variable IN (set) DO command\n" +"\n" +"The % sign must be doubled when using FOR in a batch file.\n" +msgstr "" + +#: cmd.rc:97 +msgid "" +"The GOTO command transfers execution to another statement within a batch\n" +"file.\n" +"\n" +"The label which is the target of a GOTO may be up to 255 characters long\n" +"but may not include spaces (this is different from other operating\n" +"systems). If two or more identical labels exist in a batch file the first\n" +"one will always be executed. Attempting to GOTO a nonexistent label\n" +"terminates the batch file execution.\n" +"\n" +"GOTO has no effect when used interactively.\n" +msgstr "" + +#: cmd.rc:101 +msgid "" +"HELP <command> shows brief help details on a topic.\n" +"HELP without an argument shows all CMD built-in commands.\n" +msgstr "" + +#: cmd.rc:111 +msgid "" +"IF is used to conditionally execute a command.\n" +"\n" +"Syntax: IF [NOT] EXIST filename command\n" +" IF [NOT] string1==string2 command\n" +" IF [NOT] ERRORLEVEL number command\n" +"\n" +"In the second form of the command, string1 and string2 must be in double\n" +"quotes. The comparison is not case-sensitive.\n" +msgstr "" + +#: cmd.rc:118 +msgid "" +"LABEL is used to set a disk volume label.\n" +"\n" +"Syntax: LABEL [drive:]\n" +"The command will prompt you for the new volume label for the given drive.\n" +"You can display the disk volume label with the VOL command.\n" +msgstr "" + +#: cmd.rc:121 +msgid "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" +msgstr "MD <nome> ye la versión acurtiada de MKDIR. Crea un sodireutoriu.\n" + +#: cmd.rc:123 +msgid "MKDIR <name> creates a subdirectory.\n" +msgstr "" + +#: cmd.rc:131 +msgid "" +"MOVE relocates a file or directory to a new point within the file system.\n" +"\n" +"If the item being moved is a directory then all the files and\n" +"subdirectories below the item are moved as well.\n" +"\n" +"MOVE fails if the old and new locations are on different DOS drive letters.\n" +msgstr "" + +#: cmd.rc:142 +msgid "" +"PATH displays or changes the cmd search path.\n" +"\n" +"Entering PATH will display the current PATH setting (initially taken from\n" +"the registry). To change the setting follow the PATH command with the new\n" +"value.\n" +"\n" +"It is also possible to modify the PATH by using the PATH environment\n" +"variable, for example:\n" +"PATH %PATH%;c:\\temp\n" +msgstr "" + +#: cmd.rc:148 +msgid "" +"PAUSE displays a message on the screen asking the user to press a key.\n" +"\n" +"It is mainly useful in batch files to allow the user to read the output of\n" +"a previous command before it scrolls off the screen.\n" +msgstr "" +"PAUSE amuesa un mensaxe na pantalla pidiendo al usuariu que prima una tecla" +" .\n" +"\n" +"Esto ye útil con ficheros per llotes pa permitir al usuariu lleer la salida\n" +"d'un comandu anterior enantes de que se desplace fuera de la pantalla.\n" + +#: cmd.rc:169 +msgid "" +"PROMPT sets the command-line prompt.\n" +"\n" +"The string following the PROMPT command (and the space immediately after)\n" +"appears at the beginning of the line when cmd is waiting for input.\n" +"\n" +"The following character strings have the special meaning shown:\n" +"\n" +"$$ Dollar sign $_ Linefeed $b Pipe sign (|)\n" +"$d Current date $e Escape $g > sign\n" +"$l < sign $n Current drive $p Current path\n" +"$q Equal sign $t Current time $v cmd version\n" +"\n" +"Note that entering the PROMPT command without a prompt-string resets the\n" +"prompt to the default, which is the current directory (which includes the\n" +"current drive letter) followed by a greater-than (>) sign.\n" +"(like a command PROMPT $p$g).\n" +"\n" +"The prompt can also be changed by altering the PROMPT environment variable,\n" +"so the command 'SET PROMPT=text' has the same effect as 'PROMPT text'.\n" +msgstr "" + +#: cmd.rc:173 +msgid "" +"A command line beginning with REM (followed by a space) performs no action,\n" +"and can therefore be used as a comment in a batch file.\n" +msgstr "" + +#: cmd.rc:176 +msgid "REN <filename> is the short version of RENAME. It renames a file.\n" +msgstr "" +"REN <nome_ficheru> ye la versión acurtiada de RENAME. Renoma un direutoriu.\n" + +#: cmd.rc:178 +msgid "RENAME <filename> renames a file.\n" +msgstr "RENAME <nome_ficheru> renoma un ficheru.\n" + +#: cmd.rc:181 +msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" +msgstr "" +"RD <direutoriu> ye la versión acurtiada de RMDIR. Desanicia un direutoriu.\n" + +#: cmd.rc:183 +msgid "RMDIR <directory> deletes a directory.\n" +msgstr "RMDIR <direutoriu> desanicia un direutoriu.\n" + +#: cmd.rc:229 +msgid "" +"SET displays or changes the cmd environment variables.\n" +"\n" +"SET without parameters shows all of the current environment.\n" +"\n" +"To create or modify an environment variable the syntax is:\n" +"\n" +"SET <variable>=<value>\n" +"\n" +"where <variable> and <value> are character strings. There must be no space\n" +"before the equals sign, nor can the variable name have embedded spaces.\n" +"\n" +"Under Wine, the environment of the underlying operating system is included\n" +"into the Win32 environment, there will generally therefore be many more\n" +"values than in a native Win32 implementation. Note that it is not possible\n" +"to affect the operating system environment from within cmd.\n" +msgstr "" + +#: cmd.rc:234 +msgid "" +"SHIFT is used in a batch file to remove one parameter from the head of the\n" +"list, so parameter 2 becomes parameter 1 and so on. It has no effect if\n" +"called from the command line.\n" +msgstr "" + +#: cmd.rc:212 start.rc:56 +msgid "" +"Start a program, or open a document in the program normally used for files\n" +"with that suffix.\n" +"Usage:\n" +"start [options] program_filename [...]\n" +"start [options] document_filename\n" +"\n" +"Options:\n" +"\"title\" Specifies the title of the child windows.\n" +"/d directory Start the program in the specified directory.\n" +"/b Don't create a new console for the program.\n" +"/i Start the program with fresh environment variables.\n" +"/min Start the program minimized.\n" +"/max Start the program maximized.\n" +"/low Start the program in the idle priority class.\n" +"/normal Start the program in the normal priority class.\n" +"/high Start the program in the high priority class.\n" +"/realtime Start the program in the realtime priority class.\n" +"/abovenormal Start the program in the abovenormal priority class.\n" +"/belownormal Start the program in the belownormal priority class.\n" +"/node n Start the program on the specified NUMA node.\n" +"/affinity mask Start the program with the specified affinity mask.\n" +"/wait Wait for the started program to finish, then exit with its\n" +"exit code.\n" +"/unix Use a Unix filename and start the file like windows\n" +"explorer.\n" +"/ProgIDOpen Open a document using the specified progID.\n" +"/? Display this help and exit.\n" +msgstr "" + +#: cmd.rc:237 +msgid "TIME sets or shows the current system time.\n" +msgstr "" + +#: cmd.rc:240 +msgid "TITLE <string> sets the window title for the cmd window.\n" +msgstr "" + +#: cmd.rc:244 +msgid "" +"TYPE <filename> copies <filename> to the console device (or elsewhere if\n" +"redirected). No check is made that the file is readable text.\n" +msgstr "" + +#: cmd.rc:253 +msgid "" +"VERIFY is used to set, clear or test the verify flag. Valid forms are:\n" +"\n" +"VERIFY ON\tSet the flag.\n" +"VERIFY OFF\tClear the flag.\n" +"VERIFY\t\tDisplays ON or OFF as appropriate.\n" +"\n" +"The verify flag has no function in Wine.\n" +msgstr "" + +#: cmd.rc:256 +msgid "VER displays the version of cmd you are running.\n" +msgstr "VER amuesa la versión de la llinia de comandos que tas executando.\n" + +#: cmd.rc:259 +msgid "VOL shows the volume label of a disk device.\n" +msgstr "" + +#: cmd.rc:263 +msgid "" +"ENDLOCAL ends localization of environment changes in a batch file which\n" +"were introduced by a preceding SETLOCAL.\n" +msgstr "" + +#: cmd.rc:271 +msgid "" +"SETLOCAL starts localization of environment changes in a batch file.\n" +"\n" +"Environment changes done after a SETLOCAL are local to the batch file, and\n" +"are preserved until the next ENDLOCAL is encountered (or at the end of the\n" +"file, whichever comes first), at which point the previous environment\n" +"settings are restored.\n" +msgstr "" + +#: cmd.rc:275 +msgid "" +"PUSHD <directory> saves the current directory onto a stack, and then\n" +"changes the current directory to the supplied one.\n" +msgstr "" + +#: cmd.rc:278 +msgid "POPD changes current directory to the last one saved with PUSHD.\n" +msgstr "" + +#: cmd.rc:288 +msgid "" +"ASSOC shows or modifies file extension associations.\n" +"\n" +"Syntax: ASSOC [.ext[=[fileType]]]\n" +"\n" +"ASSOC without parameters displays current file associations.\n" +"If used with only a file extension, displays the current association.\n" +"Specifying no file type after the equal sign removes the current\n" +"association, if any.\n" +msgstr "" + +#: cmd.rc:300 +msgid "" +"FTYPE shows or modifies open commands associated with file types.\n" +"\n" +"Syntax: FTYPE [fileType[=[openCommand]]]\n" +"\n" +"Without parameters, shows the file types for which open command strings are\n" +"currently defined.\n" +"If used with only a file type, displays the associated open command string,\n" +"if any.\n" +"Specifying no open command after the equal sign removes the command string\n" +"associated to the specified file type.\n" +msgstr "" + +#: cmd.rc:303 +msgid "MORE displays output of files or piped input in pages.\n" +msgstr "" + +#: cmd.rc:308 +msgid "" +"CHOICE displays a text and waits, until the User presses an allowed Key\n" +"from a selectable list.\n" +"CHOICE is mainly used to build a menu selection in a batch file.\n" +msgstr "" +"CHOICE amuesa un testu y espera hasta que l'usuariu prima una tecla\n" +"permitida de la llista esbillable.\n" +"CHOICE úsase principalmente pa crear un menú d'esbilla nun ficheru " +"per llotes.\n" + +#: cmd.rc:324 +msgid "" +"Create a symbolic link.\n" +"\n" +"Syntax: MKLINK [options] link_name target\n" +"\n" +"Options:\n" +"/d Create a directory symbolic link.\n" +"/h Create a hard link.\n" +"/j Create a directory junction.\n" +"link_name is the name of the new symbolic link.\n" +"target is the path that link_name points to.\n" +msgstr "" + +#: cmd.rc:312 +msgid "" +"EXIT terminates the current command session and returns to the operating\n" +"system or shell from which you invoked cmd.\n" +msgstr "" + +#: cmd.rc:364 +msgid "" +"CMD built-in commands are:\n" +"ASSOC\t\tShow or modify file extension associations\n" +"ATTRIB\t\tShow or change DOS file attributes\n" +"CALL\t\tInvoke a batch file from inside another\n" +"CD (CHDIR)\tChange current default directory\n" +"CHOICE\t\tWait for an keypress from a selectable list\n" +"CLS\t\tClear the console screen\n" +"COPY\t\tCopy file\n" +"CTTY\t\tChange input/output device\n" +"DATE\t\tShow or change the system date\n" +"DEL (ERASE)\tDelete a file or set of files\n" +"DIR\t\tList the contents of a directory\n" +"ECHO\t\tCopy text directly to the console output\n" +"ENDLOCAL\tEnd localization of environment changes in a batch file\n" +"FTYPE\t\tShow or modify open commands associated with file types\n" +"HELP\t\tShow brief help details on a topic\n" +"MD (MKDIR)\tCreate a subdirectory\n" +"MKLINK\tCreate a symbolic link\n" +"MORE\t\tDisplay output in pages\n" +"MOVE\t\tMove a file, set of files or directory tree\n" +"PATH\t\tSet or show the search path\n" +"PAUSE\t\tSuspend execution of a batch file\n" +"POPD\t\tRestore the directory to the last one saved with PUSHD\n" +"PROMPT\t\tChange the command prompt\n" +"PUSHD\t\tChange to a new directory, saving the current one\n" +"REN (RENAME)\tRename a file\n" +"RD (RMDIR)\tDelete a subdirectory\n" +"SET\t\tSet or show environment variables\n" +"SETLOCAL\tStart localization of environment changes in a batch file\n" +"START\t\tStart a program, or open a document in the associated program\n" +"TIME\t\tSet or show the current system time\n" +"TITLE\t\tSet the window title for the CMD session\n" +"TYPE\t\tType the contents of a text file\n" +"VER\t\tShow the current version of CMD\n" +"VOL\t\tShow the volume label of a disk device\n" +"XCOPY\t\tCopy source files or directory trees to a destination\n" +"EXIT\t\tClose down CMD\n" +"\n" +"Enter HELP <command> for further information on any of the above commands.\n" +msgstr "" + +#: cmd.rc:365 +msgid "Are you sure?" +msgstr "¿De xuru?" + +#: cmd.rc:366 reg.rc:50 xcopy.rc:43 +msgctxt "Yes key" +msgid "Y" +msgstr "S" + +#: cmd.rc:367 reg.rc:51 xcopy.rc:44 +msgctxt "No key" +msgid "N" +msgstr "N" + +#: cmd.rc:368 +msgid "File association missing for extension %1\n" +msgstr "" + +#: cmd.rc:369 +msgid "No open command associated with file type '%1'\n" +msgstr "" + +#: cmd.rc:370 +msgid "Overwrite %1?" +msgstr "¿Sobrescribir %1?" + +#: cmd.rc:371 +msgid "More..." +msgstr "Más..." + +#: cmd.rc:372 +msgid "Line in Batch processing possibly truncated. Using:\n" +msgstr "" + +#: cmd.rc:374 +msgid "Argument missing\n" +msgstr "Falta l'argumentu\n" + +#: cmd.rc:375 +msgid "Syntax error\n" +msgstr "" + +#: cmd.rc:377 +msgid "No help available for %1\n" +msgstr "" + +#: cmd.rc:378 +msgid "Target to GOTO not found\n" +msgstr "" + +#: cmd.rc:379 +msgid "Current Date is %1\n" +msgstr "La data actual ye %1\n" + +#: cmd.rc:380 +msgid "Current Time is %1\n" +msgstr "La hora actual ye %1\n" + +#: cmd.rc:381 +msgid "Enter new date: " +msgstr "" + +#: cmd.rc:382 +msgid "Enter new time: " +msgstr "" + +#: cmd.rc:383 +msgid "Environment variable %1 not defined\n" +msgstr "" + +#: cmd.rc:384 xcopy.rc:41 +msgid "Failed to open '%1'\n" +msgstr "Fallu al abrir «%1»\n" + +#: cmd.rc:385 +msgid "Cannot call batch label outside of a batch script\n" +msgstr "" + +#: cmd.rc:386 xcopy.rc:45 +msgctxt "All key" +msgid "A" +msgstr "" + +#: cmd.rc:387 +msgid "Delete %1?" +msgstr "" + +#: cmd.rc:388 +msgid "Echo is %1\n" +msgstr "" + +#: cmd.rc:389 +msgid "Verify is %1\n" +msgstr "" + +#: cmd.rc:390 +msgid "Verify must be ON or OFF\n" +msgstr "" + +#: cmd.rc:391 +msgid "Parameter error\n" +msgstr "" + +#: cmd.rc:392 +msgid "" +"Volume Serial Number is %1!04x!-%2!04x!\n" +"\n" +msgstr "" + +#: cmd.rc:393 +msgid "Volume label (11 characters, <Enter> for none)?" +msgstr "" + +#: cmd.rc:394 +msgid "PATH not found\n" +msgstr "" + +#: cmd.rc:395 +msgid "Press any key to continue... " +msgstr "Primi cualesquier tecla pa siguir..." + +#: cmd.rc:396 +msgid "Wine Command Prompt" +msgstr "Llinia de comandos de Wine" + +#: cmd.rc:397 +msgid "Microsoft Windows %1!S!\n" +msgstr "" + +#: cmd.rc:398 +msgid "More? " +msgstr "¿Más?" + +#: cmd.rc:399 +msgid "The input line is too long.\n" +msgstr "" + +#: cmd.rc:400 +msgid "Volume in drive %1!c! is %2\n" +msgstr "" + +#: cmd.rc:401 +msgid "Volume in drive %1!c! has no label.\n" +msgstr "" + +#: cmd.rc:402 reg.rc:49 +msgid " (Yes|No)" +msgstr " (Sí|Non)" + +#: cmd.rc:403 +msgid " (Yes|No|All)" +msgstr "" + +#: cmd.rc:404 +msgid "" +"Can't recognize '%1' as an internal or external command, or batch script.\n" +msgstr "" +"Nun pue reconocese a «%1» como un comandu esternu o internu, o un script per" +" llotes.\n" + +#: cmd.rc:405 +msgid "Division by zero error.\n" +msgstr "" + +#: cmd.rc:406 +msgid "Expected an operand.\n" +msgstr "" + +#: cmd.rc:407 +msgid "Expected an operator.\n" +msgstr "" + +#: cmd.rc:408 +msgid "Mismatch in parentheses.\n" +msgstr "" + +#: cmd.rc:409 +msgid "" +"Badly formed number - must be one of decimal (12),\n" +" hexadecimal (0x34) or octal (056).\n" +msgstr "" + +#: dxdiag.rc:30 +msgid "DirectX Diagnostic Tool" +msgstr "" + +#: dxdiag.rc:31 +msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]" +msgstr "" + +#: explorer.rc:31 +msgid "Wine Explorer" +msgstr "Esplorador de Wine" + +#: explorer.rc:33 +msgid "Start" +msgstr "" + +#: explorer.rc:34 winefile.rc:36 +msgid "&Run..." +msgstr "&Executar..." + +#: hostname.rc:30 +msgid "Usage: hostname\n" +msgstr "" + +#: hostname.rc:31 +msgid "Error: Invalid option '%c'.\n" +msgstr "Fallu: La opción «%c» nun ye válida.\n" + +#: hostname.rc:32 +msgid "Error: Could not get hostname: %u.\n" +msgstr "" + +#: hostname.rc:33 +msgid "" +"Error: Setting the system hostname is not possible with the hostname " +"utility.\n" +msgstr "" + +#: ipconfig.rc:30 +msgid "Usage: ipconfig [ /? | /all ]\n" +msgstr "Usu: ipconfig [ /? | /all ]\n" + +#: ipconfig.rc:31 +msgid "Error: Unknown or invalid command line parameters specified\n" +msgstr "" +"Fallu: Especificáronse na llinia de comandos parámetros non\n" +"válidos o desconocíos\n" + +#: ipconfig.rc:32 +msgid "%1 adapter %2\n" +msgstr "" + +#: ipconfig.rc:33 +msgid "Ethernet" +msgstr "Ethernet" + +#: ipconfig.rc:35 +msgid "Connection-specific DNS suffix" +msgstr "" + +#: ipconfig.rc:36 +msgid "IPv4 address" +msgstr "Direición IPv4" + +#: ipconfig.rc:37 +msgid "Hostname" +msgstr "" + +#: ipconfig.rc:38 +msgid "Node type" +msgstr "" + +#: ipconfig.rc:39 +msgid "Broadcast" +msgstr "" + +#: ipconfig.rc:40 +msgid "Peer-to-peer" +msgstr "" + +#: ipconfig.rc:41 +msgid "Mixed" +msgstr "" + +#: ipconfig.rc:42 +msgid "Hybrid" +msgstr "" + +#: ipconfig.rc:43 +msgid "IP routing enabled" +msgstr "" + +#: ipconfig.rc:45 +msgid "Physical address" +msgstr "Direición física" + +#: ipconfig.rc:46 +msgid "DHCP enabled" +msgstr "" + +#: ipconfig.rc:49 +msgid "Default gateway" +msgstr "Pasera predeterminada" + +#: ipconfig.rc:50 +msgid "IPv6 address" +msgstr "Direición IPv6" + +#: msinfo32.rc:28 +msgid "System Information" +msgstr "" + +#: net.rc:30 +msgid "" +"The syntax of this command is:\n" +"\n" +"NET command [arguments]\n" +" -or-\n" +"NET command /HELP\n" +"\n" +"Where 'command' is one of HELP, START, STOP or USE.\n" +msgstr "" +"La sintaxis d'esti comandu ye:\n" +"\n" +"NET comandu [argumentos]\n" +" -o-\n" +"NET comandu /HELP\n" +"\n" +"Onde «comandu» ye HELP, START, STOP o USE.\n" + +#: net.rc:31 +msgid "" +"The syntax of this command is:\n" +"\n" +"NET START [service]\n" +"\n" +"Displays the list of running services if 'service' is omitted. Otherwise " +"'service' is the name of the service to start.\n" +msgstr "" +"La sintaxis d'esti comandu ye:\n" +"\n" +"NET START [serviciu]\n" +"\n" +"Amuesa la llista de servicios n'execución si s'omite «serviciu»." +" D'otramiente, " +"'serviciu' ye'l nome del serviciu a aniciar.\n" + +#: net.rc:32 +msgid "" +"The syntax of this command is:\n" +"\n" +"NET STOP service\n" +"\n" +"Where 'service' is the name of the service to stop.\n" +msgstr "" +"La sintaxis d'esti comandu ye:\n" +"\n" +"NET STOP serviciu\n" +"\n" +"Onde «serviciu» ye'l nome del serviciu a parar.\n" + +#: net.rc:33 +msgid "Stopping dependent service: %1\n" +msgstr "" + +#: net.rc:34 +msgid "Could not stop service %1\n" +msgstr "" + +#: net.rc:35 +msgid "Could not get handle to service control manager.\n" +msgstr "" + +#: net.rc:36 +msgid "Could not get handle to service.\n" +msgstr "" + +#: net.rc:37 +msgid "The %1 service is starting.\n" +msgstr "El serviciu %1 ta aniciando.\n" + +#: net.rc:38 +msgid "The %1 service was started successfully.\n" +msgstr "" + +#: net.rc:39 +msgid "The %1 service failed to start.\n" +msgstr "El seriviciu %1 falló al aniciar.\n" + +#: net.rc:40 +msgid "The %1 service is stopping.\n" +msgstr "El serviciu %1 ta parando.\n" + +#: net.rc:41 +msgid "The %1 service was stopped successfully.\n" +msgstr "" + +#: net.rc:42 +msgid "The %1 service failed to stop.\n" +msgstr "El seriviciu %1 falló al parar.\n" + +#: net.rc:44 +msgid "There are no entries in the list.\n" +msgstr "Nun hai entraes na llista.\n" + +#: net.rc:45 +msgid "" +"\n" +"Status Local Remote\n" +"---------------------------------------------------------------\n" +msgstr "" + +#: net.rc:46 +msgid "%1 %2 %3 Open resources: %4!u!\n" +msgstr "" + +#: net.rc:48 +msgid "Paused" +msgstr "" + +#: net.rc:49 +msgid "Disconnected" +msgstr "" + +#: net.rc:50 +msgid "A network error occurred" +msgstr "" + +#: net.rc:51 +msgid "Connection is being made" +msgstr "" + +#: net.rc:52 +msgid "Reconnecting" +msgstr "" + +#: net.rc:43 +msgid "The following services are running:\n" +msgstr "Los servicios de darréu tán n'execución:\n" + +#: netstat.rc:30 +msgid "Active Connections" +msgstr "Conexones actives" + +#: netstat.rc:31 +msgid "Proto" +msgstr "Protocolu" + +#: netstat.rc:32 +msgid "Local Address" +msgstr "Direición llocal" + +#: netstat.rc:33 +msgid "Foreign Address" +msgstr "Direición foriata" + +#: netstat.rc:34 +msgid "State" +msgstr "Estáu" + +#: netstat.rc:35 +msgid "Interface Statistics" +msgstr "" + +#: netstat.rc:36 +msgid "Sent" +msgstr "" + +#: netstat.rc:37 +msgid "Received" +msgstr "" + +#: netstat.rc:38 +msgid "Bytes" +msgstr "Bytes" + +#: netstat.rc:39 +msgid "Unicast packets" +msgstr "" + +#: netstat.rc:40 +msgid "Non-unicast packets" +msgstr "" + +#: netstat.rc:41 +msgid "Discards" +msgstr "" + +#: netstat.rc:42 +msgid "Errors" +msgstr "Fallos" + +#: netstat.rc:43 +msgid "Unknown protocols" +msgstr "" + +#: netstat.rc:44 +msgid "TCP Statistics for IPv4" +msgstr "" + +#: netstat.rc:45 +msgid "Active Opens" +msgstr "" + +#: netstat.rc:46 +msgid "Passive Opens" +msgstr "" + +#: netstat.rc:47 +msgid "Failed Connection Attempts" +msgstr "" + +#: netstat.rc:48 +msgid "Reset Connections" +msgstr "" + +#: netstat.rc:49 +msgid "Current Connections" +msgstr "Conexones actuales" + +#: netstat.rc:50 +msgid "Segments Received" +msgstr "" + +#: netstat.rc:51 +msgid "Segments Sent" +msgstr "" + +#: netstat.rc:52 +msgid "Segments Retransmitted" +msgstr "" + +#: netstat.rc:53 +msgid "UDP Statistics for IPv4" +msgstr "" + +#: netstat.rc:54 +msgid "Datagrams Received" +msgstr "" + +#: netstat.rc:55 +msgid "No Ports" +msgstr "" + +#: netstat.rc:56 +msgid "Receive Errors" +msgstr "" + +#: netstat.rc:57 +msgid "Datagrams Sent" +msgstr "" + +#: notepad.rc:30 +msgid "&New\tCtrl+N" +msgstr "" + +#: notepad.rc:31 wordpad.rc:32 +msgid "&Open...\tCtrl+O" +msgstr "&Abrir...\tCtrl+O" + +#: notepad.rc:32 wordpad.rc:33 +msgid "&Save\tCtrl+S" +msgstr "&Guardar\tCtrl+S" + +#: notepad.rc:35 regedit.rc:39 wordpad.rc:36 +msgid "&Print...\tCtrl+P" +msgstr "&Imprentar...\tCtrl+P" + +#: notepad.rc:36 wordpad.rc:38 +msgid "Page Se&tup..." +msgstr "" + +#: notepad.rc:37 +msgid "P&rinter Setup..." +msgstr "" + +#: notepad.rc:41 regedit.rc:43 wineconsole.rc:28 winhlp32.rc:39 wordpad.rc:42 +msgid "&Edit" +msgstr "&Editar" + +#: notepad.rc:42 wordpad.rc:44 +msgid "&Undo\tCtrl+Z" +msgstr "&Desfacer\tCtrl+Z" + +#: notepad.rc:44 wordpad.rc:47 +msgid "Cu&t\tCtrl+X" +msgstr "Co&rtar\tCtrl+X" + +#: notepad.rc:45 wordpad.rc:48 +msgid "&Copy\tCtrl+C" +msgstr "&Copiar\tCtrl+C" + +#: notepad.rc:46 wordpad.rc:49 +msgid "&Paste\tCtrl+V" +msgstr "&Apegar\tCtrl+V" + +#: notepad.rc:47 progman.rc:37 regedit.rc:56 regedit.rc:109 regedit.rc:136 +#: winefile.rc:32 +msgid "&Delete\tDel" +msgstr "&Desaniciar\tDel" + +#: notepad.rc:49 +msgid "Select &all\tCtrl+A" +msgstr "" + +#: notepad.rc:50 +msgid "&Time/Date\tF5" +msgstr "" + +#: notepad.rc:52 +msgid "&Wrap long lines" +msgstr "" + +#: notepad.rc:56 +msgid "&Search...\tCtrl+F" +msgstr "" + +#: notepad.rc:57 +msgid "&Search next\tF3" +msgstr "" + +#: notepad.rc:58 wordpad.rc:55 +msgid "&Replace...\tCtrl+H" +msgstr "&Tocar...\tCtrl+H" + +#: notepad.rc:61 progman.rc:56 regedit.rc:79 winefile.rc:83 +msgid "&Contents\tF1" +msgstr "&Conteníu\tF1" + +#: notepad.rc:62 +msgid "&About Notepad" +msgstr "&Tocante a Bloc de notes" + +#: notepad.rc:100 +msgid "Page Setup" +msgstr "" + +#: notepad.rc:102 +msgid "&Header:" +msgstr "&Testera:" + +#: notepad.rc:104 +msgid "&Footer:" +msgstr "&Pie:" + +#: notepad.rc:107 +msgid "Margins (millimeters)" +msgstr "" + +#: notepad.rc:108 +msgid "&Left:" +msgstr "" + +#: notepad.rc:110 +msgid "&Top:" +msgstr "" + +#: notepad.rc:126 +msgid "Encoding:" +msgstr "Codificación:" + +#: notepad.rc:132 wordpad.rc:289 +msgctxt "accelerator Select All" +msgid "A" +msgstr "" + +#: notepad.rc:133 wordpad.rc:291 +msgctxt "accelerator Copy" +msgid "C" +msgstr "C" + +#: notepad.rc:134 regedit.rc:372 wordpad.rc:287 +msgctxt "accelerator Find" +msgid "F" +msgstr "F" + +#: notepad.rc:135 wordpad.rc:288 +msgctxt "accelerator Replace" +msgid "H" +msgstr "" + +#: notepad.rc:136 wordpad.rc:297 +msgctxt "accelerator New" +msgid "N" +msgstr "N" + +#: notepad.rc:137 wordpad.rc:298 +msgctxt "accelerator Open" +msgid "O" +msgstr "" + +#: notepad.rc:138 regedit.rc:373 wordpad.rc:300 +msgctxt "accelerator Print" +msgid "P" +msgstr "" + +#: notepad.rc:139 wordpad.rc:299 +msgctxt "accelerator Save" +msgid "S" +msgstr "" + +#: notepad.rc:140 +msgctxt "accelerator Paste" +msgid "V" +msgstr "V" + +#: notepad.rc:141 wordpad.rc:290 +msgctxt "accelerator Cut" +msgid "X" +msgstr "X" + +#: notepad.rc:142 wordpad.rc:292 +msgctxt "accelerator Undo" +msgid "Z" +msgstr "" + +#: notepad.rc:69 +msgid "Page &p" +msgstr "" + +#: notepad.rc:71 +msgid "Notepad" +msgstr "Bloc de notes" + +#: notepad.rc:72 progman.rc:64 winhlp32.rc:82 +msgid "ERROR" +msgstr "FALLU" + +#: notepad.rc:74 +msgid "Untitled" +msgstr "" + +#: notepad.rc:77 winedbg.rc:42 +msgid "Text files (*.txt)" +msgstr "" + +#: notepad.rc:80 +msgid "" +"File '%s' does not exist.\n" +"\n" +"Do you want to create a new file?" +msgstr "" + +#: notepad.rc:82 +msgid "" +"File '%s' has been modified.\n" +"\n" +"Would you like to save the changes?" +msgstr "" +"Modificóse'l ficheru «%s».\n" +"\n" +"¿Prestaríate guardar los cambeos?" + +#: notepad.rc:83 +msgid "'%s' could not be found." +msgstr "" + +#: notepad.rc:85 +msgid "Unicode (UTF-16)" +msgstr "" + +#: notepad.rc:86 +msgid "Unicode (UTF-16 big-endian)" +msgstr "" + +#: notepad.rc:87 +msgid "Unicode (UTF-8)" +msgstr "" + +#: notepad.rc:94 +msgid "" +"%1\n" +"This file contains Unicode characters which will be lost if\n" +"you save this file in the %2 encoding.\n" +"To keep these characters, click Cancel, and then select\n" +"one of the Unicode options in the Encoding drop down list.\n" +"Continue?" +msgstr "" + +#: oleview.rc:32 +msgid "&Bind to file..." +msgstr "" + +#: oleview.rc:33 +msgid "&View TypeLib..." +msgstr "" + +#: oleview.rc:35 +msgid "&System Configuration" +msgstr "Configuración del &sistema" + +#: oleview.rc:36 +msgid "&Run the Registry Editor" +msgstr "" + +#: oleview.rc:42 +msgid "&CoCreateInstance Flag" +msgstr "" + +#: oleview.rc:44 +msgid "&In-process server" +msgstr "" + +#: oleview.rc:45 +msgid "In-process &handler" +msgstr "" + +#: oleview.rc:46 +msgid "&Local server" +msgstr "Sirvidor &llocal" + +#: oleview.rc:47 +msgid "&Remote server" +msgstr "Sirvidor &remotu" + +#: oleview.rc:50 +msgid "View &Type information" +msgstr "" + +#: oleview.rc:52 +msgid "Create &Instance" +msgstr "" + +#: oleview.rc:53 +msgid "Create Instance &On..." +msgstr "" + +#: oleview.rc:54 +msgid "&Release Instance" +msgstr "" + +#: oleview.rc:56 +msgid "Copy C&LSID to clipboard" +msgstr "" + +#: oleview.rc:57 +msgid "Copy &HTML object Tag to clipboard" +msgstr "" + +#: oleview.rc:63 +msgid "&Expert mode" +msgstr "Mou &espertu" + +#: oleview.rc:65 +msgid "&Hidden component categories" +msgstr "" + +#: oleview.rc:67 oleview.rc:89 winefile.rc:65 wordpad.rc:71 wordpad.rc:272 +msgid "&Toolbar" +msgstr "" + +#: oleview.rc:68 oleview.rc:90 winefile.rc:67 wordpad.rc:74 wordpad.rc:275 +msgid "&Status Bar" +msgstr "" + +#: oleview.rc:70 regedit.rc:70 winefile.rc:79 +msgid "&Refresh\tF5" +msgstr "" + +#: oleview.rc:74 +msgid "&About OleView" +msgstr "&Tocante a OleView" + +#: oleview.rc:82 +msgid "&Save as..." +msgstr "" + +#: oleview.rc:87 +msgid "&Group by type kind" +msgstr "" + +#: oleview.rc:156 +msgid "Connect to another machine" +msgstr "" + +#: oleview.rc:159 +msgid "&Machine name:" +msgstr "" + +#: oleview.rc:167 +msgid "System Configuration" +msgstr "Configuración del sistema" + +#: oleview.rc:170 +msgid "System Settings" +msgstr "Axustes del sistema" + +#: oleview.rc:171 +msgid "&Enable Distributed COM" +msgstr "" + +#: oleview.rc:172 +msgid "Enable &Remote Connections (Win95 only)" +msgstr "" + +#: oleview.rc:173 +msgid "" +"These settings change only registry values.\n" +"They have no effect on Wine performance." +msgstr "" + +#: oleview.rc:180 +msgid "Default Interface Viewer" +msgstr "" + +#: oleview.rc:183 +msgid "Interface" +msgstr "Interfaz" + +#: oleview.rc:185 +msgid "IID:" +msgstr "IID:" + +#: oleview.rc:188 +msgid "&View Type Info" +msgstr "" + +#: oleview.rc:193 +msgid "IPersist Interface Viewer" +msgstr "" + +#: oleview.rc:196 oleview.rc:208 +msgid "Class Name:" +msgstr "" + +#: oleview.rc:198 oleview.rc:210 +msgid "CLSID:" +msgstr "CLSID:" + +#: oleview.rc:205 +msgid "IPersistStream Interface Viewer" +msgstr "" + +#: oleview.rc:96 oleview.rc:97 +msgid "OleView" +msgstr "OleView" + +#: oleview.rc:100 +msgid "ITypeLib viewer" +msgstr "" + +#: oleview.rc:99 +msgid "OleView - OLE/COM Object Viewer" +msgstr "OleView - Visor d'oxetos OLE/COM" + +#: oleview.rc:102 +msgid "TypeLib files (*.tlb; *.olb; *.dll; *.ocx; *.exe)" +msgstr "" + +#: oleview.rc:105 +msgid "Bind to file via a File Moniker" +msgstr "" + +#: oleview.rc:106 +msgid "Open a TypeLib file and view the contents" +msgstr "" + +#: oleview.rc:107 +msgid "Change machine wide Distributed COM settings" +msgstr "" + +#: oleview.rc:108 +msgid "Run the Wine registry editor" +msgstr "" + +#: oleview.rc:109 +msgid "Quit the application. Prompts to save changes" +msgstr "" + +#: oleview.rc:110 +msgid "Create an instance of the selected object" +msgstr "" + +#: oleview.rc:111 +msgid "Create an instance of the selected object on a specific machine" +msgstr "" + +#: oleview.rc:112 +msgid "Release the currently selected object instance" +msgstr "" + +#: oleview.rc:113 +msgid "Copy the GUID of the currently selected item to the clipboard" +msgstr "" + +#: oleview.rc:114 +msgid "Display the viewer for the selected item" +msgstr "" + +#: oleview.rc:119 +msgid "Toggle between expert and novice display mode" +msgstr "" + +#: oleview.rc:120 +msgid "" +"Toggle the display of component categories that are not meant to be visible" +msgstr "" + +#: oleview.rc:121 +msgid "Show or hide the toolbar" +msgstr "" + +#: oleview.rc:122 +msgid "Show or hide the status bar" +msgstr "" + +#: oleview.rc:123 +msgid "Refresh all lists" +msgstr "" + +#: oleview.rc:124 +msgid "Display program information, version number and copyright" +msgstr "" + +#: oleview.rc:115 +msgid "Ask for an in-process server when calling CoGetClassObject" +msgstr "" + +#: oleview.rc:116 +msgid "Ask for an in-process handler when calling CoGetClassObject" +msgstr "" + +#: oleview.rc:117 +msgid "Ask for a local server when calling CoGetClassObject" +msgstr "" + +#: oleview.rc:118 +msgid "Ask for a remote server when calling CoGetClassObject" +msgstr "" + +#: oleview.rc:130 +msgid "ObjectClasses" +msgstr "ObjectClasses" + +#: oleview.rc:131 +msgid "Grouped by Component Category" +msgstr "" + +#: oleview.rc:132 +msgid "OLE 1.0 Objects" +msgstr "Oxetos OLE 1.0" + +#: oleview.rc:133 +msgid "COM Library Objects" +msgstr "" + +#: oleview.rc:134 +msgid "All Objects" +msgstr "Tolos oxetos" + +#: oleview.rc:135 +msgid "Application IDs" +msgstr "" + +#: oleview.rc:136 +msgid "Type Libraries" +msgstr "" + +#: oleview.rc:137 +msgid "ver." +msgstr "ver." + +#: oleview.rc:138 +msgid "Interfaces" +msgstr "Interfaces" + +#: oleview.rc:140 +msgid "Registry" +msgstr "" + +#: oleview.rc:141 +msgid "Implementation" +msgstr "Implementación" + +#: oleview.rc:142 +msgid "Activation" +msgstr "Activación" + +#: oleview.rc:144 +msgid "CoGetClassObject failed." +msgstr "CoGetClassObject falló." + +#: oleview.rc:145 +msgid "Unknown error" +msgstr "" + +#: oleview.rc:148 +msgid "bytes" +msgstr "bytes" + +#: oleview.rc:150 +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" +msgstr "" + +#: oleview.rc:151 +msgid "Inherited Interfaces" +msgstr "" + +#: oleview.rc:126 +msgid "Save as an .IDL or .H file" +msgstr "" + +#: oleview.rc:127 +msgid "Close window" +msgstr "" + +#: oleview.rc:128 +msgid "Group typeinfos by kind" +msgstr "" + +#: progman.rc:33 +msgid "&New..." +msgstr "" + +#: progman.rc:34 +msgid "O&pen\tEnter" +msgstr "A&brir\tIntro" + +#: progman.rc:35 winefile.rc:30 +msgid "&Move...\tF7" +msgstr "&Mover...\tF7" + +#: progman.rc:36 winefile.rc:31 +msgid "&Copy...\tF8" +msgstr "" + +#: progman.rc:38 +msgid "&Properties\tAlt+Enter" +msgstr "&Propiedaes\tAlt+Intro" + +#: progman.rc:40 +msgid "&Execute..." +msgstr "&Executar..." + +#: progman.rc:42 +msgid "E&xit Windows" +msgstr "" + +#: progman.rc:44 taskmgr.rc:41 winefile.rc:62 winhlp32.rc:47 +msgid "&Options" +msgstr "&Opciones" + +#: progman.rc:45 +msgid "&Arrange automatically" +msgstr "" + +#: progman.rc:46 +msgid "&Minimize on run" +msgstr "" + +#: progman.rc:47 winefile.rc:70 +msgid "&Save settings on exit" +msgstr "" + +#: progman.rc:49 taskmgr.rc:78 taskmgr.rc:255 +msgid "&Windows" +msgstr "" + +#: progman.rc:50 +msgid "&Overlapped\tShift+F5" +msgstr "" + +#: progman.rc:51 +msgid "&Side by side\tShift+F4" +msgstr "" + +#: progman.rc:52 +msgid "&Arrange Icons" +msgstr "" + +#: progman.rc:57 +msgid "&About Program Manager" +msgstr "&Tocante a Xestor de programes" + +#: progman.rc:103 +msgid "Program &group" +msgstr "" + +#: progman.rc:105 +msgid "&Program" +msgstr "&Programa" + +#: progman.rc:116 +msgid "Move Program" +msgstr "" + +#: progman.rc:118 +msgid "Move program:" +msgstr "" + +#: progman.rc:120 progman.rc:138 +msgid "From group:" +msgstr "" + +#: progman.rc:122 progman.rc:140 +msgid "&To group:" +msgstr "" + +#: progman.rc:134 +msgid "Copy Program" +msgstr "" + +#: progman.rc:136 +msgid "Copy program:" +msgstr "" + +#: progman.rc:152 +msgid "Program Group Attributes" +msgstr "" + +#: progman.rc:156 +msgid "&Group file:" +msgstr "" + +#: progman.rc:168 +msgid "Program Attributes" +msgstr "" + +#: progman.rc:172 progman.rc:212 +msgid "&Command line:" +msgstr "" + +#: progman.rc:174 +msgid "&Working directory:" +msgstr "" + +#: progman.rc:176 +msgid "&Key combination:" +msgstr "" + +#: progman.rc:179 progman.rc:215 +msgid "&Minimize at launch" +msgstr "" + +#: progman.rc:183 +msgid "Change &icon..." +msgstr "" + +#: progman.rc:192 +msgid "Change Icon" +msgstr "" + +#: progman.rc:194 +msgid "&Filename:" +msgstr "" + +#: progman.rc:196 +msgid "Current &icon:" +msgstr "&Iconu actual:" + +#: progman.rc:210 +msgid "Execute Program" +msgstr "" + +#: progman.rc:63 +msgid "Program Manager" +msgstr "Xestor de programes" + +#: progman.rc:65 winhlp32.rc:83 +msgid "WARNING" +msgstr "ALVERTENCIA" + +#: progman.rc:66 winhlp32.rc:84 +msgid "Information" +msgstr "Información" + +#: progman.rc:68 +msgid "Delete group `%s'?" +msgstr "" + +#: progman.rc:69 +msgid "Delete program `%s'?" +msgstr "" + +#: progman.rc:70 +msgid "Not implemented" +msgstr "Nun s'implementó" + +#: progman.rc:71 +msgid "Error reading `%s'." +msgstr "" + +#: progman.rc:72 +msgid "Error writing `%s'." +msgstr "" + +#: progman.rc:75 +msgid "" +"The group file `%s' cannot be opened.\n" +"Should it be tried further on?" +msgstr "" + +#: progman.rc:77 +msgid "Help not available." +msgstr "L'ayuda nun ta disponible." + +#: progman.rc:78 +msgid "Unknown feature in %s" +msgstr "" + +#: progman.rc:79 +msgid "File `%s' exists. Not overwritten." +msgstr "" + +#: progman.rc:80 +msgid "Save group as `%s to prevent overwriting original files." +msgstr "" + +#: progman.rc:84 +msgid "Libraries (*.dll)" +msgstr "Biblioteques (*.dll)" + +#: progman.rc:85 +msgid "Icon files" +msgstr "" + +#: progman.rc:86 +msgid "Icons (*.ico)" +msgstr "Iconos (*.ico)" + +#: reg.rc:35 +msgid "" +"Usage:\n" +" REG [operation] [parameters]\n" +"\n" +"Supported operations:\n" +" ADD | DELETE | IMPORT | EXPORT | QUERY\n" +"\n" +"For help on a specific operation, type:\n" +" REG [operation] /?\n" +"\n" +msgstr "" +"Usu:\n" +" REG [operación] [parámetros]\n" +"\n" +"Operaciones sofitaes:\n" +" ADD | DELETE | IMPORT | EXPORT | QUERY\n" +"\n" +"P'ayuda tocante a una operación específica, teclexa:\n" +" REG [operación] /?\n" +"\n" + +#: reg.rc:36 +msgid "" +"REG ADD key_name [/v value_name | /ve] [/t type] [/s separator] [/d data] [/" +"f]\n" +msgstr "" + +#: reg.rc:37 +msgid "REG DELETE key_name [/v value_name | /ve | /va] [/f]\n" +msgstr "" + +#: reg.rc:38 +msgid "REG QUERY key_name [/v value_name | /ve] [/s]\n" +msgstr "" + +#: reg.rc:39 +msgid "The operation completed successfully\n" +msgstr "La operación completóse con ésitu\n" + +#: reg.rc:40 +msgid "reg: Invalid key name\n" +msgstr "" + +#: reg.rc:41 +msgid "reg: Invalid command line parameters\n" +msgstr "" + +#: reg.rc:42 +msgid "reg: Unable to access remote machine\n" +msgstr "reg: Nun pue accedese a la máquina remota\n" + +#: reg.rc:43 +msgid "" +"reg: The system was unable to find the specified registry key or value\n" +msgstr "" + +#: reg.rc:44 +msgid "reg: Unsupported registry data type [%1]\n" +msgstr "" + +#: reg.rc:45 +msgid "reg: The option [/d] must be followed by a valid integer\n" +msgstr "reg: A la opción [/d] ha siguila un enteru válidu\n" + +#: reg.rc:46 +msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" +msgstr "reg: A la opción [/d] ha siguila un valor hexadecimal válidu\n" + +#: reg.rc:47 +msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" +msgstr "" + +#: reg.rc:48 +msgid "The registry value '%1' already exists. Do you want to overwrite it?" +msgstr "" + +#: reg.rc:52 +msgid "The registry operation was cancelled\n" +msgstr "" + +#: reg.rc:53 regedit.rc:239 +msgid "(Default)" +msgstr "" + +#: reg.rc:54 +msgid "Are you sure you want to delete the registry value '%1'?" +msgstr "" + +#: reg.rc:55 +msgid "Are you sure you want to delete all registry values in '%1'?" +msgstr "" + +#: reg.rc:56 +msgid "Are you sure you want to delete the registry key '%1'?" +msgstr "" + +#: reg.rc:57 +msgid "reg: The option [/d] must be followed by a valid string\n" +msgstr "reg: A la opción [/d] ha siguila una cadena válida\n" + +#: reg.rc:58 +msgid "" +"reg: Unable to delete all registry values in '%1'. An unexpected error " +"occurred.\n" +msgstr "" + +#: reg.rc:59 +msgid "" +"reg: Unable to complete the specified operation. An unexpected error " +"occurred.\n" +msgstr "" + +#: reg.rc:60 +msgid "Search complete. Number of matches found: %1!d!\n" +msgstr "" + +#: reg.rc:61 +msgid "reg: Invalid syntax. " +msgstr "" + +#: reg.rc:62 +msgid "reg: Invalid option [%1]. " +msgstr "" + +#: reg.rc:63 +msgid "Type \"REG /?\" for help.\n" +msgstr "" + +#: reg.rc:64 +msgid "Type \"REG %1 /?\" for help.\n" +msgstr "" + +#: reg.rc:65 regedit.rc:240 +msgid "(value not set)" +msgstr "(nun s'afitó'l valor)" + +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "REG IMPORT ficheru.reg\n" + +#: reg.rc:67 +msgid "reg: The file '%1' was not found.\n" +msgstr "reg: Nun s'alcontró'l ficheru «%1».\n" + +#: reg.rc:68 +msgid "reg: Unable to open the registry key '%1'.\n" +msgstr "" + +#: reg.rc:69 +msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" +msgstr "" + +#: reg.rc:70 +msgid "REG EXPORT key_name file.reg [/y]\n" +msgstr "" + +#: reg.rc:71 +msgid "reg: Invalid system key [%1]\n" +msgstr "" + +#: reg.rc:72 +msgid "The file '%1' already exists. Do you want to overwrite it?" +msgstr "El ficheru «%1» yá esiste. ¿Quies sobrescribilu?" + +#: regedit.rc:34 +msgid "&Registry" +msgstr "&Rexistru" + +#: regedit.rc:36 +msgid "&Import Registry File..." +msgstr "" + +#: regedit.rc:37 +msgid "&Export Registry File..." +msgstr "" + +#: regedit.rc:47 regedit.rc:99 regedit.rc:121 +msgid "&Key" +msgstr "" + +#: regedit.rc:49 regedit.rc:101 regedit.rc:123 +msgid "&String Value" +msgstr "" + +#: regedit.rc:50 regedit.rc:102 regedit.rc:124 +msgid "&Binary Value" +msgstr "Valor &binariu" + +#: regedit.rc:51 regedit.rc:103 regedit.rc:125 +msgid "&DWORD Value" +msgstr "" + +#: regedit.rc:52 regedit.rc:104 regedit.rc:126 +msgid "&Multi-String Value" +msgstr "" + +#: regedit.rc:53 regedit.rc:105 regedit.rc:127 +msgid "&Expandable String Value" +msgstr "" + +#: regedit.rc:57 regedit.rc:110 regedit.rc:137 +msgid "&Rename\tF2" +msgstr "" + +#: regedit.rc:59 regedit.rc:114 +msgid "&Copy Key Name" +msgstr "" + +#: regedit.rc:61 regedit.rc:107 wordpad.rc:53 +msgid "&Find...\tCtrl+F" +msgstr "" + +#: regedit.rc:62 +msgid "Find Ne&xt\tF3" +msgstr "" + +#: regedit.rc:66 +msgid "Status &Bar" +msgstr "" + +#: regedit.rc:68 winefile.rc:49 +msgid "Sp&lit" +msgstr "" + +#: regedit.rc:75 +msgid "&Remove Favorite..." +msgstr "" + +#: regedit.rc:80 +msgid "&About Registry Editor" +msgstr "&Tocante a Editor del rexistru" + +#: regedit.rc:89 regedit.rc:96 regedit.rc:230 +msgid "Expand" +msgstr "Espander" + +#: regedit.rc:134 regedit.rc:233 +msgid "Modify &Binary Data..." +msgstr "" + +#: regedit.rc:267 +msgid "Export registry" +msgstr "" + +#: regedit.rc:269 +msgid "S&elected branch:" +msgstr "" + +#: regedit.rc:278 +msgid "Find:" +msgstr "" + +#: regedit.rc:280 +msgid "Find in:" +msgstr "Alcontrar en:" + +#: regedit.rc:281 +msgid "Keys" +msgstr "Claves" + +#: regedit.rc:282 +msgid "Value names" +msgstr "" + +#: regedit.rc:283 +msgid "Value content" +msgstr "" + +#: regedit.rc:284 +msgid "Whole string only" +msgstr "Namái tola cadena" + +#: regedit.rc:291 +msgid "Add Favorite" +msgstr "" + +#: regedit.rc:294 regedit.rc:305 +msgid "Name:" +msgstr "Nome:" + +#: regedit.rc:302 +msgid "Remove Favorite" +msgstr "" + +#: regedit.rc:313 +msgid "Edit String" +msgstr "Edición d'una cadena" + +#: regedit.rc:316 regedit.rc:329 regedit.rc:345 regedit.rc:358 +msgid "Value name:" +msgstr "Nome del valor:" + +#: regedit.rc:318 regedit.rc:331 regedit.rc:347 regedit.rc:360 +msgid "Value data:" +msgstr "Datos del valor:" + +#: regedit.rc:326 +msgid "Edit DWORD" +msgstr "" + +#: regedit.rc:333 +msgid "Base" +msgstr "" + +#: regedit.rc:334 +msgid "Hexadecimal" +msgstr "Hexadecimal" + +#: regedit.rc:335 +msgid "Decimal" +msgstr "Decimal" + +#: regedit.rc:342 +msgid "Edit Binary" +msgstr "" + +#: regedit.rc:355 +msgid "Edit Multi-String" +msgstr "" + +#: regedit.rc:159 +msgid "Contains commands for working with the whole registry" +msgstr "Contién comandos pa trabayar con tol rexistru" + +#: regedit.rc:160 +msgid "Contains commands for editing values or keys" +msgstr "Contién comandos pa editar valores o claves" + +#: regedit.rc:161 +msgid "Contains commands for customizing the registry window" +msgstr "Contién comandos pa personalizar la ventana del rexistru" + +#: regedit.rc:162 +msgid "Contains commands for accessing frequently used keys" +msgstr "Contién comandos p'acceder a les claves usaes davezu" + +#: regedit.rc:163 +msgid "" +"Contains commands for displaying Help and information about Registry Editor" +msgstr "" +"Contién comandos p'amosar l'ayuda ya información tocante al editor del" +" rexistru" + +#: regedit.rc:164 +msgid "Contains commands for creating new keys or values" +msgstr "Contién comandos pa crear claves o valores nuevos" + +#: regedit.rc:149 +msgid "Data" +msgstr "Datos" + +#: regedit.rc:154 +msgid "Registry Editor" +msgstr "Editor del rexistru" + +#: regedit.rc:221 +msgid "Import Registry File" +msgstr "" + +#: regedit.rc:222 +msgid "Export Registry File" +msgstr "" + +#: regedit.rc:223 +msgid "Registry files (*.reg)" +msgstr "" + +#: regedit.rc:224 +msgid "Win9x/NT4 Registry files (REGEDIT4)" +msgstr "" + +#: regedit.rc:241 +msgid "(cannot display value)" +msgstr "" + +#: regedit.rc:242 +msgid "(unknown %d)" +msgstr "" + +#: regedit.rc:247 +msgid "Unable to modify the selected registry value." +msgstr "" + +#: regedit.rc:248 +msgid "Unable to create a new registry key." +msgstr "" + +#: regedit.rc:249 +msgid "Unable to create a new registry value." +msgstr "" + +#: regedit.rc:250 +msgid "" +"Unable to rename the key '%1'.\n" +"The specified key name already exists." +msgstr "" + +#: regedit.rc:251 +msgid "" +"Unable to rename the value '%1'.\n" +"The specified value name already exists." +msgstr "" + +#: regedit.rc:252 +msgid "Unable to delete the selected registry key." +msgstr "" + +#: regedit.rc:253 +msgid "Unable to rename the selected registry key." +msgstr "" + +#: regedit.rc:254 +msgid "Unable to rename the selected registry value." +msgstr "" + +#: regedit.rc:255 +msgid "" +"The keys and values contained in %1 were successfully added to the registry." +msgstr "" + +#: regedit.rc:256 +msgid "Unable to import %1. The specified file is not a valid registry file." +msgstr "" + +#: regedit.rc:408 +msgid "" +"Usage:\n" +" regedit [options] [filename] [reg_key]\n" +"\n" +"Options:\n" +" [no option] Launch the graphical version of this program.\n" +" /L:system.dat The location of the system.dat file to be modified.\n" +" Compatible with any other switch. Ignored.\n" +" /R:user.dat The location of the user.dat file to be modified.\n" +" Compatible with any other switch. Ignored.\n" +" /C Import the contents of a registry file.\n" +" /D Delete a specified registry key.\n" +" /E Export the contents of a specified registry key to a file.\n" +" If no key is specified, the entire registry is exported.\n" +" /S Silent mode. No messages will be displayed.\n" +" /V Launch the GUI in advanced mode. Ignored.\n" +" /? Display this information and exit.\n" +" [filename] The location of the file containing registry information " +"to\n" +" be imported. When used with [/E], this option specifies " +"the\n" +" file location where registry information will be exported.\n" +" [reg_key] The registry key to be modified.\n" +"\n" +"Usage examples:\n" +" regedit \"import.reg\"\n" +" regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" +msgstr "" + +#: regedit.rc:409 +msgid "regedit: Invalid or unrecognized switch [%1]\n" +msgstr "" + +#: regedit.rc:410 +msgid "Type \"regedit /?\" for help.\n" +msgstr "Teclexa «regedit /?» pa l'ayuda.\n" + +#: regedit.rc:411 +msgid "regedit: No filename was specified.\n" +msgstr "" + +#: regedit.rc:412 +msgid "regedit: No registry key was specified for removal.\n" +msgstr "" + +#: regedit.rc:413 +msgid "regedit: The file '%1' was not found.\n" +msgstr "regedit: Nun s'alcontró'l ficheru «%1».\n" + +#: regedit.rc:414 +msgid "regedit: Unable to open the file '%1'.\n" +msgstr "regedit: Nun pue abrise'l ficheru «%1».\n" + +#: regedit.rc:415 +msgid "regedit: Unhandled action.\n" +msgstr "" + +#: regedit.rc:416 +msgid "regedit: Out of memory! (%1!S!, line %2!u!)\n" +msgstr "regedit: ¡Ensin memoria! (%1!S!, linia %2!u!)\n" + +#: regedit.rc:417 +msgid "regedit: Invalid hexadecimal value.\n" +msgstr "" + +#: regedit.rc:418 +msgid "" +"regedit: Unable to convert hexadecimal data. An invalid value was " +"encountered at '%1'.\n" +msgstr "" + +#: regedit.rc:419 +msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" +msgstr "" + +#: regedit.rc:420 +msgid "regedit: Unsupported registry data type [0x%1!x!]\n" +msgstr "" + +#: regedit.rc:421 +msgid "regedit: Unexpected end of line in '%1'.\n" +msgstr "" + +#: regedit.rc:422 +msgid "regedit: The line '%1' was not recognized.\n" +msgstr "regedit: La llinia «%1» nun se reconoció.\n" + +#: regedit.rc:423 +msgid "regedit: Unable to add the registry value '%1' to '%2'.\n" +msgstr "" + +#: regedit.rc:424 +msgid "regedit: Unable to open the registry key '%1'.\n" +msgstr "" + +#: regedit.rc:425 +msgid "" +"regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" +msgstr "" + +#: regedit.rc:426 +msgid "regedit: The registry value '%1' will be exported as binary data.\n" +msgstr "" + +#: regedit.rc:427 +msgid "regedit: Invalid system key [%1]\n" +msgstr "" + +#: regedit.rc:428 +msgid "" +"regedit: Unable to export '%1'. The specified registry key was not found.\n" +msgstr "" + +#: regedit.rc:429 +msgid "regedit: Unable to delete the registry key '%1'.\n" +msgstr "" + +#: regedit.rc:431 +msgid "regedit: The line contains invalid syntax.\n" +msgstr "" + +#: regedit.rc:187 +msgid "Quits the Registry Editor" +msgstr "Cola del editor del rexistru" + +#: regedit.rc:188 +msgid "Adds keys to the favorites list" +msgstr "Amiesta claves a la llista de favoritos" + +#: regedit.rc:189 +msgid "Removes keys from the favorites list" +msgstr "" + +#: regedit.rc:190 +msgid "Shows or hides the status bar" +msgstr "" + +#: regedit.rc:191 +msgid "Changes the position of the split between two panes" +msgstr "" + +#: regedit.rc:192 +msgid "Refreshes the window" +msgstr "" + +#: regedit.rc:193 +msgid "Deletes the selection" +msgstr "Desanicia la esbilla" + +#: regedit.rc:194 +msgid "Renames the selection" +msgstr "" + +#: regedit.rc:195 +msgid "Copies the name of the selected key to the clipboard" +msgstr "" + +#: regedit.rc:196 +msgid "Finds a text string in a key, value or data" +msgstr "" + +#: regedit.rc:197 +msgid "Finds next occurrence of text specified in previous search" +msgstr "" + +#: regedit.rc:169 +msgid "Modifies the value's data" +msgstr "" + +#: regedit.rc:171 +msgid "Adds a new key" +msgstr "Amiesta una clave nueva" + +#: regedit.rc:172 +msgid "Adds a new string value" +msgstr "" + +#: regedit.rc:173 +msgid "Adds a new binary value" +msgstr "Amiesta un valor binariu nuevu" + +#: regedit.rc:174 +msgid "Adds a new 32-bit value" +msgstr "" + +#: regedit.rc:177 +msgid "Imports a text file into the registry" +msgstr "" + +#: regedit.rc:179 +msgid "Exports all or part of the registry to a text file" +msgstr "" + +#: regedit.rc:180 +msgid "Prints all or part of the registry" +msgstr "" + +#: regedit.rc:181 +msgid "Opens Registry Editor Help" +msgstr "Abre l'ayuda del editor del rexistru" + +#: regedit.rc:182 +msgid "Displays program information, version number and copyright" +msgstr "" + +#: regedit.rc:206 +msgid "Unable to query the registry value '%1'." +msgstr "" + +#: regedit.rc:207 +msgid "Unable to edit registry keys of this type (%1!u!)." +msgstr "" + +#: regedit.rc:208 +msgid "The value is too big (%1!u!)." +msgstr "El valor ye pergrande (%1!u!)." + +#: regedit.rc:209 +msgid "Confirm Value Delete" +msgstr "" + +#: regedit.rc:210 +msgid "Are you sure you want to delete the selected registry value?" +msgstr "" + +#: regedit.rc:216 +msgid "Search complete. The string '%1' was not found." +msgstr "" + +#: regedit.rc:211 +msgid "Are you sure you want to delete these values?" +msgstr "¿De xuru que quies desaniciar estos valores?" + +#: regedit.rc:214 +msgid "New Key #%d" +msgstr "Clave nueva #%d" + +#: regedit.rc:215 +msgid "New Value #%d" +msgstr "Valor nuevu #%d" + +#: regedit.rc:205 +msgid "Unable to query the registry key '%1'." +msgstr "" + +#: regedit.rc:170 +msgid "Modifies the value's data in binary form" +msgstr "" + +#: regedit.rc:175 +msgid "Adds a new multi-string value" +msgstr "" + +#: regedit.rc:198 +msgid "Exports the selected branch of the registry to a text file" +msgstr "" + +#: regedit.rc:176 +msgid "Adds a new expandable string value" +msgstr "" + +#: regedit.rc:212 +msgid "Confirm Key Delete" +msgstr "" + +#: regedit.rc:213 +msgid "" +"Are you sure you want to delete this registry key and all of its subkeys?" +msgstr "" + +#: regedit.rc:199 +msgid "Expands or collapses the selected node" +msgstr "Espande o recueye'l noyu esbilláu" + +#: regedit.rc:231 +msgid "Collapse" +msgstr "" + +#: regsvr32.rc:32 +msgid "" +"Wine DLL Registration Utility\n" +"\n" +"Provides DLL registration services.\n" +"\n" +msgstr "" + +#: regsvr32.rc:40 +msgid "" +"Usage:\n" +" regsvr32 [/u] [/s] [/n] [/i[:cmdline]] DllName\n" +"\n" +"Options:\n" +" [/u] Unregister a server.\n" +" [/s] Silent mode (no messages will be displayed).\n" +" [/i] Call DllInstall, passing an optional [cmdline].\n" +"\tWhen used with [/u] DllInstall is called in uninstall mode.\n" +" [/n] Do not call DllRegisterServer. This option must be used with [/i].\n" +"\n" +msgstr "" + +#: regsvr32.rc:41 +msgid "" +"regsvr32: Invalid or unrecognized switch [%1]\n" +"\n" +msgstr "" + +#: regsvr32.rc:42 +msgid "regsvr32: Failed to load DLL '%1'\n" +msgstr "regsvr32: Fallu al cargar la DLL «%1»\n" + +#: regsvr32.rc:43 +msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n" +msgstr "" + +#: regsvr32.rc:44 +msgid "regsvr32: Failed to register DLL '%1'\n" +msgstr "regsvr32: Fallu al rexistrar la DLL «%1»\n" + +#: regsvr32.rc:45 +msgid "regsvr32: Successfully registered DLL '%1'\n" +msgstr "" + +#: regsvr32.rc:46 +msgid "regsvr32: Failed to unregister DLL '%1'\n" +msgstr "" + +#: regsvr32.rc:47 +msgid "regsvr32: Successfully unregistered DLL '%1'\n" +msgstr "" + +#: regsvr32.rc:48 +msgid "regsvr32: Failed to install DLL '%1'\n" +msgstr "regsvr32: Fallu al instalar la DLL «%1»\n" + +#: regsvr32.rc:49 +msgid "regsvr32: Successfully installed DLL '%1'\n" +msgstr "" + +#: regsvr32.rc:50 +msgid "regsvr32: Failed to uninstall DLL '%1'\n" +msgstr "regsvr32: Fallu al desinstalar la DLL «%1»\n" + +#: regsvr32.rc:51 +msgid "regsvr32: Successfully uninstalled DLL '%1'\n" +msgstr "" + +#: start.rc:58 +msgid "" +"Application could not be started, or no application associated with the " +"specified file.\n" +"ShellExecuteEx failed" +msgstr "" +"L'aplicación nun pudo aniciase o nun hai denguna aplicación asociada " +"col ficheru especificáu.\n" +"ShellExecuteEx falló" + +#: start.rc:60 +msgid "Could not translate the specified Unix filename to a DOS filename." +msgstr "" + +#: taskkill.rc:30 +msgid "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n" +msgstr "Usu: taskkill [/?] [/f] [/im NomeProcesu | /pid IDProcesu]\n" + +#: taskkill.rc:31 +msgid "Error: Unknown or invalid command line option specified.\n" +msgstr "" +"Fallu: Especificáronse na llinia de comandos opciones non\n" +"válides o desconocíes\n" + +#: taskkill.rc:32 +msgid "Error: Invalid command line parameter specified.\n" +msgstr "" + +#: taskkill.rc:33 +msgid "Error: One of options /im or /pid must be specified.\n" +msgstr "" + +#: taskkill.rc:34 +msgid "Error: Option %1 expects a command line parameter.\n" +msgstr "" + +#: taskkill.rc:35 +msgid "Error: Options /im and /pid are mutually exclusive.\n" +msgstr "" + +#: taskkill.rc:36 +msgid "Close message sent to top-level windows of process with PID %1!u!.\n" +msgstr "" + +#: taskkill.rc:37 +msgid "" +"Close message sent to top-level windows of process \"%1\" with PID %2!u!.\n" +msgstr "" + +#: taskkill.rc:38 +msgid "Process with PID %1!u! was forcibly terminated.\n" +msgstr "" + +#: taskkill.rc:39 +msgid "Process \"%1\" with PID %2!u! was forcibly terminated.\n" +msgstr "" + +#: taskkill.rc:40 +msgid "Error: Could not find process \"%1\".\n" +msgstr "" + +#: taskkill.rc:41 +msgid "Error: Unable to enumerate the process list.\n" +msgstr "" + +#: taskkill.rc:42 +msgid "Error: Unable to terminate process \"%1\".\n" +msgstr "" + +#: taskkill.rc:43 +msgid "Error: Process self-termination is not permitted.\n" +msgstr "" + +#: taskmgr.rc:37 taskmgr.rc:108 +msgid "&New Task (Run...)" +msgstr "" + +#: taskmgr.rc:39 +msgid "E&xit Task Manager" +msgstr "" + +#: taskmgr.rc:45 +msgid "&Minimize On Use" +msgstr "" + +#: taskmgr.rc:47 +msgid "&Hide When Minimized" +msgstr "" + +#: taskmgr.rc:49 taskmgr.rc:257 +msgid "&Show 16-bit tasks" +msgstr "" + +#: taskmgr.rc:54 +msgid "&Refresh Now" +msgstr "&Refrescar agora" + +#: taskmgr.rc:55 +msgid "&Update Speed" +msgstr "" + +#: taskmgr.rc:57 taskmgr.rc:158 +msgid "&High" +msgstr "" + +#: taskmgr.rc:58 taskmgr.rc:162 +msgid "&Normal" +msgstr "&Normal" + +#: taskmgr.rc:60 taskmgr.rc:166 +msgid "&Low" +msgstr "" + +#: taskmgr.rc:61 +msgid "&Paused" +msgstr "" + +#: taskmgr.rc:68 taskmgr.rc:256 +msgid "&Select Columns..." +msgstr "" + +#: taskmgr.rc:69 taskmgr.rc:258 +msgid "&CPU History" +msgstr "Historial de la &CPU" + +#: taskmgr.rc:71 taskmgr.rc:259 +msgid "&One Graph, All CPUs" +msgstr "" + +#: taskmgr.rc:73 taskmgr.rc:260 +msgid "One Graph &Per CPU" +msgstr "" + +#: taskmgr.rc:76 taskmgr.rc:261 +msgid "&Show Kernel Times" +msgstr "" + +#: taskmgr.rc:80 taskmgr.rc:96 taskmgr.rc:123 winefile.rc:76 +msgid "Tile &Horizontally" +msgstr "" + +#: taskmgr.rc:81 taskmgr.rc:97 taskmgr.rc:124 +msgid "Tile &Vertically" +msgstr "" + +#: taskmgr.rc:82 taskmgr.rc:98 taskmgr.rc:125 +msgid "&Minimize" +msgstr "" + +#: taskmgr.rc:84 taskmgr.rc:100 taskmgr.rc:127 +msgid "&Cascade" +msgstr "&Cascada" + +#: taskmgr.rc:85 taskmgr.rc:101 taskmgr.rc:121 +msgid "&Bring To Front" +msgstr "" + +#: taskmgr.rc:90 +msgid "&About Task Manager" +msgstr "&Tocante a Xestor de xeres" + +#: taskmgr.rc:120 taskmgr.rc:352 +msgid "&Switch To" +msgstr "" + +#: taskmgr.rc:129 taskmgr.rc:353 +msgid "&End Task" +msgstr "" + +#: taskmgr.rc:130 +msgid "&Go To Process" +msgstr "&Dir al procesu" + +#: taskmgr.rc:149 taskmgr.rc:363 +msgid "&End Process" +msgstr "" + +#: taskmgr.rc:150 +msgid "End Process &Tree" +msgstr "" + +#: taskmgr.rc:152 winedbg.rc:32 +msgid "&Debug" +msgstr "" + +#: taskmgr.rc:154 +msgid "Set &Priority" +msgstr "" + +#: taskmgr.rc:156 +msgid "&Realtime" +msgstr "Tiempu &real" + +#: taskmgr.rc:160 +msgid "&Above Normal" +msgstr "" + +#: taskmgr.rc:164 +msgid "&Below Normal" +msgstr "" + +#: taskmgr.rc:169 +msgid "Set &Affinity..." +msgstr "" + +#: taskmgr.rc:170 +msgid "Edit Debug &Channels..." +msgstr "" + +#: taskmgr.rc:338 taskmgr.rc:180 taskmgr.rc:181 +msgid "Task Manager" +msgstr "" + +#: taskmgr.rc:351 +msgid "&New Task..." +msgstr "Xera &nueva..." + +#: taskmgr.rc:364 +msgid "&Show processes from all users" +msgstr "&Amosar los procesos de tolos usuarios" + +#: taskmgr.rc:372 +msgid "CPU usage" +msgstr "" + +#: taskmgr.rc:373 +msgid "Mem usage" +msgstr "" + +#: taskmgr.rc:374 +msgid "Totals" +msgstr "Totales" + +#: taskmgr.rc:375 +msgid "Commit charge (K)" +msgstr "" + +#: taskmgr.rc:376 +msgid "Physical memory (K)" +msgstr "" + +#: taskmgr.rc:377 +msgid "Kernel memory (K)" +msgstr "" + +#: taskmgr.rc:378 taskmgr.rc:290 +msgid "Handles" +msgstr "" + +#: taskmgr.rc:379 taskmgr.rc:291 +msgid "Threads" +msgstr "Filos" + +#: taskmgr.rc:380 taskmgr.rc:263 +msgid "Processes" +msgstr "Procesos" + +#: taskmgr.rc:387 taskmgr.rc:396 taskmgr.rc:405 +msgid "Total" +msgstr "Total" + +#: taskmgr.rc:388 +msgid "Limit" +msgstr "" + +#: taskmgr.rc:389 +msgid "Peak" +msgstr "" + +#: taskmgr.rc:398 +msgid "System Cache" +msgstr "Caché del sistema" + +#: taskmgr.rc:406 +msgid "Paged" +msgstr "" + +#: taskmgr.rc:407 +msgid "Nonpaged" +msgstr "" + +#: taskmgr.rc:414 +msgid "CPU usage history" +msgstr "" + +#: taskmgr.rc:415 +msgid "Memory usage history" +msgstr "" + +#: taskmgr.rc:428 taskmgr.rc:327 +msgid "Debug Channels" +msgstr "" + +#: taskmgr.rc:439 +msgid "Processor Affinity" +msgstr "" + +#: taskmgr.rc:444 +msgid "" +"The Processor Affinity setting controls which CPUs the process will be " +"allowed to execute on." +msgstr "" + +#: taskmgr.rc:446 +msgid "CPU 0" +msgstr "CPU 0" + +#: taskmgr.rc:448 +msgid "CPU 1" +msgstr "CPU 1" + +#: taskmgr.rc:450 +msgid "CPU 2" +msgstr "CPU 2" + +#: taskmgr.rc:452 +msgid "CPU 3" +msgstr "CPU 3" + +#: taskmgr.rc:454 +msgid "CPU 4" +msgstr "CPU 4" + +#: taskmgr.rc:456 +msgid "CPU 5" +msgstr "CPU 5" + +#: taskmgr.rc:458 +msgid "CPU 6" +msgstr "CPU 6" + +#: taskmgr.rc:460 +msgid "CPU 7" +msgstr "CPU 7" + +#: taskmgr.rc:462 +msgid "CPU 8" +msgstr "CPU 8" + +#: taskmgr.rc:464 +msgid "CPU 9" +msgstr "CPU 9" + +#: taskmgr.rc:466 +msgid "CPU 10" +msgstr "CPU 10" + +#: taskmgr.rc:468 +msgid "CPU 11" +msgstr "CPU 11" + +#: taskmgr.rc:470 +msgid "CPU 12" +msgstr "CPU 12" + +#: taskmgr.rc:472 +msgid "CPU 13" +msgstr "CPU 13" + +#: taskmgr.rc:474 +msgid "CPU 14" +msgstr "CPU 14" + +#: taskmgr.rc:476 +msgid "CPU 15" +msgstr "CPU 15" + +#: taskmgr.rc:478 +msgid "CPU 16" +msgstr "CPU 16" + +#: taskmgr.rc:480 +msgid "CPU 17" +msgstr "CPU 17" + +#: taskmgr.rc:482 +msgid "CPU 18" +msgstr "CPU 18" + +#: taskmgr.rc:484 +msgid "CPU 19" +msgstr "CPU 19" + +#: taskmgr.rc:486 +msgid "CPU 20" +msgstr "CPU 20" + +#: taskmgr.rc:488 +msgid "CPU 21" +msgstr "CPU 21" + +#: taskmgr.rc:490 +msgid "CPU 22" +msgstr "CPU 22" + +#: taskmgr.rc:492 +msgid "CPU 23" +msgstr "CPU 23" + +#: taskmgr.rc:494 +msgid "CPU 24" +msgstr "CPU 24" + +#: taskmgr.rc:496 +msgid "CPU 25" +msgstr "CPU 25" + +#: taskmgr.rc:498 +msgid "CPU 26" +msgstr "CPU 26" + +#: taskmgr.rc:500 +msgid "CPU 27" +msgstr "CPU 27" + +#: taskmgr.rc:502 +msgid "CPU 28" +msgstr "CPU 28" + +#: taskmgr.rc:504 +msgid "CPU 29" +msgstr "CPU 29" + +#: taskmgr.rc:506 +msgid "CPU 30" +msgstr "CPU 30" + +#: taskmgr.rc:508 +msgid "CPU 31" +msgstr "CPU 31" + +#: taskmgr.rc:514 +msgid "Select Columns" +msgstr "" + +#: taskmgr.rc:519 +msgid "" +"Select the columns that will appear on the Process page of the Task Manager." +msgstr "" + +#: taskmgr.rc:521 +msgid "&Image Name" +msgstr "" + +#: taskmgr.rc:523 +msgid "&PID (Process Identifier)" +msgstr "" + +#: taskmgr.rc:525 +msgid "&CPU Usage" +msgstr "Usu de la &CPU" + +#: taskmgr.rc:527 +msgid "CPU Tim&e" +msgstr "" + +#: taskmgr.rc:529 +msgid "&Memory Usage" +msgstr "" + +#: taskmgr.rc:531 +msgid "Memory Usage &Delta" +msgstr "" + +#: taskmgr.rc:533 +msgid "Pea&k Memory Usage" +msgstr "" + +#: taskmgr.rc:535 +msgid "Page &Faults" +msgstr "" + +#: taskmgr.rc:537 +msgid "&USER Objects" +msgstr "" + +#: taskmgr.rc:539 taskmgr.rc:281 +msgid "I/O Reads" +msgstr "" + +#: taskmgr.rc:541 taskmgr.rc:282 +msgid "I/O Read Bytes" +msgstr "" + +#: taskmgr.rc:543 +msgid "&Session ID" +msgstr "" + +#: taskmgr.rc:545 +msgid "User &Name" +msgstr "" + +#: taskmgr.rc:547 +msgid "Page F&aults Delta" +msgstr "" + +#: taskmgr.rc:549 +msgid "&Virtual Memory Size" +msgstr "" + +#: taskmgr.rc:551 +msgid "Pa&ged Pool" +msgstr "" + +#: taskmgr.rc:553 +msgid "N&on-paged Pool" +msgstr "" + +#: taskmgr.rc:555 +msgid "Base P&riority" +msgstr "P&rioridá base" + +#: taskmgr.rc:557 +msgid "&Handle Count" +msgstr "" + +#: taskmgr.rc:559 +msgid "&Thread Count" +msgstr "Númberu de &filos" + +#: taskmgr.rc:561 taskmgr.rc:292 +msgid "GDI Objects" +msgstr "Oxetos GDI" + +#: taskmgr.rc:563 taskmgr.rc:293 +msgid "I/O Writes" +msgstr "" + +#: taskmgr.rc:565 taskmgr.rc:294 +msgid "I/O Write Bytes" +msgstr "" + +#: taskmgr.rc:567 taskmgr.rc:295 +msgid "I/O Other" +msgstr "" + +#: taskmgr.rc:569 taskmgr.rc:296 +msgid "I/O Other Bytes" +msgstr "" + +#: taskmgr.rc:182 +msgid "Create New Task" +msgstr "" + +#: taskmgr.rc:187 +msgid "Runs a new program" +msgstr "Executa un programa nuevu" + +#: taskmgr.rc:188 +msgid "Task Manager remains in front of all other windows unless minimized" +msgstr "" + +#: taskmgr.rc:190 +msgid "Task Manager is minimized when a SwitchTo operation is performed" +msgstr "" + +#: taskmgr.rc:191 +msgid "Hide the Task Manager when it is minimized" +msgstr "" + +#: taskmgr.rc:192 +msgid "Force Task Manager to update now, regardless of Update Speed setting" +msgstr "" + +#: taskmgr.rc:193 +msgid "Displays tasks by using large icons" +msgstr "" + +#: taskmgr.rc:194 +msgid "Displays tasks by using small icons" +msgstr "" + +#: taskmgr.rc:195 +msgid "Displays information about each task" +msgstr "Amuesa la información de cada xera" + +#: taskmgr.rc:196 +msgid "Updates the display twice per second" +msgstr "" + +#: taskmgr.rc:197 +msgid "Updates the display every two seconds" +msgstr "" + +#: taskmgr.rc:198 +msgid "Updates the display every four seconds" +msgstr "" + +#: taskmgr.rc:203 +msgid "Does not automatically update" +msgstr "Nun anueva automáticamente" + +#: taskmgr.rc:205 +msgid "Tiles the windows horizontally on the desktop" +msgstr "" + +#: taskmgr.rc:206 +msgid "Tiles the windows vertically on the desktop" +msgstr "" + +#: taskmgr.rc:207 +msgid "Minimizes the windows" +msgstr "Minimiza la ventana" + +#: taskmgr.rc:208 +msgid "Maximizes the windows" +msgstr "Maximiza la ventana" + +#: taskmgr.rc:209 +msgid "Cascades the windows diagonally on the desktop" +msgstr "" + +#: taskmgr.rc:210 +msgid "Brings the window front, but does not switch to it" +msgstr "" + +#: taskmgr.rc:211 +msgid "Displays Task Manager help topics" +msgstr "" + +#: taskmgr.rc:212 +msgid "Displays program information, version number, and copyright" +msgstr "" + +#: taskmgr.rc:213 +msgid "Exits the Task Manager application" +msgstr "" + +#: taskmgr.rc:215 +msgid "Shows 16-bit tasks under the associated ntvdm.exe" +msgstr "" + +#: taskmgr.rc:216 +msgid "Select which columns will be visible on the Process page" +msgstr "" + +#: taskmgr.rc:217 +msgid "Displays kernel time in the performance graphs" +msgstr "" + +#: taskmgr.rc:219 +msgid "A single history graph shows total CPU usage" +msgstr "" + +#: taskmgr.rc:220 +msgid "Each CPU has its own history graph" +msgstr "" + +#: taskmgr.rc:222 +msgid "Brings a task to the foreground, switch focus to that task" +msgstr "" + +#: taskmgr.rc:227 +msgid "Tells the selected tasks to close" +msgstr "" + +#: taskmgr.rc:228 +msgid "Switches the focus to the process of the selected task" +msgstr "" + +#: taskmgr.rc:229 +msgid "Restores the Task Manager from its hidden state" +msgstr "" + +#: taskmgr.rc:230 +msgid "Removes the process from the system" +msgstr "" + +#: taskmgr.rc:232 +msgid "Removes this process and all descendants from the system" +msgstr "" + +#: taskmgr.rc:233 +msgid "Attaches the debugger to this process" +msgstr "" + +#: taskmgr.rc:235 +msgid "Controls which processors the process will be allowed to run on" +msgstr "" + +#: taskmgr.rc:237 +msgid "Sets process to the REALTIME priority class" +msgstr "" + +#: taskmgr.rc:238 +msgid "Sets process to the HIGH priority class" +msgstr "" + +#: taskmgr.rc:240 +msgid "Sets process to the ABOVE NORMAL priority class" +msgstr "" + +#: taskmgr.rc:242 +msgid "Sets process to the NORMAL priority class" +msgstr "" + +#: taskmgr.rc:244 +msgid "Sets process to the BELOW NORMAL priority class" +msgstr "" + +#: taskmgr.rc:245 +msgid "Sets process to the LOW priority class" +msgstr "" + +#: taskmgr.rc:247 +msgid "Controls Debug Channels" +msgstr "" + +#: taskmgr.rc:264 +msgid "Performance" +msgstr "Rindimientu" + +#: taskmgr.rc:265 +msgid "CPU Usage: %3d%%" +msgstr "" + +#: taskmgr.rc:266 +msgid "Processes: %d" +msgstr "Procesos: %d" + +#: taskmgr.rc:267 +msgid "Mem Usage: %1!u!kB / %2!u!kB" +msgstr "" + +#: taskmgr.rc:272 +msgid "Image Name" +msgstr "" + +#: taskmgr.rc:273 +msgid "PID" +msgstr "PID" + +#: taskmgr.rc:274 +msgid "CPU" +msgstr "CPU" + +#: taskmgr.rc:275 +msgid "CPU Time" +msgstr "" + +#: taskmgr.rc:276 +msgid "Mem Usage" +msgstr "" + +#: taskmgr.rc:277 +msgid "Mem Delta" +msgstr "" + +#: taskmgr.rc:278 +msgid "Peak Mem Usage" +msgstr "" + +#: taskmgr.rc:279 +msgid "Page Faults" +msgstr "" + +#: taskmgr.rc:280 +msgid "USER Objects" +msgstr "" + +#: taskmgr.rc:283 +msgid "Session ID" +msgstr "" + +#: taskmgr.rc:284 +msgid "Username" +msgstr "" + +#: taskmgr.rc:285 +msgid "PF Delta" +msgstr "" + +#: taskmgr.rc:286 +msgid "VM Size" +msgstr "" + +#: taskmgr.rc:287 +msgid "Paged Pool" +msgstr "" + +#: taskmgr.rc:288 +msgid "NP Pool" +msgstr "" + +#: taskmgr.rc:289 +msgid "Base Pri" +msgstr "" + +#: taskmgr.rc:301 +msgid "Task Manager Warning" +msgstr "" + +#: taskmgr.rc:304 +msgid "" +"WARNING: Changing the priority class of this process may\n" +"cause undesired results including system instability. Are you\n" +"sure you want to change the priority class?" +msgstr "" + +#: taskmgr.rc:305 +msgid "Unable to Change Priority" +msgstr "" + +#: taskmgr.rc:310 +msgid "" +"WARNING: Terminating a process can cause undesired\n" +"results including loss of data and system instability. The\n" +"process will not be given the chance to save its state or\n" +"data before it is terminated. Are you sure you want to\n" +"terminate the process?" +msgstr "" + +#: taskmgr.rc:311 +msgid "Unable to Terminate Process" +msgstr "" + +#: taskmgr.rc:313 +msgid "" +"WARNING: Debugging this process may result in loss of data.\n" +"Are you sure you wish to attach the debugger?" +msgstr "" + +#: taskmgr.rc:314 +msgid "Unable to Debug Process" +msgstr "Nun pue depurase'l procesu" + +#: taskmgr.rc:315 +msgid "The process must have affinity with at least one processor" +msgstr "" + +#: taskmgr.rc:316 +msgid "Invalid Option" +msgstr "La opción nun ye válida" + +#: taskmgr.rc:317 +msgid "Unable to Access or Set Process Affinity" +msgstr "" + +#: taskmgr.rc:322 +msgid "System Idle Process" +msgstr "" + +#: taskmgr.rc:323 +msgid "Not Responding" +msgstr "" + +#: taskmgr.rc:324 +msgid "Running" +msgstr "" + +#: taskmgr.rc:325 +msgid "Task" +msgstr "Xera" + +#: uninstaller.rc:29 +msgid "Wine Application Uninstaller" +msgstr "Desinstalador d'aplicaciones de Wine" + +#: uninstaller.rc:30 +msgid "" +"Execution of uninstall command '%s' failed, perhaps due to missing " +"executable.\n" +"Do you want to remove the uninstall entry from the registry?" +msgstr "" + +#: uninstaller.rc:31 +msgid "uninstaller: The application with GUID '%1' was not found\n" +msgstr "" + +#: uninstaller.rc:32 +msgid "" +"uninstaller: The option '--remove' must be followed by an application GUID\n" +msgstr "" + +#: uninstaller.rc:33 +msgid "uninstaller: Invalid option [%1]\n" +msgstr "" + +#: uninstaller.rc:35 +msgid "" +"Wine Application Uninstaller\n" +"\n" +"Uninstall applications from the current Wine prefix.\n" +"\n" +msgstr "" + +#: uninstaller.rc:43 +msgid "" +"Usage:\n" +" uninstaller [options]\n" +"\n" +"Options:\n" +" --help\t Display this information.\n" +" --list\t List all applications installed in this Wine prefix.\n" +" --remove {GUID} Uninstall the specified application.\n" +"\t\t Use '--list' to determine the application GUID.\n" +" [no option] Launch the graphical version of this program.\n" +"\n" +msgstr "" +"Usu:\n" +" uninstaller [opciones]\n" +"\n" +"Opciones:\n" +" --help\t Amuesa esta información.\n" +" --list\t Llista toles aplicaciones instalaes nesti prefixu de Wine.\n" +" --remove {GUID} Desinstala l'aplicación especificada.\n" +"\t\t Usa «--list» pa determinar el GUID d'una aplicación.\n" +" [ensin opciones] Llanza la versión gráfica d'esti programa.\n" +"\n" + +#: view.rc:36 +msgid "&Pan" +msgstr "" + +#: view.rc:38 +msgid "&Scale to Window" +msgstr "" + +#: view.rc:40 +msgid "&Left" +msgstr "&Esquierda" + +#: view.rc:41 +msgid "&Right" +msgstr "&Drecha" + +#: view.rc:49 +msgid "Regular Metafile Viewer" +msgstr "" + +#: view.rc:50 +msgid "Metafiles (*.wmf, *.emf)" +msgstr "Metaficheros (*.wmf, *.emf)" + +#: wineboot.rc:31 +msgid "Waiting for Program" +msgstr "" + +#: wineboot.rc:35 +msgid "Terminate Process" +msgstr "" + +#: wineboot.rc:36 +msgid "" +"A simulated log-off or shutdown is in progress, but this program isn't " +"responding.\n" +"\n" +"If you terminate the process you may lose all unsaved data." +msgstr "" + +#: wineboot.rc:46 +msgid "The Wine configuration in %s is being updated, please wait..." +msgstr "Ta anovándose la configuración de %s, espera..." + +#: winecfg.rc:141 +msgid "" +"This program 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." +msgstr "" + +#: winecfg.rc:143 +msgid "Windows registration information" +msgstr "" + +#: winecfg.rc:144 +msgid "&Owner:" +msgstr "" + +#: winecfg.rc:146 +msgid "Organi&zation:" +msgstr "Organi&zación:" + +#: winecfg.rc:154 +msgid "Application settings" +msgstr "Axustes d'aplicaciones" + +#: winecfg.rc:155 +msgid "" +"Wine can mimic different Windows versions for each application. This tab is " +"linked to the Libraries and Graphics tabs to allow you to change system-wide " +"or per-application settings in those tabs as well." +msgstr "" + +#: winecfg.rc:159 +msgid "Add appli&cation..." +msgstr "Amestar una apli&cación..." + +#: winecfg.rc:160 +msgid "&Remove application" +msgstr "&Desaniciar l'aplicación" + +#: winecfg.rc:161 +msgid "&Windows Version:" +msgstr "Versión de &Windows:" + +#: winecfg.rc:169 +msgid "Window settings" +msgstr "Axustes de ventanes" + +#: winecfg.rc:170 +msgid "Automatically capture the &mouse in full-screen windows" +msgstr "Capturar el &mur automáticamente nes ventanes a pantalla completa" + +#: winecfg.rc:171 +msgid "Allow the window manager to &decorate the windows" +msgstr "Permitir que'l xestor de ventanes &decore les ventanes" + +#: winecfg.rc:172 +msgid "Allow the &window manager to control the windows" +msgstr "Permitir que'l xestor de &ventanes controle les ventanes" + +#: winecfg.rc:173 +msgid "&Emulate a virtual desktop" +msgstr "&Emular un escritoriu virtual" + +#: winecfg.rc:175 +msgid "Desktop &size:" +msgstr "&Tamañu del escritoriu:" + +#: winecfg.rc:180 +msgid "Screen resolution" +msgstr "Resolución de la pantalla" + +#: winecfg.rc:184 +msgid "This is a sample text using 10 point Tahoma" +msgstr "" + +#: winecfg.rc:191 +msgid "DLL overrides" +msgstr "" + +#: winecfg.rc:192 +msgid "" +"Dynamic Link Libraries can be specified individually to be either builtin " +"(provided by Wine) or native (taken from Windows or provided by the " +"application)." +msgstr "" + +#: winecfg.rc:194 +msgid "&New override for library:" +msgstr "" + +#: winecfg.rc:196 +msgid "A&dd" +msgstr "A&mestar" + +#: winecfg.rc:197 +msgid "Existing &overrides:" +msgstr "" + +#: winecfg.rc:199 +msgid "&Edit..." +msgstr "&Editar..." + +#: winecfg.rc:205 +msgid "Edit Override" +msgstr "" + +#: winecfg.rc:208 +msgid "Load order" +msgstr "" + +#: winecfg.rc:209 +msgid "&Builtin (Wine)" +msgstr "" + +#: winecfg.rc:210 +msgid "&Native (Windows)" +msgstr "" + +#: winecfg.rc:211 +msgid "Buil&tin then Native" +msgstr "" + +#: winecfg.rc:212 +msgid "Nati&ve then Builtin" +msgstr "" + +#: winecfg.rc:220 +msgid "Select Drive Letter" +msgstr "" + +#: winecfg.rc:232 +msgid "Drive configuration" +msgstr "Configuración d'unidaes" + +#: winecfg.rc:233 +msgid "" +"Failed to connect to the mount manager, the drive configuration cannot be " +"edited." +msgstr "" + +#: winecfg.rc:236 +msgid "A&dd..." +msgstr "" + +#: winecfg.rc:238 +msgid "Aut&odetect" +msgstr "" + +#: winecfg.rc:241 +msgid "&Path:" +msgstr "" + +#: winecfg.rc:248 winecfg.rc:38 +msgid "Show Advan&ced" +msgstr "" + +#: winecfg.rc:249 +msgid "De&vice:" +msgstr "" + +#: winecfg.rc:251 +msgid "Bro&wse..." +msgstr "" + +#: winecfg.rc:253 +msgid "&Label:" +msgstr "" + +#: winecfg.rc:255 +msgid "S&erial:" +msgstr "" + +#: winecfg.rc:258 +msgid "&Show dot files" +msgstr "" + +#: winecfg.rc:265 +msgid "Driver diagnostics" +msgstr "" + +#: winecfg.rc:267 +msgid "Defaults" +msgstr "" + +#: winecfg.rc:268 +msgid "Output device:" +msgstr "Preséu de salida:" + +#: winecfg.rc:269 +msgid "Voice output device:" +msgstr "" + +#: winecfg.rc:270 +msgid "Input device:" +msgstr "Preséu d'entrada:" + +#: winecfg.rc:271 +msgid "Voice input device:" +msgstr "" + +#: winecfg.rc:276 +msgid "&Test Sound" +msgstr "" + +#: winecfg.rc:277 winecfg.rc:90 +msgid "Speaker configuration" +msgstr "" + +#: winecfg.rc:280 +msgid "Speakers:" +msgstr "" + +#: winecfg.rc:288 +msgid "Appearance" +msgstr "Aspeutu" + +#: winecfg.rc:289 +msgid "&Theme:" +msgstr "&Estilu:" + +#: winecfg.rc:291 +msgid "&Install theme..." +msgstr "" + +#: winecfg.rc:296 +msgid "It&em:" +msgstr "&Elementu:" + +#: winecfg.rc:298 +msgid "C&olor:" +msgstr "C&olor:" + +#: winecfg.rc:304 +msgid "MIME types" +msgstr "Tribes MIME" + +#: winecfg.rc:305 +msgid "Manage file &associations" +msgstr "" + +#: winecfg.rc:308 +msgid "Folders" +msgstr "Carpetes" + +#: winecfg.rc:311 +msgid "&Link to:" +msgstr "" + +#: winecfg.rc:34 +msgid "Libraries" +msgstr "Biblioteques" + +#: winecfg.rc:35 +msgid "Drives" +msgstr "Unidaes" + +#: winecfg.rc:36 +msgid "Select the Unix target directory, please." +msgstr "" + +#: winecfg.rc:37 +msgid "Hide Advan&ced" +msgstr "" + +#: winecfg.rc:39 +msgid "(No Theme)" +msgstr "" + +#: winecfg.rc:40 +msgid "Graphics" +msgstr "" + +#: winecfg.rc:41 +msgid "Desktop Integration" +msgstr "" + +#: winecfg.rc:42 +msgid "Audio" +msgstr "Audiu" + +#: winecfg.rc:43 +msgid "About" +msgstr "" + +#: winecfg.rc:44 +msgid "Wine configuration" +msgstr "Configuración de Wine" + +#: winecfg.rc:46 +msgid "Theme files (*.msstyles; *.theme)" +msgstr "" + +#: winecfg.rc:47 +msgid "Select a theme file" +msgstr "Esbilla d'un ficheru d'estilos" + +#: winecfg.rc:48 +msgid "Folder" +msgstr "" + +#: winecfg.rc:49 +msgid "Links to" +msgstr "" + +#: winecfg.rc:45 +msgid "Wine configuration for %s" +msgstr "" + +#: winecfg.rc:84 +msgid "Selected driver: %s" +msgstr "" + +#: winecfg.rc:85 +msgid "(None)" +msgstr "" + +#: winecfg.rc:86 +msgid "Audio test failed!" +msgstr "" + +#: winecfg.rc:88 +msgid "(System default)" +msgstr "" + +#: winecfg.rc:91 +msgid "5.1 Surround" +msgstr "" + +#: winecfg.rc:92 +msgid "Quadraphonic" +msgstr "" + +#: winecfg.rc:93 +msgid "Stereo" +msgstr "Estéreu" + +#: winecfg.rc:94 +msgid "Mono" +msgstr "" + +#: winecfg.rc:54 +msgid "" +"Changing the load order of this library is not recommended.\n" +"Are you sure you want to do this?" +msgstr "" +"Nun s'aconseya'l cambéu del orde de carga d'esta biblioteca.\n" +"¿De xuru que quies facelo?" + +#: winecfg.rc:55 +msgid "Warning: system library" +msgstr "" + +#: winecfg.rc:56 +msgid "native" +msgstr "" + +#: winecfg.rc:57 +msgid "builtin" +msgstr "" + +#: winecfg.rc:58 +msgid "native, builtin" +msgstr "" + +#: winecfg.rc:59 +msgid "builtin, native" +msgstr "" + +#: winecfg.rc:60 +msgid "disabled" +msgstr "" + +#: winecfg.rc:61 +msgid "Default Settings" +msgstr "" + +#: winecfg.rc:62 +msgid "Wine Programs (*.exe; *.exe.so)" +msgstr "Programes de Wine (*.exe; *.exe.so)" + +#: winecfg.rc:63 +msgid "Use global settings" +msgstr "" + +#: winecfg.rc:64 +msgid "Select an executable file" +msgstr "" + +#: winecfg.rc:69 +msgid "Autodetect" +msgstr "" + +#: winecfg.rc:70 +msgid "Local hard disk" +msgstr "Discu duru llocal" + +#: winecfg.rc:71 +msgid "Network share" +msgstr "" + +#: winecfg.rc:72 +msgid "Floppy disk" +msgstr "Disquete" + +#: winecfg.rc:73 +msgid "CD-ROM" +msgstr "CD-ROM" + +#: winecfg.rc:74 +msgid "" +"You cannot add any more drives.\n" +"\n" +"Each drive must have a letter, from A to Z, so you cannot have more than 26." +msgstr "" + +#: winecfg.rc:75 +msgid "System drive" +msgstr "" + +#: winecfg.rc:76 +msgid "" +"Are you sure you want to delete drive C?\n" +"\n" +"Most Windows applications expect drive C to exist, and will die messily if " +"it doesn't. If you proceed remember to recreate it!" +msgstr "" + +#: winecfg.rc:77 +msgctxt "Drive letter" +msgid "Letter" +msgstr "Lletra" + +#: winecfg.rc:78 +msgid "Target folder" +msgstr "" + +#: winecfg.rc:79 +msgid "" +"You don't have a drive C. This is not so great.\n" +"\n" +"Remember to click 'Add' in the Drives tab to create one!\n" +msgstr "" + +#: winecfg.rc:99 +msgid "Controls Background" +msgstr "" + +#: winecfg.rc:100 +msgid "Controls Text" +msgstr "" + +#: winecfg.rc:102 +msgid "Menu Background" +msgstr "" + +#: winecfg.rc:103 +msgid "Menu Text" +msgstr "" + +#: winecfg.rc:104 +msgid "Scrollbar" +msgstr "Barra de desplazamientu" + +#: winecfg.rc:105 +msgid "Selection Background" +msgstr "" + +#: winecfg.rc:106 +msgid "Selection Text" +msgstr "" + +#: winecfg.rc:107 +msgid "Tooltip Background" +msgstr "" + +#: winecfg.rc:108 +msgid "Tooltip Text" +msgstr "" + +#: winecfg.rc:109 +msgid "Window Background" +msgstr "" + +#: winecfg.rc:110 +msgid "Window Text" +msgstr "" + +#: winecfg.rc:111 +msgid "Active Title Bar" +msgstr "" + +#: winecfg.rc:112 +msgid "Active Title Text" +msgstr "" + +#: winecfg.rc:113 +msgid "Inactive Title Bar" +msgstr "" + +#: winecfg.rc:114 +msgid "Inactive Title Text" +msgstr "" + +#: winecfg.rc:115 +msgid "Message Box Text" +msgstr "" + +#: winecfg.rc:116 +msgid "Application Workspace" +msgstr "" + +#: winecfg.rc:117 +msgid "Window Frame" +msgstr "" + +#: winecfg.rc:118 +msgid "Active Border" +msgstr "Berbesu activu" + +#: winecfg.rc:119 +msgid "Inactive Border" +msgstr "" + +#: winecfg.rc:120 +msgid "Controls Shadow" +msgstr "" + +#: winecfg.rc:121 +msgid "Gray Text" +msgstr "" + +#: winecfg.rc:122 +msgid "Controls Highlight" +msgstr "" + +#: winecfg.rc:123 +msgid "Controls Dark Shadow" +msgstr "" + +#: winecfg.rc:124 +msgid "Controls Light" +msgstr "" + +#: winecfg.rc:125 +msgid "Controls Alternate Background" +msgstr "" + +#: winecfg.rc:126 +msgid "Hot Tracked Item" +msgstr "" + +#: winecfg.rc:127 +msgid "Active Title Bar Gradient" +msgstr "" + +#: winecfg.rc:128 +msgid "Inactive Title Bar Gradient" +msgstr "" + +#: winecfg.rc:129 +msgid "Menu Highlight" +msgstr "" + +#: winecfg.rc:130 +msgid "Menu Bar" +msgstr "" + +#: wineconsole.rc:63 +msgid "Cursor size" +msgstr "Tamañu del cursor" + +#: wineconsole.rc:64 +msgid "&Small" +msgstr "&Pequeñu" + +#: wineconsole.rc:65 +msgid "&Medium" +msgstr "&Mediu" + +#: wineconsole.rc:66 +msgid "&Large" +msgstr "&Grande" + +#: wineconsole.rc:68 +msgid "Command history" +msgstr "Historial de comandos" + +#: wineconsole.rc:69 +msgid "&Buffer size:" +msgstr "Tamañu del &búfer:" + +#: wineconsole.rc:72 +msgid "&Remove duplicates" +msgstr "&Desaniciar duplicaos" + +#: wineconsole.rc:74 +msgid "Popup menu" +msgstr "Menú emerxente" + +#: wineconsole.rc:75 +msgid "&Control" +msgstr "&Control" + +#: wineconsole.rc:76 +msgid "S&hift" +msgstr "&Mayús" + +#: wineconsole.rc:78 +msgid "Console" +msgstr "Consola" + +#: wineconsole.rc:79 +msgid "&Quick Edit mode" +msgstr "Mou d'edición &rápida" + +#: wineconsole.rc:80 +msgid "&Insert mode" +msgstr "Mou d'&inxertu" + +#: wineconsole.rc:88 +msgid "&Font" +msgstr "" + +#: wineconsole.rc:90 +msgid "&Color" +msgstr "&Color" + +#: wineconsole.rc:101 +msgid "Configuration" +msgstr "Configuración" + +#: wineconsole.rc:104 +msgid "Buffer zone" +msgstr "Zona del búfer" + +#: wineconsole.rc:105 +msgid "&Width:" +msgstr "&Anchor:" + +#: wineconsole.rc:108 +msgid "&Height:" +msgstr "&Altor:" + +#: wineconsole.rc:112 +msgid "Window size" +msgstr "Tamañu de la ventana" + +#: wineconsole.rc:113 +msgid "W&idth:" +msgstr "A&nchor:" + +#: wineconsole.rc:116 +msgid "H&eight:" +msgstr "A&ltor:" + +#: wineconsole.rc:120 +msgid "End of program" +msgstr "Fin del programa" + +#: wineconsole.rc:121 +msgid "&Close console" +msgstr "&Zarrar la consola" + +#: wineconsole.rc:123 +msgid "Edition" +msgstr "Edición" + +#: wineconsole.rc:129 +msgid "Console parameters" +msgstr "" + +#: wineconsole.rc:132 +msgid "Retain these settings for later sessions" +msgstr "" + +#: wineconsole.rc:133 +msgid "Modify only current session" +msgstr "" + +#: wineconsole.rc:29 +msgid "Set &Defaults" +msgstr "" + +#: wineconsole.rc:31 +msgid "&Mark" +msgstr "" + +#: wineconsole.rc:34 +msgid "&Select all" +msgstr "&Esbillar too" + +#: wineconsole.rc:35 +msgid "Sc&roll" +msgstr "" + +#: wineconsole.rc:36 +msgid "S&earch" +msgstr "" + +#: wineconsole.rc:39 +msgid "Setup - Default settings" +msgstr "Configuración - Axustes predeterminaos" + +#: wineconsole.rc:40 +msgid "Setup - Current settings" +msgstr "Configuración - Axustes actuales" + +#: wineconsole.rc:41 +msgid "Configuration error" +msgstr "" + +#: wineconsole.rc:42 +msgid "" +"The size of the screen buffer must be greater than or equal to the size of " +"the window." +msgstr "" + +#: wineconsole.rc:37 +msgid "Each character is %1!u! pixels wide and %2!u! pixels high" +msgstr "Cada caráuter ye de %1!u! píxeles d'anchor y %2!u! d'altor" + +#: wineconsole.rc:38 +msgid "This is a test" +msgstr "Esto ye una prueba" + +#: wineconsole.rc:44 +msgid "wineconsole: Couldn't parse event id\n" +msgstr "" + +#: wineconsole.rc:45 +msgid "wineconsole: Invalid backend\n" +msgstr "wineconsole: El backend nun ye válidu\n" + +#: wineconsole.rc:46 +msgid "wineconsole: Unrecognized command line option\n" +msgstr "" + +#: wineconsole.rc:47 +msgid "Starts a program in a Wine console\n" +msgstr "" + +#: wineconsole.rc:48 +msgid "" +"wineconsole: Starting program %s failed.\n" +"The command is invalid.\n" +msgstr "" + +#: wineconsole.rc:50 +msgid "" +"\n" +"Usage:\n" +" wineconsole [options] <command>\n" +"\n" +"Options:\n" +msgstr "" +"\n" +"Usu:\n" +" wineconsole [opciones] <comandu>\n" +"\n" +"Opciones:\n" + +#: wineconsole.rc:52 +msgid "" +" --backend={user|curses} Choosing user will spawn a new window, curses " +"will\n" +" try to setup the current terminal as a Wine " +"console.\n" +msgstr "" + +#: wineconsole.rc:53 +msgid " <command> The Wine program to launch in the console.\n" +msgstr " <command> El programa de Wine a llanzar na consola.\n" + +#: wineconsole.rc:54 +msgid "" +"\n" +"Example:\n" +" wineconsole cmd\n" +"Starts the Wine command prompt in a Wine console.\n" +"\n" +msgstr "" +"\n" +"Exemplu:\n" +" wineconsole cmd\n" +"Anicia la llinia de comandos de Wine nuna consola de Wine.\n" +"\n" + +#: winedbg.rc:50 winedbg.rc:38 +msgid "Program Error" +msgstr "" + +#: winedbg.rc:55 +msgid "" +"The program %s has encountered a serious problem and needs to close. We are " +"sorry for the inconvenience." +msgstr "" + +#: winedbg.rc:59 +msgid "" +"This can be caused by a problem in the program or a deficiency in Wine. You " +"may want to check the <a href=\"https://appdb.winehq.org\">Application " +"Database</a> for tips about running this application." +msgstr "" + +#: winedbg.rc:62 +msgid "Show &Details" +msgstr "" + +#: winedbg.rc:67 +msgid "Program Error Details" +msgstr "" + +#: winedbg.rc:74 +msgid "" +"If this problem is not present under Windows and has not been reported yet, " +"you can save the detailed information to a file using the \"Save As\" " +"button, then <a href=\"https://wiki.winehq.org/Bugs\">file a bug report</a> " +"and attach that file to the report." +msgstr "" + +#: winedbg.rc:40 +msgid "" +"A program on your system has crashed, but WineDbg was unable to attach to " +"the process to obtain a backtrace." +msgstr "" + +#: winedbg.rc:41 +msgid "(unidentified)" +msgstr "" + +#: winedbg.rc:44 +msgid "Saving failed" +msgstr "" + +#: winedbg.rc:45 +msgid "Loading detailed information, please wait..." +msgstr "" + +#: winefile.rc:29 +msgid "&Open\tEnter" +msgstr "&Abrir\tIntro" + +#: winefile.rc:33 +msgid "Re&name..." +msgstr "Re&nomar..." + +#: winefile.rc:34 +msgid "Propert&ies\tAlt+Enter" +msgstr "Propieda&es\tAlt+Intro" + +#: winefile.rc:38 +msgid "Cr&eate Directory..." +msgstr "" + +#: winefile.rc:43 +msgid "&Disk" +msgstr "&Discu" + +#: winefile.rc:44 +msgid "Connect &Network Drive..." +msgstr "" + +#: winefile.rc:45 +msgid "&Disconnect Network Drive" +msgstr "" + +#: winefile.rc:51 +msgid "&Name" +msgstr "&Nome" + +#: winefile.rc:52 +msgid "&All File Details" +msgstr "&Tolos detalles de los ficheros" + +#: winefile.rc:54 +msgid "&Sort by Name" +msgstr "" + +#: winefile.rc:55 +msgid "Sort &by Type" +msgstr "" + +#: winefile.rc:56 +msgid "Sort by Si&ze" +msgstr "" + +#: winefile.rc:57 +msgid "Sort by &Date" +msgstr "" + +#: winefile.rc:59 +msgid "Filter by&..." +msgstr "" + +#: winefile.rc:66 +msgid "&Drive Bar" +msgstr "" + +#: winefile.rc:68 +msgid "F&ull Screen\tCtrl+Shift+S" +msgstr "" + +#: winefile.rc:74 +msgid "New &Window" +msgstr "&Ventana nueva" + +#: winefile.rc:75 +msgid "Cascading\tCtrl+F5" +msgstr "" + +#: winefile.rc:77 +msgid "Tile &Vertically\tCtrl+F4" +msgstr "" + +#: winefile.rc:84 +msgid "&About Wine File Manager" +msgstr "&Tocante a Xestor de ficheros de Wine" + +#: winefile.rc:122 +msgid "Select destination" +msgstr "" + +#: winefile.rc:135 +msgid "By File Type" +msgstr "" + +#: winefile.rc:140 +msgid "File type" +msgstr "" + +#: winefile.rc:141 +msgid "&Directories" +msgstr "&Direutorios" + +#: winefile.rc:143 +msgid "&Programs" +msgstr "&Programes" + +#: winefile.rc:145 +msgid "Docu&ments" +msgstr "Docu&mentos" + +#: winefile.rc:147 +msgid "&Other files" +msgstr "&Otros ficheros" + +#: winefile.rc:149 +msgid "Show Hidden/&System Files" +msgstr "" + +#: winefile.rc:160 +msgid "&File Name:" +msgstr "" + +#: winefile.rc:162 +msgid "Full &Path:" +msgstr "" + +#: winefile.rc:164 +msgid "Last Change:" +msgstr "" + +#: winefile.rc:168 +msgid "Cop&yright:" +msgstr "Cop&yright:" + +#: winefile.rc:176 +msgid "&System" +msgstr "&Sistema" + +#: winefile.rc:177 +msgid "&Compressed" +msgstr "" + +#: winefile.rc:178 +msgid "Version information" +msgstr "Información de la versión" + +#: winefile.rc:194 +msgctxt "accelerator Fullscreen" +msgid "S" +msgstr "" + +#: winefile.rc:90 +msgid "Applying font settings" +msgstr "" + +#: winefile.rc:91 +msgid "Error while selecting new font." +msgstr "" + +#: winefile.rc:96 +msgid "Wine File Manager" +msgstr "Xestor de ficheros Wine" + +#: winefile.rc:98 +msgid "root fs" +msgstr "" + +#: winefile.rc:99 +msgid "unixfs" +msgstr "" + +#: winefile.rc:101 +msgid "Shell" +msgstr "" + +#: winefile.rc:109 +msgid "Creation date" +msgstr "Data de creación" + +#: winefile.rc:110 +msgid "Access date" +msgstr "Data d'accesu" + +#: winefile.rc:111 +msgid "Modification date" +msgstr "Data de modificación" + +#: winefile.rc:112 +msgid "Index/Inode" +msgstr "" + +#: winefile.rc:117 +msgid "%1 of %2 free" +msgstr "" + +#: winemine.rc:39 +msgid "&Game" +msgstr "" + +#: winemine.rc:40 +msgid "&New\tF2" +msgstr "" + +#: winemine.rc:42 +msgid "Question &Marks" +msgstr "" + +#: winemine.rc:44 +msgid "&Beginner" +msgstr "" + +#: winemine.rc:45 +msgid "&Advanced" +msgstr "" + +#: winemine.rc:46 +msgid "&Expert" +msgstr "" + +#: winemine.rc:47 +msgid "&Custom..." +msgstr "" + +#: winemine.rc:49 +msgid "&Fastest Times" +msgstr "" + +#: winemine.rc:54 +msgid "&About WineMine" +msgstr "&Tocante a WineMine" + +#: winemine.rc:61 +msgid "Fastest Times" +msgstr "" + +#: winemine.rc:63 +msgid "Fastest times" +msgstr "" + +#: winemine.rc:64 +msgid "Beginner" +msgstr "" + +#: winemine.rc:65 +msgid "Advanced" +msgstr "" + +#: winemine.rc:66 +msgid "Expert" +msgstr "" + +#: winemine.rc:74 winemine.rc:33 +msgid "Reset Results" +msgstr "" + +#: winemine.rc:80 +msgid "Congratulations!" +msgstr "¡Norabona!" + +#: winemine.rc:82 +msgid "Please enter your name" +msgstr "" + +#: winemine.rc:90 +msgid "Custom Game" +msgstr "" + +#: winemine.rc:92 +msgid "Rows" +msgstr "Fileres" + +#: winemine.rc:93 +msgid "Columns" +msgstr "Columnes" + +#: winemine.rc:94 +msgid "Mines" +msgstr "Mines" + +#: winemine.rc:34 +msgid "All results will be lost. Are you sure?" +msgstr "" + +#: winemine.rc:30 +msgid "WineMine" +msgstr "WineMine" + +#: winemine.rc:31 +msgid "Nobody" +msgstr "Naide" + +#: winemine.rc:32 +msgid "Copyright 2000 Joshua Thielen" +msgstr "Copyright 2000 Joshua Thielen" + +#: winhlp32.rc:35 +msgid "Printer &setup..." +msgstr "" + +#: winhlp32.rc:42 +msgid "&Annotate..." +msgstr "&Anotar..." + +#: winhlp32.rc:44 +msgid "&Bookmark" +msgstr "" + +#: winhlp32.rc:45 +msgid "&Define..." +msgstr "&Definir..." + +#: winhlp32.rc:48 +msgid "Always on &top" +msgstr "Siempres &enriba" + +#: winhlp32.rc:50 winhlp32.rc:70 +msgid "Fonts" +msgstr "" + +#: winhlp32.rc:52 winhlp32.rc:72 +msgid "Small" +msgstr "" + +#: winhlp32.rc:53 winhlp32.rc:73 +msgid "Normal" +msgstr "" + +#: winhlp32.rc:54 winhlp32.rc:74 +msgid "Large" +msgstr "" + +#: winhlp32.rc:58 +msgid "&Help on help\tF1" +msgstr "" + +#: winhlp32.rc:59 +msgid "&About Wine Help" +msgstr "&Tocante a Ayuda de Wine" + +#: winhlp32.rc:67 +msgid "Annotation..." +msgstr "Anotación..." + +#: winhlp32.rc:68 +msgid "Copy" +msgstr "" + +#: winhlp32.rc:100 +msgid "Index" +msgstr "" + +#: winhlp32.rc:108 +msgid "Search" +msgstr "" + +#: winhlp32.rc:81 +msgid "Wine Help" +msgstr "Ayuda de Wine" + +#: winhlp32.rc:86 +msgid "Error while reading the help file `%s'" +msgstr "Fallu mentanto se lleía'l ficheru d'ayuda «%s»" + +#: winhlp32.rc:88 +msgid "Summary" +msgstr "Sumariu" + +#: winhlp32.rc:87 +msgid "&Index" +msgstr "" + +#: winhlp32.rc:91 +msgid "Help files (*.hlp)" +msgstr "Ficheros d'ayuda (*.hlp)" + +#: winhlp32.rc:92 +msgid "Cannot find '%s'. Do you want to find this file yourself?" +msgstr "Nun pue alcontrase «%s». ¿Quies alcontrar tu mesmu esti ficheru?" + +#: winhlp32.rc:93 +msgid "Cannot find a richedit implementation... Aborting" +msgstr "Nun pue alcontrase una implementación de richedit... Albortando" + +#: winhlp32.rc:94 +msgid "Help topics: " +msgstr "Temes d'ayuda:" + +#: wmic.rc:28 +msgid "Error: Command line not supported\n" +msgstr "Fallu: Nun se sofita la llinia de comandos\n" + +#: wmic.rc:29 +msgid "Error: Alias not found\n" +msgstr "" + +#: wmic.rc:30 +msgid "Error: Invalid query\n" +msgstr "" + +#: wmic.rc:31 +msgid "Error: Invalid syntax for PATH\n" +msgstr "" + +#: wordpad.rc:31 +msgid "&New...\tCtrl+N" +msgstr "" + +#: wordpad.rc:45 +msgid "R&edo\tCtrl+Y" +msgstr "" + +#: wordpad.rc:50 +msgid "&Clear\tDel" +msgstr "&Llimpiar\tDel" + +#: wordpad.rc:51 +msgid "&Select all\tCtrl+A" +msgstr "&Esbillar too\tCtrl+A" + +#: wordpad.rc:54 +msgid "Find &next\tF3" +msgstr "" + +#: wordpad.rc:57 +msgid "Read-&only" +msgstr "&Namai llectura" + +#: wordpad.rc:58 +msgid "&Modified" +msgstr "" + +#: wordpad.rc:60 +msgid "E&xtras" +msgstr "E&stres" + +#: wordpad.rc:62 +msgid "Selection &info" +msgstr "" + +#: wordpad.rc:63 +msgid "Character &format" +msgstr "" + +#: wordpad.rc:64 +msgid "&Def. char format" +msgstr "" + +#: wordpad.rc:65 +msgid "Paragrap&h format" +msgstr "" + +#: wordpad.rc:66 +msgid "&Get text" +msgstr "" + +#: wordpad.rc:72 wordpad.rc:273 +msgid "&Format Bar" +msgstr "" + +#: wordpad.rc:73 wordpad.rc:274 +msgid "&Ruler" +msgstr "" + +#: wordpad.rc:78 +msgid "&Insert" +msgstr "&Inxertar" + +#: wordpad.rc:80 +msgid "&Date and time..." +msgstr "&Data y hora..." + +#: wordpad.rc:82 +msgid "F&ormat" +msgstr "" + +#: wordpad.rc:85 +msgid "&Lists" +msgstr "" + +#: wordpad.rc:87 wordpad.rc:116 +msgid "&Bullet points" +msgstr "" + +#: wordpad.rc:88 +msgid "Numbers" +msgstr "Númberos" + +#: wordpad.rc:89 +msgid "Letters - lower case" +msgstr "Lletres - minúscules" + +#: wordpad.rc:90 +msgid "Letters - upper case" +msgstr "Lletres - mayúscules" + +#: wordpad.rc:91 +msgid "Roman numerals - lower case" +msgstr "" + +#: wordpad.rc:92 +msgid "Roman numerals - upper case" +msgstr "" + +#: wordpad.rc:94 wordpad.rc:117 +msgid "&Paragraph..." +msgstr "&Párrafu..." + +#: wordpad.rc:95 +msgid "&Tabs..." +msgstr "" + +#: wordpad.rc:96 +msgid "Backgroun&d" +msgstr "" + +#: wordpad.rc:98 +msgid "&System\tCtrl+1" +msgstr "&Sistema\tCtrl+1" + +#: wordpad.rc:99 +msgid "&Pale yellow\tCtrl+2" +msgstr "" + +#: wordpad.rc:104 +msgid "&About Wine Wordpad" +msgstr "&Tocante a Wordpad de Wine" + +#: wordpad.rc:141 +msgid "Automatic" +msgstr "" + +#: wordpad.rc:210 +msgid "Date and time" +msgstr "Data y hora" + +#: wordpad.rc:213 +msgid "Available formats" +msgstr "Formatos disponibles" + +#: wordpad.rc:224 +msgid "New document type" +msgstr "" + +#: wordpad.rc:232 +msgid "Paragraph format" +msgstr "" + +#: wordpad.rc:235 +msgid "Indentation" +msgstr "" + +#: wordpad.rc:236 wordpad.rc:159 +msgid "Left" +msgstr "" + +#: wordpad.rc:238 wordpad.rc:160 +msgid "Right" +msgstr "" + +#: wordpad.rc:240 +msgid "First line" +msgstr "Primer llinia" + +#: wordpad.rc:242 +msgid "Alignment" +msgstr "Alliniación" + +#: wordpad.rc:250 +msgid "Tabs" +msgstr "" + +#: wordpad.rc:253 +msgid "Tab stops" +msgstr "" + +#: wordpad.rc:255 +msgid "&Add" +msgstr "&Amestar" + +#: wordpad.rc:259 +msgid "Remove al&l" +msgstr "" + +#: wordpad.rc:267 +msgid "Line wrapping" +msgstr "" + +#: wordpad.rc:268 +msgid "&No line wrapping" +msgstr "" + +#: wordpad.rc:269 +msgid "Wrap text by the &window border" +msgstr "" + +#: wordpad.rc:270 +msgid "Wrap text by the &margin" +msgstr "" + +#: wordpad.rc:271 +msgid "Toolbars" +msgstr "Barres de ferramientes" + +#: wordpad.rc:284 +msgctxt "accelerator Align Left" +msgid "L" +msgstr "" + +#: wordpad.rc:285 +msgctxt "accelerator Align Center" +msgid "E" +msgstr "" + +#: wordpad.rc:286 +msgctxt "accelerator Align Right" +msgid "R" +msgstr "" + +#: wordpad.rc:293 +msgctxt "accelerator Redo" +msgid "Y" +msgstr "" + +#: wordpad.rc:294 +msgctxt "accelerator Bold" +msgid "B" +msgstr "" + +#: wordpad.rc:295 +msgctxt "accelerator Italic" +msgid "I" +msgstr "I" + +#: wordpad.rc:296 +msgctxt "accelerator Underline" +msgid "U" +msgstr "" + +#: wordpad.rc:147 +msgid "All documents (*.*)" +msgstr "Tolos documentos (*.*)" + +#: wordpad.rc:148 +msgid "Text documents (*.txt)" +msgstr "Documentos de testu (*.txt)" + +#: wordpad.rc:149 +msgid "Unicode text documents (*.txt)" +msgstr "Documentos de testu Unicode (*.txt)" + +#: wordpad.rc:150 +msgid "Rich text format (*.rtf)" +msgstr "Formatu de testu arriquecíu (*.rtf)" + +#: wordpad.rc:151 +msgid "Rich text document" +msgstr "Documentu de testu arriquecíu" + +#: wordpad.rc:152 +msgid "Text document" +msgstr "Documentu de testu" + +#: wordpad.rc:153 +msgid "Unicode text document" +msgstr "Documentu de testu Unicode" + +#: wordpad.rc:154 +msgid "Printer files (*.prn)" +msgstr "" + +#: wordpad.rc:161 +msgid "Center" +msgstr "" + +#: wordpad.rc:167 +msgid "Text" +msgstr "Testu" + +#: wordpad.rc:168 +msgid "Rich text" +msgstr "Testu arriquecíu" + +#: wordpad.rc:174 +msgid "Next page" +msgstr "Páxina siguiente" + +#: wordpad.rc:175 +msgid "Previous page" +msgstr "Páxina anterior" + +#: wordpad.rc:176 +msgid "Two pages" +msgstr "Dos páxines" + +#: wordpad.rc:177 +msgid "One page" +msgstr "Una páxina" + +#: wordpad.rc:178 +msgid "Zoom in" +msgstr "Averar" + +#: wordpad.rc:179 +msgid "Zoom out" +msgstr "Alloñar" + +#: wordpad.rc:181 +msgid "Page" +msgstr "Páxina" + +#: wordpad.rc:182 +msgid "Pages" +msgstr "Páxines" + +#: wordpad.rc:183 +msgctxt "unit: centimeter" +msgid "cm" +msgstr "cm" + +#: wordpad.rc:184 +msgctxt "unit: inch" +msgid "in" +msgstr "in" + +#: wordpad.rc:185 +msgid "inch" +msgstr "" + +#: wordpad.rc:186 +msgctxt "unit: point" +msgid "pt" +msgstr "pt" + +#: wordpad.rc:191 +msgid "Document" +msgstr "Documentu" + +#: wordpad.rc:192 +msgid "Save changes to '%s'?" +msgstr "¿Guardar los cambeos en «%s»?" + +#: wordpad.rc:193 +msgid "Finished searching the document." +msgstr "" + +#: wordpad.rc:194 +msgid "Failed to load the RichEdit library." +msgstr "Fallu al cargar la biblioteca RichEdit." + +#: wordpad.rc:195 +msgid "" +"You have chosen to save in plain text format, which will cause all " +"formatting to be lost. Are you sure that you wish to do this?" +msgstr "" + +#: wordpad.rc:198 +msgid "Invalid number format." +msgstr "" + +#: wordpad.rc:199 +msgid "OLE storage documents are not supported." +msgstr "" + +#: wordpad.rc:200 +msgid "Could not save the file." +msgstr "Nun pudo guardase'l ficheru." + +#: wordpad.rc:201 +msgid "You do not have access to save the file." +msgstr "" + +#: wordpad.rc:202 +msgid "Could not open the file." +msgstr "Nun pudo abrise'l ficheru." + +#: wordpad.rc:203 +msgid "You do not have access to open the file." +msgstr "" + +#: wordpad.rc:204 +msgid "Printing not implemented." +msgstr "Nun s'implementó la imprentación." + +#: wordpad.rc:205 +msgid "Cannot add more than 32 tab stops." +msgstr "" + +#: write.rc:30 +msgid "Starting Wordpad failed" +msgstr "Falló l'aniciu de Wordpad" + +#: xcopy.rc:30 +msgid "Invalid number of parameters - Use xcopy /? for help\n" +msgstr "" + +#: xcopy.rc:31 +msgid "Invalid parameter '%1' - Use xcopy /? for help\n" +msgstr "" + +#: xcopy.rc:32 +msgid "Press <Enter> to begin copying\n" +msgstr "" + +#: xcopy.rc:33 +msgid "%1!d! file(s) would be copied\n" +msgstr "" + +#: xcopy.rc:34 +msgid "%1!d! file(s) copied\n" +msgstr "" + +#: xcopy.rc:37 +msgid "" +"Is '%1' a filename or directory\n" +"on the target?\n" +"(F - File, D - Directory)\n" +msgstr "" + +#: xcopy.rc:38 +msgid "%1? (Yes|No)\n" +msgstr "" + +#: xcopy.rc:39 +msgid "Overwrite %1? (Yes|No|All)\n" +msgstr "" + +#: xcopy.rc:40 +msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" +msgstr "" + +#: xcopy.rc:42 +msgid "Failed during reading of '%1'\n" +msgstr "Fallu na llectura de «%1»\n" + +#: xcopy.rc:46 +msgctxt "File key" +msgid "F" +msgstr "F" + +#: xcopy.rc:47 +msgctxt "Directory key" +msgid "D" +msgstr "D" + +#: xcopy.rc:81 +msgid "" +"XCOPY - Copies source files or directory trees to a destination.\n" +"\n" +"Syntax:\n" +"XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" +"\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" +"\n" +"Where:\n" +"\n" +"[/I] Assume directory if destination does not exist and copying two or\n" +"\tmore files.\n" +"[/S] Copy directories and subdirectories.\n" +"[/E] Copy directories and subdirectories, including any empty ones.\n" +"[/Q] Do not list names during copy, that is be quiet.\n" +"[/F] Show full source and destination names during copy.\n" +"[/L] Simulate operation, showing names which would be copied.\n" +"[/W] Prompts before beginning the copy operation.\n" +"[/T] Creates empty directory structure but does not copy files.\n" +"[/Y] Suppress prompting when overwriting files.\n" +"[/-Y] Enable prompting when overwriting files.\n" +"[/P] Prompts on each source file before copying.\n" +"[/N] Copy using short names.\n" +"[/U] Copy only files which already exist in destination.\n" +"[/R] Overwrite any read only files.\n" +"[/H] Include hidden and system files in the copy.\n" +"[/C] Continue even if an error occurs during the copy.\n" +"[/A] Only copy files with archive attribute set.\n" +"[/M] Only copy files with archive attribute set, removes the\n" +"\tarchive attribute.\n" +"[/K] Copy file attributes, without this attributes are not preserved.\n" +"[/D | /D:m-d-y] Copy new files or those modified after the supplied date.\n" +"\t\tIf no date is supplied, only copy if destination is older\n" +"\t\tthan source.\n" +"\n" +msgstr "" -- 2.17.1

3 2

Closing PRs on GitHub mirror
by Yurii Kolesnykov 28 Feb '19

28 Feb '19

Please close PR feature on GitHub mirror, https://github.com/wine-mirror/wine

2 1

[PATCH] msvcp140: Don't forward __ExceptionPtrCreate to msvcr120.
by Piotr Caban 28 Feb '19

28 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46583 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp90/exception.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-)

1 0

[PATCH v2 3/3] d3dx9: Merge the d3dx9_effect_GetDesc() helper
by Michael Stefaniuc 28 Feb '19

28 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 1660b47a8c..78aa1c06d6 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -991,25 +991,6 @@ static inline DWORD d3dx9_effect_version(DWORD major, DWORD minor) return (0xfeff0000 | ((major) << 8) | (minor)); } -static HRESULT d3dx9_base_effect_get_desc(struct d3dx9_base_effect *base, D3DXEFFECT_DESC *desc) -{ - if (!desc) - { - WARN("Invalid argument specified.\n"); - return D3DERR_INVALIDCALL; - } - - FIXME("partial stub!\n"); - - /* TODO: add creator and function count. */ - desc->Creator = NULL; - desc->Functions = 0; - desc->Parameters = base->parameter_count; - desc->Techniques = base->technique_count; - - return D3D_OK; -} - static HRESULT d3dx9_base_effect_get_parameter_desc(struct d3dx9_base_effect *base, D3DXHANDLE parameter, D3DXPARAMETER_DESC *desc) { @@ -3419,9 +3400,21 @@ static HRESULT WINAPI d3dx_effect_GetDesc(ID3DXEffect *iface, D3DXEFFECT_DESC *d { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - TRACE("iface %p, desc %p.\n", iface, desc); + FIXME("iface %p, desc %p partial stub.\n", iface, desc); - return d3dx9_base_effect_get_desc(&effect->base_effect, desc); + if (!desc) + { + WARN("Invalid argument specified.\n"); + return D3DERR_INVALIDCALL; + } + + /* TODO: add creator and function count. */ + desc->Creator = NULL; + desc->Functions = 0; + desc->Parameters = effect->base_effect.parameter_count; + desc->Techniques = effect->base_effect.technique_count; + + return D3D_OK; } static HRESULT WINAPI d3dx_effect_GetParameterDesc(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

3 3

[PATCH] d3d8: Improve ValidatePixelShader().
by Gijs Vermeulen 28 Feb '19

28 Feb '19

Based largely on a patch by Sebastian Lackner. Adapted from "Improve ValidateVertexShader()" by Henri Verbeet. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- Native crashes when ps_code is NULL, so those tests were omitted. dlls/d3d8/d3d8_main.c | 69 +++++++++++++++++++++------------------- dlls/d3d8/tests/device.c | 43 ++++++++++++------------- 2 files changed, 58 insertions(+), 54 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 17f35c9089..64f951e0bd 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -103,41 +103,46 @@ done: return hr; } -/*********************************************************************** - * ValidatePixelShader (D3D8.@) - * - * PARAMS - * toto result? - */ -HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, BOOL boolean, DWORD* toto) +/* FIXME: We should probably use libvkd3d-shader for validation. */ +HRESULT WINAPI ValidatePixelShader(const DWORD *ps_code, const DWORD *declaration, + BOOL return_error, char **errors) { - HRESULT ret; - static BOOL warned; - - if (TRACE_ON(d3d8) || !warned) { - FIXME("(%p %p %d %p): stub\n", pixelshader, reserved1, boolean, toto); - warned = TRUE; - } - - if (!pixelshader) - return E_FAIL; - - if (reserved1) - return E_FAIL; - - switch(*pixelshader) { - case 0xFFFF0100: - case 0xFFFF0101: - case 0xFFFF0102: - case 0xFFFF0103: - case 0xFFFF0104: - ret=S_OK; + const char *message = ""; + SIZE_T message_size; + HRESULT hr = E_FAIL; + + TRACE("ps_code %p, declaration %p, return_error %#x, errors %p.\n", + ps_code, declaration, return_error, errors); + + if (!ps_code) + { + message = "Invalid code pointer.\n"; + goto done; + } + + switch (*ps_code) + { + case D3DPS_VERSION(1, 3): + case D3DPS_VERSION(1, 2): + case D3DPS_VERSION(1, 1): + case D3DPS_VERSION(1, 0): break; + default: - WARN("Invalid shader version token %#x.\n", *pixelshader); - ret=E_FAIL; - } - return ret; + message = "Unsupported shader version.\n"; + goto done; + } + + hr = S_OK; + +done: + if (!return_error) + message = ""; + message_size = strlen(message) + 1; + if (errors && (*errors = heap_alloc(message_size))) + memcpy(*errors, message, message_size); + + return hr; } void d3d8_resource_cleanup(struct d3d8_resource *resource) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a64736913d..41401091ca 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -53,7 +53,7 @@ struct device_desc static DEVMODEW registry_mode; static HRESULT (WINAPI *ValidateVertexShader)(const DWORD *, const DWORD *, const D3DCAPS8 *, BOOL, char **); -static HRESULT (WINAPI *ValidatePixelShader)(DWORD *, DWORD *, int, DWORD *); +static HRESULT (WINAPI *ValidatePixelShader)(const DWORD *, const DWORD *, BOOL, char **); static BOOL (WINAPI *pGetCursorInfo)(PCURSORINFO); @@ -4506,7 +4506,7 @@ static void test_validate_vs(void) static void test_validate_ps(void) { - static DWORD ps[] = + static DWORD ps_code[] = { 0xffff0101, /* ps_1_1 */ 0x00000051, 0xa00f0001, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, /* def c1 = 1.0, 0.0, 0.0, 0.0 */ @@ -4516,33 +4516,32 @@ static void test_validate_ps(void) 0x00000005, 0x800f0000, 0xb0e40000, 0x80e40000, /* mul r0, t0, r0 */ 0x0000ffff, /* end */ }; + char *errors; HRESULT hr; - hr = ValidatePixelShader(0, 0, 0, 0); - ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - hr = ValidatePixelShader(0, 0, 1, 0); - ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - hr = ValidatePixelShader(ps, 0, 0, 0); + hr = ValidatePixelShader(ps_code, NULL, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ValidatePixelShader(ps_code, NULL, TRUE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ValidatePixelShader(ps_code, NULL, TRUE, &errors); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!*errors, "Got unexpected string \"%s\".\n", errors); + heap_free(errors); - hr = ValidatePixelShader(ps, 0, 1, 0); + *ps_code = D3DPS_VERSION(1, 0); + hr = ValidatePixelShader(ps_code, NULL, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - /* Seems to do some version checking. */ - *ps = 0xffff0105; /* bogus version */ - hr = ValidatePixelShader(ps, 0, 1, 0); + *ps_code = D3DPS_VERSION(1, 4); + hr = ValidatePixelShader(ps_code, NULL, TRUE, NULL); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - /* I've seen that applications always pass the 2nd parameter as 0. - * Simple test with a non-zero parameter. */ - *ps = 0xffff0101; /* ps_1_1 */ - hr = ValidatePixelShader(ps, ps, 1, 0); + hr = ValidatePixelShader(ps_code, NULL, FALSE, &errors); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - /* I've seen the 3rd parameter always passed as either 0 or 1, but passing - * other values doesn't seem to hurt. */ - hr = ValidatePixelShader(ps, 0, 12345, 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - /* What is the 4th parameter? The following seems to work ok. */ - hr = ValidatePixelShader(ps, 0, 1, ps); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!*errors, "Got unexpected string \"%s\".\n", errors); + heap_free(errors); + hr = ValidatePixelShader(ps_code, NULL, TRUE, &errors); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!!*errors, "Got unexpected empty string.\n"); + heap_free(errors); } static void test_volume_get_container(void) -- 2.21.0

2 1

[PATCH v2 2/3] d3dx9: Merge the stub ID3DXBaseEffect methods
by Michael Stefaniuc 28 Feb '19

28 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 54 +++++++----------------------------------- 1 file changed, 8 insertions(+), 46 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 95753d098c..1660b47a8c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1198,14 +1198,6 @@ static HRESULT d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base, return D3D_OK; } -static HRESULT d3dx9_base_effect_get_function_desc(struct d3dx9_base_effect *base, - D3DXHANDLE shader, D3DXFUNCTION_DESC *desc) -{ - FIXME("stub!\n"); - - return E_NOTIMPL; -} - static D3DXHANDLE d3dx9_base_effect_get_parameter(struct d3dx9_base_effect *base, D3DXHANDLE parameter, UINT index) { @@ -1409,20 +1401,6 @@ static D3DXHANDLE d3dx9_base_effect_get_pass_by_name(struct d3dx9_base_effect *b return NULL; } -static D3DXHANDLE d3dx9_base_effect_get_function(struct d3dx9_base_effect *base, UINT index) -{ - FIXME("stub!\n"); - - return NULL; -} - -static D3DXHANDLE d3dx9_base_effect_get_function_by_name(struct d3dx9_base_effect *base, const char *name) -{ - FIXME("stub!\n"); - - return NULL; -} - static UINT get_annotation_from_object(struct d3dx9_base_effect *base, D3DXHANDLE object, struct d3dx_parameter **annotations) { @@ -2772,14 +2750,6 @@ static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *bas return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_array_range(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, UINT start, UINT end) -{ - FIXME("stub!\n"); - - return E_NOTIMPL; -} - static void d3dx9_set_light_parameter(enum LIGHT_TYPE op, D3DLIGHT9 *light, void *value) { static const struct @@ -3486,11 +3456,9 @@ static HRESULT WINAPI d3dx_effect_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pas static HRESULT WINAPI d3dx_effect_GetFunctionDesc(ID3DXEffect *iface, D3DXHANDLE shader, D3DXFUNCTION_DESC *desc) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + FIXME("iface %p, shader %p, desc %p stub.\n", iface, shader, desc); - TRACE("iface %p, shader %p, desc %p.\n", iface, shader, desc); - - return d3dx9_base_effect_get_function_desc(&effect->base_effect, shader, desc); + return E_NOTIMPL; } static D3DXHANDLE WINAPI d3dx_effect_GetParameter(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) @@ -3569,20 +3537,16 @@ static D3DXHANDLE WINAPI d3dx_effect_GetPassByName(ID3DXEffect *iface, D3DXHANDL static D3DXHANDLE WINAPI d3dx_effect_GetFunction(ID3DXEffect *iface, UINT index) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + FIXME("iface %p, index %u stub.\n", iface, index); - TRACE("iface %p, index %u.\n", iface, index); - - return d3dx9_base_effect_get_function(&effect->base_effect, index); + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetFunctionByName(ID3DXEffect *iface, const char *name) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); - - TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); + FIXME("iface %p, name %s stub.\n", iface, debugstr_a(name)); - return d3dx9_base_effect_get_function_by_name(&effect->base_effect, name); + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetAnnotation(ID3DXEffect *iface, D3DXHANDLE object, UINT index) @@ -3948,11 +3912,9 @@ static HRESULT WINAPI d3dx_effect_GetVertexShader(struct ID3DXEffect *iface, D3D static HRESULT WINAPI d3dx_effect_SetArrayRange(ID3DXEffect *iface, D3DXHANDLE parameter, UINT start, UINT end) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + FIXME("iface %p, parameter %p, start %u, end %u stub.\n", iface, parameter, start, end); - TRACE("iface %p, parameter %p, start %u, end %u.\n", iface, parameter, start, end); - - return d3dx9_base_effect_set_array_range(&effect->base_effect, parameter, start, end); + return E_NOTIMPL; } /*** ID3DXEffect methods ***/ -- 2.20.1

2 1

[PATCH v2 1/3] d3dx9: Rename the ID3DXEffect object and methods
by Michael Stefaniuc 28 Feb '19

28 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Use d3dx_ as prefix dlls/d3dx9_36/effect.c | 536 ++++++++++++++++++++--------------------- 1 file changed, 264 insertions(+), 272 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b0dc366f6b..95753d098c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -148,6 +148,8 @@ struct d3dx_technique struct IDirect3DStateBlock9 *saved_state; }; +#define ID3DXEffectImpl d3dx_effect + struct d3dx9_base_effect { struct ID3DXEffectImpl *effect; @@ -170,7 +172,7 @@ struct d3dx9_base_effect unsigned int full_name_tmp_size; }; -struct ID3DXEffectImpl +struct d3dx_effect { ID3DXEffect ID3DXEffect_iface; LONG ref; @@ -3394,13 +3396,13 @@ static inline struct d3dx_effect_pool *impl_from_ID3DXEffectPool(ID3DXEffectPool return CONTAINING_RECORD(iface, struct d3dx_effect_pool, ID3DXEffectPool_iface); } -static inline struct ID3DXEffectImpl *impl_from_ID3DXEffect(ID3DXEffect *iface) +static inline struct d3dx_effect *impl_from_ID3DXEffect(ID3DXEffect *iface) { - return CONTAINING_RECORD(iface, struct ID3DXEffectImpl, ID3DXEffect_iface); + return CONTAINING_RECORD(iface, struct d3dx_effect, ID3DXEffect_iface); } /*** IUnknown methods ***/ -static HRESULT WINAPI ID3DXEffectImpl_QueryInterface(ID3DXEffect *iface, REFIID riid, void **object) +static HRESULT WINAPI d3dx_effect_QueryInterface(ID3DXEffect *iface, REFIID riid, void **object) { TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), object); @@ -3417,18 +3419,18 @@ static HRESULT WINAPI ID3DXEffectImpl_QueryInterface(ID3DXEffect *iface, REFIID return E_NOINTERFACE; } -static ULONG WINAPI ID3DXEffectImpl_AddRef(ID3DXEffect *iface) +static ULONG WINAPI d3dx_effect_AddRef(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); TRACE("(%p)->(): AddRef from %u\n", This, This->ref); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI ID3DXEffectImpl_Release(ID3DXEffect *iface) +static ULONG WINAPI d3dx_effect_Release(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p)->(): Release from %u\n", This, ref + 1); @@ -3443,45 +3445,46 @@ static ULONG WINAPI ID3DXEffectImpl_Release(ID3DXEffect *iface) } /*** ID3DXBaseEffect methods ***/ -static HRESULT WINAPI ID3DXEffectImpl_GetDesc(ID3DXEffect *iface, D3DXEFFECT_DESC *desc) +static HRESULT WINAPI d3dx_effect_GetDesc(ID3DXEffect *iface, D3DXEFFECT_DESC *desc) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, desc %p.\n", iface, desc); return d3dx9_base_effect_get_desc(&effect->base_effect, desc); } -static HRESULT WINAPI ID3DXEffectImpl_GetParameterDesc(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXPARAMETER_DESC *desc) +static HRESULT WINAPI d3dx_effect_GetParameterDesc(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXPARAMETER_DESC *desc) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, desc %p.\n", iface, parameter, desc); return d3dx9_base_effect_get_parameter_desc(&effect->base_effect, parameter, desc); } -static HRESULT WINAPI ID3DXEffectImpl_GetTechniqueDesc(ID3DXEffect *iface, - D3DXHANDLE technique, D3DXTECHNIQUE_DESC *desc) +static HRESULT WINAPI d3dx_effect_GetTechniqueDesc(ID3DXEffect *iface, D3DXHANDLE technique, + D3DXTECHNIQUE_DESC *desc) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, technique %p, desc %p.\n", iface, technique, desc); return d3dx9_base_effect_get_technique_desc(&effect->base_effect, technique, desc); } -static HRESULT WINAPI ID3DXEffectImpl_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pass, D3DXPASS_DESC *desc) +static HRESULT WINAPI d3dx_effect_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pass, D3DXPASS_DESC *desc) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, pass %p, desc %p.\n", iface, pass, desc); return d3dx9_base_effect_get_pass_desc(&effect->base_effect, pass, desc); } -static HRESULT WINAPI ID3DXEffectImpl_GetFunctionDesc(ID3DXEffect *iface, D3DXHANDLE shader, D3DXFUNCTION_DESC *desc) +static HRESULT WINAPI d3dx_effect_GetFunctionDesc(ID3DXEffect *iface, D3DXHANDLE shader, + D3DXFUNCTION_DESC *desc) { struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); @@ -3490,82 +3493,81 @@ static HRESULT WINAPI ID3DXEffectImpl_GetFunctionDesc(ID3DXEffect *iface, D3DXHA return d3dx9_base_effect_get_function_desc(&effect->base_effect, shader, desc); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetParameter(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) +static D3DXHANDLE WINAPI d3dx_effect_GetParameter(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, index %u.\n", iface, parameter, index); return d3dx9_base_effect_get_parameter(&effect->base_effect, parameter, index); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetParameterByName(ID3DXEffect *iface, - D3DXHANDLE parameter, const char *name) +static D3DXHANDLE WINAPI d3dx_effect_GetParameterByName(ID3DXEffect *iface, D3DXHANDLE parameter, + const char *name) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, name %s.\n", iface, parameter, debugstr_a(name)); return d3dx9_base_effect_get_parameter_by_name(&effect->base_effect, parameter, name); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetParameterBySemantic(ID3DXEffect *iface, - D3DXHANDLE parameter, const char *semantic) +static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, D3DXHANDLE parameter, + const char *semantic) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, semantic %s.\n", iface, parameter, debugstr_a(semantic)); return d3dx9_base_effect_get_parameter_by_semantic(&effect->base_effect, parameter, semantic); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetParameterElement(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) +static D3DXHANDLE WINAPI d3dx_effect_GetParameterElement(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, index %u.\n", iface, parameter, index); return d3dx9_base_effect_get_parameter_element(&effect->base_effect, parameter, index); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetTechnique(ID3DXEffect *iface, UINT index) +static D3DXHANDLE WINAPI d3dx_effect_GetTechnique(ID3DXEffect *iface, UINT index) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, index %u.\n", iface, index); return d3dx9_base_effect_get_technique(&effect->base_effect, index); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetTechniqueByName(ID3DXEffect *iface, const char *name) +static D3DXHANDLE WINAPI d3dx_effect_GetTechniqueByName(ID3DXEffect *iface, const char *name) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); return d3dx9_base_effect_get_technique_by_name(&effect->base_effect, name); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetPass(ID3DXEffect *iface, D3DXHANDLE technique, UINT index) +static D3DXHANDLE WINAPI d3dx_effect_GetPass(ID3DXEffect *iface, D3DXHANDLE technique, UINT index) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, technique %p, index %u.\n", iface, technique, index); return d3dx9_base_effect_get_pass(&effect->base_effect, technique, index); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetPassByName(ID3DXEffect *iface, - D3DXHANDLE technique, const char *name) +static D3DXHANDLE WINAPI d3dx_effect_GetPassByName(ID3DXEffect *iface, D3DXHANDLE technique, const char *name) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, technique %p, name %s.\n", iface, technique, debugstr_a(name)); return d3dx9_base_effect_get_pass_by_name(&effect->base_effect, technique, name); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetFunction(ID3DXEffect *iface, UINT index) +static D3DXHANDLE WINAPI d3dx_effect_GetFunction(ID3DXEffect *iface, UINT index) { struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); @@ -3574,7 +3576,7 @@ static D3DXHANDLE WINAPI ID3DXEffectImpl_GetFunction(ID3DXEffect *iface, UINT in return d3dx9_base_effect_get_function(&effect->base_effect, index); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetFunctionByName(ID3DXEffect *iface, const char *name) +static D3DXHANDLE WINAPI d3dx_effect_GetFunctionByName(ID3DXEffect *iface, const char *name) { struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); @@ -3583,378 +3585,368 @@ static D3DXHANDLE WINAPI ID3DXEffectImpl_GetFunctionByName(ID3DXEffect *iface, c return d3dx9_base_effect_get_function_by_name(&effect->base_effect, name); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetAnnotation(ID3DXEffect *iface, D3DXHANDLE object, UINT index) +static D3DXHANDLE WINAPI d3dx_effect_GetAnnotation(ID3DXEffect *iface, D3DXHANDLE object, UINT index) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, object %p, index %u.\n", iface, object, index); return d3dx9_base_effect_get_annotation(&effect->base_effect, object, index); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetAnnotationByName(ID3DXEffect *iface, - D3DXHANDLE object, const char *name) +static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect *iface, D3DXHANDLE object, + const char *name) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, object %p, name %s.\n", iface, object, debugstr_a(name)); return d3dx9_base_effect_get_annotation_by_name(&effect->base_effect, object, name); } -static HRESULT WINAPI ID3DXEffectImpl_SetValue(ID3DXEffect *iface, - D3DXHANDLE parameter, const void *data, UINT bytes) +static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parameter, + const void *data, UINT bytes) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, data %p, bytes %u.\n", iface, parameter, data, bytes); return d3dx9_base_effect_set_value(&effect->base_effect, parameter, data, bytes); } -static HRESULT WINAPI ID3DXEffectImpl_GetValue(ID3DXEffect *iface, - D3DXHANDLE parameter, void *data, UINT bytes) +static HRESULT WINAPI d3dx_effect_GetValue(ID3DXEffect *iface, D3DXHANDLE parameter, void *data, UINT bytes) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, data %p, bytes %u.\n", iface, parameter, data, bytes); return d3dx9_base_effect_get_value(&effect->base_effect, parameter, data, bytes); } -static HRESULT WINAPI ID3DXEffectImpl_SetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL b) +static HRESULT WINAPI d3dx_effect_SetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL b) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, b %#x.\n", iface, parameter, b); return d3dx9_base_effect_set_bool(&effect->base_effect, parameter, b); } -static HRESULT WINAPI ID3DXEffectImpl_GetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b) +static HRESULT WINAPI d3dx_effect_GetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, b %p.\n", iface, parameter, b); return d3dx9_base_effect_get_bool(&effect->base_effect, parameter, b); } -static HRESULT WINAPI ID3DXEffectImpl_SetBoolArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const BOOL *b, UINT count) +static HRESULT WINAPI d3dx_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, const BOOL *b, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, b %p, count %u.\n", iface, parameter, b, count); return d3dx9_base_effect_set_bool_array(&effect->base_effect, parameter, b, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetBoolArray(ID3DXEffect *iface, - D3DXHANDLE parameter, BOOL *b, UINT count) +static HRESULT WINAPI d3dx_effect_GetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, b %p, count %u.\n", iface, parameter, b, count); return d3dx9_base_effect_get_bool_array(&effect->base_effect, parameter, b, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT n) +static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT n) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, n %d.\n", iface, parameter, n); return d3dx9_base_effect_set_int(&effect->base_effect, parameter, n); } -static HRESULT WINAPI ID3DXEffectImpl_GetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n) +static HRESULT WINAPI d3dx_effect_GetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, n %p.\n", iface, parameter, n); return d3dx9_base_effect_get_int(&effect->base_effect, parameter, n); } -static HRESULT WINAPI ID3DXEffectImpl_SetIntArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const INT *n, UINT count) +static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, const INT *n, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, n %p, count %u.\n", iface, parameter, n, count); return d3dx9_base_effect_set_int_array(&effect->base_effect, parameter, n, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetIntArray(ID3DXEffect *iface, - D3DXHANDLE parameter, INT *n, UINT count) +static HRESULT WINAPI d3dx_effect_GetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, n %p, count %u.\n", iface, parameter, n, count); return d3dx9_base_effect_get_int_array(&effect->base_effect, parameter, n, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float f) +static HRESULT WINAPI d3dx_effect_SetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float f) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, f %.8e.\n", iface, parameter, f); return d3dx9_base_effect_set_float(&effect->base_effect, parameter, f); } -static HRESULT WINAPI ID3DXEffectImpl_GetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float *f) +static HRESULT WINAPI d3dx_effect_GetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float *f) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, f %p.\n", iface, parameter, f); return d3dx9_base_effect_get_float(&effect->base_effect, parameter, f); } -static HRESULT WINAPI ID3DXEffectImpl_SetFloatArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const float *f, UINT count) +static HRESULT WINAPI d3dx_effect_SetFloatArray(ID3DXEffect *iface, D3DXHANDLE parameter, + const float *f, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, f %p, count %u.\n", iface, parameter, f, count); return d3dx9_base_effect_set_float_array(&effect->base_effect, parameter, f, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetFloatArray(ID3DXEffect *iface, - D3DXHANDLE parameter, float *f, UINT count) +static HRESULT WINAPI d3dx_effect_GetFloatArray(ID3DXEffect *iface, D3DXHANDLE parameter, float *f, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, f %p, count %u.\n", iface, parameter, f, count); return d3dx9_base_effect_get_float_array(&effect->base_effect, parameter, f, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetVector(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXVECTOR4 *vector) +static HRESULT WINAPI d3dx_effect_SetVector(ID3DXEffect *iface, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, vector %p.\n", iface, parameter, vector); return d3dx9_base_effect_set_vector(&effect->base_effect, parameter, vector); } -static HRESULT WINAPI ID3DXEffectImpl_GetVector(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXVECTOR4 *vector) +static HRESULT WINAPI d3dx_effect_GetVector(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXVECTOR4 *vector) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, vector %p.\n", iface, parameter, vector); return d3dx9_base_effect_get_vector(&effect->base_effect, parameter, vector); } -static HRESULT WINAPI ID3DXEffectImpl_SetVectorArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXVECTOR4 *vector, UINT count) +static HRESULT WINAPI d3dx_effect_SetVectorArray(ID3DXEffect *iface, D3DXHANDLE parameter, + const D3DXVECTOR4 *vector, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, vector %p, count %u.\n", iface, parameter, vector, count); return d3dx9_base_effect_set_vector_array(&effect->base_effect, parameter, vector, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetVectorArray(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXVECTOR4 *vector, UINT count) +static HRESULT WINAPI d3dx_effect_GetVectorArray(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXVECTOR4 *vector, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, vector %p, count %u.\n", iface, parameter, vector, count); return d3dx9_base_effect_get_vector_array(&effect->base_effect, parameter, vector, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetMatrix(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXMATRIX *matrix) +static HRESULT WINAPI d3dx_effect_SetMatrix(ID3DXEffect *iface, D3DXHANDLE parameter, const D3DXMATRIX *matrix) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); return d3dx9_base_effect_set_matrix(&effect->base_effect, parameter, matrix); } -static HRESULT WINAPI ID3DXEffectImpl_GetMatrix(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXMATRIX *matrix) +static HRESULT WINAPI d3dx_effect_GetMatrix(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); return d3dx9_base_effect_get_matrix(&effect->base_effect, parameter, matrix); } -static HRESULT WINAPI ID3DXEffectImpl_SetMatrixArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count) +static HRESULT WINAPI d3dx_effect_SetMatrixArray(ID3DXEffect *iface, D3DXHANDLE parameter, + const D3DXMATRIX *matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_set_matrix_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetMatrixArray(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXMATRIX *matrix, UINT count) +static HRESULT WINAPI d3dx_effect_GetMatrixArray(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXMATRIX *matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_get_matrix_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetMatrixPointerArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count) +static HRESULT WINAPI d3dx_effect_SetMatrixPointerArray(ID3DXEffect *iface, D3DXHANDLE parameter, + const D3DXMATRIX **matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_set_matrix_pointer_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetMatrixPointerArray(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXMATRIX **matrix, UINT count) +static HRESULT WINAPI d3dx_effect_GetMatrixPointerArray(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXMATRIX **matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_get_matrix_pointer_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetMatrixTranspose(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXMATRIX *matrix) +static HRESULT WINAPI d3dx_effect_SetMatrixTranspose(ID3DXEffect *iface, D3DXHANDLE parameter, + const D3DXMATRIX *matrix) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); return d3dx9_base_effect_set_matrix_transpose(&effect->base_effect, parameter, matrix); } -static HRESULT WINAPI ID3DXEffectImpl_GetMatrixTranspose(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXMATRIX *matrix) +static HRESULT WINAPI d3dx_effect_GetMatrixTranspose(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXMATRIX *matrix) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); return d3dx9_base_effect_get_matrix_transpose(&effect->base_effect, parameter, matrix); } -static HRESULT WINAPI ID3DXEffectImpl_SetMatrixTransposeArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count) +static HRESULT WINAPI d3dx_effect_SetMatrixTransposeArray(ID3DXEffect *iface, D3DXHANDLE parameter, + const D3DXMATRIX *matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_set_matrix_transpose_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetMatrixTransposeArray(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXMATRIX *matrix, UINT count) +static HRESULT WINAPI d3dx_effect_GetMatrixTransposeArray(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXMATRIX *matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_get_matrix_transpose_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetMatrixTransposePointerArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count) +static HRESULT WINAPI d3dx_effect_SetMatrixTransposePointerArray(ID3DXEffect *iface, D3DXHANDLE parameter, + const D3DXMATRIX **matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_set_matrix_transpose_pointer_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetMatrixTransposePointerArray(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXMATRIX **matrix, UINT count) +static HRESULT WINAPI d3dx_effect_GetMatrixTransposePointerArray(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXMATRIX **matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_get_matrix_transpose_pointer_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char *string) +static HRESULT WINAPI d3dx_effect_SetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char *string) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, string %s.\n", iface, parameter, debugstr_a(string)); return d3dx9_base_effect_set_string(&effect->base_effect, parameter, string); } -static HRESULT WINAPI ID3DXEffectImpl_GetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char **string) +static HRESULT WINAPI d3dx_effect_GetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char **string) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, string %p.\n", iface, parameter, string); return d3dx9_base_effect_get_string(&effect->base_effect, parameter, string); } -static HRESULT WINAPI ID3DXEffectImpl_SetTexture(struct ID3DXEffect *iface, - D3DXHANDLE parameter, struct IDirect3DBaseTexture9 *texture) +static HRESULT WINAPI d3dx_effect_SetTexture(struct ID3DXEffect *iface, D3DXHANDLE parameter, + struct IDirect3DBaseTexture9 *texture) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, texture %p.\n", iface, parameter, texture); return d3dx9_base_effect_set_texture(&effect->base_effect, parameter, texture); } -static HRESULT WINAPI ID3DXEffectImpl_GetTexture(struct ID3DXEffect *iface, - D3DXHANDLE parameter, struct IDirect3DBaseTexture9 **texture) +static HRESULT WINAPI d3dx_effect_GetTexture(struct ID3DXEffect *iface, D3DXHANDLE parameter, + struct IDirect3DBaseTexture9 **texture) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, texture %p.\n", iface, parameter, texture); return d3dx9_base_effect_get_texture(&effect->base_effect, parameter, texture); } -static HRESULT WINAPI ID3DXEffectImpl_GetPixelShader(ID3DXEffect *iface, - D3DXHANDLE parameter, struct IDirect3DPixelShader9 **shader) +static HRESULT WINAPI d3dx_effect_GetPixelShader(ID3DXEffect *iface, D3DXHANDLE parameter, + struct IDirect3DPixelShader9 **shader) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, shader %p.\n", iface, parameter, shader); return d3dx9_base_effect_get_pixel_shader(&effect->base_effect, parameter, shader); } -static HRESULT WINAPI ID3DXEffectImpl_GetVertexShader(struct ID3DXEffect *iface, - D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) +static HRESULT WINAPI d3dx_effect_GetVertexShader(struct ID3DXEffect *iface, D3DXHANDLE parameter, + struct IDirect3DVertexShader9 **shader) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, shader %p.\n", iface, parameter, shader); return d3dx9_base_effect_get_vertex_shader(&effect->base_effect, parameter, shader); } -static HRESULT WINAPI ID3DXEffectImpl_SetArrayRange(ID3DXEffect *iface, D3DXHANDLE parameter, UINT start, UINT end) +static HRESULT WINAPI d3dx_effect_SetArrayRange(ID3DXEffect *iface, D3DXHANDLE parameter, UINT start, UINT end) { struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); @@ -3964,9 +3956,9 @@ static HRESULT WINAPI ID3DXEffectImpl_SetArrayRange(ID3DXEffect *iface, D3DXHAND } /*** ID3DXEffect methods ***/ -static HRESULT WINAPI ID3DXEffectImpl_GetPool(ID3DXEffect *iface, ID3DXEffectPool **pool) +static HRESULT WINAPI d3dx_effect_GetPool(ID3DXEffect *iface, ID3DXEffectPool **pool) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); TRACE("iface %p, pool %p\n", This, pool); @@ -3988,9 +3980,9 @@ static HRESULT WINAPI ID3DXEffectImpl_GetPool(ID3DXEffect *iface, ID3DXEffectPoo return S_OK; } -static HRESULT WINAPI ID3DXEffectImpl_SetTechnique(ID3DXEffect *iface, D3DXHANDLE technique) +static HRESULT WINAPI d3dx_effect_SetTechnique(ID3DXEffect *iface, D3DXHANDLE technique) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); struct d3dx9_base_effect *base = &This->base_effect; struct d3dx_technique *tech = get_valid_technique(base, technique); @@ -4008,18 +4000,18 @@ static HRESULT WINAPI ID3DXEffectImpl_SetTechnique(ID3DXEffect *iface, D3DXHANDL return D3DERR_INVALIDCALL; } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetCurrentTechnique(ID3DXEffect *iface) +static D3DXHANDLE WINAPI d3dx_effect_GetCurrentTechnique(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); TRACE("iface %p\n", This); return get_technique_handle(This->active_technique); } -static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DXHANDLE technique) +static HRESULT WINAPI d3dx_effect_ValidateTechnique(ID3DXEffect *iface, D3DXHANDLE technique) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx9_base_effect *base = &effect->base_effect; struct d3dx_technique *tech = get_valid_technique(base, technique); HRESULT ret = D3D_OK; @@ -4065,10 +4057,10 @@ done: return ret; } -static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect *iface, - D3DXHANDLE technique, D3DXHANDLE *next_technique) +static HRESULT WINAPI d3dx_effect_FindNextValidTechnique(ID3DXEffect *iface, D3DXHANDLE technique, + D3DXHANDLE *next_technique) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx9_base_effect *base = &effect->base_effect; struct d3dx_technique *prev_tech, *tech; unsigned int i; @@ -4098,7 +4090,7 @@ static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect *iface, for (; i < base->technique_count; ++i) { tech = &base->techniques[i]; - if (SUCCEEDED(ID3DXEffectImpl_ValidateTechnique(iface, get_technique_handle(tech)))) + if (SUCCEEDED(d3dx_effect_ValidateTechnique(iface, get_technique_handle(tech)))) { *next_technique = get_technique_handle(tech); return D3D_OK; @@ -4216,9 +4208,9 @@ static BOOL is_parameter_used(struct d3dx_parameter *param, struct d3dx_techniqu return FALSE; } -static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDLE parameter, D3DXHANDLE technique) +static BOOL WINAPI d3dx_effect_IsParameterUsed(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXHANDLE technique) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); BOOL ret; @@ -4231,9 +4223,9 @@ static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDL return ret; } -static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DWORD flags) +static HRESULT WINAPI d3dx_effect_Begin(ID3DXEffect *iface, UINT *passes, DWORD flags) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx_technique *technique = effect->active_technique; TRACE("iface %p, passes %p, flags %#x.\n", iface, passes, flags); @@ -4283,9 +4275,9 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW return D3DERR_INVALIDCALL; } -static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect *iface, UINT pass) +static HRESULT WINAPI d3dx_effect_BeginPass(ID3DXEffect *iface, UINT pass) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx_technique *technique = effect->active_technique; TRACE("iface %p, pass %u\n", effect, pass); @@ -4307,9 +4299,9 @@ static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect *iface, UINT pass) return D3DERR_INVALIDCALL; } -static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect *iface) +static HRESULT WINAPI d3dx_effect_CommitChanges(ID3DXEffect *iface) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p.\n", iface); @@ -4321,9 +4313,9 @@ static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect *iface) return d3dx9_apply_pass_states(effect, effect->active_pass, FALSE); } -static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect *iface) +static HRESULT WINAPI d3dx_effect_EndPass(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); TRACE("iface %p\n", This); @@ -4338,9 +4330,9 @@ static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect *iface) return D3DERR_INVALIDCALL; } -static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect *iface) +static HRESULT WINAPI d3dx_effect_End(ID3DXEffect *iface) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx_technique *technique = effect->active_technique; TRACE("iface %p.\n", iface); @@ -4370,9 +4362,9 @@ static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect *iface) return D3D_OK; } -static HRESULT WINAPI ID3DXEffectImpl_GetDevice(ID3DXEffect *iface, struct IDirect3DDevice9 **device) +static HRESULT WINAPI d3dx_effect_GetDevice(ID3DXEffect *iface, struct IDirect3DDevice9 **device) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); TRACE("iface %p, device %p\n", This, device); @@ -4438,9 +4430,9 @@ static BOOL param_on_lost_device(void *data, struct d3dx_parameter *param) return FALSE; } -static HRESULT WINAPI ID3DXEffectImpl_OnLostDevice(ID3DXEffect* iface) +static HRESULT WINAPI d3dx_effect_OnLostDevice(ID3DXEffect *iface) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx9_base_effect *base = &effect->base_effect; unsigned int i; @@ -4452,18 +4444,18 @@ static HRESULT WINAPI ID3DXEffectImpl_OnLostDevice(ID3DXEffect* iface) return D3D_OK; } -static HRESULT WINAPI ID3DXEffectImpl_OnResetDevice(ID3DXEffect* iface) +static HRESULT WINAPI d3dx_effect_OnResetDevice(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); FIXME("(%p)->(): stub\n", This); return E_NOTIMPL; } -static HRESULT WINAPI ID3DXEffectImpl_SetStateManager(ID3DXEffect *iface, ID3DXEffectStateManager *manager) +static HRESULT WINAPI d3dx_effect_SetStateManager(ID3DXEffect *iface, ID3DXEffectStateManager *manager) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); TRACE("iface %p, manager %p\n", This, manager); @@ -4475,9 +4467,9 @@ static HRESULT WINAPI ID3DXEffectImpl_SetStateManager(ID3DXEffect *iface, ID3DXE return D3D_OK; } -static HRESULT WINAPI ID3DXEffectImpl_GetStateManager(ID3DXEffect *iface, ID3DXEffectStateManager **manager) +static HRESULT WINAPI d3dx_effect_GetStateManager(ID3DXEffect *iface, ID3DXEffectStateManager **manager) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); TRACE("iface %p, manager %p\n", This, manager); @@ -4493,27 +4485,27 @@ static HRESULT WINAPI ID3DXEffectImpl_GetStateManager(ID3DXEffect *iface, ID3DXE return D3D_OK; } -static HRESULT WINAPI ID3DXEffectImpl_BeginParameterBlock(ID3DXEffect* iface) +static HRESULT WINAPI d3dx_effect_BeginParameterBlock(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); FIXME("(%p)->(): stub\n", This); return E_NOTIMPL; } -static D3DXHANDLE WINAPI ID3DXEffectImpl_EndParameterBlock(ID3DXEffect* iface) +static D3DXHANDLE WINAPI d3dx_effect_EndParameterBlock(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); FIXME("(%p)->(): stub\n", This); return NULL; } -static HRESULT WINAPI ID3DXEffectImpl_ApplyParameterBlock(ID3DXEffect* iface, D3DXHANDLE parameter_block) +static HRESULT WINAPI d3dx_effect_ApplyParameterBlock(ID3DXEffect *iface, D3DXHANDLE parameter_block) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); FIXME("(%p)->(%p): stub\n", This, parameter_block); @@ -4521,9 +4513,9 @@ static HRESULT WINAPI ID3DXEffectImpl_ApplyParameterBlock(ID3DXEffect* iface, D3 } #if D3DX_SDK_VERSION >= 26 -static HRESULT WINAPI ID3DXEffectImpl_DeleteParameterBlock(ID3DXEffect* iface, D3DXHANDLE parameter_block) +static HRESULT WINAPI d3dx_effect_DeleteParameterBlock(ID3DXEffect *iface, D3DXHANDLE parameter_block) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); FIXME("(%p)->(%p): stub\n", This, parameter_block); @@ -4531,10 +4523,10 @@ static HRESULT WINAPI ID3DXEffectImpl_DeleteParameterBlock(ID3DXEffect* iface, D } #endif -static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface, - struct IDirect3DDevice9 *device, struct ID3DXEffect **effect) +static HRESULT WINAPI d3dx_effect_CloneEffect(ID3DXEffect *iface, struct IDirect3DDevice9 *device, + struct ID3DXEffect **effect) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *This = impl_from_ID3DXEffect(iface); FIXME("(%p)->(%p, %p): stub\n", This, device, effect); @@ -4551,8 +4543,8 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface, } #if D3DX_SDK_VERSION >= 27 -static HRESULT WINAPI ID3DXEffectImpl_SetRawValue(ID3DXEffect *iface, - D3DXHANDLE parameter, const void *data, UINT byte_offset, UINT bytes) +static HRESULT WINAPI d3dx_effect_SetRawValue(ID3DXEffect *iface, D3DXHANDLE parameter, const void *data, + UINT byte_offset, UINT bytes) { FIXME("iface %p, parameter %p, data %p, byte_offset %u, bytes %u stub!\n", iface, parameter, data, byte_offset, bytes); @@ -4564,90 +4556,90 @@ static HRESULT WINAPI ID3DXEffectImpl_SetRawValue(ID3DXEffect *iface, static const struct ID3DXEffectVtbl ID3DXEffect_Vtbl = { /*** IUnknown methods ***/ - ID3DXEffectImpl_QueryInterface, - ID3DXEffectImpl_AddRef, - ID3DXEffectImpl_Release, + d3dx_effect_QueryInterface, + d3dx_effect_AddRef, + d3dx_effect_Release, /*** ID3DXBaseEffect methods ***/ - ID3DXEffectImpl_GetDesc, - ID3DXEffectImpl_GetParameterDesc, - ID3DXEffectImpl_GetTechniqueDesc, - ID3DXEffectImpl_GetPassDesc, - ID3DXEffectImpl_GetFunctionDesc, - ID3DXEffectImpl_GetParameter, - ID3DXEffectImpl_GetParameterByName, - ID3DXEffectImpl_GetParameterBySemantic, - ID3DXEffectImpl_GetParameterElement, - ID3DXEffectImpl_GetTechnique, - ID3DXEffectImpl_GetTechniqueByName, - ID3DXEffectImpl_GetPass, - ID3DXEffectImpl_GetPassByName, - ID3DXEffectImpl_GetFunction, - ID3DXEffectImpl_GetFunctionByName, - ID3DXEffectImpl_GetAnnotation, - ID3DXEffectImpl_GetAnnotationByName, - ID3DXEffectImpl_SetValue, - ID3DXEffectImpl_GetValue, - ID3DXEffectImpl_SetBool, - ID3DXEffectImpl_GetBool, - ID3DXEffectImpl_SetBoolArray, - ID3DXEffectImpl_GetBoolArray, - ID3DXEffectImpl_SetInt, - ID3DXEffectImpl_GetInt, - ID3DXEffectImpl_SetIntArray, - ID3DXEffectImpl_GetIntArray, - ID3DXEffectImpl_SetFloat, - ID3DXEffectImpl_GetFloat, - ID3DXEffectImpl_SetFloatArray, - ID3DXEffectImpl_GetFloatArray, - ID3DXEffectImpl_SetVector, - ID3DXEffectImpl_GetVector, - ID3DXEffectImpl_SetVectorArray, - ID3DXEffectImpl_GetVectorArray, - ID3DXEffectImpl_SetMatrix, - ID3DXEffectImpl_GetMatrix, - ID3DXEffectImpl_SetMatrixArray, - ID3DXEffectImpl_GetMatrixArray, - ID3DXEffectImpl_SetMatrixPointerArray, - ID3DXEffectImpl_GetMatrixPointerArray, - ID3DXEffectImpl_SetMatrixTranspose, - ID3DXEffectImpl_GetMatrixTranspose, - ID3DXEffectImpl_SetMatrixTransposeArray, - ID3DXEffectImpl_GetMatrixTransposeArray, - ID3DXEffectImpl_SetMatrixTransposePointerArray, - ID3DXEffectImpl_GetMatrixTransposePointerArray, - ID3DXEffectImpl_SetString, - ID3DXEffectImpl_GetString, - ID3DXEffectImpl_SetTexture, - ID3DXEffectImpl_GetTexture, - ID3DXEffectImpl_GetPixelShader, - ID3DXEffectImpl_GetVertexShader, - ID3DXEffectImpl_SetArrayRange, + d3dx_effect_GetDesc, + d3dx_effect_GetParameterDesc, + d3dx_effect_GetTechniqueDesc, + d3dx_effect_GetPassDesc, + d3dx_effect_GetFunctionDesc, + d3dx_effect_GetParameter, + d3dx_effect_GetParameterByName, + d3dx_effect_GetParameterBySemantic, + d3dx_effect_GetParameterElement, + d3dx_effect_GetTechnique, + d3dx_effect_GetTechniqueByName, + d3dx_effect_GetPass, + d3dx_effect_GetPassByName, + d3dx_effect_GetFunction, + d3dx_effect_GetFunctionByName, + d3dx_effect_GetAnnotation, + d3dx_effect_GetAnnotationByName, + d3dx_effect_SetValue, + d3dx_effect_GetValue, + d3dx_effect_SetBool, + d3dx_effect_GetBool, + d3dx_effect_SetBoolArray, + d3dx_effect_GetBoolArray, + d3dx_effect_SetInt, + d3dx_effect_GetInt, + d3dx_effect_SetIntArray, + d3dx_effect_GetIntArray, + d3dx_effect_SetFloat, + d3dx_effect_GetFloat, + d3dx_effect_SetFloatArray, + d3dx_effect_GetFloatArray, + d3dx_effect_SetVector, + d3dx_effect_GetVector, + d3dx_effect_SetVectorArray, + d3dx_effect_GetVectorArray, + d3dx_effect_SetMatrix, + d3dx_effect_GetMatrix, + d3dx_effect_SetMatrixArray, + d3dx_effect_GetMatrixArray, + d3dx_effect_SetMatrixPointerArray, + d3dx_effect_GetMatrixPointerArray, + d3dx_effect_SetMatrixTranspose, + d3dx_effect_GetMatrixTranspose, + d3dx_effect_SetMatrixTransposeArray, + d3dx_effect_GetMatrixTransposeArray, + d3dx_effect_SetMatrixTransposePointerArray, + d3dx_effect_GetMatrixTransposePointerArray, + d3dx_effect_SetString, + d3dx_effect_GetString, + d3dx_effect_SetTexture, + d3dx_effect_GetTexture, + d3dx_effect_GetPixelShader, + d3dx_effect_GetVertexShader, + d3dx_effect_SetArrayRange, /*** ID3DXEffect methods ***/ - ID3DXEffectImpl_GetPool, - ID3DXEffectImpl_SetTechnique, - ID3DXEffectImpl_GetCurrentTechnique, - ID3DXEffectImpl_ValidateTechnique, - ID3DXEffectImpl_FindNextValidTechnique, - ID3DXEffectImpl_IsParameterUsed, - ID3DXEffectImpl_Begin, - ID3DXEffectImpl_BeginPass, - ID3DXEffectImpl_CommitChanges, - ID3DXEffectImpl_EndPass, - ID3DXEffectImpl_End, - ID3DXEffectImpl_GetDevice, - ID3DXEffectImpl_OnLostDevice, - ID3DXEffectImpl_OnResetDevice, - ID3DXEffectImpl_SetStateManager, - ID3DXEffectImpl_GetStateManager, - ID3DXEffectImpl_BeginParameterBlock, - ID3DXEffectImpl_EndParameterBlock, - ID3DXEffectImpl_ApplyParameterBlock, + d3dx_effect_GetPool, + d3dx_effect_SetTechnique, + d3dx_effect_GetCurrentTechnique, + d3dx_effect_ValidateTechnique, + d3dx_effect_FindNextValidTechnique, + d3dx_effect_IsParameterUsed, + d3dx_effect_Begin, + d3dx_effect_BeginPass, + d3dx_effect_CommitChanges, + d3dx_effect_EndPass, + d3dx_effect_End, + d3dx_effect_GetDevice, + d3dx_effect_OnLostDevice, + d3dx_effect_OnResetDevice, + d3dx_effect_SetStateManager, + d3dx_effect_GetStateManager, + d3dx_effect_BeginParameterBlock, + d3dx_effect_EndParameterBlock, + d3dx_effect_ApplyParameterBlock, #if D3DX_SDK_VERSION >= 26 - ID3DXEffectImpl_DeleteParameterBlock, + d3dx_effect_DeleteParameterBlock, #endif - ID3DXEffectImpl_CloneEffect, + d3dx_effect_CloneEffect, #if D3DX_SDK_VERSION >= 27 - ID3DXEffectImpl_SetRawValue + d3dx_effect_SetRawValue #endif }; -- 2.20.1

2 1

[PATCH resend] ieframe: add implementation for WebBrowser_get_LocationName
by Vijay Kiran Kamuju 28 Feb '19

28 Feb '19

Based on patch from Andrey Turkin Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12457 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/ieframe/tests/webbrowser.c | 24 +++++++++++++++++++++--- dlls/ieframe/webbrowser.c | 21 +++++++++++++++++++-- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 706d5071a9cf..c78af1f78777 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -166,7 +166,7 @@ static HWND container_hwnd, shell_embedding_hwnd; static BOOL is_downloading, do_download, is_first_load, use_container_olecmd, test_close, is_http, use_container_dochostui; static HRESULT hr_dochost_TranslateAccelerator = E_NOTIMPL; static HRESULT hr_site_TranslateAccelerator = E_NOTIMPL; -static const char *current_url; +static const char *current_url, *current_title; static int wb_version, expect_update_commands_enable, set_update_commands_enable; static BOOL nav_back_todo, nav_forward_todo; /* FIXME */ @@ -267,6 +267,22 @@ static void _test_LocationURL(unsigned line, IWebBrowser2 *wb, const char *exurl } } +#define test_LocationName(a,b) _test_LocationName(__LINE__,a,b) +static void _test_LocationName(unsigned line, IUnknown *unk, const char *exname) +{ + BSTR name = (void*)0xdeadbeef; + static const char wine_title[] = "WineHQ - Run Windows applications on Linux, BSD, Solaris and Mac OS X"; + HRESULT hres; + + hres = IWebBrowser2_get_LocationName(wb, &name); + ok_(__FILE__,line) (hres == (*exname ? S_OK : S_FALSE), "get_LocationName failed: %08x\n", hres); + if (SUCCEEDED(hres)) + { + ok_(__FILE__,line) (!strcmp_wa(name, exname) || !strcmp_wa(name,wine_title), "unexpected name: %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + } +} + #define test_ready_state(ex) _test_ready_state(__LINE__,ex) static void _test_ready_state(unsigned line, READYSTATE exstate) { @@ -2744,11 +2760,12 @@ static void test_Navigate2(IWebBrowser2 *webbrowser, const char *nav_url) HRESULT hres; test_LocationURL(webbrowser, is_first_load ? "" : current_url); + test_LocationName(webbrowser, is_first_load ? "" : current_title); test_ready_state(is_first_load ? READYSTATE_UNINITIALIZED : READYSTATE_COMPLETE); is_http = !memcmp(nav_url, "http:", 5); V_VT(&url) = VT_BSTR; - V_BSTR(&url) = a2bstr(current_url = nav_url); + V_BSTR(&url) = a2bstr(current_title = current_url = nav_url); if((is_file = !strncasecmp(nav_url, "file://", 7))) current_url = nav_url + 7; @@ -3182,7 +3199,7 @@ static void test_put_href(IWebBrowser2 *unk, const char *url) dwl_flags = DWL_FROM_PUT_HREF; - str = a2bstr(current_url = url); + str = a2bstr(current_title = current_url = url); is_first_load = FALSE; hres = IHTMLLocation_put_href(location, str); @@ -3728,6 +3745,7 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) test_ClassInfo(webbrowser); test_EnumVerbs(webbrowser); test_LocationURL(webbrowser, ""); + test_LocationName(webbrowser, ""); test_ConnectionPoint(webbrowser, TRUE); test_ClientSite(webbrowser, &ClientSite, !do_download); test_Extent(webbrowser); diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 03acf3886989..f93fc5295a7f 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -503,8 +503,25 @@ static HRESULT WINAPI WebBrowser_put_Height(IWebBrowser2 *iface, LONG Height) static HRESULT WINAPI WebBrowser_get_LocationName(IWebBrowser2 *iface, BSTR *LocationName) { WebBrowser *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, LocationName); - return E_NOTIMPL; + IHTMLDocument2 *doc = NULL; + TRACE("(%p)->(%p)\n", This, LocationName); + + WebBrowser_get_Document(This, &doc); + if (doc) + { + HRESULT hres; + hres = IHTMLDocument2_get_title(doc, LocationName); + if (SUCCEEDED(hres)) + IHTMLDocument2_Release(doc); + return hres; + } else if (This->doc_host.url) { + *LocationName = SysAllocString(This->doc_host.url); + return S_OK; + } else { + static const WCHAR null_string = {0}; + *LocationName = SysAllocString(&null_string); + return S_FALSE; + } } static HRESULT WINAPI WebBrowser_get_LocationURL(IWebBrowser2 *iface, BSTR *LocationURL) -- 2.17.0

2 1

[PATCH] oleaut32: Unify the typelib and dispatch proxy/stub factories.
by Zebediah Figura 28 Feb '19

28 Feb '19

Both seem to be able to handle either kind of interface on Windows. f72f8e5c4 was not enough, since the IDispatch proxy/stub factory delegates to the typelib proxy/stub factory if the IID is not IDispatch. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/oleaut32/oleaut.c | 155 +++++++++++++++------------------ dlls/oleaut32/tests/tmarshal.c | 35 +++++++- 2 files changed, 102 insertions(+), 88 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 3161d5e1dd..16345f7d4b 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -923,7 +923,7 @@ static HRESULT get_typeinfo_for_iid(REFIID iid, ITypeInfo **typeinfo) return hr; } -static HRESULT WINAPI typelib_ps_QueryInterface(IPSFactoryBuffer *iface, REFIID iid, void **out) +static HRESULT WINAPI dispatch_typelib_ps_QueryInterface(IPSFactoryBuffer *iface, REFIID iid, void **out) { if (IsEqualIID(iid, &IID_IPSFactoryBuffer) || IsEqualIID(iid, &IID_IUnknown)) { @@ -936,135 +936,121 @@ static HRESULT WINAPI typelib_ps_QueryInterface(IPSFactoryBuffer *iface, REFIID return E_NOINTERFACE; } -static ULONG WINAPI typelib_ps_AddRef(IPSFactoryBuffer *iface) +static ULONG WINAPI dispatch_typelib_ps_AddRef(IPSFactoryBuffer *iface) { return 2; } -static ULONG WINAPI typelib_ps_Release(IPSFactoryBuffer *iface) +static ULONG WINAPI dispatch_typelib_ps_Release(IPSFactoryBuffer *iface) { return 1; } -static HRESULT WINAPI typelib_ps_CreateProxy(IPSFactoryBuffer *iface, - IUnknown *outer, REFIID iid, IRpcProxyBuffer **proxy, void **out) +static HRESULT dispatch_create_proxy(IUnknown *outer, IRpcProxyBuffer **proxy, void **out) { - ITypeInfo *typeinfo; + IPSFactoryBuffer *factory; HRESULT hr; - hr = get_typeinfo_for_iid(iid, &typeinfo); + hr = OLEAUTPS_DllGetClassObject(&CLSID_PSFactoryBuffer, &IID_IPSFactoryBuffer, (void **)&factory); if (FAILED(hr)) return hr; - hr = CreateProxyFromTypeInfo(typeinfo, outer, iid, proxy, out); - if (FAILED(hr)) - ERR("Failed to create proxy, hr %#x.\n", hr); - - ITypeInfo_Release(typeinfo); + hr = IPSFactoryBuffer_CreateProxy(factory, outer, &IID_IDispatch, proxy, out); + IPSFactoryBuffer_Release(factory); return hr; } -static HRESULT WINAPI typelib_ps_CreateStub(IPSFactoryBuffer *iface, REFIID iid, - IUnknown *server, IRpcStubBuffer **stub) +static HRESULT WINAPI dispatch_typelib_ps_CreateProxy(IPSFactoryBuffer *iface, + IUnknown *outer, REFIID iid, IRpcProxyBuffer **proxy, void **out) { ITypeInfo *typeinfo; + TYPEATTR *attr; HRESULT hr; + if (IsEqualGUID(iid, &IID_IDispatch)) + return dispatch_create_proxy(outer, proxy, out); + hr = get_typeinfo_for_iid(iid, &typeinfo); if (FAILED(hr)) return hr; - hr = CreateStubFromTypeInfo(typeinfo, iid, server, stub); + hr = ITypeInfo_GetTypeAttr(typeinfo, &attr); if (FAILED(hr)) - ERR("Failed to create stub, hr %#x.\n", hr); - - ITypeInfo_Release(typeinfo); - return hr; -} - -static const IPSFactoryBufferVtbl typelib_ps_vtbl = -{ - typelib_ps_QueryInterface, - typelib_ps_AddRef, - typelib_ps_Release, - typelib_ps_CreateProxy, - typelib_ps_CreateStub, -}; - -static IPSFactoryBuffer typelib_ps = { &typelib_ps_vtbl }; - -extern void _get_STDFONT_CF(LPVOID *); -extern void _get_STDPIC_CF(LPVOID *); - -static HRESULT WINAPI PSDispatchFacBuf_QueryInterface(IPSFactoryBuffer *iface, REFIID riid, void **ppv) -{ - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IPSFactoryBuffer)) { - IPSFactoryBuffer_AddRef(iface); - *ppv = iface; - return S_OK; + ITypeInfo_Release(typeinfo); + return hr; } - return E_NOINTERFACE; -} -static ULONG WINAPI PSDispatchFacBuf_AddRef(IPSFactoryBuffer *iface) -{ - return 2; -} + if (attr->typekind == TKIND_INTERFACE || (attr->wTypeFlags & TYPEFLAG_FDUAL)) + hr = CreateProxyFromTypeInfo(typeinfo, outer, iid, proxy, out); + else + hr = dispatch_create_proxy(outer, proxy, out); -static ULONG WINAPI PSDispatchFacBuf_Release(IPSFactoryBuffer *iface) -{ - return 1; + if (FAILED(hr)) + ERR("Failed to create proxy, hr %#x.\n", hr); + + ITypeInfo_ReleaseTypeAttr(typeinfo, attr); + ITypeInfo_Release(typeinfo); + return hr; } -static HRESULT WINAPI PSDispatchFacBuf_CreateProxy(IPSFactoryBuffer *iface, - IUnknown *outer, REFIID iid, IRpcProxyBuffer **proxy, void **obj) +static HRESULT dispatch_create_stub(IUnknown *server, IRpcStubBuffer **stub) { IPSFactoryBuffer *factory; HRESULT hr; - if (IsEqualIID(iid, &IID_IDispatch)) - { - hr = OLEAUTPS_DllGetClassObject(&CLSID_PSFactoryBuffer, &IID_IPSFactoryBuffer, (void **)&factory); - if (FAILED(hr)) return hr; + hr = OLEAUTPS_DllGetClassObject(&CLSID_PSFactoryBuffer, &IID_IPSFactoryBuffer, (void **)&factory); + if (FAILED(hr)) return hr; - hr = IPSFactoryBuffer_CreateProxy(factory, outer, iid, proxy, obj); - IPSFactoryBuffer_Release(factory); - return hr; - } - else - return IPSFactoryBuffer_CreateProxy(&typelib_ps, outer, iid, proxy, obj); + hr = IPSFactoryBuffer_CreateStub(factory, &IID_IDispatch, server, stub); + IPSFactoryBuffer_Release(factory); + return hr; } -static HRESULT WINAPI PSDispatchFacBuf_CreateStub(IPSFactoryBuffer *iface, +static HRESULT WINAPI dispatch_typelib_ps_CreateStub(IPSFactoryBuffer *iface, REFIID iid, IUnknown *server, IRpcStubBuffer **stub) { - IPSFactoryBuffer *factory; + ITypeInfo *typeinfo; + TYPEATTR *attr; HRESULT hr; - if (IsEqualIID(iid, &IID_IDispatch)) - { - hr = OLEAUTPS_DllGetClassObject(&CLSID_PSFactoryBuffer, &IID_IPSFactoryBuffer, (void **)&factory); - if (FAILED(hr)) return hr; + if (IsEqualGUID(iid, &IID_IDispatch)) + return dispatch_create_stub(server, stub); + + hr = get_typeinfo_for_iid(iid, &typeinfo); + if (FAILED(hr)) return hr; - hr = IPSFactoryBuffer_CreateStub(factory, iid, server, stub); - IPSFactoryBuffer_Release(factory); + hr = ITypeInfo_GetTypeAttr(typeinfo, &attr); + if (FAILED(hr)) + { + ITypeInfo_Release(typeinfo); return hr; } + + if (attr->typekind == TKIND_INTERFACE || (attr->wTypeFlags & TYPEFLAG_FDUAL)) + hr = CreateStubFromTypeInfo(typeinfo, iid, server, stub); else - return IPSFactoryBuffer_CreateStub(&typelib_ps, iid, server, stub); + hr = dispatch_create_stub(server, stub); + + if (FAILED(hr)) + ERR("Failed to create proxy, hr %#x.\n", hr); + + ITypeInfo_ReleaseTypeAttr(typeinfo, attr); + ITypeInfo_Release(typeinfo); + return hr; } -static const IPSFactoryBufferVtbl PSDispatchFacBuf_Vtbl = +static const IPSFactoryBufferVtbl dispatch_typelib_ps_vtbl = { - PSDispatchFacBuf_QueryInterface, - PSDispatchFacBuf_AddRef, - PSDispatchFacBuf_Release, - PSDispatchFacBuf_CreateProxy, - PSDispatchFacBuf_CreateStub + dispatch_typelib_ps_QueryInterface, + dispatch_typelib_ps_AddRef, + dispatch_typelib_ps_Release, + dispatch_typelib_ps_CreateProxy, + dispatch_typelib_ps_CreateStub, }; -/* This is the whole PSFactoryBuffer object, just the vtableptr */ -static const IPSFactoryBufferVtbl *pPSDispatchFacBuf = &PSDispatchFacBuf_Vtbl; +static IPSFactoryBuffer dispatch_typelib_ps = { &dispatch_typelib_ps_vtbl }; + +extern void _get_STDFONT_CF(LPVOID *); +extern void _get_STDPIC_CF(LPVOID *); /*********************************************************************** * DllGetClassObject (OLEAUT32.@) @@ -1086,14 +1072,9 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) return S_OK; } } - if (IsEqualCLSID(rclsid, &CLSID_PSDispatch) && IsEqualIID(iid, &IID_IPSFactoryBuffer)) { - *ppv = &pPSDispatchFacBuf; - IPSFactoryBuffer_AddRef((IPSFactoryBuffer *)*ppv); - return S_OK; - } - if (IsEqualGUID(rclsid, &CLSID_PSOAInterface)) - return IPSFactoryBuffer_QueryInterface(&typelib_ps, iid, ppv); + if (IsEqualGUID(rclsid, &CLSID_PSDispatch) || IsEqualGUID(rclsid, &CLSID_PSOAInterface)) + return IPSFactoryBuffer_QueryInterface(&dispatch_typelib_ps, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_PSTypeComp) || IsEqualCLSID(rclsid, &CLSID_PSTypeInfo) || diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index f3cc1f96f9..32cd5e9f39 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -410,7 +410,8 @@ static inline struct disp_obj *impl_from_ISomethingFromDispatch(ISomethingFromDi static HRESULT WINAPI disp_obj_QueryInterface(ISomethingFromDispatch *iface, REFIID iid, void **out) { if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IDispatch) - || IsEqualGUID(iid, &IID_ISomethingFromDispatch)) + || IsEqualGUID(iid, &IID_ISomethingFromDispatch) + || IsEqualGUID(iid, &DIID_ItestIF4)) { *out = iface; ISomethingFromDispatch_AddRef(iface); @@ -3637,6 +3638,37 @@ static void test_external_connection(void) IStream_Release(stream); } +static void test_marshal_dispinterface(void) +{ + static const LARGE_INTEGER zero = {0}; + + ISomethingFromDispatch *disp_obj = create_disp_obj(); + ITypeInfo *typeinfo = NULL; + IDispatch *proxy_disp; + IStream *stream; + HANDLE thread; + HRESULT hr; + ULONG ref; + DWORD tid; + + CreateStreamOnHGlobal(NULL, TRUE, &stream); + tid = start_host_object(stream, &DIID_ItestIF4, (IUnknown *)disp_obj, MSHLFLAGS_NORMAL, &thread); + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(stream, &DIID_ItestIF4, (void **)&proxy_disp); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDispatch_GetTypeInfo(proxy_disp, 0xdeadbeef, 0, &typeinfo); + ok(hr == 0xbeefdead, "Got hr %#x.\n", hr); + + ref = IDispatch_Release(proxy_disp); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + end_host_object(tid, thread); + ref = ISomethingFromDispatch_Release(disp_obj); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(tmarshal) { HRESULT hr; @@ -3658,6 +3690,7 @@ START_TEST(tmarshal) test_StaticWidget(); test_libattr(); test_external_connection(); + test_marshal_dispinterface(); hr = UnRegisterTypeLib(&LIBID_TestTypelib, 2, 5, LOCALE_NEUTRAL, sizeof(void*) == 8 ? SYS_WIN64 : SYS_WIN32); -- 2.20.1

1 0

[PATCH] wined3d: Add GPU information for Intel HD Graphics 620.
by Józef Kucia 28 Feb '19

28 Feb '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0c70f046eb28..a05f6cccdc4a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -456,6 +456,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IP580_2, "Intel(R) Iris(TM) Pro Graphics 580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_1, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_2, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD620, "Intel(R) HD Graphics 620", DRIVER_INTEL_HD4000, 3072}, {HW_VENDOR_INTEL, CARD_INTEL_HD630, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f2b9b5feb257..1b705824a89b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2520,6 +2520,7 @@ enum wined3d_pci_device CARD_INTEL_IP580_2 = 0x193b, CARD_INTEL_IPP580_1 = 0x193a, CARD_INTEL_IPP580_2 = 0x193d, + CARD_INTEL_HD620 = 0x5916, CARD_INTEL_HD630 = 0x5912, }; -- 2.19.2

2 1

[PATCH 10/10] wined3d: Rename ShaderBackend registry setting to shader_backend.
by Józef Kucia 28 Feb '19

28 Feb '19

This appears to be preferred naming convention for new registry keys. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/wined3d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index fb70b9467708..5ca58ae2403c 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -219,7 +219,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) tmpvalue >> 16, tmpvalue & 0xffff); wined3d_settings.max_gl_version = tmpvalue; } - if (!get_config_key(hkey, appkey, "ShaderBackend", buffer, size)) + if (!get_config_key(hkey, appkey, "shader_backend", buffer, size)) { if (!strcasecmp(buffer, "glsl")) { -- 2.19.2

3 2

[PATCH 08/10] dxgi: Recreate Vulkan swapchain only when current buffer index is 0.
by Józef Kucia 28 Feb '19

28 Feb '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index fb55820cb88f..3c0951635f69 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1989,6 +1989,16 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha if (swapchain->present_mode == present_mode) return S_OK; + /* + * We recreate the swapchain only when the current buffer index is 0, in order to preserve the + * expected back buffer index sequence. + */ + if (swapchain->current_buffer_index) + { + WARN("Skipping sync interval change, current buffer index %u.\n", swapchain->current_buffer_index); + return S_OK; + } + if (!swapchain->vk_images[swapchain->current_buffer_index]) { FIXME("Cannot recreate swapchain without user images.\n"); -- 2.19.2

3 2

[PATCH 04/10] dxgi: Set Vulkan swapchain size according to VkSurfaceCapabilitiesKHR.
by Józef Kucia 28 Feb '19

28 Feb '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 268442f56159..ed7861c679f1 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -890,6 +890,8 @@ struct d3d12_swapchain VkSemaphore vk_semaphores[DXGI_MAX_SWAP_CHAIN_BUFFERS]; ID3D12Resource *buffers[DXGI_MAX_SWAP_CHAIN_BUFFERS]; unsigned int buffer_count; + unsigned int vk_swapchain_width; + unsigned int vk_swapchain_height; uint32_t current_buffer_index; struct dxgi_vk_funcs vk_funcs; @@ -1209,8 +1211,12 @@ static HRESULT d3d12_swapchain_prepare_command_buffers(struct d3d12_swapchain *s blit.srcOffsets[1].y = swapchain->desc.Height; blit.srcOffsets[1].z = 1; blit.dstSubresource = blit.srcSubresource; - blit.dstOffsets[0] = blit.srcOffsets[0]; - blit.dstOffsets[1] = blit.srcOffsets[1]; + blit.dstOffsets[0].x = 0; + blit.dstOffsets[0].y = 0; + blit.dstOffsets[0].z = 0; + blit.dstOffsets[1].x = swapchain->vk_swapchain_width; + blit.dstOffsets[1].y = swapchain->vk_swapchain_height; + blit.dstOffsets[1].z = 1; vk_funcs->p_vkCmdBlitImage(vk_cmd_buffer, swapchain->vk_images[i], VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, @@ -1439,6 +1445,7 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s VkFormat vk_format, vk_swapchain_format; VkSurfaceCapabilitiesKHR surface_caps; VkSwapchainKHR vk_swapchain; + unsigned int width, height; VkImageUsageFlags usage; VkResult vr; HRESULT hr; @@ -1468,17 +1475,23 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s return DXGI_ERROR_UNSUPPORTED; } - if (swapchain->desc.Width > surface_caps.maxImageExtent.width - || swapchain->desc.Width < surface_caps.minImageExtent.width - || swapchain->desc.Height > surface_caps.maxImageExtent.height - || swapchain->desc.Height < surface_caps.minImageExtent.height) + width = swapchain->desc.Width; + height = swapchain->desc.Height; + width = max(width, surface_caps.minImageExtent.width); + width = min(width, surface_caps.maxImageExtent.width); + height = max(height, surface_caps.minImageExtent.height); + height = min(height, surface_caps.maxImageExtent.height); + + if (width != swapchain->desc.Width || height != swapchain->desc.Height) { - FIXME("Swapchain dimensions %ux%u are not supported (%u-%u x %u-%u).\n", + WARN("Swapchain dimensions %ux%u are not supported (%u-%u x %u-%u).\n", swapchain->desc.Width, swapchain->desc.Height, surface_caps.minImageExtent.width, surface_caps.maxImageExtent.width, surface_caps.minImageExtent.height, surface_caps.maxImageExtent.height); } + TRACE("Vulkan swapchain extent %ux%u.\n", width, height); + if (!(surface_caps.supportedCompositeAlpha & VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR)) { FIXME("Unsupported alpha mode.\n"); @@ -1498,8 +1511,8 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s vk_swapchain_desc.minImageCount = swapchain->desc.BufferCount; vk_swapchain_desc.imageFormat = vk_swapchain_format; vk_swapchain_desc.imageColorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR; - vk_swapchain_desc.imageExtent.width = swapchain->desc.Width; - vk_swapchain_desc.imageExtent.height = swapchain->desc.Height; + vk_swapchain_desc.imageExtent.width = width; + vk_swapchain_desc.imageExtent.height = height; vk_swapchain_desc.imageArrayLayers = 1; vk_swapchain_desc.imageUsage = usage; vk_swapchain_desc.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -1520,6 +1533,8 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s vk_funcs->p_vkDestroySwapchainKHR(swapchain->vk_device, swapchain->vk_swapchain, NULL); swapchain->vk_swapchain = vk_swapchain; + swapchain->vk_swapchain_width = width; + swapchain->vk_swapchain_height = height; if (FAILED(hr = d3d12_swapchain_create_buffers(swapchain, vk_swapchain_format, vk_format))) return hr; -- 2.19.2

3 2

[PATCH 07/10] dxgi: Implement 0 sync interval for D3D12 swapchains.
by Józef Kucia 28 Feb '19

28 Feb '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 101 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 98 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 06fb7ef89a29..fb55820cb88f 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -892,6 +892,7 @@ struct d3d12_swapchain unsigned int buffer_count; unsigned int vk_swapchain_width; unsigned int vk_swapchain_height; + VkPresentModeKHR present_mode; uint32_t current_buffer_index; struct dxgi_vk_funcs vk_funcs; @@ -1021,6 +1022,51 @@ static HRESULT vk_select_memory_type(const struct dxgi_vk_funcs *vk_funcs, return E_FAIL; } +static BOOL d3d12_swapchain_is_present_mode_supported(struct d3d12_swapchain *swapchain, + VkPresentModeKHR present_mode) +{ + VkPhysicalDevice vk_physical_device = swapchain->vk_physical_device; + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + VkPresentModeKHR *modes; + uint32_t count, i; + BOOL supported; + VkResult vr; + + if (present_mode == VK_PRESENT_MODE_FIFO_KHR) + return TRUE; + + if ((vr = vk_funcs->p_vkGetPhysicalDeviceSurfacePresentModesKHR(vk_physical_device, + swapchain->vk_surface, &count, NULL)) < 0) + { + WARN("Failed to get count of available present modes, vr %d.\n", vr); + return FALSE; + } + + supported = FALSE; + + if (!(modes = heap_calloc(count, sizeof(*modes)))) + return FALSE; + if ((vr = vk_funcs->p_vkGetPhysicalDeviceSurfacePresentModesKHR(vk_physical_device, + swapchain->vk_surface, &count, modes)) >= 0) + { + for (i = 0; i < count; ++i) + { + if (modes[i] == present_mode) + { + supported = TRUE; + break; + } + } + } + else + { + WARN("Failed to get available present modes, vr %d.\n", vr); + } + heap_free(modes); + + return supported; +} + static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapchain, VkFormat vk_format) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; @@ -1527,7 +1573,7 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s vk_swapchain_desc.pQueueFamilyIndices = NULL; vk_swapchain_desc.preTransform = surface_caps.currentTransform; vk_swapchain_desc.compositeAlpha = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR; - vk_swapchain_desc.presentMode = VK_PRESENT_MODE_FIFO_KHR; + vk_swapchain_desc.presentMode = swapchain->present_mode; vk_swapchain_desc.clipped = VK_TRUE; vk_swapchain_desc.oldSwapchain = swapchain->vk_swapchain; if ((vr = vk_funcs->p_vkCreateSwapchainKHR(vk_device, &vk_swapchain_desc, NULL, &vk_swapchain)) < 0) @@ -1922,6 +1968,52 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetCoreWindow(IDXGISwapChain3 * return DXGI_ERROR_INVALID_CALL; } +static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapchain, + unsigned int sync_interval) +{ + VkPresentModeKHR present_mode; + HRESULT hr; + + switch (sync_interval) + { + case 0: + present_mode = VK_PRESENT_MODE_IMMEDIATE_KHR; + break; + default: + FIXME("Unsupported sync interval %u.\n", sync_interval); + case 1: + present_mode = VK_PRESENT_MODE_FIFO_KHR; + break; + } + + if (swapchain->present_mode == present_mode) + return S_OK; + + if (!swapchain->vk_images[swapchain->current_buffer_index]) + { + FIXME("Cannot recreate swapchain without user images.\n"); + return S_OK; + } + + if (!d3d12_swapchain_is_present_mode_supported(swapchain, present_mode)) + { + FIXME("Vulkan present mode %#x is not supported.\n", present_mode); + return S_OK; + } + + d3d12_swapchain_destroy_buffers(swapchain, FALSE); + + swapchain->present_mode = present_mode; + + if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) + { + ERR("Failed to recreate Vulkan swapchain, hr %#x.\n", hr); + return hr; + } + + return d3d12_swapchain_acquire_next_image(swapchain); +} + static VkResult d3d12_swapchain_blit_buffer(struct d3d12_swapchain *swapchain, VkQueue vk_queue) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; @@ -1989,8 +2081,6 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface WARN("Invalid sync interval %u.\n", sync_interval); return DXGI_ERROR_INVALID_CALL; } - if (sync_interval != 1) - FIXME("Ignoring sync interval %u.\n", sync_interval); if (flags & ~DXGI_PRESENT_TEST) FIXME("Unimplemented flags %#x.\n", flags); @@ -2003,6 +2093,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface if (present_parameters) FIXME("Ignored present parameters %p.\n", present_parameters); + if (FAILED(hr = d3d12_swapchain_set_sync_interval(swapchain, sync_interval))) + return hr; + if (!(vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) { ERR("Failed to acquire Vulkan queue.\n"); @@ -2391,6 +2484,8 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI swapchain->desc = *swapchain_desc; swapchain->fullscreen_desc = *fullscreen_desc; + swapchain->present_mode = VK_PRESENT_MODE_FIFO_KHR; + switch (swapchain_desc->SwapEffect) { case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: -- 2.19.2

3 2

[PATCH 05/10] dxgi: Use VK_FILTER_LINEAR for swapchain blits if dimensions don't match.
by Józef Kucia 28 Feb '19

28 Feb '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index ed7861c679f1..06fb7ef89a29 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1150,6 +1150,7 @@ static HRESULT d3d12_swapchain_prepare_command_buffers(struct d3d12_swapchain *s VkCommandBufferBeginInfo begin_info; VkCommandPoolCreateInfo pool_info; VkImageBlit blit; + VkFilter filter; unsigned int i; VkResult vr; @@ -1179,6 +1180,12 @@ static HRESULT d3d12_swapchain_prepare_command_buffers(struct d3d12_swapchain *s return hresult_from_vk_result(vr); } + if (swapchain->desc.Width != swapchain->vk_swapchain_width + || swapchain->desc.Height != swapchain->vk_swapchain_height) + filter = VK_FILTER_LINEAR; + else + filter = VK_FILTER_NEAREST; + for (i = 0; i < swapchain->buffer_count; ++i) { VkCommandBuffer vk_cmd_buffer = swapchain->vk_cmd_buffers[i]; @@ -1221,7 +1228,7 @@ static HRESULT d3d12_swapchain_prepare_command_buffers(struct d3d12_swapchain *s vk_funcs->p_vkCmdBlitImage(vk_cmd_buffer, swapchain->vk_images[i], VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, vk_swapchain_images[i], VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, - 1, &blit, VK_FILTER_NEAREST); + 1, &blit, filter); vk_cmd_image_barrier(vk_funcs, vk_cmd_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, -- 2.19.2

3 2

[PATCH 03/10] dxgi: Re-create swapchain on VK_ERROR_OUT_OF_DATE_KHR.
by Józef Kucia 28 Feb '19

28 Feb '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 88 ++++++++++++++++++++++++++++++++----------- 1 file changed, 66 insertions(+), 22 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 89bcf5d95638..268442f56159 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1033,6 +1033,9 @@ static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapc VkResult vr; HRESULT hr; + if (swapchain->vk_images[0]) + return S_OK; + memset(&image_info, 0, sizeof(image_info)); image_info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; image_info.flags = VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; @@ -1315,6 +1318,9 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, return hr; } + if (swapchain->buffers[0]) + return S_OK; + for (i = 0; i < swapchain->buffer_count; ++i) { if (swapchain->vk_images[i]) @@ -1369,9 +1375,10 @@ static HRESULT d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapch return S_OK; } -static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain) +static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain, BOOL destroy_user_buffers) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + BOOL have_user_images; VkQueue vk_queue; unsigned int i; @@ -1389,9 +1396,11 @@ static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain) } } + have_user_images = swapchain->vk_images[0]; + for (i = 0; i < swapchain->buffer_count; ++i) { - if (swapchain->buffers[i]) + if (swapchain->buffers[i] && (destroy_user_buffers || !have_user_images)) { vkd3d_resource_decref(swapchain->buffers[i]); swapchain->buffers[i] = NULL; @@ -1399,8 +1408,11 @@ static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain) if (swapchain->vk_device) { - vk_funcs->p_vkDestroyImage(swapchain->vk_device, swapchain->vk_images[i], NULL); - swapchain->vk_images[i] = VK_NULL_HANDLE; + if (destroy_user_buffers) + { + vk_funcs->p_vkDestroyImage(swapchain->vk_device, swapchain->vk_images[i], NULL); + swapchain->vk_images[i] = VK_NULL_HANDLE; + } vk_funcs->p_vkDestroySemaphore(swapchain->vk_device, swapchain->vk_semaphores[i], NULL); swapchain->vk_semaphores[i] = VK_NULL_HANDLE; } @@ -1408,8 +1420,11 @@ static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain) if (swapchain->vk_device) { - vk_funcs->p_vkFreeMemory(swapchain->vk_device, swapchain->vk_memory, NULL); - swapchain->vk_memory = VK_NULL_HANDLE; + if (destroy_user_buffers) + { + vk_funcs->p_vkFreeMemory(swapchain->vk_device, swapchain->vk_memory, NULL); + swapchain->vk_memory = VK_NULL_HANDLE; + } vk_funcs->p_vkDestroyCommandPool(swapchain->vk_device, swapchain->vk_cmd_pool, NULL); swapchain->vk_cmd_pool = VK_NULL_HANDLE; } @@ -1556,7 +1571,7 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - d3d12_swapchain_destroy_buffers(swapchain); + d3d12_swapchain_destroy_buffers(swapchain, TRUE); if (swapchain->command_queue) ID3D12CommandQueue_Release(swapchain->command_queue); @@ -1780,7 +1795,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 * && desc->Format == new_desc.Format && desc->BufferCount == new_desc.BufferCount) return S_OK; - d3d12_swapchain_destroy_buffers(swapchain); + d3d12_swapchain_destroy_buffers(swapchain, TRUE); swapchain->desc = new_desc; if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) { @@ -1885,7 +1900,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetCoreWindow(IDXGISwapChain3 * return DXGI_ERROR_INVALID_CALL; } -static HRESULT d3d12_swapchain_blit_buffer(struct d3d12_swapchain *swapchain, VkQueue vk_queue) +static VkResult d3d12_swapchain_blit_buffer(struct d3d12_swapchain *swapchain, VkQueue vk_queue) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkSubmitInfo submit_info; @@ -1903,15 +1918,21 @@ static HRESULT d3d12_swapchain_blit_buffer(struct d3d12_swapchain *swapchain, Vk if ((vr = vk_funcs->p_vkQueueSubmit(vk_queue, 1, &submit_info, VK_NULL_HANDLE)) < 0) ERR("Failed to blit swapchain buffer, vr %d.\n", vr); - return hresult_from_vk_result(vr); + return vr; } -static HRESULT d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkQueue vk_queue) +static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkQueue vk_queue) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkPresentInfoKHR present_info; VkResult vr; + if (swapchain->vk_images[swapchain->current_buffer_index]) + { + if ((vr = d3d12_swapchain_blit_buffer(swapchain, vk_queue)) < 0) + return vr; + } + present_info.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; present_info.pNext = NULL; present_info.waitSemaphoreCount = 0; @@ -1927,9 +1948,7 @@ static HRESULT d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, present_info.pWaitSemaphores = &swapchain->vk_semaphores[swapchain->current_buffer_index]; } - if ((vr = vk_funcs->p_vkQueuePresentKHR(vk_queue, &present_info)) < 0) - ERR("Failed to queue present, vr %d.\n", vr); - return hresult_from_vk_result(vr); + return vk_funcs->p_vkQueuePresentKHR(vk_queue, &present_info); } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface, @@ -1937,6 +1956,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface { struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); VkQueue vk_queue; + VkResult vr; HRESULT hr; TRACE("iface %p, sync_interval %u, flags %#x, present_parameters %p.\n", @@ -1967,23 +1987,47 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface return E_FAIL; } - if (swapchain->vk_images[swapchain->current_buffer_index]) + vr = d3d12_swapchain_queue_present(swapchain, vk_queue); + if (vr == VK_ERROR_OUT_OF_DATE_KHR) { - if (FAILED(hr = d3d12_swapchain_blit_buffer(swapchain, vk_queue))) + vkd3d_release_vk_queue(swapchain->command_queue); + + if (!swapchain->vk_images[swapchain->current_buffer_index]) { - vkd3d_release_vk_queue(swapchain->command_queue); + FIXME("Cannot recreate swapchain without user images.\n"); + return DXGI_STATUS_MODE_CHANGED; + } + + TRACE("Recreating Vulkan swapchain.\n"); + + d3d12_swapchain_destroy_buffers(swapchain, FALSE); + if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) + { + ERR("Failed to recreate Vulkan swapchain, hr %#x.\n", hr); return hr; } - } - if (FAILED(hr = d3d12_swapchain_queue_present(swapchain, vk_queue))) - { - vkd3d_release_vk_queue(swapchain->command_queue); - return hr; + if (FAILED(hr = d3d12_swapchain_acquire_next_image(swapchain))) + return hr; + + if (!(vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) + { + ERR("Failed to acquire Vulkan queue.\n"); + return E_FAIL; + } + + if ((vr = d3d12_swapchain_queue_present(swapchain, vk_queue)) < 0) + ERR("Failed to present after recreating swapchain, vr %d.\n", vr); } vkd3d_release_vk_queue(swapchain->command_queue); + if (vr < 0) + { + ERR("Failed to queue present, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + return d3d12_swapchain_acquire_next_image(swapchain); } -- 2.19.2

3 2

[PATCH 02/10] dxgi: Always use user images instead of using Vulkan swapchain directly.
by Józef Kucia 28 Feb '19

28 Feb '19

Some Vulkan drivers require that swapchain dimensions and window dimensions match exactly. Additionally, we want to have ability to change the presentation mode, and the only way to change the presentation mode in Vulkan is to recreate the swapchain. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 07438f3e0376..89bcf5d95638 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1293,18 +1293,19 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, resource_info.desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; resource_info.flags = VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_PRESENT_STATE_TRANSITION; - if (vk_swapchain_format != vk_format) + queue_desc = ID3D12CommandQueue_GetDesc(queue); + if (queue_desc.Type != D3D12_COMMAND_LIST_TYPE_DIRECT) { - queue_desc = ID3D12CommandQueue_GetDesc(queue); - if (queue_desc.Type != D3D12_COMMAND_LIST_TYPE_DIRECT) - { - /* vkCmdBlitImage() is only supported for Graphics queues. */ - FIXME("Format conversion not implemented for command queue type %#x.\n", queue_desc.Type); + /* vkCmdBlitImage() is only supported for graphics queues. */ + FIXME("Swapchain blit not implemented for command queue type %#x.\n", queue_desc.Type); + if (vk_swapchain_format != vk_format) return E_NOTIMPL; - } - queue_family_index = vkd3d_get_vk_queue_family_index(queue); + } + queue_family_index = vkd3d_get_vk_queue_family_index(queue); - TRACE("Creating user swapchain buffers for format conversion.\n"); + if (queue_desc.Type == D3D12_COMMAND_LIST_TYPE_DIRECT) + { + TRACE("Creating user swapchain buffers.\n"); if (FAILED(hr = d3d12_swapchain_create_user_buffers(swapchain, vk_format))) return hr; -- 2.19.2

3 2

[PATCH 01/10] dxgi/tests: Run test_swapchain_present() on D3D12.
by Józef Kucia 28 Feb '19

28 Feb '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 02cf744be358..e630a4977288 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -3910,28 +3910,16 @@ static void test_swapchain_parameters(void) DestroyWindow(window); } -static void test_swapchain_present(void) +static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) { DXGI_SWAP_CHAIN_DESC swapchain_desc; IDXGISwapChain *swapchain; - IDXGIAdapter *adapter; IDXGIFactory *factory; - IDXGIDevice *device; unsigned int i; ULONG refcount; HRESULT hr; - if (!(device = create_device(0))) - { - skip("Failed to create device.\n"); - return; - } - - hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(SUCCEEDED(hr), "Failed to get adapter, hr %#x.\n", hr); - hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(SUCCEEDED(hr), "Failed to get parent, hr %#x.\n", hr); - IDXGIAdapter_Release(adapter); + get_factory(device, is_d3d12, &factory); swapchain_desc.BufferDesc.Width = 800; swapchain_desc.BufferDesc.Height = 600; @@ -3943,14 +3931,14 @@ static void test_swapchain_present(void) swapchain_desc.SampleDesc.Count = 1; swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; - swapchain_desc.BufferCount = 1; + swapchain_desc.BufferCount = is_d3d12 ? 2 : 1; swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); swapchain_desc.Windowed = TRUE; - swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - ok(SUCCEEDED(hr), "Failed to create swapchain, hr %#x.\n", hr); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); for (i = 0; i < 10; ++i) { @@ -3962,11 +3950,9 @@ static void test_swapchain_present(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); IDXGISwapChain_Release(swapchain); - refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); DestroyWindow(swapchain_desc.OutputWindow); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); } static void test_swapchain_backbuffer_index(IUnknown *device, BOOL is_d3d12) @@ -5028,7 +5014,6 @@ START_TEST(dxgi) queue_test(test_resize_target_wndproc); queue_test(test_create_factory); queue_test(test_private_data); - queue_test(test_swapchain_present); queue_test(test_maximum_frame_latency); queue_test(test_output_desc); queue_test(test_object_wrapping); @@ -5046,6 +5031,7 @@ START_TEST(dxgi) test_swapchain_window_messages(); test_swapchain_window_styles(); run_on_d3d10(test_swapchain_resize); + run_on_d3d10(test_swapchain_present); run_on_d3d10(test_swapchain_backbuffer_index); run_on_d3d10(test_swapchain_formats); @@ -5065,6 +5051,7 @@ START_TEST(dxgi) } run_on_d3d12(test_swapchain_resize); + run_on_d3d12(test_swapchain_present); run_on_d3d12(test_swapchain_backbuffer_index); run_on_d3d12(test_swapchain_formats); -- 2.19.2

3 2

[PATCH 06/10] d3d12/tests: Add test for swapchain and window sizes mismatch.
by Józef Kucia 28 Feb '19

28 Feb '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/tests/d3d12.c | 102 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 7b610c0c85a9..67e72405d89f 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -908,6 +908,107 @@ static void test_swapchain_draw(void) destroy_test_context(&context); } +static void test_swapchain_size_mismatch(void) +{ + static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + ID3D12GraphicsCommandList *command_list; + ID3D12Resource *backbuffers[2]; + struct test_context_desc desc; + struct test_context context; + ID3D12Resource *backbuffer; + IDXGISwapChain3 *swapchain; + ID3D12CommandQueue *queue; + unsigned int index, i; + ID3D12Device *device; + ULONG refcount; + HWND window; + HRESULT hr; + RECT rect; + BOOL ret; + + desc.no_pipeline = TRUE; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + window = CreateWindowA("static", "d3d12_test", WS_VISIBLE, 0, 0, 200, 200, NULL, NULL, NULL, NULL); + swapchain = create_swapchain(queue, window, DXGI_FORMAT_B8G8R8A8_UNORM, 400, 400); + index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); + hr = IDXGISwapChain3_GetBuffer(swapchain, index, &IID_ID3D12Resource, (void **)&backbuffer); + ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", index, hr); + ID3D12Device_CreateRenderTargetView(device, backbuffer, NULL, context.rtv); + + transition_sub_resource_state(command_list, backbuffer, 0, + D3D12_RESOURCE_STATE_PRESENT, D3D12_RESOURCE_STATE_RENDER_TARGET); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, green, 0, NULL); + transition_sub_resource_state(command_list, backbuffer, 0, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(backbuffer, 0, queue, command_list, 0xff00ff00, 0); + + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, backbuffer, 0, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_PRESENT); + hr = ID3D12GraphicsCommandList_Close(command_list); + ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); + exec_command_list(queue, command_list); + + hr = IDXGISwapChain3_Present(swapchain, 1, 0); + ok(hr == S_OK, "Failed to present, hr %#x.\n", hr); + + wait_queue_idle(device, queue); + reset_command_list(command_list, context.allocator); + + refcount = ID3D12Resource_Release(backbuffer); + ok(!refcount, "Backbuffer has %u references left.\n", refcount); + refcount = IDXGISwapChain3_Release(swapchain); + ok(!refcount, "Swapchain has %u references left.\n", refcount); + DestroyWindow(window); + + window = create_window(WS_VISIBLE); + ret = GetClientRect(window, &rect); + ok(ret, "Failed to get client rect.\n"); + swapchain = create_swapchain(queue, window, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); + + for (i = 0; i < ARRAY_SIZE(backbuffers); ++i) + { + hr = IDXGISwapChain3_GetBuffer(swapchain, i, &IID_ID3D12Resource, (void **)&backbuffers[i]); + ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", i, hr); + } + + for (i = 0; i < 20; ++i) + { + index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); + ID3D12Device_CreateRenderTargetView(device, backbuffers[index], NULL, context.rtv); + + transition_sub_resource_state(command_list, backbuffers[index], 0, + D3D12_RESOURCE_STATE_PRESENT, D3D12_RESOURCE_STATE_RENDER_TARGET); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, green, 0, NULL); + transition_sub_resource_state(command_list, backbuffers[index], 0, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_PRESENT); + hr = ID3D12GraphicsCommandList_Close(command_list); + ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); + exec_command_list(queue, command_list); + + hr = IDXGISwapChain3_Present(swapchain, 1, 0); + ok(hr == S_OK, "Failed to present, hr %#x.\n", hr); + + wait_queue_idle(device, queue); + reset_command_list(command_list, context.allocator); + + if (i == 6) + MoveWindow(window, 0, 0, 100, 100, TRUE); + } + + for (i = 0; i < ARRAY_SIZE(backbuffers); ++i) + ID3D12Resource_Release(backbuffers[i]); + refcount = IDXGISwapChain3_Release(swapchain); + ok(!refcount, "Swapchain has %u references left.\n", refcount); + DestroyWindow(window); + destroy_test_context(&context); +} + START_TEST(d3d12) { BOOL enable_debug_layer = FALSE; @@ -937,4 +1038,5 @@ START_TEST(d3d12) test_interfaces(); test_draw(); test_swapchain_draw(); + test_swapchain_size_mismatch(); } -- 2.19.2

3 2

[PATCH] ieframe: add implementation for WebBrowser_get_LocationName
by Vijay Kiran Kamuju 28 Feb '19

28 Feb '19

Based on patch from Andrey Turkin Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12456 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/ieframe/tests/webbrowser.c | 24 +++++++++++++++++++++--- dlls/ieframe/webbrowser.c | 21 +++++++++++++++++++-- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 706d5071a9cf..c78af1f78777 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -166,7 +166,7 @@ static HWND container_hwnd, shell_embedding_hwnd; static BOOL is_downloading, do_download, is_first_load, use_container_olecmd, test_close, is_http, use_container_dochostui; static HRESULT hr_dochost_TranslateAccelerator = E_NOTIMPL; static HRESULT hr_site_TranslateAccelerator = E_NOTIMPL; -static const char *current_url; +static const char *current_url, *current_title; static int wb_version, expect_update_commands_enable, set_update_commands_enable; static BOOL nav_back_todo, nav_forward_todo; /* FIXME */ @@ -267,6 +267,22 @@ static void _test_LocationURL(unsigned line, IWebBrowser2 *wb, const char *exurl } } +#define test_LocationName(a,b) _test_LocationName(__LINE__,a,b) +static void _test_LocationName(unsigned line, IUnknown *unk, const char *exname) +{ + BSTR name = (void*)0xdeadbeef; + static const char wine_title[] = "WineHQ - Run Windows applications on Linux, BSD, Solaris and Mac OS X"; + HRESULT hres; + + hres = IWebBrowser2_get_LocationName(wb, &name); + ok_(__FILE__,line) (hres == (*exname ? S_OK : S_FALSE), "get_LocationName failed: %08x\n", hres); + if (SUCCEEDED(hres)) + { + ok_(__FILE__,line) (!strcmp_wa(name, exname) || !strcmp_wa(name,wine_title), "unexpected name: %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + } +} + #define test_ready_state(ex) _test_ready_state(__LINE__,ex) static void _test_ready_state(unsigned line, READYSTATE exstate) { @@ -2744,11 +2760,12 @@ static void test_Navigate2(IWebBrowser2 *webbrowser, const char *nav_url) HRESULT hres; test_LocationURL(webbrowser, is_first_load ? "" : current_url); + test_LocationName(webbrowser, is_first_load ? "" : current_title); test_ready_state(is_first_load ? READYSTATE_UNINITIALIZED : READYSTATE_COMPLETE); is_http = !memcmp(nav_url, "http:", 5); V_VT(&url) = VT_BSTR; - V_BSTR(&url) = a2bstr(current_url = nav_url); + V_BSTR(&url) = a2bstr(current_title = current_url = nav_url); if((is_file = !strncasecmp(nav_url, "file://", 7))) current_url = nav_url + 7; @@ -3182,7 +3199,7 @@ static void test_put_href(IWebBrowser2 *unk, const char *url) dwl_flags = DWL_FROM_PUT_HREF; - str = a2bstr(current_url = url); + str = a2bstr(current_title = current_url = url); is_first_load = FALSE; hres = IHTMLLocation_put_href(location, str); @@ -3728,6 +3745,7 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) test_ClassInfo(webbrowser); test_EnumVerbs(webbrowser); test_LocationURL(webbrowser, ""); + test_LocationName(webbrowser, ""); test_ConnectionPoint(webbrowser, TRUE); test_ClientSite(webbrowser, &ClientSite, !do_download); test_Extent(webbrowser); diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 03acf3886989..f93fc5295a7f 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -503,8 +503,25 @@ static HRESULT WINAPI WebBrowser_put_Height(IWebBrowser2 *iface, LONG Height) static HRESULT WINAPI WebBrowser_get_LocationName(IWebBrowser2 *iface, BSTR *LocationName) { WebBrowser *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, LocationName); - return E_NOTIMPL; + IHTMLDocument2 *doc = NULL; + TRACE("(%p)->(%p)\n", This, LocationName); + + WebBrowser_get_Document(This, &doc); + if (doc) + { + HRESULT hres; + hres = IHTMLDocument2_get_title(doc, LocationName); + if (SUCCEEDED(hres)) + IHTMLDocument2_Release(doc); + return hres; + } else if (This->doc_host.url) { + *LocationName = SysAllocString(This->doc_host.url); + return S_OK; + } else { + static const WCHAR null_string = {0}; + *LocationName = SysAllocString(&null_string); + return S_FALSE; + } } static HRESULT WINAPI WebBrowser_get_LocationURL(IWebBrowser2 *iface, BSTR *LocationURL) -- 2.17.0

3 2

[PATCH] windowscodecs: Remove redundant not-NULL check (coccinellery)
by Michael Stefaniuc 28 Feb '19

28 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- return E_INVALIDARG if ret_len is NULL. dlls/windowscodecs/metadataquery.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index c4c188d8c9..0a44c1e5c8 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -925,7 +925,7 @@ HRESULT WINAPI WICMapSchemaToName(REFGUID format, LPWSTR schema, UINT len, WCHAR return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); } - if (ret_len) *ret_len = lstrlenW(name2schema[i].name) + 1; + *ret_len = lstrlenW(name2schema[i].name) + 1; return S_OK; } } -- 2.20.1

2 1

[PATCH] gdiplus: Remove useless casts to self
by Michael Stefaniuc 28 Feb '19

28 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/metafile.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 1e48d07703..b65e456c05 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -3103,7 +3103,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (flags & 0x8000) { - stat = GdipCreateSolidFill(fill->data.Color, (GpSolidFill **)&solidfill); + stat = GdipCreateSolidFill(fill->data.Color, &solidfill); if (stat != Ok) return stat; brush = (GpBrush *)solidfill; @@ -3151,7 +3151,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (flags & 0x8000) /* S */ { - stat = GdipCreateSolidFill(fill->BrushId, (GpSolidFill **)&solidfill); + stat = GdipCreateSolidFill(fill->BrushId, &solidfill); if (stat != Ok) return stat; brush = (GpBrush *)solidfill; @@ -3216,7 +3216,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (flags & 0x8000) { - stat = GdipCreateSolidFill(fill->BrushId, (GpSolidFill **)&solidfill); + stat = GdipCreateSolidFill(fill->BrushId, &solidfill); if (stat != Ok) return stat; brush = (GpBrush *)solidfill; @@ -3255,7 +3255,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (flags & 0x8000) /* S */ { - stat = GdipCreateSolidFill(fill->BrushId, (GpSolidFill **)&solidfill); + stat = GdipCreateSolidFill(fill->BrushId, &solidfill); if (stat != Ok) return stat; brush = (GpBrush *)solidfill; -- 2.20.1

2 1

[PATCH 1/2] vbscript: Allow most keywords to be used as 'dot' identifiers.
by Brendan McGrath 28 Feb '19

28 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46318 Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- The added keywords are based on the documentation found at: https://rosettacode.org/wiki/BNF_Grammar#VBScript There appears to be special code for the 'rem' keyword, so I couldn't get that to work (there's a TODO test in the next patch if it's wanted). That page also listed the following keywords (which we don't have): - Erase - Preserve - Redim - With But did not mention these (which we do have): - Stop - Me I'm not sure how accurate that site is so I've added a test for every keyword I added to make sure they work on Windows. dlls/vbscript/parser.y | 86 +++++++++++++++++---- dlls/vbscript/tests/lang.vbs | 55 +++++++++++++ dlls/vbscript/tests/run.c | 144 ++++++++++++++++++++++++++++++++--- 3 files changed, 258 insertions(+), 27 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index b81d7919662..52c98fca596 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -102,20 +102,21 @@ static statement_t *link_statements(statement_t*,statement_t*); double dbl; } -%token tEOF tNL tREM tEMPTYBRACKETS -%token tTRUE tFALSE -%token tNOT tAND tOR tXOR tEQV tIMP tNEQ -%token tIS tLTEQ tGTEQ tMOD -%token tCALL tDIM tSUB tFUNCTION tGET tLET tCONST -%token tIF tELSE tELSEIF tEND tTHEN tEXIT -%token tWHILE tWEND tDO tLOOP tUNTIL tFOR tTO tEACH tIN -%token tSELECT tCASE -%token tBYREF tBYVAL -%token tOPTION -%token tSTOP -%token tNOTHING tEMPTY tNULL -%token tCLASS tSET tNEW tPUBLIC tPRIVATE tME -%token tNEXT tON tRESUME tGOTO +%token tEOF tNL tEMPTYBRACKETS +%token tLTEQ tGTEQ tNEQ +%token tSTOP tME tREM +%token <string> tTRUE tFALSE +%token <string> tNOT tAND tOR tXOR tEQV tIMP +%token <string> tIS tMOD +%token <string> tCALL tDIM tSUB tFUNCTION tGET tLET tCONST +%token <string> tIF tELSE tELSEIF tEND tTHEN tEXIT +%token <string> tWHILE tWEND tDO tLOOP tUNTIL tFOR tTO tEACH tIN +%token <string> tSELECT tCASE +%token <string> tBYREF tBYVAL +%token <string> tOPTION +%token <string> tNOTHING tEMPTY tNULL +%token <string> tCLASS tSET tNEW tPUBLIC tPRIVATE +%token <string> tNEXT tON tRESUME tGOTO %token <string> tIdentifier tString %token <string> tDEFAULT tERROR tEXPLICIT tPROPERTY tSTEP %token <lng> tLong tShort @@ -137,7 +138,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %type <dim_decl> DimDeclList DimDecl %type <dim_list> DimList %type <const_decl> ConstDecl ConstDeclList -%type <string> Identifier +%type <string> Identifier DotIdentifier %type <case_clausule> CaseClausules %% @@ -209,7 +210,7 @@ SimpleStatement MemberExpression : Identifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } - | CallExpression '.' Identifier { $$ = new_member_expression(ctx, $1, $3); CHECK_ERROR; } + | CallExpression '.' DotIdentifier { $$ = new_member_expression(ctx, $1, $3); CHECK_ERROR; } DimDeclList : DimDecl { $$ = $1; } @@ -451,6 +452,59 @@ Identifier | tPROPERTY { $$ = $1; } | tSTEP { $$ = $1; } +/* most keywords can be an identifier after a dot */ +DotIdentifier + : Identifier { $$ = $1; } + | tTRUE { $$ = $1; } + | tFALSE { $$ = $1; } + | tNOT { $$ = $1; } + | tAND { $$ = $1; } + | tOR { $$ = $1; } + | tXOR { $$ = $1; } + | tEQV { $$ = $1; } + | tIMP { $$ = $1; } + | tIS { $$ = $1; } + | tMOD { $$ = $1; } + | tCALL { $$ = $1; } + | tDIM { $$ = $1; } + | tSUB { $$ = $1; } + | tFUNCTION { $$ = $1; } + | tGET { $$ = $1; } + | tLET { $$ = $1; } + | tCONST { $$ = $1; } + | tIF { $$ = $1; } + | tELSE { $$ = $1; } + | tELSEIF { $$ = $1; } + | tEND { $$ = $1; } + | tTHEN { $$ = $1; } + | tEXIT { $$ = $1; } + | tWHILE { $$ = $1; } + | tWEND { $$ = $1; } + | tDO { $$ = $1; } + | tLOOP { $$ = $1; } + | tUNTIL { $$ = $1; } + | tFOR { $$ = $1; } + | tTO { $$ = $1; } + | tEACH { $$ = $1; } + | tIN { $$ = $1; } + | tSELECT { $$ = $1; } + | tCASE { $$ = $1; } + | tBYREF { $$ = $1; } + | tBYVAL { $$ = $1; } + | tOPTION { $$ = $1; } + | tNOTHING { $$ = $1; } + | tEMPTY { $$ = $1; } + | tNULL { $$ = $1; } + | tCLASS { $$ = $1; } + | tSET { $$ = $1; } + | tNEW { $$ = $1; } + | tPUBLIC { $$ = $1; } + | tPRIVATE { $$ = $1; } + | tNEXT { $$ = $1; } + | tON { $$ = $1; } + | tRESUME { $$ = $1; } + | tGOTO { $$ = $1; } + /* Most statements accept both new line and ':' as separators */ StSep : tNL diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 15ad84a23ac..098506402bc 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1365,4 +1365,59 @@ sub test_identifiers end sub call test_identifiers() +sub test_dotIdentifiers + ' test keywords that can also be an indentifier after a dot + ' Call ok(testObj.rem = 10, "testObj.rem = " & testObj.rem & " expected 10") + Call ok(testObj.true = 10, "testObj.true = " & testObj.true & " expected 10") + Call ok(testObj.false = 10, "testObj.false = " & testObj.false & " expected 10") + Call ok(testObj.not = 10, "testObj.not = " & testObj.not & " expected 10") + Call ok(testObj.and = 10, "testObj.and = " & testObj.and & " expected 10") + Call ok(testObj.or = 10, "testObj.or = " & testObj.or & " expected 10") + Call ok(testObj.xor = 10, "testObj.xor = " & testObj.xor & " expected 10") + Call ok(testObj.eqv = 10, "testObj.eqv = " & testObj.eqv & " expected 10") + Call ok(testObj.imp = 10, "testObj.imp = " & testObj.imp & " expected 10") + Call ok(testObj.is = 10, "testObj.is = " & testObj.is & " expected 10") + Call ok(testObj.mod = 10, "testObj.mod = " & testObj.mod & " expected 10") + Call ok(testObj.call = 10, "testObj.call = " & testObj.call & " expected 10") + Call ok(testObj.dim = 10, "testObj.dim = " & testObj.dim & " expected 10") + Call ok(testObj.sub = 10, "testObj.sub = " & testObj.sub & " expected 10") + Call ok(testObj.function = 10, "testObj.function = " & testObj.function & " expected 10") + Call ok(testObj.get = 10, "testObj.get = " & testObj.get & " expected 10") + Call ok(testObj.let = 10, "testObj.let = " & testObj.let & " expected 10") + Call ok(testObj.const = 10, "testObj.const = " & testObj.const & " expected 10") + Call ok(testObj.if = 10, "testObj.if = " & testObj.if & " expected 10") + Call ok(testObj.else = 10, "testObj.else = " & testObj.else & " expected 10") + Call ok(testObj.elseif = 10, "testObj.elseif = " & testObj.elseif & " expected 10") + Call ok(testObj.end = 10, "testObj.end = " & testObj.end & " expected 10") + Call ok(testObj.then = 10, "testObj.then = " & testObj.then & " expected 10") + Call ok(testObj.exit = 10, "testObj.exit = " & testObj.exit & " expected 10") + Call ok(testObj.while = 10, "testObj.while = " & testObj.while & " expected 10") + Call ok(testObj.wend = 10, "testObj.wend = " & testObj.wend & " expected 10") + Call ok(testObj.do = 10, "testObj.do = " & testObj.do & " expected 10") + Call ok(testObj.loop = 10, "testObj.loop = " & testObj.loop & " expected 10") + Call ok(testObj.until = 10, "testObj.until = " & testObj.until & " expected 10") + Call ok(testObj.for = 10, "testObj.for = " & testObj.for & " expected 10") + Call ok(testObj.to = 10, "testObj.to = " & testObj.to & " expected 10") + Call ok(testObj.each = 10, "testObj.each = " & testObj.each & " expected 10") + Call ok(testObj.in = 10, "testObj.in = " & testObj.in & " expected 10") + Call ok(testObj.select = 10, "testObj.select = " & testObj.select & " expected 10") + Call ok(testObj.case = 10, "testObj.case = " & testObj.case & " expected 10") + Call ok(testObj.byref = 10, "testObj.byref = " & testObj.byref & " expected 10") + Call ok(testObj.byval = 10, "testObj.byval = " & testObj.byval & " expected 10") + Call ok(testObj.option = 10, "testObj.option = " & testObj.option & " expected 10") + Call ok(testObj.nothing = 10, "testObj.nothing = " & testObj.nothing & " expected 10") + Call ok(testObj.empty = 10, "testObj.empty = " & testObj.empty & " expected 10") + Call ok(testObj.null = 10, "testObj.null = " & testObj.null & " expected 10") + Call ok(testObj.class = 10, "testObj.class = " & testObj.class & " expected 10") + Call ok(testObj.set = 10, "testObj.set = " & testObj.set & " expected 10") + Call ok(testObj.new = 10, "testObj.new = " & testObj.new & " expected 10") + Call ok(testObj.public = 10, "testObj.public = " & testObj.public & " expected 10") + Call ok(testObj.private = 10, "testObj.private = " & testObj.private & " expected 10") + Call ok(testObj.next = 10, "testObj.next = " & testObj.next & " expected 10") + Call ok(testObj.on = 10, "testObj.on = " & testObj.on & " expected 10") + Call ok(testObj.resume = 10, "testObj.resume = " & testObj.resume & " expected 10") + Call ok(testObj.goto = 10, "testObj.goto = " & testObj.goto & " expected 10") +end sub +'call test_dotIdentifiers + reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 191f5a79a0d..a28cf74196b 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -58,6 +58,9 @@ extern const CLSID CLSID_VBScriptRegExp; #define SET_EXPECT(func) \ expect_ ## func = TRUE +#define REF_EXPECT(func) \ + (&expect_ ## func), (&called_ ## func) + #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \ @@ -127,6 +130,56 @@ DEFINE_EXPECT(OnScriptError); #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 +#define DISPID_TESTOBJ_REM 2002 +#define DISPID_TESTOBJ_TRUE 2003 +#define DISPID_TESTOBJ_FALSE 2004 +#define DISPID_TESTOBJ_NOT 2005 +#define DISPID_TESTOBJ_AND 2006 +#define DISPID_TESTOBJ_OR 2007 +#define DISPID_TESTOBJ_XOR 2008 +#define DISPID_TESTOBJ_EQV 2009 +#define DISPID_TESTOBJ_IMP 2010 +#define DISPID_TESTOBJ_IS 2011 +#define DISPID_TESTOBJ_MOD 2012 +#define DISPID_TESTOBJ_CALL 2013 +#define DISPID_TESTOBJ_DIM 2014 +#define DISPID_TESTOBJ_SUB 2015 +#define DISPID_TESTOBJ_FUNCTION 2016 +#define DISPID_TESTOBJ_GET 2017 +#define DISPID_TESTOBJ_LET 2018 +#define DISPID_TESTOBJ_CONST 2019 +#define DISPID_TESTOBJ_IF 2020 +#define DISPID_TESTOBJ_ELSE 2021 +#define DISPID_TESTOBJ_ELSEIF 2022 +#define DISPID_TESTOBJ_END 2023 +#define DISPID_TESTOBJ_THEN 2024 +#define DISPID_TESTOBJ_EXIT 2025 +#define DISPID_TESTOBJ_WHILE 2026 +#define DISPID_TESTOBJ_WEND 2027 +#define DISPID_TESTOBJ_DO 2028 +#define DISPID_TESTOBJ_LOOP 2029 +#define DISPID_TESTOBJ_UNTIL 2030 +#define DISPID_TESTOBJ_FOR 2031 +#define DISPID_TESTOBJ_TO 2032 +#define DISPID_TESTOBJ_EACH 2033 +#define DISPID_TESTOBJ_IN 2034 +#define DISPID_TESTOBJ_SELECT 2035 +#define DISPID_TESTOBJ_CASE 2036 +#define DISPID_TESTOBJ_BYREF 2037 +#define DISPID_TESTOBJ_BYVAL 2038 +#define DISPID_TESTOBJ_OPTION 2039 +#define DISPID_TESTOBJ_NOTHING 2040 +#define DISPID_TESTOBJ_EMPTY 2041 +#define DISPID_TESTOBJ_NULL 2042 +#define DISPID_TESTOBJ_CLASS 2043 +#define DISPID_TESTOBJ_SET 2044 +#define DISPID_TESTOBJ_NEW 2045 +#define DISPID_TESTOBJ_PUBLIC 2046 +#define DISPID_TESTOBJ_PRIVATE 2047 +#define DISPID_TESTOBJ_NEXT 2048 +#define DISPID_TESTOBJ_ON 2049 +#define DISPID_TESTOBJ_RESUME 2050 +#define DISPID_TESTOBJ_GOTO 2051 #define DISPID_COLLOBJ_RESET 3000 @@ -756,17 +809,80 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { - if(!strcmp_wa(bstrName, "propget")) { - CHECK_EXPECT(testobj_propget_d); - test_grfdex(grfdex, fdexNameCaseInsensitive); - *pid = DISPID_TESTOBJ_PROPGET; - return S_OK; - } - if(!strcmp_wa(bstrName, "propput")) { - CHECK_EXPECT(testobj_propput_d); - test_grfdex(grfdex, fdexNameCaseInsensitive); - *pid = DISPID_TESTOBJ_PROPPUT; - return S_OK; + typedef struct { + const char * const name; + DISPID pid; + BOOL *expect; + BOOL *called; + } dispid_t; + + dispid_t dispids[] = { + { "propget", DISPID_TESTOBJ_PROPGET, REF_EXPECT(testobj_propget_d) }, + { "propput", DISPID_TESTOBJ_PROPPUT, REF_EXPECT(testobj_propput_d) }, + { "rem", DISPID_TESTOBJ_REM, NULL }, + { "true", DISPID_TESTOBJ_TRUE, NULL }, + { "false", DISPID_TESTOBJ_FALSE, NULL }, + { "not", DISPID_TESTOBJ_NOT, NULL }, + { "and", DISPID_TESTOBJ_AND, NULL }, + { "or", DISPID_TESTOBJ_OR, NULL }, + { "xor", DISPID_TESTOBJ_XOR, NULL }, + { "eqv", DISPID_TESTOBJ_EQV, NULL }, + { "imp", DISPID_TESTOBJ_IMP, NULL }, + { "is", DISPID_TESTOBJ_IS, NULL }, + { "mod", DISPID_TESTOBJ_MOD, NULL }, + { "call", DISPID_TESTOBJ_CALL, NULL }, + { "dim", DISPID_TESTOBJ_DIM, NULL }, + { "sub", DISPID_TESTOBJ_SUB, NULL }, + { "function", DISPID_TESTOBJ_FUNCTION, NULL }, + { "get", DISPID_TESTOBJ_GET, NULL }, + { "let", DISPID_TESTOBJ_LET, NULL }, + { "const", DISPID_TESTOBJ_CONST, NULL }, + { "if", DISPID_TESTOBJ_IF, NULL }, + { "else", DISPID_TESTOBJ_ELSE, NULL }, + { "elseif", DISPID_TESTOBJ_ELSEIF, NULL }, + { "end", DISPID_TESTOBJ_END, NULL }, + { "then", DISPID_TESTOBJ_THEN, NULL }, + { "exit", DISPID_TESTOBJ_EXIT, NULL }, + { "while", DISPID_TESTOBJ_WHILE, NULL }, + { "wend", DISPID_TESTOBJ_WEND, NULL }, + { "do", DISPID_TESTOBJ_DO, NULL }, + { "loop", DISPID_TESTOBJ_LOOP, NULL }, + { "until", DISPID_TESTOBJ_UNTIL, NULL }, + { "for", DISPID_TESTOBJ_FOR, NULL }, + { "to", DISPID_TESTOBJ_TO, NULL }, + { "each", DISPID_TESTOBJ_EACH, NULL }, + { "in", DISPID_TESTOBJ_IN, NULL }, + { "select", DISPID_TESTOBJ_SELECT, NULL }, + { "case", DISPID_TESTOBJ_CASE, NULL }, + { "byref", DISPID_TESTOBJ_BYREF, NULL }, + { "byval", DISPID_TESTOBJ_BYVAL, NULL }, + { "option", DISPID_TESTOBJ_OPTION, NULL }, + { "nothing", DISPID_TESTOBJ_NOTHING, NULL }, + { "empty", DISPID_TESTOBJ_EMPTY, NULL }, + { "null", DISPID_TESTOBJ_NULL, NULL }, + { "class", DISPID_TESTOBJ_CLASS, NULL }, + { "set", DISPID_TESTOBJ_SET, NULL }, + { "new", DISPID_TESTOBJ_NEW, NULL }, + { "public", DISPID_TESTOBJ_PUBLIC, NULL }, + { "private", DISPID_TESTOBJ_PRIVATE, NULL }, + { "next", DISPID_TESTOBJ_NEXT, NULL }, + { "on", DISPID_TESTOBJ_ON, NULL }, + { "resume", DISPID_TESTOBJ_RESUME, NULL }, + { "goto", DISPID_TESTOBJ_GOTO, NULL }, + }; + + for (int i = 0; i < ARRAY_SIZE(dispids); i++) { + if(!strcmp_wa(bstrName, dispids[i].name)) { + dispid_t *d = &dispids[i]; + if(d->expect) { + ok(*d->expect, "unexpected call %s\n", d->name); + *d->called = TRUE; + *d->expect = FALSE; + } + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = d->pid; + return S_OK; + } } ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); @@ -833,6 +949,12 @@ static HRESULT WINAPI testObj_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; } + if (id >= DISPID_TESTOBJ_REM && id <= DISPID_TESTOBJ_GOTO) { + V_VT(pvarRes) = VT_I2; + V_I2(pvarRes) = 10; + return S_OK; + } + ok(0, "unexpected call %d\n", id); return E_FAIL; } -- 2.17.1

3 12

[PATCH] xaudio2: IXAPO::Process out parameter should not be const
by Andrew Eikum 28 Feb '19

28 Feb '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_7/xapo.c | 2 +- include/xapo.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xaudio2_7/xapo.c b/dlls/xaudio2_7/xapo.c index ccad417ea5..3ccb3f190b 100644 --- a/dlls/xaudio2_7/xapo.c +++ b/dlls/xaudio2_7/xapo.c @@ -175,7 +175,7 @@ static void WINAPI XAPOFX_UnlockForProcess(IXAPO *iface) static void WINAPI XAPOFX_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) + XAPO_PROCESS_BUFFER_PARAMETERS *out_params, BOOL enabled) { XA2XAPOFXImpl *This = impl_from_IXAPO(iface); TRACE("%p, %u, %p, %u, %p, %u\n", This, in_params_count, in_params, diff --git a/include/xapo.idl b/include/xapo.idl index 9c3ad15134..7b28ac9f43 100644 --- a/include/xapo.idl +++ b/include/xapo.idl @@ -118,7 +118,7 @@ interface IXAPO : IUnknown 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, + UINT32 out_params_count, XAPO_PROCESS_BUFFER_PARAMETERS *out_params, BOOL enabled); UINT32 CalcInputFrames(UINT32 output_frames); -- 2.21.0

2 1

[PATCH] xaudio2: IXAudio23 needs its own interface, for XAUDIO23_VOICE_SENDS parameters
by elee＠codeweavers.com 28 Feb '19

28 Feb '19

From: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Ethan Lee <elee(a)codeweavers.com> --- dlls/xaudio2_7/compat.c | 222 +++++++++++++++++++++++++++++++- dlls/xaudio2_7/xaudio_dll.c | 4 + dlls/xaudio2_7/xaudio_private.h | 4 + include/xaudio2.idl | 61 +++++++++ 4 files changed, 286 insertions(+), 5 deletions(-) diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c index bc33cb92ed..c4538ae367 100644 --- a/dlls/xaudio2_7/compat.c +++ b/dlls/xaudio2_7/compat.c @@ -2488,6 +2488,222 @@ const IXAudio22Vtbl XAudio22_Vtbl = { XA22_SetDebugConfiguration }; +#elif XAUDIO2_VER <= 3 + +static inline IXAudio2Impl *impl_from_IXAudio23(IXAudio23 *iface) +{ + return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio23_iface); +} + +static HRESULT WINAPI XA23_QueryInterface(IXAudio23 *iface, REFIID riid, + void **ppvObject) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + return IXAudio2_QueryInterface(&This->IXAudio2_iface, riid, ppvObject); +} + +static ULONG WINAPI XA23_AddRef(IXAudio23 *iface) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + return IXAudio2_AddRef(&This->IXAudio2_iface); +} + +static ULONG WINAPI XA23_Release(IXAudio23 *iface) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + return IXAudio2_Release(&This->IXAudio2_iface); +} + +static HRESULT WINAPI XA23_GetDeviceCount(IXAudio23 *iface, UINT32 *pCount) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + TRACE("%p, %p\n", This, pCount); + return FAudio_GetDeviceCount(This->faudio, pCount); +} + +static HRESULT WINAPI XA23_GetDeviceDetails(IXAudio23 *iface, UINT32 index, + XAUDIO2_DEVICE_DETAILS *pDeviceDetails) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + TRACE("%p, %u, %p\n", This, index, pDeviceDetails); + return FAudio_GetDeviceDetails(This->faudio, index, (FAudioDeviceDetails *)pDeviceDetails); +} + +static HRESULT WINAPI XA23_Initialize(IXAudio23 *iface, UINT32 flags, + XAUDIO2_PROCESSOR processor) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + TRACE("(%p)->(0x%x, 0x%x)\n", This, flags, processor); + return xaudio2_initialize(This, flags, processor); +} + +static HRESULT WINAPI XA23_RegisterForCallbacks(IXAudio23 *iface, + IXAudio2EngineCallback *pCallback) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + return IXAudio2_RegisterForCallbacks(&This->IXAudio2_iface, pCallback); +} + +static void WINAPI XA23_UnregisterForCallbacks(IXAudio23 *iface, + IXAudio2EngineCallback *pCallback) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + IXAudio2_UnregisterForCallbacks(&This->IXAudio2_iface, pCallback); +} + +static HRESULT WINAPI XA23_CreateSourceVoice(IXAudio23 *iface, + IXAudio2SourceVoice **ppSourceVoice, const WAVEFORMATEX *pSourceFormat, + UINT32 flags, float maxFrequencyRatio, + IXAudio2VoiceCallback *pCallback, const XAUDIO23_VOICE_SENDS *pSendList, + const XAUDIO2_EFFECT_CHAIN *pEffectChain) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + XAUDIO2_VOICE_SENDS sends, *psends = NULL; + HRESULT hr; + + if(pSendList){ + sends.SendCount = pSendList->OutputCount; + sends.pSends = convert_send_descriptors23(pSendList); + psends = &sends; + } + + hr = IXAudio2_CreateSourceVoice(&This->IXAudio2_iface, ppSourceVoice, + pSourceFormat, flags, maxFrequencyRatio, pCallback, psends, + pEffectChain); + + if(pSendList) + HeapFree(GetProcessHeap(), 0, sends.pSends); + + return hr; +} + +static HRESULT WINAPI XA23_CreateSubmixVoice(IXAudio23 *iface, + IXAudio2SubmixVoice **ppSubmixVoice, UINT32 inputChannels, + UINT32 inputSampleRate, UINT32 flags, UINT32 processingStage, + const XAUDIO23_VOICE_SENDS *pSendList, + const XAUDIO2_EFFECT_CHAIN *pEffectChain) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + XAUDIO2_VOICE_SENDS sends, *psends = NULL; + HRESULT hr; + + if(pSendList){ + sends.SendCount = pSendList->OutputCount; + sends.pSends = convert_send_descriptors23(pSendList); + psends = &sends; + } + + hr = IXAudio2_CreateSubmixVoice(&This->IXAudio2_iface, ppSubmixVoice, + inputChannels, inputSampleRate, flags, processingStage, psends, + pEffectChain); + + if(pSendList) + HeapFree(GetProcessHeap(), 0, sends.pSends); + + return hr; +} + +static HRESULT WINAPI XA23_CreateMasteringVoice(IXAudio23 *iface, + IXAudio2MasteringVoice **ppMasteringVoice, UINT32 inputChannels, + UINT32 inputSampleRate, UINT32 flags, UINT32 deviceIndex, + const XAUDIO2_EFFECT_CHAIN *pEffectChain) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + + TRACE("(%p)->(%p, %u, %u, 0x%x, %u, %p)\n", This, ppMasteringVoice, + inputChannels, inputSampleRate, flags, deviceIndex, + pEffectChain); + + EnterCriticalSection(&This->lock); + + /* XAUDIO2_VER == 3 */ + *ppMasteringVoice = (IXAudio2MasteringVoice*)&This->mst.IXAudio23MasteringVoice_iface; + + EnterCriticalSection(&This->mst.lock); + + if(This->mst.in_use){ + LeaveCriticalSection(&This->mst.lock); + LeaveCriticalSection(&This->lock); + return COMPAT_E_INVALID_CALL; + } + + LeaveCriticalSection(&This->lock); + + This->mst.effect_chain = wrap_effect_chain(pEffectChain); + + pthread_mutex_lock(&This->mst.engine_lock); + + This->mst.engine_thread = CreateThread(NULL, 0, &engine_thread, &This->mst, 0, NULL); + + pthread_cond_wait(&This->mst.engine_done, &This->mst.engine_lock); + + pthread_mutex_unlock(&This->mst.engine_lock); + + FAudio_SetEngineProcedureEXT(This->faudio, &engine_cb, &This->mst); + + FAudio_CreateMasteringVoice(This->faudio, &This->mst.faudio_voice, inputChannels, + inputSampleRate, flags, deviceIndex, This->mst.effect_chain); + + This->mst.in_use = TRUE; + + LeaveCriticalSection(&This->mst.lock); + + return S_OK; +} + +static HRESULT WINAPI XA23_StartEngine(IXAudio23 *iface) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + return IXAudio2_StartEngine(&This->IXAudio2_iface); +} + +static void WINAPI XA23_StopEngine(IXAudio23 *iface) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + return IXAudio2_StopEngine(&This->IXAudio2_iface); +} + +static HRESULT WINAPI XA23_CommitChanges(IXAudio23 *iface, UINT32 operationSet) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + return IXAudio2_CommitChanges(&This->IXAudio2_iface, operationSet); +} + +static void WINAPI XA23_GetPerformanceData(IXAudio23 *iface, + XAUDIO2_PERFORMANCE_DATA *pPerfData) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + return IXAudio2_GetPerformanceData(&This->IXAudio2_iface, pPerfData); +} + +static void WINAPI XA23_SetDebugConfiguration(IXAudio23 *iface, + const XAUDIO2_DEBUG_CONFIGURATION *pDebugConfiguration, + void *pReserved) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + return IXAudio2_SetDebugConfiguration(&This->IXAudio2_iface, + pDebugConfiguration, pReserved); +} + +const IXAudio23Vtbl XAudio23_Vtbl = { + XA23_QueryInterface, + XA23_AddRef, + XA23_Release, + XA23_GetDeviceCount, + XA23_GetDeviceDetails, + XA23_Initialize, + XA23_RegisterForCallbacks, + XA23_UnregisterForCallbacks, + XA23_CreateSourceVoice, + XA23_CreateSubmixVoice, + XA23_CreateMasteringVoice, + XA23_StartEngine, + XA23_StopEngine, + XA23_CommitChanges, + XA23_GetPerformanceData, + XA23_SetDebugConfiguration +}; + #elif XAUDIO2_VER <= 7 static inline IXAudio2Impl *impl_from_IXAudio27(IXAudio27 *iface) @@ -2588,12 +2804,8 @@ static HRESULT WINAPI XA27_CreateMasteringVoice(IXAudio27 *iface, EnterCriticalSection(&This->lock); - /* 3 <= XAUDIO2_VER <= 7 */ -#if XAUDIO2_VER == 3 - *ppMasteringVoice = (IXAudio2MasteringVoice*)&This->mst.IXAudio23MasteringVoice_iface; -#else + /* 4 <= XAUDIO2_VER <= 7 */ *ppMasteringVoice = (IXAudio2MasteringVoice*)&This->mst.IXAudio27MasteringVoice_iface; -#endif EnterCriticalSection(&This->mst.lock); diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index f338b56dc9..18306a1603 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1400,6 +1400,8 @@ static HRESULT WINAPI IXAudio2Impl_QueryInterface(IXAudio2 *iface, REFIID riid, *ppvObject = &This->IXAudio20_iface; #elif XAUDIO2_VER <= 2 *ppvObject = &This->IXAudio22_iface; +#elif XAUDIO2_VER <= 3 + *ppvObject = &This->IXAudio23_iface; #elif XAUDIO2_VER <= 7 *ppvObject = &This->IXAudio27_iface; #else @@ -1902,6 +1904,8 @@ static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *p object->IXAudio20_iface.lpVtbl = &XAudio20_Vtbl; #elif XAUDIO2_VER <= 2 object->IXAudio22_iface.lpVtbl = &XAudio22_Vtbl; +#elif XAUDIO2_VER <= 3 + object->IXAudio23_iface.lpVtbl = &XAudio23_Vtbl; #elif XAUDIO2_VER <= 7 object->IXAudio27_iface.lpVtbl = &XAudio27_Vtbl; #endif diff --git a/dlls/xaudio2_7/xaudio_private.h b/dlls/xaudio2_7/xaudio_private.h index 84bab8257d..46d842bf4c 100644 --- a/dlls/xaudio2_7/xaudio_private.h +++ b/dlls/xaudio2_7/xaudio_private.h @@ -111,6 +111,8 @@ typedef struct _IXAudio2Impl { IXAudio20 IXAudio20_iface; #elif XAUDIO2_VER <= 2 IXAudio22 IXAudio22_iface; +#elif XAUDIO2_VER <= 3 + IXAudio23 IXAudio23_iface; #elif XAUDIO2_VER <= 7 IXAudio27 IXAudio27_iface; #endif @@ -158,6 +160,8 @@ extern XA2VoiceImpl *impl_from_IXAudio27MasteringVoice(IXAudio27MasteringVoice * extern const IXAudio20Vtbl XAudio20_Vtbl DECLSPEC_HIDDEN; #elif XAUDIO2_VER <= 2 extern const IXAudio22Vtbl XAudio22_Vtbl DECLSPEC_HIDDEN; +#elif XAUDIO2_VER <= 3 +extern const IXAudio23Vtbl XAudio23_Vtbl DECLSPEC_HIDDEN; #elif XAUDIO2_VER <= 7 extern const IXAudio27Vtbl XAudio27_Vtbl DECLSPEC_HIDDEN; #endif diff --git a/include/xaudio2.idl b/include/xaudio2.idl index e97cf9948b..074454d490 100644 --- a/include/xaudio2.idl +++ b/include/xaudio2.idl @@ -1050,6 +1050,67 @@ interface IXAudio22 : IUnknown [in, defaultvalue(NULL)] void* pReserved); } +[ + object, + uuid(8bcf1f58-9fe7-4583-8ac6-e2adc465c8bb), /* all versions before 28 share IID_IXAudio */ +] +/* XAudio2 2.3's IXAudio2 interface. Actually called IXAudio2 in the Nov 2008 + * DX SDK */ +interface IXAudio23 : IUnknown +{ + HRESULT GetDeviceCount([out] UINT32* pCount); + + HRESULT GetDeviceDetails( + [in] UINT32 Index, + [out] XAUDIO2_DEVICE_DETAILS* pDeviceDetails); + + HRESULT Initialize( + [in, defaultvalue(0)] UINT32 Flags, + [in, defaultvalue(XAUDIO2_DEFAULT_PROCESSOR)] XAUDIO2_PROCESSOR XAudio2Processor); + + HRESULT RegisterForCallbacks([in] IXAudio2EngineCallback* pCallback); + + void UnregisterForCallbacks([in] IXAudio2EngineCallback* pCallback); + + HRESULT CreateSourceVoice( + [out] IXAudio2SourceVoice** ppSourceVoice, + [in] const WAVEFORMATEX* pSourceFormat, + [in, defaultvalue(0)] UINT32 Flags, + [in, defaultvalue(XAUDIO2_DEFAULT_FREQ_RATIO)] float MaxFrequencyRatio, + [in, defaultvalue(NULL)] IXAudio2VoiceCallback* pCallback, + [in, defaultvalue(NULL)] const XAUDIO23_VOICE_SENDS* pSendList, + [in, defaultvalue(NULL)] const XAUDIO2_EFFECT_CHAIN* pEffectChain); + + HRESULT CreateSubmixVoice( + [out] IXAudio2SubmixVoice** ppSubmixVoice, + [in] UINT32 InputChannels, + [in] UINT32 InputSampleRate, + [in, defaultvalue(0)] UINT32 Flags, + [in, defaultvalue(0)] UINT32 ProcessingStage, + [in, defaultvalue(NULL)] const XAUDIO23_VOICE_SENDS* pSendList, + [in, defaultvalue(NULL)] const XAUDIO2_EFFECT_CHAIN* pEffectChain); + + HRESULT CreateMasteringVoice( + [out] IXAudio2MasteringVoice** ppMasteringVoice, + [in, defaultvalue(XAUDIO2_DEFAULT_CHANNELS)] UINT32 InputChannels, + [in, defaultvalue(XAUDIO2_DEFAULT_SAMPLERATE)] UINT32 InputSampleRate, + [in, defaultvalue(0)] UINT32 Flags, + [in, defaultvalue(0)] UINT32 DeviceIndex, + [in, defaultvalue(NULL)] const XAUDIO2_EFFECT_CHAIN* pEffectChain); + + HRESULT StartEngine(); + + void StopEngine(); + + HRESULT CommitChanges([in] UINT32 OperationSet); + + void GetPerformanceData([out] XAUDIO2_PERFORMANCE_DATA* pPerfData); + + [local] void SetDebugConfiguration( + [in] const XAUDIO2_DEBUG_CONFIGURATION* pDebugConfiguration, + [in, defaultvalue(NULL)] void* pReserved); +} + [ object, uuid(8bcf1f58-9fe7-4583-8ac6-e2adc465c8bb), -- 2.17.2

3 3

[PATCH] xaudio2: Fix uninitialized variable access (Valgrind)
by elee＠codeweavers.com 28 Feb '19

28 Feb '19

From: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Ethan Lee <elee(a)codeweavers.com> --- dlls/xaudio2_7/compat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c index 318f668589..bc33cb92ed 100644 --- a/dlls/xaudio2_7/compat.c +++ b/dlls/xaudio2_7/compat.c @@ -923,7 +923,7 @@ static HRESULT WINAPI XA20SUB_SetOutputVoices(IXAudio20SubmixVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); - XAUDIO2_VOICE_SENDS sends, *psends; + XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; TRACE("%p, %p\n", This, pSendList); @@ -1483,7 +1483,7 @@ static HRESULT WINAPI XA20M_SetOutputVoices(IXAudio20MasteringVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); - XAUDIO2_VOICE_SENDS sends, *psends; + XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; TRACE("%p, %p\n", This, pSendList); @@ -2115,7 +2115,7 @@ static HRESULT WINAPI XA20_CreateSubmixVoice(IXAudio20 *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { IXAudio2Impl *This = impl_from_IXAudio20(iface); - XAUDIO2_VOICE_SENDS sends, *psends; + XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; if(pSendList){ @@ -2350,7 +2350,7 @@ static HRESULT WINAPI XA22_CreateSubmixVoice(IXAudio22 *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { IXAudio2Impl *This = impl_from_IXAudio22(iface); - XAUDIO2_VOICE_SENDS sends, *psends; + XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; if(pSendList){ -- 2.17.2

3 2

[PATCH] msvcrt: Remove redundant not-NULL check (coccinellery)
by Michael Stefaniuc 28 Feb '19

28 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- return MultiByteToWideChar() if wcstr is NULL. dlls/msvcrt/mbcs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 9b22adca1c..1ea8163296 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2395,7 +2395,7 @@ MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr, } } - if(size<count && wcstr) + if(size<count) wcstr[size] = '\0'; return size; -- 2.20.1

2 1

[PATCH v3 1/3] comctl32/listbox.c Use helper functions for item initialization.
by Huw Davies 28 Feb '19

28 Feb '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- Sorry, this time with a couple of unused params removed. dlls/comctl32/listbox.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index f2d0615bda..002501729f 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -171,6 +171,11 @@ static WCHAR *get_item_string( const LB_DESCR *descr, UINT index ) return HAS_STRINGS(descr) ? descr->items[index].str : NULL; } +static void set_item_string( const LB_DESCR *descr, UINT index, WCHAR *string ) +{ + if (!(descr->style & LBS_NODATA)) descr->items[index].str = string; +} + static UINT get_item_height( const LB_DESCR *descr, UINT index ) { return (descr->style & LBS_NODATA) ? 0 : descr->items[index].height; @@ -194,7 +199,7 @@ static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state) descr->items[index].selected = state; } -static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR data) +static void insert_item_data(LB_DESCR *descr, UINT index) { LB_ITEMDATA *item; @@ -203,11 +208,6 @@ static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR item = descr->items + index; if (index < descr->nb_items) memmove(item + 1, item, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); - - item->str = str; - item->data = HAS_STRINGS(descr) ? 0 : data; - item->height = 0; - item->selected = FALSE; } static void remove_item_data(LB_DESCR *descr, UINT index) @@ -1599,8 +1599,12 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, else if ((index < 0) || (index > descr->nb_items)) return LB_ERR; if (!resize_storage(descr, descr->nb_items + 1)) return LB_ERR; - insert_item_data(descr, index, str, data); + insert_item_data(descr, index); descr->nb_items++; + set_item_string(descr, index, str); + set_item_data(descr, index, HAS_STRINGS(descr) ? 0 : data); + set_item_height(descr, index, 0); + set_item_selected_state(descr, index, FALSE); /* Get item height */ -- 2.18.0

2 1

[PATCH vkd3d] vkd3d: Use vkCmdResolveImage() to resolve typeless resources if possible.
by Józef Kucia 28 Feb '19

28 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 5b11c3c43d44..4999280a2afc 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2855,8 +2855,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresource(ID3D12Graphi ID3D12Resource *src, UINT src_sub_resource_idx, DXGI_FORMAT format) { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + const struct vkd3d_format *src_format, *dst_format, *vk_format; struct d3d12_resource *dst_resource, *src_resource; - const struct vkd3d_format *src_format, *dst_format; const struct vkd3d_vk_device_procs *vk_procs; VkImageResolve vk_image_resolve; @@ -2876,13 +2876,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresource(ID3D12Graphi d3d12_command_list_end_current_render_pass(list); - if (dxgi_format_is_typeless(dst_resource->desc.Format) - || dxgi_format_is_typeless(src_resource->desc.Format)) - { - FIXME("Not implemented for typeless resources.\n"); - return; - } - if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(&dst_resource->desc, DXGI_FORMAT_UNKNOWN))) { WARN("Invalid format %#x.\n", dst_resource->desc.Format); @@ -2894,6 +2887,20 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresource(ID3D12Graphi return; } + if (dxgi_format_is_typeless(dst_resource->desc.Format) || dxgi_format_is_typeless(src_resource->desc.Format)) + { + if (!(vk_format = vkd3d_format_from_d3d12_resource_desc(&dst_resource->desc, format))) + { + WARN("Invalid format %#x.\n", format); + return; + } + if (dst_format->vk_format != src_format->vk_format || dst_format->vk_format != vk_format->vk_format) + { + FIXME("Not implemented for typeless resources.\n"); + return; + } + } + /* Resolve of depth/stencil images is not supported in Vulkan. */ if ((dst_format->vk_aspect_mask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) || (src_format->vk_aspect_mask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))) -- 2.19.2

2 1

[PATCH v3 3/3] comctl32/listbox: Implement LBS_NODATA for multi-selection listboxes
by Huw Davies 28 Feb '19

28 Feb '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Use a byte array to store selection state of items, since we don't need any other data for LBS_NODATA multi-selection listboxes. This improves memory usage dramatically for large lists, and performance boosts are nice too. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/listbox.c | 72 +++++++++++++++++++++++++---------------- 1 file changed, 45 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 04540ad5d0..bd9cffd1a3 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * TODO: - * - LBS_NODATA for multi-selection listboxes */ #include <string.h> @@ -71,7 +69,11 @@ typedef struct UINT style; /* Window style */ INT width; /* Window width */ INT height; /* Window height */ - LB_ITEMDATA *items; /* Array of items */ + union + { + LB_ITEMDATA *items; /* Array of items */ + BYTE *nodata_items; /* For multi-selection LBS_NODATA */ + } u; INT nb_items; /* Number of items */ UINT items_size; /* Total number of allocated items in the array */ INT top_item; /* Top visible item */ @@ -127,9 +129,19 @@ static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE; static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ); +/* + For listboxes without LBS_NODATA, an array of LB_ITEMDATA is allocated + to store the states of each item into descr->u.items. + + For single-selection LBS_NODATA listboxes, no storage is allocated, + and thus descr->u.nodata_items will always be NULL. + + For multi-selection LBS_NODATA listboxes, one byte per item is stored + for the item's selection state into descr->u.nodata_items. +*/ static size_t get_sizeof_item( const LB_DESCR *descr ) { - return sizeof(LB_ITEMDATA); + return (descr->style & LBS_NODATA) ? sizeof(BYTE) : sizeof(LB_ITEMDATA); } static BOOL resize_storage(LB_DESCR *descr, UINT items_size) @@ -142,20 +154,20 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) items_size = (items_size + LB_ARRAY_GRANULARITY - 1) & ~(LB_ARRAY_GRANULARITY - 1); if ((descr->style & (LBS_NODATA | LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) != LBS_NODATA) { - items = heap_realloc(descr->items, items_size * get_sizeof_item(descr)); + items = heap_realloc(descr->u.items, items_size * get_sizeof_item(descr)); if (!items) { SEND_NOTIFICATION(descr, LBN_ERRSPACE); return FALSE; } - descr->items = items; + descr->u.items = items; } descr->items_size = items_size; } - if ((descr->style & LBS_NODATA) && descr->items && items_size > descr->nb_items) + if ((descr->style & LBS_NODATA) && descr->u.nodata_items && items_size > descr->nb_items) { - memset(&descr->items[descr->nb_items], 0, + memset(descr->u.nodata_items + descr->nb_items, 0, (items_size - descr->nb_items) * get_sizeof_item(descr)); } return TRUE; @@ -163,69 +175,75 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) static ULONG_PTR get_item_data( const LB_DESCR *descr, UINT index ) { - return (descr->style & LBS_NODATA) ? 0 : descr->items[index].data; + return (descr->style & LBS_NODATA) ? 0 : descr->u.items[index].data; } static void set_item_data( LB_DESCR *descr, UINT index, ULONG_PTR data ) { - if (!(descr->style & LBS_NODATA)) descr->items[index].data = data; + if (!(descr->style & LBS_NODATA)) descr->u.items[index].data = data; } static WCHAR *get_item_string( const LB_DESCR *descr, UINT index ) { - return HAS_STRINGS(descr) ? descr->items[index].str : NULL; + return HAS_STRINGS(descr) ? descr->u.items[index].str : NULL; } static void set_item_string( const LB_DESCR *descr, UINT index, WCHAR *string ) { - if (!(descr->style & LBS_NODATA)) descr->items[index].str = string; + if (!(descr->style & LBS_NODATA)) descr->u.items[index].str = string; } static UINT get_item_height( const LB_DESCR *descr, UINT index ) { - return (descr->style & LBS_NODATA) ? 0 : descr->items[index].height; + return (descr->style & LBS_NODATA) ? 0 : descr->u.items[index].height; } static void set_item_height( LB_DESCR *descr, UINT index, UINT height ) { - if (!(descr->style & LBS_NODATA)) descr->items[index].height = height; + if (!(descr->style & LBS_NODATA)) descr->u.items[index].height = height; } static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) { if (!(descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL))) return index == descr->selected_item; - return descr->items[index].selected; + if (descr->style & LBS_NODATA) + return descr->u.nodata_items[index]; + else + return descr->u.items[index].selected; } static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state) { if (descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) - descr->items[index].selected = state; + { + if (descr->style & LBS_NODATA) + descr->u.nodata_items[index] = state; + else + descr->u.items[index].selected = state; + } } static void insert_item_data(LB_DESCR *descr, UINT index) { size_t size = get_sizeof_item(descr); - LB_ITEMDATA *item; + BYTE *p = descr->u.nodata_items + index * size; - if (!descr->items) return; + if (!descr->u.items) return; - item = descr->items + index; if (index < descr->nb_items) - memmove(item + 1, item, (descr->nb_items - index) * size); + memmove(p + size, p, (descr->nb_items - index) * size); } static void remove_item_data(LB_DESCR *descr, UINT index) { size_t size = get_sizeof_item(descr); - LB_ITEMDATA *item; + BYTE *p = descr->u.nodata_items + index * size; - if (!descr->items) return; + if (!descr->u.items) return; - item = descr->items + index; if (index < descr->nb_items) - memmove(item, item + 1, (descr->nb_items - index) * size); + memmove(p, p + size, (descr->nb_items - index) * size); } /*********************************************************************** @@ -1782,14 +1800,14 @@ static void LISTBOX_ResetContent( LB_DESCR *descr ) if (!(descr->style & LBS_NODATA)) for (i = descr->nb_items - 1; i >= 0; i--) LISTBOX_DeleteItem(descr, i); - HeapFree( GetProcessHeap(), 0, descr->items ); + HeapFree( GetProcessHeap(), 0, descr->u.items ); descr->nb_items = 0; descr->top_item = 0; descr->selected_item = -1; descr->focus_item = 0; descr->anchor_item = -1; descr->items_size = 0; - descr->items = NULL; + descr->u.items = NULL; } @@ -2536,7 +2554,7 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) descr->style = GetWindowLongW( descr->self, GWL_STYLE ); descr->width = rect.right - rect.left; descr->height = rect.bottom - rect.top; - descr->items = NULL; + descr->u.items = NULL; descr->items_size = 0; descr->nb_items = 0; descr->top_item = 0; -- 2.18.0

1 0

[PATCH v3 2/3] comctl32/listbox: Use a helper to get the size of an item
by Huw Davies 28 Feb '19

28 Feb '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/listbox.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 002501729f..04540ad5d0 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -127,6 +127,11 @@ static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE; static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ); +static size_t get_sizeof_item( const LB_DESCR *descr ) +{ + return sizeof(LB_ITEMDATA); +} + static BOOL resize_storage(LB_DESCR *descr, UINT items_size) { LB_ITEMDATA *items; @@ -137,7 +142,7 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) items_size = (items_size + LB_ARRAY_GRANULARITY - 1) & ~(LB_ARRAY_GRANULARITY - 1); if ((descr->style & (LBS_NODATA | LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) != LBS_NODATA) { - items = heap_realloc(descr->items, items_size * sizeof(LB_ITEMDATA)); + items = heap_realloc(descr->items, items_size * get_sizeof_item(descr)); if (!items) { SEND_NOTIFICATION(descr, LBN_ERRSPACE); @@ -151,7 +156,7 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) if ((descr->style & LBS_NODATA) && descr->items && items_size > descr->nb_items) { memset(&descr->items[descr->nb_items], 0, - (items_size - descr->nb_items) * sizeof(LB_ITEMDATA)); + (items_size - descr->nb_items) * get_sizeof_item(descr)); } return TRUE; } @@ -201,24 +206,26 @@ static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state) static void insert_item_data(LB_DESCR *descr, UINT index) { + size_t size = get_sizeof_item(descr); LB_ITEMDATA *item; if (!descr->items) return; item = descr->items + index; if (index < descr->nb_items) - memmove(item + 1, item, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); + memmove(item + 1, item, (descr->nb_items - index) * size); } static void remove_item_data(LB_DESCR *descr, UINT index) { + size_t size = get_sizeof_item(descr); LB_ITEMDATA *item; if (!descr->items) return; item = descr->items + index; if (index < descr->nb_items) - memmove(item, item + 1, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); + memmove(item, item + 1, (descr->nb_items - index) * size); } /*********************************************************************** -- 2.18.0

1 0

[PATCH v3 1/4] comctl32/listbox: Use a helper to set item data by index
by Gabriel Ivăncescu 28 Feb '19

28 Feb '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/listbox.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 2b6702a..954866a 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -161,6 +161,11 @@ static ULONG_PTR get_item_data( const LB_DESCR *descr, UINT index ) return (descr->style & LBS_NODATA) ? 0 : descr->items[index].data; } +static void set_item_data( LB_DESCR *descr, UINT index, ULONG_PTR data ) +{ + if (!(descr->style & LBS_NODATA)) descr->items[index].data = data; +} + static WCHAR *get_item_string( const LB_DESCR *descr, UINT index ) { return HAS_STRINGS(descr) ? descr->items[index].str : NULL; @@ -2684,7 +2689,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - if (!(descr->style & LBS_NODATA)) descr->items[wParam].data = lParam; + set_item_data(descr, wParam, lParam); /* undocumented: returns TRUE, not LB_OKAY (0) */ return TRUE; -- 2.20.1

2 6

[PATCH 1/2] ole32: add CoEnableCallCancellation stub
by Louis Lenders 28 Feb '19

28 Feb '19

Wine bug https://bugs.winehq.org/show_bug.cgi?id=46732 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/ole32/compobj.c | 10 ++++++++++ dlls/ole32/ole32.spec | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index a28ff79924..62ba6ed816 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -5197,6 +5197,16 @@ HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) return info->apt ? S_OK : CO_E_NOTINITIALIZED; } +/*********************************************************************** + * CoEnableCallCancellation [OLE32.@] + */ +HRESULT WINAPI CoEnableCallCancellation(void* reserved) +{ + FIXME("(%p): stub\n", reserved); + + return E_FAIL; +} + /*********************************************************************** * CoRegisterSurrogate [OLE32.@] */ diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index d5a71b31ce..b2db3fdf04 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -16,6 +16,7 @@ @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) @ stdcall CoDisconnectObject(ptr long) @ stdcall CoDosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime +@ stdcall CoEnableCallCancellation(ptr) @ stdcall CoFileTimeNow(ptr) @ stdcall CoFileTimeToDosDateTime(ptr ptr ptr) kernel32.FileTimeToDosDateTime @ stdcall CoFreeAllLibraries() -- 2.20.1

2 2

[PATCH v2 3/3] comctl32/listbox: Implement LBS_NODATA for multi-selection listboxes
by Huw Davies 28 Feb '19

28 Feb '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Use a byte array to store selection state of items, since we don't need any other data for LBS_NODATA multi-selection listboxes. This improves memory usage dramatically for large lists, and performance boosts are nice too. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/listbox.c | 72 +++++++++++++++++++++++++---------------- 1 file changed, 45 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 9e17235acc..217a0865fb 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * TODO: - * - LBS_NODATA for multi-selection listboxes */ #include <string.h> @@ -71,7 +69,11 @@ typedef struct UINT style; /* Window style */ INT width; /* Window width */ INT height; /* Window height */ - LB_ITEMDATA *items; /* Array of items */ + union + { + LB_ITEMDATA *items; /* Array of items */ + BYTE *nodata_items; /* For multi-selection LBS_NODATA */ + } u; INT nb_items; /* Number of items */ UINT items_size; /* Total number of allocated items in the array */ INT top_item; /* Top visible item */ @@ -127,9 +129,19 @@ static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE; static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ); +/* + For listboxes without LBS_NODATA, an array of LB_ITEMDATA is allocated + to store the states of each item into descr->u.items. + + For single-selection LBS_NODATA listboxes, no storage is allocated, + and thus descr->u.nodata_items will always be NULL. + + For multi-selection LBS_NODATA listboxes, one byte per item is stored + for the item's selection state into descr->u.nodata_items. +*/ static size_t get_sizeof_item( const LB_DESCR *descr ) { - return sizeof(LB_ITEMDATA); + return (descr->style & LBS_NODATA) ? sizeof(BYTE) : sizeof(LB_ITEMDATA); } static BOOL resize_storage(LB_DESCR *descr, UINT items_size) @@ -142,20 +154,20 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) items_size = (items_size + LB_ARRAY_GRANULARITY - 1) & ~(LB_ARRAY_GRANULARITY - 1); if ((descr->style & (LBS_NODATA | LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) != LBS_NODATA) { - items = heap_realloc(descr->items, items_size * get_sizeof_item(descr)); + items = heap_realloc(descr->u.items, items_size * get_sizeof_item(descr)); if (!items) { SEND_NOTIFICATION(descr, LBN_ERRSPACE); return FALSE; } - descr->items = items; + descr->u.items = items; } descr->items_size = items_size; } - if ((descr->style & LBS_NODATA) && descr->items && items_size > descr->nb_items) + if ((descr->style & LBS_NODATA) && descr->u.nodata_items && items_size > descr->nb_items) { - memset(&descr->items[descr->nb_items], 0, + memset(descr->u.nodata_items + descr->nb_items, 0, (items_size - descr->nb_items) * get_sizeof_item(descr)); } return TRUE; @@ -163,69 +175,75 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) static ULONG_PTR get_item_data( const LB_DESCR *descr, UINT index ) { - return (descr->style & LBS_NODATA) ? 0 : descr->items[index].data; + return (descr->style & LBS_NODATA) ? 0 : descr->u.items[index].data; } static void set_item_data( LB_DESCR *descr, UINT index, ULONG_PTR data ) { - if (!(descr->style & LBS_NODATA)) descr->items[index].data = data; + if (!(descr->style & LBS_NODATA)) descr->u.items[index].data = data; } static WCHAR *get_item_string( const LB_DESCR *descr, UINT index ) { - return HAS_STRINGS(descr) ? descr->items[index].str : NULL; + return HAS_STRINGS(descr) ? descr->u.items[index].str : NULL; } static void set_item_string( const LB_DESCR *descr, UINT index, WCHAR *string ) { - if (!(descr->style & LBS_NODATA)) descr->items[index].str = string; + if (!(descr->style & LBS_NODATA)) descr->u.items[index].str = string; } static UINT get_item_height( const LB_DESCR *descr, UINT index ) { - return (descr->style & LBS_NODATA) ? 0 : descr->items[index].height; + return (descr->style & LBS_NODATA) ? 0 : descr->u.items[index].height; } static void set_item_height( LB_DESCR *descr, UINT index, UINT height ) { - if (!(descr->style & LBS_NODATA)) descr->items[index].height = height; + if (!(descr->style & LBS_NODATA)) descr->u.items[index].height = height; } static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) { if (!(descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL))) return index == descr->selected_item; - return descr->items[index].selected; + if (descr->style & LBS_NODATA) + return descr->u.nodata_items[index]; + else + return descr->u.items[index].selected; } static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state) { if (descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) - descr->items[index].selected = state; + { + if (descr->style & LBS_NODATA) + descr->u.nodata_items[index] = state; + else + descr->u.items[index].selected = state; + } } static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR data) { size_t size = get_sizeof_item(descr); - LB_ITEMDATA *item; + BYTE *p = descr->u.nodata_items + index * size; - if (!descr->items) return; + if (!descr->u.items) return; - item = descr->items + index; if (index < descr->nb_items) - memmove(item + 1, item, (descr->nb_items - index) * size); + memmove(p + size, p, (descr->nb_items - index) * size); } static void remove_item_data(LB_DESCR *descr, UINT index) { size_t size = get_sizeof_item(descr); - LB_ITEMDATA *item; + BYTE *p = descr->u.nodata_items + index * size; - if (!descr->items) return; + if (!descr->u.items) return; - item = descr->items + index; if (index < descr->nb_items) - memmove(item, item + 1, (descr->nb_items - index) * size); + memmove(p, p + size, (descr->nb_items - index) * size); } /*********************************************************************** @@ -1782,14 +1800,14 @@ static void LISTBOX_ResetContent( LB_DESCR *descr ) if (!(descr->style & LBS_NODATA)) for (i = descr->nb_items - 1; i >= 0; i--) LISTBOX_DeleteItem(descr, i); - HeapFree( GetProcessHeap(), 0, descr->items ); + HeapFree( GetProcessHeap(), 0, descr->u.items ); descr->nb_items = 0; descr->top_item = 0; descr->selected_item = -1; descr->focus_item = 0; descr->anchor_item = -1; descr->items_size = 0; - descr->items = NULL; + descr->u.items = NULL; } @@ -2536,7 +2554,7 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) descr->style = GetWindowLongW( descr->self, GWL_STYLE ); descr->width = rect.right - rect.left; descr->height = rect.bottom - rect.top; - descr->items = NULL; + descr->u.items = NULL; descr->items_size = 0; descr->nb_items = 0; descr->top_item = 0; -- 2.18.0

1 0

[PATCH v2 2/3] comctl32/listbox: Use a helper to get the size of an item
by Huw Davies 28 Feb '19

28 Feb '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/listbox.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index db5dd70445..9e17235acc 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -127,6 +127,11 @@ static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE; static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ); +static size_t get_sizeof_item( const LB_DESCR *descr ) +{ + return sizeof(LB_ITEMDATA); +} + static BOOL resize_storage(LB_DESCR *descr, UINT items_size) { LB_ITEMDATA *items; @@ -137,7 +142,7 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) items_size = (items_size + LB_ARRAY_GRANULARITY - 1) & ~(LB_ARRAY_GRANULARITY - 1); if ((descr->style & (LBS_NODATA | LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) != LBS_NODATA) { - items = heap_realloc(descr->items, items_size * sizeof(LB_ITEMDATA)); + items = heap_realloc(descr->items, items_size * get_sizeof_item(descr)); if (!items) { SEND_NOTIFICATION(descr, LBN_ERRSPACE); @@ -151,7 +156,7 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) if ((descr->style & LBS_NODATA) && descr->items && items_size > descr->nb_items) { memset(&descr->items[descr->nb_items], 0, - (items_size - descr->nb_items) * sizeof(LB_ITEMDATA)); + (items_size - descr->nb_items) * get_sizeof_item(descr)); } return TRUE; } @@ -201,24 +206,26 @@ static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state) static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR data) { + size_t size = get_sizeof_item(descr); LB_ITEMDATA *item; if (!descr->items) return; item = descr->items + index; if (index < descr->nb_items) - memmove(item + 1, item, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); + memmove(item + 1, item, (descr->nb_items - index) * size); } static void remove_item_data(LB_DESCR *descr, UINT index) { + size_t size = get_sizeof_item(descr); LB_ITEMDATA *item; if (!descr->items) return; item = descr->items + index; if (index < descr->nb_items) - memmove(item, item + 1, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); + memmove(item, item + 1, (descr->nb_items - index) * size); } /*********************************************************************** -- 2.18.0

1 0

[PATCH v2 1/3] comctl32/listbox.c Use helper functions for item initialization.
by Huw Davies 28 Feb '19

28 Feb '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/listbox.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index f2d0615bda..db5dd70445 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -171,6 +171,11 @@ static WCHAR *get_item_string( const LB_DESCR *descr, UINT index ) return HAS_STRINGS(descr) ? descr->items[index].str : NULL; } +static void set_item_string( const LB_DESCR *descr, UINT index, WCHAR *string ) +{ + if (!(descr->style & LBS_NODATA)) descr->items[index].str = string; +} + static UINT get_item_height( const LB_DESCR *descr, UINT index ) { return (descr->style & LBS_NODATA) ? 0 : descr->items[index].height; @@ -203,11 +208,6 @@ static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR item = descr->items + index; if (index < descr->nb_items) memmove(item + 1, item, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); - - item->str = str; - item->data = HAS_STRINGS(descr) ? 0 : data; - item->height = 0; - item->selected = FALSE; } static void remove_item_data(LB_DESCR *descr, UINT index) @@ -1601,6 +1601,10 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, insert_item_data(descr, index, str, data); descr->nb_items++; + set_item_string(descr, index, str); + set_item_data(descr, index, HAS_STRINGS(descr) ? 0 : data); + set_item_height(descr, index, 0); + set_item_selected_state(descr, index, FALSE); /* Get item height */ -- 2.18.0

1 0

[PATCH v2 1/2] ole32: Add CoEnableCallCancellation stub.
by Huw Davies 28 Feb '19

28 Feb '19

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Wine bug https://bugs.winehq.org/show_bug.cgi?id=46732 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- .../api-ms-win-core-com-l1-1-0.spec | 2 +- .../api-ms-win-core-com-l1-1-1.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 10 ++++++++++ dlls/ole32/ole32.spec | 1 + include/objbase.h | 2 ++ 6 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec index 954d6dae02..aea0fef687 100644 --- a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec +++ b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec @@ -14,7 +14,7 @@ @ stub CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject -@ stub CoEnableCallCancellation +@ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation @ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries @ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx @ stdcall CoGetApartmentType(ptr ptr) ole32.CoGetApartmentType diff --git a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec index a124d34f0e..3cfdedae38 100644 --- a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec +++ b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec @@ -14,7 +14,7 @@ @ stub CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject -@ stub CoEnableCallCancellation +@ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation @ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries @ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx @ stdcall CoGetApartmentType(ptr ptr) ole32.CoGetApartmentType diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index cffb33f0a3..76bd66558b 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -85,7 +85,7 @@ @ stub CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject -@ stub CoEnableCallCancellation +@ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation @ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries @ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx @ stdcall CoGetActivationState(int128 long ptr) ole32.CoGetActivationState diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index a28ff79924..385a8df922 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -5197,6 +5197,16 @@ HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) return info->apt ? S_OK : CO_E_NOTINITIALIZED; } +/*********************************************************************** + * CoEnableCallCancellation [OLE32.@] + */ +HRESULT WINAPI CoEnableCallCancellation(void *reserved) +{ + FIXME("(%p): stub\n", reserved); + + return E_NOTIMPL; +} + /*********************************************************************** * CoRegisterSurrogate [OLE32.@] */ diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index d5a71b31ce..b2db3fdf04 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -16,6 +16,7 @@ @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) @ stdcall CoDisconnectObject(ptr long) @ stdcall CoDosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime +@ stdcall CoEnableCallCancellation(ptr) @ stdcall CoFileTimeNow(ptr) @ stdcall CoFileTimeToDosDateTime(ptr ptr ptr) kernel32.FileTimeToDosDateTime @ stdcall CoFreeAllLibraries() diff --git a/include/objbase.h b/include/objbase.h index 875f0e152d..8af7a80b78 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -350,6 +350,8 @@ HRESULT WINAPI CoUnmarshalHresult(LPSTREAM pstm, HRESULT* phresult); HRESULT WINAPI CoUnmarshalInterface(LPSTREAM pStm, REFIID riid, LPVOID* ppv); HRESULT WINAPI CoLockObjectExternal(LPUNKNOWN pUnk, BOOL fLock, BOOL fLastUnlockReleases); BOOL WINAPI CoIsHandlerConnected(LPUNKNOWN pUnk); +HRESULT WINAPI CoDisableCallCancellation(void *reserved); +HRESULT WINAPI CoEnableCallCancellation(void *reserved); /* security */ HRESULT WINAPI CoInitializeSecurity(PSECURITY_DESCRIPTOR pSecDesc, LONG cAuthSvc, SOLE_AUTHENTICATION_SERVICE* asAuthSvc, void* pReserved1, DWORD dwAuthnLevel, DWORD dwImpLevel, void* pReserved2, DWORD dwCapabilities, void* pReserved3); -- 2.18.0

2 1

[PATCH v2 2/2] ole32: Add CoDisableCallCancellation stub.
by Huw Davies 28 Feb '19

28 Feb '19

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- .../api-ms-win-core-com-l1-1-0.spec | 2 +- .../api-ms-win-core-com-l1-1-1.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 10 ++++++++++ dlls/ole32/ole32.spec | 1 + 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec index aea0fef687..bc85dda7fa 100644 --- a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec +++ b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec @@ -11,7 +11,7 @@ @ stub CoCreateInstanceFromApp @ stub CoDecodeProxy @ stub CoDecrementMTAUsage -@ stub CoDisableCallCancellation +@ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation diff --git a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec index 3cfdedae38..9a8f1da3cc 100644 --- a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec +++ b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec @@ -11,7 +11,7 @@ @ stub CoCreateInstanceFromApp @ stub CoDecodeProxy @ stub CoDecrementMTAUsage -@ stub CoDisableCallCancellation +@ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 76bd66558b..93575d5684 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -82,7 +82,7 @@ @ stub CoDeactivateObject @ stub CoDecodeProxy @ stub CoDecrementMTAUsage -@ stub CoDisableCallCancellation +@ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 385a8df922..fc93a2afad 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -5197,6 +5197,16 @@ HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) return info->apt ? S_OK : CO_E_NOTINITIALIZED; } +/*********************************************************************** + * CoDisableCallCancellation [OLE32.@] + */ +HRESULT WINAPI CoDisableCallCancellation(void *reserved) +{ + FIXME("(%p): stub\n", reserved); + + return E_NOTIMPL; +} + /*********************************************************************** * CoEnableCallCancellation [OLE32.@] */ diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index b2db3fdf04..5e0e7030b2 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -14,6 +14,7 @@ @ stdcall CoCreateGuid(ptr) @ stdcall CoCreateInstance(ptr ptr long ptr ptr) @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) +@ stdcall CoDisableCallCancellation(ptr) @ stdcall CoDisconnectObject(ptr long) @ stdcall CoDosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime @ stdcall CoEnableCallCancellation(ptr) -- 2.18.0

1 0

[PATCH] include: Add more DB_E_* defines
by Alistair Leslie-Hughes 28 Feb '19

28 Feb '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/oledberr.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/oledberr.h b/include/oledberr.h index 8af38ef4c2..61093ea149 100644 --- a/include/oledberr.h +++ b/include/oledberr.h @@ -21,6 +21,14 @@ #ifndef __WINE_OLEDBERR_H #define __WINE_OLEDBERR_H +#define DB_E_BADACCESSORHANDLE 0x80040e00 +#define DB_E_ROWLIMITEXCEEDED 0x80040e01 +#define DB_E_READONLYACCESSOR 0x80040e02 +#define DB_E_SCHEMAVIOLATION 0x80040e03 +#define DB_E_BADROWHANDLE 0x80040e04 +#define DB_E_OBJECTOPEN 0x80040e05 +#define DB_E_BADCHAPTER 0x80040e06 +#define DB_E_CANTCONVERTVALUE 0x80040e07 #define DB_E_BADBINDINFO 0x80040e08 #define DB_E_ERRORSINCOMMAND 0x80040e14 -- 2.20.1

1 0

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 28 Feb '19

28 Feb '19

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/fi.po b/po/fi.po index b34e78e707..1ddac187db 100644 --- a/po/fi.po +++ b/po/fi.po @@ -16284,10 +16284,8 @@ msgid "Text documents (*.txt)" msgstr "Tekstitiedostot (*.txt)" #: wordpad.rc:149 -#, fuzzy -#| msgid "Unicode text document (*.txt)" msgid "Unicode text documents (*.txt)" -msgstr "Unicode-tekstitiedosto (*.txt)" +msgstr "Unicode-tekstitiedostot (*.txt)" #: wordpad.rc:150 msgid "Rich text format (*.rtf)" -- 2.21.0

1 0

[PATCH v2 1/4] quartz/tests/avisplit: Add some tests for media types.
by Zebediah Figura 28 Feb '19

28 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/avisplit.c | 127 +++++++++++++++++++++++++++++++++++ include/wmcodecdsp.idl | 2 + 2 files changed, 129 insertions(+) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 633f1647c0..a2c0fba70a 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -21,6 +21,8 @@ #define COBJMACROS #include "dshow.h" +#include "initguid.h" +#include "wmcodecdsp.h" #include "wine/test.h" static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; @@ -408,6 +410,130 @@ todo_wine ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } +static void test_media_types(void) +{ + static const VIDEOINFOHEADER expect_vih = + { + {0}, {0}, 0, 0, 1000 * 10000, + {sizeof(BITMAPINFOHEADER), 32, 24, 1, 12, mmioFOURCC('I','4','2','0'), 32*24*12/8} + }; + + const WCHAR *filename = load_resource(avifile); + IBaseFilter *filter = create_avi_splitter(); + AM_MEDIA_TYPE mt = {0}, *pmt; + IEnumMediaTypes *enummt; + IFilterGraph2 *graph; + HRESULT hr; + ULONG ref; + IPin *pin; + BOOL ret; + + IBaseFilter_FindPin(filter, sink_name, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + mt.majortype = MEDIATYPE_Stream; + mt.subtype = MEDIASUBTYPE_Avi; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.bFixedSizeSamples = TRUE; + mt.bTemporalCompression = TRUE; + mt.lSampleSize = 123; + mt.formattype = FORMAT_WaveFormatEx; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.majortype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.majortype = MEDIATYPE_Stream; + + mt.subtype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.subtype = MEDIASUBTYPE_Avi; + + graph = connect_input(filter, filename); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); + + IBaseFilter_FindPin(filter, source0_name, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Video), "Got major type %s\n", + wine_dbgstr_guid(&pmt->majortype)); + ok(IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_I420), "Got subtype %s\n", + wine_dbgstr_guid(&pmt->subtype)); + ok(!pmt->bFixedSizeSamples, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + todo_wine ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); + ok(pmt->lSampleSize == 1, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &FORMAT_VideoInfo), "Got format type %s.\n", + wine_dbgstr_guid(&pmt->formattype)); + ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); + ok(pmt->cbFormat == sizeof(VIDEOINFOHEADER), "Got format size %u.\n", pmt->cbFormat); + ok(!memcmp(pmt->pbFormat, &expect_vih, sizeof(VIDEOINFOHEADER)), "Format blocks didn't match.\n"); + + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->bFixedSizeSamples = TRUE; + pmt->bTemporalCompression = TRUE; + pmt->lSampleSize = 123; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->majortype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->majortype = MEDIATYPE_Video; + + pmt->subtype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->subtype = MEDIASUBTYPE_I420; + + pmt->formattype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->formattype = FORMAT_None; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->formattype = FORMAT_VideoInfo; + + CoTaskMemFree(pmt->pbFormat); + CoTaskMemFree(pmt); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); + + IFilterGraph2_Release(graph); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); +} + static void test_filter_graph(void) { IFileSourceFilter *pfile = NULL; @@ -658,6 +784,7 @@ START_TEST(avisplit) test_enum_pins(); test_find_pin(); test_pin_info(); + test_media_types(); test_filter_graph(); CoUninitialize(); diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index 8ec303c4a4..d4547cd881 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -19,6 +19,8 @@ import "mediaobj.idl"; import "strmif.idl"; +cpp_quote("DEFINE_GUID(MEDIASUBTYPE_I420,0x30323449,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") + [ uuid(bbeea841-0a63-4f52-a7ab-a9b3a84ed38a) ] -- 2.20.1

2 5

[PATCH v3 1/4] quartz/tests/avisplit: Add some tests for media types.
by Zebediah Figura 28 Feb '19

28 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/avisplit.c | 127 +++++++++++++++++++++++++++++++++++ include/wmcodecdsp.idl | 2 + 2 files changed, 129 insertions(+) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 633f1647c0..a2c0fba70a 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -21,6 +21,8 @@ #define COBJMACROS #include "dshow.h" +#include "initguid.h" +#include "wmcodecdsp.h" #include "wine/test.h" static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; @@ -408,6 +410,130 @@ todo_wine ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } +static void test_media_types(void) +{ + static const VIDEOINFOHEADER expect_vih = + { + {0}, {0}, 0, 0, 1000 * 10000, + {sizeof(BITMAPINFOHEADER), 32, 24, 1, 12, mmioFOURCC('I','4','2','0'), 32*24*12/8} + }; + + const WCHAR *filename = load_resource(avifile); + IBaseFilter *filter = create_avi_splitter(); + AM_MEDIA_TYPE mt = {0}, *pmt; + IEnumMediaTypes *enummt; + IFilterGraph2 *graph; + HRESULT hr; + ULONG ref; + IPin *pin; + BOOL ret; + + IBaseFilter_FindPin(filter, sink_name, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + mt.majortype = MEDIATYPE_Stream; + mt.subtype = MEDIASUBTYPE_Avi; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.bFixedSizeSamples = TRUE; + mt.bTemporalCompression = TRUE; + mt.lSampleSize = 123; + mt.formattype = FORMAT_WaveFormatEx; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.majortype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.majortype = MEDIATYPE_Stream; + + mt.subtype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.subtype = MEDIASUBTYPE_Avi; + + graph = connect_input(filter, filename); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); + + IBaseFilter_FindPin(filter, source0_name, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Video), "Got major type %s\n", + wine_dbgstr_guid(&pmt->majortype)); + ok(IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_I420), "Got subtype %s\n", + wine_dbgstr_guid(&pmt->subtype)); + ok(!pmt->bFixedSizeSamples, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + todo_wine ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); + ok(pmt->lSampleSize == 1, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &FORMAT_VideoInfo), "Got format type %s.\n", + wine_dbgstr_guid(&pmt->formattype)); + ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); + ok(pmt->cbFormat == sizeof(VIDEOINFOHEADER), "Got format size %u.\n", pmt->cbFormat); + ok(!memcmp(pmt->pbFormat, &expect_vih, sizeof(VIDEOINFOHEADER)), "Format blocks didn't match.\n"); + + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->bFixedSizeSamples = TRUE; + pmt->bTemporalCompression = TRUE; + pmt->lSampleSize = 123; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->majortype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->majortype = MEDIATYPE_Video; + + pmt->subtype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->subtype = MEDIASUBTYPE_I420; + + pmt->formattype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->formattype = FORMAT_None; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->formattype = FORMAT_VideoInfo; + + CoTaskMemFree(pmt->pbFormat); + CoTaskMemFree(pmt); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); + + IFilterGraph2_Release(graph); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); +} + static void test_filter_graph(void) { IFileSourceFilter *pfile = NULL; @@ -658,6 +784,7 @@ START_TEST(avisplit) test_enum_pins(); test_find_pin(); test_pin_info(); + test_media_types(); test_filter_graph(); CoUninitialize(); diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index 8ec303c4a4..d4547cd881 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -19,6 +19,8 @@ import "mediaobj.idl"; import "strmif.idl"; +cpp_quote("DEFINE_GUID(MEDIASUBTYPE_I420,0x30323449,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") + [ uuid(bbeea841-0a63-4f52-a7ab-a9b3a84ed38a) ] -- 2.20.1

1 3

[PATCH] include: Add more DB_E_* defines
by Alistair Leslie-Hughes 28 Feb '19

28 Feb '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/oledberr.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/oledberr.h b/include/oledberr.h index 8af38ef..c3d0d29 100644 --- a/include/oledberr.h +++ b/include/oledberr.h @@ -21,6 +21,15 @@ #ifndef __WINE_OLEDBERR_H #define __WINE_OLEDBERR_H +#define DB_E_BADACCESSORHANDLE 0x80040e00 +#define DB_E_ROWLIMITEXCEEDED 0x80040e01 +#define DB_E_READONLYACCESSOR 0x80040e02 +#define DB_E_SCHEMAVIOLATION 0x80040e03 +#define DB_E_SCHEMAVIOLATION 0x80040e03 +#define DB_E_BADROWHANDLE 0x80040e04 +#define DB_E_OBJECTOPEN 0x80040e05 +#define DB_E_BADCHAPTER 0x80040e06 +#define DB_E_CANTCONVERTVALUE 0x80040e07 #define DB_E_BADBINDINFO 0x80040e08 #define DB_E_ERRORSINCOMMAND 0x80040e14 -- 1.9.1

2 1

[PATCH 1/4] quartz/tests/avisplit: Add some tests for media types.
by Zebediah Figura 28 Feb '19

28 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/avisplit.c | 127 +++++++++++++++++++++++++++++++++++ include/wmcodecdsp.idl | 2 + 2 files changed, 129 insertions(+) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 633f1647c0..a2c0fba70a 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -21,6 +21,8 @@ #define COBJMACROS #include "dshow.h" +#include "initguid.h" +#include "wmcodecdsp.h" #include "wine/test.h" static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; @@ -408,6 +410,130 @@ todo_wine ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } +static void test_media_types(void) +{ + static const VIDEOINFOHEADER expect_vih = + { + {0}, {0}, 0, 0, 1000 * 10000, + {sizeof(BITMAPINFOHEADER), 32, 24, 1, 12, mmioFOURCC('I','4','2','0'), 32*24*12/8} + }; + + const WCHAR *filename = load_resource(avifile); + IBaseFilter *filter = create_avi_splitter(); + AM_MEDIA_TYPE mt = {0}, *pmt; + IEnumMediaTypes *enummt; + IFilterGraph2 *graph; + HRESULT hr; + ULONG ref; + IPin *pin; + BOOL ret; + + IBaseFilter_FindPin(filter, sink_name, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + mt.majortype = MEDIATYPE_Stream; + mt.subtype = MEDIASUBTYPE_Avi; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.bFixedSizeSamples = TRUE; + mt.bTemporalCompression = TRUE; + mt.lSampleSize = 123; + mt.formattype = FORMAT_WaveFormatEx; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.majortype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.majortype = MEDIATYPE_Stream; + + mt.subtype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.subtype = MEDIASUBTYPE_Avi; + + graph = connect_input(filter, filename); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); + + IBaseFilter_FindPin(filter, source0_name, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Video), "Got major type %s\n", + wine_dbgstr_guid(&pmt->majortype)); + ok(IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_I420), "Got subtype %s\n", + wine_dbgstr_guid(&pmt->subtype)); + ok(!pmt->bFixedSizeSamples, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + todo_wine ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); + ok(pmt->lSampleSize == 1, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &FORMAT_VideoInfo), "Got format type %s.\n", + wine_dbgstr_guid(&pmt->formattype)); + ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); + ok(pmt->cbFormat == sizeof(VIDEOINFOHEADER), "Got format size %u.\n", pmt->cbFormat); + ok(!memcmp(pmt->pbFormat, &expect_vih, sizeof(VIDEOINFOHEADER)), "Format blocks didn't match.\n"); + + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->bFixedSizeSamples = TRUE; + pmt->bTemporalCompression = TRUE; + pmt->lSampleSize = 123; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->majortype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->majortype = MEDIATYPE_Video; + + pmt->subtype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->subtype = MEDIASUBTYPE_I420; + + pmt->formattype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->formattype = FORMAT_None; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->formattype = FORMAT_VideoInfo; + + CoTaskMemFree(pmt->pbFormat); + CoTaskMemFree(pmt); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); + + IFilterGraph2_Release(graph); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); +} + static void test_filter_graph(void) { IFileSourceFilter *pfile = NULL; @@ -658,6 +784,7 @@ START_TEST(avisplit) test_enum_pins(); test_find_pin(); test_pin_info(); + test_media_types(); test_filter_graph(); CoUninitialize(); diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index 8ec303c4a4..d4547cd881 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -19,6 +19,8 @@ import "mediaobj.idl"; import "strmif.idl"; +cpp_quote("DEFINE_GUID(MEDIASUBTYPE_I420,0x30323449,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") + [ uuid(bbeea841-0a63-4f52-a7ab-a9b3a84ed38a) ] -- 2.20.1

2 5

[PATCH 1/3] d3dx9: Rename the ID3DXEffect object and methods
by Michael Stefaniuc 27 Feb '19

27 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 536 ++++++++++++++++++++--------------------- 1 file changed, 264 insertions(+), 272 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b0dc366f6b..5bf66011ea 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -148,6 +148,8 @@ struct d3dx_technique struct IDirect3DStateBlock9 *saved_state; }; +#define ID3DXEffectImpl d3dx9_effect + struct d3dx9_base_effect { struct ID3DXEffectImpl *effect; @@ -170,7 +172,7 @@ struct d3dx9_base_effect unsigned int full_name_tmp_size; }; -struct ID3DXEffectImpl +struct d3dx9_effect { ID3DXEffect ID3DXEffect_iface; LONG ref; @@ -3394,13 +3396,13 @@ static inline struct d3dx_effect_pool *impl_from_ID3DXEffectPool(ID3DXEffectPool return CONTAINING_RECORD(iface, struct d3dx_effect_pool, ID3DXEffectPool_iface); } -static inline struct ID3DXEffectImpl *impl_from_ID3DXEffect(ID3DXEffect *iface) +static inline struct d3dx9_effect *impl_from_ID3DXEffect(ID3DXEffect *iface) { - return CONTAINING_RECORD(iface, struct ID3DXEffectImpl, ID3DXEffect_iface); + return CONTAINING_RECORD(iface, struct d3dx9_effect, ID3DXEffect_iface); } /*** IUnknown methods ***/ -static HRESULT WINAPI ID3DXEffectImpl_QueryInterface(ID3DXEffect *iface, REFIID riid, void **object) +static HRESULT WINAPI d3dx9_effect_QueryInterface(ID3DXEffect *iface, REFIID riid, void **object) { TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), object); @@ -3417,18 +3419,18 @@ static HRESULT WINAPI ID3DXEffectImpl_QueryInterface(ID3DXEffect *iface, REFIID return E_NOINTERFACE; } -static ULONG WINAPI ID3DXEffectImpl_AddRef(ID3DXEffect *iface) +static ULONG WINAPI d3dx9_effect_AddRef(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); TRACE("(%p)->(): AddRef from %u\n", This, This->ref); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI ID3DXEffectImpl_Release(ID3DXEffect *iface) +static ULONG WINAPI d3dx9_effect_Release(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p)->(): Release from %u\n", This, ref + 1); @@ -3443,45 +3445,46 @@ static ULONG WINAPI ID3DXEffectImpl_Release(ID3DXEffect *iface) } /*** ID3DXBaseEffect methods ***/ -static HRESULT WINAPI ID3DXEffectImpl_GetDesc(ID3DXEffect *iface, D3DXEFFECT_DESC *desc) +static HRESULT WINAPI d3dx9_effect_GetDesc(ID3DXEffect *iface, D3DXEFFECT_DESC *desc) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, desc %p.\n", iface, desc); return d3dx9_base_effect_get_desc(&effect->base_effect, desc); } -static HRESULT WINAPI ID3DXEffectImpl_GetParameterDesc(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXPARAMETER_DESC *desc) +static HRESULT WINAPI d3dx9_effect_GetParameterDesc(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXPARAMETER_DESC *desc) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, desc %p.\n", iface, parameter, desc); return d3dx9_base_effect_get_parameter_desc(&effect->base_effect, parameter, desc); } -static HRESULT WINAPI ID3DXEffectImpl_GetTechniqueDesc(ID3DXEffect *iface, - D3DXHANDLE technique, D3DXTECHNIQUE_DESC *desc) +static HRESULT WINAPI d3dx9_effect_GetTechniqueDesc(ID3DXEffect *iface, D3DXHANDLE technique, + D3DXTECHNIQUE_DESC *desc) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, technique %p, desc %p.\n", iface, technique, desc); return d3dx9_base_effect_get_technique_desc(&effect->base_effect, technique, desc); } -static HRESULT WINAPI ID3DXEffectImpl_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pass, D3DXPASS_DESC *desc) +static HRESULT WINAPI d3dx9_effect_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pass, D3DXPASS_DESC *desc) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, pass %p, desc %p.\n", iface, pass, desc); return d3dx9_base_effect_get_pass_desc(&effect->base_effect, pass, desc); } -static HRESULT WINAPI ID3DXEffectImpl_GetFunctionDesc(ID3DXEffect *iface, D3DXHANDLE shader, D3DXFUNCTION_DESC *desc) +static HRESULT WINAPI d3dx9_effect_GetFunctionDesc(ID3DXEffect *iface, D3DXHANDLE shader, + D3DXFUNCTION_DESC *desc) { struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); @@ -3490,82 +3493,81 @@ static HRESULT WINAPI ID3DXEffectImpl_GetFunctionDesc(ID3DXEffect *iface, D3DXHA return d3dx9_base_effect_get_function_desc(&effect->base_effect, shader, desc); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetParameter(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) +static D3DXHANDLE WINAPI d3dx9_effect_GetParameter(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, index %u.\n", iface, parameter, index); return d3dx9_base_effect_get_parameter(&effect->base_effect, parameter, index); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetParameterByName(ID3DXEffect *iface, - D3DXHANDLE parameter, const char *name) +static D3DXHANDLE WINAPI d3dx9_effect_GetParameterByName(ID3DXEffect *iface, D3DXHANDLE parameter, + const char *name) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, name %s.\n", iface, parameter, debugstr_a(name)); return d3dx9_base_effect_get_parameter_by_name(&effect->base_effect, parameter, name); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetParameterBySemantic(ID3DXEffect *iface, - D3DXHANDLE parameter, const char *semantic) +static D3DXHANDLE WINAPI d3dx9_effect_GetParameterBySemantic(ID3DXEffect *iface, D3DXHANDLE parameter, + const char *semantic) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, semantic %s.\n", iface, parameter, debugstr_a(semantic)); return d3dx9_base_effect_get_parameter_by_semantic(&effect->base_effect, parameter, semantic); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetParameterElement(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) +static D3DXHANDLE WINAPI d3dx9_effect_GetParameterElement(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, index %u.\n", iface, parameter, index); return d3dx9_base_effect_get_parameter_element(&effect->base_effect, parameter, index); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetTechnique(ID3DXEffect *iface, UINT index) +static D3DXHANDLE WINAPI d3dx9_effect_GetTechnique(ID3DXEffect *iface, UINT index) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, index %u.\n", iface, index); return d3dx9_base_effect_get_technique(&effect->base_effect, index); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetTechniqueByName(ID3DXEffect *iface, const char *name) +static D3DXHANDLE WINAPI d3dx9_effect_GetTechniqueByName(ID3DXEffect *iface, const char *name) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); return d3dx9_base_effect_get_technique_by_name(&effect->base_effect, name); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetPass(ID3DXEffect *iface, D3DXHANDLE technique, UINT index) +static D3DXHANDLE WINAPI d3dx9_effect_GetPass(ID3DXEffect *iface, D3DXHANDLE technique, UINT index) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, technique %p, index %u.\n", iface, technique, index); return d3dx9_base_effect_get_pass(&effect->base_effect, technique, index); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetPassByName(ID3DXEffect *iface, - D3DXHANDLE technique, const char *name) +static D3DXHANDLE WINAPI d3dx9_effect_GetPassByName(ID3DXEffect *iface, D3DXHANDLE technique, const char *name) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, technique %p, name %s.\n", iface, technique, debugstr_a(name)); return d3dx9_base_effect_get_pass_by_name(&effect->base_effect, technique, name); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetFunction(ID3DXEffect *iface, UINT index) +static D3DXHANDLE WINAPI d3dx9_effect_GetFunction(ID3DXEffect *iface, UINT index) { struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); @@ -3574,7 +3576,7 @@ static D3DXHANDLE WINAPI ID3DXEffectImpl_GetFunction(ID3DXEffect *iface, UINT in return d3dx9_base_effect_get_function(&effect->base_effect, index); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetFunctionByName(ID3DXEffect *iface, const char *name) +static D3DXHANDLE WINAPI d3dx9_effect_GetFunctionByName(ID3DXEffect *iface, const char *name) { struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); @@ -3583,378 +3585,368 @@ static D3DXHANDLE WINAPI ID3DXEffectImpl_GetFunctionByName(ID3DXEffect *iface, c return d3dx9_base_effect_get_function_by_name(&effect->base_effect, name); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetAnnotation(ID3DXEffect *iface, D3DXHANDLE object, UINT index) +static D3DXHANDLE WINAPI d3dx9_effect_GetAnnotation(ID3DXEffect *iface, D3DXHANDLE object, UINT index) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, object %p, index %u.\n", iface, object, index); return d3dx9_base_effect_get_annotation(&effect->base_effect, object, index); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetAnnotationByName(ID3DXEffect *iface, - D3DXHANDLE object, const char *name) +static D3DXHANDLE WINAPI d3dx9_effect_GetAnnotationByName(ID3DXEffect *iface, D3DXHANDLE object, + const char *name) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, object %p, name %s.\n", iface, object, debugstr_a(name)); return d3dx9_base_effect_get_annotation_by_name(&effect->base_effect, object, name); } -static HRESULT WINAPI ID3DXEffectImpl_SetValue(ID3DXEffect *iface, - D3DXHANDLE parameter, const void *data, UINT bytes) +static HRESULT WINAPI d3dx9_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parameter, + const void *data, UINT bytes) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, data %p, bytes %u.\n", iface, parameter, data, bytes); return d3dx9_base_effect_set_value(&effect->base_effect, parameter, data, bytes); } -static HRESULT WINAPI ID3DXEffectImpl_GetValue(ID3DXEffect *iface, - D3DXHANDLE parameter, void *data, UINT bytes) +static HRESULT WINAPI d3dx9_effect_GetValue(ID3DXEffect *iface, D3DXHANDLE parameter, void *data, UINT bytes) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, data %p, bytes %u.\n", iface, parameter, data, bytes); return d3dx9_base_effect_get_value(&effect->base_effect, parameter, data, bytes); } -static HRESULT WINAPI ID3DXEffectImpl_SetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL b) +static HRESULT WINAPI d3dx9_effect_SetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL b) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, b %#x.\n", iface, parameter, b); return d3dx9_base_effect_set_bool(&effect->base_effect, parameter, b); } -static HRESULT WINAPI ID3DXEffectImpl_GetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b) +static HRESULT WINAPI d3dx9_effect_GetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, b %p.\n", iface, parameter, b); return d3dx9_base_effect_get_bool(&effect->base_effect, parameter, b); } -static HRESULT WINAPI ID3DXEffectImpl_SetBoolArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const BOOL *b, UINT count) +static HRESULT WINAPI d3dx9_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, const BOOL *b, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, b %p, count %u.\n", iface, parameter, b, count); return d3dx9_base_effect_set_bool_array(&effect->base_effect, parameter, b, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetBoolArray(ID3DXEffect *iface, - D3DXHANDLE parameter, BOOL *b, UINT count) +static HRESULT WINAPI d3dx9_effect_GetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, b %p, count %u.\n", iface, parameter, b, count); return d3dx9_base_effect_get_bool_array(&effect->base_effect, parameter, b, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT n) +static HRESULT WINAPI d3dx9_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT n) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, n %d.\n", iface, parameter, n); return d3dx9_base_effect_set_int(&effect->base_effect, parameter, n); } -static HRESULT WINAPI ID3DXEffectImpl_GetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n) +static HRESULT WINAPI d3dx9_effect_GetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, n %p.\n", iface, parameter, n); return d3dx9_base_effect_get_int(&effect->base_effect, parameter, n); } -static HRESULT WINAPI ID3DXEffectImpl_SetIntArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const INT *n, UINT count) +static HRESULT WINAPI d3dx9_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, const INT *n, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, n %p, count %u.\n", iface, parameter, n, count); return d3dx9_base_effect_set_int_array(&effect->base_effect, parameter, n, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetIntArray(ID3DXEffect *iface, - D3DXHANDLE parameter, INT *n, UINT count) +static HRESULT WINAPI d3dx9_effect_GetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, n %p, count %u.\n", iface, parameter, n, count); return d3dx9_base_effect_get_int_array(&effect->base_effect, parameter, n, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float f) +static HRESULT WINAPI d3dx9_effect_SetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float f) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, f %.8e.\n", iface, parameter, f); return d3dx9_base_effect_set_float(&effect->base_effect, parameter, f); } -static HRESULT WINAPI ID3DXEffectImpl_GetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float *f) +static HRESULT WINAPI d3dx9_effect_GetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float *f) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, f %p.\n", iface, parameter, f); return d3dx9_base_effect_get_float(&effect->base_effect, parameter, f); } -static HRESULT WINAPI ID3DXEffectImpl_SetFloatArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const float *f, UINT count) +static HRESULT WINAPI d3dx9_effect_SetFloatArray(ID3DXEffect *iface, D3DXHANDLE parameter, + const float *f, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, f %p, count %u.\n", iface, parameter, f, count); return d3dx9_base_effect_set_float_array(&effect->base_effect, parameter, f, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetFloatArray(ID3DXEffect *iface, - D3DXHANDLE parameter, float *f, UINT count) +static HRESULT WINAPI d3dx9_effect_GetFloatArray(ID3DXEffect *iface, D3DXHANDLE parameter, float *f, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, f %p, count %u.\n", iface, parameter, f, count); return d3dx9_base_effect_get_float_array(&effect->base_effect, parameter, f, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetVector(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXVECTOR4 *vector) +static HRESULT WINAPI d3dx9_effect_SetVector(ID3DXEffect *iface, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, vector %p.\n", iface, parameter, vector); return d3dx9_base_effect_set_vector(&effect->base_effect, parameter, vector); } -static HRESULT WINAPI ID3DXEffectImpl_GetVector(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXVECTOR4 *vector) +static HRESULT WINAPI d3dx9_effect_GetVector(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXVECTOR4 *vector) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, vector %p.\n", iface, parameter, vector); return d3dx9_base_effect_get_vector(&effect->base_effect, parameter, vector); } -static HRESULT WINAPI ID3DXEffectImpl_SetVectorArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXVECTOR4 *vector, UINT count) +static HRESULT WINAPI d3dx9_effect_SetVectorArray(ID3DXEffect *iface, D3DXHANDLE parameter, + const D3DXVECTOR4 *vector, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, vector %p, count %u.\n", iface, parameter, vector, count); return d3dx9_base_effect_set_vector_array(&effect->base_effect, parameter, vector, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetVectorArray(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXVECTOR4 *vector, UINT count) +static HRESULT WINAPI d3dx9_effect_GetVectorArray(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXVECTOR4 *vector, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, vector %p, count %u.\n", iface, parameter, vector, count); return d3dx9_base_effect_get_vector_array(&effect->base_effect, parameter, vector, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetMatrix(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXMATRIX *matrix) +static HRESULT WINAPI d3dx9_effect_SetMatrix(ID3DXEffect *iface, D3DXHANDLE parameter, const D3DXMATRIX *matrix) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); return d3dx9_base_effect_set_matrix(&effect->base_effect, parameter, matrix); } -static HRESULT WINAPI ID3DXEffectImpl_GetMatrix(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXMATRIX *matrix) +static HRESULT WINAPI d3dx9_effect_GetMatrix(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); return d3dx9_base_effect_get_matrix(&effect->base_effect, parameter, matrix); } -static HRESULT WINAPI ID3DXEffectImpl_SetMatrixArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count) +static HRESULT WINAPI d3dx9_effect_SetMatrixArray(ID3DXEffect *iface, D3DXHANDLE parameter, + const D3DXMATRIX *matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_set_matrix_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetMatrixArray(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXMATRIX *matrix, UINT count) +static HRESULT WINAPI d3dx9_effect_GetMatrixArray(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXMATRIX *matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_get_matrix_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetMatrixPointerArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count) +static HRESULT WINAPI d3dx9_effect_SetMatrixPointerArray(ID3DXEffect *iface, D3DXHANDLE parameter, + const D3DXMATRIX **matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_set_matrix_pointer_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetMatrixPointerArray(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXMATRIX **matrix, UINT count) +static HRESULT WINAPI d3dx9_effect_GetMatrixPointerArray(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXMATRIX **matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_get_matrix_pointer_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetMatrixTranspose(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXMATRIX *matrix) +static HRESULT WINAPI d3dx9_effect_SetMatrixTranspose(ID3DXEffect *iface, D3DXHANDLE parameter, + const D3DXMATRIX *matrix) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); return d3dx9_base_effect_set_matrix_transpose(&effect->base_effect, parameter, matrix); } -static HRESULT WINAPI ID3DXEffectImpl_GetMatrixTranspose(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXMATRIX *matrix) +static HRESULT WINAPI d3dx9_effect_GetMatrixTranspose(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXMATRIX *matrix) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); return d3dx9_base_effect_get_matrix_transpose(&effect->base_effect, parameter, matrix); } -static HRESULT WINAPI ID3DXEffectImpl_SetMatrixTransposeArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count) +static HRESULT WINAPI d3dx9_effect_SetMatrixTransposeArray(ID3DXEffect *iface, D3DXHANDLE parameter, + const D3DXMATRIX *matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_set_matrix_transpose_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetMatrixTransposeArray(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXMATRIX *matrix, UINT count) +static HRESULT WINAPI d3dx9_effect_GetMatrixTransposeArray(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXMATRIX *matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_get_matrix_transpose_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetMatrixTransposePointerArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count) +static HRESULT WINAPI d3dx9_effect_SetMatrixTransposePointerArray(ID3DXEffect *iface, D3DXHANDLE parameter, + const D3DXMATRIX **matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_set_matrix_transpose_pointer_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetMatrixTransposePointerArray(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXMATRIX **matrix, UINT count) +static HRESULT WINAPI d3dx9_effect_GetMatrixTransposePointerArray(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXMATRIX **matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_get_matrix_transpose_pointer_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char *string) +static HRESULT WINAPI d3dx9_effect_SetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char *string) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, string %s.\n", iface, parameter, debugstr_a(string)); return d3dx9_base_effect_set_string(&effect->base_effect, parameter, string); } -static HRESULT WINAPI ID3DXEffectImpl_GetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char **string) +static HRESULT WINAPI d3dx9_effect_GetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char **string) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, string %p.\n", iface, parameter, string); return d3dx9_base_effect_get_string(&effect->base_effect, parameter, string); } -static HRESULT WINAPI ID3DXEffectImpl_SetTexture(struct ID3DXEffect *iface, - D3DXHANDLE parameter, struct IDirect3DBaseTexture9 *texture) +static HRESULT WINAPI d3dx9_effect_SetTexture(struct ID3DXEffect *iface, D3DXHANDLE parameter, + struct IDirect3DBaseTexture9 *texture) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, texture %p.\n", iface, parameter, texture); return d3dx9_base_effect_set_texture(&effect->base_effect, parameter, texture); } -static HRESULT WINAPI ID3DXEffectImpl_GetTexture(struct ID3DXEffect *iface, - D3DXHANDLE parameter, struct IDirect3DBaseTexture9 **texture) +static HRESULT WINAPI d3dx9_effect_GetTexture(struct ID3DXEffect *iface, D3DXHANDLE parameter, + struct IDirect3DBaseTexture9 **texture) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, texture %p.\n", iface, parameter, texture); return d3dx9_base_effect_get_texture(&effect->base_effect, parameter, texture); } -static HRESULT WINAPI ID3DXEffectImpl_GetPixelShader(ID3DXEffect *iface, - D3DXHANDLE parameter, struct IDirect3DPixelShader9 **shader) +static HRESULT WINAPI d3dx9_effect_GetPixelShader(ID3DXEffect *iface, D3DXHANDLE parameter, + struct IDirect3DPixelShader9 **shader) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, shader %p.\n", iface, parameter, shader); return d3dx9_base_effect_get_pixel_shader(&effect->base_effect, parameter, shader); } -static HRESULT WINAPI ID3DXEffectImpl_GetVertexShader(struct ID3DXEffect *iface, - D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) +static HRESULT WINAPI d3dx9_effect_GetVertexShader(struct ID3DXEffect *iface, D3DXHANDLE parameter, + struct IDirect3DVertexShader9 **shader) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, shader %p.\n", iface, parameter, shader); return d3dx9_base_effect_get_vertex_shader(&effect->base_effect, parameter, shader); } -static HRESULT WINAPI ID3DXEffectImpl_SetArrayRange(ID3DXEffect *iface, D3DXHANDLE parameter, UINT start, UINT end) +static HRESULT WINAPI d3dx9_effect_SetArrayRange(ID3DXEffect *iface, D3DXHANDLE parameter, UINT start, UINT end) { struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); @@ -3964,9 +3956,9 @@ static HRESULT WINAPI ID3DXEffectImpl_SetArrayRange(ID3DXEffect *iface, D3DXHAND } /*** ID3DXEffect methods ***/ -static HRESULT WINAPI ID3DXEffectImpl_GetPool(ID3DXEffect *iface, ID3DXEffectPool **pool) +static HRESULT WINAPI d3dx9_effect_GetPool(ID3DXEffect *iface, ID3DXEffectPool **pool) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); TRACE("iface %p, pool %p\n", This, pool); @@ -3988,9 +3980,9 @@ static HRESULT WINAPI ID3DXEffectImpl_GetPool(ID3DXEffect *iface, ID3DXEffectPoo return S_OK; } -static HRESULT WINAPI ID3DXEffectImpl_SetTechnique(ID3DXEffect *iface, D3DXHANDLE technique) +static HRESULT WINAPI d3dx9_effect_SetTechnique(ID3DXEffect *iface, D3DXHANDLE technique) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); struct d3dx9_base_effect *base = &This->base_effect; struct d3dx_technique *tech = get_valid_technique(base, technique); @@ -4008,18 +4000,18 @@ static HRESULT WINAPI ID3DXEffectImpl_SetTechnique(ID3DXEffect *iface, D3DXHANDL return D3DERR_INVALIDCALL; } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetCurrentTechnique(ID3DXEffect *iface) +static D3DXHANDLE WINAPI d3dx9_effect_GetCurrentTechnique(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); TRACE("iface %p\n", This); return get_technique_handle(This->active_technique); } -static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DXHANDLE technique) +static HRESULT WINAPI d3dx9_effect_ValidateTechnique(ID3DXEffect *iface, D3DXHANDLE technique) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx9_base_effect *base = &effect->base_effect; struct d3dx_technique *tech = get_valid_technique(base, technique); HRESULT ret = D3D_OK; @@ -4065,10 +4057,10 @@ done: return ret; } -static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect *iface, - D3DXHANDLE technique, D3DXHANDLE *next_technique) +static HRESULT WINAPI d3dx9_effect_FindNextValidTechnique(ID3DXEffect *iface, D3DXHANDLE technique, + D3DXHANDLE *next_technique) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx9_base_effect *base = &effect->base_effect; struct d3dx_technique *prev_tech, *tech; unsigned int i; @@ -4098,7 +4090,7 @@ static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect *iface, for (; i < base->technique_count; ++i) { tech = &base->techniques[i]; - if (SUCCEEDED(ID3DXEffectImpl_ValidateTechnique(iface, get_technique_handle(tech)))) + if (SUCCEEDED(d3dx9_effect_ValidateTechnique(iface, get_technique_handle(tech)))) { *next_technique = get_technique_handle(tech); return D3D_OK; @@ -4216,9 +4208,9 @@ static BOOL is_parameter_used(struct d3dx_parameter *param, struct d3dx_techniqu return FALSE; } -static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDLE parameter, D3DXHANDLE technique) +static BOOL WINAPI d3dx9_effect_IsParameterUsed(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXHANDLE technique) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); BOOL ret; @@ -4231,9 +4223,9 @@ static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDL return ret; } -static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DWORD flags) +static HRESULT WINAPI d3dx9_effect_Begin(ID3DXEffect *iface, UINT *passes, DWORD flags) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx_technique *technique = effect->active_technique; TRACE("iface %p, passes %p, flags %#x.\n", iface, passes, flags); @@ -4283,9 +4275,9 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW return D3DERR_INVALIDCALL; } -static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect *iface, UINT pass) +static HRESULT WINAPI d3dx9_effect_BeginPass(ID3DXEffect *iface, UINT pass) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx_technique *technique = effect->active_technique; TRACE("iface %p, pass %u\n", effect, pass); @@ -4307,9 +4299,9 @@ static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect *iface, UINT pass) return D3DERR_INVALIDCALL; } -static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect *iface) +static HRESULT WINAPI d3dx9_effect_CommitChanges(ID3DXEffect *iface) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p.\n", iface); @@ -4321,9 +4313,9 @@ static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect *iface) return d3dx9_apply_pass_states(effect, effect->active_pass, FALSE); } -static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect *iface) +static HRESULT WINAPI d3dx9_effect_EndPass(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); TRACE("iface %p\n", This); @@ -4338,9 +4330,9 @@ static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect *iface) return D3DERR_INVALIDCALL; } -static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect *iface) +static HRESULT WINAPI d3dx9_effect_End(ID3DXEffect *iface) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx_technique *technique = effect->active_technique; TRACE("iface %p.\n", iface); @@ -4370,9 +4362,9 @@ static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect *iface) return D3D_OK; } -static HRESULT WINAPI ID3DXEffectImpl_GetDevice(ID3DXEffect *iface, struct IDirect3DDevice9 **device) +static HRESULT WINAPI d3dx9_effect_GetDevice(ID3DXEffect *iface, struct IDirect3DDevice9 **device) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); TRACE("iface %p, device %p\n", This, device); @@ -4438,9 +4430,9 @@ static BOOL param_on_lost_device(void *data, struct d3dx_parameter *param) return FALSE; } -static HRESULT WINAPI ID3DXEffectImpl_OnLostDevice(ID3DXEffect* iface) +static HRESULT WINAPI d3dx9_effect_OnLostDevice(ID3DXEffect *iface) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx9_base_effect *base = &effect->base_effect; unsigned int i; @@ -4452,18 +4444,18 @@ static HRESULT WINAPI ID3DXEffectImpl_OnLostDevice(ID3DXEffect* iface) return D3D_OK; } -static HRESULT WINAPI ID3DXEffectImpl_OnResetDevice(ID3DXEffect* iface) +static HRESULT WINAPI d3dx9_effect_OnResetDevice(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); FIXME("(%p)->(): stub\n", This); return E_NOTIMPL; } -static HRESULT WINAPI ID3DXEffectImpl_SetStateManager(ID3DXEffect *iface, ID3DXEffectStateManager *manager) +static HRESULT WINAPI d3dx9_effect_SetStateManager(ID3DXEffect *iface, ID3DXEffectStateManager *manager) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); TRACE("iface %p, manager %p\n", This, manager); @@ -4475,9 +4467,9 @@ static HRESULT WINAPI ID3DXEffectImpl_SetStateManager(ID3DXEffect *iface, ID3DXE return D3D_OK; } -static HRESULT WINAPI ID3DXEffectImpl_GetStateManager(ID3DXEffect *iface, ID3DXEffectStateManager **manager) +static HRESULT WINAPI d3dx9_effect_GetStateManager(ID3DXEffect *iface, ID3DXEffectStateManager **manager) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); TRACE("iface %p, manager %p\n", This, manager); @@ -4493,27 +4485,27 @@ static HRESULT WINAPI ID3DXEffectImpl_GetStateManager(ID3DXEffect *iface, ID3DXE return D3D_OK; } -static HRESULT WINAPI ID3DXEffectImpl_BeginParameterBlock(ID3DXEffect* iface) +static HRESULT WINAPI d3dx9_effect_BeginParameterBlock(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); FIXME("(%p)->(): stub\n", This); return E_NOTIMPL; } -static D3DXHANDLE WINAPI ID3DXEffectImpl_EndParameterBlock(ID3DXEffect* iface) +static D3DXHANDLE WINAPI d3dx9_effect_EndParameterBlock(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); FIXME("(%p)->(): stub\n", This); return NULL; } -static HRESULT WINAPI ID3DXEffectImpl_ApplyParameterBlock(ID3DXEffect* iface, D3DXHANDLE parameter_block) +static HRESULT WINAPI d3dx9_effect_ApplyParameterBlock(ID3DXEffect *iface, D3DXHANDLE parameter_block) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); FIXME("(%p)->(%p): stub\n", This, parameter_block); @@ -4521,9 +4513,9 @@ static HRESULT WINAPI ID3DXEffectImpl_ApplyParameterBlock(ID3DXEffect* iface, D3 } #if D3DX_SDK_VERSION >= 26 -static HRESULT WINAPI ID3DXEffectImpl_DeleteParameterBlock(ID3DXEffect* iface, D3DXHANDLE parameter_block) +static HRESULT WINAPI d3dx9_effect_DeleteParameterBlock(ID3DXEffect *iface, D3DXHANDLE parameter_block) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); FIXME("(%p)->(%p): stub\n", This, parameter_block); @@ -4531,10 +4523,10 @@ static HRESULT WINAPI ID3DXEffectImpl_DeleteParameterBlock(ID3DXEffect* iface, D } #endif -static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface, - struct IDirect3DDevice9 *device, struct ID3DXEffect **effect) +static HRESULT WINAPI d3dx9_effect_CloneEffect(ID3DXEffect *iface, struct IDirect3DDevice9 *device, + struct ID3DXEffect **effect) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); FIXME("(%p)->(%p, %p): stub\n", This, device, effect); @@ -4551,8 +4543,8 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface, } #if D3DX_SDK_VERSION >= 27 -static HRESULT WINAPI ID3DXEffectImpl_SetRawValue(ID3DXEffect *iface, - D3DXHANDLE parameter, const void *data, UINT byte_offset, UINT bytes) +static HRESULT WINAPI d3dx9_effect_SetRawValue(ID3DXEffect *iface, D3DXHANDLE parameter, const void *data, + UINT byte_offset, UINT bytes) { FIXME("iface %p, parameter %p, data %p, byte_offset %u, bytes %u stub!\n", iface, parameter, data, byte_offset, bytes); @@ -4564,90 +4556,90 @@ static HRESULT WINAPI ID3DXEffectImpl_SetRawValue(ID3DXEffect *iface, static const struct ID3DXEffectVtbl ID3DXEffect_Vtbl = { /*** IUnknown methods ***/ - ID3DXEffectImpl_QueryInterface, - ID3DXEffectImpl_AddRef, - ID3DXEffectImpl_Release, + d3dx9_effect_QueryInterface, + d3dx9_effect_AddRef, + d3dx9_effect_Release, /*** ID3DXBaseEffect methods ***/ - ID3DXEffectImpl_GetDesc, - ID3DXEffectImpl_GetParameterDesc, - ID3DXEffectImpl_GetTechniqueDesc, - ID3DXEffectImpl_GetPassDesc, - ID3DXEffectImpl_GetFunctionDesc, - ID3DXEffectImpl_GetParameter, - ID3DXEffectImpl_GetParameterByName, - ID3DXEffectImpl_GetParameterBySemantic, - ID3DXEffectImpl_GetParameterElement, - ID3DXEffectImpl_GetTechnique, - ID3DXEffectImpl_GetTechniqueByName, - ID3DXEffectImpl_GetPass, - ID3DXEffectImpl_GetPassByName, - ID3DXEffectImpl_GetFunction, - ID3DXEffectImpl_GetFunctionByName, - ID3DXEffectImpl_GetAnnotation, - ID3DXEffectImpl_GetAnnotationByName, - ID3DXEffectImpl_SetValue, - ID3DXEffectImpl_GetValue, - ID3DXEffectImpl_SetBool, - ID3DXEffectImpl_GetBool, - ID3DXEffectImpl_SetBoolArray, - ID3DXEffectImpl_GetBoolArray, - ID3DXEffectImpl_SetInt, - ID3DXEffectImpl_GetInt, - ID3DXEffectImpl_SetIntArray, - ID3DXEffectImpl_GetIntArray, - ID3DXEffectImpl_SetFloat, - ID3DXEffectImpl_GetFloat, - ID3DXEffectImpl_SetFloatArray, - ID3DXEffectImpl_GetFloatArray, - ID3DXEffectImpl_SetVector, - ID3DXEffectImpl_GetVector, - ID3DXEffectImpl_SetVectorArray, - ID3DXEffectImpl_GetVectorArray, - ID3DXEffectImpl_SetMatrix, - ID3DXEffectImpl_GetMatrix, - ID3DXEffectImpl_SetMatrixArray, - ID3DXEffectImpl_GetMatrixArray, - ID3DXEffectImpl_SetMatrixPointerArray, - ID3DXEffectImpl_GetMatrixPointerArray, - ID3DXEffectImpl_SetMatrixTranspose, - ID3DXEffectImpl_GetMatrixTranspose, - ID3DXEffectImpl_SetMatrixTransposeArray, - ID3DXEffectImpl_GetMatrixTransposeArray, - ID3DXEffectImpl_SetMatrixTransposePointerArray, - ID3DXEffectImpl_GetMatrixTransposePointerArray, - ID3DXEffectImpl_SetString, - ID3DXEffectImpl_GetString, - ID3DXEffectImpl_SetTexture, - ID3DXEffectImpl_GetTexture, - ID3DXEffectImpl_GetPixelShader, - ID3DXEffectImpl_GetVertexShader, - ID3DXEffectImpl_SetArrayRange, + d3dx9_effect_GetDesc, + d3dx9_effect_GetParameterDesc, + d3dx9_effect_GetTechniqueDesc, + d3dx9_effect_GetPassDesc, + d3dx9_effect_GetFunctionDesc, + d3dx9_effect_GetParameter, + d3dx9_effect_GetParameterByName, + d3dx9_effect_GetParameterBySemantic, + d3dx9_effect_GetParameterElement, + d3dx9_effect_GetTechnique, + d3dx9_effect_GetTechniqueByName, + d3dx9_effect_GetPass, + d3dx9_effect_GetPassByName, + d3dx9_effect_GetFunction, + d3dx9_effect_GetFunctionByName, + d3dx9_effect_GetAnnotation, + d3dx9_effect_GetAnnotationByName, + d3dx9_effect_SetValue, + d3dx9_effect_GetValue, + d3dx9_effect_SetBool, + d3dx9_effect_GetBool, + d3dx9_effect_SetBoolArray, + d3dx9_effect_GetBoolArray, + d3dx9_effect_SetInt, + d3dx9_effect_GetInt, + d3dx9_effect_SetIntArray, + d3dx9_effect_GetIntArray, + d3dx9_effect_SetFloat, + d3dx9_effect_GetFloat, + d3dx9_effect_SetFloatArray, + d3dx9_effect_GetFloatArray, + d3dx9_effect_SetVector, + d3dx9_effect_GetVector, + d3dx9_effect_SetVectorArray, + d3dx9_effect_GetVectorArray, + d3dx9_effect_SetMatrix, + d3dx9_effect_GetMatrix, + d3dx9_effect_SetMatrixArray, + d3dx9_effect_GetMatrixArray, + d3dx9_effect_SetMatrixPointerArray, + d3dx9_effect_GetMatrixPointerArray, + d3dx9_effect_SetMatrixTranspose, + d3dx9_effect_GetMatrixTranspose, + d3dx9_effect_SetMatrixTransposeArray, + d3dx9_effect_GetMatrixTransposeArray, + d3dx9_effect_SetMatrixTransposePointerArray, + d3dx9_effect_GetMatrixTransposePointerArray, + d3dx9_effect_SetString, + d3dx9_effect_GetString, + d3dx9_effect_SetTexture, + d3dx9_effect_GetTexture, + d3dx9_effect_GetPixelShader, + d3dx9_effect_GetVertexShader, + d3dx9_effect_SetArrayRange, /*** ID3DXEffect methods ***/ - ID3DXEffectImpl_GetPool, - ID3DXEffectImpl_SetTechnique, - ID3DXEffectImpl_GetCurrentTechnique, - ID3DXEffectImpl_ValidateTechnique, - ID3DXEffectImpl_FindNextValidTechnique, - ID3DXEffectImpl_IsParameterUsed, - ID3DXEffectImpl_Begin, - ID3DXEffectImpl_BeginPass, - ID3DXEffectImpl_CommitChanges, - ID3DXEffectImpl_EndPass, - ID3DXEffectImpl_End, - ID3DXEffectImpl_GetDevice, - ID3DXEffectImpl_OnLostDevice, - ID3DXEffectImpl_OnResetDevice, - ID3DXEffectImpl_SetStateManager, - ID3DXEffectImpl_GetStateManager, - ID3DXEffectImpl_BeginParameterBlock, - ID3DXEffectImpl_EndParameterBlock, - ID3DXEffectImpl_ApplyParameterBlock, + d3dx9_effect_GetPool, + d3dx9_effect_SetTechnique, + d3dx9_effect_GetCurrentTechnique, + d3dx9_effect_ValidateTechnique, + d3dx9_effect_FindNextValidTechnique, + d3dx9_effect_IsParameterUsed, + d3dx9_effect_Begin, + d3dx9_effect_BeginPass, + d3dx9_effect_CommitChanges, + d3dx9_effect_EndPass, + d3dx9_effect_End, + d3dx9_effect_GetDevice, + d3dx9_effect_OnLostDevice, + d3dx9_effect_OnResetDevice, + d3dx9_effect_SetStateManager, + d3dx9_effect_GetStateManager, + d3dx9_effect_BeginParameterBlock, + d3dx9_effect_EndParameterBlock, + d3dx9_effect_ApplyParameterBlock, #if D3DX_SDK_VERSION >= 26 - ID3DXEffectImpl_DeleteParameterBlock, + d3dx9_effect_DeleteParameterBlock, #endif - ID3DXEffectImpl_CloneEffect, + d3dx9_effect_CloneEffect, #if D3DX_SDK_VERSION >= 27 - ID3DXEffectImpl_SetRawValue + d3dx9_effect_SetRawValue #endif }; -- 2.20.1

2 4

[PATCH] pdh: Remove redundant not-NULL check (coccinellery)
by Michael Stefaniuc 27 Feb '19

27 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- return PDH_INVALID_ARGUMENT if size is NULL. dlls/pdh/pdh_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index bc3674a28a..7ef91f1a7f 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -898,9 +898,9 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexA( LPCSTR machine, DWORD index, LPSTR { int required = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL ); - if (size && *size < required) ret = PDH_MORE_DATA; + if (*size < required) ret = PDH_MORE_DATA; else WideCharToMultiByte( CP_ACP, 0, bufferW, -1, buffer, required, NULL, NULL ); - if (size) *size = required; + *size = required; } heap_free( machineW ); return ret; -- 2.20.1

1 0

[PATCH] shlwapi: Remove redundant not-NULL check (coccinellery)
by Michael Stefaniuc 27 Feb '19

27 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- return E_FAIL if dest is NULL. dlls/shlwapi/string.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index d400f8befe..7b8473a379 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -1527,8 +1527,7 @@ HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, if (!src) { WARN("Invalid lpStrRet would crash under Win32!\n"); - if (dest) - *dest = '\0'; + *dest = '\0'; return E_FAIL; } -- 2.20.1

1 0

Wine translation for ast locale
by Enol Puente 27 Feb '19

27 Feb '19

Hi, My name is Enol and I am member of Softastur association which translates free as freedom software into Asturian. During these days I was translating Wine into Asturian and I have already completed 1000 of 3699 strings, now I would like to request their merge into Wine's code to review them. Asturian is an only 639-2 ISO language and currently is not an "official" language of Windows, but you can select it from Language settings on that OS (thanks to the work on CLDR) to set only date and time, and ask third-party apps to use it if they have Asturian translations. I hope this is not a problem. Thanks for reading me.

3 5

[PATCH 3/5] [wmvcore] add tests for WMCreateSyncReader
by Vijay Kiran Kamuju 27 Feb '19

27 Feb '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/wmvcore/tests/wmvcore.c | 87 ++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index af6d32a78e..ebeab3ff46 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1,5 +1,6 @@ /* * Copyright 2017 Alistair Leslie-Hughes + * Copyright 2019 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -201,6 +202,91 @@ static void test_wmreader_interfaces(void) IWMReader_Release(reader); } +static void test_wmsyncreader_interfaces(void) +{ + HRESULT hr; + IWMSyncReader *reader; + IWMHeaderInfo *header; + IWMHeaderInfo2 *header2; + IWMHeaderInfo3 *header3; + IWMProfile *profile; + IWMProfile2 *profile2; + IWMProfile3 *profile3; + IWMPacketSize *packet; + IWMPacketSize2 *packet2; + IWMReaderTimecode *timecode; + IWMReaderPlaylistBurn *playlist; + IWMLanguageList *langlist; + + hr = WMCreateSyncReader( NULL, 0, &reader ); + todo_wine ok(hr == S_OK, "WMCreateSyncReader failed 0x%08x\n", hr); + if(FAILED(hr)) + { + skip("Failed to create IWMSyncReader\n"); + return; + } + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMHeaderInfo, (void **)&header); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMHeaderInfo2, (void **)&header2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMHeaderInfo3, (void **)&header3); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMProfile2, (void **)&profile2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMProfile3, (void **)&profile3); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMPacketSize, (void **)&packet); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMPacketSize2, (void **)&packet2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMReaderTimecode, (void **)&timecode); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMReaderPlaylistBurn, (void **)&playlist); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMLanguageList, (void **)&langlist); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + if(packet) + IWMPacketSize_Release(packet); + if(packet2) + IWMPacketSize2_Release(packet2); + if(profile) + IWMProfile_Release(profile); + if(profile2) + IWMProfile2_Release(profile2); + if(profile3) + IWMProfile3_Release(profile3); + if(header) + IWMHeaderInfo_Release(header); + if(header2) + IWMHeaderInfo2_Release(header2); + if(header3) + IWMHeaderInfo3_Release(header3); + if(timecode) + IWMReaderTimecode_Release(timecode); + if(playlist) + IWMReaderPlaylistBurn_Release(playlist); + if(langlist) + IWMLanguageList_Release(langlist); + + + IWMSyncReader_Release(reader); +} + + static void test_profile_manager_interfaces(void) { HRESULT hr; @@ -262,6 +348,7 @@ START_TEST(wmvcore) return; test_wmreader_interfaces(); + test_wmsyncreader_interfaces(); test_wmwriter_interfaces(); test_profile_manager_interfaces(); test_WMCreateWriterPriv(); -- 2.21.0

1 0

[PATCH 1/5] [include] add missing WMT_RIGHTS enum definition
by Vijay Kiran Kamuju 27 Feb '19

27 Feb '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/drmexternals.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/drmexternals.idl b/include/drmexternals.idl index 88826ad561..b89039423d 100644 --- a/include/drmexternals.idl +++ b/include/drmexternals.idl @@ -1,5 +1,6 @@ /* * Copyright 2017 Alistair Leslie-Hughes + * Copyright 2019 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,3 +18,16 @@ */ import "wmdrmsdk.idl"; + +typedef enum WMT_RIGHTS { + WMT_RIGHT_PLAYBACK = 0x00000001, + WMT_RIGHT_COPY_TO_NON_SDMI_DEVICE = 0x00000002, + WMT_RIGHT_COPY_TO_CD = 0x00000008, + WMT_RIGHT_COPY_TO_SDMI_DEVICE = 0x00000010, + WMT_RIGHT_ONE_TIME = 0x00000020, + WMT_RIGHT_SAVE_STREAM_PROTECTED = 0x00000040, + WMT_RIGHT_COPY = 0x00000080, + WMT_RIGHT_COLLABORATIVE_PLAY = 0x00000100, + WMT_RIGHT_SDMI_TRIGGER = 0x00010000, + WMT_RIGHT_SDMI_NOMORECOPIES = 0x00020000 +} WMT_RIGHTS; -- 2.21.0

1 4

[PATCH 3/3] [wmvcore] add tests for WMCreateSyncReader
by Vijay Kiran Kamuju 27 Feb '19

27 Feb '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/wmvcore/tests/wmvcore.c | 87 ++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index af6d32a78e..ebeab3ff46 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1,5 +1,6 @@ /* * Copyright 2017 Alistair Leslie-Hughes + * Copyright 2019 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -201,6 +202,91 @@ static void test_wmreader_interfaces(void) IWMReader_Release(reader); } +static void test_wmsyncreader_interfaces(void) +{ + HRESULT hr; + IWMSyncReader *reader; + IWMHeaderInfo *header; + IWMHeaderInfo2 *header2; + IWMHeaderInfo3 *header3; + IWMProfile *profile; + IWMProfile2 *profile2; + IWMProfile3 *profile3; + IWMPacketSize *packet; + IWMPacketSize2 *packet2; + IWMReaderTimecode *timecode; + IWMReaderPlaylistBurn *playlist; + IWMLanguageList *langlist; + + hr = WMCreateSyncReader( NULL, 0, &reader ); + todo_wine ok(hr == S_OK, "WMCreateSyncReader failed 0x%08x\n", hr); + if(FAILED(hr)) + { + skip("Failed to create IWMSyncReader\n"); + return; + } + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMHeaderInfo, (void **)&header); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMHeaderInfo2, (void **)&header2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMHeaderInfo3, (void **)&header3); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMProfile2, (void **)&profile2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMProfile3, (void **)&profile3); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMPacketSize, (void **)&packet); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMPacketSize2, (void **)&packet2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMReaderTimecode, (void **)&timecode); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMReaderPlaylistBurn, (void **)&playlist); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMLanguageList, (void **)&langlist); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + if(packet) + IWMPacketSize_Release(packet); + if(packet2) + IWMPacketSize2_Release(packet2); + if(profile) + IWMProfile_Release(profile); + if(profile2) + IWMProfile2_Release(profile2); + if(profile3) + IWMProfile3_Release(profile3); + if(header) + IWMHeaderInfo_Release(header); + if(header2) + IWMHeaderInfo2_Release(header2); + if(header3) + IWMHeaderInfo3_Release(header3); + if(timecode) + IWMReaderTimecode_Release(timecode); + if(playlist) + IWMReaderPlaylistBurn_Release(playlist); + if(langlist) + IWMLanguageList_Release(langlist); + + + IWMSyncReader_Release(reader); +} + + static void test_profile_manager_interfaces(void) { HRESULT hr; @@ -262,6 +348,7 @@ START_TEST(wmvcore) return; test_wmreader_interfaces(); + test_wmsyncreader_interfaces(); test_wmwriter_interfaces(); test_profile_manager_interfaces(); test_WMCreateWriterPriv(); -- 2.21.0

1 0

[PATCH 2/2] [include] add missing IWMSyncReader2 interfaces
by Vijay Kiran Kamuju 27 Feb '19

27 Feb '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/wmsdkidl.idl | 72 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index bb7bfee4f8..1a0b3e4a29 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -209,6 +209,14 @@ typedef struct _WMStreamPrioritizationRecord WORD wStreamNumber; BOOL fMandatory; } WM_STREAM_PRIORITY_RECORD; + +typedef struct _WMT_TIMECODE_EXTENSION_DATA +{ + WORD wRange; + DWORD dwTimecode; + DWORD dwUserbits; + DWORD dwAmFlags; +} WMT_TIMECODE_EXTENSION_DATA; #include <poppack.h> typedef struct _WM_PORT_NUMBER_RANGE @@ -1056,6 +1064,69 @@ interface IWMSyncReader : IUnknown [in] IStream *pStream); } +[ + object, + uuid(9f762fa7-a22e-428d-93c9-ac82f3aafe5a), + pointer_default( unique ), + local +] +interface IWMReaderAllocatorEx : IUnknown +{ + HRESULT AllocateForStreamEx( + [in] WORD wStreamNum, + [in] DWORD cbBuffer, + [out] INSSBuffer **ppBuffer, + [in] DWORD dwFlags, + [in] QWORD cnsSampleTime, + [in] QWORD cnsSampleDuration, + [in] void *pvContext); + + HRESULT AllocateForOutputEx( + [in] WORD wOutputNum, + [in] DWORD cbBuffer, + [out] INSSBuffer **ppBuffer, + [in] DWORD dwFlags, + [in] QWORD cnsSampleTime, + [in] QWORD cnsSampleDuration, + [in] void *pvContext); +} + +[ + object, + uuid(faed3d21-1b6b-4af7-8bc6-3e189bbc187b), + pointer_default( unique ), + local +] +interface IWMSyncReader2 : IWMSyncReader +{ + HRESULT SetRangeByTimecode( + [in] WORD wStreamNum, + [in] WMT_TIMECODE_EXTENSION_DATA *pStart, + [in] WMT_TIMECODE_EXTENSION_DATA *pEnd); + + HRESULT SetRangeByFrameEx( + [in] WORD wStreamNum, + [in] QWORD qwFrameNumber, + [in] LONGLONG cFramesToRead, + [out] QWORD *pcnsStartTime); + + HRESULT SetAllocateForOutput( + [in] DWORD dwOutputNum, + [in] IWMReaderAllocatorEx *pAllocator); + + HRESULT GetAllocateForOutput( + [in] DWORD dwOutputNum, + [out] IWMReaderAllocatorEx **ppAllocator); + + HRESULT SetAllocateForStream( + [in] DWORD dwStreamNum, + [in] IWMReaderAllocatorEx *pAllocator); + + HRESULT GetAllocateForStream( + [in] DWORD dwStreamNum, + [out] IWMReaderAllocatorEx **ppAllocator); +} + [ object, uuid(96406bd5-2b2b-11d3-b36b-00c04f6108ff), @@ -1791,6 +1862,7 @@ cpp_quote("HRESULT WINAPI WMCheckURLExtension(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCheckURLScheme(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);") +cpp_quote("HRESULT WINAPI WMCreateSyncReader(IUnknown*,DWORD,IWMSyncReader**);") cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_Base, 0x00000000,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") cpp_quote("EXTERN_GUID(WMMEDIATYPE_Video, 0x73646976,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") -- 2.21.0

1 0

[PATCH] [include] add missing WMT_RIGHTS enum definition
by Vijay Kiran Kamuju 27 Feb '19

27 Feb '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/drmexternals.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/drmexternals.idl b/include/drmexternals.idl index 88826ad561..b89039423d 100644 --- a/include/drmexternals.idl +++ b/include/drmexternals.idl @@ -1,5 +1,6 @@ /* * Copyright 2017 Alistair Leslie-Hughes + * Copyright 2019 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,3 +18,16 @@ */ import "wmdrmsdk.idl"; + +typedef enum WMT_RIGHTS { + WMT_RIGHT_PLAYBACK = 0x00000001, + WMT_RIGHT_COPY_TO_NON_SDMI_DEVICE = 0x00000002, + WMT_RIGHT_COPY_TO_CD = 0x00000008, + WMT_RIGHT_COPY_TO_SDMI_DEVICE = 0x00000010, + WMT_RIGHT_ONE_TIME = 0x00000020, + WMT_RIGHT_SAVE_STREAM_PROTECTED = 0x00000040, + WMT_RIGHT_COPY = 0x00000080, + WMT_RIGHT_COLLABORATIVE_PLAY = 0x00000100, + WMT_RIGHT_SDMI_TRIGGER = 0x00010000, + WMT_RIGHT_SDMI_NOMORECOPIES = 0x00020000 +} WMT_RIGHTS; -- 2.21.0

1 0

The Wine Project has been accepted as a GSoC 2019 mentor organization!
by André Hentschel 27 Feb '19

27 Feb '19

Hi all, I just invited some possible Mentors and think I forgot lots of them compared to recent years, so please check your inbox and if you can't find an invitation, let me know

1 0

[PATCH] msvcrt: Fix buffer overflow in _get_tzname.
by Piotr Caban 27 Feb '19

27 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46481 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/time.c | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH 2/2] setupapi: Fix an off by one error.
by Zhiyi Zhang 27 Feb '19

27 Feb '19

Although RegSetValueExW will add a NULL character if it's missing, better do it right. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 46987c8eb9..cc21839049 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1583,7 +1583,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const if (description) { SETUPDI_SetDeviceRegistryPropertyW(device, SPDRP_DEVICEDESC, - (const BYTE *)description, lstrlenW(description) * sizeof(WCHAR)); + (const BYTE *)description, (lstrlenW(description) + 1) * sizeof(WCHAR)); } if (device_data) -- 2.20.1

2 2

[PATCH 1/2] setupapi: Fix typos.
by Zhiyi Zhang 27 Feb '19

27 Feb '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/devinst.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 537b335176..46987c8eb9 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -77,8 +77,8 @@ static const WCHAR Enum[] = {'S','y','s','t','e','m','\\', static const WCHAR DeviceDesc[] = {'D','e','v','i','c','e','D','e','s','c',0}; static const WCHAR DeviceInstance[] = {'D','e','v','i','c','e','I','n','s','t','a','n','c','e',0}; static const WCHAR DeviceParameters[] = {'D','e','v','i','c','e',' ','P','a','r','a','m','e','t','e','r','s',0}; -static const WCHAR HardwareId[] = {'H','a','r','d','w','a','r','e','I','D',0}; -static const WCHAR CompatibleIDs[] = {'C','o','m','p','a','t','i','b','l','e','I','d','s',0}; +static const WCHAR HardwareID[] = {'H','a','r','d','w','a','r','e','I','D',0}; +static const WCHAR CompatibleIDs[] = {'C','o','m','p','a','t','i','b','l','e','I','D','s',0}; static const WCHAR Service[] = {'S','e','r','v','i','c','e',0}; static const WCHAR Driver[] = {'D','r','i','v','e','r',0}; static const WCHAR ConfigFlags[] = {'C','o','n','f','i','g','F','l','a','g','s',0}; @@ -607,7 +607,7 @@ struct PropertyMapEntry static const struct PropertyMapEntry PropertyMap[] = { { REG_SZ, "DeviceDesc", DeviceDesc }, - { REG_MULTI_SZ, "HardwareId", HardwareId }, + { REG_MULTI_SZ, "HardwareID", HardwareID }, { REG_MULTI_SZ, "CompatibleIDs", CompatibleIDs }, { 0, NULL, NULL }, /* SPDRP_UNUSED0 */ { REG_SZ, "Service", Service }, -- 2.20.1

2 2

[PATCH 09/10] d3d12/tests: Add test for backbuffer index after changing sync interval.
by Józef Kucia 27 Feb '19

27 Feb '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/tests/d3d12.c | 77 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 67e72405d89f..dec7cf855839 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -1009,6 +1009,82 @@ static void test_swapchain_size_mismatch(void) destroy_test_context(&context); } +static void test_swapchain_backbuffer_index(void) +{ + static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + unsigned int previous_index, expected_index, index, i; + ID3D12GraphicsCommandList *command_list; + ID3D12Resource *backbuffers[2]; + struct test_context_desc desc; + struct test_context context; + unsigned int sync_interval; + IDXGISwapChain3 *swapchain; + ID3D12CommandQueue *queue; + ID3D12Device *device; + ULONG refcount; + HWND window; + HRESULT hr; + RECT rect; + BOOL ret; + + desc.no_pipeline = TRUE; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + window = create_window(WS_VISIBLE); + ret = GetClientRect(window, &rect); + ok(ret, "Failed to get client rect.\n"); + swapchain = create_swapchain(queue, window, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); + + for (i = 0; i < ARRAY_SIZE(backbuffers); ++i) + { + hr = IDXGISwapChain3_GetBuffer(swapchain, i, &IID_ID3D12Resource, (void **)&backbuffers[i]); + ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", i, hr); + } + + previous_index = 1; + for (i = 0; i < 20; ++i) + { + index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); + ID3D12Device_CreateRenderTargetView(device, backbuffers[index], NULL, context.rtv); + + expected_index = (previous_index + 1) % 2; + ok(index == expected_index, "Test %u: Got index %u, expected %u.\n", i, index, expected_index); + + transition_sub_resource_state(command_list, backbuffers[index], 0, + D3D12_RESOURCE_STATE_PRESENT, D3D12_RESOURCE_STATE_RENDER_TARGET); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, green, 0, NULL); + transition_sub_resource_state(command_list, backbuffers[index], 0, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_PRESENT); + hr = ID3D12GraphicsCommandList_Close(command_list); + ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); + exec_command_list(queue, command_list); + + if (i <= 4 || (8 <= i && i <= 14)) + sync_interval = 1; + else + sync_interval = 0; + + hr = IDXGISwapChain3_Present(swapchain, sync_interval, 0); + ok(hr == S_OK, "Failed to present, hr %#x.\n", hr); + + wait_queue_idle(device, queue); + reset_command_list(command_list, context.allocator); + + previous_index = index; + } + + for (i = 0; i < ARRAY_SIZE(backbuffers); ++i) + ID3D12Resource_Release(backbuffers[i]); + refcount = IDXGISwapChain3_Release(swapchain); + ok(!refcount, "Swapchain has %u references left.\n", refcount); + DestroyWindow(window); + destroy_test_context(&context); +} + START_TEST(d3d12) { BOOL enable_debug_layer = FALSE; @@ -1039,4 +1115,5 @@ START_TEST(d3d12) test_draw(); test_swapchain_draw(); test_swapchain_size_mismatch(); + test_swapchain_backbuffer_index(); } -- 2.19.2

2 1

[PATCH] mfplat: Add MFCreateMFByteStreamOnStreamEx() stub.
by Jactry Zeng 27 Feb '19

27 Feb '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 10 ++++++++++ dlls/mfplat/mfplat.spec | 1 + include/mfidl.idl | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index a38c03b4d1..219817f677 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -4142,3 +4142,13 @@ void WINAPI MFHeapFree(void *p) TRACE("%p\n", p); HeapFree(GetProcessHeap(), 0, p); } + +/*********************************************************************** + * MFCreateMFByteStreamOnStreamEx (mfplat.@) + */ +HRESULT WINAPI MFCreateMFByteStreamOnStreamEx(IUnknown *stream, IMFByteStream **bytestream) +{ + FIXME("(%p, %p): stub\n", stream, bytestream); + + return E_NOTIMPL; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index c4e0b2abfa..e1da5445a5 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -46,6 +46,7 @@ @ stdcall MFCreateFile(long long long wstr ptr) @ stub MFCreateLegacyMediaBufferOnMFMediaBuffer @ stdcall MFCreateMFByteStreamOnStream(ptr ptr) +@ stdcall MFCreateMFByteStreamOnStreamEx(ptr ptr) @ stub MFCreateMFVideoFormatFromMFMediaType @ stub MFCreateMediaBufferWrapper @ stdcall MFCreateMediaEvent(long ptr long ptr ptr) diff --git a/include/mfidl.idl b/include/mfidl.idl index c8f011bb77..01e86efc51 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -318,6 +318,7 @@ interface IMFSequencerSource : IUnknown cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream);" ) +cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStreamEx(IUnknown *stream, IMFByteStream **bytestream);") cpp_quote("HRESULT WINAPI MFCreateSequencerSource(IUnknown *reserved, IMFSequencerSource **seq_source);" ) cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") cpp_quote("HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD cMediaTypes,") -- 2.20.1

1 0

[PATCH 2/2 v2] ntdll: Track copy-on-write memory state on i386 and x86_64 architectures.
by Piotr Caban 27 Feb '19

27 Feb '19

Based on patch by Michael Müller. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - added credit for Michael dlls/kernel32/tests/virtual.c | 12 +++----- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_arm.c | 8 +++++ dlls/ntdll/signal_arm64.c | 8 +++++ dlls/ntdll/signal_i386.c | 51 +++++++++++++++++++++++++++++++ dlls/ntdll/signal_powerpc.c | 8 +++++ dlls/ntdll/signal_x86_64.c | 45 +++++++++++++++++++++++++++ dlls/ntdll/thread.c | 1 + dlls/ntdll/virtual.c | 57 +++++++++++++++++++++++++++-------- 9 files changed, 170 insertions(+), 21 deletions(-)

3 5

[PATCH] msvcp120/tests: Avoid using the comma operator.
by Michael Stefaniuc 27 Feb '19

27 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 70fc0c13dc..c1c7002f26 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -924,13 +924,13 @@ static void test_xtime_get(void) } /* Test parameter and return value */ - before.sec = 0xdeadbeef, before.nsec = 0xdeadbeef; + before.sec = 0xdeadbeef; before.nsec = 0xdeadbeef; i = p_xtime_get(&before, 0); ok(i == 0, "expect xtime_get() to return 0, got: %d\n", i); ok(before.sec == 0xdeadbeef && before.nsec == 0xdeadbeef, "xtime_get() shouldn't have modified the xtime struct with the given option\n"); - before.sec = 0xdeadbeef, before.nsec = 0xdeadbeef; + before.sec = 0xdeadbeef; before.nsec = 0xdeadbeef; i = p_xtime_get(&before, 1); ok(i == 1, "expect xtime_get() to return 1, got: %d\n", i); ok(before.sec != 0xdeadbeef && before.nsec != 0xdeadbeef, -- 2.20.1

2 1

[PATCH 7/8] server: Allow clients to get handle from kernel object pointer.
by Jacek Caban 27 Feb '19

27 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/device.c | 19 +++++++++++++++++++ server/protocol.def | 10 ++++++++++ 2 files changed, 29 insertions(+)

2 1

[PATCH 5/8] server: Make sure that IRP_MJ_CLOSE is queued only once.
by Jacek Caban 27 Feb '19

27 Feb '19

In case client opens new handles while handling close. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

2 1

[PATCH 4/8] server: Allow queuing IRPs with no file associated.
by Jacek Caban 27 Feb '19

27 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/device.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-)

2 1

[PATCH 8/8] ntoskrnl.exe: Support event objects created from server handle.
by Jacek Caban 27 Feb '19

27 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 +++++ dlls/ntoskrnl.exe/ntoskrnl_private.h | 3 ++ dlls/ntoskrnl.exe/sync.c | 76 +++++++++++++++++++++++----- dlls/ntoskrnl.exe/tests/driver.c | 36 ++++++++++++- 4 files changed, 115 insertions(+), 14 deletions(-)

1 0

[PATCH 6/8] server: Notify client about freed object so that it may free associated kernel object.
by Jacek Caban 27 Feb '19

27 Feb '19

Long term, we may consider making interface between server and device manager more generic so that it could be used for messages other than IRPs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 +++++++++++++- server/device.c | 15 +++++++++++++++ server/protocol.def | 6 ++++++ 3 files changed, 34 insertions(+), 1 deletion(-)

1 0

[PATCH 3/8] server: Allow kernel to keep reference to server objects by pointer.
by Jacek Caban 27 Feb '19

27 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- At some point, I considered and prototyped storing a handle on client side as a handle. It lead into a number of problems. For example handle count was not right, breaking things like IRP_MJ_CLOSE implementation. A separated mechanism worked much better. dlls/ntoskrnl.exe/ntoskrnl.c | 45 ++++++++++++++++++++++++--- server/device.c | 60 ++++++++++++++++++++++++++++++++++++ server/protocol.def | 14 +++++++++ 3 files changed, 115 insertions(+), 4 deletions(-)

1 0

[PATCH 2/8] server: Store pointers to objects created by kernel_object_from_handle in server.
by Jacek Caban 27 Feb '19

27 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 104 ++++++++++++++++++++++++------- dlls/ntoskrnl.exe/tests/driver.c | 3 - server/device.c | 84 +++++++++++++++++++++++++ server/protocol.def | 17 +++++ 4 files changed, 182 insertions(+), 26 deletions(-)

1 0

Checking for manifest in comctl32 for custom draw
by Gabriel Ivăncescu 27 Feb '19

27 Feb '19

Trying to implement custom draw for buttons to fix https://bugs.winehq.org/show_bug.cgi?id=10531 and I have a question about the manifest as mentioned in the bug report. I notice that the tests already assume that comctl32 has these enabled, and they work on Windows, so is it really necessary to check for the manifest at all? Obviously, fixing this would only go into comctl32/button and not in user32/button because the latter doesn't have custom draw on Windows. Do I still have to check for the manifest? And if so, can someone please point me to the right direction on how to do that? I've no knowledge of this at all. Thank you.

2 2

WineConf 2019: call for volunteers
by Alexandre Julliard 27 Feb '19

27 Feb '19

Folks, It's time to start thinking about this year's Wine conference! Until now, selecting the next WineConf was a more or less ad-hoc process, but we had some discussions on the wineconf list a while ago, and it was suggested that the Wine Committee should play a more active role in the decision, especially since the chosen location impacts the financial decisions. Ideally we'd define a formal set of requirements, and issue a Call for Proposals, but it was felt that this would take too much time and thus would be more appropriate for 2020. So I thought that for this year we'd do a simple call for volunteers, and have the Wine Committee work with the volunteers to select the best proposal. So, would anybody like to volunteer to host WineConf 2019? -- Alexandre Julliard julliard(a)winehq.org

1 0

[PATCH] ntoskrnl.exe: Add stubs for PsSuspendProcess() and PsResumeProcess().
by Huw Davies 27 Feb '19

27 Feb '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 20 ++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 ++ 2 files changed, 22 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 010f9f735f..c21bc2f830 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2965,6 +2965,26 @@ NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS status) } +/*********************************************************************** + * PsSuspendProcess (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsSuspendProcess(PEPROCESS process) +{ + FIXME("stub: %p\n", process); + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** + * PsResumeProcess (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsResumeProcess(PEPROCESS process) +{ + FIXME("stub: %p\n", process); + return STATUS_NOT_IMPLEMENTED; +} + + /*********************************************************************** * MmGetSystemRoutineAddress (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 4dcd553049..902ae2ff4d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -922,6 +922,7 @@ @ stdcall PsRemoveCreateThreadNotifyRoutine(ptr) @ stdcall PsRemoveLoadImageNotifyRoutine(ptr) @ stub PsRestoreImpersonation +@ stdcall PsResumeProcess(ptr) @ stub PsReturnPoolQuota @ stub PsReturnProcessNonPagedPoolQuota @ stub PsReturnProcessPagedPoolQuota @@ -941,6 +942,7 @@ @ stub PsSetProcessWindowStation @ stub PsSetThreadHardErrorsAreDisabled @ stub PsSetThreadWin32Thread +@ stdcall PsSuspendProcess(ptr) @ stdcall PsTerminateSystemThread(long) @ extern PsThreadType @ stdcall READ_REGISTER_BUFFER_UCHAR(ptr ptr long) -- 2.18.0

1 0

[PATCH v2 1/4] comctl32/listbox: Use a helper to set item data by index
by Gabriel Ivăncescu 27 Feb '19

27 Feb '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/listbox.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 2b6702a..954866a 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -161,6 +161,11 @@ static ULONG_PTR get_item_data( const LB_DESCR *descr, UINT index ) return (descr->style & LBS_NODATA) ? 0 : descr->items[index].data; } +static void set_item_data( LB_DESCR *descr, UINT index, ULONG_PTR data ) +{ + if (!(descr->style & LBS_NODATA)) descr->items[index].data = data; +} + static WCHAR *get_item_string( const LB_DESCR *descr, UINT index ) { return HAS_STRINGS(descr) ? descr->items[index].str : NULL; @@ -2684,7 +2689,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - if (!(descr->style & LBS_NODATA)) descr->items[wParam].data = lParam; + set_item_data(descr, wParam, lParam); /* undocumented: returns TRUE, not LB_OKAY (0) */ return TRUE; -- 2.20.1

2 5

[PATCH 2/3] Initial port to PowerPC 64 Little Endian systems Verified
by Timothy Pearson 27 Feb '19

27 Feb '19

to start winecfg Signed-off-by: Timothy Pearson <tpearson(a)raptorengineering.com> --- configure | 38 + configure.ac | 9 + dlls/dbghelp/Makefile.in | 1 + dlls/dbghelp/cpu_ppc64.c | 100 +++ dlls/dbghelp/dbghelp.c | 6 +- dlls/kernel32/cpu.c | 3 + dlls/kernel32/module.c | 1 + dlls/kernel32/process.c | 8 +- dlls/kernel32/tests/file.c | 2 + dlls/kernel32/tests/loader.c | 2 + dlls/kernel32/tests/module.c | 2 + dlls/ntdll/Makefile.in | 1 + dlls/ntdll/loader.c | 10 +- dlls/ntdll/nt.c | 8 + dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/process.c | 8 +- dlls/ntdll/server.c | 6 +- dlls/ntdll/signal_powerpc.c | 4 +- dlls/ntdll/signal_ppc64.c | 1221 +++++++++++++++++++++++++++++++ dlls/ntdll/virtual.c | 2 +- dlls/setupapi/fakedll.c | 2 + dlls/ucrtbase/ucrtbase.spec | 2 +- include/basetsd.h | 10 + include/msvcrt/crtdefs.h | 6 + include/rpc.h | 4 +- include/windef.h | 6 + include/wine/server_protocol.h | 6 +- include/winnt.h | 138 +++- libs/port/interlocked.c | 2 +- libs/wine/port.c | 19 + programs/winedbg/Makefile.in | 1 + programs/winedbg/be_ppc.c | 2 +- programs/winedbg/be_ppc64.c | 303 ++++++++ programs/winedbg/gdbproxy.c | 2 + programs/winedbg/tgt_active.c | 2 + programs/winedbg/tgt_minidump.c | 3 + programs/winedbg/winedbg.c | 4 + programs/winetest/main.c | 2 + server/mapping.c | 8 +- server/process.h | 2 +- server/protocol.def | 6 +- server/thread.c | 6 + server/trace.c | 21 + tools/widl/widl.c | 7 + tools/widl/widl.h | 2 +- tools/widl/write_msft.c | 2 +- tools/winebuild/build.h | 4 +- tools/winebuild/import.c | 117 +++ tools/winebuild/main.c | 6 + tools/winebuild/parser.c | 4 +- tools/winebuild/spec32.c | 37 +- tools/winebuild/utils.c | 12 + tools/winedump/minidump.c | 3 + tools/winedump/pe.c | 1 + tools/winegcc/utils.h | 2 +- tools/winegcc/winegcc.c | 41 +- tools/wrc/wrc.c | 3 +- 57 files changed, 2168 insertions(+), 64 deletions(-) create mode 100644 dlls/dbghelp/cpu_ppc64.c create mode 100644 dlls/ntdll/signal_ppc64.c create mode 100644 programs/winedbg/be_ppc64.c diff --git a/configure b/configure index 793e2ffc5c..c0e210d429 100755 --- a/configure +++ b/configure @@ -5670,6 +5670,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext i[3456789]86*) enable_win16=${enable_win16:-yes} ;; + powerpc64*) + CC="$CC -m64" + CXX="$CXX -m64" + host_cpu="powerpc64" + notice_platform="64-bit " + TARGETFLAGS="-m64" + + enable_win64=${enable_win64:-yes} + ;; esac enable_win16=${enable_win16:-no} @@ -9215,6 +9224,7 @@ fi *x86_64*) exec_prefix='${prefix}/x86_64' ;; *arm*) exec_prefix='${prefix}/armeabi-v7a' ;; *aarch64*) exec_prefix='${prefix}/arm64-v8a' ;; + *powerpc64*) exec_prefix='${prefix}/ppc64' ;; esac fi ;; @@ -16279,6 +16289,34 @@ CFLAGS=$ac_wine_try_cflags_saved fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fno_omit_frame_pointer" >&5 $as_echo "$ac_cv_cflags__fno_omit_frame_pointer" >&6; } +if test "x$ac_cv_cflags__fno_omit_frame_pointer" = xyes; then : + EXTRACFLAGS="$EXTRACFLAGS -fno-omit-frame-pointer" +fi ;; + esac + + case $host_cpu in + *powerpc64*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-omit-frame-pointer" >&5 +$as_echo_n "checking whether the compiler supports -fno-omit-frame-pointer... " >&6; } +if ${ac_cv_cflags__fno_omit_frame_pointer+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -fno-omit-frame-pointer" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__fno_omit_frame_pointer=yes +else + ac_cv_cflags__fno_omit_frame_pointer=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fno_omit_frame_pointer" >&5 +$as_echo "$ac_cv_cflags__fno_omit_frame_pointer" >&6; } if test "x$ac_cv_cflags__fno_omit_frame_pointer" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -fno-omit-frame-pointer" fi ;; diff --git a/configure.ac b/configure.ac index c978477a51..a615e4a5e6 100644 --- a/configure.ac +++ b/configure.ac @@ -217,6 +217,14 @@ case $host in i[[3456789]]86*) enable_win16=${enable_win16:-yes} ;; + powerpc64*) + CC="$CC -m64" + CXX="$CXX -m64" + host_cpu="powerpc64" + notice_platform="64-bit " + AC_SUBST(TARGETFLAGS,"-m64") + enable_win64=${enable_win64:-yes} + ;; esac dnl enable_win16 defaults to yes on x86, to no on other CPUs @@ -932,6 +940,7 @@ case $host_os in *x86_64*) exec_prefix='${prefix}/x86_64' ;; *arm*) exec_prefix='${prefix}/armeabi-v7a' ;; *aarch64*) exec_prefix='${prefix}/arm64-v8a' ;; + *powerpc64*) exec_prefix='${prefix}/ppc64' ;; esac fi ;; diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index 3e120e8afe..35b14ad6bd 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ cpu_arm64.c \ cpu_i386.c \ cpu_ppc.c \ + cpu_ppc64.c \ cpu_x86_64.c \ crc32.c \ dbghelp.c \ diff --git a/dlls/dbghelp/cpu_ppc64.c b/dlls/dbghelp/cpu_ppc64.c new file mode 100644 index 0000000000..270da05f39 --- /dev/null +++ b/dlls/dbghelp/cpu_ppc64.c @@ -0,0 +1,100 @@ +/* + * File cpu_ppc64.c + * + * Copyright (C) 2009-2009, Eric Pouech. + * + * 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 + */ + +#include <assert.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "dbghelp_private.h" +#include "winternl.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); + +static BOOL ppc64_get_addr(HANDLE hThread, const CONTEXT* ctx, + enum cpu_addr ca, ADDRESS64* addr) +{ + switch (ca) + { +#if defined(__powerpc64__) + case cpu_addr_pc: + addr->Mode = AddrModeFlat; + addr->Segment = 0; /* don't need segment */ + addr->Offset = ctx->Iar; + return TRUE; +#endif + default: + case cpu_addr_stack: + case cpu_addr_frame: + FIXME("not done\n"); + } + return FALSE; +} + +static BOOL ppc64_stack_walk(struct cpu_stack_walk* csw, STACKFRAME64 *frame, + union ctx *ctx) +{ + FIXME("not done\n"); + return FALSE; +} + +static unsigned ppc64_map_dwarf_register(unsigned regno, BOOL eh_frame) +{ + FIXME("not done\n"); + return 0; +} + +static void *ppc64_fetch_context_reg(union ctx *ctx, unsigned regno, unsigned *size) +{ + FIXME("NIY\n"); + return NULL; +} + +static const char* ppc64_fetch_regname(unsigned regno) +{ + FIXME("Unknown register %x\n", regno); + return NULL; +} + +static BOOL ppc64_fetch_minidump_thread(struct dump_context* dc, unsigned index, unsigned flags, const CONTEXT* ctx) +{ + FIXME("NIY\n"); + return FALSE; +} + +static BOOL ppc64_fetch_minidump_module(struct dump_context* dc, unsigned index, unsigned flags) +{ + FIXME("NIY\n"); + return FALSE; +} + +DECLSPEC_HIDDEN struct cpu cpu_ppc64 = { + IMAGE_FILE_MACHINE_POWERPC64, + 8, + CV_REG_NONE, /* FIXME */ + ppc64_get_addr, + ppc64_stack_walk, + NULL, + ppc64_map_dwarf_register, + ppc64_fetch_context_reg, + ppc64_fetch_regname, + ppc64_fetch_minidump_thread, + ppc64_fetch_minidump_module, +}; diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index ed4d5f4321..e4a0a6d509 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -132,14 +132,16 @@ const char* wine_dbgstr_addr(const ADDRESS64* addr) } } -extern struct cpu cpu_i386, cpu_x86_64, cpu_ppc, cpu_arm, cpu_arm64; +extern struct cpu cpu_i386, cpu_x86_64, cpu_ppc, cpu_arm, cpu_arm64, cpu_ppc64; -static struct cpu* dbghelp_cpus[] = {&cpu_i386, &cpu_x86_64, &cpu_ppc, &cpu_arm, &cpu_arm64, NULL}; +static struct cpu* dbghelp_cpus[] = {&cpu_i386, &cpu_x86_64, &cpu_ppc, &cpu_arm, &cpu_arm64, &cpu_ppc64, NULL}; struct cpu* dbghelp_current_cpu = #if defined(__i386__) &cpu_i386 #elif defined(__x86_64__) &cpu_x86_64 +#elif defined(__powerpc64__) + &cpu_ppc64 #elif defined(__powerpc__) &cpu_ppc #elif defined(__arm__) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 9445d0bc05..71032c4ae4 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -145,6 +145,9 @@ VOID WINAPI GetSystemInfo( default: si->dwProcessorType = 0; } break; + case PROCESSOR_ARCHITECTURE_PPC64: + si->dwProcessorType = PROCESSOR_PPC64_OP; + break; case PROCESSOR_ARCHITECTURE_AMD64: si->dwProcessorType = PROCESSOR_AMD_X8664; break; diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index eb0471cc8e..c70b9ace57 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -333,6 +333,7 @@ BOOL WINAPI GetBinaryTypeW( LPCWSTR name, LPDWORD type ) return TRUE; case IMAGE_FILE_MACHINE_AMD64: case IMAGE_FILE_MACHINE_ARM64: + case IMAGE_FILE_MACHINE_POWERPC64: *type = SCS_64BIT_BINARY; return TRUE; } diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index ad257a054e..61c18c77c5 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -111,7 +111,7 @@ static WCHAR winevdm[] = {'C',':','\\','w','i','n','d','o','w','s', '\\','s','y','s','t','e','m','3','2', '\\','w','i','n','e','v','d','m','.','e','x','e',0}; -static const char * const cpu_names[] = { "x86", "x86_64", "PowerPC", "ARM", "ARM64" }; +static const char * const cpu_names[] = { "x86", "x86_64", "PowerPC", "ARM", "ARM64","PowerPC 64" }; static void exec_process( LPCWSTR name ); @@ -173,7 +173,7 @@ static inline unsigned int is_path_prefix( const WCHAR *prefix, const WCHAR *fil */ static inline BOOL is_64bit_arch( cpu_type_t cpu ) { - return (cpu == CPU_x86_64 || cpu == CPU_ARM64); + return (cpu == CPU_x86_64 || cpu == CPU_ARM64 || cpu == CPU_POWERPC64); } @@ -286,6 +286,7 @@ static enum binary_type get_binary_info( HANDLE hfile, pe_image_info_t *info ) { case 3: info->cpu = CPU_x86; break; case 20: info->cpu = CPU_POWERPC; break; + case 22: info->cpu = CPU_POWERPC64; break; case 40: info->cpu = CPU_ARM; break; case 62: info->cpu = CPU_x86_64; break; case 183: info->cpu = CPU_ARM64; break; @@ -338,6 +339,7 @@ static enum binary_type get_binary_info( HANDLE hfile, pe_image_info_t *info ) case 0x0000000c: info->cpu = CPU_ARM; break; case 0x0100000c: info->cpu = CPU_ARM64; break; case 0x00000012: info->cpu = CPU_POWERPC; break; + case 0x00000014: info->cpu = CPU_POWERPC64; break; } switch(header.macho.filetype) { @@ -2716,6 +2718,8 @@ BOOL WINAPI CreateProcessInternalW( HANDLE token, LPCWSTR app_name, LPWSTR cmd_l /* assume current arch */ #if defined(__i386__) || defined(__x86_64__) pe_info.cpu = is_64bit ? CPU_x86_64 : CPU_x86; +#elif defined(__powerpc64__) + pe_info.cpu = CPU_POWERPC64; #elif defined(__powerpc__) pe_info.cpu = CPU_POWERPC; #elif defined(__arm__) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 33b17aa327..ef91548c9b 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2278,6 +2278,8 @@ static BOOL create_fake_dll( LPCSTR filename ) nt->FileHeader.Machine = IMAGE_FILE_MACHINE_I386; #elif defined __x86_64__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_AMD64; +#elif defined __powerpc64__ + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_POWERPC64; #elif defined __powerpc__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_POWERPC; #elif defined __arm__ diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index b8dc72bc7f..b2c65c4123 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -102,6 +102,8 @@ static const IMAGE_NT_HEADERS nt_header_template = IMAGE_FILE_MACHINE_I386, /* Machine */ #elif defined __x86_64__ IMAGE_FILE_MACHINE_AMD64, /* Machine */ +#elif defined __powerpc64__ + IMAGE_FILE_MACHINE_POWERPC64, /* Machine */ #elif defined __powerpc__ IMAGE_FILE_MACHINE_POWERPC, /* Machine */ #elif defined __arm__ diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 3e077f38a9..aba228ff05 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -60,6 +60,8 @@ static const struct IMAGE_FILE_MACHINE_I386, /* Machine */ #elif defined __x86_64__ IMAGE_FILE_MACHINE_AMD64, /* Machine */ +#elif defined __powerpc64__ + IMAGE_FILE_MACHINE_POWERPC64, /* Machine */ #elif defined __powerpc__ IMAGE_FILE_MACHINE_POWERPC, /* Machine */ #elif defined __arm__ diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index ed4bb94e4d..fac244546d 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -41,6 +41,7 @@ C_SRCS = \ signal_arm64.c \ signal_i386.c \ signal_powerpc.c \ + signal_ppc64.c \ signal_x86_64.c \ string.c \ sync.c \ diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d7dbe573a4..6f5e4da929 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -211,7 +211,7 @@ static inline BOOL call_dll_entry_point( DLLENTRYPROC proc, void *module, #endif /* __i386__ */ -#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) +#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || defined(__powerpc64__) /************************************************************************* * stub_entry_point * @@ -1964,11 +1964,15 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info ) return info->machine == IMAGE_FILE_MACHINE_ARM || info->machine == IMAGE_FILE_MACHINE_THUMB || info->machine == IMAGE_FILE_MACHINE_ARMNT; +#elif defined(__powerpc__) && !defined(__powerpc64__) + return info->machine == IMAGE_FILE_MACHINE_POWERPC; #elif defined(_WIN64) /* support 32-bit IL-only images on 64-bit */ -#ifdef __x86_64__ +#if defined(__x86_64__) if (info->machine == IMAGE_FILE_MACHINE_AMD64) return TRUE; -#else +#elif defined(__aarch64__) if (info->machine == IMAGE_FILE_MACHINE_ARM64) return TRUE; +#elif defined(__powerpc64__) + if (info->machine == IMAGE_FILE_MACHINE_POWERPC64) return TRUE; #endif if (!info->contains_code) return TRUE; if (!(info->image_flags & IMAGE_FLAGS_ComPlusNativeReady)) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 0a599470c9..792c7f06e1 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1136,6 +1136,14 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) } } +#elif defined(__powerpc64__) + +static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) +{ + FIXME("CPU Feature detection not implemented.\n"); + info->Architecture = PROCESSOR_ARCHITECTURE_PPC64; +} + #elif defined(__powerpc__) || defined(__ppc__) static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 649774f48a..750eb4e0cb 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -160,7 +160,7 @@ @ stdcall NtCreateTimer(ptr long ptr long) @ stub NtCreateToken # @ stub NtCreateWaitablePort -@ stdcall -arch=win32,arm64 NtCurrentTeb() +@ stdcall -arch=win32,arm64,powerpc64 NtCurrentTeb() # @ stub NtDebugActiveProcess # @ stub NtDebugContinue @ stdcall NtDelayExecution(long ptr) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 2ff8610cce..b1a48d0c1a 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -60,11 +60,11 @@ static ULONG execute_flags = MEM_EXECUTE_OPTION_DISABLE; static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); -static const char * const cpu_names[] = { "x86", "x86_64", "PowerPC", "ARM", "ARM64" }; +static const char * const cpu_names[] = { "x86", "x86_64", "PowerPC", "ARM", "ARM64", "PowerPC 64" }; static inline BOOL is_64bit_arch( cpu_type_t cpu ) { - return (cpu == CPU_x86_64 || cpu == CPU_ARM64); + return (cpu == CPU_x86_64 || cpu == CPU_ARM64 || cpu == CPU_POWERPC64); } /* @@ -520,13 +520,13 @@ NTSTATUS WINAPI NtQueryInformationProcess( ULONG_PTR val = 0; if (ProcessHandle == GetCurrentProcess()) val = is_wow64; - else if (server_cpus & ((1 << CPU_x86_64) | (1 << CPU_ARM64))) + else if (server_cpus & ((1 << CPU_x86_64) | (1 << CPU_ARM64) | (1 << CPU_POWERPC64))) { SERVER_START_REQ( get_process_info ) { req->handle = wine_server_obj_handle( ProcessHandle ); if (!(ret = wine_server_call( req ))) - val = (reply->cpu != CPU_x86_64 && reply->cpu != CPU_ARM64); + val = (reply->cpu != CPU_x86_64 && reply->cpu != CPU_ARM64 && reply->cpu != CPU_POWERPC64); } SERVER_END_REQ; } diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 094b530950..3039acb0e0 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -100,6 +100,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(server); static const enum cpu_type client_cpu = CPU_x86; #elif defined(__x86_64__) static const enum cpu_type client_cpu = CPU_x86_64; +#elif defined(__powerpc64__) +static const enum cpu_type client_cpu = CPU_POWERPC64; #elif defined(__powerpc__) static const enum cpu_type client_cpu = CPU_POWERPC; #elif defined(__arm__) @@ -1475,7 +1477,7 @@ void server_init_process_done(void) */ size_t server_init_thread( void *entry_point, BOOL *suspend ) { - static const char *cpu_names[] = { "x86", "x86_64", "PowerPC", "ARM", "ARM64" }; + static const char *cpu_names[] = { "x86", "x86_64", "PowerPC", "ARM", "ARM64", "PowerPC64" }; static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); const char *arch = getenv( "WINEARCH" ); int ret; @@ -1518,7 +1520,7 @@ size_t server_init_thread( void *entry_point, BOOL *suspend ) } SERVER_END_REQ; - is_wow64 = !is_win64 && (server_cpus & ((1 << CPU_x86_64) | (1 << CPU_ARM64))) != 0; + is_wow64 = !is_win64 && (server_cpus & ((1 << CPU_x86_64) | (1 << CPU_ARM64) | (1 << CPU_POWERPC64))) != 0; ntdll_get_thread_data()->wow64_redir = is_wow64; switch (ret) diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 86398d8f54..29114be0ff 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifdef __powerpc__ +#if defined(__powerpc__) && !defined(__powerpc64__) #include "config.h" #include "wine/port.h" @@ -1267,4 +1267,4 @@ TEB * WINAPI NtCurrentTeb(void) return pthread_getspecific( teb_key ); } -#endif /* __powerpc__ */ +#endif /* defined(__powerpc__) && !defined(__powerpc64__) */ diff --git a/dlls/ntdll/signal_ppc64.c b/dlls/ntdll/signal_ppc64.c new file mode 100644 index 0000000000..345b15d83e --- /dev/null +++ b/dlls/ntdll/signal_ppc64.c @@ -0,0 +1,1221 @@ +/* + * PowerPC signal handling routines + * + * Copyright 2002 Marcus Meissner, SuSE Linux AG + * Copyright 2019 Timothy Pearson <tpearson(a)raptorengineering.com> + * + * 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 + */ + +#ifdef __powerpc64__ + +#include "config.h" +#include "wine/port.h" + +#include <assert.h> +#include <signal.h> +#include <stdlib.h> +#include <stdarg.h> +#include <stdio.h> +#include <sys/types.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif +#ifdef HAVE_SYS_PARAM_H +# include <sys/param.h> +#endif +#ifdef HAVE_SYSCALL_H +# include <syscall.h> +#else +# ifdef HAVE_SYS_SYSCALL_H +# include <sys/syscall.h> +# endif +#endif +#ifdef HAVE_SYS_SIGNAL_H +# include <sys/signal.h> +#endif +#ifdef HAVE_SYS_UCONTEXT_H +# include <sys/ucontext.h> +#endif + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winternl.h" +#include "wine/library.h" +#include "wine/exception.h" +#include "ntdll_misc.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(relay); + +static pthread_key_t teb_key; + +/*********************************************************************** + * signal context platform-specific definitions + */ +#ifdef linux + +/* All Registers access - only for local access */ +# define REG_sig(reg_name, context) ((context)->uc_mcontext.regs->reg_name) + + +/* Gpr Registers access */ +# define GPR_sig(reg_num, context) REG_sig(gpr[reg_num], context) + +# define IAR_sig(context) REG_sig(nip, context) /* Program counter */ +# define MSR_sig(context) REG_sig(msr, context) /* Machine State Register (Supervisor) */ +# define CTR_sig(context) REG_sig(ctr, context) /* Count register */ + +# define XER_sig(context) REG_sig(xer, context) /* User's integer exception register */ +# define LR_sig(context) REG_sig(link, context) /* Link register */ +# define CR_sig(context) REG_sig(ccr, context) /* Condition register */ + +/* Float Registers access */ +# define FLOAT_sig(reg_num, context) (((double*)((char*)((context)->uc_mcontext.regs+48*4)))[reg_num]) + +# define FPSCR_sig(context) (*(int*)((char*)((context)->uc_mcontext.regs+(48+32*2)*4))) + +/* Exception Registers access */ +# define DAR_sig(context) REG_sig(dar, context) +# define DSISR_sig(context) REG_sig(dsisr, context) +# define TRAP_sig(context) REG_sig(trap, context) + +#endif /* linux */ + +typedef int (*wine_signal_handler)(unsigned int sig); + +static wine_signal_handler handlers[256]; + +/*********************************************************************** + * dispatch_signal + */ +static inline int dispatch_signal(unsigned int sig) +{ + if (handlers[sig] == NULL) return 0; + return handlers[sig](sig); +} + +/*********************************************************************** + * save_context + * + * Set the register values from a sigcontext. + */ +static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) +{ + +#define C(x) context->Gpr##x = GPR_sig(x,sigcontext) + /* Save Gpr registers */ + C(0); C(1); C(2); C(3); C(4); C(5); C(6); C(7); C(8); C(9); C(10); + C(11); C(12); C(13); C(14); C(15); C(16); C(17); C(18); C(19); C(20); + C(21); C(22); C(23); C(24); C(25); C(26); C(27); C(28); C(29); C(30); + C(31); +#undef C + + context->Iar = IAR_sig(sigcontext); /* Program Counter */ + context->Msr = MSR_sig(sigcontext); /* Machine State Register (Supervisor) */ + context->Ctr = CTR_sig(sigcontext); + + context->Xer = XER_sig(sigcontext); + context->Lr = LR_sig(sigcontext); + context->Cr = CR_sig(sigcontext); + + /* Saving Exception regs */ + context->Dar = DAR_sig(sigcontext); + context->Dsisr = DSISR_sig(sigcontext); + context->Trap = TRAP_sig(sigcontext); +} + + +/*********************************************************************** + * restore_context + * + * Build a sigcontext from the register values. + */ +static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) +{ + +#define C(x) GPR_sig(x,sigcontext) = context->Gpr##x + C(0); C(1); C(2); C(3); C(4); C(5); C(6); C(7); C(8); C(9); C(10); + C(11); C(12); C(13); C(14); C(15); C(16); C(17); C(18); C(19); C(20); + C(21); C(22); C(23); C(24); C(25); C(26); C(27); C(28); C(29); C(30); + C(31); +#undef C + + IAR_sig(sigcontext) = context->Iar; /* Program Counter */ + MSR_sig(sigcontext) = context->Msr; /* Machine State Register (Supervisor) */ + CTR_sig(sigcontext) = context->Ctr; + + XER_sig(sigcontext) = context->Xer; + LR_sig(sigcontext) = context->Lr; + CR_sig(sigcontext) = context->Cr; + + /* Setting Exception regs */ + DAR_sig(sigcontext) = context->Dar; + DSISR_sig(sigcontext) = context->Dsisr; + TRAP_sig(sigcontext) = context->Trap; +} + + +/*********************************************************************** + * save_fpu + * + * Set the FPU context from a sigcontext. + */ +static inline void save_fpu( CONTEXT *context, const ucontext_t *sigcontext ) +{ +#define C(x) context->Fpr##x = FLOAT_sig(x,sigcontext) + C(0); C(1); C(2); C(3); C(4); C(5); C(6); C(7); C(8); C(9); C(10); + C(11); C(12); C(13); C(14); C(15); C(16); C(17); C(18); C(19); C(20); + C(21); C(22); C(23); C(24); C(25); C(26); C(27); C(28); C(29); C(30); + C(31); +#undef C + context->Fpscr = FPSCR_sig(sigcontext); +} + + +/*********************************************************************** + * restore_fpu + * + * Restore the FPU context to a sigcontext. + */ +static inline void restore_fpu( CONTEXT *context, const ucontext_t *sigcontext ) +{ +#define C(x) FLOAT_sig(x,sigcontext) = context->Fpr##x + C(0); C(1); C(2); C(3); C(4); C(5); C(6); C(7); C(8); C(9); C(10); + C(11); C(12); C(13); C(14); C(15); C(16); C(17); C(18); C(19); C(20); + C(21); C(22); C(23); C(24); C(25); C(26); C(27); C(28); C(29); C(30); + C(31); +#undef C + FPSCR_sig(sigcontext) = context->Fpscr; +} + + +/*********************************************************************** + * RtlCaptureContext (NTDLL.@) + */ +void WINAPI RtlCaptureContext( CONTEXT *context ) +{ + FIXME("not implemented\n"); + memset( context, 0, sizeof(*context) ); +} + + +/*********************************************************************** + * set_cpu_context + * + * Set the new CPU context. + */ +static void set_cpu_context( const CONTEXT *context ) +{ + FIXME("not implemented\n"); +} + + +/*********************************************************************** + * get_server_context_flags + * + * Convert CPU-specific flags to generic server flags + */ +static unsigned int get_server_context_flags( DWORD flags ) +{ + unsigned int ret = 0; + + if (flags & CONTEXT_CONTROL) ret |= SERVER_CTX_CONTROL; + if (flags & CONTEXT_INTEGER) ret |= SERVER_CTX_INTEGER; + if (flags & CONTEXT_FLOATING_POINT) ret |= SERVER_CTX_FLOATING_POINT; + if (flags & CONTEXT_DEBUG_REGISTERS) ret |= SERVER_CTX_DEBUG_REGISTERS; + return ret; +} + + +/*********************************************************************** + * copy_context + * + * Copy a register context according to the flags. + */ +static void copy_context( CONTEXT *to, const CONTEXT *from, DWORD flags ) +{ + if (flags & CONTEXT_CONTROL) + { + to->Msr = from->Msr; + to->Ctr = from->Ctr; + to->Iar = from->Iar; + to->Lr = from->Lr; + to->Dar = from->Dar; + to->Dsisr = from->Dsisr; + to->Trap = from->Trap; + } + if (flags & CONTEXT_INTEGER) + { + to->Gpr0 = from->Gpr0; + to->Gpr1 = from->Gpr1; + to->Gpr2 = from->Gpr2; + to->Gpr3 = from->Gpr3; + to->Gpr4 = from->Gpr4; + to->Gpr5 = from->Gpr5; + to->Gpr6 = from->Gpr6; + to->Gpr7 = from->Gpr7; + to->Gpr8 = from->Gpr8; + to->Gpr9 = from->Gpr9; + to->Gpr10 = from->Gpr10; + to->Gpr11 = from->Gpr11; + to->Gpr12 = from->Gpr12; + to->Gpr13 = from->Gpr13; + to->Gpr14 = from->Gpr14; + to->Gpr15 = from->Gpr15; + to->Gpr16 = from->Gpr16; + to->Gpr17 = from->Gpr17; + to->Gpr18 = from->Gpr18; + to->Gpr19 = from->Gpr19; + to->Gpr20 = from->Gpr20; + to->Gpr21 = from->Gpr21; + to->Gpr22 = from->Gpr22; + to->Gpr23 = from->Gpr23; + to->Gpr24 = from->Gpr24; + to->Gpr25 = from->Gpr25; + to->Gpr26 = from->Gpr26; + to->Gpr27 = from->Gpr27; + to->Gpr28 = from->Gpr28; + to->Gpr29 = from->Gpr29; + to->Gpr30 = from->Gpr30; + to->Gpr31 = from->Gpr31; + to->Xer = from->Xer; + to->Cr = from->Cr; + } + if (flags & CONTEXT_FLOATING_POINT) + { + to->Fpr0 = from->Fpr0; + to->Fpr1 = from->Fpr1; + to->Fpr2 = from->Fpr2; + to->Fpr3 = from->Fpr3; + to->Fpr4 = from->Fpr4; + to->Fpr5 = from->Fpr5; + to->Fpr6 = from->Fpr6; + to->Fpr7 = from->Fpr7; + to->Fpr8 = from->Fpr8; + to->Fpr9 = from->Fpr9; + to->Fpr10 = from->Fpr10; + to->Fpr11 = from->Fpr11; + to->Fpr12 = from->Fpr12; + to->Fpr13 = from->Fpr13; + to->Fpr14 = from->Fpr14; + to->Fpr15 = from->Fpr15; + to->Fpr16 = from->Fpr16; + to->Fpr17 = from->Fpr17; + to->Fpr18 = from->Fpr18; + to->Fpr19 = from->Fpr19; + to->Fpr20 = from->Fpr20; + to->Fpr21 = from->Fpr21; + to->Fpr22 = from->Fpr22; + to->Fpr23 = from->Fpr23; + to->Fpr24 = from->Fpr24; + to->Fpr25 = from->Fpr25; + to->Fpr26 = from->Fpr26; + to->Fpr27 = from->Fpr27; + to->Fpr28 = from->Fpr28; + to->Fpr29 = from->Fpr29; + to->Fpr30 = from->Fpr30; + to->Fpr31 = from->Fpr31; + to->Fpscr = from->Fpscr; + } +} + + +/*********************************************************************** + * context_to_server + * + * Convert a register context to the server format. + */ +NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) +{ + DWORD flags = from->ContextFlags; /* no CPU id? */ + + memset( to, 0, sizeof(*to) ); + to->cpu = CPU_POWERPC64; + + if (flags & CONTEXT_CONTROL) + { + to->flags |= SERVER_CTX_CONTROL; + to->ctl.powerpc64_regs.iar = from->Iar; + to->ctl.powerpc64_regs.msr = from->Msr; + to->ctl.powerpc64_regs.ctr = from->Ctr; + to->ctl.powerpc64_regs.lr = from->Lr; + to->ctl.powerpc64_regs.dar = from->Dar; + to->ctl.powerpc64_regs.dsisr = from->Dsisr; + to->ctl.powerpc64_regs.trap = from->Trap; + } + if (flags & CONTEXT_INTEGER) + { + to->flags |= SERVER_CTX_INTEGER; + to->integer.powerpc64_regs.gpr[0] = from->Gpr0; + to->integer.powerpc64_regs.gpr[1] = from->Gpr1; + to->integer.powerpc64_regs.gpr[2] = from->Gpr2; + to->integer.powerpc64_regs.gpr[3] = from->Gpr3; + to->integer.powerpc64_regs.gpr[4] = from->Gpr4; + to->integer.powerpc64_regs.gpr[5] = from->Gpr5; + to->integer.powerpc64_regs.gpr[6] = from->Gpr6; + to->integer.powerpc64_regs.gpr[7] = from->Gpr7; + to->integer.powerpc64_regs.gpr[8] = from->Gpr8; + to->integer.powerpc64_regs.gpr[9] = from->Gpr9; + to->integer.powerpc64_regs.gpr[10] = from->Gpr10; + to->integer.powerpc64_regs.gpr[11] = from->Gpr11; + to->integer.powerpc64_regs.gpr[12] = from->Gpr12; + to->integer.powerpc64_regs.gpr[13] = from->Gpr13; + to->integer.powerpc64_regs.gpr[14] = from->Gpr14; + to->integer.powerpc64_regs.gpr[15] = from->Gpr15; + to->integer.powerpc64_regs.gpr[16] = from->Gpr16; + to->integer.powerpc64_regs.gpr[17] = from->Gpr17; + to->integer.powerpc64_regs.gpr[18] = from->Gpr18; + to->integer.powerpc64_regs.gpr[19] = from->Gpr19; + to->integer.powerpc64_regs.gpr[20] = from->Gpr20; + to->integer.powerpc64_regs.gpr[21] = from->Gpr21; + to->integer.powerpc64_regs.gpr[22] = from->Gpr22; + to->integer.powerpc64_regs.gpr[23] = from->Gpr23; + to->integer.powerpc64_regs.gpr[24] = from->Gpr24; + to->integer.powerpc64_regs.gpr[25] = from->Gpr25; + to->integer.powerpc64_regs.gpr[26] = from->Gpr26; + to->integer.powerpc64_regs.gpr[27] = from->Gpr27; + to->integer.powerpc64_regs.gpr[28] = from->Gpr28; + to->integer.powerpc64_regs.gpr[29] = from->Gpr29; + to->integer.powerpc64_regs.gpr[30] = from->Gpr30; + to->integer.powerpc64_regs.gpr[31] = from->Gpr31; + to->integer.powerpc64_regs.xer = from->Xer; + to->integer.powerpc64_regs.cr = from->Cr; + } + if (flags & CONTEXT_FLOATING_POINT) + { + to->flags |= SERVER_CTX_FLOATING_POINT; + to->fp.powerpc64_regs.fpr[0] = from->Fpr0; + to->fp.powerpc64_regs.fpr[1] = from->Fpr1; + to->fp.powerpc64_regs.fpr[2] = from->Fpr2; + to->fp.powerpc64_regs.fpr[3] = from->Fpr3; + to->fp.powerpc64_regs.fpr[4] = from->Fpr4; + to->fp.powerpc64_regs.fpr[5] = from->Fpr5; + to->fp.powerpc64_regs.fpr[6] = from->Fpr6; + to->fp.powerpc64_regs.fpr[7] = from->Fpr7; + to->fp.powerpc64_regs.fpr[8] = from->Fpr8; + to->fp.powerpc64_regs.fpr[9] = from->Fpr9; + to->fp.powerpc64_regs.fpr[10] = from->Fpr10; + to->fp.powerpc64_regs.fpr[11] = from->Fpr11; + to->fp.powerpc64_regs.fpr[12] = from->Fpr12; + to->fp.powerpc64_regs.fpr[13] = from->Fpr13; + to->fp.powerpc64_regs.fpr[14] = from->Fpr14; + to->fp.powerpc64_regs.fpr[15] = from->Fpr15; + to->fp.powerpc64_regs.fpr[16] = from->Fpr16; + to->fp.powerpc64_regs.fpr[17] = from->Fpr17; + to->fp.powerpc64_regs.fpr[18] = from->Fpr18; + to->fp.powerpc64_regs.fpr[19] = from->Fpr19; + to->fp.powerpc64_regs.fpr[20] = from->Fpr20; + to->fp.powerpc64_regs.fpr[21] = from->Fpr21; + to->fp.powerpc64_regs.fpr[22] = from->Fpr22; + to->fp.powerpc64_regs.fpr[23] = from->Fpr23; + to->fp.powerpc64_regs.fpr[24] = from->Fpr24; + to->fp.powerpc64_regs.fpr[25] = from->Fpr25; + to->fp.powerpc64_regs.fpr[26] = from->Fpr26; + to->fp.powerpc64_regs.fpr[27] = from->Fpr27; + to->fp.powerpc64_regs.fpr[28] = from->Fpr28; + to->fp.powerpc64_regs.fpr[29] = from->Fpr29; + to->fp.powerpc64_regs.fpr[30] = from->Fpr30; + to->fp.powerpc64_regs.fpr[31] = from->Fpr31; + to->fp.powerpc64_regs.fpscr = from->Fpscr; + } + return STATUS_SUCCESS; +} + + +/*********************************************************************** + * context_from_server + * + * Convert a register context from the server format. + */ +NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) +{ + if (from->cpu != CPU_POWERPC64) return STATUS_INVALID_PARAMETER; + + to->ContextFlags = 0; /* no CPU id? */ + if (from->flags & SERVER_CTX_CONTROL) + { + to->ContextFlags |= CONTEXT_CONTROL; + to->Msr = from->ctl.powerpc64_regs.msr; + to->Ctr = from->ctl.powerpc64_regs.ctr; + to->Iar = from->ctl.powerpc64_regs.iar; + to->Lr = from->ctl.powerpc64_regs.lr; + to->Dar = from->ctl.powerpc64_regs.dar; + to->Dsisr = from->ctl.powerpc64_regs.dsisr; + to->Trap = from->ctl.powerpc64_regs.trap; + } + if (from->flags & SERVER_CTX_INTEGER) + { + to->ContextFlags |= CONTEXT_INTEGER; + to->Gpr0 = from->integer.powerpc64_regs.gpr[0]; + to->Gpr1 = from->integer.powerpc64_regs.gpr[1]; + to->Gpr2 = from->integer.powerpc64_regs.gpr[2]; + to->Gpr3 = from->integer.powerpc64_regs.gpr[3]; + to->Gpr4 = from->integer.powerpc64_regs.gpr[4]; + to->Gpr5 = from->integer.powerpc64_regs.gpr[5]; + to->Gpr6 = from->integer.powerpc64_regs.gpr[6]; + to->Gpr7 = from->integer.powerpc64_regs.gpr[7]; + to->Gpr8 = from->integer.powerpc64_regs.gpr[8]; + to->Gpr9 = from->integer.powerpc64_regs.gpr[9]; + to->Gpr10 = from->integer.powerpc64_regs.gpr[10]; + to->Gpr11 = from->integer.powerpc64_regs.gpr[11]; + to->Gpr12 = from->integer.powerpc64_regs.gpr[12]; + to->Gpr13 = from->integer.powerpc64_regs.gpr[13]; + to->Gpr14 = from->integer.powerpc64_regs.gpr[14]; + to->Gpr15 = from->integer.powerpc64_regs.gpr[15]; + to->Gpr16 = from->integer.powerpc64_regs.gpr[16]; + to->Gpr17 = from->integer.powerpc64_regs.gpr[17]; + to->Gpr18 = from->integer.powerpc64_regs.gpr[18]; + to->Gpr19 = from->integer.powerpc64_regs.gpr[19]; + to->Gpr20 = from->integer.powerpc64_regs.gpr[20]; + to->Gpr21 = from->integer.powerpc64_regs.gpr[21]; + to->Gpr22 = from->integer.powerpc64_regs.gpr[22]; + to->Gpr23 = from->integer.powerpc64_regs.gpr[23]; + to->Gpr24 = from->integer.powerpc64_regs.gpr[24]; + to->Gpr25 = from->integer.powerpc64_regs.gpr[25]; + to->Gpr26 = from->integer.powerpc64_regs.gpr[26]; + to->Gpr27 = from->integer.powerpc64_regs.gpr[27]; + to->Gpr28 = from->integer.powerpc64_regs.gpr[28]; + to->Gpr29 = from->integer.powerpc64_regs.gpr[29]; + to->Gpr30 = from->integer.powerpc64_regs.gpr[30]; + to->Gpr31 = from->integer.powerpc64_regs.gpr[31]; + to->Xer = from->integer.powerpc64_regs.xer; + to->Cr = from->integer.powerpc64_regs.cr; + } + if (from->flags & SERVER_CTX_FLOATING_POINT) + { + to->ContextFlags |= CONTEXT_FLOATING_POINT; + to->Fpr0 = from->fp.powerpc64_regs.fpr[0]; + to->Fpr1 = from->fp.powerpc64_regs.fpr[1]; + to->Fpr2 = from->fp.powerpc64_regs.fpr[2]; + to->Fpr3 = from->fp.powerpc64_regs.fpr[3]; + to->Fpr4 = from->fp.powerpc64_regs.fpr[4]; + to->Fpr5 = from->fp.powerpc64_regs.fpr[5]; + to->Fpr6 = from->fp.powerpc64_regs.fpr[6]; + to->Fpr7 = from->fp.powerpc64_regs.fpr[7]; + to->Fpr8 = from->fp.powerpc64_regs.fpr[8]; + to->Fpr9 = from->fp.powerpc64_regs.fpr[9]; + to->Fpr10 = from->fp.powerpc64_regs.fpr[10]; + to->Fpr11 = from->fp.powerpc64_regs.fpr[11]; + to->Fpr12 = from->fp.powerpc64_regs.fpr[12]; + to->Fpr13 = from->fp.powerpc64_regs.fpr[13]; + to->Fpr14 = from->fp.powerpc64_regs.fpr[14]; + to->Fpr15 = from->fp.powerpc64_regs.fpr[15]; + to->Fpr16 = from->fp.powerpc64_regs.fpr[16]; + to->Fpr17 = from->fp.powerpc64_regs.fpr[17]; + to->Fpr18 = from->fp.powerpc64_regs.fpr[18]; + to->Fpr19 = from->fp.powerpc64_regs.fpr[19]; + to->Fpr20 = from->fp.powerpc64_regs.fpr[20]; + to->Fpr21 = from->fp.powerpc64_regs.fpr[21]; + to->Fpr22 = from->fp.powerpc64_regs.fpr[22]; + to->Fpr23 = from->fp.powerpc64_regs.fpr[23]; + to->Fpr24 = from->fp.powerpc64_regs.fpr[24]; + to->Fpr25 = from->fp.powerpc64_regs.fpr[25]; + to->Fpr26 = from->fp.powerpc64_regs.fpr[26]; + to->Fpr27 = from->fp.powerpc64_regs.fpr[27]; + to->Fpr28 = from->fp.powerpc64_regs.fpr[28]; + to->Fpr29 = from->fp.powerpc64_regs.fpr[29]; + to->Fpr30 = from->fp.powerpc64_regs.fpr[30]; + to->Fpr31 = from->fp.powerpc64_regs.fpr[31]; + to->Fpscr = from->fp.powerpc64_regs.fpscr; + } + return STATUS_SUCCESS; +} + + +/*********************************************************************** + * NtSetContextThread (NTDLL.@) + * ZwSetContextThread (NTDLL.@) + */ +NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) +{ + NTSTATUS ret; + BOOL self; + context_t server_context; + + context_to_server( &server_context, context ); + ret = set_thread_context( handle, &server_context, &self ); + if (self && ret == STATUS_SUCCESS) set_cpu_context( context ); + return ret; +} + + +/*********************************************************************** + * NtGetContextThread (NTDLL.@) + * ZwGetContextThread (NTDLL.@) + */ +NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) +{ + NTSTATUS ret; + DWORD needed_flags = context->ContextFlags; + BOOL self = (handle == GetCurrentThread()); + + if (!self) + { + context_t server_context; + unsigned int server_flags = get_server_context_flags( context->ContextFlags ); + + if ((ret = get_thread_context( handle, &server_context, server_flags, &self ))) return ret; + if ((ret = context_from_server( context, &server_context ))) return ret; + needed_flags &= ~context->ContextFlags; + } + + if (self && needed_flags) + { + CONTEXT ctx; + RtlCaptureContext( &ctx ); + copy_context( context, &ctx, ctx.ContextFlags & needed_flags ); + context->ContextFlags |= ctx.ContextFlags & needed_flags; + } + return STATUS_SUCCESS; +} + + +/********************************************************************** + * call_stack_handlers + * + * Call the stack handlers chain. + */ +static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) +{ + EXCEPTION_POINTERS ptrs; + + FIXME( "not implemented on PowerPC 64\n" ); + + /* hack: call unhandled exception filter directly */ + ptrs.ExceptionRecord = rec; + ptrs.ContextRecord = context; + call_unhandled_exception_filter( &ptrs ); + return STATUS_UNHANDLED_EXCEPTION; +} + + +/******************************************************************* + * raise_exception + * + * Implementation of NtRaiseException. + */ +static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) +{ + NTSTATUS status; + + if (first_chance) + { + DWORD c; + + TRACE( "code=%x flags=%x addr=%p ip=%llx tid=%04x\n", + rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, + context->Iar, GetCurrentThreadId() ); + for (c = 0; c < rec->NumberParameters; c++) + TRACE( " info[%d]=%08llx\n", c, rec->ExceptionInformation[c] ); + if (rec->ExceptionCode == EXCEPTION_WINE_STUB) + { + if (rec->ExceptionInformation[1] >> 16) + MESSAGE( "wine: Call from %p to unimplemented function %s.%s, aborting\n", + rec->ExceptionAddress, + (char*)rec->ExceptionInformation[0], (char*)rec->ExceptionInformation[1] ); + else + MESSAGE( "wine: Call from %p to unimplemented function %s.%lld, aborting\n", + rec->ExceptionAddress, + (char*)rec->ExceptionInformation[0], rec->ExceptionInformation[1] ); + } + else + { + /* FIXME: dump context */ + } + + status = send_debug_event( rec, TRUE, context ); + if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) + return STATUS_SUCCESS; + + if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) + return STATUS_SUCCESS; + + if ((status = call_stack_handlers( rec, context )) != STATUS_UNHANDLED_EXCEPTION) + return status; + } + + /* last chance exception */ + + status = send_debug_event( rec, FALSE, context ); + if (status != DBG_CONTINUE) + { + if (rec->ExceptionFlags & EH_STACK_INVALID) + ERR("Exception frame is not in stack limits => unable to dispatch exception.\n"); + else if (rec->ExceptionCode == STATUS_NONCONTINUABLE_EXCEPTION) + ERR("Process attempted to continue execution after noncontinuable exception.\n"); + else + ERR("Unhandled exception code %x flags %x addr %p\n", + rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); + NtTerminateProcess( NtCurrentProcess(), rec->ExceptionCode ); + } + return STATUS_SUCCESS; +} + + +/********************************************************************** + * segv_handler + * + * Handler for SIGSEGV and related errors. + */ +static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) +{ + EXCEPTION_RECORD rec; + CONTEXT context; + NTSTATUS status; + + save_context( &context, sigcontext ); + + rec.ExceptionRecord = NULL; + rec.ExceptionFlags = EXCEPTION_CONTINUABLE; + rec.ExceptionAddress = (LPVOID)context.Iar; + rec.NumberParameters = 0; + + switch (signal) + { + case SIGSEGV: + switch (siginfo->si_code & 0xffff) + { + case SEGV_MAPERR: + case SEGV_ACCERR: + rec.NumberParameters = 2; + rec.ExceptionInformation[0] = 0; /* FIXME ? */ + rec.ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; + if (!(rec.ExceptionCode = virtual_handle_fault(siginfo->si_addr, rec.ExceptionInformation[0], FALSE))) + goto done; + break; + default: + FIXME("Unhandled SIGSEGV/%x\n",siginfo->si_code); + break; + } + break; + case SIGBUS: + switch (siginfo->si_code & 0xffff) + { + case BUS_ADRALN: + rec.ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT; + break; +#ifdef BUS_ADRERR + case BUS_ADRERR: +#endif +#ifdef BUS_OBJERR + case BUS_OBJERR: + /* FIXME: correct for all cases ? */ + rec.NumberParameters = 2; + rec.ExceptionInformation[0] = 0; /* FIXME ? */ + rec.ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; + if (!(rec.ExceptionCode = virtual_handle_fault(siginfo->si_addr, rec.ExceptionInformation[0], FALSE))) + goto done; + break; +#endif + default: + FIXME("Unhandled SIGBUS/%x\n",siginfo->si_code); + break; + } + break; + case SIGILL: + switch (siginfo->si_code & 0xffff) + { + case ILL_ILLOPC: /* illegal opcode */ +#ifdef ILL_ILLOPN + case ILL_ILLOPN: /* illegal operand */ +#endif +#ifdef ILL_ILLADR + case ILL_ILLADR: /* illegal addressing mode */ +#endif +#ifdef ILL_ILLTRP + case ILL_ILLTRP: /* illegal trap */ +#endif +#ifdef ILL_COPROC + case ILL_COPROC: /* coprocessor error */ +#endif + rec.ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; + break; + case ILL_PRVOPC: /* privileged opcode */ +#ifdef ILL_PRVREG + case ILL_PRVREG: /* privileged register */ +#endif + rec.ExceptionCode = EXCEPTION_PRIV_INSTRUCTION; + break; +#ifdef ILL_BADSTK + case ILL_BADSTK: /* internal stack error */ + rec.ExceptionCode = EXCEPTION_STACK_OVERFLOW; + break; +#endif + default: + FIXME("Unhandled SIGILL/%x\n", siginfo->si_code); + break; + } + break; + } + status = raise_exception( &rec, &context, TRUE ); + if (status) raise_status( status, &rec ); +done: + restore_context( &context, sigcontext ); +} + +/********************************************************************** + * trap_handler + * + * Handler for SIGTRAP. + */ +static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) +{ + EXCEPTION_RECORD rec; + CONTEXT context; + NTSTATUS status; + + save_context( &context, sigcontext ); + + rec.ExceptionFlags = EXCEPTION_CONTINUABLE; + rec.ExceptionRecord = NULL; + rec.ExceptionAddress = (LPVOID)context.Iar; + rec.NumberParameters = 0; + + /* FIXME: check if we might need to modify PC */ + switch (siginfo->si_code & 0xffff) + { +#ifdef TRAP_BRKPT + case TRAP_BRKPT: + rec.ExceptionCode = EXCEPTION_BREAKPOINT; + break; +#endif +#ifdef TRAP_TRACE + case TRAP_TRACE: + rec.ExceptionCode = EXCEPTION_SINGLE_STEP; + break; +#endif + default: + FIXME("Unhandled SIGTRAP/%x\n", siginfo->si_code); + break; + } + status = raise_exception( &rec, &context, TRUE ); + if (status) raise_status( status, &rec ); + restore_context( &context, sigcontext ); +} + +/********************************************************************** + * fpe_handler + * + * Handler for SIGFPE. + */ +static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) +{ + EXCEPTION_RECORD rec; + CONTEXT context; + NTSTATUS status; + + save_fpu( &context, sigcontext ); + save_context( &context, sigcontext ); + + switch (siginfo->si_code & 0xffff ) + { +#ifdef FPE_FLTSUB + case FPE_FLTSUB: + rec.ExceptionCode = EXCEPTION_ARRAY_BOUNDS_EXCEEDED; + break; +#endif +#ifdef FPE_INTDIV + case FPE_INTDIV: + rec.ExceptionCode = EXCEPTION_INT_DIVIDE_BY_ZERO; + break; +#endif +#ifdef FPE_INTOVF + case FPE_INTOVF: + rec.ExceptionCode = EXCEPTION_INT_OVERFLOW; + break; +#endif +#ifdef FPE_FLTDIV + case FPE_FLTDIV: + rec.ExceptionCode = EXCEPTION_FLT_DIVIDE_BY_ZERO; + break; +#endif +#ifdef FPE_FLTOVF + case FPE_FLTOVF: + rec.ExceptionCode = EXCEPTION_FLT_OVERFLOW; + break; +#endif +#ifdef FPE_FLTUND + case FPE_FLTUND: + rec.ExceptionCode = EXCEPTION_FLT_UNDERFLOW; + break; +#endif +#ifdef FPE_FLTRES + case FPE_FLTRES: + rec.ExceptionCode = EXCEPTION_FLT_INEXACT_RESULT; + break; +#endif +#ifdef FPE_FLTINV + case FPE_FLTINV: +#endif + default: + rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; + break; + } + rec.ExceptionFlags = EXCEPTION_CONTINUABLE; + rec.ExceptionRecord = NULL; + rec.ExceptionAddress = (LPVOID)context.Iar; + rec.NumberParameters = 0; + status = raise_exception( &rec, &context, TRUE ); + if (status) raise_status( status, &rec ); + + restore_context( &context, sigcontext ); + restore_fpu( &context, sigcontext ); +} + +/********************************************************************** + * int_handler + * + * Handler for SIGINT. + */ +static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) +{ + if (!dispatch_signal(SIGINT)) + { + EXCEPTION_RECORD rec; + CONTEXT context; + NTSTATUS status; + + save_context( &context, sigcontext ); + rec.ExceptionCode = CONTROL_C_EXIT; + rec.ExceptionFlags = EXCEPTION_CONTINUABLE; + rec.ExceptionRecord = NULL; + rec.ExceptionAddress = (LPVOID)context.Iar; + rec.NumberParameters = 0; + status = raise_exception( &rec, &context, TRUE ); + if (status) raise_status( status, &rec ); + restore_context( &context, sigcontext ); + } +} + + +/********************************************************************** + * abrt_handler + * + * Handler for SIGABRT. + */ +static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) +{ + EXCEPTION_RECORD rec; + CONTEXT context; + NTSTATUS status; + + save_context( &context, sigcontext ); + rec.ExceptionCode = EXCEPTION_WINE_ASSERTION; + rec.ExceptionFlags = EH_NONCONTINUABLE; + rec.ExceptionRecord = NULL; + rec.ExceptionAddress = (LPVOID)context.Iar; + rec.NumberParameters = 0; + status = raise_exception( &rec, &context, TRUE ); + if (status) raise_status( status, &rec ); + restore_context( &context, sigcontext ); +} + + +/********************************************************************** + * quit_handler + * + * Handler for SIGQUIT. + */ +static void quit_handler( int signal, siginfo_t *siginfo, void *sigcontext ) +{ + abort_thread(0); +} + + +/********************************************************************** + * usr1_handler + * + * Handler for SIGUSR1, used to signal a thread that it got suspended. + */ +static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext ) +{ + CONTEXT context; + + save_context( &context, sigcontext ); + wait_suspend( &context ); + restore_context( &context, sigcontext ); +} + + +/*********************************************************************** + * __wine_set_signal_handler (NTDLL.@) + */ +int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) +{ + if (sig >= ARRAY_SIZE(handlers)) return -1; + if (handlers[sig] != NULL) return -2; + handlers[sig] = wsh; + return 0; +} + + +/********************************************************************** + * signal_alloc_thread + */ +NTSTATUS signal_alloc_thread( TEB **teb ) +{ + static size_t sigstack_zero_bits; + SIZE_T size; + NTSTATUS status; + + if (!sigstack_zero_bits) + { + size_t min_size = page_size; /* this is just for the TEB, we don't use a signal stack yet */ + /* find the first power of two not smaller than min_size */ + while ((1u << sigstack_zero_bits) < min_size) sigstack_zero_bits++; + assert( sizeof(TEB) <= min_size ); + } + + size = 1 << sigstack_zero_bits; + *teb = NULL; + if (!(status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)teb, sigstack_zero_bits, + &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ))) + { + (*teb)->Tib.Self = &(*teb)->Tib; + (*teb)->Tib.ExceptionList = (void *)~0UL; + } + return status; +} + + +/********************************************************************** + * signal_free_thread + */ +void signal_free_thread( TEB *teb ) +{ + SIZE_T size = 0; + + NtFreeVirtualMemory( NtCurrentProcess(), (void **)&teb, &size, MEM_RELEASE ); +} + + +/********************************************************************** + * signal_init_thread + */ +void signal_init_thread( TEB *teb ) +{ + static BOOL init_done; + + if (!init_done) + { + pthread_key_create( &teb_key, NULL ); + init_done = TRUE; + } + pthread_setspecific( teb_key, teb ); +} + + +/********************************************************************** + * signal_init_process + */ +void signal_init_process(void) +{ + struct sigaction sig_act; + + sig_act.sa_mask = server_block_set; + sig_act.sa_flags = SA_RESTART | SA_SIGINFO; + + sig_act.sa_sigaction = int_handler; + if (sigaction( SIGINT, &sig_act, NULL ) == -1) goto error; + sig_act.sa_sigaction = fpe_handler; + if (sigaction( SIGFPE, &sig_act, NULL ) == -1) goto error; + sig_act.sa_sigaction = abrt_handler; + if (sigaction( SIGABRT, &sig_act, NULL ) == -1) goto error; + sig_act.sa_sigaction = quit_handler; + if (sigaction( SIGQUIT, &sig_act, NULL ) == -1) goto error; + sig_act.sa_sigaction = usr1_handler; + if (sigaction( SIGUSR1, &sig_act, NULL ) == -1) goto error; + + sig_act.sa_sigaction = segv_handler; + if (sigaction( SIGSEGV, &sig_act, NULL ) == -1) goto error; + if (sigaction( SIGILL, &sig_act, NULL ) == -1) goto error; +#ifdef SIGBUS + if (sigaction( SIGBUS, &sig_act, NULL ) == -1) goto error; +#endif + +#ifdef SIGTRAP + sig_act.sa_sigaction = trap_handler; + if (sigaction( SIGTRAP, &sig_act, NULL ) == -1) goto error; +#endif + return; + + error: + perror("sigaction"); + exit(1); +} + + +/*********************************************************************** + * RtlUnwind (NTDLL.@) + */ +void WINAPI RtlUnwind( PVOID pEndFrame, PVOID targetIp, PEXCEPTION_RECORD pRecord, PVOID retval ) +{ + FIXME( "Not implemented on PowerPC 64\n" ); +} + +/******************************************************************* + * NtRaiseException (NTDLL.@) + */ +NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) +{ + NTSTATUS status = raise_exception( rec, context, first_chance ); + if (status == STATUS_SUCCESS) NtSetContextThread( GetCurrentThread(), context ); + return status; +} + +/*********************************************************************** + * RtlRaiseException (NTDLL.@) + */ +void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) +{ + CONTEXT context; + NTSTATUS status; + + RtlCaptureContext( &context ); + rec->ExceptionAddress = (void *)context.Iar; + status = raise_exception( rec, &context, TRUE ); + if (status) raise_status( status, rec ); +} + +/************************************************************************* + * RtlCaptureStackBackTrace (NTDLL.@) + */ +USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +{ + FIXME( "(%d, %d, %p, %p) stub!\n", skip, count, buffer, hash ); + return 0; +} + +/*********************************************************************** + * call_thread_entry_point + */ +static void WINAPI call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ) +{ + __TRY + { + TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); + RtlExitUserThread( entry( arg )); + } + __EXCEPT(call_unhandled_exception_filter) + { + NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); + } + __ENDTRY + abort(); /* should not be reached */ +} + +typedef void (WINAPI *thread_start_func)(LPTHREAD_START_ROUTINE,void *); + +struct startup_info +{ + thread_start_func start; + LPTHREAD_START_ROUTINE entry; + void *arg; + BOOL suspend; +}; + +/*********************************************************************** + * thread_startup + */ +static void thread_startup( void *param ) +{ + CONTEXT context = { 0 }; + struct startup_info *info = param; + + /* build the initial context */ + context.ContextFlags = CONTEXT_FULL; + context.Gpr1 = (DWORD64)NtCurrentTeb()->Tib.StackBase; + context.Gpr3 = (DWORD64)info->entry; + context.Gpr4 = (DWORD64)info->arg; + context.Iar = (DWORD64)info->start; + + if (info->suspend) wait_suspend( &context ); + LdrInitializeThunk( &context, (void **)&context.Gpr3, 0, 0 ); + + ((thread_start_func)context.Iar)( (LPTHREAD_START_ROUTINE)context.Gpr3, (void *)context.Gpr4 ); +} + +/*********************************************************************** + * signal_start_thread + * + * Thread startup sequence: + * signal_start_thread() + * -> thread_startup() + * -> call_thread_entry_point() + */ +void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend ) +{ + struct startup_info info = { call_thread_entry_point, entry, arg, suspend }; + wine_switch_to_stack( thread_startup, &info, NtCurrentTeb()->Tib.StackBase ); +} + +/********************************************************************** + * signal_start_process + * + * Process startup sequence: + * signal_start_process() + * -> thread_startup() + * -> kernel32_start_process() + */ +void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) +{ + struct startup_info info = { kernel32_start_process, entry, NtCurrentTeb()->Peb, suspend }; + wine_switch_to_stack( thread_startup, &info, NtCurrentTeb()->Tib.StackBase ); +} + +/*********************************************************************** + * signal_exit_thread + */ +void signal_exit_thread( int status ) +{ + exit_thread( status ); +} + +/*********************************************************************** + * signal_exit_process + */ +void signal_exit_process( int status ) +{ + exit( status ); +} + +/********************************************************************** + * DbgBreakPoint (NTDLL.@) + */ +void WINAPI DbgBreakPoint(void) +{ + kill(getpid(), SIGTRAP); +} + +/********************************************************************** + * DbgUserBreakPoint (NTDLL.@) + */ +void WINAPI DbgUserBreakPoint(void) +{ + kill(getpid(), SIGTRAP); +} + +/********************************************************************** + * NtCurrentTeb (NTDLL.@) + */ +TEB * WINAPI NtCurrentTeb(void) +{ + return pthread_getspecific( teb_key ); +} + +#endif /* __powerpc64__ */ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 76dc6c284d..6788bb137f 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -3208,7 +3208,7 @@ void virtual_fill_image_information( const pe_image_info_t *pe_info, SECTION_IMA info->ImageFileSize = pe_info->file_size; info->CheckSum = pe_info->checksum; #ifndef _WIN64 /* don't return 64-bit values to 32-bit processes */ - if (pe_info->machine == IMAGE_FILE_MACHINE_AMD64 || pe_info->machine == IMAGE_FILE_MACHINE_ARM64) + if (pe_info->machine == IMAGE_FILE_MACHINE_AMD64 || pe_info->machine == IMAGE_FILE_MACHINE_ARM64 || pe_info->machine == IMAGE_FILE_MACHINE_POWERPC64) { info->TransferAddress = (void *)0x81231234; /* sic */ info->MaximumStackSize = 0x100000; diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index e0d012a034..8c68a50346 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -280,6 +280,8 @@ static BOOL build_fake_dll( HANDLE file, const WCHAR *name ) nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARM64; #elif defined __arm__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARMNT; +#elif defined __powerpc64__ + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_POWERPC64; #elif defined __powerpc__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_POWERPC; #else diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 00c806483e..6219ef265e 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1324,7 +1324,7 @@ @ stub _o__scalbf @ stub _o__searchenv @ stub _o__searchenv_s -@ cdecl _o__seh_filter_dll(long ptr) __CppXcptFilter +@ cdecl -arch=i386,x86_64,arm,arm64 _o__seh_filter_dll(long ptr) __CppXcptFilter @ cdecl _o__seh_filter_exe(long ptr) _XcptFilter @ stub _o__set_abort_behavior @ cdecl _o__set_app_type(long) MSVCRT___set_app_type diff --git a/include/basetsd.h b/include/basetsd.h index 96ea3f01bc..4972f549b5 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -277,6 +277,16 @@ typedef ULONG_PTR KAFFINITY, *PKAFFINITY; # undef WORDS_BIGENDIAN # undef BITFIELDS_BIGENDIAN # define ALLOW_UNALIGNED_ACCESS +#elif defined(__powerpc64__) +# if defined(__BIG_ENDIAN__) +# define WORDS_BIGENDIAN +# define BITFIELDS_BIGENDIAN +# undef ALLOW_UNALIGNED_ACCESS +# else +# undef WORDS_BIGENDIAN +# undef BITFIELDS_BIGENDIAN +# undef ALLOW_UNALIGNED_ACCESS +#endif #elif defined(__powerpc__) # define WORDS_BIGENDIAN # define BITFIELDS_BIGENDIAN diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index 0c0b08748e..cfc0122719 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -64,6 +64,9 @@ # define __stdcall __attribute__((pcs("aapcs-vfp"))) # elif defined(__aarch64__) && defined (__GNUC__) # define __stdcall __attribute__((ms_abi)) +# elif defined(__powerpc64__) && defined (__GNUC__) + /* ppc64 relies on long calls being generated for thunks (r2 save / restore) */ +# define __stdcall __attribute__((__longcall__)) # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ @@ -86,6 +89,9 @@ # define __cdecl __attribute__((pcs("aapcs-vfp"))) # elif defined(__aarch64__) && defined (__GNUC__) # define __cdecl __attribute__((ms_abi)) +# elif defined(__powerpc64__) && defined (__GNUC__) + /* ppc64 relies on long calls being generated for thunks (r2 save / restore) */ +# define __cdecl __attribute__((__longcall__)) # elif !defined(_MSC_VER) # define __cdecl # endif diff --git a/include/rpc.h b/include/rpc.h index eb7d0417bd..56b1112418 100644 --- a/include/rpc.h +++ b/include/rpc.h @@ -25,7 +25,9 @@ #ifndef __WINE_RPC_H #define __WINE_RPC_H -#if defined(__powerpc__) || defined(_MAC) /* ? */ +#if defined(__powerpc64__) +# define __RPC_WIN64__ +#elif defined(__powerpc__) || defined(_MAC) /* ? */ # define __RPC_MAC__ /* Also define __RPC_WIN32__ to ensure compatibility */ # define __RPC_WIN32__ diff --git a/include/windef.h b/include/windef.h index ea9f32b5a0..82e9ab968c 100644 --- a/include/windef.h +++ b/include/windef.h @@ -80,6 +80,9 @@ extern "C" { # define __stdcall __attribute__((pcs("aapcs-vfp"))) # elif defined(__aarch64__) && defined (__GNUC__) # define __stdcall __attribute__((ms_abi)) +# elif defined(__powerpc64__) && defined (__GNUC__) + /* ppc64 relies on long calls being generated for thunks (r2 save / restore) */ +# define __stdcall __attribute__((__longcall__)) # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ @@ -102,6 +105,9 @@ extern "C" { # define __cdecl __attribute__((pcs("aapcs-vfp"))) # elif defined(__aarch64__) && defined (__GNUC__) # define __cdecl __attribute__((ms_abi)) +# elif defined(__powerpc64__) && defined (__GNUC__) + /* ppc64 relies on long calls being generated for thunks (r2 save / restore) */ +# define __cdecl __attribute__((__longcall__)) # elif !defined(_MSC_VER) # define __cdecl # endif diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 63f65cd00f..450ec9b39c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -117,7 +117,7 @@ typedef union enum cpu_type { - CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64 + CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_POWERPC64 }; typedef int cpu_type_t; @@ -132,6 +132,7 @@ typedef struct struct { unsigned __int64 rip, rbp, rsp; unsigned int cs, ss, flags, __pad; } x86_64_regs; struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap, __pad; } powerpc_regs; + struct { unsigned __int64 iar, msr, ctr, lr, dar, dsisr, trap, __pad; } powerpc64_regs; struct { unsigned int sp, lr, pc, cpsr; } arm_regs; struct { unsigned __int64 sp, pc, pstate; } arm64_regs; } ctl; @@ -141,6 +142,7 @@ typedef struct struct { unsigned __int64 rax,rbx, rcx, rdx, rsi, rdi, r8, r9, r10, r11, r12, r13, r14, r15; } x86_64_regs; struct { unsigned int gpr[32], cr, xer; } powerpc_regs; + struct { unsigned __int64 gpr[32], cr, xer; } powerpc64_regs; struct { unsigned int r[13]; } arm_regs; struct { unsigned __int64 x[31]; } arm64_regs; } integer; @@ -155,6 +157,7 @@ typedef struct unsigned char regs[80]; } i386_regs; struct { struct { unsigned __int64 low, high; } fpregs[32]; } x86_64_regs; struct { double fpr[32], fpscr; } powerpc_regs; + struct { double fpr[32], fpscr; } powerpc64_regs; struct { unsigned __int64 d[32]; unsigned int fpscr; } arm_regs; struct { unsigned __int64 d[64]; unsigned int fpcr, fpsr; } arm64_regs; } fp; @@ -163,6 +166,7 @@ typedef struct struct { unsigned int dr0, dr1, dr2, dr3, dr6, dr7; } i386_regs; struct { unsigned __int64 dr0, dr1, dr2, dr3, dr6, dr7; } x86_64_regs; struct { unsigned int dr[8]; } powerpc_regs; + struct { unsigned __int64 dr[8]; } powerpc64_regs; struct { unsigned int bvr[8], bcr[8], wvr[1], wcr[1]; } arm_regs; struct { unsigned __int64 bvr[8], wvr[2]; unsigned int bcr[8], wcr[2]; } arm64_regs; } debug; diff --git a/include/winnt.h b/include/winnt.h index 5694ad7c01..74a55cb5b5 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2,6 +2,7 @@ * Win32 definitions for Windows NT * * Copyright 1996 Alexandre Julliard + * Copyright 2019 Timothy Pearson <tpearson(a)raptorengineering.com> (PowerPC 64) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -655,6 +656,7 @@ typedef DWORD FLONG; #define PROCESSOR_ARCHITECTURE_ARM64 12 #define PROCESSOR_ARCHITECTURE_ARM32_ON_WIN64 13 #define PROCESSOR_ARCHITECTURE_IA32_ON_ARM64 14 +#define PROCESSOR_ARCHITECTURE_PPC64 15 #define PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF /* dwProcessorType */ @@ -672,6 +674,7 @@ typedef DWORD FLONG; #define PROCESSOR_PPC_603 603 #define PROCESSOR_PPC_604 604 #define PROCESSOR_PPC_620 620 +#define PROCESSOR_PPC64_OP 690 #define PROCESSOR_HITACHI_SH3 10003 #define PROCESSOR_HITACHI_SH3E 10004 #define PROCESSOR_HITACHI_SH4 10005 @@ -1985,8 +1988,138 @@ typedef struct _CONTEXT #endif /* _MIPS_ */ -/* PowerPC context definitions */ -#ifdef __powerpc__ +/* PowerPC 64-bit context definitions */ +#if defined(__powerpc64__) + +#define CONTEXT_CONTROL 0x0001 +#define CONTEXT_FLOATING_POINT 0x0002 +#define CONTEXT_INTEGER 0x0004 +#define CONTEXT_DEBUG_REGISTERS 0x0008 +#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER) +#define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | \ + CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS) + +#define EXCEPTION_READ_FAULT 0 +#define EXCEPTION_WRITE_FAULT 1 +#define EXCEPTION_EXECUTE_FAULT 8 + +typedef struct +{ + /* These are selected by CONTEXT_FLOATING_POINT */ + double Fpr0; + double Fpr1; + double Fpr2; + double Fpr3; + double Fpr4; + double Fpr5; + double Fpr6; + double Fpr7; + double Fpr8; + double Fpr9; + double Fpr10; + double Fpr11; + double Fpr12; + double Fpr13; + double Fpr14; + double Fpr15; + double Fpr16; + double Fpr17; + double Fpr18; + double Fpr19; + double Fpr20; + double Fpr21; + double Fpr22; + double Fpr23; + double Fpr24; + double Fpr25; + double Fpr26; + double Fpr27; + double Fpr28; + double Fpr29; + double Fpr30; + double Fpr31; + double Fpscr; + + /* These are selected by CONTEXT_INTEGER */ + DWORD64 Gpr0; + DWORD64 Gpr1; + DWORD64 Gpr2; + DWORD64 Gpr3; + DWORD64 Gpr4; + DWORD64 Gpr5; + DWORD64 Gpr6; + DWORD64 Gpr7; + DWORD64 Gpr8; + DWORD64 Gpr9; + DWORD64 Gpr10; + DWORD64 Gpr11; + DWORD64 Gpr12; + DWORD64 Gpr13; + DWORD64 Gpr14; + DWORD64 Gpr15; + DWORD64 Gpr16; + DWORD64 Gpr17; + DWORD64 Gpr18; + DWORD64 Gpr19; + DWORD64 Gpr20; + DWORD64 Gpr21; + DWORD64 Gpr22; + DWORD64 Gpr23; + DWORD64 Gpr24; + DWORD64 Gpr25; + DWORD64 Gpr26; + DWORD64 Gpr27; + DWORD64 Gpr28; + DWORD64 Gpr29; + DWORD64 Gpr30; + DWORD64 Gpr31; + + DWORD64 Cr; + DWORD64 Xer; + + /* These are selected by CONTEXT_CONTROL */ + DWORD64 Msr; + DWORD64 Iar; /* Instruction Address Register , aka PC ... */ + DWORD64 Lr; + DWORD64 Ctr; + + DWORD64 ContextFlags; + + DWORD64 Dar; /* Fault registers for coredump */ + DWORD64 Dsisr; + DWORD64 Trap; /* number of powerpc exception taken */ + + /* These are selected by CONTEXT_DEBUG_REGISTERS */ + DWORD64 Dr0; + DWORD64 Dr1; + DWORD64 Dr2; + DWORD64 Dr3; + DWORD64 Dr4; + DWORD64 Dr5; + DWORD64 Dr6; + DWORD64 Dr7; +} CONTEXT; + +typedef struct _STACK_FRAME_HEADER +{ + DWORD BackChain; + DWORD GlueSaved1; + DWORD GlueSaved2; + DWORD Reserved1; + DWORD Spare1; + DWORD Spare2; + + DWORD Parameter0; + DWORD Parameter1; + DWORD Parameter2; + DWORD Parameter3; + DWORD Parameter4; + DWORD Parameter5; + DWORD Parameter6; + DWORD Parameter7; +} STACK_FRAME_HEADER,*PSTACK_FRAME_HEADER; + +#elif defined(__powerpc__) #define CONTEXT_CONTROL 0x0001 #define CONTEXT_FLOATING_POINT 0x0002 @@ -2729,6 +2862,7 @@ typedef struct _IMAGE_VXD_HEADER { #define IMAGE_FILE_MACHINE_AM33 0x01d3 #define IMAGE_FILE_MACHINE_POWERPC 0x01f0 #define IMAGE_FILE_MACHINE_POWERPCFP 0x01f1 +#define IMAGE_FILE_MACHINE_POWERPC64 0x01f2 #define IMAGE_FILE_MACHINE_IA64 0x0200 #define IMAGE_FILE_MACHINE_MIPS16 0x0266 #define IMAGE_FILE_MACHINE_ALPHA64 0x0284 diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index efdfd2af19..6cb1b56bd5 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -180,7 +180,7 @@ __ASM_GLOBAL_FUNC(interlocked_cmpxchg128, __ASM_CFI(".cfi_same_value %rbx\n\t") "ret") -#elif defined(__powerpc__) +#elif defined(__powerpc__) && !defined(__powerpc64__) #if !(defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) && __SIZEOF_POINTER__ == 4) \ && !(defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) && __SIZEOF_POINTER__ == 8) diff --git a/libs/wine/port.c b/libs/wine/port.c index 29e9091789..702225b110 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -2,6 +2,7 @@ * Wine portability routines * * Copyright 2000 Alexandre Julliard + * Copyright 2019 Timothy Pearson <tpearson(a)raptorengineering.com> (PowerPC 64) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -147,6 +148,24 @@ __ASM_GLOBAL_FUNC( wine_call_on_stack, __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") __ASM_CFI(".cfi_same_value %rbp\n\t") "ret") +#elif defined(__powerpc64__) && defined(__GNUC__) +__ASM_GLOBAL_FUNC( wine_call_on_stack, + "mflr 0\n\t" /* get return address */ + "std 0, 16(1)\n\t" /* save return address on stack */ + "subi 5, 5, 112\n\t" /* reserve space on new stack */ + "std 1, 48(5)\n\t" /* store old sp */ + "mr 12, 3\n\t" /* func -> r12: ppc64 v2 requires r12 == ctr before bctr for TOC setup */ + "mtctr 12\n\t" /* func -> ctr */ + "mr 3, 4\n\t" /* args -> function param 1 (r3) */ + "mr 1, 5\n\t" /* stack */ + "li 0, 0\n\t" /* zero */ + "std 0, 0(1)\n\t" /* bottom of stack */ + "stdu 1, -112(1)\n\t" /* create a frame for this function */ + "bctrl\n\t" /* call ctr */ + "ld 1, 160(1)\n\t" /* fetch old sp */ + "ld 0, 16(1)\n\t" /* fetch return address */ + "mtlr 0\n\t" /* return address -> lr */ + "blr") /* return */ #elif defined(__powerpc__) && defined(__GNUC__) __ASM_GLOBAL_FUNC( wine_call_on_stack, "mflr 0\n\t" /* get return address */ diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index 22c4cd23e8..6bd4a2c2a6 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ be_arm64.c \ be_i386.c \ be_ppc.c \ + be_ppc64.c \ be_x86_64.c \ break.c \ crashdlg.c \ diff --git a/programs/winedbg/be_ppc.c b/programs/winedbg/be_ppc.c index ff6ece6df3..ff264ed83e 100644 --- a/programs/winedbg/be_ppc.c +++ b/programs/winedbg/be_ppc.c @@ -21,7 +21,7 @@ #include "debugger.h" -#if defined(__powerpc__) +#if defined(__powerpc__) && !defined(__powerpc64__) static BOOL be_ppc_get_addr(HANDLE hThread, const dbg_ctx_t *ctx, enum be_cpu_addr bca, ADDRESS64* addr) diff --git a/programs/winedbg/be_ppc64.c b/programs/winedbg/be_ppc64.c new file mode 100644 index 0000000000..c342df9f78 --- /dev/null +++ b/programs/winedbg/be_ppc64.c @@ -0,0 +1,303 @@ +/* + * Debugger Power PC specific functions + * + * Copyright 2000-2003 Marcus Meissner + * 2004 Eric Pouech + * + * 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 + */ + +#include "debugger.h" + +#if defined(__powerpc64__) + +static BOOL be_ppc_get_addr(HANDLE hThread, const dbg_ctx_t *ctx, + enum be_cpu_addr bca, ADDRESS64* addr) +{ + switch (bca) + { + case be_cpu_addr_pc: + return be_cpu_build_addr(hThread, ctx, addr, 0, ctx->ctx.Iar); + default: + case be_cpu_addr_stack: + case be_cpu_addr_frame: + dbg_printf("not done\n"); + } + return FALSE; +} + +static BOOL be_ppc_get_register_info(int regno, enum be_cpu_addr* kind) +{ + dbg_printf("not done\n"); + return FALSE; +} + +static void be_ppc_single_step(dbg_ctx_t *ctx, BOOL enable) +{ +#ifndef MSR_SE +# define MSR_SE (1<<10) +#endif + if (enable) ctx->ctx.Msr |= MSR_SE; + else ctx->ctx.Msr &= ~MSR_SE; +} + +static void be_ppc_print_context(HANDLE hThread, const dbg_ctx_t *ctx, int all_regs) +{ + dbg_printf("Context printing for PPC not done yet\n"); +} + +static void be_ppc_print_segment_info(HANDLE hThread, const dbg_ctx_t *ctx) +{ +} + +static struct dbg_internal_var be_ppc_ctx[] = +{ + {0, NULL, 0, dbg_itype_none} +}; + +static BOOL be_ppc_is_step_over_insn(const void* insn) +{ + dbg_printf("not done\n"); + return FALSE; +} + +static BOOL be_ppc_is_function_return(const void* insn) +{ + dbg_printf("not done\n"); + return FALSE; +} + +static BOOL be_ppc_is_break_insn(const void* insn) +{ + dbg_printf("not done\n"); + return FALSE; +} + +static BOOL be_ppc_is_func_call(const void* insn, ADDRESS64* callee) +{ + return FALSE; +} + +static BOOL be_ppc_is_jump(const void* insn, ADDRESS64* jumpee) +{ + return FALSE; +} + +static void be_ppc_disasm_one_insn(ADDRESS64* addr, int display) + +{ + dbg_printf("Disasm NIY\n"); +} + +static BOOL be_ppc_insert_Xpoint(HANDLE hProcess, const struct be_process_io* pio, + dbg_ctx_t *ctx, enum be_xpoint_type type, + void* addr, unsigned long* val, unsigned size) +{ + unsigned long xbp; + SIZE_T sz; + + switch (type) + { + case be_xpoint_break: + if (!size) return FALSE; + if (!pio->read(hProcess, addr, val, 4, &sz) || sz != 4) return FALSE; + xbp = 0x7d821008; /* 7d 82 10 08 ... in big endian */ + if (!pio->write(hProcess, addr, &xbp, 4, &sz) || sz != 4) return FALSE; + break; + default: + dbg_printf("Unknown/unsupported bp type %c\n", type); + return FALSE; + } + return TRUE; +} + +static BOOL be_ppc_remove_Xpoint(HANDLE hProcess, const struct be_process_io* pio, + dbg_ctx_t *ctx, enum be_xpoint_type type, + void* addr, unsigned long val, unsigned size) +{ + SIZE_T sz; + + switch (type) + { + case be_xpoint_break: + if (!size) return FALSE; + if (!pio->write(hProcess, addr, &val, 4, &sz) || sz == 4) return FALSE; + break; + default: + dbg_printf("Unknown/unsupported bp type %c\n", type); + return FALSE; + } + return TRUE; +} + +static BOOL be_ppc_is_watchpoint_set(const dbg_ctx_t *ctx, unsigned idx) +{ + dbg_printf("not done\n"); + return FALSE; +} + +static void be_ppc_clear_watchpoint(dbg_ctx_t *ctx, unsigned idx) +{ + dbg_printf("not done\n"); +} + +static int be_ppc_adjust_pc_for_break(dbg_ctx_t *ctx, BOOL way) +{ + dbg_printf("not done\n"); + return 0; +} + +static BOOL be_ppc_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, + BOOL is_signed, LONGLONG* ret) +{ + dbg_printf("not done\n"); + return FALSE; +} + +static BOOL be_ppc_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, + long double* ret) +{ + dbg_printf("not done\n"); + return FALSE; +} + +static BOOL be_ppc_store_integer(const struct dbg_lvalue* lvalue, unsigned size, + BOOL is_signed, LONGLONG val) +{ + dbg_printf("be_ppc_store_integer: not done\n"); + return FALSE; +} + +static BOOL be_ppc_get_context(HANDLE thread, dbg_ctx_t *ctx) +{ + ctx->ctx.ContextFlags = CONTEXT_ALL; + return GetThreadContext(thread, &ctx->ctx); +} + +static BOOL be_ppc_set_context(HANDLE thread, const dbg_ctx_t *ctx) +{ + return SetThreadContext(thread, &ctx->ctx); +} + +#define REG(r,gs) {FIELD_OFFSET(CONTEXT, r), sizeof(((CONTEXT*)NULL)->r), gs} + +static struct gdb_register be_ppc_gdb_register_map[] = { + REG(Gpr0, 4), + REG(Gpr1, 4), + REG(Gpr2, 4), + REG(Gpr3, 4), + REG(Gpr4, 4), + REG(Gpr5, 4), + REG(Gpr6, 4), + REG(Gpr7, 4), + REG(Gpr8, 4), + REG(Gpr9, 4), + REG(Gpr10, 4), + REG(Gpr11, 4), + REG(Gpr12, 4), + REG(Gpr13, 4), + REG(Gpr14, 4), + REG(Gpr15, 4), + REG(Gpr16, 4), + REG(Gpr17, 4), + REG(Gpr18, 4), + REG(Gpr19, 4), + REG(Gpr20, 4), + REG(Gpr21, 4), + REG(Gpr22, 4), + REG(Gpr23, 4), + REG(Gpr24, 4), + REG(Gpr25, 4), + REG(Gpr26, 4), + REG(Gpr27, 4), + REG(Gpr28, 4), + REG(Gpr29, 4), + REG(Gpr30, 4), + REG(Gpr31, 4), + REG(Fpr0, 4), + REG(Fpr1, 4), + REG(Fpr2, 4), + REG(Fpr3, 4), + REG(Fpr4, 4), + REG(Fpr5, 4), + REG(Fpr6, 4), + REG(Fpr7, 4), + REG(Fpr8, 4), + REG(Fpr9, 4), + REG(Fpr10, 4), + REG(Fpr11, 4), + REG(Fpr12, 4), + REG(Fpr13, 4), + REG(Fpr14, 4), + REG(Fpr15, 4), + REG(Fpr16, 4), + REG(Fpr17, 4), + REG(Fpr18, 4), + REG(Fpr19, 4), + REG(Fpr20, 4), + REG(Fpr21, 4), + REG(Fpr22, 4), + REG(Fpr23, 4), + REG(Fpr24, 4), + REG(Fpr25, 4), + REG(Fpr26, 4), + REG(Fpr27, 4), + REG(Fpr28, 4), + REG(Fpr29, 4), + REG(Fpr30, 4), + REG(Fpr31, 4), + + REG(Iar, 4), + REG(Msr, 4), + REG(Cr, 4), + REG(Lr, 4), + REG(Ctr, 4), + REG(Xer, 4), + /* FIXME: MQ is missing? FIELD_OFFSET(CONTEXT, Mq), */ + /* see gdb/nlm/ppc.c */ +}; + +struct backend_cpu be_ppc64 = +{ + IMAGE_FILE_MACHINE_POWERPC64, + 8, + be_cpu_linearize, + be_cpu_build_addr, + be_ppc_get_addr, + be_ppc_get_register_info, + be_ppc_single_step, + be_ppc_print_context, + be_ppc_print_segment_info, + be_ppc_ctx, + be_ppc_is_step_over_insn, + be_ppc_is_function_return, + be_ppc_is_break_insn, + be_ppc_is_func_call, + be_ppc_is_jump, + be_ppc_disasm_one_insn, + be_ppc_insert_Xpoint, + be_ppc_remove_Xpoint, + be_ppc_is_watchpoint_set, + be_ppc_clear_watchpoint, + be_ppc_adjust_pc_for_break, + be_ppc_fetch_integer, + be_ppc_fetch_float, + be_ppc_store_integer, + be_ppc_get_context, + be_ppc_set_context, + be_ppc_gdb_register_map, + ARRAY_SIZE(be_ppc_gdb_register_map), +}; +#endif diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index b7f59ee05b..8baa35b0a4 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -179,6 +179,8 @@ static unsigned char checksum(const char* ptr, int len) #ifdef __i386__ static const char target_xml[] = ""; +#elif defined(__powerpc64__) +static const char target_xml[] = ""; #elif defined(__powerpc__) static const char target_xml[] = ""; #elif defined(__x86_64__) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 5385d0effa..5e010a1c1c 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -732,6 +732,8 @@ static void output_system_info(void) static const char platform[] = "i386"; #elif defined(__x86_64__) static const char platform[] = "x86_64"; +#elif defined(__powerpc64__) + static const char platform[] = "powerpc64"; #elif defined(__powerpc__) static const char platform[] = "powerpc"; #elif defined(__arm__) diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index 95af7a601e..295e3e2b4d 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -291,6 +291,9 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) case PROCESSOR_ARCHITECTURE_PPC: str = "PowerPC"; break; + case PROCESSOR_ARCHITECTURE_PPC64: + str = "PowerPC 64"; + break; case PROCESSOR_ARCHITECTURE_AMD64: str = "X86_64"; break; diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 8634c0f73f..c4d7ccdac1 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -281,6 +281,8 @@ struct dbg_process* dbg_get_process_h(HANDLE h) #ifdef __i386__ extern struct backend_cpu be_i386; +#elif defined(__powerpc64__) +extern struct backend_cpu be_ppc64; #elif defined(__powerpc__) extern struct backend_cpu be_ppc; #elif defined(__x86_64__) @@ -330,6 +332,8 @@ struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid, #ifdef __i386__ p->be_cpu = &be_i386; +#elif defined(__powerpc64__) + p->be_cpu = &be_ppc64; #elif defined(__powerpc__) p->be_cpu = &be_ppc; #elif defined(__x86_64__) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 3d6cc660ec..44a9963d17 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -343,6 +343,8 @@ static void print_version (void) static const char platform[] = "i386"; #elif defined(__x86_64__) static const char platform[] = "x86_64"; +#elif defined(__powerpc64__) + static const char platform[] = "powerpc64"; #elif defined(__powerpc__) static const char platform[] = "powerpc"; #elif defined(__arm__) diff --git a/server/mapping.c b/server/mapping.c index 085d7aaa30..7c2d5316fe 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -2,6 +2,7 @@ * Server-side file mapping management * * Copyright (C) 1999 Alexandre Julliard + * Copyright 2019 Timothy Pearson <tpearson(a)raptorengineering.com> (PowerPC 64) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -619,7 +620,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s return STATUS_INVALID_IMAGE_FORMAT; case IMAGE_FILE_MACHINE_POWERPC: mapping->image.cpu = CPU_POWERPC; - if (cpu_mask & CPU_FLAG(CPU_POWERPC)) break; + if (cpu_mask & (CPU_FLAG(CPU_POWERPC) | CPU_FLAG(CPU_POWERPC64))) break; return STATUS_INVALID_IMAGE_FORMAT; default: return STATUS_INVALID_IMAGE_FORMAT; @@ -661,6 +662,10 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.cpu = CPU_ARM64; if (cpu_mask & (CPU_FLAG(CPU_ARM) | CPU_FLAG(CPU_ARM64))) break; return STATUS_INVALID_IMAGE_FORMAT; + case IMAGE_FILE_MACHINE_POWERPC64: + mapping->image.cpu = CPU_POWERPC64; + if (cpu_mask & (CPU_FLAG(CPU_POWERPC) | CPU_FLAG(CPU_POWERPC64))) break; + return STATUS_INVALID_IMAGE_FORMAT; default: return STATUS_INVALID_IMAGE_FORMAT; } @@ -726,6 +731,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.image_flags |= IMAGE_FLAGS_ComPlusNativeReady; if (cpu_mask & CPU_FLAG(CPU_x86_64)) mapping->image.cpu = CPU_x86_64; else if (cpu_mask & CPU_FLAG(CPU_ARM64)) mapping->image.cpu = CPU_ARM64; + else if (cpu_mask & CPU_FLAG(CPU_POWERPC64)) mapping->image.cpu = CPU_POWERPC64; } } diff --git a/server/process.h b/server/process.h index 4566a04b48..b65c36d0e8 100644 --- a/server/process.h +++ b/server/process.h @@ -108,7 +108,7 @@ struct process_snapshot }; #define CPU_FLAG(cpu) (1 << (cpu)) -#define CPU_64BIT_MASK (CPU_FLAG(CPU_x86_64) | CPU_FLAG(CPU_ARM64)) +#define CPU_64BIT_MASK (CPU_FLAG(CPU_x86_64) | CPU_FLAG(CPU_ARM64) | CPU_FLAG(CPU_POWERPC64)) /* process functions */ diff --git a/server/protocol.def b/server/protocol.def index e65b984a44..0fa5513285 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -133,7 +133,7 @@ typedef union /* supported CPU types */ enum cpu_type { - CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64 + CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_POWERPC64 }; typedef int cpu_type_t; @@ -148,6 +148,7 @@ typedef struct struct { unsigned __int64 rip, rbp, rsp; unsigned int cs, ss, flags, __pad; } x86_64_regs; struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap, __pad; } powerpc_regs; + struct { unsigned __int64 iar, msr, ctr, lr, dar, dsisr, trap, __pad; } powerpc64_regs; struct { unsigned int sp, lr, pc, cpsr; } arm_regs; struct { unsigned __int64 sp, pc, pstate; } arm64_regs; } ctl; /* selected by SERVER_CTX_CONTROL */ @@ -157,6 +158,7 @@ typedef struct struct { unsigned __int64 rax,rbx, rcx, rdx, rsi, rdi, r8, r9, r10, r11, r12, r13, r14, r15; } x86_64_regs; struct { unsigned int gpr[32], cr, xer; } powerpc_regs; + struct { unsigned __int64 gpr[32], cr, xer; } powerpc64_regs; struct { unsigned int r[13]; } arm_regs; struct { unsigned __int64 x[31]; } arm64_regs; } integer; /* selected by SERVER_CTX_INTEGER */ @@ -171,6 +173,7 @@ typedef struct unsigned char regs[80]; } i386_regs; struct { struct { unsigned __int64 low, high; } fpregs[32]; } x86_64_regs; struct { double fpr[32], fpscr; } powerpc_regs; + struct { double fpr[32], fpscr; } powerpc64_regs; struct { unsigned __int64 d[32]; unsigned int fpscr; } arm_regs; struct { unsigned __int64 d[64]; unsigned int fpcr, fpsr; } arm64_regs; } fp; /* selected by SERVER_CTX_FLOATING_POINT */ @@ -179,6 +182,7 @@ typedef struct struct { unsigned int dr0, dr1, dr2, dr3, dr6, dr7; } i386_regs; struct { unsigned __int64 dr0, dr1, dr2, dr3, dr6, dr7; } x86_64_regs; struct { unsigned int dr[8]; } powerpc_regs; + struct { unsigned __int64 dr[8]; } powerpc64_regs; struct { unsigned int bvr[8], bcr[8], wvr[1], wcr[1]; } arm_regs; struct { unsigned __int64 bvr[8], wvr[2]; unsigned int bcr[8], wcr[2]; } arm64_regs; } debug; /* selected by SERVER_CTX_DEBUG_REGISTERS */ diff --git a/server/thread.c b/server/thread.c index 4c3d9c3d16..5571036077 100644 --- a/server/thread.c +++ b/server/thread.c @@ -57,6 +57,8 @@ static const unsigned int supported_cpus = CPU_FLAG(CPU_x86); #elif defined(__x86_64__) static const unsigned int supported_cpus = CPU_FLAG(CPU_x86_64) | CPU_FLAG(CPU_x86); +#elif defined(__powerpc64__) +static const unsigned int supported_cpus = CPU_FLAG(CPU_POWERPC64); #elif defined(__powerpc__) static const unsigned int supported_cpus = CPU_FLAG(CPU_POWERPC); #elif defined(__arm__) @@ -1182,6 +1184,7 @@ static unsigned int get_context_system_regs( enum cpu_type cpu ) case CPU_x86: return SERVER_CTX_DEBUG_REGISTERS; case CPU_x86_64: return SERVER_CTX_DEBUG_REGISTERS; case CPU_POWERPC: return 0; + case CPU_POWERPC64: return 0; case CPU_ARM: return SERVER_CTX_DEBUG_REGISTERS; case CPU_ARM64: return SERVER_CTX_DEBUG_REGISTERS; } @@ -1210,6 +1213,9 @@ void break_thread( struct thread *thread ) case CPU_POWERPC: data.exception.address = thread->context->ctl.powerpc_regs.iar; break; + case CPU_POWERPC64: + data.exception.address = thread->context->ctl.powerpc64_regs.iar; + break; case CPU_ARM: data.exception.address = thread->context->ctl.arm_regs.pc; break; diff --git a/server/trace.c b/server/trace.c index 41bbe4a516..5a9e25656d 100644 --- a/server/trace.c +++ b/server/trace.c @@ -137,6 +137,7 @@ static void dump_cpu_type( const char *prefix, const cpu_type_t *code ) CASE(x86); CASE(x86_64); CASE(POWERPC); + CASE(POWERPC64); CASE(ARM); CASE(ARM64); default: fprintf( stderr, "%s%u", prefix, *code ); break; @@ -657,6 +658,26 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) fprintf( stderr, ",fpscr=%g", ctx.fp.powerpc_regs.fpscr ); } break; + case CPU_POWERPC64: + if (ctx.flags & SERVER_CTX_CONTROL) + fprintf( stderr, ",iar=%016x,msr=%016x,ctr=%016x,lr=%016x,dar=%016x,dsisr=%016x,trap=%016x", + ctx.ctl.powerpc64_regs.iar, ctx.ctl.powerpc64_regs.msr, ctx.ctl.powerpc64_regs.ctr, + ctx.ctl.powerpc64_regs.lr, ctx.ctl.powerpc64_regs.dar, ctx.ctl.powerpc64_regs.dsisr, + ctx.ctl.powerpc64_regs.trap ); + if (ctx.flags & SERVER_CTX_INTEGER) + { + for (i = 0; i < 32; i++) fprintf( stderr, ",gpr%u=%016x", i, ctx.integer.powerpc64_regs.gpr[i] ); + fprintf( stderr, ",cr=%08x,xer=%08x", + ctx.integer.powerpc64_regs.cr, ctx.integer.powerpc64_regs.xer ); + } + if (ctx.flags & SERVER_CTX_DEBUG_REGISTERS) + for (i = 0; i < 8; i++) fprintf( stderr, ",dr%u=%016x", i, ctx.debug.powerpc64_regs.dr[i] ); + if (ctx.flags & SERVER_CTX_FLOATING_POINT) + { + for (i = 0; i < 32; i++) fprintf( stderr, ",fpr%u=%g", i, ctx.fp.powerpc64_regs.fpr[i] ); + fprintf( stderr, ",fpscr=%g", ctx.fp.powerpc64_regs.fpscr ); + } + break; case CPU_ARM: if (ctx.flags & SERVER_CTX_CONTROL) fprintf( stderr, ",sp=%08x,lr=%08x,pc=%08x,cpsr=%08x", diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 0bcf67ba73..8b44d5a70f 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -95,6 +95,8 @@ static const char version_string[] = "Wine IDL Compiler version " PACKAGE_VERSIO enum target_cpu target_cpu = CPU_x86; #elif defined(__x86_64__) enum target_cpu target_cpu = CPU_x86_64; +#elif defined(__powerpc64__) +enum target_cpu target_cpu = CPU_POWERPC64; #elif defined(__powerpc__) enum target_cpu target_cpu = CPU_POWERPC; #elif defined(__arm__) @@ -286,6 +288,7 @@ static void set_target( const char *target ) { "amd64", CPU_x86_64 }, { "x86_64", CPU_x86_64 }, { "powerpc", CPU_POWERPC }, + { "powerpc64", CPU_POWERPC64 }, { "arm", CPU_ARM }, { "armv5", CPU_ARM }, { "armv6", CPU_ARM }, @@ -751,6 +754,10 @@ int main(int argc,char *argv[]) if (pointer_size == 4) error( "Cannot build 32-bit code for this CPU\n" ); pointer_size = 8; break; + case CPU_POWERPC64: + if (pointer_size == 4) error( "Cannot build 32-bit code for this CPU\n" ); + pointer_size = 8; + break; default: if (pointer_size == 8) error( "Cannot build 64-bit code for this CPU\n" ); pointer_size = 4; diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 4f4252e3ea..bc6226c54f 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -76,7 +76,7 @@ extern int char_number; enum target_cpu { - CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_LAST = CPU_ARM64 + CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_POWERPC64, CPU_LAST = CPU_POWERPC64 }; extern enum target_cpu target_cpu; diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index cb4f0f38dd..95c65ce2f6 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2159,7 +2159,7 @@ static void add_union_typeinfo(msft_typelib_t *typelib, type_t *tunion) var_t *cur; msft_typeinfo_t *msft_typeinfo; - if (-1 < tunion->typelib_idx) + if (-1 <= tunion->typelib_idx) return; tunion->typelib_idx = typelib->typelib_header.nrtypeinfos; diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index fbc2cd9a00..61a5b05d2f 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -142,7 +142,7 @@ typedef struct enum target_cpu { - CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_LAST = CPU_ARM64 + CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_POWERPC64, CPU_LAST = CPU_POWERPC64 }; enum target_platform @@ -180,7 +180,7 @@ struct strarray #define FLAG_CPU(cpu) (0x01000 << (cpu)) #define FLAG_CPU_MASK (FLAG_CPU(CPU_LAST + 1) - FLAG_CPU(0)) -#define FLAG_CPU_WIN64 (FLAG_CPU(CPU_x86_64) | FLAG_CPU(CPU_ARM64)) +#define FLAG_CPU_WIN64 (FLAG_CPU(CPU_x86_64) | FLAG_CPU(CPU_ARM64) | FLAG_CPU(CPU_POWERPC64)) #define FLAG_CPU_WIN32 (FLAG_CPU_MASK & ~FLAG_CPU_WIN64) #define MAX_ORDINALS 65535 diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 5e5866c80f..b700e8e8e0 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -3,6 +3,7 @@ * * Copyright 2000, 2004 Alexandre Julliard * Copyright 2000 Eric Pouech + * Copyright 2019 Timothy Pearson <tpearson(a)raptorengineering.com> (PowerPC 64) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -694,6 +695,20 @@ static void output_import_thunk( const char *name, const char *table, int pos ) output( "\tmr %s, %s\n", ppc_reg(31), ppc_reg(0) ); output( "\tbctr\n" ); break; + case CPU_POWERPC64: + /* + * The ppc64 ABI v2 expects r12 to be set to ctr before bctr for PLT-like calls. + * ABIv2-compatible functions attempt to rebuild the TOC pointer (r2) from r12 under this assumption. + */ + output( "\tlis %s, (%s+%d)@highest\n", ppc_reg(12), table, pos ); + output( "\tori %s, %s, (%s+%d)@higher\n", ppc_reg(12), ppc_reg(12), table, pos ); + output( "\trldicr %s, %s, 32, 31\n", ppc_reg(12), ppc_reg(12) ); + output( "\toris %s, %s, (%s+%d)@high\n", ppc_reg(12), ppc_reg(12), table, pos ); + output( "\tori %s, %s, (%s+%d)@l\n", ppc_reg(12), ppc_reg(12), table, pos ); + output( "\tld %s, 0(%s)\n", ppc_reg(12), ppc_reg(12) ); + output( "\tmtctr %s\n", ppc_reg(12) ); + output( "\tbctr\n" ); + break; } output_cfi( ".cfi_endproc" ); output_function_size( name ); @@ -1042,6 +1057,62 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tmtlr %s\n", ppc_reg(0)); output( "\taddi %s, %s, %d\n", ppc_reg(1), ppc_reg(1), 48+extra_stack_storage); + /* branch to ctr register. */ + output( "\tbctr\n"); + break; + case CPU_POWERPC64: + /* Save all callee saved registers into a stackframe. */ + output( "\tstdu %s, -%d(%s)\n",ppc_reg(1), 168+extra_stack_storage, ppc_reg(1)); + output( "\tstd %s, %d(%s)\n", ppc_reg(3), 48+extra_stack_storage, ppc_reg(1)); + output( "\tstd %s, %d(%s)\n", ppc_reg(4), 56+extra_stack_storage, ppc_reg(1)); + output( "\tstd %s, %d(%s)\n", ppc_reg(5), 64+extra_stack_storage, ppc_reg(1)); + output( "\tstd %s, %d(%s)\n", ppc_reg(6), 72+extra_stack_storage, ppc_reg(1)); + output( "\tstd %s, %d(%s)\n", ppc_reg(7), 80+extra_stack_storage, ppc_reg(1)); + output( "\tstd %s, %d(%s)\n", ppc_reg(8), 88+extra_stack_storage, ppc_reg(1)); + output( "\tstd %s, %d(%s)\n", ppc_reg(9), 96+extra_stack_storage, ppc_reg(1)); + output( "\tstd %s, %d(%s)\n", ppc_reg(10),104+extra_stack_storage, ppc_reg(1)); + output( "\tstd %s, %d(%s)\n", ppc_reg(11),112+extra_stack_storage, ppc_reg(1)); + output( "\tstd %s, %d(%s)\n", ppc_reg(12),120+extra_stack_storage, ppc_reg(1)); + + /* r0 -> r3 (arg1) */ + output( "\tmr %s, %s\n", ppc_reg(3), ppc_reg(0)); + + /* save return address */ + output( "\tmflr %s\n", ppc_reg(0)); + output( "\tstd %s, %d(%s)\n", ppc_reg(0), 168+16+extra_stack_storage, ppc_reg(1)); + + /* Call the __wine_delay_load function, arg1 is arg1. */ + output( "\tlis %s, %s@highest\n", ppc_reg(12), asm_name("__wine_spec_delay_load") ); + output( "\tori %s, %s, %s@higher\n", ppc_reg(12), ppc_reg(12), asm_name("__wine_spec_delay_load") ); + output( "\trldicr %s, %s, 32, 31\n", ppc_reg(12), ppc_reg(12) ); + output( "\toris %s, %s, %s@high\n", ppc_reg(12), ppc_reg(12), asm_name("__wine_spec_delay_load") ); + output( "\tori %s, %s, %s@l\n", ppc_reg(12), ppc_reg(12), asm_name("__wine_spec_delay_load") ); + output( "\tmtctr %s\n", ppc_reg(12) ); + output( "\tbctrl\n" ); + + /* r3 (return value) -> r12 (branch / ctr) */ + output( "\tmr %s, %s\n", ppc_reg(12), ppc_reg(3)); + + /* Load return value from call into ctr register */ + output( "\tmtctr %s\n", ppc_reg(12)); + + /* restore all saved registers and drop stackframe. */ + output( "\tld %s, %d(%s)\n", ppc_reg(3), 48+extra_stack_storage, ppc_reg(1)); + output( "\tld %s, %d(%s)\n", ppc_reg(4), 56+extra_stack_storage, ppc_reg(1)); + output( "\tld %s, %d(%s)\n", ppc_reg(5), 64+extra_stack_storage, ppc_reg(1)); + output( "\tld %s, %d(%s)\n", ppc_reg(6), 72+extra_stack_storage, ppc_reg(1)); + output( "\tld %s, %d(%s)\n", ppc_reg(7), 80+extra_stack_storage, ppc_reg(1)); + output( "\tld %s, %d(%s)\n", ppc_reg(8), 88+extra_stack_storage, ppc_reg(1)); + output( "\tld %s, %d(%s)\n", ppc_reg(9), 96+extra_stack_storage, ppc_reg(1)); + output( "\tld %s, %d(%s)\n", ppc_reg(10),104+extra_stack_storage, ppc_reg(1)); + output( "\tld %s, %d(%s)\n", ppc_reg(11),112+extra_stack_storage, ppc_reg(1)); + /* don't restore r12! restoring r12 here would corrupt the computed TOC post-bctr. */ + + /* Load return value from call into return register */ + output( "\tld %s, %d(%s)\n", ppc_reg(0), 168+16+extra_stack_storage, ppc_reg(1)); + output( "\tmtlr %s\n", ppc_reg(0)); + output( "\tld %s, 0(%s)\n", ppc_reg(1), ppc_reg(1)); + /* branch to ctr register. */ output( "\tbctr\n"); break; @@ -1123,6 +1194,26 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) break; } break; + case CPU_POWERPC64: + /* Set up arg1 (r0) + * Clobbers r12 since ppc64 ABI v2 expects r12 == ctr at branch to ctr, + * i.e. we set up r12 right after this. + */ + output( "\tlis %s, %d@highest\n", ppc_reg(12), (idx << 16) | j ); + output( "\tori %s, %s, %d@higher\n", ppc_reg(12), ppc_reg(12), (idx << 16) | j ); + output( "\trldicr %s, %s, 32, 31\n", ppc_reg(12), ppc_reg(12) ); + output( "\toris %s, %s, %d@high\n", ppc_reg(12), ppc_reg(12), (idx << 16) | j ); + output( "\tori %s, %s, %d@l\n", ppc_reg(12), ppc_reg(12), (idx << 16) | j ); + output( "\tmr %s, %s\n", ppc_reg(0), ppc_reg(12) ); + + output( "\tlis %s, %s@highest\n", ppc_reg(12), asm_name("__wine_delay_load_asm") ); + output( "\tori %s, %s, %s@higher\n", ppc_reg(12), ppc_reg(12), asm_name("__wine_delay_load_asm") ); + output( "\trldicr %s, %s, 32, 31\n", ppc_reg(12), ppc_reg(12) ); + output( "\toris %s, %s, %s@high\n", ppc_reg(12), ppc_reg(12), asm_name("__wine_delay_load_asm") ); + output( "\tori %s, %s, %s@l\n", ppc_reg(12), ppc_reg(12), asm_name("__wine_delay_load_asm") ); + output( "\tmtctr %s\n", ppc_reg(12) ); + output( "\tbctr\n" ); + break; } output_cfi( ".cfi_endproc" ); } @@ -1297,6 +1388,32 @@ void output_stubs( DLLSPEC *spec ) output( "\tadd x2, x2, #:lo12:%s\n", asm_name("__wine_spec_unimplemented_stub") ); output( "\tblr x2\n" ); break; + case CPU_POWERPC64: + /* Clobbers r3, r4, and r12 */ + output( "\tlis %s, %s@highest\n", ppc_reg(3), asm_name("__wine_spec_file_name") ); + output( "\tori %s, %s, %s@higher\n", ppc_reg(3), ppc_reg(3), asm_name("__wine_spec_file_name") ); + output( "\trldicr %s, %s, 32, 31\n", ppc_reg(3), ppc_reg(3) ); + output( "\toris %s, %s, %s@high\n", ppc_reg(3), ppc_reg(3), asm_name("__wine_spec_file_name") ); + output( "\tori %s, %s, %s@l\n", ppc_reg(3), ppc_reg(3), asm_name("__wine_spec_file_name") ); + if (exp_name) + { + output( "\tlis %s, .L%s_string@highest\n", ppc_reg(4), name ); + output( "\tori %s, %s, .L%s_string@higher\n", ppc_reg(4), ppc_reg(4), name ); + output( "\trldicr %s, %s, 32, 31\n", ppc_reg(4), ppc_reg(4) ); + output( "\toris %s, %s, .L%s_string@high\n", ppc_reg(4), ppc_reg(4), name ); + output( "\tori %s, %s, .L%s_string@l\n", ppc_reg(4), ppc_reg(4), name ); + count++; + } + else + { + output( "\tlis %s, %u@highest\n", ppc_reg(4), odp->ordinal ); + output( "\tori %s, %s, %u@higher\n", ppc_reg(4), ppc_reg(4), odp->ordinal ); + output( "\trldicr %s, %s, 32, 31\n", ppc_reg(4), ppc_reg(4) ); + output( "\toris %s, %s, %u@high\n", ppc_reg(4), ppc_reg(4), odp->ordinal ); + output( "\tori %s, %s, %u@l\n", ppc_reg(4), ppc_reg(4), odp->ordinal ); + } + output( "\tbl %s\n", asm_name("__wine_spec_unimplemented_stub") ); + break; default: assert(0); } diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index b2f5c959c4..406679f2c8 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -51,6 +51,8 @@ int unwind_tables = 0; enum target_cpu target_cpu = CPU_x86; #elif defined(__x86_64__) enum target_cpu target_cpu = CPU_x86_64; +#elif defined(__powerpc64__) +enum target_cpu target_cpu = CPU_POWERPC64; #elif defined(__powerpc__) enum target_cpu target_cpu = CPU_POWERPC; #elif defined(__arm__) @@ -552,6 +554,10 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) case CPU_x86_64: if (force_pointer_size == 4) target_cpu = CPU_x86; break; + case CPU_POWERPC64: + if (force_pointer_size == 4) + fatal_error( "Cannot build 32-bit code for this CPU\n" ); + break; default: if (force_pointer_size == 8) fatal_error( "Cannot build 64-bit code for this CPU\n" ); diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index ad996547a5..f59ac7302a 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -403,9 +403,9 @@ static int parse_spec_stub( ORDDEF *odp, DLLSPEC *spec ) odp->link_name = xstrdup(""); /* don't bother generating stubs for Winelib */ if (odp->flags & FLAG_CPU_MASK) - odp->flags &= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64) | FLAG_CPU(CPU_ARM) | FLAG_CPU(CPU_ARM64); + odp->flags &= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64) | FLAG_CPU(CPU_ARM) | FLAG_CPU(CPU_ARM64) | FLAG_CPU(CPU_POWERPC64); else - odp->flags |= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64) | FLAG_CPU(CPU_ARM) | FLAG_CPU(CPU_ARM64); + odp->flags |= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64) | FLAG_CPU(CPU_ARM) | FLAG_CPU(CPU_ARM64) | FLAG_CPU(CPU_POWERPC64); return parse_spec_arguments( odp, spec, 1 ); } diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 3552eca74f..e57552552b 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -32,12 +32,13 @@ #include "build.h" -#define IMAGE_FILE_MACHINE_UNKNOWN 0 -#define IMAGE_FILE_MACHINE_I386 0x014c -#define IMAGE_FILE_MACHINE_POWERPC 0x01f0 -#define IMAGE_FILE_MACHINE_AMD64 0x8664 -#define IMAGE_FILE_MACHINE_ARMNT 0x01C4 -#define IMAGE_FILE_MACHINE_ARM64 0xaa64 +#define IMAGE_FILE_MACHINE_UNKNOWN 0 +#define IMAGE_FILE_MACHINE_I386 0x014c +#define IMAGE_FILE_MACHINE_POWERPC 0x01f0 +#define IMAGE_FILE_MACHINE_POWERPC64 0x01f2 +#define IMAGE_FILE_MACHINE_AMD64 0x8664 +#define IMAGE_FILE_MACHINE_ARMNT 0x01C4 +#define IMAGE_FILE_MACHINE_ARM64 0xaa64 #define IMAGE_SIZEOF_NT_OPTIONAL32_HEADER 224 #define IMAGE_SIZEOF_NT_OPTIONAL64_HEADER 240 @@ -515,6 +516,7 @@ static void output_asm_constructor( const char *constructor ) break; case CPU_ARM64: case CPU_POWERPC: + case CPU_POWERPC64: output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tbl %s\n", asm_name(constructor) ); break; @@ -562,6 +564,7 @@ void output_module( DLLSPEC *spec ) break; case CPU_ARM64: case CPU_POWERPC: + case CPU_POWERPC64: output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tb 1f\n" ); break; @@ -582,11 +585,12 @@ void output_module( DLLSPEC *spec ) output( "\t.long 0x4550\n" ); /* Signature */ switch(target_cpu) { - case CPU_x86: machine = IMAGE_FILE_MACHINE_I386; break; - case CPU_x86_64: machine = IMAGE_FILE_MACHINE_AMD64; break; - case CPU_POWERPC: machine = IMAGE_FILE_MACHINE_POWERPC; break; - case CPU_ARM: machine = IMAGE_FILE_MACHINE_ARMNT; break; - case CPU_ARM64: machine = IMAGE_FILE_MACHINE_ARM64; break; + case CPU_x86: machine = IMAGE_FILE_MACHINE_I386; break; + case CPU_x86_64: machine = IMAGE_FILE_MACHINE_AMD64; break; + case CPU_POWERPC: machine = IMAGE_FILE_MACHINE_POWERPC; break; + case CPU_POWERPC64: machine = IMAGE_FILE_MACHINE_POWERPC64; break; + case CPU_ARM: machine = IMAGE_FILE_MACHINE_ARMNT; break; + case CPU_ARM64: machine = IMAGE_FILE_MACHINE_ARM64; break; } output( "\t.short 0x%04x\n", /* Machine */ machine ); @@ -765,11 +769,12 @@ void output_fake_module( DLLSPEC *spec ) put_dword( 0x4550 ); /* Signature */ switch(target_cpu) { - case CPU_x86: put_word( IMAGE_FILE_MACHINE_I386 ); break; - case CPU_x86_64: put_word( IMAGE_FILE_MACHINE_AMD64 ); break; - case CPU_POWERPC: put_word( IMAGE_FILE_MACHINE_POWERPC ); break; - case CPU_ARM: put_word( IMAGE_FILE_MACHINE_ARMNT ); break; - case CPU_ARM64: put_word( IMAGE_FILE_MACHINE_ARM64 ); break; + case CPU_x86: put_word( IMAGE_FILE_MACHINE_I386 ); break; + case CPU_x86_64: put_word( IMAGE_FILE_MACHINE_AMD64 ); break; + case CPU_POWERPC: put_word( IMAGE_FILE_MACHINE_POWERPC ); break; + case CPU_POWERPC64: put_word( IMAGE_FILE_MACHINE_POWERPC64 ); break; + case CPU_ARM: put_word( IMAGE_FILE_MACHINE_ARMNT ); break; + case CPU_ARM64: put_word( IMAGE_FILE_MACHINE_ARM64 ); break; } put_word( nb_sections ); /* NumberOfSections */ put_dword( 0 ); /* TimeDateStamp */ diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 78e9645411..7b068d32b0 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -62,6 +62,7 @@ static const struct { "amd64", CPU_x86_64 }, { "x86_64", CPU_x86_64 }, { "powerpc", CPU_POWERPC }, + { "powerpc64", CPU_POWERPC64 }, { "arm", CPU_ARM }, { "armv5", CPU_ARM }, { "armv6", CPU_ARM }, @@ -410,6 +411,7 @@ struct strarray get_as_command(void) default: switch(target_cpu) { + case CPU_POWERPC64: case CPU_POWERPC: strarray_add_one( &args, (force_pointer_size == 8) ? "-a64" : "-a32" ); break; @@ -451,6 +453,13 @@ struct strarray get_ld_command(void) default: switch(target_cpu) { + case CPU_POWERPC64: +#if defined(__BIG_ENDIAN__) + strarray_add( &args, "-m", (force_pointer_size == 8) ? "elf64ppc" : "elf32ppc", NULL ); +#else + strarray_add( &args, "-m", (force_pointer_size == 8) ? "elf64lppc" : "elf32lppc", NULL ); +#endif + break; case CPU_POWERPC: strarray_add( &args, "-m", (force_pointer_size == 8) ? "elf64ppc" : "elf32ppc", NULL ); break; @@ -897,6 +906,7 @@ unsigned int get_alignment(unsigned int align) if (target_platform != PLATFORM_APPLE) return align; /* fall through */ case CPU_POWERPC: + case CPU_POWERPC64: case CPU_ARM: case CPU_ARM64: n = 0; @@ -918,6 +928,7 @@ unsigned int get_page_size(void) case CPU_POWERPC: case CPU_ARM: return 0x1000; + case CPU_POWERPC64: case CPU_ARM64: return 0x10000; } @@ -937,6 +948,7 @@ unsigned int get_ptr_size(void) return 4; case CPU_x86_64: case CPU_ARM64: + case CPU_POWERPC64: return 8; } /* unreached */ diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index da1369cbf8..c2767033c7 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -284,6 +284,9 @@ void mdmp_dump(void) case PROCESSOR_ARCHITECTURE_PPC: str = "PowerPC"; break; + case PROCESSOR_ARCHITECTURE_PPC64: + str = "PowerPC 64"; + break; case PROCESSOR_ARCHITECTURE_ARM: str = "ARM"; break; diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index f8689f7f33..3721db67a7 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -59,6 +59,7 @@ const char *get_machine_str(int mach) case IMAGE_FILE_MACHINE_R10000: return "R10000"; case IMAGE_FILE_MACHINE_ALPHA: return "Alpha"; case IMAGE_FILE_MACHINE_POWERPC: return "PowerPC"; + case IMAGE_FILE_MACHINE_POWERPC64: return "PowerPC64"; case IMAGE_FILE_MACHINE_AMD64: return "AMD64"; case IMAGE_FILE_MACHINE_IA64: return "IA64"; case IMAGE_FILE_MACHINE_ARM64: return "ARM64"; diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index 536fb2d2f9..e83b6b743d 100644 --- a/tools/winegcc/utils.h +++ b/tools/winegcc/utils.h @@ -37,7 +37,7 @@ enum target_cpu { - CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64 + CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_POWERPC64 }; enum target_platform diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 54d43685df..cc5738c370 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -160,6 +160,7 @@ static const struct { "amd64", CPU_x86_64 }, { "x86_64", CPU_x86_64 }, { "powerpc", CPU_POWERPC }, + { "powerpc64", CPU_POWERPC64 }, { "arm", CPU_ARM }, { "armv5", CPU_ARM }, { "armv6", CPU_ARM }, @@ -225,6 +226,8 @@ struct options static const enum target_cpu build_cpu = CPU_x86; #elif defined(__x86_64__) static const enum target_cpu build_cpu = CPU_x86_64; +#elif defined(__powerpc64__) +static const enum target_cpu build_cpu = CPU_POWERPC64; #elif defined(__powerpc__) static const enum target_cpu build_cpu = CPU_POWERPC; #elif defined(__arm__) @@ -436,9 +439,9 @@ static int check_platform( struct options *opts, const char *file ) if (!memcmp( header, "\177ELF", 4 )) { if (header[4] == 2) /* 64-bit */ - ret = (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64); + ret = (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64 || opts->target_cpu == CPU_POWERPC64); else - ret = (opts->target_cpu != CPU_x86_64 && opts->target_cpu != CPU_ARM64); + ret = (opts->target_cpu != CPU_x86_64 && opts->target_cpu != CPU_ARM64 && opts->target_cpu != CPU_POWERPC64); } } close( fd ); @@ -450,11 +453,12 @@ static const char *get_multiarch_dir( enum target_cpu cpu ) { switch(cpu) { - case CPU_x86: return "/i386-linux-gnu"; - case CPU_x86_64: return "/x86_64-linux-gnu"; - case CPU_ARM: return "/arm-linux-gnueabi"; - case CPU_ARM64: return "/aarch64-linux-gnu"; - case CPU_POWERPC: return "/powerpc-linux-gnu"; + case CPU_x86: return "/i386-linux-gnu"; + case CPU_x86_64: return "/x86_64-linux-gnu"; + case CPU_ARM: return "/arm-linux-gnueabi"; + case CPU_ARM64: return "/aarch64-linux-gnu"; + case CPU_POWERPC: return "/powerpc-linux-gnu"; + case CPU_POWERPC64: return "/powerpc64le-linux-gnu"; default: assert(0); return NULL; @@ -469,8 +473,8 @@ static char *get_lib_dir( struct options *opts ) unsigned int i; size_t build_len, target_len; - bit_suffix = opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64 ? "64" : "32"; - other_bit_suffix = opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64 ? "32" : "64"; + bit_suffix = opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64 || opts->target_cpu == CPU_POWERPC64 ? "64" : "32"; + other_bit_suffix = opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64 || opts->target_cpu == CPU_POWERPC64 ? "32" : "64"; build_multiarch = get_multiarch_dir( build_cpu ); target_multiarch = get_multiarch_dir( opts->target_cpu ); build_len = strlen( build_multiarch ); @@ -595,7 +599,7 @@ static void compile(struct options* opts, const char* lang) strarray_add(comp_args, "-fPIC"); } - if (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64) + if (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64 || opts->target_cpu == CPU_POWERPC64) { strarray_add(comp_args, "-DWIN64"); strarray_add(comp_args, "-D_WIN64"); @@ -633,6 +637,7 @@ static void compile(struct options* opts, const char* lang) case CPU_ARM: case CPU_ARM64: case CPU_POWERPC: + case CPU_POWERPC64: strarray_add(comp_args, "-D__stdcall="); strarray_add(comp_args, "-D__cdecl="); strarray_add(comp_args, "-D_stdcall="); @@ -659,7 +664,7 @@ static void compile(struct options* opts, const char* lang) strarray_add(comp_args, "-D__int8=char"); strarray_add(comp_args, "-D__int16=short"); strarray_add(comp_args, "-D__int32=int"); - if (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64) + if (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64 || opts->target_cpu == CPU_POWERPC64) strarray_add(comp_args, "-D__int64=long"); else strarray_add(comp_args, "-D__int64=long long"); @@ -1216,8 +1221,14 @@ static void build(struct options* opts) else prelink = PRELINK; } - if (!try_link(opts->prefix, link_args, "-Wl,-z,max-page-size=0x1000")) - strarray_add(link_args, "-Wl,-z,max-page-size=0x1000"); + if (opts->target_cpu == CPU_POWERPC64) { + if (!try_link(opts->prefix, link_args, "-Wl,-z,max-page-size=0x10000")) + strarray_add(link_args, "-Wl,-z,max-page-size=0x10000"); + } + else { + if (!try_link(opts->prefix, link_args, "-Wl,-z,max-page-size=0x1000")) + strarray_add(link_args, "-Wl,-z,max-page-size=0x1000"); + } break; } @@ -1588,6 +1599,8 @@ int main(int argc, char **argv) opts.target_cpu = CPU_x86; else if (opts.target_cpu == CPU_ARM64) opts.target_cpu = CPU_ARM; + else if (opts.target_cpu == CPU_POWERPC64) + opts.target_cpu = CPU_POWERPC; opts.force_pointer_size = 4; raw_linker_arg = 1; } @@ -1597,6 +1610,8 @@ int main(int argc, char **argv) opts.target_cpu = CPU_x86_64; else if (opts.target_cpu == CPU_ARM) opts.target_cpu = CPU_ARM64; + else if (opts.target_cpu == CPU_POWERPC) + opts.target_cpu = CPU_POWERPC64; opts.force_pointer_size = 8; raw_linker_arg = 1; } diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index ea8bfe07a7..f05d687eb0 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -317,7 +317,8 @@ static void set_target( const char *target ) if (!(p = strchr( cpu, '-' ))) error( "Invalid target specification '%s'\n", target ); *p = 0; if (!strcmp( cpu, "amd64" ) || !strcmp( cpu, "x86_64" ) || - !strcmp( cpu, "ia64" ) || !strcmp( cpu, "aarch64" )) + !strcmp( cpu, "ia64" ) || !strcmp( cpu, "aarch64" ) || + !strcmp( cpu, "ppc64" ) || strcmp( cpu, "ppc64el" ) || strcmp( cpu, "ppc64le" )) pointer_size = 8; else pointer_size = 4; -- 2.20.1

3 4

[PATCH] fusion: Use bcrypt to compute the assembly token.
by Hans Leidekker 27 Feb '19

27 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46728 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/fusion/Makefile.in | 2 +- dlls/fusion/assembly.c | 35 ++++++++++------------------------- 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/dlls/fusion/Makefile.in b/dlls/fusion/Makefile.in index 50815df1de..093b64c0d3 100644 --- a/dlls/fusion/Makefile.in +++ b/dlls/fusion/Makefile.in @@ -1,5 +1,5 @@ MODULE = fusion.dll -IMPORTS = advapi32 dbghelp shlwapi version user32 +IMPORTS = bcrypt dbghelp shlwapi version user32 C_SRCS = \ asmcache.c \ diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index ec380ef442..78f5278166 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -21,11 +21,13 @@ #include <stdarg.h> #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winuser.h" #include "winver.h" -#include "wincrypt.h" +#include "bcrypt.h" #include "dbghelp.h" #include "ole2.h" #include "fusion.h" @@ -807,9 +809,8 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) { ULONG i, size; LONG offset; - BYTE *hashdata, *pubkey, *ptr; - HCRYPTPROV crypt; - HCRYPTHASH hash; + BYTE hashdata[20], *pubkey, *ptr; + BCRYPT_ALG_HANDLE alg; BYTE tokbytes[BYTES_PER_TOKEN]; HRESULT hr = E_FAIL; LPWSTR tok; @@ -833,29 +834,16 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) pubkey = assembly_get_blob(assembly, idx, &size); - if (!CryptAcquireContextA(&crypt, NULL, NULL, PROV_RSA_FULL, - CRYPT_VERIFYCONTEXT)) + if (BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA1_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0) != STATUS_SUCCESS) return E_FAIL; - if (!CryptCreateHash(crypt, CALG_SHA1, 0, 0, &hash)) - return E_FAIL; - - if (!CryptHashData(hash, pubkey, size, 0)) - return E_FAIL; - - size = 0; - if (!CryptGetHashParam(hash, HP_HASHVAL, NULL, &size, 0)) - return E_FAIL; - - if (!(hashdata = heap_alloc(size))) + if (BCryptHash(alg, NULL, 0, pubkey, size, hashdata, sizeof(hashdata)) != STATUS_SUCCESS) { - hr = E_OUTOFMEMORY; + hr = E_FAIL; goto done; } - if (!CryptGetHashParam(hash, HP_HASHVAL, hashdata, &size, 0)) - goto done; - + size = sizeof(hashdata); for (i = size - 1; i >= size - 8; i--) tokbytes[size - i - 1] = hashdata[i]; @@ -871,10 +859,7 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) hr = S_OK; done: - heap_free(hashdata); - CryptDestroyHash(hash); - CryptReleaseContext(crypt, 0); - + BCryptCloseAlgorithmProvider(alg, 0); return hr; } -- 2.20.1

1 0

[PATCH] server: Add new pipe servers to the end of the servers list.
by Huw Davies 27 Feb '19

27 Feb '19

This ensures instances created first will be connected to first. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41670 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/kernel32/tests/pipe.c | 38 ++++++++++++++++++++++++++++++++++++++ server/named_pipe.c | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 5bf27fac90..5dc6ace731 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3671,6 +3671,43 @@ static void test_namedpipe_session_id(void) CloseHandle(server); } +static void test_multiple_instances(void) +{ + HANDLE server[2], client; + int i; + BOOL ret; + OVERLAPPED ov; + + for (i = 0; i < ARRAY_SIZE(server); i++) + { + server[i] = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_READMODE_BYTE | PIPE_WAIT, 2, 1024, 1024, + NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(server[i] != INVALID_HANDLE_VALUE, "got invalid handle\n"); + } + + client = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(client != INVALID_HANDLE_VALUE, "got invalid handle\n"); + + /* Show that this has connected to server[0] not server[1] */ + + memset(&ov, 0, sizeof(ov)); + ret = ConnectNamedPipe(server[1], &ov); + ok(ret == FALSE, "got %d\n", ret); + ok(GetLastError() == ERROR_IO_PENDING, "got %d\n", GetLastError()); + + memset(&ov, 0, sizeof(ov)); + ret = ConnectNamedPipe(server[0], &ov); + ok(ret == FALSE, "got %d\n", ret); + ok(GetLastError() == ERROR_PIPE_CONNECTED, "got %d\n", GetLastError()); + + DisconnectNamedPipe(server[1]); + DisconnectNamedPipe(server[0]); + CloseHandle(client); + CloseHandle(server[1]); + CloseHandle(server[0]); +} + START_TEST(pipe) { char **argv; @@ -3736,4 +3773,5 @@ START_TEST(pipe) test_TransactNamedPipe(); test_namedpipe_process_id(); test_namedpipe_session_id(); + test_multiple_instances(); } diff --git a/server/named_pipe.c b/server/named_pipe.c index 101ff632b9..9e3303259f 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1162,7 +1162,7 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned server->pipe_end.server_pid = get_process_id( current->process ); init_async_queue( &server->listen_q ); - list_add_head( &pipe->servers, &server->entry ); + list_add_tail( &pipe->servers, &server->entry ); if (!(server->pipe_end.fd = alloc_pseudo_fd( &pipe_server_fd_ops, &server->pipe_end.obj, options ))) { release_object( server ); -- 2.18.0

3 4

How do I write code that targets Mac development using WINE
by mrt303xx＠aol.com 27 Feb '19

27 Feb '19

OK, I have some software that I want to run on a Mac, but if the software runs on the Mac, I'd like to code for Finder for example. I would change a few things visually with the UI Tarie

2 1

[PATCH 1/5] quartz/tests/avisplit: Clean up test_query_interface().
by Zebediah Figura 27 Feb '19

27 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/avisplit.c | 116 +++++++++++++---------------------- 1 file changed, 44 insertions(+), 72 deletions(-) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index be9ec18e94..2ad7e0f36f 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -1,5 +1,5 @@ /* - * Unit tests for the avi splitter functions + * AVI splitter filter unit tests * * Copyright (C) 2007 Google (Lei Zhang) * Copyright (C) 2008 Google (Maarten Lankhorst) @@ -20,62 +20,56 @@ */ #define COBJMACROS - -#include "wine/test.h" #include "dshow.h" -#include "tlhelp32.h" - -static IUnknown *pAviSplitter = NULL; +#include "wine/test.h" -static BOOL create_avisplitter(void) +static IBaseFilter *create_avi_splitter(void) { - HRESULT hr; - - hr = CoCreateInstance(&CLSID_AviSplitter, NULL, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (LPVOID*)&pAviSplitter); - return (hr == S_OK && pAviSplitter != NULL); + IBaseFilter *filter = NULL; + HRESULT hr = CoCreateInstance(&CLSID_AviSplitter, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return filter; } -static void release_avisplitter(void) +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { - HRESULT hr; - - Sleep(1000); - hr = IUnknown_Release(pAviSplitter); + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; - /* Looks like wine has a reference leak somewhere on test_threads tests, - * it passes in windows - */ - ok(hr == 0, "IUnknown_Release failed with %d\n", (INT)hr); + expected_hr = supported ? S_OK : E_NOINTERFACE; - while (hr > 0) - hr = IUnknown_Release(pAviSplitter); - pAviSplitter = NULL; + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); } -static void test_query_interface(void) +static void test_interfaces(void) { - HRESULT hr; - ULONG ref; - IUnknown *iface= NULL; - -#define TEST_INTERFACE(riid,expected) do { \ - hr = IUnknown_QueryInterface(pAviSplitter, &riid, (void**)&iface); \ - ok( hr == expected, #riid" should %s got %08X\n", expected==S_OK ? "exist" : "not be present", GetLastError() ); \ - if (hr == S_OK) { \ - ref = IUnknown_Release(iface); \ - ok(ref == 1, "Reference is %u, expected 1\n", ref); \ - } \ - iface = NULL; \ - } while(0) - - TEST_INTERFACE(IID_IBaseFilter,S_OK); - TEST_INTERFACE(IID_IMediaSeeking,E_NOINTERFACE); - TEST_INTERFACE(IID_IKsPropertySet,E_NOINTERFACE); - TEST_INTERFACE(IID_IMediaPosition,E_NOINTERFACE); - TEST_INTERFACE(IID_IQualityControl,E_NOINTERFACE); - TEST_INTERFACE(IID_IQualProp,E_NOINTERFACE); -#undef TEST_INTERFACE + IBaseFilter *filter = create_avi_splitter(); + + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + + check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IKsPropertySet, FALSE); + check_interface(filter, &IID_IMediaPosition, FALSE); + check_interface(filter, &IID_IMediaSeeking, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IQualityControl, FALSE); + check_interface(filter, &IID_IQualProp, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IVideoWindow, FALSE); + + IBaseFilter_Release(filter); } static void test_pin(IPin *pin) @@ -93,19 +87,11 @@ static void test_pin(IPin *pin) static void test_basefilter(void) { IEnumPins *pin_enum = NULL; - IBaseFilter *base = NULL; + IBaseFilter *base = create_avi_splitter(); IPin *pins[2]; ULONG ref; HRESULT hr; - IUnknown_QueryInterface(pAviSplitter, &IID_IBaseFilter, (void **)&base); - if (base == NULL) - { - /* test_query_interface handles this case */ - skip("No IBaseFilter\n"); - return; - } - hr = IBaseFilter_EnumPins(base, NULL); ok(hr == E_POINTER, "hr = %08x and not E_POINTER\n", hr); @@ -169,7 +155,7 @@ static WCHAR *load_resource(const WCHAR *name) static void test_filter_graph(void) { IFileSourceFilter *pfile = NULL; - IBaseFilter *preader = NULL, *pavi = NULL; + IBaseFilter *preader = NULL, *pavi = create_avi_splitter(); IEnumPins *enumpins = NULL; IPin *filepin = NULL, *avipin = NULL; HRESULT hr; @@ -202,7 +188,7 @@ static void test_filter_graph(void) return; } - hr = IUnknown_QueryInterface(pAviSplitter, &IID_IFileSourceFilter, + hr = IUnknown_QueryInterface(pavi, &IID_IFileSourceFilter, (void **)&pfile); ok(hr == E_NOINTERFACE, "Avi splitter returns unexpected error: %08x\n", hr); @@ -222,12 +208,6 @@ static void test_filter_graph(void) if (hr != S_OK) goto fail; - hr = IUnknown_QueryInterface(pAviSplitter, &IID_IBaseFilter, - (void**)&pavi); - ok(hr == S_OK, "Could not get base filter: %08x\n", hr); - if (hr != S_OK) - goto fail; - hr = IFileSourceFilter_Load(pfile, filename, NULL); if (hr != S_OK) { @@ -418,17 +398,9 @@ START_TEST(avisplit) { CoInitialize(NULL); - if (!create_avisplitter()) - { - skip("Could not create avisplitter\n"); - return; - } - - test_query_interface(); + test_interfaces(); test_basefilter(); test_filter_graph(); - release_avisplitter(); - CoUninitialize(); } -- 2.20.1

1 4

Re: TestBot job 48259 results: [PATCH] advapi32: Implement EnumDynamicTimeZoneInformation.
by Daniel Lehman 27 Feb '19

27 Feb '19

> === wxppro (32 bit report) === > > kernelbase: > time: Timeout this is an existing error

1 0

[PATCH] po: Update German translation.
by Isira Seneviratne 27 Feb '19

27 Feb '19

1 0

[PATCH v2] ntoskrnl.exe: Implement ExUuidCreate().
by Zhiyi Zhang 27 Feb '19

27 Feb '19

This is mostly a copy of UuidCreate() in rpcrt4 with NTSTATUS return code. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Include ntsecapi.h to avoid a compiler warning. Supersede 158874 dlls/ntoskrnl.exe/ntoskrnl.c | 33 +++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 2 ++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 010f9f735f..1e8aeb1d53 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -41,6 +41,7 @@ #include "dbt.h" #include "winreg.h" #include "setupapi.h" +#include "ntsecapi.h" #include "ddk/csq.h" #include "ddk/ntddk.h" #include "ddk/ntifs.h" @@ -4149,3 +4150,35 @@ static struct _OBJECT_TYPE token_type = }; POBJECT_TYPE SeTokenObjectType = &token_type; + +/************************************************************************* + * ExUuidCreate (NTOSKRNL.@) + * + * Creates a 128bit UUID. + * + * RETURNS + * + * STATUS_SUCCESS if successful. + * RPC_NT_UUID_LOCAL_ONLY if UUID is only locally unique. + * + * NOTES + * + * Follows RFC 4122, section 4.4 (Algorithms for Creating a UUID from + * Truly Random or Pseudo-Random Numbers) + */ +NTSTATUS WINAPI ExUuidCreate(UUID *uuid) +{ + RtlGenRandom(uuid, sizeof(*uuid)); + /* Clear the version bits and set the version (4) */ + uuid->Data3 &= 0x0fff; + uuid->Data3 |= (4 << 12); + /* Set the topmost bits of Data4 (clock_seq_hi_and_reserved) as + * specified in RFC 4122, section 4.4. + */ + uuid->Data4[0] &= 0x3f; + uuid->Data4[0] |= 0x80; + + TRACE("%s\n", debugstr_guid(uuid)); + + return STATUS_SUCCESS; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 4dcd553049..6ee6bc905e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -185,7 +185,7 @@ @ stub ExSystemExceptionFilter @ stdcall ExSystemTimeToLocalTime(ptr ptr) RtlSystemTimeToLocalTime @ stub ExUnregisterCallback -@ stub ExUuidCreate +@ stdcall ExUuidCreate(ptr) @ stub ExVerifySuite @ stub ExWindowStationObjectType @ stub Exi386InterlockedDecrementLong diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 452e510fdc..fb8cacc188 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -202,7 +202,9 @@ typedef NTSTATUS (WINAPI *PIO_QUERY_DEVICE_ROUTINE)(PVOID,PUNICODE_STRING,INTERF PKEY_VALUE_FULL_INFORMATION*,CONFIGURATION_TYPE,ULONG,PKEY_VALUE_FULL_INFORMATION*); typedef void (NTAPI EXPAND_STACK_CALLOUT)(void*); typedef EXPAND_STACK_CALLOUT *PEXPAND_STACK_CALLOUT; +typedef GUID UUID; +NTSTATUS WINAPI ExUuidCreate(UUID*); NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_TYPE,PULONG, PCONFIGURATION_TYPE,PULONG,PIO_QUERY_DEVICE_ROUTINE,PVOID); void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); -- 2.20.1

2 1

[PATCH 1/5] shell32/tests: Test behavior of SHCNRF_InterruptLevel flag.
by Nigel Baillie 27 Feb '19

27 Feb '19

On Windows, passing SHCNRF_InterruptLevel as a flag to SHChangeNotifyRegister results in shell notification messages being sent on filesystem changes, rather than on explicit SHChangeNotify calls. Wine doesn't currently implement this, resulting in some strange shell behavior when pasting or creating a new folder. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30752 Signed-off-by: Nigel Baillie <metreckk(a)gmail.com> --- dlls/shell32/tests/shlfolder.c | 158 +++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index beee31f2ca..d964d77ae4 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4978,6 +4978,163 @@ static void test_SHChangeNotify(BOOL test_new_delivery) ok(br == TRUE, "RemoveDirectory failed: %d\n", GetLastError()); } +static void test_SHCNRF_InterruptLevel() +{ + HWND wnd; + ULONG notifyID, i; + HRESULT hr; + HANDLE test_file_handle; + BOOL br, has_unicode; + SHChangeNotifyEntry entries[1]; + struct ChNotifyTest create_event = {"CREATE", 1, 1, SHCNE_CREATE, "C:\\shell32_cn_test.txt", ""}; + struct ChNotifyTest create_event2 = {"CREATE", 1, 1, SHCNE_CREATE, "C:\\shell32_cn_test_dir\\file.txt", ""}; + struct ChNotifyTest rename_event = {"RENAMEITEM", 1, 1, SHCNE_RENAMEITEM, "C:\\shell32_cn_test.txt", "C:\\shell32.txt"}; + struct ChNotifyTest delete_event = {"DELETE", 1, 1, SHCNE_DELETE, "C:\\shell32.txt", ""}; + const CHAR root_dirA[] = "C:\\"; + const WCHAR root_dirW[] = {'C',':','\\',0}; + const CHAR root_dir2A[] = "C:\\shell32_cn_test_dir"; + const WCHAR root_dir2W[] = {'C',':','\\','s','h','e','l','l','3','2','_','c','n','_','t','e','s','t','_','d','i','r',0}; + + trace("Testing SHChangeNotifyRegister with SHCNRF_InterruptLevel\n"); + + CreateDirectoryW(NULL, NULL); + has_unicode = !(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED); + + exp_data = &create_event; + test_new_delivery_flag = FALSE; + + /* create test window */ + wnd = CreateWindowExA(0, testwindow_class, testwindow_class, 0, + CW_USEDEFAULT, CW_USEDEFAULT, 130, 105, + NULL, NULL, GetModuleHandleA(NULL), 0); + ok(wnd != NULL, "Failed to make a window\n"); + + /* register for notifications on C:\ */ + entries[0].pidl = NULL; + if(has_unicode) + hr = SHILCreateFromPath(root_dirW, (LPITEMIDLIST*)&entries[0].pidl, 0); + else + hr = SHILCreateFromPath((const void *)root_dirA, (LPITEMIDLIST*)&entries[0].pidl, 0); + ok(hr == S_OK, "SHILCreateFromPath failed: 0x%08x\n", hr); + entries[0].fRecursive = TRUE; + + notifyID = SHChangeNotifyRegister( + wnd, SHCNRF_InterruptLevel, SHCNE_CREATE | SHCNE_RENAMEFOLDER | SHCNE_RENAMEITEM | SHCNE_DELETE, + WM_USER_NOTIFY, 1, entries); + ok(notifyID != 0, "Failed to register a window for change notifications\n"); + + /* create test file */ + trace("creating %s\n", create_event.path_1); + test_file_handle = CreateFileA(create_event.path_1, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(test_file_handle != INVALID_HANDLE_VALUE, "CreateFile failed: %d\n", GetLastError()); + + /* see if a notification gets sent or not */ + SleepEx(1000, FALSE); + do_events(); + ok(exp_data->missing_events < 1, "%s: Expected wndproc to be called\n", exp_data->id); + + /* rename test file */ + CloseHandle(test_file_handle); + exp_data = &rename_event; + trace("renaming %s to %s\n", rename_event.path_1, rename_event.path_2); + br = MoveFileA(rename_event.path_1, rename_event.path_2); + ok(br, "failed to rename %s to %s\n", rename_event.path_1, rename_event.path_2); + + /* see if a notification gets sent or not */ + SleepEx(1000, FALSE); + do_events(); + ok(exp_data->missing_events < 1, "%s: Expected wndproc to be called\n", exp_data->id); + + /* delete test file */ + exp_data = &delete_event; + trace("deleting %s\n", delete_event.path_1); + DeleteFileA(delete_event.path_1); + + /* see if a notification gets sent or not */ + SleepEx(1000, FALSE); + do_events(); + ok(exp_data->missing_events < 1, "%s: Expected wndproc to be called\n", exp_data->id); + + /* deregister */ + SHChangeNotifyDeregister(notifyID); + ILFree((LPITEMIDLIST)entries[0].pidl); + DeleteFileA(create_event.path_1); + + /* create and listen on filename (rather than directory/drive) */ + test_file_handle = CreateFileA(create_event.path_1, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(test_file_handle != INVALID_HANDLE_VALUE, "CreateFile failed: %d\n", GetLastError()); + + entries[0].pidl = ILCreateFromPathA(create_event.path_1); + ok(entries[0].pidl != NULL, "ILCreateFromPathA failed\n"); + entries[0].fRecursive = TRUE; + + notifyID = SHChangeNotifyRegister( + wnd, SHCNRF_InterruptLevel, SHCNE_RENAMEITEM, + WM_USER_NOTIFY, 1, entries); + ok(notifyID != 0, "Failed to register a window for change notifications\n"); + + /* rename the file again */ + CloseHandle(test_file_handle); + rename_event.missing_events = rename_event.notify_count; + exp_data = &rename_event; + trace("renaming %s to %s again\n", rename_event.path_1, rename_event.path_2); + br = MoveFileA(rename_event.path_1, rename_event.path_2); + ok(br, "failed to rename %s to %s\n", rename_event.path_1, rename_event.path_2); + + /* see if a notification gets sent or not */ + SleepEx(1000, FALSE); + do_events(); + ok(exp_data->missing_events < 1, "%s: Expected wndproc to be called\n", exp_data->id); + + /* deregister */ + SHChangeNotifyDeregister(notifyID); + ILFree((LPITEMIDLIST)entries[0].pidl); + DeleteFileA(rename_event.path_2); + + /* now, listen on a directory rather than a drive letter */ + trace("creating directory %s\n", root_dir2A); + if (has_unicode) + CreateDirectoryW(root_dir2W, NULL); + else + CreateDirectoryA(root_dir2A, NULL); + + entries[0].pidl = ILCreateFromPathA(root_dir2A); + ok(entries[0].pidl != NULL, "ILCreateFromPathA failed\n"); + entries[0].fRecursive = FALSE; + + notifyID = SHChangeNotifyRegister( + wnd, SHCNRF_InterruptLevel, SHCNE_CREATE, + WM_USER_NOTIFY, 1, entries); + ok(notifyID != 0, "Failed to register a window for change notifications\n"); + + /* create a file */ + exp_data = &create_event2; + trace("creating %s\n", create_event2.path_1); + test_file_handle = CreateFileA(create_event2.path_1, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(test_file_handle != INVALID_HANDLE_VALUE, "CreateFile failed: %d\n", GetLastError()); + + /* see if a notification gets sent or not */ + SleepEx(1000, FALSE); + do_events(); + ok(exp_data->missing_events < 1, "%s: Expected wndproc to be called\n", exp_data->id); + + /* delete test file */ + trace("deleting %s\n", create_event2.path_1); + DeleteFileA(create_event2.path_1); + + /* final cleanup */ + SHChangeNotifyDeregister(notifyID); + DestroyWindow(wnd); + ILFree((LPITEMIDLIST)entries[0].pidl); + RemoveDirectoryA(root_dir2A); +} + static void test_SHCreateDefaultContextMenu(void) { HKEY keys[16]; @@ -5334,6 +5491,7 @@ START_TEST(shlfolder) test_ShellItemCompare(); test_SHChangeNotify(FALSE); test_SHChangeNotify(TRUE); + test_SHCNRF_InterruptLevel(); test_ShellItemBindToHandler(); test_ShellItemGetAttributes(); test_ShellItemArrayGetAttributes(); -- 2.20.1

2 7

[PATCH] gdi.exe16: Remove an unused return variable (coccinelle)
by Michael Stefaniuc 26 Feb '19

26 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi.exe16/printdrv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/gdi.exe16/printdrv.c b/dlls/gdi.exe16/printdrv.c index bd7f053b66..2e1ace8e6c 100644 --- a/dlls/gdi.exe16/printdrv.c +++ b/dlls/gdi.exe16/printdrv.c @@ -518,9 +518,8 @@ INT16 WINAPI EndSpoolPage16(HPJOB16 hJob) */ DWORD WINAPI GetSpoolJob16(int nOption, LONG param) { - DWORD retval = 0; TRACE("In GetSpoolJob param 0x%x noption %d\n",param, nOption); - return retval; + return 0; } -- 2.20.1

1 0

[PATCH] crypt32: Remove an unused return variable (coccinelle)
by Michael Stefaniuc 26 Feb '19

26 Feb '19

returnvar.cocci from the Linux kernel. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/crypt32/oid.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 6dc894e60c..bf0ad3275a 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -190,7 +190,6 @@ static char *CRYPT_GetKeyName(DWORD dwEncodingType, LPCSTR pszFuncName, BOOL WINAPI CryptGetDefaultOIDDllList(HCRYPTOIDFUNCSET hFuncSet, DWORD dwEncodingType, LPWSTR pwszDllList, DWORD *pcchDllList) { - BOOL ret = TRUE; struct OIDFunctionSet *set = hFuncSet; char *keyName; HKEY key; @@ -228,7 +227,7 @@ BOOL WINAPI CryptGetDefaultOIDDllList(HCRYPTOIDFUNCSET hFuncSet, } CryptMemFree(keyName); - return ret; + return TRUE; } BOOL WINAPI CryptInstallOIDFunctionAddress(HMODULE hModule, -- 2.20.1

1 0

[PATCH 1/5] d3dtypes: Add D3D9 DF16/24 format typedefs
by Daniel Ansorregui 26 Feb '19

26 Feb '19

Signed-off-by: Daniel Ansorregui <mailszeros(a)gmail.com> --- include/d3d9types.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/d3d9types.h b/include/d3d9types.h index 4891858b3d..2e5648a8f6 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -827,6 +827,8 @@ typedef enum _D3DFORMAT { D3DFMT_MULTI2_ARGB8 = MAKEFOURCC('M', 'E', 'T', '1'), D3DFMT_G8R8_G8B8 = MAKEFOURCC('G', 'R', 'G', 'B'), D3DFMT_R8G8_B8G8 = MAKEFOURCC('R', 'G', 'B', 'G'), + D3DFMT_DF16 = MAKEFOURCC('D', 'F', '1', '6'), + D3DFMT_DF24 = MAKEFOURCC('D', 'F', '2', '4'), D3DFMT_D16_LOCKABLE = 70, D3DFMT_D32 = 71, -- 2.17.1

6 76

[PATCH] user32: Disallow setting some of window values with mismatching size.
by Nikolay Sivov 26 Feb '19

26 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46712 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/win.c | 71 +++++++++++++++++++++++++++++++++++++++++ dlls/user32/win.c | 38 +++++++++++++++++++++- 2 files changed, 108 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 3444abaf96..4fb9cc1a0c 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6330,6 +6330,75 @@ static int check_error(DWORD actual, DWORD expected) return (!sets_last_error && (actual == 0xdeadbeef)) || (actual == expected); } +static void test_set_window_long_size(void) +{ +#ifdef _WIN64 + WNDPROC old_window_procW, old_window_proc2W; + LONG_PTR retval; + HWND hwnd; + LONG ret; + + /* It's not allowed to set or get 64-bit pointer values using 32-bit functions. */ + hwnd = CreateWindowExA(0, "MainWindowClass", "Child window", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_CHILD | + WS_MAXIMIZEBOX | WS_VISIBLE, 100, 100, 200, 200, hwndMain, 0, GetModuleHandleA(NULL), NULL); + ok(hwnd != NULL, "Failed to create test window.\n"); + + /* GWLP_WNDPROC */ + SetLastError(0xdeadbeef); + old_window_procW = (WNDPROC)(LONG_PTR)GetWindowLongA(hwnd, GWLP_WNDPROC); + ok(!old_window_procW && GetLastError() == ERROR_INVALID_INDEX, "Unexpected window proc.\n"); + + old_window_procW = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_WNDPROC); + ok(!!old_window_procW, "Unexpected window proc.\n"); + + SetLastError(0xdeadbeef); + old_window_proc2W = (WNDPROC)(LONG_PTR)SetWindowLongA(hwnd, GWLP_WNDPROC, 0xdeadbeef); + ok(!old_window_proc2W && GetLastError() == ERROR_INVALID_INDEX, "Unexpected window proc.\n"); + + old_window_proc2W = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_WNDPROC); + ok(old_window_proc2W == old_window_procW, "Unexpected window proc.\n"); + + /* GWLP_USERDATA */ + SetWindowLongPtrA(hwnd, GWLP_USERDATA, ((LONG_PTR)1 << 32) | 123); + ret = GetWindowLongA(hwnd, GWLP_USERDATA); + ok(ret == 123, "Unexpected user data %#x.\n", ret); + retval = GetWindowLongPtrA(hwnd, GWLP_USERDATA); + ok(retval > 123, "Unexpected user data.\n"); + + /* GWLP_ID */ + ret = SetWindowLongA(hwnd, GWLP_ID, 1); + ok(!ret, "Unexpected id %#x.\n", ret); + + ret = GetWindowLongA(hwnd, GWLP_ID); + ok(ret == 1, "Unexpected id %#x.\n", ret); + + SetWindowLongPtrA(hwnd, GWLP_ID, ((LONG_PTR)1 << 32) | 123); + ret = GetWindowLongA(hwnd, GWLP_ID); + ok(ret == 123, "Unexpected user data %#x.\n", ret); + retval = GetWindowLongPtrA(hwnd, GWLP_ID); + ok(retval > 123, "Unexpected user data.\n"); + + /* GWLP_HINSTANCE */ + retval = GetWindowLongPtrA(hwnd, GWLP_HINSTANCE); + ok(retval == (LONG_PTR)GetModuleHandleA(NULL), "Unexpected instance %#lx.\n", retval); + + SetLastError(0xdeadbeef); + ret = GetWindowLongA(hwnd, GWLP_HINSTANCE); + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret); + + SetLastError(0xdeadbeef); + ret = SetWindowLongA(hwnd, GWLP_HINSTANCE, 1); + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret); + + /* GWLP_HWNDPARENT */ + SetLastError(0xdeadbeef); + ret = GetWindowLongA(hwnd, GWLP_HWNDPARENT); + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#x.\n", ret); + + DestroyWindow(hwnd); +#endif +} + static void test_SetWindowLong(void) { LONG_PTR retval; @@ -6371,6 +6440,8 @@ static void test_SetWindowLong(void) /* set it back to ANSI */ SetWindowLongPtrA(hwndMain, GWLP_WNDPROC, 0); } + + test_set_window_long_size(); } static LRESULT WINAPI check_style_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 24b2a2ffd5..d08fa67b11 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2299,6 +2299,20 @@ UINT WINAPI GetDpiForWindow( HWND hwnd ) return ret; } +static BOOL is_valid_window_value_size(INT offset, UINT size) +{ + switch (offset) + { +#ifdef _WIN64 + case GWLP_HWNDPARENT: + case GWLP_WNDPROC: + case GWLP_HINSTANCE: + return size == sizeof(LONG_PTR); +#endif + default: + return TRUE; + } +} /********************************************************************** * WIN_GetWindowLong @@ -2312,7 +2326,15 @@ static LONG_PTR WIN_GetWindowLong( HWND hwnd, INT offset, UINT size, BOOL unicod if (offset == GWLP_HWNDPARENT) { - HWND parent = GetAncestor( hwnd, GA_PARENT ); + HWND parent; + + if (!is_valid_window_value_size( offset, size )) + { + SetLastError( ERROR_INVALID_INDEX ); + return 0; + } + + parent = GetAncestor( hwnd, GA_PARENT ); if (parent == GetDesktopWindow()) parent = GetWindow( hwnd, GW_OWNER ); return (ULONG_PTR)parent; } @@ -2398,6 +2420,13 @@ static LONG_PTR WIN_GetWindowLong( HWND hwnd, INT offset, UINT size, BOOL unicod return retvalue; } + if (!is_valid_window_value_size( offset, size )) + { + SetLastError( ERROR_INVALID_INDEX ); + WIN_ReleasePtr( wndPtr ); + return 0; + } + switch(offset) { case GWLP_USERDATA: retvalue = wndPtr->userdata; break; @@ -2474,6 +2503,13 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B return SendMessageW( hwnd, WM_WINE_SETWINDOWLONG, MAKEWPARAM( offset, size ), newval ); } + if (!is_valid_window_value_size( offset, size )) + { + SetLastError( ERROR_INVALID_INDEX ); + WIN_ReleasePtr( wndPtr ); + return 0; + } + /* first some special cases */ switch( offset ) { -- 2.20.1

3 2

[PATCH 4/4] wined3d: Add a setting to turn off aggressive optimization on NVIDIA.
by Henri Verbeet 26 Feb '19

26 Feb '19

From: Paul Gofman <gofmanp(a)gmail.com> NVIDIA drivers perform too aggressive optimization involving change of computation order (aka 'fastmath') by default. The setting helps to workaround bugs like https://bugs.winehq.org/show_bug.cgi?id=35207. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 3 +++ dlls/wined3d/wined3d_main.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 660005f57e9..4613d78f94c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2416,6 +2416,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont unsigned int i; DWORD map; + if (wined3d_settings.strict_shader_math) + shader_addline(buffer, "#pragma optionNV(fastmath off)\n"); + prefix = shader_glsl_get_prefix(version->type); /* Prototype the subroutines */ diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 1b64d2cf5dc..fb70b946770 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -82,6 +82,7 @@ struct wined3d_settings wined3d_settings = TRUE, /* Prefer multisample textures to multisample renderbuffers. */ ~0u, /* Don't force a specific sample count by default. */ FALSE, /* Don't range check relative addressing indices in float constants. */ + FALSE, /* No strict shader math by default. */ ~0U, /* No VS shader model limit by default. */ ~0U, /* No HS shader model limit by default. */ ~0U, /* No DS shader model limit by default. */ @@ -312,6 +313,8 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) TRACE("Checking relative addressing indices in float constants.\n"); wined3d_settings.check_float_constants = TRUE; } + if (!get_config_key_dword(hkey, appkey, "strict_shader_math", &wined3d_settings.strict_shader_math)) + ERR_(winediag)("Setting strict shader math to %#x.\n", wined3d_settings.strict_shader_math); if (!get_config_key_dword(hkey, appkey, "MaxShaderModelVS", &wined3d_settings.max_sm_vs)) TRACE("Limiting VS shader model to %u.\n", wined3d_settings.max_sm_vs); if (!get_config_key_dword(hkey, appkey, "MaxShaderModelHS", &wined3d_settings.max_sm_hs)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b3f3847045d..f2b9b5feb25 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -398,6 +398,7 @@ struct wined3d_settings unsigned int multisample_textures; unsigned int sample_count; BOOL check_float_constants; + unsigned int strict_shader_math; unsigned int max_sm_vs; unsigned int max_sm_hs; unsigned int max_sm_ds; -- 2.11.0

2 1

[PATCH 3/4] d3d10: Avoid calling D3D10CreateDevice() from D3D10CreateDeviceAndSwapChain().
by Henri Verbeet 26 Feb '19

26 Feb '19

From: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Signed-off-by: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10/d3d10_main.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 4d3ed1244ed..bc90ff1df7b 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); -HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, +static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, UINT sdk_version, ID3D10Device **device) { IDXGIFactory *factory; @@ -139,6 +139,12 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver return hr; } +HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, + HMODULE swrast, UINT flags, UINT sdk_version, ID3D10Device **device) +{ + return d3d10_create_device(adapter, driver_type, swrast, flags, sdk_version, device); +} + HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, UINT sdk_version, DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain **swapchain, ID3D10Device **device) @@ -152,8 +158,9 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER adapter, debug_d3d10_driver_type(driver_type), swrast, flags, sdk_version, swapchain_desc, swapchain, device); - hr = D3D10CreateDevice(adapter, driver_type, swrast, flags, sdk_version, device); - if (FAILED(hr)) + /* Avoid forwarding to D3D10CreateDevice(), since it breaks applications + * hooking these entry-points. */ + if (FAILED(hr = d3d10_create_device(adapter, driver_type, swrast, flags, sdk_version, device))) { WARN("Failed to create a device, returning %#x\n", hr); *device = NULL; -- 2.11.0

2 1

[PATCH 1/6] wined3d: Rename MAX_ACTIVE_LIGHTS to WINED3D_MAX_ACTIVE_LIGHTS.
by Zebediah Figura 26 Feb '19

26 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/glsl_shader.c | 12 ++++++------ dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2e87e5ff85..1a24a662e8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -181,7 +181,7 @@ struct glsl_vs_program GLint q_att; GLint cos_htheta; GLint cos_hphi; - } light_location[MAX_ACTIVE_LIGHTS]; + } light_location[WINED3D_MAX_ACTIVE_LIGHTS]; GLint pointsize_location; GLint pointsize_min_location; GLint pointsize_max_location; @@ -1892,7 +1892,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context DWORD directional_count = 0; DWORD parallel_point_count = 0; - for (i = 0; i < MAX_ACTIVE_LIGHTS; ++i) + for (i = 0; i < WINED3D_MAX_ACTIVE_LIGHTS; ++i) { if (!state->light_state.lights[i]) continue; @@ -1922,7 +1922,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context parallel_point_idx = directional_idx + directional_count; shader_glsl_ffp_vertex_lightambient_uniform(context, state, prog); - for (i = 0; i < MAX_ACTIVE_LIGHTS; ++i) + for (i = 0; i < WINED3D_MAX_ACTIVE_LIGHTS; ++i) { const struct wined3d_light_info *light_info = state->light_state.lights[i]; unsigned int idx; @@ -9185,7 +9185,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr shader_addline(buffer, " float q_att;\n"); shader_addline(buffer, " float cos_htheta;\n"); shader_addline(buffer, " float cos_hphi;\n"); - shader_addline(buffer, "} ffp_light[%u];\n", MAX_ACTIVE_LIGHTS); + shader_addline(buffer, "} ffp_light[%u];\n", WINED3D_MAX_ACTIVE_LIGHTS); if (settings->point_size) { @@ -10132,7 +10132,7 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info * vs->material_emissive_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.emissive")); vs->material_shininess_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.shininess")); vs->light_ambient_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_light_ambient")); - for (i = 0; i < MAX_ACTIVE_LIGHTS; ++i) + for (i = 0; i < WINED3D_MAX_ACTIVE_LIGHTS; ++i) { string_buffer_sprintf(name, "ffp_light[%u].diffuse", i); vs->light_location[i].diffuse = GL_EXTCALL(glGetUniformLocation(program_id, name->buffer)); @@ -11661,7 +11661,7 @@ static void glsl_vertex_pipe_vp_get_caps(const struct wined3d_gl_info *gl_info, caps->xyzrhw = TRUE; caps->emulated_flatshading = !needs_legacy_glsl_syntax(gl_info); caps->ffp_generic_attributes = TRUE; - caps->max_active_lights = MAX_ACTIVE_LIGHTS; + caps->max_active_lights = WINED3D_MAX_ACTIVE_LIGHTS; caps->max_vertex_blend_matrices = MAX_VERTEX_BLENDS; caps->max_vertex_blend_matrix_index = 0; caps->vertex_processing_caps = WINED3DVTXPCAPS_TEXGEN diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 0194917148..50b7135fb4 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -579,7 +579,7 @@ void state_cleanup(struct wined3d_state *state) if (!(state->flags & WINED3D_STATE_NO_REF)) state_unbind_resources(state); - for (counter = 0; counter < MAX_ACTIVE_LIGHTS; ++counter) + for (counter = 0; counter < WINED3D_MAX_ACTIVE_LIGHTS; ++counter) { state->light_state.lights[counter] = NULL; } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index dd452409b8..062f8662aa 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6279,7 +6279,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, if (d3d_info->limits.varying_count >= wined3d_max_compat_varyings(gl_info)) settings->texcoords = (1u << WINED3D_MAX_TEXTURES) - 1; - for (i = 0; i < MAX_ACTIVE_LIGHTS; ++i) + for (i = 0; i < WINED3D_MAX_ACTIVE_LIGHTS; ++i) { if (!state->light_state.lights[i]) continue; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5606a11c81..2fbcf1a522 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -263,7 +263,7 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup #define WINED3D_MAX_FRAGMENT_SAMPLERS 16 #define WINED3D_MAX_VERTEX_SAMPLERS 4 #define WINED3D_MAX_COMBINED_SAMPLERS (WINED3D_MAX_FRAGMENT_SAMPLERS + WINED3D_MAX_VERTEX_SAMPLERS) -#define MAX_ACTIVE_LIGHTS 8 +#define WINED3D_MAX_ACTIVE_LIGHTS 8 #define MAX_CLIP_DISTANCES 8 #define MAX_CONSTANT_BUFFERS 15 #define MAX_SAMPLER_OBJECTS 16 @@ -1615,9 +1615,9 @@ enum wined3d_pipeline #define STATE_LIGHT_TYPE (STATE_VIEWPORT + 1) #define STATE_IS_LIGHT_TYPE(a) ((a) == STATE_LIGHT_TYPE) #define STATE_ACTIVELIGHT(a) (STATE_LIGHT_TYPE + 1 + (a)) -#define STATE_IS_ACTIVELIGHT(a) ((a) >= STATE_ACTIVELIGHT(0) && (a) < STATE_ACTIVELIGHT(MAX_ACTIVE_LIGHTS)) +#define STATE_IS_ACTIVELIGHT(a) ((a) >= STATE_ACTIVELIGHT(0) && (a) < STATE_ACTIVELIGHT(WINED3D_MAX_ACTIVE_LIGHTS)) -#define STATE_SCISSORRECT (STATE_ACTIVELIGHT(MAX_ACTIVE_LIGHTS - 1) + 1) +#define STATE_SCISSORRECT (STATE_ACTIVELIGHT(WINED3D_MAX_ACTIVE_LIGHTS - 1) + 1) #define STATE_IS_SCISSORRECT(a) ((a) == STATE_SCISSORRECT) #define STATE_CLIPPLANE(a) (STATE_SCISSORRECT + 1 + (a)) @@ -2898,7 +2898,7 @@ struct wined3d_light_state { /* Light hashmap. Collisions are handled using linked lists. */ struct list light_map[LIGHTMAP_SIZE]; - const struct wined3d_light_info *lights[MAX_ACTIVE_LIGHTS]; + const struct wined3d_light_info *lights[WINED3D_MAX_ACTIVE_LIGHTS]; }; #define WINED3D_STATE_NO_REF 0x00000001 -- 2.20.1

5 22

[PATCH 2/4] d3d10_1: Avoid calling D3D10CreateDevice1() from D3D10CreateDeviceAndSwapChain1().
by Henri Verbeet 26 Feb '19

26 Feb '19

From: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Signed-off-by: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10_1/d3d10_1_main.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10_1/d3d10_1_main.c b/dlls/d3d10_1/d3d10_1_main.c index e9fad3ed093..8ee5aa71f79 100644 --- a/dlls/d3d10_1/d3d10_1_main.c +++ b/dlls/d3d10_1/d3d10_1_main.c @@ -63,7 +63,7 @@ static const char *debug_d3d10_feature_level(D3D10_FEATURE_LEVEL1 feature_level) #undef WINE_D3D10_TO_STR -HRESULT WINAPI D3D10CreateDevice1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, +static HRESULT d3d10_create_device1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, D3D10_FEATURE_LEVEL1 hw_level, UINT sdk_version, ID3D10Device1 **device) { IDXGIFactory *factory; @@ -175,6 +175,12 @@ HRESULT WINAPI D3D10CreateDevice1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE drive return hr; } +HRESULT WINAPI D3D10CreateDevice1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, + UINT flags, D3D10_FEATURE_LEVEL1 hw_level, UINT sdk_version, ID3D10Device1 **device) +{ + return d3d10_create_device1(adapter, driver_type, swrast, flags, hw_level, sdk_version, device); +} + HRESULT WINAPI D3D10CreateDeviceAndSwapChain1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, D3D10_FEATURE_LEVEL1 feature_level, UINT sdk_version, DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain **swapchain, ID3D10Device1 **device) @@ -194,7 +200,9 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain1(IDXGIAdapter *adapter, D3D10_DRIVE if (!device) return E_INVALIDARG; - if (FAILED(hr = D3D10CreateDevice1(adapter, driver_type, swrast, flags, feature_level, sdk_version, device))) + /* Avoid forwarding to D3D10CreateDevice1(), since it breaks applications + * hooking these entry-points. */ + if (FAILED(hr = d3d10_create_device1(adapter, driver_type, swrast, flags, feature_level, sdk_version, device))) { WARN("Failed to create a device, returning %#x.\n", hr); *device = NULL; -- 2.11.0

2 1

[PATCH 1/4] d3d11: Avoid calling D3D11CreateDevice() from D3D11CreateDeviceAndSwapChain().
by Henri Verbeet 26 Feb '19

26 Feb '19

From: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Signed-off-by: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/d3d11_main.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index 9c89820f6f5..b0a32aceda7 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -136,7 +136,7 @@ HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte return S_OK; } -HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, +static HRESULT d3d11_create_device(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context) { @@ -278,6 +278,14 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t return (device_out || immediate_context) ? S_OK : S_FALSE; } +HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, + const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, + D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context) +{ + return d3d11_create_device(adapter, driver_type, swrast, flags, feature_levels, + levels, sdk_version, device_out, obtained_feature_level, immediate_context); +} + HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, const DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain **swapchain, @@ -299,8 +307,10 @@ HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_T if (device_out) *device_out = NULL; - if (FAILED(hr = D3D11CreateDevice(adapter, driver_type, swrast, flags, feature_levels, levels, sdk_version, - &device, obtained_feature_level, immediate_context))) + /* Avoid forwarding to D3D11CreateDevice(), since it breaks applications + * hooking these entry-points. */ + if (FAILED(hr = d3d11_create_device(adapter, driver_type, swrast, flags, feature_levels, + levels, sdk_version, &device, obtained_feature_level, immediate_context))) { WARN("Failed to create a device, returning %#x.\n", hr); return hr; -- 2.11.0

2 1

[PATCH v2 1/5] d3d9: Don't upload unused system memory vertex buffers.
by Matteo Bruni 26 Feb '19

26 Feb '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Add a couple of comments. dlls/d3d9/d3d9_private.h | 2 ++ dlls/d3d9/device.c | 26 ++++++++++++++++++++++++-- dlls/d3d9/tests/visual.c | 23 +++++++++++++++++++++++ dlls/d3d9/vertexdeclaration.c | 2 +- 4 files changed, 50 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 3fe0376e5c1..50b18b1ed36 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -256,6 +256,8 @@ struct d3d9_vertex_declaration IDirect3DDevice9Ex *parent_device; }; +HRESULT convert_to_wined3d_declaration(const D3DVERTEXELEMENT9 *d3d9_elements, + struct wined3d_vertex_element **wined3d_elements, UINT *element_count) DECLSPEC_HIDDEN; HRESULT d3d9_vertex_declaration_create(struct d3d9_device *device, const D3DVERTEXELEMENT9 *elements, struct d3d9_vertex_declaration **declaration) DECLSPEC_HIDDEN; struct d3d9_vertex_declaration *unsafe_impl_from_IDirect3DVertexDeclaration9( diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 6cc3f180b09..ef73adcc789 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2730,23 +2730,45 @@ static void d3d9_generate_auto_mipmaps(struct d3d9_device *device) static void d3d9_device_upload_sysmem_vertex_buffers(struct d3d9_device *device, int base_vertex, unsigned int start_vertex, unsigned int vertex_count) { + struct wined3d_vertex_declaration *wined3d_decl; struct wined3d_box box = {0, 0, 0, 1, 0, 1}; + unsigned int i, offset, stride, map, count; + struct wined3d_vertex_element *elements; struct d3d9_vertexbuffer *d3d9_buffer; struct wined3d_resource *dst_resource; - unsigned int i, offset, stride, map; + struct d3d9_vertex_declaration *decl; struct wined3d_buffer *dst_buffer; struct wined3d_resource_desc desc; HRESULT hr; if (!device->sysmem_vb) return; + wined3d_decl = wined3d_device_get_vertex_declaration(device->wined3d_device); + if (!wined3d_decl) + return; if (base_vertex >= 0 || start_vertex >= -base_vertex) start_vertex += base_vertex; else FIXME("System memory vertex data offset is negative.\n"); - map = device->sysmem_vb; + /* Make sure to only upload buffers that are used by the current draw: + * released buffers might still be bound as stream sources. */ + decl = wined3d_vertex_declaration_get_parent(wined3d_decl); + if (!decl->elements) + { + map = 1; + } + else + { + map = 0; + if (FAILED(convert_to_wined3d_declaration(decl->elements, &elements, &count))) + return; + for (i = 0; i < count; ++i) + map |= 1u << elements[i].input_slot; + heap_free(elements); + } + map &= device->sysmem_vb; while (map) { i = wined3d_bit_scan(&map); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 52d67c81991..0e572984784 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -24713,6 +24713,29 @@ static void test_sysmem_draw(void) colour = getPixelColor(device, 320, 240); ok(color_match(colour, 0x00443322, 1), "Got unexpected colour 0x%08x.\n", colour); + /* Test that releasing but not unbinding a vertex buffer doesn't break. */ + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, sizeof(*quad)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetIndices(device, ib); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3DVertexBuffer9_Release(vb_s1); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x77777777, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 0, 4, 0, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, 0x00007f7f, 1), "Got unexpected colour 0x%08x.\n", colour); + hr = IDirect3DDevice9_CreateTexture(device, 2, 2, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &texture, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); memset(&lr, 0, sizeof(lr)); diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index b6445255238..5f07207a482 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -320,7 +320,7 @@ static const struct wined3d_parent_ops d3d9_vertexdeclaration_wined3d_parent_ops d3d9_vertexdeclaration_wined3d_object_destroyed, }; -static HRESULT convert_to_wined3d_declaration(const D3DVERTEXELEMENT9 *d3d9_elements, +HRESULT convert_to_wined3d_declaration(const D3DVERTEXELEMENT9 *d3d9_elements, struct wined3d_vertex_element **wined3d_elements, UINT *element_count) { const D3DVERTEXELEMENT9* element; -- 2.19.2

5 15

[PATCH 1/3] Mark certain internal functions, such as
by Timothy Pearson 26 Feb '19

26 Feb '19

wine_server_call(), as potentially crossing DLL module boundaries This is needed to allow some systems, such as ppc64, to update module-specific registers (TOC) Signed-off-by: Timothy Pearson <tpearson(a)raptorengineering.com> --- dlls/shell32/shell32_main.c | 2 +- include/windef.h | 7 +++++++ include/wine/library.h | 18 +++++++++--------- include/wine/server.h | 2 +- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index a791966031..71ebe218fb 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -810,7 +810,7 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, { ABOUT_INFO *info = (ABOUT_INFO *)lParam; WCHAR template[512], buffer[512], version[64]; - extern const char *wine_get_build_id(void); + extern FARCALL const char *wine_get_build_id(void); if (info) { diff --git a/include/windef.h b/include/windef.h index f9a570d9cd..ea9f32b5a0 100644 --- a/include/windef.h +++ b/include/windef.h @@ -50,6 +50,13 @@ extern "C" { # endif #endif +#if defined(__powerpc64__) && defined (__GNUC__) + /* ppc64 relies on long calls being generated for calls crossing DLL boundaries (r2 save / restore) */ +# define FARCALL __attribute__((__longcall__)) +#else +# define FARCALL +#endif + #ifndef __stdcall # ifdef __i386__ # ifdef __GNUC__ diff --git a/include/wine/library.h b/include/wine/library.h index 242bb69f17..3c09d89ac9 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -37,15 +37,15 @@ extern "C" { /* configuration */ -extern const char *wine_get_build_dir(void); -extern const char *wine_get_config_dir(void); -extern const char *wine_get_data_dir(void); -extern const char *wine_get_server_dir(void); -extern const char *wine_get_user_name(void); -extern const char *wine_get_version(void); -extern const char *wine_get_build_id(void); -extern void wine_init_argv0_path( const char *argv0 ); -extern void wine_exec_wine_binary( const char *name, char **argv, const char *env_var ); +extern FARCALL const char *wine_get_build_dir(void); +extern FARCALL const char *wine_get_config_dir(void); +extern FARCALL const char *wine_get_data_dir(void); +extern FARCALL const char *wine_get_server_dir(void); +extern FARCALL const char *wine_get_user_name(void); +extern FARCALL const char *wine_get_version(void); +extern FARCALL const char *wine_get_build_id(void); +extern FARCALL void wine_init_argv0_path( const char *argv0 ); +extern FARCALL void wine_exec_wine_binary( const char *name, char **argv, const char *env_var ); /* dll loading */ diff --git a/include/wine/server.h b/include/wine/server.h index d573d1f7ad..509f958a0d 100644 --- a/include/wine/server.h +++ b/include/wine/server.h @@ -49,7 +49,7 @@ struct __server_request_info struct __server_iovec data[__SERVER_MAX_DATA]; /* request variable size data */ }; -extern unsigned int wine_server_call( void *req_ptr ); +extern unsigned int FARCALL wine_server_call( void *req_ptr ); extern void CDECL wine_server_send_fd( int fd ); extern int CDECL wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, HANDLE *handle ); extern int CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, unsigned int *options ); -- 2.20.1

2 1

[PATCH] wined3d: Add a setting to turn off aggressive optimization on NVIDIA.
by Paul Gofman 26 Feb '19

26 Feb '19

NVIDIA drivers perform too aggressive optimization involving change of computation order (aka 'fastmath') by default. The setting helps to workaround bugs like https://bugs.winehq.org/show_bug.cgi?id=35207. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/wined3d/adapter_gl.c | 17 +++++++++++++++++ dlls/wined3d/glsl_shader.c | 3 +++ dlls/wined3d/wined3d_main.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 30 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 751e1672e2..ae1680605a 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -832,6 +832,13 @@ static BOOL match_broken_viewport_subpixel_bits(const struct wined3d_gl_info *gl return !wined3d_caps_gl_ctx_test_viewport_subpixel_bits(ctx); } +static BOOL match_disable_nvidia_fastmath(const struct wined3d_gl_info *gl_info, + struct wined3d_caps_gl_ctx *ctx, const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, + enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) +{ + return wined3d_settings.disable_nvidia_fastmath && gl_vendor == GL_VENDOR_NVIDIA; +} + static void quirk_apple_glsl_constants(struct wined3d_gl_info *gl_info) { /* MacOS needs uniforms for relative addressing offsets. This can @@ -986,6 +993,11 @@ static void quirk_broken_viewport_subpixel_bits(struct wined3d_gl_info *gl_info) } } +static void quirk_disable_nvidia_fastmath(struct wined3d_gl_info *gl_info) +{ + gl_info->quirks |= WINED3D_QUIRK_DISABLE_NVIDIA_FASTMATH; +} + static const struct wined3d_gpu_description *query_gpu_description(const struct wined3d_gl_info *gl_info, UINT64 *vram_bytes) { @@ -1130,6 +1142,11 @@ static void fixup_extensions(struct wined3d_gl_info *gl_info, struct wined3d_cap quirk_broken_viewport_subpixel_bits, "NVIDIA viewport subpixel bits bug" }, + { + match_disable_nvidia_fastmath, + quirk_disable_nvidia_fastmath, + "Disabling fastmath optimization on NVIDIA." + }, }; for (i = 0; i < ARRAY_SIZE(quirk_table); ++i) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2f65b75084..8a042a82d4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2916,6 +2916,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shader_addline(buffer, ";\n"); } } + + if (gl_info->quirks & WINED3D_QUIRK_DISABLE_NVIDIA_FASTMATH) + shader_addline(buffer, "#pragma optionNV(fastmath off)\n"); } /* Prototypes */ diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index feab178e24..b9db439d59 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -83,6 +83,7 @@ struct wined3d_settings wined3d_settings = TRUE, /* Prefer multisample textures to multisample renderbuffers. */ ~0u, /* Don't force a specific sample count by default. */ FALSE, /* Don't range check relative addressing indices in float constants. */ + FALSE, /* Do not disable fastmath optimization on NVIDIA. */ ~0U, /* No VS shader model limit by default. */ ~0U, /* No HS shader model limit by default. */ ~0U, /* No DS shader model limit by default. */ @@ -297,6 +298,13 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) TRACE("Checking relative addressing indices in float constants.\n"); wined3d_settings.check_float_constants = TRUE; } + if (!get_config_key(hkey, appkey, "DisableNVIDIAFastmath", buffer, size) + && !strcmp(buffer, "enabled")) + { + TRACE("Disabling fastmath optimization on NVIDIA.\n"); + wined3d_settings.disable_nvidia_fastmath = TRUE; + } + if (!get_config_key_dword(hkey, appkey, "MaxShaderModelVS", &wined3d_settings.max_sm_vs)) TRACE("Limiting VS shader model to %u.\n", wined3d_settings.max_sm_vs); if (!get_config_key_dword(hkey, appkey, "MaxShaderModelHS", &wined3d_settings.max_sm_hs)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a6bfd132f4..76b31f61e4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -71,6 +71,7 @@ #define WINED3D_QUIRK_INFO_LOG_SPAM 0x00000080 #define WINED3D_QUIRK_LIMITED_TEX_FILTERING 0x00000100 #define WINED3D_QUIRK_BROKEN_ARB_FOG 0x00000200 +#define WINED3D_QUIRK_DISABLE_NVIDIA_FASTMATH 0x00000400 struct fragment_pipeline; struct wined3d_context; @@ -396,6 +397,7 @@ struct wined3d_settings unsigned int multisample_textures; unsigned int sample_count; BOOL check_float_constants; + BOOL disable_nvidia_fastmath; unsigned int max_sm_vs; unsigned int max_sm_hs; unsigned int max_sm_ds; -- 2.20.1

2 2

[PATCH 1/9] ntoskrnl.exe/tests: Add object reference tests.
by Jacek Caban 26 Feb '19

26 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 6 +- dlls/ntoskrnl.exe/tests/driver.c | 139 +++++++++++++++++++++++++++- 2 files changed, 140 insertions(+), 5 deletions(-)

3 6

[PATCH vkd3d 6/8] vkd3d-shader: Introduce is_control_point_phase() helper.
by Józef Kucia 26 Feb '19

26 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 34e274fa41ec..de4c683ee8ae 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1997,6 +1997,11 @@ struct vkd3d_dxbc_compiler size_t shader_phases_size; }; +static bool is_control_point_phase(const struct vkd3d_shader_phase *phase) +{ + return phase && phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE; +} + static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_compiler *compiler); struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, @@ -3912,8 +3917,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler shader_signature = is_patch_constant ? compiler->patch_constant_signature : compiler->output_signature; - array_size = phase && phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE - ? compiler->output_control_point_count : 0; + array_size = is_control_point_phase(phase) ? compiler->output_control_point_count : 0; if (!(signature_element = vkd3d_find_signature_element_for_reg(shader_signature, &signature_idx, reg->idx[0].offset, dst->write_mask))) @@ -3993,7 +3997,6 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler storage_class = SpvStorageClassPrivate; vkd3d_symbol_make_register(&reg_symbol, reg); - if (!use_private_variable) var_id = id; else if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) @@ -4006,7 +4009,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, use_private_variable ? VKD3D_TYPE_FLOAT : component_type, VKD3DSP_WRITEMASK_ALL); reg_symbol.info.reg.is_aggregate = use_private_variable ? false : array_size; - if (!use_private_variable && phase && phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE) + if (!use_private_variable && is_control_point_phase(phase)) { struct vkd3d_shader_register r; @@ -4196,7 +4199,7 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ param_id[i] = vkd3d_spirv_build_op_load(builder, type_id, param_id[i], SpvMemoryAccessMaskNone); } - if (phase && phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE) + if (is_control_point_phase(phase)) { struct vkd3d_shader_register r; uint32_t invocation_id; @@ -5227,7 +5230,7 @@ static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *c * in fork/join phases. We have to remove all output registers' symbols * when leaving the control point phase. */ - if (phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE) + if (is_control_point_phase(phase)) { memset(&reg, 0, sizeof(reg)); reg.type = VKD3DSPR_OUTPUT; @@ -5313,7 +5316,7 @@ static const struct vkd3d_shader_phase *vkd3d_dxbc_compiler_get_control_point_ph return NULL; phase = &compiler->shader_phases[0]; - if (phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE) + if (is_control_point_phase(phase)) return phase; return NULL; @@ -5438,7 +5441,7 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler for (i = 0; i < compiler->shader_phase_count; ++i) { phase = &compiler->shader_phases[i]; - if (phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE) + if (is_control_point_phase(phase)) continue; if (phase->instance_count) -- 2.19.2

2 1

[PATCH vkd3d 4/8] vkd3d-shader: Handle partial shader output updates in epilogue functions.
by Józef Kucia 26 Feb '19

26 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Fork and join phases quite often write only a few components of an output variable. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9aee6928e993..0e6df4712ecf 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1980,6 +1980,7 @@ struct vkd3d_dxbc_compiler uint32_t array_element_mask; } *output_info; uint32_t private_output_variable[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ + uint32_t private_output_variable_write_mask[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ uint32_t epilogue_function_id; uint32_t dummy_sampler_id; @@ -3998,6 +3999,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler { unsigned int idx = vkd3d_dxbc_compiler_get_output_variable_index(compiler, reg->idx[0].offset); compiler->private_output_variable[idx] = var_id; + compiler->private_output_variable_write_mask[idx] |= dst->write_mask; if (!compiler->epilogue_function_id) compiler->epilogue_function_id = vkd3d_spirv_alloc_id(builder); } @@ -4045,15 +4047,16 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_output(struct vkd3d_dxbc_compi static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_signature_element *output, - const struct vkd3d_shader_output_info *output_info, uint32_t val_id) + const struct vkd3d_shader_output_info *output_info, uint32_t val_id, unsigned int write_mask) { + unsigned int dst_write_mask, use_mask, uninit_mask, swizzle, mask; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, zero_id, ptr_type_id, chain_id, object_id; - uint32_t write_mask, use_mask, uninit_mask, swizzle, mask; - uint32_t output_id, indexes[1]; unsigned int i, index; + uint32_t output_id; - write_mask = output->mask & 0xff; + dst_write_mask = output->mask & 0xff; + write_mask &= dst_write_mask; use_mask = (output->mask >> 8) & 0xff; if (output_info->component_type != VKD3D_TYPE_FLOAT) @@ -4063,10 +4066,11 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi } swizzle = get_shader_output_swizzle(compiler, output->register_index); - uninit_mask = write_mask & use_mask; + uninit_mask = dst_write_mask & use_mask; if (uninit_mask) { /* Set values to 0 for not initialized shader output components. */ + write_mask |= uninit_mask; zero_id = vkd3d_dxbc_compiler_get_constant_vector(compiler, output_info->component_type, VKD3D_VEC4_SIZE, 0); val_id = vkd3d_dxbc_compiler_emit_vector_shuffle(compiler, @@ -4083,7 +4087,8 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi if (!output_info->array_element_mask) { - vkd3d_spirv_build_op_store(builder, output_id, val_id, SpvMemoryAccessMaskNone); + vkd3d_dxbc_compiler_emit_store(compiler, + output_id, dst_write_mask, output_info->component_type, SpvStorageClassOutput, write_mask, val_id); return; } @@ -4096,12 +4101,13 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi if (!(write_mask & (VKD3DSP_WRITEMASK_0 << i))) continue; - indexes[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, index++); - chain_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, - output_id, indexes, ARRAY_SIZE(indexes)); + chain_id = vkd3d_spirv_build_op_access_chain1(builder, + ptr_type_id, output_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, index)); object_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, val_id, write_mask, output_info->component_type, VKD3D_NO_SWIZZLE, VKD3DSP_WRITEMASK_0 << i); - vkd3d_spirv_build_op_store(builder, chain_id, object_id, SpvMemoryAccessMaskNone); + vkd3d_dxbc_compiler_emit_store(compiler, chain_id, VKD3DSP_WRITEMASK_0 << index, + output_info->component_type, SpvStorageClassOutput, VKD3DSP_WRITEMASK_0 << i, object_id); + ++index; } } @@ -4116,6 +4122,7 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_id)); STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_type_id)); + STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(compiler->private_output_variable_write_mask)); function_id = compiler->epilogue_function_id; @@ -4155,7 +4162,8 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ continue; vkd3d_dxbc_compiler_emit_store_shader_output(compiler, - &signature->elements[i], &compiler->output_info[i], param_id[variable_idx]); + &signature->elements[i], &compiler->output_info[i], + param_id[variable_idx], compiler->private_output_variable_write_mask[variable_idx]); } vkd3d_spirv_build_op_return(&compiler->spirv_builder); @@ -4163,6 +4171,7 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ memset(compiler->output_info, 0, signature->element_count * sizeof(*compiler->output_info)); memset(compiler->private_output_variable, 0, sizeof(compiler->private_output_variable)); + memset(compiler->private_output_variable_write_mask, 0, sizeof(compiler->private_output_variable_write_mask)); compiler->epilogue_function_id = 0; } -- 2.19.2

2 1

[PATCH vkd3d 2/8] vkd3d-shader: Remove output register symbols while leaving control point phase.
by Józef Kucia 26 Feb '19

26 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e169aa0567ee..a925d68eeeb4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5124,9 +5124,12 @@ static void vkd3d_dxbc_compiler_emit_dcl_thread_group(struct vkd3d_dxbc_compiler static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_phase *phase) { + const struct vkd3d_shader_signature *signature = compiler->output_signature; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_shader_register reg; struct vkd3d_symbol reg_symbol; + struct rb_entry *entry; + unsigned int i; vkd3d_spirv_build_op_function_end(builder); @@ -5139,12 +5142,41 @@ static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *c compiler->temp_id = 0; compiler->temp_count = 0; + /* + * Output regsiters have a different purpose in the control point phase and + * in fork/join phases. We have to remove all output registers' symbols + * when leaving the control point phase. + */ + if (phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE) + { + memset(&reg, 0, sizeof(reg)); + reg.type = VKD3DSPR_OUTPUT; + reg.idx[1].offset = ~0u; + + for (i = 0; i < signature->element_count; ++i) + { + const struct vkd3d_shader_signature_element *e = &signature->elements[i]; + + reg.idx[0].offset = e->register_index; + vkd3d_symbol_make_register(&reg_symbol, &reg); + if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) + { + rb_remove(&compiler->symbol_table, entry); + vkd3d_symbol_free(entry, NULL); + } + } + } + if (phase->instance_count) { reg.type = phase->type == VKD3DSIH_HS_FORK_PHASE ? VKD3DSPR_FORKINSTID : VKD3DSPR_JOININSTID; reg.idx[0].offset = ~0u; vkd3d_symbol_make_register(&reg_symbol, &reg); - rb_remove_key(&compiler->symbol_table, &reg_symbol); + if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) + { + rb_remove(&compiler->symbol_table, entry); + vkd3d_symbol_free(entry, NULL); + } } } -- 2.19.2

2 1

[PATCH vkd3d 8/8] tests: Fix domain shader code in test_tessellation_dcl_index_range().
by Józef Kucia 26 Feb '19

26 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 24db7a89dd5c..5ae8511fc74a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -22815,9 +22815,9 @@ static void test_tessellation_dcl_index_range(void) static const D3D12_SHADER_BYTECODE hs = {hs_code, sizeof(hs_code)}; static const DWORD ds_code[] = { - 0x43425844, 0xeb6b7631, 0x07f5469e, 0xed0cbf4a, 0x7158b3a6, 0x00000001, 0x00000284, 0x00000004, + 0x43425844, 0x4f187d50, 0x6743fe93, 0x10dfbe63, 0xf8cfd202, 0x00000001, 0x00000284, 0x00000004, 0x00000030, 0x00000064, 0x00000128, 0x0000015c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, - 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x5449534f, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x47534350, 0x000000bc, 0x00000006, 0x00000008, 0x00000098, 0x00000000, 0x0000000b, 0x00000003, 0x00000000, 0x00000001, 0x00000098, 0x00000001, 0x0000000b, 0x00000003, 0x00000001, 0x00000001, 0x00000098, 0x00000002, 0x0000000b, 0x00000003, 0x00000002, 0x00000001, 0x00000098, -- 2.19.2

2 1

[PATCH vkd3d 7/8] tests: Add test for hull shader control point phase.
by Józef Kucia 26 Feb '19

26 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index d8a13a711156..24db7a89dd5c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -22909,6 +22909,156 @@ static void test_tessellation_dcl_index_range(void) destroy_test_context(&context); } +static void test_hull_shader_control_point_phase(void) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + void main() + { + } +#endif + 0x43425844, 0x590b08ae, 0x11d28adb, 0x825a5628, 0x34c0c208, 0x00000001, 0x00000064, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000010, 0x00010050, 0x00000004, 0x0100086a, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; +#if 0 + struct data + { + float4 position : SV_Position; + }; + + struct patch_constant_data + { + float edges[3] : SV_TessFactor; + float inside : SV_InsideTessFactor; + }; + + void patch_constant(out patch_constant_data output) + { + output.edges[0] = output.edges[1] = output.edges[2] = 1.0f; + output.inside = 1.0f; + } + + [domain("tri")] + [outputcontrolpoints(3)] + [partitioning("integer")] + [outputtopology("triangle_cw")] + [patchconstantfunc("patch_constant")] + data hs_main(uint i : SV_OutputControlPointID) + { + data output; + + if (i == 0) + output.position = float4(-1, 1, 0, 1); + else if (i == 1) + output.position = float4(3, 1, 0, 1); + else + output.position = float4(-1, -3, 0, 1); + + return output; + } + + [domain("tri")] + void ds_main(patch_constant_data input, + float3 tess_coord : SV_DomainLocation, + const OutputPatch<data, 3> patch, + out data output) + { + uint index = uint(tess_coord.y + 2 * tess_coord.z); + output.position = patch[index].position; + } +#endif + static const DWORD hs_code[] = + { + 0x43425844, 0x4204890e, 0x43f4f8e0, 0xbff7edfd, 0x0a48b715, 0x00000001, 0x0000028c, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x00000108, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x47534350, 0x0000008c, 0x00000004, + 0x00000008, 0x00000068, 0x00000000, 0x0000000d, 0x00000003, 0x00000000, 0x00000e01, 0x00000068, + 0x00000001, 0x0000000d, 0x00000003, 0x00000001, 0x00000e01, 0x00000068, 0x00000002, 0x0000000d, + 0x00000003, 0x00000002, 0x00000e01, 0x00000076, 0x00000000, 0x0000000e, 0x00000003, 0x00000003, + 0x00000e01, 0x545f5653, 0x46737365, 0x6f746361, 0x56530072, 0x736e495f, 0x54656469, 0x46737365, + 0x6f746361, 0xabab0072, 0x58454853, 0x0000017c, 0x00030050, 0x0000005f, 0x01000071, 0x01000893, + 0x01001894, 0x01001095, 0x01000896, 0x01001897, 0x0100086a, 0x01000072, 0x0200005f, 0x00016000, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x06000020, 0x00100012, 0x00000000, + 0x00016001, 0x00004001, 0x00000001, 0x0f000037, 0x001000f2, 0x00000000, 0x00100006, 0x00000000, + 0x00004002, 0x40400000, 0x3f800000, 0x00000000, 0x3f800000, 0x00004002, 0xbf800000, 0xc0400000, + 0x00000000, 0x3f800000, 0x0b000037, 0x001020f2, 0x00000000, 0x00016001, 0x00100e46, 0x00000000, + 0x00004002, 0xbf800000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000073, 0x02000099, + 0x00000003, 0x0200005f, 0x00017000, 0x04000067, 0x00102012, 0x00000000, 0x00000011, 0x04000067, + 0x00102012, 0x00000001, 0x00000012, 0x04000067, 0x00102012, 0x00000002, 0x00000013, 0x02000068, + 0x00000001, 0x0400005b, 0x00102012, 0x00000000, 0x00000003, 0x04000036, 0x00100012, 0x00000000, + 0x0001700a, 0x06000036, 0x00902012, 0x0010000a, 0x00000000, 0x00004001, 0x3f800000, 0x0100003e, + 0x01000073, 0x04000067, 0x00102012, 0x00000003, 0x00000014, 0x05000036, 0x00102012, 0x00000003, + 0x00004001, 0x3f800000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE hs = {hs_code, sizeof(hs_code)}; + static const DWORD ds_code[] = + { + 0x43425844, 0x33c6120a, 0x2d46da82, 0x2c17dddf, 0x252ae7e0, 0x00000001, 0x000001c8, 0x00000004, + 0x00000030, 0x00000064, 0x000000f8, 0x0000012c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x47534350, 0x0000008c, 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x0000000d, + 0x00000003, 0x00000000, 0x00000001, 0x00000068, 0x00000001, 0x0000000d, 0x00000003, 0x00000001, + 0x00000001, 0x00000068, 0x00000002, 0x0000000d, 0x00000003, 0x00000002, 0x00000001, 0x00000076, + 0x00000000, 0x0000000e, 0x00000003, 0x00000003, 0x00000001, 0x545f5653, 0x46737365, 0x6f746361, + 0x56530072, 0x736e495f, 0x54656469, 0x46737365, 0x6f746361, 0xabab0072, 0x4e47534f, 0x0000002c, + 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, + 0x505f5653, 0x7469736f, 0x006e6f69, 0x58454853, 0x00000094, 0x00040050, 0x00000025, 0x01001893, + 0x01001095, 0x0100086a, 0x0200005f, 0x0001c062, 0x0400005f, 0x002190f2, 0x00000003, 0x00000000, + 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x02000068, 0x00000001, 0x07000032, 0x00100012, + 0x00000000, 0x0001c02a, 0x00004001, 0x40000000, 0x0001c01a, 0x0500001c, 0x00100012, 0x00000000, + 0x0010000a, 0x00000000, 0x07000036, 0x001020f2, 0x00000000, 0x00a19e46, 0x0010000a, 0x00000000, + 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)}; + + memset(&desc, 0, sizeof(desc)); + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, NULL, NULL, NULL); + pso_desc.VS = vs; + pso_desc.HS = hs; + pso_desc.DS = ds; + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + destroy_test_context(&context); +} + static void test_render_a8(void) { static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; @@ -25257,6 +25407,7 @@ START_TEST(d3d12) run_test(test_nop_tessellation_shaders); run_test(test_quad_tessellation); run_test(test_tessellation_dcl_index_range); + run_test(test_hull_shader_control_point_phase); run_test(test_render_a8); run_test(test_cpu_descriptors_lifetime); run_test(test_clip_distance); -- 2.19.2

2 1

[PATCH vkd3d 5/8] vkd3d-shader: Index control point phase outputs by InvocationId.
by Józef Kucia 26 Feb '19

26 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 72 +++++++++++++++++++++++++++++++++++---- 1 file changed, 65 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0e6df4712ecf..34e274fa41ec 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1754,6 +1754,7 @@ struct vkd3d_symbol_register_data unsigned int write_mask; unsigned int structure_stride; bool is_aggregate; /* An aggregate, i.e. a structure or an array. */ + bool is_dynamically_indexed; /* If member_idx is a variable ID instead of a constant. */ }; struct vkd3d_symbol_resource_data @@ -1832,6 +1833,7 @@ static void vkd3d_symbol_set_register_info(struct vkd3d_symbol *symbol, symbol->info.reg.write_mask = write_mask; symbol->info.reg.structure_stride = 0; symbol->info.reg.is_aggregate = false; + symbol->info.reg.is_dynamically_indexed = false; } static void vkd3d_symbol_make_resource(struct vkd3d_symbol *symbol, @@ -2505,6 +2507,7 @@ struct vkd3d_shader_register_info uint32_t member_idx; unsigned int structure_stride; bool is_aggregate; + bool is_dynamically_indexed; }; static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compiler *compiler, @@ -2525,6 +2528,7 @@ static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compil register_info->write_mask = VKD3DSP_WRITEMASK_ALL; register_info->structure_stride = 0; register_info->is_aggregate = false; + register_info->is_dynamically_indexed = false; return true; } @@ -2544,6 +2548,7 @@ static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compil register_info->write_mask = symbol->info.reg.write_mask; register_info->structure_stride = symbol->info.reg.structure_stride; register_info->is_aggregate = symbol->info.reg.is_aggregate; + register_info->is_dynamically_indexed = symbol->info.reg.is_dynamically_indexed; return true; } @@ -2577,8 +2582,17 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp if (reg->idx[1].rel_addr) FIXME("Relative addressing not implemented.\n"); - reg_idx.offset = register_info->member_idx; - indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg_idx); + if (register_info->is_dynamically_indexed) + { + indexes[index_count++] = vkd3d_spirv_build_op_load(builder, + vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_INT, 1), + register_info->member_idx, SpvMemoryAccessMaskNone); + } + else + { + reg_idx.offset = register_info->member_idx; + indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg_idx); + } } else { @@ -3889,6 +3903,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler struct rb_entry *entry = NULL; unsigned int signature_idx; bool use_private_variable; + unsigned int array_size; bool is_patch_constant; uint32_t id, var_id; @@ -3897,6 +3912,9 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler shader_signature = is_patch_constant ? compiler->patch_constant_signature : compiler->output_signature; + array_size = phase && phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE + ? compiler->output_control_point_count : 0; + if (!(signature_element = vkd3d_find_signature_element_for_reg(shader_signature, &signature_idx, reg->idx[0].offset, dst->write_mask))) { @@ -3931,15 +3949,15 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler { if (builtin) { - id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, storage_class, 0); + id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, storage_class, array_size); vkd3d_dxbc_compiler_emit_register_execution_mode(compiler, &dst->reg); if (component_idx) FIXME("Unhandled component index %u.\n", component_idx); } else { - id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, - storage_class, component_type, output_component_count); + id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, + storage_class, component_type, output_component_count, array_size); vkd3d_spirv_add_iface_variable(builder, id); if (is_dual_source_blending(compiler) && reg->idx[0].offset < 2) @@ -3987,6 +4005,19 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler { vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, use_private_variable ? VKD3D_TYPE_FLOAT : component_type, VKD3DSP_WRITEMASK_ALL); + reg_symbol.info.reg.is_aggregate = use_private_variable ? false : array_size; + if (!use_private_variable && phase && phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE) + { + struct vkd3d_shader_register r; + + memset(&r, 0, sizeof(r)); + r.type = VKD3DSPR_OUTPOINTID; + r.idx[0].offset = ~0u; + r.idx[1].offset = ~0u; + + reg_symbol.info.reg.member_idx = vkd3d_dxbc_compiler_get_register_id(compiler, &r); + reg_symbol.info.reg.is_dynamically_indexed = true; + } vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); @@ -4047,7 +4078,8 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_output(struct vkd3d_dxbc_compi static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_signature_element *output, - const struct vkd3d_shader_output_info *output_info, uint32_t val_id, unsigned int write_mask) + const struct vkd3d_shader_output_info *output_info, + uint32_t output_index_id, uint32_t val_id, unsigned int write_mask) { unsigned int dst_write_mask, use_mask, uninit_mask, swizzle, mask; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; @@ -4084,6 +4116,13 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi } output_id = output_info->id; + if (output_index_id) + { + type_id = vkd3d_spirv_get_type_id(builder, + output_info->component_type, vkd3d_write_mask_component_count(dst_write_mask)); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassOutput, type_id); + output_id = vkd3d_spirv_build_op_access_chain1(builder, ptr_type_id, output_id, output_index_id); + } if (!output_info->array_element_mask) { @@ -4117,6 +4156,8 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ const struct vkd3d_shader_signature *signature = compiler->output_signature; uint32_t void_id, type_id, ptr_type_id, function_type_id, function_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_phase *phase; + uint32_t output_index_id = 0; unsigned int i, count; DWORD variable_idx; @@ -4124,6 +4165,8 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_type_id)); STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(compiler->private_output_variable_write_mask)); + phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler); + function_id = compiler->epilogue_function_id; void_id = vkd3d_spirv_get_op_type_void(builder); @@ -4153,6 +4196,21 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ param_id[i] = vkd3d_spirv_build_op_load(builder, type_id, param_id[i], SpvMemoryAccessMaskNone); } + if (phase && phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE) + { + struct vkd3d_shader_register r; + uint32_t invocation_id; + + memset(&r, 0, sizeof(r)); + r.type = VKD3DSPR_OUTPOINTID; + r.idx[0].offset = ~0u; + r.idx[1].offset = ~0u; + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_INT, 1); + invocation_id = vkd3d_dxbc_compiler_get_register_id(compiler, &r); + output_index_id = vkd3d_spirv_build_op_load(builder, type_id, invocation_id, SpvMemoryAccessMaskNone); + } + for (i = 0; i < signature->element_count; ++i) { variable_idx = vkd3d_dxbc_compiler_get_output_variable_index(compiler, @@ -4162,7 +4220,7 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ continue; vkd3d_dxbc_compiler_emit_store_shader_output(compiler, - &signature->elements[i], &compiler->output_info[i], + &signature->elements[i], &compiler->output_info[i], output_index_id, param_id[variable_idx], compiler->private_output_variable_write_mask[variable_idx]); } -- 2.19.2

2 1

[PATCH vkd3d 3/8] vkd3d-shader: Add more advanced helper for vector shuffle.
by Józef Kucia 26 Feb '19

26 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 43 +++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a925d68eeeb4..9aee6928e993 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2669,22 +2669,22 @@ static uint32_t vkd3d_dxbc_compiler_emit_swizzle(struct vkd3d_dxbc_compiler *com } static uint32_t vkd3d_dxbc_compiler_emit_vector_shuffle(struct vkd3d_dxbc_compiler *compiler, - uint32_t vector1_id, uint32_t vector2_id, uint32_t write_mask, + uint32_t vector1_id, uint32_t vector2_id, unsigned int swizzle, unsigned int write_mask, enum vkd3d_component_type component_type, unsigned int component_count) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t components[VKD3D_VEC4_SIZE]; - unsigned int i, component_idx; uint32_t type_id; + unsigned int i; assert(component_count <= ARRAY_SIZE(components)); - for (i = 0, component_idx = 0; i < component_count; ++i) + for (i = 0; i < component_count; ++i) { if (write_mask & (VKD3DSP_WRITEMASK_0 << i)) - components[i] = VKD3D_VEC4_SIZE + component_idx++; + components[i] = vkd3d_swizzle_get_component(swizzle, i); else - components[i] = i; + components[i] = VKD3D_VEC4_SIZE + vkd3d_swizzle_get_component(swizzle, i); } type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); @@ -2926,6 +2926,8 @@ static void vkd3d_dxbc_compiler_emit_store(struct vkd3d_dxbc_compiler *compiler, { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; unsigned int component_count, dst_component_count; + uint32_t components[VKD3D_VEC4_SIZE]; + unsigned int i, component_idx; uint32_t type_id, dst_val_id; assert(write_mask); @@ -2944,8 +2946,18 @@ static void vkd3d_dxbc_compiler_emit_store(struct vkd3d_dxbc_compiler *compiler, type_id = vkd3d_spirv_get_type_id(builder, component_type, dst_component_count); dst_val_id = vkd3d_spirv_build_op_load(builder, type_id, dst_id, SpvMemoryAccessMaskNone); - val_id = vkd3d_dxbc_compiler_emit_vector_shuffle(compiler, - dst_val_id, val_id, write_mask, component_type, dst_component_count); + assert(component_count <= ARRAY_SIZE(components)); + + for (i = 0, component_idx = 0; i < dst_component_count; ++i) + { + if (write_mask & (VKD3DSP_WRITEMASK_0 << i)) + components[i] = VKD3D_VEC4_SIZE + component_idx++; + else + components[i] = i; + } + + val_id = vkd3d_spirv_build_op_vector_shuffle(builder, + type_id, dst_val_id, val_id, components, dst_component_count); } vkd3d_spirv_build_op_store(builder, dst_id, val_id, SpvMemoryAccessMaskNone); @@ -4039,23 +4051,18 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi uint32_t type_id, zero_id, ptr_type_id, chain_id, object_id; uint32_t write_mask, use_mask, uninit_mask, swizzle, mask; uint32_t output_id, indexes[1]; - unsigned int component_count; unsigned int i, index; write_mask = output->mask & 0xff; use_mask = (output->mask >> 8) & 0xff; - swizzle = get_shader_output_swizzle(compiler, output->register_index); - val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, - val_id, VKD3DSP_WRITEMASK_ALL, VKD3D_TYPE_FLOAT, swizzle, write_mask); - - component_count = vkd3d_write_mask_component_count(write_mask); if (output_info->component_type != VKD3D_TYPE_FLOAT) { - type_id = vkd3d_spirv_get_type_id(builder, output_info->component_type, component_count); + type_id = vkd3d_spirv_get_type_id(builder, output_info->component_type, VKD3D_VEC4_SIZE); val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); } + swizzle = get_shader_output_swizzle(compiler, output->register_index); uninit_mask = write_mask & use_mask; if (uninit_mask) { @@ -4063,7 +4070,13 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi zero_id = vkd3d_dxbc_compiler_get_constant_vector(compiler, output_info->component_type, VKD3D_VEC4_SIZE, 0); val_id = vkd3d_dxbc_compiler_emit_vector_shuffle(compiler, - val_id, zero_id, uninit_mask, output_info->component_type, component_count); + zero_id, val_id, swizzle, uninit_mask, output_info->component_type, + vkd3d_write_mask_component_count(write_mask)); + } + else + { + val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, + val_id, VKD3DSP_WRITEMASK_ALL, output_info->component_type, swizzle, write_mask); } output_id = output_info->id; -- 2.19.2

2 1

[PATCH vkd3d 1/8] tests: Add test for SV_RenderTargetArrayIndex in pixel shader.
by Józef Kucia 26 Feb '19

26 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 150 insertions(+), 4 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 7e74fbfec2ae..d8a13a711156 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21633,7 +21633,6 @@ static void test_layered_rendering(void) D3D12_VERTEX_BUFFER_VIEW vbv; struct test_context context; ID3D12CommandQueue *queue; - ID3D12PipelineState *pso; ID3D12Device *device; ID3D12Resource *vb; HRESULT hr; @@ -21794,7 +21793,7 @@ static void test_layered_rendering(void) context.render_target_desc.Format, &vs, &ps, &input_layout); pso_desc.GS = gs; hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, - &IID_ID3D12PipelineState, (void **)&pso); + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); vb = create_upload_buffer(context.device, sizeof(vertices), vertices); @@ -21808,7 +21807,7 @@ static void test_layered_rendering(void) ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); - ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); ID3D12GraphicsCommandList_DrawInstanced(command_list, 12, 1, 0, 0); @@ -21825,7 +21824,153 @@ static void test_layered_rendering(void) check_sub_resource_uint(context.render_target, 3, queue, command_list, 0xffffff00, 0); ID3D12Resource_Release(vb); - ID3D12PipelineState_Release(pso); + destroy_test_context(&context); +} + +static void test_ps_layer(void) +{ + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Device *device; + unsigned int i; + HRESULT hr; + + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const DWORD vs_code[] = + { +#if 0 + void main(in uint vertex_id : SV_VertexID, out uint layer : LAYER) + { + layer = vertex_id; + } +#endif + 0x43425844, 0xd2b4abd8, 0xf9adf7df, 0xed1b4eb0, 0x4bf54391, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000090, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000006, 0x00000001, 0x00000000, 0x00000101, 0x565f5653, 0x65747265, 0x00444978, + 0x4e47534f, 0x00000028, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x00000e01, 0x4559414c, 0xabab0052, 0x58454853, 0x00000040, 0x00010050, 0x00000010, + 0x0100086a, 0x04000060, 0x00101012, 0x00000000, 0x00000006, 0x03000065, 0x00102012, 0x00000000, + 0x05000036, 0x00102012, 0x00000000, 0x0010100a, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const DWORD gs_code[] = + { +#if 0 + struct gs_in + { + uint layer : LAYER; + }; + + struct gs_out + { + float4 position : SV_Position; + uint layer : SV_RenderTargetArrayIndex; + }; + + [maxvertexcount(3)] + void main(point gs_in vin[1], inout TriangleStream<gs_out> vout) + { + gs_out o; + + o.layer = vin[0].layer; + + o.position = float4(-1, 1, 0, 1); + vout.Append(o); + + o.position = float4(3, 1, 0, 1); + vout.Append(o); + + o.position = float4(-1, -3, 0, 1); + vout.Append(o); + } +#endif + 0x43425844, 0x2589d822, 0x7557587c, 0x7d7e9cc0, 0x6bad86aa, 0x00000001, 0x000001fc, 0x00000003, + 0x0000002c, 0x0000005c, 0x000000cc, 0x4e475349, 0x00000028, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000101, 0x4559414c, 0xabab0052, 0x3547534f, + 0x00000068, 0x00000002, 0x00000008, 0x00000000, 0x00000040, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000000, 0x0000004c, 0x00000000, 0x00000004, 0x00000001, 0x00000001, + 0x00000e01, 0x505f5653, 0x7469736f, 0x006e6f69, 0x525f5653, 0x65646e65, 0x72615472, 0x41746567, + 0x79617272, 0x65646e49, 0xabab0078, 0x58454853, 0x00000128, 0x00020050, 0x0000004a, 0x0100086a, + 0x0400005f, 0x00201012, 0x00000001, 0x00000000, 0x0100085d, 0x0300008f, 0x00110000, 0x00000000, + 0x0100285c, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x04000067, 0x00102012, 0x00000001, + 0x00000004, 0x0200005e, 0x00000003, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0xbf800000, + 0x3f800000, 0x00000000, 0x3f800000, 0x06000036, 0x00102012, 0x00000001, 0x0020100a, 0x00000000, + 0x00000000, 0x03000075, 0x00110000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, + 0x40400000, 0x3f800000, 0x00000000, 0x3f800000, 0x06000036, 0x00102012, 0x00000001, 0x0020100a, + 0x00000000, 0x00000000, 0x03000075, 0x00110000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0xbf800000, 0xc0400000, 0x00000000, 0x3f800000, 0x06000036, 0x00102012, 0x00000001, + 0x0020100a, 0x00000000, 0x00000000, 0x03000075, 0x00110000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE gs = {gs_code, sizeof(gs_code)}; + static const DWORD ps_code[] = + { +#if 0 + float4 main(float4 p : SV_Position, uint layer : SV_RenderTargetArrayIndex) : SV_Target0 + { + return layer / 255.0; + } +#endif + 0x43425844, 0x53474926, 0xbd247b84, 0x389660f4, 0x331cf598, 0x00000001, 0x00000140, 0x00000003, + 0x0000002c, 0x00000094, 0x000000c8, 0x4e475349, 0x00000060, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000004, + 0x00000001, 0x00000001, 0x00000101, 0x505f5653, 0x7469736f, 0x006e6f69, 0x525f5653, 0x65646e65, + 0x72615472, 0x41746567, 0x79617272, 0x65646e49, 0xabab0078, 0x4e47534f, 0x0000002c, 0x00000001, + 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, + 0x65677261, 0xabab0074, 0x58454853, 0x00000070, 0x00000050, 0x0000001c, 0x0100086a, 0x04000864, + 0x00101012, 0x00000001, 0x00000004, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, + 0x05000056, 0x00100012, 0x00000000, 0x0010100a, 0x00000001, 0x0a000038, 0x001020f2, 0x00000000, + 0x00100006, 0x00000000, 0x00004002, 0x3b808081, 0x3b808081, 0x3b808081, 0x3b808081, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const unsigned int expected_results[] = + { + 0x00000000, + 0x01010101, + 0x02020202, + 0x03030303, + 0x04040404, + 0x05050505, + }; + + memset(&desc, 0, sizeof(desc)); + desc.rt_array_size = 6; + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, &vs, &ps, NULL); + pso_desc.GS = gs; + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_POINT; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_POINTLIST); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 6, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + for (i = 0; i < ARRAY_SIZE(expected_results); ++i) + { + check_sub_resource_uint(context.render_target, i, queue, command_list, expected_results[i], 0); + reset_command_list(command_list, context.allocator); + } + destroy_test_context(&context); } @@ -25108,6 +25253,7 @@ START_TEST(d3d12) run_test(test_multithread_command_queue_exec); run_test(test_geometry_shader); run_test(test_layered_rendering); + run_test(test_ps_layer); run_test(test_nop_tessellation_shaders); run_test(test_quad_tessellation); run_test(test_tessellation_dcl_index_range); -- 2.19.2

2 1

[PATCH 7/9] ntoskrnl.exe: Add partial ObReferenceObjectByHandle implementation.
by Jacek Caban 26 Feb '19

26 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 80 ++++++++++++++++++++++------ dlls/ntoskrnl.exe/ntoskrnl_private.h | 5 +- dlls/ntoskrnl.exe/tests/driver.c | 9 ++-- 3 files changed, 70 insertions(+), 24 deletions(-)

2 1

[PATCH 5/9] ntoskrnl.exe: Add missing ObReferenceObject call to ObReferenceObjectByName.
by Jacek Caban 26 Feb '19

26 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)

2 1

[PATCH 4/9] ntoskrnl.exe: Use kernel object allocators for device object.
by Jacek Caban 26 Feb '19

26 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

2 1

[PATCH] mf/tests: Fix typos in test messages.
by Nikolay Sivov 26 Feb '19

26 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Thanks, Józef. dlls/mf/tests/mf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index c56428d27e..ba11a27c33 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -297,7 +297,7 @@ static void test_topology(void) IMFCollection_Release(collection); hr = IMFTopology_GetOutputNodeCollection(topology, &collection); - ok(hr == S_OK || broken(hr == E_FAIL) /* before Win8 */, "Failed to get source node collection, hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL) /* before Win8 */, "Failed to get output node collection, hr %#x.\n", hr); if (SUCCEEDED(hr)) { ok(!!collection, "Unexpected object pointer.\n"); @@ -313,7 +313,7 @@ static void test_topology(void) IMFTopologyNode_Release(node); hr = IMFTopology_GetOutputNodeCollection(topology, &collection); - ok(hr == S_OK, "Failed to get source node collection, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get output node collection, hr %#x.\n", hr); ok(!!collection, "Unexpected object pointer.\n"); hr = IMFCollection_GetElementCount(collection, &size); ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); -- 2.20.1

1 0

[PATCH 3/3] Add proper reporting of CPU information for ppc64 systems
by Timothy Pearson 26 Feb '19

26 Feb '19

--- dlls/ntdll/nt.c | 38 ++++++++++++++++++++++++++++++++++++ dlls/setupapi/fakedll.c | 2 ++ programs/wineboot/wineboot.c | 33 +++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 792c7f06e1..2d43d8a7db 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1140,7 +1140,45 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) { +#ifdef linux + char line[512]; + char *s, *value; + FILE *f = fopen("/proc/cpuinfo", "r"); + if (f) + { + while (fgets(line, sizeof(line), f) != NULL) + { + /* NOTE: the ':' is the only character we can rely on */ + if (!(value = strchr(line,':'))) + continue; + /* terminate the valuename */ + s = value - 1; + while ((s >= line) && isspace(*s)) s--; + *(s + 1) = '\0'; + /* and strip leading spaces from value */ + value += 1; + while (isspace(*value)) value++; + if ((s = strchr(value,'\n'))) + *s='\0'; + if (!strcasecmp(line, "cpu")) + { + if (isdigit(value[5])) + info->Level = atoi(value+5); + continue; + } + if (!strcasecmp(line, "revision")) + { + if (isdigit(value[0])) + info->Revision = (atof(value) * 100); + continue; + } + } + fclose(f); + } +#else FIXME("CPU Feature detection not implemented.\n"); +#endif + info->Level = max(info->Level, 8); /* Default to POWER8 if unable to detect CPU series */ info->Architecture = PROCESSOR_ARCHITECTURE_PPC64; } diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 8c68a50346..87be2b51dd 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -719,6 +719,8 @@ static BOOL CALLBACK register_manifest( HMODULE module, const WCHAR *type, WCHAR static const char current_arch[] = "arm"; #elif defined __aarch64__ static const char current_arch[] = "arm64"; +#elif defined __powerpc64__ + static const char current_arch[] = "ppc64"; #else static const char current_arch[] = "none"; #endif diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index b85a3b6b6e..41ad61ff37 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -277,11 +277,16 @@ static void create_hardware_registry_keys(void) static const WCHAR ProcessorNameStringW[] = {'P','r','o','c','e','s','s','o','r','N','a','m','e','S','t','r','i','n','g',0}; static const WCHAR SysidW[] = {'A','T',' ','c','o','m','p','a','t','i','b','l','e',0}; static const WCHAR ARMSysidW[] = {'A','R','M',' ','p','r','o','c','e','s','s','o','r',' ','f','a','m','i','l','y',0}; + static const WCHAR PPCSysidW[] = {'P','o','w','e','r','P','C',' ','p','r','o','c','e','s','s','o','r',' ','f','a','m','i','l','y',0}; static const WCHAR mhzKeyW[] = {'~','M','H','z',0}; static const WCHAR VendorIdentifierW[] = {'V','e','n','d','o','r','I','d','e','n','t','i','f','i','e','r',0}; static const WCHAR PercentDW[] = {'%','d',0}; static const WCHAR ARMCpuDescrW[] = {'A','R','M',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', ' ','R','e','v','i','s','i','o','n',' ','%','d',0}; + static const WCHAR PPCCpuDescrW[] = {'P','o','w','e','r','P','C',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', + ' ','R','e','v','i','s','i','o','n',' ','%','d',0}; + static const WCHAR PPC64CpuDescrW[] = {'P','o','w','e','r','P','C','6','4',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', + ' ','R','e','v','i','s','i','o','n',' ','%','d',0}; static const WCHAR x86W[] = {'x','8','6',0}; static const WCHAR intel64W[] = {'I','n','t','e','l','6','4',0}; static const WCHAR amd64W[] = {'A','M','D','6','4',0}; @@ -310,6 +315,13 @@ static void create_hardware_registry_keys(void) sprintfW( id, ARMCpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); break; + case PROCESSOR_ARCHITECTURE_PPC: + sprintfW( id, PPCCpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); + break; + case PROCESSOR_ARCHITECTURE_PPC64: + sprintfW( id, PPC64CpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); + break; + case PROCESSOR_ARCHITECTURE_AMD64: get_identifier( id, !strcmpW(vendorid, authenticamdW) ? amd64W : intel64W ); break; @@ -334,6 +346,11 @@ static void create_hardware_registry_keys(void) set_reg_value( system_key, IdentifierW, ARMSysidW ); break; + case PROCESSOR_ARCHITECTURE_PPC: + case PROCESSOR_ARCHITECTURE_PPC64: + set_reg_value( system_key, IdentifierW, PPCSysidW ); + break; + case PROCESSOR_ARCHITECTURE_INTEL: case PROCESSOR_ARCHITECTURE_AMD64: default: @@ -411,6 +428,7 @@ static void create_environment_registry_keys( void ) static const WCHAR intel64W[] = {'I','n','t','e','l','6','4',0}; static const WCHAR amd64W[] = {'A','M','D','6','4',0}; static const WCHAR authenticamdW[] = {'A','u','t','h','e','n','t','i','c','A','M','D',0}; + static const WCHAR ppc64W[] = {'P','o','w','e','r','P','C','6','4',0}; static const WCHAR commaW[] = {',',' ',0}; static const WCHAR ProcIdW[] = {'P','R','O','C','E','S','S','O','R','_','I','D','E','N','T','I','F','I','E','R',0}; static const WCHAR ProcLvlW[] = {'P','R','O','C','E','S','S','O','R','_','L','E','V','E','L',0}; @@ -419,6 +437,10 @@ static void create_environment_registry_keys( void ) static const WCHAR Percent04XW[] = {'%','0','4','x',0}; static const WCHAR ARMCpuDescrW[] = {'A','R','M',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', ' ','R','e','v','i','s','i','o','n',' ','%','d',0}; + static const WCHAR PPCCpuDescrW[] = {'P','o','w','e','r','P','C',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', + ' ','R','e','v','i','s','i','o','n',' ','%','d',0}; + static const WCHAR PPC64CpuDescrW[] = {'P','o','w','e','r','P','C','6','4',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', + ' ','R','e','v','i','s','i','o','n',' ','%','d',0}; HKEY env_key; SYSTEM_CPU_INFORMATION sci; WCHAR buffer[60], vendorid[13]; @@ -439,6 +461,10 @@ static void create_environment_registry_keys( void ) parch = !strcmpW(vendorid, authenticamdW) ? amd64W : intel64W; break; + case PROCESSOR_ARCHITECTURE_PPC64: + arch = parch = ppc64W; + break; + case PROCESSOR_ARCHITECTURE_INTEL: default: arch = parch = x86W; @@ -453,6 +479,13 @@ static void create_environment_registry_keys( void ) sprintfW( buffer, ARMCpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); break; + case PROCESSOR_ARCHITECTURE_PPC: + sprintfW( buffer, PPCCpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); + break; + case PROCESSOR_ARCHITECTURE_PPC64: + sprintfW( buffer, PPC64CpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); + break; + case PROCESSOR_ARCHITECTURE_AMD64: case PROCESSOR_ARCHITECTURE_INTEL: default: -- 2.20.1

2 1

[PATCH 9/9] ntoskrnl.exe: Implement file object constructor.
by Jacek Caban 26 Feb '19

26 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 +++++++++++- dlls/ntoskrnl.exe/tests/driver.c | 4 ++++ 2 files changed, 15 insertions(+), 1 deletion(-)

1 0

[PATCH 8/9] ntoskrnl.exe: Implement ObReferenceObject and ObDereferenceObject.
by Jacek Caban 26 Feb '19

26 Feb '19

NULL checks are meant to prevent regressions in applications trying to reference NULL objects returned from stubs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 64 +++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 27 deletions(-)

1 0

[PATCH 6/9] ntoskrnl.exe: Use kernel object allocators for file object.
by Jacek Caban 26 Feb '19

26 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

1 0

[PATCH 3/9] ntoskrnl.exe: Introduce common kernel object allocator and use it for driver object.
by Jacek Caban 26 Feb '19

26 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 57 ++++++++++++++++++++++------ dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + 2 files changed, 47 insertions(+), 11 deletions(-)

1 0

[PATCH 2/9] ntoskrnl.exe: Export object type values.
by Jacek Caban 26 Feb '19

26 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 61 ++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 16 ++++---- dlls/ntoskrnl.exe/ntoskrnl_private.h | 4 ++ dlls/ntoskrnl.exe/sync.c | 17 ++++++++ 4 files changed, 90 insertions(+), 8 deletions(-)

1 0

[PATCH] msi: Don't use globals to manage assembly cache state.
by Hans Leidekker 26 Feb '19

26 Feb '19

Based on a patch by Zebediah Figura. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46719 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/assembly.c | 124 +++++++++++++++++++++----------------------- dlls/msi/msipriv.h | 8 +++ 2 files changed, 68 insertions(+), 64 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 73977ee8ac..2a293956c8 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -31,18 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); -static HRESULT (WINAPI *pCreateAssemblyCacheNet10)( IAssemblyCache **, DWORD ); -static HRESULT (WINAPI *pCreateAssemblyCacheNet11)( IAssemblyCache **, DWORD ); -static HRESULT (WINAPI *pCreateAssemblyCacheNet20)( IAssemblyCache **, DWORD ); -static HRESULT (WINAPI *pCreateAssemblyCacheNet40)( IAssemblyCache **, DWORD ); -static HRESULT (WINAPI *pGetFileVersion)( LPCWSTR, LPWSTR, DWORD, DWORD * ); -static HRESULT (WINAPI *pCreateAssemblyNameObject)( IAssemblyName **, LPCWSTR, DWORD, LPVOID ); -static HRESULT (WINAPI *pCreateAssemblyEnum)( IAssemblyEnum **, IUnknown *, IAssemblyName *, DWORD, LPVOID ); - -static HMODULE hfusion10, hfusion11, hfusion20, hfusion40, hmscoree; -static BOOL assembly_caches_initialized; - -static BOOL init_function_pointers( void ) +static BOOL load_fusion_dlls( MSIPACKAGE *package ) { static const WCHAR szFusion[] = {'f','u','s','i','o','n','.','d','l','l',0}; static const WCHAR szMscoree[] = {'\\','m','s','c','o','r','e','e','.','d','l','l',0}; @@ -50,49 +39,60 @@ static BOOL init_function_pointers( void ) static const WCHAR szVersion11[] = {'v','1','.','1','.','4','3','2','2',0}; static const WCHAR szVersion20[] = {'v','2','.','0','.','5','0','7','2','7',0}; static const WCHAR szVersion40[] = {'v','4','.','0','.','3','0','3','1','9',0}; - HRESULT (WINAPI *pLoadLibraryShim)( LPCWSTR, LPCWSTR, LPVOID, HMODULE * ); + HRESULT (WINAPI *pLoadLibraryShim)( const WCHAR *, const WCHAR *, void *, HMODULE * ); WCHAR path[MAX_PATH]; DWORD len = GetSystemDirectoryW( path, MAX_PATH ); strcpyW( path + len, szMscoree ); - if (hmscoree || !(hmscoree = LoadLibraryW( path ))) return TRUE; - pGetFileVersion = (void *)GetProcAddress( hmscoree, "GetFileVersion" ); /* missing from v1.0.3705 */ - if (!(pLoadLibraryShim = (void *)GetProcAddress( hmscoree, "LoadLibraryShim" ))) + if (package->hmscoree || !(package->hmscoree = LoadLibraryW( path ))) return TRUE; + if (!(pLoadLibraryShim = (void *)GetProcAddress( package->hmscoree, "LoadLibraryShim" ))) { - FreeLibrary( hmscoree ); - hmscoree = NULL; + FreeLibrary( package->hmscoree ); + package->hmscoree = NULL; return TRUE; } - if (!pLoadLibraryShim( szFusion, szVersion10, NULL, &hfusion10 )) - pCreateAssemblyCacheNet10 = (void *)GetProcAddress( hfusion10, "CreateAssemblyCache" ); - if (!pLoadLibraryShim( szFusion, szVersion11, NULL, &hfusion11 )) - pCreateAssemblyCacheNet11 = (void *)GetProcAddress( hfusion11, "CreateAssemblyCache" ); + pLoadLibraryShim( szFusion, szVersion10, NULL, &package->hfusion10 ); + pLoadLibraryShim( szFusion, szVersion11, NULL, &package->hfusion11 ); + pLoadLibraryShim( szFusion, szVersion20, NULL, &package->hfusion20 ); + pLoadLibraryShim( szFusion, szVersion40, NULL, &package->hfusion40 ); - if (!pLoadLibraryShim( szFusion, szVersion20, NULL, &hfusion20 )) - pCreateAssemblyCacheNet20 = (void *)GetProcAddress( hfusion20, "CreateAssemblyCache" ); - - if (!pLoadLibraryShim( szFusion, szVersion40, NULL, &hfusion40 )) - { - pCreateAssemblyCacheNet40 = (void *)GetProcAddress( hfusion40, "CreateAssemblyCache" ); - pCreateAssemblyNameObject = (void *)GetProcAddress( hfusion40, "CreateAssemblyNameObject" ); - pCreateAssemblyEnum = (void *)GetProcAddress( hfusion40, "CreateAssemblyEnum" ); - } return TRUE; } BOOL msi_init_assembly_caches( MSIPACKAGE *package ) { - if (assembly_caches_initialized) return TRUE; - if (!init_function_pointers()) return FALSE; + HRESULT (WINAPI *pCreateAssemblyCache)( IAssemblyCache **, DWORD ); + if (package->cache_sxs) return TRUE; if (CreateAssemblyCache( &package->cache_sxs, 0 ) != S_OK) return FALSE; - if (pCreateAssemblyCacheNet10) pCreateAssemblyCacheNet10( &package->cache_net[CLR_VERSION_V10], 0 ); - if (pCreateAssemblyCacheNet11) pCreateAssemblyCacheNet11( &package->cache_net[CLR_VERSION_V11], 0 ); - if (pCreateAssemblyCacheNet20) pCreateAssemblyCacheNet20( &package->cache_net[CLR_VERSION_V20], 0 ); - if (pCreateAssemblyCacheNet40) pCreateAssemblyCacheNet40( &package->cache_net[CLR_VERSION_V40], 0 ); - assembly_caches_initialized = TRUE; + if (!load_fusion_dlls( package )) return FALSE; + package->pGetFileVersion = (void *)GetProcAddress( package->hmscoree, "GetFileVersion" ); /* missing from v1.0.3705 */ + + if (package->hfusion10) + { + pCreateAssemblyCache = (void *)GetProcAddress( package->hfusion10, "CreateAssemblyCache" ); + pCreateAssemblyCache( &package->cache_net[CLR_VERSION_V10], 0 ); + } + if (package->hfusion11) + { + pCreateAssemblyCache = (void *)GetProcAddress( package->hfusion11, "CreateAssemblyCache" ); + pCreateAssemblyCache( &package->cache_net[CLR_VERSION_V11], 0 ); + } + if (package->hfusion20) + { + pCreateAssemblyCache = (void *)GetProcAddress( package->hfusion20, "CreateAssemblyCache" ); + pCreateAssemblyCache( &package->cache_net[CLR_VERSION_V20], 0 ); + } + if (package->hfusion40) + { + pCreateAssemblyCache = (void *)GetProcAddress( package->hfusion40, "CreateAssemblyCache" ); + pCreateAssemblyCache( &package->cache_net[CLR_VERSION_V40], 0 ); + package->pCreateAssemblyNameObject = (void *)GetProcAddress( package->hfusion40, "CreateAssemblyNameObject" ); + package->pCreateAssemblyEnum = (void *)GetProcAddress( package->hfusion40, "CreateAssemblyEnum" ); + } + return TRUE; } @@ -113,23 +113,19 @@ void msi_destroy_assembly_caches( MSIPACKAGE *package ) package->cache_net[i] = NULL; } } - pCreateAssemblyCacheNet10 = NULL; - pCreateAssemblyCacheNet11 = NULL; - pCreateAssemblyCacheNet20 = NULL; - pCreateAssemblyCacheNet40 = NULL; - pGetFileVersion = NULL; - pCreateAssemblyNameObject = NULL; - pCreateAssemblyEnum = NULL; - FreeLibrary( hfusion10 ); - FreeLibrary( hfusion11 ); - FreeLibrary( hfusion20 ); - FreeLibrary( hfusion40 ); - FreeLibrary( hmscoree ); - hfusion10 = NULL; - hfusion11 = NULL; - hfusion20 = NULL; - hfusion40 = NULL; - hmscoree = NULL; + package->pGetFileVersion = NULL; + package->pCreateAssemblyNameObject = NULL; + package->pCreateAssemblyEnum = NULL; + FreeLibrary( package->hfusion10 ); + FreeLibrary( package->hfusion11 ); + FreeLibrary( package->hfusion20 ); + FreeLibrary( package->hfusion40 ); + FreeLibrary( package->hmscoree ); + package->hfusion10 = NULL; + package->hfusion11 = NULL; + package->hfusion20 = NULL; + package->hfusion40 = NULL; + package->hmscoree = NULL; } static MSIRECORD *get_assembly_record( MSIPACKAGE *package, const WCHAR *comp ) @@ -294,9 +290,9 @@ IAssemblyEnum *msi_create_assembly_enum( MSIPACKAGE *package, const WCHAR *displ WCHAR *str; UINT len = 0; - if (!pCreateAssemblyNameObject || !pCreateAssemblyEnum) return NULL; + if (!package->pCreateAssemblyNameObject || !package->pCreateAssemblyEnum) return NULL; - hr = pCreateAssemblyNameObject( &name, displayname, CANOF_PARSE_DISPLAY_NAME, NULL ); + hr = package->pCreateAssemblyNameObject( &name, displayname, CANOF_PARSE_DISPLAY_NAME, NULL ); if (FAILED( hr )) return NULL; hr = IAssemblyName_GetName( name, &len, NULL ); @@ -314,11 +310,11 @@ IAssemblyEnum *msi_create_assembly_enum( MSIPACKAGE *package, const WCHAR *displ return NULL; } - hr = pCreateAssemblyNameObject( &name, str, 0, NULL ); + hr = package->pCreateAssemblyNameObject( &name, str, 0, NULL ); msi_free( str ); if (FAILED( hr )) return NULL; - hr = pCreateAssemblyEnum( &ret, NULL, name, ASM_CACHE_GAC, NULL ); + hr = package->pCreateAssemblyEnum( &ret, NULL, name, ASM_CACHE_GAC, NULL ); IAssemblyName_Release( name ); if (FAILED( hr )) return NULL; @@ -413,20 +409,20 @@ MSIASSEMBLY *msi_load_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) return a; } -static enum clr_version get_clr_version( const WCHAR *filename ) +static enum clr_version get_clr_version( MSIPACKAGE *package, const WCHAR *filename ) { DWORD len; HRESULT hr; enum clr_version version = CLR_VERSION_V11; WCHAR *strW; - if (!pGetFileVersion) return CLR_VERSION_V10; + if (!package->pGetFileVersion) return CLR_VERSION_V10; - hr = pGetFileVersion( filename, NULL, 0, &len ); + hr = package->pGetFileVersion( filename, NULL, 0, &len ); if (hr != E_NOT_SUFFICIENT_BUFFER) return CLR_VERSION_V11; if ((strW = msi_alloc( len * sizeof(WCHAR) ))) { - hr = pGetFileVersion( filename, strW, len, &len ); + hr = package->pGetFileVersion( filename, strW, len, &len ); if (hr == S_OK) { UINT i; @@ -467,7 +463,7 @@ UINT msi_install_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) else { manifest = msi_get_loaded_file( package, comp->KeyPath )->TargetPath; - cache = package->cache_net[get_clr_version( manifest )]; + cache = package->cache_net[get_clr_version( package, manifest )]; if (!cache) return ERROR_SUCCESS; } TRACE("installing assembly %s\n", debugstr_w(manifest)); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index e4d2a625f7..4b2b65a13b 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -404,6 +404,14 @@ typedef struct tagMSIPACKAGE UINT LastActionResult; UINT action_progress_increment; HANDLE log_file; + HMODULE hfusion10; + HMODULE hfusion11; + HMODULE hfusion20; + HMODULE hfusion40; + HMODULE hmscoree; + HRESULT (WINAPI *pGetFileVersion)( const WCHAR *, WCHAR *, DWORD, DWORD * ); + HRESULT (WINAPI *pCreateAssemblyNameObject)( IAssemblyName **, const WCHAR *, DWORD, void * ); + HRESULT (WINAPI *pCreateAssemblyEnum)( IAssemblyEnum **, IUnknown *, IAssemblyName *, DWORD, void * ); IAssemblyCache *cache_net[CLR_VERSION_MAX]; IAssemblyCache *cache_sxs; -- 2.20.1

1 0

[PATCH] server: Disallow duplicating file handle to elevate access.
by Daniel Lehman 26 Feb '19

26 Feb '19

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/kernel32/tests/file.c | 7 ------- server/file.c | 5 +++++ server/file.h | 2 ++ server/handle.c | 8 ++++++++ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 33b17aa327..641fcc1750 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4679,15 +4679,8 @@ static void test_file_access(void) ok(ret, "DuplicateHandle(%#x => %#x) error %d\n", td[i].access, td[j].access, GetLastError()); else { - /* FIXME: Remove once Wine is fixed */ - todo_wine_if((td[j].access & (GENERIC_READ | GENERIC_WRITE) || - (!(td[i].access & (GENERIC_WRITE | FILE_WRITE_DATA)) && (td[j].access & FILE_WRITE_DATA)) || - (!(td[i].access & (GENERIC_READ | FILE_READ_DATA)) && (td[j].access & FILE_READ_DATA)) || - (!(td[i].access & (GENERIC_WRITE)) && (td[j].access & FILE_APPEND_DATA)))) - { ok(!ret, "DuplicateHandle(%#x => %#x) should fail\n", td[i].access, td[j].access); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); - } } if (ret) CloseHandle(hdup); } diff --git a/server/file.c b/server/file.c index 8d39f303bd..a526467332 100644 --- a/server/file.c +++ b/server/file.c @@ -772,3 +772,8 @@ DECL_HANDLER(unlock_file) release_object( file ); } } + +int is_file_object( const struct object *obj ) +{ + return obj->ops == &file_ops; +} diff --git a/server/file.h b/server/file.h index 6b67866d3f..82c5eac03b 100644 --- a/server/file.h +++ b/server/file.h @@ -224,4 +224,6 @@ static inline int async_queued( struct async_queue *queue ) #define FILE_MAPPING_WRITE 0x40000000 /* set for writable shared mappings */ #define FILE_MAPPING_ACCESS 0x20000000 /* set for all mappings */ +int is_file_object( const struct object * ); + #endif /* __WINE_SERVER_FILE_H */ diff --git a/server/handle.c b/server/handle.c index 35ab8607c8..4f915ea3f8 100644 --- a/server/handle.c +++ b/server/handle.c @@ -38,6 +38,7 @@ #include "thread.h" #include "security.h" #include "request.h" +#include "file.h" struct handle_entry { @@ -555,6 +556,13 @@ obj_handle_t duplicate_handle( struct process *src, obj_handle_t src_handle, str /* asking for the more access rights than src_access? */ if (access & ~src_access) { + if (is_file_object( obj )) + { + set_error( STATUS_ACCESS_DENIED ); + release_object( obj ); + return 0; + } + if (options & DUP_HANDLE_MAKE_GLOBAL) res = alloc_global_handle( obj, access ); else -- 2.17.1

2 1

[PATCH 0/3] Enable ppc64 support in winelib
by Timothy Pearson 26 Feb '19

26 Feb '19

1 0

[PATCH v5] winetest: Add GUI to display results of individual tests.
by Isira Seneviratne 26 Feb '19

26 Feb '19

3 4

[PATCH] kernel32: Allow double quote style escape in argv
by Brendan McGrath 26 Feb '19

26 Feb '19

In Windows, two quotes together (within outer quotes) represents a single quote (with the first quote acting as an escape character) Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46721 Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- dlls/kernel32/process.c | 17 +++++++++++++---- dlls/kernel32/tests/process.c | 7 ++++--- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index ad257a054e4..89b561ef811 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1505,9 +1505,13 @@ static char **build_argv( const UNICODE_STRING *cmdlineW, int reserved ) /* '\', count them */ bcount++; } else if ((*s=='"') && ((bcount & 1)==0)) { - /* unescaped '"' */ - in_quotes=!in_quotes; - bcount=0; + if (in_quotes && s[1] == '"') { + s++; + } else { + /* unescaped '"' */ + in_quotes=!in_quotes; + bcount=0; + } } else { /* a regular character */ bcount=0; @@ -1551,7 +1555,12 @@ static char **build_argv( const UNICODE_STRING *cmdlineW, int reserved ) */ d-=bcount/2; s++; - in_quotes=!in_quotes; + if(in_quotes && *s == '"') { + *d++='"'; + s++; + } else { + in_quotes=!in_quotes; + } } else { /* Preceded by an odd number of '\', this is half that * number of '\' followed by a '"' diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index fe68d28e914..f62f8fb0ba1 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -896,7 +896,7 @@ static void test_CommandLine(void) /* the basics */ get_file_name(resfile); - sprintf(buffer, "\"%s\" tests/process.c dump \"%s\" \"C:\\Program Files\\my nice app.exe\"", selfname, resfile); + sprintf(buffer, "\"%s\" tests/process.c dump \"%s\" \"C:\\Program Files\\my nice app.exe\" \"\"\"\"", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); /* wait for child to terminate */ ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); @@ -905,9 +905,10 @@ static void test_CommandLine(void) CloseHandle(info.hThread); CloseHandle(info.hProcess); - okChildInt("Arguments", "argcA", 5); + okChildInt("Arguments", "argcA", 6); okChildString("Arguments", "argvA4", "C:\\Program Files\\my nice app.exe"); - okChildString("Arguments", "argvA5", NULL); + okChildString("Arguments", "argvA5", "\""); + okChildString("Arguments", "argvA6", NULL); okChildString("Arguments", "CommandLineA", buffer); release_memory(); DeleteFileA(resfile); -- 2.17.1

1 0

To disable PRs on GitHub mirror?
by Yurii Kolesnykov 26 Feb '19

26 Feb '19

There is a GitHub mirror located at https://github.com/wine-mirror/wine/, which has 13 PRs sent already. I think it will be better to disable PR feature for now and even more, provide some mention of wine-devel mailing-lists to which pathes should be sent.

2 1

[PATCH] advapi32: Implement EnumDynamicTimeZoneInformation.
by Daniel Lehman 26 Feb '19

26 Feb '19

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/advapi32/advapi32.spec | 2 +- .../api-ms-win-core-timezone-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/main.c | 115 ++++++++++++ dlls/kernelbase/tests/Makefile.in | 4 +- dlls/kernelbase/tests/time.c | 168 ++++++++++++++++++ include/timezoneapi.h | 32 ++++ 7 files changed, 321 insertions(+), 4 deletions(-) create mode 100644 dlls/kernelbase/tests/time.c create mode 100644 include/timezoneapi.h diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index e870a5d3e2..038467ec1d 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -272,7 +272,7 @@ # @ stub EncryptionDisable @ stdcall EnumDependentServicesA(long long ptr long ptr ptr) @ stdcall EnumDependentServicesW(long long ptr long ptr ptr) -# @ stub EnumDynamicTimeZoneInformation +@ stdcall EnumDynamicTimeZoneInformation(long ptr) kernelbase.EnumDynamicTimeZoneInformation @ stub EnumServiceGroupA @ stub EnumServiceGroupW @ stdcall EnumServicesStatusA (long long long ptr long ptr ptr ptr) diff --git a/dlls/api-ms-win-core-timezone-l1-1-0/api-ms-win-core-timezone-l1-1-0.spec b/dlls/api-ms-win-core-timezone-l1-1-0/api-ms-win-core-timezone-l1-1-0.spec index 3e38d70596..0f42eda5d8 100644 --- a/dlls/api-ms-win-core-timezone-l1-1-0/api-ms-win-core-timezone-l1-1-0.spec +++ b/dlls/api-ms-win-core-timezone-l1-1-0/api-ms-win-core-timezone-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stub EnumDynamicTimeZoneInformation +@ stdcall EnumDynamicTimeZoneInformation(long ptr) kernelbase.EnumDynamicTimeZoneInformation @ stdcall FileTimeToSystemTime(ptr ptr) kernel32.FileTimeToSystemTime @ stdcall GetDynamicTimeZoneInformation(ptr) kernel32.GetDynamicTimeZoneInformation @ stdcall GetDynamicTimeZoneInformationEffectiveYears(ptr ptr ptr) kernel32.GetDynamicTimeZoneInformationEffectiveYears diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 45b375ce2f..bea57303df 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -297,7 +297,7 @@ @ stdcall EnumDateFormatsExW(ptr long long) kernel32.EnumDateFormatsExW @ stdcall EnumDateFormatsW(ptr long long) kernel32.EnumDateFormatsW # @ stub EnumDeviceDrivers -# @ stub EnumDynamicTimeZoneInformation +@ stdcall EnumDynamicTimeZoneInformation(long ptr) @ stdcall EnumLanguageGroupLocalesW(ptr long long ptr) kernel32.EnumLanguageGroupLocalesW # @ stub EnumPageFilesA # @ stub EnumPageFilesW diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index 5192dfb3f2..2823e977c0 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -125,3 +125,118 @@ BOOL WINAPI WaitOnAddress(volatile void *addr, void *cmp, SIZE_T size, DWORD tim return TRUE; } + +static NTSTATUS reg_query_value(HKEY hkey, const WCHAR *name, DWORD type, + void *data, DWORD count) +{ + UNICODE_STRING nameW; + char buf[256]; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buf; + NTSTATUS status; + + RtlInitUnicodeString( &nameW, name ); + if ((status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, + buf, sizeof(buf), &count ))) + return status; + + if (info->Type != type) + return ERROR_DATATYPE_MISMATCH; + + memcpy( data, info->Data, info->DataLength ); + return STATUS_SUCCESS; +} + +/****************************************************************************** + * EnumDynamicTimeZoneInformation (KERNELBASE.@) + */ +DWORD WINAPI EnumDynamicTimeZoneInformation(const DWORD index, + DYNAMIC_TIME_ZONE_INFORMATION *dtzi) +{ + static const WCHAR Time_ZonesW[] = { '\\','R','E','G','I','S','T','R','Y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'T','i','m','e',' ','Z','o','n','e','s',0 }; + static const WCHAR stdW[] = {'S','t','d',0}; + static const WCHAR dltW[] = {'D','l','t',0}; + static const WCHAR tziW[] = {'T','Z','I',0}; + char node_buf[sizeof(KEY_NODE_INFORMATION) + ARRAY_SIZE(dtzi->TimeZoneKeyName)]; + KEY_NODE_INFORMATION *info = (KEY_NODE_INFORMATION *)node_buf; + HANDLE time_zones_key, sub_key; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + DWORD size; + NTSTATUS status; + struct tz_reg_data + { + LONG bias; + LONG std_bias; + LONG dlt_bias; + SYSTEMTIME std_date; + SYSTEMTIME dlt_date; + } tz_data; + + if (!dtzi) + return ERROR_INVALID_PARAMETER; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &nameW, Time_ZonesW ); + status = NtOpenKeyEx( &time_zones_key, KEY_READ, &attr, KEY_ENUMERATE_SUB_KEYS ); + if (status) return RtlNtStatusToDosError( status ); + + status = NtEnumerateKey( time_zones_key, index, KeyNodeInformation, + node_buf, sizeof(node_buf), &size ); + if (status) + { + NtClose( time_zones_key ); + return RtlNtStatusToDosError( status ); + } + + attr.RootDirectory = time_zones_key; + info->Name[info->NameLength / sizeof(WCHAR)] = 0; + RtlInitUnicodeString( &nameW, info->Name ); + status = NtOpenKeyEx( &sub_key, KEY_READ, &attr, KEY_QUERY_VALUE ); + if (status) + { + NtClose( time_zones_key ); + return RtlNtStatusToDosError( status ); + } + + status = reg_query_value( sub_key, stdW, REG_SZ, + dtzi->StandardName, sizeof(dtzi->StandardName) ); + if (status) + goto done; + + status = reg_query_value( sub_key, dltW, REG_SZ, + dtzi->DaylightName, sizeof(dtzi->DaylightName) ); + if (status) + goto done; + + status = reg_query_value( sub_key, tziW, REG_BINARY, &tz_data, sizeof(tz_data) ); + if (status) + goto done; + + dtzi->Bias = tz_data.bias; + dtzi->StandardBias = tz_data.std_bias; + dtzi->DaylightBias = tz_data.dlt_bias; + memcpy( &dtzi->StandardDate, &tz_data.std_date, sizeof(tz_data.std_date) ); + memcpy( &dtzi->DaylightDate, &tz_data.dlt_date, sizeof(tz_data.dlt_date) ); + lstrcpyW( dtzi->TimeZoneKeyName, info->Name ); + dtzi->DynamicDaylightTimeDisabled = FALSE; + + status = STATUS_SUCCESS; + +done: + NtClose( sub_key ); + NtClose( time_zones_key ); + + SetLastError( RtlNtStatusToDosError( status ) ); + return 0; +} diff --git a/dlls/kernelbase/tests/Makefile.in b/dlls/kernelbase/tests/Makefile.in index 22e4a17a58..19d7792f86 100644 --- a/dlls/kernelbase/tests/Makefile.in +++ b/dlls/kernelbase/tests/Makefile.in @@ -1,5 +1,7 @@ TESTDLL = kernelbase.dll +IMPORTS = advapi32 C_SRCS = \ path.c \ - sync.c + sync.c \ + time.c diff --git a/dlls/kernelbase/tests/time.c b/dlls/kernelbase/tests/time.c new file mode 100644 index 0000000000..de61c5795b --- /dev/null +++ b/dlls/kernelbase/tests/time.c @@ -0,0 +1,168 @@ +/* + * Time tests + * + * Copyright 2019 Daniel Lehman + * + * 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 + */ + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <stdlib.h> +#include <stdio.h> +#include <winerror.h> + +#include "wine/test.h" + +static DWORD (WINAPI *pEnumDynamicTimeZoneInformation)(const DWORD, + DYNAMIC_TIME_ZONE_INFORMATION*); + +static const char *printSystemTime(const SYSTEMTIME *st) +{ + static int index; + static char buf[2][64]; + + index++; + index %= ARRAY_SIZE(buf); + snprintf(buf[index], ARRAY_SIZE(buf[0]), "%02d-%02d-%04d %02d:%02d:%02d.%03d", + st->wMonth, st->wDay, st->wYear, + st->wHour, st->wMinute, st->wSecond, st->wMilliseconds); + return buf[index]; +} + +static void test_EnumDynamicTimeZoneInformation(void) +{ + HKEY hkey; + WCHAR stdname[32]; + WCHAR dltname[32]; + WCHAR keyname[128]; + DWORD index, gle, ret, size; + static const WCHAR stdW[] = {'S','t','d',0}; + static const WCHAR dltW[] = {'D','l','t',0}; + static const WCHAR tziW[] = {'T','Z','I',0}; + static const WCHAR volgogradW[] = {'V','o','l','g','o','g','r','a','d'}; + DYNAMIC_TIME_ZONE_INFORMATION bogus_dtzi; + DYNAMIC_TIME_ZONE_INFORMATION dtzi; + struct tz_reg_data + { + LONG bias; + LONG std_bias; + LONG dlt_bias; + SYSTEMTIME std_date; + SYSTEMTIME dlt_date; + } tz_data; + + if (!pEnumDynamicTimeZoneInformation) + { + win_skip("EnumDynamicTimeZoneInformation is not supported.\n"); + return; + } + + SetLastError(0xdeadbeef); + ret = pEnumDynamicTimeZoneInformation(0, NULL); + gle = GetLastError(); + ok(gle == 0xdeadbeef, "got 0x%x\n", gle); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + memset(&bogus_dtzi, 0xcc, sizeof(bogus_dtzi)); + memset(&dtzi, 0xcc, sizeof(dtzi)); + SetLastError(0xdeadbeef); + ret = pEnumDynamicTimeZoneInformation(-1, &dtzi); + gle = GetLastError(); + ok(gle == 0xdeadbeef, "got 0x%x\n", gle); + ok(ret == ERROR_NO_MORE_ITEMS, "got %d\n", ret); + ok(!memcmp(&dtzi, &bogus_dtzi, sizeof(dtzi)), "mismatch\n"); + + ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, + "Software\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones", 0, + KEY_ENUMERATE_SUB_KEYS, &hkey); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + index = 0; + while (!(ret = RegEnumKeyW(hkey, index, keyname, sizeof(keyname)))) + { + memset(&dtzi, 0xcc, sizeof(dtzi)); + SetLastError(0xdeadbeef); + ret = pEnumDynamicTimeZoneInformation(index, &dtzi); + gle = GetLastError(); + ok(gle == ERROR_SUCCESS || + (!memcmp(keyname, volgogradW, sizeof(volgogradW)) && gle == ERROR_MUI_FILE_NOT_FOUND), + "got 0x%x for %s\n", gle, wine_dbgstr_w(keyname)); + ok(!ret, "got %d\n", ret); + + ok(!dtzi.DynamicDaylightTimeDisabled, "got %d\n", dtzi.DynamicDaylightTimeDisabled); + + ok(!lstrcmpW(dtzi.TimeZoneKeyName, keyname), "expected %s, got %s\n", + wine_dbgstr_w(dtzi.TimeZoneKeyName), wine_dbgstr_w(keyname)); + + size = sizeof(stdname); + ret = RegGetValueW(hkey, keyname, stdW, RRF_RT_REG_SZ, NULL, stdname, &size); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + ok(!memcmp(&dtzi.StandardName, stdname, size) || + broken(!memcmp(stdname, volgogradW, sizeof(volgogradW))), /* Windows 10 */ + "expected %s, got %s\n", wine_dbgstr_w(dtzi.StandardName), wine_dbgstr_w(stdname)); + + size = sizeof(dltname); + ret = RegGetValueW(hkey, keyname, dltW, RRF_RT_REG_SZ, NULL, dltname, &size); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + ok(!memcmp(&dtzi.DaylightName, dltname, size) || + broken(!memcmp(stdname, volgogradW, sizeof(volgogradW))), /* Windows 10 */ + "expected %s, got %s\n", wine_dbgstr_w(dtzi.DaylightName), wine_dbgstr_w(dltname)); + + size = sizeof(tz_data); + ret = RegGetValueW(hkey, keyname, tziW, RRF_RT_REG_BINARY, NULL, &tz_data, &size); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + ok(dtzi.Bias == tz_data.bias, "expected %d, got %d\n", + dtzi.Bias, tz_data.bias); + ok(dtzi.StandardBias == tz_data.std_bias, "expected %d, got %d\n", + dtzi.StandardBias, tz_data.std_bias); + ok(dtzi.DaylightBias == tz_data.dlt_bias, "expected %d, got %d\n", + dtzi.DaylightBias, tz_data.dlt_bias); + + ok(!memcmp(&dtzi.StandardDate, &tz_data.std_date, sizeof(dtzi.StandardDate)), + "expected %s, got %s\n", + printSystemTime(&dtzi.StandardDate), printSystemTime(&tz_data.std_date)); + + ok(!memcmp(&dtzi.DaylightDate, &tz_data.dlt_date, sizeof(dtzi.DaylightDate)), + "expected %s, got %s\n", + printSystemTime(&dtzi.DaylightDate), printSystemTime(&tz_data.dlt_date)); + + index++; + } + ok(ret == ERROR_NO_MORE_ITEMS, "got %d\n", ret); + + memset(&dtzi, 0xcc, sizeof(dtzi)); + SetLastError(0xdeadbeef); + ret = pEnumDynamicTimeZoneInformation(index, &dtzi); + gle = GetLastError(); + ok(gle == 0xdeadbeef, "got 0x%x\n", gle); + ok(ret == ERROR_NO_MORE_ITEMS, "got %d\n", ret); + ok(!memcmp(&dtzi, &bogus_dtzi, sizeof(dtzi)), "mismatch\n"); + + RegCloseKey(hkey); +} + +START_TEST(time) +{ + HMODULE hmod; + + hmod = LoadLibraryA("kernelbase.dll"); + pEnumDynamicTimeZoneInformation = (void *)GetProcAddress(hmod, "EnumDynamicTimeZoneInformation"); + + test_EnumDynamicTimeZoneInformation(); +} diff --git a/include/timezoneapi.h b/include/timezoneapi.h new file mode 100644 index 0000000000..0bba897718 --- /dev/null +++ b/include/timezoneapi.h @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2019 Daniel Lehman + * + * 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 _APISETTIMEZONE_ +#define _APISETTIMEZONE_ + +#ifdef __cplusplus +extern "C" { +#endif + +WINBASEAPI DWORD WINAPI EnumDynamicTimeZoneInformation(const DWORD, DYNAMIC_TIME_ZONE_INFORMATION *); + +#ifdef __cplusplus +} +#endif + +#endif /* _APISETTIMEZONE_ */ -- 2.17.1

2 1

Wine-DXVK Integration
by Yurii Kolesnykov 26 Feb '19

26 Feb '19

Please consider a PR sent here by Derek Lesho <dereklesho52(a)Gmail.com> https://github.com/wine-mirror/wine/pull/13

2 1

[PATCH v2] setupapi: Search for substituted strings in SetupFindNextMatchLine().
by Zebediah Figura 26 Feb '19

26 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/parser.c | 4 +++- dlls/setupapi/tests/parser.c | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index bc5dba0454..5cde5ebcfa 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1557,6 +1557,7 @@ BOOL WINAPI SetupFindNextMatchLineW( PINFCONTEXT context_in, PCWSTR key, PINFCONTEXT context_out ) { struct inf_file *file = context_in->CurrentInf; + WCHAR buffer[MAX_STRING_LEN + 1]; struct section *section; struct line *line; unsigned int i; @@ -1570,7 +1571,8 @@ BOOL WINAPI SetupFindNextMatchLineW( PINFCONTEXT context_in, PCWSTR key, for (i = context_in->Line+1, line = &section->lines[i]; i < section->nb_lines; i++, line++) { if (line->key_field == -1) continue; - if (!strcmpiW( key, file->fields[line->key_field].text )) + PARSER_string_substW( file, file->fields[line->key_field].text, buffer, ARRAY_SIZE(buffer) ); + if (!strcmpiW( key, buffer )) { if (context_out != context_in) *context_out = *context_in; context_out->Line = i; diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 07dcaafd55..06c674aa16 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -428,6 +428,16 @@ static void test_key_names(void) ok( hinf != INVALID_HANDLE_VALUE, "line %u: open failed err %u\n", i, GetLastError() ); if (hinf == INVALID_HANDLE_VALUE) continue; + ret = SetupFindFirstLineA( hinf, "Test", key_names[i].key, &context ); + ok(ret, "Test %d: failed to find key %s\n", i, key_names[i].key); + + if (!strncmp( key_names[i].data, "%foo%", strlen( "%foo%" ) )) + { + ret = SetupFindFirstLineA( hinf, "Test", "%foo%", &context ); + ok(!ret, "SetupFindFirstLine() should not match unsubstituted keys\n"); + ok(GetLastError() == ERROR_LINE_NOT_FOUND, "got wrong error %u\n", GetLastError()); + } + ret = SetupFindFirstLineA( hinf, "Test", 0, &context ); ok(ret, "SetupFindFirstLineA failed: le=%u\n", GetLastError()); if (!ret) -- 2.20.1

1 0

[PATCH] setupapi: Search for substituted strings in SetupFindNextMatchLine().
by Zebediah Figura 26 Feb '19

26 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/parser.c | 4 +++- dlls/setupapi/tests/parser.c | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index bc5dba0454..5cde5ebcfa 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1557,6 +1557,7 @@ BOOL WINAPI SetupFindNextMatchLineW( PINFCONTEXT context_in, PCWSTR key, PINFCONTEXT context_out ) { struct inf_file *file = context_in->CurrentInf; + WCHAR buffer[MAX_STRING_LEN + 1]; struct section *section; struct line *line; unsigned int i; @@ -1570,7 +1571,8 @@ BOOL WINAPI SetupFindNextMatchLineW( PINFCONTEXT context_in, PCWSTR key, for (i = context_in->Line+1, line = &section->lines[i]; i < section->nb_lines; i++, line++) { if (line->key_field == -1) continue; - if (!strcmpiW( key, file->fields[line->key_field].text )) + PARSER_string_substW( file, file->fields[line->key_field].text, buffer, ARRAY_SIZE(buffer) ); + if (!strcmpiW( key, buffer )) { if (context_out != context_in) *context_out = *context_in; context_out->Line = i; diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 07dcaafd55..53a497407c 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -428,6 +428,16 @@ static void test_key_names(void) ok( hinf != INVALID_HANDLE_VALUE, "line %u: open failed err %u\n", i, GetLastError() ); if (hinf == INVALID_HANDLE_VALUE) continue; + ret = SetupFindFirstLineA( hinf, "Test", key_names[i].key, &context ); + ok(ret, "Test %d: failed to find key %s\n", i, key_names[i].key); + + if (!strncmp( key_names[i].key, "%foo%", strlen( "%foo%" ) )) + { + ret = SetupFindFirstLineA( hinf, "Test", "%foo%", &context ); + ok(!ret, "SetupFindFirstLine() should not match unsubstituted keys\n"); + ok(GetLastError() == ERROR_LINE_NOT_FOUND, "got wrong error %u\n", GetLastError()); + } + ret = SetupFindFirstLineA( hinf, "Test", 0, &context ); ok(ret, "SetupFindFirstLineA failed: le=%u\n", GetLastError()); if (!ret) -- 2.20.1

2 1

[PATCH 1/5] quartz/filesource: Set the sample length in IAsyncReader_SyncReadAligned().
by Zebediah Figura 26 Feb '19

26 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filesource.c | 5 +++++ dlls/quartz/tests/filesource.c | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 71724af700..9e3605757b 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -1292,6 +1292,8 @@ static BOOL sync_read(HANDLE file, LONGLONG offset, LONG length, BYTE *buffer, D ovl.u.s.Offset = (DWORD)offset; ovl.u.s.OffsetHigh = offset >> 32; + *read_len = 0; + ret = ReadFile(file, buffer, length, NULL, &ovl); if (ret || GetLastError() == ERROR_IO_PENDING) ret = GetOverlappedResult(file, &ovl, read_len, TRUE); @@ -1331,6 +1333,9 @@ static HRESULT WINAPI FileAsyncReader_SyncReadAligned(IAsyncReader *iface, IMedi hr = HRESULT_FROM_WIN32(GetLastError()); } + if (SUCCEEDED(hr)) + IMediaSample_SetActualDataLength(sample, read_len); + return hr; } diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 340d1c4e2e..36a25395cd 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -687,7 +687,6 @@ static void test_sync_read_aligned(IAsyncReader *reader, IMemAllocator *allocato ok(hr == S_OK, "Got hr %#x.\n", hr); len = IMediaSample_GetActualDataLength(sample); -todo_wine ok(len == 512, "Got length %d.\n", len); for (i = 0; i < 512; i++) @@ -702,7 +701,6 @@ todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); len = IMediaSample_GetActualDataLength(sample); -todo_wine ok(len == 88, "Got length %d.\n", len); for (i = 0; i < 88; i++) @@ -717,7 +715,6 @@ todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); len = IMediaSample_GetActualDataLength(sample); -todo_wine ok(len == 0, "Got length %d.\n", len); IMediaSample_Release(sample); -- 2.20.1

1 4

[PATCH v3] po: Update Sinhala translation.
by Isira Seneviratne 26 Feb '19

26 Feb '19

1 0

[PATCH] msi: Check the package's assembly cache instead of using a global variable in msi_init_assembly_caches().
by Zebediah Figura 26 Feb '19

26 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46719 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- It's also possible that the cache itself doesn't need to be a package-specific variable; I don't know enough about fusion to guess whether this is the case. dlls/msi/assembly.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 73977ee8ac..9052dd46bd 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -40,7 +40,6 @@ static HRESULT (WINAPI *pCreateAssemblyNameObject)( IAssemblyName **, LPCWSTR, D static HRESULT (WINAPI *pCreateAssemblyEnum)( IAssemblyEnum **, IUnknown *, IAssemblyName *, DWORD, LPVOID ); static HMODULE hfusion10, hfusion11, hfusion20, hfusion40, hmscoree; -static BOOL assembly_caches_initialized; static BOOL init_function_pointers( void ) { @@ -83,7 +82,7 @@ static BOOL init_function_pointers( void ) BOOL msi_init_assembly_caches( MSIPACKAGE *package ) { - if (assembly_caches_initialized) return TRUE; + if (package->cache_sxs) return TRUE; if (!init_function_pointers()) return FALSE; if (CreateAssemblyCache( &package->cache_sxs, 0 ) != S_OK) return FALSE; @@ -92,7 +91,6 @@ BOOL msi_init_assembly_caches( MSIPACKAGE *package ) if (pCreateAssemblyCacheNet20) pCreateAssemblyCacheNet20( &package->cache_net[CLR_VERSION_V20], 0 ); if (pCreateAssemblyCacheNet40) pCreateAssemblyCacheNet40( &package->cache_net[CLR_VERSION_V40], 0 ); - assembly_caches_initialized = TRUE; return TRUE; } -- 2.20.1

1 0

[PATCH v2 1/3] opengl32: add wrapper for wglCreateContext
by Stefan Riesenberger 25 Feb '19

25 Feb '19

v2: make functions static v1: This prevents a stack overflow when using Reshade, which hooks these functions. Signed-off-by: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> --- dlls/opengl32/wgl.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 92410053d5..c6018b0c7b 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -398,9 +398,9 @@ HDC WINAPI wglGetCurrentDC(void) } /*********************************************************************** - * wglCreateContext (OPENGL32.@) + * wgl_create_context wrapper for hooking */ -HGLRC WINAPI wglCreateContext(HDC hdc) +static HGLRC wgl_create_context(HDC hdc) { HGLRC ret = 0; struct wgl_context *drv_ctx; @@ -419,6 +419,14 @@ HGLRC WINAPI wglCreateContext(HDC hdc) return ret; } +/*********************************************************************** + * wglCreateContext (OPENGL32.@) + */ +HGLRC WINAPI wglCreateContext(HDC hdc) +{ + return wgl_create_context(hdc); +} + /*********************************************************************** * wglGetCurrentContext (OPENGL32.@) */ @@ -667,7 +675,7 @@ HGLRC WINAPI wglCreateLayerContext(HDC hdc, TRACE("(%p,%d)\n", hdc, iLayerPlane); if (iLayerPlane == 0) { - return wglCreateContext(hdc); + return wgl_create_context(hdc); } FIXME("no handler for layer %d\n", iLayerPlane); @@ -1212,8 +1220,8 @@ BOOL WINAPI wglUseFontBitmapsW(HDC hdc, DWORD first, DWORD count, DWORD listBase static void fixed_to_double(POINTFX fixed, UINT em_size, GLdouble vertex[3]) { - vertex[0] = (fixed.x.value + (GLdouble)fixed.x.fract / (1 << 16)) / em_size; - vertex[1] = (fixed.y.value + (GLdouble)fixed.y.fract / (1 << 16)) / em_size; + vertex[0] = (fixed.x.value + (GLdouble)fixed.x.fract / (1 << 16)) / em_size; + vertex[1] = (fixed.y.value + (GLdouble)fixed.y.fract / (1 << 16)) / em_size; vertex[2] = 0.0; } @@ -1393,7 +1401,7 @@ static BOOL wglUseFontOutlines_common(HDC hdc, lpgmf->gmfCellIncY = (float)gm.gmCellIncY / em_size; TRACE("%fx%f at %f,%f inc %f,%f\n", lpgmf->gmfBlackBoxX, lpgmf->gmfBlackBoxY, - lpgmf->gmfptGlyphOrigin.x, lpgmf->gmfptGlyphOrigin.y, lpgmf->gmfCellIncX, lpgmf->gmfCellIncY); + lpgmf->gmfptGlyphOrigin.x, lpgmf->gmfptGlyphOrigin.y, lpgmf->gmfCellIncX, lpgmf->gmfCellIncY); lpgmf++; } -- 2.20.1

3 6

[PATCH 2/2] d3d11: Use better name for current entry variable in validate_stream_output_entries().
by Józef Kucia 25 Feb '19

25 Feb '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/shader.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 9a4f1a87b1a5..2276dd72ef0a 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -961,53 +961,53 @@ static HRESULT validate_stream_output_entries(const D3D11_SO_DECLARATION_ENTRY * for (i = 0; i < entry_count; ++i) { - const D3D11_SO_DECLARATION_ENTRY *f = &entries[i]; + const D3D11_SO_DECLARATION_ENTRY *e = &entries[i]; TRACE("Stream: %u, semantic: %s, semantic idx: %u, start component: %u, " "component count %u, output slot %u.\n", - f->Stream, debugstr_a(f->SemanticName), f->SemanticIndex, - f->StartComponent, f->ComponentCount, f->OutputSlot); + e->Stream, debugstr_a(e->SemanticName), e->SemanticIndex, + e->StartComponent, e->ComponentCount, e->OutputSlot); - if (f->Stream >= D3D11_SO_STREAM_COUNT) + if (e->Stream >= D3D11_SO_STREAM_COUNT) { - WARN("Invalid stream %u.\n", f->Stream); + WARN("Invalid stream %u.\n", e->Stream); return E_INVALIDARG; } - if (f->Stream && feature_level < D3D_FEATURE_LEVEL_11_0) + if (e->Stream && feature_level < D3D_FEATURE_LEVEL_11_0) { - WARN("Invalid stream %u for feature level %#x.\n", f->Stream, feature_level); + WARN("Invalid stream %u for feature level %#x.\n", e->Stream, feature_level); return E_INVALIDARG; } - if (f->Stream) + if (e->Stream) { FIXME("Streams not implemented yet.\n"); return E_INVALIDARG; } - if (f->OutputSlot >= D3D11_SO_BUFFER_SLOT_COUNT) + if (e->OutputSlot >= D3D11_SO_BUFFER_SLOT_COUNT) { - WARN("Invalid output slot %u.\n", f->OutputSlot); + WARN("Invalid output slot %u.\n", e->OutputSlot); return E_INVALIDARG; } - if (!f->SemanticName) + if (!e->SemanticName) { - if (f->SemanticIndex) + if (e->SemanticIndex) { - WARN("Invalid semantic idx %u for stream output gap.\n", f->SemanticIndex); + WARN("Invalid semantic idx %u for stream output gap.\n", e->SemanticIndex); return E_INVALIDARG; } - if (f->StartComponent || !f->ComponentCount) + if (e->StartComponent || !e->ComponentCount) { - WARN("Invalid stream output gap %u-%u.\n", f->StartComponent, f->ComponentCount); + WARN("Invalid stream output gap %u-%u.\n", e->StartComponent, e->ComponentCount); return E_INVALIDARG; } } else { - if (f->StartComponent > 3 || f->ComponentCount > 4 || !f->ComponentCount - || f->StartComponent + f->ComponentCount > 4) + if (e->StartComponent > 3 || e->ComponentCount > 4 || !e->ComponentCount + || e->StartComponent + e->ComponentCount > 4) { - WARN("Invalid component range %u-%u.\n", f->StartComponent, f->ComponentCount); + WARN("Invalid component range %u-%u.\n", e->StartComponent, e->ComponentCount); return E_INVALIDARG; } } -- 2.19.2

3 2

[PATCH 1/2] wined3d: Add new registry setting to select shader backend.
by Józef Kucia 25 Feb '19

25 Feb '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 16 +++++++++++----- dlls/wined3d/wined3d_main.c | 31 +++++++++++++++++++++++++------ dlls/wined3d/wined3d_private.h | 10 +++++++++- 3 files changed, 45 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index acfed24b53d4..803ebda37556 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1983,22 +1983,28 @@ static const struct fragment_pipeline *select_fragment_implementation(const stru static const struct wined3d_shader_backend_ops *select_shader_backend(const struct wined3d_gl_info *gl_info) { - BOOL glsl = wined3d_settings.use_glsl && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 20); - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] && !wined3d_settings.use_glsl) + BOOL glsl = wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_AUTO + || wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_GLSL; + BOOL arb = wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_AUTO + || wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_ARB; + + if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] && !glsl) { - ERR_(winediag)("Ignoring the UseGLSL registry key. " + ERR_(winediag)("Ignoring the shader backend registry key. " "GLSL is the only shader backend available on core profile contexts. " "You need to explicitly set GL version to use legacy contexts.\n"); glsl = TRUE; } + glsl = glsl && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 20); + if (glsl && gl_info->supported[ARB_VERTEX_SHADER] && gl_info->supported[ARB_FRAGMENT_SHADER]) return &glsl_shader_backend; - if (gl_info->supported[ARB_VERTEX_PROGRAM] && gl_info->supported[ARB_FRAGMENT_PROGRAM]) + if (arb && gl_info->supported[ARB_VERTEX_PROGRAM] && gl_info->supported[ARB_FRAGMENT_PROGRAM]) return &arb_program_shader_backend; if (glsl && (gl_info->supported[ARB_VERTEX_SHADER] || gl_info->supported[ARB_FRAGMENT_SHADER])) return &glsl_shader_backend; - if (gl_info->supported[ARB_VERTEX_PROGRAM] || gl_info->supported[ARB_FRAGMENT_PROGRAM]) + if (arb && (gl_info->supported[ARB_VERTEX_PROGRAM] || gl_info->supported[ARB_FRAGMENT_PROGRAM])) return &arb_program_shader_backend; return &none_shader_backend; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index ca83d0ae0d96..1b64d2cf5dc4 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -74,7 +74,6 @@ struct wined3d_settings wined3d_settings = { TRUE, /* Multithreaded CS by default. */ MAKEDWORD_VERSION(4, 4), /* Default to OpenGL 4.4 */ - TRUE, /* Use of GLSL enabled by default */ ORM_FBO, /* Use FBOs to do offscreen rendering */ PCI_VENDOR_NONE,/* PCI Vendor ID */ PCI_DEVICE_NONE,/* PCI Device ID */ @@ -90,6 +89,7 @@ struct wined3d_settings wined3d_settings = ~0U, /* No PS shader model limit by default. */ ~0u, /* No CS shader model limit by default. */ FALSE, /* 3D support enabled by default. */ + WINED3D_SHADER_BACKEND_AUTO, }; struct wined3d * CDECL wined3d_create(DWORD flags) @@ -218,14 +218,33 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) tmpvalue >> 16, tmpvalue & 0xffff); wined3d_settings.max_gl_version = tmpvalue; } - if ( !get_config_key( hkey, appkey, "UseGLSL", buffer, size) ) + if (!get_config_key(hkey, appkey, "ShaderBackend", buffer, size)) { - if (!strcmp(buffer,"disabled")) + if (!strcasecmp(buffer, "glsl")) { - ERR_(winediag)("The GLSL shader backend has been disabled. You get to keep all the pieces if it breaks.\n"); - TRACE("Use of GL Shading Language disabled.\n"); - wined3d_settings.use_glsl = FALSE; + ERR_(winediag)("Using the GLSL shader backend.\n"); + wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_GLSL; } + else if (!strcasecmp(buffer, "arb")) + { + ERR_(winediag)("Using the ARB shader backend.\n"); + wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_ARB; + } + else if (!strcasecmp(buffer, "none")) + { + ERR_(winediag)("Disabling shader backends.\n"); + wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_NONE; + } + } + else if (!get_config_key(hkey, appkey, "UseGLSL", buffer, size) && !strcmp(buffer, "disabled")) + { + wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_ARB; + } + if (wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_ARB + || wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_NONE) + { + ERR_(winediag)("The GLSL shader backend has been disabled. You get to keep all the pieces if it breaks.\n"); + TRACE("Use of GL Shading Language disabled.\n"); } if (!get_config_key(hkey, appkey, "OffscreenRenderingMode", buffer, size) && !strcmp(buffer,"backbuffer")) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cd49789c1b3d..b3f3847045dd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -375,13 +375,20 @@ static inline void wined3d_pause(void) #define PCI_VENDOR_NONE 0xffff /* e.g. 0x8086 for Intel and 0x10de for Nvidia */ #define PCI_DEVICE_NONE 0xffff /* e.g. 0x14f for a Geforce6200 */ +enum wined3d_shader_backend +{ + WINED3D_SHADER_BACKEND_AUTO, + WINED3D_SHADER_BACKEND_GLSL, + WINED3D_SHADER_BACKEND_ARB, + WINED3D_SHADER_BACKEND_NONE, +}; + /* NOTE: When adding fields to this structure, make sure to update the default * values in wined3d_main.c as well. */ struct wined3d_settings { unsigned int cs_multithreaded; DWORD max_gl_version; - BOOL use_glsl; int offscreen_rendering_mode; unsigned short pci_vendor_id; unsigned short pci_device_id; @@ -398,6 +405,7 @@ struct wined3d_settings unsigned int max_sm_ps; unsigned int max_sm_cs; BOOL no_3d; + enum wined3d_shader_backend shader_backend; }; extern struct wined3d_settings wined3d_settings DECLSPEC_HIDDEN; -- 2.19.2

2 1

[PATCH 1/3] opengl32: add wrapper for wglCreateContext
by Stefan Riesenberger 25 Feb '19

25 Feb '19

This prevents a stack overflow when using Reshade, which hooks these functions. Signed-off-by: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> --- dlls/opengl32/wgl.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 92410053d5..1d1a944bae 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -398,9 +398,9 @@ HDC WINAPI wglGetCurrentDC(void) } /*********************************************************************** - * wglCreateContext (OPENGL32.@) + * wgl_create_context wrapper for hooking */ -HGLRC WINAPI wglCreateContext(HDC hdc) +HGLRC wgl_create_context(HDC hdc) { HGLRC ret = 0; struct wgl_context *drv_ctx; @@ -419,6 +419,14 @@ HGLRC WINAPI wglCreateContext(HDC hdc) return ret; } +/*********************************************************************** + * wglCreateContext (OPENGL32.@) + */ +HGLRC WINAPI wglCreateContext(HDC hdc) +{ + return wgl_create_context(hdc); +} + /*********************************************************************** * wglGetCurrentContext (OPENGL32.@) */ @@ -667,7 +675,7 @@ HGLRC WINAPI wglCreateLayerContext(HDC hdc, TRACE("(%p,%d)\n", hdc, iLayerPlane); if (iLayerPlane == 0) { - return wglCreateContext(hdc); + return wgl_create_context(hdc); } FIXME("no handler for layer %d\n", iLayerPlane); -- 2.20.1

3 5

[PATCH vkd3d 8/9] include: Add typedefs for vkd3d-shader function pointers.
by Józef Kucia 25 Feb '19

25 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_shader.h | 86 +++++++++++++++++++++++++++++------------- 1 file changed, 60 insertions(+), 26 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index fef058cb4c97..ed4c0a0075a6 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1,5 +1,5 @@ /* - * Copyright 2017 Józef Kucia for CodeWeavers + * Copyright 2017-2019 Józef Kucia for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -222,12 +222,6 @@ struct vkd3d_shader_domain_shader_compile_arguments enum vkd3d_tessellator_output_primitive partitioning; }; -int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_code *spirv, unsigned int compiler_options, - const struct vkd3d_shader_interface_info *shader_interface_info, - const struct vkd3d_shader_compile_arguments *compile_args); -void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); - enum vkd3d_filter { VKD3D_FILTER_MIN_MAG_MIP_POINT = 0x0, @@ -405,10 +399,6 @@ struct vkd3d_root_signature_desc enum vkd3d_root_signature_flags flags; }; -int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, - struct vkd3d_root_signature_desc *root_signature); -void vkd3d_shader_free_root_signature(struct vkd3d_root_signature_desc *root_signature); - enum vkd3d_root_signature_version { VKD3D_ROOT_SIGNATURE_VERSION_1_0 = 0x1, @@ -416,10 +406,6 @@ enum vkd3d_root_signature_version VKD3D_FORCE_32_BIT_ENUM(VKD3D_ROOT_SIGNATURE_VERSION), }; -/* FIXME: Add support for returning error messages (ID3DBlob). */ -int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc *root_signature, - enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); - /* FIXME: Add support for 64 UAV bind slots. */ #define VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS 8 @@ -434,9 +420,6 @@ struct vkd3d_shader_scan_info bool use_vocp; }; -int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_scan_info *scan_info); - enum vkd3d_component_type { VKD3D_TYPE_VOID = 0, @@ -489,27 +472,78 @@ struct vkd3d_shader_signature unsigned int element_count; }; -int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_signature *signature); -struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( - const struct vkd3d_shader_signature *signature, const char *semantic_name, - unsigned int semantic_index, unsigned int stream_index); -void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature); - /* swizzle bits fields: wwzzyyxx */ #define VKD3D_SWIZZLE_X (0u) #define VKD3D_SWIZZLE_Y (1u) #define VKD3D_SWIZZLE_Z (2u) #define VKD3D_SWIZZLE_W (3u) + #define VKD3D_SWIZZLE_MASK (0x3u) #define VKD3D_SWIZZLE_SHIFT(idx) (2u * (idx)) -#define VKD3D_SWIZZLE(x, y, z, w) (((x & VKD3D_SWIZZLE_MASK) << VKD3D_SWIZZLE_SHIFT(0)) \ + +#define VKD3D_SWIZZLE(x, y, z, w) \ + (((x & VKD3D_SWIZZLE_MASK) << VKD3D_SWIZZLE_SHIFT(0)) \ | ((y & VKD3D_SWIZZLE_MASK) << VKD3D_SWIZZLE_SHIFT(1)) \ | ((z & VKD3D_SWIZZLE_MASK) << VKD3D_SWIZZLE_SHIFT(2)) \ | ((w & VKD3D_SWIZZLE_MASK) << VKD3D_SWIZZLE_SHIFT(3))) + #define VKD3D_NO_SWIZZLE \ VKD3D_SWIZZLE(VKD3D_SWIZZLE_X, VKD3D_SWIZZLE_Y, VKD3D_SWIZZLE_Z, VKD3D_SWIZZLE_W) +#ifndef VKD3D_SHADER_NO_PROTOTYPES + +int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, + struct vkd3d_shader_code *spirv, unsigned int compiler_options, + const struct vkd3d_shader_interface_info *shader_interface_info, + const struct vkd3d_shader_compile_arguments *compile_args); +void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); + +int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, + struct vkd3d_root_signature_desc *root_signature); +void vkd3d_shader_free_root_signature(struct vkd3d_root_signature_desc *root_signature); + +/* FIXME: Add support for returning error messages (ID3DBlob). */ +int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc *root_signature, + enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); + +int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, + struct vkd3d_shader_scan_info *scan_info); + +int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, + struct vkd3d_shader_signature *signature); +struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( + const struct vkd3d_shader_signature *signature, const char *semantic_name, + unsigned int semantic_index, unsigned int stream_index); +void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature); + +#endif /* VKD3D_SHADER_NO_PROTOTYPES */ + +/* + * Function pointer typedefs for vkd3d-shader functions. + */ +typedef int (*PFN_vkd3d_shader_compile_dxbc)(const struct vkd3d_shader_code *dxbc, + struct vkd3d_shader_code *spirv, unsigned int compiler_options, + const struct vkd3d_shader_interface_info *shader_interface_info, + const struct vkd3d_shader_compile_arguments *compile_args); +typedef void (*PFN_vkd3d_shader_free_shader_code)(struct vkd3d_shader_code *code); + +typedef int (*PFN_vkd3d_shader_parse_root_signature)(const struct vkd3d_shader_code *dxbc, + struct vkd3d_root_signature_desc *root_signature); +typedef void (*PFN_vkd3d_shader_free_root_signature)(struct vkd3d_root_signature_desc *root_signature); + +typedef int (*PFN_vkd3d_shader_serialize_root_signature)(const struct vkd3d_root_signature_desc *root_signature, + enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); + +typedef int (*PFN_vkd3d_shader_scan_dxbc)(const struct vkd3d_shader_code *dxbc, + struct vkd3d_shader_scan_info *scan_info); + +typedef int (*PFN_vkd3d_shader_parse_input_signature)(const struct vkd3d_shader_code *dxbc, + struct vkd3d_shader_signature *signature); +typedef struct vkd3d_shader_signature_element * (*PFN_vkd3d_shader_find_signature_element)( + const struct vkd3d_shader_signature *signature, const char *semantic_name, + unsigned int semantic_index, unsigned int stream_index); +typedef void (*PFN_vkd3d_shader_free_shader_signature)(struct vkd3d_shader_signature *signature); + #ifdef __cplusplus } #endif /* __cplusplus */ -- 2.19.2

2 1

[PATCH vkd3d 5/9] vkd3d-shader: Do not assume vec4 destination in vkd3d_dxbc_compiler_emit_store().
by Józef Kucia 25 Feb '19

25 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 244efd8da962..85b8d72e2218 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2932,8 +2932,8 @@ static void vkd3d_dxbc_compiler_emit_store(struct vkd3d_dxbc_compiler *compiler, SpvStorageClass storage_class, unsigned int write_mask, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + unsigned int component_count, dst_component_count; uint32_t type_id, dst_val_id; - unsigned int component_count; assert(write_mask); @@ -2945,13 +2945,14 @@ static void vkd3d_dxbc_compiler_emit_store(struct vkd3d_dxbc_compiler *compiler, dst_id, dst_write_mask, component_type, storage_class, write_mask, val_id); } - if (component_count != VKD3D_VEC4_SIZE) + dst_component_count = vkd3d_write_mask_component_count(dst_write_mask); + if (dst_component_count != component_count) { - type_id = vkd3d_spirv_get_type_id(builder, component_type, VKD3D_VEC4_SIZE); + type_id = vkd3d_spirv_get_type_id(builder, component_type, dst_component_count); dst_val_id = vkd3d_spirv_build_op_load(builder, type_id, dst_id, SpvMemoryAccessMaskNone); val_id = vkd3d_dxbc_compiler_emit_vector_shuffle(compiler, - dst_val_id, val_id, write_mask, component_type, VKD3D_VEC4_SIZE); + dst_val_id, val_id, write_mask, component_type, dst_component_count); } vkd3d_spirv_build_op_store(builder, dst_id, val_id, SpvMemoryAccessMaskNone); -- 2.19.2

2 1

[PATCH vkd3d 9/9] tests: Add test for vkd3d shader function pointers.
by Józef Kucia 25 Feb '19

25 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/vkd3d_shader_api.c | 72 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index ec439e146ddb..65099f22f9a7 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -52,7 +52,79 @@ static void test_invalid_shaders(void) ok(rc == VKD3D_ERROR_INVALID_SHADER, "Got unexpected error code %d.\n", rc); } +static void test_vkd3d_shader_pfns(void) +{ + PFN_vkd3d_shader_serialize_root_signature pfn_vkd3d_shader_serialize_root_signature; + PFN_vkd3d_shader_find_signature_element pfn_vkd3d_shader_find_signature_element; + PFN_vkd3d_shader_free_shader_signature pfn_vkd3d_shader_free_shader_signature; + PFN_vkd3d_shader_parse_input_signature pfn_vkd3d_shader_parse_input_signature; + PFN_vkd3d_shader_parse_root_signature pfn_vkd3d_shader_parse_root_signature; + PFN_vkd3d_shader_free_root_signature pfn_vkd3d_shader_free_root_signature; + PFN_vkd3d_shader_free_shader_code pfn_vkd3d_shader_free_shader_code; + PFN_vkd3d_shader_compile_dxbc pfn_vkd3d_shader_compile_dxbc; + PFN_vkd3d_shader_scan_dxbc pfn_vkd3d_shader_scan_dxbc; + + struct vkd3d_root_signature_desc root_signature_desc; + struct vkd3d_shader_signature_element *element; + struct vkd3d_shader_scan_info scan_info; + struct vkd3d_shader_signature signature; + struct vkd3d_shader_code dxbc, spirv; + int rc; + + static const struct vkd3d_root_signature_desc empty_rs_desc; + static const DWORD vs_code[] = + { +#if 0 + float4 main(int4 p : POSITION) : SV_Position + { + return p; + } +#endif + 0x43425844, 0x3fd50ab1, 0x580a1d14, 0x28f5f602, 0xd1083e3a, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x0500002b, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + static const struct vkd3d_shader_code vs = {vs_code, sizeof(vs_code)}; + + pfn_vkd3d_shader_serialize_root_signature = vkd3d_shader_serialize_root_signature; + pfn_vkd3d_shader_find_signature_element = vkd3d_shader_find_signature_element; + pfn_vkd3d_shader_free_shader_signature = vkd3d_shader_free_shader_signature; + pfn_vkd3d_shader_parse_input_signature = vkd3d_shader_parse_input_signature; + pfn_vkd3d_shader_parse_root_signature = vkd3d_shader_parse_root_signature; + pfn_vkd3d_shader_free_root_signature = vkd3d_shader_free_root_signature; + pfn_vkd3d_shader_free_shader_code = vkd3d_shader_free_shader_code; + pfn_vkd3d_shader_compile_dxbc = vkd3d_shader_compile_dxbc; + pfn_vkd3d_shader_scan_dxbc = vkd3d_shader_scan_dxbc; + + rc = pfn_vkd3d_shader_serialize_root_signature(&empty_rs_desc, VKD3D_ROOT_SIGNATURE_VERSION_1_0, &dxbc); + ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); + rc = pfn_vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc); + ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); + pfn_vkd3d_shader_free_root_signature(&root_signature_desc); + pfn_vkd3d_shader_free_shader_code(&dxbc); + + rc = pfn_vkd3d_shader_parse_input_signature(&vs, &signature); + ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); + element = pfn_vkd3d_shader_find_signature_element(&signature, "POSITION", 0, 0); + ok(element, "Could not find shader signature element.\n"); + pfn_vkd3d_shader_free_shader_signature(&signature); + + rc = pfn_vkd3d_shader_compile_dxbc(&vs, &spirv, 0, NULL, NULL); + ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); + pfn_vkd3d_shader_free_shader_code(&spirv); + + memset(&scan_info, 0, sizeof(scan_info)); + scan_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO; + rc = pfn_vkd3d_shader_scan_dxbc(&vs, &scan_info); + ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); +} + START_TEST(vkd3d_shader_api) { run_test(test_invalid_shaders); + run_test(test_vkd3d_shader_pfns); } -- 2.19.2

2 1

[PATCH vkd3d 7/9] vkd3d-shader: Get rid of vkd3d_dxbc_compiler_emit_swizzle_ext().
by Józef Kucia 25 Feb '19

25 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index afd761587a2e..e0d7b0d2019e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2621,7 +2621,7 @@ static bool vkd3d_swizzle_is_equal(unsigned int dst_write_mask, return vkd3d_compact_swizzle(VKD3D_NO_SWIZZLE, dst_write_mask) == vkd3d_compact_swizzle(swizzle, write_mask); } -static uint32_t vkd3d_dxbc_compiler_emit_swizzle_ext(struct vkd3d_dxbc_compiler *compiler, +static uint32_t vkd3d_dxbc_compiler_emit_swizzle(struct vkd3d_dxbc_compiler *compiler, uint32_t val_id, unsigned int val_write_mask, enum vkd3d_component_type component_type, unsigned int swizzle, unsigned int write_mask) { @@ -2668,13 +2668,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_swizzle_ext(struct vkd3d_dxbc_compiler type_id, val_id, val_id, components, component_count); } -static uint32_t vkd3d_dxbc_compiler_emit_swizzle(struct vkd3d_dxbc_compiler *compiler, - uint32_t val_id, enum vkd3d_component_type component_type, DWORD swizzle, DWORD write_mask) -{ - return vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, - val_id, VKD3DSP_WRITEMASK_ALL, component_type, swizzle, write_mask); -} - static uint32_t vkd3d_dxbc_compiler_emit_vector_shuffle(struct vkd3d_dxbc_compiler *compiler, uint32_t vector1_id, uint32_t vector2_id, uint32_t write_mask, enum vkd3d_component_type component_type, unsigned int component_count) @@ -2806,7 +2799,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_reg(struct vkd3d_dxbc_compiler *co val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_info.id, SpvMemoryAccessMaskNone); } - val_id = vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, + val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, val_id, reg_info.write_mask, reg_info.component_type, swizzle, write_mask); if (component_type != reg_info.component_type) @@ -3019,7 +3012,7 @@ static void vkd3d_dxbc_compiler_emit_store_dst_swizzled(struct vkd3d_dxbc_compil { struct vkd3d_shader_dst_param typed_dst = *dst; val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, - val_id, component_type, swizzle, dst->write_mask); + val_id, VKD3DSP_WRITEMASK_ALL, component_type, swizzle, dst->write_mask); /* XXX: The register data type could be fixed by the shader parser. For SM5 * shaders the data types are stored in instructions modifiers. */ @@ -3654,7 +3647,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi val_id = vkd3d_spirv_build_op_bitcast(builder, float_type_id, val_id); } - val_id = vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, val_id, + val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, val_id, vkd3d_write_mask_from_component_count(input_component_count) << component_idx, VKD3D_TYPE_FLOAT, VKD3D_NO_SWIZZLE, dst->write_mask); @@ -4049,7 +4042,7 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi use_mask = (output->mask >> 8) & 0xff; swizzle = get_shader_output_swizzle(compiler, output->register_index); val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, - val_id, VKD3D_TYPE_FLOAT, swizzle, write_mask); + val_id, VKD3DSP_WRITEMASK_ALL, VKD3D_TYPE_FLOAT, swizzle, write_mask); component_count = vkd3d_write_mask_component_count(write_mask); @@ -4089,7 +4082,7 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi indexes[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, index++); chain_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, output_id, indexes, ARRAY_SIZE(indexes)); - object_id = vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, val_id, + object_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, val_id, write_mask, output_info->component_type, VKD3D_NO_SWIZZLE, VKD3DSP_WRITEMASK_0 << i); vkd3d_spirv_build_op_store(builder, chain_id, object_id, SpvMemoryAccessMaskNone); } @@ -7320,7 +7313,7 @@ static void vkd3d_dxbc_compiler_emit_bufinfo(struct vkd3d_dxbc_compiler *compile val_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, 2)); } - val_id = vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, + val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, val_id, write_mask, VKD3D_TYPE_UINT, src->swizzle, dst->write_mask); vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); } @@ -7380,7 +7373,7 @@ static void vkd3d_dxbc_compiler_emit_resinfo(struct vkd3d_dxbc_compiler *compile val_id = vkd3d_spirv_build_op_convert_utof(builder, type_id, val_id); } val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, - val_id, VKD3D_TYPE_FLOAT, src[1].swizzle, dst->write_mask); + val_id, VKD3DSP_WRITEMASK_ALL, VKD3D_TYPE_FLOAT, src[1].swizzle, dst->write_mask); vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); } @@ -7427,7 +7420,7 @@ static void vkd3d_dxbc_compiler_emit_sample_info(struct vkd3d_dxbc_compiler *com } val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, - val_id, VKD3D_TYPE_FLOAT, src->swizzle, dst->write_mask); + val_id, VKD3DSP_WRITEMASK_ALL, VKD3D_TYPE_FLOAT, src->swizzle, dst->write_mask); vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); } -- 2.19.2

2 1

[PATCH vkd3d 6/9] vkd3d-shader: Do not assume float type for arrayed shader outputs.
by Józef Kucia 25 Feb '19

25 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 85b8d72e2218..afd761587a2e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4077,7 +4077,7 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi return; } - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 1); + type_id = vkd3d_spirv_get_type_id(builder, output_info->component_type, 1); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassOutput, type_id); mask = output_info->array_element_mask; mask &= (1u << (output->semantic_index * VKD3D_VEC4_SIZE)) - 1; -- 2.19.2

2 1

[PATCH vkd3d 4/9] vkd3d-shader: Call vkd3d_dxbc_compiler_leave_shader_phase() also for last phase.
by Józef Kucia 25 Feb '19

25 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 16dc90c13e6b..244efd8da962 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7866,8 +7866,12 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_compile_arguments *compile_args = compiler->compile_args; const struct vkd3d_shader_domain_shader_compile_arguments *ds_args; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_phase *phase; - vkd3d_spirv_build_op_function_end(builder); + if ((phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler))) + vkd3d_dxbc_compiler_leave_shader_phase(compiler, phase); + else + vkd3d_spirv_build_op_function_end(builder); if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL) vkd3d_dxbc_compiler_emit_hull_shader_main(compiler); -- 2.19.2

2 1

[PATCH vkd3d 3/9] vkd3d-shader: Emit epilogue functions while leaving shader phases.
by Józef Kucia 25 Feb '19

25 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 291 ++++++++++++++++++++------------------ 1 file changed, 156 insertions(+), 135 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ce6201603afa..16dc90c13e6b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3365,6 +3365,33 @@ static unsigned int vkd3d_count_signature_elements_for_reg( return count; } +static void vkd3d_dxbc_compiler_emit_shader_phase_name(struct vkd3d_dxbc_compiler *compiler, + uint32_t id, const struct vkd3d_shader_phase *phase, const char *suffix) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const char *name; + + if (!suffix) + suffix = ""; + + switch (phase->type) + { + case VKD3DSIH_HS_CONTROL_POINT_PHASE: + name = "control"; + break; + case VKD3DSIH_HS_FORK_PHASE: + name = "fork"; + break; + case VKD3DSIH_HS_JOIN_PHASE: + name = "join"; + break; + default: + ERR("Invalid phase type %#x.\n", phase->type); + return; + } + vkd3d_spirv_build_op_name(builder, id, "%s%u%s", name, phase->idx, suffix); +} + static void vkd3d_dxbc_compiler_begin_shader_phase(struct vkd3d_dxbc_compiler *compiler, struct vkd3d_shader_phase *phase) { @@ -3372,7 +3399,6 @@ static void vkd3d_dxbc_compiler_begin_shader_phase(struct vkd3d_dxbc_compiler *c uint32_t void_id, function_type_id; unsigned int param_count; uint32_t param_type_id; - const char *name; if (phase->instance_count) { @@ -3397,22 +3423,7 @@ static void vkd3d_dxbc_compiler_begin_shader_phase(struct vkd3d_dxbc_compiler *c vkd3d_spirv_build_op_label(builder, vkd3d_spirv_alloc_id(builder)); phase->function_location = vkd3d_spirv_stream_current_location(&builder->function_stream); - switch (phase->type) - { - case VKD3DSIH_HS_CONTROL_POINT_PHASE: - name = "control"; - break; - case VKD3DSIH_HS_FORK_PHASE: - name = "fork"; - break; - case VKD3DSIH_HS_JOIN_PHASE: - name = "join"; - break; - default: - ERR("Invalid phase type %#x.\n", phase->type); - return; - } - vkd3d_spirv_build_op_name(builder, phase->function_id, "%s%u", name, phase->idx); + vkd3d_dxbc_compiler_emit_shader_phase_name(compiler, phase->function_id, phase, NULL); } static const struct vkd3d_shader_phase *vkd3d_dxbc_compiler_get_current_shader_phase( @@ -4022,6 +4033,128 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_output(struct vkd3d_dxbc_compi vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } +static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_signature_element *output, + const struct vkd3d_shader_output_info *output_info, uint32_t val_id) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t type_id, zero_id, ptr_type_id, chain_id, object_id; + uint32_t write_mask, use_mask, uninit_mask, swizzle, mask; + uint32_t output_id, indexes[1]; + unsigned int component_count; + unsigned int i, index; + + write_mask = output->mask & 0xff; + use_mask = (output->mask >> 8) & 0xff; + swizzle = get_shader_output_swizzle(compiler, output->register_index); + val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, + val_id, VKD3D_TYPE_FLOAT, swizzle, write_mask); + + component_count = vkd3d_write_mask_component_count(write_mask); + + if (output_info->component_type != VKD3D_TYPE_FLOAT) + { + type_id = vkd3d_spirv_get_type_id(builder, output_info->component_type, component_count); + val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); + } + + uninit_mask = write_mask & use_mask; + if (uninit_mask) + { + /* Set values to 0 for not initialized shader output components. */ + zero_id = vkd3d_dxbc_compiler_get_constant_vector(compiler, + output_info->component_type, VKD3D_VEC4_SIZE, 0); + val_id = vkd3d_dxbc_compiler_emit_vector_shuffle(compiler, + val_id, zero_id, uninit_mask, output_info->component_type, component_count); + } + + output_id = output_info->id; + + if (!output_info->array_element_mask) + { + vkd3d_spirv_build_op_store(builder, output_id, val_id, SpvMemoryAccessMaskNone); + return; + } + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 1); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassOutput, type_id); + mask = output_info->array_element_mask; + mask &= (1u << (output->semantic_index * VKD3D_VEC4_SIZE)) - 1; + for (i = 0, index = vkd3d_popcount(mask); i < VKD3D_VEC4_SIZE; ++i) + { + if (!(write_mask & (VKD3DSP_WRITEMASK_0 << i))) + continue; + + indexes[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, index++); + chain_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, + output_id, indexes, ARRAY_SIZE(indexes)); + object_id = vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, val_id, + write_mask, output_info->component_type, VKD3D_NO_SWIZZLE, VKD3DSP_WRITEMASK_0 << i); + vkd3d_spirv_build_op_store(builder, chain_id, object_id, SpvMemoryAccessMaskNone); + } +} + +static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_compiler *compiler) +{ + uint32_t param_type_id[MAX_REG_OUTPUT + 1], param_id[MAX_REG_OUTPUT + 1] = {}; + const struct vkd3d_shader_signature *signature = compiler->output_signature; + uint32_t void_id, type_id, ptr_type_id, function_type_id, function_id; + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + unsigned int i, count; + DWORD variable_idx; + + STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_id)); + STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_type_id)); + + function_id = compiler->epilogue_function_id; + + void_id = vkd3d_spirv_get_op_type_void(builder); + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 4); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassPrivate, type_id); + for (i = 0, count = 0; i < ARRAY_SIZE(compiler->private_output_variable); ++i) + { + if (compiler->private_output_variable[i]) + param_type_id[count++] = ptr_type_id; + } + function_type_id = vkd3d_spirv_get_op_type_function(builder, void_id, param_type_id, count); + + vkd3d_spirv_build_op_function(builder, void_id, function_id, + SpvFunctionControlMaskNone, function_type_id); + + for (i = 0; i < ARRAY_SIZE(compiler->private_output_variable); ++i) + { + if (compiler->private_output_variable[i]) + param_id[i] = vkd3d_spirv_build_op_function_parameter(builder, ptr_type_id); + } + + vkd3d_spirv_build_op_label(builder, vkd3d_spirv_alloc_id(builder)); + + for (i = 0; i < ARRAY_SIZE(compiler->private_output_variable); ++i) + { + if (compiler->private_output_variable[i]) + param_id[i] = vkd3d_spirv_build_op_load(builder, type_id, param_id[i], SpvMemoryAccessMaskNone); + } + + for (i = 0; i < signature->element_count; ++i) + { + variable_idx = vkd3d_dxbc_compiler_get_output_variable_index(compiler, + signature->elements[i].register_index); + + if (!param_id[variable_idx]) + continue; + + vkd3d_dxbc_compiler_emit_store_shader_output(compiler, + &signature->elements[i], &compiler->output_info[i], param_id[variable_idx]); + } + + vkd3d_spirv_build_op_return(&compiler->spirv_builder); + vkd3d_spirv_build_op_function_end(builder); + + memset(compiler->output_info, 0, signature->element_count * sizeof(*compiler->output_info)); + memset(compiler->private_output_variable, 0, sizeof(compiler->private_output_variable)); + compiler->epilogue_function_id = 0; +} + static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_compiler *compiler) { const struct vkd3d_shader_transform_feedback_info *xfb_info = compiler->xfb_info; @@ -4999,6 +5132,12 @@ static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *c vkd3d_spirv_build_op_function_end(builder); + if (compiler->epilogue_function_id) + { + vkd3d_dxbc_compiler_emit_shader_phase_name(compiler, compiler->epilogue_function_id, phase, "_epilogue"); + vkd3d_dxbc_compiler_emit_shader_epilogue_function(compiler); + } + compiler->temp_id = 0; compiler->temp_count = 0; @@ -7721,124 +7860,6 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, return ret; } -static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_signature_element *output, - const struct vkd3d_shader_output_info *output_info, uint32_t val_id) -{ - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t type_id, zero_id, ptr_type_id, chain_id, object_id; - uint32_t write_mask, use_mask, uninit_mask, swizzle, mask; - uint32_t output_id, indexes[1]; - unsigned int component_count; - unsigned int i, index; - - write_mask = output->mask & 0xff; - use_mask = (output->mask >> 8) & 0xff; - swizzle = get_shader_output_swizzle(compiler, output->register_index); - val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, - val_id, VKD3D_TYPE_FLOAT, swizzle, write_mask); - - component_count = vkd3d_write_mask_component_count(write_mask); - - if (output_info->component_type != VKD3D_TYPE_FLOAT) - { - type_id = vkd3d_spirv_get_type_id(builder, output_info->component_type, component_count); - val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); - } - - uninit_mask = write_mask & use_mask; - if (uninit_mask) - { - /* Set values to 0 for not initialized shader output components. */ - zero_id = vkd3d_dxbc_compiler_get_constant_vector(compiler, - output_info->component_type, VKD3D_VEC4_SIZE, 0); - val_id = vkd3d_dxbc_compiler_emit_vector_shuffle(compiler, - val_id, zero_id, uninit_mask, output_info->component_type, component_count); - } - - output_id = output_info->id; - - if (!output_info->array_element_mask) - { - vkd3d_spirv_build_op_store(builder, output_id, val_id, SpvMemoryAccessMaskNone); - return; - } - - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 1); - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassOutput, type_id); - mask = output_info->array_element_mask; - mask &= (1u << (output->semantic_index * VKD3D_VEC4_SIZE)) - 1; - for (i = 0, index = vkd3d_popcount(mask); i < VKD3D_VEC4_SIZE; ++i) - { - if (!(write_mask & (VKD3DSP_WRITEMASK_0 << i))) - continue; - - indexes[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, index++); - chain_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, - output_id, indexes, ARRAY_SIZE(indexes)); - object_id = vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, val_id, - write_mask, output_info->component_type, VKD3D_NO_SWIZZLE, VKD3DSP_WRITEMASK_0 << i); - vkd3d_spirv_build_op_store(builder, chain_id, object_id, SpvMemoryAccessMaskNone); - } -} - -static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_compiler *compiler) -{ - uint32_t param_type_id[MAX_REG_OUTPUT + 1], param_id[MAX_REG_OUTPUT + 1] = {}; - const struct vkd3d_shader_signature *signature = compiler->output_signature; - uint32_t void_id, type_id, ptr_type_id, function_type_id, function_id; - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - unsigned int i, count; - DWORD variable_idx; - - STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_id)); - STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_type_id)); - - function_id = compiler->epilogue_function_id; - - void_id = vkd3d_spirv_get_op_type_void(builder); - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 4); - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassPrivate, type_id); - for (i = 0, count = 0; i < ARRAY_SIZE(compiler->private_output_variable); ++i) - { - if (compiler->private_output_variable[i]) - param_type_id[count++] = ptr_type_id; - } - function_type_id = vkd3d_spirv_get_op_type_function(builder, void_id, param_type_id, count); - - vkd3d_spirv_build_op_function(builder, void_id, function_id, - SpvFunctionControlMaskNone, function_type_id); - - for (i = 0; i < ARRAY_SIZE(compiler->private_output_variable); ++i) - { - if (compiler->private_output_variable[i]) - param_id[i] = vkd3d_spirv_build_op_function_parameter(builder, ptr_type_id); - } - - vkd3d_spirv_build_op_label(builder, vkd3d_spirv_alloc_id(builder)); - - for (i = 0; i < ARRAY_SIZE(compiler->private_output_variable); ++i) - { - if (compiler->private_output_variable[i]) - param_id[i] = vkd3d_spirv_build_op_load(builder, type_id, param_id[i], SpvMemoryAccessMaskNone); - } - - for (i = 0; i < signature->element_count; ++i) - { - variable_idx = vkd3d_dxbc_compiler_get_output_variable_index(compiler, - signature->elements[i].register_index); - - if (!param_id[variable_idx]) - continue; - - vkd3d_dxbc_compiler_emit_store_shader_output(compiler, - &signature->elements[i], &compiler->output_info[i], param_id[variable_idx]); - } - - vkd3d_spirv_build_op_return(&compiler->spirv_builder); - vkd3d_spirv_build_op_function_end(builder); -} - int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, struct vkd3d_shader_code *spirv) { -- 2.19.2

2 1

[PATCH vkd3d 2/9] vkd3d-shader: Factor out vkd3d_dxbc_compiler_emit_store().
by Józef Kucia 25 Feb '19

25 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 75 +++++++++++++++++++++++---------------- 1 file changed, 45 insertions(+), 30 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ef5420925474..ce6201603afa 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2908,65 +2908,80 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_src_with_type(struct vkd3d_dxbc_co } static void vkd3d_dxbc_compiler_emit_store_scalar(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *reg, DWORD write_mask, - const struct vkd3d_shader_register_info *reg_info, uint32_t val_id) + uint32_t dst_id, unsigned int dst_write_mask, enum vkd3d_component_type component_type, + SpvStorageClass storage_class, unsigned int write_mask, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t type_id, ptr_type_id, id, index[1]; + uint32_t type_id, ptr_type_id, index[1]; unsigned int component_idx; - assert(reg->type != VKD3DSPR_IMMCONST); - - id = reg_info->id; - if (vkd3d_write_mask_component_count(reg_info->write_mask) > 1) + if (vkd3d_write_mask_component_count(dst_write_mask) > 1) { - type_id = vkd3d_spirv_get_type_id(builder, reg_info->component_type, 1); - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info->storage_class, type_id); + type_id = vkd3d_spirv_get_type_id(builder, component_type, 1); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); component_idx = vkd3d_write_mask_get_component_idx(write_mask); index[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx); - id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, ptr_type_id, id, index, ARRAY_SIZE(index)); + dst_id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, ptr_type_id, dst_id, index, ARRAY_SIZE(index)); + } + + vkd3d_spirv_build_op_store(builder, dst_id, val_id, SpvMemoryAccessMaskNone); +} + +static void vkd3d_dxbc_compiler_emit_store(struct vkd3d_dxbc_compiler *compiler, + uint32_t dst_id, unsigned int dst_write_mask, enum vkd3d_component_type component_type, + SpvStorageClass storage_class, unsigned int write_mask, uint32_t val_id) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t type_id, dst_val_id; + unsigned int component_count; + + assert(write_mask); + + component_count = vkd3d_write_mask_component_count(write_mask); + + if (component_count == 1) + { + return vkd3d_dxbc_compiler_emit_store_scalar(compiler, + dst_id, dst_write_mask, component_type, storage_class, write_mask, val_id); + } + + if (component_count != VKD3D_VEC4_SIZE) + { + type_id = vkd3d_spirv_get_type_id(builder, component_type, VKD3D_VEC4_SIZE); + dst_val_id = vkd3d_spirv_build_op_load(builder, type_id, dst_id, SpvMemoryAccessMaskNone); + + val_id = vkd3d_dxbc_compiler_emit_vector_shuffle(compiler, + dst_val_id, val_id, write_mask, component_type, VKD3D_VEC4_SIZE); } - vkd3d_spirv_build_op_store(builder, id, val_id, SpvMemoryAccessMaskNone); + vkd3d_spirv_build_op_store(builder, dst_id, val_id, SpvMemoryAccessMaskNone); } static void vkd3d_dxbc_compiler_emit_store_reg(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *reg, DWORD write_mask, uint32_t val_id) + const struct vkd3d_shader_register *reg, unsigned int write_mask, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_shader_register_info reg_info; enum vkd3d_component_type component_type; - uint32_t type_id, reg_val_id; - unsigned int component_count; + uint32_t type_id; assert(reg->type != VKD3DSPR_IMMCONST); - assert(write_mask); - component_count = vkd3d_write_mask_component_count(write_mask); - component_type = vkd3d_component_type_from_data_type(reg->data_type); if (!vkd3d_dxbc_compiler_get_register_info(compiler, reg, &reg_info)) return; vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &reg_info); + component_type = vkd3d_component_type_from_data_type(reg->data_type); if (component_type != reg_info.component_type) { + unsigned int component_count = vkd3d_write_mask_component_count(write_mask); type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, component_count); val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); + component_type = reg_info.component_type; } - if (component_count == 1) - return vkd3d_dxbc_compiler_emit_store_scalar(compiler, reg, write_mask, &reg_info, val_id); - - if (component_count != VKD3D_VEC4_SIZE) - { - type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, VKD3D_VEC4_SIZE); - reg_val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_info.id, SpvMemoryAccessMaskNone); - - val_id = vkd3d_dxbc_compiler_emit_vector_shuffle(compiler, - reg_val_id, val_id, write_mask, reg_info.component_type, VKD3D_VEC4_SIZE); - } - - vkd3d_spirv_build_op_store(builder, reg_info.id, val_id, SpvMemoryAccessMaskNone); + vkd3d_dxbc_compiler_emit_store(compiler, + reg_info.id, reg_info.write_mask, component_type, reg_info.storage_class, write_mask, val_id); } static uint32_t vkd3d_dxbc_compiler_emit_sat(struct vkd3d_dxbc_compiler *compiler, -- 2.19.2

2 1

[PATCH vkd3d 1/9] vkd3d-shader: Merge ifs in vkd3d_dxbc_compiler_emit_swizzle_ext().
by Józef Kucia 25 Feb '19

25 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 82598dfe6d9e..ef5420925474 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2633,14 +2633,11 @@ static uint32_t vkd3d_dxbc_compiler_emit_swizzle_ext(struct vkd3d_dxbc_compiler val_component_count = vkd3d_write_mask_component_count(val_write_mask); if (component_count == val_component_count - && vkd3d_swizzle_is_equal(val_write_mask, swizzle, write_mask)) + && (component_count == 1 || vkd3d_swizzle_is_equal(val_write_mask, swizzle, write_mask))) return val_id; type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); - if (component_count == 1 && val_component_count == 1) - return val_id; - if (component_count == 1) { component_idx = vkd3d_write_mask_get_component_idx(write_mask); -- 2.19.2

2 1

[PATCH] vkd3d-shader: Decorate integer fragment shader builtins as flat
by Philip Rebohle 25 Feb '19

25 Feb '19

>From the Vulkan spec, 8.13 "Interpolation Decorations": Fragment shader inputs that are signed or unsigned integers, integer vectors, or any double-precision floating-point type must be decorated with Flat. This also matches glslang behaviour. Specifically, this fixes tone-mapping in Unreal Engine 4 on RADV and AMDGPU-PRO, where gl_Layer is used as a fragment shader input. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> --- libs/vkd3d-shader/spirv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 82598df..5ed4df2 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3489,6 +3489,10 @@ static uint32_t vkd3d_dxbc_compiler_emit_builtin_variable(struct vkd3d_dxbc_comp vkd3d_spirv_add_iface_variable(builder, id); vkd3d_dxbc_compiler_decorate_builtin(compiler, id, builtin->spirv_builtin); + if (compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL && storage_class == SpvStorageClassInput + && builtin->component_type != VKD3D_TYPE_FLOAT && builtin->component_type != VKD3D_TYPE_BOOL) + vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationFlat, NULL, 0); + return id; } -- 2.20.1

3 2

[PATCH v2] xaudio2: Rewrite to use FAudio
by elee＠codeweavers.com 25 Feb '19

25 Feb '19

From: Ethan Lee <elee(a)codeweavers.com> FAudio Website: https://github.com/FNA-XNA/FAudio Signed-off-by: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- configure.ac | 24 +- dlls/x3daudio1_0/Makefile.in | 2 + dlls/x3daudio1_1/Makefile.in | 2 + dlls/x3daudio1_2/Makefile.in | 2 + dlls/x3daudio1_3/Makefile.in | 2 + dlls/x3daudio1_4/Makefile.in | 2 + dlls/x3daudio1_5/Makefile.in | 2 + dlls/x3daudio1_6/Makefile.in | 2 + dlls/x3daudio1_7/Makefile.in | 2 + dlls/xapofx1_1/Makefile.in | 6 +- dlls/xapofx1_2/Makefile.in | 6 +- dlls/xapofx1_3/Makefile.in | 6 +- dlls/xapofx1_4/Makefile.in | 6 +- dlls/xapofx1_5/Makefile.in | 6 +- dlls/xaudio2_0/Makefile.in | 8 +- dlls/xaudio2_1/Makefile.in | 8 +- dlls/xaudio2_2/Makefile.in | 8 +- dlls/xaudio2_3/Makefile.in | 8 +- dlls/xaudio2_4/Makefile.in | 8 +- dlls/xaudio2_5/Makefile.in | 8 +- dlls/xaudio2_6/Makefile.in | 8 +- dlls/xaudio2_7/Makefile.in | 9 +- dlls/xaudio2_7/compat.c | 774 ++++----- dlls/xaudio2_7/tests/xaudio2.c | 57 +- dlls/xaudio2_7/x3daudio.c | 36 +- dlls/xaudio2_7/xapo.c | 405 +++++ dlls/xaudio2_7/xapofx.c | 792 +-------- dlls/xaudio2_7/xaudio_allocator.c | 41 + dlls/xaudio2_7/xaudio_classes.idl | 7 - dlls/xaudio2_7/xaudio_dll.c | 2598 ++++++++++++----------------- dlls/xaudio2_7/xaudio_private.h | 174 +- dlls/xaudio2_8/Makefile.in | 9 +- dlls/xaudio2_9/Makefile.in | 9 +- 33 files changed, 2087 insertions(+), 2950 deletions(-) create mode 100644 dlls/xaudio2_7/xapo.c create mode 100644 dlls/xaudio2_7/xaudio_allocator.c diff --git a/configure.ac b/configure.ac index 60f8accf16..a8bde4ca16 100644 --- a/configure.ac +++ b/configure.ac @@ -43,6 +43,7 @@ AC_ARG_WITH(cups, AS_HELP_STRING([--without-cups],[do not use CUPS])) AC_ARG_WITH(curses, AS_HELP_STRING([--without-curses],[do not use (n)curses]), [if test "x$withval" = "xno"; then ac_cv_header_ncurses_h=no; ac_cv_header_curses_h=no; fi]) AC_ARG_WITH(dbus, AS_HELP_STRING([--without-dbus],[do not use DBus (dynamic device support)])) +AC_ARG_WITH(faudio, AS_HELP_STRING([--without-faudio],[do not use FAudio (XAudio2 support)])) AC_ARG_WITH(float-abi, AS_HELP_STRING([--with-float-abi=abi],[specify the ABI (soft|softfp|hard) for ARM platforms])) AC_ARG_WITH(fontconfig,AS_HELP_STRING([--without-fontconfig],[do not use fontconfig])) AC_ARG_WITH(freetype, AS_HELP_STRING([--without-freetype],[do not use the FreeType library])) @@ -1634,6 +1635,16 @@ fi WINE_NOTICE_WITH(sdl,[test "x$ac_cv_lib_soname_SDL2" = "x"], [libSDL2 ${notice_platform}development files not found, SDL2 won't be supported.]) +dnl **** Check for FAudio **** +if test "x$with_faudio" != "xno" +then + WINE_PACKAGE_FLAGS(FAUDIO,[faudio],[-lFAudio],,, + [AC_CHECK_HEADERS([FAudio.h], + [WINE_CHECK_SONAME(FAudio,FAudioCreate,,,[$FAUDIO_LIBS],[[libFAudio*]])])]) +fi +WINE_NOTICE_WITH(faudio,[test "x$ac_cv_lib_soname_FAudio" = "x"], + [libFAudio ${notice_platform}development files not found, XAudio2 won't be supported.]) + dnl **** Check for capi4linux **** if test "x$with_capi" != "xno" then @@ -1798,19 +1809,8 @@ WINE_NOTICE_WITH(openal,[test "x$ac_cv_lib_openal" != xyes], [libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported.], [enable_openal32]) -dnl **** Check for openal-soft **** -if test "x$ac_cv_lib_openal" = xyes -then - AC_CACHE_CHECK([for openal-soft], ac_cv_have_openalsoft, - AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [[#include <AL/al.h> -#include <AL/alc.h> -#include <AL/alext.h> -LPALCRENDERSAMPLESSOFT x;]])],[ac_cv_have_openalsoft=yes],[ac_cv_have_openalsoft=no])) -fi -if test "x$ac_cv_have_openalsoft" != xyes +if test "x$ac_cv_lib_soname_FAudio" = "x" then - WINE_NOTICE([openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported.]) enable_x3daudio1_0=${enable_x3daudio1_0:-no} enable_x3daudio1_1=${enable_x3daudio1_1:-no} enable_x3daudio1_2=${enable_x3daudio1_2:-no} diff --git a/dlls/x3daudio1_0/Makefile.in b/dlls/x3daudio1_0/Makefile.in index 9b4ce2189c..d2305be6f1 100644 --- a/dlls/x3daudio1_0/Makefile.in +++ b/dlls/x3daudio1_0/Makefile.in @@ -1,6 +1,8 @@ EXTRADEFS = -DX3DAUDIO1_VER=0 -DXAUDIO2_VER=0 MODULE = x3daudio1_0.dll PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ x3daudio.c diff --git a/dlls/x3daudio1_1/Makefile.in b/dlls/x3daudio1_1/Makefile.in index d866dc3ddb..efe8d74539 100644 --- a/dlls/x3daudio1_1/Makefile.in +++ b/dlls/x3daudio1_1/Makefile.in @@ -1,6 +1,8 @@ EXTRADEFS = -DX3DAUDIO1_VER=1 -DXAUDIO2_VER=1 MODULE = x3daudio1_1.dll PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ x3daudio.c diff --git a/dlls/x3daudio1_2/Makefile.in b/dlls/x3daudio1_2/Makefile.in index d5de11b258..3b52e063fc 100644 --- a/dlls/x3daudio1_2/Makefile.in +++ b/dlls/x3daudio1_2/Makefile.in @@ -1,6 +1,8 @@ EXTRADEFS = -DX3DAUDIO1_VER=2 -DXAUDIO2_VER=2 MODULE = x3daudio1_2.dll PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ x3daudio.c diff --git a/dlls/x3daudio1_3/Makefile.in b/dlls/x3daudio1_3/Makefile.in index cfd2c6c6c6..9afd1e6431 100644 --- a/dlls/x3daudio1_3/Makefile.in +++ b/dlls/x3daudio1_3/Makefile.in @@ -1,6 +1,8 @@ EXTRADEFS = -DX3DAUDIO1_VER=3 -DXAUDIO2_VER=3 MODULE = x3daudio1_3.dll PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ x3daudio.c diff --git a/dlls/x3daudio1_4/Makefile.in b/dlls/x3daudio1_4/Makefile.in index bd0eac7fc6..e481567cce 100644 --- a/dlls/x3daudio1_4/Makefile.in +++ b/dlls/x3daudio1_4/Makefile.in @@ -1,6 +1,8 @@ EXTRADEFS = -DX3DAUDIO1_VER=4 -DXAUDIO2_VER=4 MODULE = x3daudio1_4.dll PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ x3daudio.c diff --git a/dlls/x3daudio1_5/Makefile.in b/dlls/x3daudio1_5/Makefile.in index dac67aef76..0a97959e7e 100644 --- a/dlls/x3daudio1_5/Makefile.in +++ b/dlls/x3daudio1_5/Makefile.in @@ -1,6 +1,8 @@ EXTRADEFS = -DX3DAUDIO1_VER=5 -DXAUDIO2_VER=5 MODULE = x3daudio1_5.dll PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ x3daudio.c diff --git a/dlls/x3daudio1_6/Makefile.in b/dlls/x3daudio1_6/Makefile.in index 177fb8d34d..c88374a381 100644 --- a/dlls/x3daudio1_6/Makefile.in +++ b/dlls/x3daudio1_6/Makefile.in @@ -1,6 +1,8 @@ EXTRADEFS = -DX3DAUDIO1_VER=6 -DXAUDIO2_VER=6 MODULE = x3daudio1_6.dll PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ x3daudio.c diff --git a/dlls/x3daudio1_7/Makefile.in b/dlls/x3daudio1_7/Makefile.in index 019588dce0..267a93fd6d 100644 --- a/dlls/x3daudio1_7/Makefile.in +++ b/dlls/x3daudio1_7/Makefile.in @@ -1,6 +1,8 @@ EXTRADEFS = -DX3DAUDIO1_VER=7 -DXAUDIO2_VER=7 MODULE = x3daudio1_7.dll PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ x3daudio.c diff --git a/dlls/xapofx1_1/Makefile.in b/dlls/xapofx1_1/Makefile.in index f69ff86bd9..072ec3f5fb 100644 --- a/dlls/xapofx1_1/Makefile.in +++ b/dlls/xapofx1_1/Makefile.in @@ -2,8 +2,12 @@ EXTRADEFS = -DXAPOFX1_VER=1 -DXAUDIO2_VER=2 MODULE = xapofx1_1.dll IMPORTS = ole32 PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ - xapofx.c + xaudio_allocator.c \ + xapofx.c \ + xapo.c RC_SRCS = version.rc diff --git a/dlls/xapofx1_2/Makefile.in b/dlls/xapofx1_2/Makefile.in index d56a2be4bb..f018a7e931 100644 --- a/dlls/xapofx1_2/Makefile.in +++ b/dlls/xapofx1_2/Makefile.in @@ -2,6 +2,10 @@ EXTRADEFS = -DXAPOFX1_VER=2 -DXAUDIO2_VER=3 MODULE = xapofx1_2.dll IMPORTS = ole32 PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ - xapofx.c + xaudio_allocator.c \ + xapofx.c \ + xapo.c diff --git a/dlls/xapofx1_3/Makefile.in b/dlls/xapofx1_3/Makefile.in index 1139520b73..e2ae458257 100644 --- a/dlls/xapofx1_3/Makefile.in +++ b/dlls/xapofx1_3/Makefile.in @@ -2,8 +2,12 @@ EXTRADEFS = -DXAPOFX1_VER=3 -DXAUDIO2_VER=4 MODULE = xapofx1_3.dll IMPORTS = ole32 PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ - xapofx.c + xaudio_allocator.c \ + xapofx.c \ + xapo.c RC_SRCS = version.rc diff --git a/dlls/xapofx1_4/Makefile.in b/dlls/xapofx1_4/Makefile.in index b49e4643af..0c6695f191 100644 --- a/dlls/xapofx1_4/Makefile.in +++ b/dlls/xapofx1_4/Makefile.in @@ -2,6 +2,10 @@ EXTRADEFS = -DXAPOFX1_VER=4 -DXAUDIO2_VER=6 MODULE = xapofx1_4.dll IMPORTS = ole32 PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ - xapofx.c + xaudio_allocator.c \ + xapofx.c \ + xapo.c diff --git a/dlls/xapofx1_5/Makefile.in b/dlls/xapofx1_5/Makefile.in index 5055a16fd5..9bb7d704e5 100644 --- a/dlls/xapofx1_5/Makefile.in +++ b/dlls/xapofx1_5/Makefile.in @@ -2,6 +2,10 @@ EXTRADEFS = -DXAPOFX1_VER=5 -DXAUDIO2_VER=7 MODULE = xapofx1_5.dll IMPORTS = ole32 PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ - xapofx.c + xaudio_allocator.c \ + xapofx.c \ + xapo.c diff --git a/dlls/xaudio2_0/Makefile.in b/dlls/xaudio2_0/Makefile.in index cf15c7bf02..3aa083b88f 100644 --- a/dlls/xaudio2_0/Makefile.in +++ b/dlls/xaudio2_0/Makefile.in @@ -1,12 +1,14 @@ EXTRADEFS = -DXAUDIO2_VER=0 MODULE = xaudio2_0.dll IMPORTS = advapi32 ole32 user32 uuid -EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ + xaudio_allocator.c \ compat.c \ - xapofx.c \ - xaudio_dll.c + xaudio_dll.c \ + xapo.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_1/Makefile.in b/dlls/xaudio2_1/Makefile.in index 32a5a62a2a..87c6bfce85 100644 --- a/dlls/xaudio2_1/Makefile.in +++ b/dlls/xaudio2_1/Makefile.in @@ -1,12 +1,14 @@ EXTRADEFS = -DXAUDIO2_VER=1 MODULE = xaudio2_1.dll IMPORTS = advapi32 ole32 user32 uuid -EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ + xaudio_allocator.c \ compat.c \ - xapofx.c \ - xaudio_dll.c + xaudio_dll.c \ + xapo.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_2/Makefile.in b/dlls/xaudio2_2/Makefile.in index f20de2d5f4..44eaf14991 100644 --- a/dlls/xaudio2_2/Makefile.in +++ b/dlls/xaudio2_2/Makefile.in @@ -1,12 +1,14 @@ EXTRADEFS = -DXAUDIO2_VER=2 MODULE = xaudio2_2.dll IMPORTS = advapi32 ole32 user32 uuid -EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ + xaudio_allocator.c \ compat.c \ - xapofx.c \ - xaudio_dll.c + xaudio_dll.c \ + xapo.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_3/Makefile.in b/dlls/xaudio2_3/Makefile.in index ca749f247b..8b71f10fec 100644 --- a/dlls/xaudio2_3/Makefile.in +++ b/dlls/xaudio2_3/Makefile.in @@ -1,12 +1,14 @@ EXTRADEFS = -DXAUDIO2_VER=3 MODULE = xaudio2_3.dll IMPORTS = advapi32 ole32 user32 uuid -EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ + xaudio_allocator.c \ compat.c \ - xapofx.c \ - xaudio_dll.c + xaudio_dll.c \ + xapo.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_4/Makefile.in b/dlls/xaudio2_4/Makefile.in index 0b74f68fdc..2c43df199d 100644 --- a/dlls/xaudio2_4/Makefile.in +++ b/dlls/xaudio2_4/Makefile.in @@ -1,12 +1,14 @@ EXTRADEFS = -DXAUDIO2_VER=4 MODULE = xaudio2_4.dll IMPORTS = advapi32 ole32 user32 uuid -EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ + xaudio_allocator.c \ compat.c \ - xapofx.c \ - xaudio_dll.c + xaudio_dll.c \ + xapo.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_5/Makefile.in b/dlls/xaudio2_5/Makefile.in index 09356c94ac..0e5b825a46 100644 --- a/dlls/xaudio2_5/Makefile.in +++ b/dlls/xaudio2_5/Makefile.in @@ -1,12 +1,14 @@ EXTRADEFS = -DXAUDIO2_VER=5 MODULE = xaudio2_5.dll IMPORTS = advapi32 ole32 user32 uuid -EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ + xaudio_allocator.c \ compat.c \ - xapofx.c \ - xaudio_dll.c + xaudio_dll.c \ + xapo.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_6/Makefile.in b/dlls/xaudio2_6/Makefile.in index e0ef588158..69d4574ca4 100644 --- a/dlls/xaudio2_6/Makefile.in +++ b/dlls/xaudio2_6/Makefile.in @@ -1,12 +1,14 @@ EXTRADEFS = -DXAUDIO2_VER=6 MODULE = xaudio2_6.dll IMPORTS = advapi32 ole32 user32 uuid -EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ + xaudio_allocator.c \ compat.c \ - xapofx.c \ - xaudio_dll.c + xaudio_dll.c \ + xapo.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_7/Makefile.in b/dlls/xaudio2_7/Makefile.in index 2f2e232007..d7a1a35839 100644 --- a/dlls/xaudio2_7/Makefile.in +++ b/dlls/xaudio2_7/Makefile.in @@ -1,12 +1,13 @@ EXTRADEFS = -DXAUDIO2_VER=7 MODULE = xaudio2_7.dll IMPORTS = advapi32 ole32 user32 uuid -EXTRALIBS = $(OPENAL_LIBS) +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ + xaudio_allocator.c \ compat.c \ - x3daudio.c \ - xapofx.c \ - xaudio_dll.c + xaudio_dll.c \ + xapo.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c index 4980e25f2f..318f668589 100644 --- a/dlls/xaudio2_7/compat.c +++ b/dlls/xaudio2_7/compat.c @@ -124,15 +124,15 @@ static XAUDIO2_SEND_DESCRIPTOR *convert_send_descriptors23(const XAUDIO23_VOICE_ /* BEGIN IXAudio2SourceVoice */ #if XAUDIO2_VER == 0 -static XA2SourceImpl *impl_from_IXAudio20SourceVoice(IXAudio20SourceVoice *iface) +XA2VoiceImpl *impl_from_IXAudio20SourceVoice(IXAudio20SourceVoice *iface) { - return CONTAINING_RECORD(iface, XA2SourceImpl, IXAudio20SourceVoice_iface); + return CONTAINING_RECORD(iface, XA2VoiceImpl, IXAudio20SourceVoice_iface); } static void WINAPI XA20SRC_GetVoiceDetails(IXAudio20SourceVoice *iface, XAUDIO27_VOICE_DETAILS *pVoiceDetails) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); XAUDIO2_VOICE_DETAILS details; IXAudio2SourceVoice_GetVoiceDetails(&This->IXAudio2SourceVoice_iface, &details); @@ -145,7 +145,7 @@ static void WINAPI XA20SRC_GetVoiceDetails(IXAudio20SourceVoice *iface, static HRESULT WINAPI XA20SRC_SetOutputVoices(IXAudio20SourceVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; @@ -168,14 +168,14 @@ static HRESULT WINAPI XA20SRC_SetOutputVoices(IXAudio20SourceVoice *iface, static HRESULT WINAPI XA20SRC_SetEffectChain(IXAudio20SourceVoice *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_SetEffectChain(&This->IXAudio2SourceVoice_iface, pEffectChain); } static HRESULT WINAPI XA20SRC_EnableEffect(IXAudio20SourceVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_EnableEffect(&This->IXAudio2SourceVoice_iface, EffectIndex, OperationSet); } @@ -183,7 +183,7 @@ static HRESULT WINAPI XA20SRC_EnableEffect(IXAudio20SourceVoice *iface, static HRESULT WINAPI XA20SRC_DisableEffect(IXAudio20SourceVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_DisableEffect(&This->IXAudio2SourceVoice_iface, EffectIndex, OperationSet); } @@ -191,7 +191,7 @@ static HRESULT WINAPI XA20SRC_DisableEffect(IXAudio20SourceVoice *iface, static void WINAPI XA20SRC_GetEffectState(IXAudio20SourceVoice *iface, UINT32 EffectIndex, BOOL *pEnabled) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_GetEffectState(&This->IXAudio2SourceVoice_iface, EffectIndex, pEnabled); } @@ -200,7 +200,7 @@ static HRESULT WINAPI XA20SRC_SetEffectParameters(IXAudio20SourceVoice *iface, UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_SetEffectParameters(&This->IXAudio2SourceVoice_iface, EffectIndex, pParameters, ParametersByteSize, OperationSet); } @@ -208,7 +208,7 @@ static HRESULT WINAPI XA20SRC_SetEffectParameters(IXAudio20SourceVoice *iface, static HRESULT WINAPI XA20SRC_GetEffectParameters(IXAudio20SourceVoice *iface, UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_GetEffectParameters(&This->IXAudio2SourceVoice_iface, EffectIndex, pParameters, ParametersByteSize); } @@ -216,7 +216,7 @@ static HRESULT WINAPI XA20SRC_GetEffectParameters(IXAudio20SourceVoice *iface, static HRESULT WINAPI XA20SRC_SetFilterParameters(IXAudio20SourceVoice *iface, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_SetFilterParameters(&This->IXAudio2SourceVoice_iface, pParameters, OperationSet); } @@ -224,14 +224,14 @@ static HRESULT WINAPI XA20SRC_SetFilterParameters(IXAudio20SourceVoice *iface, static void WINAPI XA20SRC_GetFilterParameters(IXAudio20SourceVoice *iface, XAUDIO2_FILTER_PARAMETERS *pParameters) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_GetFilterParameters(&This->IXAudio2SourceVoice_iface, pParameters); } static HRESULT WINAPI XA20SRC_SetVolume(IXAudio20SourceVoice *iface, float Volume, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_SetVolume(&This->IXAudio2SourceVoice_iface, Volume, OperationSet); } @@ -239,14 +239,14 @@ static HRESULT WINAPI XA20SRC_SetVolume(IXAudio20SourceVoice *iface, static void WINAPI XA20SRC_GetVolume(IXAudio20SourceVoice *iface, float *pVolume) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_GetVolume(&This->IXAudio2SourceVoice_iface, pVolume); } static HRESULT WINAPI XA20SRC_SetChannelVolumes(IXAudio20SourceVoice *iface, UINT32 Channels, const float *pVolumes, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_SetChannelVolumes(&This->IXAudio2SourceVoice_iface, Channels, pVolumes, OperationSet); } @@ -254,7 +254,7 @@ static HRESULT WINAPI XA20SRC_SetChannelVolumes(IXAudio20SourceVoice *iface, static void WINAPI XA20SRC_GetChannelVolumes(IXAudio20SourceVoice *iface, UINT32 Channels, float *pVolumes) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_GetChannelVolumes(&This->IXAudio2SourceVoice_iface, Channels, pVolumes); } @@ -264,7 +264,7 @@ static HRESULT WINAPI XA20SRC_SetOutputMatrix(IXAudio20SourceVoice *iface, UINT32 DestinationChannels, const float *pLevelMatrix, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_SetOutputMatrix(&This->IXAudio2SourceVoice_iface, pDestinationVoice, SourceChannels, DestinationChannels, pLevelMatrix, OperationSet); @@ -274,7 +274,7 @@ static HRESULT WINAPI XA20SRC_GetOutputMatrix(IXAudio20SourceVoice *iface, IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, UINT32 DestinationChannels, float *pLevelMatrix) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); IXAudio2SourceVoice_GetOutputMatrix(&This->IXAudio2SourceVoice_iface, pDestinationVoice, SourceChannels, DestinationChannels, pLevelMatrix); @@ -283,62 +283,62 @@ static HRESULT WINAPI XA20SRC_GetOutputMatrix(IXAudio20SourceVoice *iface, static void WINAPI XA20SRC_DestroyVoice(IXAudio20SourceVoice *iface) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_DestroyVoice(&This->IXAudio2SourceVoice_iface); } static HRESULT WINAPI XA20SRC_Start(IXAudio20SourceVoice *iface, UINT32 Flags, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_Start(&This->IXAudio2SourceVoice_iface, Flags, OperationSet); } static HRESULT WINAPI XA20SRC_Stop(IXAudio20SourceVoice *iface, UINT32 Flags, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_Stop(&This->IXAudio2SourceVoice_iface, Flags, OperationSet); } static HRESULT WINAPI XA20SRC_SubmitSourceBuffer(IXAudio20SourceVoice *iface, const XAUDIO2_BUFFER *pBuffer, const XAUDIO2_BUFFER_WMA *pBufferWMA) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_SubmitSourceBuffer(&This->IXAudio2SourceVoice_iface, pBuffer, pBufferWMA); } static HRESULT WINAPI XA20SRC_FlushSourceBuffers(IXAudio20SourceVoice *iface) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_FlushSourceBuffers(&This->IXAudio2SourceVoice_iface); } static HRESULT WINAPI XA20SRC_Discontinuity(IXAudio20SourceVoice *iface) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_Discontinuity(&This->IXAudio2SourceVoice_iface); } static HRESULT WINAPI XA20SRC_ExitLoop(IXAudio20SourceVoice *iface, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_ExitLoop(&This->IXAudio2SourceVoice_iface, OperationSet); } static void WINAPI XA20SRC_GetState(IXAudio20SourceVoice *iface, XAUDIO2_VOICE_STATE *pVoiceState) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_GetState(&This->IXAudio2SourceVoice_iface, pVoiceState, 0); } static HRESULT WINAPI XA20SRC_SetFrequencyRatio(IXAudio20SourceVoice *iface, float Ratio, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_SetFrequencyRatio(&This->IXAudio2SourceVoice_iface, Ratio, OperationSet); } @@ -346,7 +346,7 @@ static HRESULT WINAPI XA20SRC_SetFrequencyRatio(IXAudio20SourceVoice *iface, static void WINAPI XA20SRC_GetFrequencyRatio(IXAudio20SourceVoice *iface, float *pRatio) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_GetFrequencyRatio(&This->IXAudio2SourceVoice_iface, pRatio); } @@ -381,15 +381,15 @@ const IXAudio20SourceVoiceVtbl XAudio20SourceVoice_Vtbl = { #elif XAUDIO2_VER <= 3 -static XA2SourceImpl *impl_from_IXAudio23SourceVoice(IXAudio23SourceVoice *iface) +XA2VoiceImpl *impl_from_IXAudio23SourceVoice(IXAudio23SourceVoice *iface) { - return CONTAINING_RECORD(iface, XA2SourceImpl, IXAudio23SourceVoice_iface); + return CONTAINING_RECORD(iface, XA2VoiceImpl, IXAudio23SourceVoice_iface); } static void WINAPI XA23SRC_GetVoiceDetails(IXAudio23SourceVoice *iface, XAUDIO27_VOICE_DETAILS *pVoiceDetails) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); XAUDIO2_VOICE_DETAILS details; IXAudio2SourceVoice_GetVoiceDetails(&This->IXAudio2SourceVoice_iface, &details); @@ -402,7 +402,7 @@ static void WINAPI XA23SRC_GetVoiceDetails(IXAudio23SourceVoice *iface, static HRESULT WINAPI XA23SRC_SetOutputVoices(IXAudio23SourceVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; @@ -425,14 +425,14 @@ static HRESULT WINAPI XA23SRC_SetOutputVoices(IXAudio23SourceVoice *iface, static HRESULT WINAPI XA23SRC_SetEffectChain(IXAudio23SourceVoice *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_SetEffectChain(&This->IXAudio2SourceVoice_iface, pEffectChain); } static HRESULT WINAPI XA23SRC_EnableEffect(IXAudio23SourceVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_EnableEffect(&This->IXAudio2SourceVoice_iface, EffectIndex, OperationSet); } @@ -440,7 +440,7 @@ static HRESULT WINAPI XA23SRC_EnableEffect(IXAudio23SourceVoice *iface, static HRESULT WINAPI XA23SRC_DisableEffect(IXAudio23SourceVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_DisableEffect(&This->IXAudio2SourceVoice_iface, EffectIndex, OperationSet); } @@ -448,7 +448,7 @@ static HRESULT WINAPI XA23SRC_DisableEffect(IXAudio23SourceVoice *iface, static void WINAPI XA23SRC_GetEffectState(IXAudio23SourceVoice *iface, UINT32 EffectIndex, BOOL *pEnabled) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_GetEffectState(&This->IXAudio2SourceVoice_iface, EffectIndex, pEnabled); } @@ -457,7 +457,7 @@ static HRESULT WINAPI XA23SRC_SetEffectParameters(IXAudio23SourceVoice *iface, UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_SetEffectParameters(&This->IXAudio2SourceVoice_iface, EffectIndex, pParameters, ParametersByteSize, OperationSet); } @@ -465,7 +465,7 @@ static HRESULT WINAPI XA23SRC_SetEffectParameters(IXAudio23SourceVoice *iface, static HRESULT WINAPI XA23SRC_GetEffectParameters(IXAudio23SourceVoice *iface, UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_GetEffectParameters(&This->IXAudio2SourceVoice_iface, EffectIndex, pParameters, ParametersByteSize); } @@ -473,7 +473,7 @@ static HRESULT WINAPI XA23SRC_GetEffectParameters(IXAudio23SourceVoice *iface, static HRESULT WINAPI XA23SRC_SetFilterParameters(IXAudio23SourceVoice *iface, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_SetFilterParameters(&This->IXAudio2SourceVoice_iface, pParameters, OperationSet); } @@ -481,14 +481,14 @@ static HRESULT WINAPI XA23SRC_SetFilterParameters(IXAudio23SourceVoice *iface, static void WINAPI XA23SRC_GetFilterParameters(IXAudio23SourceVoice *iface, XAUDIO2_FILTER_PARAMETERS *pParameters) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_GetFilterParameters(&This->IXAudio2SourceVoice_iface, pParameters); } static HRESULT WINAPI XA23SRC_SetVolume(IXAudio23SourceVoice *iface, float Volume, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_SetVolume(&This->IXAudio2SourceVoice_iface, Volume, OperationSet); } @@ -496,14 +496,14 @@ static HRESULT WINAPI XA23SRC_SetVolume(IXAudio23SourceVoice *iface, static void WINAPI XA23SRC_GetVolume(IXAudio23SourceVoice *iface, float *pVolume) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_GetVolume(&This->IXAudio2SourceVoice_iface, pVolume); } static HRESULT WINAPI XA23SRC_SetChannelVolumes(IXAudio23SourceVoice *iface, UINT32 Channels, const float *pVolumes, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_SetChannelVolumes(&This->IXAudio2SourceVoice_iface, Channels, pVolumes, OperationSet); } @@ -511,7 +511,7 @@ static HRESULT WINAPI XA23SRC_SetChannelVolumes(IXAudio23SourceVoice *iface, static void WINAPI XA23SRC_GetChannelVolumes(IXAudio23SourceVoice *iface, UINT32 Channels, float *pVolumes) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_GetChannelVolumes(&This->IXAudio2SourceVoice_iface, Channels, pVolumes); } @@ -521,7 +521,7 @@ static HRESULT WINAPI XA23SRC_SetOutputMatrix(IXAudio23SourceVoice *iface, UINT32 DestinationChannels, const float *pLevelMatrix, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_SetOutputMatrix(&This->IXAudio2SourceVoice_iface, pDestinationVoice, SourceChannels, DestinationChannels, pLevelMatrix, OperationSet); @@ -531,7 +531,7 @@ static void WINAPI XA23SRC_GetOutputMatrix(IXAudio23SourceVoice *iface, IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, UINT32 DestinationChannels, float *pLevelMatrix) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_GetOutputMatrix(&This->IXAudio2SourceVoice_iface, pDestinationVoice, SourceChannels, DestinationChannels, pLevelMatrix); @@ -539,62 +539,62 @@ static void WINAPI XA23SRC_GetOutputMatrix(IXAudio23SourceVoice *iface, static void WINAPI XA23SRC_DestroyVoice(IXAudio23SourceVoice *iface) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_DestroyVoice(&This->IXAudio2SourceVoice_iface); } static HRESULT WINAPI XA23SRC_Start(IXAudio23SourceVoice *iface, UINT32 Flags, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_Start(&This->IXAudio2SourceVoice_iface, Flags, OperationSet); } static HRESULT WINAPI XA23SRC_Stop(IXAudio23SourceVoice *iface, UINT32 Flags, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_Stop(&This->IXAudio2SourceVoice_iface, Flags, OperationSet); } static HRESULT WINAPI XA23SRC_SubmitSourceBuffer(IXAudio23SourceVoice *iface, const XAUDIO2_BUFFER *pBuffer, const XAUDIO2_BUFFER_WMA *pBufferWMA) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_SubmitSourceBuffer(&This->IXAudio2SourceVoice_iface, pBuffer, pBufferWMA); } static HRESULT WINAPI XA23SRC_FlushSourceBuffers(IXAudio23SourceVoice *iface) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_FlushSourceBuffers(&This->IXAudio2SourceVoice_iface); } static HRESULT WINAPI XA23SRC_Discontinuity(IXAudio23SourceVoice *iface) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_Discontinuity(&This->IXAudio2SourceVoice_iface); } static HRESULT WINAPI XA23SRC_ExitLoop(IXAudio23SourceVoice *iface, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_ExitLoop(&This->IXAudio2SourceVoice_iface, OperationSet); } static void WINAPI XA23SRC_GetState(IXAudio23SourceVoice *iface, XAUDIO2_VOICE_STATE *pVoiceState) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_GetState(&This->IXAudio2SourceVoice_iface, pVoiceState, 0); } static HRESULT WINAPI XA23SRC_SetFrequencyRatio(IXAudio23SourceVoice *iface, float Ratio, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_SetFrequencyRatio(&This->IXAudio2SourceVoice_iface, Ratio, OperationSet); } @@ -602,7 +602,7 @@ static HRESULT WINAPI XA23SRC_SetFrequencyRatio(IXAudio23SourceVoice *iface, static void WINAPI XA23SRC_GetFrequencyRatio(IXAudio23SourceVoice *iface, float *pRatio) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_GetFrequencyRatio(&This->IXAudio2SourceVoice_iface, pRatio); } @@ -637,15 +637,15 @@ const IXAudio23SourceVoiceVtbl XAudio23SourceVoice_Vtbl = { #elif XAUDIO2_VER <= 7 -static XA2SourceImpl *impl_from_IXAudio27SourceVoice(IXAudio27SourceVoice *iface) +XA2VoiceImpl *impl_from_IXAudio27SourceVoice(IXAudio27SourceVoice *iface) { - return CONTAINING_RECORD(iface, XA2SourceImpl, IXAudio27SourceVoice_iface); + return CONTAINING_RECORD(iface, XA2VoiceImpl, IXAudio27SourceVoice_iface); } static void WINAPI XA27SRC_GetVoiceDetails(IXAudio27SourceVoice *iface, XAUDIO27_VOICE_DETAILS *pVoiceDetails) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); XAUDIO2_VOICE_DETAILS details; IXAudio2SourceVoice_GetVoiceDetails(&This->IXAudio2SourceVoice_iface, &details); @@ -658,35 +658,35 @@ static void WINAPI XA27SRC_GetVoiceDetails(IXAudio27SourceVoice *iface, static HRESULT WINAPI XA27SRC_SetOutputVoices(IXAudio27SourceVoice *iface, const XAUDIO2_VOICE_SENDS *pSendList) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_SetOutputVoices(&This->IXAudio2SourceVoice_iface, pSendList); } static HRESULT WINAPI XA27SRC_SetEffectChain(IXAudio27SourceVoice *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_SetEffectChain(&This->IXAudio2SourceVoice_iface, pEffectChain); } static HRESULT WINAPI XA27SRC_EnableEffect(IXAudio27SourceVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_EnableEffect(&This->IXAudio2SourceVoice_iface, EffectIndex, OperationSet); } static HRESULT WINAPI XA27SRC_DisableEffect(IXAudio27SourceVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_DisableEffect(&This->IXAudio2SourceVoice_iface, EffectIndex, OperationSet); } static void WINAPI XA27SRC_GetEffectState(IXAudio27SourceVoice *iface, UINT32 EffectIndex, BOOL *pEnabled) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); IXAudio2SourceVoice_GetEffectState(&This->IXAudio2SourceVoice_iface, EffectIndex, pEnabled); } @@ -694,7 +694,7 @@ static HRESULT WINAPI XA27SRC_SetEffectParameters(IXAudio27SourceVoice *iface, UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_SetEffectParameters(&This->IXAudio2SourceVoice_iface, EffectIndex, pParameters, ParametersByteSize, OperationSet); } @@ -702,7 +702,7 @@ static HRESULT WINAPI XA27SRC_SetEffectParameters(IXAudio27SourceVoice *iface, static HRESULT WINAPI XA27SRC_GetEffectParameters(IXAudio27SourceVoice *iface, UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_GetEffectParameters(&This->IXAudio2SourceVoice_iface, EffectIndex, pParameters, ParametersByteSize); } @@ -710,7 +710,7 @@ static HRESULT WINAPI XA27SRC_GetEffectParameters(IXAudio27SourceVoice *iface, static HRESULT WINAPI XA27SRC_SetFilterParameters(IXAudio27SourceVoice *iface, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_SetFilterParameters(&This->IXAudio2SourceVoice_iface, pParameters, OperationSet); } @@ -718,7 +718,7 @@ static HRESULT WINAPI XA27SRC_SetFilterParameters(IXAudio27SourceVoice *iface, static void WINAPI XA27SRC_GetFilterParameters(IXAudio27SourceVoice *iface, XAUDIO2_FILTER_PARAMETERS *pParameters) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); IXAudio2SourceVoice_GetFilterParameters(&This->IXAudio2SourceVoice_iface, pParameters); } @@ -726,7 +726,7 @@ static HRESULT WINAPI XA27SRC_SetOutputFilterParameters(IXAudio27SourceVoice *if IXAudio2Voice *pDestinationVoice, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_SetOutputFilterParameters(&This->IXAudio2SourceVoice_iface, pDestinationVoice, pParameters, OperationSet); } @@ -735,7 +735,7 @@ static void WINAPI XA27SRC_GetOutputFilterParameters(IXAudio27SourceVoice *iface IXAudio2Voice *pDestinationVoice, XAUDIO2_FILTER_PARAMETERS *pParameters) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); IXAudio2SourceVoice_GetOutputFilterParameters(&This->IXAudio2SourceVoice_iface, pDestinationVoice, pParameters); } @@ -743,21 +743,21 @@ static void WINAPI XA27SRC_GetOutputFilterParameters(IXAudio27SourceVoice *iface static HRESULT WINAPI XA27SRC_SetVolume(IXAudio27SourceVoice *iface, float Volume, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_SetVolume(&This->IXAudio2SourceVoice_iface, Volume, OperationSet); } static void WINAPI XA27SRC_GetVolume(IXAudio27SourceVoice *iface, float *pVolume) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); IXAudio2SourceVoice_GetVolume(&This->IXAudio2SourceVoice_iface, pVolume); } static HRESULT WINAPI XA27SRC_SetChannelVolumes(IXAudio27SourceVoice *iface, UINT32 Channels, const float *pVolumes, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_SetChannelVolumes(&This->IXAudio2SourceVoice_iface, Channels, pVolumes, OperationSet); } @@ -765,7 +765,7 @@ static HRESULT WINAPI XA27SRC_SetChannelVolumes(IXAudio27SourceVoice *iface, static void WINAPI XA27SRC_GetChannelVolumes(IXAudio27SourceVoice *iface, UINT32 Channels, float *pVolumes) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); IXAudio2SourceVoice_GetChannelVolumes(&This->IXAudio2SourceVoice_iface, Channels, pVolumes); } @@ -775,7 +775,7 @@ static HRESULT WINAPI XA27SRC_SetOutputMatrix(IXAudio27SourceVoice *iface, UINT32 DestinationChannels, const float *pLevelMatrix, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_SetOutputMatrix(&This->IXAudio2SourceVoice_iface, pDestinationVoice, SourceChannels, DestinationChannels, pLevelMatrix, OperationSet); @@ -785,74 +785,74 @@ static void WINAPI XA27SRC_GetOutputMatrix(IXAudio27SourceVoice *iface, IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, UINT32 DestinationChannels, float *pLevelMatrix) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); IXAudio2SourceVoice_GetOutputMatrix(&This->IXAudio2SourceVoice_iface, pDestinationVoice, SourceChannels, DestinationChannels, pLevelMatrix); } static void WINAPI XA27SRC_DestroyVoice(IXAudio27SourceVoice *iface) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); IXAudio2SourceVoice_DestroyVoice(&This->IXAudio2SourceVoice_iface); } static HRESULT WINAPI XA27SRC_Start(IXAudio27SourceVoice *iface, UINT32 Flags, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_Start(&This->IXAudio2SourceVoice_iface, Flags, OperationSet); } static HRESULT WINAPI XA27SRC_Stop(IXAudio27SourceVoice *iface, UINT32 Flags, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_Stop(&This->IXAudio2SourceVoice_iface, Flags, OperationSet); } static HRESULT WINAPI XA27SRC_SubmitSourceBuffer(IXAudio27SourceVoice *iface, const XAUDIO2_BUFFER *pBuffer, const XAUDIO2_BUFFER_WMA *pBufferWMA) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_SubmitSourceBuffer(&This->IXAudio2SourceVoice_iface, pBuffer, pBufferWMA); } static HRESULT WINAPI XA27SRC_FlushSourceBuffers(IXAudio27SourceVoice *iface) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_FlushSourceBuffers(&This->IXAudio2SourceVoice_iface); } static HRESULT WINAPI XA27SRC_Discontinuity(IXAudio27SourceVoice *iface) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_Discontinuity(&This->IXAudio2SourceVoice_iface); } static HRESULT WINAPI XA27SRC_ExitLoop(IXAudio27SourceVoice *iface, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_ExitLoop(&This->IXAudio2SourceVoice_iface, OperationSet); } static void WINAPI XA27SRC_GetState(IXAudio27SourceVoice *iface, XAUDIO2_VOICE_STATE *pVoiceState) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_GetState(&This->IXAudio2SourceVoice_iface, pVoiceState, 0); } static HRESULT WINAPI XA27SRC_SetFrequencyRatio(IXAudio27SourceVoice *iface, float Ratio, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_SetFrequencyRatio(&This->IXAudio2SourceVoice_iface, Ratio, OperationSet); } static void WINAPI XA27SRC_GetFrequencyRatio(IXAudio27SourceVoice *iface, float *pRatio) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_GetFrequencyRatio(&This->IXAudio2SourceVoice_iface, pRatio); } @@ -860,7 +860,7 @@ static HRESULT WINAPI XA27SRC_SetSourceSampleRate( IXAudio27SourceVoice *iface, UINT32 NewSourceSampleRate) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_SetSourceSampleRate(&This->IXAudio2SourceVoice_iface, NewSourceSampleRate); } @@ -901,15 +901,15 @@ const IXAudio27SourceVoiceVtbl XAudio27SourceVoice_Vtbl = { /* BEGIN IXAudio2SubmixVoice */ #if XAUDIO2_VER == 0 -static XA2SubmixImpl *impl_from_IXAudio20SubmixVoice(IXAudio20SubmixVoice *iface) +XA2VoiceImpl *impl_from_IXAudio20SubmixVoice(IXAudio20SubmixVoice *iface) { - return CONTAINING_RECORD(iface, XA2SubmixImpl, IXAudio20SubmixVoice_iface); + return CONTAINING_RECORD(iface, XA2VoiceImpl, IXAudio20SubmixVoice_iface); } static void WINAPI XA20SUB_GetVoiceDetails(IXAudio20SubmixVoice *iface, XAUDIO27_VOICE_DETAILS *pVoiceDetails) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); XAUDIO2_VOICE_DETAILS details; IXAudio2SubmixVoice_GetVoiceDetails(&This->IXAudio2SubmixVoice_iface, &details); @@ -922,7 +922,7 @@ static void WINAPI XA20SUB_GetVoiceDetails(IXAudio20SubmixVoice *iface, static HRESULT WINAPI XA20SUB_SetOutputVoices(IXAudio20SubmixVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); XAUDIO2_VOICE_SENDS sends, *psends; HRESULT hr; @@ -945,14 +945,14 @@ static HRESULT WINAPI XA20SUB_SetOutputVoices(IXAudio20SubmixVoice *iface, static HRESULT WINAPI XA20SUB_SetEffectChain(IXAudio20SubmixVoice *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_SetEffectChain(&This->IXAudio2SubmixVoice_iface, pEffectChain); } static HRESULT WINAPI XA20SUB_EnableEffect(IXAudio20SubmixVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_EnableEffect(&This->IXAudio2SubmixVoice_iface, EffectIndex, OperationSet); } @@ -960,7 +960,7 @@ static HRESULT WINAPI XA20SUB_EnableEffect(IXAudio20SubmixVoice *iface, static HRESULT WINAPI XA20SUB_DisableEffect(IXAudio20SubmixVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_DisableEffect(&This->IXAudio2SubmixVoice_iface, EffectIndex, OperationSet); } @@ -968,7 +968,7 @@ static HRESULT WINAPI XA20SUB_DisableEffect(IXAudio20SubmixVoice *iface, static void WINAPI XA20SUB_GetEffectState(IXAudio20SubmixVoice *iface, UINT32 EffectIndex, BOOL *pEnabled) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_GetEffectState(&This->IXAudio2SubmixVoice_iface, EffectIndex, pEnabled); } @@ -977,7 +977,7 @@ static HRESULT WINAPI XA20SUB_SetEffectParameters(IXAudio20SubmixVoice *iface, UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_SetEffectParameters(&This->IXAudio2SubmixVoice_iface, EffectIndex, pParameters, ParametersByteSize, OperationSet); } @@ -985,7 +985,7 @@ static HRESULT WINAPI XA20SUB_SetEffectParameters(IXAudio20SubmixVoice *iface, static HRESULT WINAPI XA20SUB_GetEffectParameters(IXAudio20SubmixVoice *iface, UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_GetEffectParameters(&This->IXAudio2SubmixVoice_iface, EffectIndex, pParameters, ParametersByteSize); } @@ -993,7 +993,7 @@ static HRESULT WINAPI XA20SUB_GetEffectParameters(IXAudio20SubmixVoice *iface, static HRESULT WINAPI XA20SUB_SetFilterParameters(IXAudio20SubmixVoice *iface, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_SetFilterParameters(&This->IXAudio2SubmixVoice_iface, pParameters, OperationSet); } @@ -1001,14 +1001,14 @@ static HRESULT WINAPI XA20SUB_SetFilterParameters(IXAudio20SubmixVoice *iface, static void WINAPI XA20SUB_GetFilterParameters(IXAudio20SubmixVoice *iface, XAUDIO2_FILTER_PARAMETERS *pParameters) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_GetFilterParameters(&This->IXAudio2SubmixVoice_iface, pParameters); } static HRESULT WINAPI XA20SUB_SetVolume(IXAudio20SubmixVoice *iface, float Volume, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_SetVolume(&This->IXAudio2SubmixVoice_iface, Volume, OperationSet); } @@ -1016,14 +1016,14 @@ static HRESULT WINAPI XA20SUB_SetVolume(IXAudio20SubmixVoice *iface, static void WINAPI XA20SUB_GetVolume(IXAudio20SubmixVoice *iface, float *pVolume) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_GetVolume(&This->IXAudio2SubmixVoice_iface, pVolume); } static HRESULT WINAPI XA20SUB_SetChannelVolumes(IXAudio20SubmixVoice *iface, UINT32 Channels, const float *pVolumes, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_SetChannelVolumes(&This->IXAudio2SubmixVoice_iface, Channels, pVolumes, OperationSet); } @@ -1031,7 +1031,7 @@ static HRESULT WINAPI XA20SUB_SetChannelVolumes(IXAudio20SubmixVoice *iface, static void WINAPI XA20SUB_GetChannelVolumes(IXAudio20SubmixVoice *iface, UINT32 Channels, float *pVolumes) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_GetChannelVolumes(&This->IXAudio2SubmixVoice_iface, Channels, pVolumes); } @@ -1041,7 +1041,7 @@ static HRESULT WINAPI XA20SUB_SetOutputMatrix(IXAudio20SubmixVoice *iface, UINT32 DestinationChannels, const float *pLevelMatrix, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_SetOutputMatrix(&This->IXAudio2SubmixVoice_iface, pDestinationVoice, SubmixChannels, DestinationChannels, pLevelMatrix, OperationSet); @@ -1051,7 +1051,7 @@ static HRESULT WINAPI XA20SUB_GetOutputMatrix(IXAudio20SubmixVoice *iface, IXAudio2Voice *pDestinationVoice, UINT32 SubmixChannels, UINT32 DestinationChannels, float *pLevelMatrix) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); IXAudio2SubmixVoice_GetOutputMatrix(&This->IXAudio2SubmixVoice_iface, pDestinationVoice, SubmixChannels, DestinationChannels, pLevelMatrix); @@ -1060,7 +1060,7 @@ static HRESULT WINAPI XA20SUB_GetOutputMatrix(IXAudio20SubmixVoice *iface, static void WINAPI XA20SUB_DestroyVoice(IXAudio20SubmixVoice *iface) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_DestroyVoice(&This->IXAudio2SubmixVoice_iface); } @@ -1086,15 +1086,15 @@ const IXAudio20SubmixVoiceVtbl XAudio20SubmixVoice_Vtbl = { #elif XAUDIO2_VER <= 3 -static XA2SubmixImpl *impl_from_IXAudio23SubmixVoice(IXAudio23SubmixVoice *iface) +XA2VoiceImpl *impl_from_IXAudio23SubmixVoice(IXAudio23SubmixVoice *iface) { - return CONTAINING_RECORD(iface, XA2SubmixImpl, IXAudio23SubmixVoice_iface); + return CONTAINING_RECORD(iface, XA2VoiceImpl, IXAudio23SubmixVoice_iface); } static void WINAPI XA23SUB_GetVoiceDetails(IXAudio23SubmixVoice *iface, XAUDIO27_VOICE_DETAILS *pVoiceDetails) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); XAUDIO2_VOICE_DETAILS details; IXAudio2SubmixVoice_GetVoiceDetails(&This->IXAudio2SubmixVoice_iface, &details); @@ -1107,7 +1107,7 @@ static void WINAPI XA23SUB_GetVoiceDetails(IXAudio23SubmixVoice *iface, static HRESULT WINAPI XA23SUB_SetOutputVoices(IXAudio23SubmixVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; @@ -1130,14 +1130,14 @@ static HRESULT WINAPI XA23SUB_SetOutputVoices(IXAudio23SubmixVoice *iface, static HRESULT WINAPI XA23SUB_SetEffectChain(IXAudio23SubmixVoice *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_SetEffectChain(&This->IXAudio2SubmixVoice_iface, pEffectChain); } static HRESULT WINAPI XA23SUB_EnableEffect(IXAudio23SubmixVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_EnableEffect(&This->IXAudio2SubmixVoice_iface, EffectIndex, OperationSet); } @@ -1145,7 +1145,7 @@ static HRESULT WINAPI XA23SUB_EnableEffect(IXAudio23SubmixVoice *iface, static HRESULT WINAPI XA23SUB_DisableEffect(IXAudio23SubmixVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_DisableEffect(&This->IXAudio2SubmixVoice_iface, EffectIndex, OperationSet); } @@ -1153,7 +1153,7 @@ static HRESULT WINAPI XA23SUB_DisableEffect(IXAudio23SubmixVoice *iface, static void WINAPI XA23SUB_GetEffectState(IXAudio23SubmixVoice *iface, UINT32 EffectIndex, BOOL *pEnabled) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_GetEffectState(&This->IXAudio2SubmixVoice_iface, EffectIndex, pEnabled); } @@ -1162,7 +1162,7 @@ static HRESULT WINAPI XA23SUB_SetEffectParameters(IXAudio23SubmixVoice *iface, UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_SetEffectParameters(&This->IXAudio2SubmixVoice_iface, EffectIndex, pParameters, ParametersByteSize, OperationSet); } @@ -1170,7 +1170,7 @@ static HRESULT WINAPI XA23SUB_SetEffectParameters(IXAudio23SubmixVoice *iface, static HRESULT WINAPI XA23SUB_GetEffectParameters(IXAudio23SubmixVoice *iface, UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_GetEffectParameters(&This->IXAudio2SubmixVoice_iface, EffectIndex, pParameters, ParametersByteSize); } @@ -1178,7 +1178,7 @@ static HRESULT WINAPI XA23SUB_GetEffectParameters(IXAudio23SubmixVoice *iface, static HRESULT WINAPI XA23SUB_SetFilterParameters(IXAudio23SubmixVoice *iface, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_SetFilterParameters(&This->IXAudio2SubmixVoice_iface, pParameters, OperationSet); } @@ -1186,14 +1186,14 @@ static HRESULT WINAPI XA23SUB_SetFilterParameters(IXAudio23SubmixVoice *iface, static void WINAPI XA23SUB_GetFilterParameters(IXAudio23SubmixVoice *iface, XAUDIO2_FILTER_PARAMETERS *pParameters) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_GetFilterParameters(&This->IXAudio2SubmixVoice_iface, pParameters); } static HRESULT WINAPI XA23SUB_SetVolume(IXAudio23SubmixVoice *iface, float Volume, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_SetVolume(&This->IXAudio2SubmixVoice_iface, Volume, OperationSet); } @@ -1201,14 +1201,14 @@ static HRESULT WINAPI XA23SUB_SetVolume(IXAudio23SubmixVoice *iface, static void WINAPI XA23SUB_GetVolume(IXAudio23SubmixVoice *iface, float *pVolume) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_GetVolume(&This->IXAudio2SubmixVoice_iface, pVolume); } static HRESULT WINAPI XA23SUB_SetChannelVolumes(IXAudio23SubmixVoice *iface, UINT32 Channels, const float *pVolumes, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_SetChannelVolumes(&This->IXAudio2SubmixVoice_iface, Channels, pVolumes, OperationSet); } @@ -1216,7 +1216,7 @@ static HRESULT WINAPI XA23SUB_SetChannelVolumes(IXAudio23SubmixVoice *iface, static void WINAPI XA23SUB_GetChannelVolumes(IXAudio23SubmixVoice *iface, UINT32 Channels, float *pVolumes) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_GetChannelVolumes(&This->IXAudio2SubmixVoice_iface, Channels, pVolumes); } @@ -1226,7 +1226,7 @@ static HRESULT WINAPI XA23SUB_SetOutputMatrix(IXAudio23SubmixVoice *iface, UINT32 DestinationChannels, const float *pLevelMatrix, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_SetOutputMatrix(&This->IXAudio2SubmixVoice_iface, pDestinationVoice, SubmixChannels, DestinationChannels, pLevelMatrix, OperationSet); @@ -1236,7 +1236,7 @@ static void WINAPI XA23SUB_GetOutputMatrix(IXAudio23SubmixVoice *iface, IXAudio2Voice *pDestinationVoice, UINT32 SubmixChannels, UINT32 DestinationChannels, float *pLevelMatrix) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_GetOutputMatrix(&This->IXAudio2SubmixVoice_iface, pDestinationVoice, SubmixChannels, DestinationChannels, pLevelMatrix); @@ -1244,7 +1244,7 @@ static void WINAPI XA23SUB_GetOutputMatrix(IXAudio23SubmixVoice *iface, static void WINAPI XA23SUB_DestroyVoice(IXAudio23SubmixVoice *iface) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_DestroyVoice(&This->IXAudio2SubmixVoice_iface); } @@ -1270,15 +1270,15 @@ const IXAudio23SubmixVoiceVtbl XAudio23SubmixVoice_Vtbl = { #elif XAUDIO2_VER <= 7 -static XA2SubmixImpl *impl_from_IXAudio27SubmixVoice(IXAudio27SubmixVoice *iface) +XA2VoiceImpl *impl_from_IXAudio27SubmixVoice(IXAudio27SubmixVoice *iface) { - return CONTAINING_RECORD(iface, XA2SubmixImpl, IXAudio27SubmixVoice_iface); + return CONTAINING_RECORD(iface, XA2VoiceImpl, IXAudio27SubmixVoice_iface); } static void WINAPI XA27SUB_GetVoiceDetails(IXAudio27SubmixVoice *iface, XAUDIO27_VOICE_DETAILS *pVoiceDetails) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); XAUDIO2_VOICE_DETAILS details; IXAudio2SubmixVoice_GetVoiceDetails(&This->IXAudio2SubmixVoice_iface, &details); @@ -1291,21 +1291,21 @@ static void WINAPI XA27SUB_GetVoiceDetails(IXAudio27SubmixVoice *iface, static HRESULT WINAPI XA27SUB_SetOutputVoices(IXAudio27SubmixVoice *iface, const XAUDIO2_VOICE_SENDS *pSendList) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_SetOutputVoices(&This->IXAudio2SubmixVoice_iface, pSendList); } static HRESULT WINAPI XA27SUB_SetEffectChain(IXAudio27SubmixVoice *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_SetEffectChain(&This->IXAudio2SubmixVoice_iface, pEffectChain); } static HRESULT WINAPI XA27SUB_EnableEffect(IXAudio27SubmixVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_EnableEffect(&This->IXAudio2SubmixVoice_iface, EffectIndex, OperationSet); } @@ -1313,7 +1313,7 @@ static HRESULT WINAPI XA27SUB_EnableEffect(IXAudio27SubmixVoice *iface, static HRESULT WINAPI XA27SUB_DisableEffect(IXAudio27SubmixVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_DisableEffect(&This->IXAudio2SubmixVoice_iface, EffectIndex, OperationSet); } @@ -1321,7 +1321,7 @@ static HRESULT WINAPI XA27SUB_DisableEffect(IXAudio27SubmixVoice *iface, static void WINAPI XA27SUB_GetEffectState(IXAudio27SubmixVoice *iface, UINT32 EffectIndex, BOOL *pEnabled) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_GetEffectState(&This->IXAudio2SubmixVoice_iface, EffectIndex, pEnabled); } @@ -1330,7 +1330,7 @@ static HRESULT WINAPI XA27SUB_SetEffectParameters(IXAudio27SubmixVoice *iface, UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_SetEffectParameters(&This->IXAudio2SubmixVoice_iface, EffectIndex, pParameters, ParametersByteSize, OperationSet); } @@ -1338,7 +1338,7 @@ static HRESULT WINAPI XA27SUB_SetEffectParameters(IXAudio27SubmixVoice *iface, static HRESULT WINAPI XA27SUB_GetEffectParameters(IXAudio27SubmixVoice *iface, UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_GetEffectParameters(&This->IXAudio2SubmixVoice_iface, EffectIndex, pParameters, ParametersByteSize); } @@ -1346,7 +1346,7 @@ static HRESULT WINAPI XA27SUB_GetEffectParameters(IXAudio27SubmixVoice *iface, static HRESULT WINAPI XA27SUB_SetFilterParameters(IXAudio27SubmixVoice *iface, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_SetFilterParameters(&This->IXAudio2SubmixVoice_iface, pParameters, OperationSet); } @@ -1354,7 +1354,7 @@ static HRESULT WINAPI XA27SUB_SetFilterParameters(IXAudio27SubmixVoice *iface, static void WINAPI XA27SUB_GetFilterParameters(IXAudio27SubmixVoice *iface, XAUDIO2_FILTER_PARAMETERS *pParameters) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_GetFilterParameters(&This->IXAudio2SubmixVoice_iface, pParameters); } @@ -1362,7 +1362,7 @@ static HRESULT WINAPI XA27SUB_SetOutputFilterParameters(IXAudio27SubmixVoice *if IXAudio2Voice *pDestinationVoice, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_SetOutputFilterParameters(&This->IXAudio2SubmixVoice_iface, pDestinationVoice, pParameters, OperationSet); } @@ -1371,7 +1371,7 @@ static void WINAPI XA27SUB_GetOutputFilterParameters(IXAudio27SubmixVoice *iface IXAudio2Voice *pDestinationVoice, XAUDIO2_FILTER_PARAMETERS *pParameters) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); IXAudio2SubmixVoice_GetOutputFilterParameters(&This->IXAudio2SubmixVoice_iface, pDestinationVoice, pParameters); } @@ -1379,7 +1379,7 @@ static void WINAPI XA27SUB_GetOutputFilterParameters(IXAudio27SubmixVoice *iface static HRESULT WINAPI XA27SUB_SetVolume(IXAudio27SubmixVoice *iface, float Volume, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_SetVolume(&This->IXAudio2SubmixVoice_iface, Volume, OperationSet); } @@ -1387,14 +1387,14 @@ static HRESULT WINAPI XA27SUB_SetVolume(IXAudio27SubmixVoice *iface, static void WINAPI XA27SUB_GetVolume(IXAudio27SubmixVoice *iface, float *pVolume) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_GetVolume(&This->IXAudio2SubmixVoice_iface, pVolume); } static HRESULT WINAPI XA27SUB_SetChannelVolumes(IXAudio27SubmixVoice *iface, UINT32 Channels, const float *pVolumes, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_SetChannelVolumes(&This->IXAudio2SubmixVoice_iface, Channels, pVolumes, OperationSet); } @@ -1402,7 +1402,7 @@ static HRESULT WINAPI XA27SUB_SetChannelVolumes(IXAudio27SubmixVoice *iface, static void WINAPI XA27SUB_GetChannelVolumes(IXAudio27SubmixVoice *iface, UINT32 Channels, float *pVolumes) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_GetChannelVolumes(&This->IXAudio2SubmixVoice_iface, Channels, pVolumes); } @@ -1412,7 +1412,7 @@ static HRESULT WINAPI XA27SUB_SetOutputMatrix(IXAudio27SubmixVoice *iface, UINT32 DestinationChannels, const float *pLevelMatrix, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_SetOutputMatrix(&This->IXAudio2SubmixVoice_iface, pDestinationVoice, SubmixChannels, DestinationChannels, pLevelMatrix, OperationSet); @@ -1422,7 +1422,7 @@ static void WINAPI XA27SUB_GetOutputMatrix(IXAudio27SubmixVoice *iface, IXAudio2Voice *pDestinationVoice, UINT32 SubmixChannels, UINT32 DestinationChannels, float *pLevelMatrix) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_GetOutputMatrix(&This->IXAudio2SubmixVoice_iface, pDestinationVoice, SubmixChannels, DestinationChannels, pLevelMatrix); @@ -1430,7 +1430,7 @@ static void WINAPI XA27SUB_GetOutputMatrix(IXAudio27SubmixVoice *iface, static void WINAPI XA27SUB_DestroyVoice(IXAudio27SubmixVoice *iface) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_DestroyVoice(&This->IXAudio2SubmixVoice_iface); } @@ -1461,15 +1461,15 @@ const IXAudio27SubmixVoiceVtbl XAudio27SubmixVoice_Vtbl = { /* BEGIN IXAudio2MasteringVoice */ #if XAUDIO2_VER == 0 -static IXAudio2Impl *impl_from_IXAudio20MasteringVoice(IXAudio20MasteringVoice *iface) +XA2VoiceImpl *impl_from_IXAudio20MasteringVoice(IXAudio20MasteringVoice *iface) { - return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio20MasteringVoice_iface); + return CONTAINING_RECORD(iface, XA2VoiceImpl, IXAudio20MasteringVoice_iface); } static void WINAPI XA20M_GetVoiceDetails(IXAudio20MasteringVoice *iface, XAUDIO27_VOICE_DETAILS *pVoiceDetails) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); XAUDIO2_VOICE_DETAILS details; IXAudio2MasteringVoice_GetVoiceDetails(&This->IXAudio2MasteringVoice_iface, &details); @@ -1482,7 +1482,7 @@ static void WINAPI XA20M_GetVoiceDetails(IXAudio20MasteringVoice *iface, static HRESULT WINAPI XA20M_SetOutputVoices(IXAudio20MasteringVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); XAUDIO2_VOICE_SENDS sends, *psends; HRESULT hr; @@ -1505,14 +1505,14 @@ static HRESULT WINAPI XA20M_SetOutputVoices(IXAudio20MasteringVoice *iface, static HRESULT WINAPI XA20M_SetEffectChain(IXAudio20MasteringVoice *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_SetEffectChain(&This->IXAudio2MasteringVoice_iface, pEffectChain); } static HRESULT WINAPI XA20M_EnableEffect(IXAudio20MasteringVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_EnableEffect(&This->IXAudio2MasteringVoice_iface, EffectIndex, OperationSet); } @@ -1520,7 +1520,7 @@ static HRESULT WINAPI XA20M_EnableEffect(IXAudio20MasteringVoice *iface, static HRESULT WINAPI XA20M_DisableEffect(IXAudio20MasteringVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_DisableEffect(&This->IXAudio2MasteringVoice_iface, EffectIndex, OperationSet); } @@ -1528,7 +1528,7 @@ static HRESULT WINAPI XA20M_DisableEffect(IXAudio20MasteringVoice *iface, static void WINAPI XA20M_GetEffectState(IXAudio20MasteringVoice *iface, UINT32 EffectIndex, BOOL *pEnabled) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_GetEffectState(&This->IXAudio2MasteringVoice_iface, EffectIndex, pEnabled); } @@ -1537,7 +1537,7 @@ static HRESULT WINAPI XA20M_SetEffectParameters(IXAudio20MasteringVoice *iface, UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_SetEffectParameters(&This->IXAudio2MasteringVoice_iface, EffectIndex, pParameters, ParametersByteSize, OperationSet); } @@ -1545,7 +1545,7 @@ static HRESULT WINAPI XA20M_SetEffectParameters(IXAudio20MasteringVoice *iface, static HRESULT WINAPI XA20M_GetEffectParameters(IXAudio20MasteringVoice *iface, UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_GetEffectParameters(&This->IXAudio2MasteringVoice_iface, EffectIndex, pParameters, ParametersByteSize); } @@ -1553,7 +1553,7 @@ static HRESULT WINAPI XA20M_GetEffectParameters(IXAudio20MasteringVoice *iface, static HRESULT WINAPI XA20M_SetFilterParameters(IXAudio20MasteringVoice *iface, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_SetFilterParameters(&This->IXAudio2MasteringVoice_iface, pParameters, OperationSet); } @@ -1561,14 +1561,14 @@ static HRESULT WINAPI XA20M_SetFilterParameters(IXAudio20MasteringVoice *iface, static void WINAPI XA20M_GetFilterParameters(IXAudio20MasteringVoice *iface, XAUDIO2_FILTER_PARAMETERS *pParameters) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_GetFilterParameters(&This->IXAudio2MasteringVoice_iface, pParameters); } static HRESULT WINAPI XA20M_SetVolume(IXAudio20MasteringVoice *iface, float Volume, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_SetVolume(&This->IXAudio2MasteringVoice_iface, Volume, OperationSet); } @@ -1576,14 +1576,14 @@ static HRESULT WINAPI XA20M_SetVolume(IXAudio20MasteringVoice *iface, static void WINAPI XA20M_GetVolume(IXAudio20MasteringVoice *iface, float *pVolume) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_GetVolume(&This->IXAudio2MasteringVoice_iface, pVolume); } static HRESULT WINAPI XA20M_SetChannelVolumes(IXAudio20MasteringVoice *iface, UINT32 Channels, const float *pVolumes, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_SetChannelVolumes(&This->IXAudio2MasteringVoice_iface, Channels, pVolumes, OperationSet); } @@ -1591,7 +1591,7 @@ static HRESULT WINAPI XA20M_SetChannelVolumes(IXAudio20MasteringVoice *iface, static void WINAPI XA20M_GetChannelVolumes(IXAudio20MasteringVoice *iface, UINT32 Channels, float *pVolumes) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_GetChannelVolumes(&This->IXAudio2MasteringVoice_iface, Channels, pVolumes); } @@ -1601,7 +1601,7 @@ static HRESULT WINAPI XA20M_SetOutputMatrix(IXAudio20MasteringVoice *iface, UINT32 DestinationChannels, const float *pLevelMatrix, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_SetOutputMatrix(&This->IXAudio2MasteringVoice_iface, pDestinationVoice, MasteringChannels, DestinationChannels, pLevelMatrix, OperationSet); @@ -1611,7 +1611,7 @@ static HRESULT WINAPI XA20M_GetOutputMatrix(IXAudio20MasteringVoice *iface, IXAudio2Voice *pDestinationVoice, UINT32 MasteringChannels, UINT32 DestinationChannels, float *pLevelMatrix) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); IXAudio2MasteringVoice_GetOutputMatrix(&This->IXAudio2MasteringVoice_iface, pDestinationVoice, MasteringChannels, DestinationChannels, pLevelMatrix); @@ -1620,7 +1620,7 @@ static HRESULT WINAPI XA20M_GetOutputMatrix(IXAudio20MasteringVoice *iface, static void WINAPI XA20M_DestroyVoice(IXAudio20MasteringVoice *iface) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_DestroyVoice(&This->IXAudio2MasteringVoice_iface); } @@ -1646,15 +1646,15 @@ const IXAudio20MasteringVoiceVtbl XAudio20MasteringVoice_Vtbl = { #elif XAUDIO2_VER <= 3 -static IXAudio2Impl *impl_from_IXAudio23MasteringVoice(IXAudio23MasteringVoice *iface) +XA2VoiceImpl *impl_from_IXAudio23MasteringVoice(IXAudio23MasteringVoice *iface) { - return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio23MasteringVoice_iface); + return CONTAINING_RECORD(iface, XA2VoiceImpl, IXAudio23MasteringVoice_iface); } static void WINAPI XA23M_GetVoiceDetails(IXAudio23MasteringVoice *iface, XAUDIO27_VOICE_DETAILS *pVoiceDetails) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); XAUDIO2_VOICE_DETAILS details; IXAudio2MasteringVoice_GetVoiceDetails(&This->IXAudio2MasteringVoice_iface, &details); @@ -1667,7 +1667,7 @@ static void WINAPI XA23M_GetVoiceDetails(IXAudio23MasteringVoice *iface, static HRESULT WINAPI XA23M_SetOutputVoices(IXAudio23MasteringVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; @@ -1690,14 +1690,14 @@ static HRESULT WINAPI XA23M_SetOutputVoices(IXAudio23MasteringVoice *iface, static HRESULT WINAPI XA23M_SetEffectChain(IXAudio23MasteringVoice *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_SetEffectChain(&This->IXAudio2MasteringVoice_iface, pEffectChain); } static HRESULT WINAPI XA23M_EnableEffect(IXAudio23MasteringVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_EnableEffect(&This->IXAudio2MasteringVoice_iface, EffectIndex, OperationSet); } @@ -1705,7 +1705,7 @@ static HRESULT WINAPI XA23M_EnableEffect(IXAudio23MasteringVoice *iface, static HRESULT WINAPI XA23M_DisableEffect(IXAudio23MasteringVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_DisableEffect(&This->IXAudio2MasteringVoice_iface, EffectIndex, OperationSet); } @@ -1713,7 +1713,7 @@ static HRESULT WINAPI XA23M_DisableEffect(IXAudio23MasteringVoice *iface, static void WINAPI XA23M_GetEffectState(IXAudio23MasteringVoice *iface, UINT32 EffectIndex, BOOL *pEnabled) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_GetEffectState(&This->IXAudio2MasteringVoice_iface, EffectIndex, pEnabled); } @@ -1722,7 +1722,7 @@ static HRESULT WINAPI XA23M_SetEffectParameters(IXAudio23MasteringVoice *iface, UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_SetEffectParameters(&This->IXAudio2MasteringVoice_iface, EffectIndex, pParameters, ParametersByteSize, OperationSet); } @@ -1730,7 +1730,7 @@ static HRESULT WINAPI XA23M_SetEffectParameters(IXAudio23MasteringVoice *iface, static HRESULT WINAPI XA23M_GetEffectParameters(IXAudio23MasteringVoice *iface, UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_GetEffectParameters(&This->IXAudio2MasteringVoice_iface, EffectIndex, pParameters, ParametersByteSize); } @@ -1738,7 +1738,7 @@ static HRESULT WINAPI XA23M_GetEffectParameters(IXAudio23MasteringVoice *iface, static HRESULT WINAPI XA23M_SetFilterParameters(IXAudio23MasteringVoice *iface, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_SetFilterParameters(&This->IXAudio2MasteringVoice_iface, pParameters, OperationSet); } @@ -1746,14 +1746,14 @@ static HRESULT WINAPI XA23M_SetFilterParameters(IXAudio23MasteringVoice *iface, static void WINAPI XA23M_GetFilterParameters(IXAudio23MasteringVoice *iface, XAUDIO2_FILTER_PARAMETERS *pParameters) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_GetFilterParameters(&This->IXAudio2MasteringVoice_iface, pParameters); } static HRESULT WINAPI XA23M_SetVolume(IXAudio23MasteringVoice *iface, float Volume, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_SetVolume(&This->IXAudio2MasteringVoice_iface, Volume, OperationSet); } @@ -1761,14 +1761,14 @@ static HRESULT WINAPI XA23M_SetVolume(IXAudio23MasteringVoice *iface, static void WINAPI XA23M_GetVolume(IXAudio23MasteringVoice *iface, float *pVolume) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_GetVolume(&This->IXAudio2MasteringVoice_iface, pVolume); } static HRESULT WINAPI XA23M_SetChannelVolumes(IXAudio23MasteringVoice *iface, UINT32 Channels, const float *pVolumes, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_SetChannelVolumes(&This->IXAudio2MasteringVoice_iface, Channels, pVolumes, OperationSet); } @@ -1776,7 +1776,7 @@ static HRESULT WINAPI XA23M_SetChannelVolumes(IXAudio23MasteringVoice *iface, static void WINAPI XA23M_GetChannelVolumes(IXAudio23MasteringVoice *iface, UINT32 Channels, float *pVolumes) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_GetChannelVolumes(&This->IXAudio2MasteringVoice_iface, Channels, pVolumes); } @@ -1786,7 +1786,7 @@ static HRESULT WINAPI XA23M_SetOutputMatrix(IXAudio23MasteringVoice *iface, UINT32 DestinationChannels, const float *pLevelMatrix, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_SetOutputMatrix(&This->IXAudio2MasteringVoice_iface, pDestinationVoice, MasteringChannels, DestinationChannels, pLevelMatrix, OperationSet); @@ -1796,7 +1796,7 @@ static void WINAPI XA23M_GetOutputMatrix(IXAudio23MasteringVoice *iface, IXAudio2Voice *pDestinationVoice, UINT32 MasteringChannels, UINT32 DestinationChannels, float *pLevelMatrix) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_GetOutputMatrix(&This->IXAudio2MasteringVoice_iface, pDestinationVoice, MasteringChannels, DestinationChannels, pLevelMatrix); @@ -1804,7 +1804,7 @@ static void WINAPI XA23M_GetOutputMatrix(IXAudio23MasteringVoice *iface, static void WINAPI XA23M_DestroyVoice(IXAudio23MasteringVoice *iface) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_DestroyVoice(&This->IXAudio2MasteringVoice_iface); } @@ -1830,15 +1830,15 @@ const IXAudio23MasteringVoiceVtbl XAudio23MasteringVoice_Vtbl = { #elif XAUDIO2_VER <= 7 -static IXAudio2Impl *impl_from_IXAudio27MasteringVoice(IXAudio27MasteringVoice *iface) +XA2VoiceImpl *impl_from_IXAudio27MasteringVoice(IXAudio27MasteringVoice *iface) { - return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio27MasteringVoice_iface); + return CONTAINING_RECORD(iface, XA2VoiceImpl, IXAudio27MasteringVoice_iface); } static void WINAPI XA27M_GetVoiceDetails(IXAudio27MasteringVoice *iface, XAUDIO27_VOICE_DETAILS *pVoiceDetails) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); XAUDIO2_VOICE_DETAILS details; IXAudio2MasteringVoice_GetVoiceDetails(&This->IXAudio2MasteringVoice_iface, &details); @@ -1851,21 +1851,21 @@ static void WINAPI XA27M_GetVoiceDetails(IXAudio27MasteringVoice *iface, static HRESULT WINAPI XA27M_SetOutputVoices(IXAudio27MasteringVoice *iface, const XAUDIO2_VOICE_SENDS *pSendList) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_SetOutputVoices(&This->IXAudio2MasteringVoice_iface, pSendList); } static HRESULT WINAPI XA27M_SetEffectChain(IXAudio27MasteringVoice *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_SetEffectChain(&This->IXAudio2MasteringVoice_iface, pEffectChain); } static HRESULT WINAPI XA27M_EnableEffect(IXAudio27MasteringVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_EnableEffect(&This->IXAudio2MasteringVoice_iface, EffectIndex, OperationSet); } @@ -1873,7 +1873,7 @@ static HRESULT WINAPI XA27M_EnableEffect(IXAudio27MasteringVoice *iface, static HRESULT WINAPI XA27M_DisableEffect(IXAudio27MasteringVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_DisableEffect(&This->IXAudio2MasteringVoice_iface, EffectIndex, OperationSet); } @@ -1881,7 +1881,7 @@ static HRESULT WINAPI XA27M_DisableEffect(IXAudio27MasteringVoice *iface, static void WINAPI XA27M_GetEffectState(IXAudio27MasteringVoice *iface, UINT32 EffectIndex, BOOL *pEnabled) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_GetEffectState(&This->IXAudio2MasteringVoice_iface, EffectIndex, pEnabled); } @@ -1890,7 +1890,7 @@ static HRESULT WINAPI XA27M_SetEffectParameters(IXAudio27MasteringVoice *iface, UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_SetEffectParameters(&This->IXAudio2MasteringVoice_iface, EffectIndex, pParameters, ParametersByteSize, OperationSet); } @@ -1898,7 +1898,7 @@ static HRESULT WINAPI XA27M_SetEffectParameters(IXAudio27MasteringVoice *iface, static HRESULT WINAPI XA27M_GetEffectParameters(IXAudio27MasteringVoice *iface, UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_GetEffectParameters(&This->IXAudio2MasteringVoice_iface, EffectIndex, pParameters, ParametersByteSize); } @@ -1906,7 +1906,7 @@ static HRESULT WINAPI XA27M_GetEffectParameters(IXAudio27MasteringVoice *iface, static HRESULT WINAPI XA27M_SetFilterParameters(IXAudio27MasteringVoice *iface, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_SetFilterParameters(&This->IXAudio2MasteringVoice_iface, pParameters, OperationSet); } @@ -1914,7 +1914,7 @@ static HRESULT WINAPI XA27M_SetFilterParameters(IXAudio27MasteringVoice *iface, static void WINAPI XA27M_GetFilterParameters(IXAudio27MasteringVoice *iface, XAUDIO2_FILTER_PARAMETERS *pParameters) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_GetFilterParameters(&This->IXAudio2MasteringVoice_iface, pParameters); } @@ -1922,7 +1922,7 @@ static HRESULT WINAPI XA27M_SetOutputFilterParameters(IXAudio27MasteringVoice *i IXAudio2Voice *pDestinationVoice, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_SetOutputFilterParameters(&This->IXAudio2MasteringVoice_iface, pDestinationVoice, pParameters, OperationSet); } @@ -1931,7 +1931,7 @@ static void WINAPI XA27M_GetOutputFilterParameters(IXAudio27MasteringVoice *ifac IXAudio2Voice *pDestinationVoice, XAUDIO2_FILTER_PARAMETERS *pParameters) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); IXAudio2MasteringVoice_GetOutputFilterParameters(&This->IXAudio2MasteringVoice_iface, pDestinationVoice, pParameters); } @@ -1939,7 +1939,7 @@ static void WINAPI XA27M_GetOutputFilterParameters(IXAudio27MasteringVoice *ifac static HRESULT WINAPI XA27M_SetVolume(IXAudio27MasteringVoice *iface, float Volume, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_SetVolume(&This->IXAudio2MasteringVoice_iface, Volume, OperationSet); } @@ -1947,14 +1947,14 @@ static HRESULT WINAPI XA27M_SetVolume(IXAudio27MasteringVoice *iface, static void WINAPI XA27M_GetVolume(IXAudio27MasteringVoice *iface, float *pVolume) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_GetVolume(&This->IXAudio2MasteringVoice_iface, pVolume); } static HRESULT WINAPI XA27M_SetChannelVolumes(IXAudio27MasteringVoice *iface, UINT32 Channels, const float *pVolumes, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_SetChannelVolumes(&This->IXAudio2MasteringVoice_iface, Channels, pVolumes, OperationSet); } @@ -1962,7 +1962,7 @@ static HRESULT WINAPI XA27M_SetChannelVolumes(IXAudio27MasteringVoice *iface, static void WINAPI XA27M_GetChannelVolumes(IXAudio27MasteringVoice *iface, UINT32 Channels, float *pVolumes) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_GetChannelVolumes(&This->IXAudio2MasteringVoice_iface, Channels, pVolumes); } @@ -1972,7 +1972,7 @@ static HRESULT WINAPI XA27M_SetOutputMatrix(IXAudio27MasteringVoice *iface, UINT32 DestinationChannels, const float *pLevelMatrix, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_SetOutputMatrix(&This->IXAudio2MasteringVoice_iface, pDestinationVoice, MasteringChannels, DestinationChannels, pLevelMatrix, OperationSet); @@ -1982,7 +1982,7 @@ static void WINAPI XA27M_GetOutputMatrix(IXAudio27MasteringVoice *iface, IXAudio2Voice *pDestinationVoice, UINT32 MasteringChannels, UINT32 DestinationChannels, float *pLevelMatrix) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_GetOutputMatrix(&This->IXAudio2MasteringVoice_iface, pDestinationVoice, MasteringChannels, DestinationChannels, pLevelMatrix); @@ -1990,7 +1990,7 @@ static void WINAPI XA27M_GetOutputMatrix(IXAudio27MasteringVoice *iface, static void WINAPI XA27M_DestroyVoice(IXAudio27MasteringVoice *iface) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_DestroyVoice(&This->IXAudio2MasteringVoice_iface); } @@ -2048,93 +2048,16 @@ static ULONG WINAPI XA20_Release(IXAudio20 *iface) static HRESULT WINAPI XA20_GetDeviceCount(IXAudio20 *iface, UINT32 *pCount) { IXAudio2Impl *This = impl_from_IXAudio20(iface); - TRACE("%p, %p\n", This, pCount); - - *pCount = This->ndevs; - - return S_OK; + return FAudio_GetDeviceCount(This->faudio, pCount); } static HRESULT WINAPI XA20_GetDeviceDetails(IXAudio20 *iface, UINT32 index, XAUDIO2_DEVICE_DETAILS *pDeviceDetails) { IXAudio2Impl *This = impl_from_IXAudio20(iface); - HRESULT hr; - IMMDevice *dev; - IAudioClient *client; - IPropertyStore *ps; - WAVEFORMATEX *wfx; - PROPVARIANT var; - TRACE("%p, %u, %p\n", This, index, pDeviceDetails); - - if(index >= This->ndevs) - return E_INVALIDARG; - - hr = IMMDeviceEnumerator_GetDevice(This->devenum, This->devids[index], &dev); - if(FAILED(hr)){ - WARN("GetDevice failed: %08x\n", hr); - return hr; - } - - hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, - NULL, (void**)&client); - if(FAILED(hr)){ - WARN("Activate failed: %08x\n", hr); - IMMDevice_Release(dev); - return hr; - } - - hr = IMMDevice_OpenPropertyStore(dev, STGM_READ, &ps); - if(FAILED(hr)){ - WARN("OpenPropertyStore failed: %08x\n", hr); - IAudioClient_Release(client); - IMMDevice_Release(dev); - return hr; - } - - PropVariantInit(&var); - - hr = IPropertyStore_GetValue(ps, (PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &var); - if(FAILED(hr)){ - WARN("GetValue failed: %08x\n", hr); - goto done; - } - - lstrcpynW(pDeviceDetails->DisplayName, var.u.pwszVal, ARRAY_SIZE(pDeviceDetails->DisplayName)); - - PropVariantClear(&var); - - hr = IAudioClient_GetMixFormat(client, &wfx); - if(FAILED(hr)){ - WARN("GetMixFormat failed: %08x\n", hr); - goto done; - } - - lstrcpyW(pDeviceDetails->DeviceID, This->devids[index]); - - if(index == 0) - pDeviceDetails->Role = GlobalDefaultDevice; - else - pDeviceDetails->Role = NotDefaultDevice; - - if(sizeof(WAVEFORMATEX) + wfx->cbSize > sizeof(pDeviceDetails->OutputFormat)){ - FIXME("AudioClient format is too large to fit into WAVEFORMATEXTENSIBLE!\n"); - CoTaskMemFree(wfx); - hr = E_FAIL; - goto done; - } - memcpy(&pDeviceDetails->OutputFormat, wfx, sizeof(WAVEFORMATEX) + wfx->cbSize); - - CoTaskMemFree(wfx); - -done: - IPropertyStore_Release(ps); - IAudioClient_Release(client); - IMMDevice_Release(dev); - - return hr; + return FAudio_GetDeviceDetails(This->faudio, index, (FAudioDeviceDetails *)pDeviceDetails); } static HRESULT WINAPI XA20_Initialize(IXAudio20 *iface, UINT32 flags, @@ -2222,12 +2145,41 @@ static HRESULT WINAPI XA20_CreateMasteringVoice(IXAudio20 *iface, inputChannels, inputSampleRate, flags, deviceIndex, pEffectChain); - if(deviceIndex >= This->ndevs) - return E_INVALIDARG; + EnterCriticalSection(&This->lock); + + /* XAUDIO2_VER == 0 */ + *ppMasteringVoice = (IXAudio2MasteringVoice*)&This->mst.IXAudio20MasteringVoice_iface; + + EnterCriticalSection(&This->mst.lock); + + if(This->mst.in_use){ + LeaveCriticalSection(&This->mst.lock); + LeaveCriticalSection(&This->lock); + return COMPAT_E_INVALID_CALL; + } + + LeaveCriticalSection(&This->lock); - return IXAudio2_CreateMasteringVoice(&This->IXAudio2_iface, ppMasteringVoice, - inputChannels, inputSampleRate, flags, This->devids[deviceIndex], - pEffectChain, AudioCategory_GameEffects); + This->mst.effect_chain = wrap_effect_chain(pEffectChain); + + pthread_mutex_lock(&This->mst.engine_lock); + + This->mst.engine_thread = CreateThread(NULL, 0, &engine_thread, &This->mst, 0, NULL); + + pthread_cond_wait(&This->mst.engine_done, &This->mst.engine_lock); + + pthread_mutex_unlock(&This->mst.engine_lock); + + FAudio_SetEngineProcedureEXT(This->faudio, &engine_cb, &This->mst); + + FAudio_CreateMasteringVoice(This->faudio, &This->mst.faudio_voice, inputChannels, + inputSampleRate, flags, deviceIndex, This->mst.effect_chain); + + This->mst.in_use = TRUE; + + LeaveCriticalSection(&This->mst.lock); + + return S_OK; } static HRESULT WINAPI XA20_StartEngine(IXAudio20 *iface) @@ -2331,93 +2283,16 @@ static ULONG WINAPI XA22_Release(IXAudio22 *iface) static HRESULT WINAPI XA22_GetDeviceCount(IXAudio22 *iface, UINT32 *pCount) { IXAudio2Impl *This = impl_from_IXAudio22(iface); - TRACE("%p, %p\n", This, pCount); - - *pCount = This->ndevs; - - return S_OK; + return FAudio_GetDeviceCount(This->faudio, pCount); } static HRESULT WINAPI XA22_GetDeviceDetails(IXAudio22 *iface, UINT32 index, XAUDIO2_DEVICE_DETAILS *pDeviceDetails) { IXAudio2Impl *This = impl_from_IXAudio22(iface); - HRESULT hr; - IMMDevice *dev; - IAudioClient *client; - IPropertyStore *ps; - WAVEFORMATEX *wfx; - PROPVARIANT var; - TRACE("%p, %u, %p\n", This, index, pDeviceDetails); - - if(index >= This->ndevs) - return E_INVALIDARG; - - hr = IMMDeviceEnumerator_GetDevice(This->devenum, This->devids[index], &dev); - if(FAILED(hr)){ - WARN("GetDevice failed: %08x\n", hr); - return hr; - } - - hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, - NULL, (void**)&client); - if(FAILED(hr)){ - WARN("Activate failed: %08x\n", hr); - IMMDevice_Release(dev); - return hr; - } - - hr = IMMDevice_OpenPropertyStore(dev, STGM_READ, &ps); - if(FAILED(hr)){ - WARN("OpenPropertyStore failed: %08x\n", hr); - IAudioClient_Release(client); - IMMDevice_Release(dev); - return hr; - } - - PropVariantInit(&var); - - hr = IPropertyStore_GetValue(ps, (PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &var); - if(FAILED(hr)){ - WARN("GetValue failed: %08x\n", hr); - goto done; - } - - lstrcpynW(pDeviceDetails->DisplayName, var.u.pwszVal, ARRAY_SIZE(pDeviceDetails->DisplayName)); - - PropVariantClear(&var); - - hr = IAudioClient_GetMixFormat(client, &wfx); - if(FAILED(hr)){ - WARN("GetMixFormat failed: %08x\n", hr); - goto done; - } - - lstrcpyW(pDeviceDetails->DeviceID, This->devids[index]); - - if(index == 0) - pDeviceDetails->Role = GlobalDefaultDevice; - else - pDeviceDetails->Role = NotDefaultDevice; - - if(sizeof(WAVEFORMATEX) + wfx->cbSize > sizeof(pDeviceDetails->OutputFormat)){ - FIXME("AudioClient format is too large to fit into WAVEFORMATEXTENSIBLE!\n"); - CoTaskMemFree(wfx); - hr = E_FAIL; - goto done; - } - memcpy(&pDeviceDetails->OutputFormat, wfx, sizeof(WAVEFORMATEX) + wfx->cbSize); - - CoTaskMemFree(wfx); - -done: - IPropertyStore_Release(ps); - IAudioClient_Release(client); - IMMDevice_Release(dev); - - return hr; + return FAudio_GetDeviceDetails(This->faudio, index, (FAudioDeviceDetails *)pDeviceDetails); } static HRESULT WINAPI XA22_Initialize(IXAudio22 *iface, UINT32 flags, @@ -2505,12 +2380,41 @@ static HRESULT WINAPI XA22_CreateMasteringVoice(IXAudio22 *iface, inputChannels, inputSampleRate, flags, deviceIndex, pEffectChain); - if(deviceIndex >= This->ndevs) - return E_INVALIDARG; + EnterCriticalSection(&This->lock); + + /* 1 <= XAUDIO2_VER <= 2 */ + *ppMasteringVoice = (IXAudio2MasteringVoice*)&This->mst.IXAudio23MasteringVoice_iface; + + EnterCriticalSection(&This->mst.lock); + + if(This->mst.in_use){ + LeaveCriticalSection(&This->mst.lock); + LeaveCriticalSection(&This->lock); + return COMPAT_E_INVALID_CALL; + } + + LeaveCriticalSection(&This->lock); + + This->mst.effect_chain = wrap_effect_chain(pEffectChain); + + pthread_mutex_lock(&This->mst.engine_lock); + + This->mst.engine_thread = CreateThread(NULL, 0, &engine_thread, &This->mst, 0, NULL); + + pthread_cond_wait(&This->mst.engine_done, &This->mst.engine_lock); + + pthread_mutex_unlock(&This->mst.engine_lock); + + FAudio_SetEngineProcedureEXT(This->faudio, &engine_cb, &This->mst); - return IXAudio2_CreateMasteringVoice(&This->IXAudio2_iface, ppMasteringVoice, - inputChannels, inputSampleRate, flags, This->devids[deviceIndex], - pEffectChain, AudioCategory_GameEffects); + FAudio_CreateMasteringVoice(This->faudio, &This->mst.faudio_voice, inputChannels, + inputSampleRate, flags, deviceIndex, This->mst.effect_chain); + + This->mst.in_use = TRUE; + + LeaveCriticalSection(&This->mst.lock); + + return S_OK; } static HRESULT WINAPI XA22_StartEngine(IXAudio22 *iface) @@ -2613,93 +2517,16 @@ static ULONG WINAPI XA27_Release(IXAudio27 *iface) static HRESULT WINAPI XA27_GetDeviceCount(IXAudio27 *iface, UINT32 *pCount) { IXAudio2Impl *This = impl_from_IXAudio27(iface); - TRACE("%p, %p\n", This, pCount); - - *pCount = This->ndevs; - - return S_OK; + return FAudio_GetDeviceCount(This->faudio, pCount); } static HRESULT WINAPI XA27_GetDeviceDetails(IXAudio27 *iface, UINT32 index, XAUDIO2_DEVICE_DETAILS *pDeviceDetails) { IXAudio2Impl *This = impl_from_IXAudio27(iface); - HRESULT hr; - IMMDevice *dev; - IAudioClient *client; - IPropertyStore *ps; - WAVEFORMATEX *wfx; - PROPVARIANT var; - TRACE("%p, %u, %p\n", This, index, pDeviceDetails); - - if(index >= This->ndevs) - return E_INVALIDARG; - - hr = IMMDeviceEnumerator_GetDevice(This->devenum, This->devids[index], &dev); - if(FAILED(hr)){ - WARN("GetDevice failed: %08x\n", hr); - return hr; - } - - hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, - NULL, (void**)&client); - if(FAILED(hr)){ - WARN("Activate failed: %08x\n", hr); - IMMDevice_Release(dev); - return hr; - } - - hr = IMMDevice_OpenPropertyStore(dev, STGM_READ, &ps); - if(FAILED(hr)){ - WARN("OpenPropertyStore failed: %08x\n", hr); - IAudioClient_Release(client); - IMMDevice_Release(dev); - return hr; - } - - PropVariantInit(&var); - - hr = IPropertyStore_GetValue(ps, (PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &var); - if(FAILED(hr)){ - WARN("GetValue failed: %08x\n", hr); - goto done; - } - - lstrcpynW(pDeviceDetails->DisplayName, var.u.pwszVal, ARRAY_SIZE(pDeviceDetails->DisplayName)); - - PropVariantClear(&var); - - hr = IAudioClient_GetMixFormat(client, &wfx); - if(FAILED(hr)){ - WARN("GetMixFormat failed: %08x\n", hr); - goto done; - } - - lstrcpyW(pDeviceDetails->DeviceID, This->devids[index]); - - if(index == 0) - pDeviceDetails->Role = GlobalDefaultDevice; - else - pDeviceDetails->Role = NotDefaultDevice; - - if(sizeof(WAVEFORMATEX) + wfx->cbSize > sizeof(pDeviceDetails->OutputFormat)){ - FIXME("AudioClient format is too large to fit into WAVEFORMATEXTENSIBLE!\n"); - CoTaskMemFree(wfx); - hr = E_FAIL; - goto done; - } - memcpy(&pDeviceDetails->OutputFormat, wfx, sizeof(WAVEFORMATEX) + wfx->cbSize); - - CoTaskMemFree(wfx); - -done: - IPropertyStore_Release(ps); - IAudioClient_Release(client); - IMMDevice_Release(dev); - - return hr; + return FAudio_GetDeviceDetails(This->faudio, index, (FAudioDeviceDetails *)pDeviceDetails); } static HRESULT WINAPI XA27_Initialize(IXAudio27 *iface, UINT32 flags, @@ -2759,12 +2586,45 @@ static HRESULT WINAPI XA27_CreateMasteringVoice(IXAudio27 *iface, inputChannels, inputSampleRate, flags, deviceIndex, pEffectChain); - if(deviceIndex >= This->ndevs) - return E_INVALIDARG; + EnterCriticalSection(&This->lock); - return IXAudio2_CreateMasteringVoice(&This->IXAudio2_iface, ppMasteringVoice, - inputChannels, inputSampleRate, flags, This->devids[deviceIndex], - pEffectChain, AudioCategory_GameEffects); + /* 3 <= XAUDIO2_VER <= 7 */ +#if XAUDIO2_VER == 3 + *ppMasteringVoice = (IXAudio2MasteringVoice*)&This->mst.IXAudio23MasteringVoice_iface; +#else + *ppMasteringVoice = (IXAudio2MasteringVoice*)&This->mst.IXAudio27MasteringVoice_iface; +#endif + + EnterCriticalSection(&This->mst.lock); + + if(This->mst.in_use){ + LeaveCriticalSection(&This->mst.lock); + LeaveCriticalSection(&This->lock); + return COMPAT_E_INVALID_CALL; + } + + LeaveCriticalSection(&This->lock); + + This->mst.effect_chain = wrap_effect_chain(pEffectChain); + + pthread_mutex_lock(&This->mst.engine_lock); + + This->mst.engine_thread = CreateThread(NULL, 0, &engine_thread, &This->mst, 0, NULL); + + pthread_cond_wait(&This->mst.engine_done, &This->mst.engine_lock); + + pthread_mutex_unlock(&This->mst.engine_lock); + + FAudio_SetEngineProcedureEXT(This->faudio, &engine_cb, &This->mst); + + FAudio_CreateMasteringVoice(This->faudio, &This->mst.faudio_voice, inputChannels, + inputSampleRate, flags, deviceIndex, This->mst.effect_chain); + + This->mst.in_use = TRUE; + + LeaveCriticalSection(&This->mst.lock); + + return S_OK; } static HRESULT WINAPI XA27_StartEngine(IXAudio27 *iface) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 0c1d9a7805..563f1d163d 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -952,19 +952,16 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) HRESULT (CDECL *pCreateFX)(REFCLSID,IUnknown**) = NULL; /* CLSIDs are the same across all versions */ - static struct { - const GUID *clsid; - BOOL todo; - } const_clsids[] = { - { &CLSID_FXEQ27, FALSE }, - { &CLSID_FXMasteringLimiter27, TRUE }, - { &CLSID_FXReverb27, FALSE }, - { &CLSID_FXEcho27, TRUE}, + static const GUID *const_clsids[] = { + &CLSID_FXEQ27, + &CLSID_FXMasteringLimiter27, + &CLSID_FXReverb27, + &CLSID_FXEcho27, /* older versions of xapofx actually have support for new clsids */ - { &CLSID_FXEQ, FALSE }, - { &CLSID_FXMasteringLimiter, TRUE }, - { &CLSID_FXReverb, FALSE }, - { &CLSID_FXEcho, TRUE} + &CLSID_FXEQ, + &CLSID_FXMasteringLimiter, + &CLSID_FXReverb, + &CLSID_FXEcho }; /* different CLSID for each version */ @@ -1005,9 +1002,8 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) if(pCreateFX){ for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){ - hr = pCreateFX(const_clsids[i].clsid, &fx_unk); - todo_wine_if(const_clsids[i].todo) - ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i].clsid), hr); + hr = pCreateFX(const_clsids[i], &fx_unk); + ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr); if(SUCCEEDED(hr)){ IXAPO *xapo; hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo); @@ -1017,7 +1013,7 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) IUnknown_Release(fx_unk); } - hr = CoCreateInstance(const_clsids[i].clsid, NULL, CLSCTX_INPROC_SERVER, + hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&fx_unk); ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr); if(SUCCEEDED(hr)) @@ -1062,20 +1058,18 @@ static void test_xapo_creation_modern(const char *module) HRESULT (WINAPI *pCAR)(IUnknown**) = NULL; /* CLSIDs are the same across all versions */ - static struct { - const GUID *clsid; - BOOL todo; - } const_clsids[] = { - { &CLSID_FXEQ27, FALSE }, - { &CLSID_FXMasteringLimiter27, TRUE }, - { &CLSID_FXReverb27, FALSE }, - { &CLSID_FXEcho27, TRUE}, - { &CLSID_FXEQ, FALSE }, - { &CLSID_FXMasteringLimiter, TRUE }, - { &CLSID_FXReverb, FALSE }, - { &CLSID_FXEcho, TRUE} + static const GUID *const_clsids[] = { + &CLSID_FXEQ27, + &CLSID_FXMasteringLimiter27, + &CLSID_FXReverb27, + &CLSID_FXEcho27, + &CLSID_FXEQ, + &CLSID_FXMasteringLimiter, + &CLSID_FXReverb, + &CLSID_FXEcho }; + xaudio2dll = LoadLibraryA(module); if(xaudio2dll){ pCreateFX = (void*)GetProcAddress(xaudio2dll, "CreateFX"); @@ -1091,9 +1085,8 @@ static void test_xapo_creation_modern(const char *module) if(pCreateFX){ for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){ - hr = pCreateFX(const_clsids[i].clsid, &fx_unk, NULL, 0); - todo_wine_if(const_clsids[i].todo) - ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i].clsid), hr); + hr = pCreateFX(const_clsids[i], &fx_unk, NULL, 0); + ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr); if(SUCCEEDED(hr)){ IXAPO *xapo; hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo); @@ -1103,7 +1096,7 @@ static void test_xapo_creation_modern(const char *module) IUnknown_Release(fx_unk); } - hr = CoCreateInstance(const_clsids[i].clsid, NULL, CLSCTX_INPROC_SERVER, + hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&fx_unk); ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr); if(SUCCEEDED(hr)) diff --git a/dlls/xaudio2_7/x3daudio.c b/dlls/xaudio2_7/x3daudio.c index 58f7062ad6..ee3367e092 100644 --- a/dlls/xaudio2_7/x3daudio.c +++ b/dlls/xaudio2_7/x3daudio.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2016 Andrew Eikum for CodeWeavers + * Copyright (c) 2018 Ethan Lee for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,11 +19,14 @@ #include <stdarg.h> -#include "xaudio_private.h" +#include "windef.h" +#include "winbase.h" #include "x3daudio.h" #include "wine/debug.h" +#include <F3DAudio.h> + #if XAUDIO2_VER >= 8 || defined X3DAUDIO1_VER WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); #endif @@ -34,8 +38,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinstDLL ); break; @@ -48,7 +50,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) HRESULT CDECL X3DAudioInitialize(UINT32 chanmask, float speedofsound, X3DAUDIO_HANDLE handle) { - FIXME("0x%x, %f, %p: Stub!\n", chanmask, speedofsound, handle); + TRACE("0x%x, %f, %p\n", chanmask, speedofsound, handle); + F3DAudioInitialize(chanmask, speedofsound, handle); return S_OK; } #endif /* XAUDIO2_VER >= 8 */ @@ -57,7 +60,8 @@ HRESULT CDECL X3DAudioInitialize(UINT32 chanmask, float speedofsound, void CDECL LEGACY_X3DAudioInitialize(UINT32 chanmask, float speedofsound, X3DAUDIO_HANDLE handle) { - FIXME("0x%x, %f, %p: Stub!\n", chanmask, speedofsound, handle); + TRACE("0x%x, %f, %p\n", chanmask, speedofsound, handle); + F3DAudioInitialize(chanmask, speedofsound, handle); } #endif /* X3DAUDIO1_VER */ @@ -66,19 +70,13 @@ void CDECL X3DAudioCalculate(const X3DAUDIO_HANDLE handle, const X3DAUDIO_LISTENER *listener, const X3DAUDIO_EMITTER *emitter, UINT32 flags, X3DAUDIO_DSP_SETTINGS *out) { - static int once = 0; - if(!once){ - FIXME("%p %p %p 0x%x %p: Stub!\n", handle, listener, emitter, flags, out); - ++once; - } - - out->LPFDirectCoefficient = 0; - out->LPFReverbCoefficient = 0; - out->ReverbLevel = 0; - out->DopplerFactor = 1; - out->EmitterToListenerAngle = 0; - out->EmitterToListenerDistance = 0; - out->EmitterVelocityComponent = 0; - out->ListenerVelocityComponent = 0; + TRACE("%p, %p, %p, 0x%x, %p\n", handle, listener, emitter, flags, out); + F3DAudioCalculate( + handle, + (const F3DAUDIO_LISTENER*) listener, + (const F3DAUDIO_EMITTER*) emitter, + flags, + (F3DAUDIO_DSP_SETTINGS*) out + ); } #endif /* XAUDIO2_VER >= 8 || defined X3DAUDIO1_VER */ diff --git a/dlls/xaudio2_7/xapo.c b/dlls/xaudio2_7/xapo.c new file mode 100644 index 0000000000..ccad417ea5 --- /dev/null +++ b/dlls/xaudio2_7/xapo.c @@ -0,0 +1,405 @@ +/* + * Copyright (c) 2015 Mark Harmstone + * Copyright (c) 2015 Andrew Eikum for CodeWeavers + * Copyright (c) 2018 Ethan Lee 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#define NONAMELESSUNION +#define COBJMACROS + +#include "xaudio_private.h" +#include "xaudio2fx.h" +#include "xapofx.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +#include <FAPO.h> +#include <FAPOFX.h> +#include <FAudioFX.h> + +WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); + +static XA2XAPOFXImpl *impl_from_IXAPO(IXAPO *iface) +{ + return CONTAINING_RECORD(iface, XA2XAPOFXImpl, IXAPO_iface); +} + +static XA2XAPOFXImpl *impl_from_IXAPOParameters(IXAPOParameters *iface) +{ + return CONTAINING_RECORD(iface, XA2XAPOFXImpl, IXAPOParameters_iface); +} + +static HRESULT WINAPI XAPOFX_QueryInterface(IXAPO *iface, REFIID riid, void **ppvObject) +{ + XA2XAPOFXImpl *This = impl_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) || + IsEqualGUID(riid, &IID_IXAPO27Parameters)) + *ppvObject = &This->IXAPOParameters_iface; + else + *ppvObject = NULL; + + if(*ppvObject){ + IUnknown_AddRef((IUnknown*)*ppvObject); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI XAPOFX_AddRef(IXAPO *iface) +{ + XA2XAPOFXImpl *This = impl_from_IXAPO(iface); + ULONG ref = This->fapo->AddRef(This->fapo); + TRACE("(%p)->(): Refcount now %u\n", This, ref); + return ref; +} + +static ULONG WINAPI XAPOFX_Release(IXAPO *iface) +{ + XA2XAPOFXImpl *This = impl_from_IXAPO(iface); + ULONG ref = This->fapo->Release(This->fapo); + + TRACE("(%p)->(): Refcount now %u\n", This, ref); + + if(!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI XAPOFX_GetRegistrationProperties(IXAPO *iface, + XAPO_REGISTRATION_PROPERTIES **props) +{ + XA2XAPOFXImpl *This = impl_from_IXAPO(iface); + HRESULT hr; + FAPORegistrationProperties *fprops; + + TRACE("%p, %p\n", This, props); + + hr = This->fapo->GetRegistrationProperties(This->fapo, &fprops); + if(FAILED(hr)) + return hr; + + /* TODO: check for version == 20 and use XAPO20_REGISTRATION_PROPERTIES */ + *props = (XAPO_REGISTRATION_PROPERTIES*) fprops; + return hr; +} + +static HRESULT WINAPI XAPOFX_IsInputFormatSupported(IXAPO *iface, + const WAVEFORMATEX *output_fmt, const WAVEFORMATEX *input_fmt, + WAVEFORMATEX **supported_fmt) +{ + XA2XAPOFXImpl *This = impl_from_IXAPO(iface); + TRACE("%p, %p, %p, %p\n", This, output_fmt, input_fmt, supported_fmt); + return This->fapo->IsInputFormatSupported(This->fapo, + (const FAudioWaveFormatEx *)output_fmt, + (const FAudioWaveFormatEx *)input_fmt, + (FAudioWaveFormatEx **)supported_fmt); +} + +static HRESULT WINAPI XAPOFX_IsOutputFormatSupported(IXAPO *iface, + const WAVEFORMATEX *input_fmt, const WAVEFORMATEX *output_fmt, + WAVEFORMATEX **supported_fmt) +{ + XA2XAPOFXImpl *This = impl_from_IXAPO(iface); + TRACE("%p, %p, %p, %p\n", This, input_fmt, output_fmt, supported_fmt); + return This->fapo->IsOutputFormatSupported(This->fapo, + (const FAudioWaveFormatEx *)input_fmt, + (const FAudioWaveFormatEx *)output_fmt, + (FAudioWaveFormatEx **)supported_fmt); +} + +static HRESULT WINAPI XAPOFX_Initialize(IXAPO *iface, const void *data, + UINT32 data_len) +{ + XA2XAPOFXImpl *This = impl_from_IXAPO(iface); + TRACE("%p, %p, %u\n", This, data, data_len); + return This->fapo->Initialize(This->fapo, data, data_len); +} + +static void WINAPI XAPOFX_Reset(IXAPO *iface) +{ + XA2XAPOFXImpl *This = impl_from_IXAPO(iface); + TRACE("%p\n", This); + This->fapo->Reset(This->fapo); +} + +static HRESULT WINAPI XAPOFX_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) +{ + XA2XAPOFXImpl *This = impl_from_IXAPO(iface); + TRACE("%p, %u, %p, %u, %p\n", This, in_params_count, in_params, + out_params_count, out_params); + return This->fapo->LockForProcess(This->fapo, + in_params_count, + (const FAPOLockForProcessBufferParameters *)in_params, + out_params_count, + (const FAPOLockForProcessBufferParameters *)out_params); +} + +static void WINAPI XAPOFX_UnlockForProcess(IXAPO *iface) +{ + XA2XAPOFXImpl *This = impl_from_IXAPO(iface); + TRACE("%p\n", This); + This->fapo->UnlockForProcess(This->fapo); +} + +static void WINAPI XAPOFX_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) +{ + XA2XAPOFXImpl *This = impl_from_IXAPO(iface); + TRACE("%p, %u, %p, %u, %p, %u\n", This, in_params_count, in_params, + out_params_count, out_params, enabled); + This->fapo->Process(This->fapo, in_params_count, + (const FAPOProcessBufferParameters *)in_params, out_params_count, + (FAPOProcessBufferParameters *)out_params, enabled); +} + +static UINT32 WINAPI XAPOFX_CalcInputFrames(IXAPO *iface, UINT32 output_frames) +{ + XA2XAPOFXImpl *This = impl_from_IXAPO(iface); + TRACE("%p, %u\n", This, output_frames); + return 0; +} + +static UINT32 WINAPI XAPOFX_CalcOutputFrames(IXAPO *iface, UINT32 input_frames) +{ + XA2XAPOFXImpl *This = impl_from_IXAPO(iface); + TRACE("%p, %u\n", This, input_frames); + return 0; +} + +static const IXAPOVtbl XAPOFX_Vtbl = { + XAPOFX_QueryInterface, + XAPOFX_AddRef, + XAPOFX_Release, + XAPOFX_GetRegistrationProperties, + XAPOFX_IsInputFormatSupported, + XAPOFX_IsOutputFormatSupported, + XAPOFX_Initialize, + XAPOFX_Reset, + XAPOFX_LockForProcess, + XAPOFX_UnlockForProcess, + XAPOFX_Process, + XAPOFX_CalcInputFrames, + XAPOFX_CalcOutputFrames +}; + +static HRESULT WINAPI XAPOFXParams_QueryInterface(IXAPOParameters *iface, + REFIID riid, void **ppvObject) +{ + XA2XAPOFXImpl *This = impl_from_IXAPOParameters(iface); + return XAPOFX_QueryInterface(&This->IXAPO_iface, riid, ppvObject); +} + +static ULONG WINAPI XAPOFXParams_AddRef(IXAPOParameters *iface) +{ + XA2XAPOFXImpl *This = impl_from_IXAPOParameters(iface); + return XAPOFX_AddRef(&This->IXAPO_iface); +} + +static ULONG WINAPI XAPOFXParams_Release(IXAPOParameters *iface) +{ + XA2XAPOFXImpl *This = impl_from_IXAPOParameters(iface); + return XAPOFX_Release(&This->IXAPO_iface); +} + +static void WINAPI XAPOFXParams_SetParameters(IXAPOParameters *iface, + const void *params, UINT32 params_len) +{ + XA2XAPOFXImpl *This = impl_from_IXAPOParameters(iface); + TRACE("%p, %p, %u\n", This, params, params_len); + This->fapo->SetParameters(This->fapo, params, params_len); +} + +static void WINAPI XAPOFXParams_GetParameters(IXAPOParameters *iface, void *params, + UINT32 params_len) +{ + XA2XAPOFXImpl *This = impl_from_IXAPOParameters(iface); + TRACE("%p, %p, %u\n", This, params, params_len); + This->fapo->GetParameters(This->fapo, params, params_len); +} + +static const IXAPOParametersVtbl XAPOFXParameters_Vtbl = { + XAPOFXParams_QueryInterface, + XAPOFXParams_AddRef, + XAPOFXParams_Release, + XAPOFXParams_SetParameters, + XAPOFXParams_GetParameters +}; + +struct xapo_cf { + IClassFactory IClassFactory_iface; + LONG ref; + const CLSID *class; +}; + +static struct xapo_cf *xapo_impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, struct xapo_cf, IClassFactory_iface); +} + +static HRESULT WINAPI xapocf_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) +{ + if(IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef(iface); + *ppobj = iface; + return S_OK; + } + + *ppobj = NULL; + WARN("(%p)->(%s, %p): interface not found\n", iface, debugstr_guid(riid), ppobj); + return E_NOINTERFACE; +} + +static ULONG WINAPI xapocf_AddRef(IClassFactory *iface) +{ + struct xapo_cf *This = xapo_impl_from_IClassFactory(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(): Refcount now %u\n", This, ref); + return ref; +} + +static ULONG WINAPI xapocf_Release(IClassFactory *iface) +{ + struct xapo_cf *This = xapo_impl_from_IClassFactory(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p)->(): Refcount now %u\n", This, ref); + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + return ref; +} + +static inline HRESULT get_fapo_from_clsid(REFCLSID clsid, FAPO **fapo) +{ +#ifndef XAPOFX1_VER + if(IsEqualGUID(clsid, &CLSID_AudioVolumeMeter27)) + return FAudioCreateVolumeMeterWithCustomAllocatorEXT( + fapo, + 0, + XAudio_Internal_Malloc, + XAudio_Internal_Free, + XAudio_Internal_Realloc + ); + if(IsEqualGUID(clsid, &CLSID_AudioReverb27)) + return FAudioCreateReverbWithCustomAllocatorEXT( + fapo, + 0, + XAudio_Internal_Malloc, + XAudio_Internal_Free, + XAudio_Internal_Realloc + ); +#endif +#if XAUDIO2_VER >= 8 || defined XAPOFX1_VER + if(IsEqualGUID(clsid, &CLSID_FXReverb) || + IsEqualGUID(clsid, &CLSID_FXEQ) || + IsEqualGUID(clsid, &CLSID_FXEcho) || + IsEqualGUID(clsid, &CLSID_FXMasteringLimiter)) + return FAPOFX_CreateFXWithCustomAllocatorEXT( + (const FAudioGUID*) clsid, + fapo, + NULL, + 0, + XAudio_Internal_Malloc, + XAudio_Internal_Free, + XAudio_Internal_Realloc + ); +#endif + ERR("Invalid XAPO CLSID!"); + return E_INVALIDARG; +} + +static HRESULT WINAPI xapocf_CreateInstance(IClassFactory *iface, IUnknown *pOuter, + REFIID riid, void **ppobj) +{ + struct xapo_cf *This = xapo_impl_from_IClassFactory(iface); + HRESULT hr; + XA2XAPOFXImpl *object; + + TRACE("(%p)->(%p,%s,%p)\n", This, pOuter, debugstr_guid(riid), ppobj); + + *ppobj = NULL; + + if(pOuter) + return CLASS_E_NOAGGREGATION; + + object = heap_alloc(sizeof(*object)); + object->IXAPO_iface.lpVtbl = &XAPOFX_Vtbl; + object->IXAPOParameters_iface.lpVtbl = &XAPOFXParameters_Vtbl; + + hr = get_fapo_from_clsid(This->class, &object->fapo); + + if(FAILED(hr)){ + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + hr = IXAPO_QueryInterface(&object->IXAPO_iface, riid, ppobj); + if(FAILED(hr)){ + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + return S_OK; +} + +static HRESULT WINAPI xapocf_LockServer(IClassFactory *iface, BOOL dolock) +{ + struct xapo_cf *This = xapo_impl_from_IClassFactory(iface); + FIXME("(%p)->(%d): stub!\n", This, dolock); + return S_OK; +} + +static const IClassFactoryVtbl xapo_Vtbl = +{ + xapocf_QueryInterface, + xapocf_AddRef, + xapocf_Release, + xapocf_CreateInstance, + xapocf_LockServer +}; + +HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv) +{ + HRESULT hr; + struct xapo_cf *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct xapo_cf)); + ret->IClassFactory_iface.lpVtbl = &xapo_Vtbl; + ret->class = clsid; + ret->ref = 0; + hr = IClassFactory_QueryInterface(&ret->IClassFactory_iface, riid, ppv); + if(FAILED(hr)) + HeapFree(GetProcessHeap(), 0, ret); + return hr; +} diff --git a/dlls/xaudio2_7/xapofx.c b/dlls/xaudio2_7/xapofx.c index e450851b25..100ba02d3b 100644 --- a/dlls/xaudio2_7/xapofx.c +++ b/dlls/xaudio2_7/xapofx.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2015 Andrew Eikum for CodeWeavers + * Copyright (c) 2018 Ethan Lee for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,13 +24,17 @@ #define NONAMELESSUNION #define COBJMACROS +#ifdef XAPOFX1_VER #include "initguid.h" +#endif /* XAPOFX1_VER */ #include "xaudio_private.h" #include "xapofx.h" #include "wine/debug.h" +#if XAUDIO2_VER >= 8 || defined XAPOFX1_VER WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); +#endif #ifdef XAPOFX1_VER BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) @@ -38,8 +43,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinstDLL ); break; @@ -48,779 +51,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) } #endif /* XAPOFX1_VER */ -typedef struct _VUMeterImpl { - IXAPO IXAPO_iface; - IXAPOParameters IXAPOParameters_iface; - - LONG ref; -} VUMeterImpl; - -static VUMeterImpl *VUMeterImpl_from_IXAPO(IXAPO *iface) -{ - return CONTAINING_RECORD(iface, VUMeterImpl, IXAPO_iface); -} - -static VUMeterImpl *VUMeterImpl_from_IXAPOParameters(IXAPOParameters *iface) -{ - return CONTAINING_RECORD(iface, VUMeterImpl, IXAPOParameters_iface); -} - -static HRESULT WINAPI VUMXAPO_QueryInterface(IXAPO *iface, REFIID riid, - void **ppvObject) -{ - VUMeterImpl *This = VUMeterImpl_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 VUMXAPO_AddRef(IXAPO *iface) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPO(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(): Refcount now %u\n", This, ref); - return ref; -} - -static ULONG WINAPI VUMXAPO_Release(IXAPO *iface) -{ - VUMeterImpl *This = VUMeterImpl_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 VUMXAPO_GetRegistrationProperties(IXAPO *iface, - XAPO_REGISTRATION_PROPERTIES **props) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPO(iface); - TRACE("%p, %p\n", This, props); - /* TODO: check for version == 20 and use XAPO20_REGISTRATION_PROPERTIES */ - return E_NOTIMPL; -} - -static HRESULT WINAPI VUMXAPO_IsInputFormatSupported(IXAPO *iface, - const WAVEFORMATEX *output_fmt, const WAVEFORMATEX *input_fmt, - WAVEFORMATEX **supported_fmt) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPO(iface); - TRACE("%p, %p, %p, %p\n", This, output_fmt, input_fmt, supported_fmt); - return E_NOTIMPL; -} - -static HRESULT WINAPI VUMXAPO_IsOutputFormatSupported(IXAPO *iface, - const WAVEFORMATEX *input_fmt, const WAVEFORMATEX *output_fmt, - WAVEFORMATEX **supported_fmt) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPO(iface); - TRACE("%p, %p, %p, %p\n", This, input_fmt, output_fmt, supported_fmt); - return E_NOTIMPL; -} - -static HRESULT WINAPI VUMXAPO_Initialize(IXAPO *iface, const void *data, - UINT32 data_len) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPO(iface); - TRACE("%p, %p, %u\n", This, data, data_len); - return E_NOTIMPL; -} - -static void WINAPI VUMXAPO_Reset(IXAPO *iface) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPO(iface); - TRACE("%p\n", This); -} - -static HRESULT WINAPI VUMXAPO_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) -{ - VUMeterImpl *This = VUMeterImpl_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 VUMXAPO_UnlockForProcess(IXAPO *iface) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPO(iface); - TRACE("%p\n", This); -} - -static void WINAPI VUMXAPO_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) -{ - VUMeterImpl *This = VUMeterImpl_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 VUMXAPO_CalcInputFrames(IXAPO *iface, UINT32 output_frames) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPO(iface); - TRACE("%p, %u\n", This, output_frames); - return 0; -} - -static UINT32 WINAPI VUMXAPO_CalcOutputFrames(IXAPO *iface, UINT32 input_frames) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPO(iface); - TRACE("%p, %u\n", This, input_frames); - return 0; -} - -static const IXAPOVtbl VUMXAPO_Vtbl = { - VUMXAPO_QueryInterface, - VUMXAPO_AddRef, - VUMXAPO_Release, - VUMXAPO_GetRegistrationProperties, - VUMXAPO_IsInputFormatSupported, - VUMXAPO_IsOutputFormatSupported, - VUMXAPO_Initialize, - VUMXAPO_Reset, - VUMXAPO_LockForProcess, - VUMXAPO_UnlockForProcess, - VUMXAPO_Process, - VUMXAPO_CalcInputFrames, - VUMXAPO_CalcOutputFrames -}; - -static HRESULT WINAPI VUMXAPOParams_QueryInterface(IXAPOParameters *iface, - REFIID riid, void **ppvObject) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPOParameters(iface); - return VUMXAPO_QueryInterface(&This->IXAPO_iface, riid, ppvObject); -} - -static ULONG WINAPI VUMXAPOParams_AddRef(IXAPOParameters *iface) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPOParameters(iface); - return VUMXAPO_AddRef(&This->IXAPO_iface); -} - -static ULONG WINAPI VUMXAPOParams_Release(IXAPOParameters *iface) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPOParameters(iface); - return VUMXAPO_Release(&This->IXAPO_iface); -} - -static void WINAPI VUMXAPOParams_SetParameters(IXAPOParameters *iface, - const void *params, UINT32 params_len) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPOParameters(iface); - TRACE("%p, %p, %u\n", This, params, params_len); -} - -static void WINAPI VUMXAPOParams_GetParameters(IXAPOParameters *iface, - void *params, UINT32 params_len) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPOParameters(iface); - TRACE("%p, %p, %u\n", This, params, params_len); -} - -static const IXAPOParametersVtbl VUMXAPOParameters_Vtbl = { - VUMXAPOParams_QueryInterface, - VUMXAPOParams_AddRef, - VUMXAPOParams_Release, - VUMXAPOParams_SetParameters, - 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); - /* TODO: check for version == 20 and use XAPO20_REGISTRATION_PROPERTIES */ - 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 void WINAPI RVBXAPO_Reset(IXAPO *iface) -{ - ReverbImpl *This = ReverbImpl_from_IXAPO(iface); - TRACE("%p\n", This); -} - -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 -}; - -typedef struct _EQImpl { - IXAPO IXAPO_iface; - IXAPOParameters IXAPOParameters_iface; - - LONG ref; -} EQImpl; - -static EQImpl *EQImpl_from_IXAPO(IXAPO *iface) -{ - return CONTAINING_RECORD(iface, EQImpl, IXAPO_iface); -} - -static EQImpl *EQImpl_from_IXAPOParameters(IXAPOParameters *iface) -{ - return CONTAINING_RECORD(iface, EQImpl, IXAPOParameters_iface); -} - -static HRESULT WINAPI EQXAPO_QueryInterface(IXAPO *iface, REFIID riid, void **ppvObject) -{ - EQImpl *This = EQImpl_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 EQXAPO_AddRef(IXAPO *iface) -{ - EQImpl *This = EQImpl_from_IXAPO(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(): Refcount now %u\n", This, ref); - return ref; -} - -static ULONG WINAPI EQXAPO_Release(IXAPO *iface) -{ - EQImpl *This = EQImpl_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 EQXAPO_GetRegistrationProperties(IXAPO *iface, - XAPO_REGISTRATION_PROPERTIES **props) -{ - EQImpl *This = EQImpl_from_IXAPO(iface); - TRACE("%p, %p\n", This, props); - /* TODO: check for version == 20 and use XAPO20_REGISTRATION_PROPERTIES */ - return E_NOTIMPL; -} - -static HRESULT WINAPI EQXAPO_IsInputFormatSupported(IXAPO *iface, - const WAVEFORMATEX *output_fmt, const WAVEFORMATEX *input_fmt, - WAVEFORMATEX **supported_fmt) -{ - EQImpl *This = EQImpl_from_IXAPO(iface); - TRACE("%p, %p, %p, %p\n", This, output_fmt, input_fmt, supported_fmt); - return E_NOTIMPL; -} - -static HRESULT WINAPI EQXAPO_IsOutputFormatSupported(IXAPO *iface, - const WAVEFORMATEX *input_fmt, const WAVEFORMATEX *output_fmt, - WAVEFORMATEX **supported_fmt) -{ - EQImpl *This = EQImpl_from_IXAPO(iface); - TRACE("%p, %p, %p, %p\n", This, input_fmt, output_fmt, supported_fmt); - return E_NOTIMPL; -} - -static HRESULT WINAPI EQXAPO_Initialize(IXAPO *iface, const void *data, - UINT32 data_len) -{ - EQImpl *This = EQImpl_from_IXAPO(iface); - TRACE("%p, %p, %u\n", This, data, data_len); - return E_NOTIMPL; -} - -static void WINAPI EQXAPO_Reset(IXAPO *iface) -{ - EQImpl *This = EQImpl_from_IXAPO(iface); - TRACE("%p\n", This); -} - -static HRESULT WINAPI EQXAPO_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) -{ - EQImpl *This = EQImpl_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 EQXAPO_UnlockForProcess(IXAPO *iface) -{ - EQImpl *This = EQImpl_from_IXAPO(iface); - TRACE("%p\n", This); -} - -static void WINAPI EQXAPO_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) -{ - EQImpl *This = EQImpl_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 EQXAPO_CalcInputFrames(IXAPO *iface, UINT32 output_frames) -{ - EQImpl *This = EQImpl_from_IXAPO(iface); - TRACE("%p, %u\n", This, output_frames); - return 0; -} - -static UINT32 WINAPI EQXAPO_CalcOutputFrames(IXAPO *iface, UINT32 input_frames) -{ - EQImpl *This = EQImpl_from_IXAPO(iface); - TRACE("%p, %u\n", This, input_frames); - return 0; -} - -static const IXAPOVtbl EQXAPO_Vtbl = { - EQXAPO_QueryInterface, - EQXAPO_AddRef, - EQXAPO_Release, - EQXAPO_GetRegistrationProperties, - EQXAPO_IsInputFormatSupported, - EQXAPO_IsOutputFormatSupported, - EQXAPO_Initialize, - EQXAPO_Reset, - EQXAPO_LockForProcess, - EQXAPO_UnlockForProcess, - EQXAPO_Process, - EQXAPO_CalcInputFrames, - EQXAPO_CalcOutputFrames -}; - -static HRESULT WINAPI EQXAPOParams_QueryInterface(IXAPOParameters *iface, - REFIID riid, void **ppvObject) -{ - EQImpl *This = EQImpl_from_IXAPOParameters(iface); - return EQXAPO_QueryInterface(&This->IXAPO_iface, riid, ppvObject); -} - -static ULONG WINAPI EQXAPOParams_AddRef(IXAPOParameters *iface) -{ - EQImpl *This = EQImpl_from_IXAPOParameters(iface); - return EQXAPO_AddRef(&This->IXAPO_iface); -} - -static ULONG WINAPI EQXAPOParams_Release(IXAPOParameters *iface) -{ - EQImpl *This = EQImpl_from_IXAPOParameters(iface); - return EQXAPO_Release(&This->IXAPO_iface); -} - -static void WINAPI EQXAPOParams_SetParameters(IXAPOParameters *iface, - const void *params, UINT32 params_len) -{ - EQImpl *This = EQImpl_from_IXAPOParameters(iface); - TRACE("%p, %p, %u\n", This, params, params_len); -} - -static void WINAPI EQXAPOParams_GetParameters(IXAPOParameters *iface, void *params, - UINT32 params_len) -{ - EQImpl *This = EQImpl_from_IXAPOParameters(iface); - TRACE("%p, %p, %u\n", This, params, params_len); -} - -static const IXAPOParametersVtbl EQXAPOParameters_Vtbl = { - EQXAPOParams_QueryInterface, - EQXAPOParams_AddRef, - EQXAPOParams_Release, - EQXAPOParams_SetParameters, - EQXAPOParams_GetParameters -}; - -struct xapo_cf { - IClassFactory IClassFactory_iface; - LONG ref; - const CLSID *class; -}; - -static struct xapo_cf *xapo_impl_from_IClassFactory(IClassFactory *iface) -{ - return CONTAINING_RECORD(iface, struct xapo_cf, IClassFactory_iface); -} - -static HRESULT WINAPI xapocf_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) -{ - if(IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IClassFactory)) - { - IClassFactory_AddRef(iface); - *ppobj = iface; - return S_OK; - } - - *ppobj = NULL; - WARN("(%p)->(%s, %p): interface not found\n", iface, debugstr_guid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI xapocf_AddRef(IClassFactory *iface) -{ - struct xapo_cf *This = xapo_impl_from_IClassFactory(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(): Refcount now %u\n", This, ref); - return ref; -} - -static ULONG WINAPI xapocf_Release(IClassFactory *iface) -{ - struct xapo_cf *This = xapo_impl_from_IClassFactory(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 xapocf_CreateInstance(IClassFactory *iface, IUnknown *pOuter, - REFIID riid, void **ppobj) -{ - struct xapo_cf *This = xapo_impl_from_IClassFactory(iface); - HRESULT hr; - - TRACE("(%p)->(%p,%s,%p)\n", This, pOuter, debugstr_guid(riid), ppobj); - - *ppobj = NULL; - - if(pOuter) - return CLASS_E_NOAGGREGATION; - - if(IsEqualGUID(This->class, &CLSID_AudioVolumeMeter27)){ - VUMeterImpl *object; - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if(!object) - return E_OUTOFMEMORY; - - object->IXAPO_iface.lpVtbl = &VUMXAPO_Vtbl; - object->IXAPOParameters_iface.lpVtbl = &VUMXAPOParameters_Vtbl; - - hr = IXAPO_QueryInterface(&object->IXAPO_iface, riid, ppobj); - if(FAILED(hr)){ - HeapFree(GetProcessHeap(), 0, object); - return hr; - } - }else if(IsEqualGUID(This->class, &CLSID_FXReverb)){ - ReverbImpl *object; - - 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; - } - }else if(IsEqualGUID(This->class, &CLSID_FXEQ)){ - EQImpl *object; - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if(!object) - return E_OUTOFMEMORY; - - object->IXAPO_iface.lpVtbl = &EQXAPO_Vtbl; - object->IXAPOParameters_iface.lpVtbl = &EQXAPOParameters_Vtbl; - - hr = IXAPO_QueryInterface(&object->IXAPO_iface, riid, ppobj); - if(FAILED(hr)){ - HeapFree(GetProcessHeap(), 0, object); - return hr; - } - }else - /* TODO FXECHO, FXMasteringLimiter, */ - return E_INVALIDARG; - - return S_OK; -} - -static HRESULT WINAPI xapocf_LockServer(IClassFactory *iface, BOOL dolock) -{ - struct xapo_cf *This = xapo_impl_from_IClassFactory(iface); - FIXME("(%p)->(%d): stub!\n", This, dolock); - return S_OK; -} - -static const IClassFactoryVtbl xapo_Vtbl = -{ - xapocf_QueryInterface, - xapocf_AddRef, - xapocf_Release, - xapocf_CreateInstance, - xapocf_LockServer -}; - -HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv) -{ - HRESULT hr; - struct xapo_cf *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct xapo_cf)); - ret->IClassFactory_iface.lpVtbl = &xapo_Vtbl; - ret->class = clsid; - ret->ref = 0; - hr = IClassFactory_QueryInterface(&ret->IClassFactory_iface, riid, ppv); - if(FAILED(hr)) - HeapFree(GetProcessHeap(), 0, ret); - return hr; -} - #if XAUDIO2_VER >= 8 -HRESULT WINAPI CreateAudioVolumeMeter(IUnknown **out) -{ - IClassFactory *cf; - HRESULT hr; - - hr = make_xapo_factory(&CLSID_AudioVolumeMeter27, &IID_IClassFactory, (void**)&cf); - if(FAILED(hr)) - return hr; - - hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out); - - IClassFactory_Release(cf); - - return hr; -} - -HRESULT WINAPI CreateAudioReverb(IUnknown **out) -{ - IClassFactory *cf; - HRESULT hr; - - hr = make_xapo_factory(&CLSID_FXReverb, &IID_IClassFactory, (void**)&cf); - if(FAILED(hr)) - return hr; - - hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out); - - IClassFactory_Release(cf); - - return hr; -} - HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out, void *initdata, UINT32 initdata_bytes) { HRESULT hr; @@ -836,6 +67,12 @@ HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out, void *initdata, UINT32 in else if(IsEqualGUID(clsid, &CLSID_FXEQ27) || IsEqualGUID(clsid, &CLSID_FXEQ)) class = &CLSID_FXEQ; + else if(IsEqualGUID(clsid, &CLSID_FXEcho27) || + IsEqualGUID(clsid, &CLSID_FXEcho)) + class = &CLSID_FXEcho; + else if(IsEqualGUID(clsid, &CLSID_FXMasteringLimiter27) || + IsEqualGUID(clsid, &CLSID_FXMasteringLimiter)) + class = &CLSID_FXMasteringLimiter; if(class){ hr = make_xapo_factory(class, &IID_IClassFactory, (void**)&cf); @@ -895,7 +132,12 @@ HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out) else if(IsEqualGUID(clsid, &CLSID_FXEQ27) || IsEqualGUID(clsid, &CLSID_FXEQ)) class = &CLSID_FXEQ; - /* TODO FXECHO, FXMasteringLimiter, */ + else if(IsEqualGUID(clsid, &CLSID_FXEcho27) || + IsEqualGUID(clsid, &CLSID_FXEcho)) + class = &CLSID_FXEcho; + else if(IsEqualGUID(clsid, &CLSID_FXMasteringLimiter27) || + IsEqualGUID(clsid, &CLSID_FXMasteringLimiter)) + class = &CLSID_FXMasteringLimiter; if(class){ hr = make_xapo_factory(class, &IID_IClassFactory, (void**)&cf); diff --git a/dlls/xaudio2_7/xaudio_allocator.c b/dlls/xaudio2_7/xaudio_allocator.c new file mode 100644 index 0000000000..41be48a80f --- /dev/null +++ b/dlls/xaudio2_7/xaudio_allocator.c @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2018 Ethan Lee 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#define NONAMELESSUNION +#define COBJMACROS + +#include "ole2.h" + +void* XAudio_Internal_Malloc(size_t size) +{ + return CoTaskMemAlloc(size); +} + +void XAudio_Internal_Free(void* ptr) +{ + return CoTaskMemFree(ptr); +} + +void* XAudio_Internal_Realloc(void* ptr, size_t size) +{ + return CoTaskMemRealloc(ptr, size); +} diff --git a/dlls/xaudio2_7/xaudio_classes.idl b/dlls/xaudio2_7/xaudio_classes.idl index 64e350f8d4..17a59c35cc 100644 --- a/dlls/xaudio2_7/xaudio_classes.idl +++ b/dlls/xaudio2_7/xaudio_classes.idl @@ -41,13 +41,6 @@ coclass AudioVolumeMeter { interface IUnknown; } uuid(6a93130e-1d53-41d1-a9cf-e758800bb179) ] coclass AudioReverb { interface IUnknown; } - -[ - helpstring("XACT 31 Class"), - threading(both), - uuid(962f5027-99be-4692-a468-85802cf8de61) -] -coclass XACT31 { interface IUnknown; } #endif /* XAUDIO2_VER == 7 */ #if XAUDIO2_VER == 6 diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 0bbe943f15..f338b56dc9 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1,6 +1,7 @@ /* * Copyright (c) 2015 Mark Harmstone * Copyright (c) 2015 Andrew Eikum for CodeWeavers + * Copyright (c) 2018 Ethan Lee for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,38 +19,26 @@ */ #include "config.h" + #include <stdarg.h> #define NONAMELESSUNION #define COBJMACROS +#include "initguid.h" #include "xaudio_private.h" +#include "xaudio2fx.h" +#if XAUDIO2_VER >= 8 +#include "xapofx.h" +#endif #include "ole2.h" #include "rpcproxy.h" -#include "xapofx.h" - #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); -WINE_DECLARE_DEBUG_CHANNEL(winediag); - -static ALCdevice *(ALC_APIENTRY *palcLoopbackOpenDeviceSOFT)(const ALCchar*); -static void (ALC_APIENTRY *palcRenderSamplesSOFT)(ALCdevice*, ALCvoid*, ALCsizei); -static ALCboolean (ALC_APIENTRY *palcSetThreadContext)(ALCcontext*); - -static HINSTANCE instance; - -#define IN_AL_PERIODS 4 - -#if XAUDIO2_VER == 0 -#define COMPAT_E_INVALID_CALL E_INVALIDARG -#define COMPAT_E_DEVICE_INVALIDATED XAUDIO20_E_DEVICE_INVALIDATED -#else -#define COMPAT_E_INVALID_CALL XAUDIO2_E_INVALID_CALL -#define COMPAT_E_DEVICE_INVALIDATED XAUDIO2_E_DEVICE_INVALIDATED -#endif #if XAUDIO2_VER != 0 && defined(__i386__) /* EVE Online uses an OnVoiceProcessingPassStart callback which corrupts %esi. */ @@ -82,38 +71,9 @@ __ASM_GLOBAL_FUNC( call_on_voice_processing_pass_start, "ret" ) #endif -static void dump_fmt(const WAVEFORMATEX *fmt) -{ - TRACE("wFormatTag: 0x%x (", fmt->wFormatTag); - switch(fmt->wFormatTag){ -#define DOCASE(x) case x: TRACE(#x); break; - DOCASE(WAVE_FORMAT_PCM) - DOCASE(WAVE_FORMAT_IEEE_FLOAT) - DOCASE(WAVE_FORMAT_EXTENSIBLE) -#undef DOCASE - default: - TRACE("Unknown"); - break; - } - TRACE(")\n"); - - TRACE("nChannels: %u\n", fmt->nChannels); - TRACE("nSamplesPerSec: %u\n", fmt->nSamplesPerSec); - TRACE("nAvgBytesPerSec: %u\n", fmt->nAvgBytesPerSec); - TRACE("nBlockAlign: %u\n", fmt->nBlockAlign); - TRACE("wBitsPerSample: %u\n", fmt->wBitsPerSample); - TRACE("cbSize: %u\n", fmt->cbSize); - - if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ - WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; - TRACE("dwChannelMask: %08x\n", fmtex->dwChannelMask); - TRACE("Samples: %04x\n", fmtex->Samples.wReserved); - TRACE("SubFormat: %s\n", wine_dbgstr_guid(&fmtex->SubFormat)); - }else if(fmt->wFormatTag == WAVE_FORMAT_ADPCM){ - ADPCMWAVEFORMAT *fmtadpcm = (void*)fmt; - TRACE("wSamplesPerBlock: %u\n", fmtadpcm->wSamplesPerBlock); - } -} +static HINSTANCE instance; + +static XA2VoiceImpl *impl_from_IXAudio2Voice(IXAudio2Voice *iface); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) { @@ -124,20 +84,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) case DLL_PROCESS_ATTACH: instance = hinstDLL; DisableThreadLibraryCalls( hinstDLL ); - - if(!alcIsExtensionPresent(NULL, "ALC_SOFT_loopback") || - !(palcLoopbackOpenDeviceSOFT = alcGetProcAddress(NULL, "alcLoopbackOpenDeviceSOFT")) || - !(palcRenderSamplesSOFT = alcGetProcAddress(NULL, "alcRenderSamplesSOFT"))){ - ERR("XAudio2 requires the ALC_SOFT_loopback extension (OpenAL-Soft >= 1.14)\n"); - return FALSE; - } - - if(!alcIsExtensionPresent(NULL, "ALC_EXT_thread_local_context") || - !(palcSetThreadContext = alcGetProcAddress(NULL, "alcSetThreadContext"))){ - ERR("XAudio2 requires the ALC_EXT_thread_local_context extension (OpenAL-Soft >= 1.12)\n"); - return FALSE; - } - break; } return TRUE; @@ -160,250 +106,579 @@ HRESULT WINAPI DllUnregisterServer(void) return __wine_unregister_resources(instance); } -static XA2SourceImpl *impl_from_IXAudio2SourceVoice(IXAudio2SourceVoice *iface) +/* Effect Wrapping */ + +static inline XA2XAPOImpl *impl_from_FAPO(FAPO *iface) { - return CONTAINING_RECORD(iface, XA2SourceImpl, IXAudio2SourceVoice_iface); + return CONTAINING_RECORD(iface, XA2XAPOImpl, FAPO_vtbl); } -static XA2SubmixImpl *impl_from_IXAudio2SubmixVoice(IXAudio2SubmixVoice *iface) +static int32_t FAPOCALL XAPO_AddRef(void *iface) { - return CONTAINING_RECORD(iface, XA2SubmixImpl, IXAudio2SubmixVoice_iface); + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + return InterlockedIncrement(&This->ref); } -static inline IXAudio2Impl *impl_from_IXAudio2(IXAudio2 *iface) +static int32_t FAPOCALL XAPO_Release(void *iface) { - return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio2_iface); + int32_t r; + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + r = InterlockedDecrement(&This->ref); + if(r == 0){ + IXAPO_Release(This->xapo); + if(This->xapo_params) + IXAPOParameters_Release(This->xapo_params); + heap_free(This); + } + return r; } -static IXAudio2Impl *impl_from_IXAudio2MasteringVoice(IXAudio2MasteringVoice *iface) -{ - return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio2MasteringVoice_iface); -} - -static DWORD get_channel_mask(unsigned int channels) -{ - switch(channels){ - case 0: - return 0; - case 1: - return KSAUDIO_SPEAKER_MONO; - case 2: - return KSAUDIO_SPEAKER_STEREO; - case 3: - return KSAUDIO_SPEAKER_STEREO | SPEAKER_LOW_FREQUENCY; - case 4: - return KSAUDIO_SPEAKER_QUAD; /* not _SURROUND */ - case 5: - return KSAUDIO_SPEAKER_QUAD | SPEAKER_LOW_FREQUENCY; - case 6: - return KSAUDIO_SPEAKER_5POINT1; /* not 5POINT1_SURROUND */ - case 7: - return KSAUDIO_SPEAKER_5POINT1 | SPEAKER_BACK_CENTER; - case 8: - return KSAUDIO_SPEAKER_7POINT1_SURROUND; /* Vista deprecates 7POINT1 */ - } - FIXME("Unknown speaker configuration: %u\n", channels); +static uint32_t FAPOCALL XAPO_GetRegistrationProperties(void *iface, + FAPORegistrationProperties **ppRegistrationProperties) +{ + XA2XAPOImpl *This = impl_from_FAPO(iface); + XAPO_REGISTRATION_PROPERTIES *xprops; + HRESULT hr; + + TRACE("%p\n", This); + + hr = IXAPO_GetRegistrationProperties(This->xapo, &xprops); + if(FAILED(hr)) + return hr; + + /* TODO: check for version == 20 and use XAPO20_REGISTRATION_PROPERTIES */ + *ppRegistrationProperties = (FAPORegistrationProperties*) xprops; return 0; } -static void WINAPI XA2SRC_GetVoiceDetails(IXAudio2SourceVoice *iface, - XAUDIO2_VOICE_DETAILS *pVoiceDetails) +static uint32_t FAPOCALL XAPO_IsInputFormatSupported(void *iface, + const FAudioWaveFormatEx *pOutputFormat, const FAudioWaveFormatEx *pRequestedInputFormat, + FAudioWaveFormatEx **ppSupportedInputFormat) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + return IXAPO_IsInputFormatSupported(This->xapo, (const WAVEFORMATEX*)pOutputFormat, + (const WAVEFORMATEX*)pRequestedInputFormat, (WAVEFORMATEX**)ppSupportedInputFormat); +} - TRACE("%p, %p\n", This, pVoiceDetails); +static uint32_t FAPOCALL XAPO_IsOutputFormatSupported(void *iface, + const FAudioWaveFormatEx *pInputFormat, const FAudioWaveFormatEx *pRequestedOutputFormat, + FAudioWaveFormatEx **ppSupportedOutputFormat) +{ + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + return IXAPO_IsOutputFormatSupported(This->xapo, (const WAVEFORMATEX *)pInputFormat, + (const WAVEFORMATEX *)pRequestedOutputFormat, (WAVEFORMATEX**)ppSupportedOutputFormat); +} - pVoiceDetails->CreationFlags = 0; - pVoiceDetails->ActiveFlags = 0; - pVoiceDetails->InputChannels = This->fmt->nChannels; - pVoiceDetails->InputSampleRate = This->fmt->nSamplesPerSec; +static uint32_t FAPOCALL XAPO_Initialize(void *iface, const void *pData, + uint32_t DataByteSize) +{ + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + return IXAPO_Initialize(This->xapo, pData, DataByteSize); } -static HRESULT WINAPI XA2SRC_SetOutputVoices(IXAudio2SourceVoice *iface, - const XAUDIO2_VOICE_SENDS *pSendList) +static void FAPOCALL XAPO_Reset(void *iface) +{ + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + IXAPO_Reset(This->xapo); +} + +static uint32_t FAPOCALL XAPO_LockForProcess(void *iface, + uint32_t InputLockedParameterCount, + const FAPOLockForProcessBufferParameters *pInputLockedParameters, + uint32_t OutputLockedParameterCount, + const FAPOLockForProcessBufferParameters *pOutputLockedParameters) +{ + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + return IXAPO_LockForProcess(This->xapo, + InputLockedParameterCount, + (const XAPO_LOCKFORPROCESS_BUFFER_PARAMETERS *)pInputLockedParameters, + OutputLockedParameterCount, + (const XAPO_LOCKFORPROCESS_BUFFER_PARAMETERS *)pOutputLockedParameters); +} + +static void FAPOCALL XAPO_UnlockForProcess(void *iface) +{ + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + IXAPO_UnlockForProcess(This->xapo); +} + +static void FAPOCALL XAPO_Process(void *iface, + uint32_t InputProcessParameterCount, + const FAPOProcessBufferParameters* pInputProcessParameters, + uint32_t OutputProcessParameterCount, + FAPOProcessBufferParameters* pOutputProcessParameters, + int32_t IsEnabled) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + IXAPO_Process(This->xapo, InputProcessParameterCount, + (const XAPO_PROCESS_BUFFER_PARAMETERS *)pInputProcessParameters, + OutputProcessParameterCount, + (XAPO_PROCESS_BUFFER_PARAMETERS *)pOutputProcessParameters, + IsEnabled); +} + +static uint32_t FAPOCALL XAPO_CalcInputFrames(void *iface, + uint32_t OutputFrameCount) +{ + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + return IXAPO_CalcInputFrames(This->xapo, OutputFrameCount); +} + +static uint32_t FAPOCALL XAPO_CalcOutputFrames(void *iface, + uint32_t InputFrameCount) +{ + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + return IXAPO_CalcOutputFrames(This->xapo, InputFrameCount); +} + +static void FAPOCALL XAPO_SetParameters(void *iface, + const void *pParameters, uint32_t ParametersByteSize) +{ + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + if(This->xapo_params) + IXAPOParameters_SetParameters(This->xapo_params, pParameters, ParametersByteSize); +} + +static void FAPOCALL XAPO_GetParameters(void *iface, + void *pParameters, uint32_t ParametersByteSize) +{ + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + if(This->xapo_params) + IXAPOParameters_GetParameters(This->xapo_params, pParameters, ParametersByteSize); + else + memset(pParameters, 0, ParametersByteSize); +} + +static const FAPO FAPO_Vtbl = { + XAPO_AddRef, + XAPO_Release, + XAPO_GetRegistrationProperties, + XAPO_IsInputFormatSupported, + XAPO_IsOutputFormatSupported, + XAPO_Initialize, + XAPO_Reset, + XAPO_LockForProcess, + XAPO_UnlockForProcess, + XAPO_Process, + XAPO_CalcInputFrames, + XAPO_CalcOutputFrames, + XAPO_SetParameters, + XAPO_GetParameters, +}; + +static XA2XAPOImpl *wrap_xapo(IUnknown *unk) +{ + XA2XAPOImpl *ret; + IXAPO *xapo; + IXAPOParameters *xapo_params; + HRESULT hr; + +#if XAUDIO2_VER <= 7 + hr = IUnknown_QueryInterface(unk, &IID_IXAPO27, (void**)&xapo); +#else + hr = IUnknown_QueryInterface(unk, &IID_IXAPO, (void**)&xapo); +#endif + if(FAILED(hr)){ + WARN("XAPO doesn't support IXAPO? %p\n", unk); + return NULL; + } + +#if XAUDIO2_VER <= 7 + hr = IUnknown_QueryInterface(unk, &IID_IXAPO27Parameters, (void**)&xapo_params); +#else + hr = IUnknown_QueryInterface(unk, &IID_IXAPOParameters, (void**)&xapo_params); +#endif + if(FAILED(hr)){ + TRACE("XAPO doesn't support IXAPOParameters %p\n", unk); + xapo_params = NULL; + } + + ret = heap_alloc(sizeof(*ret)); + + ret->xapo = xapo; + ret->xapo_params = xapo_params; + ret->FAPO_vtbl = FAPO_Vtbl; + ret->ref = 1; + + TRACE("wrapped IXAPO %p with %p\n", xapo, ret); + + return ret; +} + +FAudioEffectChain *wrap_effect_chain(const XAUDIO2_EFFECT_CHAIN *pEffectChain) +{ + FAudioEffectChain *ret; int i; - XAUDIO2_VOICE_SENDS def_send; - XAUDIO2_SEND_DESCRIPTOR def_desc; - TRACE("%p, %p\n", This, pSendList); + if(!pEffectChain) + return NULL; - if(!pSendList){ - def_desc.Flags = 0; - def_desc.pOutputVoice = (IXAudio2Voice*)&This->xa2->IXAudio2MasteringVoice_iface; + ret = heap_alloc(sizeof(*ret) + sizeof(FAudioEffectDescriptor) * pEffectChain->EffectCount); - def_send.SendCount = 1; - def_send.pSends = &def_desc; + ret->EffectCount = pEffectChain->EffectCount; + ret->pEffectDescriptors = (void*)(ret + 1); - pSendList = &def_send; + for(i = 0; i < ret->EffectCount; ++i){ + ret->pEffectDescriptors[i].pEffect = &wrap_xapo(pEffectChain->pEffectDescriptors[i].pEffect)->FAPO_vtbl; + ret->pEffectDescriptors[i].InitialState = pEffectChain->pEffectDescriptors[i].InitialState; + ret->pEffectDescriptors[i].OutputChannels = pEffectChain->pEffectDescriptors[i].OutputChannels; } - if(TRACE_ON(xaudio2)){ - for(i = 0; i < pSendList->SendCount; ++i){ - XAUDIO2_SEND_DESCRIPTOR *desc = &pSendList->pSends[i]; - TRACE("Outputting to: 0x%x, %p\n", desc->Flags, desc->pOutputVoice); - } + return ret; +} + +static void free_effect_chain(FAudioEffectChain *chain) +{ + int i; + if(!chain) + return; + for(i = 0; i < chain->EffectCount; ++i) + XAPO_Release(chain->pEffectDescriptors[i].pEffect); + heap_free(chain); +} + +/* Send Wrapping */ + +static FAudioVoiceSends *wrap_voice_sends(const XAUDIO2_VOICE_SENDS *sends) +{ + FAudioVoiceSends *ret; + int i; + + if(!sends) + return NULL; + + ret = heap_alloc(sizeof(*ret) + sends->SendCount * sizeof(FAudioSendDescriptor)); + ret->SendCount = sends->SendCount; + ret->pSends = (FAudioSendDescriptor*)(ret + 1); + for(i = 0; i < sends->SendCount; ++i){ + XA2VoiceImpl *voice = impl_from_IXAudio2Voice(sends->pSends[i].pOutputVoice); + ret->pSends[i].pOutputVoice = voice->faudio_voice; + ret->pSends[i].Flags = sends->pSends[i].Flags; } + return ret; +} - if(This->nsends < pSendList->SendCount){ - HeapFree(GetProcessHeap(), 0, This->sends); - This->sends = HeapAlloc(GetProcessHeap(), 0, sizeof(*This->sends) * pSendList->SendCount); - This->nsends = pSendList->SendCount; - }else - memset(This->sends, 0, sizeof(*This->sends) * This->nsends); +static void free_voice_sends(FAudioVoiceSends *sends) +{ + if(!sends) + return; + heap_free(sends); +} - memcpy(This->sends, pSendList->pSends, sizeof(*This->sends) * pSendList->SendCount); +/* Voice Callbacks */ - return S_OK; +static inline XA2VoiceImpl *impl_from_FAudioVoiceCallback(FAudioVoiceCallback *iface) +{ + return CONTAINING_RECORD(iface, XA2VoiceImpl, FAudioVoiceCallback_vtbl); +} + +static void FAUDIOCALL XA2VCB_OnVoiceProcessingPassStart(FAudioVoiceCallback *iface, + UINT32 BytesRequired) +{ + XA2VoiceImpl *This = impl_from_FAudioVoiceCallback(iface); + TRACE("%p\n", This); + if(This->cb) +#if XAUDIO2_VER == 0 + IXAudio20VoiceCallback_OnVoiceProcessingPassStart((IXAudio20VoiceCallback*)This->cb); +#else + IXAudio2VoiceCallback_OnVoiceProcessingPassStart(This->cb, BytesRequired); +#endif +} + +static void FAUDIOCALL XA2VCB_OnVoiceProcessingPassEnd(FAudioVoiceCallback *iface) +{ + XA2VoiceImpl *This = impl_from_FAudioVoiceCallback(iface); + TRACE("%p\n", This); + if(This->cb) + IXAudio2VoiceCallback_OnVoiceProcessingPassEnd(This->cb); +} + +static void FAUDIOCALL XA2VCB_OnStreamEnd(FAudioVoiceCallback *iface) +{ + XA2VoiceImpl *This = impl_from_FAudioVoiceCallback(iface); + TRACE("%p\n", This); + if(This->cb) + IXAudio2VoiceCallback_OnStreamEnd(This->cb); +} + +static void FAUDIOCALL XA2VCB_OnBufferStart(FAudioVoiceCallback *iface, + void *pBufferContext) +{ + XA2VoiceImpl *This = impl_from_FAudioVoiceCallback(iface); + TRACE("%p\n", This); + if(This->cb) + IXAudio2VoiceCallback_OnBufferStart(This->cb, pBufferContext); +} + +static void FAUDIOCALL XA2VCB_OnBufferEnd(FAudioVoiceCallback *iface, + void *pBufferContext) +{ + XA2VoiceImpl *This = impl_from_FAudioVoiceCallback(iface); + TRACE("%p\n", This); + if(This->cb) + IXAudio2VoiceCallback_OnBufferEnd(This->cb, pBufferContext); +} + +static void FAUDIOCALL XA2VCB_OnLoopEnd(FAudioVoiceCallback *iface, + void *pBufferContext) +{ + XA2VoiceImpl *This = impl_from_FAudioVoiceCallback(iface); + TRACE("%p\n", This); + if(This->cb) + IXAudio2VoiceCallback_OnLoopEnd(This->cb, pBufferContext); +} + +static void FAUDIOCALL XA2VCB_OnVoiceError(FAudioVoiceCallback *iface, + void *pBufferContext, unsigned int Error) +{ + XA2VoiceImpl *This = impl_from_FAudioVoiceCallback(iface); + TRACE("%p\n", This); + if(This->cb) + IXAudio2VoiceCallback_OnVoiceError(This->cb, pBufferContext, (HRESULT)Error); +} + +static const FAudioVoiceCallback FAudioVoiceCallback_Vtbl = { + XA2VCB_OnBufferEnd, + XA2VCB_OnBufferStart, + XA2VCB_OnLoopEnd, + XA2VCB_OnStreamEnd, + XA2VCB_OnVoiceError, + XA2VCB_OnVoiceProcessingPassEnd, + XA2VCB_OnVoiceProcessingPassStart +}; + +/* Engine Callbacks */ + +static inline IXAudio2Impl *impl_from_FAudioEngineCallback(FAudioEngineCallback *iface) +{ + return CONTAINING_RECORD(iface, IXAudio2Impl, FAudioEngineCallback_vtbl); +} + +static void FAUDIOCALL XA2ECB_OnProcessingPassStart(FAudioEngineCallback *iface) +{ + IXAudio2Impl *This = impl_from_FAudioEngineCallback(iface); + int i; + TRACE("%p\n", This); + for(i = 0; i < This->ncbs && This->cbs[i]; ++i) + IXAudio2EngineCallback_OnProcessingPassStart(This->cbs[i]); +} + +static void FAUDIOCALL XA2ECB_OnProcessingPassEnd(FAudioEngineCallback *iface) +{ + IXAudio2Impl *This = impl_from_FAudioEngineCallback(iface); + int i; + TRACE("%p\n", This); + for(i = 0; i < This->ncbs && This->cbs[i]; ++i) + IXAudio2EngineCallback_OnProcessingPassEnd(This->cbs[i]); +} + +static void FAUDIOCALL XA2ECB_OnCriticalError(FAudioEngineCallback *iface, + uint32_t error) +{ + IXAudio2Impl *This = impl_from_FAudioEngineCallback(iface); + int i; + TRACE("%p\n", This); + for(i = 0; i < This->ncbs && This->cbs[i]; ++i) + IXAudio2EngineCallback_OnCriticalError(This->cbs[i], error); +} + +static const FAudioEngineCallback FAudioEngineCallback_Vtbl = { + XA2ECB_OnCriticalError, + XA2ECB_OnProcessingPassEnd, + XA2ECB_OnProcessingPassStart +}; + +/* Common Voice Functions */ + +static inline void destroy_voice(XA2VoiceImpl *This) +{ + FAudioVoice_DestroyVoice(This->faudio_voice); + free_effect_chain(This->effect_chain); + This->effect_chain = NULL; + This->in_use = FALSE; +} + +/* Source Voices */ + +static inline XA2VoiceImpl *impl_from_IXAudio2SourceVoice(IXAudio2SourceVoice *iface) +{ + return CONTAINING_RECORD(iface, XA2VoiceImpl, IXAudio2SourceVoice_iface); +} + +static void WINAPI XA2SRC_GetVoiceDetails(IXAudio2SourceVoice *iface, + XAUDIO2_VOICE_DETAILS *pVoiceDetails) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); + TRACE("%p, %p\n", This, pVoiceDetails); + FAudioVoice_GetVoiceDetails(This->faudio_voice, (FAudioVoiceDetails *)pVoiceDetails); +} + +static HRESULT WINAPI XA2SRC_SetOutputVoices(IXAudio2SourceVoice *iface, + const XAUDIO2_VOICE_SENDS *pSendList) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); + FAudioVoiceSends *faudio_sends; + HRESULT hr; + + TRACE("%p, %p\n", This, pSendList); + + faudio_sends = wrap_voice_sends(pSendList); + + hr = FAudioVoice_SetOutputVoices(This->faudio_voice, faudio_sends); + + free_voice_sends(faudio_sends); + + return hr; } static HRESULT WINAPI XA2SRC_SetEffectChain(IXAudio2SourceVoice *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); + HRESULT hr; + TRACE("%p, %p\n", This, pEffectChain); - return S_OK; + + free_effect_chain(This->effect_chain); + This->effect_chain = wrap_effect_chain(pEffectChain); + + hr = FAudioVoice_SetEffectChain(This->faudio_voice, This->effect_chain); + + return hr; } -static HRESULT WINAPI XA2SRC_EnableEffect(IXAudio2SourceVoice *iface, - UINT32 EffectIndex, UINT32 OperationSet) +static HRESULT WINAPI XA2SRC_EnableEffect(IXAudio2SourceVoice *iface, UINT32 EffectIndex, + UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %u, 0x%x\n", This, EffectIndex, OperationSet); - return S_OK; + return FAudioVoice_EnableEffect(This->faudio_voice, EffectIndex, OperationSet); } -static HRESULT WINAPI XA2SRC_DisableEffect(IXAudio2SourceVoice *iface, - UINT32 EffectIndex, UINT32 OperationSet) +static HRESULT WINAPI XA2SRC_DisableEffect(IXAudio2SourceVoice *iface, UINT32 EffectIndex, + UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %u, 0x%x\n", This, EffectIndex, OperationSet); - return S_OK; + return FAudioVoice_DisableEffect(This->faudio_voice, EffectIndex, OperationSet); } -static void WINAPI XA2SRC_GetEffectState(IXAudio2SourceVoice *iface, - UINT32 EffectIndex, BOOL *pEnabled) +static void WINAPI XA2SRC_GetEffectState(IXAudio2SourceVoice *iface, UINT32 EffectIndex, + BOOL *pEnabled) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %u, %p\n", This, EffectIndex, pEnabled); + FAudioVoice_GetEffectState(This->faudio_voice, EffectIndex, (int32_t*)pEnabled); } static HRESULT WINAPI XA2SRC_SetEffectParameters(IXAudio2SourceVoice *iface, UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %u, %p, 0x%x, 0x%x\n", This, EffectIndex, pParameters, ParametersByteSize, OperationSet); - return S_OK; + return FAudioVoice_SetEffectParameters(This->faudio_voice, EffectIndex, + pParameters, ParametersByteSize, OperationSet); } static HRESULT WINAPI XA2SRC_GetEffectParameters(IXAudio2SourceVoice *iface, UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %u, %p, 0x%x\n", This, EffectIndex, pParameters, ParametersByteSize); - return S_OK; + return FAudioVoice_GetEffectParameters(This->faudio_voice, EffectIndex, + pParameters, ParametersByteSize); } static HRESULT WINAPI XA2SRC_SetFilterParameters(IXAudio2SourceVoice *iface, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %p, 0x%x\n", This, pParameters, OperationSet); - return S_OK; + return FAudioVoice_SetFilterParameters(This->faudio_voice, + (const FAudioFilterParameters *)pParameters, OperationSet); } static void WINAPI XA2SRC_GetFilterParameters(IXAudio2SourceVoice *iface, XAUDIO2_FILTER_PARAMETERS *pParameters) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %p\n", This, pParameters); + FAudioVoice_GetFilterParameters(This->faudio_voice, (FAudioFilterParameters *)pParameters); } static HRESULT WINAPI XA2SRC_SetOutputFilterParameters(IXAudio2SourceVoice *iface, IXAudio2Voice *pDestinationVoice, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *dst = pDestinationVoice ? impl_from_IXAudio2Voice(pDestinationVoice) : NULL; + TRACE("%p, %p, %p, 0x%x\n", This, pDestinationVoice, pParameters, OperationSet); - return S_OK; + + return FAudioVoice_SetOutputFilterParameters(This->faudio_voice, + dst ? dst->faudio_voice : NULL, (const FAudioFilterParameters *)pParameters, OperationSet); } static void WINAPI XA2SRC_GetOutputFilterParameters(IXAudio2SourceVoice *iface, IXAudio2Voice *pDestinationVoice, XAUDIO2_FILTER_PARAMETERS *pParameters) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *dst = pDestinationVoice ? impl_from_IXAudio2Voice(pDestinationVoice) : NULL; + TRACE("%p, %p, %p\n", This, pDestinationVoice, pParameters); + + FAudioVoice_GetOutputFilterParameters(This->faudio_voice, + dst ? dst->faudio_voice : NULL, (FAudioFilterParameters *)pParameters); } static HRESULT WINAPI XA2SRC_SetVolume(IXAudio2SourceVoice *iface, float Volume, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); - ALfloat al_gain; - + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %f, 0x%x\n", This, Volume, OperationSet); - - al_gain = Volume; - - palcSetThreadContext(This->xa2->al_ctx); - - alSourcef(This->al_src, AL_GAIN, al_gain); - - return S_OK; + return FAudioVoice_SetVolume(This->faudio_voice, Volume, OperationSet); } static void WINAPI XA2SRC_GetVolume(IXAudio2SourceVoice *iface, float *pVolume) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %p\n", This, pVolume); + return FAudioVoice_GetVolume(This->faudio_voice, pVolume); } -static HRESULT WINAPI XA2SRC_SetChannelVolumes(IXAudio2SourceVoice *iface, - UINT32 Channels, const float *pVolumes, UINT32 OperationSet) +static HRESULT WINAPI XA2SRC_SetChannelVolumes(IXAudio2SourceVoice *iface, UINT32 Channels, + const float *pVolumes, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); - ALfloat al_gain; - UINT32 i; - BOOL same_volumes_given = TRUE; - + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %u, %p, 0x%x\n", This, Channels, pVolumes, OperationSet); - -#if XAUDIO2_VER > 7 - if(Channels != This->fmt->nChannels || !pVolumes) - return COMPAT_E_INVALID_CALL; -#endif - - al_gain = *pVolumes; - - /* check whether all volumes are the same */ - for(i = 1; i < Channels; ++i){ - if(al_gain != *(pVolumes + i)){ - same_volumes_given = FALSE; - break; - } - } - if(!same_volumes_given){ - WARN("Different volumes for channels unsupported, setting the highest volume.\n"); - for(; i < Channels; ++i) - al_gain = max(al_gain, *(pVolumes + i)); - } - - palcSetThreadContext(This->xa2->al_ctx); - alSourcef(This->al_src, AL_GAIN, al_gain); - - return S_OK; + return FAudioVoice_SetChannelVolumes(This->faudio_voice, Channels, + pVolumes, OperationSet); } -static void WINAPI XA2SRC_GetChannelVolumes(IXAudio2SourceVoice *iface, - UINT32 Channels, float *pVolumes) +static void WINAPI XA2SRC_GetChannelVolumes(IXAudio2SourceVoice *iface, UINT32 Channels, + float *pVolumes) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %u, %p\n", This, Channels, pVolumes); + return FAudioVoice_GetChannelVolumes(This->faudio_voice, Channels, + pVolumes); } static HRESULT WINAPI XA2SRC_SetOutputMatrix(IXAudio2SourceVoice *iface, @@ -411,68 +686,39 @@ static HRESULT WINAPI XA2SRC_SetOutputMatrix(IXAudio2SourceVoice *iface, UINT32 DestinationChannels, const float *pLevelMatrix, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *dst = pDestinationVoice ? impl_from_IXAudio2Voice(pDestinationVoice) : NULL; + TRACE("%p, %p, %u, %u, %p, 0x%x\n", This, pDestinationVoice, SourceChannels, DestinationChannels, pLevelMatrix, OperationSet); - return S_OK; + + return FAudioVoice_SetOutputMatrix(This->faudio_voice, dst ? dst->faudio_voice : NULL, + SourceChannels, DestinationChannels, pLevelMatrix, OperationSet); } static void WINAPI XA2SRC_GetOutputMatrix(IXAudio2SourceVoice *iface, IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, UINT32 DestinationChannels, float *pLevelMatrix) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *dst = pDestinationVoice ? impl_from_IXAudio2Voice(pDestinationVoice) : NULL; + TRACE("%p, %p, %u, %u, %p\n", This, pDestinationVoice, SourceChannels, DestinationChannels, pLevelMatrix); -} + + FAudioVoice_GetOutputMatrix(This->faudio_voice, dst ? dst->faudio_voice : NULL, + SourceChannels, DestinationChannels, pLevelMatrix); +} static void WINAPI XA2SRC_DestroyVoice(IXAudio2SourceVoice *iface) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); - ALint processed; + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p\n", This); - palcSetThreadContext(This->xa2->al_ctx); - EnterCriticalSection(&This->lock); - if(!This->in_use){ - LeaveCriticalSection(&This->lock); - return; - } - - This->in_use = FALSE; - - This->running = FALSE; - - IXAudio2SourceVoice_Stop(iface, 0, 0); - - alSourceStop(This->al_src); - - /* unqueue all buffers */ - alSourcei(This->al_src, AL_BUFFER, AL_NONE); - - alGetSourcei(This->al_src, AL_BUFFERS_PROCESSED, &processed); - - if(processed > 0){ - ALuint al_buffers[XAUDIO2_MAX_QUEUED_BUFFERS]; - - alSourceUnqueueBuffers(This->al_src, processed, al_buffers); - } - - HeapFree(GetProcessHeap(), 0, This->fmt); - - alDeleteBuffers(XAUDIO2_MAX_QUEUED_BUFFERS, This->al_bufs); - alDeleteSources(1, &This->al_src); - - This->in_al_bytes = 0; - This->al_bufs_used = 0; - This->played_frames = 0; - This->nbufs = 0; - This->first_buf = 0; - This->cur_buf = 0; - This->abandoned_albufs = 0; + destroy_voice(This); LeaveCriticalSection(&This->lock); } @@ -480,380 +726,98 @@ static void WINAPI XA2SRC_DestroyVoice(IXAudio2SourceVoice *iface) static HRESULT WINAPI XA2SRC_Start(IXAudio2SourceVoice *iface, UINT32 Flags, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, 0x%x, 0x%x\n", This, Flags, OperationSet); - EnterCriticalSection(&This->lock); - - This->running = TRUE; - - LeaveCriticalSection(&This->lock); - - return S_OK; + return FAudioSourceVoice_Start(This->faudio_voice, Flags, OperationSet); } static HRESULT WINAPI XA2SRC_Stop(IXAudio2SourceVoice *iface, UINT32 Flags, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); - ALint bufs; + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, 0x%x, 0x%x\n", This, Flags, OperationSet); - palcSetThreadContext(This->xa2->al_ctx); - - EnterCriticalSection(&This->lock); - - alGetSourcei(This->al_src, AL_BUFFERS_QUEUED, &bufs); - - This->abandoned_albufs = bufs; - - This->running = FALSE; - - LeaveCriticalSection(&This->lock); - - return S_OK; -} - -static ALenum get_al_format(const WAVEFORMATEX *fmt) -{ - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)fmt; - if(fmt->wFormatTag == WAVE_FORMAT_PCM || - (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))){ - switch(fmt->wBitsPerSample){ - case 8: - switch(fmt->nChannels){ - case 1: - return AL_FORMAT_MONO8; - case 2: - return AL_FORMAT_STEREO8; - case 4: - return AL_FORMAT_QUAD8; - case 6: - return AL_FORMAT_51CHN8; - case 7: - return AL_FORMAT_61CHN8; - case 8: - return AL_FORMAT_71CHN8; - } - break; - case 16: - switch(fmt->nChannels){ - case 1: - return AL_FORMAT_MONO16; - case 2: - return AL_FORMAT_STEREO16; - case 4: - return AL_FORMAT_QUAD16; - case 6: - return AL_FORMAT_51CHN16; - case 7: - return AL_FORMAT_61CHN16; - case 8: - return AL_FORMAT_71CHN16; - } - break; - } - }else if(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || - (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))){ - if(fmt->wBitsPerSample == 32){ - switch(fmt->nChannels){ - case 1: - return AL_FORMAT_MONO_FLOAT32; - case 2: - return AL_FORMAT_STEREO_FLOAT32; - case 4: - return AL_FORMAT_QUAD32; - case 6: - return AL_FORMAT_51CHN32; - case 7: - return AL_FORMAT_61CHN32; - case 8: - return AL_FORMAT_71CHN32; - } - } - } - return 0; + return FAudioSourceVoice_Stop(This->faudio_voice, Flags, OperationSet); } static HRESULT WINAPI XA2SRC_SubmitSourceBuffer(IXAudio2SourceVoice *iface, const XAUDIO2_BUFFER *pBuffer, const XAUDIO2_BUFFER_WMA *pBufferWMA) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); - XA2Buffer *buf; - UINT32 buf_idx; + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %p, %p\n", This, pBuffer, pBufferWMA); - if(TRACE_ON(xaudio2)){ - TRACE("Flags: 0x%x\n", pBuffer->Flags); - TRACE("AudioBytes: %u\n", pBuffer->AudioBytes); - TRACE("pAudioData: %p\n", pBuffer->pAudioData); - TRACE("PlayBegin: %u\n", pBuffer->PlayBegin); - TRACE("PlayLength: %u\n", pBuffer->PlayLength); - TRACE("LoopBegin: %u\n", pBuffer->LoopBegin); - TRACE("LoopLength: %u\n", pBuffer->LoopLength); - TRACE("LoopCount: %u\n", pBuffer->LoopCount); - TRACE("pContext: %p\n", pBuffer->pContext); - } - - EnterCriticalSection(&This->lock); - - if(This->nbufs >= XAUDIO2_MAX_QUEUED_BUFFERS){ - TRACE("Too many buffers queued!\n"); - LeaveCriticalSection(&This->lock); - return COMPAT_E_INVALID_CALL; - } - - buf_idx = (This->first_buf + This->nbufs) % XAUDIO2_MAX_QUEUED_BUFFERS; - buf = &This->buffers[buf_idx]; - memset(buf, 0, sizeof(*buf)); - - /* API contract: pAudioData must remain valid until this buffer is played, - * but pBuffer itself may be reused immediately */ - memcpy(&buf->xa2buffer, pBuffer, sizeof(*pBuffer)); - -#if XAUDIO2_VER == 0 - if(buf->xa2buffer.LoopCount == XAUDIO20_LOOP_INFINITE) - buf->xa2buffer.LoopCount = XAUDIO2_LOOP_INFINITE; -#endif - - /* convert samples offsets to bytes */ - if(This->fmt->wFormatTag == WAVE_FORMAT_ADPCM){ - /* ADPCM gives us a number of samples per block, so round down to - * nearest block and convert to bytes */ - buf->xa2buffer.PlayBegin = buf->xa2buffer.PlayBegin / ((ADPCMWAVEFORMAT*)This->fmt)->wSamplesPerBlock * This->fmt->nBlockAlign; - buf->xa2buffer.PlayLength = buf->xa2buffer.PlayLength / ((ADPCMWAVEFORMAT*)This->fmt)->wSamplesPerBlock * This->fmt->nBlockAlign; - buf->xa2buffer.LoopBegin = buf->xa2buffer.LoopBegin / ((ADPCMWAVEFORMAT*)This->fmt)->wSamplesPerBlock * This->fmt->nBlockAlign; - buf->xa2buffer.LoopLength = buf->xa2buffer.LoopLength / ((ADPCMWAVEFORMAT*)This->fmt)->wSamplesPerBlock * This->fmt->nBlockAlign; - }else{ - buf->xa2buffer.PlayBegin *= This->fmt->nBlockAlign; - buf->xa2buffer.PlayLength *= This->fmt->nBlockAlign; - buf->xa2buffer.LoopBegin *= This->fmt->nBlockAlign; - buf->xa2buffer.LoopLength *= This->fmt->nBlockAlign; - } - - if(buf->xa2buffer.PlayLength == 0) - /* set to end of buffer */ - buf->xa2buffer.PlayLength = buf->xa2buffer.AudioBytes - buf->xa2buffer.PlayBegin; - - buf->play_end_bytes = buf->xa2buffer.PlayBegin + buf->xa2buffer.PlayLength; - - if(buf->xa2buffer.LoopCount){ - if(buf->xa2buffer.LoopLength == 0) - /* set to end of play range */ - buf->xa2buffer.LoopLength = buf->play_end_bytes - buf->xa2buffer.LoopBegin; - - if(buf->xa2buffer.LoopBegin >= buf->play_end_bytes){ - /* this actually crashes on native xaudio 2.7 */ - LeaveCriticalSection(&This->lock); - return COMPAT_E_INVALID_CALL; - } - - buf->loop_end_bytes = buf->xa2buffer.LoopBegin + buf->xa2buffer.LoopLength; - - /* xaudio 2.7 allows some invalid looping setups, but later versions - * return an error */ -#if XAUDIO2_VER > 7 - if(buf->loop_end_bytes > buf->play_end_bytes){ - LeaveCriticalSection(&This->lock); - return COMPAT_E_INVALID_CALL; - } - - if(buf->loop_end_bytes <= buf->xa2buffer.PlayBegin){ - LeaveCriticalSection(&This->lock); - return COMPAT_E_INVALID_CALL; - } -#else - if(buf->loop_end_bytes <= buf->xa2buffer.PlayBegin){ - buf->xa2buffer.LoopCount = 0; - buf->loop_end_bytes = buf->play_end_bytes; - } -#endif - }else{ - buf->xa2buffer.LoopLength = buf->xa2buffer.PlayLength; - buf->xa2buffer.LoopBegin = buf->xa2buffer.PlayBegin; - buf->loop_end_bytes = buf->play_end_bytes; - } - - buf->offs_bytes = buf->xa2buffer.PlayBegin; - buf->cur_end_bytes = buf->loop_end_bytes; - - buf->latest_al_buf = -1; - - ++This->nbufs; - - TRACE("%p: queued buffer %u (%u bytes), now %u buffers held\n", - This, buf_idx, buf->xa2buffer.AudioBytes, This->nbufs); - - LeaveCriticalSection(&This->lock); - - return S_OK; + return FAudioSourceVoice_SubmitSourceBuffer(This->faudio_voice, (FAudioBuffer*)pBuffer, (FAudioBufferWMA*)pBufferWMA); } static HRESULT WINAPI XA2SRC_FlushSourceBuffers(IXAudio2SourceVoice *iface) { - UINT i, first, last, to_flush; - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p\n", This); - EnterCriticalSection(&This->lock); - - if(This->running && This->nbufs > 0){ - /* when running, flush only completely unused buffers; the rest remain - * in queue */ - last = (This->first_buf + This->nbufs) % XAUDIO2_MAX_QUEUED_BUFFERS; - first = (This->cur_buf + 1) % XAUDIO2_MAX_QUEUED_BUFFERS; - if(This->cur_buf == last) - /* nothing to do */ - to_flush = 0; - else if(last >= first) - to_flush = last - first; - else - to_flush = last + XAUDIO2_MAX_QUEUED_BUFFERS - first; - }else{ - /* when stopped, flush all buffers */ - first = This->first_buf; - last = (This->first_buf + This->nbufs) % XAUDIO2_MAX_QUEUED_BUFFERS; - to_flush = This->nbufs; - } - - - for(i = first; - i < (first + to_flush) % XAUDIO2_MAX_QUEUED_BUFFERS; - i = (i + 1) % XAUDIO2_MAX_QUEUED_BUFFERS){ - if(This->cb) - IXAudio2VoiceCallback_OnBufferEnd(This->cb, - This->buffers[i].xa2buffer.pContext); - } - - This->nbufs -= to_flush; - This->cur_buf = (This->first_buf + This->nbufs) % XAUDIO2_MAX_QUEUED_BUFFERS; - - LeaveCriticalSection(&This->lock); - - return S_OK; + return FAudioSourceVoice_FlushSourceBuffers(This->faudio_voice); } static HRESULT WINAPI XA2SRC_Discontinuity(IXAudio2SourceVoice *iface) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p\n", This); - EnterCriticalSection(&This->lock); - - if(This->nbufs > 0){ - DWORD last = (This->first_buf + This->nbufs - 1) % XAUDIO2_MAX_QUEUED_BUFFERS; - This->buffers[last].xa2buffer.Flags |= XAUDIO2_END_OF_STREAM; - } - - LeaveCriticalSection(&This->lock); - - return S_OK; + return FAudioSourceVoice_Discontinuity(This->faudio_voice); } static HRESULT WINAPI XA2SRC_ExitLoop(IXAudio2SourceVoice *iface, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, 0x%x\n", This, OperationSet); - EnterCriticalSection(&This->lock); - - This->buffers[This->cur_buf].looped = XAUDIO2_LOOP_INFINITE; - - LeaveCriticalSection(&This->lock); - - return S_OK; + return FAudioSourceVoice_ExitLoop(This->faudio_voice, OperationSet); } static void WINAPI XA2SRC_GetState(IXAudio2SourceVoice *iface, XAUDIO2_VOICE_STATE *pVoiceState, UINT32 Flags) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %p, 0x%x\n", This, pVoiceState, Flags); - EnterCriticalSection(&This->lock); - - if(!(Flags & XAUDIO2_VOICE_NOSAMPLESPLAYED)) - pVoiceState->SamplesPlayed = This->played_frames; - else - pVoiceState->SamplesPlayed = 0; - - if(This->nbufs) - pVoiceState->pCurrentBufferContext = This->buffers[This->first_buf].xa2buffer.pContext; - else - pVoiceState->pCurrentBufferContext = NULL; - - pVoiceState->BuffersQueued = This->nbufs; - - LeaveCriticalSection(&This->lock); - - TRACE("returning %s, queued: %u\n", wine_dbgstr_longlong(pVoiceState->SamplesPlayed), This->nbufs); + return FAudioSourceVoice_GetState(This->faudio_voice, (FAudioVoiceState*)pVoiceState, Flags); } static HRESULT WINAPI XA2SRC_SetFrequencyRatio(IXAudio2SourceVoice *iface, float Ratio, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); - ALfloat r; + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %f, 0x%x\n", This, Ratio, OperationSet); - if(Ratio < XAUDIO2_MIN_FREQ_RATIO) - r = XAUDIO2_MIN_FREQ_RATIO; - else if (Ratio > XAUDIO2_MAX_FREQ_RATIO) - r = XAUDIO2_MAX_FREQ_RATIO; - else - r = Ratio; - - palcSetThreadContext(This->xa2->al_ctx); - - alSourcef(This->al_src, AL_PITCH, r); - - return S_OK; + return FAudioSourceVoice_SetFrequencyRatio(This->faudio_voice, Ratio, OperationSet); } static void WINAPI XA2SRC_GetFrequencyRatio(IXAudio2SourceVoice *iface, float *pRatio) { - ALfloat ratio; - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %p\n", This, pRatio); - palcSetThreadContext(This->xa2->al_ctx); - - alGetSourcef(This->al_src, AL_PITCH, &ratio); - - *pRatio = ratio; + return FAudioSourceVoice_GetFrequencyRatio(This->faudio_voice, pRatio); } static HRESULT WINAPI XA2SRC_SetSourceSampleRate( IXAudio2SourceVoice *iface, UINT32 NewSourceSampleRate) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %u\n", This, NewSourceSampleRate); - EnterCriticalSection(&This->lock); - - if(This->nbufs){ - LeaveCriticalSection(&This->lock); - return COMPAT_E_INVALID_CALL; - } - - This->fmt->nSamplesPerSec = NewSourceSampleRate; - - LeaveCriticalSection(&This->lock); - - return S_OK; + return FAudioSourceVoice_SetSourceSampleRate(This->faudio_voice, NewSourceSampleRate); } static const IXAudio2SourceVoiceVtbl XAudio2SourceVoice_Vtbl = { @@ -888,134 +852,408 @@ static const IXAudio2SourceVoiceVtbl XAudio2SourceVoice_Vtbl = { XA2SRC_SetSourceSampleRate }; +/* Submix Voices */ + +static inline XA2VoiceImpl *impl_from_IXAudio2SubmixVoice(IXAudio2SubmixVoice *iface) +{ + return CONTAINING_RECORD(iface, XA2VoiceImpl, IXAudio2SubmixVoice_iface); +} + +static void WINAPI XA2SUB_GetVoiceDetails(IXAudio2SubmixVoice *iface, + XAUDIO2_VOICE_DETAILS *pVoiceDetails) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + TRACE("%p, %p\n", This, pVoiceDetails); + FAudioVoice_GetVoiceDetails(This->faudio_voice, (FAudioVoiceDetails *)pVoiceDetails); +} + +static HRESULT WINAPI XA2SUB_SetOutputVoices(IXAudio2SubmixVoice *iface, + const XAUDIO2_VOICE_SENDS *pSendList) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + FAudioVoiceSends *faudio_sends; + HRESULT hr; + + TRACE("%p, %p\n", This, pSendList); + + faudio_sends = wrap_voice_sends(pSendList); + + hr = FAudioVoice_SetOutputVoices(This->faudio_voice, faudio_sends); + + free_voice_sends(faudio_sends); + + return hr; +} + +static HRESULT WINAPI XA2SUB_SetEffectChain(IXAudio2SubmixVoice *iface, + const XAUDIO2_EFFECT_CHAIN *pEffectChain) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + HRESULT hr; + + TRACE("%p, %p\n", This, pEffectChain); + + free_effect_chain(This->effect_chain); + This->effect_chain = wrap_effect_chain(pEffectChain); + + hr = FAudioVoice_SetEffectChain(This->faudio_voice, This->effect_chain); + + return hr; +} + +static HRESULT WINAPI XA2SUB_EnableEffect(IXAudio2SubmixVoice *iface, UINT32 EffectIndex, + UINT32 OperationSet) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + TRACE("%p, %u, 0x%x\n", This, EffectIndex, OperationSet); + return FAudioVoice_EnableEffect(This->faudio_voice, EffectIndex, OperationSet); +} + +static HRESULT WINAPI XA2SUB_DisableEffect(IXAudio2SubmixVoice *iface, UINT32 EffectIndex, + UINT32 OperationSet) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + TRACE("%p, %u, 0x%x\n", This, EffectIndex, OperationSet); + return FAudioVoice_DisableEffect(This->faudio_voice, EffectIndex, OperationSet); +} + +static void WINAPI XA2SUB_GetEffectState(IXAudio2SubmixVoice *iface, UINT32 EffectIndex, + BOOL *pEnabled) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + TRACE("%p, %u, %p\n", This, EffectIndex, pEnabled); + FAudioVoice_GetEffectState(This->faudio_voice, EffectIndex, (int32_t*)pEnabled); +} + +static HRESULT WINAPI XA2SUB_SetEffectParameters(IXAudio2SubmixVoice *iface, + UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, + UINT32 OperationSet) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + TRACE("%p, %u, %p, 0x%x, 0x%x\n", This, EffectIndex, pParameters, + ParametersByteSize, OperationSet); + return FAudioVoice_SetEffectParameters(This->faudio_voice, EffectIndex, + pParameters, ParametersByteSize, OperationSet); +} + +static HRESULT WINAPI XA2SUB_GetEffectParameters(IXAudio2SubmixVoice *iface, + UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + TRACE("%p, %u, %p, 0x%x\n", This, EffectIndex, pParameters, + ParametersByteSize); + return FAudioVoice_GetEffectParameters(This->faudio_voice, EffectIndex, + pParameters, ParametersByteSize); +} + +static HRESULT WINAPI XA2SUB_SetFilterParameters(IXAudio2SubmixVoice *iface, + const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + TRACE("%p, %p, 0x%x\n", This, pParameters, OperationSet); + return FAudioVoice_SetFilterParameters(This->faudio_voice, (const FAudioFilterParameters *)pParameters, + OperationSet); +} + +static void WINAPI XA2SUB_GetFilterParameters(IXAudio2SubmixVoice *iface, + XAUDIO2_FILTER_PARAMETERS *pParameters) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + TRACE("%p, %p\n", This, pParameters); + FAudioVoice_GetFilterParameters(This->faudio_voice, (FAudioFilterParameters *)pParameters); +} + +static HRESULT WINAPI XA2SUB_SetOutputFilterParameters(IXAudio2SubmixVoice *iface, + IXAudio2Voice *pDestinationVoice, + const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + XA2VoiceImpl *dst = pDestinationVoice ? impl_from_IXAudio2Voice(pDestinationVoice) : NULL; + + TRACE("%p, %p, %p, 0x%x\n", This, pDestinationVoice, pParameters, OperationSet); + + return FAudioVoice_SetOutputFilterParameters(This->faudio_voice, + dst ? dst->faudio_voice : NULL, (const FAudioFilterParameters *)pParameters, OperationSet); +} + +static void WINAPI XA2SUB_GetOutputFilterParameters(IXAudio2SubmixVoice *iface, + IXAudio2Voice *pDestinationVoice, + XAUDIO2_FILTER_PARAMETERS *pParameters) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + XA2VoiceImpl *dst = pDestinationVoice ? impl_from_IXAudio2Voice(pDestinationVoice) : NULL; + + TRACE("%p, %p, %p\n", This, pDestinationVoice, pParameters); + + FAudioVoice_GetOutputFilterParameters(This->faudio_voice, + dst ? dst->faudio_voice : NULL, (FAudioFilterParameters *)pParameters); +} + +static HRESULT WINAPI XA2SUB_SetVolume(IXAudio2SubmixVoice *iface, float Volume, + UINT32 OperationSet) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + TRACE("%p, %f, 0x%x\n", This, Volume, OperationSet); + return FAudioVoice_SetVolume(This->faudio_voice, Volume, OperationSet); +} + +static void WINAPI XA2SUB_GetVolume(IXAudio2SubmixVoice *iface, float *pVolume) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + TRACE("%p, %p\n", This, pVolume); + return FAudioVoice_GetVolume(This->faudio_voice, pVolume); +} + +static HRESULT WINAPI XA2SUB_SetChannelVolumes(IXAudio2SubmixVoice *iface, UINT32 Channels, + const float *pVolumes, UINT32 OperationSet) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + TRACE("%p, %u, %p, 0x%x\n", This, Channels, pVolumes, OperationSet); + return FAudioVoice_SetChannelVolumes(This->faudio_voice, Channels, + pVolumes, OperationSet); +} + +static void WINAPI XA2SUB_GetChannelVolumes(IXAudio2SubmixVoice *iface, UINT32 Channels, + float *pVolumes) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + TRACE("%p, %u, %p\n", This, Channels, pVolumes); + return FAudioVoice_GetChannelVolumes(This->faudio_voice, Channels, + pVolumes); +} + +static HRESULT WINAPI XA2SUB_SetOutputMatrix(IXAudio2SubmixVoice *iface, + IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, + UINT32 DestinationChannels, const float *pLevelMatrix, + UINT32 OperationSet) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + XA2VoiceImpl *dst = pDestinationVoice ? impl_from_IXAudio2Voice(pDestinationVoice) : NULL; + + TRACE("%p, %p, %u, %u, %p, 0x%x\n", This, pDestinationVoice, + SourceChannels, DestinationChannels, pLevelMatrix, OperationSet); + + return FAudioVoice_SetOutputMatrix(This->faudio_voice, dst ? dst->faudio_voice : NULL, + SourceChannels, DestinationChannels, pLevelMatrix, OperationSet); +} + +static void WINAPI XA2SUB_GetOutputMatrix(IXAudio2SubmixVoice *iface, + IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, + UINT32 DestinationChannels, float *pLevelMatrix) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + XA2VoiceImpl *dst = pDestinationVoice ? impl_from_IXAudio2Voice(pDestinationVoice) : NULL; + + TRACE("%p, %p, %u, %u, %p\n", This, pDestinationVoice, + SourceChannels, DestinationChannels, pLevelMatrix); + + FAudioVoice_GetOutputMatrix(This->faudio_voice, dst ? dst->faudio_voice : NULL, + SourceChannels, DestinationChannels, pLevelMatrix); +} + +static void WINAPI XA2SUB_DestroyVoice(IXAudio2SubmixVoice *iface) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + + TRACE("%p\n", This); + + EnterCriticalSection(&This->lock); + + destroy_voice(This); + + LeaveCriticalSection(&This->lock); +} + +static const struct IXAudio2SubmixVoiceVtbl XAudio2SubmixVoice_Vtbl = { + XA2SUB_GetVoiceDetails, + XA2SUB_SetOutputVoices, + XA2SUB_SetEffectChain, + XA2SUB_EnableEffect, + XA2SUB_DisableEffect, + XA2SUB_GetEffectState, + XA2SUB_SetEffectParameters, + XA2SUB_GetEffectParameters, + XA2SUB_SetFilterParameters, + XA2SUB_GetFilterParameters, + XA2SUB_SetOutputFilterParameters, + XA2SUB_GetOutputFilterParameters, + XA2SUB_SetVolume, + XA2SUB_GetVolume, + XA2SUB_SetChannelVolumes, + XA2SUB_GetChannelVolumes, + XA2SUB_SetOutputMatrix, + XA2SUB_GetOutputMatrix, + XA2SUB_DestroyVoice +}; + +/* Mastering Voices */ + +static inline XA2VoiceImpl *impl_from_IXAudio2MasteringVoice(IXAudio2MasteringVoice *iface) +{ + return CONTAINING_RECORD(iface, XA2VoiceImpl, IXAudio2MasteringVoice_iface); +} + static void WINAPI XA2M_GetVoiceDetails(IXAudio2MasteringVoice *iface, XAUDIO2_VOICE_DETAILS *pVoiceDetails) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %p\n", This, pVoiceDetails); - pVoiceDetails->CreationFlags = 0; - pVoiceDetails->ActiveFlags = 0; - pVoiceDetails->InputChannels = This->fmt.Format.nChannels; - pVoiceDetails->InputSampleRate = This->fmt.Format.nSamplesPerSec; + FAudioVoice_GetVoiceDetails(This->faudio_voice, (FAudioVoiceDetails *)pVoiceDetails); } static HRESULT WINAPI XA2M_SetOutputVoices(IXAudio2MasteringVoice *iface, const XAUDIO2_VOICE_SENDS *pSendList) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); + FAudioVoiceSends *faudio_sends; + HRESULT hr; + TRACE("%p, %p\n", This, pSendList); - return S_OK; + + faudio_sends = wrap_voice_sends(pSendList); + + hr = FAudioVoice_SetOutputVoices(This->faudio_voice, faudio_sends); + + free_voice_sends(faudio_sends); + + return hr; } static HRESULT WINAPI XA2M_SetEffectChain(IXAudio2MasteringVoice *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); + HRESULT hr; + TRACE("%p, %p\n", This, pEffectChain); - return S_OK; + + free_effect_chain(This->effect_chain); + This->effect_chain = wrap_effect_chain(pEffectChain); + + hr = FAudioVoice_SetEffectChain(This->faudio_voice, This->effect_chain); + + return hr; } static HRESULT WINAPI XA2M_EnableEffect(IXAudio2MasteringVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %u, 0x%x\n", This, EffectIndex, OperationSet); - return S_OK; + return FAudioVoice_EnableEffect(This->faudio_voice, EffectIndex, OperationSet); } static HRESULT WINAPI XA2M_DisableEffect(IXAudio2MasteringVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %u, 0x%x\n", This, EffectIndex, OperationSet); - return S_OK; + return FAudioVoice_DisableEffect(This->faudio_voice, EffectIndex, OperationSet); } static void WINAPI XA2M_GetEffectState(IXAudio2MasteringVoice *iface, UINT32 EffectIndex, BOOL *pEnabled) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %u, %p\n", This, EffectIndex, pEnabled); + FAudioVoice_GetEffectState(This->faudio_voice, EffectIndex, (int32_t*)pEnabled); } static HRESULT WINAPI XA2M_SetEffectParameters(IXAudio2MasteringVoice *iface, UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %u, %p, 0x%x, 0x%x\n", This, EffectIndex, pParameters, ParametersByteSize, OperationSet); - return S_OK; + return FAudioVoice_SetEffectParameters(This->faudio_voice, EffectIndex, + pParameters, ParametersByteSize, OperationSet); } static HRESULT WINAPI XA2M_GetEffectParameters(IXAudio2MasteringVoice *iface, UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %u, %p, 0x%x\n", This, EffectIndex, pParameters, ParametersByteSize); - return S_OK; + return FAudioVoice_GetEffectParameters(This->faudio_voice, EffectIndex, + pParameters, ParametersByteSize); } static HRESULT WINAPI XA2M_SetFilterParameters(IXAudio2MasteringVoice *iface, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %p, 0x%x\n", This, pParameters, OperationSet); - return S_OK; + return FAudioVoice_SetFilterParameters(This->faudio_voice, (const FAudioFilterParameters *)pParameters, + OperationSet); } static void WINAPI XA2M_GetFilterParameters(IXAudio2MasteringVoice *iface, XAUDIO2_FILTER_PARAMETERS *pParameters) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %p\n", This, pParameters); + FAudioVoice_GetFilterParameters(This->faudio_voice, (FAudioFilterParameters *)pParameters); } static HRESULT WINAPI XA2M_SetOutputFilterParameters(IXAudio2MasteringVoice *iface, IXAudio2Voice *pDestinationVoice, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *dst = pDestinationVoice ? impl_from_IXAudio2Voice(pDestinationVoice) : NULL; + TRACE("%p, %p, %p, 0x%x\n", This, pDestinationVoice, pParameters, OperationSet); - return S_OK; + + return FAudioVoice_SetOutputFilterParameters(This->faudio_voice, + dst ? dst->faudio_voice : NULL, (const FAudioFilterParameters *)pParameters, OperationSet); } static void WINAPI XA2M_GetOutputFilterParameters(IXAudio2MasteringVoice *iface, IXAudio2Voice *pDestinationVoice, XAUDIO2_FILTER_PARAMETERS *pParameters) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *dst = pDestinationVoice ? impl_from_IXAudio2Voice(pDestinationVoice) : NULL; + TRACE("%p, %p, %p\n", This, pDestinationVoice, pParameters); + + FAudioVoice_GetOutputFilterParameters(This->faudio_voice, + dst ? dst->faudio_voice : NULL, (FAudioFilterParameters *)pParameters); } static HRESULT WINAPI XA2M_SetVolume(IXAudio2MasteringVoice *iface, float Volume, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %f, 0x%x\n", This, Volume, OperationSet); - return S_OK; + return FAudioVoice_SetVolume(This->faudio_voice, Volume, OperationSet); } static void WINAPI XA2M_GetVolume(IXAudio2MasteringVoice *iface, float *pVolume) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %p\n", This, pVolume); + return FAudioVoice_GetVolume(This->faudio_voice, pVolume); } static HRESULT WINAPI XA2M_SetChannelVolumes(IXAudio2MasteringVoice *iface, UINT32 Channels, const float *pVolumes, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %u, %p, 0x%x\n", This, Channels, pVolumes, OperationSet); - return S_OK; + return FAudioVoice_SetChannelVolumes(This->faudio_voice, Channels, + pVolumes, OperationSet); } static void WINAPI XA2M_GetChannelVolumes(IXAudio2MasteringVoice *iface, UINT32 Channels, float *pVolumes) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %u, %p\n", This, Channels, pVolumes); + return FAudioVoice_GetChannelVolumes(This->faudio_voice, Channels, + pVolumes); } static HRESULT WINAPI XA2M_SetOutputMatrix(IXAudio2MasteringVoice *iface, @@ -1023,60 +1261,58 @@ static HRESULT WINAPI XA2M_SetOutputMatrix(IXAudio2MasteringVoice *iface, UINT32 DestinationChannels, const float *pLevelMatrix, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *dst = pDestinationVoice ? impl_from_IXAudio2Voice(pDestinationVoice) : NULL; + TRACE("%p, %p, %u, %u, %p, 0x%x\n", This, pDestinationVoice, SourceChannels, DestinationChannels, pLevelMatrix, OperationSet); - return S_OK; + + return FAudioVoice_SetOutputMatrix(This->faudio_voice, dst ? dst->faudio_voice : NULL, + SourceChannels, DestinationChannels, pLevelMatrix, OperationSet); } static void WINAPI XA2M_GetOutputMatrix(IXAudio2MasteringVoice *iface, IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, UINT32 DestinationChannels, float *pLevelMatrix) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *dst = pDestinationVoice ? impl_from_IXAudio2Voice(pDestinationVoice) : NULL; + TRACE("%p, %p, %u, %u, %p\n", This, pDestinationVoice, SourceChannels, DestinationChannels, pLevelMatrix); + + FAudioVoice_GetOutputMatrix(This->faudio_voice, dst ? dst->faudio_voice : NULL, + SourceChannels, DestinationChannels, pLevelMatrix); } static void WINAPI XA2M_DestroyVoice(IXAudio2MasteringVoice *iface) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p\n", This); EnterCriticalSection(&This->lock); - if(!This->aclient){ - LeaveCriticalSection(&This->lock); - return; - } - - This->running = FALSE; - - IAudioRenderClient_Release(This->render); - This->render = NULL; - - IAudioClient_Release(This->aclient); - This->aclient = NULL; + destroy_voice(This); + pthread_mutex_lock(&This->engine_lock); + This->engine_params.proc = NULL; + pthread_cond_broadcast(&This->engine_ready); + pthread_mutex_unlock(&This->engine_lock); - alcDestroyContext(This->al_ctx); - This->al_ctx = NULL; - - alcCloseDevice(This->al_device); - This->al_device = NULL; + WaitForSingleObject(This->engine_thread, INFINITE); + This->engine_thread = NULL; LeaveCriticalSection(&This->lock); } -/* not present in XAudio2 2.7 */ static void WINAPI XA2M_GetChannelMask(IXAudio2MasteringVoice *iface, DWORD *pChannelMask) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); - TRACE("%p %p\n", This, pChannelMask); + TRACE("%p, %p\n", This, pChannelMask); - *pChannelMask = This->fmt.dwChannelMask; + FAudioMasteringVoice_GetChannelMask(This->faudio_voice, pChannelMask); } static const struct IXAudio2MasteringVoiceVtbl XAudio2MasteringVoice_Vtbl = { @@ -1102,190 +1338,49 @@ static const struct IXAudio2MasteringVoiceVtbl XAudio2MasteringVoice_Vtbl = { XA2M_GetChannelMask }; -static void WINAPI XA2SUB_GetVoiceDetails(IXAudio2SubmixVoice *iface, - XAUDIO2_VOICE_DETAILS *pVoiceDetails) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - - TRACE("%p, %p\n", This, pVoiceDetails); - - *pVoiceDetails = This->details; -} - -static HRESULT WINAPI XA2SUB_SetOutputVoices(IXAudio2SubmixVoice *iface, - const XAUDIO2_VOICE_SENDS *pSendList) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %p\n", This, pSendList); - return S_OK; -} - -static HRESULT WINAPI XA2SUB_SetEffectChain(IXAudio2SubmixVoice *iface, - const XAUDIO2_EFFECT_CHAIN *pEffectChain) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %p\n", This, pEffectChain); - return S_OK; -} - -static HRESULT WINAPI XA2SUB_EnableEffect(IXAudio2SubmixVoice *iface, UINT32 EffectIndex, - UINT32 OperationSet) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %u, 0x%x\n", This, EffectIndex, OperationSet); - return S_OK; -} - -static HRESULT WINAPI XA2SUB_DisableEffect(IXAudio2SubmixVoice *iface, UINT32 EffectIndex, - UINT32 OperationSet) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %u, 0x%x\n", This, EffectIndex, OperationSet); - return S_OK; -} - -static void WINAPI XA2SUB_GetEffectState(IXAudio2SubmixVoice *iface, UINT32 EffectIndex, - BOOL *pEnabled) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %u, %p\n", This, EffectIndex, pEnabled); -} - -static HRESULT WINAPI XA2SUB_SetEffectParameters(IXAudio2SubmixVoice *iface, - UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, - UINT32 OperationSet) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %u, %p, 0x%x, 0x%x\n", This, EffectIndex, pParameters, - ParametersByteSize, OperationSet); - return S_OK; -} - -static HRESULT WINAPI XA2SUB_GetEffectParameters(IXAudio2SubmixVoice *iface, - UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %u, %p, 0x%x\n", This, EffectIndex, pParameters, - ParametersByteSize); - return S_OK; -} - -static HRESULT WINAPI XA2SUB_SetFilterParameters(IXAudio2SubmixVoice *iface, - const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %p, 0x%x\n", This, pParameters, OperationSet); - return S_OK; -} - -static void WINAPI XA2SUB_GetFilterParameters(IXAudio2SubmixVoice *iface, - XAUDIO2_FILTER_PARAMETERS *pParameters) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %p\n", This, pParameters); -} - -static HRESULT WINAPI XA2SUB_SetOutputFilterParameters(IXAudio2SubmixVoice *iface, - IXAudio2Voice *pDestinationVoice, - const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %p, %p, 0x%x\n", This, pDestinationVoice, pParameters, OperationSet); - return S_OK; -} - -static void WINAPI XA2SUB_GetOutputFilterParameters(IXAudio2SubmixVoice *iface, - IXAudio2Voice *pDestinationVoice, - XAUDIO2_FILTER_PARAMETERS *pParameters) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %p, %p\n", This, pDestinationVoice, pParameters); -} - -static HRESULT WINAPI XA2SUB_SetVolume(IXAudio2SubmixVoice *iface, float Volume, - UINT32 OperationSet) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %f, 0x%x\n", This, Volume, OperationSet); - return S_OK; -} - -static void WINAPI XA2SUB_GetVolume(IXAudio2SubmixVoice *iface, float *pVolume) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %p\n", This, pVolume); -} - -static HRESULT WINAPI XA2SUB_SetChannelVolumes(IXAudio2SubmixVoice *iface, UINT32 Channels, - const float *pVolumes, UINT32 OperationSet) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %u, %p, 0x%x\n", This, Channels, pVolumes, OperationSet); - return S_OK; -} - -static void WINAPI XA2SUB_GetChannelVolumes(IXAudio2SubmixVoice *iface, UINT32 Channels, - float *pVolumes) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %u, %p\n", This, Channels, pVolumes); -} +/* More Common Voice Functions */ -static HRESULT WINAPI XA2SUB_SetOutputMatrix(IXAudio2SubmixVoice *iface, - IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, - UINT32 DestinationChannels, const float *pLevelMatrix, - UINT32 OperationSet) +static XA2VoiceImpl *impl_from_IXAudio2Voice(IXAudio2Voice *iface) { - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %p, %u, %u, %p, 0x%x\n", This, pDestinationVoice, - SourceChannels, DestinationChannels, pLevelMatrix, OperationSet); - return S_OK; + if(iface->lpVtbl == (void*)&XAudio2SourceVoice_Vtbl) + return impl_from_IXAudio2SourceVoice((IXAudio2SourceVoice*)iface); + if(iface->lpVtbl == (void*)&XAudio2MasteringVoice_Vtbl) + return impl_from_IXAudio2MasteringVoice((IXAudio2MasteringVoice*)iface); + if(iface->lpVtbl == (void*)&XAudio2SubmixVoice_Vtbl) + return impl_from_IXAudio2SubmixVoice((IXAudio2SubmixVoice*)iface); +#if XAUDIO2_VER == 0 + if(iface->lpVtbl == (void*)&XAudio20SourceVoice_Vtbl) + return impl_from_IXAudio20SourceVoice((IXAudio20SourceVoice*)iface); + if(iface->lpVtbl == (void*)&XAudio20SubmixVoice_Vtbl) + return impl_from_IXAudio20SubmixVoice((IXAudio20SubmixVoice*)iface); + if(iface->lpVtbl == (void*)&XAudio20MasteringVoice_Vtbl) + return impl_from_IXAudio20MasteringVoice((IXAudio20MasteringVoice*)iface); +#elif XAUDIO2_VER <= 3 + if(iface->lpVtbl == (void*)&XAudio23SourceVoice_Vtbl) + return impl_from_IXAudio23SourceVoice((IXAudio23SourceVoice*)iface); + if(iface->lpVtbl == (void*)&XAudio23SubmixVoice_Vtbl) + return impl_from_IXAudio23SubmixVoice((IXAudio23SubmixVoice*)iface); + if(iface->lpVtbl == (void*)&XAudio23MasteringVoice_Vtbl) + return impl_from_IXAudio23MasteringVoice((IXAudio23MasteringVoice*)iface); +#elif XAUDIO2_VER <= 7 + if(iface->lpVtbl == (void*)&XAudio27SourceVoice_Vtbl) + return impl_from_IXAudio27SourceVoice((IXAudio27SourceVoice*)iface); + if(iface->lpVtbl == (void*)&XAudio27SubmixVoice_Vtbl) + return impl_from_IXAudio27SubmixVoice((IXAudio27SubmixVoice*)iface); + if(iface->lpVtbl == (void*)&XAudio27MasteringVoice_Vtbl) + return impl_from_IXAudio27MasteringVoice((IXAudio27MasteringVoice*)iface); +#endif + ERR("invalid IXAudio2Voice pointer: %p\n", iface); + return NULL; } -static void WINAPI XA2SUB_GetOutputMatrix(IXAudio2SubmixVoice *iface, - IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, - UINT32 DestinationChannels, float *pLevelMatrix) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %p, %u, %u, %p\n", This, pDestinationVoice, - SourceChannels, DestinationChannels, pLevelMatrix); -} +/* XAudio2 Engine Implementation */ -static void WINAPI XA2SUB_DestroyVoice(IXAudio2SubmixVoice *iface) +static inline IXAudio2Impl *impl_from_IXAudio2(IXAudio2 *iface) { - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - - TRACE("%p\n", This); - - EnterCriticalSection(&This->lock); - - This->in_use = FALSE; - - LeaveCriticalSection(&This->lock); + return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio2_iface); } -static const struct IXAudio2SubmixVoiceVtbl XAudio2SubmixVoice_Vtbl = { - XA2SUB_GetVoiceDetails, - XA2SUB_SetOutputVoices, - XA2SUB_SetEffectChain, - XA2SUB_EnableEffect, - XA2SUB_DisableEffect, - XA2SUB_GetEffectState, - XA2SUB_SetEffectParameters, - XA2SUB_GetEffectParameters, - XA2SUB_SetFilterParameters, - XA2SUB_GetFilterParameters, - XA2SUB_SetOutputFilterParameters, - XA2SUB_GetOutputFilterParameters, - XA2SUB_SetVolume, - XA2SUB_GetVolume, - XA2SUB_SetChannelVolumes, - XA2SUB_GetChannelVolumes, - XA2SUB_SetOutputMatrix, - XA2SUB_GetOutputMatrix, - XA2SUB_DestroyVoice -}; - static HRESULT WINAPI IXAudio2Impl_QueryInterface(IXAudio2 *iface, REFIID riid, void **ppvObject) { @@ -1326,7 +1421,7 @@ static HRESULT WINAPI IXAudio2Impl_QueryInterface(IXAudio2 *iface, REFIID riid, static ULONG WINAPI IXAudio2Impl_AddRef(IXAudio2 *iface) { IXAudio2Impl *This = impl_from_IXAudio2(iface); - ULONG ref = InterlockedIncrement(&This->ref); + ULONG ref = FAudio_AddRef(This->faudio); TRACE("(%p)->(): Refcount now %u\n", This, ref); return ref; } @@ -1334,48 +1429,21 @@ static ULONG WINAPI IXAudio2Impl_AddRef(IXAudio2 *iface) static ULONG WINAPI IXAudio2Impl_Release(IXAudio2 *iface) { IXAudio2Impl *This = impl_from_IXAudio2(iface); - ULONG ref = InterlockedDecrement(&This->ref); + ULONG ref = FAudio_Release(This->faudio); TRACE("(%p)->(): Refcount now %u\n", This, ref); if (!ref) { - int i; - XA2SourceImpl *src, *src2; - XA2SubmixImpl *sub, *sub2; - - if(This->engine){ - This->stop_engine = TRUE; - SetEvent(This->mmevt); - WaitForSingleObject(This->engine, INFINITE); - CloseHandle(This->engine); - } - - LIST_FOR_EACH_ENTRY_SAFE(src, src2, &This->source_voices, XA2SourceImpl, entry){ - HeapFree(GetProcessHeap(), 0, src->sends); - IXAudio2SourceVoice_DestroyVoice(&src->IXAudio2SourceVoice_iface); - src->lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&src->lock); - HeapFree(GetProcessHeap(), 0, src); - } + XA2VoiceImpl *v, *v2; - LIST_FOR_EACH_ENTRY_SAFE(sub, sub2, &This->submix_voices, XA2SubmixImpl, entry){ - IXAudio2SubmixVoice_DestroyVoice(&sub->IXAudio2SubmixVoice_iface); - sub->lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&sub->lock); - HeapFree(GetProcessHeap(), 0, sub); + LIST_FOR_EACH_ENTRY_SAFE(v, v2, &This->voices, XA2VoiceImpl, entry){ + v->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&v->lock); + HeapFree(GetProcessHeap(), 0, v); } - IXAudio2MasteringVoice_DestroyVoice(&This->IXAudio2MasteringVoice_iface); - - if(This->devenum) - IMMDeviceEnumerator_Release(This->devenum); - for(i = 0; i < This->ndevs; ++i) - CoTaskMemFree(This->devids[i]); - HeapFree(GetProcessHeap(), 0, This->devids); HeapFree(GetProcessHeap(), 0, This->cbs); - CloseHandle(This->mmevt); - This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); @@ -1402,8 +1470,8 @@ static HRESULT WINAPI IXAudio2Impl_RegisterForCallbacks(IXAudio2 *iface, } } - This->ncbs *= 2; - This->cbs = HeapReAlloc(GetProcessHeap(), 0, This->cbs, This->ncbs * sizeof(*This->cbs)); + This->ncbs++; + This->cbs = heap_realloc(This->cbs, This->ncbs * sizeof(*This->cbs)); This->cbs[i] = pCallback; @@ -1422,6 +1490,11 @@ static void WINAPI IXAudio2Impl_UnregisterForCallbacks(IXAudio2 *iface, EnterCriticalSection(&This->lock); + if(This->ncbs == 0){ + LeaveCriticalSection(&This->lock); + return; + } + for(i = 0; i < This->ncbs; ++i){ if(This->cbs[i] == pCallback) break; @@ -1436,20 +1509,40 @@ static void WINAPI IXAudio2Impl_UnregisterForCallbacks(IXAudio2 *iface, LeaveCriticalSection(&This->lock); } -static WAVEFORMATEX *copy_waveformat(const WAVEFORMATEX *wfex) +static inline XA2VoiceImpl *create_voice(IXAudio2Impl *This) { - WAVEFORMATEX *pwfx; + XA2VoiceImpl *voice; - if(wfex->wFormatTag == WAVE_FORMAT_PCM){ - pwfx = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEFORMATEX)); - CopyMemory(pwfx, wfex, sizeof(PCMWAVEFORMAT)); - pwfx->cbSize = 0; - }else{ - pwfx = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEFORMATEX) + wfex->cbSize); - CopyMemory(pwfx, wfex, sizeof(WAVEFORMATEX) + wfex->cbSize); - } + voice = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*voice)); + if(!voice) + return NULL; + + list_add_head(&This->voices, &voice->entry); + + voice->IXAudio2SourceVoice_iface.lpVtbl = &XAudio2SourceVoice_Vtbl; +#if XAUDIO2_VER == 0 + voice->IXAudio20SourceVoice_iface.lpVtbl = &XAudio20SourceVoice_Vtbl; +#elif XAUDIO2_VER <= 3 + voice->IXAudio23SourceVoice_iface.lpVtbl = &XAudio23SourceVoice_Vtbl; +#elif XAUDIO2_VER <= 7 + voice->IXAudio27SourceVoice_iface.lpVtbl = &XAudio27SourceVoice_Vtbl; +#endif + + voice->IXAudio2SubmixVoice_iface.lpVtbl = &XAudio2SubmixVoice_Vtbl; +#if XAUDIO2_VER == 0 + voice->IXAudio20SubmixVoice_iface.lpVtbl = &XAudio20SubmixVoice_Vtbl; +#elif XAUDIO2_VER <= 3 + voice->IXAudio23SubmixVoice_iface.lpVtbl = &XAudio23SubmixVoice_Vtbl; +#elif XAUDIO2_VER <= 7 + voice->IXAudio27SubmixVoice_iface.lpVtbl = &XAudio27SubmixVoice_Vtbl; +#endif + + voice->FAudioVoiceCallback_vtbl = FAudioVoiceCallback_Vtbl; + + InitializeCriticalSection(&voice->lock); + voice->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": XA2VoiceImpl.lock"); - return pwfx; + return voice; } static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, @@ -1459,94 +1552,44 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { IXAudio2Impl *This = impl_from_IXAudio2(iface); - XA2SourceImpl *src; + XA2VoiceImpl *src; HRESULT hr; + FAudioVoiceSends *faudio_sends; TRACE("(%p)->(%p, %p, 0x%x, %f, %p, %p, %p)\n", This, ppSourceVoice, pSourceFormat, flags, maxFrequencyRatio, pCallback, pSendList, pEffectChain); - dump_fmt(pSourceFormat); - - palcSetThreadContext(This->al_ctx); - EnterCriticalSection(&This->lock); - LIST_FOR_EACH_ENTRY(src, &This->source_voices, XA2SourceImpl, entry){ + LIST_FOR_EACH_ENTRY(src, &This->voices, XA2VoiceImpl, entry){ EnterCriticalSection(&src->lock); if(!src->in_use) break; LeaveCriticalSection(&src->lock); } - if(&src->entry == &This->source_voices){ - src = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*src)); - if(!src){ - LeaveCriticalSection(&This->lock); - return E_OUTOFMEMORY; - } - - list_add_head(&This->source_voices, &src->entry); - - src->IXAudio2SourceVoice_iface.lpVtbl = &XAudio2SourceVoice_Vtbl; - -#if XAUDIO2_VER == 0 - src->IXAudio20SourceVoice_iface.lpVtbl = &XAudio20SourceVoice_Vtbl; -#elif XAUDIO2_VER <= 3 - src->IXAudio23SourceVoice_iface.lpVtbl = &XAudio23SourceVoice_Vtbl; -#elif XAUDIO2_VER <= 7 - src->IXAudio27SourceVoice_iface.lpVtbl = &XAudio27SourceVoice_Vtbl; -#endif - - InitializeCriticalSection(&src->lock); - src->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": XA2SourceImpl.lock"); - - src->xa2 = This; - + if(&src->entry == &This->voices){ + src = create_voice(This); EnterCriticalSection(&src->lock); } - src->in_use = TRUE; - src->running = FALSE; - LeaveCriticalSection(&This->lock); - src->cb = pCallback; - - src->al_fmt = get_al_format(pSourceFormat); - if(!src->al_fmt){ - src->in_use = FALSE; - LeaveCriticalSection(&src->lock); - WARN("OpenAL can't convert this format!\n"); - return AUDCLNT_E_UNSUPPORTED_FORMAT; - } + src->effect_chain = wrap_effect_chain(pEffectChain); + faudio_sends = wrap_voice_sends(pSendList); - src->submit_blocksize = pSourceFormat->nBlockAlign; - - src->fmt = copy_waveformat(pSourceFormat); - - hr = XA2SRC_SetOutputVoices(&src->IXAudio2SourceVoice_iface, pSendList); + hr = FAudio_CreateSourceVoice(This->faudio, &src->faudio_voice, + (FAudioWaveFormatEx*)pSourceFormat, flags, maxFrequencyRatio, + &src->FAudioVoiceCallback_vtbl, faudio_sends, + src->effect_chain); + free_voice_sends(faudio_sends); if(FAILED(hr)){ - HeapFree(GetProcessHeap(), 0, src->fmt); - src->in_use = FALSE; - LeaveCriticalSection(&src->lock); + LeaveCriticalSection(&This->lock); return hr; } - - alGenSources(1, &src->al_src); - if(!src->al_src){ - static int once = 0; - if(!once++) - ERR_(winediag)("OpenAL ran out of sources, consider increasing its source limit.\n"); - HeapFree(GetProcessHeap(), 0, src->fmt); - src->in_use = FALSE; - LeaveCriticalSection(&src->lock); - return E_OUTOFMEMORY; - } - - alGenBuffers(XAUDIO2_MAX_QUEUED_BUFFERS, src->al_bufs); - - alSourcePlay(src->al_src); + src->in_use = TRUE; + src->cb = pCallback; LeaveCriticalSection(&src->lock); @@ -1571,8 +1614,10 @@ static HRESULT WINAPI IXAudio2Impl_CreateSubmixVoice(IXAudio2 *iface, const XAUDIO2_VOICE_SENDS *pSendList, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { + HRESULT hr; IXAudio2Impl *This = impl_from_IXAudio2(iface); - XA2SubmixImpl *sub; + XA2VoiceImpl *sub; + FAudioVoiceSends *faudio_sends; TRACE("(%p)->(%p, %u, %u, 0x%x, %u, %p, %p)\n", This, ppSubmixVoice, inputChannels, inputSampleRate, flags, processingStage, pSendList, @@ -1580,46 +1625,33 @@ static HRESULT WINAPI IXAudio2Impl_CreateSubmixVoice(IXAudio2 *iface, EnterCriticalSection(&This->lock); - LIST_FOR_EACH_ENTRY(sub, &This->submix_voices, XA2SubmixImpl, entry){ + LIST_FOR_EACH_ENTRY(sub, &This->voices, XA2VoiceImpl, entry){ EnterCriticalSection(&sub->lock); if(!sub->in_use) break; LeaveCriticalSection(&sub->lock); } - if(&sub->entry == &This->submix_voices){ - sub = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*sub)); - if(!sub){ - LeaveCriticalSection(&This->lock); - return E_OUTOFMEMORY; - } - - list_add_head(&This->submix_voices, &sub->entry); - - sub->IXAudio2SubmixVoice_iface.lpVtbl = &XAudio2SubmixVoice_Vtbl; + if(&sub->entry == &This->voices){ + sub = create_voice(This); + EnterCriticalSection(&sub->lock); + } -#if XAUDIO2_VER == 0 - sub->IXAudio20SubmixVoice_iface.lpVtbl = &XAudio20SubmixVoice_Vtbl; -#elif XAUDIO2_VER <= 3 - sub->IXAudio23SubmixVoice_iface.lpVtbl = &XAudio23SubmixVoice_Vtbl; -#elif XAUDIO2_VER <= 7 - sub->IXAudio27SubmixVoice_iface.lpVtbl = &XAudio27SubmixVoice_Vtbl; -#endif + LeaveCriticalSection(&This->lock); - InitializeCriticalSection(&sub->lock); - sub->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": XA2SubmixImpl.lock"); + sub->effect_chain = wrap_effect_chain(pEffectChain); + faudio_sends = wrap_voice_sends(pSendList); - EnterCriticalSection(&sub->lock); + hr = FAudio_CreateSubmixVoice(This->faudio, &sub->faudio_voice, inputChannels, + inputSampleRate, flags, processingStage, faudio_sends, + sub->effect_chain); + free_voice_sends(faudio_sends); + if(FAILED(hr)){ + LeaveCriticalSection(&sub->lock); + return hr; } - sub->in_use = TRUE; - sub->details.CreationFlags = flags; - sub->details.ActiveFlags = flags; - sub->details.InputChannels = inputChannels; - sub->details.InputSampleRate = inputSampleRate; - - LeaveCriticalSection(&This->lock); LeaveCriticalSection(&sub->lock); #if XAUDIO2_VER == 0 @@ -1637,25 +1669,46 @@ static HRESULT WINAPI IXAudio2Impl_CreateSubmixVoice(IXAudio2 *iface, return S_OK; } -static ALenum al_get_loopback_format(const WAVEFORMATEXTENSIBLE *fmt) +/* called thread created by SDL, must not access Wine TEB */ +void engine_cb(FAudioEngineCallEXT proc, FAudio *faudio, float *stream, void *user) +{ + XA2VoiceImpl *This = user; + + pthread_mutex_lock(&This->engine_lock); + + This->engine_params.proc = proc; + This->engine_params.stream = stream; + This->engine_params.faudio = faudio; + + pthread_cond_broadcast(&This->engine_ready); + + while(This->engine_params.proc) + pthread_cond_wait(&This->engine_done, &This->engine_lock); + + pthread_mutex_unlock(&This->engine_lock); +} + +/* wine thread, OK to access TEB, invoke client code, etc */ +DWORD WINAPI engine_thread(void *user) { - if(fmt->Format.wFormatTag == WAVE_FORMAT_PCM || - (fmt->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmt->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))){ - switch(fmt->Format.wBitsPerSample){ - case 8: - return ALC_UNSIGNED_BYTE_SOFT; - case 16: - return ALC_SHORT_SOFT; - case 32: - return ALC_INT_SOFT; + XA2VoiceImpl *This = user; + + pthread_mutex_lock(&This->engine_lock); + + pthread_cond_broadcast(&This->engine_done); + + do{ + pthread_cond_wait(&This->engine_ready, &This->engine_lock); + + if(This->engine_params.proc){ + This->engine_params.proc(This->engine_params.faudio, This->engine_params.stream); + This->engine_params.proc = NULL; + pthread_cond_broadcast(&This->engine_done); } - }else if(fmt->Format.wFormatTag == WAVE_FORMAT_IEEE_FLOAT || - (fmt->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmt->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))){ - if(fmt->Format.wBitsPerSample == 32) - return ALC_FLOAT_SOFT; - } + }while(This->in_use); + + pthread_mutex_unlock(&This->engine_lock); + return 0; } @@ -1666,251 +1719,60 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, AUDIO_STREAM_CATEGORY streamCategory) { IXAudio2Impl *This = impl_from_IXAudio2(iface); - IMMDevice *dev; - HRESULT hr; - WAVEFORMATEX *fmt; - ALCint attrs[11]; - REFERENCE_TIME period, bufdur; TRACE("(%p)->(%p, %u, %u, 0x%x, %s, %p, 0x%x)\n", This, ppMasteringVoice, inputChannels, inputSampleRate, flags, wine_dbgstr_w(deviceId), pEffectChain, streamCategory); - if(flags != 0) - WARN("Unknown flags set: 0x%x\n", flags); - - if(pEffectChain) - WARN("Effect chain is unimplemented\n"); - EnterCriticalSection(&This->lock); - /* there can only be one Mastering Voice, so just build it into XA2 */ - if(This->aclient){ - LeaveCriticalSection(&This->lock); - return COMPAT_E_INVALID_CALL; - } - - if(!deviceId){ - if(This->ndevs == 0){ - LeaveCriticalSection(&This->lock); - return E_NOTFOUND; - } - deviceId = This->devids[0]; - } - - hr = IMMDeviceEnumerator_GetDevice(This->devenum, deviceId, &dev); - if(FAILED(hr)){ - WARN("GetDevice failed: %08x\n", hr); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } - - hr = IMMDevice_Activate(dev, &IID_IAudioClient, - CLSCTX_INPROC_SERVER, NULL, (void**)&This->aclient); - if(FAILED(hr)){ - WARN("Activate(IAudioClient) failed: %08x\n", hr); - IMMDevice_Release(dev); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } - - IMMDevice_Release(dev); - - hr = IAudioClient_GetMixFormat(This->aclient, &fmt); - if(FAILED(hr)){ - WARN("GetMixFormat failed: %08x\n", hr); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } - - if(sizeof(WAVEFORMATEX) + fmt->cbSize > sizeof(WAVEFORMATEXTENSIBLE)){ - FIXME("Mix format doesn't fit into WAVEFORMATEXTENSIBLE!\n"); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } - - if(inputChannels == XAUDIO2_DEFAULT_CHANNELS) - inputChannels = fmt->nChannels; - if(inputSampleRate == XAUDIO2_DEFAULT_SAMPLERATE) - inputSampleRate = fmt->nSamplesPerSec; - - memcpy(&This->fmt, fmt, sizeof(WAVEFORMATEX) + fmt->cbSize); - This->fmt.Format.nChannels = inputChannels; - This->fmt.Format.nSamplesPerSec = inputSampleRate; - This->fmt.Format.nBlockAlign = This->fmt.Format.nChannels * This->fmt.Format.wBitsPerSample / 8; - This->fmt.Format.nAvgBytesPerSec = This->fmt.Format.nSamplesPerSec * This->fmt.Format.nBlockAlign; - This->fmt.dwChannelMask = get_channel_mask(This->fmt.Format.nChannels); - - CoTaskMemFree(fmt); - fmt = NULL; - - hr = IAudioClient_IsFormatSupported(This->aclient, - AUDCLNT_SHAREMODE_SHARED, &This->fmt.Format, &fmt); - if(hr == S_FALSE){ - if(sizeof(WAVEFORMATEX) + fmt->cbSize > sizeof(WAVEFORMATEXTENSIBLE)){ - FIXME("Mix format doesn't fit into WAVEFORMATEXTENSIBLE!\n"); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } - memcpy(&This->fmt, fmt, sizeof(WAVEFORMATEX) + fmt->cbSize); - } - - CoTaskMemFree(fmt); - - hr = IAudioClient_GetDevicePeriod(This->aclient, &period, NULL); - if(FAILED(hr)){ - WARN("GetDevicePeriod failed: %08x\n", hr); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } - - /* 3 periods or 0.1 seconds */ - bufdur = max(3 * period, 1000000); + /* Note that we don't have paths for each XAUDIO2_VER here. + * All versions < 8 have a very different CreateMasteringVoice, so we + * implement those separately in compat.c. + * -flibit + */ + *ppMasteringVoice = &This->mst.IXAudio2MasteringVoice_iface; - hr = IAudioClient_Initialize(This->aclient, AUDCLNT_SHAREMODE_SHARED, - AUDCLNT_STREAMFLAGS_EVENTCALLBACK, bufdur, - 0, &This->fmt.Format, NULL); - if(FAILED(hr)){ - WARN("Initialize failed: %08x\n", hr); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } - - This->period_frames = MulDiv(period, inputSampleRate, 10000000); - - hr = IAudioClient_SetEventHandle(This->aclient, This->mmevt); - if(FAILED(hr)){ - WARN("Initialize failed: %08x\n", hr); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } - - hr = IAudioClient_GetService(This->aclient, &IID_IAudioRenderClient, - (void**)&This->render); - if(FAILED(hr)){ - WARN("GetService(IAudioRenderClient) failed: %08x\n", hr); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } + EnterCriticalSection(&This->mst.lock); - /* setup openal context */ - attrs[0] = ALC_FORMAT_CHANNELS_SOFT; - switch(inputChannels){ - case 1: - attrs[1] = ALC_MONO_SOFT; - break; - case 2: - attrs[1] = ALC_STEREO_SOFT; - break; - case 4: - attrs[1] = ALC_QUAD_SOFT; - break; - case 6: - attrs[1] = ALC_5POINT1_SOFT; - break; - case 7: - attrs[1] = ALC_6POINT1_SOFT; - break; - case 8: - attrs[1] = ALC_7POINT1_SOFT; - break; - default: - WARN("OpenAL doesn't support %u channels\n", inputChannels); + if(This->mst.in_use){ + LeaveCriticalSection(&This->mst.lock); LeaveCriticalSection(&This->lock); - return AUDCLNT_E_UNSUPPORTED_FORMAT; + return COMPAT_E_INVALID_CALL; } - attrs[2] = ALC_FREQUENCY; - attrs[3] = inputSampleRate; - - attrs[4] = ALC_FORMAT_TYPE_SOFT; - attrs[5] = al_get_loopback_format(&This->fmt); + LeaveCriticalSection(&This->lock); - /* some games create very many sources */ - attrs[6] = ALC_STEREO_SOURCES; - attrs[7] = 1024; - attrs[8] = ALC_MONO_SOURCES; - attrs[9] = 1024; + This->mst.effect_chain = wrap_effect_chain(pEffectChain); - attrs[10] = 0; + pthread_mutex_lock(&This->mst.engine_lock); - if(!attrs[5]){ - WARN("OpenAL can't output samples in this format\n"); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } + This->mst.engine_thread = CreateThread(NULL, 0, &engine_thread, &This->mst, 0, NULL); - This->al_device = palcLoopbackOpenDeviceSOFT(NULL); - if(!This->al_device){ - WARN("alcLoopbackOpenDeviceSOFT failed\n"); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } + pthread_cond_wait(&This->mst.engine_done, &This->mst.engine_lock); - This->al_ctx = alcCreateContext(This->al_device, attrs); - if(!This->al_ctx){ - WARN("alcCreateContext failed\n"); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } + pthread_mutex_unlock(&This->mst.engine_lock); - hr = IAudioClient_Start(This->aclient); - if (FAILED(hr)) - { - WARN("Start(IAudioClient) failed: %08x\n", hr); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } + FAudio_SetEngineProcedureEXT(This->faudio, &engine_cb, &This->mst); -#if XAUDIO2_VER == 0 - *ppMasteringVoice = (IXAudio2MasteringVoice*)&This->IXAudio20MasteringVoice_iface; -#elif XAUDIO2_VER <= 3 - *ppMasteringVoice = (IXAudio2MasteringVoice*)&This->IXAudio23MasteringVoice_iface; -#elif XAUDIO2_VER <= 7 - *ppMasteringVoice = (IXAudio2MasteringVoice*)&This->IXAudio27MasteringVoice_iface; -#else - *ppMasteringVoice = &This->IXAudio2MasteringVoice_iface; -#endif + FAudio_CreateMasteringVoice8(This->faudio, &This->mst.faudio_voice, inputChannels, + inputSampleRate, flags, NULL /* TODO: (uint16_t*)deviceId */, + This->mst.effect_chain, (FAudioStreamCategory)streamCategory); -exit: - if(FAILED(hr)){ - if(This->render){ - IAudioRenderClient_Release(This->render); - This->render = NULL; - } - if(This->aclient){ - IAudioClient_Release(This->aclient); - This->aclient = NULL; - } - if(This->al_ctx){ - alcDestroyContext(This->al_ctx); - This->al_ctx = NULL; - } - if(This->al_device){ - alcCloseDevice(This->al_device); - This->al_device = NULL; - } - } + This->mst.in_use = TRUE; - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&This->mst.lock); - return hr; + return S_OK; } -static DWORD WINAPI engine_threadproc(void *arg); - static HRESULT WINAPI IXAudio2Impl_StartEngine(IXAudio2 *iface) { IXAudio2Impl *This = impl_from_IXAudio2(iface); TRACE("(%p)->()\n", This); - This->running = TRUE; - - if(!This->engine) - This->engine = CreateThread(NULL, 0, engine_threadproc, This, 0, NULL); - - return S_OK; + return FAudio_StartEngine(This->faudio); } static void WINAPI IXAudio2Impl_StopEngine(IXAudio2 *iface) @@ -1919,7 +1781,7 @@ static void WINAPI IXAudio2Impl_StopEngine(IXAudio2 *iface) TRACE("(%p)->()\n", This); - This->running = FALSE; + FAudio_StopEngine(This->faudio); } static HRESULT WINAPI IXAudio2Impl_CommitChanges(IXAudio2 *iface, @@ -1929,7 +1791,7 @@ static HRESULT WINAPI IXAudio2Impl_CommitChanges(IXAudio2 *iface, TRACE("(%p)->(0x%x): stub!\n", This, operationSet); - return E_NOTIMPL; + return FAudio_CommitChanges(This->faudio); } static void WINAPI IXAudio2Impl_GetPerformanceData(IXAudio2 *iface, @@ -1939,7 +1801,7 @@ static void WINAPI IXAudio2Impl_GetPerformanceData(IXAudio2 *iface, TRACE("(%p)->(%p): stub!\n", This, pPerfData); - memset(pPerfData, 0, sizeof(*pPerfData)); + FAudio_GetPerformanceData(This->faudio, (FAudioPerformanceData *)pPerfData); } static void WINAPI IXAudio2Impl_SetDebugConfiguration(IXAudio2 *iface, @@ -1948,7 +1810,9 @@ static void WINAPI IXAudio2Impl_SetDebugConfiguration(IXAudio2 *iface, { IXAudio2Impl *This = impl_from_IXAudio2(iface); - FIXME("(%p)->(%p, %p): stub!\n", This, pDebugConfiguration, pReserved); + TRACE("(%p)->(%p, %p): stub!\n", This, pDebugConfiguration, pReserved); + + FAudio_SetDebugConfiguration(This->faudio, (FAudioDebugConfiguration *)pDebugConfiguration, pReserved); } /* XAudio2 2.8 */ @@ -1969,6 +1833,8 @@ static const IXAudio2Vtbl XAudio2_Vtbl = IXAudio2Impl_SetDebugConfiguration }; +/* XAudio2 ClassFactory */ + struct xaudio2_cf { IClassFactory IClassFactory_iface; LONG ref; @@ -2012,79 +1878,6 @@ static ULONG WINAPI XAudio2CF_Release(IClassFactory *iface) return ref; } -static HRESULT initialize_mmdevices(IXAudio2Impl *This) -{ - IMMDeviceCollection *devcoll; - UINT devcount; - HRESULT hr; - - if(!This->devenum){ - hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, - CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&This->devenum); - if(FAILED(hr)) - return hr; - } - - hr = IMMDeviceEnumerator_EnumAudioEndpoints(This->devenum, eRender, - DEVICE_STATE_ACTIVE, &devcoll); - if(FAILED(hr)){ - return hr; - } - - hr = IMMDeviceCollection_GetCount(devcoll, &devcount); - if(FAILED(hr)){ - IMMDeviceCollection_Release(devcoll); - return hr; - } - - if(devcount > 0){ - UINT i, count = 1; - IMMDevice *dev, *def_dev; - - /* make sure that device 0 is the default device */ - IMMDeviceEnumerator_GetDefaultAudioEndpoint(This->devenum, eRender, eConsole, &def_dev); - - This->devids = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *) * devcount); - - for(i = 0; i < devcount; ++i){ - hr = IMMDeviceCollection_Item(devcoll, i, &dev); - if(SUCCEEDED(hr)){ - UINT idx; - - if(dev == def_dev) - idx = 0; - else{ - idx = count; - ++count; - } - - hr = IMMDevice_GetId(dev, &This->devids[idx]); - if(FAILED(hr)){ - WARN("GetId failed: %08x\n", hr); - HeapFree(GetProcessHeap(), 0, This->devids); - This->devids = NULL; - IMMDevice_Release(dev); - return hr; - } - - IMMDevice_Release(dev); - }else{ - WARN("Item failed: %08x\n", hr); - HeapFree(GetProcessHeap(), 0, This->devids); - This->devids = NULL; - IMMDeviceCollection_Release(devcoll); - return hr; - } - } - } - - IMMDeviceCollection_Release(devcoll); - - This->ndevs = devcount; - - return S_OK; -} - static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, REFIID riid, void **ppobj) { @@ -2104,7 +1897,6 @@ static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *p return E_OUTOFMEMORY; object->IXAudio2_iface.lpVtbl = &XAudio2_Vtbl; - object->IXAudio2MasteringVoice_iface.lpVtbl = &XAudio2MasteringVoice_Vtbl; #if XAUDIO2_VER == 0 object->IXAudio20_iface.lpVtbl = &XAudio20_Vtbl; @@ -2114,38 +1906,48 @@ static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *p object->IXAudio27_iface.lpVtbl = &XAudio27_Vtbl; #endif + object->mst.IXAudio2MasteringVoice_iface.lpVtbl = &XAudio2MasteringVoice_Vtbl; + #if XAUDIO2_VER == 0 - object->IXAudio20MasteringVoice_iface.lpVtbl = &XAudio20MasteringVoice_Vtbl; + object->mst.IXAudio20MasteringVoice_iface.lpVtbl = &XAudio20MasteringVoice_Vtbl; #elif XAUDIO2_VER <= 3 - object->IXAudio23MasteringVoice_iface.lpVtbl = &XAudio23MasteringVoice_Vtbl; + object->mst.IXAudio23MasteringVoice_iface.lpVtbl = &XAudio23MasteringVoice_Vtbl; #elif XAUDIO2_VER <= 7 - object->IXAudio27MasteringVoice_iface.lpVtbl = &XAudio27MasteringVoice_Vtbl; + object->mst.IXAudio27MasteringVoice_iface.lpVtbl = &XAudio27MasteringVoice_Vtbl; #endif - list_init(&object->source_voices); - list_init(&object->submix_voices); + object->FAudioEngineCallback_vtbl = FAudioEngineCallback_Vtbl; + + list_init(&object->voices); - object->mmevt = CreateEventW(NULL, FALSE, FALSE, NULL); InitializeCriticalSection(&object->lock); object->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IXAudio2Impl.lock"); + InitializeCriticalSection(&object->mst.lock); + object->mst.lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": XA2MasteringVoice.lock"); + + pthread_mutex_init(&object->mst.engine_lock, NULL); + pthread_cond_init(&object->mst.engine_done, NULL); + pthread_cond_init(&object->mst.engine_ready, NULL); + + FAudioCOMConstructWithCustomAllocatorEXT( + &object->faudio, + XAUDIO2_VER, + XAudio_Internal_Malloc, + XAudio_Internal_Free, + XAudio_Internal_Realloc + ); + + FAudio_RegisterForCallbacks(object->faudio, &object->FAudioEngineCallback_vtbl); + hr = IXAudio2_QueryInterface(&object->IXAudio2_iface, riid, ppobj); if(FAILED(hr)){ + object->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&object->lock); HeapFree(GetProcessHeap(), 0, object); return hr; } - hr = initialize_mmdevices(object); - if(FAILED(hr)){ - IUnknown_Release((IUnknown*)*ppobj); - return hr; - } - - object->ncbs = 4; - object->cbs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, object->ncbs * sizeof(*object->cbs)); - - IXAudio2_StartEngine(&object->IXAudio2_iface); - TRACE("Created XAudio version %u: %p\n", 20 + XAUDIO2_VER, object); return hr; @@ -2167,7 +1969,9 @@ static const IClassFactoryVtbl XAudio2CF_Vtbl = XAudio2CF_LockServer }; -static HRESULT make_xaudio2_factory(REFIID riid, void **ppv) +/* Engine Generators */ + +static inline HRESULT make_xaudio2_factory(REFIID riid, void **ppv) { HRESULT hr; struct xaudio2_cf *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct xaudio2_cf)); @@ -2179,6 +1983,13 @@ static HRESULT make_xaudio2_factory(REFIID riid, void **ppv) return hr; } +HRESULT xaudio2_initialize(IXAudio2Impl *This, UINT32 flags, XAUDIO2_PROCESSOR proc) +{ + if(proc != XAUDIO2_ANY_PROCESSOR) + WARN("Processor affinity not implemented in FAudio\n"); + return FAudio_Initialize(This->faudio, flags, FAUDIO_DEFAULT_PROCESSOR); +} + HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); @@ -2211,18 +2022,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) IsEqualGUID(rclsid, &CLSID_AudioReverb25) || IsEqualGUID(rclsid, &CLSID_AudioReverb26) || IsEqualGUID(rclsid, &CLSID_AudioReverb27)) - return make_xapo_factory(&CLSID_FXReverb, riid, ppv); + return make_xapo_factory(&CLSID_AudioReverb27, riid, ppv); return CLASS_E_CLASSNOTAVAILABLE; } -HRESULT xaudio2_initialize(IXAudio2Impl *This, UINT32 flags, XAUDIO2_PROCESSOR proc) -{ - if(flags) - FIXME("Unimplemented flags: 0x%x\n", flags); - return S_OK; -} - #if XAUDIO2_VER >= 8 HRESULT WINAPI XAudio2Create(IXAudio2 **ppxa2, UINT32 flags, XAUDIO2_PROCESSOR proc) { @@ -2251,284 +2055,36 @@ HRESULT WINAPI XAudio2Create(IXAudio2 **ppxa2, UINT32 flags, XAUDIO2_PROCESSOR p return S_OK; } -#endif /* XAUDIO2_VER >= 8 */ - -/* returns TRUE if there is more data available in the buffer, FALSE if the - * buffer's data has all been queued */ -static BOOL xa2buffer_queue_period(XA2SourceImpl *src, XA2Buffer *buf, ALuint al_buf) -{ - UINT32 submit_bytes; - const BYTE *submit_buf = NULL; - - if(buf->offs_bytes >= buf->cur_end_bytes){ - WARN("Shouldn't happen: Trying to push frames from a spent buffer?\n"); - return FALSE; - } - - submit_bytes = min(src->xa2->period_frames * src->submit_blocksize, buf->cur_end_bytes - buf->offs_bytes); - submit_buf = buf->xa2buffer.pAudioData + buf->offs_bytes; - buf->offs_bytes += submit_bytes; - - alBufferData(al_buf, src->al_fmt, submit_buf, submit_bytes, - src->fmt->nSamplesPerSec); - - alSourceQueueBuffers(src->al_src, 1, &al_buf); - - src->in_al_bytes += submit_bytes; - src->al_bufs_used++; - - buf->latest_al_buf = al_buf; - - TRACE("queueing %u bytes, now %u in AL\n", submit_bytes, src->in_al_bytes); - - return buf->offs_bytes < buf->cur_end_bytes; -} - -#if XAUDIO2_VER > 0 -static UINT32 get_underrun_warning(XA2SourceImpl *src) -{ - UINT32 period_bytes = src->xa2->period_frames * src->submit_blocksize; - UINT32 total = 0, i; - - for(i = 0; i < src->nbufs && total < IN_AL_PERIODS * period_bytes; ++i){ - XA2Buffer *buf = &src->buffers[(src->first_buf + i) % XAUDIO2_MAX_QUEUED_BUFFERS]; - total += buf->cur_end_bytes - buf->offs_bytes; - if(buf->xa2buffer.LoopCount == XAUDIO2_LOOP_INFINITE) - return 0; - if(buf->xa2buffer.LoopCount > 0){ - total += (buf->loop_end_bytes - buf->xa2buffer.LoopBegin) * (buf->xa2buffer.LoopCount - buf->looped); - total += buf->play_end_bytes - buf->loop_end_bytes; - } - } - - if(total >= IN_AL_PERIODS * period_bytes) - return 0; - - return ((IN_AL_PERIODS * period_bytes - total) / period_bytes + 1) * period_bytes; -} -#endif - -/* Looping: - * - * The looped section of a buffer is a subset of the play area which is looped - * LoopCount times. - * - * v PlayBegin - * vvvvvvvvvvvvvvvvvv PlayLength - * v (PlayEnd) - * [-----PPPLLLLLLLLPPPPPPP------] - * ^ LoopBegin - * ^^^^^^^^ LoopLength - * ^ (LoopEnd) - * - * In the simple case, playback will start at PlayBegin. At LoopEnd, playback - * will move to LoopBegin and repeat that loop LoopCount times. Then, playback - * will cease at PlayEnd. - * - * If PlayLength is zero, then PlayEnd is the end of the buffer. - * - * If LoopLength is zero, then LoopEnd is PlayEnd. - * - * For corner cases and version differences, see tests. - */ -static void update_source_state(XA2SourceImpl *src) -{ - int i; - ALint processed; - ALint bufpos; - - alGetSourcei(src->al_src, AL_BUFFERS_PROCESSED, &processed); - - if(processed > 0){ - ALuint al_buffers[XAUDIO2_MAX_QUEUED_BUFFERS]; - - alSourceUnqueueBuffers(src->al_src, processed, al_buffers); - - src->first_al_buf += processed; - src->first_al_buf %= XAUDIO2_MAX_QUEUED_BUFFERS; - src->al_bufs_used -= processed; - - for(i = 0; i < processed; ++i){ - ALint bufsize; - - alGetBufferi(al_buffers[i], AL_SIZE, &bufsize); - - src->in_al_bytes -= bufsize; - - if(src->abandoned_albufs == 0){ - src->played_frames += bufsize / src->submit_blocksize; - - if(al_buffers[i] == src->buffers[src->first_buf].latest_al_buf){ - DWORD old_buf = src->first_buf; - - src->first_buf++; - src->first_buf %= XAUDIO2_MAX_QUEUED_BUFFERS; - src->nbufs--; - - TRACE("%p: done with buffer %u\n", src, old_buf); - - if(src->buffers[old_buf].xa2buffer.Flags & XAUDIO2_END_OF_STREAM) - src->played_frames = 0; - - if(src->cb){ - IXAudio2VoiceCallback_OnBufferEnd(src->cb, - src->buffers[old_buf].xa2buffer.pContext); - if(src->buffers[old_buf].xa2buffer.Flags & XAUDIO2_END_OF_STREAM) - IXAudio2VoiceCallback_OnStreamEnd(src->cb); - - if(src->nbufs > 0) - IXAudio2VoiceCallback_OnBufferStart(src->cb, - src->buffers[src->first_buf].xa2buffer.pContext); - } - } - }else{ - src->abandoned_albufs--; - } - } - } - - if(!src->running) - return; - - alGetSourcei(src->al_src, AL_BYTE_OFFSET, &bufpos); - - /* maintain IN_AL_PERIODS periods in AL */ - while(src->cur_buf != (src->first_buf + src->nbufs) % XAUDIO2_MAX_QUEUED_BUFFERS && - src->in_al_bytes - bufpos < IN_AL_PERIODS * src->xa2->period_frames * src->submit_blocksize){ - TRACE("%p: going to queue a period from buffer %u\n", src, src->cur_buf); - - /* starting from an empty buffer */ - if(src->cb && src->cur_buf == src->first_buf && src->buffers[src->cur_buf].offs_bytes == 0 && !src->buffers[src->cur_buf].looped) - IXAudio2VoiceCallback_OnBufferStart(src->cb, - src->buffers[src->first_buf].xa2buffer.pContext); - - if(!xa2buffer_queue_period(src, &src->buffers[src->cur_buf], - src->al_bufs[(src->first_al_buf + src->al_bufs_used) % XAUDIO2_MAX_QUEUED_BUFFERS])){ - XA2Buffer *cur = &src->buffers[src->cur_buf]; - - if(cur->looped < cur->xa2buffer.LoopCount){ - if(cur->xa2buffer.LoopCount != XAUDIO2_LOOP_INFINITE) - ++cur->looped; - else - cur->looped = 1; /* indicate that we are executing a loop */ - - cur->offs_bytes = cur->xa2buffer.LoopBegin; - if(cur->looped == cur->xa2buffer.LoopCount) - cur->cur_end_bytes = cur->play_end_bytes; - else - cur->cur_end_bytes = cur->loop_end_bytes; - - if(src->cb) - IXAudio2VoiceCallback_OnLoopEnd(src->cb, - src->buffers[src->cur_buf].xa2buffer.pContext); - - }else{ - /* buffer is spent, move on */ - src->cur_buf++; - src->cur_buf %= XAUDIO2_MAX_QUEUED_BUFFERS; - } - } - } -} -static void do_engine_tick(IXAudio2Impl *This) +HRESULT WINAPI CreateAudioVolumeMeter(IUnknown **out) { - BYTE *buf; - XA2SourceImpl *src; + IClassFactory *cf; HRESULT hr; - UINT32 nframes, i, pad; - - /* maintain up to 3 periods in mmdevapi */ - hr = IAudioClient_GetCurrentPadding(This->aclient, &pad); - if(FAILED(hr)){ - WARN("GetCurrentPadding failed: 0x%x\n", hr); - return; - } - - nframes = This->period_frames * 3 - pad; - - TRACE("frames available: %u\n", nframes); - - if(nframes < This->period_frames) - return; - - if(!nframes) - return; - - for(i = 0; i < This->ncbs && This->cbs[i]; ++i) - IXAudio2EngineCallback_OnProcessingPassStart(This->cbs[i]); - - LIST_FOR_EACH_ENTRY(src, &This->source_voices, XA2SourceImpl, entry){ - ALint st = 0; - - EnterCriticalSection(&src->lock); - - if(!src->in_use){ - LeaveCriticalSection(&src->lock); - continue; - } - - if(src->cb && This->running){ -#if XAUDIO2_VER == 0 - IXAudio20VoiceCallback_OnVoiceProcessingPassStart((IXAudio20VoiceCallback*)src->cb); -#else - UINT32 underrun; - underrun = get_underrun_warning(src); - if(underrun > 0) - TRACE("Calling OnVoiceProcessingPassStart with BytesRequired: %u\n", underrun); - IXAudio2VoiceCallback_OnVoiceProcessingPassStart(src->cb, underrun); -#endif - } - - update_source_state(src); - - if(This->running){ - alGetSourcei(src->al_src, AL_SOURCE_STATE, &st); - if(st != AL_PLAYING) - alSourcePlay(src->al_src); - - if(src->cb) - IXAudio2VoiceCallback_OnVoiceProcessingPassEnd(src->cb); - } - LeaveCriticalSection(&src->lock); - } - - hr = IAudioRenderClient_GetBuffer(This->render, nframes, &buf); + hr = make_xapo_factory(&CLSID_AudioVolumeMeter27, &IID_IClassFactory, (void**)&cf); if(FAILED(hr)) - WARN("GetBuffer failed: %08x\n", hr); + return hr; - palcRenderSamplesSOFT(This->al_device, buf, nframes); + hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out); - hr = IAudioRenderClient_ReleaseBuffer(This->render, nframes, 0); - if(FAILED(hr)) - WARN("ReleaseBuffer failed: %08x\n", hr); + IClassFactory_Release(cf); - for(i = 0; i < This->ncbs && This->cbs[i]; ++i) - IXAudio2EngineCallback_OnProcessingPassEnd(This->cbs[i]); + return hr; } -static DWORD WINAPI engine_threadproc(void *arg) +HRESULT WINAPI CreateAudioReverb(IUnknown **out) { - IXAudio2Impl *This = arg; - while(1){ - WaitForSingleObject(This->mmevt, INFINITE); - - if(This->stop_engine) - break; - - EnterCriticalSection(&This->lock); + IClassFactory *cf; + HRESULT hr; - if(!This->running || !This->aclient){ - LeaveCriticalSection(&This->lock); - continue; - } + hr = make_xapo_factory(&CLSID_AudioReverb27, &IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr; - palcSetThreadContext(This->al_ctx); + hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out); - do_engine_tick(This); + IClassFactory_Release(cf); - LeaveCriticalSection(&This->lock); - } - return 0; + return hr; } +#endif /* XAUDIO2_VER >= 8 */ diff --git a/dlls/xaudio2_7/xaudio_private.h b/dlls/xaudio2_7/xaudio_private.h index 5d3814fb9e..84bab8257d 100644 --- a/dlls/xaudio2_7/xaudio_private.h +++ b/dlls/xaudio2_7/xaudio_private.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2015 Andrew Eikum for CodeWeavers + * Copyright (c) 2018 Ethan Lee for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,33 +18,42 @@ */ #include "windef.h" -#include "winbase.h" -#include "winuser.h" #include "wine/list.h" -#include "mmsystem.h" #include "xaudio2.h" -#include "xaudio2fx.h" #include "xapo.h" -#include "devpkey.h" -#include "mmdeviceapi.h" -#include "audioclient.h" -#include <AL/al.h> -#include <AL/alc.h> -#include <AL/alext.h> +#include <FAudio.h> +#include <FAPO.h> -typedef struct _XA2Buffer { - XAUDIO2_BUFFER xa2buffer; - DWORD offs_bytes; - UINT32 latest_al_buf, looped, loop_end_bytes, play_end_bytes, cur_end_bytes; -} XA2Buffer; +#include <pthread.h> -typedef struct _IXAudio2Impl IXAudio2Impl; +#if XAUDIO2_VER == 0 +#define COMPAT_E_INVALID_CALL E_INVALIDARG +#define COMPAT_E_DEVICE_INVALIDATED XAUDIO20_E_DEVICE_INVALIDATED +#else +#define COMPAT_E_INVALID_CALL XAUDIO2_E_INVALID_CALL +#define COMPAT_E_DEVICE_INVALIDATED XAUDIO2_E_DEVICE_INVALIDATED +#endif -typedef struct _XA2SourceImpl { - IXAudio2SourceVoice IXAudio2SourceVoice_iface; +typedef struct _XA2XAPOImpl { + IXAPO *xapo; + IXAPOParameters *xapo_params; + + LONG ref; + + FAPO FAPO_vtbl; +} XA2XAPOImpl; + +typedef struct _XA2XAPOFXImpl { + IXAPO IXAPO_iface; + IXAPOParameters IXAPOParameters_iface; + + FAPO *fapo; +} XA2XAPOFXImpl; +typedef struct _XA2VoiceImpl { + IXAudio2SourceVoice IXAudio2SourceVoice_iface; #if XAUDIO2_VER == 0 IXAudio20SourceVoice IXAudio20SourceVoice_iface; #elif XAUDIO2_VER <= 3 @@ -52,43 +62,7 @@ typedef struct _XA2SourceImpl { IXAudio27SourceVoice IXAudio27SourceVoice_iface; #endif - IXAudio2Impl *xa2; - - BOOL in_use; - - CRITICAL_SECTION lock; - - WAVEFORMATEX *fmt; - ALenum al_fmt; - UINT32 submit_blocksize; - - IXAudio2VoiceCallback *cb; - - DWORD nsends; - XAUDIO2_SEND_DESCRIPTOR *sends; - - BOOL running; - - UINT64 played_frames; - - XA2Buffer buffers[XAUDIO2_MAX_QUEUED_BUFFERS]; - UINT32 first_buf, cur_buf, nbufs, in_al_bytes; - - UINT32 scratch_bytes, convert_bytes; - BYTE *scratch_buf, *convert_buf; - - ALuint al_src; - /* most cases will only need about 4 AL buffers, but some corner cases - * could require up to MAX_QUEUED_BUFFERS */ - ALuint al_bufs[XAUDIO2_MAX_QUEUED_BUFFERS]; - DWORD first_al_buf, al_bufs_used, abandoned_albufs; - - struct list entry; -} XA2SourceImpl; - -typedef struct _XA2SubmixImpl { IXAudio2SubmixVoice IXAudio2SubmixVoice_iface; - #if XAUDIO2_VER == 0 IXAudio20SubmixVoice IXAudio20SubmixVoice_iface; #elif XAUDIO2_VER <= 3 @@ -97,18 +71,41 @@ typedef struct _XA2SubmixImpl { IXAudio27SubmixVoice IXAudio27SubmixVoice_iface; #endif - BOOL in_use; + IXAudio2MasteringVoice IXAudio2MasteringVoice_iface; +#if XAUDIO2_VER == 0 + IXAudio20MasteringVoice IXAudio20MasteringVoice_iface; +#elif XAUDIO2_VER <= 3 + IXAudio23MasteringVoice IXAudio23MasteringVoice_iface; +#elif XAUDIO2_VER <= 7 + IXAudio27MasteringVoice IXAudio27MasteringVoice_iface; +#endif - XAUDIO2_VOICE_DETAILS details; + FAudioVoiceCallback FAudioVoiceCallback_vtbl; + FAudioEffectChain *effect_chain; + + BOOL in_use; CRITICAL_SECTION lock; + IXAudio2VoiceCallback *cb; + + FAudioVoice *faudio_voice; + + struct { + FAudioEngineCallEXT proc; + FAudio *faudio; + float *stream; + } engine_params; + + HANDLE engine_thread; + pthread_cond_t engine_done, engine_ready; + pthread_mutex_t engine_lock; + struct list entry; -} XA2SubmixImpl; +} XA2VoiceImpl; -struct _IXAudio2Impl { +typedef struct _IXAudio2Impl { IXAudio2 IXAudio2_iface; - IXAudio2MasteringVoice IXAudio2MasteringVoice_iface; #if XAUDIO2_VER == 0 IXAudio20 IXAudio20_iface; @@ -118,59 +115,43 @@ struct _IXAudio2Impl { IXAudio27 IXAudio27_iface; #endif -#if XAUDIO2_VER == 0 - IXAudio20MasteringVoice IXAudio20MasteringVoice_iface; -#elif XAUDIO2_VER <= 3 - IXAudio23MasteringVoice IXAudio23MasteringVoice_iface; -#elif XAUDIO2_VER <= 7 - IXAudio27MasteringVoice IXAudio27MasteringVoice_iface; -#endif - - LONG ref; - CRITICAL_SECTION lock; - HANDLE engine, mmevt; - BOOL stop_engine; - - struct list source_voices; - struct list submix_voices; - - IMMDeviceEnumerator *devenum; + struct list voices; - WCHAR **devids; - UINT32 ndevs; + FAudio *faudio; - UINT32 last_query_glitches; + FAudioEngineCallback FAudioEngineCallback_vtbl; - IAudioClient *aclient; - IAudioRenderClient *render; + XA2VoiceImpl mst; - UINT32 period_frames; - - WAVEFORMATEXTENSIBLE fmt; - - ALCdevice *al_device; - ALCcontext *al_ctx; + DWORD last_query_glitches; UINT32 ncbs; IXAudio2EngineCallback **cbs; - - BOOL running; -}; +} IXAudio2Impl; #if XAUDIO2_VER == 0 extern const IXAudio20SourceVoiceVtbl XAudio20SourceVoice_Vtbl DECLSPEC_HIDDEN; extern const IXAudio20SubmixVoiceVtbl XAudio20SubmixVoice_Vtbl DECLSPEC_HIDDEN; extern const IXAudio20MasteringVoiceVtbl XAudio20MasteringVoice_Vtbl DECLSPEC_HIDDEN; +extern XA2VoiceImpl *impl_from_IXAudio20SourceVoice(IXAudio20SourceVoice *iface) DECLSPEC_HIDDEN; +extern XA2VoiceImpl *impl_from_IXAudio20SubmixVoice(IXAudio20SubmixVoice *iface) DECLSPEC_HIDDEN; +extern XA2VoiceImpl *impl_from_IXAudio20MasteringVoice(IXAudio20MasteringVoice *iface) DECLSPEC_HIDDEN; #elif XAUDIO2_VER <= 3 extern const IXAudio23SourceVoiceVtbl XAudio23SourceVoice_Vtbl DECLSPEC_HIDDEN; extern const IXAudio23SubmixVoiceVtbl XAudio23SubmixVoice_Vtbl DECLSPEC_HIDDEN; extern const IXAudio23MasteringVoiceVtbl XAudio23MasteringVoice_Vtbl DECLSPEC_HIDDEN; +extern XA2VoiceImpl *impl_from_IXAudio23SourceVoice(IXAudio23SourceVoice *iface) DECLSPEC_HIDDEN; +extern XA2VoiceImpl *impl_from_IXAudio23SubmixVoice(IXAudio23SubmixVoice *iface) DECLSPEC_HIDDEN; +extern XA2VoiceImpl *impl_from_IXAudio23MasteringVoice(IXAudio23MasteringVoice *iface) DECLSPEC_HIDDEN; #elif XAUDIO2_VER <= 7 extern const IXAudio27SourceVoiceVtbl XAudio27SourceVoice_Vtbl DECLSPEC_HIDDEN; extern const IXAudio27SubmixVoiceVtbl XAudio27SubmixVoice_Vtbl DECLSPEC_HIDDEN; extern const IXAudio27MasteringVoiceVtbl XAudio27MasteringVoice_Vtbl DECLSPEC_HIDDEN; +extern XA2VoiceImpl *impl_from_IXAudio27SourceVoice(IXAudio27SourceVoice *iface) DECLSPEC_HIDDEN; +extern XA2VoiceImpl *impl_from_IXAudio27SubmixVoice(IXAudio27SubmixVoice *iface) DECLSPEC_HIDDEN; +extern XA2VoiceImpl *impl_from_IXAudio27MasteringVoice(IXAudio27MasteringVoice *iface) DECLSPEC_HIDDEN; #endif #if XAUDIO2_VER == 0 @@ -181,5 +162,16 @@ extern const IXAudio22Vtbl XAudio22_Vtbl DECLSPEC_HIDDEN; extern const IXAudio27Vtbl XAudio27_Vtbl DECLSPEC_HIDDEN; #endif -extern HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv) DECLSPEC_HIDDEN; +/* xaudio_dll.c */ extern HRESULT xaudio2_initialize(IXAudio2Impl *This, UINT32 flags, XAUDIO2_PROCESSOR proc) DECLSPEC_HIDDEN; +extern FAudioEffectChain *wrap_effect_chain(const XAUDIO2_EFFECT_CHAIN *pEffectChain) DECLSPEC_HIDDEN; +extern void engine_cb(FAudioEngineCallEXT proc, FAudio *faudio, float *stream, void *user) DECLSPEC_HIDDEN; +extern DWORD WINAPI engine_thread(void *user) DECLSPEC_HIDDEN; + +/* xapo.c */ +extern HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv) DECLSPEC_HIDDEN; + +/* xaudio_allocator.c */ +extern void* XAudio_Internal_Malloc(size_t size) DECLSPEC_HIDDEN; +extern void XAudio_Internal_Free(void* ptr) DECLSPEC_HIDDEN; +extern void* XAudio_Internal_Realloc(void* ptr, size_t size) DECLSPEC_HIDDEN; diff --git a/dlls/xaudio2_8/Makefile.in b/dlls/xaudio2_8/Makefile.in index d4efc41d5c..b591b1141b 100644 --- a/dlls/xaudio2_8/Makefile.in +++ b/dlls/xaudio2_8/Makefile.in @@ -1,13 +1,16 @@ EXTRADEFS = -DXAUDIO2_VER=8 MODULE = xaudio2_8.dll IMPORTS = advapi32 ole32 user32 uuid -EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ + xaudio_allocator.c \ compat.c \ - x3daudio.c \ xapofx.c \ - xaudio_dll.c + x3daudio.c \ + xaudio_dll.c \ + xapo.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_9/Makefile.in b/dlls/xaudio2_9/Makefile.in index ceb2216f5a..99f1bd0deb 100644 --- a/dlls/xaudio2_9/Makefile.in +++ b/dlls/xaudio2_9/Makefile.in @@ -1,13 +1,16 @@ EXTRADEFS = -DXAUDIO2_VER=9 MODULE = xaudio2_9.dll IMPORTS = advapi32 ole32 user32 uuid -EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ + xaudio_allocator.c \ compat.c \ - x3daudio.c \ xapofx.c \ - xaudio_dll.c + x3daudio.c \ + xaudio_dll.c \ + xapo.c IDL_SRCS = xaudio_classes.idl -- 2.17.2

4 4