November 2020 - Wine-Devel - list.winehq.org

[PATCH v2 1/2] winegstreamer: Implement IMFMediaSource::Stop.

by Derek Lesho

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v2: Style error. --- dlls/winegstreamer/media_source.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 5c502cf3ed5..655e765fee7 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -64,6 +64,7 @@ struct media_stream enum source_async_op { SOURCE_ASYNC_START, + SOURCE_ASYNC_STOP, SOURCE_ASYNC_REQUEST_SAMPLE, }; @@ -343,6 +344,24 @@ static void start_pipeline(struct media_source *source, struct source_async_comm gst_element_set_state(source->container, GST_STATE_PLAYING); } +static void stop_pipeline(struct media_source *source) +{ + unsigned int i; + + gst_element_set_state(source->container, GST_STATE_PAUSED); + + for (i = 0; i < source->stream_count; i++) + { + struct media_stream *stream = source->streams[i]; + if (stream->state != STREAM_INACTIVE) + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamStopped, &GUID_NULL, S_OK, NULL); + } + + IMFMediaEventQueue_QueueEventParamVar(source->event_queue, MESourceStopped, &GUID_NULL, S_OK, NULL); + + source->state = SOURCE_STOPPED; +} + static void dispatch_end_of_presentation(struct media_source *source) { PROPVARIANT empty = {.vt = VT_EMPTY}; @@ -417,6 +436,9 @@ static HRESULT WINAPI source_async_commands_Invoke(IMFAsyncCallback *iface, IMFA case SOURCE_ASYNC_START: start_pipeline(source, command); break; + case SOURCE_ASYNC_STOP: + stop_pipeline(source); + break; case SOURCE_ASYNC_REQUEST_SAMPLE: wait_on_sample(command->u.request_sample.stream, command->u.request_sample.token); break; @@ -1087,13 +1109,18 @@ static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationD static HRESULT WINAPI media_source_Stop(IMFMediaSource *iface) { struct media_source *source = impl_from_IMFMediaSource(iface); + struct source_async_command *command; + HRESULT hr; - FIXME("(%p): stub\n", source); + TRACE("(%p)\n", source); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; - return E_NOTIMPL; + if (SUCCEEDED(hr = source_create_async_op(SOURCE_ASYNC_STOP, &command))) + hr = MFPutWorkItem(source->async_commands_queue, &source->async_commands_callback, &command->IUnknown_iface); + + return hr; } static HRESULT WINAPI media_source_Pause(IMFMediaSource *iface) -- 2.29.2

Nov. 30, 2020

[PATCH] user32: Set font smoothing type to FE_FONTSMOOTHINGCLEARTYPE by default.

by Paul Gofman

That is the case on the newer Windows. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/user32/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index a620116053a..128aaa014e8 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1230,7 +1230,7 @@ static DWORD_ENTRY( FOCUSBORDERHEIGHT, 1, DESKTOP_KEY, L"FocusBorderHeight" ); static DWORD_ENTRY( FOCUSBORDERWIDTH, 1, DESKTOP_KEY, L"FocusBorderWidth" ); static DWORD_ENTRY( FONTSMOOTHINGCONTRAST, 0, DESKTOP_KEY, L"FontSmoothingGamma" ); static DWORD_ENTRY( FONTSMOOTHINGORIENTATION, FE_FONTSMOOTHINGORIENTATIONRGB, DESKTOP_KEY, L"FontSmoothingOrientation" ); -static DWORD_ENTRY( FONTSMOOTHINGTYPE, FE_FONTSMOOTHINGSTANDARD, DESKTOP_KEY, L"FontSmoothingType" ); +static DWORD_ENTRY( FONTSMOOTHINGTYPE, FE_FONTSMOOTHINGCLEARTYPE, DESKTOP_KEY, L"FontSmoothingType" ); static DWORD_ENTRY( FOREGROUNDFLASHCOUNT, 3, DESKTOP_KEY, L"ForegroundFlashCount" ); static DWORD_ENTRY( FOREGROUNDLOCKTIMEOUT, 0, DESKTOP_KEY, L"ForegroundLockTimeout" ); static DWORD_ENTRY( LOGPIXELS, 0, DESKTOP_KEY, L"LogPixels" ); -- 2.28.0

Nov. 30, 2020

Re: [PATCH vkd3d 4/4] vkd3d-compiler: Default to HLSL as a source format when preprocessing.

by Zebediah Figura (she/her)

On 11/30/20 7:05 AM, Henri Verbeet wrote: > On Fri, 27 Nov 2020 at 20:01, Zebediah Figura (she/her) > <zfigura(a)codeweavers.com> wrote: >> On 11/27/20 7:03 AM, Henri Verbeet wrote: >>> On Thu, 26 Nov 2020 at 21:25, Zebediah Figura <zfigura(a)codeweavers.com> wrote: >>>> - if (!options.output_filename && get_target_type_info(options.target_type)->is_binary >>>> - && isatty(fileno(output))) >>>> + if (!options.output_filename && options.target_type != VKD3D_SHADER_TARGET_NONE >>>> + && get_target_type_info(options.target_type)->is_binary && isatty(fileno(output))) >>>> { >>>> fprintf(stderr, "Output is a tty and output format is binary, exiting.\n" >>>> "If this is really what you intended, specify the output explicitly.\n"); >>> Perhaps we should test whether the source format is binary here with >>> -E. Although it may not end up being very useful in practice, I don't >>> think there's an inherent reason that vkd3d_shader_preprocess() >>> couldn't be used with binary formats. >>> >> Maybe if it were something like m4, yeah, but the HLSL preprocessor is >> very whitespace-sensitive. Although we could introduce a custom m4-like >> preprocessor for other formats... >> > Sure, we could have different preprocessors for different formats. (Or > even different preprocessors for the same format, if it came to that.) > As far as vkd3d-compiler is concerned though, none of that should > really matter; if "options.preprocess_only" is set, the format of the > output is determined by "options.source_type". Sorry, I managed to completely misunderstand what you were saying at first. Now this comment makes sense, and I agree, we should check the input format here instead. > >> [Perhaps we should also add something like >> vkd3d_shader_get_supported_preprocessor_types()?] > Possibly, although at least initially we could probably get away with > simply returning a copy of the input for source formats that do not > have an inherent associated preprocessor. > That's a good idea, actually; I hadn't thought of that. That does mean that for backwards compatibility's sake there's not a lot of point in later adding vkd3d_shader_get_supported_preprocessor_types().

Nov. 30, 2020

Re: [PATCH 1/2] winegstreamer: Implement IMFMediaSource::Stop.

by Derek Lesho

On 11/30/20 11:56 AM, Zebediah Figura (she/her) wrote: > On 11/30/20 10:45 AM, Derek Lesho wrote: >> Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> >> --- >> dlls/winegstreamer/media_source.c | 29 +++++++++++++++++++++++++++-- >> 1 file changed, 27 insertions(+), 2 deletions(-) >> >> diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c >> index 5c502cf3ed5..7d677e39feb 100644 >> --- a/dlls/winegstreamer/media_source.c >> +++ b/dlls/winegstreamer/media_source.c >> @@ -64,6 +64,7 @@ struct media_stream >> enum source_async_op >> { >> SOURCE_ASYNC_START, >> + SOURCE_ASYNC_STOP, >> SOURCE_ASYNC_REQUEST_SAMPLE, >> }; >> >> @@ -343,6 +344,22 @@ static void start_pipeline(struct media_source *source, struct source_async_comm >> gst_element_set_state(source->container, GST_STATE_PLAYING); >> } >> >> +static void stop_pipeline(struct media_source *source) >> +{ >> + gst_element_set_state(source->container, GST_STATE_PAUSED); >> + >> + for (unsigned int i = 0; i < source->stream_count; i++) > Another misplaced variable initializer here. Please try harder to watch > for these. Whoops, sorry. It's muscle memory at this point for me to use this form, so I'll try to create a commit hook to avoid this in the future. > >> + { >> + struct media_stream *stream = source->streams[i]; >> + if (stream->state != STREAM_INACTIVE) >> + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamStopped, &GUID_NULL, S_OK, NULL); >> + } >> + >> + IMFMediaEventQueue_QueueEventParamVar(source->event_queue, MESourceStopped, &GUID_NULL, S_OK, NULL); >> + >> + source->state = SOURCE_STOPPED; >> +} >> + >> static void dispatch_end_of_presentation(struct media_source *source) >> { >> PROPVARIANT empty = {.vt = VT_EMPTY}; >> @@ -417,6 +434,9 @@ static HRESULT WINAPI source_async_commands_Invoke(IMFAsyncCallback *iface, IMFA >> case SOURCE_ASYNC_START: >> start_pipeline(source, command); >> break; >> + case SOURCE_ASYNC_STOP: >> + stop_pipeline(source); >> + break; >> case SOURCE_ASYNC_REQUEST_SAMPLE: >> wait_on_sample(command->u.request_sample.stream, command->u.request_sample.token); >> break; >> @@ -1087,13 +1107,18 @@ static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationD >> static HRESULT WINAPI media_source_Stop(IMFMediaSource *iface) >> { >> struct media_source *source = impl_from_IMFMediaSource(iface); >> + struct source_async_command *command; >> + HRESULT hr; >> >> - FIXME("(%p): stub\n", source); >> + TRACE("(%p)\n", source); >> >> if (source->state == SOURCE_SHUTDOWN) >> return MF_E_SHUTDOWN; >> >> - return E_NOTIMPL; >> + if (SUCCEEDED(hr = source_create_async_op(SOURCE_ASYNC_STOP, &command))) >> + hr = MFPutWorkItem(source->async_commands_queue, &source->async_commands_callback, &command->IUnknown_iface); >> + >> + return hr; >> } >> >> static HRESULT WINAPI media_source_Pause(IMFMediaSource *iface) >>

Nov. 30, 2020

Re: [PATCH 1/2] winegstreamer: Implement IMFMediaSource::Stop.

by Zebediah Figura (she/her)

On 11/30/20 10:45 AM, Derek Lesho wrote: > Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> > --- > dlls/winegstreamer/media_source.c | 29 +++++++++++++++++++++++++++-- > 1 file changed, 27 insertions(+), 2 deletions(-) > > diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c > index 5c502cf3ed5..7d677e39feb 100644 > --- a/dlls/winegstreamer/media_source.c > +++ b/dlls/winegstreamer/media_source.c > @@ -64,6 +64,7 @@ struct media_stream > enum source_async_op > { > SOURCE_ASYNC_START, > + SOURCE_ASYNC_STOP, > SOURCE_ASYNC_REQUEST_SAMPLE, > }; > > @@ -343,6 +344,22 @@ static void start_pipeline(struct media_source *source, struct source_async_comm > gst_element_set_state(source->container, GST_STATE_PLAYING); > } > > +static void stop_pipeline(struct media_source *source) > +{ > + gst_element_set_state(source->container, GST_STATE_PAUSED); > + > + for (unsigned int i = 0; i < source->stream_count; i++) Another misplaced variable initializer here. Please try harder to watch for these. > + { > + struct media_stream *stream = source->streams[i]; > + if (stream->state != STREAM_INACTIVE) > + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamStopped, &GUID_NULL, S_OK, NULL); > + } > + > + IMFMediaEventQueue_QueueEventParamVar(source->event_queue, MESourceStopped, &GUID_NULL, S_OK, NULL); > + > + source->state = SOURCE_STOPPED; > +} > + > static void dispatch_end_of_presentation(struct media_source *source) > { > PROPVARIANT empty = {.vt = VT_EMPTY}; > @@ -417,6 +434,9 @@ static HRESULT WINAPI source_async_commands_Invoke(IMFAsyncCallback *iface, IMFA > case SOURCE_ASYNC_START: > start_pipeline(source, command); > break; > + case SOURCE_ASYNC_STOP: > + stop_pipeline(source); > + break; > case SOURCE_ASYNC_REQUEST_SAMPLE: > wait_on_sample(command->u.request_sample.stream, command->u.request_sample.token); > break; > @@ -1087,13 +1107,18 @@ static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationD > static HRESULT WINAPI media_source_Stop(IMFMediaSource *iface) > { > struct media_source *source = impl_from_IMFMediaSource(iface); > + struct source_async_command *command; > + HRESULT hr; > > - FIXME("(%p): stub\n", source); > + TRACE("(%p)\n", source); > > if (source->state == SOURCE_SHUTDOWN) > return MF_E_SHUTDOWN; > > - return E_NOTIMPL; > + if (SUCCEEDED(hr = source_create_async_op(SOURCE_ASYNC_STOP, &command))) > + hr = MFPutWorkItem(source->async_commands_queue, &source->async_commands_callback, &command->IUnknown_iface); > + > + return hr; > } > > static HRESULT WINAPI media_source_Pause(IMFMediaSource *iface) >

Nov. 30, 2020

Re: [PATCH] ntdll/tests: Don't check the load address in the WoW64 case.

by Zebediah Figura (she/her)

On 11/30/20 9:19 AM, Francois Gouget wrote: > It could sometimes be NULL, such as win32k.sys on Win <= 7. > > Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> > --- > > Something like this then? That seems reasonable to me, yeah. > > dlls/ntdll/tests/info.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c > index 5db7a800cbe..4379d8a84c6 100644 > --- a/dlls/ntdll/tests/info.c > +++ b/dlls/ntdll/tests/info.c > @@ -490,7 +490,7 @@ static void test_query_module(void) > const SYSTEM_MODULE *module = &info->Modules[i]; > > ok(module->LoadOrderIndex == i, "%u: got index %u\n", i, module->LoadOrderIndex); > - ok(!!module->ImageBaseAddress, "%u: got NULL address\n", i); > + ok(module->ImageBaseAddress || is_wow64, "%u: got NULL address for %s\n", i, module->Name); > ok(module->ImageSize, "%u: got 0 size\n", i); > ok(module->LoadCount, "%u: got 0 load count\n", i); > } > @@ -516,7 +516,7 @@ static void test_query_module(void) > const SYSTEM_MODULE *module = &infoex->BaseInfo; > > ok(module->LoadOrderIndex == i, "%u: got index %u\n", i, module->LoadOrderIndex); > - ok(!!module->ImageBaseAddress, "%u: got NULL address\n", i); > + ok(module->ImageBaseAddress || is_wow64, "%u: got NULL address for %s\n", i, module->Name); > ok(module->ImageSize, "%u: got 0 size\n", i); > ok(module->LoadCount, "%u: got 0 load count\n", i); > >

Nov. 30, 2020

[PATCH 2/2] winegstreamer: Set MF_MT_ALL_SAMPLES_INDEPENDENT attribute on raw media types.

by Derek Lesho

--- dlls/winegstreamer/mfplat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 07dfae64f4f..50cd93b62d1 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -610,6 +610,7 @@ IMFMediaType *mf_media_type_from_caps(const GstCaps *caps) unsigned int i; IMFMediaType_SetUINT32(media_type, &MF_MT_COMPRESSED, FALSE); + IMFMediaType_SetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); /* First try FOURCC */ if ((fourcc_subtype.Data1 = gst_video_format_to_fourcc(video_info.finfo->format))) -- 2.29.2

Nov. 30, 2020

[PATCH 1/2] winegstreamer: Implement IMFMediaSource::Stop.

by Derek Lesho

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 5c502cf3ed5..7d677e39feb 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -64,6 +64,7 @@ struct media_stream enum source_async_op { SOURCE_ASYNC_START, + SOURCE_ASYNC_STOP, SOURCE_ASYNC_REQUEST_SAMPLE, }; @@ -343,6 +344,22 @@ static void start_pipeline(struct media_source *source, struct source_async_comm gst_element_set_state(source->container, GST_STATE_PLAYING); } +static void stop_pipeline(struct media_source *source) +{ + gst_element_set_state(source->container, GST_STATE_PAUSED); + + for (unsigned int i = 0; i < source->stream_count; i++) + { + struct media_stream *stream = source->streams[i]; + if (stream->state != STREAM_INACTIVE) + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamStopped, &GUID_NULL, S_OK, NULL); + } + + IMFMediaEventQueue_QueueEventParamVar(source->event_queue, MESourceStopped, &GUID_NULL, S_OK, NULL); + + source->state = SOURCE_STOPPED; +} + static void dispatch_end_of_presentation(struct media_source *source) { PROPVARIANT empty = {.vt = VT_EMPTY}; @@ -417,6 +434,9 @@ static HRESULT WINAPI source_async_commands_Invoke(IMFAsyncCallback *iface, IMFA case SOURCE_ASYNC_START: start_pipeline(source, command); break; + case SOURCE_ASYNC_STOP: + stop_pipeline(source); + break; case SOURCE_ASYNC_REQUEST_SAMPLE: wait_on_sample(command->u.request_sample.stream, command->u.request_sample.token); break; @@ -1087,13 +1107,18 @@ static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationD static HRESULT WINAPI media_source_Stop(IMFMediaSource *iface) { struct media_source *source = impl_from_IMFMediaSource(iface); + struct source_async_command *command; + HRESULT hr; - FIXME("(%p): stub\n", source); + TRACE("(%p)\n", source); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; - return E_NOTIMPL; + if (SUCCEEDED(hr = source_create_async_op(SOURCE_ASYNC_STOP, &command))) + hr = MFPutWorkItem(source->async_commands_queue, &source->async_commands_callback, &command->IUnknown_iface); + + return hr; } static HRESULT WINAPI media_source_Pause(IMFMediaSource *iface) -- 2.29.2

Nov. 30, 2020

Re: [PATCH] conhost: Respect the StartupInfo's wShowWindow.

by Dmitry Timoshkov

Gabriel Ivăncescu <gabrielopcode(a)gmail.com> wrote: > >> - ShowWindow( console.win, SW_SHOW ); > >> + ShowWindow( console.win, (si.dwFlags & STARTF_USESHOWWINDOW) && si.wShowWindow != SW_SHOWDEFAULT > >> + ? si.wShowWindow : SW_SHOW ); > > > > What's the reason to treat SW_SHOWDEFAULT specially? > > > > I initially tried just setting it to SW_SHOWDEFAULT without any checks, > and it didn't work. I was assuming the SW_SHOW was there for a reason in > such case, as the "default". I'm not that familiar with how this works, > so of course I can remove it if it's actually unnecessary. If there's no real reason then please remove it. -- Dmitry.

Nov. 30, 2020

Re: [PATCH] conhost: Respect the StartupInfo's wShowWindow.

by Gabriel Ivăncescu

On 30/11/2020 18:19, Dmitry Timoshkov wrote: > Gabriel Ivăncescu <gabrielopcode(a)gmail.com> wrote: > >> - ShowWindow( console.win, SW_SHOW ); >> + ShowWindow( console.win, (si.dwFlags & STARTF_USESHOWWINDOW) && si.wShowWindow != SW_SHOWDEFAULT >> + ? si.wShowWindow : SW_SHOW ); > > What's the reason to treat SW_SHOWDEFAULT specially? > I initially tried just setting it to SW_SHOWDEFAULT without any checks, and it didn't work. I was assuming the SW_SHOW was there for a reason in such case, as the "default". I'm not that familiar with how this works, so of course I can remove it if it's actually unnecessary.

Nov. 30, 2020