January 2023 - Wine-commits

Gabriel Ivăncescu : mshtml: Don't hold ref to the created window in the FrameBase.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 355eb6b91bb36ccd85ad10b219766ed60da39fff URL: https://gitlab.winehq.org/wine/wine/-/commit/355eb6b91bb36ccd85ad10b219766e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 3 18:27:04 2023 +0200 mshtml: Don't hold ref to the created window in the FrameBase. Note that for the case when mozwindow_to_window returns an existing window, no ref is added to it anyway, so this is just leaking. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlframe.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index e1b1562b0dc..38bb53dc551 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -48,9 +48,14 @@ static HRESULT set_frame_doc(HTMLFrameBase *frame, nsIDOMDocument *nsdoc) return E_FAIL; window = mozwindow_to_window(mozwindow); - if(!window && frame->element.node.doc->browser) + if(!window && frame->element.node.doc->browser) { hres = create_outer_window(frame->element.node.doc->browser, mozwindow, frame->element.node.doc->outer_window, &window); + + /* Don't hold ref to the created window; the parent keeps ref to it */ + if(SUCCEEDED(hres)) + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); + } mozIDOMWindowProxy_Release(mozwindow); if(FAILED(hres)) return hres;

1 0

Gabriel Ivăncescu : mshtml: Release the image factory's dispex.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 5c3b2854315c5c084eb29b869cd2d8819981f826 URL: https://gitlab.winehq.org/wine/wine/-/commit/5c3b2854315c5c084eb29b869cd2d8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 3 18:27:04 2023 +0200 mshtml: Release the image factory's dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlimg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index c0333cab858..01cc8405f87 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -855,8 +855,10 @@ static ULONG WINAPI HTMLImageElementFactory_Release(IHTMLImageElementFactory *if TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) + if(!ref) { + release_dispex(&This->dispex); free(This); + } return ref; }

1 0

Gabriel Ivăncescu : mshtml: Don't initialize HTMLElement dispex for Option constructor.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: f3ad67d7a5d879f5894a934f98a4cde392f6e4e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/f3ad67d7a5d879f5894a934f98a4cd… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 3 18:27:04 2023 +0200 mshtml: Don't initialize HTMLElement dispex for Option constructor. It's not an element, so it doesn't even implement those interfaces. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlselect.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 4dfbbd916a7..c5610b41a1d 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -646,7 +646,6 @@ static dispex_static_data_t HTMLOptionElementFactory_dispex = { &HTMLOptionElementFactory_dispex_vtbl, IHTMLOptionElementFactory_tid, HTMLOptionElementFactory_iface_tids, - HTMLElement_init_dispex_info }; HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow *window, HTMLOptionElementFactory **ret_ptr)

1 0

Gabriel Ivăncescu : mshtml/tests: Fix EventObj leak in onclick test.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 5f031f2c877fb6ccbd186941ecf6d3243affc9d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f031f2c877fb6ccbd186941ecf6d3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 3 18:27:04 2023 +0200 mshtml/tests: Fix EventObj leak in onclick test. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/events.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index cd6006805d4..30b6d8799b6 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1270,6 +1270,7 @@ static HRESULT WINAPI submit_onclick_attached_check_cancel(IDispatchEx *iface, D ok(event != NULL, "event == NULL\n"); test_event_cancelbubble(event, VARIANT_TRUE); + IHTMLEventObj_Release(event); return S_OK; }

1 0

Gabriel Ivăncescu : mshtml/tests: Fix window leaks in dom tests.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: bdc67e95b5be27dec97d49bbe5da1e71ae00ce24 URL: https://gitlab.winehq.org/wine/wine/-/commit/bdc67e95b5be27dec97d49bbe5da1e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 3 18:27:04 2023 +0200 mshtml/tests: Fix window leaks in dom tests. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/dom.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 6a960bfa21f..c9c52776fa9 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1350,6 +1350,7 @@ static IHTMLDocument2 *_get_doc_node(unsigned line, IHTMLDocument2 *doc) hres = IHTMLWindow2_get_document(window, &ret); ok_(__FILE__,line)(hres == S_OK, "get_document failed: %08lx\n", hres); ok_(__FILE__,line)(ret != NULL, "document = NULL\n"); + IHTMLWindow2_Release(window); return ret; } @@ -6313,6 +6314,7 @@ static void test_location(IHTMLDocument2 *doc) ok(hres == S_OK, "get_location failed: %08lx\n", hres); ok(location == location2, "location != location2\n"); IHTMLLocation_Release(location2); + IHTMLWindow2_Release(window); test_ifaces((IUnknown*)location, location_iids); test_disp2((IUnknown*)location, &DIID_DispHTMLLocation, &IID_IHTMLLocation, NULL, L"about:blank"); @@ -7564,6 +7566,7 @@ static void test_xhr(IHTMLDocument2 *doc) SysFreeString(str); IHTMLWindow2_Release(window); + IDispatchEx_Release(dispex); } static void test_defaults(IHTMLDocument2 *doc)

1 0

Zhiyi Zhang : comctl32/tests: Add WM_STYLECHANGED tests for changing listview view styles.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: cc84be8d897b88a767bb14341fdf6688df92742a URL: https://gitlab.winehq.org/wine/wine/-/commit/cc84be8d897b88a767bb14341fdf66… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Jan 21 15:39:17 2023 +0800 comctl32/tests: Add WM_STYLECHANGED tests for changing listview view styles. Changing view styles should repaint listviews according to the newly added tests. --- dlls/comctl32/tests/misc.c | 65 +++++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 5613fba15f5..d128c202c67 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1021,6 +1021,15 @@ static const struct message wm_stylechanged_combox_seq[] = {0} }; +static const struct message wm_stylechanged_listview_report_seq[] = +{ + {WM_STYLECHANGED, sent}, + {WM_ERASEBKGND, sent | defwinproc}, + {WM_PAINT, sent}, + {WM_ERASEBKGND, sent | defwinproc}, + {0} +}; + static const struct message wm_stylechanged_pager_seq[] = { {WM_STYLECHANGED, sent}, @@ -1081,37 +1090,39 @@ static void test_WM_STYLECHANGED(void) static const struct test { const CHAR *class_name; + DWORD add_style; const struct message *seq; BOOL todo; } tests[] = { - {ANIMATE_CLASSA, wm_stylechanged_seq}, - {WC_BUTTONA, wm_stylechanged_seq}, - {WC_COMBOBOXA, wm_stylechanged_combox_seq, TRUE}, - {WC_COMBOBOXEXA, wm_stylechanged_seq}, - {DATETIMEPICK_CLASSA, wm_stylechanged_seq}, - {WC_EDITA, wm_stylechanged_seq}, - {WC_HEADERA, wm_stylechanged_repaint_seq, TRUE}, - {HOTKEY_CLASSA, wm_stylechanged_seq}, - {WC_IPADDRESSA, wm_stylechanged_seq}, - {WC_LISTBOXA, wm_stylechanged_repaint_seq, TRUE}, - {WC_LISTVIEWA, wm_stylechanged_seq}, - {MONTHCAL_CLASSA, wm_stylechanged_repaint_seq, TRUE}, - {WC_NATIVEFONTCTLA, wm_stylechanged_seq}, - {WC_PAGESCROLLERA, wm_stylechanged_pager_seq, TRUE}, - {PROGRESS_CLASSA, wm_stylechanged_progress_seq}, - {REBARCLASSNAMEA, wm_stylechanged_seq}, - {WC_STATICA, wm_stylechanged_seq}, - {STATUSCLASSNAMEA, wm_stylechanged_seq}, - {"SysLink", wm_stylechanged_seq}, - {WC_TABCONTROLA, wm_stylechanged_seq}, - {TOOLBARCLASSNAMEA, wm_stylechanged_seq}, - {TOOLTIPS_CLASSA, wm_stylechanged_seq}, - {TRACKBAR_CLASSA, wm_stylechanged_trackbar_seq, TRUE}, - {WC_TREEVIEWA, wm_stylechanged_seq}, - {UPDOWN_CLASSA, wm_stylechanged_seq}, - {WC_SCROLLBARA, wm_stylechanged_seq}, + {ANIMATE_CLASSA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_BUTTONA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_COMBOBOXA, WS_TABSTOP, wm_stylechanged_combox_seq, TRUE}, + {WC_COMBOBOXEXA, WS_TABSTOP, wm_stylechanged_seq}, + {DATETIMEPICK_CLASSA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_EDITA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_HEADERA, WS_TABSTOP, wm_stylechanged_repaint_seq, TRUE}, + {HOTKEY_CLASSA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_IPADDRESSA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_LISTBOXA, WS_TABSTOP, wm_stylechanged_repaint_seq, TRUE}, + {WC_LISTVIEWA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_LISTVIEWA, LVS_REPORT, wm_stylechanged_listview_report_seq, TRUE}, + {MONTHCAL_CLASSA, WS_TABSTOP, wm_stylechanged_repaint_seq, TRUE}, + {WC_NATIVEFONTCTLA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_PAGESCROLLERA, WS_TABSTOP, wm_stylechanged_pager_seq, TRUE}, + {PROGRESS_CLASSA, WS_TABSTOP, wm_stylechanged_progress_seq}, + {REBARCLASSNAMEA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_STATICA, WS_TABSTOP, wm_stylechanged_seq}, + {STATUSCLASSNAMEA, WS_TABSTOP, wm_stylechanged_seq}, + {"SysLink", WS_TABSTOP, wm_stylechanged_seq}, + {WC_TABCONTROLA, WS_TABSTOP, wm_stylechanged_seq}, + {TOOLBARCLASSNAMEA, WS_TABSTOP, wm_stylechanged_seq}, + {TOOLTIPS_CLASSA, WS_TABSTOP, wm_stylechanged_seq}, + {TRACKBAR_CLASSA, WS_TABSTOP, wm_stylechanged_trackbar_seq, TRUE}, + {WC_TREEVIEWA, WS_TABSTOP, wm_stylechanged_seq}, + {UPDOWN_CLASSA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_SCROLLBARA, WS_TABSTOP, wm_stylechanged_seq}, }; parent = CreateWindowA(WC_STATICA, "parent", WS_POPUP | WS_VISIBLE, 100, 100, 100, 100, @@ -1137,7 +1148,7 @@ static void test_WM_STYLECHANGED(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); style.styleOld = GetWindowLongA(hwnd, GWL_STYLE); - style.styleNew = style.styleOld | WS_TABSTOP; + style.styleNew = style.styleOld | tests[i].add_style; SendMessageA(hwnd, WM_STYLECHANGED, GWL_STYLE, (LPARAM)&style); flush_events(); ok_sequence(sequences, CHILD_SEQ_INDEX, tests[i].seq, "WM_STYLECHANGED", tests[i].todo);

1 0

Zhiyi Zhang : comctl32/listview: Repaint when changing view styles.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 1f1f99025d92e8e8b4428f3efc103ba7be9b63b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/1f1f99025d92e8e8b4428f3efc103b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Jan 22 12:39:53 2023 +0800 comctl32/listview: Repaint when changing view styles. Changing listview view styles should repaint according to the tests in test_WM_STYLECHANGED(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54215 --- dlls/comctl32/listview.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 07bea8574b6..fc22818c37b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11212,6 +11212,7 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lpss) { UINT uNewView, uOldView; + BOOL repaint = FALSE; UINT style; TRACE("styletype %Ix, styleOld %#lx, styleNew %#lx\n", @@ -11236,6 +11237,8 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, { HIMAGELIST himl; + repaint = TRUE; + /* LVM_SETVIEW doesn't change window style bits within LVS_TYPEMASK, changing style updates current view only when view bits change. */ map_style_view(infoPtr); @@ -11297,6 +11300,9 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, /* add scrollbars if needed */ LISTVIEW_UpdateScroll(infoPtr); + if (repaint) + LISTVIEW_InvalidateList(infoPtr); + return 0; }

1 0

Jacek Caban : win32u: Silence spurious FIXME in NtUserScrollWindowEx.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 8870d51d3e09565463baa11ce7d2b43c9ca252e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/8870d51d3e09565463baa11ce7d2b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 23 21:30:06 2023 +0100 win32u: Silence spurious FIXME in NtUserScrollWindowEx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54357 --- dlls/win32u/dce.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c index 1cc6a0d605e..af117fe1a23 100644 --- a/dlls/win32u/dce.c +++ b/dlls/win32u/dce.c @@ -1729,7 +1729,7 @@ INT WINAPI NtUserScrollWindowEx( HWND hwnd, INT dx, INT dy, const RECT *rect, TRACE( "%p, %d,%d update_rgn=%p update_rect = %p %s %04x\n", hwnd, dx, dy, update_rgn, update_rect, wine_dbgstr_rect(rect), flags ); TRACE( "clip_rect = %s\n", wine_dbgstr_rect(clip_rect) ); - if (flags & ~(SW_SCROLLCHILDREN | SW_INVALIDATE | SW_ERASE)) + if (flags & ~(SW_SCROLLCHILDREN | SW_INVALIDATE | SW_ERASE | SW_NODCCACHE)) FIXME( "some flags (%04x) are unhandled\n", flags ); rdw_flags = (flags & SW_ERASE) && (flags & SW_INVALIDATE) ?

1 0

Evan Tang : mshtml: Implement IHTMLRect2 for HTMLRect.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 8b0868c1760121c8ae5cf5466d16e4d5f7faba3e URL: https://gitlab.winehq.org/wine/wine/-/commit/8b0868c1760121c8ae5cf5466d16e4… Author: Evan Tang <etang(a)codeweavers.com> Date: Wed Jan 18 16:14:19 2023 -0600 mshtml: Implement IHTMLRect2 for HTMLRect. --- dlls/mshtml/htmlelem.c | 110 +++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/documentmode.js | 17 ++++++ dlls/mshtml/tests/dom.js | 2 + include/mshtmdid.h | 4 ++ include/mshtml.idl | 18 +++++++ 6 files changed, 151 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b66b0c22552..f8b2eb46e6c 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -529,6 +529,7 @@ HRESULT create_element(HTMLDocumentNode *doc, const WCHAR *tag, HTMLElement **re typedef struct { DispatchEx dispex; IHTMLRect IHTMLRect_iface; + IHTMLRect2 IHTMLRect2_iface; LONG ref; @@ -550,6 +551,8 @@ static HRESULT WINAPI HTMLRect_QueryInterface(IHTMLRect *iface, REFIID riid, voi *ppv = &This->IHTMLRect_iface; }else if(IsEqualGUID(&IID_IHTMLRect, riid)) { *ppv = &This->IHTMLRect_iface; + }else if (IsEqualGUID(&IID_IHTMLRect2, riid)) { + *ppv = &This->IHTMLRect2_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { @@ -723,6 +726,91 @@ static HRESULT WINAPI HTMLRect_get_bottom(IHTMLRect *iface, LONG *p) return S_OK; } +static inline HTMLRect *impl_from_IHTMLRect2(IHTMLRect2 *iface) +{ + return CONTAINING_RECORD(iface, HTMLRect, IHTMLRect2_iface); +} + +static HRESULT WINAPI HTMLRect2_QueryInterface(IHTMLRect2 *iface, REFIID riid, void **ppv) +{ + HTMLRect *This = impl_from_IHTMLRect2(iface); + return IHTMLRect_QueryInterface(&This->IHTMLRect_iface, riid, ppv); +} + +static ULONG WINAPI HTMLRect2_AddRef(IHTMLRect2 *iface) +{ + HTMLRect *This = impl_from_IHTMLRect2(iface); + return IHTMLRect_AddRef(&This->IHTMLRect_iface); +} + +static ULONG WINAPI HTMLRect2_Release(IHTMLRect2 *iface) +{ + HTMLRect *This = impl_from_IHTMLRect2(iface); + return IHTMLRect_Release(&This->IHTMLRect_iface); +} + +static HRESULT WINAPI HTMLRect2_GetTypeInfoCount(IHTMLRect2 *iface, UINT *pctinfo) +{ + HTMLRect *This = impl_from_IHTMLRect2(iface); + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLRect2_GetTypeInfo(IHTMLRect2 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLRect *This = impl_from_IHTMLRect2(iface); + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLRect2_GetIDsOfNames(IHTMLRect2 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLRect *This = impl_from_IHTMLRect2(iface); + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLRect2_Invoke(IHTMLRect2 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLRect *This = impl_from_IHTMLRect2(iface); + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLRect2_get_width(IHTMLRect2 *iface, FLOAT *p) +{ + HTMLRect *This = impl_from_IHTMLRect2(iface); + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMClientRect_GetWidth(This->nsrect, p); + if (NS_FAILED(nsres)) { + ERR("GetWidth failed: %08lx\n", nsres); + return E_FAIL; + } + + return S_OK; +} + +static HRESULT WINAPI HTMLRect2_get_height(IHTMLRect2 *iface, FLOAT *p) +{ + HTMLRect *This = impl_from_IHTMLRect2(iface); + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMClientRect_GetHeight(This->nsrect, p); + if (NS_FAILED(nsres)) { + ERR("GetHeight failed: %08lx\n", nsres); + return E_FAIL; + } + + return S_OK; +} + static const IHTMLRectVtbl HTMLRectVtbl = { HTMLRect_QueryInterface, HTMLRect_AddRef, @@ -741,6 +829,24 @@ static const IHTMLRectVtbl HTMLRectVtbl = { HTMLRect_get_bottom }; +static const IHTMLRect2Vtbl HTMLRect2Vtbl = { + HTMLRect2_QueryInterface, + HTMLRect2_AddRef, + HTMLRect2_Release, + HTMLRect2_GetTypeInfoCount, + HTMLRect2_GetTypeInfo, + HTMLRect2_GetIDsOfNames, + HTMLRect2_Invoke, + HTMLRect2_get_width, + HTMLRect2_get_height, +}; + +void HTMLRect_init_dispex_info(dispex_data_t *info, compat_mode_t mode) +{ + if (mode >= COMPAT_MODE_IE9) + dispex_info_add_interface(info, IHTMLRect2_tid, NULL); +} + static const tid_t HTMLRect_iface_tids[] = { IHTMLRect_tid, 0 @@ -749,7 +855,8 @@ static dispex_static_data_t HTMLRect_dispex = { L"ClientRect", NULL, IHTMLRect_tid, - HTMLRect_iface_tids + HTMLRect_iface_tids, + HTMLRect_init_dispex_info }; static HRESULT create_html_rect(nsIDOMClientRect *nsrect, compat_mode_t compat_mode, IHTMLRect **ret) @@ -761,6 +868,7 @@ static HRESULT create_html_rect(nsIDOMClientRect *nsrect, compat_mode_t compat_m return E_OUTOFMEMORY; rect->IHTMLRect_iface.lpVtbl = &HTMLRectVtbl; + rect->IHTMLRect2_iface.lpVtbl = &HTMLRect2Vtbl; rect->ref = 1; init_dispatch(&rect->dispex, (IUnknown*)&rect->IHTMLRect_iface, &HTMLRect_dispex, compat_mode); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d5a9e02aa13..870ba14c8b4 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -237,6 +237,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLPerformanceTiming) \ XIID(IHTMLPluginsCollection) \ XIID(IHTMLRect) \ + XIID(IHTMLRect2) \ XIID(IHTMLRectCollection) \ XIID(IHTMLScreen) \ XIID(IHTMLScriptElement) \ diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 760d8db5e38..cd639712a9f 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -557,6 +557,23 @@ sync_test("stylesheet_props", function() { test_exposed("rules", true); }); +sync_test("rect_props", function() { + document.body.innerHTML = '<div>test</div>'; + var elem = document.body.firstChild; + var rect = elem.getBoundingClientRect(); + function test_exposed(prop, expect) { + if(expect) + ok(prop in rect, prop + " not found in rect object."); + else + ok(!(prop in rect), prop + " found in rect object."); + } + + var v = document.documentMode; + + test_exposed("width", v >= 9); + test_exposed("height", v >= 9); +}); + sync_test("xhr open", function() { var e = false; try { diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 5a31b869c8f..e5a07027f7c 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -293,6 +293,8 @@ sync_test("rects", function() { ok(rects.length === 1, "rect.length = " + rects.length); ok(rects[0].top === rect.top, "rects[0].top = " + rects[0].top + " rect.top = " + rect.top); ok(rects[0].bottom === rect.bottom, "rects[0].bottom = " + rects[0].bottom + " rect.bottom = " + rect.bottom); + ok(rect.height === rect.bottom - rect.top, "rect.height = " + rect.height + " rect.bottom = " + rect.bottom + " rect.top = " + rect.top); + ok(rect.width === rect.right - rect.left, "rect.width = " + rect.width + " rect.right = " + rect.right + " rect.left = " + rect.left); elem = document.createElement("style"); rects = elem.getClientRects(); diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 0e95a7d7165..1673dd3cea0 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -4135,6 +4135,10 @@ #define DISPID_IHTMLRECT_RIGHT DISPID_OMRECT+3 #define DISPID_IHTMLRECT_BOTTOM DISPID_OMRECT+4 +/* IHTMLRect2 */ +#define DISPID_IHTMLRECT2_WIDTH DISPID_OMRECT+5 +#define DISPID_IHTMLRECT2_HEIGHT DISPID_OMRECT+6 + /* IHTMLRectCollection */ #define DISPID_IHTMLRECTCOLLECTION_LENGTH DISPID_COLLECTION #define DISPID_IHTMLRECTCOLLECTION__NEWENUM DISPID_NEWENUM diff --git a/include/mshtml.idl b/include/mshtml.idl index eff87a4593e..1a5c9bbaf28 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -7937,6 +7937,24 @@ interface IHTMLRect : IDispatch HRESULT bottom([retval, out] LONG *p); } +/***************************************************************************** + * IHTMLRect2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3051076c-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLRect2 : IDispatch +{ + [propget, id(DISPID_IHTMLRECT2_WIDTH)] + HRESULT width([retval, out] FLOAT *p); + + [propget, id(DISPID_IHTMLRECT2_HEIGHT)] + HRESULT height([retval, out] FLOAT *p); +} + /***************************************************************************** * IHTMLRectCollection interface */

1 0

Jinoh Kang : riched20: Obtain the composition start index after deleting selection.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 8c43577f0f9b4422d3641457c595c3998bd54a18 URL: https://gitlab.winehq.org/wine/wine/-/commit/8c43577f0f9b4422d3641457c595c3… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Jan 24 01:08:10 2023 +0900 riched20: Obtain the composition start index after deleting selection. Today, the Rich Edit control handles the WM_IME_STARTCOMPOSITION message by the computing the composition start position (imeStartIndex) _before_ calling ME_DeleteSelection(), which shifts the character positions after the range of deletion. If the selection were not empty, imeStartIndex immediately becomes stale, since it does not take into account the number of deleted characters before it. Fix this by computing imeStartIndex after the ME_DeleteSelection() call. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54318 --- dlls/riched20/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 57601745ab2..7b4f4b3cdf3 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4099,8 +4099,8 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0; case WM_IME_STARTCOMPOSITION: { - editor->imeStartIndex=ME_GetCursorOfs(&editor->pCursors[0]); ME_DeleteSelection(editor); + editor->imeStartIndex = ME_GetCursorOfs(&editor->pCursors[0]); ME_CommitUndo(editor); ME_UpdateRepaint(editor, FALSE); return 0;

1 0