September 2021 - Wine-devel

[PATCH 07/10] ntdll: Directly use ntdll in remove_face_from_cache.
by Jacek Caban 23 Sep '21

23 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)

2 1

[PATCH v2 10/10] gdi32: Directly use ntdll in update_font_association_info.
by Huw Davies 23 Sep '21

23 Sep '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 4b3c93d9853..274c1d83aba 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2481,20 +2481,28 @@ static void add_font_list(HKEY hkey, const struct nls_update_font_list *fl, int static void set_value_key(HKEY hkey, const char *name, const char *value) { if (value) - RegSetValueExA(hkey, name, 0, REG_SZ, (const BYTE *)value, strlen(value) + 1); + set_reg_ascii_value( hkey, name, value ); else if (name) - RegDeleteValueA(hkey, name); + { + WCHAR nameW[64]; + asciiz_to_unicode( nameW, name ); + reg_delete_value( hkey, nameW ); + } } static void update_font_association_info(UINT current_ansi_codepage) { + static const WCHAR associated_charsetW[] = + { 'A','s','s','o','c','i','a','t','e','d',' ','C','h','a','r','s','e','t' }; + if (is_dbcs_ansi_cp(current_ansi_codepage)) { HKEY hkey; - if (RegCreateKeyW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\FontAssoc", &hkey) == ERROR_SUCCESS) + if ((hkey = reg_create_key( NULL, font_assoc_keyW, sizeof(font_assoc_keyW), 0, NULL ))) { HKEY hsubkey; - if (RegCreateKeyW(hkey, L"Associated Charset", &hsubkey) == ERROR_SUCCESS) + if ((hsubkey = reg_create_key( hkey, associated_charsetW, sizeof(associated_charsetW), + 0, NULL ))) { switch (current_ansi_codepage) { @@ -2511,12 +2519,12 @@ static void update_font_association_info(UINT current_ansi_codepage) set_value_key(hsubkey, "SYMBOL(02)", "NO"); break; } - RegCloseKey(hsubkey); + NtClose( hsubkey ); } /* TODO: Associated DefaultFonts */ - RegCloseKey(hkey); + NtClose( hkey ); } } else -- 2.23.0

1 0

[PATCH v2 09/10] gdi32: Directly use ntdll in add_font_list.
by Huw Davies 23 Sep '21

23 Sep '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 1e3c70550a3..4b3c93d9853 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -132,6 +132,13 @@ static struct font_gamma_ramp font_gamma_ramp; static void add_face_to_cache( struct gdi_font_face *face ); static void remove_face_from_cache( struct gdi_font_face *face ); +static UINT asciiz_to_unicode( WCHAR *dst, const char *src ) +{ + WCHAR *p = dst; + while ((*p++ = *src++)); + return (p - dst) * sizeof(WCHAR); +} + static inline WCHAR facename_tolower( WCHAR c ) { if (c >= 'A' && c <= 'Z') return c - 'A' + 'a'; @@ -504,6 +511,13 @@ static void set_reg_value( HKEY hkey, const WCHAR *name, UINT type, const void * NtSetValueKey( hkey, &nameW, 0, type, value, count ); } +static void set_reg_ascii_value( HKEY hkey, const char *name, const char *value ) +{ + WCHAR nameW[64], valueW[128]; + asciiz_to_unicode( nameW, name ); + set_reg_value( hkey, nameW, REG_SZ, valueW, asciiz_to_unicode( valueW, value )); +} + static ULONG query_reg_value( HKEY hkey, const WCHAR *name, KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) { @@ -2458,10 +2472,10 @@ static void add_font_list(HKEY hkey, const struct nls_update_font_list *fl, int { const char *sserif = (dpi <= 108) ? fl->sserif_96 : fl->sserif_120; - RegSetValueExA(hkey, "Courier", 0, REG_SZ, (const BYTE *)fl->courier, strlen(fl->courier)+1); - RegSetValueExA(hkey, "MS Serif", 0, REG_SZ, (const BYTE *)fl->serif, strlen(fl->serif)+1); - RegSetValueExA(hkey, "MS Sans Serif", 0, REG_SZ, (const BYTE *)sserif, strlen(sserif)+1); - RegSetValueExA(hkey, "Small Fonts", 0, REG_SZ, (const BYTE *)fl->small, strlen(fl->small)+1); + set_reg_ascii_value( hkey, "Courier", fl->courier ); + set_reg_ascii_value( hkey, "MS Serif", fl->serif ); + set_reg_ascii_value( hkey, "MS Sans Serif", sserif ); + set_reg_ascii_value( hkey, "Small Fonts", fl->small ); } static void set_value_key(HKEY hkey, const char *name, const char *value) -- 2.23.0

1 0

[PATCH v2 08/10] gdi32: Directly use ntdll in load_system_links.
by Huw Davies 23 Sep '21

23 Sep '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 3419b18a242..1e3c70550a3 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -91,6 +91,18 @@ static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; static const WCHAR nt_prefixW[] = {'\\','?','?','\\'}; +static const WCHAR system_link_keyW[] = +{ + '\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','o','f','t','w','a','r','e', + '\\','M','i','c','r','o','s','o','f','t', + '\\','W','i','n','d','o','w','s',' ','N','T', + '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n', + '\\','F','o','n','t','L','i','n','k', + '\\','S','y','s','t','e','m','L','i','n','k' +}; + static const WCHAR font_substitutes_keyW[] = { '\\','R','e','g','i','s','t','r','y', @@ -1470,34 +1482,33 @@ static void load_system_links(void) struct gdi_font_link *font_link, *system_font_link; struct gdi_font_face *face; - if (!RegOpenKeyW( HKEY_LOCAL_MACHINE, - L"Software\\Microsoft\\Windows NT\\CurrentVersion\\FontLink\\SystemLink", &hkey )) + if ((hkey = reg_open_key( NULL, system_link_keyW, sizeof(system_link_keyW) ))) { - WCHAR value[MAX_PATH], data[1024]; - DWORD type, val_len, data_len; + char buffer[4096]; + KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer; + WCHAR value[MAX_PATH]; WCHAR *entry, *next; - val_len = ARRAY_SIZE(value); - data_len = sizeof(data); i = 0; - while (!RegEnumValueW( hkey, i++, value, &val_len, NULL, &type, (LPBYTE)data, &data_len)) + while (reg_enum_value( hkey, i++, info, sizeof(buffer), value, sizeof(value) )) { /* Don't store fonts that are only substitutes for other fonts */ if (!get_gdi_font_subst( value, -1, NULL )) { + char *data = (char *)info + info->DataOffset; font_link = add_gdi_font_link( value ); - for (entry = data; (char *)entry < (char *)data + data_len && *entry; entry = next) + for (entry = (WCHAR *)data; (char *)entry < data + info->DataLength && *entry; entry = next) { const WCHAR *family_name = NULL; WCHAR *p; - TRACE("%s: %s\n", debugstr_w(value), debugstr_w(entry)); + TRACE( "%s: %s\n", debugstr_w(value), debugstr_w(entry) ); next = entry + lstrlenW(entry) + 1; if ((p = wcschr( entry, ',' ))) { *p++ = 0; - while (iswspace(*p)) p++; + while (*p == ' ' || *p == '\t') p++; if (!(family_name = get_gdi_font_subst( p, -1, NULL ))) family_name = p; } if ((face = find_face_from_filename( entry, family_name ))) @@ -1510,11 +1521,8 @@ static void load_system_links(void) } } else TRACE("%s: SystemLink entry for substituted font, ignoring\n", debugstr_w(value)); - - val_len = ARRAY_SIZE(value); - data_len = sizeof(data); } - RegCloseKey( hkey ); + NtClose( hkey ); } if ((shelldlg_name = get_gdi_font_subst( L"MS Shell Dlg", -1, NULL ))) -- 2.23.0

1 0

[PATCH v2 07/10] gdi32: Directly use ntdll in remove_face_from_cache.
by Huw Davies 23 Sep '21

23 Sep '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index a02e5b4207a..3419b18a242 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -523,6 +523,13 @@ static BOOL reg_enum_value( HKEY hkey, unsigned int index, KEY_VALUE_FULL_INFORM return TRUE; } +static void reg_delete_value( HKEY hkey, const WCHAR *name ) +{ + unsigned int name_size = lstrlenW( name ) * sizeof(WCHAR); + UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name }; + NtDeleteValueKey( hkey, &nameW ); +} + static BOOL reg_delete_tree( HKEY parent, const WCHAR *name, ULONG name_len ) { char buffer[4096]; @@ -1273,20 +1280,25 @@ static void add_face_to_cache( struct gdi_font_face *face ) static void remove_face_from_cache( struct gdi_font_face *face ) { - HKEY hkey_family; + HKEY hkey_family, hkey; - if (RegOpenKeyExW( wine_fonts_cache_key, face->family->family_name, 0, KEY_ALL_ACCESS, &hkey_family )) + if (!(hkey_family = reg_open_key( wine_fonts_cache_key, face->family->family_name, + lstrlenW( face->family->family_name ) * sizeof(WCHAR) ))) return; if (!face->scalable) { WCHAR name[10]; swprintf( name, ARRAY_SIZE(name), L"%d", face->size.y_ppem ); - RegDeleteKeyW( hkey_family, name ); + if ((hkey = reg_open_key( hkey_family, name, lstrlenW( name ) * sizeof(WCHAR) ))) + { + NtDeleteKey( hkey ); + NtClose( hkey ); + } } - else RegDeleteValueW( hkey_family, face->style_name ); + else reg_delete_value( hkey_family, face->style_name ); - RegCloseKey( hkey_family ); + NtClose( hkey_family ); } /* font links */ -- 2.23.0

1 0

[PATCH v2 06/10] gdi32: Directly use ntdll in load_font_list_from_cache.
by Huw Davies 23 Sep '21

23 Sep '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index a8de47a2b59..a02e5b4207a 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -492,6 +492,19 @@ static void set_reg_value( HKEY hkey, const WCHAR *name, UINT type, const void * NtSetValueKey( hkey, &nameW, 0, type, value, count ); } +static ULONG query_reg_value( HKEY hkey, const WCHAR *name, + KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) +{ + unsigned int name_size = name ? lstrlenW( name ) * sizeof(WCHAR) : 0; + UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name }; + + if (NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, + info, size, &size )) + return 0; + + return size - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); +} + static BOOL reg_enum_value( HKEY hkey, unsigned int index, KEY_VALUE_FULL_INFORMATION *info, ULONG size, WCHAR *name, ULONG name_size ) { @@ -1187,27 +1200,30 @@ static void load_face_from_cache( HKEY hkey_family, struct gdi_font_family *fami static void load_font_list_from_cache(void) { - DWORD size, family_index = 0; + WCHAR buffer[4096]; + KEY_VALUE_PARTIAL_INFORMATION *info = (void *)buffer; + KEY_NODE_INFORMATION *enum_info = (KEY_NODE_INFORMATION *)buffer; + DWORD family_index = 0, total_size; struct gdi_font_family *family; HKEY hkey_family; - WCHAR buffer[4096], second_name[LF_FACESIZE]; + WCHAR *second_name = (WCHAR *)info->Data; - size = sizeof(buffer); - while (!RegEnumKeyExW( wine_fonts_cache_key, family_index++, buffer, &size, NULL, NULL, NULL, NULL )) + while (!NtEnumerateKey( wine_fonts_cache_key, family_index++, KeyNodeInformation, enum_info, + sizeof(buffer), &total_size )) { - RegOpenKeyExW( wine_fonts_cache_key, buffer, 0, KEY_ALL_ACCESS, &hkey_family ); - TRACE("opened family key %s\n", debugstr_w(buffer)); - size = sizeof(second_name); - if (RegQueryValueExW( hkey_family, NULL, NULL, NULL, (BYTE *)second_name, &size )) + if (!(hkey_family = reg_open_key( wine_fonts_cache_key, enum_info->Name, + enum_info->NameLength ))) + continue; + TRACE( "opened family key %s\n", debugstr_wn(enum_info->Name, enum_info->NameLength / sizeof(WCHAR)) ); + if (!query_reg_value( hkey_family, NULL, info, sizeof(buffer) )) second_name[0] = 0; family = create_family( buffer, second_name ); load_face_from_cache( hkey_family, family, buffer, sizeof(buffer), TRUE ); - RegCloseKey( hkey_family ); + NtClose( hkey_family ); release_family( family ); - size = sizeof(buffer); } } -- 2.23.0

1 0

[PATCH v2 05/10] gdi32: Directly use ntdll in load_face_from_cache.
by Huw Davies 23 Sep '21

23 Sep '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b78e5947f5e..a8de47a2b59 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1136,19 +1136,21 @@ struct cached_face static void load_face_from_cache( HKEY hkey_family, struct gdi_font_family *family, void *buffer, DWORD buffer_size, BOOL scalable ) { - DWORD type, size, needed, index = 0; + KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer; + KEY_NODE_INFORMATION *node_info = (KEY_NODE_INFORMATION *)buffer; + DWORD index = 0, total_size; struct gdi_font_face *face; HKEY hkey_strike; WCHAR name[256]; - struct cached_face *cached = (struct cached_face *)buffer; + struct cached_face *cached; - size = sizeof(name); - needed = buffer_size - sizeof(DWORD); - while (!RegEnumValueW( hkey_family, index++, name, &size, NULL, &type, buffer, &needed )) + while (reg_enum_value( hkey_family, index++, info, + buffer_size - sizeof(DWORD), name, sizeof(name) )) { - if (type == REG_BINARY && needed > sizeof(*cached)) + cached = (struct cached_face *)((char *)info + info->DataOffset); + if (info->Type == REG_BINARY && info->DataLength > sizeof(*cached)) { - ((DWORD *)buffer)[needed / sizeof(DWORD)] = 0; + ((DWORD *)cached)[info->DataLength / sizeof(DWORD)] = 0; if ((face = create_face( family, name, cached->full_name, cached->full_name + lstrlenW(cached->full_name) + 1, NULL, 0, cached->index, cached->fs, cached->ntmflags, cached->version, @@ -1167,22 +1169,19 @@ static void load_face_from_cache( HKEY hkey_family, struct gdi_font_family *fami release_face( face ); } } - size = sizeof(name); - needed = buffer_size - sizeof(DWORD); } /* load bitmap strikes */ index = 0; - needed = buffer_size; - while (!RegEnumKeyExW( hkey_family, index++, buffer, &needed, NULL, NULL, NULL, NULL )) + while (!NtEnumerateKey( hkey_family, index++, KeyNodeInformation, node_info, + buffer_size, &total_size )) { - if (!RegOpenKeyExW( hkey_family, buffer, 0, KEY_ALL_ACCESS, &hkey_strike )) + if ((hkey_strike = reg_open_key( hkey_family, node_info->Name, node_info->NameLength ))) { load_face_from_cache( hkey_strike, family, buffer, buffer_size, FALSE ); - RegCloseKey( hkey_strike ); + NtClose( hkey_strike ); } - needed = buffer_size; } } -- 2.23.0

1 0

[PATCH v2 04/10] gdi32: Directly use ntdll in add_face_to_cache.
by Huw Davies 23 Sep '21

23 Sep '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 46 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index c91ce3c8792..b78e5947f5e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -467,6 +467,31 @@ static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) return ret; } +static HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, + DWORD options, DWORD *disposition ) +{ + UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; + OBJECT_ATTRIBUTES attr; + HANDLE ret; + + attr.Length = sizeof(attr); + attr.RootDirectory = root; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + if (NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition )) return 0; + return ret; +} + +static void set_reg_value( HKEY hkey, const WCHAR *name, UINT type, const void *value, DWORD count ) +{ + unsigned int name_size = lstrlenW( name ) * sizeof(WCHAR); + UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name }; + NtSetValueKey( hkey, &nameW, 0, type, value, count ); +} + static BOOL reg_enum_value( HKEY hkey, unsigned int index, KEY_VALUE_FULL_INFORMATION *info, ULONG size, WCHAR *name, ULONG name_size ) { @@ -1193,21 +1218,22 @@ static void add_face_to_cache( struct gdi_font_face *face ) DWORD len, buffer[1024]; struct cached_face *cached = (struct cached_face *)buffer; - if (RegCreateKeyExW( wine_fonts_cache_key, face->family->family_name, 0, NULL, REG_OPTION_VOLATILE, - KEY_ALL_ACCESS, NULL, &hkey_family, NULL )) + if (!(hkey_family = reg_create_key( wine_fonts_cache_key, face->family->family_name, + lstrlenW( face->family->family_name ) * sizeof(WCHAR), + REG_OPTION_VOLATILE, NULL ))) return; if (face->family->second_name[0]) - RegSetValueExW( hkey_family, NULL, 0, REG_SZ, (BYTE *)face->family->second_name, - (lstrlenW( face->family->second_name ) + 1) * sizeof(WCHAR) ); + set_reg_value( hkey_family, NULL, REG_SZ, face->family->second_name, + (lstrlenW( face->family->second_name ) + 1) * sizeof(WCHAR) ); if (!face->scalable) { WCHAR name[10]; swprintf( name, ARRAY_SIZE(name), L"%d", face->size.y_ppem ); - RegCreateKeyExW( hkey_family, name, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, - NULL, &hkey_face, NULL); + hkey_face = reg_create_key( hkey_family, name, lstrlenW( name ) * sizeof(WCHAR), + REG_OPTION_VOLATILE, NULL ); } else hkey_face = hkey_family; @@ -1223,11 +1249,11 @@ static void add_face_to_cache( struct gdi_font_face *face ) lstrcpyW( cached->full_name + len, face->file ); len += lstrlenW( face->file ) + 1; - RegSetValueExW( hkey_face, face->style_name, 0, REG_BINARY, (BYTE *)cached, - offsetof( struct cached_face, full_name[len] )); + set_reg_value( hkey_face, face->style_name, REG_BINARY, cached, + offsetof( struct cached_face, full_name[len] )); - if (hkey_face != hkey_family) RegCloseKey( hkey_face ); - RegCloseKey( hkey_family ); + if (hkey_face != hkey_family) NtClose( hkey_face ); + NtClose( hkey_family ); } static void remove_face_from_cache( struct gdi_font_face *face ) -- 2.23.0

1 0

[PATCH v2 03/10] gdi32: Directly use ntdll in load_gdi_font_replacements.
by Huw Davies 23 Sep '21

23 Sep '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 6af91da7869..c91ce3c8792 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -792,21 +792,24 @@ static BOOL add_family_replacement( const WCHAR *new_name, const WCHAR *replace */ static void load_gdi_font_replacements(void) { + char buffer[2048]; + KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer; HKEY hkey; - DWORD i = 0, type, dlen, vlen; - WCHAR value[LF_FACESIZE], data[1024]; + DWORD i = 0; + WCHAR value[LF_FACESIZE]; + + static const WCHAR replacementsW[] = {'R','e','p','l','a','c','e','m','e','n','t','s'}; /* @@ Wine registry key: HKCU\Software\Wine\Fonts\Replacements */ - if (RegOpenKeyW( wine_fonts_key, L"Replacements", &hkey )) return; + if (!(hkey = reg_open_key( wine_fonts_key, replacementsW, sizeof(replacementsW) ))) return; - dlen = sizeof(data); - vlen = ARRAY_SIZE(value); - while (!RegEnumValueW( hkey, i++, value, &vlen, NULL, &type, (BYTE *)data, &dlen )) + while (reg_enum_value( hkey, i++, info, sizeof(buffer), value, sizeof(value) )) { + WCHAR *data = (WCHAR *)((char *)info + info->DataOffset); /* "NewName"="Oldname" */ if (!find_family_from_any_name( value )) { - if (type == REG_MULTI_SZ) + if (info->Type == REG_MULTI_SZ) { WCHAR *replace = data; while (*replace) @@ -815,15 +818,11 @@ static void load_gdi_font_replacements(void) replace += lstrlenW(replace) + 1; } } - else if (type == REG_SZ) add_family_replacement( value, data ); + else if (info->Type == REG_SZ) add_family_replacement( value, data ); } else TRACE("%s is available. Skip this replacement.\n", debugstr_w(value)); - - /* reset dlen and vlen */ - dlen = sizeof(data); - vlen = ARRAY_SIZE(value); } - RegCloseKey( hkey ); + NtClose( hkey ); } static void dump_gdi_font_list(void) -- 2.23.0

1 0

[PATCH v2 02/10] gdi32: Directly use ntdll in load_gdi_font_subst.
by Huw Davies 23 Sep '21

23 Sep '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 54 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 3ba84b10955..6af91da7869 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -91,6 +91,17 @@ static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; static const WCHAR nt_prefixW[] = {'\\','?','?','\\'}; +static const WCHAR font_substitutes_keyW[] = +{ + '\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','o','f','t','w','a','r','e', + '\\','M','i','c','r','o','s','o','f','t', + '\\','W','i','n','d','o','w','s',' ','N','T', + '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n', + '\\','F','o','n','t','S','u','b','s','t','i','t','u','t','e','s' +}; + static const WCHAR font_assoc_keyW[] = { '\\','R','e','g','i','s','t','r','y', @@ -456,6 +467,24 @@ static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) return ret; } +static BOOL reg_enum_value( HKEY hkey, unsigned int index, KEY_VALUE_FULL_INFORMATION *info, + ULONG size, WCHAR *name, ULONG name_size ) +{ + ULONG full_size; + + if (NtEnumerateValueKey( hkey, index, KeyValueFullInformation, + info, size, &full_size )) + return FALSE; + + if (name_size) + { + if (name_size < info->NameLength + sizeof(WCHAR)) return FALSE; + memcpy( name, info->Name, info->NameLength ); + name[info->NameLength / sizeof(WCHAR)] = 0; + } + return TRUE; +} + static BOOL reg_delete_tree( HKEY parent, const WCHAR *name, ULONG name_len ) { char buffer[4096]; @@ -541,20 +570,23 @@ static BOOL add_gdi_font_subst( const WCHAR *from_name, int from_charset, const static void load_gdi_font_subst(void) { + char buffer[512]; + KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer; HKEY hkey; - DWORD i = 0, type, dlen, vlen; - WCHAR value[64], data[64], *p; + DWORD i = 0; + WCHAR *data, *p, value[64]; - if (RegOpenKeyW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\FontSubstitutes", - &hkey)) return; + if (!(hkey = reg_open_key( NULL, font_substitutes_keyW, sizeof(font_substitutes_keyW) ))) + return; - dlen = sizeof(data); - vlen = ARRAY_SIZE(value); - while (!RegEnumValueW( hkey, i++, value, &vlen, NULL, &type, (BYTE *)data, &dlen )) + while (reg_enum_value( hkey, i++, info, sizeof(buffer), value, sizeof(value) )) { int from_charset = -1, to_charset = -1; - TRACE("Got %s=%s\n", debugstr_w(value), debugstr_w(data)); + if (info->Type != REG_SZ) continue; + data = (WCHAR *)((char *)info + info->DataOffset); + + TRACE( "Got %s=%s\n", debugstr_w(value), debugstr_w(data) ); if ((p = wcsrchr( value, ',' )) && p[1]) { *p++ = 0; @@ -570,12 +602,8 @@ static void load_gdi_font_subst(void) or mapping of DEFAULT_CHARSET */ if ((!from_charset || to_charset == from_charset) && to_charset != DEFAULT_CHARSET) add_gdi_font_subst( value, from_charset, data, to_charset ); - - /* reset dlen and vlen */ - dlen = sizeof(data); - vlen = ARRAY_SIZE(value); } - RegCloseKey( hkey ); + NtClose( hkey ); } /* font families */ -- 2.23.0

1 0