wine-commits November 2018

wine-commits@winehq.org

2 participants
951 discussions

Francois Gouget : testbot: Build VMs expect their missions to be a list of builds.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: tools Branch: master Commit: 6cab1726931dac09c043a5bd86e90209c15fc294 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6cab1726931dac09c043a5b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 19 16:36:55 2018 +0100 testbot: Build VMs expect their missions to be a list of builds. So replace 'build' with the actual builds that should be run. A consequence is that build VMs too may have more than one mission since they can build both exe32 and exe64 binaries in one go. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index e7cd277..6a08bc1 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -315,7 +315,7 @@ sub PutColValue($$$) } my $_SupportedMissions = { - "build" => { "build" => 1 }, + "build" => { "exe32" => 1, "exe64" => 1 }, "win32" => { "exe32" => 1 }, "win64" => { "exe32" => 1, "exe64" => 1 }, "wine" => { "win32" => 1, "wow32" => 1, "wow64" => 1 }, @@ -336,9 +336,10 @@ sub Validate($) return ("Missions", $ErrMessage) if (defined $ErrMessage); foreach my $TaskMissions (@$Missions) { - if ($self->Type ne "wine" and @{$TaskMissions->{Missions}} > 1) + if ($self->Type !~ /^(?:build|wine)$/ and + @{$TaskMissions->{Missions}} > 1) { - return ("Missions", "Only wine VMs can handle more than one mission per task"); + return ("Missions", "Only the build and wine VMs can handle more than one mission per task"); } foreach my $Mission (@{$TaskMissions->{Missions}}) {

1 0

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

19 Nov '18

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

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

16 Nov '18

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

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

16 Nov '18

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

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

16 Nov '18

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: Fix downloading data for 1D array textures.
by Alexandre Julliard 16 Nov '18

16 Nov '18

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 : wined3d: Add support for WINED3DFMT_R10G10B10A2_UINT.
by Alexandre Julliard 16 Nov '18

16 Nov '18

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

Nikolay Sivov : msvcrt: Add _iswxdigit_l().
by Alexandre Julliard 16 Nov '18

16 Nov '18

Module: wine Branch: master Commit: 311a1320904de987913c966db5c457cb4bc665fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=311a1320904de987913c966d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 16 09:31:57 2018 +0300 msvcrt: Add _iswxdigit_l(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index 920d962..0a61576 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -33,7 +33,7 @@ @ cdecl _iswpunct_l(long ptr) ucrtbase._iswpunct_l @ cdecl _iswspace_l(long ptr) ucrtbase._iswspace_l @ cdecl _iswupper_l(long ptr) ucrtbase._iswupper_l -@ stub _iswxdigit_l +@ cdecl _iswxdigit_l(long ptr) ucrtbase._iswxdigit_l @ cdecl _isxdigit_l(long ptr) ucrtbase._isxdigit_l @ cdecl _memccpy(ptr ptr long long) ucrtbase._memccpy @ cdecl _memicmp(str str long) ucrtbase._memicmp diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index de81eb8..151d6ae 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1029,7 +1029,7 @@ @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l -@ stub _iswxdigit_l +@ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l @ cdecl _itoa(long ptr long) MSVCRT__itoa @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 58e4632..abb6ada 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1375,7 +1375,7 @@ @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l -@ stub _iswxdigit_l +@ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l @ cdecl _itoa(long ptr long) MSVCRT__itoa @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index db49594..8b7b154 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1381,7 +1381,7 @@ @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l -@ stub _iswxdigit_l +@ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l @ cdecl _itoa(long ptr long) MSVCRT__itoa @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 749deb8..d293900 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1246,7 +1246,7 @@ @ cdecl _iswpunct_l(long ptr) msvcr120._iswpunct_l @ cdecl _iswspace_l(long ptr) msvcr120._iswspace_l @ cdecl _iswupper_l(long ptr) msvcr120._iswupper_l -@ stub _iswxdigit_l +@ cdecl _iswxdigit_l(long ptr) msvcr120._iswxdigit_l @ cdecl _isxdigit_l(long ptr) msvcr120._isxdigit_l @ cdecl _itoa(long ptr long) msvcr120._itoa @ cdecl _itoa_s(long ptr long long) msvcr120._itoa_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8004353..aa89792 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -701,7 +701,7 @@ @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l -@ stub _iswxdigit_l +@ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l @ cdecl _itoa(long ptr long) MSVCRT__itoa @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index bf0fc97..cf604b7 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -679,7 +679,7 @@ @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l -@ stub _iswxdigit_l +@ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l @ cdecl _itoa(long ptr long) MSVCRT__itoa @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e38647f..e4d0aad 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -644,7 +644,7 @@ @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l -# stub _iswxdigit_l(long ptr) +@ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l @ cdecl _itoa(long ptr long) MSVCRT__itoa @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index caf9b6a..27c9eb8 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1967,6 +1967,14 @@ INT CDECL MSVCRT_iswxdigit( MSVCRT_wchar_t wc ) } /********************************************************************* + * _iswxdigit_l (MSVCRT.@) + */ +int CDECL MSVCRT__iswxdigit_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +{ + return isxdigitW( wc ); +} + +/********************************************************************* * _iswctype_l (MSVCRT.@) */ INT CDECL MSVCRT__iswctype_l( MSVCRT_wchar_t wc, MSVCRT_wctype_t type, MSVCRT__locale_t locale ) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index d68ce7c..1f0975d 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -520,7 +520,7 @@ @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l -@ stub _iswxdigit_l +@ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l @ cdecl _itoa(long ptr long) MSVCRT__itoa @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s

1 0

Nikolay Sivov : msvcrt: Add _iswprint_l().
by Alexandre Julliard 16 Nov '18

16 Nov '18

Module: wine Branch: master Commit: e29fbaeca8458a5ad55c94da92a3446d6c228eb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e29fbaeca8458a5ad55c94da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 16 09:31:56 2018 +0300 msvcrt: Add _iswprint_l(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index c29e510..920d962 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -29,7 +29,7 @@ @ cdecl _iswdigit_l(long ptr) ucrtbase._iswdigit_l @ cdecl _iswgraph_l(long ptr) ucrtbase._iswgraph_l @ cdecl _iswlower_l(long ptr) ucrtbase._iswlower_l -@ stub _iswprint_l +@ cdecl _iswprint_l(long ptr) ucrtbase._iswprint_l @ cdecl _iswpunct_l(long ptr) ucrtbase._iswpunct_l @ cdecl _iswspace_l(long ptr) ucrtbase._iswspace_l @ cdecl _iswupper_l(long ptr) ucrtbase._iswupper_l diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index afc9e0f..de81eb8 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1025,7 +1025,7 @@ @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l @ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l -@ stub _iswprint_l +@ cdecl _iswprint_l(long ptr) MSVCRT__iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 24def8e..58e4632 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1371,7 +1371,7 @@ @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l @ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l -@ stub _iswprint_l +@ cdecl _iswprint_l(long ptr) MSVCRT__iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 2f559f1..db49594 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1377,7 +1377,7 @@ @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l @ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l -@ stub _iswprint_l +@ cdecl _iswprint_l(long ptr) MSVCRT__iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index bfb1046..749deb8 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1242,7 +1242,7 @@ @ cdecl _iswdigit_l(long ptr) msvcr120._iswdigit_l @ cdecl _iswgraph_l(long ptr) msvcr120._iswgraph_l @ cdecl _iswlower_l(long ptr) msvcr120._iswlower_l -@ stub _iswprint_l +@ cdecl _iswprint_l(long ptr) msvcr120._iswprint_l @ cdecl _iswpunct_l(long ptr) msvcr120._iswpunct_l @ cdecl _iswspace_l(long ptr) msvcr120._iswspace_l @ cdecl _iswupper_l(long ptr) msvcr120._iswupper_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 26c45cf..8004353 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -697,7 +697,7 @@ @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l @ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l -@ stub _iswprint_l +@ cdecl _iswprint_l(long ptr) MSVCRT__iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 653c156..bf0fc97 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -675,7 +675,7 @@ @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l @ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l -@ stub _iswprint_l +@ cdecl _iswprint_l(long ptr) MSVCRT__iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 40326a7..e38647f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -640,7 +640,7 @@ @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l @ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l -# stub _iswprint_l(long ptr) +@ cdecl _iswprint_l(long ptr) MSVCRT__iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 386764b..caf9b6a 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1903,6 +1903,14 @@ INT CDECL MSVCRT_iswprint( MSVCRT_wchar_t wc ) } /********************************************************************* + * _iswprint_l (MSVCRT.@) + */ +int CDECL MSVCRT__iswprint_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +{ + return isprintW( wc ); +} + +/********************************************************************* * _iswpunct_l (MSVCRT.@) */ INT CDECL MSVCRT__iswpunct_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2090e59..d68ce7c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -516,7 +516,7 @@ @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l @ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l -@ stub _iswprint_l +@ cdecl _iswprint_l(long ptr) MSVCRT__iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l

1 0

Nikolay Sivov : msvcrt: Add _iswcntrl_l().
by Alexandre Julliard 16 Nov '18

16 Nov '18

Module: wine Branch: master Commit: 07d5635d98784e6ba6d674dc5a5934e0c25648c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07d5635d98784e6ba6d674dc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 16 09:31:55 2018 +0300 msvcrt: Add _iswcntrl_l(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index 6b01b2b..c29e510 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -22,7 +22,7 @@ @ cdecl _iswalnum_l(long ptr) ucrtbase._iswalnum_l @ cdecl _iswalpha_l(long ptr) ucrtbase._iswalpha_l @ cdecl _iswblank_l(long ptr) ucrtbase._iswblank_l -@ stub _iswcntrl_l +@ cdecl _iswcntrl_l(long ptr) ucrtbase._iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) ucrtbase._iswctype_l diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 5c0506c..afc9e0f 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1018,7 +1018,7 @@ @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l -@ stub _iswcntrl_l +@ cdecl _iswcntrl_l(long ptr) MSVCRT__iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 757ed7c..24def8e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1364,7 +1364,7 @@ @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l -@ stub _iswcntrl_l +@ cdecl _iswcntrl_l(long ptr) MSVCRT__iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 52a3155..2f559f1 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1370,7 +1370,7 @@ @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l @ cdecl _iswblank_l(long ptr) MSVCRT__iswblank_l -@ stub _iswcntrl_l +@ cdecl _iswcntrl_l(long ptr) MSVCRT__iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index db607e0..bfb1046 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1235,7 +1235,7 @@ @ cdecl _iswalnum_l(long ptr) msvcr120._iswalnum_l @ cdecl _iswalpha_l(long ptr) msvcr120._iswalpha_l @ cdecl _iswblank_l(long ptr) msvcr120._iswblank_l -@ stub _iswcntrl_l +@ cdecl _iswcntrl_l(long ptr) msvcr120._iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) msvcr120._iswctype_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index baf89f5..26c45cf 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -690,7 +690,7 @@ @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l -@ stub _iswcntrl_l +@ cdecl _iswcntrl_l(long ptr) MSVCRT__iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 79dab2e..653c156 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -668,7 +668,7 @@ @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l -@ stub _iswcntrl_l +@ cdecl _iswcntrl_l(long ptr) MSVCRT__iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index dbff964..40326a7 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -635,7 +635,7 @@ @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l -# stub _iswcntrl_l(long ptr) +@ cdecl _iswcntrl_l(long ptr) MSVCRT__iswcntrl_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l @ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 72a2b71..386764b 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1839,6 +1839,14 @@ INT CDECL MSVCRT_iswcntrl( MSVCRT_wchar_t wc ) } /********************************************************************* + * _iswcntrl_l (MSVCRT.@) + */ +int CDECL MSVCRT__iswcntrl_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +{ + return iscntrlW( wc ); +} + +/********************************************************************* * iswdigit (MSVCRT.@) */ INT CDECL MSVCRT_iswdigit( MSVCRT_wchar_t wc ) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 32a646a..2090e59 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -509,7 +509,7 @@ @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l @ cdecl _iswblank_l(long ptr) MSVCRT__iswblank_l -@ stub _iswcntrl_l +@ cdecl _iswcntrl_l(long ptr) MSVCRT__iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
96
Older →

Jump to page:

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-commits November 2018