CrystalDiskInfo 8.2.4

- Added Windows Server 2019 and Windows 10 Pro for Workstation/Education support
hiyohiyo · Aug 18, 2019 · 6c4c009 · 6c4c009
1 parent 05157af
commit 6c4c009
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 12 deletions.
diff --git a/DiskInfo.rc b/DiskInfo.rc
@@ -870,8 +870,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 8.2.3,2019
- PRODUCTVERSION 8.2.3,2019
+ FILEVERSION 8.2.4,2019
+ PRODUCTVERSION 8.2.4,2019
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -888,9 +888,9 @@ BEGIN
         BEGIN
             VALUE "Comments", "https://crystalmark.info/, The MIT License."
             VALUE "CompanyName", "Crystal Dew World"
-            VALUE "FileVersion", "8.2.3.2019"
+            VALUE "FileVersion", "8.2.4.2019"
             VALUE "LegalCopyright", "(C) 2008-2019 hiyohiyo"
-            VALUE "ProductVersion", "8.2.3.2019"
+            VALUE "ProductVersion", "8.2.4.2019"
             VALUE "ProductName", "CrystalDiskInfo"
             VALUE "FileDescription", "CrystalDiskInfo"
             VALUE "OriginalFilename", "DiskInfo.exe"

diff --git a/DiskInfoDlg.cpp b/DiskInfoDlg.cpp
@@ -292,7 +292,7 @@ CDiskInfoDlg::CDiskInfoDlg(CWnd* pParent /*=NULL*/, BOOL flagStartupExit)
 		m_FontType = FT_AUTO;
 	}
 
-	m_ZoomType = (BOOL)GetPrivateProfileInt(_T("Setting"), _T("ZoomType"), ZOOM_TYPE_AUTO, m_Ini);
+	m_ZoomType = GetPrivateProfileInt(_T("Setting"), _T("ZoomType"), ZOOM_TYPE_AUTO, m_Ini);
 
 	// Setting
 	SAVE_SMART_PERIOD = GetPrivateProfileInt(_T("Setting"), _T("SAVE_SMART_PERIOD"), 150, m_Ini);

diff --git a/DiskInfoDlgCopy.cpp b/DiskInfoDlgCopy.cpp
@@ -55,7 +55,7 @@ void CDiskInfoDlg::CopySave(CString fileName)
 	clip = _T("\
 ----------------------------------------------------------------------------\r\n\
 %PRODUCT% %VERSION% (C) %COPY_YEAR% hiyohiyo\r\n\
-                                Crystal Dew World : https://crystalmark.info/\r\n\
+                                Crystal Dew World: https://crystalmark.info/\r\n\
 ----------------------------------------------------------------------------\r\n\
 \r\n\
     OS : %OS%\r\n\

diff --git a/GetOsInfo.cpp b/GetOsInfo.cpp
@@ -267,7 +267,14 @@ void GetOsName(CString& OsFullName)
 		{
 			if (osvi.wProductType != VER_NT_WORKSTATION)
 			{
-				osName = _T("Windows Server 2016");
+				if(osvi.dwBuildNumber >= 17763)
+				{
+					osName = _T("Windows Server 2019");
+				}
+				else
+				{
+					osName = _T("Windows Server 2016");
+				}
 			}
 			else
 			{
@@ -397,12 +404,22 @@ void GetOsName(CString& OsFullName)
 						osType = (_T("Professional N"));
 					}
 					break;
-
-				case RRODUCT_ESSENTIALBUSINESS_SERVER_MGMT:
+				case PRODUCT_PRO_WORKSTATION:
+					osType = (_T("Pro for Workstation"));
+					break;
+				case PRODUCT_PRO_WORKSTATION_N:
+					osType = (_T("Pro for Workstation N"));
+					break;
+				case PRODUCT_PRO_FOR_EDUCATION:
+					osType = (_T("Pro for Education"));
+					break;
+				case PRODUCT_PRO_FOR_EDUCATION_N:
+					osType = (_T("Pro for Education N"));
+					break;
 				case PRODUCT_ESSENTIALBUSINESS_SERVER_ADDL:
 				case PRODUCT_ESSENTIALBUSINESS_SERVER_MGMTSVC:
 				case PRODUCT_ESSENTIALBUSINESS_SERVER_ADDLSVC:
-					osType = (_T("Essentials"));
+					osType = (_T("Essentials Server"));
 					break;
 				}
 			}

diff --git a/stdafx.h b/stdafx.h
@@ -104,8 +104,8 @@ static void ControlBarCleanUp() {}
 #endif
 #endif
 
-#define PRODUCT_VERSION			_T("8.2.3")
-#define PRODUCT_RELEASE			_T("2019/08/11")
+#define PRODUCT_VERSION			_T("8.2.4")
+#define PRODUCT_RELEASE			_T("2019/08/18")
 #define PRODUCT_COPY_YEAR		_T("2008-2019")
 #define PRODUCT_COPYRIGHT		_T("© 2008-2019 hiyohiyo")
 #define PRODUCT_LICENSE			_T("The MIT License")