September 2020 - Wine-commits

Hans Leidekker : crypt32: Store CERT_KEY_CONTEXT in a platform independent way.
by Alexandre Julliard 10 Sep '20

10 Sep '20

Module: wine Branch: master Commit: 49165c25e8dff9ab3c49f55081669eb5d00b78b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49165c25e8dff9ab3c49f550… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 10 15:20:11 2020 +0200 crypt32: Store CERT_KEY_CONTEXT in a platform independent way. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49792 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 34 ++++++++++++++++++++++++++++++---- dlls/crypt32/crypt32_private.h | 8 ++++++++ dlls/crypt32/serialize.c | 7 +++++++ 3 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index e4cab01cd9..13d8df9258 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -428,6 +428,13 @@ static BOOL CertContext_CopyParam(void *pvData, DWORD *pcbData, const void *pb, return ret; } +void CRYPT_ConvertKeyContext(const struct store_CERT_KEY_CONTEXT *src, CERT_KEY_CONTEXT *dst) +{ + dst->cbSize = sizeof(*dst); + dst->hCryptProv = src->hCryptProv; + dst->dwKeySpec = src->dwKeySpec; +} + static BOOL CertContext_GetProperty(cert_t *cert, DWORD dwPropId, void *pvData, DWORD *pcbData) { @@ -441,7 +448,16 @@ static BOOL CertContext_GetProperty(cert_t *cert, DWORD dwPropId, else ret = FALSE; if (ret) + { + CERT_KEY_CONTEXT ctx; + if (dwPropId == CERT_KEY_CONTEXT_PROP_ID) + { + CRYPT_ConvertKeyContext((const struct store_CERT_KEY_CONTEXT *)blob.pbData, &ctx); + blob.pbData = (BYTE *)&ctx; + blob.cbData = ctx.cbSize; + } ret = CertContext_CopyParam(pvData, pcbData, blob.pbData, blob.cbData); + } else { /* Implicit properties */ @@ -732,6 +748,19 @@ static BOOL CertContext_SetKeyProvInfoProperty(CONTEXT_PROPERTY_LIST *properties return ret; } +static BOOL CertContext_SetKeyContextProperty(CONTEXT_PROPERTY_LIST *properties, + const CERT_KEY_CONTEXT *keyContext) +{ + struct store_CERT_KEY_CONTEXT ctx; + + ctx.cbSize = sizeof(ctx); + ctx.hCryptProv = keyContext->hCryptProv; + ctx.dwKeySpec = keyContext->dwKeySpec; + + return ContextPropertyList_SetProperty(properties, CERT_KEY_CONTEXT_PROP_ID, + (const BYTE *)&ctx, ctx.cbSize); +} + static BOOL CertContext_SetProperty(cert_t *cert, DWORD dwPropId, DWORD dwFlags, const void *pvData) { @@ -790,7 +819,6 @@ static BOOL CertContext_SetProperty(cert_t *cert, DWORD dwPropId, } break; case CERT_KEY_CONTEXT_PROP_ID: - { if (pvData) { const CERT_KEY_CONTEXT *keyContext = pvData; @@ -801,8 +829,7 @@ static BOOL CertContext_SetProperty(cert_t *cert, DWORD dwPropId, ret = FALSE; } else - ret = ContextPropertyList_SetProperty(cert->base.properties, dwPropId, - (const BYTE *)keyContext, keyContext->cbSize); + ret = CertContext_SetKeyContextProperty(cert->base.properties, pvData); } else { @@ -810,7 +837,6 @@ static BOOL CertContext_SetProperty(cert_t *cert, DWORD dwPropId, ret = TRUE; } break; - } case CERT_KEY_PROV_INFO_PROP_ID: if (pvData) ret = CertContext_SetKeyProvInfoProperty(cert->base.properties, pvData); diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index d92eb1a157..c552bdf949 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -378,6 +378,14 @@ BOOL CRYPT_ReadSerializedStoreFromBlob(const CRYPT_DATA_BLOB *blob, */ void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info) DECLSPEC_HIDDEN; +struct store_CERT_KEY_CONTEXT +{ + DWORD cbSize; + DWORD64 hCryptProv; + DWORD dwKeySpec; +}; +void CRYPT_ConvertKeyContext(const struct store_CERT_KEY_CONTEXT *src, CERT_KEY_CONTEXT *dst) DECLSPEC_HIDDEN; + /** * String functions */ diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index e8ccc4a06e..7f7a4bc369 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -280,6 +280,13 @@ static BOOL CRYPT_ReadContextProp( hdr->propID, 0, pbElement); break; } + case CERT_KEY_CONTEXT_PROP_ID: + { + CERT_KEY_CONTEXT ctx; + CRYPT_ConvertKeyContext((struct store_CERT_KEY_CONTEXT *)pbElement, &ctx); + ret = contextInterface->setProp(context, hdr->propID, 0, &ctx); + break; + } default: ret = FALSE; }

1 0

Gabriel Ivăncescu : msscript.ocx: Supply a stub ServiceProvider to InvokeEx in run_procedure.
by Alexandre Julliard 10 Sep '20

10 Sep '20

Module: wine Branch: master Commit: c409ab6290fd3d9e69492e10836db153e7f6a836 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c409ab6290fd3d9e69492e10… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 10 16:32:59 2020 +0300 msscript.ocx: Supply a stub ServiceProvider to InvokeEx in run_procedure. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 47 +++++++++++++++++++++++++++++++++++++- dlls/msscript.ocx/tests/msscript.c | 30 ++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index ed17be90d8..70dc05f61e 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -434,6 +434,51 @@ static HRESULT parse_script_text(ScriptModule *module, BSTR script_text, DWORD f return hr; } +static HRESULT WINAPI sp_caller_QueryInterface(IServiceProvider *iface, REFIID riid, void **obj) +{ + if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IServiceProvider, riid)) + *obj = iface; + else + { + FIXME("(%p)->(%s)\n", iface, debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*obj); + return S_OK; +} + +static ULONG WINAPI sp_caller_AddRef(IServiceProvider *iface) +{ + return 2; +} + +static ULONG WINAPI sp_caller_Release(IServiceProvider *iface) +{ + return 1; +} + +static HRESULT WINAPI sp_caller_QueryService(IServiceProvider *iface, REFGUID service, REFIID riid, void **obj) +{ + FIXME("(%p)->(%s %s %p): semi-stub\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + *obj = NULL; + if (IsEqualGUID(&SID_GetCaller, service)) + return S_OK; + + return E_NOINTERFACE; +} + +static const IServiceProviderVtbl sp_caller_vtbl = { + sp_caller_QueryInterface, + sp_caller_AddRef, + sp_caller_Release, + sp_caller_QueryService +}; + +static IServiceProvider sp_caller = { &sp_caller_vtbl }; + static HRESULT run_procedure(ScriptModule *module, BSTR procedure_name, SAFEARRAY *args, VARIANT *res) { IDispatchEx *dispex; @@ -475,7 +520,7 @@ static HRESULT run_procedure(ScriptModule *module, BSTR procedure_name, SAFEARRA else { hr = IDispatchEx_InvokeEx(dispex, dispid, LOCALE_USER_DEFAULT, - DISPATCH_METHOD, &dp, res, NULL, NULL); + DISPATCH_METHOD, &dp, res, NULL, &sp_caller); IDispatchEx_Release(dispex); } } diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index a6ec0992c8..4f43764234 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -673,6 +673,10 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { + IServiceProvider *sp; + IUnknown *unk; + HRESULT hr; + CHECK_EXPECT(InvokeEx); ok(lcid == LOCALE_USER_DEFAULT, "unexpected lcid %u.\n", lcid); ok(wFlags == DISPATCH_METHOD, "unexpected wFlags %u.\n", wFlags); @@ -690,6 +694,32 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc "unexpected second parameter V_VT = %d, V_I4 = %d.\n", V_VT(pdp->rgvarg), V_I4(pdp->rgvarg)); } + ok(!!pspCaller, "unexpected NULL pspCaller.\n"); + + hr = IActiveScriptSite_QueryInterface(site, &IID_IServiceProvider, (void**)&sp); + ok(hr == S_OK, "Failed to retrieve IID_IServiceProvider from script site: 0x%08x.\n", hr); + ok(sp != pspCaller, "Same IServiceProvider objects.\n"); + IServiceProvider_Release(sp); + + hr = IServiceProvider_QueryInterface(pspCaller, &IID_IActiveScriptSite, (void**)&unk); + ok(hr == E_NOINTERFACE, "QueryInterface IActiveScriptSite returned: 0x%08x.\n", hr); + + unk = (IUnknown*)0xdeadbeef; + hr = IServiceProvider_QueryService(pspCaller, &SID_GetCaller, NULL, (void**)&unk); + ok(hr == S_OK, "QueryService failed: 0x%08x.\n", hr); + ok(!unk, "unexpected object returned %p.\n", unk); + unk = (IUnknown*)0xdeadbeef; + hr = IServiceProvider_QueryService(pspCaller, &SID_GetCaller, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryService failed: 0x%08x.\n", hr); + ok(!unk, "unexpected object returned %p.\n", unk); + sp = (IServiceProvider*)0xdeadbeef; + hr = IServiceProvider_QueryService(pspCaller, &SID_GetCaller, &IID_IServiceProvider, (void**)&sp); + ok(hr == S_OK, "QueryService failed: 0x%08x.\n", hr); + ok(!sp, "unexpected object returned %p.\n", sp); + unk = (IUnknown*)0xdeadbeef; + hr = IServiceProvider_QueryService(pspCaller, &SID_VariantConversion, &IID_IVariantChangeType, (void**)&unk); + ok(hr == E_NOINTERFACE, "QueryService returned: 0x%08x.\n", hr); + ok(!unk, "unexpected object returned %p.\n", unk); V_VT(pvarRes) = VT_I2; V_I2(pvarRes) = 42;

1 0

Alex Henrie : comdlg32: Fix error precedence in IFileDialog2_SetFileTypes.
by Alexandre Julliard 10 Sep '20

10 Sep '20

Module: wine Branch: master Commit: 1a0470443d12f6fc4c241a93af5bc34aa03b34b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a0470443d12f6fc4c241a93… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 9 23:40:26 2020 -0600 comdlg32: Fix error precedence in IFileDialog2_SetFileTypes. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/itemdlg.c | 6 +++--- dlls/comdlg32/tests/itemdlg.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 1ae20ca782..f17c2f926d 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -2402,12 +2402,12 @@ static HRESULT WINAPI IFileDialog2_fnSetFileTypes(IFileDialog2 *iface, UINT cFil UINT i; TRACE("%p (%d, %p)\n", This, cFileTypes, rgFilterSpec); - if(This->filterspecs) - return E_UNEXPECTED; - if(!rgFilterSpec) return E_INVALIDARG; + if(This->filterspecs) + return E_UNEXPECTED; + if(!cFileTypes) return S_OK; diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 6ee0d5fc3d..c38457a0a1 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -675,6 +675,8 @@ static void test_basics(void) ok(hr == S_OK, "got 0x%08x.\n", hr); hr = IFileOpenDialog_SetFileTypes(pfod, 0, filterspec); ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); + hr = IFileOpenDialog_SetFileTypes(pfod, 0, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); hr = IFileOpenDialog_SetFileTypeIndex(pfod, 0); ok(hr == S_OK, "got 0x%08x.\n", hr); hr = IFileOpenDialog_GetFileTypeIndex(pfod, &filetype);

1 0

Anton Baskanov : amstream: Implement AMDirectDrawStream::GetFormat.
by Alexandre Julliard 10 Sep '20

10 Sep '20

Module: wine Branch: master Commit: 3f712c1d43122c120eee23fb980a631942fc9e78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f712c1d43122c120eee23fb… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Sep 10 02:17:35 2020 +0700 amstream: Implement AMDirectDrawStream::GetFormat. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 111 ++++++++++++++-- dlls/amstream/tests/amstream.c | 279 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 382 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f712c1d43122c120eee…

1 0

Anton Baskanov : amstream: Implement AMDirectDrawStream::SetFormat.
by Alexandre Julliard 10 Sep '20

10 Sep '20

Module: wine Branch: master Commit: 8c1204ffeeb68829a1dac9594e301cb1dd36df85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c1204ffeeb68829a1dac959… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Sep 10 02:17:36 2020 +0700 amstream: Implement AMDirectDrawStream::SetFormat. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 81 ++++++++++++- dlls/amstream/tests/amstream.c | 258 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 336 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8c1204ffeeb68829a1da…

1 0

Anton Baskanov : amstream: Reject incompatible media types in AMDirectDrawStream::ReceiveConnection.
by Alexandre Julliard 10 Sep '20

10 Sep '20

Module: wine Branch: master Commit: 337fcca4d1e0d494192d67786dbf1feeac87f592 URL: https://source.winehq.org/git/wine.git/?a=commit;h=337fcca4d1e0d494192d6778… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Sep 10 02:17:37 2020 +0700 amstream: Reject incompatible media types in AMDirectDrawStream::ReceiveConnection. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 26 +++++++ dlls/amstream/tests/amstream.c | 152 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 178 insertions(+) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 542c315930..c281c81d33 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -61,6 +61,26 @@ struct ddraw_stream static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDrawSurface *surface, const RECT *rect, IDirectDrawStreamSample **ddraw_stream_sample); +static BOOL is_format_compatible(struct ddraw_stream *stream, + DWORD width, DWORD height, const DDPIXELFORMAT *connection_pf) +{ + if (stream->format.flags & DDSD_HEIGHT) + { + if (stream->format.width != width || stream->format.height != height) + return FALSE; + } + if (stream->format.flags & DDSD_PIXELFORMAT) + { + if (stream->format.pf.dwFlags & DDPF_FOURCC) + return FALSE; + if (stream->format.pf.u1.dwRGBBitCount != connection_pf->u1.dwRGBBitCount) + return FALSE; + if (stream->format.pf.u1.dwRGBBitCount == 16 && stream->format.pf.u3.dwGBitMask != connection_pf->u3.dwGBitMask) + return FALSE; + } + return TRUE; +} + static inline struct ddraw_stream *impl_from_IAMMediaStream(IAMMediaStream *iface) { return CONTAINING_RECORD(iface, struct ddraw_stream, IAMMediaStream_iface); @@ -824,6 +844,12 @@ static HRESULT WINAPI ddraw_sink_ReceiveConnection(IPin *iface, IPin *peer, cons return VFW_E_TYPE_NOT_ACCEPTED; } + if (!is_format_compatible(stream, width, height, &pf)) + { + LeaveCriticalSection(&stream->cs); + return VFW_E_TYPE_NOT_ACCEPTED; + } + IPin_QueryDirection(peer, &dir); if (dir != PINDIR_OUTPUT) { diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index f081c58a2a..0b343b4912 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -3353,13 +3353,34 @@ static void test_ddrawstream_receive_connection(void) IDirectDrawMediaStream *ddraw_stream; IAMMultiMediaStream *mmstream; struct testfilter source; + DDSURFACEDESC format; IMediaStream *stream; + VIDEOINFO video_info; AM_MEDIA_TYPE mt; HRESULT hr; ULONG ref; IPin *pin; int i; + static const VIDEOINFO yuy2_video_info = + { + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 333, + .bmiHeader.biHeight = -444, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 16, + .bmiHeader.biCompression = MAKEFOURCC('Y', 'U', 'Y', '2'), + }; + + const AM_MEDIA_TYPE yuy2_mt = + { + .majortype = MEDIATYPE_Video, + .subtype = MEDIASUBTYPE_YUY2, + .formattype = FORMAT_VideoInfo, + .cbFormat = sizeof(VIDEOINFOHEADER), + .pbFormat = (BYTE *)&yuy2_video_info, + }; + const AM_MEDIA_TYPE video_mt = { .majortype = MEDIATYPE_Video, @@ -3420,6 +3441,137 @@ static void test_ddrawstream_receive_connection(void) } } + format = rgb8_format; + format.dwFlags = DDSD_WIDTH; + format.dwWidth = 222; + format.dwHeight = 555; + hr = IDirectDrawMediaStream_SetFormat(ddraw_stream, &format, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb32_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + format = rgb8_format; + format.dwFlags = DDSD_HEIGHT; + format.dwWidth = 333; + format.dwHeight = 444; + hr = IDirectDrawMediaStream_SetFormat(ddraw_stream, &format, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + video_info = rgb555_video_info; + video_info.bmiHeader.biWidth = 333; + video_info.bmiHeader.biHeight = 444; + mt = rgb555_mt; + mt.pbFormat = (BYTE *)&video_info; + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb32_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + video_info = rgb32_video_info; + video_info.bmiHeader.biWidth = 332; + video_info.bmiHeader.biHeight = 444; + mt = rgb32_mt; + mt.pbFormat = (BYTE *)&video_info; + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + + video_info = rgb32_video_info; + video_info.bmiHeader.biWidth = 333; + video_info.bmiHeader.biHeight = 443; + mt = rgb32_mt; + mt.pbFormat = (BYTE *)&video_info; + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_SetFormat(ddraw_stream, &rgb8_format, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb555_mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb8_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_SetFormat(ddraw_stream, &rgb555_format, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb565_mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb555_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_SetFormat(ddraw_stream, &rgb565_format, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb24_mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb565_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_SetFormat(ddraw_stream, &rgb24_format, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb32_mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb24_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_SetFormat(ddraw_stream, &rgb32_format, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb8_mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb32_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_SetFormat(ddraw_stream, &yuy2_format, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &yuy2_mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + + format = yuy2_format; + format.ddpfPixelFormat.dwRBitMask = 0xf800; + format.ddpfPixelFormat.dwGBitMask = 0x07e0; + format.ddpfPixelFormat.dwBBitMask = 0x001f; + hr = IDirectDrawMediaStream_SetFormat(ddraw_stream, &format, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb565_mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + + format = rgb8_format; + format.dwFlags = 0; + hr = IDirectDrawMediaStream_SetFormat(ddraw_stream, &format, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb565_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = IAMMultiMediaStream_Release(mmstream); ok(!ref, "Got outstanding refcount %d.\n", ref); IPin_Release(pin);

1 0

Anton Baskanov : amstream: Reconnect if the new format is incompatible with the connection media type in AMDirectDrawStream::SetFormat.
by Alexandre Julliard 10 Sep '20

10 Sep '20

Module: wine Branch: master Commit: 47ab12402201b1b7f93e9505c60f5ef8755d55a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47ab12402201b1b7f93e9505… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Sep 10 02:17:38 2020 +0700 amstream: Reconnect if the new format is incompatible with the connection media type in AMDirectDrawStream::SetFormat. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 37 ++++++++++++ dlls/amstream/tests/amstream.c | 130 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 166 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=47ab12402201b1b7f93e…

1 0

Anton Baskanov : amstream: Use current format to create surface in AMDirectDrawStream::CreateSample.
by Alexandre Julliard 10 Sep '20

10 Sep '20

Module: wine Branch: master Commit: e64a2e112e12afbd64e27a9eee0acaa3f7dcaffd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e64a2e112e12afbd64e27a9e… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Sep 10 02:17:39 2020 +0700 amstream: Use current format to create surface in AMDirectDrawStream::CreateSample. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 25 +++--- dlls/amstream/tests/amstream.c | 174 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 190 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e64a2e112e12afbd64e2…

1 0

Ken Thomases : dbghelp: Avoid asserting on egregiously long stabs symbol names.
by Alexandre Julliard 10 Sep '20

10 Sep '20

Module: wine Branch: master Commit: c7a0d5f6266b9ca315558d4042a3c355baa1cf5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7a0d5f6266b9ca315558d40… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Sep 9 14:21:48 2020 -0500 dbghelp: Avoid asserting on egregiously long stabs symbol names. Some Mac libraries have symbols which are many thousands of characters long. (Thank you, C++ templates!) It doesn't seem worth it to accommodate those by dynamically allocating the symbol name buffer, but we definitely don't want to assert. Just log an ERR. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/stabs.c | 58 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index b1b4a6ef1c..517299897c 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -83,7 +83,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); #define N_EXCL 0xc2 #define N_RBRAC 0xe0 -static void stab_strcpy(char* dest, int sz, const char* source) +static BOOL stab_strcpy(char* dest, int sz, const char* source) { char* ptr = dest; /* @@ -115,7 +115,7 @@ static void stab_strcpy(char* dest, int sz, const char* source) while (ptr > dest && isdigit(*ptr)) ptr--; if (*ptr == '.') *ptr = '\0'; } - assert(sz > 0); + return (sz > 0); } typedef struct @@ -1134,8 +1134,12 @@ static inline void pending_add_var(struct pending_list* pending, const char* nam { pending_make_room(pending); pending->objs[pending->num].tag = PENDING_VAR; - stab_strcpy(pending->objs[pending->num].u.var.name, - sizeof(pending->objs[pending->num].u.var.name), name); + if (!stab_strcpy(pending->objs[pending->num].u.var.name, + sizeof(pending->objs[pending->num].u.var.name), name)) + { + ERR("symbol too long %s\n", debugstr_a(name)); + return; + } pending->objs[pending->num].u.var.type = stabs_parse_type(name); pending->objs[pending->num].u.var.kind = dt; pending->objs[pending->num].u.var.loc = *loc; @@ -1327,8 +1331,8 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, stabbuf_append(&stabbuff, &stabbufflen, ptr); ptr = stabbuff; } - stab_strcpy(symname, sizeof(symname), ptr); - if (!stabs_parse_typedef(module, ptr, symname)) + if (!stab_strcpy(symname, sizeof(symname), ptr) || + !stabs_parse_typedef(module, ptr, symname)) { /* skip this definition */ stabbuff[0] = '\0'; @@ -1348,7 +1352,12 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, * * With a.out or mingw, they actually do make some amount of sense. */ - stab_strcpy(symname, sizeof(symname), ptr); + if (!stab_strcpy(symname, sizeof(symname), ptr)) + { + ERR("symbol too long: %s\n", debugstr_a(ptr)); + stabbuff[0] = '\0'; + continue; + } loc.kind = loc_absolute; loc.reg = 0; loc.offset = load_offset + n_value; @@ -1358,7 +1367,12 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, case N_LCSYM: case N_STSYM: /* These are static symbols and BSS symbols. */ - stab_strcpy(symname, sizeof(symname), ptr); + if (!stab_strcpy(symname, sizeof(symname), ptr)) + { + ERR("symbol too long: %s\n", debugstr_a(ptr)); + stabbuff[0] = '\0'; + continue; + } loc.kind = loc_absolute; loc.reg = 0; loc.offset = load_offset + n_value; @@ -1383,7 +1397,12 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, if (curr_func != NULL) { struct symt* param_type = stabs_parse_type(ptr); - stab_strcpy(symname, sizeof(symname), ptr); + if (!stab_strcpy(symname, sizeof(symname), ptr)) + { + ERR("symbol too long: %s\n", debugstr_a(ptr)); + stabbuff[0] = '\0'; + continue; + } loc.kind = loc_regrel; loc.reg = dbghelp_current_cpu->frame_regno; loc.offset = n_value; @@ -1442,7 +1461,12 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, loc.reg = CV_REG_NONE; break; } - stab_strcpy(symname, sizeof(symname), ptr); + if (!stab_strcpy(symname, sizeof(symname), ptr)) + { + ERR("symbol too long: %s\n", debugstr_a(ptr)); + stabbuff[0] = '\0'; + continue; + } if (ptr[strlen(symname) + 1] == 'P') { struct symt* param_type = stabs_parse_type(ptr); @@ -1494,7 +1518,12 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, * all of the pages related to the stabs, and that * sucks up swap space like crazy. */ - stab_strcpy(symname, sizeof(symname), ptr); + if (!stab_strcpy(symname, sizeof(symname), ptr)) + { + ERR("symbol too long: %s\n", debugstr_a(ptr)); + stabbuff[0] = '\0'; + continue; + } if (*symname) { struct symt_function_signature* func_type; @@ -1620,7 +1649,12 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, } if (*ptr == '_') ptr++; - stab_strcpy(symname, sizeof(symname), ptr); + if (!stab_strcpy(symname, sizeof(symname), ptr)) + { + ERR("symbol too long: %s\n", debugstr_a(ptr)); + stabbuff[0] = '\0'; + continue; + } callback(module, load_offset, symname, n_value, is_public, is_global, stab_ptr->n_other, compiland, user);

1 0

Ken Thomases : mountmgr: Avoid operating on a null CFStringRef, which would crash.
by Alexandre Julliard 10 Sep '20

10 Sep '20

Module: wine Branch: master Commit: 7e312c346cc94f093d82324f9020ac5595464f61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e312c346cc94f093d82324f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Sep 9 14:21:49 2020 -0500 mountmgr: Avoid operating on a null CFStringRef, which would crash. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/diskarb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 3d531b95ee..12da89d768 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -298,7 +298,7 @@ static CFStringRef find_service_id( const WCHAR *adapter ) service = CFArrayGetValueAtIndex( services, i ); name = SCNetworkInterfaceGetBSDName( SCNetworkServiceGetInterface(service) ); - if (CFStringGetLength( name ) < ARRAY_SIZE( buf )) + if (name && CFStringGetLength( name ) < ARRAY_SIZE( buf )) { CFStringGetCharacters( name, CFRangeMake(0, CFStringGetLength(name)), buf ); if (!lstrcmpW( buf, unix_name ) && (id = SCNetworkServiceGetServiceID( service )))

1 0