- Wine-Devel - list.winehq.org

[PATCH 1/3] msxml3/tests: Add a test for saving XML with not default encoding.
by Dmitry Timoshkov March 24, 2021

March 24, 2021

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/tests/domdoc.c | 51 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index e94a2c88a81..6ba88cf0bf7 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8522,10 +8522,20 @@ static void test_events(void) static void test_createProcessingInstruction(void) { + static const WCHAR xml1[] = L"<?xml version=\"1.0\"?>\r\n<test/>\r\n"; + static const char xml2[] = "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\r\n<test/>\r\n"; + static const char xml2_vista[] = "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\r\n"; IXMLDOMProcessingInstruction *pi; IXMLDOMDocument *doc; + IXMLDOMNode *node; + IXMLDOMElement *element; WCHAR buff[10]; + BSTR xml; + VARIANT var; HRESULT hr; + IStream *stream; + HGLOBAL global; + char *p; doc = create_document(&IID_IXMLDOMDocument); @@ -8538,6 +8548,47 @@ static void test_createProcessingInstruction(void) IXMLDOMProcessingInstruction_Release(pi); IXMLDOMDocument_Release(doc); + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=\"iso-8859-1\""), &pi); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMProcessingInstruction_QueryInterface(pi, &IID_IXMLDOMNode, (void **)&node); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_appendChild(doc, node, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + IXMLDOMNode_Release(node); + IXMLDOMProcessingInstruction_Release(pi); + + hr = IXMLDOMDocument_createElement(doc, _bstr_("test"), &element); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode *)element, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + IXMLDOMElement_Release(element); + + hr = IXMLDOMDocument_get_xml(doc, &xml); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(!wcscmp(xml, xml1), "got %s\n", wine_dbgstr_w(xml)); + SysFreeString(xml); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown*)stream; + hr = IXMLDOMDocument_save(doc, var); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &global); + ok(hr == S_OK, "got 0x%08x\n", hr); + p = GlobalLock(global); + p[GlobalSize(global)] = 0; +todo_wine + ok(!strcmp(p, xml2) || broken(!strcmp(p, xml2_vista)), "got %s\n", wine_dbgstr_a(p)); + GlobalUnlock(global); + IStream_Release(stream); + + IXMLDOMDocument_Release(doc); } static void test_put_nodeTypedValue(void) -- 2.30.2

2 3

[PATCH 1/6] mfplat/tests: Add a test for d3d11 texture buffer updates.
by Nikolay Sivov March 24, 2021

March 24, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 138 +++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index fdfcf8a5d4b..879240ae1a4 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -93,6 +93,109 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO IUnknown_Release(unk); } +struct d3d11_resource_readback +{ + ID3D11Resource *resource; + D3D11_MAPPED_SUBRESOURCE map_desc; + ID3D11DeviceContext *immediate_context; + unsigned int width, height, depth, sub_resource_idx; +}; + +static void init_d3d11_resource_readback(ID3D11Resource *resource, ID3D11Resource *readback_resource, + unsigned int width, unsigned int height, unsigned int depth, unsigned int sub_resource_idx, + ID3D11Device *device, struct d3d11_resource_readback *rb) +{ + HRESULT hr; + + rb->resource = readback_resource; + rb->width = width; + rb->height = height; + rb->depth = depth; + rb->sub_resource_idx = sub_resource_idx; + + ID3D11Device_GetImmediateContext(device, &rb->immediate_context); + + ID3D11DeviceContext_CopyResource(rb->immediate_context, rb->resource, resource); + if (FAILED(hr = ID3D11DeviceContext_Map(rb->immediate_context, + rb->resource, sub_resource_idx, D3D11_MAP_READ, 0, &rb->map_desc))) + { + trace("Failed to map resource, hr %#x.\n", hr); + ID3D11Resource_Release(rb->resource); + rb->resource = NULL; + ID3D11DeviceContext_Release(rb->immediate_context); + rb->immediate_context = NULL; + } +} + +static void get_d3d11_texture2d_readback(ID3D11Texture2D *texture, unsigned int sub_resource_idx, + struct d3d11_resource_readback *rb) +{ + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11Resource *rb_texture; + unsigned int miplevel; + ID3D11Device *device; + HRESULT hr; + + memset(rb, 0, sizeof(*rb)); + + ID3D11Texture2D_GetDevice(texture, &device); + + ID3D11Texture2D_GetDesc(texture, &texture_desc); + texture_desc.Usage = D3D11_USAGE_STAGING; + texture_desc.BindFlags = 0; + texture_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; + texture_desc.MiscFlags = 0; + if (FAILED(hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, (ID3D11Texture2D **)&rb_texture))) + { + trace("Failed to create texture, hr %#x.\n", hr); + ID3D11Device_Release(device); + return; + } + + miplevel = sub_resource_idx % texture_desc.MipLevels; + init_d3d11_resource_readback((ID3D11Resource *)texture, rb_texture, + max(1, texture_desc.Width >> miplevel), + max(1, texture_desc.Height >> miplevel), + 1, sub_resource_idx, device, rb); + + ID3D11Device_Release(device); +} + +static void release_d3d11_resource_readback(struct d3d11_resource_readback *rb) +{ + ID3D11DeviceContext_Unmap(rb->immediate_context, rb->resource, rb->sub_resource_idx); + ID3D11Resource_Release(rb->resource); + ID3D11DeviceContext_Release(rb->immediate_context); +} + +static void *get_d3d11_readback_data(struct d3d11_resource_readback *rb, + unsigned int x, unsigned int y, unsigned int z, unsigned byte_width) +{ + return (BYTE *)rb->map_desc.pData + z * rb->map_desc.DepthPitch + y * rb->map_desc.RowPitch + x * byte_width; +} + +static DWORD get_d3d11_readback_u32(struct d3d11_resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) +{ + return *(DWORD *)get_d3d11_readback_data(rb, x, y, z, sizeof(DWORD)); +} + +static DWORD get_d3d11_readback_color(struct d3d11_resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) +{ + return get_d3d11_readback_u32(rb, x, y, z); +} + +static DWORD get_d3d11_texture_color(ID3D11Texture2D *texture, unsigned int x, unsigned int y) +{ + struct d3d11_resource_readback rb; + DWORD color; + + get_d3d11_texture2d_readback(texture, 0, &rb); + color = get_d3d11_readback_color(&rb, x, y, 0); + release_d3d11_resource_readback(&rb); + + return color; +} + static HRESULT (WINAPI *pD3D11CreateDevice)(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context); @@ -6201,6 +6304,7 @@ static ID3D11Device *create_d3d11_device(void) static void test_dxgi_surface_buffer(void) { + DWORD max_length, cur_length, color; IMFDXGIBuffer *dxgi_buffer; D3D11_TEXTURE2D_DESC desc; ID3D11Texture2D *texture; @@ -6280,6 +6384,40 @@ static void test_dxgi_surface_buffer(void) IMFDXGIBuffer_Release(dxgi_buffer); + /* Texture updates. */ + color = get_d3d11_texture_color(texture, 0, 0); + ok(!color, "Unexpected texture color %#x.\n", color); + + max_length = cur_length = 0; + data = NULL; + hr = IMFMediaBuffer_Lock(buffer, &data, &max_length, &cur_length); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(max_length && max_length == cur_length, "Unexpected length %u.\n", max_length); +} + if (data) *(DWORD *)data = ~0u; + + color = get_d3d11_texture_color(texture, 0, 0); + ok(!color, "Unexpected texture color %#x.\n", color); + + hr = IMFMediaBuffer_Unlock(buffer); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + color = get_d3d11_texture_color(texture, 0, 0); +todo_wine + ok(color == ~0u, "Unexpected texture color %#x.\n", color); + + hr = IMFMediaBuffer_Lock(buffer, &data, &max_length, &cur_length); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ok(*(DWORD *)data == ~0u, "Unexpected buffer %#x.\n", *(DWORD *)data); + + hr = IMFMediaBuffer_Unlock(buffer); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFMediaBuffer_Release(buffer); ID3D11Texture2D_Release(texture); -- 2.30.2

1 5

[PATCH v2 1/2] widl: Do not generate C++ enum typedefs in WinRT mode.
by Rémi Bernon March 24, 2021

March 24, 2021

MIDL generates enum typedefs without a prior type declaration, as well as using explicit enum underlying type specifier. None of this is supported in MinGW. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- First patch should fix the C++ breakage introduced with 2a7940c97d4e6c, and second patch should fix pre-existing C++ code breakage when using types from different namespaces. Supersedes: 202355-202356 tools/widl/header.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 1a69b298e7d..0a133070b74 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -875,22 +875,28 @@ static void write_typedef(FILE *header, type_t *type, int declonly) type_t *t = type_alias_get_aliasee_type(type); if (winrt_mode && t->namespace && !is_global_namespace(t->namespace)) { - fprintf(header, "#ifdef __cplusplus\n"); - write_namespace_start(header, t->namespace); - indent(header, 0); - } - fprintf(header, "typedef "); - write_type_v(header, type_alias_get_aliasee(type), FALSE, declonly, type->name, NAME_DEFAULT); - fprintf(header, ";\n"); - if (winrt_mode && t->namespace && !is_global_namespace(t->namespace)) - { - write_namespace_end(header, t->namespace); - fprintf(header, "#else /* __cplusplus */\n"); + fprintf(header, "#ifndef __cplusplus\n"); fprintf(header, "typedef "); write_type_v(header, type_alias_get_aliasee(type), FALSE, declonly, type->c_name, NAME_C); fprintf(header, ";\n"); + if (type_get_type_detect_alias(t) != TYPE_ENUM) + { + fprintf(header, "#else /* __cplusplus */\n"); + write_namespace_start(header, t->namespace); + indent(header, 0); + fprintf(header, "typedef "); + write_type_v(header, type_alias_get_aliasee(type), FALSE, declonly, type->name, NAME_DEFAULT); + fprintf(header, ";\n"); + write_namespace_end(header, t->namespace); + } fprintf(header, "#endif /* __cplusplus */\n\n"); } + else + { + fprintf(header, "typedef "); + write_type_v(header, type_alias_get_aliasee(type), FALSE, declonly, type->name, NAME_DEFAULT); + fprintf(header, ";\n"); + } } int is_const_decl(const var_t *var) -- 2.30.2

1 1

[PATCH 5/5] riched20: Add support for WM_PRINTCLIENT.
by Huw Davies March 24, 2021

March 24, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/txthost.c | 43 ++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 81f925c0578..b624fcd377c 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1178,51 +1178,62 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, break; case WM_PAINT: + case WM_PRINTCLIENT: { HDC hdc; - RECT rc, client; + RECT rc, client, update; PAINTSTRUCT ps; HBRUSH brush = CreateSolidBrush( ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ) ); ITextHostImpl_TxGetClientRect( &host->ITextHost_iface, &client ); - hdc = BeginPaint( hwnd, &ps ); + if (msg == WM_PAINT) + { + hdc = BeginPaint( hwnd, &ps ); + update = ps.rcPaint; + } + else + { + hdc = (HDC)wparam; + update = client; + } + brush = SelectObject( hdc, brush ); /* Erase area outside of the formatting rectangle */ - if (ps.rcPaint.top < client.top) + if (update.top < client.top) { - rc = ps.rcPaint; + rc = update; rc.bottom = client.top; PatBlt( hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); - ps.rcPaint.top = client.top; + update.top = client.top; } - if (ps.rcPaint.bottom > client.bottom) + if (update.bottom > client.bottom) { - rc = ps.rcPaint; + rc = update; rc.top = client.bottom; PatBlt( hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); - ps.rcPaint.bottom = client.bottom; + update.bottom = client.bottom; } - if (ps.rcPaint.left < client.left) + if (update.left < client.left) { - rc = ps.rcPaint; + rc = update; rc.right = client.left; PatBlt( hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); - ps.rcPaint.left = client.left; + update.left = client.left; } - if (ps.rcPaint.right > client.right) + if (update.right > client.right) { - rc = ps.rcPaint; + rc = update; rc.left = client.right; PatBlt( hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); - ps.rcPaint.right = client.right; + update.right = client.right; } ITextServices_TxDraw( host->text_srv, DVASPECT_CONTENT, 0, NULL, NULL, hdc, NULL, NULL, NULL, - &ps.rcPaint, NULL, 0, TXTVIEW_ACTIVE ); + &update, NULL, 0, TXTVIEW_ACTIVE ); DeleteObject( SelectObject( hdc, brush ) ); - EndPaint( hwnd, &ps ); + if (msg == WM_PAINT) EndPaint( hwnd, &ps ); return 0; } case EM_REPLACESEL: -- 2.23.0

1 0

[PATCH 4/5] riched20: Remove direct accesses to the editor from the window proc.
by Huw Davies March 24, 2021

March 24, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/txthost.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 2c832db6a76..81f925c0578 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -970,7 +970,6 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL unicode ) { struct host *host; - ME_TextEditor *editor; HRESULT hr = S_OK; LRESULT res = 0; @@ -999,7 +998,6 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, return res; } - editor = host->editor; switch (msg) { case WM_CHAR: @@ -1042,7 +1040,7 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, RECT rc; HBRUSH brush; - if (GetUpdateRect( editor->hWnd, &rc, TRUE )) + if (GetUpdateRect( hwnd, &rc, TRUE )) { brush = CreateSolidBrush( ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ) ); FillRect( hdc, &rc, brush ); @@ -1182,47 +1180,49 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, case WM_PAINT: { HDC hdc; - RECT rc; + RECT rc, client; PAINTSTRUCT ps; HBRUSH brush = CreateSolidBrush( ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ) ); - hdc = BeginPaint( editor->hWnd, &ps ); + ITextHostImpl_TxGetClientRect( &host->ITextHost_iface, &client ); + + hdc = BeginPaint( hwnd, &ps ); brush = SelectObject( hdc, brush ); /* Erase area outside of the formatting rectangle */ - if (ps.rcPaint.top < editor->rcFormat.top) + if (ps.rcPaint.top < client.top) { rc = ps.rcPaint; - rc.bottom = editor->rcFormat.top; + rc.bottom = client.top; PatBlt( hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); - ps.rcPaint.top = editor->rcFormat.top; + ps.rcPaint.top = client.top; } - if (ps.rcPaint.bottom > editor->rcFormat.bottom) + if (ps.rcPaint.bottom > client.bottom) { rc = ps.rcPaint; - rc.top = editor->rcFormat.bottom; + rc.top = client.bottom; PatBlt( hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); - ps.rcPaint.bottom = editor->rcFormat.bottom; + ps.rcPaint.bottom = client.bottom; } - if (ps.rcPaint.left < editor->rcFormat.left) + if (ps.rcPaint.left < client.left) { rc = ps.rcPaint; - rc.right = editor->rcFormat.left; + rc.right = client.left; PatBlt( hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); - ps.rcPaint.left = editor->rcFormat.left; + ps.rcPaint.left = client.left; } - if (ps.rcPaint.right > editor->rcFormat.right) + if (ps.rcPaint.right > client.right) { rc = ps.rcPaint; - rc.left = editor->rcFormat.right; + rc.left = client.right; PatBlt( hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); - ps.rcPaint.right = editor->rcFormat.right; + ps.rcPaint.right = client.right; } ITextServices_TxDraw( host->text_srv, DVASPECT_CONTENT, 0, NULL, NULL, hdc, NULL, NULL, NULL, &ps.rcPaint, NULL, 0, TXTVIEW_ACTIVE ); DeleteObject( SelectObject( hdc, brush ) ); - EndPaint( editor->hWnd, &ps ); + EndPaint( hwnd, &ps ); return 0; } case EM_REPLACESEL: @@ -1473,7 +1473,7 @@ static BOOL register_classes( HINSTANCE instance ) wcW.style = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS; wcW.lpfnWndProc = RichEditWndProcW; wcW.cbClsExtra = 0; - wcW.cbWndExtra = sizeof(ME_TextEditor *); + wcW.cbWndExtra = sizeof(struct host *); wcW.hInstance = NULL; /* hInstance would register DLL-local class */ wcW.hIcon = NULL; wcW.hCursor = LoadCursorW( NULL, (LPWSTR)IDC_IBEAM ); @@ -1499,7 +1499,7 @@ static BOOL register_classes( HINSTANCE instance ) wcA.style = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS; wcA.lpfnWndProc = RichEditWndProcA; wcA.cbClsExtra = 0; - wcA.cbWndExtra = sizeof(ME_TextEditor *); + wcA.cbWndExtra = sizeof(struct host *); wcA.hInstance = NULL; /* hInstance would register DLL-local class */ wcA.hIcon = NULL; wcA.hCursor = LoadCursorW( NULL, (LPWSTR)IDC_IBEAM ); -- 2.23.0

1 0

[PATCH 3/5] riched20: Use TxDraw() to implement the host's WM_PAINT handler.
by Huw Davies March 24, 2021

March 24, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.h | 2 +- dlls/riched20/txthost.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 075fe534783..929e10a3179 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -390,7 +390,7 @@ extern const struct ITextServicesVtbl text_services_stdcall_vtbl DECLSPEC_HIDDEN #define TXTSERV_VTABLE(This) (This)->lpVtbl #endif #define ITextServices_TxSendMessage(This,a,b,c,d) TXTSERV_VTABLE(This)->TxSendMessage(This,a,b,c,d) -#define ITextServices_TxDraw(This,a,b,c,d,e,f,g,h,i,j,k,l) TXTSERV_VTABLE(This)->ITextServices_TxDraw(This,a,b,c,d,e,f,g,h,i,j,k,l) +#define ITextServices_TxDraw(This,a,b,c,d,e,f,g,h,i,j,k,l) TXTSERV_VTABLE(This)->TxDraw(This,a,b,c,d,e,f,g,h,i,j,k,l) #define ITextServices_TxGetHScroll(This,a,b,c,d,e) TXTSERV_VTABLE(This)->TxGetHScroll(This,a,b,c,d,e) #define ITextServices_TxGetVScroll(This,a,b,c,d,e) TXTSERV_VTABLE(This)->TxGetVScroll(This,a,b,c,d,e) #define ITextServices_OnTxSetCursor(This,a,b,c,d,e,f,g,h,i) TXTSERV_VTABLE(This)->OnTxSetCursor(This,a,b,c,d,e,f,g,h,i) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 1fd989d5ed4..2c832db6a76 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1219,7 +1219,8 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, ps.rcPaint.right = editor->rcFormat.right; } - editor_draw( editor, hdc, &ps.rcPaint ); + ITextServices_TxDraw( host->text_srv, DVASPECT_CONTENT, 0, NULL, NULL, hdc, NULL, NULL, NULL, + &ps.rcPaint, NULL, 0, TXTVIEW_ACTIVE ); DeleteObject( SelectObject( hdc, brush ) ); EndPaint( editor->hWnd, &ps ); return 0; -- 2.23.0

1 0

[PATCH 2/5] riched20: Send EN_UPDATE from text services.
by Huw Davies March 24, 2021

March 24, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/paint.c | 5 ++++- dlls/riched20/txthost.c | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 0addf7d5656..4704f43c2c3 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -132,11 +132,14 @@ void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) editor_ensure_visible( editor, &editor->pCursors[0] ); update_caret( editor ); + + if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) + ME_SendOldNotify( editor, EN_UPDATE ); + ITextHost_TxViewChange(editor->texthost, update_now); ME_SendSelChange(editor); - /* send EN_CHANGE if the event mask asks for it */ if(editor->nEventMask & ENM_CHANGE) { editor->nEventMask &= ~ENM_CHANGE; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 9e384d0c503..1fd989d5ed4 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1187,8 +1187,6 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, HBRUSH brush = CreateSolidBrush( ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ) ); hdc = BeginPaint( editor->hWnd, &ps ); - if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) - ME_SendOldNotify( editor, EN_UPDATE ); brush = SelectObject( hdc, brush ); /* Erase area outside of the formatting rectangle */ -- 2.23.0

1 0

[PATCH 1/5] riched20: Don't call update_caret() from the host.
by Huw Davies March 24, 2021

March 24, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 1 - dlls/riched20/paint.c | 1 + dlls/riched20/txthost.c | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 293ac0bad5a..4f66220d230 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1795,7 +1795,6 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre if (!(format & SFF_SELECTION)) { ME_ClearTempStyle(editor); } - update_caret(editor); ME_SendSelChange(editor); ME_SendRequestResize(editor, FALSE); diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 4be76e441d0..0addf7d5656 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -131,6 +131,7 @@ void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) /* Ensure that the cursor is visible */ editor_ensure_visible( editor, &editor->pCursors[0] ); + update_caret( editor ); ITextHost_TxViewChange(editor->texthost, update_now); ME_SendSelChange(editor); diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index ab13879c664..9e384d0c503 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1186,7 +1186,6 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, PAINTSTRUCT ps; HBRUSH brush = CreateSolidBrush( ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ) ); - update_caret( editor ); hdc = BeginPaint( editor->hWnd, &ps ); if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) ME_SendOldNotify( editor, EN_UPDATE ); -- 2.23.0

1 0

[PATCH 2/2] winedump: Dump more fields for EMR_EXTTEXTOUTW records.
by Zhiyi Zhang March 24, 2021

March 24, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- tools/winedump/emf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index f3c92ac0539..d44f7a806a5 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -357,7 +357,9 @@ static int dump_emfrecord(void) const EMREXTTEXTOUTW *etoW = PRD(offset, sizeof(*etoW)); printf("%-20s %08x\n", "EMR_EXTTEXTOUTW", length); - printf("pt (%d,%d) rect (%d,%d - %d,%d) flags %#x, %s\n", + printf("bounds (%d,%d - %d,%d) mode %#x x_scale %f y_scale %f pt (%d,%d) rect (%d,%d - %d,%d) flags %#x, %s\n", + etoW->rclBounds.left, etoW->rclBounds.top, etoW->rclBounds.right, etoW->rclBounds.bottom, + etoW->iGraphicsMode, etoW->exScale, etoW->eyScale, etoW->emrtext.ptlReference.x, etoW->emrtext.ptlReference.y, etoW->emrtext.rcl.left, etoW->emrtext.rcl.top, etoW->emrtext.rcl.right, etoW->emrtext.rcl.bottom, -- 2.27.0

1 0

[PATCH 1/2] winedump: Dump EMR_HEADER record.
by Zhiyi Zhang March 24, 2021

March 24, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- tools/winedump/emf.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index cce66c838b6..f3c92ac0539 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -93,7 +93,22 @@ static int dump_emfrecord(void) switch(type) { - EMRCASE(EMR_HEADER); + case EMR_HEADER: + { + const ENHMETAHEADER *header = PRD(offset, sizeof(*header)); + + printf("%-20s %08x\n", "EMR_HEADER", length); + printf("bounds (%d,%d - %d,%d) frame (%d,%d - %d,%d) signature %#x version %#x bytes %#x records %#x\n" + "handles %#x reserved %#x palette entries %#x px %dx%d mm %dx%d μm %dx%d opengl %d description %s\n", + header->rclBounds.left, header->rclBounds.top, header->rclBounds.right, header->rclBounds.bottom, + header->rclFrame.left, header->rclFrame.top, header->rclFrame.right, header->rclFrame.bottom, + header->dSignature, header->nVersion, header->nBytes, header->nRecords, header->nHandles, header->sReserved, + header->nPalEntries, header->szlDevice.cx, header->szlDevice.cy, header->szlMillimeters.cx, + header->szlMillimeters.cy, header->szlMicrometers.cx, header->szlMicrometers.cy, header->bOpenGL, + debugstr_wn((LPCWSTR)((const BYTE *)header + header->offDescription), header->nDescription)); + break; + } + EMRCASE(EMR_POLYBEZIER); EMRCASE(EMR_POLYGON); EMRCASE(EMR_POLYLINE); -- 2.27.0

1 0