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

Ziqing Hui : windowscodecs: Add stub for IWICDdsEncoder.
by Alexandre Julliard May 11, 2021

May 11, 2021

Module: wine Branch: master Commit: 6d39e6abe70b75a2b5dedf5f3d3a42a046e44883 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d39e6abe70b75a2b5dedf5f… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue May 11 10:48:39 2021 +0800 windowscodecs: Add stub for IWICDdsEncoder. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 63 ++++++++++++++++++++++++++++++++++++++++-- include/wincodec.idl | 19 +++++++++++++ 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index e8a4f0e5c28..a102d4883cd 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -161,6 +161,7 @@ typedef struct DdsFrameDecode { typedef struct DdsEncoder { IWICBitmapEncoder IWICBitmapEncoder_iface; + IWICDdsEncoder IWICDdsEncoder_iface; LONG ref; CRITICAL_SECTION lock; IStream *stream; @@ -710,6 +711,11 @@ static inline DdsEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) return CONTAINING_RECORD(iface, DdsEncoder, IWICBitmapEncoder_iface); } +static inline DdsEncoder *impl_from_IWICDdsEncoder(IWICDdsEncoder *iface) +{ + return CONTAINING_RECORD(iface, DdsEncoder, IWICDdsEncoder_iface); +} + static inline DdsFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) { return CONTAINING_RECORD(iface, DdsFrameEncode, IWICBitmapFrameEncode_iface); @@ -1705,6 +1711,57 @@ HRESULT DdsDecoder_CreateInstance(REFIID iid, void** ppv) return ret; } +static HRESULT WINAPI DdsEncoder_Dds_QueryInterface(IWICDdsEncoder *iface, REFIID iid, + void **ppv) +{ + DdsEncoder *This = impl_from_IWICDdsEncoder(iface); + return IWICBitmapEncoder_QueryInterface(&This->IWICBitmapEncoder_iface, iid, ppv); +} + +static ULONG WINAPI DdsEncoder_Dds_AddRef(IWICDdsEncoder *iface) +{ + DdsEncoder *This = impl_from_IWICDdsEncoder(iface); + return IWICBitmapEncoder_AddRef(&This->IWICBitmapEncoder_iface); +} + +static ULONG WINAPI DdsEncoder_Dds_Release(IWICDdsEncoder *iface) +{ + DdsEncoder *This = impl_from_IWICDdsEncoder(iface); + return IWICBitmapEncoder_Release(&This->IWICBitmapEncoder_iface); +} + +static HRESULT WINAPI DdsEncoder_Dds_SetParameters(IWICDdsEncoder *iface, + WICDdsParameters *parameters) +{ + FIXME("(%p,%p): stub.\n", iface, parameters); + return E_NOTIMPL; +} + +static HRESULT WINAPI DdsEncoder_Dds_GetParameters(IWICDdsEncoder *iface, + WICDdsParameters *parameters) +{ + FIXME("(%p,%p): stub.\n", iface, parameters); + return E_NOTIMPL; +} + +static HRESULT WINAPI DdsEncoder_Dds_CreateNewFrame(IWICDdsEncoder *iface, + IWICBitmapFrameEncode **frameEncode, + UINT *arrayIndex, UINT *mipLevel, UINT *sliceIndex) +{ + FIXME("(%p,%p,%p,%p,%p): stub.\n", iface, frameEncode, arrayIndex, mipLevel, sliceIndex); + return E_NOTIMPL; +} + +static const IWICDdsEncoderVtbl DdsEncoder_Dds_Vtbl = +{ + DdsEncoder_Dds_QueryInterface, + DdsEncoder_Dds_AddRef, + DdsEncoder_Dds_Release, + DdsEncoder_Dds_SetParameters, + DdsEncoder_Dds_GetParameters, + DdsEncoder_Dds_CreateNewFrame +}; + static HRESULT WINAPI DdsEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, void **ppv) { @@ -1716,8 +1773,9 @@ static HRESULT WINAPI DdsEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapEncoder, iid)) { *ppv = &This->IWICBitmapEncoder_iface; - } - else { + } else if (IsEqualIID(&IID_IWICDdsEncoder, iid)) { + *ppv = &This->IWICDdsEncoder_iface; + } else { *ppv = NULL; return E_NOINTERFACE; } @@ -1929,6 +1987,7 @@ HRESULT DdsEncoder_CreateInstance( REFIID iid, void **ppv) if (!This) return E_OUTOFMEMORY; This->IWICBitmapEncoder_iface.lpVtbl = &DdsEncoder_Vtbl; + This->IWICDdsEncoder_iface.lpVtbl = &DdsEncoder_Dds_Vtbl; This->ref = 1; This->stream = NULL; This->frame_count = 0; diff --git a/include/wincodec.idl b/include/wincodec.idl index 88e183d5796..6752341c02a 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -1196,6 +1196,25 @@ interface IWICDdsDecoder : IUnknown [out, retval] IWICBitmapFrameDecode **bitmapFrame); }; +[ + object, + uuid(5cacdb4c-407e-41b3-b936-d0f010cd6732) +] +interface IWICDdsEncoder : IUnknown +{ + HRESULT SetParameters( + [in] WICDdsParameters *parameters); + + HRESULT GetParameters( + [out] WICDdsParameters *parameters); + + HRESULT CreateNewFrame( + [out] IWICBitmapFrameEncode **frameEncode, + [out, optional] UINT *arrayIndex, + [out, optional] UINT *mipLevel, + [out, optional] UINT *sliceIndex); +}; + [ object, uuid(3d4c0c61-18a4-41e4-bd80-481a4fc9f464)

1 0

Zebediah Figura : ws2_32/tests: Add some tests for shutdown().
by Alexandre Julliard May 11, 2021

May 11, 2021

Module: wine Branch: master Commit: c64f454808c80d87c0d9d84769356d0061ffdf69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c64f454808c80d87c0d9d847… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 11 11:40:21 2021 -0500 ws2_32/tests: Add some tests for shutdown(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 313 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 313 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c64f454808c80d87c0d9…

1 0

Francois Gouget : winetest: Share the group definitions.
by Alexandre Julliard May 11, 2021

May 11, 2021

Module: tools Branch: master Commit: 5c545047030fb1603a6102fdf096cae4ff2084ce URL: https://source.winehq.org/git/tools.git/?a=commit;h=5c545047030fb1603a6102f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 11 18:24:46 2021 +0200 winetest: Share the group definitions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 36 +----------------------------- winetest/gather | 59 ++++++-------------------------------------------- winetest/winetest.conf | 27 +++++++++++++++++++++++ 3 files changed, 35 insertions(+), 87 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index e69ea1f..d6f04a0 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -32,7 +32,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$workdir $gitdir $gitweb/; +use vars qw/$workdir $gitdir $gitweb @groups/; require "winetest.conf"; my $name0=$0; @@ -80,40 +80,6 @@ sub short_date($) } -# This should match the definitions in gather - -my %w95 = (name => "Win95"); -my %w98 = (name => "Win98"); -my %me = (name => "Me"); -my %nt3 = (name => "NT3"); -my %nt4 = (name => "NT4"); -my %w2k = (name => "2000"); -my %xp = (name => "XP"); -my %w2k3 = (name => "2003"); -my %vista = (name => "Vista"); -my %w2k8 = (name => "2008"); -my %win7 = (name => "Win7"); -my %win8 = (name => "Win8"); -my %win1507 = (name => "Win1507+"); -my %win1709 = (name => "Win1709+"); -my %win1909 = (name => "Win1909+"); -my %win10 = (name => "Win10"); -my %win10l = (name => "Win10L"); -my %unknown = (name => "Other"); -my %linux = (name => "Linux"); -my %mac = (name => "Mac"); -my %bsd = (name => "BSD"); -my %solaris = (name => "Solaris"); -my %wine = (name => "Wine"); - -# Define the order of version groups in the summary -my @groups = (\%w95, \%w98, \%me, - \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, - \%vista, \%w2k8, \%win7, \%win8, - \%win1507, \%win1709, \%win1909, \%win10, \%win10l, - \%unknown, \%linux, \%mac, \%bsd, \%solaris, \%wine); - - # # Command line processing # diff --git a/winetest/gather b/winetest/gather index b4b9464..e000777 100755 --- a/winetest/gather +++ b/winetest/gather @@ -32,7 +32,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$workdir $gitdir $gitweb/; +use vars qw/$workdir $gitdir $gitweb @groups/; require "winetest.conf"; my $name0=$0; @@ -126,57 +126,12 @@ sub short_date($) # errors The number of unit tests with errors. # todos The number of unit tests with no error but todos. -# This should match the definitions in build-index - -my %w95 = (name => "Win95"); -my %w98 = (name => "Win98"); -my %me = (name => "Me"); -my %nt3 = (name => "NT3"); -my %nt4 = (name => "NT4"); -my %w2k = (name => "2000"); -my %xp = (name => "XP"); -my %w2k3 = (name => "2003"); -my %vista = (name => "Vista"); -my %w2k8 = (name => "2008"); -my %win7 = (name => "Win7"); -my %win8 = (name => "Win8"); -my %win1507 = (name => "Win1507+"); -my %win1709 = (name => "Win1709+"); -my %win1909 = (name => "Win1909+"); -my %win10 = (name => "Win10"); -my %win10l = (name => "Win10L"); -my %unknown = (name => "Other"); -my %linux = (name => "Linux"); -my %mac = (name => "Mac"); -my %bsd = (name => "BSD"); -my %solaris = (name => "Solaris"); -my %wine = (name => "Wine"); - -# Define the order of version groups in the summary -my @groups = (\%w95, \%w98, \%me, - \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, - \%vista, \%w2k8, \%win7, \%win8, - \%win1507, \%win1709, \%win1909, \%win10, \%win10l, - \%unknown, \%linux, \%mac, \%bsd, \%solaris, \%wine); - -# Map dissect's IDs to the above hashes -my %idmap = (95 => \%w95, 98 => \%w98, me => \%me, - nt3 => \%nt3, nt4 => \%nt4, 2000 => \%w2k, - xp => \%xp, 2003 => \%w2k3, - vista => \%vista, 2008 => \%w2k8, - win7 => \%win7, - win8 => \%win8, win81 => \%win8, - win1507 => \%win1507, win1511 => \%win1507, - win1607 => \%win1507, win1703 => \%win1507, - win1709 => \%win1709, win1803 => \%win1709, - win1809 => \%win1709, win1903 => \%win1709, - win1909 => \%win1909, - win2004 => \%win10l, - win2009 => \%win10, - win10 => \%win10, # for backward compatibility - unknown => \%unknown, - wine => \%wine, linux => \%linux, mac => \%mac, - bsd => \%bsd, solaris => \%solaris); +# Map dissect's IDs to the platform groups +my %idmap; +foreach my $group (@groups) +{ + map { $idmap{$_} = $group } @{$group->{ids}}; +} # diff --git a/winetest/winetest.conf b/winetest/winetest.conf index 1f587b3..3041cf7 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -30,4 +30,31 @@ $patternbuilds = 10; # Probability above which a failure is considered to be fixed (0..1) $fixed_threshold = 0.99; +# Define how and in which order to group the platform results +(a)groups = ( + { name => "Win95", ids => [ "95" ] }, + { name => "Win98", ids => [ "98" ] }, + { name => "Me", ids => [ "me" ] }, + { name => "NT3", ids => [ "nt3" ] }, + { name => "NT4", ids => [ "nt4" ] }, + { name => "2000", ids => [ "2000" ] }, + { name => "XP", ids => [ "xp" ] }, + { name => "2003", ids => [ "2003" ] }, + { name => "Vista", ids => [ "vista" ] }, + { name => "2008", ids => [ "2008" ] }, + { name => "Win7", ids => [ "win7" ] }, + { name => "Win8", ids => [ "win8", "win81" ] }, + { name => "Win1507+", ids => [ "win1507", "win1511", "win1607", "win1703" ] }, + { name => "Win1709+", ids => [ "win1709", "win1803", "win1809", "win1903" ] }, + { name => "Win1909+", ids => [ "win1909" ] }, + { name => "Win10", ids => [ "win2009", "win10" ] }, # win10 for backward compatibility + { name => "Win10L", ids => [ "win2004" ] }, + { name => "Other", ids => [ "unknown" ] }, + { name => "Linux", ids => [ "linux" ] }, + { name => "Mac", ids => [ "mac" ] }, + { name => "BSD", ids => [ "bsd" ] }, + { name => "Solaris", ids => [ "solaris" ] }, + { name => "Wine", ids => [ "wine" ] }, +); + 1; # keep require happy

1 0

Francois Gouget : winetest/build-patterns: Identify commits indirectly related to a test unit.
by Alexandre Julliard May 11, 2021

May 11, 2021

Module: tools Branch: master Commit: b9ba255a11894626b495c1d899ebcad5274d8f1f URL: https://source.winehq.org/git/tools.git/?a=commit;h=b9ba255a11894626b495c1d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 11 18:07:43 2021 +0200 winetest/build-patterns: Identify commits indirectly related to a test unit. Some test units depend on files other than the main C source file such as resource file, JavaScript source, etc. Patches modifying these files could also impact the test results. Also tests may fail in Wine because of modifications to the Wine module rather than to the test. So report patches to any of these components, but hide the more indirect and numerous ones. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 144 +++++++++++++++++++++++++++++++++++++++--------- winetest/report.css | 9 +++ 2 files changed, 127 insertions(+), 26 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index eb152c8..10cc021 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -312,6 +312,9 @@ my %reports; # by commit id. my %tests; +# A set containing the test units source files. +my %testsources; + foreach my $build (@sortedbuilds) { my $filename = "data/$build->{name}/testresults.txt"; @@ -360,6 +363,7 @@ foreach my $build (@sortedbuilds) name => $testname, source => $source, }; + $testsources{$source} = 1; } foreach my $statreps (@items) @@ -679,7 +683,34 @@ if (open(my $fh, "-|", $cmd)) foreach my $filename ($path1, $path2) { next if (!$filename); - $path2commits{$filename}->{$commit->{id}} = $commit; + + if ($filename =~ m~((?:dlls|programs)/([^/]+))/tests/([^/]+)\.c$~) + { + my ($moddir, $module, $unit) = ($1, $2, $3); + if ($tests{"$module:$unit"}) + { + $path2commits{$filename}->{$commit->{id}} = $commit; + } + else + { + # This C file is not the source for a test unit + # so it could impact any test in that directory + $path2commits{"$moddir/tests"}->{$commit->{id}} = $commit; + } + } + elsif ($filename =~ m~((?:dlls|programs)/[^/]+)/tests/~) + { + my $moddir = $1; + # This is not not a C file so it could impact any test in + # that directory + $path2commits{"$moddir/tests"}->{$commit->{id}} = $commit; + } + elsif ($filename =~ m~((?:dlls|programs)/[^/]+)/~) + { + my $moddir = $1; + $path2commits{$moddir}->{$commit->{id}} = $commit; + } + # ignore changes to other files } } else @@ -924,44 +955,85 @@ sub index2symbol($) return $symbols[$index % 62]; } +my %scope_descs = ( + U => "Modifies this test", + t => "Modifies a test resource (maybe for another test)", + m => "Modifies the module", +); + sub write_commits($$) { my ($html, $test) = @_; print $html "<div class='pattern'>"; my $i = 0; - my @symbuilds; + my (@udescs, @tmdescs); foreach my $build (@sortedbuilds) { - if ($test->{commits}->{$build->{name}}) - { - my $symbol = index2symbol($i++); - push @symbuilds, [$symbol, $build]; - printf $html "<a title='%s'>%s</a>", - short_date($build->{date}), $symbol; - } - else + my $buildcommits = $test->{commits}->{$build->{name}}; + if (!$buildcommits) { print $html " "; + next; } - } - print $html "</div> <i>← potentially related commits</i>\n"; - if (@symbuilds) - { - print $html "\n"; - foreach my $symbuild (@symbuilds) + my $symbol = index2symbol($i++); + my ($ucount, $tcount, $tmcount) = (0, 0, 0); + foreach my $commit (sort { $a->{index} <=> $b->{index} } values %$buildcommits) { - my $first = 1; - my ($symbol, $build) = @$symbuild; - my $buildcommits = $test->{commits}->{$build->{name}}; - foreach my $commit (sort { $a->{index} <=> $b->{index} } values %$buildcommits) + my $scope = "m"; + if ($path2commits{$test->{source}}->{$commit->{id}}) { - print $html $first ? "$symbol." : " "; - $first = undef; - printf $html " <a href='%s/commitdiff/%s' title='%s'>%s</a>\n", $gitweb, $commit->{id}, short_date($build->{date}), $commit->{summary}; + $scope = "U"; + } + else + { + my $testdir = $test->{source}; + $testdir =~ s~/[^/]+$~~; + if ($path2commits{$testdir}->{$commit->{id}}) + { + $scope = "t"; + $tcount++; + } + } + + my $desc = sprintf(" <a class='commit%s' title='%s'>%s</a> <a href='%s/commitdiff/%s' title='%s'>%s</a>", + $scope, $scope_descs{$scope}, $scope, + $gitweb, $commit->{id}, + short_date($build->{date}), + $commit->{summary}); + if ($scope eq "U") + { + push @udescs, ($ucount ? "\n " : "\n$symbol."), $desc; + $ucount++; + } + else + { + push @tmdescs, ($tmcount ? " " : "$symbol."), $desc, "\n"; + $tmcount++; } } + push @udescs, " <i>[+$tmcount in details]</i>" if ($ucount and $tmcount); + + my @impacts; + push @impacts, "this test" if ($ucount); + push @impacts, "test resources" if ($tcount); + push @impacts, "the module" if ($tmcount > $tcount); + my $scope = $ucount ? "U" : $tcount ? "t" : "m"; + my $count = $ucount + $tmcount; + printf $html "<a class='commit%s' title='%s : %s commit%s to %s'>%s</a>", + $scope, short_date($build->{date}), + $count, $count > 1 ? "s" : "", + join(", ", @impacts), $symbol; + } + print $html "</div> <i>← potentially related commits</i>\n"; + + print $html @udescs if (@udescs); + if (@tmdescs) + { + print $html "<details><summary>Test and module patch details</summary>"; + print $html @tmdescs; + print $html "</details>"; } } @@ -1012,6 +1084,18 @@ sub write_patterns_list($$$$) } } +sub add_path_commits($$) +{ + my ($commits, $path) = @_; + + return if (!$path2commits{$path}); + foreach my $commit (values %{$path2commits{$path}}) + { + my $buildname = $commit->{build}->{name}; + $commits->{$buildname}->{$commit->{id}} = $commit; + } +} + sub write_patterns_page($$$) { my ($pagereports, $subpage, $title) = (@_); @@ -1055,6 +1139,7 @@ EOF $test->{colors} = {}; $test->{commits} = {}; + my $has_wine_failures; my $first = @sortedbuilds; my $last = -1; my $fixed = 1; @@ -1073,6 +1158,8 @@ EOF $testreport->{first}; $last = $replast if ($replast > $last); + $has_wine_failures ||= $reports{$reportdir}->{is_wine}; + for my $i (0..(a)sortedbuilds-1) { my $build = $sortedbuilds[$i]; @@ -1103,10 +1190,15 @@ EOF "regular"; push @{$lists{$listid}->{testnames}}, $testname; - foreach my $commit (values %{$path2commits{$test->{source}}}) + add_path_commits($test->{commits}, $test->{source}); + # Also take into account commits to test resources + my $moddir = $test->{source}; + $moddir =~ s~/tests/[^/]+$~~; + add_path_commits($test->{commits}, "$moddir/tests"); + if ($has_wine_failures) { - my $buildname = $commit->{build}->{name}; - $test->{commits}->{$buildname}->{$commit->{id}} = $commit; + # In Wine any patch to the module could have caused the failures + add_path_commits($test->{commits}, $moddir); } } diff --git a/winetest/report.css b/winetest/report.css index 2cc4663..4c91972 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -111,3 +111,12 @@ div.pattern :hover { color: black; text-decoration: underline; } .patL { /* error while getting the test list */ background-color: #80aaff; } + +.commitU { + font-weight: bold; +} +.committ { +} +.commitm { + font-style: italic; +}

1 0

Rémi Bernon : server: Add rawinput union to hw_input_t / INPUT_HARDWARE.
by Alexandre Julliard May 10, 2021

May 10, 2021

Module: wine Branch: master Commit: 6d167b91ad0a62c2f0f2aa377b0a321414158463 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d167b91ad0a62c2f0f2aa37… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 6 12:57:31 2021 +0200 server: Add rawinput union to hw_input_t / INPUT_HARDWARE. When msg is WM_INPUT_DEVICE_CHANGE. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 41 ++++++++++++++++++++++------------------- server/protocol.def | 39 +++++++++++++++++++++------------------ server/trace.c | 23 +++++++++++++++++++++++ 3 files changed, 66 insertions(+), 37 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index f326d78bc3c..139aebc722a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -262,30 +262,32 @@ struct hw_msg_source unsigned int origin; }; +union rawinput +{ + int type; + struct + { + int type; + unsigned int message; + unsigned short vkey; + unsigned short scan; + } kbd; + struct + { + int type; + int x; + int y; + unsigned int data; + } mouse; +}; + struct hardware_msg_data { lparam_t info; unsigned int hw_id; unsigned int flags; struct hw_msg_source source; - union - { - int type; - struct - { - int type; - unsigned int message; - unsigned short vkey; - unsigned short scan; - } kbd; - struct - { - int type; - int x; - int y; - unsigned int data; - } mouse; - } rawinput; + union rawinput rawinput; }; struct callback_msg_data @@ -330,6 +332,7 @@ typedef union int type; unsigned int msg; lparam_t lparam; + union rawinput rawinput; } hw; } hw_input_t; @@ -6233,7 +6236,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 698 +#define SERVER_PROTOCOL_VERSION 699 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index abfd6d70240..10c5943a189 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -278,30 +278,32 @@ struct hw_msg_source unsigned int origin; /* source origin (IMO_* values) */ }; +union rawinput +{ + int type; + struct + { + int type; /* RIM_TYPEKEYBOARD */ + unsigned int message; /* message generated by this rawinput event */ + unsigned short vkey; /* virtual key code */ + unsigned short scan; /* scan code */ + } kbd; + struct + { + int type; /* RIM_TYPEMOUSE */ + int x; /* x coordinate */ + int y; /* y coordinate */ + unsigned int data; /* mouse data */ + } mouse; +}; + struct hardware_msg_data { lparam_t info; /* extra info */ unsigned int hw_id; /* unique id */ unsigned int flags; /* hook flags */ struct hw_msg_source source; /* message source */ - union - { - int type; - struct - { - int type; /* RIM_TYPEKEYBOARD */ - unsigned int message; /* message generated by this rawinput event */ - unsigned short vkey; /* virtual key code */ - unsigned short scan; /* scan code */ - } kbd; - struct - { - int type; /* RIM_TYPEMOUSE */ - int x; /* x coordinate */ - int y; /* y coordinate */ - unsigned int data; /* mouse data */ - } mouse; - } rawinput; + union rawinput rawinput; /* rawinput message data */ }; struct callback_msg_data @@ -346,6 +348,7 @@ typedef union int type; /* INPUT_HARDWARE */ unsigned int msg; /* message code */ lparam_t lparam; /* message param */ + union rawinput rawinput;/* rawinput message data */ } hw; } hw_input_t; diff --git a/server/trace.c b/server/trace.c index 6b8c1ad3342..3cbdaf78185 100644 --- a/server/trace.c +++ b/server/trace.c @@ -395,6 +395,24 @@ static void dump_irp_params( const char *prefix, const irp_params_t *data ) } } +static void dump_rawinput( const char *prefix, const union rawinput *rawinput ) +{ + switch (rawinput->type) + { + case RIM_TYPEMOUSE: + fprintf( stderr, "%s{type=MOUSE,x=%d,y=%d,data=%08x}", prefix, rawinput->mouse.x, + rawinput->mouse.y, rawinput->mouse.data ); + break; + case RIM_TYPEKEYBOARD: + fprintf( stderr, "%s{type=KEYBOARD,message=%04x,vkey=%04hx,scan=%04hx}", prefix, + rawinput->kbd.message, rawinput->kbd.vkey, rawinput->kbd.scan ); + break; + default: + fprintf( stderr, "%s{type=%04x}", prefix, rawinput->type ); + break; + } +} + static void dump_hw_input( const char *prefix, const hw_input_t *input ) { switch (input->type) @@ -415,6 +433,11 @@ static void dump_hw_input( const char *prefix, const hw_input_t *input ) case INPUT_HARDWARE: fprintf( stderr, "%s{type=HARDWARE,msg=%04x", prefix, input->hw.msg ); dump_uint64( ",lparam=", &input->hw.lparam ); + switch (input->hw.msg) + { + case WM_INPUT_DEVICE_CHANGE: + dump_rawinput( ",rawinput=", &input->hw.rawinput ); + } fputc( '}', stderr ); break; default:

1 0

Rémi Bernon : server: Add RIM_TYPEHID type / hid member to rawinput union.
by Alexandre Julliard May 10, 2021

May 10, 2021

Module: wine Branch: master Commit: 37c7923a31874715a10be9389ca4c862df2e2130 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37c7923a31874715a10be938… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 6 12:57:32 2021 +0200 server: Add RIM_TYPEHID type / hid member to rawinput union. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 10 +++++++++- server/protocol.def | 8 ++++++++ server/trace.c | 5 +++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 139aebc722a..9fe826918fa 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -279,6 +279,14 @@ union rawinput int y; unsigned int data; } mouse; + struct + { + int type; + unsigned int device; + unsigned int param; + unsigned short usage_page; + unsigned short usage; + } hid; }; struct hardware_msg_data @@ -6236,7 +6244,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 699 +#define SERVER_PROTOCOL_VERSION 700 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 10c5943a189..eaffa886f21 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -295,6 +295,14 @@ union rawinput int y; /* y coordinate */ unsigned int data; /* mouse data */ } mouse; + struct + { + int type; /* RIM_TYPEHID */ + unsigned int device; /* rawinput device index */ + unsigned int param; /* rawinput message param */ + unsigned short usage_page;/* HID usage page */ + unsigned short usage; /* HID usage */ + } hid; }; struct hardware_msg_data diff --git a/server/trace.c b/server/trace.c index 3cbdaf78185..e40f0769a35 100644 --- a/server/trace.c +++ b/server/trace.c @@ -407,6 +407,11 @@ static void dump_rawinput( const char *prefix, const union rawinput *rawinput ) fprintf( stderr, "%s{type=KEYBOARD,message=%04x,vkey=%04hx,scan=%04hx}", prefix, rawinput->kbd.message, rawinput->kbd.vkey, rawinput->kbd.scan ); break; + case RIM_TYPEHID: + fprintf( stderr, "%s{type=HID,device=%04x,param=%04x,page=%04hx,usage=%04hx}", + prefix, rawinput->hid.device, rawinput->hid.param, rawinput->hid.usage_page, + rawinput->hid.usage ); + break; default: fprintf( stderr, "%s{type=%04x}", prefix, rawinput->type ); break;

1 0

Rémi Bernon : user32: Send WM_INPUT_DEVICE_CHANGE / RAWINPUT to the server.
by Alexandre Julliard May 10, 2021

May 10, 2021

Module: wine Branch: master Commit: 44cb53bb37d3c40ea90aec6e35a9c08326b6e848 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44cb53bb37d3c40ea90aec6e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 6 12:57:33 2021 +0200 user32: Send WM_INPUT_DEVICE_CHANGE / RAWINPUT to the server. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index f87ef9fb3af..148b35f8caf 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -35,6 +35,7 @@ #include "dbt.h" #include "dde.h" #include "imm.h" +#include "hidusage.h" #include "ddk/imm.h" #include "wine/server.h" #include "user_private.h" @@ -3233,6 +3234,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r struct send_message_info info; int prev_x, prev_y, new_x, new_y; INT counter = global_key_state_counter; + USAGE hid_usage_page, hid_usage; NTSTATUS ret; BOOL wait; @@ -3242,6 +3244,15 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r info.flags = 0; info.timeout = 0; + if (input->type == INPUT_HARDWARE && rawinput->header.dwType == RIM_TYPEHID) + { + if (input->u.hi.uMsg == WM_INPUT_DEVICE_CHANGE) + { + hid_usage_page = ((USAGE *)rawinput->data.hid.bRawData)[0]; + hid_usage = ((USAGE *)rawinput->data.hid.bRawData)[1]; + } + } + SERVER_START_REQ( send_hardware_message ) { req->win = wine_server_user_handle( hwnd ); @@ -3267,6 +3278,24 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r case INPUT_HARDWARE: req->input.hw.msg = input->u.hi.uMsg; req->input.hw.lparam = MAKELONG( input->u.hi.wParamL, input->u.hi.wParamH ); + switch (input->u.hi.uMsg) + { + case WM_INPUT_DEVICE_CHANGE: + req->input.hw.rawinput.type = rawinput->header.dwType; + switch (rawinput->header.dwType) + { + case RIM_TYPEHID: + assert( rawinput->data.hid.dwCount <= 1 ); + req->input.hw.rawinput.hid.device = HandleToUlong( rawinput->header.hDevice ); + req->input.hw.rawinput.hid.param = rawinput->header.wParam; + req->input.hw.rawinput.hid.usage_page = hid_usage_page; + req->input.hw.rawinput.hid.usage = hid_usage; + break; + default: + assert( 0 ); + break; + } + } break; } if (key_state_info) wine_server_set_reply( req, key_state_info->state,

1 0

Piotr Caban : msvcrt: Implement llrintf using rintf function.
by Alexandre Julliard May 10, 2021

May 10, 2021

Module: wine Branch: master Commit: 0cdc52c65cadd0e17153856e6026e8cfc9bec985 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cdc52c65cadd0e17153856e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 10 20:12:05 2021 +0200 msvcrt: Implement llrintf using rintf function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 10 +++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 9 insertions(+), 20 deletions(-) diff --git a/configure b/configure index d4f1cf1383c..b6964befcc5 100755 --- a/configure +++ b/configure @@ -19636,7 +19636,6 @@ for ac_func in \ fmaf \ lgamma \ lgammaf \ - llrintf \ log1p \ log1pf \ log2 \ diff --git a/configure.ac b/configure.ac index 8fa4eac0961..2e809c2e1f0 100644 --- a/configure.ac +++ b/configure.ac @@ -2676,7 +2676,6 @@ AC_CHECK_FUNCS(\ fmaf \ lgamma \ lgammaf \ - llrintf \ log1p \ log1pf \ log2 \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b9209e7b349..e5c50efcf20 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4388,7 +4388,15 @@ __int64 CDECL llrint(double x) */ __int64 CDECL llrintf(float x) { - return unix_funcs->llrintf( x ); + float f; + + f = rintf(x); + if ((f < 0 && f != (float)(__int64)f) + || (f >= 0 && f != (float)(unsigned __int64)f)) { + *_errno() = EDOM; + return 0; + } + return f; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index a7a69405877..282c11166f5 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -435,18 +435,6 @@ static float CDECL unix_lgammaf(float x) #endif } -/********************************************************************* - * llrintf - */ -static __int64 CDECL unix_llrintf(float x) -{ -#ifdef HAVE_LLRINTF - return llrintf(x); -#else - return x >= 0 ? floorf(x + 0.5) : ceilf(x - 0.5); -#endif -} - /********************************************************************* * log */ @@ -846,7 +834,6 @@ static const struct unix_funcs funcs = unix_ldexp, unix_lgamma, unix_lgammaf, - unix_llrintf, unix_log, unix_logf, unix_log10, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 56e8d630dc2..6ce85c194ac 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -60,7 +60,6 @@ struct unix_funcs double (CDECL *ldexp)(double x, int exp); double (CDECL *lgamma)(double x); float (CDECL *lgammaf)(float x); - __int64 (CDECL *llrintf)(float x); double (CDECL *log)(double x); float (CDECL *logf)(float x); double (CDECL *log10)(double x); diff --git a/include/config.h.in b/include/config.h.in index db5dba7a54f..2fc36aa7eda 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -453,9 +453,6 @@ /* Define to 1 if you have the <linux/videodev2.h> header file. */ #undef HAVE_LINUX_VIDEODEV2_H -/* Define to 1 if you have the `llrintf' function. */ -#undef HAVE_LLRINTF - /* Define to 1 if you have the `log1p' function. */ #undef HAVE_LOG1P

1 0

Rémi Bernon : hidclass.sys: Use __wine_send_input to send device notifications.
by Alexandre Julliard May 10, 2021

May 10, 2021

Module: wine Branch: master Commit: c0fc89991b641d9927af3c0cc29ce16ee8ad1b4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0fc89991b641d9927af3c0c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 6 12:57:30 2021 +0200 hidclass.sys: Use __wine_send_input to send device notifications. When INPUT type is INPUT_HARDWARE and hi.uMsg is WM_INPUT_DEVICE_CHANGE, the RAWINPUT structure usage is a non-standard extension for Wine internal usage: * header.wParam contains the message GIDC_ARRIVAL / GIDC_REMOVAL wparam, * hid.bRawData contains two words, which are the HID device UsagePage and Usage words, instead of a real HID report. This will let us use the same entry point and structures to send device notifications as for the HID reports in the future (which will be sent with INPUT_HARDWARE type / WM_INPUT uMsg instead). This currently does nothing, because the INPUT_HARDWARE messages are currently dropped, and because winedevice.exe desktop is different from the default desktop. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/Makefile.in | 2 +- dlls/hidclass.sys/pnp.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/Makefile.in b/dlls/hidclass.sys/Makefile.in index 4b1e9338eb4..09281c118b4 100644 --- a/dlls/hidclass.sys/Makefile.in +++ b/dlls/hidclass.sys/Makefile.in @@ -1,6 +1,6 @@ MODULE = hidclass.sys IMPORTLIB = hidclass -IMPORTS = hal ntoskrnl +IMPORTS = hal ntoskrnl user32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 4490f1eba23..b5862a01593 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -30,6 +30,7 @@ #include "ddk/hidtypes.h" #include "ddk/wdm.h" #include "regstr.h" +#include "winuser.h" #include "wine/debug.h" #include "wine/asm.h" #include "wine/list.h" @@ -103,6 +104,30 @@ static UINT32 alloc_rawinput_handle(void) return InterlockedIncrement(&counter); } +/* make sure bRawData can hold UsagePage and Usage without requiring additional allocation */ +C_ASSERT(offsetof(RAWINPUT, data.hid.bRawData[2 * sizeof(USAGE)]) < sizeof(RAWINPUT)); + +static void send_wm_input_device_change(BASE_DEVICE_EXTENSION *ext, LPARAM param) +{ + RAWINPUT rawinput; + INPUT input; + + rawinput.header.dwType = RIM_TYPEHID; + rawinput.header.dwSize = offsetof(RAWINPUT, data.hid.bRawData[2 * sizeof(USAGE)]); + rawinput.header.hDevice = ULongToHandle(ext->u.pdo.rawinput_handle); + rawinput.header.wParam = param; + rawinput.data.hid.dwCount = 0; + rawinput.data.hid.dwSizeHid = 0; + ((USAGE *)rawinput.data.hid.bRawData)[0] = ext->u.pdo.preparsed_data->caps.UsagePage; + ((USAGE *)rawinput.data.hid.bRawData)[1] = ext->u.pdo.preparsed_data->caps.Usage; + + input.type = INPUT_HARDWARE; + input.u.hi.uMsg = WM_INPUT_DEVICE_CHANGE; + input.u.hi.wParamH = 0; + input.u.hi.wParamL = 0; + __wine_send_input(0, &input, &rawinput); +} + static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *bus_pdo) { WCHAR device_id[MAX_DEVICE_ID_LEN], instance_id[MAX_DEVICE_ID_LEN]; @@ -262,6 +287,8 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) sizeof(HID_XFER_PACKET) + pdo_ext->u.pdo.preparsed_data->caps.InputReportByteLength); HID_StartDeviceThread(child_pdo); + + send_wm_input_device_change(pdo_ext, GIDC_ARRIVAL); } static NTSTATUS fdo_pnp(DEVICE_OBJECT *device, IRP *irp) @@ -433,6 +460,8 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device, IRP *irp) { IRP *queued_irp; + send_wm_input_device_change(ext, GIDC_REMOVAL); + IoSetDeviceInterfaceState(&ext->u.pdo.link_name, FALSE); if (ext->u.pdo.is_mouse) IoSetDeviceInterfaceState(&ext->u.pdo.mouse_link_name, FALSE);

1 0

Zebediah Figura : server: Avoid calling get_unix_fd() in IOCTL_AFD_CREATE.
by Alexandre Julliard May 10, 2021

May 10, 2021

Module: wine Branch: master Commit: 920f654ffb73688ee92af049c6c866f4eea3af1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=920f654ffb73688ee92af049… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 10 10:19:43 2021 -0500 server: Avoid calling get_unix_fd() in IOCTL_AFD_CREATE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 36fda31f9c1..24a826e4ce5 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1087,7 +1087,6 @@ static int init_socket( struct sock *sock, int family, int type, int protocol, u return -1; } sock_reselect( sock ); - clear_error(); return 0; } @@ -1354,7 +1353,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) assert( sock->obj.ops == &sock_ops ); - if (get_unix_fd( fd ) == -1 && code != IOCTL_AFD_CREATE) return 0; + if (code != IOCTL_AFD_CREATE && get_unix_fd( fd ) < 0) return 0; switch(code) {

1 0