Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-14 14:24:10 +02:00
Code Activity

Other minor refactoring

Browse source
This commit is contained in:
Brian Fiete 2020-05-06 05:47:37 -07:00
parent 31214fcbaf
commit caf1ea54a4
1 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

35
BeefLibs/corlib/src/OperatingSystem.bf
View file

@ -137,16 +137,20 @@ namespace System
major = 0; major = 0;
minor = 0; minor = 0;
build = 0; build = 0;
uint32 VerSize, Wnd; uint32 verSize, wnd;
VSFixedFileInfo* FI = &VSFixedFileInfo(); VSFixedFileInfo* FI = &VSFixedFileInfo();
uint32 InfoSize = GetFileVersionInfoSizeA("kernel32.dll", &Wnd); uint32 infoSize = GetFileVersionInfoSizeA("kernel32.dll", &wnd);
if (InfoSize != 0) { if (infoSize != 0)
void* VerBuf = Internal.StdMalloc(InfoSize); {
void* verBuf = new uint8[infoSize]*;
defer delete verBuf;
if (GetFileVersionInfoA("kernel32.dll", &Wnd, InfoSize, VerBuf)) { if (GetFileVersionInfoA("kernel32.dll", &wnd, infoSize, verBuf))
if (VerQueryValueA(VerBuf, "\\", (void**)(&FI), &VerSize)) { {
if (VerQueryValueA(verBuf, "\\", (void**)(&FI), &verSize))
{
major = FI.dwProductVersionMS >> 16; major = FI.dwProductVersionMS >> 16;
minor = (uint16)FI.dwProductVersionMS; minor = (uint16)FI.dwProductVersionMS;
build = FI.dwProductVersionLS >> 16; build = FI.dwProductVersionLS >> 16;
@ -154,7 +158,7 @@ namespace System
} }
} }
Internal.StdFree(VerBuf); Internal.StdFree(verBuf);
} }
return result; return result;
@ -165,10 +169,13 @@ namespace System
LPWKSTA_INFO_100 LBuf = null; LPWKSTA_INFO_100 LBuf = null;
bool result = NetWkstaGetInfo(null, 100, &LBuf) == 0; bool result = NetWkstaGetInfo(null, 100, &LBuf) == 0;
if (result) { if (result)
{
major = LBuf.wki100_ver_major; major = LBuf.wki100_ver_major;
minor = LBuf.wki100_ver_minor; minor = LBuf.wki100_ver_minor;
} else { }
else
{
major = 0; major = 0;
minor = 0; minor = 0;
} }
@ -195,12 +202,16 @@ namespace System
if (Version.Check(5, 1)) // GetNativeSystemInfo not supported on Windows 2000 if (Version.Check(5, 1)) // GetNativeSystemInfo not supported on Windows 2000
GetNativeSystemInfo(&SysInfo); GetNativeSystemInfo(&SysInfo);
if ((Version.Major > 6) || ((Version.Major == 6) && (Version.Minor > 1))) { if ((Version.Major > 6) || ((Version.Major == 6) && (Version.Minor > 1)))
if (GetProductVersion(out MajorNum, out MinorNum, out BuildNum)) { {
if (GetProductVersion(out MajorNum, out MinorNum, out BuildNum))
{
Version.Major = MajorNum; Version.Major = MajorNum;
Version.Minor = MinorNum; Version.Minor = MinorNum;
Version.Build = BuildNum; Version.Build = BuildNum;
} else if (GetNetWkstaMajorMinor(out MajorNum, out MinorNum)) { }
else if (GetNetWkstaMajorMinor(out MajorNum, out MinorNum))
{
Version.Major = MajorNum; Version.Major = MajorNum;
Version.Minor = MinorNum; Version.Minor = MinorNum;
} }