wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backout bfeb3bc3da4e (bug 826029) for WINNT xpcshell failures

Browse Source
This commit is contained in:
Ed Morley 2013-01-03 10:17:14 +00:00
parent 8b4346d8c4
commit f66f49f8b3
3 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
browser/app/nsBrowserApp.cpp
View File

@ -107,7 +107,6 @@ XRE_SetupDllBlocklistType XRE_SetupDllBlocklist;
XRE_TelemetryAccumulateType XRE_TelemetryAccumulate; XRE_TelemetryAccumulateType XRE_TelemetryAccumulate;
XRE_StartupTimelineRecordType XRE_StartupTimelineRecord; XRE_StartupTimelineRecordType XRE_StartupTimelineRecord;
XRE_mainType XRE_main; XRE_mainType XRE_main;
XRE_DisableWritePoisoningType XRE_DisableWritePoisoning;
static const nsDynamicFunctionLoad kXULFuncs[] = { static const nsDynamicFunctionLoad kXULFuncs[] = {
{ "XRE_GetFileFromPath", (NSFuncPtr*) &XRE_GetFileFromPath }, { "XRE_GetFileFromPath", (NSFuncPtr*) &XRE_GetFileFromPath },
@ -119,7 +118,6 @@ static const nsDynamicFunctionLoad kXULFuncs[] = {
{ "XRE_TelemetryAccumulate", (NSFuncPtr*) &XRE_TelemetryAccumulate }, { "XRE_TelemetryAccumulate", (NSFuncPtr*) &XRE_TelemetryAccumulate },
{ "XRE_StartupTimelineRecord", (NSFuncPtr*) &XRE_StartupTimelineRecord }, { "XRE_StartupTimelineRecord", (NSFuncPtr*) &XRE_StartupTimelineRecord },
{ "XRE_main", (NSFuncPtr*) &XRE_main }, { "XRE_main", (NSFuncPtr*) &XRE_main },
{ "XRE_DisableWritePoisoning", (NSFuncPtr*) &XRE_DisableWritePoisoning },
{ nullptr, nullptr } { nullptr, nullptr }
}; };
@ -282,13 +280,5 @@ int main(int argc, char* argv[])
} }
XPCOMGlueShutdown(); 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; return result;
} }

5
toolkit/xre/nsAppRunner.cpp
View File

@ -4080,11 +4080,6 @@ XRE_mainMetro(int argc, char* argv[], const nsXREAppData* aAppData)
void SetWindowsEnvironment(WindowsEnvironmentType aEnvID); void SetWindowsEnvironment(WindowsEnvironmentType aEnvID);
#endif // MOZ_METRO || !defined(XP_WIN) #endif // MOZ_METRO || !defined(XP_WIN)
void
XRE_DisableWritePoisoning(void) {
mozilla::DisableWritePoisoning();
}
int int
XRE_main(int argc, char* argv[], const nsXREAppData* aAppData, uint32_t aFlags) XRE_main(int argc, char* argv[], const nsXREAppData* aAppData, uint32_t aFlags)
{ {

2
xpcom/build/nsXULAppAPI.h
View File

@ -452,8 +452,6 @@ XRE_API(void,
XRE_API(void, XRE_API(void,
XRE_InitOmnijar, (nsIFile* greOmni, XRE_InitOmnijar, (nsIFile* greOmni,
nsIFile* appOmni)) nsIFile* appOmni))
XRE_API(void,
XRE_DisableWritePoisoning, (void))
#ifdef XP_WIN #ifdef XP_WIN
/** /**