livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-9935 Include full win10 build number in Help > About Second Life and logs

master
AndreyL ProductEngine 2018-11-12 15:31:19 +02:00
parent 0e0d6b02cd
commit 209ab87e7d
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
indra/llcommon/llsys.cpp
View File

@ -275,10 +275,32 @@ LLOSInfo::LLOSInfo() :
} }
} }
S32 ubr = 0; // Windows 10 Update Build Revision, can be retrieved from a registry
if (mMajorVer == 10)
{
DWORD cbData(sizeof(DWORD));
DWORD data(0);
HKEY key;
BOOL ret_code = RegOpenKeyExW(HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), 0, KEY_READ, &key);
if (ERROR_SUCCESS == ret_code)
{
ret_code = RegQueryValueExW(key, L"UBR", 0, NULL, reinterpret_cast<LPBYTE>(&data), &cbData);
if (ERROR_SUCCESS == ret_code)
{
ubr = data;
}
}
}
mOSString = mOSStringSimple; mOSString = mOSStringSimple;
if (mBuild > 0) if (mBuild > 0)
{ {
mOSString += llformat("(Build %d)", mBuild); mOSString += llformat("(Build %d", mBuild);
if (ubr > 0)
{
mOSString += llformat(".%d", ubr);
}
mOSString += ")";
} }
LLStringUtil::trim(mOSStringSimple); LLStringUtil::trim(mOSStringSimple);