Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows port: For cleanness, print UBR in the log only when the UBR registry value is available.

Browse Source
This commit is contained in:
AnotherCommander 2018-01-11 18:32:09 +01:00
parent 3ad742b418
commit c608fdb856
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Core/OOCPUInfo.m
View File

@ -109,7 +109,7 @@ NSUInteger OOCPUCount(void)
NSString* operatingSystemFullVersion(void) NSString* operatingSystemFullVersion(void)
{ {
OSVERSIONINFOW osver; OSVERSIONINFOW osver;
DWORD UBRValue = 0; char outUBRString[65] = "";
osver.dwOSVersionInfoSize = sizeof(osver); osver.dwOSVersionInfoSize = sizeof(osver);
GetVersionExW (&osver); GetVersionExW (&osver);
@ -122,12 +122,15 @@ NSString* operatingSystemFullVersion(void)
DWORD dwUBR = 0; DWORD dwUBR = 0;
if (RegQueryValueEx(hKey,"UBR", NULL, NULL, (BYTE*)&dwUBR, &dwUBRSize) == ERROR_SUCCESS) if (RegQueryValueEx(hKey,"UBR", NULL, NULL, (BYTE*)&dwUBR, &dwUBRSize) == ERROR_SUCCESS)
{ {
UBRValue = dwUBR; char strUBR[64] = "";
ltoa(dwUBR, strUBR, 10);
strcpy(outUBRString, ".");
strcat(outUBRString, strUBR);
} }
} }
return [NSString stringWithFormat:@"%d.%d.%d.%d %S", return [NSString stringWithFormat:@"%d.%d.%d%s %S",
osver.dwMajorVersion, osver.dwMinorVersion, osver.dwBuildNumber, UBRValue, osver.szCSDVersion]; osver.dwMajorVersion, osver.dwMinorVersion, osver.dwBuildNumber, outUBRString, osver.szCSDVersion];
} }
/* /*