Backed out 2 changesets (bug 1511078) for build bustages at Unified_cpp_toolkit_xre0.obj

Backed out changeset 61a47d6d5e26 (bug 1511078)
Backed out changeset 006df494925a (bug 1511078)

--HG--
rename : toolkit/xre/LauncherResult.h => browser/app/winlauncher/LauncherResult.h
rename : mozglue/misc/NativeNt.h => browser/app/winlauncher/NativeNt.h
rename : mozglue/tests/TestNativeNt.cpp => browser/app/winlauncher/test/TestNativeNt.cpp

Author: ccoroiu

browser/app/winlauncher/DllBlocklistWin.cpp

@@ -4,10 +4,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+#include "NativeNt.h"
 #include "nsWindowsDllInterceptor.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/NativeNt.h"
 #include "mozilla/Types.h"
 #include "mozilla/WindowsDllBlocklist.h"
 #include "mozilla/WinHeaderOnlyUtils.h"

browser/app/winlauncher/DllBlocklistWin.h

@@ -9,7 +9,7 @@
 
 #include <windows.h>
 
-#include "mozilla/LauncherResult.h"
+#include "LauncherResult.h"
 
 namespace mozilla {
 

browser/app/winlauncher/ErrorHandler.cpp

@@ -6,17 +6,11 @@
 
 #include "ErrorHandler.h"
 
-#include "mozilla/LauncherRegistryInfo.h"
-
 namespace mozilla {
 
 void HandleLauncherError(const LauncherError& aError) {
   // This is a placeholder error handler. We'll add telemetry and a fallback
   // error log in future revisions.
-
-  LauncherRegistryInfo regInfo;
-  regInfo.DisableDueToFailure();
-
   WindowsError::UniqueString msg = aError.mError.AsString();
   if (!msg) {
     return;

browser/app/winlauncher/ErrorHandler.h

@@ -8,7 +8,8 @@
 #define mozilla_ErrorHandler_h
 
 #include "mozilla/Assertions.h"
-#include "mozilla/LauncherResult.h"
+
+#include "LauncherResult.h"
 
 namespace mozilla {
 

browser/app/winlauncher/LaunchUnelevated.cpp

@@ -8,11 +8,12 @@
 
 #include "mozilla/Assertions.h"
 #include "mozilla/CmdLineAndEnvUtils.h"
-#include "mozilla/LauncherResult.h"
 #include "mozilla/mscom/COMApartmentRegion.h"
 #include "mozilla/RefPtr.h"
 #include "nsWindowsHelpers.h"
 
+#include "LauncherResult.h"
+
 // For _bstr_t and _variant_t
 #include <comdef.h>
 #include <comutil.h>

browser/app/winlauncher/LaunchUnelevated.h

@@ -8,7 +8,7 @@
 #define mozilla_LaunchUnelevated_h
 
 #include "LauncherProcessWin.h"
-#include "mozilla/LauncherResult.h"
+#include "LauncherResult.h"
 #include "mozilla/Maybe.h"
 #include "nsWindowsHelpers.h"
 

browser/app/winlauncher/LauncherProcessWin.cpp

@@ -13,8 +13,6 @@
 #include "mozilla/CmdLineAndEnvUtils.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/DynamicallyLinkedFunctionPtr.h"
-#include "mozilla/LauncherRegistryInfo.h"
-#include "mozilla/LauncherResult.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/SafeMode.h"
 #include "mozilla/Sprintf.h"  // For printf_stderr
@@ -28,6 +26,7 @@
 
 #include "DllBlocklistWin.h"
 #include "ErrorHandler.h"
+#include "LauncherResult.h"
 #include "LaunchUnelevated.h"
 #include "ProcThreadAttributes.h"
 
@@ -39,7 +38,7 @@
  * At this point the child process has been created in a suspended state. Any
  * additional startup work (eg, blocklist setup) should go here.
  *
- * @return Ok if browser startup should proceed
+ * @return true if browser startup should proceed, otherwise false.
  */
 static mozilla::LauncherVoidResult PostCreationSetup(HANDLE aChildProcess,
                                                      HANDLE aChildMainThread,
@@ -145,14 +144,16 @@ static void MaybeBreakForBrowserDebugging() {
   ::Sleep(pauseLenMs);
 }
 
-static bool DoLauncherProcessChecks(int& argc, wchar_t** argv) {
+namespace mozilla {
+
+bool RunAsLauncherProcess(int& argc, wchar_t** argv) {
   // NB: We run all tests in this function instead of returning early in order
   // to ensure that all side effects take place, such as clearing environment
   // variables.
   bool result = false;
 
 #if defined(MOZ_LAUNCHER_PROCESS)
-  mozilla::LauncherResult<bool> isSame = mozilla::IsSameBinaryAsParentProcess();
+  LauncherResult<bool> isSame = IsSameBinaryAsParentProcess();
   if (isSame.isOk()) {
     result = !isSame.unwrap();
   } else {
@@ -165,47 +166,17 @@ static bool DoLauncherProcessChecks(int& argc, wchar_t** argv) {
     result = true;
   }
 
-  result |= mozilla::CheckArg(
-                argc, argv, L"launcher", static_cast<const wchar_t**>(nullptr),
-                mozilla::CheckArgFlag::RemoveArg) == mozilla::ARG_FOUND;
-
-  return result;
-}
-
-namespace mozilla {
-
-bool RunAsLauncherProcess(int& argc, wchar_t** argv) {
-  LauncherRegistryInfo::ProcessType desiredType =
-      DoLauncherProcessChecks(argc, argv)
-          ? LauncherRegistryInfo::ProcessType::Launcher
-          : LauncherRegistryInfo::ProcessType::Browser;
-
-  // If we're looking at browser, return fast when we're a child process.
-  if (desiredType == LauncherRegistryInfo::ProcessType::Browser &&
-      mozilla::CheckArg(argc, argv, L"contentproc",
-                        static_cast<const wchar_t**>(nullptr),
-                        mozilla::CheckArgFlag::None) == mozilla::ARG_FOUND) {
-    return false;
-  }
-
-  LauncherRegistryInfo regInfo;
-  LauncherResult<LauncherRegistryInfo::ProcessType> runAsType =
-      regInfo.Check(desiredType);
-
-  if (runAsType.isErr()) {
-    HandleLauncherError(runAsType);
-    // If there is an error, we should always fall back to returning false
-    // for safety's sake.
-    return false;
-  }
+  result |=
+      CheckArg(argc, argv, L"launcher", static_cast<const wchar_t**>(nullptr),
+               CheckArgFlag::RemoveArg) == ARG_FOUND;
 
-  if (runAsType.unwrap() == LauncherRegistryInfo::ProcessType::Browser) {
+  if (!result) {
     // In this case, we will be proceeding to run as the browser.
     // We should check MOZ_DEBUG_BROWSER_* env vars.
     MaybeBreakForBrowserDebugging();
   }
 
-  return runAsType.unwrap() == LauncherRegistryInfo::ProcessType::Launcher;
+  return result;
 }
 
 int LauncherMain(int argc, wchar_t* argv[]) {

toolkit/xre/LauncherResult.h renamed to browser/app/winlauncher/LauncherResult.h

@@ -12,62 +12,22 @@
 
 namespace mozilla {
 
-#if defined(MOZILLA_INTERNAL_API)
-
-template <typename T>
-using LauncherResult = WindowsErrorResult<T>;
-
-#else
-
 struct LauncherError {
   LauncherError(const char* aFile, int aLine, WindowsError aWin32Error)
       : mFile(aFile), mLine(aLine), mError(aWin32Error) {}
 
   const char* mFile;
   int mLine;
   WindowsError mError;
-
-  bool operator==(const LauncherError& aOther) const {
-    return mError == aOther.mError;
-  }
-
-  bool operator!=(const LauncherError& aOther) const {
-    return mError != aOther.mError;
-  }
-
-  bool operator==(const WindowsError& aOther) const { return mError == aOther; }
-
-  bool operator!=(const WindowsError& aOther) const { return mError != aOther; }
 };
 
 template <typename T>
 using LauncherResult = Result<T, LauncherError>;
 
-#endif  // defined(MOZILLA_INTERNAL_API)
-
-using LauncherVoidResult = LauncherResult<Ok>;
+using LauncherVoidResult = Result<Ok, LauncherError>;
 
 }  // namespace mozilla
 
-#if defined(MOZILLA_INTERNAL_API)
-
-#define LAUNCHER_ERROR_GENERIC() \
-  ::mozilla::Err(::mozilla::WindowsError::CreateGeneric())
-
-#define LAUNCHER_ERROR_FROM_WIN32(err) \
-  ::mozilla::Err(::mozilla::WindowsError::FromWin32Error(err))
-
-#define LAUNCHER_ERROR_FROM_LAST() \
-  ::mozilla::Err(::mozilla::WindowsError::FromLastError())
-
-#define LAUNCHER_ERROR_FROM_NTSTATUS(ntstatus) \
-  ::mozilla::Err(::mozilla::WindowsError::FromNtStatus(ntstatus))
-
-#define LAUNCHER_ERROR_FROM_HRESULT(hresult) \
-  ::mozilla::Err(::mozilla::WindowsError::FromHResult(hresult))
-
-#else
-
 #define LAUNCHER_ERROR_GENERIC()           \
   ::mozilla::Err(::mozilla::LauncherError( \
       __FILE__, __LINE__, ::mozilla::WindowsError::CreateGeneric()))
@@ -78,7 +38,8 @@ using LauncherVoidResult = LauncherResult<Ok>;
 
 #define LAUNCHER_ERROR_FROM_LAST()         \
   ::mozilla::Err(::mozilla::LauncherError( \
-      __FILE__, __LINE__, ::mozilla::WindowsError::FromLastError()))
+      __FILE__, __LINE__,                  \
+      ::mozilla::WindowsError::FromWin32Error(::GetLastError())))
 
 #define LAUNCHER_ERROR_FROM_NTSTATUS(ntstatus) \
   ::mozilla::Err(::mozilla::LauncherError(     \
@@ -88,14 +49,12 @@ using LauncherVoidResult = LauncherResult<Ok>;
   ::mozilla::Err(::mozilla::LauncherError(   \
       __FILE__, __LINE__, ::mozilla::WindowsError::FromHResult(hresult)))
 
-// This macro wraps the supplied WindowsError with a LauncherError
-#define LAUNCHER_ERROR_FROM_MOZ_WINDOWS_ERROR(err) \
-  ::mozilla::Err(::mozilla::LauncherError(__FILE__, __LINE__, err))
-
-#endif  // defined(MOZILLA_INTERNAL_API)
-
 // This macro enables moving of a mozilla::LauncherError from a
 // mozilla::LauncherResult<Foo> into a mozilla::LauncherResult<Bar>
 #define LAUNCHER_ERROR_FROM_RESULT(result) ::mozilla::Err(result.unwrapErr())
 
+// This macro wraps the supplied WindowsError with a LauncherError
+#define LAUNCHER_ERROR_FROM_MOZ_WINDOWS_ERROR(err) \
+  ::mozilla::Err(::mozilla::LauncherError(__FILE__, __LINE__, err))
+
 #endif  // mozilla_LauncherResult_h

mozglue/misc/NativeNt.h renamed to browser/app/winlauncher/NativeNt.h

@@ -7,19 +7,20 @@
 #ifndef mozilla_NativeNt_h
 #define mozilla_NativeNt_h
 
+#if defined(MOZILLA_INTERNAL_API)
+#error \
+    "This header is for initial process initialization. You don't want to be including this here."
+#endif  // defined(MOZILLA_INTERNAL_API)
+
 #include <stdint.h>
 #include <windows.h>
 #include <winnt.h>
 #include <winternl.h>
 
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/LauncherResult.h"
 
-// The declarations within this #if block are intended to be used for initial
-// process initialization ONLY. You probably don't want to be using these in
-// normal Gecko code!
-#if !defined(MOZILLA_INTERNAL_API)
+#include "LauncherResult.h"
 
 extern "C" {
 
@@ -79,13 +80,9 @@ VOID NTAPI RtlReleaseSRWLockExclusive(PSRWLOCK aLock);
 
 }  // extern "C"
 
-#endif  // !defined(MOZILLA_INTERNAL_API)
-
 namespace mozilla {
 namespace nt {
 
-#if !defined(MOZILLA_INTERNAL_API)
-
 struct MemorySectionNameBuf : public _MEMORY_SECTION_NAME {
   MemorySectionNameBuf() {
     mSectionFileName.Length = 0;
@@ -205,8 +202,6 @@ inline void GetLeafName(PUNICODE_STRING aDestString,
   aDestString->MaximumLength = aDestString->Length;
 }
 
-#endif  // !defined(MOZILLA_INTERNAL_API)
-
 inline char EnsureLowerCaseASCII(char aChar) {
   if (aChar >= 'A' && aChar <= 'Z') {
     aChar -= 'A' - 'a';

browser/app/winlauncher/SameBinary.h

@@ -7,8 +7,8 @@
 #ifndef mozilla_SameBinary_h
 #define mozilla_SameBinary_h
 
-#include "mozilla/LauncherResult.h"
-#include "mozilla/NativeNt.h"
+#include "LauncherResult.h"
+#include "NativeNt.h"
 #include "nsWindowsHelpers.h"
 
 namespace mozilla {