зеркало из https://github.com/mozilla/gecko-dev.git
Backout bfeb3bc3da4e (bug 826029) for WINNT xpcshell failures
This commit is contained in:
Родитель
063cb6cecf
Коммит
e1feef974c
|
@ -107,7 +107,6 @@ XRE_SetupDllBlocklistType XRE_SetupDllBlocklist;
|
|||
XRE_TelemetryAccumulateType XRE_TelemetryAccumulate;
|
||||
XRE_StartupTimelineRecordType XRE_StartupTimelineRecord;
|
||||
XRE_mainType XRE_main;
|
||||
XRE_DisableWritePoisoningType XRE_DisableWritePoisoning;
|
||||
|
||||
static const nsDynamicFunctionLoad kXULFuncs[] = {
|
||||
{ "XRE_GetFileFromPath", (NSFuncPtr*) &XRE_GetFileFromPath },
|
||||
|
@ -119,7 +118,6 @@ static const nsDynamicFunctionLoad kXULFuncs[] = {
|
|||
{ "XRE_TelemetryAccumulate", (NSFuncPtr*) &XRE_TelemetryAccumulate },
|
||||
{ "XRE_StartupTimelineRecord", (NSFuncPtr*) &XRE_StartupTimelineRecord },
|
||||
{ "XRE_main", (NSFuncPtr*) &XRE_main },
|
||||
{ "XRE_DisableWritePoisoning", (NSFuncPtr*) &XRE_DisableWritePoisoning },
|
||||
{ nullptr, nullptr }
|
||||
};
|
||||
|
||||
|
@ -282,13 +280,5 @@ int main(int argc, char* argv[])
|
|||
}
|
||||
|
||||
XPCOMGlueShutdown();
|
||||
|
||||
// Allow writes again. While we would like to catch writes from static
|
||||
// destructors to allow early exits to use _exit, we know that there is
|
||||
// at least one such write that we don't control (see bug 826029). For
|
||||
// now we enables write again and early exits will have to use exit instead
|
||||
// of _exit.
|
||||
XRE_DisableWritePoisoning();
|
||||
|
||||
return result;
|
||||
}
|
||||
|
|
|
@ -4080,11 +4080,6 @@ XRE_mainMetro(int argc, char* argv[], const nsXREAppData* aAppData)
|
|||
void SetWindowsEnvironment(WindowsEnvironmentType aEnvID);
|
||||
#endif // MOZ_METRO || !defined(XP_WIN)
|
||||
|
||||
void
|
||||
XRE_DisableWritePoisoning(void) {
|
||||
mozilla::DisableWritePoisoning();
|
||||
}
|
||||
|
||||
int
|
||||
XRE_main(int argc, char* argv[], const nsXREAppData* aAppData, uint32_t aFlags)
|
||||
{
|
||||
|
|
|
@ -452,8 +452,6 @@ XRE_API(void,
|
|||
XRE_API(void,
|
||||
XRE_InitOmnijar, (nsIFile* greOmni,
|
||||
nsIFile* appOmni))
|
||||
XRE_API(void,
|
||||
XRE_DisableWritePoisoning, (void))
|
||||
|
||||
#ifdef XP_WIN
|
||||
/**
|
||||
|
|
Загрузка…
Ссылка в новой задаче