wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

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: 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

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

Gabriel Ivăncescu : jscript: Initialize hres in String constructor.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: e254680ed15f43409114881d8ed613aa4b0de944 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e254680ed15f43409114881d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Apr 15 16:00:21 2022 +0300 jscript: Initialize hres in String constructor. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index e73b9e8b52f..dac89c9d8a9 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1628,7 +1628,7 @@ static HRESULT StringConstr_fromCharCode(script_ctx_t *ctx, jsval_t vthis, WORD static HRESULT StringConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - HRESULT hres; + HRESULT hres = S_OK; TRACE("\n");

1 0

Nikolay Sivov : ddraw: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: 4ceb3a650d1557451cb13da2625c75dc7ffb70fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ceb3a650d1557451cb13da2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 14 16:27:40 2022 +0300 ddraw: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/Makefile.in | 1 - dlls/ddraw/clipper.c | 12 +- dlls/ddraw/ddraw.c | 170 ++++++++++++------------ dlls/ddraw/device.c | 198 ++++++++++++++-------------- dlls/ddraw/executebuffer.c | 42 +++--- dlls/ddraw/light.c | 4 +- dlls/ddraw/main.c | 34 ++--- dlls/ddraw/material.c | 8 +- dlls/ddraw/palette.c | 14 +- dlls/ddraw/surface.c | 313 ++++++++++++++++++++++----------------------- dlls/ddraw/utils.c | 40 +++--- dlls/ddraw/vertexbuffer.c | 26 ++-- dlls/ddraw/viewport.c | 43 +++---- 13 files changed, 451 insertions(+), 454 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4ceb3a650d1557451cb1…

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: fa7c22e4583be847c0a830c87de2a6c7636adbce URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa7c22e4583be847c0a830c8… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Fri Apr 15 18:13:40 2022 +0200 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/nl.po b/po/nl.po index 659afc3bf40..8318d5fc54c 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-03-23 17:00+0100\n" +"PO-Revision-Date: 2022-04-15 18:10+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -4006,10 +4006,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "Kan onschrijfbare eigenschap '|' niet veranderen" #: dlls/jscript/jscript.rc:79 -#, fuzzy -#| msgid "'this' is not a Map object" msgid "'this' is not a | object" -msgstr "'this' is geen Map object" +msgstr "'this' is geen | object" #: dlls/jscript/jscript.rc:80 msgid "Property cannot have both accessors and a value"

1 0

Jacek Caban : win32u: Move more WM_SYSCOMMAND handling from user32.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: 35ac1b3f0700b3f6c1b8a9bbb87e9aad37ce3cc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35ac1b3f0700b3f6c1b8a9bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 14:54:16 2022 +0200 win32u: Move more WM_SYSCOMMAND handling 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/nonclient.c | 17 ----------------- dlls/win32u/defwnd.c | 22 +++++++++++++++++++++- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 2 +- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index dbcb09875d0..a2b5a82a5e6 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1550,23 +1550,6 @@ LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) WINPOS_SysCommandSizeMove( hwnd, wParam ); break; - case SC_MINIMIZE: - ShowOwnedPopups(hwnd,FALSE); - NtUserShowWindow( hwnd, SW_MINIMIZE ); - break; - - case SC_MAXIMIZE: - if (IsIconic(hwnd)) - ShowOwnedPopups(hwnd,TRUE); - NtUserShowWindow( hwnd, SW_MAXIMIZE ); - break; - - case SC_RESTORE: - if (IsIconic(hwnd)) - ShowOwnedPopups(hwnd,TRUE); - NtUserShowWindow( hwnd, SW_RESTORE ); - break; - case SC_CLOSE: return SendMessageW( hwnd, WM_CLOSE, 0, 0 ); diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 22d2b08951d..0080d4f7cc6 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -131,7 +131,27 @@ static LRESULT handle_sys_command( HWND hwnd, WPARAM wparam, LPARAM lparam ) if (!user_driver->pSysCommand( hwnd, wparam, lparam )) return 0; - return 1; + switch (wparam & 0xfff0) + { + case SC_MINIMIZE: + show_owned_popups( hwnd, FALSE ); + NtUserShowWindow( hwnd, SW_MINIMIZE ); + break; + + case SC_MAXIMIZE: + if (is_iconic(hwnd)) show_owned_popups( hwnd, TRUE ); + NtUserShowWindow( hwnd, SW_MAXIMIZE ); + break; + + case SC_RESTORE: + if (is_iconic( hwnd )) show_owned_popups( hwnd, TRUE ); + NtUserShowWindow( hwnd, SW_RESTORE ); + break; + + default: + return 1; /* handle on client side */ + } + return 0; } LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index ceff548526b..651003d4e84 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -431,6 +431,7 @@ extern LONG_PTR set_window_long( HWND hwnd, INT offset, UINT size, LONG_PTR newv BOOL ansi ) DECLSPEC_HIDDEN; extern BOOL set_window_pos( WINDOWPOS *winpos, int parent_x, int parent_y ) DECLSPEC_HIDDEN; extern ULONG set_window_style( HWND hwnd, ULONG set_bits, ULONG clear_bits ) DECLSPEC_HIDDEN; +extern BOOL show_owned_popups( HWND owner, BOOL show ) DECLSPEC_HIDDEN; extern void update_window_state( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND window_from_point( HWND hwnd, POINT pt, INT *hittest ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 49813aa2ad3..ba58dbf96aa 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -4238,7 +4238,7 @@ BOOL WINAPI NtUserShowWindow( HWND hwnd, INT cmd ) } /* see ShowOwnedPopups */ -static BOOL show_owned_popups( HWND owner, BOOL show ) +BOOL show_owned_popups( HWND owner, BOOL show ) { int count = 0; HWND *win_array = list_window_children( 0, get_desktop_window(), NULL, 0 );

1 0

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

15 Apr '22

Module: wine Branch: master Commit: bed878dd2b88cff039b5659739e801606ee7df4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bed878dd2b88cff039b56597… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 14:54:04 2022 +0200 win32u: Move ShowOwnedPopups 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/win.c | 33 ++------------------------------- dlls/win32u/window.c | 39 +++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 6 ++++++ 3 files changed, 47 insertions(+), 31 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index d44f058d256..8640ad5a473 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1283,38 +1283,9 @@ HWND WINAPI GetWindow( HWND hwnd, UINT rel ) /******************************************************************* * ShowOwnedPopups (USER32.@) */ -BOOL WINAPI ShowOwnedPopups( HWND owner, BOOL fShow ) +BOOL WINAPI ShowOwnedPopups( HWND owner, BOOL show ) { - int count = 0; - HWND *win_array = WIN_ListChildren( GetDesktopWindow() ); - - if (!win_array) return TRUE; - - while (win_array[count]) count++; - while (--count >= 0) - { - if (GetWindow( win_array[count], GW_OWNER ) != owner) continue; - if (fShow) - { - if (win_get_flags( win_array[count] ) & WIN_NEEDS_SHOW_OWNEDPOPUP) - /* In Windows, ShowOwnedPopups(TRUE) generates - * WM_SHOWWINDOW messages with SW_PARENTOPENING, - * regardless of the state of the owner - */ - SendMessageW(win_array[count], WM_SHOWWINDOW, SW_SHOWNORMAL, SW_PARENTOPENING); - } - else - { - if (GetWindowLongW( win_array[count], GWL_STYLE ) & WS_VISIBLE) - /* In Windows, ShowOwnedPopups(FALSE) generates - * WM_SHOWWINDOW messages with SW_PARENTCLOSING, - * regardless of the state of the owner - */ - SendMessageW(win_array[count], WM_SHOWWINDOW, SW_HIDE, SW_PARENTCLOSING); - } - } - HeapFree( GetProcessHeap(), 0, win_array ); - return TRUE; + return NtUserShowOwnedPopups( owner, show ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 9e3b085ac32..49813aa2ad3 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -4237,6 +4237,42 @@ BOOL WINAPI NtUserShowWindow( HWND hwnd, INT cmd ) return send_message( hwnd, WM_WINE_SHOWWINDOW, cmd, 0 ); } +/* see ShowOwnedPopups */ +static BOOL show_owned_popups( HWND owner, BOOL show ) +{ + int count = 0; + HWND *win_array = list_window_children( 0, get_desktop_window(), NULL, 0 ); + + if (!win_array) return TRUE; + + while (win_array[count]) count++; + while (--count >= 0) + { + if (get_window_relative( win_array[count], GW_OWNER ) != owner) continue; + if (show) + { + if (win_get_flags( win_array[count] ) & WIN_NEEDS_SHOW_OWNEDPOPUP) + /* In Windows, ShowOwnedPopups(TRUE) generates + * WM_SHOWWINDOW messages with SW_PARENTOPENING, + * regardless of the state of the owner + */ + send_message( win_array[count], WM_SHOWWINDOW, SW_SHOWNORMAL, SW_PARENTOPENING ); + } + else + { + if (get_window_long( win_array[count], GWL_STYLE ) & WS_VISIBLE) + /* In Windows, ShowOwnedPopups(FALSE) generates + * WM_SHOWWINDOW messages with SW_PARENTCLOSING, + * regardless of the state of the owner + */ + send_message( win_array[count], WM_SHOWWINDOW, SW_HIDE, SW_PARENTCLOSING ); + } + } + + free( win_array ); + return TRUE; +} + /******************************************************************* * NtUserFlashWindowEx (win32u.@) */ @@ -5198,6 +5234,9 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) case NtUserCallHwndParam_SetWindowPixelFormat: return set_window_pixel_format( hwnd, param ); + case NtUserCallHwndParam_ShowOwnedPopups: + return show_owned_popups( hwnd, param ); + /* temporary exports */ case NtUserIsWindowDrawable: return is_window_drawable( hwnd, param ); diff --git a/include/ntuser.h b/include/ntuser.h index 79ea57590bf..61ee94f7a5c 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -875,6 +875,7 @@ enum NtUserCallHwndParam_ScreenToClient, NtUserCallHwndParam_SetForegroundWindow, NtUserCallHwndParam_SetWindowPixelFormat, + NtUserCallHwndParam_ShowOwnedPopups, /* temporary exports */ NtUserIsWindowDrawable, NtUserSetCaptureWindow, @@ -1034,4 +1035,9 @@ static inline BOOL NtUserSetWindowPixelFormat( HWND hwnd, int format ) return NtUserCallHwndParam( hwnd, format, NtUserCallHwndParam_SetWindowPixelFormat ); } +static inline BOOL NtUserShowOwnedPopups( HWND hwnd, BOOL show ) +{ + return NtUserCallHwndParam( hwnd, show, NtUserCallHwndParam_ShowOwnedPopups ); +} + #endif /* _NTUSER_ */

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

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

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 April 2022