Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(750)

Unified Diff: sandbox/win/tests/integration_tests/hooking_win_proc.cc

Issue 2944493002: [Windows Sandbox Tests] Process Mitigations. (Closed)
Patch Set: Code review fixes, part 2. Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sandbox/win/tests/integration_tests/hooking_win_proc.cc
diff --git a/sandbox/win/tests/integration_tests/hooking_win_proc.cc b/sandbox/win/tests/integration_tests/hooking_win_proc.cc
index 3c6770abff969a12287b180b25f13d504c673a50..0c00edb5a8487e657d1059876d3c4ec94c62a140 100644
--- a/sandbox/win/tests/integration_tests/hooking_win_proc.cc
+++ b/sandbox/win/tests/integration_tests/hooking_win_proc.cc
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "integration_tests_common.h"
-
#include <windows.h>
+#include "hooking_win_proc.h"
+
LRESULT CALLBACK WndProc(HWND window,
UINT message,
WPARAM w_param,
@@ -33,8 +33,12 @@ int WINAPI WinMain(HINSTANCE instance,
HINSTANCE prev_instance,
LPSTR cmd_line,
int cmd_show) {
+ constexpr wchar_t winproc_class_name[] = L"myWindowClass";
+ constexpr wchar_t winproc_window_name[] = L"ChromeMitigationTests";
+
// The parent process should have set up this named event already.
- HANDLE event = ::OpenEventW(EVENT_MODIFY_STATE, FALSE, g_winproc_event);
+ HANDLE event = ::OpenEventW(EVENT_MODIFY_STATE, FALSE,
+ hooking_win_proc::g_winproc_event);
if (event == NULL || event == INVALID_HANDLE_VALUE)
return 1;
@@ -50,17 +54,17 @@ int WINAPI WinMain(HINSTANCE instance,
window_class.hCursor = ::LoadCursor(NULL, IDC_ARROW);
window_class.hbrBackground = reinterpret_cast<HBRUSH>(COLOR_WINDOWFRAME);
window_class.lpszMenuName = NULL;
- window_class.lpszClassName = g_winproc_class_name;
+ window_class.lpszClassName = winproc_class_name;
window_class.hIconSm = ::LoadIcon(NULL, IDI_APPLICATION);
if (!::RegisterClassEx(&window_class))
return 1;
// Step 2: Create the Window.
- HWND window = ::CreateWindowExW(WS_EX_CLIENTEDGE, g_winproc_class_name,
- g_winproc_window_name, WS_OVERLAPPEDWINDOW,
- CW_USEDEFAULT, CW_USEDEFAULT, 240, 120, NULL,
- NULL, instance, NULL);
+ HWND window =
+ ::CreateWindowExW(WS_EX_CLIENTEDGE, winproc_class_name,
+ winproc_window_name, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT,
+ CW_USEDEFAULT, 240, 120, NULL, NULL, instance, NULL);
if (window == NULL)
return 1;
« no previous file with comments | « sandbox/win/tests/integration_tests/hooking_win_proc.h ('k') | sandbox/win/tests/integration_tests/integration_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698