December 2012 - Wine-Commits

Francois Gouget : testbot/TestAgent: Add global configuration options for the SSH tunneling.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: tools Branch: master Commit: f486603d9079ce1905e8241d4794d06180489745 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f486603d9079ce1905e8241d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 11 17:46:00 2012 +0100 testbot/TestAgent: Add global configuration options for the SSH tunneling. This makes it possible to use other SSH keys than just id_dsa. This also makes it possible to disable SSH tunneling entirely or to hardcode the SSH tunnel to use instead of using whatever VirtURI specifies. --- testbot/lib/WineTestBot/Config.pm | 8 ++++---- testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 21 +++++++++++++++++++++ testbot/lib/WineTestBot/VMs.pm | 22 ++++++++++++---------- testbot/scripts/TestAgent | 20 +++++++++++--------- 4 files changed, 48 insertions(+), 23 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 9a16fe6..8d96c36 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -32,8 +32,8 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $BuildTimeout $ReconfigTimeout $OverheadTimeout $TagPrefix $ProjectName $PatchesMailingList $PatchResultsEMail $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter - $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort - $JobPurgeDays $JobArchiveDays $WebHostName); + $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel + $TunnelDefaults $JobPurgeDays $JobArchiveDays $WebHostName); require Exporter; @ISA = qw(Exporter); @@ -44,8 +44,8 @@ require Exporter; $SingleTimeout $BuildTimeout $ReconfigTimeout $OverheadTimeout $TagPrefix $ProjectName $PatchesMailingList $PatchResultsEMail $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter - $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort - $JobPurgeDays $JobArchiveDays $WebHostName); + $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel + $TunnelDefaults $JobPurgeDays $JobArchiveDays $WebHostName); @EXPORT_OK = qw($DbDataSource $DbUsername $DbPassword); if ($::RootDir !~ m=^/=) diff --git a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl index 06afb77..38e6a3a 100644 --- a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl +++ b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl @@ -83,4 +83,25 @@ $WineTestBot::Config::LDAPEMailAttribute = undef; # The port the VM agents are listening on $WineTestBot::Config::AgentPort = undef; +# This specifies if and how to do SSH tunneling. +# - If unset then tunneling is automatic based on the VM's VirtURI setting. +# - If set to an SSH URI, then tunneling is performed using these parameters. +# - Any other setting disables SSH tunneling. In particular to disable +# tunneling for SSH VirtURIs it is recommended to set this to 'never'. +$Tunnel = undef; + +# If set this specifies the SSH tunnel parameters to be used for the +# TestAgent connection. This is mostly useful for parameters that cannot be +# specified through the SSH URI, like the key filenames. Listed below are +# the supported settings. For a full reference, see the Net::SSH2::auth() +# documentation. Note though that interactive methods are disabled. +# - username +# - password +# - publickey +# - privatekey +# - hostname +# - local_username +$WineTestBot::Config::TunnelDefaults = undef; + + 1; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index a42fb12..2d1c1fd 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -361,17 +361,19 @@ sub _GetTunnel($) { my ($self) = @_; - # Auto-detect the SSH settings based on the libvirt URI - my $VirtURI = $self->VirtURI; - if ($VirtURI =~ s/^[a-z]+\+(?:ssh|libssh2):/ssh:/) + # Use either the tunnel specified in the configuration file + # or autodetect the settings based on the VM's VirtURI setting. + my $URI = $Tunnel || $self->VirtURI; + + if ($URI =~ s/^(?:[a-z]+\+)?(?:ssh|libssh2):/ssh:/) { - my $URI = URI->new($VirtURI); - my $TunnelInfo = { - sshhost => $URI->host, - sshport => $URI->port, - username => $URI->userinfo, - }; - return $TunnelInfo; + my $ParsedURI = URI->new($URI); + + my %TunnelInfo = %$TunnelDefaults; + $TunnelInfo{sshhost} = $ParsedURI->host; + $TunnelInfo{sshport} = $ParsedURI->port; + $TunnelInfo{username} = $ParsedURI->userinfo; + return \%TunnelInfo; } return undef; diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 6d241b5..f72531c 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -53,7 +53,7 @@ my ($Cmd, $Hostname, $LocalFilename, $ServerFilename, @Rm); my (@Run, $RunIn, $RunOut, $RunErr); my $SendFlags = 0; my $RunFlags = 0; -my ($Port, $ConnectTimeout, $Timeout, $Tunnel); +my ($Port, $ConnectTimeout, $Timeout, $TunnelOpt); my $Usage; sub check_opt_val($$) @@ -95,7 +95,7 @@ while (@ARGV) } elsif ($arg eq "--tunnel") { - $Tunnel = check_opt_val($arg, $Tunnel); + $TunnelOpt = check_opt_val($arg, $TunnelOpt); } elsif ($arg eq "--sendfile-exe") { @@ -189,9 +189,9 @@ if (!defined $Usage) $Usage = 2; } $AgentPort = $Port if (defined $Port); - if (defined $Tunnel and $Tunnel !~ /^ssh:/) + if ($TunnelOpt and $TunnelOpt !~ /^ssh:/) { - error("only SSH proxies are supported\n"); + error("only SSH tunnels are supported\n"); $Usage = 2; } } @@ -239,13 +239,15 @@ if (defined $Usage) exit 0; } +$TunnelOpt = $Tunnel if (!defined $TunnelOpt); my $TunnelInfo; -if (defined $Tunnel) +if ($TunnelOpt) { - my $URI = URI->new($Tunnel); - $TunnelInfo = {sshhost => $URI->host, - sshport => $URI->port, - username => $URI->userinfo}; + my $ParsedURI = URI->new($TunnelOpt); + %$TunnelInfo = %$TunnelDefaults; + $TunnelInfo->{sshhost} = $ParsedURI->host; + $TunnelInfo->{sshport} = $ParsedURI->port; + $TunnelInfo->{username} = $ParsedURI->userinfo; } my $TA = TestAgent->new($Hostname, $AgentPort, $TunnelInfo);

1 0

Francois Gouget : testbot/testagentd: Reset the status when handling a new client.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: tools Branch: master Commit: 23453c79aa6a08d2891d7b32ad84f2006b7b07e7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=23453c79aa6a08d2891d7b32… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 11 12:17:13 2012 +0100 testbot/testagentd: Reset the status when handling a new client. Otherwise, once the status has been set to FATAL, it cannot be set to anything else anymore, even for other clients. --- testbot/src/testagentd/testagentd.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index fc3a840..13d16e4 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -155,6 +155,8 @@ void set_status(int newstatus, const char* format, ...) status = newstatus; if (newstatus == ST_FATAL) broken = 1; + else if (newstatus == ST_OK) + broken = 0; va_start(valist, format); vset_status_msg(format, valist); va_end(valist); @@ -1145,7 +1147,9 @@ int main(int argc, char** argv) { if (is_host_allowed(client, opt_srchost, addrlen)) { - broken = 0; + /* Reset the status so new non-fatal errors can be set */ + set_status(ST_OK, "ok"); + /* Send the version right away */ send_string(client, PROTOCOL_VERSION);

1 0

Francois Gouget : testbot/TestAgent: Fix the TestAgent script parameter checks.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: tools Branch: master Commit: de94f940a061c8d5525f1ef52759b1cddeedf2ac URL: http://source.winehq.org/git/tools.git/?a=commit;h=de94f940a061c8d5525f1ef5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 11 12:08:55 2012 +0100 testbot/TestAgent: Fix the TestAgent script parameter checks. --- testbot/scripts/TestAgent | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index b861ba2..6d241b5 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -167,25 +167,25 @@ if (!defined $Usage) error("you must specify a command\n"); $Usage = 2; } - elsif ($Cmd eq "run" and !@Run) + elsif ($Cmd ne "sendfile" and $SendFlags) { - error("you must specify the command to run\n"); + error("the --sendfile-xxx options can only be used with the sendfile command\n"); $Usage = 2; } - elsif ($Cmd eq "rm" and !@Rm) + elsif ($Cmd eq "run" and !@Run) { - error("you must specify the server files to delete\n"); + error("you must specify the command to run\n"); $Usage = 2; } - if ($Cmd ne "run" and ($RunFlags or defined $RunIn or defined $RunOut or + elsif ($Cmd ne "run" and ($RunFlags or defined $RunIn or defined $RunOut or defined $RunErr)) { error("the --run-xxx options can only be used with the run command\n"); $Usage = 2; } - elsif ($Cmd ne "sendfile" and $SendFlags) + elsif ($Cmd eq "rm" and !@Rm) { - error("the --sendfile-xxx options can only be used with the sendfile command\n"); + error("you must specify the server files to delete\n"); $Usage = 2; } $AgentPort = $Port if (defined $Port);

1 0

Francois Gouget : testbot: Capture the worker scripts Perl errors in the general log.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: tools Branch: master Commit: 8bcaf6c8510abeb662b0ad0e61232d7c1c2fa432 URL: http://source.winehq.org/git/tools.git/?a=commit;h=8bcaf6c8510abeb662b0ad0e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 11 12:07:45 2012 +0100 testbot: Capture the worker scripts Perl errors in the general log. Also simplify the fork()+exec() code a bit. --- testbot/bin/Engine.pl | 50 +++++++++++++++++---------------------- testbot/lib/WineTestBot/Log.pm | 18 ++++++++++++++ testbot/lib/WineTestBot/VMs.pm | 17 ++++++++----- 3 files changed, 50 insertions(+), 35 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index a26ac17..e233e80 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -120,18 +120,16 @@ sub HandleJobStatusChange { $ActiveBackEnds{'WineTestBot'}->PrepareForFork(); my $Pid = fork; - if (defined($Pid) && ! $Pid) + if (!defined $Pid) { - exec("$BinDir/${ProjectName}SendLog.pl $JobKey"); + LogMsg "Unable to fork for ${ProjectName}SendLog.pl: $!\n"; } - if (defined($Pid) && ! $Pid) + elsif (!$Pid) { - LogMsg "Unable to exec ${ProjectName}SendLog.pl : $!\n"; - exit; - } - if (! defined($Pid)) - { - LogMsg "Unable to fork for ${ProjectName}SendLog.pl : $!\n"; + WineTestBot::Log::SetupRedirects(); + exec("$BinDir/${ProjectName}SendLog.pl $JobKey") or + LogMsg "Unable to exec ${ProjectName}SendLog.pl: $!\n"; + exit(1); } } @@ -214,18 +212,16 @@ sub CheckForWinetestUpdate $ActiveBackEnds{'WineTestBot'}->PrepareForFork(); my $Pid = fork; - if (defined($Pid) && ! $Pid) - { - exec("$BinDir/CheckForWinetestUpdate.pl $Bits"); - } - if (defined($Pid) && ! $Pid) + if (!defined $Pid) { - LogMsg "Unable to exec CheckForWinetestUpdate.pl : $!\n"; - exit; + LogMsg "Unable to fork for CheckForWinetestUpdate.pl: $!\n"; } - if (! defined($Pid)) + elsif (!$Pid) { - LogMsg "Unable to fork for CheckForWinetestUpdate.pl : $!\n"; + WineTestBot::Log::SetupRedirects(); + exec("$BinDir/CheckForWinetestUpdate.pl $Bits") or + LogMsg "Unable to exec CheckForWinetestUpdate.pl: $!\n"; + exit(1); } } @@ -365,19 +361,17 @@ sub HandleWinePatchWebNotification { $ActiveBackEnds{'WineTestBot'}->PrepareForFork(); my $Pid = fork; - if (defined($Pid) && ! $Pid) + if (!defined $Pid) { - exec("$BinDir/WinePatchesWebGet.pl " . ($MaxExistingWebPatchId + 1) . - " " . $LatestWebPatchId); - } - if (defined($Pid) && ! $Pid) - { - LogMsg "Unable to exec WinePatchesWebGet.pl : $!\n"; - exit; + LogMsg "Unable to fork for WinePatchesWebGet.pl: $!\n"; } - if (! defined($Pid)) + elsif (!$Pid) { - LogMsg "Unable to fork for WinePatchesWebGet.pl : $!\n"; + WineTestBot::Log::SetupRedirects(); + exec("$BinDir/WinePatchesWebGet.pl " . ($MaxExistingWebPatchId + 1) . + " " . $LatestWebPatchId) or + LogMsg "Unable to exec WinePatchesWebGet.pl: $!\n"; + exit(1); } } diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index 102b74d..6982943 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -57,4 +57,22 @@ sub LogMsg(@) print $logfile scalar localtime, " ", $logprefix, ": ", @_ if ($logfile); } +sub SetupRedirects() +{ + if (defined $logfile) + { + if (open(STDERR, ">>&", $logfile)) + { + # Make sure stderr still flushes after each print + my $tmp=select(STDERR); + $| = 1; + select($tmp); + } + else + { + LogMsg "unable to redirect stderr to the log file\n"; + } + } +} + 1; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 82ad379..a42fb12 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -526,16 +526,19 @@ sub RunRevert $self->GetBackEnd()->PrepareForFork(); my $Pid = fork; - if (defined($Pid) && ! $Pid) + if (!defined $Pid) { - $ENV{PATH} = "/usr/bin:/bin"; - delete $ENV{ENV}; - exec("$BinDir/RevertVM.pl", $self->GetKey()); - exit; + return "Unable to start child process: $!"; } - if (! defined($Pid)) + elsif (!$Pid) { - return "Unable to start child process: $!"; + $ENV{PATH} = "/usr/bin:/bin"; + delete $ENV{ENV}; + WineTestBot::Log::SetupRedirects(); + exec("$BinDir/RevertVM.pl", $self->GetKey()) or + require WineTestBot::Log; + WineTestBot::Log::LogMsg "Unable to exec RevertVM.pl: $!\n"; + exit(1); } return undef;

1 0

Francois Gouget : testbot/TestAgent: Fix the $Debug variable default value and check.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: tools Branch: master Commit: 654bcdd17e53e80ed3b65ab6625e74e03bdb1bfd URL: http://source.winehq.org/git/tools.git/?a=commit;h=654bcdd17e53e80ed3b65ab6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 11 12:08:14 2012 +0100 testbot/TestAgent: Fix the $Debug variable default value and check. --- testbot/lib/WineTestBot/TestAgent.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 8bc3e59..92d20bb 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -45,7 +45,7 @@ my %RpcNames=( $RPC_RM => 'rm', ); -my $Debug = 1; +my $Debug = 0; sub debug(@) { print STDERR @_ if ($Debug); @@ -787,7 +787,7 @@ sub _Connect($) require Net::SSH2; $self->{ssh} = Net::SSH2->new(); - $self->{ssh}->debug(1) if ($Debug > 2); + $self->{ssh}->debug(1) if ($Debug > 1); if (!$self->{ssh}->connect($self->{sshfd})) { $self->_SetError($FATAL, "Unable to connect to the SSH server: " . $self->_ssherror());

1 0

Alexandre Julliard : winex11: Send WM_EXITSIZEMOVE when the mouse has been released.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: ed47a507d0ec9b1d5771ea86b4b7fb2be3ef1bd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed47a507d0ec9b1d5771ea86b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 10 20:30:20 2012 +0100 winex11: Send WM_EXITSIZEMOVE when the mouse has been released. --- dlls/winex11.drv/mouse.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 818bdd5..47a453c 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1384,6 +1384,7 @@ void move_resize_window( HWND hwnd, int dir ) } TRACE( "hwnd %p/%lx done\n", hwnd, win ); + SendMessageW( hwnd, WM_EXITSIZEMOVE, 0, 0 ); }

1 0

Detlef Riekenberg : mlang/tests: Accept the different translation in win8.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: cd804dab296da44c1c3214c5a26b9d999e710c57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd804dab296da44c1c3214c5a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Dec 10 11:49:48 2012 +0100 mlang/tests: Accept the different translation in win8. --- dlls/mlang/tests/mlang.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index fb37e27..0da31b5 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -121,6 +121,9 @@ static const WCHAR de_engb2[] ={'E','n','g','l','i','s','c','h',' ', 'K',0xF6,'n','i','g','r','e','i','c',0}; static const WCHAR de_enus[] = {'E','n','g','l','i','s','c','h',' ', '(','U','S','A',')',0}; +static const WCHAR de_enus2[] ={'E','n','g','l','i','s','c','h',' ', + '(','V','e','r','e','i','n','i','g','t','e',' ', + 'S','t','a','a','t','e','n',')',0}; static const WCHAR de_de[] = {'D','e','u','t','s','c','h',' ', '(','D','e','u','t','s','c','h','l','a','n','d',')',0}; static const WCHAR de_deat[] = {'D','e','u','t','s','c','h',' ', @@ -184,11 +187,11 @@ static const info_table_entry info_table[] = { {MAKELANGID(LANG_ENGLISH, SUBLANG_NEUTRAL), MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), TODO_NAME, "en", de_en}, {MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), - TODO_NAME, "en-us", de_enus}, + TODO_NAME, "en-us", de_enus, de_enus2}, {MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_UK), MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), TODO_NAME, "en-gb", de_engb, de_engb2}, {MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), - TODO_NAME, "en-us", de_enus}, + TODO_NAME, "en-us", de_enus, de_enus2}, {MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_CAN), MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), TODO_NAME, "en-ca", de_enca},

1 0

Jacek Caban : atl: Don't call HeapFree on module argument in AtlModuleTerm.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: 9f03c865b390ad3a67c8221dd45524d6bde4421b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f03c865b390ad3a67c8221dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 10 12:35:33 2012 +0100 atl: Don't call HeapFree on module argument in AtlModuleTerm. --- dlls/atl/atl_main.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index eee6fee..415fbc3 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -132,7 +132,7 @@ HRESULT WINAPI AtlModuleLoadTypeLib(_ATL_MODULEW *pM, LPCOLESTR lpszIndex, return S_OK; } -HRESULT WINAPI AtlModuleTerm(_ATL_MODULEW* pM) +HRESULT WINAPI AtlModuleTerm(_ATL_MODULE *pM) { _ATL_TERMFUNC_ELEM *iter = pM->m_pTermFuncs, *tmp; @@ -145,8 +145,6 @@ HRESULT WINAPI AtlModuleTerm(_ATL_MODULEW* pM) HeapFree(GetProcessHeap(), 0, tmp); } - HeapFree(GetProcessHeap(), 0, pM); - return S_OK; }

1 0

Piotr Caban : msvcrt: Reorganize _localtime64 function.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: 11216fabc488f407a4a92ed2d187c5913afe2869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11216fabc488f407a4a92ed2d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 10 12:47:54 2012 +0100 msvcrt: Reorganize _localtime64 function. --- dlls/msvcrt/time.c | 49 +++++++++++++++++++++---------------------------- 1 files changed, 21 insertions(+), 28 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 05980a5..263c035 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -376,33 +376,6 @@ MSVCRT___time32_t CDECL MSVCRT__mkgmtime(struct MSVCRT_tm *time) #endif /********************************************************************* - * _localtime64 (MSVCRT.@) - */ -struct MSVCRT_tm* CDECL MSVCRT__localtime64(const MSVCRT___time64_t* secs) -{ - struct tm *tm; - thread_data_t *data; - time_t seconds = *secs; - - if (seconds < 0) return NULL; - - _mlock(_TIME_LOCK); - if (!(tm = localtime( &seconds))) { - _munlock(_TIME_LOCK); - return NULL; - } - - data = msvcrt_get_thread_data(); - if(!data->time_buffer) - data->time_buffer = MSVCRT_malloc(sizeof(struct MSVCRT_tm)); - - unix_tm_to_msvcrt( data->time_buffer, tm ); - _munlock(_TIME_LOCK); - - return data->time_buffer; -} - -/********************************************************************* * _localtime64_s (MSVCRT.@) */ int CDECL _localtime64_s(struct MSVCRT_tm *time, const MSVCRT___time64_t *secs) @@ -435,11 +408,31 @@ int CDECL _localtime64_s(struct MSVCRT_tm *time, const MSVCRT___time64_t *secs) } /********************************************************************* + * _localtime64 (MSVCRT.@) + */ +struct MSVCRT_tm* CDECL MSVCRT__localtime64(const MSVCRT___time64_t* secs) +{ + thread_data_t *data = msvcrt_get_thread_data(); + + if(!data->time_buffer) + data->time_buffer = MSVCRT_malloc(sizeof(struct MSVCRT_tm)); + + if(_localtime64_s(data->time_buffer, secs)) + return NULL; + return data->time_buffer; +} + +/********************************************************************* * _localtime32 (MSVCRT.@) */ struct MSVCRT_tm* CDECL MSVCRT__localtime32(const MSVCRT___time32_t* secs) { - MSVCRT___time64_t secs64 = *secs; + MSVCRT___time64_t secs64; + + if(!secs) + return NULL; + + secs64 = *secs; return MSVCRT__localtime64( &secs64 ); }

1 0

Piotr Caban : msvcrt: Added _tzset tests.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: 59776ccc9949ff5c1ef6e7a0cf512b1a06d7bed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59776ccc9949ff5c1ef6e7a0c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 10 12:47:00 2012 +0100 msvcrt: Added _tzset tests. --- dlls/msvcrt/tests/time.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index c6e2a9c..b9bc7f1 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -46,6 +46,8 @@ static errno_t (__cdecl *p_localtime32_s)(struct tm*, __time32_t*); static errno_t (__cdecl *p_localtime64_s)(struct tm*, __time64_t*); static int* (__cdecl *p__daylight)(void); static int* (__cdecl *p___p__daylight)(void); +static long* (__cdecl *p___p__dstbias)(void); +static long* (__cdecl *p___p__timezone)(void); static size_t (__cdecl *p_strftime)(char *, size_t, const char *, const struct tm *); static size_t (__cdecl *p_wcsftime)(wchar_t *, size_t, const wchar_t *, const struct tm *); static char* (__cdecl *p_asctime)(const struct tm *); @@ -64,6 +66,8 @@ static void init(void) p_localtime64_s = (void*)GetProcAddress(hmod, "_localtime64_s"); p__daylight = (void*)GetProcAddress(hmod, "__daylight"); p___p__daylight = (void*)GetProcAddress(hmod, "__p__daylight"); + p___p__dstbias = (void*)GetProcAddress(hmod, "__p__dstbias"); + p___p__timezone = (void*)GetProcAddress(hmod, "__p__timezone"); p_strftime = (void*)GetProcAddress(hmod, "strftime"); p_wcsftime = (void*)GetProcAddress(hmod, "wcsftime"); p_asctime = (void*)GetProcAddress(hmod, "asctime"); @@ -804,10 +808,52 @@ static void test_asctime(void) ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); } +static void test__tzset(void) +{ + char TZ_env[256]; + int ret; + + if(!p___p__daylight || !p___p__timezone || !p___p__dstbias) { + win_skip("__p__daylight, __p__timezone or __p__dstbias is not available\n"); + return; + } + + _snprintf(TZ_env,255,"TZ=%s",(getenv("TZ")?getenv("TZ"):"")); + + ret = *p___p__daylight(); + ok(ret == 1, "*__p__daylight() = %d\n", ret); + ret = *p___p__timezone(); + ok(ret == 28800, "*__p__timezone() = %d\n", ret); + ret = *p___p__dstbias(); + ok(ret == -3600, "*__p__dstbias() = %d\n", ret); + + _putenv("TZ=xxx+1yyy"); + _tzset(); + ret = *p___p__daylight(); + ok(ret == 121, "*__p__daylight() = %d\n", ret); + ret = *p___p__timezone(); + ok(ret == 3600, "*__p__timezone() = %d\n", ret); + ret = *p___p__dstbias(); + ok(ret == -3600, "*__p__dstbias() = %d\n", ret); + + *p___p__dstbias() = 0; + _putenv("TZ=xxx+1:3:5zzz"); + _tzset(); + ret = *p___p__daylight(); + ok(ret == 122, "*__p__daylight() = %d\n", ret); + ret = *p___p__timezone(); + ok(ret == 3785, "*__p__timezone() = %d\n", ret); + ret = *p___p__dstbias(); + ok(ret == 0, "*__p__dstbias() = %d\n", ret); + + _putenv(TZ_env); +} + START_TEST(time) { init(); + test__tzset(); test_strftime(); test_ctime(); test_gmtime();

1 0