Bug 1498695 Revert casting to void* (1462100) because mingwclang doesn't need to do that. r=bobowen
authorTom Ritter <tom@mozilla.com>
Tue, 16 Oct 2018 11:33:32 +0300
changeset 497179 d37fe76d61f968dc7e65327690020c6069841adb
parent 497178 ba4289e62b60d38f4333c79668c0eca7aac62f55
child 497190 db589d2f37284b67611b56d969b4bc9442697002
push id9996
push userarchaeopteryx@coole-files.de
push dateThu, 18 Oct 2018 18:37:15 +0000
treeherdermozilla-beta@8efe26839243 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbobowen
bugs1498695, 1462100
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1498695 Revert casting to void* (1462100) because mingwclang doesn't need to do that. r=bobowen
security/sandbox/chromium-shim/patches/with_update/mingw_noexports_casts.patch
security/sandbox/chromium-shim/patches/with_update/patch_order.txt
security/sandbox/chromium/sandbox/win/src/interception.h
deleted file mode 100644
--- a/security/sandbox/chromium-shim/patches/with_update/mingw_noexports_casts.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-# HG changeset patch
-# User Tom Ritter <tom@mozilla.com>
-# Date 1526498300 18000
-#      Wed May 16 14:18:20 2018 -0500
-# Node ID dd3f4940aeb0c4e00e8bcf1c238f2355ad793489
-# Parent  cf646c80b9545db7ab548f88a482378734ee2f78
-Bug 1462100 Cast to void* to avoid conversion errors on MinGW, which does not do the automatic conversion like msvc r?bobowen
-
-MozReview-Commit-ID: 8fO9Nu9gaxh
-
-diff --git a/security/sandbox/chromium/sandbox/win/src/interception.h b/security/sandbox/chromium/sandbox/win/src/interception.h
---- a/security/sandbox/chromium/sandbox/win/src/interception.h
-+++ b/security/sandbox/chromium/sandbox/win/src/interception.h
-@@ -264,25 +264,25 @@ class InterceptionManager {
- #define MAKE_SERVICE_NAME(service) &Target##service##64
- #else
- #define MAKE_SERVICE_NAME(service) &Target##service
- #endif
- 
- #define ADD_NT_INTERCEPTION(service, id, num_params) \
-   AddToPatchedFunctions(kNtdllName, #service, \
-                         sandbox::INTERCEPTION_SERVICE_CALL, \
--                        MAKE_SERVICE_NAME(service), id)
-+                        (void*)MAKE_SERVICE_NAME(service), id)
- 
- #define INTERCEPT_NT(manager, service, id, num_params) \
-   manager->ADD_NT_INTERCEPTION(service, id, num_params)
- 
- // When intercepting the EAT it is important that the patched version of the
- // function not call any functions imported from system libraries unless
- // |TargetServices::InitCalled()| returns true, because it is only then that
- // we are guaranteed that our IAT has been initialized.
- #define INTERCEPT_EAT(manager, dll, function, id, num_params) \
-   manager->AddToPatchedFunctions(dll, #function, sandbox::INTERCEPTION_EAT, \
--                                 MAKE_SERVICE_NAME(function), id)
-+                                 (void*)MAKE_SERVICE_NAME(function), id)
- #endif  // SANDBOX_EXPORTS
- 
- }  // namespace sandbox
- 
- #endif  // SANDBOX_SRC_INTERCEPTION_H_
--- a/security/sandbox/chromium-shim/patches/with_update/patch_order.txt
+++ b/security/sandbox/chromium-shim/patches/with_update/patch_order.txt
@@ -12,10 +12,9 @@ fix_Wcomma_warning_in_time_cc.patch
 allow_read_only_all_paths_rule.patch
 revert_TargetNtSetInformationThread_change.patch
 mingw_base_win_get_caller.patch
 mingw_duplicate_instatinations.patch
 mingw_copy_s.patch
 mingw_operator_new.patch
 mingw_cast_getprocaddress.patch
 mingw_capitalization.patch
-mingw_noexports_casts.patch
 mingw_offsetof.patch
--- a/security/sandbox/chromium/sandbox/win/src/interception.h
+++ b/security/sandbox/chromium/sandbox/win/src/interception.h
@@ -264,25 +264,25 @@ class InterceptionManager {
 #define MAKE_SERVICE_NAME(service) &Target##service##64
 #else
 #define MAKE_SERVICE_NAME(service) &Target##service
 #endif
 
 #define ADD_NT_INTERCEPTION(service, id, num_params) \
   AddToPatchedFunctions(kNtdllName, #service, \
                         sandbox::INTERCEPTION_SERVICE_CALL, \
-                        (void*)MAKE_SERVICE_NAME(service), id)
+                        MAKE_SERVICE_NAME(service), id)
 
 #define INTERCEPT_NT(manager, service, id, num_params) \
   manager->ADD_NT_INTERCEPTION(service, id, num_params)
 
 // When intercepting the EAT it is important that the patched version of the
 // function not call any functions imported from system libraries unless
 // |TargetServices::InitCalled()| returns true, because it is only then that
 // we are guaranteed that our IAT has been initialized.
 #define INTERCEPT_EAT(manager, dll, function, id, num_params) \
   manager->AddToPatchedFunctions(dll, #function, sandbox::INTERCEPTION_EAT, \
-                                 (void*)MAKE_SERVICE_NAME(function), id)
+                                 MAKE_SERVICE_NAME(function), id)
 #endif  // SANDBOX_EXPORTS
 
 }  // namespace sandbox
 
 #endif  // SANDBOX_SRC_INTERCEPTION_H_