- wine-devel - winehq.org

[PATCH 1/4] urlmon/tests: Silence some debug traces.
by Jacek Caban 05 Jan '22

05 Jan '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/tests/protocol.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-)

2 1

[PATCH v2] urlmon: Always report available data before stop_binding.
by Rémi Bernon 05 Jan '22

05 Jan '22

The HTML launcher of several Rebellion games (all probably based on the same code) use a custom protocol handler which calls ReportResult in LockRequest, causing an invalid memory access when OnDataAvailable callback is called, as the binding has already been stopped and terminated. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46213 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52286 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Use an even more ad-hoc flag to detect LockRequest calls during ReportData. dlls/mshtml/tests/htmldoc.c | 18 +++++++++++++++++- dlls/urlmon/binding.c | 23 +++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 89311c5d8c8..f8df7d7736d 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -522,6 +522,8 @@ static const IDispatchVtbl ExternalVtbl = { static IDispatch External = { &ExternalVtbl }; +static IInternetProtocolSink *protocol_sink; + static HRESULT WINAPI Protocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IInternetProtocol, riid)) { @@ -556,6 +558,8 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, CHECK_EXPECT(Start); + protocol_sink = pOIProtSink; + ok(pOIProtSink != NULL, "pOIProtSink == NULL\n"); ok(pOIBindInfo != NULL, "pOIBindInfo == NULL\n"); ok(!grfPI, "grfPI = %x\n", grfPI); @@ -619,7 +623,9 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, ok(hres == S_OK, "ReportData failed: %08x\n", hres); hres = IInternetProtocolSink_ReportResult(pOIProtSink, S_OK, 0, NULL); - ok(hres == S_OK, "ReportResult failed: %08x\n", hres); + ok(hres == E_FAIL, "ReportResult failed: %08x\n", hres); + + protocol_sink = NULL; return S_OK; } @@ -689,7 +695,17 @@ static HRESULT WINAPI Protocol_Seek(IInternetProtocol *iface, static HRESULT WINAPI Protocol_LockRequest(IInternetProtocol *iface, DWORD dwOptions) { + HRESULT hres; + CHECK_EXPECT(LockRequest); + + if(protocol_sink) { + hres = IInternetProtocolSink_ReportResult(protocol_sink, S_OK, 0, NULL); + ok(hres == S_OK, "ReportResult failed: %08x\n", hres); + ok(!called_UnlockRequest, "unexpected UnlockRequest\n"); + ok(!called_Terminate, "unexpected Terminate\n"); + } + return S_OK; } diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index a74970033b3..56c479d6d2f 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -64,6 +64,8 @@ typedef enum { #define BINDING_STOPPED 0x0002 #define BINDING_OBJAVAIL 0x0004 #define BINDING_ABORTED 0x0008 +#define BINDING_LOCKING 0x0010 +#define BINDING_TERMINATE 0x0020 typedef struct { IBinding IBinding_iface; @@ -1126,7 +1128,9 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres HRESULT hres; if(!(This->state & BINDING_LOCKED)) { + This->state |= BINDING_LOCKING; hres = IInternetProtocolEx_LockRequest(&This->protocol->IInternetProtocolEx_iface, 0); + This->state &= ~BINDING_LOCKING; if(SUCCEEDED(hres)) This->state |= BINDING_LOCKED; } @@ -1142,6 +1146,13 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres hres = IBindStatusCallback_OnDataAvailable(This->callback, bscf, progress, &formatetc, &stgmed); + + if(This->state & BINDING_TERMINATE) { + stop_binding(This, This->hres, NULL); + IInternetProtocolEx_Terminate(&This->protocol->IInternetProtocolEx_iface, 0); + return; + } + if(hres != S_OK) { if(This->download_state != END_DOWNLOAD) { This->download_state = END_DOWNLOAD; @@ -1177,6 +1188,18 @@ static HRESULT WINAPI InternetProtocolSink_ReportResult(IInternetProtocolSink *i TRACE("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult)); + /* Make sure we don't call stop_binding before available data has been reported, + as some custom protocol handlers (in Zombie Army Trilogy launcher and similar) + call ReportResult within LockRequest, in report_data, before OnDataAvailable + has been called. Stopping or terminating the binding there causes an invalid + memory access later. + */ + if(This->state & BINDING_LOCKING) { + This->hres = hrResult; + This->state |= BINDING_TERMINATE; + return S_OK; + } + stop_binding(This, hrResult, szResult); IInternetProtocolEx_Terminate(&This->protocol->IInternetProtocolEx_iface, 0); -- 2.34.1

3 6

[PATCH 2/4] urlmon/tests: Remove unreliable test.
by Jacek Caban 05 Jan '22

05 Jan '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/tests/misc.c | 1 - 1 file changed, 1 deletion(-)

1 0

[PATCH] programs/cmd: detect badly quoted operand in 'if' statement
by Eric Pouech 05 Jan '22

05 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52345 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/cmd/builtins.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 6966a4229b3..60bf3194a15 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2713,6 +2713,12 @@ void WCMD_popd (void) { LocalFree (temp); } +/* check that operand is either unquoted, or with opening and ending quotes */ +static BOOL is_properly_quoted(const WCHAR* str) +{ + return str[0] != '"' || (str[1] && str[wcslen(str) - 1] == '"'); +} + /******************************************************************* * evaluate_if_comparison * @@ -2738,8 +2744,12 @@ static int evaluate_if_comparison(const WCHAR *leftOperand, const WCHAR *operato /* == is a special case, as it always compares strings */ if (!lstrcmpiW(operator, L"==")) + { + if (!is_properly_quoted(leftOperand) || !is_properly_quoted(rightOperand)) + return -1; return caseInsensitive ? lstrcmpiW(leftOperand, rightOperand) == 0 : lstrcmpW (leftOperand, rightOperand) == 0; + } /* Check if we have plain integers (in decimal, octal or hexadecimal notation) */ leftOperand_int = wcstol(leftOperand, &endptr_leftOp, 0);

1 0

[tools] testbot/SetwinLocale: Tweak the --country checks and conversion.
by Francois Gouget 05 Jan '22

05 Jan '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Fixed the authorship. testbot/bin/SetWinLocale | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index f76f59ab37..3a74406a49 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -397,19 +397,19 @@ if (!defined $Usage) $OptLocale ||= $OptDefault; $OptSystem ||= $OptDefault; $OptMUI ||= $OptDefault; - if (!defined $OptCountry and defined $OptDefault and - $OptDefault =~ /-([A-Z]{2})$/) + + if (!$OptCountry and ($OptDefault || "") =~ /-([A-Z]{2})$/) { $OptCountry = $1; } - if (defined $OptCountry) + if ($OptCountry) { - if (!exists $Countries{$OptCountry}) + $CountryId = $Countries{$OptCountry}; + if (!defined $CountryId) { Error("unknown country '$OptCountry'\n"); $Usage = 2; } - $CountryId = $Countries{$OptCountry}; } if (!$OptLocale and !$OptSystem and !$OptMUI and !$OptKeyboard and -- 2.30.2

1 0

[tools v2] testbot/SetWinLocale: Fix the usage message and add Powershell information.
by Francois Gouget 05 Jan '22

05 Jan '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Fixed authorship. testbot/bin/SetWinLocale | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index ca02cfa270..f76f59ab37 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -432,41 +432,46 @@ if (defined $Usage) Error("try '$name0 --help' for more information\n"); exit $Usage; } - print "or $name0 [options] --show HOSTNAME\n"; - print "or $name0 [options] [--default LOC] [--locale USR] [--system SYS] [--mui MUI] [--keyboard KBD] [--country CTY] HOSTNAME\n"; + print "Usage: $name0 [options] --show HOSTNAME\n"; + print "or $name0 [options] [--default DEF] [--locale LOC] [--system SYS] [--mui MUI] [--keyboard KBD] [--country CTY] HOSTNAME\n"; print "\n"; print "Sets the locale of the specified Windows machine.\n"; print "\n"; print "Where:\n"; print " HOSTNAME Work on the specified Windows host (must be running TestAgentd).\n"; print " --show Show the locale settings of the specified host and exit.\n"; - print " --default LOC Use this Windows locale as the default for the other options.\n"; + print " --default DEF Use this Windows locale as the default for the other options.\n"; print " The locale must be in a form suitable for Windows' intl.cpl\n"; print " control panel module, that is roughly ll-CC where ll is an\n"; print " ISO 639-1 language code and CC an ISO 3166-1 alpha-2 country\n"; print " code.\n"; - print " --locale USR Specifies the user formats (see --defaults).\n"; + print " --locale LOC Specifies the user formats (see --defaults).\n"; print " . Windows 10 GUI: Time & language -> Region -> Regional\n"; print " format.\n"; print " . APIs: GetUserDefaultLCID(), GetThreadLocale().\n"; + print " . Powershell: Set-Culture LOC\n"; print " --system SYS Specifies the system locale (see --defaults).\n"; print " . Only takes effect after a reboot.\n"; print " . Windows 10 GUI: Time & language -> Language ->\n"; print " Administrative Language Settings -> Change system locale.\n"; print " . APIs: GetSystemDefaultLCID().\n"; + print " . Powershell: Set-WinSystemLocale -SystemLocale SYS\n"; print " --mui MUI Specifies the display language (see --defaults).\n"; print " . Only takes effect after a log out + log in.\n"; print " . Windows 10 GUI: Time & language -> Language -> Windows\n"; print " display language.\n"; print " . APIs: GetSystemPreferredUILanguages(),\n"; print " GetUserDefaultUILanguage(), GetThreadUILanguage().\n"; + print " . Powershell: Set-WinUILanguageOverride -Language MUI\n"; print " --keyboard KBD Specifies the keyboard layout (see --defaults).\n"; print " . Windows 10 GUI: Time & language -> Language -> Keyboard ->\n"; print " Override for default input method.\n"; + print " . Powershell: Set-WinDefaultInputMethodOverride -InputTip KBD-ID\n"; print " --country CTY Specifies the location using only the country part of the\n"; print " Windows locale (see --defaults).\n"; print " . Windows 10 GUI: Time & language -> Region -> Country.\n"; print " . APIs: GetUserGeoID().\n"; + print " . Powershell: Set-WinHomeLocation -GeoId CTY-ID\n"; print " --no-reboot Do not reboot Windows. Some locale changes will only take\n"; print " effect after the next reboot.\n"; print " --debug Show more detailed information about progress.\n"; -- 2.30.2

1 0

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

05 Jan '22

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 05 Jan '22

05 Jan '22

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 05 Jan '22

05 Jan '22

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 05 Jan '22

05 Jan '22

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 05 Jan '22

05 Jan '22

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 05 Jan '22

05 Jan '22

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 05 Jan '22

05 Jan '22

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 05 Jan '22

05 Jan '22

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 05 Jan '22

05 Jan '22

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 05 Jan '22

05 Jan '22

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

[PATCH] kernel32/tests: Drop change test workarounds for Windows <= 2000
by Alex Henrie 05 Jan '22

05 Jan '22

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Dropping support for very old Windows versions allows us to enable the test for FindFirstChangeNotificationA with a null path. --- dlls/kernel32/tests/change.c | 154 ++++++++++------------------------- 1 file changed, 44 insertions(+), 110 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 254faf9c2a1..c0fcf00ba68 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -99,16 +99,14 @@ static void test_FindFirstChangeNotification(void) change = FindFirstChangeNotificationA("not-a-file", FALSE, FILE_NOTIFY_CHANGE_FILE_NAME); ok(change == INVALID_HANDLE_VALUE, "Expected INVALID_HANDLE_VALUE, got %p\n", change); - ok(GetLastError() == ERROR_FILE_NOT_FOUND || - GetLastError() == ERROR_NO_MORE_FILES, /* win95 */ + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "FindFirstChangeNotification error: %d\n", GetLastError()); - if (0) /* This documents win2k behavior. It crashes on win98. */ - { - change = FindFirstChangeNotificationA(NULL, FALSE, FILE_NOTIFY_CHANGE_FILE_NAME); - ok(change == NULL && GetLastError() == ERROR_PATH_NOT_FOUND, - "FindFirstChangeNotification error: %d\n", GetLastError()); - } + change = FindFirstChangeNotificationA(NULL, FALSE, FILE_NOTIFY_CHANGE_FILE_NAME); + ok(change == INVALID_HANDLE_VALUE || broken(change == NULL) /* < win7 */, + "Expected INVALID_HANDLE_VALUE, got %p\n", change); + ok(GetLastError() == ERROR_PATH_NOT_FOUND, + "FindFirstChangeNotification error: %u\n", GetLastError()); ret = FindNextChangeNotification(NULL); ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "FindNextChangeNotification error: %d\n", @@ -137,10 +135,10 @@ static void test_FindFirstChangeNotification(void) ret = CloseHandle(file); ok( ret, "CloseHandle error: %d\n", GetLastError()); - /* Try to register notification for a file. win98 and win2k behave differently here */ + /* Try to register notification for a file */ change = FindFirstChangeNotificationA(filename1, FALSE, FILE_NOTIFY_CHANGE_FILE_NAME); - ok(change == INVALID_HANDLE_VALUE && (GetLastError() == ERROR_DIRECTORY || - GetLastError() == ERROR_FILE_NOT_FOUND), + ok(change == INVALID_HANDLE_VALUE, "Expected INVALID_HANDLE_VALUE, got %p\n", change); + ok(GetLastError() == ERROR_DIRECTORY, "FindFirstChangeNotification error: %d\n", GetLastError()); lstrcpyA(dirname1, filename1); @@ -156,15 +154,14 @@ static void test_FindFirstChangeNotification(void) thread = StartNotificationThread(dirname1, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME); ret = MoveFileA(dirname1, dirname2); ok(ret, "MoveFileA error: %d\n", GetLastError()); - /* win9x and win2k behave differently here, don't check result */ - FinishNotificationThread(thread); + ok(!FinishNotificationThread(thread), "Got notification\n"); /* What if we remove the directory we registered notification for? */ thread = StartNotificationThread(dirname2, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME); ret = RemoveDirectoryA(dirname2); ok(ret, "RemoveDirectoryA error: %d\n", GetLastError()); - /* win9x and win2k behave differently here, don't check result */ - FinishNotificationThread(thread); + ret = FinishNotificationThread(thread); + todo_wine ok(ret, "Missed notification\n"); /* functional checks */ @@ -263,16 +260,8 @@ static void test_ffcn(void) static const WCHAR szHoo[] = { '\\','h','o','o',0 }; static const WCHAR szZoo[] = { '\\','z','o','o',0 }; - SetLastError(0xdeadbeef); r = GetTempPathW( MAX_PATH, path ); - if (!r && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) - { - win_skip("GetTempPathW is not implemented\n"); - return; - } ok( r != 0, "temp path failed\n"); - if (!r) - return; lstrcatW( path, szBoo ); lstrcpyW( subdir, path ); @@ -407,9 +396,6 @@ static void test_ffcnMultipleThreads(void) ok( r == TRUE, "failed to remove dir\n"); } -static BOOL (WINAPI *pReadDirectoryChangesW)(HANDLE,LPVOID,DWORD,BOOL,DWORD, - LPDWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); - static void test_readdirectorychanges(void) { HANDLE hdir; @@ -423,22 +409,8 @@ static void test_readdirectorychanges(void) PFILE_NOTIFY_INFORMATION pfni; BOOL got_subdir_change = FALSE; - if (!pReadDirectoryChangesW) - { - win_skip("ReadDirectoryChangesW is not available\n"); - return; - } - - SetLastError(0xdeadbeef); r = GetTempPathW( MAX_PATH, path ); - if (!r && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) - { - win_skip("GetTempPathW is not implemented\n"); - return; - } ok( r != 0, "temp path failed\n"); - if (!r) - return; lstrcatW( path, szBoo ); lstrcpyW( subdir, path ); @@ -455,7 +427,7 @@ static void test_readdirectorychanges(void) ok( r == TRUE, "failed to create directory\n"); SetLastError(0xd0b00b00); - r = pReadDirectoryChangesW(NULL,NULL,0,FALSE,0,NULL,NULL,NULL); + r = ReadDirectoryChangesW(NULL,NULL,0,FALSE,0,NULL,NULL,NULL); ok(GetLastError()==ERROR_INVALID_PARAMETER,"last error wrong\n"); ok(r==FALSE, "should return false\n"); @@ -468,12 +440,12 @@ static void test_readdirectorychanges(void) ov.hEvent = CreateEventW( NULL, 1, 0, NULL ); SetLastError(0xd0b00b00); - r = pReadDirectoryChangesW(hdir,NULL,0,FALSE,0,NULL,NULL,NULL); + r = ReadDirectoryChangesW(hdir,NULL,0,FALSE,0,NULL,NULL,NULL); ok(GetLastError()==ERROR_INVALID_PARAMETER,"last error wrong\n"); ok(r==FALSE, "should return false\n"); SetLastError(0xd0b00b00); - r = pReadDirectoryChangesW(hdir,NULL,0,FALSE,0,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,NULL,0,FALSE,0,NULL,&ov,NULL); ok(GetLastError()==ERROR_INVALID_PARAMETER,"last error wrong\n"); ok(r==FALSE, "should return false\n"); @@ -491,15 +463,15 @@ static void test_readdirectorychanges(void) ov.InternalHigh = 0; memset( buffer, 0, sizeof buffer ); - r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,-1,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,-1,NULL,&ov,NULL); ok(GetLastError()==ERROR_INVALID_PARAMETER,"last error wrong\n"); ok(r==FALSE, "should return false\n"); - r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,0,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,0,NULL,&ov,NULL); ok(GetLastError()==ERROR_INVALID_PARAMETER,"last error wrong\n"); ok(r==FALSE, "should return false\n"); - r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,TRUE,filter,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,buffer,sizeof buffer,TRUE,filter,NULL,&ov,NULL); ok(r==TRUE, "should return true\n"); r = WaitForSingleObject( ov.hEvent, 10 ); @@ -522,11 +494,11 @@ static void test_readdirectorychanges(void) ResetEvent(ov.hEvent); SetLastError(0xd0b00b00); - r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,0,NULL,NULL,NULL); + r = ReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,0,NULL,NULL,NULL); ok(GetLastError()==ERROR_INVALID_PARAMETER,"last error wrong\n"); ok(r==FALSE, "should return false\n"); - r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,0,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,0,NULL,&ov,NULL); ok(GetLastError()==ERROR_INVALID_PARAMETER,"last error wrong\n"); ok(r==FALSE, "should return false\n"); @@ -538,7 +510,7 @@ static void test_readdirectorychanges(void) S(U(ov)).Offset = 0; S(U(ov)).OffsetHigh = 0; memset( buffer, 0, sizeof buffer ); - r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); ok(r==TRUE, "should return true\n"); ok( (NTSTATUS)ov.Internal == STATUS_PENDING, "ov.Internal wrong\n"); @@ -570,7 +542,7 @@ static void test_readdirectorychanges(void) ok( !memcmp(pfni->FileName,&szHoo[1],6), "name wrong\n" ); /* what happens if the buffer is too small? */ - r = pReadDirectoryChangesW(hdir,buffer,0x10,FALSE,filter,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,buffer,0x10,FALSE,filter,NULL,&ov,NULL); ok(r==TRUE, "should return true\n"); r = CreateDirectoryW( subdir, NULL ); @@ -583,7 +555,7 @@ static void test_readdirectorychanges(void) ok( ov.InternalHigh == 0, "ov.InternalHigh wrong\n"); /* test the recursive watch */ - r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); ok(r==TRUE, "should return true\n"); r = CreateDirectoryW( subsubdir, NULL ); @@ -619,7 +591,7 @@ static void test_readdirectorychanges(void) if (got_subdir_change) break; - r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); ok(r==TRUE, "should return true\n"); } ok(got_subdir_change, "didn't get subdir change\n"); @@ -629,7 +601,7 @@ static void test_readdirectorychanges(void) ov.Internal = 1; ov.InternalHigh = 1; - r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); ok(r==TRUE, "should return true\n"); r = RemoveDirectoryW( subdir ); @@ -674,21 +646,8 @@ static void test_readdirectorychanges_null(void) static const WCHAR szHoo[] = { '\\','h','o','o',0 }; PFILE_NOTIFY_INFORMATION pfni; - if (!pReadDirectoryChangesW) - { - win_skip("ReadDirectoryChangesW is not available\n"); - return; - } - SetLastError(0xdeadbeef); r = GetTempPathW( MAX_PATH, path ); - if (!r && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) - { - win_skip("GetTempPathW is not implemented\n"); - return; - } ok( r != 0, "temp path failed\n"); - if (!r) - return; lstrcatW( path, szBoo ); lstrcpyW( subdir, path ); @@ -716,7 +675,7 @@ static void test_readdirectorychanges_null(void) ov.InternalHigh = 0; memset( buffer, 0, sizeof buffer ); - r = pReadDirectoryChangesW(hdir,NULL,0,FALSE,filter,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,NULL,0,FALSE,filter,NULL,&ov,NULL); ok(r==TRUE, "should return true\n"); r = WaitForSingleObject( ov.hEvent, 0 ); @@ -737,7 +696,7 @@ static void test_readdirectorychanges_null(void) S(U(ov)).OffsetHigh = 0; memset( buffer, 0, sizeof buffer ); - r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); ok(r==TRUE, "should return true\n"); r = WaitForSingleObject( ov.hEvent, 0 ); @@ -774,16 +733,8 @@ static void test_readdirectorychanges_filedir(void) static const WCHAR szFoo[] = { '\\','f','o','o',0 }; PFILE_NOTIFY_INFORMATION pfni; - SetLastError(0xdeadbeef); r = GetTempPathW( MAX_PATH, path ); - if (!r && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) - { - win_skip("GetTempPathW is not implemented\n"); - return; - } ok( r != 0, "temp path failed\n"); - if (!r) - return; lstrcatW( path, szBoo ); lstrcpyW( subdir, path ); @@ -809,7 +760,7 @@ static void test_readdirectorychanges_filedir(void) filter = FILE_NOTIFY_CHANGE_FILE_NAME; - r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,TRUE,filter,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,buffer,sizeof buffer,TRUE,filter,NULL,&ov,NULL); ok(r==TRUE, "should return true\n"); r = WaitForSingleObject( ov.hEvent, 10 ); @@ -865,22 +816,8 @@ static void test_readdirectorychanges_cr(void) HANDLE hdir, hfile; NTSTATUS r; - if (!pReadDirectoryChangesW) - { - win_skip("ReadDirectoryChangesW is not available\n"); - return; - } - - SetLastError(0xdeadbeef); r = GetTempPathW(MAX_PATH, path); - if (!r && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) - { - win_skip("GetTempPathW is not implemented\n"); - return; - } ok(r != 0, "temp path failed\n"); - if (!r) - return; lstrcatW(path, szBoo); lstrcpyW(dir, path); @@ -905,9 +842,9 @@ static void test_readdirectorychanges_cr(void) memset(&ov, 0, sizeof(ov)); ov.hEvent = (void*)0xdeadbeef; - r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, + r = ReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ov, readdirectorychanges_cr); - ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + ok(r == TRUE, "ReadDirectoryChangesW failed\n"); hfile = CreateFileW(file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(hfile != INVALID_HANDLE_VALUE, "failed to create file\n"); @@ -922,9 +859,9 @@ static void test_readdirectorychanges_cr(void) ok(!memcmp(fni->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), "FileName = %s\n", wine_dbgstr_wn(fni->FileName, fni->FileNameLength/sizeof(WCHAR))); - r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, + r = ReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ov, readdirectorychanges_cr); - ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + ok(r == TRUE, "ReadDirectoryChangesW failed\n"); /* This event will not be reported */ r = CreateDirectoryW(dir, NULL); @@ -942,9 +879,9 @@ static void test_readdirectorychanges_cr(void) ok(!memcmp(fni->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), "FileName = %s\n", wine_dbgstr_wn(fni->FileName, fni->FileNameLength/sizeof(WCHAR))); - r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, + r = ReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ov, readdirectorychanges_cr); - ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + ok(r == TRUE, "ReadDirectoryChangesW failed\n"); r = MoveFileW(sub_file, file); ok(r == TRUE, "failed to move file\n"); @@ -958,9 +895,9 @@ static void test_readdirectorychanges_cr(void) ok(!memcmp(fni->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), "FileName = %s\n", wine_dbgstr_wn(fni->FileName, fni->FileNameLength/sizeof(WCHAR))); - r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, + r = ReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ov, readdirectorychanges_cr); - ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + ok(r == TRUE, "ReadDirectoryChangesW failed\n"); r = DeleteFileW(file); ok(r == TRUE, "failed to delete file\n"); @@ -981,9 +918,9 @@ static void test_readdirectorychanges_cr(void) FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, NULL); ok(hdir != INVALID_HANDLE_VALUE, "failed to open directory\n"); - r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, + r = ReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, FILE_NOTIFY_CHANGE_DIR_NAME, NULL, &ov, readdirectorychanges_cr); - ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + ok(r == TRUE, "ReadDirectoryChangesW failed\n"); r = MoveFileW(dir, file); ok(r == TRUE, "failed to move directory\n"); @@ -1012,9 +949,9 @@ static void test_readdirectorychanges_cr(void) if (fni->NextEntryOffset == 0) { - r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, + r = ReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, FILE_NOTIFY_CHANGE_DIR_NAME, NULL, &ov, readdirectorychanges_cr); - ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + ok(r == TRUE, "ReadDirectoryChangesW failed\n"); r = SleepEx(1000, TRUE); ok(r != 0, "failed to receive directory move event\n"); @@ -1027,9 +964,9 @@ static void test_readdirectorychanges_cr(void) r = RemoveDirectoryW(dir); ok(r == TRUE, "failed to remove directory\n"); - r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, + r = ReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, FILE_NOTIFY_CHANGE_DIR_NAME, NULL, &ov, readdirectorychanges_cr); - ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + ok(r == TRUE, "ReadDirectoryChangesW failed\n"); r = SleepEx(1000, TRUE); ok(r != 0, "failed to receive directory creation event\n"); @@ -1042,9 +979,9 @@ static void test_readdirectorychanges_cr(void) fni_next = (FILE_NOTIFY_INFORMATION*)((char*)fni+fni->NextEntryOffset); else { - r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, + r = ReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, FILE_NOTIFY_CHANGE_DIR_NAME, NULL, &ov, readdirectorychanges_cr); - ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + ok(r == TRUE, "ReadDirectoryChangesW failed\n"); r = SleepEx(1000, TRUE); ok(r != 0, "failed to receive directory removal event\n"); @@ -1150,9 +1087,6 @@ static void test_ffcn_directory_overlap(void) START_TEST(change) { - HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); - pReadDirectoryChangesW = (void *)GetProcAddress(hkernel32, "ReadDirectoryChangesW"); - test_ffcnMultipleThreads(); /* The above function runs a test that must occur before FindCloseChangeNotification is run in the current thread to preserve the emptiness of the wine user APC queue. To ensure this it should be -- 2.34.1

1 0

[PATCH] comctl32/tests: Drop tooltips test workarounds for Windows <= 2000
by Alex Henrie 05 Jan '22

05 Jan '22

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Dropping support for very old Windows versions allows us to enable the test for TTM_GETTEXTW with a null handle. --- dlls/comctl32/tests/tooltips.c | 35 +++++++++++----------------------- 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 639d51f7c28..4483e6f3fa3 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -55,8 +55,7 @@ static void test_create_tooltip(BOOL is_v6) style = GetWindowLongA(hwnd, GWL_STYLE); exp_style = 0x7fffffff | WS_POPUP; exp_style &= ~(WS_CHILD | WS_MAXIMIZE | WS_BORDER | WS_DLGFRAME); - ok(style == exp_style || broken(style == (exp_style | WS_BORDER)), /* nt4 */ - "wrong style %08x/%08x\n", style, exp_style); + ok(style == exp_style, "wrong style %08x/%08x\n", style, exp_style); DestroyWindow(hwnd); @@ -243,8 +242,7 @@ static void test_customdraw(void) { if (CD_Stages) { /* Check CustomDraw results */ - ok(CD_Stages == expectedResults[iterationNumber].ExpectedCalls || - broken(CD_Stages == (expectedResults[iterationNumber].ExpectedCalls & ~TEST_CDDS_POSTPAINT)), /* nt4 */ + ok(CD_Stages == expectedResults[iterationNumber].ExpectedCalls, "%d: CustomDraw stages %x, expected %x\n", iterationNumber, CD_Stages, expectedResults[iterationNumber].ExpectedCalls); } @@ -503,14 +501,11 @@ todo_wine todo_wine ok(!r, "Adding the tool to the tooltip succeeded!\n"); - if (0) /* crashes on NT4 */ - { - toolinfoW.hwnd = NULL; - toolinfoW.uId = 0x1234ABCD; - toolinfoW.lpszText = bufW; - SendMessageW(hwnd, TTM_GETTEXTW, 0, (LPARAM)&toolinfoW); - ok(toolinfoW.lpszText[0] == 0, "lpszText should be an empty string\n"); - } + toolinfoW.hwnd = NULL; + toolinfoW.uId = 0x1234ABCD; + toolinfoW.lpszText = bufW; + SendMessageW(hwnd, TTM_GETTEXTW, 0, (LPARAM)&toolinfoW); + ok(toolinfoW.lpszText[0] == 0, "lpszText should be an empty string\n"); /* text with embedded tabs */ toolinfoA.cbSize = sizeof(TTTOOLINFOA); @@ -571,9 +566,7 @@ static void test_ttm_gettoolinfo(void) ti.lParam = 0xaaaaaaaa; r = SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&ti); ok(r, "Getting tooltip info failed\n"); - ok(0x1abe11ed == ti.lParam || - broken(0x1abe11ed != ti.lParam), /* comctl32 < 5.81 */ - "Expected 0x1abe11ed, got %lx\n", ti.lParam); + ok(0x1abe11ed == ti.lParam, "Expected 0x1abe11ed, got %lx\n", ti.lParam); tiW.cbSize = TTTOOLINFOW_V2_SIZE; tiW.hwnd = NULL; @@ -582,9 +575,7 @@ static void test_ttm_gettoolinfo(void) tiW.lpszText = NULL; r = SendMessageA(hwnd, TTM_GETTOOLINFOW, 0, (LPARAM)&tiW); ok(r, "Getting tooltip info failed\n"); - ok(0x1abe11ed == tiW.lParam || - broken(0x1abe11ed != tiW.lParam), /* comctl32 < 5.81 */ - "Expected 0x1abe11ed, got %lx\n", tiW.lParam); + ok(0x1abe11ed == tiW.lParam, "Expected 0x1abe11ed, got %lx\n", tiW.lParam); ti.cbSize = TTTOOLINFOA_V2_SIZE; ti.uId = 0x1234ABCD; @@ -595,9 +586,7 @@ static void test_ttm_gettoolinfo(void) ti.lParam = 0xdeadbeef; r = SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&ti); ok(r, "Getting tooltip info failed\n"); - ok(0x55555555 == ti.lParam || - broken(0x55555555 != ti.lParam), /* comctl32 < 5.81 */ - "Expected 0x55555555, got %lx\n", ti.lParam); + ok(0x55555555 == ti.lParam, "Expected 0x55555555, got %lx\n", ti.lParam); DestroyWindow(hwnd); @@ -854,9 +843,7 @@ static void test_longtextW(void) toolinfoW.lpszText = bufW; SendMessageW(hwnd, TTM_GETTEXTW, 0, (LPARAM)&toolinfoW); textlen = lstrlenW(toolinfoW.lpszText); - ok(textlen == lenW || - broken(textlen == 0 && toolinfoW.lpszText == NULL), /* nt4, kb186177 */ - "lpszText has %d chars\n", textlen); + ok(textlen == lenW, "lpszText has %d chars\n", textlen); } DestroyWindow(hwnd); -- 2.34.1

1 0

RFC: Rework of wined3d cs fencing
by Stefan Dösinger 05 Jan '22

05 Jan '22

Hi, Before the holidays I spent some time optimizing the cs resource fencing code. The current state is attached for review. I'll send it for upstreaming after the code freeze. The basic idea is to use the default queue head and tail for fencing. This completely removes any work on the command stream thread side, and the main thread work goes from an interlocked op to a simple assignment. Together with the technically unrelated patch 4 it improves a microbenchmark I wrote for this (https://github.com/stefand/perftest/tree/main/resource_tracking_d3d11) from ~200 fps to ~700 fps on my Ryzen CPU. Other CPUs have lower gains, but still more than double the framerate. It also produces a measurable improvement in Rocket League once other known CS issues are hacked away. Items for discussion: 1) I am not entirely sure I do the ULONG / LONG handling correctly. I guess we could get away with just keeping everything as signed LONGs, but technically signed int overflow is undefined behavior. Interlocked ops accept LONG * though... 2) resource_acquire could be renamed to something else 3) Separate read and write timestamps. This should be easy to add on top of the current code. 4) Traversing resource->device->cs->queue in wined3d_resource_acquire is ugly. I'm contemplating passing const struct wined3d_cs or the timestamp to it explicitly. 5) We still iterate over a huge number of resources. Does anyone have ideas how to cut this down? Happy new Year, Stefan

2 2

[PATCH] mshtml: Remove duplicate check in get_top_window.
by Jacek Caban 04 Jan '22

04 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49174 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlwindow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] winegcc: Use libgcc on Cygwin target.
by Jacek Caban 04 Jan '22

04 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52328 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)

1 0

[PATCH v2 1/2] ws2_32/tests: Add a test for simultaneous WSARecv().
by Jinoh Kang 04 Jan '22

04 Jan '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Supersedes #222872. dlls/ws2_32/tests/sock.c | 56 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d4585c2b1dc..d3d58fc946f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -11451,6 +11451,61 @@ static void test_nonblocking_async_recv(void) CloseHandle(overlapped.hEvent); } +static void test_simultaneous_async_recv(void) +{ + SOCKET client, server; + OVERLAPPED overlappeds[2] = {{0}}; + HANDLE events[2]; + WSABUF wsabufs[2]; + DWORD flags[2] = {0}; + size_t num_io = 2, stride = 16, i; + char resbuf[32] = ""; + static const char msgstr[32] = "-- Lorem ipsum dolor sit amet -"; + int ret; + + for (i = 0; i < num_io; i++) events[i] = CreateEventW(NULL, TRUE, FALSE, NULL); + + tcp_socketpair(&client, &server); + + for (i = 0; i < num_io; i++) + { + wsabufs[i].buf = resbuf + i * stride; + wsabufs[i].len = stride; + overlappeds[i].hEvent = events[i]; + ret = WSARecv(client, &wsabufs[i], 1, NULL, &flags[i], &overlappeds[i], NULL); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + } + + ret = send(server, msgstr, sizeof(msgstr), 0); + ok(ret == sizeof(msgstr), "got %d\n", ret); + + for (i = 0; i < num_io; i++) + { + const void *expect = msgstr + i * stride; + const void *actual = resbuf + i * stride; + DWORD size; + + ret = WaitForSingleObject(events[i], 1000); + todo_wine_if(i > 0) + ok(!ret, "wait timed out\n"); + + size = 0; + ret = GetOverlappedResult((HANDLE)client, &overlappeds[i], &size, FALSE); + todo_wine_if(i > 0) + ok(ret, "got error %u\n", GetLastError()); + todo_wine_if(i > 0) + ok(size == stride, "got size %u\n", size); + todo_wine_if(i > 0) + ok(!memcmp(expect, actual, stride), "expected %s, got %s\n", debugstr_an(expect, stride), debugstr_an(actual, stride)); + } + + closesocket(client); + closesocket(server); + + for (i = 0; i < num_io; i++) CloseHandle(events[i]); +} + static void test_empty_recv(void) { OVERLAPPED overlapped = {0}; @@ -12009,6 +12064,7 @@ START_TEST( sock ) test_connecting_socket(); test_WSAGetOverlappedResult(); test_nonblocking_async_recv(); + test_simultaneous_async_recv(); test_empty_recv(); test_timeout(); -- 2.31.1

3 4

[PATCH 1/3] po: fixed typos in French translation
by Eric Pouech 04 Jan '22

04 Jan '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- po/fr.po | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/po/fr.po b/po/fr.po index 261ec742166..eb34ca3ac83 100644 --- a/po/fr.po +++ b/po/fr.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 13:08+0100\n" +"PO-Revision-Date: 2022-01-04 15:28+0100\n" "Last-Translator: Eric Pouech <eric.pouech(a)gmail.com>\n" "Language-Team: French\n" "Language: fr\n" @@ -520,7 +520,7 @@ msgstr "Cacher les détails" #: dlls/comctl32/comctl32.rc:63 msgid "See details" -msgstr "Void les détails" +msgstr "Voir les détails" #: dlls/comctl32/comctl32.rc:31 dlls/cryptui/cryptui.rc:235 #: programs/regedit/regedit.rc:286 programs/taskmgr/taskmgr.rc:434 @@ -1617,7 +1617,7 @@ msgstr "Mise à jour de Windows" #: dlls/crypt32/crypt32.rc:89 msgid "Enrollment Name Value Pair" -msgstr "Paire nom/value d'enrôlement" +msgstr "Paire nom/valeur d'enrôlement" #: dlls/crypt32/crypt32.rc:90 msgid "OS Version" @@ -3809,7 +3809,7 @@ msgstr "Indice hors limites" #: dlls/jscript/jscript.rc:31 msgid "Out of stack space" -msgstr "Dépassement de capacité de pile :" +msgstr "Dépassement de capacité de pile" #: dlls/jscript/jscript.rc:32 msgid "Object required" @@ -6621,7 +6621,7 @@ msgstr "Fichier de table de conversion de caractères trop petit.\n" #: dlls/kernel32/winerror.mc:3293 msgid "Null context handle.\n" -msgstr "Descripteur de contexte null.\n" +msgstr "Descripteur de contexte nul.\n" #: dlls/kernel32/winerror.mc:3298 msgid "Context handle damaged.\n" @@ -6637,7 +6637,7 @@ msgstr "Impossible d'obtenir le descripteur d'appel.\n" #: dlls/kernel32/winerror.mc:3313 msgid "Null reference pointer.\n" -msgstr "Pointeur de référence null.\n" +msgstr "Pointeur de référence nul.\n" #: dlls/kernel32/winerror.mc:3318 msgid "Enumeration value out of range.\n" @@ -7542,7 +7542,7 @@ msgstr "Le récepteur n'a pas été finalisé.\n" #: dlls/mferror/mferror.mc:732 msgid "Clock was stopped\n" -msgstr "L'horloge a été arrếtée\n" +msgstr "L'horloge a été arrêtée\n" #: dlls/mferror/mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7892,7 +7892,7 @@ msgstr "Le récepteur n'a pas reçu les en-têtes attendues.\n" #: dlls/mferror/mferror.mc:627 msgid "Optional node is invalid.\n" -msgstr "Le noeud optionnel n'est pas valide.\n" +msgstr "Le nœud optionnel n'est pas valide.\n" #: dlls/mferror/mferror.mc:634 msgid "Cannot find decryptor.\n" @@ -7904,7 +7904,7 @@ msgstr "Le Codec n'a pas été trouvé.\n" #: dlls/mferror/mferror.mc:648 msgid "Cannot connect topology nodes.\n" -msgstr "Impossible de connecter les noeuds de la topologie.\n" +msgstr "Impossible de connecter les nœuds de la topologie.\n" #: dlls/mferror/mferror.mc:655 msgid "Topology request is not supported.\n" @@ -8305,7 +8305,7 @@ msgstr "Suppression des composants ODBC" #: dlls/msi/msi.rc:135 msgid "Removing system registry values" -msgstr "Suppression des valeurs dans le regitre système" +msgstr "Suppression des valeurs dans le registre système" #: dlls/msi/msi.rc:136 msgid "Removing shortcuts" @@ -8527,7 +8527,7 @@ msgid "" msgstr "" "L'installeur a rencontré une erreur inattendue en installant ce paquet. Ceci " "peut provenir d'un problème avec ce paquet. Le code d'erreur est [1]. {{Les " -"arguements sont : [2], [3], [4]}}" +"arguments sont : [2], [3], [4]}}" #: dlls/msi/msi.rc:77 msgid "{{Disk full: }}" @@ -8535,7 +8535,7 @@ msgstr "{{Disque plein: }}" #: dlls/msi/msi.rc:78 msgid "Action [Time]: [1]. [2]" -msgstr "Action [Tempts] : [1]. [2]" +msgstr "Action [Temps] : [1]. [2]" #: dlls/msi/msi.rc:79 msgid "Message type: [1], Argument: [2]{, [3]}" @@ -12939,7 +12939,7 @@ msgid "" "No wave device that can play files in the current format is installed. Use " "the Drivers option to install the wave device." msgstr "" -"Aucun périphérique audio capable de jouer des fichiers dans le formaten " +"Aucun périphérique audio capable de jouer des fichiers dans le format en " "cours n'est présent. Utiliser l'option pour installer des périphériques " "audio." @@ -15658,7 +15658,7 @@ msgstr "reg : L'opération s'est terminée avec succès\n" #: programs/reg/reg.rc:131 msgid "reg: The registry operation was cancelled\n" -msgstr "reg : L'operation sur le registre a été annulée\n" +msgstr "reg : L'opération sur le registre a été annulée\n" #: programs/reg/reg.rc:174 msgid "reg: Unable to find the specified registry key\n" @@ -17941,7 +17941,7 @@ msgstr "Visionneuse de fichiers Metafile réguliers" #: programs/view/view.rc:50 msgid "Metafiles (*.wmf, *.emf)" -msgstr "Métafichiers (*.wmf, *.emf)" +msgstr "Méta-fichiers (*.wmf, *.emf)" #: programs/wineboot/wineboot.rc:31 msgid "Waiting for Program" @@ -18101,7 +18101,7 @@ msgstr "&native (Windows)" #: programs/winecfg/winecfg.rc:210 msgid "Buil&tin then Native" -msgstr "I&ntégrée puis Native." +msgstr "I&ntégrée puis Native" #: programs/winecfg/winecfg.rc:211 msgid "Nati&ve then Builtin"

2 3

[PATCH 1/2] urlmon: Set BINDING_LOCKED flag before calling LockRequest.
by Rémi Bernon 04 Jan '22

04 Jan '22

And clear it if the call failed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46213 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52286 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I tried to keep the changes as simple as possible for the code freeze, but overall the call sequence doesn't look completely right compared to native, although it may not matter too much. The patches are fixing a regression with several launchers, and as they are quite ad-hoc, hopefully they will not have any impact on anything else... dlls/urlmon/binding.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index a74970033b3..b7bea04c4d1 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1126,9 +1126,10 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres HRESULT hres; if(!(This->state & BINDING_LOCKED)) { + This->state |= BINDING_LOCKED; hres = IInternetProtocolEx_LockRequest(&This->protocol->IInternetProtocolEx_iface, 0); - if(SUCCEEDED(hres)) - This->state |= BINDING_LOCKED; + if(FAILED(hres)) + This->state &= ~BINDING_LOCKED; } hres = This->stgmed_obj->vtbl->fill_stgmed(This->stgmed_obj, &stgmed); -- 2.34.1

2 2

[PATCH] winemac: Don't try to update when the window is closing.
by Huw Davies 04 Jan '22

04 Jan '22

This can happen after the window surface has been destroyed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52231 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winemac.drv/cocoa_window.h | 1 + dlls/winemac.drv/cocoa_window.m | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index d04961f8251..9a8bbb5e255 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -36,6 +36,7 @@ @interface WineWindow : NSPanel <NSWindowDelegate> BOOL pendingOrderOut; BOOL savedVisibleState; BOOL drawnSinceShown; + BOOL closing; WineWindow* latentParentWindow; NSMutableArray* latentChildWindows; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index d0672b7fb06..10524e4b3a2 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -381,6 +381,7 @@ @interface WineWindow () @property (readwrite, nonatomic) BOOL noActivate; @property (readwrite, nonatomic) BOOL floating; @property (readwrite, nonatomic) BOOL drawnSinceShown; +@property (readwrite, nonatomic) BOOL closing; @property (readwrite, getter=isFakingClose, nonatomic) BOOL fakingClose; @property (retain, nonatomic) NSWindow* latentParentWindow; @@ -492,7 +493,7 @@ - (void) updateLayer if ([window contentView] != self) return; - if (!window.surface || !window.surface_mutex) + if (window.closing || !window.surface || !window.surface_mutex) return; pthread_mutex_lock(window.surface_mutex); @@ -941,7 +942,7 @@ @implementation WineWindow static WineWindow* causing_becomeKeyWindow; - @synthesize disabled, noActivate, floating, fullscreen, fakingClose, latentParentWindow, hwnd, queue; + @synthesize disabled, noActivate, floating, fullscreen, fakingClose, closing, latentParentWindow, hwnd, queue; @synthesize drawnSinceShown; @synthesize surface, surface_mutex; @synthesize shapeChangedSinceLastDraw; @@ -3232,6 +3233,7 @@ void macdrv_destroy_cocoa_window(macdrv_window w) WineWindow* window = (WineWindow*)w; OnMainThread(^{ + window.closing = TRUE; [window doOrderOut]; [window close]; }); -- 2.23.0

1 0

[PATCH] comctl32/tests: Add a basic test for ImageList_WriteEx().
by Nikolay Sivov 04 Jan '22

04 Jan '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/imagelist.c | 25 +++++++++++++++++++++++++ include/commctrl.h | 4 ++++ 2 files changed, 29 insertions(+) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index ed9b1cc97f2..66a70982e6f 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -88,6 +88,7 @@ static HIMAGELIST (WINAPI *pImageList_Read)(IStream *); static BOOL (WINAPI *pImageList_Copy)(HIMAGELIST, int, HIMAGELIST, int, UINT); static HIMAGELIST (WINAPI *pImageList_LoadImageW)(HINSTANCE, LPCWSTR, int, int, COLORREF, UINT, UINT); static BOOL (WINAPI *pImageList_Draw)(HIMAGELIST,INT,HDC,INT,INT,UINT); +static HRESULT (WINAPI *pImageList_WriteEx)(HIMAGELIST himl, DWORD flags, IStream *stream); static HINSTANCE hinst; @@ -2574,6 +2575,28 @@ static void test_IImageList_GetIconSize(void) IImageList_Release(imgl); } +static void test_ImageList_WriteEx(void) +{ + HIMAGELIST himl; + IStream *stream; + HRESULT hr; + + himl = pImageList_Create(24, 24, ILC_COLOR24, 1, 1); + ok(himl != 0, "Failed to create an imagelist.\n"); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = pImageList_WriteEx(himl, ILP_NORMAL, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = pImageList_WriteEx(himl, ILP_DOWNLEVEL, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IStream_Release(stream); + pImageList_Destroy(himl); +} + static void init_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -2601,6 +2624,7 @@ static void init_functions(void) X(ImageList_Merge); X(ImageList_GetImageInfo); X(ImageList_Write); + X(ImageList_WriteEx); X(ImageList_Read); X(ImageList_Copy); X(ImageList_LoadImageW); @@ -2669,6 +2693,7 @@ START_TEST(imagelist) test_IImageList_SetBkColor(); test_IImageList_GetImageCount(); test_IImageList_GetIconSize(); + test_ImageList_WriteEx(); CoUninitialize(); diff --git a/include/commctrl.h b/include/commctrl.h index c6d9dd32928..164de374604 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -602,6 +602,10 @@ BOOL WINAPI ImageList_SetOverlayImage(HIMAGELIST,INT,INT); #ifdef __IStream_INTERFACE_DEFINED__ HIMAGELIST WINAPI ImageList_Read(LPSTREAM); BOOL WINAPI ImageList_Write(HIMAGELIST,IStream*); + +#define ILP_NORMAL 0 +#define ILP_DOWNLEVEL 1 + HRESULT WINAPI ImageList_WriteEx(HIMAGELIST,DWORD,IStream*); #endif -- 2.34.1

1 0

[PATCH] winealsa.drv: Fix a typo in TRACE() message.
by Masanori Kakura 04 Jan '22

04 Jan '22

Signed-off-by: Masanori Kakura <kakurasan(a)gmail.com> --- dlls/winealsa.drv/midi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index a4d76a30fdf..e61dae12860 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -789,7 +789,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) TRACE("Unable to create output port\n"); MidiOutDev[wDevID].port_out = -1; } else { - TRACE("Outport port %d created successfully\n", port_out); + TRACE("Output port %d created successfully\n", port_out); MidiOutDev[wDevID].port_out = port_out; /* Connect our app port to the device port */ -- 2.32.0

1 0

[PATCH 1/4] winemenubuilder: Reuse buffer in wchars_to_xml_text (Coverity)
by Alex Henrie 04 Jan '22

04 Jan '22

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- programs/winemenubuilder/winemenubuilder.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 16dc32a8859..620086f9776 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -319,7 +319,9 @@ static char *wchars_to_xml_text(const WCHAR *string) { int i, pos; char *text = wchars_to_utf8_chars( string ); - char *ret = xmalloc( 6 * strlen(text) + 1 ); + static char *ret; + + ret = xrealloc( ret, 6 * strlen(text) + 1 ); for (i = pos = 0; text[i]; i++) { -- 2.34.1

3 6

[PATCH] winspool: Don't try to match a printer to a server handle.
by Huw Davies 04 Jan '22

04 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51853 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winspool.drv/info.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index ac8f0994a1c..971eb654e6a 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1002,10 +1002,9 @@ static HANDLE get_opened_printer_entry(LPWSTR name, LPPRINTER_DEFAULTSW pDefault if(handle == nb_printer_handles) handle = i; } - else + else if (!queue && name && printer_handles[i]->name && !wcscmp( name, printer_handles[i]->name )) { - if(!queue && (name) && !wcscmp( name, printer_handles[i]->name )) - queue = printer_handles[i]->queue; + queue = printer_handles[i]->queue; } } -- 2.23.0

1 0

[PATCH 1/2] plugplay: Avoid requiring rpcss.exe for PnP RPC notifications.
by Rémi Bernon 04 Jan '22

04 Jan '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I don't really know the difference between "ncalrpc" and "ncacn_np", but the services manager uses "ncacn_np" and it doesn't require rpcss to be there to work. I think plugplay should do the same, to not be dependent on rpcss, which may be started after it, and stopped before it, causing problems with device hotplug notifications when it's not there. dlls/ntoskrnl.exe/pnp.c | 6 +++--- dlls/sechost/service.c | 6 +++--- include/wine/plugplay.idl | 7 +++++++ programs/plugplay/main.c | 6 +++--- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 6d53d79267e..165e431ea68 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -1083,8 +1083,8 @@ static NTSTATUS WINAPI pnp_manager_driver_entry( DRIVER_OBJECT *driver, UNICODE_ void pnp_manager_start(void) { static const WCHAR driver_nameW[] = {'\\','D','r','i','v','e','r','\\','P','n','p','M','a','n','a','g','e','r',0}; - WCHAR endpoint[] = L"\\pipe\\wine_plugplay"; - WCHAR protseq[] = L"ncalrpc"; + WCHAR transport[] = PLUGPLAY_TRANSPORT; + WCHAR endpoint[] = PLUGPLAY_ENDPOINT; UNICODE_STRING driver_nameU; RPC_WSTR binding_str; NTSTATUS status; @@ -1094,7 +1094,7 @@ void pnp_manager_start(void) if ((status = IoCreateDriver( &driver_nameU, pnp_manager_driver_entry ))) ERR("Failed to create PnP manager driver, status %#x.\n", status); - if ((err = RpcStringBindingComposeW( NULL, protseq, NULL, endpoint, NULL, &binding_str ))) + if ((err = RpcStringBindingComposeW( NULL, transport, NULL, endpoint, NULL, &binding_str ))) { ERR("RpcStringBindingCompose() failed, error %#x\n", err); return; diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index e6f4eb75db0..4a23758de5e 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -1987,8 +1987,8 @@ struct device_notify_registration static DWORD WINAPI device_notify_proc( void *arg ) { - WCHAR endpoint[] = L"\\pipe\\wine_plugplay"; - WCHAR protseq[] = L"ncalrpc"; + WCHAR transport[] = PLUGPLAY_TRANSPORT; + WCHAR endpoint[] = PLUGPLAY_ENDPOINT; RPC_WSTR binding_str; DWORD err = ERROR_SUCCESS; struct device_notify_registration *registration; @@ -1999,7 +1999,7 @@ static DWORD WINAPI device_notify_proc( void *arg ) unsigned int i, size; BYTE *buf; - if ((err = RpcStringBindingComposeW( NULL, protseq, NULL, endpoint, NULL, &binding_str ))) + if ((err = RpcStringBindingComposeW( NULL, transport, NULL, endpoint, NULL, &binding_str ))) { ERR("RpcStringBindingCompose() failed, error %#x\n", err); return err; diff --git a/include/wine/plugplay.idl b/include/wine/plugplay.idl index 8123b733ad1..b5d42ec2135 100644 --- a/include/wine/plugplay.idl +++ b/include/wine/plugplay.idl @@ -18,8 +18,15 @@ import "wtypes.idl"; +cpp_quote("#include \"winsvc.h\"") +cpp_quote("#define PLUGPLAY_TRANSPORT {'n','c','a','c','n','_','n','p',0}") +cpp_quote("#define PLUGPLAY_TRANSPORTA \"ncacn_np\"") +cpp_quote("#define PLUGPLAY_ENDPOINT {'\\\\','p','i','p','e','\\\\','w','i','n','e','_','p','l','u','g','p','l','a','y',0}") +cpp_quote("#define PLUGPLAY_ENDPOINTA \"\\\\pipe\\\\wine_plugplay\"") + [ uuid(57c680ac-7bce-4f39-97fd-ffea566754d5), + endpoint("ncacn_np:[\\pipe\\wine_plugplay]"), implicit_handle(handle_t plugplay_binding_handle) ] interface plugplay diff --git a/programs/plugplay/main.c b/programs/plugplay/main.c index 1156cb9f036..0ca1c37194e 100644 --- a/programs/plugplay/main.c +++ b/programs/plugplay/main.c @@ -199,14 +199,14 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) { - unsigned char endpoint[] = "\\pipe\\wine_plugplay"; - unsigned char protseq[] = "ncalrpc"; + unsigned char transport[] = PLUGPLAY_TRANSPORTA; + unsigned char endpoint[] = PLUGPLAY_ENDPOINTA; SERVICE_STATUS status; RPC_STATUS err; WINE_TRACE( "starting service\n" ); - if ((err = RpcServerUseProtseqEpA( protseq, 0, endpoint, NULL ))) + if ((err = RpcServerUseProtseqEpA( transport, 0, endpoint, NULL ))) { ERR("RpcServerUseProtseqEp() failed, error %u\n", err); return; -- 2.34.1

1 1

[PATCH v3 1/4] dinput/tests: Test simple joystick with older dinput versions.
by Rémi Bernon 04 Jan '22

04 Jan '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Fix a test result typo. Supersedes: 222839-222841 dlls/dinput/tests/joystick8.c | 453 ++++++++++++++++++++++++---------- 1 file changed, 323 insertions(+), 130 deletions(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index e986bf2d1cb..0ff76da6463 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -39,8 +39,11 @@ struct check_objects_todos { BOOL type; + BOOL ofs; BOOL guid; + BOOL flags; BOOL usage; + BOOL usage_page; BOOL name; }; @@ -77,16 +80,18 @@ static BOOL CALLBACK check_objects( const DIDEVICEOBJECTINSTANCEW *obj, void *ar check_member( *obj, *exp, "%u", dwSize ); todo_wine_if( todo->guid ) check_member_guid( *obj, *exp, guidType ); - todo_wine_if( params->version < 0x700 && (obj->dwType & DIDFT_BUTTON) ) + todo_wine_if( todo->ofs ) check_member( *obj, *exp, "%#x", dwOfs ); todo_wine_if( todo->type ) check_member( *obj, *exp, "%#x", dwType ); + todo_wine_if( todo->flags ) check_member( *obj, *exp, "%#x", dwFlags ); if (!localized) todo_wine_if( todo->name )check_member_wstr( *obj, *exp, tszName ); check_member( *obj, *exp, "%u", dwFFMaxForce ); check_member( *obj, *exp, "%u", dwFFForceResolution ); check_member( *obj, *exp, "%u", wCollectionNumber ); check_member( *obj, *exp, "%u", wDesignatorIndex ); + todo_wine_if( todo->usage_page ) check_member( *obj, *exp, "%#04x", wUsagePage ); todo_wine_if( todo->usage ) check_member( *obj, *exp, "%#04x", wUsage ); @@ -307,7 +312,7 @@ static void check_dinput_devices( DWORD version, DIDEVICEINSTANCEW *devinst ) } } -static void test_simple_joystick(void) +static void test_simple_joystick( DWORD version ) { #include "psh_hid_macros.h" static const unsigned char report_desc[] = @@ -363,11 +368,12 @@ static void test_simple_joystick(void) { .InputReportByteLength = 9, }; - static const DIDEVCAPS expect_caps = + const DIDEVCAPS expect_caps = { .dwSize = sizeof(DIDEVCAPS), .dwFlags = DIDC_ATTACHED | DIDC_EMULATED, - .dwDevType = DIDEVTYPE_HID | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DI8DEVTYPE_JOYSTICK, + .dwDevType = version >= 0x800 ? DIDEVTYPE_HID | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DI8DEVTYPE_JOYSTICK + : DIDEVTYPE_HID | (DIDEVTYPEJOYSTICK_RUDDER << 8) | DIDEVTYPE_JOYSTICK, .dwAxes = 6, .dwPOVs = 1, .dwButtons = 2, @@ -452,7 +458,8 @@ static void test_simple_joystick(void) .dwSize = sizeof(DIDEVICEINSTANCEW), .guidInstance = expect_guid_product, .guidProduct = expect_guid_product, - .dwDevType = DIDEVTYPE_HID | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DI8DEVTYPE_JOYSTICK, + .dwDevType = version >= 0x800 ? DIDEVTYPE_HID | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DI8DEVTYPE_JOYSTICK + : DIDEVTYPE_HID | (DIDEVTYPEJOYSTICK_RUDDER << 8) | DIDEVTYPE_JOYSTICK, .tszInstanceName = L"Wine test root driver", .tszProductName = L"Wine test root driver", .guidFFDriver = GUID_NULL, @@ -580,14 +587,110 @@ static void test_simple_joystick(void) .wUsage = HID_USAGE_GENERIC_JOYSTICK, }, }; - const DIEFFECTINFOW expect_effects[] = {}; - + const DIDEVICEOBJECTINSTANCEW expect_objects_5[] = + { + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_XAxis, + .dwOfs = DIJOFS_X, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(0), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"X Axis", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_X, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_YAxis, + .dwOfs = DIJOFS_Y, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(1), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Y Axis", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_Y, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_ZAxis, + .dwOfs = DIJOFS_Z, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(2), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Wheel", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_WHEEL, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_RzAxis, + .dwOfs = DIJOFS_RZ, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(5), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Rudder", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_SIMULATION, + .wUsage = HID_USAGE_SIMULATION_RUDDER, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_POV, + .dwOfs = DIJOFS_POV(0), + .dwType = DIDFT_POV|DIDFT_MAKEINSTANCE(0), + .tszName = L"Hat Switch", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_HATSWITCH, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Button, + .dwOfs = DIJOFS_BUTTON(0), + .dwType = DIDFT_PSHBUTTON|DIDFT_MAKEINSTANCE(0), + .tszName = L"Button 0", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_BUTTON, + .wUsage = 0x1, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Button, + .dwOfs = DIJOFS_BUTTON(1), + .dwType = DIDFT_PSHBUTTON|DIDFT_MAKEINSTANCE(1), + .tszName = L"Button 1", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_BUTTON, + .wUsage = 0x2, + .wReportId = 1, + }, + }; + struct check_objects_todos todo_objects_5[ARRAY_SIZE(expect_objects_5)] = + { + {.guid = TRUE, .type = TRUE, .flags = TRUE, .usage = TRUE, .usage_page = TRUE, .name = TRUE}, + {.guid = TRUE, .type = TRUE, .flags = TRUE, .usage = TRUE, .usage_page = TRUE, .name = TRUE}, + {.guid = TRUE, .type = TRUE, .usage = TRUE, .usage_page = TRUE, .name = TRUE}, + {.guid = TRUE, .ofs = TRUE, .type = TRUE, .usage = TRUE, .usage_page = TRUE, .name = TRUE}, + {.guid = TRUE, .ofs = TRUE, .type = TRUE, .flags = TRUE, .usage = TRUE, .name = TRUE}, + {.guid = TRUE, .ofs = TRUE, .type = TRUE, .flags = TRUE, .usage = TRUE, .usage_page = TRUE, .name = TRUE}, + {.guid = TRUE, .ofs = TRUE, .type = TRUE, .usage = TRUE, .usage_page = TRUE, .name = TRUE}, + }; struct check_objects_params check_objects_params = { - .version = DIRECTINPUT_VERSION, - .expect_count = ARRAY_SIZE(expect_objects), - .expect_objs = expect_objects, + .version = version, + .expect_count = version < 0x700 ? ARRAY_SIZE(expect_objects_5) : ARRAY_SIZE(expect_objects), + .expect_objs = version < 0x700 ? expect_objects_5 : expect_objects, + .todo_objs = version < 0x700 ? todo_objects_5 : NULL, + .todo_extra = version < 0x700 ? TRUE : FALSE, }; + + const DIEFFECTINFOW expect_effects[] = {}; struct check_effects_params check_effects_params = { .expect_count = ARRAY_SIZE(expect_effects), @@ -641,46 +744,57 @@ static void test_simple_joystick(void) WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; DIDEVICEOBJECTDATA objdata[32] = {{0}}; DIDEVICEOBJECTINSTANCEW objinst = {0}; + DIDEVICEOBJECTINSTANCEW expect_obj; DIDEVICEINSTANCEW devinst = {0}; DIEFFECTINFOW effectinfo = {0}; DIDATAFORMAT dataformat = {0}; IDirectInputDevice8W *device; IDirectInputEffect *effect; DIEFFESCAPE escape = {0}; + ULONG i, size, res, ref; DIDEVCAPS caps = {0}; HANDLE event, file; char buffer[1024]; DIJOYSTATE2 state; - ULONG i, res, ref; HRESULT hr; WCHAR *tmp; GUID guid; HWND hwnd; + winetest_push_context( "%#x", version ); + GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); GetTempPathW( ARRAY_SIZE(tempdir), tempdir ); SetCurrentDirectoryW( tempdir ); cleanup_registry_keys(); if (!dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps, NULL, 0 )) goto done; - if (FAILED(hr = dinput_test_create_device( DIRECTINPUT_VERSION, &devinst, &device ))) goto done; + if (FAILED(hr = dinput_test_create_device( version, &devinst, &device ))) goto done; - check_dinput_devices( DIRECTINPUT_VERSION, &devinst ); + check_dinput_devices( version, &devinst ); - hr = IDirectInputDevice8_Initialize( device, instance, 0x0700, &GUID_NULL ); - todo_wine - ok( hr == DIERR_BETADIRECTINPUTVERSION, "Initialize returned %#x\n", hr ); - hr = IDirectInputDevice8_Initialize( device, instance, DIRECTINPUT_VERSION, NULL ); + hr = IDirectInputDevice8_Initialize( device, instance, 0x800 - (version - 0x700), &GUID_NULL ); + if (version == 0x800) + { + todo_wine + ok( hr == DIERR_BETADIRECTINPUTVERSION, "Initialize returned %#x\n", hr ); + } + else + { + todo_wine + ok( hr == DIERR_OLDDIRECTINPUTVERSION, "Initialize returned %#x\n", hr ); + } + hr = IDirectInputDevice8_Initialize( device, instance, version, NULL ); todo_wine ok( hr == E_POINTER, "Initialize returned %#x\n", hr ); - hr = IDirectInputDevice8_Initialize( device, NULL, DIRECTINPUT_VERSION, &GUID_NULL ); + hr = IDirectInputDevice8_Initialize( device, NULL, version, &GUID_NULL ); todo_wine ok( hr == DIERR_INVALIDPARAM, "Initialize returned %#x\n", hr ); - hr = IDirectInputDevice8_Initialize( device, instance, DIRECTINPUT_VERSION, &GUID_NULL ); + hr = IDirectInputDevice8_Initialize( device, instance, version, &GUID_NULL ); todo_wine ok( hr == REGDB_E_CLASSNOTREG, "Initialize returned %#x\n", hr ); - hr = IDirectInputDevice8_Initialize( device, instance, DIRECTINPUT_VERSION, &devinst.guidInstance ); + hr = IDirectInputDevice8_Initialize( device, instance, version, &devinst.guidInstance ); ok( hr == DI_OK, "Initialize returned %#x\n", hr ); guid = devinst.guidInstance; memset( &devinst, 0, sizeof(devinst) ); @@ -689,7 +803,7 @@ static void test_simple_joystick(void) ok( hr == DI_OK, "GetDeviceInfo returned %#x\n", hr ); ok( IsEqualGUID( &guid, &devinst.guidInstance ), "got %s expected %s\n", debugstr_guid( &guid ), debugstr_guid( &devinst.guidInstance ) ); - hr = IDirectInputDevice8_Initialize( device, instance, DIRECTINPUT_VERSION, &devinst.guidProduct ); + hr = IDirectInputDevice8_Initialize( device, instance, version, &devinst.guidProduct ); ok( hr == DI_OK, "Initialize returned %#x\n", hr ); hr = IDirectInputDevice8_GetDeviceInfo( device, NULL ); @@ -704,6 +818,7 @@ static void test_simple_joystick(void) todo_wine check_member_guid( devinst, expect_devinst, guidInstance ); check_member_guid( devinst, expect_devinst, guidProduct ); + todo_wine_if( version < 0x0800 ) check_member( devinst, expect_devinst, "%#x", dwDevType ); todo_wine check_member_wstr( devinst, expect_devinst, tszInstanceName ); @@ -718,6 +833,7 @@ static void test_simple_joystick(void) todo_wine check_member_guid( devinst, expect_devinst, guidInstance ); check_member_guid( devinst, expect_devinst, guidProduct ); + todo_wine_if( version < 0x0800 ) check_member( devinst, expect_devinst, "%#x", dwDevType ); todo_wine check_member_wstr( devinst, expect_devinst, tszInstanceName ); @@ -736,6 +852,7 @@ static void test_simple_joystick(void) ok( hr == DI_OK, "GetCapabilities returned %#x\n", hr ); check_member( caps, expect_caps, "%d", dwSize ); check_member( caps, expect_caps, "%#x", dwFlags ); + todo_wine_if( version < 0x0800 ) check_member( caps, expect_caps, "%#x", dwDevType ); check_member( caps, expect_caps, "%d", dwAxes ); check_member( caps, expect_caps, "%d", dwButtons ); @@ -753,7 +870,9 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, NULL ); ok( hr == DIERR_INVALIDPARAM, "GetProperty returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, &prop_string.diph ); - ok( hr == DIERR_INVALIDPARAM, "GetProperty returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_INVALIDPARAM), + "GetProperty DIPROP_VIDPID returned %#x\n", hr ); prop_dword.diph.dwHeaderSize = sizeof(DIPROPHEADER) - 1; hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, &prop_dword.diph ); ok( hr == DIERR_INVALIDPARAM, "GetProperty returned %#x\n", hr ); @@ -761,8 +880,14 @@ static void test_simple_joystick(void) prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, &prop_dword.diph ); - ok( hr == DI_OK, "GetProperty DIPROP_VIDPID returned %#x\n", hr ); - ok( prop_dword.dwData == EXPECT_VIDPID, "got %#x expected %#x\n", prop_dword.dwData, EXPECT_VIDPID ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_OK), + "GetProperty DIPROP_VIDPID returned %#x\n", hr ); + if (hr == DI_OK) + { + ok( prop_dword.dwData == EXPECT_VIDPID, "got %#x expected %#x\n", + prop_dword.dwData, EXPECT_VIDPID ); + } hr = IDirectInputDevice8_GetProperty( device, DIPROP_GUIDANDPATH, &prop_guid_path.diph ); ok( hr == DI_OK, "GetProperty DIPROP_GUIDANDPATH returned %#x\n", hr ); @@ -791,14 +916,23 @@ static void test_simple_joystick(void) ok( !wcscmp( prop_string.wsz, expect_devinst.tszProductName ), "got product %s\n", debugstr_w(prop_string.wsz) ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_TYPENAME, &prop_string.diph ); - todo_wine - ok( hr == DI_OK, "GetProperty DIPROP_TYPENAME returned %#x\n", hr ); - todo_wine - ok( !wcscmp( prop_string.wsz, expect_vidpid_str ), "got type %s\n", debugstr_w(prop_string.wsz) ); + todo_wine_if( version >= 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_OK), + "GetProperty DIPROP_TYPENAME returned %#x\n", hr ); + if (hr == DI_OK) + { + todo_wine + ok( !wcscmp( prop_string.wsz, expect_vidpid_str ), "got type %s\n", debugstr_w(prop_string.wsz) ); + } hr = IDirectInputDevice8_GetProperty( device, DIPROP_USERNAME, &prop_string.diph ); - ok( hr == S_FALSE, "GetProperty DIPROP_USERNAME returned %#x\n", hr ); - todo_wine - ok( !wcscmp( prop_string.wsz, L"" ), "got user %s\n", debugstr_w(prop_string.wsz) ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_NOEFFECT), + "GetProperty DIPROP_USERNAME returned %#x\n", hr ); + if (hr == DI_NOEFFECT) + { + todo_wine + ok( !wcscmp( prop_string.wsz, L"" ), "got user %s\n", debugstr_w(prop_string.wsz) ); + } prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_JOYSTICKID, &prop_dword.diph ); @@ -838,7 +972,9 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); ok( hr == DIERR_UNSUPPORTED, "GetProperty DIPROP_RANGE returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_KEYNAME, &prop_string.diph ); - ok( hr == DIERR_INVALIDPARAM, "GetProperty DIPROP_KEYNAME returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_INVALIDPARAM), + "GetProperty DIPROP_KEYNAME returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_LOGICALRANGE, &prop_range.diph ); ok( hr == DIERR_UNSUPPORTED, "GetProperty DIPROP_LOGICALRANGE returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_PHYSICALRANGE, &prop_range.diph ); @@ -867,9 +1003,14 @@ static void test_simple_joystick(void) prop_string.diph.dwHow = DIPH_BYUSAGE; prop_string.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_KEYNAME, &prop_string.diph ); - ok( hr == DI_OK, "GetProperty DIPROP_KEYNAME returned %#x\n", hr ); - ok( !wcscmp( prop_string.wsz, expect_objects[4].tszName ), "got DIPROP_KEYNAME %s\n", - debugstr_w(prop_string.wsz) ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_OK), + "GetProperty DIPROP_KEYNAME returned %#x\n", hr ); + if (hr == DI_OK) + { + ok( !wcscmp( prop_string.wsz, expect_objects[4].tszName ), "got DIPROP_KEYNAME %s\n", + debugstr_w(prop_string.wsz) ); + } prop_string.diph.dwObj = MAKELONG( 0x1, HID_USAGE_PAGE_BUTTON ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_KEYNAME, &prop_string.diph ); todo_wine @@ -884,7 +1025,9 @@ static void test_simple_joystick(void) prop_range.lMin = 0xdeadbeef; prop_range.lMax = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); - ok( hr == DIERR_NOTFOUND, "GetProperty DIPROP_RANGE returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DI_OK : DIERR_NOTFOUND), + "GetProperty DIPROP_RANGE returned %#x\n", hr ); prop_range.diph.dwObj = MAKELONG( 0, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); ok( hr == DIERR_NOTFOUND, "GetProperty DIPROP_RANGE returned %#x\n", hr ); @@ -899,19 +1042,30 @@ static void test_simple_joystick(void) ok( prop_range.lMin == 0, "got %d expected %d\n", prop_range.lMin, 0 ); ok( prop_range.lMax == 65535, "got %d expected %d\n", prop_range.lMax, 65535 ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_LOGICALRANGE, &prop_range.diph ); - ok( hr == DI_OK, "GetProperty DIPROP_LOGICALRANGE returned %#x\n", hr ); - ok( prop_range.lMin == -25, "got %d expected %d\n", prop_range.lMin, -25 ); - ok( prop_range.lMax == 56, "got %d expected %d\n", prop_range.lMax, 56 ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_OK), + "GetProperty DIPROP_LOGICALRANGE returned %#x\n", hr ); + if (hr == DI_OK) + { + ok( prop_range.lMin == -25, "got %d expected %d\n", prop_range.lMin, -25 ); + ok( prop_range.lMax == 56, "got %d expected %d\n", prop_range.lMax, 56 ); + } hr = IDirectInputDevice8_GetProperty( device, DIPROP_PHYSICALRANGE, &prop_range.diph ); - ok( hr == DI_OK, "GetProperty DIPROP_PHYSICALRANGE returned %#x\n", hr ); - ok( prop_range.lMin == -25, "got %d expected %d\n", prop_range.lMin, -25 ); - ok( prop_range.lMax == 56, "got %d expected %d\n", prop_range.lMax, 56 ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_OK), + "GetProperty DIPROP_PHYSICALRANGE returned %#x\n", hr ); + if (hr == DI_OK) + { + ok( prop_range.lMin == -25, "got %d expected %d\n", prop_range.lMin, -25 ); + ok( prop_range.lMax == 56, "got %d expected %d\n", prop_range.lMax, 56 ); + } prop_pointer.diph.dwHow = DIPH_BYUSAGE; prop_pointer.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); - todo_wine - ok( hr == DIERR_NOTINITIALIZED, "GetProperty DIPROP_APPDATA returned %#x\n", hr ); + todo_wine_if( version >= 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_NOTINITIALIZED), + "GetProperty DIPROP_APPDATA returned %#x\n", hr ); hr = IDirectInputDevice8_EnumObjects( device, NULL, NULL, DIDFT_ALL ); ok( hr == DIERR_INVALIDPARAM, "EnumObjects returned %#x\n", hr ); @@ -920,7 +1074,8 @@ static void test_simple_joystick(void) res = 0; hr = IDirectInputDevice8_EnumObjects( device, check_object_count, &res, DIDFT_AXIS | DIDFT_PSHBUTTON ); ok( hr == DI_OK, "EnumObjects returned %#x\n", hr ); - ok( res == 8, "got %u expected %u\n", res, 8 ); + todo_wine_if( version < 0x0700 ) + ok( res == (version < 0x0700 ? 6 : 8), "got %u objects\n", res ); hr = IDirectInputDevice8_EnumObjects( device, check_objects, &check_objects_params, DIDFT_ALL ); ok( hr == DI_OK, "EnumObjects returned %#x\n", hr ); ok( check_objects_params.index >= check_objects_params.expect_count, "missing %u objects\n", @@ -936,26 +1091,30 @@ static void test_simple_joystick(void) res = MAKELONG( HID_USAGE_GENERIC_Z, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, res, DIPH_BYUSAGE ); - ok( hr == DIERR_NOTFOUND, "GetObjectInfo returned: %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DI_OK : DIERR_NOTFOUND), "GetObjectInfo returned: %#x\n", hr ); res = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, res, DIPH_BYUSAGE ); ok( hr == DI_OK, "GetObjectInfo returned: %#x\n", hr ); - check_member( objinst, expect_objects[4], "%u", dwSize ); - check_member_guid( objinst, expect_objects[4], guidType ); - check_member( objinst, expect_objects[4], "%#x", dwOfs ); - check_member( objinst, expect_objects[4], "%#x", dwType ); - check_member( objinst, expect_objects[4], "%#x", dwFlags ); - if (!localized) check_member_wstr( objinst, expect_objects[4], tszName ); - check_member( objinst, expect_objects[4], "%u", dwFFMaxForce ); - check_member( objinst, expect_objects[4], "%u", dwFFForceResolution ); - check_member( objinst, expect_objects[4], "%u", wCollectionNumber ); - check_member( objinst, expect_objects[4], "%u", wDesignatorIndex ); - check_member( objinst, expect_objects[4], "%#04x", wUsagePage ); - check_member( objinst, expect_objects[4], "%#04x", wUsage ); - check_member( objinst, expect_objects[4], "%#04x", dwDimension ); - check_member( objinst, expect_objects[4], "%#04x", wExponent ); - check_member( objinst, expect_objects[4], "%u", wReportId ); + if (version < 0x0700) expect_obj = expect_objects_5[0]; + else expect_obj = expect_objects[4]; + check_member( objinst, expect_obj, "%u", dwSize ); + check_member_guid( objinst, expect_obj, guidType ); + todo_wine_if( version < 0x0700 ) + check_member( objinst, expect_obj, "%#x", dwOfs ); + check_member( objinst, expect_obj, "%#x", dwType ); + check_member( objinst, expect_obj, "%#x", dwFlags ); + if (!localized) check_member_wstr( objinst, expect_obj, tszName ); + check_member( objinst, expect_obj, "%u", dwFFMaxForce ); + check_member( objinst, expect_obj, "%u", dwFFForceResolution ); + check_member( objinst, expect_obj, "%u", wCollectionNumber ); + check_member( objinst, expect_obj, "%u", wDesignatorIndex ); + check_member( objinst, expect_obj, "%#04x", wUsagePage ); + check_member( objinst, expect_obj, "%#04x", wUsage ); + check_member( objinst, expect_obj, "%#04x", dwDimension ); + check_member( objinst, expect_obj, "%#04x", wExponent ); + check_member( objinst, expect_obj, "%u", wReportId ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, 0x14, DIPH_BYOFFSET ); ok( hr == DIERR_NOTFOUND, "GetObjectInfo returned: %#x\n", hr ); @@ -968,21 +1127,24 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, res, DIPH_BYID ); ok( hr == DI_OK, "GetObjectInfo returned: %#x\n", hr ); - check_member( objinst, expect_objects[8], "%u", dwSize ); - check_member_guid( objinst, expect_objects[8], guidType ); - check_member( objinst, expect_objects[8], "%#x", dwOfs ); - check_member( objinst, expect_objects[8], "%#x", dwType ); - check_member( objinst, expect_objects[8], "%#x", dwFlags ); - if (!localized) check_member_wstr( objinst, expect_objects[8], tszName ); - check_member( objinst, expect_objects[8], "%u", dwFFMaxForce ); - check_member( objinst, expect_objects[8], "%u", dwFFForceResolution ); - check_member( objinst, expect_objects[8], "%u", wCollectionNumber ); - check_member( objinst, expect_objects[8], "%u", wDesignatorIndex ); - check_member( objinst, expect_objects[8], "%#04x", wUsagePage ); - check_member( objinst, expect_objects[8], "%#04x", wUsage ); - check_member( objinst, expect_objects[8], "%#04x", dwDimension ); - check_member( objinst, expect_objects[8], "%#04x", wExponent ); - check_member( objinst, expect_objects[8], "%u", wReportId ); + if (version < 0x0700) expect_obj = expect_objects_5[6]; + else expect_obj = expect_objects[8]; + check_member( objinst, expect_obj, "%u", dwSize ); + check_member_guid( objinst, expect_obj, guidType ); + todo_wine_if( version < 0x0700 ) + check_member( objinst, expect_obj, "%#x", dwOfs ); + check_member( objinst, expect_obj, "%#x", dwType ); + check_member( objinst, expect_obj, "%#x", dwFlags ); + if (!localized) check_member_wstr( objinst, expect_obj, tszName ); + check_member( objinst, expect_obj, "%u", dwFFMaxForce ); + check_member( objinst, expect_obj, "%u", dwFFForceResolution ); + check_member( objinst, expect_obj, "%u", wCollectionNumber ); + check_member( objinst, expect_obj, "%u", wDesignatorIndex ); + check_member( objinst, expect_obj, "%#04x", wUsagePage ); + check_member( objinst, expect_obj, "%#04x", wUsage ); + check_member( objinst, expect_obj, "%#04x", dwDimension ); + check_member( objinst, expect_obj, "%#04x", wExponent ); + check_member( objinst, expect_obj, "%u", wReportId ); hr = IDirectInputDevice8_EnumEffects( device, NULL, NULL, DIEFT_ALL ); ok( hr == DIERR_INVALIDPARAM, "EnumEffects returned %#x\n", hr ); @@ -1026,21 +1188,25 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, DIJOFS_Y, DIPH_BYOFFSET ); ok( hr == DI_OK, "GetObjectInfo returned: %#x\n", hr ); - check_member( objinst, expect_objects[3], "%u", dwSize ); - check_member_guid( objinst, expect_objects[3], guidType ); - check_member( objinst, expect_objects[3], "%#x", dwOfs ); - check_member( objinst, expect_objects[3], "%#x", dwType ); - check_member( objinst, expect_objects[3], "%#x", dwFlags ); - if (!localized) check_member_wstr( objinst, expect_objects[3], tszName ); - check_member( objinst, expect_objects[3], "%u", dwFFMaxForce ); - check_member( objinst, expect_objects[3], "%u", dwFFForceResolution ); - check_member( objinst, expect_objects[3], "%u", wCollectionNumber ); - check_member( objinst, expect_objects[3], "%u", wDesignatorIndex ); - check_member( objinst, expect_objects[3], "%#04x", wUsagePage ); - check_member( objinst, expect_objects[3], "%#04x", wUsage ); - check_member( objinst, expect_objects[3], "%#04x", dwDimension ); - check_member( objinst, expect_objects[3], "%#04x", wExponent ); - check_member( objinst, expect_objects[3], "%u", wReportId ); + if (version < 0x0700) expect_obj = expect_objects_5[1]; + else expect_obj = expect_objects[3]; + if (version < 0x0800) expect_obj.dwOfs = DIJOFS_Y; + check_member( objinst, expect_obj, "%u", dwSize ); + check_member_guid( objinst, expect_obj, guidType ); + todo_wine_if( version < 0x0800 ) + check_member( objinst, expect_obj, "%#x", dwOfs ); + check_member( objinst, expect_obj, "%#x", dwType ); + check_member( objinst, expect_obj, "%#x", dwFlags ); + if (!localized) check_member_wstr( objinst, expect_obj, tszName ); + check_member( objinst, expect_obj, "%u", dwFFMaxForce ); + check_member( objinst, expect_obj, "%u", dwFFForceResolution ); + check_member( objinst, expect_obj, "%u", wCollectionNumber ); + check_member( objinst, expect_obj, "%u", wDesignatorIndex ); + check_member( objinst, expect_obj, "%#04x", wUsagePage ); + check_member( objinst, expect_obj, "%#04x", wUsage ); + check_member( objinst, expect_obj, "%#04x", dwDimension ); + check_member( objinst, expect_obj, "%#04x", wExponent ); + check_member( objinst, expect_obj, "%u", wReportId ); hr = IDirectInputDevice8_SetEventNotification( device, (HANDLE)0xdeadbeef ); todo_wine @@ -1101,7 +1267,8 @@ static void test_simple_joystick(void) ok( hr == DI_OK, "Acquire returned: %#x\n", hr ); hr = IDirectInputDevice8_Poll( device ); - ok( hr == DI_NOEFFECT, "Poll returned: %#x\n", hr ); + todo_wine_if( version < 0x0700 ) + ok( hr == (version < 0x0700 ? DI_OK : DI_NOEFFECT), "Poll returned: %#x\n", hr ); hr = IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE2) + 1, &state ); ok( hr == DIERR_INVALIDPARAM, "GetDeviceState returned: %#x\n", hr ); @@ -1145,11 +1312,12 @@ static void test_simple_joystick(void) winetest_pop_context(); res = 1; - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA) - 1, objdata, &res, DIGDD_PEEK ); - todo_wine - ok( hr == DIERR_INVALIDPARAM, "GetDeviceData returned %#x\n", hr ); + size = version < 0x0800 ? sizeof(DIDEVICEOBJECTDATA_DX3) : sizeof(DIDEVICEOBJECTDATA); + hr = IDirectInputDevice8_GetDeviceData( device, size - 1, objdata, &res, DIGDD_PEEK ); + todo_wine_if( version >= 0x0800 ) + ok( hr == (version < 0x0800 ? DI_OK : DIERR_INVALIDPARAM), "GetDeviceData returned %#x\n", hr ); res = 1; - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, DIGDD_PEEK ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &res, DIGDD_PEEK ); ok( hr == DIERR_NOTBUFFERED, "GetDeviceData returned %#x\n", hr ); hr = IDirectInputDevice8_Unacquire( device ); @@ -1167,7 +1335,7 @@ static void test_simple_joystick(void) ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); res = 1; - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, DIGDD_PEEK ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &res, DIGDD_PEEK ); ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); ok( res == 0, "got %u expected %u\n", res, 0 ); @@ -1177,12 +1345,13 @@ static void test_simple_joystick(void) ResetEvent( event ); res = 1; - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, DIGDD_PEEK ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &res, DIGDD_PEEK ); + todo_wine_if( version < 0x0800 ) ok( hr == DI_BUFFEROVERFLOW, "GetDeviceData returned %#x\n", hr ); ok( res == 0, "got %u expected %u\n", res, 0 ); res = 1; - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); - todo_wine + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &res, 0 ); + todo_wine_if( version >= 0x0800 ) ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); ok( res == 0, "got %u expected %u\n", res, 0 ); @@ -1202,22 +1371,23 @@ static void test_simple_joystick(void) ResetEvent( event ); res = 1; - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, DIGDD_PEEK ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &res, DIGDD_PEEK ); ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); ok( res == 1, "got %u expected %u\n", res, 1 ); check_member( objdata[0], expect_objdata[0], "%#x", dwOfs ); check_member( objdata[0], expect_objdata[0], "%#x", dwData ); - ok( objdata[0].uAppData == -1, "got %p, expected %p\n", (void *)objdata[0].uAppData, (void *)-1 ); + if (version >= 0x0800) ok( objdata[0].uAppData == -1, "got %p\n", (void *)objdata[0].uAppData ); res = 4; - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &res, 0 ); ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); ok( res == 4, "got %u expected %u\n", res, 4 ); for (i = 0; i < 4; ++i) { + DIDEVICEOBJECTDATA *ptr = (DIDEVICEOBJECTDATA *)((char *)objdata + size * i); winetest_push_context( "objdata[%d]", i ); - check_member( objdata[i], expect_objdata[1 + i], "%#x", dwOfs ); - check_member( objdata[i], expect_objdata[1 + i], "%#x", dwData ); - ok( objdata[i].uAppData == -1, "got %p, expected %p\n", (void *)objdata[i].uAppData, (void *)-1 ); + check_member( *ptr, expect_objdata[1 + i], "%#x", dwOfs ); + check_member( *ptr, expect_objdata[1 + i], "%#x", dwData ); + if (version >= 0x0800) ok( ptr->uAppData == -1, "got %p\n", (void *)ptr->uAppData ); winetest_pop_context(); } @@ -1231,26 +1401,28 @@ static void test_simple_joystick(void) ResetEvent( event ); res = 1; - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &res, 0 ); + todo_wine_if( version < 0x0800 ) ok( hr == DI_BUFFEROVERFLOW, "GetDeviceData returned %#x\n", hr ); ok( res == 1, "got %u expected %u\n", res, 1 ); todo_wine check_member( objdata[0], expect_objdata[5], "%#x", dwOfs ); todo_wine check_member( objdata[0], expect_objdata[5], "%#x", dwData ); - ok( objdata[0].uAppData == -1, "got %p, expected %p\n", (void *)objdata[0].uAppData, (void *)-1 ); + if (version >= 0x0800) ok( objdata[0].uAppData == -1, "got %p\n", (void *)objdata[0].uAppData ); res = ARRAY_SIZE(objdata); - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &res, 0 ); ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); ok( res == 8, "got %u expected %u\n", res, 8 ); for (i = 0; i < 8; ++i) { + DIDEVICEOBJECTDATA *ptr = (DIDEVICEOBJECTDATA *)((char *)objdata + size * i); winetest_push_context( "objdata[%d]", i ); todo_wine - check_member( objdata[i], expect_objdata[6 + i], "%#x", dwOfs ); + check_member( *ptr, expect_objdata[6 + i], "%#x", dwOfs ); todo_wine_if( i == 1 || i == 2 || i == 6 ) - check_member( objdata[i], expect_objdata[6 + i], "%#x", dwData ); - ok( objdata[i].uAppData == -1, "got %p, expected %p\n", (void *)objdata[i].uAppData, (void *)-1 ); + check_member( *ptr, expect_objdata[6 + i], "%#x", dwData ); + if (version >= 0x0800) ok( ptr->uAppData == -1, "got %p\n", (void *)ptr->uAppData ); winetest_pop_context(); } @@ -1348,7 +1520,9 @@ static void test_simple_joystick(void) ok( hr == DIERR_INVALIDPARAM, "SetDataFormat returned: %#x\n", hr ); objdataformat[1].dwType = DIDFT_AXIS | DIDFT_MAKEINSTANCE( 0xff ); hr = IDirectInputDevice8_SetDataFormat( device, &dataformat ); - ok( hr == DIERR_INVALIDPARAM, "SetDataFormat returned: %#x\n", hr ); + todo_wine_if( version < 0x0700 ) + ok( hr == (version < 0x0700 ? DI_OK : DIERR_INVALIDPARAM), + "SetDataFormat returned: %#x\n", hr ); objdataformat[1].dwType = DIDFT_AXIS | DIDFT_MAKEINSTANCE( 1 ); hr = IDirectInputDevice8_SetDataFormat( device, &dataformat ); ok( hr == DI_OK, "SetDataFormat returned: %#x\n", hr ); @@ -1450,9 +1624,13 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_SetProperty( device, DIPROP_RANGE, &prop_range.diph ); ok( hr == DI_OK, "SetProperty DIPROP_RANGE returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_LOGICALRANGE, &prop_range.diph ); - ok( hr == DIERR_ACQUIRED, "SetProperty DIPROP_LOGICALRANGE returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_ACQUIRED), + "SetProperty DIPROP_LOGICALRANGE returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_PHYSICALRANGE, &prop_range.diph ); - ok( hr == DIERR_ACQUIRED, "SetProperty DIPROP_PHYSICALRANGE returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_ACQUIRED), + "SetProperty DIPROP_PHYSICALRANGE returned %#x\n", hr ); hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); @@ -1505,13 +1683,17 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_SetProperty( device, DIPROP_VIDPID, NULL ); ok( hr == DIERR_INVALIDPARAM, "SetProperty returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_VIDPID, &prop_string.diph ); - ok( hr == DIERR_INVALIDPARAM, "SetProperty returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_INVALIDPARAM), + "SetProperty DIPROP_VIDPID returned %#x\n", hr ); prop_dword.diph.dwHow = DIPH_DEVICE; prop_dword.diph.dwObj = 0; prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_SetProperty( device, DIPROP_VIDPID, &prop_dword.diph ); - ok( hr == DIERR_READONLY, "SetProperty DIPROP_VIDPID returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_READONLY), + "SetProperty DIPROP_VIDPID returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_GUIDANDPATH, &prop_guid_path.diph ); ok( hr == DIERR_READONLY, "SetProperty DIPROP_GUIDANDPATH returned %#x\n", hr ); @@ -1532,9 +1714,13 @@ static void test_simple_joystick(void) debugstr_w(prop_string.wsz) ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_TYPENAME, &prop_string.diph ); - ok( hr == DIERR_READONLY, "SetProperty DIPROP_TYPENAME returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_READONLY), + "SetProperty DIPROP_TYPENAME returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_USERNAME, &prop_string.diph ); - ok( hr == DIERR_READONLY, "SetProperty DIPROP_USERNAME returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_READONLY), + "SetProperty DIPROP_USERNAME returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); ok( hr == DIERR_READONLY, "SetProperty DIPROP_FFLOAD returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_GRANULARITY, &prop_dword.diph ); @@ -1553,7 +1739,8 @@ static void test_simple_joystick(void) prop_pointer.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); todo_wine - ok( hr == DIERR_ACQUIRED, "SetProperty DIPROP_APPDATA returned %#x\n", hr ); + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_ACQUIRED), + "SetProperty DIPROP_APPDATA returned %#x\n", hr ); prop_dword.diph.dwHow = DIPH_DEVICE; prop_dword.diph.dwObj = 0; @@ -1669,8 +1856,8 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE2), &state ); ok( hr == DI_OK, "GetDeviceState returned: %#x\n", hr ); winetest_push_context( "state[%d]", i ); - todo_wine - ok( state.lX == 15, "got lX %d, expected %d\n", state.lX, 15 ); + todo_wine_if( version >= 0x0700 ) + ok( state.lX == (version < 0x0700 ? -9000 : 15), "got lX %d\n", state.lX ); check_member( state, expect_state_abs[0], "%d", lY ); check_member( state, expect_state_abs[0], "%d", lZ ); check_member( state, expect_state_abs[0], "%d", lRx ); @@ -1706,7 +1893,9 @@ static void test_simple_joystick(void) prop_pointer.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); prop_pointer.uData = 0xfeedcafe; hr = IDirectInputDevice8_SetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); - ok( hr == DI_OK, "SetProperty DIPROP_APPDATA returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_OK), + "SetProperty DIPROP_APPDATA returned %#x\n", hr ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_SetProperty( device, DIPROP_AXISMODE, &prop_dword.diph ); @@ -1733,9 +1922,10 @@ static void test_simple_joystick(void) prop_pointer.diph.dwHow = DIPH_BYUSAGE; prop_pointer.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); - todo_wine - ok( hr == DI_OK, "GetProperty DIPROP_APPDATA returned %#x\n", hr ); - ok( prop_pointer.uData == 0xfeedcafe, "got %p expected %p\n", (void *)prop_pointer.uData, (void *)0xfeedcafe ); + todo_wine_if( version >= 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_OK), + "GetProperty DIPROP_APPDATA returned %#x\n", hr ); + if (hr == DI_OK) ok( prop_pointer.uData == 0xfeedcafe, "got %p\n", (void *)prop_pointer.uData ); prop_dword.diph.dwHow = DIPH_DEVICE; prop_dword.diph.dwObj = 0; @@ -1815,15 +2005,15 @@ static void test_simple_joystick(void) objdata[0].dwOfs = 0xd; objdata[0].dwData = 0x80; res = 1; - hr = IDirectInputDevice8_SendDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0xdeadbeef ); + hr = IDirectInputDevice8_SendDeviceData( device, size, objdata, &res, 0xdeadbeef ); todo_wine ok( hr == DIERR_INVALIDPARAM, "SendDeviceData returned %#x\n", hr ); res = 1; - hr = IDirectInputDevice8_SendDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 1 /*DISDD_CONTINUE*/ ); + hr = IDirectInputDevice8_SendDeviceData( device, size, objdata, &res, 1 /*DISDD_CONTINUE*/ ); todo_wine ok( hr == DIERR_INVALIDPARAM, "SendDeviceData returned %#x\n", hr ); res = 1; - hr = IDirectInputDevice8_SendDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); + hr = IDirectInputDevice8_SendDeviceData( device, size, objdata, &res, 0 ); todo_wine ok( hr == DIERR_INVALIDPARAM, "SendDeviceData returned %#x\n", hr ); @@ -1879,6 +2069,7 @@ done: pnp_driver_stop(); cleanup_registry_keys(); SetCurrentDirectoryW( cwd ); + winetest_pop_context(); } struct device_desc @@ -2580,7 +2771,9 @@ START_TEST( joystick8 ) test_device_types( 0x500 ); test_device_types( 0x700 ); - test_simple_joystick(); + test_simple_joystick( 0x500 ); + test_simple_joystick( 0x700 ); + test_simple_joystick( 0x800 ); } CoUninitialize(); -- 2.34.1

1 3

[PATCH] kernel32/tests: Drop path test workarounds for Windows <= 2000
by Alex Henrie 04 Jan '22

04 Jan '22

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Dropping support for very old Windows versions allows us to enable the test for SearchPathW with a null filename. --- dlls/kernel32/tests/path.c | 82 ++++++++++---------------------------- 1 file changed, 20 insertions(+), 62 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 2955be0da9c..db376eef24a 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -350,8 +350,7 @@ static void test_InitPathA(CHAR *newdir, CHAR *curDrive, CHAR *otherDrive) "GetTempPathA returned a path that did not end in '\\'\n"); lstrcpyA(tmpstr,"aaaaaaaa"); len1=GetTempPathA(len,tmpstr); - ok(len1==len+1 || broken(len1 == len), /* WinME */ - "GetTempPathA should return string length %d instead of %d\n",len+1,len1); + ok(len1==len+1,"GetTempPathA should return string length %d instead of %d\n",len+1,len1); /* Test GetTmpFileNameA */ ok((id=GetTempFileNameA(tmppath,"path",0,newdir)),"GetTempFileNameA failed\n"); @@ -364,25 +363,20 @@ static void test_InitPathA(CHAR *newdir, CHAR *curDrive, CHAR *otherDrive) ok(DeleteFileA(newdir),"Couldn't delete the temporary file we just created\n"); id=GetTempFileNameA(tmppath,NULL,0,newdir); -/* Windows 95, 98 return 0==id, while Windows 2000, XP return 0!=id */ - if (id) - { - sprintf(tmpstr,"%.4x.tmp",id & 0xffff); - sprintf(tmpstr1,"%x.tmp",id & 0xffff); - ok(lstrcmpiA(newdir+lstrlenA(tmppath),tmpstr)==0 || - lstrcmpiA(newdir+lstrlenA(tmppath),tmpstr1)==0, - "GetTempFileNameA returned '%s' which doesn't match '%s' or '%s'. id=%x\n", - newdir,tmpstr,tmpstr1,id); - ok(DeleteFileA(newdir),"Couldn't delete the temporary file we just created\n"); - } + sprintf(tmpstr,"%.4x.tmp",id & 0xffff); + sprintf(tmpstr1,"%x.tmp",id & 0xffff); + ok(lstrcmpiA(newdir+lstrlenA(tmppath),tmpstr)==0 || + lstrcmpiA(newdir+lstrlenA(tmppath),tmpstr1)==0, + "GetTempFileNameA returned '%s' which doesn't match '%s' or '%s'. id=%x\n", + newdir,tmpstr,tmpstr1,id); + ok(DeleteFileA(newdir),"Couldn't delete the temporary file we just created\n"); for(unique=0;unique<3;unique++) { /* Nonexistent path */ sprintf(invalid_dir, "%s\\%s",tmppath,"non_existent_dir_1jwj3y32nb3"); SetLastError(0xdeadbeef); ok(!GetTempFileNameA(invalid_dir,"tfn",unique,newdir),"GetTempFileNameA should have failed\n"); - ok(GetLastError()==ERROR_DIRECTORY || broken(GetLastError()==ERROR_PATH_NOT_FOUND)/*win98*/, - "got %d, expected ERROR_DIRECTORY\n", GetLastError()); + ok(GetLastError()==ERROR_DIRECTORY,"got %u, expected ERROR_DIRECTORY\n", GetLastError()); /* Check return value for unique !=0 */ if(unique) { @@ -489,12 +483,12 @@ static void test_CurrentDirectoryA(CHAR *origdir, CHAR *newdir) SetLastError( 0xdeadbeef ); strcpy( buffer, "foo" ); len = GetCurrentDirectoryA( 65536, buffer ); - ok( (len != 0 && len < MAX_PATH) || broken(!len), /* nt4 */ "GetCurrentDirectoryA failed %u err %u\n", len, GetLastError() ); + ok( (len != 0 && len < MAX_PATH), "GetCurrentDirectoryA failed %u err %u\n", len, GetLastError() ); if (len) ok( !strcmp( buffer, origdir ), "wrong result %s\n", buffer ); SetLastError( 0xdeadbeef ); strcpy( buffer, "foo" ); len = GetCurrentDirectoryA( 2 * 65536, buffer ); - ok( (len != 0 && len < MAX_PATH) || broken(!len), /* nt4 */ "GetCurrentDirectoryA failed %u err %u\n", len, GetLastError() ); + ok( (len != 0 && len < MAX_PATH), "GetCurrentDirectoryA failed %u err %u\n", len, GetLastError() ); if (len) ok( !strcmp( buffer, origdir ), "wrong result %s\n", buffer ); HeapFree( GetProcessHeap(), 0, buffer ); @@ -1004,11 +998,6 @@ static void test_GetTempPathW(char* tmp_dir) lstrcpyW(buf, fooW); len = GetTempPathW(MAX_PATH, buf); - if (len == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("GetTempPathW is not available\n"); - return; - } ok(lstrcmpiW(buf, tmp_dirW) == 0, "GetTempPathW returned an incorrect temporary path\n"); ok(len == lstrlenW(buf), "returned length should be equal to the length of string\n"); @@ -1185,12 +1174,6 @@ static void test_GetLongPathNameA(void) SetLastError(0xdeadbeef); length = GetLongPathNameA(temppath2, NULL, 0); - if (length == 0 && GetLastError() == ERROR_BAD_NET_NAME) - { - win_skip("UNC syntax tests don't work on Win98/WinMe\n"); - DeleteFileA(tempfile); - return; - } ok(length == explength, "Wrong length %d, expected %d\n", length, explength); length = GetLongPathNameA(temppath2, NULL, MAX_PATH); @@ -1275,11 +1258,6 @@ static void test_GetLongPathNameW(void) SetLastError(0xdeadbeef); length = GetLongPathNameW(NULL,NULL,0); - if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("GetLongPathNameW is not implemented\n"); - return; - } ok(0==length,"GetLongPathNameW returned %d but expected 0\n",length); ok(GetLastError()==ERROR_INVALID_PARAMETER,"GetLastError returned %d but expected ERROR_INVALID_PARAMETER\n",GetLastError()); @@ -1371,13 +1349,7 @@ static void test_GetShortPathNameW(void) HANDLE file; int ret; - SetLastError(0xdeadbeef); GetTempPathW( MAX_PATH, tmppath ); - if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("GetTempPathW is not implemented\n"); - return; - } lstrcpyW( path, tmppath ); lstrcatW( path, test_path ); @@ -1462,11 +1434,8 @@ static void test_GetSystemDirectory(void) SetLastError(0xdeadbeef); res = GetSystemDirectoryA(NULL, total-1); - /* 95+NT: total (includes the terminating Zero) - 98+ME: 0 with ERROR_INVALID_PARAMETER */ - ok( (res == total) || (!res && (GetLastError() == ERROR_INVALID_PARAMETER)), - "returned %d with %d (expected '%d' or: '0' with " - "ERROR_INVALID_PARAMETER)\n", res, GetLastError(), total); + ok( res == total, "returned %u with %u (expected '%u')\n", + res, GetLastError(), total ); if (total > MAX_PATH) return; @@ -1521,11 +1490,8 @@ static void test_GetWindowsDirectory(void) SetLastError(0xdeadbeef); res = GetWindowsDirectoryA(NULL, total-1); - /* 95+NT: total (includes the terminating Zero) - 98+ME: 0 with ERROR_INVALID_PARAMETER */ - ok( (res == total) || (!res && (GetLastError() == ERROR_INVALID_PARAMETER)), - "returned %d with %d (expected '%d' or: '0' with " - "ERROR_INVALID_PARAMETER)\n", res, GetLastError(), total); + ok( res == total, "returned %u with %u (expected '%u')\n", + res, GetLastError(), total ); if (total > MAX_PATH) return; @@ -1912,11 +1878,11 @@ static void test_SearchPathW(void) HANDLE handle; DWORD ret; -if (0) -{ - /* NULL filename, crashes on nt4 */ - SearchPathW(pathW, NULL, NULL, ARRAY_SIZE(buffW), buffW, &ptrW); -} + /* NULL filename */ + ret = SearchPathW(pathW, NULL, NULL, ARRAY_SIZE(buffW), buffW, &ptrW); + ok(ret == 0, "Expected failure, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %#x\n", GetLastError()); GetWindowsDirectoryW(pathW, ARRAY_SIZE(pathW)); @@ -2105,14 +2071,6 @@ static void test_GetFullPathNameW(void) {emptyW, MAX_PATH, output, &filepart, 1}, }; - SetLastError(0xdeadbeef); - ret = GetFullPathNameW(NULL, 0, NULL, NULL); - if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("GetFullPathNameW is not available\n"); - return; - } - for (i = 0; i < ARRAY_SIZE(invalid_parameters); i++) { SetLastError(0xdeadbeef); -- 2.34.1

1 0

[PATCH] server: implement file random access hint on OS X
by Luke Deller 04 Jan '22

04 Jan '22

Disable read ahead for files opened with FILE_RANDOM_ACCESS hint on Mac OS X and FreeBSD. Signed-off-by: Luke Deller <luke(a)deller.id.au> --- server/fd.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/server/fd.c b/server/fd.c index c9a21186722..ebcbd4266cc 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2054,6 +2054,13 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam posix_fadvise( fd->unix_fd, 0, 0, POSIX_FADV_RANDOM ); break; } +#elif defined F_RDAHEAD /* Mac OS X, FreeBSD */ + switch (options & (FILE_SEQUENTIAL_ONLY | FILE_RANDOM_ACCESS)) + { + case FILE_RANDOM_ACCESS: + fcntl( fd->unix_fd, F_RDAHEAD, 0 ); + break; + } #endif if (root_fd != -1) fchdir( server_dir_fd ); /* go back to the server dir */ -- 2.32.0 (Apple Git-132)

1 0

[PATCH] gdi32/tests: Expect STATUS_GRAPHICS_PRESENT_OCCLUDED when minimized
by Alex Henrie 04 Jan '22

04 Jan '22

Fixes a testbot failure. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/gdi32/tests/driver.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 54144c44e1c..54cf06852a9 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -648,11 +648,13 @@ static void test_D3DKMTCheckOcclusion(void) status = pD3DKMTCheckOcclusion(&occlusion_desc); ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); - /* Minimized state doesn't affect D3DKMTCheckOcclusion */ + /* Minimized state affects D3DKMTCheckOcclusion */ ShowWindow(hwnd, SW_MINIMIZE); occlusion_desc.hWnd = hwnd; status = pD3DKMTCheckOcclusion(&occlusion_desc); - ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); +todo_wine + ok(status == STATUS_GRAPHICS_PRESENT_OCCLUDED || broken(status == STATUS_SUCCESS) /* < win10 */, + "Got unexpected return code %#x.\n", status); ShowWindow(hwnd, SW_SHOWNORMAL); /* Invisible state doesn't affect D3DKMTCheckOcclusion */ -- 2.34.1

2 1

[PATCH] user32/tests: Expect DialogBoxParam to set ERROR_CANNOT_FIND_WND_CLASS
by Alex Henrie 04 Jan '22

04 Jan '22

Fixes a testbot failure. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/user32/tests/dialog.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 4b1336b62c5..de11e4a2253 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1851,7 +1851,10 @@ static void test_DialogBoxParam(void) SetLastError(0xdeadbeef); ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_DIALOG_INVALID_CLASS", 0, DestroyDlgWinProc, 0); ok(ret == -1, "DialogBoxParamA returned %ld, expected -1\n", ret); - ok(GetLastError() == 0, "got %d\n", GetLastError()); +todo_wine + ok(GetLastError() == ERROR_CANNOT_FIND_WND_CLASS || + broken(GetLastError() == ERROR_SUCCESS) /* < win10 21H1 */, + "got %u, expected ERROR_CANNOT_FIND_WND_CLASS\n", GetLastError()); SetLastError(0xdeadbeef); ret = DefDlgProcA(0, WM_ERASEBKGND, 0, 0); -- 2.34.1

1 0

[PATCH] d2d: Suppress last empty segment also for D2D1_FIGURE_END_OPEN
by Stefan Brüns 03 Jan '22

03 Jan '22

When the last vertex is coincident with the first vertex, the last segment should be suppressed for both END_OPEN and END_CLOSED. When the last, zero length segment is not omitted d2d_geometry_intersect_self will add invalid segments. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51139 Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- dlls/d2d1/geometry.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index a7074899fda..95aaf199ad2 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2917,8 +2917,9 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_EndFigure(ID2D1GeometrySink *ifa { ++geometry->u.path.segment_count; figure->flags |= D2D_FIGURE_FLAG_CLOSED; - if (!memcmp(&figure->vertices[0], &figure->vertices[figure->vertex_count - 1], sizeof(*figure->vertices))) - --figure->vertex_count; + } + if (!memcmp(&figure->vertices[0], &figure->vertices[figure->vertex_count - 1], sizeof(*figure->vertices))) { + --figure->vertex_count; } if (!d2d_geometry_add_figure_outline(geometry, figure, figure_end)) -- 2.34.1

3 6

[PATCH 1/2] ws2_32/tests: Add a test for simultaneous WSARecv().
by Jinoh Kang 03 Jan '22

03 Jan '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 55 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d4585c2b1dc..57ff496cfb8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -11451,6 +11451,60 @@ static void test_nonblocking_async_recv(void) CloseHandle(overlapped.hEvent); } +static void test_simultaneous_async_recv(void) +{ + SOCKET client, server; + OVERLAPPED overlappeds[2] = {{0}}; + HANDLE events[2]; + WSABUF wsabufs[2]; + DWORD flags[2] = {0}; + size_t num_io = 2, stride = 16, i; + char resbuf[32] = ""; + static const char msgstr[32] = "-- Lorem ipsum dolor sit amet -"; + int ret; + + for (i = 0; i < num_io; i++) events[i] = CreateEventW(NULL, TRUE, FALSE, NULL); + + tcp_socketpair(&client, &server); + + for (i = 0; i < num_io; i++) + { + wsabufs[i].buf = resbuf + i * stride; + wsabufs[i].len = stride; + overlappeds[i].hEvent = events[i]; + ret = WSARecv(client, &wsabufs[i], 1, NULL, &flags[i], &overlappeds[i], NULL); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + } + + ret = send(server, msgstr, sizeof(msgstr), 0); + ok(ret == sizeof(msgstr), "got %d\n", ret); + + for (i = 0; i < num_io; i++) + { + const void *expect = msgstr + i * stride; + const void *actual = resbuf + i * stride; + DWORD size; + + ret = WaitForSingleObject(events[i], 1000); + todo_wine_if(i > 0) + ok(!ret, "wait timed out\n"); + + ret = GetOverlappedResult((HANDLE)client, &overlappeds[i], &size, FALSE); + todo_wine_if(i > 0) + ok(ret, "got error %u\n", GetLastError()); + todo_wine_if(i > 0) + ok(size == stride, "got size %u\n", size); + todo_wine_if(i > 0) + ok(!memcmp(expect, actual, stride), "expected %s, got %s\n", debugstr_an(expect, stride), debugstr_an(actual, stride)); + } + + closesocket(client); + closesocket(server); + + for (i = 0; i < num_io; i++) CloseHandle(events[i]); +} + static void test_empty_recv(void) { OVERLAPPED overlapped = {0}; @@ -12009,6 +12063,7 @@ START_TEST( sock ) test_connecting_socket(); test_WSAGetOverlappedResult(); test_nonblocking_async_recv(); + test_simultaneous_async_recv(); test_empty_recv(); test_timeout(); -- 2.31.1

2 2

[PATCH] po: Update Russian translation.
by Nikolay Sivov 03 Jan '22

03 Jan '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ru.po | 392 +++++++++++++++++++++++++++---------------------------- 1 file changed, 196 insertions(+), 196 deletions(-) diff --git a/po/ru.po b/po/ru.po index 1076281f7f8..982f907359d 100644 --- a/po/ru.po +++ b/po/ru.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: 2021-12-30 18:27+0300\n" +"PO-Revision-Date: 2022-01-03 11:22+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -10375,15 +10375,15 @@ msgstr "Выберите источник" #: dlls/tzres/tzres.rc:126 msgid "China Standard Time" -msgstr "" +msgstr "Китайское стандартное время" #: dlls/tzres/tzres.rc:127 msgid "China Daylight Time" -msgstr "" +msgstr "Китайское летнее время" #: dlls/tzres/tzres.rc:128 msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" -msgstr "" +msgstr "(UTC+08:00) Пекин, Чунцин, Гонконг, Урумчи" #: dlls/tzres/tzres.rc:267 msgid "North Asia Standard Time" @@ -10399,11 +10399,11 @@ msgstr "(UTC+07:00) Красноярск" #: dlls/tzres/tzres.rc:168 msgid "Georgian Standard Time" -msgstr "" +msgstr "Грузинское стандартное время" #: dlls/tzres/tzres.rc:169 msgid "Georgian Daylight Time" -msgstr "" +msgstr "Грузинское летнее время" #: dlls/tzres/tzres.rc:170 msgid "(UTC+04:00) Tbilisi" @@ -10419,11 +10419,11 @@ msgstr "" #: dlls/tzres/tzres.rc:252 msgid "Nepal Standard Time" -msgstr "" +msgstr "Непальское стандартное время" #: dlls/tzres/tzres.rc:253 msgid "Nepal Daylight Time" -msgstr "" +msgstr "Непальское летнее время" #: dlls/tzres/tzres.rc:254 msgid "(UTC+05:45) Kathmandu" @@ -10443,11 +10443,11 @@ msgstr "" #: dlls/tzres/tzres.rc:183 msgid "Haiti Standard Time" -msgstr "" +msgstr "Гаитянское стандартное время" #: dlls/tzres/tzres.rc:184 msgid "Haiti Daylight Time" -msgstr "" +msgstr "Гаитянское летнее время" #: dlls/tzres/tzres.rc:185 msgid "(UTC-05:00) Haiti" @@ -10467,11 +10467,11 @@ msgstr "(UTC+01:00) Сараево, Скопье, Варшава, Загреб" #: dlls/tzres/tzres.rc:234 msgid "Morocco Standard Time" -msgstr "" +msgstr "Марокканское стандартное время" #: dlls/tzres/tzres.rc:235 msgid "Morocco Daylight Time" -msgstr "" +msgstr "Марокканское летнее время" #: dlls/tzres/tzres.rc:236 msgid "(UTC+01:00) Casablanca" @@ -10487,23 +10487,23 @@ msgstr "" #: dlls/tzres/tzres.rc:39 msgid "Altai Standard Time" -msgstr "" +msgstr "Алтайское стандартное время" #: dlls/tzres/tzres.rc:40 msgid "Altai Daylight Time" -msgstr "" +msgstr "Алтайское летнее время" #: dlls/tzres/tzres.rc:41 msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" -msgstr "" +msgstr "(UTC+07:00) Барнаул, Горно-Алтайск" #: dlls/tzres/tzres.rc:108 msgid "Central Europe Standard Time" -msgstr "" +msgstr "Центральноевропейское стандартное время" #: dlls/tzres/tzres.rc:109 msgid "Central Europe Daylight Time" -msgstr "" +msgstr "Центральноевропейское летнее время" #: dlls/tzres/tzres.rc:110 msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" @@ -10511,11 +10511,11 @@ msgstr "(UTC+01:00) Белград, Братислава, Будапешт, Лю #: dlls/tzres/tzres.rc:192 msgid "Iran Standard Time" -msgstr "" +msgstr "Иранское стандартное время" #: dlls/tzres/tzres.rc:193 msgid "Iran Daylight Time" -msgstr "" +msgstr "Иранское летнее время" #: dlls/tzres/tzres.rc:194 msgid "(UTC+03:30) Tehran" @@ -10523,51 +10523,51 @@ msgstr "(UTC+03:30) Тегеран" #: dlls/tzres/tzres.rc:318 msgid "Saint Pierre Standard Time" -msgstr "" +msgstr "Сен-Пьер стандартное время" #: dlls/tzres/tzres.rc:319 msgid "Saint Pierre Daylight Time" -msgstr "" +msgstr "Сен-Пьер летнее время" #: dlls/tzres/tzres.rc:320 msgid "(UTC-03:00) Saint Pierre and Miquelon" -msgstr "" +msgstr "(UTC-03:00) Сен-Пьер и Микелон" #: dlls/tzres/tzres.rc:327 msgid "Sao Tome Standard Time" -msgstr "" +msgstr "Сан-Томе стандартное время" #: dlls/tzres/tzres.rc:328 msgid "Sao Tome Daylight Time" -msgstr "" +msgstr "Сан-Томе летнее время" #: dlls/tzres/tzres.rc:329 msgid "(UTC+00:00) Sao Tome" -msgstr "" +msgstr "(UTC+00:00) Сан-Томе" #: dlls/tzres/tzres.rc:249 msgid "Namibia Standard Time" -msgstr "" +msgstr "Намибийское стандартное время" #: dlls/tzres/tzres.rc:250 msgid "Namibia Daylight Time" -msgstr "" +msgstr "Намибийское летнее время" #: dlls/tzres/tzres.rc:251 msgid "(UTC+02:00) Windhoek" -msgstr "" +msgstr "(UTC+02:00) Виндхук" #: dlls/tzres/tzres.rc:369 msgid "Tonga Standard Time" -msgstr "" +msgstr "Тонга стандартное время" #: dlls/tzres/tzres.rc:370 msgid "Tonga Daylight Time" -msgstr "" +msgstr "Тонга летнее время" #: dlls/tzres/tzres.rc:371 msgid "(UTC+13:00) Nuku'alofa" -msgstr "" +msgstr "(UTC+13:00) Нукуалофа" #: dlls/tzres/tzres.rc:240 msgid "Mountain Standard Time (Mexico)" @@ -10583,11 +10583,11 @@ msgstr "" #: dlls/tzres/tzres.rc:171 msgid "GMT Standard Time" -msgstr "" +msgstr "Стандартное время GMT" #: dlls/tzres/tzres.rc:172 msgid "GMT Daylight Time" -msgstr "" +msgstr "Стандартное время GMT" #: dlls/tzres/tzres.rc:173 msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" @@ -10595,23 +10595,23 @@ msgstr "(UTC+00:00) Дублин, Эдинбург, Лиссабон, Лондо #: dlls/tzres/tzres.rc:342 msgid "South Sudan Standard Time" -msgstr "" +msgstr "Южный Судан стандартное время" #: dlls/tzres/tzres.rc:343 msgid "South Sudan Daylight Time" -msgstr "" +msgstr "Южный Судан летнее время" #: dlls/tzres/tzres.rc:344 msgid "(UTC+02:00) Juba" -msgstr "" +msgstr "(UTC+02:00) Джуба" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" -msgstr "" +msgstr "Центральноазиатское стандартное время" #: dlls/tzres/tzres.rc:103 msgid "Central Asia Daylight Time" -msgstr "" +msgstr "Центральноазиатское летнее время" #: dlls/tzres/tzres.rc:104 msgid "(UTC+06:00) Astana" @@ -10631,11 +10631,11 @@ msgstr "" #: dlls/tzres/tzres.rc:48 msgid "Arabic Standard Time" -msgstr "" +msgstr "Арабское стандартное время" #: dlls/tzres/tzres.rc:49 msgid "Arabic Daylight Time" -msgstr "" +msgstr "Арабское летнее время" #: dlls/tzres/tzres.rc:50 msgid "(UTC+03:00) Baghdad" @@ -10651,11 +10651,11 @@ msgstr "" #: dlls/tzres/tzres.rc:216 msgid "Magadan Standard Time" -msgstr "" +msgstr "Магаданское стандартное время" #: dlls/tzres/tzres.rc:217 msgid "Magadan Daylight Time" -msgstr "" +msgstr "Магаданское летнее время" #: dlls/tzres/tzres.rc:218 msgid "(UTC+11:00) Magadan" @@ -10675,15 +10675,15 @@ msgstr "" #: dlls/tzres/tzres.rc:348 msgid "Sudan Standard Time" -msgstr "" +msgstr "Суданское стандартное время" #: dlls/tzres/tzres.rc:349 msgid "Sudan Daylight Time" -msgstr "" +msgstr "Суданское летнее время" #: dlls/tzres/tzres.rc:350 msgid "(UTC+02:00) Khartoum" -msgstr "" +msgstr "(UTC+02:00) Хартум" #: dlls/tzres/tzres.rc:438 msgid "West Pacific Standard Time" @@ -10695,7 +10695,7 @@ msgstr "" #: dlls/tzres/tzres.rc:440 msgid "(UTC+10:00) Guam, Port Moresby" -msgstr "" +msgstr "(UTC+10:00) Гуам, Порт-Морсби" #: dlls/tzres/tzres.rc:279 msgid "Pacific Standard Time" @@ -10711,11 +10711,11 @@ msgstr "" #: dlls/tzres/tzres.rc:69 msgid "Azerbaijan Standard Time" -msgstr "" +msgstr "Азербайджанское стандартное время" #: dlls/tzres/tzres.rc:70 msgid "Azerbaijan Daylight Time" -msgstr "" +msgstr "Азербайджанское летнее время" #: dlls/tzres/tzres.rc:71 msgid "(UTC+04:00) Baku" @@ -10731,15 +10731,15 @@ msgstr "" #: dlls/tzres/tzres.rc:221 msgid "(UTC-03:00) Punta Arenas" -msgstr "" +msgstr "(UTC-03:00) Пунта-Аренас" #: dlls/tzres/tzres.rc:324 msgid "Samoa Standard Time" -msgstr "" +msgstr "Стандартное время Самоа" #: dlls/tzres/tzres.rc:325 msgid "Samoa Daylight Time" -msgstr "" +msgstr "Летнее время Самоа" #: dlls/tzres/tzres.rc:326 msgid "(UTC+13:00) Samoa" @@ -10747,11 +10747,11 @@ msgstr "(UTC+13:00) Самоа" #: dlls/tzres/tzres.rc:201 msgid "Kaliningrad Standard Time" -msgstr "" +msgstr "Калининградское стандартное время" #: dlls/tzres/tzres.rc:202 msgid "Kaliningrad Daylight Time" -msgstr "" +msgstr "Калининградское летнее время" #: dlls/tzres/tzres.rc:203 msgid "(UTC+02:00) Kaliningrad" @@ -10767,15 +10767,15 @@ msgstr "" #: dlls/tzres/tzres.rc:284 msgid "(UTC-08:00) Baja California" -msgstr "" +msgstr "(UTC-08:00) Нижняя Калифорния" #: dlls/tzres/tzres.rc:228 msgid "Middle East Standard Time" -msgstr "" +msgstr "Ближневосточное стандартное время" #: dlls/tzres/tzres.rc:229 msgid "Middle East Daylight Time" -msgstr "" +msgstr "Ближневосточное летнее время" #: dlls/tzres/tzres.rc:230 msgid "(UTC+02:00) Beirut" @@ -10783,15 +10783,15 @@ msgstr "(UTC+02:00) Бейрут" #: dlls/tzres/tzres.rc:363 msgid "Tokyo Standard Time" -msgstr "" +msgstr "Стандартное время Токио" #: dlls/tzres/tzres.rc:364 msgid "Tokyo Daylight Time" -msgstr "" +msgstr "Летнее время Токио" #: dlls/tzres/tzres.rc:365 msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" -msgstr "" +msgstr "(UTC+09:00) Осака, Саппоро, Токио" #: dlls/tzres/tzres.rc:210 msgid "Line Islands Standard Time" @@ -10803,15 +10803,15 @@ msgstr "" #: dlls/tzres/tzres.rc:212 msgid "(UTC+14:00) Kiritimati Island" -msgstr "" +msgstr "(UTC+14:00) Кирибати" #: dlls/tzres/tzres.rc:129 msgid "Cuba Standard Time" -msgstr "" +msgstr "Кубинское стандартное время" #: dlls/tzres/tzres.rc:130 msgid "Cuba Daylight Time" -msgstr "" +msgstr "Кубинское летнее время" #: dlls/tzres/tzres.rc:131 msgid "(UTC-05:00) Havana" @@ -10819,11 +10819,11 @@ msgstr "(UTC-05:00) Гавана" #: dlls/tzres/tzres.rc:198 msgid "Jordan Standard Time" -msgstr "" +msgstr "Иорданское стандартное время" #: dlls/tzres/tzres.rc:199 msgid "Jordan Daylight Time" -msgstr "" +msgstr "Иорданское летнее время" #: dlls/tzres/tzres.rc:200 msgid "(UTC+02:00) Amman" @@ -10831,15 +10831,15 @@ msgstr "(UTC+02:00) Амман" #: dlls/tzres/tzres.rc:117 msgid "Central Standard Time" -msgstr "" +msgstr "Центральное время" #: dlls/tzres/tzres.rc:118 msgid "Central Daylight Time" -msgstr "" +msgstr "Центральное летнее время" #: dlls/tzres/tzres.rc:119 msgid "(UTC-06:00) Central Time (US & Canada)" -msgstr "" +msgstr "(UTC-06:00) Центральное время (США и Канада)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 msgid "Russia Time Zone 3" @@ -10851,11 +10851,11 @@ msgstr "(UTC+04:00) Ижевск, Самара" #: dlls/tzres/tzres.rc:417 msgid "Volgograd Standard Time" -msgstr "" +msgstr "Волгоградское стандартное время" #: dlls/tzres/tzres.rc:418 msgid "Volgograd Daylight Time" -msgstr "" +msgstr "Волгоградское летнее время" #: dlls/tzres/tzres.rc:419 msgid "(UTC+04:00) Volgograd" @@ -10863,15 +10863,15 @@ msgstr "(UTC+04:00) Волгоград" #: dlls/tzres/tzres.rc:72 msgid "Azores Standard Time" -msgstr "" +msgstr "Азорское стандартное время" #: dlls/tzres/tzres.rc:73 msgid "Azores Daylight Time" -msgstr "" +msgstr "Азорское летнее время" #: dlls/tzres/tzres.rc:74 msgid "(UTC-01:00) Azores" -msgstr "" +msgstr "(UTC-01:00) Азорские острова" #: dlls/tzres/tzres.rc:264 msgid "North Asia East Standard Time" @@ -10895,39 +10895,39 @@ msgstr "" #: dlls/tzres/tzres.rc:51 msgid "Argentina Standard Time" -msgstr "" +msgstr "Аргентинское стандартное время" #: dlls/tzres/tzres.rc:52 msgid "Argentina Daylight Time" -msgstr "" +msgstr "Аргентинское летнее время" #: dlls/tzres/tzres.rc:53 msgid "(UTC-03:00) City of Buenos Aires" -msgstr "" +msgstr "(UTC-03:00) Буэнос-Айрес" #: dlls/tzres/tzres.rc:378 msgid "Turks And Caicos Standard Time" -msgstr "" +msgstr "Теркс и Кайкос стандартное время" #: dlls/tzres/tzres.rc:379 msgid "Turks And Caicos Daylight Time" -msgstr "" +msgstr "Теркс и Кайкос летнее время" #: dlls/tzres/tzres.rc:380 msgid "(UTC-05:00) Turks and Caicos" -msgstr "" +msgstr "(UTC-05:00) Теркс и Кайкос" #: dlls/tzres/tzres.rc:222 msgid "Marquesas Standard Time" -msgstr "" +msgstr "Маркизские острова стандартное время" #: dlls/tzres/tzres.rc:223 msgid "Marquesas Daylight Time" -msgstr "" +msgstr "Маркизские острова летнее время" #: dlls/tzres/tzres.rc:224 msgid "(UTC-09:30) Marquesas Islands" -msgstr "" +msgstr "(UTC-09:30) Маркизские острова" #: dlls/tzres/tzres.rc:243 msgid "Myanmar Standard Time" @@ -10951,11 +10951,11 @@ msgstr "" #: dlls/tzres/tzres.rc:189 msgid "India Standard Time" -msgstr "" +msgstr "Индийское стандартное время" #: dlls/tzres/tzres.rc:190 msgid "India Daylight Time" -msgstr "" +msgstr "Индийское летнее время" #: dlls/tzres/tzres.rc:191 msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" @@ -10975,11 +10975,11 @@ msgstr "(UTC+02:00) Афины, Бухарест" #: dlls/tzres/tzres.rc:375 msgid "Turkey Standard Time" -msgstr "" +msgstr "Турецкое стандартное время" #: dlls/tzres/tzres.rc:376 msgid "Turkey Daylight Time" -msgstr "" +msgstr "Турецкое летнее время" #: dlls/tzres/tzres.rc:377 msgid "(UTC+03:00) Istanbul" @@ -10987,11 +10987,11 @@ msgstr "(UTC+03:00) Стамбул" #: dlls/tzres/tzres.rc:54 msgid "Astrakhan Standard Time" -msgstr "" +msgstr "Астраханское стандартное время" #: dlls/tzres/tzres.rc:55 msgid "Astrakhan Daylight Time" -msgstr "" +msgstr "Астраханское летнее время" #: dlls/tzres/tzres.rc:56 msgid "(UTC+04:00) Astrakhan, Ulyanovsk" @@ -10999,11 +10999,11 @@ msgstr "(UTC+04:00) Астрахань, Ульяновск" #: dlls/tzres/tzres.rc:162 msgid "Fiji Standard Time" -msgstr "" +msgstr "Стандартное время Фиджи" #: dlls/tzres/tzres.rc:163 msgid "Fiji Daylight Time" -msgstr "" +msgstr "Летнее время Фиджи" #: dlls/tzres/tzres.rc:164 msgid "(UTC+12:00) Fiji" @@ -11011,23 +11011,23 @@ msgstr "(UTC+12:00) Фиджи" #: dlls/tzres/tzres.rc:87 msgid "Canada Central Standard Time" -msgstr "" +msgstr "Центральное канадское время" #: dlls/tzres/tzres.rc:88 msgid "Canada Central Daylight Time" -msgstr "" +msgstr "Центральное канадское летнее время" #: dlls/tzres/tzres.rc:89 msgid "(UTC-06:00) Saskatchewan" -msgstr "" +msgstr "(UTC-06:00) Саскачеван" #: dlls/tzres/tzres.rc:444 msgid "Yukon Standard Time" -msgstr "" +msgstr "Стандартное время Юкон" #: dlls/tzres/tzres.rc:445 msgid "Yukon Daylight Time" -msgstr "" +msgstr "Летнее время Юкон" #: dlls/tzres/tzres.rc:446 msgid "(UTC-07:00) Yukon" @@ -11035,23 +11035,23 @@ msgstr "(UTC-07:00) Юкон" #: dlls/tzres/tzres.rc:354 msgid "Taipei Standard Time" -msgstr "" +msgstr "Тайбэйское стандартное время" #: dlls/tzres/tzres.rc:355 msgid "Taipei Daylight Time" -msgstr "" +msgstr "Тайбэйское летнее время" #: dlls/tzres/tzres.rc:356 msgid "(UTC+08:00) Taipei" -msgstr "" +msgstr "(UTC+08:00) Тайбэй" #: dlls/tzres/tzres.rc:426 msgid "W. Europe Standard Time" -msgstr "" +msgstr "Западноевропейское стандартное время" #: dlls/tzres/tzres.rc:427 msgid "W. Europe Daylight Time" -msgstr "" +msgstr "Западноевропейское летнее время" #: dlls/tzres/tzres.rc:428 msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" @@ -11059,11 +11059,11 @@ msgstr "(UTC+01:00) Амстердам, Берлин, Берн, Стокголь #: dlls/tzres/tzres.rc:231 msgid "Montevideo Standard Time" -msgstr "" +msgstr "Монтевидео стандартное время" #: dlls/tzres/tzres.rc:232 msgid "Montevideo Daylight Time" -msgstr "" +msgstr "Монтевидео летнее время" #: dlls/tzres/tzres.rc:233 msgid "(UTC-03:00) Montevideo" @@ -11071,11 +11071,11 @@ msgstr "(UTC-03:00) Монтевидео" #: dlls/tzres/tzres.rc:285 msgid "Pakistan Standard Time" -msgstr "" +msgstr "Пакистанское стандартное время" #: dlls/tzres/tzres.rc:286 msgid "Pakistan Daylight Time" -msgstr "" +msgstr "Пакистанское летнее время" #: dlls/tzres/tzres.rc:287 msgid "(UTC+05:00) Islamabad, Karachi" @@ -11083,11 +11083,11 @@ msgstr "(UTC+05:00) Исламабад, Карачи" #: dlls/tzres/tzres.rc:366 msgid "Tomsk Standard Time" -msgstr "" +msgstr "Томское стандартное время" #: dlls/tzres/tzres.rc:367 msgid "Tomsk Daylight Time" -msgstr "" +msgstr "Томское летнее время" #: dlls/tzres/tzres.rc:368 msgid "(UTC+07:00) Tomsk" @@ -11095,11 +11095,11 @@ msgstr "(UTC+07:00) Томск" #: dlls/tzres/tzres.rc:93 msgid "Caucasus Standard Time" -msgstr "" +msgstr "Кавказское стандартное время" #: dlls/tzres/tzres.rc:94 msgid "Caucasus Daylight Time" -msgstr "" +msgstr "Кавказское летнее время" #: dlls/tzres/tzres.rc:95 msgid "(UTC+04:00) Yerevan" @@ -11107,11 +11107,11 @@ msgstr "(UTC+04:00) Ереван" #: dlls/tzres/tzres.rc:66 msgid "AUS Eastern Standard Time" -msgstr "" +msgstr "Восточноавстралийское стандартное время" #: dlls/tzres/tzres.rc:67 msgid "AUS Eastern Daylight Time" -msgstr "" +msgstr "Восточноавстралийское летнее время" #: dlls/tzres/tzres.rc:68 msgid "(UTC+10:00) Canberra, Melbourne, Sydney" @@ -11131,15 +11131,15 @@ msgstr "(UTC+07:00) Новосибирск" #: dlls/tzres/tzres.rc:150 msgid "Eastern Standard Time" -msgstr "" +msgstr "Восточное стандартное время" #: dlls/tzres/tzres.rc:151 msgid "Eastern Daylight Time" -msgstr "" +msgstr "Восточное летнее время" #: dlls/tzres/tzres.rc:152 msgid "(UTC-05:00) Eastern Time (US & Canada)" -msgstr "" +msgstr "(UTC-05:00) Восточное время (США и Канада)" #: dlls/tzres/tzres.rc:372 msgid "Transbaikal Standard Time" @@ -11155,11 +11155,11 @@ msgstr "(UTC+09:00) Чита" #: dlls/tzres/tzres.rc:141 msgid "E. Europe Standard Time" -msgstr "" +msgstr "Восточноевропейское стандартное время" #: dlls/tzres/tzres.rc:142 msgid "E. Europe Daylight Time" -msgstr "" +msgstr "Восточноевропейское летнее время" #: dlls/tzres/tzres.rc:143 msgid "(UTC+02:00) Chisinau" @@ -11179,11 +11179,11 @@ msgstr "(UTC-06:00) Гвадалахара, Мехико, Монтеррей" #: dlls/tzres/tzres.rc:330 msgid "Saratov Standard Time" -msgstr "" +msgstr "Саратовское стандартное время" #: dlls/tzres/tzres.rc:331 msgid "Saratov Daylight Time" -msgstr "" +msgstr "Саратовское летнее время" #: dlls/tzres/tzres.rc:332 msgid "(UTC+04:00) Saratov" @@ -11191,15 +11191,15 @@ msgstr "(UTC+04:00) Саратов" #: dlls/tzres/tzres.rc:57 msgid "Atlantic Standard Time" -msgstr "" +msgstr "Атлантическое стандартное время" #: dlls/tzres/tzres.rc:58 msgid "Atlantic Daylight Time" -msgstr "" +msgstr "Атлантическое летнее время" #: dlls/tzres/tzres.rc:59 msgid "(UTC-04:00) Atlantic Time (Canada)" -msgstr "" +msgstr "(UTC-04:00) Атлантическое время (Канада)" #: dlls/tzres/tzres.rc:237 msgid "Mountain Standard Time" @@ -11223,15 +11223,15 @@ msgstr "" #: dlls/tzres/tzres.rc:386 msgid "(UTC-05:00) Indiana (East)" -msgstr "" +msgstr "(UTC-05:00) Индиана (запад)" #: dlls/tzres/tzres.rc:321 msgid "Sakhalin Standard Time" -msgstr "" +msgstr "Сахалинское стандартное время" #: dlls/tzres/tzres.rc:322 msgid "Sakhalin Daylight Time" -msgstr "" +msgstr "Сахалинское летнее время" #: dlls/tzres/tzres.rc:323 msgid "(UTC+11:00) Sakhalin" @@ -11239,39 +11239,39 @@ msgstr "(UTC+11:00) Сахалин" #: dlls/tzres/tzres.rc:270 msgid "North Korea Standard Time" -msgstr "" +msgstr "Северокорейское стандартное время" #: dlls/tzres/tzres.rc:271 msgid "North Korea Daylight Time" -msgstr "" +msgstr "Северокорейское летнее время" #: dlls/tzres/tzres.rc:272 msgid "(UTC+09:00) Pyongyang" -msgstr "" +msgstr "(UTC+09:00) Пхеньян" #: dlls/tzres/tzres.rc:357 msgid "Tasmania Standard Time" -msgstr "" +msgstr "Тасманийское стандартное время" #: dlls/tzres/tzres.rc:358 msgid "Tasmania Daylight Time" -msgstr "" +msgstr "Тасманийское летнее время" #: dlls/tzres/tzres.rc:359 msgid "(UTC+10:00) Hobart" -msgstr "" +msgstr "(UTC+10:00) Хобарт" #: dlls/tzres/tzres.rc:99 msgid "Central America Standard Time" -msgstr "" +msgstr "Центральноамериканское стандартное время" #: dlls/tzres/tzres.rc:100 msgid "Central America Daylight Time" -msgstr "" +msgstr "Центральноамериканское летнее время" #: dlls/tzres/tzres.rc:101 msgid "(UTC-06:00) Central America" -msgstr "" +msgstr "(UTC-06:00) Центральная Америка" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 msgid "UTC-02" @@ -11295,15 +11295,15 @@ msgstr "(UTC-07:00) Аризона" #: dlls/tzres/tzres.rc:339 msgid "South Africa Standard Time" -msgstr "" +msgstr "Южноафриканское стандартное время" #: dlls/tzres/tzres.rc:340 msgid "South Africa Daylight Time" -msgstr "" +msgstr "Южноафриканское летнее время" #: dlls/tzres/tzres.rc:341 msgid "(UTC+02:00) Harare, Pretoria" -msgstr "" +msgstr "(UTC+02:00) Хараре, Претория" #: dlls/tzres/tzres.rc:96 msgid "Cen. Australia Standard Time" @@ -11339,11 +11339,11 @@ msgstr "" #: dlls/tzres/tzres.rc:30 msgid "Afghanistan Standard Time" -msgstr "" +msgstr "Афганское стандартное время" #: dlls/tzres/tzres.rc:31 msgid "Afghanistan Daylight Time" -msgstr "" +msgstr "Афганское летнее время" #: dlls/tzres/tzres.rc:32 msgid "(UTC+04:30) Kabul" @@ -11351,11 +11351,11 @@ msgstr "(UTC+04:30) Кабул" #: dlls/tzres/tzres.rc:441 msgid "Yakutsk Standard Time" -msgstr "" +msgstr "Якутское стандартное время" #: dlls/tzres/tzres.rc:442 msgid "Yakutsk Daylight Time" -msgstr "" +msgstr "Якутское летнее время" #: dlls/tzres/tzres.rc:443 msgid "(UTC+09:00) Yakutsk" @@ -11375,11 +11375,11 @@ msgstr "" #: dlls/tzres/tzres.rc:42 msgid "Arab Standard Time" -msgstr "" +msgstr "Арабское стандартное время" #: dlls/tzres/tzres.rc:43 msgid "Arab Daylight Time" -msgstr "" +msgstr "Арабское летнее время" #: dlls/tzres/tzres.rc:44 msgid "(UTC+03:00) Kuwait, Riyadh" @@ -11387,15 +11387,15 @@ msgstr "(UTC+03:00) Кувейт, Риад" #: dlls/tzres/tzres.rc:45 msgid "Arabian Standard Time" -msgstr "" +msgstr "Аравийское стандартное время" #: dlls/tzres/tzres.rc:46 msgid "Arabian Daylight Time" -msgstr "" +msgstr "Аравийское летнее время" #: dlls/tzres/tzres.rc:47 msgid "(UTC+04:00) Abu Dhabi, Muscat" -msgstr "" +msgstr "(UTC+04:00) Абу-Даби, Мускат" #: dlls/tzres/tzres.rc:360 msgid "Tocantins Standard Time" @@ -11407,15 +11407,15 @@ msgstr "" #: dlls/tzres/tzres.rc:362 msgid "(UTC-03:00) Araguaina" -msgstr "" +msgstr "(UTC-03:00) Арагуаина" #: dlls/tzres/tzres.rc:306 msgid "Russian Standard Time" -msgstr "" +msgstr "Российское стандартное время" #: dlls/tzres/tzres.rc:307 msgid "Russian Daylight Time" -msgstr "" +msgstr "Российское летнее время" #: dlls/tzres/tzres.rc:308 msgid "(UTC+03:00) Moscow, St. Petersburg" @@ -11447,11 +11447,11 @@ msgstr "(UTC+01:00) Брюссель, Копенгаген, Мадрид, Пар #: dlls/tzres/tzres.rc:159 msgid "Ekaterinburg Standard Time" -msgstr "" +msgstr "Екатеринбургское стандартное время" #: dlls/tzres/tzres.rc:160 msgid "Ekaterinburg Daylight Time" -msgstr "" +msgstr "Екатеринбургское летнее время" #: dlls/tzres/tzres.rc:161 msgid "(UTC+05:00) Ekaterinburg" @@ -11475,15 +11475,15 @@ msgstr "" #: dlls/tzres/tzres.rc:437 msgid "(UTC+02:00) Gaza, Hebron" -msgstr "" +msgstr "(UTC+02:00) Газа, Хеврон" #: dlls/tzres/tzres.rc:351 msgid "Syria Standard Time" -msgstr "" +msgstr "Сирийское стандартное время" #: dlls/tzres/tzres.rc:352 msgid "Syria Daylight Time" -msgstr "" +msgstr "Сирийское летнее время" #: dlls/tzres/tzres.rc:353 msgid "(UTC+02:00) Damascus" @@ -11511,7 +11511,7 @@ msgstr "" #: dlls/tzres/tzres.rc:179 msgid "(UTC+00:00) Monrovia, Reykjavik" -msgstr "" +msgstr "(UTC+00:00) Монровия, Рейкьявик" #: dlls/tzres/tzres.rc:381 msgid "Ulaanbaatar Standard Time" @@ -11523,27 +11523,27 @@ msgstr "" #: dlls/tzres/tzres.rc:383 msgid "(UTC+08:00) Ulaanbaatar" -msgstr "" +msgstr "(UTC+08:00) Улан-Батор" #: dlls/tzres/tzres.rc:261 msgid "Norfolk Standard Time" -msgstr "" +msgstr "Норфолк стандартное время" #: dlls/tzres/tzres.rc:262 msgid "Norfolk Daylight Time" -msgstr "" +msgstr "Норфолк летнее время" #: dlls/tzres/tzres.rc:263 msgid "(UTC+11:00) Norfolk Island" -msgstr "" +msgstr "(UTC+11:00) Остров Норфолк" #: dlls/tzres/tzres.rc:195 msgid "Israel Standard Time" -msgstr "" +msgstr "Израильское стандартное время" #: dlls/tzres/tzres.rc:196 msgid "Israel Daylight Time" -msgstr "" +msgstr "Израильское летнее время" #: dlls/tzres/tzres.rc:197 msgid "(UTC+02:00) Jerusalem" @@ -11559,7 +11559,7 @@ msgstr "" #: dlls/tzres/tzres.rc:80 msgid "(UTC+06:00) Dhaka" -msgstr "" +msgstr "(UTC+06:00) Дакка" #: dlls/tzres/tzres.rc:312 msgid "SA Pacific Standard Time" @@ -11571,7 +11571,7 @@ msgstr "" #: dlls/tzres/tzres.rc:314 msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" -msgstr "" +msgstr "(UTC-05:00) Богота, Лима, Кито, Риу-Бранку" #: dlls/tzres/tzres.rc:432 msgid "West Asia Standard Time" @@ -11623,11 +11623,11 @@ msgstr "" #: dlls/tzres/tzres.rc:207 msgid "Libya Standard Time" -msgstr "" +msgstr "Ливийское стандартное время" #: dlls/tzres/tzres.rc:208 msgid "Libya Daylight Time" -msgstr "" +msgstr "Ливийское летнее время" #: dlls/tzres/tzres.rc:209 msgid "(UTC+02:00) Tripoli" @@ -11647,35 +11647,35 @@ msgstr "(UTC-03:00) Сальвадор" #: dlls/tzres/tzres.rc:411 msgid "Venezuela Standard Time" -msgstr "" +msgstr "Венесуэльское стандартное время" #: dlls/tzres/tzres.rc:412 msgid "Venezuela Daylight Time" -msgstr "" +msgstr "Венесуэльское летнее время" #: dlls/tzres/tzres.rc:413 msgid "(UTC-04:00) Caracas" -msgstr "" +msgstr "(UTC-04:00) Каракас" #: dlls/tzres/tzres.rc:84 msgid "Bougainville Standard Time" -msgstr "" +msgstr "Бугенвиль стандартное время" #: dlls/tzres/tzres.rc:85 msgid "Bougainville Daylight Time" -msgstr "" +msgstr "Бугенвиль летнее время" #: dlls/tzres/tzres.rc:86 msgid "(UTC+11:00) Bougainville Island" -msgstr "" +msgstr "(UTC+11:00) Остров Бугенвиль" #: dlls/tzres/tzres.rc:186 msgid "Hawaiian Standard Time" -msgstr "" +msgstr "Гавайское стандартное время" #: dlls/tzres/tzres.rc:187 msgid "Hawaiian Daylight Time" -msgstr "" +msgstr "Гавайское летнее время" #: dlls/tzres/tzres.rc:188 msgid "(UTC-10:00) Hawaii" @@ -11703,7 +11703,7 @@ msgstr "" #: dlls/tzres/tzres.rc:293 msgid "(UTC+05:00) Qyzylorda" -msgstr "" +msgstr "(UTC+05:00) Кызылорда" #: dlls/tzres/tzres.rc:429 msgid "W. Mongolia Standard Time" @@ -11715,7 +11715,7 @@ msgstr "" #: dlls/tzres/tzres.rc:431 msgid "(UTC+07:00) Hovd" -msgstr "" +msgstr "(UTC+07:00) Ховд" #: dlls/tzres/tzres.rc:255 msgid "New Zealand Standard Time" @@ -11731,23 +11731,23 @@ msgstr "(UTC+12:00) Окленд, Веллингтон" #: dlls/tzres/tzres.rc:36 msgid "Aleutian Standard Time" -msgstr "" +msgstr "Алеутское стандартное время" #: dlls/tzres/tzres.rc:37 msgid "Aleutian Daylight Time" -msgstr "" +msgstr "Алеутское летнее время" #: dlls/tzres/tzres.rc:38 msgid "(UTC-10:00) Aleutian Islands" -msgstr "" +msgstr "(UTC-10:00) Алеутские острова" #: dlls/tzres/tzres.rc:273 msgid "Omsk Standard Time" -msgstr "" +msgstr "Омское стандартное время" #: dlls/tzres/tzres.rc:274 msgid "Omsk Daylight Time" -msgstr "" +msgstr "Омское летнее время" #: dlls/tzres/tzres.rc:275 msgid "(UTC+06:00) Omsk" @@ -11763,15 +11763,15 @@ msgstr "" #: dlls/tzres/tzres.rc:107 msgid "(UTC-04:00) Cuiaba" -msgstr "" +msgstr "(UTC-04:00) Куяба" #: dlls/tzres/tzres.rc:81 msgid "Belarus Standard Time" -msgstr "" +msgstr "Белорусское стандартное время" #: dlls/tzres/tzres.rc:82 msgid "Belarus Daylight Time" -msgstr "" +msgstr "Белорусское летнее время" #: dlls/tzres/tzres.rc:83 msgid "(UTC+03:00) Minsk" @@ -11791,11 +11791,11 @@ msgstr "" #: dlls/tzres/tzres.rc:174 msgid "Greenland Standard Time" -msgstr "" +msgstr "Гренландское стандартное время" #: dlls/tzres/tzres.rc:175 msgid "Greenland Daylight Time" -msgstr "" +msgstr "Гренландское летнее время" #: dlls/tzres/tzres.rc:176 msgid "(UTC-03:00) Greenland" @@ -11811,7 +11811,7 @@ msgstr "" #: dlls/tzres/tzres.rc:149 msgid "(UTC-06:00) Easter Island" -msgstr "" +msgstr "(UTC-06:00) Остров Пасхи" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 msgid "Russia Time Zone 10" @@ -11819,15 +11819,15 @@ msgstr "" #: dlls/tzres/tzres.rc:299 msgid "(UTC+11:00) Chokurdakh" -msgstr "" +msgstr "(UTC+11:00) Чокурдах" #: dlls/tzres/tzres.rc:156 msgid "Egypt Standard Time" -msgstr "" +msgstr "Египетское стандартное время" #: dlls/tzres/tzres.rc:157 msgid "Egypt Daylight Time" -msgstr "" +msgstr "Египетское летнее время" #: dlls/tzres/tzres.rc:158 msgid "(UTC+02:00) Cairo" @@ -11843,7 +11843,7 @@ msgstr "" #: dlls/tzres/tzres.rc:155 msgid "(UTC-05:00) Chetumal" -msgstr "" +msgstr "(UTC-05:00) Четумаль" #: dlls/tzres/tzres.rc:225 msgid "Mauritius Standard Time" @@ -11855,15 +11855,15 @@ msgstr "" #: dlls/tzres/tzres.rc:227 msgid "(UTC+04:00) Port Louis" -msgstr "" +msgstr "(UTC+04:00) Порт-Луи" #: dlls/tzres/tzres.rc:414 msgid "Vladivostok Standard Time" -msgstr "" +msgstr "Владивостокское стандартное время" #: dlls/tzres/tzres.rc:415 msgid "Vladivostok Daylight Time" -msgstr "" +msgstr "Владивостокское летнее время" #: dlls/tzres/tzres.rc:416 msgid "(UTC+10:00) Vladivostok" @@ -11871,23 +11871,23 @@ msgstr "(UTC+10:00) Владивосток" #: dlls/tzres/tzres.rc:336 msgid "Singapore Standard Time" -msgstr "" +msgstr "Сингапурское стандартное время" #: dlls/tzres/tzres.rc:337 msgid "Singapore Daylight Time" -msgstr "" +msgstr "Сингапурское летнее время" #: dlls/tzres/tzres.rc:338 msgid "(UTC+08:00) Kuala Lumpur, Singapore" -msgstr "" +msgstr "(UTC+08:00) Куала-Лумпур, Сингапур" #: dlls/tzres/tzres.rc:204 msgid "Korea Standard Time" -msgstr "" +msgstr "Корейское стандартное время" #: dlls/tzres/tzres.rc:205 msgid "Korea Daylight Time" -msgstr "" +msgstr "Корейское летнее время" #: dlls/tzres/tzres.rc:206 msgid "(UTC+09:00) Seoul" @@ -11903,7 +11903,7 @@ msgstr "" #: dlls/tzres/tzres.rc:125 msgid "(UTC+12:45) Chatham Islands" -msgstr "" +msgstr "(UTC+12:45) Острова Чатем" #: dlls/tzres/tzres.rc:135 msgid "E. Africa Standard Time" -- 2.34.1

1 0

[PATCH] taskmgr: Select process on switch from application to process
by David Kahurani 03 Jan '22

03 Jan '22

Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- programs/taskmgr/applpage.c | 22 ++++++++++++++-------- programs/taskmgr/perfdata.c | 21 +++++++++++++++++++++ programs/taskmgr/perfdata.h | 1 + 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index b35881c2..0cf9f48d 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -28,6 +28,7 @@ #include <commctrl.h> #include "taskmgr.h" +#include "perfdata.h" typedef struct { @@ -790,15 +791,20 @@ void ApplicationPage_OnGotoProcess(void) } if (pAPLI) { DWORD dwProcessId; + int index; + memset(&item, 0, sizeof(LV_ITEMW)); + item.state = LVIS_SELECTED | LVIS_FOCUSED; + item.stateMask = LVIS_SELECTED | LVIS_FOCUSED; - GetWindowThreadProcessId(pAPLI->hWnd, &dwProcessId); - /* - * Switch to the process tab - */ - SendMessageW(hTabWnd, TCM_SETCURFOCUS, 1, 0); - /* - * FIXME: Select the process item in the list - */ + GetWindowThreadProcessId(pAPLI->hWnd, &dwProcessId); + /* + * Switch to the process tab + */ + SendMessageW(hTabWnd, TCM_SETCURFOCUS, 1, 0); + + index = PerfDataGetProcessIndex(dwProcessId); + + SendMessageW(hProcessPageListCtrl, LVM_SETITEMSTATE, index, (LPARAM) &item); } } diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index 4498a2fe..e8dc8900 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -356,6 +356,27 @@ ULONG PerfDataGetProcessId(ULONG Index) return ProcessId; } +ULONG PerfDataGetProcessIndex(ULONG ProcessId) +{ + ULONG index; + + EnterCriticalSection(&PerfDataCriticalSection); + + for(index=0; index<ProcessCount; index++) + { + if(pPerfData[index].ProcessId == ProcessId) + break; + } + + LeaveCriticalSection(&PerfDataCriticalSection); + + if (index == ProcessCount) + return 0; + else + return index; +} + + BOOL PerfDataGetUserName(ULONG Index, LPWSTR lpUserName, int nMaxCount) { BOOL bSuccessful; diff --git a/programs/taskmgr/perfdata.h b/programs/taskmgr/perfdata.h index 615e7db2..ffc1d2d6 100644 --- a/programs/taskmgr/perfdata.h +++ b/programs/taskmgr/perfdata.h @@ -75,6 +75,7 @@ ULONG PerfDataGetProcessorSystemUsage(void); BOOL PerfDataGetImageName(ULONG Index, LPWSTR lpImageName, int nMaxCount); ULONG PerfDataGetProcessId(ULONG Index); +ULONG PerfDataGetProcessIndex(ULONG ProcessId); BOOL PerfDataGetUserName(ULONG Index, LPWSTR lpUserName, int nMaxCount); ULONG PerfDataGetSessionId(ULONG Index); ULONG PerfDataGetCPUUsage(ULONG Index); -- 2.25.1

1 0

[PATCH] msvcrt: Use __WINE_PE_BUILD in crt_gccmain.c.
by Jacek Caban 03 Jan '22

03 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52292 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/crt_gccmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] wmphoto: Fix memory leak on error path in wmp_decoder_create (Coverity)
by Alex Henrie 03 Jan '22

03 Jan '22

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/wmphoto/jxrlib.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wmphoto/jxrlib.c b/dlls/wmphoto/jxrlib.c index 757312b5f0f..3d7dedb869d 100644 --- a/dlls/wmphoto/jxrlib.c +++ b/dlls/wmphoto/jxrlib.c @@ -358,7 +358,10 @@ HRESULT CDECL wmp_decoder_create(struct decoder_info *info, struct decoder **res if (PKImageDecode_Create_WMP(&decoder)) return E_FAIL; This = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*This)); if (!This) + { + decoder->Release(&decoder); return E_OUTOFMEMORY; + } This->decoder_iface.vtable = &wmp_decoder_vtable; This->WMPStream_iface.Close = &wmp_stream_Close; -- 2.34.1

2 1

[PATCH v2 1/7] dinput/tests: Move tests from dinput8/tests.
by Rémi Bernon 03 Jan '22

03 Jan '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: More changes to the tests but this should avoid spurious failures caused by test output overflow. It's also probably something I think we should ultimately do, as there's little reason to keep these tests separated. configure.ac | 1 - dlls/dinput/tests/Makefile.in | 12 ++++++++++-- .../tests/device.c => dinput/tests/device8.c} | 2 +- dlls/dinput/tests/dinput.c | 4 +++- .../tests/dinput.c => dinput/tests/dinput8.c} | 5 ++--- dlls/{dinput8 => dinput}/tests/driver_hid.c | 0 dlls/{dinput8 => dinput}/tests/driver_hid.h | 0 dlls/{dinput8 => dinput}/tests/driver_hid.spec | 0 dlls/{dinput8 => dinput}/tests/hid.c | 0 dlls/{dinput8 => dinput}/tests/pop_hid_macros.h | 0 dlls/{dinput8 => dinput}/tests/psh_hid_macros.h | 0 dlls/dinput8/tests/Makefile.in | 12 ------------ 12 files changed, 16 insertions(+), 20 deletions(-) rename dlls/{dinput8/tests/device.c => dinput/tests/device8.c} (99%) rename dlls/{dinput8/tests/dinput.c => dinput/tests/dinput8.c} (99%) rename dlls/{dinput8 => dinput}/tests/driver_hid.c (100%) rename dlls/{dinput8 => dinput}/tests/driver_hid.h (100%) rename dlls/{dinput8 => dinput}/tests/driver_hid.spec (100%) rename dlls/{dinput8 => dinput}/tests/hid.c (100%) rename dlls/{dinput8 => dinput}/tests/pop_hid_macros.h (100%) rename dlls/{dinput8 => dinput}/tests/psh_hid_macros.h (100%) delete mode 100644 dlls/dinput8/tests/Makefile.in diff --git a/configure.ac b/configure.ac index 9b2c111119f..ddd45b8c241 100644 --- a/configure.ac +++ b/configure.ac @@ -2743,7 +2743,6 @@ WINE_CONFIG_MAKEFILE(dlls/difxapi) WINE_CONFIG_MAKEFILE(dlls/dinput) WINE_CONFIG_MAKEFILE(dlls/dinput/tests) WINE_CONFIG_MAKEFILE(dlls/dinput8) -WINE_CONFIG_MAKEFILE(dlls/dinput8/tests) WINE_CONFIG_MAKEFILE(dlls/directmanipulation) WINE_CONFIG_MAKEFILE(dlls/directmanipulation/tests) WINE_CONFIG_MAKEFILE(dlls/dispdib.dll16,enable_win16) diff --git a/dlls/dinput/tests/Makefile.in b/dlls/dinput/tests/Makefile.in index 858c2cdae7a..87a4dad2708 100644 --- a/dlls/dinput/tests/Makefile.in +++ b/dlls/dinput/tests/Makefile.in @@ -1,9 +1,17 @@ TESTDLL = dinput.dll -IMPORTS = dinput ole32 version user32 +IMPORTS = dinput dinput8 ole32 version user32 advapi32 hid uuid crypt32 newdev setupapi wintrust winmm -C_SRCS = \ +driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass +driver_hid_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native + +SOURCES = \ device.c \ + device8.c \ dinput.c \ + dinput8.c \ + driver_hid.c \ + driver_hid.spec \ + hid.c \ joystick.c \ keyboard.c \ mouse.c diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput/tests/device8.c similarity index 99% rename from dlls/dinput8/tests/device.c rename to dlls/dinput/tests/device8.c index 8b34de276db..817e843e33c 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput/tests/device8.c @@ -1836,7 +1836,7 @@ static void test_keyboard_info(void) ok( ref == 0, "Release returned %d\n", ref ); } -START_TEST(device) +START_TEST(device8) { instance = GetModuleHandleW( NULL ); diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index c7fa0b76397..10da888fdd4 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -19,8 +19,10 @@ #define DIRECTINPUT_VERSION 0x0700 #define COBJMACROS -#include <initguid.h> #include <windows.h> +#include "objbase.h" + +#include <initguid.h> #include <dinput.h> #include <dinputd.h> diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput/tests/dinput8.c similarity index 99% rename from dlls/dinput8/tests/dinput.c rename to dlls/dinput/tests/dinput8.c index 3e2e4fbb371..81aeb8191f6 100644 --- a/dlls/dinput8/tests/dinput.c +++ b/dlls/dinput/tests/dinput8.c @@ -22,13 +22,12 @@ #include <windows.h> #include <objidl.h> -#include <initguid.h> #include <dinput.h> #include <dinputd.h> #include "wine/test.h" -HINSTANCE hInstance; +static HINSTANCE hInstance; static BOOL CALLBACK dummy_callback(const DIDEVICEINSTANCEA *instance, void *context) { @@ -711,7 +710,7 @@ static void test_Initialize(void) IDirectInput8_Release(pDI); } -START_TEST(dinput) +START_TEST(dinput8) { hInstance = GetModuleHandleA(NULL); diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput/tests/driver_hid.c similarity index 100% rename from dlls/dinput8/tests/driver_hid.c rename to dlls/dinput/tests/driver_hid.c diff --git a/dlls/dinput8/tests/driver_hid.h b/dlls/dinput/tests/driver_hid.h similarity index 100% rename from dlls/dinput8/tests/driver_hid.h rename to dlls/dinput/tests/driver_hid.h diff --git a/dlls/dinput8/tests/driver_hid.spec b/dlls/dinput/tests/driver_hid.spec similarity index 100% rename from dlls/dinput8/tests/driver_hid.spec rename to dlls/dinput/tests/driver_hid.spec diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput/tests/hid.c similarity index 100% rename from dlls/dinput8/tests/hid.c rename to dlls/dinput/tests/hid.c diff --git a/dlls/dinput8/tests/pop_hid_macros.h b/dlls/dinput/tests/pop_hid_macros.h similarity index 100% rename from dlls/dinput8/tests/pop_hid_macros.h rename to dlls/dinput/tests/pop_hid_macros.h diff --git a/dlls/dinput8/tests/psh_hid_macros.h b/dlls/dinput/tests/psh_hid_macros.h similarity index 100% rename from dlls/dinput8/tests/psh_hid_macros.h rename to dlls/dinput/tests/psh_hid_macros.h diff --git a/dlls/dinput8/tests/Makefile.in b/dlls/dinput8/tests/Makefile.in deleted file mode 100644 index 336dbd500ba..00000000000 --- a/dlls/dinput8/tests/Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ -TESTDLL = dinput8.dll -IMPORTS = dinput8 dinput ole32 user32 hid advapi32 uuid crypt32 newdev setupapi wintrust winmm - -driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass -driver_hid_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native - -SOURCES = \ - device.c \ - dinput.c \ - driver_hid.c \ - driver_hid.spec \ - hid.c -- 2.34.1

2 12

[PATCH] include: Fix the definition of D3D_PRIMITIVE enum members.
by Zebediah Figura 03 Jan '22

03 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/d3dcommon.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 05577d34daf..7a53a84079d 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -319,7 +319,7 @@ typedef enum D3D_PRIMITIVE D3D_PRIMITIVE_17_CONTROL_POINT_PATCH, D3D_PRIMITIVE_18_CONTROL_POINT_PATCH, D3D_PRIMITIVE_19_CONTROL_POINT_PATCH, - D3D_PRIMITIVE_20_CONTROL_POINT_PATCH = 28, + D3D_PRIMITIVE_20_CONTROL_POINT_PATCH, D3D_PRIMITIVE_21_CONTROL_POINT_PATCH, D3D_PRIMITIVE_22_CONTROL_POINT_PATCH, D3D_PRIMITIVE_23_CONTROL_POINT_PATCH, @@ -363,7 +363,7 @@ typedef enum D3D_PRIMITIVE D3D11_PRIMITIVE_17_CONTROL_POINT_PATCH, D3D11_PRIMITIVE_18_CONTROL_POINT_PATCH, D3D11_PRIMITIVE_19_CONTROL_POINT_PATCH, - D3D11_PRIMITIVE_20_CONTROL_POINT_PATCH = 28, + D3D11_PRIMITIVE_20_CONTROL_POINT_PATCH, D3D11_PRIMITIVE_21_CONTROL_POINT_PATCH, D3D11_PRIMITIVE_22_CONTROL_POINT_PATCH, D3D11_PRIMITIVE_23_CONTROL_POINT_PATCH, -- 2.34.1

2 1

[tools] testbot/SetwinLocale: Tweak the --country checks and conversion.
by Francois Gouget 03 Jan '22

03 Jan '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index e7ae3c0ced..8360c76840 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -397,19 +397,19 @@ if (!defined $Usage) $OptLocale ||= $OptDefault; $OptSystem ||= $OptDefault; $OptMUI ||= $OptDefault; - if (!defined $OptCountry and defined $OptDefault and - $OptDefault =~ /-([A-Z]{2})$/) + + if (!$OptCountry and ($OptDefault || "") =~ /-([A-Z]{2})$/) { $OptCountry = $1; } - if (defined $OptCountry) + if ($OptCountry) { - if (!exists $Countries{$OptCountry}) + $CountryId = $Countries{$OptCountry}; + if (!defined $CountryId) { Error("unknown country '$OptCountry'\n"); $Usage = 2; } - $CountryId = $Countries{$OptCountry}; } if (!$OptLocale and !$OptSystem and !$OptMUI and !$OptKeyboard and -- 2.30.2

1 0

[tools] testbot/SetWinLocale: Fix the usage message and add Powershell information.
by Francois Gouget 03 Jan '22

03 Jan '22

--- testbot/bin/SetWinLocale | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index e8aff6c9d1..3a74406a49 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -432,41 +432,46 @@ if (defined $Usage) Error("try '$name0 --help' for more information\n"); exit $Usage; } - print "or $name0 [options] --show HOSTNAME\n"; - print "or $name0 [options] [--default LOC] [--locale USR] [--system SYS] [--mui MUI] [--keyboard KBD] [--country CTY] HOSTNAME\n"; + print "Usage: $name0 [options] --show HOSTNAME\n"; + print "or $name0 [options] [--default DEF] [--locale LOC] [--system SYS] [--mui MUI] [--keyboard KBD] [--country CTY] HOSTNAME\n"; print "\n"; print "Sets the locale of the specified Windows machine.\n"; print "\n"; print "Where:\n"; print " HOSTNAME Work on the specified Windows host (must be running TestAgentd).\n"; print " --show Show the locale settings of the specified host and exit.\n"; - print " --default LOC Use this Windows locale as the default for the other options.\n"; + print " --default DEF Use this Windows locale as the default for the other options.\n"; print " The locale must be in a form suitable for Windows' intl.cpl\n"; print " control panel module, that is roughly ll-CC where ll is an\n"; print " ISO 639-1 language code and CC an ISO 3166-1 alpha-2 country\n"; print " code.\n"; - print " --locale USR Specifies the user formats (see --defaults).\n"; + print " --locale LOC Specifies the user formats (see --defaults).\n"; print " . Windows 10 GUI: Time & language -> Region -> Regional\n"; print " format.\n"; print " . APIs: GetUserDefaultLCID(), GetThreadLocale().\n"; + print " . Powershell: Set-Culture LOC\n"; print " --system SYS Specifies the system locale (see --defaults).\n"; print " . Only takes effect after a reboot.\n"; print " . Windows 10 GUI: Time & language -> Language ->\n"; print " Administrative Language Settings -> Change system locale.\n"; print " . APIs: GetSystemDefaultLCID().\n"; + print " . Powershell: Set-WinSystemLocale -SystemLocale SYS\n"; print " --mui MUI Specifies the display language (see --defaults).\n"; print " . Only takes effect after a log out + log in.\n"; print " . Windows 10 GUI: Time & language -> Language -> Windows\n"; print " display language.\n"; print " . APIs: GetSystemPreferredUILanguages(),\n"; print " GetUserDefaultUILanguage(), GetThreadUILanguage().\n"; + print " . Powershell: Set-WinUILanguageOverride -Language MUI\n"; print " --keyboard KBD Specifies the keyboard layout (see --defaults).\n"; print " . Windows 10 GUI: Time & language -> Language -> Keyboard ->\n"; print " Override for default input method.\n"; + print " . Powershell: Set-WinDefaultInputMethodOverride -InputTip KBD-ID\n"; print " --country CTY Specifies the location using only the country part of the\n"; print " Windows locale (see --defaults).\n"; print " . Windows 10 GUI: Time & language -> Region -> Country.\n"; print " . APIs: GetUserGeoID().\n"; + print " . Powershell: Set-WinHomeLocation -GeoId CTY-ID\n"; print " --no-reboot Do not reboot Windows. Some locale changes will only take\n"; print " effect after the next reboot.\n"; print " --debug Show more detailed information about progress.\n"; -- 2.30.2

1 0

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

03 Jan '22

--- testbot/bin/SetWinLocale | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 8360c76840..e8aff6c9d1 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] po: some more French translations
by Eric Pouech 03 Jan '22

03 Jan '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- po/fr.po | 160 ++++++++++++++++++++++---------------------------------------- 1 file changed, 57 insertions(+), 103 deletions(-) diff --git a/po/fr.po b/po/fr.po index 4a1badfad6a..ebc433cbce5 100644 --- a/po/fr.po +++ b/po/fr.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-02 15:45+0100\n" +"PO-Revision-Date: 2022-01-03 13:08+0100\n" "Last-Translator: Eric Pouech <eric.pouech(a)gmail.com>\n" "Language-Team: French\n" "Language: fr\n" @@ -3134,7 +3134,7 @@ msgstr "Note : la clé privée de ce certificat n'est pas exportable." #: dlls/cryptui/cryptui.rc:177 msgid "Intended Use" -msgstr "Utilisation prévue :" +msgstr "Utilisation prévue" #: dlls/cryptui/cryptui.rc:178 dlls/shell32/shell32.rc:150 msgid "Location" @@ -3671,7 +3671,7 @@ msgstr "Utiliser un script Proxy Auto-Config (PAC)" #: dlls/inetcpl.cpl/inetcpl.rc:128 dlls/inetcpl.cpl/inetcpl.rc:132 msgid "Address:" -msgstr "Adresse: " +msgstr "Adresse :" #: dlls/inetcpl.cpl/inetcpl.rc:130 msgid "Proxy server" @@ -3683,7 +3683,7 @@ msgstr "Utiliser un serveur mandataire" #: dlls/inetcpl.cpl/inetcpl.rc:134 msgid "Port:" -msgstr "Port: " +msgstr "Port :" #: dlls/inetcpl.cpl/inetcpl.rc:31 msgid "Internet Settings" @@ -3809,7 +3809,7 @@ msgstr "Indice hors limites" #: dlls/jscript/jscript.rc:31 msgid "Out of stack space" -msgstr "Dépassement de capacité de pile ; " +msgstr "Dépassement de capacité de pile :" #: dlls/jscript/jscript.rc:32 msgid "Object required" @@ -7537,10 +7537,8 @@ msgid "Begin request has already been made.\n" msgstr "" #: dlls/mferror/mferror.mc:599 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Sink has not been finalized.\n" -msgstr "UUID d'objet introuvable.\n" +msgstr "Le récepteur n'a pas été finalisé.\n" #: dlls/mferror/mferror.mc:732 msgid "Clock was stopped\n" @@ -7582,7 +7580,7 @@ msgstr "Représentation non prise en charge.\n" #: dlls/mferror/mferror.mc:88 msgid "No more types in the list of suggested media types.\n" -msgstr "" +msgstr "Il n'y a plus de types dans la liste de type de médias suggérés.\n" #: dlls/mferror/mferror.mc:95 msgid "Unsupported service.\n" @@ -7609,10 +7607,8 @@ msgid "Unsupported scheme.\n" msgstr "Schéma non pris en charge.\n" #: dlls/mferror/mferror.mc:151 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported bytestream type.\n" -msgstr "Type non pris en charge.\n" +msgstr "Type de flux d'octets non pris en charge.\n" #: dlls/mferror/mferror.mc:158 msgid "Unsupported time format.\n" @@ -7787,10 +7783,8 @@ msgid "Invalid work queue index.\n" msgstr "Index invalide.\n" #: dlls/mferror/mferror.mc:438 -#, fuzzy -#| msgid "No logon servers available.\n" msgid "No events available.\n" -msgstr "Aucun serveur de connexion disponible.\n" +msgstr "Aucun événement disponible.\n" #: dlls/mferror/mferror.mc:445 #, fuzzy @@ -7843,18 +7837,16 @@ msgid "No media streams were selected.\n" msgstr "Aucun flux de données médis n'a été détecté.\n" #: dlls/mferror/mferror.mc:529 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported media source characteristics.\n" -msgstr "Type non pris en charge.\n" +msgstr "Caractéristiques du média source non prises en charge.\n" #: dlls/mferror/mferror.mc:536 msgid "Stream sink was removed.\n" -msgstr "" +msgstr "Le récepteur de flux a été enlevé.\n" #: dlls/mferror/mferror.mc:543 msgid "Stream sinks are out of sync.\n" -msgstr "" +msgstr "Les récepteurs de flux sont désynchronisés.\n" #: dlls/mferror/mferror.mc:550 #, fuzzy @@ -7863,38 +7855,28 @@ msgid "Media sink stream sinks set is fixed.\n" msgstr "Le registre a été restauré.\n" #: dlls/mferror/mferror.mc:557 -#, fuzzy -#| msgid "Domain already exists.\n" msgid "Stream sink already exists.\n" -msgstr "Le domaine existe déjà.\n" +msgstr "Le récepteur de flux existe déjà.\n" #: dlls/mferror/mferror.mc:564 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "Sample allocation was canceled.\n" -msgstr "Opération annulée par l'utilisateur.\n" +msgstr "L'allocation d'échantillons a été annulée.\n" #: dlls/mferror/mferror.mc:571 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Sample allocator is empty.\n" -msgstr "Le répertoire n'est pas vide.\n" +msgstr "L'allocateur d'échantillons est vide.\n" #: dlls/mferror/mferror.mc:578 -#, fuzzy -#| msgid "Class already exists.\n" msgid "Sink was already stopped.\n" -msgstr "La classe existe déjà.\n" +msgstr "Le récepteur a déjà été arrếté.\n" #: dlls/mferror/mferror.mc:585 msgid "Bitrate was unknown for ASF file sink.\n" msgstr "" #: dlls/mferror/mferror.mc:592 -#, fuzzy -#| msgid "No data detected.\n" msgid "No streams were selected for the sink.\n" -msgstr "Aucune donnée détectée.\n" +msgstr "Aucun flux n'a été sélectionné pour le récepteur.\n" #: dlls/mferror/mferror.mc:606 msgid "Metadata was too long.\n" @@ -7902,21 +7884,19 @@ msgstr "Métadonnées trop longues.\n" #: dlls/mferror/mferror.mc:613 msgid "No samples were processed by the sink.\n" -msgstr "" +msgstr "Aucun échantillon n'a été traité par le récepteur.\n" #: dlls/mferror/mferror.mc:620 msgid "Sink was not provided with required headers.\n" -msgstr "" +msgstr "Le récepteur n'a pas reçu les en-têtes attendues.\n" #: dlls/mferror/mferror.mc:627 msgid "Optional node is invalid.\n" msgstr "Le noeud optionnel n'est pas valide.\n" #: dlls/mferror/mferror.mc:634 -#, fuzzy -#| msgid "Cannot find the printer." msgid "Cannot find decryptor.\n" -msgstr "Impossible de trouver l'imprimante." +msgstr "Impossible de trouver le décrypteur.\n" #: dlls/mferror/mferror.mc:641 msgid "Codec was not found.\n" @@ -8060,7 +8040,7 @@ msgstr "" #: dlls/msi/msi.rc:32 msgid "path %s not found" -msgstr "Le chemin %s est introuvable" +msgstr "le chemin %s est introuvable" #: dlls/msi/msi.rc:33 msgid "insert disk %s" @@ -8155,7 +8135,7 @@ msgstr "Nouveau dossier" #: dlls/msi/msi.rc:91 msgid "Allocating registry space" -msgstr "Allocation d'espace pour le registre." +msgstr "Allocation d'espace pour le registre" #: dlls/msi/msi.rc:92 msgid "Searching for installed applications" @@ -8212,10 +8192,8 @@ msgid "Installing new services" msgstr "Installation des nouveaux services" #: dlls/msi/msi.rc:107 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Installing system catalog" -msgstr "Installation/Désinstallation" +msgstr "Installation du catalogue système" #: dlls/msi/msi.rc:108 msgid "Validating install" @@ -8319,7 +8297,7 @@ msgstr "Suppression des dossiers" #: dlls/msi/msi.rc:133 msgid "Removing INI files entries" -msgstr "" +msgstr "Suppression des entrées dans les fichiers INI" #: dlls/msi/msi.rc:134 msgid "Removing ODBC components" @@ -8395,7 +8373,7 @@ msgstr "Suppression de l'enregistrement des bibliothèques de types" #: dlls/msi/msi.rc:154 msgid "Writing INI files values" -msgstr "" +msgstr "Écriture des entrées dans les fichiers INI" #: dlls/msi/msi.rc:155 msgid "Writing system registry values" @@ -8483,7 +8461,7 @@ msgstr "Police : [1]" #: dlls/msi/msi.rc:184 dlls/msi/msi.rc:205 msgid "MIME Content Type: [1], Extension: [2]" -msgstr "" +msgstr "Type de contenu MIME : [1], Extension : [2]" #: dlls/msi/msi.rc:185 dlls/msi/msi.rc:206 msgid "ProgId: [1]" @@ -8507,11 +8485,11 @@ msgstr "Application : [1], Ligne de commande : [2]" #: dlls/msi/msi.rc:192 dlls/msi/msi.rc:209 msgid "File: [1], Section: [2], Key: [3], Value: [4]" -msgstr "" +msgstr "Fichier : [1], Section : [2], Clé : [3], Valeur : [4]" #: dlls/msi/msi.rc:193 msgid "Key: [1], Name: [2]" -msgstr "" +msgstr "Clé : [1], Nom : [2]" #: dlls/msi/msi.rc:195 dlls/msi/msi.rc:196 msgid "File: [1], Folder: [2]" @@ -8523,7 +8501,7 @@ msgstr "" #: dlls/msi/msi.rc:210 msgid "Key: [1], Name: [2], Value: [3]" -msgstr "" +msgstr "Clé : [1], Nom : [2], Valeur : [3]" #: dlls/msi/msi.rc:72 msgid "{{Fatal error: }}" @@ -8535,7 +8513,7 @@ msgstr "{{Erreur [1]. }}" #: dlls/msi/msi.rc:74 msgid "Warning [1]." -msgstr "" +msgstr "Alerte : [1]." #: dlls/msi/msi.rc:75 msgid "Info [1]." @@ -8915,11 +8893,9 @@ msgid "selected" msgstr "sélectionné" #: dlls/oleacc/oleacc.rc:100 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focused" -msgstr "En pause" +msgstr "avec focus" #: dlls/oleacc/oleacc.rc:101 msgctxt "object state" @@ -8942,11 +8918,9 @@ msgid "read only" msgstr "lecture seule" #: dlls/oleacc/oleacc.rc:105 -#, fuzzy -#| msgid "Hot Tracked Item" msgctxt "object state" msgid "hot tracked" -msgstr "Élément actif" +msgstr "actif" #: dlls/oleacc/oleacc.rc:106 msgctxt "object state" @@ -8994,10 +8968,9 @@ msgid "offscreen" msgstr "hors écran" #: dlls/oleacc/oleacc.rc:115 -#, fuzzy msgctxt "object state" msgid "sizeable" -msgstr "&activer" +msgstr "dimensionnable" #: dlls/oleacc/oleacc.rc:116 msgctxt "object state" @@ -9032,18 +9005,14 @@ msgid "traversed" msgstr "" #: dlls/oleacc/oleacc.rc:122 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "multi selectable" -msgstr "table" +msgstr "avec sélection multiple" #: dlls/oleacc/oleacc.rc:123 -#, fuzzy -#| msgid "Please select a file." msgctxt "object state" msgid "extended selectable" -msgstr "Sélectionnez un fichier." +msgstr "avec sélection étendue" #: dlls/oleacc/oleacc.rc:124 msgctxt "object state" @@ -9066,7 +9035,6 @@ msgid "protected" msgstr "protégé" #: dlls/oleacc/oleacc.rc:128 -#, fuzzy msgctxt "object state" msgid "has popup" msgstr "avec popup" @@ -9118,7 +9086,7 @@ msgstr "Utiliser une chaîne de connexion" #: dlls/oledb32/version.rc:75 msgid "&Connection string:" -msgstr "&Chaîne de connexion" +msgstr "&Chaîne de connexion :" #: dlls/oledb32/version.rc:77 msgid "B&uild..." @@ -9166,11 +9134,11 @@ msgstr "Niveau de protection :" #: dlls/oledb32/version.rc:101 msgid "Connect:" -msgstr "Connecté" +msgstr "Connecté :" #: dlls/oledb32/version.rc:103 msgid "seconds." -msgstr "secondes" +msgstr "secondes." #: dlls/oledb32/version.rc:104 msgid "A&ccess:" @@ -9186,17 +9154,15 @@ msgid "" "value, select a property, then choose Edit Value below." msgstr "" "Voici les propriétés à initialiser pour ce type de données. Pour ce faire, " -"sélectionnez une propriété, et appuyez sur « Modifier valeur... »" +"sélectionnez une propriété, et appuyez sur « Modifier valeur... »." #: dlls/oledb32/version.rc:115 msgid "&Edit Value..." msgstr "&Modifier valeur..." #: dlls/oledb32/version.rc:49 -#, fuzzy -#| msgid "Properties" msgid "Data Link Error" -msgstr "Propriétés" +msgstr "Erreur du lien vers les données" #: dlls/oledb32/version.rc:50 msgid "Please select a provider." @@ -9953,7 +9919,7 @@ msgstr "Wine est une réalisation de :" #: dlls/shell32/shell32.rc:332 msgid "Run" -msgstr "E&xécuter..." +msgstr "E&xécuter" #: dlls/shell32/shell32.rc:336 msgid "" @@ -11196,32 +11162,24 @@ msgid "(UTC-05:00) Eastern Time (US & Canada)" msgstr "" #: dlls/tzres/tzres.rc:372 -#, fuzzy -#| msgid "Date and time" msgid "Transbaikal Standard Time" -msgstr "Date et heure" +msgstr "Heure du Transbaïkal" #: dlls/tzres/tzres.rc:373 -#, fuzzy -#| msgid "Date and time" msgid "Transbaikal Daylight Time" -msgstr "Date et heure" +msgstr "Heure d'été du Transbaïkal" #: dlls/tzres/tzres.rc:374 msgid "(UTC+09:00) Chita" msgstr "" #: dlls/tzres/tzres.rc:141 -#, fuzzy -#| msgid "Central European" msgid "E. Europe Standard Time" -msgstr "Européen central" +msgstr "Heure d'Europe de l'Est" #: dlls/tzres/tzres.rc:142 -#, fuzzy -#| msgid "Central European" msgid "E. Europe Daylight Time" -msgstr "Européen central" +msgstr "Heure d'été d'Europe de l'Est" #: dlls/tzres/tzres.rc:143 msgid "(UTC+02:00) Chisinau" @@ -11684,14 +11642,12 @@ msgid "(UTC-04:00) Asuncion" msgstr "" #: dlls/tzres/tzres.rc:132 -#, fuzzy -#| msgid "Date and time" msgid "Dateline Standard Time" -msgstr "Date et heure" +msgstr "Heure de la ligne de changement de date" #: dlls/tzres/tzres.rc:133 msgid "Dateline Daylight Time" -msgstr "" +msgstr "Heure d'été de la ligne de changement de date" #: dlls/tzres/tzres.rc:134 msgid "(UTC-12:00) International Date Line West" @@ -12221,7 +12177,7 @@ msgstr "Accès refusé" #: dlls/vbscript/vbscript.rc:41 msgid "Path/File access error" -msgstr "" +msgstr "Erreur d'accès au chemin / fichier" #: dlls/vbscript/vbscript.rc:42 msgid "Path not found" @@ -12428,7 +12384,7 @@ msgstr "L'URL est invalide.\n" #: dlls/wininet/winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" -msgstr "" +msgstr "Le schéma d'URL n'a été reconnu ou n'est pas pris en charge.\n" #: dlls/wininet/winineterror.mc:46 msgid "The server name could not be resolved.\n" @@ -12460,11 +12416,11 @@ msgstr "" msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" -msgstr "" +msgstr "La date du certificat SSL reçu du serveur est incorrecte : le certificat n'est plus valide.\n" #: dlls/wininet/winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "" +msgstr "Le nom commun (champ host name) du certificat SSL est incorrect.\n" #: dlls/winmm/winmm.rc:32 msgid "The specified command was carried out." @@ -13172,10 +13128,8 @@ msgid "Confidentiality Required" msgstr "Confidentialité requise" #: dlls/wldap32/wldap32.rc:46 -#, fuzzy -#| msgid "Shutdown in progress.\n" msgid "SASL Bind in Progress" -msgstr "Arrêt du système en cours.\n" +msgstr "Liaison SASL en cours" #: dlls/wldap32/wldap32.rc:48 msgid "No Such Attribute" @@ -14488,7 +14442,7 @@ msgid "" "the window." msgstr "" "La taille du tampon écran doit être plus grande ou égale à celle du tampon " -"de la fenêtre" +"de la fenêtre." #: programs/conhost/conhost.rc:41 msgid "Each character is %1!u! pixels wide and %2!u! pixels high" @@ -15793,7 +15747,7 @@ msgid "" msgstr "" "REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n" "\n" -" Ajoute un clé au registre ou ajoute une nouvelle valeur à une clé de\n" +" Ajoute une clé au registre ou ajoute une nouvelle valeur à une clé de\n" " registre donnée.\n" "\n" " <key>\n" @@ -16491,7 +16445,7 @@ msgstr "Impossible de modifier la clé de registre sélectionnée." #: programs/regedit/regedit.rc:248 msgid "Unable to create a new registry key." -msgstr "Impossible de créer un nouvelle clé de registre." +msgstr "Impossible de créer une nouvelle clé de registre." #: programs/regedit/regedit.rc:249 msgid "Unable to create a new registry value." @@ -18145,11 +18099,11 @@ msgstr "&native (Windows)" #: programs/winecfg/winecfg.rc:210 msgid "Buil&tin then Native" -msgstr "i&ntégrée puis native" +msgstr "I&ntégrée puis Native." #: programs/winecfg/winecfg.rc:211 msgid "Nati&ve then Builtin" -msgstr "n&ative puis intégrée" +msgstr "N&ative puis Intégrée" #: programs/winecfg/winecfg.rc:219 msgid "Select Drive Letter"

1 0

[PATCH] ddraw/tests: Port tests for fullscreen window size reset from d3d9.
by Paul Gofman 03 Jan '22

03 Jan '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- This is a follow up for commit 78533e9e94d4fcae06dd44d29dbed4755d4ac1f4 porting the same test for ddraw. Altough the test result is different, ddraw doesn't seem to do the same. What I think is going on in d3d9 (deserves a separate test which I don't have yet ready) is that d3d9 window hook sends WM_ACTIVATEAPP whenever it receives WM_SIZE event (dumping messages in flush_events() show that). Then, WM_ACTIVATEAPP is already processed the way it restores the window size in Wine but it probably should also remeber the "activated" state and then the second resize also won't have an effect. dlls/ddraw/tests/ddraw1.c | 40 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 40 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 40 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 40 ++++++++++++++++++++++++++++++++++++++- 4 files changed, 156 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c9f2aead75c..11c14777122 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -14191,7 +14191,7 @@ static void test_vtbl_protection(void) static BOOL CALLBACK test_window_position_cb(HMONITOR monitor, HDC hdc, RECT *monitor_rect, LPARAM lparam) { - RECT primary_rect, window_rect; + RECT primary_rect, window_rect, new_rect; IDirectDraw *ddraw; HWND window; HRESULT hr; @@ -14214,6 +14214,44 @@ static BOOL CALLBACK test_window_position_cb(HMONITOR monitor, HDC hdc, RECT *mo ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + new_rect = window_rect; + --new_rect.right; + --new_rect.bottom; + + ret = MoveWindow(window, new_rect.left, new_rect.top, new_rect.right - new_rect.left, + new_rect.bottom - new_rect.top, TRUE); + ok(ret, "Got unexpected ret %#x, error %#x.\n", ret, GetLastError()); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x.\n", ret, GetLastError()); + ok(EqualRect(&window_rect, &new_rect), + "Expected window rect %s, got %s.\n", + wine_dbgstr_rect(monitor_rect), wine_dbgstr_rect(&window_rect)); + /* After processing window events window rectangle gets restored. But only once, the size set + * on the second resize remains. */ + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x.\n", ret, GetLastError()); + /* Both Windows and Wine change the size of the window. On Windows it is exactly the new size but in Wine + * it may get adjusted depending on window manager. */ + ok(window_rect.right != monitor_rect->right && window_rect.bottom != monitor_rect->bottom, + "Expected window rect %s, got %s.\n", + wine_dbgstr_rect(monitor_rect), wine_dbgstr_rect(&window_rect)); + + ret = MoveWindow(window, new_rect.left, new_rect.top, new_rect.right - new_rect.left, + new_rect.bottom - new_rect.top, TRUE); + ok(ret, "Got unexpected ret %#x, error %#x.\n", ret, GetLastError()); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x.\n", ret, GetLastError()); + ok(EqualRect(&window_rect, &new_rect), + "Expected window rect %s, got %s.\n", + wine_dbgstr_rect(monitor_rect), wine_dbgstr_rect(&window_rect)); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x.\n", ret, GetLastError()); + ok(window_rect.right != monitor_rect->right && window_rect.bottom != monitor_rect->bottom, + "Expected window rect %s, got %s.\n", + wine_dbgstr_rect(monitor_rect), wine_dbgstr_rect(&window_rect)); + /* Window activation should restore the window to fit the whole primary monitor */ ret = SetWindowPos(window, 0, monitor_rect->left, monitor_rect->top, 0, 0, SWP_NOZORDER | SWP_NOSIZE); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 7285c1c3a88..33ad957b644 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -15115,7 +15115,7 @@ done: static BOOL CALLBACK test_window_position_cb(HMONITOR monitor, HDC hdc, RECT *monitor_rect, LPARAM lparam) { - RECT primary_rect, window_rect; + RECT primary_rect, window_rect, new_rect; IDirectDraw2 *ddraw; HWND window; HRESULT hr; @@ -15138,6 +15138,44 @@ static BOOL CALLBACK test_window_position_cb(HMONITOR monitor, HDC hdc, RECT *mo ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + new_rect = window_rect; + --new_rect.right; + --new_rect.bottom; + + ret = MoveWindow(window, new_rect.left, new_rect.top, new_rect.right - new_rect.left, + new_rect.bottom - new_rect.top, TRUE); + ok(ret, "Got unexpected ret %#x, error %#x.\n", ret, GetLastError()); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x.\n", ret, GetLastError()); + ok(EqualRect(&window_rect, &new_rect), + "Expected window rect %s, got %s.\n", + wine_dbgstr_rect(monitor_rect), wine_dbgstr_rect(&window_rect)); + /* After processing window events window rectangle gets restored. But only once, the size set + * on the second resize remains. */ + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x.\n", ret, GetLastError()); + /* Both Windows and Wine change the size of the window. On Windows it is exactly the new size but in Wine + * it may get adjusted depending on window manager. */ + ok(window_rect.right != monitor_rect->right && window_rect.bottom != monitor_rect->bottom, + "Expected window rect %s, got %s.\n", + wine_dbgstr_rect(monitor_rect), wine_dbgstr_rect(&window_rect)); + + ret = MoveWindow(window, new_rect.left, new_rect.top, new_rect.right - new_rect.left, + new_rect.bottom - new_rect.top, TRUE); + ok(ret, "Got unexpected ret %#x, error %#x.\n", ret, GetLastError()); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x.\n", ret, GetLastError()); + ok(EqualRect(&window_rect, &new_rect), + "Expected window rect %s, got %s.\n", + wine_dbgstr_rect(monitor_rect), wine_dbgstr_rect(&window_rect)); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x.\n", ret, GetLastError()); + ok(window_rect.right != monitor_rect->right && window_rect.bottom != monitor_rect->bottom, + "Expected window rect %s, got %s.\n", + wine_dbgstr_rect(monitor_rect), wine_dbgstr_rect(&window_rect)); + /* Window activation should restore the window to fit the whole primary monitor */ ret = SetWindowPos(window, 0, monitor_rect->left, monitor_rect->top, 0, 0, SWP_NOZORDER | SWP_NOSIZE); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 07afc44e519..61828430331 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -18152,7 +18152,7 @@ done: static BOOL CALLBACK test_window_position_cb(HMONITOR monitor, HDC hdc, RECT *monitor_rect, LPARAM lparam) { - RECT primary_rect, window_rect; + RECT primary_rect, window_rect, new_rect; IDirectDraw4 *ddraw; HWND window; HRESULT hr; @@ -18175,6 +18175,44 @@ static BOOL CALLBACK test_window_position_cb(HMONITOR monitor, HDC hdc, RECT *mo ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + new_rect = window_rect; + --new_rect.right; + --new_rect.bottom; + + ret = MoveWindow(window, new_rect.left, new_rect.top, new_rect.right - new_rect.left, + new_rect.bottom - new_rect.top, TRUE); + ok(ret, "Got unexpected ret %#x, error %#x.\n", ret, GetLastError()); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x.\n", ret, GetLastError()); + ok(EqualRect(&window_rect, &new_rect), + "Expected window rect %s, got %s.\n", + wine_dbgstr_rect(monitor_rect), wine_dbgstr_rect(&window_rect)); + /* After processing window events window rectangle gets restored. But only once, the size set + * on the second resize remains. */ + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x.\n", ret, GetLastError()); + /* Both Windows and Wine change the size of the window. On Windows it is exactly the new size but in Wine + * it may get adjusted depending on window manager. */ + ok(window_rect.right != monitor_rect->right && window_rect.bottom != monitor_rect->bottom, + "Expected window rect %s, got %s.\n", + wine_dbgstr_rect(monitor_rect), wine_dbgstr_rect(&window_rect)); + + ret = MoveWindow(window, new_rect.left, new_rect.top, new_rect.right - new_rect.left, + new_rect.bottom - new_rect.top, TRUE); + ok(ret, "Got unexpected ret %#x, error %#x.\n", ret, GetLastError()); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x.\n", ret, GetLastError()); + ok(EqualRect(&window_rect, &new_rect), + "Expected window rect %s, got %s.\n", + wine_dbgstr_rect(monitor_rect), wine_dbgstr_rect(&window_rect)); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x.\n", ret, GetLastError()); + ok(window_rect.right != monitor_rect->right && window_rect.bottom != monitor_rect->bottom, + "Expected window rect %s, got %s.\n", + wine_dbgstr_rect(monitor_rect), wine_dbgstr_rect(&window_rect)); + /* Window activation should restore the window to fit the whole primary monitor */ ret = SetWindowPos(window, 0, monitor_rect->left, monitor_rect->top, 0, 0, SWP_NOZORDER | SWP_NOSIZE); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 29fa3434d4b..fc0f854e125 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -18419,7 +18419,7 @@ done: static BOOL CALLBACK test_window_position_cb(HMONITOR monitor, HDC hdc, RECT *monitor_rect, LPARAM lparam) { - RECT primary_rect, window_rect; + RECT primary_rect, window_rect, new_rect; IDirectDraw7 *ddraw; HWND window; HRESULT hr; @@ -18442,6 +18442,44 @@ static BOOL CALLBACK test_window_position_cb(HMONITOR monitor, HDC hdc, RECT *mo ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + new_rect = window_rect; + --new_rect.right; + --new_rect.bottom; + + ret = MoveWindow(window, new_rect.left, new_rect.top, new_rect.right - new_rect.left, + new_rect.bottom - new_rect.top, TRUE); + ok(ret, "Got unexpected ret %#x, error %#x.\n", ret, GetLastError()); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x.\n", ret, GetLastError()); + ok(EqualRect(&window_rect, &new_rect), + "Expected window rect %s, got %s.\n", + wine_dbgstr_rect(monitor_rect), wine_dbgstr_rect(&window_rect)); + /* After processing window events window rectangle gets restored. But only once, the size set + * on the second resize remains. */ + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x.\n", ret, GetLastError()); + /* Both Windows and Wine change the size of the window. On Windows it is exactly the new size but in Wine + * it may get adjusted depending on window manager. */ + ok(window_rect.right != monitor_rect->right && window_rect.bottom != monitor_rect->bottom, + "Expected window rect %s, got %s.\n", + wine_dbgstr_rect(monitor_rect), wine_dbgstr_rect(&window_rect)); + + ret = MoveWindow(window, new_rect.left, new_rect.top, new_rect.right - new_rect.left, + new_rect.bottom - new_rect.top, TRUE); + ok(ret, "Got unexpected ret %#x, error %#x.\n", ret, GetLastError()); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x.\n", ret, GetLastError()); + ok(EqualRect(&window_rect, &new_rect), + "Expected window rect %s, got %s.\n", + wine_dbgstr_rect(monitor_rect), wine_dbgstr_rect(&window_rect)); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x.\n", ret, GetLastError()); + ok(window_rect.right != monitor_rect->right && window_rect.bottom != monitor_rect->bottom, + "Expected window rect %s, got %s.\n", + wine_dbgstr_rect(monitor_rect), wine_dbgstr_rect(&window_rect)); + /* Window activation should restore the window to fit the whole primary monitor */ ret = SetWindowPos(window, 0, monitor_rect->left, monitor_rect->top, 0, 0, SWP_NOZORDER | SWP_NOSIZE); -- 2.33.1

3 2

[PATCH] wined3d: Fix memory leak on error path in wined3d_buffer_vk_create_buffer_object (Coverity)
by Alex Henrie 03 Jan '22

03 Jan '22

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/wined3d/buffer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index c078ba7e634..b42c7bd919a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1498,6 +1498,7 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf vk_memory_type_from_access_flags(resource->access, resource->usage), bo_vk))) { WARN("Failed to create Vulkan buffer.\n"); + heap_free(bo_vk); return FALSE; } -- 2.34.1

2 1

[PATCH] dbghelp: don't use .debug_frame section if non present when unwinding
by Eric Pouech 03 Jan '22

03 Jan '22

fixes: https://bugs.winehq.org/show_bug.cgi?id=52295 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dwarf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 70613317966..ea70fd915b4 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3795,7 +3795,8 @@ static BOOL dwarf2_fetch_frame_info(struct module* module, struct cpu* cpu, LONG fde_ctx.data = modfmt->u.dwarf2_info->debug_frame.address; fde_ctx.end_data = fde_ctx.data + modfmt->u.dwarf2_info->debug_frame.size; delta = module->reloc_delta; - if (!dwarf2_get_cie(ip, module, delta, &fde_ctx, &cie_ctx, info, FALSE)) + if (modfmt->u.dwarf2_info->debug_frame.address == IMAGE_NO_MAP || + !dwarf2_get_cie(ip, module, delta, &fde_ctx, &cie_ctx, info, FALSE)) { TRACE("Couldn't find information for %lx\n", ip); return FALSE;

1 0

[PATCH 1/4] dinput8/tests: Test simple joystick with older dinput versions.
by Rémi Bernon 03 Jan '22

03 Jan '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This will overflow the test output limit on Wine, and I'm not sure what to do about it. I don't think there's an unusually large number of todos but the number of tests in this file simply has grow very large. I can split the tests into individual files, if that's better, but I believe it will make some of the tests run less often if they aren't touched, which may not be desirable. dlls/dinput8/tests/hid.c | 464 ++++++++++++++++++++++++++++----------- 1 file changed, 335 insertions(+), 129 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 82657c2e235..17559c61a39 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3350,8 +3350,11 @@ static BOOL CALLBACK find_test_device( const DIDEVICEINSTANCEW *devinst, void *c struct check_objects_todos { BOOL type; + BOOL ofs; BOOL guid; + BOOL flags; BOOL usage; + BOOL usage_page; BOOL name; }; @@ -3388,16 +3391,18 @@ static BOOL CALLBACK check_objects( const DIDEVICEOBJECTINSTANCEW *obj, void *ar check_member( *obj, *exp, "%u", dwSize ); todo_wine_if( todo->guid ) check_member_guid( *obj, *exp, guidType ); - todo_wine_if( params->version < 0x700 && (obj->dwType & DIDFT_BUTTON) ) + todo_wine_if( todo->ofs ) check_member( *obj, *exp, "%#x", dwOfs ); todo_wine_if( todo->type ) check_member( *obj, *exp, "%#x", dwType ); + todo_wine_if( todo->flags ) check_member( *obj, *exp, "%#x", dwFlags ); if (!localized) todo_wine_if( todo->name )check_member_wstr( *obj, *exp, tszName ); check_member( *obj, *exp, "%u", dwFFMaxForce ); check_member( *obj, *exp, "%u", dwFFForceResolution ); check_member( *obj, *exp, "%u", wCollectionNumber ); check_member( *obj, *exp, "%u", wDesignatorIndex ); + todo_wine_if( todo->usage_page ) check_member( *obj, *exp, "%#04x", wUsagePage ); todo_wine_if( todo->usage ) check_member( *obj, *exp, "%#04x", wUsage ); @@ -3681,7 +3686,7 @@ static HRESULT create_dinput_device( DWORD version, DIDEVICEINSTANCEW *devinst, return DI_OK; } -static void test_simple_joystick(void) +static void test_simple_joystick( DWORD version ) { #include "psh_hid_macros.h" static const unsigned char report_desc[] = @@ -3737,11 +3742,12 @@ static void test_simple_joystick(void) { .InputReportByteLength = 9, }; - static const DIDEVCAPS expect_caps = + const DIDEVCAPS expect_caps = { .dwSize = sizeof(DIDEVCAPS), .dwFlags = DIDC_ATTACHED | DIDC_EMULATED, - .dwDevType = DIDEVTYPE_HID | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DI8DEVTYPE_JOYSTICK, + .dwDevType = version >= 0x800 ? DIDEVTYPE_HID | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DI8DEVTYPE_JOYSTICK + : DIDEVTYPE_HID | (DIDEVTYPEJOYSTICK_RUDDER << 8) | DIDEVTYPE_JOYSTICK, .dwAxes = 6, .dwPOVs = 1, .dwButtons = 2, @@ -3826,7 +3832,8 @@ static void test_simple_joystick(void) .dwSize = sizeof(DIDEVICEINSTANCEW), .guidInstance = expect_guid_product, .guidProduct = expect_guid_product, - .dwDevType = DIDEVTYPE_HID | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DI8DEVTYPE_JOYSTICK, + .dwDevType = version >= 0x800 ? DIDEVTYPE_HID | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DI8DEVTYPE_JOYSTICK + : DIDEVTYPE_HID | (DIDEVTYPEJOYSTICK_RUDDER << 8) | DIDEVTYPE_JOYSTICK, .tszInstanceName = L"Wine test root driver", .tszProductName = L"Wine test root driver", .guidFFDriver = GUID_NULL, @@ -3954,14 +3961,110 @@ static void test_simple_joystick(void) .wUsage = HID_USAGE_GENERIC_JOYSTICK, }, }; - const DIEFFECTINFOW expect_effects[] = {}; - + const DIDEVICEOBJECTINSTANCEW expect_objects_5[] = + { + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_XAxis, + .dwOfs = DIJOFS_X, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(0), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"X Axis", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_X, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_YAxis, + .dwOfs = DIJOFS_Y, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(1), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Y Axis", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_Y, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_ZAxis, + .dwOfs = DIJOFS_Z, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(2), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Wheel", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_WHEEL, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_RzAxis, + .dwOfs = DIJOFS_RZ, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(5), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Rudder", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_SIMULATION, + .wUsage = HID_USAGE_SIMULATION_RUDDER, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_POV, + .dwOfs = DIJOFS_POV(0), + .dwType = DIDFT_POV|DIDFT_MAKEINSTANCE(0), + .tszName = L"Hat Switch", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_HATSWITCH, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Button, + .dwOfs = DIJOFS_BUTTON(0), + .dwType = DIDFT_PSHBUTTON|DIDFT_MAKEINSTANCE(0), + .tszName = L"Button 0", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_BUTTON, + .wUsage = 0x1, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Button, + .dwOfs = DIJOFS_BUTTON(1), + .dwType = DIDFT_PSHBUTTON|DIDFT_MAKEINSTANCE(1), + .tszName = L"Button 1", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_BUTTON, + .wUsage = 0x2, + .wReportId = 1, + }, + }; + struct check_objects_todos todo_objects_5[ARRAY_SIZE(expect_objects_5)] = + { + {.guid = TRUE, .type = TRUE, .flags = TRUE, .usage = TRUE, .usage_page = TRUE, .name = TRUE}, + {.guid = TRUE, .type = TRUE, .flags = TRUE, .usage = TRUE, .usage_page = TRUE, .name = TRUE}, + {.guid = TRUE, .type = TRUE, .usage = TRUE, .usage_page = TRUE, .name = TRUE}, + {.guid = TRUE, .ofs = TRUE, .type = TRUE, .usage = TRUE, .usage_page = TRUE, .name = TRUE}, + {.guid = TRUE, .ofs = TRUE, .type = TRUE, .flags = TRUE, .usage = TRUE, .name = TRUE}, + {.guid = TRUE, .ofs = TRUE, .type = TRUE, .flags = TRUE, .usage = TRUE, .usage_page = TRUE, .name = TRUE}, + {.guid = TRUE, .ofs = TRUE, .type = TRUE, .usage = TRUE, .usage_page = TRUE, .name = TRUE}, + }; struct check_objects_params check_objects_params = { - .version = DIRECTINPUT_VERSION, - .expect_count = ARRAY_SIZE(expect_objects), - .expect_objs = expect_objects, + .version = version, + .expect_count = version < 0x700 ? ARRAY_SIZE(expect_objects_5) : ARRAY_SIZE(expect_objects), + .expect_objs = version < 0x700 ? expect_objects_5 : expect_objects, + .todo_objs = version < 0x700 ? todo_objects_5 : NULL, + .todo_extra = version < 0x700 ? TRUE : FALSE, }; + + const DIEFFECTINFOW expect_effects[] = {}; struct check_effects_params check_effects_params = { .expect_count = ARRAY_SIZE(expect_effects), @@ -4015,44 +4118,55 @@ static void test_simple_joystick(void) WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; DIDEVICEOBJECTDATA objdata[32] = {{0}}; DIDEVICEOBJECTINSTANCEW objinst = {0}; + DIDEVICEOBJECTINSTANCEW expect_obj; DIDEVICEINSTANCEW devinst = {0}; DIEFFECTINFOW effectinfo = {0}; DIDATAFORMAT dataformat = {0}; IDirectInputDevice8W *device; IDirectInputEffect *effect; DIEFFESCAPE escape = {0}; + ULONG i, size, res, ref; DIDEVCAPS caps = {0}; HANDLE event, file; char buffer[1024]; DIJOYSTATE2 state; - ULONG i, res, ref; HRESULT hr; WCHAR *tmp; GUID guid; HWND hwnd; + winetest_push_context( "version %#x", version ); + GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); GetTempPathW( ARRAY_SIZE(tempdir), tempdir ); SetCurrentDirectoryW( tempdir ); cleanup_registry_keys(); if (!dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps, NULL, 0 )) goto done; - if (FAILED(hr = create_dinput_device( DIRECTINPUT_VERSION, &devinst, &device ))) goto done; + if (FAILED(hr = create_dinput_device( version, &devinst, &device ))) goto done; - hr = IDirectInputDevice8_Initialize( device, instance, 0x0700, &GUID_NULL ); - todo_wine - ok( hr == DIERR_BETADIRECTINPUTVERSION, "Initialize returned %#x\n", hr ); - hr = IDirectInputDevice8_Initialize( device, instance, DIRECTINPUT_VERSION, NULL ); + hr = IDirectInputDevice8_Initialize( device, instance, 0x800 - (version - 0x700), &GUID_NULL ); + if (version == 0x800) + { + todo_wine + ok( hr == DIERR_BETADIRECTINPUTVERSION, "Initialize returned %#x\n", hr ); + } + else + { + todo_wine + ok( hr == DIERR_OLDDIRECTINPUTVERSION, "Initialize returned %#x\n", hr ); + } + hr = IDirectInputDevice8_Initialize( device, instance, version, NULL ); todo_wine ok( hr == E_POINTER, "Initialize returned %#x\n", hr ); - hr = IDirectInputDevice8_Initialize( device, NULL, DIRECTINPUT_VERSION, &GUID_NULL ); + hr = IDirectInputDevice8_Initialize( device, NULL, version, &GUID_NULL ); todo_wine ok( hr == DIERR_INVALIDPARAM, "Initialize returned %#x\n", hr ); - hr = IDirectInputDevice8_Initialize( device, instance, DIRECTINPUT_VERSION, &GUID_NULL ); + hr = IDirectInputDevice8_Initialize( device, instance, version, &GUID_NULL ); todo_wine ok( hr == REGDB_E_CLASSNOTREG, "Initialize returned %#x\n", hr ); - hr = IDirectInputDevice8_Initialize( device, instance, DIRECTINPUT_VERSION, &devinst.guidInstance ); + hr = IDirectInputDevice8_Initialize( device, instance, version, &devinst.guidInstance ); ok( hr == DI_OK, "Initialize returned %#x\n", hr ); guid = devinst.guidInstance; memset( &devinst, 0, sizeof(devinst) ); @@ -4061,7 +4175,7 @@ static void test_simple_joystick(void) ok( hr == DI_OK, "GetDeviceInfo returned %#x\n", hr ); ok( IsEqualGUID( &guid, &devinst.guidInstance ), "got %s expected %s\n", debugstr_guid( &guid ), debugstr_guid( &devinst.guidInstance ) ); - hr = IDirectInputDevice8_Initialize( device, instance, DIRECTINPUT_VERSION, &devinst.guidProduct ); + hr = IDirectInputDevice8_Initialize( device, instance, version, &devinst.guidProduct ); ok( hr == DI_OK, "Initialize returned %#x\n", hr ); hr = IDirectInputDevice8_GetDeviceInfo( device, NULL ); @@ -4076,6 +4190,7 @@ static void test_simple_joystick(void) todo_wine check_member_guid( devinst, expect_devinst, guidInstance ); check_member_guid( devinst, expect_devinst, guidProduct ); + todo_wine_if( version < 0x0800 ) check_member( devinst, expect_devinst, "%#x", dwDevType ); todo_wine check_member_wstr( devinst, expect_devinst, tszInstanceName ); @@ -4090,6 +4205,7 @@ static void test_simple_joystick(void) todo_wine check_member_guid( devinst, expect_devinst, guidInstance ); check_member_guid( devinst, expect_devinst, guidProduct ); + todo_wine_if( version < 0x0800 ) check_member( devinst, expect_devinst, "%#x", dwDevType ); todo_wine check_member_wstr( devinst, expect_devinst, tszInstanceName ); @@ -4108,6 +4224,7 @@ static void test_simple_joystick(void) ok( hr == DI_OK, "GetCapabilities returned %#x\n", hr ); check_member( caps, expect_caps, "%d", dwSize ); check_member( caps, expect_caps, "%#x", dwFlags ); + todo_wine_if( version < 0x0800 ) check_member( caps, expect_caps, "%#x", dwDevType ); check_member( caps, expect_caps, "%d", dwAxes ); check_member( caps, expect_caps, "%d", dwButtons ); @@ -4125,7 +4242,9 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, NULL ); ok( hr == DIERR_INVALIDPARAM, "GetProperty returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, &prop_string.diph ); - ok( hr == DIERR_INVALIDPARAM, "GetProperty returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_INVALIDPARAM), + "GetProperty DIPROP_VIDPID returned %#x\n", hr ); prop_dword.diph.dwHeaderSize = sizeof(DIPROPHEADER) - 1; hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, &prop_dword.diph ); ok( hr == DIERR_INVALIDPARAM, "GetProperty returned %#x\n", hr ); @@ -4133,8 +4252,14 @@ static void test_simple_joystick(void) prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, &prop_dword.diph ); - ok( hr == DI_OK, "GetProperty DIPROP_VIDPID returned %#x\n", hr ); - ok( prop_dword.dwData == EXPECT_VIDPID, "got %#x expected %#x\n", prop_dword.dwData, EXPECT_VIDPID ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_OK), + "GetProperty DIPROP_VIDPID returned %#x\n", hr ); + if (hr == DI_OK) + { + ok( prop_dword.dwData == EXPECT_VIDPID, "got %#x expected %#x\n", + prop_dword.dwData, EXPECT_VIDPID ); + } hr = IDirectInputDevice8_GetProperty( device, DIPROP_GUIDANDPATH, &prop_guid_path.diph ); ok( hr == DI_OK, "GetProperty DIPROP_GUIDANDPATH returned %#x\n", hr ); @@ -4163,14 +4288,23 @@ static void test_simple_joystick(void) ok( !wcscmp( prop_string.wsz, expect_devinst.tszProductName ), "got product %s\n", debugstr_w(prop_string.wsz) ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_TYPENAME, &prop_string.diph ); - todo_wine - ok( hr == DI_OK, "GetProperty DIPROP_TYPENAME returned %#x\n", hr ); - todo_wine - ok( !wcscmp( prop_string.wsz, expect_vidpid_str ), "got type %s\n", debugstr_w(prop_string.wsz) ); + todo_wine_if( version >= 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_OK), + "GetProperty DIPROP_TYPENAME returned %#x\n", hr ); + if (hr == DI_OK) + { + todo_wine + ok( !wcscmp( prop_string.wsz, expect_vidpid_str ), "got type %s\n", debugstr_w(prop_string.wsz) ); + } hr = IDirectInputDevice8_GetProperty( device, DIPROP_USERNAME, &prop_string.diph ); - ok( hr == S_FALSE, "GetProperty DIPROP_USERNAME returned %#x\n", hr ); - todo_wine - ok( !wcscmp( prop_string.wsz, L"" ), "got user %s\n", debugstr_w(prop_string.wsz) ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_NOEFFECT), + "GetProperty DIPROP_USERNAME returned %#x\n", hr ); + if (hr == DI_NOEFFECT) + { + todo_wine + ok( !wcscmp( prop_string.wsz, L"" ), "got user %s\n", debugstr_w(prop_string.wsz) ); + } prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_JOYSTICKID, &prop_dword.diph ); @@ -4210,7 +4344,9 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); ok( hr == DIERR_UNSUPPORTED, "GetProperty DIPROP_RANGE returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_KEYNAME, &prop_string.diph ); - ok( hr == DIERR_INVALIDPARAM, "GetProperty DIPROP_KEYNAME returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_INVALIDPARAM), + "GetProperty DIPROP_KEYNAME returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_LOGICALRANGE, &prop_range.diph ); ok( hr == DIERR_UNSUPPORTED, "GetProperty DIPROP_LOGICALRANGE returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_PHYSICALRANGE, &prop_range.diph ); @@ -4238,9 +4374,14 @@ static void test_simple_joystick(void) prop_string.diph.dwHow = DIPH_BYUSAGE; prop_string.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_KEYNAME, &prop_string.diph ); - ok( hr == DI_OK, "GetProperty DIPROP_KEYNAME returned %#x\n", hr ); - ok( !wcscmp( prop_string.wsz, expect_objects[4].tszName ), "got DIPROP_KEYNAME %s\n", - debugstr_w( prop_string.wsz ) ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_OK), + "GetProperty DIPROP_KEYNAME returned %#x\n", hr ); + if (hr == DI_OK) + { + ok( !wcscmp( prop_string.wsz, expect_objects[4].tszName ), "got DIPROP_KEYNAME %s\n", + debugstr_w( prop_string.wsz ) ); + } prop_string.diph.dwObj = MAKELONG( 0x1, HID_USAGE_PAGE_BUTTON ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_KEYNAME, &prop_string.diph ); todo_wine @@ -4255,7 +4396,9 @@ static void test_simple_joystick(void) prop_range.lMin = 0xdeadbeef; prop_range.lMax = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); - ok( hr == DIERR_NOTFOUND, "GetProperty DIPROP_RANGE returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DI_OK : DIERR_NOTFOUND), + "GetProperty DIPROP_RANGE returned %#x\n", hr ); prop_range.diph.dwObj = MAKELONG( 0, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); ok( hr == DIERR_NOTFOUND, "GetProperty DIPROP_RANGE returned %#x\n", hr ); @@ -4270,19 +4413,33 @@ static void test_simple_joystick(void) ok( prop_range.lMin == 0, "got %d expected %d\n", prop_range.lMin, 0 ); ok( prop_range.lMax == 65535, "got %d expected %d\n", prop_range.lMax, 65535 ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_LOGICALRANGE, &prop_range.diph ); - ok( hr == DI_OK, "GetProperty DIPROP_LOGICALRANGE returned %#x\n", hr ); - ok( prop_range.lMin == -25, "got %d expected %d\n", prop_range.lMin, -25 ); - ok( prop_range.lMax == 56, "got %d expected %d\n", prop_range.lMax, 56 ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_OK), + "GetProperty DIPROP_LOGICALRANGE returned %#x\n", hr ); + if (hr == DI_OK) + { + ok( prop_range.lMin == -25, "got %d expected %d\n", prop_range.lMin, -25 ); + ok( prop_range.lMax == 56, "got %d expected %d\n", prop_range.lMax, 56 ); + } hr = IDirectInputDevice8_GetProperty( device, DIPROP_PHYSICALRANGE, &prop_range.diph ); - ok( hr == DI_OK, "GetProperty DIPROP_PHYSICALRANGE returned %#x\n", hr ); - ok( prop_range.lMin == -25, "got %d expected %d\n", prop_range.lMin, -25 ); - ok( prop_range.lMax == 56, "got %d expected %d\n", prop_range.lMax, 56 ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_OK), + "GetProperty DIPROP_PHYSICALRANGE returned %#x\n", hr ); + if (hr == DI_OK) + { + ok( prop_range.lMin == -25, "got %d expected %d\n", prop_range.lMin, -25 ); + ok( prop_range.lMax == 56, "got %d expected %d\n", prop_range.lMax, 56 ); + } prop_pointer.diph.dwHow = DIPH_BYUSAGE; prop_pointer.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); - todo_wine - ok( hr == DIERR_NOTINITIALIZED, "GetProperty DIPROP_APPDATA returned %#x\n", hr ); + if (version < 0x0800) ok( hr == DIERR_UNSUPPORTED, "GetProperty DIPROP_APPDATA returned %#x\n", hr ); + else + { + todo_wine + ok( hr == DIERR_NOTINITIALIZED, "GetProperty DIPROP_APPDATA returned %#x\n", hr ); + } hr = IDirectInputDevice8_EnumObjects( device, NULL, NULL, DIDFT_ALL ); ok( hr == DIERR_INVALIDPARAM, "EnumObjects returned %#x\n", hr ); @@ -4291,7 +4448,8 @@ static void test_simple_joystick(void) res = 0; hr = IDirectInputDevice8_EnumObjects( device, check_object_count, &res, DIDFT_AXIS | DIDFT_PSHBUTTON ); ok( hr == DI_OK, "EnumObjects returned %#x\n", hr ); - ok( res == 8, "got %u expected %u\n", res, 8 ); + todo_wine_if( version < 0x0700 ) + ok( res == (version < 0x0700 ? 6 : 8), "got %u objects\n", res ); hr = IDirectInputDevice8_EnumObjects( device, check_objects, &check_objects_params, DIDFT_ALL ); ok( hr == DI_OK, "EnumObjects returned %#x\n", hr ); ok( check_objects_params.index >= check_objects_params.expect_count, "missing %u objects\n", @@ -4307,26 +4465,30 @@ static void test_simple_joystick(void) res = MAKELONG( HID_USAGE_GENERIC_Z, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, res, DIPH_BYUSAGE ); - ok( hr == DIERR_NOTFOUND, "GetObjectInfo returned: %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DI_OK : DIERR_NOTFOUND), "GetObjectInfo returned: %#x\n", hr ); res = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, res, DIPH_BYUSAGE ); ok( hr == DI_OK, "GetObjectInfo returned: %#x\n", hr ); - check_member( objinst, expect_objects[4], "%u", dwSize ); - check_member_guid( objinst, expect_objects[4], guidType ); - check_member( objinst, expect_objects[4], "%#x", dwOfs ); - check_member( objinst, expect_objects[4], "%#x", dwType ); - check_member( objinst, expect_objects[4], "%#x", dwFlags ); - if (!localized) check_member_wstr( objinst, expect_objects[4], tszName ); - check_member( objinst, expect_objects[4], "%u", dwFFMaxForce ); - check_member( objinst, expect_objects[4], "%u", dwFFForceResolution ); - check_member( objinst, expect_objects[4], "%u", wCollectionNumber ); - check_member( objinst, expect_objects[4], "%u", wDesignatorIndex ); - check_member( objinst, expect_objects[4], "%#04x", wUsagePage ); - check_member( objinst, expect_objects[4], "%#04x", wUsage ); - check_member( objinst, expect_objects[4], "%#04x", dwDimension ); - check_member( objinst, expect_objects[4], "%#04x", wExponent ); - check_member( objinst, expect_objects[4], "%u", wReportId ); + if (version < 0x0700) expect_obj = expect_objects_5[0]; + else expect_obj = expect_objects[4]; + check_member( objinst, expect_obj, "%u", dwSize ); + check_member_guid( objinst, expect_obj, guidType ); + todo_wine_if( version < 0x0700 ) + check_member( objinst, expect_obj, "%#x", dwOfs ); + check_member( objinst, expect_obj, "%#x", dwType ); + check_member( objinst, expect_obj, "%#x", dwFlags ); + if (!localized) check_member_wstr( objinst, expect_obj, tszName ); + check_member( objinst, expect_obj, "%u", dwFFMaxForce ); + check_member( objinst, expect_obj, "%u", dwFFForceResolution ); + check_member( objinst, expect_obj, "%u", wCollectionNumber ); + check_member( objinst, expect_obj, "%u", wDesignatorIndex ); + check_member( objinst, expect_obj, "%#04x", wUsagePage ); + check_member( objinst, expect_obj, "%#04x", wUsage ); + check_member( objinst, expect_obj, "%#04x", dwDimension ); + check_member( objinst, expect_obj, "%#04x", wExponent ); + check_member( objinst, expect_obj, "%u", wReportId ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, 0x14, DIPH_BYOFFSET ); ok( hr == DIERR_NOTFOUND, "GetObjectInfo returned: %#x\n", hr ); @@ -4339,21 +4501,24 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, res, DIPH_BYID ); ok( hr == DI_OK, "GetObjectInfo returned: %#x\n", hr ); - check_member( objinst, expect_objects[8], "%u", dwSize ); - check_member_guid( objinst, expect_objects[8], guidType ); - check_member( objinst, expect_objects[8], "%#x", dwOfs ); - check_member( objinst, expect_objects[8], "%#x", dwType ); - check_member( objinst, expect_objects[8], "%#x", dwFlags ); - if (!localized) check_member_wstr( objinst, expect_objects[8], tszName ); - check_member( objinst, expect_objects[8], "%u", dwFFMaxForce ); - check_member( objinst, expect_objects[8], "%u", dwFFForceResolution ); - check_member( objinst, expect_objects[8], "%u", wCollectionNumber ); - check_member( objinst, expect_objects[8], "%u", wDesignatorIndex ); - check_member( objinst, expect_objects[8], "%#04x", wUsagePage ); - check_member( objinst, expect_objects[8], "%#04x", wUsage ); - check_member( objinst, expect_objects[8], "%#04x", dwDimension ); - check_member( objinst, expect_objects[8], "%#04x", wExponent ); - check_member( objinst, expect_objects[8], "%u", wReportId ); + if (version < 0x0700) expect_obj = expect_objects_5[6]; + else expect_obj = expect_objects[8]; + check_member( objinst, expect_obj, "%u", dwSize ); + check_member_guid( objinst, expect_obj, guidType ); + todo_wine_if( version < 0x0700 ) + check_member( objinst, expect_obj, "%#x", dwOfs ); + check_member( objinst, expect_obj, "%#x", dwType ); + check_member( objinst, expect_obj, "%#x", dwFlags ); + if (!localized) check_member_wstr( objinst, expect_obj, tszName ); + check_member( objinst, expect_obj, "%u", dwFFMaxForce ); + check_member( objinst, expect_obj, "%u", dwFFForceResolution ); + check_member( objinst, expect_obj, "%u", wCollectionNumber ); + check_member( objinst, expect_obj, "%u", wDesignatorIndex ); + check_member( objinst, expect_obj, "%#04x", wUsagePage ); + check_member( objinst, expect_obj, "%#04x", wUsage ); + check_member( objinst, expect_obj, "%#04x", dwDimension ); + check_member( objinst, expect_obj, "%#04x", wExponent ); + check_member( objinst, expect_obj, "%u", wReportId ); hr = IDirectInputDevice8_EnumEffects( device, NULL, NULL, DIEFT_ALL ); ok( hr == DIERR_INVALIDPARAM, "EnumEffects returned %#x\n", hr ); @@ -4397,21 +4562,25 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, DIJOFS_Y, DIPH_BYOFFSET ); ok( hr == DI_OK, "GetObjectInfo returned: %#x\n", hr ); - check_member( objinst, expect_objects[3], "%u", dwSize ); - check_member_guid( objinst, expect_objects[3], guidType ); - check_member( objinst, expect_objects[3], "%#x", dwOfs ); - check_member( objinst, expect_objects[3], "%#x", dwType ); - check_member( objinst, expect_objects[3], "%#x", dwFlags ); - if (!localized) check_member_wstr( objinst, expect_objects[3], tszName ); - check_member( objinst, expect_objects[3], "%u", dwFFMaxForce ); - check_member( objinst, expect_objects[3], "%u", dwFFForceResolution ); - check_member( objinst, expect_objects[3], "%u", wCollectionNumber ); - check_member( objinst, expect_objects[3], "%u", wDesignatorIndex ); - check_member( objinst, expect_objects[3], "%#04x", wUsagePage ); - check_member( objinst, expect_objects[3], "%#04x", wUsage ); - check_member( objinst, expect_objects[3], "%#04x", dwDimension ); - check_member( objinst, expect_objects[3], "%#04x", wExponent ); - check_member( objinst, expect_objects[3], "%u", wReportId ); + if (version < 0x0700) expect_obj = expect_objects_5[1]; + else expect_obj = expect_objects[3]; + if (version < 0x0800) expect_obj.dwOfs = DIJOFS_Y; + check_member( objinst, expect_obj, "%u", dwSize ); + check_member_guid( objinst, expect_obj, guidType ); + todo_wine_if( version < 0x0800 ) + check_member( objinst, expect_obj, "%#x", dwOfs ); + check_member( objinst, expect_obj, "%#x", dwType ); + check_member( objinst, expect_obj, "%#x", dwFlags ); + if (!localized) check_member_wstr( objinst, expect_obj, tszName ); + check_member( objinst, expect_obj, "%u", dwFFMaxForce ); + check_member( objinst, expect_obj, "%u", dwFFForceResolution ); + check_member( objinst, expect_obj, "%u", wCollectionNumber ); + check_member( objinst, expect_obj, "%u", wDesignatorIndex ); + check_member( objinst, expect_obj, "%#04x", wUsagePage ); + check_member( objinst, expect_obj, "%#04x", wUsage ); + check_member( objinst, expect_obj, "%#04x", dwDimension ); + check_member( objinst, expect_obj, "%#04x", wExponent ); + check_member( objinst, expect_obj, "%u", wReportId ); hr = IDirectInputDevice8_SetEventNotification( device, (HANDLE)0xdeadbeef ); todo_wine @@ -4472,7 +4641,8 @@ static void test_simple_joystick(void) ok( hr == DI_OK, "Acquire returned: %#x\n", hr ); hr = IDirectInputDevice8_Poll( device ); - ok( hr == DI_NOEFFECT, "Poll returned: %#x\n", hr ); + todo_wine_if( version < 0x0700 ) + ok( hr == (version < 0x0700 ? DI_OK : DI_NOEFFECT), "Poll returned: %#x\n", hr ); hr = IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE2) + 1, &state ); ok( hr == DIERR_INVALIDPARAM, "GetDeviceState returned: %#x\n", hr ); @@ -4516,11 +4686,16 @@ static void test_simple_joystick(void) winetest_pop_context(); res = 1; - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA) - 1, objdata, &res, DIGDD_PEEK ); - todo_wine - ok( hr == DIERR_INVALIDPARAM, "GetDeviceData returned %#x\n", hr ); + size = version < 0x0800 ? sizeof(DIDEVICEOBJECTDATA_DX3) : sizeof(DIDEVICEOBJECTDATA); + hr = IDirectInputDevice8_GetDeviceData( device, size - 1, objdata, &res, DIGDD_PEEK ); + if (version < 0x0800) ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); + else + { + todo_wine + ok( hr == DIERR_INVALIDPARAM, "GetDeviceData returned %#x\n", hr ); + } res = 1; - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, DIGDD_PEEK ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &res, DIGDD_PEEK ); ok( hr == DIERR_NOTBUFFERED, "GetDeviceData returned %#x\n", hr ); hr = IDirectInputDevice8_Unacquire( device ); @@ -4538,7 +4713,7 @@ static void test_simple_joystick(void) ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); res = 1; - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, DIGDD_PEEK ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &res, DIGDD_PEEK ); ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); ok( res == 0, "got %u expected %u\n", res, 0 ); @@ -4548,12 +4723,13 @@ static void test_simple_joystick(void) ResetEvent( event ); res = 1; - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, DIGDD_PEEK ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &res, DIGDD_PEEK ); + todo_wine_if( version < 0x0800 ) ok( hr == DI_BUFFEROVERFLOW, "GetDeviceData returned %#x\n", hr ); ok( res == 0, "got %u expected %u\n", res, 0 ); res = 1; - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); - todo_wine + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &res, 0 ); + todo_wine_if( version >= 0x0800 ) ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); ok( res == 0, "got %u expected %u\n", res, 0 ); @@ -4573,22 +4749,23 @@ static void test_simple_joystick(void) ResetEvent( event ); res = 1; - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, DIGDD_PEEK ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &res, DIGDD_PEEK ); ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); ok( res == 1, "got %u expected %u\n", res, 1 ); check_member( objdata[0], expect_objdata[0], "%#x", dwOfs ); check_member( objdata[0], expect_objdata[0], "%#x", dwData ); - ok( objdata[0].uAppData == -1, "got %p, expected %p\n", (void *)objdata[0].uAppData, (void *)-1 ); + if (version >= 0x0800) ok( objdata[0].uAppData == -1, "got %p\n", (void *)objdata[0].uAppData ); res = 4; - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &res, 0 ); ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); ok( res == 4, "got %u expected %u\n", res, 4 ); for (i = 0; i < 4; ++i) { + DIDEVICEOBJECTDATA *ptr = (DIDEVICEOBJECTDATA *)((char *)objdata + size * i); winetest_push_context( "objdata[%d]", i ); - check_member( objdata[i], expect_objdata[1 + i], "%#x", dwOfs ); - check_member( objdata[i], expect_objdata[1 + i], "%#x", dwData ); - ok( objdata[i].uAppData == -1, "got %p, expected %p\n", (void *)objdata[i].uAppData, (void *)-1 ); + check_member( *ptr, expect_objdata[1 + i], "%#x", dwOfs ); + check_member( *ptr, expect_objdata[1 + i], "%#x", dwData ); + if (version >= 0x0800) ok( ptr->uAppData == -1, "got %p\n", (void *)ptr->uAppData ); winetest_pop_context(); } @@ -4602,26 +4779,28 @@ static void test_simple_joystick(void) ResetEvent( event ); res = 1; - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &res, 0 ); + todo_wine_if( version < 0x0800 ) ok( hr == DI_BUFFEROVERFLOW, "GetDeviceData returned %#x\n", hr ); ok( res == 1, "got %u expected %u\n", res, 1 ); todo_wine check_member( objdata[0], expect_objdata[5], "%#x", dwOfs ); todo_wine check_member( objdata[0], expect_objdata[5], "%#x", dwData ); - ok( objdata[0].uAppData == -1, "got %p, expected %p\n", (void *)objdata[0].uAppData, (void *)-1 ); + if (version >= 0x0800) ok( objdata[0].uAppData == -1, "got %p\n", (void *)objdata[0].uAppData ); res = ARRAY_SIZE(objdata); - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &res, 0 ); ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); ok( res == 8, "got %u expected %u\n", res, 8 ); for (i = 0; i < 8; ++i) { + DIDEVICEOBJECTDATA *ptr = (DIDEVICEOBJECTDATA *)((char *)objdata + size * i); winetest_push_context( "objdata[%d]", i ); todo_wine - check_member( objdata[i], expect_objdata[6 + i], "%#x", dwOfs ); + check_member( *ptr, expect_objdata[6 + i], "%#x", dwOfs ); todo_wine_if( i == 1 || i == 2 || i == 6 ) - check_member( objdata[i], expect_objdata[6 + i], "%#x", dwData ); - ok( objdata[i].uAppData == -1, "got %p, expected %p\n", (void *)objdata[i].uAppData, (void *)-1 ); + check_member( *ptr, expect_objdata[6 + i], "%#x", dwData ); + if (version >= 0x0800) ok( ptr->uAppData == -1, "got %p\n", (void *)ptr->uAppData ); winetest_pop_context(); } @@ -4719,7 +4898,9 @@ static void test_simple_joystick(void) ok( hr == DIERR_INVALIDPARAM, "SetDataFormat returned: %#x\n", hr ); objdataformat[1].dwType = DIDFT_AXIS|DIDFT_MAKEINSTANCE( 0xff ); hr = IDirectInputDevice8_SetDataFormat( device, &dataformat ); - ok( hr == DIERR_INVALIDPARAM, "SetDataFormat returned: %#x\n", hr ); + todo_wine_if( version < 0x0700 ) + ok( hr == (version < 0x0700 ? DI_OK : DIERR_INVALIDPARAM), + "SetDataFormat returned: %#x\n", hr ); objdataformat[1].dwType = DIDFT_AXIS|DIDFT_MAKEINSTANCE( 1 ); hr = IDirectInputDevice8_SetDataFormat( device, &dataformat ); ok( hr == DI_OK, "SetDataFormat returned: %#x\n", hr ); @@ -4821,9 +5002,13 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_SetProperty( device, DIPROP_RANGE, &prop_range.diph ); ok( hr == DI_OK, "SetProperty DIPROP_RANGE returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_LOGICALRANGE, &prop_range.diph ); - ok( hr == DIERR_ACQUIRED, "SetProperty DIPROP_LOGICALRANGE returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_ACQUIRED), + "SetProperty DIPROP_LOGICALRANGE returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_PHYSICALRANGE, &prop_range.diph ); - ok( hr == DIERR_ACQUIRED, "SetProperty DIPROP_PHYSICALRANGE returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_ACQUIRED), + "SetProperty DIPROP_PHYSICALRANGE returned %#x\n", hr ); hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); @@ -4876,13 +5061,17 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_SetProperty( device, DIPROP_VIDPID, NULL ); ok( hr == DIERR_INVALIDPARAM, "SetProperty returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_VIDPID, &prop_string.diph ); - ok( hr == DIERR_INVALIDPARAM, "SetProperty returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_INVALIDPARAM), + "SetProperty DIPROP_VIDPID returned %#x\n", hr ); prop_dword.diph.dwHow = DIPH_DEVICE; prop_dword.diph.dwObj = 0; prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_SetProperty( device, DIPROP_VIDPID, &prop_dword.diph ); - ok( hr == DIERR_READONLY, "SetProperty DIPROP_VIDPID returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_READONLY), + "SetProperty DIPROP_VIDPID returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_GUIDANDPATH, &prop_guid_path.diph ); ok( hr == DIERR_READONLY, "SetProperty DIPROP_GUIDANDPATH returned %#x\n", hr ); @@ -4903,9 +5092,13 @@ static void test_simple_joystick(void) debugstr_w(prop_string.wsz) ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_TYPENAME, &prop_string.diph ); - ok( hr == DIERR_READONLY, "SetProperty DIPROP_TYPENAME returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_READONLY), + "SetProperty DIPROP_TYPENAME returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_USERNAME, &prop_string.diph ); - ok( hr == DIERR_READONLY, "SetProperty DIPROP_USERNAME returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_READONLY), + "SetProperty DIPROP_USERNAME returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); ok( hr == DIERR_READONLY, "SetProperty DIPROP_FFLOAD returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_GRANULARITY, &prop_dword.diph ); @@ -4924,7 +5117,8 @@ static void test_simple_joystick(void) prop_pointer.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); todo_wine - ok( hr == DIERR_ACQUIRED, "SetProperty DIPROP_APPDATA returned %#x\n", hr ); + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_ACQUIRED), + "SetProperty DIPROP_APPDATA returned %#x\n", hr ); prop_dword.diph.dwHow = DIPH_DEVICE; prop_dword.diph.dwObj = 0; @@ -5039,8 +5233,8 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE2), &state ); ok( hr == DI_OK, "GetDeviceState returned: %#x\n", hr ); winetest_push_context( "state[%d]", i ); - todo_wine - ok( state.lX == 15, "got lX %d, expected %d\n" , state.lX, 15 ); + todo_wine_if( version >= 0x0700 ) + ok( state.lX == (version < 0x0700 ? -9000 : 15), "got lX %d\n", state.lX ); check_member( state, expect_state_abs[0], "%d", lY ); check_member( state, expect_state_abs[0], "%d", lZ ); check_member( state, expect_state_abs[0], "%d", lRx ); @@ -5076,7 +5270,9 @@ static void test_simple_joystick(void) prop_pointer.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); prop_pointer.uData = 0xfeedcafe; hr = IDirectInputDevice8_SetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); - ok( hr == DI_OK, "SetProperty DIPROP_APPDATA returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_OK), + "SetProperty DIPROP_APPDATA returned %#x\n", hr ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_SetProperty( device, DIPROP_AXISMODE, &prop_dword.diph ); @@ -5103,9 +5299,13 @@ static void test_simple_joystick(void) prop_pointer.diph.dwHow = DIPH_BYUSAGE; prop_pointer.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); - todo_wine - ok( hr == DI_OK, "GetProperty DIPROP_APPDATA returned %#x\n", hr ); - ok( prop_pointer.uData == 0xfeedcafe, "got %p expected %p\n", (void *)prop_pointer.uData, (void *)0xfeedcafe ); + if (version < 0x0800) ok( hr == DIERR_UNSUPPORTED, "GetProperty returned %#x\n", hr ); + else + { + todo_wine + ok( hr == DI_OK, "GetProperty DIPROP_APPDATA returned %#x\n", hr ); + ok( prop_pointer.uData == 0xfeedcafe, "got %p expected %p\n", (void *)prop_pointer.uData, (void *)0xfeedcafe ); + } prop_dword.diph.dwHow = DIPH_DEVICE; prop_dword.diph.dwObj = 0; @@ -5185,15 +5385,15 @@ static void test_simple_joystick(void) objdata[0].dwOfs = 0xd; objdata[0].dwData = 0x80; res = 1; - hr = IDirectInputDevice8_SendDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0xdeadbeef ); + hr = IDirectInputDevice8_SendDeviceData( device, size, objdata, &res, 0xdeadbeef ); todo_wine ok( hr == DIERR_INVALIDPARAM, "SendDeviceData returned %#x\n", hr ); res = 1; - hr = IDirectInputDevice8_SendDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 1 /*DISDD_CONTINUE*/ ); + hr = IDirectInputDevice8_SendDeviceData( device, size, objdata, &res, 1 /*DISDD_CONTINUE*/ ); todo_wine ok( hr == DIERR_INVALIDPARAM, "SendDeviceData returned %#x\n", hr ); res = 1; - hr = IDirectInputDevice8_SendDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); + hr = IDirectInputDevice8_SendDeviceData( device, size, objdata, &res, 0 ); todo_wine ok( hr == DIERR_INVALIDPARAM, "SendDeviceData returned %#x\n", hr ); @@ -5249,6 +5449,7 @@ done: pnp_driver_stop(); cleanup_registry_keys(); SetCurrentDirectoryW( cwd ); + winetest_pop_context(); } struct device_desc @@ -8035,6 +8236,8 @@ static void test_force_feedback_joystick( DWORD version ) {.guid = TRUE, .type = TRUE, .usage = TRUE, .name = TRUE}, {0}, {.guid = TRUE, .type = TRUE, .usage = TRUE, .name = TRUE}, + {.ofs = TRUE}, + {.ofs = TRUE}, }; struct check_objects_params check_objects_params = { @@ -10014,7 +10217,10 @@ START_TEST( hid ) test_device_types( 0x500 ); test_device_types( 0x700 ); - test_simple_joystick(); + test_simple_joystick( 0x500 ); + test_simple_joystick( 0x700 ); + test_simple_joystick( 0x800 ); + test_force_feedback_joystick( 0x500 ); test_force_feedback_joystick( 0x700 ); test_force_feedback_joystick( 0x800 ); -- 2.34.1

2 7

[PATCH v2 1/6] dinput: Simplify the internal thread and don't require loader lock.
by Rémi Bernon 03 Jan '22

03 Jan '22

When thread shuts down, instead of holding and releasing a module ref. This keeps the thread alive until the module is unloaded, instead of keeping track of live IDirectInput instances. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: winmm patches are identical to previous version, I just refactored the dinput internal thread startup and shutdown instead. It's still lazily started but simply keeps running until the module is unloaded instead of holding a module reference. dlls/dinput/dinput_main.c | 121 ++++++++++++----------------------- dlls/dinput/dinput_private.h | 3 - 2 files changed, 42 insertions(+), 82 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 55d566afa4a..cab8886f9db 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -78,9 +78,18 @@ HINSTANCE DINPUT_instance; static HWND di_em_win; -static BOOL check_hook_thread(void); +static HANDLE dinput_thread; +static DWORD dinput_thread_id; + static CRITICAL_SECTION dinput_hook_crit; -static struct list direct_input_list = LIST_INIT( direct_input_list ); +static CRITICAL_SECTION_DEBUG dinput_critsect_debug = +{ + 0, 0, &dinput_hook_crit, + { &dinput_critsect_debug.ProcessLocksList, &dinput_critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": dinput_hook_crit") } +}; +static CRITICAL_SECTION dinput_hook_crit = { &dinput_critsect_debug, -1, 0, 0, 0, 0 }; + static struct list acquired_mouse_list = LIST_INIT( acquired_mouse_list ); static struct list acquired_rawmouse_list = LIST_INIT( acquired_rawmouse_list ); static struct list acquired_keyboard_list = LIST_INIT( acquired_keyboard_list ); @@ -453,18 +462,7 @@ static HRESULT initialize_directinput_instance(IDirectInputImpl *This, DWORD dwV list_init( &This->device_players ); - /* Add self to the list of the IDirectInputs */ - EnterCriticalSection( &dinput_hook_crit ); - list_add_head( &direct_input_list, &This->entry ); - LeaveCriticalSection( &dinput_hook_crit ); - This->initialized = TRUE; - - if (!check_hook_thread()) - { - uninitialize_directinput_instance( This ); - return DIERR_GENERIC; - } } return DI_OK; @@ -475,17 +473,11 @@ static void uninitialize_directinput_instance(IDirectInputImpl *This) if (This->initialized) { struct DevicePlayer *device_player, *device_player2; - /* Remove self from the list of the IDirectInputs */ - EnterCriticalSection( &dinput_hook_crit ); - list_remove( &This->entry ); - LeaveCriticalSection( &dinput_hook_crit ); LIST_FOR_EACH_ENTRY_SAFE( device_player, device_player2, &This->device_players, struct DevicePlayer, entry ) free( device_player ); - check_hook_thread(); - This->initialized = FALSE; } } @@ -1262,13 +1254,13 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam return CallNextHookEx( 0, code, wparam, lparam ); } -static DWORD WINAPI hook_thread_proc(void *param) +static DWORD WINAPI dinput_thread_proc( void *params ) { + HANDLE events[128], start_event = params; static HHOOK kbd_hook, mouse_hook; struct dinput_device *impl, *next; SIZE_T events_count = 0; HANDLE finished_event; - HANDLE events[128]; HRESULT hr; DWORD ret; MSG msg; @@ -1277,7 +1269,7 @@ static DWORD WINAPI hook_thread_proc(void *param) /* Force creation of the message queue */ PeekMessageW( &msg, 0, 0, 0, PM_NOREMOVE ); - SetEvent(param); + SetEvent( start_event ); while ((ret = MsgWaitForMultipleObjectsEx( events_count, events, INFINITE, QS_ALLINPUT, 0 )) <= events_count) { @@ -1354,61 +1346,36 @@ static DWORD WINAPI hook_thread_proc(void *param) done: DestroyWindow( di_em_win ); di_em_win = NULL; - - FreeLibraryAndExitThread(DINPUT_instance, 0); + return 0; } -static DWORD hook_thread_id; -static HANDLE hook_thread_event; - -static CRITICAL_SECTION_DEBUG dinput_critsect_debug = +static BOOL WINAPI dinput_thread_start_once( INIT_ONCE *once, void *param, void **context ) { - 0, 0, &dinput_hook_crit, - { &dinput_critsect_debug.ProcessLocksList, &dinput_critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": dinput_hook_crit") } -}; -static CRITICAL_SECTION dinput_hook_crit = { &dinput_critsect_debug, -1, 0, 0, 0, 0 }; + HANDLE start_event; -static BOOL check_hook_thread(void) + start_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + if (!start_event) ERR( "failed to create start event, error %u\n", GetLastError() ); + + dinput_thread = CreateThread( NULL, 0, dinput_thread_proc, start_event, 0, &dinput_thread_id ); + if (!dinput_thread) ERR( "failed to create internal thread, error %u\n", GetLastError() ); + + WaitForSingleObject( start_event, INFINITE ); + CloseHandle( start_event ); + + return TRUE; +} + +static void dinput_thread_start(void) { - static HANDLE hook_thread; - HMODULE module; - HANDLE wait_handle = NULL; + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + InitOnceExecuteOnce( &init_once, dinput_thread_start_once, NULL, NULL ); +} - EnterCriticalSection(&dinput_hook_crit); - - TRACE("IDirectInputs left: %d\n", list_count(&direct_input_list)); - if (!list_empty(&direct_input_list) && !hook_thread) - { - GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR*)DINPUT_instance, &module); - hook_thread_event = CreateEventW(NULL, FALSE, FALSE, NULL); - hook_thread = CreateThread(NULL, 0, hook_thread_proc, hook_thread_event, 0, &hook_thread_id); - } - else if (list_empty(&direct_input_list) && hook_thread) - { - DWORD tid = hook_thread_id; - - if (hook_thread_event) /* if thread is not started yet */ - { - WaitForSingleObject(hook_thread_event, INFINITE); - CloseHandle(hook_thread_event); - hook_thread_event = NULL; - } - - hook_thread_id = 0; - PostThreadMessageW(tid, WM_USER+0x10, 0, 0); - wait_handle = hook_thread; - hook_thread = NULL; - } - - LeaveCriticalSection(&dinput_hook_crit); - - if (wait_handle) - { - WaitForSingleObject(wait_handle, INFINITE); - CloseHandle(wait_handle); - } - return hook_thread_id != 0; +static void dinput_thread_stop(void) +{ + PostThreadMessageW( dinput_thread_id, WM_USER + 0x10, 0, 0 ); + WaitForSingleObject( dinput_thread, INFINITE ); + CloseHandle( dinput_thread ); } void check_dinput_hooks( IDirectInputDevice8W *iface, BOOL acquired ) @@ -1418,6 +1385,8 @@ void check_dinput_hooks( IDirectInputDevice8W *iface, BOOL acquired ) struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); HANDLE hook_change_finished_event = NULL; + dinput_thread_start(); + EnterCriticalSection(&dinput_hook_crit); if (impl->dwCoopLevel & DISCL_FOREGROUND) @@ -1437,13 +1406,6 @@ void check_dinput_hooks( IDirectInputDevice8W *iface, BOOL acquired ) callwndproc_hook = NULL; } - if (hook_thread_event) /* if thread is not started yet */ - { - WaitForSingleObject(hook_thread_event, INFINITE); - CloseHandle(hook_thread_event); - hook_thread_event = NULL; - } - if (impl->use_raw_input) { if (acquired) @@ -1470,7 +1432,7 @@ void check_dinput_hooks( IDirectInputDevice8W *iface, BOOL acquired ) } hook_change_finished_event = CreateEventW( NULL, FALSE, FALSE, NULL ); - PostThreadMessageW( hook_thread_id, WM_USER+0x10, 1, (LPARAM)hook_change_finished_event ); + PostThreadMessageW( dinput_thread_id, WM_USER + 0x10, 1, (LPARAM)hook_change_finished_event ); LeaveCriticalSection(&dinput_hook_crit); @@ -1505,6 +1467,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved) break; case DLL_PROCESS_DETACH: if (reserved) break; + dinput_thread_stop(); unregister_di_em_win_class(); DeleteCriticalSection(&dinput_hook_crit); break; diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index c25fe6320ca..4b36a69c0e1 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -40,10 +40,7 @@ struct IDirectInputImpl IDirectInputJoyConfig8 IDirectInputJoyConfig8_iface; LONG ref; - BOOL initialized; - struct list entry; /* entry into list of all IDirectInputs */ - DWORD evsequence; /* unique sequence number for events */ DWORD dwVersion; /* direct input version number */ struct list device_players; /* device instance guid to player name */ -- 2.34.0

2 7

[PATCH] include: Add SL_ERROR_RETURNED
by Alex Henrie 03 Jan '22

03 Jan '22

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- I noticed that this was missing while investigating a testbot failure. --- include/ddk/wdm.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index b798d339561..d00acf5b782 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -961,6 +961,7 @@ typedef NTSTATUS (WINAPI *PIO_COMPLETION_ROUTINE)( IN PVOID Context); #define SL_PENDING_RETURNED 0x01 +#define SL_ERROR_RETURNED 0x02 #define SL_INVOKE_ON_CANCEL 0x20 #define SL_INVOKE_ON_SUCCESS 0x40 #define SL_INVOKE_ON_ERROR 0x80 -- 2.34.1

1 0

[PATCH] faultrep/tests: Remove registry writability check
by Alex Henrie 03 Jan '22

03 Jan '22

This check isn't needed anymore either. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/faultrep/tests/faultrep.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/faultrep/tests/faultrep.c b/dlls/faultrep/tests/faultrep.c index c71db80cdbb..41f03ee8870 100644 --- a/dlls/faultrep/tests/faultrep.c +++ b/dlls/faultrep/tests/faultrep.c @@ -72,11 +72,6 @@ static void test_AddERExcludedApplicationA(void) /* clean state */ lres = RegCreateKeyA(HKEY_LOCAL_MACHINE, regpath_root, &hroot); - if (lres == ERROR_ACCESS_DENIED) - { - skip("Not enough access rights\n"); - return; - } if (!lres) lres = RegOpenKeyA(hroot, regpath_exclude, &hexclude); -- 2.34.1

1 0

Wine staging 7.0-rc4 release
by Alistair Leslie-Hughes 03 Jan '22

03 Jan '22

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 7.0-rc4 (552 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * None Updated: * None Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/2] faultrep/tests: Drop workarounds for Windows <= 2000
by Alex Henrie 03 Jan '22

03 Jan '22

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/faultrep/tests/faultrep.c | 62 ++++------------------------------ 1 file changed, 6 insertions(+), 56 deletions(-) diff --git a/dlls/faultrep/tests/faultrep.c b/dlls/faultrep/tests/faultrep.c index d0b30f70cf1..30664bd29be 100644 --- a/dlls/faultrep/tests/faultrep.c +++ b/dlls/faultrep/tests/faultrep.c @@ -36,65 +36,15 @@ static const char regpath_exclude[] = "ExclusionList"; static BOOL is_process_limited(void) { - static BOOL (WINAPI *pCheckTokenMembership)(HANDLE,PSID,PBOOL) = NULL; - static BOOL (WINAPI *pOpenProcessToken)(HANDLE, DWORD, PHANDLE) = NULL; - SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; - PSID Group; - BOOL IsInGroup; HANDLE token; + TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; + DWORD size; - if (!pOpenProcessToken) - { - HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); - pOpenProcessToken = (void*)GetProcAddress(hadvapi32, "OpenProcessToken"); - pCheckTokenMembership = (void*)GetProcAddress(hadvapi32, "CheckTokenMembership"); - if (!pCheckTokenMembership || !pOpenProcessToken) - { - /* Win9x (power to the masses) or NT4 (no way to know) */ - trace("missing pOpenProcessToken or CheckTokenMembership\n"); - return FALSE; - } - } - - if (!AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, 0, 0, 0, 0, 0, &Group) || - !pCheckTokenMembership(NULL, Group, &IsInGroup)) - { - trace("Could not check if the current user is an administrator\n"); - return FALSE; - } - FreeSid(Group); - if (!IsInGroup) - { - if (!AllocateAndInitializeSid(&NtAuthority, 2, - SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_POWER_USERS, - 0, 0, 0, 0, 0, 0, &Group) || - !pCheckTokenMembership(NULL, Group, &IsInGroup)) - { - trace("Could not check if the current user is a power user\n"); - return FALSE; - } - FreeSid(Group); - if (!IsInGroup) - { - /* Only administrators and power users can be powerful */ - return TRUE; - } - } + OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); + GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); + CloseHandle(token); - if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) - { - BOOL ret; - TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; - DWORD size; - - ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); - CloseHandle(token); - return (ret && type == TokenElevationTypeLimited); - } - return FALSE; + return type == TokenElevationTypeLimited; } -- 2.34.1

2 3

[PATCH] dmsynth/tests: Clarify the sink init / synth latency clock relationship
by Michael Stefaniuc 02 Jan '22

02 Jan '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Found while wondering why SetSynthSink() is not calling the sink's Init() method but GetLatencyClock(). The documentation states that the timing related methods should be passed on to the sink. https://docs.microsoft.com/en-us/windows-hardware/drivers/audio/idirectmusi… dlls/dmsynth/tests/dmsynth.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index 3ddf40817a5..3970933cb6f 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -44,6 +44,13 @@ static BOOL missing_dmsynth(void) return TRUE; } +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + static void test_dmsynth(void) { IDirectMusicSynth *dmsynth = NULL; @@ -52,6 +59,7 @@ static void test_dmsynth(void) IReferenceClock* clock_sink = NULL; IKsControl* control_synth = NULL; IKsControl* control_sink = NULL; + ULONG ref_clock_synth, ref_clock_sink; HRESULT hr; KSPROPERTY property; ULONG value; @@ -104,6 +112,10 @@ static void test_dmsynth(void) ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes); ok(value == TRUE, "Return value: %u, should be 1\n", value); + /* Synth isn't fully initialized yet */ + hr = IDirectMusicSynth_Activate(dmsynth, TRUE); + todo_wine ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_Activate returned: %x\n", hr); + /* Synth has no default clock */ hr = IDirectMusicSynth_GetLatencyClock(dmsynth, &clock_synth); ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_GetLatencyClock returned: %x\n", hr); @@ -112,8 +124,9 @@ static void test_dmsynth(void) hr = IDirectMusicSynthSink_GetLatencyClock(dmsynth_sink, &clock_sink); ok(hr == S_OK, "IDirectMusicSynth_GetLatencyClock returned: %x\n", hr); ok(clock_sink != NULL, "No clock returned\n"); + ref_clock_sink = get_refcount(clock_sink); - /* This will set clock to Synth */ + /* This will Init() the SynthSink and finish initializing the Synth */ hr = IDirectMusicSynth_SetSynthSink(dmsynth, dmsynth_sink); ok(hr == S_OK, "IDirectMusicSynth_SetSynthSink returned: %x\n", hr); @@ -122,6 +135,8 @@ static void test_dmsynth(void) ok(hr == S_OK, "IDirectMusicSynth_GetLatencyClock returned: %x\n", hr); ok(clock_synth != NULL, "No clock returned\n"); ok(clock_synth == clock_sink, "Synth and SynthSink clocks are not the same\n"); + ref_clock_synth = get_refcount(clock_synth); + ok(ref_clock_synth > ref_clock_sink + 1, "Latency clock refcount didn't increase\n"); if (control_synth) IDirectMusicSynth_Release(control_synth); -- 2.31.1

1 0

[PATCH] comctl32: Fix return type of ImageList_WriteEx.
by Roman Pišl 02 Jan '22

02 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52323 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/comctl32/imagelist.c | 4 ++-- include/commctrl.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 8da8beec1e0..155d4b2a956 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3061,10 +3061,10 @@ failed: /************************************************************************* * ImageList_WriteEx [COMCTL32.@] */ -BOOL WINAPI ImageList_WriteEx(HIMAGELIST himl, DWORD flags, IStream *pstm) +HRESULT WINAPI ImageList_WriteEx(HIMAGELIST himl, DWORD flags, IStream *pstm) { FIXME("%p %08x %p: semi-stub\n", himl, flags, pstm); - return ImageList_Write(himl, pstm); + return ImageList_Write(himl, pstm) ? S_OK : E_FAIL; } /************************************************************************* diff --git a/include/commctrl.h b/include/commctrl.h index 025eb328c32..c6d9dd32928 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -602,7 +602,7 @@ BOOL WINAPI ImageList_SetOverlayImage(HIMAGELIST,INT,INT); #ifdef __IStream_INTERFACE_DEFINED__ HIMAGELIST WINAPI ImageList_Read(LPSTREAM); BOOL WINAPI ImageList_Write(HIMAGELIST,IStream*); -BOOL WINAPI ImageList_WriteEx(HIMAGELIST,DWORD,IStream*); +HRESULT WINAPI ImageList_WriteEx(HIMAGELIST,DWORD,IStream*); #endif #define ImageList_AddIcon(himl,hicon) ImageList_ReplaceIcon(himl,-1,hicon) -- 2.30.2

1 0

[PATCH v2] po: Update Simplified Chinese translation.
by Jactry Zeng 02 Jan '22

02 Jan '22

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- Superseded patch 222804. --- po/zh_CN.po | 1868 ++++++++++++++++++++++----------------------------- 1 file changed, 808 insertions(+), 1060 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index e4860d4f83e..469fc90c91e 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: 2020-12-15 16:24+0800\n" +"PO-Revision-Date: 2022-01-03 00:36+0800\n" "Last-Translator: Jactry Zeng <jzeng(a)codeweavers.com>\n" "Language-Team: Chinese (PRC)\n" "Language: zh_CN\n" @@ -21,26 +21,20 @@ msgid "Security" msgstr "安全" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "用户名(&U)：" +msgstr "用户组或用户名(&G):" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "黄色" +msgstr "允许" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "拒绝" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Permission denied" msgid "Permissions for %1" -msgstr "没有权限" +msgstr "%1 的权限" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" @@ -122,39 +116,39 @@ msgstr "确定" #: dlls/appwiz.cpl/appwiz.rc:79 msgid "The following information can be used to get technical support for %s:" -msgstr "%s 技术支持信息：" +msgstr "以下信息可用于寻求 %s 的技术支持:" #: dlls/appwiz.cpl/appwiz.rc:80 msgid "Publisher:" -msgstr "生产商：" +msgstr "生产商:" #: dlls/appwiz.cpl/appwiz.rc:81 programs/winefile/winefile.rc:165 msgid "Version:" -msgstr "版本：" +msgstr "版本:" #: dlls/appwiz.cpl/appwiz.rc:82 msgid "Contact:" -msgstr "联系人：" +msgstr "联系人:" #: dlls/appwiz.cpl/appwiz.rc:83 msgid "Support Information:" -msgstr "支持信息：" +msgstr "支持信息:" #: dlls/appwiz.cpl/appwiz.rc:84 msgid "Support Telephone:" -msgstr "支持电话：" +msgstr "支持电话:" #: dlls/appwiz.cpl/appwiz.rc:85 msgid "Readme:" -msgstr "产品说明：" +msgstr "产品说明:" #: dlls/appwiz.cpl/appwiz.rc:86 msgid "Product Updates:" -msgstr "产品更新：" +msgstr "产品更新:" #: dlls/appwiz.cpl/appwiz.rc:87 msgid "Comments:" -msgstr "备注：" +msgstr "备注:" #: dlls/appwiz.cpl/appwiz.rc:100 msgid "Wine Gecko Installer" @@ -251,7 +245,7 @@ msgstr "添加/删除程序" msgid "" "Allows you to install new software, or remove existing software from your " "computer." -msgstr "允许你安装新软件或删除现有程序。" +msgstr "允许您安装新软件，或从您的计算机删除现有的软件。" #: dlls/appwiz.cpl/appwiz.rc:33 programs/taskmgr/taskmgr.rc:262 #: programs/winecfg/winecfg.rc:32 @@ -322,7 +316,7 @@ msgstr "压缩选项" #: dlls/avifil32/avifil32.rc:45 msgid "&Choose a stream:" -msgstr "选择来源流(&C)：" +msgstr "选择来源流(&C):" #: dlls/avifil32/avifil32.rc:48 programs/wordpad/wordpad.rc:76 msgid "&Options..." @@ -330,7 +324,7 @@ msgstr "选项(&O)..." #: dlls/avifil32/avifil32.rc:49 msgid "&Interleave every" -msgstr "交织(&I)：每" +msgstr "交织(&I): 每隔" #: dlls/avifil32/avifil32.rc:51 dlls/msvfw32/msvfw32.rc:51 msgid "frames" @@ -338,11 +332,11 @@ msgstr "帧数" #: dlls/avifil32/avifil32.rc:52 msgid "Current format:" -msgstr "当前格式：" +msgstr "当前格式:" #: dlls/avifil32/avifil32.rc:30 msgid "Waveform: %s" -msgstr "波形：%s" +msgstr "波形: %s" #: dlls/avifil32/avifil32.rc:31 msgid "Waveform" @@ -467,7 +461,7 @@ msgstr "下移(&D)" #: dlls/comctl32/comctl32.rc:105 msgid "A&vailable buttons:" -msgstr "可用工具栏按钮(&V)：" +msgstr "可用工具栏按钮(&V):" #: dlls/comctl32/comctl32.rc:107 msgid "&Add ->" @@ -479,7 +473,7 @@ msgstr "<- 删除(&R)" #: dlls/comctl32/comctl32.rc:109 msgid "&Toolbar buttons:" -msgstr "当前工具栏按钮(&T)：" +msgstr "当前工具栏按钮(&T):" #: dlls/comctl32/comctl32.rc:42 msgid "Separator" @@ -521,7 +515,7 @@ msgstr "关闭" #: dlls/comctl32/comctl32.rc:36 msgid "Today:" -msgstr "今天：" +msgstr "今天:" #: dlls/comctl32/comctl32.rc:37 msgid "Go to today" @@ -536,19 +530,19 @@ msgstr "打开" #: dlls/comdlg32/comdlg32.rc:161 dlls/comdlg32/comdlg32.rc:183 msgid "File &Name:" -msgstr "文件名(&N)：" +msgstr "文件名(&N):" #: dlls/comdlg32/comdlg32.rc:164 dlls/comdlg32/comdlg32.rc:186 msgid "&Directories:" -msgstr "文件夹(&D)：" +msgstr "文件夹(&D):" #: dlls/comdlg32/comdlg32.rc:167 dlls/comdlg32/comdlg32.rc:189 msgid "List Files of &Type:" -msgstr "文件类型(&T)：" +msgstr "文件类型(&T):" #: dlls/comdlg32/comdlg32.rc:169 dlls/comdlg32/comdlg32.rc:191 msgid "Dri&ves:" -msgstr "驱动器(&V)：" +msgstr "驱动器(&V):" #: dlls/comdlg32/comdlg32.rc:174 dlls/comdlg32/comdlg32.rc:196 #: dlls/shell32/shell32.rc:368 dlls/shell32/shell32.rc:405 @@ -572,7 +566,7 @@ msgstr "打印" #: dlls/comdlg32/comdlg32.rc:205 msgid "Printer:" -msgstr "打印机：" +msgstr "打印机:" #: dlls/comdlg32/comdlg32.rc:207 dlls/comdlg32/comdlg32.rc:375 msgid "Print range" @@ -597,15 +591,15 @@ msgstr "设置(&S)" #: dlls/comdlg32/comdlg32.rc:214 msgid "&From:" -msgstr "从(&F)：" +msgstr "从(&F):" #: dlls/comdlg32/comdlg32.rc:215 msgid "&To:" -msgstr "到(&T)：" +msgstr "到(&T):" #: dlls/comdlg32/comdlg32.rc:216 dlls/wineps.drv/wineps.rc:42 msgid "Print &Quality:" -msgstr "打印质量(&Q)：" +msgstr "打印质量(&Q):" #: dlls/comdlg32/comdlg32.rc:218 msgid "Print to Fi&le" @@ -669,16 +663,16 @@ msgstr "字体" #: dlls/comdlg32/comdlg32.rc:254 msgid "&Font:" -msgstr "字体(&F)：" +msgstr "字体(&F):" #: dlls/comdlg32/comdlg32.rc:257 msgid "Font St&yle:" -msgstr "字体样式(&Y)：" +msgstr "字体样式(&Y):" #: dlls/comdlg32/comdlg32.rc:260 dlls/comdlg32/comdlg32.rc:439 #: programs/winecfg/winecfg.rc:292 msgid "&Size:" -msgstr "大小(&S)：" +msgstr "大小(&S):" #: dlls/comdlg32/comdlg32.rc:267 msgid "Effects" @@ -694,7 +688,7 @@ msgstr "下划线(&U)" #: dlls/comdlg32/comdlg32.rc:270 programs/winecfg/winecfg.rc:290 msgid "&Color:" -msgstr "配色(&C)：" +msgstr "配色(&C):" #: dlls/comdlg32/comdlg32.rc:273 msgid "Sample" @@ -710,11 +704,11 @@ msgstr "颜色" #: dlls/comdlg32/comdlg32.rc:286 msgid "&Basic Colors:" -msgstr "基本颜色(&B)：" +msgstr "基本颜色(&B):" #: dlls/comdlg32/comdlg32.rc:287 msgid "&Custom Colors:" -msgstr "自定义颜色(&C)：" +msgstr "自定义颜色(&C):" #: dlls/comdlg32/comdlg32.rc:289 msgid "|S&olid" @@ -722,29 +716,29 @@ msgstr "|纯色(&O)" #: dlls/comdlg32/comdlg32.rc:290 msgid "&Red:" -msgstr "红(&R)：" +msgstr "红(&R):" #: dlls/comdlg32/comdlg32.rc:292 msgid "&Green:" -msgstr "绿(&G)：" +msgstr "绿(&G):" #: dlls/comdlg32/comdlg32.rc:294 msgid "&Blue:" -msgstr "蓝(&B)：" +msgstr "蓝(&B):" #: dlls/comdlg32/comdlg32.rc:296 msgid "&Hue:" -msgstr "色调(&E)：" +msgstr "色调(&E):" #: dlls/comdlg32/comdlg32.rc:298 msgctxt "Saturation" msgid "&Sat:" -msgstr "饱和度(&S)：" +msgstr "饱和度(&S):" #: dlls/comdlg32/comdlg32.rc:300 msgctxt "Luminance" msgid "&Lum:" -msgstr "亮度(&L)：" +msgstr "亮度(&L):" #: dlls/comdlg32/comdlg32.rc:310 msgid "&Add to Custom Colors" @@ -766,7 +760,7 @@ msgstr "查找" #: dlls/comdlg32/comdlg32.rc:321 dlls/comdlg32/comdlg32.rc:340 msgid "Fi&nd What:" -msgstr "查找(&N)：" +msgstr "查找(&N):" #: dlls/comdlg32/comdlg32.rc:323 dlls/comdlg32/comdlg32.rc:344 msgid "Match &Whole Word Only" @@ -798,7 +792,7 @@ msgstr "替换" #: dlls/comdlg32/comdlg32.rc:342 msgid "Re&place With:" -msgstr "替换为(&P)：" +msgstr "替换为(&P):" #: dlls/comdlg32/comdlg32.rc:348 msgid "&Replace" @@ -822,23 +816,23 @@ msgstr "打印到文件(&L)" #: dlls/comdlg32/comdlg32.rc:365 dlls/comdlg32/comdlg32.rc:401 #: dlls/msacm32/msacm32.rc:34 programs/winefile/winefile.rc:137 msgid "&Name:" -msgstr "名称(&N)：" +msgstr "名称(&N):" #: dlls/comdlg32/comdlg32.rc:366 dlls/comdlg32/comdlg32.rc:404 msgid "Status:" -msgstr "状态：" +msgstr "状态:" #: dlls/comdlg32/comdlg32.rc:368 dlls/comdlg32/comdlg32.rc:406 msgid "Type:" -msgstr "型号：" +msgstr "型号:" #: dlls/comdlg32/comdlg32.rc:370 dlls/comdlg32/comdlg32.rc:408 msgid "Where:" -msgstr "位置：" +msgstr "位置:" #: dlls/comdlg32/comdlg32.rc:372 dlls/comdlg32/comdlg32.rc:410 msgid "Comment:" -msgstr "备注：" +msgstr "备注:" #: dlls/comdlg32/comdlg32.rc:377 msgid "Pa&ges" @@ -850,11 +844,11 @@ msgstr "选中的范围(&S)" #: dlls/comdlg32/comdlg32.rc:381 msgid "&from:" -msgstr "从(&F)：" +msgstr "从(&F):" #: dlls/comdlg32/comdlg32.rc:382 msgid "&to:" -msgstr "到(&T)：" +msgstr "到(&T):" #: dlls/comdlg32/comdlg32.rc:384 msgid "Copies" @@ -862,7 +856,7 @@ msgstr "份数" #: dlls/comdlg32/comdlg32.rc:385 msgid "Number of &copies:" -msgstr "份数(&C)：" +msgstr "份数(&C):" #: dlls/comdlg32/comdlg32.rc:387 msgid "C&ollate" @@ -874,7 +868,7 @@ msgstr "大小(&Z):" #: dlls/comdlg32/comdlg32.rc:416 msgid "&Source:" -msgstr "纸张来源(&S)：" +msgstr "纸张来源(&S):" #: dlls/comdlg32/comdlg32.rc:421 msgid "P&ortrait" @@ -890,7 +884,7 @@ msgstr "页面设置" #: dlls/comdlg32/comdlg32.rc:441 msgid "&Tray:" -msgstr "托盘(&T)：" +msgstr "托盘(&T):" #: dlls/comdlg32/comdlg32.rc:444 dlls/wineps.drv/wineps.rc:35 msgid "&Portrait" @@ -898,19 +892,19 @@ msgstr "纵向(&P)" #: dlls/comdlg32/comdlg32.rc:447 msgid "L&eft:" -msgstr "左(&E)：" +msgstr "左(&E):" #: dlls/comdlg32/comdlg32.rc:449 programs/notepad/notepad.rc:112 msgid "&Right:" -msgstr "右(&R)：" +msgstr "右(&R):" #: dlls/comdlg32/comdlg32.rc:451 msgid "T&op:" -msgstr "上(&O)：" +msgstr "上(&O):" #: dlls/comdlg32/comdlg32.rc:453 programs/notepad/notepad.rc:114 msgid "&Bottom:" -msgstr "下(&B)：" +msgstr "下(&B):" #: dlls/comdlg32/comdlg32.rc:457 msgid "P&rinter..." @@ -918,7 +912,7 @@ msgstr "打印机(&P)..." #: dlls/comdlg32/comdlg32.rc:465 dlls/comdlg32/comdlg32.rc:490 msgid "Look &in:" -msgstr "浏览(&I)：" +msgstr "浏览(&I):" #: dlls/comdlg32/comdlg32.rc:471 dlls/comdlg32/comdlg32.rc:497 msgid "File &name:" @@ -926,7 +920,7 @@ msgstr "文件名(&N):" #: dlls/comdlg32/comdlg32.rc:475 dlls/comdlg32/comdlg32.rc:501 msgid "Files of &type:" -msgstr "文件类型(&T)：" +msgstr "文件类型(&T):" #: dlls/comdlg32/comdlg32.rc:478 dlls/comdlg32/comdlg32.rc:504 msgid "Open as &read-only" @@ -940,11 +934,11 @@ msgstr "打开(&O)" #: dlls/comdlg32/comdlg32.rc:517 msgid "File name:" -msgstr "文件名：" +msgstr "文件名:" #: dlls/comdlg32/comdlg32.rc:520 msgid "Files of type:" -msgstr "文件类型：" +msgstr "文件类型:" #: dlls/comdlg32/comdlg32.rc:33 dlls/vbscript/vbscript.rc:35 msgid "File not found" @@ -960,7 +954,7 @@ msgid "" "Do you want to create file?" msgstr "" "文件不存在。\n" -"是否创建新文件？" +"是否创建新文件?" #: dlls/comdlg32/comdlg32.rc:36 msgid "" @@ -968,7 +962,7 @@ msgid "" "Do you want to replace it?" msgstr "" "文件已经存在。\n" -"是否替换？" +"是否替换?" #: dlls/comdlg32/comdlg32.rc:37 msgid "Invalid character(s) in path" @@ -979,7 +973,7 @@ msgid "" "A filename cannot contain any of the following characters:\n" " / : < > |" msgstr "" -"文件名中不能包含任何以下字符：\n" +"文件名中不能包含任何以下字符:\n" " / : < > |" #: dlls/comdlg32/comdlg32.rc:39 @@ -1128,7 +1122,7 @@ msgid "" "This large number of copies is not supported by your printer.\n" "Please enter a value between 1 and %d." msgstr "" -"你的打印机不支持这么大的份数。\n" +"您的打印机不支持这么大的份数。\n" "请输入一个 1 和 %d 之间的数。" #: dlls/comdlg32/comdlg32.rc:68 @@ -1171,7 +1165,7 @@ msgstr "保存(&S)" #: dlls/comdlg32/comdlg32.rc:144 msgid "Save &in:" -msgstr "保存在(&I)：" +msgstr "保存在(&I):" #: dlls/comdlg32/comdlg32.rc:145 msgid "Save" @@ -1316,12 +1310,12 @@ msgstr "毫米" #: dlls/credui/credui.rc:45 msgid "&User name:" -msgstr "用户名(&U)：" +msgstr "用户名(&U):" #: dlls/credui/credui.rc:48 dlls/cryptui/cryptui.rc:402 #: dlls/oledb32/version.rc:81 msgid "&Password:" -msgstr "密码(&P)：" +msgstr "密码(&P):" #: dlls/credui/credui.rc:50 msgid "&Remember my password" @@ -1344,7 +1338,7 @@ msgid "" "Make sure that your user name\n" "and password are correct." msgstr "" -"请确认你输入的用户名和密码\n" +"请确认您输入的用户名和密码\n" "是否正确。" #: dlls/credui/credui.rc:35 @@ -1354,9 +1348,9 @@ msgid "" "Press the Caps Lock key on your keyboard to turn off Caps Lock before\n" "entering your password." msgstr "" -"开着大写锁定可能导致你输入错误的密码。\n" +"开着大写锁定可能导致您输入错误的密码。\n" "\n" -"建议你按下键盘上的 Caps Lock 键以关闭大写锁定，然后再输入密码。" +"建议您按下键盘上的 Caps Lock 键以关闭大写锁定，然后再输入密码。" #: dlls/credui/credui.rc:34 msgid "Caps Lock is On" @@ -1541,7 +1535,7 @@ msgstr "组织单元" #: dlls/crypt32/crypt32.rc:74 msgid "Common Name" -msgstr "通用名" +msgstr "公用名" #: dlls/crypt32/crypt32.rc:75 msgid "Locality" @@ -2188,7 +2182,7 @@ msgstr "证书策略" #: dlls/cryptdlg/cryptdlg.rc:31 msgid "Policy Identifier: " -msgstr "策略标识符：" +msgstr "策略标识符:" #: dlls/cryptdlg/cryptdlg.rc:32 msgid "Policy Qualifier Info" @@ -2234,7 +2228,7 @@ msgstr "颁发者声明(&S)" #: dlls/cryptui/cryptui.rc:205 msgid "&Show:" -msgstr "显示(&S)：" +msgstr "显示(&S):" #: dlls/cryptui/cryptui.rc:210 msgid "&Edit Properties..." @@ -2258,7 +2252,7 @@ msgstr "查看证书(&V)" #: dlls/cryptui/cryptui.rc:223 msgid "Certificate &status:" -msgstr "证书状态(&S)：" +msgstr "证书状态(&S):" #: dlls/cryptui/cryptui.rc:229 msgid "Disclaimer" @@ -2270,12 +2264,12 @@ msgstr "更多信息(&I)" #: dlls/cryptui/cryptui.rc:244 msgid "&Friendly name:" -msgstr "易记名称(&F)：" +msgstr "易记名称(&F):" #: dlls/cryptui/cryptui.rc:246 programs/progman/progman.rc:154 #: programs/progman/progman.rc:170 msgid "&Description:" -msgstr "描述(&D)：" +msgstr "描述(&D):" #: dlls/cryptui/cryptui.rc:248 msgid "Certificate purposes" @@ -2291,7 +2285,7 @@ msgstr "禁用此证书的所有用途(&I)" #: dlls/cryptui/cryptui.rc:253 msgid "Enable &only the following purposes for this certificate:" -msgstr "仅启用此证书的如下用途(&O)：" +msgstr "仅启用此证书的如下用途(&O):" #: dlls/cryptui/cryptui.rc:258 msgid "Add &Purpose..." @@ -2304,7 +2298,7 @@ msgstr "添加用途" #: dlls/cryptui/cryptui.rc:265 msgid "" "Add the object identifier (OID) for the certificate purpose you wish to add:" -msgstr "为您要添加的证书用途添加对象识别 (OID) ：" +msgstr "为您要添加的证书用途添加对象识别 (OID):" #: dlls/cryptui/cryptui.rc:273 dlls/cryptui/cryptui.rc:69 msgid "Select Certificate Store" @@ -2349,7 +2343,7 @@ msgstr "" #: dlls/cryptui/cryptui.rc:299 dlls/cryptui/cryptui.rc:435 msgid "&File name:" -msgstr "文件名(&F)：" +msgstr "文件名(&F):" #: dlls/cryptui/cryptui.rc:301 dlls/cryptui/cryptui.rc:323 #: dlls/cryptui/cryptui.rc:437 programs/winecfg/winecfg.rc:311 @@ -2360,7 +2354,7 @@ msgstr "浏览(&R)..." msgid "" "Note: The following file formats may contain more than one certificate, " "certificate revocation list, or certificate trust list:" -msgstr "注意：如下格式的文件可能包含多个证书、证书吊销列表或证书信任列表：" +msgstr "注意: 如下格式的文件可能包含多个证书、证书吊销列表或证书信任列表:" #: dlls/cryptui/cryptui.rc:304 msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" @@ -2387,7 +2381,7 @@ msgstr "自动选择证书存储(&A)" #: dlls/cryptui/cryptui.rc:320 msgid "&Place all certificates in the following store:" -msgstr "将所有证书放入此存储(&P)：" +msgstr "将所有证书放入此存储(&P):" #: dlls/cryptui/cryptui.rc:330 msgid "Completing the Certificate Import Wizard" @@ -2399,7 +2393,7 @@ msgstr "您已成功完成证书导入向导。" #: dlls/cryptui/cryptui.rc:334 dlls/cryptui/cryptui.rc:448 msgid "You have specified the following settings:" -msgstr "您已指定如下设置：" +msgstr "您已指定如下设置:" #: dlls/cryptui/cryptui.rc:342 dlls/cryptui/cryptui.rc:122 #: dlls/inetcpl.cpl/inetcpl.rc:111 @@ -2408,7 +2402,7 @@ msgstr "证书" #: dlls/cryptui/cryptui.rc:345 msgid "I&ntended purpose:" -msgstr "预期用途：" +msgstr "预期用途:" #: dlls/cryptui/cryptui.rc:349 msgid "&Import..." @@ -2451,7 +2445,7 @@ msgstr "选择一个或多个在选中高级用途后要列出的用途。" #: dlls/cryptui/cryptui.rc:366 msgid "&Certificate purposes:" -msgstr "证书用途(&C)：" +msgstr "证书用途(&C):" #: dlls/cryptui/cryptui.rc:375 dlls/cryptui/cryptui.rc:386 #: dlls/cryptui/cryptui.rc:399 dlls/cryptui/cryptui.rc:409 @@ -2491,7 +2485,7 @@ msgstr "如果您选择导出私钥，将提示您创建密码以保护后页的 #: dlls/cryptui/cryptui.rc:390 msgid "Do you wish to export the private key?" -msgstr "您希望导出私钥吗？" +msgstr "您希望导出私钥吗?" #: dlls/cryptui/cryptui.rc:391 msgid "&Yes, export the private key" @@ -2503,11 +2497,11 @@ msgstr "否，不要导出私钥(&O)" #: dlls/cryptui/cryptui.rc:404 msgid "&Confirm password:" -msgstr "确认密码(&C)：" +msgstr "确认密码(&C):" #: dlls/cryptui/cryptui.rc:412 msgid "Select the format you want to use:" -msgstr "选择您希望使用的格式：" +msgstr "选择您希望使用的格式:" #: dlls/cryptui/cryptui.rc:413 msgid "&DER-encoded X.509 (*.cer)" @@ -2515,7 +2509,7 @@ msgstr "&DER 加密的 X.509 (*.cer)" #: dlls/cryptui/cryptui.rc:415 msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "Ba&se64 加密的 X.509 (*.cer)：" +msgstr "Ba&se64 加密的 X.509 (*.cer):" #: dlls/cryptui/cryptui.rc:417 msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" @@ -2591,15 +2585,15 @@ msgstr "证书的所有预期用途均无法验证。" #: dlls/cryptui/cryptui.rc:37 msgid "This certificate is intended for the following purposes:" -msgstr "该证书的预期用途如下：" +msgstr "该证书的预期用途如下:" #: dlls/cryptui/cryptui.rc:38 msgid "Issued to: " -msgstr "颁发给：" +msgstr "颁发给: " #: dlls/cryptui/cryptui.rc:39 msgid "Issued by: " -msgstr "颁发者：" +msgstr "颁发者: " #: dlls/cryptui/cryptui.rc:40 msgid "Valid from " @@ -2684,7 +2678,7 @@ msgstr "公钥" #: dlls/cryptui/cryptui.rc:61 msgid "%1 (%2!d! bits)" -msgstr "%1（%2!d! 位）" +msgstr "%1 (%2!d! 位)" #: dlls/cryptui/cryptui.rc:62 msgid "SHA1 hash" @@ -2692,7 +2686,7 @@ msgstr "SHA1 哈希值" #: dlls/cryptui/cryptui.rc:63 msgid "Enhanced key usage (property)" -msgstr "增强密钥用途（财产）" +msgstr "增强密钥用途 (属性)" #: dlls/cryptui/cryptui.rc:64 msgid "Friendly name" @@ -2854,7 +2848,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "您已不能使用此证书解密或签名消息。\n" -"您确实要移除此证书吗？" +"您确实要移除此证书吗?" #: dlls/cryptui/cryptui.rc:111 msgid "" @@ -2863,7 +2857,7 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "您已不能使用这些证书解密或签名消息。\n" -"您确实要移除这些证书吗？" +"您确实要移除这些证书吗?" #: dlls/cryptui/cryptui.rc:112 msgid "" @@ -2872,7 +2866,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "您已不能使用此证书加密或校验消息。\n" -"您确实要移除此证书吗？" +"您确实要移除此证书吗?" #: dlls/cryptui/cryptui.rc:113 msgid "" @@ -2881,7 +2875,7 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "您已不能使用这些证书加密或校验消息。\n" -"您确实要移除这些证书吗？" +"您确实要移除这些证书吗?" #: dlls/cryptui/cryptui.rc:114 msgid "" @@ -2890,7 +2884,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "将不再信任由此证书颁发机构颁发的证书。\n" -"您确实要移除此证书吗？" +"您确实要移除此证书吗?" #: dlls/cryptui/cryptui.rc:115 msgid "" @@ -2899,7 +2893,7 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "将不再信任由这些证书颁发机构颁发的证书。\n" -"您确实要移除这些证书吗？" +"您确实要移除这些证书吗?" #: dlls/cryptui/cryptui.rc:116 msgid "" @@ -2908,7 +2902,7 @@ msgid "" "Are you sure you want to remove this trusted root certificate?" msgstr "" "将不再信任由此根证书颁发机构颁发的证书或证书颁发机构。\n" -"您确实要移除此已信任的根证书吗？" +"您确实要移除此已信任的根证书吗?" #: dlls/cryptui/cryptui.rc:117 msgid "" @@ -2917,7 +2911,7 @@ msgid "" "Are you sure you want to remove these trusted root certificates?" msgstr "" "将不再信任由这些根证书颁发机构颁发的证书或证书颁发机构。\n" -"您确实要移除这些已信任的根证书吗？" +"您确实要移除这些已信任的根证书吗?" #: dlls/cryptui/cryptui.rc:118 msgid "" @@ -2925,7 +2919,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "将不再信任由此发行商签名的软件。\n" -"您确实要移除此证书吗？" +"您确实要移除此证书吗?" #: dlls/cryptui/cryptui.rc:119 msgid "" @@ -2933,15 +2927,15 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "将不再信任由这些发行商签名的软件。\n" -"您确实要移除这些证书吗？" +"您确实要移除这些证书吗?" #: dlls/cryptui/cryptui.rc:120 msgid "Are you sure you want to remove this certificate?" -msgstr "您确实要移除此证书吗？" +msgstr "您确实要移除此证书吗?" #: dlls/cryptui/cryptui.rc:121 msgid "Are you sure you want to remove these certificates?" -msgstr "您确实要移除这些证书吗？" +msgstr "您确实要移除这些证书吗?" #: dlls/cryptui/cryptui.rc:124 msgid "Ensures the identity of a remote computer" @@ -3001,7 +2995,7 @@ msgstr "指定用于保存内容的文件名称。" #: dlls/cryptui/cryptui.rc:155 msgid "The specified file already exists. Do you want to replace it?" -msgstr "指定文件已经存在。是否替换？" +msgstr "指定文件已经存在。您要替换它吗?" #: dlls/cryptui/cryptui.rc:156 msgid "DER-Encoded Binary X.509 (*.cer)" @@ -3063,11 +3057,11 @@ msgstr "密码不一致。" #: dlls/cryptui/cryptui.rc:175 msgid "Note: The private key for this certificate could not be opened." -msgstr "注意：无法打开该证书的私钥。" +msgstr "注意: 无法打开该证书的私钥。" #: dlls/cryptui/cryptui.rc:176 msgid "Note: The private key for this certificate is not exportable." -msgstr "注意：证书的私钥不可导出。" +msgstr "注意: 证书的私钥不可导出。" #: dlls/cryptui/cryptui.rc:177 msgid "Intended Use" @@ -3456,7 +3450,7 @@ msgstr "请指定您希望在 Internet Explorer 中打开的 URL" #: dlls/ieframe/ieframe.rc:94 msgid "Open:" -msgstr "打开：" +msgstr "打开:" #: dlls/ieframe/ieframe.rc:70 msgctxt "home page" @@ -3604,7 +3598,7 @@ msgstr "使用自动代理服务器配置 (PAC) 脚本" #: dlls/inetcpl.cpl/inetcpl.rc:128 dlls/inetcpl.cpl/inetcpl.rc:132 msgid "Address:" -msgstr "地址：" +msgstr "地址:" #: dlls/inetcpl.cpl/inetcpl.rc:130 msgid "Proxy server" @@ -3616,7 +3610,7 @@ msgstr "使用代理服务器" #: dlls/inetcpl.cpl/inetcpl.rc:134 msgid "Port:" -msgstr "端口：" +msgstr "端口:" #: dlls/inetcpl.cpl/inetcpl.rc:31 msgid "Internet Settings" @@ -3628,7 +3622,7 @@ msgstr "配置 Wine Internet Explorer 以及相关设置" #: dlls/inetcpl.cpl/inetcpl.rc:33 msgid "Security settings for zone: " -msgstr "此区域的安全设置：" +msgstr "此区域的安全设置: " #: dlls/inetcpl.cpl/inetcpl.rc:34 msgid "Custom" @@ -3663,30 +3657,24 @@ msgid "&Disable" msgstr "停用(&D)" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy -#| msgid "Reset" msgid "&Reset" -msgstr "重设" +msgstr "重置(&R)" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" msgstr "启用(&E)" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "编辑顶替" +msgstr "重写(&O)" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" msgstr "已连接" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "语音输入设备：" +msgstr "已连接 (xinput 设备)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" @@ -3930,21 +3918,19 @@ msgstr "无法在此对象上更改属性描述符中的“writable”属性为 #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "" +msgstr "无法定义属性 '|': 对象不可扩展" #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" -msgstr "无法重定义不可配置的属性“|”" +msgstr "无法重定义不可配置的属性 '|'" #: dlls/jscript/jscript.rc:76 msgid "Cannot modify non-writable property '|'" -msgstr "无法更改不可写的属性“|”" +msgstr "无法更改不可写的属性 '|'" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "'[object]' 不是日期对象" +msgstr "'this' 不是 Map 对象" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" @@ -4785,19 +4771,19 @@ msgstr "注册表损坏。\n" #: dlls/kernel32/winerror.mc:1068 msgid "Invalid key.\n" -msgstr "无效的键。\n" +msgstr "无效的项。\n" #: dlls/kernel32/winerror.mc:1073 msgid "Can't open registry key.\n" -msgstr "无法打开注册表键。\n" +msgstr "无法打开注册表项。\n" #: dlls/kernel32/winerror.mc:1078 msgid "Can't read registry key.\n" -msgstr "无法读取注册表键。\n" +msgstr "无法读取注册表项。\n" #: dlls/kernel32/winerror.mc:1083 msgid "Can't write registry key.\n" -msgstr "无法写入注册表键。\n" +msgstr "无法写入注册表项。\n" #: dlls/kernel32/winerror.mc:1088 msgid "Registry has been recovered.\n" @@ -4817,7 +4803,7 @@ msgstr "不是注册表文件。\n" #: dlls/kernel32/winerror.mc:1108 msgid "Key deleted.\n" -msgstr "键已删除。\n" +msgstr "注册表项已删除。\n" #: dlls/kernel32/winerror.mc:1113 msgid "No registry log space.\n" @@ -4825,11 +4811,11 @@ msgstr "注册表日志空间耗尽。\n" #: dlls/kernel32/winerror.mc:1118 msgid "Registry key has subkeys.\n" -msgstr "注册表键包含子键。\n" +msgstr "注册表项包含子项。\n" #: dlls/kernel32/winerror.mc:1123 msgid "Subkey must be volatile.\n" -msgstr "子键必须为可变。\n" +msgstr "子项必须为可变。\n" #: dlls/kernel32/winerror.mc:1128 msgid "Notify change request in progress.\n" @@ -6940,10 +6926,8 @@ msgid "Resource is not currently available.\n" msgstr "资源当前不可用。\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy -#| msgid "Class Name:" msgid "Classic Blue" -msgstr "类名：" +msgstr "经典蓝" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73 @@ -6951,569 +6935,468 @@ msgid "Normal" msgstr "普通" #: dlls/localspl/localspl.rc:37 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter" -msgstr "盘符" +msgstr "信纸" #: dlls/localspl/localspl.rc:38 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Small" -msgstr "盘符" +msgstr "小号信纸" #: dlls/localspl/localspl.rc:39 -#, fuzzy -#| msgid "&Table" msgid "Tabloid" -msgstr "表格(&T)" +msgstr "Tabloid" #: dlls/localspl/localspl.rc:40 msgid "Ledger" -msgstr "" +msgstr "Ledger" #: dlls/localspl/localspl.rc:41 msgid "Legal" -msgstr "" +msgstr "法律专用纸" #: dlls/localspl/localspl.rc:42 -#, fuzzy -#| msgid "State" msgid "Statement" -msgstr "状态" +msgstr "Statement" #: dlls/localspl/localspl.rc:43 -#, fuzzy -#| msgid "&Execute..." msgid "Executive" -msgstr "执行(&E)..." +msgstr "Executive" #: dlls/localspl/localspl.rc:44 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A3" -msgstr "A" +msgstr "A3" #: dlls/localspl/localspl.rc:45 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A4" -msgstr "A" +msgstr "A4" #: dlls/localspl/localspl.rc:46 -#, fuzzy -#| msgid "Small" msgid "A4 Small" -msgstr "小号" +msgstr "小号 A4" #: dlls/localspl/localspl.rc:47 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A5" -msgstr "A" +msgstr "A5" #: dlls/localspl/localspl.rc:48 msgid "B4 (JIS)" -msgstr "" +msgstr "B4 (JIS)" #: dlls/localspl/localspl.rc:49 msgid "B5 (JIS)" -msgstr "" +msgstr "B5 (JIS)" #: dlls/localspl/localspl.rc:50 msgid "Folio" -msgstr "" +msgstr "对开" #: dlls/localspl/localspl.rc:51 msgid "Quarto" -msgstr "" +msgstr "四开" #: dlls/localspl/localspl.rc:52 msgid "10x14" -msgstr "" +msgstr "10x14" #: dlls/localspl/localspl.rc:53 msgid "11x17" -msgstr "" +msgstr "11x17" #: dlls/localspl/localspl.rc:54 -#, fuzzy -#| msgid "Notepad" msgid "Note" -msgstr "记事本" +msgstr "便笺" #: dlls/localspl/localspl.rc:55 msgid "Envelope #9" -msgstr "" +msgstr "信封 #9" #: dlls/localspl/localspl.rc:56 msgid "Envelope #10" -msgstr "" +msgstr "信封 #10" #: dlls/localspl/localspl.rc:57 msgid "Envelope #11" -msgstr "" +msgstr "信封 #11" #: dlls/localspl/localspl.rc:58 msgid "Envelope #12" -msgstr "" +msgstr "信封 #12" #: dlls/localspl/localspl.rc:59 msgid "Envelope #14" -msgstr "" +msgstr "信封 #14" #: dlls/localspl/localspl.rc:60 msgid "C size sheet" -msgstr "" +msgstr "C 型纸" #: dlls/localspl/localspl.rc:61 msgid "D size sheet" -msgstr "" +msgstr "D 型纸" #: dlls/localspl/localspl.rc:62 msgid "E size sheet" -msgstr "" +msgstr "E 型纸" #: dlls/localspl/localspl.rc:63 msgid "Envelope DL" -msgstr "" +msgstr "信封 DL" #: dlls/localspl/localspl.rc:64 msgid "Envelope C5" -msgstr "" +msgstr "信封 C5" #: dlls/localspl/localspl.rc:65 msgid "Envelope C3" -msgstr "" +msgstr "信封 C3" #: dlls/localspl/localspl.rc:66 msgid "Envelope C4" -msgstr "" +msgstr "信封 C4" #: dlls/localspl/localspl.rc:67 msgid "Envelope C6" -msgstr "" +msgstr "信封 C6" #: dlls/localspl/localspl.rc:68 msgid "Envelope C65" -msgstr "" +msgstr "信封 C65" #: dlls/localspl/localspl.rc:69 msgid "Envelope B4" -msgstr "" +msgstr "信封 B4" #: dlls/localspl/localspl.rc:70 msgid "Envelope B5" -msgstr "" +msgstr "信封 B5" #: dlls/localspl/localspl.rc:71 msgid "Envelope B6" -msgstr "" +msgstr "信封 B6" #: dlls/localspl/localspl.rc:72 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "Envelope" -msgstr "已封装的 PKCS 7" +msgstr "信封" #: dlls/localspl/localspl.rc:73 msgid "Envelope Monarch" -msgstr "" +msgstr "信封 Monarch" #: dlls/localspl/localspl.rc:74 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "6 3/4 Envelope" -msgstr "已封装的 PKCS 7" +msgstr "6 3/4 信封" #: dlls/localspl/localspl.rc:75 msgid "US Std Fanfold" -msgstr "" +msgstr "美国标准复写簿" #: dlls/localspl/localspl.rc:76 msgid "German Std Fanfold" -msgstr "" +msgstr "德国标准复写簿" #: dlls/localspl/localspl.rc:77 msgid "German Legal Fanfold" -msgstr "" +msgstr "德国法律专用复写簿" #: dlls/localspl/localspl.rc:78 msgid "B4 (ISO)" -msgstr "" +msgstr "B4 (ISO)" #: dlls/localspl/localspl.rc:79 -#, fuzzy -#| msgid "Japanese" msgid "Japanese Postcard" -msgstr "日语" +msgstr "日式明信片" #: dlls/localspl/localspl.rc:80 msgid "9x11" -msgstr "" +msgstr "9x11" #: dlls/localspl/localspl.rc:81 msgid "10x11" -msgstr "" +msgstr "10x11" #: dlls/localspl/localspl.rc:82 msgid "15x11" -msgstr "" +msgstr "15x11" #: dlls/localspl/localspl.rc:83 msgid "Envelope Invite" -msgstr "" +msgstr "邀请信封" #: dlls/localspl/localspl.rc:84 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Extra" -msgstr "盘符" +msgstr "特大信纸" #: dlls/localspl/localspl.rc:85 msgid "Legal Extra" -msgstr "" +msgstr "特大法律专用纸" #: dlls/localspl/localspl.rc:86 msgid "Tabloid Extra" -msgstr "" +msgstr "特大 Tabloid" #: dlls/localspl/localspl.rc:87 -#, fuzzy -#| msgid "E&xtras" msgid "A4 Extra" -msgstr "其他(&X)" +msgstr "特大 A4" #: dlls/localspl/localspl.rc:88 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "Letter Transverse" -msgstr "横向" +msgstr "信纸横向" #: dlls/localspl/localspl.rc:89 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A4 Transverse" -msgstr "横向" +msgstr "A4 横向" #: dlls/localspl/localspl.rc:90 msgid "Letter Extra Transverse" -msgstr "" +msgstr "特大信纸横向" #: dlls/localspl/localspl.rc:91 msgid "Super A" -msgstr "" +msgstr "超大 A" #: dlls/localspl/localspl.rc:92 msgid "Super B" -msgstr "" +msgstr "超大 B" #: dlls/localspl/localspl.rc:93 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Plus" -msgstr "盘符" +msgstr "加大信纸" #: dlls/localspl/localspl.rc:94 msgid "A4 Plus" -msgstr "" +msgstr "加大 A4" #: dlls/localspl/localspl.rc:95 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A5 Transverse" -msgstr "横向" +msgstr "A5 横向" #: dlls/localspl/localspl.rc:96 msgid "B5 (JIS) Transverse" -msgstr "" +msgstr "B5 (JIS) 横向" #: dlls/localspl/localspl.rc:97 -#, fuzzy -#| msgid "E&xtras" msgid "A3 Extra" -msgstr "其他(&X)" +msgstr "特大 A3" #: dlls/localspl/localspl.rc:98 -#, fuzzy -#| msgid "E&xtras" msgid "A5 Extra" -msgstr "其他(&X)" +msgstr "特大 A5" #: dlls/localspl/localspl.rc:99 msgid "B5 (ISO) Extra" -msgstr "" +msgstr "特大 B5 (ISO)" #: dlls/localspl/localspl.rc:100 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A2" -msgstr "A" +msgstr "A2" #: dlls/localspl/localspl.rc:101 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A3 Transverse" -msgstr "横向" +msgstr "A3 横向" #: dlls/localspl/localspl.rc:102 msgid "A3 Extra Transverse" -msgstr "" +msgstr "特大 A3 横向" #: dlls/localspl/localspl.rc:103 msgid "Japanese Double Postcard" -msgstr "" +msgstr "日式双层明信片" #: dlls/localspl/localspl.rc:104 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A6" -msgstr "A" +msgstr "A6" #: dlls/localspl/localspl.rc:105 msgid "Japanese Envelope Kaku #2" -msgstr "" +msgstr "日式信封 Kaku #2" #: dlls/localspl/localspl.rc:106 msgid "Japanese Envelope Kaku #3" -msgstr "" +msgstr "日式信封 Kaku #3" #: dlls/localspl/localspl.rc:107 msgid "Japanese Envelope Chou #3" -msgstr "" +msgstr "日式信封 Chou #3" #: dlls/localspl/localspl.rc:108 msgid "Japanese Envelope Chou #4" -msgstr "" +msgstr "日式信封 Chou #4" #: dlls/localspl/localspl.rc:109 msgid "Letter Rotated" -msgstr "" +msgstr "信纸旋转" #: dlls/localspl/localspl.rc:110 msgid "A3 Rotated" -msgstr "" +msgstr "A3 旋转" #: dlls/localspl/localspl.rc:111 msgid "A4 Rotated" -msgstr "" +msgstr "A4 旋转" #: dlls/localspl/localspl.rc:112 msgid "A5 Rotated" -msgstr "" +msgstr "A5 旋转" #: dlls/localspl/localspl.rc:113 msgid "B4 (JIS) Rotated" -msgstr "" +msgstr "B4 (JIS) 旋转" #: dlls/localspl/localspl.rc:114 msgid "B5 (JIS) Rotated" -msgstr "" +msgstr "B5 (JIS) 旋转" #: dlls/localspl/localspl.rc:115 msgid "Japanese Postcard Rotated" -msgstr "" +msgstr "日式明信片旋转" #: dlls/localspl/localspl.rc:116 msgid "Double Japan Postcard Rotated" -msgstr "" +msgstr "日式双层明信片旋转" #: dlls/localspl/localspl.rc:117 msgid "A6 Rotated" -msgstr "" +msgstr "A6 旋转" #: dlls/localspl/localspl.rc:118 msgid "Japan Envelope Kaku #2 Rotated" -msgstr "" +msgstr "日式信封 Kaku #2 旋转" #: dlls/localspl/localspl.rc:119 msgid "Japan Envelope Kaku #3 Rotated" -msgstr "" +msgstr "日式信封 Kaku #3 旋转" #: dlls/localspl/localspl.rc:120 msgid "Japan Envelope Chou #3 Rotated" -msgstr "" +msgstr "日式信封 Chou #3 旋转" #: dlls/localspl/localspl.rc:121 msgid "Japan Envelope Chou #4 Rotated" -msgstr "" +msgstr "日式信封 Chou #4 旋转" #: dlls/localspl/localspl.rc:122 msgid "B6 (JIS)" -msgstr "" +msgstr "B6 (JIS)" #: dlls/localspl/localspl.rc:123 msgid "B6 (JIS) Rotated" -msgstr "" +msgstr "B6 (JIS) 旋转" #: dlls/localspl/localspl.rc:124 msgid "12x11" -msgstr "" +msgstr "12x11" #: dlls/localspl/localspl.rc:125 msgid "Japan Envelope You #4" -msgstr "" +msgstr "日式信纸 You #4" #: dlls/localspl/localspl.rc:126 msgid "Japan Envelope You #4 Rotated" -msgstr "" +msgstr "日式信纸 You #4 旋转" #: dlls/localspl/localspl.rc:127 msgid "PRC 16K" -msgstr "" +msgstr "中国 16 开" #: dlls/localspl/localspl.rc:128 msgid "PRC 32K" -msgstr "" +msgstr "中国 32 开" #: dlls/localspl/localspl.rc:129 msgid "PRC 32K(Big)" -msgstr "" +msgstr "中国 32 开 (大)" #: dlls/localspl/localspl.rc:130 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #1" #: dlls/localspl/localspl.rc:131 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #2" #: dlls/localspl/localspl.rc:132 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #3" #: dlls/localspl/localspl.rc:133 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #4" #: dlls/localspl/localspl.rc:134 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #5" #: dlls/localspl/localspl.rc:135 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #6" #: dlls/localspl/localspl.rc:136 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #7" #: dlls/localspl/localspl.rc:137 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #8" #: dlls/localspl/localspl.rc:138 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #9" #: dlls/localspl/localspl.rc:139 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #10" #: dlls/localspl/localspl.rc:140 msgid "PRC 16K Rotated" -msgstr "" +msgstr "中国 16 开旋转" #: dlls/localspl/localspl.rc:141 msgid "PRC 32K Rotated" -msgstr "" +msgstr "中国 32 开旋转" #: dlls/localspl/localspl.rc:142 msgid "PRC 32K(Big) Rotated" -msgstr "" +msgstr "中国 32 开 (大) 旋转" #: dlls/localspl/localspl.rc:143 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #1 旋转" #: dlls/localspl/localspl.rc:144 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #2 旋转" #: dlls/localspl/localspl.rc:145 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #3 旋转" #: dlls/localspl/localspl.rc:146 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #4 旋转" #: dlls/localspl/localspl.rc:147 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #5 旋转" #: dlls/localspl/localspl.rc:148 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #6 旋转" #: dlls/localspl/localspl.rc:149 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #7 旋转" #: dlls/localspl/localspl.rc:150 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #8 旋转" #: dlls/localspl/localspl.rc:151 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #9 旋转" #: dlls/localspl/localspl.rc:152 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #10 旋转" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -7530,7 +7413,7 @@ msgstr "添加本地端口" #: dlls/localui/localui.rc:42 msgid "&Enter the port name to add:" -msgstr "添加本地端口名称(&E)：" +msgstr "添加本地端口名称(&E):" #: dlls/localui/localui.rc:51 msgid "Configure LPT Port" @@ -7542,7 +7425,7 @@ msgstr "超时(秒)" #: dlls/localui/localui.rc:55 msgid "&Transmission Retry:" -msgstr "重试通讯(&T)：" +msgstr "重试通讯(&T):" #: dlls/localui/localui.rc:32 msgid "'%s' is not a valid port name" @@ -7962,7 +7845,7 @@ msgstr "输入网络密码" #: dlls/mpr/mpr.rc:38 dlls/wininet/wininet.rc:51 dlls/wininet/wininet.rc:71 msgid "Please enter your username and password:" -msgstr "请输入用户名和密码：" +msgstr "请输入用户名和密码:" #: dlls/mpr/mpr.rc:39 dlls/wininet/wininet.rc:52 msgid "Proxy" @@ -7994,11 +7877,11 @@ msgstr "保存为(&S)..." #: dlls/msacm32/msacm32.rc:42 msgid "&Format:" -msgstr "格式(&F)：" +msgstr "格式(&F):" #: dlls/msacm32/msacm32.rc:47 msgid "&Attributes:" -msgstr "属性(&A)：" +msgstr "属性(&A):" #: dlls/mshtml/mshtml.rc:39 msgid "Hyperlink" @@ -8010,11 +7893,11 @@ msgstr "超链接信息" #: dlls/mshtml/mshtml.rc:43 programs/winecfg/winecfg.rc:243 msgid "&Type:" -msgstr "类型(&T)：" +msgstr "类型(&T):" #: dlls/mshtml/mshtml.rc:45 msgid "&URL:" -msgstr "网址(&U)：" +msgstr "网址(&U):" #: dlls/mshtml/mshtml.rc:34 msgid "HTML Document" @@ -8076,31 +7959,31 @@ msgid "" msgstr "" "Windows Installer %s\n" "\n" -"用法：\n" +"用法:\n" "msiexec 命令 {必要参数} [可选参数]\n" "\n" -"安装产品：\n" +"安装产品:\n" "\t/i {安装包|产品序列号} [属性]\n" "\t/package {安装包|产品序列号} [属性]\n" "\t/a package [属性]\n" -"修复安装：\n" +"修复安装:\n" "\t/f[p|o|e|d|c|a|u|m|s|v] {产品|序列号}\n" -"卸载产品：\n" +"卸载产品:\n" "\t/uninstall {产品|序列号} [属性]\n" "\t/x {产品|序列号} [属性]\n" -"宣传产品：\n" +"宣传产品:\n" "\t/j[u|m] package [/t 变形] [/g 语言代号]\n" "应用补丁\n" "\t/p 补丁包 [属性]\n" "\t/p 补丁包 /a 安装包 [属性]\n" -"以上命令的日志和用户界面修饰：\n" +"以上命令的日志和用户界面修饰:\n" "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] 日志文件\n" "\t/q{|n|b|r|f|n+|b+|b-}\n" -"注册 MSI 服务：\n" +"注册 MSI 服务:\n" "\t/y\n" -"取消注册 MSI 服务：\n" +"取消注册 MSI 服务:\n" "\t/z\n" -"显示此帮助信息：\n" +"显示此帮助信息:\n" "\t/help\n" "\t/?\n" @@ -8118,7 +8001,7 @@ msgstr "本功能的网络驱动器不存在" #: dlls/msi/msi.rc:64 msgid "feature from:" -msgstr "功能来自：" +msgstr "功能来自:" #: dlls/msi/msi.rc:65 msgid "choose which folder contains %s" @@ -8374,87 +8257,87 @@ msgstr "正在写入系统注册表值" #: dlls/msi/msi.rc:161 msgid "Free space: [1]" -msgstr "可用空间： [1]" +msgstr "可用空间: [1]" #: dlls/msi/msi.rc:162 msgid "Property: [1], Signature: [2]" -msgstr "属性：[1]，签名：[2]" +msgstr "属性: [1]，签名: [2]" #: dlls/msi/msi.rc:163 msgid "File: [1]" -msgstr "文件：[1]" +msgstr "文件: [1]" #: dlls/msi/msi.rc:164 dlls/msi/msi.rc:191 msgid "Folder: [1]" -msgstr "文件夹：[1]" +msgstr "文件夹: [1]" #: dlls/msi/msi.rc:165 dlls/msi/msi.rc:194 msgid "Shortcut: [1]" -msgstr "快捷方式：[1]" +msgstr "快捷方式: [1]" #: dlls/msi/msi.rc:166 dlls/msi/msi.rc:197 dlls/msi/msi.rc:198 msgid "Service: [1]" -msgstr "服务：[1]" +msgstr "服务: [1]" #: dlls/msi/msi.rc:167 dlls/msi/msi.rc:170 dlls/msi/msi.rc:174 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "文件：[1]，路径：[9]，大小：[6]" +msgstr "文件: [1]，路径: [9]，大小: [6]" #: dlls/msi/msi.rc:168 msgid "Found application: [1]" -msgstr "找到应用程序：[1]" +msgstr "找到应用程序: [1]" #: dlls/msi/msi.rc:169 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "文件：[1]，路径：[9]，大小：[6]" +msgstr "文件: [1]，路径: [9]，大小: [6]" #: dlls/msi/msi.rc:171 msgid "Service: [2]" -msgstr "服务：[2]" +msgstr "服务: [2]" #: dlls/msi/msi.rc:172 msgid "File: [1], Dependencies: [2]" -msgstr "文件：[1]，依赖项：[2]" +msgstr "文件: [1]，依赖项: [2]" #: dlls/msi/msi.rc:173 msgid "Application: [1]" -msgstr "应用程序：[1]" +msgstr "应用程序: [1]" #: dlls/msi/msi.rc:175 dlls/msi/msi.rc:176 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "应用程序上下文：[1]，组装名称：[2]" +msgstr "应用程序上下文: [1]，组装名称: [2]" #: dlls/msi/msi.rc:177 msgid "File: [1], Directory: [2], Size: [3]" -msgstr "文件：[1]，路径：[2]，大小：[3]" +msgstr "文件: [1]，路径: [2]，大小: [3]" #: dlls/msi/msi.rc:178 dlls/msi/msi.rc:199 msgid "Component ID: [1], Qualifier: [2]" -msgstr "组件 ID：[1]，修饰符：[2]" +msgstr "组件 ID: [1]，修饰符: [2]" #: dlls/msi/msi.rc:179 dlls/msi/msi.rc:200 msgid "Feature: [1]" -msgstr "特性：[1]" +msgstr "特性: [1]" #: dlls/msi/msi.rc:180 dlls/msi/msi.rc:201 msgid "Class Id: [1]" -msgstr "类 ID：[1]" +msgstr "类 ID: [1]" #: dlls/msi/msi.rc:181 msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" -msgstr "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" +msgstr "应用程序 ID: [1]{{，应用程序类型: [2]，用户: [3]，RSN: [4]}}" #: dlls/msi/msi.rc:182 dlls/msi/msi.rc:203 msgid "Extension: [1]" -msgstr "扩展名：[1]" +msgstr "扩展名: [1]" #: dlls/msi/msi.rc:183 dlls/msi/msi.rc:204 msgid "Font: [1]" -msgstr "字体：[1]" +msgstr "字体: [1]" #: dlls/msi/msi.rc:184 dlls/msi/msi.rc:205 msgid "MIME Content Type: [1], Extension: [2]" -msgstr "MIME 内容类型：[1]，扩展名：[2]" +msgstr "MIME 内容类型: [1]，扩展名: [2]" #: dlls/msi/msi.rc:185 dlls/msi/msi.rc:206 msgid "ProgId: [1]" @@ -8466,27 +8349,27 @@ msgstr "LibID: [1]" #: dlls/msi/msi.rc:187 dlls/msi/msi.rc:190 msgid "File: [1], Directory: [9]" -msgstr "文件：[1]，路径：[9]" +msgstr "文件: [1]，路径: [9]" #: dlls/msi/msi.rc:188 dlls/msi/msi.rc:208 msgid "Name: [1], Value: [2], Action [3]" -msgstr "名称：[1]，值：[2]，动作 [3]" +msgstr "名称: [1]，值: [2]，动作 [3]" #: dlls/msi/msi.rc:189 msgid "Application: [1], Command line: [2]" -msgstr "应用程序：[1]，命令行：[2]" +msgstr "应用程序: [1]，命令行: [2]" #: dlls/msi/msi.rc:192 dlls/msi/msi.rc:209 msgid "File: [1], Section: [2], Key: [3], Value: [4]" -msgstr "文件：[1]，板块：[2]，键：[3]，值：［4]" +msgstr "文件: [1]，节: [2]，项: [3]，值:［4]" #: dlls/msi/msi.rc:193 msgid "Key: [1], Name: [2]" -msgstr "键：[1]，名称：[2]" +msgstr "项: [1]，名称: [2]" #: dlls/msi/msi.rc:195 dlls/msi/msi.rc:196 msgid "File: [1], Folder: [2]" -msgstr "文件：[1]，文件夹：[2]" +msgstr "文件: [1]，文件夹: [2]" #: dlls/msi/msi.rc:202 msgid "AppId: [1]{{, AppType: [2]}}" @@ -8494,11 +8377,11 @@ msgstr "AppId: [1]{{, AppType: [2]}}" #: dlls/msi/msi.rc:210 msgid "Key: [1], Name: [2], Value: [3]" -msgstr "键：[1]，名称：[2]，值：[3]" +msgstr "项: [1]，名称: [2]，值: [3]" #: dlls/msi/msi.rc:72 msgid "{{Fatal error: }}" -msgstr "{{致命错误：}}" +msgstr "{{致命错误: }}" #: dlls/msi/msi.rc:73 msgid "{{Error [1]. }}" @@ -8519,41 +8402,41 @@ msgid "" "arguments are: [2], [3], [4]}}" msgstr "" "安装程序在安装此软件包时遇到了未预期的错误。这可能代表软件包存在问题。错误码" -"为 [1]。{{参数为：[2]，[3]，[4]}}" +"为 [1]。{{参数为: [2]，[3]，[4]}}" #: dlls/msi/msi.rc:77 msgid "{{Disk full: }}" -msgstr "{{磁盘已满：}}" +msgstr "{{磁盘已满: }}" #: dlls/msi/msi.rc:78 msgid "Action [Time]: [1]. [2]" -msgstr "操作 [Time]：[1]。[2]" +msgstr "操作 [Time]: [1]。[2]" #: dlls/msi/msi.rc:79 msgid "Message type: [1], Argument: [2]{, [3]}" -msgstr "消息类型：[1]，参数：[2]{, [3]}" +msgstr "消息类型: [1]，参数: [2]{，[3]}" #: dlls/msi/msi.rc:82 msgid "=== Logging started: [Date] [Time] ===" -msgstr "=== 日志开头：[Date] [Time] ===" +msgstr "=== 日志开头: [Date] [Time] ===" #: dlls/msi/msi.rc:80 msgid "Action start [Time]: [1]." -msgstr "操作开始 [Time]：[1]。" +msgstr "操作开始 [Time]: [1]。" #: dlls/msi/msi.rc:81 msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "操作结束 [Time]：[1]。返回值 [2]。" +msgstr "操作结束 [Time]: [1]。返回值 [2]。" #: dlls/msi/msi.rc:84 msgid "Please insert the disk: [2]" -msgstr "请插入磁盘：[2]" +msgstr "请插入磁盘: [2]" #: dlls/msi/msi.rc:85 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." -msgstr "找不到源文件{{(cabinet)}}：[2]。请检查文件是否存在且可被您访问。" +msgstr "找不到源文件{{(cabinet)}}: [2]。请检查文件是否存在且可被您访问。" #: dlls/msrle32/msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -8573,7 +8456,7 @@ msgstr "视频压缩" #: dlls/msvfw32/msvfw32.rc:39 msgid "&Compressor:" -msgstr "压缩器(&C)：" +msgstr "压缩器(&C):" #: dlls/msvfw32/msvfw32.rc:42 msgid "Con&figure..." @@ -8585,7 +8468,7 @@ msgstr "关于(&A)" #: dlls/msvfw32/msvfw32.rc:47 msgid "Compression &Quality:" -msgstr "压缩质量(&Q)：" +msgstr "压缩质量(&Q):" #: dlls/msvfw32/msvfw32.rc:49 msgid "&Key Frame Every" @@ -9049,7 +8932,7 @@ msgstr "提供者" #: dlls/oledb32/version.rc:59 msgid "Select the data you want to connect to:" -msgstr "选择您想要连接的数据源：" +msgstr "选择您想要连接的数据源:" #: dlls/oledb32/version.rc:66 msgid "Connection" @@ -9057,11 +8940,11 @@ msgstr "连接" #: dlls/oledb32/version.rc:69 msgid "Specify the following to connect to ODBC data:" -msgstr "指定以下内容以连接到 ODBC 数据源：" +msgstr "指定以下内容以连接到 ODBC 数据源:" #: dlls/oledb32/version.rc:70 msgid "1. Specify the source of data:" -msgstr "1. 指定数据源：" +msgstr "1. 指定数据源:" #: dlls/oledb32/version.rc:71 msgid "Use &data source name" @@ -9073,7 +8956,7 @@ msgstr "使用连接字符串(&O)" #: dlls/oledb32/version.rc:75 msgid "&Connection string:" -msgstr "连接字符串(&C)：" +msgstr "连接字符串(&C):" #: dlls/oledb32/version.rc:77 msgid "B&uild..." @@ -9085,7 +8968,7 @@ msgstr "2. 输入服务器登录信息" #: dlls/oledb32/version.rc:79 msgid "User &name:" -msgstr "用户名(&N)：" +msgstr "用户名(&N):" #: dlls/oledb32/version.rc:83 msgid "&Blank password" @@ -9097,7 +8980,7 @@ msgstr "允许保存密码(&S)" #: dlls/oledb32/version.rc:85 msgid "3. Enter the &initial catalog to use:" -msgstr "3. 输入要使用的初始目录：" +msgstr "3. 输入要使用的初始目录:" #: dlls/oledb32/version.rc:87 msgid "&Test Connection" @@ -9113,15 +8996,15 @@ msgstr "网络设置" #: dlls/oledb32/version.rc:96 msgid "&Impersonation level:" -msgstr "模拟级别(&I)：" +msgstr "模拟级别(&I):" #: dlls/oledb32/version.rc:98 msgid "P&rotection level:" -msgstr "保护级别(&R)：" +msgstr "保护级别(&R):" #: dlls/oledb32/version.rc:101 msgid "Connect:" -msgstr "连接：" +msgstr "连接:" #: dlls/oledb32/version.rc:103 msgid "seconds." @@ -9129,7 +9012,7 @@ msgstr "秒。" #: dlls/oledb32/version.rc:104 msgid "A&ccess:" -msgstr "访问(&A)：" +msgstr "访问(&A):" #: dlls/oledb32/version.rc:110 msgid "All" @@ -9203,7 +9086,7 @@ msgstr "插入对象" #: dlls/oledlg/oledlg.rc:61 msgid "Object Type:" -msgstr "对象类型：" +msgstr "对象类型:" #: dlls/oledlg/oledlg.rc:64 dlls/oledlg/oledlg.rc:102 msgid "Result" @@ -9235,7 +9118,7 @@ msgstr "浏览..." #: dlls/oledlg/oledlg.rc:76 msgid "File:" -msgstr "文件：" +msgstr "文件:" #: dlls/oledlg/oledlg.rc:82 msgid "Paste Special" @@ -9243,7 +9126,7 @@ msgstr "特殊粘贴" #: dlls/oledlg/oledlg.rc:85 dlls/setupapi/setupapi.rc:43 msgid "Source:" -msgstr "源文件：" +msgstr "源文件:" #: dlls/oledlg/oledlg.rc:86 dlls/shdoclc/shdoclc.rc:50 #: dlls/shdoclc/shdoclc.rc:82 dlls/shdoclc/shdoclc.rc:95 @@ -9259,7 +9142,7 @@ msgstr "粘贴链接(&L)" #: dlls/oledlg/oledlg.rc:90 msgid "&As:" -msgstr "为(&A)：" +msgstr "为(&A):" #: dlls/oledlg/oledlg.rc:97 msgid "&Display As Icon" @@ -9271,14 +9154,14 @@ msgstr "改变图标(&I)..." #: dlls/oledlg/oledlg.rc:28 msgid "Insert a new %s object into your document" -msgstr "在你的文件中插入一个新的 %s 对象" +msgstr "在您的文件中插入一个新的 %s 对象" #: dlls/oledlg/oledlg.rc:29 msgid "" "Insert the contents of the file as an object into your document so that you " "may activate it using the program which created it." msgstr "" -"将文件的内容以对象的方式插入到你的文件以便你可以用创建本文件的程序来激活它。" +"将文件的内容以对象的方式插入到您的文件以便您可以用创建本文件的程序来激活它。" #: dlls/oledlg/oledlg.rc:30 dlls/shell32/shell32.rc:195 msgid "Browse" @@ -9312,20 +9195,20 @@ msgstr "对象(&O)" #: dlls/oledlg/oledlg.rc:41 msgid "Inserts the contents of the clipboard into your document as %s." -msgstr "将剪贴板的内容以 %s 插入到你的文件。" +msgstr "将剪贴板的内容以 %s 插入到您的文件。" #: dlls/oledlg/oledlg.rc:42 msgid "" "Inserts the contents of the clipboard into your document so that you can " "activate it using %s." -msgstr "将剪贴板的内容插入到你的文件以便你可以使用 %s。" +msgstr "将剪贴板的内容插入到您的文件以便您可以使用 %s。" #: dlls/oledlg/oledlg.rc:43 msgid "" "Inserts the contents of the clipboard into your document so that you can " "activate it using %s. It will be displayed as an icon." msgstr "" -"将剪贴板的内容插入到你的文件，你可以用 %s 激活它。插入的内容会显示为图标。" +"将剪贴板的内容插入到您的文件，您可以用 %s 激活它。插入的内容会显示为图标。" #: dlls/oledlg/oledlg.rc:44 msgid "" @@ -9333,8 +9216,8 @@ msgid "" "linked to the source file so that changes to the file will be reflected in " "your document." msgstr "" -"将剪贴板的内容以 %s 插入到你的文件。数据是链接到源文件的, 对源文件的任何改动" -"都会反映到反映到你的文档中。" +"将剪贴板的内容以 %s 插入到您的文件。数据是链接到源文件的, 对源文件的任何改动" +"都会反映到反映到您的文档中。" #: dlls/oledlg/oledlg.rc:45 msgid "" @@ -9342,7 +9225,7 @@ msgid "" "is linked to the source file so that changes to the file will be reflected " "in your document." msgstr "" -"插入剪贴板中的图片。图片是链接到源文件的，对源文件的任何改动都会反映到你的文" +"插入剪贴板中的图片。图片是链接到源文件的，对源文件的任何改动都会反映到您的文" "档中。" #: dlls/oledlg/oledlg.rc:46 @@ -9352,11 +9235,11 @@ msgid "" "be reflected in your document." msgstr "" "插入指向剪贴板中文件的快捷方式。快捷方式是链接到源文件的，对源文件的任何改动" -"都会反映到你的文档中。" +"都会反映到您的文档中。" #: dlls/oledlg/oledlg.rc:47 msgid "Inserts the contents of the clipboard into your document." -msgstr "将剪贴板的内容插入到你的文件。" +msgstr "将剪贴板的内容插入到您的文件。" #: dlls/oledlg/oledlg.rc:48 programs/regedit/regedit.rc:430 msgid "Unknown Type" @@ -9434,7 +9317,7 @@ msgstr "复制文件..." #: dlls/setupapi/setupapi.rc:45 msgid "Destination:" -msgstr "目标文件：" +msgstr "目标文件:" #: dlls/setupapi/setupapi.rc:52 msgid "Files Needed" @@ -9448,7 +9331,7 @@ msgstr "插入厂商的安装磁盘，然后确定下面选择了正确的驱动 #: dlls/setupapi/setupapi.rc:57 msgid "Copy manufacturer's files from:" -msgstr "从此处复制厂商文件：" +msgstr "从此处复制厂商文件:" #: dlls/setupapi/setupapi.rc:31 msgid "The file '%1' on %2 is needed" @@ -9460,7 +9343,7 @@ msgstr "未知" #: dlls/setupapi/setupapi.rc:33 msgid "Copy files from:" -msgstr "文件复制来源：" +msgstr "文件复制来源:" #: dlls/setupapi/setupapi.rc:34 msgid "Type the path where the file is located, and then click OK." @@ -9860,7 +9743,7 @@ msgstr "选择文件夹" #: dlls/shell32/shell32.rc:291 msgid "Folder:" -msgstr "文件夹：" +msgstr "文件夹:" #: dlls/shell32/shell32.rc:297 msgid "&Make New Folder" @@ -9888,7 +9771,7 @@ msgstr "运行于 %s" #: dlls/shell32/shell32.rc:327 msgid "Wine was brought to you by:" -msgstr "Wine 开发人员：" +msgstr "Wine 开发者:" #: dlls/shell32/shell32.rc:332 msgid "Run" @@ -9902,7 +9785,7 @@ msgstr "输入程序，目录，文件或者Internet资源名，Wine将为您打 #: dlls/shell32/shell32.rc:337 msgid "&Open:" -msgstr "打开(&O)：" +msgstr "打开(&O):" #: dlls/shell32/shell32.rc:341 programs/progman/progman.rc:182 #: programs/progman/progman.rc:201 programs/progman/progman.rc:218 @@ -9912,25 +9795,25 @@ msgstr "浏览(&B)..." #: dlls/shell32/shell32.rc:353 dlls/shell32/shell32.rc:382 msgid "File type:" -msgstr "文件类型：" +msgstr "文件类型:" #: dlls/shell32/shell32.rc:357 dlls/shell32/shell32.rc:390 #: dlls/urlmon/urlmon.rc:37 programs/explorer/explorer.rc:33 msgid "Location:" -msgstr "位置：" +msgstr "位置:" #: dlls/shell32/shell32.rc:359 dlls/shell32/shell32.rc:392 #: programs/winefile/winefile.rc:169 msgid "Size:" -msgstr "大小：" +msgstr "大小:" #: dlls/shell32/shell32.rc:363 dlls/shell32/shell32.rc:396 msgid "Creation date:" -msgstr "创建日期：" +msgstr "创建日期:" #: dlls/shell32/shell32.rc:367 dlls/shell32/shell32.rc:404 msgid "Attributes:" -msgstr "属性：" +msgstr "属性:" #: dlls/shell32/shell32.rc:369 dlls/shell32/shell32.rc:406 #: programs/winefile/winefile.rc:173 @@ -9944,7 +9827,7 @@ msgstr "存档(&A)" #: dlls/shell32/shell32.rc:384 msgid "Open with:" -msgstr "打开方式：" +msgstr "打开方式:" #: dlls/shell32/shell32.rc:387 msgid "&Change..." @@ -9952,11 +9835,11 @@ msgstr "更改(&C)..." #: dlls/shell32/shell32.rc:398 msgid "Last modified:" -msgstr "最近修改：" +msgstr "最近修改:" #: dlls/shell32/shell32.rc:400 msgid "Last accessed:" -msgstr "最近访问：" +msgstr "最近访问:" #: dlls/shell32/shell32.rc:138 dlls/shell32/shell32.rc:142 #: programs/winefile/winefile.rc:107 @@ -10154,7 +10037,7 @@ msgstr "下载" #: dlls/shell32/shell32.rc:167 msgid "Unable to create new Folder: Permission denied." -msgstr "无法创建新文件夹：拒绝访问。" +msgstr "无法创建新文件夹: 拒绝访问。" #: dlls/shell32/shell32.rc:168 msgid "Error during creation of a new folder" @@ -10263,7 +10146,7 @@ msgid "" msgstr "" "文件 %1 已经存在。\n" "\n" -"是否替换？" +"您要替换它吗?" #: dlls/shell32/shell32.rc:248 msgid "" @@ -10273,7 +10156,7 @@ msgid "" msgstr "" "文件夹 %1 已经存在。\n" "\n" -"是否替换？" +"您要替换它吗?" #: dlls/shell32/shell32.rc:249 msgid "Confirm overwrite" @@ -10357,7 +10240,7 @@ msgstr "中国夏令时" #: dlls/tzres/tzres.rc:128 msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" -msgstr "" +msgstr "(UTC+08:00) 北京，重庆，香港，乌鲁木齐" #: dlls/tzres/tzres.rc:267 msgid "North Asia Standard Time" @@ -10369,7 +10252,7 @@ msgstr "北亚夏令时" #: dlls/tzres/tzres.rc:269 msgid "(UTC+07:00) Krasnoyarsk" -msgstr "" +msgstr "(UTC+07:00) 雅茨克" #: dlls/tzres/tzres.rc:168 msgid "Georgian Standard Time" @@ -10381,17 +10264,15 @@ msgstr "格鲁吉亚夏令时" #: dlls/tzres/tzres.rc:170 msgid "(UTC+04:00) Tbilisi" -msgstr "" +msgstr "(UTC+04:00) 第比利斯" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 msgid "UTC+12" -msgstr "" +msgstr "UTC+12" #: dlls/tzres/tzres.rc:395 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC+12:00) Coordinated Universal Time+12" -msgstr "协调世界时" +msgstr "(UTC+12:00) 协调世界时+12" #: dlls/tzres/tzres.rc:252 msgid "Nepal Standard Time" @@ -10403,7 +10284,7 @@ msgstr "尼泊尔夏令时" #: dlls/tzres/tzres.rc:254 msgid "(UTC+05:45) Kathmandu" -msgstr "" +msgstr "(UTC+05:45) 加德满都" #: dlls/tzres/tzres.rc:90 msgid "Cape Verde Standard Time" @@ -10415,7 +10296,7 @@ msgstr "佛得角夏令时" #: dlls/tzres/tzres.rc:92 msgid "(UTC-01:00) Cabo Verde Is." -msgstr "" +msgstr "(UTC-01:00) 佛得角群岛" #: dlls/tzres/tzres.rc:183 msgid "Haiti Standard Time" @@ -10427,7 +10308,7 @@ msgstr "海地夏令时" #: dlls/tzres/tzres.rc:185 msgid "(UTC-05:00) Haiti" -msgstr "" +msgstr "(UTC-05:00) 海地" #: dlls/tzres/tzres.rc:111 msgid "Central European Standard Time" @@ -10439,7 +10320,7 @@ msgstr "中欧夏令时" #: dlls/tzres/tzres.rc:113 msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" -msgstr "" +msgstr "(UTC+01:00) 萨拉热窝，斯科普里，华沙，萨格勒布" #: dlls/tzres/tzres.rc:234 msgid "Morocco Standard Time" @@ -10451,33 +10332,27 @@ msgstr "摩洛哥夏令时" #: dlls/tzres/tzres.rc:236 msgid "(UTC+01:00) Casablanca" -msgstr "" +msgstr "(UTC+01:00) 卡萨布兰卡" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 msgid "UTC-08" -msgstr "" +msgstr "UTC-08" #: dlls/tzres/tzres.rc:404 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-08:00) Coordinated Universal Time-08" -msgstr "协调世界时" +msgstr "(UTC-08:00) 协调世界时-8" #: dlls/tzres/tzres.rc:39 -#, fuzzy -#| msgid "Atlantic Standard Time" msgid "Altai Standard Time" -msgstr "大西洋标准时间" +msgstr "阿尔泰标准时间" #: dlls/tzres/tzres.rc:40 -#, fuzzy -#| msgid "Atlantic Daylight Time" msgid "Altai Daylight Time" -msgstr "大西洋夏令时" +msgstr "阿尔泰夏令时" #: dlls/tzres/tzres.rc:41 msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" -msgstr "" +msgstr "(UTC+07:00) 巴尔瑙尔，戈尔诺-阿尔泰斯克" #: dlls/tzres/tzres.rc:108 msgid "Central Europe Standard Time" @@ -10489,7 +10364,7 @@ msgstr "中欧夏令时" #: dlls/tzres/tzres.rc:110 msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" -msgstr "" +msgstr "(UTC+01:00) 贝尔格莱德，布拉迪斯拉发，布达佩斯，卢布尔雅那，布拉格" #: dlls/tzres/tzres.rc:192 msgid "Iran Standard Time" @@ -10501,7 +10376,7 @@ msgstr "伊朗夏令时" #: dlls/tzres/tzres.rc:194 msgid "(UTC+03:30) Tehran" -msgstr "" +msgstr "(UTC+03:30) 德黑兰" #: dlls/tzres/tzres.rc:318 msgid "Saint Pierre Standard Time" @@ -10512,26 +10387,20 @@ msgid "Saint Pierre Daylight Time" msgstr "圣皮埃尔夏令时" #: dlls/tzres/tzres.rc:320 -#, fuzzy -#| msgid "Saint Pierre Standard Time" msgid "(UTC-03:00) Saint Pierre and Miquelon" -msgstr "圣皮埃尔标准时间" +msgstr "(UTC-03:00) 圣皮埃尔和密克隆" #: dlls/tzres/tzres.rc:327 -#, fuzzy -#| msgid "Samoa Standard Time" msgid "Sao Tome Standard Time" -msgstr "萨摩亚标准时间" +msgstr "圣多美标准时间" #: dlls/tzres/tzres.rc:328 -#, fuzzy -#| msgid "Samoa Daylight Time" msgid "Sao Tome Daylight Time" -msgstr "萨摩亚夏令时" +msgstr "圣多美夏令时" #: dlls/tzres/tzres.rc:329 msgid "(UTC+00:00) Sao Tome" -msgstr "" +msgstr "(UTC+00:00) 圣多美" #: dlls/tzres/tzres.rc:249 msgid "Namibia Standard Time" @@ -10543,7 +10412,7 @@ msgstr "纳米比亚夏令时" #: dlls/tzres/tzres.rc:251 msgid "(UTC+02:00) Windhoek" -msgstr "" +msgstr "(UTC+02:00) 温得和克" #: dlls/tzres/tzres.rc:369 msgid "Tonga Standard Time" @@ -10555,19 +10424,19 @@ msgstr "汤加夏令时" #: dlls/tzres/tzres.rc:371 msgid "(UTC+13:00) Nuku'alofa" -msgstr "" +msgstr "(UTC+13:00) 努库阿洛法" #: dlls/tzres/tzres.rc:240 msgid "Mountain Standard Time (Mexico)" -msgstr "山地标准时间（墨西哥）" +msgstr "山地标准时间 (墨西哥)" #: dlls/tzres/tzres.rc:241 msgid "Mountain Daylight Time (Mexico)" -msgstr "山地夏令时（墨西哥）" +msgstr "山地夏令时 (墨西哥)" #: dlls/tzres/tzres.rc:242 msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" -msgstr "" +msgstr "(UTC-07:00) 奇瓦瓦，拉巴斯，马萨特兰" #: dlls/tzres/tzres.rc:171 msgid "GMT Standard Time" @@ -10579,23 +10448,19 @@ msgstr "格林尼治夏令时" #: dlls/tzres/tzres.rc:173 msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" -msgstr "" +msgstr "(UTC+00:00) 柏林，爱丁堡，里斯本，伦敦" #: dlls/tzres/tzres.rc:342 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "South Sudan Standard Time" -msgstr "约旦标准时间" +msgstr "南苏丹标准时间" #: dlls/tzres/tzres.rc:343 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "South Sudan Daylight Time" -msgstr "约旦夏令时" +msgstr "南苏丹夏令时" #: dlls/tzres/tzres.rc:344 msgid "(UTC+02:00) Juba" -msgstr "" +msgstr "(UTC+02:00) 朱巴" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" @@ -10607,7 +10472,7 @@ msgstr "中亚夏令时" #: dlls/tzres/tzres.rc:104 msgid "(UTC+06:00) Astana" -msgstr "" +msgstr "(UTC+06:00) 阿斯塔纳" #: dlls/tzres/tzres.rc:213 msgid "Lord Howe Standard Time" @@ -10619,7 +10484,7 @@ msgstr "豪勋爵夏令时" #: dlls/tzres/tzres.rc:215 msgid "(UTC+10:30) Lord Howe Island" -msgstr "" +msgstr "(UTC+10:30) 豪勋爵岛" #: dlls/tzres/tzres.rc:48 msgid "Arabic Standard Time" @@ -10631,17 +10496,15 @@ msgstr "阿拉伯夏令时" #: dlls/tzres/tzres.rc:50 msgid "(UTC+03:00) Baghdad" -msgstr "" +msgstr "(UTC+03:00) 巴格达" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 msgid "UTC+13" -msgstr "" +msgstr "UTC+13" #: dlls/tzres/tzres.rc:398 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC+13:00) Coordinated Universal Time+13" -msgstr "协调世界时" +msgstr "(UTC+13:00) 协调世界时+13" #: dlls/tzres/tzres.rc:216 msgid "Magadan Standard Time" @@ -10653,7 +10516,7 @@ msgstr "马加丹夏令时" #: dlls/tzres/tzres.rc:218 msgid "(UTC+11:00) Magadan" -msgstr "" +msgstr "(UTC+11:00) 马加丹" #: dlls/tzres/tzres.rc:258 msgid "Newfoundland Standard Time" @@ -10665,23 +10528,19 @@ msgstr "纽芬兰夏令时" #: dlls/tzres/tzres.rc:260 msgid "(UTC-03:30) Newfoundland" -msgstr "" +msgstr "(UTC-03:30) 纽芬兰" #: dlls/tzres/tzres.rc:348 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "Sudan Standard Time" -msgstr "约旦标准时间" +msgstr "苏丹标准时间" #: dlls/tzres/tzres.rc:349 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "Sudan Daylight Time" -msgstr "约旦夏令时" +msgstr "苏丹夏令时" #: dlls/tzres/tzres.rc:350 msgid "(UTC+02:00) Khartoum" -msgstr "" +msgstr "(UTC+02:00) 喀土穆" #: dlls/tzres/tzres.rc:438 msgid "West Pacific Standard Time" @@ -10693,7 +10552,7 @@ msgstr "西太平洋夏令时" #: dlls/tzres/tzres.rc:440 msgid "(UTC+10:00) Guam, Port Moresby" -msgstr "" +msgstr "(UTC+10:00) 关岛，莫尔兹比港" #: dlls/tzres/tzres.rc:279 msgid "Pacific Standard Time" @@ -10705,7 +10564,7 @@ msgstr "太平洋夏令时" #: dlls/tzres/tzres.rc:281 msgid "(UTC-08:00) Pacific Time (US & Canada)" -msgstr "" +msgstr "(UTC-08:00) 太平洋时间 (美国和加拿大)" #: dlls/tzres/tzres.rc:69 msgid "Azerbaijan Standard Time" @@ -10717,7 +10576,7 @@ msgstr "阿塞拜疆夏令时" #: dlls/tzres/tzres.rc:71 msgid "(UTC+04:00) Baku" -msgstr "" +msgstr "(UTC+04:00) 巴库" #: dlls/tzres/tzres.rc:219 msgid "Magallanes Standard Time" @@ -10729,7 +10588,7 @@ msgstr "麦哲伦夏令时" #: dlls/tzres/tzres.rc:221 msgid "(UTC-03:00) Punta Arenas" -msgstr "" +msgstr "(UTC-03:00) 蓬塔阿雷纳斯" #: dlls/tzres/tzres.rc:324 msgid "Samoa Standard Time" @@ -10741,7 +10600,7 @@ msgstr "萨摩亚夏令时" #: dlls/tzres/tzres.rc:326 msgid "(UTC+13:00) Samoa" -msgstr "" +msgstr "(UTC+13:00) 萨摩亚" #: dlls/tzres/tzres.rc:201 msgid "Kaliningrad Standard Time" @@ -10753,19 +10612,19 @@ msgstr "加里宁格勒夏令时" #: dlls/tzres/tzres.rc:203 msgid "(UTC+02:00) Kaliningrad" -msgstr "" +msgstr "(UTC+02:00) 加里宁格勒" #: dlls/tzres/tzres.rc:282 msgid "Pacific Standard Time (Mexico)" -msgstr "太平洋标准时间（墨西哥）" +msgstr "太平洋标准时间 (墨西哥)" #: dlls/tzres/tzres.rc:283 msgid "Pacific Daylight Time (Mexico)" -msgstr "太平洋夏令时（墨西哥）" +msgstr "太平洋夏令时 (墨西哥)" #: dlls/tzres/tzres.rc:284 msgid "(UTC-08:00) Baja California" -msgstr "" +msgstr "(UTC-08:00) 下加利福尼亚" #: dlls/tzres/tzres.rc:228 msgid "Middle East Standard Time" @@ -10777,7 +10636,7 @@ msgstr "中东夏令时" #: dlls/tzres/tzres.rc:230 msgid "(UTC+02:00) Beirut" -msgstr "" +msgstr "(UTC+02:00) 贝鲁特" #: dlls/tzres/tzres.rc:363 msgid "Tokyo Standard Time" @@ -10789,7 +10648,7 @@ msgstr "东京夏令时" #: dlls/tzres/tzres.rc:365 msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" -msgstr "" +msgstr "(UTC+09:00) 大阪，札幌，东京" #: dlls/tzres/tzres.rc:210 msgid "Line Islands Standard Time" @@ -10801,7 +10660,7 @@ msgstr "莱恩群岛夏令时" #: dlls/tzres/tzres.rc:212 msgid "(UTC+14:00) Kiritimati Island" -msgstr "" +msgstr "(UTC+14:00) 圣诞岛" #: dlls/tzres/tzres.rc:129 msgid "Cuba Standard Time" @@ -10813,7 +10672,7 @@ msgstr "古巴夏令时" #: dlls/tzres/tzres.rc:131 msgid "(UTC-05:00) Havana" -msgstr "" +msgstr "(UTC-05:00) 哈瓦拉" #: dlls/tzres/tzres.rc:198 msgid "Jordan Standard Time" @@ -10825,7 +10684,7 @@ msgstr "约旦夏令时" #: dlls/tzres/tzres.rc:200 msgid "(UTC+02:00) Amman" -msgstr "" +msgstr "(UTC+02:00) 安曼" #: dlls/tzres/tzres.rc:117 msgid "Central Standard Time" @@ -10837,31 +10696,27 @@ msgstr "中部夏令时" #: dlls/tzres/tzres.rc:119 msgid "(UTC-06:00) Central Time (US & Canada)" -msgstr "" +msgstr "(UTC-06:00) 中部时间 (美国和加拿大)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 msgid "Russia Time Zone 3" -msgstr "" +msgstr "俄罗斯时区 3" #: dlls/tzres/tzres.rc:305 msgid "(UTC+04:00) Izhevsk, Samara" -msgstr "" +msgstr "(UTC+04:00) 伊热夫斯克，萨马拉" #: dlls/tzres/tzres.rc:417 -#, fuzzy -#| msgid "Tonga Standard Time" msgid "Volgograd Standard Time" -msgstr "汤加标准时间" +msgstr "伏尔加格勒标准时间" #: dlls/tzres/tzres.rc:418 -#, fuzzy -#| msgid "Tonga Daylight Time" msgid "Volgograd Daylight Time" -msgstr "汤加夏令时" +msgstr "伏尔加格勒夏令时" #: dlls/tzres/tzres.rc:419 msgid "(UTC+04:00) Volgograd" -msgstr "" +msgstr "(UTC+04:00) 伏尔加格勒" #: dlls/tzres/tzres.rc:72 msgid "Azores Standard Time" @@ -10873,7 +10728,7 @@ msgstr "亚速尔群岛夏令时" #: dlls/tzres/tzres.rc:74 msgid "(UTC-01:00) Azores" -msgstr "" +msgstr "(UTC-01:00) 亚速尔群岛" #: dlls/tzres/tzres.rc:264 msgid "North Asia East Standard Time" @@ -10885,17 +10740,15 @@ msgstr "北亚东部夏令时" #: dlls/tzres/tzres.rc:266 msgid "(UTC+08:00) Irkutsk" -msgstr "" +msgstr "(UTC+08:00) 伊尔库茨克" #: dlls/tzres/tzres.rc:408 dlls/tzres/tzres.rc:409 msgid "UTC-11" -msgstr "" +msgstr "UTC-11" #: dlls/tzres/tzres.rc:410 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-11:00) Coordinated Universal Time-11" -msgstr "协调世界时" +msgstr "(UTC-11:00) 协调世界时-11" #: dlls/tzres/tzres.rc:51 msgid "Argentina Standard Time" @@ -10907,23 +10760,19 @@ msgstr "阿根廷夏令时" #: dlls/tzres/tzres.rc:53 msgid "(UTC-03:00) City of Buenos Aires" -msgstr "" +msgstr "(UTC-03:00) 布宜诺斯艾利斯市" #: dlls/tzres/tzres.rc:378 -#, fuzzy -#| msgid "Turkey Standard Time" msgid "Turks And Caicos Standard Time" -msgstr "土耳其标准时间" +msgstr "特克斯和凯科斯群岛标准时间" #: dlls/tzres/tzres.rc:379 -#, fuzzy -#| msgid "Turkey Daylight Time" msgid "Turks And Caicos Daylight Time" -msgstr "土耳其夏令时" +msgstr "特克斯和凯科斯群岛夏令时" #: dlls/tzres/tzres.rc:380 msgid "(UTC-05:00) Turks and Caicos" -msgstr "" +msgstr "(UTC-05:00) 特克斯和凯科斯群岛" #: dlls/tzres/tzres.rc:222 msgid "Marquesas Standard Time" @@ -10935,7 +10784,7 @@ msgstr "马克萨斯夏令时" #: dlls/tzres/tzres.rc:224 msgid "(UTC-09:30) Marquesas Islands" -msgstr "" +msgstr "(UTC-09:30) 马克萨斯群岛" #: dlls/tzres/tzres.rc:243 msgid "Myanmar Standard Time" @@ -10947,17 +10796,15 @@ msgstr "缅甸夏令时" #: dlls/tzres/tzres.rc:245 msgid "(UTC+06:30) Yangon (Rangoon)" -msgstr "" +msgstr "(UTC+06:30) 仰光" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 msgid "Coordinated Universal Time" msgstr "协调世界时" #: dlls/tzres/tzres.rc:392 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC) Coordinated Universal Time" -msgstr "协调世界时" +msgstr "(UTC) 协调世界时" #: dlls/tzres/tzres.rc:189 msgid "India Standard Time" @@ -10969,7 +10816,7 @@ msgstr "印度夏令时" #: dlls/tzres/tzres.rc:191 msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" -msgstr "" +msgstr "(UTC+05:30) 马德拉斯，加尔各答，孟买，新德里" #: dlls/tzres/tzres.rc:180 msgid "GTB Standard Time" @@ -10981,7 +10828,7 @@ msgstr "GTB 夏令时" #: dlls/tzres/tzres.rc:182 msgid "(UTC+02:00) Athens, Bucharest" -msgstr "" +msgstr "(UTC+02:00) 雅典，布加勒斯特" #: dlls/tzres/tzres.rc:375 msgid "Turkey Standard Time" @@ -10993,23 +10840,19 @@ msgstr "土耳其夏令时" #: dlls/tzres/tzres.rc:377 msgid "(UTC+03:00) Istanbul" -msgstr "" +msgstr "(UTC+03:00) 伊斯坦布尔" #: dlls/tzres/tzres.rc:54 -#, fuzzy -#| msgid "Arabian Standard Time" msgid "Astrakhan Standard Time" -msgstr "阿拉伯标准时间" +msgstr "阿斯特拉罕标准时间" #: dlls/tzres/tzres.rc:55 -#, fuzzy -#| msgid "Arabian Daylight Time" msgid "Astrakhan Daylight Time" -msgstr "阿拉伯夏令时" +msgstr "阿斯特拉罕夏令时" #: dlls/tzres/tzres.rc:56 msgid "(UTC+04:00) Astrakhan, Ulyanovsk" -msgstr "" +msgstr "(UTC+04:00) 阿斯特拉罕，乌里扬诺夫斯克" #: dlls/tzres/tzres.rc:162 msgid "Fiji Standard Time" @@ -11021,7 +10864,7 @@ msgstr "斐济夏令时" #: dlls/tzres/tzres.rc:164 msgid "(UTC+12:00) Fiji" -msgstr "" +msgstr "(UTC+12:00) 斐济" #: dlls/tzres/tzres.rc:87 msgid "Canada Central Standard Time" @@ -11033,23 +10876,19 @@ msgstr "加拿大中部夏令时" #: dlls/tzres/tzres.rc:89 msgid "(UTC-06:00) Saskatchewan" -msgstr "" +msgstr "(UTC-06:00) 萨斯喀彻温省" #: dlls/tzres/tzres.rc:444 -#, fuzzy -#| msgid "Yakutsk Standard Time" msgid "Yukon Standard Time" -msgstr "雅库次克标准时间" +msgstr "育空标准时间" #: dlls/tzres/tzres.rc:445 -#, fuzzy -#| msgid "Yakutsk Daylight Time" msgid "Yukon Daylight Time" -msgstr "雅库次克夏令时" +msgstr "育空夏令时" #: dlls/tzres/tzres.rc:446 msgid "(UTC-07:00) Yukon" -msgstr "" +msgstr "(UTC-07:00) 育空" #: dlls/tzres/tzres.rc:354 msgid "Taipei Standard Time" @@ -11061,7 +10900,7 @@ msgstr "台北夏令时" #: dlls/tzres/tzres.rc:356 msgid "(UTC+08:00) Taipei" -msgstr "" +msgstr "(UTC+08:00) 台北" #: dlls/tzres/tzres.rc:426 msgid "W. Europe Standard Time" @@ -11073,7 +10912,7 @@ msgstr "西欧夏令时" #: dlls/tzres/tzres.rc:428 msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" -msgstr "" +msgstr "(UTC+01:00) 阿姆斯特丹，柏林，伯尔尼，罗马，斯德哥尔摩，维也纳" #: dlls/tzres/tzres.rc:231 msgid "Montevideo Standard Time" @@ -11085,7 +10924,7 @@ msgstr "蒙得维的亚夏令时" #: dlls/tzres/tzres.rc:233 msgid "(UTC-03:00) Montevideo" -msgstr "" +msgstr "(UTC-03:00) 蒙得维的亚" #: dlls/tzres/tzres.rc:285 msgid "Pakistan Standard Time" @@ -11097,23 +10936,19 @@ msgstr "巴基斯坦夏令时" #: dlls/tzres/tzres.rc:287 msgid "(UTC+05:00) Islamabad, Karachi" -msgstr "" +msgstr "(UTC+05:00) 伊斯兰堡，卡拉奇" #: dlls/tzres/tzres.rc:366 -#, fuzzy -#| msgid "Tokyo Standard Time" msgid "Tomsk Standard Time" -msgstr "东京标准时间" +msgstr "托木斯克标准时间" #: dlls/tzres/tzres.rc:367 -#, fuzzy -#| msgid "Tokyo Daylight Time" msgid "Tomsk Daylight Time" -msgstr "东京夏令时" +msgstr "托木斯克夏令时" #: dlls/tzres/tzres.rc:368 msgid "(UTC+07:00) Tomsk" -msgstr "" +msgstr "(UTC+07:00) 托木斯克" #: dlls/tzres/tzres.rc:93 msgid "Caucasus Standard Time" @@ -11125,7 +10960,7 @@ msgstr "高加索夏令时" #: dlls/tzres/tzres.rc:95 msgid "(UTC+04:00) Yerevan" -msgstr "" +msgstr "(UTC+04:00) 埃里温" #: dlls/tzres/tzres.rc:66 msgid "AUS Eastern Standard Time" @@ -11137,7 +10972,7 @@ msgstr "澳大利亚东部夏令时" #: dlls/tzres/tzres.rc:68 msgid "(UTC+10:00) Canberra, Melbourne, Sydney" -msgstr "" +msgstr "(UTC+10:00) 堪培拉，墨尔本，悉尼" #: dlls/tzres/tzres.rc:246 msgid "N. Central Asia Standard Time" @@ -11149,7 +10984,7 @@ msgstr "中北亚夏令时" #: dlls/tzres/tzres.rc:248 msgid "(UTC+07:00) Novosibirsk" -msgstr "" +msgstr "(UTC+07:00) 新西伯利亚" #: dlls/tzres/tzres.rc:150 msgid "Eastern Standard Time" @@ -11161,67 +10996,55 @@ msgstr "东部夏令时" #: dlls/tzres/tzres.rc:152 msgid "(UTC-05:00) Eastern Time (US & Canada)" -msgstr "" +msgstr "(UTC-05:00) 东部时间 (美国和加拿大)" #: dlls/tzres/tzres.rc:372 -#, fuzzy -#| msgid "Tasmania Standard Time" msgid "Transbaikal Standard Time" -msgstr "塔斯马尼亚标准时间" +msgstr "外贝加尔标准时间" #: dlls/tzres/tzres.rc:373 -#, fuzzy -#| msgid "Tasmania Daylight Time" msgid "Transbaikal Daylight Time" -msgstr "塔斯马尼亚夏令时" +msgstr "外贝加尔夏令时" #: dlls/tzres/tzres.rc:374 msgid "(UTC+09:00) Chita" -msgstr "" +msgstr "(UTC+09:00) 赤塔" #: dlls/tzres/tzres.rc:141 -#, fuzzy -#| msgid "W. Europe Standard Time" msgid "E. Europe Standard Time" -msgstr "西欧标准时间" +msgstr "东欧标准时间" #: dlls/tzres/tzres.rc:142 -#, fuzzy -#| msgid "W. Europe Daylight Time" msgid "E. Europe Daylight Time" -msgstr "西欧夏令时" +msgstr "东欧夏令时" #: dlls/tzres/tzres.rc:143 msgid "(UTC+02:00) Chisinau" -msgstr "" +msgstr "(UTC+02:00) 基希讷乌" #: dlls/tzres/tzres.rc:120 msgid "Central Standard Time (Mexico)" -msgstr "中部标准时间（墨西哥）" +msgstr "中部标准时间 (墨西哥)" #: dlls/tzres/tzres.rc:121 msgid "Central Daylight Time (Mexico)" -msgstr "中部夏令时（墨西哥）" +msgstr "中部夏令时 (墨西哥)" #: dlls/tzres/tzres.rc:122 msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" -msgstr "" +msgstr "(UTC-06:00) 瓜达拉哈拉，墨西哥城，蒙特雷" #: dlls/tzres/tzres.rc:330 -#, fuzzy -#| msgid "Samoa Standard Time" msgid "Saratov Standard Time" -msgstr "萨摩亚标准时间" +msgstr "萨拉托夫标准时间" #: dlls/tzres/tzres.rc:331 -#, fuzzy -#| msgid "Samoa Daylight Time" msgid "Saratov Daylight Time" -msgstr "萨摩亚夏令时" +msgstr "萨拉托夫夏令时" #: dlls/tzres/tzres.rc:332 msgid "(UTC+04:00) Saratov" -msgstr "" +msgstr "(UTC+04:00) 萨拉托夫" #: dlls/tzres/tzres.rc:57 msgid "Atlantic Standard Time" @@ -11233,7 +11056,7 @@ msgstr "大西洋夏令时" #: dlls/tzres/tzres.rc:59 msgid "(UTC-04:00) Atlantic Time (Canada)" -msgstr "" +msgstr "(UTC-04:00) 大西洋时间 (加拿大)" #: dlls/tzres/tzres.rc:237 msgid "Mountain Standard Time" @@ -11245,7 +11068,7 @@ msgstr "山地夏令时" #: dlls/tzres/tzres.rc:239 msgid "(UTC-07:00) Mountain Time (US & Canada)" -msgstr "" +msgstr "(UTC-07:00) 山地时间 (美国和加拿大)" #: dlls/tzres/tzres.rc:384 msgid "US Eastern Standard Time" @@ -11257,23 +11080,19 @@ msgstr "美国东部夏令时" #: dlls/tzres/tzres.rc:386 msgid "(UTC-05:00) Indiana (East)" -msgstr "" +msgstr "(UTC-05:00) 印第安那 (东部)" #: dlls/tzres/tzres.rc:321 -#, fuzzy -#| msgid "Alaskan Standard Time" msgid "Sakhalin Standard Time" -msgstr "阿拉斯加标准时间" +msgstr "萨哈林加标准时间" #: dlls/tzres/tzres.rc:322 -#, fuzzy -#| msgid "Alaskan Daylight Time" msgid "Sakhalin Daylight Time" -msgstr "阿拉斯加夏令时" +msgstr "萨哈林夏令时" #: dlls/tzres/tzres.rc:323 msgid "(UTC+11:00) Sakhalin" -msgstr "" +msgstr "(UTC+11:00) 萨哈林" #: dlls/tzres/tzres.rc:270 msgid "North Korea Standard Time" @@ -11285,7 +11104,7 @@ msgstr "朝鲜夏令时" #: dlls/tzres/tzres.rc:272 msgid "(UTC+09:00) Pyongyang" -msgstr "" +msgstr "(UTC+09:00) 平壤" #: dlls/tzres/tzres.rc:357 msgid "Tasmania Standard Time" @@ -11297,7 +11116,7 @@ msgstr "塔斯马尼亚夏令时" #: dlls/tzres/tzres.rc:359 msgid "(UTC+10:00) Hobart" -msgstr "" +msgstr "(UTC+10:00) 霍巴特" #: dlls/tzres/tzres.rc:99 msgid "Central America Standard Time" @@ -11309,17 +11128,15 @@ msgstr "中美洲夏令时" #: dlls/tzres/tzres.rc:101 msgid "(UTC-06:00) Central America" -msgstr "" +msgstr "(UTC-06:00) 中美洲" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 msgid "UTC-02" -msgstr "" +msgstr "UTC-02" #: dlls/tzres/tzres.rc:401 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-02:00) Coordinated Universal Time-02" -msgstr "协调世界时" +msgstr "(UTC-02:00) 协调世界时-02" #: dlls/tzres/tzres.rc:387 msgid "US Mountain Standard Time" @@ -11331,7 +11148,7 @@ msgstr "美国山地夏令时" #: dlls/tzres/tzres.rc:389 msgid "(UTC-07:00) Arizona" -msgstr "" +msgstr "(UTC-07:00) 亚利桑那" #: dlls/tzres/tzres.rc:339 msgid "South Africa Standard Time" @@ -11343,7 +11160,7 @@ msgstr "南非夏令时" #: dlls/tzres/tzres.rc:341 msgid "(UTC+02:00) Harare, Pretoria" -msgstr "" +msgstr "(UTC+02:00) 哈拉雷，比勒陀利亚" #: dlls/tzres/tzres.rc:96 msgid "Cen. Australia Standard Time" @@ -11355,17 +11172,15 @@ msgstr "澳大利亚中部夏令时" #: dlls/tzres/tzres.rc:98 msgid "(UTC+09:30) Adelaide" -msgstr "" +msgstr "(UTC+09:30) 阿德莱德" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 msgid "UTC-09" -msgstr "" +msgstr "UTC-09" #: dlls/tzres/tzres.rc:407 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-09:00) Coordinated Universal Time-09" -msgstr "协调世界时" +msgstr "(UTC-09:00) 协调世界时-09" #: dlls/tzres/tzres.rc:345 msgid "Sri Lanka Standard Time" @@ -11377,7 +11192,7 @@ msgstr "斯里兰卡夏令时" #: dlls/tzres/tzres.rc:347 msgid "(UTC+05:30) Sri Jayawardenepura" -msgstr "" +msgstr "(UTC+05:30) 斯里加亚渥登普拉" #: dlls/tzres/tzres.rc:30 msgid "Afghanistan Standard Time" @@ -11389,7 +11204,7 @@ msgstr "阿富汗夏令时" #: dlls/tzres/tzres.rc:32 msgid "(UTC+04:30) Kabul" -msgstr "" +msgstr "(UTC+04:30) 喀布尔" #: dlls/tzres/tzres.rc:441 msgid "Yakutsk Standard Time" @@ -11401,7 +11216,7 @@ msgstr "雅库次克夏令时" #: dlls/tzres/tzres.rc:443 msgid "(UTC+09:00) Yakutsk" -msgstr "" +msgstr "(UTC+09:00) 雅库茨克" #: dlls/tzres/tzres.rc:309 msgid "SA Eastern Standard Time" @@ -11413,7 +11228,7 @@ msgstr "南美东部夏令时" #: dlls/tzres/tzres.rc:311 msgid "(UTC-03:00) Cayenne, Fortaleza" -msgstr "" +msgstr "(UTC-03:00) 卡宴，福塔雷萨" #: dlls/tzres/tzres.rc:42 msgid "Arab Standard Time" @@ -11425,7 +11240,7 @@ msgstr "阿拉伯夏令时" #: dlls/tzres/tzres.rc:44 msgid "(UTC+03:00) Kuwait, Riyadh" -msgstr "" +msgstr "(UTC+03:00) 科威特，利雅得" #: dlls/tzres/tzres.rc:45 msgid "Arabian Standard Time" @@ -11437,7 +11252,7 @@ msgstr "阿拉伯夏令时" #: dlls/tzres/tzres.rc:47 msgid "(UTC+04:00) Abu Dhabi, Muscat" -msgstr "" +msgstr "(UTC+04:00) 阿布扎比，马斯喀特" #: dlls/tzres/tzres.rc:360 msgid "Tocantins Standard Time" @@ -11449,7 +11264,7 @@ msgstr "托坎廷斯夏令时" #: dlls/tzres/tzres.rc:362 msgid "(UTC-03:00) Araguaina" -msgstr "" +msgstr "(UTC-03:00) 阿拉瓜伊纳" #: dlls/tzres/tzres.rc:306 msgid "Russian Standard Time" @@ -11461,7 +11276,7 @@ msgstr "俄罗斯夏令时" #: dlls/tzres/tzres.rc:308 msgid "(UTC+03:00) Moscow, St. Petersburg" -msgstr "" +msgstr "(UTC+03:00) 莫斯科，圣彼得堡" #: dlls/tzres/tzres.rc:63 msgid "Aus Central W. Standard Time" @@ -11473,7 +11288,7 @@ msgstr "澳大利亚中西部夏令时" #: dlls/tzres/tzres.rc:65 msgid "(UTC+08:45) Eucla" -msgstr "" +msgstr "(UTC+08:45) 尤克拉" #: dlls/tzres/tzres.rc:294 msgid "Romance Standard Time" @@ -11485,7 +11300,7 @@ msgstr "罗曼夏令时" #: dlls/tzres/tzres.rc:296 msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" -msgstr "" +msgstr "(UTC+01:00) 布鲁塞尔，哥本哈根，马德里，巴黎" #: dlls/tzres/tzres.rc:159 msgid "Ekaterinburg Standard Time" @@ -11497,31 +11312,27 @@ msgstr "叶卡捷琳堡夏令时" #: dlls/tzres/tzres.rc:161 msgid "(UTC+05:00) Ekaterinburg" -msgstr "" +msgstr "(UTC+05:00) 叶卡特琳堡" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 msgid "Russia Time Zone 11" -msgstr "" +msgstr "俄罗斯时区 11" #: dlls/tzres/tzres.rc:302 msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" -msgstr "" +msgstr "(UTC+12:00) 阿纳德尔，彼得罗巴甫洛夫斯克-堪察加" #: dlls/tzres/tzres.rc:435 -#, fuzzy -#| msgid "West Asia Standard Time" msgid "West Bank Standard Time" -msgstr "西亚标准时间" +msgstr "西岸标准时间" #: dlls/tzres/tzres.rc:436 -#, fuzzy -#| msgid "West Asia Daylight Time" msgid "West Bank Daylight Time" -msgstr "西亚夏令时" +msgstr "西岸夏令时" #: dlls/tzres/tzres.rc:437 msgid "(UTC+02:00) Gaza, Hebron" -msgstr "" +msgstr "(UTC+02:00) 加沙，希伯仑" #: dlls/tzres/tzres.rc:351 msgid "Syria Standard Time" @@ -11533,7 +11344,7 @@ msgstr "叙利亚夏令时" #: dlls/tzres/tzres.rc:353 msgid "(UTC+02:00) Damascus" -msgstr "" +msgstr "(UTC+02:00) 大马士革" #: dlls/tzres/tzres.rc:60 msgid "AUS Central Standard Time" @@ -11545,7 +11356,7 @@ msgstr "澳大利亚中部夏令时" #: dlls/tzres/tzres.rc:62 msgid "(UTC+09:30) Darwin" -msgstr "" +msgstr "(UTC+09:30) 达尔文" #: dlls/tzres/tzres.rc:177 msgid "Greenwich Standard Time" @@ -11557,7 +11368,7 @@ msgstr "格林威治夏令时" #: dlls/tzres/tzres.rc:179 msgid "(UTC+00:00) Monrovia, Reykjavik" -msgstr "" +msgstr "(UTC+00:00) 蒙罗维亚，雷克雅未克" #: dlls/tzres/tzres.rc:381 msgid "Ulaanbaatar Standard Time" @@ -11569,23 +11380,19 @@ msgstr "乌兰巴托夏令时" #: dlls/tzres/tzres.rc:383 msgid "(UTC+08:00) Ulaanbaatar" -msgstr "" +msgstr "(UTC+08:00) 乌兰巴托" #: dlls/tzres/tzres.rc:261 -#, fuzzy -#| msgid "Morocco Standard Time" msgid "Norfolk Standard Time" -msgstr "摩洛哥标准时间" +msgstr "诺福克标准时间" #: dlls/tzres/tzres.rc:262 -#, fuzzy -#| msgid "Morocco Daylight Time" msgid "Norfolk Daylight Time" -msgstr "摩洛哥夏令时" +msgstr "诺福克夏令时" #: dlls/tzres/tzres.rc:263 msgid "(UTC+11:00) Norfolk Island" -msgstr "" +msgstr "(UTC+11:00) 诺福克" #: dlls/tzres/tzres.rc:195 msgid "Israel Standard Time" @@ -11597,7 +11404,7 @@ msgstr "以色列夏令时" #: dlls/tzres/tzres.rc:197 msgid "(UTC+02:00) Jerusalem" -msgstr "" +msgstr "(UTC+02:00) 耶路撒冷" #: dlls/tzres/tzres.rc:78 msgid "Bangladesh Standard Time" @@ -11609,7 +11416,7 @@ msgstr "孟加拉夏令时" #: dlls/tzres/tzres.rc:80 msgid "(UTC+06:00) Dhaka" -msgstr "" +msgstr "(UTC+06:00) 达卡" #: dlls/tzres/tzres.rc:312 msgid "SA Pacific Standard Time" @@ -11621,7 +11428,7 @@ msgstr "南美太平洋夏令时" #: dlls/tzres/tzres.rc:314 msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" -msgstr "" +msgstr "(UTC-05:00) 波哥大，利马，基多，里奥布朗库" #: dlls/tzres/tzres.rc:432 msgid "West Asia Standard Time" @@ -11633,7 +11440,7 @@ msgstr "西亚夏令时" #: dlls/tzres/tzres.rc:434 msgid "(UTC+05:00) Ashgabat, Tashkent" -msgstr "" +msgstr "(UTC+05:00) 阿什哈巴德，塔什干" #: dlls/tzres/tzres.rc:33 msgid "Alaskan Standard Time" @@ -11645,7 +11452,7 @@ msgstr "阿拉斯加夏令时" #: dlls/tzres/tzres.rc:35 msgid "(UTC-09:00) Alaska" -msgstr "" +msgstr "(UTC-09:00) 阿拉斯加" #: dlls/tzres/tzres.rc:288 msgid "Paraguay Standard Time" @@ -11657,7 +11464,7 @@ msgstr "巴拉圭夏令时" #: dlls/tzres/tzres.rc:290 msgid "(UTC-04:00) Asuncion" -msgstr "" +msgstr "(UTC-04:00) 亚松森" #: dlls/tzres/tzres.rc:132 msgid "Dateline Standard Time" @@ -11669,7 +11476,7 @@ msgstr "日期变更线夏令时" #: dlls/tzres/tzres.rc:134 msgid "(UTC-12:00) International Date Line West" -msgstr "" +msgstr "(UTC-12:00) 国际日期变更线西" #: dlls/tzres/tzres.rc:207 msgid "Libya Standard Time" @@ -11681,7 +11488,7 @@ msgstr "利比亚夏令时" #: dlls/tzres/tzres.rc:209 msgid "(UTC+02:00) Tripoli" -msgstr "" +msgstr "(UTC+02:00) 的黎波里" #: dlls/tzres/tzres.rc:75 msgid "Bahia Standard Time" @@ -11693,7 +11500,7 @@ msgstr "巴伊亚夏令时" #: dlls/tzres/tzres.rc:77 msgid "(UTC-03:00) Salvador" -msgstr "" +msgstr "(UTC-03:00) 萨尔瓦多" #: dlls/tzres/tzres.rc:411 msgid "Venezuela Standard Time" @@ -11705,7 +11512,7 @@ msgstr "委内瑞拉夏令时" #: dlls/tzres/tzres.rc:413 msgid "(UTC-04:00) Caracas" -msgstr "" +msgstr "(UTC-04:00) 加拉加斯" #: dlls/tzres/tzres.rc:84 msgid "Bougainville Standard Time" @@ -11717,7 +11524,7 @@ msgstr "布干维尔夏令时" #: dlls/tzres/tzres.rc:86 msgid "(UTC+11:00) Bougainville Island" -msgstr "" +msgstr "(UTC+11:00) 布干维尔岛" #: dlls/tzres/tzres.rc:186 msgid "Hawaiian Standard Time" @@ -11729,7 +11536,7 @@ msgstr "夏威夷夏令时" #: dlls/tzres/tzres.rc:188 msgid "(UTC-10:00) Hawaii" -msgstr "" +msgstr "(UTC-10:00) 夏威夷" #: dlls/tzres/tzres.rc:333 msgid "SE Asia Standard Time" @@ -11741,39 +11548,31 @@ msgstr "东南亚夏令时" #: dlls/tzres/tzres.rc:335 msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" -msgstr "" +msgstr "(UTC+07:00) 曼谷，河内，雅加达" #: dlls/tzres/tzres.rc:291 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "Qyzylorda Standard Time" -msgstr "约旦标准时间" +msgstr "克孜洛尔达标准时间" #: dlls/tzres/tzres.rc:292 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "Qyzylorda Daylight Time" -msgstr "约旦夏令时" +msgstr "克孜洛尔达夏令时" #: dlls/tzres/tzres.rc:293 msgid "(UTC+05:00) Qyzylorda" -msgstr "" +msgstr "(UTC+05:00) 克孜洛尔达" #: dlls/tzres/tzres.rc:429 -#, fuzzy -#| msgid "Tonga Standard Time" msgid "W. Mongolia Standard Time" -msgstr "汤加标准时间" +msgstr "西蒙古标准时间" #: dlls/tzres/tzres.rc:430 -#, fuzzy -#| msgid "Tonga Daylight Time" msgid "W. Mongolia Daylight Time" -msgstr "汤加夏令时" +msgstr "西蒙古夏令时" #: dlls/tzres/tzres.rc:431 msgid "(UTC+07:00) Hovd" -msgstr "" +msgstr "(UTC+07:00) 科布多" #: dlls/tzres/tzres.rc:255 msgid "New Zealand Standard Time" @@ -11785,7 +11584,7 @@ msgstr "新西兰夏令时" #: dlls/tzres/tzres.rc:257 msgid "(UTC+12:00) Auckland, Wellington" -msgstr "" +msgstr "(UTC+12:00) 奥克兰，惠灵顿" #: dlls/tzres/tzres.rc:36 msgid "Aleutian Standard Time" @@ -11797,23 +11596,19 @@ msgstr "阿留申夏令时" #: dlls/tzres/tzres.rc:38 msgid "(UTC-10:00) Aleutian Islands" -msgstr "" +msgstr "(UTC-10:00) 阿留申群岛" #: dlls/tzres/tzres.rc:273 -#, fuzzy -#| msgid "Yakutsk Standard Time" msgid "Omsk Standard Time" -msgstr "雅库次克标准时间" +msgstr "鄂木斯克标准时间" #: dlls/tzres/tzres.rc:274 -#, fuzzy -#| msgid "Yakutsk Daylight Time" msgid "Omsk Daylight Time" -msgstr "雅库次克夏令时" +msgstr "鄂木斯克克夏令时" #: dlls/tzres/tzres.rc:275 msgid "(UTC+06:00) Omsk" -msgstr "" +msgstr "(UTC+06:00) 鄂木斯克" #: dlls/tzres/tzres.rc:105 msgid "Central Brazilian Standard Time" @@ -11825,7 +11620,7 @@ msgstr "巴西中部夏令时" #: dlls/tzres/tzres.rc:107 msgid "(UTC-04:00) Cuiaba" -msgstr "" +msgstr "(UTC-04:00) 库亚巴" #: dlls/tzres/tzres.rc:81 msgid "Belarus Standard Time" @@ -11837,7 +11632,7 @@ msgstr "白罗斯夏令时" #: dlls/tzres/tzres.rc:83 msgid "(UTC+03:00) Minsk" -msgstr "" +msgstr "(UTC+03:00) 明斯克" #: dlls/tzres/tzres.rc:315 msgid "SA Western Standard Time" @@ -11849,7 +11644,7 @@ msgstr "南美西部夏令时" #: dlls/tzres/tzres.rc:317 msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" -msgstr "" +msgstr "(UTC-04:00) 乔治敦，拉巴斯，马瑙斯，圣胡安" #: dlls/tzres/tzres.rc:174 msgid "Greenland Standard Time" @@ -11861,7 +11656,7 @@ msgstr "格陵兰夏令时" #: dlls/tzres/tzres.rc:176 msgid "(UTC-03:00) Greenland" -msgstr "" +msgstr "(UTC-03:00) 格陵兰" #: dlls/tzres/tzres.rc:147 msgid "Easter Island Standard Time" @@ -11873,15 +11668,15 @@ msgstr "复活节岛夏令时" #: dlls/tzres/tzres.rc:149 msgid "(UTC-06:00) Easter Island" -msgstr "" +msgstr "(UTC-06:00) 复活节岛" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 msgid "Russia Time Zone 10" -msgstr "" +msgstr "俄罗斯时区 10" #: dlls/tzres/tzres.rc:299 msgid "(UTC+11:00) Chokurdakh" -msgstr "" +msgstr "(UTC+11:00) 乔库尔达赫" #: dlls/tzres/tzres.rc:156 msgid "Egypt Standard Time" @@ -11893,19 +11688,19 @@ msgstr "埃及夏令时" #: dlls/tzres/tzres.rc:158 msgid "(UTC+02:00) Cairo" -msgstr "" +msgstr "(UTC+02:00) 开罗" #: dlls/tzres/tzres.rc:153 msgid "Eastern Standard Time (Mexico)" -msgstr "东部标准时间（墨西哥）" +msgstr "东部标准时间 (墨西哥)" #: dlls/tzres/tzres.rc:154 msgid "Eastern Daylight Time (Mexico)" -msgstr "东部夏令时（墨西哥）" +msgstr "东部夏令时 (墨西哥)" #: dlls/tzres/tzres.rc:155 msgid "(UTC-05:00) Chetumal" -msgstr "" +msgstr "(UTC-05:00) 切图马尔" #: dlls/tzres/tzres.rc:225 msgid "Mauritius Standard Time" @@ -11917,19 +11712,19 @@ msgstr "毛里求斯夏令时" #: dlls/tzres/tzres.rc:227 msgid "(UTC+04:00) Port Louis" -msgstr "" +msgstr "(UTC+04:00) 路易港" #: dlls/tzres/tzres.rc:414 msgid "Vladivostok Standard Time" -msgstr "符拉迪沃斯托克标准时间" +msgstr "海参崴标准时间" #: dlls/tzres/tzres.rc:415 msgid "Vladivostok Daylight Time" -msgstr "符拉迪沃斯托克夏令时" +msgstr "海参崴夏令时" #: dlls/tzres/tzres.rc:416 msgid "(UTC+10:00) Vladivostok" -msgstr "" +msgstr "(UTC+10:00) 海参崴" #: dlls/tzres/tzres.rc:336 msgid "Singapore Standard Time" @@ -11941,7 +11736,7 @@ msgstr "新加坡夏令时" #: dlls/tzres/tzres.rc:338 msgid "(UTC+08:00) Kuala Lumpur, Singapore" -msgstr "" +msgstr "(UTC+08:00) 吉隆坡，新加坡" #: dlls/tzres/tzres.rc:204 msgid "Korea Standard Time" @@ -11953,7 +11748,7 @@ msgstr "韩国夏令时" #: dlls/tzres/tzres.rc:206 msgid "(UTC+09:00) Seoul" -msgstr "" +msgstr "(UTC+09:00) 首尔" #: dlls/tzres/tzres.rc:123 msgid "Chatham Islands Standard Time" @@ -11965,7 +11760,7 @@ msgstr "查塔姆夏令时" #: dlls/tzres/tzres.rc:125 msgid "(UTC+12:45) Chatham Islands" -msgstr "" +msgstr "(UTC+12:45) 查塔姆群岛" #: dlls/tzres/tzres.rc:135 msgid "E. Africa Standard Time" @@ -11977,7 +11772,7 @@ msgstr "东非夏令时" #: dlls/tzres/tzres.rc:137 msgid "(UTC+03:00) Nairobi" -msgstr "" +msgstr "(UTC+03:00) 奈洛比" #: dlls/tzres/tzres.rc:165 msgid "FLE Standard Time" @@ -11989,7 +11784,7 @@ msgstr "FLE 夏令时" #: dlls/tzres/tzres.rc:167 msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" -msgstr "" +msgstr "(UTC+02:00) 赫尔辛基，基辅，里加，索菲亚，塔林，维尔纽斯" #: dlls/tzres/tzres.rc:144 msgid "E. South America Standard Time" @@ -12001,7 +11796,7 @@ msgstr "东南美洲夏令时" #: dlls/tzres/tzres.rc:146 msgid "(UTC-03:00) Brasilia" -msgstr "" +msgstr "(UTC-03:00) 巴西利亚" #: dlls/tzres/tzres.rc:114 msgid "Central Pacific Standard Time" @@ -12013,7 +11808,7 @@ msgstr "中太平洋夏令时" #: dlls/tzres/tzres.rc:116 msgid "(UTC+11:00) Solomon Is., New Caledonia" -msgstr "" +msgstr "(UTC+11:00) 所罗门群岛，新喀里多尼亚" #: dlls/tzres/tzres.rc:423 msgid "W. Central Africa Standard Time" @@ -12025,7 +11820,7 @@ msgstr "西中非夏令时" #: dlls/tzres/tzres.rc:425 msgid "(UTC+01:00) West Central Africa" -msgstr "" +msgstr "(UTC+01:00) 中非西部" #: dlls/tzres/tzres.rc:276 msgid "Pacific SA Standard Time" @@ -12037,7 +11832,7 @@ msgstr "太平洋南美夏令时" #: dlls/tzres/tzres.rc:278 msgid "(UTC-04:00) Santiago" -msgstr "" +msgstr "(UTC-04:00) 圣地亚哥" #: dlls/tzres/tzres.rc:138 msgid "E. Australia Standard Time" @@ -12049,7 +11844,7 @@ msgstr "澳大利亚东部夏令时" #: dlls/tzres/tzres.rc:140 msgid "(UTC+10:00) Brisbane" -msgstr "" +msgstr "(UTC+10:00) 布里斯班" #: dlls/tzres/tzres.rc:420 msgid "W. Australia Standard Time" @@ -12061,7 +11856,7 @@ msgstr "澳大利亚西部夏令时" #: dlls/tzres/tzres.rc:422 msgid "(UTC+08:00) Perth" -msgstr "" +msgstr "(UTC+08:00) 珀斯" #: dlls/urlmon/urlmon.rc:32 dlls/wininet/wininet.rc:88 msgid "Security Warning" @@ -12069,7 +11864,7 @@ msgstr "安全警告" #: dlls/urlmon/urlmon.rc:35 msgid "Do you want to install this software?" -msgstr "是否安装该软件？" +msgstr "您是否要安装该软件?" #: dlls/urlmon/urlmon.rc:39 msgid "Don't install" @@ -12085,7 +11880,7 @@ msgstr "" #: dlls/urlmon/urlmon.rc:51 msgid "Installation of component failed: %08x" -msgstr "安装组件失败：%08x" +msgstr "安装组件失败: %08x" #: dlls/urlmon/urlmon.rc:52 msgid "Install (%d)" @@ -12314,11 +12109,11 @@ msgstr "前置全部窗口" #: dlls/wineps.drv/wineps.rc:31 msgid "Paper Si&ze:" -msgstr "纸张大小(&Z)：" +msgstr "纸张大小(&Z):" #: dlls/wineps.drv/wineps.rc:39 msgid "Duplex:" -msgstr "双面：" +msgstr "双面:" #: dlls/wineps.drv/wineps.rc:50 msgid "Setup" @@ -12342,7 +12137,7 @@ msgstr "此站点的证书有问题。" #: dlls/wininet/wininet.rc:93 msgid "Do you want to continue anyway?" -msgstr "还是要继续吗？" +msgstr "您无论如何还是要继续吗?" #: dlls/wininet/wininet.rc:28 msgid "LAN Connection" @@ -12439,7 +12234,7 @@ msgstr "从服务器接收的 SSL 证书日期无效。该证书已过期。\n" #: dlls/wininet/winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "SSL 证书一般名称（域名栏目）不正确。\n" +msgstr "SSL 证书公用名 (主机名字段) 不正确。\n" #: dlls/winmm/winmm.rc:32 msgid "The specified command was carried out." @@ -12469,7 +12264,7 @@ msgstr "指定的设备句柄无效。" #: dlls/winmm/winmm.rc:38 msgid "There is no driver installed on your system!" -msgstr "你的系统上没有安装任何驱动程序!" +msgstr "您的系统上没有安装任何驱动程序!" #: dlls/winmm/winmm.rc:39 dlls/winmm/winmm.rc:65 msgid "" @@ -12626,7 +12421,7 @@ msgstr "指定的命令需要一个参数。请提供一个参数。" #: dlls/winmm/winmm.rc:75 msgid "The MCI device you are using does not support the specified command." -msgstr "你正在使用的 MCI 设备不支持指定的命令。" +msgstr "您正在使用的 MCI 设备不支持指定的命令。" #: dlls/winmm/winmm.rc:76 msgid "" @@ -12957,7 +12752,7 @@ msgstr "打印到文件" #: dlls/winspool.drv/winspool.rc:40 msgid "&Output File Name:" -msgstr "输出文件名(&O)：" +msgstr "输出文件名(&O):" #: dlls/winspool.drv/winspool.rc:31 msgid "The output file already exists. Click OK to overwrite." @@ -13217,7 +13012,7 @@ msgstr "" #: programs/attrib/attrib.rc:31 programs/cmd/cmd.rc:376 msgid "%1: File Not Found\n" -msgstr "%1：找不到文件\n" +msgstr "%1: 找不到文件\n" #: programs/attrib/attrib.rc:50 msgid "" @@ -13260,13 +13055,11 @@ msgstr "" #: programs/chcp.com/chcp.rc:28 msgid "Active code page: %1!u!\n" -msgstr "" +msgstr "当前代码页: %1!u!\n" #: programs/chcp.com/chcp.rc:29 -#, fuzzy -#| msgid "Invalid message.\n" msgid "Invalid code page\n" -msgstr "无效消息。\n" +msgstr "无效代码页\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -13279,6 +13072,14 @@ msgid "" " Type CHCP without a number to display the active console code page.\n" "\n" msgstr "" +"CHCP [数字]\n" +"\n" +" 设置或显示当前的终端代码页。\n" +"\n" +" 数字要设置的终端代码页。\n" +"\n" +" 仅输入 CHCP 而不输入数字将显示当前使用的终端代码页。\n" +"\n" #: programs/clock/clock.rc:32 msgid "Ana&log" @@ -13401,7 +13202,7 @@ msgid "" msgstr "" "FOR 用于逐一执行用于一组文件的命令。\n" "\n" -"用法：FOR %变量 IN（命令组）DO 命令\n" +"用法: FOR %变量 IN (命令组) DO 命令\n" "\n" "在批处理文件中使用 FOR 时必须将 % 符号写两次。\n" @@ -13447,9 +13248,9 @@ msgid "" msgstr "" "IF 用于根据条件执行命令。\n" "\n" -"语法：\tIF [NOT] EXIST 文件名命令\n" -"\tIF [NOT] 字符串1==字符串2 命令\n" -"\tIF [NOT] ERRORLEVEL 序号命令\n" +"语法: IF [NOT] EXIST 文件名命令\n" +" IF [NOT] 字符串1==字符串2 命令\n" +" IF [NOT] ERRORLEVEL 序号命令\n" "\n" "在命令的第二种用法中，字符串 1 和字符串 2 必须用双引号包住。比较条件\n" "非大小写敏感。\n" @@ -13464,7 +13265,7 @@ msgid "" msgstr "" "LABEL 用于设置磁盘卷标。\n" "\n" -"语法：LABEL [drive:]\n" +"语法: LABEL [drive:]\n" "该命令将询问指定驱动器的新卷标。\n" "您可以使用 VOL 命令显示磁盘卷标。\n" @@ -13508,7 +13309,7 @@ msgstr "" "输入 PATH 将显示当前的 PATH 设置（默认从注册表读取）。在 PATH 后附加\n" "新值以改变设置。\n" "\n" -"也可以使用 PATH 环境变量来编辑 PATH 值，例如：\n" +"也可以使用 PATH 环境变量来编辑 PATH 值，例如:\n" "PATH %PATH%;c:\\temp\n" #: programs/cmd/cmd.rc:148 @@ -13550,7 +13351,7 @@ msgstr "" "PROMPT 命令后跟随的字符串（包括紧随其后的空格）将在 cmd 等待输入时\n" "在行头显示。\n" "\n" -"如下字符串带有特殊含义，如下：\n" +"如下字符串带有特殊含义，如下:\n" "\n" "$$ 美金符号 $_ 换行 $b 管道符号 (|)\n" "$d 当前日期 $e 转义 $g > 符号\n" @@ -13610,7 +13411,7 @@ msgstr "" "\n" "SET 不带参数使用可用于显示当前所有的环境变量。\n" "\n" -"传教或修改环境变量的语法如下：\n" +"传教或修改环境变量的语法如下:\n" "\n" "SET <变量>=<值>\n" "\n" @@ -13660,11 +13461,11 @@ msgid "" "/? Display this help and exit.\n" msgstr "" "启动程序，或用一般用于带有某个后缀的程序打开文档。\n" -"用法：\n" +"用法:\n" "start [选项] 程序文件名 [...]\n" "start [选项] 文档文件名\n" "\n" -"选项：\n" +"选项:\n" "“标题”\t设置子窗口的标题。\n" "/d 目录\t在指定目录启动程序。\n" "/b\t\t不要为程序创建新控制台。\n" @@ -13711,7 +13512,7 @@ msgid "" "\n" "The verify flag has no function in Wine.\n" msgstr "" -"VERIFY 用于设置、清除或测试校验旗标。有效形式如下：\n" +"VERIFY 用于设置、清除或测试校验旗标。有效形式如下:\n" "\n" "VERIFY ON\t设置此旗标。\n" "VERIFY OFF\t清除此旗标。\n" @@ -13770,7 +13571,7 @@ msgid "" msgstr "" "ASSOC 显示或更改文件扩展名所关联的文件类型。\n" "\n" -"语法：ASSOC [.扩展名[=[文件类型]]]\n" +"语法: ASSOC [.扩展名[=[文件类型]]]\n" "\n" "不带参数运行 ASSOC 将显示当前的文件类型关联。\n" "如使用文件扩展名作为参数，将显示当前扩展名的关联信息。\n" @@ -13791,7 +13592,7 @@ msgid "" msgstr "" "FTYPE 显示或更改与文件类型关联的打开命令。\n" "\n" -"语法：FTYPE [文件类型[=[打开命令]]]\n" +"语法: FTYPE [文件类型[=[打开命令]]]\n" "\n" "如不带任何参数运行，该命令将显示已定义启动命令字符串的文件类型。\n" "如使用文件类型作为参数，该命令将显示关联于此文件类型的启动命令（如果存" @@ -13826,9 +13627,9 @@ msgid "" msgstr "" "创建符号链接。\n" "\n" -"语法：MKLINK [options] link_name target\n" +"语法: MKLINK [options] link_name target\n" "\n" -"选项：\n" +"选项: \n" "/d 创建目录符号链接。\n" "/h 创建硬链接。\n" "/j 创建目录结。\n" @@ -13883,7 +13684,7 @@ msgid "" "\n" "Enter HELP <command> for further information on any of the above commands.\n" msgstr "" -"CMD 的内建命令如下：\n" +"CMD 的内建命令如下:\n" "ASSOC\t\t显示或更改文件扩展名关联\n" "ATTRIB\t\t显示或更改 DOS 文件属性\n" "CALL\t\t在批处理文件中调用另一个批处理文件\n" @@ -13925,7 +13726,7 @@ msgstr "" #: programs/cmd/cmd.rc:365 msgid "Are you sure?" -msgstr "确定吗？" +msgstr "您确定吗?" #: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" @@ -13947,7 +13748,7 @@ msgstr "没有与文件类型 \"%1\" 相关联的打开命令\n" #: programs/cmd/cmd.rc:370 msgid "Overwrite %1?" -msgstr "覆盖 %1？" +msgstr "覆盖 %1?" #: programs/cmd/cmd.rc:371 msgid "More..." @@ -13955,7 +13756,7 @@ msgstr "更多..." #: programs/cmd/cmd.rc:372 msgid "Line in Batch processing possibly truncated. Using:\n" -msgstr "批处理中的行可能被截断。正在使用：\n" +msgstr "批处理中的行可能被截断。正在使用:\n" #: programs/cmd/cmd.rc:374 msgid "Argument missing\n" @@ -13983,11 +13784,11 @@ msgstr "当前时间是 %1\n" #: programs/cmd/cmd.rc:381 msgid "Enter new date: " -msgstr "输入新的日期：" +msgstr "输入新的日期: " #: programs/cmd/cmd.rc:382 msgid "Enter new time: " -msgstr "输入新的时间：" +msgstr "输入新的时间: " #: programs/cmd/cmd.rc:383 msgid "Environment variable %1 not defined\n" @@ -14008,7 +13809,7 @@ msgstr "A" #: programs/cmd/cmd.rc:387 msgid "Delete %1?" -msgstr "删除 %1？" +msgstr "删除 %1?" #: programs/cmd/cmd.rc:388 msgid "Echo is %1\n" @@ -14129,7 +13930,7 @@ msgstr "命令历史" #: programs/conhost/conhost.rc:60 msgid "&Buffer size:" -msgstr "缓冲区大小(&B)：" +msgstr "缓冲区大小(&B):" #: programs/conhost/conhost.rc:63 msgid "&Remove duplicates" @@ -14177,11 +13978,11 @@ msgstr "缓冲区" #: programs/conhost/conhost.rc:96 msgid "&Width:" -msgstr "宽度(&W)：" +msgstr "宽度(&W):" #: programs/conhost/conhost.rc:99 msgid "&Height:" -msgstr "高度(&H)：" +msgstr "高度(&H):" #: programs/conhost/conhost.rc:103 msgid "Window size" @@ -14189,11 +13990,11 @@ msgstr "窗口大小" #: programs/conhost/conhost.rc:104 msgid "W&idth:" -msgstr "宽度(&I)：" +msgstr "宽度(&I):" #: programs/conhost/conhost.rc:107 msgid "H&eight:" -msgstr "高度(&E)：" +msgstr "高度(&E):" #: programs/conhost/conhost.rc:111 msgid "End of program" @@ -14313,19 +14114,19 @@ msgstr "" #: programs/fsutil/fsutil.mc:40 msgid "Syntax: fsutil hardlink create <new> <existing>\n" -msgstr "语法：fsutil hardlink create <new> <existing>\n" +msgstr "语法: fsutil hardlink create <new> <existing>\n" #: programs/hostname/hostname.rc:30 msgid "Usage: hostname\n" -msgstr "用法：hostname\n" +msgstr "用法: hostname\n" #: programs/hostname/hostname.rc:31 msgid "Error: Invalid option '%c'.\n" -msgstr "错误：无效的选项 '%c'。\n" +msgstr "错误: 无效的选项 '%c'。\n" #: programs/hostname/hostname.rc:32 msgid "Error: Could not get hostname: %u.\n" -msgstr "错误：无法获取主机名：%u。\n" +msgstr "错误: 无法获取主机名: %u。\n" #: programs/hostname/hostname.rc:33 msgid "" @@ -14335,7 +14136,7 @@ msgstr "错误: 无法使用 hostname 工具设置系统的主机名。\n" #: programs/ipconfig/ipconfig.rc:30 msgid "Usage: ipconfig [ /? | /all ]\n" -msgstr "用法：ipconfig [ /? | /all ]\n" +msgstr "用法: ipconfig [ /? | /all ]\n" #: programs/ipconfig/ipconfig.rc:31 msgid "Error: Unknown or invalid command line parameters specified\n" @@ -14403,7 +14204,7 @@ msgstr "IPv6 地址" #: programs/ipconfig/ipconfig.rc:38 msgid "Primary DNS suffix" -msgstr "" +msgstr "主 DNS 后缀" #: programs/msinfo32/msinfo32.rc:28 msgid "System Information" @@ -14419,7 +14220,7 @@ msgid "" "\n" "Where 'command' is one of HELP, START, STOP or USE.\n" msgstr "" -"本命令格式为：\n" +"本命令格式为:\n" "\n" "NET 命令 [参数]\n" " -或-\n" @@ -14436,7 +14237,7 @@ msgid "" "Displays the list of running services if 'service' is omitted. Otherwise " "'service' is the name of the service to start.\n" msgstr "" -"本命令格式为：\n" +"本命令格式为:\n" "\n" "NET START [服务]\n" "\n" @@ -14451,7 +14252,7 @@ msgid "" "\n" "Where 'service' is the name of the service to stop.\n" msgstr "" -"本命令的格式为：\n" +"本命令的格式为:\n" "\n" "NET STOP 服务\n" "\n" @@ -14459,7 +14260,7 @@ msgstr "" #: programs/net/net.rc:33 msgid "Stopping dependent service: %1\n" -msgstr "正在停止依赖的服务： %1\n" +msgstr "正在停止依赖的服务: %1\n" #: programs/net/net.rc:34 msgid "Could not stop service %1\n" @@ -14513,7 +14314,7 @@ msgstr "" #: programs/net/net.rc:46 msgid "%1 %2 %3 Open resources: %4!u!\n" -msgstr "%1 %2 %3 打开资源：%4!u!\n" +msgstr "%1 %2 %3 打开资源: %4!u!\n" #: programs/net/net.rc:48 msgid "Paused" @@ -14537,7 +14338,7 @@ msgstr "正在重新连接" #: programs/net/net.rc:43 msgid "The following services are running:\n" -msgstr "下列服务正在运行：\n" +msgstr "下列服务正在运行:\n" #: programs/netstat/netstat.rc:30 msgid "Active Connections" @@ -14737,11 +14538,11 @@ msgstr "页面设置" #: programs/notepad/notepad.rc:102 msgid "&Header:" -msgstr "页眉(&H)：" +msgstr "页眉(&H):" #: programs/notepad/notepad.rc:104 msgid "&Footer:" -msgstr "页脚(&F)：" +msgstr "页脚(&F):" #: programs/notepad/notepad.rc:107 msgid "Margins (millimeters)" @@ -14749,15 +14550,15 @@ msgstr "边距(毫米)" #: programs/notepad/notepad.rc:108 msgid "&Left:" -msgstr "左(&L)：" +msgstr "左(&L):" #: programs/notepad/notepad.rc:110 msgid "&Top:" -msgstr "上(&T)：" +msgstr "上(&T):" #: programs/notepad/notepad.rc:126 msgid "Encoding:" -msgstr "编码：" +msgstr "编码:" #: programs/notepad/notepad.rc:132 programs/wordpad/wordpad.rc:289 msgctxt "accelerator Select All" @@ -14831,7 +14632,7 @@ msgstr "错误" #: programs/notepad/notepad.rc:74 msgid "Untitled" -msgstr "（未命名）" +msgstr "(未命名)" #: programs/notepad/notepad.rc:77 programs/winedbg/winedbg.rc:42 msgid "Text files (*.txt)" @@ -14845,7 +14646,7 @@ msgid "" msgstr "" "文件“%s”不存在。\n" "\n" -"您想新建一个文件吗？" +"您想新建一个文件吗?" #: programs/notepad/notepad.rc:82 msgid "" @@ -14855,7 +14656,7 @@ msgid "" msgstr "" "文件“%s”已更改。\n" "\n" -"是否保存更改？" +"您要保存更改吗?" #: programs/notepad/notepad.rc:83 msgid "'%s' could not be found." @@ -14885,7 +14686,7 @@ msgstr "" "%1\n" "此文件包含 Unicode 字符。如果用 %2 编码保存，这些字符将会丢失。\n" "要保留这些字符，请点“取消”，然后选择一种 Unicode 编码。\n" -"要继续吗？" +"要继续吗?" #: programs/oleview/oleview.rc:32 msgid "&Bind to file..." @@ -14990,7 +14791,7 @@ msgstr "连接到另外一台计算机" #: programs/oleview/oleview.rc:159 msgid "&Machine name:" -msgstr "计算机名称(&M)：" +msgstr "计算机名称(&M):" #: programs/oleview/oleview.rc:167 msgid "System Configuration" @@ -15038,7 +14839,7 @@ msgstr "IPersist 接口查看器" #: programs/oleview/oleview.rc:196 programs/oleview/oleview.rc:208 msgid "Class Name:" -msgstr "类名：" +msgstr "类名:" #: programs/oleview/oleview.rc:198 programs/oleview/oleview.rc:210 msgid "CLSID:" @@ -15305,15 +15106,15 @@ msgstr "移动程序" #: programs/progman/progman.rc:118 msgid "Move program:" -msgstr "移动程序：" +msgstr "移动程序:" #: programs/progman/progman.rc:120 programs/progman/progman.rc:138 msgid "From group:" -msgstr "从此程序组中：" +msgstr "从此程序组中:" #: programs/progman/progman.rc:122 programs/progman/progman.rc:140 msgid "&To group:" -msgstr "移动到程序组(&T)：" +msgstr "移动到程序组(&T):" #: programs/progman/progman.rc:134 msgid "Copy Program" @@ -15321,7 +15122,7 @@ msgstr "复制程序" #: programs/progman/progman.rc:136 msgid "Copy program:" -msgstr "复制程序：" +msgstr "复制程序:" #: programs/progman/progman.rc:152 msgid "Program Group Attributes" @@ -15329,7 +15130,7 @@ msgstr "程序组属性" #: programs/progman/progman.rc:156 msgid "&Group file:" -msgstr "组文件(&G)：" +msgstr "组文件(&G):" #: programs/progman/progman.rc:168 msgid "Program Attributes" @@ -15337,15 +15138,15 @@ msgstr "程序属性" #: programs/progman/progman.rc:172 programs/progman/progman.rc:212 msgid "&Command line:" -msgstr "命令行(&C)：" +msgstr "命令行(&C):" #: programs/progman/progman.rc:174 msgid "&Working directory:" -msgstr "工作目录(&W)：" +msgstr "工作目录(&W):" #: programs/progman/progman.rc:176 msgid "&Key combination:" -msgstr "快捷键(&K)：" +msgstr "快捷键(&K):" #: programs/progman/progman.rc:179 programs/progman/progman.rc:215 msgid "&Minimize at launch" @@ -15361,11 +15162,11 @@ msgstr "修改图标" #: programs/progman/progman.rc:194 msgid "&Filename:" -msgstr "文件名(&F)：" +msgstr "文件名(&F):" #: programs/progman/progman.rc:196 msgid "Current &icon:" -msgstr "当前图标(&I)：" +msgstr "当前图标(&I):" #: programs/progman/progman.rc:210 msgid "Execute Program" @@ -15385,11 +15186,11 @@ msgstr "信息" #: programs/progman/progman.rc:68 msgid "Delete group `%s'?" -msgstr "是否删除程序组 “%s”？" +msgstr "是否删除程序组“%s”?" #: programs/progman/progman.rc:69 msgid "Delete program `%s'?" -msgstr "是否删除程序组 “%s”?" +msgstr "是否删除程序组“%s”?" #: programs/progman/progman.rc:70 msgid "Not implemented" @@ -15408,8 +15209,8 @@ msgid "" "The group file `%s' cannot be opened.\n" "Should it be tried further on?" msgstr "" -"不能打开组文件 “%s” 。\n" -"是否继续尝试？" +"不能打开组文件“%s”。\n" +"是否继续尝试?" #: programs/progman/progman.rc:77 msgid "Help not available." @@ -15448,37 +15249,24 @@ msgid "Type \"REG %1 /?\" for help.\n" msgstr "输入“REG %1 /?”以获取帮助。\n" #: programs/reg/reg.rc:181 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to access or create the specified registry key\n" -msgstr "reg：系统无法找到指定的注册表键或值\n" +msgstr "reg: 无法访问或新建所指定的注册表项\n" #: programs/reg/reg.rc:116 -#, fuzzy -#| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "操作完成\n" +msgstr "reg: 操作成功完成\n" #: programs/reg/reg.rc:131 -#, fuzzy -#| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" -msgstr "注册表操作已经取消\n" +msgstr "reg: 注册表操作已被取消\n" #: programs/reg/reg.rc:174 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "reg：系统无法找到指定的注册表键或值\n" +msgstr "reg: 找不到所指定的注册表项\n" #: programs/reg/reg.rc:120 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "reg：系统无法找到指定的注册表键或值\n" +msgstr "reg: 找不到所指定的注册表值\n" #: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -15489,17 +15277,6 @@ msgid "Type \"REG /?\" for help.\n" msgstr "输入“REG /?”以获取帮助。\n" #: programs/reg/reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | EXPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -15511,13 +15288,13 @@ msgid "" " REG [operation] /?\n" "\n" msgstr "" -"用法：\n" +"用法:\n" " REG [操作] [参数]\n" "\n" -"支持的操作：\n" -" ADD | DELETE | IMPORT | EXPORT | QUERY\n" +"支持的操作:\n" +" ADD | COPY | DELETE | EXPORT | IMPORT | QUERY\n" "\n" -"要获取指定操作的帮助，请输入：\n" +"要获取指定操作的帮助，请输入:\n" " REG [操作] /?\n" "\n" @@ -15686,6 +15463,13 @@ msgid "" " The name and path of the registry file to import.\n" "\n" msgstr "" +"REG IMPORT <文件>\n" +"\n" +" 从所指定的文件导入注册表项、值或数据到注册表。\n" +"\n" +" <文件>\n" +" 要导入的注册表文件的名称或路径。\n" +"\n" #: programs/reg/reg.rc:114 msgid "" @@ -15731,40 +15515,40 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" +" /reg:32\n" +" 以 32 位视角访问注册表。\n" +"\n" +" /reg:64\n" +" 以 64 位视角访问注册表。\n" +"\n" #: programs/reg/reg.rc:117 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "reg: 无效的键名\n" +msgstr "reg: 无效的注册表项\n" #: programs/reg/reg.rc:119 msgid "reg: Unable to access remote machine\n" msgstr "reg: 无法访问远程设备\n" #: programs/reg/reg.rc:172 -#, fuzzy -#| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" -msgstr "regedit: 无效的系统键 [%1]\n" +msgstr "reg: 无效的系统项\n" #: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: 无效的选项 [%1]。" #: programs/reg/reg.rc:122 -#, fuzzy -#| msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgid "reg: The option [/d] must be followed by a valid numeric value\n" -msgstr "reg：选项 [/d] 后必须紧跟一个有效的十六进制值\n" +msgstr "reg: 选项 [/d] 后必须紧跟一个有效的数字值\n" #: programs/reg/reg.rc:123 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" -msgstr "reg：选项 [/d] 后必须紧跟一个有效的十六进制值\n" +msgstr "reg: 选项 [/d] 后必须紧跟一个有效的十六进制值\n" #: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "reg：选项 [/d] 后必须紧跟一个有效的字符串\n" +msgstr "reg: 选项 [/d] 后必须紧跟一个有效的字符串\n" #: programs/reg/reg.rc:124 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" @@ -15784,33 +15568,29 @@ msgstr "reg: 无效的命令行参数\n" #: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" -msgstr "" +msgstr "reg: 源注册表项和目标项不能相同\n" #: programs/reg/reg.rc:205 -#, fuzzy -#| msgid "The file '%1' already exists. Do you want to overwrite it?" msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" -msgstr "文件 '%1' 已存在。您想要覆盖它吗?" +msgstr "值“%1\\%2”已经存在于目标项中。您真的要覆盖它吗?" #: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "您真的要删除注册表键值 '%1' 吗?" +msgstr "您真的要删除注册表值“%1”吗?" #: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "您真的要删除 '%1' 下的所有注册表键值吗?" +msgstr "您真的要删除“%1”下的所有注册表值吗?" #: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "您真的要删除注册表键 '%1' 吗?" +msgstr "您真的要删除注册表项“%1”吗?" #: programs/reg/reg.rc:137 -#, fuzzy -#| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" -msgstr "regedit：无法删除注册表键“%1”。\n" +msgstr "reg: 无法删除“%1”下所有的注册表值\n" #: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" @@ -15821,10 +15601,8 @@ msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: 无法识别的转义序列 [\\%1!c!]\n" #: programs/reg/reg.rc:175 -#, fuzzy -#| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "reg: 无法打开注册表键 '%1'。\n" +msgstr "reg: 无法导入注册表项“%1”\n" #: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" @@ -15853,7 +15631,7 @@ msgstr "导出注册表文件(&E)..." #: programs/regedit/regedit.rc:47 programs/regedit/regedit.rc:99 #: programs/regedit/regedit.rc:121 msgid "&Key" -msgstr "键(&K)" +msgstr "项(&K)" #: programs/regedit/regedit.rc:49 programs/regedit/regedit.rc:101 #: programs/regedit/regedit.rc:123 @@ -15887,7 +15665,7 @@ msgstr "改名(&R)\tF2" #: programs/regedit/regedit.rc:59 programs/regedit/regedit.rc:114 msgid "&Copy Key Name" -msgstr "复制键名(&C)" +msgstr "复制项名(&C)" #: programs/regedit/regedit.rc:61 programs/regedit/regedit.rc:107 #: programs/wordpad/wordpad.rc:53 @@ -15929,19 +15707,19 @@ msgstr "导出注册表" #: programs/regedit/regedit.rc:269 msgid "S&elected branch:" -msgstr "指定分支(&E)：" +msgstr "指定分支(&E):" #: programs/regedit/regedit.rc:278 msgid "Find:" -msgstr "查找：" +msgstr "查找:" #: programs/regedit/regedit.rc:280 msgid "Find in:" -msgstr "查找范围：" +msgstr "查找范围:" #: programs/regedit/regedit.rc:281 msgid "Keys" -msgstr "键" +msgstr "项" #: programs/regedit/regedit.rc:282 msgid "Value names" @@ -15961,7 +15739,7 @@ msgstr "添加收藏" #: programs/regedit/regedit.rc:294 programs/regedit/regedit.rc:305 msgid "Name:" -msgstr "名称：" +msgstr "名称:" #: programs/regedit/regedit.rc:302 msgid "Remove Favorite" @@ -15974,12 +15752,12 @@ msgstr "编辑字符串" #: programs/regedit/regedit.rc:316 programs/regedit/regedit.rc:329 #: programs/regedit/regedit.rc:345 programs/regedit/regedit.rc:358 msgid "Value name:" -msgstr "值名称：" +msgstr "值名称:" #: programs/regedit/regedit.rc:318 programs/regedit/regedit.rc:331 #: programs/regedit/regedit.rc:347 programs/regedit/regedit.rc:360 msgid "Value data:" -msgstr "值数据：" +msgstr "值数据:" #: programs/regedit/regedit.rc:326 msgid "Edit DWORD" @@ -16007,19 +15785,19 @@ msgstr "编辑多个字符串" #: programs/regedit/regedit.rc:159 msgid "Contains commands for working with the whole registry" -msgstr "操作整个注册表的命令" +msgstr "包含用于操作整个注册表的命令" #: programs/regedit/regedit.rc:160 msgid "Contains commands for editing values or keys" -msgstr "编辑键和值的命令" +msgstr "包含用于编辑项或值的命令" #: programs/regedit/regedit.rc:161 msgid "Contains commands for customizing the registry window" -msgstr "操作窗口显示的命令" +msgstr "包含用于自定义注册表窗口的命令" #: programs/regedit/regedit.rc:162 msgid "Contains commands for accessing frequently used keys" -msgstr "用于记录常用键的全部命令" +msgstr "包含用于访问常用项的命令" #: programs/regedit/regedit.rc:163 msgid "" @@ -16028,7 +15806,7 @@ msgstr "包含用于显示注册表编辑器帮助及相关信息的命令" #: programs/regedit/regedit.rc:164 msgid "Contains commands for creating new keys or values" -msgstr "创建新键或值的命令" +msgstr "包含用于新建项或值的命令" #: programs/regedit/regedit.rc:149 msgid "Data" @@ -16068,7 +15846,7 @@ msgstr "无法修改所选注册表值。" #: programs/regedit/regedit.rc:248 msgid "Unable to create a new registry key." -msgstr "无法创建新注册表键。" +msgstr "无法创建新注册表项。" #: programs/regedit/regedit.rc:249 msgid "Unable to create a new registry value." @@ -16079,8 +15857,8 @@ msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" -"无法重命名键 '%1'。\n" -"该键名已存在。" +"无法重命名项“%1”。\n" +"该项名已存在。" #: programs/regedit/regedit.rc:251 msgid "" @@ -16092,20 +15870,20 @@ msgstr "" #: programs/regedit/regedit.rc:252 msgid "Unable to delete the selected registry key." -msgstr "无法删除所选注册表键。" +msgstr "无法删除所选的注册表项。" #: programs/regedit/regedit.rc:253 msgid "Unable to rename the selected registry key." -msgstr "无法重命名所选注册表键。" +msgstr "无法重命名所选的注册表项。" #: programs/regedit/regedit.rc:254 msgid "Unable to rename the selected registry value." -msgstr "无法重命名所选注册表值。" +msgstr "无法重命名所选的注册表项。" #: programs/regedit/regedit.rc:255 msgid "" "The keys and values contained in %1 were successfully added to the registry." -msgstr "%1 所包含的键和值已被成功添加到注册表中。" +msgstr "%1 所包含的项和值已被成功添加到注册表中。" #: programs/regedit/regedit.rc:256 msgid "Unable to import %1. The specified file is not a valid registry file." @@ -16141,34 +15919,34 @@ msgid "" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" " regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" msgstr "" -"用法：\n" -" regedit [选项] [文件名] [注册表键]\n" +"用法:\n" +" regedit [选项] [文件名] [注册表项]\n" "\n" -"选项：\n" -" [无选项]\t\t启动该程序的图形界面。\n" -" /L:system.dat\t要修改的 system.dat 文件的位置。\n" -"\t\t\t与其他任意开关兼容。该选项将被忽略。\n" -" /R:user.dat\t\t要修改的 user.dat 文件的位置。\n" -"\t\t\t与其他任意开关兼容。该选项将被忽略。\n" -" /C\t\t\t导入注册表文件的内容。\n" -" /D\t\t\t删除指定的注册表键。\n" -" /E\t\t\t将指定注册表键的内容导出到文件。\n" -"\t\t\t如未指定任何键，将导出整份注册表。\n" -" /S\t\t\t静默模式。不显示任何消息。\n" -" /V\t\t\t使用高级模式启动图形界面。该选项将被忽略。\n" -" /?\t\t\t显示此信息并退出。\n" -" [文件名]\t\t要导入的注册表信息文件的位置。和 [/E] 一同使用时，\n" -"\t\t\t该选项将转而指定用于导出注册表信息的文件的位置。\n" -" [注册表键]\t\t要更改的注册表键。\n" +"选项:\n" +" [无选项] 启动该程序的图形界面。\n" +" /L:system.dat 要修改的 system.dat 文件的位置。\n" +" 与其他任意开关兼容。该选项将被忽略。\n" +" /R:user.dat 要修改的 user.dat 文件的位置。\n" +" 与其他任意开关兼容。该选项将被忽略。\n" +" /C 导入注册表文件的内容。\n" +" /D 删除指定的注册表项。\n" +" /E 将指定注册表项的内容导出到文件。\n" +" 如未指定任何项，将导出整份注册表。\n" +" /S 静默模式。不显示任何消息。\n" +" /V 使用高级模式启动图形界面。该选项将被忽略。\n" +" /? 显示此信息并退出。\n" +" [文件名] 要导入的注册表信息文件的位置。和 [/E] 一同使用时，\n" +" 该选项将转而指定用于导出注册表信息的文件的位置。" +" [注册表项] 要更改的注册表项。\n" "\n" -"用例：\n" +"用例:\n" " regedit \"import.reg\"\n" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" #: programs/regedit/regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "regedit：无效或无法识别的开关 [%1]\n" +msgstr "regedit: 无效或无法识别的开关 [%1]\n" #: programs/regedit/regedit.rc:410 msgid "Type \"regedit /?\" for help.\n" @@ -16180,7 +15958,7 @@ msgstr "regedit: 没有指定文件名。\n" #: programs/regedit/regedit.rc:412 msgid "regedit: No registry key was specified for removal.\n" -msgstr "regedit：未指定任何要移除的注册表键。\n" +msgstr "regedit: 未指定任何要移除的注册表项。\n" #: programs/regedit/regedit.rc:413 msgid "regedit: The file '%1' was not found.\n" @@ -16230,7 +16008,7 @@ msgstr "regedit: 无法向 '%2' 添加注册表值 '%1'。\n" #: programs/regedit/regedit.rc:424 msgid "regedit: Unable to open the registry key '%1'.\n" -msgstr "regedit: 无法打开注册表键 '%1'。\n" +msgstr "regedit: 无法打开注册表项“%1”。\n" #: programs/regedit/regedit.rc:425 msgid "" @@ -16243,16 +16021,16 @@ msgstr "regedit: 注册表值 \"%1\" 将会被导出为二进制数据。\n" #: programs/regedit/regedit.rc:427 msgid "regedit: Invalid system key [%1]\n" -msgstr "regedit: 无效的键名 [%1]\n" +msgstr "regedit: 无效的项名 [%1]\n" #: programs/regedit/regedit.rc:428 msgid "" "regedit: Unable to export '%1'. The specified registry key was not found.\n" -msgstr "regedit: 无法导出 '%1'。未找到指定的注册表键。\n" +msgstr "regedit: 无法导出“%1”。未找到指定的注册表项。\n" #: programs/regedit/regedit.rc:429 msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "regedit：无法删除注册表键“%1”。\n" +msgstr "regedit: 无法删除注册表项“%1”。\n" #: programs/regedit/regedit.rc:431 msgid "regedit: The line contains invalid syntax.\n" @@ -16264,11 +16042,11 @@ msgstr "退出注册表编辑器" #: programs/regedit/regedit.rc:188 msgid "Adds keys to the favorites list" -msgstr "把键添加到收藏夹" +msgstr "把项添加到收藏夹列表中" #: programs/regedit/regedit.rc:189 msgid "Removes keys from the favorites list" -msgstr "从收藏夹中删除键" +msgstr "从收藏夹列表中删除项" #: programs/regedit/regedit.rc:190 msgid "Shows or hides the status bar" @@ -16292,11 +16070,11 @@ msgstr "选定项更名" #: programs/regedit/regedit.rc:195 msgid "Copies the name of the selected key to the clipboard" -msgstr "把键的名称复制到剪贴板" +msgstr "把所选项的名称复制到剪贴板" #: programs/regedit/regedit.rc:196 msgid "Finds a text string in a key, value or data" -msgstr "在键、值或数据中找字符串" +msgstr "在项、值或数据中查找字符串" #: programs/regedit/regedit.rc:197 msgid "Finds next occurrence of text specified in previous search" @@ -16308,7 +16086,7 @@ msgstr "修改值的数据" #: programs/regedit/regedit.rc:171 msgid "Adds a new key" -msgstr "添加新键" +msgstr "添加新项" #: programs/regedit/regedit.rc:172 msgid "Adds a new string value" @@ -16348,7 +16126,7 @@ msgstr "无法打开注册表值 '%1'。" #: programs/regedit/regedit.rc:207 msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "无法编辑该类型的键 (%1!u!)。" +msgstr "无法编辑该类型的项 (%1!u!)。" #: programs/regedit/regedit.rc:208 msgid "The value is too big (%1!u!)." @@ -16360,7 +16138,7 @@ msgstr "确认删除值" #: programs/regedit/regedit.rc:210 msgid "Are you sure you want to delete the selected registry value?" -msgstr "您真的要删除选中的注册表键值吗?" +msgstr "您真的要删除选中的注册表值吗?" #: programs/regedit/regedit.rc:216 msgid "Search complete. The string '%1' was not found." @@ -16372,7 +16150,7 @@ msgstr "您确认要删除这些值吗?" #: programs/regedit/regedit.rc:214 msgid "New Key #%d" -msgstr "新键 #%d" +msgstr "新项 #%d" #: programs/regedit/regedit.rc:215 msgid "New Value #%d" @@ -16380,7 +16158,7 @@ msgstr "新值 #%d" #: programs/regedit/regedit.rc:205 msgid "Unable to query the registry key '%1'." -msgstr "无法打开注册表键 '%1'。" +msgstr "无法打开注册表项“%1”。" #: programs/regedit/regedit.rc:170 msgid "Modifies the value's data in binary form" @@ -16400,12 +16178,12 @@ msgstr "添加新可扩展字串值" #: programs/regedit/regedit.rc:212 msgid "Confirm Key Delete" -msgstr "确认删除键" +msgstr "确认删除项" #: programs/regedit/regedit.rc:213 msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "您真的要删除该注册表键及其包含的所有子键吗?" +msgstr "您真的要删除该注册表项及其包含的所有子项吗?" #: programs/regedit/regedit.rc:199 msgid "Expands or collapses the selected node" @@ -16498,37 +16276,6 @@ msgid "regsvr32: Successfully uninstalled DLL '%1'\n" msgstr "regsvr32: 成功卸载 DLL \"%1\"\n" #: programs/start/start.rc:57 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files\n" -#| "with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with " -#| "its\n" -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows\n" -#| "Explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -16559,30 +16306,31 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" -"启动程序，或用一般用于带有某个后缀的程序打开文档。\n" -"用法：\n" +"用于运行程序，或根据文档的后缀，使用一般用于打开此类文档的程序打开文档。\n" +"用法:\n" "start [选项] 程序文件名 [...]\n" "start [选项] 文档文件名\n" "\n" -"选项：\n" -"“标题”\t设置子窗口的标题。\n" -"/d 目录\t在指定目录启动程序。\n" -"/b\t\t不要为程序创建新控制台。\n" -"/i\t\t使用新环境启动程序。\n" -"/min\t\t最小化启动程序。\n" -"/max\t\t最大化启动程序。\n" -"/low\t\t使用 idle 优先级类启动程序。\n" -"/normal\t\t使用 normal 优先级类启动程序。\n" -"/high\t\t使用 high 优先级类启动程序。\n" -"/realtime\t使用 realtime 优先级类启动程序。\n" -"/abovenormal\t使用 abovenormal 优先级类启动程序。\n" -"/belownormal\t使用 belownormal 优先级类启动程序。\n" -"/n\t\t在指定 NUMA 节点启动程序。\n" -"/affinity 掩码\t使用指定关联性掩码启动程序。\n" -"/wait\t\t等待启动了的程序完成操作后使用其退出代码退出。\n" -"/unix\t\t使用 Unix 文件名并像 Windows 资源管理器一样启动文件。\n" -"/ProgIDOpen\t使用指定 progID 打开文档。\n" -"/?\t\t显示此帮助并退出。\n" +"选项:\n" +"\"标题\" 指定子窗口的标题。\n" +"/d 目录在指定的目录中运行程序。\n" +"/b 不要为程序新建终端。\n" +"/i 使用新的环境变量运行程序。\n" +"/min 以最小化模式运行程序。\n" +"/max 以最大化模式运行程序。\n" +"/low 以 idle 优先级运行程序。\n" +"/normal 以 normal 优先级运行程序。\n" +"/high 以 high 优先级运行程序。\n" +"/realtime 以 realtime 优先级运行程序。\n" +"/abovenormal 以 abovenormal 优先级运行程序。\n" +"/belownormal 以 belownormal 优先级运行程序。\n" +"/node n 在指定的 NUMA 节点中运行程序。\n" +"/affinity 掩码以指定的关联掩码运行程序。\n" +"/wait 等待运行的程序结束，并以它的返回值退出。\n" +"/unix 使用 Unix 文件名并像 Windows 文件管理器一样打开该文件。\n" +"/exec 执行所指定的文件 (在 Wine 内部使用)。\n" +"/ProgIDOpen 以所指定的 progID 打开文档。\n" +"/? 显示此帮助并退出。\n" #: programs/start/start.rc:59 msgid "" @@ -16599,27 +16347,27 @@ msgstr "无法将指定 Unix 文件名转换为 DOS 文件名。" #: programs/taskkill/taskkill.rc:30 msgid "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n" -msgstr "用法：taskkill [/?] [/f] [/im 进程名 | /pid 进程ID]\n" +msgstr "用法: taskkill [/?] [/f] [/im 进程名 | /pid 进程ID]\n" #: programs/taskkill/taskkill.rc:31 msgid "Error: Unknown or invalid command line option specified.\n" -msgstr "错误：指定的命令行选项未知或无效。\n" +msgstr "错误: 指定的命令行选项未知或无效。\n" #: programs/taskkill/taskkill.rc:32 msgid "Error: Invalid command line parameter specified.\n" -msgstr "错误：指定的命令行参数未知或无效。\n" +msgstr "错误: 指定的命令行参数未知或无效。\n" #: programs/taskkill/taskkill.rc:33 msgid "Error: One of options /im or /pid must be specified.\n" -msgstr "错误：必须指定 /im 或 /pid 选项。\n" +msgstr "错误: 必须指定 /im 或 /pid 选项。\n" #: programs/taskkill/taskkill.rc:34 msgid "Error: Option %1 expects a command line parameter.\n" -msgstr "错误：选项 %1 需要命令行参数值。\n" +msgstr "错误: 选项 %1 需要命令行参数值。\n" #: programs/taskkill/taskkill.rc:35 msgid "Error: Options /im and /pid are mutually exclusive.\n" -msgstr "错误：选项 /im 和 /pid 不能共存。\n" +msgstr "错误: 选项 /im 和 /pid 不能共存。\n" #: programs/taskkill/taskkill.rc:36 msgid "Close message sent to top-level windows of process with PID %1!u!.\n" @@ -16640,19 +16388,19 @@ msgstr "已经强行结束 PID 为 %2!u! 的进程 \"%1\"。\n" #: programs/taskkill/taskkill.rc:40 msgid "Error: Could not find process \"%1\".\n" -msgstr "错误：找不到进程 \"%1\"。\n" +msgstr "错误: 找不到进程 \"%1\"。\n" #: programs/taskkill/taskkill.rc:41 msgid "Error: Unable to enumerate the process list.\n" -msgstr "错误：无法列举进程清单。\n" +msgstr "错误: 无法列举进程清单。\n" #: programs/taskkill/taskkill.rc:42 msgid "Error: Unable to terminate process \"%1\".\n" -msgstr "错误：无法结束进程 \"%1\"。\n" +msgstr "错误: 无法结束进程 \"%1\"。\n" #: programs/taskkill/taskkill.rc:43 msgid "Error: Process self-termination is not permitted.\n" -msgstr "错误：不允许结束本进程。\n" +msgstr "错误: 不允许结束本进程。\n" #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" @@ -17386,8 +17134,8 @@ msgid "" "cause undesired results including system instability. Are you\n" "sure you want to change the priority class?" msgstr "" -"警告：改变此进程优先级可能导致意料之外的后果，例如系统不稳定。\n" -"您确定要改变优先权吗？" +"警告: 改变此进程优先级可能导致意料之外的后果，例如系统不稳定。\n" +"您确定要改变优先权吗?" #: programs/taskmgr/taskmgr.rc:305 msgid "Unable to Change Priority" @@ -17401,8 +17149,8 @@ msgid "" "data before it is terminated. Are you sure you want to\n" "terminate the process?" msgstr "" -"警告：结束此进程可能会导致意料之外的后果，例如数据丢失或者系统不稳定。此\n" -"进程可能在被结束之前来不及保存它的状态和数据。您确定要结束这个进程吗？" +"警告: 结束此进程可能会导致意料之外的后果，例如数据丢失或者系统不稳定。此\n" +"进程可能在被结束之前来不及保存它的状态和数据。您确定要结束这个进程吗?" #: programs/taskmgr/taskmgr.rc:311 msgid "Unable to Terminate Process" @@ -17413,8 +17161,8 @@ msgid "" "WARNING: Debugging this process may result in loss of data.\n" "Are you sure you wish to attach the debugger?" msgstr "" -"警告：调试此进程可能会导致数据丢失。\n" -"您确定要连接调试器吗？" +"警告: 调试此进程可能会导致数据丢失。\n" +"您确定要连接调试器吗?" #: programs/taskmgr/taskmgr.rc:314 msgid "Unable to Debug Process" @@ -17459,7 +17207,7 @@ msgid "" "Do you want to remove the uninstall entry from the registry?" msgstr "" "卸载命令 '%s' 运行失败，可能是找不到可执行程序。\n" -"您想把这项卸载条目从注册表中删除吗？" +"您想把这项卸载条目从注册表中删除吗?" #: programs/uninstaller/uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" @@ -17499,10 +17247,10 @@ msgid "" " [no option] Launch the graphical version of this program.\n" "\n" msgstr "" -"用法：\n" +"用法:\n" " uninstaller [选项]\n" "\n" -"选项：\n" +"选项:\n" "\n" " --help\t 显示本信息。\n" " --list\t 列出安装在本 Wine prefix 中的所有应用程序。\n" @@ -17566,7 +17314,7 @@ msgid "" "option) any later version." msgstr "" "本程序为自由软件，您可以遵照自由软件基金会出版的 GNU 较宽松通用公共许可证协议" -"（LGPL）来对其进行添加、修改和重新发布。许可协议版本为2.1，您也可以选择采用更" +"(LGPL) 来对其进行添加、修改和重新发布。许可协议版本为 2.1，您也可以选择采用更" "新的版本。" #: programs/winecfg/winecfg.rc:142 @@ -17575,11 +17323,11 @@ msgstr "Windows 注册信息" #: programs/winecfg/winecfg.rc:143 msgid "&Owner:" -msgstr "姓名(&O)：" +msgstr "姓名(&O):" #: programs/winecfg/winecfg.rc:145 msgid "Organi&zation:" -msgstr "组织(&Z)：" +msgstr "组织(&Z):" #: programs/winecfg/winecfg.rc:153 msgid "Application settings" @@ -17604,7 +17352,7 @@ msgstr "删除程序设置(&R)" #: programs/winecfg/winecfg.rc:160 msgid "&Windows Version:" -msgstr "&Windows 版本：" +msgstr "&Windows 版本:" #: programs/winecfg/winecfg.rc:168 msgid "Window settings" @@ -17628,7 +17376,7 @@ msgstr "虚拟桌面(&D)" #: programs/winecfg/winecfg.rc:174 msgid "Desktop &size:" -msgstr "桌面大小(&S)：" +msgstr "桌面大小(&S):" #: programs/winecfg/winecfg.rc:179 msgid "Screen resolution" @@ -17653,7 +17401,7 @@ msgstr "" #: programs/winecfg/winecfg.rc:193 msgid "&New override for library:" -msgstr "新增函数库顶替(&N)：" +msgstr "新增函数库顶替(&N):" #: programs/winecfg/winecfg.rc:195 msgid "A&dd" @@ -17661,7 +17409,7 @@ msgstr "添加(&D)" #: programs/winecfg/winecfg.rc:196 msgid "Existing &overrides:" -msgstr "已有的函数库顶替(&O)：" +msgstr "已有的函数库顶替(&O):" #: programs/winecfg/winecfg.rc:198 msgid "&Edit..." @@ -17711,7 +17459,7 @@ msgstr "添加(&D)..." #: programs/winecfg/winecfg.rc:239 msgid "&Path:" -msgstr "路径(&P)：" +msgstr "路径(&P):" #: programs/winecfg/winecfg.rc:246 programs/winecfg/winecfg.rc:37 msgid "Show Advan&ced" @@ -17719,7 +17467,7 @@ msgstr "显示高级选项(&C)" #: programs/winecfg/winecfg.rc:247 msgid "De&vice:" -msgstr "设备(&V)：" +msgstr "设备(&V):" #: programs/winecfg/winecfg.rc:249 msgid "Bro&wse..." @@ -17727,11 +17475,11 @@ msgstr "浏览(&W)..." #: programs/winecfg/winecfg.rc:251 msgid "&Label:" -msgstr "卷标(&L)：" +msgstr "卷标(&L):" #: programs/winecfg/winecfg.rc:253 msgid "S&erial:" -msgstr "序列号(&E)：" +msgstr "序列号(&E):" #: programs/winecfg/winecfg.rc:256 msgid "&Show dot files" @@ -17747,19 +17495,19 @@ msgstr "默认值" #: programs/winecfg/winecfg.rc:266 msgid "Output device:" -msgstr "输出设备：" +msgstr "输出设备:" #: programs/winecfg/winecfg.rc:267 msgid "Voice output device:" -msgstr "语音输出设备：" +msgstr "语音输出设备:" #: programs/winecfg/winecfg.rc:268 msgid "Input device:" -msgstr "输入设备：" +msgstr "输入设备:" #: programs/winecfg/winecfg.rc:269 msgid "Voice input device:" -msgstr "语音输入设备：" +msgstr "语音输入设备:" #: programs/winecfg/winecfg.rc:274 msgid "&Test Sound" @@ -17771,7 +17519,7 @@ msgstr "扬声器设置" #: programs/winecfg/winecfg.rc:278 msgid "Speakers:" -msgstr "扬声器：" +msgstr "扬声器:" #: programs/winecfg/winecfg.rc:286 msgid "Appearance" @@ -17779,7 +17527,7 @@ msgstr "外观" #: programs/winecfg/winecfg.rc:287 msgid "&Theme:" -msgstr "主题(&T)：" +msgstr "主题(&T):" #: programs/winecfg/winecfg.rc:289 msgid "&Install theme..." @@ -17787,11 +17535,11 @@ msgstr "安装主题(&I)..." #: programs/winecfg/winecfg.rc:294 msgid "It&em:" -msgstr "物件(&E)：" +msgstr "物件(&E):" #: programs/winecfg/winecfg.rc:296 msgid "C&olor:" -msgstr "颜色(&O)：" +msgstr "颜色(&O):" #: programs/winecfg/winecfg.rc:302 msgid "MIME types" @@ -17807,7 +17555,7 @@ msgstr "文件夹" #: programs/winecfg/winecfg.rc:309 msgid "&Link to:" -msgstr "映射至(&L)：" +msgstr "映射至(&L):" #: programs/winecfg/winecfg.rc:33 msgid "Libraries" @@ -17827,7 +17575,7 @@ msgstr "隐藏高级选项(&C)" #: programs/winecfg/winecfg.rc:38 msgid "(No Theme)" -msgstr "（无主题）" +msgstr "(无主题)" #: programs/winecfg/winecfg.rc:39 msgid "Graphics" @@ -17867,11 +17615,11 @@ msgstr "映射至" #: programs/winecfg/winecfg.rc:44 msgid "Wine configuration for %s" -msgstr "Wine 设置：针对 %s" +msgstr "针对 %s 的 Wine 设置" #: programs/winecfg/winecfg.rc:83 msgid "Selected driver: %s" -msgstr "选中的驱动：%s" +msgstr "选中的驱动: %s" #: programs/winecfg/winecfg.rc:84 msgid "(None)" @@ -17879,7 +17627,7 @@ msgstr "(无)" #: programs/winecfg/winecfg.rc:85 msgid "Audio test failed!" -msgstr "音频测试失败！" +msgstr "音频测试失败!" #: programs/winecfg/winecfg.rc:87 msgid "(System default)" @@ -17907,11 +17655,11 @@ msgid "" "Are you sure you want to do this?" msgstr "" "不建议对这个函数库更改载入顺序。\n" -"你确定要如此吗？" +"您确定要如此吗?" #: programs/winecfg/winecfg.rc:54 msgid "Warning: system library" -msgstr "警告：系统函数库" +msgstr "警告: 系统函数库" #: programs/winecfg/winecfg.rc:55 msgid "native" @@ -17990,10 +17738,10 @@ msgid "" "Most Windows applications expect drive C to exist, and will die messily if " "it doesn't. If you proceed, remember to recreate it!" msgstr "" -"你确定要删除 C 盘吗？\n" +"您确定要删除 C 盘吗?\n" "\n" "大部分 Windows 程序都假定 C 盘存在，如找不到 C 盘可能会导致严重错误。如果要继" -"续，请重新建立此盘！" +"续，请重新建立此盘!" #: programs/winecfg/winecfg.rc:76 msgctxt "Drive letter" @@ -18010,9 +17758,9 @@ msgid "" "\n" "Remember to click 'Add' in the Drives tab to create one!\n" msgstr "" -"你没有 C 盘。这可不是件好事。\n" +"您没有 C 盘。这可不是件好事。\n" "\n" -"请记得点选“驱动器”标签的“添加”来建立它！\n" +"请记得点选“驱动器”标签的“添加”来建立它!\n" #: programs/winecfg/winecfg.rc:98 msgid "Controls Background" @@ -18162,7 +17910,7 @@ msgid "" "may want to check the <a href=\"https://appdb.winehq.org\">Application " "Database</a> for tips about running this application." msgstr "" -"这可能是由程序的问题或者 Wine 的缺陷造成的。你可能需要查看 <a href=\"https://" +"这可能是由程序的问题或者 Wine 的缺陷造成的。您可能需要查看 <a href=\"https://" "appdb.winehq.org\">Application Databa</a> 来获取运行该应用的相关技巧。" #: programs/winedbg/winedbg.rc:62 @@ -18192,7 +17940,7 @@ msgstr "您系统中的一个程序崩溃了，但是 WineDbg 无法挂载到进 #: programs/winedbg/winedbg.rc:41 msgid "(unidentified)" -msgstr "（未被识别的）" +msgstr "(未被识别的)" #: programs/winedbg/winedbg.rc:44 msgid "Saving failed" @@ -18316,19 +18064,19 @@ msgstr "显示隐藏文件/系统文件(&S)" #: programs/winefile/winefile.rc:159 msgid "&File Name:" -msgstr "文件名(&F)：" +msgstr "文件名(&F):" #: programs/winefile/winefile.rc:161 msgid "Full &Path:" -msgstr "完整路径(&P)：" +msgstr "完整路径(&P):" #: programs/winefile/winefile.rc:163 msgid "Last Change:" -msgstr "最后更改：" +msgstr "最后更改:" #: programs/winefile/winefile.rc:167 msgid "Cop&yright:" -msgstr "版权(&Y)：" +msgstr "版权(&Y):" #: programs/winefile/winefile.rc:175 msgid "&System" @@ -18449,11 +18197,11 @@ msgstr "重置结果" #: programs/winemine/winemine.rc:80 msgid "Congratulations!" -msgstr "祝贺！" +msgstr "祝贺!" #: programs/winemine/winemine.rc:82 msgid "Please enter your name" -msgstr "请输入你的名字" +msgstr "请输入您的名字" #: programs/winemine/winemine.rc:90 msgid "Custom Game" @@ -18473,7 +18221,7 @@ msgstr "地雷" #: programs/winemine/winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "所有结果都将丢失。您确定吗？" +msgstr "所有结果都将丢失。您确定吗?" #: programs/winemine/winemine.rc:30 msgid "WineMine" @@ -18565,7 +18313,7 @@ msgstr "帮助文件 (*.hlp)" #: programs/winhlp32/winhlp32.rc:92 msgid "Cannot find '%s'. Do you want to find this file yourself?" -msgstr "找不到文件“%s”。你想要自己找这个文件吗？" +msgstr "找不到文件“%s”。您想要自己找这个文件吗?" #: programs/winhlp32/winhlp32.rc:93 msgid "Cannot find a richedit implementation... Aborting" @@ -18573,23 +18321,23 @@ msgstr "找不到 richedit 的实现……终止" #: programs/winhlp32/winhlp32.rc:94 msgid "Help topics: " -msgstr "帮助主题：" +msgstr "帮助主题: " #: programs/wmic/wmic.rc:28 msgid "Error: Command line not supported\n" -msgstr "错误：不支持此命令行\n" +msgstr "错误: 不支持此命令行\n" #: programs/wmic/wmic.rc:29 msgid "Error: Alias not found\n" -msgstr "错误：找不到该别名\n" +msgstr "错误: 找不到该别名\n" #: programs/wmic/wmic.rc:30 msgid "Error: Invalid query\n" -msgstr "错误：无效查询\n" +msgstr "错误: 无效查询\n" #: programs/wmic/wmic.rc:31 msgid "Error: Invalid syntax for PATH\n" -msgstr "错误：PATH 语法无效\n" +msgstr "错误: PATH 语法无效\n" #: programs/wordpad/wordpad.rc:31 msgid "&New...\tCtrl+N" @@ -18927,7 +18675,7 @@ msgstr "文档" #: programs/wordpad/wordpad.rc:192 msgid "Save changes to '%s'?" -msgstr "要保存“%s”吗？" +msgstr "要保存“%s”吗?" #: programs/wordpad/wordpad.rc:193 msgid "Finished searching the document." @@ -18941,7 +18689,7 @@ msgstr "RichEdit 装载失败。" msgid "" "You have chosen to save in plain text format, which will cause all " "formatting to be lost. Are you sure that you wish to do this?" -msgstr "你已经选择保存为文本文件，而这可能导致格式丢失。你确定要这么做吗？" +msgstr "您已经选择保存为文本文件，而这可能导致格式丢失。您确定要这么做吗?" #: programs/wordpad/wordpad.rc:198 msgid "Invalid number format." @@ -18957,7 +18705,7 @@ msgstr "不能保存文件。" #: programs/wordpad/wordpad.rc:201 msgid "You do not have access to save the file." -msgstr "你没有保存文件的权限。" +msgstr "您没有保存文件的权限。" #: programs/wordpad/wordpad.rc:202 msgid "Could not open the file." @@ -18965,7 +18713,7 @@ msgstr "不能打开文件。" #: programs/wordpad/wordpad.rc:203 msgid "You do not have access to open the file." -msgstr "你没有打开文件的权限。" +msgstr "您没有打开文件的权限。" #: programs/wordpad/wordpad.rc:204 msgid "Printing not implemented." @@ -19006,16 +18754,16 @@ msgid "" "(F - File, D - Directory)\n" msgstr "" "%1 是一个在目标路径上的\n" -"文件名还是目录？\n" +"文件名还是目录?\n" "(F - 文件，D - 目录)\n" #: programs/xcopy/xcopy.rc:38 msgid "%1? (Yes|No)\n" -msgstr "%1？(是(Y)|否(N))\n" +msgstr "%1? (是(Y)|否(N))\n" #: programs/xcopy/xcopy.rc:39 msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "是否覆盖 %1？(是(Y)|否(N)|全部(A))\n" +msgstr "是否覆盖 %1? (是(Y)|否(N)|全部(A))\n" #: programs/xcopy/xcopy.rc:40 msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" @@ -19073,11 +18821,11 @@ msgid "" msgstr "" "XCOPY - 将源文件或目录拷贝到目标位置。\n" "\n" -"语法：\n" +"语法:\n" "XCOPY 源 [目标] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] [/R] [/H]\n" "\t [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n" "\n" -"说明：\n" +"说明:\n" "[/I] 如果目标位置不存在，并且操作会拷贝两个或更多的文件，就假设目标\n" "\t是目录。\n" "[/S] 拷贝目录和子目录。\n" -- 2.34.1

1 0

[PATCH 1/2] user32: Clear validate flag if both internal paint and update now are present.
by Roman Pišl 02 Jan '22

02 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48761 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/user32/painting.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 41c0bb3c6e1..48e84c0d28d 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -1239,6 +1239,9 @@ BOOL WINAPI RedrawWindow( HWND hwnd, const RECT *rect, HRGN hrgn, UINT flags ) /* process pending expose events before painting */ if (flags & RDW_UPDATENOW) USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_PAINT, 0 ); + if ((flags & (RDW_INTERNALPAINT | RDW_UPDATENOW | RDW_VALIDATE)) == (RDW_INTERNALPAINT | RDW_UPDATENOW | RDW_VALIDATE)) + flags &= ~RDW_VALIDATE; + if (rect && !hrgn) { if (IsRectEmpty( rect )) rect = ∅ -- 2.30.2

2 2

[PATCH 1/2] po: update French translation
by Eric Pouech 02 Jan '22

02 Jan '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- po/fr.po | 1131 +++++++++++++++----------------------------------------------- 1 file changed, 273 insertions(+), 858 deletions(-) diff --git a/po/fr.po b/po/fr.po index faba83d9609..79710bc6859 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-10-20 16:19+0100\n" -"Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" +"PO-Revision-Date: 2022-01-02 11:32+0100\n" +"Last-Translator: Eric Pouech <eric.pouech(a)gmail.com>\n" "Language-Team: French\n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -19,26 +19,20 @@ msgid "Security" msgstr "Sécurité" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "&Nom d'utilisateur :" +msgstr "&Noms de groupe ou d'utilisateur :" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "Jaune" +msgstr "Autoriser" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "Interdire" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Access denied.\n" msgid "Permissions for %1" -msgstr "Accès refusé.\n" +msgstr "Permissions pour %1" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" @@ -390,25 +384,23 @@ msgstr "Annulation..." #: dlls/browseui/browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "%1!u! %2 restante(s)" #: dlls/browseui/browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "%1!u! %2 et %3!u! %4 restante(s)" #: dlls/browseui/browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "&Secondes" +msgstr "secondes" #: dlls/browseui/browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "minutes" #: dlls/browseui/browseui.rc:33 msgid "hours" -msgstr "" +msgstr "heures" #: dlls/comctl32/comctl32.rc:68 programs/winefile/winefile.rc:156 msgid "Properties for %s" @@ -523,16 +515,12 @@ msgid "&Retry" msgstr "Ré&péter" #: dlls/comctl32/comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "Cacher les &onglets" +msgstr "Cacher les détails" #: dlls/comctl32/comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "Détails" +msgstr "Void les détails" #: dlls/comctl32/comctl32.rc:31 dlls/cryptui/cryptui.rc:235 #: programs/regedit/regedit.rc:286 programs/taskmgr/taskmgr.rc:434 @@ -732,15 +720,15 @@ msgstr "Couleurs" #: dlls/comdlg32/comdlg32.rc:286 msgid "&Basic Colors:" -msgstr "Couleurs de base :" +msgstr "Couleurs de &base :" #: dlls/comdlg32/comdlg32.rc:287 msgid "&Custom Colors:" -msgstr "Couleurs personnalisées :" +msgstr "&Couleurs personnalisées :" #: dlls/comdlg32/comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|S&olide" #: dlls/comdlg32/comdlg32.rc:290 msgid "&Red:" @@ -1430,7 +1418,7 @@ msgstr "Identifiant de clé du sujet" #: dlls/crypt32/crypt32.rc:39 msgid "CRL Reason Code" -msgstr "Code de raison pour la LRC" +msgstr "" #: dlls/crypt32/crypt32.rc:40 msgid "CRL Distribution Points" @@ -2606,16 +2594,12 @@ msgstr "" "Vous avez terminé avec succès l'assistant d'exportation de certificats." #: dlls/cryptui/cryptui.rc:456 dlls/cryptui/cryptui.rc:179 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "Sélectionnez le magasin de certificats" +msgstr "Sélectionnez le certificat" #: dlls/cryptui/cryptui.rc:459 -#, fuzzy -#| msgid "Select the certificate store you want to use:" msgid "Select a certificate you want to use" -msgstr "Sélectionnez le magasin de certificats à utiliser :" +msgstr "Sélectionnez le certificats à utiliser" #: dlls/cryptui/cryptui.rc:30 dlls/cryptui/cryptui.rc:93 msgid "Certificate" @@ -3151,20 +3135,16 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Note : la clé privée de ce certificat n'est pas exportable." #: dlls/cryptui/cryptui.rc:177 -#, fuzzy -#| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "&Rôle prévu :" +msgstr "Utilisation prévue :" #: dlls/cryptui/cryptui.rc:178 dlls/shell32/shell32.rc:150 msgid "Location" msgstr "Emplacement" #: dlls/cryptui/cryptui.rc:180 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select a certificate" -msgstr "Sélectionnez le magasin de certificats" +msgstr "Sélectionnez un certificat" #: dlls/cryptui/cryptui.rc:181 programs/winefile/winefile.rc:101 #: programs/winhlp32/winhlp32.rc:110 programs/winhlp32/winhlp32.rc:85 @@ -3676,46 +3656,36 @@ msgid "Publishers..." msgstr "Éditeurs..." #: dlls/inetcpl.cpl/inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "Connexion réseau local (LAN)" +msgstr "Connexions" #: dlls/inetcpl.cpl/inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Configuration de Wine" +msgstr "Configuration automatique" #: dlls/inetcpl.cpl/inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" -msgstr "" +msgstr "Utiliser Web Proxy Auto-Config (WPAD)" #: dlls/inetcpl.cpl/inetcpl.rc:127 msgid "Use Proxy Auto-Config (PAC) script" -msgstr "" +msgstr "Utiliser un script Proxy Auto-Config (PAC)" #: dlls/inetcpl.cpl/inetcpl.rc:128 dlls/inetcpl.cpl/inetcpl.rc:132 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "Adresse" +msgstr "Adresse: " #: dlls/inetcpl.cpl/inetcpl.rc:130 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "Serveur &local" +msgstr "Serveur &mandataire" #: dlls/inetcpl.cpl/inetcpl.rc:131 msgid "Use a proxy server" -msgstr "" +msgstr "Utiliser un serveur mandataire" #: dlls/inetcpl.cpl/inetcpl.rc:134 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "Aucun port" +msgstr "Port: " #: dlls/inetcpl.cpl/inetcpl.rc:31 msgid "Internet Settings" @@ -3763,30 +3733,24 @@ msgid "&Disable" msgstr "&Désactiver" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy -#| msgid "Reset" msgid "&Reset" -msgstr "Réinitialiser" +msgstr "&Réinitialiser" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" msgstr "&Activer" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "Éditer le remplacement" +msgstr "&Remplacement" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" msgstr "Connecté" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "Périphérique d'entrée voix :" +msgstr "Connecté (périphérique xinput)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" @@ -3831,7 +3795,7 @@ msgstr "Contrôleurs de jeu" #: dlls/joy.cpl/joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "Tester et configurer les manettes de jeu." #: dlls/jscript/jscript.rc:28 msgid "Error converting object to primitive type" @@ -3846,10 +3810,8 @@ msgid "Subscript out of range" msgstr "Indice hors limites" #: dlls/jscript/jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "Plus de papier ; " +msgstr "Dépassement de capacité de pile ; " #: dlls/jscript/jscript.rc:32 msgid "Object required" @@ -3937,17 +3899,15 @@ msgstr "« @ » attendu" #: dlls/jscript/jscript.rc:80 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Erreur de compilation Microsoft JScript" #: dlls/jscript/jscript.rc:81 msgid "Microsoft JScript runtime error" msgstr "" #: dlls/jscript/jscript.rc:82 dlls/vbscript/vbscript.rc:64 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "Erreur inconnue" +msgstr "Erreur d'exécution inconnue" #: dlls/jscript/jscript.rc:55 msgid "Number expected" @@ -3990,16 +3950,12 @@ msgid "JScript object expected" msgstr "Objet JScript attendu" #: dlls/jscript/jscript.rc:63 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "Objet tableau attendu" +msgstr "Objet énumérateur attendu" #: dlls/jscript/jscript.rc:64 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "Objet booléen attendu" +msgstr "Objet expression rationnelle attendu" #: dlls/jscript/jscript.rc:65 msgid "Syntax error in regular expression" @@ -4052,10 +4008,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "« [objet] » n'est pas un objet de type date" +msgstr "« this » n'est pas un objet de type Map" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" @@ -7038,40 +6992,28 @@ msgid "Connection reset by peer.\n" msgstr "Connexion fermée par le pair.\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "Non implémenté" +msgstr "Non implémenté.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "Échec de l'appel RPC.\n" +msgstr "Échec de l'appel.\n" #: dlls/kernel32/winerror.mc:3760 -#, fuzzy -#| msgid "Message 0x%1 not found in file %2.\n" msgid "No Signature found in file.\n" -msgstr "Message 0x%1 introuvable dans le fichier %2.\n" +msgstr "Pas de signature trouvée dans le fichier.\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "Niveau non valide.\n" +msgstr "Appel non valide.\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Help not available." msgid "Resource is not currently available.\n" -msgstr "Impossible d'afficher l'aide." +msgstr "La ressource n'est pas actuellement disponible.\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy -#| msgid "Class Name:" msgid "Classic Blue" -msgstr "Nom de classe :" +msgstr "Bleu Classique" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73 @@ -7079,9 +7021,6 @@ msgid "Normal" msgstr "Normale" #: dlls/localspl/localspl.rc:37 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter" msgstr "Lettre" @@ -7093,18 +7032,16 @@ msgid "Letter Small" msgstr "Lettre" #: dlls/localspl/localspl.rc:39 -#, fuzzy -#| msgid "&Table" msgid "Tabloid" -msgstr "&table" +msgstr "Tabloïde" #: dlls/localspl/localspl.rc:40 msgid "Ledger" -msgstr "" +msgstr "Ledger" #: dlls/localspl/localspl.rc:41 msgid "Legal" -msgstr "" +msgstr "Legal" #: dlls/localspl/localspl.rc:42 #, fuzzy @@ -7113,24 +7050,16 @@ msgid "Statement" msgstr "État" #: dlls/localspl/localspl.rc:43 -#, fuzzy -#| msgid "&Execute..." msgid "Executive" -msgstr "E&xécuter..." +msgstr "Executive" #: dlls/localspl/localspl.rc:44 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A3" -msgstr "T" +msgstr "A3" #: dlls/localspl/localspl.rc:45 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A4" -msgstr "T" +msgstr "A4" #: dlls/localspl/localspl.rc:46 #, fuzzy @@ -7139,35 +7068,32 @@ msgid "A4 Small" msgstr "Petite" #: dlls/localspl/localspl.rc:47 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A5" -msgstr "T" +msgstr "A5" #: dlls/localspl/localspl.rc:48 msgid "B4 (JIS)" -msgstr "" +msgstr "B4 (JIS)" #: dlls/localspl/localspl.rc:49 msgid "B5 (JIS)" -msgstr "" +msgstr "B5 (JIS)" #: dlls/localspl/localspl.rc:50 msgid "Folio" -msgstr "" +msgstr "Folio" #: dlls/localspl/localspl.rc:51 msgid "Quarto" -msgstr "" +msgstr "Quarto" #: dlls/localspl/localspl.rc:52 msgid "10x14" -msgstr "" +msgstr "10x14" #: dlls/localspl/localspl.rc:53 msgid "11x17" -msgstr "" +msgstr "11x17" #: dlls/localspl/localspl.rc:54 #, fuzzy @@ -7177,7 +7103,7 @@ msgstr "Bloc-notes" #: dlls/localspl/localspl.rc:55 msgid "Envelope #9" -msgstr "" +msgstr "Enveloppe #9" #: dlls/localspl/localspl.rc:56 msgid "Envelope #10" @@ -7273,7 +7199,7 @@ msgstr "" #: dlls/localspl/localspl.rc:78 msgid "B4 (ISO)" -msgstr "" +msgstr "B4 (ISO)" #: dlls/localspl/localspl.rc:79 #, fuzzy @@ -7283,15 +7209,15 @@ msgstr "Japonais" #: dlls/localspl/localspl.rc:80 msgid "9x11" -msgstr "" +msgstr "9x11" #: dlls/localspl/localspl.rc:81 msgid "10x11" -msgstr "" +msgstr "10x11" #: dlls/localspl/localspl.rc:82 msgid "15x11" -msgstr "" +msgstr "15x11" #: dlls/localspl/localspl.rc:83 msgid "Envelope Invite" @@ -7371,14 +7297,11 @@ msgstr "&Avancé" #: dlls/localspl/localspl.rc:99 msgid "B5 (ISO) Extra" -msgstr "" +msgstr "B5 (ISO) Extra" #: dlls/localspl/localspl.rc:100 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A2" -msgstr "T" +msgstr "A2" #: dlls/localspl/localspl.rc:101 msgid "A3 Transverse" @@ -7393,11 +7316,8 @@ msgid "Japanese Double Postcard" msgstr "" #: dlls/localspl/localspl.rc:104 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A6" -msgstr "T" +msgstr "A6" #: dlls/localspl/localspl.rc:105 msgid "Japanese Envelope Kaku #2" @@ -7469,7 +7389,7 @@ msgstr "" #: dlls/localspl/localspl.rc:122 msgid "B6 (JIS)" -msgstr "" +msgstr "B6 (JIS)" #: dlls/localspl/localspl.rc:123 msgid "B6 (JIS) Rotated" @@ -7477,7 +7397,7 @@ msgstr "" #: dlls/localspl/localspl.rc:124 msgid "12x11" -msgstr "" +msgstr "12x11" #: dlls/localspl/localspl.rc:125 msgid "Japan Envelope You #4" @@ -7704,28 +7624,20 @@ msgid "Media Foundation platform is not initialized.\n" msgstr "Plate-forme d'installation non prise en charge.\n" #: dlls/mferror/mferror.mc:39 -#, fuzzy -#| msgid "Byte count too small.\n" msgid "Buffer is too small.\n" -msgstr "Nombre d'octets trop petit.\n" +msgstr "La mémoire tampon est trop petite.\n" #: dlls/mferror/mferror.mc:46 -#, fuzzy -#| msgid "Invalid query syntax.\n" msgid "Invalid request.\n" -msgstr "Syntaxe de requête invalide.\n" +msgstr "Requête invalide.\n" #: dlls/mferror/mferror.mc:53 -#, fuzzy -#| msgid "Invalid segment number.\n" msgid "Invalid stream number.\n" -msgstr "Numéro de segment invalide.\n" +msgstr "Numéro de flux non invalide.\n" #: dlls/mferror/mferror.mc:60 -#, fuzzy -#| msgid "Invalid data type.\n" msgid "Invalid media type.\n" -msgstr "Type de donnée invalide.\n" +msgstr "Type de média invalide.\n" #: dlls/mferror/mferror.mc:67 #, fuzzy @@ -7734,44 +7646,32 @@ msgid "No more input is accepted.\n" msgstr "Il n'y a plus d'entrées.\n" #: dlls/mferror/mferror.mc:74 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Object is not initialized.\n" -msgstr "UUID d'objet introuvable.\n" +msgstr "L'objet n'est pas été initialisé.\n" #: dlls/mferror/mferror.mc:81 -#, fuzzy -#| msgid "Operation not supported.\n" msgid "Representation is not supported.\n" -msgstr "Opération pas prise en charge.\n" +msgstr "Représentation non prise en charge.\n" #: dlls/mferror/mferror.mc:88 msgid "No more types in the list of suggested media types.\n" msgstr "" #: dlls/mferror/mferror.mc:95 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported service.\n" -msgstr "Type non pris en charge.\n" +msgstr "Service non pris en charge.\n" #: dlls/mferror/mferror.mc:102 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Unexpected error.\n" -msgstr "Erreur réseau inattendue.\n" +msgstr "Erreur inattendue.\n" #: dlls/mferror/mferror.mc:116 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid type.\n" -msgstr "Heure non valide.\n" +msgstr "Type non valide.\n" #: dlls/mferror/mferror.mc:123 -#, fuzzy -#| msgid "Invalid pixel format.\n" msgid "Invalid file format.\n" -msgstr "Format de pixel invalide.\n" +msgstr "Format de fichier non valide.\n" #: dlls/mferror/mferror.mc:137 #, fuzzy @@ -7846,16 +7746,12 @@ msgid "Rate change was preempted.\n" msgstr "" #: dlls/mferror/mferror.mc:228 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Object or value wasn't found.\n" -msgstr "UUID d'objet introuvable.\n" +msgstr "L'objet ou la valeur n'a pas été trouvée.\n" #: dlls/mferror/mferror.mc:235 -#, fuzzy -#| msgid "Help not available." msgid "Value is not available.\n" -msgstr "Impossible d'afficher l'aide." +msgstr "La valeur n'est pas disponible.\n" #: dlls/mferror/mferror.mc:242 #, fuzzy @@ -7922,40 +7818,28 @@ msgid "Unsupported caption.\n" msgstr "Type non pris en charge.\n" #: dlls/mferror/mferror.mc:333 -#, fuzzy -#| msgid "Invalid workstation.\n" msgid "Invalid position.\n" -msgstr "Station de travail non autorisée.\n" +msgstr "Position non valide.\n" #: dlls/mferror/mferror.mc:340 -#, fuzzy -#| msgid "File not found.\n" msgid "Attribute is not found.\n" -msgstr "Fichier introuvable.\n" +msgstr "L'attribut n'a pas été trouvé.\n" #: dlls/mferror/mferror.mc:347 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Property type is not allowed.\n" -msgstr "Type de point d'entrée non autorisé.\n" +msgstr "Type de propriété non autorisé.\n" #: dlls/mferror/mferror.mc:354 -#, fuzzy -#| msgid "Operation not supported.\n" msgid "Property type is not supported.\n" -msgstr "Opération pas prise en charge.\n" +msgstr "Type de propriété pas pris en charge.\n" #: dlls/mferror/mferror.mc:361 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is empty.\n" -msgstr "Le répertoire n'est pas vide.\n" +msgstr "Le propriété est vide.\n" #: dlls/mferror/mferror.mc:368 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is not empty.\n" -msgstr "Le répertoire n'est pas vide.\n" +msgstr "La propriété n'est pas vide.\n" #: dlls/mferror/mferror.mc:375 #, fuzzy @@ -7968,10 +7852,8 @@ msgid "Vector property is required.\n" msgstr "" #: dlls/mferror/mferror.mc:389 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "Operation was cancelled.\n" -msgstr "Opération annulée par l'utilisateur.\n" +msgstr "L'opération a été annulée.\n" #: dlls/mferror/mferror.mc:396 #, fuzzy @@ -8407,16 +8289,12 @@ msgid "New Folder" msgstr "Nouveau dossier" #: dlls/msi/msi.rc:91 -#, fuzzy -#| msgid "No registry log space.\n" msgid "Allocating registry space" -msgstr "Pas assez d'espace disponible pour le journal du registre.\n" +msgstr "Allocation d'espace pour le registre." #: dlls/msi/msi.rc:92 -#, fuzzy -#| msgid "Single-instance application.\n" msgid "Searching for installed applications" -msgstr "Une seule instance de l'application est autorisée.\n" +msgstr "Recherche d'applications installées" #: dlls/msi/msi.rc:93 msgid "Binding executables" @@ -8430,59 +8308,43 @@ msgstr "Recherche de %s" #: dlls/msi/msi.rc:95 dlls/msi/msi.rc:96 dlls/msi/msi.rc:101 msgid "Computing space requirements" -msgstr "" +msgstr "Calcul de l'espace nécessaire en cours" #: dlls/msi/msi.rc:97 -#, fuzzy -#| msgid "Target folder" msgid "Creating folders" -msgstr "Dossier cible" +msgstr "Création des répertoires" #: dlls/msi/msi.rc:98 -#, fuzzy -#| msgid "Create Shor&tcut" msgid "Creating shortcuts" -msgstr "Créer un &raccourci" +msgstr "Création des raccourcis" #: dlls/msi/msi.rc:99 -#, fuzzy -#| msgid "Exception in service.\n" msgid "Deleting services" -msgstr "Exception durant l'exécution du service.\n" +msgstr "Effacement des services" #: dlls/msi/msi.rc:100 -#, fuzzy -#| msgid "Creation date" msgid "Creating duplicate files" -msgstr "Création" +msgstr "Création de doublons de fichiers" #: dlls/msi/msi.rc:102 -#, fuzzy -#| msgid "No associated application.\n" msgid "Searching for related applications" -msgstr "Aucun application associée.\n" +msgstr "Recherche d'applications associées" #: dlls/msi/msi.rc:103 msgid "Copying network install files" msgstr "" #: dlls/msi/msi.rc:104 -#, fuzzy -#| msgid "Copying Files..." msgid "Copying new files" -msgstr "Copie de fichiers..." +msgstr "Copie des nouveaux fichiers" #: dlls/msi/msi.rc:105 -#, fuzzy -#| msgid "Installation of component failed: %08x" msgid "Installing ODBC components" -msgstr "Échec de l'installation du composant : %08x" +msgstr "Installation des composants ODBC" #: dlls/msi/msi.rc:106 -#, fuzzy -#| msgid "Installer service failed.\n" msgid "Installing new services" -msgstr "Échec du service d'installation.\n" +msgstr "Installation des nouveaux services" #: dlls/msi/msi.rc:107 #, fuzzy @@ -8491,10 +8353,8 @@ msgid "Installing system catalog" msgstr "Installation/Désinstallation" #: dlls/msi/msi.rc:108 -#, fuzzy -#| msgid "Wine Application Uninstaller" msgid "Validating install" -msgstr "Programme de désinstallation des applications Wine" +msgstr "Validation de l'opération d'installation" #: dlls/msi/msi.rc:109 msgid "Evaluating launch conditions" @@ -8505,26 +8365,20 @@ msgid "Migrating feature states from related applications" msgstr "" #: dlls/msi/msi.rc:111 -#, fuzzy -#| msgid "Icon files" msgid "Moving files" -msgstr "Fichiers icônes" +msgstr "Déplacement de Fichiers" #: dlls/msi/msi.rc:112 -#, fuzzy -#| msgid "Version information" msgid "Publishing assembly information" -msgstr "Informations de version" +msgstr "Publication des informations d'assemblage" #: dlls/msi/msi.rc:113 msgid "Unpublishing assembly information" msgstr "" #: dlls/msi/msi.rc:114 -#, fuzzy -#| msgid "Icon files" msgid "Patching files" -msgstr "Fichiers icônes" +msgstr "Mise à jour des fichiers" #: dlls/msi/msi.rc:115 msgid "Updating component registration" @@ -8539,10 +8393,8 @@ msgid "Publishing Product Features" msgstr "" #: dlls/msi/msi.rc:118 -#, fuzzy -#| msgid "Client Information" msgid "Publishing product information" -msgstr "Informations sur le client" +msgstr "Publication des information du produit" #: dlls/msi/msi.rc:119 msgid "Registering Class servers" @@ -8558,79 +8410,59 @@ msgstr "" #: dlls/msi/msi.rc:122 msgid "Registering fonts" -msgstr "" +msgstr "Enregistrement des polices de caractères" #: dlls/msi/msi.rc:123 -#, fuzzy -#| msgid "Registry Editor" msgid "Registering MIME info" -msgstr "Éditeur du registre" +msgstr "Enregistrement d'information MIME" #: dlls/msi/msi.rc:124 -#, fuzzy -#| msgid "Registry is corrupt.\n" msgid "Registering product" -msgstr "Le registre est corrompu.\n" +msgstr "Enregistrement du produit" #: dlls/msi/msi.rc:125 msgid "Registering program identifiers" msgstr "" #: dlls/msi/msi.rc:126 -#, fuzzy -#| msgid "Type Libraries" msgid "Registering type libraries" -msgstr "Bibliothèques de types" +msgstr "Enregistrement des bibliothèques de types" #: dlls/msi/msi.rc:127 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Registering user" -msgstr "Ressource en cours d'utilisation.\n" +msgstr "Enregistrement de l'utilisateur" #: dlls/msi/msi.rc:128 -#, fuzzy -#| msgid "&Remove duplicates" msgid "Removing duplicated files" -msgstr "&Supprimer les doublons" +msgstr "Suppression des fichiers en doublon" #: dlls/msi/msi.rc:129 dlls/msi/msi.rc:153 -#, fuzzy -#| msgid "Applying font settings" msgid "Updating environment strings" -msgstr "Application des réglages des polices" +msgstr "Mise à jour des variables d'environnement" #: dlls/msi/msi.rc:130 -#, fuzzy -#| msgid "&Remove application" msgid "Removing applications" -msgstr "&Supprimer une application" +msgstr "Suppression des applications" #: dlls/msi/msi.rc:131 -#, fuzzy -#| msgid "Icon files" msgid "Removing files" -msgstr "Fichiers icônes" +msgstr "Suppression des fichiers" #: dlls/msi/msi.rc:132 msgid "Removing folders" -msgstr "" +msgstr "Suppression des répertoires" #: dlls/msi/msi.rc:133 msgid "Removing INI files entries" msgstr "" #: dlls/msi/msi.rc:134 -#, fuzzy -#| msgid "Domain Component" msgid "Removing ODBC components" -msgstr "Composant de domaine" +msgstr "Suppression des composants ODBC" #: dlls/msi/msi.rc:135 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Removing system registry values" -msgstr "regedit : impossible d'ouvrir la clé de registre « %1 ».\n" +msgstr "Suppression des valeurs dans le regitre système" #: dlls/msi/msi.rc:136 msgid "Removing shortcuts" @@ -8645,22 +8477,16 @@ msgid "Unregistering modules" msgstr "" #: dlls/msi/msi.rc:140 -#, fuzzy -#| msgid "Initializing; " msgid "Initializing ODBC directories" -msgstr "Démarrage en cours ; " +msgstr "Initialisation des répertoires ODBC" #: dlls/msi/msi.rc:141 -#, fuzzy -#| msgid "Starting Wordpad failed" msgid "Starting services" -msgstr "Wordpad n'a pas pu être démarré" +msgstr "Démarrage des services" #: dlls/msi/msi.rc:142 -#, fuzzy -#| msgid "Stopping dependent service: %1\n" msgid "Stopping services" -msgstr "Arrêt du service dépendant : %1\n" +msgstr "Arrêt des services" #: dlls/msi/msi.rc:143 msgid "Unpublishing Qualified Components" @@ -8668,13 +8494,11 @@ msgstr "" #: dlls/msi/msi.rc:144 msgid "Unpublishing Product Features" -msgstr "" +msgstr "Dépublication des caractéristiques du produit" #: dlls/msi/msi.rc:145 -#, fuzzy -#| msgid "Client Information" msgid "Unpublishing product information" -msgstr "Informations sur le client" +msgstr "Dépublication des informations du produit" #: dlls/msi/msi.rc:146 msgid "Unregister Class servers" @@ -8709,18 +8533,16 @@ msgid "Writing INI files values" msgstr "" #: dlls/msi/msi.rc:155 -#, fuzzy -#| msgid "Warning: system library" msgid "Writing system registry values" -msgstr "Attention : bibliothèque système" +msgstr "Écriture des valeurs dans le registre système" #: dlls/msi/msi.rc:161 msgid "Free space: [1]" -msgstr "" +msgstr "Espace disponible : [1]" #: dlls/msi/msi.rc:162 msgid "Property: [1], Signature: [2]" -msgstr "" +msgstr "Propriété : [1], signature : [2]" #: dlls/msi/msi.rc:163 msgid "File: [1]" @@ -8732,43 +8554,35 @@ msgstr "Dossier : [1]" #: dlls/msi/msi.rc:165 dlls/msi/msi.rc:194 msgid "Shortcut: [1]" -msgstr "" +msgstr "Raccourci : [1]" #: dlls/msi/msi.rc:166 dlls/msi/msi.rc:197 dlls/msi/msi.rc:198 -#, fuzzy -#| msgid "De&vice:" msgid "Service: [1]" -msgstr "Périp&hérique :" +msgstr "Service : [1]" #: dlls/msi/msi.rc:167 dlls/msi/msi.rc:170 dlls/msi/msi.rc:174 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "" +msgstr "Fichier : [1], Répertoire : [9], Taille : [6]" #: dlls/msi/msi.rc:168 -#, fuzzy -#| msgid "application" msgid "Found application: [1]" -msgstr "application" +msgstr "Application trouvée : [1]" #: dlls/msi/msi.rc:169 msgid "File: [1], Directory: [9], Size: [6]" msgstr "" #: dlls/msi/msi.rc:171 -#, fuzzy -#| msgid "De&vice:" msgid "Service: [2]" -msgstr "Périp&hérique :" +msgstr "Service : [2]" #: dlls/msi/msi.rc:172 msgid "File: [1], Dependencies: [2]" msgstr "" #: dlls/msi/msi.rc:173 -#, fuzzy -#| msgid "Applications" msgid "Application: [1]" -msgstr "Applications" +msgstr "Application : [1]" #: dlls/msi/msi.rc:175 dlls/msi/msi.rc:176 msgid "Application Context:[1], Assembly Name:[2]" @@ -8795,10 +8609,8 @@ msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" msgstr "" #: dlls/msi/msi.rc:182 dlls/msi/msi.rc:203 -#, fuzzy -#| msgid "Extensions Only" msgid "Extension: [1]" -msgstr "Extensions uniquement" +msgstr "Extension : [1]" #: dlls/msi/msi.rc:183 dlls/msi/msi.rc:204 msgid "Font: [1]" @@ -9277,7 +9089,6 @@ msgid "expanded" msgstr "développé" #: dlls/oleacc/oleacc.rc:108 -#, fuzzy msgctxt "object state" msgid "collapsed" msgstr "réduit" @@ -9407,130 +9218,95 @@ msgid "Off" msgstr "Inactif" #: dlls/oledb32/version.rc:56 -#, fuzzy -#| msgid "video" msgid "Provider" -msgstr "vidéo" +msgstr "Fournisseur" #: dlls/oledb32/version.rc:59 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "Sélectionnez le format à utiliser :" +msgstr "Sélectionnez la donnée à laquelle vous souhaitez vous connecter :" #: dlls/oledb32/version.rc:66 -#, fuzzy -#| msgid "LAN Connection" msgid "Connection" -msgstr "Connexion réseau local (LAN)" +msgstr "Connexion" #: dlls/oledb32/version.rc:69 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Specify the following to connect to ODBC data:" -msgstr "Sélectionnez le format à utiliser :" +msgstr "" +"Spécifiez les informations suivantes pour se connecter aux données ODBC :" #: dlls/oledb32/version.rc:70 msgid "1. Specify the source of data:" -msgstr "" +msgstr "1. La source des données :" #: dlls/oledb32/version.rc:71 -#, fuzzy -#| msgid "Please enter your name" msgid "Use &data source name" -msgstr "Veuillez saisir votre nom" +msgstr "Utiliser le nom de la source" #: dlls/oledb32/version.rc:74 -#, fuzzy -#| msgid "Reset Connections" msgid "Use c&onnection string" -msgstr "Connexions réinitialisées" +msgstr "Utiliser une chaîne de connexion" #: dlls/oledb32/version.rc:75 -#, fuzzy -#| msgid "LAN Connection" msgid "&Connection string:" -msgstr "Connexion réseau local (LAN)" +msgstr "&Chaîne de connexion" #: dlls/oledb32/version.rc:77 -#, fuzzy -#| msgid "A&dd..." msgid "B&uild..." -msgstr "Ajo&uter..." +msgstr "&Construire..." #: dlls/oledb32/version.rc:78 msgid "2. Enter information to log on to the server" msgstr "" #: dlls/oledb32/version.rc:79 -#, fuzzy -#| msgid "&User name:" msgid "User &name:" msgstr "&Nom d'utilisateur :" #: dlls/oledb32/version.rc:83 -#, fuzzy -#| msgid "&Blank page" msgid "&Blank password" -msgstr "Page &blanche" +msgstr "Mot de passe" #: dlls/oledb32/version.rc:84 -#, fuzzy -#| msgid "Wrong password.\n" msgid "Allow &saving password" -msgstr "Mot de passe erroné.\n" +msgstr "Autoriser à mémoriser le mot de passe" #: dlls/oledb32/version.rc:85 msgid "3. Enter the &initial catalog to use:" msgstr "" #: dlls/oledb32/version.rc:87 -#, fuzzy -#| msgid "Reset Connections" msgid "&Test Connection" -msgstr "Connexions réinitialisées" +msgstr "&Tester la connexion" #: dlls/oledb32/version.rc:92 msgid "Advanced" msgstr "Avancé" #: dlls/oledb32/version.rc:95 -#, fuzzy -#| msgid "Network share" msgid "Network settings" -msgstr "Partage réseau" +msgstr "Paramètres réseau" #: dlls/oledb32/version.rc:96 -#, fuzzy -#| msgid "Bad impersonation level.\n" msgid "&Impersonation level:" -msgstr "Mauvais niveau d'emprunt d'identité.\n" +msgstr "&Niveau d'emprunt d'identité :" #: dlls/oledb32/version.rc:98 msgid "P&rotection level:" msgstr "" #: dlls/oledb32/version.rc:101 -#, fuzzy -#| msgid "Connected" msgid "Connect:" msgstr "Connecté" #: dlls/oledb32/version.rc:103 -#, fuzzy -#| msgid "&Seconds" msgid "seconds." -msgstr "&Secondes" +msgstr "secondes" #: dlls/oledb32/version.rc:104 -#, fuzzy -#| msgid "Success" msgid "A&ccess:" -msgstr "Succès" +msgstr "A&ccès :" #: dlls/oledb32/version.rc:110 -#, fuzzy -#| msgid "&All" msgid "All" msgstr "&Tout" @@ -9541,10 +9317,8 @@ msgid "" msgstr "" #: dlls/oledb32/version.rc:115 -#, fuzzy -#| msgid "&Edit..." msgid "&Edit Value..." -msgstr "&Modifier..." +msgstr "&Modifier valeur..." #: dlls/oledb32/version.rc:49 #, fuzzy @@ -9553,38 +9327,32 @@ msgid "Data Link Error" msgstr "Propriétés" #: dlls/oledb32/version.rc:50 -#, fuzzy -#| msgid "Please select a file." msgid "Please select a provider." -msgstr "Sélectionnez un fichier." +msgstr "Sélectionnez un fournisseur." #: dlls/oledb32/version.rc:51 msgid "" "Provider is no longer available. Ensure that the provider is installed " "properly." msgstr "" +"Le fournisseur n'est plus disponible. Veuillez-vous assurer que le " +"fournisseur est correctement installé." #: dlls/oledb32/version.rc:36 -#, fuzzy -#| msgid "Properties" msgid "Data Link Properties" -msgstr "Propriétés" +msgstr "Propriétés du lien de données" #: dlls/oledb32/version.rc:37 msgid "OLE DB Provider(s)" msgstr "" #: dlls/oledb32/version.rc:41 -#, fuzzy -#| msgid "Ready" msgid "Read" -msgstr "Prêt" +msgstr "Lecture" #: dlls/oledb32/version.rc:42 -#, fuzzy -#| msgid "Readme:" msgid "ReadWrite" -msgstr "Lisez-moi :" +msgstr "Lecture/Ecriture" #: dlls/oledb32/version.rc:43 msgid "Share Deny None" @@ -9603,10 +9371,8 @@ msgid "Share Exclusive" msgstr "" #: dlls/oledb32/version.rc:47 -#, fuzzy -#| msgid "I/O Writes" msgid "Write" -msgstr "Écritures E/S" +msgstr "Écriture" #: dlls/oledlg/oledlg.rc:55 msgid "Insert Object" @@ -10314,8 +10080,6 @@ msgid "Wine was brought to you by:" msgstr "Wine est une réalisation de :" #: dlls/shell32/shell32.rc:332 -#, fuzzy -#| msgid "&Run..." msgid "Run" msgstr "E&xécuter..." @@ -10338,10 +10102,8 @@ msgid "&Browse..." msgstr "&Parcourir..." #: dlls/shell32/shell32.rc:353 dlls/shell32/shell32.rc:382 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "Type de fichier" +msgstr "Type de fichier :" #: dlls/shell32/shell32.rc:357 dlls/shell32/shell32.rc:390 #: dlls/urlmon/urlmon.rc:37 programs/explorer/explorer.rc:33 @@ -10354,16 +10116,12 @@ msgid "Size:" msgstr "Taille :" #: dlls/shell32/shell32.rc:363 dlls/shell32/shell32.rc:396 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "Création" +msgstr "Création :" #: dlls/shell32/shell32.rc:367 dlls/shell32/shell32.rc:404 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" -msgstr "&Attributs :" +msgstr "Attributs :" #: dlls/shell32/shell32.rc:369 dlls/shell32/shell32.rc:406 #: programs/winefile/winefile.rc:173 @@ -10376,16 +10134,12 @@ msgid "&Archive" msgstr "&Archive" #: dlls/shell32/shell32.rc:384 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "Ouvrir :" +msgstr "Ouvrir avec :" #: dlls/shell32/shell32.rc:387 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "Changer l'&icône..." +msgstr "&Changer l'&icône..." #: dlls/shell32/shell32.rc:398 #, fuzzy @@ -10798,10 +10552,8 @@ msgid " sec" msgstr " s" #: dlls/twain_32/twain.rc:29 -#, fuzzy -#| msgid "Select Folder" msgid "Select Source" -msgstr "Sélectionnez un dossier" +msgstr "Sélectionnez une source" #: dlls/tzres/tzres.rc:126 msgid "China Standard Time" @@ -10872,10 +10624,8 @@ msgid "(UTC-01:00) Cabo Verde Is." msgstr "" #: dlls/tzres/tzres.rc:183 -#, fuzzy -#| msgid "Date and time" msgid "Haiti Standard Time" -msgstr "Date et heure" +msgstr "Heure d'Haïti" #: dlls/tzres/tzres.rc:184 #, fuzzy @@ -10888,10 +10638,8 @@ msgid "(UTC-05:00) Haiti" msgstr "" #: dlls/tzres/tzres.rc:111 -#, fuzzy -#| msgid "Central European" msgid "Central European Standard Time" -msgstr "Européen central" +msgstr "Heure d'Europe centrale" #: dlls/tzres/tzres.rc:112 #, fuzzy @@ -10924,10 +10672,8 @@ msgid "(UTC-08:00) Coordinated Universal Time-08" msgstr "" #: dlls/tzres/tzres.rc:39 -#, fuzzy -#| msgid "Date and time" msgid "Altai Standard Time" -msgstr "Date et heure" +msgstr "Heure d'Altaï" #: dlls/tzres/tzres.rc:40 #, fuzzy @@ -10940,10 +10686,8 @@ msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" msgstr "" #: dlls/tzres/tzres.rc:108 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Standard Time" -msgstr "Européen central" +msgstr "Heure d'Europe centrale" #: dlls/tzres/tzres.rc:109 #, fuzzy @@ -10968,10 +10712,8 @@ msgid "(UTC+03:30) Tehran" msgstr "" #: dlls/tzres/tzres.rc:318 -#, fuzzy -#| msgid "Date and time" msgid "Saint Pierre Standard Time" -msgstr "Date et heure" +msgstr "Heure de Saint-Pierre" #: dlls/tzres/tzres.rc:319 #, fuzzy @@ -10980,10 +10722,8 @@ msgid "Saint Pierre Daylight Time" msgstr "Date et heure" #: dlls/tzres/tzres.rc:320 -#, fuzzy -#| msgid "Date and time" msgid "(UTC-03:00) Saint Pierre and Miquelon" -msgstr "Date et heure" +msgstr "(UTC-03:00) Saint Pierre et Miquelon" #: dlls/tzres/tzres.rc:327 #, fuzzy @@ -11038,10 +10778,8 @@ msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" msgstr "" #: dlls/tzres/tzres.rc:171 -#, fuzzy -#| msgid "&Standard bar" msgid "GMT Standard Time" -msgstr "Barre &standard" +msgstr "Heure GMT" #: dlls/tzres/tzres.rc:172 msgid "GMT Daylight Time" @@ -11052,10 +10790,8 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "" #: dlls/tzres/tzres.rc:342 -#, fuzzy -#| msgid "Date and time" msgid "South Sudan Standard Time" -msgstr "Date et heure" +msgstr "Heure du Sud Soudan" #: dlls/tzres/tzres.rc:343 #, fuzzy @@ -11140,10 +10876,8 @@ msgid "(UTC-03:30) Newfoundland" msgstr "" #: dlls/tzres/tzres.rc:348 -#, fuzzy -#| msgid "Date and time" msgid "Sudan Standard Time" -msgstr "Date et heure" +msgstr "Heure du Soudan" #: dlls/tzres/tzres.rc:349 #, fuzzy @@ -11280,10 +11014,8 @@ msgid "(UTC+14:00) Kiritimati Island" msgstr "" #: dlls/tzres/tzres.rc:129 -#, fuzzy -#| msgid "Date and time" msgid "Cuba Standard Time" -msgstr "Date et heure" +msgstr "Heure de Cuba" #: dlls/tzres/tzres.rc:130 #, fuzzy @@ -11328,10 +11060,8 @@ msgid "(UTC+04:00) Izhevsk, Samara" msgstr "" #: dlls/tzres/tzres.rc:417 -#, fuzzy -#| msgid "&Standard bar" msgid "Volgograd Standard Time" -msgstr "Barre &standard" +msgstr "Heure de Volgograd" #: dlls/tzres/tzres.rc:418 #, fuzzy @@ -11588,10 +11318,8 @@ msgid "Tomsk Standard Time" msgstr "Barre &standard" #: dlls/tzres/tzres.rc:367 -#, fuzzy -#| msgid "Date and time" msgid "Tomsk Daylight Time" -msgstr "Date et heure" +msgstr "Heure de Tomsk" #: dlls/tzres/tzres.rc:368 msgid "(UTC+07:00) Tomsk" @@ -11758,10 +11486,8 @@ msgid "(UTC+11:00) Sakhalin" msgstr "" #: dlls/tzres/tzres.rc:270 -#, fuzzy -#| msgid "&Standard bar" msgid "North Korea Standard Time" -msgstr "Barre &standard" +msgstr "Heure de Corée du Nord" #: dlls/tzres/tzres.rc:271 #, fuzzy @@ -12262,10 +11988,8 @@ msgid "W. Mongolia Standard Time" msgstr "Date et heure" #: dlls/tzres/tzres.rc:430 -#, fuzzy -#| msgid "Date and time" msgid "W. Mongolia Daylight Time" -msgstr "Date et heure" +msgstr "Heure de l'Ouest Mongolie" #: dlls/tzres/tzres.rc:431 msgid "(UTC+07:00) Hovd" @@ -12300,10 +12024,8 @@ msgid "(UTC-10:00) Aleutian Islands" msgstr "" #: dlls/tzres/tzres.rc:273 -#, fuzzy -#| msgid "&Standard bar" msgid "Omsk Standard Time" -msgstr "Barre &standard" +msgstr "Heure d'Omsk" #: dlls/tzres/tzres.rc:274 #, fuzzy @@ -12680,60 +12402,44 @@ msgid "Overflow" msgstr "" #: dlls/vbscript/vbscript.rc:31 -#, fuzzy -#| msgid "Out of memory." msgid "Out of memory" -msgstr "Mémoire insuffisante." +msgstr "Mémoire insuffisante" #: dlls/vbscript/vbscript.rc:33 msgid "This array is fixed or temporarily locked" msgstr "" #: dlls/vbscript/vbscript.rc:34 -#, fuzzy -#| msgid "Data type mismatch.\n" msgid "Type mismatch" -msgstr "Discordance de type de données.\n" +msgstr "Discordance de type" #: dlls/vbscript/vbscript.rc:36 -#, fuzzy -#| msgid "I/O device error.\n" msgid "Device I/O error" -msgstr "Erreur de périphérique d'E/S.\n" +msgstr "Erreur de périphérique d'E/S" #: dlls/vbscript/vbscript.rc:37 -#, fuzzy -#| msgid "File already exists.\n" msgid "File already exists" -msgstr "Le fichier existe déjà.\n" +msgstr "Le fichier existe déjà" #: dlls/vbscript/vbscript.rc:38 -#, fuzzy -#| msgid "Disk full.\n" msgid "Disk full" -msgstr "Disque plein.\n" +msgstr "Disque plein" #: dlls/vbscript/vbscript.rc:39 -#, fuzzy -#| msgid "Too many open files.\n" msgid "Too many files" -msgstr "Trop de fichiers ouverts.\n" +msgstr "Trop de fichiers ouverts" #: dlls/vbscript/vbscript.rc:40 -#, fuzzy -#| msgid "Access denied.\n" msgid "Permission denied" -msgstr "Accès refusé.\n" +msgstr "Accès refusé" #: dlls/vbscript/vbscript.rc:41 msgid "Path/File access error" msgstr "" #: dlls/vbscript/vbscript.rc:42 -#, fuzzy -#| msgid "Path not found.\n" msgid "Path not found" -msgstr "Chemin introuvable.\n" +msgstr "Chemin introuvable" #: dlls/vbscript/vbscript.rc:43 #, fuzzy @@ -12742,36 +12448,28 @@ msgid "Object variable not set" msgstr "(valeur non définie)" #: dlls/vbscript/vbscript.rc:44 -#, fuzzy -#| msgid "Invalid user buffer.\n" msgid "Invalid use of Null" -msgstr "Tampon utilisateur invalide.\n" +msgstr "Utilisation non valide de Null" #: dlls/vbscript/vbscript.rc:45 msgid "Can't create necessary temporary file" msgstr "" #: dlls/vbscript/vbscript.rc:46 -#, fuzzy -#| msgid "Automation server can't create object" msgid "ActiveX component can't create object" -msgstr "Le serveur d'automatisation ne peut créer l'objet" +msgstr "Le composant ActiveX ne peut créer l'objet" #: dlls/vbscript/vbscript.rc:47 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Class doesn't support Automation" -msgstr "Cet objet ne supporte pas cette action" +msgstr "La classe ne supporte pas l'automatisation" #: dlls/vbscript/vbscript.rc:48 msgid "File name or class name not found during Automation operation" msgstr "" #: dlls/vbscript/vbscript.rc:51 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support named arguments" -msgstr "Cet objet ne supporte pas cette action" +msgstr "Cet objet ne supporte pas les arguments nommés" #: dlls/vbscript/vbscript.rc:52 #, fuzzy @@ -12780,26 +12478,20 @@ msgid "Object doesn't support current locale setting" msgstr "Cet objet ne supporte pas cette action" #: dlls/vbscript/vbscript.rc:53 dlls/vbscript/vbscript.rc:54 -#, fuzzy -#| msgid "Element not found.\n" msgid "Named argument not found" -msgstr "Élément introuvable.\n" +msgstr "Élément nommé introuvable" #: dlls/vbscript/vbscript.rc:55 msgid "Wrong number of arguments or invalid property assignment" msgstr "" #: dlls/vbscript/vbscript.rc:56 -#, fuzzy -#| msgid "Object Class Violation" msgid "Object not a collection" -msgstr "Violation de classe d'objet" +msgstr "L'objet n'est pas une collection" #: dlls/vbscript/vbscript.rc:57 -#, fuzzy -#| msgid "Specified control was not found in message" msgid "Specified DLL function not found" -msgstr "Le contrôle spécifié n'a pas été trouvé dans le message" +msgstr "La fonction spécifiée n'a pas été trouvée dans la DLL" #: dlls/vbscript/vbscript.rc:58 msgid "Variable uses an Automation type not supported in VBScript" @@ -12925,16 +12617,12 @@ msgid "Security Protocol" msgstr "Sécurité" #: dlls/wininet/wininet.rc:38 -#, fuzzy -#| msgid "Signature" msgid "Signature Type" -msgstr "Signature" +msgstr "Type de signature" #: dlls/wininet/wininet.rc:39 -#, fuzzy -#| msgid "Encrypting File System" msgid "Encryption Type" -msgstr "Système de fichiers chiffré (EFS)" +msgstr "Type d'encryption" #: dlls/wininet/wininet.rc:40 msgid "Privacy Strength" @@ -12945,38 +12633,28 @@ msgid "bits" msgstr "" #: dlls/wininet/winineterror.mc:26 -#, fuzzy -#| msgid "Service request timeout.\n" msgid "The request has timed out.\n" -msgstr "Expiration du délai d'attente du service.\n" +msgstr "Expiration du délai d'attente de la requête.\n" #: dlls/wininet/winineterror.mc:31 -#, fuzzy -#| msgid "A printer error occurred." msgid "An internal error has occurred.\n" -msgstr "Une erreur d'impression s'est produite." +msgstr "Une erreur interne s'est produite.\n" #: dlls/wininet/winineterror.mc:36 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "The URL is invalid.\n" -msgstr "Chemin invalide.\n" +msgstr "L'URL est invalide.\n" #: dlls/wininet/winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" msgstr "" #: dlls/wininet/winineterror.mc:46 -#, fuzzy -#| msgid "The username could not be found.\n" msgid "The server name could not be resolved.\n" -msgstr "Nom d'utilisateur introuvable.\n" +msgstr "Le nom du serveur n'a pas pu être résolu.\n" #: dlls/wininet/winineterror.mc:51 -#, fuzzy -#| msgid "The user profile is invalid.\n" msgid "The requested operation is invalid.\n" -msgstr "Le profil utilisateur est invalide.\n" +msgstr "L'opération demandée n'est pas valide.\n" #: dlls/wininet/winineterror.mc:56 msgid "" @@ -12985,16 +12663,12 @@ msgid "" msgstr "" #: dlls/wininet/winineterror.mc:61 -#, fuzzy -#| msgid "The profile could not be added.\n" msgid "The requested item could not be located.\n" -msgstr "Le profil n'a pu être ajouté.\n" +msgstr "L'item requis n'a pas pu être localisé.\n" #: dlls/wininet/winineterror.mc:66 -#, fuzzy -#| msgid "Can't connect to the LDAP server" msgid "The attempt to connect to the server failed.\n" -msgstr "Impossible de se connecter au serveur LDAP" +msgstr "La tentative de connexion au serveur a échoué.\n" #: dlls/wininet/winineterror.mc:71 msgid "The connection with the server has been terminated.\n" @@ -13521,13 +13195,13 @@ msgid "Any compatible waveform recording device may be used." msgstr "N'importe quel périphérique audio d'enregistrement peut être utilisé." #: dlls/winmm/winmm.rc:118 -#, fuzzy msgid "" "No wave device that can play files in the current format is installed. Use " "the Drivers option to install the wave device." msgstr "" -"Aucun périphérique audio capable de jouer des fichiers dans le format en " -"cours n'est présent. " +"Aucun périphérique audio capable de jouer des fichiers dans le formaten " +"cours n'est présent. Utiliser l'option pour installer des périphériques " +"audio." #: dlls/winmm/winmm.rc:119 msgid "" @@ -13537,7 +13211,6 @@ msgstr "" "Ce périphérique ne parvient pas à reconnaître le format du fichier actuel." #: dlls/winmm/winmm.rc:120 -#, fuzzy msgid "" "No wave device that can record files in the current format is installed. Use " "the Drivers option to install the wave device." @@ -13562,10 +13235,6 @@ msgstr "" "horaire SMPTE en même temps." #: dlls/winmm/winmm.rc:128 -#, fuzzy -#| msgid "" -#| "The specified MIDI port is already in use. Wait until it is free; then " -#| "try again." msgid "" "The specified MIDI port is already in use. Wait until it is free, and then " "try again." @@ -13587,10 +13256,6 @@ msgid "An error occurred with the specified port." msgstr "Une erreur est survenue sur le port spécifié." #: dlls/winmm/winmm.rc:133 -#, fuzzy -#| msgid "" -#| "All multimedia timers are being used by other applications. Quit one of " -#| "these applications; then, try again." msgid "" "All multimedia timers are being used by other applications. Quit one of " "these applications, and then try again." @@ -13968,13 +13633,11 @@ msgstr "" #: programs/chcp.com/chcp.rc:28 msgid "Active code page: %1!u!\n" -msgstr "" +msgstr "Code de pages actif : %1!u!\n" #: programs/chcp.com/chcp.rc:29 -#, fuzzy -#| msgid "Invalid message.\n" msgid "Invalid code page\n" -msgstr "Message invalide.\n" +msgstr "Code de pages invalide.\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -13987,6 +13650,15 @@ msgid "" " Type CHCP without a number to display the active console code page.\n" "\n" msgstr "" +"CHCP [nombre]\n" +"\n" +" Modifie ou affiche le code de pages de la console actif.\n" +"\n" +" nombre Le code de pages de la console à activer.\n" +"\n" +" Lancer CHCP sans nombre en paramètre pour afficher le code de pages actif " +"de la console.\n" +"\n" #: programs/clock/clock.rc:32 msgid "Ana&log" @@ -14595,47 +14267,6 @@ msgstr "" "d'exploitation ou au shell où vous avez invoqué cmd.\n" #: programs/cmd/cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -14696,6 +14327,7 @@ msgstr "" "\t\ttypes de fichiers\n" "HELP\t\tAffiche de brefs détails sur l'utilisation d'une commande\n" "MD (MKDIR)\tCrée un répertoire\n" +"MKLINK\t\tCrée un lien symbolique\n" "MORE\t\tAffiche du texte par pages\n" "MOVE\t\tDéplace un fichier, un groupe de fichiers ou un répertoire\n" "PATH\t\tRègle ou affiche le chemin de recherche\n" @@ -15123,10 +14755,8 @@ msgid "Error: Invalid option '%c'.\n" msgstr "Erreur : option « %c » invalide.\n" #: programs/hostname/hostname.rc:32 -#, fuzzy -#| msgid "Error: Could not find process \"%1\".\n" msgid "Error: Could not get hostname: %u.\n" -msgstr "Erreur : processus « %1 » introuvable.\n" +msgstr "Erreur: Impossible d'obtenir le nom d'hôte: %u.\n" #: programs/hostname/hostname.rc:33 msgid "" @@ -16267,40 +15897,24 @@ msgid "Type \"REG %1 /?\" for help.\n" msgstr "Tapez « REG %1 /? » pour de l'aide.\n" #: programs/reg/reg.rc:181 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to access or create the specified registry key\n" -msgstr "" -"reg : le système n'a pas pu trouver la clé ou valeur de registre spécifiée\n" +msgstr "reg : impossible d'accéder ou de créer la clé de registre spécifiée\n" #: programs/reg/reg.rc:116 -#, fuzzy -#| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "L'opération s'est terminée avec succès\n" +msgstr "reg : L'opération s'est terminée avec succès\n" #: programs/reg/reg.rc:131 -#, fuzzy -#| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" -msgstr "L'operation sur le registre a été annulée\n" +msgstr "reg : L'operation sur le registre a été annulée\n" #: programs/reg/reg.rc:174 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "" -"reg : le système n'a pas pu trouver la clé ou valeur de registre spécifiée\n" +msgstr "reg : le système n'a pas pu trouver la clé de registre spécifiée\n" #: programs/reg/reg.rc:120 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "" -"reg : le système n'a pas pu trouver la clé ou valeur de registre spécifiée\n" +msgstr "reg : le système n'a pas pu trouver la valeur de registre spécifiée\n" #: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -16311,17 +15925,6 @@ msgid "Type \"REG /?\" for help.\n" msgstr "Tapez « REG /? » pour de l'aide.\n" #: programs/reg/reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -16337,7 +15940,7 @@ msgstr "" " REG [opération] [paramètres]\n" "\n" "Opérations prises en charge :\n" -" ADD | DELETE | QUERY\n" +" ADD | COPY | DELETE | EXPORT | IMPORT | QUERY\n" "\n" "Pour de l'aide sur une opération spécifique, tapez :\n" " REG [opération] /?\n" @@ -16555,28 +16158,22 @@ msgid "" msgstr "" #: programs/reg/reg.rc:117 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "reg : nom de clé invalide\n" +msgstr "reg : clé de registre invalide\n" #: programs/reg/reg.rc:119 msgid "reg: Unable to access remote machine\n" msgstr "reg : impossible d'accéder à une machine distante\n" #: programs/reg/reg.rc:172 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid system key\n" -msgstr "reg : nom de clé invalide\n" +msgstr "reg : clé système invalide\n" #: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg : option [%1] invalide. " #: programs/reg/reg.rc:122 -#, fuzzy -#| msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgid "reg: The option [/d] must be followed by a valid numeric value\n" msgstr "" "reg : l'option [/d] doit être suivie d'une valeur hexadécimale valide\n" @@ -16612,12 +16209,11 @@ msgid "reg: The source and destination keys cannot be the same\n" msgstr "" #: programs/reg/reg.rc:205 -#, fuzzy -#| msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" -msgstr "La valeur de registre « %1 » existe déjà. Voulez-vous la remplacer ?" +msgstr "" +"La valeur de registre « %1\\\\%2 » existe déjà. Voulez-vous la remplacer ?" #: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" @@ -16633,34 +16229,25 @@ msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Voulez-vous réellement supprimer la clé de registre « %1 » ?" #: programs/reg/reg.rc:137 -#, fuzzy -#| msgid "regedit: Unable to delete the registry class '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" -msgstr "regedit : impossible d'effacer la classe de registre « %1 ».\n" +msgstr "" +"reg : impossible d'effacer toutes les valeurs de registre dans « %1 ».\n" #: programs/reg/reg.rc:173 -#, fuzzy -#| msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "La valeur de registre « %1 » existe déjà. Voulez-vous la remplacer ?" +msgstr "Le fichier « %1 » existe déjà. Voulez-vous la remplacer ?" #: programs/reg/reg.rc:151 -#, fuzzy -#| msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit : séquence d'échappement non reconnue [\\%1!c!]\n" +msgstr "reg : séquence d'échappement non reconnue [\\%1!c!]\n" #: programs/reg/reg.rc:175 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "regedit : impossible d'ouvrir la clé de registre « %1 ».\n" +msgstr "reg : impossible d'ouvrir la clé de registre « %1 ».\n" #: programs/reg/reg.rc:150 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "reg: The file '%1' was not found.\n" -msgstr "regedit : le fichier « %1 » est introuvable.\n" +msgstr "reg : le fichier « %1 » est introuvable.\n" #: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" @@ -16748,15 +16335,10 @@ msgstr "À &propos de l'éditeur du registre" #: programs/regedit/regedit.rc:89 programs/regedit/regedit.rc:96 #: programs/regedit/regedit.rc:230 -#, fuzzy -#| msgctxt "object state" -#| msgid "expanded" msgid "Expand" -msgstr "développé" +msgstr "Développer" #: programs/regedit/regedit.rc:134 programs/regedit/regedit.rc:233 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." msgstr "Modifier les données &binaires..." @@ -16859,10 +16441,6 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Contient des commandes pour accéder aux clés fréquemment utilisées" #: programs/regedit/regedit.rc:163 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" msgstr "" @@ -16906,52 +16484,44 @@ msgid "(unknown %d)" msgstr "(%d inconnu)" #: programs/regedit/regedit.rc:247 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to modify the selected registry value." -msgstr "regedit : impossible d'ouvrir la clé de registre « %1 ».\n" +msgstr "Impossible de modifier la clé de registre sélectionnée." #: programs/regedit/regedit.rc:248 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry key." -msgstr "regedit : impossible d'ouvrir la clé de registre « %1 ».\n" +msgstr "Impossible de créer un nouvelle clé de registre." #: programs/regedit/regedit.rc:249 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry value." -msgstr "regedit : impossible d'ouvrir la clé de registre « %1 ».\n" +msgstr "Impossible de créer une nouvelle valeur registre." #: programs/regedit/regedit.rc:250 msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" +"Impossible de renommer la clé '%1'.\n" +"Le nom spécifié existe déjà." #: programs/regedit/regedit.rc:251 msgid "" "Unable to rename the value '%1'.\n" "The specified value name already exists." msgstr "" +"Impossible de changer la valeur '%1'.\n" +"Le nom de valeur spécifié existe déjà." #: programs/regedit/regedit.rc:252 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to delete the selected registry key." -msgstr "regedit : impossible d'ouvrir la clé de registre « %1 ».\n" +msgstr "Impossible d'enlever la clé de registre sélectionnée." #: programs/regedit/regedit.rc:253 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry key." -msgstr "regedit : impossible d'ouvrir la clé de registre « %1 ».\n" +msgstr "Impossible de renommer la clé de registre sélectionnée." #: programs/regedit/regedit.rc:254 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry value." -msgstr "regedit : impossible d'ouvrir la clé de registre « %1 ».\n" +msgstr "Impossible de renommer la clé de registre sélectionnée." #: programs/regedit/regedit.rc:255 msgid "" @@ -16959,48 +16529,11 @@ msgid "" msgstr "" #: programs/regedit/regedit.rc:256 -#, fuzzy -#| msgid "" -#| "regedit: Unable to export '%1'. The specified registry key was not " -#| "found.\n" msgid "Unable to import %1. The specified file is not a valid registry file." msgstr "" -"regedit : impossible d'exporter « %1 ». La clé de registre spécifiée est " -"introuvable.\n" +"Impossible d'importer « %1 ». La clé de registre spécifiée est introuvable." #: programs/regedit/regedit.rc:408 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " regedit [options] [filename] [reg_key]\n" -#| "\n" -#| "Options:\n" -#| " [no option] Launch the graphical version of this program.\n" -#| " /L:system.dat The location of the system.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /R:user.dat The location of the user.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /C Import the contents of a registry file.\n" -#| " /D Delete a specified registry key.\n" -#| " /E Export the contents of a specified registry key to a " -#| "file.\n" -#| " If no key is specified, the entire registry is " -#| "exported.\n" -#| " /S Silent mode. No messages will be displayed.\n" -#| " /V Launch the GUI in advanced mode. Ignored.\n" -#| " /? Display this information and exit.\n" -#| " [filename] The location of the file containing registry information " -#| "to\n" -#| " be imported. When used with [/E], this option specifies " -#| "the\n" -#| " file location where registry information will be " -#| "exported.\n" -#| " [reg_key] The registry key to be modified.\n" -#| "\n" -#| "Usage examples:\n" -#| " regedit \"import.reg\"\n" -#| " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -#| " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgid "" "Usage:\n" " regedit [options] [filename] [reg_key]\n" @@ -17111,10 +16644,8 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "regedit : séquence d'échappement non reconnue [\\%1!c!]\n" #: programs/regedit/regedit.rc:420 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [0x%1!x!]\n" -msgstr "regedit : type de données de registre non pris en charge [%1]\n" +msgstr "regedit : type de données de registre non pris en charge [0x%1!x!]\n" #: programs/regedit/regedit.rc:421 msgid "regedit: Unexpected end of line in '%1'.\n" @@ -17134,11 +16665,10 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "regedit : impossible d'ouvrir la clé de registre « %1 ».\n" #: programs/regedit/regedit.rc:425 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" -msgstr "regedit : type de données de registre [%1] rencontré dans [%2].\n" +msgstr "" +"regedit : type de données de registre [0x%1!x!] rencontré dans « %2 ».\n" #: programs/regedit/regedit.rc:426 msgid "regedit: The registry value '%1' will be exported as binary data.\n" @@ -17146,10 +16676,8 @@ msgstr "" "regedit : la valeur de registre « %1 » sera exportée comme donnée binaire.\n" #: programs/regedit/regedit.rc:427 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid system key [%1]\n" -msgstr "reg : nom de clé invalide\n" +msgstr "regedit: Clé système non valide [%1]\n" #: programs/regedit/regedit.rc:428 msgid "" @@ -17159,20 +16687,14 @@ msgstr "" "introuvable.\n" #: programs/regedit/regedit.rc:429 -#, fuzzy -#| msgid "regedit: Unable to delete the registry class '%1'.\n" msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "regedit : impossible d'effacer la classe de registre « %1 ».\n" +msgstr "regedit : impossible d'effacer la clé de registre « %1 ».\n" #: programs/regedit/regedit.rc:431 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit : la ligne « %1 » n'a pas été reconnue.\n" +msgstr "regedit : la ligne « %1 » contient une syntaxe non reconnue.\n" #: programs/regedit/regedit.rc:187 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" msgstr "Quitte l'éditeur du registre" @@ -17189,8 +16711,6 @@ msgid "Shows or hides the status bar" msgstr "Affiche ou masque la barre d'état" #: programs/regedit/regedit.rc:191 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" msgstr "Modifie la position du séparateur entre les deux panneaux" @@ -17236,10 +16756,8 @@ msgid "Adds a new binary value" msgstr "Ajoute une nouvelle valeur binaire" #: programs/regedit/regedit.rc:174 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Ajoute une nouvelle valeur binaire" +msgstr "Ajoute une nouvelle valeur de 32 bits" #: programs/regedit/regedit.rc:177 msgid "Imports a text file into the registry" @@ -17254,10 +16772,8 @@ msgid "Prints all or part of the registry" msgstr "Imprime tout ou partie du registre" #: programs/regedit/regedit.rc:181 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Éditeur du registre" +msgstr "Ouvre l'aide de l'Éditeur du registre" #: programs/regedit/regedit.rc:182 msgid "Displays program information, version number and copyright" @@ -17266,38 +16782,28 @@ msgstr "" "copyright" #: programs/regedit/regedit.rc:206 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry value '%1'." -msgstr "regedit : impossible d'ouvrir la clé de registre « %1 ».\n" +msgstr "Impossible d'ouvrir la clé de registre « %1 »." #: programs/regedit/regedit.rc:207 -#, fuzzy -#| msgid "Can't edit keys of this type (%u)" msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "Ne peut éditer de clé du type %u" +msgstr "Ne peut éditer de clé du type (%1!u!)." #: programs/regedit/regedit.rc:208 -#, fuzzy -#| msgid "Value is too big (%u)" msgid "The value is too big (%1!u!)." -msgstr "La valeur est trop grande (%u)" +msgstr "La valeur est trop grande (%1!u!)." #: programs/regedit/regedit.rc:209 msgid "Confirm Value Delete" msgstr "Confirmez l'effacement de valeur" #: programs/regedit/regedit.rc:210 -#, fuzzy -#| msgid "Are you sure you want to delete the registry value '%1'?" msgid "Are you sure you want to delete the selected registry value?" -msgstr "Voulez-vous réellement supprimer la valeur de registre « %1 » ?" +msgstr "Voulez-vous réellement supprimer la valeur de registre sélectionnée ?" #: programs/regedit/regedit.rc:216 -#, fuzzy -#| msgid "Search string '%s' not found" msgid "Search complete. The string '%1' was not found." -msgstr "Occurrence de « %s » non trouvée" +msgstr "Recherche terminée. Occurrence de « %1 » non trouvée." #: programs/regedit/regedit.rc:211 msgid "Are you sure you want to delete these values?" @@ -17312,54 +16818,43 @@ msgid "New Value #%d" msgstr "Nouvelle valeur #%d" #: programs/regedit/regedit.rc:205 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry key '%1'." -msgstr "regedit : impossible d'ouvrir la clé de registre « %1 ».\n" +msgstr "Impossible d'ouvrir la clé de registre « %1 »." #: programs/regedit/regedit.rc:170 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Modifie les données d'une valeur" +msgstr "Modifie les données d'une valeur sous forme binaire" #: programs/regedit/regedit.rc:175 msgid "Adds a new multi-string value" msgstr "Ajoute une nouvelle valeur chaîne extensible" #: programs/regedit/regedit.rc:198 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" msgstr "Exporte la branche du registre sélectionnée dans un fichier texte" #: programs/regedit/regedit.rc:176 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Ajoute une nouvelle valeur chaîne" +msgstr "Ajoute une nouvelle valeur de chaîne extensible" #: programs/regedit/regedit.rc:212 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "Confirmez l'effacement de valeur" +msgstr "Confirmez l'effacement de la clé" #: programs/regedit/regedit.rc:213 -#, fuzzy -#| msgid "Are you sure you want to delete the registry key '%1'?" msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "Voulez-vous réellement supprimer la clé de registre « %1 » ?" +msgstr "" +"Voulez-vous réellement supprimer cette clé de registre ainsi que toutes ses " +"sous-clés ?" #: programs/regedit/regedit.rc:199 msgid "Expands or collapses the selected node" msgstr "" #: programs/regedit/regedit.rc:231 -#, fuzzy msgid "Collapse" -msgstr "réduit" +msgstr "Réduire" #: programs/regsvr32/regsvr32.rc:33 msgid "" @@ -17448,37 +16943,6 @@ msgid "regsvr32: Successfully uninstalled DLL '%1'\n" msgstr "regsvr32 : DLL « %1 » désinstallée avec succès\n" #: programs/start/start.rc:57 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files\n" -#| "with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with " -#| "its\n" -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows\n" -#| "Explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -17537,6 +17001,7 @@ msgstr "" " son code de sortie.\n" "/unix Interpréter fichier_programme ou fichier_document comme un\n" " chemin Unix.\n" +"/exec Ouvrir le fichier spécifié (usage interne à Wine).\\n\"\n" "/ProgIDOpen Ouvrir un document via le programme identifié par progID.\n" "/? Afficher cette aide et se terminer.\n" @@ -18689,15 +18154,11 @@ msgid "Drive configuration" msgstr "Configuration des lecteurs" #: programs/winecfg/winecfg.rc:232 -#, fuzzy -#| msgid "" -#| "Failed to connect to the mount manager, the drive configuration cannot be " -#| "edited." msgid "" "Failed to connect to the mount manager; the drive configuration cannot be " "edited." msgstr "" -"N'a pu se connecter au gestionnaire de montage : la configuration du lecteur " +"N'a pu se connecter au gestionnaire de montage ; la configuration du lecteur " "n'a pu être éditée." #: programs/winecfg/winecfg.rc:235 @@ -18980,12 +18441,6 @@ msgid "System drive" msgstr "Lecteur système" #: programs/winecfg/winecfg.rc:75 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete drive C?\n" -#| "\n" -#| "Most Windows applications expect drive C to exist, and will die messily " -#| "if it doesn't. If you proceed remember to recreate it!" msgid "" "Are you sure you want to delete drive C?\n" "\n" @@ -19415,10 +18870,8 @@ msgid "&Beginner" msgstr "&Débutant" #: programs/winemine/winemine.rc:45 -#, fuzzy -#| msgid "Interface" msgid "&Intermediate" -msgstr "Interface" +msgstr "&Intermédaire" #: programs/winemine/winemine.rc:46 msgid "&Expert" @@ -19449,20 +18902,16 @@ msgid "Beginner" msgstr "Débutant" #: programs/winemine/winemine.rc:65 -#, fuzzy -#| msgid "Interface" msgid "Intermediate" -msgstr "Interface" +msgstr "Intermédiaire" #: programs/winemine/winemine.rc:66 msgid "Expert" msgstr "Expert" #: programs/winemine/winemine.rc:74 programs/winemine/winemine.rc:33 -#, fuzzy -#| msgid "Result" msgid "Reset Results" -msgstr "Résultat" +msgstr "Effacer les résultats" #: programs/winemine/winemine.rc:80 msgid "Congratulations!" @@ -19852,8 +19301,6 @@ msgid "Text documents (*.txt)" msgstr "Documents texte (*.txt)" #: programs/wordpad/wordpad.rc:149 -#, fuzzy -#| msgid "Unicode text document (*.txt)" msgid "Unicode text documents (*.txt)" msgstr "Documents texte Unicode (*.txt)" @@ -20059,41 +19506,6 @@ msgid "D" msgstr "R" #: programs/xcopy/xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -20161,6 +19573,9 @@ msgstr "" "[/A] Ne copier que les fichiers ayant l'attribut archive défini.\n" "[/M] Ne copier que les fichiers ayant l'attribut archive défini ; supprime\n" " ensuite l'attribut.\n" +"[/K] Copier les attributs de fichier; sans cette option, les attributes ne " +"sont\n" +"pas préservés.\n" "[/D | /D:m-j-a] Ne copier que les nouveaux fichiers, ou ceux modifiés après " "la\n" "\t\tdate spécifiée. Si aucune date n'est fournie, ne copier que si\n"

1 1

[PATCH] po: Update Simplified Chinese translation.
by Jactry Zeng 01 Jan '22

01 Jan '22

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- po/zh_CN.po | 1865 ++++++++++++++++++++++----------------------------- 1 file changed, 796 insertions(+), 1069 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index e4860d4f83e..e793bf7d288 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -21,26 +21,20 @@ msgid "Security" msgstr "安全" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "用户名(&U)：" +msgstr "用户组或用户名(&G):" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "黄色" +msgstr "允许" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "拒绝" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Permission denied" msgid "Permissions for %1" -msgstr "没有权限" +msgstr "%1 的权限" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" @@ -122,39 +116,39 @@ msgstr "确定" #: dlls/appwiz.cpl/appwiz.rc:79 msgid "The following information can be used to get technical support for %s:" -msgstr "%s 技术支持信息：" +msgstr "以下信息可用于寻求 %s 的技术支持:" #: dlls/appwiz.cpl/appwiz.rc:80 msgid "Publisher:" -msgstr "生产商：" +msgstr "生产商:" #: dlls/appwiz.cpl/appwiz.rc:81 programs/winefile/winefile.rc:165 msgid "Version:" -msgstr "版本：" +msgstr "版本:" #: dlls/appwiz.cpl/appwiz.rc:82 msgid "Contact:" -msgstr "联系人：" +msgstr "联系人:" #: dlls/appwiz.cpl/appwiz.rc:83 msgid "Support Information:" -msgstr "支持信息：" +msgstr "支持信息:" #: dlls/appwiz.cpl/appwiz.rc:84 msgid "Support Telephone:" -msgstr "支持电话：" +msgstr "支持电话:" #: dlls/appwiz.cpl/appwiz.rc:85 msgid "Readme:" -msgstr "产品说明：" +msgstr "产品说明:" #: dlls/appwiz.cpl/appwiz.rc:86 msgid "Product Updates:" -msgstr "产品更新：" +msgstr "产品更新:" #: dlls/appwiz.cpl/appwiz.rc:87 msgid "Comments:" -msgstr "备注：" +msgstr "备注:" #: dlls/appwiz.cpl/appwiz.rc:100 msgid "Wine Gecko Installer" @@ -251,7 +245,7 @@ msgstr "添加/删除程序" msgid "" "Allows you to install new software, or remove existing software from your " "computer." -msgstr "允许你安装新软件或删除现有程序。" +msgstr "允许您安装新软件，或从您的计算机删除现有的软件。" #: dlls/appwiz.cpl/appwiz.rc:33 programs/taskmgr/taskmgr.rc:262 #: programs/winecfg/winecfg.rc:32 @@ -322,7 +316,7 @@ msgstr "压缩选项" #: dlls/avifil32/avifil32.rc:45 msgid "&Choose a stream:" -msgstr "选择来源流(&C)：" +msgstr "选择来源流(&C):" #: dlls/avifil32/avifil32.rc:48 programs/wordpad/wordpad.rc:76 msgid "&Options..." @@ -330,7 +324,7 @@ msgstr "选项(&O)..." #: dlls/avifil32/avifil32.rc:49 msgid "&Interleave every" -msgstr "交织(&I)：每" +msgstr "交织(&I): 每隔" #: dlls/avifil32/avifil32.rc:51 dlls/msvfw32/msvfw32.rc:51 msgid "frames" @@ -338,11 +332,11 @@ msgstr "帧数" #: dlls/avifil32/avifil32.rc:52 msgid "Current format:" -msgstr "当前格式：" +msgstr "当前格式:" #: dlls/avifil32/avifil32.rc:30 msgid "Waveform: %s" -msgstr "波形：%s" +msgstr "波形: %s" #: dlls/avifil32/avifil32.rc:31 msgid "Waveform" @@ -467,7 +461,7 @@ msgstr "下移(&D)" #: dlls/comctl32/comctl32.rc:105 msgid "A&vailable buttons:" -msgstr "可用工具栏按钮(&V)：" +msgstr "可用工具栏按钮(&V):" #: dlls/comctl32/comctl32.rc:107 msgid "&Add ->" @@ -479,7 +473,7 @@ msgstr "<- 删除(&R)" #: dlls/comctl32/comctl32.rc:109 msgid "&Toolbar buttons:" -msgstr "当前工具栏按钮(&T)：" +msgstr "当前工具栏按钮(&T):" #: dlls/comctl32/comctl32.rc:42 msgid "Separator" @@ -521,7 +515,7 @@ msgstr "关闭" #: dlls/comctl32/comctl32.rc:36 msgid "Today:" -msgstr "今天：" +msgstr "今天:" #: dlls/comctl32/comctl32.rc:37 msgid "Go to today" @@ -536,19 +530,19 @@ msgstr "打开" #: dlls/comdlg32/comdlg32.rc:161 dlls/comdlg32/comdlg32.rc:183 msgid "File &Name:" -msgstr "文件名(&N)：" +msgstr "文件名(&N):" #: dlls/comdlg32/comdlg32.rc:164 dlls/comdlg32/comdlg32.rc:186 msgid "&Directories:" -msgstr "文件夹(&D)：" +msgstr "文件夹(&D):" #: dlls/comdlg32/comdlg32.rc:167 dlls/comdlg32/comdlg32.rc:189 msgid "List Files of &Type:" -msgstr "文件类型(&T)：" +msgstr "文件类型(&T):" #: dlls/comdlg32/comdlg32.rc:169 dlls/comdlg32/comdlg32.rc:191 msgid "Dri&ves:" -msgstr "驱动器(&V)：" +msgstr "驱动器(&V):" #: dlls/comdlg32/comdlg32.rc:174 dlls/comdlg32/comdlg32.rc:196 #: dlls/shell32/shell32.rc:368 dlls/shell32/shell32.rc:405 @@ -572,7 +566,7 @@ msgstr "打印" #: dlls/comdlg32/comdlg32.rc:205 msgid "Printer:" -msgstr "打印机：" +msgstr "打印机:" #: dlls/comdlg32/comdlg32.rc:207 dlls/comdlg32/comdlg32.rc:375 msgid "Print range" @@ -597,15 +591,15 @@ msgstr "设置(&S)" #: dlls/comdlg32/comdlg32.rc:214 msgid "&From:" -msgstr "从(&F)：" +msgstr "从(&F):" #: dlls/comdlg32/comdlg32.rc:215 msgid "&To:" -msgstr "到(&T)：" +msgstr "到(&T):" #: dlls/comdlg32/comdlg32.rc:216 dlls/wineps.drv/wineps.rc:42 msgid "Print &Quality:" -msgstr "打印质量(&Q)：" +msgstr "打印质量(&Q):" #: dlls/comdlg32/comdlg32.rc:218 msgid "Print to Fi&le" @@ -669,16 +663,16 @@ msgstr "字体" #: dlls/comdlg32/comdlg32.rc:254 msgid "&Font:" -msgstr "字体(&F)：" +msgstr "字体(&F):" #: dlls/comdlg32/comdlg32.rc:257 msgid "Font St&yle:" -msgstr "字体样式(&Y)：" +msgstr "字体样式(&Y):" #: dlls/comdlg32/comdlg32.rc:260 dlls/comdlg32/comdlg32.rc:439 #: programs/winecfg/winecfg.rc:292 msgid "&Size:" -msgstr "大小(&S)：" +msgstr "大小(&S):" #: dlls/comdlg32/comdlg32.rc:267 msgid "Effects" @@ -694,7 +688,7 @@ msgstr "下划线(&U)" #: dlls/comdlg32/comdlg32.rc:270 programs/winecfg/winecfg.rc:290 msgid "&Color:" -msgstr "配色(&C)：" +msgstr "配色(&C):" #: dlls/comdlg32/comdlg32.rc:273 msgid "Sample" @@ -710,11 +704,11 @@ msgstr "颜色" #: dlls/comdlg32/comdlg32.rc:286 msgid "&Basic Colors:" -msgstr "基本颜色(&B)：" +msgstr "基本颜色(&B):" #: dlls/comdlg32/comdlg32.rc:287 msgid "&Custom Colors:" -msgstr "自定义颜色(&C)：" +msgstr "自定义颜色(&C):" #: dlls/comdlg32/comdlg32.rc:289 msgid "|S&olid" @@ -722,29 +716,29 @@ msgstr "|纯色(&O)" #: dlls/comdlg32/comdlg32.rc:290 msgid "&Red:" -msgstr "红(&R)：" +msgstr "红(&R):" #: dlls/comdlg32/comdlg32.rc:292 msgid "&Green:" -msgstr "绿(&G)：" +msgstr "绿(&G):" #: dlls/comdlg32/comdlg32.rc:294 msgid "&Blue:" -msgstr "蓝(&B)：" +msgstr "蓝(&B):" #: dlls/comdlg32/comdlg32.rc:296 msgid "&Hue:" -msgstr "色调(&E)：" +msgstr "色调(&E):" #: dlls/comdlg32/comdlg32.rc:298 msgctxt "Saturation" msgid "&Sat:" -msgstr "饱和度(&S)：" +msgstr "饱和度(&S):" #: dlls/comdlg32/comdlg32.rc:300 msgctxt "Luminance" msgid "&Lum:" -msgstr "亮度(&L)：" +msgstr "亮度(&L):" #: dlls/comdlg32/comdlg32.rc:310 msgid "&Add to Custom Colors" @@ -766,7 +760,7 @@ msgstr "查找" #: dlls/comdlg32/comdlg32.rc:321 dlls/comdlg32/comdlg32.rc:340 msgid "Fi&nd What:" -msgstr "查找(&N)：" +msgstr "查找(&N):" #: dlls/comdlg32/comdlg32.rc:323 dlls/comdlg32/comdlg32.rc:344 msgid "Match &Whole Word Only" @@ -798,7 +792,7 @@ msgstr "替换" #: dlls/comdlg32/comdlg32.rc:342 msgid "Re&place With:" -msgstr "替换为(&P)：" +msgstr "替换为(&P):" #: dlls/comdlg32/comdlg32.rc:348 msgid "&Replace" @@ -822,23 +816,23 @@ msgstr "打印到文件(&L)" #: dlls/comdlg32/comdlg32.rc:365 dlls/comdlg32/comdlg32.rc:401 #: dlls/msacm32/msacm32.rc:34 programs/winefile/winefile.rc:137 msgid "&Name:" -msgstr "名称(&N)：" +msgstr "名称(&N):" #: dlls/comdlg32/comdlg32.rc:366 dlls/comdlg32/comdlg32.rc:404 msgid "Status:" -msgstr "状态：" +msgstr "状态:" #: dlls/comdlg32/comdlg32.rc:368 dlls/comdlg32/comdlg32.rc:406 msgid "Type:" -msgstr "型号：" +msgstr "型号:" #: dlls/comdlg32/comdlg32.rc:370 dlls/comdlg32/comdlg32.rc:408 msgid "Where:" -msgstr "位置：" +msgstr "位置:" #: dlls/comdlg32/comdlg32.rc:372 dlls/comdlg32/comdlg32.rc:410 msgid "Comment:" -msgstr "备注：" +msgstr "备注:" #: dlls/comdlg32/comdlg32.rc:377 msgid "Pa&ges" @@ -850,11 +844,11 @@ msgstr "选中的范围(&S)" #: dlls/comdlg32/comdlg32.rc:381 msgid "&from:" -msgstr "从(&F)：" +msgstr "从(&F):" #: dlls/comdlg32/comdlg32.rc:382 msgid "&to:" -msgstr "到(&T)：" +msgstr "到(&T):" #: dlls/comdlg32/comdlg32.rc:384 msgid "Copies" @@ -862,7 +856,7 @@ msgstr "份数" #: dlls/comdlg32/comdlg32.rc:385 msgid "Number of &copies:" -msgstr "份数(&C)：" +msgstr "份数(&C):" #: dlls/comdlg32/comdlg32.rc:387 msgid "C&ollate" @@ -874,7 +868,7 @@ msgstr "大小(&Z):" #: dlls/comdlg32/comdlg32.rc:416 msgid "&Source:" -msgstr "纸张来源(&S)：" +msgstr "纸张来源(&S):" #: dlls/comdlg32/comdlg32.rc:421 msgid "P&ortrait" @@ -890,7 +884,7 @@ msgstr "页面设置" #: dlls/comdlg32/comdlg32.rc:441 msgid "&Tray:" -msgstr "托盘(&T)：" +msgstr "托盘(&T):" #: dlls/comdlg32/comdlg32.rc:444 dlls/wineps.drv/wineps.rc:35 msgid "&Portrait" @@ -898,19 +892,19 @@ msgstr "纵向(&P)" #: dlls/comdlg32/comdlg32.rc:447 msgid "L&eft:" -msgstr "左(&E)：" +msgstr "左(&E):" #: dlls/comdlg32/comdlg32.rc:449 programs/notepad/notepad.rc:112 msgid "&Right:" -msgstr "右(&R)：" +msgstr "右(&R):" #: dlls/comdlg32/comdlg32.rc:451 msgid "T&op:" -msgstr "上(&O)：" +msgstr "上(&O):" #: dlls/comdlg32/comdlg32.rc:453 programs/notepad/notepad.rc:114 msgid "&Bottom:" -msgstr "下(&B)：" +msgstr "下(&B):" #: dlls/comdlg32/comdlg32.rc:457 msgid "P&rinter..." @@ -918,7 +912,7 @@ msgstr "打印机(&P)..." #: dlls/comdlg32/comdlg32.rc:465 dlls/comdlg32/comdlg32.rc:490 msgid "Look &in:" -msgstr "浏览(&I)：" +msgstr "浏览(&I):" #: dlls/comdlg32/comdlg32.rc:471 dlls/comdlg32/comdlg32.rc:497 msgid "File &name:" @@ -926,7 +920,7 @@ msgstr "文件名(&N):" #: dlls/comdlg32/comdlg32.rc:475 dlls/comdlg32/comdlg32.rc:501 msgid "Files of &type:" -msgstr "文件类型(&T)：" +msgstr "文件类型(&T):" #: dlls/comdlg32/comdlg32.rc:478 dlls/comdlg32/comdlg32.rc:504 msgid "Open as &read-only" @@ -940,11 +934,11 @@ msgstr "打开(&O)" #: dlls/comdlg32/comdlg32.rc:517 msgid "File name:" -msgstr "文件名：" +msgstr "文件名:" #: dlls/comdlg32/comdlg32.rc:520 msgid "Files of type:" -msgstr "文件类型：" +msgstr "文件类型:" #: dlls/comdlg32/comdlg32.rc:33 dlls/vbscript/vbscript.rc:35 msgid "File not found" @@ -960,7 +954,7 @@ msgid "" "Do you want to create file?" msgstr "" "文件不存在。\n" -"是否创建新文件？" +"是否创建新文件?" #: dlls/comdlg32/comdlg32.rc:36 msgid "" @@ -968,7 +962,7 @@ msgid "" "Do you want to replace it?" msgstr "" "文件已经存在。\n" -"是否替换？" +"是否替换?" #: dlls/comdlg32/comdlg32.rc:37 msgid "Invalid character(s) in path" @@ -979,7 +973,7 @@ msgid "" "A filename cannot contain any of the following characters:\n" " / : < > |" msgstr "" -"文件名中不能包含任何以下字符：\n" +"文件名中不能包含任何以下字符:\n" " / : < > |" #: dlls/comdlg32/comdlg32.rc:39 @@ -1128,7 +1122,7 @@ msgid "" "This large number of copies is not supported by your printer.\n" "Please enter a value between 1 and %d." msgstr "" -"你的打印机不支持这么大的份数。\n" +"您的打印机不支持这么大的份数。\n" "请输入一个 1 和 %d 之间的数。" #: dlls/comdlg32/comdlg32.rc:68 @@ -1171,7 +1165,7 @@ msgstr "保存(&S)" #: dlls/comdlg32/comdlg32.rc:144 msgid "Save &in:" -msgstr "保存在(&I)：" +msgstr "保存在(&I):" #: dlls/comdlg32/comdlg32.rc:145 msgid "Save" @@ -1316,12 +1310,12 @@ msgstr "毫米" #: dlls/credui/credui.rc:45 msgid "&User name:" -msgstr "用户名(&U)：" +msgstr "用户名(&U):" #: dlls/credui/credui.rc:48 dlls/cryptui/cryptui.rc:402 #: dlls/oledb32/version.rc:81 msgid "&Password:" -msgstr "密码(&P)：" +msgstr "密码(&P):" #: dlls/credui/credui.rc:50 msgid "&Remember my password" @@ -1344,7 +1338,7 @@ msgid "" "Make sure that your user name\n" "and password are correct." msgstr "" -"请确认你输入的用户名和密码\n" +"请确认您输入的用户名和密码\n" "是否正确。" #: dlls/credui/credui.rc:35 @@ -1354,9 +1348,9 @@ msgid "" "Press the Caps Lock key on your keyboard to turn off Caps Lock before\n" "entering your password." msgstr "" -"开着大写锁定可能导致你输入错误的密码。\n" +"开着大写锁定可能导致您输入错误的密码。\n" "\n" -"建议你按下键盘上的 Caps Lock 键以关闭大写锁定，然后再输入密码。" +"建议您按下键盘上的 Caps Lock 键以关闭大写锁定，然后再输入密码。" #: dlls/credui/credui.rc:34 msgid "Caps Lock is On" @@ -1541,7 +1535,7 @@ msgstr "组织单元" #: dlls/crypt32/crypt32.rc:74 msgid "Common Name" -msgstr "通用名" +msgstr "公用名" #: dlls/crypt32/crypt32.rc:75 msgid "Locality" @@ -2188,7 +2182,7 @@ msgstr "证书策略" #: dlls/cryptdlg/cryptdlg.rc:31 msgid "Policy Identifier: " -msgstr "策略标识符：" +msgstr "策略标识符:" #: dlls/cryptdlg/cryptdlg.rc:32 msgid "Policy Qualifier Info" @@ -2234,7 +2228,7 @@ msgstr "颁发者声明(&S)" #: dlls/cryptui/cryptui.rc:205 msgid "&Show:" -msgstr "显示(&S)：" +msgstr "显示(&S):" #: dlls/cryptui/cryptui.rc:210 msgid "&Edit Properties..." @@ -2258,7 +2252,7 @@ msgstr "查看证书(&V)" #: dlls/cryptui/cryptui.rc:223 msgid "Certificate &status:" -msgstr "证书状态(&S)：" +msgstr "证书状态(&S):" #: dlls/cryptui/cryptui.rc:229 msgid "Disclaimer" @@ -2270,12 +2264,12 @@ msgstr "更多信息(&I)" #: dlls/cryptui/cryptui.rc:244 msgid "&Friendly name:" -msgstr "易记名称(&F)：" +msgstr "易记名称(&F):" #: dlls/cryptui/cryptui.rc:246 programs/progman/progman.rc:154 #: programs/progman/progman.rc:170 msgid "&Description:" -msgstr "描述(&D)：" +msgstr "描述(&D):" #: dlls/cryptui/cryptui.rc:248 msgid "Certificate purposes" @@ -2291,7 +2285,7 @@ msgstr "禁用此证书的所有用途(&I)" #: dlls/cryptui/cryptui.rc:253 msgid "Enable &only the following purposes for this certificate:" -msgstr "仅启用此证书的如下用途(&O)：" +msgstr "仅启用此证书的如下用途(&O):" #: dlls/cryptui/cryptui.rc:258 msgid "Add &Purpose..." @@ -2304,7 +2298,7 @@ msgstr "添加用途" #: dlls/cryptui/cryptui.rc:265 msgid "" "Add the object identifier (OID) for the certificate purpose you wish to add:" -msgstr "为您要添加的证书用途添加对象识别 (OID) ：" +msgstr "为您要添加的证书用途添加对象识别 (OID):" #: dlls/cryptui/cryptui.rc:273 dlls/cryptui/cryptui.rc:69 msgid "Select Certificate Store" @@ -2349,7 +2343,7 @@ msgstr "" #: dlls/cryptui/cryptui.rc:299 dlls/cryptui/cryptui.rc:435 msgid "&File name:" -msgstr "文件名(&F)：" +msgstr "文件名(&F):" #: dlls/cryptui/cryptui.rc:301 dlls/cryptui/cryptui.rc:323 #: dlls/cryptui/cryptui.rc:437 programs/winecfg/winecfg.rc:311 @@ -2360,7 +2354,7 @@ msgstr "浏览(&R)..." msgid "" "Note: The following file formats may contain more than one certificate, " "certificate revocation list, or certificate trust list:" -msgstr "注意：如下格式的文件可能包含多个证书、证书吊销列表或证书信任列表：" +msgstr "注意: 如下格式的文件可能包含多个证书、证书吊销列表或证书信任列表:" #: dlls/cryptui/cryptui.rc:304 msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" @@ -2387,7 +2381,7 @@ msgstr "自动选择证书存储(&A)" #: dlls/cryptui/cryptui.rc:320 msgid "&Place all certificates in the following store:" -msgstr "将所有证书放入此存储(&P)：" +msgstr "将所有证书放入此存储(&P):" #: dlls/cryptui/cryptui.rc:330 msgid "Completing the Certificate Import Wizard" @@ -2399,7 +2393,7 @@ msgstr "您已成功完成证书导入向导。" #: dlls/cryptui/cryptui.rc:334 dlls/cryptui/cryptui.rc:448 msgid "You have specified the following settings:" -msgstr "您已指定如下设置：" +msgstr "您已指定如下设置:" #: dlls/cryptui/cryptui.rc:342 dlls/cryptui/cryptui.rc:122 #: dlls/inetcpl.cpl/inetcpl.rc:111 @@ -2408,7 +2402,7 @@ msgstr "证书" #: dlls/cryptui/cryptui.rc:345 msgid "I&ntended purpose:" -msgstr "预期用途：" +msgstr "预期用途:" #: dlls/cryptui/cryptui.rc:349 msgid "&Import..." @@ -2451,7 +2445,7 @@ msgstr "选择一个或多个在选中高级用途后要列出的用途。" #: dlls/cryptui/cryptui.rc:366 msgid "&Certificate purposes:" -msgstr "证书用途(&C)：" +msgstr "证书用途(&C):" #: dlls/cryptui/cryptui.rc:375 dlls/cryptui/cryptui.rc:386 #: dlls/cryptui/cryptui.rc:399 dlls/cryptui/cryptui.rc:409 @@ -2491,7 +2485,7 @@ msgstr "如果您选择导出私钥，将提示您创建密码以保护后页的 #: dlls/cryptui/cryptui.rc:390 msgid "Do you wish to export the private key?" -msgstr "您希望导出私钥吗？" +msgstr "您希望导出私钥吗?" #: dlls/cryptui/cryptui.rc:391 msgid "&Yes, export the private key" @@ -2503,11 +2497,11 @@ msgstr "否，不要导出私钥(&O)" #: dlls/cryptui/cryptui.rc:404 msgid "&Confirm password:" -msgstr "确认密码(&C)：" +msgstr "确认密码(&C):" #: dlls/cryptui/cryptui.rc:412 msgid "Select the format you want to use:" -msgstr "选择您希望使用的格式：" +msgstr "选择您希望使用的格式:" #: dlls/cryptui/cryptui.rc:413 msgid "&DER-encoded X.509 (*.cer)" @@ -2515,7 +2509,7 @@ msgstr "&DER 加密的 X.509 (*.cer)" #: dlls/cryptui/cryptui.rc:415 msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "Ba&se64 加密的 X.509 (*.cer)：" +msgstr "Ba&se64 加密的 X.509 (*.cer):" #: dlls/cryptui/cryptui.rc:417 msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" @@ -2591,15 +2585,15 @@ msgstr "证书的所有预期用途均无法验证。" #: dlls/cryptui/cryptui.rc:37 msgid "This certificate is intended for the following purposes:" -msgstr "该证书的预期用途如下：" +msgstr "该证书的预期用途如下:" #: dlls/cryptui/cryptui.rc:38 msgid "Issued to: " -msgstr "颁发给：" +msgstr "颁发给: " #: dlls/cryptui/cryptui.rc:39 msgid "Issued by: " -msgstr "颁发者：" +msgstr "颁发者: " #: dlls/cryptui/cryptui.rc:40 msgid "Valid from " @@ -2684,7 +2678,7 @@ msgstr "公钥" #: dlls/cryptui/cryptui.rc:61 msgid "%1 (%2!d! bits)" -msgstr "%1（%2!d! 位）" +msgstr "%1 (%2!d! 位)" #: dlls/cryptui/cryptui.rc:62 msgid "SHA1 hash" @@ -2692,7 +2686,7 @@ msgstr "SHA1 哈希值" #: dlls/cryptui/cryptui.rc:63 msgid "Enhanced key usage (property)" -msgstr "增强密钥用途（财产）" +msgstr "增强密钥用途 (属性)" #: dlls/cryptui/cryptui.rc:64 msgid "Friendly name" @@ -2854,7 +2848,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "您已不能使用此证书解密或签名消息。\n" -"您确实要移除此证书吗？" +"您确实要移除此证书吗?" #: dlls/cryptui/cryptui.rc:111 msgid "" @@ -2863,7 +2857,7 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "您已不能使用这些证书解密或签名消息。\n" -"您确实要移除这些证书吗？" +"您确实要移除这些证书吗?" #: dlls/cryptui/cryptui.rc:112 msgid "" @@ -2872,7 +2866,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "您已不能使用此证书加密或校验消息。\n" -"您确实要移除此证书吗？" +"您确实要移除此证书吗?" #: dlls/cryptui/cryptui.rc:113 msgid "" @@ -2881,7 +2875,7 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "您已不能使用这些证书加密或校验消息。\n" -"您确实要移除这些证书吗？" +"您确实要移除这些证书吗?" #: dlls/cryptui/cryptui.rc:114 msgid "" @@ -2890,7 +2884,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "将不再信任由此证书颁发机构颁发的证书。\n" -"您确实要移除此证书吗？" +"您确实要移除此证书吗?" #: dlls/cryptui/cryptui.rc:115 msgid "" @@ -2899,7 +2893,7 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "将不再信任由这些证书颁发机构颁发的证书。\n" -"您确实要移除这些证书吗？" +"您确实要移除这些证书吗?" #: dlls/cryptui/cryptui.rc:116 msgid "" @@ -2908,7 +2902,7 @@ msgid "" "Are you sure you want to remove this trusted root certificate?" msgstr "" "将不再信任由此根证书颁发机构颁发的证书或证书颁发机构。\n" -"您确实要移除此已信任的根证书吗？" +"您确实要移除此已信任的根证书吗?" #: dlls/cryptui/cryptui.rc:117 msgid "" @@ -2917,7 +2911,7 @@ msgid "" "Are you sure you want to remove these trusted root certificates?" msgstr "" "将不再信任由这些根证书颁发机构颁发的证书或证书颁发机构。\n" -"您确实要移除这些已信任的根证书吗？" +"您确实要移除这些已信任的根证书吗?" #: dlls/cryptui/cryptui.rc:118 msgid "" @@ -2925,7 +2919,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "将不再信任由此发行商签名的软件。\n" -"您确实要移除此证书吗？" +"您确实要移除此证书吗?" #: dlls/cryptui/cryptui.rc:119 msgid "" @@ -2933,15 +2927,15 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "将不再信任由这些发行商签名的软件。\n" -"您确实要移除这些证书吗？" +"您确实要移除这些证书吗?" #: dlls/cryptui/cryptui.rc:120 msgid "Are you sure you want to remove this certificate?" -msgstr "您确实要移除此证书吗？" +msgstr "您确实要移除此证书吗?" #: dlls/cryptui/cryptui.rc:121 msgid "Are you sure you want to remove these certificates?" -msgstr "您确实要移除这些证书吗？" +msgstr "您确实要移除这些证书吗?" #: dlls/cryptui/cryptui.rc:124 msgid "Ensures the identity of a remote computer" @@ -3001,7 +2995,7 @@ msgstr "指定用于保存内容的文件名称。" #: dlls/cryptui/cryptui.rc:155 msgid "The specified file already exists. Do you want to replace it?" -msgstr "指定文件已经存在。是否替换？" +msgstr "指定文件已经存在。您要替换它吗?" #: dlls/cryptui/cryptui.rc:156 msgid "DER-Encoded Binary X.509 (*.cer)" @@ -3063,11 +3057,11 @@ msgstr "密码不一致。" #: dlls/cryptui/cryptui.rc:175 msgid "Note: The private key for this certificate could not be opened." -msgstr "注意：无法打开该证书的私钥。" +msgstr "注意: 无法打开该证书的私钥。" #: dlls/cryptui/cryptui.rc:176 msgid "Note: The private key for this certificate is not exportable." -msgstr "注意：证书的私钥不可导出。" +msgstr "注意: 证书的私钥不可导出。" #: dlls/cryptui/cryptui.rc:177 msgid "Intended Use" @@ -3456,7 +3450,7 @@ msgstr "请指定您希望在 Internet Explorer 中打开的 URL" #: dlls/ieframe/ieframe.rc:94 msgid "Open:" -msgstr "打开：" +msgstr "打开:" #: dlls/ieframe/ieframe.rc:70 msgctxt "home page" @@ -3604,7 +3598,7 @@ msgstr "使用自动代理服务器配置 (PAC) 脚本" #: dlls/inetcpl.cpl/inetcpl.rc:128 dlls/inetcpl.cpl/inetcpl.rc:132 msgid "Address:" -msgstr "地址：" +msgstr "地址:" #: dlls/inetcpl.cpl/inetcpl.rc:130 msgid "Proxy server" @@ -3616,7 +3610,7 @@ msgstr "使用代理服务器" #: dlls/inetcpl.cpl/inetcpl.rc:134 msgid "Port:" -msgstr "端口：" +msgstr "端口:" #: dlls/inetcpl.cpl/inetcpl.rc:31 msgid "Internet Settings" @@ -3628,7 +3622,7 @@ msgstr "配置 Wine Internet Explorer 以及相关设置" #: dlls/inetcpl.cpl/inetcpl.rc:33 msgid "Security settings for zone: " -msgstr "此区域的安全设置：" +msgstr "此区域的安全设置: " #: dlls/inetcpl.cpl/inetcpl.rc:34 msgid "Custom" @@ -3663,30 +3657,24 @@ msgid "&Disable" msgstr "停用(&D)" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy -#| msgid "Reset" msgid "&Reset" -msgstr "重设" +msgstr "重置(&R)" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" msgstr "启用(&E)" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "编辑顶替" +msgstr "重写(&O)" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" msgstr "已连接" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "语音输入设备：" +msgstr "已连接 (xinput 设备)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" @@ -3930,21 +3918,19 @@ msgstr "无法在此对象上更改属性描述符中的“writable”属性为 #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "" +msgstr "无法定义属性 '|': 对象不可扩展" #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" -msgstr "无法重定义不可配置的属性“|”" +msgstr "无法重定义不可配置的属性 '|'" #: dlls/jscript/jscript.rc:76 msgid "Cannot modify non-writable property '|'" -msgstr "无法更改不可写的属性“|”" +msgstr "无法更改不可写的属性 '|'" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "'[object]' 不是日期对象" +msgstr "'this' 不是 Map 对象" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" @@ -4785,19 +4771,19 @@ msgstr "注册表损坏。\n" #: dlls/kernel32/winerror.mc:1068 msgid "Invalid key.\n" -msgstr "无效的键。\n" +msgstr "无效的项。\n" #: dlls/kernel32/winerror.mc:1073 msgid "Can't open registry key.\n" -msgstr "无法打开注册表键。\n" +msgstr "无法打开注册表项。\n" #: dlls/kernel32/winerror.mc:1078 msgid "Can't read registry key.\n" -msgstr "无法读取注册表键。\n" +msgstr "无法读取注册表项。\n" #: dlls/kernel32/winerror.mc:1083 msgid "Can't write registry key.\n" -msgstr "无法写入注册表键。\n" +msgstr "无法写入注册表项。\n" #: dlls/kernel32/winerror.mc:1088 msgid "Registry has been recovered.\n" @@ -4817,7 +4803,7 @@ msgstr "不是注册表文件。\n" #: dlls/kernel32/winerror.mc:1108 msgid "Key deleted.\n" -msgstr "键已删除。\n" +msgstr "注册表项已删除。\n" #: dlls/kernel32/winerror.mc:1113 msgid "No registry log space.\n" @@ -4825,11 +4811,11 @@ msgstr "注册表日志空间耗尽。\n" #: dlls/kernel32/winerror.mc:1118 msgid "Registry key has subkeys.\n" -msgstr "注册表键包含子键。\n" +msgstr "注册表项包含子项。\n" #: dlls/kernel32/winerror.mc:1123 msgid "Subkey must be volatile.\n" -msgstr "子键必须为可变。\n" +msgstr "子项必须为可变。\n" #: dlls/kernel32/winerror.mc:1128 msgid "Notify change request in progress.\n" @@ -6940,10 +6926,8 @@ msgid "Resource is not currently available.\n" msgstr "资源当前不可用。\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy -#| msgid "Class Name:" msgid "Classic Blue" -msgstr "类名：" +msgstr "经典蓝" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73 @@ -6951,569 +6935,468 @@ msgid "Normal" msgstr "普通" #: dlls/localspl/localspl.rc:37 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter" -msgstr "盘符" +msgstr "信纸" #: dlls/localspl/localspl.rc:38 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Small" -msgstr "盘符" +msgstr "小号信纸" #: dlls/localspl/localspl.rc:39 -#, fuzzy -#| msgid "&Table" msgid "Tabloid" -msgstr "表格(&T)" +msgstr "Tabloid" #: dlls/localspl/localspl.rc:40 msgid "Ledger" -msgstr "" +msgstr "Ledger" #: dlls/localspl/localspl.rc:41 msgid "Legal" -msgstr "" +msgstr "法律专用纸" #: dlls/localspl/localspl.rc:42 -#, fuzzy -#| msgid "State" msgid "Statement" -msgstr "状态" +msgstr "Statement" #: dlls/localspl/localspl.rc:43 -#, fuzzy -#| msgid "&Execute..." msgid "Executive" -msgstr "执行(&E)..." +msgstr "Executive" #: dlls/localspl/localspl.rc:44 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A3" -msgstr "A" +msgstr "A3" #: dlls/localspl/localspl.rc:45 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A4" -msgstr "A" +msgstr "A4" #: dlls/localspl/localspl.rc:46 -#, fuzzy -#| msgid "Small" msgid "A4 Small" -msgstr "小号" +msgstr "小号 A4" #: dlls/localspl/localspl.rc:47 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A5" -msgstr "A" +msgstr "A5" #: dlls/localspl/localspl.rc:48 msgid "B4 (JIS)" -msgstr "" +msgstr "B4 (JIS)" #: dlls/localspl/localspl.rc:49 msgid "B5 (JIS)" -msgstr "" +msgstr "B5 (JIS)" #: dlls/localspl/localspl.rc:50 msgid "Folio" -msgstr "" +msgstr "对开" #: dlls/localspl/localspl.rc:51 msgid "Quarto" -msgstr "" +msgstr "四开" #: dlls/localspl/localspl.rc:52 msgid "10x14" -msgstr "" +msgstr "10x14" #: dlls/localspl/localspl.rc:53 msgid "11x17" -msgstr "" +msgstr "11x17" #: dlls/localspl/localspl.rc:54 -#, fuzzy -#| msgid "Notepad" msgid "Note" -msgstr "记事本" +msgstr "便笺" #: dlls/localspl/localspl.rc:55 msgid "Envelope #9" -msgstr "" +msgstr "信封 #9" #: dlls/localspl/localspl.rc:56 msgid "Envelope #10" -msgstr "" +msgstr "信封 #10" #: dlls/localspl/localspl.rc:57 msgid "Envelope #11" -msgstr "" +msgstr "信封 #11" #: dlls/localspl/localspl.rc:58 msgid "Envelope #12" -msgstr "" +msgstr "信封 #12" #: dlls/localspl/localspl.rc:59 msgid "Envelope #14" -msgstr "" +msgstr "信封 #14" #: dlls/localspl/localspl.rc:60 msgid "C size sheet" -msgstr "" +msgstr "C 型纸" #: dlls/localspl/localspl.rc:61 msgid "D size sheet" -msgstr "" +msgstr "D 型纸" #: dlls/localspl/localspl.rc:62 msgid "E size sheet" -msgstr "" +msgstr "E 型纸" #: dlls/localspl/localspl.rc:63 msgid "Envelope DL" -msgstr "" +msgstr "信封 DL" #: dlls/localspl/localspl.rc:64 msgid "Envelope C5" -msgstr "" +msgstr "信封 C5" #: dlls/localspl/localspl.rc:65 msgid "Envelope C3" -msgstr "" +msgstr "信封 C3" #: dlls/localspl/localspl.rc:66 msgid "Envelope C4" -msgstr "" +msgstr "信封 C4" #: dlls/localspl/localspl.rc:67 msgid "Envelope C6" -msgstr "" +msgstr "信封 C6" #: dlls/localspl/localspl.rc:68 msgid "Envelope C65" -msgstr "" +msgstr "信封 C65" #: dlls/localspl/localspl.rc:69 msgid "Envelope B4" -msgstr "" +msgstr "信封 B4" #: dlls/localspl/localspl.rc:70 msgid "Envelope B5" -msgstr "" +msgstr "信封 B5" #: dlls/localspl/localspl.rc:71 msgid "Envelope B6" -msgstr "" +msgstr "信封 B6" #: dlls/localspl/localspl.rc:72 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "Envelope" -msgstr "已封装的 PKCS 7" +msgstr "信封" #: dlls/localspl/localspl.rc:73 msgid "Envelope Monarch" -msgstr "" +msgstr "信封 Monarch" #: dlls/localspl/localspl.rc:74 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "6 3/4 Envelope" -msgstr "已封装的 PKCS 7" +msgstr "6 3/4 信封" #: dlls/localspl/localspl.rc:75 msgid "US Std Fanfold" -msgstr "" +msgstr "美国标准复写簿" #: dlls/localspl/localspl.rc:76 msgid "German Std Fanfold" -msgstr "" +msgstr "德国标准复写簿" #: dlls/localspl/localspl.rc:77 msgid "German Legal Fanfold" -msgstr "" +msgstr "德国法律专用复写簿" #: dlls/localspl/localspl.rc:78 msgid "B4 (ISO)" -msgstr "" +msgstr "B4 (ISO)" #: dlls/localspl/localspl.rc:79 -#, fuzzy -#| msgid "Japanese" msgid "Japanese Postcard" -msgstr "日语" +msgstr "日式明信片" #: dlls/localspl/localspl.rc:80 msgid "9x11" -msgstr "" +msgstr "9x11" #: dlls/localspl/localspl.rc:81 msgid "10x11" -msgstr "" +msgstr "10x11" #: dlls/localspl/localspl.rc:82 msgid "15x11" -msgstr "" +msgstr "15x11" #: dlls/localspl/localspl.rc:83 msgid "Envelope Invite" -msgstr "" +msgstr "邀请信封" #: dlls/localspl/localspl.rc:84 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Extra" -msgstr "盘符" +msgstr "特大信纸" #: dlls/localspl/localspl.rc:85 msgid "Legal Extra" -msgstr "" +msgstr "特大法律专用纸" #: dlls/localspl/localspl.rc:86 msgid "Tabloid Extra" -msgstr "" +msgstr "特大 Tabloid" #: dlls/localspl/localspl.rc:87 -#, fuzzy -#| msgid "E&xtras" msgid "A4 Extra" -msgstr "其他(&X)" +msgstr "特大 A4" #: dlls/localspl/localspl.rc:88 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "Letter Transverse" -msgstr "横向" +msgstr "信纸横向" #: dlls/localspl/localspl.rc:89 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A4 Transverse" -msgstr "横向" +msgstr "A4 横向" #: dlls/localspl/localspl.rc:90 msgid "Letter Extra Transverse" -msgstr "" +msgstr "特大信纸横向" #: dlls/localspl/localspl.rc:91 msgid "Super A" -msgstr "" +msgstr "超大 A" #: dlls/localspl/localspl.rc:92 msgid "Super B" -msgstr "" +msgstr "超大 B" #: dlls/localspl/localspl.rc:93 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Plus" -msgstr "盘符" +msgstr "加大信纸" #: dlls/localspl/localspl.rc:94 msgid "A4 Plus" -msgstr "" +msgstr "加大 A4" #: dlls/localspl/localspl.rc:95 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A5 Transverse" -msgstr "横向" +msgstr "A5 横向" #: dlls/localspl/localspl.rc:96 msgid "B5 (JIS) Transverse" -msgstr "" +msgstr "B5 (JIS) 横向" #: dlls/localspl/localspl.rc:97 -#, fuzzy -#| msgid "E&xtras" msgid "A3 Extra" -msgstr "其他(&X)" +msgstr "特大 A3" #: dlls/localspl/localspl.rc:98 -#, fuzzy -#| msgid "E&xtras" msgid "A5 Extra" -msgstr "其他(&X)" +msgstr "特大 A5" #: dlls/localspl/localspl.rc:99 msgid "B5 (ISO) Extra" -msgstr "" +msgstr "特大 B5 (ISO)" #: dlls/localspl/localspl.rc:100 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A2" -msgstr "A" +msgstr "A2" #: dlls/localspl/localspl.rc:101 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A3 Transverse" -msgstr "横向" +msgstr "A3 横向" #: dlls/localspl/localspl.rc:102 msgid "A3 Extra Transverse" -msgstr "" +msgstr "特大 A3 横向" #: dlls/localspl/localspl.rc:103 msgid "Japanese Double Postcard" -msgstr "" +msgstr "日式双层明信片" #: dlls/localspl/localspl.rc:104 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A6" -msgstr "A" +msgstr "A6" #: dlls/localspl/localspl.rc:105 msgid "Japanese Envelope Kaku #2" -msgstr "" +msgstr "日式信封 Kaku #2" #: dlls/localspl/localspl.rc:106 msgid "Japanese Envelope Kaku #3" -msgstr "" +msgstr "日式信封 Kaku #3" #: dlls/localspl/localspl.rc:107 msgid "Japanese Envelope Chou #3" -msgstr "" +msgstr "日式信封 Chou #3" #: dlls/localspl/localspl.rc:108 msgid "Japanese Envelope Chou #4" -msgstr "" +msgstr "日式信封 Chou #4" #: dlls/localspl/localspl.rc:109 msgid "Letter Rotated" -msgstr "" +msgstr "信纸旋转" #: dlls/localspl/localspl.rc:110 msgid "A3 Rotated" -msgstr "" +msgstr "A3 旋转" #: dlls/localspl/localspl.rc:111 msgid "A4 Rotated" -msgstr "" +msgstr "A4 旋转" #: dlls/localspl/localspl.rc:112 msgid "A5 Rotated" -msgstr "" +msgstr "A5 旋转" #: dlls/localspl/localspl.rc:113 msgid "B4 (JIS) Rotated" -msgstr "" +msgstr "B4 (JIS) 旋转" #: dlls/localspl/localspl.rc:114 msgid "B5 (JIS) Rotated" -msgstr "" +msgstr "B5 (JIS) 旋转" #: dlls/localspl/localspl.rc:115 msgid "Japanese Postcard Rotated" -msgstr "" +msgstr "日式明信片旋转" #: dlls/localspl/localspl.rc:116 msgid "Double Japan Postcard Rotated" -msgstr "" +msgstr "日式双层明信片旋转" #: dlls/localspl/localspl.rc:117 msgid "A6 Rotated" -msgstr "" +msgstr "A6 旋转" #: dlls/localspl/localspl.rc:118 msgid "Japan Envelope Kaku #2 Rotated" -msgstr "" +msgstr "日式信封 Kaku #2 旋转" #: dlls/localspl/localspl.rc:119 msgid "Japan Envelope Kaku #3 Rotated" -msgstr "" +msgstr "日式信封 Kaku #3 旋转" #: dlls/localspl/localspl.rc:120 msgid "Japan Envelope Chou #3 Rotated" -msgstr "" +msgstr "日式信封 Chou #3 旋转" #: dlls/localspl/localspl.rc:121 msgid "Japan Envelope Chou #4 Rotated" -msgstr "" +msgstr "日式信封 Chou #4 旋转" #: dlls/localspl/localspl.rc:122 msgid "B6 (JIS)" -msgstr "" +msgstr "B6 (JIS)" #: dlls/localspl/localspl.rc:123 msgid "B6 (JIS) Rotated" -msgstr "" +msgstr "B6 (JIS) 旋转" #: dlls/localspl/localspl.rc:124 msgid "12x11" -msgstr "" +msgstr "12x11" #: dlls/localspl/localspl.rc:125 msgid "Japan Envelope You #4" -msgstr "" +msgstr "日式信纸 You #4" #: dlls/localspl/localspl.rc:126 msgid "Japan Envelope You #4 Rotated" -msgstr "" +msgstr "日式信纸 You #4 旋转" #: dlls/localspl/localspl.rc:127 msgid "PRC 16K" -msgstr "" +msgstr "中国 16 开" #: dlls/localspl/localspl.rc:128 msgid "PRC 32K" -msgstr "" +msgstr "中国 32 开" #: dlls/localspl/localspl.rc:129 msgid "PRC 32K(Big)" -msgstr "" +msgstr "中国 32 开 (大)" #: dlls/localspl/localspl.rc:130 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #1" #: dlls/localspl/localspl.rc:131 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #2" #: dlls/localspl/localspl.rc:132 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #3" #: dlls/localspl/localspl.rc:133 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #4" #: dlls/localspl/localspl.rc:134 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #5" #: dlls/localspl/localspl.rc:135 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #6" #: dlls/localspl/localspl.rc:136 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #7" #: dlls/localspl/localspl.rc:137 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #8" #: dlls/localspl/localspl.rc:138 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #9" #: dlls/localspl/localspl.rc:139 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #10" #: dlls/localspl/localspl.rc:140 msgid "PRC 16K Rotated" -msgstr "" +msgstr "中国 16 开旋转" #: dlls/localspl/localspl.rc:141 msgid "PRC 32K Rotated" -msgstr "" +msgstr "中国 32 开旋转" #: dlls/localspl/localspl.rc:142 msgid "PRC 32K(Big) Rotated" -msgstr "" +msgstr "中国 32 开 (大) 旋转" #: dlls/localspl/localspl.rc:143 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #1 旋转" #: dlls/localspl/localspl.rc:144 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #2 旋转" #: dlls/localspl/localspl.rc:145 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #3 旋转" #: dlls/localspl/localspl.rc:146 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #4 旋转" #: dlls/localspl/localspl.rc:147 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #5 旋转" #: dlls/localspl/localspl.rc:148 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #6 旋转" #: dlls/localspl/localspl.rc:149 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #7 旋转" #: dlls/localspl/localspl.rc:150 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #8 旋转" #: dlls/localspl/localspl.rc:151 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #9 旋转" #: dlls/localspl/localspl.rc:152 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #10 旋转" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -7530,7 +7413,7 @@ msgstr "添加本地端口" #: dlls/localui/localui.rc:42 msgid "&Enter the port name to add:" -msgstr "添加本地端口名称(&E)：" +msgstr "添加本地端口名称(&E):" #: dlls/localui/localui.rc:51 msgid "Configure LPT Port" @@ -7542,7 +7425,7 @@ msgstr "超时(秒)" #: dlls/localui/localui.rc:55 msgid "&Transmission Retry:" -msgstr "重试通讯(&T)：" +msgstr "重试通讯(&T):" #: dlls/localui/localui.rc:32 msgid "'%s' is not a valid port name" @@ -7962,7 +7845,7 @@ msgstr "输入网络密码" #: dlls/mpr/mpr.rc:38 dlls/wininet/wininet.rc:51 dlls/wininet/wininet.rc:71 msgid "Please enter your username and password:" -msgstr "请输入用户名和密码：" +msgstr "请输入用户名和密码:" #: dlls/mpr/mpr.rc:39 dlls/wininet/wininet.rc:52 msgid "Proxy" @@ -7994,11 +7877,11 @@ msgstr "保存为(&S)..." #: dlls/msacm32/msacm32.rc:42 msgid "&Format:" -msgstr "格式(&F)：" +msgstr "格式(&F):" #: dlls/msacm32/msacm32.rc:47 msgid "&Attributes:" -msgstr "属性(&A)：" +msgstr "属性(&A):" #: dlls/mshtml/mshtml.rc:39 msgid "Hyperlink" @@ -8010,11 +7893,11 @@ msgstr "超链接信息" #: dlls/mshtml/mshtml.rc:43 programs/winecfg/winecfg.rc:243 msgid "&Type:" -msgstr "类型(&T)：" +msgstr "类型(&T):" #: dlls/mshtml/mshtml.rc:45 msgid "&URL:" -msgstr "网址(&U)：" +msgstr "网址(&U):" #: dlls/mshtml/mshtml.rc:34 msgid "HTML Document" @@ -8076,31 +7959,31 @@ msgid "" msgstr "" "Windows Installer %s\n" "\n" -"用法：\n" +"用法:\n" "msiexec 命令 {必要参数} [可选参数]\n" "\n" -"安装产品：\n" +"安装产品:\n" "\t/i {安装包|产品序列号} [属性]\n" "\t/package {安装包|产品序列号} [属性]\n" "\t/a package [属性]\n" -"修复安装：\n" +"修复安装:\n" "\t/f[p|o|e|d|c|a|u|m|s|v] {产品|序列号}\n" -"卸载产品：\n" +"卸载产品:\n" "\t/uninstall {产品|序列号} [属性]\n" "\t/x {产品|序列号} [属性]\n" -"宣传产品：\n" +"宣传产品:\n" "\t/j[u|m] package [/t 变形] [/g 语言代号]\n" "应用补丁\n" "\t/p 补丁包 [属性]\n" "\t/p 补丁包 /a 安装包 [属性]\n" -"以上命令的日志和用户界面修饰：\n" +"以上命令的日志和用户界面修饰:\n" "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] 日志文件\n" "\t/q{|n|b|r|f|n+|b+|b-}\n" -"注册 MSI 服务：\n" +"注册 MSI 服务:\n" "\t/y\n" -"取消注册 MSI 服务：\n" +"取消注册 MSI 服务:\n" "\t/z\n" -"显示此帮助信息：\n" +"显示此帮助信息:\n" "\t/help\n" "\t/?\n" @@ -8118,7 +8001,7 @@ msgstr "本功能的网络驱动器不存在" #: dlls/msi/msi.rc:64 msgid "feature from:" -msgstr "功能来自：" +msgstr "功能来自:" #: dlls/msi/msi.rc:65 msgid "choose which folder contains %s" @@ -8374,87 +8257,87 @@ msgstr "正在写入系统注册表值" #: dlls/msi/msi.rc:161 msgid "Free space: [1]" -msgstr "可用空间： [1]" +msgstr "可用空间: [1]" #: dlls/msi/msi.rc:162 msgid "Property: [1], Signature: [2]" -msgstr "属性：[1]，签名：[2]" +msgstr "属性: [1]，签名: [2]" #: dlls/msi/msi.rc:163 msgid "File: [1]" -msgstr "文件：[1]" +msgstr "文件: [1]" #: dlls/msi/msi.rc:164 dlls/msi/msi.rc:191 msgid "Folder: [1]" -msgstr "文件夹：[1]" +msgstr "文件夹: [1]" #: dlls/msi/msi.rc:165 dlls/msi/msi.rc:194 msgid "Shortcut: [1]" -msgstr "快捷方式：[1]" +msgstr "快捷方式: [1]" #: dlls/msi/msi.rc:166 dlls/msi/msi.rc:197 dlls/msi/msi.rc:198 msgid "Service: [1]" -msgstr "服务：[1]" +msgstr "服务: [1]" #: dlls/msi/msi.rc:167 dlls/msi/msi.rc:170 dlls/msi/msi.rc:174 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "文件：[1]，路径：[9]，大小：[6]" +msgstr "文件: [1]，路径: [9]，大小: [6]" #: dlls/msi/msi.rc:168 msgid "Found application: [1]" -msgstr "找到应用程序：[1]" +msgstr "找到应用程序: [1]" #: dlls/msi/msi.rc:169 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "文件：[1]，路径：[9]，大小：[6]" +msgstr "文件: [1]，路径: [9]，大小: [6]" #: dlls/msi/msi.rc:171 msgid "Service: [2]" -msgstr "服务：[2]" +msgstr "服务: [2]" #: dlls/msi/msi.rc:172 msgid "File: [1], Dependencies: [2]" -msgstr "文件：[1]，依赖项：[2]" +msgstr "文件: [1]，依赖项: [2]" #: dlls/msi/msi.rc:173 msgid "Application: [1]" -msgstr "应用程序：[1]" +msgstr "应用程序: [1]" #: dlls/msi/msi.rc:175 dlls/msi/msi.rc:176 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "应用程序上下文：[1]，组装名称：[2]" +msgstr "应用程序上下文: [1]，组装名称: [2]" #: dlls/msi/msi.rc:177 msgid "File: [1], Directory: [2], Size: [3]" -msgstr "文件：[1]，路径：[2]，大小：[3]" +msgstr "文件: [1]，路径: [2]，大小: [3]" #: dlls/msi/msi.rc:178 dlls/msi/msi.rc:199 msgid "Component ID: [1], Qualifier: [2]" -msgstr "组件 ID：[1]，修饰符：[2]" +msgstr "组件 ID: [1]，修饰符: [2]" #: dlls/msi/msi.rc:179 dlls/msi/msi.rc:200 msgid "Feature: [1]" -msgstr "特性：[1]" +msgstr "特性: [1]" #: dlls/msi/msi.rc:180 dlls/msi/msi.rc:201 msgid "Class Id: [1]" -msgstr "类 ID：[1]" +msgstr "类 ID: [1]" #: dlls/msi/msi.rc:181 msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" -msgstr "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" +msgstr "应用程序 ID: [1]{{，应用程序类型: [2]，用户: [3]，RSN: [4]}}" #: dlls/msi/msi.rc:182 dlls/msi/msi.rc:203 msgid "Extension: [1]" -msgstr "扩展名：[1]" +msgstr "扩展名: [1]" #: dlls/msi/msi.rc:183 dlls/msi/msi.rc:204 msgid "Font: [1]" -msgstr "字体：[1]" +msgstr "字体: [1]" #: dlls/msi/msi.rc:184 dlls/msi/msi.rc:205 msgid "MIME Content Type: [1], Extension: [2]" -msgstr "MIME 内容类型：[1]，扩展名：[2]" +msgstr "MIME 内容类型: [1]，扩展名: [2]" #: dlls/msi/msi.rc:185 dlls/msi/msi.rc:206 msgid "ProgId: [1]" @@ -8466,27 +8349,27 @@ msgstr "LibID: [1]" #: dlls/msi/msi.rc:187 dlls/msi/msi.rc:190 msgid "File: [1], Directory: [9]" -msgstr "文件：[1]，路径：[9]" +msgstr "文件: [1]，路径: [9]" #: dlls/msi/msi.rc:188 dlls/msi/msi.rc:208 msgid "Name: [1], Value: [2], Action [3]" -msgstr "名称：[1]，值：[2]，动作 [3]" +msgstr "名称: [1]，值: [2]，动作 [3]" #: dlls/msi/msi.rc:189 msgid "Application: [1], Command line: [2]" -msgstr "应用程序：[1]，命令行：[2]" +msgstr "应用程序: [1]，命令行: [2]" #: dlls/msi/msi.rc:192 dlls/msi/msi.rc:209 msgid "File: [1], Section: [2], Key: [3], Value: [4]" -msgstr "文件：[1]，板块：[2]，键：[3]，值：［4]" +msgstr "文件: [1]，节: [2]，项: [3]，值:［4]" #: dlls/msi/msi.rc:193 msgid "Key: [1], Name: [2]" -msgstr "键：[1]，名称：[2]" +msgstr "项: [1]，名称: [2]" #: dlls/msi/msi.rc:195 dlls/msi/msi.rc:196 msgid "File: [1], Folder: [2]" -msgstr "文件：[1]，文件夹：[2]" +msgstr "文件: [1]，文件夹: [2]" #: dlls/msi/msi.rc:202 msgid "AppId: [1]{{, AppType: [2]}}" @@ -8494,11 +8377,11 @@ msgstr "AppId: [1]{{, AppType: [2]}}" #: dlls/msi/msi.rc:210 msgid "Key: [1], Name: [2], Value: [3]" -msgstr "键：[1]，名称：[2]，值：[3]" +msgstr "项: [1]，名称: [2]，值: [3]" #: dlls/msi/msi.rc:72 msgid "{{Fatal error: }}" -msgstr "{{致命错误：}}" +msgstr "{{致命错误: }}" #: dlls/msi/msi.rc:73 msgid "{{Error [1]. }}" @@ -8519,41 +8402,41 @@ msgid "" "arguments are: [2], [3], [4]}}" msgstr "" "安装程序在安装此软件包时遇到了未预期的错误。这可能代表软件包存在问题。错误码" -"为 [1]。{{参数为：[2]，[3]，[4]}}" +"为 [1]。{{参数为: [2]，[3]，[4]}}" #: dlls/msi/msi.rc:77 msgid "{{Disk full: }}" -msgstr "{{磁盘已满：}}" +msgstr "{{磁盘已满: }}" #: dlls/msi/msi.rc:78 msgid "Action [Time]: [1]. [2]" -msgstr "操作 [Time]：[1]。[2]" +msgstr "操作 [Time]: [1]。[2]" #: dlls/msi/msi.rc:79 msgid "Message type: [1], Argument: [2]{, [3]}" -msgstr "消息类型：[1]，参数：[2]{, [3]}" +msgstr "消息类型: [1]，参数: [2]{，[3]}" #: dlls/msi/msi.rc:82 msgid "=== Logging started: [Date] [Time] ===" -msgstr "=== 日志开头：[Date] [Time] ===" +msgstr "=== 日志开头: [Date] [Time] ===" #: dlls/msi/msi.rc:80 msgid "Action start [Time]: [1]." -msgstr "操作开始 [Time]：[1]。" +msgstr "操作开始 [Time]: [1]。" #: dlls/msi/msi.rc:81 msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "操作结束 [Time]：[1]。返回值 [2]。" +msgstr "操作结束 [Time]: [1]。返回值 [2]。" #: dlls/msi/msi.rc:84 msgid "Please insert the disk: [2]" -msgstr "请插入磁盘：[2]" +msgstr "请插入磁盘: [2]" #: dlls/msi/msi.rc:85 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." -msgstr "找不到源文件{{(cabinet)}}：[2]。请检查文件是否存在且可被您访问。" +msgstr "找不到源文件{{(cabinet)}}: [2]。请检查文件是否存在且可被您访问。" #: dlls/msrle32/msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -8573,7 +8456,7 @@ msgstr "视频压缩" #: dlls/msvfw32/msvfw32.rc:39 msgid "&Compressor:" -msgstr "压缩器(&C)：" +msgstr "压缩器(&C):" #: dlls/msvfw32/msvfw32.rc:42 msgid "Con&figure..." @@ -8585,7 +8468,7 @@ msgstr "关于(&A)" #: dlls/msvfw32/msvfw32.rc:47 msgid "Compression &Quality:" -msgstr "压缩质量(&Q)：" +msgstr "压缩质量(&Q):" #: dlls/msvfw32/msvfw32.rc:49 msgid "&Key Frame Every" @@ -9049,7 +8932,7 @@ msgstr "提供者" #: dlls/oledb32/version.rc:59 msgid "Select the data you want to connect to:" -msgstr "选择您想要连接的数据源：" +msgstr "选择您想要连接的数据源:" #: dlls/oledb32/version.rc:66 msgid "Connection" @@ -9057,11 +8940,11 @@ msgstr "连接" #: dlls/oledb32/version.rc:69 msgid "Specify the following to connect to ODBC data:" -msgstr "指定以下内容以连接到 ODBC 数据源：" +msgstr "指定以下内容以连接到 ODBC 数据源:" #: dlls/oledb32/version.rc:70 msgid "1. Specify the source of data:" -msgstr "1. 指定数据源：" +msgstr "1. 指定数据源:" #: dlls/oledb32/version.rc:71 msgid "Use &data source name" @@ -9073,7 +8956,7 @@ msgstr "使用连接字符串(&O)" #: dlls/oledb32/version.rc:75 msgid "&Connection string:" -msgstr "连接字符串(&C)：" +msgstr "连接字符串(&C):" #: dlls/oledb32/version.rc:77 msgid "B&uild..." @@ -9085,7 +8968,7 @@ msgstr "2. 输入服务器登录信息" #: dlls/oledb32/version.rc:79 msgid "User &name:" -msgstr "用户名(&N)：" +msgstr "用户名(&N):" #: dlls/oledb32/version.rc:83 msgid "&Blank password" @@ -9097,7 +8980,7 @@ msgstr "允许保存密码(&S)" #: dlls/oledb32/version.rc:85 msgid "3. Enter the &initial catalog to use:" -msgstr "3. 输入要使用的初始目录：" +msgstr "3. 输入要使用的初始目录:" #: dlls/oledb32/version.rc:87 msgid "&Test Connection" @@ -9113,15 +8996,15 @@ msgstr "网络设置" #: dlls/oledb32/version.rc:96 msgid "&Impersonation level:" -msgstr "模拟级别(&I)：" +msgstr "模拟级别(&I):" #: dlls/oledb32/version.rc:98 msgid "P&rotection level:" -msgstr "保护级别(&R)：" +msgstr "保护级别(&R):" #: dlls/oledb32/version.rc:101 msgid "Connect:" -msgstr "连接：" +msgstr "连接:" #: dlls/oledb32/version.rc:103 msgid "seconds." @@ -9129,7 +9012,7 @@ msgstr "秒。" #: dlls/oledb32/version.rc:104 msgid "A&ccess:" -msgstr "访问(&A)：" +msgstr "访问(&A):" #: dlls/oledb32/version.rc:110 msgid "All" @@ -9203,7 +9086,7 @@ msgstr "插入对象" #: dlls/oledlg/oledlg.rc:61 msgid "Object Type:" -msgstr "对象类型：" +msgstr "对象类型:" #: dlls/oledlg/oledlg.rc:64 dlls/oledlg/oledlg.rc:102 msgid "Result" @@ -9235,7 +9118,7 @@ msgstr "浏览..." #: dlls/oledlg/oledlg.rc:76 msgid "File:" -msgstr "文件：" +msgstr "文件:" #: dlls/oledlg/oledlg.rc:82 msgid "Paste Special" @@ -9243,7 +9126,7 @@ msgstr "特殊粘贴" #: dlls/oledlg/oledlg.rc:85 dlls/setupapi/setupapi.rc:43 msgid "Source:" -msgstr "源文件：" +msgstr "源文件:" #: dlls/oledlg/oledlg.rc:86 dlls/shdoclc/shdoclc.rc:50 #: dlls/shdoclc/shdoclc.rc:82 dlls/shdoclc/shdoclc.rc:95 @@ -9259,7 +9142,7 @@ msgstr "粘贴链接(&L)" #: dlls/oledlg/oledlg.rc:90 msgid "&As:" -msgstr "为(&A)：" +msgstr "为(&A):" #: dlls/oledlg/oledlg.rc:97 msgid "&Display As Icon" @@ -9271,14 +9154,14 @@ msgstr "改变图标(&I)..." #: dlls/oledlg/oledlg.rc:28 msgid "Insert a new %s object into your document" -msgstr "在你的文件中插入一个新的 %s 对象" +msgstr "在您的文件中插入一个新的 %s 对象" #: dlls/oledlg/oledlg.rc:29 msgid "" "Insert the contents of the file as an object into your document so that you " "may activate it using the program which created it." msgstr "" -"将文件的内容以对象的方式插入到你的文件以便你可以用创建本文件的程序来激活它。" +"将文件的内容以对象的方式插入到您的文件以便您可以用创建本文件的程序来激活它。" #: dlls/oledlg/oledlg.rc:30 dlls/shell32/shell32.rc:195 msgid "Browse" @@ -9312,20 +9195,20 @@ msgstr "对象(&O)" #: dlls/oledlg/oledlg.rc:41 msgid "Inserts the contents of the clipboard into your document as %s." -msgstr "将剪贴板的内容以 %s 插入到你的文件。" +msgstr "将剪贴板的内容以 %s 插入到您的文件。" #: dlls/oledlg/oledlg.rc:42 msgid "" "Inserts the contents of the clipboard into your document so that you can " "activate it using %s." -msgstr "将剪贴板的内容插入到你的文件以便你可以使用 %s。" +msgstr "将剪贴板的内容插入到您的文件以便您可以使用 %s。" #: dlls/oledlg/oledlg.rc:43 msgid "" "Inserts the contents of the clipboard into your document so that you can " "activate it using %s. It will be displayed as an icon." msgstr "" -"将剪贴板的内容插入到你的文件，你可以用 %s 激活它。插入的内容会显示为图标。" +"将剪贴板的内容插入到您的文件，您可以用 %s 激活它。插入的内容会显示为图标。" #: dlls/oledlg/oledlg.rc:44 msgid "" @@ -9333,8 +9216,8 @@ msgid "" "linked to the source file so that changes to the file will be reflected in " "your document." msgstr "" -"将剪贴板的内容以 %s 插入到你的文件。数据是链接到源文件的, 对源文件的任何改动" -"都会反映到反映到你的文档中。" +"将剪贴板的内容以 %s 插入到您的文件。数据是链接到源文件的, 对源文件的任何改动" +"都会反映到反映到您的文档中。" #: dlls/oledlg/oledlg.rc:45 msgid "" @@ -9342,7 +9225,7 @@ msgid "" "is linked to the source file so that changes to the file will be reflected " "in your document." msgstr "" -"插入剪贴板中的图片。图片是链接到源文件的，对源文件的任何改动都会反映到你的文" +"插入剪贴板中的图片。图片是链接到源文件的，对源文件的任何改动都会反映到您的文" "档中。" #: dlls/oledlg/oledlg.rc:46 @@ -9352,11 +9235,11 @@ msgid "" "be reflected in your document." msgstr "" "插入指向剪贴板中文件的快捷方式。快捷方式是链接到源文件的，对源文件的任何改动" -"都会反映到你的文档中。" +"都会反映到您的文档中。" #: dlls/oledlg/oledlg.rc:47 msgid "Inserts the contents of the clipboard into your document." -msgstr "将剪贴板的内容插入到你的文件。" +msgstr "将剪贴板的内容插入到您的文件。" #: dlls/oledlg/oledlg.rc:48 programs/regedit/regedit.rc:430 msgid "Unknown Type" @@ -9434,7 +9317,7 @@ msgstr "复制文件..." #: dlls/setupapi/setupapi.rc:45 msgid "Destination:" -msgstr "目标文件：" +msgstr "目标文件:" #: dlls/setupapi/setupapi.rc:52 msgid "Files Needed" @@ -9448,11 +9331,11 @@ msgstr "插入厂商的安装磁盘，然后确定下面选择了正确的驱动 #: dlls/setupapi/setupapi.rc:57 msgid "Copy manufacturer's files from:" -msgstr "从此处复制厂商文件：" +msgstr "从此处复制厂商文件:" #: dlls/setupapi/setupapi.rc:31 msgid "The file '%1' on %2 is needed" -msgstr "需要 %2 上的文件“%1”" +msgstr "需要 %2 上的文件 '%1'" #: dlls/setupapi/setupapi.rc:32 programs/ipconfig/ipconfig.rc:34 msgid "Unknown" @@ -9460,7 +9343,7 @@ msgstr "未知" #: dlls/setupapi/setupapi.rc:33 msgid "Copy files from:" -msgstr "文件复制来源：" +msgstr "文件复制来源:" #: dlls/setupapi/setupapi.rc:34 msgid "Type the path where the file is located, and then click OK." @@ -9860,7 +9743,7 @@ msgstr "选择文件夹" #: dlls/shell32/shell32.rc:291 msgid "Folder:" -msgstr "文件夹：" +msgstr "文件夹:" #: dlls/shell32/shell32.rc:297 msgid "&Make New Folder" @@ -9888,7 +9771,7 @@ msgstr "运行于 %s" #: dlls/shell32/shell32.rc:327 msgid "Wine was brought to you by:" -msgstr "Wine 开发人员：" +msgstr "Wine 开发者:" #: dlls/shell32/shell32.rc:332 msgid "Run" @@ -9902,7 +9785,7 @@ msgstr "输入程序，目录，文件或者Internet资源名，Wine将为您打 #: dlls/shell32/shell32.rc:337 msgid "&Open:" -msgstr "打开(&O)：" +msgstr "打开(&O):" #: dlls/shell32/shell32.rc:341 programs/progman/progman.rc:182 #: programs/progman/progman.rc:201 programs/progman/progman.rc:218 @@ -9912,25 +9795,25 @@ msgstr "浏览(&B)..." #: dlls/shell32/shell32.rc:353 dlls/shell32/shell32.rc:382 msgid "File type:" -msgstr "文件类型：" +msgstr "文件类型:" #: dlls/shell32/shell32.rc:357 dlls/shell32/shell32.rc:390 #: dlls/urlmon/urlmon.rc:37 programs/explorer/explorer.rc:33 msgid "Location:" -msgstr "位置：" +msgstr "位置:" #: dlls/shell32/shell32.rc:359 dlls/shell32/shell32.rc:392 #: programs/winefile/winefile.rc:169 msgid "Size:" -msgstr "大小：" +msgstr "大小:" #: dlls/shell32/shell32.rc:363 dlls/shell32/shell32.rc:396 msgid "Creation date:" -msgstr "创建日期：" +msgstr "创建日期:" #: dlls/shell32/shell32.rc:367 dlls/shell32/shell32.rc:404 msgid "Attributes:" -msgstr "属性：" +msgstr "属性:" #: dlls/shell32/shell32.rc:369 dlls/shell32/shell32.rc:406 #: programs/winefile/winefile.rc:173 @@ -9944,7 +9827,7 @@ msgstr "存档(&A)" #: dlls/shell32/shell32.rc:384 msgid "Open with:" -msgstr "打开方式：" +msgstr "打开方式:" #: dlls/shell32/shell32.rc:387 msgid "&Change..." @@ -9952,11 +9835,11 @@ msgstr "更改(&C)..." #: dlls/shell32/shell32.rc:398 msgid "Last modified:" -msgstr "最近修改：" +msgstr "最近修改:" #: dlls/shell32/shell32.rc:400 msgid "Last accessed:" -msgstr "最近访问：" +msgstr "最近访问:" #: dlls/shell32/shell32.rc:138 dlls/shell32/shell32.rc:142 #: programs/winefile/winefile.rc:107 @@ -10154,7 +10037,7 @@ msgstr "下载" #: dlls/shell32/shell32.rc:167 msgid "Unable to create new Folder: Permission denied." -msgstr "无法创建新文件夹：拒绝访问。" +msgstr "无法创建新文件夹: 拒绝访问。" #: dlls/shell32/shell32.rc:168 msgid "Error during creation of a new folder" @@ -10263,7 +10146,7 @@ msgid "" msgstr "" "文件 %1 已经存在。\n" "\n" -"是否替换？" +"您要替换它吗?" #: dlls/shell32/shell32.rc:248 msgid "" @@ -10273,7 +10156,7 @@ msgid "" msgstr "" "文件夹 %1 已经存在。\n" "\n" -"是否替换？" +"您要替换它吗?" #: dlls/shell32/shell32.rc:249 msgid "Confirm overwrite" @@ -10357,7 +10240,7 @@ msgstr "中国夏令时" #: dlls/tzres/tzres.rc:128 msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" -msgstr "" +msgstr "(UTC+08:00) 北京，重庆，香港，乌鲁木齐" #: dlls/tzres/tzres.rc:267 msgid "North Asia Standard Time" @@ -10369,7 +10252,7 @@ msgstr "北亚夏令时" #: dlls/tzres/tzres.rc:269 msgid "(UTC+07:00) Krasnoyarsk" -msgstr "" +msgstr "(UTC+07:00) 雅茨克" #: dlls/tzres/tzres.rc:168 msgid "Georgian Standard Time" @@ -10381,17 +10264,15 @@ msgstr "格鲁吉亚夏令时" #: dlls/tzres/tzres.rc:170 msgid "(UTC+04:00) Tbilisi" -msgstr "" +msgstr "(UTC+04:00) 第比利斯" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 msgid "UTC+12" -msgstr "" +msgstr "UTC+12" #: dlls/tzres/tzres.rc:395 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC+12:00) Coordinated Universal Time+12" -msgstr "协调世界时" +msgstr "(UTC+12:00) 协调世界时+12" #: dlls/tzres/tzres.rc:252 msgid "Nepal Standard Time" @@ -10403,7 +10284,7 @@ msgstr "尼泊尔夏令时" #: dlls/tzres/tzres.rc:254 msgid "(UTC+05:45) Kathmandu" -msgstr "" +msgstr "(UTC+05:45) 加德满都" #: dlls/tzres/tzres.rc:90 msgid "Cape Verde Standard Time" @@ -10415,7 +10296,7 @@ msgstr "佛得角夏令时" #: dlls/tzres/tzres.rc:92 msgid "(UTC-01:00) Cabo Verde Is." -msgstr "" +msgstr "(UTC-01:00) 佛得角群岛" #: dlls/tzres/tzres.rc:183 msgid "Haiti Standard Time" @@ -10427,7 +10308,7 @@ msgstr "海地夏令时" #: dlls/tzres/tzres.rc:185 msgid "(UTC-05:00) Haiti" -msgstr "" +msgstr "(UTC-05:00) 海地" #: dlls/tzres/tzres.rc:111 msgid "Central European Standard Time" @@ -10439,7 +10320,7 @@ msgstr "中欧夏令时" #: dlls/tzres/tzres.rc:113 msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" -msgstr "" +msgstr "(UTC+01:00) 萨拉热窝，斯科普里，华沙，萨格勒布" #: dlls/tzres/tzres.rc:234 msgid "Morocco Standard Time" @@ -10451,33 +10332,27 @@ msgstr "摩洛哥夏令时" #: dlls/tzres/tzres.rc:236 msgid "(UTC+01:00) Casablanca" -msgstr "" +msgstr "(UTC+01:00) 卡萨布兰卡" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 msgid "UTC-08" -msgstr "" +msgstr "UTC-08" #: dlls/tzres/tzres.rc:404 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-08:00) Coordinated Universal Time-08" -msgstr "协调世界时" +msgstr "(UTC-08:00) 协调世界时-8" #: dlls/tzres/tzres.rc:39 -#, fuzzy -#| msgid "Atlantic Standard Time" msgid "Altai Standard Time" -msgstr "大西洋标准时间" +msgstr "阿尔泰标准时间" #: dlls/tzres/tzres.rc:40 -#, fuzzy -#| msgid "Atlantic Daylight Time" msgid "Altai Daylight Time" -msgstr "大西洋夏令时" +msgstr "阿尔泰夏令时" #: dlls/tzres/tzres.rc:41 msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" -msgstr "" +msgstr "(UTC+07:00) 巴尔瑙尔，戈尔诺-阿尔泰斯克" #: dlls/tzres/tzres.rc:108 msgid "Central Europe Standard Time" @@ -10489,7 +10364,7 @@ msgstr "中欧夏令时" #: dlls/tzres/tzres.rc:110 msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" -msgstr "" +msgstr "(UTC+01:00) 贝尔格莱德，布拉迪斯拉发，布达佩斯，卢布尔雅那，布拉格" #: dlls/tzres/tzres.rc:192 msgid "Iran Standard Time" @@ -10501,7 +10376,7 @@ msgstr "伊朗夏令时" #: dlls/tzres/tzres.rc:194 msgid "(UTC+03:30) Tehran" -msgstr "" +msgstr "(UTC+03:30) 德黑兰" #: dlls/tzres/tzres.rc:318 msgid "Saint Pierre Standard Time" @@ -10512,26 +10387,20 @@ msgid "Saint Pierre Daylight Time" msgstr "圣皮埃尔夏令时" #: dlls/tzres/tzres.rc:320 -#, fuzzy -#| msgid "Saint Pierre Standard Time" msgid "(UTC-03:00) Saint Pierre and Miquelon" -msgstr "圣皮埃尔标准时间" +msgstr "(UTC-03:00) 圣皮埃尔和密克隆" #: dlls/tzres/tzres.rc:327 -#, fuzzy -#| msgid "Samoa Standard Time" msgid "Sao Tome Standard Time" -msgstr "萨摩亚标准时间" +msgstr "圣多美标准时间" #: dlls/tzres/tzres.rc:328 -#, fuzzy -#| msgid "Samoa Daylight Time" msgid "Sao Tome Daylight Time" -msgstr "萨摩亚夏令时" +msgstr "圣多美夏令时" #: dlls/tzres/tzres.rc:329 msgid "(UTC+00:00) Sao Tome" -msgstr "" +msgstr "(UTC+00:00) 圣多美" #: dlls/tzres/tzres.rc:249 msgid "Namibia Standard Time" @@ -10543,7 +10412,7 @@ msgstr "纳米比亚夏令时" #: dlls/tzres/tzres.rc:251 msgid "(UTC+02:00) Windhoek" -msgstr "" +msgstr "(UTC+02:00) 温得和克" #: dlls/tzres/tzres.rc:369 msgid "Tonga Standard Time" @@ -10555,19 +10424,19 @@ msgstr "汤加夏令时" #: dlls/tzres/tzres.rc:371 msgid "(UTC+13:00) Nuku'alofa" -msgstr "" +msgstr "(UTC+13:00) 努库阿洛法" #: dlls/tzres/tzres.rc:240 msgid "Mountain Standard Time (Mexico)" -msgstr "山地标准时间（墨西哥）" +msgstr "山地标准时间 (墨西哥)" #: dlls/tzres/tzres.rc:241 msgid "Mountain Daylight Time (Mexico)" -msgstr "山地夏令时（墨西哥）" +msgstr "山地夏令时 (墨西哥)" #: dlls/tzres/tzres.rc:242 msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" -msgstr "" +msgstr "(UTC-07:00) 奇瓦瓦，拉巴斯，马萨特兰" #: dlls/tzres/tzres.rc:171 msgid "GMT Standard Time" @@ -10579,23 +10448,19 @@ msgstr "格林尼治夏令时" #: dlls/tzres/tzres.rc:173 msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" -msgstr "" +msgstr "(UTC+00:00) 柏林，爱丁堡，里斯本，伦敦" #: dlls/tzres/tzres.rc:342 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "South Sudan Standard Time" -msgstr "约旦标准时间" +msgstr "南苏丹标准时间" #: dlls/tzres/tzres.rc:343 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "South Sudan Daylight Time" -msgstr "约旦夏令时" +msgstr "南苏丹夏令时" #: dlls/tzres/tzres.rc:344 msgid "(UTC+02:00) Juba" -msgstr "" +msgstr "(UTC+02:00) 朱巴" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" @@ -10607,7 +10472,7 @@ msgstr "中亚夏令时" #: dlls/tzres/tzres.rc:104 msgid "(UTC+06:00) Astana" -msgstr "" +msgstr "(UTC+06:00) 阿斯塔纳" #: dlls/tzres/tzres.rc:213 msgid "Lord Howe Standard Time" @@ -10619,7 +10484,7 @@ msgstr "豪勋爵夏令时" #: dlls/tzres/tzres.rc:215 msgid "(UTC+10:30) Lord Howe Island" -msgstr "" +msgstr "(UTC+10:30) 豪勋爵岛" #: dlls/tzres/tzres.rc:48 msgid "Arabic Standard Time" @@ -10631,17 +10496,15 @@ msgstr "阿拉伯夏令时" #: dlls/tzres/tzres.rc:50 msgid "(UTC+03:00) Baghdad" -msgstr "" +msgstr "(UTC+03:00) 巴格达" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 msgid "UTC+13" -msgstr "" +msgstr "UTC+13" #: dlls/tzres/tzres.rc:398 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC+13:00) Coordinated Universal Time+13" -msgstr "协调世界时" +msgstr "(UTC+13:00) 协调世界时+13" #: dlls/tzres/tzres.rc:216 msgid "Magadan Standard Time" @@ -10653,7 +10516,7 @@ msgstr "马加丹夏令时" #: dlls/tzres/tzres.rc:218 msgid "(UTC+11:00) Magadan" -msgstr "" +msgstr "(UTC+11:00) 马加丹" #: dlls/tzres/tzres.rc:258 msgid "Newfoundland Standard Time" @@ -10665,23 +10528,19 @@ msgstr "纽芬兰夏令时" #: dlls/tzres/tzres.rc:260 msgid "(UTC-03:30) Newfoundland" -msgstr "" +msgstr "(UTC-03:30) 纽芬兰" #: dlls/tzres/tzres.rc:348 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "Sudan Standard Time" -msgstr "约旦标准时间" +msgstr "苏丹标准时间" #: dlls/tzres/tzres.rc:349 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "Sudan Daylight Time" -msgstr "约旦夏令时" +msgstr "苏丹夏令时" #: dlls/tzres/tzres.rc:350 msgid "(UTC+02:00) Khartoum" -msgstr "" +msgstr "(UTC+02:00) 喀土穆" #: dlls/tzres/tzres.rc:438 msgid "West Pacific Standard Time" @@ -10693,7 +10552,7 @@ msgstr "西太平洋夏令时" #: dlls/tzres/tzres.rc:440 msgid "(UTC+10:00) Guam, Port Moresby" -msgstr "" +msgstr "(UTC+10:00) 关岛，莫尔兹比港" #: dlls/tzres/tzres.rc:279 msgid "Pacific Standard Time" @@ -10705,7 +10564,7 @@ msgstr "太平洋夏令时" #: dlls/tzres/tzres.rc:281 msgid "(UTC-08:00) Pacific Time (US & Canada)" -msgstr "" +msgstr "(UTC-08:00) 太平洋时间 (美国和加拿大)" #: dlls/tzres/tzres.rc:69 msgid "Azerbaijan Standard Time" @@ -10717,7 +10576,7 @@ msgstr "阿塞拜疆夏令时" #: dlls/tzres/tzres.rc:71 msgid "(UTC+04:00) Baku" -msgstr "" +msgstr "(UTC+04:00) 巴库" #: dlls/tzres/tzres.rc:219 msgid "Magallanes Standard Time" @@ -10729,7 +10588,7 @@ msgstr "麦哲伦夏令时" #: dlls/tzres/tzres.rc:221 msgid "(UTC-03:00) Punta Arenas" -msgstr "" +msgstr "(UTC-03:00) 蓬塔阿雷纳斯" #: dlls/tzres/tzres.rc:324 msgid "Samoa Standard Time" @@ -10741,7 +10600,7 @@ msgstr "萨摩亚夏令时" #: dlls/tzres/tzres.rc:326 msgid "(UTC+13:00) Samoa" -msgstr "" +msgstr "(UTC+13:00) 萨摩亚" #: dlls/tzres/tzres.rc:201 msgid "Kaliningrad Standard Time" @@ -10753,19 +10612,19 @@ msgstr "加里宁格勒夏令时" #: dlls/tzres/tzres.rc:203 msgid "(UTC+02:00) Kaliningrad" -msgstr "" +msgstr "(UTC+02:00) 加里宁格勒" #: dlls/tzres/tzres.rc:282 msgid "Pacific Standard Time (Mexico)" -msgstr "太平洋标准时间（墨西哥）" +msgstr "太平洋标准时间 (墨西哥)" #: dlls/tzres/tzres.rc:283 msgid "Pacific Daylight Time (Mexico)" -msgstr "太平洋夏令时（墨西哥）" +msgstr "太平洋夏令时 (墨西哥)" #: dlls/tzres/tzres.rc:284 msgid "(UTC-08:00) Baja California" -msgstr "" +msgstr "(UTC-08:00) 下加利福尼亚" #: dlls/tzres/tzres.rc:228 msgid "Middle East Standard Time" @@ -10777,7 +10636,7 @@ msgstr "中东夏令时" #: dlls/tzres/tzres.rc:230 msgid "(UTC+02:00) Beirut" -msgstr "" +msgstr "(UTC+02:00) 贝鲁特" #: dlls/tzres/tzres.rc:363 msgid "Tokyo Standard Time" @@ -10789,7 +10648,7 @@ msgstr "东京夏令时" #: dlls/tzres/tzres.rc:365 msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" -msgstr "" +msgstr "(UTC+09:00) 大阪，札幌，东京" #: dlls/tzres/tzres.rc:210 msgid "Line Islands Standard Time" @@ -10801,7 +10660,7 @@ msgstr "莱恩群岛夏令时" #: dlls/tzres/tzres.rc:212 msgid "(UTC+14:00) Kiritimati Island" -msgstr "" +msgstr "(UTC+14:00) 圣诞岛" #: dlls/tzres/tzres.rc:129 msgid "Cuba Standard Time" @@ -10813,7 +10672,7 @@ msgstr "古巴夏令时" #: dlls/tzres/tzres.rc:131 msgid "(UTC-05:00) Havana" -msgstr "" +msgstr "(UTC-05:00) 哈瓦拉" #: dlls/tzres/tzres.rc:198 msgid "Jordan Standard Time" @@ -10825,7 +10684,7 @@ msgstr "约旦夏令时" #: dlls/tzres/tzres.rc:200 msgid "(UTC+02:00) Amman" -msgstr "" +msgstr "(UTC+02:00) 安曼" #: dlls/tzres/tzres.rc:117 msgid "Central Standard Time" @@ -10837,31 +10696,27 @@ msgstr "中部夏令时" #: dlls/tzres/tzres.rc:119 msgid "(UTC-06:00) Central Time (US & Canada)" -msgstr "" +msgstr "(UTC-06:00) 中部时间 (美国和加拿大)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 msgid "Russia Time Zone 3" -msgstr "" +msgstr "俄罗斯时区 3" #: dlls/tzres/tzres.rc:305 msgid "(UTC+04:00) Izhevsk, Samara" -msgstr "" +msgstr "(UTC+04:00) 伊热夫斯克，萨马拉" #: dlls/tzres/tzres.rc:417 -#, fuzzy -#| msgid "Tonga Standard Time" msgid "Volgograd Standard Time" -msgstr "汤加标准时间" +msgstr "伏尔加格勒标准时间" #: dlls/tzres/tzres.rc:418 -#, fuzzy -#| msgid "Tonga Daylight Time" msgid "Volgograd Daylight Time" -msgstr "汤加夏令时" +msgstr "伏尔加格勒夏令时" #: dlls/tzres/tzres.rc:419 msgid "(UTC+04:00) Volgograd" -msgstr "" +msgstr "(UTC+04:00) 伏尔加格勒" #: dlls/tzres/tzres.rc:72 msgid "Azores Standard Time" @@ -10873,7 +10728,7 @@ msgstr "亚速尔群岛夏令时" #: dlls/tzres/tzres.rc:74 msgid "(UTC-01:00) Azores" -msgstr "" +msgstr "(UTC-01:00) 亚速尔群岛" #: dlls/tzres/tzres.rc:264 msgid "North Asia East Standard Time" @@ -10885,17 +10740,15 @@ msgstr "北亚东部夏令时" #: dlls/tzres/tzres.rc:266 msgid "(UTC+08:00) Irkutsk" -msgstr "" +msgstr "(UTC+08:00) 伊尔库茨克" #: dlls/tzres/tzres.rc:408 dlls/tzres/tzres.rc:409 msgid "UTC-11" -msgstr "" +msgstr "UTC-11" #: dlls/tzres/tzres.rc:410 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-11:00) Coordinated Universal Time-11" -msgstr "协调世界时" +msgstr "(UTC-11:00) 协调世界时-11" #: dlls/tzres/tzres.rc:51 msgid "Argentina Standard Time" @@ -10907,23 +10760,19 @@ msgstr "阿根廷夏令时" #: dlls/tzres/tzres.rc:53 msgid "(UTC-03:00) City of Buenos Aires" -msgstr "" +msgstr "(UTC-03:00) 布宜诺斯艾利斯市" #: dlls/tzres/tzres.rc:378 -#, fuzzy -#| msgid "Turkey Standard Time" msgid "Turks And Caicos Standard Time" -msgstr "土耳其标准时间" +msgstr "特克斯和凯科斯群岛标准时间" #: dlls/tzres/tzres.rc:379 -#, fuzzy -#| msgid "Turkey Daylight Time" msgid "Turks And Caicos Daylight Time" -msgstr "土耳其夏令时" +msgstr "特克斯和凯科斯群岛夏令时" #: dlls/tzres/tzres.rc:380 msgid "(UTC-05:00) Turks and Caicos" -msgstr "" +msgstr "(UTC-05:00) 特克斯和凯科斯群岛" #: dlls/tzres/tzres.rc:222 msgid "Marquesas Standard Time" @@ -10935,7 +10784,7 @@ msgstr "马克萨斯夏令时" #: dlls/tzres/tzres.rc:224 msgid "(UTC-09:30) Marquesas Islands" -msgstr "" +msgstr "(UTC-09:30) 马克萨斯群岛" #: dlls/tzres/tzres.rc:243 msgid "Myanmar Standard Time" @@ -10947,17 +10796,15 @@ msgstr "缅甸夏令时" #: dlls/tzres/tzres.rc:245 msgid "(UTC+06:30) Yangon (Rangoon)" -msgstr "" +msgstr "(UTC+06:30) 仰光" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 msgid "Coordinated Universal Time" msgstr "协调世界时" #: dlls/tzres/tzres.rc:392 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC) Coordinated Universal Time" -msgstr "协调世界时" +msgstr "(UTC) 协调世界时" #: dlls/tzres/tzres.rc:189 msgid "India Standard Time" @@ -10969,7 +10816,7 @@ msgstr "印度夏令时" #: dlls/tzres/tzres.rc:191 msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" -msgstr "" +msgstr "(UTC+05:30) 马德拉斯，加尔各答，孟买，新德里" #: dlls/tzres/tzres.rc:180 msgid "GTB Standard Time" @@ -10981,7 +10828,7 @@ msgstr "GTB 夏令时" #: dlls/tzres/tzres.rc:182 msgid "(UTC+02:00) Athens, Bucharest" -msgstr "" +msgstr "(UTC+02:00) 雅典，布加勒斯特" #: dlls/tzres/tzres.rc:375 msgid "Turkey Standard Time" @@ -10993,23 +10840,19 @@ msgstr "土耳其夏令时" #: dlls/tzres/tzres.rc:377 msgid "(UTC+03:00) Istanbul" -msgstr "" +msgstr "(UTC+03:00) 伊斯坦布尔" #: dlls/tzres/tzres.rc:54 -#, fuzzy -#| msgid "Arabian Standard Time" msgid "Astrakhan Standard Time" -msgstr "阿拉伯标准时间" +msgstr "阿斯特拉罕标准时间" #: dlls/tzres/tzres.rc:55 -#, fuzzy -#| msgid "Arabian Daylight Time" msgid "Astrakhan Daylight Time" -msgstr "阿拉伯夏令时" +msgstr "阿斯特拉罕夏令时" #: dlls/tzres/tzres.rc:56 msgid "(UTC+04:00) Astrakhan, Ulyanovsk" -msgstr "" +msgstr "(UTC+04:00) 阿斯特拉罕，乌里扬诺夫斯克" #: dlls/tzres/tzres.rc:162 msgid "Fiji Standard Time" @@ -11021,7 +10864,7 @@ msgstr "斐济夏令时" #: dlls/tzres/tzres.rc:164 msgid "(UTC+12:00) Fiji" -msgstr "" +msgstr "(UTC+12:00) 斐济" #: dlls/tzres/tzres.rc:87 msgid "Canada Central Standard Time" @@ -11033,23 +10876,19 @@ msgstr "加拿大中部夏令时" #: dlls/tzres/tzres.rc:89 msgid "(UTC-06:00) Saskatchewan" -msgstr "" +msgstr "(UTC-06:00) 萨斯喀彻温省" #: dlls/tzres/tzres.rc:444 -#, fuzzy -#| msgid "Yakutsk Standard Time" msgid "Yukon Standard Time" -msgstr "雅库次克标准时间" +msgstr "育空标准时间" #: dlls/tzres/tzres.rc:445 -#, fuzzy -#| msgid "Yakutsk Daylight Time" msgid "Yukon Daylight Time" -msgstr "雅库次克夏令时" +msgstr "育空夏令时" #: dlls/tzres/tzres.rc:446 msgid "(UTC-07:00) Yukon" -msgstr "" +msgstr "(UTC-07:00) 育空" #: dlls/tzres/tzres.rc:354 msgid "Taipei Standard Time" @@ -11061,7 +10900,7 @@ msgstr "台北夏令时" #: dlls/tzres/tzres.rc:356 msgid "(UTC+08:00) Taipei" -msgstr "" +msgstr "(UTC+08:00) 台北" #: dlls/tzres/tzres.rc:426 msgid "W. Europe Standard Time" @@ -11073,7 +10912,7 @@ msgstr "西欧夏令时" #: dlls/tzres/tzres.rc:428 msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" -msgstr "" +msgstr "(UTC+01:00) 阿姆斯特丹，柏林，伯尔尼，罗马，斯德哥尔摩，维也纳" #: dlls/tzres/tzres.rc:231 msgid "Montevideo Standard Time" @@ -11085,7 +10924,7 @@ msgstr "蒙得维的亚夏令时" #: dlls/tzres/tzres.rc:233 msgid "(UTC-03:00) Montevideo" -msgstr "" +msgstr "(UTC-03:00) 蒙得维的亚" #: dlls/tzres/tzres.rc:285 msgid "Pakistan Standard Time" @@ -11097,23 +10936,19 @@ msgstr "巴基斯坦夏令时" #: dlls/tzres/tzres.rc:287 msgid "(UTC+05:00) Islamabad, Karachi" -msgstr "" +msgstr "(UTC+05:00) 伊斯兰堡，卡拉奇" #: dlls/tzres/tzres.rc:366 -#, fuzzy -#| msgid "Tokyo Standard Time" msgid "Tomsk Standard Time" -msgstr "东京标准时间" +msgstr "托木斯克标准时间" #: dlls/tzres/tzres.rc:367 -#, fuzzy -#| msgid "Tokyo Daylight Time" msgid "Tomsk Daylight Time" -msgstr "东京夏令时" +msgstr "托木斯克夏令时" #: dlls/tzres/tzres.rc:368 msgid "(UTC+07:00) Tomsk" -msgstr "" +msgstr "(UTC+07:00) 托木斯克" #: dlls/tzres/tzres.rc:93 msgid "Caucasus Standard Time" @@ -11125,7 +10960,7 @@ msgstr "高加索夏令时" #: dlls/tzres/tzres.rc:95 msgid "(UTC+04:00) Yerevan" -msgstr "" +msgstr "(UTC+04:00) 埃里温" #: dlls/tzres/tzres.rc:66 msgid "AUS Eastern Standard Time" @@ -11137,7 +10972,7 @@ msgstr "澳大利亚东部夏令时" #: dlls/tzres/tzres.rc:68 msgid "(UTC+10:00) Canberra, Melbourne, Sydney" -msgstr "" +msgstr "(UTC+10:00) 堪培拉，墨尔本，悉尼" #: dlls/tzres/tzres.rc:246 msgid "N. Central Asia Standard Time" @@ -11149,7 +10984,7 @@ msgstr "中北亚夏令时" #: dlls/tzres/tzres.rc:248 msgid "(UTC+07:00) Novosibirsk" -msgstr "" +msgstr "(UTC+07:00) 新西伯利亚" #: dlls/tzres/tzres.rc:150 msgid "Eastern Standard Time" @@ -11161,67 +10996,55 @@ msgstr "东部夏令时" #: dlls/tzres/tzres.rc:152 msgid "(UTC-05:00) Eastern Time (US & Canada)" -msgstr "" +msgstr "(UTC-05:00) 东部时间 (美国和加拿大)" #: dlls/tzres/tzres.rc:372 -#, fuzzy -#| msgid "Tasmania Standard Time" msgid "Transbaikal Standard Time" -msgstr "塔斯马尼亚标准时间" +msgstr "外贝加尔标准时间" #: dlls/tzres/tzres.rc:373 -#, fuzzy -#| msgid "Tasmania Daylight Time" msgid "Transbaikal Daylight Time" -msgstr "塔斯马尼亚夏令时" +msgstr "外贝加尔夏令时" #: dlls/tzres/tzres.rc:374 msgid "(UTC+09:00) Chita" -msgstr "" +msgstr "(UTC+09:00) 赤塔" #: dlls/tzres/tzres.rc:141 -#, fuzzy -#| msgid "W. Europe Standard Time" msgid "E. Europe Standard Time" -msgstr "西欧标准时间" +msgstr "东欧标准时间" #: dlls/tzres/tzres.rc:142 -#, fuzzy -#| msgid "W. Europe Daylight Time" msgid "E. Europe Daylight Time" -msgstr "西欧夏令时" +msgstr "东欧夏令时" #: dlls/tzres/tzres.rc:143 msgid "(UTC+02:00) Chisinau" -msgstr "" +msgstr "(UTC+02:00) 基希讷乌" #: dlls/tzres/tzres.rc:120 msgid "Central Standard Time (Mexico)" -msgstr "中部标准时间（墨西哥）" +msgstr "中部标准时间 (墨西哥)" #: dlls/tzres/tzres.rc:121 msgid "Central Daylight Time (Mexico)" -msgstr "中部夏令时（墨西哥）" +msgstr "中部夏令时 (墨西哥)" #: dlls/tzres/tzres.rc:122 msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" -msgstr "" +msgstr "(UTC-06:00) 瓜达拉哈拉，墨西哥城，蒙特雷" #: dlls/tzres/tzres.rc:330 -#, fuzzy -#| msgid "Samoa Standard Time" msgid "Saratov Standard Time" -msgstr "萨摩亚标准时间" +msgstr "萨拉托夫标准时间" #: dlls/tzres/tzres.rc:331 -#, fuzzy -#| msgid "Samoa Daylight Time" msgid "Saratov Daylight Time" -msgstr "萨摩亚夏令时" +msgstr "萨拉托夫夏令时" #: dlls/tzres/tzres.rc:332 msgid "(UTC+04:00) Saratov" -msgstr "" +msgstr "(UTC+04:00) 萨拉托夫" #: dlls/tzres/tzres.rc:57 msgid "Atlantic Standard Time" @@ -11233,7 +11056,7 @@ msgstr "大西洋夏令时" #: dlls/tzres/tzres.rc:59 msgid "(UTC-04:00) Atlantic Time (Canada)" -msgstr "" +msgstr "(UTC-04:00) 大西洋时间 (加拿大)" #: dlls/tzres/tzres.rc:237 msgid "Mountain Standard Time" @@ -11245,7 +11068,7 @@ msgstr "山地夏令时" #: dlls/tzres/tzres.rc:239 msgid "(UTC-07:00) Mountain Time (US & Canada)" -msgstr "" +msgstr "(UTC-07:00) 山地时间 (美国和加拿大)" #: dlls/tzres/tzres.rc:384 msgid "US Eastern Standard Time" @@ -11257,23 +11080,19 @@ msgstr "美国东部夏令时" #: dlls/tzres/tzres.rc:386 msgid "(UTC-05:00) Indiana (East)" -msgstr "" +msgstr "(UTC-05:00) 印第安那 (东部)" #: dlls/tzres/tzres.rc:321 -#, fuzzy -#| msgid "Alaskan Standard Time" msgid "Sakhalin Standard Time" -msgstr "阿拉斯加标准时间" +msgstr "萨哈林加标准时间" #: dlls/tzres/tzres.rc:322 -#, fuzzy -#| msgid "Alaskan Daylight Time" msgid "Sakhalin Daylight Time" -msgstr "阿拉斯加夏令时" +msgstr "萨哈林夏令时" #: dlls/tzres/tzres.rc:323 msgid "(UTC+11:00) Sakhalin" -msgstr "" +msgstr "(UTC+11:00) 萨哈林" #: dlls/tzres/tzres.rc:270 msgid "North Korea Standard Time" @@ -11285,7 +11104,7 @@ msgstr "朝鲜夏令时" #: dlls/tzres/tzres.rc:272 msgid "(UTC+09:00) Pyongyang" -msgstr "" +msgstr "(UTC+09:00) 平壤" #: dlls/tzres/tzres.rc:357 msgid "Tasmania Standard Time" @@ -11297,7 +11116,7 @@ msgstr "塔斯马尼亚夏令时" #: dlls/tzres/tzres.rc:359 msgid "(UTC+10:00) Hobart" -msgstr "" +msgstr "(UTC+10:00) 霍巴特" #: dlls/tzres/tzres.rc:99 msgid "Central America Standard Time" @@ -11309,17 +11128,15 @@ msgstr "中美洲夏令时" #: dlls/tzres/tzres.rc:101 msgid "(UTC-06:00) Central America" -msgstr "" +msgstr "(UTC-06:00) 中美洲" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 msgid "UTC-02" -msgstr "" +msgstr "UTC-02" #: dlls/tzres/tzres.rc:401 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-02:00) Coordinated Universal Time-02" -msgstr "协调世界时" +msgstr "(UTC-02:00) 协调世界时-02" #: dlls/tzres/tzres.rc:387 msgid "US Mountain Standard Time" @@ -11331,7 +11148,7 @@ msgstr "美国山地夏令时" #: dlls/tzres/tzres.rc:389 msgid "(UTC-07:00) Arizona" -msgstr "" +msgstr "(UTC-07:00) 亚利桑那" #: dlls/tzres/tzres.rc:339 msgid "South Africa Standard Time" @@ -11343,7 +11160,7 @@ msgstr "南非夏令时" #: dlls/tzres/tzres.rc:341 msgid "(UTC+02:00) Harare, Pretoria" -msgstr "" +msgstr "(UTC+02:00) 哈拉雷，比勒陀利亚" #: dlls/tzres/tzres.rc:96 msgid "Cen. Australia Standard Time" @@ -11355,17 +11172,15 @@ msgstr "澳大利亚中部夏令时" #: dlls/tzres/tzres.rc:98 msgid "(UTC+09:30) Adelaide" -msgstr "" +msgstr "(UTC+09:30) 阿德莱德" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 msgid "UTC-09" -msgstr "" +msgstr "UTC-09" #: dlls/tzres/tzres.rc:407 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-09:00) Coordinated Universal Time-09" -msgstr "协调世界时" +msgstr "(UTC-09:00) 协调世界时-09" #: dlls/tzres/tzres.rc:345 msgid "Sri Lanka Standard Time" @@ -11377,7 +11192,7 @@ msgstr "斯里兰卡夏令时" #: dlls/tzres/tzres.rc:347 msgid "(UTC+05:30) Sri Jayawardenepura" -msgstr "" +msgstr "(UTC+05:30) 斯里加亚渥登普拉" #: dlls/tzres/tzres.rc:30 msgid "Afghanistan Standard Time" @@ -11389,7 +11204,7 @@ msgstr "阿富汗夏令时" #: dlls/tzres/tzres.rc:32 msgid "(UTC+04:30) Kabul" -msgstr "" +msgstr "(UTC+04:30) 喀布尔" #: dlls/tzres/tzres.rc:441 msgid "Yakutsk Standard Time" @@ -11401,7 +11216,7 @@ msgstr "雅库次克夏令时" #: dlls/tzres/tzres.rc:443 msgid "(UTC+09:00) Yakutsk" -msgstr "" +msgstr "(UTC+09:00) 雅库茨克" #: dlls/tzres/tzres.rc:309 msgid "SA Eastern Standard Time" @@ -11413,7 +11228,7 @@ msgstr "南美东部夏令时" #: dlls/tzres/tzres.rc:311 msgid "(UTC-03:00) Cayenne, Fortaleza" -msgstr "" +msgstr "(UTC-03:00) 卡宴，福塔雷萨" #: dlls/tzres/tzres.rc:42 msgid "Arab Standard Time" @@ -11425,7 +11240,7 @@ msgstr "阿拉伯夏令时" #: dlls/tzres/tzres.rc:44 msgid "(UTC+03:00) Kuwait, Riyadh" -msgstr "" +msgstr "(UTC+03:00) 科威特，利雅得" #: dlls/tzres/tzres.rc:45 msgid "Arabian Standard Time" @@ -11437,7 +11252,7 @@ msgstr "阿拉伯夏令时" #: dlls/tzres/tzres.rc:47 msgid "(UTC+04:00) Abu Dhabi, Muscat" -msgstr "" +msgstr "(UTC+04:00) 阿布扎比，马斯喀特" #: dlls/tzres/tzres.rc:360 msgid "Tocantins Standard Time" @@ -11449,7 +11264,7 @@ msgstr "托坎廷斯夏令时" #: dlls/tzres/tzres.rc:362 msgid "(UTC-03:00) Araguaina" -msgstr "" +msgstr "(UTC-03:00) 阿拉瓜伊纳" #: dlls/tzres/tzres.rc:306 msgid "Russian Standard Time" @@ -11461,7 +11276,7 @@ msgstr "俄罗斯夏令时" #: dlls/tzres/tzres.rc:308 msgid "(UTC+03:00) Moscow, St. Petersburg" -msgstr "" +msgstr "(UTC+03:00) 莫斯科，圣彼得堡" #: dlls/tzres/tzres.rc:63 msgid "Aus Central W. Standard Time" @@ -11473,7 +11288,7 @@ msgstr "澳大利亚中西部夏令时" #: dlls/tzres/tzres.rc:65 msgid "(UTC+08:45) Eucla" -msgstr "" +msgstr "(UTC+08:45) 尤克拉" #: dlls/tzres/tzres.rc:294 msgid "Romance Standard Time" @@ -11485,7 +11300,7 @@ msgstr "罗曼夏令时" #: dlls/tzres/tzres.rc:296 msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" -msgstr "" +msgstr "(UTC+01:00) 布鲁塞尔，哥本哈根，马德里，巴黎" #: dlls/tzres/tzres.rc:159 msgid "Ekaterinburg Standard Time" @@ -11497,31 +11312,27 @@ msgstr "叶卡捷琳堡夏令时" #: dlls/tzres/tzres.rc:161 msgid "(UTC+05:00) Ekaterinburg" -msgstr "" +msgstr "(UTC+05:00) 叶卡特琳堡" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 msgid "Russia Time Zone 11" -msgstr "" +msgstr "俄罗斯时区 11" #: dlls/tzres/tzres.rc:302 msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" -msgstr "" +msgstr "(UTC+12:00) 阿纳德尔，彼得罗巴甫洛夫斯克-堪察加" #: dlls/tzres/tzres.rc:435 -#, fuzzy -#| msgid "West Asia Standard Time" msgid "West Bank Standard Time" -msgstr "西亚标准时间" +msgstr "西岸标准时间" #: dlls/tzres/tzres.rc:436 -#, fuzzy -#| msgid "West Asia Daylight Time" msgid "West Bank Daylight Time" -msgstr "西亚夏令时" +msgstr "西岸夏令时" #: dlls/tzres/tzres.rc:437 msgid "(UTC+02:00) Gaza, Hebron" -msgstr "" +msgstr "(UTC+02:00) 加沙，希伯仑" #: dlls/tzres/tzres.rc:351 msgid "Syria Standard Time" @@ -11533,7 +11344,7 @@ msgstr "叙利亚夏令时" #: dlls/tzres/tzres.rc:353 msgid "(UTC+02:00) Damascus" -msgstr "" +msgstr "(UTC+02:00) 大马士革" #: dlls/tzres/tzres.rc:60 msgid "AUS Central Standard Time" @@ -11545,7 +11356,7 @@ msgstr "澳大利亚中部夏令时" #: dlls/tzres/tzres.rc:62 msgid "(UTC+09:30) Darwin" -msgstr "" +msgstr "(UTC+09:30) 达尔文" #: dlls/tzres/tzres.rc:177 msgid "Greenwich Standard Time" @@ -11557,7 +11368,7 @@ msgstr "格林威治夏令时" #: dlls/tzres/tzres.rc:179 msgid "(UTC+00:00) Monrovia, Reykjavik" -msgstr "" +msgstr "(UTC+00:00) 蒙罗维亚，雷克雅未克" #: dlls/tzres/tzres.rc:381 msgid "Ulaanbaatar Standard Time" @@ -11569,23 +11380,19 @@ msgstr "乌兰巴托夏令时" #: dlls/tzres/tzres.rc:383 msgid "(UTC+08:00) Ulaanbaatar" -msgstr "" +msgstr "(UTC+08:00) 乌兰巴托" #: dlls/tzres/tzres.rc:261 -#, fuzzy -#| msgid "Morocco Standard Time" msgid "Norfolk Standard Time" -msgstr "摩洛哥标准时间" +msgstr "诺福克标准时间" #: dlls/tzres/tzres.rc:262 -#, fuzzy -#| msgid "Morocco Daylight Time" msgid "Norfolk Daylight Time" -msgstr "摩洛哥夏令时" +msgstr "诺福克夏令时" #: dlls/tzres/tzres.rc:263 msgid "(UTC+11:00) Norfolk Island" -msgstr "" +msgstr "(UTC+11:00) 诺福克" #: dlls/tzres/tzres.rc:195 msgid "Israel Standard Time" @@ -11597,7 +11404,7 @@ msgstr "以色列夏令时" #: dlls/tzres/tzres.rc:197 msgid "(UTC+02:00) Jerusalem" -msgstr "" +msgstr "(UTC+02:00) 耶路撒冷" #: dlls/tzres/tzres.rc:78 msgid "Bangladesh Standard Time" @@ -11609,7 +11416,7 @@ msgstr "孟加拉夏令时" #: dlls/tzres/tzres.rc:80 msgid "(UTC+06:00) Dhaka" -msgstr "" +msgstr "(UTC+06:00) 达卡" #: dlls/tzres/tzres.rc:312 msgid "SA Pacific Standard Time" @@ -11621,7 +11428,7 @@ msgstr "南美太平洋夏令时" #: dlls/tzres/tzres.rc:314 msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" -msgstr "" +msgstr "(UTC-05:00) 波哥大，利马，基多，里奥布朗库" #: dlls/tzres/tzres.rc:432 msgid "West Asia Standard Time" @@ -11633,7 +11440,7 @@ msgstr "西亚夏令时" #: dlls/tzres/tzres.rc:434 msgid "(UTC+05:00) Ashgabat, Tashkent" -msgstr "" +msgstr "(UTC+05:00) 阿什哈巴德，塔什干" #: dlls/tzres/tzres.rc:33 msgid "Alaskan Standard Time" @@ -11645,7 +11452,7 @@ msgstr "阿拉斯加夏令时" #: dlls/tzres/tzres.rc:35 msgid "(UTC-09:00) Alaska" -msgstr "" +msgstr "(UTC-09:00) 阿拉斯加" #: dlls/tzres/tzres.rc:288 msgid "Paraguay Standard Time" @@ -11657,7 +11464,7 @@ msgstr "巴拉圭夏令时" #: dlls/tzres/tzres.rc:290 msgid "(UTC-04:00) Asuncion" -msgstr "" +msgstr "(UTC-04:00) 亚松森" #: dlls/tzres/tzres.rc:132 msgid "Dateline Standard Time" @@ -11669,7 +11476,7 @@ msgstr "日期变更线夏令时" #: dlls/tzres/tzres.rc:134 msgid "(UTC-12:00) International Date Line West" -msgstr "" +msgstr "(UTC-12:00) 国际日期变更线西" #: dlls/tzres/tzres.rc:207 msgid "Libya Standard Time" @@ -11681,7 +11488,7 @@ msgstr "利比亚夏令时" #: dlls/tzres/tzres.rc:209 msgid "(UTC+02:00) Tripoli" -msgstr "" +msgstr "(UTC+02:00) 的黎波里" #: dlls/tzres/tzres.rc:75 msgid "Bahia Standard Time" @@ -11693,7 +11500,7 @@ msgstr "巴伊亚夏令时" #: dlls/tzres/tzres.rc:77 msgid "(UTC-03:00) Salvador" -msgstr "" +msgstr "(UTC-03:00) 萨尔瓦多" #: dlls/tzres/tzres.rc:411 msgid "Venezuela Standard Time" @@ -11705,7 +11512,7 @@ msgstr "委内瑞拉夏令时" #: dlls/tzres/tzres.rc:413 msgid "(UTC-04:00) Caracas" -msgstr "" +msgstr "(UTC-04:00) 加拉加斯" #: dlls/tzres/tzres.rc:84 msgid "Bougainville Standard Time" @@ -11717,7 +11524,7 @@ msgstr "布干维尔夏令时" #: dlls/tzres/tzres.rc:86 msgid "(UTC+11:00) Bougainville Island" -msgstr "" +msgstr "(UTC+11:00) 布干维尔岛" #: dlls/tzres/tzres.rc:186 msgid "Hawaiian Standard Time" @@ -11729,7 +11536,7 @@ msgstr "夏威夷夏令时" #: dlls/tzres/tzres.rc:188 msgid "(UTC-10:00) Hawaii" -msgstr "" +msgstr "(UTC-10:00) 夏威夷" #: dlls/tzres/tzres.rc:333 msgid "SE Asia Standard Time" @@ -11741,39 +11548,31 @@ msgstr "东南亚夏令时" #: dlls/tzres/tzres.rc:335 msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" -msgstr "" +msgstr "(UTC+07:00) 曼谷，河内，雅加达" #: dlls/tzres/tzres.rc:291 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "Qyzylorda Standard Time" -msgstr "约旦标准时间" +msgstr "克孜洛尔达标准时间" #: dlls/tzres/tzres.rc:292 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "Qyzylorda Daylight Time" -msgstr "约旦夏令时" +msgstr "克孜洛尔达夏令时" #: dlls/tzres/tzres.rc:293 msgid "(UTC+05:00) Qyzylorda" -msgstr "" +msgstr "(UTC+05:00) 克孜洛尔达" #: dlls/tzres/tzres.rc:429 -#, fuzzy -#| msgid "Tonga Standard Time" msgid "W. Mongolia Standard Time" -msgstr "汤加标准时间" +msgstr "西蒙古标准时间" #: dlls/tzres/tzres.rc:430 -#, fuzzy -#| msgid "Tonga Daylight Time" msgid "W. Mongolia Daylight Time" -msgstr "汤加夏令时" +msgstr "西蒙古夏令时" #: dlls/tzres/tzres.rc:431 msgid "(UTC+07:00) Hovd" -msgstr "" +msgstr "(UTC+07:00) 科布多" #: dlls/tzres/tzres.rc:255 msgid "New Zealand Standard Time" @@ -11785,7 +11584,7 @@ msgstr "新西兰夏令时" #: dlls/tzres/tzres.rc:257 msgid "(UTC+12:00) Auckland, Wellington" -msgstr "" +msgstr "(UTC+12:00) 奥克兰，惠灵顿" #: dlls/tzres/tzres.rc:36 msgid "Aleutian Standard Time" @@ -11797,23 +11596,19 @@ msgstr "阿留申夏令时" #: dlls/tzres/tzres.rc:38 msgid "(UTC-10:00) Aleutian Islands" -msgstr "" +msgstr "(UTC-10:00) 阿留申群岛" #: dlls/tzres/tzres.rc:273 -#, fuzzy -#| msgid "Yakutsk Standard Time" msgid "Omsk Standard Time" -msgstr "雅库次克标准时间" +msgstr "鄂木斯克标准时间" #: dlls/tzres/tzres.rc:274 -#, fuzzy -#| msgid "Yakutsk Daylight Time" msgid "Omsk Daylight Time" -msgstr "雅库次克夏令时" +msgstr "鄂木斯克克夏令时" #: dlls/tzres/tzres.rc:275 msgid "(UTC+06:00) Omsk" -msgstr "" +msgstr "(UTC+06:00) 鄂木斯克" #: dlls/tzres/tzres.rc:105 msgid "Central Brazilian Standard Time" @@ -11825,7 +11620,7 @@ msgstr "巴西中部夏令时" #: dlls/tzres/tzres.rc:107 msgid "(UTC-04:00) Cuiaba" -msgstr "" +msgstr "(UTC-04:00) 库亚巴" #: dlls/tzres/tzres.rc:81 msgid "Belarus Standard Time" @@ -11837,7 +11632,7 @@ msgstr "白罗斯夏令时" #: dlls/tzres/tzres.rc:83 msgid "(UTC+03:00) Minsk" -msgstr "" +msgstr "(UTC+03:00) 明斯克" #: dlls/tzres/tzres.rc:315 msgid "SA Western Standard Time" @@ -11849,7 +11644,7 @@ msgstr "南美西部夏令时" #: dlls/tzres/tzres.rc:317 msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" -msgstr "" +msgstr "(UTC-04:00) 乔治敦，拉巴斯，马瑙斯，圣胡安" #: dlls/tzres/tzres.rc:174 msgid "Greenland Standard Time" @@ -11861,7 +11656,7 @@ msgstr "格陵兰夏令时" #: dlls/tzres/tzres.rc:176 msgid "(UTC-03:00) Greenland" -msgstr "" +msgstr "(UTC-03:00) 格陵兰" #: dlls/tzres/tzres.rc:147 msgid "Easter Island Standard Time" @@ -11873,15 +11668,15 @@ msgstr "复活节岛夏令时" #: dlls/tzres/tzres.rc:149 msgid "(UTC-06:00) Easter Island" -msgstr "" +msgstr "(UTC-06:00) 复活节岛" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 msgid "Russia Time Zone 10" -msgstr "" +msgstr "俄罗斯时区 10" #: dlls/tzres/tzres.rc:299 msgid "(UTC+11:00) Chokurdakh" -msgstr "" +msgstr "(UTC+11:00) 乔库尔达赫" #: dlls/tzres/tzres.rc:156 msgid "Egypt Standard Time" @@ -11893,19 +11688,19 @@ msgstr "埃及夏令时" #: dlls/tzres/tzres.rc:158 msgid "(UTC+02:00) Cairo" -msgstr "" +msgstr "(UTC+02:00) 开罗" #: dlls/tzres/tzres.rc:153 msgid "Eastern Standard Time (Mexico)" -msgstr "东部标准时间（墨西哥）" +msgstr "东部标准时间 (墨西哥)" #: dlls/tzres/tzres.rc:154 msgid "Eastern Daylight Time (Mexico)" -msgstr "东部夏令时（墨西哥）" +msgstr "东部夏令时 (墨西哥)" #: dlls/tzres/tzres.rc:155 msgid "(UTC-05:00) Chetumal" -msgstr "" +msgstr "(UTC-05:00) 切图马尔" #: dlls/tzres/tzres.rc:225 msgid "Mauritius Standard Time" @@ -11917,19 +11712,19 @@ msgstr "毛里求斯夏令时" #: dlls/tzres/tzres.rc:227 msgid "(UTC+04:00) Port Louis" -msgstr "" +msgstr "(UTC+04:00) 路易港" #: dlls/tzres/tzres.rc:414 msgid "Vladivostok Standard Time" -msgstr "符拉迪沃斯托克标准时间" +msgstr "海参崴标准时间" #: dlls/tzres/tzres.rc:415 msgid "Vladivostok Daylight Time" -msgstr "符拉迪沃斯托克夏令时" +msgstr "海参崴夏令时" #: dlls/tzres/tzres.rc:416 msgid "(UTC+10:00) Vladivostok" -msgstr "" +msgstr "(UTC+10:00) 海参崴" #: dlls/tzres/tzres.rc:336 msgid "Singapore Standard Time" @@ -11941,7 +11736,7 @@ msgstr "新加坡夏令时" #: dlls/tzres/tzres.rc:338 msgid "(UTC+08:00) Kuala Lumpur, Singapore" -msgstr "" +msgstr "(UTC+08:00) 吉隆坡，新加坡" #: dlls/tzres/tzres.rc:204 msgid "Korea Standard Time" @@ -11953,7 +11748,7 @@ msgstr "韩国夏令时" #: dlls/tzres/tzres.rc:206 msgid "(UTC+09:00) Seoul" -msgstr "" +msgstr "(UTC+09:00) 首尔" #: dlls/tzres/tzres.rc:123 msgid "Chatham Islands Standard Time" @@ -11965,7 +11760,7 @@ msgstr "查塔姆夏令时" #: dlls/tzres/tzres.rc:125 msgid "(UTC+12:45) Chatham Islands" -msgstr "" +msgstr "(UTC+12:45) 查塔姆群岛" #: dlls/tzres/tzres.rc:135 msgid "E. Africa Standard Time" @@ -11977,7 +11772,7 @@ msgstr "东非夏令时" #: dlls/tzres/tzres.rc:137 msgid "(UTC+03:00) Nairobi" -msgstr "" +msgstr "(UTC+03:00) 奈洛比" #: dlls/tzres/tzres.rc:165 msgid "FLE Standard Time" @@ -11989,7 +11784,7 @@ msgstr "FLE 夏令时" #: dlls/tzres/tzres.rc:167 msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" -msgstr "" +msgstr "(UTC+02:00) 赫尔辛基，基辅，里加，索菲亚，塔林，维尔纽斯" #: dlls/tzres/tzres.rc:144 msgid "E. South America Standard Time" @@ -12001,7 +11796,7 @@ msgstr "东南美洲夏令时" #: dlls/tzres/tzres.rc:146 msgid "(UTC-03:00) Brasilia" -msgstr "" +msgstr "(UTC-03:00) 巴西利亚" #: dlls/tzres/tzres.rc:114 msgid "Central Pacific Standard Time" @@ -12013,7 +11808,7 @@ msgstr "中太平洋夏令时" #: dlls/tzres/tzres.rc:116 msgid "(UTC+11:00) Solomon Is., New Caledonia" -msgstr "" +msgstr "(UTC+11:00) 所罗门群岛，新喀里多尼亚" #: dlls/tzres/tzres.rc:423 msgid "W. Central Africa Standard Time" @@ -12025,7 +11820,7 @@ msgstr "西中非夏令时" #: dlls/tzres/tzres.rc:425 msgid "(UTC+01:00) West Central Africa" -msgstr "" +msgstr "(UTC+01:00) 中非西部" #: dlls/tzres/tzres.rc:276 msgid "Pacific SA Standard Time" @@ -12037,7 +11832,7 @@ msgstr "太平洋南美夏令时" #: dlls/tzres/tzres.rc:278 msgid "(UTC-04:00) Santiago" -msgstr "" +msgstr "(UTC-04:00) 圣地亚哥" #: dlls/tzres/tzres.rc:138 msgid "E. Australia Standard Time" @@ -12049,7 +11844,7 @@ msgstr "澳大利亚东部夏令时" #: dlls/tzres/tzres.rc:140 msgid "(UTC+10:00) Brisbane" -msgstr "" +msgstr "(UTC+10:00) 布里斯班" #: dlls/tzres/tzres.rc:420 msgid "W. Australia Standard Time" @@ -12061,7 +11856,7 @@ msgstr "澳大利亚西部夏令时" #: dlls/tzres/tzres.rc:422 msgid "(UTC+08:00) Perth" -msgstr "" +msgstr "(UTC+08:00) 珀斯" #: dlls/urlmon/urlmon.rc:32 dlls/wininet/wininet.rc:88 msgid "Security Warning" @@ -12069,7 +11864,7 @@ msgstr "安全警告" #: dlls/urlmon/urlmon.rc:35 msgid "Do you want to install this software?" -msgstr "是否安装该软件？" +msgstr "您是否要安装该软件?" #: dlls/urlmon/urlmon.rc:39 msgid "Don't install" @@ -12085,7 +11880,7 @@ msgstr "" #: dlls/urlmon/urlmon.rc:51 msgid "Installation of component failed: %08x" -msgstr "安装组件失败：%08x" +msgstr "安装组件失败: %08x" #: dlls/urlmon/urlmon.rc:52 msgid "Install (%d)" @@ -12314,11 +12109,11 @@ msgstr "前置全部窗口" #: dlls/wineps.drv/wineps.rc:31 msgid "Paper Si&ze:" -msgstr "纸张大小(&Z)：" +msgstr "纸张大小(&Z):" #: dlls/wineps.drv/wineps.rc:39 msgid "Duplex:" -msgstr "双面：" +msgstr "双面:" #: dlls/wineps.drv/wineps.rc:50 msgid "Setup" @@ -12342,7 +12137,7 @@ msgstr "此站点的证书有问题。" #: dlls/wininet/wininet.rc:93 msgid "Do you want to continue anyway?" -msgstr "还是要继续吗？" +msgstr "您无论如何还是要继续吗?" #: dlls/wininet/wininet.rc:28 msgid "LAN Connection" @@ -12439,7 +12234,7 @@ msgstr "从服务器接收的 SSL 证书日期无效。该证书已过期。\n" #: dlls/wininet/winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "SSL 证书一般名称（域名栏目）不正确。\n" +msgstr "SSL 证书公用名 (主机名字段) 不正确。\n" #: dlls/winmm/winmm.rc:32 msgid "The specified command was carried out." @@ -12469,7 +12264,7 @@ msgstr "指定的设备句柄无效。" #: dlls/winmm/winmm.rc:38 msgid "There is no driver installed on your system!" -msgstr "你的系统上没有安装任何驱动程序!" +msgstr "您的系统上没有安装任何驱动程序!" #: dlls/winmm/winmm.rc:39 dlls/winmm/winmm.rc:65 msgid "" @@ -12626,7 +12421,7 @@ msgstr "指定的命令需要一个参数。请提供一个参数。" #: dlls/winmm/winmm.rc:75 msgid "The MCI device you are using does not support the specified command." -msgstr "你正在使用的 MCI 设备不支持指定的命令。" +msgstr "您正在使用的 MCI 设备不支持指定的命令。" #: dlls/winmm/winmm.rc:76 msgid "" @@ -12649,7 +12444,7 @@ msgstr "设备驱动程序出现了问题。该驱动程序已经关闭。无法 #: dlls/winmm/winmm.rc:80 msgid "Cannot use 'all' as the device name with the specified command." -msgstr "指定的命令无法使用“all”作为设备名称。" +msgstr "指定的命令无法使用 'all' 作为设备名称。" #: dlls/winmm/winmm.rc:81 msgid "" @@ -12957,7 +12752,7 @@ msgstr "打印到文件" #: dlls/winspool.drv/winspool.rc:40 msgid "&Output File Name:" -msgstr "输出文件名(&O)：" +msgstr "输出文件名(&O):" #: dlls/winspool.drv/winspool.rc:31 msgid "The output file already exists. Click OK to overwrite." @@ -13217,7 +13012,7 @@ msgstr "" #: programs/attrib/attrib.rc:31 programs/cmd/cmd.rc:376 msgid "%1: File Not Found\n" -msgstr "%1：找不到文件\n" +msgstr "%1: 找不到文件\n" #: programs/attrib/attrib.rc:50 msgid "" @@ -13263,10 +13058,8 @@ msgid "Active code page: %1!u!\n" msgstr "" #: programs/chcp.com/chcp.rc:29 -#, fuzzy -#| msgid "Invalid message.\n" msgid "Invalid code page\n" -msgstr "无效消息。\n" +msgstr "无效代码页\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -13401,7 +13194,7 @@ msgid "" msgstr "" "FOR 用于逐一执行用于一组文件的命令。\n" "\n" -"用法：FOR %变量 IN（命令组）DO 命令\n" +"用法: FOR %变量 IN (命令组) DO 命令\n" "\n" "在批处理文件中使用 FOR 时必须将 % 符号写两次。\n" @@ -13447,9 +13240,9 @@ msgid "" msgstr "" "IF 用于根据条件执行命令。\n" "\n" -"语法：\tIF [NOT] EXIST 文件名命令\n" -"\tIF [NOT] 字符串1==字符串2 命令\n" -"\tIF [NOT] ERRORLEVEL 序号命令\n" +"语法: IF [NOT] EXIST 文件名命令\n" +" IF [NOT] 字符串1==字符串2 命令\n" +" IF [NOT] ERRORLEVEL 序号命令\n" "\n" "在命令的第二种用法中，字符串 1 和字符串 2 必须用双引号包住。比较条件\n" "非大小写敏感。\n" @@ -13464,7 +13257,7 @@ msgid "" msgstr "" "LABEL 用于设置磁盘卷标。\n" "\n" -"语法：LABEL [drive:]\n" +"语法: LABEL [drive:]\n" "该命令将询问指定驱动器的新卷标。\n" "您可以使用 VOL 命令显示磁盘卷标。\n" @@ -13508,7 +13301,7 @@ msgstr "" "输入 PATH 将显示当前的 PATH 设置（默认从注册表读取）。在 PATH 后附加\n" "新值以改变设置。\n" "\n" -"也可以使用 PATH 环境变量来编辑 PATH 值，例如：\n" +"也可以使用 PATH 环境变量来编辑 PATH 值，例如:\n" "PATH %PATH%;c:\\temp\n" #: programs/cmd/cmd.rc:148 @@ -13550,7 +13343,7 @@ msgstr "" "PROMPT 命令后跟随的字符串（包括紧随其后的空格）将在 cmd 等待输入时\n" "在行头显示。\n" "\n" -"如下字符串带有特殊含义，如下：\n" +"如下字符串带有特殊含义，如下:\n" "\n" "$$ 美金符号 $_ 换行 $b 管道符号 (|)\n" "$d 当前日期 $e 转义 $g > 符号\n" @@ -13610,7 +13403,7 @@ msgstr "" "\n" "SET 不带参数使用可用于显示当前所有的环境变量。\n" "\n" -"传教或修改环境变量的语法如下：\n" +"传教或修改环境变量的语法如下:\n" "\n" "SET <变量>=<值>\n" "\n" @@ -13660,11 +13453,11 @@ msgid "" "/? Display this help and exit.\n" msgstr "" "启动程序，或用一般用于带有某个后缀的程序打开文档。\n" -"用法：\n" +"用法:\n" "start [选项] 程序文件名 [...]\n" "start [选项] 文档文件名\n" "\n" -"选项：\n" +"选项:\n" "“标题”\t设置子窗口的标题。\n" "/d 目录\t在指定目录启动程序。\n" "/b\t\t不要为程序创建新控制台。\n" @@ -13711,7 +13504,7 @@ msgid "" "\n" "The verify flag has no function in Wine.\n" msgstr "" -"VERIFY 用于设置、清除或测试校验旗标。有效形式如下：\n" +"VERIFY 用于设置、清除或测试校验旗标。有效形式如下:\n" "\n" "VERIFY ON\t设置此旗标。\n" "VERIFY OFF\t清除此旗标。\n" @@ -13770,7 +13563,7 @@ msgid "" msgstr "" "ASSOC 显示或更改文件扩展名所关联的文件类型。\n" "\n" -"语法：ASSOC [.扩展名[=[文件类型]]]\n" +"语法: ASSOC [.扩展名[=[文件类型]]]\n" "\n" "不带参数运行 ASSOC 将显示当前的文件类型关联。\n" "如使用文件扩展名作为参数，将显示当前扩展名的关联信息。\n" @@ -13791,7 +13584,7 @@ msgid "" msgstr "" "FTYPE 显示或更改与文件类型关联的打开命令。\n" "\n" -"语法：FTYPE [文件类型[=[打开命令]]]\n" +"语法: FTYPE [文件类型[=[打开命令]]]\n" "\n" "如不带任何参数运行，该命令将显示已定义启动命令字符串的文件类型。\n" "如使用文件类型作为参数，该命令将显示关联于此文件类型的启动命令（如果存" @@ -13826,9 +13619,9 @@ msgid "" msgstr "" "创建符号链接。\n" "\n" -"语法：MKLINK [options] link_name target\n" +"语法: MKLINK [options] link_name target\n" "\n" -"选项：\n" +"选项: \n" "/d 创建目录符号链接。\n" "/h 创建硬链接。\n" "/j 创建目录结。\n" @@ -13883,7 +13676,7 @@ msgid "" "\n" "Enter HELP <command> for further information on any of the above commands.\n" msgstr "" -"CMD 的内建命令如下：\n" +"CMD 的内建命令如下:\n" "ASSOC\t\t显示或更改文件扩展名关联\n" "ATTRIB\t\t显示或更改 DOS 文件属性\n" "CALL\t\t在批处理文件中调用另一个批处理文件\n" @@ -13925,7 +13718,7 @@ msgstr "" #: programs/cmd/cmd.rc:365 msgid "Are you sure?" -msgstr "确定吗？" +msgstr "您确定吗?" #: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" @@ -13947,7 +13740,7 @@ msgstr "没有与文件类型 \"%1\" 相关联的打开命令\n" #: programs/cmd/cmd.rc:370 msgid "Overwrite %1?" -msgstr "覆盖 %1？" +msgstr "覆盖 %1?" #: programs/cmd/cmd.rc:371 msgid "More..." @@ -13955,7 +13748,7 @@ msgstr "更多..." #: programs/cmd/cmd.rc:372 msgid "Line in Batch processing possibly truncated. Using:\n" -msgstr "批处理中的行可能被截断。正在使用：\n" +msgstr "批处理中的行可能被截断。正在使用:\n" #: programs/cmd/cmd.rc:374 msgid "Argument missing\n" @@ -13983,11 +13776,11 @@ msgstr "当前时间是 %1\n" #: programs/cmd/cmd.rc:381 msgid "Enter new date: " -msgstr "输入新的日期：" +msgstr "输入新的日期: " #: programs/cmd/cmd.rc:382 msgid "Enter new time: " -msgstr "输入新的时间：" +msgstr "输入新的时间: " #: programs/cmd/cmd.rc:383 msgid "Environment variable %1 not defined\n" @@ -14008,7 +13801,7 @@ msgstr "A" #: programs/cmd/cmd.rc:387 msgid "Delete %1?" -msgstr "删除 %1？" +msgstr "删除 %1?" #: programs/cmd/cmd.rc:388 msgid "Echo is %1\n" @@ -14129,7 +13922,7 @@ msgstr "命令历史" #: programs/conhost/conhost.rc:60 msgid "&Buffer size:" -msgstr "缓冲区大小(&B)：" +msgstr "缓冲区大小(&B):" #: programs/conhost/conhost.rc:63 msgid "&Remove duplicates" @@ -14177,11 +13970,11 @@ msgstr "缓冲区" #: programs/conhost/conhost.rc:96 msgid "&Width:" -msgstr "宽度(&W)：" +msgstr "宽度(&W):" #: programs/conhost/conhost.rc:99 msgid "&Height:" -msgstr "高度(&H)：" +msgstr "高度(&H):" #: programs/conhost/conhost.rc:103 msgid "Window size" @@ -14189,11 +13982,11 @@ msgstr "窗口大小" #: programs/conhost/conhost.rc:104 msgid "W&idth:" -msgstr "宽度(&I)：" +msgstr "宽度(&I):" #: programs/conhost/conhost.rc:107 msgid "H&eight:" -msgstr "高度(&E)：" +msgstr "高度(&E):" #: programs/conhost/conhost.rc:111 msgid "End of program" @@ -14313,19 +14106,19 @@ msgstr "" #: programs/fsutil/fsutil.mc:40 msgid "Syntax: fsutil hardlink create <new> <existing>\n" -msgstr "语法：fsutil hardlink create <new> <existing>\n" +msgstr "语法: fsutil hardlink create <new> <existing>\n" #: programs/hostname/hostname.rc:30 msgid "Usage: hostname\n" -msgstr "用法：hostname\n" +msgstr "用法: hostname\n" #: programs/hostname/hostname.rc:31 msgid "Error: Invalid option '%c'.\n" -msgstr "错误：无效的选项 '%c'。\n" +msgstr "错误: 无效的选项 '%c'。\n" #: programs/hostname/hostname.rc:32 msgid "Error: Could not get hostname: %u.\n" -msgstr "错误：无法获取主机名：%u。\n" +msgstr "错误: 无法获取主机名: %u。\n" #: programs/hostname/hostname.rc:33 msgid "" @@ -14335,7 +14128,7 @@ msgstr "错误: 无法使用 hostname 工具设置系统的主机名。\n" #: programs/ipconfig/ipconfig.rc:30 msgid "Usage: ipconfig [ /? | /all ]\n" -msgstr "用法：ipconfig [ /? | /all ]\n" +msgstr "用法: ipconfig [ /? | /all ]\n" #: programs/ipconfig/ipconfig.rc:31 msgid "Error: Unknown or invalid command line parameters specified\n" @@ -14419,7 +14212,7 @@ msgid "" "\n" "Where 'command' is one of HELP, START, STOP or USE.\n" msgstr "" -"本命令格式为：\n" +"本命令格式为:\n" "\n" "NET 命令 [参数]\n" " -或-\n" @@ -14436,7 +14229,7 @@ msgid "" "Displays the list of running services if 'service' is omitted. Otherwise " "'service' is the name of the service to start.\n" msgstr "" -"本命令格式为：\n" +"本命令格式为:\n" "\n" "NET START [服务]\n" "\n" @@ -14451,7 +14244,7 @@ msgid "" "\n" "Where 'service' is the name of the service to stop.\n" msgstr "" -"本命令的格式为：\n" +"本命令的格式为:\n" "\n" "NET STOP 服务\n" "\n" @@ -14459,7 +14252,7 @@ msgstr "" #: programs/net/net.rc:33 msgid "Stopping dependent service: %1\n" -msgstr "正在停止依赖的服务： %1\n" +msgstr "正在停止依赖的服务: %1\n" #: programs/net/net.rc:34 msgid "Could not stop service %1\n" @@ -14513,7 +14306,7 @@ msgstr "" #: programs/net/net.rc:46 msgid "%1 %2 %3 Open resources: %4!u!\n" -msgstr "%1 %2 %3 打开资源：%4!u!\n" +msgstr "%1 %2 %3 打开资源: %4!u!\n" #: programs/net/net.rc:48 msgid "Paused" @@ -14537,7 +14330,7 @@ msgstr "正在重新连接" #: programs/net/net.rc:43 msgid "The following services are running:\n" -msgstr "下列服务正在运行：\n" +msgstr "下列服务正在运行:\n" #: programs/netstat/netstat.rc:30 msgid "Active Connections" @@ -14737,11 +14530,11 @@ msgstr "页面设置" #: programs/notepad/notepad.rc:102 msgid "&Header:" -msgstr "页眉(&H)：" +msgstr "页眉(&H):" #: programs/notepad/notepad.rc:104 msgid "&Footer:" -msgstr "页脚(&F)：" +msgstr "页脚(&F):" #: programs/notepad/notepad.rc:107 msgid "Margins (millimeters)" @@ -14749,15 +14542,15 @@ msgstr "边距(毫米)" #: programs/notepad/notepad.rc:108 msgid "&Left:" -msgstr "左(&L)：" +msgstr "左(&L):" #: programs/notepad/notepad.rc:110 msgid "&Top:" -msgstr "上(&T)：" +msgstr "上(&T):" #: programs/notepad/notepad.rc:126 msgid "Encoding:" -msgstr "编码：" +msgstr "编码:" #: programs/notepad/notepad.rc:132 programs/wordpad/wordpad.rc:289 msgctxt "accelerator Select All" @@ -14831,7 +14624,7 @@ msgstr "错误" #: programs/notepad/notepad.rc:74 msgid "Untitled" -msgstr "（未命名）" +msgstr "(未命名)" #: programs/notepad/notepad.rc:77 programs/winedbg/winedbg.rc:42 msgid "Text files (*.txt)" @@ -14843,9 +14636,9 @@ msgid "" "\n" "Do you want to create a new file?" msgstr "" -"文件“%s”不存在。\n" +"文件 '%s' 不存在。\n" "\n" -"您想新建一个文件吗？" +"您想新建一个文件吗?" #: programs/notepad/notepad.rc:82 msgid "" @@ -14853,13 +14646,13 @@ msgid "" "\n" "Would you like to save the changes?" msgstr "" -"文件“%s”已更改。\n" +"文件 '%s' 已更改。\n" "\n" -"是否保存更改？" +"您要保存更改吗?" #: programs/notepad/notepad.rc:83 msgid "'%s' could not be found." -msgstr "找不到“%s”。" +msgstr "找不到 '%s'。" #: programs/notepad/notepad.rc:85 msgid "Unicode (UTF-16)" @@ -14885,7 +14678,7 @@ msgstr "" "%1\n" "此文件包含 Unicode 字符。如果用 %2 编码保存，这些字符将会丢失。\n" "要保留这些字符，请点“取消”，然后选择一种 Unicode 编码。\n" -"要继续吗？" +"要继续吗?" #: programs/oleview/oleview.rc:32 msgid "&Bind to file..." @@ -14990,7 +14783,7 @@ msgstr "连接到另外一台计算机" #: programs/oleview/oleview.rc:159 msgid "&Machine name:" -msgstr "计算机名称(&M)：" +msgstr "计算机名称(&M):" #: programs/oleview/oleview.rc:167 msgid "System Configuration" @@ -15038,7 +14831,7 @@ msgstr "IPersist 接口查看器" #: programs/oleview/oleview.rc:196 programs/oleview/oleview.rc:208 msgid "Class Name:" -msgstr "类名：" +msgstr "类名:" #: programs/oleview/oleview.rc:198 programs/oleview/oleview.rc:210 msgid "CLSID:" @@ -15305,15 +15098,15 @@ msgstr "移动程序" #: programs/progman/progman.rc:118 msgid "Move program:" -msgstr "移动程序：" +msgstr "移动程序:" #: programs/progman/progman.rc:120 programs/progman/progman.rc:138 msgid "From group:" -msgstr "从此程序组中：" +msgstr "从此程序组中:" #: programs/progman/progman.rc:122 programs/progman/progman.rc:140 msgid "&To group:" -msgstr "移动到程序组(&T)：" +msgstr "移动到程序组(&T):" #: programs/progman/progman.rc:134 msgid "Copy Program" @@ -15321,7 +15114,7 @@ msgstr "复制程序" #: programs/progman/progman.rc:136 msgid "Copy program:" -msgstr "复制程序：" +msgstr "复制程序:" #: programs/progman/progman.rc:152 msgid "Program Group Attributes" @@ -15329,7 +15122,7 @@ msgstr "程序组属性" #: programs/progman/progman.rc:156 msgid "&Group file:" -msgstr "组文件(&G)：" +msgstr "组文件(&G):" #: programs/progman/progman.rc:168 msgid "Program Attributes" @@ -15337,15 +15130,15 @@ msgstr "程序属性" #: programs/progman/progman.rc:172 programs/progman/progman.rc:212 msgid "&Command line:" -msgstr "命令行(&C)：" +msgstr "命令行(&C):" #: programs/progman/progman.rc:174 msgid "&Working directory:" -msgstr "工作目录(&W)：" +msgstr "工作目录(&W):" #: programs/progman/progman.rc:176 msgid "&Key combination:" -msgstr "快捷键(&K)：" +msgstr "快捷键(&K):" #: programs/progman/progman.rc:179 programs/progman/progman.rc:215 msgid "&Minimize at launch" @@ -15361,11 +15154,11 @@ msgstr "修改图标" #: programs/progman/progman.rc:194 msgid "&Filename:" -msgstr "文件名(&F)：" +msgstr "文件名(&F):" #: programs/progman/progman.rc:196 msgid "Current &icon:" -msgstr "当前图标(&I)：" +msgstr "当前图标(&I):" #: programs/progman/progman.rc:210 msgid "Execute Program" @@ -15385,11 +15178,11 @@ msgstr "信息" #: programs/progman/progman.rc:68 msgid "Delete group `%s'?" -msgstr "是否删除程序组 “%s”？" +msgstr "是否删除程序组 `%s'?" #: programs/progman/progman.rc:69 msgid "Delete program `%s'?" -msgstr "是否删除程序组 “%s”?" +msgstr "是否删除程序组 `%s'?" #: programs/progman/progman.rc:70 msgid "Not implemented" @@ -15397,19 +15190,19 @@ msgstr "尚未实现" #: programs/progman/progman.rc:71 msgid "Error reading `%s'." -msgstr "读取文件 “%s” 时发生错误。" +msgstr "读取文件 `%s' 时发生错误。" #: programs/progman/progman.rc:72 msgid "Error writing `%s'." -msgstr "写入文件 “%s” 时发生错误。" +msgstr "写入文件 `%s' 时发生错误。" #: programs/progman/progman.rc:75 msgid "" "The group file `%s' cannot be opened.\n" "Should it be tried further on?" msgstr "" -"不能打开组文件 “%s” 。\n" -"是否继续尝试？" +"不能打开组文件 `%s'。\n" +"是否继续尝试?" #: programs/progman/progman.rc:77 msgid "Help not available." @@ -15421,11 +15214,11 @@ msgstr "在 %s 中发现未知特性" #: programs/progman/progman.rc:79 msgid "File `%s' exists. Not overwritten." -msgstr "文件 “%s” 已经存在。不覆盖已有文件。" +msgstr "文件 `%s' 已经存在。不覆盖已有文件。" #: programs/progman/progman.rc:80 msgid "Save group as `%s' to prevent overwriting original files." -msgstr "将程序组保存为 “%s” 可以避免复盖已有的文件。" +msgstr "将程序组保存为 `%s' 可以避免复盖已有的文件。" #: programs/progman/progman.rc:84 msgid "Libraries (*.dll)" @@ -15448,37 +15241,24 @@ msgid "Type \"REG %1 /?\" for help.\n" msgstr "输入“REG %1 /?”以获取帮助。\n" #: programs/reg/reg.rc:181 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to access or create the specified registry key\n" -msgstr "reg：系统无法找到指定的注册表键或值\n" +msgstr "reg: 无法访问或新建所指定的注册表项\n" #: programs/reg/reg.rc:116 -#, fuzzy -#| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "操作完成\n" +msgstr "reg: 操作成功完成\n" #: programs/reg/reg.rc:131 -#, fuzzy -#| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" -msgstr "注册表操作已经取消\n" +msgstr "reg: 注册表操作已被取消\n" #: programs/reg/reg.rc:174 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "reg：系统无法找到指定的注册表键或值\n" +msgstr "reg: 找不到所指定的注册表项\n" #: programs/reg/reg.rc:120 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "reg：系统无法找到指定的注册表键或值\n" +msgstr "reg: 找不到所指定的注册表值\n" #: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -15489,17 +15269,6 @@ msgid "Type \"REG /?\" for help.\n" msgstr "输入“REG /?”以获取帮助。\n" #: programs/reg/reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | EXPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -15511,13 +15280,13 @@ msgid "" " REG [operation] /?\n" "\n" msgstr "" -"用法：\n" +"用法:\n" " REG [操作] [参数]\n" "\n" -"支持的操作：\n" -" ADD | DELETE | IMPORT | EXPORT | QUERY\n" +"支持的操作:\n" +" ADD | COPY | DELETE | EXPORT | IMPORT | QUERY\n" "\n" -"要获取指定操作的帮助，请输入：\n" +"要获取指定操作的帮助，请输入:\n" " REG [操作] /?\n" "\n" @@ -15733,38 +15502,32 @@ msgid "" msgstr "" #: programs/reg/reg.rc:117 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "reg: 无效的键名\n" +msgstr "reg: 无效的注册表项\n" #: programs/reg/reg.rc:119 msgid "reg: Unable to access remote machine\n" msgstr "reg: 无法访问远程设备\n" #: programs/reg/reg.rc:172 -#, fuzzy -#| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" -msgstr "regedit: 无效的系统键 [%1]\n" +msgstr "reg: 无效的系统项\n" #: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: 无效的选项 [%1]。" #: programs/reg/reg.rc:122 -#, fuzzy -#| msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgid "reg: The option [/d] must be followed by a valid numeric value\n" -msgstr "reg：选项 [/d] 后必须紧跟一个有效的十六进制值\n" +msgstr "reg: 选项 [/d] 后必须紧跟一个有效的数字值\n" #: programs/reg/reg.rc:123 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" -msgstr "reg：选项 [/d] 后必须紧跟一个有效的十六进制值\n" +msgstr "reg: 选项 [/d] 后必须紧跟一个有效的十六进制值\n" #: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "reg：选项 [/d] 后必须紧跟一个有效的字符串\n" +msgstr "reg: 选项 [/d] 后必须紧跟一个有效的字符串\n" #: programs/reg/reg.rc:124 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" @@ -15787,30 +15550,26 @@ msgid "reg: The source and destination keys cannot be the same\n" msgstr "" #: programs/reg/reg.rc:205 -#, fuzzy -#| msgid "The file '%1' already exists. Do you want to overwrite it?" msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" -msgstr "文件 '%1' 已存在。您想要覆盖它吗?" +msgstr "值 '%1\\%2' 已经存在于目标项中。您真的要覆盖它吗?" #: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "您真的要删除注册表键值 '%1' 吗?" +msgstr "您真的要删除注册表值 '%1' 吗?" #: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "您真的要删除 '%1' 下的所有注册表键值吗?" +msgstr "您真的要删除 '%1' 下的所有注册表值吗?" #: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "您真的要删除注册表键 '%1' 吗?" +msgstr "您真的要删除注册表项 '%1' 吗?" #: programs/reg/reg.rc:137 -#, fuzzy -#| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" -msgstr "regedit：无法删除注册表键“%1”。\n" +msgstr "reg: 无法删除 '%1' 下所有的注册表值\n" #: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" @@ -15821,10 +15580,8 @@ msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: 无法识别的转义序列 [\\%1!c!]\n" #: programs/reg/reg.rc:175 -#, fuzzy -#| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "reg: 无法打开注册表键 '%1'。\n" +msgstr "reg: 无法导入注册表项 '%1'\n" #: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" @@ -15853,7 +15610,7 @@ msgstr "导出注册表文件(&E)..." #: programs/regedit/regedit.rc:47 programs/regedit/regedit.rc:99 #: programs/regedit/regedit.rc:121 msgid "&Key" -msgstr "键(&K)" +msgstr "项(&K)" #: programs/regedit/regedit.rc:49 programs/regedit/regedit.rc:101 #: programs/regedit/regedit.rc:123 @@ -15887,7 +15644,7 @@ msgstr "改名(&R)\tF2" #: programs/regedit/regedit.rc:59 programs/regedit/regedit.rc:114 msgid "&Copy Key Name" -msgstr "复制键名(&C)" +msgstr "复制项名(&C)" #: programs/regedit/regedit.rc:61 programs/regedit/regedit.rc:107 #: programs/wordpad/wordpad.rc:53 @@ -15929,19 +15686,19 @@ msgstr "导出注册表" #: programs/regedit/regedit.rc:269 msgid "S&elected branch:" -msgstr "指定分支(&E)：" +msgstr "指定分支(&E):" #: programs/regedit/regedit.rc:278 msgid "Find:" -msgstr "查找：" +msgstr "查找:" #: programs/regedit/regedit.rc:280 msgid "Find in:" -msgstr "查找范围：" +msgstr "查找范围:" #: programs/regedit/regedit.rc:281 msgid "Keys" -msgstr "键" +msgstr "项" #: programs/regedit/regedit.rc:282 msgid "Value names" @@ -15961,7 +15718,7 @@ msgstr "添加收藏" #: programs/regedit/regedit.rc:294 programs/regedit/regedit.rc:305 msgid "Name:" -msgstr "名称：" +msgstr "名称:" #: programs/regedit/regedit.rc:302 msgid "Remove Favorite" @@ -15974,12 +15731,12 @@ msgstr "编辑字符串" #: programs/regedit/regedit.rc:316 programs/regedit/regedit.rc:329 #: programs/regedit/regedit.rc:345 programs/regedit/regedit.rc:358 msgid "Value name:" -msgstr "值名称：" +msgstr "值名称:" #: programs/regedit/regedit.rc:318 programs/regedit/regedit.rc:331 #: programs/regedit/regedit.rc:347 programs/regedit/regedit.rc:360 msgid "Value data:" -msgstr "值数据：" +msgstr "值数据:" #: programs/regedit/regedit.rc:326 msgid "Edit DWORD" @@ -16007,19 +15764,19 @@ msgstr "编辑多个字符串" #: programs/regedit/regedit.rc:159 msgid "Contains commands for working with the whole registry" -msgstr "操作整个注册表的命令" +msgstr "包含用于操作整个注册表的命令" #: programs/regedit/regedit.rc:160 msgid "Contains commands for editing values or keys" -msgstr "编辑键和值的命令" +msgstr "包含用于编辑项或值的命令" #: programs/regedit/regedit.rc:161 msgid "Contains commands for customizing the registry window" -msgstr "操作窗口显示的命令" +msgstr "包含用于自定义注册表窗口的命令" #: programs/regedit/regedit.rc:162 msgid "Contains commands for accessing frequently used keys" -msgstr "用于记录常用键的全部命令" +msgstr "包含用于访问常用项的命令" #: programs/regedit/regedit.rc:163 msgid "" @@ -16028,7 +15785,7 @@ msgstr "包含用于显示注册表编辑器帮助及相关信息的命令" #: programs/regedit/regedit.rc:164 msgid "Contains commands for creating new keys or values" -msgstr "创建新键或值的命令" +msgstr "包含用于新建项或值的命令" #: programs/regedit/regedit.rc:149 msgid "Data" @@ -16068,7 +15825,7 @@ msgstr "无法修改所选注册表值。" #: programs/regedit/regedit.rc:248 msgid "Unable to create a new registry key." -msgstr "无法创建新注册表键。" +msgstr "无法创建新注册表项。" #: programs/regedit/regedit.rc:249 msgid "Unable to create a new registry value." @@ -16079,8 +15836,8 @@ msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" -"无法重命名键 '%1'。\n" -"该键名已存在。" +"无法重命名项 '%1'。\n" +"该项名已存在。" #: programs/regedit/regedit.rc:251 msgid "" @@ -16092,20 +15849,20 @@ msgstr "" #: programs/regedit/regedit.rc:252 msgid "Unable to delete the selected registry key." -msgstr "无法删除所选注册表键。" +msgstr "无法删除所选的注册表项。" #: programs/regedit/regedit.rc:253 msgid "Unable to rename the selected registry key." -msgstr "无法重命名所选注册表键。" +msgstr "无法重命名所选的注册表项。" #: programs/regedit/regedit.rc:254 msgid "Unable to rename the selected registry value." -msgstr "无法重命名所选注册表值。" +msgstr "无法重命名所选的注册表项。" #: programs/regedit/regedit.rc:255 msgid "" "The keys and values contained in %1 were successfully added to the registry." -msgstr "%1 所包含的键和值已被成功添加到注册表中。" +msgstr "%1 所包含的项和值已被成功添加到注册表中。" #: programs/regedit/regedit.rc:256 msgid "Unable to import %1. The specified file is not a valid registry file." @@ -16141,34 +15898,34 @@ msgid "" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" " regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" msgstr "" -"用法：\n" -" regedit [选项] [文件名] [注册表键]\n" +"用法:\n" +" regedit [选项] [文件名] [注册表项]\n" "\n" -"选项：\n" -" [无选项]\t\t启动该程序的图形界面。\n" -" /L:system.dat\t要修改的 system.dat 文件的位置。\n" -"\t\t\t与其他任意开关兼容。该选项将被忽略。\n" -" /R:user.dat\t\t要修改的 user.dat 文件的位置。\n" -"\t\t\t与其他任意开关兼容。该选项将被忽略。\n" -" /C\t\t\t导入注册表文件的内容。\n" -" /D\t\t\t删除指定的注册表键。\n" -" /E\t\t\t将指定注册表键的内容导出到文件。\n" -"\t\t\t如未指定任何键，将导出整份注册表。\n" -" /S\t\t\t静默模式。不显示任何消息。\n" -" /V\t\t\t使用高级模式启动图形界面。该选项将被忽略。\n" -" /?\t\t\t显示此信息并退出。\n" -" [文件名]\t\t要导入的注册表信息文件的位置。和 [/E] 一同使用时，\n" -"\t\t\t该选项将转而指定用于导出注册表信息的文件的位置。\n" -" [注册表键]\t\t要更改的注册表键。\n" +"选项:\n" +" [无选项] 启动该程序的图形界面。\n" +" /L:system.dat 要修改的 system.dat 文件的位置。\n" +" 与其他任意开关兼容。该选项将被忽略。\n" +" /R:user.dat 要修改的 user.dat 文件的位置。\n" +" 与其他任意开关兼容。该选项将被忽略。\n" +" /C 导入注册表文件的内容。\n" +" /D 删除指定的注册表项。\n" +" /E 将指定注册表项的内容导出到文件。\n" +" 如未指定任何项，将导出整份注册表。\n" +" /S 静默模式。不显示任何消息。\n" +" /V 使用高级模式启动图形界面。该选项将被忽略。\n" +" /? 显示此信息并退出。\n" +" [文件名] 要导入的注册表信息文件的位置。和 [/E] 一同使用时，\n" +" 该选项将转而指定用于导出注册表信息的文件的位置。" +" [注册表项] 要更改的注册表项。\n" "\n" -"用例：\n" +"用例:\n" " regedit \"import.reg\"\n" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" #: programs/regedit/regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "regedit：无效或无法识别的开关 [%1]\n" +msgstr "regedit: 无效或无法识别的开关 [%1]\n" #: programs/regedit/regedit.rc:410 msgid "Type \"regedit /?\" for help.\n" @@ -16180,7 +15937,7 @@ msgstr "regedit: 没有指定文件名。\n" #: programs/regedit/regedit.rc:412 msgid "regedit: No registry key was specified for removal.\n" -msgstr "regedit：未指定任何要移除的注册表键。\n" +msgstr "regedit: 未指定任何要移除的注册表项。\n" #: programs/regedit/regedit.rc:413 msgid "regedit: The file '%1' was not found.\n" @@ -16230,7 +15987,7 @@ msgstr "regedit: 无法向 '%2' 添加注册表值 '%1'。\n" #: programs/regedit/regedit.rc:424 msgid "regedit: Unable to open the registry key '%1'.\n" -msgstr "regedit: 无法打开注册表键 '%1'。\n" +msgstr "regedit: 无法打开注册表项 '%1'。\n" #: programs/regedit/regedit.rc:425 msgid "" @@ -16243,16 +16000,16 @@ msgstr "regedit: 注册表值 \"%1\" 将会被导出为二进制数据。\n" #: programs/regedit/regedit.rc:427 msgid "regedit: Invalid system key [%1]\n" -msgstr "regedit: 无效的键名 [%1]\n" +msgstr "regedit: 无效的项名 [%1]\n" #: programs/regedit/regedit.rc:428 msgid "" "regedit: Unable to export '%1'. The specified registry key was not found.\n" -msgstr "regedit: 无法导出 '%1'。未找到指定的注册表键。\n" +msgstr "regedit: 无法导出 '%1'。未找到指定的注册表项。\n" #: programs/regedit/regedit.rc:429 msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "regedit：无法删除注册表键“%1”。\n" +msgstr "regedit: 无法删除注册表项 '%1'。\n" #: programs/regedit/regedit.rc:431 msgid "regedit: The line contains invalid syntax.\n" @@ -16264,11 +16021,11 @@ msgstr "退出注册表编辑器" #: programs/regedit/regedit.rc:188 msgid "Adds keys to the favorites list" -msgstr "把键添加到收藏夹" +msgstr "把项添加到收藏夹列表中" #: programs/regedit/regedit.rc:189 msgid "Removes keys from the favorites list" -msgstr "从收藏夹中删除键" +msgstr "从收藏夹列表中删除项" #: programs/regedit/regedit.rc:190 msgid "Shows or hides the status bar" @@ -16292,11 +16049,11 @@ msgstr "选定项更名" #: programs/regedit/regedit.rc:195 msgid "Copies the name of the selected key to the clipboard" -msgstr "把键的名称复制到剪贴板" +msgstr "把所选项的名称复制到剪贴板" #: programs/regedit/regedit.rc:196 msgid "Finds a text string in a key, value or data" -msgstr "在键、值或数据中找字符串" +msgstr "在项、值或数据中查找字符串" #: programs/regedit/regedit.rc:197 msgid "Finds next occurrence of text specified in previous search" @@ -16308,7 +16065,7 @@ msgstr "修改值的数据" #: programs/regedit/regedit.rc:171 msgid "Adds a new key" -msgstr "添加新键" +msgstr "添加新项" #: programs/regedit/regedit.rc:172 msgid "Adds a new string value" @@ -16348,7 +16105,7 @@ msgstr "无法打开注册表值 '%1'。" #: programs/regedit/regedit.rc:207 msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "无法编辑该类型的键 (%1!u!)。" +msgstr "无法编辑该类型的项 (%1!u!)。" #: programs/regedit/regedit.rc:208 msgid "The value is too big (%1!u!)." @@ -16360,7 +16117,7 @@ msgstr "确认删除值" #: programs/regedit/regedit.rc:210 msgid "Are you sure you want to delete the selected registry value?" -msgstr "您真的要删除选中的注册表键值吗?" +msgstr "您真的要删除选中的注册表值吗?" #: programs/regedit/regedit.rc:216 msgid "Search complete. The string '%1' was not found." @@ -16372,7 +16129,7 @@ msgstr "您确认要删除这些值吗?" #: programs/regedit/regedit.rc:214 msgid "New Key #%d" -msgstr "新键 #%d" +msgstr "新项 #%d" #: programs/regedit/regedit.rc:215 msgid "New Value #%d" @@ -16380,7 +16137,7 @@ msgstr "新值 #%d" #: programs/regedit/regedit.rc:205 msgid "Unable to query the registry key '%1'." -msgstr "无法打开注册表键 '%1'。" +msgstr "无法打开注册表项 '%1'。" #: programs/regedit/regedit.rc:170 msgid "Modifies the value's data in binary form" @@ -16400,12 +16157,12 @@ msgstr "添加新可扩展字串值" #: programs/regedit/regedit.rc:212 msgid "Confirm Key Delete" -msgstr "确认删除键" +msgstr "确认删除项" #: programs/regedit/regedit.rc:213 msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "您真的要删除该注册表键及其包含的所有子键吗?" +msgstr "您真的要删除该注册表项及其包含的所有子项吗?" #: programs/regedit/regedit.rc:199 msgid "Expands or collapses the selected node" @@ -16498,37 +16255,6 @@ msgid "regsvr32: Successfully uninstalled DLL '%1'\n" msgstr "regsvr32: 成功卸载 DLL \"%1\"\n" #: programs/start/start.rc:57 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files\n" -#| "with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with " -#| "its\n" -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows\n" -#| "Explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -16559,30 +16285,31 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" -"启动程序，或用一般用于带有某个后缀的程序打开文档。\n" -"用法：\n" +"用于运行程序，或根据文档的后缀，使用一般用于打开此类文档的程序打开文档。\n" +"用法:\n" "start [选项] 程序文件名 [...]\n" "start [选项] 文档文件名\n" "\n" -"选项：\n" -"“标题”\t设置子窗口的标题。\n" -"/d 目录\t在指定目录启动程序。\n" -"/b\t\t不要为程序创建新控制台。\n" -"/i\t\t使用新环境启动程序。\n" -"/min\t\t最小化启动程序。\n" -"/max\t\t最大化启动程序。\n" -"/low\t\t使用 idle 优先级类启动程序。\n" -"/normal\t\t使用 normal 优先级类启动程序。\n" -"/high\t\t使用 high 优先级类启动程序。\n" -"/realtime\t使用 realtime 优先级类启动程序。\n" -"/abovenormal\t使用 abovenormal 优先级类启动程序。\n" -"/belownormal\t使用 belownormal 优先级类启动程序。\n" -"/n\t\t在指定 NUMA 节点启动程序。\n" -"/affinity 掩码\t使用指定关联性掩码启动程序。\n" -"/wait\t\t等待启动了的程序完成操作后使用其退出代码退出。\n" -"/unix\t\t使用 Unix 文件名并像 Windows 资源管理器一样启动文件。\n" -"/ProgIDOpen\t使用指定 progID 打开文档。\n" -"/?\t\t显示此帮助并退出。\n" +"选项:\n" +"\"标题\" 指定子窗口的标题。\n" +"/d 目录在指定的目录中运行程序。\n" +"/b 不要为程序新建终端。\n" +"/i 使用新的环境变量运行程序。\n" +"/min 以最小化模式运行程序。\n" +"/max 以最大化模式运行程序。\n" +"/low 以 idle 优先级运行程序。\n" +"/normal 以 normal 优先级运行程序。\n" +"/high 以 high 优先级运行程序。\n" +"/realtime 以 realtime 优先级运行程序。\n" +"/abovenormal 以 abovenormal 优先级运行程序。\n" +"/belownormal 以 belownormal 优先级运行程序。\n" +"/node n 在指定的 NUMA 节点中运行程序。\n" +"/affinity 掩码以指定的关联掩码运行程序。\n" +"/wait 等待运行的程序结束，并以它的返回值退出。\n" +"/unix 使用 Unix 文件名并像 Windows 文件管理器一样打开该文件。\n" +"/exec 执行所指定的文件 (在 Wine 内部使用)。\n" +"/ProgIDOpen 以所指定的 progID 打开文档。\n" +"/? 显示此帮助并退出。\n" #: programs/start/start.rc:59 msgid "" @@ -16599,27 +16326,27 @@ msgstr "无法将指定 Unix 文件名转换为 DOS 文件名。" #: programs/taskkill/taskkill.rc:30 msgid "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n" -msgstr "用法：taskkill [/?] [/f] [/im 进程名 | /pid 进程ID]\n" +msgstr "用法: taskkill [/?] [/f] [/im 进程名 | /pid 进程ID]\n" #: programs/taskkill/taskkill.rc:31 msgid "Error: Unknown or invalid command line option specified.\n" -msgstr "错误：指定的命令行选项未知或无效。\n" +msgstr "错误: 指定的命令行选项未知或无效。\n" #: programs/taskkill/taskkill.rc:32 msgid "Error: Invalid command line parameter specified.\n" -msgstr "错误：指定的命令行参数未知或无效。\n" +msgstr "错误: 指定的命令行参数未知或无效。\n" #: programs/taskkill/taskkill.rc:33 msgid "Error: One of options /im or /pid must be specified.\n" -msgstr "错误：必须指定 /im 或 /pid 选项。\n" +msgstr "错误: 必须指定 /im 或 /pid 选项。\n" #: programs/taskkill/taskkill.rc:34 msgid "Error: Option %1 expects a command line parameter.\n" -msgstr "错误：选项 %1 需要命令行参数值。\n" +msgstr "错误: 选项 %1 需要命令行参数值。\n" #: programs/taskkill/taskkill.rc:35 msgid "Error: Options /im and /pid are mutually exclusive.\n" -msgstr "错误：选项 /im 和 /pid 不能共存。\n" +msgstr "错误: 选项 /im 和 /pid 不能共存。\n" #: programs/taskkill/taskkill.rc:36 msgid "Close message sent to top-level windows of process with PID %1!u!.\n" @@ -16640,19 +16367,19 @@ msgstr "已经强行结束 PID 为 %2!u! 的进程 \"%1\"。\n" #: programs/taskkill/taskkill.rc:40 msgid "Error: Could not find process \"%1\".\n" -msgstr "错误：找不到进程 \"%1\"。\n" +msgstr "错误: 找不到进程 \"%1\"。\n" #: programs/taskkill/taskkill.rc:41 msgid "Error: Unable to enumerate the process list.\n" -msgstr "错误：无法列举进程清单。\n" +msgstr "错误: 无法列举进程清单。\n" #: programs/taskkill/taskkill.rc:42 msgid "Error: Unable to terminate process \"%1\".\n" -msgstr "错误：无法结束进程 \"%1\"。\n" +msgstr "错误: 无法结束进程 \"%1\"。\n" #: programs/taskkill/taskkill.rc:43 msgid "Error: Process self-termination is not permitted.\n" -msgstr "错误：不允许结束本进程。\n" +msgstr "错误: 不允许结束本进程。\n" #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" @@ -17386,8 +17113,8 @@ msgid "" "cause undesired results including system instability. Are you\n" "sure you want to change the priority class?" msgstr "" -"警告：改变此进程优先级可能导致意料之外的后果，例如系统不稳定。\n" -"您确定要改变优先权吗？" +"警告: 改变此进程优先级可能导致意料之外的后果，例如系统不稳定。\n" +"您确定要改变优先权吗?" #: programs/taskmgr/taskmgr.rc:305 msgid "Unable to Change Priority" @@ -17401,8 +17128,8 @@ msgid "" "data before it is terminated. Are you sure you want to\n" "terminate the process?" msgstr "" -"警告：结束此进程可能会导致意料之外的后果，例如数据丢失或者系统不稳定。此\n" -"进程可能在被结束之前来不及保存它的状态和数据。您确定要结束这个进程吗？" +"警告: 结束此进程可能会导致意料之外的后果，例如数据丢失或者系统不稳定。此\n" +"进程可能在被结束之前来不及保存它的状态和数据。您确定要结束这个进程吗?" #: programs/taskmgr/taskmgr.rc:311 msgid "Unable to Terminate Process" @@ -17413,8 +17140,8 @@ msgid "" "WARNING: Debugging this process may result in loss of data.\n" "Are you sure you wish to attach the debugger?" msgstr "" -"警告：调试此进程可能会导致数据丢失。\n" -"您确定要连接调试器吗？" +"警告: 调试此进程可能会导致数据丢失。\n" +"您确定要连接调试器吗?" #: programs/taskmgr/taskmgr.rc:314 msgid "Unable to Debug Process" @@ -17459,7 +17186,7 @@ msgid "" "Do you want to remove the uninstall entry from the registry?" msgstr "" "卸载命令 '%s' 运行失败，可能是找不到可执行程序。\n" -"您想把这项卸载条目从注册表中删除吗？" +"您想把这项卸载条目从注册表中删除吗?" #: programs/uninstaller/uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" @@ -17499,10 +17226,10 @@ msgid "" " [no option] Launch the graphical version of this program.\n" "\n" msgstr "" -"用法：\n" +"用法:\n" " uninstaller [选项]\n" "\n" -"选项：\n" +"选项:\n" "\n" " --help\t 显示本信息。\n" " --list\t 列出安装在本 Wine prefix 中的所有应用程序。\n" @@ -17566,7 +17293,7 @@ msgid "" "option) any later version." msgstr "" "本程序为自由软件，您可以遵照自由软件基金会出版的 GNU 较宽松通用公共许可证协议" -"（LGPL）来对其进行添加、修改和重新发布。许可协议版本为2.1，您也可以选择采用更" +"(LGPL) 来对其进行添加、修改和重新发布。许可协议版本为 2.1，您也可以选择采用更" "新的版本。" #: programs/winecfg/winecfg.rc:142 @@ -17575,11 +17302,11 @@ msgstr "Windows 注册信息" #: programs/winecfg/winecfg.rc:143 msgid "&Owner:" -msgstr "姓名(&O)：" +msgstr "姓名(&O):" #: programs/winecfg/winecfg.rc:145 msgid "Organi&zation:" -msgstr "组织(&Z)：" +msgstr "组织(&Z):" #: programs/winecfg/winecfg.rc:153 msgid "Application settings" @@ -17604,7 +17331,7 @@ msgstr "删除程序设置(&R)" #: programs/winecfg/winecfg.rc:160 msgid "&Windows Version:" -msgstr "&Windows 版本：" +msgstr "&Windows 版本:" #: programs/winecfg/winecfg.rc:168 msgid "Window settings" @@ -17628,7 +17355,7 @@ msgstr "虚拟桌面(&D)" #: programs/winecfg/winecfg.rc:174 msgid "Desktop &size:" -msgstr "桌面大小(&S)：" +msgstr "桌面大小(&S):" #: programs/winecfg/winecfg.rc:179 msgid "Screen resolution" @@ -17653,7 +17380,7 @@ msgstr "" #: programs/winecfg/winecfg.rc:193 msgid "&New override for library:" -msgstr "新增函数库顶替(&N)：" +msgstr "新增函数库顶替(&N):" #: programs/winecfg/winecfg.rc:195 msgid "A&dd" @@ -17661,7 +17388,7 @@ msgstr "添加(&D)" #: programs/winecfg/winecfg.rc:196 msgid "Existing &overrides:" -msgstr "已有的函数库顶替(&O)：" +msgstr "已有的函数库顶替(&O):" #: programs/winecfg/winecfg.rc:198 msgid "&Edit..." @@ -17711,7 +17438,7 @@ msgstr "添加(&D)..." #: programs/winecfg/winecfg.rc:239 msgid "&Path:" -msgstr "路径(&P)：" +msgstr "路径(&P):" #: programs/winecfg/winecfg.rc:246 programs/winecfg/winecfg.rc:37 msgid "Show Advan&ced" @@ -17719,7 +17446,7 @@ msgstr "显示高级选项(&C)" #: programs/winecfg/winecfg.rc:247 msgid "De&vice:" -msgstr "设备(&V)：" +msgstr "设备(&V):" #: programs/winecfg/winecfg.rc:249 msgid "Bro&wse..." @@ -17727,11 +17454,11 @@ msgstr "浏览(&W)..." #: programs/winecfg/winecfg.rc:251 msgid "&Label:" -msgstr "卷标(&L)：" +msgstr "卷标(&L):" #: programs/winecfg/winecfg.rc:253 msgid "S&erial:" -msgstr "序列号(&E)：" +msgstr "序列号(&E):" #: programs/winecfg/winecfg.rc:256 msgid "&Show dot files" @@ -17747,19 +17474,19 @@ msgstr "默认值" #: programs/winecfg/winecfg.rc:266 msgid "Output device:" -msgstr "输出设备：" +msgstr "输出设备:" #: programs/winecfg/winecfg.rc:267 msgid "Voice output device:" -msgstr "语音输出设备：" +msgstr "语音输出设备:" #: programs/winecfg/winecfg.rc:268 msgid "Input device:" -msgstr "输入设备：" +msgstr "输入设备:" #: programs/winecfg/winecfg.rc:269 msgid "Voice input device:" -msgstr "语音输入设备：" +msgstr "语音输入设备:" #: programs/winecfg/winecfg.rc:274 msgid "&Test Sound" @@ -17771,7 +17498,7 @@ msgstr "扬声器设置" #: programs/winecfg/winecfg.rc:278 msgid "Speakers:" -msgstr "扬声器：" +msgstr "扬声器:" #: programs/winecfg/winecfg.rc:286 msgid "Appearance" @@ -17779,7 +17506,7 @@ msgstr "外观" #: programs/winecfg/winecfg.rc:287 msgid "&Theme:" -msgstr "主题(&T)：" +msgstr "主题(&T):" #: programs/winecfg/winecfg.rc:289 msgid "&Install theme..." @@ -17787,11 +17514,11 @@ msgstr "安装主题(&I)..." #: programs/winecfg/winecfg.rc:294 msgid "It&em:" -msgstr "物件(&E)：" +msgstr "物件(&E):" #: programs/winecfg/winecfg.rc:296 msgid "C&olor:" -msgstr "颜色(&O)：" +msgstr "颜色(&O):" #: programs/winecfg/winecfg.rc:302 msgid "MIME types" @@ -17807,7 +17534,7 @@ msgstr "文件夹" #: programs/winecfg/winecfg.rc:309 msgid "&Link to:" -msgstr "映射至(&L)：" +msgstr "映射至(&L):" #: programs/winecfg/winecfg.rc:33 msgid "Libraries" @@ -17827,7 +17554,7 @@ msgstr "隐藏高级选项(&C)" #: programs/winecfg/winecfg.rc:38 msgid "(No Theme)" -msgstr "（无主题）" +msgstr "(无主题)" #: programs/winecfg/winecfg.rc:39 msgid "Graphics" @@ -17867,11 +17594,11 @@ msgstr "映射至" #: programs/winecfg/winecfg.rc:44 msgid "Wine configuration for %s" -msgstr "Wine 设置：针对 %s" +msgstr "针对 %s 的 Wine 设置" #: programs/winecfg/winecfg.rc:83 msgid "Selected driver: %s" -msgstr "选中的驱动：%s" +msgstr "选中的驱动: %s" #: programs/winecfg/winecfg.rc:84 msgid "(None)" @@ -17879,7 +17606,7 @@ msgstr "(无)" #: programs/winecfg/winecfg.rc:85 msgid "Audio test failed!" -msgstr "音频测试失败！" +msgstr "音频测试失败!" #: programs/winecfg/winecfg.rc:87 msgid "(System default)" @@ -17907,11 +17634,11 @@ msgid "" "Are you sure you want to do this?" msgstr "" "不建议对这个函数库更改载入顺序。\n" -"你确定要如此吗？" +"您确定要如此吗?" #: programs/winecfg/winecfg.rc:54 msgid "Warning: system library" -msgstr "警告：系统函数库" +msgstr "警告: 系统函数库" #: programs/winecfg/winecfg.rc:55 msgid "native" @@ -17990,10 +17717,10 @@ msgid "" "Most Windows applications expect drive C to exist, and will die messily if " "it doesn't. If you proceed, remember to recreate it!" msgstr "" -"你确定要删除 C 盘吗？\n" +"您确定要删除 C 盘吗?\n" "\n" "大部分 Windows 程序都假定 C 盘存在，如找不到 C 盘可能会导致严重错误。如果要继" -"续，请重新建立此盘！" +"续，请重新建立此盘!" #: programs/winecfg/winecfg.rc:76 msgctxt "Drive letter" @@ -18010,9 +17737,9 @@ msgid "" "\n" "Remember to click 'Add' in the Drives tab to create one!\n" msgstr "" -"你没有 C 盘。这可不是件好事。\n" +"您没有 C 盘。这可不是件好事。\n" "\n" -"请记得点选“驱动器”标签的“添加”来建立它！\n" +"请记得点选“驱动器”标签的“添加”来建立它!\n" #: programs/winecfg/winecfg.rc:98 msgid "Controls Background" @@ -18162,7 +17889,7 @@ msgid "" "may want to check the <a href=\"https://appdb.winehq.org\">Application " "Database</a> for tips about running this application." msgstr "" -"这可能是由程序的问题或者 Wine 的缺陷造成的。你可能需要查看 <a href=\"https://" +"这可能是由程序的问题或者 Wine 的缺陷造成的。您可能需要查看 <a href=\"https://" "appdb.winehq.org\">Application Databa</a> 来获取运行该应用的相关技巧。" #: programs/winedbg/winedbg.rc:62 @@ -18192,7 +17919,7 @@ msgstr "您系统中的一个程序崩溃了，但是 WineDbg 无法挂载到进 #: programs/winedbg/winedbg.rc:41 msgid "(unidentified)" -msgstr "（未被识别的）" +msgstr "(未被识别的)" #: programs/winedbg/winedbg.rc:44 msgid "Saving failed" @@ -18316,19 +18043,19 @@ msgstr "显示隐藏文件/系统文件(&S)" #: programs/winefile/winefile.rc:159 msgid "&File Name:" -msgstr "文件名(&F)：" +msgstr "文件名(&F):" #: programs/winefile/winefile.rc:161 msgid "Full &Path:" -msgstr "完整路径(&P)：" +msgstr "完整路径(&P):" #: programs/winefile/winefile.rc:163 msgid "Last Change:" -msgstr "最后更改：" +msgstr "最后更改:" #: programs/winefile/winefile.rc:167 msgid "Cop&yright:" -msgstr "版权(&Y)：" +msgstr "版权(&Y):" #: programs/winefile/winefile.rc:175 msgid "&System" @@ -18449,11 +18176,11 @@ msgstr "重置结果" #: programs/winemine/winemine.rc:80 msgid "Congratulations!" -msgstr "祝贺！" +msgstr "祝贺!" #: programs/winemine/winemine.rc:82 msgid "Please enter your name" -msgstr "请输入你的名字" +msgstr "请输入您的名字" #: programs/winemine/winemine.rc:90 msgid "Custom Game" @@ -18473,7 +18200,7 @@ msgstr "地雷" #: programs/winemine/winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "所有结果都将丢失。您确定吗？" +msgstr "所有结果都将丢失。您确定吗?" #: programs/winemine/winemine.rc:30 msgid "WineMine" @@ -18549,7 +18276,7 @@ msgstr "Wine 帮助" #: programs/winhlp32/winhlp32.rc:86 msgid "Error while reading the help file `%s'" -msgstr "读入帮助文件“%s”时发生错误" +msgstr "读入帮助文件 `%s' 时发生错误" #: programs/winhlp32/winhlp32.rc:88 msgid "Summary" @@ -18565,7 +18292,7 @@ msgstr "帮助文件 (*.hlp)" #: programs/winhlp32/winhlp32.rc:92 msgid "Cannot find '%s'. Do you want to find this file yourself?" -msgstr "找不到文件“%s”。你想要自己找这个文件吗？" +msgstr "找不到文件 '%s'。您想要自己找这个文件吗?" #: programs/winhlp32/winhlp32.rc:93 msgid "Cannot find a richedit implementation... Aborting" @@ -18573,23 +18300,23 @@ msgstr "找不到 richedit 的实现……终止" #: programs/winhlp32/winhlp32.rc:94 msgid "Help topics: " -msgstr "帮助主题：" +msgstr "帮助主题: " #: programs/wmic/wmic.rc:28 msgid "Error: Command line not supported\n" -msgstr "错误：不支持此命令行\n" +msgstr "错误: 不支持此命令行\n" #: programs/wmic/wmic.rc:29 msgid "Error: Alias not found\n" -msgstr "错误：找不到该别名\n" +msgstr "错误: 找不到该别名\n" #: programs/wmic/wmic.rc:30 msgid "Error: Invalid query\n" -msgstr "错误：无效查询\n" +msgstr "错误: 无效查询\n" #: programs/wmic/wmic.rc:31 msgid "Error: Invalid syntax for PATH\n" -msgstr "错误：PATH 语法无效\n" +msgstr "错误: PATH 语法无效\n" #: programs/wordpad/wordpad.rc:31 msgid "&New...\tCtrl+N" @@ -18927,7 +18654,7 @@ msgstr "文档" #: programs/wordpad/wordpad.rc:192 msgid "Save changes to '%s'?" -msgstr "要保存“%s”吗？" +msgstr "要保存 '%s' 吗?" #: programs/wordpad/wordpad.rc:193 msgid "Finished searching the document." @@ -18941,7 +18668,7 @@ msgstr "RichEdit 装载失败。" msgid "" "You have chosen to save in plain text format, which will cause all " "formatting to be lost. Are you sure that you wish to do this?" -msgstr "你已经选择保存为文本文件，而这可能导致格式丢失。你确定要这么做吗？" +msgstr "您已经选择保存为文本文件，而这可能导致格式丢失。您确定要这么做吗?" #: programs/wordpad/wordpad.rc:198 msgid "Invalid number format." @@ -18957,7 +18684,7 @@ msgstr "不能保存文件。" #: programs/wordpad/wordpad.rc:201 msgid "You do not have access to save the file." -msgstr "你没有保存文件的权限。" +msgstr "您没有保存文件的权限。" #: programs/wordpad/wordpad.rc:202 msgid "Could not open the file." @@ -18965,7 +18692,7 @@ msgstr "不能打开文件。" #: programs/wordpad/wordpad.rc:203 msgid "You do not have access to open the file." -msgstr "你没有打开文件的权限。" +msgstr "您没有打开文件的权限。" #: programs/wordpad/wordpad.rc:204 msgid "Printing not implemented." @@ -18985,7 +18712,7 @@ msgstr "无效参数个数 - 使用 xcopy /? 获取帮助\n" #: programs/xcopy/xcopy.rc:31 msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "无效参数 ‘%1’ - 使用 xcopy /? 获取帮助\n" +msgstr "无效参数 '%1' - 使用 xcopy /? 获取帮助\n" #: programs/xcopy/xcopy.rc:32 msgid "Press <Enter> to begin copying\n" @@ -19006,24 +18733,24 @@ msgid "" "(F - File, D - Directory)\n" msgstr "" "%1 是一个在目标路径上的\n" -"文件名还是目录？\n" +"文件名还是目录?\n" "(F - 文件，D - 目录)\n" #: programs/xcopy/xcopy.rc:38 msgid "%1? (Yes|No)\n" -msgstr "%1？(是(Y)|否(N))\n" +msgstr "%1? (是(Y)|否(N))\n" #: programs/xcopy/xcopy.rc:39 msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "是否覆盖 %1？(是(Y)|否(N)|全部(A))\n" +msgstr "是否覆盖 %1? (是(Y)|否(N)|全部(A))\n" #: programs/xcopy/xcopy.rc:40 msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" -msgstr "无法将“%1”复制为“%2”，错误为 r/c %3!d!\n" +msgstr "无法将 '%1' 复制至 '%2'，错误为 r/c %3!d!\n" #: programs/xcopy/xcopy.rc:42 msgid "Failed during reading of '%1'\n" -msgstr "读取‘%1’失败\n" +msgstr "读取 '%1' 失败\n" #: programs/xcopy/xcopy.rc:46 msgctxt "File key" @@ -19073,11 +18800,11 @@ msgid "" msgstr "" "XCOPY - 将源文件或目录拷贝到目标位置。\n" "\n" -"语法：\n" +"语法:\n" "XCOPY 源 [目标] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] [/R] [/H]\n" "\t [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n" "\n" -"说明：\n" +"说明:\n" "[/I] 如果目标位置不存在，并且操作会拷贝两个或更多的文件，就假设目标\n" "\t是目录。\n" "[/S] 拷贝目录和子目录。\n" -- 2.34.1

1 0

[PATCH] server: Store PE image info in process structure.
by Paul Gofman 31 Dec '21

31 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51829 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- The effect of the blamed commit 7ef35b33936682c01f1c825b7d1b07567a691c12 is that before the commit a process was failing to create due to NT image path passed to RtlCreateUserProcess(). That was wrong, NT path are what actually works on Windows and DOS paths do not. When the process creation working after the commit the new process started failing early in initialization due to the parent process unmapping the image section and remapping that as an anoymous mapping before the user part of process was initialized (build_main_module() needs correct image info from NtQueryInformationProcess( ProcessImageInformation ). The process failure at that stage makes parent process wait for 20 sec until timeout. dlls/kernel32/tests/loader.c | 15 +++++++++++++++ server/mapping.c | 1 + server/process.c | 13 ++----------- server/process.h | 1 + 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index c5857174403..f990d632f73 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1931,9 +1931,11 @@ static void test_section_access(void) char temp_path[MAX_PATH]; char dll_name[MAX_PATH]; SIZE_T size; + SECTION_IMAGE_INFORMATION image_info; MEMORY_BASIC_INFORMATION info; STARTUPINFOA sti; PROCESS_INFORMATION pi; + NTSTATUS status; DWORD ret; /* prevent displaying of the "Unable to load this DLL" message box */ @@ -2084,6 +2086,19 @@ static void test_section_access(void) ok(!memcmp(buf, section_data, section.SizeOfRawData), "wrong section data\n"); } + status = NtQueryInformationProcess(pi.hProcess, ProcessImageInformation, + &image_info, sizeof(image_info), NULL ); + ok(!status, "Got unexpected status %#x.\n", status); + ok(!(image_info.ImageCharacteristics & IMAGE_FILE_DLL), + "Got unexpected characteristics %#x.\n", nt_header.FileHeader.Characteristics); + status = NtUnmapViewOfSection(pi.hProcess, info.BaseAddress); + ok(!status, "Got unexpected status %#x.\n", status); + status = NtQueryInformationProcess(pi.hProcess, ProcessImageInformation, + &image_info, sizeof(image_info), NULL ); + ok(!status, "Got unexpected status %#x.\n", status); + ok(!(image_info.ImageCharacteristics & IMAGE_FILE_DLL), + "Got unexpected characteristics %#x.\n", nt_header.FileHeader.Characteristics); + SetLastError(0xdeadbeef); ret = TerminateProcess(pi.hProcess, 0); ok(ret, "TerminateProcess() error %d\n", GetLastError()); diff --git a/server/mapping.c b/server/mapping.c index bc9ed5bdcb9..c421bd9961d 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -408,6 +408,7 @@ static void add_process_view( struct thread *thread, struct memory_view *view ) process->image = NULL; if (get_view_nt_name( view, &name ) && (process->image = memdup( name.str, name.len ))) process->imagelen = name.len; + process->pe_info = view->image; return; } } diff --git a/server/process.c b/server/process.c index 0cc7f6b60ee..a14950e456b 100644 --- a/server/process.c +++ b/server/process.c @@ -680,6 +680,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla process->trace_data = 0; process->rawinput_mouse = NULL; process->rawinput_kbd = NULL; + memset( &process->pe_info, 0, sizeof(process->pe_info) ); list_init( &process->kernel_object ); list_init( &process->thread_list ); list_init( &process->locks ); @@ -1502,17 +1503,7 @@ DECL_HANDLER(get_process_info) reply->session_id = process->session_id; reply->machine = process->machine; if (get_reply_max_size()) - { - client_ptr_t base; - const pe_image_info_t *info; - struct memory_view *view = get_exe_view( process ); - if (view) - { - if ((info = get_view_image_info( view, &base ))) - set_reply_data( info, min( sizeof(*info), get_reply_max_size() )); - } - else set_error( STATUS_PROCESS_IS_TERMINATING ); - } + set_reply_data( &process->pe_info, min( sizeof(process->pe_info), get_reply_max_size() )); release_object( process ); } } diff --git a/server/process.h b/server/process.h index 22ee8178368..d14df38a13f 100644 --- a/server/process.h +++ b/server/process.h @@ -89,6 +89,7 @@ struct process const struct rawinput_device *rawinput_mouse; /* rawinput mouse device, if any */ const struct rawinput_device *rawinput_kbd; /* rawinput keyboard device, if any */ struct list kernel_object; /* list of kernel object pointers */ + pe_image_info_t pe_info; /* image info */ }; /* process functions */ -- 2.33.1

2 1

[PATCH] winex11.drv: Call XRaiseWindow during WM_TAKE_FOCUS handler.
by Ethan Searl 30 Dec '21

30 Dec '21

In the case where the original hwnd rejects the focus and we search for something else, raise the window because it may not be on top. This prevents showing modal windows on top of non-modal. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26503 Signed-off-by: Ethan Searl <internetethansearl(a)gmail.com> --- dlls/winex11.drv/event.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 170111e9c28..183efe17d3a 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -722,7 +722,16 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) if (hwnd) hwnd = GetAncestor( hwnd, GA_ROOT ); if (!hwnd) hwnd = GetActiveWindow(); if (!hwnd) hwnd = last_focus; - if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, event_time ); + if (hwnd && can_activate_window(hwnd)) + { + Window win = X11DRV_get_whole_window(hwnd); + if (win) + { + TRACE("will raise window %p", hwnd); + XRaiseWindow(event->display, win); + } + set_focus( event->display, hwnd, event_time ); + } } else if (protocol == x11drv_atom(_NET_WM_PING)) { -- 2.27.0

1 0

[PATCH resend 1/2] ddraw: Use WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES only with DDSCL_NOWINDOWCHANGES or if window inactive.
by Gabriel Ivăncescu 30 Dec '21

30 Dec '21

Fixes a regression introduced by f90d607c67768f19e36d9d74b498594252faa3fd. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50370 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This is a regression from last year but I completely forgot about it. Last time, it got no reviews, unfortunately, so it would be nice to have it fixed during this year's code freeze. dlls/ddraw/ddraw.c | 18 ++++++----- dlls/ddraw/tests/ddraw1.c | 65 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 65 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 65 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 65 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 270 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 5b70bb4..848b1d9 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -559,7 +559,7 @@ static HRESULT ddraw_set_focus_window(struct ddraw *ddraw, HWND window) } static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, - BOOL windowed, struct wined3d_swapchain **wined3d_swapchain) + DWORD cooplevel, struct wined3d_swapchain **wined3d_swapchain) { struct wined3d_swapchain_desc swapchain_desc; struct wined3d_display_mode mode; @@ -582,9 +582,11 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, swapchain_desc.backbuffer_count = 1; swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; swapchain_desc.device_window = window; - swapchain_desc.windowed = windowed; - swapchain_desc.flags = WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH - | WINED3D_SWAPCHAIN_IMPLICIT | WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES; + swapchain_desc.windowed = !(cooplevel & DDSCL_FULLSCREEN); + swapchain_desc.flags = WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH | WINED3D_SWAPCHAIN_IMPLICIT; + + if ((cooplevel & DDSCL_NOWINDOWCHANGES) || window != GetActiveWindow()) + swapchain_desc.flags |= WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES; if (ddraw->flags & DDRAW_NO3D) return wined3d_swapchain_create(ddraw->wined3d_device, &swapchain_desc, @@ -640,7 +642,7 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, return DD_OK; } -static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL windowed) +static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, DWORD cooplevel) { HRESULT hr; @@ -650,7 +652,7 @@ static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL win return E_FAIL; } - if (FAILED(hr = ddraw_attach_d3d_device(ddraw, window, windowed, &ddraw->wined3d_swapchain))) + if (FAILED(hr = ddraw_attach_d3d_device(ddraw, window, cooplevel, &ddraw->wined3d_swapchain))) { ERR("Failed to create swapchain, hr %#x.\n", hr); return hr; @@ -776,7 +778,7 @@ static HRESULT WINAPI ddraw1_RestoreDisplayMode(IDirectDraw *iface) * Unsure about this: DDSCL_FPUSETUP * * These don't seem very important for wine: - * DDSCL_ALLOWREBOOT, DDSCL_NOWINDOWCHANGES, DDSCL_ALLOWMODEX + * DDSCL_ALLOWREBOOT, DDSCL_ALLOWMODEX * * Returns: * DD_OK if the cooperative level was set successfully @@ -945,7 +947,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, ddraw_destroy_swapchain(ddraw); } - if (FAILED(hr = ddraw_create_swapchain(ddraw, window, !(cooplevel & DDSCL_FULLSCREEN)))) + if (FAILED(hr = ddraw_create_swapchain(ddraw, window, cooplevel))) ERR("Failed to create swapchain, hr %#x.\n", hr); if (restore_state) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c9f2aea..f16e428 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2636,6 +2636,71 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 7285c1c..2d488ae 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2714,6 +2714,71 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 07afc44..ec828ac 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2950,6 +2950,71 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 29fa343..c66d521 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2615,6 +2615,71 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); -- 2.34.1

3 8

[PATCH] po: Update Russian translation.
by Nikolay Sivov 30 Dec '21

30 Dec '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ru.po | 704 ++++++++++++++++++++----------------------------------- 1 file changed, 248 insertions(+), 456 deletions(-) diff --git a/po/ru.po b/po/ru.po index 6fe67a18e3e..1076281f7f8 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-12-20 15:34+0300\n" +"PO-Revision-Date: 2021-12-30 18:27+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.2.4\n" +"X-Generator: Poedit 3.0.1\n" #: dlls/aclui/aclui.rc:29 dlls/inetcpl.cpl/inetcpl.rc:90 #: programs/winefile/winefile.rc:114 @@ -33,7 +33,7 @@ msgstr "Жёлтый" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "Запретить" #: dlls/aclui/aclui.rc:47 #, fuzzy @@ -3744,10 +3744,8 @@ msgid "Connected" msgstr "Подключено" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "Уст-во речевого ввода:" +msgstr "Подключено (устройство xinput)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" @@ -3806,10 +3804,8 @@ msgid "Subscript out of range" msgstr "Индекс вне диапазона" #: dlls/jscript/jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "Не хватило бумаги; " +msgstr "Превышен размер стека" #: dlls/jscript/jscript.rc:32 msgid "Object required" @@ -3897,17 +3893,15 @@ msgstr "Ожидается «@»" #: dlls/jscript/jscript.rc:80 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Ошибка компиляции Microsoft JScript" #: dlls/jscript/jscript.rc:81 msgid "Microsoft JScript runtime error" -msgstr "" +msgstr "Ошибка выполнения Microsoft JScript" #: dlls/jscript/jscript.rc:82 dlls/vbscript/vbscript.rc:64 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "Неизвестная ошибка" +msgstr "Неизвестная ошибка времени выполнения" #: dlls/jscript/jscript.rc:55 msgid "Number expected" @@ -4012,10 +4006,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "Невозможно изменить свойство «|»" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "«[object]» не объект типа «date»" +msgstr "«this» не объект типа «Map»" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" @@ -6992,32 +6984,24 @@ msgid "Connection reset by peer.\n" msgstr "Соединение закрыто удалённым узлом.\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "Не реализовано" +msgstr "Не реализовано.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "Сбой RPC-вызова.\n" +msgstr "Сбой вызова.\n" #: dlls/kernel32/winerror.mc:3760 msgid "No Signature found in file.\n" msgstr "Подпись файла не обнаружена.\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "Неверный уровень системного вызова.\n" +msgstr "Неверный вызов.\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Value is not available.\n" msgid "Resource is not currently available.\n" -msgstr "Значение недоступно.\n" +msgstr "В данный момент ресурс недоступен.\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 #, fuzzy @@ -7031,18 +7015,12 @@ msgid "Normal" msgstr "Обычный" #: dlls/localspl/localspl.rc:37 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter" -msgstr "Диск" +msgstr "Письмо" #: dlls/localspl/localspl.rc:38 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Small" -msgstr "Диск" +msgstr "Письмо маленькое" #: dlls/localspl/localspl.rc:39 #, fuzzy @@ -7065,45 +7043,34 @@ msgid "Statement" msgstr "Состояние" #: dlls/localspl/localspl.rc:43 -#, fuzzy #| msgid "&Execute..." msgid "Executive" -msgstr "&Запустить..." +msgstr "Executive" #: dlls/localspl/localspl.rc:44 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A3" -msgstr "A" +msgstr "A3" #: dlls/localspl/localspl.rc:45 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A4" -msgstr "A" +msgstr "A4" #: dlls/localspl/localspl.rc:46 -#, fuzzy #| msgid "Small" msgid "A4 Small" -msgstr "Мелкий" +msgstr "A4 маленький" #: dlls/localspl/localspl.rc:47 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A5" -msgstr "A" +msgstr "A5" #: dlls/localspl/localspl.rc:48 msgid "B4 (JIS)" -msgstr "" +msgstr "B4 (JIS)" #: dlls/localspl/localspl.rc:49 msgid "B5 (JIS)" -msgstr "" +msgstr "B5 (JIS)" #: dlls/localspl/localspl.rc:50 msgid "Folio" @@ -7115,11 +7082,11 @@ msgstr "" #: dlls/localspl/localspl.rc:52 msgid "10x14" -msgstr "" +msgstr "10x14" #: dlls/localspl/localspl.rc:53 msgid "11x17" -msgstr "" +msgstr "11x17" #: dlls/localspl/localspl.rc:54 #, fuzzy @@ -7129,87 +7096,83 @@ msgstr "Блокнот" #: dlls/localspl/localspl.rc:55 msgid "Envelope #9" -msgstr "" +msgstr "Конверт №9" #: dlls/localspl/localspl.rc:56 msgid "Envelope #10" -msgstr "" +msgstr "Конверт №10" #: dlls/localspl/localspl.rc:57 msgid "Envelope #11" -msgstr "" +msgstr "Конверт №11" #: dlls/localspl/localspl.rc:58 msgid "Envelope #12" -msgstr "" +msgstr "Конверт №12" #: dlls/localspl/localspl.rc:59 msgid "Envelope #14" -msgstr "" +msgstr "Конверт №14" #: dlls/localspl/localspl.rc:60 msgid "C size sheet" -msgstr "" +msgstr "Лист C" #: dlls/localspl/localspl.rc:61 msgid "D size sheet" -msgstr "" +msgstr "Лист D" #: dlls/localspl/localspl.rc:62 msgid "E size sheet" -msgstr "" +msgstr "Лист E" #: dlls/localspl/localspl.rc:63 msgid "Envelope DL" -msgstr "" +msgstr "Конверт DL" #: dlls/localspl/localspl.rc:64 msgid "Envelope C5" -msgstr "" +msgstr "Конверт C5" #: dlls/localspl/localspl.rc:65 msgid "Envelope C3" -msgstr "" +msgstr "Конверт C3" #: dlls/localspl/localspl.rc:66 msgid "Envelope C4" -msgstr "" +msgstr "Конверт C4" #: dlls/localspl/localspl.rc:67 msgid "Envelope C6" -msgstr "" +msgstr "Конверт C6" #: dlls/localspl/localspl.rc:68 msgid "Envelope C65" -msgstr "" +msgstr "Конверт C65" #: dlls/localspl/localspl.rc:69 msgid "Envelope B4" -msgstr "" +msgstr "Конверт B4" #: dlls/localspl/localspl.rc:70 msgid "Envelope B5" -msgstr "" +msgstr "Конверт B5" #: dlls/localspl/localspl.rc:71 msgid "Envelope B6" -msgstr "" +msgstr "Конверт B6" #: dlls/localspl/localspl.rc:72 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "Envelope" -msgstr "Запечатано PKCS 7" +msgstr "Конверт" #: dlls/localspl/localspl.rc:73 msgid "Envelope Monarch" msgstr "" #: dlls/localspl/localspl.rc:74 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "6 3/4 Envelope" -msgstr "Запечатано PKCS 7" +msgstr "Конверт 6 3/4" #: dlls/localspl/localspl.rc:75 msgid "US Std Fanfold" @@ -7225,25 +7188,23 @@ msgstr "" #: dlls/localspl/localspl.rc:78 msgid "B4 (ISO)" -msgstr "" +msgstr "B4 (ISO)" #: dlls/localspl/localspl.rc:79 -#, fuzzy -#| msgid "Japanese" msgid "Japanese Postcard" -msgstr "Японский" +msgstr "Японская открытка" #: dlls/localspl/localspl.rc:80 msgid "9x11" -msgstr "" +msgstr "9x11" #: dlls/localspl/localspl.rc:81 msgid "10x11" -msgstr "" +msgstr "10x11" #: dlls/localspl/localspl.rc:82 msgid "15x11" -msgstr "" +msgstr "15x11" #: dlls/localspl/localspl.rc:83 msgid "Envelope Invite" @@ -7265,10 +7226,8 @@ msgid "Tabloid Extra" msgstr "" #: dlls/localspl/localspl.rc:87 -#, fuzzy -#| msgid "E&xtras" msgid "A4 Extra" -msgstr "&Дополнительно" +msgstr "A4 экстра" #: dlls/localspl/localspl.rc:88 #, fuzzy @@ -7290,11 +7249,11 @@ msgstr "" #: dlls/localspl/localspl.rc:91 msgid "Super A" -msgstr "" +msgstr "Super A" #: dlls/localspl/localspl.rc:92 msgid "Super B" -msgstr "" +msgstr "Super B" #: dlls/localspl/localspl.rc:93 #, fuzzy @@ -7305,7 +7264,7 @@ msgstr "Диск" #: dlls/localspl/localspl.rc:94 msgid "A4 Plus" -msgstr "" +msgstr "A4 Plus" #: dlls/localspl/localspl.rc:95 #, fuzzy @@ -7319,27 +7278,20 @@ msgid "B5 (JIS) Transverse" msgstr "" #: dlls/localspl/localspl.rc:97 -#, fuzzy -#| msgid "E&xtras" msgid "A3 Extra" -msgstr "&Дополнительно" +msgstr "A3 экстра" #: dlls/localspl/localspl.rc:98 -#, fuzzy -#| msgid "E&xtras" msgid "A5 Extra" -msgstr "&Дополнительно" +msgstr "A5 экстра" #: dlls/localspl/localspl.rc:99 msgid "B5 (ISO) Extra" -msgstr "" +msgstr "B5 (ISO) экстра" #: dlls/localspl/localspl.rc:100 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A2" -msgstr "A" +msgstr "A2" #: dlls/localspl/localspl.rc:101 #, fuzzy @@ -7354,246 +7306,204 @@ msgstr "" #: dlls/localspl/localspl.rc:103 msgid "Japanese Double Postcard" -msgstr "" +msgstr "Японская двойная открытка" #: dlls/localspl/localspl.rc:104 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A6" -msgstr "A" +msgstr "A6" #: dlls/localspl/localspl.rc:105 msgid "Japanese Envelope Kaku #2" -msgstr "" +msgstr "Японский конверт Kaku №2" #: dlls/localspl/localspl.rc:106 msgid "Japanese Envelope Kaku #3" -msgstr "" +msgstr "Японский конверт Kaku №3" #: dlls/localspl/localspl.rc:107 msgid "Japanese Envelope Chou #3" -msgstr "" +msgstr "Японский конверт Chou №3" #: dlls/localspl/localspl.rc:108 msgid "Japanese Envelope Chou #4" -msgstr "" +msgstr "Японский конверт Chou №4" #: dlls/localspl/localspl.rc:109 msgid "Letter Rotated" -msgstr "" +msgstr "Письмо (повёрнуто)" #: dlls/localspl/localspl.rc:110 msgid "A3 Rotated" -msgstr "" +msgstr "A3 (повёрнуто)" #: dlls/localspl/localspl.rc:111 msgid "A4 Rotated" -msgstr "" +msgstr "A4 (повёрнуто)" #: dlls/localspl/localspl.rc:112 msgid "A5 Rotated" -msgstr "" +msgstr "A5 (повёрнуто)" #: dlls/localspl/localspl.rc:113 msgid "B4 (JIS) Rotated" -msgstr "" +msgstr "B4 (JIS) (повёрнуто)" #: dlls/localspl/localspl.rc:114 msgid "B5 (JIS) Rotated" -msgstr "" +msgstr "B5 (JIS) (повёрнуто)" #: dlls/localspl/localspl.rc:115 msgid "Japanese Postcard Rotated" -msgstr "" +msgstr "Японская открытка (повёрнута)" #: dlls/localspl/localspl.rc:116 msgid "Double Japan Postcard Rotated" -msgstr "" +msgstr "Двойная японская открытка (повёрнута)" #: dlls/localspl/localspl.rc:117 msgid "A6 Rotated" -msgstr "" +msgstr "A6 (повёрнуто)" #: dlls/localspl/localspl.rc:118 msgid "Japan Envelope Kaku #2 Rotated" -msgstr "" +msgstr "Японский конверт Kaku №2 (повёрнут)" #: dlls/localspl/localspl.rc:119 msgid "Japan Envelope Kaku #3 Rotated" -msgstr "" +msgstr "Японский конверт Kaku №3 (повёрнут)" #: dlls/localspl/localspl.rc:120 msgid "Japan Envelope Chou #3 Rotated" -msgstr "" +msgstr "Японский конверт Chou №3 (повёрнут)" #: dlls/localspl/localspl.rc:121 msgid "Japan Envelope Chou #4 Rotated" -msgstr "" +msgstr "Японский конверт Chou №4 (повёрнут)" #: dlls/localspl/localspl.rc:122 msgid "B6 (JIS)" -msgstr "" +msgstr "B6 (JIS)" #: dlls/localspl/localspl.rc:123 msgid "B6 (JIS) Rotated" -msgstr "" +msgstr "B6 (JIS) (повёрнуто)" #: dlls/localspl/localspl.rc:124 msgid "12x11" -msgstr "" +msgstr "12x11" #: dlls/localspl/localspl.rc:125 msgid "Japan Envelope You #4" -msgstr "" +msgstr "Японский конверт You №4" #: dlls/localspl/localspl.rc:126 msgid "Japan Envelope You #4 Rotated" -msgstr "" +msgstr "Японский конверт You №4 (повёрнутый)" #: dlls/localspl/localspl.rc:127 msgid "PRC 16K" -msgstr "" +msgstr "PRC 16K" #: dlls/localspl/localspl.rc:128 msgid "PRC 32K" -msgstr "" +msgstr "PRC 32K" #: dlls/localspl/localspl.rc:129 msgid "PRC 32K(Big)" -msgstr "" +msgstr "PRC 32K(Big)" #: dlls/localspl/localspl.rc:130 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC1" #: dlls/localspl/localspl.rc:131 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC2" #: dlls/localspl/localspl.rc:132 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC3" #: dlls/localspl/localspl.rc:133 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC4" #: dlls/localspl/localspl.rc:134 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC5" #: dlls/localspl/localspl.rc:135 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC6" #: dlls/localspl/localspl.rc:136 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC7" #: dlls/localspl/localspl.rc:137 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC8" #: dlls/localspl/localspl.rc:138 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC9" #: dlls/localspl/localspl.rc:139 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC10" #: dlls/localspl/localspl.rc:140 msgid "PRC 16K Rotated" -msgstr "" +msgstr "PRC 16K (повёрнуто)" #: dlls/localspl/localspl.rc:141 msgid "PRC 32K Rotated" -msgstr "" +msgstr "PRC 32K (повёрнуто)" #: dlls/localspl/localspl.rc:142 msgid "PRC 32K(Big) Rotated" -msgstr "" +msgstr "PRC 32K(Big) (повёрнуто)" #: dlls/localspl/localspl.rc:143 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1 Rotated" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC1 (повёрнут)" #: dlls/localspl/localspl.rc:144 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2 Rotated" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC2 (повёрнут)" #: dlls/localspl/localspl.rc:145 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3 Rotated" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC3 (повёрнут)" #: dlls/localspl/localspl.rc:146 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4 Rotated" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC4 (повёрнут)" #: dlls/localspl/localspl.rc:147 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5 Rotated" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC5 (повёрнут)" #: dlls/localspl/localspl.rc:148 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6 Rotated" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC6 (повёрнут)" #: dlls/localspl/localspl.rc:149 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7 Rotated" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC7 (повёрнут)" #: dlls/localspl/localspl.rc:150 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8 Rotated" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC8 (повёрнут)" #: dlls/localspl/localspl.rc:151 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9 Rotated" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC9 (повёрнут)" #: dlls/localspl/localspl.rc:152 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10 Rotated" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC10 (повёрнут)" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -7653,10 +7563,8 @@ msgid "Sink has not been finalized.\n" msgstr "Приёмник данных не был завершён.\n" #: dlls/mferror/mferror.mc:732 -#, fuzzy -#| msgid "Sink was already stopped.\n" msgid "Clock was stopped\n" -msgstr "Приёмник данных уже был остановлен.\n" +msgstr "Часы были остановлены\n" #: dlls/mferror/mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -9140,10 +9048,8 @@ msgid "Select the data you want to connect to:" msgstr "Выберите формат для подключения:" #: dlls/oledb32/version.rc:66 -#, fuzzy -#| msgid "Connections" msgid "Connection" -msgstr "Подключения" +msgstr "Подключение" #: dlls/oledb32/version.rc:69 #, fuzzy @@ -9162,16 +9068,12 @@ msgid "Use &data source name" msgstr "Введите ваше имя" #: dlls/oledb32/version.rc:74 -#, fuzzy -#| msgid "Reset Connections" msgid "Use c&onnection string" -msgstr "Сброшено подключений" +msgstr "Использовать &строку подключения" #: dlls/oledb32/version.rc:75 -#, fuzzy -#| msgid "Connections" msgid "&Connection string:" -msgstr "Подключения" +msgstr "Строка &подключения:" #: dlls/oledb32/version.rc:77 #, fuzzy @@ -9184,42 +9086,32 @@ msgid "2. Enter information to log on to the server" msgstr "" #: dlls/oledb32/version.rc:79 -#, fuzzy -#| msgid "&User name:" msgid "User &name:" msgstr "По&льзователь:" #: dlls/oledb32/version.rc:83 -#, fuzzy -#| msgid "&Blank page" msgid "&Blank password" -msgstr "Пу&стая страница" +msgstr "Пу&стой пароль" #: dlls/oledb32/version.rc:84 -#, fuzzy -#| msgid "Wrong password.\n" msgid "Allow &saving password" -msgstr "Неверный пароль.\n" +msgstr "Разрешить &сохранять пароль" #: dlls/oledb32/version.rc:85 msgid "3. Enter the &initial catalog to use:" msgstr "" #: dlls/oledb32/version.rc:87 -#, fuzzy -#| msgid "Reset Connections" msgid "&Test Connection" -msgstr "Сброшено подключений" +msgstr "&Проверка подключения" #: dlls/oledb32/version.rc:92 msgid "Advanced" msgstr "Мастер" #: dlls/oledb32/version.rc:95 -#, fuzzy -#| msgid "Network share" msgid "Network settings" -msgstr "Сетевой диск" +msgstr "Сетевые настройки" #: dlls/oledb32/version.rc:96 #, fuzzy @@ -9238,22 +9130,18 @@ msgid "Connect:" msgstr "Подключено" #: dlls/oledb32/version.rc:103 -#, fuzzy -#| msgid "seconds" msgid "seconds." msgstr "сек." #: dlls/oledb32/version.rc:104 -#, fuzzy #| msgid "Success" msgid "A&ccess:" -msgstr "Успех" +msgstr "До&ступ:" #: dlls/oledb32/version.rc:110 -#, fuzzy #| msgid "&All" msgid "All" -msgstr "&Все" +msgstr "Все" #: dlls/oledb32/version.rc:114 msgid "" @@ -9274,10 +9162,9 @@ msgid "Data Link Error" msgstr "Свойства подключения" #: dlls/oledb32/version.rc:50 -#, fuzzy #| msgid "Please select a file." msgid "Please select a provider." -msgstr "Выберите файл." +msgstr "Выберите провайдер." #: dlls/oledb32/version.rc:51 msgid "" @@ -9291,19 +9178,15 @@ msgstr "Свойства подключения" #: dlls/oledb32/version.rc:37 msgid "OLE DB Provider(s)" -msgstr "" +msgstr "Провайдеры OLE DB" #: dlls/oledb32/version.rc:41 -#, fuzzy -#| msgid "Ready" msgid "Read" -msgstr "Готово" +msgstr "Чтение" #: dlls/oledb32/version.rc:42 -#, fuzzy -#| msgid "Readme:" msgid "ReadWrite" -msgstr "Файл «Readme»:" +msgstr "Чтение и запись" #: dlls/oledb32/version.rc:43 msgid "Share Deny None" @@ -9322,10 +9205,8 @@ msgid "Share Exclusive" msgstr "" #: dlls/oledb32/version.rc:47 -#, fuzzy -#| msgid "I/O Writes" msgid "Write" -msgstr "Число записей" +msgstr "Запись" #: dlls/oledlg/oledlg.rc:55 msgid "Insert Object" @@ -10514,7 +10395,7 @@ msgstr "" #: dlls/tzres/tzres.rc:269 msgid "(UTC+07:00) Krasnoyarsk" -msgstr "" +msgstr "(UTC+07:00) Красноярск" #: dlls/tzres/tzres.rc:168 msgid "Georgian Standard Time" @@ -10526,11 +10407,11 @@ msgstr "" #: dlls/tzres/tzres.rc:170 msgid "(UTC+04:00) Tbilisi" -msgstr "" +msgstr "(UTC+04:00) Тбилиси" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 msgid "UTC+12" -msgstr "" +msgstr "UTC+12" #: dlls/tzres/tzres.rc:395 msgid "(UTC+12:00) Coordinated Universal Time+12" @@ -10546,7 +10427,7 @@ msgstr "" #: dlls/tzres/tzres.rc:254 msgid "(UTC+05:45) Kathmandu" -msgstr "" +msgstr "(UTC+05:45) Катманду" #: dlls/tzres/tzres.rc:90 msgid "Cape Verde Standard Time" @@ -10570,7 +10451,7 @@ msgstr "" #: dlls/tzres/tzres.rc:185 msgid "(UTC-05:00) Haiti" -msgstr "" +msgstr "(UTC-05:00) Гаити" #: dlls/tzres/tzres.rc:111 msgid "Central European Standard Time" @@ -10582,7 +10463,7 @@ msgstr "" #: dlls/tzres/tzres.rc:113 msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" -msgstr "" +msgstr "(UTC+01:00) Сараево, Скопье, Варшава, Загреб" #: dlls/tzres/tzres.rc:234 msgid "Morocco Standard Time" @@ -10594,11 +10475,11 @@ msgstr "" #: dlls/tzres/tzres.rc:236 msgid "(UTC+01:00) Casablanca" -msgstr "" +msgstr "(UTC+01:00) Касабланка" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 msgid "UTC-08" -msgstr "" +msgstr "UTC-08" #: dlls/tzres/tzres.rc:404 msgid "(UTC-08:00) Coordinated Universal Time-08" @@ -10626,7 +10507,7 @@ msgstr "" #: dlls/tzres/tzres.rc:110 msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" -msgstr "" +msgstr "(UTC+01:00) Белград, Братислава, Будапешт, Любляна, Прага" #: dlls/tzres/tzres.rc:192 msgid "Iran Standard Time" @@ -10638,7 +10519,7 @@ msgstr "" #: dlls/tzres/tzres.rc:194 msgid "(UTC+03:30) Tehran" -msgstr "" +msgstr "(UTC+03:30) Тегеран" #: dlls/tzres/tzres.rc:318 msgid "Saint Pierre Standard Time" @@ -10710,7 +10591,7 @@ msgstr "" #: dlls/tzres/tzres.rc:173 msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" -msgstr "" +msgstr "(UTC+00:00) Дублин, Эдинбург, Лиссабон, Лондон" #: dlls/tzres/tzres.rc:342 msgid "South Sudan Standard Time" @@ -10734,7 +10615,7 @@ msgstr "" #: dlls/tzres/tzres.rc:104 msgid "(UTC+06:00) Astana" -msgstr "" +msgstr "(UTC+06:00) Астана" #: dlls/tzres/tzres.rc:213 msgid "Lord Howe Standard Time" @@ -10758,11 +10639,11 @@ msgstr "" #: dlls/tzres/tzres.rc:50 msgid "(UTC+03:00) Baghdad" -msgstr "" +msgstr "(UTC+03:00) Багдад" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 msgid "UTC+13" -msgstr "" +msgstr "UTC+13" #: dlls/tzres/tzres.rc:398 msgid "(UTC+13:00) Coordinated Universal Time+13" @@ -10778,7 +10659,7 @@ msgstr "" #: dlls/tzres/tzres.rc:218 msgid "(UTC+11:00) Magadan" -msgstr "" +msgstr "(UTC+11:00) Магадан" #: dlls/tzres/tzres.rc:258 msgid "Newfoundland Standard Time" @@ -10838,7 +10719,7 @@ msgstr "" #: dlls/tzres/tzres.rc:71 msgid "(UTC+04:00) Baku" -msgstr "" +msgstr "(UTC+04:00) Баку" #: dlls/tzres/tzres.rc:219 msgid "Magallanes Standard Time" @@ -10862,7 +10743,7 @@ msgstr "" #: dlls/tzres/tzres.rc:326 msgid "(UTC+13:00) Samoa" -msgstr "" +msgstr "(UTC+13:00) Самоа" #: dlls/tzres/tzres.rc:201 msgid "Kaliningrad Standard Time" @@ -10874,7 +10755,7 @@ msgstr "" #: dlls/tzres/tzres.rc:203 msgid "(UTC+02:00) Kaliningrad" -msgstr "" +msgstr "(UTC+02:00) Калининград" #: dlls/tzres/tzres.rc:282 msgid "Pacific Standard Time (Mexico)" @@ -10898,7 +10779,7 @@ msgstr "" #: dlls/tzres/tzres.rc:230 msgid "(UTC+02:00) Beirut" -msgstr "" +msgstr "(UTC+02:00) Бейрут" #: dlls/tzres/tzres.rc:363 msgid "Tokyo Standard Time" @@ -10934,7 +10815,7 @@ msgstr "" #: dlls/tzres/tzres.rc:131 msgid "(UTC-05:00) Havana" -msgstr "" +msgstr "(UTC-05:00) Гавана" #: dlls/tzres/tzres.rc:198 msgid "Jordan Standard Time" @@ -10946,7 +10827,7 @@ msgstr "" #: dlls/tzres/tzres.rc:200 msgid "(UTC+02:00) Amman" -msgstr "" +msgstr "(UTC+02:00) Амман" #: dlls/tzres/tzres.rc:117 msgid "Central Standard Time" @@ -10966,7 +10847,7 @@ msgstr "" #: dlls/tzres/tzres.rc:305 msgid "(UTC+04:00) Izhevsk, Samara" -msgstr "" +msgstr "(UTC+04:00) Ижевск, Самара" #: dlls/tzres/tzres.rc:417 msgid "Volgograd Standard Time" @@ -10978,7 +10859,7 @@ msgstr "" #: dlls/tzres/tzres.rc:419 msgid "(UTC+04:00) Volgograd" -msgstr "" +msgstr "(UTC+04:00) Волгоград" #: dlls/tzres/tzres.rc:72 msgid "Azores Standard Time" @@ -11002,11 +10883,11 @@ msgstr "" #: dlls/tzres/tzres.rc:266 msgid "(UTC+08:00) Irkutsk" -msgstr "" +msgstr "(UTC+08:00) Иркутск" #: dlls/tzres/tzres.rc:408 dlls/tzres/tzres.rc:409 msgid "UTC-11" -msgstr "" +msgstr "UTC-11" #: dlls/tzres/tzres.rc:410 msgid "(UTC-11:00) Coordinated Universal Time-11" @@ -11090,7 +10971,7 @@ msgstr "" #: dlls/tzres/tzres.rc:182 msgid "(UTC+02:00) Athens, Bucharest" -msgstr "" +msgstr "(UTC+02:00) Афины, Бухарест" #: dlls/tzres/tzres.rc:375 msgid "Turkey Standard Time" @@ -11102,7 +10983,7 @@ msgstr "" #: dlls/tzres/tzres.rc:377 msgid "(UTC+03:00) Istanbul" -msgstr "" +msgstr "(UTC+03:00) Стамбул" #: dlls/tzres/tzres.rc:54 msgid "Astrakhan Standard Time" @@ -11114,7 +10995,7 @@ msgstr "" #: dlls/tzres/tzres.rc:56 msgid "(UTC+04:00) Astrakhan, Ulyanovsk" -msgstr "" +msgstr "(UTC+04:00) Астрахань, Ульяновск" #: dlls/tzres/tzres.rc:162 msgid "Fiji Standard Time" @@ -11126,7 +11007,7 @@ msgstr "" #: dlls/tzres/tzres.rc:164 msgid "(UTC+12:00) Fiji" -msgstr "" +msgstr "(UTC+12:00) Фиджи" #: dlls/tzres/tzres.rc:87 msgid "Canada Central Standard Time" @@ -11150,7 +11031,7 @@ msgstr "" #: dlls/tzres/tzres.rc:446 msgid "(UTC-07:00) Yukon" -msgstr "" +msgstr "(UTC-07:00) Юкон" #: dlls/tzres/tzres.rc:354 msgid "Taipei Standard Time" @@ -11174,7 +11055,7 @@ msgstr "" #: dlls/tzres/tzres.rc:428 msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" -msgstr "" +msgstr "(UTC+01:00) Амстердам, Берлин, Берн, Стокгольм, Вена" #: dlls/tzres/tzres.rc:231 msgid "Montevideo Standard Time" @@ -11186,7 +11067,7 @@ msgstr "" #: dlls/tzres/tzres.rc:233 msgid "(UTC-03:00) Montevideo" -msgstr "" +msgstr "(UTC-03:00) Монтевидео" #: dlls/tzres/tzres.rc:285 msgid "Pakistan Standard Time" @@ -11198,7 +11079,7 @@ msgstr "" #: dlls/tzres/tzres.rc:287 msgid "(UTC+05:00) Islamabad, Karachi" -msgstr "" +msgstr "(UTC+05:00) Исламабад, Карачи" #: dlls/tzres/tzres.rc:366 msgid "Tomsk Standard Time" @@ -11210,7 +11091,7 @@ msgstr "" #: dlls/tzres/tzres.rc:368 msgid "(UTC+07:00) Tomsk" -msgstr "" +msgstr "(UTC+07:00) Томск" #: dlls/tzres/tzres.rc:93 msgid "Caucasus Standard Time" @@ -11222,7 +11103,7 @@ msgstr "" #: dlls/tzres/tzres.rc:95 msgid "(UTC+04:00) Yerevan" -msgstr "" +msgstr "(UTC+04:00) Ереван" #: dlls/tzres/tzres.rc:66 msgid "AUS Eastern Standard Time" @@ -11234,7 +11115,7 @@ msgstr "" #: dlls/tzres/tzres.rc:68 msgid "(UTC+10:00) Canberra, Melbourne, Sydney" -msgstr "" +msgstr "(UTC+10:00) Канберра, Мельбурн, Сидней" #: dlls/tzres/tzres.rc:246 msgid "N. Central Asia Standard Time" @@ -11246,7 +11127,7 @@ msgstr "" #: dlls/tzres/tzres.rc:248 msgid "(UTC+07:00) Novosibirsk" -msgstr "" +msgstr "(UTC+07:00) Новосибирск" #: dlls/tzres/tzres.rc:150 msgid "Eastern Standard Time" @@ -11270,7 +11151,7 @@ msgstr "" #: dlls/tzres/tzres.rc:374 msgid "(UTC+09:00) Chita" -msgstr "" +msgstr "(UTC+09:00) Чита" #: dlls/tzres/tzres.rc:141 msgid "E. Europe Standard Time" @@ -11282,7 +11163,7 @@ msgstr "" #: dlls/tzres/tzres.rc:143 msgid "(UTC+02:00) Chisinau" -msgstr "" +msgstr "(UTC+02:00) Кишинёв" #: dlls/tzres/tzres.rc:120 msgid "Central Standard Time (Mexico)" @@ -11294,7 +11175,7 @@ msgstr "" #: dlls/tzres/tzres.rc:122 msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" -msgstr "" +msgstr "(UTC-06:00) Гвадалахара, Мехико, Монтеррей" #: dlls/tzres/tzres.rc:330 msgid "Saratov Standard Time" @@ -11306,7 +11187,7 @@ msgstr "" #: dlls/tzres/tzres.rc:332 msgid "(UTC+04:00) Saratov" -msgstr "" +msgstr "(UTC+04:00) Саратов" #: dlls/tzres/tzres.rc:57 msgid "Atlantic Standard Time" @@ -11354,7 +11235,7 @@ msgstr "" #: dlls/tzres/tzres.rc:323 msgid "(UTC+11:00) Sakhalin" -msgstr "" +msgstr "(UTC+11:00) Сахалин" #: dlls/tzres/tzres.rc:270 msgid "North Korea Standard Time" @@ -11394,7 +11275,7 @@ msgstr "" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 msgid "UTC-02" -msgstr "" +msgstr "UTC-02" #: dlls/tzres/tzres.rc:401 msgid "(UTC-02:00) Coordinated Universal Time-02" @@ -11410,7 +11291,7 @@ msgstr "" #: dlls/tzres/tzres.rc:389 msgid "(UTC-07:00) Arizona" -msgstr "" +msgstr "(UTC-07:00) Аризона" #: dlls/tzres/tzres.rc:339 msgid "South Africa Standard Time" @@ -11434,11 +11315,11 @@ msgstr "" #: dlls/tzres/tzres.rc:98 msgid "(UTC+09:30) Adelaide" -msgstr "" +msgstr "(UTC+09:30) Аделаида" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 msgid "UTC-09" -msgstr "" +msgstr "UTC-09" #: dlls/tzres/tzres.rc:407 msgid "(UTC-09:00) Coordinated Universal Time-09" @@ -11466,7 +11347,7 @@ msgstr "" #: dlls/tzres/tzres.rc:32 msgid "(UTC+04:30) Kabul" -msgstr "" +msgstr "(UTC+04:30) Кабул" #: dlls/tzres/tzres.rc:441 msgid "Yakutsk Standard Time" @@ -11478,7 +11359,7 @@ msgstr "" #: dlls/tzres/tzres.rc:443 msgid "(UTC+09:00) Yakutsk" -msgstr "" +msgstr "(UTC+09:00) Якутск" #: dlls/tzres/tzres.rc:309 msgid "SA Eastern Standard Time" @@ -11502,7 +11383,7 @@ msgstr "" #: dlls/tzres/tzres.rc:44 msgid "(UTC+03:00) Kuwait, Riyadh" -msgstr "" +msgstr "(UTC+03:00) Кувейт, Риад" #: dlls/tzres/tzres.rc:45 msgid "Arabian Standard Time" @@ -11538,7 +11419,7 @@ msgstr "" #: dlls/tzres/tzres.rc:308 msgid "(UTC+03:00) Moscow, St. Petersburg" -msgstr "" +msgstr "(UTC+03:00) Москва, Санкт-Петербург" #: dlls/tzres/tzres.rc:63 msgid "Aus Central W. Standard Time" @@ -11562,7 +11443,7 @@ msgstr "" #: dlls/tzres/tzres.rc:296 msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" -msgstr "" +msgstr "(UTC+01:00) Брюссель, Копенгаген, Мадрид, Париж" #: dlls/tzres/tzres.rc:159 msgid "Ekaterinburg Standard Time" @@ -11574,7 +11455,7 @@ msgstr "" #: dlls/tzres/tzres.rc:161 msgid "(UTC+05:00) Ekaterinburg" -msgstr "" +msgstr "(UTC+05:00) Екатеринбург" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 msgid "Russia Time Zone 11" @@ -11582,7 +11463,7 @@ msgstr "" #: dlls/tzres/tzres.rc:302 msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" -msgstr "" +msgstr "(UTC+12:00) Анадырь, Петропавловск-Камчатский" #: dlls/tzres/tzres.rc:435 msgid "West Bank Standard Time" @@ -11606,7 +11487,7 @@ msgstr "" #: dlls/tzres/tzres.rc:353 msgid "(UTC+02:00) Damascus" -msgstr "" +msgstr "(UTC+02:00) Дамаск" #: dlls/tzres/tzres.rc:60 msgid "AUS Central Standard Time" @@ -11666,7 +11547,7 @@ msgstr "" #: dlls/tzres/tzres.rc:197 msgid "(UTC+02:00) Jerusalem" -msgstr "" +msgstr "(UTC+02:00) Иерусалим" #: dlls/tzres/tzres.rc:78 msgid "Bangladesh Standard Time" @@ -11702,7 +11583,7 @@ msgstr "" #: dlls/tzres/tzres.rc:434 msgid "(UTC+05:00) Ashgabat, Tashkent" -msgstr "" +msgstr "(UTC+05:00) Ашхабад, Ташкент" #: dlls/tzres/tzres.rc:33 msgid "Alaskan Standard Time" @@ -11714,7 +11595,7 @@ msgstr "" #: dlls/tzres/tzres.rc:35 msgid "(UTC-09:00) Alaska" -msgstr "" +msgstr "(UTC-09:00) Аляска" #: dlls/tzres/tzres.rc:288 msgid "Paraguay Standard Time" @@ -11726,7 +11607,7 @@ msgstr "" #: dlls/tzres/tzres.rc:290 msgid "(UTC-04:00) Asuncion" -msgstr "" +msgstr "(UTC-04:00) Асунсьон" #: dlls/tzres/tzres.rc:132 msgid "Dateline Standard Time" @@ -11750,7 +11631,7 @@ msgstr "" #: dlls/tzres/tzres.rc:209 msgid "(UTC+02:00) Tripoli" -msgstr "" +msgstr "(UTC+02:00) Триполи" #: dlls/tzres/tzres.rc:75 msgid "Bahia Standard Time" @@ -11762,7 +11643,7 @@ msgstr "" #: dlls/tzres/tzres.rc:77 msgid "(UTC-03:00) Salvador" -msgstr "" +msgstr "(UTC-03:00) Сальвадор" #: dlls/tzres/tzres.rc:411 msgid "Venezuela Standard Time" @@ -11798,7 +11679,7 @@ msgstr "" #: dlls/tzres/tzres.rc:188 msgid "(UTC-10:00) Hawaii" -msgstr "" +msgstr "(UTC-10:00) Гавайи" #: dlls/tzres/tzres.rc:333 msgid "SE Asia Standard Time" @@ -11810,7 +11691,7 @@ msgstr "" #: dlls/tzres/tzres.rc:335 msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" -msgstr "" +msgstr "(UTC+07:00) Бангкок, Ханой, Джакарта" #: dlls/tzres/tzres.rc:291 msgid "Qyzylorda Standard Time" @@ -11846,7 +11727,7 @@ msgstr "" #: dlls/tzres/tzres.rc:257 msgid "(UTC+12:00) Auckland, Wellington" -msgstr "" +msgstr "(UTC+12:00) Окленд, Веллингтон" #: dlls/tzres/tzres.rc:36 msgid "Aleutian Standard Time" @@ -11870,7 +11751,7 @@ msgstr "" #: dlls/tzres/tzres.rc:275 msgid "(UTC+06:00) Omsk" -msgstr "" +msgstr "(UTC+06:00) Омск" #: dlls/tzres/tzres.rc:105 msgid "Central Brazilian Standard Time" @@ -11894,7 +11775,7 @@ msgstr "" #: dlls/tzres/tzres.rc:83 msgid "(UTC+03:00) Minsk" -msgstr "" +msgstr "(UTC+03:00) Минск" #: dlls/tzres/tzres.rc:315 msgid "SA Western Standard Time" @@ -11918,7 +11799,7 @@ msgstr "" #: dlls/tzres/tzres.rc:176 msgid "(UTC-03:00) Greenland" -msgstr "" +msgstr "(UTC-03:00) Гренландия" #: dlls/tzres/tzres.rc:147 msgid "Easter Island Standard Time" @@ -11950,7 +11831,7 @@ msgstr "" #: dlls/tzres/tzres.rc:158 msgid "(UTC+02:00) Cairo" -msgstr "" +msgstr "(UTC+02:00) Каир" #: dlls/tzres/tzres.rc:153 msgid "Eastern Standard Time (Mexico)" @@ -11986,7 +11867,7 @@ msgstr "" #: dlls/tzres/tzres.rc:416 msgid "(UTC+10:00) Vladivostok" -msgstr "" +msgstr "(UTC+10:00) Владивосток" #: dlls/tzres/tzres.rc:336 msgid "Singapore Standard Time" @@ -12010,7 +11891,7 @@ msgstr "" #: dlls/tzres/tzres.rc:206 msgid "(UTC+09:00) Seoul" -msgstr "" +msgstr "(UTC+09:00) Сеул" #: dlls/tzres/tzres.rc:123 msgid "Chatham Islands Standard Time" @@ -12034,7 +11915,7 @@ msgstr "" #: dlls/tzres/tzres.rc:137 msgid "(UTC+03:00) Nairobi" -msgstr "" +msgstr "(UTC+03:00) Найроби" #: dlls/tzres/tzres.rc:165 msgid "FLE Standard Time" @@ -12046,7 +11927,7 @@ msgstr "" #: dlls/tzres/tzres.rc:167 msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" -msgstr "" +msgstr "(UTC+02:00) Хельсинки, Киев, Рига, София, Таллин, Вильнюс" #: dlls/tzres/tzres.rc:144 msgid "E. South America Standard Time" @@ -12058,7 +11939,7 @@ msgstr "" #: dlls/tzres/tzres.rc:146 msgid "(UTC-03:00) Brasilia" -msgstr "" +msgstr "(UTC-03:00) Бразилиа" #: dlls/tzres/tzres.rc:114 msgid "Central Pacific Standard Time" @@ -12094,7 +11975,7 @@ msgstr "" #: dlls/tzres/tzres.rc:278 msgid "(UTC-04:00) Santiago" -msgstr "" +msgstr "(UTC-04:00) Сантьяго" #: dlls/tzres/tzres.rc:138 msgid "E. Australia Standard Time" @@ -12118,7 +11999,7 @@ msgstr "" #: dlls/tzres/tzres.rc:422 msgid "(UTC+08:00) Perth" -msgstr "" +msgstr "(UTC+08:00) Перт" #: dlls/urlmon/urlmon.rc:32 dlls/wininet/wininet.rc:88 msgid "Security Warning" @@ -12219,47 +12100,35 @@ msgstr "&Ещё окна..." #: dlls/vbscript/vbscript.rc:30 msgid "Overflow" -msgstr "" +msgstr "Переполнение" #: dlls/vbscript/vbscript.rc:31 -#, fuzzy -#| msgid "Out of memory." msgid "Out of memory" -msgstr "Мало памяти." +msgstr "Недостаточно памяти" #: dlls/vbscript/vbscript.rc:33 msgid "This array is fixed or temporarily locked" msgstr "" #: dlls/vbscript/vbscript.rc:34 -#, fuzzy -#| msgid "Data type mismatch.\n" msgid "Type mismatch" -msgstr "Тип данных не совпадает.\n" +msgstr "Несовпадение типов" #: dlls/vbscript/vbscript.rc:36 -#, fuzzy -#| msgid "I/O device error.\n" msgid "Device I/O error" -msgstr "Ошибка ввода/вывода на устройстве.\n" +msgstr "Ошибка ввода/вывода на устройстве" #: dlls/vbscript/vbscript.rc:37 -#, fuzzy -#| msgid "File already exists.\n" msgid "File already exists" -msgstr "Файл уже существует.\n" +msgstr "Файл уже существует" #: dlls/vbscript/vbscript.rc:38 -#, fuzzy -#| msgid "Disk full.\n" msgid "Disk full" -msgstr "Диск полностью заполнен.\n" +msgstr "Диск заполнен" #: dlls/vbscript/vbscript.rc:39 -#, fuzzy -#| msgid "Too many open files.\n" msgid "Too many files" -msgstr "Слишком много открытых файлов.\n" +msgstr "Слишком много файлов" #: dlls/vbscript/vbscript.rc:40 #, fuzzy @@ -12272,10 +12141,8 @@ msgid "Path/File access error" msgstr "" #: dlls/vbscript/vbscript.rc:42 -#, fuzzy -#| msgid "Path not found.\n" msgid "Path not found" -msgstr "Путь не найден.\n" +msgstr "Путь не найден" #: dlls/vbscript/vbscript.rc:43 #, fuzzy @@ -12284,48 +12151,36 @@ msgid "Object variable not set" msgstr "(значение не задано)" #: dlls/vbscript/vbscript.rc:44 -#, fuzzy -#| msgid "Invalid user buffer.\n" msgid "Invalid use of Null" -msgstr "Неподходящий пользовательский буфер.\n" +msgstr "Некорректное использование Null" #: dlls/vbscript/vbscript.rc:45 msgid "Can't create necessary temporary file" -msgstr "" +msgstr "Не удалось создать временный файл" #: dlls/vbscript/vbscript.rc:46 -#, fuzzy -#| msgid "Automation server can't create object" msgid "ActiveX component can't create object" -msgstr "Сервер автоматизации не может создать объект" +msgstr "Компонент ActiveX не смог создать объект" #: dlls/vbscript/vbscript.rc:47 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Class doesn't support Automation" -msgstr "Объект не поддерживает это действие" +msgstr "Класс не поддерживает автоматизацию" #: dlls/vbscript/vbscript.rc:48 msgid "File name or class name not found during Automation operation" msgstr "" #: dlls/vbscript/vbscript.rc:51 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support named arguments" -msgstr "Объект не поддерживает это действие" +msgstr "Объект не поддерживает именованные аргументы" #: dlls/vbscript/vbscript.rc:52 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support current locale setting" -msgstr "Объект не поддерживает это действие" +msgstr "Объект не поддерживает выбор локали" #: dlls/vbscript/vbscript.rc:53 dlls/vbscript/vbscript.rc:54 -#, fuzzy -#| msgid "Element not found.\n" msgid "Named argument not found" -msgstr "Элемент не найден.\n" +msgstr "Именованный аргумент не найден" #: dlls/vbscript/vbscript.rc:55 msgid "Wrong number of arguments or invalid property assignment" @@ -12338,10 +12193,8 @@ msgid "Object not a collection" msgstr "Нарушение класса объекта" #: dlls/vbscript/vbscript.rc:57 -#, fuzzy -#| msgid "Specified control was not found in message" msgid "Specified DLL function not found" -msgstr "Указанный управляющий элемент не найден в сообщении" +msgstr "Указанная функция не найдена в библиотеке" #: dlls/vbscript/vbscript.rc:58 msgid "Variable uses an Automation type not supported in VBScript" @@ -12357,11 +12210,11 @@ msgstr "" #: dlls/vbscript/vbscript.rc:62 msgid "Microsoft VBScript compilation error" -msgstr "" +msgstr "Ошибка компиляции Microsoft VBScript" #: dlls/vbscript/vbscript.rc:63 msgid "Microsoft VBScript runtime error" -msgstr "" +msgstr "Ошибка выполнения Microsoft VBScript" #: dlls/winemac.drv/winemac.rc:33 msgid "Hide %@" @@ -12462,22 +12315,16 @@ msgid "Effective Date" msgstr "" #: dlls/wininet/wininet.rc:37 -#, fuzzy -#| msgid "Security" msgid "Security Protocol" -msgstr "Безопасность" +msgstr "Протокол безопасности" #: dlls/wininet/wininet.rc:38 -#, fuzzy -#| msgid "Signature" msgid "Signature Type" -msgstr "Подпись" +msgstr "Тип подписи" #: dlls/wininet/wininet.rc:39 -#, fuzzy -#| msgid "Encrypting File System" msgid "Encryption Type" -msgstr "Шифрованная файловая система" +msgstr "Тип шифрования" #: dlls/wininet/wininet.rc:40 msgid "Privacy Strength" @@ -12485,7 +12332,7 @@ msgstr "" #: dlls/wininet/wininet.rc:43 msgid "bits" -msgstr "" +msgstr "бит" #: dlls/wininet/winineterror.mc:26 msgid "The request has timed out.\n" @@ -13453,13 +13300,11 @@ msgstr "" #: programs/chcp.com/chcp.rc:28 msgid "Active code page: %1!u!\n" -msgstr "" +msgstr "Активная кодовая страница: %1!u!\n" #: programs/chcp.com/chcp.rc:29 -#, fuzzy -#| msgid "Invalid message.\n" msgid "Invalid code page\n" -msgstr "Неверное сообщение.\n" +msgstr "Неверная кодовая страница\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -14533,7 +14378,7 @@ msgstr "" #: programs/fsutil/fsutil.mc:40 msgid "Syntax: fsutil hardlink create <new> <existing>\n" -msgstr "" +msgstr "Синтаксис: fsutil hardlink create <новое имя> <существующее имя>\n" #: programs/hostname/hostname.rc:30 msgid "Usage: hostname\n" @@ -15671,37 +15516,24 @@ msgid "Type \"REG %1 /?\" for help.\n" msgstr "Для справки введите «REG %1 /?».\n" #: programs/reg/reg.rc:181 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to access or create the specified registry key\n" -msgstr "reg: не удалось найти указанный раздел реестра или значение\n" +msgstr "reg: не удалось получить доступ или создать ключ\n" #: programs/reg/reg.rc:116 -#, fuzzy -#| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "Операция успешно завершена\n" +msgstr "reg: операция успешно завершена\n" #: programs/reg/reg.rc:131 -#, fuzzy -#| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" -msgstr "Операция с реестром была отменена\n" +msgstr "reg: операция с реестром была отменена\n" #: programs/reg/reg.rc:174 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "reg: не удалось найти указанный раздел реестра или значение\n" +msgstr "reg: не удалось найти указанный ключ\n" #: programs/reg/reg.rc:120 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "reg: не удалось найти указанный раздел реестра или значение\n" +msgstr "reg: не удалось найти указанное значение\n" #: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -15712,17 +15544,6 @@ msgid "Type \"REG /?\" for help.\n" msgstr "Для справки введите «REG /?».\n" #: programs/reg/reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | EXPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -15734,11 +15555,11 @@ msgid "" " REG [operation] /?\n" "\n" msgstr "" -"Вызов:\n" +"Использование:\n" " REG [операция] [параметры]\n" "\n" "Поддерживаемые операции:\n" -" ADD | DELETE | IMPORT | EXPORT | QUERY\n" +" ADD | COPY | DELETE | EXPORT | IMPORT | QUERY\n" "\n" "Для получения справки по конкретной операции используйте:\n" " REG [операция] /?\n" @@ -15909,6 +15730,13 @@ msgid "" " The name and path of the registry file to import.\n" "\n" msgstr "" +"REG IMPORT <файл>\n" +"\n" +" Импорт ключей, значений и данных из указанного файла.\n" +"\n" +" <файл>\n" +" Имя импортируемого файла.\n" +"\n" #: programs/reg/reg.rc:114 msgid "" @@ -15954,33 +15782,32 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" +" /reg:32\n" +" Доступ к 32-битным веткам реестра.\n" +"\n" +" /reg:64\n" +" Доступ к 64-битным веткам реестра.\n" +"\n" #: programs/reg/reg.rc:117 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "reg: неверное имя раздела\n" +msgstr "reg: неверный ключ\n" #: programs/reg/reg.rc:119 msgid "reg: Unable to access remote machine\n" msgstr "reg: не удалось получить доступ к удалённому компьютеру\n" #: programs/reg/reg.rc:172 -#, fuzzy -#| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" -msgstr "reg: неверный системный ключ [%1]\n" +msgstr "reg: неверный системный ключ\n" #: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: неверная опция [%1]. " #: programs/reg/reg.rc:122 -#, fuzzy -#| msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgid "reg: The option [/d] must be followed by a valid numeric value\n" -msgstr "" -"reg: за опцией [/d] должно следовать число в шестнадцатеричном формате\n" +msgstr "reg: за опцией [/d] должно следовать числовое значение\n" #: programs/reg/reg.rc:123 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" @@ -16012,12 +15839,10 @@ msgid "reg: The source and destination keys cannot be the same\n" msgstr "" #: programs/reg/reg.rc:205 -#, fuzzy -#| msgid "The file '%1' already exists. Do you want to overwrite it?" msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" -msgstr "Файл «%1» уже существует. Вы хотите заменить его?" +msgstr "Значение «%1\\%2» уже существует. Вы хотите заменить его?" #: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" @@ -16032,10 +15857,8 @@ msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Вы точно хотите удалить ключ реестра «%1»?" #: programs/reg/reg.rc:137 -#, fuzzy -#| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" -msgstr "regedit: не удалось удалить ключ «%1».\n" +msgstr "regedit: не удалось удалить все значения в «%1»\n" #: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" @@ -16046,10 +15869,8 @@ msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: неизвестная управляющая последовательность [\\%1!c!]\n" #: programs/reg/reg.rc:175 -#, fuzzy -#| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "reg: не удалось открыть ключ «%1».\n" +msgstr "reg: не удалось импортировать ключ «%1»\n" #: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" @@ -16730,37 +16551,6 @@ msgid "regsvr32: Successfully uninstalled DLL '%1'\n" msgstr "regsvr32: DLL «%1» успешно удалена\n" #: programs/start/start.rc:57 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files\n" -#| "with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with " -#| "its\n" -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows\n" -#| "Explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -16815,6 +16605,8 @@ msgstr "" "/wait Подождать завершения программы и вернуть её код возврата.\n" "/unix Использовать Unix-имя файла и запустить как Windows\n" " Explorer.\n" +"/exec Выполнить указанный файл (для внутреннего использования в " +"Wine).\n" "/ProgIDOpen Открывает документ с помощью указанного progID.\n" "/? Показать эту справку и выйти.\n" -- 2.34.1

1 0

[PATCH] mshtml: Fix use after free in use_gecko_script (Coverity)
by Alex Henrie 30 Dec '21

30 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/mshtml/script.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 28e07a50c8e..2a0d86c9f76 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1716,12 +1716,13 @@ static BOOL use_gecko_script(IUri *uri) return FALSE; hres = IInternetSecurityManager_MapUrlToZone(get_security_manager(), display_uri, &zone, 0); - SysFreeString(display_uri); if(FAILED(hres)) { WARN("Could not map %s to zone: %08x\n", debugstr_w(display_uri), hres); + SysFreeString(display_uri); return TRUE; } + SysFreeString(display_uri); TRACE("zone %d\n", zone); return zone == URLZONE_UNTRUSTED; } -- 2.34.1

2 1

[PATCH 2/2] ntdll/tests: Remove workarounds for old Windows versions.
by Jacek Caban 30 Dec '21

30 Dec '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/path.c | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-)

1 0

[PATCH 1/2] ntdll: Fix handling \\.\CON path in RtlDosPathNameToNtPathName.
by Jacek Caban 30 Dec '21

30 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=32183 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- It seems to be a special case, like in RtlIsDosDeviceName_U. dlls/ntdll/path.c | 4 +++- dlls/ntdll/tests/path.c | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-)

1 0

[PATCH] comctl32: ShowWindow should be called in REBAR_CommonSetupBand on visibility change
by Jesus Sanz del Rey 30 Dec '21

30 Dec '21

From: StartForKillerMC <jesussanz2003(a)gmail.com> This bug was reported on ReactOS jira: https://jira.reactos.org/browse/CORE-17236 Signed-off-by: StartForKillerMC <jesussanz2003(a)gmail.com> Signed-off-by: Jesus Sanz del Rey <jesussanz2003(a)gmail.com> --- dlls/comctl32/rebar.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 6a065514e60..4934728f23f 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1705,13 +1705,6 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan lpBand->fMask |= lprbbi->fMask; - if( (lprbbi->fMask & RBBIM_STYLE) && - (lpBand->fStyle != lprbbi->fStyle ) ) - { - lpBand->fStyle = lprbbi->fStyle; - uChanged |= RBBIM_STYLE; - } - if( (lprbbi->fMask & RBBIM_COLORS) && ( ( lpBand->clrFore != lprbbi->clrFore ) || ( lpBand->clrBack != lprbbi->clrBack ) ) ) @@ -1748,6 +1741,15 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan uChanged |= RBBIM_CHILD; } + if( (lprbbi->fMask & RBBIM_STYLE) && + (lpBand->fStyle != lprbbi->fStyle ) ) + { + if (lpBand->hwndChild && ((lpBand->fStyle & RBBS_HIDDEN) != (lprbbi->fStyle & RBBS_HIDDEN))) + ShowWindow(lpBand->hwndChild, (lprbbi->fStyle & RBBS_HIDDEN) ? SW_HIDE : (SW_SHOWNOACTIVATE | SW_SHOWNORMAL)); + lpBand->fStyle = lprbbi->fStyle; + uChanged |= RBBIM_STYLE; + } + if( (lprbbi->fMask & RBBIM_CHILDSIZE) && ( (lpBand->cxMinChild != lprbbi->cxMinChild) || (lpBand->cyMinChild != lprbbi->cyMinChild ) || -- 2.33.0

1 0

[PATCH] comctl32: ShowWindow should be called in REBAR_CommonSetupBand on visibility change
by StartForKillerMC 30 Dec '21

30 Dec '21

This bug was reported on ReactOS jira: https://jira.reactos.org/browse/CORE-17236 Signed-off-by: StartForKillerMC <jesussanz2003(a)gmail.com> --- dlls/comctl32/rebar.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 6a065514e60..4934728f23f 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1705,13 +1705,6 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan lpBand->fMask |= lprbbi->fMask; - if( (lprbbi->fMask & RBBIM_STYLE) && - (lpBand->fStyle != lprbbi->fStyle ) ) - { - lpBand->fStyle = lprbbi->fStyle; - uChanged |= RBBIM_STYLE; - } - if( (lprbbi->fMask & RBBIM_COLORS) && ( ( lpBand->clrFore != lprbbi->clrFore ) || ( lpBand->clrBack != lprbbi->clrBack ) ) ) @@ -1748,6 +1741,15 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan uChanged |= RBBIM_CHILD; } + if( (lprbbi->fMask & RBBIM_STYLE) && + (lpBand->fStyle != lprbbi->fStyle ) ) + { + if (lpBand->hwndChild && ((lpBand->fStyle & RBBS_HIDDEN) != (lprbbi->fStyle & RBBS_HIDDEN))) + ShowWindow(lpBand->hwndChild, (lprbbi->fStyle & RBBS_HIDDEN) ? SW_HIDE : (SW_SHOWNOACTIVATE | SW_SHOWNORMAL)); + lpBand->fStyle = lprbbi->fStyle; + uChanged |= RBBIM_STYLE; + } + if( (lprbbi->fMask & RBBIM_CHILDSIZE) && ( (lpBand->cxMinChild != lprbbi->cxMinChild) || (lpBand->cyMinChild != lprbbi->cyMinChild ) || -- 2.33.0

1 0

[PATCH] comctl32: ShowWindow should be called in REBAR_CommonSetupBand on visibility change
by StartForKillerMC 30 Dec '21

30 Dec '21

This bug was reported on ReactOS jira: https://jira.reactos.org/browse/CORE-17236 --- dlls/comctl32/rebar.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 6a065514e60..4934728f23f 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1705,13 +1705,6 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan lpBand->fMask |= lprbbi->fMask; - if( (lprbbi->fMask & RBBIM_STYLE) && - (lpBand->fStyle != lprbbi->fStyle ) ) - { - lpBand->fStyle = lprbbi->fStyle; - uChanged |= RBBIM_STYLE; - } - if( (lprbbi->fMask & RBBIM_COLORS) && ( ( lpBand->clrFore != lprbbi->clrFore ) || ( lpBand->clrBack != lprbbi->clrBack ) ) ) @@ -1748,6 +1741,15 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan uChanged |= RBBIM_CHILD; } + if( (lprbbi->fMask & RBBIM_STYLE) && + (lpBand->fStyle != lprbbi->fStyle ) ) + { + if (lpBand->hwndChild && ((lpBand->fStyle & RBBS_HIDDEN) != (lprbbi->fStyle & RBBS_HIDDEN))) + ShowWindow(lpBand->hwndChild, (lprbbi->fStyle & RBBS_HIDDEN) ? SW_HIDE : (SW_SHOWNOACTIVATE | SW_SHOWNORMAL)); + lpBand->fStyle = lprbbi->fStyle; + uChanged |= RBBIM_STYLE; + } + if( (lprbbi->fMask & RBBIM_CHILDSIZE) && ( (lpBand->cxMinChild != lprbbi->cxMinChild) || (lpBand->cyMinChild != lprbbi->cyMinChild ) || -- 2.33.0

1 0

[PATCH] po: Update Japanese translation.
by Akihiro Sagawa 30 Dec '21

30 Dec '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-)

1 0

[PATCH] comctl32/listview: Don not paint over header when handling WM_NCPAINT.
by Zhiyi Zhang 30 Dec '21

30 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52285 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/listview.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 41e3db5f9be..9e35f7879b7 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10537,8 +10537,8 @@ static LRESULT LISTVIEW_NCPaint(const LISTVIEW_INFO *infoPtr, HRGN region) { LONG exstyle = GetWindowLongW (infoPtr->hwndSelf, GWL_EXSTYLE); HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); + RECT r, window_rect; HDC dc; - RECT r; HRGN cliprgn; int cxEdge = GetSystemMetrics (SM_CXEDGE), cyEdge = GetSystemMetrics (SM_CYEDGE); @@ -10552,7 +10552,13 @@ static LRESULT LISTVIEW_NCPaint(const LISTVIEW_INFO *infoPtr, HRGN region) r.right - cxEdge, r.bottom - cyEdge); if (region != (HRGN)1) CombineRgn (cliprgn, cliprgn, region, RGN_AND); + OffsetRect(&r, -r.left, -r.top); + if (infoPtr->hwndHeader && LISTVIEW_IsHeaderEnabled(infoPtr)) + { + GetWindowRect(infoPtr->hwndHeader, &window_rect); + r.top = min(r.bottom, r.top + window_rect.bottom - window_rect.top); + } dc = GetDCEx(infoPtr->hwndSelf, region, DCX_WINDOW|DCX_INTERSECTRGN); -- 2.32.0

1 0

[PATCH] combase: Don't use attr.ObjectName after calling create_key (cppcheck)
by Alex Henrie 30 Dec '21

30 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/combase/combase.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 4677972656f..c71158af47c 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -232,7 +232,7 @@ static HKEY create_classes_root_hkey(DWORD access) RtlInitUnicodeString(&name, L"\\Registry\\Machine\\Software\\Classes"); if (create_key( &hkey, access, &attr )) return 0; - TRACE( "%s -> %p\n", debugstr_w(attr.ObjectName->Buffer), hkey ); + TRACE( "%s -> %p\n", debugstr_w(name.Buffer), hkey ); if (!(access & KEY_WOW64_64KEY)) { -- 2.34.1

1 2

[PATCH] combase: Don't change attr->ObjectName in create_key (cppcheck)
by Alex Henrie 30 Dec '21

30 Dec '21

ObjectName can't point to a local variable because it is used later outside of this function. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/combase/combase.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 4677972656f..a3ba3a53fe6 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -186,18 +186,16 @@ static NTSTATUS create_key(HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES * HANDLE subkey, root = attr->RootDirectory; WCHAR *buffer = attr->ObjectName->Buffer; DWORD attrs, pos = 0, i = 0, len = attr->ObjectName->Length / sizeof(WCHAR); - UNICODE_STRING str; while (i < len && buffer[i] != '\\') i++; if (i == len) return status; attrs = attr->Attributes; - attr->ObjectName = &str; while (i < len) { - str.Buffer = buffer + pos; - str.Length = (i - pos) * sizeof(WCHAR); + attr->ObjectName->Buffer = buffer + pos; + attr->ObjectName->Length = (i - pos) * sizeof(WCHAR); status = NtCreateKey(&subkey, access, attr, 0, NULL, 0, NULL); if (attr->RootDirectory != root) NtClose(attr->RootDirectory); if (status) return status; @@ -206,8 +204,8 @@ static NTSTATUS create_key(HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES * pos = i; while (i < len && buffer[i] != '\\') i++; } - str.Buffer = buffer + pos; - str.Length = (i - pos) * sizeof(WCHAR); + attr->ObjectName->Buffer = buffer + pos; + attr->ObjectName->Length = (i - pos) * sizeof(WCHAR); attr->Attributes = attrs; status = NtCreateKey((HANDLE *)retkey, access, attr, 0, NULL, 0, NULL); if (attr->RootDirectory != root) NtClose(attr->RootDirectory); -- 2.34.1

2 2

[PATCH] shell32: Fix sizeof argument in DoPaste (Coverity)
by Alex Henrie 30 Dec '21

30 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/shlview_cmenu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 6c05904bb91..a7e14b3e241 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -1218,7 +1218,7 @@ static HRESULT DoPaste(ContextMenu *This) TRACE("CF_HDROP=%p\n", medium.u.hGlobal); count = DragQueryFileW(medium.u.hGlobal, -1, NULL, 0); - pidls = SHAlloc(count*sizeof(ITEMIDLIST**)); + pidls = SHAlloc(count*sizeof(ITEMIDLIST*)); if (pidls) { for (i = 0; i < count; i++) -- 2.34.1

1 0

[PATCH] mciwave: Fix bad free in MCI_SendCommandAsync (Coverity)
by Alex Henrie 30 Dec '21

30 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/mciwave/mciwave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 13dd927cd42..4f4e69cd0a2 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -124,7 +124,7 @@ static DWORD MCI_SendCommandAsync(UINT wDevID, async_cmd cmd, DWORD_PTR dwParam1 WARN("Couldn't allocate thread for async command handling, sending synchronously\n"); if (handles[1]) CloseHandle(handles[1]); sca->evt = NULL; - return MCI_SCAStarter(&sca); + return MCI_SCAStarter(sca); } SetThreadPriority(handles[0], THREAD_PRIORITY_TIME_CRITICAL); -- 2.34.1

1 0

[PATCH] winhttp: Fix memory leak on error path in WinHttpCrackUrl (Coverity)
by Alex Henrie 30 Dec '21

30 Dec '21

And use a single variable for the encoded or decoded URL so that free only has to be called once. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/winhttp/url.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 0d9dfb76de6..8efd5ed0c49 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -172,7 +172,7 @@ static DWORD parse_port( const WCHAR *str, DWORD len, INTERNET_PORT *ret ) */ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONENTSW uc ) { - WCHAR *p, *q, *r, *url_decoded = NULL, *url_escaped = NULL; + WCHAR *p, *q, *r, *url_transformed = NULL; INTERNET_SCHEME scheme_number = 0; struct url_component scheme, username, password, hostname, path, extra; BOOL overflow = FALSE; @@ -189,25 +189,26 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN if (flags & ICU_ESCAPE) { - if ((err = escape_url( url, &len, &url_escaped ))) + if ((err = escape_url( url, &len, &url_transformed ))) { SetLastError( err ); return FALSE; } - url = url_escaped; + url = url_transformed; } else if (flags & ICU_DECODE) { - if (!(url_decoded = decode_url( url, &len ))) + if (!(url_transformed = decode_url( url, &len ))) { SetLastError( ERROR_OUTOFMEMORY ); return FALSE; } - url = url_decoded; + url = url_transformed; } if (!(p = wcschr( url, ':' ))) { SetLastError( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ); + free( url_transformed ); return FALSE; } if (p - url == 4 && !wcsnicmp( url, L"http", 4 )) scheme_number = INTERNET_SCHEME_HTTP; @@ -331,8 +332,7 @@ exit: if (overflow) err = ERROR_INSUFFICIENT_BUFFER; uc->nScheme = scheme_number; } - free( url_decoded ); - free( url_escaped ); + free( url_transformed ); SetLastError( err ); return !err; } -- 2.34.1

1 0

[PATCH] msi: Fix memory leak in get_fusion_filename (Coverity)
by Alex Henrie 30 Dec '21

30 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/msi/package.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 7488c095080..596affbaae4 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -553,6 +553,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) GetWindowsDirectoryW(windir, MAX_PATH); len = lstrlenW(windir) + lstrlenW(L"Microsoft.NET\\Framework\\") + lstrlenW(L"v2.0.50727") + lstrlenW(L"fusion.dll") + 3; + msi_free(filename); if (!(filename = msi_alloc(len * sizeof(WCHAR)))) return NULL; lstrcpyW(filename, windir); -- 2.34.1

1 0

[PATCH] adsldp: Fix memory leak in search_ExecuteSearch (Coverity)
by Alex Henrie 30 Dec '21

30 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/adsldp/adsldp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 3d5ea29882c..c8f63a25e0c 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1302,7 +1302,11 @@ static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filte props = NULL; else { - if (count && !names) return E_ADS_BAD_PARAMETER; + if (count && !names) + { + heap_free(ldap_ctx); + return E_ADS_BAD_PARAMETER; + } props = heap_alloc((count + 1) * sizeof(props[0])); if (!props) -- 2.34.1

1 0

[PATCH] winegstreamer: Always set the initial video type for the WMF reader to WG_VIDEO_FORMAT_BGR.
by Zebediah Figura 30 Dec '21

30 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52273 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/wm_reader.c | 8 +++++--- dlls/wmvcore/tests/wmvcore.c | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 3a1f1684fdc..693e9adfc19 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1503,9 +1503,11 @@ static HRESULT init_stream(struct wm_reader *reader, QWORD file_size) { /* Call of Juarez: Bound in Blood breaks if I420 is enumerated. * Some native decoders output I420, but the msmpeg4v3 decoder - * never does. */ - if (stream->format.u.video.format == WG_VIDEO_FORMAT_I420) - stream->format.u.video.format = WG_VIDEO_FORMAT_YV12; + * never does. + * + * Shadowgrounds provides wmv3 video and assumes that the initial + * video type will be BGR. */ + stream->format.u.video.format = WG_VIDEO_FORMAT_BGR; } wg_parser_stream_enable(stream->wg_stream, &stream->format); } diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 66ad89a185e..1b9cffaee1d 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -2388,6 +2388,8 @@ static void test_async_reader_types(void) else { ok(IsEqualGUID(&majortype, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&majortype)); + /* Shadowgrounds assumes that the initial video type will be RGB24. */ + ok(IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB24), "Got subtype %s.\n", debugstr_guid(&mt->subtype)); got_video = true; check_video_type(mt); } -- 2.34.1

1 0

[PATCH] winegstreamer: Use the size of the data read when allocating the read buffer.
by Zebediah Figura 30 Dec '21

30 Dec '21

Instead of the size of the data requested, which may be e.g. UINT_MAX. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52277 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/wg_parser.c | 67 ++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 28 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 0178538fa81..013566b25e9 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -80,11 +80,11 @@ struct wg_parser pthread_cond_t read_cond, read_done_cond; struct { - void *data; + GstBuffer *buffer; uint64_t offset; uint32_t size; bool done; - bool ret; + GstFlowReturn ret; } read_request; bool flushing, sink_connected; @@ -556,7 +556,7 @@ static NTSTATUS wg_parser_get_next_read_offset(void *args) pthread_mutex_lock(&parser->mutex); - while (parser->sink_connected && !parser->read_request.data) + while (parser->sink_connected && !parser->read_request.size) pthread_cond_wait(&parser->read_cond, &parser->mutex); if (!parser->sink_connected) @@ -580,12 +580,35 @@ static NTSTATUS wg_parser_push_data(void *args) uint32_t size = params->size; pthread_mutex_lock(&parser->mutex); - parser->read_request.size = size; - parser->read_request.done = true; - parser->read_request.ret = !!data; + if (data) - memcpy(parser->read_request.data, data, size); - parser->read_request.data = NULL; + { + if (size) + { + GstMapInfo map_info; + + /* Note that we don't allocate the buffer until we have a size. + * midiparse passes a NULL buffer and a size of UINT_MAX, in an + * apparent attempt to read the whole input stream at once. */ + if (!parser->read_request.buffer) + parser->read_request.buffer = gst_buffer_new_and_alloc(size); + gst_buffer_map(parser->read_request.buffer, &map_info, GST_MAP_WRITE); + memcpy(map_info.data, data, size); + gst_buffer_unmap(parser->read_request.buffer, &map_info); + parser->read_request.ret = GST_FLOW_OK; + } + else + { + parser->read_request.ret = GST_FLOW_EOS; + } + } + else + { + parser->read_request.ret = GST_FLOW_ERROR; + } + parser->read_request.done = true; + parser->read_request.size = 0; + pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&parser->read_done_cond); @@ -1279,9 +1302,7 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, guint64 offset, guint size, GstBuffer **buffer) { struct wg_parser *parser = gst_pad_get_element_private(pad); - GstBuffer *new_buffer = NULL; - GstMapInfo map_info; - bool ret; + GstFlowReturn ret; GST_LOG("pad %p, offset %" G_GINT64_MODIFIER "u, size %u, buffer %p.", pad, offset, size, *buffer); @@ -1289,25 +1310,22 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, offset = parser->next_pull_offset; parser->next_pull_offset = offset + size; - if (!*buffer) - *buffer = new_buffer = gst_buffer_new_and_alloc(size); - if (!size) { /* asfreader occasionally asks for zero bytes. gst_buffer_map() will * return NULL in this case. Avoid confusing the read thread by asking * it for zero bytes. */ + if (!*buffer) + *buffer = gst_buffer_new_and_alloc(0); gst_buffer_set_size(*buffer, 0); GST_LOG("Returning empty buffer."); return GST_FLOW_OK; } - gst_buffer_map(*buffer, &map_info, GST_MAP_WRITE); - pthread_mutex_lock(&parser->mutex); - assert(!parser->read_request.data); - parser->read_request.data = map_info.data; + assert(!parser->read_request.size); + parser->read_request.buffer = *buffer; parser->read_request.offset = offset; parser->read_request.size = size; parser->read_request.done = false; @@ -1320,21 +1338,14 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, while (!parser->read_request.done) pthread_cond_wait(&parser->read_done_cond, &parser->mutex); + *buffer = parser->read_request.buffer; ret = parser->read_request.ret; - gst_buffer_set_size(*buffer, parser->read_request.size); pthread_mutex_unlock(&parser->mutex); - gst_buffer_unmap(*buffer, &map_info); - - GST_LOG("Request returned %d.", ret); + GST_LOG("Request returned %s.", gst_flow_get_name(ret)); - if ((!ret || !size) && new_buffer) - gst_buffer_unref(new_buffer); - - if (ret) - return size ? GST_FLOW_OK : GST_FLOW_EOS; - return GST_FLOW_ERROR; + return ret; } static gboolean src_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) -- 2.34.1

1 0

[PATCH] po: Update Korean translation.
by Byeongsik Jeon 30 Dec '21

30 Dec '21

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- po/ko.po | 111 ++++++++++++++++++++++++++----------------------------- 1 file changed, 52 insertions(+), 59 deletions(-) diff --git a/po/ko.po b/po/ko.po index 6e42d3ba1e7..d6c304bfa8d 100644 --- a/po/ko.po +++ b/po/ko.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: 2021-12-02 20:37+0900\n" +"PO-Revision-Date: 2021-12-30 11:19+0900\n" "Last-Translator: Byeongsik Jeon <bsjeon(a)hanmail.net>\n" "Language-Team: Korean\n" "Language: ko\n" @@ -6984,7 +6984,7 @@ msgstr "타블로이드" #: dlls/localspl/localspl.rc:40 msgid "Ledger" -msgstr "회계 원장" +msgstr "레저" #: dlls/localspl/localspl.rc:41 msgid "Legal" @@ -6992,11 +6992,11 @@ msgstr "리갈" #: dlls/localspl/localspl.rc:42 msgid "Statement" -msgstr "Statement" +msgstr "스테이트먼트" #: dlls/localspl/localspl.rc:43 msgid "Executive" -msgstr "Executive" +msgstr "익스큐티브" #: dlls/localspl/localspl.rc:44 msgid "A3" @@ -7024,11 +7024,11 @@ msgstr "B5 (JIS)" #: dlls/localspl/localspl.rc:50 msgid "Folio" -msgstr "Folio" +msgstr "폴리오" #: dlls/localspl/localspl.rc:51 msgid "Quarto" -msgstr "Quarto" +msgstr "쿼토" #: dlls/localspl/localspl.rc:52 msgid "10x14" @@ -7044,23 +7044,23 @@ msgstr "노트" #: dlls/localspl/localspl.rc:55 msgid "Envelope #9" -msgstr "봉투 #9" +msgstr "봉투 9호" #: dlls/localspl/localspl.rc:56 msgid "Envelope #10" -msgstr "봉투 #10" +msgstr "봉투 10호" #: dlls/localspl/localspl.rc:57 msgid "Envelope #11" -msgstr "봉투 #11" +msgstr "봉투 11호" #: dlls/localspl/localspl.rc:58 msgid "Envelope #12" -msgstr "봉투 #12" +msgstr "봉투 12호" #: dlls/localspl/localspl.rc:59 msgid "Envelope #14" -msgstr "봉투 #14" +msgstr "봉투 14호" #: dlls/localspl/localspl.rc:60 msgid "C size sheet" @@ -7236,7 +7236,7 @@ msgstr "A3 엑스트라 가로" #: dlls/localspl/localspl.rc:103 msgid "Japanese Double Postcard" -msgstr "일본 이중 엽서" +msgstr "일본 왕복 엽서" #: dlls/localspl/localspl.rc:104 msgid "A6" @@ -7244,19 +7244,19 @@ msgstr "A6" #: dlls/localspl/localspl.rc:105 msgid "Japanese Envelope Kaku #2" -msgstr "일본 봉투 Kaku #2" +msgstr "일본 봉투 각형 2호" #: dlls/localspl/localspl.rc:106 msgid "Japanese Envelope Kaku #3" -msgstr "일본 봉투 Kaku #3" +msgstr "일본 봉투 각형 3호" #: dlls/localspl/localspl.rc:107 msgid "Japanese Envelope Chou #3" -msgstr "일본 봉투 Chou #3" +msgstr "일본 봉투 장형 3호" #: dlls/localspl/localspl.rc:108 msgid "Japanese Envelope Chou #4" -msgstr "일본 봉투 Chou #4" +msgstr "일본 봉투 장형 4호" #: dlls/localspl/localspl.rc:109 msgid "Letter Rotated" @@ -7288,7 +7288,7 @@ msgstr "일본 엽서 회전" #: dlls/localspl/localspl.rc:116 msgid "Double Japan Postcard Rotated" -msgstr "이중 일본 엽서 회전" +msgstr "일본 왕복 엽서 회전" #: dlls/localspl/localspl.rc:117 msgid "A6 Rotated" @@ -7296,19 +7296,19 @@ msgstr "A6 회전" #: dlls/localspl/localspl.rc:118 msgid "Japan Envelope Kaku #2 Rotated" -msgstr "일본 봉투 Kaku #2 회전" +msgstr "일본 봉투 각형 2호 회전" #: dlls/localspl/localspl.rc:119 msgid "Japan Envelope Kaku #3 Rotated" -msgstr "일본 봉투 Kaku #3 회전" +msgstr "일본 봉투 각형 3호 회전" #: dlls/localspl/localspl.rc:120 msgid "Japan Envelope Chou #3 Rotated" -msgstr "일본 봉투 Chou #3 회전" +msgstr "일본 봉투 장형 3호 회전" #: dlls/localspl/localspl.rc:121 msgid "Japan Envelope Chou #4 Rotated" -msgstr "일본 봉투 Chou #4 회전" +msgstr "일본 봉투 장형 4호 회전" #: dlls/localspl/localspl.rc:122 msgid "B6 (JIS)" @@ -7324,115 +7324,115 @@ msgstr "12x11" #: dlls/localspl/localspl.rc:125 msgid "Japan Envelope You #4" -msgstr "일본 봉투 You #4" +msgstr "일본 봉투 서양형 4호" #: dlls/localspl/localspl.rc:126 msgid "Japan Envelope You #4 Rotated" -msgstr "일본 봉투 You #4 회전" +msgstr "일본 봉투 서양형 4호 회전" #: dlls/localspl/localspl.rc:127 msgid "PRC 16K" -msgstr "PRC 16K" +msgstr "중국 16K" #: dlls/localspl/localspl.rc:128 msgid "PRC 32K" -msgstr "PRC 32K" +msgstr "중국 32K" #: dlls/localspl/localspl.rc:129 msgid "PRC 32K(Big)" -msgstr "PRC 32K(대)" +msgstr "중국 32K(대)" #: dlls/localspl/localspl.rc:130 msgid "PRC Envelope #1" -msgstr "PRC 봉투 #1" +msgstr "중국 봉투 1호" #: dlls/localspl/localspl.rc:131 msgid "PRC Envelope #2" -msgstr "PRC 봉투 #2" +msgstr "중국 봉투 2호" #: dlls/localspl/localspl.rc:132 msgid "PRC Envelope #3" -msgstr "PRC 봉투 #3" +msgstr "중국 봉투 3호" #: dlls/localspl/localspl.rc:133 msgid "PRC Envelope #4" -msgstr "PRC 봉투 #4" +msgstr "중국 봉투 4호" #: dlls/localspl/localspl.rc:134 msgid "PRC Envelope #5" -msgstr "PRC 봉투 #5" +msgstr "중국 봉투 5호" #: dlls/localspl/localspl.rc:135 msgid "PRC Envelope #6" -msgstr "PRC 봉투 #6" +msgstr "중국 봉투 6호" #: dlls/localspl/localspl.rc:136 msgid "PRC Envelope #7" -msgstr "PRC 봉투 #7" +msgstr "중국 봉투 7호" #: dlls/localspl/localspl.rc:137 msgid "PRC Envelope #8" -msgstr "PRC 봉투 #8" +msgstr "중국 봉투 8호" #: dlls/localspl/localspl.rc:138 msgid "PRC Envelope #9" -msgstr "PRC 봉투 #9" +msgstr "중국 봉투 9호" #: dlls/localspl/localspl.rc:139 msgid "PRC Envelope #10" -msgstr "PRC 봉투 #10" +msgstr "중국 봉투 10호" #: dlls/localspl/localspl.rc:140 msgid "PRC 16K Rotated" -msgstr "PRC 16K 회전" +msgstr "중국 16K 회전" #: dlls/localspl/localspl.rc:141 msgid "PRC 32K Rotated" -msgstr "PRC 32K 회전" +msgstr "중국 32K 회전" #: dlls/localspl/localspl.rc:142 msgid "PRC 32K(Big) Rotated" -msgstr "PRC 32K(대) 회전" +msgstr "중국 32K(대) 회전" #: dlls/localspl/localspl.rc:143 msgid "PRC Envelope #1 Rotated" -msgstr "PRC 봉투 #1 회전" +msgstr "중국 봉투 1호 회전" #: dlls/localspl/localspl.rc:144 msgid "PRC Envelope #2 Rotated" -msgstr "PRC 봉투 #2 회전" +msgstr "중국 봉투 2호 회전" #: dlls/localspl/localspl.rc:145 msgid "PRC Envelope #3 Rotated" -msgstr "PRC 봉투 #3 회전" +msgstr "중국 봉투 3호 회전" #: dlls/localspl/localspl.rc:146 msgid "PRC Envelope #4 Rotated" -msgstr "PRC 봉투 #4 회전" +msgstr "중국 봉투 4호 회전" #: dlls/localspl/localspl.rc:147 msgid "PRC Envelope #5 Rotated" -msgstr "PRC 봉투 #5 회전" +msgstr "중국 봉투 5호 회전" #: dlls/localspl/localspl.rc:148 msgid "PRC Envelope #6 Rotated" -msgstr "PRC 봉투 #6 회전" +msgstr "중국 봉투 6호 회전" #: dlls/localspl/localspl.rc:149 msgid "PRC Envelope #7 Rotated" -msgstr "PRC 봉투 #7 회전" +msgstr "중국 봉투 7호 회전" #: dlls/localspl/localspl.rc:150 msgid "PRC Envelope #8 Rotated" -msgstr "PRC 봉투 #8 회전" +msgstr "중국 봉투 8호 회전" #: dlls/localspl/localspl.rc:151 msgid "PRC Envelope #9 Rotated" -msgstr "PRC 봉투 #9 회전" +msgstr "중국 봉투 9호 회전" #: dlls/localspl/localspl.rc:152 msgid "PRC Envelope #10 Rotated" -msgstr "PRC 봉투 #10 회전" +msgstr "중국 봉투 10호 회전" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -10505,22 +10505,16 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "(UTC+00:00) 더블린, 에든버러, 리스본, 런던" #: dlls/tzres/tzres.rc:342 -#, fuzzy -#| msgid "Sudan Standard Time" msgid "South Sudan Standard Time" -msgstr "수단 표준시" +msgstr "남수단 표준시" #: dlls/tzres/tzres.rc:343 -#, fuzzy -#| msgid "Sudan Daylight Time" msgid "South Sudan Daylight Time" -msgstr "수단 일광 절약시" +msgstr "남수단 일광 절약시" #: dlls/tzres/tzres.rc:344 -#, fuzzy -#| msgid "(UTC+02:00) Jerusalem" msgid "(UTC+02:00) Juba" -msgstr "(UTC+02:00) 예루살렘" +msgstr "(UTC+02:00) 주바" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" @@ -13332,7 +13326,6 @@ msgstr "" "ECHO OFF는 ECHO ON과 반대 효과가 있습니다(기본값은 ECHO OFF입니다).\n" "ECHO OFF 앞에 @ 기호룰 두어서 ECHO OFF 명령어 자체가 화면에\n" "표시되는 것을 막을 수 있습니다.\n" -"\n" #: programs/cmd/cmd.rc:78 msgid "ERASE <filename> deletes a file or set of files.\n" -- 2.34.1

1 0

[PATCH v2] ws2_32/tests: Increase tolerance in a timing test.
by Zebediah Figura 30 Dec '21

30 Dec '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: adjust the message too (thanks Gijs for catching this.) dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 95f858a86e3..8d4af019f16 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3235,7 +3235,7 @@ static void test_select(void) ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); ticks = GetTickCount() - ticks; ok(ret == 0, "select should not return any socket handles\n"); - ok(ticks < 10, "select was blocking for %u ms, expected < 10 ms\n", ticks); + ok(ticks < 100, "select was blocking for %u ms\n", ticks); ok(!FD_ISSET(fdRead, &readfds), "FD should not be set\n"); ok(!FD_ISSET(fdWrite, &writefds), "FD should not be set\n"); ok(!FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); -- 2.34.1

2 1

[PATCH 1/2] ws2_32/tests: Test that the socket returned from accept() inherits event selection parameters.
by Zebediah Figura 30 Dec '21

30 Dec '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/tests/sock.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 46f26d32e50..ec428acaf32 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5222,6 +5222,37 @@ static void test_accept_events(struct event_test_ctx *ctx) closesocket(client); closesocket(listener); + + /* The socket returned from accept() inherits the same parameters. */ + + listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(listener != -1, "failed to create socket, error %u\n", WSAGetLastError()); + ret = bind(listener, (const struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); + len = sizeof(destaddr); + ret = getsockname(listener, (struct sockaddr *)&destaddr, &len); + ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); + ret = listen(listener, 2); + ok(!ret, "failed to listen, error %u\n", WSAGetLastError()); + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + + select_events(ctx, listener, FD_CONNECT | FD_READ | FD_OOB | FD_ACCEPT | FD_WRITE); + check_events(ctx, FD_ACCEPT, 0, 200); + + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + ctx->socket = server; + check_events_todo(ctx, FD_WRITE, 0, 200); + check_events_todo_event(ctx, 0, 0, 0); + + closesocket(server); + closesocket(client); + + closesocket(listener); } static void test_connect_events(struct event_test_ctx *ctx) -- 2.34.1

2 2

[PATCH 1/4] ws2_32/tests: Test selecting the same socket twice.
by Zebediah Figura 29 Dec '21

29 Dec '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/tests/sock.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a678f619342..95f858a86e3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3325,6 +3325,16 @@ static void test_select(void) ok(ret == 1, "select returned %d\n", ret); ok(FD_ISSET(fdWrite, &writefds), "fdWrite socket is not in the set\n"); + /* select the same socket twice */ + writefds.fd_count = 2; + writefds.fd_array[0] = fdWrite; + writefds.fd_array[1] = fdWrite; + ret = select(0, NULL, &writefds, NULL, &select_timeout); + ok(ret == 1, "select returned %d\n", ret); + ok(writefds.fd_count == 1, "got count %u\n", writefds.fd_count); + ok(writefds.fd_array[0] == fdWrite, "got fd %#Ix\n", writefds.fd_array[0]); + ok(writefds.fd_array[1] == fdWrite, "got fd %#Ix\n", writefds.fd_array[1]); + /* tests for overlapping fd_set pointers */ FD_ZERO(&readfds); FD_SET(fdWrite, &readfds); -- 2.34.1

2 7

[PATCH] po: Update on Brazilian Portuguese
by Roberto Pungartnik 29 Dec '21

29 Dec '21

2 1

[PATCH] wininet: Do not call InternetUnlockRequestFile when locking failed.
by Robert Wilhelm 29 Dec '21

29 Dec '21

This should fix crashes on W10L vms, when we pass NULL to InternetUnlockRequestFile after prior lock already failed. Crashes are here: https://test.winehq.org/data/tests/wininet:http.html Behavior after crash is here: https://testbot.winehq.org/JobDetails.pl?Key=104580 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/wininet/tests/http.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index cf3f62f868a..ee56c64fbd9 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1718,10 +1718,13 @@ static void InternetLockRequestFile_test(void) ret = InternetLockRequestFile(req.request, &lock2); ok(ret, "InternetLockRequestFile returned: %x(%u)\n", ret, GetLastError()); + ok(lock2 != NULL, "lock2 == NULL\n"); ok(lock == lock2, "lock != lock2\n"); - ret = InternetUnlockRequestFile(lock2); - ok(ret, "InternetUnlockRequestFile failed: %u\n", GetLastError()); + if (lock2) { + ret = InternetUnlockRequestFile(lock2); + ok(ret, "InternetUnlockRequestFile failed: %u\n", GetLastError()); + } ret = DeleteFileA(file_name); ok(!ret && GetLastError() == ERROR_SHARING_VIOLATION, "Deleting file returned %x(%u)\n", ret, GetLastError()); @@ -1731,8 +1734,12 @@ static void InternetLockRequestFile_test(void) ret = DeleteFileA(file_name); ok(!ret && GetLastError() == ERROR_SHARING_VIOLATION, "Deleting file returned %x(%u)\n", ret, GetLastError()); - ret = InternetUnlockRequestFile(lock); - ok(ret, "InternetUnlockRequestFile failed: %u\n", GetLastError()); + ok(lock != NULL, "lock == 0\n"); + if (lock) + { + ret = InternetUnlockRequestFile(lock); + ok(ret, "InternetUnlockRequestFile failed: %u\n", GetLastError()); + } ret = DeleteFileA(file_name); ok(ret, "Deleting file returned %x(%u)\n", ret, GetLastError()); -- 2.31.1

3 2

[PATCH 01/10] loader: Use long instead of int for syscall return type in i386 code.
by Jinoh Kang 29 Dec '21

29 Dec '21

Although int = long effectively in i386, this makes it clear that a machine word-width value is being returned. Also, future patches adding syscalls returning pointers can use the same type (long) for return value consistently. While we're at it, slightly change SYSCALL_RET function macro to include the parameter only once. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- loader/preloader.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 585be50624f..cb20afd4d5a 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -236,7 +236,7 @@ __ASM_GLOBAL_FUNC(_start, /* wrappers for Linux system calls */ -#define SYSCALL_RET(ret) (((ret) < 0 && (ret) > -4096) ? -1 : (ret)) +#define SYSCALL_RET(ret) (((unsigned long)(ret) > -4096UL) ? -1 : (ret)) static inline __attribute__((noreturn)) void wld_exit( int code ) { @@ -247,7 +247,7 @@ static inline __attribute__((noreturn)) void wld_exit( int code ) static inline int wld_open( const char *name, int flags ) { - int ret; + long ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) : "0" (5 /* SYS_open */), "r" (name), "c" (flags) ); return SYSCALL_RET(ret); @@ -255,7 +255,7 @@ static inline int wld_open( const char *name, int flags ) static inline int wld_close( int fd ) { - int ret; + long ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) : "0" (6 /* SYS_close */), "r" (fd) ); return SYSCALL_RET(ret); @@ -263,7 +263,7 @@ static inline int wld_close( int fd ) static inline ssize_t wld_read( int fd, void *buffer, size_t len ) { - int ret; + long ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) : "0" (3 /* SYS_read */), "r" (fd), "c" (buffer), "d" (len) @@ -273,7 +273,7 @@ static inline ssize_t wld_read( int fd, void *buffer, size_t len ) static inline ssize_t wld_write( int fd, const void *buffer, size_t len ) { - int ret; + long ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) : "0" (4 /* SYS_write */), "r" (fd), "c" (buffer), "d" (len) ); return SYSCALL_RET(ret); @@ -281,7 +281,7 @@ static inline ssize_t wld_write( int fd, const void *buffer, size_t len ) static inline int wld_mprotect( const void *addr, size_t len, int prot ) { - int ret; + long ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) : "0" (125 /* SYS_mprotect */), "r" (addr), "c" (len), "d" (prot) ); return SYSCALL_RET(ret); @@ -328,7 +328,7 @@ __ASM_GLOBAL_FUNC(wld_mmap, static inline int wld_prctl( int code, long arg ) { - int ret; + long ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) : "0" (172 /* SYS_prctl */), "r" (code), "c" (arg) ); return SYSCALL_RET(ret); -- 2.31.1

3 11

[PATCH] MAINTAINERS: Updating my email address.
by Esme Povirk 29 Dec '21

29 Dec '21

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- MAINTAINERS | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index d1f92c3a50b..97f9c78ae21 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -53,7 +53,7 @@ P: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/comctl32/ Common Item Dialog -P: Esme Povirk <vincent(a)codeweavers.com> +P: Esme Povirk <esme(a)codeweavers.com> F: dlls/comdlg32/itemdlg.c F: dlls/comdlg32/tests/itemdlg.c @@ -118,7 +118,7 @@ M: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/dwrite/ DotNet Runtime -M: Esme Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <esme(a)codeweavers.com> F: dlls/mscoree/ GDI @@ -146,7 +146,7 @@ F: dlls/win32u/printdrv.c F: dlls/win32u/region.c GDIPlus -M: Esme Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <esme(a)codeweavers.com> F: dlls/gdiplus/ GPhoto Driver @@ -240,7 +240,7 @@ F: dlls/ole32/marshal.c F: dlls/ole32/usrmarshal.c OLE Storage -M: Esme Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <esme(a)codeweavers.com> F: dlls/ole32/filelockbytes.c F: dlls/ole32/memlockbytes.c F: dlls/ole32/stg_stream.c @@ -280,7 +280,7 @@ P: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/rpcrt4 TWAIN -P: Esme Povirk <vincent(a)codeweavers.com> +P: Esme Povirk <esme(a)codeweavers.com> F: dlls/twain_32/ F: dlls/sane.ds/ F: dlls/gphoto2.ds/ @@ -314,9 +314,10 @@ P: Zebediah Figura <z.figura12(a)gmail.com> F: tools/widl Windows Imaging Component -M: Esme Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <esme(a)codeweavers.com> F: dlls/windowscodecs/ F: dlls/windowscodecsext/ +F: dlls/wmphoto/ Windows Management Instrumentation M: Hans Leidekker <hans(a)codeweavers.com> @@ -376,7 +377,7 @@ P: Alex Henrie <alexhenrie24(a)gmail.com> P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> P: Jacek Caban <jacek(a)codeweavers.com> -P: Esme Povirk <vincent(a)codeweavers.com> +P: Esme Povirk <esme(a)codeweavers.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> F: * F: */ -- 2.30.2

1 0

[PATCH] ntdll/env: RtlCreateProcessParametersEx: Don't add unnecessary padding
by Keno Fischer 29 Dec '21

29 Dec '21

RtlCreateProcessParametersEx tries to align all strings to either 8 or 4 byte boundaries (it seems wine and various windows versions disagree about which). However, using the previous algorithm, we would adding padding bytes for the alignment of the Environment, even if no Environment was specified. Windows does not add these padding bytes and in fact we were testing that they are not present. Prior to this patch, I am seeing the following test failure locally: env.c:461: Test failed: wrong end ptr 00000000002427D6/00000000002427D8 This patch fixes the issue by not allocating the superfluous padding bytes, matching the Windows behavior and fixing the test. Signed-off-by: Keno Fischer <keno(a)juliacomputing.com> --- dlls/ntdll/env.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index bb8931a556b..454ca4c234d 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -499,6 +499,11 @@ PRTL_USER_PROCESS_PARAMETERS WINAPI RtlDeNormalizeProcessParams( RTL_USER_PROCES #define ROUND_SIZE(size) (((size) + sizeof(void *) - 1) & ~(sizeof(void *) - 1)) +static void *align_ptr(void *ptr) +{ + return (void*)(((UINT_PTR)ptr + sizeof(void *) - 1) & ~(sizeof(void *) - 1)); +} + /* append a unicode string to the process params data; helper for RtlCreateProcessParameters */ static void append_unicode_string( void **data, const UNICODE_STRING *src, UNICODE_STRING *dst ) @@ -507,13 +512,19 @@ static void append_unicode_string( void **data, const UNICODE_STRING *src, dst->MaximumLength = src->MaximumLength; if (dst->MaximumLength) { - dst->Buffer = *data; + dst->Buffer = align_ptr( *data ); memcpy( dst->Buffer, src->Buffer, dst->Length ); - *data = (char *)dst->Buffer + ROUND_SIZE( dst->MaximumLength ); + *data = (char *)dst->Buffer + dst->MaximumLength; } else dst->Buffer = NULL; } +static void add_rounded_size(SIZE_T *size, SIZE_T new_size) +{ + if (new_size) { + *size = ROUND_SIZE(*size) + new_size; + } +} /****************************************************************************** * RtlCreateProcessParametersEx [NTDLL.@] @@ -556,17 +567,20 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu if (!ShellInfo) ShellInfo = &empty_str; if (!RuntimeInfo) RuntimeInfo = &null_str; - if (Environment) env_size = get_env_length( Environment ) * sizeof(WCHAR); - - size = (sizeof(RTL_USER_PROCESS_PARAMETERS) - + ROUND_SIZE( ImagePathName->MaximumLength ) - + ROUND_SIZE( DllPath->MaximumLength ) - + ROUND_SIZE( curdir.MaximumLength ) - + ROUND_SIZE( CommandLine->MaximumLength ) - + ROUND_SIZE( WindowTitle->MaximumLength ) - + ROUND_SIZE( Desktop->MaximumLength ) - + ROUND_SIZE( ShellInfo->MaximumLength ) - + ROUND_SIZE( RuntimeInfo->MaximumLength )); + size = sizeof(RTL_USER_PROCESS_PARAMETERS); + add_rounded_size(&size, ImagePathName->MaximumLength); + add_rounded_size(&size, DllPath->MaximumLength); + add_rounded_size(&size, curdir.MaximumLength); + add_rounded_size(&size, CommandLine->MaximumLength); + add_rounded_size(&size, WindowTitle->MaximumLength); + add_rounded_size(&size, Desktop->MaximumLength); + add_rounded_size(&size, ShellInfo->MaximumLength); + add_rounded_size(&size, RuntimeInfo->MaximumLength); + + if (Environment) { + env_size = get_env_length( Environment ) * sizeof(WCHAR); + size = ROUND_SIZE(size); + } if ((ptr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, size + ROUND_SIZE( env_size ) ))) { @@ -587,7 +601,7 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu append_unicode_string( &ptr, Desktop, &params->Desktop ); append_unicode_string( &ptr, ShellInfo, &params->ShellInfo ); append_unicode_string( &ptr, RuntimeInfo, &params->RuntimeInfo ); - if (Environment) params->Environment = memcpy( ptr, Environment, env_size ); + if (Environment) params->Environment = memcpy( align_ptr(ptr), Environment, env_size ); *result = params; if (!(flags & PROCESS_PARAMS_FLAG_NORMALIZED)) RtlDeNormalizeProcessParams( params ); } -- 2.25.1

1 0

[PATCH] ws2_32: Correctly null-terminate the addrinfo chain.
by Zebediah Figura 29 Dec '21

29 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52288 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/unixlib.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index e89ebe35248..56a0bed308d 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -752,6 +752,7 @@ static NTSTATUS unix_getaddrinfo( void *args ) dst->ai_addrlen = sockaddr_from_unix( (const union unix_sockaddr *)src->ai_addr, NULL, 0 ); dst->ai_addr = next; sockaddr_from_unix( (const union unix_sockaddr *)src->ai_addr, dst->ai_addr, dst->ai_addrlen ); + dst->ai_next = NULL; next = (char *)dst->ai_addr + dst->ai_addrlen; if (dst == params->info || !addrinfo_in_list( params->info, dst )) @@ -763,8 +764,6 @@ static NTSTATUS unix_getaddrinfo( void *args ) } } - dst->ai_next = NULL; - freeaddrinfo( unix_info ); return 0; #else -- 2.34.1

1 0

[PATCH] ntdll: Always prefer native signal restorer over the custom one.
by Jinoh Kang 29 Dec '21

29 Dec '21

A few months after the custom signal restorer for Android was commited, bionic rolled its own signal restorer. The patch is at: https://android-review.googlesource.com/c/platform/bionic/+/107692 In general, rolling our own signal restorer is not a good idea since it interferes with unwinding. GDB seems especially unhappy when the signal restorer's name isn't exactly "__restore_rt". Fix this by using the custom signal restorer only if the vDSO has disappeared and libc doesn't supply its own signal restorer. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/unix/signal_i386.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 6bb5649e2b5..f98269535bb 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -50,6 +50,9 @@ #ifdef HAVE_SYS_UCONTEXT_H # include <sys/ucontext.h> #endif +#ifdef HAVE_SYS_AUXV_H +# include <sys/auxv.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -150,9 +153,9 @@ typedef struct ucontext #define FPUX_sig(context) (FPU_sig(context) && !((context)->uc_mcontext.fpregs->status >> 16) ? (XSAVE_FORMAT *)(FPU_sig(context) + 1) : NULL) #define XState_sig(fpu) (((unsigned int *)fpu->Reserved4)[12] == FP_XSTATE_MAGIC1 ? (XSTATE *)(fpu + 1) : NULL) -#ifdef __ANDROID__ -/* custom signal restorer since we may have unmapped the one in vdso, and bionic doesn't check for that */ -void rt_sigreturn(void); +#if defined(__linux__) && defined(SA_RESTORER) +/* backup signal restorer if we have unmapped the one in vDSO, and libc doesn't supply its own restorer */ +extern void rt_sigreturn(void) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( rt_sigreturn, "movl $173,%eax\n\t" /* NR_rt_sigreturn */ "int $0x80" ); @@ -2329,9 +2332,18 @@ void signal_init_process(void) sig_act.sa_mask = server_block_set; sig_act.sa_flags = SA_SIGINFO | SA_RESTART | SA_ONSTACK; -#ifdef __ANDROID__ - sig_act.sa_flags |= SA_RESTORER; - sig_act.sa_restorer = rt_sigreturn; +#if defined(__linux__) && defined(SA_RESTORER) + if (!getauxval(AT_SYSINFO_EHDR)) { + struct sigaction real_sig_act; + + sig_act.sa_sigaction = int_handler; + if (sigaction( SIGINT, &sig_act, NULL ) == -1) goto error; + if (sigaction( SIGINT, NULL, &real_sig_act ) == -1) goto error; + if (!(real_sig_act.sa_flags & SA_RESTORER)) { + sig_act.sa_flags |= SA_RESTORER; + sig_act.sa_restorer = rt_sigreturn; + } + } #endif sig_act.sa_sigaction = int_handler; if (sigaction( SIGINT, &sig_act, NULL ) == -1) goto error; -- 2.31.1

1 0

[PATCH] conhost: Fix status for READ_CONSOLE ioctl
by Keno Fischer 29 Dec '21

29 Dec '21

Without this patch conhost would attempt to process non-existent input, spewing stdout with various cursor moves and incorrectly returning the ReadConsole call early. Fix that by only attempting input processing if there are actually input records to be processed and properly returning STATUS_PENDING if the input processing is not yet complete. Signed-off-by: Keno Fischer <keno(a)juliacomputing.com> --- programs/conhost/conhost.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 78f6e345170..64a77e52b43 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1385,7 +1385,14 @@ static NTSTATUS read_console( struct console *console, unsigned int ioctl, size_ if (edit_line_grow( console, 1 )) console->edit_line.buf[0] = 0; console->pending_read = out_size; - return process_console_input( console ); + + /* If there are any pending input records, cook them now. */ + if (console->record_count) + { + process_console_input( console ); + } + + return console->edit_line.status; } /* add input events to a console input queue */ -- 2.25.1

2 2

[PATCH] po: Update Japanese translation.
by Akihiro Sagawa 29 Dec '21

29 Dec '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)

2 1

[PATCH] po: Update Catalan translation
by Alex Henrie 29 Dec '21

29 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- po/ca.po | 1258 ++++++++++++++++++++++++++---------------------------- 1 file changed, 594 insertions(+), 664 deletions(-) diff --git a/po/ca.po b/po/ca.po index 9de7d50aea9..a06513cae05 100644 --- a/po/ca.po +++ b/po/ca.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: 2020-12-13 20:27-0700\n" +"PO-Revision-Date: 2021-12-28 21:33-0700\n" "Last-Translator: Alex Henrie <alexhenrie24(a)gmail.com>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.4.1\n" +"X-Generator: Poedit 3.0\n" #: dlls/aclui/aclui.rc:29 dlls/inetcpl.cpl/inetcpl.rc:90 #: programs/winefile/winefile.rc:114 @@ -21,26 +21,20 @@ msgid "Security" msgstr "Seguretat" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "&Nom d'usuari:" +msgstr "Noms de &grups i d'usuaris:" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "Groga" +msgstr "Permet" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "Denega" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Permission denied" msgid "Permissions for %1" -msgstr "S'ha denegat el permís" +msgstr "Permisos per a %1" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" @@ -3731,30 +3725,24 @@ msgid "&Disable" msgstr "&Inhabilita" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy -#| msgid "Reset" msgid "&Reset" -msgstr "Reinicia" +msgstr "&Reinicia" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" msgstr "&Habilita" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "Edita reemplaçament" +msgstr "S&obrescriu" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" msgstr "Connectat" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "Dispositiu d'entrada de veu:" +msgstr "Connectat (dispositiu de xinput)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" @@ -4002,7 +3990,7 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "" +msgstr "No es pot definir la propietat '|': l'objecte no és extensible" #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" @@ -4013,10 +4001,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "No es pot modificar la propietat no escrivible '|'" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "'[objecte]' no és un objecte de data" +msgstr "'this' no és un objecte de Map" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" @@ -7014,10 +7000,8 @@ msgid "Resource is not currently available.\n" msgstr "El recurs actualment no està disponible.\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy -#| msgid "Class Name:" msgid "Classic Blue" -msgstr "Nom de classe:" +msgstr "Blau clásic" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73 @@ -7025,569 +7009,468 @@ msgid "Normal" msgstr "Normal" #: dlls/localspl/localspl.rc:37 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter" -msgstr "Lletra" +msgstr "Carta" #: dlls/localspl/localspl.rc:38 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Small" -msgstr "Lletra" +msgstr "Carta petita" #: dlls/localspl/localspl.rc:39 -#, fuzzy -#| msgid "&Table" msgid "Tabloid" -msgstr "&Taula" +msgstr "Tabloide" #: dlls/localspl/localspl.rc:40 msgid "Ledger" -msgstr "" +msgstr "Llibre major" #: dlls/localspl/localspl.rc:41 msgid "Legal" -msgstr "" +msgstr "Legal" #: dlls/localspl/localspl.rc:42 -#, fuzzy -#| msgid "State" msgid "Statement" -msgstr "Estat" +msgstr "Declaració" #: dlls/localspl/localspl.rc:43 -#, fuzzy -#| msgid "&Execute..." msgid "Executive" -msgstr "&Executa..." +msgstr "Executiu" #: dlls/localspl/localspl.rc:44 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A3" -msgstr "T" +msgstr "A3" #: dlls/localspl/localspl.rc:45 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A4" -msgstr "T" +msgstr "A4" #: dlls/localspl/localspl.rc:46 -#, fuzzy -#| msgid "Small" msgid "A4 Small" -msgstr "Petita" +msgstr "A4 petit" #: dlls/localspl/localspl.rc:47 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A5" -msgstr "T" +msgstr "A5" #: dlls/localspl/localspl.rc:48 msgid "B4 (JIS)" -msgstr "" +msgstr "B4 (JIS)" #: dlls/localspl/localspl.rc:49 msgid "B5 (JIS)" -msgstr "" +msgstr "B5 (JIS)" #: dlls/localspl/localspl.rc:50 msgid "Folio" -msgstr "" +msgstr "Infoli" #: dlls/localspl/localspl.rc:51 msgid "Quarto" -msgstr "" +msgstr "Quart" #: dlls/localspl/localspl.rc:52 msgid "10x14" -msgstr "" +msgstr "10x14" #: dlls/localspl/localspl.rc:53 msgid "11x17" -msgstr "" +msgstr "11x17" #: dlls/localspl/localspl.rc:54 -#, fuzzy -#| msgid "Notepad" msgid "Note" -msgstr "Llibreta" +msgstr "Nota" #: dlls/localspl/localspl.rc:55 msgid "Envelope #9" -msgstr "" +msgstr "Sobre #9" #: dlls/localspl/localspl.rc:56 msgid "Envelope #10" -msgstr "" +msgstr "Sobre #10" #: dlls/localspl/localspl.rc:57 msgid "Envelope #11" -msgstr "" +msgstr "Sobre #11" #: dlls/localspl/localspl.rc:58 msgid "Envelope #12" -msgstr "" +msgstr "Sobre #12" #: dlls/localspl/localspl.rc:59 msgid "Envelope #14" -msgstr "" +msgstr "Sobre #14" #: dlls/localspl/localspl.rc:60 msgid "C size sheet" -msgstr "" +msgstr "Full de mida C" #: dlls/localspl/localspl.rc:61 msgid "D size sheet" -msgstr "" +msgstr "Full de mida D" #: dlls/localspl/localspl.rc:62 msgid "E size sheet" -msgstr "" +msgstr "Full de mida E" #: dlls/localspl/localspl.rc:63 msgid "Envelope DL" -msgstr "" +msgstr "Sobre DL" #: dlls/localspl/localspl.rc:64 msgid "Envelope C5" -msgstr "" +msgstr "Sobre C5" #: dlls/localspl/localspl.rc:65 msgid "Envelope C3" -msgstr "" +msgstr "Sobre C3" #: dlls/localspl/localspl.rc:66 msgid "Envelope C4" -msgstr "" +msgstr "Sobre C4" #: dlls/localspl/localspl.rc:67 msgid "Envelope C6" -msgstr "" +msgstr "Sobre C6" #: dlls/localspl/localspl.rc:68 msgid "Envelope C65" -msgstr "" +msgstr "Sobre C65" #: dlls/localspl/localspl.rc:69 msgid "Envelope B4" -msgstr "" +msgstr "Sobre B4" #: dlls/localspl/localspl.rc:70 msgid "Envelope B5" -msgstr "" +msgstr "Sobre B5" #: dlls/localspl/localspl.rc:71 msgid "Envelope B6" -msgstr "" +msgstr "Sobre B6" #: dlls/localspl/localspl.rc:72 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "Envelope" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre" #: dlls/localspl/localspl.rc:73 msgid "Envelope Monarch" -msgstr "" +msgstr "Sobre de monarca" #: dlls/localspl/localspl.rc:74 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "6 3/4 Envelope" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre 6 3/4" #: dlls/localspl/localspl.rc:75 msgid "US Std Fanfold" -msgstr "" +msgstr "Paper continu estatunidenc estàndard" #: dlls/localspl/localspl.rc:76 msgid "German Std Fanfold" -msgstr "" +msgstr "Paper continu alemany estàndard" #: dlls/localspl/localspl.rc:77 msgid "German Legal Fanfold" -msgstr "" +msgstr "Paper continu alemany legal" #: dlls/localspl/localspl.rc:78 msgid "B4 (ISO)" -msgstr "" +msgstr "B4 (ISO)" #: dlls/localspl/localspl.rc:79 -#, fuzzy -#| msgid "Japanese" msgid "Japanese Postcard" -msgstr "Japonès" +msgstr "Postal japonès" #: dlls/localspl/localspl.rc:80 msgid "9x11" -msgstr "" +msgstr "9x11" #: dlls/localspl/localspl.rc:81 msgid "10x11" -msgstr "" +msgstr "10x11" #: dlls/localspl/localspl.rc:82 msgid "15x11" -msgstr "" +msgstr "15x11" #: dlls/localspl/localspl.rc:83 msgid "Envelope Invite" -msgstr "" +msgstr "Sobre d'invitació" #: dlls/localspl/localspl.rc:84 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Extra" -msgstr "Lletra" +msgstr "Carta extra" #: dlls/localspl/localspl.rc:85 msgid "Legal Extra" -msgstr "" +msgstr "Legal extra" #: dlls/localspl/localspl.rc:86 msgid "Tabloid Extra" -msgstr "" +msgstr "Tabloide extra" #: dlls/localspl/localspl.rc:87 -#, fuzzy -#| msgid "E&xtras" msgid "A4 Extra" -msgstr "E&xtres" +msgstr "A4 extra" #: dlls/localspl/localspl.rc:88 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "Letter Transverse" -msgstr "travessat" +msgstr "Carta transversa" #: dlls/localspl/localspl.rc:89 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A4 Transverse" -msgstr "travessat" +msgstr "A4 transvers" #: dlls/localspl/localspl.rc:90 msgid "Letter Extra Transverse" -msgstr "" +msgstr "Carta extra transversa" #: dlls/localspl/localspl.rc:91 msgid "Super A" -msgstr "" +msgstr "A súper" #: dlls/localspl/localspl.rc:92 msgid "Super B" -msgstr "" +msgstr "B súper" #: dlls/localspl/localspl.rc:93 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Plus" -msgstr "Lletra" +msgstr "Carta plus" #: dlls/localspl/localspl.rc:94 msgid "A4 Plus" -msgstr "" +msgstr "A4 plus" #: dlls/localspl/localspl.rc:95 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A5 Transverse" -msgstr "travessat" +msgstr "A5 transvers" #: dlls/localspl/localspl.rc:96 msgid "B5 (JIS) Transverse" -msgstr "" +msgstr "B5 (JIS) transvers" #: dlls/localspl/localspl.rc:97 -#, fuzzy -#| msgid "E&xtras" msgid "A3 Extra" -msgstr "E&xtres" +msgstr "A3 extra" #: dlls/localspl/localspl.rc:98 -#, fuzzy -#| msgid "E&xtras" msgid "A5 Extra" -msgstr "E&xtres" +msgstr "A5 extra" #: dlls/localspl/localspl.rc:99 msgid "B5 (ISO) Extra" -msgstr "" +msgstr "B5 (ISO) extra" #: dlls/localspl/localspl.rc:100 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A2" -msgstr "T" +msgstr "A2" #: dlls/localspl/localspl.rc:101 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A3 Transverse" -msgstr "travessat" +msgstr "A3 transvers" #: dlls/localspl/localspl.rc:102 msgid "A3 Extra Transverse" -msgstr "" +msgstr "A3 extra transvers" #: dlls/localspl/localspl.rc:103 msgid "Japanese Double Postcard" -msgstr "" +msgstr "Postal doble japonès" #: dlls/localspl/localspl.rc:104 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A6" -msgstr "T" +msgstr "A6" #: dlls/localspl/localspl.rc:105 msgid "Japanese Envelope Kaku #2" -msgstr "" +msgstr "Sobre japonès Kaku #2" #: dlls/localspl/localspl.rc:106 msgid "Japanese Envelope Kaku #3" -msgstr "" +msgstr "Sobre japonès Kaku #3" #: dlls/localspl/localspl.rc:107 msgid "Japanese Envelope Chou #3" -msgstr "" +msgstr "Sobre japonès Chou #3" #: dlls/localspl/localspl.rc:108 msgid "Japanese Envelope Chou #4" -msgstr "" +msgstr "Sobre japonès Chou #4" #: dlls/localspl/localspl.rc:109 msgid "Letter Rotated" -msgstr "" +msgstr "Carta girada" #: dlls/localspl/localspl.rc:110 msgid "A3 Rotated" -msgstr "" +msgstr "A3 girat" #: dlls/localspl/localspl.rc:111 msgid "A4 Rotated" -msgstr "" +msgstr "A4 girat" #: dlls/localspl/localspl.rc:112 msgid "A5 Rotated" -msgstr "" +msgstr "A5 girat" #: dlls/localspl/localspl.rc:113 msgid "B4 (JIS) Rotated" -msgstr "" +msgstr "B4 (JIS) girat" #: dlls/localspl/localspl.rc:114 msgid "B5 (JIS) Rotated" -msgstr "" +msgstr "B5 (JIS) girat" #: dlls/localspl/localspl.rc:115 msgid "Japanese Postcard Rotated" -msgstr "" +msgstr "Postal japonès girat" #: dlls/localspl/localspl.rc:116 msgid "Double Japan Postcard Rotated" -msgstr "" +msgstr "Postal japonès doble girat" #: dlls/localspl/localspl.rc:117 msgid "A6 Rotated" -msgstr "" +msgstr "A6 girat" #: dlls/localspl/localspl.rc:118 msgid "Japan Envelope Kaku #2 Rotated" -msgstr "" +msgstr "Sobre japonès Kaku #2 girat" #: dlls/localspl/localspl.rc:119 msgid "Japan Envelope Kaku #3 Rotated" -msgstr "" +msgstr "Sobre japonès Kaku #3 girat" #: dlls/localspl/localspl.rc:120 msgid "Japan Envelope Chou #3 Rotated" -msgstr "" +msgstr "Sobre japonès Chou #3 girat" #: dlls/localspl/localspl.rc:121 msgid "Japan Envelope Chou #4 Rotated" -msgstr "" +msgstr "Sobre japonès Chou #4 girat" #: dlls/localspl/localspl.rc:122 msgid "B6 (JIS)" -msgstr "" +msgstr "B6 (JIS)" #: dlls/localspl/localspl.rc:123 msgid "B6 (JIS) Rotated" -msgstr "" +msgstr "B6 (JIS) girat" #: dlls/localspl/localspl.rc:124 msgid "12x11" -msgstr "" +msgstr "12x11" #: dlls/localspl/localspl.rc:125 msgid "Japan Envelope You #4" -msgstr "" +msgstr "Sobre japonès You #4" #: dlls/localspl/localspl.rc:126 msgid "Japan Envelope You #4 Rotated" -msgstr "" +msgstr "Sobre japonès You #4 girat" #: dlls/localspl/localspl.rc:127 msgid "PRC 16K" -msgstr "" +msgstr "Xinès 16K" #: dlls/localspl/localspl.rc:128 msgid "PRC 32K" -msgstr "" +msgstr "Xinès 32K" #: dlls/localspl/localspl.rc:129 msgid "PRC 32K(Big)" -msgstr "" +msgstr "Xinès 32K(Gran)" #: dlls/localspl/localspl.rc:130 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #1" #: dlls/localspl/localspl.rc:131 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #2" #: dlls/localspl/localspl.rc:132 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #3" #: dlls/localspl/localspl.rc:133 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #4" #: dlls/localspl/localspl.rc:134 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #5" #: dlls/localspl/localspl.rc:135 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #6" #: dlls/localspl/localspl.rc:136 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #7" #: dlls/localspl/localspl.rc:137 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #8" #: dlls/localspl/localspl.rc:138 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #9" #: dlls/localspl/localspl.rc:139 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #10" #: dlls/localspl/localspl.rc:140 msgid "PRC 16K Rotated" -msgstr "" +msgstr "Xinès 16K girat" #: dlls/localspl/localspl.rc:141 msgid "PRC 32K Rotated" -msgstr "" +msgstr "Xinès 32K girat" #: dlls/localspl/localspl.rc:142 msgid "PRC 32K(Big) Rotated" -msgstr "" +msgstr "Xinès 32K(Gran) girat" #: dlls/localspl/localspl.rc:143 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1 Rotated" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #1 girat" #: dlls/localspl/localspl.rc:144 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2 Rotated" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #2 girat" #: dlls/localspl/localspl.rc:145 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3 Rotated" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #3 girat" #: dlls/localspl/localspl.rc:146 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4 Rotated" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #4 girat" #: dlls/localspl/localspl.rc:147 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5 Rotated" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #5 girat" #: dlls/localspl/localspl.rc:148 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6 Rotated" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #6 girat" #: dlls/localspl/localspl.rc:149 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7 Rotated" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #7 girat" #: dlls/localspl/localspl.rc:150 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8 Rotated" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #8 girat" #: dlls/localspl/localspl.rc:151 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9 Rotated" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #9 girat" #: dlls/localspl/localspl.rc:152 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10 Rotated" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #10 girat" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -7858,7 +7741,7 @@ msgstr "No es pot analitzar el flux de bytes.\n" #: dlls/mferror/mferror.mc:417 msgid "Mutually exclusive flags passed to source resolver.\n" -msgstr "S'han passat opcions mutualment exclusives al resolutor de fons.\n" +msgstr "S'han passat opcions mutualment exclusives al resolutor font.\n" #: dlls/mferror/mferror.mc:424 msgid "Unknown bytestream length.\n" @@ -7874,7 +7757,7 @@ msgstr "Cap esdeveniment està disponible.\n" #: dlls/mferror/mferror.mc:445 msgid "Invalid media source state transition.\n" -msgstr "La transició d'estat de fons de mitjans no és vàlida.\n" +msgstr "La transició d'estat de font de mitjans no és vàlida.\n" #: dlls/mferror/mferror.mc:452 msgid "End of media stream has been reached.\n" @@ -10473,7 +10356,7 @@ msgstr "Hora d'estiu de la Xina" #: dlls/tzres/tzres.rc:128 msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" -msgstr "" +msgstr "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" #: dlls/tzres/tzres.rc:267 msgid "North Asia Standard Time" @@ -10485,7 +10368,7 @@ msgstr "Hora d'estiu de l'Àsia del Nord" #: dlls/tzres/tzres.rc:269 msgid "(UTC+07:00) Krasnoyarsk" -msgstr "" +msgstr "(UTC+07:00) Krasnoiarsk" #: dlls/tzres/tzres.rc:168 msgid "Georgian Standard Time" @@ -10497,17 +10380,15 @@ msgstr "Hora d'estiu de Geòrgia" #: dlls/tzres/tzres.rc:170 msgid "(UTC+04:00) Tbilisi" -msgstr "" +msgstr "(UTC+04:00) Tbilissi" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 msgid "UTC+12" -msgstr "" +msgstr "UTC+12" #: dlls/tzres/tzres.rc:395 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC+12:00) Coordinated Universal Time+12" -msgstr "Temps universal coordinat" +msgstr "(UTC+12:00) Temps universal coordinat+12" #: dlls/tzres/tzres.rc:252 msgid "Nepal Standard Time" @@ -10519,7 +10400,7 @@ msgstr "Hora d'estiu del Nepal" #: dlls/tzres/tzres.rc:254 msgid "(UTC+05:45) Kathmandu" -msgstr "" +msgstr "(UTC+05:45) Katmandú" #: dlls/tzres/tzres.rc:90 msgid "Cape Verde Standard Time" @@ -10531,7 +10412,7 @@ msgstr "Hora d'estiu de Cap Verd" #: dlls/tzres/tzres.rc:92 msgid "(UTC-01:00) Cabo Verde Is." -msgstr "" +msgstr "(UTC-01:00) Illes del Cap Verd" #: dlls/tzres/tzres.rc:183 msgid "Haiti Standard Time" @@ -10543,19 +10424,19 @@ msgstr "Hora d'estiu de Haití" #: dlls/tzres/tzres.rc:185 msgid "(UTC-05:00) Haiti" -msgstr "" +msgstr "(UTC-05:00) Haití" #: dlls/tzres/tzres.rc:111 msgid "Central European Standard Time" -msgstr "Hora estàndard de l'Europa Central" +msgstr "Hora estàndard de l'Europa central" #: dlls/tzres/tzres.rc:112 msgid "Central European Daylight Time" -msgstr "Hora d'estiu de l'Europa Central" +msgstr "Hora d'estiu de l'Europa central" #: dlls/tzres/tzres.rc:113 msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" -msgstr "" +msgstr "(UTC+01:00) Sarajevo, Skopje, Varsòvia, Zagreb" #: dlls/tzres/tzres.rc:234 msgid "Morocco Standard Time" @@ -10567,45 +10448,39 @@ msgstr "Hora d'estiu del Marroc" #: dlls/tzres/tzres.rc:236 msgid "(UTC+01:00) Casablanca" -msgstr "" +msgstr "(UTC+01:00) Casablanca" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 msgid "UTC-08" -msgstr "" +msgstr "UTC-08" #: dlls/tzres/tzres.rc:404 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-08:00) Coordinated Universal Time-08" -msgstr "Temps universal coordinat" +msgstr "(UTC-08:00) Temps universal coordinat-08" #: dlls/tzres/tzres.rc:39 -#, fuzzy -#| msgid "Atlantic Standard Time" msgid "Altai Standard Time" -msgstr "Hora estàndard de l'Atlàntic" +msgstr "Hora estàndard de l'Altai" #: dlls/tzres/tzres.rc:40 -#, fuzzy -#| msgid "Atlantic Daylight Time" msgid "Altai Daylight Time" -msgstr "Hora d'estiu de l'Atlàntic" +msgstr "Hora d'estiu de l'Altai" #: dlls/tzres/tzres.rc:41 msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" -msgstr "" +msgstr "(UTC+07:00) Barnaül, Gorno-Altaisk" #: dlls/tzres/tzres.rc:108 msgid "Central Europe Standard Time" -msgstr "Hora estàndard de l'Europa Central" +msgstr "Hora estàndard de l'Europa central" #: dlls/tzres/tzres.rc:109 msgid "Central Europe Daylight Time" -msgstr "Hora d'estiu de l'Europa Central" +msgstr "Hora d'estiu de l'Europa central" #: dlls/tzres/tzres.rc:110 msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" -msgstr "" +msgstr "(UTC+01:00) Belgrad, Bratislava, Budapest, Ljubljana, Praga" #: dlls/tzres/tzres.rc:192 msgid "Iran Standard Time" @@ -10617,7 +10492,7 @@ msgstr "Hora d'estiu d'Iran" #: dlls/tzres/tzres.rc:194 msgid "(UTC+03:30) Tehran" -msgstr "" +msgstr "(UTC+03:30) Teheran" #: dlls/tzres/tzres.rc:318 msgid "Saint Pierre Standard Time" @@ -10628,26 +10503,20 @@ msgid "Saint Pierre Daylight Time" msgstr "Hora d'estiu de Sant Pere" #: dlls/tzres/tzres.rc:320 -#, fuzzy -#| msgid "Saint Pierre Standard Time" msgid "(UTC-03:00) Saint Pierre and Miquelon" -msgstr "Hora estàndard de Sant Pere" +msgstr "(UTC-03:00) Sant Pere i Miquelon" #: dlls/tzres/tzres.rc:327 -#, fuzzy -#| msgid "Samoa Standard Time" msgid "Sao Tome Standard Time" -msgstr "Hora estàndard de Samoa" +msgstr "Hora estàndard de São Tomé" #: dlls/tzres/tzres.rc:328 -#, fuzzy -#| msgid "Samoa Daylight Time" msgid "Sao Tome Daylight Time" -msgstr "Hora d'estiu de Samoa" +msgstr "Hora d'estiu de São Tomé" #: dlls/tzres/tzres.rc:329 msgid "(UTC+00:00) Sao Tome" -msgstr "" +msgstr "(UTC+00:00) São Tomé" #: dlls/tzres/tzres.rc:249 msgid "Namibia Standard Time" @@ -10659,7 +10528,7 @@ msgstr "Hora d'estiu de Namíbia" #: dlls/tzres/tzres.rc:251 msgid "(UTC+02:00) Windhoek" -msgstr "" +msgstr "(UTC+02:00) Windhoek" #: dlls/tzres/tzres.rc:369 msgid "Tonga Standard Time" @@ -10671,7 +10540,7 @@ msgstr "Hora d'estiu de Tonga" #: dlls/tzres/tzres.rc:371 msgid "(UTC+13:00) Nuku'alofa" -msgstr "" +msgstr "(UTC+13:00) Nuku'alofa" #: dlls/tzres/tzres.rc:240 msgid "Mountain Standard Time (Mexico)" @@ -10683,7 +10552,7 @@ msgstr "Hora d'estiu de les muntanyes (Mèxic)" #: dlls/tzres/tzres.rc:242 msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" -msgstr "" +msgstr "(UTC-07:00) Chihuahua, La Paz, Mazatlán" #: dlls/tzres/tzres.rc:171 msgid "GMT Standard Time" @@ -10695,35 +10564,31 @@ msgstr "Hora d'estiu GMT" #: dlls/tzres/tzres.rc:173 msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" -msgstr "" +msgstr "(UTC+00:00) Dublín, Edimburg, Lisboa, Londres" #: dlls/tzres/tzres.rc:342 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "South Sudan Standard Time" -msgstr "Hora estàndard de Jordània" +msgstr "Hora estàndard de Sudan del Sud" #: dlls/tzres/tzres.rc:343 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "South Sudan Daylight Time" -msgstr "Hora d'estiu de Jordània" +msgstr "Hora d'estiu de Sudan del Sud" #: dlls/tzres/tzres.rc:344 msgid "(UTC+02:00) Juba" -msgstr "" +msgstr "(UTC+02:00) Juba" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" -msgstr "Hora estàndard de l'Àsia Central" +msgstr "Hora estàndard de l'Àsia central" #: dlls/tzres/tzres.rc:103 msgid "Central Asia Daylight Time" -msgstr "Hora d'estiu de l'Àsia Central" +msgstr "Hora d'estiu de l'Àsia central" #: dlls/tzres/tzres.rc:104 msgid "(UTC+06:00) Astana" -msgstr "" +msgstr "(UTC+06:00) Astanà" #: dlls/tzres/tzres.rc:213 msgid "Lord Howe Standard Time" @@ -10735,7 +10600,7 @@ msgstr "Hora d'estiu de Lord Howe" #: dlls/tzres/tzres.rc:215 msgid "(UTC+10:30) Lord Howe Island" -msgstr "" +msgstr "(UTC+10:30) Illa de Lord Howe" #: dlls/tzres/tzres.rc:48 msgid "Arabic Standard Time" @@ -10747,17 +10612,15 @@ msgstr "Hora d'estiu àrab" #: dlls/tzres/tzres.rc:50 msgid "(UTC+03:00) Baghdad" -msgstr "" +msgstr "(UTC+03:00) Bagdad" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 msgid "UTC+13" -msgstr "" +msgstr "UTC+13" #: dlls/tzres/tzres.rc:398 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC+13:00) Coordinated Universal Time+13" -msgstr "Temps universal coordinat" +msgstr "(UTC+13:00) Temps universal coordinat+13" #: dlls/tzres/tzres.rc:216 msgid "Magadan Standard Time" @@ -10769,7 +10632,7 @@ msgstr "Hora d'estiu de Magadan" #: dlls/tzres/tzres.rc:218 msgid "(UTC+11:00) Magadan" -msgstr "" +msgstr "(UTC+11:00) Magadan" #: dlls/tzres/tzres.rc:258 msgid "Newfoundland Standard Time" @@ -10781,35 +10644,31 @@ msgstr "Hora d'estiu de Terranova" #: dlls/tzres/tzres.rc:260 msgid "(UTC-03:30) Newfoundland" -msgstr "" +msgstr "(UTC-03:30) Terranova" #: dlls/tzres/tzres.rc:348 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "Sudan Standard Time" -msgstr "Hora estàndard de Jordània" +msgstr "Hora estàndard de Sudan" #: dlls/tzres/tzres.rc:349 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "Sudan Daylight Time" -msgstr "Hora d'estiu de Jordània" +msgstr "Hora d'estiu de Sudan" #: dlls/tzres/tzres.rc:350 msgid "(UTC+02:00) Khartoum" -msgstr "" +msgstr "(UTC+02:00) Khartum" #: dlls/tzres/tzres.rc:438 msgid "West Pacific Standard Time" -msgstr "Hora estàndard del Pacífic Occidental" +msgstr "Hora estàndard del Pacífic occidental" #: dlls/tzres/tzres.rc:439 msgid "West Pacific Daylight Time" -msgstr "Hora d'estiu del Pacífic Occidental" +msgstr "Hora d'estiu del Pacífic occidental" #: dlls/tzres/tzres.rc:440 msgid "(UTC+10:00) Guam, Port Moresby" -msgstr "" +msgstr "(UTC+10:00) Guam, Port Moresby" #: dlls/tzres/tzres.rc:279 msgid "Pacific Standard Time" @@ -10821,7 +10680,7 @@ msgstr "Hora d'estiu del Pacífic" #: dlls/tzres/tzres.rc:281 msgid "(UTC-08:00) Pacific Time (US & Canada)" -msgstr "" +msgstr "(UTC-08:00) Hora del Pacífic (EU i Canadà)" #: dlls/tzres/tzres.rc:69 msgid "Azerbaijan Standard Time" @@ -10833,7 +10692,7 @@ msgstr "Hora d'estiu de l'Azerbaidjan" #: dlls/tzres/tzres.rc:71 msgid "(UTC+04:00) Baku" -msgstr "" +msgstr "(UTC+04:00) Bakú" #: dlls/tzres/tzres.rc:219 msgid "Magallanes Standard Time" @@ -10845,7 +10704,7 @@ msgstr "Hora d'estiu de Magallanes" #: dlls/tzres/tzres.rc:221 msgid "(UTC-03:00) Punta Arenas" -msgstr "" +msgstr "(UTC-03:00) Punta Arenas" #: dlls/tzres/tzres.rc:324 msgid "Samoa Standard Time" @@ -10857,7 +10716,7 @@ msgstr "Hora d'estiu de Samoa" #: dlls/tzres/tzres.rc:326 msgid "(UTC+13:00) Samoa" -msgstr "" +msgstr "(UTC+13:00) Samoa" #: dlls/tzres/tzres.rc:201 msgid "Kaliningrad Standard Time" @@ -10869,7 +10728,7 @@ msgstr "Hora d'estiu de Kaliningrad" #: dlls/tzres/tzres.rc:203 msgid "(UTC+02:00) Kaliningrad" -msgstr "" +msgstr "(UTC+02:00) Kaliningrad" #: dlls/tzres/tzres.rc:282 msgid "Pacific Standard Time (Mexico)" @@ -10881,7 +10740,7 @@ msgstr "Hora d'estiu del Pacífic (Mèxic)" #: dlls/tzres/tzres.rc:284 msgid "(UTC-08:00) Baja California" -msgstr "" +msgstr "(UTC-08:00) Baixa Califòrnia" #: dlls/tzres/tzres.rc:228 msgid "Middle East Standard Time" @@ -10893,7 +10752,7 @@ msgstr "Hora d'estiu de l'Orient Mitjà" #: dlls/tzres/tzres.rc:230 msgid "(UTC+02:00) Beirut" -msgstr "" +msgstr "(UTC+02:00) Beirut" #: dlls/tzres/tzres.rc:363 msgid "Tokyo Standard Time" @@ -10905,7 +10764,7 @@ msgstr "Hora d'estiu de Tokyo" #: dlls/tzres/tzres.rc:365 msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" -msgstr "" +msgstr "(UTC+09:00) Osaka, Sapporo, Tòquio" #: dlls/tzres/tzres.rc:210 msgid "Line Islands Standard Time" @@ -10917,7 +10776,7 @@ msgstr "Hora d'estiu de les Illes de la Línia" #: dlls/tzres/tzres.rc:212 msgid "(UTC+14:00) Kiritimati Island" -msgstr "" +msgstr "(UTC+14:00) Illa de Kiritimati" #: dlls/tzres/tzres.rc:129 msgid "Cuba Standard Time" @@ -10929,7 +10788,7 @@ msgstr "Hora d'estiu de Cuba" #: dlls/tzres/tzres.rc:131 msgid "(UTC-05:00) Havana" -msgstr "" +msgstr "(UTC-05:00) L'Havana" #: dlls/tzres/tzres.rc:198 msgid "Jordan Standard Time" @@ -10941,7 +10800,7 @@ msgstr "Hora d'estiu de Jordània" #: dlls/tzres/tzres.rc:200 msgid "(UTC+02:00) Amman" -msgstr "" +msgstr "(UTC+02:00) Amman" #: dlls/tzres/tzres.rc:117 msgid "Central Standard Time" @@ -10953,31 +10812,27 @@ msgstr "Hora d'estiu central" #: dlls/tzres/tzres.rc:119 msgid "(UTC-06:00) Central Time (US & Canada)" -msgstr "" +msgstr "(UTC-06:00) Hora central (EU i Canadà)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 msgid "Russia Time Zone 3" -msgstr "" +msgstr "Zona horària russa 3" #: dlls/tzres/tzres.rc:305 msgid "(UTC+04:00) Izhevsk, Samara" -msgstr "" +msgstr "(UTC+04:00) Ijevsk, Samara" #: dlls/tzres/tzres.rc:417 -#, fuzzy -#| msgid "Tonga Standard Time" msgid "Volgograd Standard Time" -msgstr "Hora estàndard de Tonga" +msgstr "Hora estàndard de Volgograd" #: dlls/tzres/tzres.rc:418 -#, fuzzy -#| msgid "Tonga Daylight Time" msgid "Volgograd Daylight Time" -msgstr "Hora d'estiu de Tonga" +msgstr "Hora d'estiu de Volgograd" #: dlls/tzres/tzres.rc:419 msgid "(UTC+04:00) Volgograd" -msgstr "" +msgstr "(UTC+04:00) Volgograd" #: dlls/tzres/tzres.rc:72 msgid "Azores Standard Time" @@ -10989,29 +10844,27 @@ msgstr "Hora d'estiu de les Açores" #: dlls/tzres/tzres.rc:74 msgid "(UTC-01:00) Azores" -msgstr "" +msgstr "(UTC-01:00) Açores" #: dlls/tzres/tzres.rc:264 msgid "North Asia East Standard Time" -msgstr "Hora estàndard de l'Àsia del Norest" +msgstr "Hora estàndard d'Àsia del nord" #: dlls/tzres/tzres.rc:265 msgid "North Asia East Daylight Time" -msgstr "Hora d'estiu de l'Àsia del Norest" +msgstr "Hora d'estiu d'Àsia del norest" #: dlls/tzres/tzres.rc:266 msgid "(UTC+08:00) Irkutsk" -msgstr "" +msgstr "(UTC+08:00) Irkutsk" #: dlls/tzres/tzres.rc:408 dlls/tzres/tzres.rc:409 msgid "UTC-11" -msgstr "" +msgstr "UTC-11" #: dlls/tzres/tzres.rc:410 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-11:00) Coordinated Universal Time-11" -msgstr "Temps universal coordinat" +msgstr "(UTC-11:00) Temps universal coordinat-11" #: dlls/tzres/tzres.rc:51 msgid "Argentina Standard Time" @@ -11023,23 +10876,19 @@ msgstr "Hora d'estiu de l'Argentina" #: dlls/tzres/tzres.rc:53 msgid "(UTC-03:00) City of Buenos Aires" -msgstr "" +msgstr "(UTC-03:00) Ciutat de Buenos Aires" #: dlls/tzres/tzres.rc:378 -#, fuzzy -#| msgid "Turkey Standard Time" msgid "Turks And Caicos Standard Time" -msgstr "Hora estàndard de Turquia" +msgstr "Hora estàndard de Turks i Caicos" #: dlls/tzres/tzres.rc:379 -#, fuzzy -#| msgid "Turkey Daylight Time" msgid "Turks And Caicos Daylight Time" -msgstr "Hora d'estiu de Turquia" +msgstr "Hora d'estiu de Turks i Caicos" #: dlls/tzres/tzres.rc:380 msgid "(UTC-05:00) Turks and Caicos" -msgstr "" +msgstr "(UTC-05:00) Turks i Caicos" #: dlls/tzres/tzres.rc:222 msgid "Marquesas Standard Time" @@ -11051,7 +10900,7 @@ msgstr "Hora d'estiu de Marqueses" #: dlls/tzres/tzres.rc:224 msgid "(UTC-09:30) Marquesas Islands" -msgstr "" +msgstr "(UTC-09:30) Illes Marqueses" #: dlls/tzres/tzres.rc:243 msgid "Myanmar Standard Time" @@ -11063,17 +10912,15 @@ msgstr "Hora d'estiu de Birmània" #: dlls/tzres/tzres.rc:245 msgid "(UTC+06:30) Yangon (Rangoon)" -msgstr "" +msgstr "(UTC+06:30) Yangon (Rangoon)" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 msgid "Coordinated Universal Time" msgstr "Temps universal coordinat" #: dlls/tzres/tzres.rc:392 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC) Coordinated Universal Time" -msgstr "Temps universal coordinat" +msgstr "(UTC) Temps universal coordinat" #: dlls/tzres/tzres.rc:189 msgid "India Standard Time" @@ -11085,7 +10932,7 @@ msgstr "Hora d'estiu de l'Índia" #: dlls/tzres/tzres.rc:191 msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" -msgstr "" +msgstr "(UTC+05:30) Chennai, Kolkata, Mumbai, Nova Delhi" #: dlls/tzres/tzres.rc:180 msgid "GTB Standard Time" @@ -11097,7 +10944,7 @@ msgstr "Hora d'estiu GTB" #: dlls/tzres/tzres.rc:182 msgid "(UTC+02:00) Athens, Bucharest" -msgstr "" +msgstr "(UTC+02:00) Atenes, Bucarest" #: dlls/tzres/tzres.rc:375 msgid "Turkey Standard Time" @@ -11109,23 +10956,19 @@ msgstr "Hora d'estiu de Turquia" #: dlls/tzres/tzres.rc:377 msgid "(UTC+03:00) Istanbul" -msgstr "" +msgstr "(UTC+03:00) Istanbul" #: dlls/tzres/tzres.rc:54 -#, fuzzy -#| msgid "Arabian Standard Time" msgid "Astrakhan Standard Time" -msgstr "Hora estàndard de l'Àrabia" +msgstr "Hora estàndard d'Àstrakhan" #: dlls/tzres/tzres.rc:55 -#, fuzzy -#| msgid "Arabian Daylight Time" msgid "Astrakhan Daylight Time" -msgstr "Hora d'estiu de l'Àrabia" +msgstr "Hora d'estiu d'Àstrakhan" #: dlls/tzres/tzres.rc:56 msgid "(UTC+04:00) Astrakhan, Ulyanovsk" -msgstr "" +msgstr "(UTC+04:00) Àstrakhan, Uliànovsk" #: dlls/tzres/tzres.rc:162 msgid "Fiji Standard Time" @@ -11137,35 +10980,31 @@ msgstr "Hora d'estiu de Fiji" #: dlls/tzres/tzres.rc:164 msgid "(UTC+12:00) Fiji" -msgstr "" +msgstr "(UTC+12:00) Fiji" #: dlls/tzres/tzres.rc:87 msgid "Canada Central Standard Time" -msgstr "Hora estàndard del Canadà Central" +msgstr "Hora estàndard del Canadà central" #: dlls/tzres/tzres.rc:88 msgid "Canada Central Daylight Time" -msgstr "Hora d'estiu del Canadà Central" +msgstr "Hora d'estiu del Canadà central" #: dlls/tzres/tzres.rc:89 msgid "(UTC-06:00) Saskatchewan" -msgstr "" +msgstr "(UTC-06:00) Saskatchewan" #: dlls/tzres/tzres.rc:444 -#, fuzzy -#| msgid "Yakutsk Standard Time" msgid "Yukon Standard Time" -msgstr "Hora estàndard de Iakutsk" +msgstr "Hora estàndard de Yukon" #: dlls/tzres/tzres.rc:445 -#, fuzzy -#| msgid "Yakutsk Daylight Time" msgid "Yukon Daylight Time" -msgstr "Hora d'estiu de Iakutsk" +msgstr "Hora d'estiu de Yukon" #: dlls/tzres/tzres.rc:446 msgid "(UTC-07:00) Yukon" -msgstr "" +msgstr "(UTC-07:00) Yukon" #: dlls/tzres/tzres.rc:354 msgid "Taipei Standard Time" @@ -11177,19 +11016,19 @@ msgstr "Hora d'estiu de Taipei" #: dlls/tzres/tzres.rc:356 msgid "(UTC+08:00) Taipei" -msgstr "" +msgstr "(UTC+08:00) Taipei" #: dlls/tzres/tzres.rc:426 msgid "W. Europe Standard Time" -msgstr "Hora estàndard de l'Europa Occidental" +msgstr "Hora estàndard d'Europa de l'oest" #: dlls/tzres/tzres.rc:427 msgid "W. Europe Daylight Time" -msgstr "Hora d'estiu de l'Europa Occidental" +msgstr "Hora d'estiu d'Europa de l'oest" #: dlls/tzres/tzres.rc:428 msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" -msgstr "" +msgstr "(UTC+01:00) Amsterdam, Berlín, Berna, Roma, Estocolm, Viena" #: dlls/tzres/tzres.rc:231 msgid "Montevideo Standard Time" @@ -11201,7 +11040,7 @@ msgstr "Hora d'estiu de Montevideo" #: dlls/tzres/tzres.rc:233 msgid "(UTC-03:00) Montevideo" -msgstr "" +msgstr "(UTC-03:00) Montevideo" #: dlls/tzres/tzres.rc:285 msgid "Pakistan Standard Time" @@ -11213,23 +11052,19 @@ msgstr "Hora d'estiu del Pakistan" #: dlls/tzres/tzres.rc:287 msgid "(UTC+05:00) Islamabad, Karachi" -msgstr "" +msgstr "(UTC+05:00) Islamabad, Karachi" #: dlls/tzres/tzres.rc:366 -#, fuzzy -#| msgid "Tokyo Standard Time" msgid "Tomsk Standard Time" -msgstr "Hora estàndard de Tokyo" +msgstr "Hora estàndard de Tomsk" #: dlls/tzres/tzres.rc:367 -#, fuzzy -#| msgid "Tokyo Daylight Time" msgid "Tomsk Daylight Time" -msgstr "Hora d'estiu de Tokyo" +msgstr "Hora d'estiu de Tomsk" #: dlls/tzres/tzres.rc:368 msgid "(UTC+07:00) Tomsk" -msgstr "" +msgstr "(UTC+07:00) Tomsk" #: dlls/tzres/tzres.rc:93 msgid "Caucasus Standard Time" @@ -11241,7 +11076,7 @@ msgstr "Hora d'estiu del Caucas" #: dlls/tzres/tzres.rc:95 msgid "(UTC+04:00) Yerevan" -msgstr "" +msgstr "(UTC+04:00) Erevan" #: dlls/tzres/tzres.rc:66 msgid "AUS Eastern Standard Time" @@ -11249,67 +11084,59 @@ msgstr "Hora estàndard oriental AUS" #: dlls/tzres/tzres.rc:67 msgid "AUS Eastern Daylight Time" -msgstr "Hora d'estiu oriental AUS" +msgstr "Hora d'estiu de l'est AUS" #: dlls/tzres/tzres.rc:68 msgid "(UTC+10:00) Canberra, Melbourne, Sydney" -msgstr "" +msgstr "(UTC+10:00) Canberra, Melbourne, Sydney" #: dlls/tzres/tzres.rc:246 msgid "N. Central Asia Standard Time" -msgstr "Hora estàndard de l'Àsia del Centre-Nord" +msgstr "Hora estàndard d'Àsia del centre-nord" #: dlls/tzres/tzres.rc:247 msgid "N. Central Asia Daylight Time" -msgstr "Hora d'estiu de l'Àsia del Centre-Nord" +msgstr "Hora d'estiu d'Àsia del centre-nord" #: dlls/tzres/tzres.rc:248 msgid "(UTC+07:00) Novosibirsk" -msgstr "" +msgstr "(UTC+07:00) Novossibirsk" #: dlls/tzres/tzres.rc:150 msgid "Eastern Standard Time" -msgstr "Hora estàndard oriental" +msgstr "Hora estàndard de l'est" #: dlls/tzres/tzres.rc:151 msgid "Eastern Daylight Time" -msgstr "Hora d'estiu oriental" +msgstr "Hora d'estiu de l'est" #: dlls/tzres/tzres.rc:152 msgid "(UTC-05:00) Eastern Time (US & Canada)" -msgstr "" +msgstr "(UTC-05:00) Hora de l'est (EU i Canadà)" #: dlls/tzres/tzres.rc:372 -#, fuzzy -#| msgid "Tasmania Standard Time" msgid "Transbaikal Standard Time" -msgstr "Hora estàndard de Tasmània" +msgstr "Hora estàndard de Transbaikal" #: dlls/tzres/tzres.rc:373 -#, fuzzy -#| msgid "Tasmania Daylight Time" msgid "Transbaikal Daylight Time" -msgstr "Hora d'estiu de Tasmània" +msgstr "Hora d'estiu de Transbaikal" #: dlls/tzres/tzres.rc:374 msgid "(UTC+09:00) Chita" -msgstr "" +msgstr "(UTC+09:00) Txità" #: dlls/tzres/tzres.rc:141 -#, fuzzy -#| msgid "W. Europe Standard Time" msgid "E. Europe Standard Time" -msgstr "Hora estàndard de l'Europa Occidental" +msgstr "Hora estàndard d'Europa de l'est" #: dlls/tzres/tzres.rc:142 -#, fuzzy -#| msgid "W. Europe Daylight Time" msgid "E. Europe Daylight Time" -msgstr "Hora d'estiu de l'Europa Occidental" +msgstr "Hora d'estiu d'Europa de l'est" #: dlls/tzres/tzres.rc:143 msgid "(UTC+02:00) Chisinau" -msgstr "" +msgstr "(UTC+02:00) Chisinau" #: dlls/tzres/tzres.rc:120 msgid "Central Standard Time (Mexico)" @@ -11321,23 +11148,19 @@ msgstr "Hora d'estiu central (Mèxic)" #: dlls/tzres/tzres.rc:122 msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" -msgstr "" +msgstr "(UTC-06:00) Guadalajara, Ciutat de Mèxic, Monterrey" #: dlls/tzres/tzres.rc:330 -#, fuzzy -#| msgid "Samoa Standard Time" msgid "Saratov Standard Time" -msgstr "Hora estàndard de Samoa" +msgstr "Hora estàndard de Saràtov" #: dlls/tzres/tzres.rc:331 -#, fuzzy -#| msgid "Samoa Daylight Time" msgid "Saratov Daylight Time" -msgstr "Hora d'estiu de Samoa" +msgstr "Hora d'estiu de Saràtov" #: dlls/tzres/tzres.rc:332 msgid "(UTC+04:00) Saratov" -msgstr "" +msgstr "(UTC+04:00) Saràtov" #: dlls/tzres/tzres.rc:57 msgid "Atlantic Standard Time" @@ -11349,7 +11172,7 @@ msgstr "Hora d'estiu de l'Atlàntic" #: dlls/tzres/tzres.rc:59 msgid "(UTC-04:00) Atlantic Time (Canada)" -msgstr "" +msgstr "(UTC-04:00) Hora de l'Atlàntic (Canadà)" #: dlls/tzres/tzres.rc:237 msgid "Mountain Standard Time" @@ -11361,35 +11184,31 @@ msgstr "Hora d'estiu de les muntanyes" #: dlls/tzres/tzres.rc:239 msgid "(UTC-07:00) Mountain Time (US & Canada)" -msgstr "" +msgstr "(UTC-07:00) Hora de les muntanyes (EU i Canadà)" #: dlls/tzres/tzres.rc:384 msgid "US Eastern Standard Time" -msgstr "Hora estàndard oriental EUA" +msgstr "Hora estàndard de l'est EUA" #: dlls/tzres/tzres.rc:385 msgid "US Eastern Daylight Time" -msgstr "Hora d'estiu oriental EUA" +msgstr "Hora d'estiu de l'est EUA" #: dlls/tzres/tzres.rc:386 msgid "(UTC-05:00) Indiana (East)" -msgstr "" +msgstr "(UTC-05:00) Indiana (est)" #: dlls/tzres/tzres.rc:321 -#, fuzzy -#| msgid "Alaskan Standard Time" msgid "Sakhalin Standard Time" -msgstr "Hora estàndard d'Alaska" +msgstr "Hora estàndard de Sakhalín" #: dlls/tzres/tzres.rc:322 -#, fuzzy -#| msgid "Alaskan Daylight Time" msgid "Sakhalin Daylight Time" -msgstr "Hora d'estiu d'Alaska" +msgstr "Hora d'estiu de Sakhalín" #: dlls/tzres/tzres.rc:323 msgid "(UTC+11:00) Sakhalin" -msgstr "" +msgstr "(UTC+11:00) Sakhalín" #: dlls/tzres/tzres.rc:270 msgid "North Korea Standard Time" @@ -11401,7 +11220,7 @@ msgstr "Hora d'estiu de Corea del Nord" #: dlls/tzres/tzres.rc:272 msgid "(UTC+09:00) Pyongyang" -msgstr "" +msgstr "(UTC+09:00) Pyongyang" #: dlls/tzres/tzres.rc:357 msgid "Tasmania Standard Time" @@ -11413,29 +11232,27 @@ msgstr "Hora d'estiu de Tasmània" #: dlls/tzres/tzres.rc:359 msgid "(UTC+10:00) Hobart" -msgstr "" +msgstr "(UTC+10:00) Hobart" #: dlls/tzres/tzres.rc:99 msgid "Central America Standard Time" -msgstr "Hora estàndard de l'Àmerica Central" +msgstr "Hora estàndard de l'Àmerica central" #: dlls/tzres/tzres.rc:100 msgid "Central America Daylight Time" -msgstr "Hora d'estiu de l'Àmerica Central" +msgstr "Hora d'estiu de l'Àmerica central" #: dlls/tzres/tzres.rc:101 msgid "(UTC-06:00) Central America" -msgstr "" +msgstr "(UTC-06:00) Amèrica central" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 msgid "UTC-02" -msgstr "" +msgstr "UTC-02" #: dlls/tzres/tzres.rc:401 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-02:00) Coordinated Universal Time-02" -msgstr "Temps universal coordinat" +msgstr "(UTC-02:00) Temps universal coordinat-02" #: dlls/tzres/tzres.rc:387 msgid "US Mountain Standard Time" @@ -11447,7 +11264,7 @@ msgstr "Hora d'estiu de les muntanyes EUA" #: dlls/tzres/tzres.rc:389 msgid "(UTC-07:00) Arizona" -msgstr "" +msgstr "(UTC-07:00) Arizona" #: dlls/tzres/tzres.rc:339 msgid "South Africa Standard Time" @@ -11459,29 +11276,27 @@ msgstr "Hora d'estiu de l'Àfrica del Sud" #: dlls/tzres/tzres.rc:341 msgid "(UTC+02:00) Harare, Pretoria" -msgstr "" +msgstr "(UTC+02:00) Harare, Pretòria" #: dlls/tzres/tzres.rc:96 msgid "Cen. Australia Standard Time" -msgstr "Hora estàndard d'Austràlia Central" +msgstr "Hora estàndard de l'Austràlia central" #: dlls/tzres/tzres.rc:97 msgid "Cen. Australia Daylight Time" -msgstr "Hora d'estiu d'Austràlia Central" +msgstr "Hora d'estiu de l'Austràlia central" #: dlls/tzres/tzres.rc:98 msgid "(UTC+09:30) Adelaide" -msgstr "" +msgstr "(UTC+09:30) Adelaida" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 msgid "UTC-09" -msgstr "" +msgstr "UTC-09" #: dlls/tzres/tzres.rc:407 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-09:00) Coordinated Universal Time-09" -msgstr "Temps universal coordinat" +msgstr "(UTC-09:00) Temps universal coordinat-09" #: dlls/tzres/tzres.rc:345 msgid "Sri Lanka Standard Time" @@ -11493,7 +11308,7 @@ msgstr "Hora d'estiu de Sri Lanka" #: dlls/tzres/tzres.rc:347 msgid "(UTC+05:30) Sri Jayawardenepura" -msgstr "" +msgstr "(UTC+05:30) Sri Jayewardenepura" #: dlls/tzres/tzres.rc:30 msgid "Afghanistan Standard Time" @@ -11505,7 +11320,7 @@ msgstr "Hora d'estiu de l'Afganistan" #: dlls/tzres/tzres.rc:32 msgid "(UTC+04:30) Kabul" -msgstr "" +msgstr "(UTC+04:30) Kabul" #: dlls/tzres/tzres.rc:441 msgid "Yakutsk Standard Time" @@ -11517,19 +11332,19 @@ msgstr "Hora d'estiu de Iakutsk" #: dlls/tzres/tzres.rc:443 msgid "(UTC+09:00) Yakutsk" -msgstr "" +msgstr "(UTC+09:00) Iakutsk" #: dlls/tzres/tzres.rc:309 msgid "SA Eastern Standard Time" -msgstr "Hora estàndard de l'Àmerica del Sud-est" +msgstr "Hora estàndard d'Àmerica del sud-est" #: dlls/tzres/tzres.rc:310 msgid "SA Eastern Daylight Time" -msgstr "Hora d'estiu de l'Àmerica del Sud-est" +msgstr "Hora d'estiu d'Àmerica del sud-est" #: dlls/tzres/tzres.rc:311 msgid "(UTC-03:00) Cayenne, Fortaleza" -msgstr "" +msgstr "(UTC-03:00) Caiena, Fortaleza" #: dlls/tzres/tzres.rc:42 msgid "Arab Standard Time" @@ -11541,7 +11356,7 @@ msgstr "Hora d'estiu àrab" #: dlls/tzres/tzres.rc:44 msgid "(UTC+03:00) Kuwait, Riyadh" -msgstr "" +msgstr "(UTC+03:00) Kuwait, Riad" #: dlls/tzres/tzres.rc:45 msgid "Arabian Standard Time" @@ -11553,7 +11368,7 @@ msgstr "Hora d'estiu de l'Àrabia" #: dlls/tzres/tzres.rc:47 msgid "(UTC+04:00) Abu Dhabi, Muscat" -msgstr "" +msgstr "(UTC+04:00) Abu Dhabi, Masqat" #: dlls/tzres/tzres.rc:360 msgid "Tocantins Standard Time" @@ -11565,7 +11380,7 @@ msgstr "Hora d'estiu de Tocantins" #: dlls/tzres/tzres.rc:362 msgid "(UTC-03:00) Araguaina" -msgstr "" +msgstr "(UTC-03:00) Araguaína" #: dlls/tzres/tzres.rc:306 msgid "Russian Standard Time" @@ -11577,19 +11392,19 @@ msgstr "Hora d'estiu de Rússia" #: dlls/tzres/tzres.rc:308 msgid "(UTC+03:00) Moscow, St. Petersburg" -msgstr "" +msgstr "(UTC+03:00) Moscou, Sant Petersburg" #: dlls/tzres/tzres.rc:63 msgid "Aus Central W. Standard Time" -msgstr "Hora estàndard central occident d'Austràlia" +msgstr "Hora estàndard d'Austràlia del centre-oest" #: dlls/tzres/tzres.rc:64 msgid "Aus Central W. Daylight Time" -msgstr "Hora d'estiu central occident d'Austràlia" +msgstr "Hora d'estiu d'Austràlia del centre-oest" #: dlls/tzres/tzres.rc:65 msgid "(UTC+08:45) Eucla" -msgstr "" +msgstr "(UTC+08:45) Eucla" #: dlls/tzres/tzres.rc:294 msgid "Romance Standard Time" @@ -11601,7 +11416,7 @@ msgstr "Hora d'estiu romànic" #: dlls/tzres/tzres.rc:296 msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" -msgstr "" +msgstr "(UTC+01:00) Brussel·les, Copenhaguen, Madrid, París" #: dlls/tzres/tzres.rc:159 msgid "Ekaterinburg Standard Time" @@ -11613,31 +11428,27 @@ msgstr "Hora d'estiu de Iekaterinburg" #: dlls/tzres/tzres.rc:161 msgid "(UTC+05:00) Ekaterinburg" -msgstr "" +msgstr "(UTC+05:00) Iekaterinburg" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 msgid "Russia Time Zone 11" -msgstr "" +msgstr "Zona horària russa 11" #: dlls/tzres/tzres.rc:302 msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" -msgstr "" +msgstr "(UTC+12:00) Anàdir, Petropàvlovsk-Kamtxatski" #: dlls/tzres/tzres.rc:435 -#, fuzzy -#| msgid "West Asia Standard Time" msgid "West Bank Standard Time" -msgstr "Hora estàndard de l'Àsia Occidental" +msgstr "Hora estàndard de Cisjordània" #: dlls/tzres/tzres.rc:436 -#, fuzzy -#| msgid "West Asia Daylight Time" msgid "West Bank Daylight Time" -msgstr "Hora d'estiu de l'Àsia Occidental" +msgstr "Hora d'estiu de Cisjordània" #: dlls/tzres/tzres.rc:437 msgid "(UTC+02:00) Gaza, Hebron" -msgstr "" +msgstr "(UTC+02:00) Gaza, Hebron" #: dlls/tzres/tzres.rc:351 msgid "Syria Standard Time" @@ -11649,7 +11460,7 @@ msgstr "Hora d'estiu de Síria" #: dlls/tzres/tzres.rc:353 msgid "(UTC+02:00) Damascus" -msgstr "" +msgstr "(UTC+02:00) Damasc" #: dlls/tzres/tzres.rc:60 msgid "AUS Central Standard Time" @@ -11661,7 +11472,7 @@ msgstr "Hora d'estiu central AUS" #: dlls/tzres/tzres.rc:62 msgid "(UTC+09:30) Darwin" -msgstr "" +msgstr "(UTC+09:30) Darwin" #: dlls/tzres/tzres.rc:177 msgid "Greenwich Standard Time" @@ -11673,7 +11484,7 @@ msgstr "Hora d'estiu de Greenwich" #: dlls/tzres/tzres.rc:179 msgid "(UTC+00:00) Monrovia, Reykjavik" -msgstr "" +msgstr "(UTC+00:00) Monròvia, Reykjavík" #: dlls/tzres/tzres.rc:381 msgid "Ulaanbaatar Standard Time" @@ -11685,23 +11496,19 @@ msgstr "Hora d'estiu d'Ulan Bator" #: dlls/tzres/tzres.rc:383 msgid "(UTC+08:00) Ulaanbaatar" -msgstr "" +msgstr "(UTC+08:00) Ulaanbaatar" #: dlls/tzres/tzres.rc:261 -#, fuzzy -#| msgid "Morocco Standard Time" msgid "Norfolk Standard Time" -msgstr "Hora estàndard del Marroc" +msgstr "Hora estàndard de Norfolk" #: dlls/tzres/tzres.rc:262 -#, fuzzy -#| msgid "Morocco Daylight Time" msgid "Norfolk Daylight Time" -msgstr "Hora d'estiu del Marroc" +msgstr "Hora d'estiu de Norfolk" #: dlls/tzres/tzres.rc:263 msgid "(UTC+11:00) Norfolk Island" -msgstr "" +msgstr "(UTC+11:00) Illa Norfolk" #: dlls/tzres/tzres.rc:195 msgid "Israel Standard Time" @@ -11713,7 +11520,7 @@ msgstr "Hora d'estiu d'Israel" #: dlls/tzres/tzres.rc:197 msgid "(UTC+02:00) Jerusalem" -msgstr "" +msgstr "(UTC+02:00) Jerusalem" #: dlls/tzres/tzres.rc:78 msgid "Bangladesh Standard Time" @@ -11725,7 +11532,7 @@ msgstr "Hora d'estiu de Bangla Desh" #: dlls/tzres/tzres.rc:80 msgid "(UTC+06:00) Dhaka" -msgstr "" +msgstr "(UTC+06:00) Dhaka" #: dlls/tzres/tzres.rc:312 msgid "SA Pacific Standard Time" @@ -11737,19 +11544,19 @@ msgstr "Hora d'estiu del Pacífic de l'Amèrica del Sud" #: dlls/tzres/tzres.rc:314 msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" -msgstr "" +msgstr "(UTC-05:00) Bogotà, Lima, Quito, Rio Branco" #: dlls/tzres/tzres.rc:432 msgid "West Asia Standard Time" -msgstr "Hora estàndard de l'Àsia Occidental" +msgstr "Hora estàndard d'Àsia de l'oest" #: dlls/tzres/tzres.rc:433 msgid "West Asia Daylight Time" -msgstr "Hora d'estiu de l'Àsia Occidental" +msgstr "Hora d'estiu d'Àsia de l'oest" #: dlls/tzres/tzres.rc:434 msgid "(UTC+05:00) Ashgabat, Tashkent" -msgstr "" +msgstr "(UTC+05:00) Aixkhabad, Taixkent" #: dlls/tzres/tzres.rc:33 msgid "Alaskan Standard Time" @@ -11761,7 +11568,7 @@ msgstr "Hora d'estiu d'Alaska" #: dlls/tzres/tzres.rc:35 msgid "(UTC-09:00) Alaska" -msgstr "" +msgstr "(UTC-09:00) Alaska" #: dlls/tzres/tzres.rc:288 msgid "Paraguay Standard Time" @@ -11773,7 +11580,7 @@ msgstr "Hora d'estiu del Paraguai" #: dlls/tzres/tzres.rc:290 msgid "(UTC-04:00) Asuncion" -msgstr "" +msgstr "(UTC-04:00) Asunción" #: dlls/tzres/tzres.rc:132 msgid "Dateline Standard Time" @@ -11785,7 +11592,7 @@ msgstr "Hora d'estiu de la línia de canvi de data" #: dlls/tzres/tzres.rc:134 msgid "(UTC-12:00) International Date Line West" -msgstr "" +msgstr "(UTC-12:00) Línia internacional de canvi de data occidental" #: dlls/tzres/tzres.rc:207 msgid "Libya Standard Time" @@ -11797,7 +11604,7 @@ msgstr "Hora d'estiu de Líbia" #: dlls/tzres/tzres.rc:209 msgid "(UTC+02:00) Tripoli" -msgstr "" +msgstr "(UTC+02:00) Trípoli" #: dlls/tzres/tzres.rc:75 msgid "Bahia Standard Time" @@ -11809,7 +11616,7 @@ msgstr "Hora d'estiu de Bahia" #: dlls/tzres/tzres.rc:77 msgid "(UTC-03:00) Salvador" -msgstr "" +msgstr "(UTC-03:00) Salvador" #: dlls/tzres/tzres.rc:411 msgid "Venezuela Standard Time" @@ -11821,7 +11628,7 @@ msgstr "Hora d'estiu de Veneçuela" #: dlls/tzres/tzres.rc:413 msgid "(UTC-04:00) Caracas" -msgstr "" +msgstr "(UTC-04:00) Caracas" #: dlls/tzres/tzres.rc:84 msgid "Bougainville Standard Time" @@ -11833,7 +11640,7 @@ msgstr "Hora d'estiu de Bougainville" #: dlls/tzres/tzres.rc:86 msgid "(UTC+11:00) Bougainville Island" -msgstr "" +msgstr "(UTC+11:00) Illa de Bougainville" #: dlls/tzres/tzres.rc:186 msgid "Hawaiian Standard Time" @@ -11845,7 +11652,7 @@ msgstr "Hora d'estiu de Hawaii" #: dlls/tzres/tzres.rc:188 msgid "(UTC-10:00) Hawaii" -msgstr "" +msgstr "(UTC-10:00) Hawaii" #: dlls/tzres/tzres.rc:333 msgid "SE Asia Standard Time" @@ -11857,39 +11664,31 @@ msgstr "Hora d'estiu de l'Àsia del Sud-est" #: dlls/tzres/tzres.rc:335 msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" -msgstr "" +msgstr "(UTC+07:00) Bangkok, Hanoi, Jakarta" #: dlls/tzres/tzres.rc:291 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "Qyzylorda Standard Time" -msgstr "Hora estàndard de Jordània" +msgstr "Hora estàndard de Khizilordà" #: dlls/tzres/tzres.rc:292 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "Qyzylorda Daylight Time" -msgstr "Hora d'estiu de Jordània" +msgstr "Hora d'estiu de Khizilordà" #: dlls/tzres/tzres.rc:293 msgid "(UTC+05:00) Qyzylorda" -msgstr "" +msgstr "(UTC+05:00) Khizilordà" #: dlls/tzres/tzres.rc:429 -#, fuzzy -#| msgid "Tonga Standard Time" msgid "W. Mongolia Standard Time" -msgstr "Hora estàndard de Tonga" +msgstr "Hora estàndard de Mongòlia de l'oest" #: dlls/tzres/tzres.rc:430 -#, fuzzy -#| msgid "Tonga Daylight Time" msgid "W. Mongolia Daylight Time" -msgstr "Hora d'estiu de Tonga" +msgstr "Hora d'estiu de Mongòlia de l'oest" #: dlls/tzres/tzres.rc:431 msgid "(UTC+07:00) Hovd" -msgstr "" +msgstr "(UTC+07:00) Hovd" #: dlls/tzres/tzres.rc:255 msgid "New Zealand Standard Time" @@ -11901,7 +11700,7 @@ msgstr "Hora d'estiu de Nova Zelanda" #: dlls/tzres/tzres.rc:257 msgid "(UTC+12:00) Auckland, Wellington" -msgstr "" +msgstr "(UTC+12:00) Auckland, Wellington" #: dlls/tzres/tzres.rc:36 msgid "Aleutian Standard Time" @@ -11913,35 +11712,31 @@ msgstr "Hora d'estiu aleutiana" #: dlls/tzres/tzres.rc:38 msgid "(UTC-10:00) Aleutian Islands" -msgstr "" +msgstr "(UTC-10:00) Illes Aleutianes" #: dlls/tzres/tzres.rc:273 -#, fuzzy -#| msgid "Yakutsk Standard Time" msgid "Omsk Standard Time" -msgstr "Hora estàndard de Iakutsk" +msgstr "Hora estàndard d'Omsk" #: dlls/tzres/tzres.rc:274 -#, fuzzy -#| msgid "Yakutsk Daylight Time" msgid "Omsk Daylight Time" -msgstr "Hora d'estiu de Iakutsk" +msgstr "Hora d'estiu d'Omsk" #: dlls/tzres/tzres.rc:275 msgid "(UTC+06:00) Omsk" -msgstr "" +msgstr "(UTC+06:00) Omsk" #: dlls/tzres/tzres.rc:105 msgid "Central Brazilian Standard Time" -msgstr "Hora estàndard del Brasil Central" +msgstr "Hora estàndard del Brasil central" #: dlls/tzres/tzres.rc:106 msgid "Central Brazilian Daylight Time" -msgstr "Hora d'estiu del Brasil Central" +msgstr "Hora d'estiu del Brasil central" #: dlls/tzres/tzres.rc:107 msgid "(UTC-04:00) Cuiaba" -msgstr "" +msgstr "(UTC-04:00) Cuiabá" #: dlls/tzres/tzres.rc:81 msgid "Belarus Standard Time" @@ -11953,19 +11748,19 @@ msgstr "Hora d'estiu de Bielorússia" #: dlls/tzres/tzres.rc:83 msgid "(UTC+03:00) Minsk" -msgstr "" +msgstr "(UTC+03:00) Minsk" #: dlls/tzres/tzres.rc:315 msgid "SA Western Standard Time" -msgstr "Hora estàndard de l'Àmerica del Sud-oest" +msgstr "Hora estàndard d'Àmerica del sud-oest" #: dlls/tzres/tzres.rc:316 msgid "SA Western Daylight Time" -msgstr "Hora d'estiu de l'Àmerica del Sud-oest" +msgstr "Hora d'estiu d'Àmerica del sud-oest" #: dlls/tzres/tzres.rc:317 msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" -msgstr "" +msgstr "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" #: dlls/tzres/tzres.rc:174 msgid "Greenland Standard Time" @@ -11977,7 +11772,7 @@ msgstr "Hora d'estiu de Groenlàndia" #: dlls/tzres/tzres.rc:176 msgid "(UTC-03:00) Greenland" -msgstr "" +msgstr "(UTC-03:00) Groenlàndia" #: dlls/tzres/tzres.rc:147 msgid "Easter Island Standard Time" @@ -11989,15 +11784,15 @@ msgstr "Hora d'estiu de l'Illa de Pasqua" #: dlls/tzres/tzres.rc:149 msgid "(UTC-06:00) Easter Island" -msgstr "" +msgstr "(UTC-06:00) Illa de Pasqua" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 msgid "Russia Time Zone 10" -msgstr "" +msgstr "Zona horària russa 10" #: dlls/tzres/tzres.rc:299 msgid "(UTC+11:00) Chokurdakh" -msgstr "" +msgstr "(UTC+11:00) Txokurdakh" #: dlls/tzres/tzres.rc:156 msgid "Egypt Standard Time" @@ -12009,19 +11804,19 @@ msgstr "Hora d'estiu d'Egipte" #: dlls/tzres/tzres.rc:158 msgid "(UTC+02:00) Cairo" -msgstr "" +msgstr "(UTC+02:00) El Caire" #: dlls/tzres/tzres.rc:153 msgid "Eastern Standard Time (Mexico)" -msgstr "Hora estàndard oriental (Mèxic)" +msgstr "Hora estàndard de l'est (Mèxic)" #: dlls/tzres/tzres.rc:154 msgid "Eastern Daylight Time (Mexico)" -msgstr "Hora d'estiu oriental (Mèxic)" +msgstr "Hora d'estiu de l'est (Mèxic)" #: dlls/tzres/tzres.rc:155 msgid "(UTC-05:00) Chetumal" -msgstr "" +msgstr "(UTC-05:00) Chetumal" #: dlls/tzres/tzres.rc:225 msgid "Mauritius Standard Time" @@ -12033,7 +11828,7 @@ msgstr "Hora d'estiu de Maurici" #: dlls/tzres/tzres.rc:227 msgid "(UTC+04:00) Port Louis" -msgstr "" +msgstr "(UTC+04:00) Port Louis" #: dlls/tzres/tzres.rc:414 msgid "Vladivostok Standard Time" @@ -12045,7 +11840,7 @@ msgstr "Hora d'estiu de Vladivostok" #: dlls/tzres/tzres.rc:416 msgid "(UTC+10:00) Vladivostok" -msgstr "" +msgstr "(UTC+10:00) Vladivostok" #: dlls/tzres/tzres.rc:336 msgid "Singapore Standard Time" @@ -12057,7 +11852,7 @@ msgstr "Hora d'estiu de Singapur" #: dlls/tzres/tzres.rc:338 msgid "(UTC+08:00) Kuala Lumpur, Singapore" -msgstr "" +msgstr "(UTC+08:00) Kuala Lumpur, Singapur" #: dlls/tzres/tzres.rc:204 msgid "Korea Standard Time" @@ -12069,7 +11864,7 @@ msgstr "Hora d'estiu de Corea" #: dlls/tzres/tzres.rc:206 msgid "(UTC+09:00) Seoul" -msgstr "" +msgstr "(UTC+09:00) Seül" #: dlls/tzres/tzres.rc:123 msgid "Chatham Islands Standard Time" @@ -12081,19 +11876,19 @@ msgstr "Hora d'estiu de les Illes de Chatham" #: dlls/tzres/tzres.rc:125 msgid "(UTC+12:45) Chatham Islands" -msgstr "" +msgstr "(UTC+12:45) Illes Chatham" #: dlls/tzres/tzres.rc:135 msgid "E. Africa Standard Time" -msgstr "Hora estàndard de l'Àfrica Oriental" +msgstr "Hora estàndard d'Àfrica de l'est" #: dlls/tzres/tzres.rc:136 msgid "E. Africa Daylight Time" -msgstr "Hora d'estiu de l'Àfrica Oriental" +msgstr "Hora d'estiu d'Àfrica de l'est" #: dlls/tzres/tzres.rc:137 msgid "(UTC+03:00) Nairobi" -msgstr "" +msgstr "(UTC+03:00) Nairobi" #: dlls/tzres/tzres.rc:165 msgid "FLE Standard Time" @@ -12105,43 +11900,43 @@ msgstr "Hora d'estiu FLE" #: dlls/tzres/tzres.rc:167 msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" -msgstr "" +msgstr "(UTC+02:00) Hèlsinki, Kíev, Riga, Sofia, Tallinn, Vílnius" #: dlls/tzres/tzres.rc:144 msgid "E. South America Standard Time" -msgstr "Hora estàndard de l'Àmerica del Sudest" +msgstr "Hora estàndard d'Àmerica del sudest" #: dlls/tzres/tzres.rc:145 msgid "E. South America Daylight Time" -msgstr "Hora d'estiu de l'Àmerica del Sudest" +msgstr "Hora d'estiu d'Àmerica del sudest" #: dlls/tzres/tzres.rc:146 msgid "(UTC-03:00) Brasilia" -msgstr "" +msgstr "(UTC-03:00) Brasília" #: dlls/tzres/tzres.rc:114 msgid "Central Pacific Standard Time" -msgstr "Hora estàndard del Pacífic Central" +msgstr "Hora estàndard del Pacífic central" #: dlls/tzres/tzres.rc:115 msgid "Central Pacific Daylight Time" -msgstr "Hora d'estiu del Pacífic Central" +msgstr "Hora d'estiu del Pacífic central" #: dlls/tzres/tzres.rc:116 msgid "(UTC+11:00) Solomon Is., New Caledonia" -msgstr "" +msgstr "(UTC+11:00) Illes de Salomó, Nova Caledònia" #: dlls/tzres/tzres.rc:423 msgid "W. Central Africa Standard Time" -msgstr "Hora estàndard de l'Àfrica del Centre-Oest" +msgstr "Hora estàndard d'Àfrica del centre-oest" #: dlls/tzres/tzres.rc:424 msgid "W. Central Africa Daylight Time" -msgstr "Hora d'estiu de l'Àfrica del Centre-Oest" +msgstr "Hora d'estiu d'Àfrica del centre-oest" #: dlls/tzres/tzres.rc:425 msgid "(UTC+01:00) West Central Africa" -msgstr "" +msgstr "(UTC+01:00) Àfrica del centre-oest" #: dlls/tzres/tzres.rc:276 msgid "Pacific SA Standard Time" @@ -12153,31 +11948,31 @@ msgstr "Hora d'estiu del Pacífic de l'Amèrica del Sud" #: dlls/tzres/tzres.rc:278 msgid "(UTC-04:00) Santiago" -msgstr "" +msgstr "(UTC-04:00) Santiago" #: dlls/tzres/tzres.rc:138 msgid "E. Australia Standard Time" -msgstr "Hora estàndard de l'Austràlia Oriental" +msgstr "Hora estàndard d'Austràlia de l'est" #: dlls/tzres/tzres.rc:139 msgid "E. Australia Daylight Time" -msgstr "Hora d'estiu de l'Austràlia Oriental" +msgstr "Hora d'estiu d'Austràlia de l'est" #: dlls/tzres/tzres.rc:140 msgid "(UTC+10:00) Brisbane" -msgstr "" +msgstr "(UTC+10:00) Brisbane" #: dlls/tzres/tzres.rc:420 msgid "W. Australia Standard Time" -msgstr "Hora estàndard de l'Austràlia Occidental" +msgstr "Hora estàndard d'Austràlia de l'oest" #: dlls/tzres/tzres.rc:421 msgid "W. Australia Daylight Time" -msgstr "Hora d'estiu de l'Austràlia Occidental" +msgstr "Hora d'estiu d'Austràlia de l'oest" #: dlls/tzres/tzres.rc:422 msgid "(UTC+08:00) Perth" -msgstr "" +msgstr "(UTC+08:00) Perth" #: dlls/urlmon/urlmon.rc:32 dlls/wininet/wininet.rc:88 msgid "Security Warning" @@ -12775,7 +12570,7 @@ msgid "" "manufacturer about obtaining a new driver." msgstr "" "El controlador de dispositiu ha donat un tipus de retorn no vàlid. Consulteu " -"amb el fabricant del dispositiu sobre com obtenir un controlador nou." +"amb el fabricant del dispositiu quant a com obtenir un controlador nou." #: dlls/winmm/winmm.rc:73 msgid "" @@ -12783,7 +12578,7 @@ msgid "" "manufacturer about obtaining a new driver." msgstr "" "Hi ha un problema amb el controlador de dispositiu. Consulteu amb el " -"fabricant del dispositiu sobre com obtenir un controlador nou." +"fabricant del dispositiu quant a com obtenir un controlador nou." #: dlls/winmm/winmm.rc:74 msgid "The specified command requires a parameter. Please supply one." @@ -13515,13 +13310,11 @@ msgstr "" #: programs/chcp.com/chcp.rc:28 msgid "Active code page: %1!u!\n" -msgstr "" +msgstr "Pàgina de codificació activa: %1!u!\n" #: programs/chcp.com/chcp.rc:29 -#, fuzzy -#| msgid "Invalid message.\n" msgid "Invalid code page\n" -msgstr "El missatge no és vàlid.\n" +msgstr "Pàgina de codificació no vàlida\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -13534,6 +13327,15 @@ msgid "" " Type CHCP without a number to display the active console code page.\n" "\n" msgstr "" +"CHCP [número]\n" +"\n" +" Estableix o mostra la pàgina de codificació activa de la consola.\n" +"\n" +" número La pàgina de codificació de consola a activar.\n" +"\n" +" Teclegeu CHCP sense número per a mostrar la pàgina de codificació activa\n" +" de la consola.\n" +"\n" #: programs/clock/clock.rc:32 msgid "Ana&log" @@ -14716,7 +14518,7 @@ msgstr "Adreça IPv6" #: programs/ipconfig/ipconfig.rc:38 msgid "Primary DNS suffix" -msgstr "" +msgstr "Sufix DNS principal" #: programs/msinfo32/msinfo32.rc:28 msgid "System Information" @@ -15768,43 +15570,25 @@ msgid "Type \"REG %1 /?\" for help.\n" msgstr "Teclegeu \"REG %1 /?\" per ajuda.\n" #: programs/reg/reg.rc:181 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to access or create the specified registry key\n" msgstr "" -"reg: El sistema no ha pogut trobar la clau de registre especificada o el " -"valor de registre especificat\n" +"reg: No s'ha pogut crear o accedir a la clau de registre especificada\n" #: programs/reg/reg.rc:116 -#, fuzzy -#| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "L'operació s'ha acabat amb èxit\n" +msgstr "reg: L'operació s'ha acabat amb èxit\n" #: programs/reg/reg.rc:131 -#, fuzzy -#| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" -msgstr "S'ha cancel·lat l'operació de registre\n" +msgstr "reg: S'ha cancel·lat l'operació de registre\n" #: programs/reg/reg.rc:174 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "" -"reg: El sistema no ha pogut trobar la clau de registre especificada o el " -"valor de registre especificat\n" +msgstr "reg: No s'ha pogut trobar la clau de registre especificada\n" #: programs/reg/reg.rc:120 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "" -"reg: El sistema no ha pogut trobar la clau de registre especificada o el " -"valor de registre especificat\n" +msgstr "reg: No s'ha pogut trobar el valor de registre especificat\n" #: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -15815,17 +15599,6 @@ msgid "Type \"REG /?\" for help.\n" msgstr "Teclegeu \"REG /?\" per ajuda.\n" #: programs/reg/reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | EXPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -15841,9 +15614,9 @@ msgstr "" " REG [operació] [paràmetres]\n" "\n" "Operacions admeses:\n" -" ADD | DELETE | IMPORT | EXPORT | QUERY\n" +" ADD | COPY | DELETE | EXPORT | IMPORT | QUERY\n" "\n" -"Per ajuda sobre una operació específica, teclegeu:\n" +"Per ajuda quant a una operació específica, teclegeu:\n" " REG [operació] /?\n" "\n" @@ -15896,6 +15669,57 @@ msgid "" " Modify the registry without prompting for confirmation.\n" "\n" msgstr "" +"REG ADD <clau> [/v nom_de_valor | /ve] [/t tipus] [/s separador] [/d dades] " +"[/f]\n" +"\n" +" Afegeix la clau al registre o afegeix un valor nou a una clau de registre\n" +" donada.\n" +"\n" +" <clau>\n" +" La clau de registre a afegir o, si o [/v] o [/ve] s'especifica,\n" +" la clau en la qual afegir les dades de registre noves.\n" +"\n" +" Format: ARREL\\Subclau\n" +"\n" +" ARREL: Una clau de registre predefinida. Això ha de ser una de les\n" +" següents:\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" +" Subclau: El camí complet a una clau de registre sota una clau ARREL\n" +" donada.\n" +"\n" +" /v <nom_de_valor>\n" +" El nom del valor de registre a afegir.\n" +"\n" +" /ve\n" +" Afegir un valor de registre sense nom. Aquesta opció modifica el valor\n" +" de registre (Default).\n" +"\n" +" /t <tipus>\n" +" El tipus de dades a afegir al registre. Si s'especifica [/t],\n" +" <tipus> ha de ser un dels següents:\n" +"\n" +" REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" +" REG_DWORD | REG_BINARY | REG_NONE\n" +"\n" +" Si no s'especifica [/t], el tipus de dades per defecte és REG_SZ.\n" +"\n" +" /s <separador>\n" +" El caràcter utilitzat per a separar les cadenes en dades de\n" +" REG_MULTI_SZ.\n" +" Si no s'especifica [/s], el separador per defecte és \\0.\n" +"\n" +" /d <dades>\n" +" Les dades a afegir al valor de registre nou.\n" +"\n" +" /f\n" +" Modifica el registre sense demanar confirmació.\n" +"\n" #: programs/reg/reg.rc:202 msgid "" @@ -15931,6 +15755,40 @@ msgid "" "<key2>.\n" "\n" msgstr "" +"REG COPY <clau1> <clau2> [/s] [/f]\n" +"\n" +" Copia a altra ubicació els continguts d'una clau de registre\n" +" especificada. Per defecte, aquesta operació només copia valors de\n" +" registre. Utilitzeu [/s] per a copiar totes les subclaus i tots els\n" +" valors recursivament.\n" +"\n" +" <clau1>, <clau2>\n" +" Claus de registre que especifiquen l'origen (<clau1>) i la destinació\n" +" (<clau2>) de les dades. Si <clau2> no existeix, es crea.\n" +"\n" +" Format: ARREL\\Subclau\n" +"\n" +" ARREL: Una clau de registre predefinida. Això ha de ser una de les\n" +" següents:\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" +" Subclau: El camí complet a una clau de registre sota una clau ARREL\n" +" donada.\n" +"\n" +" /s\n" +" Copia totes les subclaus i tots els valors de <clau1> a <clau2>.\n" +"\n" +" /f\n" +" Sobrescriu totes les dades de registre en <clau2> sense demanar\n" +" confirmació.\n" +" Aquesta opció no modifica les subclaus i els valors que només\n" +" existeixin en <clau2>.\n" +"\n" #: programs/reg/reg.rc:92 msgid "" @@ -15970,6 +15828,42 @@ msgid "" " prompting for confirmation.\n" "\n" msgstr "" +"REG DELETE <clau> [/v nom_de_valor | /ve | /va] [/f]\n" +"\n" +" Suprimeix una clau de registre (incloent totes les subclaus i valors), o\n" +" suprimeix un o més valors d'una clau de registre donada.\n" +"\n" +" <clau>\n" +" La clau de registre a suprimir o, si s'especifica [/v], [/ve] o [/va],\n" +" la clau de registre en la qual suprimir un o més valors.\n" +"\n" +" Format: ARREL\\Subclau\n" +"\n" +" ARREL: Una clau de registre predefinida. Això ha de ser una de les\n" +" següents:\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" +" Subclau: El camí complet a una clau de registre sota una clau ARREL\n" +" donada.\n" +"\n" +" /v <nom_de_valor>\n" +" El nom del valor de registre a suprimir.\n" +"\n" +" /ve\n" +" Suprimeix un valor de registre sense nom. Aquesta opció suprimeix el\n" +" valor de registre (Default).\n" +"\n" +" /va\n" +" Suprimeix tots els valors d'una clau de registre.\n" +"\n" +" /f\n" +" Suprimeix una clau de registre (incloent totes les subclaus i tots els\n" +" valors) sense demanar confirmació.\n" #: programs/reg/reg.rc:170 msgid "" @@ -16001,6 +15895,35 @@ msgid "" " Overwrite <file> without prompting for confirmation.\n" "\n" msgstr "" +"REG EXPORT <clau> <fitxer> [/y]\n" +"\n" +" Exporta una clau de registre especificada (incloent totes les subclaus i\n" +" valors) a un fitxer.\n" +"\n" +" <clau>\n" +" La clau de registre a exportar.\n" +"\n" +" Format: ARREL\\Subclau\n" +"\n" +" ARREL: Una clau de registre predefinida. Això ha de ser una de les\n" +" següents:\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" +" Subclau: El camí complet a una clau de registre sota una clau ARREL\n" +" donada.\n" +"\n" +" <fitxer>\n" +" El nom i el camí del fitxer de registre que es crearà.\n" +" Aquest fitxer ha de tenir una extensió .reg.\n" +"\n" +" /y\n" +" Sobrescriu <fitxer> sense demanar confirmació.\n" +"\n" #: programs/reg/reg.rc:148 msgid "" @@ -16012,6 +15935,13 @@ msgid "" " The name and path of the registry file to import.\n" "\n" msgstr "" +"REG IMPORT <fitxer>\n" +"\n" +" Importa al registre claus, valors i dades d'un fitxer donat.\n" +"\n" +" <fitxer>\n" +" El nom i el camí del fitxer de registre a importar.\n" +"\n" #: programs/reg/reg.rc:114 msgid "" @@ -16047,6 +15977,40 @@ msgid "" " List all registry entries under <key> and its subkeys.\n" "\n" msgstr "" +"REG QUERY <clau> [/v nom_de_valor | /ve] [/s]\n" +"\n" +" Consulta una clau de registre especificada i llista totes les subclaus\n" +" immediates, valors i dades dins aquella clau. Utilitzeu [/s] per a\n" +" consultar cada subclau recursivament.\n" +"\n" +" <clau>\n" +" La clau de registre a consultar.\n" +"\n" +" Format: ARREL\\Subclau\n" +"\n" +" ARREL: Una clau de registre predefinida. Això ha de ser una de les\n" +" següents:\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" +" Subclau: El camí complet a una clau de registre sota una clau ARREL\n" +" donada.\n" +"\n" +" /v <nom_de_valor>\n" +" El nom del valor de registre a consultar. Si no s'especifica ni [/v]\n" +" ni [/ve], es llisten tots els valors sota <clau>.\n" +"\n" +" /ve\n" +" Consulta un valor de registre sense nom. Aquesta opció consulta el\n" +" valor de registre (Default).\n" +"\n" +" /s\n" +" Llista totes les entrades sota <clau> i les seves subclaus.\n" +"\n" #: programs/reg/reg.rc:180 msgid "" @@ -16057,32 +16021,32 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" +" /reg:32\n" +" Accedir al registre utilitzant la perspectiva de 32 bits.\n" +"\n" +" /reg:64\n" +" Accedir al registre utilitzant la perspectiva de 64 bits.\n" +"\n" #: programs/reg/reg.rc:117 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "reg: Nom de clau no vàlid\n" +msgstr "reg: Clau de registre no vàlida\n" #: programs/reg/reg.rc:119 msgid "reg: Unable to access remote machine\n" msgstr "reg: No s'ha pogut accedir a la màquina remota\n" #: programs/reg/reg.rc:172 -#, fuzzy -#| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" -msgstr "reg: Nom de clau de sistema no vàlid [%1]\n" +msgstr "reg: Clau de sistema no vàlida\n" #: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: L'opció [%1] no és vàlida. " #: programs/reg/reg.rc:122 -#, fuzzy -#| msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgid "reg: The option [/d] must be followed by a valid numeric value\n" -msgstr "reg: Un valor hexadecimal vàlid ha de seguir l'opció [/d]\n" +msgstr "reg: Un valor numèric vàlid ha de seguir l'opció [/d]\n" #: programs/reg/reg.rc:123 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" @@ -16110,15 +16074,15 @@ msgstr "reg: Paràmetres de línia d'ordres no vàlids\n" #: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" -msgstr "" +msgstr "reg: Les claus d'origen i de destinació no poden ser la mateixa\n" #: programs/reg/reg.rc:205 -#, fuzzy -#| msgid "The file '%1' already exists. Do you want to overwrite it?" msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" -msgstr "El fitxer '%1' ja existeix. El voleu sobreescriure?" +msgstr "" +"El valor '%1\\%2' ja existeix en la clau de destinació. El voleu " +"sobreescriure?" #: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" @@ -16133,10 +16097,8 @@ msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Esteu segur que voleu suprimir la clau de registre '%1'?" #: programs/reg/reg.rc:137 -#, fuzzy -#| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" -msgstr "regedit: No s'ha pogut suprimir la clau de registre '%1'.\n" +msgstr "reg: No s'ha pogut suprimir tots els valors de registre en '%1'\n" #: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" @@ -16147,10 +16109,8 @@ msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: Seqüència d'escapada no reconeguda [\\%1!c!]\n" #: programs/reg/reg.rc:175 -#, fuzzy -#| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "reg: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "reg: No s'ha pogut importar la clau de registre '%1'\n" #: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" @@ -16843,37 +16803,6 @@ msgid "regsvr32: Successfully uninstalled DLL '%1'\n" msgstr "regsvr32: S'ha desinstal·lat el DLL '%1' amb èxit\n" #: programs/start/start.rc:57 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files\n" -#| "with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with " -#| "its\n" -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows\n" -#| "Explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -16931,6 +16860,7 @@ msgstr "" " el seu codi de sortida.\n" "/unix Utilitza un nom de fitxer d'Unix i inicia el fitxer com\n" " el Windows Explorer.\n" +"/exec Executa el fitxer especificat (per a ús intern del Wine).\n" "/ProgIDOpen Obre un document utilitzant el progID especificat.\n" "/? Mostra aquesta ajuda i surt.\n" @@ -17531,7 +17461,7 @@ msgstr "Mostra les tasques utilitzant icones petites" #: programs/taskmgr/taskmgr.rc:195 msgid "Displays information about each task" -msgstr "Mosta informació sobre cada tasca" +msgstr "Mostra informació quant a cada tasca" #: programs/taskmgr/taskmgr.rc:196 msgid "Updates the display twice per second" @@ -18551,7 +18481,7 @@ msgid "" msgstr "" "Això pot ser causat per un problema en el programa o una deficiència en el " "Wine. Potser voleu comprovar la <a href=\"https://appdb.winehq.org\">base de " -"dades d'aplicacions</a> per suggeriments sobre l'execució d'aquesta " +"dades d'aplicacions</a> per suggeriments quant a l'execució d'aquesta " "aplicació." #: programs/winedbg/winedbg.rc:62 @@ -19480,7 +19410,7 @@ msgstr "" "[/S] Copia els directoris i subdirectoris.\n" "[/E] Copia els directoris i subdirectoris, incloent-hi els buits.\n" "[/Q] No mostris els noms durant la còpia, és a dir, sigues silent.\n" -"[/F] Mostra els noms complets de la font i la destinació durant la còpia.\n" +"[/F] Mostra els noms complets de l'origen i la destinació durant la còpia.\n" "[/L] Simula l'operació, mostrant els noms que es copiarien.\n" "[/W] Pregunta abans de començar l'operació de còpia.\n" "[/T] Crea una estructura de directoris buits però no copiïs els fitxers.\n" -- 2.34.1

1 0

[PATCH 1/2] ole32: Fix memory leak on error path in CompositeMonikerImpl_CommonPrefixWith (Coverity)
by Alex Henrie 29 Dec '21

29 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ole32/compositemoniker.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index a94e4734f45..05901bb52b3 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -751,7 +751,11 @@ static HRESULT WINAPI CompositeMonikerImpl_CommonPrefixWith(IMoniker *iface, IMo heap_free(components); heap_free(other_components); - if (!prefix_len) return MK_E_NOPREFIX; + if (!prefix_len) + { + heap_free(prefix_components); + return MK_E_NOPREFIX; + } last = prefix_components[0]; for (i = 1; i < prefix_len; ++i) -- 2.34.1

1 1

[PATCH] widl: Fix including tlb files in mingw-w64-tools configuration.
by Martin Storsjö 28 Dec '21

28 Dec '21

Prior to c94f44f9b4559351c0ca86d344fe37aabc15200c (widl: Search for imported typelibs in the library search path.), widl looked for tlb files in the path specified by BIN_TO_INCLUDEDIR. After that commit, widl looks for tlb files in a subdirectory (get_pe_dir) of BIN_TO_DLLDIR (which mingw-w64 sets to the same as BIN_TO_INCLUDEDIR). For compatibility with the mingw-w64 usecase, check for tlb files in the directory specified by BIN_TO_DLLDIR without a separate subdirectory suffix too. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- tools/widl/widl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 0b5f07236f0..f696a73bd2f 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -698,7 +698,11 @@ int open_typelib( const char *name ) if (stdinc) { - if (dlldir) TRYOPEN( strmake( "%s%s/%s", dlldir, pe_dir, name )); + if (dlldir) + { + TRYOPEN( strmake( "%s%s/%s", dlldir, pe_dir, name )); + TRYOPEN( strmake( "%s/%s", dlldir, name )); + } for (i = 0; i < ARRAY_SIZE(default_dirs); i++) { if (i && !strcmp( default_dirs[i], default_dirs[0] )) continue; -- 2.25.1

1 0

[PATCH 1/2] kernel32/tests: Don't test functions directly when reporting GetLastError()
by André Zwing 28 Dec '21

28 Dec '21

Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/kernel32/tests/locale.c | 68 +++++++++++++++--------------------- 1 file changed, 28 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index d64a08666f8..2d327b7130c 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -7048,22 +7048,19 @@ static BOOL CALLBACK calinfo_procA(LPSTR calinfo) static void test_EnumCalendarInfoA(void) { + BOOL ret; INT i; - ok( EnumCalendarInfoA( calinfo_procA, - LOCALE_USER_DEFAULT, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), - "EnumCalendarInfoA for user default locale failed: %u\n", GetLastError() ); + ret = EnumCalendarInfoA( calinfo_procA, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret, "EnumCalendarInfoA for user default locale failed: %u\n", GetLastError() ); for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) { LCID lcid = locales_with_optional_calendars[i]; - ok( EnumCalendarInfoA( calinfo_procA, - lcid, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || - broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + ret = EnumCalendarInfoA( calinfo_procA, lcid, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret || broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, "EnumCalendarInfoA for LCID %#06x failed: %u\n", lcid, GetLastError() ); } } @@ -7076,22 +7073,19 @@ static BOOL CALLBACK calinfo_procW(LPWSTR calinfo) static void test_EnumCalendarInfoW(void) { + BOOL ret; INT i; - ok( EnumCalendarInfoW( calinfo_procW, - LOCALE_USER_DEFAULT, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), - "EnumCalendarInfoW for user default locale failed: %u\n", GetLastError() ); + ret = EnumCalendarInfoW( calinfo_procW, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret, "EnumCalendarInfoW for user default locale failed: %u\n", GetLastError() ); for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) { LCID lcid = locales_with_optional_calendars[i]; - ok( EnumCalendarInfoW( calinfo_procW, - lcid, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || - broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + ret = EnumCalendarInfoW( calinfo_procW, lcid, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret || broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, "EnumCalendarInfoW for LCID %#06x failed: %u\n", lcid, GetLastError() ); } } @@ -7105,22 +7099,19 @@ static BOOL CALLBACK calinfoex_procA(LPSTR calinfo, LCID calid) static void test_EnumCalendarInfoExA(void) { + BOOL ret; INT i; - ok( EnumCalendarInfoExA( calinfoex_procA, - LOCALE_USER_DEFAULT, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), - "EnumCalendarInfoExA for user default locale failed: %u\n", GetLastError() ); + ret = EnumCalendarInfoExA( calinfoex_procA, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret, "EnumCalendarInfoExA for user default locale failed: %u\n", GetLastError() ); for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) { LCID lcid = locales_with_optional_calendars[i]; - ok( EnumCalendarInfoExA( calinfoex_procA, - lcid, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || - broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + ret = EnumCalendarInfoExA( calinfoex_procA, lcid, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret || broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, "EnumCalendarInfoExA for LCID %#06x failed: %u\n", lcid, GetLastError() ); } } @@ -7134,22 +7125,19 @@ static BOOL CALLBACK calinfoex_procW(LPWSTR calinfo, LCID calid) static void test_EnumCalendarInfoExW(void) { + BOOL ret; INT i; - ok( EnumCalendarInfoExW( calinfoex_procW, - LOCALE_USER_DEFAULT, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), - "EnumCalendarInfoExW for user default locale failed: %u\n", GetLastError() ); + ret = EnumCalendarInfoExW( calinfoex_procW, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret, "EnumCalendarInfoExW for user default locale failed: %u\n", GetLastError() ); for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) { LCID lcid = locales_with_optional_calendars[i]; - ok( EnumCalendarInfoExW( calinfoex_procW, - lcid, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || - broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + ret = EnumCalendarInfoExW( calinfoex_procW, lcid, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret || broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, "EnumCalendarInfoExW for LCID %#06x failed: %u\n", lcid, GetLastError() ); } } -- 2.25.1

1 1

[PATCH website] [website] Modify Wine man pages hyperlinks
by Floris Renaud 28 Dec '21

28 Dec '21

Wine-Bug:https://bugs.winehq.org/show_bug.cgi?id=50516 Wine-Bug:https://bugs.winehq.org/show_bug.cgi?id=49884 Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- templates/en/documentation.template | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/templates/en/documentation.template b/templates/en/documentation.template index d0d1b6f9..ce28b225 100644 --- a/templates/en/documentation.template +++ b/templates/en/documentation.template @@ -26,33 +26,33 @@ </li> </ul> - <h2>Man Pages</h2> + <h2><a href="https://wiki.winehq.org/Man_Pages">Man Pages</a></h2> <ul> - <li><a href="{$root}/docs/wine">wine man page</a> + <li><a href="https://wiki.winehq.org/Man_Pages/wine">wine man page</a> <br>Command line options for the wine binary.</li><br> - <li><a href="{$root}/docs/wineserver">wineserver man page</a> + <li><a href="https://wiki.winehq.org/Man_Pages/wineserver">wineserver man page</a> <br>Command line options for the wineserver binary.</li><br> - <li><a href="{$root}/docs/winebuild">winebuild man page</a> + <li><a href="https://wiki.winehq.org/Man_Pages/winebuild">winebuild man page</a> <br>Command line options for the winebuild binary.</li><br> - <li><a href="{$root}/docs/winedump">winedump man page</a> + <li><a href="https://wiki.winehq.org/Man_Pages/winedump">winedump man page</a> <br>Command line options for the winedump binary.</li><br> - <li><a href="{$root}/docs/winemaker">winemaker man page</a> + <li><a href="https://wiki.winehq.org/Man_Pages/winemaker">winemaker man page</a> <br>Command line options for the winemaker script.</li><br> - <li><a href="{$root}/docs/widl">widl man page</a> + <li><a href="https://wiki.winehq.org/Man_Pages/widl">widl man page</a> <br>Command line options for the IDL compiler.</li><br> - <li><a href="{$root}/docs/wmc">wmc man page</a> + <li><a href="https://wiki.winehq.org/Man_Pages/wmc">wmc man page</a> <br>Command line options for the message compiler.</li><br> - <li><a href="{$root}/docs/wrc">wrc man page</a> + <li><a href="https://wiki.winehq.org/Man_Pages/wrc">wrc man page</a> <br>Command line options for the resource compiler.</li><br> - <li><a href="{$root}/docs/winegcc">winegcc man page</a> + <li><a href="https://wiki.winehq.org/Man_Pages/winegcc">winegcc man page</a> <br>Command line options for the winegcc compiler.</li><br> </ul> -- 2.34.1

2 1

[PATCH] winex11.drv: Map the window in UpdateLayeredWindow.
by Gabriel Ivăncescu 28 Dec '21

28 Dec '21

Fixes a regression introduced by 8892b79118fde5f2307ecbbdb03a8d0c489c8b3d, because set_window_pos is called before UpdateLayeredWindow, which calls the driver's WindowPosChanged earlier. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51984 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/winex11.drv/window.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 29473ce..843d10a 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2713,10 +2713,10 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *bmi = (BITMAPINFO *)buffer; void *src_bits, *dst_bits; + BOOL mapped, ret = FALSE; RECT rect, src_rect; HDC hdc = 0; HBITMAP dib; - BOOL ret = FALSE; if (!(data = get_win_data( hwnd ))) return FALSE; @@ -2737,6 +2737,7 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO else set_surface_color_key( surface, color_key ); if (surface) window_surface_add_ref( surface ); + mapped = data->mapped; release_win_data( data ); if (!surface) return FALSE; @@ -2778,6 +2779,15 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO surface->funcs->unlock( surface ); surface->funcs->flush( surface ); + /* layered windows are mapped only once their attributes are set */ + if (!mapped) + { + DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); + + if ((style & WS_VISIBLE) && ((style & WS_MINIMIZE) || is_window_rect_mapped( window_rect ))) + map_window( hwnd, style ); + } + done: window_surface_release( surface ); if (hdc) DeleteDC( hdc ); -- 2.31.1

1 1

[PATCH v2] wined3d: Also check the internal format when determining GL raw blit compatibility.
by Conor McCarthy 28 Dec '21

28 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51935 Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- Supersedes 222249. --- dlls/wined3d/texture.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 851c3c36b..a638ec4ee 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -6163,6 +6163,26 @@ static void raw_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de clear_rects, draw_rect, flags, colour, depth, stencil); } +static bool gl_formats_compatible(struct wined3d_texture *src_texture, DWORD src_location, + struct wined3d_texture *dst_texture, DWORD dst_location) +{ + GLuint src_internal, dst_internal; + bool src_ds, dst_ds; + + src_ds = src_texture->resource.format->depth_size || src_texture->resource.format->stencil_size; + dst_ds = dst_texture->resource.format->depth_size || dst_texture->resource.format->stencil_size; + if (src_ds == dst_ds) + return true; + /* Also check the internal format because, e.g. WINED3DFMT_D24_UNORM_S8_UINT has nonzero depth and stencil + * sizes as does WINED3DFMT_R24G8_TYPELESS when bound with flag WINED3D_BIND_DEPTH_STENCIL, but these share + * the same internal format with WINED3DFMT_R24_UNORM_X8_TYPELESS. */ + src_internal = wined3d_gl_get_internal_format(&src_texture->resource, + wined3d_format_gl(src_texture->resource.format), src_location == WINED3D_LOCATION_TEXTURE_SRGB); + dst_internal = wined3d_gl_get_internal_format(&dst_texture->resource, + wined3d_format_gl(dst_texture->resource.format), dst_location == WINED3D_LOCATION_TEXTURE_SRGB); + return src_internal == dst_internal; +} + static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_op op, struct wined3d_context *context, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, DWORD src_location, const RECT *src_rect, struct wined3d_texture *dst_texture, @@ -6177,19 +6197,15 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit unsigned int src_level, src_layer, dst_level, dst_layer; struct wined3d_blitter *next; GLuint src_name, dst_name; - bool src_ds, dst_ds; DWORD location; - src_ds = src_texture->resource.format->depth_size || src_texture->resource.format->stencil_size; - dst_ds = dst_texture->resource.format->depth_size || dst_texture->resource.format->stencil_size; - /* If we would need to copy from a renderbuffer or drawable, we'd probably * be better off using the FBO blitter directly, since we'd need to use it * to copy the resource contents to the texture anyway. * * We also can't copy between depth/stencil and colour resources, since * the formats are considered incompatible in OpenGL. */ - if (op != WINED3D_BLIT_OP_RAW_BLIT || (src_ds != dst_ds) + if (op != WINED3D_BLIT_OP_RAW_BLIT || !gl_formats_compatible(src_texture, src_location, dst_texture, dst_location) || (src_texture->resource.format->id == dst_texture->resource.format->id && (!(src_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) || !(dst_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB))))) -- 2.33.0

2 1

[PATCH] d3d10core/tests: Don't test stencil_ref again if it wasn't touched
by Michael Stefaniuc 28 Dec '21

28 Dec '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index a1c4be46b7f..d7fc9efa901 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -5717,7 +5717,6 @@ float4 main(float4 color : COLOR) : SV_TARGET ok(stencil_ref == 3, "Got unexpected stencil ref %u.\n", stencil_ref); tmp_ds_state = NULL; ID3D10Device_OMGetDepthStencilState(device, &tmp_ds_state, NULL); - ok(stencil_ref == 3, "Got unexpected stencil ref %u.\n", stencil_ref); ok(tmp_ds_state == ds_state, "Got unexpected depth stencil state %p, expected %p.\n", tmp_ds_state, ds_state); ID3D10DepthStencilState_Release(tmp_ds_state); -- 2.31.1

3 2

[PATCH v2] ntdll: resolve drive symlink for mapped filename
by Matias Zuniga 27 Dec '21

27 Dec '21

Applications expect a path starting with a drive like '\Device\Harddisk1\' instead of a drive letter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51687 Signed-off-by: Matias Zuniga <matias.nicolas.zc(a)gmail.com> --- v2: Fix info.c test breakage --- dlls/ntdll/unix/virtual.c | 97 ++++++++++++++++++++++++++++++++--- dlls/psapi/tests/psapi_main.c | 5 +- 2 files changed, 90 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 984af2d4a21..48bfaf3cf99 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -133,6 +133,8 @@ struct file_view } \ } while (0); +#define SYMBOLIC_LINK_QUERY 0x0001 + /* per-page protection flags */ #define VPROT_READ 0x01 #define VPROT_WRITE 0x02 @@ -4273,34 +4275,113 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr, return STATUS_SUCCESS; } +static NTSTATUS read_nt_symlink( UNICODE_STRING *name, WCHAR *target, DWORD size ) +{ + NTSTATUS status; + OBJECT_ATTRIBUTES attr; + HANDLE handle; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.ObjectName = name; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + if (!(status = NtOpenSymbolicLinkObject( &handle, SYMBOLIC_LINK_QUERY, &attr ))) + { + UNICODE_STRING targetW; + targetW.Buffer = target; + targetW.MaximumLength = (size - 1) * sizeof(WCHAR); + status = NtQuerySymbolicLinkObject( handle, &targetW, NULL ); + if (!status) target[targetW.Length / sizeof(WCHAR)] = 0; + NtClose( handle ); + } + return status; +} + +static NTSTATUS follow_device_symlink( WCHAR *name, SIZE_T max_path_len, WCHAR *buffer, + SIZE_T buffer_len, SIZE_T *current_path_len ) +{ + WCHAR *p; + NTSTATUS status = STATUS_SUCCESS; + SIZE_T devname_len = 6 * sizeof(WCHAR); // e.g. \??\C: + UNICODE_STRING devname; + SIZE_T target_len; + + if (*current_path_len > buffer_len) return STATUS_INVALID_PARAMETER; + + if (*current_path_len >= devname_len && buffer[devname_len / sizeof(WCHAR) - 1] == ':') { + devname.Buffer = buffer; + devname.Length = devname_len; + + p = buffer + (*current_path_len / sizeof(WCHAR)); + if (!(status = read_nt_symlink( &devname, p, (buffer_len - *current_path_len) / sizeof(WCHAR) ))) + { + *current_path_len -= devname_len; // skip the device name + target_len = lstrlenW(p) * sizeof(WCHAR); + *current_path_len += target_len; + + if (*current_path_len <= max_path_len) + { + memcpy( name, p, target_len ); + p = buffer + devname_len / sizeof(WCHAR); + memcpy( name + target_len / sizeof(WCHAR), p, *current_path_len - target_len); + } + else status = STATUS_BUFFER_OVERFLOW; + } + } + else if (*current_path_len <= max_path_len) { + memcpy( name, buffer, *current_path_len ); + } + else status = STATUS_BUFFER_OVERFLOW; + + return status; +} + static NTSTATUS get_memory_section_name( HANDLE process, LPCVOID addr, MEMORY_SECTION_NAME *info, SIZE_T len, SIZE_T *ret_len ) { + SIZE_T current_path_len, max_path_len = 0; + // buffer to hold the path + 6 chars devname (e.g. \??\C:) + SIZE_T buffer_len = (MAX_PATH + 6) * sizeof(WCHAR); + WCHAR *buffer = NULL; NTSTATUS status; if (!info) return STATUS_ACCESS_VIOLATION; + if (!(buffer = malloc( buffer_len ))) return STATUS_NO_MEMORY; + if (len > sizeof(*info) + sizeof(WCHAR)) + { + max_path_len = len - sizeof(*info) - sizeof(WCHAR); // dont count null char + } SERVER_START_REQ( get_mapping_filename ) { req->process = wine_server_obj_handle( process ); req->addr = wine_server_client_ptr( addr ); - if (len > sizeof(*info) + sizeof(WCHAR)) - wine_server_set_reply( req, info + 1, len - sizeof(*info) - sizeof(WCHAR) ); + wine_server_set_reply( req, buffer, MAX_PATH ); status = wine_server_call( req ); - if (!status || status == STATUS_BUFFER_OVERFLOW) + if (!status) { - if (ret_len) *ret_len = sizeof(*info) + reply->len + sizeof(WCHAR); - if (len < sizeof(*info)) status = STATUS_INFO_LENGTH_MISMATCH; + current_path_len = reply->len; + status = follow_device_symlink( (WCHAR *)(info + 1), max_path_len, buffer, buffer_len, &current_path_len); + if (len < sizeof(*info)) + { + status = STATUS_INFO_LENGTH_MISMATCH; + } + + if (ret_len) *ret_len = sizeof(*info) + current_path_len + sizeof(WCHAR); if (!status) { info->SectionFileName.Buffer = (WCHAR *)(info + 1); - info->SectionFileName.Length = reply->len; - info->SectionFileName.MaximumLength = reply->len + sizeof(WCHAR); - info->SectionFileName.Buffer[reply->len / sizeof(WCHAR)] = 0; + info->SectionFileName.Length = current_path_len; + info->SectionFileName.MaximumLength = current_path_len + sizeof(WCHAR); + info->SectionFileName.Buffer[current_path_len / sizeof(WCHAR)] = 0; } } } SERVER_END_REQ; + free(buffer); return status; } diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index c4a740310a4..d6fb8e69384 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -471,7 +471,6 @@ static void test_GetMappedFileName(void) ret = GetMappedFileNameA(GetCurrentProcess(), base, map_name, sizeof(map_name)); ok(ret, "GetMappedFileName error %d\n", GetLastError()); ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); - todo_wine ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); SetLastError(0xdeadbeef); @@ -482,7 +481,6 @@ static void test_GetMappedFileName(void) { ok(memcmp(map_nameW, nt_map_name, lstrlenW(map_nameW)) == 0, "map name does not start with a device name: %s\n", map_name); WideCharToMultiByte(CP_ACP, 0, map_nameW, -1, map_name, MAX_PATH, NULL, NULL); - todo_wine ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); } @@ -490,7 +488,6 @@ static void test_GetMappedFileName(void) ret = GetMappedFileNameA(GetCurrentProcess(), base + 0x2000, map_name, sizeof(map_name)); ok(ret, "GetMappedFileName error %d\n", GetLastError()); ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); - todo_wine ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); SetLastError(0xdeadbeef); @@ -566,7 +563,7 @@ static void test_GetProcessImageFileName(void) { /* Windows returns 2*strlen-1 */ ok(ret >= strlen(szImgPath), "szImgPath=\"%s\" ret=%d\n", szImgPath, ret); - todo_wine ok(!strcmp(szImgPath, szMapPath), "szImgPath=\"%s\" szMapPath=\"%s\"\n", szImgPath, szMapPath); + ok(!strcmp(szImgPath, szMapPath), "szImgPath=\"%s\" szMapPath=\"%s\"\n", szImgPath, szMapPath); } SetLastError(0xdeadbeef); -- 2.31.1

3 2

[PATCH v2] winealsa.drv: use separate port for each output device.
by Jacek Konieczny 27 Dec '21

27 Dec '21

This fixes use of multiple MIDI outputs while keeping the flexibility of proper ALSA sequencer port subscriptions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52220 Signed-off-by: Jacek Konieczny <jajcus(a)jajcus.net> --- v2: do not fail on port connection errors. Fixes failures to open a device when the port is already connected to the target, either by wine or some external application --- dlls/winealsa.drv/midi.c | 55 +++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index f2fe6307bb2..ac666b49d79 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -85,6 +85,7 @@ typedef struct { void* lpExtra; /* according to port type (MIDI, FM...), extra data when needed */ MIDIOUTCAPSW caps; snd_seq_addr_t addr; + int port_out; } WINE_MIDIOUT; static WINE_MIDIIN MidiInDev [MAX_MIDIINDRV ]; @@ -108,7 +109,6 @@ static int numOpenMidiSeq = 0; static int numStartedMidiIn = 0; static int port_in; -static int port_out; static CRITICAL_SECTION crit_sect; /* protects all MidiIn buffer queues */ static CRITICAL_SECTION_DEBUG critsect_debug = @@ -247,14 +247,6 @@ static int midiOpenSeq(BOOL create_client) /* Setting the client name is the only init to do */ snd_seq_set_client_name(midiSeq, "WINE midi driver"); - port_out = snd_seq_create_simple_port(midiSeq, "WINE ALSA Output", - SND_SEQ_PORT_CAP_READ|SND_SEQ_PORT_CAP_SUBS_READ|SND_SEQ_PORT_CAP_SUBS_WRITE, - SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION); - if (port_out < 0) - TRACE("Unable to create output port\n"); - else - TRACE("Outport port %d created successfully\n", port_out); - port_in = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input", SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_READ|SND_SEQ_PORT_CAP_SUBS_WRITE, SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION); @@ -276,7 +268,6 @@ static int midiCloseSeq(void) { EnterCriticalSection(&midiSeqLock); if (--numOpenMidiSeq == 0) { - snd_seq_delete_simple_port(midiSeq, port_out); snd_seq_delete_simple_port(midiSeq, port_in); snd_seq_close(midiSeq); midiSeq = NULL; @@ -738,6 +729,8 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) { int ret; + int port_out; + char port_out_name[32]; TRACE("(%04X, %p, %08X);\n", wDevID, lpDesc, dwFlags); if (lpDesc == NULL) { @@ -784,12 +777,37 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) MidiOutDev[wDevID].bufsize = 0x3FFF; MidiOutDev[wDevID].midiDesc = *lpDesc; - /* Connect our app port to the device port */ EnterCriticalSection(&midiSeqLock); - ret = snd_seq_connect_to(midiSeq, port_out, MidiOutDev[wDevID].addr.client, - MidiOutDev[wDevID].addr.port); + /* Create a port dedicated to a specific device */ + /* Keep the old name without a number for the first port */ + if (wDevID) + sprintf(port_out_name, "WINE ALSA Output #%d", wDevID); + + port_out = snd_seq_create_simple_port(midiSeq, wDevID?port_out_name:"WINE ALSA Output", + SND_SEQ_PORT_CAP_READ|SND_SEQ_PORT_CAP_SUBS_READ|SND_SEQ_PORT_CAP_SUBS_WRITE, + SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION); + + if (port_out < 0) { + TRACE("Unable to create output port\n"); + MidiOutDev[wDevID].port_out = -1; + } else { + TRACE("Outport port %d created successfully\n", port_out); + MidiOutDev[wDevID].port_out = port_out; + + /* Connect our app port to the device port */ + ret = snd_seq_connect_to(midiSeq, port_out, MidiOutDev[wDevID].addr.client, + MidiOutDev[wDevID].addr.port); + + /* usually will happen when the port is already connected */ + /* other errors should not be fatal either */ + if (ret < 0) + WARN("Could not connect port %d to %d:%d: %s\n", + wDevID, MidiOutDev[wDevID].addr.client, + MidiOutDev[wDevID].addr.port, snd_strerror(ret)); + } LeaveCriticalSection(&midiSeqLock); - if (ret < 0) + + if (port_out < 0) return MMSYSERR_NOTENABLED; TRACE("Output port :%d connected %d:%d\n",port_out,MidiOutDev[wDevID].addr.client,MidiOutDev[wDevID].addr.port); @@ -825,7 +843,9 @@ static DWORD modClose(WORD wDevID) case MOD_MIDIPORT: case MOD_SYNTH: EnterCriticalSection(&midiSeqLock); - snd_seq_disconnect_to(midiSeq, port_out, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); + TRACE("Deleting port :%d, connected to %d:%d\n", MidiOutDev[wDevID].port_out, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); + snd_seq_delete_simple_port(midiSeq, MidiOutDev[wDevID].port_out); + MidiOutDev[wDevID].port_out = -1; LeaveCriticalSection(&midiSeqLock); midiCloseSeq(); break; @@ -870,7 +890,7 @@ static DWORD modData(WORD wDevID, DWORD dwParam) snd_seq_event_t event; snd_seq_ev_clear(&event); snd_seq_ev_set_direct(&event); - snd_seq_ev_set_source(&event, port_out); + snd_seq_ev_set_source(&event, MidiOutDev[wDevID].port_out); snd_seq_ev_set_subs(&event); switch (evt & 0xF0) { @@ -1039,7 +1059,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) } snd_seq_ev_clear(&event); snd_seq_ev_set_direct(&event); - snd_seq_ev_set_source(&event, port_out); + snd_seq_ev_set_source(&event, MidiOutDev[wDevID].port_out); snd_seq_ev_set_subs(&event); snd_seq_ev_set_sysex(&event, lpMidiHdr->dwBufferLength + len_add, lpNewData ? lpNewData : lpData); EnterCriticalSection(&midiSeqLock); @@ -1201,6 +1221,7 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* MidiOutDev[MODM_NumDevs].caps.wNotes = 16; } MidiOutDev[MODM_NumDevs].bEnabled = TRUE; + MidiOutDev[MODM_NumDevs].port_out = -1; TRACE("MidiOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n" "\tALSA info: midi dev-type=%x, capa=0\n", -- 2.25.1

3 5

[PATCH v3 2/2] server: Strip terminating '\0' from the registry key name.
by Dmitry Timoshkov 27 Dec '21

27 Dec '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/tests/reg.c | 18 +++++++++++++++++- server/registry.c | 2 ++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 74d82b85be4..024d9026785 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -457,6 +457,14 @@ todo_wine ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenKey failed: 0x%08x\n", status ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); + str.Length += sizeof(WCHAR); /* include terminating \0 in the length */ + status = pNtOpenKey( &key, KEY_READ, &attr ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_NAME_NOT_FOUND) /* win8 */, + "NtOpenKey failed: 0x%08x\n", status ); + if (!status) pNtClose( key ); + pRtlFreeUnicodeString( &str ); + if (!pNtOpenKeyEx) { win_skip("NtOpenKeyEx not available\n"); @@ -631,13 +639,21 @@ static void test_NtCreateKey(void) status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); - if (!status) pNtClose( subkey ); + pNtClose( subkey ); pRtlFreeUnicodeString( &str ); pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\MACHINE\\SOFTWARE\\CLASSES" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); + pNtClose( subkey ); + pRtlFreeUnicodeString( &str ); + + pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); + str.Length += sizeof(WCHAR); /* include terminating \0 in the length */ + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_PATH_NOT_FOUND) /* win8 */, + "NtCreateKey failed: 0x%08x\n", status ); if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); diff --git a/server/registry.c b/server/registry.c index 4ed3ee9896e..6d783efbfb2 100644 --- a/server/registry.c +++ b/server/registry.c @@ -479,6 +479,8 @@ static inline struct unicode_str *get_req_path( struct unicode_str *str, int ski str->str = get_req_data(); str->len = (get_req_data_size() / sizeof(WCHAR)) * sizeof(WCHAR); + while (str->len && !str->str[str->len / sizeof(WCHAR) - 1]) str->len -= sizeof(WCHAR); + if (skip_root && str->len >= sizeof(root_name) && !memicmp_strW( str->str, root_name, sizeof(root_name) )) { str->str += ARRAY_SIZE( root_name ); -- 2.34.1

1 0

[PATCH 2/2] dwrite: Add Segoe UI Symbol fallback ranges.
by Dmitry Timoshkov 27 Dec '21

27 Dec '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/dwrite/analyzer.c | 8 ++++++++ dlls/dwrite/tests/layout.c | 5 ++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 13ccf8e4434..a169b8ef860 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -220,6 +220,13 @@ static const DWRITE_UNICODE_RANGE cjk_ranges[] = { 0x4e00, 0x9fff }, /* CJK Unified Ideographs */ }; +static const WCHAR *SegoeUI_Symbol_families[] = { L"Segoe UI Symbol" }; + +static const DWRITE_UNICODE_RANGE SegoeUI_Symbol_ranges[] = +{ + { 0x2196, 0x2bef }, +}; + struct fallback_mapping { DWRITE_UNICODE_RANGE *ranges; UINT32 ranges_count; @@ -236,6 +243,7 @@ static const struct fallback_mapping fontfallback_neutral_data[] = { (WCHAR **)families, ARRAY_SIZE(families) } MAPPING_RANGE(cjk_ranges, cjk_families), + MAPPING_RANGE(SegoeUI_Symbol_ranges, SegoeUI_Symbol_families), #undef MAPPING_RANGE }; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c242155cce3..7bc53834ea3 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -6604,19 +6604,18 @@ todo_wine { hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, collection, families[i], DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); -todo_wine_if(families[i] == NULL) ok(hr == S_OK, "%u: %s - got %#x\n", i, wine_dbgstr_w(families[i]), hr); if (hr != S_OK) continue; ok(mappedlength == 1, "got %u\n", mappedlength); ok(scale == 1.0f, "got %f\n", scale); get_font_name(font, name, ARRAY_SIZE(name)); -todo_wine +todo_wine_if(families[i] != NULL) ok(!wcscmp(name, L"Segoe UI Symbol"), "got %s\n", wine_dbgstr_w(name)); hr = IDWriteFont_HasCharacter(font, 0x25d4, &exists); ok(hr == S_OK, "got %#x\n", hr); -todo_wine +todo_wine_if(families[i] != NULL) ok(exists, "%s should have character 0x25d4\n", wine_dbgstr_w(name)); IDWriteFont_Release(font); -- 2.34.1

1 0

[PATCH] mfplat/tests: Print an error if the first call to get_event fails in test_source_resolver (Coverity)
by Alex Henrie 27 Dec '21

27 Dec '21

The test will still segfault if it fails, but at least there will be an indication as to why. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/mfplat/tests/mfplat.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 21eab6d1172..d9f30867f7f 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -686,6 +686,7 @@ static void test_source_resolver(void) GUID guid; float rate; UINT32 rotation; + BOOL ret; if (!pMFCreateSourceResolver) { @@ -889,12 +890,10 @@ todo_wine hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); - video_stream = NULL; - if (get_event((IMFMediaEventGenerator *)mediasource, MENewStream, &var)) - { - ok(var.vt == VT_UNKNOWN, "Unexpected value type.\n"); - video_stream = (IMFMediaStream *)var.punkVal; - } + ret = get_event((IMFMediaEventGenerator *)mediasource, MENewStream, &var); + ok(ret, "Failed to get event.\n"); + ok(var.vt == VT_UNKNOWN, "Unexpected value type.\n"); + video_stream = (IMFMediaStream *)var.punkVal; sample_count = 10; @@ -912,7 +911,6 @@ todo_wine LONGLONG duration, time; DWORD buffer_count; IMFSample *sample; - BOOL ret; ret = get_event((IMFMediaEventGenerator *)video_stream, MEMediaSample, &var); ok(ret, "Sample %u not received.\n", i + 1); -- 2.34.1

2 2

[PATCH] comctl32/tests: Use GetLocaleInfoA when the buffer size is in bytes (Coverity)
by Alex Henrie 27 Dec '21

27 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Alternatively, we could keep using GetLocaleInfoW here and divide sizeof(reading_layout) by sizeof(WCHAR). --- dlls/comctl32/tests/propsheet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index b4696112500..4621d2c8c38 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -56,7 +56,7 @@ static HTHEME (WINAPI *pOpenThemeData)(HWND, LPCWSTR); static void detect_locale(void) { DWORD reading_layout; - rtl = GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_IREADINGLAYOUT | LOCALE_RETURN_NUMBER, + rtl = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_IREADINGLAYOUT | LOCALE_RETURN_NUMBER, (void *)&reading_layout, sizeof(reading_layout)) && reading_layout == 1; } -- 2.34.1

3 3

[PATCH] advapi32/tests: Accept a variable number of x's in some RegEnumValue name overflow tests
by Alex Henrie 27 Dec '21

27 Dec '21

Fixes intermittent testbot failures. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- I sent this patch through the testbot several times to make sure that it makes the tests pass consistently. --- dlls/advapi32/tests/registry.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index ecddfe647c2..054529b54ba 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -545,7 +545,7 @@ static void test_enum_value(void) data_count = 20; type = 1234; strcpy( value, "xxxxxxxxxx" ); - strcpy( data, "xxxxxxxxxx" ); + memset( data, 'x', sizeof(data) ); res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); ok( val_count == 3, "val_count set to %d\n", val_count ); @@ -555,15 +555,16 @@ static void test_enum_value(void) /* v5.1.2600.0 (XP Home and Professional) does not touch value or data in this case */ ok( !strcmp( value, "Te" ) || !strcmp( value, "xxxxxxxxxx" ), "value set to '%s' instead of 'Te' or 'xxxxxxxxxx'\n", value ); - ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || broken( !strcmp( data, "xxxxxxxx" ) && data_count > 7 ), - "data set to '%s' instead of 'foobar' or 'xxxxxxx'\n", data ); + ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || + broken( data_count > 7 && strspn( data, "x" ) == data_count && data[data_count] == 0 ), + "data set to '%s' instead of 'foobar' or x's, data_count=%u\n", data, data_count ); /* overflow empty name */ val_count = 0; data_count = 20; type = 1234; strcpy( value, "xxxxxxxxxx" ); - strcpy( data, "xxxxxxxxxx" ); + memset( data, 'x', sizeof(data) ); res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); ok( val_count == 0, "val_count set to %d\n", val_count ); @@ -572,8 +573,9 @@ static void test_enum_value(void) ok( type == REG_SZ, "type %d is not REG_SZ\n", type ); ok( !strcmp( value, "xxxxxxxxxx" ), "value set to '%s'\n", value ); /* v5.1.2600.0 (XP Home and Professional) does not touch data in this case */ - ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || broken( !strcmp( data, "xxxxxxxx" ) && data_count > 7 ), - "data set to '%s' instead of 'foobar' or 'xxxxxxx'\n", data ); + ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || + broken( data_count > 7 && strspn( data, "x" ) == data_count && data[data_count] == 0 ), + "data set to '%s' instead of 'foobar' or x's, data_count=%u\n", data, data_count ); /* overflow data */ val_count = 20; -- 2.34.1

1 0

[PATCH] advapi32/tests: Fix memory leaks in test_performance_keys (Coverity)
by Alex Henrie 27 Dec '21

27 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/advapi32/tests/registry.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index ca371f73d65..ecddfe647c2 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3675,7 +3675,7 @@ static void test_performance_keys(void) LARGE_INTEGER perftime1, perftime2, systime1, systime2, freq; WCHAR sysname[MAX_COMPUTERNAME_LENGTH + 1]; unsigned int buffer_size = 1024 * 1024; - void *buffer, *bufferW; + void *buffer, *bufferW = NULL; PERF_DATA_BLOCK *data; union { @@ -3804,7 +3804,7 @@ static void test_performance_keys(void) ok(!ret, "got %u\n", ret); ok(size > 0, "got size %u\n", size); - bufferW = malloc(size); + bufferW = realloc(bufferW, size); type = 0xdeadbeef; ret = RegQueryValueExW(keys[i], L"cOuNtEr", NULL, &type, bufferW, &size); @@ -3843,7 +3843,7 @@ static void test_performance_keys(void) ok(!ret, "got %u\n", ret); ok(size > 0, "got size %u\n", size); - bufferW = malloc(size); + bufferW = realloc(bufferW, size); type = 0xdeadbeef; ret = RegQueryValueExW(keys[i], L"hElP", NULL, &type, bufferW, &size); @@ -3922,6 +3922,7 @@ static void test_performance_keys(void) todo_wine ok(ret == ERROR_NO_MORE_ITEMS, "got %u\n", ret); free(buffer); + free(bufferW); } static void test_perflib_key(void) -- 2.34.1

1 0

[PATCH] comctl32/tests: Mark smaller propsheet buffer as broken
by Alex Henrie 27 Dec '21

27 Dec '21

Fixes another testbot failure. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/comctl32/tests/propsheet.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 4621d2c8c38..affd21da825 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -92,8 +92,11 @@ static int CALLBACK sheet_callback(HWND hwnd, UINT msg, LPARAM lparam) size = SizeofResource(module, hrsrc); ok(size != 0, "Failed to get size of propsheet dialog resource\n"); buffer_size = HeapSize(GetProcessHeap(), 0, (void *)lparam); - /* Hebrew Windows 10 allocates 2 * size + 8, all others allocate 2 * size */ - ok(buffer_size >= 2 * size, "Unexpected template buffer size %u, resource size %u\n", + /* Hebrew Windows 10 allocates 2 * size + 8, + * Arabic Windows 10 allocates 2 * size - 32, + * all others allocate exactly 2 * size */ + ok(buffer_size >= 2 * size || broken(buffer_size == 2 * size - 32), + "Unexpected template buffer size %u, resource size %u\n", buffer_size, size); break; } -- 2.34.1

1 0

Wine staging 7.0-rc3 release
by Alistair Leslie-Hughes 27 Dec '21

27 Dec '21

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 7.0-rc3 (552 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * None Updated: * None Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] kernel32/tests: Remove unused variable size from test_process_info (Coverity)
by Alex Henrie 26 Dec '21

26 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/tests/process.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 6251ee05f94..a558597a404 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3770,7 +3770,7 @@ static void test_process_info(HANDLE hproc) sizeof(PROCESS_JOB_MEMORY_INFO) /* ProcessJobMemoryInformation */, #endif }; - ULONG i, status, ret_len, size; + ULONG i, status, ret_len; BOOL is_current = hproc == GetCurrentProcess(); if (!pNtQueryInformationProcess) @@ -3781,8 +3781,6 @@ static void test_process_info(HANDLE hproc) for (i = 0; i < MaxProcessInfoClass; i++) { - size = info_size[i]; - if (!size) size = sizeof(buf); ret_len = 0; status = pNtQueryInformationProcess(hproc, i, buf, info_size[i], &ret_len); if (status == STATUS_NOT_IMPLEMENTED) continue; -- 2.34.1

2 1

[PATCH] kernel32/tests: Ensure auto_value.data is initialized in test_ExitCode (Coverity)
by Alex Henrie 26 Dec '21

26 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/tests/debugger.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 0955025a650..8b82aaecb9e 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -752,7 +752,11 @@ static void test_ExitCode(void) ok(0, "could not open the AeDebug key: %d\n", ret); return; } - else debugger_value.data = NULL; + else + { + auto_value.data = NULL; + debugger_value.data = NULL; + } if (debugger_value.data && debugger_value.type == REG_SZ && strstr((char*)debugger_value.data, "winedbg --auto")) -- 2.34.1

2 1

[PATCH] kernel32/tests: Check return value of NtGetNlsSectionPtr in test_GetCPInfo (Coverity)
by Alex Henrie 26 Dec '21

26 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/tests/locale.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 1f30547df5b..d64a08666f8 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4043,6 +4043,7 @@ static void test_GetCPInfo(void) ok( !status, "failed %x\n", status ); ok( size > 0x1000 && size <= 0x8000 , "wrong size %lx\n", size ); status = pNtGetNlsSectionPtr( 10, 0, NULL, &ptr2, &size ); + ok( !status, "failed %x\n", status ); ok( ptr != ptr2, "got same pointer\n" ); ret = UnmapViewOfFile( ptr ); ok( ret, "UnmapViewOfFile failed err %u\n", GetLastError() ); -- 2.34.1

1 0

[PATCH vkd3d v2 1/3] vkd3d-compiler: Print usage instructions only if --help is specified.
by Zebediah Figura 26 Dec '21

26 Dec '21

vkd3d-compiler is hardly the only program to print usage instructions on all invalid invocations, but it's rather annoying to have one's whole screen wiped due to a typo. It also makes it hard to notice the actual error messages printed on e.g. `vkd3d-compiler -x`. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 4d7d628ca..4e56e8fa5 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -209,6 +209,7 @@ struct options enum vkd3d_shader_source_type source_type; enum vkd3d_shader_target_type target_type; bool preprocess_only; + bool print_help; bool print_version; bool print_source_types; bool print_target_types; @@ -446,6 +447,11 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->preprocess_only = true; break; + case 'h': + case OPTION_HELP: + options->print_help = true; + return true; + case OPTION_OUTPUT: case 'o': options->output_filename = optarg; @@ -623,9 +629,12 @@ int main(int argc, char **argv) int ret; if (!parse_command_line(argc, argv, &options)) + return 1; + + if (options.print_help) { print_usage(argv[0]); - return 1; + return 0; } if (options.print_version) -- 2.34.1

2 5

[PATCH vkd3d 1/3] vkd3d-compiler: Print usage instructions only if --help is specified.
by Zebediah Figura 26 Dec '21

26 Dec '21

vkd3d-compiler is hardly the only program to print usage instructions on all invalid invocations, but it's rather annoying to have one's whole screen wiped due to a typo. It also makes it hard to notice the actual error messages printed on e.g. `vkd3d-compiler -x`. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 4d7d628ca..4e56e8fa5 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -209,6 +209,7 @@ struct options enum vkd3d_shader_source_type source_type; enum vkd3d_shader_target_type target_type; bool preprocess_only; + bool print_help; bool print_version; bool print_source_types; bool print_target_types; @@ -446,6 +447,11 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->preprocess_only = true; break; + case 'h': + case OPTION_HELP: + options->print_help = true; + return true; + case OPTION_OUTPUT: case 'o': options->output_filename = optarg; @@ -623,9 +629,12 @@ int main(int argc, char **argv) int ret; if (!parse_command_line(argc, argv, &options)) + return 1; + + if (options.print_help) { print_usage(argv[0]); - return 1; + return 0; } if (options.print_version) -- 2.34.1

2 5

[PATCH v3] combase: Reorder hstring_private elements.
by Bernhard Kölbl 25 Dec '21

25 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51017 Debugging sessions and the official WinRT SDK show, that hstrings are aligned differently in memory, than they are currently used in Wine. E.g. The string buffer is stored at the end of hstring_private. Also if a string reference is created with WindowsCreateStringReference, a seperate pointer is used to point at the string-source. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- v3: Add nested hstring_header struct to hstring_private and add a test for both. v2: I was mistaken about no reference counting being used. --- dlls/combase/string.c | 127 ++++++++++++++++++++++-------------- dlls/combase/tests/string.c | 71 +++++++++++++++++++- 2 files changed, 149 insertions(+), 49 deletions(-) diff --git a/dlls/combase/string.c b/dlls/combase/string.c index 2092e4360a3..0b676c1e965 100644 --- a/dlls/combase/string.c +++ b/dlls/combase/string.c @@ -26,44 +26,58 @@ WINE_DEFAULT_DEBUG_CHANNEL(winstring); -struct hstring_private +#define HSTRING_REFERENCE_FLAG 1 + +struct hstring_header { - LPWSTR buffer; + UINT32 flags; UINT32 length; - BOOL reference; - LONG refcount; + UINT32 padding1; + UINT32 padding2; + LPCWSTR ptr; }; +struct hstring_private +{ + struct hstring_header header; + LONG refcount; + WCHAR buffer[1]; +}; + + static const WCHAR empty[1]; -C_ASSERT(sizeof(struct hstring_private) <= sizeof(HSTRING_HEADER)); +C_ASSERT(sizeof(struct hstring_header) <= sizeof(HSTRING_HEADER)); static inline struct hstring_private *impl_from_HSTRING(HSTRING string) { - return (struct hstring_private *)string; + return (struct hstring_private *)string; } static inline struct hstring_private *impl_from_HSTRING_HEADER(HSTRING_HEADER *header) { - return (struct hstring_private *)header; + return CONTAINING_RECORD(header, struct hstring_private, header); } static inline struct hstring_private *impl_from_HSTRING_BUFFER(HSTRING_BUFFER buffer) { - return (struct hstring_private *)buffer; + return CONTAINING_RECORD(buffer, struct hstring_private, buffer); } static BOOL alloc_string(UINT32 len, HSTRING *out) { struct hstring_private *priv; - priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv) + (len + 1) * sizeof(*priv->buffer)); + priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv) + (len) * sizeof(*priv->buffer)); if (!priv) return FALSE; - priv->buffer = (LPWSTR)(priv + 1); - priv->length = len; - priv->reference = FALSE; + + priv->header.flags = 0; + priv->header.length = len; + priv->header.ptr = priv->buffer; + priv->refcount = 1; priv->buffer[len] = '\0'; + *out = (HSTRING)priv; return TRUE; } @@ -115,10 +129,12 @@ HRESULT WINAPI WindowsCreateStringReference(LPCWSTR ptr, UINT32 len, } if (ptr == NULL) return E_POINTER; - priv->buffer = (LPWSTR)ptr; - priv->length = len; - priv->reference = TRUE; - *out = (HSTRING)header; + + priv->header.ptr = (LPWSTR)ptr; + priv->header.length = len; + priv->header.flags = HSTRING_REFERENCE_FLAG; + + *out = (HSTRING)priv; return S_OK; } @@ -127,16 +143,21 @@ HRESULT WINAPI WindowsCreateStringReference(LPCWSTR ptr, UINT32 len, */ HRESULT WINAPI WindowsDeleteString(HSTRING str) { - struct hstring_private *priv = impl_from_HSTRING(str); + struct hstring_private *priv; TRACE("(%p)\n", str); if (str == NULL) return S_OK; - if (priv->reference) + + priv = impl_from_HSTRING(str); + + if(priv->header.flags == HSTRING_REFERENCE_FLAG) return S_OK; + if (InterlockedDecrement(&priv->refcount) == 0) HeapFree(GetProcessHeap(), 0, priv); + return S_OK; } @@ -156,8 +177,8 @@ HRESULT WINAPI WindowsDuplicateString(HSTRING str, HSTRING *out) *out = NULL; return S_OK; } - if (priv->reference) - return WindowsCreateString(priv->buffer, priv->length, out); + if (priv->header.flags == HSTRING_REFERENCE_FLAG) + return WindowsCreateString(priv->header.ptr, priv->header.length, out); InterlockedIncrement(&priv->refcount); *out = str; return S_OK; @@ -187,7 +208,7 @@ HRESULT WINAPI WindowsPreallocateStringBuffer(UINT32 len, WCHAR **outptr, return E_OUTOFMEMORY; priv = impl_from_HSTRING(str); *outptr = priv->buffer; - *out = (HSTRING_BUFFER)str; + *out = (HSTRING_BUFFER)&priv->buffer; return S_OK; } @@ -196,9 +217,17 @@ HRESULT WINAPI WindowsPreallocateStringBuffer(UINT32 len, WCHAR **outptr, */ HRESULT WINAPI WindowsDeleteStringBuffer(HSTRING_BUFFER buf) { + + struct hstring_private *priv; + TRACE("(%p)\n", buf); - return WindowsDeleteString((HSTRING)buf); + if(buf) + priv = impl_from_HSTRING_BUFFER(buf); + else + priv = NULL; + + return WindowsDeleteString((HSTRING)priv); } /*********************************************************************** @@ -217,9 +246,9 @@ HRESULT WINAPI WindowsPromoteStringBuffer(HSTRING_BUFFER buf, HSTRING *out) *out = NULL; return S_OK; } - if (priv->buffer[priv->length] != 0 || priv->reference || priv->refcount != 1) + if (priv->buffer[priv->header.length] != 0 || priv->header.flags == HSTRING_REFERENCE_FLAG || priv->refcount != 1) return E_INVALIDARG; - *out = (HSTRING)buf; + *out = (HSTRING)priv; return S_OK; } @@ -234,7 +263,7 @@ UINT32 WINAPI WindowsGetStringLen(HSTRING str) if (str == NULL) return 0; - return priv->length; + return priv->header.length; } /*********************************************************************** @@ -253,8 +282,9 @@ LPCWSTR WINAPI WindowsGetStringRawBuffer(HSTRING str, UINT32 *len) return empty; } if (len) - *len = priv->length; - return priv->buffer; + *len = priv->header.length; + + return priv->header.ptr; } /*********************************************************************** @@ -274,9 +304,10 @@ HRESULT WINAPI WindowsStringHasEmbeddedNull(HSTRING str, BOOL *out) *out = FALSE; return S_OK; } - for (i = 0; i < priv->length; i++) + for (i = 0; i < (priv->header.length); i++) { - if (priv->buffer[i] == '\0') + TRACE("->>>>>>>>>>>>>>%d,", i); + if (priv->header.ptr[i] == '\0') { *out = TRUE; return S_OK; @@ -305,7 +336,7 @@ HRESULT WINAPI WindowsSubstring(HSTRING str, UINT32 start, HSTRING *out) *out = NULL; return S_OK; } - return WindowsCreateString(&priv->buffer[start], len - start, out); + return WindowsCreateString(&priv->header.ptr[start], len - start, out); } /*********************************************************************** @@ -327,7 +358,7 @@ HRESULT WINAPI WindowsSubstringWithSpecifiedLength(HSTRING str, UINT32 start, UI *out = NULL; return S_OK; } - return WindowsCreateString(&priv->buffer[start], len, out); + return WindowsCreateString(&priv->header.ptr[start], len, out); } /*********************************************************************** @@ -347,16 +378,16 @@ HRESULT WINAPI WindowsConcatString(HSTRING str1, HSTRING str2, HSTRING *out) return WindowsDuplicateString(str2, out); if (str2 == NULL) return WindowsDuplicateString(str1, out); - if (!priv1->length && !priv2->length) + if (!priv1->header.length && !priv2->header.length) { *out = NULL; return S_OK; } - if (!alloc_string(priv1->length + priv2->length, out)) + if (!alloc_string(priv1->header.length + priv2->header.length, out)) return E_OUTOFMEMORY; priv = impl_from_HSTRING(*out); - memcpy(priv->buffer, priv1->buffer, priv1->length * sizeof(*priv1->buffer)); - memcpy(priv->buffer + priv1->length, priv2->buffer, priv2->length * sizeof(*priv2->buffer)); + memcpy(priv->buffer, priv1->header.ptr, priv1->header.length * sizeof(*priv1->buffer)); + memcpy(priv->buffer + priv1->header.length, priv2->header.ptr, priv2->header.length * sizeof(*priv2->buffer)); return S_OK; } @@ -371,7 +402,7 @@ BOOL WINAPI WindowsIsStringEmpty(HSTRING str) if (str == NULL) return TRUE; - return priv->length == 0; + return priv->header.length == 0; } /*********************************************************************** @@ -395,13 +426,13 @@ HRESULT WINAPI WindowsCompareStringOrdinal(HSTRING str1, HSTRING str2, INT32 *re } if (str1) { - buf1 = priv1->buffer; - len1 = priv1->length; + buf1 = priv1->header.ptr; + len1 = priv1->header.length; } if (str2) { - buf2 = priv2->buffer; - len2 = priv2->length; + buf2 = priv2->header.ptr; + len2 = priv2->header.length; } *res = CompareStringOrdinal(buf1, len1, buf2, len2, FALSE) - CSTR_EQUAL; return S_OK; @@ -418,19 +449,19 @@ HRESULT WINAPI WindowsTrimStringStart(HSTRING str1, HSTRING str2, HSTRING *out) TRACE("(%p, %p, %p)\n", str1, str2, out); - if (!out || !str2 || !priv2->length) + if (!out || !str2 || !priv2->header.length) return E_INVALIDARG; if (!str1) { *out = NULL; return S_OK; } - for (start = 0; start < priv1->length; start++) + for (start = 0; start < priv1->header.length; start++) { - if (!wmemchr(priv2->buffer, priv1->buffer[start], priv2->length)) + if (!wmemchr(priv2->header.ptr, priv1->header.ptr[start], priv2->header.length)) break; } - return start ? WindowsCreateString(&priv1->buffer[start], priv1->length - start, out) : + return start ? WindowsCreateString(&priv1->header.ptr[start], priv1->header.length - start, out) : WindowsDuplicateString(str1, out); } @@ -445,18 +476,18 @@ HRESULT WINAPI WindowsTrimStringEnd(HSTRING str1, HSTRING str2, HSTRING *out) TRACE("(%p, %p, %p)\n", str1, str2, out); - if (!out || !str2 || !priv2->length) + if (!out || !str2 || !priv2->header.length) return E_INVALIDARG; if (!str1) { *out = NULL; return S_OK; } - for (len = priv1->length; len > 0; len--) + for (len = priv1->header.length; len > 0; len--) { - if (!wmemchr(priv2->buffer, priv1->buffer[len - 1], priv2->length)) + if (!wmemchr(priv2->header.ptr, priv1->header.ptr[len - 1], priv2->header.length)) break; } - return (len < priv1->length) ? WindowsCreateString(priv1->buffer, len, out) : + return (len < priv1->header.length) ? WindowsCreateString(priv1->header.ptr, len, out) : WindowsDuplicateString(str1, out); } diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c index 5ebf669a426..f796bbeef18 100644 --- a/dlls/combase/tests/string.c +++ b/dlls/combase/tests/string.c @@ -37,7 +37,7 @@ static void _check_string(int line, HSTRING str, LPCWSTR content, UINT32 length, ok_(__FILE__, line)(WindowsIsStringEmpty(str) == empty, "WindowsIsStringEmpty failed\n"); ok_(__FILE__, line)(WindowsStringHasEmbeddedNull(str, &out_null) == S_OK, "WindowsStringHasEmbeddedNull failed\n"); - ok_(__FILE__, line)(out_null == has_null, "WindowsStringHasEmbeddedNull failed\n"); + ok_(__FILE__, line)(out_null == has_null, "WindowsStringHasEmbeddedNull failed. %d != %d \n", out_null, has_null); ok_(__FILE__, line)(WindowsGetStringLen(str) == length, "WindowsGetStringLen failed\n"); ptr = WindowsGetStringRawBuffer(str, &out_length); /* WindowsGetStringRawBuffer should return a non-null, null terminated empty string @@ -479,6 +479,74 @@ static void test_trim(void) ok(WindowsDeleteString(str1) == S_OK, "Failed to delete string\n"); } +static void test_hstring_struct(void) +{ + struct hstring_private + { + struct hstring_header + { + UINT32 flags; + UINT32 length; + UINT32 padding1; + UINT32 padding2; + LPCWSTR ptr; + }header; + LONG refcount; + WCHAR buffer[1]; + }; + + HSTRING str; + HSTRING str2; + HSTRING_HEADER hdr; + struct hstring_private* prv; + struct hstring_private* prv2; + + BOOL arch64 = (sizeof(void*) == 8); + + ok(arch64 ? (sizeof(prv->header) == 24) : (sizeof(prv->header) == 20), "hstring_header size incorrect!\n"); + + ok(WindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n"); + + prv = CONTAINING_RECORD(str, struct hstring_private, header); + + ok(prv->header.flags == 0, "Expected 0 in flags field, got 0x%x.\n", prv->header.flags); + ok(prv->header.length == 6, "Expected 6 in length field, got %d.\n", prv->header.length); + ok(prv->header.ptr != NULL, "Unexpected nullptr in ptr field.\n"); + ok(prv->refcount == 1, "Expected 1 in refcount, got %d.\n", prv->refcount); + ok(prv->header.ptr == prv->buffer, "Expected ptr to point at buffer, instead pointing at %p.\n", prv->header.ptr); + ok(wcscmp(input_string, prv->buffer) == 0, "Strings didn't match!\n"); + + trace("str ptr(%p), flags(%d), length(%d), padding1(%p), padding2(%p), ptr(%p), refcount(%d), str(%ls)->addr(%p)\n", + prv, prv->header.flags, prv->header.length, &prv->header.padding1, &prv->header.padding2, + prv->header.ptr, prv->refcount, prv->buffer, prv->buffer); + + ok(WindowsDuplicateString(str, &str2) == S_OK, "Failed to duplicate string\n"); + + prv2 = CONTAINING_RECORD(str2, struct hstring_private, header); + + ok(prv->refcount == 2, "Expected 2 in refcount, got %d.\n", prv->refcount); + ok(prv2->refcount == 2, "Expected 2 in refcount, got %d.\n", prv2->refcount); + ok(wcscmp(input_string, prv2->buffer) == 0, "Strings didn't match!\n"); + + ok(WindowsDeleteString(str) == S_OK, "Failed to delete string\n"); + + ok(prv->refcount == 1, "Expected 1 in refcount, got %d.\n", prv->refcount); + + ok(WindowsDeleteString(str) == S_OK, "Failed to delete string.\n"); + + ok(WindowsCreateStringReference(input_string, 6, &hdr, &str) == S_OK, "Failed to create string ref.\n"); + + prv = CONTAINING_RECORD(&hdr, struct hstring_private, header); + prv2 = CONTAINING_RECORD(str, struct hstring_private, header); + + ok(prv == prv2, "Pointers not identical.\n"); + ok(prv2->header.flags == 1, "HSTRING_REFERENCE_FLAG not set.\n"); + ok(prv2->header.length == 6, "Length incorrect.\n"); + ok(prv2->header.ptr == input_string, "Pointer not pointing at input string.\n"); + + ok(WindowsDeleteString(str) == S_OK, "Failed to delete string ref.\n"); +} + START_TEST(string) { test_create_delete(); @@ -489,4 +557,5 @@ START_TEST(string) test_concat(); test_compare(); test_trim(); + test_hstring_struct(); } -- 2.34.1

1 0

Re: [PATCH v2] combase: Reorder hstring_private elements.
by Nikolay Sivov 25 Dec '21

25 Dec '21

On 12/24/21 15:25, Bernhard wrote: > Thanks for your review Nikolay, > > Nikolay Sivov <nsivov(a)codeweavers.com> schrieb am Fr., 24. Dez. 2021, > 09:03: > > > > On 12/24/21 01:48, Bernhard Kölbl wrote: > > +#define HSTRING_REFERENCE_FLAG 1 > > + > > struct hstring_private > > { > > - LPWSTR buffer; > > + UINT32 flags; > > UINT32 length; > > - BOOL reference; > > - LONG refcount; > > + LONG refcount; > > + LPWSTR ptr; > > }; > From what I can tell this still doesn't match native layout. It also > might be slightly different for references. > > > Yes it actually doesn't match but I don't know if it really matters in > this case, because HSTRINGs seem to be passed with this data only. > E.g. in the provided bug, the RoGetActivationFactory function takes a > HSTRING as parameter, but WinRT actually passes a HSTRING_HEADER. > The first field in the HSTRING struct seems to only point at this > header struct. WinRT dereferences this pointer when passing the String. I don't follow. What do you mean by "WinRT passing a header" and "WinRT dereferencing this pointer" ? Where is this code? > > > > static BOOL alloc_string(UINT32 len, HSTRING *out) > > { > > struct hstring_private *priv; > > - priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv) + (len > + 1) * sizeof(*priv->buffer)); > > + priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv)); > > if (!priv) > > return FALSE; > > - priv->buffer = (LPWSTR)(priv + 1); > > + priv->ptr = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (len + > 1) * sizeof(*priv->ptr)); > I don't see this behaviour on Windows. > > > Could explain this one a bit more? (I'm not much into how Windows > libraries allocate memory.) Maybe I'm overseeing a obvious mistake. I don't think it's justified to have separate allocation for string buffer. > > > But anyway, do you have any idea why application would care? Is it > some > statically linked code depending on it, or some native module > bundled or > installed separately? > > > Well, the programs (also WinRT) from the Wine-bug suffer from the same > issue, which to me looks like is caused by the misarranged struct, > which I changed in this patch. They try to dereference the flags + > length field, which causes a crash or invalid data to be read. > I actually don't know why it worked in Wine before. Maybe by luck? > (Also: The code that arranges the HSTRING struct members in memory > this way, is compiled into the binary from the WinRT headers) Which headers in particular? I'd like to read through that, maybe we can easily match it. > > > If the layout is stable across Windows releases, we'll need tests > for it. > > > I think test are the best solution for our open questions. > > Happy holidays

2 1

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 25 Dec '21

25 Dec '21

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/po/fi.po b/po/fi.po index 434bc4c7305..dc8d41255c0 100644 --- a/po/fi.po +++ b/po/fi.po @@ -10523,22 +10523,16 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "(UTC+00:00) Dublin, Edinburgh, Lissabon, Lontoo" #: dlls/tzres/tzres.rc:342 -#, fuzzy -#| msgid "Sudan Standard Time" msgid "South Sudan Standard Time" -msgstr "Sudanin normaaliaika" +msgstr "Etelä-Sudanin normaaliaika" #: dlls/tzres/tzres.rc:343 -#, fuzzy -#| msgid "Sudan Daylight Time" msgid "South Sudan Daylight Time" -msgstr "Sudanin kesäaika" +msgstr "Etelä-Sudanin kesäaika" #: dlls/tzres/tzres.rc:344 -#, fuzzy -#| msgid "(UTC+02:00) Jerusalem" msgid "(UTC+02:00) Juba" -msgstr "(UTC+02:00) Jerusalem" +msgstr "(UTC+02:00) Juba" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" @@ -13219,10 +13213,8 @@ msgid "Active code page: %1!u!\n" msgstr "Aktiivinen koodisivu: %1!u!\n" #: programs/chcp.com/chcp.rc:29 -#, fuzzy -#| msgid "Invalid message.\n" msgid "Invalid code page\n" -msgstr "Viesti ei kelpaa.\n" +msgstr "Koodisivu ei kelpaa.\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -13241,7 +13233,7 @@ msgstr "" "\n" " numero Aktivoitava koodisivu.\n" "\n" -" CHCP ilman numeroa näyttää aktiivisen konsolin koodisivun.\n" +" CHCP ilman numeroa näyttää aktiivisen koodisivun.\n" "\n" #: programs/clock/clock.rc:32 -- 2.34.1

1 0

[PATCH 1/5] dinput8/tests: Add some RegisterDeviceNotificationA and hotplug tests.
by Rémi Bernon 24 Dec '21

24 Dec '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput8/tests/hid.c | 388 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 388 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 3b88dc4ea21..bd51d27580a 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -44,6 +44,7 @@ #define COBJMACROS #include "wingdi.h" +#include "dbt.h" #include "dinput.h" #include "dinputd.h" #include "mmsystem.h" @@ -9964,6 +9965,391 @@ done: SetCurrentDirectoryW( cwd ); } +static int device_change_count; +static int device_change_expect; +static HWND device_change_hwnd; +static BOOL device_change_all; + +static BOOL all_upper( const WCHAR *str, const WCHAR *end ) +{ + while (str++ != end) if (towupper( str[-1] ) != str[-1]) return FALSE; + return TRUE; +} + +static BOOL all_lower( const WCHAR *str, const WCHAR *end ) +{ + while (str++ != end) if (towlower( str[-1] ) != str[-1]) return FALSE; + return TRUE; +} + +static LRESULT CALLBACK devnotify_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + if (msg == WM_DEVICECHANGE) + { + DEV_BROADCAST_HDR *header = (DEV_BROADCAST_HDR *)lparam; + DEV_BROADCAST_DEVICEINTERFACE_W *iface = (DEV_BROADCAST_DEVICEINTERFACE_W *)lparam; + const WCHAR *upper_end, *name_end, *expect_prefix; + GUID expect_guid; + + if (device_change_all && (device_change_count == 0 || device_change_count == 3)) + { + expect_guid = control_class; + expect_prefix = L"\\\\?\\ROOT#"; + } + else + { + expect_guid = GUID_DEVINTERFACE_HID; + expect_prefix = L"\\\\?\\HID#"; + } + + ok( hwnd == device_change_hwnd, "got hwnd %p\n", hwnd ); + ok( header->dbch_devicetype == DBT_DEVTYP_DEVICEINTERFACE, "got dbch_devicetype %u\n", + header->dbch_devicetype ); + + winetest_push_context( "%u", device_change_count ); + + todo_wine_if( IsEqualGUID( &iface->dbcc_classguid, &control_class ) && !device_change_all ) + ok( IsEqualGUID( &iface->dbcc_classguid, &expect_guid ), "got dbch_classguid %s\n", + debugstr_guid( &iface->dbcc_classguid ) ); + ok( iface->dbcc_size >= offsetof( DEV_BROADCAST_DEVICEINTERFACE_W, dbcc_name[wcslen( iface->dbcc_name ) + 1] ), + "got dbcc_size %u\n", iface->dbcc_size ); + todo_wine + ok( !wcsncmp( iface->dbcc_name, expect_prefix, wcslen( expect_prefix ) ), + "got dbcc_name %s\n", debugstr_w(iface->dbcc_name) ); + + upper_end = wcschr( iface->dbcc_name + wcslen( expect_prefix ), '#' ); + name_end = iface->dbcc_name + wcslen( iface->dbcc_name ) + 1; + ok( !!upper_end, "got dbcc_name %s\n", debugstr_w(iface->dbcc_name) ); + todo_wine + ok( all_upper( iface->dbcc_name, upper_end ), "got dbcc_name %s\n", debugstr_w(iface->dbcc_name) ); + ok( all_lower( upper_end, name_end ), "got dbcc_name %s\n", debugstr_w(iface->dbcc_name) ); + + if (device_change_count++ >= device_change_expect / 2) + ok( wparam == DBT_DEVICEREMOVECOMPLETE, "got wparam %#x\n", (DWORD)wparam ); + else + ok( wparam == DBT_DEVICEARRIVAL, "got wparam %#x\n", (DWORD)wparam ); + + winetest_pop_context(); + } + + return DefWindowProcW( hwnd, msg, wparam, lparam ); +} + +static DWORD WINAPI test_gamepad_driver_thread( void *arg ) +{ +#include "psh_hid_macros.h" + static const unsigned char gamepad_desc[] = + { + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_GAMEPAD), + COLLECTION(1, Application), + USAGE(1, HID_USAGE_GENERIC_GAMEPAD), + COLLECTION(1, Physical), + USAGE(1, HID_USAGE_GENERIC_X), + USAGE(1, HID_USAGE_GENERIC_Y), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 127), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 127), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 2), + INPUT(1, Data|Var|Abs), + + USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_MINIMUM(1, 1), + USAGE_MAXIMUM(1, 6), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_SIZE(1, 1), + REPORT_COUNT(1, 8), + INPUT(1, Data|Var|Abs), + END_COLLECTION, + END_COLLECTION, + }; +#include "pop_hid_macros.h" + static const HID_DEVICE_ATTRIBUTES attributes = + { + .Size = sizeof(HID_DEVICE_ATTRIBUTES), + .VendorID = LOWORD( EXPECT_VIDPID ), + .ProductID = HIWORD( EXPECT_VIDPID ), + .VersionNumber = 0x0100, + }; + static const HIDP_CAPS caps = + { + .InputReportByteLength = 3, + }; + + WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; + DWORD report_id = 1, polled = 0; + HANDLE stop_event = arg; + char context[64]; + LSTATUS status; + HKEY hkey; + + GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); + GetTempPathW( ARRAY_SIZE(tempdir), tempdir ); + SetCurrentDirectoryW( tempdir ); + + status = RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Services\\winetest", + 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL ); + ok( !status, "RegCreateKeyExW returned %#x\n", status ); + status = RegSetValueExW( hkey, L"ReportID", 0, REG_DWORD, (void *)&report_id, sizeof(report_id) ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + status = RegSetValueExW( hkey, L"PolledMode", 0, REG_DWORD, (void *)&polled, sizeof(polled) ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + status = RegSetValueExW( hkey, L"Descriptor", 0, REG_BINARY, (void *)gamepad_desc, sizeof(gamepad_desc) ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + status = RegSetValueExW( hkey, L"Attributes", 0, REG_BINARY, (void *)&attributes, sizeof(attributes) ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + status = RegSetValueExW( hkey, L"Caps", 0, REG_BINARY, (void *)&caps, sizeof(caps) ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + status = RegSetValueExW( hkey, L"Expect", 0, REG_BINARY, (void *)NULL, 0 ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + status = RegSetValueExW( hkey, L"Input", 0, REG_BINARY, NULL, 0 ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + fill_context( __LINE__, context, ARRAY_SIZE(context) ); + status = RegSetValueExW( hkey, L"Context", 0, REG_BINARY, (void *)context, sizeof(context) ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + + pnp_driver_start( L"driver_hid.dll" ); + WaitForSingleObject( stop_event, INFINITE ); + pnp_driver_stop(); + + SetCurrentDirectoryW( cwd ); + + return 0; +} + +static void test_RegisterDeviceNotification(void) +{ + DEV_BROADCAST_DEVICEINTERFACE_A iface_filter_a = + { + .dbcc_size = sizeof(DEV_BROADCAST_DEVICEINTERFACE_A), + .dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE, + .dbcc_classguid = GUID_DEVINTERFACE_HID, + }; + WNDCLASSEXW class = + { + .cbSize = sizeof(WNDCLASSEXW), + .hInstance = GetModuleHandleW( NULL ), + .lpszClassName = L"devnotify", + .lpfnWndProc = devnotify_wndproc, + }; + char buffer[1024] = {0}; + DEV_BROADCAST_HDR *header = (DEV_BROADCAST_HDR *)buffer; + HANDLE hwnd, thread, stop_event; + HDEVNOTIFY devnotify; + MSG msg; + + RegisterClassExW( &class ); + + hwnd = CreateWindowW( class.lpszClassName, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL ); + ok( !!hwnd, "CreateWindowW failed, error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + devnotify = RegisterDeviceNotificationA( NULL, NULL, 0 ); + todo_wine + ok( !devnotify, "RegisterDeviceNotificationA succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError() ); + if (devnotify) UnregisterDeviceNotification( devnotify ); + + SetLastError( 0xdeadbeef ); + devnotify = RegisterDeviceNotificationA( (HWND)0xdeadbeef, NULL, 0 ); + todo_wine + ok( !devnotify, "RegisterDeviceNotificationA succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError() ); + if (devnotify) UnregisterDeviceNotification( devnotify ); + + SetLastError( 0xdeadbeef ); + devnotify = RegisterDeviceNotificationA( hwnd, NULL, 2 ); + todo_wine + ok( !devnotify, "RegisterDeviceNotificationA succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError() ); + if (devnotify) UnregisterDeviceNotification( devnotify ); + + SetLastError( 0xdeadbeef ); + memset( header, 0, sizeof(DEV_BROADCAST_OEM) ); + header->dbch_size = sizeof(DEV_BROADCAST_OEM); + header->dbch_devicetype = DBT_DEVTYP_OEM; + devnotify = RegisterDeviceNotificationA( hwnd, header, 0 ); + todo_wine + ok( !devnotify, "RegisterDeviceNotificationA succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_INVALID_DATA, "got error %u\n", GetLastError() ); + if (devnotify) UnregisterDeviceNotification( devnotify ); + + SetLastError( 0xdeadbeef ); + memset( header, 0, sizeof(DEV_BROADCAST_DEVNODE) ); + header->dbch_size = sizeof(DEV_BROADCAST_DEVNODE); + header->dbch_devicetype = DBT_DEVTYP_DEVNODE; + devnotify = RegisterDeviceNotificationA( hwnd, header, 0 ); + todo_wine + ok( !devnotify, "RegisterDeviceNotificationA succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_INVALID_DATA, "got error %u\n", GetLastError() ); + if (devnotify) UnregisterDeviceNotification( devnotify ); + + SetLastError( 0xdeadbeef ); + memset( header, 0, sizeof(DEV_BROADCAST_VOLUME) ); + header->dbch_size = sizeof(DEV_BROADCAST_VOLUME); + header->dbch_devicetype = DBT_DEVTYP_VOLUME; + devnotify = RegisterDeviceNotificationA( hwnd, header, 0 ); + todo_wine + ok( !devnotify, "RegisterDeviceNotificationA succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_INVALID_DATA, "got error %u\n", GetLastError() ); + if (devnotify) UnregisterDeviceNotification( devnotify ); + + SetLastError( 0xdeadbeef ); + memset( header, 0, sizeof(DEV_BROADCAST_PORT_A) ); + header->dbch_size = sizeof(DEV_BROADCAST_PORT_A); + header->dbch_devicetype = DBT_DEVTYP_PORT; + devnotify = RegisterDeviceNotificationA( hwnd, header, 0 ); + todo_wine + ok( !devnotify, "RegisterDeviceNotificationA succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_INVALID_DATA, "got error %u\n", GetLastError() ); + if (devnotify) UnregisterDeviceNotification( devnotify ); + + SetLastError( 0xdeadbeef ); + memset( header, 0, sizeof(DEV_BROADCAST_NET) ); + header->dbch_size = sizeof(DEV_BROADCAST_NET); + header->dbch_devicetype = DBT_DEVTYP_NET; + devnotify = RegisterDeviceNotificationA( hwnd, header, 0 ); + todo_wine + ok( !devnotify, "RegisterDeviceNotificationA succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_INVALID_DATA, "got error %u\n", GetLastError() ); + if (devnotify) UnregisterDeviceNotification( devnotify ); + + devnotify = RegisterDeviceNotificationA( hwnd, &iface_filter_a, DEVICE_NOTIFY_WINDOW_HANDLE ); + ok( !!devnotify, "RegisterDeviceNotificationA failed, error %u\n", GetLastError() ); + + device_change_count = 0; + if (!strcmp( winetest_platform, "wine" )) device_change_expect = 4; + else device_change_expect = 2; + device_change_hwnd = hwnd; + device_change_all = FALSE; + stop_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( !!stop_event, "CreateEventW failed, error %u\n", GetLastError() ); + thread = CreateThread( NULL, 0, test_gamepad_driver_thread, stop_event, 0, NULL ); + ok( !!thread, "CreateThread failed, error %u\n", GetLastError() ); + + while (device_change_count < device_change_expect) + { + /* This may happen on a newly created prefix, if rpcss.exe started late and plugplay didn't connect */ + if (MsgWaitForMultipleObjectsEx( 0, NULL, 1000, QS_ALLINPUT, 0 ) == WAIT_TIMEOUT) + { + todo_wine + ok( 0, "Timeout while waiting for WM_DEVICECHANGE message.\n" ); + SetEvent( stop_event ); + break; + } + + while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) + { + TranslateMessage( &msg ); + ok( msg.message != WM_DEVICECHANGE, "got WM_DEVICECHANGE\n" ); + DispatchMessageW( &msg ); + } + if (device_change_count == device_change_expect / 2) SetEvent( stop_event ); + } + + WaitForSingleObject( thread, INFINITE ); + CloseHandle( thread ); + CloseHandle( stop_event ); + + UnregisterDeviceNotification( devnotify ); + + memcpy( buffer, &iface_filter_a, sizeof(iface_filter_a) ); + strcpy( ((DEV_BROADCAST_DEVICEINTERFACE_A *)buffer)->dbcc_name, "device name" ); + ((DEV_BROADCAST_DEVICEINTERFACE_A *)buffer)->dbcc_size += strlen( "device name" ) + 1; + devnotify = RegisterDeviceNotificationA( hwnd, buffer, DEVICE_NOTIFY_WINDOW_HANDLE ); + ok( !!devnotify, "RegisterDeviceNotificationA failed, error %u\n", GetLastError() ); + + device_change_count = 0; + if (!strcmp( winetest_platform, "wine" )) device_change_expect = 4; + else device_change_expect = 2; + device_change_hwnd = hwnd; + device_change_all = FALSE; + stop_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( !!stop_event, "CreateEventW failed, error %u\n", GetLastError() ); + thread = CreateThread( NULL, 0, test_gamepad_driver_thread, stop_event, 0, NULL ); + ok( !!thread, "CreateThread failed, error %u\n", GetLastError() ); + + while (device_change_count < device_change_expect) + { + /* This may happen on a newly created prefix, if rpcss.exe started late and plugplay didn't connect */ + if (MsgWaitForMultipleObjectsEx( 0, NULL, 1000, QS_ALLINPUT, 0 ) == WAIT_TIMEOUT) + { + todo_wine + ok( 0, "Timeout while waiting for WM_DEVICECHANGE message.\n" ); + SetEvent( stop_event ); + break; + } + + while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) + { + TranslateMessage( &msg ); + ok( msg.message != WM_DEVICECHANGE, "got WM_DEVICECHANGE\n" ); + DispatchMessageW( &msg ); + } + if (device_change_count == device_change_expect / 2) SetEvent( stop_event ); + } + + WaitForSingleObject( thread, INFINITE ); + CloseHandle( thread ); + CloseHandle( stop_event ); + + UnregisterDeviceNotification( devnotify ); + + devnotify = RegisterDeviceNotificationA( hwnd, &iface_filter_a, DEVICE_NOTIFY_ALL_INTERFACE_CLASSES ); + ok( !!devnotify, "RegisterDeviceNotificationA failed, error %u\n", GetLastError() ); + + device_change_count = 0; + device_change_expect = 4; + device_change_hwnd = hwnd; + device_change_all = TRUE; + stop_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( !!stop_event, "CreateEventW failed, error %u\n", GetLastError() ); + thread = CreateThread( NULL, 0, test_gamepad_driver_thread, stop_event, 0, NULL ); + ok( !!thread, "CreateThread failed, error %u\n", GetLastError() ); + + while (device_change_count < device_change_expect) + { + /* This may happen on a newly created prefix, if rpcss.exe started late and plugplay didn't connect */ + if (MsgWaitForMultipleObjectsEx( 0, NULL, 1000, QS_ALLINPUT, 0 ) == WAIT_TIMEOUT) + { + todo_wine + ok( 0, "Timeout while waiting for WM_DEVICECHANGE message.\n" ); + SetEvent( stop_event ); + break; + } + + while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) + { + TranslateMessage( &msg ); + ok( msg.message != WM_DEVICECHANGE, "got WM_DEVICECHANGE\n" ); + DispatchMessageW( &msg ); + } + if (device_change_count == device_change_expect / 2) SetEvent( stop_event ); + } + + WaitForSingleObject( thread, INFINITE ); + CloseHandle( thread ); + CloseHandle( stop_event ); + + UnregisterDeviceNotification( devnotify ); + + DestroyWindow( hwnd ); + UnregisterClassW( class.lpszClassName, class.hInstance ); +} + START_TEST( hid ) { HANDLE mapping; @@ -10003,6 +10389,8 @@ START_TEST( hid ) test_hid_driver( 0, TRUE ); test_hid_driver( 1, TRUE ); + test_RegisterDeviceNotification(); + CoInitialize( NULL ); if (test_device_types( 0x800 )) { -- 2.34.1

2 10

[PATCH v2] winex11.drv: Fix import XA_STRING compatible wide character.
by Chao Long 24 Dec '21

24 Dec '21

Drag text from the html or word to the wine application to display garbled characters. Signed-off-by: Chao Long <longchao(a)uniontech.com> --- dlls/winex11.drv/clipboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index a13d0a55b76..5148e4cc5ec 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -157,8 +157,8 @@ static const struct { { 0, CF_UNICODETEXT, XATOM_UTF8_STRING, import_utf8_string, export_utf8_string }, { 0, CF_UNICODETEXT, XATOM_COMPOUND_TEXT, import_compound_text, export_compound_text }, - { 0, CF_UNICODETEXT, XA_STRING, import_string, export_string }, - { 0, CF_UNICODETEXT, XATOM_text_plain, import_string, export_string }, + { 0, CF_UNICODETEXT, XA_STRING, import_utf8_string, export_utf8_string }, + { 0, CF_UNICODETEXT, XATOM_text_plain, import_utf8_string, export_utf8_string }, { 0, CF_UNICODETEXT, XATOM_TEXT, import_text, export_text }, { 0, CF_SYLK, XATOM_WCF_SYLK, import_data, export_data }, { 0, CF_DIF, XATOM_WCF_DIF, import_data, export_data }, -- 2.20.1

2 1

[PATCH] taskmgr: Select process on switch from application to process
by David Kahurani 24 Dec '21

24 Dec '21

Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- programs/taskmgr/applpage.c | 22 ++++++++++++++-------- programs/taskmgr/perfdata.c | 21 +++++++++++++++++++++ programs/taskmgr/perfdata.h | 1 + 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index b35881c2..0cf9f48d 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -28,6 +28,7 @@ #include <commctrl.h> #include "taskmgr.h" +#include "perfdata.h" typedef struct { @@ -790,15 +791,20 @@ void ApplicationPage_OnGotoProcess(void) } if (pAPLI) { DWORD dwProcessId; + int index; + memset(&item, 0, sizeof(LV_ITEMW)); + item.state = LVIS_SELECTED | LVIS_FOCUSED; + item.stateMask = LVIS_SELECTED | LVIS_FOCUSED; - GetWindowThreadProcessId(pAPLI->hWnd, &dwProcessId); - /* - * Switch to the process tab - */ - SendMessageW(hTabWnd, TCM_SETCURFOCUS, 1, 0); - /* - * FIXME: Select the process item in the list - */ + GetWindowThreadProcessId(pAPLI->hWnd, &dwProcessId); + /* + * Switch to the process tab + */ + SendMessageW(hTabWnd, TCM_SETCURFOCUS, 1, 0); + + index = PerfDataGetProcessIndex(dwProcessId); + + SendMessageW(hProcessPageListCtrl, LVM_SETITEMSTATE, index, (LPARAM) &item); } } diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index 4498a2fe..e8dc8900 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -356,6 +356,27 @@ ULONG PerfDataGetProcessId(ULONG Index) return ProcessId; } +ULONG PerfDataGetProcessIndex(ULONG ProcessId) +{ + ULONG index; + + EnterCriticalSection(&PerfDataCriticalSection); + + for(index=0; index<ProcessCount; index++) + { + if(pPerfData[index].ProcessId == ProcessId) + break; + } + + LeaveCriticalSection(&PerfDataCriticalSection); + + if (index == ProcessCount) + return 0; + else + return index; +} + + BOOL PerfDataGetUserName(ULONG Index, LPWSTR lpUserName, int nMaxCount) { BOOL bSuccessful; diff --git a/programs/taskmgr/perfdata.h b/programs/taskmgr/perfdata.h index 615e7db2..ffc1d2d6 100644 --- a/programs/taskmgr/perfdata.h +++ b/programs/taskmgr/perfdata.h @@ -75,6 +75,7 @@ ULONG PerfDataGetProcessorSystemUsage(void); BOOL PerfDataGetImageName(ULONG Index, LPWSTR lpImageName, int nMaxCount); ULONG PerfDataGetProcessId(ULONG Index); +ULONG PerfDataGetProcessIndex(ULONG ProcessId); BOOL PerfDataGetUserName(ULONG Index, LPWSTR lpUserName, int nMaxCount); ULONG PerfDataGetSessionId(ULONG Index); ULONG PerfDataGetCPUUsage(ULONG Index); -- 2.25.1

1 0

[PATCH 1/4] user32: Uppercase the RawInput device names sans the GUID.
by Rémi Bernon 24 Dec '21

24 Dec '21

From: Arkadiusz Hiler <ahiler(a)codeweavers.com> This is a preparation for a patch that changes setupapi to return lowercased device paths, which is the source of RawInput device name here. On Windows RawInput returns mostly uppercase names (except the GUID) and we want to keep that behavior. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- First two patches have been in Proton for a long while. They aren't directly related to the SDL issue described in PATCH 3, and as we're already using upper case device paths it's possible to skip them. However they fix some other kind of hotplug problem, and so I think they are related and worth having. Then, because SDL checks for uppercase "IG_", we need PATCH 1 before PATCH 2. I'm a bit unsure about PATCH 4, as creating a (msg) window in DllMain is probably not great, but I don't really how else we can make sure XInput gets notified first. It would be better to avoid refreshing the device list on every call. dlls/user32/rawinput.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index f3dc4ae67de..a774f12231b 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -101,6 +101,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) struct device *device = NULL; UINT32 handle; HANDLE file; + WCHAR *pos; DWORD i, size, type; SetupDiGetDeviceInterfaceDetailW(set, iface, NULL, 0, &size, &device_data); @@ -125,6 +126,9 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) detail->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); SetupDiGetDeviceInterfaceDetailW(set, iface, detail, size, NULL, NULL); + /* upper case everything but the GUID */ + for (pos = detail->DevicePath; *pos && *pos != '{'; pos++) *pos = towupper(*pos); + file = CreateFileW(detail->DevicePath, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); if (file == INVALID_HANDLE_VALUE) -- 2.34.1

2 6

[tools 1/2] testbot/SetWinLocale: Check that the locale changes took effect.
by Francois Gouget 24 Dec '21

24 Dec '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- It's more practical than running WineTest just for that and there are quite a few cases where the desired changes don't in fact happen. testbot/bin/SetWinLocale | 107 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 4f50ed555c..135c7b9b48 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -608,6 +608,62 @@ if ($OptShow) } +# +# Helper to get the LCIDs +# + +my (%WinLCIDs, %WinKeyboardIds); + +sub GetWinKeyboardIds($) +{ + my ($Locale) = @_; + + # Look for that locale's keyboard id. + # Its first component is the locale's LCID. + my $Values = RegGetValues("$HKCU_USER_PROFILE\\$Locale", "*:*"); + foreach my $VName (keys %$Values) + { + next if ($VName !~ /^[0-9A-F]{4}:/); + $WinKeyboardIds{$Locale} = [$VName]; + last; + } + $WinKeyboardIds{$Locale} ||= $Keyboards{$Locale}; + if (!$WinKeyboardIds{$Locale}) + { + FatalError("could not find the $Locale LCID and keyboard ids\n"); + } + + my $WinLCID = uc($WinKeyboardIds{$Locale}->[0]); + $WinLCID =~ s/:.*$//; + $WinLCIDs{$Locale} = $WinLCID; + + # Check our builtin information + if ($Keyboards{$Locale}) + { + my $LCID = uc($Keyboards{$Locale}->[0]); + $LCID =~ s/:.*$//; + if ($LCID ne $WinLCID) + { + FatalError("inconsistent $Locale LCID: expected $LCID, got $WinLCID\n"); + } + } + + return $WinKeyboardIds{$Locale}; +} + +sub GetLCID($) +{ + my ($Locale) = @_; + return undef if (!$Locale); + + GetWinKeyboardIds($Locale) if (!$WinLCIDs{$Locale}); + return $WinLCIDs{$Locale}; +} + +my $LCIDLocale = GetLCID($OptLocale); +my $LCIDSystem = GetLCID($OptSystem); + + # # Generate the intl.cpl configuration # @@ -738,5 +794,56 @@ if ($OptReboot) } } + +# +# Check that all the changes succeeded +# + +my $Success = 1; +sub CheckSetting($$$$;$) +{ + my ($Settings, $VName, $Expected, $For, $IgnoreCase) = @_; + + my $Value = $Settings->{$VName}; + if (defined $Value) + { + if ((!$IgnoreCase and $Value ne $Expected) or + ($IgnoreCase and uc($Value) ne uc($Expected))) + { + Error("expected $VName = $Expected but got $Value $For\n"); + $Success = 0; + } + } +} + +Debug(Elapsed($Start), " Checking the new locale settings\n"); +my $Settings = GetWinSettings($Debug); +ShowWinSettings($Settings) if ($Debug); +if ($OptLocale) +{ + CheckSetting($Settings, "Locale", "0000$LCIDLocale", "for --locale $OptLocale", 1); + CheckSetting($Settings, "LocaleName", $OptLocale, "for --locale $OptLocale"); +} +if ($OptKeyboard) +{ + CheckSetting($Settings, "InputMethod", $Keyboards{$OptKeyboard}->[0], "for --keyboard $OptKeyboard", 1); +} +if ($OptMUI) +{ + CheckSetting($Settings, "PreferredUILanguages", $OptMUI, "for --mui $OptMUI"); +} +if ($OptCountry) +{ + CheckSetting($Settings, "Country", $CountryId, "for --country $OptCountry"); + CheckSetting($Settings, "CountryName", $OptCountry, "for --country $OptCountry"); +} +if ($OptSystem) +{ + CheckSetting($Settings, "SysLanguage", $LCIDSystem, "for --system $OptSystem", 1); + CheckSetting($Settings, "SysLocale", "0000$LCIDSystem", "for --system $OptSystem", 1); +} +exit(1) if (!$Success); + + Debug(Elapsed($Start), " All done!\n"); exit(0); -- 2.30.2

1 1

[PATCH v2] combase: Reorder hstring_private elements.
by Bernhard Kölbl 24 Dec '21

24 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51017 Debugging sessions and the official WinRT SDK show, that the contained string is aligned at the end and the reference flag at the beginning of the hstring_private struct. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- v2: I was mistaken about no reference counting being used. --- dlls/combase/string.c | 85 +++++++++++++++++++++++++------------------ 1 file changed, 50 insertions(+), 35 deletions(-) diff --git a/dlls/combase/string.c b/dlls/combase/string.c index 2092e4360a3..32ca89d53a0 100644 --- a/dlls/combase/string.c +++ b/dlls/combase/string.c @@ -26,12 +26,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(winstring); +#define HSTRING_REFERENCE_FLAG 1 + struct hstring_private { - LPWSTR buffer; + UINT32 flags; UINT32 length; - BOOL reference; - LONG refcount; + LONG refcount; + LPWSTR ptr; }; static const WCHAR empty[1]; @@ -40,30 +42,30 @@ C_ASSERT(sizeof(struct hstring_private) <= sizeof(HSTRING_HEADER)); static inline struct hstring_private *impl_from_HSTRING(HSTRING string) { - return (struct hstring_private *)string; + return (struct hstring_private *)string; } static inline struct hstring_private *impl_from_HSTRING_HEADER(HSTRING_HEADER *header) { - return (struct hstring_private *)header; + return (struct hstring_private *)header; } static inline struct hstring_private *impl_from_HSTRING_BUFFER(HSTRING_BUFFER buffer) { - return (struct hstring_private *)buffer; + return CONTAINING_RECORD(buffer, struct hstring_private, ptr); } static BOOL alloc_string(UINT32 len, HSTRING *out) { struct hstring_private *priv; - priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv) + (len + 1) * sizeof(*priv->buffer)); + priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv)); if (!priv) return FALSE; - priv->buffer = (LPWSTR)(priv + 1); + priv->ptr = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(*priv->ptr)); priv->length = len; - priv->reference = FALSE; + priv->flags = 0; priv->refcount = 1; - priv->buffer[len] = '\0'; + priv->ptr[len] = '\0'; *out = (HSTRING)priv; return TRUE; } @@ -90,7 +92,7 @@ HRESULT WINAPI WindowsCreateString(LPCWSTR ptr, UINT32 len, if (!alloc_string(len, out)) return E_OUTOFMEMORY; priv = impl_from_HSTRING(*out); - memcpy(priv->buffer, ptr, len * sizeof(*priv->buffer)); + memcpy(priv->ptr, ptr, len * sizeof(*priv->ptr)); return S_OK; } @@ -115,10 +117,10 @@ HRESULT WINAPI WindowsCreateStringReference(LPCWSTR ptr, UINT32 len, } if (ptr == NULL) return E_POINTER; - priv->buffer = (LPWSTR)ptr; + priv->ptr = (LPWSTR)ptr; priv->length = len; - priv->reference = TRUE; - *out = (HSTRING)header; + priv->flags = HSTRING_REFERENCE_FLAG; + *out = (HSTRING)priv; return S_OK; } @@ -127,16 +129,21 @@ HRESULT WINAPI WindowsCreateStringReference(LPCWSTR ptr, UINT32 len, */ HRESULT WINAPI WindowsDeleteString(HSTRING str) { - struct hstring_private *priv = impl_from_HSTRING(str); + struct hstring_private *priv; TRACE("(%p)\n", str); if (str == NULL) return S_OK; - if (priv->reference) + + priv = impl_from_HSTRING(str); + + if(priv->flags == 0) return S_OK; + if (InterlockedDecrement(&priv->refcount) == 0) HeapFree(GetProcessHeap(), 0, priv); + return S_OK; } @@ -156,8 +163,8 @@ HRESULT WINAPI WindowsDuplicateString(HSTRING str, HSTRING *out) *out = NULL; return S_OK; } - if (priv->reference) - return WindowsCreateString(priv->buffer, priv->length, out); + if (priv->flags == HSTRING_REFERENCE_FLAG) + return WindowsCreateString(priv->ptr, priv->length, out); InterlockedIncrement(&priv->refcount); *out = str; return S_OK; @@ -186,8 +193,8 @@ HRESULT WINAPI WindowsPreallocateStringBuffer(UINT32 len, WCHAR **outptr, if (!alloc_string(len, &str)) return E_OUTOFMEMORY; priv = impl_from_HSTRING(str); - *outptr = priv->buffer; - *out = (HSTRING_BUFFER)str; + *outptr = priv->ptr; + *out = (HSTRING_BUFFER)&priv->ptr; return S_OK; } @@ -196,9 +203,17 @@ HRESULT WINAPI WindowsPreallocateStringBuffer(UINT32 len, WCHAR **outptr, */ HRESULT WINAPI WindowsDeleteStringBuffer(HSTRING_BUFFER buf) { + + struct hstring_private *priv; + TRACE("(%p)\n", buf); - return WindowsDeleteString((HSTRING)buf); + if(buf) + priv = impl_from_HSTRING_BUFFER(buf); + else + priv = NULL; + + return WindowsDeleteString((HSTRING)priv); } /*********************************************************************** @@ -217,9 +232,9 @@ HRESULT WINAPI WindowsPromoteStringBuffer(HSTRING_BUFFER buf, HSTRING *out) *out = NULL; return S_OK; } - if (priv->buffer[priv->length] != 0 || priv->reference || priv->refcount != 1) + if (priv->ptr[priv->length] != 0 || priv->flags == HSTRING_REFERENCE_FLAG || priv->refcount != 1) return E_INVALIDARG; - *out = (HSTRING)buf; + *out = (HSTRING)priv; return S_OK; } @@ -254,7 +269,7 @@ LPCWSTR WINAPI WindowsGetStringRawBuffer(HSTRING str, UINT32 *len) } if (len) *len = priv->length; - return priv->buffer; + return priv->ptr; } /*********************************************************************** @@ -276,7 +291,7 @@ HRESULT WINAPI WindowsStringHasEmbeddedNull(HSTRING str, BOOL *out) } for (i = 0; i < priv->length; i++) { - if (priv->buffer[i] == '\0') + if (priv->ptr[i] == '\0') { *out = TRUE; return S_OK; @@ -305,7 +320,7 @@ HRESULT WINAPI WindowsSubstring(HSTRING str, UINT32 start, HSTRING *out) *out = NULL; return S_OK; } - return WindowsCreateString(&priv->buffer[start], len - start, out); + return WindowsCreateString(&priv->ptr[start], len - start, out); } /*********************************************************************** @@ -327,7 +342,7 @@ HRESULT WINAPI WindowsSubstringWithSpecifiedLength(HSTRING str, UINT32 start, UI *out = NULL; return S_OK; } - return WindowsCreateString(&priv->buffer[start], len, out); + return WindowsCreateString(&priv->ptr[start], len, out); } /*********************************************************************** @@ -355,8 +370,8 @@ HRESULT WINAPI WindowsConcatString(HSTRING str1, HSTRING str2, HSTRING *out) if (!alloc_string(priv1->length + priv2->length, out)) return E_OUTOFMEMORY; priv = impl_from_HSTRING(*out); - memcpy(priv->buffer, priv1->buffer, priv1->length * sizeof(*priv1->buffer)); - memcpy(priv->buffer + priv1->length, priv2->buffer, priv2->length * sizeof(*priv2->buffer)); + memcpy(priv->ptr, priv1->ptr, priv1->length * sizeof(*priv1->ptr)); + memcpy(priv->ptr + priv1->length, priv2->ptr, priv2->length * sizeof(*priv2->ptr)); return S_OK; } @@ -395,12 +410,12 @@ HRESULT WINAPI WindowsCompareStringOrdinal(HSTRING str1, HSTRING str2, INT32 *re } if (str1) { - buf1 = priv1->buffer; + buf1 = priv1->ptr; len1 = priv1->length; } if (str2) { - buf2 = priv2->buffer; + buf2 = priv2->ptr; len2 = priv2->length; } *res = CompareStringOrdinal(buf1, len1, buf2, len2, FALSE) - CSTR_EQUAL; @@ -427,10 +442,10 @@ HRESULT WINAPI WindowsTrimStringStart(HSTRING str1, HSTRING str2, HSTRING *out) } for (start = 0; start < priv1->length; start++) { - if (!wmemchr(priv2->buffer, priv1->buffer[start], priv2->length)) + if (!wmemchr(priv2->ptr, priv1->ptr[start], priv2->length)) break; } - return start ? WindowsCreateString(&priv1->buffer[start], priv1->length - start, out) : + return start ? WindowsCreateString(&priv1->ptr[start], priv1->length - start, out) : WindowsDuplicateString(str1, out); } @@ -454,9 +469,9 @@ HRESULT WINAPI WindowsTrimStringEnd(HSTRING str1, HSTRING str2, HSTRING *out) } for (len = priv1->length; len > 0; len--) { - if (!wmemchr(priv2->buffer, priv1->buffer[len - 1], priv2->length)) + if (!wmemchr(priv2->ptr, priv1->ptr[len - 1], priv2->length)) break; } - return (len < priv1->length) ? WindowsCreateString(priv1->buffer, len, out) : + return (len < priv1->length) ? WindowsCreateString(priv1->ptr, len, out) : WindowsDuplicateString(str1, out); } -- 2.34.1

2 1

[PATCH] winex11.drv: Print an error when the X server is not running in a 32-bit display mode.
by Zhiyi Zhang 24 Dec '21

24 Dec '21

Some games expect a 32-bit display mode to be present even though EnumDisplaySettings() doesn't report it. It's usually a configuration issue if the X server is not running in a 32-bit display mode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52258 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/x11drv_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 32beb84a009..e31f0a42113 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -599,6 +599,8 @@ static BOOL process_attach(void) init_pixmap_formats( display ); init_visuals( display, DefaultScreen( display )); screen_bpp = pixmap_formats[default_visual.depth]->bits_per_pixel; + if (screen_bpp != 32) + ERR("The X server is running in a %u-bit display mode. Expect problems.", screen_bpp); XInternAtoms( display, (char **)atom_names, NB_XATOMS - FIRST_XATOM, False, X11DRV_Atoms ); -- 2.32.0

1 0

[PATCH resend 1/2] ws2_32: Don't read more than necessary from the inputs in select().
by Torge Matthies 24 Dec '21

24 Dec '21

.NET Framework / old .NET Core seems to allocate not more space than necessary for the fd_set inputs, so if the allocation fell on the edge of the end of the heap, Wine tried to read past it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52259 Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/ws2_32/socket.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 648284c10a3..446cbd0b469 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2395,9 +2395,9 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, FD_ZERO( &read ); FD_ZERO( &write ); FD_ZERO( &except ); - if (read_ptr) read = *read_ptr; - if (write_ptr) write = *write_ptr; - if (except_ptr) except = *except_ptr; + if (read_ptr) read.fd_count = read_ptr->fd_count; + if (write_ptr) write.fd_count = write_ptr->fd_count; + if (except_ptr) except.fd_count = except_ptr->fd_count; if (!(sync_event = get_sync_event())) return -1; @@ -2408,26 +2408,29 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, for (i = 0; i < read.fd_count; ++i) { - params->sockets[params->count].socket = read.fd_array[i]; + poll_socket = read_ptr->fd_array[i]; + read.fd_array[i] = poll_socket; + params->sockets[params->count].socket = poll_socket; params->sockets[params->count].flags = AFD_POLL_READ | AFD_POLL_ACCEPT | AFD_POLL_HUP; ++params->count; - poll_socket = read.fd_array[i]; } for (i = 0; i < write.fd_count; ++i) { - params->sockets[params->count].socket = write.fd_array[i]; + poll_socket = write_ptr->fd_array[i]; + write.fd_array[i] = poll_socket; + params->sockets[params->count].socket = poll_socket; params->sockets[params->count].flags = AFD_POLL_WRITE; ++params->count; - poll_socket = write.fd_array[i]; } for (i = 0; i < except.fd_count; ++i) { - params->sockets[params->count].socket = except.fd_array[i]; + poll_socket = except_ptr->fd_array[i]; + except.fd_array[i] = poll_socket; + params->sockets[params->count].socket = poll_socket; params->sockets[params->count].flags = AFD_POLL_OOB | AFD_POLL_CONNECT_ERR; ++params->count; - poll_socket = except.fd_array[i]; } if (!params->count) @@ -2450,9 +2453,9 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, if (!status) { /* pointers may alias, so clear them all first */ - if (read_ptr) FD_ZERO( read_ptr ); - if (write_ptr) FD_ZERO( write_ptr ); - if (except_ptr) FD_ZERO( except_ptr ); + if (read_ptr) read_ptr->fd_count = 0; + if (write_ptr) write_ptr->fd_count = 0; + if (except_ptr) except_ptr->fd_count = 0; for (i = 0; i < params->count; ++i) { -- 2.34.1

1 1

[PATCH v3] msado15: Some interface parts need a 64-bit type on amd64.
by Bernhard Übelacker 23 Dec '21

23 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50842 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- Supersedes 222557. v3: Dropped the _WIN64 patch for widl and fixed definition of ADO_LONGPTR. Fixed a few resulting format string warnings. But the "warning: can't write value of type 20 yet" remains. v2: Missed some warnings about incompatible types. --- dlls/msado15/command.c | 4 +-- dlls/msado15/connection.c | 9 ++++++- dlls/msado15/recordset.c | 42 +++++++++++++++---------------- dlls/msado15/stream.c | 12 ++++----- dlls/msado15/tests/msado15.c | 45 +++++++++++++++++---------------- include/msado15_backcompat.idl | 46 +++++++++++++++++++--------------- 6 files changed, 87 insertions(+), 71 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index 8c8ec79a58e..63ec9b23a01 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -234,10 +234,10 @@ static HRESULT WINAPI command_Execute( _Command *iface, VARIANT *affected, VARIA } static HRESULT WINAPI command_CreateParameter( _Command *iface, BSTR name, DataTypeEnum type, - ParameterDirectionEnum direction, LONG size, VARIANT value, + ParameterDirectionEnum direction, ADO_LONGPTR size, VARIANT value, _Parameter **parameter ) { - FIXME( "%p, %s, %d, %d, %d, %p\n", iface, debugstr_w(name), type, direction, size, parameter ); + FIXME( "%p, %s, %d, %d, %ld, %p\n", iface, debugstr_w(name), type, direction, size, parameter ); return E_NOTIMPL; } diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index ce7750fef66..1dfae0b7821 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -336,8 +336,15 @@ static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARI if (records_affected) { + ADO_LONGPTR records_affected_lp; + _Recordset_get_RecordCount(recordset, &records_affected_lp); +#ifdef _WIN64 + V_VT(records_affected) = VT_I8; + V_I8(records_affected) = records_affected_lp; +#else V_VT(records_affected) = VT_I4; - _Recordset_get_RecordCount(recordset, &V_I4(records_affected)); + V_I4(records_affected) = records_affected_lp; +#endif } *record_set = recordset; diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 92a0deb6959..81098a31144 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -69,7 +69,7 @@ struct field LONG refs; WCHAR *name; DataTypeEnum type; - LONG defined_size; + ADO_LONGPTR defined_size; LONG attrs; LONG index; struct recordset *recordset; @@ -195,7 +195,7 @@ static HRESULT WINAPI field_get_Properties( Field *iface, Properties **obj ) return S_OK; } -static HRESULT WINAPI field_get_ActualSize( Field *iface, LONG *size ) +static HRESULT WINAPI field_get_ActualSize( Field *iface, ADO_LONGPTR *size ) { FIXME( "%p, %p\n", iface, size ); return E_NOTIMPL; @@ -211,7 +211,7 @@ static HRESULT WINAPI field_get_Attributes( Field *iface, LONG *attrs ) return S_OK; } -static HRESULT WINAPI field_get_DefinedSize( Field *iface, LONG *size ) +static HRESULT WINAPI field_get_DefinedSize( Field *iface, ADO_LONGPTR *size ) { struct field *field = impl_from_Field( iface ); @@ -360,11 +360,11 @@ static HRESULT WINAPI field_put_Type( Field *iface, DataTypeEnum type ) return S_OK; } -static HRESULT WINAPI field_put_DefinedSize( Field *iface, LONG size ) +static HRESULT WINAPI field_put_DefinedSize( Field *iface, ADO_LONGPTR size ) { struct field *field = impl_from_Field( iface ); - TRACE( "%p, %d\n", field, size ); + TRACE( "%p, %ld\n", field, size ); field->defined_size = size; return S_OK; @@ -829,11 +829,11 @@ static HRESULT append_field( struct fields *fields, BSTR name, DataTypeEnum type return S_OK; } -static HRESULT WINAPI fields__Append( Fields *iface, BSTR name, DataTypeEnum type, LONG size, FieldAttributeEnum attr ) +static HRESULT WINAPI fields__Append( Fields *iface, BSTR name, DataTypeEnum type, ADO_LONGPTR size, FieldAttributeEnum attr ) { struct fields *fields = impl_from_Fields( iface ); - TRACE( "%p, %s, %u, %d, %d\n", fields, debugstr_w(name), type, size, attr ); + TRACE( "%p, %s, %u, %ld, %d\n", fields, debugstr_w(name), type, size, attr ); return append_field( fields, name, type, size, attr, NULL ); } @@ -844,12 +844,12 @@ static HRESULT WINAPI fields_Delete( Fields *iface, VARIANT index ) return E_NOTIMPL; } -static HRESULT WINAPI fields_Append( Fields *iface, BSTR name, DataTypeEnum type, LONG size, FieldAttributeEnum attr, +static HRESULT WINAPI fields_Append( Fields *iface, BSTR name, DataTypeEnum type, ADO_LONGPTR size, FieldAttributeEnum attr, VARIANT value ) { struct fields *fields = impl_from_Fields( iface ); - TRACE( "%p, %s, %u, %d, %d, %s\n", fields, debugstr_w(name), type, size, attr, debugstr_variant(&value) ); + TRACE( "%p, %s, %u, %ld, %d, %s\n", fields, debugstr_w(name), type, size, attr, debugstr_variant(&value) ); return append_field( fields, name, type, size, attr, &value ); } @@ -1290,19 +1290,19 @@ static HRESULT WINAPI recordset_put_LockType( _Recordset *iface, LockTypeEnum lo return E_NOTIMPL; } -static HRESULT WINAPI recordset_get_MaxRecords( _Recordset *iface, LONG *max_records ) +static HRESULT WINAPI recordset_get_MaxRecords( _Recordset *iface, ADO_LONGPTR *max_records ) { FIXME( "%p, %p\n", iface, max_records ); return E_NOTIMPL; } -static HRESULT WINAPI recordset_put_MaxRecords( _Recordset *iface, LONG max_records ) +static HRESULT WINAPI recordset_put_MaxRecords( _Recordset *iface, ADO_LONGPTR max_records ) { - FIXME( "%p, %d\n", iface, max_records ); + FIXME( "%p, %ld\n", iface, max_records ); return E_NOTIMPL; } -static HRESULT WINAPI recordset_get_RecordCount( _Recordset *iface, LONG *count ) +static HRESULT WINAPI recordset_get_RecordCount( _Recordset *iface, ADO_LONGPTR *count ) { struct recordset *recordset = impl_from_Recordset( iface ); @@ -1392,9 +1392,9 @@ static HRESULT WINAPI recordset_GetRows( _Recordset *iface, LONG rows, VARIANT s return E_NOTIMPL; } -static HRESULT WINAPI recordset_Move( _Recordset *iface, LONG num_records, VARIANT start ) +static HRESULT WINAPI recordset_Move( _Recordset *iface, ADO_LONGPTR num_records, VARIANT start ) { - FIXME( "%p, %d, %s\n", iface, num_records, debugstr_variant(&start) ); + FIXME( "%p, %ld, %s\n", iface, num_records, debugstr_variant(&start) ); return E_NOTIMPL; } @@ -1591,7 +1591,7 @@ static HRESULT WINAPI recordset_put_Filter( _Recordset *iface, VARIANT criteria return E_NOTIMPL; } -static HRESULT WINAPI recordset_get_PageCount( _Recordset *iface, LONG *count ) +static HRESULT WINAPI recordset_get_PageCount( _Recordset *iface, ADO_LONGPTR *count ) { FIXME( "%p, %p\n", iface, count ); return E_NOTIMPL; @@ -1715,10 +1715,10 @@ static HRESULT WINAPI recordset_put_MarshalOptions( _Recordset *iface, MarshalOp return E_NOTIMPL; } -static HRESULT WINAPI recordset_Find( _Recordset *iface, BSTR criteria, LONG skip_records, +static HRESULT WINAPI recordset_Find( _Recordset *iface, BSTR criteria, ADO_LONGPTR skip_records, SearchDirectionEnum search_direction, VARIANT start ) { - FIXME( "%p, %s, %d, %d, %s\n", iface, debugstr_w(criteria), skip_records, search_direction, + FIXME( "%p, %s, %ld, %d, %s\n", iface, debugstr_w(criteria), skip_records, search_direction, debugstr_variant(&start) ); return E_NOTIMPL; } @@ -2061,17 +2061,17 @@ static HRESULT WINAPI rsconstruction_put_Rowset(ADORecordsetConstruction *iface, return S_OK; } -static HRESULT WINAPI rsconstruction_get_Chapter(ADORecordsetConstruction *iface, LONG *chapter) +static HRESULT WINAPI rsconstruction_get_Chapter(ADORecordsetConstruction *iface, ADO_LONGPTR *chapter) { struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); FIXME( "%p, %p\n", recordset, chapter ); return E_NOTIMPL; } -static HRESULT WINAPI rsconstruction_put_Chapter(ADORecordsetConstruction *iface, LONG chapter) +static HRESULT WINAPI rsconstruction_put_Chapter(ADORecordsetConstruction *iface, ADO_LONGPTR chapter) { struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); - FIXME( "%p, %d\n", recordset, chapter ); + FIXME( "%p, %ld\n", recordset, chapter ); return E_NOTIMPL; } diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 424ba722a26..ef5de1b74f8 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -144,7 +144,7 @@ static HRESULT WINAPI stream_Invoke( _Stream *iface, DISPID member, REFIID riid, return hr; } -static HRESULT WINAPI stream_get_Size( _Stream *iface, LONG *size ) +static HRESULT WINAPI stream_get_Size( _Stream *iface, ADO_LONGPTR *size ) { struct stream *stream = impl_from_Stream( iface ); TRACE( "%p, %p\n", stream, size ); @@ -166,7 +166,7 @@ static HRESULT WINAPI stream_get_EOS( _Stream *iface, VARIANT_BOOL *eos ) return S_OK; } -static HRESULT WINAPI stream_get_Position( _Stream *iface, LONG *pos ) +static HRESULT WINAPI stream_get_Position( _Stream *iface, ADO_LONGPTR *pos ) { struct stream *stream = impl_from_Stream( iface ); TRACE( "%p, %p\n", stream, pos ); @@ -191,12 +191,12 @@ static HRESULT resize_buffer( struct stream *stream, LONG size ) return S_OK; } -static HRESULT WINAPI stream_put_Position( _Stream *iface, LONG pos ) +static HRESULT WINAPI stream_put_Position( _Stream *iface, ADO_LONGPTR pos ) { struct stream *stream = impl_from_Stream( iface ); HRESULT hr; - TRACE( "%p, %d\n", stream, pos ); + TRACE( "%p, %ld\n", stream, pos ); if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); if (pos < 0) return MAKE_ADO_HRESULT( adErrInvalidArgument ); @@ -406,9 +406,9 @@ static HRESULT WINAPI stream_SetEOS( _Stream *iface ) return resize_buffer( stream, stream->pos ); } -static HRESULT WINAPI stream_CopyTo( _Stream *iface, _Stream *dst, LONG size ) +static HRESULT WINAPI stream_CopyTo( _Stream *iface, _Stream *dst, ADO_LONGPTR size ) { - FIXME( "%p, %p, %d\n", iface, dst, size ); + FIXME( "%p, %p, %ld\n", iface, dst, size ); return E_NOTIMPL; } diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 25c9c6f8356..39d4fdd4727 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -53,6 +53,7 @@ static void test_Recordset(void) Properties *props; Property *prop; LONG count, state; + ADO_LONGPTR count_lp; VARIANT missing, val, index; CursorLocationEnum location; CursorTypeEnum cursor; @@ -212,20 +213,20 @@ static void test_Recordset(void) hr = _Recordset_put_Bookmark( recordset, bookmark ); ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08x\n", hr ); - count = -1; - hr = _Recordset_get_RecordCount( recordset, &count ); + count_lp = -1; + hr = _Recordset_get_RecordCount( recordset, &count_lp ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %d\n", count ); + ok( !count_lp, "got %ld\n", count_lp ); hr = _Recordset_AddNew( recordset, missing, missing ); ok( hr == S_OK, "got %08x\n", hr ); ok( !is_eof( recordset ), "eof\n" ); ok( !is_bof( recordset ), "bof\n" ); - count = -1; - hr = _Recordset_get_RecordCount( recordset, &count ); + count_lp = -1; + hr = _Recordset_get_RecordCount( recordset, &count_lp ); ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 1, "got %d\n", count ); + ok( count_lp == 1, "got %ld\n", count_lp ); /* get_Fields still returns the same object */ hr = _Recordset_get_Fields( recordset, &fields2 ); @@ -631,7 +632,7 @@ static void test_ADORecordsetConstruction(void) if (count > 0) { VARIANT index; - LONG size; + ADO_LONGPTR size; DataTypeEnum type; V_VT( &index ) = VT_BSTR; @@ -646,7 +647,7 @@ static void test_ADORecordsetConstruction(void) size = -1; hr = Field_get_DefinedSize( field, &size ); ok( hr == S_OK, "got %08x\n", hr ); - ok( size == 5, "got %d\n", size ); + ok( size == 5, "got %ld\n", size ); VariantClear(&index); @@ -672,7 +673,8 @@ static void test_Fields(void) Field *field, *field2; VARIANT val, index; BSTR name; - LONG count, size; + LONG count; + ADO_LONGPTR size; DataTypeEnum type; FieldAttributeEnum attrs; HRESULT hr; @@ -747,7 +749,7 @@ static void test_Fields(void) size = -1; hr = Field_get_DefinedSize( field, &size ); ok( hr == S_OK, "got %08x\n", hr ); - ok( size == 4, "got %d\n", size ); + ok( size == 4, "got %ld\n", size ); attrs = 0xdead; hr = Field_get_Attributes( field, &attrs ); ok( hr == S_OK, "got %08x\n", hr ); @@ -785,7 +787,8 @@ static void test_Stream(void) VARIANT_BOOL eos; StreamTypeEnum type; LineSeparatorEnum sep; - LONG refs, size, pos; + LONG refs; + ADO_LONGPTR size, pos; ObjectStateEnum state; ConnectModeEnum mode; BSTR charset, str; @@ -875,7 +878,7 @@ static void test_Stream(void) size = -1; hr = _Stream_get_Size( stream, &size ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !size, "got %d\n", size ); + ok( !size, "got %ld\n", size ); eos = VARIANT_FALSE; hr = _Stream_get_EOS( stream, &eos ); @@ -885,12 +888,12 @@ static void test_Stream(void) pos = -1; hr = _Stream_get_Position( stream, &pos ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !pos, "got %d\n", pos ); + ok( !pos, "got %ld\n", pos ); size = -1; hr = _Stream_get_Size( stream, &size ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !size, "got %d\n", size ); + ok( !size, "got %ld\n", size ); hr = _Stream_Read( stream, 2, &val ); ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08x\n", hr ); @@ -903,7 +906,7 @@ static void test_Stream(void) pos = -1; hr = _Stream_get_Position( stream, &pos ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !pos, "got %d\n", pos ); + ok( !pos, "got %ld\n", pos ); str = SysAllocString( L"test" ); hr = _Stream_WriteText( stream, str, adWriteChar ); @@ -925,7 +928,7 @@ static void test_Stream(void) pos = -1; hr = _Stream_get_Position( stream, &pos ); ok( hr == S_OK, "got %08x\n", hr ); - ok( pos == 10, "got %d\n", pos ); + ok( pos == 10, "got %ld\n", pos ); eos = VARIANT_FALSE; hr = _Stream_get_EOS( stream, &eos ); @@ -938,7 +941,7 @@ static void test_Stream(void) size = -1; hr = _Stream_get_Size( stream, &size ); ok( hr == S_OK, "got %08x\n", hr ); - ok( size == 10, "got %d\n", size ); + ok( size == 10, "got %ld\n", size ); hr = _Stream_put_Position( stream, 2 ); ok( hr == S_OK, "got %08x\n", hr ); @@ -949,12 +952,12 @@ static void test_Stream(void) pos = -1; hr = _Stream_get_Position( stream, &pos ); ok( hr == S_OK, "got %08x\n", hr ); - ok( pos == 2, "got %d\n", pos ); + ok( pos == 2, "got %ld\n", pos ); size = -1; hr = _Stream_get_Size( stream, &size ); ok( hr == S_OK, "got %08x\n", hr ); - ok( size == 2, "got %d\n", size ); + ok( size == 2, "got %ld\n", size ); hr = _Stream_Close( stream ); ok( hr == S_OK, "got %08x\n", hr ); @@ -1006,7 +1009,7 @@ static void test_Stream(void) pos = -1; hr = _Stream_get_Position( stream, &pos ); ok( hr == S_OK, "got %08x\n", hr ); - ok( pos == 4, "got %d\n", pos ); + ok( pos == 4, "got %ld\n", pos ); hr = _Stream_put_Position( stream, 0 ); ok( hr == S_OK, "got %08x\n", hr ); @@ -1020,7 +1023,7 @@ static void test_Stream(void) pos = -1; hr = _Stream_get_Position( stream, &pos ); ok( hr == S_OK, "got %08x\n", hr ); - ok( pos == 4, "got %d\n", pos ); + ok( pos == 4, "got %ld\n", pos ); refs = _Stream_Release( stream ); ok( !refs, "got %d\n", refs ); diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index fedaf557066..a8e977430c0 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -125,7 +125,13 @@ typedef [uuid(00000528-0000-0010-8000-00aa006d2ea4)] enum PositionEnum adPosEOF = -3 } PositionEnum; +typedef LONG_PTR ADO_LONGPTR; + +cpp_quote("#ifdef _WIN64") +cpp_quote("typedef ADO_LONGPTR PositionEnum_Param;") +cpp_quote("#else") typedef [uuid(a56187c5-d690-4037-ae32-a00edc376ac3), public] PositionEnum PositionEnum_Param; +cpp_quote("#endif") typedef [uuid(0000051f-0000-0010-8000-00aa006d2ea4)] enum DataTypeEnum { @@ -626,7 +632,7 @@ interface Field20 : _ADO { [id(0x00000455), propget] HRESULT ActualSize( - [out, retval] LONG *size); + [out, retval] ADO_LONGPTR *size); [id(0x0000040c), propget] HRESULT Attributes( @@ -634,7 +640,7 @@ interface Field20 : _ADO [id(0x0000044f), propget] HRESULT DefinedSize( - [out, retval] LONG *size); + [out, retval] ADO_LONGPTR *size); [id(0x0000044c), propget] HRESULT Name( @@ -699,7 +705,7 @@ interface Field20 : _ADO [id(0x0000044f), propput] HRESULT DefinedSize( - [in] LONG size); + [in] ADO_LONGPTR size); [id(0x0000040c), propput] HRESULT Attributes( @@ -748,7 +754,7 @@ interface Fields20 : Fields15 HRESULT _Append( [in] BSTR name, [in] DataTypeEnum type, - [in, defaultvalue(0)] LONG size, + [in, defaultvalue(0)] ADO_LONGPTR size, [in, defaultvalue(adFldUnspecified)] FieldAttributeEnum attr); [id(0x60030002)] @@ -769,7 +775,7 @@ interface Fields : Fields20 HRESULT Append( [in] BSTR name, [in] DataTypeEnum type, - [in, defaultvalue(0)] LONG size, + [in, defaultvalue(0)] ADO_LONGPTR size, [in, defaultvalue(adFldUnspecified)] FieldAttributeEnum attr, [in, optional] VARIANT value); @@ -859,15 +865,15 @@ interface Recordset15 : _ADO [id(0x000003f1), propget] HRESULT MaxRecords( - [out, retval] LONG *max_records); + [out, retval] ADO_LONGPTR *max_records); [id(0x000003f1), propput] HRESULT MaxRecords( - [in] LONG max_records); + [in] ADO_LONGPTR max_records); [id(0x000003f2), propget] HRESULT RecordCount( - [out, retval] LONG *count); + [out, retval] ADO_LONGPTR *count); [id(0x000003f3), propputref] HRESULT Source( @@ -905,7 +911,7 @@ interface Recordset15 : _ADO [id(0x000003f9)] HRESULT Move( - [in] LONG num_records, + [in] ADO_LONGPTR num_records, [in, optional] VARIANT start); [id(0x000003fa)] @@ -963,7 +969,7 @@ interface Recordset15 : _ADO [id(0x0000041a), propget] HRESULT PageCount( - [out, retval] LONG *count); + [out, retval] ADO_LONGPTR *count); [id(0x00000418), propget] HRESULT PageSize( @@ -1040,7 +1046,7 @@ interface Recordset15 : _ADO [id(0x00000422)] HRESULT Find( [in] BSTR criteria, - [in, defaultvalue(0)] LONG skip_records, + [in, defaultvalue(0)] ADO_LONGPTR skip_records, [in, defaultvalue(adSearchForward)] SearchDirectionEnum search_direction, [in, optional] VARIANT start); }; @@ -1408,11 +1414,11 @@ interface _Parameter : _ADO [id(0x6003000c), propput] HRESULT Size( - [in] LONG size); + [in] ADO_LONGPTR size); [id(0x6003000c), propget] HRESULT Size( - [out, retval] LONG *size); + [out, retval] ADO_LONGPTR *size); [id(0x6003000e)] HRESULT AppendChunk( @@ -1517,7 +1523,7 @@ interface Command15 : _ADO [in, defaultvalue("")] BSTR name, [in, defaultvalue(adEmpty)] DataTypeEnum type, [in, defaultvalue(adParamInput)] ParameterDirectionEnum direction, - [in, defaultvalue(0)] LONG size, + [in, defaultvalue(0)] ADO_LONGPTR size, [in, optional] VARIANT value, [out, retval] _Parameter **parameter); @@ -1844,7 +1850,7 @@ interface _Stream : IDispatch { [id(1), propget] HRESULT Size( - [out, retval] LONG *size); + [out, retval] ADO_LONGPTR *size); [id(2), propget] HRESULT EOS( @@ -1852,11 +1858,11 @@ interface _Stream : IDispatch [id(3), propget] HRESULT Position( - [out, retval] LONG *position); + [out, retval] ADO_LONGPTR *position); [id(3), propput] HRESULT Position( - [in] LONG position); + [in] ADO_LONGPTR position); [id(4), propget] HRESULT Type( @@ -1923,7 +1929,7 @@ interface _Stream : IDispatch [id(15)] HRESULT CopyTo( [in] _Stream *dest, - [in, defaultvalue(-1)] LONG size); + [in, defaultvalue(-1)] ADO_LONGPTR size); [id(16)] HRESULT Flush(void); @@ -2111,11 +2117,11 @@ interface ADORecordsetConstruction : IDispatch [propget] HRESULT Chapter( - [out, retval] LONG *chapter); + [out, retval] ADO_LONGPTR *chapter); [propput] HRESULT Chapter( - [in] LONG chapter); + [in] ADO_LONGPTR chapter); [propget] HRESULT RowPosition( -- 2.34.1

1 0

[PATCH] combase: Reorder hstring_private elements.
by Bernhard Kölbl 23 Dec '21

23 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51017 Debugging sessions and the official WinRT SDK show, that the contained string is alligned at the end of the hstring_private struct and actually no reference counting is used. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/combase/string.c | 92 +++++++++++++++++++++++++------------------ 1 file changed, 53 insertions(+), 39 deletions(-) diff --git a/dlls/combase/string.c b/dlls/combase/string.c index 2092e4360a3..559a026fede 100644 --- a/dlls/combase/string.c +++ b/dlls/combase/string.c @@ -26,12 +26,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(winstring); +#define HSTRING_REFERENCE_FLAG 1 + struct hstring_private { - LPWSTR buffer; + UINT32 flags; UINT32 length; - BOOL reference; - LONG refcount; + UINT32 padding1; + UINT32 padding2; + LPWSTR ptr; }; static const WCHAR empty[1]; @@ -40,30 +43,29 @@ C_ASSERT(sizeof(struct hstring_private) <= sizeof(HSTRING_HEADER)); static inline struct hstring_private *impl_from_HSTRING(HSTRING string) { - return (struct hstring_private *)string; + return (struct hstring_private *)string; } static inline struct hstring_private *impl_from_HSTRING_HEADER(HSTRING_HEADER *header) { - return (struct hstring_private *)header; + return (struct hstring_private *)header; } static inline struct hstring_private *impl_from_HSTRING_BUFFER(HSTRING_BUFFER buffer) { - return (struct hstring_private *)buffer; + return CONTAINING_RECORD(buffer, struct hstring_private, ptr); } static BOOL alloc_string(UINT32 len, HSTRING *out) { struct hstring_private *priv; - priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv) + (len + 1) * sizeof(*priv->buffer)); + priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv)); if (!priv) return FALSE; - priv->buffer = (LPWSTR)(priv + 1); + priv->ptr = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(*priv->ptr)); priv->length = len; - priv->reference = FALSE; - priv->refcount = 1; - priv->buffer[len] = '\0'; + priv->flags = 0; + priv->ptr[len] = '\0'; *out = (HSTRING)priv; return TRUE; } @@ -90,7 +92,7 @@ HRESULT WINAPI WindowsCreateString(LPCWSTR ptr, UINT32 len, if (!alloc_string(len, out)) return E_OUTOFMEMORY; priv = impl_from_HSTRING(*out); - memcpy(priv->buffer, ptr, len * sizeof(*priv->buffer)); + memcpy(priv->ptr, ptr, len * sizeof(*priv->ptr)); return S_OK; } @@ -115,10 +117,10 @@ HRESULT WINAPI WindowsCreateStringReference(LPCWSTR ptr, UINT32 len, } if (ptr == NULL) return E_POINTER; - priv->buffer = (LPWSTR)ptr; + priv->ptr = (LPWSTR)ptr; priv->length = len; - priv->reference = TRUE; - *out = (HSTRING)header; + priv->flags = TRUE; + *out = (HSTRING)priv; return S_OK; } @@ -127,16 +129,20 @@ HRESULT WINAPI WindowsCreateStringReference(LPCWSTR ptr, UINT32 len, */ HRESULT WINAPI WindowsDeleteString(HSTRING str) { - struct hstring_private *priv = impl_from_HSTRING(str); + struct hstring_private *priv; TRACE("(%p)\n", str); if (str == NULL) return S_OK; - if (priv->reference) + + priv = impl_from_HSTRING(str); + + if(priv->flags == 0) return S_OK; - if (InterlockedDecrement(&priv->refcount) == 0) - HeapFree(GetProcessHeap(), 0, priv); + + HeapFree(GetProcessHeap(), 0, priv); + return S_OK; } @@ -156,9 +162,9 @@ HRESULT WINAPI WindowsDuplicateString(HSTRING str, HSTRING *out) *out = NULL; return S_OK; } - if (priv->reference) - return WindowsCreateString(priv->buffer, priv->length, out); - InterlockedIncrement(&priv->refcount); + if (priv->flags == HSTRING_REFERENCE_FLAG) + return WindowsCreateString(priv->ptr, priv->length, out); + *out = str; return S_OK; } @@ -186,8 +192,8 @@ HRESULT WINAPI WindowsPreallocateStringBuffer(UINT32 len, WCHAR **outptr, if (!alloc_string(len, &str)) return E_OUTOFMEMORY; priv = impl_from_HSTRING(str); - *outptr = priv->buffer; - *out = (HSTRING_BUFFER)str; + *outptr = priv->ptr; + *out = (HSTRING_BUFFER)&priv->ptr; return S_OK; } @@ -196,9 +202,17 @@ HRESULT WINAPI WindowsPreallocateStringBuffer(UINT32 len, WCHAR **outptr, */ HRESULT WINAPI WindowsDeleteStringBuffer(HSTRING_BUFFER buf) { + + struct hstring_private *priv; + TRACE("(%p)\n", buf); - return WindowsDeleteString((HSTRING)buf); + if(buf) + priv = impl_from_HSTRING_BUFFER(buf); + else + priv = NULL; + + return WindowsDeleteString((HSTRING)priv); } /*********************************************************************** @@ -217,9 +231,9 @@ HRESULT WINAPI WindowsPromoteStringBuffer(HSTRING_BUFFER buf, HSTRING *out) *out = NULL; return S_OK; } - if (priv->buffer[priv->length] != 0 || priv->reference || priv->refcount != 1) + if (priv->ptr[priv->length] != 0 || priv->flags == HSTRING_REFERENCE_FLAG) return E_INVALIDARG; - *out = (HSTRING)buf; + *out = (HSTRING)priv; return S_OK; } @@ -254,7 +268,7 @@ LPCWSTR WINAPI WindowsGetStringRawBuffer(HSTRING str, UINT32 *len) } if (len) *len = priv->length; - return priv->buffer; + return priv->ptr; } /*********************************************************************** @@ -276,7 +290,7 @@ HRESULT WINAPI WindowsStringHasEmbeddedNull(HSTRING str, BOOL *out) } for (i = 0; i < priv->length; i++) { - if (priv->buffer[i] == '\0') + if (priv->ptr[i] == '\0') { *out = TRUE; return S_OK; @@ -305,7 +319,7 @@ HRESULT WINAPI WindowsSubstring(HSTRING str, UINT32 start, HSTRING *out) *out = NULL; return S_OK; } - return WindowsCreateString(&priv->buffer[start], len - start, out); + return WindowsCreateString(&priv->ptr[start], len - start, out); } /*********************************************************************** @@ -327,7 +341,7 @@ HRESULT WINAPI WindowsSubstringWithSpecifiedLength(HSTRING str, UINT32 start, UI *out = NULL; return S_OK; } - return WindowsCreateString(&priv->buffer[start], len, out); + return WindowsCreateString(&priv->ptr[start], len, out); } /*********************************************************************** @@ -355,8 +369,8 @@ HRESULT WINAPI WindowsConcatString(HSTRING str1, HSTRING str2, HSTRING *out) if (!alloc_string(priv1->length + priv2->length, out)) return E_OUTOFMEMORY; priv = impl_from_HSTRING(*out); - memcpy(priv->buffer, priv1->buffer, priv1->length * sizeof(*priv1->buffer)); - memcpy(priv->buffer + priv1->length, priv2->buffer, priv2->length * sizeof(*priv2->buffer)); + memcpy(priv->ptr, priv1->ptr, priv1->length * sizeof(*priv1->ptr)); + memcpy(priv->ptr + priv1->length, priv2->ptr, priv2->length * sizeof(*priv2->ptr)); return S_OK; } @@ -395,12 +409,12 @@ HRESULT WINAPI WindowsCompareStringOrdinal(HSTRING str1, HSTRING str2, INT32 *re } if (str1) { - buf1 = priv1->buffer; + buf1 = priv1->ptr; len1 = priv1->length; } if (str2) { - buf2 = priv2->buffer; + buf2 = priv2->ptr; len2 = priv2->length; } *res = CompareStringOrdinal(buf1, len1, buf2, len2, FALSE) - CSTR_EQUAL; @@ -427,10 +441,10 @@ HRESULT WINAPI WindowsTrimStringStart(HSTRING str1, HSTRING str2, HSTRING *out) } for (start = 0; start < priv1->length; start++) { - if (!wmemchr(priv2->buffer, priv1->buffer[start], priv2->length)) + if (!wmemchr(priv2->ptr, priv1->ptr[start], priv2->length)) break; } - return start ? WindowsCreateString(&priv1->buffer[start], priv1->length - start, out) : + return start ? WindowsCreateString(&priv1->ptr[start], priv1->length - start, out) : WindowsDuplicateString(str1, out); } @@ -454,9 +468,9 @@ HRESULT WINAPI WindowsTrimStringEnd(HSTRING str1, HSTRING str2, HSTRING *out) } for (len = priv1->length; len > 0; len--) { - if (!wmemchr(priv2->buffer, priv1->buffer[len - 1], priv2->length)) + if (!wmemchr(priv2->ptr, priv1->ptr[len - 1], priv2->length)) break; } - return (len < priv1->length) ? WindowsCreateString(priv1->buffer, len, out) : + return (len < priv1->length) ? WindowsCreateString(priv1->ptr, len, out) : WindowsDuplicateString(str1, out); } -- 2.34.1

1 0

[PATCH] msvcrt: Fix restoring 53-bit precision mode in _control87.
by Piotr Caban 23 Dec '21

23 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52260 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tools] testbot/SetWinLocale: Add an option to show the current locale settings.
by Francois Gouget 23 Dec '21

23 Dec '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 139 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 135 insertions(+), 4 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 0ab7f935d2..4f50ed555c 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -41,6 +41,13 @@ use WineTestBot::Log; use WineTestBot::TestAgent; use WineTestBot::Utils; +my $HKCU_INTERNATIONAL = "HKCU\\Control Panel\\International"; +my $HKCU_GEO = "HKCU\\Control Panel\\International\\Geo"; +my $HKCU_USER_PROFILE = "HKCU\\Control Panel\\International\\User Profile"; +my $HKCU_DESKTOP = "HKCU\\Control Panel\\Desktop"; +my $HKLM_LANGUAGE = "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Nls\\Language"; +my $HKLM_LOCALE = "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Nls\\Locale"; + # # Error handling and logging @@ -289,7 +296,7 @@ sub CheckLocale($$) return undef; } -my ($OptHostName, $OptReboot); +my ($OptHostName, $OptShow, $OptReboot); my ($OptDefault, $OptLocale, $OptSystem, $OptMUI, $OptCountry, $OptKeyboard); while (@ARGV) { @@ -298,6 +305,10 @@ while (@ARGV) { $Usage = 0; } + elsif ($Arg eq "--show") + { + $OptShow = 1; + } elsif ($Arg eq "--reboot") { if (defined $OptReboot and !$OptReboot) @@ -414,7 +425,7 @@ if (!defined $Usage) } if (!$OptLocale and !$OptSystem and !$OptMUI and !$OptKeyboard and - !$OptCountry) + !$OptCountry and !$OptShow) { Error("you must specify at least one locale to change\n"); $Usage = 2; @@ -433,12 +444,14 @@ if (defined $Usage) Error("try '$name0 --help' for more information\n"); exit $Usage; } + print "or $name0 [options] --show HOSTNAME\n"; print "or $name0 [options] [--default LOC] [--locale USR] [--system SYS] [--mui MUI] [--keyboard KBD] [--country CTY] HOSTNAME\n"; print "\n"; print "Sets the locale of the specified Windows machine.\n"; print "\n"; print "Where:\n"; print " HOSTNAME Work on the specified Windows host (must be running TestAgentd).\n"; + print " --show Show the locale settings of the specified host and exit.\n"; print " --default LOC Use this Windows locale as the default for the other options.\n"; print " The locale must be in a form suitable for Windows' intl.cpl\n"; print " control panel module, that is roughly ll-CC where ll is an\n"; @@ -474,6 +487,126 @@ if (defined $Usage) exit 0; } +my $TA = TestAgent->new($OptHostName, $AgentPort); + + +# +# Registry helpers +# + +sub RegGetValues($;$) +{ + my ($Key, $VName) = @_; + + my $Cmd = ["reg.exe", "query", $Key]; + if ($VName) + { + push @$Cmd, ($VName =~ /\*/ ? "/f" : "/v"), $VName; + } + else + { + push @$Cmd, "/ve"; + } + + my $Pid = $TA->Run($Cmd, 0, undef, "reg.out"); + if (!$Pid) + { + FatalError("failed to run @$Cmd\n"); + } + if (!defined $TA->Wait($Pid, 10)) + { + FatalError("@$Cmd timed out: ", $TA->GetLastError(), "\n"); + } + my $RegOut = $TA->GetFileToString("reg.out"); + $TA->Rm("reg.out"); + + my $Values = {}; + foreach my $Line (split /\n/, $RegOut) + { + if ($Line =~ /^\s{4}(.*)\s{4}REG_[A-Z_]+\s{4}(.*)\r$/) + { + my ($VName, $Value) = ($1, $2); + $Value = [split /\\0/, $Value] if ($Value =~ /\\0/); + $Values->{$VName} = $Value; + } + } + return $Values; +} + +sub RegGetValue($;$) +{ + my ($Key, $VName) = @_; + my $Values = RegGetValues($Key, $VName); + return $Values->{defined $VName ? $VName : "(Default)"}; +} + + +# +# Show the host's locale settings +# + +sub GetWinSettings($) +{ + my ($All) = @_; + my $Settings; + + if ($OptLocale or $All) + { + my $Values = RegGetValues($HKCU_INTERNATIONAL, "Locale*"); + map { $Settings->{$_} = $Values->{$_} } ("Locale", "LocaleName"); + } + if ($OptCountry or $All) + { + my $Values = RegGetValues($HKCU_GEO, "N*"); + $Settings->{Country} = $Values->{Nation}; + $Settings->{CountryName} = $Values->{Name}; + } + if ($OptKeyboard or $All) + { + $Settings->{InputMethod} = RegGetValue($HKCU_USER_PROFILE, "InputMethodOverride"); + } + if ($OptMUI or $All) + { + my $Values = RegGetValues($HKCU_DESKTOP, "*PreferredUILanguages*"); + map { $Settings->{$_} = $Values->{$_} } ("PreferredUILanguages", "PreferredUILanguagesPending", "PreviousPreferredUILanguages"); + } + if ($OptSystem or $All) + { + $Settings->{SysLanguage} = RegGetValue($HKLM_LANGUAGE, "Default"); + $Settings->{SysLocale} = RegGetValue($HKLM_LOCALE, "(Default)"); + } + return $Settings; +} + +sub Value2Str($) +{ + my ($Value) = @_; + return !defined $Value ? "<undef>" : + ref($Value) ne "ARRAY" ? $Value : + ("[". join(", ", @$Value) ."]"); +} + +sub ShowWinSettings($) +{ + my ($Settings) = @_; + print "Locale (--locale) = ", Value2Str($Settings->{Locale}), "\n"; + print "LocaleName (--locale) = ", Value2Str($Settings->{LocaleName}), "\n"; + print "Geo:Nation (--country) = ", Value2Str($Settings->{Country}), "\n"; + print "Geo:Name (--country) = ", Value2Str($Settings->{CountryName}), "\n"; + print "InputMethod (--keyboard) = ", Value2Str($Settings->{InputMethod}), "\n"; + print "PreferredUILanguages (--mui) = ", Value2Str($Settings->{PreferredUILanguages}), "\n"; + print " ...Pending (--mui) = ", Value2Str($Settings->{PreferredUILanguagesPending}), "\n"; + print " Previous... (--mui) = ", Value2Str($Settings->{PreviousPreferredUILanguages}), "\n"; + print "Nls:Language (--system) = ", Value2Str($Settings->{SysLanguage}), "\n"; + print "Nls:Locale (--system) = ", Value2Str($Settings->{SysLocale}), "\n"; +} + +if ($OptShow) +{ + ShowWinSettings(GetWinSettings("all")); + exit(0); +} + # # Generate the intl.cpl configuration @@ -526,8 +659,6 @@ push @Config, "</gs:GlobalizationServices>"; # Change the Windows locale using intl.cpl # -my $TA = TestAgent->new($OptHostName, $AgentPort); - Debug(Elapsed($Start), " Sending the configuration file\n"); print STDERR join("\n", "locales.xml:", @Config, "") if ($DryRun or $Debug); -- 2.30.2

1 0

[tools] testbot/SetWinLocale: Fix a typo in the usage message.
by Francois Gouget 23 Dec '21

23 Dec '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 2de673360f..0ab7f935d2 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -447,7 +447,7 @@ if (defined $Usage) print " --locale USR Specifies the user formats (see --defaults).\n"; print " . Windows 10 GUI: Time & language -> Region -> Regional\n"; print " format.\n"; - print " . APIs: UserDefaultLCID(), GetThreadLocale().\n"; + print " . APIs: GetUserDefaultLCID(), GetThreadLocale().\n"; print " --system SYS Specifies the system locale (see --defaults).\n"; print " . Only takes effect after a reboot.\n"; print " . Windows 10 GUI: Time & language -> Language ->\n"; -- 2.30.2

1 0

[PATCH v2] faudio: Return PCM format from IXAudio27_GetDeviceDetails.
by Rémi Bernon 23 Dec '21

23 Dec '21

This will be in next FAudio release. This fixes a regression in some games, such as Far Cry 4, where audio doesn't work anymore since the move to FAudio Win32 platform. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Only pick the format change, remove the corresponding todo_wine. dlls/xaudio2_7/tests/xaudio2.c | 1 - libs/faudio/src/FAudio_platform_win32.c | 27 ++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index ea7e2ec121a..9821553166e 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -940,7 +940,6 @@ static UINT32 test_DeviceDetails(IXAudio27 *xa) else ok(dd.Role == NotDefaultDevice, "Got wrong role for index %u: 0x%x\n", i, dd.Role); - todo_wine ok(IsEqualGUID(&dd.OutputFormat.SubFormat, &KSDATAFORMAT_SUBTYPE_PCM), "got format %s\n", debugstr_guid(&dd.OutputFormat.SubFormat)); } diff --git a/libs/faudio/src/FAudio_platform_win32.c b/libs/faudio/src/FAudio_platform_win32.c index ccb8d8abbbf..d99bae044a4 100644 --- a/libs/faudio/src/FAudio_platform_win32.c +++ b/libs/faudio/src/FAudio_platform_win32.c @@ -364,13 +364,14 @@ uint32_t FAudio_PlatformGetDeviceDetails( uint32_t index, FAudioDeviceDetails *details ) { + WAVEFORMATEX *format, *obtained; WAVEFORMATEXTENSIBLE *ext; - WAVEFORMATEX *format; IAudioClient *client; IMMDevice *device; uint32_t ret = 0; HRESULT hr; WCHAR *str; + GUID sub; FAudio_memset(details, 0, sizeof(FAudioDeviceDetails)); if (index > 0) return FAUDIO_E_INVALID_CALL; @@ -406,6 +407,28 @@ uint32_t FAudio_PlatformGetDeviceDetails( hr = IAudioClient_GetMixFormat(client, &format); FAudio_assert(!FAILED(hr) && "Failed to get audio client mix format!"); + if (format->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + { + ext = (WAVEFORMATEXTENSIBLE *)format; + sub = ext->SubFormat; + FAudio_memcpy( + &ext->SubFormat, + &DATAFORMAT_SUBTYPE_PCM, + sizeof(GUID) + ); + + hr = IAudioClient_IsFormatSupported(client, AUDCLNT_SHAREMODE_SHARED, format, &obtained); + if (FAILED(hr)) + { + ext->SubFormat = sub; + } + else if (obtained) + { + CoTaskMemFree(format); + format = obtained; + } + } + details->OutputFormat.Format.wFormatTag = format->wFormatTag; details->OutputFormat.Format.nChannels = format->nChannels; details->OutputFormat.Format.nSamplesPerSec = format->nSamplesPerSec; @@ -426,6 +449,8 @@ uint32_t FAudio_PlatformGetDeviceDetails( ); } + CoTaskMemFree(format); + IAudioClient_Release(client); IMMDevice_Release(device); -- 2.34.1

1 0

[PATCH v2 1/2] widl: Define _WIN64 for 64-bit targets.
by Bernhard Übelacker 23 Dec '21

23 Dec '21

Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- Supersedes 222554. v2: No changes. --- tools/widl/widl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 0b5f07236f0..d241e046846 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -849,6 +849,8 @@ int main(int argc,char *argv[]) add_widl_version_define(); wpp_add_cmdline_define("_WIN32=1"); + if (pointer_size == 8) + wpp_add_cmdline_define("_WIN64=1"); atexit(rm_tempfile); if (!no_preprocess) -- 2.34.1

3 8

[PATCH] faudio: Update to 21.12-3-gbbc9519.
by Rémi Bernon 23 Dec '21

23 Dec '21

This will be in next FAudio release. The PCM format change is required to fix a regression in some games, such as Far Cry 4, where audio doesn't work anymore since the move to FAudio Win32 platform. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I believe FAudio uses monthly releases, which may be late for Wine 7.0, depending on our release schedule. We can also wait for FAudio 22.01 otherwise. libs/faudio/include/FAudio.h | 2 +- libs/faudio/src/FAudio_platform_win32.c | 75 ++++++++++++++++++++++++- 2 files changed, 75 insertions(+), 2 deletions(-) diff --git a/libs/faudio/include/FAudio.h b/libs/faudio/include/FAudio.h index 6f68013d79f..3d2ea4afdcd 100644 --- a/libs/faudio/include/FAudio.h +++ b/libs/faudio/include/FAudio.h @@ -485,7 +485,7 @@ extern FAudioGUID DATAFORMAT_SUBTYPE_IEEE_FLOAT; #define FAUDIO_ABI_VERSION 0 #define FAUDIO_MAJOR_VERSION 21 -#define FAUDIO_MINOR_VERSION 11 +#define FAUDIO_MINOR_VERSION 12 #define FAUDIO_PATCH_VERSION 0 #define FAUDIO_COMPILED_VERSION ( \ diff --git a/libs/faudio/src/FAudio_platform_win32.c b/libs/faudio/src/FAudio_platform_win32.c index ccb8d8abbbf..89101a6cf7a 100644 --- a/libs/faudio/src/FAudio_platform_win32.c +++ b/libs/faudio/src/FAudio_platform_win32.c @@ -70,6 +70,44 @@ void FAudio_Log(char const *msg) OutputDebugStringA(msg); } +static HMODULE kernelbase = NULL; +static HRESULT (WINAPI *my_SetThreadDescription)(HANDLE, PCWSTR) = NULL; + +static void FAudio_resolve_SetThreadDescription(void) +{ + kernelbase = LoadLibraryA("kernelbase.dll"); + if (!kernelbase) + return; + + my_SetThreadDescription = (HRESULT (WINAPI *)(HANDLE, PCWSTR)) GetProcAddress(kernelbase, "SetThreadDescription"); + if (!my_SetThreadDescription) + { + FreeLibrary(kernelbase); + kernelbase = NULL; + } +} + +static void FAudio_set_thread_name(char const *name) +{ + int ret; + WCHAR *nameW; + + if (!my_SetThreadDescription) + return; + + ret = MultiByteToWideChar(CP_UTF8, 0, name, -1, NULL, 0); + + nameW = FAudio_malloc(ret * sizeof(WCHAR)); + if (!nameW) + return; + + ret = MultiByteToWideChar(CP_UTF8, 0, name, -1, nameW, ret); + if (ret) + my_SetThreadDescription(GetCurrentThread(), nameW); + + FAudio_free(nameW); +} + static HRESULT FAudio_FillAudioClientBuffer( struct FAudioAudioClientThreadArgs *args, IAudioRenderClient *client, @@ -121,6 +159,8 @@ static DWORD WINAPI FAudio_AudioClientThread(void *user) HRESULT hr = S_OK; UINT frames, padding = 0; + FAudio_set_thread_name(__func__); + hr = IAudioClient_GetService( args->client, &IID_IAudioRenderClient, @@ -172,6 +212,7 @@ void FAudio_PlatformInit( BOOL has_sse2 = IsProcessorFeaturePresent(PF_XMMI64_INSTRUCTIONS_AVAILABLE); FAudio_INTERNAL_InitSIMDFunctions(has_sse2, FALSE); + FAudio_resolve_SetThreadDescription(); FAudio_PlatformAddRef(); @@ -305,6 +346,12 @@ void FAudio_PlatformQuit(void* platformDevice) SetEvent(data->stopEvent); WaitForSingleObject(data->audioThread, INFINITE); if (data->client) IAudioClient_Release(data->client); + if (kernelbase) + { + my_SetThreadDescription = NULL; + FreeLibrary(kernelbase); + kernelbase = NULL; + } FAudio_PlatformRelease(); } @@ -364,13 +411,14 @@ uint32_t FAudio_PlatformGetDeviceDetails( uint32_t index, FAudioDeviceDetails *details ) { + WAVEFORMATEX *format, *obtained; WAVEFORMATEXTENSIBLE *ext; - WAVEFORMATEX *format; IAudioClient *client; IMMDevice *device; uint32_t ret = 0; HRESULT hr; WCHAR *str; + GUID sub; FAudio_memset(details, 0, sizeof(FAudioDeviceDetails)); if (index > 0) return FAUDIO_E_INVALID_CALL; @@ -406,6 +454,28 @@ uint32_t FAudio_PlatformGetDeviceDetails( hr = IAudioClient_GetMixFormat(client, &format); FAudio_assert(!FAILED(hr) && "Failed to get audio client mix format!"); + if (format->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + { + ext = (WAVEFORMATEXTENSIBLE *)format; + sub = ext->SubFormat; + FAudio_memcpy( + &ext->SubFormat, + &DATAFORMAT_SUBTYPE_PCM, + sizeof(GUID) + ); + + hr = IAudioClient_IsFormatSupported(client, AUDCLNT_SHAREMODE_SHARED, format, &obtained); + if (FAILED(hr)) + { + ext->SubFormat = sub; + } + else if (obtained) + { + CoTaskMemFree(format); + format = obtained; + } + } + details->OutputFormat.Format.wFormatTag = format->wFormatTag; details->OutputFormat.Format.nChannels = format->nChannels; details->OutputFormat.Format.nSamplesPerSec = format->nSamplesPerSec; @@ -426,6 +496,8 @@ uint32_t FAudio_PlatformGetDeviceDetails( ); } + CoTaskMemFree(format); + IAudioClient_Release(client); IMMDevice_Release(device); @@ -475,6 +547,7 @@ static DWORD WINAPI FaudioThreadWrapper(void *user) struct FAudioThreadArgs *args = user; DWORD ret; + FAudio_set_thread_name(args->name); ret = args->func(args->data); FAudio_free(args); -- 2.34.1

2 1

[PATCH v8 1/3] ntdll: sock_recv keeps message ordered
by Dongwan Kim 23 Dec '21

23 Dec '21

Calling try_recv could make messages misordered. Suppose that a server program calls a overlapped WSARecv and its operation is pending. Another program sends a message and wineserver is busy. The server program calls another overlapped WSARecv and it intercepts the message for the pending WSARecv. The problem already had been discussed here https://www.winehq.org/pipermail/wine-devel/2021-May/186612.html To avoid this situation, this kind of approach can be applied. The server program needs to know if there are pending asyncs before calling try_recv. Wineserver notifies it whenever invoking APC_ASYNC_IO. Then, the server program updates it and check it before calling try_recv. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/ntdll/unix/server.c | 8 ++++---- dlls/ntdll/unix/socket.c | 26 +++++++++++++++++++++++++- dlls/ws2_32/socket.c | 28 ++++++++++++++++++++++++++++ include/wine/afd.h | 12 +++++++++++- include/wine/server_protocol.h | 1 + server/async.c | 8 ++++++++ 6 files changed, 77 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index a388247beb2..047da6e0974 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -368,17 +368,17 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO case APC_ASYNC_IO: { struct async_fileio *user = wine_server_get_ptr( call->async_io.user ); - ULONG_PTR info = call->async_io.result; + ULONG_PTR info[2] = { call->async_io.result, call->async_io.async_wait }; NTSTATUS status; result->type = call->type; status = call->async_io.status; - if (user->callback( user, &info, &status )) + if (user->callback( user, info, &status )) { result->async_io.status = status; - result->async_io.total = info; + result->async_io.total = *info; /* the server will pass us NULL if a call failed synchronously */ - set_async_iosb( call->async_io.sb, result->async_io.status, info ); + set_async_iosb( call->async_io.sb, result->async_io.status, *info ); } else result->async_io.status = STATUS_PENDING; /* restart it */ break; diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index f82c7ae1ddf..a76def8b9c6 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -651,13 +651,28 @@ static NTSTATUS try_recv( int fd, struct async_recv_ioctl *async, ULONG_PTR *siz return status; } +struct list *async_queue_list; +static struct afd_async_queue* find_async_queue(HANDLE handle){ + struct afd_async_queue *queue; + + LIST_FOR_EACH_ENTRY(queue, async_queue_list, struct afd_async_queue, entry){ + if(queue->sock == handle) + return queue; + } + return NULL; +} static BOOL async_recv_proc( void *user, ULONG_PTR *info, NTSTATUS *status ) { struct async_recv_ioctl *async = user; + struct afd_async_queue *queue; int fd, needs_close; TRACE( "%#x\n", *status ); + queue = find_async_queue(async->io.handle); + if( queue ) + queue->read_q = info[1]; //store if waiting asyncs exist + if (*status == STATUS_ALERTED) { if ((*status = server_get_unix_fd( async->io.handle, 0, &fd, &needs_close, NULL, NULL ))) @@ -679,6 +694,7 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi struct WS_sockaddr *addr, int *addr_len, DWORD *ret_flags, int unix_flags, int force_async ) { struct async_recv_ioctl *async; + struct afd_async_queue *queue; ULONG_PTR information; HANDLE wait_handle; DWORD async_size; @@ -735,7 +751,12 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi } } - status = try_recv( fd, async, &information ); + queue = find_async_queue(handle); + + if( force_async && queue->read_q ) // if there are waiting asyncs, avoid cutting in line. + status = STATUS_DEVICE_NOT_READY; + else + status = try_recv( fd, async, &information ); if (status != STATUS_SUCCESS && status != STATUS_BUFFER_OVERFLOW && status != STATUS_DEVICE_NOT_READY) { @@ -764,6 +785,7 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi SERVER_END_REQ; if (status != STATUS_PENDING) release_fileio( &async->io ); + else queue->read_q = 1; if (wait_handle) status = wait_async( wait_handle, options & FILE_SYNCHRONOUS_IO_ALERT ); return status; @@ -1306,6 +1328,8 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc unsigned int *ws_flags = u64_to_user_ptr(params->ws_flags_ptr); int unix_flags = 0; + async_queue_list = u64_to_user_ptr(params->async_queue_list); + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) return status; diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 648284c10a3..88e0b00cb51 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -157,6 +157,30 @@ DECLARE_CRITICAL_SECTION(cs_socket_list); static SOCKET *socket_list; static unsigned int socket_list_size; +struct list async_queue_list = LIST_INIT(async_queue_list); + +static struct afd_async_queue* alloc_async_queue(HANDLE handle){ + struct afd_async_queue *queue = + (struct afd_async_queue*)malloc(sizeof(struct afd_async_queue)); + memset(queue, 0, sizeof(struct afd_async_queue)); + + queue->sock = handle; + list_add_head(&async_queue_list, &queue->entry); + return queue; +} + +static void remove_async_queue(HANDLE handle){ + struct afd_async_queue *queue; + + LIST_FOR_EACH_ENTRY(queue, &async_queue_list, struct afd_async_queue, entry){ + if(queue->sock == handle){ + list_remove(&queue->entry); + free(queue); + break; + } + } +} + const char *debugstr_sockaddr( const struct sockaddr *a ) { if (!a) return "(nil)"; @@ -355,6 +379,8 @@ static BOOL socket_list_add(SOCKET socket) SOCKET *new_array; EnterCriticalSection(&cs_socket_list); + alloc_async_queue((HANDLE)socket); + for (i = 0; i < socket_list_size; ++i) { if (!socket_list[i]) @@ -406,6 +432,7 @@ static BOOL socket_list_remove( SOCKET socket ) if (!socket) return FALSE; EnterCriticalSection(&cs_socket_list); + remove_async_queue( (HANDLE)socket); for (i = 0; i < socket_list_size; ++i) { if (socket_list[i] == socket) @@ -938,6 +965,7 @@ static int WS2_recv_base( SOCKET s, WSABUF *buffers, DWORD buffer_count, DWORD * params.force_async = !!overlapped; params.count = buffer_count; params.buffers_ptr = u64_from_user_ptr(buffers); + params.async_queue_list = u64_from_user_ptr(&async_queue_list); status = NtDeviceIoControlFile( (HANDLE)s, event, apc, cvalue, piosb, IOCTL_AFD_WINE_RECVMSG, &params, sizeof(params), NULL, 0 ); diff --git a/include/wine/afd.h b/include/wine/afd.h index efd5787e90a..c4ece63138a 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -24,6 +24,7 @@ #include <winternl.h> #include <winioctl.h> #include <mswsock.h> +#include "wine/list.h" struct afd_wsabuf_32 { @@ -322,8 +323,9 @@ struct afd_recvmsg_params int force_async; unsigned int count; ULONGLONG buffers_ptr; /* WSABUF[] */ + ULONGLONG async_queue_list; }; -C_ASSERT( sizeof(struct afd_recvmsg_params) == 48 ); +C_ASSERT( sizeof(struct afd_recvmsg_params) == 56 ); struct afd_sendmsg_params { @@ -365,4 +367,12 @@ struct afd_get_info_params }; C_ASSERT( sizeof(struct afd_get_info_params) == 12 ); +struct afd_async_queue{ + struct list entry; + HANDLE sock; + char read_q; + char write_q; +}; + + #endif diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1d17a40530f..ce26240bc9a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -492,6 +492,7 @@ typedef union client_ptr_t user; client_ptr_t sb; data_size_t result; + unsigned int async_wait; } async_io; struct { diff --git a/server/async.c b/server/async.c index 1a564ff1a69..5d6cc9770c3 100644 --- a/server/async.c +++ b/server/async.c @@ -164,6 +164,7 @@ static void async_destroy( struct object *obj ) void async_terminate( struct async *async, unsigned int status ) { struct iosb *iosb = async->iosb; + struct async* async_waiting; if (async->terminated) return; @@ -202,6 +203,13 @@ void async_terminate( struct async *async, unsigned int status ) else data.async_io.status = status; + async_waiting = find_pending_async(async->queue); + if(async_waiting) + { + data.async_io.async_wait = 1; + release_object(async_waiting); + } + thread_queue_apc( async->thread->process, async->thread, &async->obj, &data ); } -- 2.30.2

2 4

[PATCH] crypt32/tests: Make pfxdata static
by Alex Henrie 23 Dec '21

23 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/crypt32/tests/store.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 46c9102686d..852cedaa1fe 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -3038,7 +3038,7 @@ static void test_I_UpdateStore(void) CertCloseStore(store2, 0); } -const BYTE pfxdata[] = +static const BYTE pfxdata[] = { 0x30, 0x82, 0x0b, 0x1d, 0x02, 0x01, 0x03, 0x30, 0x82, 0x0a, 0xe3, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x82, -- 2.34.1

1 0

[PATCH] taskmgr: Select process on switch from application to process
by David Kahurani 23 Dec '21

23 Dec '21

Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- programs/taskmgr/applpage.c | 22 ++++++++++++++-------- programs/taskmgr/perfdata.c | 21 +++++++++++++++++++++ programs/taskmgr/perfdata.h | 1 + 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index b35881c2..0cf9f48d 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -28,6 +28,7 @@ #include <commctrl.h> #include "taskmgr.h" +#include "perfdata.h" typedef struct { @@ -790,15 +791,20 @@ void ApplicationPage_OnGotoProcess(void) } if (pAPLI) { DWORD dwProcessId; + int index; + memset(&item, 0, sizeof(LV_ITEMW)); + item.state = LVIS_SELECTED | LVIS_FOCUSED; + item.stateMask = LVIS_SELECTED | LVIS_FOCUSED; - GetWindowThreadProcessId(pAPLI->hWnd, &dwProcessId); - /* - * Switch to the process tab - */ - SendMessageW(hTabWnd, TCM_SETCURFOCUS, 1, 0); - /* - * FIXME: Select the process item in the list - */ + GetWindowThreadProcessId(pAPLI->hWnd, &dwProcessId); + /* + * Switch to the process tab + */ + SendMessageW(hTabWnd, TCM_SETCURFOCUS, 1, 0); + + index = PerfDataGetProcessIndex(dwProcessId); + + SendMessageW(hProcessPageListCtrl, LVM_SETITEMSTATE, index, (LPARAM) &item); } } diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index 4498a2fe..e8dc8900 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -356,6 +356,27 @@ ULONG PerfDataGetProcessId(ULONG Index) return ProcessId; } +ULONG PerfDataGetProcessIndex(ULONG ProcessId) +{ + ULONG index; + + EnterCriticalSection(&PerfDataCriticalSection); + + for(index=0; index<ProcessCount; index++) + { + if(pPerfData[index].ProcessId == ProcessId) + break; + } + + LeaveCriticalSection(&PerfDataCriticalSection); + + if (index == ProcessCount) + return 0; + else + return index; +} + + BOOL PerfDataGetUserName(ULONG Index, LPWSTR lpUserName, int nMaxCount) { BOOL bSuccessful; diff --git a/programs/taskmgr/perfdata.h b/programs/taskmgr/perfdata.h index 615e7db2..ffc1d2d6 100644 --- a/programs/taskmgr/perfdata.h +++ b/programs/taskmgr/perfdata.h @@ -75,6 +75,7 @@ ULONG PerfDataGetProcessorSystemUsage(void); BOOL PerfDataGetImageName(ULONG Index, LPWSTR lpImageName, int nMaxCount); ULONG PerfDataGetProcessId(ULONG Index); +ULONG PerfDataGetProcessIndex(ULONG ProcessId); BOOL PerfDataGetUserName(ULONG Index, LPWSTR lpUserName, int nMaxCount); ULONG PerfDataGetSessionId(ULONG Index); ULONG PerfDataGetCPUUsage(ULONG Index); -- 2.25.1

1 0

[PATCH] api-ms-win-core-windowserrorreporting-l1-1-1: Add DLL
by Alex Henrie 23 Dec '21

23 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51923 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-windowserrorreporting-l1-1-1.spec | 10 ++++++++++ tools/make_specfiles | 1 + 4 files changed, 13 insertions(+) create mode 100644 dlls/api-ms-win-core-windowserrorreporting-l1-1-1/Makefile.in create mode 100644 dlls/api-ms-win-core-windowserrorreporting-l1-1-1/api-ms-win-core-windowserrorreporting-l1-1-1.spec diff --git a/configure.ac b/configure.ac index c1eb2f99a8c..9b2c111119f 100644 --- a/configure.ac +++ b/configure.ac @@ -2470,6 +2470,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-version-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-version-private-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-versionansi-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-windowserrorreporting-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-windowserrorreporting-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-error-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-errorprivate-l1-1-1) diff --git a/dlls/api-ms-win-core-windowserrorreporting-l1-1-1/Makefile.in b/dlls/api-ms-win-core-windowserrorreporting-l1-1-1/Makefile.in new file mode 100644 index 00000000000..dc0b525273e --- /dev/null +++ b/dlls/api-ms-win-core-windowserrorreporting-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-windowserrorreporting-l1-1-1.dll diff --git a/dlls/api-ms-win-core-windowserrorreporting-l1-1-1/api-ms-win-core-windowserrorreporting-l1-1-1.spec b/dlls/api-ms-win-core-windowserrorreporting-l1-1-1/api-ms-win-core-windowserrorreporting-l1-1-1.spec new file mode 100644 index 00000000000..8201b14cfb8 --- /dev/null +++ b/dlls/api-ms-win-core-windowserrorreporting-l1-1-1/api-ms-win-core-windowserrorreporting-l1-1-1.spec @@ -0,0 +1,10 @@ +@ stub GetApplicationRecoveryCallback +@ stdcall GetApplicationRestartSettings(long ptr ptr ptr) kernel32.GetApplicationRestartSettings +@ stdcall WerRegisterFile(wstr long long) kernel32.WerRegisterFile +@ stdcall WerRegisterMemoryBlock(ptr long) kernel32.WerRegisterMemoryBlock +@ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) kernel32.WerRegisterRuntimeExceptionModule +@ stdcall WerUnregisterFile(wstr) kernel32.WerUnregisterFile +@ stdcall WerUnregisterMemoryBlock(ptr) kernel32.WerUnregisterMemoryBlock +@ stdcall WerUnregisterRuntimeExceptionModule(wstr ptr) kernel32.WerUnregisterRuntimeExceptionModule +@ stub WerpNotifyLoadStringResource +@ stub WerpNotifyUseStringResource diff --git a/tools/make_specfiles b/tools/make_specfiles index 49a032ef14c..b5e6443dd3c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -300,6 +300,7 @@ my @dll_groups = "api-ms-win-core-datetime-l1-1-0", "api-ms-win-core-datetime-l1-1-1", "api-ms-win-core-windowserrorreporting-l1-1-0", + "api-ms-win-core-windowserrorreporting-l1-1-1", "api-ms-win-core-wow64-l1-1-0", "api-ms-win-core-wow64-l1-1-1", "api-ms-win-core-xstate-l2-1-0", -- 2.34.1

1 0

[PATCH] nsiproxy: Allow the name length to be IFNAMSIZ - 1.
by Huw Davies 23 Dec '21

23 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52214 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/ndis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 86c4248c9ec..036e8f1eb0c 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -259,7 +259,7 @@ static struct if_entry *add_entry( DWORD index, char *name ) struct if_entry *entry; int name_len = strlen( name ); - if (name_len >= IFNAMSIZ - 1) return NULL; + if (name_len >= sizeof(entry->if_unix_name)) return NULL; entry = malloc( sizeof(*entry) ); if (!entry) return NULL; -- 2.23.0

1 0

[PATCH 1/6] winegstreamer: Allow specifying flipped video via negative height.
by Zebediah Figura 23 Dec '21

23 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50668 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/unixlib.h | 2 +- dlls/winegstreamer/wg_parser.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 90101893541..82bb534b938 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -63,7 +63,7 @@ struct wg_format WG_VIDEO_FORMAT_CINEPAK, } format; - uint32_t width, height; + int32_t width, height; uint32_t fps_n, fps_d; } video; struct diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index c3c9051a174..0178538fa81 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -450,7 +450,7 @@ static GstCaps *wg_format_to_caps_video(const struct wg_format *format) if ((video_format = wg_video_format_to_gst(format->u.video.format)) == GST_VIDEO_FORMAT_UNKNOWN) return NULL; - gst_video_info_set_format(&info, video_format, format->u.video.width, format->u.video.height); + gst_video_info_set_format(&info, video_format, format->u.video.width, abs(format->u.video.height)); if ((caps = gst_video_info_to_caps(&info))) { /* Clear some fields that shouldn't prevent us from connecting. */ @@ -497,7 +497,7 @@ static bool wg_format_compare(const struct wg_format *a, const struct wg_format /* Do not compare FPS. */ return a->u.video.format == b->u.video.format && a->u.video.width == b->u.video.width - && a->u.video.height == b->u.video.height; + && abs(a->u.video.height) == abs(b->u.video.height); } assert(0); @@ -611,6 +611,8 @@ static NTSTATUS wg_parser_stream_enable(void *args) if (format->major_type == WG_MAJOR_TYPE_VIDEO) { + bool flip = (format->u.video.height < 0); + switch (format->u.video.format) { case WG_VIDEO_FORMAT_BGRA: @@ -618,7 +620,7 @@ static NTSTATUS wg_parser_stream_enable(void *args) case WG_VIDEO_FORMAT_BGR: case WG_VIDEO_FORMAT_RGB15: case WG_VIDEO_FORMAT_RGB16: - gst_util_set_object_arg(G_OBJECT(stream->flip), "method", "vertical-flip"); + flip = !flip; break; case WG_VIDEO_FORMAT_AYUV: @@ -630,9 +632,10 @@ static NTSTATUS wg_parser_stream_enable(void *args) case WG_VIDEO_FORMAT_YVYU: case WG_VIDEO_FORMAT_UNKNOWN: case WG_VIDEO_FORMAT_CINEPAK: - gst_util_set_object_arg(G_OBJECT(stream->flip), "method", "none"); break; } + + gst_util_set_object_arg(G_OBJECT(stream->flip), "method", flip ? "vertical-flip" : "none"); } gst_pad_push_event(stream->my_sink, gst_event_new_reconfigure()); -- 2.34.1

1 5

[PATCH] po: Update Traditional Chinese translation.
by Chilung Chan 23 Dec '21

23 Dec '21

Signed-off-by: Chilung Chan <eason066(a)gmail.com> --- po/zh_TW.po | 94 +++++++++++++++++++++++++---------------------------- 1 file changed, 44 insertions(+), 50 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index d4d05db3298..16c22e456a4 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.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: 2021-12-13 13:32+0800\n" +"PO-Revision-Date: 2021-12-23 14:09+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -257,7 +257,7 @@ msgstr "應用程式" msgid "" "Unable to execute the uninstaller, '%s'. Do you want to remove the uninstall " "entry for this program from the registry?" -msgstr "無法執行移除程式 '%s'。您想將這個移除程式從註冊表中移除嗎?" +msgstr "無法執行移除程式 '%s'。您想將這個移除程式從登錄中移除嗎?" #: dlls/appwiz.cpl/appwiz.rc:36 msgid "Not specified" @@ -4774,7 +4774,7 @@ msgstr "不存在的權杖。\n" #: dlls/kernel32/winerror.mc:1063 msgid "Registry corrupt.\n" -msgstr "註冊表損毀。\n" +msgstr "登錄損毀。\n" #: dlls/kernel32/winerror.mc:1068 msgid "Invalid key.\n" @@ -4782,47 +4782,47 @@ msgstr "無效的索引鍵。\n" #: dlls/kernel32/winerror.mc:1073 msgid "Can't open registry key.\n" -msgstr "無法開啟註冊表索引鍵。\n" +msgstr "無法開啟登錄機碼。\n" #: dlls/kernel32/winerror.mc:1078 msgid "Can't read registry key.\n" -msgstr "無法讀取註冊表索引鍵。\n" +msgstr "無法讀取登錄機碼。\n" #: dlls/kernel32/winerror.mc:1083 msgid "Can't write registry key.\n" -msgstr "無法寫入註冊表索引鍵。\n" +msgstr "無法寫入登錄機碼。\n" #: dlls/kernel32/winerror.mc:1088 msgid "Registry has been recovered.\n" -msgstr "註冊表已復原。\n" +msgstr "登錄已復原。\n" #: dlls/kernel32/winerror.mc:1093 msgid "Registry is corrupt.\n" -msgstr "註冊表損毀。\n" +msgstr "登錄損毀。\n" #: dlls/kernel32/winerror.mc:1098 msgid "I/O to registry failed.\n" -msgstr "註冊表 I/O 時失敗。\n" +msgstr "I/O 至登錄時失敗。\n" #: dlls/kernel32/winerror.mc:1103 msgid "Not registry file.\n" -msgstr "非註冊表檔案。\n" +msgstr "非登錄檔案。\n" #: dlls/kernel32/winerror.mc:1108 msgid "Key deleted.\n" -msgstr "索引鍵已刪除。\n" +msgstr "已刪除機碼。\n" #: dlls/kernel32/winerror.mc:1113 msgid "No registry log space.\n" -msgstr "沒有註冊表記錄檔空間。\n" +msgstr "沒有登錄記錄檔空間。\n" #: dlls/kernel32/winerror.mc:1118 msgid "Registry key has subkeys.\n" -msgstr "註冊表索引鍵有子項。\n" +msgstr "登錄機碼有子項。\n" #: dlls/kernel32/winerror.mc:1123 msgid "Subkey must be volatile.\n" -msgstr "子項必須是可變的。\n" +msgstr "子機碼必須是可變的。\n" #: dlls/kernel32/winerror.mc:1128 msgid "Notify change request in progress.\n" @@ -8020,7 +8020,7 @@ msgstr "新資料夾" #: dlls/msi/msi.rc:91 msgid "Allocating registry space" -msgstr "正在分配註冊表空間" +msgstr "正在分配登錄空間" #: dlls/msi/msi.rc:92 msgid "Searching for installed applications" @@ -10464,22 +10464,16 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "(UTC+00:00) 都柏林，愛丁堡，里斯本，倫敦" #: dlls/tzres/tzres.rc:342 -#, fuzzy -#| msgid "Sudan Standard Time" msgid "South Sudan Standard Time" -msgstr "蘇丹標準時間" +msgstr "南蘇丹標準時間" #: dlls/tzres/tzres.rc:343 -#, fuzzy -#| msgid "Sudan Daylight Time" msgid "South Sudan Daylight Time" -msgstr "蘇丹夏令時間" +msgstr "南蘇丹夏令時間" #: dlls/tzres/tzres.rc:344 -#, fuzzy -#| msgid "(UTC+02:00) Jerusalem" msgid "(UTC+02:00) Juba" -msgstr "(UTC+02:00) 耶路撒冷" +msgstr "(UTC+02:00) 朱巴" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" @@ -13355,7 +13349,7 @@ msgid "" msgstr "" "PATH 顯示或變更 cmd 的搜尋路徑。\n" "\n" -"輸入 PATH 將會顯示目前的路徑設定 (根據註冊表\n" +"輸入 PATH 將會顯示目前的路徑設定 (根據登錄\n" "進行初始化)。要變更設定就在\n" "PATH 命令之後緊接新的值。\n" "\n" @@ -14765,7 +14759,7 @@ msgstr "系統設定(&S)" #: programs/oleview/oleview.rc:36 msgid "&Run the Registry Editor" -msgstr "執行註冊表編輯器(&R)" +msgstr "執行登錄檔編輯器(&R)" #: programs/oleview/oleview.rc:42 msgid "&CoCreateInstance Flag" @@ -14877,7 +14871,7 @@ msgid "" "These settings change only registry values.\n" "They have no effect on Wine performance." msgstr "" -"這些設定只改變註冊表內的值。\n" +"這些設定只改變登錄內的值。\n" "它對 Wine 的性能沒有影響。" #: programs/oleview/oleview.rc:180 @@ -14942,7 +14936,7 @@ msgstr "變更本機分散式 COM 設定" #: programs/oleview/oleview.rc:108 msgid "Run the Wine registry editor" -msgstr "執行 Wine 註冊表編輯器" +msgstr "執行 Wine 登錄檔編輯器" #: programs/oleview/oleview.rc:109 msgid "Quit the application. Prompts to save changes" @@ -15047,7 +15041,7 @@ msgstr "介面" #: programs/oleview/oleview.rc:140 msgid "Registry" -msgstr "註冊表" +msgstr "登錄" #: programs/oleview/oleview.rc:141 msgid "Implementation" @@ -15313,7 +15307,7 @@ msgstr "輸入 \"REG %1 /?\" 以取得說明。\n" #: programs/reg/reg.rc:181 msgid "reg: Unable to access or create the specified registry key\n" -msgstr "reg: 無法存取或建立指定的註冊表鍵\n" +msgstr "reg: 無法存取或建立指定的登錄機碼\n" #: programs/reg/reg.rc:116 msgid "reg: The operation completed successfully\n" @@ -15321,7 +15315,7 @@ msgstr "reg: 操作成功完成\n" #: programs/reg/reg.rc:131 msgid "reg: The registry operation was cancelled\n" -msgstr "reg: 註冊表操作已經取消\n" +msgstr "reg: 登錄操作已經取消\n" #: programs/reg/reg.rc:174 msgid "reg: Unable to find the specified registry key\n" @@ -15412,7 +15406,7 @@ msgid "" msgstr "" "REG ADD <機碼> [/v 值名稱 | /ve] [/t 類型] [/s 分隔符號] [/d 資料] [/f]\n" "\n" -" 新增一個機碼到註冊表，或新增值到給定的登錄機碼。\n" +" 新增一個機碼到登錄，或新增值到給定的登錄機碼。\n" "\n" " <機碼>\n" " 要新增的機碼，如果指定了 [/v] 或 [/ve]，\n" @@ -15438,7 +15432,7 @@ msgstr "" " 登錄值。\n" "\n" " /t <類型>\n" -" 要新增到註冊表的資料類型。如果指定了 [/t]，\n" +" 要新增到登錄的資料類型。如果指定了 [/t]，\n" " <類型> 必須是下列的其中一個:\n" "\n" " REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" @@ -15665,7 +15659,7 @@ msgid "" msgstr "" "REG IMPORT <檔案>\n" "\n" -" 從給定的檔案匯入機碼、值和資料到註冊表。\n" +" 從給定的檔案匯入機碼、值和資料到登錄。\n" "\n" " <檔案>\n" " 要匯入的登錄檔案的名稱和路徑。\n" @@ -15849,7 +15843,7 @@ msgstr "搜尋完成。相符項目的數目: %1!d!\n" #: programs/regedit/regedit.rc:34 msgid "&Registry" -msgstr "註冊表(&R)" +msgstr "登錄檔(&R)" #: programs/regedit/regedit.rc:36 msgid "&Import Registry File..." @@ -15921,7 +15915,7 @@ msgstr "移除我的最愛(&R)..." #: programs/regedit/regedit.rc:80 msgid "&About Registry Editor" -msgstr "關於註冊表編輯器(&A)" +msgstr "關於登錄檔編輯器(&A)" #: programs/regedit/regedit.rc:89 programs/regedit/regedit.rc:96 #: programs/regedit/regedit.rc:230 @@ -15934,7 +15928,7 @@ msgstr "修改二進位資料(&B)..." #: programs/regedit/regedit.rc:267 msgid "Export registry" -msgstr "匯出註冊表" +msgstr "要匯出的登錄" #: programs/regedit/regedit.rc:269 msgid "S&elected branch:" @@ -16016,28 +16010,28 @@ msgstr "編輯多字串" #: programs/regedit/regedit.rc:159 msgid "Contains commands for working with the whole registry" -msgstr "含有與註冊表有關的全部指令" +msgstr "包含登錄工作相關的全部命令" #: programs/regedit/regedit.rc:160 msgid "Contains commands for editing values or keys" -msgstr "含有與編輯數值有關的全部指令" +msgstr "包含編輯機碼或值的命令" #: programs/regedit/regedit.rc:161 msgid "Contains commands for customizing the registry window" -msgstr "含有與自訂註冊表視窗有關的全部指令" +msgstr "包含自訂登錄視窗的命令" #: programs/regedit/regedit.rc:162 msgid "Contains commands for accessing frequently used keys" -msgstr "含有與使用常用索引鍵有關的全部指令" +msgstr "包含使用常用的機碼的命令" #: programs/regedit/regedit.rc:163 msgid "" "Contains commands for displaying Help and information about Registry Editor" -msgstr "含有顯示登錄編輯程式說明及資訊的命令" +msgstr "包含顯示登錄編輯程式說明及資訊的命令" #: programs/regedit/regedit.rc:164 msgid "Contains commands for creating new keys or values" -msgstr "含有與建立新值有關的全部指令" +msgstr "包含建立新機碼或值的指令" #: programs/regedit/regedit.rc:149 msgid "Data" @@ -16045,7 +16039,7 @@ msgstr "資料" #: programs/regedit/regedit.rc:154 msgid "Registry Editor" -msgstr "註冊表編輯器" +msgstr "登錄檔編輯器" #: programs/regedit/regedit.rc:221 msgid "Import Registry File" @@ -16114,7 +16108,7 @@ msgstr "無法重新命名選定的登錄值" #: programs/regedit/regedit.rc:255 msgid "" "The keys and values contained in %1 were successfully added to the registry." -msgstr "%1 所包含的機碼和值已成功新增至註冊表。" +msgstr "%1 所包含的機碼和值已成功新增至登錄。" #: programs/regedit/regedit.rc:256 msgid "Unable to import %1. The specified file is not a valid registry file." @@ -16270,7 +16264,7 @@ msgstr "regedit: 該列有錯誤的語法。\n" #: programs/regedit/regedit.rc:187 msgid "Quits the Registry Editor" -msgstr "結束註冊表編輯器" +msgstr "結束登錄檔編輯器" #: programs/regedit/regedit.rc:188 msgid "Adds keys to the favorites list" @@ -16334,19 +16328,19 @@ msgstr "新增一個新的 32 位元值" #: programs/regedit/regedit.rc:177 msgid "Imports a text file into the registry" -msgstr "將純文字檔案匯入註冊表" +msgstr "將純文字檔案匯入登錄" #: programs/regedit/regedit.rc:179 msgid "Exports all or part of the registry to a text file" -msgstr "將註冊表匯出到純文字檔案" +msgstr "將登錄匯出到純文字檔案" #: programs/regedit/regedit.rc:180 msgid "Prints all or part of the registry" -msgstr "列印註冊表的全部或部分" +msgstr "列印登錄的全部或部分" #: programs/regedit/regedit.rc:181 msgid "Opens Registry Editor Help" -msgstr "開啟註冊表編輯器的說明" +msgstr "開啟登錄檔編輯器的說明" #: programs/regedit/regedit.rc:182 msgid "Displays program information, version number and copyright" -- 2.33.0.windows.2

1 0

[PATCH 1/2] ws2_32: Don't read more than necessary from the inputs in select().
by Torge Matthies 23 Dec '21

23 Dec '21

.NET Framework / old .NET Core seems to allocate not more space than necessary for the fd_set inputs, so if the allocation fell on the edge of the end of the heap, Wine tried to read past it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52259 Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/ws2_32/socket.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 648284c10a3..446cbd0b469 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2395,9 +2395,9 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, FD_ZERO( &read ); FD_ZERO( &write ); FD_ZERO( &except ); - if (read_ptr) read = *read_ptr; - if (write_ptr) write = *write_ptr; - if (except_ptr) except = *except_ptr; + if (read_ptr) read.fd_count = read_ptr->fd_count; + if (write_ptr) write.fd_count = write_ptr->fd_count; + if (except_ptr) except.fd_count = except_ptr->fd_count; if (!(sync_event = get_sync_event())) return -1; @@ -2408,26 +2408,29 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, for (i = 0; i < read.fd_count; ++i) { - params->sockets[params->count].socket = read.fd_array[i]; + poll_socket = read_ptr->fd_array[i]; + read.fd_array[i] = poll_socket; + params->sockets[params->count].socket = poll_socket; params->sockets[params->count].flags = AFD_POLL_READ | AFD_POLL_ACCEPT | AFD_POLL_HUP; ++params->count; - poll_socket = read.fd_array[i]; } for (i = 0; i < write.fd_count; ++i) { - params->sockets[params->count].socket = write.fd_array[i]; + poll_socket = write_ptr->fd_array[i]; + write.fd_array[i] = poll_socket; + params->sockets[params->count].socket = poll_socket; params->sockets[params->count].flags = AFD_POLL_WRITE; ++params->count; - poll_socket = write.fd_array[i]; } for (i = 0; i < except.fd_count; ++i) { - params->sockets[params->count].socket = except.fd_array[i]; + poll_socket = except_ptr->fd_array[i]; + except.fd_array[i] = poll_socket; + params->sockets[params->count].socket = poll_socket; params->sockets[params->count].flags = AFD_POLL_OOB | AFD_POLL_CONNECT_ERR; ++params->count; - poll_socket = except.fd_array[i]; } if (!params->count) @@ -2450,9 +2453,9 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, if (!status) { /* pointers may alias, so clear them all first */ - if (read_ptr) FD_ZERO( read_ptr ); - if (write_ptr) FD_ZERO( write_ptr ); - if (except_ptr) FD_ZERO( except_ptr ); + if (read_ptr) read_ptr->fd_count = 0; + if (write_ptr) write_ptr->fd_count = 0; + if (except_ptr) except_ptr->fd_count = 0; for (i = 0; i < params->count; ++i) { -- 2.34.1

2 3

[PATCH 1/2] widl: Define _WIN64 for 64-bit targets.
by Bernhard Übelacker 23 Dec '21

23 Dec '21

Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- tools/widl/widl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 0b5f07236f0..d241e046846 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -849,6 +849,8 @@ int main(int argc,char *argv[]) add_widl_version_define(); wpp_add_cmdline_define("_WIN32=1"); + if (pointer_size == 8) + wpp_add_cmdline_define("_WIN64=1"); atexit(rm_tempfile); if (!no_preprocess) -- 2.34.1

1 2

[PATCH] msado15: Use a 64-bit type for DefinedSize on amd64.
by Bernhard Übelacker 22 Dec '21

22 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50842 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- dlls/msado15/recordset.c | 8 ++++---- dlls/msado15/tests/msado15.c | 9 +++++---- include/msado15_backcompat.idl | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 92a0deb6959..61b7ebb596a 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -69,7 +69,7 @@ struct field LONG refs; WCHAR *name; DataTypeEnum type; - LONG defined_size; + LONG_PTR defined_size; LONG attrs; LONG index; struct recordset *recordset; @@ -211,7 +211,7 @@ static HRESULT WINAPI field_get_Attributes( Field *iface, LONG *attrs ) return S_OK; } -static HRESULT WINAPI field_get_DefinedSize( Field *iface, LONG *size ) +static HRESULT WINAPI field_get_DefinedSize( Field *iface, LONG_PTR *size ) { struct field *field = impl_from_Field( iface ); @@ -360,11 +360,11 @@ static HRESULT WINAPI field_put_Type( Field *iface, DataTypeEnum type ) return S_OK; } -static HRESULT WINAPI field_put_DefinedSize( Field *iface, LONG size ) +static HRESULT WINAPI field_put_DefinedSize( Field *iface, LONG_PTR size ) { struct field *field = impl_from_Field( iface ); - TRACE( "%p, %d\n", field, size ); + TRACE( "%p, %ld\n", field, size ); field->defined_size = size; return S_OK; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 25c9c6f8356..cbe48764324 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -631,7 +631,7 @@ static void test_ADORecordsetConstruction(void) if (count > 0) { VARIANT index; - LONG size; + LONG_PTR size; DataTypeEnum type; V_VT( &index ) = VT_BSTR; @@ -646,7 +646,7 @@ static void test_ADORecordsetConstruction(void) size = -1; hr = Field_get_DefinedSize( field, &size ); ok( hr == S_OK, "got %08x\n", hr ); - ok( size == 5, "got %d\n", size ); + ok( size == 5, "got %ld\n", size ); VariantClear(&index); @@ -672,7 +672,8 @@ static void test_Fields(void) Field *field, *field2; VARIANT val, index; BSTR name; - LONG count, size; + LONG count; + LONG_PTR size; DataTypeEnum type; FieldAttributeEnum attrs; HRESULT hr; @@ -747,7 +748,7 @@ static void test_Fields(void) size = -1; hr = Field_get_DefinedSize( field, &size ); ok( hr == S_OK, "got %08x\n", hr ); - ok( size == 4, "got %d\n", size ); + ok( size == 4, "got %ld\n", size ); attrs = 0xdead; hr = Field_get_Attributes( field, &attrs ); ok( hr == S_OK, "got %08x\n", hr ); diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index fedaf557066..08566a2eee0 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -634,7 +634,7 @@ interface Field20 : _ADO [id(0x0000044f), propget] HRESULT DefinedSize( - [out, retval] LONG *size); + [out, retval] LONG_PTR *size); [id(0x0000044c), propget] HRESULT Name( @@ -699,7 +699,7 @@ interface Field20 : _ADO [id(0x0000044f), propput] HRESULT DefinedSize( - [in] LONG size); + [in] LONG_PTR size); [id(0x0000040c), propput] HRESULT Attributes( -- 2.34.1

2 2

[PATCH] api-ms-win-core-versionansi-l1-1-1: Add dll.
by David Warner 22 Dec '21

22 Dec '21

Add the ANSI analogue to api-ms-win-core-version-l1-1-1 Signed-off-by: David Warner <david.p.warner(a)gmail.com> --- configure | 1 + configure.ac | 1 + dlls/api-ms-win-core-versionansi-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-versionansi-l1-1-1.spec | 6 ++++++ tools/make_specfiles | 1 + 5 files changed, 10 insertions(+) create mode 100644 dlls/api-ms-win-core-versionansi-l1-1-1/Makefile.in create mode 100644 dlls/api-ms-win-core-versionansi-l1-1-1/api-ms-win-core-versionansi-l1-1-1.spec diff --git a/configure b/configure index 69159422456..f38652cc263 100755 --- a/configure +++ b/configure @@ -21545,6 +21545,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-version-l1-1-0 enable_api_ms_win_co wine_fn_config_makefile dlls/api-ms-win-core-version-l1-1-1 enable_api_ms_win_core_version_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-version-private-l1-1-0 enable_api_ms_win_core_version_private_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-versionansi-l1-1-0 enable_api_ms_win_core_versionansi_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-versionansi-l1-1-1 enable_api_ms_win_core_versionansi_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-windowserrorreporting-l1-1-0 enable_api_ms_win_core_windowserrorreporting_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-winrt-error-l1-1-1 enable_api_ms_win_core_winrt_error_l1_1_1 diff --git a/configure.ac b/configure.ac index c1eb2f99a8c..57c4e01be61 100644 --- a/configure.ac +++ b/configure.ac @@ -2469,6 +2469,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-version-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-version-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-version-private-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-versionansi-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-versionansi-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-windowserrorreporting-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-error-l1-1-1) diff --git a/dlls/api-ms-win-core-versionansi-l1-1-1/Makefile.in b/dlls/api-ms-win-core-versionansi-l1-1-1/Makefile.in new file mode 100644 index 00000000000..054fa70c479 --- /dev/null +++ b/dlls/api-ms-win-core-versionansi-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-versionansi-l1-1-1.dll diff --git a/dlls/api-ms-win-core-versionansi-l1-1-1/api-ms-win-core-versionansi-l1-1-1.spec b/dlls/api-ms-win-core-versionansi-l1-1-1/api-ms-win-core-versionansi-l1-1-1.spec new file mode 100644 index 00000000000..a73d8924376 --- /dev/null +++ b/dlls/api-ms-win-core-versionansi-l1-1-1/api-ms-win-core-versionansi-l1-1-1.spec @@ -0,0 +1,6 @@ +@ stdcall GetFileVersionInfoExA(long str long long ptr) version.GetFileVersionInfoExA +@ stdcall GetFileVersionInfoSizeExA(long str ptr) version.GetFileVersionInfoSizeExA +@ stdcall GetFileVersionInfoSizeA(str ptr) version.GetFileVersionInfoSizeA +@ stdcall GetFileVersionInfoA(str long long ptr) version.GetFileVersionInfoA +@ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) version.VerFindFileA +@ stdcall VerQueryValueA(ptr str ptr ptr) version.VerQueryValueA diff --git a/tools/make_specfiles b/tools/make_specfiles index 49a032ef14c..3e5f54f4947 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -442,6 +442,7 @@ my @dll_groups = [ "version", "api-ms-win-core-versionansi-l1-1-0", + "api-ms-win-core-versionansi-l1-1-1", "api-ms-win-core-version-l1-1-0", "api-ms-win-core-version-l1-1-1", "api-ms-win-core-version-private-l1-1-0", -- 2.33.1

1 0

[PATCH v2 2/2] user32: DefWindowProc(WM_NCCALCSIZE) should return 0.
by Dmitry Timoshkov 22 Dec '21

22 Dec '21

v2: Remove remaining todo_wine statements. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37609 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/defwnd.c | 3 ++- dlls/user32/tests/win.c | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 8cd9047f02b..1b28232b551 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -265,7 +265,8 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa } case WM_NCCALCSIZE: - return NC_HandleNCCalcSize( hwnd, wParam, (RECT *)lParam ); + NC_HandleNCCalcSize( hwnd, wParam, (RECT *)lParam ); + break; case WM_WINDOWPOSCHANGING: return WINPOS_HandleWindowPosChanging( hwnd, (WINDOWPOS *)lParam ); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index b93839e40b5..87a6a837070 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -12372,25 +12372,21 @@ static void test_WM_NCCALCSIZE(void) params.lppos = &winpos; ret = SendMessageW(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)&params); -todo_wine ok(!ret, "got %08x\n", ret); ok(EqualRect(&params.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(&params.rgrc[0])); params.rgrc[0] = window_rect; ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)&params); -todo_wine ok(!ret, "got %08x\n", ret); ok(EqualRect(&params.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(&params.rgrc[0])); GetWindowRect(hwnd, &window_rect); ret = SendMessageW(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect); -todo_wine ok(!ret, "got %08x\n", ret); ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect)); GetWindowRect(hwnd, &window_rect); ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect); -todo_wine ok(!ret, "got %08x\n", ret); ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect)); -- 2.34.1

2 2

[PATCH] po: Update Ukrainian translation.
by Andrey Gusev 22 Dec '21

22 Dec '21

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- po/uk.po | 553 +++++++++++++++++++++---------------------------------- 1 file changed, 209 insertions(+), 344 deletions(-) diff --git a/po/uk.po b/po/uk.po index 5940fb792f3..6aee0d6fae8 100644 --- a/po/uk.po +++ b/po/uk.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: 2020-12-25 21:00+0200\n" +"PO-Revision-Date: 2021-12-22 22:24+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -19,26 +19,20 @@ msgid "Security" msgstr "Безпека" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "&Користувач:" +msgstr "&Імена груп або користувачів:" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "Жовтий" +msgstr "Дозволити" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "Відмовити" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Permission denied" msgid "Permissions for %1" -msgstr "Доступ заборонено" +msgstr "Дозволи для %1" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" @@ -3718,30 +3712,24 @@ msgid "&Disable" msgstr "Вим&кнути" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy -#| msgid "Reset" msgid "&Reset" -msgstr "Скинути" +msgstr "&Скинути" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" msgstr "&Увімкнути" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "Змінити заміщення" +msgstr "&Змінити заміщення" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" msgstr "Під'єднано" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "Пристрій вводу голосу:" +msgstr "Під'єднано (пристрій xinput)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" @@ -3765,7 +3753,7 @@ msgstr "Кнопки" #: dlls/joy.cpl/joy.rc:68 msgid "Test Force Feedback" -msgstr "" +msgstr "Перевірка Force Feedback" #: dlls/joy.cpl/joy.rc:72 msgid "Available Effects" @@ -3998,7 +3986,7 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "" +msgstr "Неможливо визначити властивість '|': об'єкт не є розширюваним" #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" @@ -4009,10 +3997,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "Неможливо змінити властивість, яка не підлягає запису '|'" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "'[object]' не об'єкт типу date" +msgstr "'це' не є Map об'єкта" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" @@ -7010,10 +6996,8 @@ msgid "Resource is not currently available.\n" msgstr "Наразі ресурс недоступний.\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy -#| msgid "Class Name:" msgid "Classic Blue" -msgstr "Ім'я класу:" +msgstr "Класичний синій" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73 @@ -10511,7 +10495,7 @@ msgstr "Китайський літній час" #: dlls/tzres/tzres.rc:128 msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" -msgstr "" +msgstr "(UTC+08:00) Пекін, Чунцин, Гонконг, Урумчі" #: dlls/tzres/tzres.rc:267 msgid "North Asia Standard Time" @@ -10523,7 +10507,7 @@ msgstr "Північноазіатський літній час" #: dlls/tzres/tzres.rc:269 msgid "(UTC+07:00) Krasnoyarsk" -msgstr "" +msgstr "(UTC+07:00) Красноярськ" #: dlls/tzres/tzres.rc:168 msgid "Georgian Standard Time" @@ -10535,17 +10519,15 @@ msgstr "Грузинський літній час" #: dlls/tzres/tzres.rc:170 msgid "(UTC+04:00) Tbilisi" -msgstr "" +msgstr "(UTC+04:00) Тбілісі" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 msgid "UTC+12" -msgstr "" +msgstr "UTC+12" #: dlls/tzres/tzres.rc:395 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC+12:00) Coordinated Universal Time+12" -msgstr "Всесвітній координований час" +msgstr "(UTC+12:00) Всесвітній координований час+12" #: dlls/tzres/tzres.rc:252 msgid "Nepal Standard Time" @@ -10557,7 +10539,7 @@ msgstr "Непальський літній час" #: dlls/tzres/tzres.rc:254 msgid "(UTC+05:45) Kathmandu" -msgstr "" +msgstr "(UTC+05:45) Катманду" #: dlls/tzres/tzres.rc:90 msgid "Cape Verde Standard Time" @@ -10569,7 +10551,7 @@ msgstr "Літній час Кабо-Верде" #: dlls/tzres/tzres.rc:92 msgid "(UTC-01:00) Cabo Verde Is." -msgstr "" +msgstr "(UTC-01:00) Острів Кабо-Верде" #: dlls/tzres/tzres.rc:183 msgid "Haiti Standard Time" @@ -10581,7 +10563,7 @@ msgstr "Літній час Гаїті" #: dlls/tzres/tzres.rc:185 msgid "(UTC-05:00) Haiti" -msgstr "" +msgstr "(UTC-05:00) Гаїті" #: dlls/tzres/tzres.rc:111 msgid "Central European Standard Time" @@ -10593,7 +10575,7 @@ msgstr "Центральноєвропейський літній час" #: dlls/tzres/tzres.rc:113 msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" -msgstr "" +msgstr "(UTC+01:00) Сараєво, Скоп’є, Варшава, Загреб" #: dlls/tzres/tzres.rc:234 msgid "Morocco Standard Time" @@ -10605,33 +10587,27 @@ msgstr "Літній час Марокко" #: dlls/tzres/tzres.rc:236 msgid "(UTC+01:00) Casablanca" -msgstr "" +msgstr "(UTC+01:00) Касабланка" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 msgid "UTC-08" -msgstr "" +msgstr "UTC-08" #: dlls/tzres/tzres.rc:404 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-08:00) Coordinated Universal Time-08" -msgstr "Всесвітній координований час" +msgstr "(UTC-08:00) Всесвітній координований час-08" #: dlls/tzres/tzres.rc:39 -#, fuzzy -#| msgid "Atlantic Standard Time" msgid "Altai Standard Time" -msgstr "Атлантичний стандартний час" +msgstr "Алтайський стандартний час" #: dlls/tzres/tzres.rc:40 -#, fuzzy -#| msgid "Atlantic Daylight Time" msgid "Altai Daylight Time" -msgstr "Атлантичний літній час" +msgstr "Алтайський літній час" #: dlls/tzres/tzres.rc:41 msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" -msgstr "" +msgstr "(UTC+07:00) Барнаул, Горно-Алтайськ" #: dlls/tzres/tzres.rc:108 msgid "Central Europe Standard Time" @@ -10643,7 +10619,7 @@ msgstr "Центральноєвропейський літній час" #: dlls/tzres/tzres.rc:110 msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" -msgstr "" +msgstr "(UTC+01:00) Белград, Братислава, Будапешт, Любляна, Прага" #: dlls/tzres/tzres.rc:192 msgid "Iran Standard Time" @@ -10655,7 +10631,7 @@ msgstr "Іранський літній час" #: dlls/tzres/tzres.rc:194 msgid "(UTC+03:30) Tehran" -msgstr "" +msgstr "(UTC+03:30) Тегеран" #: dlls/tzres/tzres.rc:318 msgid "Saint Pierre Standard Time" @@ -10666,26 +10642,20 @@ msgid "Saint Pierre Daylight Time" msgstr "Літній час Сен-П'єра" #: dlls/tzres/tzres.rc:320 -#, fuzzy -#| msgid "Saint Pierre Standard Time" msgid "(UTC-03:00) Saint Pierre and Miquelon" -msgstr "Стандартний час Сен-П'єра" +msgstr "(UTC-03:00) Сен-П'єр і Мікелон" #: dlls/tzres/tzres.rc:327 -#, fuzzy -#| msgid "Samoa Standard Time" msgid "Sao Tome Standard Time" -msgstr "Стандартний час Самоа" +msgstr "Сан-Томе, стандартний час" #: dlls/tzres/tzres.rc:328 -#, fuzzy -#| msgid "Samoa Daylight Time" msgid "Sao Tome Daylight Time" -msgstr "Літній час Самоа" +msgstr "Сан-Томе, літній час" #: dlls/tzres/tzres.rc:329 msgid "(UTC+00:00) Sao Tome" -msgstr "" +msgstr "(UTC+00:00) Сан-Томе" #: dlls/tzres/tzres.rc:249 msgid "Namibia Standard Time" @@ -10697,7 +10667,7 @@ msgstr "Літній час Намібії" #: dlls/tzres/tzres.rc:251 msgid "(UTC+02:00) Windhoek" -msgstr "" +msgstr "(UTC+02:00) Віндхук" #: dlls/tzres/tzres.rc:369 msgid "Tonga Standard Time" @@ -10709,7 +10679,7 @@ msgstr "Літній час Королівства Тонга" #: dlls/tzres/tzres.rc:371 msgid "(UTC+13:00) Nuku'alofa" -msgstr "" +msgstr "(UTC+13:00) Нукуалофа" #: dlls/tzres/tzres.rc:240 msgid "Mountain Standard Time (Mexico)" @@ -10721,7 +10691,7 @@ msgstr "Гірський літній час (Мексика)" #: dlls/tzres/tzres.rc:242 msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" -msgstr "" +msgstr "(UTC-07:00) Чихуахуа, Ла-Пас, Мазатлан" #: dlls/tzres/tzres.rc:171 msgid "GMT Standard Time" @@ -10733,23 +10703,19 @@ msgstr "GMT літній час" #: dlls/tzres/tzres.rc:173 msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" -msgstr "" +msgstr "(UTC+00:00) Дублін, Единбург, Лісабон, Лондон" #: dlls/tzres/tzres.rc:342 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "South Sudan Standard Time" -msgstr "Йорданський стандартний час" +msgstr "Стандартний час Південного Судану" #: dlls/tzres/tzres.rc:343 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "South Sudan Daylight Time" -msgstr "Йорданський літній час" +msgstr "Літній час Південного Судану" #: dlls/tzres/tzres.rc:344 msgid "(UTC+02:00) Juba" -msgstr "" +msgstr "(UTC+02:00) Джуба" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" @@ -10761,7 +10727,7 @@ msgstr "Середньоазіатський літній час" #: dlls/tzres/tzres.rc:104 msgid "(UTC+06:00) Astana" -msgstr "" +msgstr "(UTC+06:00) Астана" #: dlls/tzres/tzres.rc:213 msgid "Lord Howe Standard Time" @@ -10773,7 +10739,7 @@ msgstr "Літній час острова Лорд-Хау" #: dlls/tzres/tzres.rc:215 msgid "(UTC+10:30) Lord Howe Island" -msgstr "" +msgstr "(UTC+10:30) Острів Лорд-Хау" #: dlls/tzres/tzres.rc:48 msgid "Arabic Standard Time" @@ -10785,17 +10751,15 @@ msgstr "Арабський літній час" #: dlls/tzres/tzres.rc:50 msgid "(UTC+03:00) Baghdad" -msgstr "" +msgstr "(UTC+03:00) Багдад" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 msgid "UTC+13" -msgstr "" +msgstr "UTC+13" #: dlls/tzres/tzres.rc:398 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC+13:00) Coordinated Universal Time+13" -msgstr "Всесвітній координований час" +msgstr "(UTC+13:00) Всесвітній координований час+13" #: dlls/tzres/tzres.rc:216 msgid "Magadan Standard Time" @@ -10807,7 +10771,7 @@ msgstr "Магаданський літній час" #: dlls/tzres/tzres.rc:218 msgid "(UTC+11:00) Magadan" -msgstr "" +msgstr "(UTC+11:00) Магадан" #: dlls/tzres/tzres.rc:258 msgid "Newfoundland Standard Time" @@ -10819,23 +10783,19 @@ msgstr "Літній час Ньюфаундленда" #: dlls/tzres/tzres.rc:260 msgid "(UTC-03:30) Newfoundland" -msgstr "" +msgstr "(UTC-03:30) Ньюфаундленд" #: dlls/tzres/tzres.rc:348 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "Sudan Standard Time" -msgstr "Йорданський стандартний час" +msgstr "Судан, стандартний час" #: dlls/tzres/tzres.rc:349 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "Sudan Daylight Time" -msgstr "Йорданський літній час" +msgstr "Судан, літній час" #: dlls/tzres/tzres.rc:350 msgid "(UTC+02:00) Khartoum" -msgstr "" +msgstr "(UTC+02:00) Хартум" #: dlls/tzres/tzres.rc:438 msgid "West Pacific Standard Time" @@ -10847,7 +10807,7 @@ msgstr "Західно-Тихоокеанський літній час" #: dlls/tzres/tzres.rc:440 msgid "(UTC+10:00) Guam, Port Moresby" -msgstr "" +msgstr "(UTC+10:00) Гуам, Порт-Морсбі" #: dlls/tzres/tzres.rc:279 msgid "Pacific Standard Time" @@ -10859,7 +10819,7 @@ msgstr "Тихоокеанський літній час" #: dlls/tzres/tzres.rc:281 msgid "(UTC-08:00) Pacific Time (US & Canada)" -msgstr "" +msgstr "(UTC-08:00) Тихоокеанський час (США та Канада)" #: dlls/tzres/tzres.rc:69 msgid "Azerbaijan Standard Time" @@ -10871,7 +10831,7 @@ msgstr "Азербайджанський літній час" #: dlls/tzres/tzres.rc:71 msgid "(UTC+04:00) Baku" -msgstr "" +msgstr "(UTC+04:00) Баку" #: dlls/tzres/tzres.rc:219 msgid "Magallanes Standard Time" @@ -10883,7 +10843,7 @@ msgstr "Літній час Магальянеса" #: dlls/tzres/tzres.rc:221 msgid "(UTC-03:00) Punta Arenas" -msgstr "" +msgstr "(UTC-03:00) Пунта-Аренас" #: dlls/tzres/tzres.rc:324 msgid "Samoa Standard Time" @@ -10895,7 +10855,7 @@ msgstr "Літній час Самоа" #: dlls/tzres/tzres.rc:326 msgid "(UTC+13:00) Samoa" -msgstr "" +msgstr "(UTC+13:00) Самоа" #: dlls/tzres/tzres.rc:201 msgid "Kaliningrad Standard Time" @@ -10907,7 +10867,7 @@ msgstr "Калінінградський літній час" #: dlls/tzres/tzres.rc:203 msgid "(UTC+02:00) Kaliningrad" -msgstr "" +msgstr "(UTC+02:00) Калінінград" #: dlls/tzres/tzres.rc:282 msgid "Pacific Standard Time (Mexico)" @@ -10919,7 +10879,7 @@ msgstr "Тихоокеанський літній час (Мексика)" #: dlls/tzres/tzres.rc:284 msgid "(UTC-08:00) Baja California" -msgstr "" +msgstr "(UTC-08:00) Баха-Каліфорнія" #: dlls/tzres/tzres.rc:228 msgid "Middle East Standard Time" @@ -10931,7 +10891,7 @@ msgstr "Близькосхідний літній час" #: dlls/tzres/tzres.rc:230 msgid "(UTC+02:00) Beirut" -msgstr "" +msgstr "(UTC+02:00) Бейрут" #: dlls/tzres/tzres.rc:363 msgid "Tokyo Standard Time" @@ -10943,7 +10903,7 @@ msgstr "Токійський літній час" #: dlls/tzres/tzres.rc:365 msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" -msgstr "" +msgstr "(UTC+09:00) Осака, Саппоро, Токіо" #: dlls/tzres/tzres.rc:210 msgid "Line Islands Standard Time" @@ -10955,7 +10915,7 @@ msgstr "Літній час островів Лайн" #: dlls/tzres/tzres.rc:212 msgid "(UTC+14:00) Kiritimati Island" -msgstr "" +msgstr "(UTC+14:00) Острів Кіритіматі" #: dlls/tzres/tzres.rc:129 msgid "Cuba Standard Time" @@ -10967,7 +10927,7 @@ msgstr "Кубинський літній час" #: dlls/tzres/tzres.rc:131 msgid "(UTC-05:00) Havana" -msgstr "" +msgstr "(UTC-05:00) Гавана" #: dlls/tzres/tzres.rc:198 msgid "Jordan Standard Time" @@ -10979,7 +10939,7 @@ msgstr "Йорданський літній час" #: dlls/tzres/tzres.rc:200 msgid "(UTC+02:00) Amman" -msgstr "" +msgstr "(UTC+02:00) Амман" #: dlls/tzres/tzres.rc:117 msgid "Central Standard Time" @@ -10991,7 +10951,7 @@ msgstr "Центральний літній час" #: dlls/tzres/tzres.rc:119 msgid "(UTC-06:00) Central Time (US & Canada)" -msgstr "" +msgstr "(UTC-06:00) Центральний час (США та Канада)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 msgid "Russia Time Zone 3" @@ -10999,23 +10959,19 @@ msgstr "" #: dlls/tzres/tzres.rc:305 msgid "(UTC+04:00) Izhevsk, Samara" -msgstr "" +msgstr "(UTC+04:00) Іжевськ, Самара" #: dlls/tzres/tzres.rc:417 -#, fuzzy -#| msgid "Tonga Standard Time" msgid "Volgograd Standard Time" -msgstr "Стандартний час Королівства Тонга" +msgstr "Волгоград, стандартний час" #: dlls/tzres/tzres.rc:418 -#, fuzzy -#| msgid "Tonga Daylight Time" msgid "Volgograd Daylight Time" -msgstr "Літній час Королівства Тонга" +msgstr "Волгоград, літній час" #: dlls/tzres/tzres.rc:419 msgid "(UTC+04:00) Volgograd" -msgstr "" +msgstr "(UTC+04:00) Волгоград" #: dlls/tzres/tzres.rc:72 msgid "Azores Standard Time" @@ -11027,7 +10983,7 @@ msgstr "Літній час Азорських островів" #: dlls/tzres/tzres.rc:74 msgid "(UTC-01:00) Azores" -msgstr "" +msgstr "(UTC-01:00) Азорські острови" #: dlls/tzres/tzres.rc:264 msgid "North Asia East Standard Time" @@ -11039,17 +10995,15 @@ msgstr "Північноазіатський східний літній час" #: dlls/tzres/tzres.rc:266 msgid "(UTC+08:00) Irkutsk" -msgstr "" +msgstr "(UTC+08:00) Іркутськ" #: dlls/tzres/tzres.rc:408 dlls/tzres/tzres.rc:409 msgid "UTC-11" -msgstr "" +msgstr "UTC-11" #: dlls/tzres/tzres.rc:410 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-11:00) Coordinated Universal Time-11" -msgstr "Всесвітній координований час" +msgstr "(UTC-11:00) Всесвітній координований час-11" #: dlls/tzres/tzres.rc:51 msgid "Argentina Standard Time" @@ -11061,23 +11015,19 @@ msgstr "Аргентинський літній час" #: dlls/tzres/tzres.rc:53 msgid "(UTC-03:00) City of Buenos Aires" -msgstr "" +msgstr "(UTC-03:00) Буенос-Айрес" #: dlls/tzres/tzres.rc:378 -#, fuzzy -#| msgid "Turkey Standard Time" msgid "Turks And Caicos Standard Time" -msgstr "Турецький стандартний час" +msgstr "Теркс і Кайкос, стандартний час" #: dlls/tzres/tzres.rc:379 -#, fuzzy -#| msgid "Turkey Daylight Time" msgid "Turks And Caicos Daylight Time" -msgstr "Турецький літній час" +msgstr "Теркс і Кайкос, літній час" #: dlls/tzres/tzres.rc:380 msgid "(UTC-05:00) Turks and Caicos" -msgstr "" +msgstr "(UTC-05:00) Теркс і Кайкос" #: dlls/tzres/tzres.rc:222 msgid "Marquesas Standard Time" @@ -11089,7 +11039,7 @@ msgstr "Літній час Маркізьких островів" #: dlls/tzres/tzres.rc:224 msgid "(UTC-09:30) Marquesas Islands" -msgstr "" +msgstr "(UTC-09:30) Маркізські острови" #: dlls/tzres/tzres.rc:243 msgid "Myanmar Standard Time" @@ -11101,17 +11051,15 @@ msgstr "Літній час М'янми" #: dlls/tzres/tzres.rc:245 msgid "(UTC+06:30) Yangon (Rangoon)" -msgstr "" +msgstr "(UTC+06:30) Янгон (Рангун)" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 msgid "Coordinated Universal Time" msgstr "Всесвітній координований час" #: dlls/tzres/tzres.rc:392 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC) Coordinated Universal Time" -msgstr "Всесвітній координований час" +msgstr "(UTC) Всесвітній координований час" #: dlls/tzres/tzres.rc:189 msgid "India Standard Time" @@ -11123,7 +11071,7 @@ msgstr "Індійський літній час" #: dlls/tzres/tzres.rc:191 msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" -msgstr "" +msgstr "(UTC+05:30) Ченнаї, Колката, Мумбаї, Нью-Делі" #: dlls/tzres/tzres.rc:180 msgid "GTB Standard Time" @@ -11135,7 +11083,7 @@ msgstr "GTB літній час" #: dlls/tzres/tzres.rc:182 msgid "(UTC+02:00) Athens, Bucharest" -msgstr "" +msgstr "(UTC+02:00) Афіни, Бухарест" #: dlls/tzres/tzres.rc:375 msgid "Turkey Standard Time" @@ -11147,23 +11095,19 @@ msgstr "Турецький літній час" #: dlls/tzres/tzres.rc:377 msgid "(UTC+03:00) Istanbul" -msgstr "" +msgstr "(UTC+03:00) Стамбул" #: dlls/tzres/tzres.rc:54 -#, fuzzy -#| msgid "Arabian Standard Time" msgid "Astrakhan Standard Time" -msgstr "Арабський стандартний час" +msgstr "Астраханський стандартний час" #: dlls/tzres/tzres.rc:55 -#, fuzzy -#| msgid "Arabian Daylight Time" msgid "Astrakhan Daylight Time" -msgstr "Арабський літній час" +msgstr "Астраханський літній час" #: dlls/tzres/tzres.rc:56 msgid "(UTC+04:00) Astrakhan, Ulyanovsk" -msgstr "" +msgstr "(UTC+04:00) Астрахань, Ульяновськ" #: dlls/tzres/tzres.rc:162 msgid "Fiji Standard Time" @@ -11175,7 +11119,7 @@ msgstr "Літній час Фіджі" #: dlls/tzres/tzres.rc:164 msgid "(UTC+12:00) Fiji" -msgstr "" +msgstr "(UTC+12:00) Фіджі" #: dlls/tzres/tzres.rc:87 msgid "Canada Central Standard Time" @@ -11187,23 +11131,19 @@ msgstr "Центральний літній час Канади" #: dlls/tzres/tzres.rc:89 msgid "(UTC-06:00) Saskatchewan" -msgstr "" +msgstr "(UTC-06:00) Саскачеван" #: dlls/tzres/tzres.rc:444 -#, fuzzy -#| msgid "Yakutsk Standard Time" msgid "Yukon Standard Time" -msgstr "Якутський стандартний час" +msgstr "Юкон, стандартний час" #: dlls/tzres/tzres.rc:445 -#, fuzzy -#| msgid "Yakutsk Daylight Time" msgid "Yukon Daylight Time" -msgstr "Якутський літній час" +msgstr "Юкон, літній час" #: dlls/tzres/tzres.rc:446 msgid "(UTC-07:00) Yukon" -msgstr "" +msgstr "(UTC-07:00) Юкон" #: dlls/tzres/tzres.rc:354 msgid "Taipei Standard Time" @@ -11215,7 +11155,7 @@ msgstr "Тайбейський літній час" #: dlls/tzres/tzres.rc:356 msgid "(UTC+08:00) Taipei" -msgstr "" +msgstr "(UTC+08:00) Тайбей" #: dlls/tzres/tzres.rc:426 msgid "W. Europe Standard Time" @@ -11227,7 +11167,7 @@ msgstr "Західноєвропейський літній час" #: dlls/tzres/tzres.rc:428 msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" -msgstr "" +msgstr "(UTC+01:00) Амстердам, Берлін, Берн, Рим, Стокгольм, Відень" #: dlls/tzres/tzres.rc:231 msgid "Montevideo Standard Time" @@ -11239,7 +11179,7 @@ msgstr "Літній час Монтевідео" #: dlls/tzres/tzres.rc:233 msgid "(UTC-03:00) Montevideo" -msgstr "" +msgstr "(UTC-03:00) Монтевідео" #: dlls/tzres/tzres.rc:285 msgid "Pakistan Standard Time" @@ -11251,23 +11191,19 @@ msgstr "Пакистанський літній час" #: dlls/tzres/tzres.rc:287 msgid "(UTC+05:00) Islamabad, Karachi" -msgstr "" +msgstr "(UTC+05:00) Ісламабад, Карачі" #: dlls/tzres/tzres.rc:366 -#, fuzzy -#| msgid "Tokyo Standard Time" msgid "Tomsk Standard Time" -msgstr "Токійський стандартний час" +msgstr "Томськ, стандартний час" #: dlls/tzres/tzres.rc:367 -#, fuzzy -#| msgid "Tokyo Daylight Time" msgid "Tomsk Daylight Time" -msgstr "Токійський літній час" +msgstr "Томськ, літній час" #: dlls/tzres/tzres.rc:368 msgid "(UTC+07:00) Tomsk" -msgstr "" +msgstr "(UTC+07:00) Томськ" #: dlls/tzres/tzres.rc:93 msgid "Caucasus Standard Time" @@ -11279,7 +11215,7 @@ msgstr "Кавказький літній час" #: dlls/tzres/tzres.rc:95 msgid "(UTC+04:00) Yerevan" -msgstr "" +msgstr "(UTC+04:00) Єреван" #: dlls/tzres/tzres.rc:66 msgid "AUS Eastern Standard Time" @@ -11291,7 +11227,7 @@ msgstr "AUS східний літній час" #: dlls/tzres/tzres.rc:68 msgid "(UTC+10:00) Canberra, Melbourne, Sydney" -msgstr "" +msgstr "(UTC+10:00) Канберра, Мельбурн, Сідней" #: dlls/tzres/tzres.rc:246 msgid "N. Central Asia Standard Time" @@ -11303,7 +11239,7 @@ msgstr "Північно-Центральна Азія за літнім час #: dlls/tzres/tzres.rc:248 msgid "(UTC+07:00) Novosibirsk" -msgstr "" +msgstr "(UTC+07:00) Новосибірськ" #: dlls/tzres/tzres.rc:150 msgid "Eastern Standard Time" @@ -11315,39 +11251,31 @@ msgstr "Східний літній час" #: dlls/tzres/tzres.rc:152 msgid "(UTC-05:00) Eastern Time (US & Canada)" -msgstr "" +msgstr "(UTC-05:00) Східний час (США та Канада)" #: dlls/tzres/tzres.rc:372 -#, fuzzy -#| msgid "Tasmania Standard Time" msgid "Transbaikal Standard Time" -msgstr "Тасманійський стандартний час" +msgstr "Забайкальський стандартний час" #: dlls/tzres/tzres.rc:373 -#, fuzzy -#| msgid "Tasmania Daylight Time" msgid "Transbaikal Daylight Time" -msgstr "Тасманійський літній час" +msgstr "Забайкальський літній час" #: dlls/tzres/tzres.rc:374 msgid "(UTC+09:00) Chita" -msgstr "" +msgstr "(UTC+09:00) Чита" #: dlls/tzres/tzres.rc:141 -#, fuzzy -#| msgid "W. Europe Standard Time" msgid "E. Europe Standard Time" -msgstr "Західноєвропейський стандартний час" +msgstr "Східноєвропейський стандартний час" #: dlls/tzres/tzres.rc:142 -#, fuzzy -#| msgid "W. Europe Daylight Time" msgid "E. Europe Daylight Time" -msgstr "Західноєвропейський літній час" +msgstr "Східноєвропейський літній час" #: dlls/tzres/tzres.rc:143 msgid "(UTC+02:00) Chisinau" -msgstr "" +msgstr "(UTC+02:00) Кишинів" #: dlls/tzres/tzres.rc:120 msgid "Central Standard Time (Mexico)" @@ -11359,23 +11287,19 @@ msgstr "Центральний літній час (Мексика)" #: dlls/tzres/tzres.rc:122 msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" -msgstr "" +msgstr "(UTC-06:00) Гвадалахара, Мехіко, Монтеррей" #: dlls/tzres/tzres.rc:330 -#, fuzzy -#| msgid "Samoa Standard Time" msgid "Saratov Standard Time" -msgstr "Стандартний час Самоа" +msgstr "Саратовський стандартний час" #: dlls/tzres/tzres.rc:331 -#, fuzzy -#| msgid "Samoa Daylight Time" msgid "Saratov Daylight Time" -msgstr "Літній час Самоа" +msgstr "Саратовський літній час" #: dlls/tzres/tzres.rc:332 msgid "(UTC+04:00) Saratov" -msgstr "" +msgstr "(UTC+04:00) Саратов" #: dlls/tzres/tzres.rc:57 msgid "Atlantic Standard Time" @@ -11387,7 +11311,7 @@ msgstr "Атлантичний літній час" #: dlls/tzres/tzres.rc:59 msgid "(UTC-04:00) Atlantic Time (Canada)" -msgstr "" +msgstr "(UTC-04:00) Атлантичний час (Канада)" #: dlls/tzres/tzres.rc:237 msgid "Mountain Standard Time" @@ -11399,7 +11323,7 @@ msgstr "Гірський літній час" #: dlls/tzres/tzres.rc:239 msgid "(UTC-07:00) Mountain Time (US & Canada)" -msgstr "" +msgstr "(UTC-07:00) Гірський час (США та Канада)" #: dlls/tzres/tzres.rc:384 msgid "US Eastern Standard Time" @@ -11411,23 +11335,19 @@ msgstr "Східний літній час США" #: dlls/tzres/tzres.rc:386 msgid "(UTC-05:00) Indiana (East)" -msgstr "" +msgstr "(UTC-05:00) Індіана (Схід)" #: dlls/tzres/tzres.rc:321 -#, fuzzy -#| msgid "Alaskan Standard Time" msgid "Sakhalin Standard Time" -msgstr "Аляскинський стандартний час" +msgstr "Сахалінський стандартний час" #: dlls/tzres/tzres.rc:322 -#, fuzzy -#| msgid "Alaskan Daylight Time" msgid "Sakhalin Daylight Time" -msgstr "Аляскинський літній час" +msgstr "Сахалінський літній час" #: dlls/tzres/tzres.rc:323 msgid "(UTC+11:00) Sakhalin" -msgstr "" +msgstr "(UTC+11:00) Сахалін" #: dlls/tzres/tzres.rc:270 msgid "North Korea Standard Time" @@ -11439,7 +11359,7 @@ msgstr "Північнокорейський літній час" #: dlls/tzres/tzres.rc:272 msgid "(UTC+09:00) Pyongyang" -msgstr "" +msgstr "(UTC+09:00) Пхеньян" #: dlls/tzres/tzres.rc:357 msgid "Tasmania Standard Time" @@ -11451,7 +11371,7 @@ msgstr "Тасманійський літній час" #: dlls/tzres/tzres.rc:359 msgid "(UTC+10:00) Hobart" -msgstr "" +msgstr "(UTC+10:00) Гобарт" #: dlls/tzres/tzres.rc:99 msgid "Central America Standard Time" @@ -11463,17 +11383,15 @@ msgstr "Центральна Америка за літнім часом" #: dlls/tzres/tzres.rc:101 msgid "(UTC-06:00) Central America" -msgstr "" +msgstr "(UTC-06:00) Центральна Америка" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 msgid "UTC-02" -msgstr "" +msgstr "UTC-02" #: dlls/tzres/tzres.rc:401 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-02:00) Coordinated Universal Time-02" -msgstr "Всесвітній координований час" +msgstr "(UTC-02:00) Всесвітній координований час-02" #: dlls/tzres/tzres.rc:387 msgid "US Mountain Standard Time" @@ -11485,7 +11403,7 @@ msgstr "Американський гірський літній час" #: dlls/tzres/tzres.rc:389 msgid "(UTC-07:00) Arizona" -msgstr "" +msgstr "(UTC-07:00) Арізона" #: dlls/tzres/tzres.rc:339 msgid "South Africa Standard Time" @@ -11497,7 +11415,7 @@ msgstr "Південно-Африканський літній час" #: dlls/tzres/tzres.rc:341 msgid "(UTC+02:00) Harare, Pretoria" -msgstr "" +msgstr "(UTC+02:00) Хараре, Преторія" #: dlls/tzres/tzres.rc:96 msgid "Cen. Australia Standard Time" @@ -11509,17 +11427,15 @@ msgstr "Цен. Австралійський літній час" #: dlls/tzres/tzres.rc:98 msgid "(UTC+09:30) Adelaide" -msgstr "" +msgstr "(UTC+09:30) Аделаїда" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 msgid "UTC-09" -msgstr "" +msgstr "UTC-09" #: dlls/tzres/tzres.rc:407 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-09:00) Coordinated Universal Time-09" -msgstr "Всесвітній координований час" +msgstr "(UTC-09:00) Всесвітній координований час-09" #: dlls/tzres/tzres.rc:345 msgid "Sri Lanka Standard Time" @@ -11531,7 +11447,7 @@ msgstr "Літній час Шрі-Ланки" #: dlls/tzres/tzres.rc:347 msgid "(UTC+05:30) Sri Jayawardenepura" -msgstr "" +msgstr "(UTC+05:30) Шрі-Джаяварденепура" #: dlls/tzres/tzres.rc:30 msgid "Afghanistan Standard Time" @@ -11543,7 +11459,7 @@ msgstr "Літній час в Афганістані" #: dlls/tzres/tzres.rc:32 msgid "(UTC+04:30) Kabul" -msgstr "" +msgstr "(UTC+04:30) Кабул" #: dlls/tzres/tzres.rc:441 msgid "Yakutsk Standard Time" @@ -11555,7 +11471,7 @@ msgstr "Якутський літній час" #: dlls/tzres/tzres.rc:443 msgid "(UTC+09:00) Yakutsk" -msgstr "" +msgstr "(UTC+09:00) Якутськ" #: dlls/tzres/tzres.rc:309 msgid "SA Eastern Standard Time" @@ -11567,7 +11483,7 @@ msgstr "SA східний літній час" #: dlls/tzres/tzres.rc:311 msgid "(UTC-03:00) Cayenne, Fortaleza" -msgstr "" +msgstr "(UTC-03:00) Кайєнна, Форталеза" #: dlls/tzres/tzres.rc:42 msgid "Arab Standard Time" @@ -11579,7 +11495,7 @@ msgstr "Арабський літній час" #: dlls/tzres/tzres.rc:44 msgid "(UTC+03:00) Kuwait, Riyadh" -msgstr "" +msgstr "(UTC+03:00) Кувейт, Ер-Ріяд" #: dlls/tzres/tzres.rc:45 msgid "Arabian Standard Time" @@ -11591,7 +11507,7 @@ msgstr "Арабський літній час" #: dlls/tzres/tzres.rc:47 msgid "(UTC+04:00) Abu Dhabi, Muscat" -msgstr "" +msgstr "(UTC+04:00) Абу-Дабі, Маскат" #: dlls/tzres/tzres.rc:360 msgid "Tocantins Standard Time" @@ -11603,7 +11519,7 @@ msgstr "Літній час Токантінс" #: dlls/tzres/tzres.rc:362 msgid "(UTC-03:00) Araguaina" -msgstr "" +msgstr "(UTC-03:00) Арагуаіна" #: dlls/tzres/tzres.rc:306 msgid "Russian Standard Time" @@ -11615,7 +11531,7 @@ msgstr "Російський літній час" #: dlls/tzres/tzres.rc:308 msgid "(UTC+03:00) Moscow, St. Petersburg" -msgstr "" +msgstr "(UTC+03:00) Москва, Санкт-Петербург" #: dlls/tzres/tzres.rc:63 msgid "Aus Central W. Standard Time" @@ -11627,7 +11543,7 @@ msgstr "Aus Central W. літній час" #: dlls/tzres/tzres.rc:65 msgid "(UTC+08:45) Eucla" -msgstr "" +msgstr "(UTC+08:45) Евкла" #: dlls/tzres/tzres.rc:294 msgid "Romance Standard Time" @@ -11639,7 +11555,7 @@ msgstr "Романський літній час" #: dlls/tzres/tzres.rc:296 msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" -msgstr "" +msgstr "(UTC+01:00) Брюссель, Копенгаген, Мадрид, Париж" #: dlls/tzres/tzres.rc:159 msgid "Ekaterinburg Standard Time" @@ -11651,7 +11567,7 @@ msgstr "Літній час Єкатеринбурга" #: dlls/tzres/tzres.rc:161 msgid "(UTC+05:00) Ekaterinburg" -msgstr "" +msgstr "(UTC+05:00) Єкатеринбург" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 msgid "Russia Time Zone 11" @@ -11659,23 +11575,19 @@ msgstr "" #: dlls/tzres/tzres.rc:302 msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" -msgstr "" +msgstr "(UTC+12:00) Анадир, Петропавловськ-Камчатський" #: dlls/tzres/tzres.rc:435 -#, fuzzy -#| msgid "West Asia Standard Time" msgid "West Bank Standard Time" -msgstr "Західноазіатський стандартний час" +msgstr "Західний берег річки Йордан, стандартний час" #: dlls/tzres/tzres.rc:436 -#, fuzzy -#| msgid "West Asia Daylight Time" msgid "West Bank Daylight Time" -msgstr "Західноазіатський літній час" +msgstr "Західний берег річки Йордан, літній час" #: dlls/tzres/tzres.rc:437 msgid "(UTC+02:00) Gaza, Hebron" -msgstr "" +msgstr "(UTC+02:00) Газа, Хеврон" #: dlls/tzres/tzres.rc:351 msgid "Syria Standard Time" @@ -11687,7 +11599,7 @@ msgstr "Літній час Сирії" #: dlls/tzres/tzres.rc:353 msgid "(UTC+02:00) Damascus" -msgstr "" +msgstr "(UTC+02:00) Дамаск" #: dlls/tzres/tzres.rc:60 msgid "AUS Central Standard Time" @@ -11699,7 +11611,7 @@ msgstr "Центральний літній час AUS" #: dlls/tzres/tzres.rc:62 msgid "(UTC+09:30) Darwin" -msgstr "" +msgstr "(UTC+09:30) Дарвін" #: dlls/tzres/tzres.rc:177 msgid "Greenwich Standard Time" @@ -11711,7 +11623,7 @@ msgstr "Літній час за Грінвічем" #: dlls/tzres/tzres.rc:179 msgid "(UTC+00:00) Monrovia, Reykjavik" -msgstr "" +msgstr "(UTC+00:00) Монровія, Рейк'явік" #: dlls/tzres/tzres.rc:381 msgid "Ulaanbaatar Standard Time" @@ -11723,23 +11635,19 @@ msgstr "Літній час Улан-Батора" #: dlls/tzres/tzres.rc:383 msgid "(UTC+08:00) Ulaanbaatar" -msgstr "" +msgstr "(UTC+08:00) Улан-Батор" #: dlls/tzres/tzres.rc:261 -#, fuzzy -#| msgid "Morocco Standard Time" msgid "Norfolk Standard Time" -msgstr "Стандартний час Марокко" +msgstr "Норфолк, стандартний час" #: dlls/tzres/tzres.rc:262 -#, fuzzy -#| msgid "Morocco Daylight Time" msgid "Norfolk Daylight Time" -msgstr "Літній час Марокко" +msgstr "Норфолк, літній час" #: dlls/tzres/tzres.rc:263 msgid "(UTC+11:00) Norfolk Island" -msgstr "" +msgstr "(UTC+11:00) Острів Норфолк" #: dlls/tzres/tzres.rc:195 msgid "Israel Standard Time" @@ -11751,7 +11659,7 @@ msgstr "Літній час Ізраїлю" #: dlls/tzres/tzres.rc:197 msgid "(UTC+02:00) Jerusalem" -msgstr "" +msgstr "(UTC+02:00) Єрусалим" #: dlls/tzres/tzres.rc:78 msgid "Bangladesh Standard Time" @@ -11763,7 +11671,7 @@ msgstr "Літній час Бангладеш" #: dlls/tzres/tzres.rc:80 msgid "(UTC+06:00) Dhaka" -msgstr "" +msgstr "(UTC+06:00) Дакка" #: dlls/tzres/tzres.rc:312 msgid "SA Pacific Standard Time" @@ -11775,7 +11683,7 @@ msgstr "SA Тихоокеанський літній час" #: dlls/tzres/tzres.rc:314 msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" -msgstr "" +msgstr "(UTC-05:00) Богота, Ліма, Кіто, Ріу-Бранку" #: dlls/tzres/tzres.rc:432 msgid "West Asia Standard Time" @@ -11787,7 +11695,7 @@ msgstr "Західноазіатський літній час" #: dlls/tzres/tzres.rc:434 msgid "(UTC+05:00) Ashgabat, Tashkent" -msgstr "" +msgstr "(UTC+05:00) Ашхабад, Ташкент" #: dlls/tzres/tzres.rc:33 msgid "Alaskan Standard Time" @@ -11799,7 +11707,7 @@ msgstr "Аляскинський літній час" #: dlls/tzres/tzres.rc:35 msgid "(UTC-09:00) Alaska" -msgstr "" +msgstr "(UTC-09:00) Аляска" #: dlls/tzres/tzres.rc:288 msgid "Paraguay Standard Time" @@ -11811,7 +11719,7 @@ msgstr "Парагвайський літній час" #: dlls/tzres/tzres.rc:290 msgid "(UTC-04:00) Asuncion" -msgstr "" +msgstr "(UTC-04:00) Асунсьйон" #: dlls/tzres/tzres.rc:132 msgid "Dateline Standard Time" @@ -11823,7 +11731,7 @@ msgstr "Літній час у Дателіні" #: dlls/tzres/tzres.rc:134 msgid "(UTC-12:00) International Date Line West" -msgstr "" +msgstr "(UTC-12:00) Міжнародна лінія дат на захід" #: dlls/tzres/tzres.rc:207 msgid "Libya Standard Time" @@ -11835,7 +11743,7 @@ msgstr "Лівійський літній час" #: dlls/tzres/tzres.rc:209 msgid "(UTC+02:00) Tripoli" -msgstr "" +msgstr "(UTC+02:00) Тріполі" #: dlls/tzres/tzres.rc:75 msgid "Bahia Standard Time" @@ -11847,7 +11755,7 @@ msgstr "Літній час Баїя" #: dlls/tzres/tzres.rc:77 msgid "(UTC-03:00) Salvador" -msgstr "" +msgstr "(UTC-03:00) Сальвадор" #: dlls/tzres/tzres.rc:411 msgid "Venezuela Standard Time" @@ -11859,7 +11767,7 @@ msgstr "Літній час Венесуели" #: dlls/tzres/tzres.rc:413 msgid "(UTC-04:00) Caracas" -msgstr "" +msgstr "(UTC-04:00) Каракас" #: dlls/tzres/tzres.rc:84 msgid "Bougainville Standard Time" @@ -11871,7 +11779,7 @@ msgstr "Літній час Бугенвіля" #: dlls/tzres/tzres.rc:86 msgid "(UTC+11:00) Bougainville Island" -msgstr "" +msgstr "(UTC+11:00) Острів Бугенвіль" #: dlls/tzres/tzres.rc:186 msgid "Hawaiian Standard Time" @@ -11883,7 +11791,7 @@ msgstr "Гавайський літній час" #: dlls/tzres/tzres.rc:188 msgid "(UTC-10:00) Hawaii" -msgstr "" +msgstr "(UTC-10:00) Гаваї" #: dlls/tzres/tzres.rc:333 msgid "SE Asia Standard Time" @@ -11895,39 +11803,31 @@ msgstr "Південно-Східний Азіатський літній час #: dlls/tzres/tzres.rc:335 msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" -msgstr "" +msgstr "(UTC+07:00) Бангкок, Ханой, Джакарта" #: dlls/tzres/tzres.rc:291 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "Qyzylorda Standard Time" -msgstr "Йорданський стандартний час" +msgstr "Кизилорда, стандартний час" #: dlls/tzres/tzres.rc:292 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "Qyzylorda Daylight Time" -msgstr "Йорданський літній час" +msgstr "Кизилорда, літній час" #: dlls/tzres/tzres.rc:293 msgid "(UTC+05:00) Qyzylorda" -msgstr "" +msgstr "(UTC+05:00) Кизилорда" #: dlls/tzres/tzres.rc:429 -#, fuzzy -#| msgid "Tonga Standard Time" msgid "W. Mongolia Standard Time" -msgstr "Стандартний час Королівства Тонга" +msgstr "Західна Монголія, стандартний час" #: dlls/tzres/tzres.rc:430 -#, fuzzy -#| msgid "Tonga Daylight Time" msgid "W. Mongolia Daylight Time" -msgstr "Літній час Королівства Тонга" +msgstr "Західна Монголія, літній час" #: dlls/tzres/tzres.rc:431 msgid "(UTC+07:00) Hovd" -msgstr "" +msgstr "(UTC+07:00) Ховд" #: dlls/tzres/tzres.rc:255 msgid "New Zealand Standard Time" @@ -11939,7 +11839,7 @@ msgstr "Літній час Нової Зеландії" #: dlls/tzres/tzres.rc:257 msgid "(UTC+12:00) Auckland, Wellington" -msgstr "" +msgstr "(UTC+12:00) Окленд, Веллінгтон" #: dlls/tzres/tzres.rc:36 msgid "Aleutian Standard Time" @@ -11951,23 +11851,19 @@ msgstr "Алеутський літній час" #: dlls/tzres/tzres.rc:38 msgid "(UTC-10:00) Aleutian Islands" -msgstr "" +msgstr "(UTC-10:00) Алеутські острови" #: dlls/tzres/tzres.rc:273 -#, fuzzy -#| msgid "Yakutsk Standard Time" msgid "Omsk Standard Time" -msgstr "Якутський стандартний час" +msgstr "Омський стандартний час" #: dlls/tzres/tzres.rc:274 -#, fuzzy -#| msgid "Yakutsk Daylight Time" msgid "Omsk Daylight Time" -msgstr "Якутський літній час" +msgstr "Омський літній час" #: dlls/tzres/tzres.rc:275 msgid "(UTC+06:00) Omsk" -msgstr "" +msgstr "(UTC+06:00) Омськ" #: dlls/tzres/tzres.rc:105 msgid "Central Brazilian Standard Time" @@ -11979,7 +11875,7 @@ msgstr "Центральний бразильський літній час" #: dlls/tzres/tzres.rc:107 msgid "(UTC-04:00) Cuiaba" -msgstr "" +msgstr "(UTC-04:00) Куяба" #: dlls/tzres/tzres.rc:81 msgid "Belarus Standard Time" @@ -11991,7 +11887,7 @@ msgstr "Білоруський літній час" #: dlls/tzres/tzres.rc:83 msgid "(UTC+03:00) Minsk" -msgstr "" +msgstr "(UTC+03:00) Мінськ" #: dlls/tzres/tzres.rc:315 msgid "SA Western Standard Time" @@ -12003,7 +11899,7 @@ msgstr "SA Західний літній час" #: dlls/tzres/tzres.rc:317 msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" -msgstr "" +msgstr "(UTC-04:00) Джорджтаун, Ла-Пас, Манаус, Сан-Хуан" #: dlls/tzres/tzres.rc:174 msgid "Greenland Standard Time" @@ -12015,7 +11911,7 @@ msgstr "Літній час Гренландії" #: dlls/tzres/tzres.rc:176 msgid "(UTC-03:00) Greenland" -msgstr "" +msgstr "(UTC-03:00) Гренландія" #: dlls/tzres/tzres.rc:147 msgid "Easter Island Standard Time" @@ -12027,7 +11923,7 @@ msgstr "Літній час острова Пасхи" #: dlls/tzres/tzres.rc:149 msgid "(UTC-06:00) Easter Island" -msgstr "" +msgstr "(UTC-06:00) Острів Пасхи" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 msgid "Russia Time Zone 10" @@ -12035,7 +11931,7 @@ msgstr "" #: dlls/tzres/tzres.rc:299 msgid "(UTC+11:00) Chokurdakh" -msgstr "" +msgstr "(UTC+11:00) Чокурдах" #: dlls/tzres/tzres.rc:156 msgid "Egypt Standard Time" @@ -12047,7 +11943,7 @@ msgstr "Єгипетський літній час" #: dlls/tzres/tzres.rc:158 msgid "(UTC+02:00) Cairo" -msgstr "" +msgstr "(UTC+02:00) Каїр" #: dlls/tzres/tzres.rc:153 msgid "Eastern Standard Time (Mexico)" @@ -12059,7 +11955,7 @@ msgstr "Східний літній час (Мексика)" #: dlls/tzres/tzres.rc:155 msgid "(UTC-05:00) Chetumal" -msgstr "" +msgstr "(UTC-05:00) Четумал" #: dlls/tzres/tzres.rc:225 msgid "Mauritius Standard Time" @@ -12071,7 +11967,7 @@ msgstr "Літній час Маврикія" #: dlls/tzres/tzres.rc:227 msgid "(UTC+04:00) Port Louis" -msgstr "" +msgstr "(UTC+04:00) Порт-Луї" #: dlls/tzres/tzres.rc:414 msgid "Vladivostok Standard Time" @@ -12083,7 +11979,7 @@ msgstr "Літній час Владивостока" #: dlls/tzres/tzres.rc:416 msgid "(UTC+10:00) Vladivostok" -msgstr "" +msgstr "(UTC+10:00) Владивосток" #: dlls/tzres/tzres.rc:336 msgid "Singapore Standard Time" @@ -12095,7 +11991,7 @@ msgstr "Літній час Сінгапуру" #: dlls/tzres/tzres.rc:338 msgid "(UTC+08:00) Kuala Lumpur, Singapore" -msgstr "" +msgstr "(UTC+08:00) Куала-Лумпур, Сінгапур" #: dlls/tzres/tzres.rc:204 msgid "Korea Standard Time" @@ -12107,7 +12003,7 @@ msgstr "Корейський літній час" #: dlls/tzres/tzres.rc:206 msgid "(UTC+09:00) Seoul" -msgstr "" +msgstr "(UTC+09:00) Сеул" #: dlls/tzres/tzres.rc:123 msgid "Chatham Islands Standard Time" @@ -12119,7 +12015,7 @@ msgstr "Літній час островів Чатем" #: dlls/tzres/tzres.rc:125 msgid "(UTC+12:45) Chatham Islands" -msgstr "" +msgstr "(UTC+12:45) Острови Чатем" #: dlls/tzres/tzres.rc:135 msgid "E. Africa Standard Time" @@ -12131,7 +12027,7 @@ msgstr "E. Літній час в Африці" #: dlls/tzres/tzres.rc:137 msgid "(UTC+03:00) Nairobi" -msgstr "" +msgstr "(UTC+03:00) Найробі" #: dlls/tzres/tzres.rc:165 msgid "FLE Standard Time" @@ -12143,7 +12039,7 @@ msgstr "Літній час FLE" #: dlls/tzres/tzres.rc:167 msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" -msgstr "" +msgstr "(UTC+02:00) Гельсінкі, Київ, Рига, Софія, Таллінн, Вільнюс" #: dlls/tzres/tzres.rc:144 msgid "E. South America Standard Time" @@ -12155,7 +12051,7 @@ msgstr "E. Літній час Південної Америки" #: dlls/tzres/tzres.rc:146 msgid "(UTC-03:00) Brasilia" -msgstr "" +msgstr "(UTC-03:00) Бразиліа" #: dlls/tzres/tzres.rc:114 msgid "Central Pacific Standard Time" @@ -12167,7 +12063,7 @@ msgstr "Центральний тихоокеанський літній час" #: dlls/tzres/tzres.rc:116 msgid "(UTC+11:00) Solomon Is., New Caledonia" -msgstr "" +msgstr "(UTC+11:00) Соломонові острови, Нова Каледонія" #: dlls/tzres/tzres.rc:423 msgid "W. Central Africa Standard Time" @@ -15741,37 +15637,24 @@ msgid "Type \"REG %1 /?\" for help.\n" msgstr "Введіть \"REG %1 /?\" для довідки.\n" #: programs/reg/reg.rc:181 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to access or create the specified registry key\n" -msgstr "reg: не вдалось знайти вказаний ключ реєстру чи значення\n" +msgstr "reg: Не вдається отримати доступ або створити вказаний ключ реєстру\n" #: programs/reg/reg.rc:116 -#, fuzzy -#| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "Операція успішно завершена\n" +msgstr "reg: Операція успішно завершена\n" #: programs/reg/reg.rc:131 -#, fuzzy -#| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" -msgstr "Операцію з реєстром було скасовано\n" +msgstr "reg: Операцію з реєстром було скасовано\n" #: programs/reg/reg.rc:174 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "reg: не вдалось знайти вказаний ключ реєстру чи значення\n" +msgstr "reg: Не вдається знайти вказаний ключ реєстру\n" #: programs/reg/reg.rc:120 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "reg: не вдалось знайти вказаний ключ реєстру чи значення\n" +msgstr "reg: Не вдається знайти вказане значення реєстру\n" #: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -15782,17 +15665,6 @@ msgid "Type \"REG /?\" for help.\n" msgstr "Введіть \"REG /?\" для довідки.\n" #: programs/reg/reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | EXPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -15808,7 +15680,7 @@ msgstr "" " REG [операція] [параметри]\n" "\n" "Підтримувані операції:\n" -" ADD | DELETE | IMPORT | EXPORT | QUERY\n" +" ADD | COPY | DELETE | EXPORT | IMPORT | QUERY\n" "\n" "Для довідки по конкретній операції, введіть:\n" " REG [операція] /?\n" @@ -16024,34 +15896,33 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" +" /reg:32\n" +" Доступ до реєстру за допомогою 32-розрядного перегляду.\n" +"\n" +" /reg:64\n" +" Доступ до реєстру за допомогою 64-розрядного перегляду.\n" +"\n" #: programs/reg/reg.rc:117 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "reg: невірне ім'я ключа\n" +msgstr "reg: Невірне ім'я ключа\n" #: programs/reg/reg.rc:119 msgid "reg: Unable to access remote machine\n" -msgstr "reg: неможливо отримати доступ до віддаленої машини\n" +msgstr "reg: Неможливо отримати доступ до віддаленої машини\n" #: programs/reg/reg.rc:172 -#, fuzzy -#| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" -msgstr "reg: Невірний системний ключ [%1]\n" +msgstr "reg: Невірний системний ключ\n" #: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: Невірна опція [%1]. " #: programs/reg/reg.rc:122 -#, fuzzy -#| msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgid "reg: The option [/d] must be followed by a valid numeric value\n" msgstr "" -"reg: після параметра [/d] повинно бути вказано число в шістнадцятковому " -"форматі\n" +"reg: після параметра [/d] повинно бути вказано дійсне числове значення\n" #: programs/reg/reg.rc:123 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" @@ -16081,15 +15952,13 @@ msgstr "reg: невірні параметри командного рядка\n #: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" -msgstr "" +msgstr "reg: Ключі джерела і призначення не можуть бути однаковими\n" #: programs/reg/reg.rc:205 -#, fuzzy -#| msgid "The file '%1' already exists. Do you want to overwrite it?" msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" -msgstr "Файл '%1' вже існує. Ви хочете його перезаписати?" +msgstr "Значення '%1\\%2' вже існує в ключі призначення. Ви хочете його перезаписати?" #: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" @@ -16104,10 +15973,8 @@ msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Ви впевнені, що хочете видалити ключ реєстру '%1'?" #: programs/reg/reg.rc:137 -#, fuzzy -#| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" -msgstr "regedit: Неможливо видалити ключ реєстру '%1'.\n" +msgstr "reg: Неможливо видалити всі значення реєстру для '%1'\n" #: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" @@ -16118,10 +15985,8 @@ msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: Нерозпізнана керівна послідовність [\\%1!c!]\n" #: programs/reg/reg.rc:175 -#, fuzzy -#| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "reg: Неможливо відкрити ключ реєстру '%1'.\n" +msgstr "reg: Неможливо імпортувати ключ реєстру '%1'\n" #: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" -- 2.33.1

1 0

[PATCH vkd3d 1/3] vkd3d-shader/hlsl: Handle branches in copy propagation.
by Giovanni Mascellani 22 Dec '21

22 Dec '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- A new var_def is now initialized to the content of the same var_def in earlier stack frames. I still believe this is more complicated than it should be (i.e., harder to check and therefore more prone to bugs), but maybe it's correct anyway. --- libs/vkd3d-shader/hlsl_codegen.c | 148 +++++++++++++++++++++++++++---- 1 file changed, 133 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 75716bdf..d09a6a3b 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -290,6 +290,7 @@ struct copy_propagation_var_def struct copy_propagation_state { struct rb_tree var_defs; + struct copy_propagation_state *parent; }; static int copy_propagation_var_def_compare(const void *key, const struct rb_entry *entry) @@ -308,9 +309,12 @@ static void copy_propagation_var_def_destroy(struct rb_entry *entry, void *conte } static struct copy_propagation_var_def *copy_propagation_get_var_def(struct copy_propagation_state *state, - struct hlsl_ir_var *var) + const struct hlsl_ir_var *var) { - struct rb_entry *entry = rb_get(&state->var_defs, var); + struct rb_entry *entry; + + while (state && !(entry = rb_get(&state->var_defs, var))) + state = state->parent; if (entry) return RB_ENTRY_VALUE(entry, struct copy_propagation_var_def, entry); @@ -321,8 +325,8 @@ static struct copy_propagation_var_def *copy_propagation_get_var_def(struct copy static struct copy_propagation_var_def *copy_propagation_create_var_def(struct hlsl_ctx *ctx, struct copy_propagation_state *state, struct hlsl_ir_var *var) { + struct copy_propagation_var_def *var_def, *prev_var_def; struct rb_entry *entry = rb_get(&state->var_defs, var); - struct copy_propagation_var_def *var_def; int res; if (entry) @@ -331,6 +335,10 @@ static struct copy_propagation_var_def *copy_propagation_create_var_def(struct h if (!(var_def = hlsl_alloc(ctx, offsetof(struct copy_propagation_var_def, values[var->data_type->reg_size])))) return NULL; + prev_var_def = copy_propagation_get_var_def(state, var); + if (prev_var_def) + memcpy(var_def->values, prev_var_def->values, var->data_type->reg_size * sizeof(*var_def->values)); + var_def->var = var; res = rb_put(&state->var_defs, var, &var_def->entry); @@ -339,12 +347,6 @@ static struct copy_propagation_var_def *copy_propagation_create_var_def(struct h return var_def; } -static void copy_propagation_invalidate_whole_variable(struct copy_propagation_var_def *var_def) -{ - TRACE("Invalidate variable %s.\n", var_def->var->name); - memset(var_def->values, 0, sizeof(*var_def->values) * var_def->var->data_type->reg_size); -} - static void copy_propagation_set_value(struct copy_propagation_var_def *var_def, unsigned int offset, unsigned char writemask, struct hlsl_ir_node *node) { @@ -354,7 +356,7 @@ static void copy_propagation_set_value(struct copy_propagation_var_def *var_def, { if (writemask & (1u << i)) { - TRACE("Variable %s[%u] is written by instruction %p%s.\n", + TRACE("Variable %s[%u] updated with value from %p%s.\n", var_def->var->name, offset + i, node, debug_hlsl_writemask(1u << i)); var_def->values[offset + i].node = node; var_def->values[offset + i].component = j++; @@ -362,6 +364,99 @@ static void copy_propagation_set_value(struct copy_propagation_var_def *var_def, } } +static void copy_propagation_invalidate_whole_variable(struct copy_propagation_state *state, + struct copy_propagation_var_def *var_def) +{ + const struct hlsl_ir_var *var = var_def->var; + + TRACE("Invalidate variable %s.\n", var->name); + while (state) + { + if ((var_def = copy_propagation_get_var_def(state, var))) + memset(var_def->values, 0, sizeof(*var_def->values) * var_def->var->data_type->reg_size); + state = state->parent; + } +} + +static void copy_propagation_invalidate_variable_partial(struct copy_propagation_state *state, + struct copy_propagation_var_def *var_def, unsigned int offset, unsigned char writemask) +{ + const struct hlsl_ir_var *var = var_def->var; + + TRACE("Invalidate variable %s[%u]%s.\n", var->name, offset, debug_hlsl_writemask(writemask)); + while (state) + { + if ((var_def = copy_propagation_get_var_def(state, var))) + copy_propagation_set_value(var_def, offset, writemask, NULL); + state = state->parent; + } +} + +static void copy_propagation_invalidate_from_block(struct hlsl_ctx *ctx, struct copy_propagation_state *state, + struct hlsl_block *block) +{ + struct hlsl_ir_node *instr; + + LIST_FOR_EACH_ENTRY(instr, &block->instrs, struct hlsl_ir_node, entry) + { + switch (instr->type) + { + case HLSL_IR_STORE: + { + struct hlsl_ir_store *store = hlsl_ir_store(instr); + struct copy_propagation_var_def *var_def; + struct hlsl_deref *lhs = &store->lhs; + struct hlsl_ir_var *var = lhs->var; + unsigned int offset; + + if (!(var_def = copy_propagation_get_var_def(state, var))) + continue; + + if (hlsl_offset_from_deref(lhs, &offset)) + copy_propagation_invalidate_variable_partial(state, var_def, offset, store->writemask); + else + copy_propagation_invalidate_whole_variable(state, var_def); + + break; + } + + case HLSL_IR_IF: + { + struct hlsl_ir_if *iff = hlsl_ir_if(instr); + + copy_propagation_invalidate_from_block(ctx, state, &iff->then_instrs); + copy_propagation_invalidate_from_block(ctx, state, &iff->else_instrs); + + break; + } + + case HLSL_IR_LOOP: + { + struct hlsl_ir_loop *loop = hlsl_ir_loop(instr); + + copy_propagation_invalidate_from_block(ctx, state, &loop->body); + + break; + } + + default: + break; + } + } +} + +static void copy_propagation_state_destroy(struct copy_propagation_state *state) +{ + rb_destroy(&state->var_defs, copy_propagation_var_def_destroy, NULL); +} + +static void copy_propagation_state_init(struct hlsl_ctx *ctx, struct copy_propagation_state *state, + struct copy_propagation_state *parent) +{ + rb_init(&state->var_defs, copy_propagation_var_def_compare); + state->parent = parent; +} + static struct hlsl_ir_node *copy_propagation_compute_replacement(struct copy_propagation_var_def *var_def, unsigned int offset, unsigned int count, unsigned int *swizzle) { @@ -433,7 +528,30 @@ static void copy_propagation_record_store(struct hlsl_ctx *ctx, struct hlsl_ir_s if (hlsl_offset_from_deref(lhs, &offset)) copy_propagation_set_value(var_def, offset, store->writemask, store->rhs.node); else - copy_propagation_invalidate_whole_variable(var_def); + copy_propagation_invalidate_whole_variable(state, var_def); +} + +static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_block *block, + struct copy_propagation_state *state); + +static bool copy_propagation_process_if(struct hlsl_ctx *ctx, struct hlsl_ir_if *iff, + struct copy_propagation_state *state) +{ + struct copy_propagation_state inner_state; + bool progress = false; + + copy_propagation_state_init(ctx, &inner_state, state); + progress |= copy_propagation_transform_block(ctx, &iff->then_instrs, &inner_state); + copy_propagation_state_destroy(&inner_state); + + copy_propagation_state_init(ctx, &inner_state, state); + progress |= copy_propagation_transform_block(ctx, &iff->else_instrs, &inner_state); + copy_propagation_state_destroy(&inner_state); + + copy_propagation_invalidate_from_block(ctx, state, &iff->then_instrs); + copy_propagation_invalidate_from_block(ctx, state, &iff->else_instrs); + + return progress; } static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_block *block, @@ -455,8 +573,8 @@ static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_b break; case HLSL_IR_IF: - FIXME("Copy propagation doesn't support conditionals yet, leaving.\n"); - return progress; + progress |= copy_propagation_process_if(ctx, hlsl_ir_if(instr), state); + break; case HLSL_IR_LOOP: FIXME("Copy propagation doesn't support loops yet, leaving.\n"); @@ -475,11 +593,11 @@ static bool copy_propagation_execute(struct hlsl_ctx *ctx, struct hlsl_block *bl struct copy_propagation_state state; bool progress; - rb_init(&state.var_defs, copy_propagation_var_def_compare); + copy_propagation_state_init(ctx, &state, NULL); progress = copy_propagation_transform_block(ctx, block, &state); - rb_destroy(&state.var_defs, copy_propagation_var_def_destroy, NULL); + copy_propagation_state_destroy(&state); return progress; } -- 2.34.1

2 5

[tools] testbot/SetWinLocale: Reorder the intl.cpl's XML file elements.
by Francois Gouget 22 Dec '21

22 Dec '21

They now match the order in the documentation in case it matters. Also removed redundant comments. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This probably has no impact but intl.cpl is finicky enough that I prefer not to take chances. --- testbot/bin/SetWinLocale | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index d7f795bee..d4dc1c586 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -470,22 +470,9 @@ my @Config = ( " <gs:User UserID='Current' CopySettingsToDefaultUserAcct='true' CopySettingsToSystemAcct='true'/>", " </gs:UserList>", ); -if ($OptLocale) -{ - push @Config, " ", - " <gs:UserLocale>", - " <gs:Locale Name='$OptLocale' SetAsCurrent='true'/>", - " </gs:UserLocale>"; -} -if ($OptSystem) -{ - push @Config, " ", - " <gs:SystemLocale Name='$OptSystem'/>"; -} if (defined $CountryId) { - push @Config, " ", - " <gs:LocationPreferences>", + push @Config, " <gs:LocationPreferences>", " <gs:GeoID Value='$CountryId'/>", " </gs:LocationPreferences>"; } @@ -495,10 +482,13 @@ if ($OptMUI) " <gs:MUILanguage Value='$OptMUI'/>", " </gs:MUILanguagePreferences>"; } +if ($OptSystem) +{ + push @Config, " <gs:SystemLocale Name='$OptSystem'/>"; +} if ($KeyboardIds) { - push @Config, " ", - " <gs:InputPreferences>"; + push @Config, " <gs:InputPreferences>"; my $Default = " Default='true'"; foreach my $Id (@$KeyboardIds) { @@ -507,6 +497,12 @@ if ($KeyboardIds) } push @Config, " </gs:InputPreferences>"; } +if ($OptLocale) +{ + push @Config, " <gs:UserLocale>", + " <gs:Locale Name='$OptLocale' SetAsCurrent='true'/>", + " </gs:UserLocale>"; +} push @Config, "</gs:GlobalizationServices>"; -- 2.30.2

1 0

[tools] testbot/SetWinLocale: Simplify checking for the locale options.
by Francois Gouget 22 Dec '21

22 Dec '21

They cannot have a defined value that is false. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index d4dc1c586..6cc810226 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -413,8 +413,8 @@ if (!defined $Usage) $CountryId = $Countries{$OptCountry}; } - if (!defined $OptLocale and !defined $OptSystem and !defined $OptMUI and - !defined $OptKeyboard and !defined $OptCountry) + if (!$OptLocale and !$OptSystem and !$OptMUI and !$OptKeyboard and + !$OptCountry) { Error("you must specify at least one locale to change\n"); $Usage = 2; -- 2.30.2

1 0

[tools] testbot/SetWinLocale: Add more information to the usage message.
by Francois Gouget 22 Dec '21

22 Dec '21

Document which options require a reboot or log out + log in. Also cross-reference the options with the Windows 10 GUI to help with manual testing; and with the Windows APIs to help match them to the WineTest output. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 6cc810226..2de673360 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -445,11 +445,27 @@ if (defined $Usage) print " ISO 639-1 language code and CC an ISO 3166-1 alpha-2 country\n"; print " code.\n"; print " --locale USR Specifies the user formats (see --defaults).\n"; + print " . Windows 10 GUI: Time & language -> Region -> Regional\n"; + print " format.\n"; + print " . APIs: UserDefaultLCID(), GetThreadLocale().\n"; print " --system SYS Specifies the system locale (see --defaults).\n"; + print " . Only takes effect after a reboot.\n"; + print " . Windows 10 GUI: Time & language -> Language ->\n"; + print " Administrative Language Settings -> Change system locale.\n"; + print " . APIs: GetSystemDefaultLCID().\n"; print " --mui MUI Specifies the display language (see --defaults).\n"; + print " . Only takes effect after a log out + log in.\n"; + print " . Windows 10 GUI: Time & language -> Language -> Windows\n"; + print " display language.\n"; + print " . APIs: GetSystemPreferredUILanguages(),\n"; + print " GetUserDefaultUILanguage(), GetThreadUILanguage().\n"; print " --keyboard KBD Specifies the keyboard layout (see --defaults).\n"; + print " . Windows 10 GUI: Time & language -> Language -> Keyboard ->\n"; + print " Override for default input method.\n"; print " --country CTY Specifies the location using only the country part of the\n"; print " Windows locale (see --defaults).\n"; + print " . Windows 10 GUI: Time & language -> Region -> Country.\n"; + print " . APIs: GetUserGeoID().\n"; print " --no-reboot Do not reboot Windows. Some locale changes will only take\n"; print " effect after the next reboot.\n"; print " --debug Show more detailed information about progress.\n"; -- 2.30.2

1 0

[PATCH 2/2] winecoreaudio: Actually free the stream.
by Huw Davies 22 Dec '21

22 Dec '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 4bb83a37621..3f694b95a49 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -726,6 +726,7 @@ static NTSTATUS release_stream( void *args ) NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &stream->tmp_buffer_size, MEM_RELEASE); free(stream->fmt); + free(stream); params->result = S_OK; return STATUS_SUCCESS; } -- 2.23.0

2 1

[PATCH 1/2] winecoreaudio: Set the buffer to NULL after freeing.
by Huw Davies 22 Dec '21

22 Dec '21

This ensures the subsequent allocation is free to pick a new location. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52202 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 00bd79927ca..4bb83a37621 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1352,8 +1352,11 @@ static NTSTATUS get_render_buffer(void *args) if(stream->wri_offs_frames + params->frames > stream->bufsize_frames){ if(stream->tmp_buffer_frames < params->frames){ - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, - &stream->tmp_buffer_size, MEM_RELEASE); + if(stream->tmp_buffer){ + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, + &stream->tmp_buffer_size, MEM_RELEASE); + stream->tmp_buffer = NULL; + } stream->tmp_buffer_size = params->frames * stream->fmt->nBlockAlign; if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE)){ -- 2.23.0

2 1

[PATCH 1/2] dinput: Update internal thread events list on every wake up.
by Rémi Bernon 22 Dec '21

22 Dec '21

Instead of message notifications only. We have to remove the events from devices that are automatically unacquired whenever a read failed. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/dinput_main.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 5226a07e500..cd40eabb373 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1311,16 +1311,9 @@ static DWORD WINAPI dinput_thread_proc( void *params ) goto done; } - events_count = 0; EnterCriticalSection( &dinput_hook_crit ); kbd_cnt = list_count( &acquired_keyboard_list ); mice_cnt = list_count( &acquired_mouse_list ); - LIST_FOR_EACH_ENTRY( impl, &acquired_device_list, struct dinput_device, entry ) - { - if (!impl->read_event || !impl->vtbl->read) continue; - if (events_count >= ARRAY_SIZE(events)) break; - events[events_count++] = impl->read_event; - } LeaveCriticalSection( &dinput_hook_crit ); if (kbd_cnt && !kbd_hook) @@ -1341,8 +1334,20 @@ static DWORD WINAPI dinput_thread_proc( void *params ) SetEvent(finished_event); } + + events_count = 0; + EnterCriticalSection( &dinput_hook_crit ); + LIST_FOR_EACH_ENTRY( impl, &acquired_device_list, struct dinput_device, entry ) + { + if (!impl->read_event || !impl->vtbl->read) continue; + if (events_count >= ARRAY_SIZE(events)) break; + events[events_count++] = impl->read_event; + } + LeaveCriticalSection( &dinput_hook_crit ); } + if (ret != events_count) ERR("Unexpected termination, ret %#x\n", ret); + done: DestroyWindow( di_em_win ); di_em_win = NULL; -- 2.34.1

1 1

[PATCH] win32u: Handle memory allocation failures in nulldrv_PolyBezierTo (cppcheck)
by Alex Henrie 22 Dec '21

22 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/win32u/painting.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/painting.c b/dlls/win32u/painting.c index 7939ea878da..ca914a3a294 100644 --- a/dlls/win32u/painting.c +++ b/dlls/win32u/painting.c @@ -156,7 +156,7 @@ BOOL CDECL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count ) BOOL CDECL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWORD count ) { DC *dc = get_nulldrv_dc( dev ); - POINT *line_pts = NULL, *bzr_pts = NULL, bzr[4]; + POINT *line_pts = NULL, *new_line_pts, *bzr_pts = NULL, bzr[4]; DWORD i; INT num_pts, num_bzr_pts, space, size; @@ -182,6 +182,7 @@ BOOL CDECL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types space = count + 300; line_pts = malloc( space * sizeof(POINT) ); + if (!line_pts) return FALSE; num_pts = 1; line_pts[0] = dc->attr->cur_pos; @@ -209,7 +210,13 @@ BOOL CDECL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types if (space < size) { space = size * 2; - line_pts = realloc( line_pts, space * sizeof(POINT) ); + new_line_pts = realloc( line_pts, space * sizeof(POINT) ); + if (!new_line_pts) + { + free( line_pts ); + return FALSE; + } + line_pts = new_line_pts; } memcpy( &line_pts[num_pts], &bzr_pts[1], (num_bzr_pts - 1) * sizeof(POINT) ); num_pts += num_bzr_pts - 1; -- 2.34.1

2 1

[PATCH v2] win32u: Handle memory allocation failures in nulldrv_PolyBezierTo (cppcheck)
by Huw Davies 22 Dec '21

22 Dec '21

From: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/win32u/painting.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/painting.c b/dlls/win32u/painting.c index 7939ea878da..648630cf2c0 100644 --- a/dlls/win32u/painting.c +++ b/dlls/win32u/painting.c @@ -156,7 +156,7 @@ BOOL CDECL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count ) BOOL CDECL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWORD count ) { DC *dc = get_nulldrv_dc( dev ); - POINT *line_pts = NULL, *bzr_pts = NULL, bzr[4]; + POINT *line_pts = NULL, *new_line_pts, *bzr_pts = NULL, bzr[4]; DWORD i; INT num_pts, num_bzr_pts, space, size; @@ -182,6 +182,7 @@ BOOL CDECL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types space = count + 300; line_pts = malloc( space * sizeof(POINT) ); + if (!line_pts) return FALSE; num_pts = 1; line_pts[0] = dc->attr->cur_pos; @@ -209,7 +210,14 @@ BOOL CDECL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types if (space < size) { space = size * 2; - line_pts = realloc( line_pts, space * sizeof(POINT) ); + new_line_pts = realloc( line_pts, space * sizeof(POINT) ); + if (!new_line_pts) + { + free( bzr_pts ); + free( line_pts ); + return FALSE; + } + line_pts = new_line_pts; } memcpy( &line_pts[num_pts], &bzr_pts[1], (num_bzr_pts - 1) * sizeof(POINT) ); num_pts += num_bzr_pts - 1; -- 2.23.0

1 0

[PATCH] kernel32: Fix regression in CancelIoEx error code
by Keno Fischer 22 Dec '21

22 Dec '21

In commit 27ecc6ba5 ("ntdll: Fix iosb handling in NtCancelIoFile()"), NtCancelIoFile(Ex) was updated to return its status rather than unconditionally setting it in io_status->u.Status (though the write was retained in the success case). As a result, in the error case, the kernelbase wrappers now interpret unitialized memory as an error code, since io_status->u.Status is never written. Fix that by using the return status instead and add an appropriate test that covers this case. Issue Reference: https://github.com/JuliaLang/julia/issues/43490 Signed-Off-By: Keno Fischer <keno(a)juliacomputing.com> --- dlls/kernel32/tests/pipe.c | 12 ++++++++++++ dlls/kernelbase/file.c | 6 ++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 5af92f8f8a5..f73ef627c67 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2941,6 +2941,7 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL OVERLAPPED read_overlapped, read_overlapped2, write_overlapped, write_overlapped2; char buf[10000], read_buf[10000]; HANDLE flush_thread; + BOOL res; memset(buf, 0xaa, sizeof(buf)); @@ -3074,6 +3075,17 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL overlapped_write_sync(writer, buf, 1); test_overlapped_result(reader, &read_overlapped, 1, FALSE); + /* Test that canceling the same operation twice gives a sensible error */ + SetLastError(0xdeadbeef); + overlapped_read_async(reader, read_buf, 1, &read_overlapped2); + res = pCancelIoEx(reader, &read_overlapped2); + ok(res, "CancelIoEx failed with error %d\n", GetLastError()); + res = pCancelIoEx(reader, &read_overlapped2); + ok(!res, "CancelIOEx succeeded unexpectedly"); + ok(GetLastError() == ERROR_NOT_FOUND, + "In CancelIoEx failure, expected ERROR_NOT_FOUND, got %d\n", GetLastError()); + test_overlapped_failure(reader, &read_overlapped2, ERROR_OPERATION_ABORTED); + /* make two async writes, cancel the first one and make sure that we read from the second one */ overlapped_write_async(writer, buf, buf_size+2000, &write_overlapped); overlapped_write_async(writer, buf, 1, &write_overlapped2); diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 5c7b649d805..576e03eb62b 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -2872,8 +2872,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CancelIo( HANDLE handle ) { IO_STATUS_BLOCK io; - NtCancelIoFile( handle, &io ); - return set_ntstatus( io.u.Status ); + return set_ntstatus( NtCancelIoFile( handle, &io ) ); } @@ -2884,8 +2883,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CancelIoEx( HANDLE handle, LPOVERLAPPED overlapped { IO_STATUS_BLOCK io; - NtCancelIoFileEx( handle, (PIO_STATUS_BLOCK)overlapped, &io ); - return set_ntstatus( io.u.Status ); + return set_ntstatus( NtCancelIoFileEx( handle, (PIO_STATUS_BLOCK)overlapped, &io ) ); } -- 2.25.1

1 0

[PATCH] api-ms-win-core-versionansi-l1-1-1: Add dll.
by David Warner 22 Dec '21

22 Dec '21

Add the ANSI analogue to api-ms-win-core-version-l1-1-1 --- configure | 1 + configure.ac | 1 + dlls/api-ms-win-core-versionansi-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-versionansi-l1-1-1.spec | 6 ++++++ tools/make_specfiles | 1 + 5 files changed, 10 insertions(+) create mode 100644 dlls/api-ms-win-core-versionansi-l1-1-1/Makefile.in create mode 100644 dlls/api-ms-win-core-versionansi-l1-1-1/api-ms-win-core-versionansi-l1-1-1.spec diff --git a/configure b/configure index 69159422456..f38652cc263 100755 --- a/configure +++ b/configure @@ -21545,6 +21545,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-version-l1-1-0 enable_api_ms_win_co wine_fn_config_makefile dlls/api-ms-win-core-version-l1-1-1 enable_api_ms_win_core_version_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-version-private-l1-1-0 enable_api_ms_win_core_version_private_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-versionansi-l1-1-0 enable_api_ms_win_core_versionansi_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-versionansi-l1-1-1 enable_api_ms_win_core_versionansi_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-windowserrorreporting-l1-1-0 enable_api_ms_win_core_windowserrorreporting_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-winrt-error-l1-1-1 enable_api_ms_win_core_winrt_error_l1_1_1 diff --git a/configure.ac b/configure.ac index c1eb2f99a8c..57c4e01be61 100644 --- a/configure.ac +++ b/configure.ac @@ -2469,6 +2469,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-version-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-version-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-version-private-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-versionansi-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-versionansi-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-windowserrorreporting-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-error-l1-1-1) diff --git a/dlls/api-ms-win-core-versionansi-l1-1-1/Makefile.in b/dlls/api-ms-win-core-versionansi-l1-1-1/Makefile.in new file mode 100644 index 00000000000..054fa70c479 --- /dev/null +++ b/dlls/api-ms-win-core-versionansi-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-versionansi-l1-1-1.dll diff --git a/dlls/api-ms-win-core-versionansi-l1-1-1/api-ms-win-core-versionansi-l1-1-1.spec b/dlls/api-ms-win-core-versionansi-l1-1-1/api-ms-win-core-versionansi-l1-1-1.spec new file mode 100644 index 00000000000..a73d8924376 --- /dev/null +++ b/dlls/api-ms-win-core-versionansi-l1-1-1/api-ms-win-core-versionansi-l1-1-1.spec @@ -0,0 +1,6 @@ +@ stdcall GetFileVersionInfoExA(long str long long ptr) version.GetFileVersionInfoExA +@ stdcall GetFileVersionInfoSizeExA(long str ptr) version.GetFileVersionInfoSizeExA +@ stdcall GetFileVersionInfoSizeA(str ptr) version.GetFileVersionInfoSizeA +@ stdcall GetFileVersionInfoA(str long long ptr) version.GetFileVersionInfoA +@ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) version.VerFindFileA +@ stdcall VerQueryValueA(ptr str ptr ptr) version.VerQueryValueA diff --git a/tools/make_specfiles b/tools/make_specfiles index 49a032ef14c..3e5f54f4947 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -442,6 +442,7 @@ my @dll_groups = [ "version", "api-ms-win-core-versionansi-l1-1-0", + "api-ms-win-core-versionansi-l1-1-1", "api-ms-win-core-version-l1-1-0", "api-ms-win-core-version-l1-1-1", "api-ms-win-core-version-private-l1-1-0", -- 2.33.1

1 0

[PATCH v7 1/3] ntdll: sock_recv keeps message ordered
by Dongwan Kim 22 Dec '21

22 Dec '21

Calling try_recv could make messages misordered. Suppose that a server program calls a overlapped WSARecv and its operation is pending. Another program sends a message and wineserver is busy. The server program calls another overlapped WSARecv and it intercepts the message for the pending WSARecv. The problem already had been discussed here https://www.winehq.org/pipermail/wine-devel/2021-May/186612.html To avoid this situation, this kind of approach can be applied. The server program needs to know if there are pending asyncs before calling try_recv. Wineserver notifies it whenever invoking APC_ASYNC_IO. Then, the server program updates it and check it before calling try_recv. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/ntdll/unix/server.c | 8 ++++---- dlls/ntdll/unix/socket.c | 25 ++++++++++++++++++++++++- dlls/ws2_32/socket.c | 28 ++++++++++++++++++++++++++++ include/wine/afd.h | 12 +++++++++++- include/wine/server_protocol.h | 1 + server/async.c | 8 ++++++++ 6 files changed, 76 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index a388247beb2..047da6e0974 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -368,17 +368,17 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO case APC_ASYNC_IO: { struct async_fileio *user = wine_server_get_ptr( call->async_io.user ); - ULONG_PTR info = call->async_io.result; + ULONG_PTR info[2] = { call->async_io.result, call->async_io.async_wait }; NTSTATUS status; result->type = call->type; status = call->async_io.status; - if (user->callback( user, &info, &status )) + if (user->callback( user, info, &status )) { result->async_io.status = status; - result->async_io.total = info; + result->async_io.total = *info; /* the server will pass us NULL if a call failed synchronously */ - set_async_iosb( call->async_io.sb, result->async_io.status, info ); + set_async_iosb( call->async_io.sb, result->async_io.status, *info ); } else result->async_io.status = STATUS_PENDING; /* restart it */ break; diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index f82c7ae1ddf..1b2fc854999 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -651,13 +651,27 @@ static NTSTATUS try_recv( int fd, struct async_recv_ioctl *async, ULONG_PTR *siz return status; } +struct list *async_queue_list; +static struct afd_async_queue* find_async_queue(HANDLE handle){ + struct afd_async_queue *queue; + + LIST_FOR_EACH_ENTRY(queue, async_queue_list, struct afd_async_queue, entry){ + if(queue->sock == handle) + return queue; + } + return NULL; +} static BOOL async_recv_proc( void *user, ULONG_PTR *info, NTSTATUS *status ) { struct async_recv_ioctl *async = user; + struct afd_async_queue *queue; int fd, needs_close; TRACE( "%#x\n", *status ); + queue = find_async_queue(async->io.handle); + if(queue) + queue->read_q = info[1]; //store if waiting asyncs exist if (*status == STATUS_ALERTED) { if ((*status = server_get_unix_fd( async->io.handle, 0, &fd, &needs_close, NULL, NULL ))) @@ -679,6 +693,7 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi struct WS_sockaddr *addr, int *addr_len, DWORD *ret_flags, int unix_flags, int force_async ) { struct async_recv_ioctl *async; + struct afd_async_queue *queue; ULONG_PTR information; HANDLE wait_handle; DWORD async_size; @@ -735,7 +750,12 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi } } - status = try_recv( fd, async, &information ); + queue = find_async_queue(handle); + + if( force_async && queue->read_q ) // if there are waiting asyncs, avoid cutting in line. + status = STATUS_DEVICE_NOT_READY; + else + status = try_recv( fd, async, &information ); if (status != STATUS_SUCCESS && status != STATUS_BUFFER_OVERFLOW && status != STATUS_DEVICE_NOT_READY) { @@ -764,6 +784,7 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi SERVER_END_REQ; if (status != STATUS_PENDING) release_fileio( &async->io ); + else queue->read_q = 1; if (wait_handle) status = wait_async( wait_handle, options & FILE_SYNCHRONOUS_IO_ALERT ); return status; @@ -1306,6 +1327,8 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc unsigned int *ws_flags = u64_to_user_ptr(params->ws_flags_ptr); int unix_flags = 0; + async_queue_list = u64_to_user_ptr(params->async_queue_list); + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) return status; diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 648284c10a3..88e0b00cb51 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -157,6 +157,30 @@ DECLARE_CRITICAL_SECTION(cs_socket_list); static SOCKET *socket_list; static unsigned int socket_list_size; +struct list async_queue_list = LIST_INIT(async_queue_list); + +static struct afd_async_queue* alloc_async_queue(HANDLE handle){ + struct afd_async_queue *queue = + (struct afd_async_queue*)malloc(sizeof(struct afd_async_queue)); + memset(queue, 0, sizeof(struct afd_async_queue)); + + queue->sock = handle; + list_add_head(&async_queue_list, &queue->entry); + return queue; +} + +static void remove_async_queue(HANDLE handle){ + struct afd_async_queue *queue; + + LIST_FOR_EACH_ENTRY(queue, &async_queue_list, struct afd_async_queue, entry){ + if(queue->sock == handle){ + list_remove(&queue->entry); + free(queue); + break; + } + } +} + const char *debugstr_sockaddr( const struct sockaddr *a ) { if (!a) return "(nil)"; @@ -355,6 +379,8 @@ static BOOL socket_list_add(SOCKET socket) SOCKET *new_array; EnterCriticalSection(&cs_socket_list); + alloc_async_queue((HANDLE)socket); + for (i = 0; i < socket_list_size; ++i) { if (!socket_list[i]) @@ -406,6 +432,7 @@ static BOOL socket_list_remove( SOCKET socket ) if (!socket) return FALSE; EnterCriticalSection(&cs_socket_list); + remove_async_queue( (HANDLE)socket); for (i = 0; i < socket_list_size; ++i) { if (socket_list[i] == socket) @@ -938,6 +965,7 @@ static int WS2_recv_base( SOCKET s, WSABUF *buffers, DWORD buffer_count, DWORD * params.force_async = !!overlapped; params.count = buffer_count; params.buffers_ptr = u64_from_user_ptr(buffers); + params.async_queue_list = u64_from_user_ptr(&async_queue_list); status = NtDeviceIoControlFile( (HANDLE)s, event, apc, cvalue, piosb, IOCTL_AFD_WINE_RECVMSG, &params, sizeof(params), NULL, 0 ); diff --git a/include/wine/afd.h b/include/wine/afd.h index efd5787e90a..c4ece63138a 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -24,6 +24,7 @@ #include <winternl.h> #include <winioctl.h> #include <mswsock.h> +#include "wine/list.h" struct afd_wsabuf_32 { @@ -322,8 +323,9 @@ struct afd_recvmsg_params int force_async; unsigned int count; ULONGLONG buffers_ptr; /* WSABUF[] */ + ULONGLONG async_queue_list; }; -C_ASSERT( sizeof(struct afd_recvmsg_params) == 48 ); +C_ASSERT( sizeof(struct afd_recvmsg_params) == 56 ); struct afd_sendmsg_params { @@ -365,4 +367,12 @@ struct afd_get_info_params }; C_ASSERT( sizeof(struct afd_get_info_params) == 12 ); +struct afd_async_queue{ + struct list entry; + HANDLE sock; + char read_q; + char write_q; +}; + + #endif diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1d17a40530f..ce26240bc9a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -492,6 +492,7 @@ typedef union client_ptr_t user; client_ptr_t sb; data_size_t result; + unsigned int async_wait; } async_io; struct { diff --git a/server/async.c b/server/async.c index 1a564ff1a69..5d6cc9770c3 100644 --- a/server/async.c +++ b/server/async.c @@ -164,6 +164,7 @@ static void async_destroy( struct object *obj ) void async_terminate( struct async *async, unsigned int status ) { struct iosb *iosb = async->iosb; + struct async* async_waiting; if (async->terminated) return; @@ -202,6 +203,13 @@ void async_terminate( struct async *async, unsigned int status ) else data.async_io.status = status; + async_waiting = find_pending_async(async->queue); + if(async_waiting) + { + data.async_io.async_wait = 1; + release_object(async_waiting); + } + thread_queue_apc( async->thread->process, async->thread, &async->obj, &data ); } -- 2.30.2

2 4

[PATCH 2/2] user32: DefWindowProc(WM_NCCALCSIZE) should return 0.
by Dmitry Timoshkov 22 Dec '21

22 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37609 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/defwnd.c | 3 ++- dlls/user32/tests/win.c | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 8cd9047f02b..1b28232b551 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -265,7 +265,8 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa } case WM_NCCALCSIZE: - return NC_HandleNCCalcSize( hwnd, wParam, (RECT *)lParam ); + NC_HandleNCCalcSize( hwnd, wParam, (RECT *)lParam ); + break; case WM_WINDOWPOSCHANGING: return WINPOS_HandleWindowPosChanging( hwnd, (WINDOWPOS *)lParam ); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index b93839e40b5..f2a4e5028ea 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -12378,7 +12378,6 @@ todo_wine params.rgrc[0] = window_rect; ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)&params); -todo_wine ok(!ret, "got %08x\n", ret); ok(EqualRect(&params.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(&params.rgrc[0])); @@ -12390,7 +12389,6 @@ todo_wine GetWindowRect(hwnd, &window_rect); ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect); -todo_wine ok(!ret, "got %08x\n", ret); ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect)); -- 2.34.1

2 1

[PATCH 1/2] user32/tests: Add some tests for WM_NCCALCSIZE.
by Dmitry Timoshkov 22 Dec '21

22 Dec '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/win.c | 70 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 0156987f529..b93839e40b5 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -12328,6 +12328,75 @@ static void test_DragDetect(void) ok(!(GetKeyState( VK_LBUTTON ) & 0x8000), "got VK_LBUTTON\n"); } +static void test_WM_NCCALCSIZE(void) +{ + WNDCLASSA cls; + HWND hwnd; + NCCALCSIZE_PARAMS params; + WINDOWPOS winpos; + RECT client_rect, window_rect; + LRESULT ret; + + cls.style = CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW; + cls.lpfnWndProc = DefWindowProcA; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "dummy_window_class"; + ret = RegisterClassA(&cls); + ok(ret, "RegisterClass error %u\n", GetLastError()); + + hwnd = CreateWindowExA(0, "dummy_window_class", NULL, + WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP, + 100, 100, 200, 200, 0, 0, GetModuleHandleA(NULL), NULL); + ok(hwnd != 0, "CreateWindowEx error %u\n", GetLastError()); + + GetWindowRect(hwnd, &window_rect); + params.rgrc[0] = window_rect; + params.rgrc[1] = window_rect; + GetClientRect(hwnd, &client_rect); + MapWindowPoints(hwnd, 0, (POINT *)&client_rect, 2); + params.rgrc[2] = client_rect; + + winpos.hwnd = hwnd; + winpos.hwndInsertAfter = HWND_TOP; + winpos.x = window_rect.left; + winpos.y = window_rect.top; + winpos.cx = window_rect.right - window_rect.left; + winpos.cy = window_rect.bottom - window_rect.top; + winpos.flags = SWP_NOMOVE; + params.lppos = &winpos; + + ret = SendMessageW(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)&params); +todo_wine + ok(!ret, "got %08x\n", ret); + ok(EqualRect(&params.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(&params.rgrc[0])); + + params.rgrc[0] = window_rect; + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)&params); +todo_wine + ok(!ret, "got %08x\n", ret); + ok(EqualRect(&params.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(&params.rgrc[0])); + + GetWindowRect(hwnd, &window_rect); + ret = SendMessageW(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect); +todo_wine + ok(!ret, "got %08x\n", ret); + ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect)); + + GetWindowRect(hwnd, &window_rect); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect); +todo_wine + ok(!ret, "got %08x\n", ret); + ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect)); + + DestroyWindow(hwnd); +} + START_TEST(win) { char **argv; @@ -12497,6 +12566,7 @@ START_TEST(win) test_SC_SIZE(); test_cancel_mode(); test_DragDetect(); + test_WM_NCCALCSIZE(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook); -- 2.34.1

2 1

[PATCH] po: Update Dutch time zones translation.
by Floris Renaud 22 Dec '21

22 Dec '21

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/po/nl.po b/po/nl.po index ee88b224ec4..2abb4cd694d 100644 --- a/po/nl.po +++ b/po/nl.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: 2021-12-01 16:10+0100\n" +"PO-Revision-Date: 2021-12-22 10:00+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -10554,22 +10554,16 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "(UTC+00:00) Dublin, Edinburgh, Lissabon, Londen" #: dlls/tzres/tzres.rc:342 -#, fuzzy -#| msgid "Sudan Standard Time" msgid "South Sudan Standard Time" -msgstr "Soedan Standaard Tijd" +msgstr "Zuid-Soedan Standaard Tijd" #: dlls/tzres/tzres.rc:343 -#, fuzzy -#| msgid "Sudan Daylight Time" msgid "South Sudan Daylight Time" -msgstr "Soedan Zomertijd" +msgstr "Zuid-Soedan Zomertijd" #: dlls/tzres/tzres.rc:344 -#, fuzzy -#| msgid "(UTC+02:00) Jerusalem" msgid "(UTC+02:00) Juba" -msgstr "(UTC+02:00) Jeruzalem" +msgstr "(UTC+02:00) Juba" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" -- 2.34.1

1 0

[PATCH] dwrite: Handle memory allocation failures in bidi_compute_bracket_pairs (cppcheck)
by Alex Henrie 22 Dec '21

22 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/dwrite/bidi.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/bidi.c b/dlls/dwrite/bidi.c index cc62509b557..df79d3ff58d 100644 --- a/dlls/dwrite/bidi.c +++ b/dlls/dwrite/bidi.c @@ -629,12 +629,14 @@ static BracketPair *bidi_compute_bracket_pairs(IsolatedRun *iso_run) WCHAR *open_stack; int *stack_index; int stack_top = iso_run->length; - BracketPair *out = NULL; + BracketPair *out = NULL, *new_out; int pair_count = 0; int i; open_stack = malloc(sizeof(WCHAR) * iso_run->length); + if (!open_stack) return NULL; stack_index = malloc(sizeof(int) * iso_run->length); + if (!stack_index) goto done; for (i = 0; i < iso_run->length; i++) { unsigned short ubv = get_table_entry(bidi_bracket_table, iso_run->item[i].ch); @@ -643,6 +645,7 @@ static BracketPair *bidi_compute_bracket_pairs(IsolatedRun *iso_run) if (!out) { out = malloc(sizeof(BracketPair)); + if (!out) goto done; out[0].start = -1; } @@ -665,7 +668,14 @@ static BracketPair *bidi_compute_bracket_pairs(IsolatedRun *iso_run) out[pair_count].start = stack_index[j]; out[pair_count].end = i; pair_count++; - out = realloc(out, sizeof(BracketPair) * (pair_count+1)); + new_out = realloc(out, sizeof(BracketPair) * (pair_count+1)); + if (!new_out) + { + free(out); + out = NULL; + goto done; + } + out = new_out; out[pair_count].start = -1; stack_top = j+1; break; @@ -682,6 +692,7 @@ static BracketPair *bidi_compute_bracket_pairs(IsolatedRun *iso_run) else if (pair_count > 1) qsort(out, pair_count, sizeof(BracketPair), bracketpair_compr); +done: free(open_stack); free(stack_index); return out; -- 2.34.1

2 1

[PATCH vkd3d v3 07/12] vkd3d-shader/hlsl: Add dimension types for textures to enum hlsl_sampler_dim.
by Francisco Casas 22 Dec '21

22 Dec '21

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 25 +++++++++++++++---------- libs/vkd3d-shader/hlsl.h | 10 ++++++++-- libs/vkd3d-shader/hlsl_sm4.c | 2 +- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index c664d5b1..2bd4b5c8 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -929,10 +929,15 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru { static const char *const dimensions[] = { - [HLSL_SAMPLER_DIM_1D] = "1D", - [HLSL_SAMPLER_DIM_2D] = "2D", - [HLSL_SAMPLER_DIM_3D] = "3D", - [HLSL_SAMPLER_DIM_CUBE] = "Cube" + [HLSL_SAMPLER_DIM_1D] = "1D", + [HLSL_SAMPLER_DIM_2D] = "2D", + [HLSL_SAMPLER_DIM_3D] = "3D", + [HLSL_SAMPLER_DIM_CUBE] = "Cube", + [HLSL_SAMPLER_DIM_1DARRAY] = "1DArray", + [HLSL_SAMPLER_DIM_2DARRAY] = "2DArray", + [HLSL_SAMPLER_DIM_2DMS] = "2DMS", + [HLSL_SAMPLER_DIM_2DMSARRAY] = "2DMSArray", + [HLSL_SAMPLER_DIM_CUBEARRAY] = "CubeArray", }; switch (type->base_type) @@ -1776,11 +1781,11 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) static const char *const sampler_names[] = { - "sampler", - "sampler1D", - "sampler2D", - "sampler3D", - "samplerCUBE" + [HLSL_SAMPLER_DIM_GENERIC] = "sampler", + [HLSL_SAMPLER_DIM_1D] = "sampler1D", + [HLSL_SAMPLER_DIM_2D] = "sampler2D", + [HLSL_SAMPLER_DIM_3D] = "sampler3D", + [HLSL_SAMPLER_DIM_CUBE] = "samplerCUBE", }; static const struct @@ -1832,7 +1837,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) } } - for (bt = 0; bt <= HLSL_SAMPLER_DIM_MAX; ++bt) + for (bt = 0; bt <= HLSL_SAMPLER_DIM_LAST_SAMPLER; ++bt) { type = hlsl_new_type(ctx, sampler_names[bt], HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); type->sampler_dim = bt; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 49fa8d9d..334610df 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -98,7 +98,13 @@ enum hlsl_sampler_dim HLSL_SAMPLER_DIM_2D, HLSL_SAMPLER_DIM_3D, HLSL_SAMPLER_DIM_CUBE, - HLSL_SAMPLER_DIM_MAX = HLSL_SAMPLER_DIM_CUBE + HLSL_SAMPLER_DIM_LAST_SAMPLER = HLSL_SAMPLER_DIM_CUBE, + HLSL_SAMPLER_DIM_1DARRAY, + HLSL_SAMPLER_DIM_2DARRAY, + HLSL_SAMPLER_DIM_2DMS, + HLSL_SAMPLER_DIM_2DMSARRAY, + HLSL_SAMPLER_DIM_CUBEARRAY, + HLSL_SAMPLER_DIM_MAX = HLSL_SAMPLER_DIM_CUBEARRAY, }; enum hlsl_matrix_majority @@ -489,7 +495,7 @@ struct hlsl_ctx struct hlsl_type *vector[HLSL_TYPE_LAST_SCALAR + 1][4]; /* matrix[float][2][4] is a float4x2, i.e. dimx = 2, dimy = 4 */ struct hlsl_type *matrix[HLSL_TYPE_LAST_SCALAR + 1][4][4]; - struct hlsl_type *sampler[HLSL_SAMPLER_DIM_MAX + 1]; + struct hlsl_type *sampler[HLSL_SAMPLER_DIM_LAST_SAMPLER + 1]; struct hlsl_type *Void; } builtin_types; diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index be35d125..cefe173d 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1291,7 +1291,7 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf case HLSL_SAMPLER_DIM_CUBE: break; - case HLSL_SAMPLER_DIM_GENERIC: + default: assert(0); } -- 2.25.1

3 6

[PATCH] reg: Handle memory allocation failures in run_delete (cppcheck)
by Alex Henrie 22 Dec '21

22 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- programs/reg/delete.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/programs/reg/delete.c b/programs/reg/delete.c index cf0108664fd..344fb6614c5 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -87,9 +87,14 @@ static int run_delete(HKEY root, WCHAR *path, REGSAM sam, WCHAR *key_name, WCHAR if (value_all) { DWORD max_value_len = 256, value_len; - WCHAR *value_name; + WCHAR *value_name, *new_value_name; value_name = malloc(max_value_len * sizeof(WCHAR)); + if (!value_name) + { + output_error(ERROR_NOT_ENOUGH_MEMORY); + return 1; + } while (1) { @@ -110,7 +115,13 @@ static int run_delete(HKEY root, WCHAR *path, REGSAM sam, WCHAR *key_name, WCHAR else if (rc == ERROR_MORE_DATA) { max_value_len *= 2; - value_name = realloc(value_name, max_value_len * sizeof(WCHAR)); + new_value_name = realloc(value_name, max_value_len * sizeof(WCHAR)); + if (!new_value_name) + { + output_error(ERROR_NOT_ENOUGH_MEMORY); + return 1; + } + value_name = new_value_name; } else break; } -- 2.34.1

1 0

[PATCH v2] ws2_32: Fix memory leaks on error paths in unix_gethostby* (scan-build)
by Alex Henrie 22 Dec '21

22 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Don't free before the call to hostent_from_unix --- dlls/ws2_32/unixlib.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index e89ebe35248..1f82aee81de 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -866,7 +866,10 @@ static NTSTATUS unix_gethostbyaddr( void *args ) } if (!unix_host) + { + free( unix_buffer ); return (locerr < 0 ? errno_from_unix( errno ) : host_errno_from_unix( locerr )); + } ret = hostent_from_unix( unix_host, params->host, params->size ); @@ -916,7 +919,10 @@ static NTSTATUS unix_gethostbyname( void *args ) } if (!unix_host) + { + free( unix_buffer ); return (locerr < 0 ? errno_from_unix( errno ) : host_errno_from_unix( locerr )); + } ret = hostent_from_unix( unix_host, params->host, params->size ); -- 2.34.1

1 0

[PATCH] quartz/tests: Test querying connection state inside of IPin::ReceiveConnection().
by Zebediah Figura 22 Dec '21

22 Dec '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/quartz/tests/avisplit.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 10088c033b7..80ee6607279 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -913,6 +913,25 @@ static HRESULT testsink_get_media_type(struct strmbase_pin *iface, unsigned int return VFW_S_NO_MORE_ITEMS; } +static HRESULT testsink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *mt) +{ + AM_MEDIA_TYPE mt2; + IPin *peer2; + HRESULT hr; + + hr = IPin_ConnectedTo(peer, &peer2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(peer2 == &iface->pin.IPin_iface, "Peer didn't match.\n"); + IPin_Release(peer2); + + hr = IPin_ConnectionMediaType(peer, &mt2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(mt, &mt2), "Media types didn't match.\n"); + FreeMediaType(&mt2); + + return S_OK; +} + static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample *sample) { struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); @@ -976,6 +995,7 @@ static const struct strmbase_sink_ops testsink_ops = .base.pin_query_interface = testsink_query_interface, .base.pin_query_accept = testsink_query_accept, .base.pin_get_media_type = testsink_get_media_type, + .sink_connect = testsink_connect, .pfnReceive = testsink_Receive, .sink_eos = testsink_eos, .sink_new_segment = testsink_new_segment, -- 2.34.1

2 1

[PATCH] server: Avoid using the long double type on non-x86 platforms.
by Zebediah Figura 22 Dec '21

22 Dec '21

We especially may want to support x86 on ARM, where long double is not an 80-bit type. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/trace.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/trace.c b/server/trace.c index a1a8726ba71..a48f00258fe 100644 --- a/server/trace.c +++ b/server/trace.c @@ -666,9 +666,11 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) ctx.fp.i386_regs.data_off, ctx.fp.i386_regs.data_sel, ctx.fp.i386_regs.cr0npx ); for (i = 0; i < 8; i++) { - long double reg = 0; - memcpy( &reg, &ctx.fp.i386_regs.regs[10 * i], 10 ); - fprintf( stderr, ",fp.reg%u=%Lg", i, reg ); + unsigned __int64 reg[2]; + memset( reg, 0, sizeof(reg) ); + memcpy( reg, &ctx.fp.i386_regs.regs[10 * i], 10 ); + fprintf( stderr, ",fp.reg%u=", i ); + dump_uint128( "", reg ); } } if (ctx.flags & SERVER_CTX_EXTENDED_REGISTERS) -- 2.34.1

1 0

[PATCH] winex11: Fix the build when XInput2 headers are not present.
by Zebediah Figura 22 Dec '21

22 Dec '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winex11.drv/mouse.c | 155 ++++++++++++++++++++------------------- 1 file changed, 79 insertions(+), 76 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 9e56e080bda..51a6828f10c 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -275,7 +275,6 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator thread_data->x_valuator.value = 0; thread_data->y_valuator.value = 0; } -#endif /*********************************************************************** @@ -283,7 +282,6 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator */ static void enable_xinput2(void) { -#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H struct x11drv_thread_data *data = x11drv_thread_data(); XIEventMask mask; XIDeviceInfo *pointer_info; @@ -330,9 +328,10 @@ static void enable_xinput2(void) data->xi2_current_slave = 0; data->xi2_state = xi_enabled; -#endif } +#endif + /*********************************************************************** * disable_xinput2 */ @@ -371,6 +370,7 @@ static void disable_xinput2(void) */ static BOOL grab_clipping_window( const RECT *clip ) { +#if HAVE_X11_EXTENSIONS_XINPUT2_H static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; struct x11drv_thread_data *data = x11drv_thread_data(); Window clip_window; @@ -441,6 +441,10 @@ static BOOL grab_clipping_window( const RECT *clip ) data->clip_hwnd = msg_hwnd; SendNotifyMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR_NOTIFY, 0, (LPARAM)msg_hwnd ); return TRUE; +#else + WARN( "XInput2 was not available at compile time\n" ); + return FALSE; +#endif } /*********************************************************************** @@ -628,79 +632,6 @@ static void map_event_coords( HWND hwnd, Window window, Window event_root, int x input->u.mi.dy = pt.y; } -static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input ) -{ - struct x11drv_thread_data *thread_data = x11drv_thread_data(); - XIValuatorClassInfo *x = &thread_data->x_valuator, *y = &thread_data->y_valuator; - double x_value = 0, y_value = 0, x_scale, y_scale; - const double *values = event->valuators.values; - RECT virtual_rect; - int i; - - if (x->number < 0 || y->number < 0) return FALSE; - if (!event->valuators.mask_len) return FALSE; - if (thread_data->xi2_state != xi_enabled) return FALSE; - - /* If there is no slave currently detected, no previous motion nor device - * change events were received. Look it up now on the device list in this - * case. - */ - if (!thread_data->xi2_current_slave) - { - XIDeviceInfo *devices = thread_data->xi2_devices; - - for (i = 0; i < thread_data->xi2_device_count; i++) - { - if (devices[i].use != XISlavePointer) continue; - if (devices[i].deviceid != event->deviceid) continue; - if (devices[i].attachment != thread_data->xi2_core_pointer) continue; - thread_data->xi2_current_slave = event->deviceid; - break; - } - } - if (event->deviceid != thread_data->xi2_current_slave) return FALSE; - - virtual_rect = get_virtual_screen_rect(); - - if (x->max <= x->min) x_scale = 1; - else x_scale = (virtual_rect.right - virtual_rect.left) / (x->max - x->min); - if (y->max <= y->min) y_scale = 1; - else y_scale = (virtual_rect.bottom - virtual_rect.top) / (y->max - y->min); - - for (i = 0; i <= max( x->number, y->number ); i++) - { - if (!XIMaskIsSet( event->valuators.mask, i )) continue; - if (i == x->number) - { - x_value = *values; - x->value += x_value * x_scale; - } - if (i == y->number) - { - y_value = *values; - y->value += y_value * y_scale; - } - values++; - } - - input->u.mi.dx = round( x->value ); - input->u.mi.dy = round( y->value ); - - TRACE( "event %f,%f value %f,%f input %d,%d\n", x_value, y_value, x->value, y->value, input->u.mi.dx, input->u.mi.dy ); - - x->value -= input->u.mi.dx; - y->value -= input->u.mi.dy; - - if (!input->u.mi.dx && !input->u.mi.dy) - { - TRACE( "accumulating motion\n" ); - return FALSE; - } - - return TRUE; -} - - /*********************************************************************** * send_mouse_input * @@ -1887,6 +1818,78 @@ static BOOL X11DRV_DeviceChanged( XGenericEventCookie *xev ) return TRUE; } +static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input ) +{ + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + XIValuatorClassInfo *x = &thread_data->x_valuator, *y = &thread_data->y_valuator; + double x_value = 0, y_value = 0, x_scale, y_scale; + const double *values = event->valuators.values; + RECT virtual_rect; + int i; + + if (x->number < 0 || y->number < 0) return FALSE; + if (!event->valuators.mask_len) return FALSE; + if (thread_data->xi2_state != xi_enabled) return FALSE; + + /* If there is no slave currently detected, no previous motion nor device + * change events were received. Look it up now on the device list in this + * case. + */ + if (!thread_data->xi2_current_slave) + { + XIDeviceInfo *devices = thread_data->xi2_devices; + + for (i = 0; i < thread_data->xi2_device_count; i++) + { + if (devices[i].use != XISlavePointer) continue; + if (devices[i].deviceid != event->deviceid) continue; + if (devices[i].attachment != thread_data->xi2_core_pointer) continue; + thread_data->xi2_current_slave = event->deviceid; + break; + } + } + if (event->deviceid != thread_data->xi2_current_slave) return FALSE; + + virtual_rect = get_virtual_screen_rect(); + + if (x->max <= x->min) x_scale = 1; + else x_scale = (virtual_rect.right - virtual_rect.left) / (x->max - x->min); + if (y->max <= y->min) y_scale = 1; + else y_scale = (virtual_rect.bottom - virtual_rect.top) / (y->max - y->min); + + for (i = 0; i <= max( x->number, y->number ); i++) + { + if (!XIMaskIsSet( event->valuators.mask, i )) continue; + if (i == x->number) + { + x_value = *values; + x->value += x_value * x_scale; + } + if (i == y->number) + { + y_value = *values; + y->value += y_value * y_scale; + } + values++; + } + + input->u.mi.dx = round( x->value ); + input->u.mi.dy = round( y->value ); + + TRACE( "event %f,%f value %f,%f input %d,%d\n", x_value, y_value, x->value, y->value, input->u.mi.dx, input->u.mi.dy ); + + x->value -= input->u.mi.dx; + y->value -= input->u.mi.dy; + + if (!input->u.mi.dx && !input->u.mi.dy) + { + TRACE( "accumulating motion\n" ); + return FALSE; + } + + return TRUE; +} + /*********************************************************************** * X11DRV_RawMotion */ -- 2.34.1

1 0

[PATCH] po: Update LIthuanian translation.
by Aurimas Fišeras 21 Dec '21

21 Dec '21

2 1

[RFC PATCH] ntdll: Swallow crashes once pthread_exit() has been called.
by Giovanni Mascellani 21 Dec '21

21 Dec '21

When pthread_exit() is called, it tries to rewind the stack, which includes calling cleanup routines registered with pthread_cleanup_push() or similar procedures. But we also unwind the stack in signal_exit_thread(). This means that if any cleanup routine was registered between the exit frame and where control was when the thread was interrupted, then pthread will try to call functions from frames that do not exist anymore and might have been overwritten, which easily results in segmentation faults or similar accidents. Since until PE separation is finished it is not easy to fix the real problem, this patch logs and swallows crashes occurring after pthread_exit() is called, so that at least damages are minimized and developers are not confused by irrelevant messages. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52213 --- dlls/ntdll/unix/signal_arm.c | 6 ++++++ dlls/ntdll/unix/signal_arm64.c | 6 ++++++ dlls/ntdll/unix/signal_i386.c | 6 ++++++ dlls/ntdll/unix/signal_x86_64.c | 6 ++++++ dlls/ntdll/unix/thread.c | 2 ++ dlls/ntdll/unix/unix_private.h | 1 + 6 files changed, 27 insertions(+) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index ebc08984adf..b552bdb79f9 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -800,6 +800,12 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) EXCEPTION_RECORD rec = { 0 }; ucontext_t *context = sigcontext; + if (ntdll_get_thread_data()->exiting_pthread) + { + WARN("Swallowing crash after pthread is exiting\n"); + syscall(__NR_exit, 0); + } + switch (get_trap_code(signal, context)) { case TRAP_ARM_PRIVINFLT: /* Invalid opcode exception */ diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index f2612412366..10da9b8a366 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -854,6 +854,12 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) EXCEPTION_RECORD rec = { 0 }; ucontext_t *context = sigcontext; + if (ntdll_get_thread_data()->exiting_pthread) + { + WARN("Swallowing crash after pthread is exiting\n"); + syscall(__NR_exit, 0); + } + rec.NumberParameters = 2; rec.ExceptionInformation[0] = (get_fault_esr( context ) & 0x40) != 0; rec.ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index bf3abc1a587..1d4f8ec9df1 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1774,6 +1774,12 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) ucontext_t *ucontext = sigcontext; void *stack = setup_exception_record( sigcontext, &rec, &xcontext ); + if (ntdll_get_thread_data()->exiting_pthread) + { + WARN("Swallowing crash after pthread is exiting\n"); + syscall(__NR_exit, 0); + } + switch (TRAP_sig(ucontext)) { case TRAP_x86_OFLOW: /* Overflow exception */ diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index d32e38875a4..6454d2e6b26 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2551,6 +2551,12 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) struct xcontext context; ucontext_t *ucontext = sigcontext; + if (ntdll_get_thread_data()->exiting_pthread) + { + WARN("Swallowing crash after pthread is exiting\n"); + syscall(__NR_exit, 0); + } + rec.ExceptionAddress = (void *)RIP_sig(ucontext); save_context( &context, sigcontext ); diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 00fe2b6fa1b..8a22b68605a 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1055,6 +1055,7 @@ static void pthread_exit_wrapper( int status ) close( ntdll_get_thread_data()->wait_fd[1] ); close( ntdll_get_thread_data()->reply_fd ); close( ntdll_get_thread_data()->request_fd ); + ntdll_get_thread_data()->exiting_pthread = TRUE; pthread_exit( UIntToPtr(status) ); } @@ -1342,6 +1343,7 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT thread_data->request_fd = request_pipe[1]; thread_data->start = start; thread_data->param = param; + thread_data->exiting_pthread = FALSE; pthread_attr_init( &pthread_attr ); pthread_attr_setstack( &pthread_attr, teb->DeallocationStack, diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 0dcb09ad641..0d1117be2e3 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -61,6 +61,7 @@ struct ntdll_thread_data PRTL_THREAD_START_ROUTINE start; /* thread entry point */ void *param; /* thread entry point parameter */ void *jmp_buf; /* setjmp buffer for exception handling */ + BOOL exiting_pthread; }; C_ASSERT( sizeof(struct ntdll_thread_data) <= sizeof(((TEB *)0)->GdiTebBatch) ); -- 2.34.1

3 3

[PATCH] msxml3: Fix crashes due to access to invalid context pointer.
by Bernhard Übelacker 21 Dec '21

21 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52073 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> ---- Unchanged to previous [RFC]. In function xslt_doc_default_loader a pointer of the stack based variable "xmlParserInputPtr input" is given to bind_url. Later in function import_loader_onDataAvailable this pointer appears as parameter "void *ctxt" which correctly gets casted to "xmlParserInputPtr *input", but in my opinion incorrectly given to xmlNewIOInputStream as parameter "xmlParserCtxtPtr ctxt". In the next call to xmlNewInputStream this xmlParserCtxtPtr is used to increment the input_id member. By accident this input_id member contains the pointer which causes in xmlXPathNodeCollectAndTest the segfault. --- dlls/msxml3/node.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 721ad54e379..272e438e773 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1329,7 +1329,7 @@ static HRESULT import_loader_onDataAvailable(void *ctxt, char *ptr, DWORD len) inputbuffer = xmlParserInputBufferCreateIO(import_loader_io_read, import_loader_io_close, buffer, XML_CHAR_ENCODING_NONE); - *input = xmlNewIOInputStream(ctxt, inputbuffer, XML_CHAR_ENCODING_NONE); + *input = xmlNewIOInputStream(NULL, inputbuffer, XML_CHAR_ENCODING_NONE); if (!*input) xmlFreeParserInputBuffer(inputbuffer); -- 2.34.1

2 1

[PATCH] win32u: Implement NtUserBuildHwndList.
by Jacek Caban 21 Dec '21

21 Dec '21

Fixes Quake Champions, spotted by Paul Gofman. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/syscall.c | 1 + dlls/win32u/tests/win32u.c | 82 +++++++++++++++++++++++++++++++- dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 31 ++++++++++++ dlls/wow64win/Makefile.in | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 25 ++++++++++ dlls/wow64win/wow64win_private.h | 2 + include/ntuser.h | 2 + 9 files changed, 144 insertions(+), 4 deletions(-)

1 0

[tools] testbot/SetWinLocale: Remove the VM options.
by Francois Gouget 21 Dec '21

21 Dec '21

The TestBot creates the the missing live snapshots itself so these options were unused. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Also they can only be used by running SetWinLocale on the TestBot server which I cannot do. --- testbot/bin/SetWinLocale | 327 +++------------------------------------ 1 file changed, 21 insertions(+), 306 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 1e803c555..d7f795bee 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -1,10 +1,9 @@ #!/usr/bin/perl -Tw # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # -# Sets the locale of the specified Windows machine and, optionally, -# updates or creates a new snapshot of the TestBot VM for it. +# Sets the locale of the specified Windows machine. # -# Copyright 2018 Francois Gouget +# Copyright 2018, 2021 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -40,7 +39,6 @@ sub BEGIN use WineTestBot::Config; use WineTestBot::Log; use WineTestBot::TestAgent; -use WineTestBot::VMs; use WineTestBot::Utils; @@ -292,7 +290,6 @@ sub CheckLocale($$) } my ($OptHostName, $OptReboot); -my ($OptVM, $OptRefresh, $OptRefreshAll, $OptAddMissing, $OptAddLocales); my ($OptDefault, $OptLocale, $OptSystem, $OptMUI, $OptCountry, $OptKeyboard); while (@ARGV) { @@ -301,26 +298,6 @@ while (@ARGV) { $Usage = 0; } - elsif ($Arg eq "--vm") - { - $OptVM = CheckValue($Arg, $OptVM); - } - elsif ($Arg eq "--refresh") - { - $OptRefresh = 1; - } - elsif ($Arg eq "--refresh-all") - { - $OptRefreshAll = 1; - } - elsif ($Arg eq "--add-missing") - { - $OptAddMissing = 1; - } - elsif ($Arg eq "--add-locales") - { - $OptAddLocales = CheckValue($Arg, $OptAddLocales); - } elsif ($Arg eq "--reboot") { if (defined $OptReboot and !$OptReboot) @@ -388,101 +365,22 @@ while (@ARGV) } # Check and untaint parameters -my ($BaseVMName, $VMLocale, %AddLocales, $KeyboardIds, $CountryId); +my ($KeyboardIds, $CountryId); if (!defined $Usage) { - if (defined $OptVM) + if (!defined $OptHostName) { - if ($OptRefresh or $OptRefreshAll or $OptAddMissing or - defined $OptAddLocales) - { - if (defined $OptReboot and !$OptReboot) - { - Error("--no-reboot is incompatible with --refresh, --refresh-all, --add-missing and --add-locales\n"); - $Usage = 2; - } - if (defined $OptDefault or defined $OptLocale or defined $OptMUI or - defined $OptCountry or defined $OptKeyboard) - { - Error("--default, --locale, --mui, --country and --keyboard are incompatible with the VM snapshot options\n"); - $Usage = 2; - } - - # Always reboot Windows before updating a TestBot snapshot - $OptReboot = 1; - } - if ($OptRefresh and - ($OptRefreshAll or $OptAddMissing or defined $OptAddLocales)) - { - Error("--refresh is incompatible with --refresh--all, --add-missing and --add-locales\n"); - $Usage = 2; - } - if ($OptRefreshAll and $OptAddMissing) - { - Error("--refresh-all and --add-missing are mutually incompatible\n"); - $Usage = 2; - } - if (defined $OptAddLocales) - { - foreach my $Locale (split /:/, $OptAddLocales) - { - if ($Locale =~ /^[a-z]{2}_[A-Z]{2}$/) - { - $AddLocales{$Locale} = 1; - } - else - { - Error("'$Locale' is not a valid locale for --add-locales\n"); - $Usage = 2; - last; - } - } - if (!%AddLocales) - { - Error("'$OptAddLocales' does not contain any valid locale\n"); - $Usage = 2; - } - } - - $BaseVMName = $OptVM; - if ($BaseVMName =~ s/_([a-z]{2})_([A-Z]{2})$//) - { - if ($OptRefreshAll) - { - Error("'$OptVM' should not be a locale VM\n"); - $Usage = 2; - } - $VMLocale = "$1_$2"; # untaint - $OptDefault = $VMLocale eq "sr_RS" ? "sr-Latn-CS" : "$1-$2"; - } - elsif ($OptRefresh) - { - Error("'$OptVM' is not a locale VM\n"); - $Usage = 2; - } + Error("you must specify the Windows machine to work on\n"); + $Usage = 2; + } + elsif ($OptHostName =~ /^([a-zA-Z0-9.-]+)$/) + { + $OptHostName = $1; # untaint } else { - if ($OptRefresh or $OptRefreshAll or $OptAddMissing or - defined $OptAddLocales) - { - Error("--refresh, --refresh-all, --add-missing and --add-locales can only be used with --vm\n"); - $Usage = 2; - } - if (!defined $OptHostName) - { - Error("you must specify the Windows machine to work on\n"); - $Usage = 2; - } - elsif ($OptHostName =~ /^([a-zA-Z0-9.-]+)$/) - { - $OptHostName = $1; # untaint - } - else - { - Error("'$OptHostName' is not a valid hostname\n"); - $Usage = 2; - } + Error("'$OptHostName' is not a valid hostname\n"); + $Usage = 2; } $OptLocale ||= $OptDefault; @@ -516,9 +414,7 @@ if (!defined $Usage) } if (!defined $OptLocale and !defined $OptSystem and !defined $OptMUI and - !defined $OptKeyboard and !defined $OptCountry and - !$OptRefresh and !$OptRefreshAll and !$OptAddMissing and - !defined $OptAddLocales) + !defined $OptKeyboard and !defined $OptCountry) { Error("you must specify at least one locale to change\n"); $Usage = 2; @@ -537,21 +433,11 @@ if (defined $Usage) Error("try '$name0 --help' for more information\n"); exit $Usage; } - print "Usage: $name0 [options] --vm NAME --refresh\n"; - print "or $name0 [options] --vm NAME [--refresh-all] [--add-locales LOC1:LOC2:...]\n"; - print "or $name0 [options] [--default LOC] [--locale USR] [--system SYS] [--mui MUI] [--keyboard KBD] [--country CTY] HOSTNAME|--vm NAME\n"; + print "or $name0 [options] [--default LOC] [--locale USR] [--system SYS] [--mui MUI] [--keyboard KBD] [--country CTY] HOSTNAME\n"; print "\n"; - print "Sets the locale of the specified Windows machine and, optionally, updates or creates a new snapshot ot the TestBot VM for it.\n"; + print "Sets the locale of the specified Windows machine.\n"; print "\n"; print "Where:\n"; - print " --vm NAME Work on the specified TestBot VM.\n"; - print " --refresh Create or update the TestBot VM's snapshot (and VM if needed).\n"; - print " --refresh-all Refresh the locale VMs derived from the specified base VM.\n"; - print " --add-missing Check the locale VMs derived from the specified base VM and\n"; - print " add any missing corresponding snapshots.\n"; - print " --add-locales LOC1:LOC2:... Create new TestBot VMs derived from the specified\n"; - print " base VM for each of the Unix locale in the colon-sperated\n"; - print " list.\n"; print " HOSTNAME Work on the specified Windows host (must be running TestAgentd).\n"; print " --default LOC Use this Windows locale as the default for the other options.\n"; print " The locale must be in a form suitable for Windows' intl.cpl\n"; @@ -573,160 +459,6 @@ if (defined $Usage) } -# -# Handle the meta options -# - -my $VMs = CreateVMs(); -my $VM = $VMs->GetItem($OptVM); -if ($VM and $VM->Role eq "deleted") -{ - FatalError("'$OptVM' is marked for deletion\n"); -} - -if ($OptRefreshAll or $OptAddMissing) -{ - FatalError("could not find the '$OptVM' virtual machine\n") if (!$VM); - - my $HasLocaleVMs; - foreach my $VM (@{$VMs->GetItems()}) - { - next if ($VM->Role eq "deleted"); - if ($VM->Name =~ /^\Q$OptVM\E_([a-z]{2})_([A-Z]{2})$/) - { - $HasLocaleVMs = 1; - if ($OptRefreshAll or !$VM->GetDomain()->HasSnapshot($VM->IdleSnapshot)) - { - $AddLocales{"$1_$2"} = 1; - } - } - } - FatalError("could not find any locale VM for '$OptVM'\n") if (!$HasLocaleVMs); - if (!%AddLocales) - { - Debug(Elapsed($Start), " Nothing to do!\n"); - exit(0); - } -} - -if (%AddLocales) -{ - my @Failed; - my @Cmd = ("$0", ($Debug ? "--debug" : ()), "--refresh", "--vm"); - foreach my $Locale (sort keys %AddLocales) - { - if (Run(@Cmd, "${OptVM}_$Locale")) - { - push @Failed, $Locale; - } - } - if (@Failed) - { - Error("failed to add/refresh the snapshots for the following locales: @Failed\n"); - exit(1); - } - exit(0); -} - - -# -# Prepare the virtual machine -# - -if ($OptRefresh) -{ - my $BaseVM = $VMs->GetItem($BaseVMName); - if (!$BaseVM) - { - FatalError("could not find the '$BaseVMName' base virtual machine\n"); - } - - if (!$VM) - { - if ($BaseVM->Status ne "maintenance") - { - FatalError("the base VM is not marked for maintenance\n"); - } - if ($DryRun) - { - Warning("'$OptVM' does not exist. Skipping for dry run.\n"); - exit(0); - } - - # Create the localized VM - $VM = $VMs->Add(); - $VM->Name($OptVM); - $VM->SortOrder($BaseVM->SortOrder + 1); - $VM->Type($BaseVM->Type); - $VM->Role("extra"); - $VM->Missions($BaseVM->Missions); - $VM->MissionCaps($BaseVM->MissionCaps); - # All we need is for one VM to be in maintenance mode to prevent the - # TestBot from using this hypervisor domain. The base VM is in maintenance - # mode so that is enough. - $VM->Status("off"); - $VM->VirtURI($BaseVM->VirtURI); - $VM->VirtDomain($BaseVM->VirtDomain); - $VM->IdleSnapshot($BaseVM->IdleSnapshot ."_$VMLocale"); - $VM->Hostname($BaseVM->Hostname); - - my $Description = $BaseVM->Description ." ". LocaleName($VMLocale); - my $PropertyDescriptor = $VMs->GetPropertyDescriptorByName("Description"); - if ($PropertyDescriptor->GetMaxLength() < length($Description)) - { - Warning("the $OptVM description is too long. Truncating it.\n"); - $Description = substr($Description, 0, $PropertyDescriptor->GetMaxLength()); - } - $VM->Description($Description); - $VM->Details($BaseVM->Details); - - my ($_ErrKey, $_ErrProperty, $ErrMessage) = $VMs->Save(); - if (defined $ErrMessage) - { - FatalError("could not create the localized VM: $ErrMessage\n"); - } - } - else - { - if ($VM->Status ne "maintenance" and $BaseVM->Status ne "maintenance") - { - FatalError("neither $OptVM nor its base VM are marked for maintenance\n"); - } - if ($VM->Status !~ /^(?:maintenance|off)$/) - { - FatalError("'$OptVM' is neither off nor marked for maintenance\n"); - } - if ($BaseVM->Status !~ /^(?:maintenance|off)$/) - { - FatalError("'$BaseVMName' is neither off nor marked for maintenance\n"); - } - - } - - my $IdleSnapshot = $VM->IdleSnapshot; - if ($VM->GetDomain()->HasSnapshot($IdleSnapshot)) - { - Debug(Elapsed($Start), " Deleting the old $IdleSnapshot snapshot\n"); - my $ErrMessage = $DryRun ? undef : $VM->GetDomain()->RemoveSnapshot(); - if (defined $ErrMessage) - { - FatalError("could not remove the $IdleSnapshot snapshot: $ErrMessage\n"); - } - } - - Debug(Elapsed($Start), " Reverting the base VM\n"); - if (Run("$::RootDir/bin/LibvirtTool.pl", "--debug", "revert", $BaseVMName)) - { - # LibvirtTool.pl will have already printed an error message - exit(1); - } -} -elsif (defined $OptVM and !$VM) -{ - FatalError("could not find the '$OptVM' virtual machine\n"); -} - - # # Generate the intl.cpl configuration # @@ -782,8 +514,7 @@ push @Config, "</gs:GlobalizationServices>"; # Change the Windows locale using intl.cpl # -$OptHostName = $VM->Hostname if ($VM); # For error messages -my $TA = $VM ? $VM->GetAgent() : TestAgent->new($OptHostName, $AgentPort); +my $TA = TestAgent->new($OptHostName, $AgentPort); Debug(Elapsed($Start), " Sending the configuration file\n"); print STDERR join("\n", "locales.xml:", @Config, "") if ($DryRun or $Debug); @@ -834,6 +565,11 @@ if (!$DryRun) } } + +# +# Reboot to finalize the changes +# + if ($OptReboot) { Debug(Elapsed($Start), " Rebooting Windows\n"); @@ -847,37 +583,16 @@ if ($OptReboot) $TA->Run($Cmd, 0); # Note that we cannot wait for this command since it reboots Windows } -} - -# -# Update the virtual machine snapshot -# - -if ($OptRefresh) -{ # Wait a bit to make sure we don't reconnect before Windows has rebooted. sleep(30) if (!$DryRun); - # Allow up to 10 minutes for the shutdown plus reboot. Debug(Elapsed($Start), " Waiting for Windows to boot\n"); $TA->SetConnectTimeout(undef, undef, $WaitForBoot); if (!$DryRun and !$TA->Ping()) { FatalError("could not reconnect to $OptHostName after the reboot: ", $TA->GetLastError(), "\n"); } - - # Then wait a good minute after the reboot to make sure all the widgets are - # up and running. - Debug(Elapsed($Start), " Letting Windows warm up\n"); - sleep(60) if (!$DryRun); - - Debug(Elapsed($Start), " Creating the ", $VM->IdleSnapshot, " snapshot\n"); - my $ErrMessage = $DryRun ? undef : $VM->GetDomain()->CreateSnapshot(); - if (defined $ErrMessage) - { - FatalError("could not create the ". $VM->IdleSnapshot ." snapshot: $ErrMessage\n"); - } } Debug(Elapsed($Start), " All done!\n"); -- 2.30.2

1 0

[tools] testbot/SetWinLocale: Show the intl.cpl XML file in --debug mode.
by Francois Gouget 21 Dec '21

21 Dec '21

In addition to the --dry-run mode. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index d9a9e0340..1e803c555 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -786,11 +786,10 @@ $OptHostName = $VM->Hostname if ($VM); # For error messages my $TA = $VM ? $VM->GetAgent() : TestAgent->new($OptHostName, $AgentPort); Debug(Elapsed($Start), " Sending the configuration file\n"); -if ($DryRun) -{ - print STDERR join("\n", "locales.xml:", @Config, ""); -} -elsif (!$TA->SendFileFromString(join("\r\n", @Config, ""), "locales.xml", 0)) +print STDERR join("\n", "locales.xml:", @Config, "") if ($DryRun or $Debug); + +if (!$DryRun and + !$TA->SendFileFromString(join("\r\n", @Config, ""), "locales.xml", 0)) { FatalError("could not send the configuration file:", $TA->GetLastError(), "\n"); } -- 2.30.2

1 0

[tools] testbot/SetWinLocale: Accept underscores in the locale names.
by Francois Gouget 21 Dec '21

21 Dec '21

Also avoid undefined value errors if the locale value is missing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 947c1e0d1..d9a9e0340 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -279,14 +279,16 @@ sub CheckValue($$) sub CheckLocale($$) { my ($Option, $Value) = @_; + $Value = CheckValue($Option, $Value); - if ($Value !~ /^(?:[a-z]{2})-(?:Latn-)?(?:[A-Z]{2})$/) - { - Error("'$Value' is not a valid $Option locale\n"); - $Usage = 2; - return undef; - } - return $Value; + return undef if (!defined $Value); + + $Value =~ s/_/-/g; + return $Value if ($Value =~ /^(?:[a-z]{2})-(?:Latn-)?(?:[A-Z]{2})$/); + + Error("'$Value' is not a valid $Option locale\n"); + $Usage = 2; + return undef; } my ($OptHostName, $OptReboot); -- 2.30.2

1 0

[PATCH] ntdll: Fix a variable name in TRACE() message.
by Andrey Gusev 21 Dec '21

21 Dec '21

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d11f3f0f79d..c8f3d83947f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3127,7 +3127,7 @@ NTSTATUS WINAPI LdrGetDllHandleEx( ULONG flags, LPCWSTR load_path, ULONG *dll_ch WCHAR *dllname; HANDLE mapping; - TRACE( "flag %#x, load_path %p, dll_characteristics %p, name %p, base %p.\n", + TRACE( "flags %#x, load_path %p, dll_characteristics %p, name %p, base %p.\n", flags, load_path, dll_characteristics, name, base ); if (flags & ~valid_flags) return STATUS_INVALID_PARAMETER; -- 2.33.1

1 0

[PATCH v3] winmm: Instanciate DirectInput8 class lazily using delay imported DLL.
by Rémi Bernon 21 Dec '21

21 Dec '21

Instead of statically importing dinput8 and creating the class at load time, which causes some native hooks to fail loading. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52222 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Use lazy init and delay load instead of COM. dlls/winmm/Makefile.in | 3 ++- dlls/winmm/joystick.c | 11 ++++++++--- dlls/winmm/winemm.h | 1 - dlls/winmm/winmm.c | 2 -- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in index 5439ae21678..c515a3aba2e 100644 --- a/dlls/winmm/Makefile.in +++ b/dlls/winmm/Makefile.in @@ -1,7 +1,8 @@ EXTRADEFS = -D_WINMM_ MODULE = winmm.dll IMPORTLIB = winmm -IMPORTS = uuid user32 advapi32 ole32 msacm32 dinput8 +IMPORTS = uuid user32 advapi32 ole32 msacm32 +DELAYIMPORTS = dinput8 C_SRCS = \ driver.c \ diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 5f5683e3e35..5a6e1203513 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -152,11 +152,12 @@ static BOOL CALLBACK enum_instances( const DIDEVICEINSTANCEW *instance, void *co return DIENUM_CONTINUE; } -void joystick_load( HINSTANCE instance ) +static BOOL WINAPI joystick_load_once( INIT_ONCE *once, void *param, void **context ) { - HRESULT hr = DirectInput8Create( instance, DIRECTINPUT_VERSION, &IID_IDirectInput8W, + HRESULT hr = DirectInput8Create( hWinMM32Instance, DIRECTINPUT_VERSION, &IID_IDirectInput8W, (void **)&dinput, NULL ); - if (FAILED(hr)) WARN( "could not create dinput instance, hr %#x\n", hr ); + if (FAILED(hr)) ERR( "Could not create dinput instance, hr %#x\n", hr ); + return TRUE; } void joystick_unload() @@ -177,11 +178,15 @@ void joystick_unload() static void find_joysticks(void) { + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + IDirectInputDevice8W *device; HANDLE event; DWORD index; HRESULT hr; + InitOnceExecuteOnce( &init_once, joystick_load_once, NULL, NULL ); + if (!dinput) return; index = 0; diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 3459c2a85ef..52cab64b1c5 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -153,7 +153,6 @@ MMRESULT WINMM_CheckCallback(DWORD_PTR dwCallback, DWORD fdwOpen, BOOL mixer) DE void WINMM_DeleteWaveform(void) DECLSPEC_HIDDEN; -void joystick_load( HMODULE instance ) DECLSPEC_HIDDEN; void joystick_unload( void ) DECLSPEC_HIDDEN; /* Global variables */ diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index aab8bfb51a9..aa2dd50c4c1 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -144,8 +144,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) if (!WINMM_CreateIData(hInstDLL)) return FALSE; - - joystick_load( hInstDLL ); break; case DLL_PROCESS_DETACH: if(fImpLoad) -- 2.34.0

2 1

[PATCH 1/2] xaudio2/tests: Check that GetDeviceDetails returns a PCM format.
by Rémi Bernon 21 Dec '21

21 Dec '21

Far Cry 4 expects IXAudio27_GetDeviceDetails to return a PCM format GUID and refuses to create a source voice if the format is IEEE_FLOAT. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/xaudio2_7/tests/xaudio2.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 502b513fb6b..ea7e2ec121a 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -27,6 +27,8 @@ #include "xapo.h" #include "xapofx.h" #include "mmsystem.h" +#include "ks.h" +#include "ksmedia.h" static BOOL xaudio27; @@ -937,6 +939,10 @@ static UINT32 test_DeviceDetails(IXAudio27 *xa) ok(dd.Role == GlobalDefaultDevice, "Got wrong role for index 0: 0x%x\n", dd.Role); else ok(dd.Role == NotDefaultDevice, "Got wrong role for index %u: 0x%x\n", i, dd.Role); + + todo_wine + ok(IsEqualGUID(&dd.OutputFormat.SubFormat, &KSDATAFORMAT_SUBTYPE_PCM), + "got format %s\n", debugstr_guid(&dd.OutputFormat.SubFormat)); } return count; -- 2.34.0

3 5

[PATCH] oledb32: Add missing parentheses to the switch statement.
by Andrey Gusev 21 Dec '21

21 Dec '21

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/oledb32/dslocator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 95fd7687560..d35e1eb116f 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -492,7 +492,7 @@ static INT_PTR CALLBACK data_link_connection_dlg_proc(HWND hwnd, UINT msg, WPARA } case WM_COMMAND: { - switch LOWORD(wp) + switch (LOWORD(wp)) { case IDC_RDO_SRC_NAME: case IDC_BTN_CONNECTION: -- 2.33.1

1 0

[PATCH] schtasks: Fix a typo in FIXME() message.
by Andrey Gusev 21 Dec '21

21 Dec '21

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- programs/schtasks/schtasks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c index 79f2555522f..340aeaa56fb 100644 --- a/programs/schtasks/schtasks.c +++ b/programs/schtasks/schtasks.c @@ -104,7 +104,7 @@ static BSTR read_file_to_bstr(const WCHAR *file_name) r = ReadFile(file, data, file_size.QuadPart, &read_size, NULL); CloseHandle(file); if (!r) { - FIXME("Read filed\n"); + FIXME("Read failed\n"); HeapFree(GetProcessHeap(), 0, data); return NULL; } -- 2.33.1

1 0

[PATCH] ntdll: Restore FP status words from MSVCRT_JUMP_BUFFER on x64.
by Paul Gofman 21 Dec '21

21 Dec '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Commit d60c450c7be196c2072f74e34f7760d39e3bad32 added the FP status words to msvcrt and wine internal setjmp and longjmp but ntdll part was left behind. dlls/ntdll/signal_x86_64.c | 7 ++++++- dlls/ntdll/tests/exception.c | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index e0372b111fd..7e77329363c 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -64,7 +64,9 @@ struct MSVCRT_JUMP_BUFFER ULONG64 R14; ULONG64 R15; ULONG64 Rip; - ULONG64 Spare; + ULONG MxCsr; + USHORT FpCsr; + USHORT Spare; M128A Xmm6; M128A Xmm7; M128A Xmm8; @@ -1218,6 +1220,9 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) context->u.s.Xmm13 = jmp->Xmm13; context->u.s.Xmm14 = jmp->Xmm14; context->u.s.Xmm15 = jmp->Xmm15; + context->MxCsr = jmp->MxCsr; + context->u.FltSave.MxCsr = jmp->MxCsr; + context->u.FltSave.ControlWord = jmp->FpCsr; } else if (rec && rec->ExceptionCode == STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters >= 1) { diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 2bceca204be..4307016f149 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2460,6 +2460,10 @@ static void test_restore_context(void) rec.NumberParameters = 1; rec.ExceptionInformation[0] = (DWORD64)&buf; + ok(buf.MxCsr == 0x1f80, "Got unexpected MxCsr %#x.\n", buf.MxCsr); + ok(buf.FpCsr == 0x27f, "Got unexpected FpCsr %#x.\n", buf.FpCsr); + buf.FpCsr = 0x7f; + buf.MxCsr = 0x3f80; /* uses buf.Rip instead of ctx.Rip */ pRtlRestoreContext(&ctx, &rec); ok(0, "shouldn't be reached\n"); @@ -2487,6 +2491,18 @@ static void test_restore_context(void) "longjmp failed for Xmm%d, expected %lx, got %lx\n", i + 6, fltsave[i].Part[1], ctx.FltSave.XmmRegisters[i + 6].High); } + ok(ctx.FltSave.ControlWord == 0x7f, "Got unexpected float control word %#x.\n", ctx.FltSave.ControlWord); + ok(ctx.MxCsr == 0x3f80, "Got unexpected MxCsr %#x.\n", ctx.MxCsr); + ok(ctx.FltSave.MxCsr == 0x3f80, "Got unexpected MxCsr %#x.\n", ctx.FltSave.MxCsr); + buf.FpCsr = 0x27f; + buf.MxCsr = 0x1f80; + pRtlRestoreContext(&ctx, &rec); + ok(0, "shouldn't be reached\n"); + } + else if (pass == 5) + { + ok(ctx.FltSave.ControlWord == 0x27f, "Got unexpected float control word %#x.\n", ctx.FltSave.ControlWord); + ok(ctx.FltSave.MxCsr == 0x1f80, "Got unexpected MxCsr %#x.\n", ctx.MxCsr); } else ok(0, "unexpected pass %d\n", pass); -- 2.33.1

1 0

[PATCH vkd3d v4 08/10] vkd3d-shader/hlsl: Parse texture array types.
by Francisco Casas 21 Dec '21

21 Dec '21

Also, remove Texture3DArrays from the lexer since they don't exist. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Multisampled objects, namely Texture2DMS and Texture2DMSArray are not parsed yet since they require a different type of declaration, with the number of samples stated expicitly. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.l | 2 +- libs/vkd3d-shader/hlsl.y | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index e9281ec3..c1edfe7e 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -131,9 +131,9 @@ Texture2DMS {return KW_TEXTURE2DMS; } Texture2DMSArray {return KW_TEXTURE2DMSARRAY; } texture3D {return KW_TEXTURE3D; } Texture3D {return KW_TEXTURE3D; } -Texture3DArray {return KW_TEXTURE3DARRAY; } textureCUBE {return KW_TEXTURECUBE; } TextureCube {return KW_TEXTURECUBE; } +TextureCubeArray {return KW_TEXTURECUBEARRAY; } true {return KW_TRUE; } typedef {return KW_TYPEDEF; } uniform {return KW_UNIFORM; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 0fd6b9a3..ae64bbd6 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2126,8 +2126,8 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %token KW_TEXTURE2DMS %token KW_TEXTURE2DMSARRAY %token KW_TEXTURE3D -%token KW_TEXTURE3DARRAY %token KW_TEXTURECUBE +%token KW_TEXTURECUBEARRAY %token KW_TRUE %token KW_TYPEDEF %token KW_UNIFORM @@ -2672,6 +2672,18 @@ texture_type: { $$ = HLSL_SAMPLER_DIM_CUBE; } + | KW_TEXTURE1DARRAY + { + $$ = HLSL_SAMPLER_DIM_1DARRAY; + } + | KW_TEXTURE2DARRAY + { + $$ = HLSL_SAMPLER_DIM_2DARRAY; + } + | KW_TEXTURECUBEARRAY + { + $$ = HLSL_SAMPLER_DIM_CUBEARRAY; + } type: KW_VECTOR '<' type ',' C_INTEGER '>' -- 2.25.1

1 0

[PATCH vkd3d v4 07/10] vkd3d-shader/hlsl: Handle additional dimension types for textures.
by Francisco Casas 21 Dec '21

21 Dec '21

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Also, sampler_dim_count() is moved from hlsl.y to hlsl.h, since it can be useful in other files. Note: This patch should superseed: [PATCH vkd3d v3 07/12] vkd3d-shader/hlsl: Add dimension types for textures to enum hlsl_sampler_dim. [PATCH vkd3d v3 09/12] vkd3d-shader/hlsl: Parse texture array types. [PATCH vkd3d v3 10/12] vkd3d-shader/hlsl: Include new texture dimension types in sampler_dim_count(). [PATCH vkd3d v3 11/12] vkd3d-shader/hlsl: Handle mipmap level for texture arrays in sm4 ld instruction. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 25 ++++++++++++-------- libs/vkd3d-shader/hlsl.h | 33 ++++++++++++++++++++++++-- libs/vkd3d-shader/hlsl.y | 17 -------------- libs/vkd3d-shader/hlsl_sm4.c | 45 ++++++++++++++++++++++-------------- 4 files changed, 74 insertions(+), 46 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 530f7357..6c8d2f2d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -929,10 +929,15 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru { static const char *const dimensions[] = { - [HLSL_SAMPLER_DIM_1D] = "1D", - [HLSL_SAMPLER_DIM_2D] = "2D", - [HLSL_SAMPLER_DIM_3D] = "3D", - [HLSL_SAMPLER_DIM_CUBE] = "Cube" + [HLSL_SAMPLER_DIM_1D] = "1D", + [HLSL_SAMPLER_DIM_2D] = "2D", + [HLSL_SAMPLER_DIM_3D] = "3D", + [HLSL_SAMPLER_DIM_CUBE] = "Cube", + [HLSL_SAMPLER_DIM_1DARRAY] = "1DArray", + [HLSL_SAMPLER_DIM_2DARRAY] = "2DArray", + [HLSL_SAMPLER_DIM_2DMS] = "2DMS", + [HLSL_SAMPLER_DIM_2DMSARRAY] = "2DMSArray", + [HLSL_SAMPLER_DIM_CUBEARRAY] = "CubeArray", }; switch (type->base_type) @@ -1776,11 +1781,11 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) static const char *const sampler_names[] = { - "sampler", - "sampler1D", - "sampler2D", - "sampler3D", - "samplerCUBE" + [HLSL_SAMPLER_DIM_GENERIC] = "sampler", + [HLSL_SAMPLER_DIM_1D] = "sampler1D", + [HLSL_SAMPLER_DIM_2D] = "sampler2D", + [HLSL_SAMPLER_DIM_3D] = "sampler3D", + [HLSL_SAMPLER_DIM_CUBE] = "samplerCUBE", }; static const struct @@ -1832,7 +1837,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) } } - for (bt = 0; bt <= HLSL_SAMPLER_DIM_MAX; ++bt) + for (bt = 0; bt <= HLSL_SAMPLER_DIM_LAST_SAMPLER; ++bt) { type = hlsl_new_type(ctx, sampler_names[bt], HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); type->sampler_dim = bt; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 49fa8d9d..927dca02 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -98,9 +98,38 @@ enum hlsl_sampler_dim HLSL_SAMPLER_DIM_2D, HLSL_SAMPLER_DIM_3D, HLSL_SAMPLER_DIM_CUBE, - HLSL_SAMPLER_DIM_MAX = HLSL_SAMPLER_DIM_CUBE + HLSL_SAMPLER_DIM_LAST_SAMPLER = HLSL_SAMPLER_DIM_CUBE, + HLSL_SAMPLER_DIM_1DARRAY, + HLSL_SAMPLER_DIM_2DARRAY, + HLSL_SAMPLER_DIM_2DMS, + HLSL_SAMPLER_DIM_2DMSARRAY, + HLSL_SAMPLER_DIM_CUBEARRAY, + HLSL_SAMPLER_DIM_MAX = HLSL_SAMPLER_DIM_CUBEARRAY, }; +static inline unsigned int sampler_dim_count(enum hlsl_sampler_dim dim) +{ + switch (dim) + { + case HLSL_SAMPLER_DIM_1D: + return 1; + case HLSL_SAMPLER_DIM_1DARRAY: + case HLSL_SAMPLER_DIM_2D: + case HLSL_SAMPLER_DIM_2DMS: + return 2; + case HLSL_SAMPLER_DIM_2DARRAY: + case HLSL_SAMPLER_DIM_2DMSARRAY: + case HLSL_SAMPLER_DIM_3D: + case HLSL_SAMPLER_DIM_CUBE: + return 3; + case HLSL_SAMPLER_DIM_CUBEARRAY: + return 4; + default: + assert(0); + return 0; + } +} + enum hlsl_matrix_majority { HLSL_COLUMN_MAJOR, @@ -489,7 +518,7 @@ struct hlsl_ctx struct hlsl_type *vector[HLSL_TYPE_LAST_SCALAR + 1][4]; /* matrix[float][2][4] is a float4x2, i.e. dimx = 2, dimy = 4 */ struct hlsl_type *matrix[HLSL_TYPE_LAST_SCALAR + 1][4][4]; - struct hlsl_type *sampler[HLSL_SAMPLER_DIM_MAX + 1]; + struct hlsl_type *sampler[HLSL_SAMPLER_DIM_LAST_SAMPLER + 1]; struct hlsl_type *Void; } builtin_types; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index a321789c..0fd6b9a3 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1513,23 +1513,6 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t return statements_list; } -static unsigned int sampler_dim_count(enum hlsl_sampler_dim dim) -{ - switch (dim) - { - case HLSL_SAMPLER_DIM_1D: - return 1; - case HLSL_SAMPLER_DIM_2D: - return 2; - case HLSL_SAMPLER_DIM_3D: - case HLSL_SAMPLER_DIM_CUBE: - return 3; - default: - assert(0); - return 0; - } -} - struct find_function_call_args { const struct parse_initializer *params; diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 61247031..3ee68736 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -424,6 +424,7 @@ static D3D_RESOURCE_RETURN_TYPE sm4_resource_format(const struct hlsl_type *type static D3D_SRV_DIMENSION sm4_rdef_resource_dimension(const struct hlsl_type *type) { + assert(type->base_type == HLSL_TYPE_TEXTURE); /* for now, until other resources are handled. */ switch (type->sampler_dim) { case HLSL_SAMPLER_DIM_1D: @@ -434,6 +435,16 @@ static D3D_SRV_DIMENSION sm4_rdef_resource_dimension(const struct hlsl_type *typ return D3D_SRV_DIMENSION_TEXTURE3D; case HLSL_SAMPLER_DIM_CUBE: return D3D_SRV_DIMENSION_TEXTURECUBE; + case HLSL_SAMPLER_DIM_1DARRAY: + return D3D_SRV_DIMENSION_TEXTURE1DARRAY; + case HLSL_SAMPLER_DIM_2DARRAY: + return D3D_SRV_DIMENSION_TEXTURE2DARRAY; + case HLSL_SAMPLER_DIM_2DMS: + return D3D_SRV_DIMENSION_TEXTURE2DMS; + case HLSL_SAMPLER_DIM_2DMSARRAY: + return D3D_SRV_DIMENSION_TEXTURE2DMSARRAY; + case HLSL_SAMPLER_DIM_CUBEARRAY: + return D3D_SRV_DIMENSION_TEXTURECUBEARRAY; default: assert(0); return D3D_SRV_DIMENSION_UNKNOWN; @@ -711,6 +722,7 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) static enum vkd3d_sm4_resource_type sm4_resource_dimension(const struct hlsl_type *type) { + assert(type->base_type == HLSL_TYPE_TEXTURE); /* for now, until other resources are handled. */ switch (type->sampler_dim) { case HLSL_SAMPLER_DIM_1D: @@ -721,6 +733,16 @@ static enum vkd3d_sm4_resource_type sm4_resource_dimension(const struct hlsl_typ return VKD3D_SM4_RESOURCE_TEXTURE_3D; case HLSL_SAMPLER_DIM_CUBE: return VKD3D_SM4_RESOURCE_TEXTURE_CUBE; + case HLSL_SAMPLER_DIM_1DARRAY: + return VKD3D_SM4_RESOURCE_TEXTURE_1DARRAY; + case HLSL_SAMPLER_DIM_2DARRAY: + return VKD3D_SM4_RESOURCE_TEXTURE_2DARRAY; + case HLSL_SAMPLER_DIM_2DMS: + return VKD3D_SM4_RESOURCE_TEXTURE_2DMS; + case HLSL_SAMPLER_DIM_2DMSARRAY: + return VKD3D_SM4_RESOURCE_TEXTURE_2DMSARRAY; + case HLSL_SAMPLER_DIM_CUBEARRAY: + return VKD3D_SM4_RESOURCE_TEXTURE_CUBEARRAY; default: assert(0); return 0; @@ -1294,6 +1316,7 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf { struct sm4_instruction instr; unsigned int writemask; + unsigned int dim_count; memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_LD; @@ -1306,23 +1329,11 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf /* Mipmap level is in the last component in the IR, but needs to be in the W * component in the instruction. */ - switch (resource_type->sampler_dim) - { - case HLSL_SAMPLER_DIM_1D: - instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, X, X, Y), 4); - break; - - case HLSL_SAMPLER_DIM_2D: - instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, Y, X, Z), 4); - break; - - case HLSL_SAMPLER_DIM_3D: - case HLSL_SAMPLER_DIM_CUBE: - break; - - case HLSL_SAMPLER_DIM_GENERIC: - assert(0); - } + dim_count = sampler_dim_count(resource_type->sampler_dim); + if (dim_count == 1) + instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, X, X, Y), 4); + if (dim_count == 2) + instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, Y, X, Z), 4); sm4_register_from_deref(ctx, &instr.srcs[1].reg, &writemask, &instr.srcs[1].swizzle_type, resource, resource_type); -- 2.25.1

1 0

[PATCH vkd3d v4 04/10] vkd3d-shader/hlsl: Add tests for Sample method with offset.
by Francisco Casas 21 Dec '21

21 Dec '21

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 ++ tests/sampler-offset.shader_test | 51 ++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 tests/sampler-offset.shader_test diff --git a/Makefile.am b/Makefile.am index 20fee06d..16848f5a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -94,6 +94,7 @@ vkd3d_shader_tests = \ tests/preproc-misc.shader_test \ tests/round.shader_test \ tests/sampler.shader_test \ + tests/sampler-offset.shader_test \ tests/saturate.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ @@ -306,6 +307,7 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/max.shader_test \ tests/sampler.shader_test \ + tests/sampler-offset.shader_test \ tests/texture-load.shader_test \ tests/texture-load-typed.shader_test \ tests/trigonometry.shader_test diff --git a/tests/sampler-offset.shader_test b/tests/sampler-offset.shader_test new file mode 100644 index 00000000..83900c55 --- /dev/null +++ b/tests/sampler-offset.shader_test @@ -0,0 +1,51 @@ +[sampler 0] +filter point point point +address clamp clamp clamp + +[texture 0] +size (3, 3) +0.0 0.0 0.0 0.4 0.1 0.0 0.5 0.0 0.2 0.0 0.0 0.4 +0.0 0.1 0.5 0.0 0.1 0.1 0.0 0.4 0.2 0.1 0.5 0.0 +0.0 0.2 0.0 0.4 0.1 0.2 0.5 0.0 0.2 0.2 0.0 0.4 + + +[pixel shader] +sampler s; +Texture2D t; + +float4 main() : sv_target +{ + return t.Sample(s, float2(0.5, 0.5), int2(0, 1)); +} + +[test] +draw quad +probe all rgba (0.1, 0.2, 0.5, 0.0) + + +[pixel shader] +sampler s; +Texture2D t; + +float4 main() : sv_target +{ + return t.Sample(s, float2(0.1, 0.5), int2(2, 1)); +} + +[test] +draw quad +probe all rgba (0.2, 0.2, 0.0, 0.4) + + +[pixel shader] +sampler s; +Texture2D t; + +float4 main() : sv_target +{ + return t.Sample(s, float2(0.9, 0.5), int2(-2, 1)); +} + +[test] +draw quad +probe all rgba (0.0, 0.2, 0.0, 0.4) -- 2.25.1

1 0

[PATCH vkd3d v4 03/10] vkd3d-shader/hlsl: Add aoffimmi modifiers on Sample sm4 instructions.
by Francisco Casas 21 Dec '21

21 Dec '21

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 47 ++++++++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 19450584..d55815f1 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -766,7 +766,6 @@ static uint32_t sm4_encode_instruction_modifier(const struct sm4_instruction_mod return word; } - struct sm4_register { enum vkd3d_sm4_register_type type; @@ -1020,6 +1019,35 @@ static void write_sm4_instruction(struct vkd3d_bytecode_buffer *buffer, const st put_u32(buffer, instr->idx[j]); } +static bool encode_texel_offset_as_aoffimmi(struct sm4_instruction *instr, + const struct hlsl_ir_node *texel_offset){ + struct sm4_instruction_modifier modif; + struct hlsl_ir_constant *offset; + + if (!texel_offset) + return false; + + if (texel_offset->type != HLSL_IR_CONSTANT) + return false; + offset = hlsl_ir_constant(texel_offset); + + modif.type = VKD3D_SM4_MODIFIER_AOFFIMMI; + modif.aoffimmi.u = offset->value[0].i; + modif.aoffimmi.v = offset->value[1].i; + modif.aoffimmi.w = offset->value[2].i; + if (modif.aoffimmi.u < -8 || 7 < modif.aoffimmi.u) + return false; + if (modif.aoffimmi.v < -8 || 7 < modif.aoffimmi.v) + return false; + if (modif.aoffimmi.w < -8 || 7 < modif.aoffimmi.w) + return false; + + instr->modifiers[instr->modifier_count] = modif; + instr->modifier_count++; + + return true; +} + static void write_sm4_dcl_constant_buffer(struct vkd3d_bytecode_buffer *buffer, const struct hlsl_buffer *cbuffer) { const struct sm4_instruction instr = @@ -1307,7 +1335,8 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_type *resource_type, const struct hlsl_ir_node *dst, - const struct hlsl_deref *resource, const struct hlsl_deref *sampler, const struct hlsl_ir_node *coords) + const struct hlsl_deref *resource, const struct hlsl_deref *sampler, + const struct hlsl_ir_node *coords, const struct hlsl_ir_node *texel_offset) { struct sm4_instruction instr; unsigned int writemask; @@ -1315,6 +1344,16 @@ static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_SAMPLE; + if (texel_offset) + { + if (!encode_texel_offset_as_aoffimmi(&instr, texel_offset)) + { + hlsl_error(ctx, &texel_offset->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TEXEL_OFFSET, + "Offset must resolve to integer literal in the range -8 to 7\n"); + return; + } + } + sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, NULL, dst); instr.dst_count = 1; @@ -1627,6 +1666,7 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx, { const struct hlsl_type *resource_type = load->resource.var->data_type; const struct hlsl_ir_node *coords = load->coords.node; + const struct hlsl_ir_node *texel_offset = load->texel_offset.node; if (load->sampler.var) { @@ -1658,7 +1698,8 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx, case HLSL_RESOURCE_SAMPLE: if (!load->sampler.var) hlsl_fixme(ctx, &load->node.loc, "SM4 combined sample expression."); - write_sm4_sample(ctx, buffer, resource_type, &load->node, &load->resource, &load->sampler, coords); + write_sm4_sample(ctx, buffer, resource_type, &load->node, &load->resource, &load->sampler, + coords, texel_offset); break; } } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 62073cf1..718bb202 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -114,6 +114,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_HLSL_OVERLAPPING_RESERVATIONS = 5015, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION = 5016, VKD3D_SHADER_ERROR_HLSL_NOT_IMPLEMENTED = 5017, + VKD3D_SHADER_ERROR_HLSL_INVALID_TEXEL_OFFSET = 5018, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION = 5300, -- 2.25.1

1 0

[PATCH vkd3d v4 02/10] vkd3d-shader/hlsl: Add texel_offset field to hlsl_ir_resource_load.
by Francisco Casas 21 Dec '21

21 Dec '21

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 9 ++++++++- libs/vkd3d-shader/hlsl.h | 3 ++- libs/vkd3d-shader/hlsl.y | 16 +++++++++++----- libs/vkd3d-shader/hlsl_codegen.c | 2 ++ 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index d2ea4c34..b426e461 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -641,7 +641,7 @@ struct hlsl_ir_load *hlsl_new_var_load(struct hlsl_ctx *ctx, struct hlsl_ir_var struct hlsl_ir_resource_load *hlsl_new_resource_load(struct hlsl_ctx *ctx, struct hlsl_type *data_type, enum hlsl_resource_load_type type, struct hlsl_ir_var *resource, struct hlsl_ir_node *resource_offset, struct hlsl_ir_var *sampler, struct hlsl_ir_node *sampler_offset, struct hlsl_ir_node *coords, - const struct vkd3d_shader_location *loc) + struct hlsl_ir_node *texel_offset, const struct vkd3d_shader_location *loc) { struct hlsl_ir_resource_load *load; @@ -654,6 +654,7 @@ struct hlsl_ir_resource_load *hlsl_new_resource_load(struct hlsl_ctx *ctx, struc load->sampler.var = sampler; hlsl_src_from_node(&load->sampler.offset, sampler_offset); hlsl_src_from_node(&load->coords, coords); + hlsl_src_from_node(&load->texel_offset, texel_offset); return load; } @@ -1284,6 +1285,11 @@ static void dump_ir_resource_load(struct vkd3d_string_buffer *buffer, const stru dump_deref(buffer, &load->sampler); vkd3d_string_buffer_printf(buffer, ", coords = "); dump_src(buffer, &load->coords); + if (load->texel_offset.node) + { + vkd3d_string_buffer_printf(buffer, ", offset = "); + dump_src(buffer, &load->texel_offset); + } vkd3d_string_buffer_printf(buffer, ")"); } @@ -1457,6 +1463,7 @@ static void free_ir_resource_load(struct hlsl_ir_resource_load *load) hlsl_src_remove(&load->coords); hlsl_src_remove(&load->sampler.offset); hlsl_src_remove(&load->resource.offset); + hlsl_src_remove(&load->texel_offset); vkd3d_free(load); } diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 57acf3a0..2396adb4 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -386,6 +386,7 @@ struct hlsl_ir_resource_load enum hlsl_resource_load_type load_type; struct hlsl_deref resource, sampler; struct hlsl_src coords; + struct hlsl_src texel_offset; }; struct hlsl_ir_store @@ -710,7 +711,7 @@ struct hlsl_ir_loop *hlsl_new_loop(struct hlsl_ctx *ctx, struct vkd3d_shader_loc struct hlsl_ir_resource_load *hlsl_new_resource_load(struct hlsl_ctx *ctx, struct hlsl_type *data_type, enum hlsl_resource_load_type type, struct hlsl_ir_var *resource, struct hlsl_ir_node *resource_offset, struct hlsl_ir_var *sampler, struct hlsl_ir_node *sampler_offset, struct hlsl_ir_node *coords, - const struct vkd3d_shader_location *loc); + struct hlsl_ir_node *texel_offset, const struct vkd3d_shader_location *loc); struct hlsl_ir_store *hlsl_new_simple_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs); struct hlsl_ir_store *hlsl_new_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct hlsl_ir_node *offset, struct hlsl_ir_node *rhs, unsigned int writemask, struct vkd3d_shader_location loc); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 636882c4..3a0ddb93 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1875,7 +1875,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl return false; if (!(load = hlsl_new_resource_load(ctx, object_type->e.resource_format, HLSL_RESOURCE_LOAD, - object_load->src.var, object_load->src.offset.node, NULL, NULL, coords, loc))) + object_load->src.var, object_load->src.offset.node, NULL, NULL, coords, NULL, loc))) return false; list_add_tail(instrs, &load->node.entry); return true; @@ -1885,6 +1885,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl const unsigned int sampler_dim = sampler_dim_count(object_type->sampler_dim); const struct hlsl_type *sampler_type; struct hlsl_ir_resource_load *load; + struct hlsl_ir_node *offset = NULL; struct hlsl_ir_load *sampler_load; struct hlsl_ir_node *coords; @@ -1894,8 +1895,6 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl "Wrong number of arguments to method 'Sample': expected 2 or 3, but got %u.", params->args_count); return false; } - if (params->args_count == 3) - FIXME("Ignoring offset parameter.\n"); sampler_type = params->args[0]->data_type; if (sampler_type->type != HLSL_CLASS_OBJECT || sampler_type->base_type != HLSL_TYPE_SAMPLER @@ -1915,11 +1914,18 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl if (!(coords = add_implicit_conversion(ctx, instrs, params->args[1], hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, sampler_dim), loc))) - coords = params->args[1]; + return false; + + if (params->args_count == 3) + { + if (!(offset = add_implicit_conversion(ctx, instrs, params->args[2], + hlsl_get_vector_type(ctx, HLSL_TYPE_INT, sampler_dim), loc))) + return false; + } if (!(load = hlsl_new_resource_load(ctx, object_type->e.resource_format, HLSL_RESOURCE_SAMPLE, object_load->src.var, object_load->src.offset.node, - sampler_load->src.var, sampler_load->src.offset.node, coords, loc))) + sampler_load->src.var, sampler_load->src.offset.node, coords, offset, loc))) return false; list_add_tail(instrs, &load->node.entry); return true; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 75716bdf..8918dc27 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -964,6 +964,8 @@ static void compute_liveness_recurse(struct hlsl_block *block, unsigned int loop } load->coords.node->last_read = instr->index; + if (load->texel_offset.node) + load->texel_offset.node->last_read = instr->index; break; } case HLSL_IR_SWIZZLE: -- 2.25.1

1 0

[PATCH vkd3d v4 01/10] vkd3d-shader/hlsl: Add support for sm4 instruction modifiers.
by Francisco Casas 21 Dec '21

21 Dec '21

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 55 ++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 2458018f..19450584 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -727,6 +727,46 @@ static enum vkd3d_sm4_resource_type sm4_resource_dimension(const struct hlsl_typ } } +struct sm4_instruction_modifier +{ + enum vkd3d_sm4_instruction_modifier type; + + union + { + struct + { + int u,v,w; + } aoffimmi; + }; +}; + +static uint32_t sm4_encode_instruction_modifier(const struct sm4_instruction_modifier *imod) +{ + uint32_t word = 0; + + word |= VKD3D_SM4_MODIFIER_MASK & imod->type; + + switch (imod->type) + { + case VKD3D_SM4_MODIFIER_AOFFIMMI: + assert(-8 <= imod->aoffimmi.u && imod->aoffimmi.u <= 7); + assert(-8 <= imod->aoffimmi.v && imod->aoffimmi.v <= 7); + assert(-8 <= imod->aoffimmi.w && imod->aoffimmi.w <= 7); + word |= ((uint32_t)imod->aoffimmi.u & 0xf) << VKD3D_SM4_AOFFIMMI_U_SHIFT; + word |= ((uint32_t)imod->aoffimmi.v & 0xf) << VKD3D_SM4_AOFFIMMI_V_SHIFT; + word |= ((uint32_t)imod->aoffimmi.w & 0xf) << VKD3D_SM4_AOFFIMMI_W_SHIFT; + break; + + default: + FIXME("Unhandled instruction modifier %#x.\n", imod->type); + return 0; + break; + } + + return word; +} + + struct sm4_register { enum vkd3d_sm4_register_type type; @@ -741,6 +781,9 @@ struct sm4_instruction { enum vkd3d_sm4_opcode opcode; + struct sm4_instruction_modifier modifiers[1]; + unsigned int modifier_count; + struct { struct sm4_register reg; @@ -913,6 +956,7 @@ static void write_sm4_instruction(struct vkd3d_bytecode_buffer *buffer, const st uint32_t token = instr->opcode; unsigned int size = 1, i, j; + size += instr->modifier_count; for (i = 0; i < instr->dst_count; ++i) size += sm4_register_order(&instr->dsts[i].reg); for (i = 0; i < instr->src_count; ++i) @@ -920,8 +964,19 @@ static void write_sm4_instruction(struct vkd3d_bytecode_buffer *buffer, const st size += instr->idx_count; token |= (size << VKD3D_SM4_INSTRUCTION_LENGTH_SHIFT); + + if (instr->modifier_count > 0) + token |= VKD3D_SM4_INSTRUCTION_MODIFIER; put_u32(buffer, token); + for (i = 0; i < instr->modifier_count; i++) + { + token = sm4_encode_instruction_modifier(&instr->modifiers[i]); + if (instr->modifier_count > i + 1) + token |= VKD3D_SM4_INSTRUCTION_MODIFIER; + put_u32(buffer, token); + } + for (i = 0; i < instr->dst_count; ++i) { token = sm4_encode_register(&instr->dsts[i].reg); -- 2.25.1

1 0

[PATCH v6 1/3] ntdll: sock_recv keeps message ordered
by Dongwan Kim 21 Dec '21

21 Dec '21

Calling try_recv could make messages misordered. Suppose that a server program calls a overlapped WSARecv and its operation is pending. Another program sends a message and wineserver is busy. The server program calls another overlapped WSARecv and it intercepts the message for the pending WSARecv. The problem already had been discussed here https://www.winehq.org/pipermail/wine-devel/2021-May/186612.html To avoid this situation, this kind of approach can be applied. The server program needs to know if there are pending asyncs before calling try_recv. Wineserver notifies it whenever invoking APC_ASYNC_IO. Then, the server program updates it and check it before calling try_recv. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/ntdll/unix/server.c | 8 ++++---- dlls/ntdll/unix/socket.c | 25 ++++++++++++++++++++++++- dlls/ws2_32/socket.c | 28 ++++++++++++++++++++++++++++ include/wine/afd.h | 12 +++++++++++- include/wine/server_protocol.h | 1 + server/async.c | 8 ++++++++ 6 files changed, 76 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index a388247beb2..047da6e0974 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -368,17 +368,17 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO case APC_ASYNC_IO: { struct async_fileio *user = wine_server_get_ptr( call->async_io.user ); - ULONG_PTR info = call->async_io.result; + ULONG_PTR info[2] = { call->async_io.result, call->async_io.async_wait }; NTSTATUS status; result->type = call->type; status = call->async_io.status; - if (user->callback( user, &info, &status )) + if (user->callback( user, info, &status )) { result->async_io.status = status; - result->async_io.total = info; + result->async_io.total = *info; /* the server will pass us NULL if a call failed synchronously */ - set_async_iosb( call->async_io.sb, result->async_io.status, info ); + set_async_iosb( call->async_io.sb, result->async_io.status, *info ); } else result->async_io.status = STATUS_PENDING; /* restart it */ break; diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index f82c7ae1ddf..1066da19bc7 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -651,13 +651,27 @@ static NTSTATUS try_recv( int fd, struct async_recv_ioctl *async, ULONG_PTR *siz return status; } +struct list *async_queue_list; +static struct afd_async_queue* find_async_queue(HANDLE handle){ + struct afd_async_queue *queue; + + LIST_FOR_EACH_ENTRY(queue, async_queue_list, struct afd_async_queue, entry){ + if(queue->sock == handle) + return queue; + } + return NULL; +} static BOOL async_recv_proc( void *user, ULONG_PTR *info, NTSTATUS *status ) { struct async_recv_ioctl *async = user; + struct afd_async_queue *queue; int fd, needs_close; TRACE( "%#x\n", *status ); + queue = find_async_queue(async->io.handle); + if(queue) + queue->read_q = info[1]; //store if waiting asyncs exist if (*status == STATUS_ALERTED) { if ((*status = server_get_unix_fd( async->io.handle, 0, &fd, &needs_close, NULL, NULL ))) @@ -679,6 +693,7 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi struct WS_sockaddr *addr, int *addr_len, DWORD *ret_flags, int unix_flags, int force_async ) { struct async_recv_ioctl *async; + struct afd_async_queue *queue; ULONG_PTR information; HANDLE wait_handle; DWORD async_size; @@ -735,7 +750,12 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi } } - status = try_recv( fd, async, &information ); + queue = find_async_queue(handle); + + if(queue->read_q ) // if there are waiting asyncs, avoid cutting in line. + status = STATUS_DEVICE_NOT_READY; + else + status = try_recv( fd, async, &information ); if (status != STATUS_SUCCESS && status != STATUS_BUFFER_OVERFLOW && status != STATUS_DEVICE_NOT_READY) { @@ -764,6 +784,7 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi SERVER_END_REQ; if (status != STATUS_PENDING) release_fileio( &async->io ); + else queue->read_q = 1; if (wait_handle) status = wait_async( wait_handle, options & FILE_SYNCHRONOUS_IO_ALERT ); return status; @@ -1306,6 +1327,8 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc unsigned int *ws_flags = u64_to_user_ptr(params->ws_flags_ptr); int unix_flags = 0; + async_queue_list = u64_to_user_ptr(params->async_queue_list); + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) return status; diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 648284c10a3..42954537abe 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -157,6 +157,30 @@ DECLARE_CRITICAL_SECTION(cs_socket_list); static SOCKET *socket_list; static unsigned int socket_list_size; +struct list async_queue_list = LIST_INIT(async_queue_list); + +static struct afd_async_queue* alloc_async_queue(HANDLE handle){ + struct afd_async_queue *queue = + (struct afd_async_queue*)malloc(sizeof(struct afd_async_queue)); + memset(queue, 0, sizeof(struct afd_async_queue)); + + queue->sock = handle; + list_add_head(&async_queue_list, &queue->entry); + return queue; +} + +static void remove_async_queue(HANDLE handle){ + struct afd_async_queue *queue; + + LIST_FOR_EACH_ENTRY(queue, &async_queue_list, struct afd_async_queue, entry){ + if(queue->sock == handle){ + list_remove(&queue->entry); + free(queue); + break; + } + } +} + const char *debugstr_sockaddr( const struct sockaddr *a ) { if (!a) return "(nil)"; @@ -355,6 +379,8 @@ static BOOL socket_list_add(SOCKET socket) SOCKET *new_array; EnterCriticalSection(&cs_socket_list); + alloc_async_queue((HANDLE)socket); + for (i = 0; i < socket_list_size; ++i) { if (!socket_list[i]) @@ -938,6 +964,7 @@ static int WS2_recv_base( SOCKET s, WSABUF *buffers, DWORD buffer_count, DWORD * params.force_async = !!overlapped; params.count = buffer_count; params.buffers_ptr = u64_from_user_ptr(buffers); + params.async_queue_list = u64_from_user_ptr(&async_queue_list); status = NtDeviceIoControlFile( (HANDLE)s, event, apc, cvalue, piosb, IOCTL_AFD_WINE_RECVMSG, &params, sizeof(params), NULL, 0 ); @@ -1171,6 +1198,7 @@ int WINAPI closesocket( SOCKET s ) } CloseHandle( (HANDLE)s ); + remove_async_queue( (HANDLE)s); return 0; } diff --git a/include/wine/afd.h b/include/wine/afd.h index efd5787e90a..c4ece63138a 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -24,6 +24,7 @@ #include <winternl.h> #include <winioctl.h> #include <mswsock.h> +#include "wine/list.h" struct afd_wsabuf_32 { @@ -322,8 +323,9 @@ struct afd_recvmsg_params int force_async; unsigned int count; ULONGLONG buffers_ptr; /* WSABUF[] */ + ULONGLONG async_queue_list; }; -C_ASSERT( sizeof(struct afd_recvmsg_params) == 48 ); +C_ASSERT( sizeof(struct afd_recvmsg_params) == 56 ); struct afd_sendmsg_params { @@ -365,4 +367,12 @@ struct afd_get_info_params }; C_ASSERT( sizeof(struct afd_get_info_params) == 12 ); +struct afd_async_queue{ + struct list entry; + HANDLE sock; + char read_q; + char write_q; +}; + + #endif diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1d17a40530f..ce26240bc9a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -492,6 +492,7 @@ typedef union client_ptr_t user; client_ptr_t sb; data_size_t result; + unsigned int async_wait; } async_io; struct { diff --git a/server/async.c b/server/async.c index 1a564ff1a69..5d6cc9770c3 100644 --- a/server/async.c +++ b/server/async.c @@ -164,6 +164,7 @@ static void async_destroy( struct object *obj ) void async_terminate( struct async *async, unsigned int status ) { struct iosb *iosb = async->iosb; + struct async* async_waiting; if (async->terminated) return; @@ -202,6 +203,13 @@ void async_terminate( struct async *async, unsigned int status ) else data.async_io.status = status; + async_waiting = find_pending_async(async->queue); + if(async_waiting) + { + data.async_io.async_wait = 1; + release_object(async_waiting); + } + thread_queue_apc( async->thread->process, async->thread, &async->obj, &data ); } -- 2.30.2

2 4

[PATCH 2/2] msvcrt: Make _setfp* helpers infallible.
by Piotr Caban 21 Dec '21

21 Dec '21

The functions may only fail on unsupported compilers/architectures. It's not really possible to handle errors properly. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-)

1 0

[PATCH 1/2] msvcrt: Don't set _EM_AMBIGOUS flag in _control87 when sse2 is not supported.
by Piotr Caban 21 Dec '21

21 Dec '21

Fixes compilation warning. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

1 0

[PATCH] loader/wine.inf: Regenerate time zones.
by Giovanni Mascellani 21 Dec '21

21 Dec '21

Unicode CLDR release 40 and tzdata 2021e were used. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- I am not sure whether this is appropriate for code freeze or not. --- dlls/tzres/tzres.rc | 3 + loader/wine.inf.in | 167 ++++++++++++++++++++++++++++---------------- 2 files changed, 108 insertions(+), 62 deletions(-) diff --git a/dlls/tzres/tzres.rc b/dlls/tzres/tzres.rc index 9914023dbc5..4914dba1728 100644 --- a/dlls/tzres/tzres.rc +++ b/dlls/tzres/tzres.rc @@ -338,6 +338,9 @@ STRINGTABLE 38896 "South Africa Standard Time" 38897 "South Africa Daylight Time" 38898 "(UTC+02:00) Harare, Pretoria" + 7664 "South Sudan Standard Time" + 7665 "South Sudan Daylight Time" + 7666 "(UTC+02:00) Juba" 39408 "Sri Lanka Standard Time" 39409 "Sri Lanka Daylight Time" 39410 "(UTC+05:30) Sri Jayawardenepura" diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 49f45e6eed3..c0251934dfc 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3479,8 +3479,8 @@ HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2017",1,30,fd HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2018",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2019",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2020",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,0c,00,00,00,03,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2021",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2022",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2021",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2022",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2023",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2024",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2025",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 @@ -3777,7 +3777,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"MUI_Display",,"@tzres.d HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"MUI_Dlt",,"@tzres.dll,-17233" HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"MUI_Std",,"@tzres.dll,-17232" HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"Std",,"Jordan Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,02,00,05,00,05,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,04,00,05,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,04,00,05,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 @@ -3800,32 +3800,35 @@ HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2018",1,88, HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2019",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2020",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2021",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2022",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2023",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2024",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2025",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2026",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2027",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2028",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2029",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2030",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2031",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2032",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2033",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2034",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2035",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2036",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2037",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2038",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2039",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2040",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2041",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2042",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2043",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2044",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2045",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2022",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,02,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2023",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,02,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2024",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2025",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,02,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2026",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,02,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2027",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,02,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2028",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,02,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2029",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,02,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2030",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2031",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,02,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2032",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,02,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2033",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,02,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2034",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,02,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2035",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,02,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2036",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,02,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2037",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,02,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2038",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,02,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2039",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,02,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2040",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,02,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2041",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2042",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,02,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2043",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,02,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2044",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,02,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2045",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,02,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2046",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,02,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2047",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2048",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,02,00,05,00,05,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"LastEntry",0x10001,"2045" +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"LastEntry",0x10001,"2048" HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time,"Display",,"(UTC+02:00) Kaliningrad" HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time,"Dlt",,"Kaliningrad Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time,"MUI_Display",,"@tzres.dll,-14722" @@ -4650,7 +4653,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time,"MUI_Display",,"@tzres.dl HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time,"MUI_Dlt",,"@tzres.dll,-14593" HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time,"MUI_Std",,"@tzres.dll,-14592" HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time,"Std",,"Samoa Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time,"TZI",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,04,00,00,00,00,00,00,00,00,00,09,00,00,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time,"TZI",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2000",1,94,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2001",1,94,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2002",1,94,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 @@ -4664,8 +4667,18 @@ HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2009",1,94,0 HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2010",1,94,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,04,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2011",1,94,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,06,00,01,00,04,00,00,00,00,00,00,00,00,00,09,00,06,00,04,00,03,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2012",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,04,00,00,00,00,00,00,00,00,00,09,00,00,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2013",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,04,00,00,00,00,00,00,00,00,00,09,00,00,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2014",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,04,00,00,00,00,00,00,00,00,00,09,00,00,00,04,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2015",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,04,00,00,00,00,00,00,00,00,00,09,00,00,00,04,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2016",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,04,00,00,00,00,00,00,00,00,00,09,00,00,00,04,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2017",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,04,00,00,00,00,00,00,00,00,00,09,00,00,00,04,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2018",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,04,00,00,00,00,00,00,00,00,00,09,00,00,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2019",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,04,00,00,00,00,00,00,00,00,00,09,00,00,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2020",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,04,00,00,00,00,00,00,00,00,00,09,00,00,00,04,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2021",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,04,00,00,00,00,00,00,00,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2022",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" -HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"LastEntry",0x10001,"2012" +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"LastEntry",0x10001,"2022" HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time,"Display",,"(UTC+00:00) Sao Tome" HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time,"Dlt",,"Sao Tome Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time,"MUI_Display",,"@tzres.dll,-5986" @@ -4726,6 +4739,38 @@ HKLM,%CurrentVersionNT%\Time Zones\South Africa Standard Time,"MUI_Dlt",,"@tzres HKLM,%CurrentVersionNT%\Time Zones\South Africa Standard Time,"MUI_Std",,"@tzres.dll,-38896" HKLM,%CurrentVersionNT%\Time Zones\South Africa Standard Time,"Std",,"South Africa Standard Time" HKLM,%CurrentVersionNT%\Time Zones\South Africa Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time,"Display",,"(UTC+02:00) Juba" +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time,"Dlt",,"South Sudan Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time,"MUI_Display",,"@tzres.dll,-7666" +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time,"MUI_Dlt",,"@tzres.dll,-7665" +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time,"MUI_Std",,"@tzres.dll,-7664" +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time,"Std",,"South Sudan Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,01,00,06,00,03,00,0c,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time\Dynamic DST,"2001",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time\Dynamic DST,"2002",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time\Dynamic DST,"2003",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time\Dynamic DST,"2004",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time\Dynamic DST,"2005",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time\Dynamic DST,"2006",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time\Dynamic DST,"2007",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time\Dynamic DST,"2008",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time\Dynamic DST,"2009",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time\Dynamic DST,"2010",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time\Dynamic DST,"2011",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time\Dynamic DST,"2012",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time\Dynamic DST,"2013",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time\Dynamic DST,"2014",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time\Dynamic DST,"2015",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time\Dynamic DST,"2016",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time\Dynamic DST,"2017",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time\Dynamic DST,"2018",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time\Dynamic DST,"2019",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time\Dynamic DST,"2020",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time\Dynamic DST,"2021",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,02,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time\Dynamic DST,"2022",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\South Sudan Standard Time\Dynamic DST,"LastEntry",0x10001,"2022" HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time,"Display",,"(UTC+05:30) Sri Jayawardenepura" HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time,"Dlt",,"Sri Lanka Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time,"MUI_Display",,"@tzres.dll,-39410" @@ -5229,7 +5274,7 @@ HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"MUI_Display",,"@tzre HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"MUI_Dlt",,"@tzres.dll,-46161" HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"MUI_Std",,"@tzres.dll,-46160" HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"Std",,"West Bank Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,03,00,00,00,00,00,00,00,00,00 @@ -5251,38 +5296,36 @@ HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2017",1, HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2018",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,01,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2019",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2020",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2021",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2022",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2023",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2024",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2025",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2026",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2027",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2028",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2029",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2030",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2031",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2032",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2033",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2034",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2035",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2036",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2037",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2038",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2039",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2040",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2041",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2042",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2043",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2044",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2045",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2046",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2047",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2048",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2049",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2050",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2021",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2022",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2023",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2024",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2025",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2026",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2027",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2028",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2029",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2030",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2031",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2032",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2033",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2034",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2035",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2036",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2037",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2038",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2039",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2040",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2041",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2042",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2043",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2044",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2045",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2046",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2047",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2048",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"LastEntry",0x10001,"2050" +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"LastEntry",0x10001,"2048" HKLM,%CurrentVersionNT%\Time Zones\West Pacific Standard Time,"Display",,"(UTC+10:00) Guam, Port Moresby" HKLM,%CurrentVersionNT%\Time Zones\West Pacific Standard Time,"Dlt",,"West Pacific Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\West Pacific Standard Time,"MUI_Display",,"@tzres.dll,-10226" -- 2.34.1

1 0

[PATCH] wineconsole: Remove "option" from the man page.
by Floris Renaud 21 Dec '21

21 Dec '21

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- programs/wineconsole/wineconsole.man.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/wineconsole.man.in b/programs/wineconsole/wineconsole.man.in index 251579c1422..dac4e62f321 100644 --- a/programs/wineconsole/wineconsole.man.in +++ b/programs/wineconsole/wineconsole.man.in @@ -3,11 +3,11 @@ wineconsole \- The Wine console .SH SYNOPSIS .B wineconsole -.RI [ option "] " command +.RI [ command "] " .SH DESCRIPTION .B wineconsole is the Wine console manager, used to run console commands and applications. It allows running the -console either in the current terminal (\fIcurses\fR) or in a newly made window (\fIuser\fR). +console in a newly made window. .SH BUGS Bugs can be reported on the .UR https://bugs.winehq.org -- 2.34.1

1 0

[PATCH v2] wldap32: Fix memory leak on error path in create_page_control (cppcheck)
by Alex Henrie 21 Dec '21

21 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Fix typo in commit message --- dlls/wldap32/page.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 8b0ded40e35..9f4acbdaa16 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -96,6 +96,7 @@ static ULONG create_page_control( ULONG pagesize, struct berval *cookie, UCHAR c } if (!(ctrl->ldctl_oid = strAtoW( LDAP_PAGED_RESULT_OID_STRING ))) { + free( val ); free( ctrl ); return LDAP_NO_MEMORY; } -- 2.34.1

2 1

[PATCH] wpcap: Remove unused variable ptr from build_win32_description (cppcheck)
by Alex Henrie 21 Dec '21

21 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/wpcap/wpcap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 59e8f43f77c..b140deeb3d2 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -240,10 +240,10 @@ static char *build_win32_name( const char *source, const char *adapter_name ) static char *build_win32_description( const struct pcap_interface *unix_dev ) { int len = strlen(unix_dev->name) + 1; - char *ret, *ptr; + char *ret; if (unix_dev->description && unix_dev->description[0]) len += strlen(unix_dev->description) + 1; - if ((ret = ptr = malloc( len ))) + if ((ret = malloc( len ))) { if (unix_dev->description) { -- 2.34.1

2 1

[PATCH] nsiproxy: Fix use after free in icmp_send_echo (scan-build)
by Alex Henrie 21 Dec '21

21 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/nsiproxy.sys/icmp_echo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c index cfebb287547..f36ff156bef 100644 --- a/dlls/nsiproxy.sys/icmp_echo.c +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -656,8 +656,8 @@ NTSTATUS icmp_send_echo( void *args ) if (ret < 0) { TRACE( "sendto() rets %d errno %d\n", ret, errno ); - icmp_data_free( data ); params->reply_len = data->ops->set_reply_ip_status( errno_to_ip_status( errno ), params->bits, params->reply ); + icmp_data_free( data ); return STATUS_SUCCESS; } -- 2.34.1

2 1