diff options
| author | Arnon Gilboa <agilboa@redhat.com> | 2013-03-18 12:54:04 +0200 |
|---|---|---|
| committer | Arnon Gilboa <agilboa@redhat.com> | 2013-03-18 12:54:04 +0200 |
| commit | 877e52386e6a98ec5c5bd54af13a984b571674ea (patch) | |
| tree | b705e816f50e9505e9897f51d97b5cf2ccd13fbb /vdservice | |
| parent | 9b05b948fce1db343d6d57425194e72d2c850760 (diff) | |
vdservice: extract supported_system_version() to vdcommon
rhbz #919451 preparation
Diffstat (limited to 'vdservice')
| -rw-r--r-- | vdservice/vdservice.cpp | 24 | ||||
| -rw-r--r-- | vdservice/vdservice.vcproj | 4 |
2 files changed, 4 insertions, 24 deletions
diff --git a/vdservice/vdservice.cpp b/vdservice/vdservice.cpp index 90a3b26..9134c4b 100644 --- a/vdservice/vdservice.cpp +++ b/vdservice/vdservice.cpp @@ -119,30 +119,6 @@ VDService* VDService::get() return (VDService*)_singleton; } -enum SystemVersion { - SYS_VER_UNSUPPORTED, - SYS_VER_WIN_XP_CLASS, // also Server 2003/R2 - SYS_VER_WIN_7_CLASS, // also Windows 8, Server 2012, Server 2008/R2 & Vista -}; - -int supported_system_version() -{ - OSVERSIONINFOEX osvi; - - ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX)); - osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - if (!GetVersionEx((OSVERSIONINFO*)&osvi)) { - vd_printf("GetVersionEx() failed: %lu", GetLastError()); - return 0; - } - 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 <= 2) { - return SYS_VER_WIN_7_CLASS; - } - return 0; -} - VDService::VDService() : _status_handle (0) , _events (NULL) diff --git a/vdservice/vdservice.vcproj b/vdservice/vdservice.vcproj index 45af4c5..736f425 100644 --- a/vdservice/vdservice.vcproj +++ b/vdservice/vdservice.vcproj @@ -363,6 +363,10 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
+ RelativePath="..\common\vdcommon.cpp"
+ >
+ </File>
+ <File
RelativePath="..\common\vdlog.cpp"
>
</File>
|