February 2021 - Wine-commits

Rémi Bernon : include: Add Windows.Media.SpeechSynthesis.SpeechSynthesizer runtimeclass.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: 02edba0f9d27d5130cc6398f2c0d2cb4e09cbfb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02edba0f9d27d5130cc6398f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 9 10:37:22 2021 +0100 include: Add Windows.Media.SpeechSynthesis.SpeechSynthesizer runtimeclass. As an illustration for the newly supported attributes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.media.speechsynthesis.idl | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/windows.media.speechsynthesis.idl b/include/windows.media.speechsynthesis.idl index 502261f79c6..87497678f30 100644 --- a/include/windows.media.speechsynthesis.idl +++ b/include/windows.media.speechsynthesis.idl @@ -24,10 +24,16 @@ import "inspectable.idl"; import "windows.foundation.idl"; namespace Windows { + namespace Foundation { + interface IClosable; + } namespace Media { namespace SpeechSynthesis { typedef enum VoiceGender VoiceGender; interface IInstalledVoicesStatic; + interface IInstalledVoicesStatic2; + interface ISpeechSynthesizer; + interface ISpeechSynthesizer2; interface IVoiceInformation; runtimeclass VoiceInformation; } @@ -66,6 +72,20 @@ namespace Windows { { [default] interface Windows.Media.SpeechSynthesis.IVoiceInformation; } + + [ + activatable(Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Media.SpeechSynthesis.IInstalledVoicesStatic, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.Media.SpeechSynthesis.IInstalledVoicesStatic2, Windows.Foundation.UniversalApiContract, 5.0) + ] + runtimeclass SpeechSynthesizer + { + [default] interface Windows.Media.SpeechSynthesis.ISpeechSynthesizer; + interface Windows.Foundation.IClosable; + [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.Media.SpeechSynthesis.ISpeechSynthesizer2; + } } } }

1 0

Andrew Boyarshin : widl: Fix handling of output_name in option parsing.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: 5423e0d9e6fc60300a042c3933716fbcf3334fd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5423e0d9e6fc60300a042c39… Author: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> Date: Tue Feb 9 13:38:50 2021 +0100 widl: Fix handling of output_name in option parsing. Do not overwrite explicitly stated paths, such as header_name or proxy_name. Instead, use output_name when specified as a fallback. Signed-off-by: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/widl.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 99b24e86fdc..8da887ea636 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -831,19 +831,17 @@ int main(int argc,char *argv[]) set_everything(TRUE); } - if (!output_name) output_name = dup_basename(input_name, ".idl"); - if (do_header + do_typelib + do_proxies + do_client + - do_server + do_regscript + do_idfile + do_dlldata == 1) + do_server + do_regscript + do_idfile + do_dlldata == 1 && output_name) { - if (do_header) header_name = output_name; - else if (do_typelib) typelib_name = output_name; - else if (do_proxies) proxy_name = output_name; - else if (do_client) client_name = output_name; - else if (do_server) server_name = output_name; - else if (do_regscript) regscript_name = output_name; - else if (do_idfile) idfile_name = output_name; - else if (do_dlldata) dlldata_name = output_name; + if (do_header && !header_name) header_name = output_name; + else if (do_typelib && !typelib_name) typelib_name = output_name; + else if (do_proxies && !proxy_name) proxy_name = output_name; + else if (do_client && !client_name) client_name = output_name; + else if (do_server && !server_name) server_name = output_name; + else if (do_regscript && !regscript_name) regscript_name = output_name; + else if (do_idfile && !idfile_name) idfile_name = output_name; + else if (do_dlldata && !dlldata_name) dlldata_name = output_name; } if (!dlldata_name && do_dlldata)

1 0

Hugh McMaster : reg/tests: Add initial syntax tests for 'reg copy'.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: 6cf0e7fe85ba2f9348cec4d4d555c5dac42033de URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cf0e7fe85ba2f9348cec4d4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Feb 9 22:52:45 2021 +1100 reg/tests: Add initial syntax tests for 'reg copy'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index ea4e128da5a..afba8424c1a 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -21,7 +21,8 @@ #include "wine/test.h" #define lok ok_(__FILE__,line) -#define KEY_BASE "Software\\Wine\\reg_test" +#define KEY_WINE "Software\\Wine" +#define KEY_BASE KEY_WINE "\\reg_test" #define REG_EXIT_SUCCESS 0 #define REG_EXIT_FAILURE 1 #define TODO_REG_TYPE (0x0001u) @@ -4684,6 +4685,82 @@ static void test_export(void) delete_key(HKEY_CURRENT_USER, KEY_BASE); } +#define COPY_DEST KEY_WINE "\\reg_copy" + +static void test_copy(void) +{ + DWORD r; + + run_reg_exe("reg copy", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /?", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg copy /h", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg copy -H", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg copy /? /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /h /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /? /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /h /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /s /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /f /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " foo /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" KEY_BASE" /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /f HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /f HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /f HKEY_CURRENT_USER\\" COPY_DEST, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /s HKEY_CURRENT_USER\\" COPY_DEST, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" COPY_DEST " HKEY_CURRENT_USER\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" COPY_DEST " HKEY_CURRENT_USER\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST "/a", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST "/f /a", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); +} + START_TEST(reg) { DWORD r; @@ -4702,4 +4779,5 @@ START_TEST(reg) test_unicode_import_with_whitespace(); test_import_31(); test_export(); + test_copy(); }

1 0

Jacek Caban : mshtml: Move load_gecko() call from DllRegisterServer to DllInstall.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: 5b362f07f67db5f90ac355c62a1f3d73658c4346 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b362f07f67db5f90ac355c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 9 13:51:59 2021 +0100 mshtml: Move load_gecko() call from DllRegisterServer to DllInstall. With this patch, Wine will no longer ensure that Wine Gecko is available during prefix creation and update. We have shared Gecko installations and good support for installing Gecko on demand now. To ensure that Gecko is installed, one may use DllInstall with something like |regsvr32 -i mshtml|. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/main.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 642e2fdbffd..7ee26076513 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -524,9 +524,15 @@ DWORD WINAPI RNIGetCompatibleVersion(void) /*********************************************************************** * DllInstall (MSHTML.@) */ -HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) +HRESULT WINAPI DllInstall(BOOL install, const WCHAR *cmdline) { - FIXME("stub %d %s: returning S_OK\n", bInstall, debugstr_w(cmdline)); + TRACE("(%x %s)\n", install, debugstr_w(cmdline)); + + if(cmdline && *cmdline) + FIXME("unsupported cmdline: %s\n", debugstr_w(cmdline)); + else if(install) + load_gecko(); + return S_OK; } @@ -669,9 +675,6 @@ HRESULT WINAPI DllRegisterServer(void) hres = __wine_register_resources( hInst ); if(SUCCEEDED(hres)) hres = register_server(TRUE); - if(SUCCEEDED(hres)) - load_gecko(); - return hres; }

1 0

Jacek Caban : include: Add relogger.idl file.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: fd6e23e5ef1fffca1e26e0a5b6a2548493952864 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd6e23e5ef1fffca1e26e0a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 9 14:33:17 2021 +0100 include: Add relogger.idl file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/relogger.idl | 184 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 185 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index f99280149fd..c1efee700fa 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -593,6 +593,7 @@ SOURCES = \ raserror.h \ reason.h \ regstr.h \ + relogger.idl \ restartmanager.h \ restrictederrorinfo.idl \ richedit.h \ diff --git a/include/relogger.idl b/include/relogger.idl new file mode 100644 index 00000000000..60e04512ee0 --- /dev/null +++ b/include/relogger.idl @@ -0,0 +1,184 @@ +/* + * Copyright 2021 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "oaidl.idl"; +import "ocidl.idl"; + +#ifndef __WIDL__ +#define threading(model) +#endif + +typedef struct _EVENT_DESCRIPTOR +{ + USHORT Id; + UCHAR Version; + UCHAR Channel; + UCHAR Level; + UCHAR Opcode; + USHORT Task; + ULONGLONG Keyword; +} EVENT_DESCRIPTOR, *PEVENT_DESCRIPTOR; +typedef const EVENT_DESCRIPTOR *PCEVENT_DESCRIPTOR; + +typedef struct _EVENT_HEADER +{ + USHORT Size; + USHORT HeaderType; + USHORT Flags; + USHORT EventProperty; + ULONG ThreadId; + ULONG ProcessId; + LARGE_INTEGER TimeStamp; + GUID ProviderId; + EVENT_DESCRIPTOR EventDescriptor; + union { + struct { + ULONG KernelTime; + ULONG UserTime; + } DUMMYSTRUCTNAME; + ULONG64 ProcessorTime; + } DUMMYUNIONNAME; + GUID ActivityId; +} EVENT_HEADER, *PEVENT_HEADER; + +typedef struct _ETW_BUFFER_CONTEXT +{ + union { + struct { + UCHAR ProcessorNumber; + UCHAR Alignment; + } DUMMYSTRUCTNAME; + USHORT ProcessorIndex; + } DUMMYUNIONNAME; + USHORT LoggerId; +} ETW_BUFFER_CONTEXT, *PETW_BUFFER_CONTEXT; + +typedef struct _EVENT_HEADER_EXTENDED_DATA_ITEM +{ + USHORT Reserved1; + USHORT ExtType; + USHORT Linkage; + USHORT DataSize; + ULONGLONG DataPtr; +} EVENT_HEADER_EXTENDED_DATA_ITEM, *PEVENT_HEADER_EXTENDED_DATA_ITEM; + +typedef struct _EVENT_RECORD +{ + EVENT_HEADER EventHeader; + ETW_BUFFER_CONTEXT BufferContext; + USHORT ExtendedDataCount; + USHORT UserDataLength; + EVENT_HEADER_EXTENDED_DATA_ITEM *ExtendedData; + void *UserData; + void *UserContext; +} EVENT_RECORD, *PEVENT_RECORD; + +typedef ULONG64 TRACEHANDLE, *PTRACEHANDLE; + +[ + object, + uuid(8cc97f40-9028-4ff3-9b62-7d1f79ca7bcb), + local +] +interface ITraceEvent : IUnknown +{ + HRESULT Clone([out, retval] ITraceEvent **NewEvent); + + HRESULT GetUserContext([out, retval] void **UserContext); + + HRESULT GetEventRecord([out, retval] PEVENT_RECORD *EventRecord); + + HRESULT SetPayload([in, size_is(PayloadSize)] BYTE *Payload, + [in] ULONG PayloadSize); + + HRESULT SetEventDescriptor([in] PCEVENT_DESCRIPTOR EventDescriptor); + + HRESULT SetProcessId([in] ULONG ProcessId); + + HRESULT SetProcessorIndex([in] ULONG ProcessorIndex); + + HRESULT SetThreadId([in] ULONG ThreadId); + + HRESULT SetThreadTimes([in] ULONG KernelTime, + [in] ULONG UserTime); + + HRESULT SetActivityId([in] LPCGUID ActivityId); + + HRESULT SetTimeStamp([in] LARGE_INTEGER *TimeStamp); + + HRESULT SetProviderId([in] LPCGUID ProviderId); +} + +interface ITraceRelogger; + +[ + object, + uuid(3ed25501-593f-43e9-8f38-3ab46f5a4a52) +] +interface ITraceEventCallback : IUnknown +{ + HRESULT OnBeginProcessTrace([in] ITraceEvent *HeaderEvent, + [in] ITraceRelogger *Relogger); + + HRESULT OnFinalizeProcessTrace([in] ITraceRelogger *Relogger); + + HRESULT OnEvent([in] ITraceEvent *Event, + [in] ITraceRelogger *Relogger); +} + +[ + object, + uuid(f754ad43-3bcc-4286-8009-9c5da214e84e), + local +] +interface ITraceRelogger : IUnknown +{ + HRESULT AddLogfileTraceStream([in] BSTR LogfileName, + [in] void *UserContext, + [out, retval] TRACEHANDLE *TraceHandle); + + HRESULT AddRealtimeTraceStream([in] BSTR LoggerName, + [in] void *UserContext, + [out, retval] TRACEHANDLE *TraceHandle); + + HRESULT RegisterCallback([in] ITraceEventCallback *Callback); + + HRESULT Inject([in] ITraceEvent *Event); + + HRESULT CreateEventInstance([in] TRACEHANDLE TraceHandle, + [in] ULONG Flags, + [out, retval] ITraceEvent **Event); + + HRESULT ProcessTrace(); + + HRESULT SetOutputFilename([in] BSTR LogfileName); + + HRESULT SetCompressionMode([in] BOOLEAN CompressionMode); + + HRESULT Cancel(); +} + +[ + uuid(7b40792d-05ff-44c4-9058-f440c71f17d4), + threading(both) +] +coclass CTraceRelogger +{ + [default] interface ITraceRelogger; +}

1 0

Paul Gofman : vcomp100: Share the source with vcomp.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: 761481ba2a1bcc67715eecc3f7bd54e6e7fa9df3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=761481ba2a1bcc67715eecc3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 9 02:44:11 2021 +0300 vcomp100: Share the source with vcomp. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp100/Makefile.in | 7 ++ dlls/vcomp100/vcomp100.spec | 202 ++++++++++++++++++++++---------------------- 2 files changed, 108 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=761481ba2a1bcc67715e…

1 0

Paul Gofman : vcomp110: Share the source with vcomp.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: 411afe8223b8aad8e55a4aa039f69b0fcd169d14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=411afe8223b8aad8e55a4aa0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 9 02:44:12 2021 +0300 vcomp110: Share the source with vcomp. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp110/Makefile.in | 7 ++ dlls/vcomp110/vcomp110.spec | 202 ++++++++++++++++++++++---------------------- 2 files changed, 108 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=411afe8223b8aad8e55a…

1 0

Zebediah Figura : winegstreamer: Do not use gst_segment_to_running_time().
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: a3e7cfd4d7df756145145e7c853a2f2a7a711102 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3e7cfd4d7df756145145e7c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 8 15:06:58 2021 -0600 winegstreamer: Do not use gst_segment_to_running_time(). It fails if samples lie outside of the current segment, but DirectShow filters (in particular, the native AVI splitter) will happily set timestamps outside of the current segment. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 7b3a4fd48bd..c05b1e24018 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -103,7 +103,6 @@ struct wg_parser_stream { GstPad *their_src, *post_sink, *post_src, *my_sink; GstElement *flip; - GstSegment *segment; GstCaps *caps; pthread_cond_t event_cond, event_empty_cond; @@ -769,8 +768,6 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) break; } - gst_segment_copy_into(segment, stream->segment); - stream_event.type = WG_PARSER_EVENT_SEGMENT; stream_event.u.segment.position = segment->position / 100; stream_event.u.segment.stop = segment->stop / 100; @@ -822,7 +819,6 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) break; case GST_EVENT_FLUSH_STOP: - gst_segment_init(stream->segment, GST_FORMAT_TIME); if (stream->enabled) { pthread_mutex_lock(&parser->mutex); @@ -928,7 +924,6 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu static HRESULT send_sample(struct parser_source *pin, IMediaSample *sample, GstBuffer *buf, GstMapInfo *info, gsize offset, gsize size, DWORD bytes_per_second) { - struct wg_parser_stream *stream = pin->wg_stream; HRESULT hr; BYTE *ptr = NULL; @@ -943,26 +938,19 @@ static HRESULT send_sample(struct parser_source *pin, IMediaSample *sample, memcpy(ptr, &info->data[offset], size); if (GST_BUFFER_PTS_IS_VALID(buf)) { - REFERENCE_TIME rtStart; - GstClockTime ptsStart = buf->pts; + REFERENCE_TIME rtStart, ptsStart = buf->pts; + if (offset > 0) ptsStart = buf->pts + gst_util_uint64_scale(offset, GST_SECOND, bytes_per_second); - rtStart = gst_segment_to_running_time(stream->segment, GST_FORMAT_TIME, ptsStart); - if (rtStart >= 0) - rtStart /= 100; + rtStart = ((ptsStart / 100) - pin->seek.llCurrent) * pin->seek.dRate; if (GST_BUFFER_DURATION_IS_VALID(buf)) { - REFERENCE_TIME rtStop; - REFERENCE_TIME tStart; - REFERENCE_TIME tStop; - GstClockTime ptsStop = buf->pts + buf->duration; + REFERENCE_TIME rtStop, tStart, tStop, ptsStop = buf->pts + buf->duration; if (offset + size < info->size) ptsStop = buf->pts + gst_util_uint64_scale(offset + size, GST_SECOND, bytes_per_second); tStart = ptsStart / 100; tStop = ptsStop / 100; - rtStop = gst_segment_to_running_time(stream->segment, GST_FORMAT_TIME, ptsStop); - if (rtStop >= 0) - rtStop /= 100; + rtStop = ((ptsStop / 100) - pin->seek.llCurrent) * pin->seek.dRate; TRACE("Current time on %p: %i to %i ms\n", pin, (int)(rtStart / 10000), (int)(rtStop / 10000)); IMediaSample_SetTime(sample, &rtStart, rtStop >= 0 ? &rtStop : NULL); IMediaSample_SetMediaTime(sample, &tStart, &tStop); @@ -2473,7 +2461,6 @@ static void free_stream(struct wg_parser_stream *stream) gst_object_unref(stream->their_src); } gst_object_unref(stream->my_sink); - gst_segment_free(stream->segment); pthread_cond_destroy(&stream->event_cond); pthread_cond_destroy(&stream->event_empty_cond); @@ -2538,8 +2525,6 @@ static struct parser_source *create_pin(struct parser *filter, const WCHAR *name pin->wg_stream = stream; strmbase_source_init(&pin->pin, &filter->filter, name, &source_ops); - stream->segment = gst_segment_new(); - gst_segment_init(stream->segment, GST_FORMAT_TIME); pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl; strmbase_seeking_init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, GST_ChangeCurrent, GST_ChangeRate);

1 0

Zebediah Figura : winegstreamer: Introduce an intermediate media format structure.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: fb096d54a82a0ce754b14de3ea099a3bc0c26115 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb096d54a82a0ce754b14de3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 8 15:06:59 2021 -0600 winegstreamer: Introduce an intermediate media format structure. The fundamental idea here is to provide a type which can be used in the unixlib interface. Obviously GstCaps can't be used from PE, and while AM_MEDIA_TYPE can in theory be used from the Unix library, allocation of the format block makes things a little tricky. Moreover, we'd ideally like to use the same backend for DirectShow and Media Foundation, and while it wouldn't be a problem currently, in general AM_MEDIA_TYPE is not quite expressive enough to translate from GstCaps to IMFMediaType, and the latter can't be used from the Unix library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 60 +++++ dlls/winegstreamer/gstdemux.c | 516 ++++++++++++++++++++++++++++++++------- 2 files changed, 486 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fb096d54a82a0ce754b1…

1 0

Zebediah Figura : winegstreamer: Use struct wg_format to convert from AM_MEDIA_TYPE to GstCaps.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: 7fa0855fa12bd962d5decf59995fcb4485bd54a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fa0855fa12bd962d5decf59… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 8 15:07:00 2021 -0600 winegstreamer: Use struct wg_format to convert from AM_MEDIA_TYPE to GstCaps. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 222 +++++++++++++++++++++++++++++++----------- 1 file changed, 167 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7fa0855fa12bd962d5de…

1 0