April 2020 - Wine-Commits - list.winehq.org

Nikolay Sivov : mf: Set approximate occurrence time for MESessionStopped/MESessionEnded events.
by Alexandre Julliard April 14, 2020

April 14, 2020

Module: wine Branch: master Commit: 08cdea91ba65548cc4e52a144d36dad5eb85d5de URL: https://source.winehq.org/git/wine.git/?a=commit;h=08cdea91ba65548cc4e52a14… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 14 18:03:46 2020 +0300 mf: Set approximate occurrence time for MESessionStopped/MESessionEnded events. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 076327920a..75ef600a4d 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -207,10 +207,11 @@ struct media_session { IMFTopology *current_topology; MF_TOPOSTATUS topo_status; + MFTIME clock_stop_time; + unsigned int flags; struct list sources; struct list sinks; struct list nodes; - DWORD flags; /* Latest Start() arguments. */ GUID time_format; @@ -829,10 +830,17 @@ static void session_pause(struct media_session *session) static void session_set_stopped(struct media_session *session, HRESULT status) { MediaEventType event_type; + IMFMediaEvent *event; session->state = SESSION_STATE_STOPPED; event_type = session->presentation.flags & SESSION_FLAG_END_OF_PRESENTATION ? MESessionEnded : MESessionStopped; - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, event_type, &GUID_NULL, status, NULL); + + if (SUCCEEDED(MFCreateMediaEvent(event_type, &GUID_NULL, status, NULL, &event))) + { + IMFMediaEvent_SetUINT64(event, &MF_SESSION_APPROX_EVENT_OCCURRENCE_TIME, session->presentation.clock_stop_time); + IMFMediaEventQueue_QueueEvent(session->event_queue, event); + IMFMediaEvent_Release(event); + } } static void session_stop(struct media_session *session) @@ -847,6 +855,7 @@ static void session_stop(struct media_session *session) case SESSION_STATE_PAUSED: /* Transition in two steps - pause clock, wait for sinks and pause sources. */ + IMFPresentationClock_GetTime(session->clock, &session->presentation.clock_stop_time); if (SUCCEEDED(hr = IMFPresentationClock_Stop(session->clock))) session->state = SESSION_STATE_STOPPING_SINKS; else

1 0

Francois Gouget : winapi: Skip #if 0 sections.
by Alexandre Julliard April 14, 2020

April 14, 2020

Module: wine Branch: master Commit: 1c9077f13d32c6b30ac474c52068822525201c36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c9077f13d32c6b30ac474c5… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Apr 14 16:57:12 2020 +0200 winapi: Skip #if 0 sections. They are typically used as 'super comments' and may not contain C code. They are also typically not nested so this ignores nesting. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/winapi_parser.pm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tools/winapi/winapi_parser.pm b/tools/winapi/winapi_parser.pm index ca4cef4267..37038371b2 100644 --- a/tools/winapi/winapi_parser.pm +++ b/tools/winapi/winapi_parser.pm @@ -240,7 +240,21 @@ sub parse_c_file($$) { # remove preprocessor directives if(s/^\s*\#/\#/s) { - if(/^(\#.*?)\\$/s) { + if (/^#\s*if\s+0\s*$/ms) { + # Skip #if 0 ... #endif sections entirely. + # They are typically used as 'super comments' and may not + # contain C code. This totally ignores nesting. + if(s/^(\s*#\s*if\s+0\s*\n.*?\n\s*#\s*endif\s*)\n//s) { + my @lines = split(/\n/, $1); + $_ = "\n" x $#lines; + &$preprocessor_found_callback("if", "0"); + $again = 1; + } else { + $lookahead = 1; + } + next readmore; + } + elsif(/^(\#.*?)\\$/s) { $_ = "$1\n"; $lookahead = 1; next;

1 0

Francois Gouget : winapi: Tweak a couple of typedef error messages.
by Alexandre Julliard April 14, 2020

April 14, 2020

Module: wine Branch: master Commit: eb85be50f45923cb991bf53b00e7ad1cb669425e URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb85be50f45923cb991bf53b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Apr 14 16:55:27 2020 +0200 winapi: Tweak a couple of typedef error messages. This makes them more unique, making it easier to find which part of the code issues these error messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/winapi_parser.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winapi/winapi_parser.pm b/tools/winapi/winapi_parser.pm index b24ce5f5f3..eee7aa4e66 100644 --- a/tools/winapi/winapi_parser.pm +++ b/tools/winapi/winapi_parser.pm @@ -620,10 +620,10 @@ sub parse_c_file($$) { &$type_end([$name]); } elsif(/typedef[^\{;]*;/s) { $_ = $'; $again = 1; - $output->write("$file: $.: can't parse: '$&'\n"); + $output->write("$file: $.: could not parse typedef: '$&'\n"); } elsif(/typedef[^\{]*\{[^\}]*\}[^;];/s) { $_ = $'; $again = 1; - $output->write("$file: $.: can't parse: '$&'\n"); + $output->write("$file: $.: could not parse multi-line typedef: '$&'\n"); } elsif(/\'[^\']*\'/s) { $_ = $'; $again = 1; } elsif(/\"(?:[^\\\"]*|\\.)*\"/s) {

1 0

Francois Gouget : winapi_check: Fix support for .ocx API documentation.
by Alexandre Julliard April 14, 2020

April 14, 2020

Module: wine Branch: master Commit: 5fec86769421a86899e9af267259fe355c8b11ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fec86769421a86899e9af26… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Apr 14 16:55:18 2020 +0200 winapi_check: Fix support for .ocx API documentation. The module name must include non-default extensions, for instance 'wshom.ocx'. Truncating the module name prevents later lookups from finding the API's spec file declaration. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/winapi_documentation.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/winapi/winapi_documentation.pm b/tools/winapi/winapi_documentation.pm index a168cfa6b7..d959e11ac8 100644 --- a/tools/winapi/winapi_documentation.pm +++ b/tools/winapi/winapi_documentation.pm @@ -77,11 +77,10 @@ sub check_documentation($) { my $found_name = 0; my $found_ordinal = 0; - $module =~ s/\.(acm|dll|drv|exe|ocx)$//; # FIXME: Kludge $module = "kernel" if $module eq "krnl386"; # FIXME: Kludge foreach (split(/\n/, $documentation)) { - if(/^(\s*)\*(\s*)(\@|\S+)(\s*)([$\[])(\w+)\.(\@|\d+)([$\]])/) { + if(/^(\s*)\*(\s*)(\@|\S+)(\s*)([$\[])(\w+(?:\.\w+)?)\.(\@|\d+)([$\]])/) { my $external_name2 = $3; my $module2 = $6; my $ordinal2 = $7;

1 0

Francois Gouget : dbghelp: Fix the spelling of a comment.
by Alexandre Julliard April 14, 2020

April 14, 2020

Module: wine Branch: master Commit: ab4665f4ae3c67317e21d42868cae0af72ffcb7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab4665f4ae3c67317e21d428… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Apr 14 16:57:21 2020 +0200 dbghelp: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index ab2a693eca..00e5c12c2e 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -105,7 +105,7 @@ struct elf_module_info #define ELF_SHT_FINI_ARRAY 15 /* Array of destructors */ #define ELF_SHT_PREINIT_ARRAY 16 /* Array of pre-constructors */ #define ELF_SHT_GROUP 17 /* Section group */ -#define ELF_SHT_SYMTAB_SHNDX 18 /* Extended section indeces */ +#define ELF_SHT_SYMTAB_SHNDX 18 /* Extended section indices */ #define ELF_SHT_NUM 19 /* Number of defined types. */ /* Legal values for ST_TYPE subfield of st_info (symbol type). */

1 0

Francois Gouget : adsldp: Fix the spelling of some FIXME() messages.
by Alexandre Julliard April 14, 2020

April 14, 2020

Module: wine Branch: master Commit: 0be09af819470791ba4cc0742549f1901e1440ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=0be09af819470791ba4cc074… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Apr 14 16:57:41 2020 +0200 adsldp: Fix the spelling of some FIXME() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 4 ++-- dlls/adsldp/schema.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index dce462d685..c2f7ca8023 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1147,7 +1147,7 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S case ADS_SEARCHPREF_SEARCH_SCOPE: if (prefs[i].vValue.dwType != ADSTYPE_INTEGER) { - FIXME("ADS_SEARCHPREF_SEACH_SCOPE: not supportd dwType %d\n", prefs[i].vValue.dwType); + FIXME("ADS_SEARCHPREF_SEACH_SCOPE: not supported dwType %d\n", prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; break; } @@ -1178,7 +1178,7 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S if (prefs[i].vValue.dwType != ADSTYPE_INTEGER) { - FIXME("ADS_SEARCHPREF_SECURITY_MASK: not supportd dwType %d\n", prefs[i].vValue.dwType); + FIXME("ADS_SEARCHPREF_SECURITY_MASK: not supported dwType %d\n", prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; break; } diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 63c95bdae6..c8bcf3de66 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -227,7 +227,7 @@ static WCHAR *parse_name(WCHAR **str, ULONG *name_count) if (*p != '\'') { - FIXME("not suported NAME start at %s\n", debugstr_w(p)); + FIXME("not supported NAME start at %s\n", debugstr_w(p)); return NULL; }

1 0

Nikolay Sivov : mf: Add support for end of presentation state change.
by Alexandre Julliard April 14, 2020

April 14, 2020

Module: wine Branch: master Commit: 39c66af35e012f98e165aeeaf8bab7db4d53e756 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39c66af35e012f98e165aeea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 14 18:03:44 2020 +0300 mf: Add support for end of presentation state change. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 67 ++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 47 insertions(+), 20 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 3474b242a4..992b9a5cfb 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -826,9 +826,18 @@ static void session_pause(struct media_session *session) LeaveCriticalSection(&session->cs); } +static void session_set_stopped(struct media_session *session, HRESULT status) +{ + MediaEventType event_type; + + session->state = SESSION_STATE_STOPPED; + event_type = session->presentation.flags & SESSION_FLAG_END_OF_PRESENTATION ? MESessionEnded : MESessionStopped; + IMFMediaEventQueue_QueueEventParamVar(session->event_queue, event_type, &GUID_NULL, status, NULL); +} + static void session_stop(struct media_session *session) { - HRESULT hr = S_OK; + HRESULT hr; EnterCriticalSection(&session->cs); @@ -840,18 +849,14 @@ static void session_stop(struct media_session *session) /* Transition in two steps - pause clock, wait for sinks and pause sources. */ if (SUCCEEDED(hr = IMFPresentationClock_Stop(session->clock))) session->state = SESSION_STATE_STOPPING_SINKS; + else + session_set_stopped(session, hr); break; default: ; } - if (FAILED(hr)) - { - session->state = SESSION_STATE_STOPPED; - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionStopped, &GUID_NULL, hr, NULL); - } - LeaveCriticalSection(&session->cs); } @@ -2215,14 +2220,9 @@ static void session_set_source_object_state(struct media_session *session, IUnkn session_set_caps(session, session->caps & ~MFSESSIONCAP_PAUSE); if (session->presentation.flags & SESSION_FLAG_FINALIZE_SINKS) - { session_finalize_sinks(session); - } else - { - session->state = SESSION_STATE_STOPPED; - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionStopped, &GUID_NULL, S_OK, NULL); - } + session_set_stopped(session, S_OK); break; default: @@ -2237,8 +2237,8 @@ static void session_set_sink_stream_state(struct media_session *session, IMFStre enum object_state state; IMFMediaEvent *event; DWORD caps, flags; + HRESULT hr = S_OK; BOOL changed; - HRESULT hr; if ((state = session_get_object_state_for_event(event_type)) == OBJ_STATE_INVALID) return; @@ -2311,15 +2311,14 @@ static void session_set_sink_stream_state(struct media_session *session, IMFStre LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) { - if (FAILED(hr = IMFMediaSource_Stop(source->source))) + if (session->presentation.flags & SESSION_FLAG_END_OF_PRESENTATION) + IMFMediaSource_Stop(source->source); + else if (FAILED(hr = IMFMediaSource_Stop(source->source))) break; } - if (FAILED(hr)) - { - session->state = SESSION_STATE_STOPPED; - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionStopped, &GUID_NULL, hr, NULL); - } + if (session->presentation.flags & SESSION_FLAG_END_OF_PRESENTATION || FAILED(hr)) + session_set_stopped(session, hr); break; default: @@ -2771,6 +2770,27 @@ static void session_handle_end_of_presentation(struct media_session *session, IM } } +static void session_sink_stream_marker(struct media_session *session, IMFStreamSink *stream_sink) +{ + struct topo_node *node; + + if (!(node = session_get_node_object(session, (IUnknown *)stream_sink, MF_TOPOLOGY_OUTPUT_NODE)) + || node->flags & TOPO_NODE_END_OF_STREAM) + { + return; + } + + node->flags |= TOPO_NODE_END_OF_STREAM; + + if (session->presentation.flags & SESSION_FLAG_END_OF_PRESENTATION && + session_nodes_is_mask_set(session, MF_TOPOLOGY_OUTPUT_NODE, TOPO_NODE_END_OF_STREAM)) + { + session_set_topo_status(session, S_OK, MF_TOPOSTATUS_ENDED); + session_set_caps(session, session->caps & ~MFSESSIONCAP_PAUSE); + session_stop(session); + } +} + static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct media_session *session = impl_from_events_callback_IMFAsyncCallback(iface); @@ -2847,6 +2867,13 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM session_set_sink_stream_state(session, (IMFStreamSink *)event_source, event_type); LeaveCriticalSection(&session->cs); + break; + case MEStreamSinkMarker: + + EnterCriticalSection(&session->cs); + session_sink_stream_marker(session, (IMFStreamSink *)event_source); + LeaveCriticalSection(&session->cs); + break; case MEStreamSinkRequestSample:

1 0

Nikolay Sivov : mf: Raise MESessionStopped again if session is already stopped.
by Alexandre Julliard April 14, 2020

April 14, 2020

Module: wine Branch: master Commit: fe5e93ccc62f59ff026285ad2bb11333066de153 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe5e93ccc62f59ff026285ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 14 18:03:45 2020 +0300 mf: Raise MESessionStopped again if session is already stopped. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 992b9a5cfb..076327920a 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -852,6 +852,9 @@ static void session_stop(struct media_session *session) else session_set_stopped(session, hr); + break; + case SESSION_STATE_STOPPED: + IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionStopped, &GUID_NULL, S_OK, NULL); break; default: ;

1 0

Francois Gouget : winapi: Allow DECLSPEC_ALIGN() in typedef declarations.
by Alexandre Julliard April 14, 2020

April 14, 2020

Module: wine Branch: master Commit: 13c69ae840083105880cac443024b445bc0eb3a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13c69ae840083105880cac44… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Apr 14 16:55:44 2020 +0200 winapi: Allow DECLSPEC_ALIGN() in typedef declarations. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/winapi_parser.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/winapi_parser.pm b/tools/winapi/winapi_parser.pm index eee7aa4e66..da0a929bf1 100644 --- a/tools/winapi/winapi_parser.pm +++ b/tools/winapi/winapi_parser.pm @@ -556,7 +556,7 @@ sub parse_c_file($$) { } elsif(/(DEFAULT|DECLARE)_DEBUG_CHANNEL\s*$(\S+)$/s) { $_ = $'; $again = 1; push @$debug_channels, $1; - } elsif(/typedef\s+(enum|interface|struct|union)(?:\s+(\w+))?\s*\{/s) { + } elsif(/typedef\s+(enum|interface|struct|union)(?:\s+DECLSPEC_ALIGN$\d+$)?(?:\s+(\w+))?\s*\{/s) { $_ = $'; $again = 1; $level++; my $type = $1;

1 0

Francois Gouget : winapi: Add support for some new spec file declarations.
by Alexandre Julliard April 14, 2020

April 14, 2020

Module: wine Branch: master Commit: ebbc0686ec68d3a78924777ab468e0f914ae545c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebbc0686ec68d3a78924777a… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Apr 14 16:56:33 2020 +0200 winapi: Add support for some new spec file declarations. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/winapi.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index 926cd1f40a..c77046583e 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -282,7 +282,7 @@ sub parse_spec_file($$) { my $ARCHES="arm|arm64|i386|powerpc|win32|win64|x86_64"; if(/^(\d+|@)\s+ (cdecl|pascal|stdcall|varargs|thiscall)\s+ - ((?:(?:-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-ordinal|-i386|-ret16|-ret64|-register|-interrupt|-private)\s+)*)(\S+)\s*$\s*(.*?)\s*$\s*(\S*)$/x) + ((?:(?:-arch=!?(?:$ARCHES)(?:,(?:$ARCHES))*|-import|-noname|-norelay|-ordinal|-i386|-ret16|-ret64|-fastcall|-register|-interrupt|-private)\s+)*)(\S+)\s*$\s*(.*?)\s*$\s*(\S*)$/x) { my $calling_convention = $2; my $flags = $3;

1 0