diff options
author | Mykhaylo Yehorov <yehorov@gmail.com> | 2015-07-26 23:10:21 +0300 |
---|---|---|
committer | Mykhaylo Yehorov <yehorov@gmail.com> | 2015-07-26 23:10:21 +0300 |
commit | 1cf9df55391fe086913c623ed809a1f7ad43797b (patch) | |
tree | 647f180c010e9afdb518b4e662bf277fe55f2f34 /src/Mayaqua | |
parent | 7772ee119ee0d2adb4d48e675cc0c4785b464475 (diff) | |
parent | 4b65e251f240d0b36c704acd598f4ceb07c41413 (diff) |
merge upstream v4.18-9570-rtm
Diffstat (limited to 'src/Mayaqua')
-rw-r--r-- | src/Mayaqua/MayaType.h | 2 | ||||
-rw-r--r-- | src/Mayaqua/OS.c | 6 | ||||
-rw-r--r-- | src/Mayaqua/Table.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/Mayaqua/MayaType.h b/src/Mayaqua/MayaType.h index 8cbda55f..6476c142 100644 --- a/src/Mayaqua/MayaType.h +++ b/src/Mayaqua/MayaType.h @@ -145,7 +145,7 @@ typedef struct x509_crl_st X509_CRL; #define BUF_SIZE 512
// Support Windows OS list
-#define SUPPORTED_WINDOWS_LIST "Windows 98 / 98 SE / ME / NT 4.0 SP6a / 2000 SP4 / XP SP2, SP3 / Vista SP1, SP2 / 7 SP1 / 8 / 8.1 / Server 2003 SP2 / Server 2008 SP1, SP2 / Hyper-V Server 2008 / Server 2008 R2 SP1 / Hyper-V Server 2008 R2 / Server 2012 / Hyper-V Server 2012 / Server 2012 R2 / Hyper-V Server 2012 R2"
+#define SUPPORTED_WINDOWS_LIST "Windows 98 / 98 SE / ME / NT 4.0 SP6a / 2000 SP4 / XP SP2, SP3 / Vista SP1, SP2 / 7 SP1 / 8 / 8.1 / 10 / Server 2003 SP2 / Server 2008 SP1, SP2 / Hyper-V Server 2008 / Server 2008 R2 SP1 / Hyper-V Server 2008 R2 / Server 2012 / Hyper-V Server 2012 / Server 2012 R2 / Hyper-V Server 2012 R2"
// Infinite
#ifndef WINDOWS_H
diff --git a/src/Mayaqua/OS.c b/src/Mayaqua/OS.c index dacd030e..d4355918 100644 --- a/src/Mayaqua/OS.c +++ b/src/Mayaqua/OS.c @@ -200,11 +200,11 @@ char *OsTypeToStr(UINT type) case OSTYPE_WINDOWS_10:
return "Windows 10\0\n";
case OSTYPE_WINDOWS_SERVER_10:
- return "Windows Server 10\0\n";
+ return "Windows Server 2016\0\n";
case OSTYPE_WINDOWS_11:
- return "Windows 11 or later\0\n";
+ return "Newer than Windows 10\0\n";
case OSTYPE_WINDOWS_SERVER_11:
- return "Windows Server 11 or later\0\n";
+ return "Newer than Windows Server 2016\0\n";
case OSTYPE_UNIX_UNKNOWN:
return "UNIX System\0\n";
case OSTYPE_LINUX:
diff --git a/src/Mayaqua/Table.c b/src/Mayaqua/Table.c index b74f64ca..57b7a46e 100644 --- a/src/Mayaqua/Table.c +++ b/src/Mayaqua/Table.c @@ -293,7 +293,7 @@ bool SaveLangConfig(wchar_t *filename, char *str) FreeLangList(o);
}
- ret = DumpBufW(b, filename);
+ ret = DumpBufWIfNecessary(b, filename);
FreeBuf(b);
|