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

Jacek Caban : win32u: Move NtUserDrawMenuBarTemp implementation from user32.
by Alexandre Julliard 14 Jun '22

14 Jun '22

Module: wine Branch: master Commit: af00521e290fab8966c61ec8dd956152e47ddaa5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af00521e290fab8966c61ec8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 10 20:15:53 2022 +0200 win32u: Move NtUserDrawMenuBarTemp implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/menu.c | 140 +---------- dlls/user32/user32.spec | 2 +- dlls/win32u/dc.c | 13 + dlls/win32u/defwnd.c | 77 +++++- dlls/win32u/gdiobj.c | 1 + dlls/win32u/menu.c | 556 ++++++++++++++++++++++++++++++++++++++++++- dlls/win32u/ntgdi_private.h | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 5 + dlls/win32u/wrappers.c | 6 + include/ntuser.h | 1 + 11 files changed, 659 insertions(+), 145 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=af00521e290fab8966c6…

1 0

Jacek Caban : win32u: Move MENU_DrawMenuBar implementation from user32.
by Alexandre Julliard 14 Jun '22

14 Jun '22

Module: wine Branch: master Commit: e13145c893e3de376008b3eeaf531e3f000a7410 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e13145c893e3de376008b3ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 10 20:27:33 2022 +0200 win32u: Move MENU_DrawMenuBar implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/controls.h | 1 - dlls/user32/menu.c | 20 -------------------- dlls/user32/user_main.c | 1 - dlls/win32u/defwnd.c | 7 +++++-- dlls/win32u/menu.c | 2 +- dlls/win32u/ntuser_private.h | 1 - dlls/win32u/win32u_private.h | 1 + 7 files changed, 7 insertions(+), 26 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 2b6c4912709..c09ab1233d0 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -116,7 +116,6 @@ extern BOOL update_wallpaper( const WCHAR *wallpaper, const WCHAR *pattern ) DEC extern HWND MENU_IsMenuActive(void) DECLSPEC_HIDDEN; extern void MENU_TrackMouseMenuBar( HWND hwnd, INT ht, POINT pt ) DECLSPEC_HIDDEN; extern void MENU_TrackKbdMenuBar( HWND hwnd, UINT wParam, WCHAR wChar ) DECLSPEC_HIDDEN; -extern UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd ) DECLSPEC_HIDDEN; extern void MENU_EndMenu(HWND) DECLSPEC_HIDDEN; extern HMENU MENU_GetSysMenu( HWND hWnd, HMENU hPopupMenu ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 1372baca6cc..2d01e01872c 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1693,26 +1693,6 @@ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu ) } } -/*********************************************************************** - * MENU_DrawMenuBar - * - * Paint a menu bar. Returns the height of the menu bar. - * called from [windows/nonclient.c] - */ -UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd ) -{ - LPPOPUPMENU lppop; - HMENU hMenu = GetMenu(hwnd); - - lppop = MENU_GetMenu( hMenu ); - if (lppop == NULL || lprect == NULL) - { - return GetSystemMetrics(SM_CYMENU); - } - - return NtUserDrawMenuBarTemp( hwnd, hDC, lprect, hMenu, NULL ); -} - /*********************************************************************** * MENU_InitPopup diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 5344dafd359..bca56fc4141 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -145,7 +145,6 @@ static const struct user_callbacks user_funcs = ImmProcessKey, ImmTranslateMessage, NtWaitForMultipleObjects, - MENU_DrawMenuBar, SCROLL_DrawNCScrollBar, free_win_ptr, MENU_GetSysMenu, diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 9a51b9a463a..f9a23bcee3f 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -1487,12 +1487,15 @@ static void nc_paint( HWND hwnd, HRGN clip ) if (has_menu( hwnd, style )) { RECT r = rect; + HMENU menu; + r.bottom = rect.top + get_system_metrics( SM_CYMENU ); TRACE( "drawing menu with rect %s\n", wine_dbgstr_rect( &r )); - if (user_callbacks) - rect.top += user_callbacks->draw_menu( hdc, &r, hwnd ) + 1; + menu = get_menu( hwnd ); + if (!is_menu( menu )) rect.top += get_system_metrics( SM_CYMENU ); + else rect.top += NtUserDrawMenuBarTemp( hwnd, hdc, &r, menu, NULL ); } TRACE( "rect after menu %s\n", wine_dbgstr_rect( &rect )); diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index 182dbb6cf58..b794b9a162a 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -241,7 +241,7 @@ static POPUPMENU *unsafe_menu_ptr( HMENU handle ) } /* see IsMenu */ -static BOOL is_menu( HMENU handle ) +BOOL is_menu( HMENU handle ) { POPUPMENU *menu; BOOL is_menu; diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 6fc1c1423bd..69fb831c03f 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -36,7 +36,6 @@ struct user_callbacks BOOL (WINAPI *pImmProcessKey)(HWND, HKL, UINT, LPARAM, DWORD); BOOL (WINAPI *pImmTranslateMessage)(HWND, UINT, WPARAM, LPARAM); NTSTATUS (WINAPI *pNtWaitForMultipleObjects)(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); - UINT (CDECL *draw_menu)( HDC hDC, LPRECT lprect, HWND hwnd ); void (CDECL *draw_nc_scrollbar)( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical ); void (CDECL *free_win_ptr)( struct tagWND *win ); HMENU (CDECL *get_sys_menu)( HWND hwnd, HMENU popup ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 5f5563ec9f9..cf3e5c75b16 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -401,6 +401,7 @@ extern UINT get_menu_bar_height( HWND hwnd, UINT width, INT org_x, INT org_y ) D extern BOOL get_menu_info( HMENU handle, MENUINFO *info ) DECLSPEC_HIDDEN; extern INT get_menu_item_count( HMENU handle ) DECLSPEC_HIDDEN; extern UINT get_menu_state( HMENU handle, UINT item_id, UINT flags ) DECLSPEC_HIDDEN; +extern BOOL is_menu( HMENU handle ) DECLSPEC_HIDDEN; extern BOOL set_window_menu( HWND hwnd, HMENU handle ) DECLSPEC_HIDDEN; /* message.c */

1 0

Jacek Caban : win32u: Move PopupMenuWndProc implementation from user32.
by Alexandre Julliard 14 Jun '22

14 Jun '22

Module: wine Branch: master Commit: d4b8ca785307083abc449dd09efa3394d9ad9771 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4b8ca785307083abc449dd0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 11 01:42:50 2022 +0200 win32u: Move PopupMenuWndProc implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/menu.c | 165 ++------------------------------------- dlls/win32u/menu.c | 181 ++++++++++++++++++++++++++++++++++++++++++- dlls/win32u/message.c | 2 + dlls/win32u/win32u_private.h | 3 + dlls/win32u/window.c | 2 +- include/ntuser.h | 1 + 6 files changed, 194 insertions(+), 160 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d4b8ca785307083abc44…

1 0

Jacek Caban : user32: Reimplement GetMenuContextHelpId on top of GetMenuInfo.
by Alexandre Julliard 14 Jun '22

14 Jun '22

Module: wine Branch: master Commit: eda3732afda87367d8196f360ee07c833be275d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eda3732afda87367d8196f36… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 11 02:20:22 2022 +0200 user32: Reimplement GetMenuContextHelpId on top of GetMenuInfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/menu.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index f5b74a24c25..73aee6b849d 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4309,20 +4309,13 @@ BOOL WINAPI GetMenuInfo( HMENU menu, MENUINFO *info ) /********************************************************************** * GetMenuContextHelpId (USER32.@) */ -DWORD WINAPI GetMenuContextHelpId( HMENU hMenu ) +DWORD WINAPI GetMenuContextHelpId( HMENU menu ) { - DWORD help_id = 0; - POPUPMENU *menu; - - TRACE("(%p)\n", hMenu); - - if ((menu = grab_menu_ptr(hMenu))) - { - help_id = menu->dwContextHelpID; - release_menu_ptr(menu); - } - - return help_id; + MENUINFO info; + TRACE( "(%p)\n", menu ); + info.cbSize = sizeof(info); + info.fMask = MIM_HELPID; + return GetMenuInfo( menu, &info ) ? info.dwContextHelpID : 0; } /**********************************************************************

1 0

Hans Leidekker : winhttp: Fix default port corner cases in WinHttpCrackUrl().
by Alexandre Julliard 14 Jun '22

14 Jun '22

Module: wine Branch: master Commit: 2fccd2cb1067ca3e07b0f978ca4082dfeea482ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fccd2cb1067ca3e07b0f978… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sat Jun 4 16:07:38 2022 +0200 winhttp: Fix default port corner cases in WinHttpCrackUrl(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/tests/url.c | 9 ++++++++- dlls/winhttp/url.c | 18 ++++++++++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index 5f137dc6365..da51117e41e 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -61,6 +61,7 @@ static const WCHAR url18[] = L"http://%0D%1F%20%0A%7F%0D%0A"; static const WCHAR url19[] = L"http://?text=\xfb00"; static const WCHAR url20[] = L"http:///text=\xfb00"; static const WCHAR url21[] = L"https://nba2k19-ws.2ksports.com:19133/nba/v4/Accounts/get_account?x=3789526…"; +static const WCHAR url22[] = L"http://winehq.org:/"; static const WCHAR url_k1[] = L"http://username:password(a)www.winehq.org/site/about"; static const WCHAR url_k2[] = L"http://www.winehq.org"; @@ -807,7 +808,13 @@ static void WinHttpCrackUrl_test( void ) uc.nPort = 1; ret = WinHttpCrackUrl( url17, 0, 0, &uc ); ok( ret, "got %lu\n", GetLastError() ); - todo_wine ok( uc.nPort == 80, "got %u\n", uc.nPort ); + ok( uc.nPort == 80, "got %u\n", uc.nPort ); + + reset_url_components( &uc ); + uc.nPort = 1; + ret = WinHttpCrackUrl( url22, 0, 0, &uc ); + ok( ret, "got %lu\n", GetLastError() ); + ok( uc.nPort == 80, "got %u\n", uc.nPort ); memset( &uc, 0, sizeof(uc) ); uc.dwStructSize = sizeof(uc); diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 9e7f5478dfe..4d10a17f6a0 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -280,13 +280,18 @@ BOOL WINAPI WinHttpCrackUrl( const WCHAR *url, DWORD len, DWORD flags, URL_COMPO { if ((err = set_component( &hostname, p, r - p, flags, &overflow ))) goto exit; r++; - if ((err = parse_port( r, q - r, &uc->nPort ))) goto exit; + if (!(q - r)) + { + if (scheme_number == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; + else if (scheme_number == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; + } + else if ((err = parse_port( r, q - r, &uc->nPort ))) goto exit; } else { if ((err = set_component( &hostname, p, q - p, flags, &overflow ))) goto exit; if (scheme_number == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; - if (scheme_number == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; + else if (scheme_number == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; } if ((r = wmemchr( q, '?', len - (q - url) ))) @@ -310,13 +315,18 @@ BOOL WINAPI WinHttpCrackUrl( const WCHAR *url, DWORD len, DWORD flags, URL_COMPO { if ((err = set_component( &hostname, p, r - p, flags, &overflow ))) goto exit; r++; - if ((err = parse_port( r, len - (r - url), &uc->nPort ))) goto exit; + if (!*r) + { + if (scheme_number == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; + else if (scheme_number == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; + } + else if ((err = parse_port( r, len - (r - url), &uc->nPort ))) goto exit; } else { if ((err = set_component( &hostname, p, len - (p - url), flags, &overflow ))) goto exit; if (scheme_number == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; - if (scheme_number == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; + else if (scheme_number == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; } if ((err = set_component( &path, (WCHAR *)url + len, 0, flags, &overflow ))) goto exit; if ((err = set_component( &extra, (WCHAR *)url + len, 0, flags, &overflow ))) goto exit;

1 0

Alex Henrie : user32: Plug icon handle leak in MDI_AugmentFrameMenu (Coverity).
by Alexandre Julliard 14 Jun '22

14 Jun '22

Module: wine Branch: master Commit: 001d78a58257b67871924774485ce226f4b87a9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=001d78a58257b67871924774… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 29 16:37:19 2022 -0600 user32: Plug icon handle leak in MDI_AugmentFrameMenu (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/user32/mdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 26772aed763..11c17a6dbd8 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -859,7 +859,7 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild ) hIcon = (HICON)GetClassLongPtrW(hChild, GCLP_HICON); if (!hIcon) hIcon = LoadImageW(0, (LPWSTR)IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); + GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR | LR_SHARED); if (hIcon) { HDC hMemDC;

1 0

Alexandre Julliard : patches: Use gitlab instead of gitweb.
by Alexandre Julliard 14 Jun '22

14 Jun '22

Module: tools Branch: master Commit: 0c4caff2510bca35a93e9215448a0f78c9c36ee0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0c4caff2510bca35a93e921… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 14 18:48:19 2022 +0200 patches: Use gitlab instead of gitweb. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update-regressions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/update-regressions b/patches/update-regressions index f617b980..f37939a1 100755 --- a/patches/update-regressions +++ b/patches/update-regressions @@ -29,7 +29,7 @@ binmode STDOUT, ':utf8'; $ENV{"GIT_DIR"} = "/home/winehq/opt/source/git/wine.git"; my $bugzilla_base = "//bugs.winehq.org/show_bug.cgi?id="; -my $gitweb_base = "//source.winehq.org/git/wine.git/commit/"; +my $gitlab_base = "https://gitlab.winehq.org/wine/wine/-/commit/"; my $dest = "/home/winehq/opt/source"; my %regressions; @@ -95,7 +95,7 @@ sub print_bugs($@) printf OUTPUT "<tr class=\"regression %s\">", ++$row & 1 ? "odd" : "even"; printf OUTPUT "<td class=\"id\"><a href=\"%s%u\">%u</a></td>", $bugzilla_base, $id, $id; printf OUTPUT "<td class=\"sha1\"><a href=\"%s%s\" title=\"%s\">%s</a></td>", - $gitweb_base, escapeHTML($commit_id), + $gitlab_base, escapeHTML($commit_id), escapeHTML($commits{$commit_id}->{"subject"}), escapeHTML(substr($commit_id,0,12)); printf OUTPUT "<td class=\"subject\" width=\"100%%\"><a href=\"%s%u\">%s</a></td></tr>\n", $bugzilla_base, $id, escapeHTML($regression->{"description"});

1 0

Francois Gouget : testbot: Include the filename in LoadLogErrors() error messages.
by Alexandre Julliard 14 Jun '22

14 Jun '22

Module: tools Branch: master Commit: dde9a39ccbb2985603ae02ba5b76be4eb6db9a4a URL: https://source.winehq.org/git/tools.git/?a=commit;h=dde9a39ccbb2985603ae02b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 14 15:59:16 2022 +0200 testbot: Include the filename in LoadLogErrors() error messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 17cfc352..2e3de83b 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1016,6 +1016,10 @@ sub LoadLogErrors($) if (open(my $ErrorsFile, "<", "$LogPath.errors")) { LoadLogErrorsFromFh($LogInfo, $ErrorsFile); + if ($LogInfo->{BadLog}) + { + $LogInfo->{BadLog} = "$LogInfo->{LogName}.errors: $LogInfo->{BadLog}"; + } delete $LogInfo->{CurGroup}; close($ErrorsFile); }

1 0

Francois Gouget : testbot/web: Fix hiding the branch column on the main page.
by Alexandre Julliard 14 Jun '22

14 Jun '22

Module: tools Branch: master Commit: adce5f9343c9dbec16f4ce06f038b6a83b4e01be URL: https://source.winehq.org/git/tools.git/?a=commit;h=adce5f9343c9dbec16f4ce0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 14 15:59:39 2022 +0200 testbot/web: Fix hiding the branch column on the main page. It is hidden when only one branch exists. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 2073b1e6..a3b26ea9 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -41,7 +41,7 @@ sub DisplayProperty($$) my $PropertyName = $PropertyDescriptor->GetName(); return $PropertyName =~ /^(?:Branch|User|PatchId|Patch)$/ ? "" : $PropertyName eq "Submitted" ? ("ro", "timetipdate") : - ($PropertyName eq "Branch" and !CreateBranches()->MultipleBranchesPresent) ? "" : + ($PropertyName eq "BranchName" and !CreateBranches()->MultipleBranchesPresent) ? "" : $self->SUPER::DisplayProperty($PropertyDescriptor); }

1 0

Francois Gouget : testbot/web: Tweak GenerateFullLog() in the job details page.
by Alexandre Julliard 14 Jun '22

14 Jun '22

Module: tools Branch: master Commit: c6f40dd1d94cb832674f4e4f94f102a4748c691f URL: https://source.winehq.org/git/tools.git/?a=commit;h=c6f40dd1d94cb832674f4e4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 14 15:59:45 2022 +0200 testbot/web: Tweak GenerateFullLog() in the job details page. Rename %ErrLineNos to %ErrCategory since it contains the error's category indexed by the full log line number. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 36bba0d0..7860a4c9 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -400,16 +400,14 @@ sub GenerateFullLog($$$$) print "<pre class='log-note'>Some WineTest results could not be used to detect new errors: $LogInfo->{BadRef}</pre>\n"; } - my %ErrLineNos; + my %ErrCategory; foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { my $Group = $LogInfo->{ErrGroups}->{$GroupName}; - my $ErrCount = @{$Group->{Errors}}; - next if (!$ErrCount); - for my $ErrIndex (0..$ErrCount-1) + for my $ErrIndex (0..$#{$Group->{Errors}}) { - $ErrLineNos{$Group->{LineNos}->[$ErrIndex]} = \ - $Group->{IsNew}->[$ErrIndex] ? "fullnew" : "error"; + my $LineNo = $Group->{LineNos}->[$ErrIndex]; + $ErrCategory{$LineNo} = $Group->{IsNew}->[$ErrIndex] ? "fullnew" : "error"; } } @@ -432,7 +430,7 @@ sub GenerateFullLog($$$$) } my $Html = $self->escapeHTML($Line); - my $Category = $ErrLineNos{$LineNo} || $GetCategory->($Line); + my $Category = $ErrCategory{$LineNo} || $GetCategory->($Line); if ($Category ne "none") { $Html =~ s~^(.*\S)\s*\r?$~<span class='log-$Category'>$1</span>~;

1 0