Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly disable WER reporting

Browse Source
This commit is contained in:
Rye Mutt
2019-10-07 11:56:31 -04:00
parent 8561af1f84
commit a46f1145f5
2 changed files with 10 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/CMakeLists.txt
View File

@@ -1342,6 +1342,7 @@ if (WINDOWS)
shell32
user32
Vfw32
wer
Wbemuuid
winspool
Normaliz

38
indra/newview/llappviewerwin32.cpp
View File

@@ -47,7 +47,6 @@
#include <fcntl.h> //_O_APPEND
#include <io.h> //_open_osfhandle()
#include <errorrep.h> // for AddERExcludedApplicationA()
#include <process.h> // _spawnl()
#include <tchar.h> // For TCHAR support
#include <Werapi.h>
@@ -379,34 +378,15 @@ int APIENTRY WinMain(HINSTANCE hInstance,
void LLAppViewerWin32::disableWinErrorReporting()
{
const char win_xp_string[] = "Microsoft Windows XP";
BOOL is_win_xp = ( getOSInfo().getOSString().substr(0, strlen(win_xp_string) ) == win_xp_string ); /* Flawfinder: ignore*/
if( is_win_xp )
std::string const& executable_name = gDirUtilp->getExecutableFilename();
if( S_OK == WerAddExcludedApplication( utf8str_to_utf16str(executable_name).c_str(), FALSE ) )
{
// Note: we need to use run-time dynamic linking, because load-time dynamic linking will fail
// on systems that don't have the library installed (all non-Windows XP systems)
HINSTANCE fault_rep_dll_handle = LoadLibrary(L"faultrep.dll"); /* Flawfinder: ignore */
if( fault_rep_dll_handle )
{
pfn_ADDEREXCLUDEDAPPLICATIONA pAddERExcludedApplicationA = (pfn_ADDEREXCLUDEDAPPLICATIONA) GetProcAddress(fault_rep_dll_handle, "AddERExcludedApplicationA");
if( pAddERExcludedApplicationA )
{
// Strip the path off the name
const char* executable_name = gDirUtilp->getExecutableFilename().c_str();
if( 0 == pAddERExcludedApplicationA( executable_name ) )
{
U32 error_code = GetLastError();
LL_INFOS() << "AddERExcludedApplication() failed with error code " << error_code << LL_ENDL;
}
else
{
LL_INFOS() << "AddERExcludedApplication() success for " << executable_name << LL_ENDL;
}
}
FreeLibrary( fault_rep_dll_handle );
}
LL_INFOS() << "WerAddExcludedApplication() succeeded for " << executable_name << LL_ENDL;
}
else
{
LL_INFOS() << "WerAddExcludedApplication() failed for " << executable_name << LL_ENDL;
}
}
@@ -451,7 +431,7 @@ bool LLAppViewerWin32::init()
{
// Platform specific initialization.
// Turn off Windows XP Error Reporting
// Turn off Windows Error Reporting
// (Don't send our data to Microsoft--at least until we are Logo approved and have a way
// of getting the data back from them.)
//