- Wine-Devel - list.winehq.org

[PATCH] gdi32: Avoid the actual drawing position is inconsistent with the desired position when the width or height is negative.
by Jiangyi Chen Nov. 19, 2020

Nov. 19, 2020

The attachment contains a test program and source code written on the window. Please take a look.

2 1

[PATCH] winepulse.drv: Support older version of the AudioClientProperties structure
by Alistair Leslie-Hughes Nov. 19, 2020

Nov. 19, 2020

Warframe when using a win10 prefix, uses an xaudio2_9redist.dll which uses the older AudioClientProperties structure (missing the Options member). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winepulse.drv/mmdevdrv.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index cef8a2d4d5b..319904ee55a 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -2254,13 +2254,17 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient3 *iface, if(!prop) return E_POINTER; - if(prop->cbSize != sizeof(*prop)) + /* Windows 8 and below doesn't have the Options Field. */ + if(prop->cbSize != sizeof(*prop) && prop->cbSize != FIELD_OFFSET(AudioClientProperties, Options)) + { + WARN("Unsupported Size = %d\n", prop->cbSize); return E_INVALIDARG; - + } + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", prop->bIsOffload, prop->eCategory, - prop->Options); + prop->cbSize == sizeof(*prop) ? prop->Options : 0); if(prop->bIsOffload) return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; -- 2.29.2

1 0

[PATCH] msado15/tests: Add ADORecordsetConstruction tests
by Alistair Leslie-Hughes Nov. 19, 2020

Nov. 19, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/tests/msado15.c | 346 +++++++++++++++++++++++++++++++++++ 1 file changed, 346 insertions(+) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index e95df49c2c2..a905c8d38ac 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -23,6 +23,9 @@ #include <olectl.h> #include <msado15_backcompat.h> #include "wine/test.h" +#include "msdasql.h" + +DEFINE_GUID(DBPROPSET_ROWSET, 0xc8b522be, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); #define MAKE_ADO_HRESULT( err ) MAKE_HRESULT( SEVERITY_ERROR, FACILITY_CONTROL, err ) @@ -288,6 +291,348 @@ static void test_Recordset(void) _Recordset_Release( recordset ); } +/* This interface is queried for but is not documented anywhere. */ +DEFINE_GUID(UKN_INTERFACE, 0x6f1e39e1, 0x05c6, 0x11d0, 0xa7, 0x8b, 0x00, 0xaa, 0x00, 0xa3, 0xf0, 0x0d); + +struct test_rowset +{ + IRowset IRowset_iface; + IRowsetInfo IRowsetInfo_iface; + IColumnsInfo IColumnsInfo_iface; + LONG refs; +}; + +static inline struct test_rowset *impl_from_IRowset( IRowset *iface ) +{ + return CONTAINING_RECORD( iface, struct test_rowset, IRowset_iface ); +} + +static inline struct test_rowset *impl_from_IRowsetInfo( IRowsetInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct test_rowset, IRowsetInfo_iface ); +} + +static inline struct test_rowset *impl_from_IColumnsInfo( IColumnsInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct test_rowset, IColumnsInfo_iface ); +} + +static HRESULT WINAPI rowset_info_QueryInterface(IRowsetInfo *iface, REFIID riid, void **obj) +{ + struct test_rowset *rowset = impl_from_IRowsetInfo( iface ); + return IRowset_QueryInterface(&rowset->IRowset_iface, riid, obj); +} + +static ULONG WINAPI rowset_info_AddRef(IRowsetInfo *iface) +{ + struct test_rowset *rowset = impl_from_IRowsetInfo( iface ); + return IRowset_AddRef(&rowset->IRowset_iface); +} + +static ULONG WINAPI rowset_info_Release(IRowsetInfo *iface) +{ + struct test_rowset *rowset = impl_from_IRowsetInfo( iface ); + return IRowset_Release(&rowset->IRowset_iface); +} + +static HRESULT WINAPI rowset_info_GetProperties(IRowsetInfo *iface, const ULONG count, + const DBPROPIDSET propertyidsets[], ULONG *out_count, DBPROPSET **propertysets1) +{ + ok( count == 2, "got %d\n", count ); + + ok( IsEqualIID(&DBPROPSET_ROWSET, &propertyidsets[0].guidPropertySet), "got %s\n", wine_dbgstr_guid(&propertyidsets[0].guidPropertySet)); + ok( propertyidsets[0].cPropertyIDs == 17, "got %d\n", propertyidsets[0].cPropertyIDs ); + + ok( IsEqualIID(&DBPROPSET_PROVIDERROWSET, &propertyidsets[1].guidPropertySet), "got %s\n", wine_dbgstr_guid(&propertyidsets[1].guidPropertySet)); + ok( propertyidsets[1].cPropertyIDs == 1, "got %d\n", propertyidsets[1].cPropertyIDs ); + + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_info_GetReferencedRowset(IRowsetInfo *iface, DBORDINAL ordinal, + REFIID riid, IUnknown **unk) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_info_GetSpecification(IRowsetInfo *iface, REFIID riid, + IUnknown **specification) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static const struct IRowsetInfoVtbl rowset_info = +{ + rowset_info_QueryInterface, + rowset_info_AddRef, + rowset_info_Release, + rowset_info_GetProperties, + rowset_info_GetReferencedRowset, + rowset_info_GetSpecification +}; + +static HRESULT WINAPI column_info_QueryInterface(IColumnsInfo *iface, REFIID riid, void **obj) +{ + struct test_rowset *rowset = impl_from_IColumnsInfo( iface ); + return IRowset_QueryInterface(&rowset->IRowset_iface, riid, obj); +} + +static ULONG WINAPI column_info_AddRef(IColumnsInfo *iface) +{ + struct test_rowset *rowset = impl_from_IColumnsInfo( iface ); + return IRowset_AddRef(&rowset->IRowset_iface); +} + +static ULONG WINAPI column_info_Release(IColumnsInfo *iface) +{ + struct test_rowset *rowset = impl_from_IColumnsInfo( iface ); + return IRowset_Release(&rowset->IRowset_iface); +} + +static HRESULT WINAPI column_info_GetColumnInfo(IColumnsInfo *This, DBORDINAL *columns, + DBCOLUMNINFO **colinfo, OLECHAR **stringsbuffer) +{ + DBCOLUMNINFO *dbcolumn; + *columns = 1; + + *stringsbuffer = CoTaskMemAlloc(sizeof(L"Column1")); + lstrcpyW(*stringsbuffer, L"Column1"); + + dbcolumn = CoTaskMemAlloc(sizeof(DBCOLUMNINFO)); + + dbcolumn->pwszName = *stringsbuffer; + dbcolumn->pTypeInfo = NULL; + dbcolumn->iOrdinal = 1; + dbcolumn->dwFlags = DBCOLUMNFLAGS_MAYBENULL; + dbcolumn->ulColumnSize = 5; + dbcolumn->wType = DBTYPE_I4; + dbcolumn->bPrecision = 1; + dbcolumn->bScale = 1; + dbcolumn->columnid.eKind = DBKIND_NAME; + dbcolumn->columnid.uName.pwszName = *stringsbuffer; + + *colinfo = dbcolumn; + + return S_OK; +} + +static HRESULT WINAPI column_info_MapColumnIDs(IColumnsInfo *This, DBORDINAL column_ids, + const DBID *dbids, DBORDINAL *columns) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static const struct IColumnsInfoVtbl column_info = +{ + column_info_QueryInterface, + column_info_AddRef, + column_info_Release, + column_info_GetColumnInfo, + column_info_MapColumnIDs, +}; + +static HRESULT WINAPI rowset_QueryInterface(IRowset *iface, REFIID riid, void **obj) +{ + struct test_rowset *rowset = impl_from_IRowset( iface ); + + *obj = NULL; + + if (IsEqualIID(riid, &IID_IRowset) || + IsEqualIID(riid, &IID_IUnknown)) + { + trace("Requested interface IID_IRowset\n"); + *obj = &rowset->IRowset_iface; + } + else if (IsEqualIID(riid, &IID_IRowsetInfo)) + { + trace("Requested interface IID_IRowsetInfo\n"); + *obj = &rowset->IRowsetInfo_iface; + } + else if (IsEqualIID(riid, &IID_IColumnsInfo)) + { + trace("Requested interface IID_IColumnsInfo\n"); + *obj = &rowset->IColumnsInfo_iface; + } + else if (IsEqualIID(riid, &IID_IRowsetLocate)) + { + trace("Requested interface IID_IRowsetLocate\n"); + return E_NOINTERFACE; + } + else if (IsEqualIID(riid, &IID_IDBAsynchStatus)) + { + trace("Requested interface IID_IDBAsynchStatus\n"); + return E_NOINTERFACE; + } + else if (IsEqualIID(riid, &IID_IAccessor)) + { + trace("Requested interface IID_IAccessor\n"); + return E_NOINTERFACE; + } + else if (IsEqualIID(riid, &UKN_INTERFACE)) + { + trace("Unknown interface\n"); + return E_NOINTERFACE; + } + + if(*obj) { + IUnknown_AddRef((IUnknown*)*obj); + return S_OK; + } + + ok(0, "Unsupported interface %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI rowset_AddRef(IRowset *iface) +{ + struct test_rowset *rowset = impl_from_IRowset( iface ); + return InterlockedIncrement( &rowset->refs );; +} + +static ULONG WINAPI rowset_Release(IRowset *iface) +{ + struct test_rowset *rowset = impl_from_IRowset( iface ); + /* Object not allocated no need to destroy */ + return InterlockedDecrement( &rowset->refs );; +} + +static HRESULT WINAPI rowset_AddRefRows(IRowset *iface, DBCOUNTITEM cRows, const HROW rghRows[], + DBREFCOUNT rgRefCounts[], DBROWSTATUS rgRowStatus[]) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_GetData(IRowset *iface, HROW hRow, HACCESSOR hAccessor, void *pData) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_GetNextRows(IRowset *iface, HCHAPTER hReserved, DBROWOFFSET lRowsOffset, + DBROWCOUNT cRows, DBCOUNTITEM *pcRowObtained, HROW **prghRows) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_ReleaseRows(IRowset *iface, DBCOUNTITEM cRows, const HROW rghRows[], + DBROWOPTIONS rgRowOptions[], DBREFCOUNT rgRefCounts[], DBROWSTATUS rgRowStatus[]) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_RestartPosition(IRowset *iface, HCHAPTER hReserved) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static const struct IRowsetVtbl rowset_vtbl = +{ + rowset_QueryInterface, + rowset_AddRef, + rowset_Release, + rowset_AddRefRows, + rowset_GetData, + rowset_GetNextRows, + rowset_ReleaseRows, + rowset_RestartPosition +}; + +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + +static void test_ADORecordsetConstruction(void) +{ + _Recordset *recordset; + ADORecordsetConstruction *construct; + Fields *fields = NULL; + Field *field; + struct test_rowset testrowset; + IRowset *rowset; + HRESULT hr; + LONG ref, count; + + 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_ADORecordsetConstruction, (void**)&construct ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + if (FAILED(hr)) + { + goto done; + } + + testrowset.IRowset_iface.lpVtbl = &rowset_vtbl; + testrowset.IRowsetInfo_iface.lpVtbl = &rowset_info; + testrowset.IColumnsInfo_iface.lpVtbl = &column_info; + testrowset.refs = 1; + + rowset = &testrowset.IRowset_iface; + + ref = get_refcount( rowset ); + ok( ref == 1, "got %d\n", ref ); + hr = ADORecordsetConstruction_put_Rowset( construct, (IUnknown*)rowset ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + + ref = get_refcount( rowset ); + ok( ref == 2, "got %d\n", ref ); + + hr = _Recordset_get_Fields( recordset, &fields ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( fields != NULL, "NULL value\n"); + + ref = get_refcount( rowset ); + ok( ref == 2, "got %d\n", ref ); + + count = -1; + hr = Fields_get_Count( fields, &count ); + ok( count == 1, "got %d\n", count ); + if (count > 0) + { + VARIANT index; + LONG size; + DataTypeEnum type; + + V_VT( &index ) = VT_BSTR; + V_BSTR( &index ) = SysAllocString( L"Column1" ); + + hr = Fields_get_Item( fields, index, &field ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = Field_get_Type( field, &type ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( type == adInteger, "got %d\n", type ); + size = -1; + hr = Field_get_DefinedSize( field, &size ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( size == 5, "got %d\n", size ); + + VariantClear(&index); + + Field_Release(field); + } + + ref = get_refcount(rowset); + ok( ref == 2, "got %d\n", ref ); + + Fields_Release(fields); + + ADORecordsetConstruction_Release(construct); + +done: + _Recordset_Release( recordset ); +} + static void test_Fields(void) { _Recordset *recordset; @@ -1136,6 +1481,7 @@ START_TEST(msado15) { CoInitialize( NULL ); test_Connection(); + test_ADORecordsetConstruction(); test_ConnectionPoint(); test_Fields(); test_Recordset(); -- 2.29.2

2 1

[PATCH v2 1/4] include: Fix DPFLTR_MASK value to 0x80000000.
by Rémi Bernon Nov. 19, 2020

Nov. 19, 2020

This is most likely a typo from MSDN. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Use RtlRaiseException as the exception address, testing shows that the address on Windows varies, and is sometimes around DbgPrint or RtlRaiseException, but nothing matching exactly. Supersedes: 196206-196209 include/dpfilter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dpfilter.h b/include/dpfilter.h index 5b09dc9c23c..deb8db3fc41 100644 --- a/include/dpfilter.h +++ b/include/dpfilter.h @@ -23,7 +23,7 @@ #define DPFLTR_WARNING_LEVEL 1 #define DPFLTR_TRACE_LEVEL 2 #define DPFLTR_INFO_LEVEL 3 -#define DPFLTR_MASK 0x8000000 +#define DPFLTR_MASK 0x80000000 typedef enum _DPFLTR_TYPE { -- 2.29.2

1 3

[PATCH v2] ntdll: Stub ThreadEnableAlignmentFaultFixup info class.
by Rémi Bernon Nov. 19, 2020

Nov. 19, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46216 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: * Remove unused variables * Query with the same size that succeeds with Set Supersedes: 196211 dlls/ntdll/tests/info.c | 33 +++++++++++++++++++++++++++++++++ dlls/ntdll/unix/thread.c | 11 +++++++++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 70ea7d5146b..5db7a800cbe 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2505,6 +2505,37 @@ static void test_NtGetCurrentProcessorNumber(void) ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); } +static void test_ThreadEnableAlignmentFaultFixup(void) +{ + NTSTATUS status; + ULONG dummy; + + dummy = 0; + status = NtQueryInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, sizeof(ULONG), NULL ); + ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), "Expected STATUS_INVALID_INFO_CLASS, got %08x\n", status ); + status = NtQueryInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, 1, NULL ); + ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), "Expected STATUS_INVALID_INFO_CLASS, got %08x\n", status ); + + dummy = 1; + status = pNtSetInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, sizeof(ULONG) ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadEnableAlignmentFaultFixup, NULL, 0 ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadEnableAlignmentFaultFixup, NULL, 1 ); + ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status ); + status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadEnableAlignmentFaultFixup, &dummy, 1 ); + todo_wine ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status ); + status = pNtSetInformationThread( GetCurrentProcess(), ThreadEnableAlignmentFaultFixup, &dummy, 1 ); + todo_wine ok( status == STATUS_OBJECT_TYPE_MISMATCH, "Expected STATUS_OBJECT_TYPE_MISMATCH, got %08x\n", status ); + dummy = 1; + status = pNtSetInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, 1 ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + + dummy = 0; + status = pNtSetInformationThread( GetCurrentProcess(), ThreadEnableAlignmentFaultFixup, &dummy, 8 ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); +} + static DWORD WINAPI start_address_thread(void *arg) { PRTL_THREAD_START_ROUTINE entry; @@ -2774,4 +2805,6 @@ START_TEST(info) test_readvirtualmemory(); test_queryvirtualmemory(); test_NtGetCurrentProcessorNumber(); + + test_ThreadEnableAlignmentFaultFixup(); } diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index a161c5d1c90..6c056497ab7 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1093,10 +1093,12 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, if (ret_len) *ret_len = sizeof(BOOLEAN); return STATUS_SUCCESS; + case ThreadEnableAlignmentFaultFixup: + return STATUS_INVALID_INFO_CLASS; + case ThreadPriority: case ThreadBasePriority: case ThreadImpersonationToken: - case ThreadEnableAlignmentFaultFixup: case ThreadEventPair_Reusable: case ThreadZeroTlsCell: case ThreadPerformanceCount: @@ -1272,11 +1274,16 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, #endif } + case ThreadEnableAlignmentFaultFixup: + if (length != sizeof(BOOLEAN)) return STATUS_INFO_LENGTH_MISMATCH; + if (!data) return STATUS_ACCESS_VIOLATION; + FIXME( "ThreadEnableAlignmentFaultFixup stub!\n" ); + return STATUS_SUCCESS; + case ThreadBasicInformation: case ThreadTimes: case ThreadPriority: case ThreadDescriptorTableEntry: - case ThreadEnableAlignmentFaultFixup: case ThreadEventPair_Reusable: case ThreadPerformanceCount: case ThreadAmILastThread: -- 2.29.2

1 0

[PATCH] ntdll: Stub ThreadEnableAlignmentFaultFixup info class.
by Rémi Bernon Nov. 19, 2020

Nov. 19, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46216 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- These games DRMs are just calling this function with an invalid length. It seems harmless as it doesn't prevent them from running, but we can stub it a bit more. dlls/ntdll/tests/info.c | 32 ++++++++++++++++++++++++++++++++ dlls/ntdll/unix/thread.c | 11 +++++++++-- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 70ea7d5146b..afc6149277d 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2505,6 +2505,36 @@ static void test_NtGetCurrentProcessorNumber(void) ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); } +static void test_ThreadEnableAlignmentFaultFixup(void) +{ + NTSTATUS status; + HANDLE thread, stop_event; + ULONG dummy; + + dummy = 0; + status = NtQueryInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, sizeof(ULONG), NULL ); + ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), "Expected STATUS_INVALID_INFO_CLASS, got %08x\n", status ); + + dummy = 1; + status = pNtSetInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, sizeof(ULONG) ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadEnableAlignmentFaultFixup, NULL, 0 ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadEnableAlignmentFaultFixup, NULL, 1 ); + ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status ); + status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadEnableAlignmentFaultFixup, &dummy, 1 ); + todo_wine ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status ); + status = pNtSetInformationThread( GetCurrentProcess(), ThreadEnableAlignmentFaultFixup, &dummy, 1 ); + todo_wine ok( status == STATUS_OBJECT_TYPE_MISMATCH, "Expected STATUS_OBJECT_TYPE_MISMATCH, got %08x\n", status ); + dummy = 1; + status = pNtSetInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, 1 ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + + dummy = 0; + status = pNtSetInformationThread( GetCurrentProcess(), ThreadEnableAlignmentFaultFixup, &dummy, 8 ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); +} + static DWORD WINAPI start_address_thread(void *arg) { PRTL_THREAD_START_ROUTINE entry; @@ -2774,4 +2804,6 @@ START_TEST(info) test_readvirtualmemory(); test_queryvirtualmemory(); test_NtGetCurrentProcessorNumber(); + + test_ThreadEnableAlignmentFaultFixup(); } diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index a161c5d1c90..6c056497ab7 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1093,10 +1093,12 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, if (ret_len) *ret_len = sizeof(BOOLEAN); return STATUS_SUCCESS; + case ThreadEnableAlignmentFaultFixup: + return STATUS_INVALID_INFO_CLASS; + case ThreadPriority: case ThreadBasePriority: case ThreadImpersonationToken: - case ThreadEnableAlignmentFaultFixup: case ThreadEventPair_Reusable: case ThreadZeroTlsCell: case ThreadPerformanceCount: @@ -1272,11 +1274,16 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, #endif } + case ThreadEnableAlignmentFaultFixup: + if (length != sizeof(BOOLEAN)) return STATUS_INFO_LENGTH_MISMATCH; + if (!data) return STATUS_ACCESS_VIOLATION; + FIXME( "ThreadEnableAlignmentFaultFixup stub!\n" ); + return STATUS_SUCCESS; + case ThreadBasicInformation: case ThreadTimes: case ThreadPriority: case ThreadDescriptorTableEntry: - case ThreadEnableAlignmentFaultFixup: case ThreadEventPair_Reusable: case ThreadPerformanceCount: case ThreadAmILastThread: -- 2.29.2

2 1

[PATCH 1/4] include: Fix DPFLTR_MASK value to 0x80000000.
by Rémi Bernon Nov. 19, 2020

Nov. 19, 2020

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This is most likely a typo from MSDN. Supersedes: 196179 include/dpfilter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dpfilter.h b/include/dpfilter.h index 5b09dc9c23c..deb8db3fc41 100644 --- a/include/dpfilter.h +++ b/include/dpfilter.h @@ -23,7 +23,7 @@ #define DPFLTR_WARNING_LEVEL 1 #define DPFLTR_TRACE_LEVEL 2 #define DPFLTR_INFO_LEVEL 3 -#define DPFLTR_MASK 0x8000000 +#define DPFLTR_MASK 0x80000000 typedef enum _DPFLTR_TYPE { -- 2.29.2

2 5

[PATCH] d3dx10/tests: Add tests for D3DX10CreateTextureFromMemory.
by Ziqing Hui Nov. 19, 2020

Nov. 19, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 163 ++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+)

1 0

[PATCH 1/2] winemac.drv: Use Metal to get a display's GPU info if possible.
by Brendan Shanks Nov. 19, 2020

Nov. 19, 2020

Fixes an Apple Silicon issue where CGDisplayIOServicePort() returns a fake AMD GPU "compatibility" node rather than the real GPU node. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/winemac.drv/cocoa_display.m | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index e769772feaa..1125d29839c 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -330,6 +330,21 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) return ret; } +/*********************************************************************** + * macdrv_get_gpu_info_from_display_id_using_metal + * + * Get GPU information for a CG display id using Metal. + * + * Returns non-zero value on failure. + */ +static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) +{ + id<MTLDevice> device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; + if (!device || ![device respondsToSelector:@selector(registryID)]) + return -1; + return macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); +} + #else static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) @@ -337,6 +352,11 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) return -1; } +static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) +{ + return -1; +} + #endif /*********************************************************************** @@ -349,8 +369,16 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) */ static int macdrv_get_gpu_info_from_display_id(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) { - io_registry_entry_t entry = CGDisplayIOServicePort(display_id); - return macdrv_get_gpu_info_from_entry(gpu, entry); + int ret; + io_registry_entry_t entry; + + ret = macdrv_get_gpu_info_from_display_id_using_metal(gpu, display_id); + if (ret) + { + entry = CGDisplayIOServicePort(display_id); + ret = macdrv_get_gpu_info_from_entry(gpu, entry); + } + return ret; } /*********************************************************************** -- 2.26.2

2 2

[PATCH 1/5] strmbase: Forbid disconnecting the sink if the filter is not stopped.
by Zebediah Figura Nov. 19, 2020

Nov. 19, 2020

Addendum to 2a6037e263ff3fae8ca82d90b0b141bea1cd473d. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/pin.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index c08f04730e7..d7788cda493 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -887,6 +887,13 @@ static HRESULT WINAPI sink_Disconnect(IPin *iface) EnterCriticalSection(&pin->pin.filter->csFilter); + if (pin->pin.filter->state != State_Stopped) + { + LeaveCriticalSection(&pin->pin.filter->csFilter); + WARN("Filter is not stopped; returning VFW_E_NOT_STOPPED.\n"); + return VFW_E_NOT_STOPPED; + } + if (pin->pin.peer) { if (pin->pFuncsTable->sink_disconnect) -- 2.29.2

2 7