- Wine-Devel - list.winehq.org

[tools] testbot/SetWinLocale: Re-set --locale if it does not stick after the reboot.
by Francois Gouget Jan. 31, 2022

Jan. 31, 2022

On Windows 10 21H1 some process typically resets the --locale and --country some time after the login (except when they are changed through the GUI)!!! So wait for the reset to happen and set them again so they are as expected at least until the next reboot :-( Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This is why UserDefaultLCID is wrong in many of the TestBot VMs :-( Unfortunately I did not find what's causing the settings to be reset, and what's the difference with changing them through the GUI. At least with this patch GetUserDefaultLCID() and GetUserGeoID() return the expected values in the tests (except when LibvirtTool triggers another reboot before taking the snapshot). --- testbot/bin/SetWinLocale | 92 ++++++++++++++++++++++++++++++++-------- 1 file changed, 74 insertions(+), 18 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 18cbfc22c5..81bb2212b1 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -41,6 +41,8 @@ use WineTestBot::Log; use WineTestBot::TestAgent; use WineTestBot::Utils; +my $HKCU_INTERNATIONAL = "HKCU\\Control Panel\\International"; +my $HKCU_GEO = "HKCU\\Control Panel\\International\\Geo"; my $HKCU_USER_PROFILE = "HKCU\\Control Panel\\International\\User Profile"; @@ -499,12 +501,18 @@ if (defined $Usage) print " ISO 639-1 language code and CC an ISO 3166-1 alpha-2 country\n"; print " code.\n"; print " --locale LOC Specifies the user formats (see --defaults).\n"; + print " . Windows 10 may reset this setting a few seconds after a\n"; + print " the next log in. Thus one should not expect this change to\n"; + print " persist after a reboot.\n"; print " . Windows 10 GUI: Time & language -> Region -> Regional\n"; print " format.\n"; print " . APIs: GetUserDefaultLCID().\n"; print " . Powershell: Set-Culture LOC\n"; print " --country CTY Specifies the location using only the country part of the\n"; print " Windows locale (see --defaults).\n"; + print " . Windows 10 may reset this setting a few seconds after a\n"; + print " the next log in. Thus one should not expect this change to\n"; + print " persist after a reboot.\n"; print " . Windows 10 GUI: Time & language -> Region -> Country.\n"; print " . APIs: GetUserGeoID().\n"; print " . Powershell: Set-WinHomeLocation -GeoId CTY-ID\n"; @@ -555,9 +563,10 @@ if (defined $Usage) print " . Powershell (Windows 11+): Copy-UserInternationalSettingsToSystem -NewUser \$True\n"; print " . Intl.cpl: CopySettingsToDefaultUserAcct='true'\n"; print " --no-def-copy Do not copy the current locales to the default user account.\n"; - print " --no-reboot Do not reboot Windows. Some locale changes only take effect\n"; - print " after a reboot so this option should only be used for\n"; - print " debugging.\n"; + print " --no-reboot Do not reboot Windows. Some locale changes will only take\n"; + print " effect after the next reboot. This will also prevent working\n"; + print " around cases where some locale changes do not stick after a\n"; + print " reboot. So this should only be used for debugging.\n"; print " --debug Show more detailed information about progress.\n"; print " --help Shows this usage message.\n"; exit 0; @@ -713,9 +722,10 @@ sub ShowWinSettings($) print "InputMethod (--keyboard) = ", Value2Str($Settings->{DefInputMethod}), "\n"; } +my $InitialSettings = GetWinSettings(); if ($OptShow) { - ShowWinSettings(GetWinSettings()); + ShowWinSettings($InitialSettings); Cleanup(); exit(0); } @@ -814,24 +824,32 @@ $OptKeyboard ||= $OptDefault; # -# Change the Windows locale +# Helper to change the Windows locales # -my $Cmd = ["powershell.exe", "-ExecutionPolicy", "ByPass", "-File", - "$name0.ps1", "locales", $OptLocale || ".", $CountryId || ".", - $OptSystem || ".", $OptUTF8 ? "true" : "false", $OptMUI || ".", - $KeyboardIds ? $KeyboardIds->[0] : ".", - $OptSysCopy ? "true" : "false", $OptDefCopy ? "true" : "false"]; -Debug(Elapsed($Start), " Running: ", join(" ", @$Cmd), "\n"); -my $Ret = $TA->RunAndWait($Cmd, 0, 30, undef, "$name0.out", "$name0.out"); -FatalError("$name0.ps1 locales failed: ", $TA->GetLastError(), "\n") if ($Ret < 0); -my $Out = $TA->GetFileToString("$name0.out"); -foreach my $Line (split /\n/, $Out || "") +sub SetWinLocales($$$$$$$$) { - $Line =~ s/\r$//; - Info("$Line\n"); + my ($SysCopy, $DefCopy, $Locale, $CountryId, $System, $UTF8, $MUI, $KeyboardIds) = @_; + + my $Cmd = ["powershell.exe", "-ExecutionPolicy", "ByPass", "-File", + "$name0.ps1", "locales", $Locale || ".", $CountryId || ".", + $System || ".", $UTF8 ? "true" : "false", $MUI || ".", + $KeyboardIds ? $KeyboardIds->[0] : ".", + $SysCopy ? "true" : "false", $DefCopy ? "true" : "false"]; + Debug(Elapsed($Start), " Running: ", join(" ", @$Cmd), "\n"); + my $Ret = $TA->RunAndWait($Cmd, 0, 30, undef, "$name0.out", "$name0.out"); + FatalError("$name0.ps1 locales failed: ", $TA->GetLastError(), "\n") if ($Ret < 0); + my $Out = $TA->GetFileToString("$name0.out"); + foreach my $Line (split /\n/, $Out || "") + { + $Line =~ s/\r$//; + Info("$Line\n"); + } } +SetWinLocales($OptSysCopy, $OptDefCopy, $OptLocale, $CountryId, + $OptSystem, $OptUTF8, $OptMUI, $KeyboardIds); + # # Reboot to finalize the changes @@ -839,7 +857,7 @@ foreach my $Line (split /\n/, $Out || "") if ($OptReboot) { - $Cmd = ["shutdown.exe", "/r", "/t", "0"]; + my $Cmd = ["shutdown.exe", "/r", "/t", "0"]; Debug(Elapsed($Start), " Rebooting: ", join(" ", @$Cmd), "\n"); $TA->Run($Cmd, 0); # Note that we cannot wait for this command since it reboots Windows @@ -853,6 +871,44 @@ if ($OptReboot) { FatalError("could not reconnect to $OptHostName after the reboot: ", $TA->GetLastError(), "\n"); } + + # Skip this check on pre-Windows 10 versions, i.e. those that don't have + # 'CountryName' and if the settings were not changed in the first place. + if ($InitialSettings->{CountryName} and + (($OptLocale and $InitialSettings->{Locale} ne $OptLocale) or + ($OptCountry and $InitialSettings->{Country} ne $CountryId))) + { + # On Windows 10 21H1 some process typically resets the --locale and + # --country some time after the login!!! + # This also happens when making the change through the Powershell's + # Set-Culture and Set-WinHomeLocation calls, but not when manually going + # through the GUI. + # So wait for the reset to happen and re-set them :-( + my $Expected = $OptLocale ? "--locale $OptLocale" : ""; + $Expected .= !$OptCountry ? "" : (($Expected ? " and " : "") . ("--country $OptCountry")); + Debug(Elapsed($Start), " Expecting $Expected to get reverted\n"); + foreach (1..30) + { + my $Reverted; + if ($OptCountry) + { + my $Nation = RegGetValue($HKCU_GEO, "Nation"); + $Reverted = "--country $Nation" if ($Nation ne $CountryId); + } + else + { + my $LocaleName = RegGetValue($HKCU_INTERNATIONAL, "LocaleName"); + $Reverted = "--locale $LocaleName" if ($LocaleName ne $OptLocale); + } + if ($Reverted) + { + Warning("$Expected got reverted to $Reverted. Setting them again but this will not stick across reboots\n"); + SetWinLocales(undef, undef, $OptLocale, $CountryId, undef, undef, undef, undef); + last; + } + sleep(2); + } + } } -- 2.30.2

1 0

[tools] testbot/SetWinLocale: Nls:InstallLanguage is unaffected by --system.
by Francois Gouget Jan. 31, 2022

Jan. 31, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 6535c49396..18cbfc22c5 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -690,8 +690,8 @@ sub ShowWinSettings($) print "\n"; print "System settings:\n"; print "Nls:Language (--system) = ", Value2Str($Settings->{SysLanguage}), "\n"; - print "Nls:InstallLang (--system) = ", Value2Str($Settings->{SysInstallLang}), "\n"; print "Nls:Locale (--system) = ", Value2Str($Settings->{SysLocale}), "\n"; + print "Nls:InstallLang = ", Value2Str($Settings->{SysInstallLang}), "\n"; print "ACP (--utf8) = ", Value2Str($Settings->{ACP}), "\n"; print "MACCP (--utf8) = ", Value2Str($Settings->{MACCP}), "\n"; print "OEMCP (--utf8) = ", Value2Str($Settings->{OEMCP}), "\n"; -- 2.30.2

1 0

[v2 PATCH 08/14] dlls/evr: use correct integral type
by Nikolay Sivov Jan. 31, 2022

Jan. 31, 2022

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: keeps existing formatting for declarations. dlls/evr/mixer.c | 5 +++-- dlls/evr/presenter.c | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 5af5b2861b3..3d72270fc16 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -906,8 +906,9 @@ static HRESULT WINAPI video_mixer_transform_SetOutputType(IMFTransform *iface, D const unsigned int equality_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES; struct video_mixer *mixer = impl_from_IMFTransform(iface); HRESULT hr = MF_E_INVALIDMEDIATYPE; - unsigned int i, compare_flags; BOOL is_compressed = TRUE; + DWORD compare_flags; + unsigned int i; TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags); @@ -1557,7 +1558,7 @@ static HRESULT WINAPI video_mixer_service_client_InitServicePointers(IMFTopology IMFTopologyServiceLookup *service_lookup) { struct video_mixer *mixer = impl_from_IMFTopologyServiceLookupClient(iface); - unsigned int count; + DWORD count; HRESULT hr; TRACE("%p, %p.\n", iface, service_lookup); diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index fd02404b7af..cf8ba20cbb8 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -282,7 +282,7 @@ static void video_presenter_reset_media_type(struct video_presenter *presenter) static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, IMFMediaType *media_type) { - unsigned int flags; + DWORD flags; HRESULT hr; if (!media_type) @@ -328,9 +328,9 @@ static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, static HRESULT video_presenter_configure_output_type(struct video_presenter *presenter, const MFVideoArea *aperture, IMFMediaType *media_type) { - unsigned int size; GUID subtype; LONG stride; + DWORD size; HRESULT hr; hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)aperture->Area.cx << 32 | aperture->Area.cy); @@ -1104,8 +1104,8 @@ static void video_presenter_set_mixer_rect(struct video_presenter *presenter) static HRESULT video_presenter_attach_mixer(struct video_presenter *presenter, IMFTopologyServiceLookup *service_lookup) { IMFVideoDeviceID *device_id; - unsigned int count; GUID id = { 0 }; + DWORD count; HRESULT hr; count = 1; @@ -1143,8 +1143,8 @@ static HRESULT WINAPI video_presenter_service_client_InitServicePointers(IMFTopo IMFTopologyServiceLookup *service_lookup) { struct video_presenter *presenter = impl_from_IMFTopologyServiceLookupClient(iface); - unsigned int count; HRESULT hr = S_OK; + DWORD count; TRACE("%p, %p.\n", iface, service_lookup); -- 2.34.1

1 0

[PATCH vkd3d 3/3] vkd3d-shader: Use LONG type with InterlockedIncrement.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 47fe3d60d27f..ae0662b83cac 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -308,7 +308,7 @@ void set_u32(struct vkd3d_bytecode_buffer *buffer, size_t offset, uint32_t value static void vkd3d_shader_dump_blob(const char *path, const char *prefix, const char *suffix, const void *data, size_t size) { - static int shader_id = 0; + static LONG shader_id = 0; char filename[1024]; unsigned int id; FILE *f; -- 2.34.1

2 1

[PATCH vkd3d 2/3] vkd3d-shader: Fix some DWORD/unsigned int pointer mismatches.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 9476765fb7af..be24a74963dd 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1155,7 +1155,7 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in struct hlsl_type *lhs_type = lhs->data_type; struct hlsl_ir_store *store; struct hlsl_ir_expr *copy; - DWORD writemask = 0; + unsigned int writemask = 0; if (assign_op == ASSIGN_OP_SUB) { @@ -2359,7 +2359,7 @@ struct_declaration: var_modifiers struct_spec variables_def_optional ';' { struct hlsl_type *type; - DWORD modifiers = $1; + unsigned int modifiers = $1; if (!$3) { @@ -2449,7 +2449,7 @@ field: var_modifiers field_type variables_def ';' { struct hlsl_type *type; - DWORD modifiers = $1; + unsigned int modifiers = $1; if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) YYABORT; @@ -2619,7 +2619,7 @@ parameter: input_mods var_modifiers type any_identifier colon_attribute { struct hlsl_type *type; - DWORD modifiers = $2; + unsigned int modifiers = $2; if (!(type = apply_type_modifiers(ctx, $3, &modifiers, @2))) YYABORT; @@ -2858,7 +2858,7 @@ declaration: var_modifiers type variables_def ';' { struct hlsl_type *type; - DWORD modifiers = $1; + unsigned int modifiers = $1; if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) YYABORT; -- 2.34.1

2 1

[PATCH vkd3d 1/3] vkd3d-shader: Consistently use uint32_t for pointers to shader data.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Mixing uint32_t and DWORD pointers causes warnings on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 50 ++++++++++++------------ libs/vkd3d-shader/vkd3d_shader_private.h | 4 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 4d3773190875..d28c303ab7ac 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -87,7 +87,7 @@ struct vkd3d_shader_src_param_entry struct vkd3d_shader_sm4_parser { - const DWORD *start, *end; + const uint32_t *start, *end; unsigned int output_map[MAX_REG_OUTPUT]; @@ -252,7 +252,7 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, u { struct vkd3d_shader_semantic *semantic = &ins->declaration.semantic; enum vkd3d_sm4_resource_type resource_type; - const DWORD *end = &tokens[token_count]; + const uint32_t *end = &tokens[token_count]; enum vkd3d_sm4_data_type data_type; enum vkd3d_data_type reg_data_type; DWORD components; @@ -297,7 +297,7 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, u static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction *ins, uint32_t opcode, uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { - const DWORD *end = &tokens[token_count]; + const uint32_t *end = &tokens[token_count]; shader_sm4_read_src_param(priv, &tokens, end, VKD3D_DATA_FLOAT, &ins->declaration.cb.src); shader_sm4_set_descriptor_register_range(priv, &ins->declaration.cb.src.reg, &ins->declaration.cb.range); @@ -323,7 +323,7 @@ static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction static void shader_sm4_read_dcl_sampler(struct vkd3d_shader_instruction *ins, uint32_t opcode, uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { - const DWORD *end = &tokens[token_count]; + const uint32_t *end = &tokens[token_count]; ins->flags = (opcode_token & VKD3D_SM4_SAMPLER_MODE_MASK) >> VKD3D_SM4_SAMPLER_MODE_SHIFT; if (ins->flags & ~VKD3D_SM4_SAMPLER_COMPARISON) @@ -342,7 +342,7 @@ static void shader_sm4_read_dcl_index_range(struct vkd3d_shader_instruction *ins } static void shader_sm4_read_dcl_output_topology(struct vkd3d_shader_instruction *ins, uint32_t opcode, - uint32_t opcode_token, const DWORD *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { enum vkd3d_sm4_output_primitive_type primitive_type; @@ -495,7 +495,7 @@ static void shader_sm5_read_dcl_hs_max_tessfactor(struct vkd3d_shader_instructio } static void shader_sm5_read_dcl_thread_group(struct vkd3d_shader_instruction *ins, uint32_t opcode, - uint32_t opcode_token, const DWORD *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { ins->declaration.thread_group_size.x = *tokens++; ins->declaration.thread_group_size.y = *tokens++; @@ -506,7 +506,7 @@ static void shader_sm5_read_dcl_uav_raw(struct vkd3d_shader_instruction *ins, ui const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { struct vkd3d_shader_raw_resource *resource = &ins->declaration.raw_resource; - const DWORD *end = &tokens[token_count]; + const uint32_t *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_UAV, &resource->resource.reg); shader_sm4_set_descriptor_register_range(priv, &resource->resource.reg.reg, &resource->resource.range); @@ -518,7 +518,7 @@ static void shader_sm5_read_dcl_uav_structured(struct vkd3d_shader_instruction * uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { struct vkd3d_shader_structured_resource *resource = &ins->declaration.structured_resource; - const DWORD *end = &tokens[token_count]; + const uint32_t *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_UAV, &resource->resource.reg); shader_sm4_set_descriptor_register_range(priv, &resource->resource.reg.reg, &resource->resource.range); @@ -553,7 +553,7 @@ static void shader_sm5_read_dcl_resource_structured(struct vkd3d_shader_instruct uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { struct vkd3d_shader_structured_resource *resource = &ins->declaration.structured_resource; - const DWORD *end = &tokens[token_count]; + const uint32_t *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_RESOURCE, &resource->resource.reg); shader_sm4_set_descriptor_register_range(priv, &resource->resource.reg.reg, &resource->resource.range); @@ -567,7 +567,7 @@ static void shader_sm5_read_dcl_resource_raw(struct vkd3d_shader_instruction *in uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { struct vkd3d_shader_raw_resource *resource = &ins->declaration.raw_resource; - const DWORD *end = &tokens[token_count]; + const uint32_t *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_RESOURCE, &resource->resource.reg); shader_sm4_set_descriptor_register_range(priv, &resource->resource.reg.reg, &resource->resource.range); @@ -1465,7 +1465,7 @@ static void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, stru const uint32_t **ptr = &parser->ptr; unsigned int i, len; size_t remaining; - const DWORD *p; + const uint32_t *p; DWORD precise; list_move_head(&sm4->src_free, &sm4->src); @@ -1692,7 +1692,7 @@ static bool require_space(size_t offset, size_t count, size_t size, size_t data_ return !count || (data_size - offset) / count >= size; } -static void read_dword(const char **ptr, DWORD *d) +static void read_dword(const char **ptr, uint32_t *d) { memcpy(d, *ptr, sizeof(*d)); *ptr += sizeof(*d); @@ -1700,14 +1700,14 @@ static void read_dword(const char **ptr, DWORD *d) static void read_float(const char **ptr, float *f) { - STATIC_ASSERT(sizeof(float) == sizeof(DWORD)); - read_dword(ptr, (DWORD *)f); + STATIC_ASSERT(sizeof(float) == sizeof(uint32_t)); + read_dword(ptr, (uint32_t *)f); } static void skip_dword_unknown(const char **ptr, unsigned int count) { unsigned int i; - DWORD d; + uint32_t d; WARN("Skipping %u unknown DWORDs:\n", count); for (i = 0; i < count; ++i) @@ -1744,11 +1744,11 @@ static int parse_dxbc(const char *data, size_t data_size, uint32_t checksum[4], calculated_checksum[4]; const char *ptr = data; int ret = VKD3D_OK; - DWORD chunk_count; - DWORD total_size; + uint32_t chunk_count; + uint32_t total_size; unsigned int i; - DWORD version; - DWORD tag; + uint32_t version; + uint32_t tag; if (data_size < VKD3D_DXBC_HEADER_SIZE) { @@ -1803,9 +1803,9 @@ static int parse_dxbc(const char *data, size_t data_size, for (i = 0; i < chunk_count; ++i) { - DWORD chunk_tag, chunk_size; + uint32_t chunk_tag, chunk_size; const char *chunk_ptr; - DWORD chunk_offset; + uint32_t chunk_offset; read_dword(&ptr, &chunk_offset); TRACE("chunk %u at offset %#x\n", i, chunk_offset); @@ -1847,7 +1847,7 @@ static int shader_parse_signature(DWORD tag, const char *data, DWORD data_size, struct vkd3d_shader_signature_element *e; const char *ptr = data; unsigned int i; - DWORD count; + uint32_t count; if (!require_space(0, 2, sizeof(DWORD), data_size)) { @@ -1877,7 +1877,7 @@ static int shader_parse_signature(DWORD tag, const char *data, DWORD data_size, for (i = 0; i < count; ++i) { - DWORD name_offset, mask; + uint32_t name_offset, mask; if (has_stream_index) read_dword(&ptr, &e[i].stream_index); @@ -1998,7 +1998,7 @@ static int shdr_handler(const char *data, DWORD data_size, DWORD tag, void *cont case TAG_SHEX: if (desc->byte_code) FIXME("Multiple shader code chunks.\n"); - desc->byte_code = (const DWORD *)data; + desc->byte_code = (const uint32_t *)data; desc->byte_code_size = data_size; break; @@ -2355,7 +2355,7 @@ static int shader_parse_root_parameters(struct root_signature_parser_context *co } static int shader_parse_root_parameters1(struct root_signature_parser_context *context, - DWORD offset, DWORD count, struct vkd3d_shader_root_parameter1 *parameters) + uint32_t offset, DWORD count, struct vkd3d_shader_root_parameter1 *parameters) { const char *ptr; unsigned int i; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 9cd26d7f91a9..1de67f45461a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -638,7 +638,7 @@ struct vkd3d_shader_version struct vkd3d_shader_immediate_constant_buffer { unsigned int vec4_count; - DWORD data[MAX_IMMEDIATE_CONSTANT_BUFFER_SIZE]; + uint32_t data[MAX_IMMEDIATE_CONSTANT_BUFFER_SIZE]; }; struct vkd3d_shader_indexable_temp @@ -762,7 +762,7 @@ enum vkd3d_shader_input_sysval_semantic struct vkd3d_shader_desc { - const DWORD *byte_code; + const uint32_t *byte_code; size_t byte_code_size; struct vkd3d_shader_signature input_signature; struct vkd3d_shader_signature output_signature; -- 2.34.1

2 1

[PATCH] wshom: Fix long types warnings.
by Nikolay Sivov Jan. 31, 2022

Jan. 31, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wshom.ocx/Makefile.in | 1 - dlls/wshom.ocx/shell.c | 97 +++++++++++++++++-------------------- dlls/wshom.ocx/wshom_main.c | 6 +-- 3 files changed, 47 insertions(+), 57 deletions(-) diff --git a/dlls/wshom.ocx/Makefile.in b/dlls/wshom.ocx/Makefile.in index 70653a1a1f6..fed2babda33 100644 --- a/dlls/wshom.ocx/Makefile.in +++ b/dlls/wshom.ocx/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wshom.ocx IMPORTS = uuid oleaut32 ole32 shell32 user32 advapi32 diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 1ee74577310..82d618b1142 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -116,7 +116,7 @@ static ULONG WINAPI WshExec_AddRef(IWshExec *iface) { WshExecImpl *This = impl_from_IWshExec(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref = %d\n", This, ref); + TRACE("%p, refcount %ld.\n", iface, ref); return ref; } @@ -124,7 +124,7 @@ static ULONG WINAPI WshExec_Release(IWshExec *iface) { WshExecImpl *This = impl_from_IWshExec(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref = %d\n", This, ref); + TRACE("%p, refcount %ld.\n", iface, ref); if (!ref) { CloseHandle(This->info.hThread); @@ -145,19 +145,18 @@ static HRESULT WINAPI WshExec_GetTypeInfoCount(IWshExec *iface, UINT *pctinfo) static HRESULT WINAPI WshExec_GetTypeInfo(IWshExec *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - WshExecImpl *This = impl_from_IWshExec(iface); - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo); + return get_typeinfo(IWshExec_tid, ppTInfo); } static HRESULT WINAPI WshExec_GetIDsOfNames(IWshExec *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - WshExecImpl *This = impl_from_IWshExec(iface); ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(IWshExec_tid, &typeinfo); if(SUCCEEDED(hr)) @@ -172,18 +171,16 @@ static HRESULT WINAPI WshExec_GetIDsOfNames(IWshExec *iface, REFIID riid, LPOLES static HRESULT WINAPI WshExec_Invoke(IWshExec *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - WshExecImpl *This = impl_from_IWshExec(iface); ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(IWshExec_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &This->IWshExec_iface, dispIdMember, wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); } @@ -372,7 +369,7 @@ static ULONG WINAPI WshEnvironment_AddRef(IWshEnvironment *iface) { WshEnvironment *This = impl_from_IWshEnvironment(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref = %d\n", This, ref); + TRACE("%p, refcount %ld.\n", iface, ref); return ref; } @@ -380,7 +377,7 @@ static ULONG WINAPI WshEnvironment_Release(IWshEnvironment *iface) { WshEnvironment *This = impl_from_IWshEnvironment(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref = %d\n", This, ref); + TRACE("%p, refcount %ld.\n", iface, ref); if (!ref) free(This); @@ -398,19 +395,18 @@ static HRESULT WINAPI WshEnvironment_GetTypeInfoCount(IWshEnvironment *iface, UI static HRESULT WINAPI WshEnvironment_GetTypeInfo(IWshEnvironment *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - WshEnvironment *This = impl_from_IWshEnvironment(iface); - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo); + return get_typeinfo(IWshEnvironment_tid, ppTInfo); } static HRESULT WINAPI WshEnvironment_GetIDsOfNames(IWshEnvironment *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - WshEnvironment *This = impl_from_IWshEnvironment(iface); ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(IWshEnvironment_tid, &typeinfo); if(SUCCEEDED(hr)) @@ -425,18 +421,16 @@ static HRESULT WINAPI WshEnvironment_GetIDsOfNames(IWshEnvironment *iface, REFII static HRESULT WINAPI WshEnvironment_Invoke(IWshEnvironment *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - WshEnvironment *This = impl_from_IWshEnvironment(iface); ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(IWshEnvironment_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &This->IWshEnvironment_iface, dispIdMember, wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); } @@ -561,20 +555,22 @@ static HRESULT WINAPI WshCollection_QueryInterface(IWshCollection *iface, REFIID static ULONG WINAPI WshCollection_AddRef(IWshCollection *iface) { - WshCollection *This = impl_from_IWshCollection(iface); - LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref = %d\n", This, ref); + WshCollection *collection = impl_from_IWshCollection(iface); + LONG ref = InterlockedIncrement(&collection->ref); + + TRACE("%p, refcount %ld.\n", iface, ref); + return ref; } static ULONG WINAPI WshCollection_Release(IWshCollection *iface) { - WshCollection *This = impl_from_IWshCollection(iface); - LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref = %d\n", This, ref); + WshCollection *collection = impl_from_IWshCollection(iface); + LONG ref = InterlockedDecrement(&collection->ref); + TRACE("%p, refcount %ld.\n", iface, ref); if (!ref) - free(This); + free(collection); return ref; } @@ -589,19 +585,18 @@ static HRESULT WINAPI WshCollection_GetTypeInfoCount(IWshCollection *iface, UINT static HRESULT WINAPI WshCollection_GetTypeInfo(IWshCollection *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - WshCollection *This = impl_from_IWshCollection(iface); - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo); + return get_typeinfo(IWshCollection_tid, ppTInfo); } static HRESULT WINAPI WshCollection_GetIDsOfNames(IWshCollection *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - WshCollection *This = impl_from_IWshCollection(iface); ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(IWshCollection_tid, &typeinfo); if(SUCCEEDED(hr)) @@ -616,18 +611,16 @@ static HRESULT WINAPI WshCollection_GetIDsOfNames(IWshCollection *iface, REFIID static HRESULT WINAPI WshCollection_Invoke(IWshCollection *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - WshCollection *This = impl_from_IWshCollection(iface); ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(IWshCollection_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &This->IWshCollection_iface, dispIdMember, wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); } @@ -763,7 +756,7 @@ static ULONG WINAPI WshShortcut_AddRef(IWshShortcut *iface) { WshShortcut *This = impl_from_IWshShortcut(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref = %d\n", This, ref); + TRACE("%p, refcount %ld.\n", iface, ref); return ref; } @@ -771,7 +764,7 @@ static ULONG WINAPI WshShortcut_Release(IWshShortcut *iface) { WshShortcut *This = impl_from_IWshShortcut(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref = %d\n", This, ref); + TRACE("%p, refcount %ld.\n", iface, ref); if (!ref) { @@ -793,19 +786,18 @@ static HRESULT WINAPI WshShortcut_GetTypeInfoCount(IWshShortcut *iface, UINT *pc static HRESULT WINAPI WshShortcut_GetTypeInfo(IWshShortcut *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - WshShortcut *This = impl_from_IWshShortcut(iface); - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo); + return get_typeinfo(IWshShortcut_tid, ppTInfo); } static HRESULT WINAPI WshShortcut_GetIDsOfNames(IWshShortcut *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - WshShortcut *This = impl_from_IWshShortcut(iface); ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(IWshShortcut_tid, &typeinfo); if(SUCCEEDED(hr)) @@ -820,18 +812,16 @@ static HRESULT WINAPI WshShortcut_GetIDsOfNames(IWshShortcut *iface, REFIID riid static HRESULT WINAPI WshShortcut_Invoke(IWshShortcut *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - WshShortcut *This = impl_from_IWshShortcut(iface); ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(IWshShortcut_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &This->IWshShortcut_iface, dispIdMember, wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); } @@ -1155,7 +1145,8 @@ static HRESULT WINAPI WshShell3_GetTypeInfoCount(IWshShell3 *iface, UINT *pctinf static HRESULT WINAPI WshShell3_GetTypeInfo(IWshShell3 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - TRACE("(%u %u %p)\n", iTInfo, lcid, ppTInfo); + TRACE("%u, %lx, %p.\n", iTInfo, lcid, ppTInfo); + return get_typeinfo(IWshShell3_tid, ppTInfo); } @@ -1165,7 +1156,7 @@ static HRESULT WINAPI WshShell3_GetIDsOfNames(IWshShell3 *iface, REFIID riid, LP ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%s %p %u %u %p)\n", debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("%s, %p, %u, %lx, %p.\n", debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(IWshShell3_tid, &typeinfo); if(SUCCEEDED(hr)) @@ -1183,7 +1174,7 @@ static HRESULT WINAPI WshShell3_Invoke(IWshShell3 *iface, DISPID dispIdMember, R ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%d %s %d %d %p %p %p %p)\n", dispIdMember, debugstr_guid(riid), + TRACE("%ld, %s, %lx, %d, %p, %p, %p, %p.\n", dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(IWshShell3_tid, &typeinfo); @@ -1255,7 +1246,7 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, hr = VariantChangeType(&s, style, 0, VT_I4); if (FAILED(hr)) { - ERR("failed to convert style argument, 0x%08x\n", hr); + ERR("failed to convert style argument, %#lx\n", hr); return hr; } @@ -1285,7 +1276,7 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, free(file); if (!ret) { - TRACE("ShellExecute failed, %d\n", GetLastError()); + TRACE("ShellExecute failed, %ld\n", GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); } else @@ -1587,7 +1578,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v break; } default: - FIXME("value type %d not supported\n", type); + FIXME("value type %ld not supported\n", type); hr = E_FAIL; }; @@ -1663,12 +1654,12 @@ static HRESULT WINAPI WshShell3_RegWrite(IWshShell3 *iface, BSTR name, VARIANT * data_len = sizeof(DWORD); break; default: - FIXME("unexpected regtype %d\n", regtype); + FIXME("unexpected regtype %ld\n", regtype); return E_FAIL; }; if (FAILED(hr)) { - FIXME("failed to convert value, regtype %d, 0x%08x\n", regtype, hr); + FIXME("failed to convert value, regtype %ld, %#lx.\n", regtype, hr); return hr; } diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c index 0439ceb072a..b2dc79a1948 100644 --- a/dlls/wshom.ocx/wshom_main.c +++ b/dlls/wshom.ocx/wshom_main.c @@ -53,7 +53,7 @@ static HRESULT load_typelib(void) hres = LoadRegTypeLib(&LIBID_IWshRuntimeLibrary, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); if(FAILED(hres)) { - ERR("LoadRegTypeLib failed: %08x\n", hres); + ERR("LoadRegTypeLib failed: %#lx.\n", hres); return hres; } @@ -84,7 +84,7 @@ HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); if(FAILED(hres)) { - ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); + ERR("GetTypeInfoOfGuid(%s) failed: %#lx.\n", debugstr_guid(tid_ids[tid]), hres); return hres; } @@ -216,7 +216,7 @@ static IClassFactory WshShellFactory = { &WshShellFactoryVtbl }; */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { - TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv); + TRACE("%p, %ld, %p.\n", hInstDLL, fdwReason, lpv); switch(fdwReason) { -- 2.34.1

1 0

[PATCH 1/4] d3d9/tests: Try to make test_cursor_pos more reliable.
by Stefan Dösinger Jan. 31, 2022

Jan. 31, 2022

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- The Win10 1709 behavior and apparent workaround of moving the pointer before the test don't quite make sense. In past testbot runs there have been cases where e.g. move 3 doesn't produce a message, or any other move. This patch has worked so far in all of my manual testbot submissions. The only way to know is to wait and see... I have sent this series on top of 225041 and 225042, but it should apply independently as well. --- dlls/d3d9/tests/device.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 7effd0f28b8..9c2e94cc694 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5205,6 +5205,20 @@ static void test_cursor_pos(void) {0, 0}, }; + /* Windows 10 1709 is unreliable. One or more of the cursor movements we + * expect don't show up. Moving the mouse to a defined position beforehand + * seems to get it into better shape - only the final 150x150 move we do + * below is missing - it looks as if this Windows version filters redundant + * SetCursorPos calls on the user32 level, although I am not entirely sure. + * + * The weird thing is that the previous test leaves the cursor position + * reliably at 512x384 on the testbot. So the 50x50 mouse move shouldn't + * be stripped away anyway, but it might be a difference between moving the + * cursor through SetCursorPos vs moving it by changing the display mode. */ + ret = SetCursorPos(99, 99); + ok(ret, "Failed to set cursor position.\n"); + flush_events(); + wc.lpfnWndProc = test_cursor_proc; wc.lpszClassName = "d3d9_test_cursor_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); @@ -5239,7 +5253,8 @@ static void test_cursor_pos(void) IDirect3DDevice9_SetCursorPosition(device, 75, 75, 0); flush_events(); - /* SetCursorPosition() eats duplicates. */ + /* SetCursorPosition() eats duplicates. FIXME: Since we accept unexpected + * mouse moves the test doesn't actually demonstrate that. */ IDirect3DDevice9_SetCursorPosition(device, 75, 75, 0); flush_events(); @@ -5260,13 +5275,14 @@ static void test_cursor_pos(void) IDirect3DDevice9_SetCursorPosition(device, 150, 150, 0); flush_events(); - /* SetCursorPos() doesn't. */ + /* SetCursorPos() doesn't. Except for Win10 1709. */ ret = SetCursorPos(150, 150); ok(ret, "Failed to set cursor position.\n"); flush_events(); - ok(!expect_pos->x && !expect_pos->y, "Didn't receive MOUSEMOVE %u (%d, %d).\n", - (unsigned)(expect_pos - points), expect_pos->x, expect_pos->y); + ok((!expect_pos->x && !expect_pos->y) || broken(expect_pos - points == 7), + "Didn't receive MOUSEMOVE %u (%d, %d).\n", + (unsigned)(expect_pos - points), expect_pos->x, expect_pos->y); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); -- 2.34.1

4 14

[PATCH 1/2] d3d9/tests: Ignore random testbot failures in test_cursor.
by Stefan Dösinger Jan. 31, 2022

Jan. 31, 2022

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index c480a9d163e..7effd0f28b8 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1886,11 +1886,19 @@ static void test_cursor(void) IDirect3DSurface9_Release(cursor); + /* On the testbot the cursor handle does not behave as expected in rare situations, + * leading to random test failures. Either the cursor handle changes before we expect + * it to, or it doesn't change afterwards (or already changed before we read the + * initial handle?). I was not able to reproduce this on my own machines. Moving the + * mouse outside the window results in similar behavior. However, I tested various + * obvious failure causes: Was the mouse moved? Was the window hidden or moved? Is + * the window in the background? Neither of those applies. Making the window topmost + * or using a fullscreen device doesn't improve the test's reliability either. */ memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); ok(GetCursorInfo(&info), "GetCursorInfo failed\n"); ok(info.flags & (CURSOR_SHOWING|CURSOR_SUPPRESSED), "The gdi cursor is hidden (%08x)\n", info.flags); - ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ + ok(info.hCursor == cur || broken(1), "The cursor handle is %p\n", info.hCursor); /* unchanged */ /* Still hidden */ ret = IDirect3DDevice9_ShowCursor(device, TRUE); @@ -1904,7 +1912,7 @@ static void test_cursor(void) info.cbSize = sizeof(info); ok(GetCursorInfo(&info), "GetCursorInfo failed\n"); ok(info.flags & (CURSOR_SHOWING|CURSOR_SUPPRESSED), "The gdi cursor is hidden (%08x)\n", info.flags); - ok(info.hCursor != cur, "The cursor handle is %p\n", info.hCursor); + ok(info.hCursor != cur || broken(1), "The cursor handle is %p\n", info.hCursor); /* Cursor dimensions must all be powers of two */ for (test_idx = 0; test_idx < ARRAY_SIZE(cursor_sizes); ++test_idx) -- 2.34.1

3 5

[tools] testbot/SetWinLocale: Take --reboot into account when checking the results.
by Francois Gouget Jan. 31, 2022

Jan. 31, 2022

Don't complain about settings that are only modified after a reboot if none took place. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 2ff8348fb3..6535c49396 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -904,7 +904,19 @@ if ($OptUTF8) } if ($OptMUI) { - CheckSetting($Settings, "PreferredUILanguages", $OptMUI, "for --mui $OptMUI"); + if ($OptReboot) + { + CheckSetting($Settings, "PreferredUILanguages", $OptMUI, "for --mui $OptMUI"); + if ($Settings->{PreferredUILanguagesPending}) + { + Error("PreferredUILanguagesPending should not be set for --mui $OptMUI\n"); + $Success = 0; + } + } + else + { + CheckSetting($Settings, "PreferredUILanguagesPending", $OptMUI, "for --mui $OptMUI"); + } } if ($KeyboardIds) { @@ -923,7 +935,7 @@ if ($OptSysCopy) CheckSetting($Settings, "DefCountry", $CountryId, "for --country $OptCountry"); CheckSetting($Settings, "DefCountryName", $OptCountry, "for --country $OptCountry"); } - if ($OptMUI) + if ($OptMUI and $OptReboot) { CheckSetting($Settings, "DefMachinePreferredUILanguages", $OptMUI, "for --mui $OptMUI"); } @@ -932,6 +944,13 @@ if ($OptSysCopy) CheckSetting($Settings, "DefInputMethod", $KeyboardIds->[0], "for --keyboard $OptKeyboard", 1); } } +if (!$OptReboot and ($OptSystem or $OptMUI)) +{ + my @Pending; + push @Pending, "--system $OptSystem" if ($OptSystem); + push @Pending, "--mui $OptMUI" if ($OptMUI); + Warning(join(" ", "the", @Pending, "changes are still pending\n")); +} Cleanup(); exit(1) if (!$Success); -- 2.30.2

1 0