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

Francisco Casas : tests: Test matrix initialization.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: vkd3d Branch: master Commit: 535bbfa6f8aa3b41bf7d667866859eaf416a7e67 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=535bbfa6f8aa3b41bf7d667… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Apr 22 12:25:04 2022 +0200 tests: Test matrix initialization. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + tests/hlsl-initializer-matrix.shader_test | 72 +++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/Makefile.am b/Makefile.am index 3e113dc7..26aa3f84 100644 --- a/Makefile.am +++ b/Makefile.am @@ -79,6 +79,7 @@ vkd3d_shader_tests = \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-nested.shader_test \ tests/hlsl-initializer-numeric.shader_test \ + tests/hlsl-initializer-matrix.shader_test \ tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-initializer-struct.shader_test \ tests/hlsl-intrinsic-override.shader_test \ diff --git a/tests/hlsl-initializer-matrix.shader_test b/tests/hlsl-initializer-matrix.shader_test new file mode 100644 index 00000000..c4fafea7 --- /dev/null +++ b/tests/hlsl-initializer-matrix.shader_test @@ -0,0 +1,72 @@ +[pixel shader] +float4 main() : SV_TARGET +{ + float4x3 mat = {11, 12, 13, 21, 22, 23, 31, 32, 33, 41, 42, 43}; + return float4(mat[1], 0); +} + +[test] +todo draw quad +probe all rgba (21, 22, 23, 0) + + +[pixel shader] +float4 main() : SV_TARGET +{ + row_major float4x3 mat = {11, 12, 13, 21, 22, 23, 31, 32, 33, 41, 42, 43}; + return float4(mat[1], 0); +} + +[test] +todo draw quad +probe all rgba (21, 22, 23, 0) + + +[pixel shader] +float4 main() : SV_TARGET +{ + float3x4 mat = {11, 12, 13, 14, 21, 22, 23, 24, 31, 32, 33, 34}; + return float4(mat[1]); +} + +[test] +todo draw quad +probe all rgba (21, 22, 23, 24) + + +[pixel shader] +float4 main() : SV_TARGET +{ + row_major float3x2 mat = {11, 12, 21, 22, 31, 32}; + return float4(mat[1], mat[2]); +} + +[test] +todo draw quad +probe all rgba (21, 22, 31, 32) + + +[pixel shader] +float4 main() : SV_TARGET +{ + row_major float3x2 mat; + mat = float3x2(11, 12, 21, 22, 31, 32); + return float4(mat[1], mat[2]); +} + +[test] +todo draw quad +probe all rgba (21, 22, 31, 32) + + +[pixel shader] +float4 main() : SV_TARGET +{ + float4 x = float4(12, 21, 22, 31); + float3x2 mat = float3x2(11, x, 32); + return float4(mat[1], mat[2]); +} + +[test] +todo draw quad +probe all rgba (21, 22, 31, 32)

1 0

Francois Gouget : winetest: Move the win2004 results in the Win1909+ category.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: tools Branch: master Commit: fd6c06576400f717ceb569a0dffb91c8f2e7522a URL: https://source.winehq.org/git/tools.git/?a=commit;h=fd6c06576400f717ceb569a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 25 19:15:59 2022 +0200 winetest: Move the win2004 results in the Win1909+ category. They used to be used for the locale tests which is why they were in the Win10L category. But the locale tests have been running on win21H1 for a long time now. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/winetest.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/winetest.conf b/winetest/winetest.conf index 3623a8d..411382b 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -47,9 +47,9 @@ $fixed_threshold = 0.99; { name => "Win8", ids => [ "win8", "win81" ] }, { name => "Win1507+", ids => [ "win1507", "win1511", "win1607", "win1703" ] }, { name => "Win1709+", ids => [ "win1709", "win1803", "win1809", "win1903" ] }, - { name => "Win1909+", ids => [ "win1909" ] }, + { name => "Win1909+", ids => [ "win1909", "win2004" ] }, { name => "Win10", ids => [ "win2009", "win21H2", "win10" ] }, # win10 for backward compatibility - { name => "Win10L", ids => [ "win2004", "win21H1" ] }, + { name => "Win10L", ids => [ "win21H1" ] }, { name => "Other", ids => [ "unknown" ] }, { name => "Linux", ids => [ "linux" ] }, { name => "Mac", ids => [ "mac" ] },

1 0

Francois Gouget : winetest: Add support for Windows 21H2.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: tools Branch: master Commit: 3151dda4a838678881dd79a118ff106b7c158349 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3151dda4a838678881dd79a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 25 18:46:26 2022 +0200 winetest: Add support for Windows 21H2. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 1 + winetest/dissect | 1 + winetest/winetest.conf | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index d1d5261..49b08e3 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -428,6 +428,7 @@ my %platform_order = ( win1809 => 1809, win1903 => 1903, win1909 => 1909, win2004 => 2004, win2009 => 2009, win21H1 => 2101, + win21H2 => 2107, win10 => 2100, # for backward compatibility wine => 3000, linux => 3001, mac => 3001, bsd => 3002, solaris => 3003 diff --git a/winetest/dissect b/winetest/dissect index fe88cb9..c66293d 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -394,6 +394,7 @@ my @idmatch = ( [ "win2004", 2, 10, 0, 19041, 1, 0 ], [ "win2009", 2, 10, 0, 19042, 1, 0 ], [ "win21H1", 2, 10, 0, 19043, 1, 0 ], + [ "win21H2", 2, 10, 0, 19044, 1, 0 ], # [ "ce", 3, undef, undef, undef, undef, 0 ], [ "unknown", 2, undef, undef, undef, undef, 0 ], [ "unknown", undef, undef, undef, undef, undef, 1 ], diff --git a/winetest/winetest.conf b/winetest/winetest.conf index 0b8fd63..3623a8d 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -48,7 +48,7 @@ $fixed_threshold = 0.99; { 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 => "Win10", ids => [ "win2009", "win21H2", "win10" ] }, # win10 for backward compatibility { name => "Win10L", ids => [ "win2004", "win21H1" ] }, { name => "Other", ids => [ "unknown" ] }, { name => "Linux", ids => [ "linux" ] },

1 0

Francois Gouget : testbot/cgi: Fix ItemPage's iteration over the master columns.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: tools Branch: master Commit: e244074494de8a06fcdb09ce9b3f720bceac8b07 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e244074494de8a06fcdb09c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 25 18:49:21 2022 +0200 testbot/cgi: Fix ItemPage's iteration over the master columns. GenerateFormStart() went one iteration too far which is okay only because our pages never have master columns in the first place. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index b88e273..1b77eea 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -109,7 +109,7 @@ sub GenerateFormStart($) my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); if (defined($MasterColNames)) { - foreach my $ColIndex (0 .. @$MasterColNames) + foreach my $ColIndex (0..$#{$MasterColNames}) { print "<div><input type='hidden' name='", $MasterColNames->[$ColIndex], "' value='", $self->escapeHTML($MasterColValues->[$ColIndex]), @@ -146,7 +146,7 @@ sub RedirectToList($) my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); if (defined($MasterColNames)) { - foreach my $ColIndex (0 .. @$MasterColNames - 1) + foreach my $ColIndex (0..$#{$MasterColNames}) { $Target .= ($ColIndex == 0 ? "?" : "&") . $MasterColNames->[$ColIndex] . "=" . url_escape($MasterColValues->[$ColIndex]);

1 0

Alexandre Julliard : packaging: Add Fedora 36.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: tools Branch: master Commit: 616a64ae176f77db01ae5ca48f64c1b86d65864d URL: https://source.winehq.org/git/tools.git/?a=commit;h=616a64ae176f77db01ae5ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 23 11:28:42 2022 +0200 packaging: Add Fedora 36. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/obs-sync | 2 +- packaging/obs/rsync-filter | 1 + packaging/obs/yum.conf | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 0b81755..831c2b1 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -199,7 +199,7 @@ publish_files () cd $basedir -distros="34 35 buster bullseye bookworm bionic focal impish jammy" +distros="34 35 36 buster bullseye bookworm bionic focal impish jammy" dry_run= build=1 diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index 4d818b3..220e0fd 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -1,6 +1,7 @@ + /fedora + /fedora/34 + /fedora/35 ++ /fedora/36 - /fedora/* + /debian diff --git a/packaging/obs/yum.conf b/packaging/obs/yum.conf index 6d5a731..4ad17e2 100644 --- a/packaging/obs/yum.conf +++ b/packaging/obs/yum.conf @@ -11,3 +11,7 @@ baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/… [fedora-35] name = Fedora 35 baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/… + +[fedora-36] +name = Fedora 36 +baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/Fedora_36

1 0

Alexandre Julliard : gitlab: Import the gitlab-to-mail tool.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: tools Branch: master Commit: 212ab0a40cfd329d4ab3b9a0bf1db6fe546297d3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=212ab0a40cfd329d4ab3b9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 25 16:27:47 2022 +0200 gitlab: Import the gitlab-to-mail tool. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/LICENSE | 18 + gitlab/gitlab-to-mail/Makefile | 19 + gitlab/gitlab-to-mail/README.md | 21 + gitlab/gitlab-to-mail/db.py | 111 +++++ gitlab/gitlab-to-mail/gitlabtomail.py | 632 +++++++++++++++++++++++++++++ gitlab/gitlab-to-mail/gitlabtomail.service | 13 + gitlab/gitlab-to-mail/mailtogitlab.py | 160 ++++++++ gitlab/gitlab-to-mail/runner.py | 46 +++ gitlab/gitlab-to-mail/settings_example.py | 31 ++ gitlab/gitlab-to-mail/util.py | 15 + 10 files changed, 1066 insertions(+) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=212ab0a40cfd329d4ab…

1 0

Alexandre Julliard : Wine release 7.7
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: website Branch: master Commit: 90dfaa04c04b5b1a868211cd0eaa19b4cfce29c2 URL: https://source.winehq.org/git/website.git/?a=commit;h=90dfaa04c04b5b1a86821… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 22 21:46:37 2022 +0200 Wine release 7.7 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022042201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2022042201.xml b/news/en/2022042201.xml new file mode 100644 index 00000000..da50903c --- /dev/null +++ b/news/en/2022042201.xml @@ -0,0 +1,16 @@ +<news> +<date>April 22, 2022</date> +<title>Wine 7.7 Released</title> +<body> +<p> The Wine development release 7.7 is now available.</p> +<p> <a href="{$root}/announce/7.7">What's new</a> in this release: +<ul> + <li>More progress on the PE conversion of the X11 and OSS drivers.</li> + <li>Support for UTF-8 as default Ansi codepage.</li> + <li>Theming support for control panel applets.</li> + <li>Various bug fixes.</li> +</ul> +</p> +<p>The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.7.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Jacek Caban : win32u: Move NtUserSetClipboardViewer implementation from user32.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: c38e287befdf1f2910d7e23ccff5638d57cd411d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c38e287befdf1f2910d7e23c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 22 14:45:43 2022 +0200 win32u: Move NtUserSetClipboardViewer implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 25 ------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/clipboard.c | 26 ++++++++++++++++++++++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 1 + 8 files changed, 37 insertions(+), 27 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index f2861fce28f..0a502de5846 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -702,31 +702,6 @@ BOOL WINAPI EmptyClipboard(void) } -/************************************************************************** - * SetClipboardViewer (USER32.@) - */ -HWND WINAPI SetClipboardViewer( HWND hwnd ) -{ - HWND prev = 0, owner = 0; - - SERVER_START_REQ( set_clipboard_viewer ) - { - req->viewer = wine_server_user_handle( hwnd ); - if (!wine_server_call_err( req )) - { - prev = wine_server_ptr_handle( reply->old_viewer ); - owner = wine_server_ptr_handle( reply->owner ); - } - } - SERVER_END_REQ; - - if (hwnd) SendNotifyMessageW( hwnd, WM_DRAWCLIPBOARD, (WPARAM)owner, 0 ); - - TRACE( "%p returning %p\n", hwnd, prev ); - return prev; -} - - /************************************************************************** * ChangeClipboardChain (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index f8683a78426..fa195442b27 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -655,7 +655,7 @@ @ stdcall SetClassLongW(long long long) @ stdcall SetClassWord(long long long) NtUserSetClassWord @ stdcall SetClipboardData(long long) -@ stdcall SetClipboardViewer(long) +@ stdcall SetClipboardViewer(long) NtUserSetClipboardViewer @ stdcall SetCoalescableTimer(long long long ptr long) NtUserSetTimer # @ stub SetConsoleReserveKeys @ stdcall -import SetCursor(long) NtUserSetCursor diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index f49d9db3b9d..d4004c045e0 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -231,6 +231,32 @@ HWND WINAPI NtUserGetClipboardOwner(void) return owner; } +/************************************************************************** + * NtUserSetClipboardViewer (win32u.@) + */ +HWND WINAPI NtUserSetClipboardViewer( HWND hwnd ) +{ + HWND prev = 0, owner = 0; + + SERVER_START_REQ( set_clipboard_viewer ) + { + req->viewer = wine_server_user_handle( hwnd ); + if (!wine_server_call_err( req )) + { + prev = wine_server_ptr_handle( reply->old_viewer ); + owner = wine_server_ptr_handle( reply->owner ); + } + } + SERVER_END_REQ; + + if (hwnd) + NtUserMessageCall( hwnd, WM_DRAWCLIPBOARD, (WPARAM)owner, 0, + NULL, NtUserSendNotifyMessage, FALSE ); + + TRACE( "%p returning %p\n", hwnd, prev ); + return prev; +} + /************************************************************************** * NtUserGetClipboardViewer (win32u.@) */ diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index c0f21662403..453c4893317 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1192,6 +1192,7 @@ static struct unix_funcs unix_funcs = NtUserSetClassLong, NtUserSetClassLongPtr, NtUserSetClassWord, + NtUserSetClipboardViewer, NtUserSetCursor, NtUserSetCursorIconData, NtUserSetCursorPos, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index f3e2f9ca2f5..05818d001cd 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1175,7 +1175,7 @@ @ stdcall NtUserSetClassLongPtr(long long long long) @ stdcall NtUserSetClassWord(long long long) @ stub NtUserSetClipboardData -@ stub NtUserSetClipboardViewer +@ stdcall NtUserSetClipboardViewer(long) @ stub NtUserSetCoreWindow @ stub NtUserSetCoreWindowPartner @ stdcall NtUserSetCursor(long) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 2299330be0d..a693a972830 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -263,6 +263,7 @@ struct unix_funcs DWORD (WINAPI *pNtUserSetClassLong)( HWND hwnd, INT offset, LONG newval, BOOL ansi ); ULONG_PTR (WINAPI *pNtUserSetClassLongPtr)( HWND hwnd, INT offset, LONG_PTR newval, BOOL ansi ); WORD (WINAPI *pNtUserSetClassWord)( HWND hwnd, INT offset, WORD newval ); + HWND (WINAPI *pNtUserSetClipboardViewer)( HWND hwnd ); HCURSOR (WINAPI *pNtUserSetCursor)( HCURSOR cursor ); BOOL (WINAPI *pNtUserSetCursorIconData)( HCURSOR cursor, UNICODE_STRING *module, UNICODE_STRING *res_name, struct cursoricon_desc *desc ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index d8b117bac8f..994f8c63a5b 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -1088,6 +1088,12 @@ WORD WINAPI NtUserSetClassWord( HWND hwnd, INT offset, WORD newval ) return unix_funcs->pNtUserSetClassWord( hwnd, offset, newval ); } +HWND WINAPI NtUserSetClipboardViewer( HWND hwnd ) +{ + if (!unix_funcs) return 0; + return unix_funcs->pNtUserSetClipboardViewer( hwnd ); +} + BOOL WINAPI NtUserSetCursorIconData( HCURSOR cursor, UNICODE_STRING *module, UNICODE_STRING *res_name, struct cursoricon_desc *desc ) { diff --git a/include/ntuser.h b/include/ntuser.h index 7fc52979e7e..5d49cd8caba 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -547,6 +547,7 @@ HWND WINAPI NtUserSetCapture( HWND hwnd ); DWORD WINAPI NtUserSetClassLong( HWND hwnd, INT offset, LONG newval, BOOL ansi ); ULONG_PTR WINAPI NtUserSetClassLongPtr( HWND hwnd, INT offset, LONG_PTR newval, BOOL ansi ); WORD WINAPI NtUserSetClassWord( HWND hwnd, INT offset, WORD newval ); +HWND WINAPI NtUserSetClipboardViewer( HWND hwnd ); HCURSOR WINAPI NtUserSetCursor( HCURSOR cursor ); BOOL WINAPI NtUserSetCursorIconData( HCURSOR cursor, UNICODE_STRING *module, UNICODE_STRING *res_name, struct cursoricon_desc *desc );

1 0

Jacek Caban : win32u: Move NtUserChangeClipboardChain implementation from user32.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: 357d8654c9fd128e801b7fa914dc635fc84d7b94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=357d8654c9fd128e801b7fa9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 22 14:45:59 2022 +0200 win32u: Move NtUserChangeClipboardChain implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 27 --------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/clipboard.c | 26 ++++++++++++++++++++++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 1 + 8 files changed, 37 insertions(+), 29 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 0a502de5846..911014ee628 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -702,33 +702,6 @@ BOOL WINAPI EmptyClipboard(void) } -/************************************************************************** - * ChangeClipboardChain (USER32.@) - */ -BOOL WINAPI ChangeClipboardChain( HWND hwnd, HWND next ) -{ - NTSTATUS status; - HWND viewer; - - if (!hwnd) return FALSE; - - SERVER_START_REQ( set_clipboard_viewer ) - { - req->viewer = wine_server_user_handle( next ); - req->previous = wine_server_user_handle( hwnd ); - status = wine_server_call( req ); - viewer = wine_server_ptr_handle( reply->old_viewer ); - } - SERVER_END_REQ; - - if (status == STATUS_PENDING) - return !SendMessageW( viewer, WM_CHANGECBCHAIN, (WPARAM)hwnd, (LPARAM)next ); - - if (status) SetLastError( RtlNtStatusToDosError( status )); - return !status; -} - - /************************************************************************** * SetClipboardData (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index fa195442b27..a7b2f7e0681 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -33,7 +33,7 @@ @ stdcall CallWindowProcW(ptr long long long long) @ stdcall CascadeChildWindows(long long) @ stdcall CascadeWindows(long long ptr long ptr) -@ stdcall ChangeClipboardChain(long long) +@ stdcall ChangeClipboardChain(long long) NtUserChangeClipboardChain @ stdcall ChangeDisplaySettingsA(ptr long) @ stdcall ChangeDisplaySettingsExA(str ptr long long ptr) @ stdcall ChangeDisplaySettingsExW(wstr ptr long long ptr) diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index d4004c045e0..29bf36ee80d 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -274,6 +274,32 @@ HWND WINAPI NtUserGetClipboardViewer(void) return viewer; } +/************************************************************************** + * NtUserChangeClipboardChain (win32u.@) + */ +BOOL WINAPI NtUserChangeClipboardChain( HWND hwnd, HWND next ) +{ + NTSTATUS status; + HWND viewer; + + if (!hwnd) return FALSE; + + SERVER_START_REQ( set_clipboard_viewer ) + { + req->viewer = wine_server_user_handle( next ); + req->previous = wine_server_user_handle( hwnd ); + status = wine_server_call( req ); + viewer = wine_server_ptr_handle( reply->old_viewer ); + } + SERVER_END_REQ; + + if (status == STATUS_PENDING) + return !send_message( viewer, WM_CHANGECBCHAIN, (WPARAM)hwnd, (LPARAM)next ); + + if (status) SetLastError( RtlNtStatusToDosError( status )); + return !status; +} + /************************************************************************** * NtUserGetOpenClipboardWindow (win32u.@) */ diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 453c4893317..fbaf61a52f6 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1139,6 +1139,7 @@ static struct unix_funcs unix_funcs = NtUserCallNoParam, NtUserCallOneParam, NtUserCallTwoParam, + NtUserChangeClipboardChain, NtUserChangeDisplaySettings, NtUserClipCursor, NtUserCloseClipboard, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 05818d001cd..aa40be5f652 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -782,7 +782,7 @@ @ stdcall NtUserCallOneParam(long long) @ stdcall NtUserCallTwoParam(long long long) @ stub NtUserCanBrokerForceForeground -@ stub NtUserChangeClipboardChain +@ stdcall NtUserChangeClipboardChain(long long) @ stdcall NtUserChangeDisplaySettings(ptr ptr long long ptr) @ stub NtUserChangeWindowMessageFilterEx @ stub NtUserCheckAccessForIntegrityLevel diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index a693a972830..9d4c7b5021c 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -191,6 +191,7 @@ struct unix_funcs ULONG_PTR (WINAPI *pNtUserCallNoParam)( ULONG code ); ULONG_PTR (WINAPI *pNtUserCallOneParam)( ULONG_PTR arg, ULONG code ); ULONG_PTR (WINAPI *pNtUserCallTwoParam)( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code ); + BOOL (WINAPI *pNtUserChangeClipboardChain)( HWND hwnd, HWND next ); LONG (WINAPI *pNtUserChangeDisplaySettings)( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam ); BOOL (WINAPI *pNtUserClipCursor)( const RECT *rect ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 994f8c63a5b..d3497d29f03 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -755,6 +755,12 @@ BOOL WINAPI NtUserCloseClipboard(void) return unix_funcs->pNtUserCloseClipboard(); } +BOOL WINAPI NtUserChangeClipboardChain( HWND hwnd, HWND next ) +{ + if (!unix_funcs) return DISP_CHANGE_FAILED; + return unix_funcs->pNtUserChangeClipboardChain( hwnd, next ); +} + LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam ) { diff --git a/include/ntuser.h b/include/ntuser.h index 5d49cd8caba..836854a12b4 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -417,6 +417,7 @@ LRESULT WINAPI NtUserCallNextHookEx( HHOOK hhook, INT code, WPARAM wparam, LPARA ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ); ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ); ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code ); +BOOL WINAPI NtUserChangeClipboardChain( HWND hwnd, HWND next ); LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam ); DWORD WINAPI NtUserCheckMenuItem( HMENU handle, UINT id, UINT flags );

1 0

Jacek Caban : win32u: Move EnumClipboardFormats implementation from user32.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: ea9fb81c0998222bf72d982494433c8a2d7149aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea9fb81c0998222bf72d9824… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 22 14:46:17 2022 +0200 win32u: Move EnumClipboardFormats implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 16 +--------------- dlls/win32u/clipboard.c | 20 ++++++++++++++++++++ dlls/win32u/sysparams.c | 3 +++ dlls/win32u/win32u_private.h | 1 + include/ntuser.h | 6 ++++++ 5 files changed, 31 insertions(+), 15 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 911014ee628..9a7753520f5 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -764,21 +764,7 @@ done: */ UINT WINAPI EnumClipboardFormats( UINT format ) { - UINT ret = 0; - - SERVER_START_REQ( enum_clipboard_formats ) - { - req->previous = format; - if (!wine_server_call_err( req )) - { - ret = reply->format; - SetLastError( ERROR_SUCCESS ); - } - } - SERVER_END_REQ; - - TRACE( "%s -> %s\n", debugstr_format( format ), debugstr_format( ret )); - return ret; + return NtUserEnumClipboardFormats( format ); } diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index 29bf36ee80d..bf1c241d7c8 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -334,6 +334,26 @@ DWORD WINAPI NtUserGetClipboardSequenceNumber(void) return seqno; } +/* see EnumClipboardFormats */ +UINT enum_clipboard_formats( UINT format ) +{ + UINT ret = 0; + + SERVER_START_REQ( enum_clipboard_formats ) + { + req->previous = format; + if (!wine_server_call_err( req )) + { + ret = reply->format; + SetLastError( ERROR_SUCCESS ); + } + } + SERVER_END_REQ; + + TRACE( "%s -> %s\n", debugstr_format( format ), debugstr_format( ret )); + return ret; +} + /************************************************************************** * NtUserAddClipboardFormatListener (win32u.@) */ diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 1e8b0fbf489..3b380c017e5 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4707,6 +4707,9 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) enable_thunk_lock = arg; return 0; + case NtUserCallOneParam_EnumClipboardFormats: + return enum_clipboard_formats( arg ); + case NtUserCallOneParam_GetClipCursor: return get_clip_cursor( (RECT *)arg ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 9d4c7b5021c..4c1b0a7b45b 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -313,6 +313,7 @@ struct unix_funcs }; /* clipboard.c */ +extern UINT enum_clipboard_formats( UINT format ) DECLSPEC_HIDDEN; extern void release_clipboard_owner( HWND hwnd ) DECLSPEC_HIDDEN; /* cursoricon.c */ diff --git a/include/ntuser.h b/include/ntuser.h index 836854a12b4..d06b76ab605 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -637,6 +637,7 @@ enum NtUserCallOneParam_DispatchMessageA, NtUserCallOneParam_EnableDC, NtUserCallOneParam_EnableThunkLock, + NtUserCallOneParam_EnumClipboardFormats, NtUserCallOneParam_GetClipCursor, NtUserCallOneParam_GetCursorPos, NtUserCallOneParam_GetIconParam, @@ -688,6 +689,11 @@ static inline void NtUserEnableThunkLock( BOOL enable ) NtUserCallOneParam( enable, NtUserCallOneParam_EnableThunkLock ); } +static inline UINT NtUserEnumClipboardFormats( UINT format ) +{ + return NtUserCallOneParam( format, NtUserCallOneParam_EnumClipboardFormats ); +} + static inline BOOL NtUserGetClipCursor( RECT *rect ) { return NtUserCallOneParam( (UINT_PTR)rect, NtUserCallOneParam_GetClipCursor );

1 0