wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Zebediah Figura : ws2_32: Move namespace provider stubs to protocol.c.
by Alexandre Julliard 04 May '21

04 May '21

Module: wine Branch: master Commit: b9cfd6eddb721f297673a3649748586baec6b198 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9cfd6eddb721f297673a364… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 3 21:42:52 2021 -0500 ws2_32: Move namespace provider stubs to protocol.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 337 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/socket.c | 333 ------------------------------------------------ 2 files changed, 337 insertions(+), 333 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b9cfd6eddb721f297673…

1 0

Zebediah Figura : ws2_32: Move byte order conversion functions to protocol.c.
by Alexandre Julliard 04 May '21

04 May '21

Module: wine Branch: master Commit: ec6940cd3fd1f88e0365ae16e5ee9d2add445bd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec6940cd3fd1f88e0365ae16… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 3 21:42:51 2021 -0500 ws2_32: Move byte order conversion functions to protocol.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/socket.c | 97 -------------------------------------------------- 2 files changed, 90 insertions(+), 97 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index fe30f26db53..abbe5738b88 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -2022,3 +2022,93 @@ WS_u_long WINAPI WS_inet_addr( const char *cp ) if (!cp) return INADDR_NONE; return inet_addr( cp ); } + + +/*********************************************************************** + * htonl (ws2_32.8) + */ +WS_u_long WINAPI WS_htonl( WS_u_long hostlong ) +{ + return htonl( hostlong ); +} + + +/*********************************************************************** + * htons (ws2_32.9) + */ +WS_u_short WINAPI WS_htons( WS_u_short hostshort ) +{ + return htons( hostshort ); +} + + +/*********************************************************************** + * WSAHtonl (ws2_32.@) + */ +int WINAPI WSAHtonl( SOCKET s, WS_u_long hostlong, WS_u_long *netlong ) +{ + if (netlong) + { + *netlong = htonl( hostlong ); + return 0; + } + SetLastError( WSAEFAULT ); + return -1; +} + + +/*********************************************************************** + * WSAHtons (ws2_32.@) + */ +int WINAPI WSAHtons( SOCKET s, WS_u_short hostshort, WS_u_short *netshort ) +{ + if (netshort) + { + *netshort = htons( hostshort ); + return 0; + } + SetLastError( WSAEFAULT ); + return -1; +} + + +/*********************************************************************** + * ntohl (ws2_32.14) + */ +WS_u_long WINAPI WS_ntohl( WS_u_long netlong ) +{ + return ntohl( netlong ); +} + + +/*********************************************************************** + * ntohs (ws2_32.15) + */ +WS_u_short WINAPI WS_ntohs( WS_u_short netshort ) +{ + return ntohs( netshort ); +} + + +/*********************************************************************** + * WSANtohl (ws2_32.@) + */ +int WINAPI WSANtohl( SOCKET s, WS_u_long netlong, WS_u_long *hostlong ) +{ + if (!hostlong) return WSAEFAULT; + + *hostlong = ntohl( netlong ); + return 0; +} + + +/*********************************************************************** + * WSANtohs (ws2_32.@) + */ +int WINAPI WSANtohs( SOCKET s, WS_u_short netshort, WS_u_short *hostshort ) +{ + if (!hostshort) return WSAEFAULT; + + *hostshort = ntohs( netshort ); + return 0; +} diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3d930d13bb6..3c63b93d737 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3837,78 +3837,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, } /* end switch(level) */ } -/*********************************************************************** - * htonl (WS2_32.8) - */ -WS_u_long WINAPI WS_htonl(WS_u_long hostlong) -{ - return htonl(hostlong); -} - - -/*********************************************************************** - * htons (WS2_32.9) - */ -WS_u_short WINAPI WS_htons(WS_u_short hostshort) -{ - return htons(hostshort); -} - -/*********************************************************************** - * WSAHtonl (WS2_32.46) - * From MSDN description of error codes, this function should also - * check if WinSock has been initialized and the socket is a valid - * socket. But why? This function only translates a host byte order - * u_long into a network byte order u_long... - */ -int WINAPI WSAHtonl(SOCKET s, WS_u_long hostlong, WS_u_long *lpnetlong) -{ - if (lpnetlong) - { - *lpnetlong = htonl(hostlong); - return 0; - } - SetLastError(WSAEFAULT); - return SOCKET_ERROR; -} - -/*********************************************************************** - * WSAHtons (WS2_32.47) - * From MSDN description of error codes, this function should also - * check if WinSock has been initialized and the socket is a valid - * socket. But why? This function only translates a host byte order - * u_short into a network byte order u_short... - */ -int WINAPI WSAHtons(SOCKET s, WS_u_short hostshort, WS_u_short *lpnetshort) -{ - - if (lpnetshort) - { - *lpnetshort = htons(hostshort); - return 0; - } - SetLastError(WSAEFAULT); - return SOCKET_ERROR; -} - - -/*********************************************************************** - * ntohl (WS2_32.14) - */ -WS_u_long WINAPI WS_ntohl(WS_u_long netlong) -{ - return ntohl(netlong); -} - - -/*********************************************************************** - * ntohs (WS2_32.15) - */ -WS_u_short WINAPI WS_ntohs(WS_u_short netshort) -{ - return ntohs(netshort); -} - static const char *debugstr_wsaioctl(DWORD code) { @@ -6544,31 +6472,6 @@ INT WINAPI WSALookupServiceNextW( HANDLE lookup, DWORD flags, LPDWORD len, LPWSA return SOCKET_ERROR; } -/*********************************************************************** - * WSANtohl (WS2_32.64) - */ -INT WINAPI WSANtohl( SOCKET s, WS_u_long netlong, WS_u_long* lphostlong ) -{ - TRACE( "(%04lx 0x%08x %p)\n", s, netlong, lphostlong ); - - if (!lphostlong) return WSAEFAULT; - - *lphostlong = ntohl( netlong ); - return 0; -} - -/*********************************************************************** - * WSANtohs (WS2_32.65) - */ -INT WINAPI WSANtohs( SOCKET s, WS_u_short netshort, WS_u_short* lphostshort ) -{ - TRACE( "(%04lx 0x%08x %p)\n", s, netshort, lphostshort ); - - if (!lphostshort) return WSAEFAULT; - - *lphostshort = ntohs( netshort ); - return 0; -} /*********************************************************************** * WSAProviderConfigChange (WS2_32.66)

1 0

Zebediah Figura : ws2_32: Move address/string conversion functions to protocol.c.
by Alexandre Julliard 04 May '21

04 May '21

Module: wine Branch: master Commit: 615028f8ba6f37ed41bd7f50d45d77213acfeb3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=615028f8ba6f37ed41bd7f50… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 3 21:42:50 2021 -0500 ws2_32: Move address/string conversion functions to protocol.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 369 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/socket.c | 411 ------------------------------------------------- 2 files changed, 369 insertions(+), 411 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=615028f8ba6f37ed41bd…

1 0

Hugh McMaster : winetest/gather: Dynamically set the scroll-margin-top property on the platform-specific index pages.
by Alexandre Julliard 04 May '21

04 May '21

Module: tools Branch: master Commit: d68796a68adfc4b980c51aacc836b53947f7d3e4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d68796a68adfc4b980c51aa… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 3 23:31:41 2021 +1000 winetest/gather: Dynamically set the scroll-margin-top property on the platform-specific index pages. The sticky <th> header row often has a different height depending on the platform page being accessed. This prevents us from hard-coding the scroll-margin-top property using CSS alone. Dynamically setting this value ensures each bookmark is shown as expected. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/winetest/gather b/winetest/gather index 4698ac3..b4b9464 100755 --- a/winetest/gather +++ b/winetest/gather @@ -911,6 +911,12 @@ EOF To run the tests on your Windows machine, download the <a href="/builds/winetest-$short_build.exe">32-bit winetest</a>. If you have a 64-bit Windows OS, you can also run the <a href="/builds/winetest64-$short_build.exe">64-bit winetest</a>. </div> +<script> + var sticky_height = document.querySelector('.sticky').offsetHeight + 1; + var style = document.createElement('style'); + style.innerHTML = 'div.group table.report td.test a { scroll-margin-top: ' + sticky_height + 'px; }'; + document.head.appendChild(style); +</script> </body> </html> EOF

1 0

Francois Gouget : winetest/build-patterns: Split write_patterns_list().
by Alexandre Julliard 04 May '21

04 May '21

Module: tools Branch: master Commit: 536e5f23bee8ab5e92eb51b8d0b258325207237b URL: https://source.winehq.org/git/tools.git/?a=commit;h=536e5f23bee8ab5e92eb51b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 4 17:26:13 2021 +0200 winetest/build-patterns: Split write_patterns_list(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 253 ++++++++++++++++++++++++++---------------------- 1 file changed, 135 insertions(+), 118 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 130294e..a5f98f5 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"; } }

1 0

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

04 May '21

Module: tools Branch: master Commit: ad674e6601d70028fdc7e901e8c81825eb185b4c URL: https://source.winehq.org/git/tools.git/?a=commit;h=ad674e6601d70028fdc7e90… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 4 17:25:49 2021 +0200 winetest/build-patterns: Reset the palette for each page. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 1 + 1 file changed, 1 insertion(+) diff --git a/winetest/build-patterns b/winetest/build-patterns index e6640d6..130294e 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;

1 0

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

04 May '21

Module: tools Branch: master Commit: 0c401d7d7ee682e282d073aa786adf469527e635 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0c401d7d7ee682e282d073a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 4 17:24:16 2021 +0200 winetest/build-patterns: Move the main page links to the right. This matches the site's convention on other index pages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index fe285cc..e6640d6 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);

1 0

Francois Gouget : winetest/build-patterns: Tweak the failure color gradients.
by Alexandre Julliard 04 May '21

04 May '21

Module: tools Branch: master Commit: f5079e629f772c3bf44c955d9f3ebbc9b689a8cd URL: https://source.winehq.org/git/tools.git/?a=commit;h=f5079e629f772c3bf44c955… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 4 17:23:48 2021 +0200 winetest/build-patterns: Tweak the failure color gradients. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index ea9cd4c..fe285cc 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)

1 0

Zhiyi Zhang : gdi32: Fix typos for GET_DC_PHYSDEV.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: 3ba4412be60dafee310b5d3c71aa762aa8846564 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ba4412be60dafee310b5d3c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Apr 29 10:53:24 2021 +0800 gdi32: Fix typos for GET_DC_PHYSDEV. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/enhmfdrv/dc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index e8bff37a1bc..7fd404fc2cb 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -876,7 +876,7 @@ static BOOL CDECL windrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT b BOOL ret; lock_surface( physdev ); - dev = GET_NEXT_PHYSDEV( dev, pArc ); + dev = GET_NEXT_PHYSDEV( dev, pArcTo ); ret = dev->funcs->pArcTo( dev, left, top, right, bottom, xstart, ystart, xend, yend ); unlock_surface( physdev ); return ret; diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 1c87643ea96..67913f39f0c 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -365,7 +365,7 @@ BOOL CDECL EMFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, DWORD CDECL EMFDRV_SetLayout( PHYSDEV dev, DWORD layout ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetMapMode ); + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetLayout ); EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); EMRSETLAYOUT emr; DWORD ret;

1 0

Nikolay Sivov : mfplat: Implement shared device manager API.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: def07b3f69bd82357419f31449a7de875944a041 URL: https://source.winehq.org/git/wine.git/?a=commit;h=def07b3f69bd82357419f314… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 3 20:02:44 2021 +0300 mfplat: Implement shared device manager API. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 ++ dlls/mfplat/tests/mfplat.c | 39 ++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index dad4039fa16..f1d0aaad94d 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -8553,6 +8553,16 @@ HRESULT WINAPI CreatePropertyStore(IPropertyStore **store) return S_OK; } +struct shared_dxgi_manager +{ + IMFDXGIDeviceManager *manager; + unsigned int token; + unsigned int locks; +}; + +static struct shared_dxgi_manager shared_dm; +static CRITICAL_SECTION shared_dm_cs = { NULL, -1, 0, 0, 0, 0 }; + enum dxgi_device_handle_flags { DXGI_DEVICE_HANDLE_FLAG_OPEN = 0x1, @@ -8904,6 +8914,9 @@ static const IMFDXGIDeviceManagerVtbl dxgi_device_manager_vtbl = dxgi_device_manager_UnlockDevice, }; +/*********************************************************************** + * MFCreateDXGIDeviceManager (mfplat.@) + */ HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **manager) { struct dxgi_device_manager *object; @@ -8930,6 +8943,58 @@ HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **man return S_OK; } +/*********************************************************************** + * MFLockDXGIDeviceManager (mfplat.@) + */ +HRESULT WINAPI MFLockDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **manager) +{ + HRESULT hr = S_OK; + + TRACE("%p, %p.\n", token, manager); + + EnterCriticalSection(&shared_dm_cs); + + if (!shared_dm.manager) + hr = MFCreateDXGIDeviceManager(&shared_dm.token, &shared_dm.manager); + + if (SUCCEEDED(hr)) + { + *manager = shared_dm.manager; + IMFDXGIDeviceManager_AddRef(*manager); + shared_dm.locks++; + + if (token) *token = shared_dm.token; + } + + LeaveCriticalSection(&shared_dm_cs); + + return hr; +} + +/*********************************************************************** + * MFUnlockDXGIDeviceManager (mfplat.@) + */ +HRESULT WINAPI MFUnlockDXGIDeviceManager(void) +{ + TRACE("\n"); + + EnterCriticalSection(&shared_dm_cs); + + if (shared_dm.manager) + { + IMFDXGIDeviceManager_Release(shared_dm.manager); + if (!--shared_dm.locks) + { + shared_dm.manager = NULL; + shared_dm.token = 0; + } + } + + LeaveCriticalSection(&shared_dm_cs); + + return S_OK; +} + /* * MFllMulDiv implementation is derived from gstreamer utility functions code (gstutils.c), diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index d8558cee0cb..e8dc01c200c 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -131,6 +131,7 @@ @ stdcall MFInvokeCallback(ptr) @ stub MFJoinIoPort @ stdcall MFJoinWorkQueue(long long ptr) rtworkq.RtwqJoinWorkQueue +@ stdcall MFLockDXGIDeviceManager(ptr ptr) @ stdcall MFLockPlatform() rtworkq.RtwqLockPlatform @ stdcall MFLockSharedWorkQueue(wstr long ptr ptr) rtworkq.RtwqLockSharedWorkQueue @ stdcall MFLockWorkQueue(long) rtworkq.RtwqLockWorkQueue @@ -171,6 +172,7 @@ @ stub MFTraceFuncEnter @ stub MFUnblockThread @ stdcall MFUnjoinWorkQueue(long long) rtworkq.RtwqUnjoinWorkQueue +@ stdcall MFUnlockDXGIDeviceManager() @ stdcall MFUnlockPlatform() rtworkq.RtwqUnlockPlatform @ stdcall MFUnlockWorkQueue(long) rtworkq.RtwqUnlockWorkQueue @ stdcall MFUnwrapMediaType(ptr ptr) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index b0c7298c28d..65ab72bd57b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -262,6 +262,8 @@ static HRESULT (WINAPI *pMFCreateDXGISurfaceBuffer)(REFIID riid, IUnknown *surfa IMFMediaBuffer **buffer); static HRESULT (WINAPI *pMFCreateVideoMediaTypeFromSubtype)(const GUID *subtype, IMFVideoMediaType **media_type); static HRESULT (WINAPI *pMFLockSharedWorkQueue)(const WCHAR *name, LONG base_priority, DWORD *taskid, DWORD *queue); +static HRESULT (WINAPI *pMFLockDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager); +static HRESULT (WINAPI *pMFUnlockDXGIDeviceManager)(void); static HWND create_window(void) { @@ -935,6 +937,7 @@ static void init_functions(void) X(MFCreateVideoSampleAllocatorEx); X(MFGetPlaneSize); X(MFGetStrideForBitmapInfoHeader); + X(MFLockDXGIDeviceManager); X(MFLockSharedWorkQueue); X(MFMapDX9FormatToDXGIFormat); X(MFMapDXGIFormatToDX9Format); @@ -947,6 +950,7 @@ static void init_functions(void) X(MFTRegisterLocalByCLSID); X(MFTUnregisterLocal); X(MFTUnregisterLocalByCLSID); + X(MFUnlockDXGIDeviceManager); if ((mod = LoadLibraryA("d3d11.dll"))) { @@ -7168,6 +7172,40 @@ static void test_MFllMulDiv(void) } } +static void test_shared_dxgi_device_manager(void) +{ + IMFDXGIDeviceManager *manager; + HRESULT hr; + UINT token; + + if (!pMFLockDXGIDeviceManager) + { + win_skip("Shared DXGI device manager is not supported.\n"); + return; + } + + hr = pMFUnlockDXGIDeviceManager(); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + manager = NULL; + hr = pMFLockDXGIDeviceManager(NULL, &manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!manager, "Unexpected instance.\n"); + + hr = pMFLockDXGIDeviceManager(&token, &manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + EXPECT_REF(manager, 3); + + hr = pMFUnlockDXGIDeviceManager(); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + EXPECT_REF(manager, 2); + + hr = pMFUnlockDXGIDeviceManager(); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +} + START_TEST(mfplat) { char **argv; @@ -7233,6 +7271,7 @@ START_TEST(mfplat) test_sample_allocator(); test_MFMapDX9FormatToDXGIFormat(); test_MFllMulDiv(); + test_shared_dxgi_device_manager(); CoUninitialize(); }

1 0

← Newer
1
...
70
71
72
73
74
75
76
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2021