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

Nikolay Sivov : mf: Raise MESessionStopped again if session is already stopped.
by Alexandre Julliard 14 Apr '20

14 Apr '20

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

Nikolay Sivov : mf: Set approximate occurrence time for MESessionStopped/MESessionEnded events.
by Alexandre Julliard 14 Apr '20

14 Apr '20

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_check: Fix support for .ocx API documentation.
by Alexandre Julliard 14 Apr '20

14 Apr '20

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 : winapi: Tweak a couple of typedef error messages.
by Alexandre Julliard 14 Apr '20

14 Apr '20

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: Allow DECLSPEC_ALIGN() in typedef declarations.
by Alexandre Julliard 14 Apr '20

14 Apr '20

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_test: Clarify the error message regarding struct size and alignment.
by Alexandre Julliard 14 Apr '20

14 Apr '20

Module: wine Branch: master Commit: e5531732ae8653fa81c78f7bdeb068fcbe915c8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5531732ae8653fa81c78f7b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Apr 14 16:56:00 2020 +0200 winapi_test: Clarify the error message regarding struct size and alignment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/winapi_test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 48c29f8f4a..453b7a42e1 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -276,7 +276,7 @@ sub _find_align_kind_size($) { } elsif (/^(struct|union)$/) { $kind = $1; if (!$size_parse_reported{$_}) { - $output->write("$type_name: can't parse type\n"); + $output->write("cannot compute the size and alignment of $type_name types\n"); $size_parse_reported{$_} = 1; } } elsif (/^\w+\s*$(?:\s*CALLBACK|\s*NTAPI|\s*WINAPI)?\s*\*\s*$\s*$.*?$$/) {

1 0

Francois Gouget : winapi: Add support for some new spec file declarations.
by Alexandre Julliard 14 Apr '20

14 Apr '20

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

Francois Gouget : winapi: Ignore function declarations that are too complex.
by Alexandre Julliard 14 Apr '20

14 Apr '20

Module: wine Branch: master Commit: 4c554940d463f57e761d951b3767ddf76330563e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c554940d463f57e761d951b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Apr 14 16:57:00 2020 +0200 winapi: Ignore function declarations that are too complex. A few function declarations are simply too complex for the winapi parser. Some are because they are in fact macro calls, and other because they mix parentheses with array declarations or strange function pointer types. When that happens print an error message and ignore the function declaration. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/winapi_parser.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/winapi/winapi_parser.pm b/tools/winapi/winapi_parser.pm index da0a929bf1..ca4cef4267 100644 --- a/tools/winapi/winapi_parser.pm +++ b/tools/winapi/winapi_parser.pm @@ -492,7 +492,11 @@ sub parse_c_file($$) { # die "$file: $.: syntax error: '$argument_type':'$argument_name'\n"; } else { - die "$file: $.: syntax error: '$argument'\n"; + # This is either a complex argument type, typically + # involving parentheses, or a macro argument. This is rare + # so just ignore the 'function' declaration. + print STDERR "$file: $.: cannot parse declaration argument (ignoring): '$argument'\n"; + next readmore; } $argument_type =~ s/\s*(?:const|volatile)\s*/ /g; # Remove const/volatile

1 0

Francois Gouget : winapi: Skip #if 0 sections.
by Alexandre Julliard 14 Apr '20

14 Apr '20

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_test: Add support for more base types.
by Alexandre Julliard 14 Apr '20

14 Apr '20

Module: wine Branch: master Commit: 8bd4bc47166716762bf03e29e87b9eaaa9cb7b41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bd4bc47166716762bf03e29… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Apr 14 20:10:04 2020 +0200 winapi_test: Add support for more base types. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/winapi_test | 98 +++++++++++++++++++++++++++--------------------- 1 file changed, 55 insertions(+), 43 deletions(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 453b7a42e1..8b7596f040 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -177,42 +177,74 @@ sub _find_align_kind_size($) { $align = $pointer_size; $kind = "pointer"; $size = $pointer_size; + } elsif (/^(?:void|VOID)$/) { + $align = 4; + $kind = "signed"; + $size = 4; } elsif(/^char$/) { $align = 1; $kind = "char"; $size = 1; - } elsif(/^(?:(signed|unsigned)\s+)?(?:__int8|char|byte)$/) { + } elsif(/^(?:(signed|unsigned)\s+)?(?:__int8|char)$/) { $align = 1; $kind = defined($1) ? $1 : "signed"; $size = 1; + } elsif(/^CHAR$/) { + $align = 1; + $kind = "signed"; + $size = 1; + } elsif(/^(?:byte|BOOLEAN|BYTE|UCHAR)$/) { + $align = 1; + $kind = "unsigned"; + $size = 1; } elsif (/^(?:(signed|unsigned)\s+)?(?:__int16|short(?:\s+int)?)$/) { $align = 2; $kind = defined($1) ? $1 : "signed"; $size = 2; - } elsif (/^(?:wchar_t)$/) { + } elsif (/^SHORT$/) { $align = 2; $kind = "signed"; $size = 2; + } elsif (/^(?:char16_t|wchar_t|USHORT|WCHAR|WORD)$/) { + $align = 2; + $kind = "unsigned"; + $size = 2; } elsif (/^(signed|unsigned)$/) { $align = 4; - $kind = defined($1) ? $1 : "signed"; + $kind = $1; $size = 4; } elsif (/^(?:(signed|unsigned)\s+)?(?:__int32|int)$/) { $align = 4; $kind = defined($1) ? $1 : "signed"; $size = 4; + } elsif (/^(?:BOOL|INT|LONG)$/) { + $align = 4; + $kind = "signed"; + $size = 4; + } elsif (/^(?:DWORD|FOURCC|LCID|UINT|ULONG)$/) { + $align = 4; + $kind = "unsigned"; + $size = 4; + } elsif (/^(?:float|FLOAT)$/) { + $align = 4; + $kind = "float"; + $size = 4; } elsif (/^(?:(signed|unsigned)\s+)?(?:long(?:\s+int)?)$/) { $align = $pointer_size; $kind = defined($1) ? $1 : "signed"; $size = $pointer_size; - } elsif (/^(?:float)$/) { - $align = 4; - $kind = "float"; - $size = 4; } elsif (/^(?:(signed|unsigned)\s+)?__int64$/) { $align = 8; $kind = defined($1) ? $1 : "signed"; $size = 8; + } elsif (/^(?:INT64|LONG64|LONGLONG)$/) { + $align = 8; + $kind = "signed"; + $size = 8; + } elsif (/^(?:UINT64|ULONG64|DWORD64|ULONGLONG|DWORDLONG)$/) { + $align = 8; + $kind = "unsigned"; + $size = 8; } elsif (/^(?:double|DOUBLE|DATE)$/) { $align = 8; $kind = "float"; @@ -221,58 +253,38 @@ sub _find_align_kind_size($) { $align = 4; $kind = "float"; $size = 12; - } elsif (/^H(?:DC|BITMAP|BRUSH|ICON|INSTANCE|KEY|MENU|METAFILE|WND)$/) { + } elsif (/^(?:INT|LONG)_PTR$/) { + $align = $pointer_size; + $kind = "signed"; + $size = $pointer_size; + } elsif (/^(?:UINT|MMVERSION|ULONG|DWORD)_PTR$/) { + $align = $pointer_size; + $kind = "unsigned"; + $size = $pointer_size; + } elsif (/^H(?:ANDLE|DC|BITMAP|BRUSH|ICON|INSTANCE|KEY|MENU|METAFILE|MMIO|TASK|WND)$/) { $align = $pointer_size; $kind = "pointer"; $size = $pointer_size; - } elsif (/^LP(?:BYTE|CSTR|CWSTR|DWORD|STR|VOID|WSTR)$/) { + } elsif (/^(?:HPSTR|LP[A-Z0-9_]+|PVOID)$/) { $align = $pointer_size; $kind = "pointer"; $size = $pointer_size; - } elsif (/^(?:FILETIME)$/) { + } elsif (/^POINTS$/) { + $align = 2; + $kind = "struct"; + $size = 4; + } elsif (/^(?:FILETIME|LUID|POINT|POINTL)$/) { $align = 4; $kind = "struct"; $size = 8; - } elsif (/^GUID$/) { + } elsif (/^(?:CLSID|GUID|RECT|RECTL)$/) { $align = 4; $kind = "struct"; $size = 16; - } elsif (/^(?:VOID)$/) { - $align = 4; - $kind = "signed"; - $size = 4; - } elsif (/^(?:SHORT)$/) { - $align = 2; - $kind = "unsigned"; - $size = 2; - } elsif (/^(?:BYTE)$/) { - $align = 1; - $kind = "unsigned"; - $size = 1; - } elsif (/^(?:DWORD)$/) { - $align = 4; - $kind = "unsigned"; - $size = 4; - } elsif (/^(?:WORD)$/) { - $align = 2; - $kind = "unsigned"; - $size = 2; - } elsif (/^(?:INT64|LONG64|LONGLONG)$/) { - $align = 8; - $kind = "signed"; - $size = 8; - } elsif (/^(?:UINT64|ULONG64|DWORD64|ULONGLONG|DWORDLONG)$/) { - $align = 8; - $kind = "unsigned"; - $size = 8; } elsif (/^(?:LARGE_INTEGER)$/) { $align = 8; $kind = "union"; $size = 8; - } elsif (/^(?:POINTS)$/) { - $align = 2; - $kind = "struct"; - $size = 4; } elsif (/^(struct|union)$/) { $kind = $1; if (!$size_parse_reported{$_}) {

1 0