GetVersionExを使わない

xtne6f · Aug 18, 2015 · 25e07e1 · 25e07e1
1 parent b00bef1
commit 25e07e1
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/EpgTimerSrv/EpgTimerSrv/EpgTimerSrvMain.cpp b/EpgTimerSrv/EpgTimerSrv/EpgTimerSrvMain.cpp
@@ -81,9 +81,10 @@ bool CEpgTimerSrvMain::Main(bool serviceFlag_)
 	this->residentFlag = serviceFlag_;
 
 	DWORD awayMode;
-	OSVERSIONINFO osvi;
-	osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-	awayMode = GetVersionEx(&osvi) && osvi.dwMajorVersion >= 6 ? ES_AWAYMODE_REQUIRED : 0;
+	OSVERSIONINFOEX osvi;
+	osvi.dwOSVersionInfoSize = sizeof(osvi);
+	osvi.dwMajorVersion = 6;
+	awayMode = VerifyVersionInfo(&osvi, VER_MAJORVERSION, VerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL)) ? ES_AWAYMODE_REQUIRED : 0;
 
 	wstring settingPath;
 	GetSettingPath(settingPath);