May 2021 - Wine-devel - list.winehq.org

[PATCH 1/2] winegstreamer: Store decoder caps for decodebin parser.
by Connor McAdams 04 May '21

04 May '21

Store the current decoder caps so that we know what the expected input format is. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/winegstreamer/wg_parser.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 0d59297a026..1653701506c 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -49,6 +49,7 @@ struct wg_parser GstElement *container, *decodebin; GstBus *bus; GstPad *my_src, *their_sink; + GstCaps *decoder_caps; guint64 file_size, start_offset, next_offset, stop_offset; guint64 next_pull_offset; @@ -720,8 +721,12 @@ static GstAutoplugSelectResult autoplug_select_cb(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) { const char *name = gst_element_factory_get_longname(fact); + struct wg_parser *parser = user; GST_TRACE("Using \"%s\".", name); + if (parser->decoder_caps) + gst_caps_unref(parser->decoder_caps); + parser->decoder_caps = NULL; if (strstr(name, "Player protection")) { @@ -733,6 +738,9 @@ static GstAutoplugSelectResult autoplug_select_cb(GstElement *bin, GstPad *pad, GST_WARNING("Disabled video acceleration since it breaks in wine."); return GST_AUTOPLUG_SELECT_SKIP; } + if (caps) + parser->decoder_caps = gst_caps_ref(caps); + return GST_AUTOPLUG_SELECT_TRY; } @@ -1520,10 +1528,12 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s { GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE("quartz_src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); + struct wg_format input_format; unsigned int i; parser->file_size = file_size; parser->sink_connected = true; + memset(&input_format, 0, sizeof(input_format)); if (!parser->bus) { @@ -1547,6 +1557,13 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s if (!parser->init_gst(parser)) return E_FAIL; + if (parser->decoder_caps) + { + wg_format_from_caps(&input_format, parser->decoder_caps); + gst_caps_unref(parser->decoder_caps); + parser->decoder_caps = NULL; + } + pthread_mutex_lock(&parser->mutex); for (i = 0; i < parser->stream_count; ++i) -- 2.25.1

2 6

[PATCH 1/5] ntoskrnl: Implement IoSetDevicePropertyData().
by Rémi Bernon 04 May '21

04 May '21

From: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- In PATCH 1, the return GetLastError() look wrong to me but the same is done in IoGetDeviceProperty so I kept them. I guess we would need to convert the setupapi error back to NTSTATUS, or implement the higher level setupapi on top of these lower level primitives intead. In PATCH 2, I moved the error case before IoInvalidateDeviceRelations, because I don't know what the call is actually expecting. Maybe it was unnecessary. dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + dlls/ntoskrnl.exe/pnp.c | 51 +++++++++++++++++++++++++++++ include/ddk/wdm.h | 4 +++ 3 files changed, 56 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 2e5e2e6e11b..4eb08faec2e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -465,6 +465,7 @@ @ stdcall IoReuseIrp(ptr long) @ stub IoSetCompletionRoutineEx @ stdcall IoSetDeviceInterfaceState(ptr long) +@ stdcall IoSetDevicePropertyData(ptr ptr long long long long ptr) @ stub IoSetDeviceToVerify @ stub IoSetFileOrigin @ stub IoSetHardErrorOrVerifyDevice diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 095344b1073..e425712d738 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -38,6 +38,12 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); WINE_DEFAULT_DEBUG_CHANNEL(plugplay); +static inline const char *debugstr_propkey( const DEVPROPKEY *id ) +{ + if (!id) return "(null)"; + return wine_dbg_sprintf( "{%s,%04x}", wine_dbgstr_guid( &id->fmtid ), id->pid ); +} + #define MAX_SERVICE_NAME 260 struct device_interface @@ -783,6 +789,51 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable return ret; } +/*********************************************************************** + * IoSetDevicePropertyData (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoSetDevicePropertyData( DEVICE_OBJECT *device, const DEVPROPKEY *property_key, LCID lcid, + ULONG flags, DEVPROPTYPE type, ULONG size, void *data ) +{ + SP_DEVINFO_DATA sp_device = {sizeof(sp_device)}; + WCHAR device_instance_id[MAX_DEVICE_ID_LEN]; + NTSTATUS status; + HDEVINFO set; + + TRACE( "device %p, property_key %s, lcid %#x, flags %#x, type %#x, size %u, data %p.\n", + device, debugstr_propkey(property_key), lcid, flags, type, size, data ); + + /* flags is always treated as PLUGPLAY_PROPERTY_PERSISTENT starting with Win 8 / 2012 */ + + if (lcid != LOCALE_NEUTRAL) FIXME( "only LOCALE_NEUTRAL is supported\n" ); + + if ((status = get_device_instance_id( device, device_instance_id ))) return status; + + if ((set = SetupDiCreateDeviceInfoList( &GUID_NULL, NULL )) == INVALID_HANDLE_VALUE) + { + ERR( "Failed to create device list, error %#x.\n", GetLastError() ); + return GetLastError(); + } + + if (!SetupDiOpenDeviceInfoW( set, device_instance_id, NULL, 0, &sp_device )) + { + ERR( "Failed to open device, error %#x.\n", GetLastError() ); + SetupDiDestroyDeviceInfoList( set ); + return GetLastError(); + } + + if (!SetupDiSetDevicePropertyW( set, &sp_device, property_key, type, data, size, 0 )) + { + ERR( "Failed to set property, error %#x.\n", GetLastError() ); + SetupDiDestroyDeviceInfoList( set ); + return GetLastError(); + } + + SetupDiDestroyDeviceInfoList( set ); + + return STATUS_SUCCESS; +} + /*********************************************************************** * IoRegisterDeviceInterface (NTOSKRNL.EXE.@) */ diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 51097bfe3ab..447833c4bc9 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -21,6 +21,7 @@ #define _NTDDK_ #include <ntstatus.h> +#include <devpropdef.h> #ifdef _WIN64 #define POINTER_ALIGNMENT DECLSPEC_ALIGN(8) @@ -1681,6 +1682,8 @@ void WINAPI ExReleaseResourceForThreadLite(ERESOURCE*,ERESOURCE_THREAD); ULONG WINAPI ExSetTimerResolution(ULONG,BOOLEAN); void WINAPI ExUnregisterCallback(void*); +#define PLUGPLAY_PROPERTY_PERSISTENT 0x0001 + void WINAPI IoAcquireCancelSpinLock(KIRQL*); NTSTATUS WINAPI IoAcquireRemoveLockEx(IO_REMOVE_LOCK*,void*,const char*,ULONG, ULONG); NTSTATUS WINAPI IoAllocateDriverObjectExtension(PDRIVER_OBJECT,PVOID,ULONG,PVOID*); @@ -1728,6 +1731,7 @@ void WINAPI IoReleaseRemoveLockAndWaitEx(IO_REMOVE_LOCK*,void*,ULONG); void WINAPI IoReleaseRemoveLockEx(IO_REMOVE_LOCK*,void*,ULONG); void WINAPI IoReuseIrp(IRP*,NTSTATUS); NTSTATUS WINAPI IoSetDeviceInterfaceState(UNICODE_STRING*,BOOLEAN); +NTSTATUS WINAPI IoSetDevicePropertyData(DEVICE_OBJECT*,const DEVPROPKEY*,LCID,ULONG,DEVPROPTYPE,ULONG,void*); NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG); void FASTCALL KeAcquireInStackQueuedSpinLockAtDpcLevel(KSPIN_LOCK*,KLOCK_QUEUE_HANDLE*); -- 2.31.0

4 16

[PATCH] shell32/tests: fix test failures from ad412b11a7ea17b708994ed6609f8ed0cbfb169b
by Damjan Jovanovic 04 May '21

04 May '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/shell32/tests/shlfolder.c | 66 +++++++++++++++------------------- 1 file changed, 29 insertions(+), 37 deletions(-)

2 1

[PATCH 1/7] msvcrt: Remove return after _endthread().
by Arkadiusz Hiler 04 May '21

04 May '21

Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/msvcrt/thread.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index 650afdc08af..c2fc863dd33 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -103,7 +103,6 @@ static DWORD CALLBACK _beginthread_trampoline(LPVOID arg) local_trampoline.start_address(local_trampoline.arglist); _endthread(); - return 0; } /********************************************************************* -- 2.31.1

3 17

[tools] winetest/build-patterns: Split write_patterns_list().
by Francois Gouget 04 May '21

04 May '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-patterns | 253 +++++++++++++++++++++------------------- 1 file changed, 135 insertions(+), 118 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 130294ea1..a5f98f5f3 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -709,6 +709,140 @@ sub cmpstatus return ($a =~ /^[0-9]+$/ and $b =~ /^[0-9]+$/) ? $a <=> $b : $a cmp $b; } +sub write_newmodes_line($$) +{ + my ($html, $test) = @_; + + print $html "New failure modes:"; + foreach my $status (sort cmpstatus keys %{$test->{newmodes}}) + { + my ($symbol, $class, $title, $_link, $attrs) = get_status_html($status, $test->{colors}); + print $html " <span class='pat$class'$attrs title='$title'><b><i>$symbol</i></b></span>"; + } + print $html "\n"; +} + +sub write_pattern_line($$$) +{ + my ($html, $test, $reportdir) = @_; + my $testreport = $test->{testreports}->{$reportdir}; + + print $html "<div class='pattern'>"; + + my $has_newmode; + my ($range_symbol, $range_count) = ("", 0); + my ($range_start, $range_end, $range_title); + foreach my $build (@sortedbuilds) + { + my ($symbol, $class, $title); + my ($tag, $attrs) = ("span", ""); + my $status = $testreport->{status}->{$build->{name}}; + + if (!defined $status) + { + if (!$build->{hasreport}->{$reportdir}) + { + $symbol = "_"; + $class = "W"; + $title = "WineTest was not run"; + } + elsif ($build->{hastest}->{$test->{name}}) + { + $symbol = "."; + $class = "S"; + $title = "success"; + } + else + { + $symbol = " "; + $class = "A"; + $title = "no such test in this build"; + } + } + else + { + ($symbol, $class, $title, my $link, $attrs) = get_status_html($status, $test->{colors}); + if ($link eq "t") + { + $tag = "a"; + $attrs .= sprintf " href='%s/%s/%s.html'", + $build->{name}, $reportdir, $test->{name}; + } + elsif ($link) + { + $tag = "a"; + my $dll = $test->{name}; + $dll =~ s/:.*//; + $attrs .= sprintf " href='%s/%s/%s.html#%s'", + $build->{name}, $reportdir, $link, $dll; + } + if ($test->{newmodes}->{$status}) + { + $symbol = "<b><i>$symbol</i></b>"; + $has_newmode = 1; + } + } + + if ($range_symbol eq $symbol) + { + $range_end = $build->{date}; + $range_count++; + } + else + { + # Close the previous range of patterns + if ($range_count) + { + printf $html " title='%s : %s'>%s</span>", + date_range($range_start, $range_end), + $range_title, $range_symbol x $range_count; + $range_symbol = $range_end = ""; + $range_count = 0; + } + + # Start a new pattern range + $class = " class='pat$class'" if ($class); + print $html "<$tag$class$attrs"; + if ($tag eq "a") + { + printf $html " title='%s : %s'>%s</a>", + short_date($build->{date}), $title, $symbol; + } + else + { + $range_symbol = $symbol; + $range_start = $build->{date}; + $range_title = $title; + $range_count = 1; + } + } + } + if ($range_count) + { + printf $html " title='%s : %s'>%s</span>", + date_range($range_start, $range_end), + $range_title, $range_symbol x $range_count; + } + my $label = $reportdir; + $label = "<b>$label</b>" if ($has_newmode); + print $html "</div> $label\n"; +} + +sub write_pattern($$$) +{ + my ($html, $test, $pagereports) = @_; + + compute_set_colors($test->{colors}); + write_newmodes_line($html, $test) if (%{$test->{newmodes}}); + + foreach my $reportdir (@sortedreports) + { + next if (!$pagereports->{$reportdir}); + next if (!$test->{testreports}->{$reportdir}->{failed}); + write_pattern_line($html, $test, $reportdir); + } +} + sub write_patterns_list($$$$) { my ($html, $pagereports, $mainpage, $list) = @_; @@ -734,125 +868,8 @@ sub write_patterns_list($$$$) print $html "</div></div>\n"; - compute_set_colors($test->{colors}); - print $html "<div class='test'>\n"; - if (%{$test->{newmodes}}) - { - print $html "New failure modes:"; - foreach my $status (sort cmpstatus keys %{$test->{newmodes}}) - { - my ($symbol, $class, $title, $_link, $attrs) = get_status_html($status, $test->{colors}); - print $html " <span class='pat$class'$attrs title='$title'><b><i>$symbol</i></b></span>"; - } - print $html "\n"; - } - - foreach my $reportdir (@sortedreports) - { - next if (!$pagereports->{$reportdir}); - my $testreport = $test->{testreports}->{$reportdir}; - next if (!$testreport->{failed}); - print $html "<div class='pattern'>"; - - my $has_newmode; - my ($range_symbol, $range_count) = ("", 0); - my ($range_start, $range_end, $range_title); - foreach my $build (@sortedbuilds) - { - my ($symbol, $class, $title); - my ($tag, $attrs) = ("span", ""); - my $status = $testreport->{status}->{$build->{name}}; - - if (!defined $status) - { - if (!$build->{hasreport}->{$reportdir}) - { - $symbol = "_"; - $class = "W"; - $title = "WineTest was not run"; - } - elsif ($build->{hastest}->{$testname}) - { - $symbol = "."; - $class = "S"; - $title = "success"; - } - else - { - $symbol = " "; - $class = "A"; - $title = "no such test in this build"; - } - } - else - { - ($symbol, $class, $title, my $link, $attrs) = get_status_html($status, $test->{colors}); - if ($link eq "t") - { - $tag = "a"; - $attrs .= sprintf " href='%s/%s/%s.html'", - $build->{name}, $reportdir, $testname; - } - elsif ($link) - { - $tag = "a"; - my $dll = $testname; - $dll =~ s/:.*//; - $attrs .= sprintf " href='%s/%s/%s.html#%s'", - $build->{name}, $reportdir, $link, $dll; - } - if ($test->{newmodes}->{$status}) - { - $symbol = "<b><i>$symbol</i></b>"; - $has_newmode = 1; - } - } - - if ($range_symbol eq $symbol) - { - $range_end = $build->{date}; - $range_count++; - } - else - { - # Close the previous range of patterns - if ($range_count) - { - printf $html " title='%s : %s'>%s</span>", - date_range($range_start, $range_end), - $range_title, $range_symbol x $range_count; - $range_symbol = $range_end = ""; - $range_count = 0; - } - - # Start a new pattern range - $class = " class='pat$class'" if ($class); - print $html "<$tag$class$attrs"; - if ($tag eq "a") - { - printf $html " title='%s : %s'>%s</a>", - short_date($build->{date}), $title, $symbol; - } - else - { - $range_symbol = $symbol; - $range_start = $build->{date}; - $range_title = $title; - $range_count = 1; - } - } - } - if ($range_count) - { - printf $html " title='%s : %s'>%s</span>", - date_range($range_start, $range_end), - $range_title, $range_symbol x $range_count; - } - my $label = $reportdir; - $label = "<b>$label</b>" if ($has_newmode); - print $html "</div> $label\n"; - } + write_pattern($html, $test, $pagereports); print $html "</div></div>\n"; } } -- 2.20.1

1 0

[tools] winetest/build-patterns: Reset the palette for each page.
by Francois Gouget 04 May '21

04 May '21

Otherwise pages with fewer reports use a palette designed for the full range of failure counts of the main page, losing contrast for no reason. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-patterns | 1 + 1 file changed, 1 insertion(+) diff --git a/winetest/build-patterns b/winetest/build-patterns index e6640d69c..130294ea1 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -897,6 +897,7 @@ EOF foreach my $testname (sort keys %tests) { my $test = $tests{$testname}; + $test->{colors} = {}; my $first = @sortedbuilds; my $last = -1; -- 2.20.1

1 0

[tools] winetest/build-patterns: Move the main page links to the right.
by Francois Gouget 04 May '21

04 May '21

This matches the site's convention on other index pages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-patterns | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index fe285cc5b..e6640d69c 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -721,8 +721,11 @@ sub write_patterns_list($$$$) print $html "<div class='testfile' id='$testname'>\n"; print $html "<div class='updownbar'><a href='tests/$testname.html'>$testname</a>"; - print $html " <small>(<a href='$mainpage#$testname'>see all results</a></small>)" if ($mainpage); print $html "<div class='ralign'>"; + if ($mainpage) + { + print $html "<a href='$mainpage#$testname'>all results</a> | "; + } my $href = $i ? $testnames->[$i-1] : $list->{prevunit}; print $html "<a href='#$href'>↑</a>" if (defined $href); -- 2.20.1

1 0

[tools] winetest/build-patterns: Tweak the failure color gradients.
by Francois Gouget 04 May '21

04 May '21

Start from a 'darker cyan' when we need a lot of colors. Stick to lighter shades when few colors are needed for better color consistency and aesthetics. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-patterns | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index ea9cd4c1d..fe285cc5b 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -621,11 +621,6 @@ sub blend($$$) return $r; } -my @keycolors = ([0, 255, 255], # cyan - [0, 255, 0], # green - [255, 255, 0], # yellow - [255, 0, 0], # red -); # Use colors to differentiate the set values. Each unique value is assigned # a color (in HTML format) picked along a series of gradients passing by the @@ -633,6 +628,12 @@ my @keycolors = ([0, 255, 255], # cyan sub compute_set_colors($) { my ($set) = @_; + + my @keycolors = ([0, 255, 255], # cyan + [0, 255, 0], # green + [255, 255, 0], # yellow + [255, 0, 0]); # red + my @values = sort { $a <=> $b } keys %$set; my $count = @values; if ($count == 1) @@ -641,6 +642,10 @@ sub compute_set_colors($) } else { + # Start from a 'darker cyan' for increased contrast + # when many colors are needed. + $keycolors[0] = [0, 179, 179] if ($count > 10); + my $k = 0; my ($start, $end) = (-1, 0); for (0..$count-1) -- 2.20.1

1 0

[PATCH] po: Update Dutch translation
by Floris Renaud 04 May '21

04 May '21

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/po/nl.po b/po/nl.po index 74dd20a4afe..6347c615a8f 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-04-21 09:20+0200\n" +"PO-Revision-Date: 2021-05-04 16:50+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -571,7 +571,7 @@ msgstr "Opslaan als..." #: dlls/comdlg32/comdlg32.rc:193 dlls/comdlg32/comdlg32.rc:146 msgid "Save As" -msgstr "&Opslaan als" +msgstr "Opslaan als" #: dlls/comdlg32/comdlg32.rc:202 dlls/comdlg32/comdlg32.rc:211 #: dlls/comdlg32/comdlg32.rc:358 dlls/comdlg32/comdlg32.rc:55 @@ -3985,10 +3985,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "Kan onschrijfbare eigenschap '|' niet veranderen" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "'[object]' is geen datum object" +msgstr "'this' is geen Map object" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" @@ -14799,10 +14797,8 @@ msgstr "" "\n" #: programs/reg/reg.rc:180 -#, fuzzy -#| msgid "reg: Unable to find the specified registry key\n" msgid "reg: Unable to access or create the specified registry key\n" -msgstr "reg: Kan de gegeven registersleutel niet vinden\n" +msgstr "reg: Kan de gegeven registersleutel niet openen of aanmaken\n" #: programs/regedit/regedit.rc:34 msgid "&Registry" -- 2.31.1

1 0

[PATCH] po: Update Polish translation.
by Łukasz Wojniłowicz 04 May '21

04 May '21

1 0