November 2022 - Wine-Commits

Gabriel Ivăncescu : mshtml: Add SVG and XHTML document information to the registry.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: 21219fa31584fadd978754a8fc82a0bbdc305cd8 URL: https://gitlab.winehq.org/wine/wine/-/commit/21219fa31584fadd978754a8fc82a0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 8 20:50:35 2022 +0200 mshtml: Add SVG and XHTML document information to the registry. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/mshtml.inf | 24 ++++++++++++++++++++++++ dlls/mshtml/mshtml_classes.idl | 18 ++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf index 4a650b444fc..fc010bcc593 100644 --- a/dlls/mshtml/mshtml.inf +++ b/dlls/mshtml/mshtml.inf @@ -49,6 +49,16 @@ HKCR,"CLSID\%CLSID_Scriptlet%\Programmable",,16 HKCR,"CLSID\%CLSID_Scriptlet%\ToolboxBitmap32",,,"%16422%\Internet Explorer\iexplore.exe,1" HKCR,"MIME\Database\Content Type\text/x-scriptlet","CLSID",,"%CLSID_Scriptlet%" +;; SVGDocument +HKCR,"CLSID\{30590066-98B5-11CF-BB82-00AA00BDCE0B}\BrowseInPlace",,16 +HKCR,"CLSID\{30590066-98B5-11CF-BB82-00AA00BDCE0B}\DefaultIcon",,0x00020000,"%16422%\Internet Explorer\iexplore.exe,1" +HKCR,"CLSID\{30590066-98B5-11CF-BB82-00AA00BDCE0B}\MiscStatus",,,"2228625" + +;; XHTMLDocument +HKCR,"CLSID\{30590067-98B5-11CF-BB82-00AA00BDCE0B}\BrowseInPlace",,16 +HKCR,"CLSID\{30590067-98B5-11CF-BB82-00AA00BDCE0B}\DefaultIcon",,0x00020000,"%16422%\Internet Explorer\iexplore.exe,1" +HKCR,"CLSID\{30590067-98B5-11CF-BB82-00AA00BDCE0B}\MiscStatus",,,"2228625" + [Protocols.Reg] HKCR,"PROTOCOLS\Handler\javascript","CLSID",,"%CLSID_JSProtocol%" @@ -241,6 +251,12 @@ HKCR,".ai","Content Type",,"application/postscript" HKCR,".eps","Content Type",,"application/postscript" HKCR,".ps","Content Type",,"application/postscript" +;; SVG +HKCR,"MIME\Database\Content Type\image/svg+xml","CLSID",,"{30590066-98B5-11CF-BB82-00AA00BDCE0B}" +HKCR,"MIME\Database\Content Type\image/svg+xml","Extension",,".svg" +HKCR,".svg",,,"svgfile" +HKCR,".svg","Content Type",,"image/svg+xml" + ;; TAR HKCR,"MIME\Database\Content Type\application/x-tar","Extension",,".tar" HKCR,".tar","Content Type",,"application/x-tar" @@ -278,6 +294,14 @@ HKCR,"xbmfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"xbmfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"xbmfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,9" +;; XHTML +HKCR,"MIME\Database\Content Type\application/xhtml+xml","CLSID",,"{30590067-98B5-11CF-BB82-00AA00BDCE0B}" +HKCR,"MIME\Database\Content Type\application/xhtml+xml","Extension",,".xht" +HKCR,".xht",,,"xhtmlfile" +HKCR,".xht","Content Type",,"application/xhtml+xml" +HKCR,".xhtml",,,"xhtmlfile" +HKCR,".xhtml","Content Type",,"application/xhtml+xml" + ;; XML HKCR,"MIME\Database\Content Type\application/xml","CLSID",,"{48123BC4-99D9-11D1-A6B3-00C04FD91555}" HKCR,"MIME\Database\Content Type\application/xml","Extension",,".xml" diff --git a/dlls/mshtml/mshtml_classes.idl b/dlls/mshtml/mshtml_classes.idl index b84a50f1cf1..13fe655b0c0 100644 --- a/dlls/mshtml/mshtml_classes.idl +++ b/dlls/mshtml/mshtml_classes.idl @@ -295,6 +295,15 @@ coclass ResProtocol { } ] coclass Scriptlet { } +[ + helpstring("SVG Document"), + progid("svgfile"), + threading(apartment), + version(1.0), + uuid(30590066-98b5-11cf-bb82-00aa00bdce0b) +] +coclass SVGDocumentClass { } + [ helpstring("Microsoft HTML Resource Pluggable Protocol"), threading(apartment), @@ -308,3 +317,12 @@ coclass SysimageProtocol { } uuid(429af92c-a51f-11d2-861e-00c04fa35c89) ] coclass TridentAPI { } + +[ + helpstring("XHTML Document"), + progid("xhtmlfile"), + threading(apartment), + version(1.0), + uuid(30590067-98b5-11cf-bb82-00aa00bdce0b) +] +coclass XHTMLDocumentClass { }

1 0

Rémi Bernon : winegstreamer: Split the wm_reader_get_stream_sample helper.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: af751b594e1654c4991c7a491997091c0c85603e URL: https://gitlab.winehq.org/wine/wine/-/commit/af751b594e1654c4991c7a49199709… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Sep 24 01:00:11 2022 +0200 winegstreamer: Split the wm_reader_get_stream_sample helper. --- dlls/winegstreamer/wm_reader.c | 110 ++++++++++++++++++++++------------------- 1 file changed, 58 insertions(+), 52 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index f514475d3eb..09d7bbda3e1 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1596,6 +1596,58 @@ static HRESULT wm_stream_allocate_sample(struct wm_stream *stream, DWORD size, I return S_OK; } +static HRESULT wm_reader_read_stream_sample(struct wm_reader *reader, struct wm_stream *stream, + struct wg_parser_buffer *buffer, INSSBuffer **sample, QWORD *pts, QWORD *duration, DWORD *flags) +{ + DWORD size, capacity; + HRESULT hr; + BYTE *data; + + TRACE("Got buffer for '%s' stream %p.\n", get_major_type_string(stream->format.major_type), stream); + + if (FAILED(hr = wm_stream_allocate_sample(stream, buffer->size, sample))) + { + ERR("Failed to allocate sample of %u bytes, hr %#lx.\n", buffer->size, hr); + wg_parser_stream_release_buffer(stream->wg_stream); + return hr; + } + + if (FAILED(hr = INSSBuffer_GetBufferAndLength(*sample, &data, &size))) + ERR("Failed to get data pointer, hr %#lx.\n", hr); + if (FAILED(hr = INSSBuffer_GetMaxLength(*sample, &capacity))) + ERR("Failed to get capacity, hr %#lx.\n", hr); + if (buffer->size > capacity) + ERR("Returned capacity %lu is less than requested capacity %u.\n", capacity, buffer->size); + + if (!wg_parser_stream_copy_buffer(stream->wg_stream, data, 0, buffer->size)) + { + /* The GStreamer pin has been flushed. */ + INSSBuffer_Release(*sample); + *sample = NULL; + return S_FALSE; + } + + if (FAILED(hr = INSSBuffer_SetLength(*sample, buffer->size))) + ERR("Failed to set size %u, hr %#lx.\n", buffer->size, hr); + + wg_parser_stream_release_buffer(stream->wg_stream); + + if (!buffer->has_pts) + FIXME("Missing PTS.\n"); + if (!buffer->has_duration) + FIXME("Missing duration.\n"); + + *pts = buffer->pts; + *duration = buffer->duration; + *flags = 0; + if (buffer->discontinuity) + *flags |= WM_SF_DISCONTINUITY; + if (!buffer->delta) + *flags |= WM_SF_CLEANPOINT; + + return S_OK; +} + /* Find the earliest buffer by PTS. * * Native seems to behave similarly to this with the async reader, although our @@ -1642,15 +1694,11 @@ static WORD get_earliest_buffer(struct wm_reader *reader, struct wg_parser_buffe static HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream_number, INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags, WORD *ret_stream_number) { - struct wg_parser_stream *wg_stream; struct wg_parser_buffer wg_buffer; struct wm_stream *stream; - DWORD size, capacity; - INSSBuffer *sample; HRESULT hr = S_OK; - BYTE *data; - for (;;) + do { if (!stream_number) { @@ -1661,7 +1709,6 @@ static HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream } stream = wm_reader_get_stream_by_stream_number(reader, stream_number); - wg_stream = stream->wg_stream; } else { @@ -1670,7 +1717,6 @@ static HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream WARN("Invalid stream number %u; returning E_INVALIDARG.\n", stream_number); return E_INVALIDARG; } - wg_stream = stream->wg_stream; if (stream->selection == WMT_OFF) { @@ -1681,7 +1727,7 @@ static HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream if (stream->eos) return NS_E_NO_MORE_SAMPLES; - if (!wg_parser_stream_get_buffer(wg_stream, &wg_buffer)) + if (!wg_parser_stream_get_buffer(stream->wg_stream, &wg_buffer)) { stream->eos = true; TRACE("End of stream.\n"); @@ -1689,51 +1735,11 @@ static HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream } } - TRACE("Got buffer for '%s' stream %p.\n", get_major_type_string(stream->format.major_type), stream); - - if (FAILED(hr = wm_stream_allocate_sample(stream, wg_buffer.size, &sample))) - { - ERR("Failed to allocate sample of %u bytes, hr %#lx.\n", wg_buffer.size, hr); - wg_parser_stream_release_buffer(wg_stream); - return hr; - } - - if (FAILED(hr = INSSBuffer_GetBufferAndLength(sample, &data, &size))) - ERR("Failed to get data pointer, hr %#lx.\n", hr); - if (FAILED(hr = INSSBuffer_GetMaxLength(sample, &capacity))) - ERR("Failed to get capacity, hr %#lx.\n", hr); - if (wg_buffer.size > capacity) - ERR("Returned capacity %lu is less than requested capacity %u.\n", capacity, wg_buffer.size); - - if (!wg_parser_stream_copy_buffer(wg_stream, data, 0, wg_buffer.size)) - { - /* The GStreamer pin has been flushed. */ - INSSBuffer_Release(sample); - continue; - } - - if (FAILED(hr = INSSBuffer_SetLength(sample, wg_buffer.size))) - ERR("Failed to set size %u, hr %#lx.\n", wg_buffer.size, hr); - - wg_parser_stream_release_buffer(wg_stream); - - if (!wg_buffer.has_pts) - FIXME("Missing PTS.\n"); - if (!wg_buffer.has_duration) - FIXME("Missing duration.\n"); + if (SUCCEEDED(hr = wm_reader_read_stream_sample(reader, stream, &wg_buffer, ret_sample, pts, duration, flags))) + *ret_stream_number = stream_number; + } while (hr == S_FALSE); - *pts = wg_buffer.pts; - *duration = wg_buffer.duration; - *flags = 0; - if (wg_buffer.discontinuity) - *flags |= WM_SF_DISCONTINUITY; - if (!wg_buffer.delta) - *flags |= WM_SF_CLEANPOINT; - - *ret_sample = sample; - *ret_stream_number = stream_number; - return S_OK; - } + return hr; } static struct wm_reader *impl_from_IUnknown(IUnknown *iface)

1 0

Rémi Bernon : winegstreamer: Allow wg_parser_stream_get_buffer to wait on all streams.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: 042c1cefa56b1cd53070d3c8770920561bb67585 URL: https://gitlab.winehq.org/wine/wine/-/commit/042c1cefa56b1cd53070d3c8770920… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 23 12:31:54 2022 +0200 winegstreamer: Allow wg_parser_stream_get_buffer to wait on all streams. For the WM reader, returning the earliest buffer. --- dlls/winegstreamer/gst_private.h | 3 +- dlls/winegstreamer/main.c | 6 ++- dlls/winegstreamer/media_source.c | 3 +- dlls/winegstreamer/quartz_parser.c | 2 +- dlls/winegstreamer/unixlib.h | 2 + dlls/winegstreamer/wg_parser.c | 92 +++++++++++++++++++++++++++++--------- dlls/winegstreamer/wm_reader.c | 61 +++++-------------------- 7 files changed, 91 insertions(+), 78 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Use nsIDOMDocument instead of nsIDOMHTMLDocument where possible.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: 67f07ffb3f7f83d91b5129743a488db6b0b21371 URL: https://gitlab.winehq.org/wine/wine/-/commit/67f07ffb3f7f83d91b5129743a488d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 8 20:50:35 2022 +0200 mshtml: Use nsIDOMDocument instead of nsIDOMHTMLDocument where possible. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/editor.c | 13 +- dlls/mshtml/htmlbody.c | 6 +- dlls/mshtml/htmlcurstyle.c | 6 +- dlls/mshtml/htmldoc.c | 389 +++++++++++++++++++++++++++---------------- dlls/mshtml/htmlelem.c | 44 ++--- dlls/mshtml/htmlevent.c | 6 +- dlls/mshtml/htmlselect.c | 6 +- dlls/mshtml/htmlwindow.c | 12 +- dlls/mshtml/mshtml_private.h | 9 +- dlls/mshtml/mutation.c | 10 +- dlls/mshtml/navigate.c | 2 +- dlls/mshtml/nsembed.c | 7 +- dlls/mshtml/nsevents.c | 6 +- dlls/mshtml/omnavigator.c | 9 +- dlls/mshtml/persist.c | 6 +- dlls/mshtml/range.c | 13 +- dlls/mshtml/script.c | 4 +- dlls/mshtml/selection.c | 11 +- 18 files changed, 330 insertions(+), 229 deletions(-)

1 0

Gabriel Ivăncescu : jscript: Convert filetime to date properly using unsigned division.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: 0c875dfa5fc34619777c5d9782e84cd9f82bbdc4 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c875dfa5fc34619777c5d9782e84c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 8 20:50:35 2022 +0200 jscript: Convert filetime to date properly using unsigned division. Also, the result has to be signed type before converting to double, since it can be negative then (e.g. if system clock is set before 1970). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/date.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index bc09f05d4b9..f90a3eb052f 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -28,9 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); -/* 1601 to 1970 is 369 years plus 89 leap days */ -#define TIME_EPOCH ((ULONGLONG)(369 * 365 + 89) * 86400 * 1000) - typedef struct { jsdisp_t dispex; @@ -55,6 +52,16 @@ static inline DateInstance *date_this(jsval_t vthis) return (jsdisp && is_class(jsdisp, JSCLASS_DATE)) ? date_from_jsdisp(jsdisp) : NULL; } +static inline double file_time_to_date_time(const FILETIME *ftime) +{ + /* 1601 to 1970 is 369 years plus 89 leap days */ + const LONGLONG time_epoch = (LONGLONG)(369 * 365 + 89) * 86400 * 1000; + + LONGLONG time = (((ULONGLONG)ftime->dwHighDateTime << 32) | ftime->dwLowDateTime) / 10000; + + return time - time_epoch; +} + /*ECMA-262 3rd Edition 15.9.1.2 */ #define MS_PER_DAY 86400000 #define MS_PER_HOUR 3600000 @@ -406,12 +413,9 @@ static inline DOUBLE time_clip(DOUBLE time) static double date_now(void) { FILETIME ftime; - LONGLONG time; GetSystemTimeAsFileTime(&ftime); - time = ((LONGLONG)ftime.dwHighDateTime << 32) + ftime.dwLowDateTime; - - return time/10000 - TIME_EPOCH; + return file_time_to_date_time(&ftime); } static SYSTEMTIME create_systemtime(DOUBLE time) @@ -2410,14 +2414,11 @@ static HRESULT DateConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, un case INVOKE_FUNC: { FILETIME system_time, local_time; - LONGLONG lltime; GetSystemTimeAsFileTime(&system_time); FileTimeToLocalFileTime(&system_time, &local_time); - lltime = ((LONGLONG)local_time.dwHighDateTime<<32) - + local_time.dwLowDateTime; - return date_to_string(lltime/10000-TIME_EPOCH, FALSE, 0, r); + return date_to_string(file_time_to_date_time(&local_time), FALSE, 0, r); } default:

1 0

Rémi Bernon : winegstreamer: Return no buffer when wg_parser stream is disabled.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: 407aba3008dfa6b7a3d41a688929a105407da39b URL: https://gitlab.winehq.org/wine/wine/-/commit/407aba3008dfa6b7a3d41a688929a1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Sep 24 11:48:49 2022 +0200 winegstreamer: Return no buffer when wg_parser stream is disabled. --- dlls/winegstreamer/wg_parser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index d1230c89f2e..14970d327c8 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -268,7 +268,7 @@ static GstBuffer *wait_parser_stream_buffer(struct wg_parser *parser, struct wg_ /* Note that we can both have a buffer and stream->eos, in which case we * must return the buffer. */ - while (!(buffer = stream->buffer) && !stream->eos) + while (stream->enabled && !(buffer = stream->buffer) && !stream->eos) pthread_cond_wait(&stream->event_cond, &parser->mutex); return buffer; @@ -308,7 +308,7 @@ static NTSTATUS wg_parser_stream_get_buffer(void *args) for (i = 0; i < parser->stream_count; ++i) { - if (!parser->streams[i]->enabled || !(buffer = wait_parser_stream_buffer(parser, parser->streams[i]))) + if (!(buffer = wait_parser_stream_buffer(parser, parser->streams[i]))) continue; /* invalid PTS is GST_CLOCK_TIME_NONE == (guint64)-1, so this will prefer valid timestamps. */ if (!earliest || GST_BUFFER_PTS(buffer) < GST_BUFFER_PTS(earliest))

1 0

Rémi Bernon : winegstreamer: Merge wm_reader_get_stream_sample with GetNextSample.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: 819a848a5f035d48eb6987d5eeecb21051d049c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/819a848a5f035d48eb6987d5eeecb2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Sep 24 01:23:04 2022 +0200 winegstreamer: Merge wm_reader_get_stream_sample with GetNextSample. --- dlls/winegstreamer/wm_reader.c | 74 +++++++++++++----------------------------- 1 file changed, 23 insertions(+), 51 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 43de0f5e970..8ac852a99b0 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1652,55 +1652,6 @@ static HRESULT wm_reader_read_stream_sample(struct wm_reader *reader, struct wg_ return S_OK; } -static HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream_number, - INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags, WORD *ret_stream_number) -{ - struct wg_parser_buffer wg_buffer; - struct wm_stream *stream; - HRESULT hr = S_OK; - - do - { - if (!stream_number) - { - if (!wg_parser_stream_get_buffer(reader->wg_parser, NULL, &wg_buffer)) - { - /* All streams are disabled or EOS. */ - return NS_E_NO_MORE_SAMPLES; - } - } - else - { - if (!(stream = wm_reader_get_stream_by_stream_number(reader, stream_number))) - { - WARN("Invalid stream number %u; returning E_INVALIDARG.\n", stream_number); - return E_INVALIDARG; - } - - if (stream->selection == WMT_OFF) - { - WARN("Stream %u is deselected; returning NS_E_INVALID_REQUEST.\n", stream_number); - return NS_E_INVALID_REQUEST; - } - - if (stream->eos) - return NS_E_NO_MORE_SAMPLES; - - if (!wg_parser_stream_get_buffer(reader->wg_parser, stream->wg_stream, &wg_buffer)) - { - stream->eos = true; - TRACE("End of stream.\n"); - return NS_E_NO_MORE_SAMPLES; - } - } - - if (SUCCEEDED(hr = wm_reader_read_stream_sample(reader, &wg_buffer, ret_sample, pts, duration, flags))) - *ret_stream_number = wg_buffer.stream + 1; - } while (hr == S_FALSE); - - return hr; -} - static struct wm_reader *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, struct wm_reader, IUnknown_inner); @@ -1869,7 +1820,8 @@ static HRESULT WINAPI reader_GetNextSample(IWMSyncReader2 *iface, DWORD *flags, DWORD *output_number, WORD *ret_stream_number) { struct wm_reader *reader = impl_from_IWMSyncReader2(iface); - HRESULT hr = NS_E_NO_MORE_SAMPLES; + struct wm_stream *stream; + HRESULT hr = S_FALSE; TRACE("reader %p, stream_number %u, sample %p, pts %p, duration %p," " flags %p, output_number %p, ret_stream_number %p.\n", @@ -1880,7 +1832,27 @@ static HRESULT WINAPI reader_GetNextSample(IWMSyncReader2 *iface, EnterCriticalSection(&reader->cs); - hr = wm_reader_get_stream_sample(reader, stream_number, sample, pts, duration, flags, &stream_number); + if (!stream_number) + stream = NULL; + else if (!(stream = wm_reader_get_stream_by_stream_number(reader, stream_number))) + hr = E_INVALIDARG; + else if (stream->selection == WMT_OFF) + hr = NS_E_INVALID_REQUEST; + else if (stream->eos) + hr = NS_E_NO_MORE_SAMPLES; + + while (hr == S_FALSE) + { + struct wg_parser_buffer wg_buffer; + if (!wg_parser_stream_get_buffer(reader->wg_parser, stream ? stream->wg_stream : NULL, &wg_buffer)) + hr = NS_E_NO_MORE_SAMPLES; + else if (SUCCEEDED(hr = wm_reader_read_stream_sample(reader, &wg_buffer, sample, pts, duration, flags))) + stream_number = wg_buffer.stream + 1; + } + + if (stream && hr == NS_E_NO_MORE_SAMPLES) + stream->eos = true; + if (output_number && hr == S_OK) *output_number = stream_number - 1; if (ret_stream_number && (hr == S_OK || stream_number))

1 0

Rémi Bernon : winegstreamer: Introduce new wm_stream_allocate_sample helper.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: 2d442738f5fb24d497dd954fd0cd4c1712c7b76b URL: https://gitlab.winehq.org/wine/wine/-/commit/2d442738f5fb24d497dd954fd0cd4c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Sep 24 00:59:15 2022 +0200 winegstreamer: Introduce new wm_stream_allocate_sample helper. --- dlls/winegstreamer/wm_reader.c | 46 +++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 55d98671931..f514475d3eb 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1572,6 +1572,30 @@ static const char *get_major_type_string(enum wg_major_type type) return NULL; } +static HRESULT wm_stream_allocate_sample(struct wm_stream *stream, DWORD size, INSSBuffer **sample) +{ + struct buffer *buffer; + + if (!stream->read_compressed && stream->output_allocator) + return IWMReaderAllocatorEx_AllocateForOutputEx(stream->output_allocator, stream->index, + size, sample, 0, 0, 0, NULL); + + if (stream->read_compressed && stream->stream_allocator) + return IWMReaderAllocatorEx_AllocateForStreamEx(stream->stream_allocator, stream->index + 1, + size, sample, 0, 0, 0, NULL); + + /* FIXME: Should these be pooled? */ + if (!(buffer = calloc(1, offsetof(struct buffer, data[size])))) + return E_OUTOFMEMORY; + buffer->INSSBuffer_iface.lpVtbl = &buffer_vtbl; + buffer->refcount = 1; + buffer->capacity = size; + + TRACE("Created buffer %p.\n", buffer); + *sample = &buffer->INSSBuffer_iface; + return S_OK; +} + /* Find the earliest buffer by PTS. * * Native seems to behave similarly to this with the async reader, although our @@ -1621,7 +1645,6 @@ static HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream struct wg_parser_stream *wg_stream; struct wg_parser_buffer wg_buffer; struct wm_stream *stream; - struct buffer *object; DWORD size, capacity; INSSBuffer *sample; HRESULT hr = S_OK; @@ -1668,26 +1691,7 @@ static HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream TRACE("Got buffer for '%s' stream %p.\n", get_major_type_string(stream->format.major_type), stream); - if (!stream->read_compressed && stream->output_allocator) - hr = IWMReaderAllocatorEx_AllocateForOutputEx(stream->output_allocator, stream->index, - wg_buffer.size, &sample, 0, 0, 0, NULL); - else if (stream->read_compressed && stream->stream_allocator) - hr = IWMReaderAllocatorEx_AllocateForStreamEx(stream->stream_allocator, stream->index + 1, - wg_buffer.size, &sample, 0, 0, 0, NULL); - /* FIXME: Should these be pooled? */ - else if (!(object = calloc(1, offsetof(struct buffer, data[wg_buffer.size])))) - hr = E_OUTOFMEMORY; - else - { - object->INSSBuffer_iface.lpVtbl = &buffer_vtbl; - object->refcount = 1; - object->capacity = wg_buffer.size; - - TRACE("Created buffer %p.\n", object); - sample = &object->INSSBuffer_iface; - } - - if (FAILED(hr)) + if (FAILED(hr = wm_stream_allocate_sample(stream, wg_buffer.size, &sample))) { ERR("Failed to allocate sample of %u bytes, hr %#lx.\n", wg_buffer.size, hr); wg_parser_stream_release_buffer(wg_stream);

1 0

Nikolay Sivov : vbscript: Improve argument type handling in Mid().
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: d2c2c0c4a31b29cce1be9b3162d18bfac756aa33 URL: https://gitlab.winehq.org/wine/wine/-/commit/d2c2c0c4a31b29cce1be9b3162d18b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 8 07:21:09 2022 +0300 vbscript: Improve argument type handling in Mid(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53888 --- dlls/vbscript/global.c | 40 +++++++++++++++++++++++++----------- dlls/vbscript/tests/api.vbs | 49 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index ccbef9a5974..1abfff9b4fe 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1391,35 +1391,49 @@ static HRESULT Global_RightB(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, static HRESULT Global_Mid(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { int len = -1, start, str_len; - BSTR str; + BSTR str, conv_str = NULL; HRESULT hres; TRACE("(%s %s ...)\n", debugstr_variant(args), debugstr_variant(args+1)); assert(args_cnt == 2 || args_cnt == 3); - if(V_VT(args) != VT_BSTR) { - FIXME("args[0] = %s\n", debugstr_variant(args)); - return E_NOTIMPL; - } + if(V_VT(args) == VT_EMPTY) + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); - str = V_BSTR(args); + if(V_VT(args+1) == VT_NULL || (args_cnt == 3 && V_VT(args+2) == VT_NULL)) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + if(V_VT(args+1) == VT_EMPTY) + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); hres = to_int(args+1, &start); if(FAILED(hres)) return hres; + if(start < 0) + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + if(args_cnt == 3) { + if(V_VT(args+2) == VT_EMPTY) + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + hres = to_int(args+2, &len); if(FAILED(hres)) return hres; - if(len < 0) { - FIXME("len = %d\n", len); - return E_FAIL; - } + if(len < 0) + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); } + if(V_VT(args) == VT_BSTR) { + str = V_BSTR(args); + }else { + hres = to_string(args, &conv_str); + if(FAILED(hres)) + return hres; + str = conv_str; + } str_len = SysStringLen(str); start--; @@ -1435,10 +1449,12 @@ static HRESULT Global_Mid(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, V V_VT(res) = VT_BSTR; V_BSTR(res) = SysAllocStringLen(str+start, len); if(!V_BSTR(res)) - return E_OUTOFMEMORY; + hres = E_OUTOFMEMORY; } - return S_OK; + SysFreeString(conv_str); + + return hres; } static HRESULT Global_MidB(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index c9c8610f5fa..5f7f2aac3bf 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -605,10 +605,59 @@ TestMid "test", 1, 2, "te" TestMid "test", 1, 0, "" TestMid "test", 1, 0, "" TestMid "test", 5, 2, "" +TestMid 1234, 1, 2, "12" +TestMid 1234, 5, 2, "" TestMid2 "test", 1, "test" TestMid2 "test", 2, "est" TestMid2 "test", 4, "t" TestMid2 "test", 5, "" +TestMid2 1234, 5, "" + +sub TestMidError() + on error resume next + call Err.clear() + call Mid("test", "a", 1) + call ok(Err.number = 13, "Err.number = " & Err.number) + call Err.clear() + call Mid("test", "a", null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + call Mid("test", "a", empty) + call ok(Err.number = 13, "Err.number = " & Err.number) + call Mid("test", 0, -1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Mid("test", -1, -1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Mid(null, -1, -1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Mid("test", 0, null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + call Mid("test", -1, null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + call Mid("test", null, 2) + call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + call Mid("test", null, -1) + call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + call Mid(null, -1, -1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Mid("test", empty, 1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Mid("test", 0, empty) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Mid(empty, 0, 0) + call ok(Err.number = 5, "Err.number = " & Err.number) +end sub +call TestMidError() Sub TestUCase(str, ex) x = UCase(str)

1 0

Nikolay Sivov : vbscript: Improve invalid argument checks in Right().
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: 47ecca254144af9e2e4fa5e39583c73f88d62b2e URL: https://gitlab.winehq.org/wine/wine/-/commit/47ecca254144af9e2e4fa5e39583c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 8 06:50:22 2022 +0300 vbscript: Improve invalid argument checks in Right(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/global.c | 22 +++++++++++++--------- dlls/vbscript/tests/api.vbs | 21 +++++++++++++++++++++ 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index ad5cb484947..ccbef9a5974 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1348,6 +1348,19 @@ static HRESULT Global_Right(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, TRACE("(%s %s)\n", debugstr_variant(args), debugstr_variant(args+1)); + if(V_VT(args+1) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + hres = to_int(args+1, &len); + if(FAILED(hres)) + return hres; + + if(len < 0) + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + + if(V_VT(args) == VT_NULL) + return return_null(res); + if(V_VT(args) == VT_BSTR) { str = V_BSTR(args); }else { @@ -1357,15 +1370,6 @@ static HRESULT Global_Right(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, str = conv_str; } - hres = to_int(args+1, &len); - if(FAILED(hres)) - return hres; - - if(len < 0) { - FIXME("len = %d\n", len); - return E_FAIL; - } - str_len = SysStringLen(str); if(len > str_len) len = str_len; diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 60ec7f5dc61..c9c8610f5fa 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -842,7 +842,28 @@ TestRight "test", 0, "" TestRight 123, 2, "23" TestRight "test", "3", "est" TestRight 123, "2", "23" +TestRight empty, 0, "" +TestRight empty, 1, "" +TestRight "test", empty, "" +TestRight "test", empty, "" if isEnglishLang then TestRight true, 2, "ue" +call Right(null, 0) +call ok(getVT(Right(null, 0)) = "VT_NULL", "getVT(Right(null, 0)) = " & getVT(Right(null, 0))) +call ok(getVT(Right(null, 1)) = "VT_NULL", "getVT(Right(null, 1)) = " & getVT(Right(null, 1))) + +sub TestRightError() + on error resume next + call Err.clear() + call Right("test", -1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Right(null, -1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Right("test", null) + call ok(Err.number = 94, "Err.number = " & Err.number) +end sub +call TestRightError() Sub TestTrim(str, exstr) Call ok(Trim(str) = exstr, "Trim(" & str & ") = " & Trim(str))

1 0