March 2021 - Wine-devel - list.winehq.org

[tools] testbot/reporttest: Add a test for garbled pids.
by Francois Gouget 15 Mar '21

15 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/reporttest/report.template | 10 +++++++++- testbot/src/reporttest/report.testwtbs | 4 +++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index afdc317f4..8e5f72c2b 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -525,7 +525,15 @@ subprocess crashes either. This is why the error is "Zero exit code" and not 07b0:rebar: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped. comctl32:rebar:07b0 done (0) in 0s -stub comctl32:status +comctl32:status start dlls/comctl32/tests/status.c - +----- A test unit with a garbled exception and summary pids, and garbled done +----- line. +----- Expected assessement: Crash +This is +garbled0123:status: unhandled exception c0000005 at 0040167C +status.c:33: unhandled exception c0000005 in child process 0123dead +garbled07b0:status: 5 tests executed (0 marked as todo, 1 failures), 0 skipped. +garbledcomctl32:status:07b0 done (1) in 0s comctl32:subclass start dlls/comctl32/tests/subclass.c - ----- A test unit with a subprocess crash, and a non-zero exit code diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index 09264cadf..e1988278c 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -13,7 +13,7 @@ with: ----- TestWTBS ----- -p tests.TestFailures 66 +p tests.TestFailures 68 p build.HasTask 0 a wine.log.GrepV ^Applying patch @@ -50,6 +50,8 @@ n 0 comboex.c:40: Test failed: A failure in the main process n 0 comboex.c:41: Test succeeded inside todo block: Success in the main process n 0 header.c:1: Test failed: Something wrong n 0 1234:rebar: unhandled exception c0000005 at 0040167C +n 0 garbled0123:status: unhandled exception c0000005 at 0040167C +n 0 status.c:33: unhandled exception c0000005 in child process 0123dead n 0 1234:subclass: unhandled exception c0000005 at 0040167C n 0 Do not cut syslink.c:40: Test failed: Something wrong n 0 Do not cut syslink.c:41: Test succeeded inside todo block: Something right! -- 2.20.1

1 0

[tools] testbot/LibvirtTool: Always use a default deadline if none is set.
by Francois Gouget 15 Mar '21

15 Mar '21

VM->ChildDeadline may be unset not only while in debug mode if the VM is in maintenance mode, but also if another VM sharing the same hypervisor domain is in maintenance mode. So rather than relying on the VM status, just use a default value as a fallback. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index f3ea1987f..f135b9b51 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -579,8 +579,7 @@ sub Revert() if ($ExtraTimeout) { Debug(Elapsed($Start), " Extend the $VMKey revert deadline by $ExtraTimeout\n"); - my $Deadline = $VM->Status eq "maintenance" ? (time() + $VMToolTimeout) : - $VM->ChildDeadline; + my $Deadline = $VM->ChildDeadline || (time() + $VMToolTimeout); $VM->ChildDeadline($Deadline + $ExtraTimeout); $VM->Save(); } -- 2.20.1

1 0

[tools] testbot/TestAgent: Add documentation for new().
by Francois Gouget 15 Mar '21

15 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/TestAgent.pm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 6c4e6444d..096c3eaea 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -95,6 +95,19 @@ sub trace_speed($$) } } +=pod +=over 12 + +=item C<new()> + +Creates a connection to a TestAgent server. + +Note that the resources, including the network connection and ssh tunnel, +are automatically released when this object goes out of scope. + +=back +=cut + sub new($$$;$) { my ($class, $Hostname, $Port, $Tunnel) = @_; -- 2.20.1

1 0

[tools] testbot/VMs: Add documentation for VM::GetAgent().
by Francois Gouget 15 Mar '21

15 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/VMs.pm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 53f43948b..2cc6c678d 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -208,9 +208,25 @@ sub GetDomain($) return LibvirtDomain->new($self); } +=pod +=over 12 + +=item C<GetAgent()> + +Returns a connection to the VM's TestAgent server. + +If $Alternate is true, GetAgent() will connect to the TestAgent server running +on the alternate port. This is typically a server running with higher +privileges than the one running on the regular port. However note that some +VMs only run a single TestAgent server with high privileges on the regular +port. + +=back +=cut + sub GetAgent($;$) { - my ($self, $Privileged) = @_; + my ($self, $Alternate) = @_; # Use either the tunnel specified in the configuration file # or autodetect the settings based on the VM's VirtURI setting. @@ -227,7 +243,7 @@ sub GetAgent($;$) $TunnelInfo->{username} = $ParsedURI->userinfo; } my $Port = $AgentPort; - $Port++ if ($Privileged); + $Port++ if ($Alternate); return TestAgent->new($self->Hostname, $Port, $TunnelInfo); } -- 2.20.1

1 0

[PATCH] wbemprox: add ProductType to win32_operatingsystem class
by Louis Lenders 15 Mar '21

15 Mar '21

https://bugs.winehq.org/show_bug.cgi?id=50805 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index dbf9173d21d..3922331f650 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -247,6 +247,7 @@ static const struct column col_operatingsystem[] = { L"OSProductSuite", CIM_UINT32 }, { L"OSType", CIM_UINT16 }, { L"Primary", CIM_BOOLEAN }, + { L"ProductType", CIM_UINT32 }, { L"SerialNumber", CIM_STRING|COL_FLAG_DYNAMIC }, { L"ServicePackMajorVersion", CIM_UINT16 }, { L"ServicePackMinorVersion", CIM_UINT16 }, @@ -659,6 +660,7 @@ struct record_operatingsystem UINT32 osproductsuite; UINT16 ostype; int primary; + UINT32 producttype; const WCHAR *serialnumber; UINT16 servicepackmajor; UINT16 servicepackminor; @@ -3574,6 +3576,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec->osproductsuite = 2461140; /* Windows XP Professional */ rec->ostype = 18; /* WINNT */ rec->primary = -1; + rec->producttype = 1; rec->serialnumber = get_osserialnumber(); rec->servicepackmajor = ver.wServicePackMajor; rec->servicepackminor = ver.wServicePackMinor; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index f650418e51f..a79bc759bea 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1299,6 +1299,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) check_property( obj, L"CurrentTimeZone", VT_I2, CIM_SINT16 ); check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); check_property( obj, L"OSType", VT_I4, CIM_UINT16 ); + check_property( obj, L"ProductType", VT_I4, CIM_UINT32 ); check_property( obj, L"ServicePackMajorVersion", VT_I4, CIM_UINT16 ); check_property( obj, L"ServicePackMinorVersion", VT_I4, CIM_UINT16 ); check_property( obj, L"SuiteMask", VT_I4, CIM_UINT32 ); -- 2.30.1

2 1

[PATCH 1/5] dwrite: Test simulations mask bitwise for consistency.
by Nikolay Sivov 15 Mar '21

15 Mar '21

This has no functional impact. Internal function is only called with one bit set at a time, but there is no reason to make it more confusing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 14be1b9fc1b..4e2917854ba 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4022,7 +4022,7 @@ static HRESULT init_font_data(const struct fontface_desc *desc, struct dwrite_fo return S_OK; } -static HRESULT init_font_data_from_font(const struct dwrite_font_data *src, DWRITE_FONT_SIMULATIONS sim, +static HRESULT init_font_data_from_font(const struct dwrite_font_data *src, DWRITE_FONT_SIMULATIONS simulations, const WCHAR *facenameW, struct dwrite_font_data **ret) { struct dwrite_font_data *data; @@ -4035,10 +4035,10 @@ static HRESULT init_font_data_from_font(const struct dwrite_font_data *src, DWRI *data = *src; data->refcount = 1; - data->simulations |= sim; - if (sim == DWRITE_FONT_SIMULATIONS_BOLD) + data->simulations |= simulations; + if (simulations & DWRITE_FONT_SIMULATIONS_BOLD) data->weight = DWRITE_FONT_WEIGHT_BOLD; - else if (sim == DWRITE_FONT_SIMULATIONS_OBLIQUE) + if (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE) data->style = DWRITE_FONT_STYLE_OBLIQUE; memset(data->info_strings, 0, sizeof(data->info_strings)); data->names = NULL; -- 2.30.2

1 4

[PATCH] ws2_32: Add a suitable break in the loop for WSASocketW.
by Jiangyi Chen 15 Mar '21

15 Mar '21

2 1

[PATCH v2] gdi32: Font replacements should use original family name.
by Haidong Yu 15 Mar '21

15 Mar '21

1 0

[PATCH] devenum: Avoid the comma operator
by Michael Stefaniuc 14 Mar '21

14 Mar '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/devenum/mediacatenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index f097c580261..b24e24f7f31 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -186,7 +186,7 @@ static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, reg_pins[1].nMediaTypes = output_count; reg_pins[1].lpMediaType = reg_types + count; reg_filter.dwVersion = 2; - reg_filter.dwMerit = MERIT_NORMAL + 0x800, + reg_filter.dwMerit = MERIT_NORMAL + 0x800; reg_filter.cPins2 = 2; reg_filter.rgPins2 = reg_pins; -- 2.26.2

2 1

[PATCH] mshtml: Print the debug string and not the pointer to it
by Michael Stefaniuc 14 Mar '21

14 Mar '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/nsio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 9ba5a6c8612..1ffc6325725 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2182,7 +2182,7 @@ static nsresult NSAPI nsCacheInfoChannel_GetCacheTokenCachedCharset(nsICacheInfo static nsresult NSAPI nsCacheInfoChannel_SetCacheTokenCachedCharset(nsICacheInfoChannel *iface, const nsACString *p) { nsChannel *This = impl_from_nsICacheInfoChannel(iface); - FIXME("(%p)->(%p)\n", This, debugstr_nsacstr(p)); + FIXME("(%p)->(%s)\n", This, debugstr_nsacstr(p)); return E_NOTIMPL; } -- 2.26.2

1 0