Bug 946799 part B - fix the blocklist annotation to use the correct size, r=dmajor a=lsblakk
authorBenjamin Smedberg <benjamin@smedbergs.us>
Fri, 06 Dec 2013 09:00:06 -0500
changeset 166761 79e2ad13871d646e5405e4f3dfe2bd1c6120f831
parent 166760 591ed7a98ced45f98d0e944b7b809e97a3e26037
child 166762 d453d9c5d9165cfdd86327450137ab2ac05dd1fb
push id3090
push userbsmedberg@mozilla.com
push dateMon, 16 Dec 2013 14:45:39 +0000
treeherdermozilla-beta@79e2ad13871d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdmajor, lsblakk
bugs946799
milestone27.0
Bug 946799 part B - fix the blocklist annotation to use the correct size, r=dmajor a=lsblakk
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);
   }
 }