[Spice-devel] [PATCH v2] vdservice: support Windows 8 & Server 2012

[Christophe Fergeau]

On Thu, Nov 22, 2012 at 01:38:07PM +0200, Arnon Gilboa wrote:
> vdagent was ok, but vdservice required adding these to the version check.
> Both are handled as the rest of the Win7 class.
> Tested on Win8x64.
> ---
>  vdservice/vdservice.cpp |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/vdservice/vdservice.cpp b/vdservice/vdservice.cpp
> index 8f12317..6a1ed79 100644
> --- a/vdservice/vdservice.cpp
> +++ b/vdservice/vdservice.cpp
> @@ -121,7 +121,7 @@ VDService* VDService::get()
>  enum SystemVersion {
>      SYS_VER_UNSUPPORTED,
>      SYS_VER_WIN_XP_CLASS, // also Server 2003/R2
> -    SYS_VER_WIN_7_CLASS,  // also Server 2008/R2 & Vista
> +    SYS_VER_WIN_7_CLASS,  // also Windows 8, Server 2012, Server 2008/R2 & Vista
>  };
>  
>  int supported_system_version()
> @@ -136,7 +136,7 @@ int supported_system_version()
>      }
>      if (osvi.dwMajorVersion == 5 && (osvi.dwMinorVersion == 1 || osvi.dwMinorVersion == 2)) {
>          return SYS_VER_WIN_XP_CLASS;
> -    } else if (osvi.dwMajorVersion == 6 && (osvi.dwMinorVersion == 0 || osvi.dwMinorVersion == 1)) {
> +    } else if (osvi.dwMajorVersion == 6 && (osvi.dwMinorVersion >= 0 && osvi.dwMinorVersion <= 2)) {

The () are not strictly needed. ACK.

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/spice-devel/attachments/20121122/bc352e83/attachment.pgp>