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

[PATCH 1/1] winhttp: Release object on allocation failure.

by Hans Leidekker

From: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 52 +++++++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 11 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 7fb582362aa..ece4e34f0b8 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2308,7 +2308,12 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, const WCHAR *headers, DWORD { struct send_request *s; - if (!(s = malloc( sizeof(*s) ))) return FALSE; + if (!(s = malloc( sizeof(*s) ))) + { + release_object( &request->hdr ); + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } s->headers = strdupW( headers ); s->headers_len = headers_len; s->optional = optional; @@ -2886,8 +2891,12 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) { struct receive_response *r; - if (!(r = malloc( sizeof(*r) ))) return FALSE; - + if (!(r = malloc( sizeof(*r) ))) + { + release_object( &request->hdr ); + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } if ((ret = queue_task( &request->queue, task_receive_response, &r->task_hdr, &request->hdr ))) free( r ); } @@ -2981,7 +2990,13 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) { struct query_data *q; - if (!(q = malloc( sizeof(*q) ))) return FALSE; + if (!(q = malloc( sizeof(*q) ))) + { + release_object( &request->hdr ); + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } + q->available = available; if ((ret = queue_task( &request->queue, task_query_data_available, &q->task_hdr, &request->hdr ))) @@ -3034,7 +3049,12 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW { struct read_data *r; - if (!(r = malloc( sizeof(*r) ))) return FALSE; + if (!(r = malloc( sizeof(*r) ))) + { + release_object( &request->hdr ); + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } r->buffer = buffer; r->to_read = to_read; r->read = read; @@ -3110,7 +3130,12 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, const void *buffer, DWORD to_w { struct write_data *w; - if (!(w = malloc( sizeof(*w) ))) return FALSE; + if (!(w = malloc( sizeof(*w) ))) + { + release_object( &request->hdr ); + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } w->buffer = buffer; w->to_write = to_write; w->written = written; @@ -3973,10 +3998,11 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D if (!(r = malloc( sizeof(*r) ))) { InterlockedDecrement( &socket->hdr.pending_receives ); + release_object( &socket->hdr ); return ERROR_OUTOFMEMORY; } - r->buf = buf; - r->len = len; + r->buf = buf; + r->len = len; if ((ret = queue_task( &socket->recv_q, task_socket_receive, &r->task_hdr, &socket->hdr ))) { @@ -4191,8 +4217,8 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas cancel_queue( &socket->recv_q ); } - if (prev_state < SOCKET_STATE_SHUTDOWN - && (ret = send_socket_shutdown( socket, status, reason, len, FALSE ))) goto done; + if (prev_state < SOCKET_STATE_SHUTDOWN && (ret = send_socket_shutdown( socket, status, reason, len, FALSE ))) + goto done; if (pending_receives == 1 && socket->close_frame_received) { @@ -4205,7 +4231,11 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas { struct socket_shutdown *s; - if (!(s = calloc( 1, sizeof(*s) ))) return FALSE; + if (!(s = calloc( 1, sizeof(*s) ))) + { + ret = ERROR_OUTOFMEMORY; + goto done; + } if ((ret = queue_task( &socket->recv_q, task_socket_close, &s->task_hdr, &socket->hdr ))) { InterlockedDecrement( &socket->hdr.pending_receives ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/248

June 15, 2022

[PATCH 0/1] MR248: winhttp: Release object on allocation failure.

by Hans Leidekker (＠hans)

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/248

June 15, 2022

Re: Gitlab experiment wrapup

by Giovanni Mascellani

Hi, Il 14/06/22 22:01, Alexandre Julliard ha scritto: > Signed-off-by is convenient because the git tools have direct support > for it, but the real motivation for us was to keep track of who > submitted the patch, to support sending a patch written by someone else. > In that case the convention with email is to set From: to the original > author, but the committer info is lost, hence the Signed-off-by. > > With merge requests, the information of who submitted the merge request > is preserved independently of the commit contents, so the easiest option > is to simply get rid of signoffs completely. If that was the only intended meaning of the SOBs, then yes, I would say than now we have a better options and we could get rid of them. Right now the SOBs also help keeping a trace of who had a look at the patch and said it was good, which might be an interesting information to keep tracking. My point is that we shouldn't be using SOB for that, because its standard meaning is another one. In other words, there are a few different pieces of information that it can make sense to track for a certain commit: * who authored it; * who committed it; * who reviewed it from the technical point of view; * who checked that it's ok from the copyright point of view to have it in Wine. For any of these we can (in principle) choose whether we want it or not, but each of them should be recorded in a way that is aligned with the standard best practices. Giovanni.

June 15, 2022

Re: [PATCH] comctl32: Add partial support for LVM_SETBKIMAGE.

by Dmitry Timoshkov

Dmitry Timoshkov <dmitry(a)baikal.ru> wrote: > Zhiyi Zhang <zzhang(a)codeweavers.com> wrote: > > > >>>>>> Also, I found LVM_SETBKIMAGE is acting a bit weird on Windows. For example, > > >>>>>> if a LVM_SETBKIMAGE message trying to set a bitmap > > >>>>>> is sent the second time. The second message returns FALSE and the background > > >>>>>> image gets reset to none(from LVM_GETBKIMAGE). I don't know if we should > > >>>>>> implement such a behavior but I would be more comfortable with some tests. > > >>>>> According to my testing LVM_SETBKIMAGE always returns 0. > > >>>> If LVM_SETBKIMAGE for a bitmap succeeds, it does return TRUE. > > >>> Where do you see this? In my tests LVM_SETBKIMAGE always returns 0: > > >>> https://testbot.winehq.org/JobDetails.pl?Key=116659 > > >> You're only testing with comctl32 v5. Please see https://testbot.winehq.org/JobDetails.pl?Key=116666&f204=exe32.report#k204 > > > Thanks. Do you think it's really necessary to change return value for the v6 case? > > > > > Yes, I think it's necessary. I don't think comctl32 v5 support LVM_SETBKIMAGE at all. The FALSE is probably from DefWindowProc(). > > I don't think that explains destroying the bitmap on the 2nd call. It looks > like v5 really supports LVM_SETBKIMAGE, and the only difference in v6 is > the return value. Is there anything else that should be addressed in this patch? -- Dmitry.

June 15, 2022

Re: [PATCH v2 0/1] MR134: ntdll: Don't hard-code the battery and AC adapter names on Linux

by Huw Davies (＠huw)

Sebastian Reichel replied: [1](https://www.winehq.org/pipermail/wine-devel/2022-June/220112.html) > /sys/class/power_supply/*/scope is set to 'Device' for all > batteries, that are not powering the main system. There can still > be multiple batteries; for example Thinkpads in the 2014-2018 era > used to have an internal and a removable battery. For a single > "X %/hours left" info the data from all 'System' level batteries > must be aggregated. Benjamin Berg also mentioned UPower: [2](https://www.winehq.org/pipermail/wine-devel/2022-June/220110.html) > > Wouldn't it make sense for Wine to use the UPower provided > > DisplayDevice that can be queried through DBus? To which Sebastian replied: > UPower does the required data aggregation for the 'DisplayDevice'. > I don't know enough about the Wine codebase to recommend for or > against using UPower. So it looks like the patch's general idea is correct. I would suggest adding a `FIXME()` if a second battery is encountered. Also, `bs->BatteryPresent` could be used instead of the `found_battery` variable. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/134#note_2077

June 15, 2022

[PATCH v4 6/6] qasf: Configure WMReader stream selection in asf_reader_init_stream.

by Rémi Bernon

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/qasf/asfreader.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c index 6db1a5ca01f..40011cb4b30 100644 --- a/dlls/qasf/asfreader.c +++ b/dlls/qasf/asfreader.c @@ -153,11 +153,23 @@ static HRESULT asf_reader_query_interface(struct strmbase_filter *iface, REFIID static HRESULT asf_reader_init_stream(struct strmbase_filter *iface) { struct asf_reader *filter = impl_from_strmbase_filter(iface); + WMT_STREAM_SELECTION selections[ARRAY_SIZE(filter->streams)]; + WORD stream_numbers[ARRAY_SIZE(filter->streams)]; + IWMReaderAdvanced *reader_advanced; HRESULT hr; int i; TRACE("iface %p\n", iface); + if (FAILED(hr = IWMReader_QueryInterface(filter->reader, &IID_IWMReaderAdvanced, (void **)&reader_advanced))) + return hr; + + for (i = 0; i < ARRAY_SIZE(selections); ++i) + { + stream_numbers[i] = i + 1; + selections[i] = WMT_OFF; + } + for (i = 0; i < filter->stream_count; ++i) { struct asf_stream *stream = filter->streams + i; @@ -196,8 +208,18 @@ static HRESULT asf_reader_init_stream(struct strmbase_filter *iface) WARN("Failed to set stream %u output format, hr %#lx\n", i, hr); continue; } + + selections[i] = WMT_ON; } + hr = IWMReaderAdvanced_SetStreamsSelected(reader_advanced, filter->stream_count, stream_numbers, selections); + if (FAILED(hr)) + { + WARN("Failed to set stream selection, hr %#lx\n", hr); + } + + IWMReaderAdvanced_Release(reader_advanced); + return IWMReader_Start(filter->reader, 0, 0, 1, NULL); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/140

June 15, 2022

[PATCH v4 5/6] qasf: Configure WMReader stream format in asf_reader_init_stream.

by Rémi Bernon

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/qasf/asfreader.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c index db976f36752..6db1a5ca01f 100644 --- a/dlls/qasf/asfreader.c +++ b/dlls/qasf/asfreader.c @@ -161,6 +161,7 @@ static HRESULT asf_reader_init_stream(struct strmbase_filter *iface) for (i = 0; i < filter->stream_count; ++i) { struct asf_stream *stream = filter->streams + i; + IWMOutputMediaProps *props; if (!stream->source.pin.peer) continue; @@ -178,6 +179,23 @@ static HRESULT asf_reader_init_stream(struct strmbase_filter *iface) WARN("Failed to start stream %u new segment, hr %#lx\n", i, hr); continue; } + + hr = IWMReader_GetOutputFormat(filter->reader, stream->index, 0, &props); + if (FAILED(hr)) + { + WARN("Failed to get stream %u output format, hr %#lx\n", i, hr); + continue; + } + + hr = IWMOutputMediaProps_SetMediaType(props, (WM_MEDIA_TYPE *)&stream->source.pin.mt); + if (SUCCEEDED(hr)) + hr = IWMReader_SetOutputProps(filter->reader, stream->index, props); + IWMOutputMediaProps_Release(props); + if (FAILED(hr)) + { + WARN("Failed to set stream %u output format, hr %#lx\n", i, hr); + continue; + } } return IWMReader_Start(filter->reader, 0, 0, 1, NULL); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/140

June 15, 2022

[PATCH v4 4/6] winegstreamer: Implement IWMOutputMediaProps_SetMediaType.

by Rémi Bernon

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/wm_reader.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 03adea8a318..a235f2d15c6 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -116,8 +116,12 @@ static HRESULT WINAPI output_props_GetMediaType(IWMOutputMediaProps *iface, WM_M static HRESULT WINAPI output_props_SetMediaType(IWMOutputMediaProps *iface, WM_MEDIA_TYPE *mt) { - FIXME("iface %p, mt %p, stub!\n", iface, mt); - return E_NOTIMPL; + const struct output_props *props = impl_from_IWMOutputMediaProps(iface); + + TRACE("iface %p, mt %p.\n", iface, mt); + + FreeMediaType((AM_MEDIA_TYPE *)&props->mt); + return CopyMediaType((AM_MEDIA_TYPE *)&props->mt, (AM_MEDIA_TYPE *)mt); } static HRESULT WINAPI output_props_GetStreamGroupName(IWMOutputMediaProps *iface, WCHAR *name, WORD *len) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/140

June 15, 2022

[PATCH v4 3/6] qasf: Implement ASF Reader filter init_stream and cleanup_stream.

by Rémi Bernon

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/qasf/asfreader.c | 69 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c index 4fa9136982d..db976f36752 100644 --- a/dlls/qasf/asfreader.c +++ b/dlls/qasf/asfreader.c @@ -150,11 +150,66 @@ static HRESULT asf_reader_query_interface(struct strmbase_filter *iface, REFIID return E_NOINTERFACE; } +static HRESULT asf_reader_init_stream(struct strmbase_filter *iface) +{ + struct asf_reader *filter = impl_from_strmbase_filter(iface); + HRESULT hr; + int i; + + TRACE("iface %p\n", iface); + + for (i = 0; i < filter->stream_count; ++i) + { + struct asf_stream *stream = filter->streams + i; + + if (!stream->source.pin.peer) + continue; + + hr = IMemAllocator_Commit(stream->source.pAllocator); + if (FAILED(hr)) + { + WARN("Failed to commit stream %u allocator, hr %#lx\n", i, hr); + continue; + } + + hr = IPin_NewSegment(stream->source.pin.peer, 0, 0, 1); + if (FAILED(hr)) + { + WARN("Failed to start stream %u new segment, hr %#lx\n", i, hr); + continue; + } + } + + return IWMReader_Start(filter->reader, 0, 0, 1, NULL); +} + +static HRESULT asf_reader_cleanup_stream(struct strmbase_filter *iface) +{ + struct asf_reader *filter = impl_from_strmbase_filter(iface); + int i; + + TRACE("iface %p\n", iface); + + for (i = 0; i < filter->stream_count; ++i) + { + struct asf_stream *stream = filter->streams + i; + + if (!stream->source.pin.peer) + continue; + + IMemAllocator_Decommit(stream->source.pAllocator); + } + + return S_OK; +} + static const struct strmbase_filter_ops filter_ops = { .filter_get_pin = asf_reader_get_pin, .filter_destroy = asf_reader_destroy, .filter_query_interface = asf_reader_query_interface, + .filter_init_stream = asf_reader_init_stream, + .filter_cleanup_stream = asf_reader_cleanup_stream, }; static HRESULT WINAPI asf_reader_DecideBufferSize(struct strmbase_source *iface, @@ -390,6 +445,20 @@ static HRESULT WINAPI reader_callback_OnStatus(IWMReaderCallback *iface, WMT_STA BaseFilterImpl_IncrementPinVersion(&filter->filter); break; + case WMT_END_OF_STREAMING: + EnterCriticalSection(&filter->filter.filter_cs); + for (i = 0; i < filter->stream_count; ++i) + { + struct asf_stream *stream = filter->streams + i; + + if (!stream->source.pin.peer) + continue; + + IPin_EndOfStream(stream->source.pin.peer); + } + LeaveCriticalSection(&filter->filter.filter_cs); + break; + default: WARN("Ignoring status %#x.\n", status); break; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/140

June 15, 2022

[PATCH v4 2/6] qasf: Implement ASF Reader filter pin DecideBufferSize.

by Rémi Bernon

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/qasf/asfreader.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c index 8c042e72773..4fa9136982d 100644 --- a/dlls/qasf/asfreader.c +++ b/dlls/qasf/asfreader.c @@ -160,8 +160,29 @@ static const struct strmbase_filter_ops filter_ops = static HRESULT WINAPI asf_reader_DecideBufferSize(struct strmbase_source *iface, IMemAllocator *allocator, ALLOCATOR_PROPERTIES *req_props) { - FIXME("iface %p, allocator %p, req_props %p stub!\n", iface, allocator, req_props); - return E_NOTIMPL; + struct asf_stream *stream = impl_from_strmbase_pin(&iface->pin); + unsigned int buffer_size = 16384; + ALLOCATOR_PROPERTIES ret_props; + + TRACE("iface %p, allocator %p, req_props %p.\n", iface, allocator, req_props); + + if (IsEqualGUID(&stream->source.pin.mt.formattype, &FORMAT_VideoInfo)) + { + VIDEOINFOHEADER *format = (VIDEOINFOHEADER *)stream->source.pin.mt.pbFormat; + buffer_size = format->bmiHeader.biSizeImage; + } + else if (IsEqualGUID(&stream->source.pin.mt.formattype, &FORMAT_WaveFormatEx) + && (IsEqualGUID(&stream->source.pin.mt.subtype, &MEDIASUBTYPE_PCM) + || IsEqualGUID(&stream->source.pin.mt.subtype, &MEDIASUBTYPE_IEEE_FLOAT))) + { + WAVEFORMATEX *format = (WAVEFORMATEX *)stream->source.pin.mt.pbFormat; + buffer_size = format->nAvgBytesPerSec; + } + + req_props->cBuffers = max(req_props->cBuffers, 1); + req_props->cbBuffer = max(req_props->cbBuffer, buffer_size); + req_props->cbAlign = max(req_props->cbAlign, 1); + return IMemAllocator_SetProperties(allocator, req_props, &ret_props); } static const struct strmbase_source_ops source_ops = -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/140

June 15, 2022