Backed out 7 changesets (bug 1546154) for causing build bustages on ContentProcess.cpp. CLOSED TREE

Backed out changeset 0bd777eee249 (bug 1546154)
Backed out changeset 611812ee62a2 (bug 1546154)
Backed out changeset cef0aa18a3ab (bug 1546154)
Backed out changeset cfda47fb0a46 (bug 1546154)
Backed out changeset f3e005f5fedc (bug 1546154)
Backed out changeset 7f50fca0c2cd (bug 1546154)
Backed out changeset bbb0b25450f5 (bug 1546154)

Author: Marian-Vasile Laza

browser/app/winlauncher/moz.build

@@ -9,7 +9,6 @@ Library("winlauncher")
 FORCE_STATIC_LIB = True
 
 UNIFIED_SOURCES += [
-    "/ipc/mscom/COMWrappers.cpp",
     "/ipc/mscom/ProcessRuntime.cpp",
     "/toolkit/xre/WinTokenUtils.cpp",
     "/widget/windows/WindowsConsole.cpp",

dom/ipc/ContentProcess.cpp

@@ -17,7 +17,6 @@
 
 #if (defined(XP_WIN) || defined(XP_MACOSX)) && defined(MOZ_SANDBOX)
 #  include "mozilla/SandboxSettings.h"
-#  include "mozilla/WindowsProcessMitigations.h"
 #  include "nsAppDirectoryServiceDefs.h"
 #  include "nsDirectoryService.h"
 #  include "nsDirectoryServiceDefs.h"
@@ -54,9 +53,8 @@ static void SetUpSandboxEnvironment() {
       "SetUpSandboxEnvironment relies on nsDirectoryService being initialized");
 
   // On Windows, a sandbox-writable temp directory is used whenever the sandbox
-  // is enabled, except when win32k is locked down when we no longer require a
-  // temp directory.
-  if (!IsContentSandboxEnabled() || IsWin32kLockedDown()) {
+  // is enabled.
+  if (!IsContentSandboxEnabled()) {
     return;
   }
 

dom/media/ThreadPoolCOMListener.cpp

@@ -0,0 +1,28 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "ThreadPoolCOMListener.h"
+
+namespace mozilla {
+
+NS_IMPL_ISUPPORTS(MSCOMInitThreadPoolListener, nsIThreadPoolListener)
+
+NS_IMETHODIMP
+MSCOMInitThreadPoolListener::OnThreadCreated() {
+  HRESULT hr = CoInitializeEx(0, COINIT_MULTITHREADED);
+  if (FAILED(hr)) {
+    NS_WARNING("Failed to initialize MSCOM on decoder thread.");
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+MSCOMInitThreadPoolListener::OnThreadShuttingDown() {
+  CoUninitialize();
+  return NS_OK;
+}
+
+}  // namespace mozilla

dom/media/ThreadPoolCOMListener.h

@@ -0,0 +1,28 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef MSCOMInitThreadPoolListener_h_
+#define MSCOMInitThreadPoolListener_h_
+
+#include "nsIThreadPool.h"
+#include <objbase.h>
+
+namespace mozilla {
+
+// Thread pool listener which ensures that MSCOM is initialized and
+// deinitialized on the thread pool thread. We may call into WMF on this thread,
+// so we need MSCOM working.
+class MSCOMInitThreadPoolListener final : public nsIThreadPoolListener {
+  ~MSCOMInitThreadPoolListener() {}
+
+ public:
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_NSITHREADPOOLLISTENER
+};
+
+}  // namespace mozilla
+
+#endif  // MSCOMInitThreadPoolListener_h_

dom/media/gmp-plugin-openh264/moz.build

@@ -18,6 +18,11 @@ SOURCES += [
 
 SharedLibrary("fakeopenh264")
 
+if CONFIG["OS_ARCH"] == "WINNT":
+    OS_LIBS += [
+        "ole32",
+    ]
+
 USE_STATIC_LIBS = True
 NoVisibilityFlags()
 # Don't use STL wrappers; this isn't Gecko code

dom/media/gmp/GMPChild.cpp

@@ -209,7 +209,6 @@ mozilla::ipc::IPCResult GMPChild::RecvPreloadLibs(const nsCString& aLibs) {
                            // MFCreateMediaType
       u"msmpeg2vdec.dll",  // H.264 decoder
       u"nss3.dll",         // NSS for clearkey CDM
-      u"ole32.dll",        // required for OPM
       u"psapi.dll",        // For GetMappedFileNameW, see bug 1383611
       u"softokn3.dll",     // NSS for clearkey CDM
   };

dom/media/gmp/GMPParent.cpp

@@ -862,13 +862,13 @@ RefPtr<GenericPromise> GMPParent::ParseChromiumManifest(
 #if XP_WIN
     // psapi.dll added for GetMappedFileNameW, which could possibly be avoided
     // in future versions, see bug 1383611 for details.
-    mLibs = "dxva2.dll, ole32.dll, psapi.dll"_ns;
+    mLibs = "dxva2.dll, psapi.dll"_ns;
 #endif
   } else if (mDisplayName.EqualsASCII("fake")) {
     // The fake CDM just exposes a key system with id "fake".
     video.mAPITags.AppendElement(nsCString{"fake"});
 #if XP_WIN
-    mLibs = "dxva2.dll, ole32.dll"_ns;
+    mLibs = "dxva2.dll"_ns;
 #endif
   } else {
     GMP_PARENT_LOG_DEBUG("%s: Unrecognized key system: %s, failing.",

dom/media/moz.build

@@ -181,6 +181,7 @@ EXPORTS += [
     "SeekTarget.h",
     "SelfRef.h",
     "SharedBuffer.h",
+    "ThreadPoolCOMListener.h",
     "TimeUnits.h",
     "Tracing.h",
     "VideoFrameContainer.h",
@@ -303,6 +304,11 @@ if CONFIG["OS_TARGET"] == "Linux":
 else:
     UNIFIED_SOURCES += ["UnderrunHandlerNoop.cpp"]
 
+if CONFIG["OS_TARGET"] == "WINNT":
+    SOURCES += [
+        "ThreadPoolCOMListener.cpp",
+    ]
+
 # CubebUtils.cpp needs to be built separately due to what appears to be some kind
 # of compiler bug on Android 4.2 x86 opt. See bug 1408459.
 # DecoderTraits.cpp needs to be built separately because of Mac OS X headers.

ipc/chromium/src/base/command_line.cc

@@ -9,7 +9,6 @@
 #if defined(OS_WIN)
 #  include <windows.h>
 #  include <shellapi.h>
-#  include "mozilla/DynamicallyLinkedFunctionPtr.h"
 #endif
 
 #include <algorithm>
@@ -51,16 +50,8 @@ void CommandLine::ParseFromString(const std::wstring& command_line) {
 
   int num_args = 0;
   wchar_t** args = NULL;
-  // When calling CommandLineToArgvW, use the API set if available.
-  // Doing so will bypass loading shell32.dll on Win8+.
-  mozilla::DynamicallyLinkedFunctionPtr<decltype(&::CommandLineToArgvW)>
-      pCommandLineToArgvW(L"api-ms-win-downlevel-shell32-l1-1-0.dll",
-                          "CommandLineToArgvW");
-  if (pCommandLineToArgvW) {
-    args = pCommandLineToArgvW(command_line_string_.c_str(), &num_args);
-  } else {
-    args = CommandLineToArgvW(command_line_string_.c_str(), &num_args);
-  }
+
+  args = CommandLineToArgvW(command_line_string_.c_str(), &num_args);
 
   // Populate program_ with the trimmed version of the first arg.
   TrimWhitespace(args[0], TRIM_ALL, &program_);

ipc/mscom/ApartmentRegion.h

@@ -9,7 +9,8 @@
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/mscom/COMWrappers.h"
+
+#include <objbase.h>
 
 namespace mozilla {
 namespace mscom {
@@ -24,14 +25,14 @@ class MOZ_NON_TEMPORARY_CLASS ApartmentRegion final {
   constexpr ApartmentRegion() : mInitResult(CO_E_NOTINITIALIZED) {}
 
   explicit ApartmentRegion(COINIT aAptType)
-      : mInitResult(wrapped::CoInitializeEx(nullptr, aAptType)) {
+      : mInitResult(::CoInitializeEx(nullptr, aAptType)) {
     // If this fires then we're probably mixing apartments on the same thread
     MOZ_ASSERT(IsValid());
   }
 
   ~ApartmentRegion() {
     if (IsValid()) {
-      wrapped::CoUninitialize();
+      ::CoUninitialize();
     }
   }
 
@@ -43,7 +44,7 @@ class MOZ_NON_TEMPORARY_CLASS ApartmentRegion final {
 
   bool Init(COINIT aAptType) {
     MOZ_ASSERT(mInitResult == CO_E_NOTINITIALIZED);
-    mInitResult = wrapped::CoInitializeEx(nullptr, aAptType);
+    mInitResult = ::CoInitializeEx(nullptr, aAptType);
     MOZ_ASSERT(IsValid());
     return IsValid();
   }