- Wine-Devel - list.winehq.org

[tools] testbot/SetWinLocale: Also show the user's languages list.
by Francois Gouget Jan. 5, 2022

Jan. 5, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index e7ae3c0ced..ca02cfa270 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -551,7 +551,9 @@ sub GetWinSettings($) } if (($OptKeyboard || $OptDefault) or $All) { - $Settings->{InputMethod} = RegGetValue($HKCU_USER_PROFILE, "InputMethodOverride"); + my $Values = RegGetValues($HKCU_USER_PROFILE, "*"); + $Settings->{InputMethod} = $Values->{InputMethodOverride}; + $Settings->{Languages} = $Values->{Languages}; } if ($OptMUI or $All) { @@ -582,6 +584,7 @@ sub ShowWinSettings($) print "Geo:Nation (--country) = ", Value2Str($Settings->{Country}), "\n"; print "Geo:Name (--country) = ", Value2Str($Settings->{CountryName}), "\n"; print "InputMethod (--keyboard) = ", Value2Str($Settings->{InputMethod}), "\n"; + print "Languages = ", Value2Str($Settings->{Languages}), "\n"; print "PreferredUILanguages (--mui) = ", Value2Str($Settings->{PreferredUILanguages}), "\n"; print " ...Pending (--mui) = ", Value2Str($Settings->{PreferredUILanguagesPending}), "\n"; print " Previous... (--mui) = ", Value2Str($Settings->{PreviousPreferredUILanguages}), "\n"; -- 2.30.2

1 0

[PATCH] programs/cmd: expand commandline before starting parsing it
by Eric Pouech Jan. 5, 2022

Jan. 5, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52344 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/cmd/wcmdmain.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 45aec76c89c..bb4661697c4 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1297,6 +1297,11 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, new_redir = heap_xalloc(MAXSTRING * sizeof(WCHAR)); redir = new_redir; + /* Expand variables in command line mode only (batch mode will + be expanded as the line is read in, except for 'for' loops) */ + handleExpansion(new_cmd, (context != NULL), delayedsubst); + handleExpansion(new_redir, (context != NULL), delayedsubst); + /* Strip leading whitespaces, and a '@' if supplied */ whichcmd = WCMD_skip_leading_spaces(cmd); WINE_TRACE("Command: '%s'\n", wine_dbgstr_w(cmd)); @@ -1347,11 +1352,6 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, lstrcpyW(new_redir, redirects); } - /* Expand variables in command line mode only (batch mode will - be expanded as the line is read in, except for 'for' loops) */ - handleExpansion(new_cmd, (context != NULL), delayedsubst); - handleExpansion(new_redir, (context != NULL), delayedsubst); - /* * Changing default drive has to be handled as a special case, anything * else if it exists after whitespace is ignored

1 0

[PATCH 0/4] a couple of fixes to programs/cmd
by Eric Pouech Jan. 5, 2022

Jan. 5, 2022

I thought fixing bug #51599 would be quick and simple... Fixing was quick, but I shouldn't have tried to run the non regression tests... which opened a can of worms <g> patch #2 fixes some error cases on input handling the can of worms: it happens that I have a single symlinks in my (not pristine) prefix (well a very very simple one: Z: -> /) cmd.exe (and attrib.exe) **NEVER** test for buffer overflow when recursing inside the directory tree structure (I haven't checked the other utilities yet) I tested native behavior: depth-recursion stops around MAX_PATH length... while breadth-recursion continues; and there's no detection about DAG or entering twice the same directory so patches #3 and #4 are about not recursing when buffer would overflow in attrib.exe and cmd.exe Notes: - not all the places (in cmd) have been fixed by those patches for buffer overflow - there are some places that take care of allocating larger buffers than MAX_PATH, hence preventing the recursion to stop as native does - with those patches, I still can't successfully run the cmd regression test with the symlink in place (maybe I need to be more patient than one hour :-( - regression tests pass on a pristine prefix though A+ --- Eric Pouech (4): programs/cmd: handle white space only lines within ( ) block programs/cmd: handle read errors in WCMD_ask_confirm programs/attrib: don't overflow internal path buffers programs/cmd: don't overflow internal path buffers programs/attrib/attrib.c | 10 ++++++---- programs/cmd/builtins.c | 25 ++++++++++++++++++------- programs/cmd/directory.c | 1 + programs/cmd/wcmdmain.c | 8 ++++++-- 4 files changed, 31 insertions(+), 13 deletions(-)

1 4

[PATCH vkd3d] vkd3d-shader/hlsl: Support array initializers.
by Francisco Casas Jan. 5, 2022

Jan. 5, 2022

The new function initialize_var_recursive() "pops" arguments from the parse_variable_def initializer to initialize the members of var for both struct and array initialization recursively. initializer_i is used to keep track of the index of the next input parameter to read. This approach should scale well for nested arrays and structs. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- The new definition of free_parse_variable_def() is unorthodox, but I think it helps illustrate how the parse_variable_def memory should be free on the different scenarios. The exercise of writting it this way allowed to find a memory leak. Ignoring inner braces on initializers is still pending, this could be achieved through a flattening method or at the parser level. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 4 + libs/vkd3d-shader/hlsl.y | 207 +++++++++--------- .../hlsl-array-initializer-local.shader_test | 21 ++ .../hlsl-array-initializer-static.shader_test | 21 ++ 4 files changed, 155 insertions(+), 98 deletions(-) create mode 100644 tests/hlsl-array-initializer-local.shader_test create mode 100644 tests/hlsl-array-initializer-static.shader_test diff --git a/Makefile.am b/Makefile.am index 20fee06d..91e396ee 100644 --- a/Makefile.am +++ b/Makefile.am @@ -61,6 +61,8 @@ vkd3d_shader_tests = \ tests/cast-to-uint.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-array-initializer-local.shader_test \ + tests/hlsl-array-initializer-static.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-clamp.shader_test \ tests/hlsl-comma.shader_test \ @@ -289,6 +291,8 @@ XFAIL_TESTS = \ tests/cast-to-uint.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-array-initializer-local.shader_test \ + tests/hlsl-array-initializer-static.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 636882c4..52c32878 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -904,7 +904,8 @@ static bool expr_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t static enum hlsl_base_type expr_common_base_type(enum hlsl_base_type t1, enum hlsl_base_type t2) { - if (t1 > HLSL_TYPE_LAST_SCALAR || t2 > HLSL_TYPE_LAST_SCALAR) { + if (t1 > HLSL_TYPE_LAST_SCALAR || t2 > HLSL_TYPE_LAST_SCALAR) + { FIXME("Unexpected base type.\n"); return HLSL_TYPE_FLOAT; } @@ -1278,71 +1279,113 @@ static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrem return true; } -static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, struct hlsl_ir_var *var, - struct parse_initializer *initializer) +static void initialize_var_recursive(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, unsigned int reg_offset, + struct hlsl_type *type, struct parse_variable_def *v, unsigned int *initializer_i, struct list *instrs) { - struct hlsl_type *type = var->data_type; - struct hlsl_struct_field *field; - unsigned int i = 0; - - if (initializer_size(initializer) != hlsl_type_component_count(type)) + if (type->type <= HLSL_CLASS_LAST_NUMERIC) { - hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in initializer, but got %u.", - hlsl_type_component_count(type), initializer_size(initializer)); - free_parse_initializer(initializer); - return; - } + unsigned int writemask_offset = 0; + unsigned int components_read = 0; - list_move_tail(list, initializer->instrs); - vkd3d_free(initializer->instrs); + if (type->type == HLSL_CLASS_MATRIX) + hlsl_fixme(ctx, &var->loc, "Matrix initializer\n"); - LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) - { - struct hlsl_ir_node *node = initializer->args[i]; - struct hlsl_ir_store *store; - struct hlsl_ir_constant *c; + while (components_read < hlsl_type_component_count(type)) + { + struct hlsl_ir_store *store; + struct hlsl_ir_constant *c; + struct hlsl_ir_node *node; + unsigned int width; - if (i++ >= initializer->args_count) - break; + assert(*initializer_i < v->initializer.args_count); + node = v->initializer.args[*initializer_i]; + *initializer_i += 1; - if (hlsl_type_component_count(field->type) == hlsl_type_component_count(node->data_type)) - { - if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, node->loc))) - break; - list_add_tail(list, &c->node.entry); + width = hlsl_type_component_count(node->data_type); + components_read += width; - if (!(store = hlsl_new_store(ctx, var, &c->node, node, 0, node->loc))) - break; - list_add_tail(list, &store->node.entry); + if (components_read > hlsl_type_component_count(type)) + { + hlsl_error(ctx, &node->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Initializer argument has spare components.\n"); + return; + } + + if (!(node = add_implicit_conversion(ctx, instrs, node, + hlsl_get_vector_type(ctx, type->base_type, width), &node->loc))) + return; + + if (!(c = hlsl_new_uint_constant(ctx, reg_offset, node->loc))) + return; + list_add_tail(instrs, &c->node.entry); + + if (!(store = hlsl_new_store(ctx, var, &c->node, node, + ((1u << width) - 1) << writemask_offset, node->loc))) + return; + list_add_tail(instrs, &store->node.entry); + + writemask_offset += width; } - else + } + else if (type->type == HLSL_CLASS_STRUCT) + { + struct hlsl_struct_field *field; + + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) { - hlsl_fixme(ctx, &node->loc, "Implicit cast in structure initializer."); + initialize_var_recursive(ctx, var, reg_offset + field->reg_offset, field->type, v, + initializer_i, instrs); } + return; } + else if (type->type == HLSL_CLASS_ARRAY) + { + for (int i = 0; i < type->e.array.elements_count; i++) + { + struct hlsl_type *elem_type = type->e.array.type; + unsigned int elem_offset = i * elem_type->reg_size; - vkd3d_free(initializer->args); + initialize_var_recursive(ctx, var, reg_offset + elem_offset, elem_type, v, + initializer_i, instrs); + } + return; + } + else if (type->type == HLSL_CLASS_OBJECT) + { + hlsl_fixme(ctx, &var->loc, "Initializers for objects not supported yet.\n"); + return; + } } -static void free_parse_variable_def(struct parse_variable_def *v) +static void free_parse_variable_def(struct parse_variable_def *v, int freeness) { - free_parse_initializer(&v->initializer); - vkd3d_free(v->arrays.sizes); - vkd3d_free(v->name); - vkd3d_free((void *)v->semantic.name); - vkd3d_free(v); + /* 0 : If v's names and instructions were passed to another struct. */ + /* 1 : If only v's names were passed to another struct. */ + /* 2 : If v still retains the ownership of all its members. */ + if (freeness == 0) + { + vkd3d_free(v->initializer.args); + vkd3d_free(v->initializer.instrs); + } + if (freeness == 1) + { + free_parse_initializer(&v->initializer); + } + if (freeness == 2) + { + free_parse_initializer(&v->initializer); + vkd3d_free(v->name); + vkd3d_free((void *)v->semantic.name); + } + vkd3d_free(v->arrays.sizes); + vkd3d_free(v); } static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, DWORD modifiers, struct list *var_list) { struct parse_variable_def *v, *v_next; - struct hlsl_ir_function_decl *func; struct list *statements_list; - struct hlsl_ir_var *var; - struct hlsl_type *type; - bool local = true; if (basic_type->type == HLSL_CLASS_MATRIX) assert(basic_type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK); @@ -1350,7 +1393,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (!(statements_list = make_empty_list(ctx))) { LIST_FOR_EACH_ENTRY_SAFE(v, v_next, var_list, struct parse_variable_def, entry) - free_parse_variable_def(v); + free_parse_variable_def(v,2); vkd3d_free(var_list); return NULL; } @@ -1360,9 +1403,12 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t LIST_FOR_EACH_ENTRY_SAFE(v, v_next, var_list, struct parse_variable_def, entry) { + struct hlsl_type *type = basic_type; + struct hlsl_ir_function_decl *func; + struct hlsl_ir_var *var; + bool local = true; unsigned int i; - type = basic_type; for (i = 0; i < v->arrays.count; ++i) type = hlsl_new_array_type(ctx, type, v->arrays.sizes[i]); @@ -1371,7 +1417,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (!(var = hlsl_new_var(ctx, v->name, type, v->loc, &v->semantic, modifiers, &v->reg_reservation))) { - free_parse_variable_def(v); + free_parse_variable_def(v,2); continue; } @@ -1424,7 +1470,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_INITIALIZER, "Const variable \"%s\" is missing an initializer.", var->name); hlsl_free_var(var); - vkd3d_free(v); + free_parse_variable_def(v,1); continue; } @@ -1436,78 +1482,43 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t "Variable \"%s\" was already declared in this scope.", var->name); hlsl_note(ctx, &old->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously declared here.", old->name); hlsl_free_var(var); - vkd3d_free(v); + free_parse_variable_def(v,1); continue; } if (v->initializer.args_count) { unsigned int size = initializer_size(&v->initializer); - struct hlsl_ir_load *load; - if (type->type <= HLSL_CLASS_LAST_NUMERIC - && type->dimx * type->dimy != size && size != 1) - { - if (size < type->dimx * type->dimy) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in numeric initializer, but got %u.", - type->dimx * type->dimy, size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } - } - if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) - && hlsl_type_component_count(type) != size) + if (hlsl_type_component_count(type) != size && (size != 1 || type->type > HLSL_CLASS_LAST_NUMERIC)) { hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); + free_parse_variable_def(v,1); continue; } - if (type->type == HLSL_CLASS_STRUCT) + if(var->data_type->type <= HLSL_CLASS_LAST_NUMERIC) { - struct_var_initializer(ctx, statements_list, var, &v->initializer); - vkd3d_free(v); - continue; - } - if (type->type > HLSL_CLASS_LAST_NUMERIC) - { - FIXME("Initializers for non scalar/struct variables not supported yet.\n"); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } - if (v->arrays.count) - { - hlsl_fixme(ctx, &v->loc, "Array initializer."); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; + struct hlsl_ir_load *load; + + load = hlsl_new_var_load(ctx, var, var->loc); + list_add_tail(v->initializer.instrs, &load->node.entry); + add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); } - if (v->initializer.args_count > 1) + else { - hlsl_fixme(ctx, &v->loc, "Complex initializer."); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } - - load = hlsl_new_var_load(ctx, var, var->loc); - list_add_tail(v->initializer.instrs, &load->node.entry); - add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); - vkd3d_free(v->initializer.args); + unsigned int initializer_i = 0; + initialize_var_recursive(ctx, var, 0, var->data_type, v, &initializer_i, v->initializer.instrs); + } if (modifiers & HLSL_STORAGE_STATIC) list_move_tail(&ctx->static_initializers, v->initializer.instrs); else list_move_tail(statements_list, v->initializer.instrs); - vkd3d_free(v->initializer.instrs); } - vkd3d_free(v); + + free_parse_variable_def(v,0); } vkd3d_free(var_list); return statements_list; diff --git a/tests/hlsl-array-initializer-local.shader_test b/tests/hlsl-array-initializer-local.shader_test new file mode 100644 index 00000000..e9310b98 --- /dev/null +++ b/tests/hlsl-array-initializer-local.shader_test @@ -0,0 +1,21 @@ +[pixel shader] +float4 main() : SV_TARGET +{ + float4 array_loc[2][4] = { + 11, 12, 13, 14, + 21, 22, 23, 24, + 31, 32, 33, 34, + 41, 42, 43, 44, + 51, 52, 53, 54, + 61, 62, 63, 64, + 71, 72, 73, 74, + 81, 82, 83, 84, + }; + + return array_loc[1][2]; +} + +[test] +draw quad +probe all rgba (71, 72, 73, 74) + diff --git a/tests/hlsl-array-initializer-static.shader_test b/tests/hlsl-array-initializer-static.shader_test new file mode 100644 index 00000000..f103dd9a --- /dev/null +++ b/tests/hlsl-array-initializer-static.shader_test @@ -0,0 +1,21 @@ +[pixel shader] +static const float4 array_st[4][2] = { + 11, 12, 13, 14, + 21, 22, 23, 24, + 31, 32, 33, 34, + 41, 42, 43, 44, + 51, 52, 53, 54, + 61, 62, 63, 64, + 71, 72, 73, 74, + 81, 82, 83, 84, +}; + +float4 main() : SV_TARGET +{ + return array_st[2][1]; +} + +[test] +draw quad +probe all rgba (61, 62, 63, 64) + -- 2.25.1

3 4

[PATCH] oleacc: Fix intermittent AccessibleObjectFromPoint tests failures.
by Piotr Caban Jan. 5, 2022

Jan. 5, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/tests/main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)

1 0

[PATCH 1/8] dinput: Don't pass a module handle to SetWindowsHookExW.
by Rémi Bernon Jan. 5, 2022

Jan. 5, 2022

For low-level hooks, which don't need it. Passing a module handle will make set_windows_hook call GetModuleFileNameW which requires the loader lock. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52263 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This is a bit longer than I'd like and I don't like very much the idea of the thread timeout, but I don't see any other solution. Maybe a finer grained loader locking could solve the underlying problem, but it's not going to be there soon. dlls/dinput/dinput_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index a62d4d2ea3d..980edeba817 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1317,7 +1317,7 @@ static DWORD WINAPI dinput_thread_proc( void *params ) LeaveCriticalSection( &dinput_hook_crit ); if (kbd_cnt && !kbd_hook) - kbd_hook = SetWindowsHookExW( WH_KEYBOARD_LL, LL_hook_proc, DINPUT_instance, 0 ); + kbd_hook = SetWindowsHookExW( WH_KEYBOARD_LL, LL_hook_proc, NULL, 0 ); else if (!kbd_cnt && kbd_hook) { UnhookWindowsHookEx( kbd_hook ); @@ -1325,7 +1325,7 @@ static DWORD WINAPI dinput_thread_proc( void *params ) } if (mice_cnt && !mouse_hook) - mouse_hook = SetWindowsHookExW( WH_MOUSE_LL, LL_hook_proc, DINPUT_instance, 0 ); + mouse_hook = SetWindowsHookExW( WH_MOUSE_LL, LL_hook_proc, NULL, 0 ); else if (!mice_cnt && mouse_hook) { UnhookWindowsHookEx( mouse_hook ); -- 2.34.1

1 8

[PATCH v2 1/6] d3d8/tests: Test for window changes when it's not active.
by Gabriel Ivăncescu Jan. 5, 2022

Jan. 5, 2022

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- I'm sending these tests first to show the behavior across d3d versions. I do not plan to fix them during code freeze, except for ddraw, since I'm not aware of any regressions due to them. I might fix them after code freeze though. dlls/d3d8/tests/device.c | 91 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index fc94dca..9e7c0fb 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -4055,6 +4055,97 @@ static void test_window_style(void) ref = IDirect3DDevice8_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + DestroyWindow(device_window); + DestroyWindow(focus_window); + + /* Window changes are done only if either the device or focus windows are active */ + focus_window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, registry_mode.dmPelsWidth / 2, registry_mode.dmPelsHeight / 2, 0, 0, 0, 0); + device_window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, registry_mode.dmPelsWidth / 2, registry_mode.dmPelsHeight / 2, 0, 0, 0, 0); + + device_style = GetWindowLongA(device_window, GWL_STYLE); + device_exstyle = GetWindowLongA(device_window, GWL_EXSTYLE); + focus_style = GetWindowLongA(focus_window, GWL_STYLE); + focus_exstyle = GetWindowLongA(focus_window, GWL_EXSTYLE); + + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + + device_desc.device_window = device_window; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + device = create_device(d3d8, focus_window, &device_desc); + ok(!!device, "Failed to create a D3D device.\n"); + ShowWindow(device_window, SW_SHOWNOACTIVATE); + + /* 32-bit tests ran under Windows 8 and 10 testbots have pretty + inconsistent behavior but topmost is set even when inactive. */ + style = GetWindowLongA(device_window, GWL_EXSTYLE); + if (broken(style & WS_EX_TOPMOST)) + { + win_skip("topmost set when inactive due to inconsistent behavior, skipping related tests..."); + goto skip_inactive; + } + todo_wine ok(style == device_exstyle || broken(style == (device_exstyle & ~WS_EX_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window extended style %#x, got %#x.\n", device_exstyle, style); + style = GetWindowLongA(device_window, GWL_STYLE); + todo_wine ok(style == device_style || broken(style == (device_style & ~WS_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window style %#x, got %#x.\n", device_style, style); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x.\n", focus_style, style); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x.\n", focus_exstyle, style); + + device_desc.flags = 0; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + style = GetWindowLongA(device_window, GWL_STYLE); + todo_wine ok(style == device_style || broken(style == (device_style & ~WS_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window style %#x, got %#x.\n", device_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + todo_wine ok(style == device_exstyle || broken(style == (device_exstyle & ~WS_EX_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window extended style %#x, got %#x.\n", device_exstyle, style); + GetWindowRect(device_window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + SetForegroundWindow(focus_window); + ok(ret, "Failed to set foreground window.\n"); + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + style = GetWindowLongA(device_window, GWL_STYLE); + todo_wine ok(style == device_style || broken(style == (device_style & ~WS_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window style %#x, got %#x.\n", device_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + todo_wine ok(style == device_exstyle || broken(style == (device_exstyle & ~WS_EX_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window extended style %#x, got %#x.\n", device_exstyle, style); + + device_desc.flags = 0; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + style = GetWindowLongA(device_window, GWL_STYLE); + todo_wine ok(style == device_style || broken(style == (device_style & ~WS_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window style %#x, got %#x.\n", device_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + todo_wine ok(style == device_exstyle || broken(style == (device_exstyle & ~WS_EX_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window extended style %#x, got %#x.\n", device_exstyle, style); + +skip_inactive: + ref = IDirect3DDevice8_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); done: IDirect3D8_Release(d3d8); -- 2.34.1

3 14

[PATCH] po: Update Japanese translation.
by Jactry Zeng Jan. 5, 2022

Jan. 5, 2022

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- cc Sagawa, since I don't speak Japanese actually. --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index ba9835a5494..f2f7a431995 100644 --- a/po/ja.po +++ b/po/ja.po @@ -443,7 +443,7 @@ msgstr "閉じる(&C)" #: dlls/comctl32/comctl32.rc:101 msgid "R&eset" -msgstr "リセット(R&)" +msgstr "リセット(&E)" #: dlls/comctl32/comctl32.rc:102 dlls/comdlg32/comdlg32.rc:173 #: dlls/comdlg32/comdlg32.rc:195 dlls/comdlg32/comdlg32.rc:266 @@ -9008,7 +9008,7 @@ msgstr "利用するデータソース名(&D)" #: dlls/oledb32/version.rc:74 msgid "Use c&onnection string" -msgstr "利用する接続文字列(&C)" +msgstr "利用する接続文字列(&O)" #: dlls/oledb32/version.rc:75 msgid "&Connection string:" -- 2.34.1

2 1

[PATCH] iphlpapi: Always populate the friendly name.
by Huw Davies Jan. 5, 2022

Jan. 5, 2022

The GAA_FLAG_SKIP_FRIENDLY_NAME flag is essentially ignored. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48084 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 11 ++++------- dlls/iphlpapi/tests/iphlpapi.c | 8 +++++++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 15c4f067105..c94f869c9f9 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1221,7 +1221,7 @@ static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADD if (err) return err; needed = count * (sizeof(*aa) + ((CHARS_IN_GUID + 1) & ~1) + sizeof(stat->descr.String)); - if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) needed += count * sizeof(rw->alias.String); + needed += count * sizeof(rw->alias.String); /* GAA_FLAG_SKIP_FRIENDLY_NAME is ignored */ aa = heap_alloc_zero( needed ); if (!aa) @@ -1243,12 +1243,9 @@ static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADD if_counted_string_copy( (WCHAR *)str_ptr, ARRAY_SIZE(stat[i].descr.String), &stat[i].descr ); aa[i].Description = (WCHAR *)str_ptr; str_ptr += sizeof(stat[i].descr.String); - if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) - { - if_counted_string_copy( (WCHAR *)str_ptr, ARRAY_SIZE(rw[i].alias.String), &rw[i].alias ); - aa[i].FriendlyName = (WCHAR *)str_ptr; - str_ptr += sizeof(rw[i].alias.String); - } + if_counted_string_copy( (WCHAR *)str_ptr, ARRAY_SIZE(rw[i].alias.String), &rw[i].alias ); + aa[i].FriendlyName = (WCHAR *)str_ptr; + str_ptr += sizeof(rw[i].alias.String); aa[i].PhysicalAddressLength = rw[i].phys_addr.Length; if (aa[i].PhysicalAddressLength > sizeof(aa[i].PhysicalAddress)) aa[i].PhysicalAddressLength = 0; memcpy( aa[i].PhysicalAddress, rw[i].phys_addr.Address, aa[i].PhysicalAddressLength ); diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 2adacd36b48..12da629c30c 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1580,6 +1580,12 @@ static void test_GetAdaptersAddresses(void) ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %u\n", ret); if (ret != ERROR_BUFFER_OVERFLOW) return; + /* GAA_FLAG_SKIP_FRIENDLY_NAME is ignored */ + osize = 0x7fffffff; + ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_SKIP_FRIENDLY_NAME, NULL, NULL, &osize); + ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %u\n", ret); + ok(osize == size, "expected %d, got %d\n", size, osize); + ptr = HeapAlloc(GetProcessHeap(), 0, size); ret = GetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &size); ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); @@ -1589,7 +1595,7 @@ static void test_GetAdaptersAddresses(void) size *= 2; osize = size; ptr = HeapAlloc(GetProcessHeap(), 0, osize); - ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX, NULL, ptr, &osize); + ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX | GAA_FLAG_SKIP_FRIENDLY_NAME, NULL, ptr, &osize); ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); ok(osize == size, "expected %d, got %d\n", size, osize); -- 2.23.0

1 0

[PATCH] po: Update Simplified Chinese translation.
by Jactry Zeng Jan. 5, 2022

Jan. 5, 2022

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- po/zh_CN.po | 248 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 206 insertions(+), 42 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 52072333886..995198ef63f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-01-03 00:36+0800\n" +"PO-Revision-Date: 2022-01-05 12:09+0800\n" "Last-Translator: Jactry Zeng <jzeng(a)codeweavers.com>\n" "Language-Team: Chinese (PRC)\n" "Language: zh_CN\n" @@ -44,7 +44,7 @@ msgstr "安装/卸载" msgid "" "To install a new program from a floppy disk, CD-ROM drive, or your hard " "drive, click Install." -msgstr "要从软盘，光盘或硬盘安装新程序，请按'安装'。" +msgstr "要从软盘，光盘或硬盘安装新程序，请单击“安装”。" #: dlls/appwiz.cpl/appwiz.rc:62 msgid "&Install..." @@ -55,7 +55,7 @@ msgid "" "The following software can be automatically removed. To remove a program or " "to modify its installed components, select it from the list and click Modify/" "Remove." -msgstr "下列软件可以自动卸载。按'修改/删除'可卸载选定程序或者调整已安装部件。" +msgstr "下列软件可以自动卸载。单击“修改/删除”可卸载选中的程序或修改其已安装的组件。" #: dlls/appwiz.cpl/appwiz.rc:67 msgid "&Support Information" @@ -294,7 +294,7 @@ msgstr "所有文件 (*.*)" #: dlls/appwiz.cpl/appwiz.rc:46 msgid "&Modify/Remove" -msgstr "修改或删除(&M)" +msgstr "修改/删除(&M)" #: dlls/appwiz.cpl/appwiz.rc:51 msgid "Downloading..." @@ -388,7 +388,7 @@ msgstr "时" #: dlls/comctl32/comctl32.rc:68 programs/winefile/winefile.rc:156 msgid "Properties for %s" -msgstr "属性 %s" +msgstr "%s 的属性" #: dlls/comctl32/comctl32.rc:73 dlls/comdlg32/comdlg32.rc:265 msgid "&Apply" @@ -429,7 +429,7 @@ msgstr "关闭(&C)" #: dlls/comctl32/comctl32.rc:101 msgid "R&eset" -msgstr "重置(&e)" +msgstr "重置(&E)" #: dlls/comctl32/comctl32.rc:102 dlls/comdlg32/comdlg32.rc:173 #: dlls/comdlg32/comdlg32.rc:195 dlls/comdlg32/comdlg32.rc:266 @@ -637,7 +637,7 @@ msgstr "方向" #: dlls/comdlg32/comdlg32.rc:237 msgid "Po&rtrait" -msgstr "纵向(&P)" +msgstr "纵向(&R)" #: dlls/comdlg32/comdlg32.rc:238 dlls/comdlg32/comdlg32.rc:445 #: dlls/wineps.drv/wineps.rc:37 @@ -728,7 +728,7 @@ msgstr "蓝(&B):" #: dlls/comdlg32/comdlg32.rc:296 msgid "&Hue:" -msgstr "色调(&E):" +msgstr "色调(&H):" #: dlls/comdlg32/comdlg32.rc:298 msgctxt "Saturation" @@ -784,7 +784,7 @@ msgstr "下(&D)" #: dlls/comdlg32/comdlg32.rc:329 dlls/comdlg32/comdlg32.rc:347 msgid "&Find Next" -msgstr "找下一个(&F)" +msgstr "查找下一个(&F)" #: dlls/comdlg32/comdlg32.rc:337 msgid "Replace" @@ -872,7 +872,7 @@ msgstr "纸张来源(&S):" #: dlls/comdlg32/comdlg32.rc:421 msgid "P&ortrait" -msgstr "纵向(&P)" +msgstr "纵向(&O)" #: dlls/comdlg32/comdlg32.rc:422 msgid "L&andscape" @@ -908,7 +908,7 @@ msgstr "下(&B):" #: dlls/comdlg32/comdlg32.rc:457 msgid "P&rinter..." -msgstr "打印机(&P)..." +msgstr "打印机(&R)..." #: dlls/comdlg32/comdlg32.rc:465 dlls/comdlg32/comdlg32.rc:490 msgid "Look &in:" @@ -946,7 +946,7 @@ msgstr "找不到文件" #: dlls/comdlg32/comdlg32.rc:34 msgid "Please verify that the correct file name was given" -msgstr "请检验是否给予正确的文件名称" +msgstr "请检查给予的文件名是否正确" #: dlls/comdlg32/comdlg32.rc:35 msgid "" @@ -1050,7 +1050,7 @@ msgstr "紫色" #: dlls/comdlg32/comdlg32.rc:128 programs/wordpad/wordpad.rc:131 msgid "Teal" -msgstr "鸭翅绿" +msgstr "青色" #: dlls/comdlg32/comdlg32.rc:129 programs/wordpad/wordpad.rc:132 msgid "Gray" @@ -1115,7 +1115,7 @@ msgstr "" #: dlls/comdlg32/comdlg32.rc:65 msgid "The 'Number of copies' field cannot be empty." -msgstr "“份数”项不能空。" +msgstr "“份数”项不能为空。" #: dlls/comdlg32/comdlg32.rc:67 msgid "" @@ -3227,7 +3227,7 @@ msgstr "正在传输" #: dlls/gphoto2.ds/gphoto2.rc:46 msgid "Transferring... Please Wait" -msgstr "正在传输… 请稍候" +msgstr "正在传输... 请稍候" #: dlls/gphoto2.ds/gphoto2.rc:51 msgid "Connecting to camera" @@ -3235,7 +3235,7 @@ msgstr "连接照相机" #: dlls/gphoto2.ds/gphoto2.rc:55 msgid "Connecting to camera... Please Wait" -msgstr "正在连接照相机… 请稍候" +msgstr "正在连接照相机... 请稍候" #: dlls/hhctrl.ocx/hhctrl.rc:59 msgid "S&ync" @@ -6899,7 +6899,7 @@ msgstr "找不到用户名。\n" #: dlls/kernel32/winerror.mc:3743 msgid "This network connection does not exist.\n" -msgstr "该网络链接不存在。\n" +msgstr "该网络连接不存在。\n" #: dlls/kernel32/winerror.mc:3748 msgid "Connection reset by peer.\n" @@ -8061,7 +8061,7 @@ msgstr "正在复制新文件" #: dlls/msi/msi.rc:105 msgid "Installing ODBC components" -msgstr "正在安装 ODBC 组建" +msgstr "正在安装 ODBC 组件" #: dlls/msi/msi.rc:106 msgid "Installing new services" @@ -8101,7 +8101,7 @@ msgstr "正在为文件打补丁" #: dlls/msi/msi.rc:115 msgid "Updating component registration" -msgstr "正在更新组建注册信息" +msgstr "正在更新组件注册信息" #: dlls/msi/msi.rc:116 msgid "Publishing Qualified Components" @@ -9012,7 +9012,7 @@ msgstr "秒。" #: dlls/oledb32/version.rc:104 msgid "A&ccess:" -msgstr "访问(&A):" +msgstr "访问(&C):" #: dlls/oledb32/version.rc:110 msgid "All" @@ -9259,7 +9259,7 @@ msgstr "正在扫描" #: dlls/sane.ds/sane.rc:44 msgid "SCANNING... Please Wait" -msgstr "正在扫描… 请稍候" +msgstr "正在扫描... 请稍候" #: dlls/sane.ds/sane.rc:31 msgctxt "unit: pixels" @@ -9410,11 +9410,11 @@ msgstr "打印目标(&P)" #: dlls/shdoclc/shdoclc.rc:71 dlls/shdoclc/shdoclc.rc:154 #: dlls/shdoclc/shdoclc.rc:178 msgid "S&how Picture" -msgstr "显示图片(&S)" +msgstr "显示图片(&H)" #: dlls/shdoclc/shdoclc.rc:72 dlls/shdoclc/shdoclc.rc:179 msgid "&Save Picture As..." -msgstr "将图片存为(&A)..." +msgstr "将图片另存为(&S)..." #: dlls/shdoclc/shdoclc.rc:73 msgid "&E-mail Picture..." @@ -9471,7 +9471,7 @@ msgstr "行(&R)" #: dlls/shdoclc/shdoclc.rc:107 msgid "&Column" -msgstr "列(&O)" +msgstr "列(&C)" #: dlls/shdoclc/shdoclc.rc:108 msgid "&Table" @@ -9495,7 +9495,7 @@ msgstr "剪下" #: dlls/shdoclc/shdoclc.rc:155 msgid "&Save Video As..." -msgstr "将视频存为(&V)..." +msgstr "将视频另存为(&S)..." #: dlls/shdoclc/shdoclc.rc:166 dlls/shdoclc/shdoclc.rc:190 msgid "Play" @@ -10205,7 +10205,7 @@ msgstr "错误" #: dlls/shlwapi/shlwapi.rc:43 msgid "Don't show me th&is message again" -msgstr "不要再显示这个讯息(&i)" +msgstr "不要再显示这个信息(&I)" #: dlls/shlwapi/shlwapi.rc:30 msgid "%d bytes" @@ -11917,7 +11917,7 @@ msgstr "最大化(&X)" #: dlls/user32/user32.rc:36 msgid "&Close\tAlt+F4" -msgstr "关闭(&N)\tAlt+F4" +msgstr "关闭(&C)\tAlt+F4" #: dlls/user32/user32.rc:38 msgid "&About Wine" @@ -11925,7 +11925,7 @@ msgstr "关于 Wine(&A)" #: dlls/user32/user32.rc:49 msgid "&Close\tCtrl+F4" -msgstr "关闭(&N)\tCtrl+F4" +msgstr "关闭(&C)\tCtrl+F4" #: dlls/user32/user32.rc:51 msgid "Nex&t\tCtrl+F6" @@ -13837,7 +13837,7 @@ msgstr "" #: programs/cmd/cmd.rc:393 msgid "Volume label (11 characters, <Enter> for none)?" -msgstr "卷标 (11 个字符, 直接按 <回车> 以留空)?" +msgstr "卷标 (11 个字符，直接按 <回车> 以留空)?" #: programs/cmd/cmd.rc:394 msgid "PATH not found\n" @@ -14152,7 +14152,7 @@ msgstr "以太网" #: programs/ipconfig/ipconfig.rc:35 msgid "Connection-specific DNS suffix" -msgstr "链接专用的 DNS 后缀" +msgstr "连接专用的 DNS 后缀" #: programs/ipconfig/ipconfig.rc:36 msgid "IPv4 address" @@ -14754,7 +14754,7 @@ msgstr "专家模式(&E)" #: programs/oleview/oleview.rc:65 msgid "&Hidden component categories" -msgstr "隐藏部件分类(&H)" +msgstr "隐藏组件分类(&H)" #: programs/oleview/oleview.rc:67 programs/oleview/oleview.rc:89 #: programs/winefile/winefile.rc:65 programs/wordpad/wordpad.rc:71 @@ -14952,7 +14952,7 @@ msgstr "对象类型" #: programs/oleview/oleview.rc:131 msgid "Grouped by Component Category" -msgstr "按部件类型分组" +msgstr "按组件类型分组" #: programs/oleview/oleview.rc:132 msgid "OLE 1.0 Objects" @@ -15032,7 +15032,7 @@ msgstr "新建(&N)..." #: programs/progman/progman.rc:34 msgid "O&pen\tEnter" -msgstr "打开(&O)\tEnter" +msgstr "打开(&P)\tEnter" #: programs/progman/progman.rc:35 programs/winefile/winefile.rc:30 msgid "&Move...\tF7" @@ -15347,6 +15347,51 @@ msgid "" " Modify the registry without prompting for confirmation.\n" "\n" msgstr "" +"REG ADD <项> [/v 值名称 | /ve] [/t 类型] [/s 分隔符] [/d 数据] [/f]\n" +"\n" +" 添加一个项到注册表，或添加一个新的值到所指定的注册表项。\n" +"\n" +" <项>\n" +" 要添加的注册表项，如果指定了 [/v] 或 [/ve] 选项，\n" +" 则新的注册表数据将被添加到该项。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 内置的注册表项。应为以下的其中一个:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 位于指定的 ROOT 下的注册表项完整路径。\n" +"\n" +" /v <值名称>\n" +" 所要添加的注册表值名称。\n" +"\n" +" /ve\n" +" 添加一个未指定名称的值。该选项将修改 (默认) 注册表值。\n" +"\n" +" /t <类型>\n" +" 所要添加到注册表的数据的类型。如果指定了 [/t] 选项，\n" +" <类型> 应为以下的其中一个:\n" +"\n" +" REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" +" REG_DWORD | REG_BINARY | REG_NONE\n" +"\n" +" 如果未指定 [/t] 选项，默认的数据类型是 REG_SZ。\n" +"\n" +" /s <分隔符>\n" +" 指定一个字符，用于分隔 REG_MULTI_SZ 数据中的字符串。\n" +" 如果 [/s] 选项未被指定，默认的分隔符是 \\0。\n" +"\n" +" /d <数据>\n" +" 所要添加到新建注册表值的数据。\n" +"\n" +" /f\n" +" 无需确认提示，修改注册表。\n" +"\n" #: programs/reg/reg.rc:202 msgid "" @@ -15382,6 +15427,35 @@ msgid "" "<key2>.\n" "\n" msgstr "" +"REG COPY <项1> <项2> [/s] [/f]\n" +"\n" +" 复制所指定的注册表项的内容到另外一个位置。\n" +" 默认情况下，该操作只复制注册表值。使用 [/s] 选项可以\n" +" 递归复制所有的子项和值。\n" +"\n" +" <项1>，<项2>\n" +" 用于指定源项 (<项1>) 和目标项 (<项2>)。\n" +" 如果 <项2> 不存在，它将会被创建。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 内置的注册表项。应为以下的其中一个:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 位于指定的 ROOT 下的注册表项完整路径。\n" +"\n" +" /s\n" +" 从 <项1> 复制所有的子项和值到 <项2>。\n" +"\n" +" /f\n" +" 无需确认提示，覆盖 <项2> 中所有的数据。\n" +" 该选项不会修改只存在于 <项2> 中的子项和值。\n" +"\n" #: programs/reg/reg.rc:92 msgid "" @@ -15421,6 +15495,39 @@ msgid "" " prompting for confirmation.\n" "\n" msgstr "" +"REG DELETE <项> [/v 值名称 | /ve | /va] [/f]\n" +"\n" +" 删除一个注册表项 (包括所有的子项和值)，或删除\n" +" 指定注册表项中的一个或多个注册表值。\n" +"\n" +" <项>\n" +" 所要删除的注册表项，如果指定了 [/v]，[/ve] 或 [/va] 选项的\n" +" 其中一个，则可删除注册表项内的一个或多个值。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 内置的注册表项。应为以下的其中一个:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 位于指定的 ROOT 下的注册表项完整路径。\n" +"\n" +" /v <值名称>\n" +" 所要删除的注册表值名称。\n" +"\n" +" /ve\n" +" 删除一个未指定名称的注册表值。该选项将删除 (默认) 注册表值。\n" +"\n" +" /va\n" +" 删除注册表项中所有的值。\n" +"\n" +" /f\n" +" 无需确认提示，删除注册表项 (包括所有的子项和值)。\n" +"\n" #: programs/reg/reg.rc:170 msgid "" @@ -15452,6 +15559,33 @@ msgid "" " Overwrite <file> without prompting for confirmation.\n" "\n" msgstr "" +"REG EXPORT <项> <文件> [/y]\n" +"\n" +" 导出所指定的注册表项 (包括所有的子项和值)\n" +" 到一个文件。\n" +"\n" +" <key>\n" +" 所要导出的注册表项。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 内置的注册表项。应为以下的其中一个:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 位于指定的 ROOT 下的注册表项完整路径。\n" +"\n" +" <文件>\n" +" 所要创建的注册表文件的名称和路径。\n" +" 该文件必须使用 .reg 扩展名。\n" +"\n" +" /y\n" +" 无需确认提示，覆盖 <文件>。\n" +"\n" #: programs/reg/reg.rc:148 msgid "" @@ -15505,6 +15639,36 @@ msgid "" " List all registry entries under <key> and its subkeys.\n" "\n" msgstr "" +"REG QUERY <项> [/v 值名称 | /ve] [/s]\n" +"\n" +" 查询所指定的注册表项，并列出该注册表项中所有的子项、值和数据。\n" +" 使用 [/s] 选项可以递归查询每一个子项。\n" +"\n" +" <key>\n" +" 所要查询的注册表项。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 内置的注册表项。应为以下的其中一个:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 位于指定的 ROOT 下的注册表项完整路径。\n" +"\n" +" /v <值名称>\n" +" 所要查询的注册表值名称，如果未指定 [/v] 或 [/ve] 选项，\n" +" <项1> 中所有的值都将被列出。\n" +"\n" +" /ve\n" +" 查询一个未指定名称的值。该选项将查询 (默认) 注册表值。\n" +"\n" +" /s\n" +" 列出 <项> 及其子项中的所有注册表项。\n" +"\n" #: programs/reg/reg.rc:180 msgid "" @@ -15699,7 +15863,7 @@ msgstr "展开" #: programs/regedit/regedit.rc:134 programs/regedit/regedit.rc:233 msgid "Modify &Binary Data..." -msgstr "修改二进制数据...(&B)" +msgstr "修改二进制数据(&B)..." #: programs/regedit/regedit.rc:267 msgid "Export registry" @@ -16782,7 +16946,7 @@ msgstr "映像名称(&I)" #: programs/taskmgr/taskmgr.rc:523 msgid "&PID (Process Identifier)" -msgstr "&PID (进程编号)" +msgstr "PID (进程编号)(&P)" #: programs/taskmgr/taskmgr.rc:525 msgid "&CPU Usage" @@ -16790,7 +16954,7 @@ msgstr "&CPU 负载率" #: programs/taskmgr/taskmgr.rc:527 msgid "CPU Tim&e" -msgstr "CPU 耗时(&T)" +msgstr "CPU 耗时(&E)" #: programs/taskmgr/taskmgr.rc:529 msgid "&Memory Usage" @@ -17372,7 +17536,7 @@ msgstr "允许窗口管理器控制窗口(&W)" #: programs/winecfg/winecfg.rc:172 msgid "&Emulate a virtual desktop" -msgstr "虚拟桌面(&D)" +msgstr "虚拟桌面(&E)" #: programs/winecfg/winecfg.rc:174 msgid "Desktop &size:" @@ -18004,7 +18168,7 @@ msgstr "按日期排序(&D)" #: programs/winefile/winefile.rc:59 msgid "Filter by&..." -msgstr "过滤标准&..." +msgstr "过滤标准(&.)..." #: programs/winefile/winefile.rc:66 msgid "&Drive Bar" @@ -18024,7 +18188,7 @@ msgstr "层叠\tCtrl+F5" #: programs/winefile/winefile.rc:77 msgid "Tile &Vertically\tCtrl+F4" -msgstr "垂直平铺(&)\tCtrl+F4" +msgstr "垂直平铺(&V)\tCtrl+F4" #: programs/winefile/winefile.rc:84 msgid "&About Wine File Manager" @@ -18273,7 +18437,7 @@ msgstr "如何使用帮助(&H)\tF1" #: programs/winhlp32/winhlp32.rc:59 msgid "&About Wine Help" -msgstr "关于 Wine 帮助(&I)" +msgstr "关于 Wine 帮助(&A)" #: programs/winhlp32/winhlp32.rc:67 msgid "Annotation..." @@ -18317,7 +18481,7 @@ msgstr "找不到文件“%s”。您想要自己找这个文件吗?" #: programs/winhlp32/winhlp32.rc:93 msgid "Cannot find a richedit implementation... Aborting" -msgstr "找不到 richedit 的实现……终止" +msgstr "找不到 richedit 的实现... 终止" #: programs/winhlp32/winhlp32.rc:94 msgid "Help topics: " @@ -18517,7 +18681,7 @@ msgstr "添加(&A)" #: programs/wordpad/wordpad.rc:259 msgid "Remove al&l" -msgstr "全部删除(&R)" +msgstr "全部删除(&L)" #: programs/wordpad/wordpad.rc:267 msgid "Line wrapping" -- 2.34.1

1 0