Skip to content

in_winevtlog: Handle Daylight saving time by using newer functions [Backport to 4.0] #10668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cosmo0920 merged 3 commits into from
Aug 1, 2025
Merged

in_winevtlog: Handle Daylight saving time by using newer functions [Backport to 4.0] #10668

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57ea3ae
in_winevtlog: Handle Daylight saving time by using newer functions
cosmo0920 Jul 22, 2025
c68f8d2
in_winevtlog: Use -1 at the last argument for auto-detection of DST
cosmo0920 Jul 22, 2025
6f7c02b
in_winevtlog: Initialize TZInfo correctly
cosmo0920 Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions plugins/in_winevtlog/pack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,25 +189,27 @@ static int pack_systemtime(struct winevtlog_config *ctx, SYSTEMTIME *st)
CHAR buf[64];
size_t len = 0;
_locale_t locale;
TIME_ZONE_INFORMATION tzi;
DYNAMIC_TIME_ZONE_INFORMATION dtzi;
SYSTEMTIME st_local;

GetTimeZoneInformation(&tzi);
_tzset();

GetDynamicTimeZoneInformation(&dtzi);

locale = _get_current_locale();
if (locale == NULL) {
return -1;
}
if (st != NULL) {
SystemTimeToTzSpecificLocalTime(&tzi, st, &st_local);
SystemTimeToTzSpecificLocalTimeEx(&dtzi, st, &st_local);

struct tm tm = {st_local.wSecond,
st_local.wMinute,
st_local.wHour,
st_local.wDay,
st_local.wMonth-1,
st_local.wYear-1900,
st_local.wDayOfWeek, 0, 0};
st_local.wDayOfWeek, 0, -1};
len = _strftime_l(buf, 64, FORMAT_ISO8601, &tm, locale);
if (len == 0) {
flb_errno();
Expand All @@ -234,6 +236,8 @@ static int pack_filetime(struct winevtlog_config *ctx, ULONGLONG filetime)
SYSTEMTIME st;
_locale_t locale;

_tzset();

locale = _get_current_locale();
if (locale == NULL) {
return -1;
Expand All @@ -243,7 +247,7 @@ static int pack_filetime(struct winevtlog_config *ctx, ULONGLONG filetime)
ft.dwLowDateTime = timestamp.LowPart;
FileTimeToLocalFileTime(&ft, &ft_local);
if (FileTimeToSystemTime(&ft_local, &st)) {
struct tm tm = {st.wSecond, st.wMinute, st.wHour, st.wDay, st.wMonth-1, st.wYear-1900, st.wDayOfWeek, 0, 0};
struct tm tm = {st.wSecond, st.wMinute, st.wHour, st.wDay, st.wMonth-1, st.wYear-1900, st.wDayOfWeek, 0, -1};
len = _strftime_l(buf, 64, FORMAT_ISO8601, &tm, locale);
if (len == 0) {
flb_errno();
Expand Down