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

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(a)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

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: 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

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

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 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

Louis Lenders : wbemprox: Add WindowsDirectory property to Win32_Operatingsystem.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: 789eecc665c20af187ed23c61d75b9c2a4910242 URL: https://source.winehq.org/git/wine.git/?a=commit;h=789eecc665c20af187ed23c6… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Apr 28 12:43:23 2022 +0200 wbemprox: Add WindowsDirectory property to Win32_Operatingsystem. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52887 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 22 ++++++++++++++++------ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 8c5a158fea3..27e1084b21e 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -263,6 +263,7 @@ static const struct column col_operatingsystem[] = { L"TotalVirtualMemorySize", CIM_UINT64 }, { L"TotalVisibleMemorySize", CIM_UINT64 }, { L"Version", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"WindowsDirectory", CIM_STRING|COL_FLAG_DYNAMIC }, }; static const struct column col_pagefileusage[] = { @@ -698,6 +699,7 @@ struct record_operatingsystem UINT64 totalvirtualmemorysize; UINT64 totalvisiblememorysize; const WCHAR *version; + const WCHAR *windowsdirectory; }; struct record_pagefileusage { @@ -3446,6 +3448,15 @@ static enum fill_status fill_processor( struct table *table, const struct expr * return status; } +static INT16 get_currenttimezone(void) +{ + TIME_ZONE_INFORMATION info; + DWORD status = GetTimeZoneInformation( &info ); + if (status == TIME_ZONE_ID_INVALID) return 0; + if (status == TIME_ZONE_ID_DAYLIGHT) return -(info.Bias + info.DaylightBias); + return -(info.Bias + info.StandardBias); +} + static WCHAR *get_lastbootuptime(void) { SYSTEM_TIMEOFDAY_INFORMATION ti; @@ -3631,13 +3642,11 @@ static WCHAR *get_registereduser(void) return get_reg_str( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", L"RegisteredOwner" ); } -static INT16 get_currenttimezone(void) +static WCHAR *get_windowsdirectory(void) { - TIME_ZONE_INFORMATION info; - DWORD status = GetTimeZoneInformation( &info ); - if (status == TIME_ZONE_ID_INVALID) return 0; - if (status == TIME_ZONE_ID_DAYLIGHT) return -(info.Bias + info.DaylightBias); - return -(info.Bias + info.StandardBias); + WCHAR dir[MAX_PATH]; + if (!GetWindowsDirectoryW( dir, ARRAY_SIZE(dir) )) return NULL; + return wcsdup( dir ); } static enum fill_status fill_operatingsystem( struct table *table, const struct expr *cond ) @@ -3688,6 +3697,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec->totalvirtualmemorysize = get_total_physical_memory() / 1024; rec->totalvisiblememorysize = rec->totalvirtualmemorysize; rec->version = get_osversion( &ver ); + rec->windowsdirectory = get_windowsdirectory(); if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 37c149fab26..54d80b9e196 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1441,6 +1441,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) check_property( obj, L"TotalVirtualMemorySize", VT_BSTR, CIM_UINT64 ); check_property( obj, L"Status", VT_BSTR, CIM_STRING ); check_property( obj, L"SystemDrive", VT_BSTR, CIM_STRING ); + check_property( obj, L"WindowsDirectory", VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result );

1 0

Louis Lenders : wbemprox: Add SystemType property to Win32_Computersystem.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: ba8e416e63c891d7762a171e45d9df7982cba440 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba8e416e63c891d7762a171e… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Apr 28 12:43:24 2022 +0200 wbemprox: Add SystemType property to Win32_Computersystem. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52887 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 11 +++++++++++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 12 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 27e1084b21e..98a32313461 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -105,6 +105,7 @@ static const struct column col_compsys[] = { L"Name", CIM_STRING|COL_FLAG_DYNAMIC }, { L"NumberOfLogicalProcessors", CIM_UINT32 }, { L"NumberOfProcessors", CIM_UINT32 }, + { L"SystemType", CIM_STRING }, { L"TotalPhysicalMemory", CIM_UINT64 }, { L"UserName", CIM_STRING|COL_FLAG_DYNAMIC }, }; @@ -541,6 +542,7 @@ struct record_computersystem const WCHAR *name; UINT32 num_logical_processors; UINT32 num_processors; + const WCHAR *systemtype; UINT64 total_physical_memory; const WCHAR *username; }; @@ -1580,6 +1582,14 @@ static WCHAR *get_computername(void) return ret; } +static const WCHAR *get_systemtype(void) +{ + SYSTEM_INFO info; + GetNativeSystemInfo( &info ); + if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return L"x64 based PC"; + return L"x86 based PC"; +} + static WCHAR *get_username(void) { WCHAR *ret; @@ -1614,6 +1624,7 @@ static enum fill_status fill_compsys( struct table *table, const struct expr *co rec->model = L"Wine"; rec->name = get_computername(); rec->num_logical_processors = get_logical_processor_count( NULL, &rec->num_processors ); + rec->systemtype = get_systemtype(); rec->total_physical_memory = get_total_physical_memory(); rec->username = get_username(); if (!match_row( table, row, cond, &status )) free_row_values( table, row ); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 54d80b9e196..f8508cd1405 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -752,6 +752,7 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) } check_property( obj, L"NumberOfProcessors", VT_I4, CIM_UINT32 ); + check_property( obj, L"SystemType", VT_BSTR, CIM_STRING ); type = 0xdeadbeef; VariantInit( &value );

1 0

Louis Lenders : wbemprox: Add FreeVirtualMemory property to Win32_Operatingsystem.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: 1d0dd6d778b014c0f61f064ed5a08e43209baca5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d0dd6d778b014c0f61f064e… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Apr 28 12:43:25 2022 +0200 wbemprox: Add FreeVirtualMemory property to Win32_Operatingsystem. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52887 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 12 ++++++++++++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 13 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 98a32313461..d27130b00c9 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -239,6 +239,7 @@ static const struct column col_operatingsystem[] = { L"CSName", CIM_STRING|COL_FLAG_DYNAMIC }, { L"CurrentTimeZone", CIM_SINT16 }, { L"FreePhysicalMemory", CIM_UINT64 }, + { L"FreeVirtualMemory", CIM_UINT64 }, { L"InstallDate", CIM_DATETIME }, { L"LastBootUpTime", CIM_DATETIME|COL_FLAG_DYNAMIC }, { L"LocalDateTime", CIM_DATETIME|COL_FLAG_DYNAMIC }, @@ -676,6 +677,7 @@ struct record_operatingsystem const WCHAR *csname; INT16 currenttimezone; UINT64 freephysicalmemory; + UINT64 freevirtualmemory; const WCHAR *installdate; const WCHAR *lastbootuptime; const WCHAR *localdatetime; @@ -1572,6 +1574,15 @@ static UINT64 get_available_physical_memory(void) return status.ullAvailPhys; } +static UINT64 get_available_virtual_memory(void) +{ + MEMORYSTATUSEX status; + + status.dwLength = sizeof(status); + if (!GlobalMemoryStatusEx( &status )) return 1024 * 1024 * 1024; + return status.ullAvailVirtual; +} + static WCHAR *get_computername(void) { WCHAR *ret; @@ -3683,6 +3694,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec->csname = get_computername(); rec->currenttimezone = get_currenttimezone(); rec->freephysicalmemory = get_available_physical_memory() / 1024; + rec->freevirtualmemory = get_available_virtual_memory() / 1024; rec->installdate = L"20140101000000.000000+000"; rec->lastbootuptime = get_lastbootuptime(); rec->localdatetime = get_localdatetime(); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index f8508cd1405..f6faaea0d99 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1404,6 +1404,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) VariantClear( &val ); check_property( obj, L"FreePhysicalMemory", VT_BSTR, CIM_UINT64 ); + check_property( obj, L"FreeVirtualMemory", VT_BSTR, CIM_UINT64 ); check_property( obj, L"Name", VT_BSTR, CIM_STRING ); type = 0xdeadbeef;

1 0

Huw Davies : wineoss: Simplify the midi in dispatcher.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: 9a7924a687e5ae53a076de823d34976f99d04421 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a7924a687e5ae53a076de82… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 28 08:49:55 2022 -0500 wineoss: Simplify the midi in dispatcher. The continue statement looks a bit awkward at the moment, but a future patch will introduce more code into the for loop. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/midi.c | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index fe73d97f5ab..1a5b348da9f 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -320,12 +320,23 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) } } +static void handle_midi_data(unsigned char *buffer, unsigned int len) +{ + unsigned int time = GetTickCount(), i; + + for (i = 0; i < len; i += (buffer[i] & 0x80) ? 8 : 4) + { + if (buffer[i] != SEQ_MIDIPUTC) continue; + + midReceiveChar(buffer[i + 2], buffer[i + 1], time); + } +} + static DWORD WINAPI midRecThread(void *arg) { int fd = (int)(INT_PTR)arg; unsigned char buffer[256]; - int len, idx; - DWORD dwTime; + int len; struct pollfd pfd; TRACE("Thread startup\n"); @@ -349,32 +360,7 @@ static DWORD WINAPI midRecThread(void *arg) continue; } - dwTime = GetTickCount(); - - for (idx = 0; idx < len; ) { - if (buffer[idx] & 0x80) { - TRACE( - "Reading<8> %02x %02x %02x %02x %02x %02x %02x %02x\n", - buffer[idx + 0], buffer[idx + 1], - buffer[idx + 2], buffer[idx + 3], - buffer[idx + 4], buffer[idx + 5], - buffer[idx + 6], buffer[idx + 7]); - idx += 8; - } else { - switch (buffer[idx + 0]) { - case SEQ_WAIT: - case SEQ_ECHO: - break; - case SEQ_MIDIPUTC: - midReceiveChar(buffer[idx + 2], buffer[idx + 1], dwTime); - break; - default: - TRACE("Unsupported event %d\n", buffer[idx + 0]); - break; - } - idx += 4; - } - } + handle_midi_data(buffer, len); } return 0; }

1 0