diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2013-12-11 15:04:34 +0000 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2013-12-30 17:07:09 +0000 |
| commit | bafab18b87d3ef53a283b3ebe3c35eff2c04aa1e (patch) | |
| tree | 1525b1fb0c622a91045aebd115c926aefde2696d | |
| parent | 78549ac3e6059c6b845de403b890087d11c07c32 (diff) | |
Add the names for Windows 8.1, Windows Server 2012 R2cygwin-patches-for-1.14
Add marketing names for Windows 6.3 versions
Manifest for compatbility so we don't get lied to by GetVersionEx()
Also, make description in manifest a bit more generic
Add marketing name for Windows 5.2 workstation
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
| -rwxr-xr-x | hw/xwin/XWin.exe.manifest | 14 | ||||
| -rw-r--r-- | hw/xwin/winprocarg.c | 10 |
2 files changed, 22 insertions, 2 deletions
diff --git a/hw/xwin/XWin.exe.manifest b/hw/xwin/XWin.exe.manifest index 477334fb3..ea0e138f5 100755 --- a/hw/xwin/XWin.exe.manifest +++ b/hw/xwin/XWin.exe.manifest @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <description>The XWin X Windows server for Cygwin.</description> + <description>The XWin X Windows server</description> <dependency> <dependentAssembly> <assemblyIdentity @@ -18,4 +18,16 @@ <dpiAware>true</dpiAware> </asmv3:windowsSettings> </asmv3:application> + <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> + <application> + <!-- Windows Vista --> + <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> + <!-- Windows 7 --> + <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> + <!-- Windows 8 --> + <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> + <!-- Windows 8.1 --> + <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> + </application> + </compatibility> </assembly> diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c index c91d8dc4d..bb6efc3da 100644 --- a/hw/xwin/winprocarg.c +++ b/hw/xwin/winprocarg.c @@ -1208,6 +1208,12 @@ winOS(void) if (osvi.dwMajorVersion <= 4) prodName = "Windows NT"; else if (osvi.dwMajorVersion == 6) { + if (osvi.dwMinorVersion == 3) { + if (osvi.wProductType == VER_NT_WORKSTATION) + prodName = "Windows 8.1"; + else + prodName = "Windows Server 2012 R2"; + } if (osvi.dwMinorVersion == 2) { if (osvi.wProductType == VER_NT_WORKSTATION) prodName = "Windows 8"; @@ -1229,7 +1235,9 @@ winOS(void) } else if (osvi.dwMajorVersion == 5) { if (osvi.dwMinorVersion == 2) { - if (GetSystemMetrics(SM_SERVERR2)) + if (osvi.wProductType == VER_NT_WORKSTATION) + prodName = "Windows XP x64 Edition"; + else if (GetSystemMetrics(SM_SERVERR2)) prodName = "Windows Server 2003 R2"; else prodName = "Windows Server 2003"; |