Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1683373: Add hasUserCET flag to cpu.extensions in Telemetry Environment. r=dmajor

Browse Source 
Depends on D100124

Differential Revision: https://phabricator.services.mozilla.com/D100156
This commit is contained in:
Bob Owen 2020-12-19 19:48:29 +00:00
parent 6638e1db57
commit 19d42b3c5b
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
toolkit/components/telemetry/app/TelemetryEnvironment.jsm
View File

@ -1843,6 +1843,7 @@ EnvironmentCache.prototype = {
"hasARMv6",
"hasARMv7",
"hasNEON",
"hasUserCET",
];
// Enumerate the available CPU extensions.

20
xpcom/base/nsSystemInfo.cpp
View File

@ -29,6 +29,7 @@
# include <wscapi.h>
# endif // __MINGW32__
# include "base/scoped_handle_win.h"
# include "mozilla/DynamicallyLinkedFunctionPtr.h"
# include "nsAppDirectoryServiceDefs.h"
# include "nsDirectoryServiceDefs.h"
# include "nsDirectoryServiceUtils.h"
@ -854,6 +855,13 @@ nsresult CollectProcessInfo(ProcessInfo& info) {
return NS_OK;
}
#if defined(XP_WIN) && (_WIN32_WINNT < 0x0A00)
WINBASEAPI
BOOL WINAPI IsUserCetAvailableInEnvironment(_In_ DWORD UserCetEnvironment);
# define USER_CET_ENVIRONMENT_WIN32_PROCESS 0x00000000
#endif
nsresult nsSystemInfo::Init() {
// check that it is called from the main thread on all platforms.
MOZ_ASSERT(NS_IsMainThread());
@ -950,6 +958,18 @@ nsresult nsSystemInfo::Init() {
}
}
# endif // __MINGW32__
mozilla::DynamicallyLinkedFunctionPtr<decltype(
&IsUserCetAvailableInEnvironment)>
isUserCetAvailable(L"api-ms-win-core-sysinfo-l1-2-6.dll",
"IsUserCetAvailableInEnvironment");
bool hasUserCET = isUserCetAvailable &&
isUserCetAvailable(USER_CET_ENVIRONMENT_WIN32_PROCESS);
rv = SetPropertyAsBool(u"hasUserCET"_ns, hasUserCET);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
#endif
#if defined(XP_MACOSX)