Make kernel-entry page to support Windows 11.

BlackINT3 · Oct 28, 2021 · 8fc6aa1 · 8fc6aa1
1 parent cf3d548
commit 8fc6aa1
Show file tree

Hide file tree

Showing 7 changed files with 268 additions and 219 deletions.
diff --git a/src/OpenArk/common/win-wrapper/win-wrapper.cpp b/src/OpenArk/common/win-wrapper/win-wrapper.cpp
@@ -690,4 +690,113 @@ ULONG64 GetFreeLibraryAddress(DWORD pid)
 		addr = GetFreeLibraryAddress32(pid);
 	}
 	return addr;
+}
+
+std::string OsWinVersionInfo()
+{
+	//from https://github.com/BlackINT3/unone
+	std::string winver;
+	auto major = UNONE::OsMajorVer();
+	auto minor = UNONE::OsMinorVer();
+	auto release = UNONE::OsBuildNumber();
+	SYSTEM_INFO info;
+	GetSystemInfo(&info);
+	OSVERSIONINFOEX os;
+	os.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+	GetVersionEx((OSVERSIONINFO *)&os);
+	if (major == 10 && minor == 0) {
+		if (os.dwPlatformId == VER_PLATFORM_WIN32_NT) {
+			if (release > 19043) winver = "Windows 11";
+			else winver = "Windows 10";
+		} else {
+			switch (release) {
+			case 14393: winver = "Windows Server 2016"; break;
+			case 17763:
+			case 18363:
+			case 19041:
+			case 19042: winver = "Windows Server 2019"; break;
+			case 20348: winver = "Windows Server 2022"; break;
+			}
+		}
+	} else {
+		switch (major) {
+		case 4:
+			switch (minor) {
+			case 0:
+				if (os.dwPlatformId == VER_PLATFORM_WIN32_NT) winver = "Windows NT 4.0";
+				else if (os.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) winver = "Windows 95";
+				break;
+			case 10: winver = "Windows 98"; break;
+			case 90: winver = "Windows ME"; break;
+			}
+			break;
+		case 5:
+			switch (major) {
+			case 0: winver = "Windows 2000"; break;
+			case 1: winver = "Windows XP"; break;
+			case 2:
+				if (os.wProductType == VER_NT_WORKSTATION && info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
+					winver = "Windows XP Professional x64 Edition";
+				else if (GetSystemMetrics(SM_SERVERR2) == 0)
+					winver = "Windows Server 2003";
+				else if (GetSystemMetrics(SM_SERVERR2) != 0)
+					winver = "Windows Server 2003 R2";
+				break;
+			}
+			break;
+		case 6:
+			switch (minor) {
+			case 0:
+				if (os.wProductType == VER_NT_WORKSTATION) winver = "Windows Vista";
+				else winver = "Windows Server 2008";
+				break;
+			case 1:
+				if (os.wProductType == VER_NT_WORKSTATION) winver = "Windows 7";
+				else winver = "Windows Server 2008 R2";
+				break;
+			case 2:
+				if (os.wProductType == VER_NT_WORKSTATION) winver = "Windows 8";
+				else winver = "Windows Server 2012";
+				break;
+			case 3:
+				if (os.wProductType == VER_NT_WORKSTATION) winver = "Windows 8.1";
+				else winver = "Windows Server 2012 R2";
+			}
+			break;
+		}
+	}
+	return winver;
+}
+
+std::string OsReleaseNumber()
+{
+	/*
+	//c++11
+	std::map<DWORD, DWORD> tables = {
+	{ 10240, 1507 }, { 10586, 1511} ,{ 14393, 1607 } ,{ 15063, 1703 } ,{ 16299, 1709 } ,{ 17134, 1803 } ,
+	{ 17763, 1809 }, { 18362, 1903 } ,{ 18363, 1909 } ,{ 19041, 2004 }, { 19042, 20H2 }
+	};*/
+
+	std::pair<DWORD, std::string> pairs[] = {
+		std::make_pair(10240, "1507"),
+		std::make_pair(10586, "1511"),
+		std::make_pair(14393, "1607"),
+		std::make_pair(15063, "1703"),
+		std::make_pair(16299, "1709"),
+		std::make_pair(17134, "1803"),
+		std::make_pair(17763, "1809"),
+		std::make_pair(18362, "1903"),
+		std::make_pair(18363, "1909"),
+		std::make_pair(19041, "2004"),
+		std::make_pair(19042, "20H2"),
+		std::make_pair(19043, "21H1"),
+		std::make_pair(22000, "21H2"),
+	};
+	std::map<DWORD, std::string> tables(pairs, pairs + _countof(pairs));
+
+	DWORD build = UNONE::OsBuildNumber();
+	auto it = tables.find(build);
+	if (it != tables.end())
+		return it->second;
+	return "";
 }
diff --git a/src/OpenArk/common/win-wrapper/win-wrapper.h b/src/OpenArk/common/win-wrapper/win-wrapper.h
@@ -51,4 +51,6 @@ DWORD OsGetExplorerPid();
 bool ObLoadDriverRegistryW(__in const std::wstring &file_path, __in std::wstring srv_name);
 bool ObUnloadDriverRegistryW(__in const std::wstring &srv_name);
 bool PsKillProcess(__in DWORD pid);
-ULONG64 GetFreeLibraryAddress(DWORD pid);
+ULONG64 GetFreeLibraryAddress(DWORD pid);
+std::string OsWinVersionInfo();
+std::string OsReleaseNumber();
diff --git a/src/OpenArk/kernel/driver/driver.cpp b/src/OpenArk/kernel/driver/driver.cpp
@@ -129,10 +129,7 @@ void KernelDriver::InitDriverKitView()
 		QString file = QFileDialog::getOpenFileName(kernel_, tr("Open File"), "", tr("Driver Files (*.sys);;All Files (*.*)"));
 		kernel_->onOpenFile(file);
 	});
-	connect(ui_->signBtn, SIGNAL(clicked()), this, SLOT(onSignDriver()));
-	connect(ui_->installNormallyBtn, SIGNAL(clicked()), this, SLOT(onInstallNormallyDriver()));
-	connect(ui_->installUnsignedBtn, SIGNAL(clicked()), this, SLOT(onInstallUnsignedDriver()));
-	connect(ui_->installExpiredBtn, SIGNAL(clicked()), this, SLOT(onInstallExpiredDriver()));
+	connect(ui_->installBtn, SIGNAL(clicked()), this, SLOT(onInstallNormallyDriver()));
 	connect(ui_->uninstallBtn, SIGNAL(clicked()), this, SLOT(onUninstallDriver()));
 	connect(ui_->writeRegBtn, &QPushButton::clicked, [&] {
 		auto driver = QToWStr(ui_->driverFileEdit->text());

diff --git a/src/OpenArk/kernel/kernel.cpp b/src/OpenArk/kernel/kernel.cpp
@@ -203,36 +203,6 @@ void Kernel::onTabChanged(int index)
 	CommonMainTabObject::onTabChanged(index);
 }
 
-std::string OsReleaseNumber()
-{
-	/*
-	//c++11
-	std::map<DWORD, DWORD> tables = {
-		{ 10240, 1507 }, { 10586, 1511} ,{ 14393, 1607 } ,{ 15063, 1703 } ,{ 16299, 1709 } ,{ 17134, 1803 } ,
-		{ 17763, 1809 }, { 18362, 1903 } ,{ 18363, 1909 } ,{ 19041, 2004 }, { 19042, 20H2 }
-	};*/
-
-	std::pair<DWORD, std::string> pairs[] = {
-		std::make_pair(10240, "1507"),
-		std::make_pair(10586, "1511"),
-		std::make_pair(14393, "1607"),
-		std::make_pair(15063, "1703"),
-		std::make_pair(16299, "1709"),
-		std::make_pair(17134, "1803"),
-		std::make_pair(17763, "1809"),
-		std::make_pair(18362, "1903"),
-		std::make_pair(18363, "1909"),
-		std::make_pair(19041, "2004"),
-		std::make_pair(19042, "20H2"),
-	};
-	std::map<DWORD, std::string> tables(pairs, pairs+_countof(pairs));
-
-	DWORD build = UNONE::OsBuildNumber();
-	auto it = tables.find(build);
-	if (it != tables.end())
-		return it->second;
-	return "";
-}
 void Kernel::InitKernelEntryView()
 {
 	kerninfo_model_ = new QStandardItemModel;
@@ -261,6 +231,7 @@ void Kernel::InitKernelEntryView()
 	GetPerformanceInfo(&perf, sizeof(perf));
 	double gb = round((double)(perf.PhysicalTotal*perf.PageSize) / 1024 / 1024 / 1024);
 
+	AddSummaryUpItem(tr("OperateSystem"), StrToQ(OsWinVersionInfo()));
 	auto major = UNONE::OsMajorVer();
 	AddSummaryUpItem(tr("MajorVersion"), DWordToDecQ(major));
 	AddSummaryUpItem(tr("MiniorVersion"), DWordToDecQ(UNONE::OsMinorVer()));
@@ -281,7 +252,7 @@ void Kernel::InitKernelEntryView()
 	connect(ui.kernelInfoView, &QTableView::doubleClicked, [&](QModelIndex idx) {
 		QString &txt = idx.data().toString();
 		if (txt == tr("ReleaseNumber") || txt == tr("BuildNumber")) {
-			ShellOpenUrl("https://docs.microsoft.com/en-us/windows/release-information/");
+			ShellOpenUrl("https://docs.microsoft.com/en-us/windows/release-health/release-information");
 		}
 	});