wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Cressida Silver : WWN417
by Jeremy Newman 29 Apr '22

29 Apr '22

Module: website Branch: master Commit: 2eba047386161e1bac8d5cec7dcca74a44f9e9c4 URL: https://source.winehq.org/git/website.git/?a=commit;h=2eba047386161e1bac8d5… Author: Cressida Silver <cjsilver(a)codeweavers.com> Date: Fri Apr 29 12:08:24 2022 -0500 WWN417 --- news/en/2022042902.xml | 14 ++++ wwn/en/wn20220429_417.xml | 185 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 199 insertions(+) diff --git a/news/en/2022042902.xml b/news/en/2022042902.xml new file mode 100644 index 00000000..305c8d31 --- /dev/null +++ b/news/en/2022042902.xml @@ -0,0 +1,14 @@ +<news> + <date>April 29th, 2022</date> + <title>World Wine News Issue 417</title> + <body> + <a href="{$root}/wwn/417">WWN 417</a> covers the new GitLab instance and Wine 7.7. + <p> + <ul> + <li><a href="{$root}/wwn/417#GitLab" class="">GitLab</a></li> + <li><a href="{$root}/wwn/417#Wine 7.7" class="">Wine 7.7</a></li> + <li><a href="{$root}/wwn/417#A Bug's Life" class="">A Bug's Life</a></li> + </ul> + </p> + </body> +</news> diff --git a/wwn/en/wn20220429_417.xml b/wwn/en/wn20220429_417.xml new file mode 100644 index 00000000..2f4ba9c7 --- /dev/null +++ b/wwn/en/wn20220429_417.xml @@ -0,0 +1,185 @@ +<kc> + <title>Wine Traffic</title> + <author contact="mailto:wwn@winehq.org">Cressida Silver</author> + <issue num="417" date="04/29/2022"/> + <intro> + <p> + This is the 417th issue of the World Wine News publication. Its main goal is to inform you of what's going on around Wine. + Wine is an open-source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. + Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code. + </p> + </intro> + + <section title="GitLab"> + <p> + WineHQ is testing a <a href="https://gitlab.winehq.org">GitLab</a> instance. Currently, it contains projects for the main Wine Tree, WineHQ tools, and the WineHQ website. Create an account <a href="https://gitlab.winehq.org/users/sign_up">here.</a> + </p> + + <p> + A mail gateway forwards merge requests and comments from the WineHQ GitLab to the wine-devel mailing list, so <i>lab</i> activity is visible on the mailing list. Most actions can also be accomplished from the command line, with the help of tools like or <a href="https://github.com/profclems/glab">this,</a> or <a href="https://github.com/zaquestion/lab">this.</a> There is a wine-demo project for testing merge requests or debug scripts without worrying about goofing up the actual project. The mail gateway does not send wine-demo activity to wine-devel, so don't worry about making mistakes. + </p> + + <p> + Only time will tell if switching to GitLab makes sense, but it has the potential to improve the current process. Create an account, test it out, and see if it fits your workflow. + </p> + </section> + + <section title="Wine 7.7"> + <p> + Wine 7.7 spilled onto the scene last Friday. More progress on <a href="https://www.winehq.org/wwn/408#Conversion%20to%20PE%20Files">PE conversion,</a> support for UTF-8 as default for ANSI codepage, and theming support for control panel applets. Below is a list of closed bugs. + </p> + </section> + + <section title="A Bug's Life"> + <p> + <center> + <table cellspacing="0" bordercolor="#222222" border="2"> + <tr> + <td width="100" align="center"> + <b>Bug ID</b> + </td> + <td width="100" align="center"> + <b>Open Date</b> + </td> + <td width="100" align="center"> + <b>Days Open</b> + </td> + <td width="100" align="center"> + <b>Weeks Open</b> + </td> + <td width="100" align="center"> + <b>Months Open</b> + </td> + <td width="100" align="center"> + <b>Years Open</b> + </td> + <td width="850" align="center"> + <b>Bug Summary</b> + </td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=6682">6682</a> + </td> + <td align="center">11/14/06</td> + <td align="center">5,638</td> + <td align="center">805</td> + <td align="center">185</td> + <td align="center">15</td> + <td align="">IrfanView's 4.44 Help -> About window is missing a picture on the left</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=24574">24574</a> + </td> + <td align="center">9/30/10</td> + <td align="center">4,222</td> + <td align="center">603</td> + <td align="center">138</td> + <td align="center">12</td> + <td align="">RAR Password Recovery Magic initial (registration) window is empty and doesn't allow any interaction</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=45916">45916</a> + </td> + <td align="center">9/30/18</td> + <td align="center">1,300</td> + <td align="center">186</td> + <td align="center">42</td> + <td align="center">4</td> + <td align="">x64dbg fails to load debuggee, needs ThreadScheduler_ScheduleTask</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52223">52223</a> + </td> + <td align="center">12/15/21</td> + <td align="center">128</td> + <td align="center">18</td> + <td align="center">4</td> + <td align="center">0</td> + <td align="">activeCodePage utf-8 in application manifest not respected</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52640">52640</a> + </td> + <td align="center">3/9/22</td> + <td align="center">44</td> + <td align="center">6</td> + <td align="center">1</td> + <td align="center">0</td> + <td align=""> Steam does not display anything when using the Vulkan renderer (stack overflow from official Vulkan loader calling into dxgi)</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52679">52679</a> + </td> + <td align="center">3/15/22</td> + <td align="center">38</td> + <td align="center">5</td> + <td align="center">1</td> + <td align="center">0</td> + <td align="">Anno 1602 / 1602 A.D. graphics too dark / black</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52703">52703</a> + </td> + <td align="center">3/20/22</td> + <td align="center">33</td> + <td align="center">5</td> + <td align="center">1</td> + <td align="center">0</td> + <td align="">64-bit Irfanview crashes on startup</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52763">52763</a> + </td> + <td align="center">4/2/22</td> + <td align="center">20</td> + <td align="center">3</td> + <td align="center">0</td> + <td align="center">0</td> + <td align="">ConEmu doesn't work with winver > Win8.1</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52787">52787</a> + </td> + <td align="center">4/8/22</td> + <td align="center">14</td> + <td align="center">2</td> + <td align="center">0</td> + <td align="center">0</td> + <td align="">Invalid function prototype for "RegisterUserApiHook" when compiling for C++</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52809">52809</a> + </td> + <td align="center">4/12/22</td> + <td align="center">10</td> + <td align="center">1</td> + <td align="center">0</td> + <td align="center">0</td> + <td align="">steamwebhelper.exe crashes repeatedly since 2aa4673f32</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52825">52825</a> + </td> + <td align="center">4/16/22</td> + <td align="center">6</td> + <td align="center">1</td> + <td align="center">0</td> + <td align="center">0</td> + <td align="">Capella help crashes with Error "qtwebengingeprocess has serious errors"</td> + </tr> + </table> + </center> + </p> + </section> +</kc>

1 0

Anton Baskanov : winegstreamer: Reject incompatible output types in MPEG audio decoder.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: 64b96eec7d0aea470f897a3ed0ac9e1b3a680cc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64b96eec7d0aea470f897a3e… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Apr 28 14:27:25 2022 +0700 winegstreamer: Reject incompatible output types in MPEG audio decoder. 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 | 20 ++++++++-------- dlls/winegstreamer/quartz_transform.c | 45 +++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/tests/mpegaudio.c b/dlls/quartz/tests/mpegaudio.c index 68e49afe576..ae098dba355 100644 --- a/dlls/quartz/tests/mpegaudio.c +++ b/dlls/quartz/tests/mpegaudio.c @@ -819,7 +819,7 @@ static void test_media_types(void) init_pcm_mt(&mt, &format, 1, 32000, 16); hr = IPin_QueryAccept(pin, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); IPin_Release(pin); @@ -951,42 +951,42 @@ static void test_connect_pin(void) init_pcm_mt(&req_mt, &req_format, 1, 32000, 16); req_mt.majortype = GUID_NULL; hr = IPin_QueryAccept(source, &req_mt); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); init_pcm_mt(&req_mt, &req_format, 1, 32000, 16); req_mt.subtype = GUID_NULL; hr = IPin_QueryAccept(source, &req_mt); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); init_pcm_mt(&req_mt, &req_format, 1, 32000, 16); req_mt.formattype = GUID_NULL; hr = IPin_QueryAccept(source, &req_mt); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); init_pcm_mt(&req_mt, &req_format, 2, 32000, 16); hr = IPin_QueryAccept(source, &req_mt); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); init_pcm_mt(&req_mt, &req_format, 1, 16000, 16); hr = IPin_QueryAccept(source, &req_mt); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); init_pcm_mt(&req_mt, &req_format, 1, 32000, 24); hr = IPin_QueryAccept(source, &req_mt); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IPin_QueryAccept(source, &pcm16ex_mt); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); init_pcm_mt(&req_mt, &req_format, 1, 32000, 16); req_format.nBlockAlign = 333; hr = IPin_QueryAccept(source, &req_mt); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); init_pcm_mt(&req_mt, &req_format, 1, 32000, 16); req_format.nAvgBytesPerSec = 333; hr = IPin_QueryAccept(source, &req_mt); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IMediaControl_Pause(control); ok(hr == S_OK, "Got hr %#lx.\n", hr); diff --git a/dlls/winegstreamer/quartz_transform.c b/dlls/winegstreamer/quartz_transform.c index 4472e524dae..8207d24ca8d 100644 --- a/dlls/winegstreamer/quartz_transform.c +++ b/dlls/winegstreamer/quartz_transform.c @@ -35,6 +35,7 @@ struct transform struct transform_ops { HRESULT (*sink_query_accept)(struct transform *filter, const AM_MEDIA_TYPE *mt); + HRESULT (*source_query_accept)(struct transform *filter, const AM_MEDIA_TYPE *mt); }; static inline struct transform *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -95,8 +96,16 @@ static const struct strmbase_sink_ops sink_ops = .base.pin_query_interface = transform_sink_query_interface, }; +static HRESULT transform_source_query_accept(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt) +{ + struct transform *filter = impl_from_strmbase_filter(pin->filter); + + return filter->ops->source_query_accept(filter, mt); +} + static const struct strmbase_source_ops source_ops = { + .base.pin_query_accept = transform_source_query_accept, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, }; @@ -145,9 +154,45 @@ static HRESULT mpeg_audio_codec_sink_query_accept(struct transform *filter, cons return S_OK; } +static HRESULT mpeg_audio_codec_source_query_accept(struct transform *filter, const AM_MEDIA_TYPE *mt) +{ + const MPEG1WAVEFORMAT *input_format; + const WAVEFORMATEX *output_format; + DWORD expected_avg_bytes_per_sec; + WORD expected_block_align; + + if (!filter->sink.pin.peer) + return S_FALSE; + + if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Audio) + || !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_PCM) + || !IsEqualGUID(&mt->formattype, &FORMAT_WaveFormatEx) + || mt->cbFormat < sizeof(WAVEFORMATEX)) + return S_FALSE; + + input_format = (const MPEG1WAVEFORMAT *)filter->sink.pin.mt.pbFormat; + output_format = (const WAVEFORMATEX *)mt->pbFormat; + + if (output_format->wFormatTag != WAVE_FORMAT_PCM + || input_format->wfx.nSamplesPerSec != output_format->nSamplesPerSec + || input_format->wfx.nChannels != output_format->nChannels + || (output_format->wBitsPerSample != 8 && output_format->wBitsPerSample != 16)) + return S_FALSE; + + expected_block_align = output_format->nChannels * output_format->wBitsPerSample / 8; + expected_avg_bytes_per_sec = expected_block_align * output_format->nSamplesPerSec; + + if (output_format->nBlockAlign != expected_block_align + || output_format->nAvgBytesPerSec != expected_avg_bytes_per_sec) + return S_FALSE; + + return S_OK; +} + static const struct transform_ops mpeg_audio_codec_transform_ops = { mpeg_audio_codec_sink_query_accept, + mpeg_audio_codec_source_query_accept, }; HRESULT mpeg_audio_codec_create(IUnknown *outer, IUnknown **out)

1 0

Anton Baskanov : quartz/tests: Add tests for MPEG audio decoder sink connection.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: a7a90de929f3a37507a3f4d4231c778f79e5fa94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7a90de929f3a37507a3f4d4… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Apr 28 14:27:24 2022 +0700 quartz/tests: Add tests for MPEG audio decoder sink connection. 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 | 238 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 227 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7a90de929f3a37507a3…

1 0

Anton Baskanov : winegstreamer: Reject incompatible input media types in MPEG audio decoder.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: 2298f04a1d40a008a843ac4b0573d1a3234d5f82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2298f04a1d40a008a843ac4b… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Apr 28 14:27:23 2022 +0700 winegstreamer: Reject incompatible input media types in MPEG audio decoder. 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 | 10 +++---- dlls/winegstreamer/quartz_transform.c | 52 +++++++++++++++++++++++++++++++++-- 2 files changed, 55 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/tests/mpegaudio.c b/dlls/quartz/tests/mpegaudio.c index cbf8ef393d2..84297884a6d 100644 --- a/dlls/quartz/tests/mpegaudio.c +++ b/dlls/quartz/tests/mpegaudio.c @@ -759,25 +759,25 @@ static void test_media_types(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IPin_QueryAccept(pin, &mp3_mt0); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IPin_QueryAccept(pin, &mp3_mt1); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); mt = mp2_mt; mt.majortype = GUID_NULL; hr = IPin_QueryAccept(pin, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); mt = mp2_mt; mt.subtype = MEDIASUBTYPE_PCM; hr = IPin_QueryAccept(pin, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); mt = mp2_mt; mt.formattype = GUID_NULL; hr = IPin_QueryAccept(pin, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); IPin_Release(pin); diff --git a/dlls/winegstreamer/quartz_transform.c b/dlls/winegstreamer/quartz_transform.c index 9665c56d848..4472e524dae 100644 --- a/dlls/winegstreamer/quartz_transform.c +++ b/dlls/winegstreamer/quartz_transform.c @@ -28,6 +28,13 @@ struct transform struct strmbase_sink sink; struct strmbase_source source; + + const struct transform_ops *ops; +}; + +struct transform_ops +{ + HRESULT (*sink_query_accept)(struct transform *filter, const AM_MEDIA_TYPE *mt); }; static inline struct transform *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -62,6 +69,13 @@ static const struct strmbase_filter_ops filter_ops = .filter_destroy = transform_destroy, }; +static HRESULT transform_sink_query_accept(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt) +{ + struct transform *filter = impl_from_strmbase_filter(pin->filter); + + return filter->ops->sink_query_accept(filter, mt); +} + static HRESULT transform_sink_query_interface(struct strmbase_pin *pin, REFIID iid, void **out) { struct transform *filter = impl_from_strmbase_filter(pin->filter); @@ -77,6 +91,7 @@ static HRESULT transform_sink_query_interface(struct strmbase_pin *pin, REFIID i static const struct strmbase_sink_ops sink_ops = { + .base.pin_query_accept = transform_sink_query_accept, .base.pin_query_interface = transform_sink_query_interface, }; @@ -86,7 +101,7 @@ static const struct strmbase_source_ops source_ops = .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, }; -static HRESULT transform_create(IUnknown *outer, const CLSID *clsid, struct transform **out) +static HRESULT transform_create(IUnknown *outer, const CLSID *clsid, const struct transform_ops *ops, struct transform **out) { struct transform *object; @@ -98,16 +113,49 @@ static HRESULT transform_create(IUnknown *outer, const CLSID *clsid, struct tran strmbase_sink_init(&object->sink, &object->filter, L"In", &sink_ops, NULL); strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops); + object->ops = ops; + *out = object; return S_OK; } +static HRESULT mpeg_audio_codec_sink_query_accept(struct transform *filter, const AM_MEDIA_TYPE *mt) +{ + const MPEG1WAVEFORMAT *format; + + if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Audio)) + return S_FALSE; + + if (!IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_MPEG1Packet) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_MPEG1Payload) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_MPEG1AudioPayload) + && !IsEqualGUID(&mt->subtype, &GUID_NULL)) + return S_FALSE; + + if (!IsEqualGUID(&mt->formattype, &FORMAT_WaveFormatEx) + || mt->cbFormat < sizeof(MPEG1WAVEFORMAT)) + return S_FALSE; + + format = (const MPEG1WAVEFORMAT *)mt->pbFormat; + + if (format->wfx.wFormatTag != WAVE_FORMAT_MPEG + || format->fwHeadLayer == ACM_MPEG_LAYER3) + return S_FALSE; + + return S_OK; +} + +static const struct transform_ops mpeg_audio_codec_transform_ops = +{ + mpeg_audio_codec_sink_query_accept, +}; + HRESULT mpeg_audio_codec_create(IUnknown *outer, IUnknown **out) { struct transform *object; HRESULT hr; - hr = transform_create(outer, &CLSID_CMpegAudioCodec, &object); + hr = transform_create(outer, &CLSID_CMpegAudioCodec, &mpeg_audio_codec_transform_ops, &object); if (FAILED(hr)) return hr;

1 0

Rémi Bernon : winegstreamer: Check whether transforms are supported at creation time.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: 3aaa953bd6f71c77a3d3ec34ab0f5155f67346db URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aaa953bd6f71c77a3d3ec34… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 27 20:41:26 2022 +0200 winegstreamer: Check whether transforms are supported at creation time. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52908 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52914 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/h264_decoder.c | 19 +++++++++++++++++++ dlls/winegstreamer/wma_decoder.c | 20 ++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 1c7bf391bf7..b98f137eb82 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -595,10 +595,29 @@ static const IMFTransformVtbl transform_vtbl = HRESULT h264_decoder_create(REFIID riid, void **ret) { + struct wg_format output_format = + { + .major_type = WG_MAJOR_TYPE_VIDEO, + .u.video = + { + .format = WG_VIDEO_FORMAT_I420, + .width = 1920, + .height = 1080, + }, + }; + struct wg_format input_format = {.major_type = WG_MAJOR_TYPE_H264}; + struct wg_transform *transform; struct h264_decoder *decoder; TRACE("riid %s, ret %p.\n", debugstr_guid(riid), ret); + if (!(transform = wg_transform_create(&input_format, &output_format))) + { + FIXME("GStreamer doesn't support H264 decoding, please install appropriate plugins\n"); + return E_FAIL; + } + wg_transform_destroy(transform); + if (!(decoder = calloc(1, sizeof(*decoder)))) return E_OUTOFMEMORY; diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 57b0f204f9e..24ea176bfc8 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -853,10 +853,30 @@ static const IPropertyBagVtbl property_bag_vtbl = HRESULT wma_decoder_create(IUnknown *outer, IUnknown **out) { + struct wg_format output_format = + { + .major_type = WG_MAJOR_TYPE_AUDIO, + .u.audio = + { + .format = WG_AUDIO_FORMAT_F32LE, + .channel_mask = 1, + .channels = 1, + .rate = 44100, + }, + }; + struct wg_format input_format = {.major_type = WG_MAJOR_TYPE_WMA}; + struct wg_transform *transform; struct wma_decoder *decoder; TRACE("outer %p, out %p.\n", outer, out); + if (!(transform = wg_transform_create(&input_format, &output_format))) + { + FIXME("GStreamer doesn't support WMA decoding, please install appropriate plugins\n"); + return E_FAIL; + } + wg_transform_destroy(transform); + if (!(decoder = calloc(1, sizeof(*decoder)))) return E_OUTOFMEMORY;

1 0

Rémi Bernon : winegstreamer: Check caps pointer in wg_format_to_caps_h264.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: 8c5207f6a7232c20ad12a0d3171185442faa1295 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c5207f6a7232c20ad12a0d3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 27 20:41:25 2022 +0200 winegstreamer: Check caps pointer in wg_format_to_caps_h264. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_format.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index b22581e7824..ff9238a6a69 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -437,7 +437,8 @@ static GstCaps *wg_format_to_caps_h264(const struct wg_format *format) const char *profile, *level; GstCaps *caps; - caps = gst_caps_new_empty_simple("video/x-h264"); + if (!(caps = gst_caps_new_empty_simple("video/x-h264"))) + return NULL; gst_caps_set_simple(caps, "stream-format", G_TYPE_STRING, "byte-stream", NULL); gst_caps_set_simple(caps, "alignment", G_TYPE_STRING, "au", NULL);

1 0

Rémi Bernon : winegstreamer: Ignore unset H264 format profile and level.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: 9cc016ecb925d41f3835c07a02e23a5776a77517 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cc016ecb925d41f3835c07a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 27 20:41:24 2022 +0200 winegstreamer: Ignore unset H264 format profile and level. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_format.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index 84163f1e5d7..b22581e7824 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -455,6 +455,8 @@ static GstCaps *wg_format_to_caps_h264(const struct wg_format *format) case eAVEncH264VProfile_444: profile = "high-4:4:4"; break; default: GST_FIXME("H264 profile attribute %u not implemented.", format->u.h264.profile); + /* fallthrough */ + case eAVEncH264VProfile_unknown: profile = NULL; break; } @@ -481,6 +483,8 @@ static GstCaps *wg_format_to_caps_h264(const struct wg_format *format) case eAVEncH264VLevel5_2: level = "5.2"; break; default: GST_FIXME("H264 level attribute %u not implemented.", format->u.h264.level); + /* fallthrough */ + case 0: level = NULL; break; }

1 0

Zebediah Figura : wined3d: Refuse blits between height-scaled formats in the raw blitter.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: 29f91b916a433a0ed60e1219e850fc86863ca44e URL: https://source.winehq.org/git/wine.git/?a=commit;h=29f91b916a433a0ed60e1219… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 27 21:23:59 2022 -0500 wined3d: Refuse blits between height-scaled formats in the raw blitter. 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a73b3b55e4b..5fd38b49132 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -6458,6 +6458,7 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit * We also can't copy between depth/stencil and colour resources, since * the formats are considered incompatible in OpenGL. */ if (op != WINED3D_BLIT_OP_RAW_BLIT || !gl_formats_compatible(src_texture, src_location, dst_texture, dst_location) + || ((src_texture->resource.format_flags | dst_texture->resource.format_flags) & WINED3DFMT_FLAG_HEIGHT_SCALE) || (src_texture->resource.format->id == dst_texture->resource.format->id && (!(src_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) || !(dst_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)))))

1 0

Zebediah Figura : wined3d: Refuse blits between height-scaled formats in the FBO blitter.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: 7df8cd35d5dc5066f4fe3795921900c810c6d658 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7df8cd35d5dc5066f4fe3795… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 27 21:23:58 2022 -0500 wined3d: Refuse blits between height-scaled formats in the FBO blitter. 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ce283b05022..a73b3b55e4b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -279,6 +279,9 @@ static bool fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct win if ((wined3d_settings.offscreen_rendering_mode != ORM_FBO) || !gl_info->fbo_ops.glBlitFramebuffer) return false; + if ((src_resource->format_flags | dst_resource->format_flags) & WINED3DFMT_FLAG_HEIGHT_SCALE) + return false; + /* Source and/or destination need to be on the GL side. */ if (!(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) return false;

1 0

Zebediah Figura : wined3d: Refuse blits between height-scaled formats in the CPU blitter.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: 374c58ccb175538019a54a80076b8b89e2379f8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=374c58ccb175538019a54a80… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 27 21:23:57 2022 -0500 wined3d: Refuse blits between height-scaled formats in the CPU blitter. 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/surface.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3216439f32b..5feeba3be2d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -853,6 +853,14 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int goto release; } + if ((src_fmt_flags | dst_fmt_flags) & WINED3DFMT_FLAG_HEIGHT_SCALE) + { + FIXME("Unsupported blit between height-scaled formats (src %s, dst %s).\n", + debug_d3dformat(src_format->id), debug_d3dformat(dst_format->id)); + hr = E_NOTIMPL; + goto release; + } + if (filter != WINED3D_TEXF_NONE && filter != WINED3D_TEXF_POINT && (src_width != dst_width || src_height != dst_height)) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2022