April 2022 - Wine-commits - list.winehq.org

Anton Baskanov : quartz/tests: Add tests for querying MPEG audio decoder pin info.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: cf849b73087f25acf6615ca128178740adc6cda8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf849b73087f25acf6615ca1… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Apr 25 14:32:12 2022 +0700 quartz/tests: Add tests for querying MPEG audio decoder pin info. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/mpegaudio.c | 77 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/quartz/tests/mpegaudio.c b/dlls/quartz/tests/mpegaudio.c index 11816e65cfc..d948c2648f2 100644 --- a/dlls/quartz/tests/mpegaudio.c +++ b/dlls/quartz/tests/mpegaudio.c @@ -450,6 +450,82 @@ static void test_find_pin(void) ok(!ref, "Got outstanding refcount %ld.\n", ref); } +static void test_pin_info(void) +{ + IBaseFilter *filter; + PIN_DIRECTION dir; + PIN_INFO info; + HRESULT hr; + WCHAR *id; + ULONG ref; + IPin *pin; + + filter = create_mpeg_audio_codec(); + if (!filter) + { + skip("Failed to create MPEG audio decoder instance, skipping tests.\n"); + return; + } + + hr = IBaseFilter_FindPin(filter, L"In", &pin); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %ld.\n", ref); + ref = get_refcount(pin); + ok(ref == 2, "Got unexpected refcount %ld.\n", ref); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); + ok(!wcscmp(info.achName, L"XForm In"), "Got name %s.\n", debugstr_w(info.achName)); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %ld.\n", ref); + ref = get_refcount(pin); + ok(ref == 3, "Got unexpected refcount %ld.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(!wcscmp(id, L"In"), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, NULL); + ok(hr == E_NOTIMPL, "Got hr %#lx.\n", hr); + + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, L"Out", &pin); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); + ok(!wcscmp(info.achName, L"XForm Out"), "Got name %s.\n", debugstr_w(info.achName)); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(dir == PINDIR_OUTPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(!wcscmp(id, L"Out"), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, NULL); + ok(hr == E_NOTIMPL, "Got hr %#lx.\n", hr); + + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %ld.\n", ref); +} + START_TEST(mpegaudio) { CoInitialize(NULL); @@ -459,6 +535,7 @@ START_TEST(mpegaudio) test_unconnected_filter_state(); test_enum_pins(); test_find_pin(); + test_pin_info(); CoUninitialize(); }

1 0

Anton Baskanov : winegstreamer: Add a skeleton MPEG audio decoder filter.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: d7c4fa0d5724b7a89f5b80970e8f62efcc457f8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7c4fa0d5724b7a89f5b8097… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Apr 25 14:32:13 2022 +0700 winegstreamer: Add a skeleton MPEG audio decoder filter. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/mpegaudio.c | 6 +- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/main.c | 3 + dlls/winegstreamer/quartz_transform.c | 120 +++++++++++++++++++++++++++ dlls/winegstreamer/winegstreamer_classes.idl | 7 ++ 6 files changed, 135 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/mpegaudio.c b/dlls/quartz/tests/mpegaudio.c index d948c2648f2..44e1a9ad2e6 100644 --- a/dlls/quartz/tests/mpegaudio.c +++ b/dlls/quartz/tests/mpegaudio.c @@ -28,7 +28,7 @@ static IBaseFilter *create_mpeg_audio_codec(void) IBaseFilter *filter = NULL; HRESULT hr = CoCreateInstance(&CLSID_CMpegAudioCodec, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&filter); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); return filter; } @@ -156,12 +156,12 @@ static void test_aggregation(void) filter = (IBaseFilter *)0xdeadbeef; hr = CoCreateInstance(&CLSID_CMpegAudioCodec, &test_outer, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&filter); - todo_wine ok(hr == E_NOINTERFACE, "Got hr %#lx.\n", hr); + ok(hr == E_NOINTERFACE, "Got hr %#lx.\n", hr); ok(!filter, "Got interface %p.\n", filter); hr = CoCreateInstance(&CLSID_CMpegAudioCodec, &test_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); if (FAILED(hr)) { skip("Failed to create MPEG audio decoder instance, skipping tests.\n"); diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 3524cffb399..00b7c72a5f3 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -13,6 +13,7 @@ C_SRCS = \ media_source.c \ mfplat.c \ quartz_parser.c \ + quartz_transform.c \ wg_format.c \ wg_parser.c \ wg_transform.c \ diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index f5da807a2ab..2a4b16079c1 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -103,6 +103,7 @@ unsigned int wg_format_get_max_size(const struct wg_format *format); HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out); HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out); +HRESULT mpeg_audio_codec_create(IUnknown *outer, IUnknown **out); HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out); HRESULT wave_parser_create(IUnknown *outer, IUnknown **out); HRESULT wma_decoder_create(IUnknown *outer, IUnknown **out); diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index d88a462d81e..a408704cf47 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -431,6 +431,7 @@ static const IClassFactoryVtbl class_factory_vtbl = static struct class_factory avi_splitter_cf = {{&class_factory_vtbl}, avi_splitter_create}; static struct class_factory decodebin_parser_cf = {{&class_factory_vtbl}, decodebin_parser_create}; +static struct class_factory mpeg_audio_codec_cf = {{&class_factory_vtbl}, mpeg_audio_codec_create}; static struct class_factory mpeg_splitter_cf = {{&class_factory_vtbl}, mpeg_splitter_create}; static struct class_factory wave_parser_cf = {{&class_factory_vtbl}, wave_parser_create}; static struct class_factory wma_decoder_cf = {{&class_factory_vtbl}, wma_decoder_create}; @@ -452,6 +453,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) factory = &avi_splitter_cf; else if (IsEqualGUID(clsid, &CLSID_decodebin_parser)) factory = &decodebin_parser_cf; + else if (IsEqualGUID(clsid, &CLSID_CMpegAudioCodec)) + factory = &mpeg_audio_codec_cf; else if (IsEqualGUID(clsid, &CLSID_MPEG1Splitter)) factory = &mpeg_splitter_cf; else if (IsEqualGUID(clsid, &CLSID_WAVEParser)) diff --git a/dlls/winegstreamer/quartz_transform.c b/dlls/winegstreamer/quartz_transform.c new file mode 100644 index 00000000000..9665c56d848 --- /dev/null +++ b/dlls/winegstreamer/quartz_transform.c @@ -0,0 +1,120 @@ +/* + * DirectShow transform filters + * + * Copyright 2022 Anton Baskanov + * + * 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 "gst_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(quartz); + +struct transform +{ + struct strmbase_filter filter; + + struct strmbase_sink sink; + struct strmbase_source source; +}; + +static inline struct transform *impl_from_strmbase_filter(struct strmbase_filter *iface) +{ + return CONTAINING_RECORD(iface, struct transform, filter); +} + +static struct strmbase_pin *transform_get_pin(struct strmbase_filter *iface, unsigned int index) +{ + struct transform *filter = impl_from_strmbase_filter(iface); + if (index == 0) + return &filter->sink.pin; + if (index == 1) + return &filter->source.pin; + return NULL; +} + +static void transform_destroy(struct strmbase_filter *iface) +{ + struct transform *filter = impl_from_strmbase_filter(iface); + + strmbase_source_cleanup(&filter->source); + strmbase_sink_cleanup(&filter->sink); + strmbase_filter_cleanup(&filter->filter); + + free(filter); +} + +static const struct strmbase_filter_ops filter_ops = +{ + .filter_get_pin = transform_get_pin, + .filter_destroy = transform_destroy, +}; + +static HRESULT transform_sink_query_interface(struct strmbase_pin *pin, REFIID iid, void **out) +{ + struct transform *filter = impl_from_strmbase_filter(pin->filter); + + if (IsEqualGUID(iid, &IID_IMemInputPin)) + *out = &filter->sink.IMemInputPin_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static const struct strmbase_sink_ops sink_ops = +{ + .base.pin_query_interface = transform_sink_query_interface, +}; + +static const struct strmbase_source_ops source_ops = +{ + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, +}; + +static HRESULT transform_create(IUnknown *outer, const CLSID *clsid, struct transform **out) +{ + struct transform *object; + + object = calloc(1, sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + strmbase_filter_init(&object->filter, outer, clsid, &filter_ops); + strmbase_sink_init(&object->sink, &object->filter, L"In", &sink_ops, NULL); + strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops); + + *out = object; + return S_OK; +} + +HRESULT mpeg_audio_codec_create(IUnknown *outer, IUnknown **out) +{ + struct transform *object; + HRESULT hr; + + hr = transform_create(outer, &CLSID_CMpegAudioCodec, &object); + if (FAILED(hr)) + return hr; + + wcscpy(object->sink.pin.name, L"XForm In"); + wcscpy(object->source.pin.name, L"XForm Out"); + + TRACE("Created MPEG audio decoder %p.\n", object); + *out = &object->filter.IUnknown_inner; + return hr; +} diff --git a/dlls/winegstreamer/winegstreamer_classes.idl b/dlls/winegstreamer/winegstreamer_classes.idl index 347ee906a52..037f0573b34 100644 --- a/dlls/winegstreamer/winegstreamer_classes.idl +++ b/dlls/winegstreamer/winegstreamer_classes.idl @@ -28,6 +28,13 @@ ] coclass AviSplitter {} +[ + helpstring("MPEG Audio Decoder"), + threading(both), + uuid(4a2286e0-7bef-11ce-9bd9-0000e202599c) +] +coclass CMpegAudioCodec {} + [ helpstring("MPEG-I Stream Splitter"), threading(both),

1 0

Piotr Caban : msvcrt: Use TICKSPERMSEC define in concurrency functions.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 7af93f497c3e71f69511743f42b86b2ef5e13b32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7af93f497c3e71f69511743f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 25 18:34:31 2022 +0200 msvcrt: Use TICKSPERMSEC define in concurrency functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/concurrency.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index f9a7f489ceb..c26478f36cd 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -1944,8 +1944,8 @@ bool __thiscall critical_section_try_lock_for( last->next = q; GetSystemTimeAsFileTime(&ft); - to.QuadPart = ((LONGLONG)ft.dwHighDateTime<<32) + - ft.dwLowDateTime + (LONGLONG)timeout*10000; + to.QuadPart = ((LONGLONG)ft.dwHighDateTime << 32) + + ft.dwLowDateTime + (LONGLONG)timeout * TICKSPERMSEC; status = NtWaitForKeyedEvent(keyed_event, q, 0, &to); if(status == STATUS_TIMEOUT) { if(!InterlockedExchange(&q->free, TRUE)) @@ -2128,7 +2128,7 @@ unsigned int __cdecl _GetConcurrency(void) static inline PLARGE_INTEGER evt_timeout(PLARGE_INTEGER pTime, unsigned int timeout) { if(timeout == COOPERATIVE_TIMEOUT_INFINITE) return NULL; - pTime->QuadPart = (ULONGLONG)timeout * -10000; + pTime->QuadPart = (ULONGLONG)timeout * -TICKSPERMSEC; return pTime; } @@ -2396,7 +2396,7 @@ bool __thiscall _Condition_variable_wait_for(_Condition_variable *this, GetSystemTimeAsFileTime(&ft); to.QuadPart = ((LONGLONG)ft.dwHighDateTime << 32) + - ft.dwLowDateTime + (LONGLONG)timeout * 10000; + ft.dwLowDateTime + (LONGLONG)timeout * TICKSPERMSEC; while (q->next != CV_WAKE) { status = RtlWaitOnAddress(&q->next, &next, sizeof(next), &to); if(status == STATUS_TIMEOUT) {

1 0

Henri Verbeet : d3d11/tests: Declare "data_size" as UINT in test_device_context_state().
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: e2f30db4c2d4a4f258687108554db3d0b27b92b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2f30db4c2d4a4f258687108… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 25 18:25:54 2022 +0200 d3d11/tests: Declare "data_size" as UINT in test_device_context_state(). ID3DDeviceContextState_GetPrivateData() takes an UINT parameter, not a DWORD. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 236fa85a257..6287855c3a6 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6976,9 +6976,9 @@ static void test_device_context_state(void) ID3D11Texture2D *texture; enum DXGI_FORMAT format; float blend_factor[4]; - DWORD data_size; BOOL pred_value; ULONG refcount; + UINT data_size; char data[64]; HRESULT hr;

1 0

Eric Pouech : d3d11/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 0a31c4058da8b1ac0865943d40419a45387e8fc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a31c4058da8b1ac0865943d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Apr 25 18:25:55 2022 +0200 d3d11/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/Makefile.in | 1 - dlls/d3d11/tests/d3d11.c | 2661 +++++++++++++++++++++--------------------- 2 files changed, 1323 insertions(+), 1339 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a31c4058da8b1ac0865…

1 0

Henri Verbeet : wined3d: Pass "quality_levels" as an unsigned int pointer to wined3d_check_device_multisample_type().
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: ae0bdd9ad46041d2d00df6aa778ab0dd09d7a8d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae0bdd9ad46041d2d00df6aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 25 18:25:56 2022 +0200 wined3d: Pass "quality_levels" as an unsigned int pointer to wined3d_check_device_multisample_type(). The equivalent d3d11 function takes a UINT pointer, while the equivalent d3d9 function takes a DWORD pointer. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4d105a57237..c9a62c6997a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1650,7 +1650,7 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d_adapter *ad HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, enum wined3d_format_id surface_format_id, BOOL windowed, - enum wined3d_multisample_type multisample_type, DWORD *quality_levels) + enum wined3d_multisample_type multisample_type, unsigned int *quality_levels) { const struct wined3d_format *format; HRESULT hr = WINED3D_OK; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7fbff07a3ad..ee241ab3b1d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2323,7 +2323,7 @@ HRESULT __cdecl wined3d_check_device_format_conversion(const struct wined3d_outp enum wined3d_format_id target_format_id); HRESULT __cdecl wined3d_check_device_multisample_type(const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, enum wined3d_format_id surface_format_id, BOOL windowed, - enum wined3d_multisample_type multisample_type, DWORD *quality_levels); + enum wined3d_multisample_type multisample_type, unsigned int *quality_levels); HRESULT __cdecl wined3d_check_device_type(const struct wined3d *wined3d, const struct wined3d_output *output, enum wined3d_device_type device_type, enum wined3d_format_id display_format_id, enum wined3d_format_id backbuffer_format_id,

1 0

Eric Pouech : d3d11: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 46aa3fafaaa8cc94fe8c44b4477ce5805a519b41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46aa3fafaaa8cc94fe8c44b4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Apr 25 18:25:57 2022 +0200 d3d11: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/Makefile.in | 1 - dlls/d3d11/async.c | 12 ++++---- dlls/d3d11/buffer.c | 8 ++--- dlls/d3d11/d3d11_main.c | 28 +++++++++--------- dlls/d3d11/device.c | 76 ++++++++++++++++++++++++------------------------ dlls/d3d11/inputlayout.c | 10 +++---- dlls/d3d11/shader.c | 46 ++++++++++++++--------------- dlls/d3d11/state.c | 28 +++++++++--------- dlls/d3d11/texture.c | 24 +++++++-------- dlls/d3d11/view.c | 32 ++++++++++---------- 10 files changed, 132 insertions(+), 133 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=46aa3fafaaa8cc94fe8c…

1 0

Torge Matthies : msvcr110: Add _StructuredTaskCollection::_StructuredTaskCollection_ctor stub.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 881879c658c6b1bfed41beb5da87b6cf1ee31936 URL: https://source.winehq.org/git/wine.git/?a=commit;h=881879c658c6b1bfed41beb5… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Apr 25 19:35:02 2022 +0200 msvcr110: Add _StructuredTaskCollection::_StructuredTaskCollection_ctor stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 6 +++--- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/concurrency.c | 19 +++++++++++++++++++ 5 files changed, 31 insertions(+), 12 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 50db9348327..3257d61bb37 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -63,9 +63,9 @@ @ stub -arch=arm ??0_SpinLock(a)details@Concurrency@@QAA(a)ACJ@Z @ stub -arch=i386 ??0_SpinLock(a)details@Concurrency@@QAE(a)ACJ@Z @ stub -arch=win64 ??0_SpinLock(a)details@Concurrency@@QEAA(a)AECJ@Z -@ stub -arch=arm ??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z -@ stub -arch=i386 ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z -@ stub -arch=win64 ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z +@ cdecl -arch=arm ??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor +@ thiscall -arch=i386 ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor +@ cdecl -arch=win64 ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor @ stub -arch=arm ??0_TaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z @ stub -arch=i386 ??0_TaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z @ stub -arch=win64 ??0_TaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 23840f85eda..64b634b582e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -62,9 +62,9 @@ @ stub -arch=arm ??0_SpinLock(a)details@Concurrency@@QAA(a)ACJ@Z @ stub -arch=i386 ??0_SpinLock(a)details@Concurrency@@QAE(a)ACJ@Z @ stub -arch=win64 ??0_SpinLock(a)details@Concurrency@@QEAA(a)AECJ@Z -@ stub -arch=arm ??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z -@ stub -arch=i386 ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z -@ stub -arch=win64 ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z +@ cdecl -arch=arm ??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor +@ thiscall -arch=i386 ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor +@ cdecl -arch=win64 ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor @ stub -arch=arm ??0_TaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z @ stub -arch=i386 ??0_TaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z @ stub -arch=win64 ??0_TaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 64ddeed42f4..68855b90096 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -59,9 +59,9 @@ @ stub -arch=arm ??0_SpinLock(a)details@Concurrency@@QAA(a)ACJ@Z @ stub -arch=i386 ??0_SpinLock(a)details@Concurrency@@QAE(a)ACJ@Z @ stub -arch=win64 ??0_SpinLock(a)details@Concurrency@@QEAA(a)AECJ@Z -@ stub -arch=arm ??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z -@ stub -arch=i386 ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z -@ stub -arch=win64 ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z +@ cdecl -arch=arm ??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor +@ thiscall -arch=i386 ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor +@ cdecl -arch=win64 ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor @ stub -arch=arm ??0_TaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z @ stub -arch=i386 ??0_TaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z @ stub -arch=win64 ??0_TaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 05f408d6884..eabb304dd6d 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -57,9 +57,9 @@ @ stub -arch=arm ??0_SpinLock(a)details@Concurrency@@QAA(a)ACJ@Z @ stub -arch=i386 ??0_SpinLock(a)details@Concurrency@@QAE(a)ACJ@Z @ stub -arch=win64 ??0_SpinLock(a)details@Concurrency@@QEAA(a)AECJ@Z -@ stub -arch=arm ??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z -@ stub -arch=i386 ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z -@ stub -arch=win64 ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z +@ cdecl -arch=arm ??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z(ptr ptr) msvcr120.??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z +@ thiscall -arch=i386 ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z(ptr ptr) msvcr120.??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z +@ cdecl -arch=win64 ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z(ptr ptr) msvcr120.??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z @ stub -arch=arm ??0_TaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z @ stub -arch=i386 ??0_TaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z @ stub -arch=win64 ??0_TaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 2ca6421b0e7..f9a7f489ceb 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -164,6 +164,11 @@ typedef struct yield_func yield_func; } SpinWait; +typedef struct +{ + char dummy; +} _StructuredTaskCollection; + /* keep in sync with msvcp90/msvcp90.h */ typedef struct cs_queue { @@ -1741,6 +1746,20 @@ bool __thiscall SpinWait__SpinOnce(SpinWait *this) } } +#if _MSVCR_VER >= 110 + +/* ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z */ +/* ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z */ +DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection_ctor, 8) +_StructuredTaskCollection* __thiscall _StructuredTaskCollection_ctor( + _StructuredTaskCollection *this, /*_CancellationTokenState*/void *token) +{ + FIXME("(%p): stub\n", this); + return NULL; +} + +#endif /* _MSVCR_VER >= 110 */ + /* ??0critical_section(a)Concurrency@@QAE(a)XZ */ /* ??0critical_section(a)Concurrency@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(critical_section_ctor, 4)

1 0

Zebediah Figura : wined3d: Clear the texture BO when loading textures into WINED3D_LOCATION_BUFFER.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 444a513de0a0b704c210d41cc7c185588d899db9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=444a513de0a0b704c210d41c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 22 15:42:54 2022 -0500 wined3d: Clear the texture BO when loading textures into WINED3D_LOCATION_BUFFER. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 55 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index eaa7cdf3ea5..dd1b0c88830 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -799,23 +799,6 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, return TRUE; } - if (current & WINED3D_LOCATION_CLEARED) - { - struct wined3d_bo_address addr; - - /* FIXME: Clear textures on the GPU if possible. */ - - if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM)) - return FALSE; - wined3d_texture_get_bo_address(texture, sub_resource_idx, &addr, WINED3D_LOCATION_SYSMEM); - memset(addr.addr, 0, texture->sub_resources[sub_resource_idx].size); - wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_SYSMEM); - current |= WINED3D_LOCATION_SYSMEM; - - if (current & location) - return TRUE; - } - if (!current) { ERR("Sub-resource %u of texture %p does not have any up to date location.\n", @@ -824,22 +807,54 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, return wined3d_texture_load_location(texture, sub_resource_idx, context, location); } - if ((location & wined3d_texture_sysmem_locations) && (current & wined3d_texture_sysmem_locations)) + if ((location & wined3d_texture_sysmem_locations) + && (current & (wined3d_texture_sysmem_locations | WINED3D_LOCATION_CLEARED))) { struct wined3d_bo_address source, destination; struct wined3d_range range; + void *map_ptr; if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) return FALSE; - wined3d_texture_get_bo_address(texture, sub_resource_idx, &source, (current & wined3d_texture_sysmem_locations)); wined3d_texture_get_bo_address(texture, sub_resource_idx, &destination, location); range.offset = 0; range.size = texture->sub_resources[sub_resource_idx].size; - wined3d_context_copy_bo_address(context, &destination, &source, 1, &range); + if (current & WINED3D_LOCATION_CLEARED) + { + if (destination.buffer_object) + map_ptr = wined3d_context_map_bo_address(context, &destination, range.size, + WINED3D_MAP_WRITE | WINED3D_MAP_DISCARD); + else + map_ptr = destination.addr; + memset(map_ptr, 0, range.size); + if (destination.buffer_object) + wined3d_context_unmap_bo_address(context, &destination, 1, &range); + } + else + { + wined3d_texture_get_bo_address(texture, sub_resource_idx, + &source, (current & wined3d_texture_sysmem_locations)); + wined3d_context_copy_bo_address(context, &destination, &source, 1, &range); + } ret = TRUE; } else + { + if (current & WINED3D_LOCATION_CLEARED) + { + struct wined3d_bo_address addr; + + /* FIXME: Clear textures on the GPU if possible. */ + + if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM)) + return FALSE; + wined3d_texture_get_bo_address(texture, sub_resource_idx, &addr, WINED3D_LOCATION_SYSMEM); + memset(addr.addr, 0, texture->sub_resources[sub_resource_idx].size); + wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_SYSMEM); + } + ret = texture->texture_ops->texture_load_location(texture, sub_resource_idx, context, location); + } if (ret) wined3d_texture_validate_location(texture, sub_resource_idx, location);

1 0

Zebediah Figura : wined3d: Move loading from CLEARED into the texture_load_location op.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 102cb840a4eb8bc96e9e907f3c7d8f2d4692ec1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=102cb840a4eb8bc96e9e907f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 22 15:42:55 2022 -0500 wined3d: Move loading from CLEARED into the texture_load_location op. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index dd1b0c88830..ddb1ffcde49 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -840,19 +840,6 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, } else { - if (current & WINED3D_LOCATION_CLEARED) - { - struct wined3d_bo_address addr; - - /* FIXME: Clear textures on the GPU if possible. */ - - if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM)) - return FALSE; - wined3d_texture_get_bo_address(texture, sub_resource_idx, &addr, WINED3D_LOCATION_SYSMEM); - memset(addr.addr, 0, texture->sub_resources[sub_resource_idx].size); - wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_SYSMEM); - } - ret = texture->texture_ops->texture_load_location(texture, sub_resource_idx, context, location); } @@ -3345,12 +3332,26 @@ static BOOL wined3d_texture_gl_prepare_location(struct wined3d_texture *texture, static BOOL wined3d_texture_gl_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { + struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture); struct wined3d_context_gl *context_gl = wined3d_context_gl(context); TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n", texture, sub_resource_idx, context, wined3d_debug_location(location)); + if (sub_resource->locations & WINED3D_LOCATION_CLEARED) + { + struct wined3d_bo_address addr; + + /* FIXME: Clear textures on the GPU if possible. */ + + if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM)) + return FALSE; + wined3d_texture_get_bo_address(texture, sub_resource_idx, &addr, WINED3D_LOCATION_SYSMEM); + memset(addr.addr, 0, sub_resource->size); + wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_SYSMEM); + } + if (!wined3d_texture_gl_prepare_location(texture, sub_resource_idx, context, location)) return FALSE; @@ -5181,6 +5182,20 @@ static BOOL wined3d_texture_vk_load_texture(struct wined3d_texture_vk *texture_v struct wined3d_box src_box; sub_resource = &texture_vk->t.sub_resources[sub_resource_idx]; + + if (sub_resource->locations & WINED3D_LOCATION_CLEARED) + { + struct wined3d_bo_address addr; + + /* FIXME: Clear textures on the GPU if possible. */ + + if (!wined3d_texture_prepare_location(&texture_vk->t, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM)) + return FALSE; + wined3d_texture_get_bo_address(&texture_vk->t, sub_resource_idx, &addr, WINED3D_LOCATION_SYSMEM); + memset(addr.addr, 0, sub_resource->size); + wined3d_texture_validate_location(&texture_vk->t, sub_resource_idx, WINED3D_LOCATION_SYSMEM); + } + if (!(sub_resource->locations & wined3d_texture_sysmem_locations)) { ERR("Unimplemented load from %s.\n", wined3d_debug_location(sub_resource->locations));

1 0