Merge pull request #68 from CherryPill/v1.4

V1.4
CherryPill · Feb 11, 2020 · 6bc13a6 · 6bc13a6
2 parents f93afdc + 2602104
commit 6bc13a6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 23 deletions.
diff --git a/SystemInfo/core/SystemInfo.cpp b/SystemInfo/core/SystemInfo.cpp
@@ -110,11 +110,3 @@ void SystemInfo::setSnapshotGenDateTime(wstring snapshotGenDateTime) {
 wstring SystemInfo::getSnapshotGenDateTime(void) {
 	return (*this).snapshotGenDateTime;
 }
-
-wstring SystemInfo::getComputerType() {
-	return (*this).computerType;
-}
-
-void SystemInfo::setComputerType(wstring computerType) {
-	(*this).computerType = computerType;
-}
diff --git a/SystemInfo/core/SystemInfo.h b/SystemInfo/core/SystemInfo.h
@@ -19,7 +19,6 @@ class SystemInfo {
 		this->uptime = L"Uptime not set";
 	}
 	wstring BIOS;
-	wstring computerType;
 	wstring OS;
 	wstring CPU;
 	wstring MB;
@@ -57,7 +56,6 @@ class SystemInfo {
 	}
 	wstring getOS(void);
 	wstring getSnapshotGenDateTime();
-	wstring getComputerType();
 	void setBIOS(wstring bios);
 	void setUptime(wstring uptime);
 	void setCPU(wstring CPU);
@@ -72,5 +70,4 @@ class SystemInfo {
 	void setAudio(wstring audio);
 	void addCDROMDevice(wstring CDROM);
 	void setSnapshotGenDateTime(wstring dt);
-	void setComputerType(wstring computerType);
 };
diff --git a/SystemInfo/core/sysinfo.cpp b/SystemInfo/core/sysinfo.cpp
@@ -125,10 +125,9 @@ int fillSystemInformation(SystemInfo *localMachine) {
 	//use the IWbemServices pointer to make requests of WMI
 
 	//temp
-	fillCPUTemp(localMachine, hres, pSvc, pLoc);
+	//fillCPUTemp(localMachine, hres, pSvc, pLoc);
 	//hardware
 	fillBIOS(localMachine);
-	fillComputerType(localMachine);
 	for (int x = 0; x < sizeof(fillInfoFuncs) / sizeof(fillInfoFuncs[0]); x++) {
 		(*fillInfoFuncs[x])(localMachine, hres, pSvc, pLoc);
 	}
@@ -173,6 +172,8 @@ void fillCPU(SystemInfo *localMachine,
 		processor = vtProp.bstrVal;
 		trimNullTerminator(processor);
 		trimWhiteSpace(processor);
+		removeTabulation(processor);
+		condenseSpaces(processor);
 		if (processor.find(L"@", 0) == string::npos) {
 			hr = pclsObj->Get(queryAttrs.at((int)WMI_CPU::MAXCLOCK), 0, &vtProp, 0, 0);
 			maxClockInMhZ = vtProp.uintVal;
@@ -461,8 +462,8 @@ void fillDimensionsAndFrequency(HRESULT hres,
 
 
 void fillStorage(SystemInfo *localMachine,
-				HRESULT hres, IWbemServices *pSvc,
-				IWbemLocator *pLoc) {
+				 HRESULT hres, IWbemServices *pSvc,
+				 IWbemLocator *pLoc) {
 	vector<LPCWSTR> queryAttrs = wmiClassStringsMap.at(L"Win32_DiskDrive");
 
 	IEnumWbemClassObject* pEnumerator =
@@ -614,6 +615,7 @@ void fillBIOS(SystemInfo *localMachine) {
 	} else {
 		MessageBox(NULL, _T("Memory allocation failed"), _T("Fatal Error"), MB_OK);
 	}
+	_tcscat(biosData, (wchar_t*)getComputerType().c_str());
 	localMachine->setBIOS(biosData);
 }
 
@@ -624,7 +626,7 @@ void fillCPUTemp(SystemInfo *localMachine,
 }
 
 wstring getSocket(HRESULT hres, IWbemServices *pSvc,
-				   IWbemLocator *pLoc) {
+				  IWbemLocator *pLoc) {
 	wstring socket;
 	IEnumWbemClassObject* pEnumerator = NULL;
 	pEnumerator = executeWQLQuery(hres, pLoc, pSvc, bstr_t("SELECT * FROM Win32_Processor"));
@@ -824,13 +826,13 @@ bstr_t buildQueryString(const wchar_t *wmiClass, vector<LPCWSTR> attrs) {
 	return bstr_t(queryString);
 }
 
-void fillComputerType(SystemInfo *localMachine) {
+wstring getComputerType() {
 	SYSTEM_POWER_CAPABILITIES systemPowerCapabilities;
 	ZeroMemory(&systemPowerCapabilities, sizeof(systemPowerCapabilities));
 	GetPwrCapabilities(&systemPowerCapabilities);
-	systemPowerCapabilities.LidPresent
+	return systemPowerCapabilities.LidPresent
 		?
-		localMachine->setComputerType(PCType[0])
+		PCType[0]
 		:
-		localMachine->setComputerType(PCType[1]);
+		PCType[1];
 }
diff --git a/SystemInfo/core/sysinfo.h b/SystemInfo/core/sysinfo.h
@@ -66,7 +66,7 @@
 	int test();
 	void fillCPUTemp(SystemInfo *localMachine, HRESULT hres, IWbemServices *pSvc, IWbemLocator *pLoc);
 	//hardware
-	void fillComputerType(SystemInfo *localMachine);
+	wstring getComputerType(void);
 	void fillBIOS(SystemInfo *localMachine);
 	void fillOS(SystemInfo *localMachine, HRESULT hres, IWbemServices *pSvc, IWbemLocator *pLoc);
 	void fillCPU(SystemInfo *localMachine, HRESULT hres, IWbemServices *pSvc, IWbemLocator *pLoc);

diff --git a/SystemInfo/mainWindowProcedure.cpp b/SystemInfo/mainWindowProcedure.cpp
@@ -363,8 +363,7 @@ void createHardwareInfoHolders(HWND parent, SystemInfo *info, int offsetIndex) {
 void populateInfoHolders(SystemInfo *currentMachineInfo, HWND mainWindowHwnd) {
 	TCHAR biosInfo[256] = { 0 };
 	_tcscat(biosInfo, currentMachineInfo->getBIOS().c_str());
-	_tcscat(biosInfo, currentMachineInfo->getComputerType().c_str());
-
+
 	SetWindowText(GetDlgItem(mainWindowHwnd, BIOS_INFO),
 				  biosInfo);
 	SetWindowText(GetDlgItem(mainWindowHwnd, OS_INFO),