October 2022 - Wine-Commits

Giovanni Mascellani : vkd3d-shader/hlsl: Lower int division.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: vkd3d Branch: master Commit: eb7b594002df9f403aa0a15dc1682a340a4146a0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/eb7b594002df9f403aa0a15dc1682… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Sep 21 17:12:31 2021 +0200 vkd3d-shader/hlsl: Lower int division. --- libs/vkd3d-shader/hlsl_codegen.c | 105 +++++++++++++++++++++++++++++++ tests/arithmetic-int-uniform.shader_test | 2 +- 2 files changed, 106 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index ef67e39b..656e2e93 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1284,6 +1284,110 @@ static bool lower_casts_to_bool(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr return true; } +static struct hlsl_ir_load *add_conditional(struct hlsl_ctx *ctx, struct list *instrs, + struct hlsl_ir_node *condition, struct hlsl_ir_node *if_true, struct hlsl_ir_node *if_false) +{ + struct hlsl_ir_store *store; + struct hlsl_ir_load *load; + struct hlsl_ir_var *var; + struct hlsl_ir_if *iff; + + assert(hlsl_types_are_equal(if_true->data_type, if_false->data_type)); + + if (!(var = hlsl_new_synthetic_var(ctx, "conditional", if_true->data_type, &condition->loc))) + return NULL; + + if (!(iff = hlsl_new_if(ctx, condition, condition->loc))) + return NULL; + list_add_tail(instrs, &iff->node.entry); + + if (!(store = hlsl_new_simple_store(ctx, var, if_true))) + return NULL; + list_add_tail(&iff->then_instrs.instrs, &store->node.entry); + + if (!(store = hlsl_new_simple_store(ctx, var, if_false))) + return NULL; + list_add_tail(&iff->else_instrs.instrs, &store->node.entry); + + if (!(load = hlsl_new_var_load(ctx, var, condition->loc))) + return NULL; + list_add_tail(instrs, &load->node.entry); + + return load; +} + +static bool lower_int_division(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_ir_node *arg1, *arg2, *xor, *and, *abs1, *abs2, *div, *neg; + struct hlsl_type *type = instr->data_type, *utype; + struct hlsl_ir_expr *cast1, *cast2, *cast3; + struct hlsl_ir_constant *high_bit; + struct hlsl_ir_expr *expr; + struct hlsl_ir_load *cond; + unsigned int i; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + arg1 = expr->operands[0].node; + arg2 = expr->operands[1].node; + if (expr->op != HLSL_OP2_DIV) + return false; + if (type->type != HLSL_CLASS_SCALAR && type->type != HLSL_CLASS_VECTOR) + return false; + if (type->base_type != HLSL_TYPE_INT) + return false; + utype = hlsl_get_numeric_type(ctx, type->type, HLSL_TYPE_UINT, type->dimx, type->dimy); + + if (!(xor = hlsl_new_binary_expr(ctx, HLSL_OP2_BIT_XOR, arg1, arg2))) + return false; + list_add_before(&instr->entry, &xor->entry); + + if (!(high_bit = hlsl_new_constant(ctx, type, &instr->loc))) + return false; + for (i = 0; i < type->dimx; ++i) + high_bit->value[i].u = 0x80000000; + list_add_before(&instr->entry, &high_bit->node.entry); + + if (!(and = hlsl_new_binary_expr(ctx, HLSL_OP2_BIT_AND, xor, &high_bit->node))) + return false; + list_add_before(&instr->entry, &and->entry); + + if (!(abs1 = hlsl_new_unary_expr(ctx, HLSL_OP1_ABS, arg1, instr->loc))) + return false; + list_add_before(&instr->entry, &abs1->entry); + + if (!(cast1 = hlsl_new_cast(ctx, abs1, utype, &instr->loc))) + return false; + list_add_before(&instr->entry, &cast1->node.entry); + + if (!(abs2 = hlsl_new_unary_expr(ctx, HLSL_OP1_ABS, arg2, instr->loc))) + return false; + list_add_before(&instr->entry, &abs2->entry); + + if (!(cast2 = hlsl_new_cast(ctx, abs2, utype, &instr->loc))) + return false; + list_add_before(&instr->entry, &cast2->node.entry); + + if (!(div = hlsl_new_binary_expr(ctx, HLSL_OP2_DIV, &cast1->node, &cast2->node))) + return false; + list_add_before(&instr->entry, &div->entry); + + if (!(cast3 = hlsl_new_cast(ctx, div, type, &instr->loc))) + return false; + list_add_before(&instr->entry, &cast3->node.entry); + + if (!(neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, &cast3->node, instr->loc))) + return false; + list_add_before(&instr->entry, &neg->entry); + + if (!(cond = add_conditional(ctx, &instr->entry, and, neg, &cast3->node))) + return false; + hlsl_replace_node(instr, &cond->node); + + return true; +} + static bool lower_int_abs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_type *type = instr->data_type; @@ -2297,6 +2401,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry transform_ir(ctx, lower_narrowing_casts, body, NULL); transform_ir(ctx, lower_casts_to_bool, body, NULL); + transform_ir(ctx, lower_int_division, body, NULL); transform_ir(ctx, lower_int_abs, body, NULL); do { diff --git a/tests/arithmetic-int-uniform.shader_test b/tests/arithmetic-int-uniform.shader_test index f7fe8291..3190be00 100644 --- a/tests/arithmetic-int-uniform.shader_test +++ b/tests/arithmetic-int-uniform.shader_test @@ -10,7 +10,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 5.0 16.0 0.0 0.0 -todo draw quad +draw quad probe all rgba (21.0, -11.0, 80.0, 0.0) [pixel shader]

1 0

Francisco Casas : tests: Add missing backslash to restore skipped tests.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: vkd3d Branch: master Commit: ab8f418207c30c5e4d2f04faeff086af62e374c5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ab8f418207c30c5e4d2f04faeff08… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Oct 14 10:09:21 2022 -0300 tests: Add missing backslash to restore skipped tests. Tests after this missing backslash are not being executed since e9829fdc6524e455f85893445ad8a2d703f02a2e. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 24602862..a0cd584f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -117,7 +117,7 @@ vkd3d_shader_tests = \ tests/matrix-semantics.shader_test \ tests/multiple-rt.shader_test \ tests/nointerpolation.shader_test \ - tests/object-references.shader_test + tests/object-references.shader_test \ tests/pow.shader_test \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \

1 0

Giovanni Mascellani : tests: Test length() intrinsic.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: vkd3d Branch: master Commit: a43242a3e6fb73090d7bb0a9cf66d55be029445e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a43242a3e6fb73090d7bb0a9cf66d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Oct 4 23:31:42 2022 +0200 tests: Test length() intrinsic. --- Makefile.am | 1 + tests/hlsl-length.shader_test | 80 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/Makefile.am b/Makefile.am index 110b66f6..24602862 100644 --- a/Makefile.am +++ b/Makefile.am @@ -90,6 +90,7 @@ vkd3d_shader_tests = \ tests/hlsl-intrinsic-override.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-ldexp.shader_test \ + tests/hlsl-length.shader_test \ tests/hlsl-lerp.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ diff --git a/tests/hlsl-length.shader_test b/tests/hlsl-length.shader_test new file mode 100644 index 00000000..e9f7c8ae --- /dev/null +++ b/tests/hlsl-length.shader_test @@ -0,0 +1,80 @@ +[pixel shader] +uniform float4 x; + +float4 main() : SV_TARGET +{ + return length(x); +} + +[test] +uniform 0 float4 2.0 3.0 4.0 5.0 +todo draw quad +probe all rgba (7.34846926, 7.34846926, 7.34846926, 7.34846926) 1 + +[pixel shader] +uniform float3 x; + +float4 main() : SV_TARGET +{ + return length(x); +} + +[test] +uniform 0 float4 2.0 3.0 4.0 0.0 +todo draw quad +probe all rgba (5.38516474, 5.38516474, 5.38516474, 5.38516474) 1 + +[pixel shader] +uniform float2 x; + +float4 main() : SV_TARGET +{ + return length(x); +} + +[test] +uniform 0 float4 2.0 3.0 0.0 0.0 +todo draw quad +probe all rgba (3.60555124, 3.60555124, 3.60555124, 3.60555124) 1 + +[pixel shader] +uniform float1 x; + +float4 main() : SV_TARGET +{ + return length(x); +} + +[test] +uniform 0 float4 2.0 0.0 0.0 0.0 +todo draw quad +probe all rgba (2.0, 2.0, 2.0, 2.0) + +[pixel shader] +uniform float x; + +float4 main() : SV_TARGET +{ + return length(x); +} + +[test] +uniform 0 float4 2.0 0.0 0.0 0.0 +todo draw quad +probe all rgba (2.0, 2.0, 2.0, 2.0) + +[pixel shader fail] +uniform float1x3 x; + +float4 main() : SV_TARGET +{ + return length(x); +} + +[pixel shader fail] +uniform float4x1 x; + +float4 main() : SV_TARGET +{ + return length(x); +}

1 0

Hugh McMaster : kernel32/tests: Remove tests comparing expected output in certain functions.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: wine Branch: master Commit: c7b8da649d899ad90f6949b6d6bd96d0e760cdcd URL: https://gitlab.winehq.org/wine/wine/-/commit/c7b8da649d899ad90f6949b6d6bd96… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Oct 17 22:28:34 2022 +1100 kernel32/tests: Remove tests comparing expected output in certain functions. The Windows versions of [Read|Write]ConsoleOutput[Attribute|Character] appear to assign an uninitialized internal DWORD to the given pointer address before returning. As the functions fail (intentionally) in these tests, the value of the DWORD is never set, so the tests end up comparing the expected value of zero with random values. This value of this test is very limited and is best removed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53686 --- dlls/kernel32/tests/console.c | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index c145aa4cb59..9eabd887f2c 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2347,12 +2347,6 @@ static void test_WriteConsoleOutputCharacterA(HANDLE output_handle) invalid_table[i].coord, invalid_table[i].lpNumCharsWritten); ok(!ret, "[%d] Expected WriteConsoleOutputCharacterA to return FALSE, got %d\n", i, ret); - if (invalid_table[i].lpNumCharsWritten) - { - ok(count == invalid_table[i].expected_count, - "[%d] Expected count to be %lu, got %lu\n", - i, invalid_table[i].expected_count, count); - } ok(GetLastError() == invalid_table[i].last_error, "[%d] Expected last error to be %lu, got %lu\n", i, invalid_table[i].last_error, GetLastError()); @@ -2437,12 +2431,6 @@ static void test_WriteConsoleOutputCharacterW(HANDLE output_handle) invalid_table[i].coord, invalid_table[i].lpNumCharsWritten); ok(!ret, "[%d] Expected WriteConsoleOutputCharacterW to return FALSE, got %d\n", i, ret); - if (invalid_table[i].lpNumCharsWritten) - { - ok(count == invalid_table[i].expected_count, - "[%d] Expected count to be %lu, got %lu\n", - i, invalid_table[i].expected_count, count); - } ok(GetLastError() == invalid_table[i].last_error, "[%d] Expected last error to be %lu, got %lu\n", i, invalid_table[i].last_error, GetLastError()); @@ -2527,12 +2515,6 @@ static void test_WriteConsoleOutputAttribute(HANDLE output_handle) invalid_table[i].coord, invalid_table[i].lpNumAttrsWritten); ok(!ret, "[%d] Expected WriteConsoleOutputAttribute to return FALSE, got %d\n", i, ret); - if (invalid_table[i].lpNumAttrsWritten) - { - ok(count == invalid_table[i].expected_count, - "[%d] Expected count to be %lu, got %lu\n", - i, invalid_table[i].expected_count, count); - } ok(GetLastError() == invalid_table[i].last_error, "[%d] Expected last error to be %lu, got %lu\n", i, invalid_table[i].last_error, GetLastError()); @@ -2943,12 +2925,6 @@ static void test_ReadConsoleOutputCharacterA(HANDLE output_handle) invalid_table[i].coord, invalid_table[i].read_count); ok(!ret, "[%d] Expected ReadConsoleOutputCharacterA to return FALSE, got %d\n", i, ret); - if (invalid_table[i].read_count) - { - ok(count == invalid_table[i].expected_count, - "[%d] Expected count to be %lu, got %lu\n", - i, invalid_table[i].expected_count, count); - } ok(GetLastError() == invalid_table[i].last_error, "[%d] Expected last error to be %lu, got %lu\n", i, invalid_table[i].last_error, GetLastError()); @@ -3033,12 +3009,6 @@ static void test_ReadConsoleOutputCharacterW(HANDLE output_handle) invalid_table[i].coord, invalid_table[i].read_count); ok(!ret, "[%d] Expected ReadConsoleOutputCharacterW to return FALSE, got %d\n", i, ret); - if (invalid_table[i].read_count) - { - ok(count == invalid_table[i].expected_count, - "[%d] Expected count to be %lu, got %lu\n", - i, invalid_table[i].expected_count, count); - } ok(GetLastError() == invalid_table[i].last_error, "[%d] Expected last error to be %lu, got %lu\n", i, invalid_table[i].last_error, GetLastError()); @@ -3122,12 +3092,6 @@ static void test_ReadConsoleOutputAttribute(HANDLE output_handle) invalid_table[i].coord, invalid_table[i].read_count); ok(!ret, "[%d] Expected ReadConsoleOutputAttribute to return FALSE, got %d\n", i, ret); - if (invalid_table[i].read_count) - { - ok(count == invalid_table[i].expected_count, - "[%d] Expected count to be %lu, got %lu\n", - i, invalid_table[i].expected_count, count); - } ok(GetLastError() == invalid_table[i].last_error, "[%d] Expected last error to be %lu, got %lu\n", i, invalid_table[i].last_error, GetLastError());

1 0

Ziqing Hui : win32u: Add more linked fonts for Tahoma.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: wine Branch: master Commit: a32782d28b744e228f21f61bb3d94c5371ff3f99 URL: https://gitlab.winehq.org/wine/wine/-/commit/a32782d28b744e228f21f61bb3d94c… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Oct 11 18:00:59 2022 +0800 win32u: Add more linked fonts for Tahoma. --- dlls/win32u/font.c | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 6086fa79609..5762d55eab5 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1555,31 +1555,56 @@ static const char system_link_tahoma_sc[] = "SIMSUN.TTC,SimSun\0" "MINGLIU.TTC,PMingLiu\0" "MSGOTHIC.TTC,MS UI Gothic\0" - "BATANG.TTC,Batang\0"; + "BATANG.TTC,Batang\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; static const char system_link_tahoma_tc[] = "MINGLIU.TTC,PMingLiu\0" "SIMSUN.TTC,SimSun\0" "MSGOTHIC.TTC,MS UI Gothic\0" - "BATANG.TTC,Batang\0"; + "BATANG.TTC,Batang\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; static const char system_link_tahoma_jp[] = "MSGOTHIC.TTC,MS UI Gothic\0" "MINGLIU.TTC,PMingLiU\0" "SIMSUN.TTC,SimSun\0" - "GULIM.TTC,Gulim\0"; + "GULIM.TTC,Gulim\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; static const char system_link_tahoma_kr[] = "GULIM.TTC,Gulim\0" "MSGOTHIC.TTC,MS UI Gothic\0" "MINGLIU.TTC,PMingLiU\0" - "SIMSUN.TTC,SimSun\0"; + "SIMSUN.TTC,SimSun\0" + "MALGUN.TTF,Malgun Gothic\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; static const char system_link_tahoma_non_cjk[] = "MSGOTHIC.TTC,MS UI Gothic\0" "MINGLIU.TTC,PMingLiU\0" "SIMSUN.TTC,SimSun\0" - "GULIM.TTC,Gulim\0"; + "GULIM.TTC,Gulim\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; static const char system_link_ms_ui_gothic[] = "MICROSS.TTF,Microsoft Sans Serif\0"

1 0

Alex Henrie : shell32: Use standard C functions for memory allocation in dde.c.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: wine Branch: master Commit: 0d90fa6348d0523a83bab91fc250ea684bc01239 URL: https://gitlab.winehq.org/wine/wine/-/commit/0d90fa6348d0523a83bab91fc250ea… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Oct 14 09:51:08 2022 -0600 shell32: Use standard C functions for memory allocation in dde.c. --- dlls/shell32/dde.c | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index cd956def797..39e7de9c2c9 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -58,7 +58,7 @@ static WCHAR *strndupW(const WCHAR *src, DWORD len) { WCHAR *dest; if (!src) return NULL; - dest = heap_alloc((len + 1) * sizeof(*dest)); + dest = malloc((len + 1) * sizeof(*dest)); if (dest) { memcpy(dest, src, len * sizeof(WCHAR)); @@ -100,7 +100,7 @@ static WCHAR *get_programs_path(const WCHAR *name) SHGetKnownFolderPath(&FOLDERID_Programs, 0, NULL, &programs); len = lstrlenW(programs) + 1 + lstrlenW(name); - path = heap_alloc((len + 1) * sizeof(*path)); + path = malloc((len + 1) * sizeof(*path)); lstrcpyW(path, programs); lstrcatW(path, L"/"); lstrcatW(path, name); @@ -119,7 +119,7 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, WIN32_FIND_DATAW finddata; HANDLE hfind; int len = 1; - WCHAR *groups_data = heap_alloc(sizeof(WCHAR)); + WCHAR *groups_data = malloc(sizeof(WCHAR)); char *groups_dataA; HDDEDATA ret; @@ -134,7 +134,7 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, wcscmp(finddata.cFileName, L".") && wcscmp(finddata.cFileName, L"..")) { len += lstrlenW(finddata.cFileName) + 2; - groups_data = heap_realloc(groups_data, len * sizeof(WCHAR)); + groups_data = realloc(groups_data, len * sizeof(WCHAR)); lstrcatW(groups_data, finddata.cFileName); lstrcatW(groups_data, L"\r\n"); } @@ -143,13 +143,13 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, } len = WideCharToMultiByte(CP_ACP, 0, groups_data, -1, NULL, 0, NULL, NULL); - groups_dataA = heap_alloc(len * sizeof(WCHAR)); + groups_dataA = malloc(len * sizeof(WCHAR)); WideCharToMultiByte(CP_ACP, 0, groups_data, -1, groups_dataA, len, NULL, NULL); ret = DdeCreateDataHandle(dwDDEInst, (BYTE *)groups_dataA, len, 0, hszGroups, uFmt, 0); - heap_free(groups_dataA); - heap_free(groups_data); - heap_free(programs); + free(groups_dataA); + free(groups_data); + free(programs); return ret; } else if (hszTopic == hszProgmanTopic && hszItem == hszProgmanService && uFmt == CF_TEXT) @@ -180,7 +180,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) CreateDirectoryW(path, NULL); ShellExecuteW(NULL, NULL, path, NULL, NULL, SW_SHOWNORMAL); - heap_free(last_group); + free(last_group); last_group = path; } else if (!wcsicmp(command, L"DeleteGroup")) @@ -193,7 +193,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) path = get_programs_path(argv[0]); - path2 = heap_alloc((lstrlenW(path) + 2) * sizeof(*path)); + path2 = malloc((lstrlenW(path) + 2) * sizeof(*path)); lstrcpyW(path2, path); path2[lstrlenW(path) + 1] = 0; @@ -203,8 +203,8 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) ret = SHFileOperationW(&shfos); - heap_free(path2); - heap_free(path); + free(path2); + free(path); if (ret || shfos.fAnyOperationsAborted) return DDE_FNOTPROCESSED; } @@ -220,7 +220,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) ShellExecuteW(NULL, NULL, path, NULL, NULL, SW_SHOWNORMAL); - heap_free(last_group); + free(last_group); last_group = path; } else if (!wcsicmp(command, L"AddItem")) @@ -242,10 +242,10 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) IShellLinkW_Release(link); return DDE_FNOTPROCESSED; } - path = heap_alloc(len * sizeof(WCHAR)); + path = malloc(len * sizeof(WCHAR)); SearchPathW(NULL, argv[0], L".exe", len, path, NULL); IShellLinkW_SetPath(link, path); - heap_free(path); + free(path); if (argc >= 2) IShellLinkW_SetDescription(link, argv[1]); if (argc >= 4) IShellLinkW_SetIconLocation(link, argv[2], wcstol(argv[3], NULL, 10)); @@ -266,19 +266,19 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) if (argc >= 2) { len = lstrlenW(last_group) + 1 + lstrlenW(argv[1]) + 5; - name = heap_alloc(len * sizeof(*name)); + name = malloc(len * sizeof(*name)); swprintf( name, len, L"%s/%s.lnk", last_group, argv[1] ); } else { const WCHAR *filename = PathFindFileNameW(argv[0]); len = PathFindExtensionW(filename) - filename; - name = heap_alloc((lstrlenW(last_group) + 1 + len + 5) * sizeof(*name)); + name = malloc((lstrlenW(last_group) + 1 + len + 5) * sizeof(*name)); swprintf( name, lstrlenW(last_group) + 1 + len + 5, L"%s/%.*s.lnk", last_group, len, filename ); } hres = IPersistFile_Save(file, name, TRUE); - heap_free(name); + free(name); IPersistFile_Release(file); IShellLinkW_Release(link); @@ -292,12 +292,12 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) if (argc < 1) return DDE_FNOTPROCESSED; len = lstrlenW(last_group) + 1 + lstrlenW(argv[0]) + 5; - name = heap_alloc(len * sizeof(*name)); + name = malloc(len * sizeof(*name)); swprintf( name, len, L"%s/%s.lnk", last_group, argv[0]); ret = DeleteFileW(name); - heap_free(name); + free(name); if (!ret) return DDE_FNOTPROCESSED; } @@ -326,7 +326,7 @@ static DWORD parse_dde_command(HSZ hszTopic, WCHAR *command) while (*command == '[') { argc = 0; - argv = heap_alloc(sizeof(*argv)); + argv = malloc(sizeof(*argv)); command++; while (*command == ' ') command++; @@ -355,7 +355,7 @@ static DWORD parse_dde_command(HSZ hszTopic, WCHAR *command) } argc++; - argv = heap_realloc(argv, argc * sizeof(*argv)); + argv = realloc(argv, argc * sizeof(*argv)); argv[argc-1] = strndupW(command, p - command); command = p; @@ -381,9 +381,9 @@ static DWORD parse_dde_command(HSZ hszTopic, WCHAR *command) ret = DDE_FNOTPROCESSED; } - heap_free(opcode); - for (i = 0; i < argc; i++) heap_free(argv[i]); - heap_free(argv); + free(opcode); + for (i = 0; i < argc; i++) free(argv[i]); + free(argv); if (ret == DDE_FNOTPROCESSED) break; } @@ -392,9 +392,9 @@ static DWORD parse_dde_command(HSZ hszTopic, WCHAR *command) error: ERR("failed to parse command %s\n", debugstr_w(original)); - heap_free(opcode); - for (i = 0; i < argc; i++) heap_free(argv[i]); - heap_free(argv); + free(opcode); + for (i = 0; i < argc; i++) free(argv[i]); + free(argv); return DDE_FNOTPROCESSED; } @@ -406,14 +406,14 @@ static DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata) len = DdeGetData(hdata, NULL, 0, 0); if (!len) return DDE_FNOTPROCESSED; - command = heap_alloc(len); + command = malloc(len); DdeGetData(hdata, (BYTE *)command, len, 0); TRACE("conv=%p topic=%s data=%s\n", hconv, debugstr_hsz(hszTopic), debugstr_w(command)); ret = parse_dde_command(hszTopic, command); - heap_free(command); + free(command); return ret; }

1 0

Ziqing Hui : win32u: Add mechanism for font specific system links.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: wine Branch: master Commit: a9cc68336c591d3d9bf915a3a74d9a3685d0ae4b URL: https://gitlab.winehq.org/wine/wine/-/commit/a9cc68336c591d3d9bf915a3a74d9a… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Oct 11 12:38:38 2022 +0800 win32u: Add mechanism for font specific system links. --- dlls/win32u/font.c | 148 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 99 insertions(+), 49 deletions(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 7fc4a01eb64..d3e69cb5f8e 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1551,6 +1551,78 @@ static const struct font_links_defaults_list } }; +static const char system_link_tahoma_sc[] = + "SIMSUN.TTC,SimSun\0" + "MINGLIU.TTC,PMingLiu\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "BATANG.TTC,Batang\0"; + +static const char system_link_tahoma_tc[] = + "MINGLIU.TTC,PMingLiu\0" + "SIMSUN.TTC,SimSun\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "BATANG.TTC,Batang\0"; + +static const char system_link_tahoma_jp[] = + "MSGOTHIC.TTC,MS UI Gothic\0" + "MINGLIU.TTC,PMingLiU\0" + "SIMSUN.TTC,SimSun\0" + "GULIM.TTC,Gulim\0"; + +static const char system_link_tahoma_kr[] = + "GULIM.TTC,Gulim\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "MINGLIU.TTC,PMingLiU\0" + "SIMSUN.TTC,SimSun\0"; + +static const char system_link_tahoma_non_cjk[] = + "MSGOTHIC.TTC,MS UI Gothic\0" + "MINGLIU.TTC,PMingLiU\0" + "SIMSUN.TTC,SimSun\0" + "GULIM.TTC,Gulim\0"; + +static const struct system_link_reg +{ + const WCHAR *font_name; + const char *link_sc; + DWORD link_sc_len; + const char *link_tc; + DWORD link_tc_len; + const char *link_jp; + DWORD link_jp_len; + const char *link_kr; + DWORD link_kr_len; + const char *link_non_cjk; + DWORD link_non_cjk_len; +} +default_system_link[] = +{ + { + tahomaW, + system_link_tahoma_sc, sizeof(system_link_tahoma_sc), + system_link_tahoma_tc, sizeof(system_link_tahoma_tc), + system_link_tahoma_jp, sizeof(system_link_tahoma_jp), + system_link_tahoma_kr, sizeof(system_link_tahoma_kr), + system_link_tahoma_non_cjk, sizeof(system_link_tahoma_non_cjk), + }, + { + microsoft_sans_serifW, + system_link_tahoma_sc, sizeof(system_link_tahoma_sc), + system_link_tahoma_tc, sizeof(system_link_tahoma_tc), + system_link_tahoma_jp, sizeof(system_link_tahoma_jp), + system_link_tahoma_kr, sizeof(system_link_tahoma_kr), + system_link_tahoma_non_cjk, sizeof(system_link_tahoma_non_cjk), + }, + { + lucida_sans_unicodeW, + system_link_tahoma_sc, sizeof(system_link_tahoma_sc), + system_link_tahoma_tc, sizeof(system_link_tahoma_tc), + system_link_tahoma_jp, sizeof(system_link_tahoma_jp), + system_link_tahoma_kr, sizeof(system_link_tahoma_kr), + system_link_tahoma_non_cjk, sizeof(system_link_tahoma_non_cjk), + }, +}; + static void populate_system_links( const WCHAR *name, const WCHAR * const *values ) { struct gdi_font_family *family; @@ -2646,63 +2718,41 @@ static void set_multi_value_key( HKEY hkey, const WCHAR *name, const char *value static void update_font_system_link_info(void) { - static const char system_link_simplified_chinese[] = - "SIMSUN.TTC,SimSun\0" - "MINGLIU.TTC,PMingLiu\0" - "MSGOTHIC.TTC,MS UI Gothic\0" - "BATANG.TTC,Batang\0"; - static const char system_link_traditional_chinese[] = - "MINGLIU.TTC,PMingLiu\0" - "SIMSUN.TTC,SimSun\0" - "MSGOTHIC.TTC,MS UI Gothic\0" - "BATANG.TTC,Batang\0"; - static const char system_link_japanese[] = - "MSGOTHIC.TTC,MS UI Gothic\0" - "MINGLIU.TTC,PMingLiU\0" - "SIMSUN.TTC,SimSun\0" - "GULIM.TTC,Gulim\0"; - static const char system_link_korean[] = - "GULIM.TTC,Gulim\0" - "MSGOTHIC.TTC,MS UI Gothic\0" - "MINGLIU.TTC,PMingLiU\0" - "SIMSUN.TTC,SimSun\0"; - static const char system_link_non_cjk[] = - "MSGOTHIC.TTC,MS UI Gothic\0" - "MINGLIU.TTC,PMingLiU\0" - "SIMSUN.TTC,SimSun\0" - "GULIM.TTC,Gulim\0"; HKEY hkey; if ((hkey = reg_create_key( NULL, system_link_keyW, sizeof(system_link_keyW), 0, NULL ))) { const char *link; - DWORD len; + DWORD len, i; - switch (ansi_cp.CodePage) + for (i = 0; i < ARRAY_SIZE(default_system_link); ++i) { - case 932: - link = system_link_japanese; - len = sizeof(system_link_japanese); - break; - case 936: - link = system_link_simplified_chinese; - len = sizeof(system_link_simplified_chinese); - break; - case 949: - link = system_link_korean; - len = sizeof(system_link_korean); - break; - case 950: - link = system_link_traditional_chinese; - len = sizeof(system_link_traditional_chinese); - break; - default: - link = system_link_non_cjk; - len = sizeof(system_link_non_cjk); + const struct system_link_reg *link_reg = &default_system_link[i]; + + switch (ansi_cp.CodePage) + { + case 932: + link = link_reg->link_jp; + len = link_reg->link_jp_len; + break; + case 936: + link = link_reg->link_sc; + len = link_reg->link_sc_len; + break; + case 949: + link = link_reg->link_kr; + len = link_reg->link_kr_len; + break; + case 950: + link = link_reg->link_tc; + len = link_reg->link_tc_len; + break; + default: + link = link_reg->link_non_cjk; + len = link_reg->link_non_cjk_len; + } + set_multi_value_key(hkey, link_reg->font_name, link, len); } - set_multi_value_key(hkey, lucida_sans_unicodeW, link, len); - set_multi_value_key(hkey, microsoft_sans_serifW, link, len); - set_multi_value_key(hkey, tahomaW, link, len); NtClose( hkey ); } }

1 0

Alex Henrie : shell32: Sanitize Program Manager icon and group names.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: wine Branch: master Commit: 52ffd611de9ec84727118b5caa5138dabeb69a68 URL: https://gitlab.winehq.org/wine/wine/-/commit/52ffd611de9ec84727118b5caa5138… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Oct 14 09:51:08 2022 -0600 shell32: Sanitize Program Manager icon and group names. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52506 --- dlls/shell32/dde.c | 40 ++++++++++++++++++++++++++++------------ dlls/shell32/tests/progman_dde.c | 3 +-- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 51aa8f88927..24482d2c33f 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -91,16 +91,32 @@ static inline BOOL Dde_OnWildConnect(HSZ hszTopic, HSZ hszService) return FALSE; } -static WCHAR *combine_path(const WCHAR *directory, const WCHAR *name, const WCHAR *extension) +static WCHAR *combine_path(const WCHAR *directory, const WCHAR *name, const WCHAR *extension, BOOL sanitize) { WCHAR *path; - int len; + int len, i; len = wcslen(directory) + 1 + wcslen(name); if (extension) len += wcslen(extension); path = malloc((len + 1) * sizeof(WCHAR)); - PathCombineW(path, directory, name); + if (sanitize) + { + WCHAR *sanitized_name = wcsdup(name); + + for (i = 0; i < wcslen(name); i++) + { + if (name[i] < ' ' || wcschr(L"*/:<>?\\|", name[i])) + sanitized_name[i] = '_'; + } + + PathCombineW(path, directory, sanitized_name); + free(sanitized_name); + } + else + { + PathCombineW(path, directory, name); + } if (extension) wcscat(path, extension); @@ -109,12 +125,12 @@ static WCHAR *combine_path(const WCHAR *directory, const WCHAR *name, const WCHA } /* Returned string must be freed by caller */ -static WCHAR *get_programs_path(const WCHAR *name) +static WCHAR *get_programs_path(const WCHAR *name, BOOL sanitize) { WCHAR *programs, *path; SHGetKnownFolderPath(&FOLDERID_Programs, 0, NULL, &programs); - path = combine_path(programs, name, NULL); + path = combine_path(programs, name, NULL, sanitize); CoTaskMemFree(programs); return path; @@ -134,7 +150,7 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, HDDEDATA ret; groups_data[0] = 0; - programs = get_programs_path(L"*"); + programs = get_programs_path(L"*", FALSE); hfind = FindFirstFileW(programs, &finddata); if (hfind) { @@ -185,7 +201,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) if (argc < 1) return DDE_FNOTPROCESSED; - path = get_programs_path(argv[0]); + path = get_programs_path(argv[0], TRUE); CreateDirectoryW(path, NULL); ShellExecuteW(NULL, NULL, path, NULL, NULL, SW_SHOWNORMAL); @@ -201,7 +217,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) if (argc < 1) return DDE_FNOTPROCESSED; - path = get_programs_path(argv[0]); + path = get_programs_path(argv[0], TRUE); path2 = malloc((lstrlenW(path) + 2) * sizeof(*path)); lstrcpyW(path2, path); @@ -226,7 +242,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) * ignore its actual value. */ if (argc < 2) return DDE_FNOTPROCESSED; - path = get_programs_path(argv[0]); + path = get_programs_path(argv[0], TRUE); ShellExecuteW(NULL, NULL, path, NULL, NULL, SW_SHOWNORMAL); @@ -275,14 +291,14 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) } if (argc >= 2) { - name = combine_path(last_group, argv[1], L".lnk"); + name = combine_path(last_group, argv[1], L".lnk", TRUE); } else { WCHAR *filename = wcsdup(PathFindFileNameW(argv[0])); WCHAR *ext = PathFindExtensionW(filename); *ext = '\0'; - name = combine_path(last_group, filename, L".lnk"); + name = combine_path(last_group, filename, L".lnk", TRUE); free(filename); } hres = IPersistFile_Save(file, name, TRUE); @@ -300,7 +316,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) if (argc < 1) return DDE_FNOTPROCESSED; - name = combine_path(last_group, argv[0], L".lnk"); + name = combine_path(last_group, argv[0], L".lnk", FALSE); ret = DeleteFileW(name); free(name); diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index cb1ff8ddb9f..5a7e8c912e5 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -459,8 +459,7 @@ static void test_name_sanitization(DWORD instance, HCONV hConv) error = dde_execute(instance, hConv, buf); ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); sprintf(buf, "Group%s", sanitized_name); - todo_wine ok(check_exists(buf), "directory not created\n"); - if (!check_exists(buf)) return; + ok(check_exists(buf), "directory not created\n"); ok(check_window_exists(buf), "window not created\n"); sprintf(buf, "[ShowGroup(\"Group%s\", 0)]", original_name);

1 0

Alexandre Julliard : nls: Update locales that have been added in recent Windows versions.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: wine Branch: master Commit: b591b3167cf98ccc6d70871f282d8b5f98013fff URL: https://gitlab.winehq.org/wine/wine/-/commit/b591b3167cf98ccc6d70871f282d8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 17 12:31:38 2022 +0200 nls: Update locales that have been added in recent Windows versions. --- nls/locale.nls | Bin 736194 -> 738990 bytes tools/make_unicode | 27 ++++++++++++++++++++------- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/nls/locale.nls b/nls/locale.nls index 06d1982cf5a..8ee39e44222 100644 Binary files a/nls/locale.nls and b/nls/locale.nls differ diff --git a/tools/make_unicode b/tools/make_unicode index 667df5e186f..12076252e3d 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -614,8 +614,10 @@ my @locales = { name => "de-LU", lcid => 0x00001007, sabbrevlangname => "DEL" }, { name => "dje", sopentypelang => "DJR" }, { name => "dje-NE" }, - { name => "doi" }, - { name => "doi-IN" }, + { name => "doi", sopentypelang => "DGR" }, + { name => "doi-IN", alias => "doi-Deva-IN" }, + { name => "doi-Deva", file => "doi" }, + { name => "doi-Deva-IN", file => "doi_IN" }, { name => "dsb", lcid => 0x00007c2e, sparent => "hsb", oemcp => 850, ebcdiccp => 870, sabbrevlangname => "DSB", sopentypelang => "LSB" }, { name => "dsb-DE", lcid => 0x0000082e }, { name => "dua" }, @@ -790,7 +792,7 @@ my @locales = { name => "ff-MR", alias => "ff-Latn-MR" }, { name => "ff-NG", alias => "ff-Latn-NG" }, { name => "ff-SN", alias => "ff-Latn-SN" }, - { name => "ff-Adlm" }, + { name => "ff-Adlm", oemcp => 65001 }, { name => "ff-Adlm-BF" }, { name => "ff-Adlm-CM" }, { name => "ff-Adlm-GH" }, @@ -875,10 +877,11 @@ my @locales = { name => "fr-YT" }, { name => "fur", sopentypelang => "FRL" }, { name => "fur-IT" }, + { name => "fuv-NG", alias => "ff-Latn-NG" }, { name => "fy", lcid => 0x00000062, oemcp => 850, sabbrevlangname => "FYN", sopentypelang => "FRI" }, { name => "fy-NL", lcid => 0x00000462 }, { name => "ga", lcid => 0x0000003c, oemcp => 850, sabbrevlangname => "IRE", sopentypelang => "IRI" }, - { name => "ga-GB" }, + { name => "ga-GB", oemcp => 65001 }, { name => "ga-IE", lcid => 0x0000083c }, { name => "gd", lcid => 0x00000091, oemcp => 850, ebcdiccp => 20285, sopentypelang => "GAE" }, { name => "gd-GB", lcid => 0x00000491 }, @@ -896,6 +899,7 @@ my @locales = { name => "guz" }, { name => "guz-KE" }, { name => "gv", sopentypelang => "MNX" }, + { name => "gv-GB", file => "gv" }, { name => "gv-IM" }, { name => "ha", lcid => 0x00000068, oemcp => 437 }, { name => "ha-GH", alias => "ha-Latn-GH" }, @@ -1026,7 +1030,8 @@ my @locales = { name => "ky-Cyrl-KG", alias => "ky-KG" }, { name => "ky-KG", lcid => 0x00000440 }, { name => "la", lcid => 0x00000076, oemcp => 437, slist => ",", dir => "seed", sabbrevlangname => "ZZZ" }, - { name => "la-001", lcid => 0x00000476, file => "la", dir => "seed" }, + { name => "la-VA", lcid => 0x00000476, dir => "seed" }, + { name => "la-001", alias => "la-VA" }, { name => "lag" }, { name => "lag-TZ" }, { name => "lb", lcid => 0x0000006e, oemcp => 850, ebcdiccp => 20297, sabbrevlangname => "LBX" }, @@ -1087,6 +1092,8 @@ my @locales = { name => "mn-Mong-MN", lcid => 0x00000c50, dir => "seed", sabbrevlangname => "MNM" }, { name => "mni", lcid => 0x00000058, slist => ",", sabbrevlangname => "ZZZ" }, { name => "mni-IN", lcid => 0x00000458, file => "mni_Beng_IN" }, + { name => "mni-Beng" }, + { name => "mni-Beng-IN", alias => "mni-IN" }, { name => "moh", lcid => 0x0000007c, oemcp => 850, ebcdiccp => 37, slist => ",", dir => "seed", sabbrevlangname => "MWK" }, { name => "moh-CA", lcid => 0x0000047c, dir => "seed" }, { name => "moh-Latn", alias => "moh" }, @@ -1170,7 +1177,9 @@ my @locales = ## name => "pap", lcid => 0x00000079 }, ## name => "pap-029", lcid => 0x00000479 }, { name => "pcm" }, - { name => "pcm-NG" }, + { name => "pcm-NG", alias => "pcm-Latn-NG" }, + { name => "pcm-Latn", file => "pcm" }, + { name => "pcm-Latn-NG", file => "pcm_NG" }, { name => "pl", lcid => 0x00000015, oemcp => 852, ebcdiccp => 20880, group => 2, sabbrevlangname => "PLK", sopentypelang => "PLK" }, { name => "pl-PL", lcid => 0x00000415 }, ## name => "prg" }, @@ -1376,6 +1385,7 @@ my @locales = { name => "ti-ET", lcid => 0x00000473, sabbrevlangname => "TIE" }, { name => "tig", dir => "seed", sopentypelang => "TGR" }, { name => "tig-ER", dir => "seed" }, + { name => "tig-Ethi-ER", alias => "tig-ER" }, { name => "tk", lcid => 0x00000042, oemcp => 852, ebcdiccp => 20880, group => 2, sopentypelang => "TKM" }, { name => "tk-Latn", alias => "tk" }, { name => "tk-Latn-TM", alias => "tk-TM" }, @@ -1401,6 +1411,7 @@ my @locales = { name => "tzm-Latn-MA", file => "tzm_MA", oemcp => 65001 }, { name => "tzm-Latn-DZ", lcid => 0x0000085f, file => "tzm" }, { name => "tzm-MA", alias => "tzm-Latn-MA" }, + { name => "tzm-DZ", alias => "tzm-Latn-DZ" }, ## name => "tzm-Arab", group => 13 }, ## name => "tzm-Arab-MA", lcid => 0x0000045f }, ## name => "tzm-Tfng", lcid => 0x0000785f }, @@ -1434,6 +1445,8 @@ my @locales = { name => "vo-001", dir => "seed" }, { name => "vun" }, { name => "vun-TZ" }, + { name => "wa", dir => "seed", oemcp => 850 }, + { name => "wa-BE", dir => "seed" }, { name => "wae" }, { name => "wae-CH" }, { name => "wal", dir => "seed" }, @@ -4480,7 +4493,7 @@ sub build_locale_data() else { my $name = $loc->{file} || $loc->{name}; - $name =~ s/-(Arab|Cyrl|Deva|Guru|Hans|Hant|Latn|Tfng|Vaii)$//; + $name =~ s/-(Arab|Beng|Cyrl|Deva|Guru|Hans|Hant|Latn|Tfng|Vaii)$//; $name =~ s/-/_/g; $id = xml_query( $subtags, "/supplementalData/likelySubtags/likelySubtag[\@from='$name']/\@to" ); $id =~ s/_/-/g if $id;

1 0

Ziqing Hui : win32u: Add font link for MS UI Gothic.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: wine Branch: master Commit: 71b1e636ecc8a63e4edb74b4c80cd4aef47bf013 URL: https://gitlab.winehq.org/wine/wine/-/commit/71b1e636ecc8a63e4edb74b4c80cd4… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat Oct 15 12:32:09 2022 +0800 win32u: Add font link for MS UI Gothic. Win10 has font link for most of the system default fonts, including MS UI Gothic. This fixes Korean text display issue for Romance of the There Kindoms XIII. --- dlls/win32u/font.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index d3e69cb5f8e..6086fa79609 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1581,6 +1581,16 @@ static const char system_link_tahoma_non_cjk[] = "SIMSUN.TTC,SimSun\0" "GULIM.TTC,Gulim\0"; +static const char system_link_ms_ui_gothic[] = + "MICROSS.TTF,Microsoft Sans Serif\0" + "MINGLIU.TTC,PMingLiU\0""SIMSUN.TTC,SimSun\0" + "GULIM.TTC,Gulim\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + static const struct system_link_reg { const WCHAR *font_name; @@ -1621,6 +1631,14 @@ default_system_link[] = system_link_tahoma_kr, sizeof(system_link_tahoma_kr), system_link_tahoma_non_cjk, sizeof(system_link_tahoma_non_cjk), }, + { + ms_ui_gothicW, + system_link_ms_ui_gothic, sizeof(system_link_ms_ui_gothic), + system_link_ms_ui_gothic, sizeof(system_link_ms_ui_gothic), + system_link_ms_ui_gothic, sizeof(system_link_ms_ui_gothic), + system_link_ms_ui_gothic, sizeof(system_link_ms_ui_gothic), + system_link_ms_ui_gothic, sizeof(system_link_ms_ui_gothic), + }, }; static void populate_system_links( const WCHAR *name, const WCHAR * const *values )

1 0