November 2021 - Wine-Commits

Gabriel Ivăncescu : mshtml: Fix reference leak in HTMLStyleSheetRulesCollection_item.
by Alexandre Julliard Nov. 1, 2021

Nov. 1, 2021

Module: wine Branch: master Commit: 9ca56d3e97160fa428131258f87ff8df39116d5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ca56d3e97160fa428131258… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 25 16:30:29 2021 +0300 mshtml: Fix reference leak in HTMLStyleSheetRulesCollection_item. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstylesheet.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 52eaa214508..c31c7809f63 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -348,6 +348,7 @@ static HRESULT WINAPI HTMLStyleSheetRulesCollection_item(IHTMLStyleSheetRulesCol HTMLStyleSheetRulesCollection *This = impl_from_IHTMLStyleSheetRulesCollection(iface); nsIDOMCSSRule *nsstylesheetrule; nsresult nsres; + HRESULT hres; TRACE("(%p)->(%d %p)\n", This, index, p); @@ -357,7 +358,9 @@ static HRESULT WINAPI HTMLStyleSheetRulesCollection_item(IHTMLStyleSheetRulesCol if(!nsstylesheetrule) return E_INVALIDARG; - return create_style_sheet_rule(nsstylesheetrule, dispex_compat_mode(&This->dispex), p); + hres = create_style_sheet_rule(nsstylesheetrule, dispex_compat_mode(&This->dispex), p); + nsIDOMCSSRule_Release(nsstylesheetrule); + return hres; } static const IHTMLStyleSheetRulesCollectionVtbl HTMLStyleSheetRulesCollectionVtbl = {

1 0

Zebediah Figura : qedit/tests: Test receiving EC_COMPLETE when not connected.
by Alexandre Julliard Nov. 1, 2021

Nov. 1, 2021

Module: wine Branch: master Commit: 59376f124bf4ddbbda73a7814bfa2c160325124e URL: https://source.winehq.org/git/wine.git/?a=commit;h=59376f124bf4ddbbda73a781… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 31 19:04:07 2021 -0500 qedit/tests: Test receiving EC_COMPLETE when not connected. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/nullrenderer.c | 104 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index 1800f4dad4c..b4003f43cf4 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -32,6 +32,15 @@ static IBaseFilter *create_null_renderer(void) return filter; } +static IFilterGraph2 *create_graph(void) +{ + IFilterGraph2 *ret; + HRESULT hr; + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&ret); + ok(hr == S_OK, "Failed to create FilterGraph: %#x\n", hr); + return ret; +} + static ULONG get_refcount(void *iface) { IUnknown *unknown = iface; @@ -791,6 +800,34 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) IMediaControl_Release(control); } +static unsigned int check_event_code(IMediaEvent *eventsrc, DWORD timeout, LONG expected_code, LONG_PTR expected1, LONG_PTR expected2) +{ + LONG_PTR param1, param2; + unsigned int ret = 0; + HRESULT hr; + LONG code; + + while ((hr = IMediaEvent_GetEvent(eventsrc, &code, &param1, &param2, timeout)) == S_OK) + { + if (code == expected_code) + { + ok(param1 == expected1, "Got param1 %#lx.\n", param1); + ok(param2 == expected2, "Got param2 %#lx.\n", param2); + ret++; + } + IMediaEvent_FreeEventParams(eventsrc, code, param1, param2); + timeout = 0; + } + ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + return ret; +} + +static unsigned int check_ec_complete(IMediaEvent *eventsrc, DWORD timeout) +{ + return check_event_code(eventsrc, timeout, EC_COMPLETE, S_OK, 0); +} + static void test_connect_pin(void) { static const AM_MEDIA_TYPE req_mt = @@ -900,6 +937,72 @@ static void test_connect_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_unconnected_eos(void) +{ + IBaseFilter *filter = create_null_renderer(); + IFilterGraph2 *graph = create_graph(); + IMediaControl *control; + IMediaEvent *eventsrc; + unsigned int ret; + HRESULT hr; + ULONG ref; + + hr = IFilterGraph2_AddFilter(graph, filter, L"renderer"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (void **)&eventsrc); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + IMediaControl_Release(control); + IMediaEvent_Release(eventsrc); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(nullrenderer) { IBaseFilter *filter; @@ -924,6 +1027,7 @@ START_TEST(nullrenderer) test_media_types(); test_enum_media_types(); test_connect_pin(); + test_unconnected_eos(); CoUninitialize(); }

1 0

Andrew Eikum : strmbase: Send EC_COMPLETE in IBaseFilter::Run() for unconnected renderers.
by Alexandre Julliard Nov. 1, 2021

Nov. 1, 2021

Module: wine Branch: master Commit: 6e11378df2f1cdbff984b7b8072e46a7738e74a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e11378df2f1cdbff984b7b8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Sun Oct 31 19:04:08 2021 -0500 strmbase: Send EC_COMPLETE in IBaseFilter::Run() for unconnected renderers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 6 +++--- dlls/qedit/tests/nullrenderer.c | 6 +++--- dlls/quartz/tests/videorenderer.c | 6 +++--- dlls/quartz/tests/vmr7.c | 6 +++--- dlls/quartz/tests/vmr9.c | 6 +++--- dlls/strmbase/renderer.c | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 8bfeb987352..48115388993 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -508,7 +508,7 @@ static void test_unconnected_eos(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); hr = IMediaControl_Pause(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -520,7 +520,7 @@ static void test_unconnected_eos(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -532,7 +532,7 @@ static void test_unconnected_eos(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); IMediaControl_Release(control); IMediaEvent_Release(eventsrc); diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index b4003f43cf4..cfbf1d37c2f 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -969,7 +969,7 @@ static void test_unconnected_eos(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); hr = IMediaControl_Pause(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -981,7 +981,7 @@ static void test_unconnected_eos(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -993,7 +993,7 @@ static void test_unconnected_eos(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); IMediaControl_Release(control); IMediaEvent_Release(eventsrc); diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 0ce24884200..5625971426b 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2897,7 +2897,7 @@ static void test_unconnected_eos(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); hr = IMediaControl_Pause(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -2909,7 +2909,7 @@ static void test_unconnected_eos(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -2921,7 +2921,7 @@ static void test_unconnected_eos(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); IMediaControl_Release(control); IMediaEvent_Release(eventsrc); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 1214d5dcbb7..efc876a845c 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -3101,7 +3101,7 @@ static void test_unconnected_eos(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); hr = IMediaControl_Pause(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -3113,7 +3113,7 @@ static void test_unconnected_eos(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -3125,7 +3125,7 @@ static void test_unconnected_eos(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); IMediaControl_Release(control); IMediaEvent_Release(eventsrc); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 618669595cb..a0ccb4898a9 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -4202,7 +4202,7 @@ static void test_unconnected_eos(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); hr = IMediaControl_Pause(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -4214,7 +4214,7 @@ static void test_unconnected_eos(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -4226,7 +4226,7 @@ static void test_unconnected_eos(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); IMediaControl_Release(control); IMediaEvent_Release(eventsrc); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index a879917b169..da257555a19 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -252,7 +252,7 @@ static HRESULT renderer_start_stream(struct strmbase_filter *iface, REFERENCE_TI if (filter->sink.pin.peer && filter->ops->renderer_start_stream) filter->ops->renderer_start_stream(filter); - if (filter->eos && graph + if ((filter->eos || !filter->sink.pin.peer) && graph && SUCCEEDED(IFilterGraph_QueryInterface(graph, &IID_IMediaEventSink, (void **)&event_sink))) {

1 0

Zebediah Figura : quartz/dsoundrender: Send EC_COMPLETE in IBaseFilter::Run() when not connected.
by Alexandre Julliard Nov. 1, 2021

Nov. 1, 2021

Module: wine Branch: master Commit: 0b79e2caa6f224fc0da672886c07f4f32dda4682 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b79e2caa6f224fc0da67288… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 31 19:04:09 2021 -0500 quartz/dsoundrender: Send EC_COMPLETE in IBaseFilter::Run() when not connected. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 2 +- dlls/quartz/tests/dsoundrender.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 51a66ac5d30..df40d1254ee 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -608,7 +608,7 @@ static HRESULT dsound_render_start_stream(struct strmbase_filter *iface, REFEREN if (filter->sink.pin.peer) IDirectSoundBuffer_Play(filter->dsbuffer, 0, 0, DSBPLAY_LOOPING); - if (filter->eos && graph + if ((filter->eos || !filter->sink.pin.peer) && graph && SUCCEEDED(IFilterGraph_QueryInterface(graph, &IID_IMediaEventSink, (void **)&event_sink))) { diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 9107828b9df..03e6b8413d5 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -1355,7 +1355,7 @@ static void test_unconnected_eos(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); hr = IMediaControl_Pause(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1367,7 +1367,7 @@ static void test_unconnected_eos(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1379,7 +1379,7 @@ static void test_unconnected_eos(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); IMediaControl_Release(control); IMediaEvent_Release(eventsrc);

1 0

Zebediah Figura : quartz/tests: Test receiving EC_COMPLETE when not connected.
by Alexandre Julliard Nov. 1, 2021

Nov. 1, 2021

Module: wine Branch: master Commit: 74b595162cb2c494a67a9bf2fcd3253183a58029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74b595162cb2c494a67a9bf2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 31 19:04:06 2021 -0500 quartz/tests: Test receiving EC_COMPLETE when not connected. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/dsoundrender.c | 76 +++++++++++++++++++++++++++++++ dlls/quartz/tests/videorenderer.c | 67 +++++++++++++++++++++++++++ dlls/quartz/tests/vmr7.c | 95 +++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/vmr9.c | 67 +++++++++++++++++++++++++++ 4 files changed, 305 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=74b595162cb2c494a67a…

1 0

Gabriel Ivăncescu : mshtml: Fix reference leak in HTMLStyleSheetsCollection_item.
by Alexandre Julliard Nov. 1, 2021

Nov. 1, 2021

Module: wine Branch: master Commit: c6b9cb7747130589bcfb47ecc840282f770b782d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6b9cb7747130589bcfb47ec… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 25 16:30:28 2021 +0300 mshtml: Fix reference leak in HTMLStyleSheetsCollection_item. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstylesheet.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index cbc2adf68b5..52eaa214508 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -540,6 +540,7 @@ static HRESULT WINAPI HTMLStyleSheetsCollection_item(IHTMLStyleSheetsCollection } hres = create_style_sheet(nsstylesheet, dispex_compat_mode(&This->dispex), &stylesheet); + nsIDOMStyleSheet_Release(nsstylesheet); if(FAILED(hres)) return hres;

1 0

Zebediah Figura : wined3d: Move the bo_user field to struct wined3d_buffer.
by Alexandre Julliard Nov. 1, 2021

Nov. 1, 2021

Module: wine Branch: master Commit: d4f8d13b099c87dd56c72c7e137e0a1dd2f20b42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4f8d13b099c87dd56c72c7e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 20 00:12:00 2021 -0500 wined3d: Move the bo_user field to struct wined3d_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/buffer.c | 18 +++++++++--------- dlls/wined3d/context_gl.c | 20 ++++++++++---------- dlls/wined3d/context_vk.c | 8 ++++---- dlls/wined3d/state.c | 6 +++--- dlls/wined3d/wined3d_private.h | 3 +-- 5 files changed, 27 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d4f8d13b099c87dd56c7…

1 0

Zebediah Figura : wined3d: Make wined3d_buffer_gl_binding_from_bind_flags() static.
by Alexandre Julliard Nov. 1, 2021

Nov. 1, 2021

Module: wine Branch: master Commit: cdf01b2f599d70e8a4d50c3b37df0ebd88bf72a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdf01b2f599d70e8a4d50c3b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 20 00:11:59 2021 -0500 wined3d: Make wined3d_buffer_gl_binding_from_bind_flags() static. 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/buffer.c | 56 +++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 854fa71aefe..54291f1d9dd 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -136,6 +136,34 @@ static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct w wined3d_context_gl_bind_bo(context_gl, buffer_gl->bo.binding, buffer_gl->bo.id); } +static GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *gl_info, uint32_t bind_flags) +{ + if (!bind_flags) + return GL_PIXEL_UNPACK_BUFFER; + + if (bind_flags == WINED3D_BIND_INDEX_BUFFER) + return GL_ELEMENT_ARRAY_BUFFER; + + if (bind_flags & (WINED3D_BIND_SHADER_RESOURCE | WINED3D_BIND_UNORDERED_ACCESS) + && gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT]) + return GL_TEXTURE_BUFFER; + + if (bind_flags & WINED3D_BIND_CONSTANT_BUFFER) + return GL_UNIFORM_BUFFER; + + if (bind_flags & WINED3D_BIND_STREAM_OUTPUT) + return GL_TRANSFORM_FEEDBACK_BUFFER; + + if (bind_flags & WINED3D_BIND_INDIRECT_BUFFER + && gl_info->supported[ARB_DRAW_INDIRECT]) + return GL_DRAW_INDIRECT_BUFFER; + + if (bind_flags & ~(WINED3D_BIND_VERTEX_BUFFER | WINED3D_BIND_INDEX_BUFFER)) + FIXME("Unhandled bind flags %#x.\n", bind_flags); + + return GL_ARRAY_BUFFER; +} + /* Context activation is done by the caller. */ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context_gl *context_gl) @@ -1116,34 +1144,6 @@ static const struct wined3d_resource_ops buffer_resource_ops = buffer_resource_sub_resource_unmap, }; -GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *gl_info, uint32_t bind_flags) -{ - if (!bind_flags) - return GL_PIXEL_UNPACK_BUFFER; - - if (bind_flags == WINED3D_BIND_INDEX_BUFFER) - return GL_ELEMENT_ARRAY_BUFFER; - - if (bind_flags & (WINED3D_BIND_SHADER_RESOURCE | WINED3D_BIND_UNORDERED_ACCESS) - && gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT]) - return GL_TEXTURE_BUFFER; - - if (bind_flags & WINED3D_BIND_CONSTANT_BUFFER) - return GL_UNIFORM_BUFFER; - - if (bind_flags & WINED3D_BIND_STREAM_OUTPUT) - return GL_TRANSFORM_FEEDBACK_BUFFER; - - if (bind_flags & WINED3D_BIND_INDIRECT_BUFFER - && gl_info->supported[ARB_DRAW_INDIRECT]) - return GL_DRAW_INDIRECT_BUFFER; - - if (bind_flags & ~(WINED3D_BIND_VERTEX_BUFFER | WINED3D_BIND_INDEX_BUFFER)) - FIXME("Unhandled bind flags %#x.\n", bind_flags); - - return GL_ARRAY_BUFFER; -} - static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_buffer_ops *buffer_ops) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6a6c84ee02f..63dc130d03d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5067,8 +5067,6 @@ static inline const struct wined3d_buffer_gl *wined3d_buffer_gl_const(const stru return CONTAINING_RECORD(buffer, struct wined3d_buffer_gl, b); } -GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *gl_info, - uint32_t bind_flags) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;

1 0

Francois Gouget : wined3d: Add a trailing linefeed to an ERR().
by Alexandre Julliard Nov. 1, 2021

Nov. 1, 2021

Module: wine Branch: master Commit: facd463f0e6682750781c3be1babb126e61d31cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=facd463f0e6682750781c3be… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Oct 20 16:39:44 2021 +0200 wined3d: Add a trailing linefeed to an ERR(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 94bbe27bd5c..374e693b17d 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -2021,7 +2021,7 @@ void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view if (format_id == WINED3DFMT_UNKNOWN) { - ERR("Unsupported format %s.", debug_d3dformat(view_format->id)); + ERR("Unsupported format %s.\n", debug_d3dformat(view_format->id)); return; }

1 0

Jan Sikorski : d3d9: Don't grab wined3d lock for surface AddRef/Release().
by Alexandre Julliard Nov. 1, 2021

Nov. 1, 2021

Module: wine Branch: master Commit: ce93526f4829d8033ee79b4f74b9171cfb6831bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce93526f4829d8033ee79b4f… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:31 2021 +0200 d3d9: Don't grab wined3d lock for surface AddRef/Release(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/surface.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 2ff5134781e..175fa6269cc 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -67,11 +67,9 @@ static ULONG WINAPI d3d9_surface_AddRef(IDirect3DSurface9 *iface) { if (surface->parent_device) IDirect3DDevice9Ex_AddRef(surface->parent_device); - wined3d_mutex_lock(); if (surface->wined3d_rtv) wined3d_rendertarget_view_incref(surface->wined3d_rtv); wined3d_texture_incref(surface->wined3d_texture); - wined3d_mutex_unlock(); } return refcount; @@ -103,11 +101,9 @@ static ULONG WINAPI d3d9_surface_Release(IDirect3DSurface9 *iface) { IDirect3DDevice9Ex *parent_device = surface->parent_device; - wined3d_mutex_lock(); if (surface->wined3d_rtv) wined3d_rendertarget_view_decref(surface->wined3d_rtv); wined3d_texture_decref(surface->wined3d_texture); - wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ if (parent_device)

1 0