Merge branch 'windows-port' into webreplay-release

Author: bhackett1024

browser/app/splash.rc

@@ -6,12 +6,15 @@
 #include <windows.h>
 #include "nsNativeAppSupportWin.h"
 
+/* These icons are disabled to avoid build breaks when using non-standard branding. */
+/*
 IDI_APPICON ICON FIREFOX_ICO
 IDI_DOCUMENT ICON DOCUMENT_ICO
 IDI_APPLICATION ICON FIREFOX_ICO
 IDI_NEWWINDOW ICON NEWWINDOW_ICO
 IDI_NEWTAB ICON NEWTAB_ICO
 IDI_PBMODE ICON PBMODE_ICO
+*/
 
 STRINGTABLE DISCARDABLE
 BEGIN

browser/branding/recordreplay/firefox64.ico

@@ -0,0 +1,61 @@
+/* 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/. */
+
+body {
+  color: white;
+}
+
+#label,
+#progress_background,
+#blurb {
+  text-align: center;
+  margin: 20px 30px;
+}
+
+#label {
+  font-size: 40px;
+  margin-top: 100px;
+  margin-bottom: 20px;
+}
+
+#progress_background {
+  margin: 0 auto;
+  width: 60%;
+  height: 24px;
+  background-color: white;
+}
+
+body.high-contrast #progress_background {
+  outline: solid;
+}
+
+#progress_bar {
+  margin: 0;
+  width: 0%;
+  height: 100%;
+  background-color: #00AAFF;
+}
+
+/* In high contrast mode, fill the entire progress bar with its border. */
+body.high-contrast #progress_bar {
+  /* This border should be the height of progress_background. */
+  border-top: 24px solid;
+  box-sizing: border-box;
+}
+
+/* This layout doesn't want the header or content text. */
+#header, #content {
+  display: none;
+}
+
+#blurb {
+  font-size: 20px;
+}
+
+/* The footer goes in the bottom right corner. */
+#footer {
+  position: fixed;
+  right: 50px;
+  bottom: 59px;
+}

browser/branding/recordreplay/stubinstaller/bgstub.jpg

@@ -0,0 +1,42 @@
+/* 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/. */
+
+body {
+  color: white;
+}
+
+#header,
+#refreshCheckboxContainer,
+#refreshButtonContainer {
+  text-align: center;
+  margin-left: 40px;
+  margin-right: 40px;
+  margin-bottom: 30px;
+}
+
+#header {
+  font-size: 35px;
+  font-weight: normal;
+  margin-top: 45px;
+}
+
+#refreshCheckbox {
+  vertical-align: middle;
+}
+
+#checkboxLabel {
+  font-size: 13px;
+}
+
+#refreshButton {
+  padding: 8px 40px;
+  font-size: 15px;
+}
+
+/* The footer goes in the bottom right corner. */
+#footer {
+  position: fixed;
+  right: 50px;
+  bottom: 59px;
+}

browser/branding/recordreplay/stubinstaller/installing_page.css

@@ -3,28 +3,42 @@ const os = require("os");
 const { spawnSync } = require("child_process");
 const gecko = __dirname;
 
-// Download the latest record/replay driver.
-const driverFile = `${currentPlatform()}-recordreplay.so`;
-spawnChecked("curl", [`https://replay.io/downloads/${driverFile}`, "-o", driverFile], { stdio: "inherit" });
-
-// Embed the driver in the source.
-const driverContents = fs.readFileSync(driverFile);
-fs.unlinkSync(driverFile);
-let driverString = "";
-for (let i = 0; i < driverContents.length; i++) {
-  driverString += `\\${driverContents[i].toString(8)}`;
-}
-fs.writeFileSync(
-  `${gecko}/toolkit/recordreplay/RecordReplayDriver.cpp`,
-  `
+if (process.platform != "win32") {
+  // Download the latest record/replay driver.
+  const driverFile = `${currentPlatform()}-recordreplay.so`;
+  spawnChecked("curl", [`https://replay.io/downloads/${driverFile}`, "-o", driverFile], { stdio: "inherit" });
+
+  // Embed the driver in the source.
+  const driverContents = fs.readFileSync(driverFile);
+  fs.unlinkSync(driverFile);
+  let driverString = "";
+  for (let i = 0; i < driverContents.length; i++) {
+    driverString += `\\${driverContents[i].toString(8)}`;
+  }
+  fs.writeFileSync(
+    `${gecko}/toolkit/recordreplay/RecordReplayDriver.cpp`,
+    `
+>>>>>>> windows-port
 namespace mozilla::recordreplay {
   char gRecordReplayDriver[] = "${driverString}";
   int gRecordReplayDriverSize = ${driverContents.length};
 }
-`
-);
+  `
+  );
+} else {
+  fs.writeFileSync(
+    `${gecko}/toolkit/recordreplay/RecordReplayDriver.cpp`,
+    ""
+  );
+}
 
-spawnChecked("./mach", ["build"], { stdio: "inherit" });
+spawnChecked("bash", ["./mach", "build"], {
+  stdio: "inherit",
+  env: {
+    ...process.env,
+    RUSTC_BOOTSTRAP: "qcms",
+  },
+});
 
 function spawnChecked(cmd, args, options) {
   const prettyCmd = [cmd].concat(args).join(" ");
@@ -46,6 +60,8 @@ function currentPlatform() {
       return "macOS";
     case "linux":
       return "linux";
+    case "win32":
+      return "windows";
     default:
       throw new Error(`Platform ${process.platform} not supported`);
   }

browser/branding/recordreplay/stubinstaller/profile_cleanup_page.css

@@ -1876,7 +1876,7 @@ set_config("MOZ_HARDENING_LDFLAGS_JS", security_hardening_cflags.js_ldflags)
 def frame_pointer_flags(compiler):
     if compiler.type == "clang-cl":
         return namespace(
-            enable=["-Oy-"],
+            enable=["-Oy-", "-clang:-fno-omit-frame-pointer"],
             disable=["-Oy"],
         )
     return namespace(

browser/branding/recordreplay/wizHeader.bmp

@@ -42,6 +42,8 @@
 #include <usp10.h>
 #include <objbase.h>
 
+#include "mozilla/RecordReplay.h"
+
 static void (*gEnsureLOGFONTAccessibleProc)(const LOGFONT&);
 
 void SkTypeface_SetEnsureLOGFONTAccessibleProc(void (*proc)(const LOGFONT&)) {
@@ -557,6 +559,11 @@ const void* HDCOffscreen::draw(const SkGlyph& glyph, bool isBW,
     uint16_t glyphID = glyph.getGlyphID();
     BOOL ret = ExtTextOutW(fDC, 0, 0, ETO_GLYPH_INDEX, nullptr, reinterpret_cast<LPCWSTR>(&glyphID), 1, nullptr);
     GdiFlush();
+
+    // For now we record/replay the drawn text manually, instead of handling this
+    // within the recording driver.
+    mozilla::recordreplay::RecordReplayBytes("HDCOffscreen::draw", fBits, size);
+
     if (0 == ret) {
         return nullptr;
     }

browser/branding/recordreplay/wizHeaderRTL.bmp

@@ -51,8 +51,19 @@ std::condition_variable *initCondition;
 // Used when ICU implementation code passes nullptr for the mutex pointer.
 UMutex globalMutex;
 
-pthread_once_t initFlag = PTHREAD_ONCE_INIT;
-pthread_once_t *pInitFlag = &initFlag;
+std::atomic<int> initFlag{0};
+std::atomic<int> *pInitFlag = &initFlag;
+
+static void call_once(std::atomic<int>* init, void (*callback)()) {
+    int v = 0;
+    bool rv = std::atomic_compare_exchange_strong(init, &v, 1);
+    if (rv) {
+        callback();
+        *init = 2;
+    } else {
+        while (*init != 2) {}
+    }
+}
 
 }  // Anonymous namespace
 
@@ -64,7 +75,7 @@ static UBool U_CALLCONV umtx_cleanup() {
 
     // Reset the once_flag, by destructing it and creating a fresh one in its place.
     // Do not use this trick anywhere else in ICU; use umtx_initOnce, not std::call_once().
-    *pInitFlag = PTHREAD_ONCE_INIT;
+    *pInitFlag = 0;
     return true;
 }
 
@@ -79,7 +90,7 @@ U_CDECL_END
 std::mutex *UMutex::getMutex() {
     std::mutex *retPtr = fMutex.load(std::memory_order_acquire);
     if (retPtr == nullptr) {
-        pthread_once(pInitFlag, umtx_init);
+        call_once(pInitFlag, umtx_init);
         std::lock_guard<std::mutex> guard(*initMutex);
         retPtr = fMutex.load(std::memory_order_acquire);
         if (retPtr == nullptr) {
@@ -142,7 +153,7 @@ umtx_unlock(UMutex* mutex)
 //
 U_COMMON_API UBool U_EXPORT2
 umtx_initImplPreInit(UInitOnce &uio) {
-    pthread_once(pInitFlag, umtx_init);
+    call_once(pInitFlag, umtx_init);
     std::unique_lock<std::mutex> lock(*initMutex);
     if (umtx_loadAcquire(uio.fState) == 0) {
         umtx_storeRelease(uio.fState, 1);

browser/branding/recordreplay/wizWatermark.bmp

@@ -19,7 +19,11 @@ class Lock {
   // Optimized wrapper implementation
   Lock(bool ordered = false) : lock_() {
     if (ordered) {
+#ifndef XP_WIN
       mozilla::recordreplay::AddOrderedPthreadMutex("Lock", lock_.native_handle());
+#else
+      mozilla::recordreplay::AddOrderedSRWLock("Lock", lock_.native_handle());
+#endif
     }
   }
   ~Lock() {}

build.js

@@ -11,6 +11,7 @@
 #include "base/message_loop.h"
 #include "base/histogram.h"
 #include "base/win_util.h"
+#include "mozilla/RecordReplay.h"
 #include "WinUtils.h"
 #include "GeckoProfiler.h"
 
@@ -94,7 +95,7 @@ MessagePumpForUI::~MessagePumpForUI() {
 }
 
 void MessagePumpForUI::ScheduleWork() {
-  if (InterlockedExchange(&have_work_, 1))
+  if (have_work_.exchange(1))
     return;  // Someone else continued the pumping.
 
   // Make sure the MessagePump does some work for us.
@@ -257,7 +258,7 @@ void MessagePumpForUI::HandleWorkMessage() {
   // sort.
   if (!state_) {
     // Since we handled a kMsgHaveWork message, we must still update this flag.
-    InterlockedExchange(&have_work_, 0);
+    have_work_ = 0;
     return;
   }
 
@@ -355,7 +356,7 @@ bool MessagePumpForUI::ProcessPumpReplacementMessage() {
          msg.hwnd != message_hwnd_);
 
   // Since we discarded a kMsgHaveWork message, we must update the flag.
-  int old_have_work = InterlockedExchange(&have_work_, 0);
+  int old_have_work = have_work_.exchange(0);
   DCHECK(old_have_work);
 
   // We don't need a special time slice if we didn't have_message to process.
@@ -378,8 +379,9 @@ MessagePumpForIO::MessagePumpForIO() {
 }
 
 void MessagePumpForIO::ScheduleWork() {
-  if (InterlockedExchange(&have_work_, 1))
+  if (have_work_.exchange(1)) {
     return;  // Someone else continued the pumping.
+  }
 
   // Make sure the MessagePump does some work for us.
   BOOL ret =
@@ -498,7 +500,7 @@ bool MessagePumpForIO::ProcessInternalIOItem(const IOItem& item) {
       this == reinterpret_cast<MessagePumpForIO*>(item.handler)) {
     // This is our internal completion.
     DCHECK(!item.bytes_transfered);
-    InterlockedExchange(&have_work_, 0);
+    have_work_ = 0;
     return true;
   }
   return false;

build/moz.configure/toolchain.configure

@@ -15,6 +15,7 @@
 #include "base/observer_list.h"
 #include "base/scoped_handle.h"
 #include "base/time.h"
+#include "mozilla/RecordReplay.h"
 
 namespace base {
 
@@ -102,7 +103,7 @@ class MessagePumpWin : public MessagePump {
   // A boolean value used to indicate if there is a kMsgDoWork message pending
   // in the Windows Message queue.  There is at most one such message, and it
   // can drive execution of tasks when a native message pump is running.
-  LONG have_work_;
+  mozilla::recordreplay::OrderedAtomic<LONG> have_work_;
 
   // State for the current invocation of Run.
   RunState* state_;

gfx/skia/skia/src/ports/SkFontHost_win.cpp

@@ -11,6 +11,7 @@
 #include "base/string_util.h"
 #include "mozilla/ipc/ProtocolUtils.h"
 #include "mozilla/RandomNum.h"
+#include "mozilla/RecordReplay.h"
 #include "mozilla/WindowsVersion.h"
 #include "nsDebug.h"
 #include "nsString.h"
@@ -37,21 +38,24 @@ typedef ULONG(__stdcall* NtQuerySectionType)(
 // Checks if the section object is safe to map. At the moment this just means
 // it's not an image section.
 bool IsSectionSafeToMap(HANDLE handle) {
-  static NtQuerySectionType nt_query_section_func =
-      reinterpret_cast<NtQuerySectionType>(
-          ::GetProcAddress(::GetModuleHandle(L"ntdll.dll"), "NtQuerySection"));
-  DCHECK(nt_query_section_func);
-
-  // The handle must have SECTION_QUERY access for this to succeed.
-  SECTION_BASIC_INFORMATION basic_information = {};
-  ULONG status =
-      nt_query_section_func(handle, SectionBasicInformation, &basic_information,
-                            sizeof(basic_information), nullptr);
-  if (status) {
-    return false;
+  // Avoid calling NtQuerySection when replaying, as intercepting this function
+  // causes crashes inside ntdll when recording for some reason.
+  bool rv = false;
+  if (!mozilla::recordreplay::IsReplaying()) {
+    mozilla::recordreplay::AutoPassThroughThreadEvents pt;
+    static NtQuerySectionType nt_query_section_func =
+        reinterpret_cast<NtQuerySectionType>(
+            ::GetProcAddress(::GetModuleHandle(L"ntdll.dll"), "NtQuerySection"));
+    DCHECK(nt_query_section_func);
+
+    // The handle must have SECTION_QUERY access for this to succeed.
+    SECTION_BASIC_INFORMATION basic_information = {};
+    ULONG status =
+        nt_query_section_func(handle, SectionBasicInformation, &basic_information,
+                              sizeof(basic_information), nullptr);
+    rv = status ? false : ((basic_information.Attributes & SEC_IMAGE) != SEC_IMAGE);
   }
-
-  return (basic_information.Attributes & SEC_IMAGE) != SEC_IMAGE;
+  return mozilla::recordreplay::RecordReplayValue("IsSectionSafeToMap", rv);
 }
 
 }  // namespace