diff --git a/docs/functions/sys.html b/docs/functions/sys.html index acfff59..d3529f4 100644 --- a/docs/functions/sys.html +++ b/docs/functions/sys.html @@ -49,43 +49,63 @@ sys.version.type
-
sys.datetime
+
sys.datetime (system.datetime)

Date and time format

Syntax

-
sys.datetime
-sys.datetime.date
-sys.datetime.date_day
-sys.datetime.date_dayofweek
-sys.datetime.date_month
-sys.datetime.date_y
-sys.datetime.date_year
-sys.datetime.date_yy
-sys.datetime.short
-sys.datetime.time
-sys.datetime.time_hour
-sys.datetime.time_milliseconds
-sys.datetime.time_min
-sys.datetime.time_minute
-sys.datetime.time_ms
-sys.datetime.time_pm
-sys.datetime.time_second
+
sys.datetime                                   // the date and time in a short format (Format: YYYY.MM.DD-HH.MM.SS).
+sys.datetime.short                             // the date and time in a short format (Format: YYYY.MM.DD-HH.MM.SS).
+sys.datetime.dayofweek (sys.datetime.dw)       // the day of the week as a number (Sunday as 1)
+
+sys.datetime.date                              // the full date in a long format (Format: YYYY.MM.DD).
+sys.datetime.yy                                // the year part of the current date as a two-digit number.
+sys.datetime.year (sys.datetime.y)             // the year part of the current date as a four-digit number.
+sys.datetime.month (sys.datetime.m)            // the month part of the current date.
+sys.datetime.day (sys.datetime.d)              // the day part of the current date.
+
+sys.datetime.time                              // the full time in hours, minutes, and seconds (Format: HH.MM.SS).
+sys.datetime.pm                                // "AM" or "PM" based on the current time.
+sys.datetime.hour (sys.datetime.h)             // the hour part of the current time (24-hour format).
+sys.datetime.minute (sys.datetime.min)         // the minutes part of the current time.
+sys.datetime.second (sys.datetime.s)           // the seconds part of the current time.
+sys.datetime.milliseconds (sys.datetime.ms)    // the milliseconds part of the current time as a three-digit number.
+
+sys.datetime("D")                              // the full date in a short format (Format: DD/MM/YYYY).
+sys.datetime("Y")                              // the year part of the current date as a four-digit number.
+sys.datetime("y")                              // the year part of the current date as a two-digit number.
+sys.datetime("m")                              // the month part of the current date as a two-digit number.
+sys.datetime("d")                              // the day part of the current date as a two-digit number.
+sys.datetime("P") (sys.datetime("p"))          // "AM" or "PM" based on the current time.
+sys.datetime("h")                              // the hour part of the current time as a two-digit number (12-hour format).
+sys.datetime("H")                              // the hour part of the current time as a two-digit number (24-hour format).
+sys.datetime("M")                              // the minute part of the current time as a two-digit number.
+sys.datetime("S")                              // the second part of the current time as a two-digit number.
+sys.datetime("s")                              // the milliseconds part of the current time as a three-digit number.
+
+datetime("y/m/d")                              // the date in a short format (Format: YYYY/MM/DD).
+datetime("h:M P")                              // the time in a short format (Format: HH:MM AM/PM).
+datetime("H.M.S.s")                            // the time in a long format (Format: HH.MM.SS.MS).
Windows paths
-
sys.appdata
-sys.bin
+	
sys                                            // %WINDIR%
+
+sys.root                                       // %SYSTEMDRIVE%
+
+sys.programdata                                // %PROGRAMDATA%
+sys.prog                                       // %PROGRAMFILES%
+sys.prog32                                     // %PROGRAMFILES(x86)%
+sys.templates
+
+sys.users
+sys.appdata                                    // %APPDATA%
+sys.temp                                       // %TEMP%
+
+sys.directory (sys.dir)                        // %WINDIR%
+sys.path                                       // %WINDIR%
+sys.bin                                        // %WINDIR%\system32
 sys.bin32
 sys.bin64
-sys.directory (sys.dir)
-sys.path
-sys.prog
-sys.prog32
-sys.programdata
-sys.root
-sys.temp
-sys.templates
-sys.users
 sys.wow
@@ -95,3 +115,52 @@ sys.wow

Syntax

sys.is_primary_monitor
+ +
+
sys.langid
+

Returns the language ID

+

Syntax

+ sys.langid
+
+ +
+
sys.extended
+

Returns whether the Shift key is currently pressed

+

Syntax

+ sys.extended
+
+ +
+
sys.is11
+

Returns whether the Windows version is 11

+

Syntax

+ sys.is11
+
+ +
+
sys.is10
+

Returns whether the Windows version is 10

+

Syntax

+ sys.is10
+
+ +
+
sys.is81
+

Returns whether the Windows version is 8.1

+

Syntax

+ sys.is81
+
+ +
+
sys.is8
+

Returns whether the Windows version is 8

+

Syntax

+ sys.is8
+
+ +
+
sys.is7
+

Returns whether the Windows version is 7

+

Syntax

+ sys.is7
+
\ No newline at end of file diff --git a/src/dll/src/Expression/FuncExpression.cpp b/src/dll/src/Expression/FuncExpression.cpp index 862b667..904f080 100644 --- a/src/dll/src/Expression/FuncExpression.cpp +++ b/src/dll/src/Expression/FuncExpression.cpp @@ -4239,34 +4239,34 @@ namespace Nilesoft break; } case IDENT_IS7ORGREATER: - _result = ver->Major >= 6 && ver->Minor >= 1; + _result = ver->Major > 6 || (ver->Major == 6 && ver->Minor >= 1); break; case IDENT_IS8ORGREATER: - _result = ver->Major >= 6 && ver->Minor >= 2; + _result = ver->Major > 6 || (ver->Major == 6 && ver->Minor >= 2); break; case IDENT_IS81ORGREATER: - _result = ver->Major >= 6 && ver->Minor >= 3; + _result = ver->Major > 6 || (ver->Major == 6 && ver->Minor >= 3); break; case IDENT_IS10ORGREATER: _result = ver->Major >= 10; break; case IDENT_S11ORGREATER: - _result = ver->Major >= 10 && ver->Build >= 22000; + _result = ver->Major >10 || (ver->Major == 10 && ver->Build >= 22000); break; case IDENT_IS7OREARLIER: - _result = ver->Major <= 6 && ver->Minor <= 1; + _result = ver->Major < 6 || (ver->Major == 6 && ver->Minor <= 1); break; case IDENT_IS8OREARLIER: - _result = ver->Major <= 6 && ver->Minor <= 2; + _result = ver->Major < 6 || (ver->Major == 6 && ver->Minor <= 2); break; case IDENT_IS81OREARLIER: - _result = ver->Major <= 6 && ver->Minor <= 3; + _result = ver->Major < 6 || (ver->Major == 6 && ver->Minor <= 3); break; case IDENT_IS10OREARLIER: - _result = ver->Major <= 10 && ver->Build < 22000; + _result = ver->Major < 10 || (ver->Major == 10 && ver->Build < 22000); break; case IDENT_IS11OREARLIER: - _result = ver->Major <= 10 && ver->Build <= 22000; + _result = ver->Major < 10 || (ver->Major == 10 && ver->Build <= 22000); break; case IDENT_IS_PRIMARY_MONITOR: _result = context->helper.is_primary_monitor;