- 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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel