July 2020 - Wine-Devel - list.winehq.org

[PATCH] crypt32: Check CRYPT_ConstructBitBlob() return value in CRYPT_ExportKeyTrans().
by Serge Gautherie July 4, 2020

July 4, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/crypt32/msg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index f591a5e..5df03f7 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1574,9 +1574,8 @@ static BOOL WINAPI CRYPT_ExportKeyTrans( ret = CRYPT_ConstructAlgorithmId(&keyInfo.Algorithm, &pKeyTransEncodeInfo->KeyEncryptionAlgorithm); if (ret) - CRYPT_ConstructBitBlob(&keyInfo.PublicKey, + ret = CRYPT_ConstructBitBlob(&keyInfo.PublicKey, &pKeyTransEncodeInfo->RecipientPublicKey); - if (ret) ret = CryptImportPublicKeyInfo(pKeyTransEncodeInfo->hCryptProv, X509_ASN_ENCODING, &keyInfo, &expKey); -- 2.10.0.windows.1

1 0

[PATCH] ntdll: Add missing LC_NUMERIC locale setting to init_locale
by Thomas Crider July 4, 2020

July 4, 2020

This re-adds the missing setlocale( LC_NUMERIC, "C" ); that was not transferred when ntdll locale code was moved to ntdll/unix in commit b86dc3926bfe5cd92400aa96c89b0255eba1d447. Fixes: https://bugs.winehq.org/show_bug.cgi?id=49489 https://bugs.winehq.org/show_bug.cgi?id=49417

1 0

[PATCH] msvcrt: Don't set MXCSR register in __control87_2 if unchanged.
by Myah Caron July 4, 2020

July 4, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27594 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- I've only tested on x86 as I believe x64 is different enough to warrant a separate commit if the same issue is also present there. Though I suspect the x87 control word might need the same treatment, I couldn't create a test case that displayed a requirement for this, so I've left it untouched. --- dlls/kernel32/tests/thread.c | 36 +++++++++++++++++++++++++----- dlls/msvcrt/math.c | 43 ++++++++++++++++++++---------------- 2 files changed, 55 insertions(+), 24 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index b476e44cfc..9b12b5043d 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1829,6 +1829,19 @@ static inline unsigned long get_fpu_cw(void) #endif } +static inline void set_fpu_cw(unsigned int cw, unsigned int sse) +{ +#if defined(__i386__) || defined(__x86_64__) +#ifdef _MSC_VER + __asm { fldcw [cw] } + __asm { ldmxcsr [sse] } +#else + __asm__ volatile ("fldcw %0" : : "m" (cw)); + __asm__ volatile ("ldmxcsr %0" : : "m" (sse)); +#endif +#endif +} + static DWORD WINAPI fpu_thread(void *param) { struct fpu_thread_ctx *ctx = param; @@ -1870,7 +1883,7 @@ static void test_thread_fpu_cw(void) { static const struct { unsigned int cw; unsigned long fpu_cw; unsigned long fpu_cw_broken; - } expected_cw[6] = + } expected_cw[7] = { #ifdef __i386__ { _MCW_EM | _PC_53, MAKELONG( 0x27f, 0x1f80 ) }, @@ -1878,27 +1891,30 @@ static void test_thread_fpu_cw(void) { _EM_INEXACT | _RC_CHOP | _PC_24, MAKELONG( 0xc60, 0x7000 ), MAKELONG( 0xc60, 0x1f80 ) }, { _MCW_EM | _PC_53, MAKELONG( 0x27f, 0x1f80 ) }, { _EM_INEXACT | _RC_CHOP | _PC_24, MAKELONG( 0xc60, 0x7000 ), MAKELONG( 0xc60, 0x1f80 ) }, - { _MCW_EM | _PC_53, MAKELONG( 0x27f, 0x1f80 ) } + { _MCW_EM | _PC_53, MAKELONG( 0x27f, 0x1f80 ) }, + { _MCW_EM | _PC_24 | _RC_DOWN, MAKELONG( 0x47f, 0x3fa1 ) } #elif defined(__x86_64__) { _MCW_EM | _PC_64, MAKELONG( 0x27f, 0x1f80 ) }, { _MCW_EM | _PC_64, MAKELONG( 0x27f, 0x1f80 ) }, { _EM_INEXACT | _RC_CHOP | _PC_64, MAKELONG( 0x27f, 0x7000 ) }, { _MCW_EM | _PC_64, MAKELONG( 0x27f, 0x1f80 ) }, { _EM_INEXACT | _RC_CHOP | _PC_64, MAKELONG( 0x27f, 0x7000 ) }, - { _MCW_EM | _PC_64, MAKELONG( 0x27f, 0x1f80 ) } + { _MCW_EM | _PC_64, MAKELONG( 0x27f, 0x1f80 ) }, + { 0xdeadbeef, 0xdeadbeef } #elif defined(__aarch64__) { _MCW_EM | _PC_64, 0 }, { _MCW_EM | _PC_64, 0 }, { _EM_INEXACT | _RC_CHOP | _PC_64, 0xc08f00 }, { _MCW_EM | _PC_64, 0 }, { _EM_INEXACT | _RC_CHOP | _PC_64, 0xc08f00 }, - { _MCW_EM | _PC_64, 0 } + { _MCW_EM | _PC_64, 0 }, + { 0xdeadbeef, 0xdeadbeef } #else { 0xdeadbeef, 0xdeadbeef } #endif }; unsigned int initial_cw, cw; - unsigned long fpu_cw; + unsigned long initial_fpu_cw, fpu_cw; fpu_cw = get_fpu_cw(); initial_cw = _control87( 0, 0 ); @@ -1933,6 +1949,16 @@ static void test_thread_fpu_cw(void) fpu_cw = get_fpu_cw(); ok(cw == expected_cw[5].cw, "expected %#x got %#x\n", expected_cw[5].cw, cw); ok(fpu_cw == expected_cw[5].fpu_cw, "expected %#lx got %#lx\n", expected_cw[5].fpu_cw, fpu_cw); + +#ifdef __i386__ + initial_fpu_cw = get_fpu_cw(); + set_fpu_cw(0x47f, 0x3fa1); + cw = _control87( _RC_DOWN, _MCW_RC ); + fpu_cw = get_fpu_cw(); + ok(cw == expected_cw[6].cw, "expected %#x got %#x\n", expected_cw[6].cw, cw); + ok(fpu_cw == expected_cw[6].fpu_cw, "expected %#lx got %#lx\n", expected_cw[6].fpu_cw, fpu_cw); + set_fpu_cw(initial_fpu_cw & 0xffff, (initial_fpu_cw >> 16) & 0xffff); +#endif } static const char manifest_dep[] = diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index eae917076f..d11bd53acd 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1107,6 +1107,7 @@ int CDECL __control87_2( unsigned int newval, unsigned int mask, #ifdef __GNUC__ unsigned long fpword; unsigned int flags; + unsigned int old_flags; if (x86_cw) { @@ -1196,29 +1197,33 @@ int CDECL __control87_2( unsigned int newval, unsigned int mask, TRACE( "sse2 flags=%08x newval=%08x mask=%08x\n", flags, newval, mask ); if (mask) { + old_flags = flags; flags = (flags & ~mask) | (newval & mask); - /* Convert (masked) value back to fp word */ - fpword = 0; - if (flags & MSVCRT__EM_INVALID) fpword |= 0x80; - if (flags & MSVCRT__EM_DENORMAL) fpword |= 0x100; - if (flags & MSVCRT__EM_ZERODIVIDE) fpword |= 0x200; - if (flags & MSVCRT__EM_OVERFLOW) fpword |= 0x400; - if (flags & MSVCRT__EM_UNDERFLOW) fpword |= 0x800; - if (flags & MSVCRT__EM_INEXACT) fpword |= 0x1000; - switch (flags & MSVCRT__MCW_RC) + if (flags != old_flags) { - case MSVCRT__RC_UP|MSVCRT__RC_DOWN: fpword |= 0x6000; break; - case MSVCRT__RC_UP: fpword |= 0x4000; break; - case MSVCRT__RC_DOWN: fpword |= 0x2000; break; - } - switch (flags & MSVCRT__MCW_DN) - { - case MSVCRT__DN_FLUSH_OPERANDS_SAVE_RESULTS: fpword |= 0x0040; break; - case MSVCRT__DN_SAVE_OPERANDS_FLUSH_RESULTS: fpword |= 0x8000; break; - case MSVCRT__DN_FLUSH: fpword |= 0x8040; break; + /* Convert (masked) value back to fp word */ + fpword = 0; + if (flags & MSVCRT__EM_INVALID) fpword |= 0x80; + if (flags & MSVCRT__EM_DENORMAL) fpword |= 0x100; + if (flags & MSVCRT__EM_ZERODIVIDE) fpword |= 0x200; + if (flags & MSVCRT__EM_OVERFLOW) fpword |= 0x400; + if (flags & MSVCRT__EM_UNDERFLOW) fpword |= 0x800; + if (flags & MSVCRT__EM_INEXACT) fpword |= 0x1000; + switch (flags & MSVCRT__MCW_RC) + { + case MSVCRT__RC_UP|MSVCRT__RC_DOWN: fpword |= 0x6000; break; + case MSVCRT__RC_UP: fpword |= 0x4000; break; + case MSVCRT__RC_DOWN: fpword |= 0x2000; break; + } + switch (flags & MSVCRT__MCW_DN) + { + case MSVCRT__DN_FLUSH_OPERANDS_SAVE_RESULTS: fpword |= 0x0040; break; + case MSVCRT__DN_SAVE_OPERANDS_FLUSH_RESULTS: fpword |= 0x8000; break; + case MSVCRT__DN_FLUSH: fpword |= 0x8040; break; + } + __asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) ); } - __asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) ); } *sse2_cw = flags; } -- 2.26.2

1 1

[PATCH] mfplat: Add tracked sample stub.
by Nikolay Sivov July 3, 2020

July 3, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/buffer.c | 89 +++++++++++++++++++++++++++++++++++--- dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/tests/mfplat.c | 37 ++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 122 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 1a31299d244..67c60663b33 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -62,6 +62,7 @@ struct sample { struct attributes attributes; IMFSample IMFSample_iface; + IMFTrackedSample IMFTrackedSample_iface; IMFMediaBuffer **buffers; size_t buffer_count; @@ -87,6 +88,11 @@ static inline struct sample *impl_from_IMFSample(IMFSample *iface) return CONTAINING_RECORD(iface, struct sample, IMFSample_iface); } +static struct sample *impl_from_IMFTrackedSample(IMFTrackedSample *iface) +{ + return CONTAINING_RECORD(iface, struct sample, IMFTrackedSample_iface); +} + static HRESULT WINAPI memory_buffer_QueryInterface(IMFMediaBuffer *iface, REFIID riid, void **out) { struct memory_buffer *buffer = impl_from_IMFMediaBuffer(iface); @@ -711,20 +717,29 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO static HRESULT WINAPI sample_QueryInterface(IMFSample *iface, REFIID riid, void **out) { + struct sample *sample = impl_from_IMFSample(iface); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); if (IsEqualIID(riid, &IID_IMFSample) || IsEqualIID(riid, &IID_IMFAttributes) || IsEqualIID(riid, &IID_IUnknown)) { - *out = iface; - IMFSample_AddRef(iface); - return S_OK; + *out = &sample->IMFSample_iface; + } + else if (sample->IMFTrackedSample_iface.lpVtbl && IsEqualIID(riid, &IID_IMFTrackedSample)) + { + *out = &sample->IMFTrackedSample_iface; + } + else + { + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; } - WARN("Unsupported %s.\n", debugstr_guid(riid)); - *out = NULL; - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } static ULONG WINAPI sample_AddRef(IMFSample *iface) @@ -1448,6 +1463,40 @@ static const IMFSampleVtbl samplevtbl = sample_CopyToBuffer, }; +static HRESULT WINAPI tracked_sample_QueryInterface(IMFTrackedSample *iface, REFIID riid, void **obj) +{ + struct sample *sample = impl_from_IMFTrackedSample(iface); + return IMFSample_QueryInterface(&sample->IMFSample_iface, riid, obj); +} + +static ULONG WINAPI tracked_sample_AddRef(IMFTrackedSample *iface) +{ + struct sample *sample = impl_from_IMFTrackedSample(iface); + return IMFSample_AddRef(&sample->IMFSample_iface); +} + +static ULONG WINAPI tracked_sample_Release(IMFTrackedSample *iface) +{ + struct sample *sample = impl_from_IMFTrackedSample(iface); + return IMFSample_Release(&sample->IMFSample_iface); +} + +static HRESULT WINAPI tracked_sample_SetAllocator(IMFTrackedSample *iface, + IMFAsyncCallback *sample_allocator, IUnknown *state) +{ + FIXME("%p, %p, %p.\n", iface, sample_allocator, state); + + return E_NOTIMPL; +} + +static const IMFTrackedSampleVtbl tracked_sample_vtbl = +{ + tracked_sample_QueryInterface, + tracked_sample_AddRef, + tracked_sample_Release, + tracked_sample_SetAllocator, +}; + /*********************************************************************** * MFCreateSample (mfplat.@) */ @@ -1476,3 +1525,31 @@ HRESULT WINAPI MFCreateSample(IMFSample **sample) return S_OK; } + +/*********************************************************************** + * MFCreateTrackedSample (mfplat.@) + */ +HRESULT WINAPI MFCreateTrackedSample(IMFTrackedSample **sample) +{ + struct sample *object; + HRESULT hr; + + TRACE("%p.\n", sample); + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + if (FAILED(hr = init_attributes_object(&object->attributes, 0))) + { + heap_free(object); + return hr; + } + + object->IMFSample_iface.lpVtbl = &samplevtbl; + object->IMFTrackedSample_iface.lpVtbl = &tracked_sample_vtbl; + + *sample = &object->IMFTrackedSample_iface; + + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 16be972e5bd..f55a8237d35 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -70,6 +70,7 @@ @ stdcall MFCreateSystemTimeSource(ptr) @ stub MFCreateSystemUnderlyingClock @ stub MFCreateTempFile +@ stdcall MFCreateTrackedSample(ptr) @ stdcall MFCreateTransformActivate(ptr) @ stub MFCreateURLFromPath @ stub MFCreateUdpSockets diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 8b4012f8087..01749dd9ef8 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -107,6 +107,7 @@ static HRESULT (WINAPI *pMFCreate2DMediaBuffer)(DWORD width, DWORD height, DWORD static HRESULT (WINAPI *pMFCreateMediaBufferFromMediaType)(IMFMediaType *media_type, LONGLONG duration, DWORD min_length, DWORD min_alignment, IMFMediaBuffer **buffer); static HRESULT (WINAPI *pMFCreateDXSurfaceBuffer)(REFIID riid, IUnknown *surface, BOOL bottom_up, IMFMediaBuffer **buffer); +static HRESULT (WINAPI *pMFCreateTrackedSample)(IMFTrackedSample **sample); static HWND create_window(void) { @@ -715,6 +716,7 @@ static void init_functions(void) X(MFCreateSourceResolver); X(MFCreateMediaBufferFromMediaType); X(MFCreateMFByteStreamOnStream); + X(MFCreateTrackedSample); X(MFCreateTransformActivate); X(MFGetPlaneSize); X(MFGetStrideForBitmapInfoHeader); @@ -5465,6 +5467,40 @@ done: DestroyWindow(window); } +static void test_MFCreateTrackedSample(void) +{ + IMFTrackedSample *tracked_sample; + IMFDesiredSample *desired_sample; + IMFSample *sample; + IUnknown *unk; + HRESULT hr; + + if (!pMFCreateTrackedSample) + { + win_skip("MFCreateTrackedSample() is not available.\n"); + return; + } + + hr = pMFCreateTrackedSample(&tracked_sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* It's actually a sample. */ + hr = IMFTrackedSample_QueryInterface(tracked_sample, &IID_IMFSample, (void **)&sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTrackedSample_QueryInterface(tracked_sample, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(unk == (IUnknown *)sample, "Unexpected pointer.\n"); + IUnknown_Release(unk); + + IMFSample_Release(sample); + + hr = IMFTrackedSample_QueryInterface(tracked_sample, &IID_IMFDesiredSample, (void **)&desired_sample); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + + IMFTrackedSample_Release(tracked_sample); +} + START_TEST(mfplat) { char **argv; @@ -5522,6 +5558,7 @@ START_TEST(mfplat) test_MFInitMediaTypeFromWaveFormatEx(); test_MFCreateMFVideoFormatFromMFMediaType(); test_MFCreateDXSurfaceBuffer(); + test_MFCreateTrackedSample(); CoUninitialize(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index 1f5fc06dd1e..4ceeb707bd0 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -648,6 +648,7 @@ cpp_quote("HRESULT WINAPI MFGetService(IUnknown *object, REFGUID service, REFIID cpp_quote("MFTIME WINAPI MFGetSystemTime(void);") cpp_quote("HRESULT WINAPI MFGetTopoNodeCurrentType(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaType **type);") cpp_quote("HRESULT WINAPI MFShutdownObject(IUnknown *object);") +cpp_quote("HRESULT WINAPI MFCreateTrackedSample(IMFTrackedSample **sample);") typedef enum _MFMEDIASOURCE_CHARACTERISTICS { -- 2.27.0

1 0

[PATCH 1/2] evr: Add a stub for sample allocator.
by Nikolay Sivov July 3, 2020

July 3, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/Makefile.in | 3 +- dlls/evr/evr.spec | 2 +- dlls/evr/sample.c | 199 +++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 19 +++++ include/evr.idl | 1 + include/mfidl.idl | 57 +++++++++++++ 6 files changed, 279 insertions(+), 2 deletions(-) create mode 100644 dlls/evr/sample.c diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in index daaf9cc872a..c8178297dab 100644 --- a/dlls/evr/Makefile.in +++ b/dlls/evr/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ evr.c \ main.c \ mixer.c \ - presenter.c + presenter.c \ + sample.c IDL_SRCS = evr_classes.idl diff --git a/dlls/evr/evr.spec b/dlls/evr/evr.spec index 73cbf05b461..aa839295658 100644 --- a/dlls/evr/evr.spec +++ b/dlls/evr/evr.spec @@ -18,7 +18,7 @@ @ stub MFCreateVideoOTA @ stub MFCreateVideoPresenter2 @ stdcall MFCreateVideoPresenter(ptr ptr ptr ptr) -@ stub MFCreateVideoSampleAllocator +@ stdcall MFCreateVideoSampleAllocator(ptr ptr) @ stdcall MFCreateVideoSampleFromSurface(ptr ptr) @ stub MFGetPlaneSize @ stub MFGetStrideForBitmapInfoHeader diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c new file mode 100644 index 00000000000..f371d920762 --- /dev/null +++ b/dlls/evr/sample.c @@ -0,0 +1,199 @@ +/* + * Copyright 2020 Nikolay Sivov + * + * 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 + */ + +#define COBJMACROS + +#include "evr.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(evr); + +struct sample_allocator +{ + IMFVideoSampleAllocator IMFVideoSampleAllocator_iface; + IMFVideoSampleAllocatorCallback IMFVideoSampleAllocatorCallback_iface; + LONG refcount; +}; + +static struct sample_allocator *impl_from_IMFVideoSampleAllocator(IMFVideoSampleAllocator *iface) +{ + return CONTAINING_RECORD(iface, struct sample_allocator, IMFVideoSampleAllocator_iface); +} + +static struct sample_allocator *impl_from_IMFVideoSampleAllocatorCallback(IMFVideoSampleAllocatorCallback *iface) +{ + return CONTAINING_RECORD(iface, struct sample_allocator, IMFVideoSampleAllocatorCallback_iface); +} + +static HRESULT WINAPI sample_allocator_QueryInterface(IMFVideoSampleAllocator *iface, REFIID riid, void **obj) +{ + struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocator(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFVideoSampleAllocator) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = &allocator->IMFVideoSampleAllocator_iface; + } + else if (IsEqualIID(riid, &IID_IMFVideoSampleAllocatorCallback)) + { + *obj = &allocator->IMFVideoSampleAllocatorCallback_iface; + } + else + { + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; +} + +static ULONG WINAPI sample_allocator_AddRef(IMFVideoSampleAllocator *iface) +{ + struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocator(iface); + ULONG refcount = InterlockedIncrement(&allocator->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI sample_allocator_Release(IMFVideoSampleAllocator *iface) +{ + struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocator(iface); + ULONG refcount = InterlockedDecrement(&allocator->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + heap_free(allocator); + } + + return refcount; +} + +static HRESULT WINAPI sample_allocator_SetDirectXManager(IMFVideoSampleAllocator *iface, + IUnknown *manager) +{ + FIXME("%p, %p.\n", iface, manager); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sample_allocator_UninitializeSampleAllocator(IMFVideoSampleAllocator *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sample_allocator_InitializeSampleAllocator(IMFVideoSampleAllocator *iface, + DWORD sample_count, IMFMediaType *media_type) +{ + FIXME("%p, %u, %p.\n", iface, sample_count, media_type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sample_allocator_AllocateSample(IMFVideoSampleAllocator *iface, IMFSample **sample) +{ + FIXME("%p, %p.\n", iface, sample); + + return E_NOTIMPL; +} + +static const IMFVideoSampleAllocatorVtbl sample_allocator_vtbl = +{ + sample_allocator_QueryInterface, + sample_allocator_AddRef, + sample_allocator_Release, + sample_allocator_SetDirectXManager, + sample_allocator_UninitializeSampleAllocator, + sample_allocator_InitializeSampleAllocator, + sample_allocator_AllocateSample, +}; + +static HRESULT WINAPI sample_allocator_callback_QueryInterface(IMFVideoSampleAllocatorCallback *iface, + REFIID riid, void **obj) +{ + struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocatorCallback(iface); + return IMFVideoSampleAllocator_QueryInterface(&allocator->IMFVideoSampleAllocator_iface, riid, obj); +} + +static ULONG WINAPI sample_allocator_callback_AddRef(IMFVideoSampleAllocatorCallback *iface) +{ + struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocatorCallback(iface); + return IMFVideoSampleAllocator_AddRef(&allocator->IMFVideoSampleAllocator_iface); +} + +static ULONG WINAPI sample_allocator_callback_Release(IMFVideoSampleAllocatorCallback *iface) +{ + struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocatorCallback(iface); + return IMFVideoSampleAllocator_Release(&allocator->IMFVideoSampleAllocator_iface); +} + +static HRESULT WINAPI sample_allocator_callback_SetCallback(IMFVideoSampleAllocatorCallback *iface, + IMFVideoSampleAllocatorNotify *callback) +{ + FIXME("%p, %p.\n", iface, callback); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sample_allocator_callback_GetFreeSampleCount(IMFVideoSampleAllocatorCallback *iface, + LONG *count) +{ + FIXME("%p, %p.\n", iface, count); + + return E_NOTIMPL; +} + +static const IMFVideoSampleAllocatorCallbackVtbl sample_allocator_callback_vtbl = +{ + sample_allocator_callback_QueryInterface, + sample_allocator_callback_AddRef, + sample_allocator_callback_Release, + sample_allocator_callback_SetCallback, + sample_allocator_callback_GetFreeSampleCount, +}; + +HRESULT WINAPI MFCreateVideoSampleAllocator(REFIID riid, void **obj) +{ + struct sample_allocator *object; + HRESULT hr; + + TRACE("%s, %p.\n", debugstr_guid(riid), obj); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IMFVideoSampleAllocator_iface.lpVtbl = &sample_allocator_vtbl; + object->IMFVideoSampleAllocatorCallback_iface.lpVtbl = &sample_allocator_callback_vtbl; + object->refcount = 1; + + hr = IMFVideoSampleAllocator_QueryInterface(&object->IMFVideoSampleAllocator_iface, riid, obj); + IMFVideoSampleAllocator_Release(&object->IMFVideoSampleAllocator_iface); + + return hr; +} diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index b9f86eb2529..5773fedd226 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -962,6 +962,24 @@ static void test_MFCreateVideoMixerAndPresenter(void) IUnknown_Release(presenter); } +static void test_MFCreateVideoSampleAllocator(void) +{ + IUnknown *unk; + HRESULT hr; + + hr = MFCreateVideoSampleAllocator(&IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocator, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocatorCallback, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); +} + START_TEST(evr) { CoInitialize(NULL); @@ -978,6 +996,7 @@ START_TEST(evr) test_surface_sample(); test_default_presenter(); test_MFCreateVideoMixerAndPresenter(); + test_MFCreateVideoSampleAllocator(); CoUninitialize(); } diff --git a/include/evr.idl b/include/evr.idl index 8628e111a31..6369a39b2f3 100644 --- a/include/evr.idl +++ b/include/evr.idl @@ -303,4 +303,5 @@ cpp_quote("HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device cpp_quote("HRESULT WINAPI MFCreateVideoMixerAndPresenter(IUnknown *mixer_outer, IUnknown *presenter_outer, ") cpp_quote(" REFIID riid_mixer, void **mixer, REFIID riid_presenter, void **presenter);") cpp_quote("HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj);") +cpp_quote("HRESULT WINAPI MFCreateVideoSampleAllocator(REFIID riid, void **allocator);") cpp_quote("HRESULT WINAPI MFCreateVideoSampleFromSurface(IUnknown *surface, IMFSample **sample);") diff --git a/include/mfidl.idl b/include/mfidl.idl index 35419756b5c..1f5fc06dd1e 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1040,6 +1040,63 @@ interface IMFAudioPolicy : IUnknown HRESULT GetIconPath([out] LPWSTR *path); } +[ + object, + uuid(86cbc910-e533-4751-8e3b-f19b5b806a03), + local +] +interface IMFVideoSampleAllocator : IUnknown +{ + HRESULT SetDirectXManager( + [in, unique] IUnknown *manager + ); + HRESULT UninitializeSampleAllocator(); + HRESULT InitializeSampleAllocator( + [in] DWORD sample_count, + [in] IMFMediaType *media_type + ); + + HRESULT AllocateSample( + [out] IMFSample **sample + ); +} + +[ + object, + uuid(a792cdbe-c374-4e89-8335-278e7b9956a4), + local +] +interface IMFVideoSampleAllocatorNotify : IUnknown +{ + HRESULT NotifyRelease(); +} + +[ + object, + uuid(3978aa1a-6d5b-4b7f-a340-90899189ae34), + local +] +interface IMFVideoSampleAllocatorNotifyEx : IMFVideoSampleAllocatorNotify +{ + HRESULT NotifyPrune(IMFSample *sample); +} + +[ + object, + uuid(992388b4-3372-4f67-8b6f-c84c071f4751), + local +] +interface IMFVideoSampleAllocatorCallback : IUnknown +{ + HRESULT SetCallback( + [in, unique] IMFVideoSampleAllocatorNotify *callback + ); + + HRESULT GetFreeSampleCount( + [out] LONG *count + ); +} + enum { MF_ACTIVATE_CUSTOM_MIXER_ALLOWFAIL = 0x00000001, -- 2.27.0

1 1

[PATCH v3 1/3] ntdll: Reimplement NtQuerySystemInformation(SystemProcessInformation) using a single server call.
by Zebediah Figura July 3, 2020

July 3, 2020

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v3: clear the buffer first, thanks Alexandre. dlls/ntdll/unix/system.c | 182 +++++++++++++++++---------------------- server/process.c | 69 +++++++++++++++ server/protocol.def | 30 +++++++ server/trace.c | 39 +++++++++ 4 files changed, 216 insertions(+), 104 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 7045bc1550b..3a53a764d03 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1998,6 +1998,11 @@ static void get_timezone_info( RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi ) RtlLeaveCriticalSection( &TIME_tz_section ); } +static unsigned int align_offset(unsigned int offset, unsigned int alignment) +{ + return (offset + (alignment - 1)) & ~(alignment - 1); +} + /****************************************************************************** * NtQuerySystemInformation (NTDLL.@) @@ -2083,132 +2088,101 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, case SystemProcessInformation: { - SYSTEM_PROCESS_INFORMATION *spi = info; - SYSTEM_PROCESS_INFORMATION *last = NULL; - HANDLE handle = 0; - WCHAR procname[1024]; - WCHAR* exename; - DWORD wlen = 0; - DWORD procstructlen = 0; + unsigned int process_count, i, j; + char *buffer = NULL; + unsigned int pos = 0; - SERVER_START_REQ( create_snapshot ) + if (size && !(buffer = RtlAllocateHeap( GetProcessHeap(), 0, size ))) { - req->flags = SNAP_PROCESS | SNAP_THREAD; - if (!(ret = wine_server_call( req ))) handle = wine_server_ptr_handle( reply->handle ); + ret = STATUS_NO_MEMORY; + break; } - SERVER_END_REQ; - len = 0; - while (ret == STATUS_SUCCESS) + SERVER_START_REQ( list_processes ) { - int unix_pid = -1; - SERVER_START_REQ( next_process ) - { - req->handle = wine_server_obj_handle( handle ); - req->reset = (len == 0); - wine_server_set_reply( req, procname, sizeof(procname) - sizeof(WCHAR) ); - if (!(ret = wine_server_call( req ))) - { - unix_pid = reply->unix_pid; - - /* Make sure procname is 0 terminated */ - procname[wine_server_reply_size(reply) / sizeof(WCHAR)] = 0; - - /* Get only the executable name, not the path */ - if ((exename = wcsrchr(procname, '\\')) != NULL) exename++; - else exename = procname; + wine_server_set_reply( req, buffer, size ); + ret = wine_server_call( req ); + len = reply->info_size; + process_count = reply->process_count; + } + SERVER_END_REQ; - wlen = (wcslen(exename) + 1) * sizeof(WCHAR); - procstructlen = sizeof(*spi) + wlen + ((reply->threads - 1) * sizeof(SYSTEM_THREAD_INFORMATION)); + if (ret) + { + RtlFreeHeap( GetProcessHeap(), 0, buffer ); + break; + } - if (size >= len + procstructlen) - { - /* ftCreationTime, ftUserTime, ftKernelTime; - * vmCounters, ioCounters - */ - memset(spi, 0, sizeof(*spi)); + len = 0; - spi->NextEntryOffset = procstructlen - wlen; - spi->dwThreadCount = reply->threads; + for (i = 0; i < process_count; i++) + { + SYSTEM_PROCESS_INFORMATION *nt_process = (SYSTEM_PROCESS_INFORMATION *)((char *)info + len); + const struct process_info *server_process; + const WCHAR *server_name, *file_part; + ULONG proc_len; + ULONG name_len = 0; - /* spi->pszProcessName will be set later on */ + pos = align_offset( pos, TYPE_ALIGNMENT(struct process_info) ); + server_process = (const struct process_info *)(buffer + pos); + pos += sizeof(*server_process); - spi->dwBasePriority = reply->priority; - spi->UniqueProcessId = UlongToHandle(reply->pid); - spi->ParentProcessId = UlongToHandle(reply->ppid); - spi->HandleCount = reply->handles; + server_name = (const WCHAR *)(buffer + pos); + file_part = server_name + (server_process->name_len / sizeof(WCHAR)); + pos += server_process->name_len; + while (file_part > server_name && file_part[-1] != '\\') + { + file_part--; + name_len++; + } - /* spi->ti will be set later on */ + proc_len = sizeof(*nt_process) + server_process->thread_count * sizeof(SYSTEM_THREAD_INFORMATION) + + (name_len + 1) * sizeof(WCHAR); + len += proc_len; - } - len += procstructlen; - } - } - SERVER_END_REQ; - if (ret != STATUS_SUCCESS) + if (len <= size) { - if (ret == STATUS_NO_MORE_FILES) ret = STATUS_SUCCESS; - break; + memset(nt_process, 0, sizeof(*nt_process)); + if (i < process_count - 1) + nt_process->NextEntryOffset = proc_len; + nt_process->dwThreadCount = server_process->thread_count; + nt_process->dwBasePriority = server_process->priority; + nt_process->UniqueProcessId = UlongToHandle(server_process->pid); + nt_process->ParentProcessId = UlongToHandle(server_process->parent_pid); + nt_process->HandleCount = server_process->handle_count; + get_thread_times( server_process->unix_pid, -1, &nt_process->KernelTime, &nt_process->UserTime ); } - if (size >= len) + pos = align_offset( pos, TYPE_ALIGNMENT(struct thread_info) ); + for (j = 0; j < server_process->thread_count; j++) { - int i, j; + const struct thread_info *server_thread = (const struct thread_info *)(buffer + pos); - get_thread_times(unix_pid, -1, &spi->KernelTime, &spi->UserTime); - - /* set thread info */ - i = j = 0; - while (ret == STATUS_SUCCESS) + if (len <= size) { - int unix_tid, pid, tid, base_pri, delta_pri; - SERVER_START_REQ( next_thread ) - { - req->handle = wine_server_obj_handle( handle ); - req->reset = (j == 0); - if (!(ret = wine_server_call( req ))) - { - unix_tid = reply->unix_tid; - pid = reply->pid; - tid = reply->tid; - base_pri = reply->base_pri; - delta_pri = reply->delta_pri; - j++; - } - } - SERVER_END_REQ; - - if (!ret) - { - if (UlongToHandle(pid) == spi->UniqueProcessId) - { - memset(&spi->ti[i], 0, sizeof(spi->ti)); - - spi->ti[i].CreateTime.QuadPart = 0xdeadbeef; - spi->ti[i].ClientId.UniqueProcess = UlongToHandle(pid); - spi->ti[i].ClientId.UniqueThread = UlongToHandle(tid); - spi->ti[i].dwCurrentPriority = base_pri + delta_pri; - spi->ti[i].dwBasePriority = base_pri; - get_thread_times(unix_pid, unix_tid, &spi->ti[i].KernelTime, &spi->ti[i].UserTime); - i++; - } - } + nt_process->ti[j].CreateTime.QuadPart = 0xdeadbeef; + nt_process->ti[j].ClientId.UniqueProcess = UlongToHandle(server_process->pid); + nt_process->ti[j].ClientId.UniqueThread = UlongToHandle(server_thread->tid); + nt_process->ti[j].dwCurrentPriority = server_thread->current_priority; + nt_process->ti[j].dwBasePriority = server_thread->base_priority; + get_thread_times( server_process->unix_pid, server_thread->unix_tid, + &nt_process->ti[j].KernelTime, &nt_process->ti[j].UserTime ); } - if (ret == STATUS_NO_MORE_FILES) ret = STATUS_SUCCESS; - - /* now append process name */ - spi->ProcessName.Buffer = (WCHAR*)((char*)spi + spi->NextEntryOffset); - spi->ProcessName.Length = wlen - sizeof(WCHAR); - spi->ProcessName.MaximumLength = wlen; - memcpy( spi->ProcessName.Buffer, exename, wlen ); - spi->NextEntryOffset += wlen; - last = spi; - spi = (SYSTEM_PROCESS_INFORMATION*)((char*)spi + spi->NextEntryOffset); + + pos += sizeof(*server_thread); + } + + if (len <= size) + { + nt_process->ProcessName.Buffer = (WCHAR *)&nt_process->ti[server_process->thread_count]; + nt_process->ProcessName.Length = name_len * sizeof(WCHAR); + nt_process->ProcessName.MaximumLength = (name_len + 1) * sizeof(WCHAR); + memcpy(nt_process->ProcessName.Buffer, file_part, name_len * sizeof(WCHAR)); + nt_process->ProcessName.Buffer[name_len] = 0; } } - if (ret == STATUS_SUCCESS && last) last->NextEntryOffset = 0; + if (len > size) ret = STATUS_INFO_LENGTH_MISMATCH; - if (handle) NtClose( handle ); break; } diff --git a/server/process.c b/server/process.c index 283edc09c5e..e1af3c8ac5c 100644 --- a/server/process.c +++ b/server/process.c @@ -22,6 +22,7 @@ #include "wine/port.h" #include <assert.h> +#include <errno.h> #include <limits.h> #include <signal.h> #include <string.h> @@ -1819,3 +1820,71 @@ DECL_HANDLER(resume_process) release_object( process ); } } + +static unsigned int align_offset(unsigned int offset, unsigned int alignment) +{ + return (offset + (alignment - 1)) & ~(alignment - 1); +} + +/* Get a list of processes and threads currently running */ +DECL_HANDLER(list_processes) +{ + struct process *process; + struct thread *thread; + unsigned int pos = 0; + char *buffer; + + reply->process_count = 0; + reply->info_size = 0; + + LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) + { + struct process_dll *exe = get_process_exe_module( process ); + reply->info_size = align_offset( reply->info_size, TYPE_ALIGNMENT(struct process_info) ); + reply->info_size += sizeof(struct process_info) + exe->namelen; + reply->info_size = align_offset( reply->info_size, TYPE_ALIGNMENT(struct thread_info) ); + reply->info_size += process->running_threads * sizeof(struct thread_info); + reply->process_count++; + } + + if (reply->info_size > get_reply_max_size()) + { + set_error( STATUS_INFO_LENGTH_MISMATCH ); + return; + } + + if (!(buffer = set_reply_data_size( reply->info_size ))) return; + + memset( buffer, 0, reply->info_size ); + LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) + { + struct process_info *process_info; + struct process_dll *exe = get_process_exe_module( process ); + + pos = align_offset( pos, TYPE_ALIGNMENT(struct process_info) ); + process_info = (struct process_info *)(buffer + pos); + process_info->name_len = exe->namelen; + process_info->thread_count = process->running_threads; + process_info->priority = process->priority; + process_info->pid = process->id; + process_info->parent_pid = process->parent_id; + process_info->handle_count = get_handle_table_count(process); + process_info->unix_pid = process->unix_pid; + pos += sizeof(*process_info); + + memcpy( buffer + pos, exe->filename, exe->namelen ); + pos += exe->namelen; + + pos = align_offset( pos, TYPE_ALIGNMENT(struct thread_info) ); + LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) + { + struct thread_info *thread_info = (struct thread_info *)(buffer + pos); + + thread_info->tid = thread->id; + thread_info->base_priority = thread->priority; + thread_info->current_priority = thread->priority; /* FIXME */ + thread_info->unix_tid = thread->unix_tid; + pos += sizeof(*thread_info); + } + } +} diff --git a/server/protocol.def b/server/protocol.def index 6416306c0a1..2737cd6fddd 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1919,6 +1919,36 @@ enum char_info_mode @END +struct thread_info +{ + thread_id_t tid; + int base_priority; + int current_priority; + int unix_tid; +}; + +struct process_info +{ + data_size_t name_len; + unsigned int thread_count; + int priority; + process_id_t pid; + process_id_t parent_pid; + unsigned int handle_count; + int unix_pid; + /* VARARG(name,unicode_str,name_len); */ + /* VARARG(threads,struct thread_info,thread_count); */ +}; + +/* Get a list of processes and threads currently running */ +(a)REQ(list_processes) +(a)REPLY + data_size_t info_size; + unsigned int process_count; + VARARG(data,process_info,info_size); +(a)END + + /* Wait for a debug event */ @REQ(wait_debug_event) int get_handle; /* should we alloc a handle for waiting? */ diff --git a/server/trace.c b/server/trace.c index 2fb5afd5ef1..d47e1260255 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1115,6 +1115,45 @@ static void dump_varargs_token_groups( const char *prefix, data_size_t size ) fputc( '}', stderr ); } +static unsigned int align_offset(unsigned int offset, unsigned int alignment) +{ + return (offset + (alignment - 1)) & ~(alignment - 1); +} + +static void dump_varargs_process_info( const char *prefix, data_size_t size ) +{ + data_size_t pos = 0; + unsigned int i; + + fprintf( stderr,"%s{", prefix ); + + while (size - pos >= sizeof(struct process_info)) + { + const struct process_info *process = (const struct process_info *)((const char *)cur_data + pos); + pos = align_offset( pos, TYPE_ALIGNMENT(struct process_info) ); + fprintf( stderr, "[thread_count=%u,priority=%d,pid=%04x,parent_pid=%04x,handle_count=%08x,unix_pid=%d,", + process->thread_count, process->priority, process->pid, + process->parent_pid, process->handle_count, process->unix_pid ); + pos += sizeof(*process); + + pos = dump_inline_unicode_string( "name=L\"", pos, process->name_len, size ); + + pos = align_offset( pos, TYPE_ALIGNMENT(struct thread_info) ); + fprintf( stderr, "\",threads={" ); + for (i = 0; i < process->thread_count; i++) + { + const struct thread_info *thread = (const struct thread_info *)((const char *)cur_data + pos); + if (size - pos < sizeof(*thread)) break; + fprintf( stderr, "[tid=%04x,base_priority=%d,current_priority=%d,unix_tid=%d],", + thread->tid, thread->base_priority, thread->current_priority, thread->unix_tid ); + pos += sizeof(*thread); + } + fprintf( stderr, "}," ); + } + + fputc( '}', stderr ); +} + static void dump_varargs_object_attributes( const char *prefix, data_size_t size ) { const struct object_attributes *objattr = cur_data; -- 2.27.0

1 2

[PATCH] amstream: Return E_POINTER on NULL stream in IMediaStreamFilter::GetMediaStream().
by Gijs Vermeulen July 3, 2020

July 3, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/filter.c | 3 +++ dlls/amstream/tests/amstream.c | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 3dff686b21..0e09e492cb 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -513,6 +513,9 @@ static HRESULT WINAPI filter_GetMediaStream(IMediaStreamFilter *iface, REFMSPID TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(idPurpose), ppMediaStream); + if (!ppMediaStream) + return E_POINTER; + for (i = 0; i < This->nb_streams; i++) { IAMMediaStream_GetInformation(This->streams[i], &purpose_id, NULL); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index bbad585d48..3fb77f277a 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -701,9 +701,13 @@ static void test_add_stream(void) ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_GetMediaStream(mmstream, &MSPID_PrimaryAudio, NULL); - todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_GetMediaStream(stream_filter, &MSPID_PrimaryAudio, NULL); - todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetMediaStream(mmstream, &MSPID_PrimaryVideo, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + hr = IMediaStreamFilter_GetMediaStream(stream_filter, &MSPID_PrimaryVideo, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); check_enum_stream(mmstream, stream_filter, 0, NULL); -- 2.27.0

2 1

[PATCH] ws2_32: Consider socket with zero ifindex unbound.
by Paul Gofman July 3, 2020

July 3, 2020

Real interface index can't be zero. getsockopt(..., IP_UNICAST_IF, ...) may return success and zero interface index if IP_UNICAST_IF was never set. Avoids error output which doesn't inidcate a real error condition for such case. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 402ee86d962..69fbb37af22 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3788,7 +3788,7 @@ static void interface_bind_check(int fd, struct sockaddr_in *addr) ret = getsockopt(fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, &len); if (!ret) ifindex = ntohl(ifindex); #endif - if (!ret) + if (!ret && ifindex) { EnterCriticalSection(&cs_if_addr_cache); if (ifindex < if_addr_cache_size) -- 2.26.2

1 0

[PATCH] server: Don't fail setting hw debug registers for invalid breakpoint addresses on x64.
by Paul Gofman July 3, 2020

July 3, 2020

Fixes hardware breakpoints for some debuggers. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 50 +++++++++++++++++++++++++++++++----- server/ptrace.c | 21 ++++++++++++--- 2 files changed, 61 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 95d25375f77..f98c5bdae07 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -161,6 +161,8 @@ static int (CDECL *p_setjmp)(_JUMP_BUFFER*); static int my_argc; static char** my_argv; +static const BOOL is_win64 = sizeof(void *) == 8; + #ifdef __i386__ #ifndef __WINE_WINTRNL_H @@ -2807,9 +2809,10 @@ static void test_debug_registers(void) { 0x42424240, 0, 0x126bb070, 0x0badbad0, 0, 0xffff0115 }, { 0x42424242, 0, 0x100f0fe7, 0x0abebabe, 0, 0x115 }, }; + BOOL is_native_win32 = !is_win64 && !is_wow64; NTSTATUS status; - CONTEXT ctx; HANDLE thread; + CONTEXT ctx; int i; for (i = 0; i < ARRAY_SIZE(tests); i++) @@ -2841,15 +2844,50 @@ static void test_debug_registers(void) memset(&ctx, 0, sizeof(ctx)); ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; - ctx.Dr0 = 0xffffffff; - ctx.Dr1 = 0xffffffff; - ctx.Dr2 = 0xffffffff; - ctx.Dr3 = 0xffffffff; + ctx.Dr0 = 0x11111111; + ctx.Dr1 = 0x22222222; + ctx.Dr2 = 0x33333333; + ctx.Dr3 = 0x44444444; ctx.Dr6 = 0xffffffff; - ctx.Dr7 = 0x00000400; + ctx.Dr7 = 0x00000001; status = pNtSetContextThread(GetCurrentThread(), &ctx); ok(status == STATUS_SUCCESS, "NtSetContextThread failed with %x\n", status); + memset(&ctx, 0, sizeof(ctx)); + ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; + ctx.Dr0 = (ULONG_PTR)~0; + ctx.Dr1 = 0xf2222222; + ctx.Dr2 = 0xf3333333; + ctx.Dr3 = 0xf4444444; + ctx.Dr6 = 0xffffffff; + ctx.Dr7 = 0x00000001; + status = pNtSetContextThread(GetCurrentThread(), &ctx); + ok(status == STATUS_SUCCESS, "NtSetContextThread failed with %x\n", status); + + memset(&ctx, 0, sizeof(ctx)); + ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; + status = pNtGetContextThread(GetCurrentThread(), &ctx); + ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", status); + + todo_wine_if(is_native_win32) + ok(!ctx.Dr0 || (is_wow64 && ctx.Dr0 == ~0u), + "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr0); + + todo_wine_if(is_native_win32) + ok((!is_native_win32 && ctx.Dr1 == 0xf2222222) || (is_native_win32 && !ctx.Dr1), + "expected 0xf2222222, got %lx\n", (DWORD_PTR)ctx.Dr1); + + todo_wine_if(is_native_win32) + ok((!is_native_win32 && ctx.Dr2 == 0xf3333333) || (is_native_win32 && !ctx.Dr2), + "expected 0xf3333333, got %lx\n", (DWORD_PTR)ctx.Dr2); + + todo_wine_if(is_native_win32) + ok((!is_native_win32 && ctx.Dr3 == 0xf4444444) || (is_native_win32 && !ctx.Dr3), + "expected 0xf4444444, got %lx\n", (DWORD_PTR)ctx.Dr3); + + memset(&ctx, 0, sizeof(ctx)); + ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; + thread = CreateThread(NULL, 0, register_check_thread, NULL, CREATE_SUSPENDED, NULL); ok(thread != INVALID_HANDLE_VALUE, "CreateThread failed with %d\n", GetLastError()); diff --git a/server/ptrace.c b/server/ptrace.c index 49347791d8c..985559e1f39 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -648,10 +648,23 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign break; case CPU_x86_64: if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.x86_64_regs.dr7 & 0xffff0000 ) == -1) goto error; - if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(0), context->debug.x86_64_regs.dr0 ) == -1) goto error; - if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(1), context->debug.x86_64_regs.dr1 ) == -1) goto error; - if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(2), context->debug.x86_64_regs.dr2 ) == -1) goto error; - if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(3), context->debug.x86_64_regs.dr3 ) == -1) goto error; + + if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(0), context->debug.x86_64_regs.dr0 ) == -1 + && (errno != EINVAL || ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(0), 0 ) == -1)) + goto error; + + if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(1), context->debug.x86_64_regs.dr1 ) == -1 + && (errno != EINVAL || ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(1), 0 ) == -1)) + goto error; + + if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(2), context->debug.x86_64_regs.dr2 ) == -1 + && (errno != EINVAL || ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(2), 0 ) == -1)) + goto error; + + if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(3), context->debug.x86_64_regs.dr3 ) == -1 + && (errno != EINVAL || ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(3), 0 ) == -1)) + goto error; + if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(6), context->debug.x86_64_regs.dr6 ) == -1) goto error; ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.x86_64_regs.dr7 | 0x55 ); if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.x86_64_regs.dr7 ) == -1) goto error; -- 2.26.2

1 0

[PATCH 2/2] winhttp: Implement WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS.
by Owen Rudge July 3, 2020

July 3, 2020

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/winhttp/request.c | 2 ++ dlls/winhttp/session.c | 17 +++++++++++++++++ dlls/winhttp/tests/winhttp.c | 6 +++--- dlls/winhttp/winhttp_private.h | 2 ++ 4 files changed, 24 insertions(+), 3 deletions(-)

3 2