August 2017 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Added delayed DispatchEx init support and use it to expose IHTMLDOMNode3 from document node.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: 856dc7eda432517d6e3c9b0c64e7e12ae4e38895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=856dc7eda432517d6e3c9b0c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 21 21:35:57 2017 +0200 mshtml: Added delayed DispatchEx init support and use it to expose IHTMLDOMNode3 from document node. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 63 ++++++++++++++++++++++++++++++++------- dlls/mshtml/htmldoc.c | 14 ++++++++- dlls/mshtml/htmlelem.c | 1 + dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/documentmode.js | 17 +++++++++++ dlls/mshtml/tests/elements.js | 2 ++ dlls/mshtml/xmlhttprequest.c | 1 + 8 files changed, 90 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index baf251a..95c17b8 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -62,7 +62,7 @@ typedef struct { } func_info_t; struct dispex_data_t { - const dispex_static_data_t *desc; + dispex_static_data_t *desc; DWORD func_cnt; DWORD func_size; @@ -379,7 +379,7 @@ static int func_name_cmp(const void *p1, const void *p2) return strcmpiW((*(func_info_t* const*)p1)->name, (*(func_info_t* const*)p2)->name); } -static dispex_data_t *preprocess_dispex_data(const dispex_static_data_t *desc, compat_mode_t compat_mode) +static dispex_data_t *preprocess_dispex_data(dispex_static_data_t *desc, compat_mode_t compat_mode) { const tid_t *tid; dispex_data_t *data; @@ -1346,6 +1346,27 @@ HRESULT remove_attribute(DispatchEx *This, DISPID id, VARIANT_BOOL *success) } } +static dispex_data_t *ensure_dispex_info(dispex_static_data_t *desc, compat_mode_t compat_mode) +{ + if(!desc->info_cache[compat_mode]) { + EnterCriticalSection(&cs_dispex_static_data); + if(!desc->info_cache[compat_mode]) + desc->info_cache[compat_mode] = preprocess_dispex_data(desc, compat_mode); + LeaveCriticalSection(&cs_dispex_static_data); + } + return desc->info_cache[compat_mode]; +} + +static BOOL ensure_real_info(DispatchEx *dispex) +{ + if(dispex->info != dispex->info->desc->delayed_init_info) + return TRUE; + + dispex->info = ensure_dispex_info(dispex->info->desc, + dispex->info->desc->vtbl->get_compat_mode(dispex)); + return dispex->info != NULL; +} + static inline DispatchEx *impl_from_IDispatchEx(IDispatchEx *iface) { return CONTAINING_RECORD(iface, DispatchEx, IDispatchEx_iface); @@ -1442,6 +1463,9 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW if(grfdex & ~(fdexNameCaseSensitive|fdexNameCaseInsensitive|fdexNameEnsure|fdexNameImplicit|FDEX_VERSION_MASK)) FIXME("Unsupported grfdex %x\n", grfdex); + if(!ensure_real_info(This)) + return E_OUTOFMEMORY; + hres = get_builtin_id(This, bstrName, grfdex, pid); if(hres != DISP_E_UNKNOWNNAME) return hres; @@ -1462,6 +1486,9 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + if(!ensure_real_info(This)) + return E_OUTOFMEMORY; + if(wFlags == (DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF)) wFlags = DISPATCH_PROPERTYPUT; @@ -1572,6 +1599,9 @@ static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BS TRACE("(%p)->(%x %p)\n", This, id, pbstrName); + if(!ensure_real_info(This)) + return E_OUTOFMEMORY; + if(is_dynamic_dispid(id)) { DWORD idx = id - DISPID_DYNPROP_0; @@ -1617,6 +1647,9 @@ static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, TRACE("(%p)->(%x %x %p)\n", This, grfdex, id, pid); + if(!ensure_real_info(This)) + return E_OUTOFMEMORY; + if(is_dynamic_dispid(id)) { DWORD idx = id - DISPID_DYNPROP_0; @@ -1770,15 +1803,25 @@ void init_dispex_with_compat_mode(DispatchEx *dispex, IUnknown *outer, dispex_st { assert(compat_mode < COMPAT_MODE_CNT); - if(!data->info_cache[compat_mode]) { - EnterCriticalSection(&cs_dispex_static_data); - if(!data->info_cache[compat_mode]) - data->info_cache[compat_mode] = preprocess_dispex_data(data, compat_mode); - LeaveCriticalSection(&cs_dispex_static_data); - } - dispex->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; dispex->outer = outer; - dispex->info = data->info_cache[compat_mode]; dispex->dynamic_data = NULL; + + if(data->vtbl && data->vtbl->get_compat_mode) { + /* delayed init */ + if(!data->delayed_init_info) { + EnterCriticalSection(&cs_dispex_static_data); + if(!data->delayed_init_info) { + dispex_data_t *info = heap_alloc_zero(sizeof(*data->delayed_init_info)); + if(info) { + info->desc = data; + data->delayed_init_info = info; + } + } + LeaveCriticalSection(&cs_dispex_static_data); + } + dispex->info = data->delayed_init_info; + }else { + dispex->info = ensure_dispex_info(data, compat_mode); + } } diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 3c16d2c..a8d104e 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4813,6 +4813,16 @@ static HRESULT HTMLDocumentNode_invoke(DispatchEx *dispex, DISPID id, LCID lcid, return S_OK; } +static compat_mode_t HTMLDocumentNode_get_compat_mode(DispatchEx *dispex) +{ + HTMLDocumentNode *This = impl_from_DispatchEx(dispex); + + TRACE("(%p) returning %u\n", This, This->document_mode); + + This->document_mode_locked = TRUE; + return This->document_mode; +} + static void HTMLDocumentNode_bind_event(DispatchEx *dispex, int eid) { HTMLDocumentNode *This = impl_from_DispatchEx(dispex); @@ -4823,6 +4833,7 @@ static const dispex_static_data_vtbl_t HTMLDocumentNode_dispex_vtbl = { NULL, NULL, HTMLDocumentNode_invoke, + HTMLDocumentNode_get_compat_mode, NULL, NULL, HTMLDocumentNode_bind_event @@ -4851,7 +4862,8 @@ static const tid_t HTMLDocumentNode_iface_tids[] = { static dispex_static_data_t HTMLDocumentNode_dispex = { &HTMLDocumentNode_dispex_vtbl, DispHTMLDocument_tid, - HTMLDocumentNode_iface_tids + HTMLDocumentNode_iface_tids, + HTMLDOMNode_init_dispex_info }; static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLInnerWindow *window) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 927541b..247948c 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5319,6 +5319,7 @@ static dispex_static_data_vtbl_t HTMLElement_dispex_vtbl = { NULL, HTMLElement_get_dispid, HTMLElement_invoke, + NULL, HTMLElement_populate_props, HTMLElement_get_event_target, HTMLElement_bind_event diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 5853220..dc18f84 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3019,6 +3019,7 @@ static const dispex_static_data_vtbl_t HTMLWindow_dispex_vtbl = { NULL, HTMLWindow_invoke, NULL, + NULL, HTMLWindow_get_event_target, HTMLWindow_bind_event }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2ee34c1..f10a793 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -267,6 +267,7 @@ typedef struct { HRESULT (*value)(DispatchEx*,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); HRESULT (*get_dispid)(DispatchEx*,BSTR,DWORD,DISPID*); HRESULT (*invoke)(DispatchEx*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); + compat_mode_t (*get_compat_mode)(DispatchEx*); HRESULT (*populate_props)(DispatchEx*); /* We abuse this vtbl for EventTarget functions to avoid separated vtbl. */ EventTarget *(*get_event_target)(DispatchEx*); @@ -279,6 +280,7 @@ typedef struct { const tid_t* const iface_tids; void (*init_info)(dispex_data_t*,compat_mode_t); dispex_data_t *info_cache[COMPAT_MODE_CNT]; + dispex_data_t *delayed_init_info; } dispex_static_data_t; struct DispatchEx { diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 69ec6a3..4224dfe 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -39,6 +39,22 @@ function test_elem_props() { next_test(); } +function test_doc_props() { + function test_exposed(prop, expect) { + if(expect) + ok(prop in document, prop + " not found in document."); + else + ok(!(prop in document), prop + " found in document."); + } + + var v = document.documentMode; + + test_exposed("textContent", v >= 9); + test_exposed("prefix", v >= 9); + + next_test(); +} + function test_doc_mode() { compat_version = parseInt(document.location.search.substring(1)); @@ -99,5 +115,6 @@ function test_conditional_comments() { var tests = [ test_doc_mode, test_elem_props, + test_doc_props, test_conditional_comments ]; diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index b7db0bc..ac1e2d0 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -77,6 +77,8 @@ function test_textContent() { ok(div.textContent === "", "div.textContent = " + div.textContent); ok(div.childNodes.length === 0, "div.childNodes.length = " + div.childNodes.length); + ok(document.textContent === null, "document.textContent = " + document.textContent); + next_test(); } diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 1565f9b..35e91fc 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -778,6 +778,7 @@ static dispex_static_data_vtbl_t HTMLXMLHttpRequest_dispex_vtbl = { NULL, NULL, NULL, + NULL, HTMLXMLHttpRequest_bind_event };

1 0

Jacek Caban : mshtml: Don' t allow changing document mode after script insertion or when it' s already set.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: 53253aa6a42f767ab21052419e4e7454144f0aae URL: http://source.winehq.org/git/wine.git/?a=commit;h=53253aa6a42f767ab21052419… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 22 17:54:54 2017 +0200 mshtml: Don't allow changing document mode after script insertion or when it's already set. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 4 +++- dlls/mshtml/mutation.c | 16 ++++++++++--- dlls/mshtml/tests/dom.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1e12a6e..2ee34c1 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -811,9 +811,11 @@ struct HTMLDocumentNode { LONG ref; - compat_mode_t document_mode; HTMLInnerWindow *window; + compat_mode_t document_mode; + BOOL document_mode_locked; + nsIDOMHTMLDocument *nsdoc; BOOL content_ready; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 50e162e..cf69b60 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -370,9 +370,17 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa return NS_OK; } -static void set_document_mode(HTMLDocumentNode *doc, compat_mode_t document_mode) +static void set_document_mode(HTMLDocumentNode *doc, compat_mode_t document_mode, BOOL lock) { + if(doc->document_mode_locked) { + WARN("attemting to set document mode %d on locked document %p\n", document_mode, doc); + return; + } + TRACE("%p: %d\n", doc, document_mode); + + if(lock) + doc->document_mode_locked = TRUE; doc->document_mode = document_mode; } @@ -444,7 +452,7 @@ static void process_meta_element(HTMLDocumentNode *doc, nsIDOMHTMLMetaElement *m if(!strcmpiW(http_equiv, x_ua_compatibleW)) { compat_mode_t document_mode; if(parse_ua_compatible(content, &document_mode)) - set_document_mode(doc, document_mode); + set_document_mode(doc, document_mode, TRUE); else FIXME("Unsupported document mode %s\n", debugstr_w(content)); } @@ -755,7 +763,7 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, if(NS_SUCCEEDED(nsres)) { TRACE("doctype node\n"); /* FIXME: We should set it to something higher for internet zone. */ - set_document_mode(This, COMPAT_MODE_IE7); + set_document_mode(This, COMPAT_MODE_IE7, FALSE); nsIDOMDocumentType_Release(nsdoctype); } } @@ -814,6 +822,8 @@ static void NSAPI nsDocumentObserver_AttemptToExecuteScript(nsIDocumentObserver if(NS_SUCCEEDED(nsres)) { TRACE("script node\n"); + This->document_mode_locked = TRUE; + add_script_runner(This, run_insert_script, (nsISupports*)nsscript, (nsISupports*)aParser); nsIDOMHTMLScriptElement_Release(nsscript); } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5276166..c6053a6 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -10530,12 +10530,65 @@ static void run_domtest(const char *str, domtest_t test) "ref = %d\n", ref); } +static float expected_document_mode; + +static void test_document_mode(IHTMLDocument2 *doc2) +{ + IHTMLDocument6 *doc; + VARIANT v; + HRESULT hres; + + if(expected_document_mode >= 9) { + IHTMLDocument7 *doc7; + hres = IHTMLDocument2_QueryInterface(doc2, &IID_IHTMLDocument7, (void**)&doc7); + if(FAILED(hres)) { + win_skip("IHTMLDocument7 interface not supported: %08x\n", hres); + return; + } + IHTMLDocument7_Release(doc7); + } + + hres = IHTMLDocument2_QueryInterface(doc2, &IID_IHTMLDocument6, (void**)&doc); + ok(hres == S_OK, "Could not get IHTMLDocument6 interface: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLDocument6_get_documentMode(doc, &v); + ok(hres == S_OK, "get_documentMode failed: %08x\n", hres); + ok(V_VT(&v) == VT_R4, "V_VT(documentMode) = %u\n", V_VT(&v)); + ok(V_R4(&v) == expected_document_mode, "documentMode = %f\n", V_R4(&v)); + IHTMLDocument6_Release(doc); +} + static void test_quirks_mode(void) { run_domtest("<html></html>", check_quirks_mode); run_domtest("<!DOCTYPE html>\n<html></html>", check_strict_mode); run_domtest("<!DOCTYPE html>\n<html></html>", check_quirks_mode); run_domtest("<html><body></body></html>", test_quirks_mode_offsetHeight); + + expected_document_mode = 5; + run_domtest("<html><body></body></html>", test_document_mode); + + expected_document_mode = 9; + run_domtest("<!DOCTYPE html>\n" + "<html>" + " <head>" + " <meta http-equiv=\"x-ua-compatible\" content=\"IE=9\" />" + " </head>" + " <body>" + " </body>" + "</html>", test_document_mode); + + expected_document_mode = 8; + run_domtest("<!DOCTYPE html>\n" + "<html>" + " <head>" + " <meta http-equiv=\"x-ua-compatible\" content=\"IE=8\" />" + " <meta http-equiv=\"x-ua-compatible\" content=\"IE=9\" />" + " </head>" + " <body>" + " </body>" + "</html>", test_document_mode); } START_TEST(dom)

1 0

Dmitry Timoshkov : gdiplus/tests: Add a test for loading PNG grayscale images.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: ae65558ba180808c7ea7f802e13878e720f72a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae65558ba180808c7ea7f802e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 21 11:12:30 2017 -0500 gdiplus/tests: Add a test for loading PNG grayscale images. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 60 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 225dc54..989c217 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2,7 +2,7 @@ * Unit test suite for images * * Copyright (C) 2007 Google (Evan Stade) - * Copyright (C) 2012 Dmitry Timoshkov + * Copyright (C) 2012, 2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -4966,6 +4966,63 @@ static void test_imageabort(void) GdipDisposeImage((GpImage*)bm); } +/* RGB 24 bpp 1x1 pixel PNG image */ +static const char png_1x1_data[] = { + 0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a, + 0x00,0x00,0x00,0x0d,'I','H','D','R',0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x08,0x02,0x00,0x00,0x00,0x90,0x77,0x53,0xde, + 0x00,0x00,0x00,0x0c,'I','D','A','T',0x08,0xd7,0x63,0xf8,0xff,0xff,0x3f,0x00,0x05,0xfe,0x02,0xfe,0xdc,0xcc,0x59,0xe7, + 0x00,0x00,0x00,0x00,'I','E','N','D',0xae,0x42,0x60,0x82 +}; + +static void test_png_color_formats(void) +{ + static const struct + { + char bit_depth, color_type; + PixelFormat format; + } td[] = + { + /* 2 - PNG_COLOR_TYPE_RGB */ + { 8, 2, PixelFormat24bppRGB }, + /* 0 - PNG_COLOR_TYPE_GRAY */ + { 1, 0, PixelFormat1bppIndexed }, + { 2, 0, PixelFormat32bppARGB }, + { 4, 0, PixelFormat32bppARGB }, + { 8, 0, PixelFormat32bppARGB }, + { 16, 0, PixelFormat32bppARGB }, + }; + BYTE buf[sizeof(png_1x1_data)]; + GpStatus status; + GpImage *image; + ImageType type; + PixelFormat format; + int i; + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + memcpy(buf, png_1x1_data, sizeof(png_1x1_data)); + buf[24] = td[i].bit_depth; + buf[25] = td[i].color_type; + + image = load_image(buf, sizeof(buf)); + ok(image != NULL, "%d: failed to load image data\n", i); + if (!image) continue; + + status = GdipGetImageType(image, &type); + ok(status == Ok, "%u: GdipGetImageType error %d\n", i, status); + ok(type == ImageTypeBitmap, "%d: wrong image type %d\n", i, type); + + status = GdipGetImagePixelFormat(image, &format); + expect(Ok, status); +todo_wine_if(td[i].bit_depth == 8 && td[i].color_type == 0) + ok(format == td[i].format || + broken(td[i].bit_depth == 1 && td[i].color_type == 0 && format == PixelFormat32bppARGB), /* XP */ + "%d: expected %#x, got %#x\n", i, td[i].format, format); + + GdipDisposeImage(image); + } +} + START_TEST(image) { HMODULE mod = GetModuleHandleA("gdiplus.dll"); @@ -4990,6 +5047,7 @@ START_TEST(image) pGdipBitmapGetHistogram = (void*)GetProcAddress(mod, "GdipBitmapGetHistogram"); pGdipImageSetAbort = (void*)GetProcAddress(mod, "GdipImageSetAbort"); + test_png_color_formats(); test_supported_encoders(); test_CloneBitmapArea(); test_ARGB_conversion();

1 0

Huw Davies : riched20: Use the implementation of EM_PASTESPECIAL for EM_CANPASTE.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: bbf34a4ab17c872f119626fc43c09a1f61f0e650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbf34a4ab17c872f119626fc4… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 21 12:31:50 2017 +0100 riched20: Use the implementation of EM_PASTESPECIAL for EM_CANPASTE. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 383b307..b66d8e8 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4039,14 +4039,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return 1; } case EM_CANPASTE: - { - UINT nRTFFormat = RegisterClipboardFormatA("Rich Text Format"); - if (IsClipboardFormatAvailable(nRTFFormat)) - return TRUE; - if (IsClipboardFormatAvailable(CF_UNICODETEXT)) - return TRUE; - return FALSE; - } + return paste_special( editor, 0, NULL, TRUE ); case WM_PASTE: case WM_MBUTTONDOWN: wParam = 0;

1 0

Huw Davies : riched20: Add support for EM_PASTESPECIAL.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: 9bec53fbad3b773db991dea9091fb0390592020d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bec53fbad3b773db991dea90… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 21 12:31:48 2017 +0100 riched20: Add support for EM_PASTESPECIAL. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 103 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9174ece..5f9da92 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2209,6 +2209,106 @@ static DWORD CALLBACK ME_ReadFromHGLOBALRTF(DWORD_PTR dwCookie, LPBYTE lpBuff, L return 0; } +static const WCHAR rtfW[] = {'R','i','c','h',' ','T','e','x','t',' ','F','o','r','m','a','t',0}; + +static HRESULT paste_rtf(ME_TextEditor *editor, FORMATETC *fmt, STGMEDIUM *med) +{ + EDITSTREAM es; + ME_GlobalDestStruct gds; + HRESULT hr; + + gds.hData = med->u.hGlobal; + gds.nLength = 0; + es.dwCookie = (DWORD_PTR)&gds; + es.pfnCallback = ME_ReadFromHGLOBALRTF; + hr = ME_StreamIn( editor, SF_RTF | SFF_SELECTION, &es, FALSE ) == 0 ? E_FAIL : S_OK; + ReleaseStgMedium( med ); + return hr; +} + +static HRESULT paste_text(ME_TextEditor *editor, FORMATETC *fmt, STGMEDIUM *med) +{ + EDITSTREAM es; + ME_GlobalDestStruct gds; + HRESULT hr; + + gds.hData = med->u.hGlobal; + gds.nLength = 0; + es.dwCookie = (DWORD_PTR)&gds; + es.pfnCallback = ME_ReadFromHGLOBALUnicode; + hr = ME_StreamIn( editor, SF_TEXT | SF_UNICODE | SFF_SELECTION, &es, FALSE ) == 0 ? E_FAIL : S_OK; + ReleaseStgMedium( med ); + return hr; +} + +static struct paste_format +{ + FORMATETC fmt; + HRESULT (*paste)(ME_TextEditor *, FORMATETC *, STGMEDIUM *); + const WCHAR *name; +} paste_formats[] = +{ + {{ -1, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, paste_rtf, rtfW }, + {{ CF_UNICODETEXT, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, paste_text }, + {{ 0 }} +}; + +static void init_paste_formats(void) +{ + struct paste_format *format; + static int done; + + if (!done) + { + for (format = paste_formats; format->fmt.cfFormat; format++) + { + if (format->name) + format->fmt.cfFormat = RegisterClipboardFormatW( format->name ); + } + done = 1; + } +} + +static BOOL paste_special(ME_TextEditor *editor, UINT cf, REPASTESPECIAL *ps, BOOL check_only) +{ + HRESULT hr; + STGMEDIUM med; + struct paste_format *format; + IDataObject *data; + + init_paste_formats(); + + if (ps && ps->dwAspect != DVASPECT_CONTENT) + FIXME("Ignoring aspect %x\n", ps->dwAspect); + + hr = OleGetClipboard( &data ); + if (hr != S_OK) return FALSE; + + if (cf == CF_TEXT) cf = CF_UNICODETEXT; + + hr = S_FALSE; + for (format = paste_formats; format->fmt.cfFormat; format++) + { + if (cf && cf != format->fmt.cfFormat) continue; + hr = IDataObject_QueryGetData( data, &format->fmt ); + if (hr == S_OK) + { + if (!check_only) + { + hr = IDataObject_GetData( data, &format->fmt, &med ); + if (hr != S_OK) goto done; + hr = format->paste( editor, &format->fmt, &med ); + } + break; + } + } + +done: + IDataObject_Release( data ); + + return hr == S_OK; +} + static BOOL ME_Paste(ME_TextEditor *editor) { DWORD dwFormat = 0; @@ -3410,7 +3510,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, UNSUPPORTED_MSG(EM_GETTYPOGRAPHYOPTIONS) UNSUPPORTED_MSG(EM_GETUNDONAME) UNSUPPORTED_MSG(EM_GETWORDBREAKPROCEX) - UNSUPPORTED_MSG(EM_PASTESPECIAL) UNSUPPORTED_MSG(EM_SELECTIONTYPE) UNSUPPORTED_MSG(EM_SETBIDIOPTIONS) UNSUPPORTED_MSG(EM_SETEDITSTYLE) @@ -3979,6 +4078,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_MBUTTONDOWN: ME_Paste(editor); return 0; + case EM_PASTESPECIAL: + paste_special( editor, wParam, (REPASTESPECIAL *)lParam, FALSE ); + return 0; case WM_CUT: case WM_COPY: {

1 0

Huw Davies : riched20: Don' t create a special richedit ole instance for the RTF parser.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: 417c80d6fe1bdbf7cf314dec9cdae3b115dc4622 URL: http://source.winehq.org/git/wine.git/?a=commit;h=417c80d6fe1bdbf7cf314dec9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 21 12:31:47 2017 +0100 riched20: Don't create a special richedit ole instance for the RTF parser. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 27 +++++++++++++-------------- dlls/riched20/rtf.h | 1 - 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 51b0cad..9174ece 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1122,8 +1122,8 @@ void ME_RTFSpecialCharHook(RTF_Info *info) } } -static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbmp, - const SIZEL* sz) +static HRESULT insert_static_object(ME_TextEditor *editor, HENHMETAFILE hemf, HBITMAP hbmp, + const SIZEL* sz) { LPOLEOBJECT lpObject = NULL; LPSTORAGE lpStorage = NULL; @@ -1133,7 +1133,7 @@ static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbm STGMEDIUM stgm; FORMATETC fm; CLSID clsid; - BOOL ret = FALSE; + HRESULT hr = E_FAIL; DWORD conn; if (hemf) @@ -1155,13 +1155,14 @@ static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbm fm.lindex = -1; fm.tymed = stgm.tymed; - if (!info->lpRichEditOle) + if (!editor->reOle) { - CreateIRichEditOle(NULL, info->editor, (VOID**)&info->lpRichEditOle); + if (!CreateIRichEditOle(NULL, editor, (LPVOID *)&editor->reOle)) + return hr; } if (OleCreateDefaultHandler(&CLSID_NULL, NULL, &IID_IOleObject, (void**)&lpObject) == S_OK && - IRichEditOle_GetClientSite(info->lpRichEditOle, &lpClientSite) == S_OK && + IRichEditOle_GetClientSite(editor->reOle, &lpClientSite) == S_OK && IOleObject_SetClientSite(lpObject, lpClientSite) == S_OK && IOleObject_GetUserClassID(lpObject, &clsid) == S_OK && IOleObject_QueryInterface(lpObject, &IID_IOleCache, (void**)&lpOleCache) == S_OK && @@ -1184,8 +1185,8 @@ static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbm reobject.dwFlags = 0; /* FIXME */ reobject.dwUser = 0; - ME_InsertOLEFromCursor(info->editor, &reobject, 0); - ret = TRUE; + ME_InsertOLEFromCursor(editor, &reobject, 0); + hr = S_OK; } if (lpObject) IOleObject_Release(lpObject); @@ -1194,7 +1195,7 @@ static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbm if (lpDataObject) IDataObject_Release(lpDataObject); if (lpOleCache) IOleCache_Release(lpOleCache); - return ret; + return hr; } static void ME_RTFReadShpPictGroup( RTF_Info *info ) @@ -1353,11 +1354,11 @@ static void ME_RTFReadPictGroup(RTF_Info *info) { case gfx_enhmetafile: if ((hemf = SetEnhMetaFileBits( size, buffer ))) - ME_RTFInsertOleObject( info, hemf, NULL, &sz ); + insert_static_object( info->editor, hemf, NULL, &sz ); break; case gfx_metafile: if ((hemf = SetWinMetaFileBits( size, buffer, NULL, &mfp ))) - ME_RTFInsertOleObject( info, hemf, NULL, &sz ); + insert_static_object( info->editor, hemf, NULL, &sz ); break; case gfx_dib: { @@ -1371,7 +1372,7 @@ static void ME_RTFReadPictGroup(RTF_Info *info) if ((hbmp = CreateDIBitmap( hdc, &bi->bmiHeader, CBM_INIT, (char*)(bi + 1) + nc * sizeof(RGBQUAD), bi, DIB_RGB_COLORS)) ) - ME_RTFInsertOleObject( info, NULL, hbmp, &sz ); + insert_static_object( info->editor, NULL, hbmp, &sz ); ReleaseDC( 0, hdc ); break; } @@ -1727,8 +1728,6 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre } ME_CheckTablesForCorruption(editor); RTFDestroy(&parser); - if (parser.lpRichEditOle) - IRichEditOle_Release(parser.lpRichEditOle); if (parser.stackTop > 0) { diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index cc53c61..66d88b5 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -1175,7 +1175,6 @@ struct _RTF_Info { RTFState stack[maxStack]; int stackTop; BOOL styleChanged; - LPRICHEDITOLE lpRichEditOle; RTFTable *tableDef; int nestingLevel;

1 0

Huw Davies : riched20: Retrieve the default paragraph alignment from the text host.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: 5cc8c9fe83d6d6deb95f2ec743f6c629480e2a96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc8c9fe83d6d6deb95f2ec74… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 21 12:31:45 2017 +0100 riched20: Retrieve the default paragraph alignment from the text host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 9 ++------- dlls/riched20/editor.h | 2 +- dlls/riched20/editstr.h | 1 - dlls/riched20/para.c | 14 +++++++++++++- dlls/riched20/txthost.c | 15 +++++++++++++-- dlls/riched20/txtsrv.c | 2 +- 6 files changed, 30 insertions(+), 13 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index f5b9e4c..3cd80be 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2884,7 +2884,7 @@ static BOOL ME_ShowContextMenu(ME_TextEditor *editor, int x, int y) return TRUE; } -ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10, DWORD csStyle) +ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) { ME_TextEditor *ed = ALLOC_OBJ(ME_TextEditor); int i; @@ -2898,11 +2898,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10, DWORD ed->reOle = NULL; ed->bEmulateVersion10 = bEmulateVersion10; ed->styleFlags = 0; - ed->alignStyle = PFA_LEFT; - if (csStyle & ES_RIGHT) - ed->alignStyle = PFA_RIGHT; - if (csStyle & ES_CENTER) - ed->alignStyle = PFA_CENTER; ITextHost_TxGetPropertyBits(texthost, (TXTBIT_RICHTEXT|TXTBIT_MULTILINE| TXTBIT_READONLY|TXTBIT_USEPASSWORD| @@ -4799,7 +4794,7 @@ static BOOL create_windowed_editor(HWND hwnd, CREATESTRUCTW *create, BOOL emulat if (!host) return FALSE; - editor = ME_MakeEditor( host, emulate_10, create->style ); + editor = ME_MakeEditor( host, emulate_10 ); if (!editor) { ITextHost_Release( host ); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 237036c..53c41a9 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -255,7 +255,7 @@ void ME_DeleteReObject(REOBJECT* reo) DECLSPEC_HIDDEN; void ME_GetITextDocumentInterface(IRichEditOle *iface, LPVOID *ppvObj) DECLSPEC_HIDDEN; /* editor.c */ -ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10, DWORD csStyle) DECLSPEC_HIDDEN; +ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) DECLSPEC_HIDDEN; void ME_DestroyEditor(ME_TextEditor *editor) DECLSPEC_HIDDEN; LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode, HRESULT* phresult) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index eafe2b7..2bf680e 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -382,7 +382,6 @@ typedef struct tagME_TextEditor ME_TextBuffer *pBuffer; ME_Cursor *pCursors; DWORD styleFlags; - DWORD alignStyle; DWORD exStyleFlags; int nCursors; SIZE sizeWindow; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 6c023f2..f2a70e5 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -863,10 +863,22 @@ void ME_GetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) void ME_SetDefaultParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) { + const PARAFORMAT2 *host_fmt; + HRESULT hr; + ZeroMemory(pFmt, sizeof(PARAFORMAT2)); pFmt->cbSize = sizeof(PARAFORMAT2); pFmt->dwMask = PFM_ALL2; - pFmt->wAlignment = editor->alignStyle; + pFmt->wAlignment = PFA_LEFT; pFmt->sStyle = -1; pFmt->bOutlineLevel = TRUE; + + hr = ITextHost_TxGetParaFormat( editor->texthost, (const PARAFORMAT **)&host_fmt ); + if (SUCCEEDED(hr)) + { + /* Just use the alignment for now */ + if (host_fmt->dwMask & PFM_ALIGNMENT) + pFmt->wAlignment = host_fmt->wAlignment; + ITextHost_OnTxParaFormatChange( editor->texthost, (PARAFORMAT *)pFmt ); + } } diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index ccd554d..b479bde 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -38,6 +38,7 @@ typedef struct ITextHostImpl { LONG ref; HWND hWnd; BOOL bEmulateVersion10; + PARAFORMAT2 para_fmt; } ITextHostImpl; static const ITextHostVtbl textHostVtbl; @@ -53,6 +54,14 @@ ITextHost *ME_CreateTextHost(HWND hwnd, CREATESTRUCTW *cs, BOOL bEmulateVersion1 texthost->ref = 1; texthost->hWnd = hwnd; texthost->bEmulateVersion10 = bEmulateVersion10; + memset( &texthost->para_fmt, 0, sizeof(texthost->para_fmt) ); + texthost->para_fmt.cbSize = sizeof(texthost->para_fmt); + texthost->para_fmt.dwMask = PFM_ALIGNMENT; + texthost->para_fmt.wAlignment = PFA_LEFT; + if (cs->style & ES_RIGHT) + texthost->para_fmt.wAlignment = PFA_RIGHT; + if (cs->style & ES_CENTER) + texthost->para_fmt.wAlignment = PFA_CENTER; return &texthost->ITextHost_iface; } @@ -260,9 +269,11 @@ DECLSPEC_HIDDEN HRESULT WINAPI ITextHostImpl_TxGetCharFormat(ITextHost *iface, } DECLSPEC_HIDDEN HRESULT WINAPI ITextHostImpl_TxGetParaFormat(ITextHost *iface, - const PARAFORMAT **ppPF) + const PARAFORMAT **fmt) { - return E_NOTIMPL; + ITextHostImpl *This = impl_from_ITextHost(iface); + *fmt = (const PARAFORMAT *)&This->para_fmt; + return S_OK; } DECLSPEC_HIDDEN COLORREF WINAPI ITextHostImpl_TxGetSysColor(ITextHost *iface, diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 307b484..2a2149e 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -413,7 +413,7 @@ HRESULT WINAPI CreateTextServices(IUnknown *pUnkOuter, ITextHost *pITextHost, I ITextImpl->pMyHost = pITextHost; ITextImpl->IUnknown_inner.lpVtbl = &textservices_inner_vtbl; ITextImpl->ITextServices_iface.lpVtbl = &textservices_vtbl; - ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE, ES_LEFT); + ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE); ITextImpl->editor->exStyleFlags = 0; SetRectEmpty(&ITextImpl->editor->rcFormat);

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: 20b908b6da8910500824cf69a86e074c9b1f1ed7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b908b6da8910500824cf69a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 21 15:26:21 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/po/ru.po b/po/ru.po index d6bda1d..9b15ef9 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-08-08 21:25+0300\n" +"PO-Revision-Date: 2017-08-21 15:10+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -11983,17 +11983,6 @@ msgid "Icons (*.ico)" msgstr "Значки (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -12009,7 +11998,7 @@ msgstr "" " REG [операция] [параметры]\n" "\n" "Поддерживаемые операции:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "Для получения справки по конкретной операции используйте:\n" " REG [операция] /?\n" @@ -12137,25 +12126,19 @@ msgstr "(значение не задано)" #: reg.rc:66 msgid "REG IMPORT file.reg\n" -msgstr "" +msgstr "REG IMPORT file.reg\n" #: reg.rc:67 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "reg: The file '%1' was not found.\n" -msgstr "regedit: файл «%1» не найден.\n" +msgstr "reg: файл «%1» не найден.\n" #: reg.rc:68 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "reg: Unable to open the registry key '%1'.\n" -msgstr "regedit: не удалось открыть ключ «%1».\n" +msgstr "reg: не удалось открыть ключ «%1».\n" #: reg.rc:69 -#, fuzzy -#| msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: неизвестная управляющая последовательность [\\%1!c!]\n" +msgstr "reg: неизвестная управляющая последовательность [\\%1!c!]\n" #: regedit.rc:34 msgid "&Registry"

1 0

Nikolay Sivov : dwrite: Use more readable names for spacing attributes.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: 7fd7960b9d47a64ffd49484495dbd52cea547cce URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fd7960b9d47a64ffd4948449… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 22 12:42:09 2017 +0300 dwrite: Use more readable names for spacing attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 2f59c0c..9bf8d8d 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -92,7 +92,11 @@ struct layout_range_attr_value { IDWriteFontCollection *collection; const WCHAR *locale; const WCHAR *fontfamily; - FLOAT spacing[3]; /* in arguments order - leading, trailing, advance */ + struct { + FLOAT leading; + FLOAT trailing; + FLOAT min_advance; + } spacing; IDWriteTypography *typography; } u; }; @@ -2095,9 +2099,9 @@ static BOOL is_same_layout_attrvalue(struct layout_range_header const *h, enum l case LAYOUT_RANGE_ATTR_FONTFAMILY: return strcmpW(range->fontfamily, value->u.fontfamily) == 0; case LAYOUT_RANGE_ATTR_SPACING: - return range_spacing->leading == value->u.spacing[0] && - range_spacing->trailing == value->u.spacing[1] && - range_spacing->min_advance == value->u.spacing[2]; + return range_spacing->leading == value->u.spacing.leading && + range_spacing->trailing == value->u.spacing.trailing && + range_spacing->min_advance == value->u.spacing.min_advance; case LAYOUT_RANGE_ATTR_TYPOGRAPHY: return range_iface->iface == (IUnknown*)value->u.typography; default: @@ -2484,12 +2488,12 @@ static BOOL set_layout_range_attrval(struct layout_range_header *h, enum layout_ } break; case LAYOUT_RANGE_ATTR_SPACING: - changed = dest_spacing->leading != value->u.spacing[0] || - dest_spacing->trailing != value->u.spacing[1] || - dest_spacing->min_advance != value->u.spacing[2]; - dest_spacing->leading = value->u.spacing[0]; - dest_spacing->trailing = value->u.spacing[1]; - dest_spacing->min_advance = value->u.spacing[2]; + changed = dest_spacing->leading != value->u.spacing.leading || + dest_spacing->trailing != value->u.spacing.trailing || + dest_spacing->min_advance != value->u.spacing.min_advance; + dest_spacing->leading = value->u.spacing.leading; + dest_spacing->trailing = value->u.spacing.trailing; + dest_spacing->min_advance = value->u.spacing.min_advance; break; case LAYOUT_RANGE_ATTR_TYPOGRAPHY: changed = set_layout_range_iface_attr((IUnknown**)&dest_iface->iface, (IUnknown*)value->u.typography); @@ -3791,9 +3795,9 @@ static HRESULT WINAPI dwritetextlayout1_SetCharacterSpacing(IDWriteTextLayout3 * return E_INVALIDARG; value.range = range; - value.u.spacing[0] = leading; - value.u.spacing[1] = trailing; - value.u.spacing[2] = min_advance; + value.u.spacing.leading = leading; + value.u.spacing.trailing = trailing; + value.u.spacing.min_advance = min_advance; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_SPACING, &value); }

1 0

Huw Davies : riched20: Add support for pasting EMFs.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: adf53a9cdb4ac1999b0c17164ea92d16858d212c URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf53a9cdb4ac1999b0c17164… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 21 12:31:51 2017 +0100 riched20: Add support for pasting EMFs. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b66d8e8..a7b1bc7 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2241,6 +2241,23 @@ static HRESULT paste_text(ME_TextEditor *editor, FORMATETC *fmt, STGMEDIUM *med) return hr; } +static HRESULT paste_emf(ME_TextEditor *editor, FORMATETC *fmt, STGMEDIUM *med) +{ + HRESULT hr; + SIZEL sz = {0, 0}; + + hr = insert_static_object( editor, med->u.hEnhMetaFile, NULL, &sz ); + if (SUCCEEDED(hr)) + { + ME_CommitUndo( editor ); + ME_UpdateRepaint( editor, FALSE ); + } + else + ReleaseStgMedium( med ); + + return hr; +} + static struct paste_format { FORMATETC fmt; @@ -2250,6 +2267,7 @@ static struct paste_format { {{ -1, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, paste_rtf, rtfW }, {{ CF_UNICODETEXT, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, paste_text }, + {{ CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF }, paste_emf }, {{ 0 }} };

1 0