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

Roberto Pungartnik : po: Update Spanish translation.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: aba849eb55453b439913334e394f69c681b01edd URL: https://source.winehq.org/git/wine.git/?a=commit;h=aba849eb55453b439913334e… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Sat Mar 13 21:51:08 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 | 728 ++++++++++++++++----------------------------------------------- 1 file changed, 182 insertions(+), 546 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aba849eb55453b439913…

1 0

Alexandre Julliard : server: Return the file name for image mappings in the get_mapping_info request.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 6531f262e3488bbd917fcdb191f97efa820d0d54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6531f262e3488bbd917fcdb1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 11 14:56:57 2021 +0100 server: Return the file name for image mappings in the get_mapping_info request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 99 ++++++++++++++++++++++++++++++------------ include/wine/server_protocol.h | 5 ++- server/mapping.c | 16 ++++++- server/protocol.def | 2 + server/request.h | 3 +- server/trace.c | 2 + 6 files changed, 96 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6531f262e3488bbd917f…

1 0

Nikolay Sivov : d2d1: Implement d2d_geometry_group_GetBounds().
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 1cd678d6a0638698f27f9f3e4a1f42bb566e524f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cd678d6a0638698f27f9f3e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 15 10:38:15 2021 +0300 d2d1: Implement d2d_geometry_group_GetBounds(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50411 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 19 +++++++++++++++++-- dlls/d2d1/tests/d2d1.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index c32de310353..6da93de3eb4 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -4880,9 +4880,24 @@ static void STDMETHODCALLTYPE d2d_geometry_group_GetFactory(ID2D1GeometryGroup * static HRESULT STDMETHODCALLTYPE d2d_geometry_group_GetBounds(ID2D1GeometryGroup *iface, const D2D1_MATRIX_3X2_F *transform, D2D1_RECT_F *bounds) { - FIXME("iface %p, transform %p, bounds %p stub!.\n", iface, transform, bounds); + struct d2d_geometry *geometry = impl_from_ID2D1GeometryGroup(iface); + D2D1_RECT_F rect; + unsigned int i; - return E_NOTIMPL; + TRACE("iface %p, transform %p, bounds %p.\n", iface, transform, bounds); + + bounds->left = FLT_MAX; + bounds->top = FLT_MAX; + bounds->right = -FLT_MAX; + bounds->bottom = -FLT_MAX; + + for (i = 0; i < geometry->u.group.geometry_count; ++i) + { + if (SUCCEEDED(ID2D1Geometry_GetBounds(geometry->u.group.src_geometries[i], transform, &rect))) + d2d_rect_union(bounds, &rect); + } + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_geometry_group_GetWidenedBounds(ID2D1GeometryGroup *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 1dc7a27ca5b..a046a21c7f6 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9566,6 +9566,54 @@ static void test_colour_space(BOOL d3d11) } } +static void test_geometry_group(BOOL d3d11) +{ + ID2D1Factory *factory; + ID2D1GeometryGroup *group; + ID2D1Geometry *geometries[2]; + D2D1_RECT_F rect; + HRESULT hr; + D2D1_MATRIX_3X2_F matrix; + BOOL match; + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + + set_rect(&rect, -1.0f, -1.0f, 1.0f, 1.0f); + hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, (ID2D1RectangleGeometry **)&geometries[0]); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + + set_rect(&rect, -2.0f, -2.0f, 0.0f, 2.0f); + hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, (ID2D1RectangleGeometry **)&geometries[1]); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + + hr = ID2D1Factory_CreateGeometryGroup(factory, D2D1_FILL_MODE_ALTERNATE, geometries, 2, &group); + ok(SUCCEEDED(hr), "Failed to create geometry group, hr %#x.\n", hr); + + set_rect(&rect, 0.0f, 0.0f, 0.0f, 0.0f); + hr = ID2D1GeometryGroup_GetBounds(group, NULL, &rect); + ok(SUCCEEDED(hr), "Failed to get geometry group bounds, hr %#x.\n", hr); + match = compare_rect(&rect, -2.0f, -2.0f, 1.0f, 2.0f, 0); + ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + set_matrix_identity(&matrix); + translate_matrix(&matrix, 80.0f, 640.0f); + scale_matrix(&matrix, 2.0f, 0.5f); + hr = ID2D1GeometryGroup_GetBounds(group, &matrix, &rect); + ok(SUCCEEDED(hr), "Failed to get geometry group bounds, hr %#x.\n", hr); + match = compare_rect(&rect, 76.0f, 639.0f, 82.0f, 641.0f, 0); + ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + ID2D1GeometryGroup_Release(group); + + ID2D1Geometry_Release(geometries[0]); + ID2D1Geometry_Release(geometries[1]); + + ID2D1Factory_Release(factory); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -9625,6 +9673,7 @@ START_TEST(d2d1) queue_test(test_wic_bitmap_format); queue_d3d10_test(test_math); queue_d3d10_test(test_colour_space); + queue_test(test_geometry_group); run_queued_tests(); }

1 0

Huw Davies : riched20: Handle EM_GETLINE's unicode conversion in the host.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: e4c38944d83191dc0de525cd212a7972aca862c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4c38944d83191dc0de525cd… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 15 10:03:17 2021 +0000 riched20: Handle EM_GETLINE's unicode conversion 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 | 24 +++++------------------- dlls/riched20/txthost.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 19 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index eb1ec78d962..c27a691de4f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4030,11 +4030,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, const unsigned int nMaxChars = *(WORD *) lParam; unsigned int nCharsLeft = nMaxChars; char *dest = (char *) lParam; - BOOL wroteNull = FALSE; ME_Cursor start, end; - TRACE("EM_GETLINE: row=%d, nMaxChars=%d (%s)\n", (int) wParam, nMaxChars, - unicode ? "Unicode" : "Ansi"); + TRACE( "EM_GETLINE: row=%d, nMaxChars=%d\n", (int)wParam, nMaxChars ); row = row_from_row_number( editor, wParam ); if (row == NULL) return 0; @@ -4052,30 +4050,18 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, str = get_text( run, ofs ); nCopy = min( nCharsLeft, len ); - if (unicode) - memcpy(dest, str, nCopy * sizeof(WCHAR)); - else - nCopy = WideCharToMultiByte(CP_ACP, 0, str, nCopy, dest, - nCharsLeft, NULL, NULL); - dest += nCopy * (unicode ? sizeof(WCHAR) : 1); + memcpy(dest, str, nCopy * sizeof(WCHAR)); + dest += nCopy * sizeof(WCHAR); nCharsLeft -= nCopy; if (run == end.run) break; run = row_next_run( row, run ); } /* append line termination, space allowing */ - if (nCharsLeft > 0) - { - if (unicode) - *((WCHAR *)dest) = '\0'; - else - *dest = '\0'; - nCharsLeft--; - wroteNull = TRUE; - } + if (nCharsLeft > 0) *((WCHAR *)dest) = '\0'; TRACE("EM_GETLINE: got %u characters\n", nMaxChars - nCharsLeft); - return nMaxChars - nCharsLeft - (wroteNull ? 1 : 0); + return nMaxChars - nCharsLeft; } case EM_GETLINECOUNT: { diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index d249137d829..a10b77e8ebb 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -753,6 +753,32 @@ static BOOL create_windowed_editor( HWND hwnd, CREATESTRUCTW *create, BOOL emula return TRUE; } +static HRESULT get_lineA( ITextServices *text_srv, WPARAM wparam, LPARAM lparam, LRESULT *res ) +{ + LRESULT len = USHRT_MAX; + WORD sizeA; + HRESULT hr; + WCHAR *buf; + + *res = 0; + sizeA = *(WORD *)lparam; + *(WORD *)lparam = 0; + if (!sizeA) return S_OK; + buf = heap_alloc( len * sizeof(WCHAR) ); + if (!buf) return E_OUTOFMEMORY; + *(WORD *)buf = len; + hr = ITextServices_TxSendMessage( text_srv, EM_GETLINE, wparam, (LPARAM)buf, &len ); + if (hr == S_OK && len) + { + len = WideCharToMultiByte( CP_ACP, 0, buf, len, (char *)lparam, sizeA, NULL, NULL ); + if (!len && GetLastError() == ERROR_INSUFFICIENT_BUFFER) len = sizeA; + if (len < sizeA) ((char *)lparam)[len] = '\0'; + *res = len; + } + heap_free( buf ); + return hr; +} + static HRESULT get_text_rangeA( struct host *host, TEXTRANGEA *rangeA, LRESULT *res ) { TEXTRANGEW range; @@ -871,6 +897,11 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, } break; } + case EM_GETLINE: + if (unicode) hr = ITextServices_TxSendMessage( host->text_srv, msg, wparam, lparam, &res ); + else hr = get_lineA( host->text_srv, wparam, lparam, &res ); + break; + case WM_GETTEXT: { GETTEXTEX params;

1 0

Huw Davies : riched20: Handle EM_GETSELTEXT's unicode conversion in the host.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: dc6434959ea05d5dc715e0de01c630dff509717d URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc6434959ea05d5dc715e0de… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 15 10:03:18 2021 +0000 riched20: Handle EM_GETSELTEXT's unicode conversion 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 | 24 ++++++------------------ dlls/riched20/tests/editor.c | 4 ++-- dlls/riched20/txthost.c | 14 ++++++++++++++ dlls/riched32/tests/editor.c | 6 +++--- 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c27a691de4f..994e91ce3d5 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2132,22 +2132,11 @@ static int ME_GetTextEx(ME_TextEditor *editor, GETTEXTEX *ex, LPARAM pText) } } -static int ME_GetTextRange(ME_TextEditor *editor, WCHAR *strText, - const ME_Cursor *start, int nLen, BOOL unicode) +static int get_text_range( ME_TextEditor *editor, WCHAR *buffer, + const ME_Cursor *start, int len ) { - if (!strText) return 0; - if (unicode) { - return ME_GetTextW(editor, strText, INT_MAX, start, nLen, FALSE, FALSE); - } else { - int nChars; - WCHAR *p = heap_alloc((nLen+1) * sizeof(*p)); - if (!p) return 0; - nChars = ME_GetTextW(editor, p, nLen, start, nLen, FALSE, FALSE); - WideCharToMultiByte(CP_ACP, 0, p, nChars+1, (char *)strText, - nLen+1, NULL, NULL); - heap_free(p); - return nChars; - } + if (!buffer) return 0; + return ME_GetTextW( editor, buffer, INT_MAX, start, len, FALSE, FALSE ); } int set_selection( ME_TextEditor *editor, int to, int from ) @@ -3991,8 +3980,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { int nFrom, nTo, nStartCur = ME_GetSelectionOfs(editor, &nFrom, &nTo); ME_Cursor *from = &editor->pCursors[nStartCur]; - return ME_GetTextRange(editor, (WCHAR *)lParam, from, - nTo - nFrom, unicode); + return get_text_range( editor, (WCHAR *)lParam, from, nTo - nFrom ); } case EM_GETSCROLLPOS: { @@ -4021,7 +4009,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if (nStart >= nEnd) return 0; cursor_from_char_ofs( editor, nStart, &start ); - return ME_GetTextRange( editor, rng->lpstrText, &start, nEnd - nStart, TRUE ); + return get_text_range( editor, rng->lpstrText, &start, nEnd - nStart ); } case EM_GETLINE: { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 170c29f186e..1ce94f8ae64 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1828,8 +1828,8 @@ static void test_EM_GETSELTEXT(void) SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); SendMessageA(hwndRichEdit, EM_SETSEL, 4, 8); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); - todo_wine ok(result == 5, "EM_GETSELTEXT returned %ld\n", result); - todo_wine ok(!strcmp("ef\x8e\xf0g", buffer), "EM_GETSELTEXT filled %s\n", buffer); + ok(result == 5, "EM_GETSELTEXT returned %ld\n", result); + ok(!strcmp("ef\x8e\xf0g", buffer), "EM_GETSELTEXT filled %s\n", buffer); } DestroyWindow(hwndRichEdit); diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index a10b77e8ebb..1acf1d1e207 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -902,6 +902,20 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, else hr = get_lineA( host->text_srv, wparam, lparam, &res ); break; + case EM_GETSELTEXT: + { + TEXTRANGEA range; + + if (unicode) hr = ITextServices_TxSendMessage( host->text_srv, msg, wparam, lparam, &res ); + else + { + ITextServices_TxSendMessage( host->text_srv, EM_EXGETSEL, 0, (LPARAM)&range.chrg, &res ); + range.lpstrText = (char *)lparam; + range.lpstrText[0] = '\0'; + hr = get_text_rangeA( host, &range, &res ); + } + break; + } case WM_GETTEXT: { GETTEXTEX params; diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 0f5ca9f738b..5e3a70c5c7d 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -623,7 +623,7 @@ static void test_EM_GETSELTEXT(void) SendMessageA(hwndRichEdit, EM_SETSEL, 4, 8); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); ok(result == 4, "EM_GETSELTEXT returned %ld\n", result); - todo_wine ok(!strcmp("ef\x8e\xf0", buffer), "EM_GETSELTEXT filled %s\n", buffer); + ok(!strcmp("ef\x8e\xf0", buffer), "EM_GETSELTEXT filled %s\n", buffer); } DestroyWindow(hwndRichEdit); @@ -1362,7 +1362,7 @@ static void test_EM_EXSETSEL(void) result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); todo_wine ok(result == 7, "EM_EXSETSEL return %ld expected 7\n", result); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(bufA), (LPARAM)bufA); - todo_wine ok(!strcmp(bufA, "ef\x8e\xf0"), "EM_GETSELTEXT return incorrect string\n"); + ok(!strcmp(bufA, "ef\x8e\xf0"), "EM_GETSELTEXT return incorrect string\n"); SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); ok(cr.cpMin == 4, "Selection start incorrectly: %d expected 4\n", cr.cpMin); ok(cr.cpMax == 8, "Selection end incorrectly: %d expected 8\n", cr.cpMax); @@ -1421,7 +1421,7 @@ static void test_EM_SETSEL(void) result = SendMessageA(hwndRichEdit, EM_SETSEL, 4, 8); todo_wine ok(result == 7, "EM_SETSEL return %ld expected 7\n", result); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(buffA), (LPARAM)buffA); - todo_wine ok(!strcmp(buffA, "ef\x8e\xf0"), "EM_GETSELTEXT return incorrect string\n"); + ok(!strcmp(buffA, "ef\x8e\xf0"), "EM_GETSELTEXT return incorrect string\n"); result = SendMessageA(hwndRichEdit, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == 4, "Selection start incorrectly: %d expected 4\n", sel_start); ok(sel_end == 8, "Selection end incorrectly: %d expected 8\n", sel_end);

1 0

Huw Davies : riched20: Remove unused code from ITextHost_TxGetPropertyBits.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: b456420096ccb50b070e1f58d9bb5b2953e241db URL: https://source.winehq.org/git/wine.git/?a=commit;h=b456420096ccb50b070e1f58… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 15 10:03:19 2021 +0000 riched20: Remove unused code from ITextHost_TxGetPropertyBits. Currently TxGetPropertyBits is only called during text services creation, so the editor is not set. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/txthost.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 1acf1d1e207..278b0a64379 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -375,28 +375,14 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetPropertyBits( ITextHost *i struct host *host = impl_from_ITextHost( iface ); DWORD style; DWORD dwBits = 0; + DWORD dwScrollBar; - if (host->editor) - { - style = host->editor->styleFlags; - if (host->editor->mode & TM_RICHTEXT) - dwBits |= TXTBIT_RICHTEXT; - if (host->editor->bWordWrap) - dwBits |= TXTBIT_WORDWRAP; - if (style & ECO_AUTOWORDSELECTION) - dwBits |= TXTBIT_AUTOWORDSEL; - } - else - { - DWORD dwScrollBar; - - style = GetWindowLongW( host->window, GWL_STYLE ); - ITextHostImpl_TxGetScrollBars(iface, &dwScrollBar); + style = GetWindowLongW( host->window, GWL_STYLE ); + ITextHostImpl_TxGetScrollBars(iface, &dwScrollBar); - dwBits |= TXTBIT_RICHTEXT|TXTBIT_AUTOWORDSEL; - if (!(dwScrollBar & ES_AUTOHSCROLL)) - dwBits |= TXTBIT_WORDWRAP; - } + dwBits |= TXTBIT_RICHTEXT|TXTBIT_AUTOWORDSEL; + if (!(dwScrollBar & ES_AUTOHSCROLL)) + dwBits |= TXTBIT_WORDWRAP; /* Bits that correspond to window styles. */ if (style & ES_MULTILINE)

1 0

Huw Davies : riched20: Implement EM_SETREADONLY using EM_SETOPTIONS.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 5d75cac480f1ab14b923137784a0a7583d986018 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d75cac480f1ab14b9231377… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 15 10:03:20 2021 +0000 riched20: Implement EM_SETREADONLY using EM_SETOPTIONS. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 8 -------- dlls/riched20/txthost.c | 11 ++++------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 994e91ce3d5..4988f6e0746 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3779,14 +3779,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0; } - case EM_SETREADONLY: - { - if (wParam) - editor->styleFlags |= ES_READONLY; - else - editor->styleFlags &= ~ES_READONLY; - return 1; - } case EM_SETEVENTMASK: { DWORD nOldMask = editor->nEventMask; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 278b0a64379..5bd11c5aba2 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1002,14 +1002,11 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, } case EM_SETREADONLY: { - DWORD style; + DWORD op = wparam ? ECOOP_OR : ECOOP_AND; + DWORD mask = wparam ? ECO_READONLY : ~ECO_READONLY; - res = ME_HandleMessage( editor, msg, wparam, lparam, unicode, &hr ); - style = GetWindowLongW( hwnd, GWL_STYLE ); - style &= ~ES_READONLY; - if (wparam) style |= ES_READONLY; - SetWindowLongW( hwnd, GWL_STYLE, style ); - return res; + SendMessageW( hwnd, EM_SETOPTIONS, op, mask ); + return 1; } case WM_SETTEXT: {

1 0

Huw Davies : riched20: Initialize a copy of the properties in the host.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 1507f2c8c39a46ce09eefd25fd7b3e50c115f603 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1507f2c8c39a46ce09eefd25… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 15 10:03:21 2021 +0000 riched20: Initialize a copy of the properties in the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/txthost.c | 69 +++++++++++++++++-------------------------------- 1 file changed, 23 insertions(+), 46 deletions(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 5bd11c5aba2..c810589b4a6 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -41,6 +41,7 @@ struct host HWND window; BOOL emulate_10; PARAFORMAT2 para_fmt; + DWORD props; }; static const ITextHostVtbl textHostVtbl; @@ -48,6 +49,26 @@ static const ITextHostVtbl textHostVtbl; static BOOL listbox_registered; static BOOL combobox_registered; +static void host_init_props( struct host *host ) +{ + DWORD style, scrollbar; + + host->props = TXTBIT_RICHTEXT | TXTBIT_AUTOWORDSEL | TXTBIT_ALLOWBEEP; + + style = GetWindowLongW( host->window, GWL_STYLE ); + + if (style & ES_MULTILINE) host->props |= TXTBIT_MULTILINE; + if (style & ES_READONLY) host->props |= TXTBIT_READONLY; + if (style & ES_PASSWORD) host->props |= TXTBIT_USEPASSWORD; + if (!(style & ES_NOHIDESEL)) host->props |= TXTBIT_HIDESELECTION; + if (style & ES_SAVESEL) host->props |= TXTBIT_SAVESELECTION; + if (style & ES_VERTICAL) host->props |= TXTBIT_VERTICAL; + if (style & ES_NOOLEDRAGDROP) host->props |= TXTBIT_DISABLEDRAG; + + ITextHost_TxGetScrollBars( &host->ITextHost_iface, &scrollbar ); + if (!(scrollbar & ES_AUTOHSCROLL)) host->props |= TXTBIT_WORDWRAP; +} + struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) { struct host *texthost; @@ -68,6 +89,7 @@ struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) if (cs->style & ES_CENTER) texthost->para_fmt.wAlignment = PFA_CENTER; texthost->editor = NULL; + host_init_props( texthost ); return texthost; } @@ -373,53 +395,8 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPropertyBits,12) DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetPropertyBits( ITextHost *iface, DWORD mask, DWORD *bits ) { struct host *host = impl_from_ITextHost( iface ); - DWORD style; - DWORD dwBits = 0; - DWORD dwScrollBar; - style = GetWindowLongW( host->window, GWL_STYLE ); - ITextHostImpl_TxGetScrollBars(iface, &dwScrollBar); - - dwBits |= TXTBIT_RICHTEXT|TXTBIT_AUTOWORDSEL; - if (!(dwScrollBar & ES_AUTOHSCROLL)) - dwBits |= TXTBIT_WORDWRAP; - - /* Bits that correspond to window styles. */ - if (style & ES_MULTILINE) - dwBits |= TXTBIT_MULTILINE; - if (style & ES_READONLY) - dwBits |= TXTBIT_READONLY; - if (style & ES_PASSWORD) - dwBits |= TXTBIT_USEPASSWORD; - if (!(style & ES_NOHIDESEL)) - dwBits |= TXTBIT_HIDESELECTION; - if (style & ES_SAVESEL) - dwBits |= TXTBIT_SAVESELECTION; - if (style & ES_VERTICAL) - dwBits |= TXTBIT_VERTICAL; - if (style & ES_NOOLEDRAGDROP) - dwBits |= TXTBIT_DISABLEDRAG; - - dwBits |= TXTBIT_ALLOWBEEP; - - /* The following bits are always FALSE because they are probably only - * needed for ITextServices_OnTxPropertyBitsChange: - * TXTBIT_VIEWINSETCHANGE - * TXTBIT_BACKSTYLECHANGE - * TXTBIT_MAXLENGTHCHANGE - * TXTBIT_CHARFORMATCHANGE - * TXTBIT_PARAFORMATCHANGE - * TXTBIT_SHOWACCELERATOR - * TXTBIT_EXTENTCHANGE - * TXTBIT_SELBARCHANGE - * TXTBIT_SCROLLBARCHANGE - * TXTBIT_CLIENTRECTCHANGE - * - * Documented by MSDN as not supported: - * TXTBIT_USECURRENTBKG - */ - - *bits = dwBits & mask; + *bits = host->props & mask; return S_OK; }

1 0

Henri Verbeet : d3d11/tests: Add some more device context state tests.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 6167f5e6dfbaee0c7ed05b66575e9fdf7523061c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6167f5e6dfbaee0c7ed05b66… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 15 16:11:33 2021 +0100 d3d11/tests: Add some more device context state tests. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 46 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1e69d827977..1b35e8f4983 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6779,6 +6779,7 @@ static void test_device_context_state(void) ID3DDeviceContextState *context_state, *previous_context_state, *tmp_context_state, *context_state2; UINT ib_offset, vb_offset, vb_stride, so_offset, offset, stride, sample_mask, stencil_ref, count; ID3D11Buffer *cb, *srvb, *uavb, *ib, *vb, *sob, *tmp_cb, *tmp_ib, *tmp_vb, *tmp_sob; + D3D_FEATURE_LEVEL feature_level, selected_feature_level; ID3D11UnorderedAccessView *tmp_uav, *uav, *ps_uav; ID3D11Device *d3d11_device, *d3d11_device2; ID3D11SamplerState *sampler, *tmp_sampler; @@ -6800,7 +6801,6 @@ static void test_device_context_state(void) ID3D11Predicate *tmp_pred, *pred; ID3D11DomainShader *tmp_ds, *ds; D3D11_SAMPLER_DESC sampler_desc; - D3D_FEATURE_LEVEL feature_level; D3D11_QUERY_DESC predicate_desc; ID3D11Device1 *device, *device2; ID3D11InputLayout *il, *tmp_il; @@ -6860,17 +6860,41 @@ static void test_device_context_state(void) ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); feature_level = min(feature_level, D3D_FEATURE_LEVEL_11_1); - hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, - &IID_ID3D11Device1, NULL, &context_state); - ok(SUCCEEDED(hr), "Failed to create device context state, hr %#x.\n", hr); - if (FAILED(hr)) - { - ID3D11SamplerState_Release(sampler); - ID3D11Device1_Release(device); - return; - } + + hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, + 1, D3D11_SDK_VERSION, &IID_ID3D11Device1, NULL, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + + selected_feature_level = 0xc0de0000; + hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, + D3D11_SDK_VERSION, &IID_ID3D11Device1, &selected_feature_level, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + ok(selected_feature_level == feature_level, "Got unexpected feature level %#x, expected %#x.\n", + selected_feature_level, feature_level); + + selected_feature_level = 0xc0de0000; + context_state = (void *)0xc0de0001; + hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 0, + D3D11_SDK_VERSION, &IID_ID3D11Device1, &selected_feature_level, &context_state); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!selected_feature_level, "Got unexpected feature level %#x.\n", selected_feature_level); + todo_wine ok(!context_state, "Got unexpected context state %p.\n", context_state); + if (SUCCEEDED(hr)) + ID3DDeviceContextState_Release(context_state); + + hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, + 0, D3D11_SDK_VERSION, &IID_ID3D11Device1, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = ID3D11Device1_CreateDeviceContextState(device, 0, NULL, + 0, D3D11_SDK_VERSION, &IID_ID3D11Device1, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, + 1, D3D11_SDK_VERSION, &IID_ID3D11Device1, NULL, &context_state); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); refcount = get_refcount(context_state); - ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); context_type = ID3D11DeviceContext1_GetType(context); ok(context_type == D3D11_DEVICE_CONTEXT_IMMEDIATE, "Unexpected context type %u.\n", context_type);

1 0

Louis Lenders : wbemprox: Add ProductType to win32_operatingsystem class.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 733dc15bae32ce88d324ee221860f2a0e3e5d347 URL: https://source.winehq.org/git/wine.git/?a=commit;h=733dc15bae32ce88d324ee22… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sun Mar 14 21:22:51 2021 +0100 wbemprox: Add ProductType to win32_operatingsystem class. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50805 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index dbf9173d21d..3922331f650 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -247,6 +247,7 @@ static const struct column col_operatingsystem[] = { L"OSProductSuite", CIM_UINT32 }, { L"OSType", CIM_UINT16 }, { L"Primary", CIM_BOOLEAN }, + { L"ProductType", CIM_UINT32 }, { L"SerialNumber", CIM_STRING|COL_FLAG_DYNAMIC }, { L"ServicePackMajorVersion", CIM_UINT16 }, { L"ServicePackMinorVersion", CIM_UINT16 }, @@ -659,6 +660,7 @@ struct record_operatingsystem UINT32 osproductsuite; UINT16 ostype; int primary; + UINT32 producttype; const WCHAR *serialnumber; UINT16 servicepackmajor; UINT16 servicepackminor; @@ -3574,6 +3576,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec->osproductsuite = 2461140; /* Windows XP Professional */ rec->ostype = 18; /* WINNT */ rec->primary = -1; + rec->producttype = 1; rec->serialnumber = get_osserialnumber(); rec->servicepackmajor = ver.wServicePackMajor; rec->servicepackminor = ver.wServicePackMinor; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index f650418e51f..a79bc759bea 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1299,6 +1299,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) check_property( obj, L"CurrentTimeZone", VT_I2, CIM_SINT16 ); check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); check_property( obj, L"OSType", VT_I4, CIM_UINT16 ); + check_property( obj, L"ProductType", VT_I4, CIM_UINT32 ); check_property( obj, L"ServicePackMajorVersion", VT_I4, CIM_UINT16 ); check_property( obj, L"ServicePackMinorVersion", VT_I4, CIM_UINT16 ); check_property( obj, L"SuiteMask", VT_I4, CIM_UINT32 );

1 0