April 2022 - Wine-commits - list.winehq.org

Paul Gofman : winex11.drv: Treat invalid icon as no icon in fetch_icon_data().
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 3eb944c0a7a1b4857cb0b74d04a8450b636c98de URL: https://source.winehq.org/git/wine.git/?a=commit;h=3eb944c0a7a1b4857cb0b74d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Apr 22 18:53:56 2022 +0300 winex11.drv: Treat invalid icon as no icon in fetch_icon_data(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 48500284b68..4cf771a998f 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -598,6 +598,11 @@ failed: } +static HICON get_icon_info( HICON icon, ICONINFO *ii ) +{ + return icon && NtUserGetIconInfo( icon, ii, NULL, NULL, NULL, 0 ) ? icon : NULL; +} + /*********************************************************************** * fetch_icon_data */ @@ -612,21 +617,24 @@ static void fetch_icon_data( HWND hwnd, HICON icon_big, HICON icon_small ) if (!icon_big) { - icon_big = (HICON)send_message( hwnd, WM_GETICON, ICON_BIG, 0 ); - if (!icon_big) icon_big = (HICON)NtUserGetClassLongPtrW( hwnd, GCLP_HICON ); - if (!icon_big) icon_big = LoadIconW( 0, (LPWSTR)IDI_WINLOGO ); + icon_big = get_icon_info( (HICON)send_message( hwnd, WM_GETICON, ICON_BIG, 0 ), &ii ); + if (!icon_big) + icon_big = get_icon_info( (HICON)NtUserGetClassLongPtrW( hwnd, GCLP_HICON ), &ii ); + if (!icon_big) + icon_big = get_icon_info( LoadIconW( 0, (LPWSTR)IDI_WINLOGO ), &ii); } if (!icon_small) { - icon_small = (HICON)send_message( hwnd, WM_GETICON, ICON_SMALL, 0 ); - if (!icon_small) icon_small = (HICON)NtUserGetClassLongPtrW( hwnd, GCLP_HICONSM ); + icon_small = get_icon_info( (HICON)send_message( hwnd, WM_GETICON, ICON_SMALL, 0 ), &ii_small ); + if (!icon_small) + icon_small = get_icon_info( (HICON)NtUserGetClassLongPtrW( hwnd, GCLP_HICONSM ), &ii_small ); } - if (!NtUserGetIconInfo( icon_big, &ii, NULL, NULL, NULL, 0 )) return; + if (!icon_big) return; hDC = NtGdiCreateCompatibleDC(0); bits = get_bitmap_argb( hDC, ii.hbmColor, ii.hbmMask, &size ); - if (bits && NtUserGetIconInfo( icon_small, &ii_small, NULL, NULL, NULL, 0 )) + if (bits && icon_small) { unsigned int size_small; unsigned long *bits_small, *new;

1 0

Alexandre Julliard : server: Store the full group attributes.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 1a0f082682ceeb099086711f43a668bf9adac029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a0f082682ceeb099086711f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 25 12:53:19 2022 +0200 server: Store the full group attributes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/token.c | 41 ++++++++++------------------------------- 1 file changed, 10 insertions(+), 31 deletions(-) diff --git a/server/token.c b/server/token.c index dcb2a879ba6..4aca1ea133a 100644 --- a/server/token.c +++ b/server/token.c @@ -128,15 +128,9 @@ struct privilege struct group { - struct list entry; - unsigned enabled : 1; /* is the sid currently enabled? */ - unsigned def : 1; /* is the sid enabled by default? */ - unsigned logon : 1; /* is this a logon sid? */ - unsigned mandatory: 1; /* is this sid always enabled? */ - unsigned owner : 1; /* can this sid be an owner of an object? */ - unsigned resource : 1; /* is this a domain-local group? */ - unsigned deny_only: 1; /* is this a sid that should be use for denying only? */ - struct sid sid; + struct list entry; + unsigned int attrs; + struct sid sid; }; static void token_dump( struct object *obj, int verbose ); @@ -523,17 +517,11 @@ static struct token *create_token( unsigned int primary, unsigned int session_id release_object( token ); return NULL; } + group->attrs = groups[i].attrs; copy_sid( &group->sid, groups[i].sid ); - group->enabled = TRUE; - group->def = TRUE; - group->logon = (groups[i].attrs & SE_GROUP_LOGON_ID) != 0; - group->mandatory = (groups[i].attrs & SE_GROUP_MANDATORY) != 0; - group->owner = (groups[i].attrs & SE_GROUP_OWNER) != 0; - group->resource = FALSE; - group->deny_only = FALSE; list_add_tail( &token->groups, &group->entry ); /* Use first owner capable group as owner and primary group */ - if (!token->primary_group && group->owner) + if (!token->primary_group && (group->attrs & SE_GROUP_OWNER)) { token->owner = &group->sid; token->primary_group = &group->sid; @@ -628,9 +616,8 @@ struct token *token_duplicate( struct token *src_token, unsigned primary, memcpy( newgroup, group, size ); if (filter_group( group, remove_groups, remove_group_count )) { - newgroup->enabled = 0; - newgroup->def = 0; - newgroup->deny_only = 1; + newgroup->attrs &= ~(SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT); + newgroup->attrs |= SE_GROUP_USE_FOR_DENY_ONLY; } list_add_tail( &token->groups, &newgroup->entry ); if (src_token->primary_group == &group->sid) @@ -888,8 +875,8 @@ int token_sid_present( struct token *token, const struct sid *sid, int deny ) LIST_FOR_EACH_ENTRY( group, &token->groups, struct group, entry ) { - if (!group->enabled) continue; - if (group->deny_only && !deny) continue; + if (!(group->attrs & SE_GROUP_ENABLED)) continue; + if (!deny && (group->attrs & SE_GROUP_USE_FOR_DENY_ONLY)) continue; if (equal_sid( &group->sid, sid )) return TRUE; } @@ -1411,16 +1398,8 @@ DECL_HANDLER(get_token_groups) { LIST_FOR_EACH_ENTRY( group, &token->groups, const struct group, entry ) { - *attr_ptr = 0; - if (group->mandatory) *attr_ptr |= SE_GROUP_MANDATORY; - if (group->def) *attr_ptr |= SE_GROUP_ENABLED_BY_DEFAULT; - if (group->enabled) *attr_ptr |= SE_GROUP_ENABLED; - if (group->owner) *attr_ptr |= SE_GROUP_OWNER; - if (group->deny_only) *attr_ptr |= SE_GROUP_USE_FOR_DENY_ONLY; - if (group->resource) *attr_ptr |= SE_GROUP_RESOURCE; - if (group->logon) *attr_ptr |= SE_GROUP_LOGON_ID; sid = copy_sid( sid, &group->sid ); - attr_ptr++; + *attr_ptr++ = group->attrs; } } }

1 0

Alexandre Julliard : server: Return the full token group for TokenLogonSid.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: dd99319cdebe783c9c3def3a39c8b6ab73689c5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd99319cdebe783c9c3def3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 25 13:23:28 2022 +0200 server: Return the full token group for TokenLogonSid. Based on a patch by Fabian Maurer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52845 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 3 +++ dlls/ntdll/unix/security.c | 24 ++---------------------- include/wine/server_protocol.h | 4 +++- server/protocol.def | 1 + server/request.h | 3 ++- server/token.c | 8 +++----- server/trace.c | 1 + 7 files changed, 15 insertions(+), 29 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 135a45f7727..ed91ccc39d3 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1898,6 +1898,9 @@ static void test_token_attr(void) /* S-1-5-5-0-XXXXXX */ ret = IsWellKnownSid(Groups->Groups[0].Sid, WinLogonIdsSid); ok(ret, "Unknown SID\n"); + + ok(Groups->Groups[0].Attributes == (SE_GROUP_MANDATORY | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_ENABLED | SE_GROUP_LOGON_ID), + "got %lx\n", Groups->Groups[0].Attributes); } } diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index 2955355353e..7b401c8bd70 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -230,6 +230,7 @@ NTSTATUS WINAPI NtQueryInformationToken( HANDLE token, TOKEN_INFORMATION_CLASS c break; case TokenGroups: + case TokenLogonSid: { /* reply buffer is always shorter than output one */ void *buffer = malloc( length ); @@ -239,6 +240,7 @@ NTSTATUS WINAPI NtQueryInformationToken( HANDLE token, TOKEN_INFORMATION_CLASS c SERVER_START_REQ( get_token_groups ) { req->handle = wine_server_obj_handle( token ); + req->attr_mask = (class == TokenLogonSid) ? SE_GROUP_LOGON_ID : 0; wine_server_set_reply( req, buffer, length ); status = wine_server_call( req ); @@ -464,28 +466,6 @@ NTSTATUS WINAPI NtQueryInformationToken( HANDLE token, TOKEN_INFORMATION_CLASS c break; } - case TokenLogonSid: - SERVER_START_REQ( get_token_sid ) - { - TOKEN_GROUPS * groups = info; - PSID sid = groups + 1; - DWORD sid_len = length < sizeof(TOKEN_GROUPS) ? 0 : length - sizeof(TOKEN_GROUPS); - - req->handle = wine_server_obj_handle( token ); - req->which_sid = class; - wine_server_set_reply( req, sid, sid_len ); - status = wine_server_call( req ); - if (retlen) *retlen = reply->sid_len + sizeof(TOKEN_GROUPS); - if (status == STATUS_SUCCESS) - { - groups->GroupCount = 1; - groups->Groups[0].Sid = sid; - groups->Groups[0].Attributes = 0; - } - } - SERVER_END_REQ; - break; - case TokenLinkedToken: SERVER_START_REQ( create_linked_token ) { diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 8f883b2d97e..868add58abf 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4479,6 +4479,8 @@ struct get_token_groups_request { struct request_header __header; obj_handle_t handle; + unsigned int attr_mask; + char __pad_20[4]; }; struct get_token_groups_reply { @@ -6286,7 +6288,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 750 +#define SERVER_PROTOCOL_VERSION 751 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 9b7b99ae86a..2be1658fca2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3176,6 +3176,7 @@ enum caret_state @REQ(get_token_groups) obj_handle_t handle; /* handle to the token */ + unsigned int attr_mask; /* mask for wanted attributes */ @REPLY data_size_t attr_len; /* length needed to store attrs */ data_size_t sid_len; /* length needed to store sids */ diff --git a/server/request.h b/server/request.h index 9ed2f898e6d..7fd63905e0e 100644 --- a/server/request.h +++ b/server/request.h @@ -1964,7 +1964,8 @@ C_ASSERT( sizeof(struct get_token_sid_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_token_sid_reply, sid_len) == 8 ); C_ASSERT( sizeof(struct get_token_sid_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_token_groups_request, handle) == 12 ); -C_ASSERT( sizeof(struct get_token_groups_request) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_token_groups_request, attr_mask) == 16 ); +C_ASSERT( sizeof(struct get_token_groups_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_token_groups_reply, attr_len) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_token_groups_reply, sid_len) == 12 ); C_ASSERT( sizeof(struct get_token_groups_reply) == 16 ); diff --git a/server/token.c b/server/token.c index 4aca1ea133a..f817c1114f8 100644 --- a/server/token.c +++ b/server/token.c @@ -82,7 +82,6 @@ static const struct sid local_sid = { SID_REVISION, 1, SECURITY_LOCAL_SID_AUTHOR static const struct sid interactive_sid = { SID_REVISION, 1, SECURITY_NT_AUTHORITY, { SECURITY_INTERACTIVE_RID } }; static const struct sid anonymous_logon_sid = { SID_REVISION, 1, SECURITY_NT_AUTHORITY, { SECURITY_ANONYMOUS_LOGON_RID } }; static const struct sid authenticated_user_sid = { SID_REVISION, 1, SECURITY_NT_AUTHORITY, { SECURITY_AUTHENTICATED_USER_RID } }; -static const struct sid builtin_logon_sid = { SID_REVISION, 3, SECURITY_NT_AUTHORITY, { SECURITY_LOGON_IDS_RID, 0, 0 } }; static struct luid prev_luid_value = { 1000, 0 }; @@ -731,7 +730,7 @@ struct token *token_create_admin( unsigned primary, int impersonation_level, int struct sid alias_admins_sid = { SID_REVISION, 2, SECURITY_NT_AUTHORITY, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS }}; struct sid alias_users_sid = { SID_REVISION, 2, SECURITY_NT_AUTHORITY, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS }}; /* on Windows, this value changes every time the user logs on */ - struct sid logon_sid = { SID_REVISION, 3, SECURITY_NT_AUTHORITY, { SECURITY_LOGON_IDS_RID, 0, 1 /* FIXME: should be randomly generated when tokens are inherited by new processes */ }}; + struct sid logon_sid = { SID_REVISION, 3, SECURITY_NT_AUTHORITY, { SECURITY_LOGON_IDS_RID, 0, 0 /* FIXME: should be randomly generated when tokens are inherited by new processes */ }}; const struct sid *user_sid = security_unix_uid_to_sid( getuid() ); struct acl *default_dacl = create_default_dacl( user_sid ); const struct luid_attr admin_privs[] = @@ -1354,9 +1353,6 @@ DECL_HANDLER(get_token_sid) case TokenOwner: sid = token->owner; break; - case TokenLogonSid: - sid = &builtin_logon_sid; - break; default: set_error( STATUS_INVALID_PARAMETER ); break; @@ -1384,6 +1380,7 @@ DECL_HANDLER(get_token_groups) LIST_FOR_EACH_ENTRY( group, &token->groups, const struct group, entry ) { + if (req->attr_mask && !(group->attrs & req->attr_mask)) continue; group_count++; reply->sid_len += sid_len( &group->sid ); } @@ -1398,6 +1395,7 @@ DECL_HANDLER(get_token_groups) { LIST_FOR_EACH_ENTRY( group, &token->groups, const struct group, entry ) { + if (req->attr_mask && !(group->attrs & req->attr_mask)) continue; sid = copy_sid( sid, &group->sid ); *attr_ptr++ = group->attrs; } diff --git a/server/trace.c b/server/trace.c index d71561e1247..15ca4e7d71e 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3864,6 +3864,7 @@ static void dump_get_token_sid_reply( const struct get_token_sid_reply *req ) static void dump_get_token_groups_request( const struct get_token_groups_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); + fprintf( stderr, ", attr_mask=%08x", req->attr_mask ); } static void dump_get_token_groups_reply( const struct get_token_groups_reply *req )

1 0

Nikolay Sivov : dwrite/tests: Add a test for unset axis for references created with IDWriteFactory3.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 76a4039e270fae98991d782babf15b0cc9644999 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76a4039e270fae98991d782b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 25 13:31:41 2022 +0300 dwrite/tests: Add a test for unset axis for references created with IDWriteFactory3. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 38eb1aeeb7d..af88c716ad8 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7982,9 +7982,10 @@ static void test_CreateFontFaceReference(void) IDWriteFontFace3 *fontface, *fontface1; DWRITE_FONT_AXIS_VALUE axis_values[16]; IDWriteFontCollection1 *collection; + UINT32 axis_count, index, count, i; + IDWriteFontFaceReference1 *ref2; IDWriteFontFile *file, *file1; IDWriteFactory3 *factory; - UINT32 index, count, i; IDWriteFont3 *font3; ULONG refcount; WCHAR *path; @@ -8091,6 +8092,13 @@ static void test_CreateFontFaceReference(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(file != file1, "got %p, previous file %p\n", file1, file); + if (SUCCEEDED(IDWriteFontFaceReference_QueryInterface(ref, &IID_IDWriteFontFaceReference1, (void **)&ref2))) + { + axis_count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref2); + ok(!axis_count, "Unexpected axis value count.\n"); + IDWriteFontFaceReference1_Release(ref2); + } + IDWriteFontFaceReference_Release(ref); IDWriteFontFile_Release(file); IDWriteFontFile_Release(file1); @@ -8112,8 +8120,6 @@ static void test_CreateFontFaceReference(void) for (j = 0; j < font_count; j++) { - IDWriteFontFaceReference1 *ref2; - hr = IDWriteFontFamily1_GetFont(family, j, &font3); ok(hr == S_OK, "Failed to get font, hr %#lx.\n", hr); @@ -8132,7 +8138,7 @@ static void test_CreateFontFaceReference(void) if (SUCCEEDED(hr = IDWriteFontFaceReference_QueryInterface(ref, &IID_IDWriteFontFaceReference1, (void **)&ref2))) { - UINT32 axis_count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref2); + axis_count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref2); todo_wine ok(axis_count >= 4, "Unexpected axis value count.\n");

1 0

Nikolay Sivov : dwrite/tests: Use table access helpers for CBLC tests.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 58ea0d81e532a35eb14a7c67dcec65172666ffd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58ea0d81e532a35eb14a7c67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 25 13:31:42 2022 +0300 dwrite/tests: Use table access helpers for CBLC tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index af88c716ad8..3d4c4caad98 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -321,11 +321,12 @@ typedef struct { BYTE data[1]; } sbix_glyph_data; -typedef struct { +struct cblc_header +{ WORD majorVersion; WORD minorVersion; DWORD numSizes; -} CBLCHeader; +}; typedef struct { BYTE res[12]; @@ -3526,6 +3527,14 @@ struct dwrite_fonttable UINT32 size; }; +static const void *table_read_ensure(const struct dwrite_fonttable *table, unsigned int offset, unsigned int size) +{ + if (size > table->size || offset > table->size - size) + return NULL; + + return table->data + offset; +} + static WORD table_read_be_word(const struct dwrite_fonttable *table, void *ptr, DWORD offset) { if (!ptr) @@ -9303,34 +9312,40 @@ static DWORD get_sbix_formats(IDWriteFontFace4 *fontface) static DWORD get_cblc_formats(IDWriteFontFace4 *fontface) { - CBLCBitmapSizeTable *sizes; - UINT32 num_sizes, size, s; + const CBLCBitmapSizeTable *sizes; + struct dwrite_fonttable cblc; + unsigned int i, num_sizes; BOOL exists = FALSE; - CBLCHeader *header; DWORD ret = 0; - void *context; HRESULT hr; - hr = IDWriteFontFace4_TryGetFontTable(fontface, MS_CBLC_TAG, (const void **)&header, &size, &context, &exists); - ok(hr == S_OK, "TryGetFontTable() failed, %#lx\n", hr); - ok(exists, "Expected CBLC table\n"); + hr = IDWriteFontFace4_TryGetFontTable(fontface, MS_CBLC_TAG, (const void **)&cblc.data, &cblc.size, &cblc.context, &exists); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(exists, "Expected CBLC table.\n"); if (!exists) return 0; - num_sizes = GET_BE_DWORD(header->numSizes); - sizes = (CBLCBitmapSizeTable *)(header + 1); - - for (s = 0; s < num_sizes; s++) { - BYTE bpp = sizes[s].bitDepth; + num_sizes = table_read_be_dword(&cblc, NULL, FIELD_OFFSET(struct cblc_header, numSizes)); + if (!(sizes = table_read_ensure(&cblc, sizeof(struct cblc_header), num_sizes * sizeof(*sizes)))) + { + skip("Malformed CBLC table.\n"); + num_sizes = 0; + } + for (i = 0; i < num_sizes; ++i) + { + BYTE bpp = sizes[i].bitDepth; if (bpp == 1 || bpp == 2 || bpp == 4 || bpp == 8) ret |= DWRITE_GLYPH_IMAGE_FORMATS_PNG; else if (bpp == 32) ret |= DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8; + + if (ret == (DWRITE_GLYPH_IMAGE_FORMATS_PNG | DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8)) + break; } - IDWriteFontFace4_ReleaseFontTable(fontface, context); + IDWriteFontFace4_ReleaseFontTable(fontface, cblc.context); return ret; }

1 0

Nikolay Sivov : dwrite: Remove already defined macros.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: fd56f8e31c633c34c3c9c5c1433bba2fd0815f6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd56f8e31c633c34c3c9c5c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 25 13:31:43 2022 +0300 dwrite: Remove already defined macros. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 93adb65ec76..c663ed77b96 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -415,11 +415,6 @@ struct dwrite_colorglyphenum struct dwrite_fonttable colr; /* used to access layers */ }; -#define GLYPH_BLOCK_SHIFT 8 -#define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT) -#define GLYPH_BLOCK_MASK (GLYPH_BLOCK_SIZE - 1) -#define GLYPH_MAX 65536 - struct dwrite_fontfile { IDWriteFontFile IDWriteFontFile_iface;

1 0

Nikolay Sivov : dwrite: Simplify collection object initialization.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: e32f59461a10fe905ac5a24a6c35fd2501ccb1e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e32f59461a10fe905ac5a24a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 25 13:31:44 2022 +0300 dwrite: Simplify collection object initialization. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c663ed77b96..6b3aeebc8c3 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2,7 +2,7 @@ * Font and collections * * Copyright 2011 Huw Davies - * Copyright 2012, 2014-2017 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2022 Nikolay Sivov for CodeWeavers * Copyright 2014 Aric Stewart for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -3524,13 +3524,13 @@ static HRESULT fontcollection_add_family(struct dwrite_fontcollection *collectio return S_OK; } -static HRESULT init_font_collection(struct dwrite_fontcollection *collection, BOOL is_system) +static HRESULT init_font_collection(struct dwrite_fontcollection *collection, IDWriteFactory7 *factory, + BOOL is_system) { collection->IDWriteFontCollection3_iface.lpVtbl = is_system ? &systemfontcollectionvtbl : &fontcollectionvtbl; collection->refcount = 1; - collection->count = 0; - collection->size = 0; - collection->family_data = NULL; + collection->factory = factory; + IDWriteFactory7_AddRef(collection->factory); return S_OK; } @@ -4637,7 +4637,7 @@ HRESULT create_font_collection(IDWriteFactory7 *factory, IDWriteFontFileEnumerat if (!(collection = calloc(1, sizeof(*collection)))) return E_OUTOFMEMORY; - hr = init_font_collection(collection, is_system); + hr = init_font_collection(collection, factory, is_system); if (FAILED(hr)) { free(collection); @@ -4776,9 +4776,6 @@ HRESULT create_font_collection(IDWriteFactory7 *factory, IDWriteFontFileEnumerat if (is_system) fontcollection_add_replacements(collection); - collection->factory = factory; - IDWriteFactory7_AddRef(factory); - return hr; } @@ -5092,7 +5089,7 @@ HRESULT get_eudc_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection3 if (!(collection = calloc(1, sizeof(*collection)))) return E_OUTOFMEMORY; - hr = init_font_collection(collection, FALSE); + hr = init_font_collection(collection, factory, FALSE); if (FAILED(hr)) { free(collection); @@ -5100,8 +5097,6 @@ HRESULT get_eudc_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection3 } *ret = &collection->IDWriteFontCollection3_iface; - collection->factory = factory; - IDWriteFactory7_AddRef(factory); /* return empty collection if EUDC fonts are not configured */ swprintf(eudckeypathW, ARRAY_SIZE(eudckeypathW), L"EUDC\\%u", GetACP());

1 0

Nikolay Sivov : dwrite: Implement GetFontFamilyModel().
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 9250a3ab54ba14de9207e16880fa0cad2057f879 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9250a3ab54ba14de9207e168… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 25 13:31:45 2022 +0300 dwrite: Implement GetFontFamilyModel(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 6b3aeebc8c3..aa14eb3360c 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -333,6 +333,7 @@ struct dwrite_fontcollection LONG refcount; IDWriteFactory7 *factory; + DWRITE_FONT_FAMILY_MODEL family_model; struct dwrite_fontfamily_data **family_data; size_t size; size_t count; @@ -3438,9 +3439,11 @@ static HRESULT WINAPI dwritefontcollection2_GetMatchingFonts(IDWriteFontCollecti static DWRITE_FONT_FAMILY_MODEL WINAPI dwritefontcollection2_GetFontFamilyModel(IDWriteFontCollection3 *iface) { - FIXME("%p.\n", iface); + struct dwrite_fontcollection *collection = impl_from_IDWriteFontCollection3(iface); + + TRACE("%p.\n", iface); - return DWRITE_FONT_FAMILY_MODEL_WEIGHT_STRETCH_STYLE; + return collection->family_model; } static HRESULT WINAPI dwritefontcollection2_GetFontSet(IDWriteFontCollection3 *iface, IDWriteFontSet1 **fontset) @@ -3525,12 +3528,13 @@ static HRESULT fontcollection_add_family(struct dwrite_fontcollection *collectio } static HRESULT init_font_collection(struct dwrite_fontcollection *collection, IDWriteFactory7 *factory, - BOOL is_system) + DWRITE_FONT_FAMILY_MODEL family_model, BOOL is_system) { collection->IDWriteFontCollection3_iface.lpVtbl = is_system ? &systemfontcollectionvtbl : &fontcollectionvtbl; collection->refcount = 1; collection->factory = factory; IDWriteFactory7_AddRef(collection->factory); + collection->family_model = family_model; return S_OK; } @@ -4637,7 +4641,7 @@ HRESULT create_font_collection(IDWriteFactory7 *factory, IDWriteFontFileEnumerat if (!(collection = calloc(1, sizeof(*collection)))) return E_OUTOFMEMORY; - hr = init_font_collection(collection, factory, is_system); + hr = init_font_collection(collection, factory, DWRITE_FONT_FAMILY_MODEL_WEIGHT_STRETCH_STYLE, is_system); if (FAILED(hr)) { free(collection); @@ -5089,7 +5093,7 @@ HRESULT get_eudc_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection3 if (!(collection = calloc(1, sizeof(*collection)))) return E_OUTOFMEMORY; - hr = init_font_collection(collection, factory, FALSE); + hr = init_font_collection(collection, factory, DWRITE_FONT_FAMILY_MODEL_WEIGHT_STRETCH_STYLE, FALSE); if (FAILED(hr)) { free(collection);

1 0

Nikolay Sivov : dwrite: Use separate structure for set entry description.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: b3cf1df4f49e4cf649fa5ca8541863fadb832bf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3cf1df4f49e4cf649fa5ca8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 25 13:31:46 2022 +0300 dwrite: Use separate structure for set entry description. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 81 +++++++++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 38 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index aa14eb3360c..bdd8c7fcc8b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -452,13 +452,18 @@ struct dwrite_fontresource IDWriteFactory7 *factory; }; -struct dwrite_fontset_entry +struct dwrite_fontset_entry_desc { - LONG refcount; IDWriteFontFile *file; DWRITE_FONT_FACE_TYPE face_type; unsigned int face_index; unsigned int simulations; +}; + +struct dwrite_fontset_entry +{ + LONG refcount; + struct dwrite_fontset_entry_desc desc; IDWriteLocalizedStrings *props[DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FACE_NAME + 1]; }; @@ -7465,7 +7470,7 @@ static void release_fontset_entry(struct dwrite_fontset_entry *entry) if (InterlockedDecrement(&entry->refcount) > 0) return; - IDWriteFontFile_Release(entry->file); + IDWriteFontFile_Release(entry->desc.file); for (i = 0; i < ARRAY_SIZE(entry->props); ++i) { if (entry->props[i] && entry->props[i] != MISSING_SET_PROP) @@ -7497,9 +7502,9 @@ static IDWriteLocalizedStrings * fontset_entry_get_property(struct dwrite_fontse return value; } - get_filestream_from_file(entry->file, &stream_desc.stream); - stream_desc.face_type = entry->face_type; - stream_desc.face_index = entry->face_index; + get_filestream_from_file(entry->desc.file, &stream_desc.stream); + stream_desc.face_type = entry->desc.face_type; + stream_desc.face_index = entry->desc.face_index; if (property == DWRITE_FONT_PROPERTY_ID_FULL_NAME) opentype_get_font_info_strings(&stream_desc, DWRITE_INFORMATIONAL_STRING_FULL_NAME, &value); @@ -7572,8 +7577,8 @@ static HRESULT WINAPI dwritefontset_GetFontFaceReference(IDWriteFontSet3 *iface, if (index >= set->count) return E_INVALIDARG; - return IDWriteFactory7_CreateFontFaceReference_(set->factory, set->entries[index]->file, - set->entries[index]->face_index, set->entries[index]->simulations, reference); + return IDWriteFactory7_CreateFontFaceReference_(set->factory, set->entries[index]->desc.file, + set->entries[index]->desc.face_index, set->entries[index]->desc.simulations, reference); } static HRESULT WINAPI dwritefontset_FindFontFaceReference(IDWriteFontSet3 *iface, @@ -7820,8 +7825,8 @@ static HRESULT WINAPI dwritefontset1_CreateFontResource(IDWriteFontSet3 *iface, if (index >= set->count) return E_INVALIDARG; - return IDWriteFactory7_CreateFontResource(set->factory, set->entries[index]->file, - set->entries[index]->face_index, resource); + return IDWriteFactory7_CreateFontResource(set->factory, set->entries[index]->desc.file, + set->entries[index]->desc.face_index, resource); } static HRESULT WINAPI dwritefontset1_CreateFontFace(IDWriteFontSet3 *iface, UINT32 index, IDWriteFontFace5 **fontface) @@ -7909,11 +7914,11 @@ static HRESULT fontset_create_entry(IDWriteFontFile *file, DWRITE_FONT_FACE_TYPE return E_OUTOFMEMORY; entry->refcount = 1; - entry->file = file; - IDWriteFontFile_AddRef(entry->file); - entry->face_type = face_type; - entry->face_index = face_index; - entry->simulations = simulations; + entry->desc.file = file; + IDWriteFontFile_AddRef(entry->desc.file); + entry->desc.face_type = face_type; + entry->desc.face_index = face_index; + entry->desc.simulations = simulations; *ret = entry; @@ -8034,8 +8039,7 @@ static ULONG WINAPI dwritefontsetbuilder_Release(IDWriteFontSetBuilder2 *iface) return refcount; } -static HRESULT fontset_builder_add_entry(struct dwrite_fontset_builder *builder, IDWriteFontFile *file, - DWRITE_FONT_FACE_TYPE face_type, unsigned int face_index, unsigned int simulations) +static HRESULT fontset_builder_add_entry(struct dwrite_fontset_builder *builder, const struct dwrite_fontset_entry_desc *desc) { struct dwrite_fontset_entry *entry; HRESULT hr; @@ -8046,7 +8050,7 @@ static HRESULT fontset_builder_add_entry(struct dwrite_fontset_builder *builder, return E_OUTOFMEMORY; } - if (FAILED(hr = fontset_create_entry(file, face_type, face_index, simulations, &entry))) + if (FAILED(hr = fontset_create_entry(desc->file, desc->face_type, desc->face_index, desc->simulations, &entry))) return hr; builder->entries[builder->count++] = entry; @@ -8056,13 +8060,14 @@ static HRESULT fontset_builder_add_entry(struct dwrite_fontset_builder *builder, static HRESULT fontset_builder_add_file(struct dwrite_fontset_builder *builder, IDWriteFontFile *file) { + struct dwrite_fontset_entry_desc desc = { 0 }; DWRITE_FONT_FILE_TYPE filetype; - DWRITE_FONT_FACE_TYPE facetype; unsigned int i, face_count; BOOL supported = FALSE; HRESULT hr; - if (FAILED(hr = IDWriteFontFile_Analyze(file, &supported, &filetype, &facetype, &face_count))) + desc.file = file; + if (FAILED(hr = IDWriteFontFile_Analyze(desc.file, &supported, &filetype, &desc.face_type, &face_count))) return hr; if (!supported) @@ -8070,7 +8075,8 @@ static HRESULT fontset_builder_add_file(struct dwrite_fontset_builder *builder, for (i = 0; i < face_count; ++i) { - if (FAILED(hr = fontset_builder_add_entry(builder, file, facetype, i, DWRITE_FONT_SIMULATIONS_NONE))) + desc.face_index = i; + if (FAILED(hr = fontset_builder_add_entry(builder, &desc))) break; } @@ -8086,34 +8092,33 @@ static HRESULT WINAPI dwritefontsetbuilder_AddFontFaceReference_(IDWriteFontSetB } static HRESULT WINAPI dwritefontsetbuilder_AddFontFaceReference(IDWriteFontSetBuilder2 *iface, - IDWriteFontFaceReference *ref) + IDWriteFontFaceReference *reference) { struct dwrite_fontset_builder *builder = impl_from_IDWriteFontSetBuilder2(iface); - unsigned int face_count, face_index, simulations; + struct dwrite_fontset_entry_desc desc = { 0 }; DWRITE_FONT_FILE_TYPE file_type; - DWRITE_FONT_FACE_TYPE face_type; - IDWriteFontFile *file; + unsigned int face_count; BOOL supported; HRESULT hr; - TRACE("%p, %p.\n", iface, ref); + TRACE("%p, %p.\n", iface, reference); - if (FAILED(hr = IDWriteFontFaceReference_GetFontFile(ref, &file))) return hr; - if (FAILED(hr = IDWriteFontFile_Analyze(file, &supported, &file_type, &face_type, &face_count))) - goto done; + if (FAILED(hr = IDWriteFontFaceReference_GetFontFile(reference, &desc.file))) return hr; - if (!supported) + if (SUCCEEDED(hr = IDWriteFontFile_Analyze(desc.file, &supported, &file_type, &desc.face_type, &face_count))) { - hr = DWRITE_E_FILEFORMAT; - goto done; - } + if (!supported) + hr = DWRITE_E_FILEFORMAT; - face_index = IDWriteFontFaceReference_GetFontFaceIndex(ref); - simulations = IDWriteFontFaceReference_GetSimulations(ref); - hr = fontset_builder_add_entry(builder, file, face_type, face_index, simulations); + if (SUCCEEDED(hr)) + { + desc.face_index = IDWriteFontFaceReference_GetFontFaceIndex(reference); + desc.simulations = IDWriteFontFaceReference_GetSimulations(reference); + hr = fontset_builder_add_entry(builder, &desc); + } + } -done: - IDWriteFontFile_Release(file); + IDWriteFontFile_Release(desc.file); return hr; }

1 0

Nikolay Sivov : dwrite: Prefer different family names for typographical collections.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 7e3edfabc5ae2d6c696e936ecb6956d07bc75da9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e3edfabc5ae2d6c696e936e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 25 13:31:47 2022 +0300 dwrite: Prefer different family names for typographical collections. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 3 ++- dlls/dwrite/font.c | 21 ++++++++++------- dlls/dwrite/opentype.c | 56 ++++++++++++++++++++++++++++++++------------ 3 files changed, 55 insertions(+), 25 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 00fe325518f..35cf5add34b 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -469,7 +469,8 @@ extern void opentype_get_font_typo_metrics(struct file_stream_desc *stream_desc, unsigned int *descent) DECLSPEC_HIDDEN; extern HRESULT opentype_get_font_info_strings(const struct file_stream_desc *stream_desc, DWRITE_INFORMATIONAL_STRING_ID id, IDWriteLocalizedStrings **strings) DECLSPEC_HIDDEN; -extern HRESULT opentype_get_font_familyname(struct file_stream_desc*,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; +extern HRESULT opentype_get_font_familyname(const struct file_stream_desc *desc, DWRITE_FONT_FAMILY_MODEL family_model, + IDWriteLocalizedStrings **names) DECLSPEC_HIDDEN; extern HRESULT opentype_get_font_facename(struct file_stream_desc*,WCHAR*,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern void opentype_get_typographic_features(struct ot_gsubgpos_table *table, unsigned int script_index, unsigned int language_index, struct tag_array *tags) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index bdd8c7fcc8b..e32b2d0f4cb 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4279,7 +4279,8 @@ static BOOL font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA return TRUE; } -static HRESULT init_font_data(const struct fontface_desc *desc, struct dwrite_font_data **ret) +static HRESULT init_font_data(const struct fontface_desc *desc, DWRITE_FONT_FAMILY_MODEL family_model, + struct dwrite_font_data **ret) { static const float width_axis_values[] = { @@ -4319,10 +4320,9 @@ static HRESULT init_font_data(const struct fontface_desc *desc, struct dwrite_fo opentype_get_font_metrics(&stream_desc, &data->metrics, NULL); opentype_get_font_facename(&stream_desc, props.lf.lfFaceName, &data->names); - /* get family name from font file */ - hr = opentype_get_font_familyname(&stream_desc, &data->family_names); - if (FAILED(hr)) { - WARN("unable to get family name from font\n"); + if (FAILED(hr = opentype_get_font_familyname(&stream_desc, family_model, &data->family_names))) + { + WARN("Unable to get family name from the font file, hr %#lx.\n", hr); release_font_data(data); return hr; } @@ -4337,7 +4337,10 @@ static HRESULT init_font_data(const struct fontface_desc *desc, struct dwrite_fo fontstrings_get_en_string(data->family_names, familyW, ARRAY_SIZE(familyW)); fontstrings_get_en_string(data->names, faceW, ARRAY_SIZE(faceW)); - if (font_apply_differentiation_rules(data, familyW, faceW)) { + + if (family_model == DWRITE_FONT_FAMILY_MODEL_WEIGHT_STRETCH_STYLE + && font_apply_differentiation_rules(data, familyW, faceW)) + { set_en_localizedstring(data->family_names, familyW); set_en_localizedstring(data->names, faceW); } @@ -4722,7 +4725,7 @@ HRESULT create_font_collection(IDWriteFactory7 *factory, IDWriteFontFileEnumerat desc.font_data = NULL; /* Allocate an initialize new font data structure. */ - hr = init_font_data(&desc, &font_data); + hr = init_font_data(&desc, DWRITE_FONT_FAMILY_MODEL_WEIGHT_STRETCH_STYLE, &font_data); if (FAILED(hr)) { /* move to next one */ @@ -5060,7 +5063,7 @@ static HRESULT eudc_collection_add_family(IDWriteFactory7 *factory, struct dwrit desc.simulations = DWRITE_FONT_SIMULATIONS_NONE; desc.font_data = NULL; - hr = init_font_data(&desc, &font_data); + hr = init_font_data(&desc, DWRITE_FONT_FAMILY_MODEL_WEIGHT_STRETCH_STYLE, &font_data); if (FAILED(hr)) continue; @@ -5388,7 +5391,7 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li } else { - hr = init_font_data(desc, &font_data); + hr = init_font_data(desc, DWRITE_FONT_FAMILY_MODEL_WEIGHT_STRETCH_STYLE, &font_data); if (FAILED(hr)) { IDWriteFontFace5_Release(&fontface->IDWriteFontFace5_iface); diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c671218c486..c4b2177639b 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -2565,12 +2565,26 @@ HRESULT opentype_get_font_info_strings(const struct file_stream_desc *stream_des return S_OK; } -/* FamilyName locating order is WWS Family Name -> Preferred Family Name -> Family Name. If font claims to - have 'Preferred Family Name' in WWS format, then WWS name is not used. */ -HRESULT opentype_get_font_familyname(struct file_stream_desc *stream_desc, IDWriteLocalizedStrings **names) +HRESULT opentype_get_font_familyname(const struct file_stream_desc *stream_desc, DWRITE_FONT_FAMILY_MODEL family_model, + IDWriteLocalizedStrings **names) { + static const unsigned int wws_candidates[] = + { + OPENTYPE_STRING_WWS_FAMILY_NAME, + OPENTYPE_STRING_TYPOGRAPHIC_FAMILY_NAME, + OPENTYPE_STRING_FAMILY_NAME, + ~0u, + }; + static const unsigned int typographic_candidates[] = + { + OPENTYPE_STRING_TYPOGRAPHIC_FAMILY_NAME, + OPENTYPE_STRING_WWS_FAMILY_NAME, + OPENTYPE_STRING_FAMILY_NAME, + ~0u, + }; struct dwrite_fonttable os2, name; - UINT16 fsselection; + const unsigned int *id; + BOOL try_wws_name; HRESULT hr; opentype_get_font_table(stream_desc, MS_OS2_TAG, &os2); @@ -2578,20 +2592,32 @@ HRESULT opentype_get_font_familyname(struct file_stream_desc *stream_desc, IDWri *names = NULL; - /* If Preferred Family doesn't conform to WWS model try WWS name. */ - fsselection = os2.data ? table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, fsSelection)) : 0; - if (os2.data && !(fsselection & OS2_FSSELECTION_WWS)) - hr = opentype_get_font_strings_from_id(&name, OPENTYPE_STRING_WWS_FAMILY_NAME, names); + if (family_model == DWRITE_FONT_FAMILY_MODEL_TYPOGRAPHIC) + { + id = typographic_candidates; + } else - hr = E_FAIL; + { + /* FamilyName locating order is WWS Family Name -> Preferred Family Name -> Family Name. If font claims to + have 'Preferred Family Name' in WWS format, then WWS name is not used. */ - if (FAILED(hr)) - hr = opentype_get_font_strings_from_id(&name, OPENTYPE_STRING_TYPOGRAPHIC_FAMILY_NAME, names); - if (FAILED(hr)) - hr = opentype_get_font_strings_from_id(&name, OPENTYPE_STRING_FAMILY_NAME, names); + opentype_get_font_table(stream_desc, MS_OS2_TAG, &os2); + /* If Preferred Family doesn't conform to WWS model try WWS name. */ + try_wws_name = os2.data && !(table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, fsSelection)) & OS2_FSSELECTION_WWS); + if (os2.context) + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2.context); + + id = wws_candidates; + if (!try_wws_name) id++; + } + + while (*id != ~0u) + { + if (SUCCEEDED(hr = opentype_get_font_strings_from_id(&name, *id, names))) + break; + id++; + } - if (os2.context) - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2.context); if (name.context) IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, name.context);

1 0