Bug 946799 part B - fix the blocklist annotation to use the correct size, r=dmajor
authorBenjamin Smedberg <benjamin@smedbergs.us>
Fri, 06 Dec 2013 09:00:06 -0500
changeset 174843 14c40f80f7e28017f66d51b65096997e6ceffef5
parent 174842 dccf3c3e7125c0a9144ecc9b5d3298d6550cab2d
child 174844 5118bd7f09548a09383473e2a5e4bb8fc68bd601
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdmajor
bugs946799
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 946799 part B - fix the blocklist annotation to use the correct size, r=dmajor
mozglue/build/WindowsDllBlocklist.cpp
--- a/mozglue/build/WindowsDllBlocklist.cpp
+++ b/mozglue/build/WindowsDllBlocklist.cpp
@@ -145,23 +145,23 @@ static DllBlockInfo sWindowsDllBlocklist
 
 // define this for very verbose dll load debug spew
 #undef DEBUG_very_verbose
 
 static const char kBlockedDllsParameter[] = "BlockedDllList=";
 static const int kBlockedDllsParameterLen =
   sizeof(kBlockedDllsParameter) - 1;
 
-static const char kBlocklistInitFailedParameter[] = "BlocklistInitFailed=";
+static const char kBlocklistInitFailedParameter[] = "BlocklistInitFailed=1\n";
 static const int kBlocklistInitFailedParameterLen =
   sizeof(kBlocklistInitFailedParameter) - 1;
 
-static const char kUser32BeforeBlocklistParameter[] = "User32BeforeBlocklist=";
+static const char kUser32BeforeBlocklistParameter[] = "User32BeforeBlocklist=1\n";
 static const int kUser32BeforeBlocklistParameterLen =
-  sizeof(kUser32BeforeBlocklistParameterLen) - 1;
+  sizeof(kUser32BeforeBlocklistParameter) - 1;
 
 static DWORD sThreadLoadingXPCOMModule;
 static bool sBlocklistInitFailed;
 static bool sUser32BeforeBlocklist;
 
 // Duplicated from xpcom glue. Ideally this should be shared.
 static void
 printf_stderr(const char *fmt, ...)
@@ -638,17 +638,15 @@ DllBlocklist_WriteNotes(HANDLE file)
 
   WriteFile(file, kBlockedDllsParameter, kBlockedDllsParameterLen, &nBytes, nullptr);
   DllBlockSet::Write(file);
   WriteFile(file, "\n", 1, &nBytes, nullptr);
 
   if (sBlocklistInitFailed) {
     WriteFile(file, kBlocklistInitFailedParameter,
               kBlocklistInitFailedParameterLen, &nBytes, nullptr);
-    WriteFile(file, "1\n", 2, &nBytes, nullptr);
   }
 
   if (sUser32BeforeBlocklist) {
     WriteFile(file, kUser32BeforeBlocklistParameter,
               kUser32BeforeBlocklistParameterLen, &nBytes, nullptr);
-    WriteFile(file, "1\n", 2, &nBytes, nullptr);
   }
 }