October 2019 - Wine-Commits

Zebediah Figura : qcap: Use strmbase_dump_media_type() where appropriate.
by Alexandre Julliard Oct. 7, 2019

Oct. 7, 2019

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 : quartz: Use strmbase_dump_media_type() where appropriate.
by Alexandre Julliard Oct. 7, 2019

Oct. 7, 2019

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 : strmbase: Introduce a helper to more thoroughly trace media type.
by Alexandre Julliard Oct. 7, 2019

Oct. 7, 2019

Module: wine Branch: master Commit: b33f05830811b96ad7ff7534383e7007677ac85c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b33f05830811b96ad7ff7534… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 5 19:18:50 2019 -0500 strmbase: Introduce a helper to more thoroughly trace media type. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/mediatype.c | 110 +++++++++++++++++++++++++++++++++++++++++++--- dlls/strmbase/pin.c | 21 +++------ dlls/strmbase/renderer.c | 4 ++ dlls/strmbase/transform.c | 1 + include/wine/strmbase.h | 2 + 5 files changed, 116 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b33f05830811b96ad7ff…

1 0

Zebediah Figura : strmbase: Introduce a helper to trace reference time.
by Alexandre Julliard Oct. 7, 2019

Oct. 7, 2019

Module: wine Branch: master Commit: a9b87a8216ba62ceee7202fa51ce3644de6dadfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9b87a8216ba62ceee7202fa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 5 19:18:49 2019 -0500 strmbase: Introduce a helper to trace reference time. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/filter.c | 2 +- dlls/strmbase/pin.c | 6 ++++-- dlls/strmbase/pospass.c | 6 +++--- dlls/strmbase/qualitycontrol.c | 32 ++++++++++++++------------------ dlls/strmbase/renderer.c | 3 ++- dlls/strmbase/strmbase_private.h | 18 ++++++++++++++++++ dlls/strmbase/transform.c | 5 +++-- 7 files changed, 45 insertions(+), 27 deletions(-) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 2de0a78f7a..c9d15e31c7 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -153,7 +153,7 @@ HRESULT WINAPI BaseFilterImpl_Run(IBaseFilter *iface, REFERENCE_TIME start) { struct strmbase_filter *filter = impl_from_IBaseFilter(iface); - TRACE("iface %p, start %s.\n", iface, wine_dbgstr_longlong(start)); + TRACE("iface %p, start %s.\n", iface, debugstr_time(start)); EnterCriticalSection(&filter->csFilter); filter->state = State_Running; diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index cc7db119fa..42b150be67 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -346,7 +346,8 @@ HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFER { struct strmbase_pin *This = impl_from_IPin(iface); - TRACE("(%p)->(%s, %s, %e)\n", This, wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); + TRACE("iface %p, start %s, stop %s, rate %.16e.\n", + iface, debugstr_time(tStart), debugstr_time(tStop), dRate); This->tStart = tStart; This->tStop = tStop; @@ -858,7 +859,8 @@ HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); newsegmentargs args; - TRACE("(%p)->(%s, %s, %e)\n", This, wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); + TRACE("iface %p, start %s, stop %s, rate %.16e.\n", + iface, debugstr_time(tStart), debugstr_time(tStop), dRate); args.tStart = This->pin.tStart = tStart; args.tStop = This->pin.tStop = tStop; diff --git a/dlls/strmbase/pospass.c b/dlls/strmbase/pospass.c index 2c5c274bba..148d4fae3c 100644 --- a/dlls/strmbase/pospass.c +++ b/dlls/strmbase/pospass.c @@ -743,7 +743,7 @@ static HRESULT WINAPI MediaPositionPassThru_put_CurrentPosition(IMediaPosition * IMediaPosition *pos; HRESULT hr; - TRACE("(%s)\n", wine_dbgstr_longlong(llTime)); + TRACE("iface %p, time %.16e.\n", iface, llTime); hr = get_connected(This, &IID_IMediaPosition, (LPVOID*)&pos); if (SUCCEEDED(hr)) { @@ -797,7 +797,7 @@ static HRESULT WINAPI MediaPositionPassThru_put_StopTime(IMediaPosition *iface, IMediaPosition *pos; HRESULT hr; - TRACE("(%s)\n", wine_dbgstr_longlong(llTime)); + TRACE("iface %p, time %.16e.\n", iface, llTime); hr = get_connected(This, &IID_IMediaPosition, (LPVOID*)&pos); if (SUCCEEDED(hr)) { @@ -833,7 +833,7 @@ static HRESULT WINAPI MediaPositionPassThru_put_PrerollTime(IMediaPosition *ifac IMediaPosition *pos; HRESULT hr; - TRACE("(%s)\n", wine_dbgstr_longlong(llTime)); + TRACE("iface %p, time %.16e.\n", iface, llTime); hr = get_connected(This, &IID_IMediaPosition, (LPVOID*)&pos); if (SUCCEEDED(hr)) { diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index 139c4dfe86..b3e93b7baa 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -27,9 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase_qc); -#define XTIME_FMT "%u.%03u" -#define XTIME(u) (int)(u/10000000), (int)((u / 10000)%1000) - HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControlImpl **ppv) { QualityControlImpl *This; @@ -80,9 +77,8 @@ HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *se QualityControlImpl *This = impl_from_IQualityControl(iface); HRESULT hr = S_FALSE; - TRACE("%p %p { 0x%x %u " XTIME_FMT " " XTIME_FMT " }\n", - This, sender, qm.Type, qm.Proportion, - XTIME(qm.Late), XTIME(qm.TimeStamp)); + TRACE("iface %p, sender %p, type %#x, proportion %u, late %s, timestamp %s.\n", + iface, sender, qm.Type, qm.Proportion, debugstr_time(qm.Late), debugstr_time(qm.TimeStamp)); if (This->tonotify) return IQualityControl_Notify(This->tonotify, This->self, qm); @@ -126,7 +122,6 @@ HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityContro void QualityControlRender_Start(QualityControlImpl *This, REFERENCE_TIME tStart) { - TRACE("%p " XTIME_FMT "\n", This, XTIME(tStart)); This->avg_render = This->last_in_time = This->last_left = This->avg_duration = This->avg_pt = -1; This->clockstart = tStart; This->avg_rate = -1.0; @@ -147,8 +142,8 @@ static BOOL QualityControlRender_IsLate(QualityControlImpl *This, REFERENCE_TIME { REFERENCE_TIME max_lateness = 200000; - TRACE("%p " XTIME_FMT " " XTIME_FMT " " XTIME_FMT "\n", - This, XTIME(jitter), XTIME(start), XTIME(stop)); + TRACE("jitter %s, start %s, stop %s.\n", debugstr_time(jitter), + debugstr_time(start), debugstr_time(stop)); /* we can add a valid stop time */ if (stop >= start) @@ -217,12 +212,12 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv) pt = priv->avg_pt; } - TRACE("start: " XTIME_FMT ", entered " XTIME_FMT ", left " XTIME_FMT ", pt: " XTIME_FMT ", " - "duration " XTIME_FMT ", jitter " XTIME_FMT "\n", XTIME(start), XTIME(entered), - XTIME(left), XTIME(pt), XTIME(duration), XTIME(jitter)); + TRACE("start %s, entered %s, left %s, pt %s, duration %s, jitter %s.\n", + debugstr_time(start), debugstr_time(entered), debugstr_time(left), + debugstr_time(pt), debugstr_time(duration), debugstr_time(jitter)); - TRACE("avg_duration: " XTIME_FMT ", avg_pt: " XTIME_FMT ", avg_rate: %g\n", - XTIME(priv->avg_duration), XTIME(priv->avg_pt), priv->avg_rate); + TRACE("average duration %s, average pt %s, average rate %.16e.\n", + debugstr_time(priv->avg_duration), debugstr_time(priv->avg_pt), priv->avg_rate); /* collect running averages. for first observations, we copy the * values */ @@ -274,7 +269,7 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv) q.Proportion = 5000; q.Late = priv->current_jitter; q.TimeStamp = priv->current_rstart; - TRACE("Late: %i from %i, rate: %g\n", (int)(q.Late/10000), (int)(q.TimeStamp/10000), 1./priv->avg_rate); + TRACE("Late: %s from %s, rate: %g\n", debugstr_time(q.Late), debugstr_time(q.TimeStamp), 1./priv->avg_rate); hr = IQualityControl_Notify(&priv->IQualityControl_iface, priv->self, q); priv->qos_handled = hr == S_OK; } @@ -302,8 +297,8 @@ void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME s /* FIXME: This isn't correct; we don't drop samples, nor should. */ This->is_dropped = QualityControlRender_IsLate(This, This->current_jitter, start, stop); - TRACE("Dropped: %i %i %i %i\n", This->is_dropped, (int)(start/10000), - (int)(stop/10000), (int)(This->current_jitter / 10000)); + TRACE("dropped %d, start %s, stop %s, jitter %s.\n", This->is_dropped, + debugstr_time(start), debugstr_time(stop), debugstr_time(This->current_jitter)); if (This->is_dropped) This->dropped++; else @@ -313,7 +308,8 @@ void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME s return; IReferenceClock_GetTime(This->clock, &This->start); - TRACE("at: " XTIME_FMT "\n", XTIME(This->start)); + + TRACE("Starting at %s.\n", debugstr_time(This->start)); } void QualityControlRender_EndRender(QualityControlImpl *This) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 7d8420e73c..270a6f260f 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -426,7 +426,8 @@ HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface) HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) { BaseRenderer *This = impl_from_IBaseFilter(iface); - TRACE("(%p)->(%s)\n", This, wine_dbgstr_longlong(tStart)); + + TRACE("iface %p, start %s.\n", iface, debugstr_time(tStart)); EnterCriticalSection(&This->csRenderLock); This->stream_start = tStart; diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index 4dd7caa924..d0f5029765 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -32,6 +32,24 @@ #include "wine/list.h" #include "wine/strmbase.h" +static inline const char *debugstr_time(REFERENCE_TIME time) +{ + unsigned int i = 0, j = 0; + char buffer[22], rev[22]; + + while (time || i <= 8) + { + buffer[i++] = '0' + (time % 10); + time /= 10; + if (i == 7) buffer[i++] = '.'; + } + + while (i--) rev[j++] = buffer[i]; + rev[j] = 0; + + return wine_dbg_sprintf("%s", rev); +} + /* Quality Control */ typedef struct QualityControlImpl { IQualityControl IQualityControl_iface; diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index abf5ed34b3..bd70b8a90c 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -254,7 +254,7 @@ static HRESULT WINAPI TransformFilterImpl_Run(IBaseFilter *iface, REFERENCE_TIME HRESULT hr = S_OK; TransformFilter *This = impl_from_IBaseFilter(iface); - TRACE("(%p/%p)->(%s)\n", This, iface, wine_dbgstr_longlong(tStart)); + TRACE("iface %p, start %s.\n", iface, debugstr_time(tStart)); EnterCriticalSection(&This->csReceive); { @@ -453,7 +453,8 @@ static HRESULT WINAPI TransformFilter_InputPin_NewSegment(IPin * iface, REFERENC TransformFilter *pTransform = impl_from_sink_IPin(iface); HRESULT hr = S_OK; - TRACE("(%p)->(%s %s %e)\n", iface, wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); + TRACE("iface %p, start %s, stop %s, rate %.16e.\n", + iface, debugstr_time(tStart), debugstr_time(tStop), dRate); EnterCriticalSection(&pTransform->filter.csFilter); if (pTransform->pFuncsTable->pfnNewSegment)

1 0

Joseph Kogut : ncrypt: Add NCryptIsAlgSupported stub.
by Alexandre Julliard Oct. 7, 2019

Oct. 7, 2019

Module: wine Branch: master Commit: 1f75b081275c7e7991584206dad4bb37094cd80c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f75b081275c7e7991584206… Author: Joseph Kogut <joseph.kogut(a)gmail.com> Date: Fri Oct 4 18:27:12 2019 -0700 ncrypt: Add NCryptIsAlgSupported 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 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 1f06ed398e..c0cc05c43c 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -125,6 +125,13 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H return NTE_NOT_SUPPORTED; } +SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const WCHAR *algid, + DWORD flags) +{ + FIXME("(0x%lx, %s, 0x%08x): stub\n", provider, wine_dbgstr_w(algid), 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 b58ef34434..3908cbfb91 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -77,7 +77,7 @@ @ stdcall NCryptGetProperty(ptr wstr ptr long ptr long) @ stub NCryptGetProtectionDescriptorInfo @ stdcall NCryptImportKey(long long wstr ptr ptr ptr long long) -@ stub NCryptIsAlgSupported +@ stub NCryptIsAlgSupported(long wstr long) @ stub NCryptIsKeyHandle @ stub NCryptKeyDerivation @ stub NCryptNotifyChangeKey

1 0

Sven Baars : comctl32/tests: Prevent some test failures by moving the cursor away from the window.
by Alexandre Julliard Oct. 7, 2019

Oct. 7, 2019

Module: wine Branch: master Commit: 3dcff4de701bc08845f1945a9b8efd3c4a1aedad URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dcff4de701bc08845f1945a… Author: Sven Baars <sven.wine(a)gmail.com> Date: Mon Oct 7 11:19:40 2019 +0200 comctl32/tests: Prevent some test failures by moving the cursor away from the window. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/edit.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index f454434a0c..6013cafb59 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3315,6 +3315,9 @@ static void test_change_focus(void) HWND hwnd, parent_wnd; WNDPROC oldproc; MSG msg; + POINT orig_pos; + + GetCursorPos(&orig_pos); parent_wnd = CreateWindowA("ParentWnd", "", WS_OVERLAPPEDWINDOW, 0, 0, 200, 200, NULL, NULL, GetModuleHandleA(NULL), NULL); @@ -3329,6 +3332,8 @@ static void test_change_focus(void) oldproc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)edit_subclass_proc); SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc); + SetCursorPos(400, 400); + SetFocus(parent_wnd); flush_sequences(sequences, NUM_MSG_SEQUENCES); SetFocus(hwnd); @@ -3340,6 +3345,8 @@ static void test_change_focus(void) while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok_sequence(sequences, COMBINED_SEQ_INDEX, killfocus_combined_seq, "Kill focus", TRUE); + SetCursorPos(orig_pos.x, orig_pos.y); + DestroyWindow(hwnd); }

1 0

Joseph Kogut : ncrypt: Add NCryptImportKey stub.
by Alexandre Julliard Oct. 7, 2019

Oct. 7, 2019

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 Oct. 7, 2019

Oct. 7, 2019

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

Joseph Kogut : ncrypt: Add NCrypt{Get,Set}Property stubs.
by Alexandre Julliard Oct. 7, 2019

Oct. 7, 2019

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 NCryptEnumAlgorithms stub.
by Alexandre Julliard Oct. 7, 2019

Oct. 7, 2019

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