July 2022 - Wine-Commits - list.winehq.org

Jacek Caban : user32: Use GetWindowLongPtr for GetWindowModuleFileName implementation.
by Alexandre Julliard July 28, 2022

July 28, 2022

Module: wine Branch: master Commit: fcf4d07161478ec8ea0707a50af02acc7fe6df6a URL: https://gitlab.winehq.org/wine/wine/-/commit/fcf4d07161478ec8ea0707a50af02a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 26 18:23:30 2022 +0200 user32: Use GetWindowLongPtr for GetWindowModuleFileName implementation. --- dlls/user32/win.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index b149a202433..23263166eeb 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1413,20 +1413,17 @@ BOOL WINAPI DragDetect( HWND hwnd, POINT pt ) */ UINT WINAPI GetWindowModuleFileNameA( HWND hwnd, LPSTR module, UINT size ) { - WND *win; HINSTANCE hinst; TRACE( "%p, %p, %u\n", hwnd, module, size ); - win = WIN_GetPtr( hwnd ); - if (!win || win == WND_OTHER_PROCESS || win == WND_DESKTOP) + if (!WIN_IsCurrentProcess( hwnd )) { SetLastError( ERROR_INVALID_WINDOW_HANDLE ); return 0; } - hinst = win->hInstance; - WIN_ReleasePtr( win ); + hinst = (HINSTANCE)GetWindowLongPtrA( hwnd, GWLP_HINSTANCE ); return GetModuleFileNameA( hinst, module, size ); } @@ -1435,20 +1432,17 @@ UINT WINAPI GetWindowModuleFileNameA( HWND hwnd, LPSTR module, UINT size ) */ UINT WINAPI GetWindowModuleFileNameW( HWND hwnd, LPWSTR module, UINT size ) { - WND *win; HINSTANCE hinst; TRACE( "%p, %p, %u\n", hwnd, module, size ); - win = WIN_GetPtr( hwnd ); - if (!win || win == WND_OTHER_PROCESS || win == WND_DESKTOP) + if (!WIN_IsCurrentProcess( hwnd )) { SetLastError( ERROR_INVALID_WINDOW_HANDLE ); return 0; } - hinst = win->hInstance; - WIN_ReleasePtr( win ); + hinst = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ); return GetModuleFileNameW( hinst, module, size ); }

1 0

Jacek Caban : user32: Avoid using WIN_GetPtr for window handle validation.
by Alexandre Julliard July 28, 2022

July 28, 2022

Module: wine Branch: master Commit: 11657aab278e73a892843b33e196b8f4375d54f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/11657aab278e73a892843b33e196b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 26 16:08:55 2022 +0200 user32: Avoid using WIN_GetPtr for window handle validation. We will eventually want to make GetWindowThreadProcessId fast (probably based on shared handle table) instead of calling win32u. --- dlls/user32/win.c | 47 +++-------------------------------------------- dlls/win32u/window.c | 10 ++++++++++ include/ntuser.h | 4 ++++ 3 files changed, 17 insertions(+), 44 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 8b5033ad821..b149a202433 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -153,13 +153,7 @@ void WIN_ReleasePtr( WND *ptr ) */ HWND WIN_IsCurrentProcess( HWND hwnd ) { - WND *ptr; - HWND ret; - - if (!(ptr = WIN_GetPtr( hwnd )) || ptr == WND_OTHER_PROCESS || ptr == WND_DESKTOP) return 0; - ret = ptr->obj.handle; - WIN_ReleasePtr( ptr ); - return ret; + return UlongToHandle( NtUserCallHwnd( hwnd, NtUserIsCurrehtProcessWindow )); } @@ -170,13 +164,7 @@ HWND WIN_IsCurrentProcess( HWND hwnd ) */ HWND WIN_IsCurrentThread( HWND hwnd ) { - WND *ptr; - HWND ret = 0; - - if (!(ptr = WIN_GetPtr( hwnd )) || ptr == WND_OTHER_PROCESS || ptr == WND_DESKTOP) return 0; - if (ptr->tid == GetCurrentThreadId()) ret = ptr->obj.handle; - WIN_ReleasePtr( ptr ); - return ret; + return UlongToHandle( NtUserCallHwnd( hwnd, NtUserIsCurrehtThreadWindow )); } @@ -205,36 +193,7 @@ UINT win_set_flags( HWND hwnd, UINT set_mask, UINT clear_mask ) */ HWND WIN_GetFullHandle( HWND hwnd ) { - WND *ptr; - - if (!hwnd || (ULONG_PTR)hwnd >> 16) return hwnd; - if (LOWORD(hwnd) <= 1 || LOWORD(hwnd) == 0xffff) return hwnd; - /* do sign extension for -2 and -3 */ - if (LOWORD(hwnd) >= (WORD)-3) return (HWND)(LONG_PTR)(INT16)LOWORD(hwnd); - - if (!(ptr = WIN_GetPtr( hwnd ))) return hwnd; - - if (ptr == WND_DESKTOP) - { - if (LOWORD(hwnd) == LOWORD(GetDesktopWindow())) return GetDesktopWindow(); - else return get_hwnd_message_parent(); - } - - if (ptr != WND_OTHER_PROCESS) - { - hwnd = ptr->obj.handle; - WIN_ReleasePtr( ptr ); - } - else /* may belong to another process */ - { - SERVER_START_REQ( get_window_info ) - { - req->handle = wine_server_user_handle( hwnd ); - if (!wine_server_call_err( req )) hwnd = wine_server_ptr_handle( reply->full_handle ); - } - SERVER_END_REQ; - } - return hwnd; + return UlongToHandle( NtUserCallHwnd( hwnd, NtUserGetFullWindowHandle )); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index a2ef9e72a06..1b72635e99c 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5408,6 +5408,16 @@ ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) case NtUserCallHwnd_SetForegroundWindow: return set_foreground_window( hwnd, FALSE ); + /* temporary exports */ + case NtUserGetFullWindowHandle: + return HandleToUlong( get_full_window_handle( hwnd )); + + case NtUserIsCurrehtProcessWindow: + return HandleToUlong( is_current_process_window( hwnd )); + + case NtUserIsCurrehtThreadWindow: + return HandleToUlong( is_current_thread_window( hwnd )); + default: FIXME( "invalid code %u\n", code ); return 0; diff --git a/include/ntuser.h b/include/ntuser.h index 59916d25d6d..dc5f5ee501a 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -1112,6 +1112,10 @@ enum NtUserCallHwnd_IsWindowUnicode, NtUserCallHwnd_IsWindowVisible, NtUserCallHwnd_SetForegroundWindow, + /* temporary exports */ + NtUserGetFullWindowHandle, + NtUserIsCurrehtProcessWindow, + NtUserIsCurrehtThreadWindow, }; static inline UINT NtUserArrangeIconicWindows( HWND parent )

1 0

Jacek Caban : win32u: Introduce NtUserGetDialogInfo and NtUserSetDialogInfo.
by Alexandre Julliard July 28, 2022

July 28, 2022

Module: wine Branch: master Commit: 1cd5702d9f4787f56a342b52ae9b4dcf5356b8e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/1cd5702d9f4787f56a342b52ae9b4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 26 19:12:12 2022 +0200 win32u: Introduce NtUserGetDialogInfo and NtUserSetDialogInfo. And use it instead of accessing window object from user32. --- dlls/user32/defdlg.c | 22 ++++------------------ dlls/win32u/window.c | 32 ++++++++++++++++++++++++++++++++ include/ntuser.h | 12 ++++++++++++ 3 files changed, 48 insertions(+), 18 deletions(-) diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index e330cf6603d..1e1ff71b87b 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -237,15 +237,11 @@ static LRESULT DEFDLG_Proc( HWND hwnd, UINT msg, WPARAM wParam, case WM_NCDESTROY: if (dlgInfo) { - WND *wndPtr; - if (dlgInfo->hUserFont) DeleteObject( dlgInfo->hUserFont ); if (dlgInfo->hMenu) NtUserDestroyMenu( dlgInfo->hMenu ); HeapFree( GetProcessHeap(), 0, dlgInfo ); - wndPtr = WIN_GetPtr( hwnd ); - wndPtr->dlgInfo = NULL; - WIN_ReleasePtr( wndPtr ); + NtUserSetDialogInfo( hwnd, NULL ); } /* Window clean-up */ return DefWindowProcA( hwnd, msg, wParam, lParam ); @@ -323,22 +319,14 @@ static LRESULT DEFDLG_Proc( HWND hwnd, UINT msg, WPARAM wParam, */ DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) { - WND* wndPtr; DIALOGINFO* dlgInfo; - wndPtr = WIN_GetPtr( hwnd ); - if (!wndPtr || wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return NULL; - } - - dlgInfo = wndPtr->dlgInfo; + dlgInfo = NtUserGetDialogInfo( hwnd ); if (!dlgInfo && create) { if (!(dlgInfo = HeapAlloc( GetProcessHeap(), 0, sizeof(*dlgInfo) ))) - goto out; + return NULL; dlgInfo->hwndFocus = 0; dlgInfo->hUserFont = 0; dlgInfo->hMenu = 0; @@ -346,11 +334,9 @@ DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) dlgInfo->yBaseUnit = 0; dlgInfo->idResult = IDOK; dlgInfo->flags = 0; - wndPtr->dlgInfo = dlgInfo; + NtUserSetDialogInfo( hwnd, dlgInfo ); } -out: - WIN_ReleasePtr( wndPtr ); return dlgInfo; } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 1b72635e99c..71e500abb0f 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5359,6 +5359,32 @@ failed: return 0; } +static void *get_dialog_info( HWND hwnd ) +{ + WND *win; + void *ret; + + if (!(win = get_win_ptr( hwnd )) || win == WND_OTHER_PROCESS || win == WND_DESKTOP) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return NULL; + } + + ret = win->dlgInfo; + release_win_ptr( win ); + return ret; +} + +static BOOL set_dialog_info( HWND hwnd, void *info ) +{ + WND *win; + + if (!(win = get_win_ptr( hwnd )) || win == WND_OTHER_PROCESS || win == WND_DESKTOP) return FALSE; + win->dlgInfo = info; + release_win_ptr( win ); + return TRUE; +} + /***************************************************************************** * NtUserCallHwnd (win32u.@) */ @@ -5381,6 +5407,9 @@ ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) case NtUserCallHwnd_GetParent: return HandleToUlong( get_parent( hwnd )); + case NtUserCallHwnd_GetDialogInfo: + return (ULONG_PTR)get_dialog_info( hwnd ); + case NtUserCallHwnd_GetWindowContextHelpId: return get_window_context_help_id( hwnd ); @@ -5510,6 +5539,9 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) case NtUserCallHwndParam_ScreenToClient: return screen_to_client( hwnd, (POINT *)param ); + case NtUserCallHwndParam_SetDialogInfo: + return set_dialog_info( hwnd, (void *)param ); + case NtUserCallHwndParam_SetWindowContextHelpId: return set_window_context_help_id( hwnd, param ); diff --git a/include/ntuser.h b/include/ntuser.h index dc5f5ee501a..9ba128bdbda 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -1101,6 +1101,7 @@ enum NtUserCallHwnd_ArrangeIconicWindows, NtUserCallHwnd_DrawMenuBar, NtUserCallHwnd_GetDefaultImeWindow, + NtUserCallHwnd_GetDialogInfo, NtUserCallHwnd_GetDpiForWindow, NtUserCallHwnd_GetParent, NtUserCallHwnd_GetWindowContextHelpId, @@ -1138,6 +1139,11 @@ static inline HWND NtUserGetDefaultImeWindow( HWND hwnd ) return UlongToHandle( NtUserCallHwnd( hwnd, NtUserCallHwnd_GetDefaultImeWindow )); } +static inline void *NtUserGetDialogInfo( HWND hwnd ) +{ + return (void *)NtUserCallHwnd( hwnd, NtUserCallHwnd_GetDialogInfo ); +} + static inline UINT NtUserGetDpiForWindow( HWND hwnd ) { return NtUserCallHwnd( hwnd, NtUserCallHwnd_GetDpiForWindow ); @@ -1216,6 +1222,7 @@ enum NtUserCallHwndParam_MirrorRgn, NtUserCallHwndParam_MonitorFromWindow, NtUserCallHwndParam_ScreenToClient, + NtUserCallHwndParam_SetDialogInfo, NtUserCallHwndParam_SetWindowContextHelpId, NtUserCallHwndParam_SetWindowPixelFormat, NtUserCallHwndParam_ShowOwnedPopups, @@ -1365,6 +1372,11 @@ static inline BOOL NtUserScreenToClient( HWND hwnd, POINT *pt ) return NtUserCallHwndParam( hwnd, (UINT_PTR)pt, NtUserCallHwndParam_ScreenToClient ); } +static inline void NtUserSetDialogInfo( HWND hwnd, void *info ) +{ + NtUserCallHwndParam( hwnd, (UINT_PTR)info, NtUserCallHwndParam_SetDialogInfo ); +} + static inline BOOL NtUserSetWindowContextHelpId( HWND hwnd, DWORD id ) { return NtUserCallHwndParam( hwnd, id, NtUserCallHwndParam_SetWindowContextHelpId );

1 0

Santino Mazza : riched20/test: Add scrolling test for richole.
by Alexandre Julliard July 28, 2022

July 28, 2022

Module: wine Branch: master Commit: 059c70d736baa164a1b246e949acd006cf83ab5a URL: https://gitlab.winehq.org/wine/wine/-/commit/059c70d736baa164a1b246e949acd0… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Mon Jul 25 19:08:52 2022 -0300 riched20/test: Add scrolling test for richole. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/riched20/tests/richole.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 1ebc12a27ab..d648354729e 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3579,13 +3579,25 @@ static void test_ITextRange_IsEqual(void) ITextSelection_Release(selection); } +static int get_scroll_pos_y(HWND hwnd) +{ + POINT p = {-1, -1}; + SendMessageA(hwnd, EM_GETSCROLLPOS, 0, (LPARAM)&p); + ok(p.x != -1 && p.y != -1, "p.x:%ld p.y:%ld\n", p.x, p.y); + return p.y; +} + static void test_Select(void) { static const CHAR test_text1[] = "TestSomeText"; + static const CHAR test_text2[] = "text\nwith\nbreak\n" + "lines\ntest\ntest\n"; IRichEditOle *reOle = NULL; ITextDocument *doc = NULL; ITextSelection *selection; ITextRange *range; + int scroll_pos1; + int scroll_pos2; LONG value; HRESULT hr; HWND hwnd; @@ -3597,8 +3609,11 @@ static void test_Select(void) hr = ITextDocument_Range(doc, 0, 4, &range); ok(hr == S_OK, "got 0x%08lx\n", hr); + scroll_pos1 = get_scroll_pos_y(hwnd); hr = ITextRange_Select(range); ok(hr == S_OK, "got 0x%08lx\n", hr); + scroll_pos2 = get_scroll_pos_y(hwnd); + ok(scroll_pos1 == scroll_pos2, "%d != %d\n", scroll_pos1, scroll_pos2); value = 1; hr = ITextSelection_GetStart(selection, &value); @@ -3611,6 +3626,16 @@ static void test_Select(void) hr = ITextSelection_Select(selection); ok(hr == S_OK, "got 0x%08lx\n", hr); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text2); + SendMessageA(hwnd, EM_SETSEL, 1, 2); + hr = ITextDocument_Range(doc, 10, 16, &range); + ok(hr == S_OK, "got 0x%08lx\n", hr); + scroll_pos1 = get_scroll_pos_y(hwnd); + hr = ITextRange_Select(range); + ok(hr == S_OK, "got 0x%08lx\n", hr); + scroll_pos2 = get_scroll_pos_y(hwnd); + ok(scroll_pos1 != scroll_pos2, "%d == %d\n", scroll_pos1, scroll_pos2); + release_interfaces(&hwnd, &reOle, &doc, NULL); hr = ITextRange_Select(range);

1 0

Santino Mazza : riched20/tests: When selection is out of view, the scrollbar should move.
by Alexandre Julliard July 28, 2022

July 28, 2022

Module: wine Branch: master Commit: ee131e9eba7dad090f0baf4a73fab2d62dc73b52 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee131e9eba7dad090f0baf4a73fab2… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Tue Jul 19 14:11:27 2022 -0300 riched20/tests: When selection is out of view, the scrollbar should move. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/riched20/tests/editor.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 03c07829ee4..2667e7d3fdc 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5018,6 +5018,24 @@ static void check_EM_SETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); } +/* When the selection is out of the windows view, the scrollbar should move. */ +static void check_EM_SETSEL_multiline(HWND hwnd) +{ + int oldY; + int curY; + const char textwithlines[] = "This is a text\n" + "with lines\n" + "I expect this text\n" + "to be\nlarge\nenough\n"; + + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)textwithlines); + oldY = get_scroll_pos_y(hwnd); + SendMessageA(hwnd, EM_SETSEL, 59, 59); + curY = get_scroll_pos_y(hwnd); + todo_wine + ok(oldY < curY, "oldY %d >= curY %d\n", oldY, curY); +} + static void test_EM_SETSEL(void) { char buffA[32] = {0}; @@ -5058,6 +5076,8 @@ static void test_EM_SETSEL(void) ok(sel_end == 8, "Selection end incorrectly: %d expected 8\n", sel_end); } + check_EM_SETSEL_multiline(hwndRichEdit); + DestroyWindow(hwndRichEdit); }

1 0

Santino Mazza : riched20: Ensure that cursor is visible when selecting text.
by Alexandre Julliard July 28, 2022

July 28, 2022

Module: wine Branch: master Commit: 25209c162fc209124b369abbad55d915d31909b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/25209c162fc209124b369abbad55d9… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Tue Jul 19 14:13:58 2022 -0300 riched20: Ensure that cursor is visible when selecting text. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40444 Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/riched20/editor.c | 1 + dlls/riched20/tests/editor.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 108c37a7f30..57601745ab2 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2142,6 +2142,7 @@ int set_selection( ME_TextEditor *editor, int to, int from ) if (!editor->bHideSelection) ME_InvalidateSelection( editor ); end = set_selection_cursors( editor, to, from ); + editor_ensure_visible( editor, &editor->pCursors[0] ); if (!editor->bHideSelection) ME_InvalidateSelection( editor ); update_caret( editor ); ME_SendSelChange( editor ); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 2667e7d3fdc..1661654aa11 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5032,7 +5032,6 @@ static void check_EM_SETSEL_multiline(HWND hwnd) oldY = get_scroll_pos_y(hwnd); SendMessageA(hwnd, EM_SETSEL, 59, 59); curY = get_scroll_pos_y(hwnd); - todo_wine ok(oldY < curY, "oldY %d >= curY %d\n", oldY, curY); }

1 0

Jeremy White : gitlab: Exclude the MR submitter from reviewers.
by Alexandre Julliard July 28, 2022

July 28, 2022

Module: tools Branch: master Commit: 34b1a84e0ca9f3327d63e78a78382500f7e8f449 URL: https://gitlab.winehq.org/winehq/tools/-/commit/34b1a84e0ca9f3327d63e78a783… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu Jul 28 09:36:09 2022 -0500 gitlab: Exclude the MR submitter from reviewers. Also add a more full featured test mode. --- gitlab/gitlab-to-mail/assign.py | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/gitlab/gitlab-to-mail/assign.py b/gitlab/gitlab-to-mail/assign.py index 4538a701..f5959d7a 100755 --- a/gitlab/gitlab-to-mail/assign.py +++ b/gitlab/gitlab-to-mail/assign.py @@ -10,6 +10,7 @@ import re from urllib.parse import urljoin import fnmatch import requests +import argparse from util import fetch_all, Settings @@ -23,6 +24,12 @@ def empty_record(): } return copy.deepcopy(m) +def add_but_exclude_author(out_ids, out_names, in_ids, in_names, author): + for i in range(len(in_ids)): + if in_names[i] != author: + out_ids.append(in_ids[i]) + out_names.append(in_names[i]) + class Assign: settings = None users = {} @@ -96,7 +103,7 @@ class Assign: r = requests.put(url, headers={"PRIVATE-TOKEN": self.settings.GITLAB_TOKEN}, json={'reviewer_ids': reviewers}) r.raise_for_status() - def get_assignees_from_files(self, files): + def get_assignees_from_files(self, files, author): maintainer_ids = [] people_ids = [] maintainer_names = [] @@ -105,10 +112,8 @@ class Assign: for glob in m['globs']: for f in files: if fnmatch.fnmatch(f, glob): - maintainer_ids = maintainer_ids + m['maintainer_ids'] - maintainer_names = maintainer_names + m['maintainers'] - people_ids = people_ids + m['people_ids'] - people_names = people_names + m['people'] + add_but_exclude_author(maintainer_ids, maintainer_names, m['maintainer_ids'], m['maintainers'], author['name']) + add_but_exclude_author(people_ids, people_names, m['people_ids'], m['people'], author['name']) if len(maintainer_ids) > 0: return maintainer_ids, maintainer_names return people_ids, people_names @@ -129,7 +134,7 @@ class Assign: return ids, names def get_assignees(self, files, author, version): - ids, names = self.get_assignees_from_files(files) + ids, names = self.get_assignees_from_files(files, author) commit_ids, commit_names = self.get_assignees_from_commits(version) return list(set(ids + commit_ids)), list(set(names + commit_names)) @@ -151,9 +156,26 @@ class Assign: def main(argv): """ Debug code; pass in a config file and the names of files you want to test """ - settings = Settings(argv[1]) + parser = argparse.ArgumentParser(description="Debug code to test the assignment code") + parser.add_argument('settings', nargs=1) + parser.add_argument('--author', nargs=1, help='name of the person supposed to have submitted the MR') + parser.add_argument('--committer', action='append', help='repeat to specify multiple committers in our fake MR.') + parser.add_argument('files', nargs='*', help='name of Wine files supposedly in MR to pattern match') + args = parser.parse_args() + settings = Settings(args.settings) + print(args) a = Assign(settings) - ids, names = a.get_assignees_from_files(argv[2:]) + if args.author: + author = { 'name': args.author[0] } + else: + author = { 'name': None } + version = { 'commits' : [] } + if args.committer: + for commit in args.committer: + vcommit = { 'author_name' : commit } + version['commits'].append(vcommit) + print(version) + ids, names = a.get_assignees(args.files, author, version) for i in range(len(ids)): print("{}: {}".format(ids[i], names[i]))

1 0

Jeremy White : gitlab: Use a class for the assignment logic.
by Alexandre Julliard July 28, 2022

July 28, 2022

Module: tools Branch: master Commit: 7792ce8b434654f138bf92d6831484de8fdba82c URL: https://gitlab.winehq.org/winehq/tools/-/commit/7792ce8b434654f138bf92d6831… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Jul 26 15:56:26 2022 -0500 gitlab: Use a class for the assignment logic. This avoids the use of global variables or holding a bunch of state structures and passing them around. This is motivated by the further patch to assign reviewers based on commits in a merge request not by the submitter. --- gitlab/gitlab-to-mail/assign.py | 206 +++++++++++++++++----------------- gitlab/gitlab-to-mail/gitlabtomail.py | 16 +-- 2 files changed, 113 insertions(+), 109 deletions(-)

1 0

Jeremy White : gitlab: Assign extra commit authors as reviewers.
by Alexandre Julliard July 28, 2022

July 28, 2022

Module: tools Branch: master Commit: 6452a67926c0f71aa36f730a9d1943da2a7d4b48 URL: https://gitlab.winehq.org/winehq/tools/-/commit/6452a67926c0f71aa36f730a9d1… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu Jul 28 13:13:51 2022 -0500 gitlab: Assign extra commit authors as reviewers. If a merge request contains commits by authors other than the submitting author, and we can find the commit author in GitLab, ask them to review the merge request as well. --- gitlab/gitlab-to-mail/assign.py | 28 ++++++++++++++++++++++++---- gitlab/gitlab-to-mail/gitlabtomail.py | 2 +- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/gitlab/gitlab-to-mail/assign.py b/gitlab/gitlab-to-mail/assign.py index bd156b2e..4538a701 100755 --- a/gitlab/gitlab-to-mail/assign.py +++ b/gitlab/gitlab-to-mail/assign.py @@ -96,7 +96,7 @@ class Assign: r = requests.put(url, headers={"PRIVATE-TOKEN": self.settings.GITLAB_TOKEN}, json={'reviewer_ids': reviewers}) r.raise_for_status() - def get_assignees(self, files): + def get_assignees_from_files(self, files): maintainer_ids = [] people_ids = [] maintainer_names = [] @@ -113,14 +113,34 @@ class Assign: return maintainer_ids, maintainer_names return people_ids, people_names - def assign_reviewers(self, mr_iid, version, update_db): + def get_assignees_from_commits(self, version): + author_names = [] + for c in version['commits']: + if c['author_name'] != c['committer_name']: + author_names.append(c['committer_name']) + ids = [] + names = [] + for name in set(author_names): + if name in self.user_map: + ids.append(self.user_map[name]) + names.append(name) + else: + print(f"MR includes a commit by {name}, but unable to find a GitLab ID in order to assign as reviewer.") + return ids, names + + def get_assignees(self, files, author, version): + ids, names = self.get_assignees_from_files(files) + commit_ids, commit_names = self.get_assignees_from_commits(version) + return list(set(ids + commit_ids)), list(set(names + commit_names)) + + def assign_reviewers(self, mr_iid, author, version, update_db): paths = [] if 'diffs' not in version: return for d in version['diffs']: if 'new_path' in d: paths.append(d['new_path']) - ids, names = self.get_assignees(paths) + ids, names = self.get_assignees(paths, author, version) if len(ids) > 0: unique_names = list(set(names)) print(f"Asking {unique_names} to review MR {mr_iid}") @@ -133,7 +153,7 @@ def main(argv): """ Debug code; pass in a config file and the names of files you want to test """ settings = Settings(argv[1]) a = Assign(settings) - ids, names = a.get_assignees(argv[2:]) + ids, names = a.get_assignees_from_files(argv[2:]) for i in range(len(ids)): print("{}: {}".format(ids[i], names[i])) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 915392d1..525130e8 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -628,7 +628,7 @@ def process_mr(mr, update_db, assigner): # Assign reviewers if there are none currently if len(mr['reviewers']) == 0: full_version = fetch_mr_version(iid, versions[0]['id']) - assigner.assign_reviewers(iid, full_version, update_db) + assigner.assign_reviewers(iid, mr['author'], full_version, update_db) fixup_date(cover, date) create_headers_from_mr(cover, mr)

1 0

Gabriel Ivăncescu : mshtml: Implement HTMLTitleElement's text property.
by Alexandre Julliard July 27, 2022

July 27, 2022

Module: wine Branch: master Commit: 1381ced8ecbfaa57aa378ab32e94d5aa51873160 URL: https://gitlab.winehq.org/wine/wine/-/commit/1381ced8ecbfaa57aa378ab32e94d5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jul 27 21:33:35 2022 +0300 mshtml: Implement HTMLTitleElement's text property. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlhead.c | 22 ++++++++++++++++++---- dlls/mshtml/tests/dom.js | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index 1bad06ee9d7..786d60ae227 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -103,15 +103,29 @@ static HRESULT WINAPI HTMLTitleElement_Invoke(IHTMLTitleElement *iface, DISPID d static HRESULT WINAPI HTMLTitleElement_put_text(IHTMLTitleElement *iface, BSTR v) { HTMLTitleElement *This = impl_from_IHTMLTitleElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString text; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&text, v); + nsres = nsIDOMNode_SetTextContent(This->element.node.nsnode, &text); + nsAString_Finish(&text); + + return map_nsresult(nsres); } static HRESULT WINAPI HTMLTitleElement_get_text(IHTMLTitleElement *iface, BSTR *p) { HTMLTitleElement *This = impl_from_IHTMLTitleElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString text; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_InitDepend(&text, NULL); + nsres = nsIDOMNode_GetTextContent(This->element.node.nsnode, &text); + return return_nsstr(nsres, &text, p); } static const IHTMLTitleElementVtbl HTMLTitleElementVtbl = { diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 231633b0712..fcbca0f4b2f 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -533,6 +533,24 @@ sync_test("title", function() { elem.title = "test"; ok(elem.title === "test", "div.title = " + elem.title); ok(elem.getAttribute("title") === "test", "title attribute = " + elem.getAttribute("title")); + + var orig = document.title; + document.title = "w i n e test"; + var title = document.getElementsByTagName("title")[0]; + ok(title.text === "w i n e test", "<title> element text = " + title.text); + title.text = "winetest"; + ok(title.text === "winetest", "<title> element text after change = " + title.text); + ok(document.title === "winetest", "document.title after <title> change = " + document.title); + + elem = document.createElement("title"); + ok(elem.text === "", "detached <title> element text = " + elem.text); + elem.text = "foobar"; + ok(elem.text === "foobar", "detached <title> element text after change = " + elem.text); + ok(document.title === "winetest", "document.title after detached <title> change = " + document.title); + + title.parentNode.replaceChild(elem, title); + ok(document.title === "foobar", "document.title after <title> replaced = " + document.title); + document.title = orig; }); sync_test("disabled", function() {

1 0