November 2021 - Wine-devel - list.winehq.org

[PATCH 05/11] winecoreaudio: Move get_frequency to the unixlib.
by Huw Davies 24 Nov '21

24 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 15 +++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 11 +++++------ dlls/winecoreaudio.drv/unixlib.h | 8 ++++++++ 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index d7390c5a677..f59723d48f6 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1527,6 +1527,20 @@ static NTSTATUS get_position(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_frequency(void *args) +{ + struct get_frequency_params *params = args; + struct coreaudio_stream *stream = params->stream; + + if(stream->share == AUDCLNT_SHAREMODE_SHARED) + *params->freq = (UINT64)stream->fmt->nSamplesPerSec * stream->fmt->nBlockAlign; + else + *params->freq = stream->fmt->nSamplesPerSec; + + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1546,4 +1560,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_current_padding, get_next_packet_size, get_position, + get_frequency, }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index ebfc0543af8..f79d808d8ed 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1458,15 +1458,14 @@ static ULONG WINAPI AudioClock_Release(IAudioClock *iface) static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) { ACImpl *This = impl_from_IAudioClock(iface); + struct get_frequency_params params; TRACE("(%p)->(%p)\n", This, freq); - if(This->stream->share == AUDCLNT_SHAREMODE_SHARED) - *freq = (UINT64)This->stream->fmt->nSamplesPerSec * This->stream->fmt->nBlockAlign; - else - *freq = This->stream->fmt->nSamplesPerSec; - - return S_OK; + params.stream = This->stream; + params.freq = freq; + UNIX_CALL(get_frequency, &params); + return params.result; } static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index e9edaf82973..5dcefe2eb05 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -181,6 +181,13 @@ struct get_position_params UINT64 *qpctime; }; +struct get_frequency_params +{ + struct coreaudio_stream *stream; + HRESULT result; + UINT64 *freq; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -200,6 +207,7 @@ enum unix_funcs unix_get_current_padding, unix_get_next_packet_size, unix_get_position, + unix_get_frequency, }; extern unixlib_handle_t coreaudio_handle; -- 2.23.0

2 1

[PATCH 04/11] winecoreaudio: Move get_position to the unixlib.
by Huw Davies 24 Nov '21

24 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 25 +++++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 32 ++++++------------------------ dlls/winecoreaudio.drv/unixlib.h | 9 +++++++++ 3 files changed, 40 insertions(+), 26 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 0ed4fcb02fe..d7390c5a677 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1503,6 +1503,30 @@ static NTSTATUS get_next_packet_size(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_position(void *args) +{ + struct get_position_params *params = args; + struct coreaudio_stream *stream = params->stream; + LARGE_INTEGER stamp, freq; + + OSSpinLockLock(&stream->lock); + + *params->pos = stream->written_frames - stream->held_frames; + + if(stream->share == AUDCLNT_SHAREMODE_SHARED) + *params->pos *= stream->fmt->nBlockAlign; + + if(params->qpctime){ + NtQueryPerformanceCounter(&stamp, &freq); + *params->qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + } + + OSSpinLockUnlock(&stream->lock); + + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1521,4 +1545,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_latency, get_current_padding, get_next_packet_size, + get_position, }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index b0208ce0a44..ebfc0543af8 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1469,42 +1469,22 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) return S_OK; } -static HRESULT AudioClock_GetPosition_nolock(ACImpl *This, - UINT64 *pos, UINT64 *qpctime) -{ - *pos = This->stream->written_frames - This->stream->held_frames; - - if(This->stream->share == AUDCLNT_SHAREMODE_SHARED) - *pos *= This->stream->fmt->nBlockAlign; - - if(qpctime){ - LARGE_INTEGER stamp, freq; - QueryPerformanceCounter(&stamp); - QueryPerformanceFrequency(&freq); - *qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; - } - - return S_OK; -} - static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, UINT64 *qpctime) { ACImpl *This = impl_from_IAudioClock(iface); - HRESULT hr; + struct get_position_params params; TRACE("(%p)->(%p, %p)\n", This, pos, qpctime); if(!pos) return E_POINTER; - OSSpinLockLock(&This->stream->lock); - - hr = AudioClock_GetPosition_nolock(This, pos, qpctime); - - OSSpinLockUnlock(&This->stream->lock); - - return hr; + params.stream = This->stream; + params.pos = pos; + params.qpctime = qpctime; + UNIX_CALL(get_position, &params); + return params.result; } static HRESULT WINAPI AudioClock_GetCharacteristics(IAudioClock *iface, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 32eb57a866a..e9edaf82973 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -173,6 +173,14 @@ struct get_next_packet_size_params UINT32 *frames; }; +struct get_position_params +{ + struct coreaudio_stream *stream; + HRESULT result; + UINT64 *pos; + UINT64 *qpctime; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -191,6 +199,7 @@ enum unix_funcs unix_get_latency, unix_get_current_padding, unix_get_next_packet_size, + unix_get_position, }; extern unixlib_handle_t coreaudio_handle; -- 2.23.0

2 1

[PATCH 03/11] winecoreaudio: Move get_next_packet_size to the unixlib.
by Huw Davies 24 Nov '21

24 Nov '21

The capture_resample syscall can now be removed. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 27 ++++++++++++++++++++++----- dlls/winecoreaudio.drv/mmdevdrv.c | 22 +++++----------------- dlls/winecoreaudio.drv/unixlib.h | 10 ++++++++-- 3 files changed, 35 insertions(+), 24 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index d723291bb24..0ed4fcb02fe 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1068,9 +1068,8 @@ static OSStatus feed_cb(AudioConverterRef converter, UInt32 *nframes, AudioBuffe return noErr; } -static NTSTATUS capture_resample(void *args) +static void capture_resample(struct coreaudio_stream *stream) { - struct coreaudio_stream *stream = args; UINT32 resamp_period_frames = muldiv(stream->period_frames, stream->dev_desc.mSampleRate, stream->fmt->nSamplesPerSec); OSStatus sc; @@ -1115,7 +1114,6 @@ static NTSTATUS capture_resample(void *args) }else stream->held_frames += wanted_frames; } - return STATUS_SUCCESS; } static NTSTATUS get_buffer_size(void *args) @@ -1485,6 +1483,26 @@ static NTSTATUS release_capture_buffer(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_next_packet_size(void *args) +{ + struct get_next_packet_size_params *params = args; + struct coreaudio_stream *stream = params->stream; + + OSSpinLockLock(&stream->lock); + + capture_resample(stream); + + if(stream->held_frames >= stream->period_frames) + *params->frames = stream->period_frames; + else + *params->frames = 0; + + OSSpinLockUnlock(&stream->lock); + + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1502,6 +1520,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_buffer_size, get_latency, get_current_padding, - - capture_resample /* temporary */ + get_next_packet_size, }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index cc37bebdc77..b0208ce0a44 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -683,11 +683,6 @@ static HRESULT get_audio_session(const GUID *sessionguid, return S_OK; } -static void capture_resample(ACImpl *This) -{ - UNIX_CALL(capture_resample, This->stream); -} - static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration, REFERENCE_TIME period, const WAVEFORMATEX *fmt, @@ -1401,24 +1396,17 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( IAudioCaptureClient *iface, UINT32 *frames) { ACImpl *This = impl_from_IAudioCaptureClient(iface); + struct get_next_packet_size_params params; TRACE("(%p)->(%p)\n", This, frames); if(!frames) return E_POINTER; - OSSpinLockLock(&This->stream->lock); - - capture_resample(This); - - if(This->stream->held_frames >= This->stream->period_frames) - *frames = This->stream->period_frames; - else - *frames = 0; - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + params.frames = frames; + UNIX_CALL(get_next_packet_size, &params); + return params.result; } static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 9bb636fd625..32eb57a866a 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -166,6 +166,13 @@ struct get_current_padding_params UINT32 *padding; }; +struct get_next_packet_size_params +{ + struct coreaudio_stream *stream; + HRESULT result; + UINT32 *frames; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -183,8 +190,7 @@ enum unix_funcs unix_get_buffer_size, unix_get_latency, unix_get_current_padding, - - unix_capture_resample /* temporary */ + unix_get_next_packet_size, }; extern unixlib_handle_t coreaudio_handle; -- 2.23.0

2 1

[PATCH 02/11] winecoreaudio: Release the correct stream on init failure.
by Huw Davies 24 Nov '21

24 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index aa051cb3d61..cc37bebdc77 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -764,6 +764,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, params.duration = duration; params.period = period; params.fmt = fmt; + params.stream = NULL; UNIX_CALL(create_stream, &params); if(FAILED(params.result)) goto end; @@ -791,7 +792,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, end: if(FAILED(params.result)){ if(params.stream){ - release_params.stream = This->stream; + release_params.stream = params.stream; UNIX_CALL(release_stream, &release_params); } HeapFree(GetProcessHeap(), 0, This->vols); -- 2.23.0

2 1

[PATCH 01/11] winecoreaudio: Release the critical section in the no interface case.
by Huw Davies 24 Nov '21

24 Nov '21

This fixes an error introduced in 8e90b2569c4 which was incorrectly fixed in b5b77ed6aca. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 717e64b2283..aa051cb3d61 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1114,7 +1114,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(*ppv) hr = S_OK; else{ FIXME("stub %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + hr = E_NOINTERFACE; } end: -- 2.23.0

2 1

[PATCH 1/2] wined3d: Acquire sampler references for command lists by inspecting CS packets.
by Jan Sikorski 24 Nov '21

24 Nov '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- This is meant to be followed by more patches that manage references to all the other objects that need to be kept alive for command lists. That includes: all the ones handled similarly to samplers (i.e. the ones that we put into dedicated arrays); wined3d_resources, which are currently acquired on every draw/dispatch call; and views on these resources, which are not handled at all at this point. Apart from simplifying the code to some degree, it will fix the size problem of wined3d_resources arrays, which can get pretty large when the application is doing many repeated draw/dispatch calls. --- dlls/wined3d/cs.c | 71 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 9bdd2c8ed98..9c7ec1edbf8 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -103,6 +103,8 @@ ULONG CDECL wined3d_command_list_incref(struct wined3d_command_list *list) return refcount; } +static void wined3d_decref_packet_stream_objects(const uint8_t *data, size_t data_size); + ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) { ULONG refcount = InterlockedDecrement(&list->refcount); @@ -133,6 +135,8 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) for (i = 0; i < list->sampler_count; ++i) wined3d_sampler_decref(list->samplers[i]); + wined3d_decref_packet_stream_objects(list->data, list->data_size); + wined3d_mutex_lock(); wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); wined3d_mutex_unlock(); @@ -3627,6 +3631,62 @@ void wined3d_cs_destroy(struct wined3d_cs *cs) heap_free(cs); } +static void wined3d_decref_packet_stream_objects(const uint8_t *data, size_t data_size) +{ + size_t start = 0; + unsigned int i; + + while (start < data_size) + { + const struct wined3d_cs_packet *packet = (const struct wined3d_cs_packet *)&data[start]; + enum wined3d_cs_op opcode = *(const enum wined3d_cs_op *)packet->data; + + switch (opcode) + { + case WINED3D_CS_OP_SET_SAMPLERS: + { + struct wined3d_cs_set_samplers *cs_set + = (struct wined3d_cs_set_samplers *)packet->data; + for (i = 0; i < cs_set->count; ++i) + { + if (cs_set->samplers[i]) + wined3d_sampler_decref(cs_set->samplers[i]); + } + break; + } + default: + break; + } + + start += offsetof(struct wined3d_cs_packet, data[packet->size]); + } +} + +static void wined3d_incref_packet_objects(struct wined3d_cs_packet *packet) +{ + enum wined3d_cs_op opcode; + unsigned int i; + + opcode = *(const enum wined3d_cs_op *)packet->data; + + switch (opcode) + { + case WINED3D_CS_OP_SET_SAMPLERS: + { + struct wined3d_cs_set_samplers *cs_set + = (struct wined3d_cs_set_samplers *)packet->data; + for (i = 0; i < cs_set->count; ++i) + { + if (cs_set->samplers[i]) + wined3d_sampler_incref(cs_set->samplers[i]); + } + break; + } + default: + break; + } +} + struct wined3d_deferred_context { struct wined3d_device_context c; @@ -3689,16 +3749,19 @@ static void *wined3d_deferred_context_require_space(struct wined3d_device_contex packet = (struct wined3d_cs_packet *)((BYTE *)deferred->data + deferred->data_size); TRACE("size was %zu, adding %zu\n", (size_t)deferred->data_size, packet_size); - deferred->data_size += packet_size; packet->size = packet_size - header_size; return &packet->data; } static void wined3d_deferred_context_submit(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id) { - assert(queue_id == WINED3D_CS_QUEUE_DEFAULT); + struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); + struct wined3d_cs_packet *packet; - /* Nothing to do. */ + assert(queue_id == WINED3D_CS_QUEUE_DEFAULT); + packet = (struct wined3d_cs_packet *)((BYTE *)deferred->data + deferred->data_size); + deferred->data_size += packet->size + offsetof(struct wined3d_cs_packet, data[0]); + wined3d_incref_packet_objects(packet); } static void wined3d_deferred_context_finish(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id) @@ -4023,6 +4086,8 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_sampler_decref(deferred->samplers[i]); heap_free(deferred->samplers); + wined3d_decref_packet_stream_objects(deferred->data, deferred->data_size); + wined3d_state_destroy(deferred->c.state); heap_free(deferred->data); heap_free(deferred); -- 2.32.0

2 2

[PATCH 1/2] ntdll: Fix context arch flag cleanup for AMD64 in context_from_server().
by Paul Gofman 24 Nov '21

24 Nov '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- In particular, fixes a semi-random crash in ntdll exception test (test_extended_context) I am now reproducing locally. The thread is created suspended while the main thread sets context to it. (to_flags & CONTEXT_AMD64_XSTATE) is always TRUE. dlls/ntdll/unix/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 38a03bd4b60..00261edb593 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -755,7 +755,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma { AMD64_CONTEXT *to = dst; - to_flags = to->ContextFlags & ~CONTEXT_i386; + to_flags = to->ContextFlags & ~CONTEXT_AMD64; if ((from->flags & SERVER_CTX_CONTROL) && (to_flags & CONTEXT_AMD64_CONTROL)) { to->ContextFlags |= CONTEXT_AMD64_CONTROL; @@ -830,7 +830,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma { AMD64_CONTEXT *to = dst; - to_flags = to->ContextFlags & ~CONTEXT_i386; + to_flags = to->ContextFlags & ~CONTEXT_AMD64; if ((from->flags & SERVER_CTX_CONTROL) && (to_flags & CONTEXT_AMD64_CONTROL)) { to->ContextFlags |= CONTEXT_AMD64_CONTROL; -- 2.33.1

2 2

[PATCH 1/4] dinput8/tests: Add some GetForceFeedbackState / GetEffectStatus tests.
by Rémi Bernon 24 Nov '21

24 Nov '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52062 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput8/tests/hid.c | 436 ++++++++++++++++++++++++++++++++++----- 1 file changed, 381 insertions(+), 55 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 0c63ed835e8..f3d35e57ce1 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3291,7 +3291,8 @@ static void cleanup_registry_keys(void) RegCloseKey( root_key ); } -static BOOL dinput_driver_start( const BYTE *desc_buf, ULONG desc_len, const HIDP_CAPS *caps ) +static BOOL dinput_driver_start( const BYTE *desc_buf, ULONG desc_len, const HIDP_CAPS *caps, + struct hid_expect *expect, ULONG expect_size ) { static const HID_DEVICE_ATTRIBUTES attributes = { @@ -3318,7 +3319,7 @@ static BOOL dinput_driver_start( const BYTE *desc_buf, ULONG desc_len, const HID ok( !status, "RegSetValueExW returned %#x\n", status ); status = RegSetValueExW( hkey, L"Caps", 0, REG_BINARY, (void *)caps, sizeof(*caps) ); ok( !status, "RegSetValueExW returned %#x\n", status ); - status = RegSetValueExW( hkey, L"Expect", 0, REG_BINARY, NULL, 0 ); + status = RegSetValueExW( hkey, L"Expect", 0, REG_BINARY, (void *)expect, expect_size ); ok( !status, "RegSetValueExW returned %#x\n", status ); status = RegSetValueExW( hkey, L"Input", 0, REG_BINARY, NULL, 0 ); ok( !status, "RegSetValueExW returned %#x\n", status ); @@ -4022,7 +4023,7 @@ static void test_simple_joystick(void) SetCurrentDirectoryW( tempdir ); cleanup_registry_keys(); - if (!dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps )) goto done; + if (!dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps, NULL, 0 )) goto done; if (FAILED(hr = create_dinput_device( DIRECTINPUT_VERSION, &devinst, &device ))) goto done; hr = IDirectInputDevice8_Initialize( device, instance, 0x0700, &GUID_NULL ); @@ -5511,7 +5512,7 @@ static BOOL test_device_types( DWORD version ) cleanup_registry_keys(); if (!dinput_driver_start( device_desc[i].report_desc_buf, device_desc[i].report_desc_len, - &device_desc[i].hid_caps )) + &device_desc[i].hid_caps, NULL, 0 )) { success = FALSE; goto done; @@ -7950,7 +7951,7 @@ static void test_force_feedback_joystick( DWORD version ) SetCurrentDirectoryW( tempdir ); cleanup_registry_keys(); - if (!dinput_driver_start( report_descriptor, sizeof(report_descriptor), &hid_caps )) goto done; + if (!dinput_driver_start( report_descriptor, sizeof(report_descriptor), &hid_caps, NULL, 0 )) goto done; if (FAILED(hr = create_dinput_device( version, &devinst, &device ))) goto done; hr = IDirectInputDevice8_GetDeviceInfo( device, &devinst ); @@ -8222,13 +8223,15 @@ static void test_device_managed_effect(void) PHYSICAL_MINIMUM(1, 0), PHYSICAL_MAXIMUM(1, 1), REPORT_SIZE(1, 1), - REPORT_COUNT(1, 1), + REPORT_COUNT(1, 8), INPUT(1, Data|Var|Abs), USAGE(1, PID_USAGE_EFFECT_BLOCK_INDEX), + LOGICAL_MINIMUM(1, 1), LOGICAL_MAXIMUM(1, 0x7f), - LOGICAL_MINIMUM(1, 0x00), - REPORT_SIZE(1, 7), + PHYSICAL_MINIMUM(1, 1), + PHYSICAL_MAXIMUM(1, 0x7f), + REPORT_SIZE(1, 8), REPORT_COUNT(1, 1), INPUT(1, Data|Var|Abs), END_COLLECTION, @@ -8256,9 +8259,9 @@ static void test_device_managed_effect(void) REPORT_ID(1, 2), USAGE(1, PID_USAGE_EFFECT_BLOCK_INDEX), - LOGICAL_MINIMUM(1, 0), + LOGICAL_MINIMUM(1, 1), LOGICAL_MAXIMUM(1, 0x7f), - PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MINIMUM(1, 1), PHYSICAL_MAXIMUM(1, 0x7f), REPORT_SIZE(1, 8), REPORT_COUNT(1, 1), @@ -8293,9 +8296,9 @@ static void test_device_managed_effect(void) REPORT_ID(1, 3), USAGE(1, PID_USAGE_EFFECT_BLOCK_INDEX), - LOGICAL_MINIMUM(1, 0), + LOGICAL_MINIMUM(1, 1), LOGICAL_MAXIMUM(1, 0x7f), - PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MINIMUM(1, 1), PHYSICAL_MAXIMUM(1, 0x7f), REPORT_SIZE(1, 8), REPORT_COUNT(1, 1), @@ -8378,7 +8381,7 @@ static void test_device_managed_effect(void) USAGE(1, PID_USAGE_SET_CONDITION_REPORT), COLLECTION(1, Logical), - REPORT_ID(1, 7), + REPORT_ID(1, 4), USAGE(1, PID_USAGE_TYPE_SPECIFIC_BLOCK_OFFSET), COLLECTION(1, Logical), @@ -8435,9 +8438,56 @@ static void test_device_managed_effect(void) OUTPUT(1, Data|Var|Abs), END_COLLECTION, + USAGE(1, PID_USAGE_BLOCK_FREE_REPORT), + COLLECTION(1, Logical), + REPORT_ID(1, 5), + + USAGE(1, PID_USAGE_EFFECT_BLOCK_INDEX), + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, 0x7f), + PHYSICAL_MINIMUM(1, 1), + PHYSICAL_MAXIMUM(1, 0x7f), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + END_COLLECTION, + + USAGE(1, PID_USAGE_POOL_REPORT), + COLLECTION(1, Logical), + REPORT_ID(1, 1), + + USAGE(1, PID_USAGE_RAM_POOL_SIZE), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(4, 0xffff), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(4, 0xffff), + REPORT_SIZE(1, 16), + REPORT_COUNT(1, 1), + FEATURE(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_SIMULTANEOUS_EFFECTS_MAX), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 0x7f), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 0x7f), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + FEATURE(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_DEVICE_MANAGED_POOL), + USAGE(1, PID_USAGE_SHARED_PARAMETER_BLOCKS), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_SIZE(1, 1), + REPORT_COUNT(1, 8), + FEATURE(1, Data|Var|Abs), + END_COLLECTION, + USAGE(1, PID_USAGE_CREATE_NEW_EFFECT_REPORT), COLLECTION(1, Logical), - REPORT_ID(1, 9), + REPORT_ID(1, 2), USAGE(1, PID_USAGE_EFFECT_TYPE), COLLECTION(1, NamedArray), @@ -8456,7 +8506,7 @@ static void test_device_managed_effect(void) USAGE(1, PID_USAGE_BLOCK_LOAD_REPORT), COLLECTION(1, Logical), - REPORT_ID(1, 10), + REPORT_ID(1, 3), USAGE(1, PID_USAGE_EFFECT_BLOCK_INDEX), LOGICAL_MINIMUM(1, 1), @@ -8480,33 +8530,14 @@ static void test_device_managed_effect(void) REPORT_COUNT(1, 1), FEATURE(1, Data|Ary|Abs), END_COLLECTION, - END_COLLECTION, - USAGE(1, PID_USAGE_BLOCK_FREE_REPORT), - COLLECTION(1, Logical), - REPORT_ID(1, 11), - - USAGE(1, PID_USAGE_EFFECT_BLOCK_INDEX), - LOGICAL_MINIMUM(1, 1), - LOGICAL_MAXIMUM(1, 0x7f), - PHYSICAL_MINIMUM(1, 1), - PHYSICAL_MAXIMUM(1, 0x7f), - REPORT_SIZE(1, 8), - REPORT_COUNT(1, 1), - OUTPUT(1, Data|Var|Abs), - END_COLLECTION, - - USAGE(1, PID_USAGE_POOL_REPORT), - COLLECTION(1, Logical), - REPORT_ID(1, 12), - - USAGE(1, PID_USAGE_DEVICE_MANAGED_POOL), + USAGE(1, PID_USAGE_RAM_POOL_AVAILABLE), LOGICAL_MINIMUM(1, 0), - LOGICAL_MAXIMUM(1, 1), + LOGICAL_MAXIMUM(4, 0xffff), PHYSICAL_MINIMUM(1, 0), - PHYSICAL_MAXIMUM(1, 1), + PHYSICAL_MAXIMUM(4, 0xffff), REPORT_SIZE(1, 1), - REPORT_COUNT(1, 8), + REPORT_COUNT(1, 16), FEATURE(1, Data|Var|Abs), END_COLLECTION, END_COLLECTION, @@ -8519,6 +8550,7 @@ static void test_device_managed_effect(void) }; struct hid_expect expect_reset[] = { + /* device reset */ { .code = IOCTL_HID_WRITE_REPORT, .report_id = 1, @@ -8531,39 +8563,55 @@ static void test_device_managed_effect(void) /* create new effect */ { .code = IOCTL_HID_SET_FEATURE, - .report_id = 9, + .report_id = 2, .report_len = 2, - .report_buf = {9,0x03}, + .report_buf = {2,0x03}, }, /* block load */ { .code = IOCTL_HID_GET_FEATURE, - .report_id = 10, - .report_len = 3, - .report_buf = {10,0x01,0x01}, + .report_id = 3, + .report_len = 5, + .report_buf = {3,0x01,0x01,0x00,0x00}, }, /* set condition */ { .code = IOCTL_HID_WRITE_REPORT, - .report_id = 7, + .report_id = 4, .report_len = 8, - .report_buf = {0x07,0x00,0xf9,0x19,0xd9,0xff,0xff,0x99}, + .report_buf = {4,0x00,0xf9,0x19,0xd9,0xff,0xff,0x99}, }, /* set condition */ { .code = IOCTL_HID_WRITE_REPORT, - .report_id = 7, + .report_id = 4, .report_len = 8, - .report_buf = {0x07,0x00,0x4c,0x3f,0xcc,0x4c,0x33,0x19}, + .report_buf = {4,0x00,0x4c,0x3f,0xcc,0x4c,0x33,0x19}, }, /* update effect */ { .code = IOCTL_HID_WRITE_REPORT, .report_id = 3, .report_len = 11, - .report_buf = {0x03,0x01,0x03,0x08,0x01,0x00,0x06,0x00,0x01,0x55,0x00}, + .report_buf = {3,0x01,0x03,0x08,0x01,0x00,0x06,0x00,0x01,0x55,0x00}, }, }; + struct hid_expect expect_start = + { + /* effect control */ + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 2, + .report_len = 4, + .report_buf = {2,0x01,0x01,0x01}, + }; + struct hid_expect expect_stop = + { + /* effect control */ + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 2, + .report_len = 4, + .report_buf = {2,0x01,0x03,0x00}, + }; struct hid_expect expect_destroy[] = { /* effect operation */ @@ -8571,14 +8619,84 @@ static void test_device_managed_effect(void) .code = IOCTL_HID_WRITE_REPORT, .report_id = 2, .report_len = 4, - .report_buf = {0x02,0x01,0x03,0x00}, + .report_buf = {2,0x01,0x03,0x00}, }, /* block free */ { .code = IOCTL_HID_WRITE_REPORT, - .report_id = 11, + .report_id = 5, .report_len = 2, - .report_buf = {11,0x01}, + .report_buf = {5,0x01}, + }, + }; + struct hid_expect device_state_input[] = + { + /* effect state */ + { + .code = IOCTL_HID_READ_REPORT, + .report_id = 2, + .report_len = 4, + .report_buf = {2,0xff,0x00,0xff}, + }, + /* device state */ + { + .code = IOCTL_HID_READ_REPORT, + .report_id = 1, + .report_len = 5, + .report_buf = {1,0x12,0x34,0x56,0xff}, + }, + }; + struct hid_expect device_state_input_1[] = + { + /* effect state */ + { + .code = IOCTL_HID_READ_REPORT, + .report_id = 2, + .report_len = 4, + .report_buf = {2,0x00,0x01,0x00}, + }, + /* device state */ + { + .code = IOCTL_HID_READ_REPORT, + .report_id = 1, + .report_len = 5, + .report_buf = {1,0x65,0x43,0x21,0x00}, + }, + }; + struct hid_expect device_state_input_2[] = + { + /* effect state */ + { + .code = IOCTL_HID_READ_REPORT, + .report_id = 2, + .report_len = 4, + .report_buf = {2,0x03,0x00,0x00}, + }, + /* device state */ + { + .code = IOCTL_HID_READ_REPORT, + .report_id = 1, + .report_len = 5, + .report_buf = {1,0x12,0x34,0x56,0xff}, + }, + }; + struct hid_expect expect_pool[] = + { + /* device pool */ + { + .code = IOCTL_HID_GET_FEATURE, + .report_id = 1, + .report_len = 5, + .report_buf = {1,0x10,0x00,0x01,0x03}, + .todo = TRUE, + }, + /* device pool */ + { + .code = IOCTL_HID_GET_FEATURE, + .report_id = 1, + .report_len = 5, + .report_buf = {1,0x10,0x00,0x01,0x03}, + .todo = TRUE, }, }; static const DWORD expect_axes[3] = @@ -8666,10 +8784,10 @@ static void test_device_managed_effect(void) WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; IDirectInputDevice8W *device; IDirectInputEffect *effect; - HANDLE file; + HANDLE file, event; + ULONG res, ref; DWORD flags; HRESULT hr; - ULONG ref; HWND hwnd; GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); @@ -8677,7 +8795,8 @@ static void test_device_managed_effect(void) SetCurrentDirectoryW( tempdir ); cleanup_registry_keys(); - if (!dinput_driver_start( report_descriptor, sizeof(report_descriptor), &hid_caps )) goto done; + if (!dinput_driver_start( report_descriptor, sizeof(report_descriptor), &hid_caps, + expect_pool, sizeof(expect_pool) )) goto done; if (FAILED(hr = create_dinput_device( DIRECTINPUT_VERSION, &devinst, &device ))) goto done; hr = IDirectInputDevice8_GetProperty( device, DIPROP_GUIDANDPATH, &prop_guid_path.diph ); @@ -8690,6 +8809,10 @@ static void test_device_managed_effect(void) hwnd = CreateWindowW( L"static", L"dinput", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 10, 10, 200, 200, NULL, NULL, NULL, NULL ); + event = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( event != NULL, "CreateEventW failed, last error %u\n", GetLastError() ); + hr = IDirectInputDevice8_SetEventNotification( device, event ); + ok( hr == DI_OK, "SetEventNotification returned: %#x\n", hr ); hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_BACKGROUND | DISCL_EXCLUSIVE ); ok( hr == DI_OK, "SetCooperativeLevel returned: %#x\n", hr ); hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 ); @@ -8698,33 +8821,235 @@ static void test_device_managed_effect(void) hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); todo_wine ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "GetProperty DIPROP_FFLOAD returned %#x\n", hr ); + hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); + todo_wine + ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "GetForceFeedbackState returned %#x\n", hr ); + hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_RESET ); + ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "SendForceFeedbackCommand returned %#x\n", hr ); set_hid_expect( file, expect_reset, sizeof(expect_reset) ); hr = IDirectInputDevice8_Acquire( device ); ok( hr == DI_OK, "Acquire returned: %#x\n", hr ); + wait_hid_expect( file, 100 ); + + set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); + prop_dword.dwData = 0xdeadbeef; + hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); + todo_wine + ok( hr == DI_OK, "GetProperty DIPROP_FFLOAD returned %#x\n", hr ); + todo_wine + ok( prop_dword.dwData == 0, "got DIPROP_FFLOAD %#x\n", prop_dword.dwData ); + set_hid_expect( file, NULL, 0 ); + + set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); + res = 0xdeadbeef; + hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); + todo_wine + ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); + flags = DIGFFS_STOPPED|DIGFFS_EMPTY; + todo_wine + ok( res == flags, "got state %#x\n", res ); + set_hid_expect( file, NULL, 0 ); + + set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); + prop_dword.dwData = 0xdeadbeef; + hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); + todo_wine + ok( hr == DI_OK, "GetProperty DIPROP_FFLOAD returned %#x\n", hr ); + todo_wine + ok( prop_dword.dwData == 0, "got DIPROP_FFLOAD %#x\n", prop_dword.dwData ); + set_hid_expect( file, NULL, 0 ); + + send_hid_input( file, device_state_input, sizeof(struct hid_expect) ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#x\n", res ); + send_hid_input( file, device_state_input, sizeof(device_state_input) ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); + + set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); + res = 0xdeadbeef; + hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); + todo_wine + ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); + flags = DIGFFS_PAUSED|DIGFFS_EMPTY|DIGFFS_ACTUATORSON|DIGFFS_POWERON|DIGFFS_SAFETYSWITCHON|DIGFFS_USERFFSWITCHON; + todo_wine + ok( res == flags, "got state %#x\n", res ); set_hid_expect( file, NULL, 0 ); hr = IDirectInputDevice8_CreateEffect( device, &GUID_Spring, NULL, &effect, NULL ); ok( hr == DI_OK, "CreateEffect returned %#x\n", hr ); + hr = IDirectInputEffect_GetEffectStatus( effect, NULL ); + ok( hr == E_POINTER, "GetEffectStatus returned %#x\n", hr ); + res = 0xdeadbeef; + hr = IDirectInputEffect_GetEffectStatus( effect, &res ); + todo_wine + ok( hr == DIERR_NOTDOWNLOADED, "GetEffectStatus returned %#x\n", hr ); + todo_wine + ok( res == 0, "got status %#x\n", res ); + flags = DIEP_ALLPARAMS; hr = IDirectInputEffect_SetParameters( effect, &expect_desc, flags | DIEP_NODOWNLOAD ); ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#x\n", hr ); + set_hid_expect( file, expect_reset, sizeof(struct hid_expect) ); + hr = IDirectInputDevice8_Unacquire( device ); + ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); + set_hid_expect( file, NULL, 0 ); + + hr = IDirectInputEffect_GetEffectStatus( effect, &res ); + todo_wine + ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "GetEffectStatus returned %#x\n", hr ); + + set_hid_expect( file, expect_reset, sizeof(expect_reset) ); + hr = IDirectInputDevice8_Acquire( device ); + ok( hr == DI_OK, "Acquire returned: %#x\n", hr ); + wait_hid_expect( file, 100 ); + + res = 0xdeadbeef; + hr = IDirectInputEffect_GetEffectStatus( effect, &res ); + todo_wine + ok( hr == DIERR_NOTDOWNLOADED, "GetEffectStatus returned %#x\n", hr ); + todo_wine + ok( res == 0, "got status %#x\n", res ); + + set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); + res = 0xdeadbeef; + hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); + todo_wine + ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); + flags = DIGFFS_STOPPED|DIGFFS_EMPTY; + todo_wine + ok( res == flags, "got state %#x\n", res ); + set_hid_expect( file, NULL, 0 ); + set_hid_expect( file, expect_create, sizeof(expect_create) ); hr = IDirectInputEffect_Download( effect ); ok( hr == DI_OK, "Download returned %#x\n", hr ); set_hid_expect( file, NULL, 0 ); + res = 0xdeadbeef; + hr = IDirectInputEffect_GetEffectStatus( effect, &res ); + todo_wine + ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr ); + todo_wine + ok( res == 0, "got status %#x\n", res ); + set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); + res = 0xdeadbeef; + hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); + todo_wine + ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); + flags = DIGFFS_STOPPED; + todo_wine + ok( res == flags, "got state %#x\n", res ); + set_hid_expect( file, NULL, 0 ); + + set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); + prop_dword.dwData = 0xdeadbeef; + hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); + todo_wine + ok( hr == DI_OK, "GetProperty DIPROP_FFLOAD returned %#x\n", hr ); + todo_wine + ok( prop_dword.dwData == 0, "got DIPROP_FFLOAD %#x\n", prop_dword.dwData ); + set_hid_expect( file, NULL, 0 ); + + set_hid_expect( file, &expect_start, sizeof(expect_start) ); + hr = IDirectInputEffect_Start( effect, 1, DIES_NODOWNLOAD ); + ok( hr == DI_OK, "Start returned %#x\n", hr ); + set_hid_expect( file, NULL, 0 ); + + res = 0xdeadbeef; + hr = IDirectInputEffect_GetEffectStatus( effect, &res ); + todo_wine + ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr ); + todo_wine + ok( res == DIEGES_PLAYING, "got status %#x\n", res ); + + send_hid_input( file, device_state_input_1, sizeof(device_state_input_1) ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); + res = 0xdeadbeef; + hr = IDirectInputEffect_GetEffectStatus( effect, &res ); + todo_wine + ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr ); + todo_wine + ok( res == DIEGES_PLAYING, "got status %#x\n", res ); + set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); + res = 0xdeadbeef; + hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); + todo_wine + ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); + flags = DIGFFS_ACTUATORSOFF|DIGFFS_POWEROFF|DIGFFS_SAFETYSWITCHOFF|DIGFFS_USERFFSWITCHOFF; + todo_wine + ok( res == flags, "got state %#x\n", res ); + set_hid_expect( file, NULL, 0 ); + + send_hid_input( file, device_state_input_2, sizeof(device_state_input_2) ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); + res = 0xdeadbeef; + hr = IDirectInputEffect_GetEffectStatus( effect, &res ); + todo_wine + ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr ); + todo_wine + ok( res == DIEGES_PLAYING, "got status %#x\n", res ); + set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); + res = 0xdeadbeef; + hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); + todo_wine + ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); + flags = DIGFFS_PAUSED|DIGFFS_ACTUATORSON|DIGFFS_POWEROFF|DIGFFS_SAFETYSWITCHOFF|DIGFFS_USERFFSWITCHOFF; + todo_wine + ok( res == flags, "got state %#x\n", res ); + set_hid_expect( file, NULL, 0 ); + + set_hid_expect( file, &expect_stop, sizeof(expect_stop) ); + hr = IDirectInputEffect_Stop( effect ); + ok( hr == DI_OK, "Stop returned %#x\n", hr ); + set_hid_expect( file, NULL, 0 ); + + res = 0xdeadbeef; + hr = IDirectInputEffect_GetEffectStatus( effect, &res ); + todo_wine + ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr ); + todo_wine + ok( res == 0, "got status %#x\n", res ); + set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); + res = 0xdeadbeef; + hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); + todo_wine + ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); + flags = DIGFFS_PAUSED|DIGFFS_ACTUATORSON|DIGFFS_POWEROFF|DIGFFS_SAFETYSWITCHOFF|DIGFFS_USERFFSWITCHOFF; + todo_wine + ok( res == flags, "got state %#x\n", res ); + set_hid_expect( file, NULL, 0 ); + set_hid_expect( file, expect_destroy, sizeof(expect_destroy) ); hr = IDirectInputEffect_Unload( effect ); ok( hr == DI_OK, "Unload returned %#x\n", hr ); set_hid_expect( file, NULL, 0 ); + res = 0xdeadbeef; + hr = IDirectInputEffect_GetEffectStatus( effect, &res ); + todo_wine + ok( hr == DIERR_NOTDOWNLOADED, "GetEffectStatus returned %#x\n", hr ); + todo_wine + ok( res == 0, "got status %#x\n", res ); + set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); + res = 0xdeadbeef; + hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); + todo_wine + ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); + flags = DIGFFS_EMPTY|DIGFFS_PAUSED|DIGFFS_ACTUATORSON|DIGFFS_POWEROFF|DIGFFS_SAFETYSWITCHOFF|DIGFFS_USERFFSWITCHOFF; + todo_wine + ok( res == flags, "got state %#x\n", res ); + set_hid_expect( file, NULL, 0 ); + ref = IDirectInputEffect_Release( effect ); ok( ref == 0, "Release returned %d\n", ref ); - set_hid_expect( file, expect_reset, sizeof(expect_reset) ); + set_hid_expect( file, expect_reset, sizeof(struct hid_expect) ); hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); set_hid_expect( file, NULL, 0 ); @@ -8733,6 +9058,7 @@ static void test_device_managed_effect(void) ok( ref == 0, "Release returned %d\n", ref ); DestroyWindow( hwnd ); + CloseHandle( event ); CloseHandle( file ); done: -- 2.33.1

1 3

[PATCH v2 1/2] ntdll: Fix context arch flag cleanup for AMD64 in context_from_server().
by Paul Gofman 24 Nov '21

24 Nov '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- In particular, fixes a semi-random crash in ntdll exception test (test_extended_context) I am now reproducing locally. The thread is created suspended while the main thread sets context to it. (to_flags & CONTEXT_AMD64_XSTATE) is always TRUE. dlls/ntdll/unix/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 38a03bd4b60..00261edb593 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -755,7 +755,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma { AMD64_CONTEXT *to = dst; - to_flags = to->ContextFlags & ~CONTEXT_i386; + to_flags = to->ContextFlags & ~CONTEXT_AMD64; if ((from->flags & SERVER_CTX_CONTROL) && (to_flags & CONTEXT_AMD64_CONTROL)) { to->ContextFlags |= CONTEXT_AMD64_CONTROL; @@ -830,7 +830,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma { AMD64_CONTEXT *to = dst; - to_flags = to->ContextFlags & ~CONTEXT_i386; + to_flags = to->ContextFlags & ~CONTEXT_AMD64; if ((from->flags & SERVER_CTX_CONTROL) && (to_flags & CONTEXT_AMD64_CONTROL)) { to->ContextFlags |= CONTEXT_AMD64_CONTROL; -- 2.33.1

1 1

[PATCH 1/3] wined3d: Remove poll list.
by Jan Sikorski 24 Nov '21

24 Nov '21

Poll with callbacks from application threads instead. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/cs.c | 73 ++------- dlls/wined3d/query.c | 284 ++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 6 +- 3 files changed, 212 insertions(+), 151 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 9bdd2c8ed98..fff79a6b021 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2388,44 +2388,26 @@ void wined3d_cs_init_object(struct wined3d_cs *cs, void (*callback)(void *object wined3d_cs_emit_callback(cs, callback, object); } -static void wined3d_cs_exec_query_issue(struct wined3d_cs *cs, const void *data) +void wined3d_cs_run_priority_callback(struct wined3d_cs *cs, void (*callback)(void *object), void *object) { - const struct wined3d_cs_query_issue *op = data; - struct wined3d_query *query = op->query; - BOOL poll; + struct wined3d_cs_callback *op; - poll = query->query_ops->query_issue(query, op->flags); + op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_MAP); + op->opcode = WINED3D_CS_OP_CALLBACK; + op->callback = callback; + op->object = object; - if (!cs->thread) - return; + wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_MAP); + wined3d_cs_finish(cs, WINED3D_CS_QUEUE_MAP); +} - if (poll && list_empty(&query->poll_list_entry)) - { - if (query->buffer_object) - InterlockedIncrement(&query->counter_retrieved); - else - list_add_tail(&cs->query_poll_list, &query->poll_list_entry); - return; - } +static void wined3d_cs_exec_query_issue(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_query_issue *op = data; + struct wined3d_query *query = op->query; - /* This can happen if occlusion queries are restarted. This discards the - * old result, since polling it could result in a GL error. */ - if ((op->flags & WINED3DISSUE_BEGIN) && !poll && !list_empty(&query->poll_list_entry)) - { - list_remove(&query->poll_list_entry); - list_init(&query->poll_list_entry); - InterlockedIncrement(&query->counter_retrieved); - return; - } + query->query_ops->query_issue(query, op->flags); - /* This can happen when an occlusion query is ended without being started, - * in which case we don't want to poll, but still have to counter-balance - * the increment of the main counter. - * - * This can also happen if an event query is re-issued before the first - * fence was reached. In this case the query is already in the list and - * the poll function will check the new fence. We have to counter-balance - * the discarded increment. */ if (op->flags & WINED3DISSUE_END) InterlockedIncrement(&query->counter_retrieved); } @@ -3424,21 +3406,6 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_acquire_samplers, }; -static void poll_queries(struct wined3d_cs *cs) -{ - struct wined3d_query *query, *cursor; - - LIST_FOR_EACH_ENTRY_SAFE(query, cursor, &cs->query_poll_list, struct wined3d_query, poll_list_entry) - { - if (!query->query_ops->query_poll(query, 0)) - continue; - - list_remove(&query->poll_list_entry); - list_init(&query->poll_list_entry); - InterlockedIncrement(&query->counter_retrieved); - } -} - static void wined3d_cs_wait_event(struct wined3d_cs *cs) { InterlockedExchange(&cs->waiting_for_event, TRUE); @@ -3478,7 +3445,6 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) struct wined3d_cs *cs = ctx; enum wined3d_cs_op opcode; HMODULE wined3d_module; - unsigned int poll = 0; LONG tail; TRACE("Started.\n"); @@ -3487,25 +3453,16 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) * thread freeing "cs" before the FreeLibraryAndExitThread() call. */ wined3d_module = cs->wined3d_module; - list_init(&cs->query_poll_list); cs->thread_id = GetCurrentThreadId(); for (;;) { - if (++poll == WINED3D_CS_QUERY_POLL_INTERVAL) - { - wined3d_cs_command_lock(cs); - poll_queries(cs); - wined3d_cs_command_unlock(cs); - poll = 0; - } - queue = &cs->queue[WINED3D_CS_QUEUE_MAP]; if (wined3d_cs_queue_is_empty(cs, queue)) { queue = &cs->queue[WINED3D_CS_QUEUE_DEFAULT]; if (wined3d_cs_queue_is_empty(cs, queue)) { - if (++spin_count >= WINED3D_CS_SPIN_COUNT && list_empty(&cs->query_poll_list)) + if (++spin_count >= WINED3D_CS_SPIN_COUNT) wined3d_cs_wait_event(cs); continue; } diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 1b38eb5e311..193f62cd265 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -472,23 +472,18 @@ HRESULT CDECL wined3d_query_get_data(struct wined3d_query *query, return WINED3DERR_INVALIDCALL; } - if (query->device->cs->thread) - { - if (query->counter_main != query->counter_retrieved - || (query->buffer_object && !wined3d_query_buffer_is_valid(query))) - { - if (flags & WINED3DGETDATA_FLUSH && !query->device->cs->queries_flushed) - query->device->cs->c.ops->flush(&query->device->cs->c); - return S_FALSE; - } - if (query->buffer_object) - query->data = query->map_ptr; - } - else if (!query->query_ops->query_poll(query, flags)) + if (query->counter_main != query->counter_retrieved + || (query->buffer_object && !wined3d_query_buffer_is_valid(query)) + || !query->query_ops->query_poll(query, flags)) { + if (flags & WINED3DGETDATA_FLUSH && !query->device->cs->queries_flushed) + query->device->cs->c.ops->flush(&query->device->cs->c); return S_FALSE; } + if (query->buffer_object) + query->data = query->map_ptr; + if (data) memcpy(data, query->data, min(data_size, query->data_size)); @@ -511,20 +506,33 @@ HRESULT CDECL wined3d_query_issue(struct wined3d_query *query, DWORD flags) return WINED3D_OK; } -static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query, DWORD flags) +struct wined3d_poll_callback_data { - struct wined3d_occlusion_query *oq = wined3d_occlusion_query_from_query(query); + struct wined3d_query *query; + DWORD flags; + BOOL result; +}; + +static void wined3d_occlusion_query_ops_poll_cs(void *object) +{ + struct wined3d_poll_callback_data *data = object; + struct wined3d_query *query = data->query; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; + struct wined3d_occlusion_query *oq; + DWORD flags = data->flags; GLuint available; TRACE("query %p, flags %#x.\n", query, flags); + oq = wined3d_occlusion_query_from_query(query); + if (!(context_gl = wined3d_context_gl_reacquire(oq->context_gl))) { FIXME("%p Wrong thread, returning 1.\n", query); oq->samples = 1; - return TRUE; + data->result = TRUE; + return; } gl_info = context_gl->gl_info; @@ -540,40 +548,76 @@ static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query, DWORD checkGLcall("poll occlusion query"); context_release(&context_gl->c); - return available; + data->result = available; } -static BOOL wined3d_event_query_ops_poll(struct wined3d_query *query, DWORD flags) +static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query, DWORD flags) { - struct wined3d_event_query *event_query = wined3d_event_query_from_query(query); + struct wined3d_cs *cs = query->device->cs; + struct wined3d_poll_callback_data data; + + data.query = query; + data.flags = flags; + + wined3d_cs_run_priority_callback(cs, wined3d_occlusion_query_ops_poll_cs, &data); + + return data.result; +} + +static void wined3d_event_query_ops_poll_cs(void *object) +{ + struct wined3d_poll_callback_data *data = object; + struct wined3d_query *query = data->query; + struct wined3d_event_query *event_query; enum wined3d_fence_result ret; + DWORD flags = data->flags; TRACE("query %p, flags %#x.\n", query, flags); + event_query = wined3d_event_query_from_query(query); + ret = wined3d_fence_test(&event_query->fence, query->device, flags); switch (ret) { case WINED3D_FENCE_OK: case WINED3D_FENCE_NOT_STARTED: - return event_query->signalled = TRUE; + data->result = event_query->signalled = TRUE; + break; case WINED3D_FENCE_WAITING: - return event_query->signalled = FALSE; + data->result = event_query->signalled = FALSE; + break; case WINED3D_FENCE_WRONG_THREAD: FIXME("(%p) Wrong thread, reporting GPU idle.\n", query); - return event_query->signalled = TRUE; + data->result = event_query->signalled = TRUE; + break; case WINED3D_FENCE_ERROR: ERR("The GL event query failed.\n"); - return event_query->signalled = TRUE; + data->result = event_query->signalled = TRUE; + break; default: ERR("Unexpected wined3d_event_query_test result %#x.\n", ret); - return event_query->signalled = TRUE; + data->result = event_query->signalled = TRUE; + break; } } +static BOOL wined3d_event_query_ops_poll(struct wined3d_query *query, DWORD flags) +{ + struct wined3d_cs *cs = query->device->cs; + struct wined3d_poll_callback_data data; + + data.query = query; + data.flags = flags; + + wined3d_cs_run_priority_callback(cs, wined3d_event_query_ops_poll_cs, &data); + + return data.result; +} + void * CDECL wined3d_query_get_parent(const struct wined3d_query *query) { TRACE("query %p.\n", query); @@ -588,7 +632,7 @@ enum wined3d_query_type CDECL wined3d_query_get_type(const struct wined3d_query return query->type; } -static BOOL wined3d_event_query_ops_issue(struct wined3d_query *query, DWORD flags) +static void wined3d_event_query_ops_issue(struct wined3d_query *query, DWORD flags) { TRACE("query %p, flags %#x.\n", query, flags); @@ -597,24 +641,20 @@ static BOOL wined3d_event_query_ops_issue(struct wined3d_query *query, DWORD fla struct wined3d_event_query *event_query = wined3d_event_query_from_query(query); wined3d_fence_issue(&event_query->fence, query->device); - return TRUE; } else if (flags & WINED3DISSUE_BEGIN) { /* Started implicitly at query creation. */ ERR("Event query issued with START flag - what to do?\n"); } - - return FALSE; } -static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD flags) +static void wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD flags) { struct wined3d_occlusion_query *oq = wined3d_occlusion_query_from_query(query); struct wined3d_device *device = query->device; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; - BOOL poll = FALSE; TRACE("query %p, flags %#x.\n", query, flags); @@ -668,7 +708,6 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD wined3d_query_buffer_queue_result(context_gl, query, oq->id); context_release(&context_gl->c); - poll = TRUE; } else { @@ -677,25 +716,29 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD } oq->started = FALSE; } - - return poll; } -static BOOL wined3d_timestamp_query_ops_poll(struct wined3d_query *query, DWORD flags) +static void wined3d_timestamp_query_ops_poll_cs(void *object) { - struct wined3d_timestamp_query *tq = wined3d_timestamp_query_from_query(query); - const struct wined3d_gl_info *gl_info; + struct wined3d_poll_callback_data *data = object; + struct wined3d_query *query = data->query; struct wined3d_context_gl *context_gl; + const struct wined3d_gl_info *gl_info; + struct wined3d_timestamp_query *tq; + DWORD flags = data->flags; GLuint64 timestamp; GLuint available; TRACE("query %p, flags %#x.\n", query, flags); + tq = wined3d_timestamp_query_from_query(query); + if (!(context_gl = wined3d_context_gl_reacquire(tq->context_gl))) { FIXME("%p Wrong thread, returning 1.\n", query); tq->timestamp = 1; - return TRUE; + data->result = TRUE; + return; } gl_info = context_gl->gl_info; @@ -712,11 +755,23 @@ static BOOL wined3d_timestamp_query_ops_poll(struct wined3d_query *query, DWORD } context_release(&context_gl->c); + data->result = available; +} + +static BOOL wined3d_timestamp_query_ops_poll(struct wined3d_query *query, DWORD flags) +{ + struct wined3d_cs *cs = query->device->cs; + struct wined3d_poll_callback_data data; - return available; + data.query = query; + data.flags = flags; + + wined3d_cs_run_priority_callback(cs, wined3d_timestamp_query_ops_poll_cs, &data); + + return data.result; } -static BOOL wined3d_timestamp_query_ops_issue(struct wined3d_query *query, DWORD flags) +static void wined3d_timestamp_query_ops_issue(struct wined3d_query *query, DWORD flags) { struct wined3d_timestamp_query *tq = wined3d_timestamp_query_from_query(query); const struct wined3d_gl_info *gl_info; @@ -738,11 +793,7 @@ static BOOL wined3d_timestamp_query_ops_issue(struct wined3d_query *query, DWORD GL_EXTCALL(glQueryCounter(tq->id, GL_TIMESTAMP)); checkGLcall("glQueryCounter()"); context_release(&context_gl->c); - - return TRUE; } - - return FALSE; } static BOOL wined3d_timestamp_disjoint_query_ops_poll(struct wined3d_query *query, DWORD flags) @@ -752,27 +803,31 @@ static BOOL wined3d_timestamp_disjoint_query_ops_poll(struct wined3d_query *quer return TRUE; } -static BOOL wined3d_timestamp_disjoint_query_ops_issue(struct wined3d_query *query, DWORD flags) +static void wined3d_timestamp_disjoint_query_ops_issue(struct wined3d_query *query, DWORD flags) { TRACE("query %p, flags %#x.\n", query, flags); - - return FALSE; } -static BOOL wined3d_so_statistics_query_ops_poll(struct wined3d_query *query, DWORD flags) +static void wined3d_so_statistics_query_ops_poll_cs(void *object) { - struct wined3d_so_statistics_query *pq = wined3d_so_statistics_query_from_query(query); GLuint written_available, generated_available; - const struct wined3d_gl_info *gl_info; + struct wined3d_poll_callback_data *data = object; + struct wined3d_query *query = data->query; + struct wined3d_so_statistics_query *pq; struct wined3d_context_gl *context_gl; + const struct wined3d_gl_info *gl_info; + DWORD flags = data->flags; TRACE("query %p, flags %#x.\n", query, flags); + pq = wined3d_so_statistics_query_from_query(query); + if (!(context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { FIXME("%p Wrong thread, returning 0 primitives.\n", query); memset(&pq->statistics, 0, sizeof(pq->statistics)); - return TRUE; + data->result = TRUE; + return; } gl_info = context_gl->gl_info; @@ -794,7 +849,20 @@ static BOOL wined3d_so_statistics_query_ops_poll(struct wined3d_query *query, DW checkGLcall("poll SO statistics query"); context_release(&context_gl->c); - return written_available && generated_available; + data->result = written_available && generated_available; +} + +static BOOL wined3d_so_statistics_query_ops_poll(struct wined3d_query *query, DWORD flags) +{ + struct wined3d_cs *cs = query->device->cs; + struct wined3d_poll_callback_data data; + + data.query = query; + data.flags = flags; + + wined3d_cs_run_priority_callback(cs, wined3d_so_statistics_query_ops_poll_cs, &data); + + return data.result; } static void wined3d_so_statistics_query_end(struct wined3d_so_statistics_query *query, @@ -815,13 +883,12 @@ static void wined3d_so_statistics_query_end(struct wined3d_so_statistics_query * checkGLcall("end query"); } -static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, DWORD flags) +static void wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, DWORD flags) { struct wined3d_so_statistics_query *pq = wined3d_so_statistics_query_from_query(query); struct wined3d_device *device = query->device; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; - BOOL poll = FALSE; TRACE("query %p, flags %#x.\n", query, flags); @@ -878,7 +945,6 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D wined3d_so_statistics_query_end(pq, context_gl); context_release(&context_gl->c); - poll = TRUE; } else { @@ -887,25 +953,29 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D } pq->started = FALSE; } - - return poll; } -static BOOL wined3d_pipeline_query_ops_poll(struct wined3d_query *query, DWORD flags) +static void wined3d_pipeline_query_ops_poll_cs(void *object) { - struct wined3d_pipeline_statistics_query *pq = wined3d_pipeline_statistics_query_from_query(query); + struct wined3d_pipeline_statistics_query *pq; + struct wined3d_poll_callback_data *data = object; + struct wined3d_query *query = data->query; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; + DWORD flags = data->flags; GLuint available; int i; TRACE("query %p, flags %#x.\n", query, flags); + pq = wined3d_pipeline_statistics_query_from_query(query); + if (!(context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { FIXME("%p Wrong thread.\n", query); memset(&pq->statistics, 0, sizeof(pq->statistics)); - return TRUE; + data->result = TRUE; + return; } gl_info = context_gl->gl_info; @@ -933,7 +1003,20 @@ static BOOL wined3d_pipeline_query_ops_poll(struct wined3d_query *query, DWORD f checkGLcall("poll pipeline statistics query"); context_release(&context_gl->c); - return available; + data->result = available; +} + +static BOOL wined3d_pipeline_query_ops_poll(struct wined3d_query *query, DWORD flags) +{ + struct wined3d_cs *cs = query->device->cs; + struct wined3d_poll_callback_data data; + + data.query = query; + data.flags = flags; + + wined3d_cs_run_priority_callback(cs, wined3d_pipeline_query_ops_poll_cs, &data); + + return data.result; } static void wined3d_pipeline_statistics_query_end(struct wined3d_pipeline_statistics_query *query, @@ -955,13 +1038,12 @@ static void wined3d_pipeline_statistics_query_end(struct wined3d_pipeline_statis checkGLcall("end query"); } -static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD flags) +static void wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD flags) { struct wined3d_pipeline_statistics_query *pq = wined3d_pipeline_statistics_query_from_query(query); struct wined3d_device *device = query->device; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; - BOOL poll = FALSE; TRACE("query %p, flags %#x.\n", query, flags); @@ -1014,7 +1096,6 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD { wined3d_pipeline_statistics_query_end(pq, context_gl); context_release(&context_gl->c); - poll = TRUE; } else { @@ -1023,8 +1104,6 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD } pq->started = FALSE; } - - return poll; } static void wined3d_event_query_ops_destroy(struct wined3d_query *query) @@ -1612,10 +1691,15 @@ void wined3d_query_vk_suspend(struct wined3d_query_vk *query_vk, struct wined3d_ query_vk->flags &= ~WINED3D_QUERY_VK_FLAG_ACTIVE; } -static BOOL wined3d_query_vk_poll(struct wined3d_query *query, uint32_t flags) +static void wined3d_query_vk_poll_cs(void *object) { - struct wined3d_query_vk *query_vk = wined3d_query_vk(query); + struct wined3d_poll_callback_data *data = object; + struct wined3d_query *query = data->query; struct wined3d_context_vk *context_vk; + struct wined3d_query_vk *query_vk; + uint32_t flags = data->flags; + + query_vk = wined3d_query_vk(query); context_vk = wined3d_context_vk(context_acquire(query->device, NULL, 0)); @@ -1642,20 +1726,33 @@ static BOOL wined3d_query_vk_poll(struct wined3d_query *query, uint32_t flags) query_vk->pool_idx.pool_vk = NULL; context_release(&context_vk->c); - return TRUE; + data->result = TRUE; + return; unavailable: context_release(&context_vk->c); - return FALSE; + data->result = FALSE; } -static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) +static BOOL wined3d_query_vk_poll(struct wined3d_query *query, uint32_t flags) +{ + struct wined3d_cs *cs = query->device->cs; + struct wined3d_poll_callback_data data; + + data.query = query; + data.flags = flags; + + wined3d_cs_run_priority_callback(cs, wined3d_query_vk_poll_cs, &data); + + return data.result; +} + +static void wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) { struct wined3d_device_vk *device_vk = wined3d_device_vk(query->device); struct wined3d_query_vk *query_vk = wined3d_query_vk(query); struct wined3d_context_vk *context_vk; VkCommandBuffer vk_command_buffer; - bool poll = false; TRACE("query %p, flags %#x.\n", query, flags); @@ -1680,7 +1777,7 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) if (!wined3d_context_vk_allocate_query(context_vk, query_vk->q.type, &query_vk->pool_idx)) { ERR("Failed to allocate new query.\n"); - return false; + return; } /* A query needs to either begin and end inside a single render pass, @@ -1730,12 +1827,9 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) } list_remove(&query_vk->entry); query_vk->flags = 0; - poll = true; context_release(&context_vk->c); } - - return poll; } static void wined3d_query_vk_destroy(struct wined3d_query *query) @@ -1761,12 +1855,16 @@ static const struct wined3d_query_ops wined3d_query_vk_ops = .query_destroy = wined3d_query_vk_destroy, }; -static BOOL wined3d_query_event_vk_poll(struct wined3d_query *query, uint32_t flags) +static void wined3d_query_event_vk_poll_cs(void *object) { - struct wined3d_query_vk *query_vk = wined3d_query_vk(query); + struct wined3d_poll_callback_data *data = object; + struct wined3d_query *query = data->query; struct wined3d_context_vk *context_vk; + struct wined3d_query_vk *query_vk; + uint32_t flags = data->flags; BOOL *signalled; + query_vk = wined3d_query_vk(query); context_vk = wined3d_context_vk(context_acquire(query->device, NULL, 0)); signalled = (BOOL *)query->data; @@ -1775,7 +1873,8 @@ static BOOL wined3d_query_event_vk_poll(struct wined3d_query *query, uint32_t fl if (query_vk->command_buffer_id == context_vk->current_command_buffer.id) { context_release(&context_vk->c); - return *signalled = FALSE; + data->result = *signalled = FALSE; + return; } if (query_vk->command_buffer_id > context_vk->completed_command_buffer_id) @@ -1784,10 +1883,23 @@ static BOOL wined3d_query_event_vk_poll(struct wined3d_query *query, uint32_t fl context_release(&context_vk->c); - return *signalled; + data->result = *signalled; +} + +static BOOL wined3d_query_event_vk_poll(struct wined3d_query *query, uint32_t flags) +{ + struct wined3d_cs *cs = query->device->cs; + struct wined3d_poll_callback_data data; + + data.query = query; + data.flags = flags; + + wined3d_cs_run_priority_callback(cs, wined3d_query_event_vk_poll_cs, &data); + + return data.result; } -static BOOL wined3d_query_event_vk_issue(struct wined3d_query *query, uint32_t flags) +static void wined3d_query_event_vk_issue(struct wined3d_query *query, uint32_t flags) { struct wined3d_device_vk *device_vk = wined3d_device_vk(query->device); struct wined3d_query_vk *query_vk = wined3d_query_vk(query); @@ -1808,11 +1920,7 @@ static BOOL wined3d_query_event_vk_issue(struct wined3d_query *query, uint32_t f if (!context_vk->current_command_buffer.vk_command_buffer) --query_vk->command_buffer_id; context_release(&context_vk->c); - - return TRUE; } - - return FALSE; } static const struct wined3d_query_ops wined3d_query_event_vk_ops = @@ -1822,7 +1930,7 @@ static const struct wined3d_query_ops wined3d_query_event_vk_ops = .query_destroy = wined3d_query_vk_destroy, }; -static BOOL wined3d_query_timestamp_vk_issue(struct wined3d_query *query, uint32_t flags) +static void wined3d_query_timestamp_vk_issue(struct wined3d_query *query, uint32_t flags) { struct wined3d_device_vk *device_vk = wined3d_device_vk(query->device); struct wined3d_query_vk *query_vk = wined3d_query_vk(query); @@ -1846,18 +1954,14 @@ static BOOL wined3d_query_timestamp_vk_issue(struct wined3d_query *query, uint32 if (!wined3d_context_vk_allocate_query(context_vk, query_vk->q.type, &query_vk->pool_idx)) { ERR("Failed to allocate new query.\n"); - return FALSE; + return; } VK_CALL(vkCmdWriteTimestamp(command_buffer, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, query_vk->pool_idx.pool_vk->vk_query_pool, query_vk->pool_idx.idx)); wined3d_context_vk_reference_query(context_vk, query_vk); context_release(&context_vk->c); - - return TRUE; } - - return FALSE; } static const struct wined3d_query_ops wined3d_query_timestamp_vk_ops = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 79b02c2448d..6b885036260 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1952,7 +1952,7 @@ enum wined3d_query_state struct wined3d_query_ops { BOOL (*query_poll)(struct wined3d_query *query, DWORD flags); - BOOL (*query_issue)(struct wined3d_query *query, DWORD flags); + void (*query_issue)(struct wined3d_query *query, DWORD flags); void (*query_destroy)(struct wined3d_query *query); }; @@ -4823,7 +4823,6 @@ enum wined3d_push_constants WINED3D_PUSH_CONSTANTS_PS_B, }; -#define WINED3D_CS_QUERY_POLL_INTERVAL 10u #define WINED3D_CS_QUEUE_SIZE 0x100000u #define WINED3D_CS_SPIN_COUNT 10000000u @@ -4879,7 +4878,6 @@ struct wined3d_cs struct wined3d_cs_queue queue[WINED3D_CS_QUEUE_COUNT]; size_t data_size, start, end; void *data; - struct list query_poll_list; BOOL queries_flushed; HANDLE event; @@ -4920,6 +4918,8 @@ void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_init_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) DECLSPEC_HIDDEN; +void wined3d_cs_run_priority_callback(struct wined3d_cs *cs, void (*callback)(void *object), + void *object) DECLSPEC_HIDDEN; static inline void wined3d_cs_finish(struct wined3d_cs *cs, enum wined3d_cs_queue_id queue_id) { -- 2.32.0

2 8