December 2012 - Wine-commits

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

11 Dec '12

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/testagentd: Reset the status when handling a new client.
by Alexandre Julliard 11 Dec '12

11 Dec '12

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: Add global configuration options for the SSH tunneling.
by Alexandre Julliard 11 Dec '12

11 Dec '12

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/TestAgent: Small fixes in the authentication data setup.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: tools Branch: master Commit: f49d5bd90360276afbea2603f398a5850d29bf01 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f49d5bd90360276afbea2603… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 11 17:46:17 2012 +0100 testbot/TestAgent: Small fixes in the authentication data setup. We don't allow interactive login methods so there's no point merging the 'interact' setting from the configuration defaults. Also Net::SSH2 does not like getting undefined settings so don't override potentially defined values with undefined ones. --- 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 92d20bb..e04827a 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -798,9 +798,9 @@ sub _Connect($) my $Tunnel = $self->{tunnel}; my %AuthOptions=(username => $Tunnel->{username} || $ENV{USER}); foreach my $Key ("username", "password", "publickey", "privatekey", - "hostname", "local_username", "interact") + "hostname", "local_username") { - $AuthOptions{$Key} = $Tunnel->{$Key} if (exists $Tunnel->{$Key}); + $AuthOptions{$Key} = $Tunnel->{$Key} if (defined $Tunnel->{$Key}); } # Interactive authentication makes no sense with automatic reconnects $AuthOptions{interact} = 0;

1 0

Francois Gouget : testbot/TestAgent: Automatically use the id_dsa and id_rsa keys for Net:SSH2.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: tools Branch: master Commit: ada73ac9601d41eb84849b564d61a3ab362ddb91 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ada73ac9601d41eb84849b56… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 11 17:55:09 2012 +0100 testbot/TestAgent: Automatically use the id_dsa and id_rsa keys for Net:SSH2. Newer Net:SSH2 versions will automatically detect and use the id_dsa keys but older ones don't autodetect anything. --- testbot/lib/WineTestBot/TestAgent.pm | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index e04827a..cb63cfd 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -802,6 +802,21 @@ sub _Connect($) { $AuthOptions{$Key} = $Tunnel->{$Key} if (defined $Tunnel->{$Key}); } + # Old versions of Net::SSH2 won't automatically find DSA keys, and new ones + # still won't automatically find RSA ones. + if (defined $ENV{HOME} and !exists $AuthOptions{"privatekey"} and + !exists $AuthOptions{"publickey"}) + { + foreach my $key ("dsa", "rsa") + { + if (-f "$ENV{HOME}/.ssh/$key" and -f "$ENV{HOME}/.ssh/$key.pub") + { + $AuthOptions{"privatekey"} = "$ENV{HOME}/.ssh/$key"; + $AuthOptions{"publickey"} = "$ENV{HOME}/.ssh/$key.pub"; + last; + } + } + } # Interactive authentication makes no sense with automatic reconnects $AuthOptions{interact} = 0; if (!$self->{ssh}->auth(%AuthOptions))

1 0

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

10 Dec '12

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 10 Dec '12

10 Dec '12

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

Piotr Caban : msvcrt: Added _tzset tests.
by Alexandre Julliard 10 Dec '12

10 Dec '12

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

Piotr Caban : msvcrt: Fixed mktime and _mktime64 implementation.
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: a66ed048a32fd1cd4e8afebd262b7b1b1eabfbcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a66ed048a32fd1cd4e8afebd2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 10 12:47:13 2012 +0100 msvcrt: Fixed mktime and _mktime64 implementation. --- dlls/msvcrt/time.c | 165 ++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 142 insertions(+), 23 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 27f93b1..e484bf4 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -52,20 +52,6 @@ static inline int IsLeapYear(int Year) return Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0); } -static inline void msvcrt_tm_to_unix( struct tm *dest, const struct MSVCRT_tm *src ) -{ - memset( dest, 0, sizeof(*dest) ); - dest->tm_sec = src->tm_sec; - dest->tm_min = src->tm_min; - dest->tm_hour = src->tm_hour; - dest->tm_mday = src->tm_mday; - dest->tm_mon = src->tm_mon; - dest->tm_year = src->tm_year; - dest->tm_wday = src->tm_wday; - dest->tm_yday = src->tm_yday; - dest->tm_isdst = src->tm_isdst; -} - static inline void unix_tm_to_msvcrt( struct MSVCRT_tm *dest, const struct tm *src ) { memset( dest, 0, sizeof(*dest) ); @@ -177,6 +163,57 @@ void CDECL MSVCRT__tzset(void) _munlock(_TIME_LOCK); } +static void _tzset_init(void) +{ + static BOOL init = FALSE; + + if(!init) { + _mlock(_TIME_LOCK); + if(!init) { + MSVCRT__tzset(); + init = TRUE; + } + _munlock(_TIME_LOCK); + } +} + +static BOOL is_dst(const SYSTEMTIME *st) +{ + TIME_ZONE_INFORMATION tmp; + SYSTEMTIME out; + + if(!MSVCRT___daylight) + return FALSE; + + if(tzi.DaylightDate.wMonth) { + tmp = tzi; + }else if(st->wYear >= 2007) { + memset(&tmp, 0, sizeof(tmp)); + tmp.StandardDate.wMonth = 11; + tmp.StandardDate.wDay = 1; + tmp.StandardDate.wHour = 2; + tmp.DaylightDate.wMonth = 3; + tmp.DaylightDate.wDay = 2; + tmp.DaylightDate.wHour = 2; + }else { + memset(&tmp, 0, sizeof(tmp)); + tmp.StandardDate.wMonth = 10; + tmp.StandardDate.wDay = 5; + tmp.StandardDate.wHour = 2; + tmp.DaylightDate.wMonth = 4; + tmp.DaylightDate.wDay = 1; + tmp.DaylightDate.wHour = 2; + } + + tmp.Bias = 0; + tmp.StandardBias = 0; + tmp.DaylightBias = MSVCRT__dstbias/60; + if(!SystemTimeToTzSpecificLocalTime(&tmp, st, &out)) + return FALSE; + + return memcmp(st, &out, sizeof(SYSTEMTIME)); +} + #define SECSPERDAY 86400 /* 1601 to 1970 is 369 years plus 89 leap days */ #define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)SECSPERDAY) @@ -184,19 +221,100 @@ void CDECL MSVCRT__tzset(void) #define TICKSPERMSEC 10000 #define TICKS_1601_TO_1970 (SECS_1601_TO_1970 * TICKSPERSEC) +static MSVCRT___time64_t mktime_helper(struct MSVCRT_tm *mstm, BOOL local) +{ + SYSTEMTIME st; + FILETIME ft; + MSVCRT___time64_t ret = 0; + int i; + BOOL use_dst = FALSE; + + ret = mstm->tm_year + mstm->tm_mon/12; + mstm->tm_mon %= 12; + if(mstm->tm_mon < 0) { + mstm->tm_mon += 12; + ret--; + } + + if(ret<70 || ret>1100) { + *MSVCRT__errno() = MSVCRT_EINVAL; + return -1; + } + + memset(&st, 0, sizeof(SYSTEMTIME)); + st.wDay = 1; + st.wMonth = mstm->tm_mon+1; + st.wYear = ret+1900; + + if(!SystemTimeToFileTime(&st, &ft)) { + *MSVCRT__errno() = MSVCRT_EINVAL; + return -1; + } + + ret = ((MSVCRT___time64_t)ft.dwHighDateTime<<32)+ft.dwLowDateTime; + ret += (MSVCRT___time64_t)mstm->tm_sec*TICKSPERSEC; + ret += (MSVCRT___time64_t)mstm->tm_min*60*TICKSPERSEC; + ret += (MSVCRT___time64_t)mstm->tm_hour*60*60*TICKSPERSEC; + ret += (MSVCRT___time64_t)(mstm->tm_mday-1)*SECSPERDAY*TICKSPERSEC; + + ft.dwLowDateTime = ret & 0xffffffff; + ft.dwHighDateTime = ret >> 32; + FileTimeToSystemTime(&ft, &st); + + if(local) { + _tzset_init(); + use_dst = is_dst(&st); + if((mstm->tm_isdst<=-1 && use_dst) || (mstm->tm_isdst>=1)) { + SYSTEMTIME tmp; + + ret += (MSVCRT___time64_t)MSVCRT__dstbias*TICKSPERSEC; + + ft.dwLowDateTime = ret & 0xffffffff; + ft.dwHighDateTime = ret >> 32; + FileTimeToSystemTime(&ft, &tmp); + + if(!is_dst(&tmp)) { + st = tmp; + use_dst = FALSE; + }else { + use_dst = TRUE; + } + }else if(mstm->tm_isdst==0 && use_dst) { + ret -= (MSVCRT___time64_t)MSVCRT__dstbias*TICKSPERSEC; + ft.dwLowDateTime = ret & 0xffffffff; + ft.dwHighDateTime = ret >> 32; + FileTimeToSystemTime(&ft, &st); + ret += (MSVCRT___time64_t)MSVCRT__dstbias*TICKSPERSEC; + } + ret += (MSVCRT___time64_t)MSVCRT___timezone*TICKSPERSEC; + } + + mstm->tm_sec = st.wSecond; + mstm->tm_min = st.wMinute; + mstm->tm_hour = st.wHour; + mstm->tm_mday = st.wDay; + mstm->tm_mon = st.wMonth-1; + mstm->tm_year = st.wYear-1900; + mstm->tm_wday = st.wDayOfWeek; + for(i=mstm->tm_yday=0; i<st.wMonth-1; i++) + mstm->tm_yday += MonthLengths[IsLeapYear(st.wYear)][i]; + mstm->tm_yday += st.wDay-1; + mstm->tm_isdst = use_dst ? 1 : 0; + + if(ret < TICKS_1601_TO_1970) { + *MSVCRT__errno() = MSVCRT_EINVAL; + return -1; + } + ret = (ret-TICKS_1601_TO_1970)/TICKSPERSEC; + return ret; +} + /********************************************************************** * _mktime64 (MSVCRT.@) */ MSVCRT___time64_t CDECL MSVCRT__mktime64(struct MSVCRT_tm *mstm) { - time_t secs; - struct tm tm; - - msvcrt_tm_to_unix( &tm, mstm ); - secs = mktime( &tm ); - unix_tm_to_msvcrt( mstm, &tm ); - - return secs < 0 ? -1 : secs; + return mktime_helper(mstm, TRUE); } /********************************************************************** @@ -204,7 +322,8 @@ MSVCRT___time64_t CDECL MSVCRT__mktime64(struct MSVCRT_tm *mstm) */ MSVCRT___time32_t CDECL MSVCRT__mktime32(struct MSVCRT_tm *mstm) { - return MSVCRT__mktime64( mstm ); + MSVCRT___time64_t ret = MSVCRT__mktime64( mstm ); + return ret == (MSVCRT___time32_t)ret ? ret : -1; } /**********************************************************************

1 0

Piotr Caban : msvcrt: Fixed mkgmtime and _mkgmtime64 implementation.
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: c9a7436812560b612f83b9d44388ff2de8682780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9a7436812560b612f83b9d44… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 10 12:47:26 2012 +0100 msvcrt: Fixed mkgmtime and _mkgmtime64 implementation. --- dlls/msvcrt/time.c | 30 +++--------------------------- 1 files changed, 3 insertions(+), 27 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index e484bf4..60c7120 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -348,32 +348,7 @@ MSVCRT___time32_t CDECL MSVCRT_mktime(struct MSVCRT_tm *mstm) */ MSVCRT___time64_t CDECL MSVCRT__mkgmtime64(struct MSVCRT_tm *time) { - SYSTEMTIME st; - FILETIME ft; - MSVCRT___time64_t ret; - int i; - - st.wMilliseconds = 0; - st.wSecond = time->tm_sec; - st.wMinute = time->tm_min; - st.wHour = time->tm_hour; - st.wDay = time->tm_mday; - st.wMonth = time->tm_mon+1; - st.wYear = time->tm_year+1900; - - if(!SystemTimeToFileTime(&st, &ft)) - return -1; - - FileTimeToSystemTime(&ft, &st); - time->tm_wday = st.wDayOfWeek; - - for(i=time->tm_yday=0; i<st.wMonth-1; i++) - time->tm_yday += MonthLengths[IsLeapYear(st.wYear)][i]; - time->tm_yday += st.wDay-1; - - ret = ((MSVCRT___time64_t)ft.dwHighDateTime<<32)+ft.dwLowDateTime; - ret = (ret-TICKS_1601_TO_1970)/TICKSPERSEC; - return ret; + return mktime_helper(time, FALSE); } /********************************************************************** @@ -381,7 +356,8 @@ MSVCRT___time64_t CDECL MSVCRT__mkgmtime64(struct MSVCRT_tm *time) */ MSVCRT___time32_t CDECL MSVCRT__mkgmtime32(struct MSVCRT_tm *time) { - return MSVCRT__mkgmtime64(time); + MSVCRT___time64_t ret = MSVCRT__mkgmtime64(time); + return ret == (MSVCRT___time32_t)ret ? ret : -1; } /**********************************************************************

1 0