wine-commits November 2020

wine-commits@winehq.org

1 participants
851 discussions

Nikolay Sivov : mf/session: Keep a reference to the original activation object when binding sink nodes.
by Alexandre Julliard 20 Nov '20

20 Nov '20

Module: wine Branch: master Commit: 39cac934efe495a029faed00fd5608e1e6f6ce62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39cac934efe495a029faed00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 20 16:21:17 2020 +0300 mf/session: Keep a reference to the original activation object when binding sink nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 4821ed5c90a..0381917826a 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -32,6 +32,10 @@ #include "mf_private.h" +#include "initguid.h" + +DEFINE_GUID(_MF_TOPONODE_IMFActivate, 0x33706f4a, 0x309a, 0x49be, 0xa8, 0xdd, 0xe7, 0xc0, 0x87, 0x5e, 0xb6, 0x79); + WINE_DEFAULT_DEBUG_CHANNEL(mfplat); enum session_command @@ -683,6 +687,9 @@ static HRESULT session_bind_output_nodes(IMFTopology *topology) IMFMediaSink_Release(media_sink); } + if (SUCCEEDED(hr)) + IMFTopologyNode_SetUnknown(node, &_MF_TOPONODE_IMFActivate, (IUnknown *)activate); + IMFActivate_Release(activate); } }

1 0

Nikolay Sivov : mf/session: Shutdown and release presentation clock on session shutdown.
by Alexandre Julliard 20 Nov '20

20 Nov '20

Module: wine Branch: master Commit: b3461c48649b6b3ae290fec92c7c2f67f884aae9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3461c48649b6b3ae290fec9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 20 16:21:16 2020 +0300 mf/session: Shutdown and release presentation clock on session shutdown. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 3 +++ dlls/mf/tests/mf.c | 18 +++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index dffd5113ff9..4821ed5c90a 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1792,6 +1792,9 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) IMFMediaEventQueue_Shutdown(session->event_queue); if (session->quality_manager) IMFQualityManager_Shutdown(session->quality_manager); + MFShutdownObject((IUnknown *)session->clock); + IMFPresentationClock_Release(session->clock); + session->clock = NULL; } LeaveCriticalSection(&session->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 2a671225a11..27e859fa82d 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1188,13 +1188,14 @@ static void test_media_session(void) IMFAttributes *attributes; IMFMediaSession *session; IMFTopology *topology; + IMFShutdown *shutdown; PROPVARIANT propvar; + DWORD status, caps; IMFGetService *gs; IMFClock *clock; IUnknown *unk; HRESULT hr; float rate; - DWORD caps; BOOL thin; hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); @@ -1275,9 +1276,24 @@ todo_wine hr = MFCreateMediaSession(NULL, &session); ok(hr == S_OK, "Failed to create media session, hr %#x.\n", hr); + hr = IMFMediaSession_GetClock(session, &clock); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFClock_QueryInterface(clock, &IID_IMFShutdown, (void **)&shutdown); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFShutdown_GetShutdownStatus(shutdown, &status); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSession_Shutdown(session); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + hr = IMFShutdown_GetShutdownStatus(shutdown, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(status == MFSHUTDOWN_COMPLETED, "Unexpected shutdown status %u.\n", status); + + IMFShutdown_Release(shutdown); + hr = IMFMediaSession_ClearTopologies(session); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr);

1 0

Michael Stefaniuc : mshtml: Fix spelling of fuchsia.
by Alexandre Julliard 20 Nov '20

20 Nov '20

Module: wine Branch: master Commit: b8e550a575c69c2f951fa0d0d2e425f7c050ab08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8e550a575c69c2f951fa0d0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 18 20:59:31 2020 +0100 mshtml: Fix spelling of fuchsia. Spotted by Rafał Mużyło. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlbody.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index fddc4c6da0e..4209fd2cc2e 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -52,7 +52,7 @@ static const struct { {L"aqua", 0x00ffff}, {L"black", 0x000000}, {L"blue", 0x0000ff}, - {L"fushsia", 0xff00ff}, + {L"fuchsia", 0xff00ff}, {L"gray", 0x808080}, {L"green", 0x008000}, {L"lime", 0x00ff00},

1 0

Alistair Leslie-Hughes : msado15: Implement ADORecordsetConstruction get/put Rowset.
by Alexandre Julliard 20 Nov '20

20 Nov '20

Module: wine Branch: master Commit: f99a09e906a47f0ee7dc2a18d4c232426a401cc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f99a09e906a47f0ee7dc2a18… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 20 19:16:26 2020 +1100 msado15: Implement ADORecordsetConstruction get/put Rowset. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 31 ++++++++++++++++++++++++++----- dlls/msado15/tests/msado15.c | 8 ++++---- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 79679e455af..17200d73790 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -23,6 +23,7 @@ #define COBJMACROS #include "objbase.h" #include "msado15_backcompat.h" +#include "oledb.h" #include "wine/debug.h" #include "wine/heap.h" @@ -46,6 +47,7 @@ struct recordset VARIANT *data; CursorLocationEnum cursor_location; CursorTypeEnum cursor_type; + IRowset *row_set; }; struct fields @@ -757,6 +759,8 @@ static void close_recordset( struct recordset *recordset ) { ULONG row, col, col_count; + if ( recordset->row_set ) IRowset_Release( recordset->row_set ); + if (!recordset->fields) return; col_count = get_column_count( recordset ); @@ -1611,15 +1615,31 @@ static HRESULT WINAPI rsconstruction_Invoke(ADORecordsetConstruction *iface, DIS static HRESULT WINAPI rsconstruction_get_Rowset(ADORecordsetConstruction *iface, IUnknown **row_set) { struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); - FIXME( "%p, %p\n", recordset, row_set ); - return E_NOTIMPL; + HRESULT hr; + + TRACE( "%p, %p\n", recordset, row_set ); + + hr = IRowset_QueryInterface(recordset->row_set, &IID_IUnknown, (void**)row_set); + if ( FAILED(hr) ) return E_FAIL; + + return S_OK; } -static HRESULT WINAPI rsconstruction_put_Rowset(ADORecordsetConstruction *iface, IUnknown *row_set) +static HRESULT WINAPI rsconstruction_put_Rowset(ADORecordsetConstruction *iface, IUnknown *unk) { struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); - FIXME( "%p, %p\n", recordset, row_set ); - return E_NOTIMPL; + HRESULT hr; + IRowset *rowset; + + TRACE( "%p, %p\n", recordset, unk ); + + hr = IUnknown_QueryInterface(unk, &IID_IRowset, (void**)&rowset); + if ( FAILED(hr) ) return E_FAIL; + + if ( recordset->row_set ) IRowset_Release( recordset->row_set ); + recordset->row_set = rowset; + + return S_OK; } static HRESULT WINAPI rsconstruction_get_Chapter(ADORecordsetConstruction *iface, LONG *chapter) @@ -1679,6 +1699,7 @@ HRESULT Recordset_create( void **obj ) recordset->index = -1; recordset->cursor_location = adUseServer; recordset->cursor_type = adOpenForwardOnly; + recordset->row_set = NULL; *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 288e579f10c..cafb73d64e4 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -582,17 +582,17 @@ static void test_ADORecordsetConstruction(void) 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 ); + ok( hr == S_OK, "got %08x\n", hr ); ref = get_refcount( rowset ); - todo_wine ok( ref == 2, "got %d\n", ref ); + 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 ); - todo_wine ok( ref == 2, "got %d\n", ref ); + ok( ref == 2, "got %d\n", ref ); count = -1; hr = Fields_get_Count( fields, &count ); @@ -623,7 +623,7 @@ static void test_ADORecordsetConstruction(void) } ref = get_refcount(rowset); - todo_wine ok( ref == 2, "got %d\n", ref ); + ok( ref == 2, "got %d\n", ref ); Fields_Release(fields);

1 0

Alistair Leslie-Hughes : msado15: Support ADORecordsetConstruction in _Recordset.
by Alexandre Julliard 20 Nov '20

20 Nov '20

Module: wine Branch: master Commit: 8049e4dbc94469b345a7ffa25edd567f2a75d341 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8049e4dbc94469b345a7ffa2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 20 19:16:25 2020 +1100 msado15: Support ADORecordsetConstruction in _Recordset. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 123 +++++++++++++++++++++++++++++++++++++++++++ dlls/msado15/tests/msado15.c | 10 ++-- 2 files changed, 128 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index e3dd83a4309..79679e455af 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -35,6 +35,7 @@ struct fields; struct recordset { _Recordset Recordset_iface; + ADORecordsetConstruction ADORecordsetConstruction_iface; ISupportErrorInfo ISupportErrorInfo_iface; LONG refs; LONG state; @@ -739,6 +740,11 @@ static inline struct recordset *impl_from_Recordset( _Recordset *iface ) return CONTAINING_RECORD( iface, struct recordset, Recordset_iface ); } +static inline struct recordset *impl_from_ADORecordsetConstruction( ADORecordsetConstruction *iface ) +{ + return CONTAINING_RECORD( iface, struct recordset, ADORecordsetConstruction_iface ); +} + static ULONG WINAPI recordset_AddRef( _Recordset *iface ) { struct recordset *recordset = impl_from_Recordset( iface ); @@ -798,6 +804,10 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, { *obj = &recordset->ISupportErrorInfo_iface; } + else if (IsEqualGUID( riid, &IID_ADORecordsetConstruction )) + { + *obj = &recordset->ADORecordsetConstruction_iface; + } else if (IsEqualGUID( riid, &IID_IRunnableObject )) { TRACE("IID_IRunnableObject not supported returning NULL\n"); @@ -1545,6 +1555,118 @@ static const ISupportErrorInfoVtbl recordset_supporterrorinfo_vtbl = recordset_supporterrorinfo_InterfaceSupportsErrorInfo }; +static HRESULT WINAPI rsconstruction_QueryInterface(ADORecordsetConstruction *iface, + REFIID riid, void **obj) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + return _Recordset_QueryInterface( &recordset->Recordset_iface, riid, obj ); +} + +static ULONG WINAPI rsconstruction_AddRef(ADORecordsetConstruction *iface) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + return _Recordset_AddRef( &recordset->Recordset_iface ); +} + +static ULONG WINAPI rsconstruction_Release(ADORecordsetConstruction *iface) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + return _Recordset_Release( &recordset->Recordset_iface ); +} + +static HRESULT WINAPI rsconstruction_GetTypeInfoCount(ADORecordsetConstruction *iface, UINT *pctinfo) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + TRACE( "%p, %p\n", recordset, pctinfo ); + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI rsconstruction_GetTypeInfo(ADORecordsetConstruction *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p %u %u %p\n", recordset, iTInfo, lcid, ppTInfo ); + return E_NOTIMPL; +} + +static HRESULT WINAPI rsconstruction_GetIDsOfNames(ADORecordsetConstruction *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p %s %p %u %u %p\n", recordset, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId ); + return E_NOTIMPL; +} + +static HRESULT WINAPI rsconstruction_Invoke(ADORecordsetConstruction *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p %d %s %d %d %p %p %p %p\n", recordset, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + return E_NOTIMPL; +} + +static HRESULT WINAPI rsconstruction_get_Rowset(ADORecordsetConstruction *iface, IUnknown **row_set) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p, %p\n", recordset, row_set ); + return E_NOTIMPL; +} + +static HRESULT WINAPI rsconstruction_put_Rowset(ADORecordsetConstruction *iface, IUnknown *row_set) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p, %p\n", recordset, row_set ); + return E_NOTIMPL; +} + +static HRESULT WINAPI rsconstruction_get_Chapter(ADORecordsetConstruction *iface, LONG *chapter) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p, %p\n", recordset, chapter ); + return E_NOTIMPL; +} + +static HRESULT WINAPI rsconstruction_put_Chapter(ADORecordsetConstruction *iface, LONG chapter) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p, %d\n", recordset, chapter ); + return E_NOTIMPL; +} + +static HRESULT WINAPI rsconstruction_get_RowPosition(ADORecordsetConstruction *iface, IUnknown **row_pos) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p, %p\n", recordset, row_pos ); + return E_NOTIMPL; +} + +static HRESULT WINAPI rsconstruction_put_RowPosition(ADORecordsetConstruction *iface, IUnknown *row_pos) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p, %p\n", recordset, row_pos ); + return E_NOTIMPL; +} + +static const ADORecordsetConstructionVtbl rsconstruction_vtbl = +{ + rsconstruction_QueryInterface, + rsconstruction_AddRef, + rsconstruction_Release, + rsconstruction_GetTypeInfoCount, + rsconstruction_GetTypeInfo, + rsconstruction_GetIDsOfNames, + rsconstruction_Invoke, + rsconstruction_get_Rowset, + rsconstruction_put_Rowset, + rsconstruction_get_Chapter, + rsconstruction_put_Chapter, + rsconstruction_get_RowPosition, + rsconstruction_put_RowPosition +}; + HRESULT Recordset_create( void **obj ) { struct recordset *recordset; @@ -1552,6 +1674,7 @@ HRESULT Recordset_create( void **obj ) if (!(recordset = heap_alloc_zero( sizeof(*recordset) ))) return E_OUTOFMEMORY; recordset->Recordset_iface.lpVtbl = &recordset_vtbl; recordset->ISupportErrorInfo_iface.lpVtbl = &recordset_supporterrorinfo_vtbl; + recordset->ADORecordsetConstruction_iface.lpVtbl = &rsconstruction_vtbl; recordset->refs = 1; recordset->index = -1; recordset->cursor_location = adUseServer; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 70c2db7a62d..288e579f10c 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -566,7 +566,7 @@ static void test_ADORecordsetConstruction(void) 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 ); + ok( hr == S_OK, "got %08x\n", hr ); if (FAILED(hr)) { goto done; @@ -585,18 +585,18 @@ static void test_ADORecordsetConstruction(void) todo_wine ok( hr == S_OK, "got %08x\n", hr ); ref = get_refcount( rowset ); - ok( ref == 2, "got %d\n", ref ); + todo_wine 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 ); + todo_wine ok( ref == 2, "got %d\n", ref ); count = -1; hr = Fields_get_Count( fields, &count ); - ok( count == 1, "got %d\n", count ); + todo_wine ok( count == 1, "got %d\n", count ); if (count > 0) { VARIANT index; @@ -623,7 +623,7 @@ static void test_ADORecordsetConstruction(void) } ref = get_refcount(rowset); - ok( ref == 2, "got %d\n", ref ); + todo_wine ok( ref == 2, "got %d\n", ref ); Fields_Release(fields);

1 0

Rémi Bernon : ntdll: Raise debug exceptions when invalid heap is destroyed.
by Alexandre Julliard 20 Nov '20

20 Nov '20

Module: wine Branch: master Commit: 255270373e036f06578f71afa7af8765212e0652 URL: https://source.winehq.org/git/wine.git/?a=commit;h=255270373e036f06578f71af… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 19 10:25:23 2020 +0100 ntdll: Raise debug exceptions when invalid heap is destroyed. And when PEB->BeingDebugged is set to 1. Lords Of The Fallen anti-tamper does this and only continues if a DBG_PRINTEXCEPTION_C is received. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 6 +++++ dlls/ntdll/tests/rtl.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 1ac0cb24806..88db935746a 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1589,6 +1589,12 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) void *addr; TRACE("%p\n", heap ); + if (!heapPtr && heap && (((HEAP *)heap)->flags & HEAP_VALIDATE_PARAMS) && + NtCurrentTeb()->Peb->BeingDebugged) + { + DbgPrint( "Attempt to destroy an invalid heap\n" ); + DbgBreakPoint(); + } if (!heapPtr) return heap; if (heap == processHeap) return heap; /* cannot delete the main process heap */ diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index ae8170f41fe..897be4fcd12 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -3599,6 +3599,71 @@ static void test_DbgPrint(void) RtlRemoveVectoredExceptionHandler( handler ); } +static BOOL test_heap_destroy_dbgstr = FALSE; +static BOOL test_heap_destroy_break = FALSE; + +static LONG CALLBACK test_heap_destroy_except_handler( EXCEPTION_POINTERS *eptrs ) +{ + if (eptrs->ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) + { +#if defined( __i386__ ) + eptrs->ContextRecord->Eip += 1; + test_heap_destroy_break = TRUE; + return (LONG)EXCEPTION_CONTINUE_EXECUTION; +#elif defined( __x86_64__ ) + eptrs->ContextRecord->Rip += 1; + test_heap_destroy_break = TRUE; + return (LONG)EXCEPTION_CONTINUE_EXECUTION; +#endif + } + + if (eptrs->ExceptionRecord->ExceptionCode == DBG_PRINTEXCEPTION_C) + { + test_heap_destroy_dbgstr = TRUE; + return (LONG)EXCEPTION_CONTINUE_EXECUTION; + } + + return (LONG)EXCEPTION_CONTINUE_SEARCH; +} + +/* partially copied from ntdll/heap.c */ +#define HEAP_VALIDATE_PARAMS 0x40000000 + +struct heap +{ + DWORD_PTR unknown1[2]; + DWORD unknown2[2]; + DWORD_PTR unknown3[4]; + DWORD unknown4; + DWORD_PTR unknown5[2]; + DWORD unknown6[3]; + DWORD_PTR unknown7[2]; + DWORD flags; + DWORD force_flags; + DWORD_PTR unknown8[6]; +}; + +static void test_RtlDestroyHeap(void) +{ + const struct heap invalid = {{0, 0}, {0, HEAP_VALIDATE_PARAMS}, {0, 0, 0, 0}, 0, {0, 0}, {0, 0, 0}, {0, 0}, HEAP_VALIDATE_PARAMS, 0, {0}}; + HANDLE heap = (HANDLE)&invalid, ret; + PEB *Peb = NtCurrentTeb()->Peb; + BOOL debugged; + void *handler = RtlAddVectoredExceptionHandler( TRUE, test_heap_destroy_except_handler ); + + test_heap_destroy_dbgstr = FALSE; + test_heap_destroy_break = FALSE; + debugged = Peb->BeingDebugged; + Peb->BeingDebugged = TRUE; + ret = RtlDestroyHeap( heap ); + ok( ret == heap, "RtlDestroyHeap(%p) returned %p\n", heap, ret ); + ok( test_heap_destroy_dbgstr, "HeapDestroy didn't call OutputDebugStrA\n" ); + ok( test_heap_destroy_break, "HeapDestroy didn't call DbgBreakPoint\n" ); + Peb->BeingDebugged = debugged; + + RtlRemoveVectoredExceptionHandler( handler ); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -3640,4 +3705,5 @@ START_TEST(rtl) test_RtlMakeSelfRelativeSD(); test_LdrRegisterDllNotification(); test_DbgPrint(); + test_RtlDestroyHeap(); }

1 0

Rémi Bernon : ntdll: Reimplement DbgPrint* using DBG_PRINTEXCEPTION_C.
by Alexandre Julliard 20 Nov '20

20 Nov '20

Module: wine Branch: master Commit: c5129d6fc083514bf7b854d3403148627fe66475 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5129d6fc083514bf7b854d3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 19 10:25:22 2020 +0100 ntdll: Reimplement DbgPrint* using DBG_PRINTEXCEPTION_C. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/rtl.c | 56 +++++++++++++++++++++++++++++++++++--------------- dlls/ntdll/tests/rtl.c | 14 ++++++------- 2 files changed, 46 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index ca4fea84209..11dbc63a3b3 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -39,6 +39,7 @@ #include "ddk/ntddk.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); +WINE_DECLARE_DEBUG_CHANNEL(debugstr); /* CRC polynomial 0xedb88320 */ static const DWORD CRC_table[256] = @@ -297,21 +298,24 @@ void WINAPI RtlDumpResource(LPRTL_RWLOCK rwl) * misc functions */ +static LONG WINAPI debug_exception_handler( EXCEPTION_POINTERS *eptr ) +{ + EXCEPTION_RECORD *rec = eptr->ExceptionRecord; + return (rec->ExceptionCode == DBG_PRINTEXCEPTION_C) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH; +} + /****************************************************************************** * DbgPrint [NTDLL.@] */ NTSTATUS WINAPIV DbgPrint(LPCSTR fmt, ...) { - char buf[512]; - __ms_va_list args; - - __ms_va_start(args, fmt); - _vsnprintf(buf, sizeof(buf), fmt, args); - __ms_va_end(args); + NTSTATUS ret; + __ms_va_list args; - MESSAGE("DbgPrint says: %s",buf); - /* hmm, raise exception? */ - return STATUS_SUCCESS; + __ms_va_start(args, fmt); + ret = vDbgPrintEx(0, DPFLTR_ERROR_LEVEL, fmt, args); + __ms_va_end(args); + return ret; } @@ -342,18 +346,36 @@ NTSTATUS WINAPI vDbgPrintEx( ULONG id, ULONG level, LPCSTR fmt, __ms_va_list arg */ NTSTATUS WINAPI vDbgPrintExWithPrefix( LPCSTR prefix, ULONG id, ULONG level, LPCSTR fmt, __ms_va_list args ) { - char buf[1024]; + ULONG level_mask = level <= 31 ? (1 << level) : level; + SIZE_T len = strlen( prefix ); + char buf[1024], *end; - _vsnprintf(buf, sizeof(buf), fmt, args); + strcpy( buf, prefix ); + len += _vsnprintf( buf + len, sizeof(buf) - len, fmt, args ); + end = buf + len - 1; - switch (level & DPFLTR_MASK) + WARN_(debugstr)(*end == '\n' ? "%08x:%08x: %s" : "%08x:%08x: %s\n", id, level_mask, buf); + + if (level_mask & (1 << DPFLTR_ERROR_LEVEL) && NtCurrentTeb()->Peb->BeingDebugged) { - case DPFLTR_ERROR_LEVEL: ERR("%s%x: %s", prefix, id, buf); break; - case DPFLTR_WARNING_LEVEL: WARN("%s%x: %s", prefix, id, buf); break; - case DPFLTR_TRACE_LEVEL: - case DPFLTR_INFO_LEVEL: - default: TRACE("%s%x: %s", prefix, id, buf); break; + __TRY + { + EXCEPTION_RECORD record; + record.ExceptionCode = DBG_PRINTEXCEPTION_C; + record.ExceptionFlags = 0; + record.ExceptionRecord = NULL; + record.ExceptionAddress = RtlRaiseException; + record.NumberParameters = 2; + record.ExceptionInformation[1] = (ULONG_PTR)buf; + record.ExceptionInformation[0] = strlen( buf ) + 1; + RtlRaiseException( &record ); + } + __EXCEPT(debug_exception_handler) + { + } + __ENDTRY } + return STATUS_SUCCESS; } diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 6121dc9f9d0..ae8170f41fe 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -3541,19 +3541,19 @@ static void test_DbgPrint(void) test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; status = DbgPrint( "test_DbgPrint: %s", "Hello World" ); ok( !status, "DbgPrint returned %x\n", status ); - todo_wine ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); + ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); test_dbg_print_except = FALSE; test_dbg_print_except_ret = (LONG)EXCEPTION_CONTINUE_EXECUTION; status = DbgPrint( "test_DbgPrint: %s", "Hello World" ); ok( !status, "DbgPrint returned %x\n", status ); - todo_wine ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); + ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); test_dbg_print_except = FALSE; test_dbg_print_except_ret = (LONG)EXCEPTION_CONTINUE_SEARCH; status = DbgPrint( "test_DbgPrint: %s", "Hello World" ); ok( !status, "DbgPrint returned %x\n", status ); - todo_wine ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); + ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); /* FIXME: NtSetDebugFilterState / DbgSetDebugFilterState are probably what's controlling these */ @@ -3562,7 +3562,7 @@ static void test_DbgPrint(void) test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; status = DbgPrintEx( 0, DPFLTR_ERROR_LEVEL, "test_DbgPrint: %s", "Hello World" ); ok( !status, "DbgPrintEx returned %x\n", status ); - todo_wine ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); + ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); test_dbg_print_except = FALSE; test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; @@ -3574,7 +3574,7 @@ static void test_DbgPrint(void) test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; status = DbgPrintEx( 0, DPFLTR_MASK|(1 << DPFLTR_ERROR_LEVEL), "test_DbgPrint: %s", "Hello World" ); ok( !status, "DbgPrintEx returned %x\n", status ); - todo_wine ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); + ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); test_dbg_print_except = FALSE; test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; @@ -3587,13 +3587,13 @@ static void test_DbgPrint(void) test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; status = test_vDbgPrintEx( 0, 0xFFFFFFFF, "test_DbgPrint: %s", "Hello World" ); ok( !status, "vDbgPrintEx returned %x\n", status ); - todo_wine ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); + ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); test_dbg_print_except = FALSE; test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; status = test_vDbgPrintExWithPrefix( "test_", 0, 0xFFFFFFFF, "DbgPrint: %s", "Hello World" ); ok( !status, "vDbgPrintExWithPrefix returned %x\n", status ); - todo_wine ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); + ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); Peb->BeingDebugged = debugged; RtlRemoveVectoredExceptionHandler( handler );

1 0

Rémi Bernon : ntdll/tests: Add tests for DbgPrint* functions.
by Alexandre Julliard 20 Nov '20

20 Nov '20

Module: wine Branch: master Commit: 1425363bbd32ad6142bae98e655e92fb9fa8eb97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1425363bbd32ad6142bae98e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 19 10:25:21 2020 +0100 ntdll/tests: Add tests for DbgPrint* functions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 7a62670ea05..6121dc9f9d0 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -3483,6 +3483,122 @@ static void test_LdrRegisterDllNotification(void) pLdrUnregisterDllNotification(cookie); } +static BOOL test_dbg_print_except; +static LONG test_dbg_print_except_ret; + +static LONG CALLBACK test_dbg_print_except_handler( EXCEPTION_POINTERS *eptrs ) +{ + if (eptrs->ExceptionRecord->ExceptionCode == DBG_PRINTEXCEPTION_C) + { + ok( eptrs->ExceptionRecord->NumberParameters == 2, + "Unexpected NumberParameters: %d\n", eptrs->ExceptionRecord->NumberParameters ); + ok( eptrs->ExceptionRecord->ExceptionInformation[0] == strlen("test_DbgPrint: Hello World") + 1, + "Unexpected ExceptionInformation[0]: %d\n", (int)eptrs->ExceptionRecord->ExceptionInformation[0] ); + ok( !strcmp((char *)eptrs->ExceptionRecord->ExceptionInformation[1], "test_DbgPrint: Hello World"), + "Unexpected ExceptionInformation[1]: %s\n", wine_dbgstr_a((char *)eptrs->ExceptionRecord->ExceptionInformation[1]) ); + test_dbg_print_except = TRUE; + return test_dbg_print_except_ret; + } + + return (LONG)EXCEPTION_CONTINUE_SEARCH; +} + +static NTSTATUS WINAPIV test_vDbgPrintEx( ULONG id, ULONG level, const char *fmt, ... ) +{ + NTSTATUS status; + __ms_va_list args; + __ms_va_start( args, fmt ); + status = vDbgPrintEx( id, level, fmt, args ); + __ms_va_end( args ); + return status; +} + +static NTSTATUS WINAPIV test_vDbgPrintExWithPrefix( const char *prefix, ULONG id, ULONG level, const char *fmt, ... ) +{ + NTSTATUS status; + __ms_va_list args; + __ms_va_start( args, fmt ); + status = vDbgPrintExWithPrefix( prefix, id, level, fmt, args ); + __ms_va_end( args ); + return status; +} + +static void test_DbgPrint(void) +{ + NTSTATUS status; + void *handler = RtlAddVectoredExceptionHandler( TRUE, test_dbg_print_except_handler ); + PEB *Peb = NtCurrentTeb()->Peb; + BOOL debugged = Peb->BeingDebugged; + + test_dbg_print_except = FALSE; + test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; + status = DbgPrint( "test_DbgPrint: %s", "Hello World" ); + ok( !status, "DbgPrint returned %x\n", status ); + ok( !test_dbg_print_except, "DBG_PRINTEXCEPTION_C received\n" ); + + Peb->BeingDebugged = TRUE; + test_dbg_print_except = FALSE; + test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; + status = DbgPrint( "test_DbgPrint: %s", "Hello World" ); + ok( !status, "DbgPrint returned %x\n", status ); + todo_wine ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); + + test_dbg_print_except = FALSE; + test_dbg_print_except_ret = (LONG)EXCEPTION_CONTINUE_EXECUTION; + status = DbgPrint( "test_DbgPrint: %s", "Hello World" ); + ok( !status, "DbgPrint returned %x\n", status ); + todo_wine ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); + + test_dbg_print_except = FALSE; + test_dbg_print_except_ret = (LONG)EXCEPTION_CONTINUE_SEARCH; + status = DbgPrint( "test_DbgPrint: %s", "Hello World" ); + ok( !status, "DbgPrint returned %x\n", status ); + todo_wine ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); + + + /* FIXME: NtSetDebugFilterState / DbgSetDebugFilterState are probably what's controlling these */ + + test_dbg_print_except = FALSE; + test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; + status = DbgPrintEx( 0, DPFLTR_ERROR_LEVEL, "test_DbgPrint: %s", "Hello World" ); + ok( !status, "DbgPrintEx returned %x\n", status ); + todo_wine ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); + + test_dbg_print_except = FALSE; + test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; + status = DbgPrintEx( 0, DPFLTR_WARNING_LEVEL, "test_DbgPrint: %s", "Hello World" ); + ok( !status, "DbgPrintEx returned %x\n", status ); + ok( !test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); + + test_dbg_print_except = FALSE; + test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; + status = DbgPrintEx( 0, DPFLTR_MASK|(1 << DPFLTR_ERROR_LEVEL), "test_DbgPrint: %s", "Hello World" ); + ok( !status, "DbgPrintEx returned %x\n", status ); + todo_wine ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); + + test_dbg_print_except = FALSE; + test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; + status = DbgPrintEx( 0, DPFLTR_MASK|(1 << DPFLTR_WARNING_LEVEL), "test_DbgPrint: %s", "Hello World" ); + ok( !status, "DbgPrintEx returned %x\n", status ); + ok( !test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); + + + test_dbg_print_except = FALSE; + test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; + status = test_vDbgPrintEx( 0, 0xFFFFFFFF, "test_DbgPrint: %s", "Hello World" ); + ok( !status, "vDbgPrintEx returned %x\n", status ); + todo_wine ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); + + test_dbg_print_except = FALSE; + test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; + status = test_vDbgPrintExWithPrefix( "test_", 0, 0xFFFFFFFF, "DbgPrint: %s", "Hello World" ); + ok( !status, "vDbgPrintExWithPrefix returned %x\n", status ); + todo_wine ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); + + Peb->BeingDebugged = debugged; + RtlRemoveVectoredExceptionHandler( handler ); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -3523,4 +3639,5 @@ START_TEST(rtl) test_LdrEnumerateLoadedModules(); test_RtlMakeSelfRelativeSD(); test_LdrRegisterDllNotification(); + test_DbgPrint(); }

1 0

Rémi Bernon : include: Fix DPFLTR_MASK value to 0x80000000.
by Alexandre Julliard 20 Nov '20

20 Nov '20

Module: wine Branch: master Commit: 65af0b67024002f6fb3eb485a6775baf41db2050 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65af0b67024002f6fb3eb485… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 19 10:25:20 2020 +0100 include: Fix DPFLTR_MASK value to 0x80000000. This is most likely a typo from MSDN. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 {

1 0

Rémi Bernon : ntdll: Stub ThreadEnableAlignmentFaultFixup info class.
by Alexandre Julliard 20 Nov '20

20 Nov '20

Module: wine Branch: master Commit: ad24187de837f985cc9a11237ac560ace6b57aa4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad24187de837f985cc9a1123… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 19 10:18:54 2020 +0100 ntdll: Stub ThreadEnableAlignmentFaultFixup info class. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46216 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 8c91f49690b..9808fc610e3 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1137,10 +1137,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: @@ -1316,11 +1318,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:

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2020