Backed out 2 changesets (bug 1462979) for windows nightly and build bustages
authorAndreea Pavel <apavel@mozilla.com>
Tue, 12 Jun 2018 23:26:52 +0300
changeset 473732 728f6001d25ca6a9daf6779f833fe4b683d49945
parent 473731 2eb17616fb879dc625b7194a4ff41ef1410a70d9
child 473733 a5aa390759bf99d5b23f5f12d19209889a9c96a3
push id1728
push userjlund@mozilla.com
push dateMon, 18 Jun 2018 21:12:27 +0000
treeherdermozilla-release@c296fde26f5f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1462979
milestone61.0
backs out05f93f4378c67c9a3e608edf11c6ef6dde18e091
f5f970316cb959932af5ef2c7e99b0da98ead7b3
Backed out 2 changesets (bug 1462979) for windows nightly and build bustages Backed out changeset 05f93f4378c6 (bug 1462979) Backed out changeset f5f970316cb9 (bug 1462979)
dom/plugins/ipc/FunctionBroker.cpp
dom/plugins/ipc/FunctionBrokerIPCUtils.h
--- a/dom/plugins/ipc/FunctionBroker.cpp
+++ b/dom/plugins/ipc/FunctionBroker.cpp
@@ -726,39 +726,16 @@ const LPINTERNET_BUFFERSA HSRExAReqInfo:
 // passes other values.
 // template<> template<>
 // struct HSRExAReqInfo::FixedValue<3> { static const DWORD value = 0; };
 
 template<> template<>
 struct HSRExAReqInfo::FixedValue<4> { static const DWORD_PTR value; };
 const DWORD_PTR HSRExAReqInfo::FixedValue<4>::value = 0;
 
-/* HttpEndRequestA */
-
-typedef SslFunctionBroker<ID_HttpEndRequestA,
-  decltype(HttpEndRequestA)> HttpEndRequestAFB;
-
-template<>
-ShouldHookFunc* const
-HttpEndRequestAFB::BaseType::mShouldHook = &CheckQuirks<QUIRK_FLASH_HOOK_SSL>;
-
-typedef RequestInfo<ID_HttpEndRequestA> HERAReqInfo;
-
-template<> template<>
-struct HERAReqInfo::FixedValue<1> { static const LPINTERNET_BUFFERSA value; };
-const LPINTERNET_BUFFERSA HERAReqInfo::FixedValue<1>::value = nullptr;
-
-template<> template<>
-struct HERAReqInfo::FixedValue<2> { static const DWORD value; };
-const DWORD HERAReqInfo::FixedValue<2>::value = 0;
-
-template<> template<>
-struct HERAReqInfo::FixedValue<3> { static const DWORD_PTR value; };
-const DWORD_PTR HERAReqInfo::FixedValue<3>::value = 0;
-
 /* InternetQueryOptionA */
 
 typedef FunctionBroker<ID_InternetQueryOptionA,
                        decltype(InternetQueryOptionA)> InternetQueryOptionAFB;
 
 template<>
 ShouldHookFunc* const
 InternetQueryOptionAFB::BaseType::mShouldHook = &CheckQuirks<QUIRK_FLASH_HOOK_SSL>;
@@ -1035,19 +1012,16 @@ AddBrokeredFunctionHooks(FunctionHookArr
     FUN_HOOK(new HttpQueryInfoAFB("wininet.dll", "HttpQueryInfoA",
                                   &HttpQueryInfoA));
   aHooks[ID_HttpSendRequestA] =
     FUN_HOOK(new HttpSendRequestAFB("wininet.dll", "HttpSendRequestA",
                                     &HttpSendRequestA));
   aHooks[ID_HttpSendRequestExA] =
     FUN_HOOK(new HttpSendRequestExAFB("wininet.dll", "HttpSendRequestExA",
                                       &HttpSendRequestExA));
-  aHooks[ID_HttpEndRequestA] =
-    FUN_HOOK(new HttpEndRequestAFB("wininet.dll", "HttpEndRequestA",
-      &HttpEndRequestA));
   aHooks[ID_InternetQueryOptionA] =
     FUN_HOOK(new InternetQueryOptionAFB("wininet.dll", "InternetQueryOptionA",
                                         &InternetQueryOptionA));
   aHooks[ID_InternetErrorDlg] =
     FUN_HOOK(new InternetErrorDlgFB("wininet.dll", "InternetErrorDlg",
                                     InternetErrorDlg));
   aHooks[ID_AcquireCredentialsHandleA] =
     FUN_HOOK(new AcquireCredentialsHandleAFB("sspicli.dll",
--- a/dom/plugins/ipc/FunctionBrokerIPCUtils.h
+++ b/dom/plugins/ipc/FunctionBrokerIPCUtils.h
@@ -35,17 +35,16 @@ enum FunctionHookId
   , ID_InternetReadFile
   , ID_InternetWriteFile
   , ID_InternetSetOptionA
   , ID_HttpAddRequestHeadersA
   , ID_HttpOpenRequestA
   , ID_HttpQueryInfoA
   , ID_HttpSendRequestA
   , ID_HttpSendRequestExA
-  , ID_HttpEndRequestA
   , ID_InternetQueryOptionA
   , ID_InternetErrorDlg
   , ID_AcquireCredentialsHandleA
   , ID_QueryCredentialsAttributesA
   , ID_FreeCredentialsHandle
   , ID_PrintDlgW
   , ID_FunctionHookCount
 #else // defined(XP_WIN)
@@ -282,17 +281,17 @@ struct ParamTraits<OpenFileNameIPC>
         ReadParam(aMsg, aIter, &aResult->mFlagsEx)) {
       return true;
     }
     return false;
   }
 
   static void Log(const paramType& aParam, std::wstring* aLog)
   {
-    aLog->append(StringPrintf(L"[%ls, %ls, %ls, %ls]", aParam.mFilter.c_str(),
+    aLog->append(StringPrintf(L"[%S, %S, %S, %S]", aParam.mFilter.c_str(),
                               aParam.mCustomFilterIn.c_str(), aParam.mFile.c_str(),
                               aParam.mTitle.c_str()));
   }
 };
 
 template <>
 struct ParamTraits<OpenFileNameRetIPC>
 {
@@ -316,17 +315,17 @@ struct ParamTraits<OpenFileNameRetIPC>
         ReadParam(aMsg, aIter, &aResult->mFileExtension)) {
       return true;
     }
     return false;
   }
 
   static void Log(const paramType& aParam, std::wstring* aLog)
   {
-    aLog->append(StringPrintf(L"[%ls, %ls, %ls, %d, %d]", aParam.mCustomFilterOut.c_str(),
+    aLog->append(StringPrintf(L"[%S, %S, %S, %d, %d]", aParam.mCustomFilterOut.c_str(),
                               aParam.mFile.c_str(), aParam.mFileTitle.c_str(),
                               aParam.mFileOffset, aParam.mFileExtension));
   }
 };
 
 template <>
 struct ParamTraits<mozilla::plugins::GetFileNameFunc> :
   public ContiguousEnumSerializerInclusive<mozilla::plugins::GetFileNameFunc,