projects
/
reactos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
df31f87
)
[NET] Fix remaining issues with logon hours.
author
Eric Kohl
<eric.kohl@reactos.org>
Tue, 28 May 2019 15:23:43 +0000
(17:23 +0200)
committer
Eric Kohl
<eric.kohl@reactos.org>
Tue, 28 May 2019 15:23:43 +0000
(17:23 +0200)
base/applications/network/net/cmdUser.c
patch
|
blob
|
history
diff --git
a/base/applications/network/net/cmdUser.c
b/base/applications/network/net/cmdUser.c
index
1ce735e
..
4530e28
100644
(file)
--- a/
base/applications/network/net/cmdUser.c
+++ b/
base/applications/network/net/cmdUser.c
@@
-909,6
+909,24
@@
ParseDay(
}
}
+static
+DWORD
+LocalToGmtHour(
+ LONG lLocalHour,
+ LONG lBias)
+{
+ LONG lGmtHour;
+
+ lGmtHour = lLocalHour + lBias;
+ if (lGmtHour < 0)
+ lGmtHour += UNITS_PER_WEEK;
+ else if (lGmtHour > UNITS_PER_WEEK)
+ lGmtHour -= UNITS_PER_WEEK;
+
+ return (DWORD)lGmtHour;
+}
+
+
static
DWORD
ParseLogonHours(
static
DWORD
ParseLogonHours(
@@
-1018,14
+1036,7
@@
ParseLogonHours(
break;
}
break;
}
- /* Convert from local timezone to GMT */
- lStartHour += lBias;
- if (lStartHour < 0)
- lStartHour += UNITS_PER_WEEK;
- else if (lStartHour > UNITS_PER_WEEK)
- lStartHour -= UNITS_PER_WEEK;
-
- SetBitValue(HourBitmap, (DWORD)lStartHour);
+ SetBitValue(HourBitmap, LocalToGmtHour(lStartHour, lBias));
}
else
{
}
else
{
@@
-1051,19
+1062,10
@@
ParseLogonHours(
break;
}
break;
}
- if (lEndHour < lStartHour)
+ if (lEndHour <
=
lStartHour)
lEndHour += HOURS_PER_DAY;
lEndHour += HOURS_PER_DAY;
- else if (lEndHour == lStartHour)
- lEndHour = lStartHour + HOURS_PER_DAY;
-
- /* Convert from local timezone to GMT */
- lEndHour += lBias;
- if (lEndHour < 0)
- lEndHour += UNITS_PER_WEEK;
- else if (lEndHour > UNITS_PER_WEEK)
- lEndHour -= UNITS_PER_WEEK;
- for (i =
(DWORD)lStartHour; i < (DWORD)lEndHour
; i++)
+ for (i =
LocalToGmtHour(lStartHour, lBias); i < LocalToGmtHour(lEndHour, lBias)
; i++)
SetBitValue(HourBitmap, i);
}
else
SetBitValue(HourBitmap, i);
}
else