From: yyagi <yyagi.dtxmania@gmail.com>
Date: Mon, 25 Jun 2018 11:30:58 +0000 (+0900)
Subject: #xxxxx COS.csの、Win10ビルド判定部のリファクタ。
X-Git-Tag: Release113~18
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8b0f1985a9ab032898afbed25f3cf27106e3c876;p=dtxmania%2Fdtxmania.git

#xxxxx COS.csの、Win10ビルド判定部のリファクタ。
---

diff --git a/FDK/コード/00.共通/COS.cs b/FDK/コード/00.共通/COS.cs
index 8fafce44..49a76da8 100644
--- a/FDK/コード/00.共通/COS.cs
+++ b/FDK/コード/00.共通/COS.cs
@@ -129,7 +129,8 @@ namespace FDK
 			RS1 = 14393,
 			RS2 = 15063,
 			RS3 = 16299,
-			UNKNOWN = -1,
+			RS4 = 17134,
+			UNKNOWN  = -1,
 			NOTWIN10 = 0
 		}
 		private static WIN10BUILD GetWin10BuildNumber()
@@ -144,19 +145,22 @@ namespace FDK
 			{
 				ret = WIN10BUILD.NOTWIN10;
 			}
-			else if ((build != (int)WIN10BUILD.TH1) &&
-					  (build != (int)WIN10BUILD.TH2) &&
-					  (build != (int)WIN10BUILD.RS1) &&
-					  (build != (int)WIN10BUILD.RS2) &&
-					  (build != (int)WIN10BUILD.RS3)
-			)
-			{
-				ret = (WIN10BUILD)build;
-			}
-			else
-			{
-				ret = WIN10BUILD.UNKNOWN;
-			}
+			ret = (WIN10BUILD)build;
+
+			//else if ((build != (int)WIN10BUILD.TH1) &&		// 現状だと、「新しすぎるビルド」はWin10でなくUNKNOWNになってしまう。要改善。
+			//		 (build != (int)WIN10BUILD.TH2) &&
+			//		 (build != (int)WIN10BUILD.RS1) &&
+			//		 (build != (int)WIN10BUILD.RS2) &&
+			//		 (build != (int)WIN10BUILD.RS3) &&
+			//		 (build != (int)WIN10BUILD.RS4)
+			//)
+			//{
+			//	ret = (WIN10BUILD)build;
+			//}
+			//else
+			//{
+			//	ret = WIN10BUILD.UNKNOWN;
+			//}
 
 			return ret;
 		}