October 2019 - Wine-commits

Zebediah Figura : quartz: Use strmbase_dump_media_type() where appropriate.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: c4e3f4180dcdec1a4d9087a029b50670985ba606 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4e3f4180dcdec1a4d9087a0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 5 19:18:51 2019 -0500 quartz: Use strmbase_dump_media_type() where appropriate. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 1 - dlls/quartz/avidec.c | 1 - dlls/quartz/dsoundrender.c | 17 ----------------- dlls/quartz/enummedia.c | 32 -------------------------------- dlls/quartz/filesource.c | 2 +- dlls/quartz/filtergraph.c | 3 +++ dlls/quartz/quartz_private.h | 2 -- dlls/quartz/videorenderer.c | 8 -------- dlls/quartz/vmr9.c | 11 ----------- 9 files changed, 4 insertions(+), 73 deletions(-) diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index fd2397668d..b79bed1949 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -8,7 +8,6 @@ C_SRCS = \ acmwrapper.c \ avidec.c \ dsoundrender.c \ - enummedia.c \ enummoniker.c \ enumregfilters.c \ filesource.c \ diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index ce38b6963c..7352a28db8 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -240,7 +240,6 @@ static HRESULT WINAPI AVIDec_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir bmi = &format2->bmiHeader; else goto failed; - TRACE("Fourcc: %s\n", debugstr_an((const char *)&pmt->subtype.Data1, 4)); This->hvid = ICLocate(pmt->majortype.Data1, pmt->subtype.Data1, bmi, NULL, ICMODE_DECOMPRESS); if (This->hvid) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index d3c382f166..6ba6e4c7ae 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -400,20 +400,9 @@ static HRESULT WINAPI DSoundRender_DoRenderSample(BaseRenderer *iface, IMediaSam static HRESULT WINAPI DSoundRender_CheckMediaType(BaseRenderer *iface, const AM_MEDIA_TYPE * pmt) { - WAVEFORMATEX* format; - if (!IsEqualIID(&pmt->majortype, &MEDIATYPE_Audio)) return S_FALSE; - format = (WAVEFORMATEX*)pmt->pbFormat; - TRACE("Format = %p\n", format); - TRACE("wFormatTag = %x %x\n", format->wFormatTag, WAVE_FORMAT_PCM); - TRACE("nChannels = %d\n", format->nChannels); - TRACE("nSamplesPerSec = %d\n", format->nSamplesPerSec); - TRACE("nAvgBytesPerSec = %d\n", format->nAvgBytesPerSec); - TRACE("nBlockAlign = %d\n", format->nBlockAlign); - TRACE("wBitsPerSample = %d\n", format->wBitsPerSample); - if (!IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_PCM)) return S_FALSE; @@ -451,12 +440,6 @@ static HRESULT WINAPI DSoundRender_CompleteConnect(BaseRenderer * iface, IPin * DSBUFFERDESC buf_desc; TRACE("(%p)->(%p)\n", This, pReceivePin); - dump_AM_MEDIA_TYPE(pmt); - - TRACE("MajorType %s\n", debugstr_guid(&pmt->majortype)); - TRACE("SubType %s\n", debugstr_guid(&pmt->subtype)); - TRACE("Format %s\n", debugstr_guid(&pmt->formattype)); - TRACE("Size %d\n", pmt->cbFormat); format = (WAVEFORMATEX*)pmt->pbFormat; diff --git a/dlls/quartz/enummedia.c b/dlls/quartz/enummedia.c deleted file mode 100644 index b3acc5d4e2..0000000000 --- a/dlls/quartz/enummedia.c +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Implementation of IEnumMediaTypes Interface - * - * Copyright 2003 Robert Shearman - * - * 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 "quartz_private.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(quartz); - -void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt) -{ - if (!pmt) - return; - TRACE("\t%s\n\t%s\n\t...\n\t%s\n", qzdebugstr_guid(&pmt->majortype), qzdebugstr_guid(&pmt->subtype), qzdebugstr_guid(&pmt->formattype)); -} diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 36b7e95ad6..8a921954dd 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -474,6 +474,7 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi AsyncReader *This = impl_from_IFileSourceFilter(iface); TRACE("%p->(%s, %p)\n", This, debugstr_w(pszFileName), pmt); + strmbase_dump_media_type(pmt); if (!pszFileName) return E_POINTER; @@ -645,7 +646,6 @@ static HRESULT WINAPI FileAsyncReaderPin_AttemptConnection(struct strmbase_sourc HRESULT hr; TRACE("%p->(%p, %p)\n", This, pReceivePin, pmt); - dump_AM_MEDIA_TYPE(pmt); /* FIXME: call queryacceptproc */ diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4dd3075463..3017ee7408 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -830,6 +830,7 @@ static HRESULT WINAPI FilterGraph2_ConnectDirect(IFilterGraph2 *iface, IPin *ppi HRESULT hr; TRACE("(%p/%p)->(%p, %p, %p)\n", This, iface, ppinIn, ppinOut, pmt); + strmbase_dump_media_type(pmt); /* FIXME: check pins are in graph */ @@ -1834,6 +1835,7 @@ static HRESULT WINAPI FilterGraph2_ReconnectEx(IFilterGraph2 *iface, IPin *ppin, IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); TRACE("(%p/%p)->(%p %p): stub !!!\n", This, iface, ppin, pmt); + strmbase_dump_media_type(pmt); return S_OK; } @@ -5461,6 +5463,7 @@ static HRESULT WINAPI GraphConfig_Reconnect(IGraphConfig *iface, IPin *pOutputPi IFilterGraphImpl *This = impl_from_IGraphConfig(iface); FIXME("(%p)->(%p, %p, %p, %p, %p, %x): stub!\n", This, pOutputPin, pInputPin, pmtFirstConnection, pUsingFilter, hAbortEvent, dwFlags); + strmbase_dump_media_type(pmtFirstConnection); return E_NOTIMPL; } diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 1213aea352..f3ba39fba9 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -62,8 +62,6 @@ HRESULT IEnumRegFiltersImpl_Construct(REGFILTER * pInRegFilters, const ULONG siz extern const char * qzdebugstr_guid(const GUID * id) DECLSPEC_HIDDEN; extern void video_unregister_windowclass(void) DECLSPEC_HIDDEN; -void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt) DECLSPEC_HIDDEN; - BOOL get_media_type(const WCHAR *filename, GUID *majortype, GUID *subtype, GUID *source_clsid) DECLSPEC_HIDDEN; #endif /* __QUARTZ_PRIVATE_INCLUDED__ */ diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 87ff9f59bf..43aef9ffbe 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -176,14 +176,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, return VFW_E_RUNTIME_ERROR; } - TRACE("biSize = %d\n", bmiHeader->biSize); - TRACE("biWidth = %d\n", bmiHeader->biWidth); - TRACE("biHeight = %d\n", bmiHeader->biHeight); - TRACE("biPlanes = %d\n", bmiHeader->biPlanes); - TRACE("biBitCount = %d\n", bmiHeader->biBitCount); - TRACE("biCompression = %s\n", debugstr_an((LPSTR)&(bmiHeader->biCompression), 4)); - TRACE("biSizeImage = %d\n", bmiHeader->biSizeImage); - if (!This->baseControlWindow.baseWindow.hDC) { ERR("Cannot get DC from window!\n"); return E_FAIL; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 600e75945a..0e04fef366 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -214,14 +214,6 @@ static DWORD VMR9_SendSampleData(struct quartz_vmr *This, VMR9PresentationInfo * return VFW_E_RUNTIME_ERROR; } - TRACE("biSize = %d\n", bmiHeader->biSize); - TRACE("biWidth = %d\n", bmiHeader->biWidth); - TRACE("biHeight = %d\n", bmiHeader->biHeight); - TRACE("biPlanes = %d\n", bmiHeader->biPlanes); - TRACE("biBitCount = %d\n", bmiHeader->biBitCount); - TRACE("biCompression = %s\n", debugstr_an((LPSTR)&(bmiHeader->biCompression), 4)); - TRACE("biSizeImage = %d\n", bmiHeader->biSizeImage); - width = bmiHeader->biWidth; height = bmiHeader->biHeight; @@ -342,7 +334,6 @@ static HRESULT WINAPI VMR9_CheckMediaType(BaseRenderer *iface, const AM_MEDIA_TY VIDEOINFOHEADER *format = (VIDEOINFOHEADER *)pmt->pbFormat; This->bmiheader = format->bmiHeader; - TRACE("Resolution: %dx%d\n", format->bmiHeader.biWidth, format->bmiHeader.biHeight); This->VideoWidth = format->bmiHeader.biWidth; This->VideoHeight = format->bmiHeader.biHeight; SetRect(&This->source_rect, 0, 0, This->VideoWidth, This->VideoHeight); @@ -352,8 +343,6 @@ static HRESULT WINAPI VMR9_CheckMediaType(BaseRenderer *iface, const AM_MEDIA_TY VIDEOINFOHEADER2 *format = (VIDEOINFOHEADER2 *)pmt->pbFormat; This->bmiheader = format->bmiHeader; - - TRACE("Resolution: %dx%d\n", format->bmiHeader.biWidth, format->bmiHeader.biHeight); This->VideoWidth = format->bmiHeader.biWidth; This->VideoHeight = format->bmiHeader.biHeight; SetRect(&This->source_rect, 0, 0, This->VideoWidth, This->VideoHeight);

1 0

Zebediah Figura : qcap: Use strmbase_dump_media_type() where appropriate.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: e1150b8632c3195c334dd3914855dec880798aa2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1150b8632c3195c334dd391… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 5 19:18:52 2019 -0500 qcap: Use strmbase_dump_media_type() where appropriate. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/Makefile.in | 1 - dlls/qcap/avico.c | 2 -- dlls/qcap/avimux.c | 3 --- dlls/qcap/enummedia.c | 44 -------------------------------------------- dlls/qcap/qcap_main.h | 2 -- dlls/qcap/smartteefilter.c | 1 - dlls/qcap/v4l.c | 2 -- dlls/qcap/vfwcapture.c | 11 +++++++---- 8 files changed, 7 insertions(+), 59 deletions(-) diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index 12cc9171fb..cb33e07c8d 100644 --- a/dlls/qcap/Makefile.in +++ b/dlls/qcap/Makefile.in @@ -9,7 +9,6 @@ C_SRCS = \ avimux.c \ capturegraph.c \ dllfunc.c \ - enummedia.c \ enumpins.c \ filter.c \ mediatype.c \ diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index ea98b2a655..95e51f6e63 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -325,7 +325,6 @@ static HRESULT WINAPI AVICompressorIn_ReceiveConnection(IPin *iface, HRESULT hres; TRACE("(%p)->(%p AM_MEDIA_TYPE(%p))\n", This, pConnector, pmt); - dump_AM_MEDIA_TYPE(pmt); hres = BaseInputPinImpl_ReceiveConnection(iface, pConnector, pmt); if(FAILED(hres)) @@ -382,7 +381,6 @@ static HRESULT sink_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE DWORD res; TRACE("(%p)->(AM_MEDIA_TYPE(%p))\n", base, pmt); - dump_AM_MEDIA_TYPE(pmt); if(!IsEqualIID(&pmt->majortype, &MEDIATYPE_Video)) return S_FALSE; diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 596016cf77..8f7fe13285 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1165,7 +1165,6 @@ static HRESULT WINAPI AviMuxOut_AttemptConnection(struct strmbase_source *base, HRESULT hr; TRACE("(%p)->(%p AM_MEDIA_TYPE(%p))\n", base, pReceivePin, pmt); - dump_AM_MEDIA_TYPE(pmt); hr = IPin_QueryDirection(pReceivePin, &dir); if(hr==S_OK && dir!=PINDIR_INPUT) @@ -1260,7 +1259,6 @@ static HRESULT WINAPI AviMuxOut_Connect(IPin *iface, int i; TRACE("(%p)->(%p AM_MEDIA_TYPE(%p))\n", This, pReceivePin, pmt); - dump_AM_MEDIA_TYPE(pmt); hr = BaseOutputPinImpl_Connect(iface, pReceivePin, pmt); if(FAILED(hr)) @@ -1537,7 +1535,6 @@ static HRESULT WINAPI AviMuxIn_ReceiveConnection(IPin *iface, HRESULT hr; TRACE("pin %p, pConnector %p, pmt %p.\n", avimuxin, pConnector, pmt); - dump_AM_MEDIA_TYPE(pmt); if(!pmt) return E_POINTER; diff --git a/dlls/qcap/enummedia.c b/dlls/qcap/enummedia.c deleted file mode 100644 index 45552e16a4..0000000000 --- a/dlls/qcap/enummedia.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Implementation of IEnumMediaTypes Interface - * - * Copyright 2003 Robert Shearman - * - * 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> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "wingdi.h" -#include "winuser.h" -#include "dshow.h" - -#include "qcap_main.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(qcap); - -void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt) -{ - if (!pmt) - return; - TRACE("\t%s\n\t%s\n\t...\n\t%s\n", debugstr_guid(&pmt->majortype), - debugstr_guid(&pmt->subtype), debugstr_guid(&pmt->formattype)); -} diff --git a/dlls/qcap/qcap_main.h b/dlls/qcap/qcap_main.h index 0e767bd08c..ab02dbb9ab 100644 --- a/dlls/qcap/qcap_main.h +++ b/dlls/qcap/qcap_main.h @@ -39,6 +39,4 @@ extern IUnknown * WINAPI QCAP_createInfinitePinTeeFilter(IUnknown *pUnkOuter, HR extern IUnknown * WINAPI QCAP_createSmartTeeFilter(IUnknown *pUnkOuter, HRESULT *phr) DECLSPEC_HIDDEN; extern IUnknown * WINAPI QCAP_createAudioInputMixerPropertyPage(IUnknown *pUnkOuter, HRESULT *phr) DECLSPEC_HIDDEN; -void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt) DECLSPEC_HIDDEN; - #endif /* _QCAP_MAIN_H_DEFINED */ diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 26f3255967..a4d0a435ef 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -124,7 +124,6 @@ static HRESULT sink_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE { SmartTeeFilter *This = impl_from_strmbase_pin(base); TRACE("(%p, AM_MEDIA_TYPE(%p))\n", This, pmt); - dump_AM_MEDIA_TYPE(pmt); if (!pmt) return VFW_E_TYPE_NOT_ACCEPTED; /* We'll take any media type, but the output pins will later diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index c9102accb8..cdab38052b 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -135,7 +135,6 @@ HRESULT qcap_driver_check_format(Capture *device, const AM_MEDIA_TYPE *mt) { HRESULT hr; TRACE("device %p, mt %p.\n", device, mt); - dump_AM_MEDIA_TYPE(mt); if (!mt) return E_POINTER; @@ -251,7 +250,6 @@ HRESULT qcap_driver_get_format(const Capture *capBox, AM_MEDIA_TYPE ** mT) vi->bmiHeader.biXPelsPerMeter = 100; vi->bmiHeader.biYPelsPerMeter = 100; mT[0]->pbFormat = (void *)vi; - dump_AM_MEDIA_TYPE(mT[0]); return S_OK; } diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 6fbe721a31..0be0914836 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -205,7 +205,8 @@ AMStreamConfig_SetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE *pmt) HRESULT hr; VfwCapture *This = impl_from_IAMStreamConfig(iface); - TRACE("(%p): %p->%p\n", iface, pmt, pmt ? pmt->pbFormat : NULL); + TRACE("filter %p, mt %p.\n", This, pmt); + strmbase_dump_media_type(pmt); if (This->filter.state != State_Stopped) { @@ -219,8 +220,6 @@ AMStreamConfig_SetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE *pmt) return E_POINTER; } - dump_AM_MEDIA_TYPE(pmt); - if (This->source.pin.peer) { hr = IPin_QueryAccept(This->source.pin.peer, pmt); @@ -244,9 +243,13 @@ static HRESULT WINAPI AMStreamConfig_GetFormat( IAMStreamConfig *iface, AM_MEDIA_TYPE **pmt ) { VfwCapture *This = impl_from_IAMStreamConfig(iface); + HRESULT hr; TRACE("%p -> (%p)\n", iface, pmt); - return qcap_driver_get_format(This->driver_info, pmt); + hr = qcap_driver_get_format(This->driver_info, pmt); + if (SUCCEEDED(hr)) + strmbase_dump_media_type(*pmt); + return hr; } static HRESULT WINAPI

1 0

Zebediah Figura : winegstreamer: Use strmbase_dump_media_type() where appropriate.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: 6c8cb0abaca77b124ccd1f754ac276cd8ba47f2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c8cb0abaca77b124ccd1f75… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 5 19:18:53 2019 -0500 winegstreamer: Use strmbase_dump_media_type() where appropriate. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 3 --- dlls/winegstreamer/gstdemux.c | 2 +- dlls/winegstreamer/gsttffilter.c | 3 --- dlls/winegstreamer/main.c | 9 --------- 4 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 596724cf26..122e4c1037 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -35,9 +35,6 @@ #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) -/* enum media */ -void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt); - IUnknown * CALLBACK avi_splitter_create(IUnknown *outer, HRESULT *phr) DECLSPEC_HIDDEN; IUnknown * CALLBACK mpeg_splitter_create(IUnknown *outer, HRESULT *phr) DECLSPEC_HIDDEN; IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *pUnkOuter, HRESULT *phr); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 4a685b1bd5..f20455c2be 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1976,7 +1976,7 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, HRESULT hr = S_OK; TRACE("filter %p, peer %p, mt %p.\n", filter, pReceivePin, pmt); - dump_AM_MEDIA_TYPE(pmt); + strmbase_dump_media_type(pmt); mark_wine_thread(); diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 1a40ec6856..8619cc6b3f 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -509,7 +509,6 @@ static HRESULT WINAPI Gstreamer_Mp3_QueryConnect(TransformFilter *iface, const A { GstTfImpl *This = (GstTfImpl*)iface; TRACE("%p %p\n", This, amt); - dump_AM_MEDIA_TYPE(amt); if ( (!IsEqualGUID(&amt->majortype, &MEDIATYPE_Audio) && !IsEqualGUID(&amt->majortype, &MEDIATYPE_Stream)) || @@ -649,7 +648,6 @@ static HRESULT WINAPI Gstreamer_YUV_QueryConnect(TransformFilter *iface, const A { GstTfImpl *This = (GstTfImpl*)iface; TRACE("%p %p\n", This, amt); - dump_AM_MEDIA_TYPE(amt); if (!IsEqualGUID(&amt->majortype, &MEDIATYPE_Video) || (!IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo) && @@ -885,7 +883,6 @@ static HRESULT WINAPI Gstreamer_AudioConvert_QueryConnect(TransformFilter *iface { GstTfImpl *This = (GstTfImpl*)iface; TRACE("%p %p\n", This, amt); - dump_AM_MEDIA_TYPE(amt); if (!IsEqualGUID(&amt->majortype, &MEDIATYPE_Audio) || !IsEqualGUID(&amt->subtype, &MEDIASUBTYPE_PCM) || diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 5a8e05e887..379f54ab4e 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -412,15 +412,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return hr; } -/* GStreamer common functions */ - -void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt) -{ - if (!pmt) - return; - TRACE("\t%s\n\t%s\n\t...\n\t%s\n", debugstr_guid(&pmt->majortype), debugstr_guid(&pmt->subtype), debugstr_guid(&pmt->formattype)); -} - static BOOL CALLBACK init_gstreamer_proc(INIT_ONCE *once, void *param, void **ctx) { BOOL *status = param;

1 0

Dmitry Timoshkov : wshom.ocx: Actually wait for process termination in IWshShell3::Run().
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: 57961e5e78ceb573303b7374639ee31d3794face URL: https://source.winehq.org/git/wine.git/?a=commit;h=57961e5e78ceb573303b7374… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 7 12:59:40 2019 +0800 wshom.ocx: Actually wait for process termination in IWshShell3::Run(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/shell.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 5d58ac74ed..d423856ce7 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -1297,6 +1297,7 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, { if (waitforprocess) { + WaitForSingleObject(info.hProcess, INFINITE); GetExitCodeProcess(info.hProcess, exit_code); CloseHandle(info.hProcess); }

1 0

Joseph Kogut : ncrypt: Add NCryptEnumAlgorithms stub.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: 2321adb1c83f94f9adeb892ed17947eb5f51ed47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2321adb1c83f94f9adeb892e… Author: Joseph Kogut <joseph.kogut(a)gmail.com> Date: Fri Oct 4 18:27:06 2019 -0700 ncrypt: Add NCryptEnumAlgorithms stub. Signed-off-by: Joseph Kogut <joseph.kogut(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 8 ++++++++ dlls/ncrypt/ncrypt.spec | 2 +- include/ncrypt.h | 7 +++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index bfda1d8295..c2dd8c0d71 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -68,6 +68,14 @@ SECURITY_STATUS WINAPI NCryptEncrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD i return NTE_NOT_SUPPORTED; } +SECURITY_STATUS WINAPI NCryptEnumAlgorithms(NCRYPT_PROV_HANDLE provider, DWORD alg_ops, + DWORD *alg_count, NCryptAlgorithmName **alg_list, + DWORD flags) +{ + FIXME("(0x%lx, 0x%08x, %p, %p, 0x%08x): stub\n", provider, alg_ops, alg_count, alg_list, flags); + return NTE_NOT_SUPPORTED; +} + SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE key, DWORD flags) { FIXME("(0x%lx, 0x%08x): stub\n", key, flags); diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index b0141808a3..c94a17d1b2 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -67,7 +67,7 @@ @ stub NCryptDeriveKey @ stub NCryptDuplicateKeyProtectorHandle @ stdcall NCryptEncrypt(long ptr long ptr ptr long ptr long) -@ stub NCryptEnumAlgorithms +@ stdcall NCryptEnumAlgorithms(long long ptr ptr long) @ stub NCryptEnumKeys @ stub NCryptEnumStorageProviders @ stub NCryptExportKey diff --git a/include/ncrypt.h b/include/ncrypt.h index 85ced7a2fb..cf4442ccd8 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -32,6 +32,13 @@ typedef LONG SECURITY_STATUS; #define __SECSTATUS_DEFINED__ #endif +typedef struct _NCryptAlgorithmName { + LPWSTR pszName; + DWORD dwClass; + DWORD dwAlgOperations; + DWORD dwFlags; +} NCryptAlgorithmName; + typedef ULONG_PTR NCRYPT_HANDLE; typedef ULONG_PTR NCRYPT_PROV_HANDLE; typedef ULONG_PTR NCRYPT_KEY_HANDLE;

1 0

Joseph Kogut : ncrypt: Add NCryptEnumKeys stub.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: 2f6735e8210cce7183542dca0bc71ff7a5de4f9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f6735e8210cce7183542dca… Author: Joseph Kogut <joseph.kogut(a)gmail.com> Date: Fri Oct 4 18:27:07 2019 -0700 ncrypt: Add NCryptEnumKeys stub. Signed-off-by: Joseph Kogut <joseph.kogut(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 7 +++++++ dlls/ncrypt/ncrypt.spec | 2 +- include/ncrypt.h | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index c2dd8c0d71..1e8fe93244 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -76,6 +76,13 @@ SECURITY_STATUS WINAPI NCryptEnumAlgorithms(NCRYPT_PROV_HANDLE provider, DWORD a return NTE_NOT_SUPPORTED; } +SECURITY_STATUS WINAPI NCryptEnumKeys(NCRYPT_PROV_HANDLE provider, const WCHAR *scope, + NCryptKeyName **key_name, PVOID *enum_state, DWORD flags) +{ + FIXME("(0x%lx, %p, %p, %p, 0x%08x): stub\n", provider, scope, key_name, enum_state, flags); + return NTE_NOT_SUPPORTED; +} + SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE key, DWORD flags) { FIXME("(0x%lx, 0x%08x): stub\n", key, flags); diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index c94a17d1b2..d4482d5b40 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -68,7 +68,7 @@ @ stub NCryptDuplicateKeyProtectorHandle @ stdcall NCryptEncrypt(long ptr long ptr ptr long ptr long) @ stdcall NCryptEnumAlgorithms(long long ptr ptr long) -@ stub NCryptEnumKeys +@ stdcall NCryptEnumKeys(long wstr ptr ptr long) @ stub NCryptEnumStorageProviders @ stub NCryptExportKey @ stdcall NCryptFinalizeKey(long long) diff --git a/include/ncrypt.h b/include/ncrypt.h index cf4442ccd8..9712f2f521 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -39,6 +39,13 @@ typedef struct _NCryptAlgorithmName { DWORD dwFlags; } NCryptAlgorithmName; +typedef struct NCryptKeyName { + LPWSTR pszName; + LPWSTR pszAlgid; + DWORD dwLegacyKeySpec; + DWORD dwFlags; +} NCryptKeyName; + typedef ULONG_PTR NCRYPT_HANDLE; typedef ULONG_PTR NCRYPT_PROV_HANDLE; typedef ULONG_PTR NCRYPT_KEY_HANDLE;

1 0

Joseph Kogut : ncrypt: Add NCryptFreeBuffer stub.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: ff885a810dd44901b8528c0c7365741e1c815c4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff885a810dd44901b8528c0c… Author: Joseph Kogut <joseph.kogut(a)gmail.com> Date: Fri Oct 4 18:27:08 2019 -0700 ncrypt: Add NCryptFreeBuffer stub. Signed-off-by: Joseph Kogut <joseph.kogut(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 6 ++++++ dlls/ncrypt/ncrypt.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 1e8fe93244..6022d20ca0 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -89,6 +89,12 @@ SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE key, DWORD flags) return NTE_NOT_SUPPORTED; } +SECURITY_STATUS WINAPI NCryptFreeBuffer(PVOID buf) +{ + FIXME("(%p): stub\n", buf); + return NTE_NOT_SUPPORTED; +} + SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE object) { FIXME("(0x%lx): stub\n", object); diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index d4482d5b40..1c06935bed 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -72,7 +72,7 @@ @ stub NCryptEnumStorageProviders @ stub NCryptExportKey @ stdcall NCryptFinalizeKey(long long) -@ stub NCryptFreeBuffer +@ stdcall NCryptFreeBuffer(ptr) @ stdcall NCryptFreeObject(long) @ stub NCryptGetProperty @ stub NCryptGetProtectionDescriptorInfo

1 0

Joseph Kogut : ncrypt: Add NCrypt{Get,Set}Property stubs.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: 9ea80d88b9f67e782e4c970fc9f4a58a6f39f3ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ea80d88b9f67e782e4c970f… Author: Joseph Kogut <joseph.kogut(a)gmail.com> Date: Fri Oct 4 18:27:09 2019 -0700 ncrypt: Add NCrypt{Get,Set}Property stubs. Signed-off-by: Joseph Kogut <joseph.kogut(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 16 ++++++++++++++++ dlls/ncrypt/ncrypt.spec | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 6022d20ca0..1d7c853840 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -101,6 +101,14 @@ SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE object) return NTE_NOT_SUPPORTED; } +SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE object, const WCHAR *property, PBYTE output, + DWORD outsize, DWORD *result, DWORD flags) +{ + FIXME("(0x%lx, %s, %p, %u, %p, 0x%08x): stub\n", object, wine_dbgstr_w(property), output, outsize, + result, flags); + return NTE_NOT_SUPPORTED; +} + SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, const WCHAR *name, DWORD keyspec, DWORD flags) { @@ -113,3 +121,11 @@ SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, c FIXME("(%p, %s, %u): stub\n", provider, wine_dbgstr_w(name), flags); return NTE_NOT_SUPPORTED; } + +SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE object, const WCHAR *property, + PBYTE input, DWORD insize, DWORD flags) +{ + FIXME("(%lx, %s, %p, %u, 0x%08x): stub\n", object, wine_dbgstr_w(property), input, insize, + flags); + return NTE_NOT_SUPPORTED; +} diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 1c06935bed..cf5decbc8c 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -74,7 +74,7 @@ @ stdcall NCryptFinalizeKey(long long) @ stdcall NCryptFreeBuffer(ptr) @ stdcall NCryptFreeObject(long) -@ stub NCryptGetProperty +@ stdcall NCryptGetProperty(ptr wstr ptr long ptr long) @ stub NCryptGetProtectionDescriptorInfo @ stub NCryptImportKey @ stub NCryptIsAlgSupported @@ -90,7 +90,7 @@ @ stub NCryptRegisterProtectionDescriptorName @ stub NCryptSecretAgreement @ stub NCryptSetAuditingInterface -@ stub NCryptSetProperty +@ stdcall NCryptSetProperty(ptr wstr ptr long long) @ stub NCryptSignHash @ stub NCryptStreamClose @ stub NCryptStreamOpenToProtect

1 0

Joseph Kogut : ncrypt: Add NCryptImportKey stub.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: 94e38a612682901f57414c12e14a66788521a141 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94e38a612682901f57414c12… Author: Joseph Kogut <joseph.kogut(a)gmail.com> Date: Fri Oct 4 18:27:10 2019 -0700 ncrypt: Add NCryptImportKey stub. Signed-off-by: Joseph Kogut <joseph.kogut(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 10 ++++++++++ dlls/ncrypt/ncrypt.spec | 2 +- include/ncrypt.h | 12 ++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 1d7c853840..2d4a513140 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -109,6 +109,16 @@ SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE object, const WCHAR *prop return NTE_NOT_SUPPORTED; } +SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE decrypt_key, + const WCHAR *type, NCryptBufferDesc *params, NCRYPT_KEY_HANDLE *key, + PBYTE data, DWORD datasize, DWORD flags) +{ + FIXME("(0x%lx, 0x%lx, %s, %p, %p, %p, %u, 0x%08x): stub\n", provider, decrypt_key, + wine_dbgstr_w(type), params, + key, data, datasize, flags); + return NTE_NOT_SUPPORTED; +} + SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, const WCHAR *name, DWORD keyspec, DWORD flags) { diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index cf5decbc8c..ac5e85895a 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -76,7 +76,7 @@ @ stdcall NCryptFreeObject(long) @ stdcall NCryptGetProperty(ptr wstr ptr long ptr long) @ stub NCryptGetProtectionDescriptorInfo -@ stub NCryptImportKey +@ stdcall NCryptImportKey(long long wstr ptr ptr ptr long long) @ stub NCryptIsAlgSupported @ stub NCryptIsKeyHandle @ stub NCryptKeyDerivation diff --git a/include/ncrypt.h b/include/ncrypt.h index 9712f2f521..111693f1d4 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -39,6 +39,18 @@ typedef struct _NCryptAlgorithmName { DWORD dwFlags; } NCryptAlgorithmName; +typedef struct _NCryptBuffer { + ULONG cbBuffer; + ULONG BufferType; + PVOID pvBuffer; +} NCryptBuffer, *PNCryptBuffer; + +typedef struct _NCryptBufferDesc { + ULONG ulVersion; + ULONG cBuffers; + PNCryptBuffer pBuffers; +} NCryptBufferDesc, *PNCryptBufferDesc; + typedef struct NCryptKeyName { LPWSTR pszName; LPWSTR pszAlgid;

1 0

Joseph Kogut : ncrypt: Add NCryptDeleteKey stub.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: 0ea8128a882757689a0a695af4867b3f4d32662f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ea8128a882757689a0a695a… Author: Joseph Kogut <joseph.kogut(a)gmail.com> Date: Fri Oct 4 18:27:11 2019 -0700 ncrypt: Add NCryptDeleteKey stub. Signed-off-by: Joseph Kogut <joseph.kogut(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 6 ++++++ dlls/ncrypt/ncrypt.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 2d4a513140..1f06ed398e 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -60,6 +60,12 @@ SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD i return NTE_NOT_SUPPORTED; } +SECURITY_STATUS WINAPI NCryptDeleteKey(NCRYPT_KEY_HANDLE key, DWORD flags) +{ + FIXME("(0x%lx, 0x%08x): stub\n", key, flags); + return NTE_NOT_SUPPORTED; +} + SECURITY_STATUS WINAPI NCryptEncrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD insize, void *padding, BYTE *output, DWORD outsize, DWORD *result, DWORD flags) { diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index ac5e85895a..b58ef34434 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -63,7 +63,7 @@ @ stdcall NCryptCreatePersistedKey(long ptr wstr wstr long long) @ stub NCryptCreateProtectionDescriptor @ stdcall NCryptDecrypt(long ptr long ptr ptr long ptr long) -@ stub NCryptDeleteKey +@ stdcall NCryptDeleteKey(long long) @ stub NCryptDeriveKey @ stub NCryptDuplicateKeyProtectorHandle @ stdcall NCryptEncrypt(long ptr long ptr ptr long ptr long)

1 0