November 2018 - Wine-Commits

Francois Gouget : testbot: Only quote strings when needed in ShQuote().
by Alexandre Julliard Nov. 19, 2018

Nov. 19, 2018

Module: tools Branch: master Commit: ce79f49524f4d18c6107c7a6fa8a72b7b635beab URL: https://source.winehq.org/git/tools.git/?a=commit;h=ce79f49524f4d18c6107c7a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 19 16:37:20 2018 +0100 testbot: Only quote strings when needed in ShQuote(). Based on a short whitelist of safe characters. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Utils.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 6681072..a80f809 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -248,6 +248,8 @@ in another context. sub ShQuote($) { my ($Str)=@_; + return $Str if ($Str =~ /^[a-zA-Z0-9\/=:.,+_-]+$/); + $Str =~ s%\\%\\\\%g; $Str =~ s%\$%\\\$%g; $Str =~ s%\"%\\\"%g; @@ -269,7 +271,7 @@ See also ShQuote(). sub ShArgv2Cmd(@) { - return join(' ', map { /[^a-zA-Z0-9\/.,+_-]/ ? ShQuote($_) : $_ } @_); + return join(' ', map { ShQuote($_) } @_); } 1;

1 0

Francois Gouget : testbot: Add a 'lang' option for the Wine missions.
by Alexandre Julliard Nov. 19, 2018

Nov. 19, 2018

Module: tools Branch: master Commit: 2d261b12f25ce5622e73a2c37ccc3a03f14813fd URL: https://source.winehq.org/git/tools.git/?a=commit;h=2d261b12f25ce5622e73a2c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 19 00:53:32 2018 +0100 testbot: Add a 'lang' option for the Wine missions. Appending ',lang=xxx' sets $LANG when running the Wine tests. This allows running the Wine tests in multiple locales by creating multiple missions with different lang values. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 7 +++++ testbot/lib/WineTestBot/LogUtils.pm | 59 +++++++++++++++++++++++++---------- testbot/lib/WineTestBot/Missions.pm | 45 ++++++++++++++++++++++++-- testbot/lib/WineTestBot/StepsTasks.pm | 18 +---------- testbot/lib/WineTestBot/Utils.pm | 15 ++++++++- testbot/web/admin/VMDetails.pl | 1 + 6 files changed, 108 insertions(+), 37 deletions(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 06fb3d8..4dda8d5 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -334,6 +334,13 @@ sub SetupWineEnvironment($) $ENV{WINEPREFIX} = "$DataDir/wineprefix-$BaseName"; $ENV{DISPLAY} ||= ":0.0"; + my $Lang = $Mission->{lang} || "en_US"; + if ($Lang =~ /^[a-zA-Z0-9\(a)_.-]+$/) + { + $Lang .= ".UTF-8" if ($Lang !~ /\./); + $ENV{LANG} = $Lang; + } + return $BaseName; } diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index f142982..fee4278 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -36,6 +36,7 @@ use Algorithm::Diff; use File::Basename; use WineTestBot::Config; # For $MaxUnitSize +use WineTestBot::Utils; # For LocaleName() # @@ -578,31 +579,47 @@ sub GetLogFileNames($;$) { my ($Dir, $IncludeOld) = @_; - my @Candidates = ("exe32.report", "exe64.report", - "win32.report", "wow32.report", "wow64.report", - "log"); - push @Candidates, "old_log" if ($IncludeOld); + my @Globs = qw(exe32.report exe32_*.report + exe64.report exe64_*.report + win32.report win32_*.report + wow32.report wow32_*.report + wow64.report wow64_*.report + log); + push @Globs, "old_log" if ($IncludeOld); - my @Logs; - foreach my $FileName (@Candidates) + my (@Logs, %Seen); + foreach my $Glob (@Globs) { - if ((-f "$Dir/$FileName" and !-z "$Dir/$FileName") or - (-f "$Dir/$FileName.err" and !-z "$Dir/$FileName.err")) + foreach my $FileName (glob("'$Dir/$Glob*'")) { - push @Logs, $FileName; + my $LogName = basename($FileName); + if ($LogName !~ s/\.err$// and $LogName !~ /\.report$/ and + $LogName ne $Glob) # 'log' case + { + # Not a valid log filename (where does this file come from?) + next; + } + next if ($Seen{$LogName}); + $Seen{$LogName} = 1; + + if ((-f "$Dir/$LogName" and !-z "$Dir/$LogName") or + (-f "$Dir/$LogName.err" and !-z "$Dir/$LogName.err")) + { + push @Logs, $LogName; + } } } return \@Logs; } my %_LogFileLabels = ( - "exe32.report" => "32 bit report", - "exe64.report" => "64 bit report", - "win32.report" => "32 bit report", - "wow32.report" => "32 bit WoW report", - "wow64.report" => "64 bit WoW report", - "log" => "task log", - "old_log" => "old logs", + "exe32.report" => '32 bit%s report', + "exe64.report" => '64 bit%s report', + "win32.report" => '32 bit%s report', + "wow32.report" => '32 bit%s WoW report', + "wow64.report" => '64 bit%s WoW report', + "log" => 'task%s log', + "old_log" => 'old%s logs', ); =pod @@ -618,7 +635,15 @@ Returns a user-friendly description of the content of the specified log file. sub GetLogLabel($) { my ($LogFileName) = @_; - return $_LogFileLabels{$LogFileName}; + + my $Extra = ""; + if ($LogFileName =~ /^([^_]+)_(.*)\.report$/) + { + $LogFileName = "$1.report"; + $Extra = " ". LocaleName($2); + } + my $Label = $_LogFileLabels{$LogFileName}; + return defined $Label ? sprintf($Label, $Extra) : $LogFileName; } diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index 0dc812d..dcaeb31 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -26,9 +26,12 @@ WineTestBot::Missions - Missions parser and helper functions =cut use Exporter 'import'; -our @EXPORT = qw(DumpMissions GetMissionBaseName ParseMissionStatement +our @EXPORT = qw(DumpMissions GetMissionBaseName GetTaskMissionDescription + ParseMissionStatement MergeMissionStatementTasks SplitMissionStatementTasks); +use WineTestBot::Utils; + sub DumpMissions($$) { @@ -89,7 +92,45 @@ sub ParseMissionStatement($) sub GetMissionBaseName($) { my ($Mission) = @_; - return $Mission->{Build}; + + my $BaseName = $Mission->{Build}; + + # Option values may be tainted if they come from the command line + my $Lang = $Mission->{lang} || ""; + $BaseName .= "_$1" if ($Lang =~ /^([a-zA-Z0-9\(a)_.-]+)$/) # untaint + + return $BaseName; +} + +sub GetTaskMissionDescription($) +{ + my ($TaskMission) = @_; + + my $Builds = $TaskMission->{Builds}; + my $Description = + $Builds->{build} ? "build" : + ($Builds->{exe64} and ($Builds->{exe32} or $Builds->{exe32})) ? "32 & 64 bit executable" : + $Builds->{exe32} ? "32 bit executable" : + $Builds->{exe64} ? "64 bit executable" : + ($Builds->{wow64} and ($Builds->{win32} or $Builds->{wow32})) ? "32 & 64 bit" : + $Builds->{win32} ? "32 bit" : + $Builds->{wow32} ? "32 bit WoW" : + "64 bit WoW"; + + my $Lang; + foreach my $Mission (@{$TaskMission->{Missions}}) + { + next if (!$Mission->{lang}); + if (defined $Lang) + { + $Description .= " + Locales"; + $Lang = undef; + last; + } + $Lang = $Mission->{lang}; + } + $Description .= " ". LocaleName($Lang) if ($Lang); + return $Description; } sub MergeMissionStatementTasks($) diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 8128bf9..4a803e7 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -91,23 +91,7 @@ sub GetTitle($) my ($ErrMessage, $Missions) = ParseMissionStatement($self->Missions); if (!defined $ErrMessage and @$Missions == 1) { - my $Builds = $Missions->[0]->{Builds}; - if ($Builds->{build}) - { - push @TitleParts, "build"; - } - elsif ($Builds->{wow64} and ($Builds->{win32} or $Builds->{wow32})) - { - push @TitleParts, "32 & 64 bit"; - } - elsif ($Builds->{win32} or $Builds->{wow32}) - { - push @TitleParts, "32 bit"; - } - elsif ($Builds->{wow64}) - { - push @TitleParts, "64 bit"; - } + push @TitleParts, GetTaskMissionDescription($Missions->[0]); } } if ($self->Type ne "suite" and $self->CmdLineArg) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 6fa0ccc..6681072 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -30,9 +30,11 @@ use Exporter 'import'; our @EXPORT = qw(MakeSecureURL SecureConnection GenerateRandomString OpenNewFile CreateNewFile CreateNewLink CreateNewDir DurationToString BuildEMailRecipient IsValidFileName - BuildTag SanitizeTag ShQuote ShArgv2Cmd); + BuildTag SanitizeTag LocaleName ShQuote ShArgv2Cmd); use Fcntl; +use Locale::Language; +use Locale::Country; use WineTestBot::Config; @@ -104,6 +106,17 @@ sub BuildEMailRecipient($$) return $Recipient; } +sub LocaleName($) +{ + my ($Locale) = @_; + + if ($Locale =~ /^([a-z]+)_([A-Z]+)(?:\.|$)/) + { + return (code2language($1) || $1) .":". (code2country($2) || $2); + } + return $Locale; +} + # # Temporary file helpers diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 4b7799a..4dd9e25 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -79,6 +79,7 @@ sub GenerateFooter($) print "The supported builds are build for build VMs; exe32 and exe64 for Windows VMs; win32, wow32 and wow64 for Wine VMs.\n"; print "On Wine VMs: \n"; print "The test option can be set to build to only test building, test to only rerun patched tests, module to rerun all of a patched dll or program's tests, or all to always rerun all the tests. \n"; + print "The lang option can be set to run the tests in the specified \$LANG locale. The default is en_US (.UTF-8 can be omitted). \n"; print "If set, the nosubmit option specifies that the WineTest results should not be published online.\n"; print "</td></tr></tbody>\n"; print "</table></div>\n";

1 0

Józef Kucia : d3d11/tests: Add test for readback from 1D array texture.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: 48a1c12d9b7886d5620f27d4d529e6acad68b14a URL: https://source.winehq.org/git/wine.git/?a=commit;h=48a1c12d9b7886d5620f27d4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 16 13:02:11 2018 +0100 d3d11/tests: Add test for readback from 1D array texture. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index aeba9ef..5c6dfe0 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12375,6 +12375,16 @@ static void test_copy_subresource_region_1d(void) } release_resource_readback(&rb); + get_texture1d_readback(texture1d, 0, &rb); + for (i = 0; i < texture1d_desc.Width; ++i) + { + color = get_readback_color(&rb, i, 0, 0); + ok(compare_color(color, bitmap_data[i], 1), + "Got color 0x%08x at %u, expected 0x%08x.\n", + color, i, bitmap_data[i]); + } + release_resource_readback(&rb); + ID3D11Texture1D_Release(texture1d); ID3D11Texture2D_Release(texture2d); release_test_context(&test_context);

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_R10G10B10A2_UINT.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: 4bca8dbe0a025b898f4d423157be14c4b2366027 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bca8dbe0a025b898f4d4231… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 16 13:02:09 2018 +0100 wined3d: Add support for WINED3DFMT_R10G10B10A2_UINT. Unfortunately, GL_RGB10_A2UI is not supported for buffer textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1fd3f32..a0abe6a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1531,6 +1531,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE, NULL}, + {WINED3DFMT_R10G10B10A2_UINT, GL_RGB10_A2UI, GL_RGB10_A2UI, 0, + GL_RGBA_INTEGER, GL_UNSIGNED_INT_2_10_10_10_REV, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, + ARB_TEXTURE_RGB10_A2UI, NULL}, {WINED3DFMT_R10G10B10A2_UNORM, GL_RGB10_A2, GL_RGB10_A2, 0, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING

1 0

Józef Kucia : wined3d: Fix downloading data for 1D array textures.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: a586d4e880ba3a4832b653bec7bcea304e002a87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a586d4e880ba3a4832b653be… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 16 13:02:10 2018 +0100 wined3d: Fix downloading data for 1D array textures. glGetTexImage() downloads data for all layers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e01becd..05f210f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2159,7 +2159,7 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s } } -static void texture2d_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, +static void texture_download_data_slow_path(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, const struct wined3d_bo_address *data) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -2186,7 +2186,7 @@ static void texture2d_download_data(struct wined3d_texture *texture, unsigned in target = wined3d_texture_gl_get_sub_resource_target(wined3d_texture_gl(texture), sub_resource_idx); level = sub_resource_idx % texture->level_count; - if (target == GL_TEXTURE_2D_ARRAY) + if (target == GL_TEXTURE_1D_ARRAY || target == GL_TEXTURE_2D_ARRAY) { if (format_gl->f.download) { @@ -2401,12 +2401,12 @@ void wined3d_texture_download_data(struct wined3d_texture *texture, unsigned int target = wined3d_texture_gl_get_sub_resource_target(wined3d_texture_gl(texture), sub_resource_idx); level = sub_resource_idx % texture->level_count; - if (texture->resource.type == WINED3D_RTYPE_TEXTURE_2D - && (target == GL_TEXTURE_2D_ARRAY || format_gl->f.conv_byte_count + if ((texture->resource.type == WINED3D_RTYPE_TEXTURE_2D + && (target == GL_TEXTURE_2D_ARRAY || format_gl->f.conv_byte_count || texture->flags & (WINED3D_TEXTURE_CONVERTED | WINED3D_TEXTURE_COND_NP2_EMULATED))) + || target == GL_TEXTURE_1D_ARRAY) { - /* 2D-specific special cases. */ - texture2d_download_data(texture, sub_resource_idx, context, data); + texture_download_data_slow_path(texture, sub_resource_idx, context, data); return; }

1 0

Józef Kucia : d3d10core/tests: Add test for readback from 1D array texture.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: 2a356bc102b669c327f2a6ffc62f9024e95fd6a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a356bc102b669c327f2a6ff… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 16 13:02:12 2018 +0100 d3d10core/tests: Add test for readback from 1D array texture. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 9aae322..98210546 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -9612,6 +9612,16 @@ static void test_copy_subresource_region_1d(void) } release_resource_readback(&rb); + get_texture1d_readback(texture1d, 0, &rb); + for (i = 0; i < texture1d_desc.Width; ++i) + { + color = get_readback_color(&rb, i, 0); + ok(compare_color(color, bitmap_data[i], 1), + "Got color 0x%08x at %u, expected 0x%08x.\n", + color, i, bitmap_data[i]); + } + release_resource_readback(&rb); + ID3D10Texture1D_Release(texture1d); ID3D10Texture2D_Release(texture2d); release_test_context(&test_context);

1 0

Dmitry Timoshkov : crypt32: Make sure that the provider supports algorithm of the message being decoded.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: 2ef62f90853d9903cdded2442e382b89a4c3a55f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ef62f90853d9903cdded244… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 16 15:28:07 2018 +0300 crypt32: Make sure that the provider supports algorithm of the message being decoded. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/msg.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 9fe63e2..4132390 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -926,17 +926,25 @@ typedef struct _CSignedMsgData * been constructed. */ static BOOL CSignedMsgData_ConstructSignerHandles(CSignedMsgData *msg_data, - DWORD signerIndex, HCRYPTPROV crypt_prov) + DWORD signerIndex, HCRYPTPROV *crypt_prov, DWORD *flags) { ALG_ID algID; BOOL ret; algID = CertOIDToAlgId( msg_data->info->rgSignerInfo[signerIndex].HashAlgorithm.pszObjId); - ret = CryptCreateHash(crypt_prov, algID, 0, 0, + + if (!*crypt_prov) + { + *crypt_prov = I_CryptGetDefaultCryptProv(algID); + if (!*crypt_prov) return FALSE; + *flags &= ~CMSG_CRYPT_RELEASE_CONTEXT_FLAG; + } + + ret = CryptCreateHash(*crypt_prov, algID, 0, 0, &msg_data->signerHandles->contentHash); if (ret && msg_data->info->rgSignerInfo[signerIndex].AuthAttrs.cAttr > 0) - ret = CryptCreateHash(crypt_prov, algID, 0, 0, + ret = CryptCreateHash(*crypt_prov, algID, 0, 0, &msg_data->signerHandles->authAttrHash); return ret; } @@ -1434,7 +1442,7 @@ static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags, if (ret) { ret = CSignedMsgData_ConstructSignerHandles( - &msg->msg_data, i, info->rgSigners[i].hCryptProv); + &msg->msg_data, i, &info->rgSigners[i].hCryptProv, &dwFlags); if (dwFlags & CMSG_CRYPT_RELEASE_CONTEXT_FLAG) CryptReleaseContext(info->rgSigners[i].hCryptProv, 0); @@ -2092,7 +2100,7 @@ static void CDecodeMsg_Close(HCRYPTMSG hCryptMsg) { CDecodeMsg *msg = hCryptMsg; - if (msg->base.open_flags & CMSG_CRYPT_RELEASE_CONTEXT_FLAG) + if (msg->crypt_prov && msg->base.open_flags & CMSG_CRYPT_RELEASE_CONTEXT_FLAG) CryptReleaseContext(msg->crypt_prov, 0); switch (msg->type) { @@ -2343,6 +2351,14 @@ static BOOL CDecodeMsg_FinalizeHashedContent(CDecodeMsg *msg, &size); if (ret) algID = CertOIDToAlgId(hashAlgoID->pszObjId); + + if (!msg->crypt_prov) + { + msg->crypt_prov = I_CryptGetDefaultCryptProv(algID); + if (msg->crypt_prov) + msg->base.open_flags &= ~CMSG_CRYPT_RELEASE_CONTEXT_FLAG; + } + ret = CryptCreateHash(msg->crypt_prov, algID, 0, 0, &msg->u.hash); if (ret) { @@ -2389,7 +2405,7 @@ static BOOL CDecodeMsg_FinalizeSignedContent(CDecodeMsg *msg, ret = CSignedMsgData_AllocateHandles(&msg->u.signed_data); for (i = 0; ret && i < msg->u.signed_data.info->cSignerInfo; i++) ret = CSignedMsgData_ConstructSignerHandles(&msg->u.signed_data, i, - msg->crypt_prov); + &msg->crypt_prov, &msg->base.open_flags); if (ret) { CRYPT_DATA_BLOB *content; @@ -3555,13 +3571,7 @@ HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, CDecodeMsg_Close, CDecodeMsg_GetParam, CDecodeMsg_Update, CDecodeMsg_Control); msg->type = dwMsgType; - if (hCryptProv) - msg->crypt_prov = hCryptProv; - else - { - msg->crypt_prov = I_CryptGetDefaultCryptProv(0); - msg->base.open_flags &= ~CMSG_CRYPT_RELEASE_CONTEXT_FLAG; - } + msg->crypt_prov = hCryptProv; memset(&msg->u, 0, sizeof(msg->u)); msg->msg_data.cbData = 0; msg->msg_data.pbData = NULL;

1 0

André Hentschel : ntdll: Add more traces to raise_exception on ARM64.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: b78a5db2dc6147ed8b62bdcff210a78f448e0fa9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b78a5db2dc6147ed8b62bdcf… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Nov 15 19:50:45 2018 +0100 ntdll: Add more traces to raise_exception on ARM64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46126 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 0ab402e..4d2d127 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -545,6 +545,9 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f { DWORD c; + TRACE( "code=%x flags=%x addr=%p pc=%lx tid=%04x\n", + rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, + context->Pc, GetCurrentThreadId() ); for (c = 0; c < rec->NumberParameters; c++) TRACE( " info[%d]=%016lx\n", c, rec->ExceptionInformation[c] ); if (rec->ExceptionCode == EXCEPTION_WINE_STUB) @@ -560,7 +563,24 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f } else { - /* FIXME: dump context */ + TRACE(" x0=%016lx x1=%016lx x2=%016lx x3=%016lx\n", + context->u.s.X0, context->u.s.X1, context->u.s.X2, context->u.s.X3 ); + TRACE(" x4=%016lx x5=%016lx x6=%016lx x7=%016lx\n", + context->u.s.X4, context->u.s.X5, context->u.s.X6, context->u.s.X7 ); + TRACE(" x8=%016lx x9=%016lx x10=%016lx x11=%016lx\n", + context->u.s.X8, context->u.s.X9, context->u.s.X10, context->u.s.X11 ); + TRACE(" x12=%016lx x13=%016lx x14=%016lx x15=%016lx\n", + context->u.s.X12, context->u.s.X13, context->u.s.X14, context->u.s.X15 ); + TRACE(" x16=%016lx x17=%016lx x18=%016lx x19=%016lx\n", + context->u.s.X16, context->u.s.X17, context->u.s.X18, context->u.s.X19 ); + TRACE(" x20=%016lx x21=%016lx x22=%016lx x23=%016lx\n", + context->u.s.X20, context->u.s.X21, context->u.s.X22, context->u.s.X23 ); + TRACE(" x24=%016lx x25=%016lx x26=%016lx x27=%016lx\n", + context->u.s.X24, context->u.s.X25, context->u.s.X26, context->u.s.X27 ); + TRACE(" x28=%016lx fp=%016lx lr=%016lx sp=%016lx\n", + context->u.s.X28, context->u.s.Fp, context->u.s.Lr, context->Sp ); + TRACE(" pc=%016lx\n", + context->Pc ); } status = send_debug_event( rec, TRUE, context );

1 0

Gabriel Ivăncescu : user32/listbox: Return 0 from LB_GETITEMDATA for LBS_NODATA listboxes.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: cab591c59b0ceab26a7d3654eab64e655969645a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cab591c59b0ceab26a7d3654… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 15 11:46:20 2018 +0200 user32/listbox: Return 0 from LB_GETITEMDATA for LBS_NODATA listboxes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 2 +- dlls/user32/tests/listbox.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 044d73d..d46f685 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2684,7 +2684,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - return descr->items[wParam].data; + return (descr->style & LBS_NODATA) ? 0 : descr->items[wParam].data; case LB_SETITEMDATA: if (((INT)wParam < 0) || ((INT)wParam >= descr->nb_items)) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 3c3de71..2115ee4 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -2099,7 +2099,6 @@ static void test_LBS_NODATA(void) ok(!memcmp(&data, &zero_data, sizeof(data)), "Unexpected item data.\n"); ret = SendMessageA(listbox, LB_GETITEMDATA, valid_idx[i], 0); - todo_wine ok(ret == 0, "Unexpected return value %d.\n", ret); }

1 0

Gabriel Ivăncescu : user32/listbox: Always retrieve zeros in LB_GETTEXT for LBS_NODATA listboxes.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: c980edc2270d70a3378df4561c2494e80512f222 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c980edc2270d70a3378df456… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 15 11:46:19 2018 +0200 user32/listbox: Always retrieve zeros in LB_GETTEXT for LBS_NODATA listboxes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 3 ++- dlls/user32/tests/listbox.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 5746293..044d73d 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -799,7 +799,8 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL __ENDTRY } else { if (buffer) - *((ULONG_PTR *)buffer) = descr->items[index].data; + *((ULONG_PTR *)buffer) = (descr->style & LBS_NODATA) + ? 0 : descr->items[index].data; len = sizeof(ULONG_PTR); } return len; diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 658893a..3c3de71 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -2096,7 +2096,6 @@ static void test_LBS_NODATA(void) memset(&data, 0xee, sizeof(data)); ret = SendMessageA(listbox, LB_GETTEXT, valid_idx[i], (LPARAM)&data); ok(ret == sizeof(data), "Unexpected return value %d.\n", ret); - todo_wine ok(!memcmp(&data, &zero_data, sizeof(data)), "Unexpected item data.\n"); ret = SendMessageA(listbox, LB_GETITEMDATA, valid_idx[i], 0);

1 0