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

Michael Müller : aclui: Implement EditSecurity().
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: wine Branch: master Commit: 7d2fb57725f396d584d477de3b5b94ada2e1ee5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d2fb57725f396d584d477de… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Feb 28 10:27:49 2021 -0600 aclui: Implement EditSecurity(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/aclui/aclui_main.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c index 24fb32fdb8c..43171d70410 100644 --- a/dlls/aclui/aclui_main.c +++ b/dlls/aclui/aclui_main.c @@ -480,10 +480,32 @@ HPROPSHEETPAGE WINAPI CreateSecurityPage(ISecurityInformation *security) return ret; } -BOOL WINAPI EditSecurity(HWND owner, LPSECURITYINFO psi) +BOOL WINAPI EditSecurity(HWND owner, ISecurityInformation *security) { - FIXME("(%p, %p): stub\n", owner, psi); - return FALSE; + PROPSHEETHEADERW sheet = {0}; + HPROPSHEETPAGE pages[1]; + SI_OBJECT_INFO info; + BOOL ret; + + TRACE("(%p, %p)\n", owner, security); + + if (FAILED(ISecurityInformation_GetObjectInformation(security, &info))) + return FALSE; + if (!(pages[0] = CreateSecurityPage(security))) + return FALSE; + + sheet.dwSize = sizeof(sheet); + sheet.dwFlags = PSH_DEFAULT; + sheet.hwndParent = owner; + sheet.hInstance = aclui_instance; + sheet.pszCaption = load_formatstr(IDS_PERMISSION_FOR, info.pszObjectName); + sheet.nPages = 1; + sheet.nStartPage = 0; + sheet.phpage = pages; + + ret = PropertySheetW(&sheet) != -1; + LocalFree((void *)sheet.pszCaption); + return ret; } BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)

1 0

Zhiyi Zhang : comctl32/hotkey: Implement themed frame painting.
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: wine Branch: master Commit: 5ca79e66ad87966094b2ee4d70bad112b2702caa URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ca79e66ad87966094b2ee4d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 4 16:47:27 2021 +0800 comctl32/hotkey: Implement themed frame painting. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/hotkey.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c index 58717a2a493..7421ff6ef65 100644 --- a/dlls/comctl32/hotkey.c +++ b/dlls/comctl32/hotkey.c @@ -37,6 +37,7 @@ #include "winnls.h" #include "commctrl.h" #include "comctl32.h" +#include "uxtheme.h" #include "wine/debug.h" #include "wine/heap.h" @@ -423,6 +424,50 @@ HOTKEY_NCCreate (HWND hwnd, const CREATESTRUCTW *lpcs) return DefWindowProcW (infoPtr->hwndSelf, WM_NCCREATE, 0, (LPARAM)lpcs); } +static LRESULT +HOTKEY_NCPaint (HWND hwnd, HRGN region) +{ + INT cxEdge, cyEdge; + HRGN clipRgn; + HTHEME theme; + LONG exStyle; + RECT r; + HDC dc; + + theme = OpenThemeData(NULL, WC_EDITW); + if (!theme) + return DefWindowProcW(hwnd, WM_NCPAINT, (WPARAM)region, 0); + + exStyle = GetWindowLongW(hwnd, GWL_EXSTYLE); + if (!(exStyle & WS_EX_CLIENTEDGE)) + { + CloseThemeData(theme); + return DefWindowProcW(hwnd, WM_NCPAINT, (WPARAM)region, 0); + } + + cxEdge = GetSystemMetrics(SM_CXEDGE); + cyEdge = GetSystemMetrics(SM_CYEDGE); + GetWindowRect(hwnd, &r); + + /* New clipping region passed to default proc to exclude border */ + clipRgn = CreateRectRgn(r.left + cxEdge, r.top + cyEdge, r.right - cxEdge, r.bottom - cyEdge); + if (region != (HRGN)1) + CombineRgn(clipRgn, clipRgn, region, RGN_AND); + OffsetRect(&r, -r.left, -r.top); + + dc = GetDCEx(hwnd, region, DCX_WINDOW | DCX_INTERSECTRGN); + if (IsThemeBackgroundPartiallyTransparent(theme, 0, 0)) + DrawThemeParentBackground(hwnd, dc, &r); + DrawThemeBackground(theme, dc, 0, 0, &r, 0); + ReleaseDC(hwnd, dc); + CloseThemeData(theme); + + /* Call default proc to get the scrollbars etc. also painted */ + DefWindowProcW(hwnd, WM_NCPAINT, (WPARAM)clipRgn, 0); + DeleteObject(clipRgn); + return 0; +} + static LRESULT HOTKEY_SetFocus (HOTKEY_INFO *infoPtr) { @@ -516,6 +561,9 @@ HOTKEY_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_NCCREATE: return HOTKEY_NCCreate (hwnd, (LPCREATESTRUCTW)lParam); + case WM_NCPAINT: + return HOTKEY_NCPaint (hwnd, (HRGN)wParam); + case WM_PRINTCLIENT: case WM_PAINT: HOTKEY_Paint(infoPtr, (HDC)wParam);

1 0

Michael Müller : aclui: Add icons to the users list.
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: wine Branch: master Commit: fe7d44dfa38657bd9151a8b28592ac457e1a067a URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe7d44dfa38657bd9151a8b2… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Feb 28 10:27:47 2021 -0600 aclui: Add icons to the users list. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/aclui/Makefile.in | 2 +- dlls/aclui/aclui.rc | 5 +++++ dlls/aclui/aclui_main.c | 34 +++++++++++++++++++++++++++++++++- dlls/aclui/user_icons.bmp | Bin 0 -> 2730 bytes 4 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/aclui/Makefile.in b/dlls/aclui/Makefile.in index f93e5da6c8d..1eac32f0700 100644 --- a/dlls/aclui/Makefile.in +++ b/dlls/aclui/Makefile.in @@ -1,6 +1,6 @@ MODULE = aclui.dll IMPORTLIB = aclui -IMPORTS = comctl32 user32 advapi32 +IMPORTS = comctl32 user32 advapi32 gdi32 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/aclui/aclui.rc b/dlls/aclui/aclui.rc index 5cc808811ca..1228c2ab15b 100644 --- a/dlls/aclui/aclui.rc +++ b/dlls/aclui/aclui.rc @@ -40,3 +40,8 @@ BEGIN | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 5, 115, 230, 95, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE END + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* @makedep: user_icons.bmp */ +IDB_USER_ICONS BITMAP user_icons.bmp diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c index 199e7295adc..01e3476b97f 100644 --- a/dlls/aclui/aclui_main.c +++ b/dlls/aclui/aclui_main.c @@ -55,6 +55,7 @@ struct security_page unsigned int user_count; HWND dialog; + HIMAGELIST image_list; }; static HINSTANCE aclui_instance; @@ -110,11 +111,12 @@ static void add_user(struct security_page *page, PSID sid) user->name = name; user->sid = sid; - item.mask = LVIF_PARAM | LVIF_TEXT; + item.mask = LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE; item.iItem = -1; item.iSubItem = 0; item.pszText = name; item.lParam = (LPARAM)user; + item.iImage = (sid_type == SidTypeGroup || sid_type == SidTypeWellKnownGroup) ? 0 : 1; SendMessageW(GetDlgItem(page->dialog, IDC_USERS), LVM_INSERTITEMW, 0, (LPARAM)&item); } @@ -160,6 +162,30 @@ static void init_users(struct security_page *page) } } +static HIMAGELIST create_image_list(UINT resource, UINT width, UINT height, UINT count, COLORREF mask_color) +{ + HIMAGELIST image_list; + HBITMAP image; + INT ret; + + if (!(image_list = ImageList_Create(width, height, ILC_COLOR32 | ILC_MASK, 0, count))) + return NULL; + if (!(image = LoadBitmapW(aclui_instance, MAKEINTRESOURCEW(resource)))) + { + ImageList_Destroy(image_list); + return NULL; + } + + ret = ImageList_AddMasked(image_list, image, mask_color); + DeleteObject(image); + if (ret == -1) + { + ImageList_Destroy(image_list); + return NULL; + } + return image_list; +} + static void security_page_free(struct security_page *page) { unsigned int i; @@ -169,6 +195,8 @@ static void security_page_free(struct security_page *page) free(page->users); LocalFree(page->sd); + if (page->image_list) + ImageList_Destroy(page->image_list); if (page->security) ISecurityInformation_Release(page->security); free(page); @@ -199,6 +227,10 @@ static void security_page_init_dlg(HWND hwnd, struct security_page *page) column.cx = rect.right - rect.left; SendMessageW(control, LVM_INSERTCOLUMNW, 0, (LPARAM)&column); + if (!(page->image_list = create_image_list(IDB_USER_ICONS, 18, 18, 2, RGB(255, 0, 255)))) + return; + SendMessageW(control, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)page->image_list); + init_users(page); if (page->user_count) diff --git a/dlls/aclui/user_icons.bmp b/dlls/aclui/user_icons.bmp new file mode 100644 index 00000000000..29259e2724c Binary files /dev/null and b/dlls/aclui/user_icons.bmp differ

1 0

Michael Müller : aclui: Populate the users list.
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: wine Branch: master Commit: f57356ad44548ec0387beec9b68f11f7a37721ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=f57356ad44548ec0387beec9… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Feb 28 10:27:46 2021 -0600 aclui: Populate the users list. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/aclui/Makefile.in | 2 +- dlls/aclui/aclui_main.c | 159 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 160 insertions(+), 1 deletion(-) diff --git a/dlls/aclui/Makefile.in b/dlls/aclui/Makefile.in index da3aa00084e..f93e5da6c8d 100644 --- a/dlls/aclui/Makefile.in +++ b/dlls/aclui/Makefile.in @@ -1,6 +1,6 @@ MODULE = aclui.dll IMPORTLIB = aclui -IMPORTS = comctl32 user32 +IMPORTS = comctl32 user32 advapi32 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c index 3989c3017aa..199e7295adc 100644 --- a/dlls/aclui/aclui_main.c +++ b/dlls/aclui/aclui_main.c @@ -39,23 +39,178 @@ WINE_DEFAULT_DEBUG_CHANNEL(aclui); #define ISecurityInformation_GetSecurity(This, info, sd, def) (This)->lpVtbl->GetSecurity(This, info, sd, def) #define ISecurityInformation_GetAccessRights(This, type, flags, access, count, def) (This)->lpVtbl->GetAccessRights(This, type, flags, access, count, def) +struct user +{ + WCHAR *name; + PSID sid; +}; + struct security_page { + ISecurityInformation *security; SI_OBJECT_INFO info; + PSECURITY_DESCRIPTOR sd; + + struct user *users; + unsigned int user_count; HWND dialog; }; static HINSTANCE aclui_instance; +static WCHAR *get_sid_name(PSID sid, SID_NAME_USE *sid_type) +{ + WCHAR *name, *domain; + DWORD domain_len = 0; + DWORD name_len = 0; + BOOL ret; + + LookupAccountSidW(NULL, sid, NULL, &name_len, NULL, &domain_len, sid_type); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return NULL; + if (!(name = malloc(name_len * sizeof(WCHAR)))) + return NULL; + if (!(domain = malloc(domain_len * sizeof(WCHAR)))) + { + free(name); + return NULL; + } + + ret = LookupAccountSidW(NULL, sid, name, &name_len, domain, &domain_len, sid_type); + free(domain); + if (ret) return name; + free(name); + return NULL; +} + +static void add_user(struct security_page *page, PSID sid) +{ + struct user *new_array, *user; + SID_NAME_USE sid_type; + unsigned int i; + LVITEMW item; + WCHAR *name; + + /* check if we already processed this user or group */ + for (i = 0; i < page->user_count; ++i) + { + if (EqualSid(sid, page->users[i].sid)) + return; + } + + if (!(name = get_sid_name(sid, &sid_type))) + return; + + if (!(new_array = realloc(page->users, (page->user_count + 1) * sizeof(*page->users)))) + return; + page->users = new_array; + user = &page->users[page->user_count++]; + + user->name = name; + user->sid = sid; + + item.mask = LVIF_PARAM | LVIF_TEXT; + item.iItem = -1; + item.iSubItem = 0; + item.pszText = name; + item.lParam = (LPARAM)user; + + SendMessageW(GetDlgItem(page->dialog, IDC_USERS), LVM_INSERTITEMW, 0, (LPARAM)&item); +} + +static PSID get_sid_from_ace(ACE_HEADER *ace) +{ + switch (ace->AceType) + { + case ACCESS_ALLOWED_ACE_TYPE: + return &((ACCESS_ALLOWED_ACE *)ace)->SidStart; + case ACCESS_DENIED_ACE_TYPE: + return &((ACCESS_DENIED_ACE *)ace)->SidStart; + default: + FIXME("Unhandled ACE type %#x.\n", ace->AceType); + return NULL; + } +} + +static void init_users(struct security_page *page) +{ + BOOL defaulted, present; + ACE_HEADER *ace; + DWORD index; + ACL *dacl; + PSID sid; + + if (!GetSecurityDescriptorDacl(page->sd, &present, &dacl, &defaulted)) + { + ERR("Failed to query descriptor information, error %u.\n", GetLastError()); + return; + } + + if (!present) + return; + + for (index = 0; index < dacl->AceCount; index++) + { + if (!GetAce(dacl, index, (void **)&ace)) + break; + if (!(sid = get_sid_from_ace(ace))) + continue; + add_user(page, sid); + } +} + static void security_page_free(struct security_page *page) { + unsigned int i; + + for (i = 0; i < page->user_count; ++i) + free(page->users[i].name); + free(page->users); + + LocalFree(page->sd); + if (page->security) + ISecurityInformation_Release(page->security); free(page); } static void security_page_init_dlg(HWND hwnd, struct security_page *page) { + LVCOLUMNW column; + HWND control; + HRESULT hr; + RECT rect; + page->dialog = hwnd; + + if (FAILED(hr = ISecurityInformation_GetSecurity(page->security, + DACL_SECURITY_INFORMATION, &page->sd, FALSE))) + { + ERR("Failed to get security descriptor, hr %#x.\n", hr); + return; + } + + control = GetDlgItem(hwnd, IDC_USERS); + SendMessageW(control, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_FULLROWSELECT, LVS_EX_FULLROWSELECT); + + GetClientRect(control, &rect); + column.mask = LVCF_FMT | LVCF_WIDTH; + column.fmt = LVCFMT_LEFT; + column.cx = rect.right - rect.left; + SendMessageW(control, LVM_INSERTCOLUMNW, 0, (LPARAM)&column); + + init_users(page); + + if (page->user_count) + { + LVITEMW item; + item.mask = LVIF_STATE; + item.iItem = 0; + item.iSubItem = 0; + item.state = LVIS_FOCUSED | LVIS_SELECTED; + item.stateMask = item.state; + SendMessageW(control, LVM_SETITEMW, 0, (LPARAM)&item); + } } static INT_PTR CALLBACK security_page_proc(HWND dialog, UINT msg, WPARAM wparam, LPARAM lparam) @@ -101,6 +256,9 @@ HPROPSHEETPAGE WINAPI CreateSecurityPage(ISecurityInformation *security) return NULL; } + page->security = security; + ISecurityInformation_AddRef(security); + memset(&propsheet, 0, sizeof(propsheet)); propsheet.dwSize = sizeof(propsheet); propsheet.dwFlags = PSP_DEFAULT | PSP_USECALLBACK; @@ -119,6 +277,7 @@ HPROPSHEETPAGE WINAPI CreateSecurityPage(ISecurityInformation *security) if (!(ret = CreatePropertySheetPageW(&propsheet))) { ERR("Failed to create property sheet page.\n"); + ISecurityInformation_Release(security); free(page); return NULL; }

1 0

Nikolay Sivov : dwrite: Silence GetPropertyValues() fixme.
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: wine Branch: master Commit: c8ac1909bc0540ad080c626fc806f25582be1fa4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8ac1909bc0540ad080c626f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 4 18:39:36 2021 +0300 dwrite: Silence GetPropertyValues() fixme. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 98c194b8c30..b0b8e3c34f4 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -7212,7 +7212,13 @@ static HRESULT WINAPI dwritefontset_GetPropertyValues_(IDWriteFontSet3 *iface, D static HRESULT WINAPI dwritefontset_GetPropertyValues(IDWriteFontSet3 *iface, UINT32 index, DWRITE_FONT_PROPERTY_ID id, BOOL *exists, IDWriteLocalizedStrings **values) { - FIXME("%p, %u, %d, %p, %p.\n", iface, index, id, exists, values); + static int once; + + if (!once++) + FIXME("%p: stub\n", iface); + + if (!once++) + FIXME("%p, %u, %d, %p, %p.\n", iface, index, id, exists, values); return E_NOTIMPL; }

1 0

Nikolay Sivov : dwrite: Implement GetFontSet() for families.
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: wine Branch: master Commit: 3049c94753ed9f44083b38b89862e41966f76e97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3049c94753ed9f44083b38b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 4 18:39:38 2021 +0300 dwrite: Implement GetFontSet() for families. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 14 ++++++++++---- dlls/dwrite/tests/font.c | 16 ++++------------ 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index b64ea53692f..9232f29317f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2725,9 +2725,12 @@ static HRESULT WINAPI dwritefontfamily2_GetMatchingFonts(IDWriteFontFamily2 *ifa static HRESULT WINAPI dwritefontfamily2_GetFontSet(IDWriteFontFamily2 *iface, IDWriteFontSet1 **fontset) { - FIXME("%p, %p.\n", iface, fontset); + struct dwrite_fontfamily *family = impl_from_IDWriteFontFamily2(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, fontset); + + return fontset_create_from_font_data(family->collection->factory, family->data->fonts, + family->data->count, fontset); } static const IDWriteFontFamily2Vtbl fontfamilyvtbl = @@ -2806,9 +2809,12 @@ static HRESULT WINAPI dwritefontfamilylist1_GetFontFaceReference(IDWriteFontList static HRESULT WINAPI dwritefontfamilylist2_GetFontSet(IDWriteFontList2 *iface, IDWriteFontSet1 **fontset) { - FIXME("%p, %p.\n", iface, fontset); + struct dwrite_fontfamily *family = impl_family_from_IDWriteFontList2(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, fontset); + + return fontset_create_from_font_data(family->collection->factory, family->data->fonts, + family->data->count, fontset); } static const IDWriteFontList2Vtbl fontfamilylistvtbl = diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 12ea78b634b..8fe59ca5a1e 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1631,18 +1631,14 @@ if (0) /* crashes on native */ ok(fontlist == (IDWriteFontList *)fontlist2, "Unexpected interface pointer.\n"); hr = IDWriteFontList2_GetFontSet(fontlist2, &fontset); - todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IDWriteFontList2_GetFontSet(fontlist2, &fontset2); - todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(fontset != fontset2, "Unexpected instance.\n"); - } - if (fontset2) - IDWriteFontSet1_Release(fontset2); - if (fontset) - IDWriteFontSet1_Release(fontset); + + IDWriteFontSet1_Release(fontset2); + IDWriteFontSet1_Release(fontset); IDWriteFontList2_Release(fontlist2); } @@ -9959,17 +9955,13 @@ static void test_family_font_set(void) if (SUCCEEDED(IDWriteFontFamily_QueryInterface(family, &IID_IDWriteFontFamily2, (void **)&family2))) { hr = IDWriteFontFamily2_GetFontSet(family2, &fontset); - todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IDWriteFontFamily2_GetFontSet(family2, &fontset2); - todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { ok(fontset != fontset2, "Unexpected fontset instance.\n"); IDWriteFontSet1_Release(fontset2); IDWriteFontSet1_Release(fontset); - } + IDWriteFontFamily2_Release(family2); } else

1 0

Michael Müller : aclui: Add an empty ACE editor dialog.
by Alexandre Julliard March 4, 2021

March 4, 2021

1 0

Nikolay Sivov : dwrite: Return font set for matched font list.
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: wine Branch: master Commit: f40c2a19e2fe508deb12b91cf1c63dd030863cf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f40c2a19e2fe508deb12b91c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 4 18:39:37 2021 +0300 dwrite: Return font set for matched font list. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- dlls/dwrite/tests/font.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index b0b8e3c34f4..b64ea53692f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -278,6 +278,9 @@ struct dwrite_fontset_builder size_t capacity; }; +static HRESULT fontset_create_from_font_data(IDWriteFactory7 *factory, struct dwrite_font_data **fonts, + unsigned int count, IDWriteFontSet1 **ret); + static void dwrite_grab_font_table(void *context, UINT32 table, const BYTE **data, UINT32 *size, void **data_context) { struct dwrite_fontface *fontface = context; @@ -2385,9 +2388,12 @@ static HRESULT WINAPI dwritefontlist1_GetFontFaceReference(IDWriteFontList2 *ifa static HRESULT WINAPI dwritefontlist2_GetFontSet(IDWriteFontList2 *iface, IDWriteFontSet1 **fontset) { - FIXME("%p, %p.\n", iface, fontset); + struct dwrite_fontlist *fontlist = impl_from_IDWriteFontList2(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, fontset); + + return fontset_create_from_font_data(fontlist->family->collection->factory, fontlist->fonts, + fontlist->font_count, fontset); } static const IDWriteFontList2Vtbl dwritefontlistvtbl = @@ -7410,6 +7416,40 @@ static const IDWriteFontSet3Vtbl fontsetvtbl = dwritefontset3_GetFontSourceName, }; +static HRESULT fontset_create_from_font_data(IDWriteFactory7 *factory, struct dwrite_font_data **fonts, + unsigned int count, IDWriteFontSet1 **ret) +{ + struct dwrite_fontset *object; + unsigned int i; + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IDWriteFontSet3_iface.lpVtbl = &fontsetvtbl; + object->refcount = 1; + object->factory = factory; + IDWriteFactory7_AddRef(object->factory); + + if (count) + { + object->entries = heap_calloc(count, sizeof(*object->entries)); + object->count = count; + + /* FIXME: set available properties too */ + for (i = 0; i < object->count; ++i) + { + object->entries[i].file = fonts[i]->file; + object->entries[i].face_index = fonts[i]->face_index; + object->entries[i].simulations = fonts[i]->simulations; + IDWriteFontFile_AddRef(object->entries[i].file); + } + } + + *ret = (IDWriteFontSet1 *)&object->IDWriteFontSet3_iface; + + return S_OK; +} + static HRESULT fontset_builder_create_fontset(IDWriteFactory7 *factory, struct dwrite_fontset_entry *entries, unsigned int count, IDWriteFontSet **ret) { diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 4dcbbc4d077..12ea78b634b 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1626,7 +1626,24 @@ if (0) /* crashes on native */ if (SUCCEEDED(IDWriteFontFamily1_QueryInterface(family1, &IID_IDWriteFontList2, (void **)&fontlist2))) { + IDWriteFontSet1 *fontset = NULL, *fontset2 = NULL; + ok(fontlist == (IDWriteFontList *)fontlist2, "Unexpected interface pointer.\n"); + + hr = IDWriteFontList2_GetFontSet(fontlist2, &fontset); + todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDWriteFontList2_GetFontSet(fontlist2, &fontset2); + todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(fontset != fontset2, "Unexpected instance.\n"); + } + if (fontset2) + IDWriteFontSet1_Release(fontset2); + if (fontset) + IDWriteFontSet1_Release(fontset); + IDWriteFontList2_Release(fontlist2); } else @@ -4067,6 +4084,18 @@ static void test_GetMatchingFonts(void) if (SUCCEEDED(IDWriteFontList_QueryInterface(fontlist, &IID_IDWriteFontList2, (void **)&fontlist3))) { + IDWriteFontSet1 *fontset, *fontset2; + + hr = IDWriteFontList2_GetFontSet(fontlist3, &fontset); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDWriteFontList2_GetFontSet(fontlist3, &fontset2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(fontset != fontset2, "Unexpected instance.\n"); + + IDWriteFontSet1_Release(fontset2); + IDWriteFontSet1_Release(fontset); + IDWriteFontList2_Release(fontlist3); } else

1 0

Alexandre Julliard : ntdll: Make sure we send valid object attributes in NtCreateUserProcess().
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: wine Branch: master Commit: d0a1bddea0f618c199e2b7d9930ab06df6c61935 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0a1bddea0f618c199e2b7d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 4 13:04:42 2021 +0100 ntdll: Make sure we send valid object attributes in NtCreateUserProcess(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 083a3a82a1d..ca9951dfa03 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -861,6 +861,7 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ CLIENT_ID id; HANDLE parent = 0, debug = 0, token = 0; UNICODE_STRING path = {0}; + OBJECT_ATTRIBUTES empty_attr = { sizeof(empty_attr) }; SIZE_T i, attr_count = (attr->TotalLength - sizeof(attr->TotalLength)) / sizeof(PS_ATTRIBUTE); const PS_ATTRIBUTE *handles_attr = NULL; data_size_t handles_size; @@ -893,6 +894,7 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ break; } } + if (!process_attr) process_attr = &empty_attr; TRACE( "%s image %s cmdline %s parent %p\n", debugstr_us( &path ), debugstr_us( &params->ImagePathName ), debugstr_us( &params->CommandLine ), parent );

1 0

Nikolay Sivov : dwrite: Implement font set object stub.
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: wine Branch: master Commit: 91ab9018d22ed5bbda708d9360a88cbec85b30f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91ab9018d22ed5bbda708d93… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 4 18:39:34 2021 +0300 dwrite: Implement font set object stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 355 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/dwrite/tests/font.c | 23 ++- 2 files changed, 361 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=91ab9018d22ed5bbda70…

1 0