December 2021 - Wine-Commits

Huw Davies : riched20: Defer releasing the host if inside a notify callback.
by Alexandre Julliard Dec. 14, 2021

Dec. 14, 2021

Module: wine Branch: master Commit: 8138159f20d6453443861570689e0f14018051da URL: https://source.winehq.org/git/wine.git/?a=commit;h=8138159f20d6453443861570… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 14 07:36:13 2021 +0000 riched20: Defer releasing the host if inside a notify callback. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51521 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/txthost.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index af4d37d9fd2..82a3db8f0b6 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -44,11 +44,13 @@ struct host unsigned int client_edge : 1; unsigned int use_set_rect : 1; unsigned int use_back_colour : 1; + unsigned int defer_release : 1; PARAFORMAT2 para_fmt; DWORD props, scrollbars, event_mask; RECT client_rect, set_rect; COLORREF back_colour; WCHAR password_char; + unsigned int notify_level; }; static const ITextHost2Vtbl textHostVtbl; @@ -118,6 +120,8 @@ struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) GetClientRect( hwnd, &texthost->client_rect ); texthost->use_back_colour = 0; texthost->password_char = (texthost->props & TXTBIT_USEPASSWORD) ? '*' : 0; + texthost->defer_release = 0; + texthost->notify_level = 0; return texthost; } @@ -1098,12 +1102,24 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, if ((((host->event_mask & ENM_KEYEVENTS) && msg >= WM_KEYFIRST && msg <= WM_KEYLAST) || ((host->event_mask & ENM_MOUSEEVENTS) && msg >= WM_MOUSEFIRST && msg <= WM_MOUSELAST) || - ((host->event_mask & ENM_SCROLLEVENTS) && msg >= WM_HSCROLL && msg <= WM_VSCROLL)) && - send_msg_filter( host, msg, &wparam, &lparam )) + ((host->event_mask & ENM_SCROLLEVENTS) && msg >= WM_HSCROLL && msg <= WM_VSCROLL))) { - TRACE( "exit (filtered) hwnd %p msg %04x (%s) %lx %lx -> %lu\n", - hwnd, msg, get_msg_name(msg), wparam, lparam, res ); - return res; + host->notify_level++; + res = send_msg_filter( host, msg, &wparam, &lparam ); + if (!--host->notify_level && host->defer_release) + { + TRACE( "exit (filtered deferred release) hwnd %p msg %04x (%s) %lx %lx -> 0\n", + hwnd, msg, get_msg_name(msg), wparam, lparam ); + ITextHost2_Release( &host->ITextHost_iface ); + return 0; + } + + if (res) + { + TRACE( "exit (filtered %lu) hwnd %p msg %04x (%s) %lx %lx -> 0\n", + res, hwnd, msg, get_msg_name(msg), wparam, lparam ); + return 0; + } } switch (msg) @@ -1139,7 +1155,8 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, break; } case WM_DESTROY: - ITextHost2_Release( &host->ITextHost_iface ); + if (!host->notify_level) ITextHost2_Release( &host->ITextHost_iface ); + else host->defer_release = 1; return 0; case WM_ERASEBKGND:

1 0

Nikolay Sivov : mfplat/tests: Fix test crash on old Windows 10 systems.
by Alexandre Julliard Dec. 14, 2021

Dec. 14, 2021

Module: wine Branch: master Commit: 77f596659682859487032cd5d145277c0944e1a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77f596659682859487032cd5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 14 11:10:21 2021 +0300 mfplat/tests: Fix test crash on old Windows 10 systems. MFCreateDXGISurfaceBuffer() rejects unsupported riid argument. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52166 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 06547dba3f4..33b93852e2a 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6867,7 +6867,12 @@ static void test_d3d12_surface_buffer(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = pMFCreateDXGISurfaceBuffer(&IID_ID3D12Resource, (IUnknown *)resource, 0, FALSE, &buffer); + if (hr == E_INVALIDARG) + { todo_wine + win_skip("D3D12 resource buffers are not supported.\n"); + goto notsupported; + } ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); if (SUCCEEDED(hr)) @@ -6888,6 +6893,8 @@ if (SUCCEEDED(hr)) IMFDXGIBuffer_Release(dxgi_buffer); IMFMediaBuffer_Release(buffer); } + +notsupported: ID3D12Resource_Release(resource); refcount = ID3D12Device_Release(device); ok(!refcount, "Unexpected device refcount %u.\n", refcount);

1 0

Nikolay Sivov : mfplat/tests: Use CRT allocation functions.
by Alexandre Julliard Dec. 14, 2021

Dec. 14, 2021

Module: wine Branch: master Commit: 6f8debb11f22db4f96059e7cc0cf962031fed5bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f8debb11f22db4f96059e7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 14 09:49:17 2021 +0300 mfplat/tests: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 4dfdc18bb52..baac5ceffae 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -38,7 +38,6 @@ #include "evr.h" #include "wine/test.h" -#include "wine/heap.h" #define D3D11_INIT_GUID #include "initguid.h" @@ -4201,7 +4200,7 @@ static void test_attributes_serialization(void) ok(hr == S_OK, "Failed to get blob size, hr %#x.\n", hr); ok(size == 8, "Got size %u.\n", size); - buffer = heap_alloc(size); + buffer = malloc(size); hr = MFGetAttributesAsBlob(attributes, buffer, size); ok(hr == S_OK, "Failed to serialize, hr %#x.\n", hr); @@ -4223,7 +4222,7 @@ static void test_attributes_serialization(void) ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); ok(count == 0, "Unexpected count %u.\n", count); - heap_free(buffer); + free(buffer); /* Set some attributes of various types. */ IMFAttributes_SetUINT32(attributes, &MF_MT_MAJOR_TYPE, 456); @@ -4238,12 +4237,12 @@ static void test_attributes_serialization(void) ok(hr == S_OK, "Failed to get blob size, hr %#x.\n", hr); ok(size > 8, "Got unexpected size %u.\n", size); - buffer = heap_alloc(size); + buffer = malloc(size); hr = MFGetAttributesAsBlob(attributes, buffer, size); ok(hr == S_OK, "Failed to serialize, hr %#x.\n", hr); hr = MFInitAttributesFromBlob(dest, buffer, size); ok(hr == S_OK, "Failed to deserialize, hr %#x.\n", hr); - heap_free(buffer); + free(buffer); hr = IMFAttributes_GetUINT32(dest, &MF_MT_MAJOR_TYPE, &value32); ok(hr == S_OK, "Failed to get get uint32 value, hr %#x.\n", hr);

1 0

Nikolay Sivov : mfplat/tests: Allocate test callbacks.
by Alexandre Julliard Dec. 14, 2021

Dec. 14, 2021

Module: wine Branch: master Commit: 4b69a997e933be3813393b5023f99171935ff36e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b69a997e933be3813393b50… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 14 09:49:18 2021 +0300 mfplat/tests: Allocate test callbacks. It's not safe to use stack variables for async callbacks. Diagnosed by Bernhard Übelacker. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 178 ++++++++++++++++++++++++++------------------- 1 file changed, 104 insertions(+), 74 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4b69a997e933be381339…

1 0

Roberto Pungartnik : po: Update Brazilian Portuguese translation.
by Alexandre Julliard Dec. 13, 2021

Dec. 13, 2021

Module: wine Branch: master Commit: cf823cefd43d7966989c4f13eba1979e602bdb48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf823cefd43d7966989c4f13… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Sun Dec 12 16:30:28 2021 -0300 po: Update Brazilian Portuguese translation. Signed-off-by: Roberto Pungartnik <rpungartnik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 21a21850893..a7de7ae0bbe 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.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: 2021-09-11 12:32-0300\n" +"PO-Revision-Date: 2021-12-12 12:11-0300\n" "Last-Translator: Roberto Augusto Pungartnik <rpungartnik(a)gmail.com>\n" "Language-Team: Portuguese (Brazil)\n" "Language: pt_BR\n" @@ -3721,30 +3721,24 @@ msgid "&Disable" msgstr "&Desativar" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy -#| msgid "Reset" msgid "&Reset" -msgstr "Reiniciar" +msgstr "&Reiniciar" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" msgstr "&Habilitar" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "Editar Substituição" +msgstr "S&obrescrever" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" msgstr "Conectado" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "Entrada de voz:" +msgstr "Conectado (dispositivo xinput)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" @@ -10402,7 +10396,7 @@ msgstr "Horário de verão de Cabo Verde" #: dlls/tzres/tzres.rc:92 msgid "(UTC-01:00) Cabo Verde Is." -msgstr "(UTC-01:00) Ilha de Cabo Verde" +msgstr "(UTC-01:00) Ilha de Cabo Verde." #: dlls/tzres/tzres.rc:183 msgid "Haiti Standard Time" @@ -13272,13 +13266,11 @@ msgstr "" #: programs/chcp.com/chcp.rc:28 msgid "Active code page: %1!u!\n" -msgstr "" +msgstr "Página de código ativa: %1!u!\n" #: programs/chcp.com/chcp.rc:29 -#, fuzzy -#| msgid "Invalid message.\n" msgid "Invalid code page\n" -msgstr "Mensagem inválida.\n" +msgstr "Página de código inválida.\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -13291,6 +13283,14 @@ msgid "" " Type CHCP without a number to display the active console code page.\n" "\n" msgstr "" +"CHCP [número]\n" +"\n" +" Configura ou apresenta a página de código ativa do console.\n" +"\n" +" número Página de código do console para ativar.\n" +"\n" +" Tecle CHCP sem um número para exibir a página de código ativa no console.\n" +"\n" #: programs/clock/clock.rc:32 msgid "Ana&log" @@ -14463,7 +14463,7 @@ msgstr "Endereço IPv6" #: programs/ipconfig/ipconfig.rc:38 msgid "Primary DNS suffix" -msgstr "" +msgstr "Sufixo de DNS Primário" #: programs/msinfo32/msinfo32.rc:28 msgid "System Information"

1 0

Roberto Pungartnik : po: Update Spanish translation.
by Alexandre Julliard Dec. 13, 2021

Dec. 13, 2021

Module: wine Branch: master Commit: be2b2901cf072daedd7a07d0a3ac6ee3f83976a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be2b2901cf072daedd7a07d0… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Sun Dec 12 16:31:27 2021 -0300 po: Update Spanish translation. Signed-off-by: Roberto Pungartnik <rpungartnik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/es.po | 708 ++++++++++++++++++++++++++++----------------------------------- 1 file changed, 315 insertions(+), 393 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be2b2901cf072daedd7a…

1 0

Huw Davies : riched20: Return the nearest char pos if the coords are outside the format rect.
by Alexandre Julliard Dec. 13, 2021

Dec. 13, 2021

Module: wine Branch: master Commit: 363508454d5f8f1fc5916bda47e6429756b7dc8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=363508454d5f8f1fc5916bda… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 13 12:58:51 2021 +0000 riched20: Return the nearest char pos if the coords are outside the format rect. For the two tests that remain todo_wine, the results differ between riched20 and msftedit, with Wine's implementation matching msftedit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52041 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 27 ++++++--------------------- dlls/riched20/editor.c | 34 +++++++++++++--------------------- dlls/riched20/editor.h | 4 ++-- dlls/riched20/tests/editor.c | 10 ++++++---- 4 files changed, 27 insertions(+), 48 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index beac8af50a1..ebc137ebf85 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -993,32 +993,17 @@ static BOOL cursor_from_virtual_coords( ME_TextEditor *editor, int x, int y, * * x & y are pixel positions in client coordinates. * - * isExact will be set to TRUE if the run is directly under the pixel - * position, FALSE if it not, unless isExact is set to NULL. - * - * return FALSE if outside client area and the cursor is not set, - * otherwise TRUE is returned. + * return TRUE if the run is directly under the pixel + * position, FALSE if it not. */ -BOOL ME_CharFromPos(ME_TextEditor *editor, int x, int y, - ME_Cursor *cursor, BOOL *isExact) +BOOL cursor_from_coords( ME_TextEditor *editor, int x, int y, ME_Cursor *cursor ) { - RECT rc; - BOOL bResult; - - ITextHost_TxGetClientRect(editor->texthost, &rc); - if (x < 0 || y < 0 || x >= rc.right || y >= rc.bottom) { - if (isExact) *isExact = FALSE; - return FALSE; - } - x += editor->horz_si.nPos; - y += editor->vert_si.nPos; - bResult = cursor_from_virtual_coords( editor, x, y, cursor, FALSE ); - if (isExact) *isExact = bResult; - return TRUE; + x += editor->horz_si.nPos; + y += editor->vert_si.nPos; + return cursor_from_virtual_coords( editor, x, y, cursor, FALSE ); } - /* Extends the selection with a word, line, or paragraph selection type. * * The selection is anchored by editor->pCursors[2-3] such that the text diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 3bf499681ed..429f023ebe4 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2815,7 +2815,6 @@ static BOOL is_link( ME_Run *run ) void editor_set_cursor( ME_TextEditor *editor, int x, int y ) { ME_Cursor pos; - BOOL is_exact; static HCURSOR cursor_arrow, cursor_hand, cursor_ibeam, cursor_reverse; HCURSOR cursor; @@ -2838,22 +2837,18 @@ void editor_set_cursor( ME_TextEditor *editor, int x, int y ) else cursor = cursor_ibeam; } else if (x < editor->rcFormat.left) cursor = cursor_reverse; - else + else if (cursor_from_coords( editor, x, y, &pos )) { - ME_CharFromPos( editor, x, y, &pos, &is_exact ); - if (is_exact) - { - ME_Run *run = pos.run; + ME_Run *run = pos.run; - if (is_link( run )) cursor = cursor_hand; + if (is_link( run )) cursor = cursor_hand; - else if (ME_IsSelection( editor )) - { - int start, end, offset = ME_GetCursorOfs( &pos ); + else if (ME_IsSelection( editor )) + { + int start, end, offset = ME_GetCursorOfs( &pos ); - ME_GetSelectionOfs( editor, &start, &end ); - if (start <= offset && end >= offset) cursor = cursor_arrow; - } + ME_GetSelectionOfs( editor, &start, &end ); + if (start <= offset && end >= offset) cursor = cursor_arrow; } } @@ -3113,15 +3108,13 @@ static inline int calc_wheel_change( int *remain, int amount_per_click ) void link_notify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam) { int x,y; - BOOL isExact; ME_Cursor cursor; /* The start of the clicked text. */ ME_Run *run; ENLINK info; x = (short)LOWORD(lParam); y = (short)HIWORD(lParam); - ME_CharFromPos(editor, x, y, &cursor, &isExact); - if (!isExact) return; + if (!cursor_from_coords( editor, x, y, &cursor )) return; if (is_link( cursor.run )) { /* The clicked run has CFE_LINK set */ @@ -3853,11 +3846,10 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, case EM_CHARFROMPOS: { ME_Cursor cursor; - if (ME_CharFromPos(editor, ((POINTL *)lParam)->x, ((POINTL *)lParam)->y, - &cursor, NULL)) - return ME_GetCursorOfs(&cursor); - else - return -1; + POINTL *pt = (POINTL *)lParam; + + cursor_from_coords(editor, pt->x, pt->y, &cursor); + return ME_GetCursorOfs(&cursor); } case EM_POSFROMCHAR: { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 7bdd1bf5efe..8a46e942581 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -164,6 +164,7 @@ static inline ME_DisplayItem *run_get_di( ME_Run *run ) /* caret.c */ void cursor_coords( ME_TextEditor *editor, ME_Cursor *cursor, int *x, int *y, int *height ) DECLSPEC_HIDDEN; +BOOL cursor_from_coords( ME_TextEditor *editor, int x, int y, ME_Cursor *cursor ) DECLSPEC_HIDDEN; void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; int set_selection_cursors(ME_TextEditor *editor, int from, int to) DECLSPEC_HIDDEN; BOOL ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) DECLSPEC_HIDDEN; @@ -171,11 +172,10 @@ void hide_caret(ME_TextEditor *ed) DECLSPEC_HIDDEN; void show_caret(ME_TextEditor *ed) DECLSPEC_HIDDEN; void update_caret(ME_TextEditor *ed) DECLSPEC_HIDDEN; void create_caret(ME_TextEditor *ed) DECLSPEC_HIDDEN; -BOOL ME_CharFromPos(ME_TextEditor *editor, int x, int y, ME_Cursor *cursor, BOOL *isExact) DECLSPEC_HIDDEN; void ME_LButtonDown(ME_TextEditor *editor, int x, int y, int clickNum) DECLSPEC_HIDDEN; void ME_MouseMove(ME_TextEditor *editor, int x, int y) DECLSPEC_HIDDEN; BOOL ME_DeleteTextAtCursor(ME_TextEditor *editor, int nCursor, int nChars) DECLSPEC_HIDDEN; -void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, +void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, const WCHAR *str, int len, ME_Style *style) DECLSPEC_HIDDEN; void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor) DECLSPEC_HIDDEN; int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs, BOOL final_eop) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index ab74e0ef1ab..85f7c00383a 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7228,32 +7228,34 @@ static void test_EM_CHARFROMPOS(void) point.x = -1; point.y = 40; result = SendMessageA(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point); - todo_wine ok(result == 34, "expected character index of 34 but got %d\n", result); + ok(result == 34, "expected character index of 34 but got %d\n", result); point.x = 1000; point.y = 0; result = SendMessageA(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point); - todo_wine ok(result == 33, "expected character index of 33 but got %d\n", result); + ok(result == 33, "expected character index of 33 but got %d\n", result); point.x = 1000; point.y = 36; result = SendMessageA(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point); - todo_wine ok(result == 39, "expected character index of 39 but got %d\n", result); + ok(result == 39, "expected character index of 39 but got %d\n", result); point.x = 1000; point.y = -1; result = SendMessageA(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point); + /* This differs from the msftedit result */ todo_wine ok(result == 0, "expected character index of 0 but got %d\n", result); point.x = 1000; point.y = rcClient.bottom + 1; result = SendMessageA(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point); + /* This differs from the msftedit result */ todo_wine ok(result == 34, "expected character index of 34 but got %d\n", result); point.x = 1000; point.y = rcClient.bottom; result = SendMessageA(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point); - todo_wine ok(result == 39, "expected character index of 39 but got %d\n", result); + ok(result == 39, "expected character index of 39 but got %d\n", result); DestroyWindow(hwnd); }

1 0

Alex Henrie : kernel32/tests: Split up checks in flush_proc function.
by Alexandre Julliard Dec. 13, 2021

Dec. 13, 2021

Module: wine Branch: master Commit: d7161a857652d80dd413613de1e92e8952beaa1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7161a857652d80dd413613d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 12 19:04:29 2021 -0700 kernel32/tests: Split up checks in flush_proc function. This test is failing intermittently on the testbot but not enough information is output to tell why. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 93eeca16c75..5af92f8f8a5 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2858,9 +2858,15 @@ static DWORD CALLBACK flush_proc(HANDLE pipe) res = FlushFileBuffers(pipe); if (expected_flush_error == ERROR_SUCCESS) + { ok(res, "FlushFileBuffers failed: %u\n", GetLastError()); + } else - ok(!res && GetLastError() == expected_flush_error, "FlushFileBuffers failed: %u\n", GetLastError()); + { + ok(!res, "FlushFileBuffers should have failed\n"); + ok(GetLastError() == expected_flush_error, + "FlushFileBuffers set error %u, expected %u\n", GetLastError(), expected_flush_error); + } return 0; }

1 0

Jinoh Kang : ntdll/tests: Fix access denied error in unprivileged mode.
by Alexandre Julliard Dec. 13, 2021

Dec. 13, 2021

Module: wine Branch: master Commit: 4ef486467254441e46aadfbb709c0952bc75bcce URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ef486467254441e46aadfbb… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sun Dec 12 02:03:32 2021 +0900 ntdll/tests: Fix access denied error in unprivileged mode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52161 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index c32136763a1..f872d6709a1 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2477,7 +2477,7 @@ static void test_object_identity(void) pNtClose( h1 ); - h1 = CreateFileA( "\\\\.\\NUL", GENERIC_ALL, 0, NULL, OPEN_EXISTING, 0, 0 ); + h1 = CreateFileA( "\\\\.\\NUL", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0 ); ok( h1 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); h2 = NULL; @@ -2490,7 +2490,7 @@ static void test_object_identity(void) pNtClose( h2 ); - h2 = CreateFileA( "\\\\.\\NUL", GENERIC_ALL, 0, NULL, OPEN_EXISTING, 0, 0 ); + h2 = CreateFileA( "\\\\.\\NUL", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0 ); ok( h2 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); status = pNtCompareObjects( h1, h2 );

1 0

Alexandre Julliard : krnl386.exe: Page-align the GlobalAlloc() size when the selector limit is in pages.
by Alexandre Julliard Dec. 13, 2021

Dec. 13, 2021

Module: wine Branch: master Commit: 1c5e4d066f6cfd65cc5ad729ce6e8aff53e20939 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c5e4d066f6cfd65cc5ad729… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 12 17:57:55 2021 +0100 krnl386.exe: Page-align the GlobalAlloc() size when the selector limit is in pages. GlobalSize() uses the selector limit and that needs to match the allocated size. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52082 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/global.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/global.c b/dlls/krnl386.exe16/global.c index 0a8da28e99b..2eb02b8cef3 100644 --- a/dlls/krnl386.exe16/global.c +++ b/dlls/krnl386.exe16/global.c @@ -196,6 +196,7 @@ HGLOBAL16 GLOBAL_Alloc( UINT16 flags, DWORD size, HGLOBAL16 hOwner, unsigned cha { void *ptr; HGLOBAL16 handle; + DWORD align = 0x1f; TRACE("%d flags=%04x\n", size, flags ); @@ -205,8 +206,9 @@ HGLOBAL16 GLOBAL_Alloc( UINT16 flags, DWORD size, HGLOBAL16 hOwner, unsigned cha /* Fixup the size */ - if (size >= GLOBAL_MAX_ALLOC_SIZE - 0x1f) return 0; - size = (size + 0x1f) & ~0x1f; + if (size > 0x100000) align = 0xfff; /* selector limit will be in pages */ + if (size >= GLOBAL_MAX_ALLOC_SIZE - align) return 0; + size = (size + align) & ~align; /* Allocate the linear memory */ ptr = HeapAlloc( get_win16_heap(), 0, size );

1 0