chrome/app/close_handle_hook_win.cc - Issue 1422773008: Fixing remaining VC++ 2015 64-bit build breaks

Unified Diff: chrome/app/close_handle_hook_win.cc

Issue 1422773008: Fixing remaining VC++ 2015 64-bit build breaks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: More use of HandleToUint32 Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/app/close_handle_hook_win.cc

diff --git a/chrome/app/close_handle_hook_win.cc b/chrome/app/close_handle_hook_win.cc

index efec307a62a511e6dc57838bddceab0918224d8c..0c109074cdea18c9fb89e8a8f4e80b8ac764f557 100644

--- a/chrome/app/close_handle_hook_win.cc

+++ b/chrome/app/close_handle_hook_win.cc

@@ -142,8 +142,8 @@ void EATPatch(HMODULE module, const char* function_name,

// Perform the patch.

#pragma warning(push)

-#pragma warning(disable: 4311)

- // These casts generate warnings because they are 32 bit specific.

+#pragma warning(disable : 4311 4302)

+ // These casts generate truncation warnings because they are 32 bit specific.

*eat_entry = reinterpret_cast<DWORD>(new_function) -

reinterpret_cast<DWORD>(module);

Nico 2015/11/18 02:02:35 I guess we don't run this code in 64-bit?

brucedawson 2015/11/18 02:06:04 Correct. UseHooks (line 234) unconditionally retur

Will Harris 2015/11/18 02:08:17 looks like these should look more like the EAT hoo

Nico 2015/11/18 02:09:39 Yeah, if this isn't called on 64-bit then it shoul

#pragma warning(pop)