June 2022 - Wine-Commits - list.winehq.org

Jinoh Kang : riched20: Fetch extent from object if REOBJECT::sizel is unset.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: 164897e6c94d3eee4798f82a730472a5a847f9b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=164897e6c94d3eee4798f82a… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Jun 11 19:46:40 2022 +0900 riched20: Fetch extent from object if REOBJECT::sizel is unset. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/riched20/caret.c | 13 +++++++++++++ dlls/riched20/tests/richole.c | 2 -- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 09ec0ffc735..c9fd327e87e 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -464,6 +464,7 @@ HRESULT editor_insert_oleobj(ME_TextEditor *editor, const REOBJECT *reo) ME_Cursor *cursor, cursor_from_ofs; ME_Style *style; HRESULT hr; + SIZEL extent; if (editor->lpOleCallback) { @@ -472,6 +473,17 @@ HRESULT editor_insert_oleobj(ME_TextEditor *editor, const REOBJECT *reo) return hr; } + extent = reo->sizel; + if (!extent.cx && !extent.cy && reo->poleobj) + { + hr = IOleObject_GetExtent( reo->poleobj, DVASPECT_CONTENT, &extent ); + if (FAILED(hr)) + { + extent.cx = 0; + extent.cy = 0; + } + } + if (reo->cp == REO_CP_SELECTION) cursor = editor->pCursors; else @@ -487,6 +499,7 @@ HRESULT editor_insert_oleobj(ME_TextEditor *editor, const REOBJECT *reo) run = run_insert( editor, cursor, style, &space, 1, MERF_GRAPHICS ); run->reobj = create_re_object( reo, run ); + run->reobj->obj.sizel = extent; prev = run; while ((prev = run_prev_all_paras( prev ))) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index bb7ee869e0d..db9d123815e 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -4217,9 +4217,7 @@ static void subtest_InsertObject(struct reolecb_obj *callback) reobj.cbStruct = sizeof(reobj); hr = IRichEditOle_GetObject(reole, 0, &reobj, REO_GETOBJ_NO_INTERFACES); ok(hr == S_OK, "IRichEditOle_GetObject got hr %#lx.\n", hr); - todo_wine ok(reobj.sizel.cx == 800, "expected reobj.sizel.cx to be %ld, got %ld\n", 800L, reobj.sizel.cx); - todo_wine ok(reobj.sizel.cy == 400, "expected reobj.sizel.cy to be %ld, got %ld\n", 400L, reobj.sizel.cy); IOleClientSite_Release(clientsite);

1 0

Rémi Bernon : ntdll: Remove heap pointer from SUBHEAP structure.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: 4ca954ad0b2b098372e952f4208aff99a934841c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ca954ad0b2b098372e952f4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 13 17:47:48 2022 +0200 ntdll: Remove heap pointer from SUBHEAP structure. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 69 +++++++++++++++++++++++++------------------------------ 1 file changed, 31 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4ca954ad0b2b098372e9…

1 0

Connor McAdams : uiautomationcore: Implement NavigateDirection_Parent for MSAA Providers.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: fdd7f3152e4b95552364810060eb33fcb18b2b0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdd7f3152e4b955523648100… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue May 24 13:20:10 2022 -0400 uiautomationcore: Implement NavigateDirection_Parent for MSAA Providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 96 +++++++++++++----------------- dlls/uiautomationcore/uia_provider.c | 64 +++++++++++++++++++- 2 files changed, 104 insertions(+), 56 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index b4958d2dc70..885e520bfd3 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -1078,38 +1078,35 @@ static void test_uia_prov_from_acc_navigation(void) elfrag2 = (void *)0xdeadbeef; hr = IRawElementProviderFragment_Navigate(elfrag, NavigateDirection_Parent, &elfrag2); ok(Accessible.ref == 2, "Unexpected refcnt %ld\n", Accessible.ref); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!elfrag2, "elfrag2 != NULL\n"); - todo_wine CHECK_CALLED(winproc_GETOBJECT_CLIENT); - todo_wine CHECK_CALLED(Accessible_get_accRole); - todo_wine CHECK_CALLED(Accessible_get_accState); - todo_wine CHECK_CALLED(Accessible_get_accChildCount); - todo_wine CHECK_CALLED(Accessible_accLocation); - todo_wine CHECK_CALLED(Accessible_get_accName); - todo_wine CHECK_CALLED(Accessible2_get_accRole); - todo_wine CHECK_CALLED(Accessible2_get_accState); - todo_wine CHECK_CALLED(Accessible2_get_accChildCount); - todo_wine CHECK_CALLED(Accessible2_accLocation); - todo_wine CHECK_CALLED(Accessible2_get_accName); + CHECK_CALLED(winproc_GETOBJECT_CLIENT); + CHECK_CALLED(Accessible_get_accRole); + CHECK_CALLED(Accessible_get_accState); + CHECK_CALLED(Accessible_get_accChildCount); + CHECK_CALLED(Accessible_accLocation); + CHECK_CALLED(Accessible_get_accName); + CHECK_CALLED(Accessible2_get_accRole); + CHECK_CALLED(Accessible2_get_accState); + CHECK_CALLED(Accessible2_get_accChildCount); + CHECK_CALLED(Accessible2_accLocation); + CHECK_CALLED(Accessible2_get_accName); todo_wine CHECK_CALLED(Accessible2_QI_IAccIdentity); todo_wine CHECK_CALLED(Accessible2_get_accParent); acc_client = NULL; - if (SUCCEEDED(hr)) - { - /* No check against root IAccessible, since it was done previously. */ - elprov2 = (void *)0xdeadbeef; - hr = IRawElementProviderSimple_get_HostRawElementProvider(elprov, &elprov2); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!!elprov2, "elprov == NULL, elprov %p\n", elprov2); - IRawElementProviderSimple_Release(elprov2); - } + /* No check against root IAccessible, since it was done previously. */ + elprov2 = (void *)0xdeadbeef; + hr = IRawElementProviderSimple_get_HostRawElementProvider(elprov, &elprov2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!elprov2, "elprov == NULL, elprov %p\n", elprov2); + IRawElementProviderSimple_Release(elprov2); /* Do nothing. */ elfrag2 = (void *)0xdeadbeef; hr = IRawElementProviderFragment_Navigate(elfrag, NavigateDirection_Parent, &elfrag2); ok(Accessible.ref == 2, "Unexpected refcnt %ld\n", Accessible.ref); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!elfrag2, "elfrag2 != NULL\n"); elfrag2 = (void *)0xdeadbeef; @@ -1284,36 +1281,30 @@ static void test_uia_prov_from_acc_navigation(void) SET_EXPECT(Accessible2_QI_IAccIdentity); SET_EXPECT(Accessible2_get_accParent); hr = IRawElementProviderFragment_Navigate(elfrag, NavigateDirection_Parent, &elfrag2); - todo_wine ok(Accessible.ref == 2, "Unexpected refcnt %ld\n", Accessible.ref); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(!!elfrag2, "elfrag2 == NULL\n"); - todo_wine CHECK_CALLED(Accessible_child_get_accParent); - todo_wine CHECK_CALLED(Accessible_child_get_accRole); - todo_wine CHECK_CALLED(Accessible2_get_accRole); + ok(Accessible.ref == 2, "Unexpected refcnt %ld\n", Accessible.ref); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!elfrag2, "elfrag2 == NULL\n"); + CHECK_CALLED(Accessible_child_get_accParent); + CHECK_CALLED(Accessible_child_get_accRole); + CHECK_CALLED(Accessible2_get_accRole); todo_wine CHECK_CALLED(Accessible2_QI_IAccIdentity); todo_wine CHECK_CALLED(Accessible2_get_accParent); - todo_wine CHECK_CALLED(winproc_GETOBJECT_CLIENT); - if (elfrag2) - { - check_fragment_acc(elfrag2, &Accessible.IAccessible_iface, CHILDID_SELF); - IRawElementProviderFragment_Release(elfrag2); - ok(Accessible.ref == 1, "Unexpected refcnt %ld\n", Accessible.ref); - } + CHECK_CALLED(winproc_GETOBJECT_CLIENT); + check_fragment_acc(elfrag2, &Accessible.IAccessible_iface, CHILDID_SELF); + IRawElementProviderFragment_Release(elfrag2); + ok(Accessible.ref == 1, "Unexpected refcnt %ld\n", Accessible.ref); acc_client = NULL; /* Second call only does get_accParent, no root check. */ SET_EXPECT(Accessible_child_get_accParent); hr = IRawElementProviderFragment_Navigate(elfrag, NavigateDirection_Parent, &elfrag2); - todo_wine ok(Accessible.ref == 2, "Unexpected refcnt %ld\n", Accessible.ref); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(!!elfrag2, "elfrag2 == NULL\n"); - todo_wine CHECK_CALLED(Accessible_child_get_accParent); - if (elfrag2) - { - check_fragment_acc(elfrag2, &Accessible.IAccessible_iface, CHILDID_SELF); - IRawElementProviderFragment_Release(elfrag2); - ok(Accessible.ref == 1, "Unexpected refcnt %ld\n", Accessible.ref); - } + ok(Accessible.ref == 2, "Unexpected refcnt %ld\n", Accessible.ref); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!elfrag2, "elfrag2 == NULL\n"); + CHECK_CALLED(Accessible_child_get_accParent); + check_fragment_acc(elfrag2, &Accessible.IAccessible_iface, CHILDID_SELF); + IRawElementProviderFragment_Release(elfrag2); + ok(Accessible.ref == 1, "Unexpected refcnt %ld\n", Accessible.ref); /* ChildCount of 0, do nothing for First/Last child.*/ SET_EXPECT(Accessible_child_get_accChildCount); @@ -1434,15 +1425,12 @@ static void test_uia_prov_from_acc_navigation(void) * can't be the root IAccessible. */ hr = IRawElementProviderFragment_Navigate(elfrag, NavigateDirection_Parent, &elfrag2); - todo_wine ok(Accessible.ref == 3, "Unexpected refcnt %ld\n", Accessible.ref); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(!!elfrag2, "elfrag2 == NULL\n"); - if (elfrag2) - { - check_fragment_acc(elfrag2, &Accessible.IAccessible_iface, CHILDID_SELF); - IRawElementProviderFragment_Release(elfrag2); - ok(Accessible.ref == 2, "Unexpected refcnt %ld\n", Accessible.ref); - } + ok(Accessible.ref == 3, "Unexpected refcnt %ld\n", Accessible.ref); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!elfrag2, "elfrag2 == NULL\n"); + check_fragment_acc(elfrag2, &Accessible.IAccessible_iface, CHILDID_SELF); + IRawElementProviderFragment_Release(elfrag2); + ok(Accessible.ref == 2, "Unexpected refcnt %ld\n", Accessible.ref); /* * Test NavigateDirection_First/LastChild on simple child element. Does diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index 8701d67a89f..1dfe447331e 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -205,6 +205,21 @@ exit: return matched; } +static HRESULT msaa_acc_get_parent(IAccessible *acc, IAccessible **parent) +{ + IDispatch *disp = NULL; + HRESULT hr; + + *parent = NULL; + hr = IAccessible_get_accParent(acc, &disp); + if (FAILED(hr) || !disp) + return hr; + + hr = IDispatch_QueryInterface(disp, &IID_IAccessible, (void**)parent); + IDispatch_Release(disp); + return hr; +} + static LONG msaa_role_to_uia_control_type(LONG role) { switch (role) @@ -515,9 +530,54 @@ static ULONG WINAPI msaa_fragment_Release(IRawElementProviderFragment *iface) static HRESULT WINAPI msaa_fragment_Navigate(IRawElementProviderFragment *iface, enum NavigateDirection direction, IRawElementProviderFragment **ret_val) { - FIXME("%p, %d, %p: stub!\n", iface, direction, ret_val); + struct msaa_provider *msaa_prov = impl_from_msaa_fragment(iface); + IRawElementProviderSimple *elprov; + IAccessible *acc; + HRESULT hr; + + TRACE("%p, %d, %p\n", iface, direction, ret_val); + *ret_val = NULL; - return E_NOTIMPL; + switch (direction) + { + case NavigateDirection_Parent: + if (msaa_check_root_acc(msaa_prov)) + break; + + if (V_I4(&msaa_prov->cid) == CHILDID_SELF) + { + hr = msaa_acc_get_parent(msaa_prov->acc, &acc); + if (FAILED(hr) || !acc) + break; + } + else + acc = msaa_prov->acc; + + hr = UiaProviderFromIAccessible(acc, CHILDID_SELF, 0, &elprov); + if (SUCCEEDED(hr)) + { + struct msaa_provider *prov = impl_from_msaa_provider(elprov); + *ret_val = &prov->IRawElementProviderFragment_iface; + } + + if (acc != msaa_prov->acc) + IAccessible_Release(acc); + + break; + + case NavigateDirection_FirstChild: + case NavigateDirection_LastChild: + case NavigateDirection_NextSibling: + case NavigateDirection_PreviousSibling: + FIXME("Unimplemented NavigateDirection %d\n", direction); + return E_NOTIMPL; + + default: + FIXME("Invalid NavigateDirection %d\n", direction); + return E_INVALIDARG; + } + + return S_OK; } static HRESULT WINAPI msaa_fragment_GetRuntimeId(IRawElementProviderFragment *iface,

1 0

Jacek Caban : win32u: Allow passing simple LOGFONTW to NtGdiHfontCreate.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: 952affeaeb933edfee4fa4722bb1e4ce320b8f5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=952affeaeb933edfee4fa472… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 10 15:01:31 2022 +0200 win32u: Allow passing simple LOGFONTW to NtGdiHfontCreate. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/font.c | 29 +++++++++++++++++++---------- dlls/wow64win/gdi.c | 4 ++-- include/ntgdi.h | 2 +- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 571379976a5..6aa46e0949a 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -4478,26 +4478,35 @@ UINT WINAPI NtGdiGetTextCharsetInfo( HDC hdc, FONTSIGNATURE *fs, DWORD flags ) /*********************************************************************** * NtGdiHfontCreate (win32u.@) */ -HFONT WINAPI NtGdiHfontCreate( const ENUMLOGFONTEXDVW *penumex, ULONG size, ULONG type, +HFONT WINAPI NtGdiHfontCreate( const void *logfont, ULONG size, ULONG type, ULONG flags, void *data ) { HFONT hFont; FONTOBJ *fontPtr; const LOGFONTW *plf; - if (!penumex) return 0; + if (!logfont) return 0; - if (penumex->elfEnumLogfontEx.elfFullName[0] || - penumex->elfEnumLogfontEx.elfStyle[0] || - penumex->elfEnumLogfontEx.elfScript[0]) + if (size == sizeof(ENUMLOGFONTEXDVW) || size == sizeof(ENUMLOGFONTEXW)) { - FIXME("some fields ignored. fullname=%s, style=%s, script=%s\n", - debugstr_w(penumex->elfEnumLogfontEx.elfFullName), - debugstr_w(penumex->elfEnumLogfontEx.elfStyle), - debugstr_w(penumex->elfEnumLogfontEx.elfScript)); + const ENUMLOGFONTEXW *lfex = logfont; + + if (lfex->elfFullName[0] || lfex->elfStyle[0] || lfex->elfScript[0]) + { + FIXME( "some fields ignored. fullname=%s, style=%s, script=%s\n", + debugstr_w( lfex->elfFullName ), debugstr_w( lfex->elfStyle ), + debugstr_w( lfex->elfScript )); + } + + plf = &lfex->elfLogFont; + } + else if (size != sizeof(LOGFONTW)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; } + else plf = logfont; - plf = &penumex->elfEnumLogfontEx.elfLogFont; if (!(fontPtr = malloc( sizeof(*fontPtr) ))) return 0; fontPtr->logfont = *plf; diff --git a/dlls/wow64win/gdi.c b/dlls/wow64win/gdi.c index c821b90122e..5fdc9906a02 100644 --- a/dlls/wow64win/gdi.c +++ b/dlls/wow64win/gdi.c @@ -403,13 +403,13 @@ NTSTATUS WINAPI wow64_NtGdiSetTextJustification( UINT *args ) NTSTATUS WINAPI wow64_NtGdiHfontCreate( UINT *args ) { - const ENUMLOGFONTEXDVW *enumex = get_ptr( &args ); + const void *logfont = get_ptr( &args ); ULONG unk2 = get_ulong( &args ); ULONG unk3 = get_ulong( &args ); ULONG unk4 = get_ulong( &args ); void *data = get_ptr( &args ); - return HandleToUlong( NtGdiHfontCreate( enumex, unk2, unk3, unk4, data )); + return HandleToUlong( NtGdiHfontCreate( logfont, unk2, unk3, unk4, data )); } NTSTATUS WINAPI wow64_NtGdiGetFontFileData( UINT *args ) diff --git a/include/ntgdi.h b/include/ntgdi.h index 14b1dde45d5..61ee94071a9 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -371,7 +371,7 @@ BOOL WINAPI NtGdiGetTextMetricsW( HDC hdc, TEXTMETRICW *metrics, ULONG flags BOOL WINAPI NtGdiGetTransform( HDC hdc, DWORD which, XFORM *xform ); BOOL WINAPI NtGdiGradientFill( HDC hdc, TRIVERTEX *vert_array, ULONG nvert, void *grad_array, ULONG ngrad, ULONG mode ); -HFONT WINAPI NtGdiHfontCreate( const ENUMLOGFONTEXDVW *enumex, ULONG unk2, ULONG unk3, +HFONT WINAPI NtGdiHfontCreate( const void *logfont, ULONG unk2, ULONG unk3, ULONG unk4, void *data ); DWORD WINAPI NtGdiInitSpool(void); INT WINAPI NtGdiIntersectClipRect( HDC hdc, INT left, INT top, INT right, INT bottom );

1 0

Jacek Caban : win32u: Move WM_NCPAINT handling from user32.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: 9f03d8f3e1ba0fae01934cd0938a0caa80b28972 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f03d8f3e1ba0fae01934cd0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 10 15:52:01 2022 +0200 win32u: Move WM_NCPAINT handling from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/controls.h | 1 - dlls/user32/defwnd.c | 20 -- dlls/user32/nonclient.c | 23 -- dlls/user32/user_main.c | 9 + dlls/win32u/dc.c | 5 + dlls/win32u/defwnd.c | 786 ++++++++++++++++++++++++++++++++++++++++++- dlls/win32u/font.c | 22 ++ dlls/win32u/menu.c | 2 +- dlls/win32u/ntuser_private.h | 2 + dlls/win32u/sysparams.c | 6 +- dlls/win32u/win32u_private.h | 4 + include/ntgdi.h | 1 + include/ntuser.h | 11 + 13 files changed, 843 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9f03d8f3e1ba0fae0193…

1 0

Jacek Caban : win32u: Move GetDialogBaseUnits implementation from user32.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: d65f2492ed3982e09fc38ebaae96c1f293f223a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d65f2492ed3982e09fc38eba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 10 18:39:37 2022 +0200 win32u: Move GetDialogBaseUnits implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/dialog.c | 17 +------------- dlls/win32u/sysparams.c | 61 +++++++++++++++++++++++++++++++++++++------------ include/ntuser.h | 6 +++++ 3 files changed, 53 insertions(+), 31 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 66000995861..b804de90df2 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1519,22 +1519,7 @@ BOOL WINAPI CheckRadioButton( HWND hwndDlg, int firstID, */ DWORD WINAPI GetDialogBaseUnits(void) { - static LONG cx, cy; - - if (!cx) - { - HDC hdc; - - if ((hdc = GetDC(0))) - { - cx = GdiGetCharDimensions( hdc, NULL, &cy ); - NtUserReleaseDC( 0, hdc ); - } - TRACE( "base units = %ld,%ld\n", cx, cy ); - } - - return MAKELONG( MulDiv( cx, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI ), - MulDiv( cy, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI )); + return NtUserGetDialogBaseUnits(); } diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 20b24d9fe86..7c333953f7e 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2724,38 +2724,66 @@ static void get_real_fontname( LOGFONTW *lf, WCHAR fullname[LF_FACESIZE] ) lstrcpyW( fullname, lf->lfFaceName ); } +static LONG get_char_dimensions( HDC hdc, TEXTMETRICW *metric, LONG *height ) +{ + SIZE sz; + static const WCHAR abcdW[] = + {'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q', + 'r','s','t','u','v','w','x','y','z','A','B','C','D','E','F','G','H', + 'I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'}; + + if (metric && !NtGdiGetTextMetricsW( hdc, metric, 0 )) return 0; + + if (!NtGdiGetTextExtentExW( hdc, abcdW, ARRAYSIZE(abcdW), 0, NULL, NULL, &sz, 0 )) + return 0; + + if (height) *height = sz.cy; + return (sz.cx / 26 + 1) / 2; +} + /* get text metrics and/or "average" char width of the specified logfont * for the specified dc */ -static void get_text_metr_size( HDC hdc, LOGFONTW *plf, TEXTMETRICW * ptm, UINT *psz) +static void get_text_metr_size( HDC hdc, LOGFONTW *plf, TEXTMETRICW *metric, UINT *psz) { ENUMLOGFONTEXDVW exdv = { .elfEnumLogfontEx.elfLogFont = *plf }; HFONT hfont, hfontsav; TEXTMETRICW tm; - if (!ptm) ptm = &tm; + UINT ret; + if (!metric) metric = &tm; hfont = NtGdiHfontCreate( &exdv, sizeof(exdv), 0, 0, NULL ); if (!hfont || !(hfontsav = NtGdiSelectFont( hdc, hfont ))) { - ptm->tmHeight = -1; + metric->tmHeight = -1; if (psz) *psz = 10; if (hfont) NtGdiDeleteObjectApp( hfont ); return; } - NtGdiGetTextMetricsW( hdc, ptm, 0 ); - if (psz) - { - SIZE sz; - static const WCHAR abcdW[] = - {'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q', - 'r','s','t','u','v','w','x','y','z','A','B','C','D','E','F','G','H', - 'I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'}; - if (NtGdiGetTextExtentExW( hdc, abcdW, ARRAYSIZE(abcdW), 0, NULL, NULL, &sz, 0 )) - *psz = (sz.cx / 26 + 1) / 2; - else *psz = 10; - } + ret = get_char_dimensions( hdc, metric, NULL ); + if (psz) *psz = ret ? ret : 10; NtGdiSelectFont( hdc, hfontsav ); NtGdiDeleteObjectApp( hfont ); } +static DWORD get_dialog_base_units(void) +{ + static LONG cx, cy; + + if (!cx) + { + HDC hdc; + + if ((hdc = NtUserGetDCEx( 0, 0, DCX_CACHE | DCX_WINDOW ))) + { + cx = get_char_dimensions( hdc, NULL, &cy ); + NtUserReleaseDC( 0, hdc ); + } + TRACE( "base units = %d,%d\n", cx, cy ); + } + + return MAKELONG( muldiv( cx, get_system_dpi(), USER_DEFAULT_SCREEN_DPI ), + muldiv( cy, get_system_dpi(), USER_DEFAULT_SCREEN_DPI )); +} + /* adjust some of the raw values found in the registry */ static void normalize_nonclientmetrics( NONCLIENTMETRICSW *pncm) { @@ -4681,6 +4709,9 @@ ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ) case NtUserCallNoParam_GetDesktopWindow: return HandleToUlong( get_desktop_window() ); + case NtUserCallNoParam_GetDialogBaseUnits: + return get_dialog_base_units(); + case NtUserCallNoParam_GetInputState: return get_input_state(); diff --git a/include/ntuser.h b/include/ntuser.h index a918be6b7dd..f2fdab6c0f9 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -718,6 +718,7 @@ enum { NtUserCallNoParam_DestroyCaret, NtUserCallNoParam_GetDesktopWindow, + NtUserCallNoParam_GetDialogBaseUnits, NtUserCallNoParam_GetInputState, NtUserCallNoParam_ReleaseCapture, /* temporary exports */ @@ -735,6 +736,11 @@ static inline HWND NtUserGetDesktopWindow(void) return UlongToHandle( NtUserCallNoParam( NtUserCallNoParam_GetDesktopWindow )); } +static inline DWORD NtUserGetDialogBaseUnits(void) +{ + return NtUserCallNoParam( NtUserCallNoParam_GetDialogBaseUnits ); +}; + static inline BOOL NtUserGetInputState(void) { return NtUserCallNoParam( NtUserCallNoParam_GetInputState );

1 0

Daniel Lehman : kernelbase: Pass va_list copy to internal RtlFormatMessage.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: 1714963a5f9e62deb7aaa8f751640cbf87d57993 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1714963a5f9e62deb7aaa8f7… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sat Jun 4 08:03:02 2022 -0700 kernelbase: Pass va_list copy to internal RtlFormatMessage. va_list passed to RtlFormatMessage is modified even on error in this case, if the buffer is not large enough, STATUS_BUFFER_OVERFLOW is returned and FormatMessage tries again, but the va_list pointer is now moved to a later argument, so the next call reads off the end, crashing. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 257d9f693ba..0c20c858a7a 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -5457,6 +5457,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH FormatMessageW( DWORD flags, const void *source, if (flags & FORMAT_MESSAGE_ALLOCATE_BUFFER) { WCHAR *result; + va_list args_copy; ULONG alloc = max( size * sizeof(WCHAR), 65536 ); for (;;) @@ -5466,9 +5467,17 @@ DWORD WINAPI DECLSPEC_HOTPATCH FormatMessageW( DWORD flags, const void *source, status = STATUS_NO_MEMORY; break; } - status = RtlFormatMessage( src, width, !!(flags & FORMAT_MESSAGE_IGNORE_INSERTS), - FALSE, !!(flags & FORMAT_MESSAGE_ARGUMENT_ARRAY), args, - result, alloc, &retsize ); + if (args && !(flags & FORMAT_MESSAGE_ARGUMENT_ARRAY)) + { + va_copy( args_copy, *args ); + status = RtlFormatMessage( src, width, !!(flags & FORMAT_MESSAGE_IGNORE_INSERTS), + FALSE, FALSE, &args_copy, result, alloc, &retsize ); + va_end( args_copy ); + } + else + status = RtlFormatMessage( src, width, !!(flags & FORMAT_MESSAGE_IGNORE_INSERTS), + FALSE, TRUE, args, result, alloc, &retsize ); + if (!status) { if (retsize <= sizeof(WCHAR)) HeapFree( GetProcessHeap(), 0, result );

1 0

Rémi Bernon : ntdll: Use block_size and data_size in subheap structure.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: a6fcf059a7ce5cde7b81fdae9873d856cbfe72b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6fcf059a7ce5cde7b81fdae… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 13 16:52:46 2022 +0200 ntdll: Use block_size and data_size in subheap structure. Respectively describing allocated size vs commit size, relative to the first subheap block, instead of size / commitSize. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 7e64eea4602..acaf3e53bc5 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -162,10 +162,10 @@ static const SIZE_T free_list_sizes[] = typedef struct DECLSPEC_ALIGN(ALIGNMENT) tagSUBHEAP { SIZE_T __pad[sizeof(SIZE_T) / sizeof(DWORD)]; - SIZE_T size; /* Size of the whole sub-heap */ - SIZE_T commitSize; /* Committed size of the sub-heap */ - struct list entry; /* Entry in sub-heap list */ - struct heap *heap; /* Main heap structure */ + SIZE_T block_size; + SIZE_T data_size; + struct list entry; + struct heap *heap; struct block block; } SUBHEAP; @@ -269,19 +269,25 @@ static inline void *subheap_base( const SUBHEAP *subheap ) return ROUND_ADDR( subheap, COMMIT_MASK ); } -static inline SIZE_T subheap_size( const SUBHEAP *subheap ) +static inline SIZE_T subheap_overhead( const SUBHEAP *subheap ) { - return subheap->size; + return (char *)&subheap->block - (char *)subheap_base( subheap ); } -static inline SIZE_T subheap_overhead( const SUBHEAP *subheap ) +static inline SIZE_T subheap_size( const SUBHEAP *subheap ) { - return (char *)&subheap->block - (char *)subheap_base( subheap ); + return subheap->block_size + subheap_overhead( subheap ); } static inline const void *subheap_commit_end( const SUBHEAP *subheap ) { - return (char *)subheap_base( subheap ) + subheap->commitSize; + return (char *)(subheap + 1) + subheap->data_size; +} + +static void subheap_set_bounds( SUBHEAP *subheap, char *commit_end, char *end ) +{ + subheap->block_size = end - (char *)&subheap->block; + subheap->data_size = commit_end - (char *)(subheap + 1); } static inline void *first_block( const SUBHEAP *subheap ) @@ -304,8 +310,7 @@ static inline struct block *next_block( const SUBHEAP *subheap, const struct blo static inline BOOL check_subheap( const SUBHEAP *subheap ) { - const char *base = ROUND_ADDR( subheap, COMMIT_MASK ); - return contains( base, subheap->size, &subheap->block, base + subheap->commitSize - (char *)&subheap->block ); + return contains( &subheap->block, subheap->block_size, subheap + 1, subheap->data_size ); } static BOOL heap_validate( const struct heap *heap ); @@ -642,7 +647,7 @@ static inline BOOL subheap_commit( SUBHEAP *subheap, const struct block *block, return FALSE; } - subheap->commitSize = (char *)commit_end - (char *)subheap_base( subheap ); + subheap->data_size = (char *)commit_end - (char *)(subheap + 1); return TRUE; } @@ -666,7 +671,7 @@ static inline BOOL subheap_decommit( SUBHEAP *subheap, const void *commit_end ) return FALSE; } - subheap->commitSize = (char *)commit_end - (char *)subheap_base( subheap ); + subheap->data_size = (char *)commit_end - (char *)(subheap + 1); return TRUE; } @@ -928,8 +933,7 @@ static SUBHEAP *HEAP_CreateSubHeap( struct heap *heap, LPVOID address, DWORD fla subheap = address; subheap->heap = heap; - subheap->size = totalSize; - subheap->commitSize = commitSize; + subheap_set_bounds( subheap, (char *)address + commitSize, (char *)address + totalSize ); list_add_head( &heap->subheap_list, &subheap->entry ); } else @@ -949,8 +953,7 @@ static SUBHEAP *HEAP_CreateSubHeap( struct heap *heap, LPVOID address, DWORD fla subheap = &heap->subheap; subheap->heap = heap; - subheap->size = totalSize; - subheap->commitSize = commitSize; + subheap_set_bounds( subheap, (char *)address + commitSize, (char *)address + totalSize ); list_add_head( &heap->subheap_list, &subheap->entry ); /* Build the free lists */

1 0

Daniel Lehman : ntdll/tests: Test if RtlFormatMessage modifies va_list on error.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: dd95979b0aaa0a6e09abb4017136ae5236363dda URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd95979b0aaa0a6e09abb401… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sat Jun 4 08:03:02 2022 -0700 ntdll/tests: Test if RtlFormatMessage modifies va_list on error. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/ntdll/tests/rtlstr.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 49f6ef65785..2aebe1deda1 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -2660,6 +2660,25 @@ static void WINAPIV testfmt( const WCHAR *src, const WCHAR *expect, ULONG width, ok( size == (lstrlenW(expect) + 1) * sizeof(WCHAR), "%s: wrong size %lu\n", debugstr_w(src), size ); } +static void testfmt_arg_eaten( const WCHAR *src, ... ) +{ + va_list args; + NTSTATUS status; + WCHAR *arg, buffer[1]; + ULONG size = 0xdeadbeef; + + buffer[0] = 0xcccc; + va_start( args, src ); + status = pRtlFormatMessage( src, 0, FALSE, FALSE, FALSE, &args, buffer, ARRAY_SIZE(buffer), &size ); + ok( status == STATUS_BUFFER_OVERFLOW, "%s: failed %lx\n", debugstr_w(src), status ); + todo_wine + ok( buffer[0] == 0xcccc, "%s: got %x\n", debugstr_w(src), buffer[0] ); + ok( size == 0xdeadbeef, "%s: wrong size %lu\n", debugstr_w(src), size ); + arg = va_arg( args, WCHAR * ); + ok( !wcscmp( L"unused", arg ), "%s: wrong arg %s\n", debugstr_w(src), debugstr_w(arg) ); + va_end( args ); +} + static void test_RtlFormatMessage(void) { WCHAR buffer[128]; @@ -2907,6 +2926,8 @@ static void test_RtlFormatMessage(void) ok( !lstrcmpW( buffer, L"abcxxxxxxx" ), "got %s\n", wine_dbgstr_w(buffer) ); ok( size == 0xdeadbeef, "wrong size %lu\n", size ); + /* va_arg is eaten even in case of buffer overflow */ + testfmt_arg_eaten( L"%1!s! %2!s!", L"eaten", L"unused" ); } START_TEST(rtlstr)

1 0

Jacek Caban : win32u: Move WM_NCACTIVATE implementation from user32.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: 817dca10997e1b9214cb101e3da7221bf2cc379e URL: https://source.winehq.org/git/wine.git/?a=commit;h=817dca10997e1b9214cb101e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 10 17:07:42 2022 +0200 win32u: Move WM_NCACTIVATE implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/controls.h | 1 - dlls/user32/defwnd.c | 3 - dlls/user32/nonclient.c | 305 ------------------------------------------------ dlls/win32u/defwnd.c | 27 +++++ 4 files changed, 27 insertions(+), 309 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=817dca10997e1b9214cb…

1 0