Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
64ed8487
Commit
64ed8487
authored
21 years ago
by
Huw Davies
Committed by
Alexandre Julliard
21 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Call TIME_GetBias rather than RtlQueryTimeZoneInfo if we're only
interested in the bias - it's faster.
parent
b65d1360
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/ntdll/time.c
+33
-29
33 additions, 29 deletions
dlls/ntdll/time.c
with
33 additions
and
29 deletions
dlls/ntdll/time.c
+
33
−
29
View file @
64ed8487
...
...
@@ -257,8 +257,6 @@ static const struct tagTZ_INFO TZ_INFO[] =
'e'
,
'\0'
},
-
780
,
0
}
};
/*********** start of code by Rex Jolliff (rex@lvcablemodem.com) **************/
#define TICKSPERSEC 10000000
#define TICKSPERMSEC 10000
#define SECSPERDAY 86400
...
...
@@ -469,6 +467,27 @@ BOOLEAN WINAPI RtlTimeFieldsToTime(
return
TRUE
;
}
/***********************************************************************
* TIME_GetBias [internal]
*
* Helper function calculates delta local time from UTC.
*
* PARAMS
* utc [I] The current utc time.
* pdaylight [I] Local daylight.
*
* RETURNS
* The bias for the current timezone.
*/
static
int
TIME_GetBias
(
time_t
utc
,
int
*
pdaylight
)
{
struct
tm
*
ptm
=
localtime
(
&
utc
);
*
pdaylight
=
ptm
->
tm_isdst
;
/* daylight for local timezone */
ptm
=
gmtime
(
&
utc
);
ptm
->
tm_isdst
=
*
pdaylight
;
/* use local daylight, not that of Greenwich */
return
(
int
)(
utc
-
mktime
(
ptm
));
}
/******************************************************************************
* RtlLocalTimeToSystemTime [NTDLL.@]
*
...
...
@@ -485,12 +504,15 @@ BOOLEAN WINAPI RtlTimeFieldsToTime(
NTSTATUS
WINAPI
RtlLocalTimeToSystemTime
(
const
LARGE_INTEGER
*
LocalTime
,
PLARGE_INTEGER
SystemTime
)
{
TIME_ZONE_INFORMATION
tzinfo
;
time_t
gmt
;
int
bias
,
daylight
;
TRACE
(
"(%p, %p)
\n
"
,
LocalTime
,
SystemTime
);
RtlQueryTimeZoneInformation
(
&
tzinfo
);
SystemTime
->
QuadPart
=
LocalTime
->
QuadPart
+
tzinfo
.
Bias
*
60
*
(
LONGLONG
)
10000000
;
gmt
=
time
(
NULL
);
bias
=
TIME_GetBias
(
gmt
,
&
daylight
);
SystemTime
->
QuadPart
=
LocalTime
->
QuadPart
-
bias
*
(
LONGLONG
)
10000000
;
return
STATUS_SUCCESS
;
}
...
...
@@ -510,12 +532,15 @@ NTSTATUS WINAPI RtlLocalTimeToSystemTime( const LARGE_INTEGER *LocalTime,
NTSTATUS
WINAPI
RtlSystemTimeToLocalTime
(
const
LARGE_INTEGER
*
SystemTime
,
PLARGE_INTEGER
LocalTime
)
{
TIME_ZONE_INFORMATION
tzinfo
;
time_t
gmt
;
int
bias
,
daylight
;
TRACE
(
"(%p, %p)
\n
"
,
SystemTime
,
LocalTime
);
RtlQueryTimeZoneInformation
(
&
tzinfo
);
LocalTime
->
QuadPart
=
SystemTime
->
QuadPart
-
tzinfo
.
Bias
*
60
*
(
LONGLONG
)
10000000
;
gmt
=
time
(
NULL
);
bias
=
TIME_GetBias
(
gmt
,
&
daylight
);
LocalTime
->
QuadPart
=
SystemTime
->
QuadPart
+
bias
*
(
LONGLONG
)
10000000
;
return
STATUS_SUCCESS
;
}
...
...
@@ -658,27 +683,6 @@ NTSTATUS WINAPI NtQuerySystemTime( PLARGE_INTEGER Time )
return
STATUS_SUCCESS
;
}
/***********************************************************************
* TIME_GetBias [internal]
*
* Helper function calculates delta local time from UTC.
*
* PARAMS
* utc [I] The current utc time.
* pdaylight [I] Local daylight.
*
* RETURNS
* The bias for the current timezone.
*/
static
int
TIME_GetBias
(
time_t
utc
,
int
*
pdaylight
)
{
struct
tm
*
ptm
=
localtime
(
&
utc
);
*
pdaylight
=
ptm
->
tm_isdst
;
/* daylight for local timezone */
ptm
=
gmtime
(
&
utc
);
ptm
->
tm_isdst
=
*
pdaylight
;
/* use local daylight, not that of Greenwich */
return
(
int
)(
utc
-
mktime
(
ptm
));
}
/***********************************************************************
* TIME_GetTZAsStr [internal]
*
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment