Commit c825fc45 authored by Giovanni Mascellani's avatar Giovanni Mascellani Committed by Alexandre Julliard

tzres: Take timezone display names from Unicode CLDR database.

The name from CLDR is made available both in the Display and MUI_Display fields, reproducing the Windows behavior. Signed-off-by: 's avatarGiovanni Mascellani <gmascellani@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 3e370f76
...@@ -4420,7 +4420,7 @@ static void test_EnumDynamicTimeZoneInformation(void) ...@@ -4420,7 +4420,7 @@ static void test_EnumDynamicTimeZoneInformation(void)
memset(name, 0, sizeof(name)); memset(name, 0, sizeof(name));
status = pRegLoadMUIStringW(subkey, L"MUI_Display", name, size, &size, 0, sysdir); status = pRegLoadMUIStringW(subkey, L"MUI_Display", name, size, &size, 0, sysdir);
/* recently added time zones may not have MUI strings */ /* recently added time zones may not have MUI strings */
todo_wine ok((status == ERROR_SUCCESS && *name) || ok((status == ERROR_SUCCESS && *name) ||
broken(status == ERROR_RESOURCE_TYPE_NOT_FOUND) /* Win10 1809 32-bit */ || broken(status == ERROR_RESOURCE_TYPE_NOT_FOUND) /* Win10 1809 32-bit */ ||
broken(status == ERROR_MUI_FILE_NOT_FOUND) /* Win10 1809 64-bit */, broken(status == ERROR_MUI_FILE_NOT_FOUND) /* Win10 1809 64-bit */,
"status %d MUI_Display %s\n", status, wine_dbgstr_w(name)); "status %d MUI_Display %s\n", status, wine_dbgstr_w(name));
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment