March 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Move the builtin dll list to virtual.c.
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: wine Branch: master Commit: 8824474e08a1db3e722bb905045b6243834f1486 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8824474e08a1db3e722bb905… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 16 10:58:14 2021 +0100 ntdll: Move the builtin dll list to virtual.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 5 +- dlls/ntdll/unix/loader.c | 227 +++++++++-------------------------------- dlls/ntdll/unix/unix_private.h | 5 +- dlls/ntdll/unix/virtual.c | 162 ++++++++++++++++++++++++++++- dlls/ntdll/unixlib.h | 3 +- 5 files changed, 214 insertions(+), 188 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8824474e08a1db3e722b…

1 0

Francois Gouget : winetest: Fix detecting whether a test can be run or not.
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: wine Branch: master Commit: e618fb526d06ae19306bae88e81e0214fcbd7d85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e618fb526d06ae19306bae88… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 16 10:34:07 2021 +0100 winetest: Fix detecting whether a test can be run or not. Rather than second-guessing the loader, run 'test.exe --list' with the critical-error handler message box disabled and use the resulting exit codes. But keep the activation context and COM code to improve the chances of getting the dll version. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45032 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50783 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 46 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index e203b781dc8..8f80aca9919 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -608,11 +608,12 @@ static void append_path( const char *path) value of WaitForSingleObject. */ static int -run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms, DWORD* pid) +run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms, BOOL nocritical, DWORD* pid) { STARTUPINFOA si; PROCESS_INFORMATION pi; - DWORD wait, status; + DWORD wait, status, flags; + UINT old_errmode; /* Flush to disk so we know which test caused Windows to crash if it does */ if (out_file) @@ -623,14 +624,24 @@ run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms, DWORD* pid) si.hStdInput = GetStdHandle( STD_INPUT_HANDLE ); si.hStdOutput = out_file ? out_file : GetStdHandle( STD_OUTPUT_HANDLE ); si.hStdError = out_file ? out_file : GetStdHandle( STD_ERROR_HANDLE ); + if (nocritical) + { + old_errmode = SetErrorMode(0); + SetErrorMode(old_errmode | SEM_FAILCRITICALERRORS); + flags = 0; + } + else + flags = CREATE_DEFAULT_ERROR_MODE; - if (!CreateProcessA (NULL, cmd, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, + if (!CreateProcessA (NULL, cmd, NULL, NULL, TRUE, flags, NULL, tempdir, &si, &pi)) { + if (nocritical) SetErrorMode(old_errmode); if (pid) *pid = 0; return -2; } + if (nocritical) SetErrorMode(old_errmode); CloseHandle (pi.hThread); if (pid) *pid = pi.dwProcessId; status = wait_process( pi.hProcess, ms ); @@ -716,7 +727,7 @@ get_subtests (const char *tempdir, struct wine_test *test, LPSTR res_name) /* We need to add the path (to the main dll) to PATH */ append_path(test->maindllpath); } - status = run_ex (cmd, subfile, tempdir, 5000, NULL); + status = run_ex (cmd, subfile, tempdir, 5000, TRUE, NULL); err = GetLastError(); if (test->maindllpath) { /* Restore PATH again */ @@ -792,7 +803,7 @@ run_test (struct wine_test* test, const char* subtest, HANDLE out_file, const ch char *cmd = strmake (NULL, "%s %s", test->exename, subtest); report (R_STEP, "Running: %s:%s", test->name, subtest); xprintf ("%s:%s start %s -\n", test->name, subtest, file); - status = run_ex (cmd, out_file, tempdir, 120000, &pid); + status = run_ex (cmd, out_file, tempdir, 120000, FALSE, &pid); heap_free (cmd); xprintf ("%s:%s:%04x done (%d) in %ds\n", test->name, subtest, pid, status, (GetTickCount()-start)/1000); if (status) failures++; @@ -943,12 +954,7 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP } run = TRUE; - if (!dll) - { - xprintf (" %s=dll is missing\n", dllname); - run = FALSE; - } - else + if (dll) { if (is_stub_dll(dllname)) { @@ -967,14 +973,26 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP if (run) { err = get_subtests( tempdir, &wine_tests[nr_of_files], lpszName ); - if (!err) + switch (err) { + case 0: xprintf (" %s=%s\n", dllname, get_file_version(filename)); nr_of_tests += wine_tests[nr_of_files].subtest_count; nr_of_files++; - } - else + break; + case STATUS_DLL_NOT_FOUND: + xprintf (" %s=dll is missing\n", dllname); + break; + case STATUS_ORDINAL_NOT_FOUND: + xprintf (" %s=dll is missing an ordinal (%s)\n", dllname, get_file_version(filename)); + break; + case STATUS_ENTRYPOINT_NOT_FOUND: + xprintf (" %s=dll is missing an entrypoint (%s)\n", dllname, get_file_version(filename)); + break; + default: xprintf (" %s=load error %u\n", dllname, err); + break; + } } if (actctx != INVALID_HANDLE_VALUE)

1 0

Hans Leidekker : msi: Fix building the fusion filename.
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: wine Branch: master Commit: 46424c6196a7b544ff6173d544fc120cc9f804d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46424c6196a7b544ff6173d5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 16 09:47:28 2021 +0100 msi: Fix building the fusion filename. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50809 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 05f122fb545..bf93f3e9afe 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -534,7 +534,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) if (!(filename = msi_alloc(len * sizeof(WCHAR)))) return NULL; lstrcpyW(filename, path); - lstrcpyW(filename, L"\\"); + lstrcatW(filename, L"\\"); lstrcatW(filename, L"fusion.dll"); if (GetFileAttributesW(filename) != INVALID_FILE_ATTRIBUTES) {

1 0

Huw Davies : riched20: Handle sending EN_MSGFILTER notifications in the host.
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: wine Branch: master Commit: c57e98eae9d66b1b6d893a6dcadac57c27670727 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c57e98eae9d66b1b6d893a6d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 16 08:22:49 2021 +0000 riched20: Handle sending EN_MSGFILTER notifications in the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 57 ++----------------------------------------------- dlls/riched20/txthost.c | 40 ++++++++++++++++++++++++++++++++-- 2 files changed, 40 insertions(+), 57 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 559ed88ea33..6f38231de9b 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2384,28 +2384,6 @@ static BOOL copy_or_cut( ME_TextEditor *editor, BOOL cut ) return SUCCEEDED( hr ); } -/* helper to send a msg filter notification */ -static BOOL -ME_FilterEvent(ME_TextEditor *editor, UINT msg, WPARAM* wParam, LPARAM* lParam) -{ - MSGFILTER msgf; - - if (!editor->hWnd || !editor->hwndParent) return FALSE; - msgf.nmhdr.hwndFrom = editor->hWnd; - msgf.nmhdr.idFrom = GetWindowLongW(editor->hWnd, GWLP_ID); - msgf.nmhdr.code = EN_MSGFILTER; - msgf.msg = msg; - msgf.wParam = *wParam; - msgf.lParam = *lParam; - if (SendMessageW(editor->hwndParent, WM_NOTIFY, msgf.nmhdr.idFrom, (LPARAM)&msgf)) - return FALSE; - *wParam = msgf.wParam; - *lParam = msgf.lParam; - msgf.wParam = *wParam; - - return TRUE; -} - static void ME_UpdateSelectionLinkAttribute(ME_TextEditor *editor) { ME_Paragraph *start_para, *end_para; @@ -4132,9 +4110,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_LBUTTONDOWN: { ME_CommitUndo(editor); /* End coalesced undos for typed characters */ - if ((editor->nEventMask & ENM_MOUSEEVENTS) && - !ME_FilterEvent(editor, msg, &wParam, &lParam)) - return 0; ITextHost_TxSetFocus(editor->texthost); ME_LButtonDown(editor, (short)LOWORD(lParam), (short)HIWORD(lParam), ME_CalculateClickCount(editor, msg, wParam, lParam)); @@ -4145,9 +4120,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, break; } case WM_MOUSEMOVE: - if ((editor->nEventMask & ENM_MOUSEEVENTS) && - !ME_FilterEvent(editor, msg, &wParam, &lParam)) - return 0; if (editor->bMouseCaptured) ME_MouseMove(editor, (short)LOWORD(lParam), (short)HIWORD(lParam)); else @@ -4163,9 +4135,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } if (editor->nSelectionType == stDocument) editor->nSelectionType = stPosition; - if ((editor->nEventMask & ENM_MOUSEEVENTS) && - !ME_FilterEvent(editor, msg, &wParam, &lParam)) - return 0; else { ME_SetCursor(editor); @@ -4176,9 +4145,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_RBUTTONDOWN: case WM_RBUTTONDBLCLK: ME_CommitUndo(editor); /* End coalesced undos for typed characters */ - if ((editor->nEventMask & ENM_MOUSEEVENTS) && - !ME_FilterEvent(editor, msg, &wParam, &lParam)) - return 0; ME_LinkNotify(editor, msg, wParam, lParam); goto do_default; case WM_CONTEXTMENU: @@ -4206,22 +4172,11 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_COMMAND: TRACE("editor wnd command = %d\n", LOWORD(wParam)); return 0; - case WM_KEYUP: - if ((editor->nEventMask & ENM_KEYEVENTS) && - !ME_FilterEvent(editor, msg, &wParam, &lParam)) - return 0; - goto do_default; case WM_KEYDOWN: - if ((editor->nEventMask & ENM_KEYEVENTS) && - !ME_FilterEvent(editor, msg, &wParam, &lParam)) - return 0; if (ME_KeyDown(editor, LOWORD(wParam))) return 0; goto do_default; case WM_CHAR: - if ((editor->nEventMask & ENM_KEYEVENTS) && - !ME_FilterEvent(editor, msg, &wParam, &lParam)) - return 0; return handle_wm_char( editor, wParam, lParam ); case WM_UNICHAR: if (unicode) @@ -4328,16 +4283,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case WM_MOUSEWHEEL: { - int delta; - BOOL ctrl_is_down; - - if ((editor->nEventMask & ENM_MOUSEEVENTS) && - !ME_FilterEvent(editor, msg, &wParam, &lParam)) - return 0; - - ctrl_is_down = GetKeyState(VK_CONTROL) & 0x8000; - - delta = GET_WHEEL_DELTA_WPARAM(wParam); + int delta = GET_WHEEL_DELTA_WPARAM( wParam ); + BOOL ctrl_is_down = GetKeyState( VK_CONTROL ) & 0x8000; /* if scrolling changes direction, ignore left overs */ if ((delta < 0 && editor->wheel_remain < 0) || diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index d10b303a137..a8286905659 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -38,10 +38,10 @@ struct host LONG ref; ITextServices *text_srv; ME_TextEditor *editor; /* to be removed */ - HWND window; + HWND window, parent; BOOL emulate_10; PARAFORMAT2 para_fmt; - DWORD props, scrollbars; + DWORD props, scrollbars, event_mask; }; static const ITextHostVtbl textHostVtbl; @@ -82,6 +82,7 @@ struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) texthost->ITextHost_iface.lpVtbl = &textHostVtbl; texthost->ref = 1; texthost->window = hwnd; + texthost->parent = cs->hwndParent; texthost->emulate_10 = emulate_10; memset( &texthost->para_fmt, 0, sizeof(texthost->para_fmt) ); texthost->para_fmt.cbSize = sizeof(texthost->para_fmt); @@ -93,6 +94,7 @@ struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) texthost->para_fmt.wAlignment = PFA_CENTER; texthost->editor = NULL; host_init_props( texthost ); + texthost->event_mask = 0; return texthost; } @@ -842,6 +844,26 @@ static HRESULT set_options( struct host *host, DWORD op, DWORD value, LRESULT *r return hr; } +static LRESULT send_msg_filter( struct host *host, UINT msg, WPARAM *wparam, LPARAM *lparam ) +{ + MSGFILTER msgf; + LRESULT res; + + if (!host->parent) return 0; + msgf.nmhdr.hwndFrom = host->window; + msgf.nmhdr.idFrom = GetWindowLongW( host->window, GWLP_ID ); + msgf.nmhdr.code = EN_MSGFILTER; + msgf.msg = msg; + msgf.wParam = *wparam; + msgf.lParam = *lparam; + if ((res = SendMessageW( host->parent, WM_NOTIFY, msgf.nmhdr.idFrom, (LPARAM)&msgf ))) + return res; + *wparam = msgf.wParam; + *lparam = msgf.lParam; + + return 0; +} + static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL unicode ) { @@ -866,6 +888,15 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, else return DefWindowProcW( hwnd, msg, wparam, lparam ); } + if ((((host->event_mask & ENM_KEYEVENTS) && msg >= WM_KEYFIRST && msg <= WM_KEYLAST) || + ((host->event_mask & ENM_MOUSEEVENTS) && msg >= WM_MOUSEFIRST && msg <= WM_MOUSELAST)) && + send_msg_filter( host, msg, &wparam, &lparam )) + { + TRACE( "exit (filtered) hwnd %p msg %04x (%s) %lx %lx -> %lu\n", + hwnd, msg, get_msg_name(msg), wparam, lparam, res ); + return res; + } + editor = host->editor; switch (msg) { @@ -1042,6 +1073,11 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, res = len; break; } + case EM_SETEVENTMASK: + host->event_mask = lparam; + hr = ITextServices_TxSendMessage( host->text_srv, msg, wparam, lparam, &res ); + break; + case EM_SETOPTIONS: hr = set_options( host, wparam, lparam, &res ); break;

1 0

Huw Davies : riched20: Use the multiline property rather than style.
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: wine Branch: master Commit: 1cf8fea7a7ab3fe83b06b2b41c92fb7d870e21ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cf8fea7a7ab3fe83b06b2b4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 16 08:22:48 2021 +0000 riched20: Use the multiline property rather than style. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 4 ++-- dlls/riched20/editor.c | 20 ++++++-------------- dlls/riched20/paint.c | 4 ++-- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 6417bbde442..96765cba25d 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -99,7 +99,7 @@ int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how) length = ME_GetTextLength(editor); - if ((editor->styleFlags & ES_MULTILINE) + if ((editor->props & TXTBIT_MULTILINE) && (how->flags & GTL_USECRLF) && !editor->bEmulateVersion10) /* Ignore GTL_USECRLF flag in 1.0 emulation */ length += editor->nParagraphs - 1; @@ -549,7 +549,7 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, int eol_len = 0; /* Check if new line is allowed for this control */ - if (!(editor->styleFlags & ES_MULTILINE)) + if (!(editor->props & TXTBIT_MULTILINE)) break; /* Find number of CR and LF in end of paragraph run */ diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b7c07058801..559ed88ea33 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2461,7 +2461,7 @@ static BOOL handle_enter(ME_TextEditor *editor) } } - if (editor->styleFlags & ES_MULTILINE) + if (editor->props & TXTBIT_MULTILINE) { ME_Cursor cursor = editor->pCursors[0]; ME_Paragraph *para = cursor.para; @@ -3118,15 +3118,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) if (ed->props & TXTBIT_USEPASSWORD) ITextHost_TxGetPasswordChar(texthost, &ed->cPasswordMask); - if (ed->props & TXTBIT_MULTILINE) { - ed->styleFlags |= ES_MULTILINE; - ed->bWordWrap = (ed->props & TXTBIT_WORDWRAP) != 0; - } else { - ed->bWordWrap = FALSE; - } - - if (ed->props & TXTBIT_DISABLEDRAG) - ed->styleFlags |= ES_NOOLEDRAGDROP; + ed->bWordWrap = (ed->props & TXTBIT_WORDWRAP) && (ed->props & TXTBIT_MULTILINE); ed->notified_cr.cpMin = ed->notified_cr.cpMax = 0; @@ -3435,7 +3427,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if (lParam) editor->bDialogMode = TRUE; - if (editor->styleFlags & ES_MULTILINE) + if (editor->props & TXTBIT_MULTILINE) code |= DLGC_WANTMESSAGE; if (!(editor->props & TXTBIT_SAVESELECTION)) code |= DLGC_HASSETSEL; @@ -3784,7 +3776,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_LINESCROLL: { - if (!(editor->styleFlags & ES_MULTILINE)) + if (!(editor->props & TXTBIT_MULTILINE)) return FALSE; ME_ScrollDown( editor, lParam * get_default_line_height( editor ) ); return TRUE; @@ -4579,7 +4571,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case EM_SETTARGETDEVICE: if (wParam == 0) { - BOOL new = (lParam == 0 && (editor->styleFlags & ES_MULTILINE)); + BOOL new = (lParam == 0 && (editor->props & TXTBIT_MULTILINE)); if (editor->nAvailWidth || editor->bWordWrap != new) { editor->bWordWrap = new; @@ -4588,7 +4580,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } } else { int width = max(0, lParam); - if ((editor->styleFlags & ES_MULTILINE) && + if ((editor->props & TXTBIT_MULTILINE) && (!editor->bWordWrap || editor->nAvailWidth != width)) { editor->nAvailWidth = width; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 34d0ab8a54f..8ef5ada5855 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1086,7 +1086,7 @@ void ME_ScrollAbs(ME_TextEditor *editor, int x, int y) bScrollBarIsVisible = (winStyle & WS_VSCROLL) != 0; bScrollBarWillBeVisible = (editor->nTotalLength > editor->sizeWindow.cy && (editor->scrollbars & WS_VSCROLL) - && (editor->styleFlags & ES_MULTILINE)) + && (editor->props & TXTBIT_MULTILINE)) || (editor->scrollbars & ES_DISABLENOSCROLL); if (bScrollBarIsVisible != bScrollBarWillBeVisible) ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, @@ -1211,7 +1211,7 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) /* Update vertical scrollbar */ bScrollBarWasVisible = editor->vert_si.nMax > editor->vert_si.nPage; bScrollBarWillBeVisible = editor->nTotalLength > editor->sizeWindow.cy && - (editor->styleFlags & ES_MULTILINE); + (editor->props & TXTBIT_MULTILINE); if (editor->vert_si.nPos && !bScrollBarWillBeVisible) {

1 0

Huw Davies : riched20: Handle the read-only property setting in the host.
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: wine Branch: master Commit: 8544242f43b5eeeb9f74ed112bca726e42de1d7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8544242f43b5eeeb9f74ed11… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 16 08:22:45 2021 +0000 riched20: Handle the read-only property setting in the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 49 ++++++++++++++++-------------------- dlls/riched20/editstr.h | 1 + dlls/riched20/txthost.c | 67 ++++++++++++++++++++++++++++++++++++++++--------- dlls/riched20/txtsrv.c | 9 ++++--- 4 files changed, 83 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8544242f43b5eeeb9f74…

1 0

Alexandre Julliard : ntdll: Add a helper for mapping a PE image.
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: wine Branch: master Commit: 9e38a6800178ee2da39e265340660a36a82e3407 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e38a6800178ee2da39e2653… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 16 11:01:19 2021 +0100 ntdll: Add a helper for mapping a PE image. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 210 +++++++++++++++++++++++++++++----------------- 1 file changed, 131 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9e38a6800178ee2da39e…

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_set_viewports().
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: wine Branch: master Commit: da7a9bd8115cf16dc4757285a3043c399acd3e01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da7a9bd8115cf16dc4757285… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 16 00:42:19 2021 -0500 wined3d: Introduce wined3d_device_context_set_viewports(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 32 ++++++++++++++++++++++++-------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 62a3e990cf1..6e9afb8468d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1681,7 +1681,6 @@ void CDECL wined3d_device_set_base_vertex_index(struct wined3d_device *device, I void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned int viewport_count, const struct wined3d_viewport *viewports) { - struct wined3d_state *state = device->cs->c.state; unsigned int i; TRACE("device %p, viewport_count %u, viewports %p.\n", device, viewport_count, viewports); @@ -1692,13 +1691,7 @@ void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned viewports[i].width, viewports[i].height, viewports[i].min_z, viewports[i].max_z); } - if (viewport_count) - memcpy(state->viewports, viewports, viewport_count * sizeof(*viewports)); - else - memset(state->viewports, 0, sizeof(state->viewports)); - state->viewport_count = viewport_count; - - wined3d_device_context_emit_set_viewports(&device->cs->c, viewport_count, viewports); + wined3d_device_context_set_viewports(&device->cs->c, viewport_count, viewports); } void CDECL wined3d_device_get_viewports(const struct wined3d_device *device, unsigned int *viewport_count, @@ -2157,6 +2150,29 @@ void CDECL wined3d_device_context_set_rasterizer_state(struct wined3d_device_con wined3d_rasterizer_state_decref(prev); } +void CDECL wined3d_device_context_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, + const struct wined3d_viewport *viewports) +{ + struct wined3d_state *state = context->state; + unsigned int i; + + TRACE("context %p, viewport_count %u, viewports %p.\n", context, viewport_count, viewports); + + for (i = 0; i < viewport_count; ++i) + { + TRACE("%u: x %.8e, y %.8e, w %.8e, h %.8e, min_z %.8e, max_z %.8e.\n", i, viewports[i].x, viewports[i].y, + viewports[i].width, viewports[i].height, viewports[i].min_z, viewports[i].max_z); + } + + if (viewport_count) + memcpy(state->viewports, viewports, viewport_count * sizeof(*viewports)); + else + memset(state->viewports, 0, sizeof(state->viewports)); + state->viewport_count = viewport_count; + + wined3d_device_context_emit_set_viewports(context, viewport_count, viewports); +} + void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { TRACE("device %p, shader %p.\n", device, shader); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3fe3e0cfd89..8fc190b73ba 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -171,6 +171,7 @@ @ cdecl wined3d_device_context_set_depth_stencil_state(ptr ptr long) @ cdecl wined3d_device_context_set_rasterizer_state(ptr ptr) @ cdecl wined3d_device_context_set_shader(ptr long ptr) +@ cdecl wined3d_device_context_set_viewports(ptr long ptr) @ cdecl wined3d_output_find_closest_matching_mode(ptr ptr) @ cdecl wined3d_output_get_adapter(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3c091263742..f3de0098ef3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2558,6 +2558,8 @@ void __cdecl wined3d_device_context_set_rasterizer_state(struct wined3d_device_c struct wined3d_rasterizer_state *rasterizer_state); void __cdecl wined3d_device_context_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type, struct wined3d_shader *shader); +void __cdecl wined3d_device_context_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, + const struct wined3d_viewport *viewports); HRESULT __cdecl wined3d_output_find_closest_matching_mode(const struct wined3d_output *output, struct wined3d_display_mode *mode);

1 0

Francois Gouget : winetest: Remove support for CVS revisions.
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: tools Branch: master Commit: 42611d95714554152eee990b5cd22167e0615c71 URL: https://source.winehq.org/git/tools.git/?a=commit;h=42611d95714554152eee990… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 16 12:15:45 2021 +0100 winetest: Remove support for CVS revisions. Don't expect them in the WineTest reports and don't store them in the per-report summary.txt files. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 28 ++++++++++++++-------------- winetest/gather | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index dbbbe6b..4f0e95b 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -239,11 +239,11 @@ open IN, "<:raw", $report or mydie "could not open '$report' for reading: $!"; # summary.txt file format: # Version <version> -# - <dll> - missing - - - - - -# - <dll> - skipped - - - - - -# - <dll> <unit> skipped - - - <source> <rev> -# - <dll> <unit> failed (258|crash) - - <source> <rev> -# - <dll> <unit> <total> <todo> <failures> <skipped> <source> <rev> +# - <dll> - missing - - - - +# - <dll> - skipped - - - - +# - <dll> <unit> skipped - - - <source> +# - <dll> <unit> failed (258|crash) - - <source> +# - <dll> <unit> <total> <todo> <failures> <skipped> <source> open SUM, ">$tmpdir/summary.txt" or mydie "could not open '$tmpdir/summary.txt' for writing: $!"; my $line = <IN> || ""; @@ -431,11 +431,11 @@ while ($line = <IN> || "") # For compatibility with old WineTest versions $info =~ /^(?:failed|unknown|version not available)$/) { - print SUM "- $dll - missing - - - - -\n"; + print SUM "- $dll - missing - - - -\n"; } elsif ($info eq "skipped") { - print SUM "- $dll - skipped - - - - -\n"; + print SUM "- $dll - skipped - - - -\n"; mydie "too many dlls skipped by user request (>$maxuserskips at $dll)" if ++$skipped_units > $maxuserskips; } } @@ -445,7 +445,7 @@ while ($line = <IN> || "") # Parse the tests output # -my ($dll, $unit, $units_re, $source, $rev, $result) = ("", "", "", ""); +my ($dll, $unit, $units_re, $source, $result) = ("", "", "", ""); my $unitsize = 0; my %units; my ($failures, $todo, $skipped) = (0, 0, 0); @@ -570,7 +570,7 @@ sub close_test_unit($) $failures += $extra_failures; $summary = "$s_total $todo $failures $skipped" if (!defined $summary); - print SUM "- $dll $unit $summary $source $rev\n"; + print SUM "- $dll $unit $summary $source\n"; if ($failures && ++$failed_units > $maxfailedtests) { mydie "too many failed test units (>$maxfailedtests at $dll:$unit)"; } @@ -591,14 +591,14 @@ while ($line = <IN>) { next if ($line =~ /^\s*$/); # empty lines have no impact chomp $line; $line =~ s/\r+$//; - if ($line =~ m%^([_.a-z0-9-]+):([_a-z0-9]+) (start|skipped) (-|[/_.a-z0-9-]+) (-|[.0-9a-f]+)$%) + if ($line =~ m%^([_.a-z0-9-]+):([_a-z0-9]+) (start|skipped) (-|[/_.a-z0-9-]+)%) { - my ($l_dll, $l_unit, $l_type, $l_source, $l_rev) = ($1, $2, $3, $4, $5); + my ($l_dll, $l_unit, $l_type, $l_source) = ($1, $2, $3, $4); # Close the previous test unit close_test_unit(0) if ($dll ne ""); - ($dll, $unit, $source, $rev) = ($l_dll, $l_unit, $l_source, $l_rev); + ($dll, $unit, $source) = ($l_dll, $l_unit, $l_source); %units = ($unit => 1); $units_re = $unit; @@ -606,7 +606,7 @@ while ($line = <IN>) { if ($l_type eq "skipped") { add_test_line("skipped", "Skipped by user request"); - print SUM "- $dll $unit skipped - - - $source $rev\n"; + print SUM "- $dll $unit skipped - - - $source\n"; mydie "too many test units skipped by user request (>$maxuserskips at $dll:$unit)" if ++$skipped_units > $maxuserskips; $rc = 0; } @@ -771,7 +771,7 @@ while ($line = <IN>) { # Then switch to the new test unit, not for the past lines, but for # those before the next 'start' line. This 'new' test unit may have # inconsistent results too. - ($dll, $unit, $source, $rev) = ($l_dll, $l_unit, "-", "-"); + ($dll, $unit, $source) = ($l_dll, $l_unit, "-"); %units = ($unit => 1); $units_re = $unit; $broken = 1; diff --git a/winetest/gather b/winetest/gather index 392e8e6..a0b259b 100755 --- a/winetest/gather +++ b/winetest/gather @@ -312,7 +312,7 @@ foreach my $file (glob "$builddir/*/summary.txt") { while (<TEST>) { next if /^Archive: /; my ($dummy, $dll, $unit, $count, $todos, $errors, $skips, - $source, $rev) = split; + $source) = split; my $testname = "$dll:$unit"; if ($count eq "missing")

1 0

Francois Gouget : testbot/LibvirtTool: Always shut down for '-off' snapshots.
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: tools Branch: master Commit: b22f79a59d9a04f70a9a5c9b66570a85927cf072 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b22f79a59d9a04f70a9a5c9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 16 12:13:25 2021 +0100 testbot/LibvirtTool: Always shut down for '-off' snapshots. Snapshots with a name ending in '-off' request that the VM be cleanly shut down if possible rather than summarily powered off. So check the domain's current snapshot and do a clean shutdown before powering off for every operation, including checkoff, monitor and revert. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 118 +++++++++++++++++++++++++++------------------ 1 file changed, 72 insertions(+), 46 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index f135b9b..c4dbffb 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -257,6 +257,66 @@ sub ChangeStatus($$;$) return 0; } +sub ShutDown() +{ + my $Domain = $VM->GetDomain(); + my $CurrentSnapshot = $Domain->GetSnapshotName(); + if (!defined $CurrentSnapshot or $CurrentSnapshot !~ /-off$/ or + !$Domain->IsPoweredOn()) + { + return 1; + } + + Debug(Elapsed($Start), " Performing a clean shutdown of $VMKey $CurrentSnapshot\n"); + LogMsg "Performing a clean shutdown of $VMKey $CurrentSnapshot\n"; + + # Use SetTime() to detect if privileged operations are allowed. + my $TA = $VM->GetAgent(); + if (!$TA->SetTime()) + { + # Not a fatal error. Try the next port in case the VM runs a privileged + # TestAgentd daemon there. + $TA->Disconnect(); + $TA = $VM->GetAgent(1); + if (!$TA->SetTime()) + { + Error "Unable to get a privileged TestAgent: ". $TA->GetLastError() ."\n"; + $TA->Disconnect(); + return 0; + } + } + + my $Success = 1; + my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ? + ["shutdown.exe", "/p", "/d", "00:00"] : + ["/sbin/shutdown", "--poweroff", "now"]; + Debug(Elapsed($Start), " Running @$Cmd\n"); + if (!$TA->Run($Cmd, 0)) + { + Error "Could not run @$Cmd: ". $TA->GetLastError() ."\n"; + $Success = 0; + } + else + { + Debug(Elapsed($Start), " Waiting for the VM to power off\n"); + my $Deadline = time() + $WaitForShutdown; + while ($Domain->IsPoweredOn()) + { + if (time() >= $Deadline) + { + Error "Timed out waiting for $VMKey to perform a clean shutdown. Forcefully shutting down now...\n"; + $Success = 0; + last; + } + sleep(1); + } + } + $TA->Disconnect(); + Debug(Elapsed($Start), " Successfully shut down $VMKey\n"); + LogMsg "Successfully shut down $VMKey\n"; + return $Success; +} + sub Monitor() { # Still try recovering the VM in case of repeated errors, but space out @@ -301,6 +361,9 @@ sub Monitor() my $IsReady = $VM->GetDomain()->IsReady(); if ($IsReady and $VM->GetDomain()->IsPoweredOn()) { + # Try to perform a clean shutdown if requested + ShutDown(); + my $ErrMessage = $VM->GetDomain()->PowerOff(); if (defined $ErrMessage) { @@ -324,55 +387,12 @@ sub Monitor() sub PowerOff() { - my $Domain = $VM->GetDomain(); - if ($VM->IdleSnapshot =~ /-off$/ and $Domain->IsPoweredOn()) - { - # Attempt to perform a clean shutdown. - # Use SetTime() to detect if privileged operations are allowed. - my $TA = $VM->GetAgent(); - if (!$TA->SetTime()) - { - # Not a fatal error. Try the next port in case the VM runs a privileged - # TestAgentd daemon there. - $TA->Disconnect(); - $TA = $VM->GetAgent(1); - if (!$TA->SetTime()) - { - Error "Unable to get a privileged TestAgent: ". $TA->GetLastError() ."\n"; - $TA->Disconnect(); - $TA = undef; - } - } - if ($TA) - { - my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ? - ["shutdown.exe", "/p", "/d", "00:00"] : - ["/sbin/shutdown", "--poweroff", "now"]; - Debug(Elapsed($Start), " Running @$Cmd\n"); - if (!$TA->Run($Cmd, 0)) - { - Error "Could not run @$Cmd: ". $TA->GetLastError() ."\n"; - } - else - { - Debug(Elapsed($Start), " Waiting for the VM to power off\n"); - my $Deadline = time() + $WaitForShutdown; - while ($Domain->IsPoweredOn()) - { - if (time() >= $Deadline) - { - Error "Timed out waiting for ". $VM->Name ." to perform a clean shutdown. Forcefully shutting down now...\n"; - last; - } - sleep(1); - } - } - } - } + # Try to perform a clean shutdown if requested + ShutDown(); # Power off the VM no matter what its initial status is $CurrentStatus = $VM->Status; - my $ErrMessage = $Domain->PowerOff(); + my $ErrMessage = $VM->GetDomain()->PowerOff(); FatalError("$ErrMessage\n") if (defined $ErrMessage); return ChangeStatus(undef, "off", "done"); @@ -407,6 +427,9 @@ sub CheckOff() FatalError("$ErrMessage\n") if (defined $ErrMessage); if ($SnapshotName eq $VM->IdleSnapshot) { + # Try to perform a clean shutdown if requested + ShutDown(); + my $ErrMessage = $VM->GetDomain()->PowerOff(); FatalError("$ErrMessage\n") if (defined $ErrMessage); } @@ -584,6 +607,9 @@ sub Revert() $VM->Save(); } + # Before reverting, try to perform a clean shutdown if requested + ShutDown(); + # Revert the VM (and power it on if necessary) Debug(Elapsed($Start), " Reverting $VMKey to $DomainSnapshot\n"); my ($ErrMessage, $Booting) = $Domain->RevertToSnapshot($DomainSnapshot);

1 0