February 2021 - Wine-Commits

Alexandre Julliard : wuaueng: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: 505ab26841741d094b663a8a121b3fbd03d1b211 URL: https://source.winehq.org/git/wine.git/?a=commit;h=505ab26841741d094b663a8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:55:43 2021 +0100 wuaueng: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wuaueng/Makefile.in | 5 +---- dlls/wuaueng/main.c | 44 -------------------------------------------- 2 files changed, 1 insertion(+), 48 deletions(-) diff --git a/dlls/wuaueng/Makefile.in b/dlls/wuaueng/Makefile.in index c74d7d9da42..e710511ab51 100644 --- a/dlls/wuaueng/Makefile.in +++ b/dlls/wuaueng/Makefile.in @@ -1,8 +1,5 @@ MODULE = wuaueng.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native RC_SRCS = version.rc diff --git a/dlls/wuaueng/main.c b/dlls/wuaueng/main.c deleted file mode 100644 index d49d3b05d02..00000000000 --- a/dlls/wuaueng/main.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2009 Louis Lenders - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wuaueng); - -/***************************************************** - * DllMain - */ -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) -{ - TRACE("(%p, %d, %p)\n", hinst, reason, reserved); - - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinst ); - break; - } - return TRUE; -}

1 0

Alexandre Julliard : vulkan-1: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: 290c9a4d6372cee046768eccd8fa49050a294f68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=290c9a4d6372cee046768ecc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:54:50 2021 +0100 vulkan-1: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/Makefile.in | 5 +---- dlls/vulkan-1/vulkan.c | 44 -------------------------------------------- 2 files changed, 1 insertion(+), 48 deletions(-) diff --git a/dlls/vulkan-1/Makefile.in b/dlls/vulkan-1/Makefile.in index 0ec2877c692..a4a10bc8e93 100644 --- a/dlls/vulkan-1/Makefile.in +++ b/dlls/vulkan-1/Makefile.in @@ -2,9 +2,6 @@ MODULE = vulkan-1.dll IMPORTS = winevulkan IMPORTLIB = vulkan-1 -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - vulkan.c +EXTRADLLFLAGS = -Wb,--prefer-native RC_SRCS = version.rc diff --git a/dlls/vulkan-1/vulkan.c b/dlls/vulkan-1/vulkan.c deleted file mode 100644 index d3b35603a17..00000000000 --- a/dlls/vulkan-1/vulkan.c +++ /dev/null @@ -1,44 +0,0 @@ -/* Wine Vulkan loader implementation - * - * Copyright 2018 Roderick Colenbrander - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(vulkan); - -BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) -{ - TRACE("%p, %u, %p\n", hinst, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - /* Prefer native as it provides more functionality. */ - return FALSE; - - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinst); - return TRUE; - } - return TRUE; -}

1 0

Nikolay Sivov : mf/tests: Add a sample copier test for sample fields handling.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: 34dbb2c8590f3eec862e95dfad7ae7b431b73321 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34dbb2c8590f3eec862e95df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 19 11:59:53 2021 +0300 mf/tests: Add a sample copier test for sample fields handling. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 11eff78b645..65f2b40faa9 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4918,20 +4918,51 @@ static void test_sample_copier(void) IMFTransform_Release(copier); } +struct sample_metadata +{ + unsigned int flags; + LONGLONG duration; + LONGLONG time; +}; + static void sample_copier_process(IMFTransform *copier, IMFMediaBuffer *input_buffer, - IMFMediaBuffer *output_buffer) + IMFMediaBuffer *output_buffer, const struct sample_metadata *md) { + static const struct sample_metadata zero_md = { 0, ~0u, ~0u }; IMFSample *input_sample, *output_sample; MFT_OUTPUT_DATA_BUFFER buffer; + unsigned int flags; + LONGLONG time; DWORD status; HRESULT hr; hr = MFCreateSample(&input_sample); ok(hr == S_OK, "Failed to create a sample, hr %#x.\n", hr); + if (md) + { + hr = IMFSample_SetSampleFlags(input_sample, md->flags); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_SetSampleTime(input_sample, md->time); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_SetSampleDuration(input_sample, md->duration); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + } + hr = MFCreateSample(&output_sample); ok(hr == S_OK, "Failed to create a sample, hr %#x.\n", hr); + hr = IMFSample_SetSampleFlags(output_sample, ~0u); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_SetSampleTime(output_sample, ~0u); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_SetSampleDuration(output_sample, ~0u); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFSample_AddBuffer(input_sample, input_buffer); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -4947,6 +4978,18 @@ static void sample_copier_process(IMFTransform *copier, IMFMediaBuffer *input_bu hr = IMFTransform_ProcessOutput(copier, 0, 1, &buffer, &status); ok(hr == S_OK, "Failed to get output, hr %#x.\n", hr); + if (!md) md = &zero_md; + + hr = IMFSample_GetSampleFlags(output_sample, &flags); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(md->flags == flags, "Unexpected flags.\n"); + hr = IMFSample_GetSampleTime(output_sample, &time); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(md->time == time, "Unexpected time.\n"); + hr = IMFSample_GetSampleDuration(output_sample, &time); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(md->duration == time, "Unexpected duration.\n"); + IMFSample_Release(input_sample); IMFSample_Release(output_sample); } @@ -4955,6 +4998,7 @@ static void test_sample_copier_output_processing(void) { IMFMediaBuffer *input_buffer, *output_buffer; MFT_OUTPUT_STREAM_INFO output_info; + struct sample_metadata md; IMFMediaType *mediatype; IMFTransform *copier; DWORD max_length; @@ -5007,7 +5051,7 @@ static void test_sample_copier_output_processing(void) hr = IMFMediaBuffer_SetCurrentLength(input_buffer, 4); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - sample_copier_process(copier, input_buffer, output_buffer); + sample_copier_process(copier, input_buffer, output_buffer, NULL); hr = IMFMediaBuffer_Lock(output_buffer, &ptr, &max_length, NULL); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -5016,6 +5060,14 @@ static void test_sample_copier_output_processing(void) hr = IMFMediaBuffer_Unlock(output_buffer); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + md.flags = 123; + md.time = 10; + md.duration = 2; + sample_copier_process(copier, input_buffer, output_buffer, &md); + + IMFMediaBuffer_Release(input_buffer); + IMFMediaBuffer_Release(output_buffer); + IMFMediaType_Release(mediatype); IMFTransform_Release(copier); }

1 0

Nikolay Sivov : dwrite/layout: Remove unnecessary argument check from GetPairKerning().
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: 7129b3e14dbd59d9ece355830c2003f5135be12f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7129b3e14dbd59d9ece35583… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 19 12:03:46 2021 +0300 dwrite/layout: Remove unnecessary argument check from GetPairKerning(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 3 --- dlls/dwrite/tests/layout.c | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 5dcf62d4690..7b9d521c29a 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -4062,9 +4062,6 @@ static HRESULT WINAPI dwritetextlayout1_GetPairKerning(IDWriteTextLayout4 *iface TRACE("%p, %u, %p, %p.\n", iface, position, is_pairkerning_enabled, r); - if (position >= layout->len) - return S_OK; - range = get_layout_range_by_pos(layout, position); *is_pairkerning_enabled = range->pair_kerning; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index bff95ca3bb6..8d74056af2f 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -6337,11 +6337,10 @@ todo_wine value = FALSE; hr = IDWriteTextLayout1_GetPairKerning(layout1, 10, &value, &range); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - todo_wine { ok(range.startPosition == 10 && range.length == ~0u - 10, "Unexpected range (%u, %u).\n", range.startPosition, range.length); ok(!!value, "Unexpected value %d.\n", value); - } + range.startPosition = 0; range.length = ~0u; hr = IDWriteTextLayout1_SetPairKerning(layout1, FALSE, range);

1 0

Nikolay Sivov : dwrite/layout: Remove unnecessary argument check from GetFontCollection().
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: 4b0f2eb6e5f5efd7e7cc296cc2f58a0dbe6c9c02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b0f2eb6e5f5efd7e7cc296c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 19 12:03:49 2021 +0300 dwrite/layout: Remove unnecessary argument check from GetFontCollection(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 3 --- dlls/dwrite/tests/layout.c | 10 +++++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 482fcc733db..fc874541d74 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3403,9 +3403,6 @@ static HRESULT WINAPI dwritetextlayout_layout_GetFontCollection(IDWriteTextLayou TRACE("%p, %u, %p, %p.\n", iface, position, collection, r); - if (position >= layout->len) - return S_OK; - range = get_layout_range_by_pos(layout, position); *collection = range->collection; if (*collection) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index b96ff2f0289..adc9503ffd9 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -5973,8 +5973,8 @@ if (SUCCEEDED(hr)) static void test_layout_range_length(void) { + IDWriteFontCollection *collection, *collection2; IDWriteInlineObject *sign, *object; - IDWriteFontCollection *collection; IDWriteTypography *typography; DWRITE_FONT_STRETCH stretch; IDWriteTextLayout1 *layout1; @@ -6305,6 +6305,14 @@ static void test_layout_range_length(void) hr = IDWriteTextLayout_SetFontCollection(layout, NULL, range); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + range.startPosition = range.length = 0; + collection2 = NULL; + hr = IDWriteTextLayout_GetFontCollection(layout, 10, &collection2, &range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(range.length == ~0u, "Unexpected range length %u.\n", range.length); + if (collection2) + IDWriteFontCollection_Release(collection2); + IDWriteFontCollection_Release(collection); if (SUCCEEDED(IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout1, (void **)&layout1)))

1 0

Nikolay Sivov : dwrite/layout: Remove unnecessary argument check from GetFontWeight().
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: 68cfa3a4117fdf52498c7d22b3c0d10d7ff05c77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68cfa3a4117fdf52498c7d22… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 19 12:03:48 2021 +0300 dwrite/layout: Remove unnecessary argument check from GetFontWeight(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 5 +---- dlls/dwrite/tests/layout.c | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 3793f1ed8cb..482fcc733db 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1,7 +1,7 @@ /* * Text format and layout * - * Copyright 2012, 2014-2017 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2021 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -3442,9 +3442,6 @@ static HRESULT WINAPI dwritetextlayout_layout_GetFontWeight(IDWriteTextLayout4 * TRACE("%p, %u, %p, %p.\n", iface, position, weight, r); - if (position >= layout->len) - return S_OK; - range = get_layout_range_by_pos(layout, position); *weight = range->weight; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index b37cdfbf5ba..b96ff2f0289 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -6022,7 +6022,6 @@ static void test_layout_range_length(void) range.startPosition = range.length = 0; hr = IDWriteTextLayout_GetFontWeight(layout, 10, &weight, &range); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine ok(range.startPosition == 10 && range.length == ~0u - 10, "Unexpected range (%u, %u).\n", range.startPosition, range.length);

1 0

Nikolay Sivov : mfreadwrite/reader: Add support for reading to SA-allocated samples.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: a67d7c15336ea5caa89099952da1fc1998188029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a67d7c15336ea5caa8909995… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 19 11:59:06 2021 +0300 mfreadwrite/reader: Add support for reading to SA-allocated samples. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 141 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 110 insertions(+), 31 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index ec7d3fd62e6..9903898a155 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -85,6 +85,7 @@ struct stream_response DWORD stream_flags; LONGLONG timestamp; IMFSample *sample; + unsigned int sa_pending : 1; }; enum media_stream_state @@ -365,12 +366,83 @@ static HRESULT WINAPI source_reader_callback_GetParameters(IMFAsyncCallback *ifa return E_NOTIMPL; } +static void source_reader_response_ready(struct source_reader *reader, struct stream_response *response) +{ + struct source_reader_async_command *command; + struct media_stream *stream = &reader->streams[response->stream_index]; + HRESULT hr; + + if (!stream->requests || response->sa_pending) + return; + + if (reader->async_callback) + { + if (SUCCEEDED(source_reader_create_async_op(SOURCE_READER_ASYNC_SAMPLE_READY, &command))) + { + command->u.sample.stream_index = stream->index; + if (FAILED(hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &reader->async_commands_callback, + &command->IUnknown_iface))) + WARN("Failed to submit async result, hr %#x.\n", hr); + IUnknown_Release(&command->IUnknown_iface); + } + } + else + WakeAllConditionVariable(&reader->sample_event); + + stream->requests--; +} + +static void source_reader_copy_sample_buffer(IMFSample *src, IMFSample *dst) +{ + IMFMediaBuffer *buffer; + unsigned int flags; + LONGLONG time; + HRESULT hr; + + IMFSample_CopyAllItems(src, (IMFAttributes *)dst); + + IMFSample_SetSampleDuration(dst, 0); + IMFSample_SetSampleTime(dst, 0); + IMFSample_SetSampleFlags(dst, 0); + + if (SUCCEEDED(IMFSample_GetSampleDuration(src, &time))) + IMFSample_SetSampleDuration(dst, time); + + if (SUCCEEDED(IMFSample_GetSampleTime(src, &time))) + IMFSample_SetSampleTime(dst, time); + + if (SUCCEEDED(IMFSample_GetSampleFlags(src, &flags))) + IMFSample_SetSampleFlags(dst, flags); + + if (SUCCEEDED(IMFSample_ConvertToContiguousBuffer(src, NULL))) + { + if (SUCCEEDED(IMFSample_GetBufferByIndex(dst, 0, &buffer))) + { + if (FAILED(hr = IMFSample_CopyToBuffer(src, buffer))) + WARN("Failed to copy a buffer, hr %#x.\n", hr); + IMFMediaBuffer_Release(buffer); + } + } +} + +static void source_reader_set_sa_response(struct source_reader *reader, struct stream_response *response) +{ + struct media_stream *stream = &reader->streams[response->stream_index]; + IMFSample *sample; + + if (SUCCEEDED(IMFVideoSampleAllocatorEx_AllocateSample(stream->allocator, &sample))) + { + source_reader_copy_sample_buffer(response->sample, sample); + response->sa_pending = 0; + IMFSample_Release(response->sample); + response->sample = sample; + } +} + static void source_reader_queue_response(struct source_reader *reader, struct media_stream *stream, HRESULT status, DWORD stream_flags, LONGLONG timestamp, IMFSample *sample) { - struct source_reader_async_command *command; struct stream_response *response; - HRESULT hr; response = heap_alloc_zero(sizeof(*response)); response->status = status; @@ -381,27 +453,16 @@ static void source_reader_queue_response(struct source_reader *reader, struct me if (response->sample) IMFSample_AddRef(response->sample); + if (response->sample && stream->allocator) + { + response->sa_pending = 1; + source_reader_set_sa_response(reader, response); + } + list_add_tail(&reader->responses, &response->entry); stream->responses++; - if (stream->requests) - { - if (reader->async_callback) - { - if (SUCCEEDED(source_reader_create_async_op(SOURCE_READER_ASYNC_SAMPLE_READY, &command))) - { - command->u.sample.stream_index = stream->index; - if (FAILED(hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &reader->async_commands_callback, - &command->IUnknown_iface))) - WARN("Failed to submit async result, hr %#x.\n", hr); - IUnknown_Release(&command->IUnknown_iface); - } - } - else - WakeAllConditionVariable(&reader->sample_event); - - stream->requests--; - } + source_reader_response_ready(reader, response); } static HRESULT source_reader_request_sample(struct source_reader *reader, struct media_stream *stream) @@ -874,20 +935,26 @@ static struct stream_response * media_stream_detach_response(struct source_reade static struct stream_response *media_stream_pop_response(struct source_reader *reader, struct media_stream *stream) { struct stream_response *response; - struct list *head; - if (stream) + LIST_FOR_EACH_ENTRY(response, &reader->responses, struct stream_response, entry) { - LIST_FOR_EACH_ENTRY(response, &reader->responses, struct stream_response, entry) - { - if (response->stream_index == stream->index) - return media_stream_detach_response(reader, response); - } + if ((stream && response->stream_index != stream->index) || response->sa_pending) + continue; + + return media_stream_detach_response(reader, response); } - else + + return NULL; +} + +static struct stream_response *media_stream_pick_pending_response(struct source_reader *reader, unsigned int stream) +{ + struct stream_response *response; + + LIST_FOR_EACH_ENTRY(response, &reader->responses, struct stream_response, entry) { - if ((head = list_head(&reader->responses))) - return media_stream_detach_response(reader, LIST_ENTRY(head, struct stream_response, entry)); + if (response->stream_index == stream && response->sa_pending) + return response; } return NULL; @@ -963,7 +1030,7 @@ static BOOL source_reader_got_response_for_stream(struct source_reader *reader, LIST_FOR_EACH_ENTRY(response, &reader->responses, struct stream_response, entry) { - if (response->stream_index == stream->index) + if (response->stream_index == stream->index && !response->sa_pending) return TRUE; } @@ -1201,6 +1268,18 @@ static HRESULT WINAPI source_reader_async_commands_callback_Invoke(IMFAsyncCallb break; + case SOURCE_READER_ASYNC_SA_READY: + + EnterCriticalSection(&reader->cs); + if ((response = media_stream_pick_pending_response(reader, command->u.sa.stream_index))) + { + source_reader_set_sa_response(reader, response); + source_reader_response_ready(reader, response); + } + LeaveCriticalSection(&reader->cs); + + break; + case SOURCE_READER_ASYNC_SAMPLE_READY: EnterCriticalSection(&reader->cs);

1 0

Alexandre Julliard : xpssvcs: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: f892f2fe8a7fd9f6aaa9198de0d0d9c911b5fff0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f892f2fe8a7fd9f6aaa9198d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:56:13 2021 +0100 xpssvcs: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xpssvcs/Makefile.in | 5 +---- dlls/xpssvcs/main.c | 35 ----------------------------------- 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/dlls/xpssvcs/Makefile.in b/dlls/xpssvcs/Makefile.in index bb41d26d557..364a9d210a9 100644 --- a/dlls/xpssvcs/Makefile.in +++ b/dlls/xpssvcs/Makefile.in @@ -1,6 +1,3 @@ MODULE = xpssvcs.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/xpssvcs/main.c b/dlls/xpssvcs/main.c deleted file mode 100644 index 39fb3c36302..00000000000 --- a/dlls/xpssvcs/main.c +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2012 Hans Leidekker for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinst ); - break; - } - return TRUE; -}

1 0

Alexandre Julliard : xpsprint: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: a0fb33b23711d8eae98262e4efd61c2ced02fec2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0fb33b23711d8eae98262e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:56:03 2021 +0100 xpsprint: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xpsprint/Makefile.in | 5 +---- dlls/xpsprint/main.c | 39 --------------------------------------- 2 files changed, 1 insertion(+), 43 deletions(-) diff --git a/dlls/xpsprint/Makefile.in b/dlls/xpsprint/Makefile.in index 12639f1f89d..9240d324ff4 100644 --- a/dlls/xpsprint/Makefile.in +++ b/dlls/xpsprint/Makefile.in @@ -1,8 +1,5 @@ MODULE = xpsprint.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native RC_SRCS = xpsprint.rc diff --git a/dlls/xpsprint/main.c b/dlls/xpsprint/main.c deleted file mode 100644 index 734d9221c44..00000000000 --- a/dlls/xpsprint/main.c +++ /dev/null @@ -1,39 +0,0 @@ -/* - * XPS printing support - * - * Copyright 2012 Austin English - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -}

1 0

Alexandre Julliard : wlanui: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: f4072058e5ec1bd4479a5dee97ff8cc826d35e6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4072058e5ec1bd4479a5dee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:55:17 2021 +0100 wlanui: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanui/Makefile.in | 5 +---- dlls/wlanui/main.c | 43 ------------------------------------------- 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/dlls/wlanui/Makefile.in b/dlls/wlanui/Makefile.in index a78f40f53b6..927c977532a 100644 --- a/dlls/wlanui/Makefile.in +++ b/dlls/wlanui/Makefile.in @@ -1,6 +1,3 @@ MODULE = wlanui.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/wlanui/main.c b/dlls/wlanui/main.c deleted file mode 100644 index 8e8278d039a..00000000000 --- a/dlls/wlanui/main.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Wireless Local Area Network User Interface - * - * Copyright 2019 Alex Henrie - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wlanui); - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) -{ - TRACE("(%p, %u, %p)\n", instance, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -}

1 0