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

[PATCH] include: Add wownt16.h
by Vijay Kiran Kamuju June 7, 2020

June 7, 2020

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

32-bit hotpatching question
by Alexandre Ganea June 7, 2020

June 7, 2020

Hello, While implementing the MSVC /hotpatch flag into LLVM clang-cl, we were wondering how hotpatching is achieved in Wine for 32-bit x86 targets? Previous versions of MSVC up to VS2013 were emitting "8F FF MOV edi, edi". However since VS2015, a two-byte nop "66 90 XCHG ax, ax" is emitted, as suggested by Intel documentation. Charles suggested here: https://reviews.llvm.org/D81301#2077964 that Wine might be relying on the magic "8F FF" to patch the Win32 APIs. However how is that possible since (I assume) recent Windows do not contain that magic sequence, rather a two-byte nop. In essence the question is, if MSVC /hotpatch or GCC __ms_hook_prologue__ was supported in LLVM, would it be fine if it generated "66 90 XCHG ax, ax"? Thanks in advance! Alex.

3 4

[PATCH 1/2] msado15: Ignore IRunnableObject interface in recordset/connection_QueryInterface.
by Gijs Vermeulen June 7, 2020

June 7, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- This avoids a fixme in FinanceExplorer and CMS-Client. dlls/msado15/connection.c | 7 +++++++ dlls/msado15/recordset.c | 7 +++++++ dlls/msado15/tests/msado15.c | 6 ++++++ 3 files changed, 20 insertions(+) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 9e8c05522e..b9474e1b78 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -98,6 +98,8 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid struct connection *connection = impl_from_Connection( iface ); TRACE( "%p, %s, %p\n", connection, debugstr_guid(riid), obj ); + *obj = NULL; + if (IsEqualGUID( riid, &IID__Connection ) || IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown )) { @@ -111,6 +113,11 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid { *obj = &connection->IConnectionPointContainer_iface; } + else if (IsEqualGUID( riid, &IID_IRunnableObject )) + { + TRACE("IID_IRunnableObject not supported returning NULL\n"); + return E_NOINTERFACE; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index ffb3788531..a5096e5c4f 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -784,6 +784,8 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, struct recordset *recordset = impl_from_Recordset( iface ); TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); + *obj = NULL; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDispatch) || IsEqualIID(riid, &IID__ADO) || IsEqualIID(riid, &IID_Recordset15) || IsEqualIID(riid, &IID_Recordset20) || IsEqualIID(riid, &IID_Recordset21) || @@ -795,6 +797,11 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, { *obj = &recordset->ISupportErrorInfo_iface; } + else if (IsEqualGUID( riid, &IID_IRunnableObject )) + { + TRACE("IID_IRunnableObject not supported returning NULL\n"); + return E_NOINTERFACE; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index a8d2afdd41..1d457a703d 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -61,6 +61,7 @@ static LONG get_refs_recordset( _Recordset *recordset ) static void test_Recordset(void) { _Recordset *recordset; + IRunnableObject *runtime; ISupportErrorInfo *errorinfo; Fields *fields, *fields2; Field *field; @@ -73,6 +74,10 @@ static void test_Recordset(void) hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); ok( hr == S_OK, "got %08x\n", hr ); + hr = _Recordset_QueryInterface( recordset, &IID_IRunnableObject, (void**)&runtime); + ok(hr == E_NOINTERFACE, "Unexpected IRunnableObject interface\n"); + ok(runtime == NULL, "expected NULL\n"); + /* _Recordset object supports ISupportErrorInfo */ errorinfo = NULL; hr = _Recordset_QueryInterface( recordset, &IID_ISupportErrorInfo, (void **)&errorinfo ); @@ -676,6 +681,7 @@ static void test_Connection(void) hr = _Connection_QueryInterface(connection, &IID_IRunnableObject, (void**)&runtime); ok(hr == E_NOINTERFACE, "Unexpected IRunnableObject interface\n"); + ok(runtime == NULL, "expected NULL\n"); hr = _Connection_QueryInterface(connection, &IID_ISupportErrorInfo, (void**)&errorinfo); ok(hr == S_OK, "Failed to get ISupportErrorInfo interface\n"); -- 2.26.2

1 1

[PATCH] ntdll: Replicate InterlockedCompareExchange64 to the Unix library.
by Gerald Pfeifer June 6, 2020

June 6, 2020

Between Wine 5.9 and 5.10 many ntdll functions moved to the Unix library. Make the implementation of InterlockedCompareExchange64 via RtlInterlockedCompareExchange64 available there as well for targets without __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8. This fixes the build on FreeBSD/i386 with GCC 9. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/ntdll/unix/unix_private.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index a422fd825e..a0485b411d 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -23,6 +23,10 @@ #include "unixlib.h" +#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 +#define InterlockedCompareExchange64(dest,xchg,cmp) RtlInterlockedCompareExchange64(dest,xchg,cmp) +#endif + struct debug_info { unsigned int str_pos; /* current position in strings buffer */ -- 2.25.0

1 0

[PATCH] strmbase: Avoid leaking the media type on failure in IEnumMediaTypes::Next().
by Zebediah Figura June 6, 2020

June 6, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/pin.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index eab7c0cb2e..f08c6d0186 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -119,6 +119,7 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, AM_MEDIA_TYPE **mts, ULONG *ret_count) { struct enum_media_types *enummt = impl_from_IEnumMediaTypes(iface); + AM_MEDIA_TYPE mt; unsigned int i; HRESULT hr; @@ -133,10 +134,14 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, for (i = 0; i < count; ++i) { - if ((mts[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) - hr = enummt->pin->ops->pin_get_media_type(enummt->pin, enummt->index + i, mts[i]); - else - hr = E_OUTOFMEMORY; + hr = enummt->pin->ops->pin_get_media_type(enummt->pin, enummt->index + i, &mt); + if (hr == S_OK) + { + if ((mts[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) + *mts[i] = mt; + else + hr = E_OUTOFMEMORY; + } if (FAILED(hr)) { while (i--) -- 2.27.0

1 0

[PATCH] strmbase: Clear the debug info before calling DeleteCriticalSection (Valgrind).
by Zebediah Figura June 6, 2020

June 6, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/filter.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 2809832ee8..8b8182a13a 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -532,11 +532,13 @@ void strmbase_filter_init(struct strmbase_filter *filter, IUnknown *outer, filter->ops = ops; } -void strmbase_filter_cleanup(struct strmbase_filter *This) +void strmbase_filter_cleanup(struct strmbase_filter *filter) { - if (This->clock) - IReferenceClock_Release(This->clock); + if (filter->clock) + IReferenceClock_Release(filter->clock); - This->IBaseFilter_iface.lpVtbl = NULL; - DeleteCriticalSection(&This->csFilter); + filter->IBaseFilter_iface.lpVtbl = NULL; + if (filter->csFilter.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) + filter->csFilter.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&filter->csFilter); } -- 2.27.0

1 0

[PATCH] ntdll: Avoid leaking "drive" on error paths from get_mountmgr_fs_info() (Valgrind).
by Zebediah Figura June 6, 2020

June 6, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/file.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index b5a48db176..1b70e47367 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2328,7 +2328,10 @@ static struct mountmgr_unix_drive *get_mountmgr_fs_info( HANDLE handle, int fd ) InitializeObjectAttributes( &attr, &string, 0, NULL, NULL ); if (NtOpenFile( &mountmgr, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT )) + { + RtlFreeHeap( GetProcessHeap(), 0, drive ); return NULL; + } status = NtDeviceIoControlFile( mountmgr, NULL, NULL, NULL, &io, IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE, drive, sizeof(*drive), drive, 1024 ); -- 2.27.0

2 1

[PATCH 3/3] oleaut32: Add support for decoding SLTG variable help strings.
by Vijay Kiran Kamuju June 6, 2020

June 6, 2020

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 2/3] oleaut32: Add support for decoding SLTG function help strings.
by Vijay Kiran Kamuju June 6, 2020

June 6, 2020

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

Wine staging 5.10 release
by Alistair Leslie-Hughes June 6, 2020

June 6, 2020

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.10 (818 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * ntdll: Refactor RtlCreateUserThread into NtCreateThreadEx. Added: * [46969] ntdll: Implement RtlQueryRegistryValuesEx. * [41636] d3d11: Implement ID3D11Device2 GetImmediateContext1. Updated: * winebuild-Fake_Dlls * d3d11-Deferred_Context * ntdll-ForceBottomUpAlloc * ntdll-Interrupt-0x2e Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0