September 2020 - Wine-commits

Anton Baskanov : amstream: Implement AMDirectDrawStream::SetState.
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: 999b59b7c1d73acbc1f528d7b9a2fbd5d0403d6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=999b59b7c1d73acbc1f528d7… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Sep 24 01:54:57 2020 +0700 amstream: Implement AMDirectDrawStream::SetState. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 13 ++++++-- dlls/amstream/tests/amstream.c | 76 +++++++++++++++++++++++------------------- 2 files changed, 51 insertions(+), 38 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index fdfe0374ab..a03cf41e92 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -57,6 +57,7 @@ struct ddraw_stream IMemAllocator *allocator; AM_MEDIA_TYPE mt; struct format format; + FILTER_STATE state; }; static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDrawSurface *surface, @@ -260,11 +261,17 @@ static HRESULT WINAPI ddraw_IAMMediaStream_Initialize(IAMMediaStream *iface, IUn static HRESULT WINAPI ddraw_IAMMediaStream_SetState(IAMMediaStream *iface, FILTER_STATE state) { - struct ddraw_stream *This = impl_from_IAMMediaStream(iface); + struct ddraw_stream *stream = impl_from_IAMMediaStream(iface); - FIXME("(%p/%p)->(%u) stub!\n", This, iface, state); + TRACE("stream %p, state %u.\n", stream, state); - return S_FALSE; + EnterCriticalSection(&stream->cs); + + stream->state = state; + + LeaveCriticalSection(&stream->cs); + + return S_OK; } static HRESULT WINAPI ddraw_IAMMediaStream_JoinAMMultiMediaStream(IAMMediaStream *iface, IAMMultiMediaStream *mmstream) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 1c0b36ea6c..8d4f07e308 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -3613,40 +3613,6 @@ static void test_ddrawstream_receive_connection(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -static void test_audiostream_set_state(void) -{ - IAMMultiMediaStream *mmstream = create_ammultimediastream(); - IAMMediaStream *am_stream; - IMediaStream *stream; - HRESULT hr; - ULONG ref; - - hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IMediaStream_QueryInterface(stream, &IID_IAMMediaStream, (void **)&am_stream); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IAMMediaStream_SetState(am_stream, 4); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IAMMediaStream_SetState(am_stream, State_Running); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IAMMediaStream_SetState(am_stream, State_Paused); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IAMMediaStream_SetState(am_stream, State_Stopped); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - ref = IAMMultiMediaStream_Release(mmstream); - ok(!ref, "Got outstanding refcount %d.\n", ref); - IAMMediaStream_Release(am_stream); - ref = IMediaStream_Release(stream); - ok(!ref, "Got outstanding refcount %d.\n", ref); -} - void test_audiostream_end_of_stream(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -5358,6 +5324,46 @@ static void test_ammediastream_join_filter_graph(void) check_ammediastream_join_filter_graph(&MSPID_PrimaryVideo); } +static void check_ammediastream_set_state(const MSPID *id) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IAMMediaStream *am_stream; + IMediaStream *stream; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, id, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IAMMediaStream, (void **)&am_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMediaStream_SetState(am_stream, 4); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMediaStream_SetState(am_stream, State_Running); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMediaStream_SetState(am_stream, State_Paused); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMediaStream_SetState(am_stream, State_Stopped); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IAMMediaStream_Release(am_stream); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_ammediastream_set_state(void) +{ + check_ammediastream_set_state(&MSPID_PrimaryAudio); + check_ammediastream_set_state(&MSPID_PrimaryVideo); +} + void test_mediastreamfilter_get_state(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -6787,7 +6793,6 @@ START_TEST(amstream) test_audiostream_get_format(); test_audiostream_set_format(); test_audiostream_receive_connection(); - test_audiostream_set_state(); test_audiostream_end_of_stream(); test_audiostream_receive(); test_audiostream_initialize(); @@ -6812,6 +6817,7 @@ START_TEST(amstream) test_ammediastream_join_am_multi_media_stream(); test_ammediastream_join_filter(); test_ammediastream_join_filter_graph(); + test_ammediastream_set_state(); test_mediastreamfilter_get_state(); test_mediastreamfilter_stop_pause_run();

1 0

Anton Baskanov : amstream: Implement AMDirectDrawStream::EndOfStream.
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: fdf43b9bacb1dc6b767f807e66fd3c33e4f5b7c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdf43b9bacb1dc6b767f807e… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Sep 24 01:54:58 2020 +0700 amstream: Implement AMDirectDrawStream::EndOfStream. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 23 +++++++- dlls/amstream/tests/amstream.c | 126 +++++++++++++++++++++-------------------- 2 files changed, 87 insertions(+), 62 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index a03cf41e92..0771587552 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -58,6 +58,7 @@ struct ddraw_stream AM_MEDIA_TYPE mt; struct format format; FILTER_STATE state; + BOOL eos; }; static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDrawSurface *surface, @@ -267,6 +268,9 @@ static HRESULT WINAPI ddraw_IAMMediaStream_SetState(IAMMediaStream *iface, FILTE EnterCriticalSection(&stream->cs); + if (stream->state == State_Stopped) + stream->eos = FALSE; + stream->state = state; LeaveCriticalSection(&stream->cs); @@ -1061,8 +1065,23 @@ static HRESULT WINAPI ddraw_sink_QueryInternalConnections(IPin *iface, IPin **pi static HRESULT WINAPI ddraw_sink_EndOfStream(IPin *iface) { - FIXME("iface %p, stub!\n", iface); - return E_NOTIMPL; + struct ddraw_stream *stream = impl_from_IPin(iface); + + TRACE("stream %p.\n", stream); + + EnterCriticalSection(&stream->cs); + + if (stream->eos) + { + LeaveCriticalSection(&stream->cs); + return E_FAIL; + } + + stream->eos = TRUE; + + LeaveCriticalSection(&stream->cs); + + return S_OK; } static HRESULT WINAPI ddraw_sink_BeginFlush(IPin *iface) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 8d4f07e308..9b25bdd7d1 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -3613,65 +3613,6 @@ static void test_ddrawstream_receive_connection(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -void test_audiostream_end_of_stream(void) -{ - IAMMultiMediaStream *mmstream = create_ammultimediastream(); - struct testfilter source; - IGraphBuilder *graph; - IMediaStream *stream; - HRESULT hr; - ULONG ref; - IPin *pin; - - hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!!graph, "Expected non-NULL graph.\n"); - testfilter_init(&source); - hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &audio_mt); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IPin_EndOfStream(pin); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IPin_EndOfStream(pin); - ok(hr == E_FAIL, "Got hr %#x.\n", hr); - - hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IPin_EndOfStream(pin); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IPin_EndOfStream(pin); - ok(hr == E_FAIL, "Got hr %#x.\n", hr); - - hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IPin_EndOfStream(pin); - ok(hr == E_FAIL, "Got hr %#x.\n", hr); - - IGraphBuilder_Disconnect(graph, pin); - IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); - - ref = IAMMultiMediaStream_Release(mmstream); - ok(!ref, "Got outstanding refcount %d.\n", ref); - ref = IGraphBuilder_Release(graph); - ok(!ref, "Got outstanding refcount %d.\n", ref); - IPin_Release(pin); - ref = IMediaStream_Release(stream); - ok(!ref, "Got outstanding refcount %d.\n", ref); -} - static void test_audiostream_receive(void) { ALLOCATOR_PROPERTIES properties = @@ -5364,6 +5305,71 @@ static void test_ammediastream_set_state(void) check_ammediastream_set_state(&MSPID_PrimaryVideo); } +static void check_ammediastream_end_of_stream(const MSPID *id, const AM_MEDIA_TYPE *mt) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + struct testfilter source; + IGraphBuilder *graph; + IMediaStream *stream; + HRESULT hr; + ULONG ref; + IPin *pin; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, id, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!graph, "Expected non-NULL graph.\n"); + testfilter_init(&source); + hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_EndOfStream(pin); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_EndOfStream(pin); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_EndOfStream(pin); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + IGraphBuilder_Disconnect(graph, pin); + IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_ammediastream_end_of_stream(void) +{ + check_ammediastream_end_of_stream(&MSPID_PrimaryAudio, &audio_mt); + check_ammediastream_end_of_stream(&MSPID_PrimaryVideo, &rgb32_mt); +} + void test_mediastreamfilter_get_state(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -6793,7 +6799,6 @@ START_TEST(amstream) test_audiostream_get_format(); test_audiostream_set_format(); test_audiostream_receive_connection(); - test_audiostream_end_of_stream(); test_audiostream_receive(); test_audiostream_initialize(); test_audiostream_begin_flush_end_flush(); @@ -6818,6 +6823,7 @@ START_TEST(amstream) test_ammediastream_join_filter(); test_ammediastream_join_filter_graph(); test_ammediastream_set_state(); + test_ammediastream_end_of_stream(); test_mediastreamfilter_get_state(); test_mediastreamfilter_stop_pause_run();

1 0

Nikolay Sivov : widl: Add null source pointer check for typelib writer.
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: fe5bfa5b7196786633c1e702d9e6d55f0bad3ccb URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe5bfa5b7196786633c1e702… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 23 20:46:22 2020 +0300 widl: Add null source pointer check for typelib writer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38964 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index aa05dcfe56..440bb23f79 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2560,7 +2560,8 @@ static void set_lib_flags(msft_typelib_t *typelib) static void ctl2_write_segment(msft_typelib_t *typelib, int segment) { - put_data(typelib->typelib_segment_data[segment], typelib->typelib_segdir[segment].length); + if (typelib->typelib_segment_data[segment]) + put_data(typelib->typelib_segment_data[segment], typelib->typelib_segdir[segment].length); } static void ctl2_finalize_typeinfos(msft_typelib_t *typelib, int filesize)

1 0

Nikolay Sivov : widl: Allow [restricted] for coclass-es.
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: d7b166976d70e0761e5c36345c520cdc2a0f3b16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7b166976d70e0761e5c3634… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 24 11:16:57 2020 +0300 widl: Allow [restricted] for coclass-es. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 52eb96488a..5bc0d82703 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2201,7 +2201,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_READONLY */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "readonly" }, /* ATTR_REPRESENTAS */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "represent_as" }, /* ATTR_REQUESTEDIT */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "requestedit" }, - /* ATTR_RESTRICTED */ { 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, "restricted" }, + /* ATTR_RESTRICTED */ { 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, "restricted" }, /* ATTR_RETVAL */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "retval" }, /* ATTR_SIZEIS */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "size_is" }, /* ATTR_SOURCE */ { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, "source" },

1 0

Henri Verbeet : wined3d: Do not accumulate ended queries in wined3d_query_vk_poll().
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: 3f3b0ac1f07e46f2e0205164a5e1fa9d10849ea9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f3b0ac1f07e46f2e0205164… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 23 17:39:59 2020 +0330 wined3d: Do not accumulate ended queries in wined3d_query_vk_poll(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 3af5649990..bb860db4eb 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1571,7 +1571,9 @@ static BOOL wined3d_query_vk_poll(struct wined3d_query *query, uint32_t flags) if (query_vk->pending_count) goto unavailable; - if (!wined3d_query_vk_accumulate_data(query_vk, context_vk, &query_vk->pool_idx)) + /* If the query was suspended, and then ended before it was resumed, + * there's no data to accumulate here. */ + if (query_vk->pool_idx.pool_vk && !wined3d_query_vk_accumulate_data(query_vk, context_vk, &query_vk->pool_idx)) goto unavailable; context_release(&context_vk->c);

1 0

Zebediah Figura : vkd3d: Move the ID3DBlob implementation to vkd3d-common.
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: vkd3d Branch: master Commit: e5fea6ade01c73384236d1fbf1a30e0babc7371f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e5fea6ade01c73384236d1f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 23 11:07:47 2020 -0500 vkd3d: Move the ID3DBlob implementation to vkd3d-common. 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> --- Makefile.am | 2 + include/private/vkd3d_blob.h | 27 +++++++++ libs/vkd3d-common/blob.c | 137 +++++++++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_main.c | 141 ++----------------------------------------- libs/vkd3d/vkd3d_private.h | 1 + 5 files changed, 173 insertions(+), 135 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=e5fea6ade01c7338423…

1 0

Zebediah Figura : vkd3d-utils: Introduce D3DCreateBlob().
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: vkd3d Branch: master Commit: b72a2893c27d40b4cb5fd0d7f6cf0e47adc54a20 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b72a2893c27d40b4cb5fd0d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 23 11:07:48 2020 -0500 vkd3d-utils: Introduce D3DCreateBlob(). 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> --- Makefile.am | 1 + include/vkd3d_d3dcompiler.h | 26 ++++++++++++++++++++++++++ include/vkd3d_utils.h | 3 +++ libs/vkd3d-utils/vkd3d_utils.map | 1 + libs/vkd3d-utils/vkd3d_utils_main.c | 18 ++++++++++++++++++ libs/vkd3d-utils/vkd3d_utils_private.h | 2 ++ 6 files changed, 51 insertions(+) diff --git a/Makefile.am b/Makefile.am index d0c7cd5..fe6ba92 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,6 +20,7 @@ vkd3d_public_headers = \ include/vkd3d_d3d12.h \ include/vkd3d_d3d12sdklayers.h \ include/vkd3d_d3dcommon.h \ + include/vkd3d_d3dcompiler.h \ include/vkd3d_dxgibase.h \ include/vkd3d_dxgiformat.h \ include/vkd3d_shader.h \ diff --git a/include/vkd3d_d3dcompiler.h b/include/vkd3d_d3dcompiler.h new file mode 100644 index 0000000..25f6044 --- /dev/null +++ b/include/vkd3d_d3dcompiler.h @@ -0,0 +1,26 @@ +/* + * Copyright 2010 Matteo Bruni 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 + */ + +#ifndef __VKD3D_D3DCOMPILER_H +#define __VKD3D_D3DCOMPILER_H +#ifndef __D3DCOMPILER_H__ + +HRESULT WINAPI D3DCreateBlob(SIZE_T size, ID3D10Blob **blob); + +#endif /* __D3DCOMPILER_H__ */ +#endif /* __VKD3D_D3DCOMPILER_H */ diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index 02687ed..f1fc4db 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -54,6 +54,9 @@ HRESULT WINAPI D3D12CreateVersionedRootSignatureDeserializer(const void *data, HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, ID3DBlob **blob, ID3DBlob **error_blob); +/* 1.3 */ +HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3D10Blob **blob); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libs/vkd3d-utils/vkd3d_utils.map b/libs/vkd3d-utils/vkd3d_utils.map index fb39124..20d182c 100644 --- a/libs/vkd3d-utils/vkd3d_utils.map +++ b/libs/vkd3d-utils/vkd3d_utils.map @@ -8,6 +8,7 @@ global: D3D12GetDebugInterface; D3D12SerializeRootSignature; D3D12SerializeVersionedRootSignature; + D3DCreateBlob; vkd3d_create_event; vkd3d_destroy_event; vkd3d_signal_event; diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index c19fe7f..ffb655f 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -232,3 +232,21 @@ void vkd3d_destroy_event(HANDLE event) ERR("Failed to destroy condition variable, error %d.\n", rc); vkd3d_free(impl); } + +HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3D10Blob **blob) +{ + HRESULT hr; + void *data; + + TRACE("data_size %lu, blob %p.\n", data_size, blob); + + if (!(data = vkd3d_calloc(data_size, 1))) + return E_OUTOFMEMORY; + + if (FAILED(hr = vkd3d_blob_create(data, data_size, blob))) + { + WARN("Failed to create blob object, hr %#x.\n", hr); + vkd3d_free(data); + } + return hr; +} diff --git a/libs/vkd3d-utils/vkd3d_utils_private.h b/libs/vkd3d-utils/vkd3d_utils_private.h index 6b5851e..3c73f42 100644 --- a/libs/vkd3d-utils/vkd3d_utils_private.h +++ b/libs/vkd3d-utils/vkd3d_utils_private.h @@ -25,7 +25,9 @@ #include <pthread.h> #include <vkd3d.h> +#include <vkd3d_shader.h> +#include "vkd3d_blob.h" #include "vkd3d_memory.h" #include <vkd3d_utils.h>

1 0

Alexandre Julliard : server: Keep permanent objects on the standard object list.
by Alexandre Julliard 23 Sep '20

23 Sep '20

Module: wine Branch: master Commit: 3b3c8619c852513f57ce7388557c8451691fbe00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b3c8619c852513f57ce7388… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 23 15:34:10 2020 +0200 server: Keep permanent objects on the standard object list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/object.c | 47 ++++++----------------------------------------- server/object.h | 5 +++-- 2 files changed, 9 insertions(+), 43 deletions(-) diff --git a/server/object.c b/server/object.c index 27c1aa58ad..77dec733a5 100644 --- a/server/object.c +++ b/server/object.c @@ -52,22 +52,13 @@ struct namespace #ifdef DEBUG_OBJECTS static struct list object_list = LIST_INIT(object_list); -static struct list static_object_list = LIST_INIT(static_object_list); void dump_objects(void) { - struct list *p; + struct object *ptr; - LIST_FOR_EACH( p, &static_object_list ) - { - struct object *ptr = LIST_ENTRY( p, struct object, obj_list ); - fprintf( stderr, "%p:%d: ", ptr, ptr->refcount ); - dump_object_name( ptr ); - ptr->ops->dump( ptr, 1 ); - } - LIST_FOR_EACH( p, &object_list ) + LIST_FOR_EACH_ENTRY( ptr, &object_list, struct object, obj_list ) { - struct object *ptr = LIST_ENTRY( p, struct object, obj_list ); fprintf( stderr, "%p:%d: ", ptr, ptr->refcount ); dump_object_name( ptr ); ptr->ops->dump( ptr, 1 ); @@ -76,17 +67,11 @@ void dump_objects(void) void close_objects(void) { - struct list *ptr; + struct object *obj, *obj2; - /* release the static objects */ - while ((ptr = list_head( &static_object_list ))) - { - struct object *obj = LIST_ENTRY( ptr, struct object, obj_list ); - /* move it back to the standard list before freeing */ - list_remove( &obj->obj_list ); - list_add_head( &object_list, &obj->obj_list ); - release_object( obj ); - } + /* release the permanent objects */ + LIST_FOR_EACH_ENTRY_SAFE( obj, obj2, &object_list, struct object, obj_list ) + if (obj->is_permanent) release_object( obj ); dump_objects(); /* dump any remaining objects */ } @@ -406,26 +391,6 @@ void unlink_named_object( struct object *obj ) free( name_ptr ); } -/* mark an object as being permanent, i.e. only released at shutdown */ -void make_object_permanent( struct object *obj ) -{ - obj->is_permanent = 1; -#ifdef DEBUG_OBJECTS - list_remove( &obj->obj_list ); - list_add_head( &static_object_list, &obj->obj_list ); -#endif -} - -/* mark an object as no longer permanent */ -void make_object_temporary( struct object *obj ) -{ - obj->is_permanent = 0; -#ifdef DEBUG_OBJECTS - list_remove( &obj->obj_list ); - list_add_head( &object_list, &obj->obj_list ); -#endif -} - /* grab an object (i.e. increment its refcount) and return the object */ struct object *grab_object( void *ptr ) { diff --git a/server/object.h b/server/object.h index f8a3a971d6..394a4aac46 100644 --- a/server/object.h +++ b/server/object.h @@ -145,8 +145,6 @@ extern void *create_named_object( struct object *parent, const struct object_ops extern void *open_named_object( struct object *parent, const struct object_ops *ops, const struct unicode_str *name, unsigned int attributes ); extern void unlink_named_object( struct object *obj ); -extern void make_object_permanent( struct object *obj ); -extern void make_object_temporary( struct object *obj ); extern struct namespace *create_namespace( unsigned int hash_size ); extern void free_kernel_objects( struct object *obj ); /* grab/release_object can take any pointer, but you better make sure */ @@ -180,6 +178,9 @@ extern void dump_objects(void); extern void close_objects(void); #endif +static inline void make_object_permanent( struct object *obj ) { obj->is_permanent = 1; } +static inline void make_object_temporary( struct object *obj ) { obj->is_permanent = 0; } + /* event functions */ struct event;

1 0

Biswapriyo Nath : include/ddraw.h: Add missing members in DDPIXELFORMAT struct.
by Alexandre Julliard 23 Sep '20

23 Sep '20

Module: wine Branch: master Commit: 7a4ca1b0b2b5203b7ec9c7b56f9ccf25691ba91f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a4ca1b0b2b5203b7ec9c7b5… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 22 10:04:41 2020 +0530 include/ddraw.h: Add missing members in DDPIXELFORMAT struct. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddraw.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/ddraw.h b/include/ddraw.h index cb77df19f0..528c70aa21 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -743,6 +743,7 @@ typedef struct _DDPIXELFORMAT { DWORD dwAlphaBitDepth; /* C: how many bits for alpha channels*/ DWORD dwLuminanceBitCount; DWORD dwBumpBitCount; + DWORD dwPrivateFormatBitCount; } DUMMYUNIONNAME1; union { DWORD dwRBitMask; /* 10: mask for red bit*/ @@ -750,12 +751,17 @@ typedef struct _DDPIXELFORMAT { DWORD dwStencilBitDepth; DWORD dwLuminanceBitMask; DWORD dwBumpDuBitMask; + DWORD dwOperations; } DUMMYUNIONNAME2; union { DWORD dwGBitMask; /* 14: mask for green bits*/ DWORD dwUBitMask; /* 14: mask for U bits*/ DWORD dwZBitMask; DWORD dwBumpDvBitMask; + struct { + WORD wFlipMSTypes; + WORD wBltMSTypes; + } MultiSampleCaps; } DUMMYUNIONNAME3; union { DWORD dwBBitMask; /* 18: mask for blue bits*/

1 0

Biswapriyo Nath : include/ddraw.h: Add missing UpdateOverlay flags.
by Alexandre Julliard 23 Sep '20

23 Sep '20

Module: wine Branch: master Commit: 577ee2938f89c23a10e63ea9910f2c9c8fdaf426 URL: https://source.winehq.org/git/wine.git/?a=commit;h=577ee2938f89c23a10e63ea9… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 22 10:04:41 2020 +0530 include/ddraw.h: Add missing UpdateOverlay flags. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddraw.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/ddraw.h b/include/ddraw.h index 528c70aa21..6f7cc0ec27 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -895,6 +895,9 @@ typedef struct _DDPIXELFORMAT { #define DDOVER_BOB 0x00200000 #define DDOVER_OVERRIDEBOBWEAVE 0x00400000 #define DDOVER_INTERLEAVED 0x00800000 +#define DDOVER_BOBHARDWARE 0x01000000 +#define DDOVER_ARGBSCALEFACTORS 0x02000000 +#define DDOVER_DEGRADEARGBSCALING 0x04000000 /* DDPIXELFORMAT.dwFlags */ #define DDPF_ALPHAPIXELS 0x00000001

1 0