From 023631c97ecb90102c216a0f09edf5f617d2c061 Mon Sep 17 00:00:00 2001
From: Ray Kraesig <rkraesig@mozilla.com>
Date: Wed, 30 Aug 2023 17:26:32 +0000
Subject: [PATCH] Bug 1571516 - [1/2] preparatory reorganization  r=gsvelto

Pull the failing section of code out into its own function, for the sake
of clarity of later diffs.

No functional changes.

Differential Revision: https://phabricator.services.mozilla.com/D186987
---
 widget/windows/nsAppShell.cpp | 64 ++++++++++++++++++++---------------
 widget/windows/nsAppShell.h   |  3 +-
 2 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/widget/windows/nsAppShell.cpp b/widget/windows/nsAppShell.cpp
index 2ef6e85e4730..bbf7ac259187 100644
--- a/widget/windows/nsAppShell.cpp
+++ b/widget/windows/nsAppShell.cpp
@@ -361,6 +361,40 @@ nsAppShell::Observe(nsISupports* aSubject, const char* aTopic,
   return nsBaseAppShell::Observe(aSubject, aTopic, aData);
 }
 
+nsresult nsAppShell::InitHiddenWindow() {
+  sAppShellGeckoMsgId = ::RegisterWindowMessageW(kAppShellGeckoEventId);
+  NS_ASSERTION(sAppShellGeckoMsgId,
+               "Could not register hidden window event message!");
+
+  mLastNativeEventScheduled = TimeStamp::NowLoRes();
+
+  WNDCLASSW wc;
+  HINSTANCE module = GetModuleHandle(nullptr);
+
+  const wchar_t* const kWindowClass = L"nsAppShell:EventWindowClass";
+  if (!GetClassInfoW(module, kWindowClass, &wc)) {
+    wc.style = 0;
+    wc.lpfnWndProc = EventWindowProc;
+    wc.cbClsExtra = 0;
+    wc.cbWndExtra = 0;
+    wc.hInstance = module;
+    wc.hIcon = nullptr;
+    wc.hCursor = nullptr;
+    wc.hbrBackground = (HBRUSH) nullptr;
+    wc.lpszMenuName = (LPCWSTR) nullptr;
+    wc.lpszClassName = kWindowClass;
+    [[maybe_unused]] ATOM wcA = RegisterClassW(&wc);
+    MOZ_DIAGNOSTIC_ASSERT(wcA, "RegisterClassW for EventWindowClass failed");
+  }
+
+  mEventWnd = CreateWindowW(kWindowClass, L"nsAppShell:EventWindow", 0, 0, 0,
+                            10, 10, HWND_MESSAGE, nullptr, module, nullptr);
+  MOZ_DIAGNOSTIC_ASSERT(mEventWnd, "CreateWindowW for EventWindow failed");
+  NS_ENSURE_STATE(mEventWnd);
+
+  return NS_OK;
+}
+
 nsresult nsAppShell::Init() {
   LSPAnnotate();
 
@@ -377,35 +411,9 @@ nsresult nsAppShell::Init() {
   // we are processing native events. Disabling this is required for win32k
   // syscall lockdown.
   if (XRE_UseNativeEventProcessing()) {
-    sAppShellGeckoMsgId = ::RegisterWindowMessageW(kAppShellGeckoEventId);
-    NS_ASSERTION(sAppShellGeckoMsgId,
-                 "Could not register hidden window event message!");
-
-    mLastNativeEventScheduled = TimeStamp::NowLoRes();
-
-    WNDCLASSW wc;
-    HINSTANCE module = GetModuleHandle(nullptr);
-
-    const wchar_t* const kWindowClass = L"nsAppShell:EventWindowClass";
-    if (!GetClassInfoW(module, kWindowClass, &wc)) {
-      wc.style = 0;
-      wc.lpfnWndProc = EventWindowProc;
-      wc.cbClsExtra = 0;
-      wc.cbWndExtra = 0;
-      wc.hInstance = module;
-      wc.hIcon = nullptr;
-      wc.hCursor = nullptr;
-      wc.hbrBackground = (HBRUSH) nullptr;
-      wc.lpszMenuName = (LPCWSTR) nullptr;
-      wc.lpszClassName = kWindowClass;
-      [[maybe_unused]] ATOM wcA = RegisterClassW(&wc);
-      MOZ_DIAGNOSTIC_ASSERT(wcA, "RegisterClassW for EventWindowClass failed");
+    if (nsresult rv = this->InitHiddenWindow(); NS_FAILED(rv)) {
+      return rv;
     }
-
-    mEventWnd = CreateWindowW(kWindowClass, L"nsAppShell:EventWindow", 0, 0, 0,
-                              10, 10, HWND_MESSAGE, nullptr, module, nullptr);
-    MOZ_DIAGNOSTIC_ASSERT(mEventWnd, "CreateWindowW for EventWindow failed");
-    NS_ENSURE_STATE(mEventWnd);
   } else if (XRE_IsContentProcess() && !IsWin32kLockedDown()) {
     // We're not generally processing native events, but still using GDI and we
     // still have some internal windows, e.g. from calling CoInitializeEx.
diff --git a/widget/windows/nsAppShell.h b/widget/windows/nsAppShell.h
index 239aedd01a32..20ea65e83459 100644
--- a/widget/windows/nsAppShell.h
+++ b/widget/windows/nsAppShell.h
@@ -19,7 +19,7 @@
 /**
  * Native Win32 Application shell wrapper
  */
-class nsAppShell : public nsBaseAppShell {
+class nsAppShell final : public nsBaseAppShell {
  public:
   nsAppShell()
       : mEventWnd(nullptr),
@@ -49,6 +49,7 @@ class nsAppShell : public nsBaseAppShell {
   static LRESULT CALLBACK EventWindowProc(HWND, UINT, WPARAM, LPARAM);
 
  protected:
+  nsresult InitHiddenWindow();
   HWND mEventWnd;
   bool mNativeCallbackPending;