September 2021 - Wine-commits

Rémi Bernon : joy.cpl: Use msvcrt memory allocation functions.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 0a777f0bcce71084b756376395c09ee6fc794ee1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a777f0bcce71084b7563763… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 23 14:01:50 2021 +0200 joy.cpl: Use msvcrt memory allocation functions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 3ea417843f4..226f36051a6 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -112,7 +112,7 @@ static void initialize_joysticks(struct JoystickData *data) data->num_joysticks = 0; data->cur_joystick = 0; IDirectInput8_EnumDevices(data->di, DI8DEVCLASS_GAMECTRL, enum_callback, data, DIEDFL_ATTACHEDONLY); - data->joysticks = HeapAlloc(GetProcessHeap(), 0, sizeof(struct Joystick) * data->num_joysticks); + data->joysticks = malloc(sizeof(struct Joystick) * data->num_joysticks); /* Get all the joysticks */ IDirectInput8_EnumDevices(data->di, DI8DEVCLASS_GAMECTRL, enum_callback, data, DIEDFL_ATTACHEDONLY); @@ -134,14 +134,14 @@ static void destroy_joysticks(struct JoystickData *data) if (data->joysticks[i].effects[j].effect) IDirectInputEffect_Release(data->joysticks[i].effects[j].effect); - HeapFree(GetProcessHeap(), 0, data->joysticks[i].effects); + free(data->joysticks[i].effects); } IDirectInputDevice8_Unacquire(data->joysticks[i].device); IDirectInputDevice8_Release(data->joysticks[i].device); } - HeapFree(GetProcessHeap(), 0, data->joysticks); + free(data->joysticks); } static void initialize_joysticks_list(HWND hwnd, struct JoystickData *data) @@ -823,7 +823,7 @@ static INT_PTR CALLBACK ff_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp joy->num_effects = 0; joy->effects = NULL; IDirectInputDevice8_EnumEffects(joy->device, ff_effects_callback, (void *) joy, 0); - joy->effects = HeapAlloc(GetProcessHeap(), 0, sizeof(struct Effect) * joy->num_effects); + joy->effects = malloc(sizeof(struct Effect) * joy->num_effects); joy->cur_effect = 0; IDirectInputDevice8_EnumEffects(joy->device, ff_effects_callback, (void*) joy, 0);

1 0

Rémi Bernon : joy.cpl: Use msvcrt wide string functions.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 032052fca6a47d44e7a2fa0623bc86ff2c783d89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=032052fca6a47d44e7a2fa06… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 23 14:01:51 2021 +0200 joy.cpl: Use msvcrt wide string functions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 226f36051a6..43e124a0a33 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -212,7 +212,7 @@ static void enable_joystick(WCHAR *joy_name, BOOL enable) get_app_key(&hkey, &appkey); if (!enable) - set_config_key(hkey, appkey, joy_name, L"disabled", lstrlenW(L"disabled")); + set_config_key(hkey, appkey, joy_name, L"disabled", wcslen(L"disabled")); else set_config_key(hkey, appkey, joy_name, NULL, 0); @@ -240,7 +240,7 @@ static void initialize_disabled_joysticks_list(HWND hwnd) status = RegEnumValueW(hkey, i, buf_name, &name_len, NULL, NULL, (BYTE*) buf_data, &data_len); - if (status == ERROR_SUCCESS && !lstrcmpW(L"disabled", buf_data)) + if (status == ERROR_SUCCESS && !wcscmp(L"disabled", buf_data)) SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_ADDSTRING, 0, (LPARAM) buf_name); }

1 0

Rémi Bernon : joy.cpl: Enumerate force-feedback effects with the devices.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 5fad09d24653bd19a0113734d147087c9bcb59ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fad09d24653bd19a0113734… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 23 14:01:52 2021 +0200 joy.cpl: Enumerate force-feedback effects with the devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 43e124a0a33..ef905c65a93 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -60,6 +60,7 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) * First time it checks if space for the joysticks was already reserved * and if not, just counts how many there are. */ +static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef); static BOOL CALLBACK enum_callback(const DIDEVICEINSTANCEW *instance, void *context) { struct JoystickData *data = context; @@ -101,6 +102,18 @@ static BOOL CALLBACK enum_callback(const DIDEVICEINSTANCEW *instance, void *cont IDirectInputDevice_SetProperty(joystick->device, DIPROP_RANGE, &proprange.diph); + if (!joystick->forcefeedback) return DIENUM_CONTINUE; + + /* Count device effects and then store them */ + joystick->num_effects = 0; + joystick->effects = NULL; + IDirectInputDevice8_EnumEffects(joystick->device, ff_effects_callback, (void *)joystick, 0); + joystick->effects = malloc(sizeof(struct Effect) * joystick->num_effects); + + joystick->cur_effect = 0; + IDirectInputDevice8_EnumEffects(joystick->device, ff_effects_callback, (void*)joystick, 0); + joystick->num_effects = joystick->cur_effect; + return DIENUM_CONTINUE; } @@ -818,16 +831,6 @@ static INT_PTR CALLBACK ff_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp SendDlgItemMessageW(hwnd, IDC_FFSELECTCOMBO, CB_SETITEMDATA, cur, i); cur++; - - /* Count device effects and then store them */ - joy->num_effects = 0; - joy->effects = NULL; - IDirectInputDevice8_EnumEffects(joy->device, ff_effects_callback, (void *) joy, 0); - joy->effects = malloc(sizeof(struct Effect) * joy->num_effects); - - joy->cur_effect = 0; - IDirectInputDevice8_EnumEffects(joy->device, ff_effects_callback, (void*) joy, 0); - joy->num_effects = joy->cur_effect; } }

1 0

Rémi Bernon : joy.cpl: Refresh joystick test device list when activated.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 95cc64aa731d9babfba677d6dca97d13efebd476 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95cc64aa731d9babfba677d6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 23 14:01:53 2021 +0200 joy.cpl: Refresh joystick test device list when activated. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index ef905c65a93..3dee30a4b5b 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -533,6 +533,14 @@ static void draw_joystick_axes(HWND hwnd, struct JoystickData* data) * test_dlgproc [internal] * */ +static void refresh_test_joystick_list(HWND hwnd, struct JoystickData *data) +{ + struct Joystick *joy, *joy_end; + SendDlgItemMessageW(hwnd, IDC_TESTSELECTCOMBO, CB_RESETCONTENT, 0, 0); + for (joy = data->joysticks, joy_end = joy + data->num_joysticks; joy != joy_end; ++joy) + SendDlgItemMessageW(hwnd, IDC_TESTSELECTCOMBO, CB_ADDSTRING, 0, (LPARAM)joy->instance.tszInstanceName); +} + static INT_PTR CALLBACK test_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { static HANDLE thread; @@ -543,17 +551,9 @@ static INT_PTR CALLBACK test_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM { case WM_INITDIALOG: { - int i; - data = (struct JoystickData*) ((PROPSHEETPAGEW*)lparam)->lParam; - /* Add enumerated joysticks to the combobox */ - for (i = 0; i < data->num_joysticks; i++) - { - struct Joystick *joy = &data->joysticks[i]; - SendDlgItemMessageW(hwnd, IDC_TESTSELECTCOMBO, CB_ADDSTRING, 0, (LPARAM) joy->instance.tszInstanceName); - } - + refresh_test_joystick_list(hwnd, data); draw_joystick_buttons(hwnd, data); draw_joystick_axes(hwnd, data); @@ -576,6 +576,8 @@ static INT_PTR CALLBACK test_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM { DWORD tid; + refresh_test_joystick_list(hwnd, data); + /* Initialize input thread */ if (data->num_joysticks > 0) {

1 0

Rémi Bernon : joy.cpl: Refresh joystick FF device list when activated.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: a6f7f2dcfbf1f6fb9555f0324e53194f24d56115 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6f7f2dcfbf1f6fb9555f032… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 23 14:01:54 2021 +0200 joy.cpl: Refresh joystick FF device list when activated. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 3dee30a4b5b..d5272990df3 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -642,12 +642,9 @@ static void initialize_effects_list(HWND hwnd, struct Joystick* joy) static void ff_handle_joychange(HWND hwnd, struct JoystickData *data) { - int sel; - if (data->num_ff == 0) return; - sel = SendDlgItemMessageW(hwnd, IDC_FFSELECTCOMBO, CB_GETCURSEL, 0, 0); - data->chosen_joystick = SendDlgItemMessageW(hwnd, IDC_FFSELECTCOMBO, CB_GETITEMDATA, sel, 0); + data->chosen_joystick = SendDlgItemMessageW(hwnd, IDC_FFSELECTCOMBO, CB_GETCURSEL, 0, 0); initialize_effects_list(hwnd, &data->joysticks[data->chosen_joystick]); } @@ -808,6 +805,14 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef) * ff_dlgproc [internal] * */ +static void refresh_ff_joystick_list(HWND hwnd, struct JoystickData *data) +{ + struct Joystick *joy, *joy_end; + SendDlgItemMessageW(hwnd, IDC_FFSELECTCOMBO, CB_RESETCONTENT, 0, 0); + for (joy = data->joysticks, joy_end = joy + data->num_joysticks; joy != joy_end; ++joy) + SendDlgItemMessageW(hwnd, IDC_FFSELECTCOMBO, CB_ADDSTRING, 0, (LPARAM)joy->instance.tszInstanceName); +} + static INT_PTR CALLBACK ff_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { static HANDLE thread; @@ -818,24 +823,9 @@ static INT_PTR CALLBACK ff_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp { case WM_INITDIALOG: { - int i, cur = 0; - data = (struct JoystickData*) ((PROPSHEETPAGEW*)lparam)->lParam; - /* Add joysticks with FF support to the combobox and get the effects */ - for (i = 0; i < data->num_joysticks; i++) - { - struct Joystick *joy = &data->joysticks[i]; - - if (joy->forcefeedback) - { - SendDlgItemMessageW(hwnd, IDC_FFSELECTCOMBO, CB_ADDSTRING, 0, (LPARAM) joy->instance.tszInstanceName); - SendDlgItemMessageW(hwnd, IDC_FFSELECTCOMBO, CB_SETITEMDATA, cur, i); - - cur++; - } - } - + refresh_ff_joystick_list(hwnd, data); draw_ff_axis(hwnd, data); return TRUE; @@ -861,6 +851,8 @@ static INT_PTR CALLBACK ff_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp switch(((LPNMHDR)lparam)->code) { case PSN_SETACTIVE: + refresh_ff_joystick_list(hwnd, data); + if (data->num_ff > 0) { DWORD tid;

1 0

Rémi Bernon : joy.cpl: Refresh the joystick device list when modified.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: c496a7b3f984fa0eb4931757da77eeecd6a7ab38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c496a7b3f984fa0eb4931757… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 23 14:01:55 2021 +0200 joy.cpl: Refresh the joystick device list when modified. This will not work for legacy dinput devices because of the internal enumeration logic, but it will dynamically update the list for HID joysticks. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index d5272990df3..dbe84963c5d 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -155,20 +155,7 @@ static void destroy_joysticks(struct JoystickData *data) } free(data->joysticks); -} - -static void initialize_joysticks_list(HWND hwnd, struct JoystickData *data) -{ - int i; - - SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_RESETCONTENT, 0, 0); - - /* Add enumerated joysticks */ - for (i = 0; i < data->num_joysticks; i++) - { - struct Joystick *joy = &data->joysticks[i]; - SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_ADDSTRING, 0, (LPARAM) joy->instance.tszInstanceName); - } + data->joysticks = NULL; } /****************************************************************************** @@ -233,15 +220,23 @@ static void enable_joystick(WCHAR *joy_name, BOOL enable) if (appkey) RegCloseKey(appkey); } -static void initialize_disabled_joysticks_list(HWND hwnd) +static void refresh_joystick_list(HWND hwnd, struct JoystickData *data) { + struct Joystick *joy, *joy_end; HKEY hkey, appkey; DWORD values = 0; LSTATUS status; DWORD i; + destroy_joysticks(data); + initialize_joysticks(data); + + SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_RESETCONTENT, 0, 0); SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_RESETCONTENT, 0, 0); + for (joy = data->joysticks, joy_end = joy + data->num_joysticks; joy != joy_end; ++joy) + SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_ADDSTRING, 0, (LPARAM) joy->instance.tszInstanceName); + /* Search for disabled joysticks */ get_app_key(&hkey, &appkey); RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, &values, NULL, NULL, NULL, NULL); @@ -275,8 +270,7 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM { data = (struct JoystickData*) ((PROPSHEETPAGEW*)lparam)->lParam; - initialize_joysticks_list(hwnd, data); - initialize_disabled_joysticks_list(hwnd); + refresh_joystick_list(hwnd, data); EnableWindow(GetDlgItem(hwnd, IDC_BUTTONENABLE), FALSE); EnableWindow(GetDlgItem(hwnd, IDC_BUTTONDISABLE), FALSE); @@ -298,7 +292,7 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM if (sel >= 0) { enable_joystick(data->joysticks[sel].instance.tszInstanceName, FALSE); - initialize_disabled_joysticks_list(hwnd); + refresh_joystick_list(hwnd, data); } } break; @@ -312,7 +306,7 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM WCHAR text[MAX_PATH]; SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_GETTEXT, sel, (LPARAM) text); enable_joystick(text, TRUE); - initialize_disabled_joysticks_list(hwnd); + refresh_joystick_list(hwnd, data); } } break;

1 0

Jacek Caban : gdi32: Directly use ntdll instead of RegDeleteTreeW.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 171bfb6e35857bf4cc44e5d773efbfca7dea3f3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=171bfb6e35857bf4cc44e5d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 23 13:44:02 2021 +0100 gdi32: Directly use ntdll instead of RegDeleteTreeW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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)

1 0

Jacek Caban : gdi32: Directly use ntdll in load_gdi_font_subst.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: c1959a797412fbc2a19a8904d6bbc2d3900183ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1959a797412fbc2a19a8904… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 23 13:44:03 2021 +0100 gdi32: Directly use ntdll in load_gdi_font_subst. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 */

1 0

Jacek Caban : gdi32: Directly use ntdll in load_gdi_font_replacements.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: e122da03ada632470c45d9d3091fd1983283fd8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e122da03ada632470c45d9d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 23 13:44:04 2021 +0100 gdi32: Directly use ntdll in load_gdi_font_replacements. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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)

1 0

Jacek Caban : gdi32: Directly use ntdll in add_face_to_cache.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 3eeb37f86a4d0a8c826fa72d8f657e13b8d159e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3eeb37f86a4d0a8c826fa72d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 23 13:44:05 2021 +0100 gdi32: Directly use ntdll in add_face_to_cache. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 )

1 0