ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Directly use ntdll instead of RegDeleteTreeW. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2021-09-23 13:44:02 +01:00 committed by Alexandre Julliard
parent c496a7b3f9
commit 171bfb6e35
1 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
dlls/gdi32/font.c
View File

@ -91,6 +91,16 @@ static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} };
static const WCHAR nt_prefixW[] = {'\\','?','?','\\'}; 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 font_smoothing = GGO_BITMAP;
static UINT subpixel_orientation = GGO_GRAY4_BITMAP; static UINT subpixel_orientation = GGO_GRAY4_BITMAP;
static BOOL antialias_fakes = TRUE; 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 ); 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 */ /* font substitutions */
struct gdi_font_subst struct gdi_font_subst
@ -2373,7 +2418,7 @@ static void update_font_association_info(UINT current_ansi_codepage)
} }
} }
else 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) static void set_multi_value_key(HKEY hkey, const WCHAR *name, const WCHAR *value, DWORD len)