June 2022 - Wine-Commits - list.winehq.org

Francois Gouget : testbot/web: Fix hiding the branch column on the main page.
by Alexandre Julliard June 14, 2022

June 14, 2022

Module: tools Branch: master Commit: adce5f9343c9dbec16f4ce06f038b6a83b4e01be URL: https://source.winehq.org/git/tools.git/?a=commit;h=adce5f9343c9dbec16f4ce0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 14 15:59:39 2022 +0200 testbot/web: Fix hiding the branch column on the main page. It is hidden when only one branch exists. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 2073b1e6..a3b26ea9 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -41,7 +41,7 @@ sub DisplayProperty($$) my $PropertyName = $PropertyDescriptor->GetName(); return $PropertyName =~ /^(?:Branch|User|PatchId|Patch)$/ ? "" : $PropertyName eq "Submitted" ? ("ro", "timetipdate") : - ($PropertyName eq "Branch" and !CreateBranches()->MultipleBranchesPresent) ? "" : + ($PropertyName eq "BranchName" and !CreateBranches()->MultipleBranchesPresent) ? "" : $self->SUPER::DisplayProperty($PropertyDescriptor); }

1 0

Jeremy Newman : migrate README to markdown
by Alexandre Julliard June 14, 2022

June 14, 2022

Module: website Branch: master Commit: 438be0bc3dae98da6c9a5f20dbd99ddf67129c27 URL: https://source.winehq.org/git/website.git/?a=commit;h=438be0bc3dae98da6c9a5… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jun 14 09:53:43 2022 -0500 migrate README to markdown --- README | 58 ---------------------------------------------------------- README.md | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 58 deletions(-) diff --git a/README b/README deleted file mode 100644 index 0b3100cb..00000000 --- a/README +++ /dev/null @@ -1,58 +0,0 @@ -WineHQ (lostwages) Website Template Engine -ver 4.0 -by Jeremy Newman <jnewman(a)codeweavers.com> ------------------------------------------------------------------------ - -Installation Requirements: - * Apache 2.4 or higher - * mod_rewrite enabled in Apache config - * PHP 5.6 or higher - -Setting Up: ------------------------------------------------------------------------ -1. cp include/htaccess.sample .htaccess -2. edit .htaccess - * change Rewritebase to the subdir path from the root of your website. - iow, if you have the site as http://www.example.com/winehq_org/ - then Rewritebase /winehq_org/ - otherwise if this site is the root, leave Rewritebase / -3. cp include/winehq.conf.sample include/winehq.conf -4. edit include/winehq.conf -5. cp include/globals.conf.sample include/globals.conf -6. edit include/globals.conf - -Templates: ------------------------------------------------------------------------ -For any path in your website, create a .template file in templates/en/ -For example, http://www.example.com/winehq_org/new_page - is templates/en/new_page.template -You can nest templates into subdirs. - -The following variables can be used in templates. - -{$root} : relative path back to root of website -{$base_url} : full URL of main website, as defined in winehq.conf -{$self} : same as $_SERVER['PHP_SELF'] in PHP -{$request_uri} : same as $_SERVER['REQUEST_URI'] in PHP - -You can also add global vars to include/globals.conf and they will be available -as {$config_[key]} where [key] is the name you defined in globals.conf - -Translating: ------------------------------------------------------------------------ -1. Edit include/winehq.conf and add your language code to @languages. -2. Create language subdir in templates. -4. Add your language strings to templates/en/global/xml/trans/lang.xml -5. Copy and edit path templates/en/global/xml/trans/global.xml to your - langs subdir. -6. Copy individual templates/en/*.template to your langs subdir as you - translate them. Only copy the files you plan on translating. -7. News item translations are in news/<lang>. - -Notes: ------------------------------------------------------------------------ - - * The font used in the WineHQ logo is: Ocean Sans Pro - * A SVG version of the logo is available at: - http://ftp.winehq.org/pub/wine/logos/wine_logo.svg - diff --git a/README.md b/README.md new file mode 100644 index 00000000..da521bb1 --- /dev/null +++ b/README.md @@ -0,0 +1,59 @@ +# WineHQ Website Template Engine + +*ver 4.0* by Jeremy Newman <jnewman(a)codeweavers.com> + +--- + +## Installation Requirements + +* Apache 2.4 or higher + * `mod_rewrite` enabled in Apache config +* PHP 7.0 or higher + +## Setting Up + +1. `cp include/htaccess.sample .htaccess` +2. edit `.htaccess` + * change Rewritebase to the subdir path from the root of your website. + iow, if you have the site as <http://www.example.com/winehq_org/> + then `Rewritebase /winehq_org/` + otherwise if this site is the root, leave Rewritebase / +3. `cp include/winehq.conf.sample include/winehq.conf` +4. edit `include/winehq.conf` +5. `cp include/globals.conf.sample include/globals.conf` +6. edit `include/globals.conf` + +## Templates + +For any path in your website, create a .template file in templates/en/ +For example, <http://www.example.com/winehq_org/new_page> + is `templates/en/new_page.template` +You can nest templates into subdirs. + +The following variables can be used in templates. + +`{$root}` : relative path back to root of website +`{$base_url}` : full URL of main website, as defined in winehq.conf +`{$self}` : same as `$_SERVER['PHP_SELF']` in PHP +`{$request_uri}` : same as `$_SERVER['REQUEST_URI']` in PHP + +You can also add global vars to `include/globals.conf` and they will be available +as `{$config_[key]}` where `[key]` is the name you defined in globals.conf + +## Translating + +1. Edit `include/winehq.conf` and add your language code to @languages. +2. Create language subdir in templates. +4. Add your language strings to `templates/en/global/xml/trans/lang.xml` +5. Copy and edit path `templates/en/global/xml/trans/global.xml` to your + langs subdir. +6. Copy individual `templates/en/*.template` to your langs subdir as you + translate them. Only copy the files you plan on translating. +7. News item translations are in `news/<lang>`. + +## Notes + +* The font used in the WineHQ logo is: Ocean Sans Pro +* A SVG version of the logo is available at: + <http://ftp.winehq.org/pub/wine/logos/wine_logo.svg> +

1 0

Rémi Bernon : winegstreamer: Support zero-copy wg_transform_push_data in quartz_transform.c.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: 6c110bd398de28613b34555ff2738e74191bb6cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c110bd398de28613b34555f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 13 11:43:51 2022 +0200 winegstreamer: Support zero-copy wg_transform_push_data in quartz_transform.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/gst_private.h | 2 ++ dlls/winegstreamer/quartz_transform.c | 18 +++--------------- dlls/winegstreamer/wg_sample.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 15 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 21bd4f25028..a72d72bab18 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -132,6 +132,8 @@ void wg_sample_release(struct wg_sample *wg_sample); HRESULT wg_transform_push_mf(struct wg_transform *transform, struct wg_sample *sample, struct wg_sample_queue *queue); +HRESULT wg_transform_push_quartz(struct wg_transform *transform, struct wg_sample *sample, + struct wg_sample_queue *queue); HRESULT wg_transform_read_mf(struct wg_transform *transform, struct wg_sample *sample, struct wg_format *format); diff --git a/dlls/winegstreamer/quartz_transform.c b/dlls/winegstreamer/quartz_transform.c index 2dd7d038f2f..5617e904bf7 100644 --- a/dlls/winegstreamer/quartz_transform.c +++ b/dlls/winegstreamer/quartz_transform.c @@ -315,21 +315,7 @@ static HRESULT WINAPI transform_sink_receive(struct strmbase_sink *pin, IMediaSa if (FAILED(hr)) return hr; - hr = IMediaSample_GetTime(sample, &start_time, &end_time); - if (SUCCEEDED(hr)) - { - wg_sample->pts = start_time; - wg_sample->flags |= WG_SAMPLE_FLAG_HAS_PTS; - } - if (hr == S_OK) - { - wg_sample->duration = end_time - start_time; - wg_sample->flags |= WG_SAMPLE_FLAG_HAS_DURATION; - } - - hr = wg_transform_push_data(filter->transform, wg_sample); - wg_sample_release(wg_sample); - + hr = wg_transform_push_quartz(filter->transform, wg_sample, filter->sample_queue); if (FAILED(hr)) return hr; @@ -364,6 +350,8 @@ static HRESULT WINAPI transform_sink_receive(struct strmbase_sink *pin, IMediaSa return hr; } + wg_sample_queue_flush(filter->sample_queue, false); + hr = IMediaSample_SetActualDataLength(output_sample, wg_sample->size); if (FAILED(hr)) { diff --git a/dlls/winegstreamer/wg_sample.c b/dlls/winegstreamer/wg_sample.c index dded264b079..cd17b88cdd3 100644 --- a/dlls/winegstreamer/wg_sample.c +++ b/dlls/winegstreamer/wg_sample.c @@ -298,3 +298,34 @@ HRESULT wg_transform_read_mf(struct wg_transform *transform, struct wg_sample *w return S_OK; } + +HRESULT wg_transform_push_quartz(struct wg_transform *transform, struct wg_sample *wg_sample, + struct wg_sample_queue *queue) +{ + struct sample *sample = unsafe_quartz_from_wg_sample(wg_sample); + REFERENCE_TIME start_time, end_time; + HRESULT hr; + + TRACE_(quartz)("transform %p, wg_sample %p, queue %p.\n", transform, wg_sample, queue); + + hr = IMediaSample_GetTime(sample->u.quartz.sample, &start_time, &end_time); + if (SUCCEEDED(hr)) + { + wg_sample->pts = start_time; + wg_sample->flags |= WG_SAMPLE_FLAG_HAS_PTS; + } + if (hr == S_OK) + { + wg_sample->duration = end_time - start_time; + wg_sample->flags |= WG_SAMPLE_FLAG_HAS_DURATION; + } + + if (IMediaSample_IsSyncPoint(sample->u.quartz.sample) == S_OK) + wg_sample->flags |= WG_SAMPLE_FLAG_SYNC_POINT; + + wg_sample_queue_begin_append(queue, wg_sample); + hr = wg_transform_push_data(transform, wg_sample); + wg_sample_queue_end_append(queue, wg_sample); + + return hr; +}

1 0

Rémi Bernon : winegstreamer: Remove copying support from wg_transform_push_data.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: 5dcf77d8d0d1676b806c1cc56706c3b738327e9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dcf77d8d0d1676b806c1cc5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 13 14:00:38 2022 +0200 winegstreamer: Remove copying support from wg_transform_push_data. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/gst_private.h | 3 --- dlls/winegstreamer/unixlib.h | 2 -- dlls/winegstreamer/wg_sample.c | 8 +++++++- dlls/winegstreamer/wg_transform.c | 12 +----------- 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index da0f1b103b3..e1abe7018da 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -102,9 +102,6 @@ void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate, struct wg_transform *wg_transform_create(const struct wg_format *input_format, const struct wg_format *output_format); void wg_transform_destroy(struct wg_transform *transform); -HRESULT wg_transform_push_data(struct wg_transform *transform, struct wg_sample *sample); -HRESULT wg_transform_read_data(struct wg_transform *transform, struct wg_sample *sample, - struct wg_format *format); unsigned int wg_format_get_max_size(const struct wg_format *format); diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index ed56fb47908..860a8ab2a52 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -121,8 +121,6 @@ enum wg_sample_flag WG_SAMPLE_FLAG_HAS_PTS = 2, WG_SAMPLE_FLAG_HAS_DURATION = 4, WG_SAMPLE_FLAG_SYNC_POINT = 8, - - WG_SAMPLE_FLAG_HAS_REFCOUNT = 0x10000, /* sample is queued on the client side and may be wrapped */ }; struct wg_sample diff --git a/dlls/winegstreamer/wg_sample.c b/dlls/winegstreamer/wg_sample.c index 47892b71796..ae8a2d4d0c7 100644 --- a/dlls/winegstreamer/wg_sample.c +++ b/dlls/winegstreamer/wg_sample.c @@ -185,7 +185,6 @@ static void wg_sample_queue_begin_append(struct wg_sample_queue *queue, struct w /* make sure a concurrent wg_sample_queue_flush call won't release the sample until we're done */ InterlockedIncrement(&wg_sample->refcount); - sample->wg_sample.flags |= WG_SAMPLE_FLAG_HAS_REFCOUNT; EnterCriticalSection(&queue->cs); list_add_tail(&queue->samples, &sample->entry); @@ -245,6 +244,13 @@ void wg_sample_queue_destroy(struct wg_sample_queue *queue) free(queue); } +/* These unixlib entry points should not be used directly, they assume samples + * to be queued and zero-copy support, use the helpers below instead. + */ +HRESULT wg_transform_push_data(struct wg_transform *transform, struct wg_sample *sample); +HRESULT wg_transform_read_data(struct wg_transform *transform, struct wg_sample *sample, + struct wg_format *format); + HRESULT wg_transform_push_mf(struct wg_transform *transform, struct wg_sample *wg_sample, struct wg_sample_queue *queue) { diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index d40f508250c..b5517f24515 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -542,17 +542,7 @@ NTSTATUS wg_transform_push_data(void *args) return STATUS_SUCCESS; } - if (!(sample->flags & WG_SAMPLE_FLAG_HAS_REFCOUNT)) - { - if (!(buffer = gst_buffer_new_and_alloc(sample->size))) - { - GST_ERROR("Failed to allocate input buffer"); - return STATUS_NO_MEMORY; - } - gst_buffer_fill(buffer, 0, sample->data, sample->size); - GST_INFO("Copied %u bytes from sample %p to buffer %p", sample->size, sample, buffer); - } - else if (!(buffer = gst_buffer_new_wrapped_full(GST_MEMORY_FLAG_READONLY, sample->data, sample->max_size, + if (!(buffer = gst_buffer_new_wrapped_full(GST_MEMORY_FLAG_READONLY, sample->data, sample->max_size, 0, sample->size, sample, wg_sample_free_notify))) { GST_ERROR("Failed to allocate input buffer");

1 0

Rémi Bernon : winegstreamer: Support zero-copy wg_transform_read_data in quartz_transform.c.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: ca0719f44077917f69d92a5cfc9f101806922149 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca0719f44077917f69d92a5c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 13 14:00:07 2022 +0200 winegstreamer: Support zero-copy wg_transform_read_data in quartz_transform.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/quartz_transform.c | 31 +++---------------------------- dlls/winegstreamer/wg_sample.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 28 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index a72d72bab18..da0f1b103b3 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -136,6 +136,7 @@ HRESULT wg_transform_push_quartz(struct wg_transform *transform, struct wg_sampl struct wg_sample_queue *queue); HRESULT wg_transform_read_mf(struct wg_transform *transform, struct wg_sample *sample, struct wg_format *format); +HRESULT wg_transform_read_quartz(struct wg_transform *transform, struct wg_sample *sample); HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj); diff --git a/dlls/winegstreamer/quartz_transform.c b/dlls/winegstreamer/quartz_transform.c index 5617e904bf7..30cfb7b855b 100644 --- a/dlls/winegstreamer/quartz_transform.c +++ b/dlls/winegstreamer/quartz_transform.c @@ -291,8 +291,6 @@ static HRESULT WINAPI transform_sink_receive(struct strmbase_sink *pin, IMediaSa { struct transform *filter = impl_from_strmbase_filter(pin->pin.filter); struct wg_sample *wg_sample; - REFERENCE_TIME start_time; - REFERENCE_TIME end_time; HRESULT hr; /* We do not expect pin connection state to change while the filter is @@ -334,10 +332,11 @@ static HRESULT WINAPI transform_sink_receive(struct strmbase_sink *pin, IMediaSa return hr; } - hr = wg_transform_read_data(filter->transform, wg_sample, NULL); + hr = wg_transform_read_quartz(filter->transform, wg_sample); + wg_sample_release(wg_sample); + if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) { - wg_sample_release(wg_sample); IMediaSample_Release(output_sample); break; } @@ -345,36 +344,12 @@ static HRESULT WINAPI transform_sink_receive(struct strmbase_sink *pin, IMediaSa { if (hr == MF_E_TRANSFORM_STREAM_CHANGE) FIXME("Unexpected stream format change!\n"); - wg_sample_release(wg_sample); IMediaSample_Release(output_sample); return hr; } wg_sample_queue_flush(filter->sample_queue, false); - hr = IMediaSample_SetActualDataLength(output_sample, wg_sample->size); - if (FAILED(hr)) - { - wg_sample_release(wg_sample); - IMediaSample_Release(output_sample); - return hr; - } - - if (wg_sample->flags & WG_SAMPLE_FLAG_HAS_PTS) - { - start_time = wg_sample->pts; - if (wg_sample->flags & WG_SAMPLE_FLAG_HAS_DURATION) - { - end_time = start_time + wg_sample->duration; - IMediaSample_SetTime(output_sample, &start_time, &end_time); - } - else - { - IMediaSample_SetTime(output_sample, &start_time, NULL); - } - } - wg_sample_release(wg_sample); - hr = IMemInputPin_Receive(filter->source.pMemInputPin, output_sample); if (FAILED(hr)) { diff --git a/dlls/winegstreamer/wg_sample.c b/dlls/winegstreamer/wg_sample.c index cd17b88cdd3..47892b71796 100644 --- a/dlls/winegstreamer/wg_sample.c +++ b/dlls/winegstreamer/wg_sample.c @@ -329,3 +329,38 @@ HRESULT wg_transform_push_quartz(struct wg_transform *transform, struct wg_sampl return hr; } + +HRESULT wg_transform_read_quartz(struct wg_transform *transform, struct wg_sample *wg_sample) +{ + struct sample *sample = unsafe_quartz_from_wg_sample(wg_sample); + REFERENCE_TIME start_time, end_time; + HRESULT hr; + BOOL value; + + TRACE_(mfplat)("transform %p, wg_sample %p.\n", transform, wg_sample); + + if (FAILED(hr = wg_transform_read_data(transform, wg_sample, NULL))) + return hr; + + if (FAILED(hr = IMediaSample_SetActualDataLength(sample->u.quartz.sample, wg_sample->size))) + return hr; + + if (wg_sample->flags & WG_SAMPLE_FLAG_HAS_PTS) + { + start_time = wg_sample->pts; + if (wg_sample->flags & WG_SAMPLE_FLAG_HAS_DURATION) + { + end_time = start_time + wg_sample->duration; + IMediaSample_SetTime(sample->u.quartz.sample, &start_time, &end_time); + } + else + { + IMediaSample_SetTime(sample->u.quartz.sample, &start_time, NULL); + } + } + + value = !!(wg_sample->flags & WG_SAMPLE_FLAG_SYNC_POINT); + IMediaSample_SetSyncPoint(sample->u.quartz.sample, value); + + return S_OK; +}

1 0

Rémi Bernon : winegstreamer: Introduce new wg_sample_create_quartz helper for quartz_transform.c.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: 2bbdd1eee680fc111df2f45e64611fd67030e87d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bbdd1eee680fc111df2f45e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 13 11:30:52 2022 +0200 winegstreamer: Introduce new wg_sample_create_quartz helper for quartz_transform.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/quartz_transform.c | 40 +++++++++++++------------- dlls/winegstreamer/wg_sample.c | 54 +++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 20 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index da76452fbf4..21bd4f25028 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -127,6 +127,7 @@ IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format); void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format); HRESULT wg_sample_create_mf(IMFSample *sample, struct wg_sample **out); +HRESULT wg_sample_create_quartz(IMediaSample *sample, struct wg_sample **out); void wg_sample_release(struct wg_sample *wg_sample); HRESULT wg_transform_push_mf(struct wg_transform *transform, struct wg_sample *sample, diff --git a/dlls/winegstreamer/quartz_transform.c b/dlls/winegstreamer/quartz_transform.c index b701b3f6369..2dd7d038f2f 100644 --- a/dlls/winegstreamer/quartz_transform.c +++ b/dlls/winegstreamer/quartz_transform.c @@ -290,7 +290,7 @@ static HRESULT transform_sink_query_interface(struct strmbase_pin *pin, REFIID i static HRESULT WINAPI transform_sink_receive(struct strmbase_sink *pin, IMediaSample *sample) { struct transform *filter = impl_from_strmbase_filter(pin->pin.filter); - struct wg_sample input_wg_sample = {0}; + struct wg_sample *wg_sample; REFERENCE_TIME start_time; REFERENCE_TIME end_time; HRESULT hr; @@ -311,50 +311,47 @@ static HRESULT WINAPI transform_sink_receive(struct strmbase_sink *pin, IMediaSa if (filter->sink.flushing) return S_FALSE; - input_wg_sample.max_size = IMediaSample_GetSize(sample); - input_wg_sample.size = IMediaSample_GetActualDataLength(sample); - - hr = IMediaSample_GetPointer(sample, &input_wg_sample.data); + hr = wg_sample_create_quartz(sample, &wg_sample); if (FAILED(hr)) return hr; hr = IMediaSample_GetTime(sample, &start_time, &end_time); if (SUCCEEDED(hr)) { - input_wg_sample.pts = start_time; - input_wg_sample.flags |= WG_SAMPLE_FLAG_HAS_PTS; + wg_sample->pts = start_time; + wg_sample->flags |= WG_SAMPLE_FLAG_HAS_PTS; } if (hr == S_OK) { - input_wg_sample.duration = end_time - start_time; - input_wg_sample.flags |= WG_SAMPLE_FLAG_HAS_DURATION; + wg_sample->duration = end_time - start_time; + wg_sample->flags |= WG_SAMPLE_FLAG_HAS_DURATION; } - hr = wg_transform_push_data(filter->transform, &input_wg_sample); + hr = wg_transform_push_data(filter->transform, wg_sample); + wg_sample_release(wg_sample); + if (FAILED(hr)) return hr; for (;;) { - struct wg_sample output_wg_sample = {0}; IMediaSample *output_sample; hr = IMemAllocator_GetBuffer(filter->source.pAllocator, &output_sample, NULL, NULL, 0); if (FAILED(hr)) return hr; - output_wg_sample.max_size = IMediaSample_GetSize(output_sample); - - hr = IMediaSample_GetPointer(output_sample, &output_wg_sample.data); + hr = wg_sample_create_quartz(output_sample, &wg_sample); if (FAILED(hr)) { IMediaSample_Release(output_sample); return hr; } - hr = wg_transform_read_data(filter->transform, &output_wg_sample, NULL); + hr = wg_transform_read_data(filter->transform, wg_sample, NULL); if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) { + wg_sample_release(wg_sample); IMediaSample_Release(output_sample); break; } @@ -362,23 +359,25 @@ static HRESULT WINAPI transform_sink_receive(struct strmbase_sink *pin, IMediaSa { if (hr == MF_E_TRANSFORM_STREAM_CHANGE) FIXME("Unexpected stream format change!\n"); + wg_sample_release(wg_sample); IMediaSample_Release(output_sample); return hr; } - hr = IMediaSample_SetActualDataLength(output_sample, output_wg_sample.size); + hr = IMediaSample_SetActualDataLength(output_sample, wg_sample->size); if (FAILED(hr)) { + wg_sample_release(wg_sample); IMediaSample_Release(output_sample); return hr; } - if (output_wg_sample.flags & WG_SAMPLE_FLAG_HAS_PTS) + if (wg_sample->flags & WG_SAMPLE_FLAG_HAS_PTS) { - start_time = output_wg_sample.pts; - if (output_wg_sample.flags & WG_SAMPLE_FLAG_HAS_DURATION) + start_time = wg_sample->pts; + if (wg_sample->flags & WG_SAMPLE_FLAG_HAS_DURATION) { - end_time = start_time + output_wg_sample.duration; + end_time = start_time + wg_sample->duration; IMediaSample_SetTime(output_sample, &start_time, &end_time); } else @@ -386,6 +385,7 @@ static HRESULT WINAPI transform_sink_receive(struct strmbase_sink *pin, IMediaSa IMediaSample_SetTime(output_sample, &start_time, NULL); } } + wg_sample_release(wg_sample); hr = IMemInputPin_Receive(filter->source.pMemInputPin, output_sample); if (FAILED(hr)) diff --git a/dlls/winegstreamer/wg_sample.c b/dlls/winegstreamer/wg_sample.c index cf57bdd996b..dded264b079 100644 --- a/dlls/winegstreamer/wg_sample.c +++ b/dlls/winegstreamer/wg_sample.c @@ -25,6 +25,7 @@ #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +WINE_DECLARE_DEBUG_CHANNEL(quartz); struct wg_sample_queue { @@ -51,6 +52,10 @@ struct sample IMFSample *sample; IMFMediaBuffer *buffer; } mf; + struct + { + IMediaSample *sample; + } quartz; } u; }; @@ -110,6 +115,55 @@ fail: return hr; } +static const struct wg_sample_ops quartz_sample_ops; + +static inline struct sample *unsafe_quartz_from_wg_sample(struct wg_sample *wg_sample) +{ + struct sample *sample = CONTAINING_RECORD(wg_sample, struct sample, wg_sample); + if (sample->ops != &quartz_sample_ops) return NULL; + return sample; +} + +static void quartz_sample_destroy(struct wg_sample *wg_sample) +{ + struct sample *sample = unsafe_quartz_from_wg_sample(wg_sample); + + TRACE_(quartz)("wg_sample %p.\n", wg_sample); + + IMediaSample_Release(sample->u.quartz.sample); +} + +static const struct wg_sample_ops quartz_sample_ops = +{ + quartz_sample_destroy, +}; + +HRESULT wg_sample_create_quartz(IMediaSample *media_sample, struct wg_sample **out) +{ + DWORD current_length, max_length; + struct sample *sample; + BYTE *buffer; + HRESULT hr; + + if (FAILED(hr = IMediaSample_GetPointer(media_sample, &buffer))) + return hr; + current_length = IMediaSample_GetActualDataLength(media_sample); + max_length = IMediaSample_GetSize(media_sample); + + if (!(sample = calloc(1, sizeof(*sample)))) + return E_OUTOFMEMORY; + + IMediaSample_AddRef((sample->u.quartz.sample = media_sample)); + sample->wg_sample.data = buffer; + sample->wg_sample.size = current_length; + sample->wg_sample.max_size = max_length; + sample->ops = &quartz_sample_ops; + + TRACE_(quartz)("Created wg_sample %p for IMediaSample %p.\n", &sample->wg_sample, media_sample); + *out = &sample->wg_sample; + return S_OK; +} + void wg_sample_release(struct wg_sample *wg_sample) { struct sample *sample = CONTAINING_RECORD(wg_sample, struct sample, wg_sample);

1 0

Rémi Bernon : winegstreamer: Use a union in struct sample to keep API pointers.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: b2828c1c8824d4c4bc83d8b2813c395bc0b04f5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2828c1c8824d4c4bc83d8b2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 8 10:59:05 2022 +0200 winegstreamer: Use a union in struct sample to keep API pointers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/wg_sample.c | 81 ++++++++++++++++++++++++++++++++---------- 1 file changed, 62 insertions(+), 19 deletions(-) diff --git a/dlls/winegstreamer/wg_sample.c b/dlls/winegstreamer/wg_sample.c index 051e6199ec9..cf57bdd996b 100644 --- a/dlls/winegstreamer/wg_sample.c +++ b/dlls/winegstreamer/wg_sample.c @@ -32,12 +32,51 @@ struct wg_sample_queue struct list samples; }; +struct wg_sample_ops +{ + void (*destroy)(struct wg_sample *sample); +}; + struct sample { - IMFSample *sample; - IMFMediaBuffer *media_buffer; struct wg_sample wg_sample; + + const struct wg_sample_ops *ops; struct list entry; + + union + { + struct + { + IMFSample *sample; + IMFMediaBuffer *buffer; + } mf; + } u; +}; + +static const struct wg_sample_ops mf_sample_ops; + +static inline struct sample *unsafe_mf_from_wg_sample(struct wg_sample *wg_sample) +{ + struct sample *sample = CONTAINING_RECORD(wg_sample, struct sample, wg_sample); + if (sample->ops != &mf_sample_ops) return NULL; + return sample; +} + +static void mf_sample_destroy(struct wg_sample *wg_sample) +{ + struct sample *sample = unsafe_mf_from_wg_sample(wg_sample); + + TRACE_(mfplat)("wg_sample %p.\n", wg_sample); + + IMFMediaBuffer_Unlock(sample->u.mf.buffer); + IMFMediaBuffer_Release(sample->u.mf.buffer); + IMFSample_Release(sample->u.mf.sample); +} + +static const struct wg_sample_ops mf_sample_ops = +{ + mf_sample_destroy, }; HRESULT wg_sample_create_mf(IMFSample *mf_sample, struct wg_sample **out) @@ -49,23 +88,24 @@ HRESULT wg_sample_create_mf(IMFSample *mf_sample, struct wg_sample **out) if (!(sample = calloc(1, sizeof(*sample)))) return E_OUTOFMEMORY; - if (FAILED(hr = IMFSample_ConvertToContiguousBuffer(mf_sample, &sample->media_buffer))) + if (FAILED(hr = IMFSample_ConvertToContiguousBuffer(mf_sample, &sample->u.mf.buffer))) goto fail; - if (FAILED(hr = IMFMediaBuffer_Lock(sample->media_buffer, &buffer, &max_length, &current_length))) + if (FAILED(hr = IMFMediaBuffer_Lock(sample->u.mf.buffer, &buffer, &max_length, &current_length))) goto fail; - IMFSample_AddRef((sample->sample = mf_sample)); + IMFSample_AddRef((sample->u.mf.sample = mf_sample)); sample->wg_sample.data = buffer; sample->wg_sample.size = current_length; sample->wg_sample.max_size = max_length; + sample->ops = &mf_sample_ops; *out = &sample->wg_sample; TRACE_(mfplat)("Created wg_sample %p for IMFSample %p.\n", *out, mf_sample); return S_OK; fail: - if (sample->media_buffer) - IMFMediaBuffer_Release(sample->media_buffer); + if (sample->u.mf.buffer) + IMFMediaBuffer_Release(sample->u.mf.buffer); free(sample); return hr; } @@ -80,9 +120,7 @@ void wg_sample_release(struct wg_sample *wg_sample) return; } - IMFMediaBuffer_Unlock(sample->media_buffer); - IMFMediaBuffer_Release(sample->media_buffer); - IMFSample_Release(sample->sample); + sample->ops->destroy(wg_sample); free(sample); } @@ -156,22 +194,24 @@ void wg_sample_queue_destroy(struct wg_sample_queue *queue) HRESULT wg_transform_push_mf(struct wg_transform *transform, struct wg_sample *wg_sample, struct wg_sample_queue *queue) { - struct sample *sample = CONTAINING_RECORD(wg_sample, struct sample, wg_sample); + struct sample *sample = unsafe_mf_from_wg_sample(wg_sample); LONGLONG time, duration; UINT32 value; HRESULT hr; - if (SUCCEEDED(IMFSample_GetSampleTime(sample->sample, &time))) + TRACE_(mfplat)("transform %p, wg_sample %p, queue %p.\n", transform, wg_sample, queue); + + if (SUCCEEDED(IMFSample_GetSampleTime(sample->u.mf.sample, &time))) { sample->wg_sample.flags |= WG_SAMPLE_FLAG_HAS_PTS; sample->wg_sample.pts = time; } - if (SUCCEEDED(IMFSample_GetSampleDuration(sample->sample, &duration))) + if (SUCCEEDED(IMFSample_GetSampleDuration(sample->u.mf.sample, &duration))) { sample->wg_sample.flags |= WG_SAMPLE_FLAG_HAS_DURATION; sample->wg_sample.duration = duration; } - if (SUCCEEDED(IMFSample_GetUINT32(sample->sample, &MFSampleExtension_CleanPoint, &value)) && value) + if (SUCCEEDED(IMFSample_GetUINT32(sample->u.mf.sample, &MFSampleExtension_CleanPoint, &value)) && value) sample->wg_sample.flags |= WG_SAMPLE_FLAG_SYNC_POINT; wg_sample_queue_begin_append(queue, wg_sample); @@ -184,20 +224,23 @@ HRESULT wg_transform_push_mf(struct wg_transform *transform, struct wg_sample *w HRESULT wg_transform_read_mf(struct wg_transform *transform, struct wg_sample *wg_sample, struct wg_format *format) { - struct sample *sample = CONTAINING_RECORD(wg_sample, struct sample, wg_sample); + struct sample *sample = unsafe_mf_from_wg_sample(wg_sample); HRESULT hr; + TRACE_(mfplat)("transform %p, wg_sample %p, format %p.\n", transform, wg_sample, format); + if (FAILED(hr = wg_transform_read_data(transform, wg_sample, format))) return hr; - IMFMediaBuffer_SetCurrentLength(sample->media_buffer, wg_sample->size); + if (FAILED(hr = IMFMediaBuffer_SetCurrentLength(sample->u.mf.buffer, wg_sample->size))) + return hr; if (wg_sample->flags & WG_SAMPLE_FLAG_HAS_PTS) - IMFSample_SetSampleTime(sample->sample, wg_sample->pts); + IMFSample_SetSampleTime(sample->u.mf.sample, wg_sample->pts); if (wg_sample->flags & WG_SAMPLE_FLAG_HAS_DURATION) - IMFSample_SetSampleDuration(sample->sample, wg_sample->duration); + IMFSample_SetSampleDuration(sample->u.mf.sample, wg_sample->duration); if (wg_sample->flags & WG_SAMPLE_FLAG_SYNC_POINT) - IMFSample_SetUINT32(sample->sample, &MFSampleExtension_CleanPoint, 1); + IMFSample_SetUINT32(sample->u.mf.sample, &MFSampleExtension_CleanPoint, 1); return S_OK; }

1 0

Rémi Bernon : winegstreamer: Split wg_sample wrapper helpers to a separate source.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: 57b3b2923a2b77f2f72daa6b0164ee94ee27bad9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57b3b2923a2b77f2f72daa6b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 8 10:51:52 2022 +0200 winegstreamer: Split wg_sample wrapper helpers to a separate source. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/mfplat.c | 176 ----------------------------------- dlls/winegstreamer/wg_sample.c | 203 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 204 insertions(+), 176 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=57b3b2923a2b77f2f72d…

1 0

Piotr Caban : server: Don't reset socket error in poll_socket.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: 73648f901cc64e061d4b9d316719c952e3a52ce8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73648f901cc64e061d4b9d31… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 10 17:07:25 2022 +0200 server: Don't reset socket error in poll_socket. Otherwise socket error may be cleared in poll_socket causing ioctl SO_ERROR calls to return no error. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51433 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- server/sock.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/server/sock.c b/server/sock.c index 8a0f3198c4e..439801a8cfa 100644 --- a/server/sock.c +++ b/server/sock.c @@ -631,13 +631,27 @@ static void sock_wake_up( struct sock *sock ) } } -static inline int sock_error( struct fd *fd ) +static inline int sock_error( struct sock *sock ) { - unsigned int optval = 0; - socklen_t optlen = sizeof(optval); + int error = 0; + socklen_t len = sizeof(error); - getsockopt( get_unix_fd(fd), SOL_SOCKET, SO_ERROR, (void *) &optval, &optlen); - return optval; + getsockopt( get_unix_fd(sock->fd), SOL_SOCKET, SO_ERROR, (void *)&error, &len); + if (sock->state == SOCK_CONNECTING) + { + if (error) + sock->errors[AFD_POLL_BIT_CONNECT_ERR] = error; + else + error = sock->errors[AFD_POLL_BIT_CONNECT_ERR]; + } + else if (sock->state == SOCK_LISTENING) + { + if (error) + sock->errors[AFD_POLL_BIT_ACCEPT] = error; + else + error = sock->errors[AFD_POLL_BIT_ACCEPT]; + } + return error; } static void free_accept_req( void *private ) @@ -1120,9 +1134,9 @@ static void sock_poll_event( struct fd *fd, int event ) case SOCK_CONNECTING: if (event & (POLLERR|POLLHUP)) { + error = sock_error( sock ); sock->state = SOCK_UNCONNECTED; event &= ~POLLOUT; - error = sock_error( fd ); } else if (event & POLLOUT) { @@ -1133,7 +1147,7 @@ static void sock_poll_event( struct fd *fd, int event ) case SOCK_LISTENING: if (event & (POLLERR|POLLHUP)) - error = sock_error( fd ); + error = sock_error( sock ); break; case SOCK_CONNECTED: @@ -3125,7 +3139,7 @@ static void poll_socket( struct sock *poll_sock, struct async *async, int exclus { signaled = TRUE; req->sockets[i].flags = flags; - req->sockets[i].status = sock_get_ntstatus( sock_error( sock->fd ) ); + req->sockets[i].status = sock_get_ntstatus( sock_error( sock ) ); } /* FIXME: do other error conditions deserve a similar treatment? */

1 0

Piotr Caban : server: Don't reset socket error in IOCTL_AFD_GET_SO_ERROR.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: 0c7928061c05d6f24bc62b7bb5de7e2447ac4163 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c7928061c05d6f24bc62b7b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 10 17:09:30 2022 +0200 server: Don't reset socket error in IOCTL_AFD_GET_SO_ERROR. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- server/sock.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/server/sock.c b/server/sock.c index 439801a8cfa..b11ebddb51d 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2797,7 +2797,6 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) case IOCTL_AFD_WINE_GET_SO_ERROR: { int error; - socklen_t len = sizeof(error); unsigned int i; if (get_reply_max_size() < sizeof(error)) @@ -2806,12 +2805,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return; } - if (getsockopt( unix_fd, SOL_SOCKET, SO_ERROR, (char *)&error, &len ) < 0) - { - set_error( sock_get_ntstatus( errno ) ); - return; - } - + error = sock_error( sock ); if (!error) { for (i = 0; i < ARRAY_SIZE( sock->errors ); ++i)

1 0