wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Zebediah Figura : setupapi: Check all INF files in SetupCopyOEMInf().
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 29f65bc6a209643c56330b63aefbe36cb96d7cbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=29f65bc6a209643c56330b63… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 23 18:00:46 2019 -0500 setupapi: Check all INF files in SetupCopyOEMInf(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/misc.c | 138 +++++++++++++++++++++++++++------------------ dlls/setupapi/tests/misc.c | 8 --- 2 files changed, 83 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=29f65bc6a209643c5633…

1 0

Zebediah Figura : setupapi/tests: Clean up and expand tests for SetupCopyOEMInf().
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 097e224af72f50f036ce5e1ac4c8ef49b19feb64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=097e224af72f50f036ce5e1a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 23 18:00:45 2019 -0500 setupapi/tests: Clean up and expand tests for SetupCopyOEMInf(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/misc.c | 298 +++++++++++++++++++++------------------------ 1 file changed, 142 insertions(+), 156 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=097e224af72f50f036ce…

1 0

Zebediah Figura : quartz/filesource: Use BaseFilterImpl_Release().
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: b9735fc69e89706f8f9733e8be4b5016053ac2ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9735fc69e89706f8f9733e8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 23 17:06:34 2019 -0500 quartz/filesource: Use BaseFilterImpl_Release(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 59 +++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 33 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 269fa27..bb0f162 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -403,8 +403,32 @@ static IPin *async_reader_get_pin(BaseFilter *iface, unsigned int index) return This->pOutputPin; } -static const BaseFilterFuncTable BaseFuncTable = { +static void async_reader_destroy(BaseFilter *iface) +{ + AsyncReader *filter = impl_from_BaseFilter(iface); + + if (filter->pOutputPin) + { + IPin *peer; + if (SUCCEEDED(IPin_ConnectedTo(filter->pOutputPin, &peer))) + { + IPin_Disconnect(peer); + IPin_Release(peer); + } + IPin_Disconnect(filter->pOutputPin); + IPin_Release(filter->pOutputPin); + } + CoTaskMemFree(filter->pszFileName); + if (filter->pmt) + DeleteMediaType(filter->pmt); + strmbase_filter_cleanup(&filter->filter); + CoTaskMemFree(filter); +} + +static const BaseFilterFuncTable BaseFuncTable = +{ .filter_get_pin = async_reader_get_pin, + .filter_destroy = async_reader_destroy, }; HRESULT AsyncReader_create(IUnknown * pUnkOuter, LPVOID * ppv) @@ -468,37 +492,6 @@ static HRESULT WINAPI AsyncReader_QueryInterface(IBaseFilter * iface, REFIID rii return E_NOINTERFACE; } -static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface) -{ - AsyncReader *This = impl_from_IBaseFilter(iface); - ULONG refCount = InterlockedDecrement(&This->filter.refCount); - - TRACE("%p->() Release from %d\n", This, refCount + 1); - - if (!refCount) - { - if (This->pOutputPin) - { - IPin *pConnectedTo; - if(SUCCEEDED(IPin_ConnectedTo(This->pOutputPin, &pConnectedTo))) - { - IPin_Disconnect(pConnectedTo); - IPin_Release(pConnectedTo); - } - IPin_Disconnect(This->pOutputPin); - IPin_Release(This->pOutputPin); - } - CoTaskMemFree(This->pszFileName); - if (This->pmt) - DeleteMediaType(This->pmt); - strmbase_filter_cleanup(&This->filter); - CoTaskMemFree(This); - return 0; - } - else - return refCount; -} - /** IMediaFilter methods **/ static HRESULT WINAPI AsyncReader_Stop(IBaseFilter * iface) @@ -538,7 +531,7 @@ static const IBaseFilterVtbl AsyncReader_Vtbl = { AsyncReader_QueryInterface, BaseFilterImpl_AddRef, - AsyncReader_Release, + BaseFilterImpl_Release, BaseFilterImpl_GetClassID, AsyncReader_Stop, AsyncReader_Pause,

1 0

Zebediah Figura : strmbase: Reimplement BaseFilterImpl_Release() using a destructor callback.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 3c98e11b601fcdf1b4fdf59aa45dff36c0c45a17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c98e11b601fcdf1b4fdf59a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 23 17:06:33 2019 -0500 strmbase: Reimplement BaseFilterImpl_Release() using a destructor callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/filter.c | 4 ++-- include/wine/strmbase.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index f9dd72c..cf8000f 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -54,7 +54,7 @@ ULONG WINAPI BaseFilterImpl_AddRef(IBaseFilter * iface) return refCount; } -ULONG WINAPI BaseFilterImpl_Release(IBaseFilter * iface) +ULONG WINAPI BaseFilterImpl_Release(IBaseFilter *iface) { BaseFilter *This = impl_from_IBaseFilter(iface); ULONG refCount = InterlockedDecrement(&This->refCount); @@ -62,7 +62,7 @@ ULONG WINAPI BaseFilterImpl_Release(IBaseFilter * iface) TRACE("(%p)->() Release from %d\n", This, refCount + 1); if (!refCount) - strmbase_filter_cleanup(This); + This->pFuncsTable->filter_destroy(This); return refCount; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 7c44b36..307204e 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -171,6 +171,7 @@ typedef struct BaseFilter typedef struct BaseFilterFuncTable { IPin *(*filter_get_pin)(BaseFilter *iface, unsigned int index); + void (*filter_destroy)(BaseFilter *iface); } BaseFilterFuncTable; HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv);

1 0

Zebediah Figura : strmbase: Remove unnecessary calling convention from the filter_get_pin() callback.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 1fc5c6b75d8d36808bd97f282a778980078f0231 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fc5c6b75d8d36808bd97f28… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 23 17:06:32 2019 -0500 strmbase: Remove unnecessary calling convention from the filter_get_pin() callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 2 +- dlls/qcap/audiorecord.c | 2 +- dlls/qcap/avico.c | 2 +- dlls/qcap/avimux.c | 2 +- dlls/qcap/smartteefilter.c | 2 +- dlls/qcap/vfwcapture.c | 2 +- dlls/qedit/samplegrabber.c | 2 +- dlls/quartz/filesource.c | 2 +- dlls/quartz/parser.c | 2 +- dlls/strmbase/renderer.c | 2 +- dlls/strmbase/transform.c | 2 +- dlls/winegstreamer/gstdemux.c | 2 +- dlls/wineqtdecoder/qtsplitter.c | 2 +- include/wine/strmbase.h | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 6121068..8341c40 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -191,7 +191,7 @@ static const IBaseFilterVtbl basefilter_vtbl = BaseFilterImpl_QueryVendorInfo }; -static IPin * WINAPI evr_get_pin(BaseFilter *iface, unsigned int index) +static IPin *evr_get_pin(BaseFilter *iface, unsigned int index) { FIXME("iface %p, index %u, stub!\n", iface, index); return NULL; diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index d6b99ee..bc1b452 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -171,7 +171,7 @@ static const IBaseFilterVtbl AudioRecordVtbl = { BaseFilterImpl_QueryVendorInfo }; -static IPin * WINAPI audio_record_get_pin(BaseFilter *iface, unsigned int index) +static IPin *audio_record_get_pin(BaseFilter *iface, unsigned int index) { FIXME("iface %p, index %u, stub!\n", iface, index); return NULL; diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 2e147a5..e2f21d0 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -244,7 +244,7 @@ static const IBaseFilterVtbl AVICompressorVtbl = { AVICompressor_QueryVendorInfo }; -static IPin * WINAPI avi_compressor_get_pin(BaseFilter *iface, unsigned int index) +static IPin *avi_compressor_get_pin(BaseFilter *iface, unsigned int index) { AVICompressor *This = impl_from_BaseFilter(iface); IPin *ret; diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 9272960..77e5898 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -116,7 +116,7 @@ static inline AviMux* impl_from_BaseFilter(BaseFilter *filter) return CONTAINING_RECORD(filter, AviMux, filter); } -static IPin * WINAPI avi_mux_get_pin(BaseFilter *iface, unsigned int index) +static IPin *avi_mux_get_pin(BaseFilter *iface, unsigned int index) { AviMux *This = impl_from_BaseFilter(iface); diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index b3a8748..7496fe6 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -199,7 +199,7 @@ static const IBaseFilterVtbl SmartTeeFilterVtbl = { BaseFilterImpl_QueryVendorInfo }; -static IPin * WINAPI smart_tee_get_pin(BaseFilter *iface, unsigned int index) +static IPin *smart_tee_get_pin(BaseFilter *iface, unsigned int index) { SmartTeeFilter *This = impl_from_BaseFilter(iface); IPin *ret; diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index e5dfead..a795a1e 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -192,7 +192,7 @@ static const IUnknownVtbl unknown_inner_vtbl = unknown_inner_Release, }; -static IPin * WINAPI vfw_capture_get_pin(BaseFilter *iface, unsigned int index) +static IPin *vfw_capture_get_pin(BaseFilter *iface, unsigned int index) { VfwCapture *This = impl_from_BaseFilter(iface); diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 9877523..76dc3d7 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -339,7 +339,7 @@ static const IUnknownVtbl samplegrabber_vtbl = SampleGrabber_Release, }; -static IPin * WINAPI sample_grabber_get_pin(BaseFilter *iface, unsigned int index) +static IPin *sample_grabber_get_pin(BaseFilter *iface, unsigned int index) { SG_Impl *This = impl_from_BaseFilter(iface); IPin *pin; diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index b10a7ff..269fa27 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -392,7 +392,7 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * return hr; } -static IPin * WINAPI async_reader_get_pin(BaseFilter *iface, unsigned int index) +static IPin *async_reader_get_pin(BaseFilter *iface, unsigned int index) { AsyncReader *This = impl_from_BaseFilter(iface); diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 6863947..fdefa3d 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -62,7 +62,7 @@ static inline ParserImpl *impl_from_BaseFilter( BaseFilter *iface ) return CONTAINING_RECORD(iface, ParserImpl, filter); } -static IPin * WINAPI parser_get_pin(BaseFilter *iface, unsigned int index) +static IPin *parser_get_pin(BaseFilter *iface, unsigned int index) { ParserImpl *filter = impl_from_BaseFilter(iface); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 278bf0a..ea1be8b 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -183,7 +183,7 @@ static const IPinVtbl BaseRenderer_InputPin_Vtbl = BaseInputPinImpl_NewSegment }; -static IPin * WINAPI renderer_get_pin(BaseFilter *iface, unsigned int index) +static IPin *renderer_get_pin(BaseFilter *iface, unsigned int index) { BaseRenderer *This = impl_from_BaseFilter(iface); diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index e19f3ef..6a7636c 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -128,7 +128,7 @@ static HRESULT WINAPI TransformFilter_Output_GetMediaType(BasePin *This, int iPo return S_OK; } -static IPin * WINAPI transform_get_pin(BaseFilter *iface, unsigned int index) +static IPin *transform_get_pin(BaseFilter *iface, unsigned int index) { TransformFilter *filter = impl_from_BaseFilter(iface); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3482d3e..6d3d2a0 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1196,7 +1196,7 @@ static inline GSTOutPin *impl_from_IMediaSeeking( IMediaSeeking *iface ) return CONTAINING_RECORD(iface, GSTOutPin, seek.IMediaSeeking_iface); } -static IPin * WINAPI gstdemux_get_pin(BaseFilter *base, unsigned int index) +static IPin *gstdemux_get_pin(BaseFilter *base, unsigned int index) { GSTImpl *This = impl_from_IBaseFilter(&base->IBaseFilter_iface); IPin *pin; diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 3b00a01..e900b91 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -202,7 +202,7 @@ static inline QTSplitter *impl_from_IBaseFilter( IBaseFilter *iface ) * Base Filter */ -static IPin * WINAPI qt_splitter_get_pin(BaseFilter *base, unsigned int index) +static IPin *qt_splitter_get_pin(BaseFilter *base, unsigned int index) { QTSplitter *filter = impl_from_BaseFilter(base); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 17a58a1..7c44b36 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -170,7 +170,7 @@ typedef struct BaseFilter typedef struct BaseFilterFuncTable { - IPin *(WINAPI *filter_get_pin)(BaseFilter *iface, unsigned int index); + IPin *(*filter_get_pin)(BaseFilter *iface, unsigned int index); } BaseFilterFuncTable; HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv);

1 0

Zebediah Figura : strmbase: Rename pfnGetPin to filter_get_pin.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 8a8c5a82292b428b083975a977a6d75b6dcf4bba URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a8c5a82292b428b083975a9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 23 17:06:31 2019 -0500 strmbase: Rename pfnGetPin to filter_get_pin. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 4 ++-- dlls/qcap/audiorecord.c | 4 ++-- dlls/qcap/avico.c | 4 ++-- dlls/qcap/avimux.c | 4 ++-- dlls/qcap/smartteefilter.c | 4 ++-- dlls/qcap/vfwcapture.c | 4 ++-- dlls/qedit/samplegrabber.c | 4 ++-- dlls/quartz/filesource.c | 4 ++-- dlls/quartz/parser.c | 4 ++-- dlls/strmbase/enumpins.c | 6 +++--- dlls/strmbase/filter.c | 2 +- dlls/strmbase/renderer.c | 4 ++-- dlls/strmbase/transform.c | 4 ++-- dlls/winegstreamer/gstdemux.c | 4 ++-- dlls/wineqtdecoder/qtsplitter.c | 4 ++-- include/wine/strmbase.h | 8 +++----- 16 files changed, 33 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8a8c5a82292b428b0839…

1 0

Zebediah Figura : strmbase: Use an unsigned int for the GetPin() callback.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 97546ca0b71287bd028da1d21d1e043480ae2897 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97546ca0b71287bd028da1d2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 23 17:06:30 2019 -0500 strmbase: Use an unsigned int for the GetPin() callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 4 ++-- dlls/qcap/audiorecord.c | 5 ++--- dlls/qcap/avico.c | 15 ++++----------- dlls/qcap/avimux.c | 15 ++++++++------- dlls/qcap/smartteefilter.c | 18 +++++------------- dlls/qcap/vfwcapture.c | 4 ++-- dlls/qedit/samplegrabber.c | 6 +++--- dlls/quartz/filesource.c | 6 ++---- dlls/quartz/parser.c | 14 +++++--------- dlls/strmbase/filter.c | 2 +- dlls/strmbase/renderer.c | 4 ++-- dlls/strmbase/transform.c | 4 ++-- dlls/winegstreamer/gstdemux.c | 10 ++++------ dlls/wineqtdecoder/qtsplitter.c | 2 +- include/wine/strmbase.h | 2 +- 15 files changed, 44 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=97546ca0b71287bd028d…

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 23 May '19

23 May '19

Module: wine Branch: master Commit: 27bf52d12c0eb13ec797a5d81177954faac00fa4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27bf52d12c0eb13ec797a5d8… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu May 23 23:54:58 2019 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 44 +++++++++++++------------------------------- 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/po/fi.po b/po/fi.po index 1384042..37811c3 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6809,10 +6809,8 @@ msgid "Begin request has already been made.\n" msgstr "Aloituspyyntö on jo tehty.\n" #: mferror.mc:599 -#, fuzzy -#| msgid "Object is not initialized.\n" msgid "Sink has not been finalized.\n" -msgstr "Objektia ei ole alustettu.\n" +msgstr "Ulostuloa ei ole viimeistelty.\n" #: mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7087,68 +7085,52 @@ msgid "Unsupported media source characteristics.\n" msgstr "Medialähteen ominaisuuksia ei tueta.\n" #: mferror.mc:536 -#, fuzzy -#| msgid "Rate change was preempted.\n" msgid "Stream sink was removed.\n" -msgstr "Nopeuden vaihto sivuutettiin.\n" +msgstr "Virtaulostulo poistettiin.\n" #: mferror.mc:543 msgid "Stream sinks are out of sync.\n" -msgstr "" +msgstr "Virtaulostulojen ajoitus ei täsmää.\n" #: mferror.mc:550 -#, fuzzy -#| msgid "Media stream has no duration set.\n" msgid "Media sink stream sinks set is fixed.\n" -msgstr "Mediavirralla ei ole kestoa.\n" +msgstr "Mediaulostulon virtaulostuloja ei voi muuttaa.\n" #: mferror.mc:557 -#, fuzzy -#| msgid "Domain already exists.\n" msgid "Stream sink already exists.\n" -msgstr "Toimialue on jo olemassa.\n" +msgstr "Virtaulostulo on jo olemassa.\n" #: mferror.mc:564 -#, fuzzy -#| msgid "Operation was cancelled.\n" msgid "Sample allocation was canceled.\n" -msgstr "Toimenpide keskeytettiin.\n" +msgstr "Näytteen varaaminen keskeytettiin.\n" #: mferror.mc:571 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Sample allocator is empty.\n" -msgstr "Hakemisto ei ole tyhjä.\n" +msgstr "Näytteenvaraaja on tyhjä.\n" #: mferror.mc:578 -#, fuzzy -#| msgid "Clock state was already set.\n" msgid "Sink was already stopped.\n" -msgstr "Kellon tila oli jo asetettu.\n" +msgstr "Ulostulo oli jo pysäytetty.\n" #: mferror.mc:585 msgid "Bitrate was unknown for ASF file sink.\n" -msgstr "" +msgstr "ASF-tiedoston siirtonopeus (bitrate) oli tuntematon.\n" #: mferror.mc:592 -#, fuzzy -#| msgid "No media streams were selected.\n" msgid "No streams were selected for the sink.\n" -msgstr "Mediavirtoja ei ole valittu.\n" +msgstr "Ulostulolle ei ole valittu mediavirtoja.\n" #: mferror.mc:606 -#, fuzzy -#| msgid "File name is too long.\n" msgid "Metadata was too long.\n" -msgstr "Tiedostonimi on liian pitkä.\n" +msgstr "Metatieto on liian pitkä.\n" #: mferror.mc:613 msgid "No samples were processed by the sink.\n" -msgstr "" +msgstr "Ulostulo ei käsitellyt näytteitä.\n" #: mferror.mc:620 msgid "Sink was not provided with required headers.\n" -msgstr "" +msgstr "Ulostulolle ei annettu tarvittavia otsikoita.\n" #: mferror.mc:627 msgid "Optional node is invalid.\n"

1 0

Ethan Lee : xaudio2: Use new features from FAudio 19.06 ( but keep compatibility for <=19.05).
by Alexandre Julliard 23 May '19

23 May '19

Module: wine Branch: master Commit: d341efeff071532801fdc224062eb9e60dc5aea0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d341efeff071532801fdc224… Author: Ethan Lee <elee(a)codeweavers.com> Date: Thu May 23 13:01:31 2019 -0400 xaudio2: Use new features from FAudio 19.06 (but keep compatibility for <=19.05). Signed-off-by: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 17 +++++++++++++++++ configure.ac | 4 ++++ dlls/xaudio2_7/x3daudio.c | 6 ++++++ dlls/xaudio2_7/xaudio_dll.c | 6 +++++- include/config.h.in | 6 ++++++ 5 files changed, 38 insertions(+), 1 deletion(-) diff --git a/configure b/configure index c206e8d..2ad2639 100755 --- a/configure +++ b/configure @@ -14966,6 +14966,23 @@ CPPFLAGS=$ac_save_CPPFLAGS test -z "$FAUDIO_CFLAGS" || FAUDIO_CFLAGS=`echo " $FAUDIO_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` test -z "$FAUDIO_LIBS" || FAUDIO_LIBS=`echo " $FAUDIO_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` + ac_wine_check_funcs_save_LIBS="$LIBS" +LIBS="$LIBS $FAUDIO_LIBS" +for ac_func in \ + FAudio_CommitOperationSet \ + F3DAudioInitialize8 +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + +LIBS="$ac_wine_check_funcs_save_LIBS" fi if test "x$ac_cv_lib_soname_FAudio" = "x"; then : case "x$with_faudio" in diff --git a/configure.ac b/configure.ac index 83a8181..f548e3e 100644 --- a/configure.ac +++ b/configure.ac @@ -1690,6 +1690,10 @@ then WINE_PACKAGE_FLAGS(FAUDIO,[faudio],[-lFAudio],,, [AC_CHECK_HEADERS([FAudio.h], [WINE_CHECK_SONAME(FAudio,FAudioCreate,,,[$FAUDIO_LIBS],[[libFAudio*]])])]) + WINE_CHECK_LIB_FUNCS(\ + FAudio_CommitOperationSet \ + F3DAudioInitialize8, + [$FAUDIO_LIBS]) 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.]) diff --git a/dlls/xaudio2_7/x3daudio.c b/dlls/xaudio2_7/x3daudio.c index ee3367e..5bc7c84 100644 --- a/dlls/xaudio2_7/x3daudio.c +++ b/dlls/xaudio2_7/x3daudio.c @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include <stdarg.h> #include "windef.h" @@ -51,8 +53,12 @@ HRESULT CDECL X3DAudioInitialize(UINT32 chanmask, float speedofsound, X3DAUDIO_HANDLE handle) { TRACE("0x%x, %f, %p\n", chanmask, speedofsound, handle); +#ifdef HAVE_F3DAUDIOINITIALIZE8 + return F3DAudioInitialize8(chanmask, speedofsound, handle); +#else F3DAudioInitialize(chanmask, speedofsound, handle); return S_OK; +#endif } #endif /* XAUDIO2_VER >= 8 */ diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 70ba243..f135642 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1797,9 +1797,13 @@ static HRESULT WINAPI IXAudio2Impl_CommitChanges(IXAudio2 *iface, { IXAudio2Impl *This = impl_from_IXAudio2(iface); - TRACE("(%p)->(0x%x): stub!\n", This, operationSet); + TRACE("(%p)->(0x%x)\n", This, operationSet); +#ifdef HAVE_FAUDIO_COMMITOPERATIONSET + return FAudio_CommitOperationSet(This->faudio, operationSet); +#else return FAudio_CommitChanges(This->faudio); +#endif } static void WINAPI IXAudio2Impl_GetPerformanceData(IXAudio2 *iface, diff --git a/include/config.h.in b/include/config.h.in index 774e9ee..ce5c157 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -146,9 +146,15 @@ /* Define to 1 if you have the `expm1f' function. */ #undef HAVE_EXPM1F +/* Define to 1 if you have the `F3DAudioInitialize8' function. */ +#undef HAVE_F3DAUDIOINITIALIZE8 + /* Define to 1 if you have the `fallocate' function. */ #undef HAVE_FALLOCATE +/* Define to 1 if you have the `FAudio_CommitOperationSet' function. */ +#undef HAVE_FAUDIO_COMMITOPERATIONSET + /* Define to 1 if you have the <FAudio.h> header file. */ #undef HAVE_FAUDIO_H

1 0

Jacek Caban : server: Always block overlapped device requests until driver dispatches them.
by Alexandre Julliard 23 May '19

23 May '19

Module: wine Branch: master Commit: a55a287cab25b85c2788e9a07e09057f76e76926 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a55a287cab25b85c2788e9a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 23 19:36:27 2019 +0200 server: Always block overlapped device requests until driver dispatches them. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 18 ------------------ server/async.c | 21 +++++++++++++++++++++ server/device.c | 9 ++++++--- server/file.h | 1 + 5 files changed, 29 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 1f93c52..1cbaa1b 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -427,7 +427,7 @@ static async_data_t server_async( HANDLE handle, struct async_fileio *user, HAND static NTSTATUS wait_async( HANDLE handle, BOOL alertable, IO_STATUS_BLOCK *io ) { - NtWaitForSingleObject( handle, alertable, NULL ); + if (NtWaitForSingleObject( handle, alertable, NULL )) return STATUS_PENDING; return io->u.Status; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index d47943a..49490bb 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -216,9 +216,7 @@ static void test_overlapped(void) /* test cancelling all device requests */ res = DeviceIoControl(file, IOCTL_WINETEST_RESET_CANCEL, NULL, 0, NULL, 0, NULL, &overlapped); - todo_wine ok(res, "DeviceIoControl failed: %u\n", GetLastError()); - if (!res && GetLastError() == ERROR_IO_PENDING) WaitForSingleObject(overlapped.hEvent, INFINITE); res = DeviceIoControl(file, IOCTL_WINETEST_TEST_CANCEL, NULL, 0, NULL, 0, NULL, &overlapped); ok(!res && GetLastError() == ERROR_IO_PENDING, "DeviceIoControl failed: %u\n", GetLastError()); @@ -228,9 +226,7 @@ static void test_overlapped(void) cancel_cnt = 0xdeadbeef; res = DeviceIoControl(file, IOCTL_WINETEST_GET_CANCEL_COUNT, NULL, 0, &cancel_cnt, sizeof(cancel_cnt), NULL, &overlapped); - todo_wine ok(res, "DeviceIoControl failed: %u\n", GetLastError()); - if (!res && GetLastError() == ERROR_IO_PENDING) WaitForSingleObject(overlapped.hEvent, INFINITE); ok(cancel_cnt == 0, "cancel_cnt = %u\n", cancel_cnt); CancelIo(file); @@ -238,18 +234,13 @@ static void test_overlapped(void) cancel_cnt = 0xdeadbeef; res = DeviceIoControl(file, IOCTL_WINETEST_GET_CANCEL_COUNT, NULL, 0, &cancel_cnt, sizeof(cancel_cnt), NULL, &overlapped); todo_wine - ok(res, "DeviceIoControl failed: %u\n", GetLastError()); - if (!res && GetLastError() == ERROR_IO_PENDING) WaitForSingleObject(overlapped.hEvent, INFINITE); - todo_wine ok(cancel_cnt == 2, "cancel_cnt = %u\n", cancel_cnt); /* test cancelling selected overlapped event */ if (pCancelIoEx) { res = DeviceIoControl(file, IOCTL_WINETEST_RESET_CANCEL, NULL, 0, NULL, 0, NULL, &overlapped); - todo_wine ok(res, "DeviceIoControl failed: %u\n", GetLastError()); - if (!res && GetLastError() == ERROR_IO_PENDING) WaitForSingleObject(overlapped.hEvent, INFINITE); res = DeviceIoControl(file, IOCTL_WINETEST_TEST_CANCEL, NULL, 0, NULL, 0, NULL, &overlapped); ok(!res && GetLastError() == ERROR_IO_PENDING, "DeviceIoControl failed: %u\n", GetLastError()); @@ -261,9 +252,7 @@ static void test_overlapped(void) cancel_cnt = 0xdeadbeef; res = DeviceIoControl(file, IOCTL_WINETEST_GET_CANCEL_COUNT, NULL, 0, &cancel_cnt, sizeof(cancel_cnt), NULL, &overlapped); - todo_wine ok(res, "DeviceIoControl failed: %u\n", GetLastError()); - if (!res && GetLastError() == ERROR_IO_PENDING) WaitForSingleObject(overlapped.hEvent, INFINITE); todo_wine ok(cancel_cnt == 1, "cancel_cnt = %u\n", cancel_cnt); @@ -271,9 +260,7 @@ static void test_overlapped(void) cancel_cnt = 0xdeadbeef; res = DeviceIoControl(file, IOCTL_WINETEST_GET_CANCEL_COUNT, NULL, 0, &cancel_cnt, sizeof(cancel_cnt), NULL, &overlapped); - todo_wine ok(res, "DeviceIoControl failed: %u\n", GetLastError()); - if (!res && GetLastError() == ERROR_IO_PENDING) WaitForSingleObject(overlapped.hEvent, INFINITE); todo_wine ok(cancel_cnt == 2, "cancel_cnt = %u\n", cancel_cnt); } @@ -284,9 +271,7 @@ static void test_overlapped(void) ok(!res && GetLastError() == WAIT_TIMEOUT, "GetQueuedCompletionStatus returned %x(%u)\n", res, GetLastError()); res = DeviceIoControl(file, IOCTL_WINETEST_RESET_CANCEL, NULL, 0, NULL, 0, NULL, &overlapped); - todo_wine ok(res, "DeviceIoControl failed: %u\n", GetLastError()); - if (!res && GetLastError() == ERROR_IO_PENDING) WaitForSingleObject(overlapped.hEvent, INFINITE); res = GetQueuedCompletionStatus(port, &size, &key, &o, 0); ok(res, "GetQueuedCompletionStatus failed: %u\n", GetLastError()); ok(o == &overlapped, "o != overlapped\n"); @@ -297,11 +282,8 @@ static void test_overlapped(void) ok(res, "SetFileCompletionNotificationModes failed: %u\n", GetLastError()); res = DeviceIoControl(file, IOCTL_WINETEST_RESET_CANCEL, NULL, 0, NULL, 0, NULL, &overlapped); - todo_wine ok(res, "DeviceIoControl failed: %u\n", GetLastError()); - if (!res && GetLastError() == ERROR_IO_PENDING) WaitForSingleObject(overlapped.hEvent, INFINITE); res = GetQueuedCompletionStatus(port, &size, &key, &o, 0); - todo_wine ok(!res && GetLastError() == WAIT_TIMEOUT, "GetQueuedCompletionStatus returned %x(%u)\n", res, GetLastError()); } diff --git a/server/async.c b/server/async.c index c0b84c2..94cac47 100644 --- a/server/async.c +++ b/server/async.c @@ -121,6 +121,8 @@ static void async_satisfied( struct object *obj, struct wait_queue_entry *entry close_handle( async->thread->process, async->wait_handle ); async->wait_handle = 0; } + + if (async->status == STATUS_PENDING) make_wait_abandoned( entry ); } static void async_destroy( struct object *obj ) @@ -261,6 +263,19 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da return async; } +void set_async_pending( struct async *async, int signal ) +{ + if (async->status == STATUS_PENDING) + { + async->pending = 1; + if (signal && !async->signaled) + { + async->signaled = 1; + wake_up( &async->obj, 0 ); + } + } +} + /* create an async associated with iosb for async-based requests * returned async must be passed to async_handoff */ struct async *create_request_async( struct fd *fd, unsigned int comp_flags, const async_data_t *data ) @@ -292,6 +307,12 @@ obj_handle_t async_handoff( struct async *async, int success, data_size_t *resul { if (!success) { + if (get_error() == STATUS_PENDING) + { + /* we don't know the result yet, so client needs to wait */ + async->direct_result = 0; + return async->wait_handle; + } close_handle( async->thread->process, async->wait_handle ); async->wait_handle = 0; return 0; diff --git a/server/device.c b/server/device.c index 6885bf0..1dcd500 100644 --- a/server/device.c +++ b/server/device.c @@ -597,7 +597,7 @@ static int queue_irp( struct device_file *file, const irp_params_t *params, stru add_irp_to_queue( file->device->manager, irp, current ); release_object( irp ); set_error( STATUS_PENDING ); - return 1; + return 0; } static enum server_fd_type device_file_get_fd_type( struct fd *fd ) @@ -896,8 +896,11 @@ DECL_HANDLER(get_next_device_request) if (manager->current_call) { - free_irp_params( manager->current_call ); - release_object( manager->current_call ); + irp = manager->current_call; + if (irp->async) + set_async_pending( irp->async, irp->file && is_fd_overlapped( irp->file->fd ) ); + free_irp_params( irp ); + release_object( irp ); manager->current_call = NULL; } diff --git a/server/file.h b/server/file.h index 0621b47..4341ad3 100644 --- a/server/file.h +++ b/server/file.h @@ -192,6 +192,7 @@ extern obj_handle_t async_handoff( struct async *async, int success, data_size_t extern void queue_async( struct async_queue *queue, struct async *async ); extern void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status ); extern void async_set_result( struct object *obj, unsigned int status, apc_param_t total ); +extern void set_async_pending( struct async *async, int signal ); extern int async_waiting( struct async_queue *queue ); extern void async_terminate( struct async *async, unsigned int status ); extern void async_wake_up( struct async_queue *queue, unsigned int status );

1 0

Jump to page:

2025

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-commits May 2019