September 2021 - Wine-Devel

[PATCH v2 01/10] gdi32: Directly use ntdll instead of RegDeleteTreeW.
by Huw Davies Sept. 23, 2021

Sept. 23, 2021

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 | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 11cec6b95ae..3ba84b10955 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -91,6 +91,16 @@ static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; static const WCHAR nt_prefixW[] = {'\\','?','?','\\'}; +static const WCHAR font_assoc_keyW[] = +{ + '\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','y','s','t','e','m', + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', + '\\','C','o','n','t','r','o','l', + '\\','F','o','n','t','A','s','s','o','c' +}; + static UINT font_smoothing = GGO_BITMAP; static UINT subpixel_orientation = GGO_GRAY4_BITMAP; static BOOL antialias_fakes = TRUE; @@ -429,6 +439,41 @@ static void get_fonts_win_dir_path( const WCHAR *file, WCHAR *path ) if (file) lstrcatW( path, file ); } +static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) +{ + 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 (NtOpenKeyEx( &ret, MAXIMUM_ALLOWED, &attr, 0 )) return 0; + return ret; +} + +static BOOL reg_delete_tree( HKEY parent, const WCHAR *name, ULONG name_len ) +{ + char buffer[4096]; + KEY_NODE_INFORMATION *key_info = (KEY_NODE_INFORMATION *)buffer; + DWORD size; + HKEY key; + BOOL ret = TRUE; + + if (!(key = reg_open_key( parent, name, name_len ))) return FALSE; + + while (ret && !NtEnumerateKey( key, 0, KeyNodeInformation, key_info, sizeof(buffer), &size )) + ret = reg_delete_tree( key, key_info->Name, key_info->NameLength ); + + if (ret) ret = !NtDeleteKey( key ); + NtClose( key ); + return ret; +} + /* font substitutions */ struct gdi_font_subst @@ -2373,7 +2418,7 @@ static void update_font_association_info(UINT current_ansi_codepage) } } else - RegDeleteTreeW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\FontAssoc"); + reg_delete_tree( NULL, font_assoc_keyW, sizeof(font_assoc_keyW) ); } static void set_multi_value_key(HKEY hkey, const WCHAR *name, const WCHAR *value, DWORD len) -- 2.23.0

1 0

[PATCH 10/10] gdi32: Directly use ntdll in update_font_association_info.
by Jacek Caban Sept. 23, 2021

Sept. 23, 2021

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

1 0

[PATCH 09/10] gdi32: Directly use ntdll in add_font_list.
by Jacek Caban Sept. 23, 2021

Sept. 23, 2021

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

1 0

[PATCH 08/10] gdi32: Directly use ntdll in load_system_links.
by Jacek Caban Sept. 23, 2021

Sept. 23, 2021

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

1 0

[PATCH 06/10] gdi32: Directly use ntdll in load_font_list_from_cache.
by Jacek Caban Sept. 23, 2021

Sept. 23, 2021

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

1 0

[PATCH 05/10] gdi32: Directly use ntdll in load_face_from_cache.
by Jacek Caban Sept. 23, 2021

Sept. 23, 2021

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

1 0

[PATCH 04/10] gdi32: Directly use ntdll in add_face_to_cache.
by Jacek Caban Sept. 23, 2021

Sept. 23, 2021

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

1 0

[PATCH 03/10] gdi32: Directly use ntdll in load_gdi_font_replacements.
by Jacek Caban Sept. 23, 2021

Sept. 23, 2021

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

1 0

[PATCH 02/10] gdi32: Directly use ntdll in load_gdi_font_subst.
by Jacek Caban Sept. 23, 2021

Sept. 23, 2021

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

1 0

[PATCH 01/10] gdi32: Directly use ntdll instead of RegDeleteTreeW.
by Jacek Caban Sept. 23, 2021

Sept. 23, 2021

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

1 0