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

[PATCH 1/5] server: Create a desktop shared mapping.
by Huw Davies Nov. 19, 2020

Nov. 19, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- server/directory.c | 17 +++++++++++++++++ server/file.h | 6 ++++++ server/mapping.c | 19 ++++++++++++++++++- server/protocol.def | 5 +++++ server/user.h | 28 +++++++++++++++------------- server/winstation.c | 22 ++++++++++++++++++++++ 6 files changed, 83 insertions(+), 14 deletions(-) diff --git a/server/directory.c b/server/directory.c index 6f8fb179808..a54ca0e91f3 100644 --- a/server/directory.c +++ b/server/directory.c @@ -38,6 +38,7 @@ #include "process.h" #include "file.h" #include "unicode.h" +#include "user.h" #define HASH_SIZE 7 /* default hash size */ @@ -240,6 +241,22 @@ struct object_type *get_object_type( const struct unicode_str *name ) return type; } +struct object *create_desktop_map_directory( struct winstation *winstation ) +{ + static const WCHAR dir_desktop_mapsW[] = {'_','_','w','i','n','e','_','d','e','s','k','t','o','p','_','m','a','p','p','i','n','g','s'}; + static const struct unicode_str dir_desktop_maps_str = {dir_desktop_mapsW, sizeof(dir_desktop_mapsW)}; + struct object *root; + struct directory *mapping_root, *ret; + const struct unicode_str winsta_name = {winstation->obj.name->name, winstation->obj.name->len}; + + root = winstation->obj.name->parent; + mapping_root = create_directory( root, &dir_desktop_maps_str, OBJ_OPENIF, HASH_SIZE, NULL ); + ret = create_directory( &mapping_root->obj, &winsta_name, OBJ_OPENIF, HASH_SIZE, NULL ); + release_object( &mapping_root->obj ); + + return &ret->obj; +} + /* Global initialization */ static void create_session( unsigned int id ) diff --git a/server/file.h b/server/file.h index 2fb634fad8d..9c376e4c483 100644 --- a/server/file.h +++ b/server/file.h @@ -151,6 +151,10 @@ extern struct timeout_user *add_timeout_user( timeout_t when, timeout_callback f extern void remove_timeout_user( struct timeout_user *user ); extern const char *get_timeout_str( timeout_t timeout ); +/* directory functions */ + +extern struct object *create_desktop_map_directory( struct winstation *winstation ); + /* file functions */ extern struct file *get_file_obj( struct process *process, obj_handle_t handle, @@ -173,6 +177,8 @@ extern void free_mapped_views( struct process *process ); extern int get_page_size(void); extern struct object *create_user_data_mapping( struct object *root, const struct unicode_str *name, unsigned int attr, const struct security_descriptor *sd ); +extern struct object *create_desktop_mapping( struct object *root, const struct unicode_str *name, + mem_size_t size, const struct security_descriptor *sd, void **ptr ); /* device functions */ diff --git a/server/mapping.c b/server/mapping.c index 769a986ae21..48bc7361977 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -959,7 +959,7 @@ int get_page_size(void) } struct object *create_user_data_mapping( struct object *root, const struct unicode_str *name, - unsigned int attr, const struct security_descriptor *sd ) + unsigned int attr, const struct security_descriptor *sd ) { void *ptr; struct mapping *mapping; @@ -975,6 +975,23 @@ struct object *create_user_data_mapping( struct object *root, const struct unico return &mapping->obj; } +struct object *create_desktop_mapping( struct object *root, const struct unicode_str *name, + mem_size_t size, const struct security_descriptor *sd, void **ptr ) +{ + struct mapping *mapping; + + if (!(mapping = create_mapping( root, name, OBJ_OPENIF, size, SEC_COMMIT, 0, + FILE_READ_DATA | FILE_WRITE_DATA, sd ))) return NULL; + *ptr = mmap( NULL, mapping->size, PROT_WRITE, MAP_SHARED, get_unix_fd( mapping->fd ), 0 ); + if (*ptr == MAP_FAILED) + { + release_object( &mapping->obj ); + return NULL; + } + + return &mapping->obj; +} + /* create a file mapping */ DECL_HANDLER(create_mapping) { diff --git a/server/protocol.def b/server/protocol.def index a3708f20705..c1c33d7e3d1 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -796,6 +796,11 @@ typedef struct lparam_t info; } cursor_pos_t; +struct desktop_shared_memory +{ + int placeholder; +}; + /****************************************************************/ /* Request declarations */ diff --git a/server/user.h b/server/user.h index 6267f3e2881..9a28ba7f449 100644 --- a/server/user.h +++ b/server/user.h @@ -64,19 +64,21 @@ struct global_cursor struct desktop { - struct object obj; /* object header */ - unsigned int flags; /* desktop flags */ - struct winstation *winstation; /* winstation this desktop belongs to */ - struct list entry; /* entry in winstation list of desktops */ - struct window *top_window; /* desktop window for this desktop */ - struct window *msg_window; /* HWND_MESSAGE top window */ - struct hook_table *global_hooks; /* table of global hooks on this desktop */ - struct list hotkeys; /* list of registered hotkeys */ - struct timeout_user *close_timeout; /* timeout before closing the desktop */ - struct thread_input *foreground_input; /* thread input of foreground thread */ - unsigned int users; /* processes and threads using this desktop */ - struct global_cursor cursor; /* global cursor information */ - unsigned char keystate[256]; /* asynchronous key state */ + struct object obj; /* object header */ + unsigned int flags; /* desktop flags */ + struct winstation *winstation; /* winstation this desktop belongs to */ + struct list entry; /* entry in winstation list of desktops */ + struct window *top_window; /* desktop window for this desktop */ + struct window *msg_window; /* HWND_MESSAGE top window */ + struct hook_table *global_hooks; /* table of global hooks on this desktop */ + struct list hotkeys; /* list of registered hotkeys */ + struct timeout_user *close_timeout; /* timeout before closing the desktop */ + struct thread_input *foreground_input; /* thread input of foreground thread */ + unsigned int users; /* processes and threads using this desktop */ + struct global_cursor cursor; /* global cursor information */ + struct object *shared_mapping; /* desktop shared memory mapping */ + volatile struct desktop_shared_memory *shared; /* desktop shared memory ptr */ + unsigned char keystate[256]; /* asynchronous key state */ }; /* user handles functions */ diff --git a/server/winstation.c b/server/winstation.c index c9c85e50fff..7cf62f27e89 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -210,6 +210,22 @@ struct desktop *get_desktop_obj( struct process *process, obj_handle_t handle, u return (struct desktop *)get_handle_obj( process, handle, access, &desktop_ops ); } +static volatile void *init_desktop_mapping( struct desktop *desktop, const struct unicode_str *name ) +{ + struct object *dir = create_desktop_map_directory( desktop->winstation ); + + desktop->shared = NULL; + desktop->shared_mapping = NULL; + + if (!dir) return NULL; + + desktop->shared_mapping = create_desktop_mapping( dir, name, sizeof(struct desktop_shared_memory), + NULL, (void **)&desktop->shared ); + release_object( dir ); + if (desktop->shared) memset( (void *)desktop->shared, 0, sizeof(*desktop->shared) ); + return desktop->shared; +} + /* create a desktop object */ static struct desktop *create_desktop( const struct unicode_str *name, unsigned int attr, unsigned int flags, struct winstation *winstation ) @@ -233,6 +249,11 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned memset( desktop->keystate, 0, sizeof(desktop->keystate) ); list_add_tail( &winstation->desktops, &desktop->entry ); list_init( &desktop->hotkeys ); + if (!init_desktop_mapping( desktop, name )) + { + release_object( desktop ); + return NULL; + } } else clear_error(); } @@ -293,6 +314,7 @@ static void desktop_destroy( struct object *obj ) if (desktop->global_hooks) release_object( desktop->global_hooks ); if (desktop->close_timeout) remove_timeout_user( desktop->close_timeout ); list_remove( &desktop->entry ); + release_object( desktop->shared_mapping ); release_object( desktop->winstation ); } -- 2.23.0

1 0

[PATCH] mf/samplegrabber: Implement IMFRateSupport.
by Nikolay Sivov Nov. 19, 2020

Nov. 19, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 127 ++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 66 +++++++++++++++++++++ 2 files changed, 193 insertions(+) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 566ee2f2930..54e28b466c5 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -18,6 +18,8 @@ #define COBJMACROS +#include <float.h> + #include "mfidl.h" #include "mf_private.h" @@ -61,6 +63,8 @@ struct sample_grabber IMFMediaSink IMFMediaSink_iface; IMFClockStateSink IMFClockStateSink_iface; IMFMediaEventGenerator IMFMediaEventGenerator_iface; + IMFGetService IMFGetService_iface; + IMFRateSupport IMFRateSupport_iface; IMFStreamSink IMFStreamSink_iface; IMFMediaTypeHandler IMFMediaTypeHandler_iface; IMFAsyncCallback timer_callback; @@ -117,6 +121,16 @@ static struct sample_grabber *impl_from_IMFMediaEventGenerator(IMFMediaEventGene return CONTAINING_RECORD(iface, struct sample_grabber, IMFMediaEventGenerator_iface); } +static struct sample_grabber *impl_from_IMFGetService(IMFGetService *iface) +{ + return CONTAINING_RECORD(iface, struct sample_grabber, IMFGetService_iface); +} + +static struct sample_grabber *impl_from_IMFRateSupport(IMFRateSupport *iface) +{ + return CONTAINING_RECORD(iface, struct sample_grabber, IMFRateSupport_iface); +} + static struct sample_grabber *impl_from_IMFStreamSink(IMFStreamSink *iface) { return CONTAINING_RECORD(iface, struct sample_grabber, IMFStreamSink_iface); @@ -773,6 +787,14 @@ static HRESULT WINAPI sample_grabber_sink_QueryInterface(IMFMediaSink *iface, RE { *obj = &grabber->IMFMediaEventGenerator_iface; } + else if (IsEqualIID(riid, &IID_IMFGetService)) + { + *obj = &grabber->IMFGetService_iface; + } + else if (IsEqualIID(riid, &IID_IMFRateSupport)) + { + *obj = &grabber->IMFRateSupport_iface; + } else { WARN("Unsupported %s.\n", debugstr_guid(riid)); @@ -1249,6 +1271,109 @@ static const IMFClockStateSinkVtbl sample_grabber_clock_sink_vtbl = sample_grabber_clock_sink_OnClockSetRate, }; +static HRESULT WINAPI sample_grabber_getservice_QueryInterface(IMFGetService *iface, REFIID riid, void **obj) +{ + struct sample_grabber *grabber = impl_from_IMFGetService(iface); + return IMFMediaSink_QueryInterface(&grabber->IMFMediaSink_iface, riid, obj); +} + +static ULONG WINAPI sample_grabber_getservice_AddRef(IMFGetService *iface) +{ + struct sample_grabber *grabber = impl_from_IMFGetService(iface); + return IMFMediaSink_AddRef(&grabber->IMFMediaSink_iface); +} + +static ULONG WINAPI sample_grabber_getservice_Release(IMFGetService *iface) +{ + struct sample_grabber *grabber = impl_from_IMFGetService(iface); + return IMFMediaSink_Release(&grabber->IMFMediaSink_iface); +} + +static HRESULT WINAPI sample_grabber_getservice_GetService(IMFGetService *iface, REFGUID service, + REFIID riid, void **obj) +{ + TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + if (IsEqualGUID(service, &MF_RATE_CONTROL_SERVICE)) + { + if (IsEqualIID(riid, &IID_IMFRateSupport)) + return IMFGetService_QueryInterface(iface, riid, obj); + + return E_NOINTERFACE; + } + + FIXME("Unsupported service %s, riid %s.\n", debugstr_guid(service), debugstr_guid(riid)); + + return MF_E_UNSUPPORTED_SERVICE; +} + +static const IMFGetServiceVtbl sample_grabber_getservice_vtbl = +{ + sample_grabber_getservice_QueryInterface, + sample_grabber_getservice_AddRef, + sample_grabber_getservice_Release, + sample_grabber_getservice_GetService, +}; + +static HRESULT WINAPI sample_grabber_rate_support_QueryInterface(IMFRateSupport *iface, REFIID riid, void **obj) +{ + struct sample_grabber *grabber = impl_from_IMFRateSupport(iface); + return IMFMediaSink_QueryInterface(&grabber->IMFMediaSink_iface, riid, obj); +} + +static ULONG WINAPI sample_grabber_rate_support_AddRef(IMFRateSupport *iface) +{ + struct sample_grabber *grabber = impl_from_IMFRateSupport(iface); + return IMFMediaSink_AddRef(&grabber->IMFMediaSink_iface); +} + +static ULONG WINAPI sample_grabber_rate_support_Release(IMFRateSupport *iface) +{ + struct sample_grabber *grabber = impl_from_IMFRateSupport(iface); + return IMFMediaSink_Release(&grabber->IMFMediaSink_iface); +} + +static HRESULT WINAPI sample_grabber_rate_support_GetSlowestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, + BOOL thin, float *rate) +{ + TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); + + *rate = 0.0f; + + return S_OK; +} + +static HRESULT WINAPI sample_grabber_rate_support_GetFastestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, + BOOL thin, float *rate) +{ + TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); + + *rate = direction == MFRATE_REVERSE ? -FLT_MAX : FLT_MAX; + + return S_OK; +} + +static HRESULT WINAPI sample_grabber_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, + float *ret_rate) +{ + TRACE("%p, %d, %f, %p.\n", iface, thin, rate, ret_rate); + + if (ret_rate) + *ret_rate = rate; + + return S_OK; +} + +static const IMFRateSupportVtbl sample_grabber_rate_support_vtbl = +{ + sample_grabber_rate_support_QueryInterface, + sample_grabber_rate_support_AddRef, + sample_grabber_rate_support_Release, + sample_grabber_rate_support_GetSlowestRate, + sample_grabber_rate_support_GetFastestRate, + sample_grabber_rate_support_IsRateSupported, +}; + static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) { struct sample_grabber_activate_context *context = user_context; @@ -1272,6 +1397,8 @@ static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *use object->IMFMediaSink_iface.lpVtbl = &sample_grabber_sink_vtbl; object->IMFClockStateSink_iface.lpVtbl = &sample_grabber_clock_sink_vtbl; object->IMFMediaEventGenerator_iface.lpVtbl = &sample_grabber_sink_events_vtbl; + object->IMFGetService_iface.lpVtbl = &sample_grabber_getservice_vtbl; + object->IMFRateSupport_iface.lpVtbl = &sample_grabber_rate_support_vtbl; object->IMFStreamSink_iface.lpVtbl = &sample_grabber_stream_vtbl; object->IMFMediaTypeHandler_iface.lpVtbl = &sample_grabber_stream_type_handler_vtbl; object->timer_callback.lpVtbl = &sample_grabber_stream_timer_callback_vtbl; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 78a3d75e0a7..2a671225a11 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <string.h> +#include <float.h> #define COBJMACROS @@ -71,6 +72,21 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO IUnknown_Release(unk); } +#define check_service_interface(a, b, c, d) check_service_interface_(__LINE__, a, b, c, d) +static void check_service_interface_(unsigned int line, void *iface_ptr, REFGUID service, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = MFGetService(iface, service, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + static HWND create_window(void) { RECT r = {0, 0, 640, 480}; @@ -2097,6 +2113,7 @@ static void test_sample_grabber(void) IMFPresentationTimeSource *time_source; IMFPresentationClock *clock, *clock2; IMFStreamSink *stream, *stream2; + IMFRateSupport *rate_support; IMFMediaEventGenerator *eg; IMFMediaSink *sink, *sink2; DWORD flags, count, id; @@ -2104,6 +2121,7 @@ static void test_sample_grabber(void) IMFMediaEvent *event; ULONG refcount; IUnknown *unk; + float rate; HRESULT hr; GUID guid; @@ -2136,6 +2154,53 @@ static void test_sample_grabber(void) hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); ok(hr == S_OK, "Failed to activate object, hr %#x.\n", hr); + check_interface(sink, &IID_IMFClockStateSink, TRUE); + check_interface(sink, &IID_IMFMediaEventGenerator, TRUE); + check_interface(sink, &IID_IMFGetService, TRUE); + check_interface(sink, &IID_IMFRateSupport, TRUE); + check_service_interface(sink, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, TRUE); + + if (SUCCEEDED(MFGetService((IUnknown *)sink, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support))) + { + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == FLT_MAX, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == FLT_MAX, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == -FLT_MAX, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == -FLT_MAX, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_IsRateSupported(rate_support, TRUE, 1.0f, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 1.0f, "Unexpected rate %f.\n", rate); + + IMFRateSupport_Release(rate_support); + } + hr = IMFMediaSink_GetCharacteristics(sink, &flags); ok(hr == S_OK, "Failed to get sink flags, hr %#x.\n", hr); ok(flags & MEDIASINK_FIXED_STREAMS, "Unexpected flags %#x.\n", flags); @@ -2148,6 +2213,7 @@ static void test_sample_grabber(void) ok(hr == S_OK, "Failed to get sink stream, hr %#x.\n", hr); check_interface(stream, &IID_IMFMediaEventGenerator, TRUE); + check_interface(stream, &IID_IMFMediaTypeHandler, TRUE); hr = IMFStreamSink_GetIdentifier(stream, &id); ok(hr == S_OK, "Failed to get stream id, hr %#x.\n", hr); -- 2.29.2

1 0

[PATCH v2] 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

2 1

[PATCH] winevulkan: Don't support VK_EXT_headless_surface.
by Georg Lehmann Nov. 19, 2020

Nov. 19, 2020

It's completly broken because the wine drivers only implement VK_KHR_win32_surface. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 6675a813c05..056f6aefbcd 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -88,6 +88,7 @@ UNSUPPORTED_EXTENSIONS = [ # Instance extensions "VK_KHR_display", # Needs WSI work. "VK_KHR_surface_protected_capabilities", + "VK_EXT_headless_surface", # Needs WSI work. # Device extensions "VK_AMD_display_native_hdr", -- 2.29.2

1 0

[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