wine-devel

wine-devel@winehq.org

5 participants
84473 discussions

[PATCH v3 1/2] ncrypt: Implement NCryptCreatePersistedKey.
by Santino Mazza 10 Mar '22

10 Mar '22

Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/ncrypt/main.c | 109 +++++++++++++++++++++++++++------- dlls/ncrypt/ncrypt_internal.h | 21 +++++++ dlls/ncrypt/tests/ncrypt.c | 8 ++- 3 files changed, 114 insertions(+), 24 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 8ace3e55731..1cc09cdfc97 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -30,14 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); -SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, - const WCHAR *algid, const WCHAR *name, DWORD keyspec, DWORD flags) -{ - FIXME("(%#Ix, %p, %s, %s, %#lx, %#lx): stub\n", provider, key, wine_dbgstr_w(algid), - wine_dbgstr_w(name), keyspec, flags); - return NTE_NOT_SUPPORTED; -} - SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD insize, void *padding, BYTE *output, DWORD outsize, DWORD *result, DWORD flags) { @@ -229,6 +221,45 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n return ERROR_SUCCESS; } +static struct object *create_key_object(enum algid algid, NCRYPT_PROV_HANDLE provider) +{ + struct object *key_object; + NTSTATUS ret; + + if (!(key_object = allocate_object(KEY))) + { + ERR("Error allocating memory\n"); + return NULL; + } + + switch(algid) + { + case RSA: + { + ret = BCryptOpenAlgorithmProvider(&key_object->key.bcrypt_alg, BCRYPT_RSA_ALGORITHM, NULL, 0); + if (ret != ERROR_SUCCESS) + { + ERR("Error opening algorithm provider\n"); + free(key_object); + return NULL; + } + + key_object->key.algid = RSA; + set_object_property(key_object, NCRYPT_ALGORITHM_GROUP_PROPERTY, (BYTE *)BCRYPT_RSA_ALGORITHM, sizeof(BCRYPT_RSA_ALGORITHM)); + break; + } + default: + { + ERR("Invalid algid %#x\n", algid); + free(key_object); + return NULL; + } + } + + set_object_property(key_object, NCRYPT_PROVIDER_HANDLE_PROPERTY, (BYTE *)&provider, sizeof(provider)); + return key_object; +} + SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE decrypt_key, const WCHAR *type, NCryptBufferDesc *params, NCRYPT_KEY_HANDLE *handle, BYTE *data, DWORD datasize, DWORD flags) @@ -259,12 +290,6 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H return NTE_BAD_FLAGS; } - if (!(object = allocate_object(KEY))) - { - ERR("Error allocating memory\n"); - return NTE_NO_MEMORY; - } - switch(header->Magic) { case BCRYPT_RSAFULLPRIVATE_MAGIC: @@ -273,13 +298,13 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H { NTSTATUS ret; BCRYPT_RSAKEY_BLOB *rsablob = (BCRYPT_RSAKEY_BLOB *)data; - ret = BCryptOpenAlgorithmProvider(&object->key.bcrypt_alg, BCRYPT_RSA_ALGORITHM, NULL, 0); - if (ret != ERROR_SUCCESS) + + if (!(object = create_key_object(RSA, provider))) { - ERR("Error opening algorithm provider\n"); - free(object); - return NTE_INTERNAL_ERROR; + ERR("Error allocating memory\n"); + return NTE_NO_MEMORY; } + ret = BCryptImportKeyPair(object->key.bcrypt_alg, NULL, type, &object->key.bcrypt_key, data, datasize, 0); if (ret != ERROR_SUCCESS) { @@ -289,14 +314,11 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H return NTE_BAD_DATA; } - set_object_property(object, NCRYPT_PROVIDER_HANDLE_PROPERTY, (BYTE *)&provider, sizeof(provider)); - set_object_property(object, NCRYPT_ALGORITHM_GROUP_PROPERTY, (BYTE *)BCRYPT_RSA_ALGORITHM, sizeof(BCRYPT_RSA_ALGORITHM)); set_object_property(object, NCRYPT_LENGTH_PROPERTY, (BYTE *)&rsablob->BitLength, sizeof(rsablob->BitLength)); break; } default: FIXME("Unhandled key magic %#lx\n", header->Magic); - free(object); return NTE_INVALID_PARAMETER; } @@ -304,6 +326,49 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H return ERROR_SUCCESS; } +SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, + const WCHAR *algid, const WCHAR *name, DWORD keyspec, DWORD flags) +{ + struct object *key_object; + TRACE("(%#Ix, %p, %s, %s, %#lx, %#lx)\n", provider, key, wine_dbgstr_w(algid), + wine_dbgstr_w(name), keyspec, flags); + + if (!provider) return NTE_INVALID_HANDLE; + if (!algid) return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER); + if (name) FIXME("Persistant keys not supported\n"); + + if (!lstrcmpiW(algid, BCRYPT_RSA_ALGORITHM)) + { + NTSTATUS ret; + DWORD default_bitlength = 1024; + + if (!(key_object = create_key_object(RSA, provider))) + { + ERR("Error allocating memory\n"); + return NTE_NO_MEMORY; + } + + ret = BCryptGenerateKeyPair(key_object->key.bcrypt_alg, &key_object->key.bcrypt_key, 1024, 0); + if (ret != ERROR_SUCCESS) + { + ERR("Error generating key pair\n"); + BCryptCloseAlgorithmProvider(key_object->key.bcrypt_alg, 0); + free(key_object); + return NTE_INTERNAL_ERROR; + } + + set_object_property(key_object, NCRYPT_LENGTH_PROPERTY, (BYTE *)&default_bitlength, sizeof(default_bitlength)); + } + else + { + FIXME("Algorithm not handled %s\n", wine_dbgstr_w(algid)); + return NTE_NOT_SUPPORTED; + } + + *key = (NCRYPT_KEY_HANDLE)key_object; + return ERROR_SUCCESS; +} + SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const WCHAR *algid, DWORD flags) { FIXME("(%#Ix, %s, %#lx): stub\n", provider, wine_dbgstr_w(algid), flags); diff --git a/dlls/ncrypt/ncrypt_internal.h b/dlls/ncrypt/ncrypt_internal.h index e5884c8871a..fb4dcd290b6 100644 --- a/dlls/ncrypt/ncrypt_internal.h +++ b/dlls/ncrypt/ncrypt_internal.h @@ -18,8 +18,29 @@ #include <bcrypt.h> +enum algid +{ + AES, + DES, + DESX, + DH, + DSA, + ECDH, + ECDH_P256, + ECDH_P384, + ECDH_P521, + ECDSA, + ECDSA_P256, + ECDSA_P384, + ECDSA_P521, + RC2, + RSA, + PBKDF2, +}; + struct key { + enum algid algid; BCRYPT_ALG_HANDLE bcrypt_alg; BCRYPT_KEY_HANDLE bcrypt_key; }; diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index cf434054428..ec69b236ac9 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -229,6 +229,7 @@ static void test_set_property(void) { ret = NCryptSetProperty(key, NCRYPT_NAME_PROPERTY, (BYTE *)L"Key name", sizeof(L"Key name"), 0); ok(ret == NTE_NOT_SUPPORTED, "got %#lx\n", ret); + } NCryptFreeObject(key); key = 0; @@ -240,6 +241,8 @@ static void test_set_property(void) ret = NCryptSetProperty(key, NCRYPT_LENGTH_PROPERTY, (BYTE *)&keylength, sizeof(keylength), 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + todo_wine + { ret = NCryptSetProperty(key, NCRYPT_NAME_PROPERTY, (BYTE *)L"Key name", sizeof(L"Key name"), 0); ok(ret == NTE_NOT_SUPPORTED, "got %#lx\n", ret); @@ -261,7 +264,6 @@ static void test_create_persisted_key(void) ret = NCryptOpenStorageProvider(&prov, NULL, 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); - todo_wine { key = 0; ret = NCryptCreatePersistedKey(0, &key, BCRYPT_RSA_ALGORITHM, NULL, 0, 0); ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); @@ -292,14 +294,16 @@ static void test_create_persisted_key(void) NCryptFinalizeKey(key, 0); NCryptFreeObject(key); + todo_wine + { key = 0; ret = NCryptCreatePersistedKey(prov, &key, BCRYPT_AES_ALGORITHM, NULL, 0, 0); ok(ret == ERROR_SUCCESS || broken(ret == NTE_NOT_SUPPORTED) /* win 7 */, "got %#lx\n", ret); if (ret == NTE_NOT_SUPPORTED) win_skip("broken, symmetric keys not supported.\n"); else ok(key, "got null handle\n"); + } NCryptFreeObject(prov); - } } START_TEST(ncrypt) -- 2.32.0

1 1

[PATCH] winegstreamer: Deliver samples in PTS order instead of alternating.
by Zebediah Figura 10 Mar '22

10 Mar '22

For the async reader, and when requesting stream 0. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gst_private.h | 4 +- dlls/winegstreamer/wm_asyncreader.c | 97 +++++++++++++---------------- dlls/winegstreamer/wm_reader.c | 97 ++++++++++++++++++++++++----- dlls/winegstreamer/wm_syncreader.c | 57 +++-------------- 4 files changed, 137 insertions(+), 118 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 2cbba09f9a7..a3f8c0ab5eb 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -180,8 +180,8 @@ HRESULT wm_reader_get_output_props(struct wm_reader *reader, DWORD output, IWMOutputMediaProps **props); struct wm_stream *wm_reader_get_stream_by_stream_number(struct wm_reader *reader, WORD stream_number); -HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, - INSSBuffer **sample, QWORD *pts, QWORD *duration, DWORD *flags); +HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream_number, + INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags, WORD *ret_stream_number); HRESULT wm_reader_get_stream_selection(struct wm_reader *reader, WORD stream_number, WMT_STREAM_SELECTION *selection); void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops); diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 9dfe2380284..947b3307a3a 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -72,11 +72,11 @@ static void open_stream(struct async_reader *reader, IWMReaderCallback *callback static DWORD WINAPI stream_thread(void *arg) { struct async_reader *reader = arg; - WORD i, stream_count = reader->reader.stream_count; IWMReaderCallback *callback = reader->callback; REFERENCE_TIME start_time; static const DWORD zero; QWORD pts, duration; + WORD stream_number; INSSBuffer *sample; DWORD flags; HRESULT hr; @@ -87,71 +87,56 @@ static DWORD WINAPI stream_thread(void *arg) while (reader->running) { - bool all_eos = true; + hr = wm_reader_get_stream_sample(&reader->reader, 0, &sample, &pts, &duration, &flags, &stream_number); - for (i = 0; i < stream_count; ++i) + if (hr == S_OK) { - struct wm_stream *stream = &reader->reader.streams[i]; + struct wm_stream *stream = wm_reader_get_stream_by_stream_number(&reader->reader, stream_number); - if (stream->selection == WMT_OFF) - continue; - - hr = wm_reader_get_stream_sample(stream, &sample, &pts, &duration, &flags); - if (hr == S_OK) + if (reader->user_clock) { - if (reader->user_clock) - { - QWORD user_time = reader->user_time; + QWORD user_time = reader->user_time; + + if (pts > user_time && reader->reader.callback_advanced) + IWMReaderCallbackAdvanced_OnTime(reader->reader.callback_advanced, user_time, reader->context); + while (pts > reader->user_time && reader->running) + SleepConditionVariableCS(&reader->stream_cv, &reader->stream_cs, INFINITE); + if (!reader->running) + { + INSSBuffer_Release(sample); + goto out; + } + } + else + { + for (;;) + { + REFERENCE_TIME current_time = get_current_time(reader); + + if (pts <= current_time - start_time) + break; + + SleepConditionVariableCS(&reader->stream_cv, &reader->stream_cs, + (pts - (current_time - start_time)) / 10000); - if (pts > user_time && reader->reader.callback_advanced) - IWMReaderCallbackAdvanced_OnTime(reader->reader.callback_advanced, user_time, reader->context); - while (pts > reader->user_time && reader->running) - SleepConditionVariableCS(&reader->stream_cv, &reader->stream_cs, INFINITE); if (!reader->running) { INSSBuffer_Release(sample); goto out; } } - else - { - for (;;) - { - REFERENCE_TIME current_time = get_current_time(reader); - - if (pts <= current_time - start_time) - break; - - SleepConditionVariableCS(&reader->stream_cv, &reader->stream_cs, - (pts - (current_time - start_time)) / 10000); - - if (!reader->running) - { - INSSBuffer_Release(sample); - goto out; - } - } - } - - if (stream->read_compressed) - hr = IWMReaderCallbackAdvanced_OnStreamSample(reader->reader.callback_advanced, - i + 1, pts, duration, flags, sample, reader->context); - else - hr = IWMReaderCallback_OnSample(callback, i, pts, duration, - flags, sample, reader->context); - TRACE("Callback returned %#lx.\n", hr); - INSSBuffer_Release(sample); - all_eos = false; - } - else if (hr != NS_E_NO_MORE_SAMPLES) - { - ERR("Failed to get sample, hr %#lx.\n", hr); - LeaveCriticalSection(&reader->stream_cs); - return 0; } + + if (stream->read_compressed) + hr = IWMReaderCallbackAdvanced_OnStreamSample(reader->reader.callback_advanced, + stream_number, pts, duration, flags, sample, reader->context); + else + hr = IWMReaderCallback_OnSample(callback, stream_number - 1, pts, duration, + flags, sample, reader->context); + TRACE("Callback returned %#lx.\n", hr); + INSSBuffer_Release(sample); } - - if (all_eos) + else if (hr == NS_E_NO_MORE_SAMPLES) { IWMReaderCallback_OnStatus(callback, WMT_END_OF_STREAMING, S_OK, WMT_TYPE_DWORD, (BYTE *)&zero, reader->context); @@ -171,6 +156,12 @@ static DWORD WINAPI stream_thread(void *arg) LeaveCriticalSection(&reader->stream_cs); return 0; } + else + { + ERR("Failed to get sample, hr %#lx.\n", hr); + LeaveCriticalSection(&reader->stream_cs); + return 0; + } } out: diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index bfed0d1e0ca..c911cb59d1f 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1820,30 +1820,98 @@ static const char *get_major_type_string(enum wg_major_type type) return NULL; } -HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, - INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags) +/* Find the earliest buffer by PTS. + * + * Native seems to behave similarly to this with the async reader, although our + * unit tests show that it's not entirely consistent—some frames are received + * slightly out of order. It's possible that one stream is being manually offset + * to account for decoding latency. + * + * The behaviour with the synchronous reader, when stream 0 is requested, seems + * consistent with this hypothesis, but with a much larger offset—the video + * stream seems to be "behind" by about 150 ms. + * + * The main reason for doing this is that the video and audio stream probably + * don't have quite the same "frame rate", and we don't want to force one stream + * to decode faster just to keep up with the other. Delivering samples in PTS + * order should avoid that problem. */ +static WORD get_earliest_buffer(struct wm_reader *reader, struct wg_parser_buffer *ret_buffer) { - IWMReaderCallbackAdvanced *callback_advanced = stream->reader->callback_advanced; - struct wg_parser_stream *wg_stream = stream->wg_stream; + struct wg_parser_buffer buffer; + QWORD earliest_pts = UI64_MAX; + WORD stream_number = 0; + WORD i; + + for (i = 0; i < reader->stream_count; ++i) + { + struct wm_stream *stream = &reader->streams[i]; + + if (stream->selection == WMT_OFF) + continue; + + if (!wg_parser_stream_get_buffer(stream->wg_stream, &buffer)) + continue; + + if (buffer.has_pts && buffer.pts < earliest_pts) + { + stream_number = i + 1; + earliest_pts = buffer.pts; + *ret_buffer = buffer; + } + } + + return stream_number; +} + +HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream_number, + INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags, WORD *ret_stream_number) +{ + IWMReaderCallbackAdvanced *callback_advanced = reader->callback_advanced; + struct wg_parser_stream *wg_stream; struct wg_parser_buffer wg_buffer; + struct wm_stream *stream; DWORD size, capacity; INSSBuffer *sample; HRESULT hr; BYTE *data; - if (stream->selection == WMT_OFF) - return NS_E_INVALID_REQUEST; - - if (stream->eos) - return NS_E_NO_MORE_SAMPLES; - for (;;) { - if (!wg_parser_stream_get_buffer(wg_stream, &wg_buffer)) + if (!stream_number) { - stream->eos = true; - TRACE("End of stream.\n"); - return NS_E_NO_MORE_SAMPLES; + if (!(stream_number = get_earliest_buffer(reader, &wg_buffer))) + { + /* All streams are disabled or EOS. */ + return NS_E_NO_MORE_SAMPLES; + } + + stream = wm_reader_get_stream_by_stream_number(reader, stream_number); + wg_stream = stream->wg_stream; + } + else + { + if (!(stream = wm_reader_get_stream_by_stream_number(reader, stream_number))) + { + WARN("Invalid stream number %u; returning E_INVALIDARG.\n", stream_number); + return E_INVALIDARG; + } + wg_stream = stream->wg_stream; + + if (stream->selection == WMT_OFF) + { + WARN("Stream %u is deselected; returning NS_E_INVALID_REQUEST.\n", stream_number); + return NS_E_INVALID_REQUEST; + } + + if (stream->eos) + return NS_E_NO_MORE_SAMPLES; + + if (!wg_parser_stream_get_buffer(wg_stream, &wg_buffer)) + { + stream->eos = true; + TRACE("End of stream.\n"); + return NS_E_NO_MORE_SAMPLES; + } } TRACE("Got buffer for '%s' stream %p.\n", get_major_type_string(stream->format.major_type), stream); @@ -1920,6 +1988,7 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, *flags |= WM_SF_CLEANPOINT; *ret_sample = sample; + *ret_stream_number = stream_number; return S_OK; } } diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index 55940e2b370..c7cccd52c4f 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -25,8 +25,6 @@ struct sync_reader struct wm_reader reader; IWMSyncReader2 IWMSyncReader2_iface; - - WORD last_read_stream; }; static struct sync_reader *impl_from_IWMSyncReader2(IWMSyncReader2 *iface) @@ -84,60 +82,21 @@ static HRESULT WINAPI WMSyncReader_GetNextSample(IWMSyncReader2 *iface, { struct sync_reader *reader = impl_from_IWMSyncReader2(iface); HRESULT hr = NS_E_NO_MORE_SAMPLES; - struct wm_stream *stream; - WORD i; TRACE("reader %p, stream_number %u, sample %p, pts %p, duration %p," " flags %p, output_number %p, ret_stream_number %p.\n", reader, stream_number, sample, pts, duration, flags, output_number, ret_stream_number); + if (!stream_number && !output_number && !ret_stream_number) + return E_INVALIDARG; + EnterCriticalSection(&reader->reader.cs); - if (!stream_number) - { - if (!output_number && !ret_stream_number) - { - LeaveCriticalSection(&reader->reader.cs); - return E_INVALIDARG; - } - - for (i = 0; i < reader->reader.stream_count; ++i) - { - WORD index = (i + reader->last_read_stream + 1) % reader->reader.stream_count; - struct wm_stream *stream = &reader->reader.streams[index]; - - if (stream->selection == WMT_OFF) - continue; - - hr = wm_reader_get_stream_sample(stream, sample, pts, duration, flags); - if (hr == S_OK) - { - if (output_number) - *output_number = index; - if (ret_stream_number) - *ret_stream_number = index + 1; - } - if (hr != NS_E_NO_MORE_SAMPLES) - { - reader->last_read_stream = index; - break; - } - } - } - else - { - if (!(stream = wm_reader_get_stream_by_stream_number(&reader->reader, stream_number))) - { - LeaveCriticalSection(&reader->reader.cs); - return E_INVALIDARG; - } - - hr = wm_reader_get_stream_sample(stream, sample, pts, duration, flags); - if (hr == S_OK && output_number) - *output_number = stream->index; - if (ret_stream_number) - *ret_stream_number = stream->index + 1; - } + hr = wm_reader_get_stream_sample(&reader->reader, stream_number, sample, pts, duration, flags, &stream_number); + if (output_number && hr == S_OK) + *output_number = stream_number - 1; + if (ret_stream_number && (hr == S_OK || stream_number)) + *ret_stream_number = stream_number; LeaveCriticalSection(&reader->reader.cs); return hr; -- 2.35.1

1 0

[PATCH v4 1/3] winevulkan: Avoid zero-sized allocations.
by Georg Lehmann 09 Mar '22

09 Mar '22

Fixes some -Wmaybe-uninitialized warnings in the next patch. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index c609bbfd151..1d796289615 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2150,7 +2150,7 @@ class ConversionFunction(object): body += "#endif /* USE_STRUCT_CONVERSION */\n" body += " unsigned int i;\n\n" - body += " if (!in) return NULL;\n\n" + body += " if (!in || !count) return NULL;\n\n" body += " out = malloc(count * sizeof(*out));\n" -- 2.35.1

1 2

[PATCH v3 1/2] winevulkan: Manually fixup struct alignment for VkPipelineCreationFeedback.
by Georg Lehmann 09 Mar '22

09 Mar '22

We can't reasonably auto generate this because it's output in an otherwise input pNext chain. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 8 +++ dlls/winevulkan/vulkan.c | 107 ++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index c609bbfd151..2f3d647ef9b 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -205,6 +205,8 @@ FUNCTION_OVERRIDES = { # Device functions "vkAllocateCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, "vkCreateCommandPool" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkCreateComputePipelines" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, + "vkCreateGraphicsPipelines" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, "vkDestroyCommandPool" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, "vkDestroyDevice" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, "vkFreeCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, @@ -250,6 +252,9 @@ FUNCTION_OVERRIDES = { "vkGetDeviceGroupSurfacePresentModesKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, "vkGetPhysicalDevicePresentRectanglesKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, + # VK_KHR_ray_tracing_pipeline + "vkCreateRayTracingPipelinesKHR" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, + # VK_EXT_calibrated_timestamps "vkGetPhysicalDeviceCalibrateableTimeDomainsEXT" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, "vkGetCalibratedTimestampsEXT" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, @@ -261,6 +266,9 @@ FUNCTION_OVERRIDES = { # VK_EXT_debug_report "vkCreateDebugReportCallbackEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, "vkDestroyDebugReportCallbackEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, + + # VK_NV_ray_tracing + "vkCreateRayTracingPipelinesNV" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, } STRUCT_CHAIN_CONVERSIONS = { diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 19cc999433b..190f70f3616 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1758,6 +1758,113 @@ NTSTATUS wine_vkDestroyDebugReportCallbackEXT(void *args) return STATUS_SUCCESS; } +static void fixup_pipeline_feedback(VkPipelineCreationFeedback *feedback, uint32_t count) +{ +#if defined(USE_STRUCT_CONVERSION) + struct host_pipeline_feedback + { + VkPipelineCreationFeedbackFlags flags; + uint64_t duration; + } *host_feedback; + int64_t i; + + host_feedback = (void *) feedback; + + for (i = count - 1; i >= 0; i--) + { + memmove(&feedback[i].duration, &host_feedback[i].duration, sizeof(uint64_t)); + feedback[i].flags = host_feedback[i].flags; + } +#endif +} + +static void fixup_pipeline_feedback_info(const void *pipeline_info) +{ + VkPipelineCreationFeedbackCreateInfo *feedback; + + feedback = wine_vk_find_struct(pipeline_info, PIPELINE_CREATION_FEEDBACK_CREATE_INFO); + + if (!feedback) + return; + + fixup_pipeline_feedback(feedback->pPipelineCreationFeedback, 1); + fixup_pipeline_feedback(feedback->pPipelineStageCreationFeedbacks, + feedback->pipelineStageCreationFeedbackCount); +} + +NTSTATUS wine_vkCreateComputePipelines(void *args) +{ + struct vkCreateComputePipelines_params *params = args; + VkResult res; + uint32_t i; + + TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + res = thunk_vkCreateComputePipelines(params->device, params->pipelineCache, + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + for (i = 0; i < params->createInfoCount; i++) + fixup_pipeline_feedback_info(&params->pCreateInfos[i]); + + return res; +} + +NTSTATUS wine_vkCreateGraphicsPipelines(void *args) +{ + struct vkCreateGraphicsPipelines_params *params = args; + VkResult res; + uint32_t i; + + TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + res = thunk_vkCreateGraphicsPipelines(params->device, params->pipelineCache, + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + for (i = 0; i < params->createInfoCount; i++) + fixup_pipeline_feedback_info(&params->pCreateInfos[i]); + + return res; +} + +NTSTATUS wine_vkCreateRayTracingPipelinesKHR(void *args) +{ + struct vkCreateRayTracingPipelinesKHR_params *params = args; + VkResult res; + uint32_t i; + + TRACE("%p, 0x%s, 0x%s, %u, %p, %p, %p\n", params->device, + wine_dbgstr_longlong(params->deferredOperation), wine_dbgstr_longlong(params->pipelineCache), + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + res = thunk_vkCreateRayTracingPipelinesKHR(params->device, params->deferredOperation, params->pipelineCache, + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + for (i = 0; i < params->createInfoCount; i++) + fixup_pipeline_feedback_info(&params->pCreateInfos[i]); + + return res; +} + +NTSTATUS wine_vkCreateRayTracingPipelinesNV(void *args) +{ + struct vkCreateRayTracingPipelinesNV_params *params = args; + VkResult res; + uint32_t i; + + TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + res = thunk_vkCreateRayTracingPipelinesNV(params->device, params->pipelineCache, + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + for (i = 0; i < params->createInfoCount; i++) + fixup_pipeline_feedback_info(&params->pCreateInfos[i]); + + return res; +} + BOOL WINAPI wine_vk_is_available_instance_function(VkInstance instance, const char *name) { return !!vk_funcs->p_vkGetInstanceProcAddr(instance->instance, name); -- 2.35.1

2 2

[tools] testbot/cgi: Move saving items to ItemPage::Save().
by Francois Gouget 09 Mar '22

09 Mar '22

A FormPage has no Collection field and no concept of what an Item object is so it should not be trying to save items. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 5 +---- testbot/lib/ObjectModel/CGI/ItemPage.pm | 10 ++++++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 9ea7f0f5b2..3ac62239d5 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -388,10 +388,7 @@ sub Save($) { my ($self) = @_; - return !1 if (!$self->SaveProperties()); - - (my $_ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); - return ! defined($self->{ErrMessage}); + return $self->SaveProperties(); } sub OnAction($$) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 3dab64cf71..940115475f 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -134,6 +134,16 @@ sub SaveProperty($$$) return 1; } +sub Save($) +{ + my ($self) = @_; + + return !1 if (!$self->SUPER::Save()); + + (my $_ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); + return !defined $self->{ErrMessage}; +} + sub OnAction($$) { my ($self, $Action) = @_; -- 2.30.2

1 0

[tools] testbot/web: Explicitly call exit on return from Redirect().
by Francois Gouget 09 Mar '22

09 Mar '22

Having Redirect() call exit() itself is confusing and requires documenting that it does not return in each call point and/or adding a defensive exit() call anyway. Using the exit(Redirect(...)) construct is more explicit, concise and robust. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 18 +++++++----------- testbot/lib/ObjectModel/CGI/ItemPage.pm | 10 ++++------ testbot/lib/ObjectModel/CGI/Page.pm | 2 +- testbot/lib/WineTestBot/CGI/PageBase.pm | 6 +++--- testbot/web/JobDetails.pl | 8 +++----- testbot/web/Login.pl | 3 +-- testbot/web/Submit.pl | 13 +++---------- testbot/web/admin/Log.pl | 4 ++-- testbot/web/admin/SpecialJobs.pl | 3 +-- testbot/web/admin/SpecialJobs2.pl | 3 +-- testbot/web/admin/UserDetails.pl | 9 +++------ 11 files changed, 29 insertions(+), 50 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index a5e8187009..9027b87758 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -539,20 +539,16 @@ sub OnAction($$) "=" . uri_escape($MasterColValues->[$ColIndex]); } } - $self->{EnclosingPage}->Redirect($Target); - return 1; + exit($self->{EnclosingPage}->Redirect($Target)); } - else + + my $Ok = 1; + foreach my $Key (@{$self->{Collection}->GetKeys()}) { - my $Ok = 1; - foreach my $Key (@{$self->{Collection}->GetKeys()}) + if (defined $self->{EnclosingPage}->GetParam($self->SelName($Key)) && $Ok) { - if (defined($self->{EnclosingPage}->GetParam($self->SelName($Key))) && - $Ok) - { - my $Item = $self->{Collection}->GetItem($Key); - $Ok = $self->CallOnItemAction($Item, $Action); - } + my $Item = $self->{Collection}->GetItem($Key); + $Ok = $self->CallOnItemAction($Item, $Action); } } } diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 9b9f2ff7e5..3dab64cf71 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -141,13 +141,11 @@ sub OnAction($$) if ($Action eq "OK") { return !1 if (!$self->Save()); - $self->RedirectToList(); - exit; + exit($self->RedirectToList()); } - elsif ($Action eq "Cancel") + if ($Action eq "Cancel") { - $self->RedirectToList(); - exit; + exit($self->RedirectToList()); } return $self->SUPER::OnAction($Action); @@ -167,7 +165,7 @@ sub RedirectToList($) "=" . url_escape($MasterColValues->[$ColIndex]); } } - $self->Redirect($Target); # does not return + return $self->Redirect($Target); } 1; diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 8abaaaa9d2..b0450d0e78 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -246,7 +246,7 @@ sub Redirect($$) { my ($self, $Location) = @_; - $self->{PageBase}->Redirect($self, $Location); + return $self->{PageBase}->Redirect($self, $Location); } sub GetCurrentSession($) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index d38e8d96b6..b7edd8fcaa 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -56,7 +56,7 @@ sub new($$$$@) ! $Session->User->HasRole($RequiredRole)) { my $LoginURL = "/Login.pl?Target=" . uri_escape($ENV{"REQUEST_URI"}); - $self->Redirect($Page, MakeSecureURL($LoginURL)); + exit($self->Redirect($Page, MakeSecureURL($LoginURL))); } } @@ -75,7 +75,7 @@ sub CheckSecurePage($$) if ($UseSSL && ! SecureConnection()) { - $self->Redirect($Page, MakeSecureURL($ENV{"REQUEST_URI"})); + exit($self->Redirect($Page, MakeSecureURL($ENV{"REQUEST_URI"}))); } } @@ -415,7 +415,7 @@ sub Redirect($$$) } $self->{Request}->headers_out->set("Location", $Location); $self->{Request}->status(Apache2::Const::REDIRECT); - exit; + return 0; # a suitable exit code } sub GetCurrentSession($) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 919c7a5e3b..8d93957ce6 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -52,7 +52,7 @@ sub _initialize($$$) $self->{Job} = CreateJobs()->GetItem($JobId); if (!defined $self->{Job}) { - $self->Redirect("/"); # does not return + exit($self->Redirect("/")); } $self->{JobId} = $JobId; @@ -193,8 +193,7 @@ sub OnCancel($) return !1; } - $self->Redirect("/JobDetails.pl?Key=" . $self->{JobId}); # does not return - exit; + exit($self->Redirect("/JobDetails.pl?Key=" . $self->{JobId})); } sub OnRestart($) @@ -215,8 +214,7 @@ sub OnRestart($) return !1; } - $self->Redirect("/JobDetails.pl?Key=" . $self->{JobId}); # does not return - exit; + exit($self->Redirect("/JobDetails.pl?Key=" . $self->{JobId})); } sub OnAction($$$) diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index d9757edb92..ac64fc28ea 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -135,8 +135,7 @@ sub OnLogIn($) { $Target = "/"; } - $self->Redirect(MakeSecureURL($Target)); # does not return - exit; + exit($self->Redirect(MakeSecureURL($Target))); } sub OnAction($$) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 98d13381e0..79d1c8772d 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -1265,8 +1265,7 @@ sub _SubmitJob($$) return undef; } - $self->Redirect("/JobDetails.pl?Key=". $NewJob->GetKey()); # does not return - exit; + exit($self->Redirect("/JobDetails.pl?Key=". $NewJob->GetKey())); } sub OnSubmit($) @@ -1323,14 +1322,8 @@ sub OnOK($) { my ($self) = @_; - if (defined $self->{JobKey}) - { - $self->Redirect("/JobDetails.pl?Key=$self->{JobKey}"); # does not return - } - else - { - $self->Redirect("/"); # does not return - } + my $Target = defined $self->{JobKey} ? "/JobDetails.pl?Key=$self->{JobKey}" : "/"; + exit($self->Redirect($Target)); } sub OnAction($$) diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl index cb253bd03e..456e73f55d 100644 --- a/testbot/web/admin/Log.pl +++ b/testbot/web/admin/Log.pl @@ -71,8 +71,8 @@ sub GetActions($) sub OnDownload($) { my ($self) = @_; - $self->Redirect("/admin/SendLog.pl?Hours=". $self->GetParam("Hours")); # does not return - exit; + + exit($self->Redirect("/admin/SendLog.pl?Hours=". $self->GetParam("Hours"))); } sub OnAction($$) diff --git a/testbot/web/admin/SpecialJobs.pl b/testbot/web/admin/SpecialJobs.pl index 534336c483..02d9f8ea9d 100644 --- a/testbot/web/admin/SpecialJobs.pl +++ b/testbot/web/admin/SpecialJobs.pl @@ -237,8 +237,7 @@ sub OnSubmit($) return undef; } - $self->Redirect("/"); # does not return - exit; + exit($self->Redirect("/")); } sub OnAction($$) diff --git a/testbot/web/admin/SpecialJobs2.pl b/testbot/web/admin/SpecialJobs2.pl index c5a8f6587f..3fa5ab11bb 100644 --- a/testbot/web/admin/SpecialJobs2.pl +++ b/testbot/web/admin/SpecialJobs2.pl @@ -240,8 +240,7 @@ sub OnSubmit($) return undef; } - $self->Redirect("/"); # does not return - exit; + exit($self->Redirect("/")); } sub OnAction($$) diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index 2cf0f597fb..8c26930e8e 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -74,8 +74,7 @@ sub OnApprove($) return !1 if (!$self->Save()); $self->{ErrMessage} = $self->{Item}->Approve(); return !1 if (defined $self->{ErrMessage}); - $self->RedirectToList(); # does not return - exit; + exit($self->RedirectToList()); } sub OnReject($) @@ -87,8 +86,7 @@ sub OnReject($) return !1 if (defined $self->{ErrMessage}); # Forcefully log out that user by deleting his web sessions DeleteSessions($self->{Item}); - $self->RedirectToList(); # does not return - exit; + exit($self->RedirectToList()); } sub OnOK($) @@ -101,8 +99,7 @@ sub OnOK($) # Forcefully log out that user by deleting his web sessions DeleteSessions($self->{Item}); } - $self->RedirectToList(); # does not return - exit; + exit($self->RedirectToList()); } sub OnAction($$) -- 2.30.2

1 0

[PATCH 1/7] ws2_32: Manage shorter length for SO_KEEPALIVE.
by Paul Gofman 09 Mar '22

09 Mar '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/socket.c | 14 +++++++++++++- dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 31e8be5b6b0..1a0d28c484e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1525,6 +1525,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_ERROR, optval, optlen ); case SO_KEEPALIVE: + if (*optlen < 1 || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + *optlen = 1; return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_KEEPALIVE, optval, optlen ); case SO_LINGER: @@ -2827,7 +2833,13 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return -1; case SO_KEEPALIVE: - return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_KEEPALIVE, optval, optlen ); + if (optlen <= 0 || !optval) + { + SetLastError( optlen ? WSAENOBUFS : WSAEFAULT ); + return SOCKET_ERROR; + } + value = *optval; + return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_KEEPALIVE, (char *)&value, sizeof(value) ); case SO_LINGER: return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_LINGER, optval, optlen ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3da68b0e4a8..a6505134d44 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1171,6 +1171,7 @@ static void test_set_getsockopt(void) { {AF_INET, SOCK_DGRAM, SOL_SOCKET, SO_BROADCAST, TRUE, {1, 1, 4}, {0, 0xdead0001, 0}, TRUE, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_DONTLINGER, TRUE, {1, 1, 4}, {0, 0xdead0001, 0}, TRUE, TRUE}, + {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_KEEPALIVE, TRUE, {1, 1, 1}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_DONTROUTE, TRUE, {1, 1, 1}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_RCVTIMEO, FALSE, {1, 2, 4}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDTIMEO, FALSE, {1, 2, 4}, {0}, TRUE}, -- 2.35.1

3 15

[PATCH 4/4] winealsa: Move release_capture_buffer to the unixlib.
by Huw Davies 09 Mar '22

09 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 29 +++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 31 +++++-------------------------- dlls/winealsa.drv/unixlib.h | 8 ++++++++ 3 files changed, 42 insertions(+), 26 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 60ef49c4c1a..02063fd3374 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1752,6 +1752,34 @@ static NTSTATUS get_capture_buffer(void *args) return alsa_unlock_result(stream, &params->result, *frames ? S_OK : AUDCLNT_S_BUFFER_EMPTY); } +static NTSTATUS release_capture_buffer(void *args) +{ + struct release_capture_buffer_params *params = args; + struct alsa_stream *stream = params->stream; + UINT32 done = params->done; + + alsa_lock(stream); + + if(!done){ + stream->getbuf_last = 0; + return alsa_unlock_result(stream, &params->result, S_OK); + } + + if(!stream->getbuf_last) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_OUT_OF_ORDER); + + if(stream->getbuf_last != done) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_INVALID_SIZE); + + stream->written_frames += done; + stream->held_frames -= done; + stream->lcl_offs_frames += done; + stream->lcl_offs_frames %= stream->bufsize_frames; + stream->getbuf_last = 0; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -2086,6 +2114,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_render_buffer, release_render_buffer, get_capture_buffer, + release_capture_buffer, is_format_supported, get_mix_format, get_buffer_size, diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index cecb358bab7..b50025aa77c 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1398,37 +1398,16 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( IAudioCaptureClient *iface, UINT32 done) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct alsa_stream *stream = This->stream; + struct release_capture_buffer_params params; TRACE("(%p)->(%u)\n", This, done); - alsa_lock(stream); - - if(!done){ - stream->getbuf_last = 0; - alsa_unlock(stream); - return S_OK; - } - - if(!stream->getbuf_last){ - alsa_unlock(stream); - return AUDCLNT_E_OUT_OF_ORDER; - } - - if(stream->getbuf_last != done){ - alsa_unlock(stream); - return AUDCLNT_E_INVALID_SIZE; - } + params.stream = This->stream; + params.done = done; - stream->written_frames += done; - stream->held_frames -= done; - stream->lcl_offs_frames += done; - stream->lcl_offs_frames %= stream->bufsize_frames; - stream->getbuf_last = 0; + ALSA_CALL(release_capture_buffer, &params); - alsa_unlock(stream); - - return S_OK; + return params.result; } static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index c4efe5ad764..ddca1a3100c 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -141,6 +141,13 @@ struct get_capture_buffer_params UINT64 *qpcpos; }; +struct release_capture_buffer_params +{ + struct alsa_stream *stream; + UINT32 done; + HRESULT result; +}; + struct is_format_supported_params { const char *alsa_name; @@ -199,6 +206,7 @@ enum alsa_funcs alsa_get_render_buffer, alsa_release_render_buffer, alsa_get_capture_buffer, + alsa_release_capture_buffer, alsa_is_format_supported, alsa_get_mix_format, alsa_get_buffer_size, -- 2.25.1

2 1

[PATCH 3/4] winealsa: Move get_capture_buffer to the unixlib.
by Huw Davies 09 Mar '22

09 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 62 ++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 69 +++++------------------------------- dlls/winealsa.drv/unixlib.h | 12 +++++++ 3 files changed, 83 insertions(+), 60 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 302a525e52d..60ef49c4c1a 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1691,6 +1691,67 @@ static NTSTATUS release_render_buffer(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_capture_buffer(void *args) +{ + struct get_capture_buffer_params *params = args; + struct alsa_stream *stream = params->stream; + UINT32 *frames = params->frames; + SIZE_T size; + + alsa_lock(stream); + + if(stream->getbuf_last) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_OUT_OF_ORDER); + + if(stream->held_frames < stream->mmdev_period_frames){ + *frames = 0; + return alsa_unlock_result(stream, &params->result, AUDCLNT_S_BUFFER_EMPTY); + } + *frames = stream->mmdev_period_frames; + + if(stream->lcl_offs_frames + *frames > stream->bufsize_frames){ + UINT32 chunk_bytes, offs_bytes, frames_bytes; + if(stream->tmp_buffer_frames < *frames){ + if(stream->tmp_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); + stream->tmp_buffer = NULL; + } + size = *frames * stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, + MEM_COMMIT, PAGE_READWRITE)){ + stream->tmp_buffer_frames = 0; + return alsa_unlock_result(stream, &params->result, E_OUTOFMEMORY); + } + stream->tmp_buffer_frames = *frames; + } + + *params->data = stream->tmp_buffer; + chunk_bytes = (stream->bufsize_frames - stream->lcl_offs_frames) * + stream->fmt->nBlockAlign; + offs_bytes = stream->lcl_offs_frames * stream->fmt->nBlockAlign; + frames_bytes = *frames * stream->fmt->nBlockAlign; + memcpy(stream->tmp_buffer, stream->local_buffer + offs_bytes, chunk_bytes); + memcpy(stream->tmp_buffer + chunk_bytes, stream->local_buffer, + frames_bytes - chunk_bytes); + }else + *params->data = stream->local_buffer + + stream->lcl_offs_frames * stream->fmt->nBlockAlign; + + stream->getbuf_last = *frames; + *params->flags = 0; + + if(params->devpos) + *params->devpos = stream->written_frames; + if(params->qpcpos){ /* fixme: qpc of recording time */ + LARGE_INTEGER stamp, freq; + NtQueryPerformanceCounter(&stamp, &freq); + *params->qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + } + + return alsa_unlock_result(stream, &params->result, *frames ? S_OK : AUDCLNT_S_BUFFER_EMPTY); +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -2024,6 +2085,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = timer_loop, get_render_buffer, release_render_buffer, + get_capture_buffer, is_format_supported, get_mix_format, get_buffer_size, diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index e5512880442..cecb358bab7 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1369,8 +1369,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, UINT64 *qpcpos) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct alsa_stream *stream = This->stream; - SIZE_T size; + struct get_capture_buffer_params params; TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); @@ -1383,66 +1382,16 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, if(!frames || !flags) return E_POINTER; - alsa_lock(stream); - - if(stream->getbuf_last){ - alsa_unlock(stream); - return AUDCLNT_E_OUT_OF_ORDER; - } - - /* hr = GetNextPacketSize(iface, frames); */ - if(stream->held_frames < stream->mmdev_period_frames){ - *frames = 0; - alsa_unlock(stream); - return AUDCLNT_S_BUFFER_EMPTY; - } - *frames = stream->mmdev_period_frames; - - if(stream->lcl_offs_frames + *frames > stream->bufsize_frames){ - UINT32 chunk_bytes, offs_bytes, frames_bytes; - if(stream->tmp_buffer_frames < *frames){ - if(stream->tmp_buffer){ - size = 0; - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); - stream->tmp_buffer = NULL; - } - size = *frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, - MEM_COMMIT, PAGE_READWRITE)){ - stream->tmp_buffer_frames = 0; - alsa_unlock(stream); - return E_OUTOFMEMORY; - } - stream->tmp_buffer_frames = *frames; - } - - *data = stream->tmp_buffer; - chunk_bytes = (stream->bufsize_frames - stream->lcl_offs_frames) * - stream->fmt->nBlockAlign; - offs_bytes = stream->lcl_offs_frames * stream->fmt->nBlockAlign; - frames_bytes = *frames * stream->fmt->nBlockAlign; - memcpy(stream->tmp_buffer, stream->local_buffer + offs_bytes, chunk_bytes); - memcpy(stream->tmp_buffer + chunk_bytes, stream->local_buffer, - frames_bytes - chunk_bytes); - }else - *data = stream->local_buffer + - stream->lcl_offs_frames * stream->fmt->nBlockAlign; - - stream->getbuf_last = *frames; - *flags = 0; - - if(devpos) - *devpos = stream->written_frames; - if(qpcpos){ /* fixme: qpc of recording time */ - LARGE_INTEGER stamp, freq; - QueryPerformanceCounter(&stamp); - QueryPerformanceFrequency(&freq); - *qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; - } + params.stream = This->stream; + params.data = data; + params.frames = frames; + params.flags = flags; + params.devpos = devpos; + params.qpcpos = qpcpos; - alsa_unlock(stream); + ALSA_CALL(get_capture_buffer, &params); - return *frames ? S_OK : AUDCLNT_S_BUFFER_EMPTY; + return params.result; } static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index bef38c2a1a9..c4efe5ad764 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -130,6 +130,17 @@ struct release_render_buffer_params HRESULT result; }; +struct get_capture_buffer_params +{ + struct alsa_stream *stream; + HRESULT result; + BYTE **data; + UINT32 *frames; + UINT *flags; + UINT64 *devpos; + UINT64 *qpcpos; +}; + struct is_format_supported_params { const char *alsa_name; @@ -187,6 +198,7 @@ enum alsa_funcs alsa_timer_loop, alsa_get_render_buffer, alsa_release_render_buffer, + alsa_get_capture_buffer, alsa_is_format_supported, alsa_get_mix_format, alsa_get_buffer_size, -- 2.25.1

2 1

[PATCH 2/4] winealsa: Move release_render_buffer to the unixlib.
by Huw Davies 09 Mar '22

09 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 58 ++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 73 +++--------------------------------- dlls/winealsa.drv/unixlib.h | 9 +++++ 3 files changed, 73 insertions(+), 67 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 57a605b6bdf..302a525e52d 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1634,6 +1634,63 @@ static NTSTATUS get_render_buffer(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static void alsa_wrap_buffer(struct alsa_stream *stream, BYTE *buffer, UINT32 written_frames) +{ + snd_pcm_uframes_t write_offs_frames = stream->wri_offs_frames; + UINT32 write_offs_bytes = write_offs_frames * stream->fmt->nBlockAlign; + snd_pcm_uframes_t chunk_frames = stream->bufsize_frames - write_offs_frames; + UINT32 chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; + UINT32 written_bytes = written_frames * stream->fmt->nBlockAlign; + + if(written_bytes <= chunk_bytes){ + memcpy(stream->local_buffer + write_offs_bytes, buffer, written_bytes); + }else{ + memcpy(stream->local_buffer + write_offs_bytes, buffer, chunk_bytes); + memcpy(stream->local_buffer, buffer + chunk_bytes, + written_bytes - chunk_bytes); + } +} + +static NTSTATUS release_render_buffer(void *args) +{ + struct release_render_buffer_params *params = args; + struct alsa_stream *stream = params->stream; + UINT32 written_frames = params->written_frames; + BYTE *buffer; + + alsa_lock(stream); + + if(!written_frames){ + stream->getbuf_last = 0; + return alsa_unlock_result(stream, &params->result, S_OK); + } + + if(!stream->getbuf_last) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_OUT_OF_ORDER); + + if(written_frames > (stream->getbuf_last >= 0 ? stream->getbuf_last : -stream->getbuf_last)) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_INVALID_SIZE); + + if(stream->getbuf_last >= 0) + buffer = stream->local_buffer + stream->wri_offs_frames * stream->fmt->nBlockAlign; + else + buffer = stream->tmp_buffer; + + if(params->flags & AUDCLNT_BUFFERFLAGS_SILENT) + silence_buffer(stream, buffer, written_frames); + + if(stream->getbuf_last < 0) + alsa_wrap_buffer(stream, buffer, written_frames); + + stream->wri_offs_frames += written_frames; + stream->wri_offs_frames %= stream->bufsize_frames; + stream->held_frames += written_frames; + stream->written_frames += written_frames; + stream->getbuf_last = 0; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -1966,6 +2023,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = reset, timer_loop, get_render_buffer, + release_render_buffer, is_format_supported, get_mix_format, get_buffer_size, diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 5d99ede8a4f..e5512880442 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -689,18 +689,6 @@ static HRESULT get_audio_session(const GUID *sessionguid, return S_OK; } -static void silence_buffer(struct alsa_stream *stream, BYTE *buffer, UINT32 frames) -{ - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; - if((stream->fmt->wFormatTag == WAVE_FORMAT_PCM || - (stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && - stream->fmt->wBitsPerSample == 8) - memset(buffer, 128, frames * stream->fmt->nBlockAlign); - else - memset(buffer, 0, frames * stream->fmt->nBlockAlign); -} - static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration, REFERENCE_TIME period, const WAVEFORMATEX *fmt, @@ -1314,70 +1302,21 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, return params.result; } -static void alsa_wrap_buffer(struct alsa_stream *stream, BYTE *buffer, UINT32 written_frames) -{ - snd_pcm_uframes_t write_offs_frames = stream->wri_offs_frames; - UINT32 write_offs_bytes = write_offs_frames * stream->fmt->nBlockAlign; - snd_pcm_uframes_t chunk_frames = stream->bufsize_frames - write_offs_frames; - UINT32 chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; - UINT32 written_bytes = written_frames * stream->fmt->nBlockAlign; - - if(written_bytes <= chunk_bytes){ - memcpy(stream->local_buffer + write_offs_bytes, buffer, written_bytes); - }else{ - memcpy(stream->local_buffer + write_offs_bytes, buffer, chunk_bytes); - memcpy(stream->local_buffer, buffer + chunk_bytes, - written_bytes - chunk_bytes); - } -} - static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( IAudioRenderClient *iface, UINT32 written_frames, DWORD flags) { ACImpl *This = impl_from_IAudioRenderClient(iface); - struct alsa_stream *stream = This->stream; - BYTE *buffer; + struct release_render_buffer_params params; TRACE("(%p)->(%u, %x)\n", This, written_frames, flags); - alsa_lock(stream); - - if(!written_frames){ - stream->getbuf_last = 0; - alsa_unlock(stream); - return S_OK; - } - - if(!stream->getbuf_last){ - alsa_unlock(stream); - return AUDCLNT_E_OUT_OF_ORDER; - } - - if(written_frames > (stream->getbuf_last >= 0 ? stream->getbuf_last : -stream->getbuf_last)){ - alsa_unlock(stream); - return AUDCLNT_E_INVALID_SIZE; - } - - if(stream->getbuf_last >= 0) - buffer = stream->local_buffer + stream->wri_offs_frames * stream->fmt->nBlockAlign; - else - buffer = stream->tmp_buffer; - - if(flags & AUDCLNT_BUFFERFLAGS_SILENT) - silence_buffer(stream, buffer, written_frames); - - if(stream->getbuf_last < 0) - alsa_wrap_buffer(stream, buffer, written_frames); - - stream->wri_offs_frames += written_frames; - stream->wri_offs_frames %= stream->bufsize_frames; - stream->held_frames += written_frames; - stream->written_frames += written_frames; - stream->getbuf_last = 0; + params.stream = This->stream; + params.written_frames = written_frames; + params.flags = flags; - alsa_unlock(stream); + ALSA_CALL(release_render_buffer, &params); - return S_OK; + return params.result; } static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index fb137d6b9ff..bef38c2a1a9 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -122,6 +122,14 @@ struct get_render_buffer_params BYTE **data; }; +struct release_render_buffer_params +{ + struct alsa_stream *stream; + UINT32 written_frames; + UINT flags; + HRESULT result; +}; + struct is_format_supported_params { const char *alsa_name; @@ -178,6 +186,7 @@ enum alsa_funcs alsa_reset, alsa_timer_loop, alsa_get_render_buffer, + alsa_release_render_buffer, alsa_is_format_supported, alsa_get_mix_format, alsa_get_buffer_size, -- 2.25.1

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel