Changeset 232574 in webkit

Timestamp:

Jun 6, 2018 11:25:41 PM (6 years ago)

Author:

Fujii Hironori

Message:

[Win][MiniBrowser] Remove gMainWindow global variable
​https://bugs.webkit.org/show_bug.cgi?id=186378

Reviewed by Ryosuke Niwa.

I'm going to support multiple MainWindow in Bug 186263. It should
not be assumed that MainWindow has only one instance. gMainWindow
is used only in DisplayAuthDialog.

• MiniBrowser/win/Common.cpp:

(authDialogProc): Use DWLP_USER to store the dialog data.
(displayAuthDialog): Moved and renamed from
MainWindow::displayAuthDialog. Use DialogBoxParam instead of
DialogBox to pass a data pointer. Do not return S_OK if
DialogBoxParam returns -1. Take a HWND argument as the parent
window.
(DisplayAuthDialog): Deleted.

• MiniBrowser/win/Common.h:
• MiniBrowser/win/MainWindow.cpp:

(authDialogProc): Moved to Common.cpp.
(MainWindow::displayAuthDialog): Ditto.

• MiniBrowser/win/MainWindow.h:
• MiniBrowser/win/ResourceLoadDelegate.cpp:

(ResourceLoadDelegate::didReceiveAuthenticationChallenge):

• MiniBrowser/win/WinMain.cpp:

(wWinMain): Added a local variable mainWindow instead of using
gMainWindow.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• MiniBrowser/win/Common.cpp (modified) (2 diffs)
• MiniBrowser/win/Common.h (modified) (1 diff)
• MiniBrowser/win/MainWindow.cpp (modified) (1 diff)
• MiniBrowser/win/MainWindow.h (modified) (1 diff)
• MiniBrowser/win/ResourceLoadDelegate.cpp (modified) (3 diffs)
• MiniBrowser/win/WinMain.cpp (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-06-06  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [Win][MiniBrowser] Remove gMainWindow global variable
+        https://bugs.webkit.org/show_bug.cgi?id=186378
+
+        Reviewed by Ryosuke Niwa.
+
+        I'm going to support multiple MainWindow in Bug 186263. It should
+        not be assumed that MainWindow has only one instance. gMainWindow
+        is used only in DisplayAuthDialog.
+
+        * MiniBrowser/win/Common.cpp:
+        (authDialogProc): Use DWLP_USER to store the dialog data.
+        (displayAuthDialog): Moved and renamed from
+        MainWindow::displayAuthDialog. Use DialogBoxParam instead of
+        DialogBox to pass a data pointer. Do not return S_OK if
+        DialogBoxParam returns -1. Take a HWND argument as the parent
+        window.
+        (DisplayAuthDialog): Deleted.
+        * MiniBrowser/win/Common.h:
+        * MiniBrowser/win/MainWindow.cpp:
+        (authDialogProc): Moved to Common.cpp.
+        (MainWindow::displayAuthDialog): Ditto.
+        * MiniBrowser/win/MainWindow.h:
+        * MiniBrowser/win/ResourceLoadDelegate.cpp:
+        (ResourceLoadDelegate::didReceiveAuthenticationChallenge):
+        * MiniBrowser/win/WinMain.cpp:
+        (wWinMain): Added a local variable mainWindow instead of using
+        gMainWindow.
+
 2018-06-06  Dan Bernstein  <mitz@apple.com>
 

trunk/Tools/MiniBrowser/win/Common.cpp

@@ -30 +30 @@
 #include "Common.h"
 
+#include "MiniBrowserLibResource.h"
 #include "MiniBrowserReplace.h"
 #include <dbghelp.h>
 #include <shlobj.h>
+#include <wtf/StdLibExtras.h>
 
 // Global Variables:
 HINSTANCE hInst;
-MainWindow* gMainWindow = nullptr;
 
 // Support moving the transparent window
@@ -119 +120 @@
 }
 
-HRESULT DisplayAuthDialog(std::wstring& username, std::wstring& password)
+struct AuthDialogData {
+    std::wstring& username;
+    std::wstring& password;
+};
+
+static INT_PTR CALLBACK authDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
-    return gMainWindow->displayAuthDialog(username, password);
+    AuthDialogData& data = *reinterpret_cast<AuthDialogData*>(GetWindowLongPtr(hDlg, DWLP_USER));
+    switch (message) {
+    case WM_INITDIALOG:
+        SetWindowLongPtr(hDlg, DWLP_USER, lParam);
+        return TRUE;
+
+    case WM_COMMAND: {
+        int wmId = LOWORD(wParam);
+        switch (wmId) {
+        case IDOK: {
+            TCHAR str[256];
+            int strLen = GetWindowText(GetDlgItem(hDlg, IDC_AUTH_USER), str, WTF_ARRAY_LENGTH(str)-1);
+            str[strLen] = 0;
+            data.username = str;
+
+            strLen = GetWindowText(GetDlgItem(hDlg, IDC_AUTH_PASSWORD), str, WTF_ARRAY_LENGTH(str)-1);
+            str[strLen] = 0;
+            data.password = str;
+
+            EndDialog(hDlg, true);
+            return TRUE;
+        }
+        case IDCANCEL:
+            EndDialog(hDlg, false);
+            return TRUE;
+        }
+        break;
+    }
+    }
+    return FALSE;
+}
+
+HRESULT displayAuthDialog(HWND hwnd, std::wstring& username, std::wstring& password)
+{
+    AuthDialogData data { username, password };
+    auto result = DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_AUTH), hwnd, authDialogProc, reinterpret_cast<LPARAM>(&data));
+    return result > 0 ? S_OK : E_FAIL;
 }
 

trunk/Tools/MiniBrowser/win/Common.h

@@ -34 +34 @@
 void parseCommandLine(bool& usesLayeredWebView, bool& useFullDesktop, bool& pageLoadTesting, _bstr_t& requestedURL);
 void createCrashReport(EXCEPTION_POINTERS*);
+HRESULT displayAuthDialog(HWND, std::wstring& username, std::wstring& password);
 
 extern HINSTANCE hInst;
-extern MainWindow* gMainWindow;
 extern POINT s_windowPosition;
 extern SIZE s_windowSize;

trunk/Tools/MiniBrowser/win/MainWindow.cpp

@@ -384 +384 @@
 }
 
-static INT_PTR CALLBACK authDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    switch (message) {
-    case WM_INITDIALOG: {
-        HWND edit = ::GetDlgItem(hDlg, IDC_AUTH_USER);
-        ::SetWindowText(edit, static_cast<LPCTSTR>(L""));
-
-        edit = ::GetDlgItem(hDlg, IDC_AUTH_PASSWORD);
-        ::SetWindowText(edit, static_cast<LPCTSTR>(L""));
-        return (INT_PTR)TRUE;
-    }
-
-    case WM_COMMAND:
-        if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) {
-            INT_PTR result { };
-
-            if (LOWORD(wParam) == IDOK) {
-                TCHAR user[256];
-                int strLen = ::GetWindowText(::GetDlgItem(hDlg, IDC_AUTH_USER), user, 256);
-                user[strLen] = 0;
-
-                TCHAR pass[256];
-                strLen = ::GetWindowText(::GetDlgItem(hDlg, IDC_AUTH_PASSWORD), pass, 256);
-                pass[strLen] = 0;
-
-                result = reinterpret_cast<INT_PTR>(new std::pair<std::wstring, std::wstring>(user, pass));
-            }
-
-            ::EndDialog(hDlg, result);
-            return (INT_PTR)TRUE;
-        }
-        break;
-    }
-    return (INT_PTR)FALSE;
-}
-
-HRESULT MainWindow::displayAuthDialog(std::wstring& username, std::wstring& password)
-{
-    auto result = DialogBox(hInst, MAKEINTRESOURCE(IDD_AUTH), hwnd(), authDialogProc);
-    if (!result)
-        return E_FAIL;
-
-    auto pair = reinterpret_cast<std::pair<std::wstring, std::wstring>*>(result);
-    username = pair->first;
-    password = pair->second;
-    delete pair;
-
-    return S_OK;
-}
-
 void MainWindow::loadURL(BSTR url)
 {

trunk/Tools/MiniBrowser/win/MainWindow.h

@@ -40 +40 @@
 
     void loadURL(BSTR url);
-    HRESULT displayAuthDialog(std::wstring& username, std::wstring& password);
     
 private:

trunk/Tools/MiniBrowser/win/ResourceLoadDelegate.cpp

@@ -26 +26 @@
 #include "ResourceLoadDelegate.h"
 
+#include "Common.h"
 #include "MiniBrowser.h"
 #include "PageLoadTestClient.h"
@@ -37 +38 @@
 #include <string>
 #include <wininet.h>
-
-extern HRESULT DisplayAuthDialog(std::wstring& username, std::wstring& password);
 
 HRESULT ResourceLoadDelegate::QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject)
@@ -95 +94 @@
 
     std::wstring username, password;
-    if (DisplayAuthDialog(username, password) != S_OK)
+    if (displayAuthDialog(m_client->hwnd(), username, password) != S_OK)
         return E_FAIL;
 

trunk/Tools/MiniBrowser/win/WinMain.cpp

@@ -66 +66 @@
     ::SetProcessDPIAware();
 
-    gMainWindow = new MainWindow();
-    HRESULT hr = gMainWindow->init(hInst, usesLayeredWebView, pageLoadTesting);
+    auto mainWindow = new MainWindow();
+    HRESULT hr = mainWindow->init(hInst, usesLayeredWebView, pageLoadTesting);
     if (FAILED(hr))
         goto exit;
 
-    ShowWindow(gMainWindow->hwnd(), nCmdShow);
+    ShowWindow(mainWindow->hwnd(), nCmdShow);
 
     hAccelTable = LoadAccelerators(hInst, MAKEINTRESOURCE(IDC_MINIBROWSER));
 
     if (requestedURL.length())
-        gMainWindow->loadURL(requestedURL.GetBSTR());
+        mainWindow->loadURL(requestedURL.GetBSTR());
     else
-        gMainWindow->browserWindow()->loadHTMLString(_bstr_t(defaultHTML).GetBSTR());
+        mainWindow->browserWindow()->loadHTMLString(_bstr_t(defaultHTML).GetBSTR());
 
 #pragma warning(disable:4509)