wine-devel April 2020

wine-devel@winehq.org

87 participants
854 discussions

[PATCH 3/6] server: Use monotonic clock for SetTimer timeouts.
by Piotr Caban 01 Apr '20

01 Apr '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- server/file.h | 6 ++++++ server/queue.c | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-)

1 0

[PATCH 1/6] server: Initialize current_time before it's used in init_registry.
by Piotr Caban 01 Apr '20

01 Apr '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- server/fd.c | 2 +- server/file.h | 1 + server/main.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-)

1 0

[PATCH v3] winmm: Use CreateFileA instead of OpenFile.
by Alistair Leslie-Hughes 01 Apr '20

01 Apr '20

OpenFile has a filpath limit of 128. Use CreateFile which doesn't have this limit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48832 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27324 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winmm/mmio.c | 49 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 6f14301975..2e2dfe13d7 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -48,6 +48,40 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmio); static WINE_MMIO *MMIOList; +/* From kernel32 */ +static HANDLE create_file_OF( LPCSTR path, INT mode ) +{ + DWORD access, sharing, creation; + + if (mode & OF_CREATE) + { + creation = CREATE_ALWAYS; + access = GENERIC_READ | GENERIC_WRITE; + } + else + { + creation = OPEN_EXISTING; + switch(mode & 0x03) + { + case OF_READ: access = GENERIC_READ; break; + case OF_WRITE: access = GENERIC_WRITE; break; + case OF_READWRITE: access = GENERIC_READ | GENERIC_WRITE; break; + default: access = 0; break; + } + } + + switch(mode & 0x70) + { + case OF_SHARE_EXCLUSIVE: sharing = 0; break; + case OF_SHARE_DENY_WRITE: sharing = FILE_SHARE_READ; break; + case OF_SHARE_DENY_READ: sharing = FILE_SHARE_WRITE; break; + case OF_SHARE_DENY_NONE: + case OF_SHARE_COMPAT: + default: sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; break; + } + return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); +} + /************************************************************************** * mmioDosIOProc [internal] */ @@ -74,11 +108,16 @@ static LRESULT CALLBACK mmioDosIOProc(LPMMIOINFO lpmmioinfo, UINT uMessage, return MMIOERR_CANNOTOPEN; } - /* if filename NULL, assume open file handle in adwInfo[0] */ - if (szFileName) { - OFSTRUCT ofs; - lpmmioinfo->adwInfo[0] = OpenFile(szFileName, &ofs, lpmmioinfo->dwFlags & 0xFFFF); - } + /* if filename NULL, assume open file handle in adwInfo[0] */ + if (szFileName) { + HANDLE file; + + file = create_file_OF( szFileName, lpmmioinfo->dwFlags ); + if (file != INVALID_HANDLE_VALUE) + lpmmioinfo->adwInfo[0] = HandleToLong(file); + else + lpmmioinfo->adwInfo[0] = HFILE_ERROR; + } if (lpmmioinfo->adwInfo[0] == HFILE_ERROR) ret = MMIOERR_FILENOTFOUND; } -- 2.25.1

2 1

[PATCH 1/5] quartz/acmwrapper: Get rid of the ACMWrapperImpl typedef.
by Zebediah Figura 01 Apr '20

01 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/acmwrapper.c | 48 ++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index b116f98ef01..6df04595bb5 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -typedef struct ACMWrapperImpl +struct acm_wrapper { struct strmbase_filter filter; CRITICAL_SECTION stream_cs; @@ -53,16 +53,16 @@ typedef struct ACMWrapperImpl LONGLONG lasttime_real; LONGLONG lasttime_sent; -} ACMWrapperImpl; +}; -static inline ACMWrapperImpl *impl_from_strmbase_filter(struct strmbase_filter *iface) +static struct acm_wrapper *impl_from_strmbase_filter(struct strmbase_filter *iface) { - return CONTAINING_RECORD(iface, ACMWrapperImpl, filter); + return CONTAINING_RECORD(iface, struct acm_wrapper, filter); } static HRESULT acm_wrapper_sink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->filter); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->filter); if (IsEqualGUID(iid, &IID_IMemInputPin)) *out = &filter->sink.IMemInputPin_iface; @@ -80,7 +80,7 @@ static HRESULT acm_wrapper_sink_query_accept(struct strmbase_pin *iface, const A static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMediaSample *pSample) { - ACMWrapperImpl *This = impl_from_strmbase_filter(iface->pin.filter); + struct acm_wrapper *This = impl_from_strmbase_filter(iface->pin.filter); IMediaSample* pOutSample = NULL; DWORD cbDstStream, cbSrcStream; LPBYTE pbDstStream; @@ -278,7 +278,7 @@ static BOOL is_audio_subtype(const GUID *guid) static HRESULT acm_wrapper_sink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *mt) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->pin.filter); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->pin.filter); const WAVEFORMATEX *wfx = (WAVEFORMATEX *)mt->pbFormat; HACMSTREAM drv; MMRESULT res; @@ -312,7 +312,7 @@ static HRESULT acm_wrapper_sink_connect(struct strmbase_sink *iface, IPin *peer, static void acm_wrapper_sink_disconnect(struct strmbase_sink *iface) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->pin.filter); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->pin.filter); if (filter->has) acmStreamClose(filter->has, 0); @@ -332,7 +332,7 @@ static const struct strmbase_sink_ops sink_ops = static HRESULT acm_wrapper_source_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->filter); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->filter); if (IsEqualGUID(iid, &IID_IQualityControl)) *out = &filter->source_IQualityControl_iface; @@ -347,7 +347,7 @@ static HRESULT acm_wrapper_source_query_interface(struct strmbase_pin *iface, RE static HRESULT acm_wrapper_source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->filter); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->filter); if (IsEqualGUID(&mt->majortype, &filter->mt.majortype) && (IsEqualGUID(&mt->subtype, &filter->mt.subtype) @@ -359,7 +359,7 @@ static HRESULT acm_wrapper_source_query_accept(struct strmbase_pin *iface, const static HRESULT acm_wrapper_source_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->filter); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->filter); if (index) return VFW_S_NO_MORE_ITEMS; @@ -370,7 +370,7 @@ static HRESULT acm_wrapper_source_get_media_type(struct strmbase_pin *iface, static HRESULT WINAPI acm_wrapper_source_DecideBufferSize(struct strmbase_source *iface, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->pin.filter); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->pin.filter); ALLOCATOR_PROPERTIES actual; if (!ppropInputRequest->cbAlign) @@ -395,34 +395,34 @@ static const struct strmbase_source_ops source_ops = .pfnDecideBufferSize = acm_wrapper_source_DecideBufferSize, }; -static ACMWrapperImpl *impl_from_source_IQualityControl(IQualityControl *iface) +static struct acm_wrapper *impl_from_source_IQualityControl(IQualityControl *iface) { - return CONTAINING_RECORD(iface, ACMWrapperImpl, source_IQualityControl_iface); + return CONTAINING_RECORD(iface, struct acm_wrapper, source_IQualityControl_iface); } static HRESULT WINAPI acm_wrapper_source_qc_QueryInterface(IQualityControl *iface, REFIID iid, void **out) { - ACMWrapperImpl *filter = impl_from_source_IQualityControl(iface); + struct acm_wrapper *filter = impl_from_source_IQualityControl(iface); return IPin_QueryInterface(&filter->source.pin.IPin_iface, iid, out); } static ULONG WINAPI acm_wrapper_source_qc_AddRef(IQualityControl *iface) { - ACMWrapperImpl *filter = impl_from_source_IQualityControl(iface); + struct acm_wrapper *filter = impl_from_source_IQualityControl(iface); return IPin_AddRef(&filter->source.pin.IPin_iface); } static ULONG WINAPI acm_wrapper_source_qc_Release(IQualityControl *iface) { - ACMWrapperImpl *filter = impl_from_source_IQualityControl(iface); + struct acm_wrapper *filter = impl_from_source_IQualityControl(iface); return IPin_Release(&filter->source.pin.IPin_iface); } static HRESULT WINAPI acm_wrapper_source_qc_Notify(IQualityControl *iface, IBaseFilter *sender, Quality q) { - ACMWrapperImpl *filter = impl_from_source_IQualityControl(iface); + struct acm_wrapper *filter = impl_from_source_IQualityControl(iface); IQualityControl *peer; HRESULT hr = S_OK; @@ -443,7 +443,7 @@ static HRESULT WINAPI acm_wrapper_source_qc_Notify(IQualityControl *iface, static HRESULT WINAPI acm_wrapper_source_qc_SetSink(IQualityControl *iface, IQualityControl *sink) { - ACMWrapperImpl *filter = impl_from_source_IQualityControl(iface); + struct acm_wrapper *filter = impl_from_source_IQualityControl(iface); TRACE("filter %p, sink %p.\n", filter, sink); @@ -463,7 +463,7 @@ static const IQualityControlVtbl source_qc_vtbl = static struct strmbase_pin *acm_wrapper_get_pin(struct strmbase_filter *iface, unsigned int index) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface); if (index == 0) return &filter->sink.pin; @@ -474,7 +474,7 @@ static struct strmbase_pin *acm_wrapper_get_pin(struct strmbase_filter *iface, u static void acm_wrapper_destroy(struct strmbase_filter *iface) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface); if (filter->sink.pin.peer) IPin_Disconnect(filter->sink.pin.peer); @@ -499,7 +499,7 @@ static void acm_wrapper_destroy(struct strmbase_filter *iface) static HRESULT acm_wrapper_init_stream(struct strmbase_filter *iface) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface); BaseOutputPinImpl_Active(&filter->source); return S_OK; @@ -507,7 +507,7 @@ static HRESULT acm_wrapper_init_stream(struct strmbase_filter *iface) static HRESULT acm_wrapper_cleanup_stream(struct strmbase_filter *iface) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface); BaseOutputPinImpl_Inactive(&filter->source); return S_OK; @@ -523,7 +523,7 @@ static const struct strmbase_filter_ops filter_ops = HRESULT acm_wrapper_create(IUnknown *outer, IUnknown **out) { - ACMWrapperImpl *object; + struct acm_wrapper *object; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; -- 2.26.0

2 5

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel April 2020