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

Francois Gouget : testbot/web: Simplify linking patches to the job details pages.
by Alexandre Julliard 18 Apr '22

18 Apr '22

Module: tools Branch: master Commit: 74981370d37c7951ed15268d7d069a62c1520adf URL: https://source.winehq.org/git/tools.git/?a=commit;h=74981370d37c7951ed15268… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 18 10:55:05 2022 +0200 testbot/web: Simplify linking patches to the job details pages. There is no need to call uri_escape() on integers. Also the URL is simple (no ampersand) and does not need to go through escapeHTML(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/PatchesList.pl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index 943b9c5..48c8382 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -25,7 +25,6 @@ package PatchesBlock; use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); -use URI::Escape; use WineTestBot::Patches; @@ -54,9 +53,7 @@ sub GenerateDataView($$$) $Row->{Item}->Disposition =~ /job ([0-9]+)$/) { my $JobId = $1; - my $URI = "/JobDetails.pl?Key=" . uri_escape($JobId); - print "<a href='" . $self->escapeHTML($URI) . "'>" . - "Job " . $self->escapeHTML($JobId) . "</a>"; + print "<a href='/JobDetails.pl?Key=$JobId'>Job $JobId</a>"; } else {

1 0

Francois Gouget : testbot/cgi: Introduce ValueFormatter to handle value formatting.
by Alexandre Julliard 18 Apr '22

18 Apr '22

Module: tools Branch: master Commit: cf5985ccd262fdce0eef2127b5a0cddc62590731 URL: https://source.winehq.org/git/tools.git/?a=commit;h=cf5985ccd262fdce0eef212… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 18 10:32:36 2022 +0200 testbot/cgi: Introduce ValueFormatter to handle value formatting. This allows sharing code between CollectionBlock and FormPage. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 38 ++++---------- testbot/lib/ObjectModel/CGI/FormPage.pm | 11 ++-- testbot/lib/ObjectModel/CGI/ValueFormatter.pm | 69 ++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 36 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 435c44e..36f1b01 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -47,6 +47,8 @@ our @EXPORT = qw(new); use POSIX qw(strftime); use URI::Escape; +use ObjectModel::CGI::ValueFormatter; + =pod =over 12 @@ -280,35 +282,15 @@ sub GenerateDataView($$$) my $PropertyName = $PropertyDescriptor->GetName(); my $Value = $Row->{Item}->$PropertyName; - if ($PropertyDescriptor->GetClass() eq "Itemref" and defined $Value) + if ($PropertyDescriptor->GetClass() eq "Basic" and + $PropertyDescriptor->GetType() eq "DT" and defined $Value) { - # Note: This only supports single-key Itemrefs - foreach my $ValuePD (@{$Value->GetPropertyDescriptors()}) - { - if ($ValuePD->GetIsKey()) - { - $PropertyName = $ValuePD->GetName(); - print $self->escapeHTML($Value->$PropertyName); - return; - } - } - } - elsif ($PropertyDescriptor->GetClass() eq "Basic") - { - if ($PropertyDescriptor->GetType() eq "B") - { - print $Value ? "Yes" : "No"; - return; - } - if ($PropertyDescriptor->GetType() eq "DT" and defined $Value) - { - print "<script type='text/javascript'></script><noscript><div>", - strftime("%Y-%m-%d %H:%M:%S", localtime($Value)), - "</div></noscript>\n"; - return; - } + print "<script type='text/javascript'></script><noscript><div>", + strftime("%Y-%m-%d %H:%M:%S", localtime($Value)), + "</div></noscript>\n"; + return; } print defined $Value ? $self->escapeHTML($Value) : " "; } diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 4f29efe..7fd2f56 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -57,6 +57,8 @@ $MyFormPage->GeneratePage(); use ObjectModel::CGI::Page; our @ISA = qw(ObjectModel::CGI::Page); +use ObjectModel::CGI::ValueFormatter; + =pod =over 12 @@ -280,14 +282,7 @@ sub GenerateValueView($$$) { my ($self, $PropertyDescriptor, $Value) = @_; - if ($PropertyDescriptor->GetClass() eq "Basic") - { - if ($PropertyDescriptor->GetType() eq "B") - { - print $Value ? "Yes" : "No"; - } - } - print defined $Value ? $self->escapeHTML($Value) : " "; + GenerateValueHTML($self, $PropertyDescriptor, $Value); } sub GetInputType($$) diff --git a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm new file mode 100644 index 0000000..cad6eee --- /dev/null +++ b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm @@ -0,0 +1,69 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Generates HTML providing a user-readable representation of a given value +# +# Copyright 2022 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +package ObjectModel::CGI::ValueFormatter; + +use Exporter 'import'; +our @EXPORT = qw(GenerateValueHTML); + + +=pod +=over 12 + +=item C<GenerateValueHTML()> + +Generates an HTML snippet representing the value in a user-readable form. + +The Parent parameter must point to a class that implements the escapeHTML() +method. + +=back +=cut + +sub GenerateValueHTML($$$); + +sub GenerateValueHTML($$$) +{ + my ($Parent, $PropertyDescriptor, $Value) = @_; + + if ($PropertyDescriptor->GetClass() eq "Basic" and + $PropertyDescriptor->GetType() eq "B") + { + print $Value ? "Yes" : "No"; + return; + } + if ($PropertyDescriptor->GetClass() eq "Itemref" and defined $Value) + { + # Note: This only supports single-key Itemrefs + foreach my $ValuePD (@{$Value->GetPropertyDescriptors()}) + { + if ($ValuePD->GetIsKey()) + { + my $PropertyName = $ValuePD->GetName(); + GenerateValueHTML($Parent, $ValuePD, $Value->$PropertyName); + return; + } + } + } + print defined $Value ? $Parent->escapeHTML($Value) : " "; +} + +1;

1 0

Francois Gouget : testbot: Add User::AddRole().
by Alexandre Julliard 18 Apr '22

18 Apr '22

Module: tools Branch: master Commit: eb3a8541027bbec95f2e1dd3b86616fcb9c3e021 URL: https://source.winehq.org/git/tools.git/?a=commit;h=eb3a8541027bbec95f2e1dd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 18 10:32:52 2022 +0200 testbot: Add User::AddRole(). This simplifies adding a role to a user, particularly with regards to making sure the user's Roles collection is up to date. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Users.pm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index bd9cf35..f2f2a19 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -106,22 +106,25 @@ sub GenerateResetCode($) } } +sub AddRole($$) +{ + my ($self, $Role) = @_; + + my $UserRole = $self->Roles->Add(); + my $OldKey = $UserRole->GetKey(); + $UserRole->Role($Role); + $self->Roles->KeyChanged($OldKey, $Role->GetKey()); +} + sub AddDefaultRoles($) { my ($self) = @_; - my $UserRoles = $self->Roles; my $DefaultRoles = CreateRoles(); $DefaultRoles->AddFilter("IsDefaultRole", [1]); - foreach my $RoleKey (@{$DefaultRoles->GetKeys()}) + foreach my $Role (@{$DefaultRoles->GetItems()}) { - if (! defined($UserRoles->GetItem($RoleKey))) - { - my $NewRole = $UserRoles->Add(); - my $OldKey = $NewRole->GetKey(); - $NewRole->Role($DefaultRoles->GetItem($RoleKey)); - $UserRoles->KeyChanged($OldKey, $RoleKey); - } + $self->AddRole($Role) if (!$self->Roles->GetItem($Role->Name)); } }

1 0

Jacek Caban : winex11: Directly use win32u for user functions in event.c.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: 21c37e8f957a8433e5bf78b0ff10b56959cbf22a URL: https://source.winehq.org/git/wine.git/?a=commit;h=21c37e8f957a8433e5bf78b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 14:52:02 2022 +0200 winex11: Directly use win32u for user functions in event.c. 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/winex11.drv/event.c | 169 +++++++++++++++++++++++----------------------- dlls/winex11.drv/x11drv.h | 7 ++ 2 files changed, 92 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=21c37e8f957a8433e5bf…

1 0

Jacek Caban : winex11: Directly use win32u in more places.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: 262831bc63dca2d63171aa98d19e8f2566907dbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=262831bc63dca2d63171aa98… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 14:52:20 2022 +0200 winex11: Directly use win32u in more places. 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/winex11.drv/desktop.c | 24 ++++++++++++------------ dlls/winex11.drv/display.c | 5 +++-- dlls/winex11.drv/keyboard.c | 18 +++++++++--------- dlls/winex11.drv/vulkan.c | 4 ++-- dlls/winex11.drv/window.c | 4 ++-- dlls/winex11.drv/x11drv.h | 10 ++++++++++ dlls/winex11.drv/xrandr.c | 2 +- 7 files changed, 39 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=262831bc63dca2d63171…

1 0

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

15 Apr '22

Module: wine Branch: master Commit: 6ea417b2d5a6c2d589578f1e9f958af64eb6f0fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ea417b2d5a6c2d589578f1e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 14:52:36 2022 +0200 win32u: Move NtUserTranslateMessage 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/message.c | 46 +---------------------------------- dlls/user32/user_main.c | 2 ++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 +++++ include/ntuser.h | 2 ++ 9 files changed, 72 insertions(+), 46 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 51f183fdbc0..611f603fc1e 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -45,7 +45,6 @@ #include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(msg); -WINE_DECLARE_DEBUG_CHANNEL(key); /* Message class descriptor */ @@ -848,50 +847,7 @@ BOOL WINAPI IsDialogMessageA( HWND hwndDlg, LPMSG pmsg ) */ BOOL WINAPI TranslateMessage( const MSG *msg ) { - UINT message; - WCHAR wp[8]; - BYTE state[256]; - INT len; - - if (msg->message < WM_KEYFIRST || msg->message > WM_KEYLAST) return FALSE; - if (msg->message != WM_KEYDOWN && msg->message != WM_SYSKEYDOWN) return TRUE; - - TRACE_(key)("Translating key %s (%04lX), scancode %04x\n", - SPY_GetVKeyName(msg->wParam), msg->wParam, HIWORD(msg->lParam)); - - switch (msg->wParam) - { - case VK_PACKET: - message = (msg->message == WM_KEYDOWN) ? WM_CHAR : WM_SYSCHAR; - TRACE_(key)("PostMessageW(%p,%s,%04x,%08x)\n", - msg->hwnd, SPY_GetMsgName(message, msg->hwnd), HIWORD(msg->lParam), LOWORD(msg->lParam)); - PostMessageW( msg->hwnd, message, HIWORD(msg->lParam), LOWORD(msg->lParam)); - return TRUE; - - case VK_PROCESSKEY: - return ImmTranslateMessage(msg->hwnd, msg->message, msg->wParam, msg->lParam); - } - - NtUserGetKeyboardState( state ); - len = ToUnicode(msg->wParam, HIWORD(msg->lParam), state, wp, ARRAY_SIZE(wp), 0); - if (len == -1) - { - message = (msg->message == WM_KEYDOWN) ? WM_DEADCHAR : WM_SYSDEADCHAR; - TRACE_(key)("-1 -> PostMessageW(%p,%s,%04x,%08lx)\n", - msg->hwnd, SPY_GetMsgName(message, msg->hwnd), wp[0], msg->lParam); - PostMessageW( msg->hwnd, message, wp[0], msg->lParam ); - } - else if (len > 0) - { - INT i; - - message = (msg->message == WM_KEYDOWN) ? WM_CHAR : WM_SYSCHAR; - TRACE_(key)("%d -> PostMessageW(%p,%s,<x>,%08lx) for <x> in %s\n", len, msg->hwnd, - SPY_GetMsgName(message, msg->hwnd), msg->lParam, debugstr_wn(wp, len)); - for (i = 0; i < len; i++) - PostMessageW( msg->hwnd, message, wp[i], msg->lParam ); - } - return TRUE; + return NtUserTranslateMessage( msg, 0 ); } diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index f99e773d6f4..c477d0325d3 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -26,6 +26,7 @@ #include "wingdi.h" #include "winuser.h" #include "imm.h" +#include "ddk/imm.h" #include "controls.h" #include "user_private.h" @@ -164,6 +165,7 @@ static const struct user_callbacks user_funcs = EndMenu, HideCaret, ImmProcessKey, + ImmTranslateMessage, SetSystemMenu, ShowCaret, free_menu_items, diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index d5538848a4f..b7b3d9d87b9 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1209,6 +1209,7 @@ static struct unix_funcs unix_funcs = NtUserSystemParametersInfo, NtUserSystemParametersInfoForDpi, NtUserToUnicodeEx, + NtUserTranslateMessage, NtUserUnregisterClass, NtUserUnregisterHotKey, NtUserUpdateLayeredWindow, diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 36bafccc9a4..644e91aed4f 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -36,6 +36,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msg); +WINE_DECLARE_DEBUG_CHANNEL(key); WINE_DECLARE_DEBUG_CHANNEL(relay); #define MAX_WINPROC_RECURSION 64 @@ -2879,3 +2880,59 @@ LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa } return 0; } + +/*********************************************************************** + * NtUserTranslateMessage (win32u.@) + */ +BOOL WINAPI NtUserTranslateMessage( const MSG *msg, UINT flags ) +{ + UINT message; + WCHAR wp[8]; + BYTE state[256]; + INT len; + + if (flags) FIXME( "unsupported flags %x\n", flags ); + + if (msg->message < WM_KEYFIRST || msg->message > WM_KEYLAST) return FALSE; + if (msg->message != WM_KEYDOWN && msg->message != WM_SYSKEYDOWN) return TRUE; + + TRACE_(key)( "Translating key %s (%04lX), scancode %04x\n", + debugstr_vkey_name( msg->wParam ), msg->wParam, HIWORD(msg->lParam) ); + + switch (msg->wParam) + { + case VK_PACKET: + message = (msg->message == WM_KEYDOWN) ? WM_CHAR : WM_SYSCHAR; + TRACE_(key)( "PostMessageW(%p,%s,%04x,%08x)\n", msg->hwnd, + debugstr_msg_name( message, msg->hwnd ), + HIWORD(msg->lParam), LOWORD(msg->lParam) ); + NtUserPostMessage( msg->hwnd, message, HIWORD(msg->lParam), LOWORD(msg->lParam) ); + return TRUE; + + case VK_PROCESSKEY: + return user_callbacks && user_callbacks->pImmTranslateMessage( msg->hwnd, msg->message, + msg->wParam, msg->lParam ); + } + + NtUserGetKeyboardState( state ); + len = NtUserToUnicodeEx( msg->wParam, HIWORD(msg->lParam), state, wp, ARRAY_SIZE(wp), 0, + NtUserGetKeyboardLayout(0) ); + if (len == -1) + { + message = msg->message == WM_KEYDOWN ? WM_DEADCHAR : WM_SYSDEADCHAR; + TRACE_(key)( "-1 -> PostMessageW(%p,%s,%04x,%08lx)\n", + msg->hwnd, debugstr_msg_name( message, msg->hwnd ), wp[0], msg->lParam ); + NtUserPostMessage( msg->hwnd, message, wp[0], msg->lParam ); + } + else if (len > 0) + { + INT i; + + message = msg->message == WM_KEYDOWN ? WM_CHAR : WM_SYSCHAR; + TRACE_(key)( "%d -> PostMessageW(%p,%s,<x>,%08lx) for <x> in %s\n", len, msg->hwnd, + debugstr_msg_name(message, msg->hwnd), msg->lParam, debugstr_wn(wp, len) ); + for (i = 0; i < len; i++) + NtUserPostMessage( msg->hwnd, message, wp[i], msg->lParam ); + } + return TRUE; +} diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 5aee58fa1e3..57cf60681e2 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -38,6 +38,7 @@ struct user_callbacks BOOL (WINAPI *pEndMenu)(void); BOOL (WINAPI *pHideCaret)( HWND hwnd ); BOOL (WINAPI *pImmProcessKey)(HWND, HKL, UINT, LPARAM, DWORD); + BOOL (WINAPI *pImmTranslateMessage)(HWND, UINT, WPARAM, LPARAM); BOOL (WINAPI *pSetSystemMenu)( HWND hwnd, HMENU menu ); BOOL (WINAPI *pShowCaret)( HWND hwnd ); void (CDECL *free_menu_items)( void *ptr ); diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index cf419668789..ee9dc094ab6 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1282,7 +1282,7 @@ @ stub NtUserTransformPoint @ stub NtUserTransformRect @ stub NtUserTranslateAccelerator -@ stub NtUserTranslateMessage +@ stdcall NtUserTranslateMessage(ptr long) @ stub NtUserUndelegateInput @ stdcall -syscall NtUserUnhookWinEvent(long) @ stdcall -syscall NtUserUnhookWindowsHookEx(long) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 69ddcc83c47..20d0e4ac5b1 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -283,6 +283,7 @@ struct unix_funcs UINT winini, UINT dpi ); INT (WINAPI *pNtUserToUnicodeEx)( UINT virt, UINT scan, const BYTE *state, WCHAR *str, int size, UINT flags, HKL layout ); + BOOL (WINAPI *pNtUserTranslateMessage)( const MSG *msg, UINT flags ); BOOL (WINAPI *pNtUserUnregisterClass)( UNICODE_STRING *name, HINSTANCE instance, struct client_menu_name *client_menu_name ); BOOL (WINAPI *pNtUserUnregisterHotKey)( HWND hwnd, INT id ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index b5c2b49ce79..77120efd0b3 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -1186,6 +1186,12 @@ INT WINAPI NtUserToUnicodeEx( UINT virt, UINT scan, const BYTE *state, return unix_funcs->pNtUserToUnicodeEx( virt, scan, state, str, size, flags, layout ); } +BOOL WINAPI NtUserTranslateMessage( const MSG *msg, UINT flags ) +{ + if (!unix_funcs) return 0; + return unix_funcs->pNtUserTranslateMessage( msg, flags ); +} + BOOL WINAPI NtUserUnregisterClass( UNICODE_STRING *name, HINSTANCE instance, struct client_menu_name *client_menu_name ) { diff --git a/include/ntuser.h b/include/ntuser.h index 5cf82043a2e..34b4462f7fe 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -559,6 +559,8 @@ BOOL WINAPI NtUserSystemParametersInfo( UINT action, UINT val, void *ptr, UIN BOOL WINAPI NtUserSystemParametersInfoForDpi( UINT action, UINT val, PVOID ptr, UINT winini, UINT dpi ); INT WINAPI NtUserToUnicodeEx( UINT virt, UINT scan, const BYTE *state, WCHAR *str, int size, UINT flags, HKL layout ); +INT WINAPI NtUserTranslateAccelerator( HWND hwnd, HACCEL accel, MSG *msg ); +BOOL WINAPI NtUserTranslateMessage( const MSG *msg, UINT flags ); BOOL WINAPI NtUserUnhookWinEvent( HWINEVENTHOOK hEventHook ); BOOL WINAPI NtUserUnhookWindowsHookEx( HHOOK handle ); BOOL WINAPI NtUserUnregisterClass( UNICODE_STRING *name, HINSTANCE instance,

1 0

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

15 Apr '22

Module: wine Branch: master Commit: 72d53fda590126acb8cee72cb1fd208946d55d8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=72d53fda590126acb8cee72c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 14:52:51 2022 +0200 win32u: Move CreatePopupMenu 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/menu.c | 10 ++-------- dlls/win32u/menu.c | 5 +++-- dlls/win32u/sysparams.c | 6 +++--- dlls/win32u/win32u_private.h | 2 +- include/ntuser.h | 12 ++++++------ 5 files changed, 15 insertions(+), 20 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 185d596fbb8..6d506e21c3c 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4158,13 +4158,7 @@ BOOL WINAPI ModifyMenuA( HMENU hMenu, UINT pos, UINT flags, */ HMENU WINAPI CreatePopupMenu(void) { - HMENU hmenu; - POPUPMENU *menu; - - if (!(hmenu = CreateMenu())) return 0; - menu = MENU_GetMenu( hmenu ); - menu->wFlags |= MF_POPUP; - return hmenu; + return NtUserCreateMenu( TRUE ); } @@ -4213,7 +4207,7 @@ BOOL WINAPI SetMenuItemBitmaps( HMENU hMenu, UINT nPos, UINT wFlags, */ HMENU WINAPI CreateMenu(void) { - return NtUserCreateMenu(); + return NtUserCreateMenu( FALSE ); } diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index 6ae55e5cee1..2b1a5c97ac1 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -116,8 +116,8 @@ HMENU get_menu( HWND hwnd ) return UlongToHandle( get_window_long( hwnd, GWLP_ID )); } -/* see CreateMenu */ -HMENU create_menu(void) +/* see CreateMenu and CreatePopupMenu */ +HMENU create_menu( BOOL is_popup ) { POPUPMENU *menu; HMENU handle; @@ -125,6 +125,7 @@ HMENU create_menu(void) if (!(menu = calloc( 1, sizeof(*menu) ))) return 0; menu->FocusedItem = NO_SELECTED_ITEM; menu->refcount = 1; + if (is_popup) menu->wFlags |= MF_POPUP; if (!(handle = alloc_user_handle( &menu->obj, NTUSER_OBJ_MENU ))) free( menu ); diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 4d2455fe64e..f6cbda9fa20 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4632,9 +4632,6 @@ ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ) { switch(code) { - case NtUserCallNoParam_CreateMenu: - return HandleToUlong( create_menu() ); - case NtUserCallNoParam_GetDesktopWindow: return HandleToUlong( get_desktop_window() ); @@ -4679,6 +4676,9 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) case NtUserCallOneParam_CreateCursorIcon: return HandleToUlong( alloc_cursoricon_handle( arg )); + case NtUserCallOneParam_CreateMenu: + return HandleToUlong( create_menu( arg ) ); + case NtUserCallOneParam_DispatchMessageA: return dispatch_message( (const MSG *)arg, TRUE ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 20d0e4ac5b1..89b717c695d 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -353,7 +353,7 @@ extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECL extern BOOL set_foreground_window( HWND hwnd, BOOL mouse ) DECLSPEC_HIDDEN; /* menu.c */ -extern HMENU create_menu(void) DECLSPEC_HIDDEN; +extern HMENU create_menu( BOOL is_popup ) DECLSPEC_HIDDEN; extern HMENU get_menu( HWND hwnd ) DECLSPEC_HIDDEN; /* message.c */ diff --git a/include/ntuser.h b/include/ntuser.h index 34b4462f7fe..47b174bc065 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -577,7 +577,6 @@ HWND WINAPI NtUserWindowFromPoint( LONG x, LONG y ); /* NtUserCallNoParam codes, not compatible with Windows */ enum { - NtUserCallNoParam_CreateMenu, NtUserCallNoParam_GetDesktopWindow, NtUserCallNoParam_GetInputState, NtUserCallNoParam_GetMessagePos, @@ -588,11 +587,6 @@ enum NtUserUpdateClipboard, }; -static inline HMENU NtUserCreateMenu(void) -{ - return UlongToHandle( NtUserCallNoParam( NtUserCallNoParam_CreateMenu )); -} - static inline HWND NtUserGetDesktopWindow(void) { return UlongToHandle( NtUserCallNoParam( NtUserCallNoParam_GetDesktopWindow )); @@ -618,6 +612,7 @@ enum { NtUserCallOneParam_BeginDeferWindowPos, NtUserCallOneParam_CreateCursorIcon, + NtUserCallOneParam_CreateMenu, NtUserCallOneParam_DispatchMessageA, NtUserCallOneParam_EnableDC, NtUserCallOneParam_EnableThunkLock, @@ -651,6 +646,11 @@ static inline HICON NtUserCreateCursorIcon( BOOL is_icon ) return UlongToHandle( NtUserCallOneParam( is_icon, NtUserCallOneParam_CreateCursorIcon )); } +static inline HMENU NtUserCreateMenu( BOOL is_popup ) +{ + return UlongToHandle( NtUserCallOneParam( is_popup, NtUserCallOneParam_CreateMenu )); +} + static inline LRESULT NtUserDispatchMessageA( const MSG *msg ) { return NtUserCallOneParam( (UINT_PTR)msg, NtUserCallOneParam_DispatchMessageA );

1 0

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

15 Apr '22

Module: wine Branch: master Commit: a4d6198ac597b0cfd1f0a89ba71e12ea772352ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4d6198ac597b0cfd1f0a89b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 14:53:09 2022 +0200 win32u: Move NtUserCheckMenuItem 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/mdi.c | 2 +- dlls/user32/menu.c | 43 ------------------ dlls/user32/user32.spec | 2 +- dlls/win32u/menu.c | 106 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 24 +++++++++- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 9 ++++ include/ntuser.h | 1 + 10 files changed, 143 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a4d6198ac597b0cfd1f0…

1 0

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

15 Apr '22

Module: wine Branch: master Commit: 2c7b8e001111bb9e7bdf0189ca88d85883f6d90d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c7b8e001111bb9e7bdf0189… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 14:53:24 2022 +0200 win32u: Move NtUserEnableMenuItem 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/edit.c | 31 ++++++++++++++--------- dlls/user32/mdi.c | 6 ++--- dlls/user32/menu.c | 59 +++++--------------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/menu.c | 47 +++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 +++++ include/ntuser.h | 1 + 10 files changed, 86 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2c7b8e001111bb9e7bdf…

1 0

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

15 Apr '22

Module: wine Branch: master Commit: a2dcfd1d6d0e5715a4bbd30935b81454dd18def0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2dcfd1d6d0e5715a4bbd309… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 14:53:43 2022 +0200 win32u: Move DrawMenuBar 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/menu.c | 23 ++--------------------- dlls/win32u/menu.c | 28 ++++++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 3 +++ include/ntuser.h | 6 ++++++ 5 files changed, 40 insertions(+), 21 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index d1efb9d49d3..b1fdacefc9c 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4367,28 +4367,9 @@ HMENU WINAPI GetSubMenu( HMENU hMenu, INT nPos ) /********************************************************************** * DrawMenuBar (USER32.@) */ -BOOL WINAPI DrawMenuBar( HWND hWnd ) +BOOL WINAPI DrawMenuBar( HWND hwnd ) { - HMENU hMenu; - - if (!IsWindow( hWnd )) - return FALSE; - if (is_win_menu_disallowed(hWnd)) - return TRUE; - - if ((hMenu = GetMenu( hWnd ))) - { - POPUPMENU *menu = grab_menu_ptr(hMenu); - if (menu) - { - menu->Height = 0; /* Make sure we call MENU_MenuBarCalcSize */ - menu->hwndOwner = hWnd; - release_menu_ptr(menu); - } - } - - return NtUserSetWindowPos( hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | - SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED ); + return NtUserDrawMenuBar( hwnd ); } /*********************************************************************** diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index 0f02bb15c7a..b107bd7e8e0 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -196,6 +196,11 @@ static POPUPMENU *find_menu_item( HMENU handle, UINT id, UINT flags, UINT *pos ) return menu; } +static BOOL is_win_menu_disallowed( HWND hwnd ) +{ + return (get_window_long(hwnd, GWL_STYLE) & (WS_CHILD | WS_POPUP)) == WS_CHILD; +} + /* see GetMenu */ HMENU get_menu( HWND hwnd ) { @@ -319,3 +324,26 @@ BOOL WINAPI NtUserEnableMenuItem( HMENU handle, UINT id, UINT flags ) return oldflags; } + +/* see DrawMenuBar */ +BOOL draw_menu_bar( HWND hwnd ) +{ + HMENU handle; + + if (!is_window( hwnd )) return FALSE; + if (is_win_menu_disallowed( hwnd )) return TRUE; + + if ((handle = get_menu( hwnd ))) + { + POPUPMENU *menu = grab_menu_ptr( handle ); + if (menu) + { + menu->Height = 0; /* Make sure we call MENU_MenuBarCalcSize */ + menu->hwndOwner = hwnd; + release_menu_ptr( menu ); + } + } + + return NtUserSetWindowPos( hwnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | + SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED ); +} diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 7db37e4a32c..ceff548526b 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -355,6 +355,7 @@ extern BOOL set_foreground_window( HWND hwnd, BOOL mouse ) DECLSPEC_HIDDEN; /* menu.c */ extern HMENU create_menu( BOOL is_popup ) DECLSPEC_HIDDEN; +extern BOOL draw_menu_bar( HWND hwnd ) DECLSPEC_HIDDEN; extern HMENU get_menu( HWND hwnd ) DECLSPEC_HIDDEN; /* message.c */ diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 3df544b1bb1..9e3b085ac32 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5069,6 +5069,9 @@ ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) case NtUserCallHwnd_ArrangeIconicWindows: return arrange_iconic_windows( hwnd ); + case NtUserCallHwnd_DrawMenuBar: + return draw_menu_bar( hwnd ); + case NtUserCallHwnd_GetDpiForWindow: return get_dpi_for_window( hwnd ); diff --git a/include/ntuser.h b/include/ntuser.h index ded3096b76c..79ea57590bf 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -777,6 +777,7 @@ static inline BOOL NtUserUnhookWindowsHook( INT id, HOOKPROC proc ) enum { NtUserCallHwnd_ArrangeIconicWindows, + NtUserCallHwnd_DrawMenuBar, NtUserCallHwnd_GetDpiForWindow, NtUserCallHwnd_GetParent, NtUserCallHwnd_GetWindowContextHelpId, @@ -793,6 +794,11 @@ static inline UINT NtUserArrangeIconicWindows( HWND parent ) return NtUserCallHwnd( parent, NtUserCallHwnd_ArrangeIconicWindows ); } +static inline BOOL NtUserDrawMenuBar( HWND hwnd ) +{ + return NtUserCallHwnd( hwnd, NtUserCallHwnd_DrawMenuBar ); +} + static inline DWORD NtUserGetWindowContextHelpId( HWND hwnd ) { return NtUserCallHwnd( hwnd, NtUserCallHwnd_GetWindowContextHelpId );

1 0